bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point

renames the most annoying abbreviations in Writer (and partially
in the shared code too).

Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9

1107 files changed, 50156 insertions, 50156 deletions

diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index e0176be4eff4..77fff3fe3456 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -582,8 +582,8 @@ void ShapeController::executeDispatch_ParagraphDialog()
                                     0 );
             aNewAttr.Put( aAttr );
             aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
-            aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
-            aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT)  );
+            aNewAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
+            aNewAttr.Put( SvxFormatSplitItem( true, SID_ATTR_PARA_SPLIT)  );
             aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
             aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 3be79e68b9be..44724042527d 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -313,7 +313,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
     if ( pHyperlinkItem->GetMacroEvents() )
     {
         // get macros from itemset
-        const SvxMacroTableDtor* pMacroTbl = pHyperlinkItem->GetMacroTbl();
+        const SvxMacroTableDtor* pMacroTbl = pHyperlinkItem->GetMacroTable();
         SvxMacroItem aItem ( GetWhich(SID_ATTR_MACROITEM) );
         if( pMacroTbl )
             aItem.SetMacroTable( *pMacroTbl );
@@ -381,7 +381,7 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
     const SvxHyperlinkItem *pHyperlinkItem = static_cast<const SvxHyperlinkItem *>(
                                        GetItemSet().GetItem (SID_HYPERLINK_GETLINK));
 
-    return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTbl());
+    return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTable());
 }
 
 // try to detect the current protocol that is used in rStrURL
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index a5a5b4f6b0ae..9cb85a13414a 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -61,8 +61,8 @@ public:
 
     void                        AddEvent( const OUString & rEventName, sal_uInt16 nEventId );
 
-    const SvxMacroTableDtor&    GetMacroTbl() const;
-    void                        SetMacroTbl( const SvxMacroTableDtor& rTbl );
+    const SvxMacroTableDtor&    GetMacroTable() const;
+    void                        SetMacroTable( const SvxMacroTableDtor& rTbl );
 
     void                        ScriptChanged();
     virtual void                PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE;
@@ -77,12 +77,12 @@ public:
     bool                        IsReadOnly() const SAL_OVERRIDE;
 };
 
-inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
+inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTable() const
 {
     return aTbl;
 }
 
-inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
+inline void _SfxMacroTabPage::SetMacroTable( const SvxMacroTableDtor& rTbl )
 {
     aTbl = rTbl;
 }
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 032ad4596818..21c975343d76 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -138,7 +138,7 @@ class SvxBulletPickTabPage : public SfxTabPage
     bool                bPreset     : 1;
     sal_uInt16              nNumItemId;
 
-    OUString            sBulletCharFmtName;
+    OUString            sBulletCharFormatName;
 protected:
         DECL_LINK(NumSelectHdl_Impl, void *);
         DECL_LINK(DoubleClickHdl_Impl, void *);
@@ -156,7 +156,7 @@ public:
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
-    void                SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;}
+    void                SetCharFormatName(const OUString& rName){sBulletCharFormatName = rName;}
     virtual void        PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
 };
 
@@ -170,7 +170,7 @@ class SvxNumPickTabPage : public SfxTabPage
 
     VclPtr<SvxNumValueSet>     m_pExamplesVS;
     OUString            sNumCharFmtName;
-    OUString            sBulletCharFmtName;
+    OUString            sBulletCharFormatName;
 
     SvxNumSettingsArr_Impl  aNumSettingsArrays[NUM_VALUSET_COUNT];  // is initialized with the five formats
 
@@ -200,9 +200,9 @@ public:
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
-    void                SetCharFmtNames(const OUString& rCharName, const OUString& rBulName)
+    void                SetCharFormatNames(const OUString& rCharName, const OUString& rBulName)
                             {   sNumCharFmtName = rCharName;
-                                sBulletCharFmtName = rBulName;}
+                                sBulletCharFormatName = rBulName;}
     virtual void        PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
 };
 
@@ -298,7 +298,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
     VclPtr<SvxNumberingPreview> m_pPreviewWIN;
 
     OUString        m_sNumCharFmtName;
-    OUString        m_sBulletCharFmtName;
+    OUString        m_sBulletCharFormatName;
 
     Timer           aInvalidateTimer;
 
@@ -365,7 +365,7 @@ public:
     void                SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
                         {
                             m_sNumCharFmtName = rNumName;
-                            m_sBulletCharFmtName = rBulletName;
+                            m_sBulletCharFormatName = rBulletName;
                         }
     void                SetMetric(FieldUnit eSet);
 
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 7662a9d2ea9f..0c55af1988e2 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -183,8 +183,8 @@ public:
 
     [Items]
     <SvxHyphenZoneItem><SID_ATTR_PARA_HYPHENZONE>
-    <SvxFmtBreakItem><SID_ATTR_PARA_PAGEBREAK>
-    <SvxFmtSplitItem><SID_ATTR_PARA_SPLIT>
+    <SvxFormatBreakItem><SID_ATTR_PARA_PAGEBREAK>
+    <SvxFormatSplitItem><SID_ATTR_PARA_SPLIT>
     <SvxWidowsItem><SID_ATTR_PARA_WIDOWS>
     <SvxOrphansItem><SID_ATTR_PARA_ORPHANS>
 */
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 09f62262fc76..c4a91772b2fe 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -97,7 +97,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet )
     {
         // remove smart tag tab page if no extensions are installed
         SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-        SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+        SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
         if ( !pOpt || !pOpt->pSmartTagMgr || 0 == pOpt->pSmartTagMgr->NumberOfRecognizers() )
             RemoveTabPage("smarttags");
 
@@ -521,7 +521,7 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet*  )
 {
     bool bModified = false;
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
     long nFlags = pAutoCorrect->GetFlags();
 
     bool bCheck = m_pCheckLB->IsChecked(USE_REPLACE_TABLE, CBCOL_FIRST);
@@ -610,18 +610,18 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet*  )
                         m_pCheckLB->IsChecked(REPLACE_DASHES, CBCOL_SECOND));
 
     bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_FIRST);
-    bModified |= pOpt->bAFmtDelSpacesAtSttEnd != bCheck;
-    pOpt->bAFmtDelSpacesAtSttEnd = bCheck;
+    bModified |= pOpt->bAFormatDelSpacesAtSttEnd != bCheck;
+    pOpt->bAFormatDelSpacesAtSttEnd = bCheck;
     bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_SECOND);
-    bModified |= pOpt->bAFmtByInpDelSpacesAtSttEnd != bCheck;
-    pOpt->bAFmtByInpDelSpacesAtSttEnd = bCheck;
+    bModified |= pOpt->bAFormatByInpDelSpacesAtSttEnd != bCheck;
+    pOpt->bAFormatByInpDelSpacesAtSttEnd = bCheck;
 
     bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST);
-    bModified |= pOpt->bAFmtDelSpacesBetweenLines != bCheck;
-    pOpt->bAFmtDelSpacesBetweenLines = bCheck;
+    bModified |= pOpt->bAFormatDelSpacesBetweenLines != bCheck;
+    pOpt->bAFormatDelSpacesBetweenLines = bCheck;
     bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND);
-    bModified |= pOpt->bAFmtByInpDelSpacesBetweenLines != bCheck;
-    pOpt->bAFmtByInpDelSpacesBetweenLines = bCheck;
+    bModified |= pOpt->bAFormatByInpDelSpacesBetweenLines != bCheck;
+    pOpt->bAFormatByInpDelSpacesBetweenLines = bCheck;
 
     if(bModified || nFlags != pAutoCorrect->GetFlags())
     {
@@ -641,7 +641,7 @@ void    OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& )
 void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
     const long nFlags = pAutoCorrect->GetFlags();
 
     m_pCheckLB->SetUpdateMode(false);
@@ -683,10 +683,10 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
     m_pCheckLB->CheckEntryPos( DETECT_URL,         CBCOL_SECOND,   0 != (nFlags & SetINetAttr) );
     m_pCheckLB->CheckEntryPos( REPLACE_DASHES,     CBCOL_FIRST,    pOpt->bChgToEnEmDash );
     m_pCheckLB->CheckEntryPos( REPLACE_DASHES,     CBCOL_SECOND,   0 != (nFlags & ChgToEnEmDash) );
-    m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END,      CBCOL_FIRST,    pOpt->bAFmtDelSpacesAtSttEnd );
-    m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END,      CBCOL_SECOND,   pOpt->bAFmtByInpDelSpacesAtSttEnd );
-    m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_FIRST,    pOpt->bAFmtDelSpacesBetweenLines );
-    m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_SECOND,   pOpt->bAFmtByInpDelSpacesBetweenLines );
+    m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END,      CBCOL_FIRST,    pOpt->bAFormatDelSpacesAtSttEnd );
+    m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END,      CBCOL_SECOND,   pOpt->bAFormatByInpDelSpacesAtSttEnd );
+    m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_FIRST,    pOpt->bAFormatDelSpacesBetweenLines );
+    m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_SECOND,   pOpt->bAFormatByInpDelSpacesBetweenLines );
     m_pCheckLB->CheckEntryPos( DEL_EMPTY_NODE,     CBCOL_FIRST,    pOpt->bDelEmptyNode );
     m_pCheckLB->CheckEntryPos( REPLACE_USER_COLL,  CBCOL_FIRST,    pOpt->bChgUserColl );
     m_pCheckLB->CheckEntryPos( REPLACE_BULLETS,    CBCOL_FIRST,    pOpt->bChgEnumNum );
@@ -1926,7 +1926,7 @@ bool OfaQuoteTabPage::FillItemSet( SfxItemSet*  )
     bool bModified = false;
     if (m_pSwCheckLB->IsVisible())
     {
-        SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+        SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
 
         bool bCheck = m_pSwCheckLB->IsChecked(ADD_NONBRK_SPACE, CBCOL_FIRST);
         bModified |= pOpt->bAddNonBrkSpace != bCheck;
@@ -1991,7 +1991,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet* )
     // Initialize the Sw options
     if (m_pSwCheckLB->IsVisible())
     {
-        SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+        SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
 
         m_pSwCheckLB->SetUpdateMode( false );
         m_pSwCheckLB->Clear();
@@ -2254,7 +2254,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
 {
     bool bModified = false, bCheck;
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
     sal_uInt16 nVal;
 
     bCheck = m_pCBActiv->IsChecked();
@@ -2306,7 +2306,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
 void OfaAutoCompleteTabPage::Reset( const SfxItemSet*  )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
 
     m_pCBActiv->Check( pOpt->bAutoCompleteWords );
     m_pCBCollect->Check( pOpt->bAutoCmpltCollectWords );
@@ -2640,7 +2640,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl)
 bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
     SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
 
     // robust!
@@ -2683,7 +2683,7 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
 void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet*  )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
     const SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
 
     // robust, should not happen!
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 86930e231508..4d721afaffa0 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -362,7 +362,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl)
                     aFmt.SetSuffix( aEmptyStr );
                 else
                     aFmt.SetSuffix(_pSet->sSuffix);
-                aFmt.SetCharFmtName(sNumCharFmtName);
+                aFmt.SetCharFormatName(sNumCharFmtName);
                 // #62069# // #92724#
                 aFmt.SetBulletRelSize(100);
                 pActNum->SetLevel(i, aFmt);
@@ -520,7 +520,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl)
                 aFmt.SetSuffix( OUString() );
                 aFmt.SetBulletFont(&rActBulletFont);
                 aFmt.SetBulletChar(cChar );
-                aFmt.SetCharFmtName(sBulletCharFmtName);
+                aFmt.SetCharFormatName(sBulletCharFormatName);
                 // #62069# // #92724#
                 aFmt.SetBulletRelSize(45);
                 pActNum->SetLevel(i, aFmt);
@@ -548,7 +548,7 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet)
     SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false);
 
     if (pBulletCharFmt)
-        SetCharFmtName( pBulletCharFmt->GetValue());
+        SetCharFormatName( pBulletCharFmt->GetValue());
 
 
 }
@@ -773,14 +773,14 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
                 aFmt.SetBulletChar( !pLevelSettings->sBulletChar.isEmpty()
                                         ? pLevelSettings->sBulletChar[0]
                                         : 0 );
-                aFmt.SetCharFmtName( sBulletCharFmtName );
+                aFmt.SetCharFormatName( sBulletCharFormatName );
                 // #62069# // #92724#
                 aFmt.SetBulletRelSize(45);
             }
             else
             {
                 aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? pActNum->GetLevelCount() : 0));
-                aFmt.SetCharFmtName(sNumCharFmtName);
+                aFmt.SetCharFormatName(sNumCharFmtName);
                 // #62069# // #92724#
                 aFmt.SetBulletRelSize(100);
                 // #i93908#
@@ -808,7 +808,7 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet)
 
 
     if (pNumCharFmt &&pBulletCharFmt)
-        SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
+        SetCharFormatNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
 }
 
 SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,
@@ -986,7 +986,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl)
                 aFmt.SetNumberingType(nSetNumberingType);
                 aFmt.SetPrefix( aEmptyStr );
                 aFmt.SetSuffix( aEmptyStr );
-                aFmt.SetCharFmtName( sNumCharFmtName );
+                aFmt.SetCharFormatName( sNumCharFmtName );
 
                 Graphic aGraphic;
                 if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nIdx, &aGraphic))
@@ -1611,7 +1611,7 @@ void SvxNumOptionsTabPage::InitControls()
             if(SAL_MAX_UINT16 == nLvl)
             {
                 nLvl = i;
-                sFirstCharFmt = aNumFmtArr[i]->GetCharFmtName();
+                sFirstCharFmt = aNumFmtArr[i]->GetCharFormatName();
                 eFirstOrient = aNumFmtArr[i]->GetVertOrient();
                 if(bShowBitmap)
                     aFirstSize = aNumFmtArr[i]->GetGraphicSize();
@@ -1624,7 +1624,7 @@ void SvxNumOptionsTabPage::InitControls()
                 bSamePrefix = aNumFmtArr[i]->GetPrefix() == aNumFmtArr[nLvl]->GetPrefix();
                 bSameSuffix = aNumFmtArr[i]->GetSuffix() == aNumFmtArr[nLvl]->GetSuffix();
                 bAllLevel &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[nLvl]->GetIncludeUpperLevels();
-                bSameCharFmt    &= sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName();
+                bSameCharFmt    &= sFirstCharFmt == aNumFmtArr[i]->GetCharFormatName();
                 bSameVOrient    &= eFirstOrient == aNumFmtArr[i]->GetVertOrient();
                 if(bShowBitmap && bSameSize)
                     bSameSize &= aNumFmtArr[i]->GetGraphicSize() == aFirstSize;
@@ -1933,7 +1933,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
                 // allocation of the drawing pattern is automatic
                 if(bAutomaticCharStyles)
                 {
-                    sSelectStyle = m_sBulletCharFmtName;
+                    sSelectStyle = m_sBulletCharFormatName;
                 }
             }
             else
@@ -2118,7 +2118,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, v
             if(nActNumLvl & nMask)
             {
                 SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
-                aNumFmt.SetCharFmtName(m_sNumCharFmtName);
+                aNumFmt.SetCharFormatName(m_sNumCharFmtName);
                 aNumFmt.SetGraphic(aGrfName);
 
                 // set size for a later comparison
@@ -2355,11 +2355,11 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl)
         {
             SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
             if( 0 == nEntryPos )
-                aNumFmt.SetCharFmtName(aEmptyStr);
+                aNumFmt.SetCharFormatName(aEmptyStr);
             else
             {
                 if(SVX_NUM_BITMAP != (aNumFmt.GetNumberingType()&(~LINK_TOKEN)))
-                    aNumFmt.SetCharFmtName(sEntry);
+                    aNumFmt.SetCharFormatName(sEntry);
             }
             pActNum->SetLevel(i, aNumFmt);
         }
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 94c007053d8c..d128a30060b4 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -319,10 +319,10 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
                 static_cast<const SvxLRSpaceItem&>(GetItemSet().GetParent()->Get( nWhich ));
 
             if ( m_pLeftIndent->IsRelative() )
-                aMargin.SetTxtLeft( rOldItem.GetTxtLeft(),
+                aMargin.SetTextLeft( rOldItem.GetTextLeft(),
                                     (sal_uInt16)m_pLeftIndent->GetValue() );
             else
-                aMargin.SetTxtLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
+                aMargin.SetTextLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
 
             if ( m_pRightIndent->IsRelative() )
                 aMargin.SetRight( rOldItem.GetRight(),
@@ -331,21 +331,21 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
                 aMargin.SetRight( GetCoreValue( *m_pRightIndent, eUnit ) );
 
             if ( m_pFLineIndent->IsRelative() )
-                aMargin.SetTxtFirstLineOfst( rOldItem.GetTxtFirstLineOfst(),
+                aMargin.SetTextFirstLineOfst( rOldItem.GetTextFirstLineOfst(),
                                              (sal_uInt16)m_pFLineIndent->GetValue() );
             else
-                aMargin.SetTxtFirstLineOfst(
+                aMargin.SetTextFirstLineOfst(
                     (sal_uInt16)GetCoreValue( *m_pFLineIndent, eUnit ) );
         }
         else
         {
-            aMargin.SetTxtLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
+            aMargin.SetTextLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
             aMargin.SetRight( GetCoreValue( *m_pRightIndent, eUnit ) );
-            aMargin.SetTxtFirstLineOfst(
+            aMargin.SetTextFirstLineOfst(
                 (sal_uInt16)GetCoreValue( *m_pFLineIndent, eUnit ) );
         }
         aMargin.SetAutoFirst(m_pAutoCB->IsChecked());
-        if ( aMargin.GetTxtFirstLineOfst() < 0 )
+        if ( aMargin.GetTextFirstLineOfst() < 0 )
             bNullTab = true;
         eState = GetItemSet().GetItemState( nWhich );
 
@@ -452,7 +452,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
             {
                 m_pLeftIndent->SetRelative();
                 SetFieldUnit( *m_pLeftIndent, eFUnit );
-                SetMetricValue( *m_pLeftIndent, rOldItem.GetTxtLeft(), eUnit );
+                SetMetricValue( *m_pLeftIndent, rOldItem.GetTextLeft(), eUnit );
             }
 
             if ( rOldItem.GetPropRight() != 100 )
@@ -467,17 +467,17 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
                 SetMetricValue( *m_pRightIndent, rOldItem.GetRight(), eUnit );
             }
 
-            if ( rOldItem.GetPropTxtFirstLineOfst() != 100 )
+            if ( rOldItem.GetPropTextFirstLineOfst() != 100 )
             {
                 m_pFLineIndent->SetRelative( true );
-                m_pFLineIndent->SetValue( rOldItem.GetPropTxtFirstLineOfst() );
+                m_pFLineIndent->SetValue( rOldItem.GetPropTextFirstLineOfst() );
             }
             else
             {
                 m_pFLineIndent->SetRelative();
                 m_pFLineIndent->SetMin(-9999);
                 SetFieldUnit( *m_pFLineIndent, eFUnit );
-                SetMetricValue( *m_pFLineIndent, rOldItem.GetTxtFirstLineOfst(),
+                SetMetricValue( *m_pFLineIndent, rOldItem.GetTextFirstLineOfst(),
                                 eUnit );
             }
             m_pAutoCB->Check(rOldItem.IsAutoFirst());
@@ -487,9 +487,9 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
             const SvxLRSpaceItem& rSpace =
                 static_cast<const SvxLRSpaceItem&>(rSet->Get( _nWhich ));
 
-            SetMetricValue( *m_pLeftIndent, rSpace.GetTxtLeft(), eUnit );
+            SetMetricValue( *m_pLeftIndent, rSpace.GetTextLeft(), eUnit );
             SetMetricValue( *m_pRightIndent, rSpace.GetRight(), eUnit );
-            SetMetricValue( *m_pFLineIndent, rSpace.GetTxtFirstLineOfst(), eUnit );
+            SetMetricValue( *m_pFLineIndent, rSpace.GetTextFirstLineOfst(), eUnit );
             m_pAutoCB->Check(rSpace.IsAutoFirst());
         }
         AutoHdl_Impl(m_pAutoCB);
@@ -1430,7 +1430,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
 
     if ( bIsPageModel )
         // if PageModel is turned on, always turn off PageBreak
-        rOutSet->Put( SvxFmtBreakItem( SVX_BREAK_NONE, _nWhich ) );
+        rOutSet->Put( SvxFormatBreakItem( SVX_BREAK_NONE, _nWhich ) );
     else
     {
         eState = m_pPageBreakBox->GetState();
@@ -1441,9 +1441,9 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
              m_pBreakTypeLB->IsValueChangedFromSaved()   ||
              m_pBreakPositionLB->IsValueChangedFromSaved() )
         {
-            const SvxFmtBreakItem rOldBreak(
-                    static_cast<const SvxFmtBreakItem&>(GetItemSet().Get( _nWhich )));
-            SvxFmtBreakItem aBreak(rOldBreak.GetBreak(), rOldBreak.Which());
+            const SvxFormatBreakItem rOldBreak(
+                    static_cast<const SvxFormatBreakItem&>(GetItemSet().Get( _nWhich )));
+            SvxFormatBreakItem aBreak(rOldBreak.GetBreak(), rOldBreak.Which());
 
             switch ( eState )
             {
@@ -1476,7 +1476,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
             pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGEBREAK );
 
             if ( eState != m_pPageBreakBox->GetSavedValue()                ||
-                    !pOld || !( *static_cast<const SvxFmtBreakItem*>(pOld) == aBreak ) )
+                    !pOld || !( *static_cast<const SvxFormatBreakItem*>(pOld) == aBreak ) )
             {
                 bModified = true;
                 rOutSet->Put( aBreak );
@@ -1492,10 +1492,10 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
     {
         pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT );
 
-        if ( !pOld || static_cast<const SvxFmtSplitItem*>(pOld)->GetValue() !=
+        if ( !pOld || static_cast<const SvxFormatSplitItem*>(pOld)->GetValue() !=
                       ( eState == TRISTATE_FALSE ) )
         {
-            rOutSet->Put( SvxFmtSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
+            rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
             bModified = true;
         }
     }
@@ -1507,7 +1507,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
     if ( m_pKeepParaBox->IsValueChangedFromSaved() )
     {
         // if the status has changed, putting is necessary
-        rOutSet->Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
+        rOutSet->Put( SvxFormatKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
         bModified = true;
     }
 
@@ -1655,8 +1655,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
 
             if ( eItemState >= SfxItemState::DEFAULT )
             {
-                const SvxFmtBreakItem& rPageBreak =
-                    static_cast<const SvxFmtBreakItem&>(rSet->Get( _nWhich ));
+                const SvxFormatBreakItem& rPageBreak =
+                    static_cast<const SvxFormatBreakItem&>(rSet->Get( _nWhich ));
 
                 SvxBreak eBreak = (SvxBreak)rPageBreak.GetValue();
 
@@ -1727,8 +1727,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
     if ( eItemState >= SfxItemState::DEFAULT )
     {
         m_pKeepParaBox->EnableTriState( false );
-        const SvxFmtKeepItem& rKeep =
-            static_cast<const SvxFmtKeepItem&>(rSet->Get( _nWhich ));
+        const SvxFormatKeepItem& rKeep =
+            static_cast<const SvxFormatKeepItem&>(rSet->Get( _nWhich ));
 
         if ( rKeep.GetValue() )
             m_pKeepParaBox->SetState( TRISTATE_TRUE );
@@ -1745,8 +1745,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
 
     if ( eItemState >= SfxItemState::DEFAULT )
     {
-        const SvxFmtSplitItem& rSplit =
-            static_cast<const SvxFmtSplitItem&>(rSet->Get( _nWhich ));
+        const SvxFormatSplitItem& rSplit =
+            static_cast<const SvxFormatSplitItem&>(rSet->Get( _nWhich ));
         m_pKeepTogetherBox->EnableTriState( false );
 
         if ( !rSplit.GetValue() )
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 9dd3c078639f..6bef88304734 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -233,7 +233,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
         if (SfxItemState::SET != rSet->GetItemState(GetWhich(SID_ATTR_LRSPACE), true, &pLRSpace))
             pLRSpace = GetOldItem(*rSet, SID_ATTR_LRSPACE);
 
-        if (pLRSpace && static_cast<const SvxLRSpaceItem*>(pLRSpace)->GetTxtFirstLineOfst() < 0)
+        if (pLRSpace && static_cast<const SvxLRSpaceItem*>(pLRSpace)->GetTextFirstLineOfst() < 0)
         {
             SvxTabStop aNull(0, SVX_TAB_ADJUST_DEFAULT);
             aNewTabs.Insert(aNull);
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index c5f7a3b32f40..fb210c6813a3 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -375,8 +375,8 @@ public:
                                     { return !(operator == ( rAttr ) ); }
 
     virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
-    Color*&         GetTxtColor()           { return pTxtColor; }
-    Color*&         GetFldColor()           { return pFldColor; }
+    Color*&         GetTextColor()           { return pTxtColor; }
+    Color*&         GetFieldColor()           { return pFldColor; }
 
     const OUString& GetFieldValue() const { return aFieldValue;}
     void SetFieldValue(const OUString& rVal);
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index fa1f99af1169..d59654f713e5 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -70,9 +70,9 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem)
         case EE_PARA_OUTLLRSPACE:
         case EE_PARA_LRSPACE:
             aDebStr.append("FI=");
-            aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtFirstLineOfst()));
+            aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst()));
             aDebStr.append(", LI=");
-            aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtLeft()));
+            aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft()));
             aDebStr.append(", RI=");
             aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetRight()));
         break;
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index c9fe9755005f..6f447b90f291 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -878,8 +878,8 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
         {
             DBG_ASSERT( rPoolItem.IsA( TYPE( SvxLRSpaceItem ) ), "ConvertItem: invalid Item!" );
             SvxLRSpaceItem& rItem = static_cast<SvxLRSpaceItem&>(rPoolItem);
-            rItem.SetTxtFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTxtFirstLineOfst(), eSourceUnit, eDestUnit ) ) );
-            rItem.SetTxtLeft( OutputDevice::LogicToLogic( rItem.GetTxtLeft(), eSourceUnit, eDestUnit ) );
+            rItem.SetTextFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTextFirstLineOfst(), eSourceUnit, eDestUnit ) ) );
+            rItem.SetTextLeft( OutputDevice::LogicToLogic( rItem.GetTextLeft(), eSourceUnit, eDestUnit ) );
             rItem.SetRight( OutputDevice::LogicToLogic( rItem.GetRight(), eSourceUnit, eDestUnit ) );
         }
         break;
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 3a356ab28115..a119b58dc8dc 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1922,11 +1922,11 @@ Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph )
         else
         {
             const SvxLRSpaceItem& rLRItem = pImpEditEngine->GetLRSpaceItem( pPPortion->GetNode() );
-// TL_NF_LR         aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst()) );
+// TL_NF_LR         aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst()) );
             sal_Int32 nSpaceBefore = 0;
             pImpEditEngine->GetSpaceBeforeAndMinLabelWidth( pPPortion->GetNode(), &nSpaceBefore );
-            short nX = (short)(rLRItem.GetTxtLeft()
-                            + rLRItem.GetTxtFirstLineOfst()
+            short nX = (short)(rLRItem.GetTextLeft()
+                            + rLRItem.GetTextFirstLineOfst()
                             + nSpaceBefore);
             aPoint.X() = pImpEditEngine->GetXValue( nX
                              );
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index c4f3afca1338..ecee5b62ef22 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1564,14 +1564,14 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
         {
             ContentInfo& rC = aContents[i];
             const SvxLRSpaceItem& rLRSpace = static_cast<const SvxLRSpaceItem&>(rC.GetParaAttribs().Get(EE_PARA_LRSPACE));
-            if ( rLRSpace.GetTxtLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) )
+            if ( rLRSpace.GetTextLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) )
             {
                 const SvxTabStopItem& rTabs = static_cast<const SvxTabStopItem&>(rC.GetParaAttribs().Get(EE_PARA_TABS));
                 SvxTabStopItem aNewTabs( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS );
                 for ( sal_uInt16 t = 0; t < rTabs.Count(); t++ )
                 {
                     const SvxTabStop& rT = rTabs[ t ];
-                    aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTxtLeft(),
+                    aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTextLeft(),
                                 rT.GetAdjustment(), rT.GetDecimal(), rT.GetFill() ) );
                 }
                 rC.GetParaAttribs().Put( aNewTabs );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index bfded820d6fa..87a1f947af28 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2943,12 +2943,12 @@ bool ImpEditEngine::UpdateFields()
                 rField.Reset();
 
                 if ( aStatus.MarkFields() )
-                    rField.GetFldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor );
+                    rField.GetFieldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor );
 
                 OUString aFldValue =
                     GetEditEnginePtr()->CalcFieldValue(
                         static_cast<const SvxFieldItem&>(*rField.GetItem()),
-                        nPara, rField.GetStart(), rField.GetTxtColor(), rField.GetFldColor());
+                        nPara, rField.GetStart(), rField.GetTextColor(), rField.GetFieldColor());
 
                 rField.SetFieldValue(aFldValue);
                 if (rField != *pCurrent)
@@ -3089,10 +3089,10 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( bool bIgnoreExtraSpace )
                 // width, here not preferred. I general, it is best not leave it
                 // to StartPosX, also the right indents have to be taken into
                 // account!
-                nCurWidth = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth );
+                nCurWidth = GetXValue( rLRItem.GetTextLeft() + nSpaceBeforeAndMinLabelWidth );
                 if ( nLine == 0 )
                 {
-                    long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );
+                    long nFI = GetXValue( rLRItem.GetTextFirstLineOfst() );
                     nCurWidth -= nFI;
                     if ( pPortion->GetBulletX() > nCurWidth )
                     {
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 1a8ac4d5918b..fb071e08799e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -737,10 +737,10 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
         sal_Int32 nPortionStart = 0;
         sal_Int32 nPortionEnd = 0;
 
-        long nStartX = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth );
+        long nStartX = GetXValue( rLRItem.GetTextLeft() + nSpaceBeforeAndMinLabelWidth );
         if ( nIndex == 0 )
         {
-            long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );
+            long nFI = GetXValue( rLRItem.GetTextFirstLineOfst() );
             nStartX += nFI;
 
             if ( !nLine && ( pParaPortion->GetBulletX() > nStartX ) )
@@ -907,9 +907,9 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
                         if ( aStatus.DoStretch() && ( nStretchX != 100 ) )
                             nCurPos = nCurPos*100/std::max(static_cast<sal_Int32>(nStretchX), static_cast<sal_Int32>(1));
 
-                        short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTxtLeft()/* + rLRItem.GetTxtLeft()*/ + nSpaceBeforeAndMinLabelWidth);
-                        aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/, aEditDoc.GetDefTab() );
-                        aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/ ) );
+                        short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTextLeft()/* + rLRItem.GetTextLeft()*/ + nSpaceBeforeAndMinLabelWidth);
+                        aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/, aEditDoc.GetDefTab() );
+                        aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/ ) );
                         aCurrentTab.bValid = false;
 
                         // Switch direction in R2L para...
@@ -1577,12 +1577,12 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
     sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pParaPortion->GetNode(), &nSpaceBefore );
     const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pParaPortion->GetNode() );
     const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pParaPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
-    short nStartX = GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBefore));
+    short nStartX = GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBefore));
 
     Rectangle aBulletArea = Rectangle( Point(), Point() );
     if ( bLineBreak )
     {
-        nStartX = (short)GetXValue( rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
+        nStartX = (short)GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
     }
     else
     {
@@ -1593,7 +1593,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
             pParaPortion->SetBulletX( 0 ); // If Bullet set incorrectly.
         if ( pParaPortion->GetBulletX() > nStartX )
         {
-            nStartX = (short)GetXValue( rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
+            nStartX = (short)GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
             if ( pParaPortion->GetBulletX() > nStartX )
                 nStartX = pParaPortion->GetBulletX();
         }
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 0fb7962a54da..8cd007a3de34 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -723,11 +723,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
         case EE_PARA_LRSPACE:
         {
             rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FI );
-            sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTxtFirstLineOfst();
+            sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst();
             nTxtFirst = LogicToTwips( nTxtFirst );
             rOutput.WriteInt32AsString( nTxtFirst );
             rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LI );
-            sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtLeft());
+            sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft());
             nTxtLeft = (sal_uInt32)LogicToTwips( nTxtLeft );
             rOutput.WriteInt32AsString( nTxtLeft );
             rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RI );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 50db5864bc23..d872838d7250 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -149,8 +149,8 @@ TYPEINIT1_FACTORY(SvxBrushItem, SfxPoolItem, new SvxBrushItem(0));
 TYPEINIT1_FACTORY(SvxShadowItem, SfxPoolItem, new SvxShadowItem(0));
 TYPEINIT1_FACTORY(SvxBoxItem, SfxPoolItem, new SvxBoxItem(0));
 TYPEINIT1_FACTORY(SvxBoxInfoItem, SfxPoolItem, new SvxBoxInfoItem(0));
-TYPEINIT1_FACTORY(SvxFmtBreakItem, SfxEnumItem, new SvxFmtBreakItem(SVX_BREAK_NONE, 0));
-TYPEINIT1_FACTORY(SvxFmtKeepItem, SfxBoolItem, new SvxFmtKeepItem(false, 0));
+TYPEINIT1_FACTORY(SvxFormatBreakItem, SfxEnumItem, new SvxFormatBreakItem(SVX_BREAK_NONE, 0));
+TYPEINIT1_FACTORY(SvxFormatKeepItem, SfxBoolItem, new SvxFormatKeepItem(false, 0));
 TYPEINIT1_FACTORY(SvxLineItem, SfxPoolItem, new SvxLineItem(0));
 TYPEINIT1_FACTORY(SvxFrameDirectionItem, SfxUInt16Item, new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0));
 
@@ -496,7 +496,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             break;
 
         case MID_TXT_LMARGIN :
-            SetTxtLeft( bConvert ? convertMm100ToTwip(nVal) : nVal );
+            SetTextLeft( bConvert ? convertMm100ToTwip(nVal) : nVal );
         break;
 
         case MID_R_MARGIN:
@@ -518,11 +518,11 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
         }
         break;
         case MID_FIRST_LINE_INDENT     :
-            SetTxtFirstLineOfst((short)(bConvert ?  convertMm100ToTwip(nVal) : nVal));
+            SetTextFirstLineOfst((short)(bConvert ?  convertMm100ToTwip(nVal) : nVal));
             break;
 
         case MID_FIRST_LINE_REL_INDENT:
-            SetPropTxtFirstLineOfst ( (sal_uInt16)nVal );
+            SetPropTextFirstLineOfst ( (sal_uInt16)nVal );
             break;
 
         case MID_FIRST_AUTO:
@@ -557,11 +557,11 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
     const SvxLRSpaceItem& rOther = static_cast<const SvxLRSpaceItem&>(rAttr);
 
     return (
-        nFirstLineOfst == rOther.GetTxtFirstLineOfst() &&
-        nTxtLeft == rOther.GetTxtLeft() &&
+        nFirstLineOfst == rOther.GetTextFirstLineOfst() &&
+        nTxtLeft == rOther.GetTextLeft() &&
         nLeftMargin == rOther.GetLeft()  &&
         nRightMargin == rOther.GetRight() &&
-        nPropFirstLineOfst == rOther.GetPropTxtFirstLineOfst() &&
+        nPropFirstLineOfst == rOther.GetPropTextFirstLineOfst() &&
         nPropLeftMargin == rOther.GetPropLeft()  &&
         nPropRightMargin == rOther.GetPropRight() &&
         bAutoFirst == rOther.IsAutoFirst() &&
@@ -673,7 +673,7 @@ bool SvxLRSpaceItem::GetPresentation
 SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
     short nSaveFI = nFirstLineOfst;
-    const_cast<SvxLRSpaceItem*>(this)->SetTxtFirstLineOfst( 0 );  // nLeftMargin is manipulated together with this, see Create()
+    const_cast<SvxLRSpaceItem*>(this)->SetTextFirstLineOfst( 0 );  // nLeftMargin is manipulated together with this, see Create()
 
     sal_uInt16 nMargin = 0;
     if( nLeftMargin > 0 )
@@ -713,7 +713,7 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con
         }
     }
 
-    const_cast<SvxLRSpaceItem*>(this)->SetTxtFirstLineOfst( nSaveFI );
+    const_cast<SvxLRSpaceItem*>(this)->SetTextFirstLineOfst( nSaveFI );
 
     return rStrm;
 }
@@ -1268,7 +1268,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     sal_Int8 cProt = 0;
     if( IsPosProtected() )   cProt |= 0x01;
     if( IsSizeProtected() )  cProt |= 0x02;
-    if( IsCntntProtected() ) cProt |= 0x04;
+    if( IsContentProtected() ) cProt |= 0x04;
     rStrm.WriteSChar( cProt );
     return rStrm;
 }
@@ -1282,7 +1282,7 @@ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
     SvxProtectItem* pAttr = new SvxProtectItem( Which() );
     pAttr->SetPosProtect( ( cFlags & 0x01 ) != 0 );
     pAttr->SetSizeProtect( ( cFlags & 0x02 ) != 0 );
-    pAttr->SetCntntProtect( ( cFlags & 0x04 ) != 0 );
+    pAttr->SetContentProtect( ( cFlags & 0x04 ) != 0 );
     return pAttr;
 }
 
@@ -2937,18 +2937,18 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-// class SvxFmtBreakItem -------------------------------------------------
+// class SvxFormatBreakItem -------------------------------------------------
 
-bool SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxFormatBreakItem::operator==( const SfxPoolItem& rAttr ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "unequal types" );
 
-    return GetValue() == static_cast<const SvxFmtBreakItem&>( rAttr ).GetValue();
+    return GetValue() == static_cast<const SvxFormatBreakItem&>( rAttr ).GetValue();
 }
 
 
 
-bool SvxFmtBreakItem::GetPresentation
+bool SvxFormatBreakItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -2962,14 +2962,14 @@ bool SvxFmtBreakItem::GetPresentation
 
 
 
-OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" );
     return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos);
 }
 
 
-bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
+bool SvxFormatBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     style::BreakType eBreak = style::BreakType_NONE;
     switch ( (SvxBreak)GetValue() )
@@ -2986,7 +2986,7 @@ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) cons
     return true;
 }
 
-bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
+bool SvxFormatBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     style::BreakType nBreak;
 
@@ -3017,14 +3017,14 @@ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 
 
 
-SfxPoolItem* SvxFmtBreakItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SvxFormatBreakItem::Clone( SfxItemPool* ) const
 {
-    return new SvxFmtBreakItem( *this );
+    return new SvxFormatBreakItem( *this );
 }
 
 
 
-SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+SvStream& SvxFormatBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
     rStrm.WriteSChar( GetValue() );
     if( FMTBREAK_NOAUTO > nItemVersion )
@@ -3034,44 +3034,44 @@ SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) co
 
 
 
-sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const
+sal_uInt16 SvxFormatBreakItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
             SOFFICE_FILEFORMAT_50==nFFVer,
-            "SvxFmtBreakItem: Is there a new file format? ");
+            "SvxFormatBreakItem: Is there a new file format? ");
     return SOFFICE_FILEFORMAT_31==nFFVer ||
            SOFFICE_FILEFORMAT_40==nFFVer ? 0 : FMTBREAK_NOAUTO;
 }
 
 
 
-SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
+SfxPoolItem* SvxFormatBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
     sal_Int8 eBreak, bDummy;
     rStrm.ReadSChar( eBreak );
     if( FMTBREAK_NOAUTO > nVersion )
         rStrm.ReadSChar( bDummy );
-    return new SvxFmtBreakItem( (const SvxBreak)eBreak, Which() );
+    return new SvxFormatBreakItem( (const SvxBreak)eBreak, Which() );
 }
 
 
 
-sal_uInt16 SvxFmtBreakItem::GetValueCount() const
+sal_uInt16 SvxFormatBreakItem::GetValueCount() const
 {
     return SVX_BREAK_END;   // SVX_BREAK_PAGE_BOTH + 1
 }
 
-// class SvxFmtKeepItem -------------------------------------------------
+// class SvxFormatKeepItem -------------------------------------------------
 
-SfxPoolItem* SvxFmtKeepItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const
 {
-    return new SvxFmtKeepItem( *this );
+    return new SvxFormatKeepItem( *this );
 }
 
 
 
-SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
+SvStream& SvxFormatKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm.WriteSChar( (sal_Int8)GetValue() );
     return rStrm;
@@ -3079,16 +3079,16 @@ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
 
 
 
-SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
+SfxPoolItem* SvxFormatKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 bIsKeep;
     rStrm.ReadSChar( bIsKeep );
-    return new SvxFmtKeepItem( bIsKeep != 0, Which() );
+    return new SvxFormatKeepItem( bIsKeep != 0, Which() );
 }
 
 
 
-bool SvxFmtKeepItem::GetPresentation
+bool SvxFormatKeepItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index c78822484e39..6b846e74491f 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -565,7 +565,7 @@ OUString SvxNumberFormat::CreateRomanString( sal_uLong nNo, bool bUpper )
     return sRet;
 }
 
-OUString SvxNumberFormat::GetCharFmtName()const
+OUString SvxNumberFormat::GetCharFormatName()const
 {
     return sCharStyleName;
 }
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 758e2480ccda..452704b0d9ff 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -59,7 +59,7 @@ TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0));
 TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0));
 TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0));
 TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0));
-TYPEINIT1_FACTORY(SvxFmtSplitItem, SfxBoolItem, new SvxFmtSplitItem(false, 0));
+TYPEINIT1_FACTORY(SvxFormatSplitItem, SfxBoolItem, new SvxFormatSplitItem(false, 0));
 TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0));
 TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(false, 0));
 TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(false, 0));
@@ -1208,19 +1208,19 @@ void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart,
 
 
 
-// class SvxFmtSplitItem -------------------------------------------------
-SvxFmtSplitItem::~SvxFmtSplitItem()
+// class SvxFormatSplitItem -------------------------------------------------
+SvxFormatSplitItem::~SvxFormatSplitItem()
 {
 }
 
-SfxPoolItem* SvxFmtSplitItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const
 {
-    return new SvxFmtSplitItem( *this );
+    return new SvxFormatSplitItem( *this );
 }
 
 
 
-SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
+SvStream& SvxFormatSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm.WriteSChar( (sal_Int8)GetValue() );
     return rStrm;
@@ -1228,16 +1228,16 @@ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
 
 
 
-SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
+SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 bIsSplit;
     rStrm.ReadSChar( bIsSplit );
-    return new SvxFmtSplitItem( bIsSplit != 0, Which() );
+    return new SvxFormatSplitItem( bIsSplit != 0, Which() );
 }
 
 
 
-bool SvxFmtSplitItem::GetPresentation
+bool SvxFormatSplitItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index da7e9183e4ad..7de20d1eed9d 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -434,7 +434,7 @@ Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const OUString &rTxt,
 }
 
 
-Size SvxFont::GetTxtSize( const OutputDevice *pOut, const OUString &rTxt,
+Size SvxFont::GetTextSize( const OutputDevice *pOut, const OUString &rTxt,
                          const sal_Int32 nIdx, const sal_Int32 nLen ) const
 {
     sal_Int32 nTmp = nLen;
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 3971ce8d8e74..325e787217dd 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -398,7 +398,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
     DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed");
     if(aValues.getLength() == aNames.getLength())
     {
-        SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
+        SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
         for(int nProp = 0; nProp < aNames.getLength(); nProp++)
         {
             if(pValues[nProp].hasValue())
@@ -461,16 +461,16 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
                             sal::static_int_cast< sal_uInt8 >(nVal);
                     }
                     break; // "Format/Option/CombineValue",
-                    case  23: rSwFlags.bAFmtDelSpacesAtSttEnd =  *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesAtStartEnd",
-                    case  24: rSwFlags.bAFmtDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesBetween",
+                    case  23: rSwFlags.bAFormatDelSpacesAtSttEnd =  *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesAtStartEnd",
+                    case  24: rSwFlags.bAFormatDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesBetween",
                     case  25: rParent.bAutoFmtByInput = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/Enable",
                     case  26: rSwFlags.bChgToEnEmDash = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeDash",
                     case  27: rSwFlags.bSetNumRule = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ApplyNumbering/Enable",
                     case  28: rSwFlags.bSetBorder = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeToBorders",
                     case  29: rSwFlags.bCreateTable = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeToTable",
                     case  30: rSwFlags.bReplaceStyles =  *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ReplaceStyle",
-                    case  31: rSwFlags.bAFmtByInpDelSpacesAtSttEnd =  *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesAtStartEnd",
-                    case  32: rSwFlags.bAFmtByInpDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesBetween",
+                    case  31: rSwFlags.bAFormatByInpDelSpacesAtSttEnd =  *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesAtStartEnd",
+                    case  32: rSwFlags.bAFormatByInpDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesBetween",
                     case  33: rSwFlags.bAutoCompleteWords = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Completion/Enable",
                     case  34:
                     {
@@ -554,7 +554,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
 
     const Type& rType = cppu::UnoType<bool>::get();
     sal_Bool bVal;
-    SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
+    SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
         switch(nProp)
@@ -597,16 +597,16 @@ void SvxSwAutoCorrCfg::ImplCommit()
             case  22:
                 pValues[nProp] <<= (sal_Int32)rSwFlags.nRightMargin;
             break; // "Format/Option/CombineValue",
-            case  23: bVal = rSwFlags.bAFmtDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd",
-            case  24: bVal = rSwFlags.bAFmtDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween",
+            case  23: bVal = rSwFlags.bAFormatDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd",
+            case  24: bVal = rSwFlags.bAFormatDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween",
             case  25: bVal = rParent.bAutoFmtByInput; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/Enable",
             case  26: bVal = rSwFlags.bChgToEnEmDash; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeDash",
             case  27: bVal = rSwFlags.bSetNumRule; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ApplyNumbering/Enable",
             case  28: bVal = rSwFlags.bSetBorder; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToBorders",
             case  29: bVal = rSwFlags.bCreateTable; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToTable",
             case  30: bVal = rSwFlags.bReplaceStyles; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ReplaceStyle",
-            case  31: bVal = rSwFlags.bAFmtByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd",
-            case  32: bVal = rSwFlags.bAFmtByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween",
+            case  31: bVal = rSwFlags.bAFormatByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd",
+            case  32: bVal = rSwFlags.bAFormatByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween",
             case  33: bVal = rSwFlags.bAutoCompleteWords; pValues[nProp].setValue(&bVal, rType); break; // "Completion/Enable",
             case  34:
                 pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltWordLen;
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 74645ed982c2..31f085c805c1 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -21,7 +21,7 @@
 #include <tools/gen.hxx>
 #include <vcl/keycodes.hxx>
 
-SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
+SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
     : aBulletFont( OUString("StarSymbol"),
                     Size( 0, 14 ) )
 {
@@ -36,10 +36,10 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     bChgToEnEmDash =
     bChgWeightUnderl =
     bSetINetAttr =
-    bAFmtDelSpacesAtSttEnd =
-    bAFmtDelSpacesBetweenLines =
-    bAFmtByInpDelSpacesAtSttEnd =
-    bAFmtByInpDelSpacesBetweenLines =
+    bAFormatDelSpacesAtSttEnd =
+    bAFormatDelSpacesBetweenLines =
+    bAFormatByInpDelSpacesAtSttEnd =
+    bAFormatByInpDelSpacesBetweenLines =
     bDummy = true;
 
     bReplaceStyles =
@@ -52,7 +52,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     bSetBorder =
     bCreateTable =
     bSetNumRule =
-    bAFmtByInput =
+    bAFormatByInput =
     bRightMargin =
     bAutoCompleteWords =
     bAutoCmpltCollectWords =
@@ -81,7 +81,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
 }
 
 
-SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFlags )
+SvxSwAutoFormatFlags& SvxSwAutoFormatFlags::operator=( const SvxSwAutoFormatFlags& rAFFlags )
 {
     bAutoCorrect = rAFFlags.bAutoCorrect;
     bCptlSttSntnc = rAFFlags.bCptlSttSntnc;
@@ -92,7 +92,7 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
     bChgEnumNum = rAFFlags.bChgEnumNum;
     bDelEmptyNode = rAFFlags.bDelEmptyNode;
     bSetNumRule = rAFFlags.bSetNumRule;
-    bAFmtByInput = rAFFlags.bAFmtByInput;
+    bAFormatByInput = rAFFlags.bAFormatByInput;
 
     bAddNonBrkSpace = rAFFlags.bAddNonBrkSpace;
     bChgOrdinalNumber = rAFFlags.bChgOrdinalNumber;
@@ -102,10 +102,10 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
     bSetBorder = rAFFlags.bSetBorder;
     bCreateTable = rAFFlags.bCreateTable;
     bReplaceStyles = rAFFlags.bReplaceStyles;
-    bAFmtDelSpacesAtSttEnd = rAFFlags.bAFmtDelSpacesAtSttEnd;
-    bAFmtDelSpacesBetweenLines = rAFFlags.bAFmtDelSpacesBetweenLines;
-    bAFmtByInpDelSpacesAtSttEnd = rAFFlags.bAFmtByInpDelSpacesAtSttEnd;
-    bAFmtByInpDelSpacesBetweenLines = rAFFlags.bAFmtByInpDelSpacesBetweenLines;
+    bAFormatDelSpacesAtSttEnd = rAFFlags.bAFormatDelSpacesAtSttEnd;
+    bAFormatDelSpacesBetweenLines = rAFFlags.bAFormatDelSpacesBetweenLines;
+    bAFormatByInpDelSpacesAtSttEnd = rAFFlags.bAFormatByInpDelSpacesAtSttEnd;
+    bAFormatByInpDelSpacesBetweenLines = rAFFlags.bAFormatByInpDelSpacesBetweenLines;
 
     bDummy = rAFFlags.bDummy;
 
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 8f704bb192bf..b573ea1ebd5e 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -679,17 +679,17 @@ OUString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara,
     EditFieldInfo aFldInfo( this, rField, nPara, nPos );
     // The FldColor is preset with COL_LIGHTGRAY.
     if ( rpFldColor )
-        aFldInfo.SetFldColor( *rpFldColor );
+        aFldInfo.SetFieldColor( *rpFldColor );
 
     aCalcFieldValueHdl.Call( &aFldInfo );
-    if ( aFldInfo.GetTxtColor() )
+    if ( aFldInfo.GetTextColor() )
     {
         delete rpTxtColor;
-        rpTxtColor = new Color( *aFldInfo.GetTxtColor() );
+        rpTxtColor = new Color( *aFldInfo.GetTextColor() );
     }
 
     delete rpFldColor;
-    rpFldColor = aFldInfo.GetFldColor() ? new Color( *aFldInfo.GetFldColor() ) : 0;
+    rpFldColor = aFldInfo.GetFieldColor() ? new Color( *aFldInfo.GetFieldColor() ) : 0;
 
     return aFldInfo.GetRepresentation();
 }
@@ -1578,9 +1578,9 @@ Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bRetu
         const short nSpaceBefore = pFmt->GetAbsLSpace() + pFmt->GetFirstLineOffset();
 
         const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>( pEditEngine->GetParaAttrib( nPara, bOutlineMode ? EE_PARA_OUTLLRSPACE : EE_PARA_LRSPACE ) );
-        aTopLeft.X() = rLR.GetTxtLeft() + rLR.GetTxtFirstLineOfst() + nSpaceBefore;
+        aTopLeft.X() = rLR.GetTextLeft() + rLR.GetTextFirstLineOfst() + nSpaceBefore;
 
-        long nBulletWidth = std::max( (long) -rLR.GetTxtFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) );
+        long nBulletWidth = std::max( (long) -rLR.GetTextFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) );
         if ( nBulletWidth < aBulletSize.Width() )   // The Bullet creates its space
             nBulletWidth = aBulletSize.Width();
 
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index fdfda0726f7f..67a574bac6e2 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -303,14 +303,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
             case RTF_KEEP:
                 if( aPardMap.nSplit )
                 {
-                    pSet->Put( SvxFmtSplitItem( false, aPardMap.nSplit ));
+                    pSet->Put( SvxFormatSplitItem( false, aPardMap.nSplit ));
                 }
                 break;
 
             case RTF_KEEPN:
                 if( aPardMap.nKeep )
                 {
-                    pSet->Put( SvxFmtKeepItem( true, aPardMap.nKeep ));
+                    pSet->Put( SvxFormatKeepItem( true, aPardMap.nKeep ));
                 }
                 break;
 
@@ -358,7 +358,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                             CalcValue();
                         nSz = sal_uInt16(nTokenValue);
                     }
-                    aLR.SetTxtFirstLineOfst( nSz );
+                    aLR.SetTextFirstLineOfst( nSz );
                     pSet->Put( aLR );
                 }
                 break;
@@ -375,7 +375,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                             CalcValue();
                         nSz = sal_uInt16(nTokenValue);
                     }
-                    aLR.SetTxtLeft( nSz );
+                    aLR.SetTextLeft( nSz );
                     pSet->Put( aLR );
                 }
                 break;
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 552c52a77b27..56ef7368e8fc 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -129,7 +129,7 @@ SvParserState SvxRTFParser::CallParser()
     sBaseURL.clear();
 
     // generate the correct WhichId table from the set WhichIds.
-    BuildWhichTbl();
+    BuildWhichTable();
 
     return SvRTFParser::CallParser();
 }
@@ -1089,7 +1089,7 @@ void SvxRTFParser::SetAttrInDoc( SvxRTFItemStackType & )
 {
 }
 
-void SvxRTFParser::BuildWhichTbl()
+void SvxRTFParser::BuildWhichTable()
 {
     aWhichMap.clear();
     aWhichMap.push_back( 0 );
@@ -1097,8 +1097,8 @@ void SvxRTFParser::BuildWhichTbl()
     // Building a Which-Map 'rWhichMap' from an array of
     // 'pWhichIds' from Which-Ids. It has the long 'nWhichIds'.
     // The Which-Map is not going to be deleted.
-    SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) );
-    SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) );
+    SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) );
+    SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) );
 }
 
 const SfxItemSet& SvxRTFParser::GetRTFDefaults()
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 506c449d9bed..9e88ceb4a361 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5460,7 +5460,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
 void SvxMSDffManager::StoreShapeOrder(sal_uLong         nId,
                                       sal_uLong         nTxBx,
                                       SdrObject*    pObject,
-                                      SwFlyFrmFmt*  pFly,
+                                      SwFlyFrameFormat*  pFly,
                                       short         nHdFtSection) const
 {
     sal_uInt16 nShpCnt = pShapeOrders->size();
@@ -5481,7 +5481,7 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong         nId,
 
 void SvxMSDffManager::ExchangeInShapeOrder( SdrObject*   pOldObject,
                                             sal_uLong        nTxBx,
-                                            SwFlyFrmFmt* pFly,
+                                            SwFlyFrameFormat* pFly,
                                             SdrObject*   pObject) const
 {
     sal_uInt16 nShpCnt = pShapeOrders->size();
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 42f3c2d0b531..4536cda3ad52 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6094,14 +6094,14 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet,  boost::optional< sal_Int16 >&
         sal_uInt16 nAbsLSpace = (sal_uInt16)( ( (sal_uInt32)_nTextOfs * 2540 ) / 576 );
         sal_uInt16 nFirstLineOffset = nAbsLSpace - (sal_uInt16)( ( (sal_uInt32)_nBulletOfs * 2540 ) / 576 );
         aLRSpaceItem.SetLeft( nAbsLSpace );
-        aLRSpaceItem.SetTxtFirstLineOfstValue( -nFirstLineOffset );
+        aLRSpaceItem.SetTextFirstLineOfstValue( -nFirstLineOffset );
         rSet.Put( aLRSpaceItem );
     }
     else
     {
         SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
         aLRSpaceItem.SetLeft( 0 );
-        aLRSpaceItem.SetTxtFirstLineOfstValue( 0 );
+        aLRSpaceItem.SetTextFirstLineOfstValue( 0 );
         rSet.Put( aLRSpaceItem );
     }
     if ( GetAttrib( PPT_ParaAttr_Adjust, nVal, nDestinationInstance ) )
diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx
index 1a90fb301e7c..e2fd887ad02e 100644
--- a/include/editeng/acorrcfg.hxx
+++ b/include/editeng/acorrcfg.hxx
@@ -96,8 +96,8 @@ public:
     // the pointer is transferred to the possession of the ConfigItems!
     void SetAutoCorrect( SvxAutoCorrect* );
 
-    bool IsAutoFmtByInput() const       { return bAutoFmtByInput; }
-    void SetAutoFmtByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
+    bool IsAutoFormatByInput() const       { return bAutoFmtByInput; }
+    void SetAutoFormatByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
 
     bool IsSaveRelFile() const          { return bFileRel; }
     void SetSaveRelFile( bool bSet )    { bFileRel = bSet; aSwConfig.SetModified(); }
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 65a1bf12cc81..7dee5d66e039 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -24,7 +24,7 @@
 #include <editeng/editengdllapi.h>
 
 
-// class SvxFmtBreakItem -------------------------------------------------
+// class SvxFormatBreakItem -------------------------------------------------
 
 /*  [Description]
 
@@ -33,15 +33,15 @@
 */
 #define FMTBREAK_NOAUTO ((sal_uInt16)0x0001)
 
-class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxFormatBreakItem : public SfxEnumItem
 {
 public:
     TYPEINFO_OVERRIDE();
 
-    inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
+    inline SvxFormatBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
                             const sal_uInt16 nWhich );
-    inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak );
-    inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
+    inline SvxFormatBreakItem( const SvxFormatBreakItem& rBreak );
+    inline SvxFormatBreakItem& operator=( const SvxFormatBreakItem& rCpy );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -69,17 +69,17 @@ public:
 };
 
 
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
+inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak,
                                          const sal_uInt16 _nWhich ) :
     SfxEnumItem( _nWhich, (sal_uInt16)eBreak )
 {}
 
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) :
+inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxFormatBreakItem& rBreak ) :
     SfxEnumItem( rBreak )
 {}
 
-inline SvxFmtBreakItem& SvxFmtBreakItem::operator=(
-    const SvxFmtBreakItem& rBreak )
+inline SvxFormatBreakItem& SvxFormatBreakItem::operator=(
+    const SvxFormatBreakItem& rBreak )
 {
     SetValue( rBreak.GetValue() );
     return *this;
diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx
index 1092311baeda..4646cf75b919 100644
--- a/include/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
@@ -23,21 +23,21 @@
 #include <editeng/editengdllapi.h>
 
 
-// class SvxFmtKeepItem ------------------------------------------------
+// class SvxFormatKeepItem ------------------------------------------------
 
 /*  [Description]
 
     This item describes a logical variable "keep paragraphs together?".
 */
 
-class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFormatKeepItem : public SfxBoolItem
 {
 public:
     TYPEINFO_OVERRIDE();
 
-    inline SvxFmtKeepItem( const bool bKeep /*= false*/,
+    inline SvxFormatKeepItem( const bool bKeep /*= false*/,
                            const sal_uInt16 _nWhich  );
-    inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit );
+    inline SvxFormatKeepItem& operator=( const SvxFormatKeepItem& rSplit );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -50,11 +50,11 @@ public:
                                     OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
 };
 
-inline SvxFmtKeepItem::SvxFmtKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
+inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
     SfxBoolItem( _nWhich, bKeep )
 {}
 
-inline SvxFmtKeepItem& SvxFmtKeepItem::operator=( const SvxFmtKeepItem& rKeep )
+inline SvxFormatKeepItem& SvxFormatKeepItem::operator=( const SvxFormatKeepItem& rKeep )
 {
     SetValue( rKeep.GetValue() );
     return *this;
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 123264e9cd89..4e1b0796bbd6 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -36,7 +36,7 @@
     0 coordinate for the first line indent:
 
     UI         UI       LAYOUT   UI/TEXT      UI/TEXT    (Where?)
-    SetTxtLeft SetTxtFirst GetLeft  GetTxtLeft  GetTxtFirst  (What?)
+    SetTextLeft SetTxtFirst GetLeft  GetTextLeft  GetTxtFirst  (What?)
     500       -500        0        500         -500      (How much?)
     500         0        500       500           0
     500       +500       500       500         +500
@@ -115,16 +115,16 @@ public:
     inline sal_uInt16 GetPropRight() const { return nPropRightMargin;}
 
     // The UI/text interface:
-    inline void SetTxtLeft( const long nL, const sal_uInt16 nProp = 100 );
-    inline long GetTxtLeft() const { return nTxtLeft; }
+    inline void SetTextLeft( const long nL, const sal_uInt16 nProp = 100 );
+    inline long GetTextLeft() const { return nTxtLeft; }
 
-    inline void   SetTxtFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
-    inline short  GetTxtFirstLineOfst() const { return nFirstLineOfst; }
-    inline void SetPropTxtFirstLineOfst( const sal_uInt16 nProp = 100 )
+    inline void   SetTextFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
+    inline short  GetTextFirstLineOfst() const { return nFirstLineOfst; }
+    inline void SetPropTextFirstLineOfst( const sal_uInt16 nProp = 100 )
                     { nPropFirstLineOfst = nProp; }
-    inline sal_uInt16 GetPropTxtFirstLineOfst() const
+    inline sal_uInt16 GetPropTextFirstLineOfst() const
                     { return nPropFirstLineOfst; }
-    inline void SetTxtFirstLineOfstValue( const short nValue )
+    inline void SetTextFirstLineOfstValue( const short nValue )
                     { nFirstLineOfst = nValue; }
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
@@ -159,7 +159,7 @@ inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp )
     nRightMargin = (nR * nProp) / 100;
     nPropRightMargin = nProp;
 }
-inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
+inline void SvxLRSpaceItem::SetTextFirstLineOfst( const short nF,
                                                  const sal_uInt16 nProp )
 {
     nFirstLineOfst = short((long(nF) * nProp ) / 100);
@@ -167,7 +167,7 @@ inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
     AdjustLeft();
 }
 
-inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const sal_uInt16 nProp )
+inline void SvxLRSpaceItem::SetTextLeft( const long nL, const sal_uInt16 nProp )
 {
     if (0 == nL)
     {
diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc
index 1e9e623a8466..d3768a8237a1 100644
--- a/include/editeng/memberids.hrc
+++ b/include/editeng/memberids.hrc
@@ -172,7 +172,7 @@
 #define MID_BACK_COLOR_TRANSPARENCY 10
 #define MID_SHADING_VALUE       11
 
-//SvxFmtBreakItem
+//SvxFormatBreakItem
 #define MID_BREAK_BEFORE        0
 #define MID_BREAK_AFTER         1
 
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index ae7b3150d72c..bcf8b29b054a 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -71,7 +71,7 @@ public:
     void            SetShowSymbol(bool bSet) {bShowSymbol = bSet;}
     bool            IsShowSymbol()const{return bShowSymbol;}
 
-    bool            IsTxtFmt() const
+    bool            IsTextFormat() const
                     {
                         return com::sun::star::style::NumberingType::NUMBER_NONE != nNumType &&
                                com::sun::star::style::NumberingType::CHAR_SPECIAL != nNumType &&
@@ -163,8 +163,8 @@ public:
     void            SetSuffix(const OUString& rSet) { sSuffix = rSet;}
     const OUString&   GetSuffix() const { return sSuffix;}
 
-    void                    SetCharFmtName(const OUString& rSet){ sCharStyleName = rSet; }
-    virtual OUString        GetCharFmtName()const;
+    void                    SetCharFormatName(const OUString& rSet){ sCharStyleName = rSet; }
+    virtual OUString        GetCharFormatName()const;
 
     void            SetBulletFont(const vcl::Font* pFont);
     const vcl::Font* GetBulletFont() const {return pBulletFont;}
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 4b47caeb97ec..5a2dbe9f8cf9 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -524,14 +524,14 @@ public:
 
     const SvxFieldItem& GetField() const { return rFldItem; }
 
-    Color*          GetTxtColor() const { return pTxtColor; }
-    void            SetTxtColor( const Color& rColor )
+    Color*          GetTextColor() const { return pTxtColor; }
+    void            SetTextColor( const Color& rColor )
                         { delete pTxtColor; pTxtColor = new Color( rColor ); }
 
-    Color*          GetFldColor() const { return pFldColor; }
-    void            SetFldColor( const Color& rColor )
+    Color*          GetFieldColor() const { return pFldColor; }
+    void            SetFieldColor( const Color& rColor )
                         { delete pFldColor; pFldColor = new Color( rColor ); }
-    void            ClearFldColor()
+    void            ClearFieldColor()
                         { delete pFldColor; pFldColor = 0; }
 
     sal_Int32       GetPara() const { return nPara; }
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 66fa1a30d1ca..119a8dd3a4ba 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -57,10 +57,10 @@ public:
     virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const SAL_OVERRIDE;
     virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
 
-    bool IsCntntProtected() const { return bCntnt; }
+    bool IsContentProtected() const { return bCntnt; }
     bool IsSizeProtected()  const { return bSize;  }
     bool IsPosProtected()   const { return bPos;   }
-    void SetCntntProtect( bool bNew ) { bCntnt = bNew; }
+    void SetContentProtect( bool bNew ) { bCntnt = bNew; }
     void SetSizeProtect ( bool bNew ) { bSize  = bNew; }
     void SetPosProtect  ( bool bNew ) { bPos   = bNew; }
 
@@ -77,7 +77,7 @@ inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId )
 
 inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy )
 {
-    bCntnt = rCpy.IsCntntProtected();
+    bCntnt = rCpy.IsContentProtected();
     bSize  = rCpy.IsSizeProtected();
     bPos   = rCpy.IsPosProtected();
     return *this;
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index f84ce3b348bc..c5c8b769d8b5 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -24,22 +24,22 @@
 
 class SvXMLUnitConverter;
 
-// class SvxFmtSplitItem -------------------------------------------------
+// class SvxFormatSplitItem -------------------------------------------------
 
 /*  [Description]
 
     This item describes a logical variable "split paragraph yes or no".
 */
 
-class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFormatSplitItem : public SfxBoolItem
 {
 public:
     TYPEINFO_OVERRIDE();
-    virtual ~SvxFmtSplitItem();
+    virtual ~SvxFormatSplitItem();
 
-    inline SvxFmtSplitItem( const bool bSplit /*= true*/,
+    inline SvxFormatSplitItem( const bool bSplit /*= true*/,
                             const sal_uInt16 nWh  );
-    inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit );
+    inline SvxFormatSplitItem& operator=( const SvxFormatSplitItem& rSplit );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -52,12 +52,12 @@ public:
                                     OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
 };
 
-inline SvxFmtSplitItem::SvxFmtSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
+inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
     SfxBoolItem( nWh, bSplit )
 {}
 
-inline SvxFmtSplitItem& SvxFmtSplitItem::operator=(
-    const SvxFmtSplitItem& rSplit )
+inline SvxFormatSplitItem& SvxFormatSplitItem::operator=(
+    const SvxFormatSplitItem& rSplit )
 {
     SetValue( rSplit.GetValue() );
     return *this;
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index d4438d42d835..18fb82a31315 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -232,7 +232,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
 
     OUString sShareAutoCorrFile, sUserAutoCorrFile;
 
-    SvxSwAutoFmtFlags aSwFlags;     // StarWriter AutoFormat Flags
+    SvxSwAutoFormatFlags aSwFlags;     // StarWriter AutoFormat Flags
 
     // all languages in a table
     boost::ptr_map<LanguageTag, SvxAutoCorrectLanguageLists>* pLangTable;
@@ -328,7 +328,7 @@ public:
 
     // Query/Set the current settings of AutoCorrect
     long GetFlags() const                       { return nFlags; }
-    inline SvxSwAutoFmtFlags&   GetSwFlags()    { return aSwFlags;}
+    inline SvxSwAutoFormatFlags&   GetSwFlags()    { return aSwFlags;}
     bool IsAutoCorrFlag( long nFlag ) const
                                 { return (nFlags & nFlag) != 0; }
     void SetAutoCorrFlag( long nFlag, bool bOn = true );
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 51a0c0dcdde6..c84df967ac0d 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -89,7 +89,7 @@ public:
 
     Size GetPhysTxtSize( const OutputDevice *pOut, const OUString &rTxt );
 
-    Size GetTxtSize( const OutputDevice *pOut, const OUString &rTxt,
+    Size GetTextSize( const OutputDevice *pOut, const OUString &rTxt,
                       const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const;
 
     void QuickDrawText( OutputDevice *pOut, const Point &rPos, const OUString &rTxt,
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 39290ec9f376..42098f663220 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -225,7 +225,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
     // Execute pard / plain
     void RTFPardPlain( bool bPard, SfxItemSet** ppSet );
 
-    void BuildWhichTbl();
+    void BuildWhichTable();
 
     enum RTF_CharTypeDef
     {
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 7bfcb353f3e5..5cf829d94ff8 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -59,7 +59,7 @@ public:
 } // namespace editeng
 
 // Class of options for AutoFormat
-struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
+struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags
 {
     vcl::Font aBulletFont;
     vcl::Font aByInputBulletFont;
@@ -83,7 +83,7 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
     bool bChgUserColl : 1;
     bool bChgEnumNum : 1;
 
-    bool bAFmtByInput : 1;
+    bool bAFormatByInput : 1;
     bool bDelEmptyNode : 1;
     bool bSetNumRule : 1;
 
@@ -109,10 +109,10 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
     bool bAutoCmpltAppendBlanc : 1;
     bool bAutoCmpltShowAsTip : 1;
 
-    bool bAFmtDelSpacesAtSttEnd : 1;
-    bool bAFmtDelSpacesBetweenLines : 1;
-    bool bAFmtByInpDelSpacesAtSttEnd : 1;
-    bool bAFmtByInpDelSpacesBetweenLines : 1;
+    bool bAFormatDelSpacesAtSttEnd : 1;
+    bool bAFormatDelSpacesBetweenLines : 1;
+    bool bAFormatByInpDelSpacesAtSttEnd : 1;
+    bool bAFormatByInpDelSpacesBetweenLines : 1;
 
     bool bAutoCmpltKeepList : 1;
 
@@ -122,9 +122,9 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
          bDummy8 : 1
          ;
 
-    SvxSwAutoFmtFlags();
-    SvxSwAutoFmtFlags( const SvxSwAutoFmtFlags& rAFFlags ) { *this = rAFFlags; }
-    SvxSwAutoFmtFlags& operator=( const SvxSwAutoFmtFlags& );
+    SvxSwAutoFormatFlags();
+    SvxSwAutoFormatFlags( const SvxSwAutoFormatFlags& rAFFlags ) { *this = rAFFlags; }
+    SvxSwAutoFormatFlags& operator=( const SvxSwAutoFormatFlags& );
 };
 
 #endif
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index fc54adeaba6b..a3572ca48f7b 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -55,7 +55,7 @@ class Polygon;
 namespace tools { class PolyPolygon; }
 class FmFormModel;
 class SdrModel;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
 
 struct SvxMSDffBLIPInfo;
 struct SvxMSDffShapeInfo;
@@ -695,12 +695,12 @@ public:
     void StoreShapeOrder(sal_uLong      nId,
                          sal_uLong      nTxBx,
                          SdrObject*     pObject,
-                         SwFlyFrmFmt*   pFly = 0,
+                         SwFlyFrameFormat*   pFly = 0,
                          short          nHdFtSection = 0) const;
 
     void ExchangeInShapeOrder(SdrObject*    pOldObject,
                               sal_uLong     nTxBx,
-                              SwFlyFrmFmt*  pFly,
+                              SwFlyFrameFormat*  pFly,
                               SdrObject*    pObject) const;
 
     void RemoveFromShapeOrder( SdrObject* pObject ) const;
@@ -778,7 +778,7 @@ struct SvxMSDffShapeOrder
 {
     sal_uLong nShapeId;  ///< shape id used in PLCF SPA and in mso_fbtSp (FSP)
     sal_uLong nTxBxComp; ///< chain or box number in the Text-Box-Story (or NULL)
-    SwFlyFrmFmt* pFly;   ///< format of frame that was inserted as a replacement
+    SwFlyFrameFormat* pFly;   ///< format of frame that was inserted as a replacement
                          ///< for a Sdr-Text object in Writer - needed for
                          ///< chaining!
     short nHdFtSection;  ///< used by Writer to find out if linked frames are in
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index bc553c013966..0127662ebcfb 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -593,9 +593,9 @@ public:
     SvNumberFormatterIndexTable* MergeFormatter(SvNumberFormatter& rNewTable);
 
     /// Whether a merge table is present or not
-    bool HasMergeFmtTbl() const;
+    bool HasMergeFormatTable() const;
     /// Return the new format index for an old format index, if a merge table exists
-    sal_uInt32 GetMergeFmtIndex( sal_uInt32 nOldFmt ) const;
+    sal_uInt32 GetMergeFormatIndex( sal_uInt32 nOldFmt ) const;
 
     /** Convert the ugly old tools' Table type bloated with new'ed sal_uInt32
         entries merge table to ::std::map with old index key and new index key.
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index b8705dc16ffc..eabdf18c6807 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -169,7 +169,7 @@ public:
     // build a Which-Map 'rWhichMap' from an array of WhichIds
     // 'pWhichIds'. It has the length 'nWhichIds'.
     // The WhichMap is not deleted.
-    static void BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap,
+    static void BuildWhichTable( std::vector<sal_uInt16> &rWhichMap,
                                sal_uInt16 *pWhichIds,
                                sal_uInt16 nWhichIds );
 };
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 64ed0d94e832..6b00c35b14fd 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -28,7 +28,7 @@
 #include <svx/svxdllapi.h>
 
 class PopupMenu;
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
 
 class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipBoardControl : public SfxToolBoxControl
 {
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index e8a9453f2da8..052ed8ffc6e7 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -24,11 +24,11 @@
 #include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
 
-struct SvxClipboardFmtItem_Impl;
+struct SvxClipboardFormatItem_Impl;
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFmtItem : public SfxPoolItem
+class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFormatItem : public SfxPoolItem
 {
-    SvxClipboardFmtItem_Impl* pImpl;
+    SvxClipboardFormatItem_Impl* pImpl;
 protected:
 
     virtual bool             operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -36,9 +36,9 @@ protected:
 
 public:
     TYPEINFO_OVERRIDE();
-    SvxClipboardFmtItem( sal_uInt16 nId = 0 );
-    SvxClipboardFmtItem( const SvxClipboardFmtItem& );
-    virtual ~SvxClipboardFmtItem();
+    SvxClipboardFormatItem( sal_uInt16 nId = 0 );
+    SvxClipboardFormatItem( const SvxClipboardFormatItem& );
+    virtual ~SvxClipboardFormatItem();
 
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index a448aa120844..06c4af78bfbb 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -87,7 +87,7 @@ public:
     void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro );
 
     void SetMacroTable( const SvxMacroTableDtor& rTbl );
-    const SvxMacroTableDtor* GetMacroTbl() const    { return pMacroTable; }
+    const SvxMacroTableDtor* GetMacroTable() const    { return pMacroTable; }
 
     void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; }
     sal_uInt16 GetMacroEvents() const { return nMacroEvents; }
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 9aeee8d1c8c1..68b8072ebfa0 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -48,23 +48,23 @@ public:
     SvxOptionsGrid();
     ~SvxOptionsGrid();
 
-    void    SetFldDrawX(    sal_uInt32 nSet){nFldDrawX      = nSet;}
-    void    SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX  = nSet;}
-    void    SetFldDrawY   ( sal_uInt32 nSet){nFldDrawY      = nSet;}
-    void    SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY  = nSet;}
-    void    SetFldSnapX(    sal_uInt32 nSet){nFldSnapX      = nSet;}
-    void    SetFldSnapY   ( sal_uInt32 nSet){nFldSnapY      = nSet;}
+    void    SetFieldDrawX(    sal_uInt32 nSet){nFldDrawX      = nSet;}
+    void    SetFieldDivisionX(sal_uInt32 nSet){nFldDivisionX  = nSet;}
+    void    SetFieldDrawY   ( sal_uInt32 nSet){nFldDrawY      = nSet;}
+    void    SetFieldDivisionY(sal_uInt32 nSet){nFldDivisionY  = nSet;}
+    void    SetFieldSnapX(    sal_uInt32 nSet){nFldSnapX      = nSet;}
+    void    SetFieldSnapY   ( sal_uInt32 nSet){nFldSnapY      = nSet;}
     void    SetUseGridSnap( bool bSet ) {bUseGridsnap   = bSet;}
     void    SetSynchronize( bool bSet ) {bSynchronize   = bSet;}
     void    SetGridVisible( bool bSet ) {bGridVisible   = bSet;}
     void    SetEqualGrid( bool bSet )   {bEqualGrid     = bSet;}
 
-    sal_uInt32  GetFldDrawX(    ) const {  return nFldDrawX;    }
-    sal_uInt32  GetFldDivisionX() const {  return nFldDivisionX;}
-    sal_uInt32  GetFldDrawY   ( ) const {  return nFldDrawY;    }
-    sal_uInt32  GetFldDivisionY() const {  return nFldDivisionY;}
-    sal_uInt32  GetFldSnapX(    ) const {  return nFldSnapX;    }
-    sal_uInt32  GetFldSnapY   ( ) const {  return nFldSnapY;    }
+    sal_uInt32  GetFieldDrawX(    ) const {  return nFldDrawX;    }
+    sal_uInt32  GetFieldDivisionX() const {  return nFldDivisionX;}
+    sal_uInt32  GetFieldDrawY   ( ) const {  return nFldDrawY;    }
+    sal_uInt32  GetFieldDivisionY() const {  return nFldDivisionY;}
+    sal_uInt32  GetFieldSnapX(    ) const {  return nFldSnapX;    }
+    sal_uInt32  GetFieldSnapY   ( ) const {  return nFldSnapY;    }
     bool        GetUseGridSnap( ) const {  return bUseGridsnap; }
     bool        GetSynchronize( ) const {  return bSynchronize; }
     bool        GetGridVisible( ) const {  return bGridVisible; }
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 32f6223c8976..f1c529ad2064 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -178,12 +178,12 @@ SvxGridItem* ScViewOptions::CreateGridItem( sal_uInt16 nId /* = SID_ATTR_GRID_OP
 {
     SvxGridItem* pItem = new SvxGridItem( nId );
 
-    pItem->SetFldDrawX      ( aGridOpt.GetFldDrawX() );
-    pItem->SetFldDivisionX  ( aGridOpt.GetFldDivisionX() );
-    pItem->SetFldDrawY      ( aGridOpt.GetFldDrawY() );
-    pItem->SetFldDivisionY  ( aGridOpt.GetFldDivisionY() );
-    pItem->SetFldSnapX      ( aGridOpt.GetFldSnapX() );
-    pItem->SetFldSnapY      ( aGridOpt.GetFldSnapY() );
+    pItem->SetFieldDrawX      ( aGridOpt.GetFieldDrawX() );
+    pItem->SetFieldDivisionX  ( aGridOpt.GetFieldDivisionX() );
+    pItem->SetFieldDrawY      ( aGridOpt.GetFieldDrawY() );
+    pItem->SetFieldDivisionY  ( aGridOpt.GetFieldDivisionY() );
+    pItem->SetFieldSnapX      ( aGridOpt.GetFieldSnapX() );
+    pItem->SetFieldSnapY      ( aGridOpt.GetFieldSnapY() );
     pItem->SetUseGridSnap   ( aGridOpt.GetUseGridSnap() );
     pItem->SetSynchronize   ( aGridOpt.GetSynchronize() );
     pItem->SetGridVisible   ( aGridOpt.GetGridVisible() );
@@ -483,22 +483,22 @@ ScViewCfg::ScViewCfg() :
                 switch(nProp)
                 {
                     case SCGRIDOPT_RESOLU_X:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldDrawX( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawX( nIntVal );
                         break;
                     case SCGRIDOPT_RESOLU_Y:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldDrawY( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawY( nIntVal );
                         break;
                     case SCGRIDOPT_SUBDIV_X:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldDivisionX( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDivisionX( nIntVal );
                         break;
                     case SCGRIDOPT_SUBDIV_Y:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldDivisionY( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDivisionY( nIntVal );
                         break;
                     case SCGRIDOPT_OPTION_X:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldSnapX( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldSnapX( nIntVal );
                         break;
                     case SCGRIDOPT_OPTION_Y:
-                        if (pValues[nProp] >>= nIntVal) aGrid.SetFldSnapY( nIntVal );
+                        if (pValues[nProp] >>= nIntVal) aGrid.SetFieldSnapY( nIntVal );
                         break;
                     case SCGRIDOPT_SNAPTOGRID:
                         aGrid.SetUseGridSnap( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
@@ -624,22 +624,22 @@ IMPL_LINK_NOARG(ScViewCfg, GridCommitHdl)
         switch(nProp)
         {
             case SCGRIDOPT_RESOLU_X:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldDrawX();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDrawX();
                 break;
             case SCGRIDOPT_RESOLU_Y:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldDrawY();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDrawY();
                 break;
             case SCGRIDOPT_SUBDIV_X:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldDivisionX();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDivisionX();
                 break;
             case SCGRIDOPT_SUBDIV_Y:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldDivisionY();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDivisionY();
                 break;
             case SCGRIDOPT_OPTION_X:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldSnapX();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapX();
                 break;
             case SCGRIDOPT_OPTION_Y:
-                pValues[nProp] <<= (sal_Int32) rGrid.GetFldSnapY();
+                pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapY();
                 break;
             case SCGRIDOPT_SNAPTOGRID:
                 ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], rGrid.GetUseGridSnap() );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index f2b7b1bbffbb..c135b531975a 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2172,7 +2172,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo )
 
             svtools::ColorConfigEntry eEntry =
                 INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS;
-            pInfo->SetTxtColor( GetColorConfig().GetColorValue(eEntry).nColor );
+            pInfo->SetTextColor( GetColorConfig().GetColorValue(eEntry).nColor );
         }
         else
         {
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index 973d63f1c907..171e4c3980ee 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -111,7 +111,7 @@
 #define aSfxUInt32Item_Impl sc_source_ui_appl_typemap_aSfxUInt32Item_Impl
 #define aSfxVoidItem_Impl sc_source_ui_appl_typemap_aSfxVoidItem_Impl
 #define aSvxCharReliefItem_Impl sc_source_ui_appl_typemap_aSvxCharReliefItem_Impl
-#define aSvxClipboardFmtItem_Impl sc_source_ui_appl_typemap_aSvxClipboardFmtItem_Impl
+#define aSvxClipboardFormatItem_Impl sc_source_ui_appl_typemap_aSvxClipboardFormatItem_Impl
 #define aSvxColorItem_Impl sc_source_ui_appl_typemap_aSvxColorItem_Impl
 #define aSvxContourItem_Impl sc_source_ui_appl_typemap_aSvxContourItem_Impl
 #define aSvxCrossedOutItem_Impl sc_source_ui_appl_typemap_aSvxCrossedOutItem_Impl
@@ -136,7 +136,7 @@
 #undef aSfxUInt32Item_Impl
 #undef aSfxVoidItem_Impl
 #undef aSvxCharReliefItem_Impl
-#undef aSvxClipboardFmtItem_Impl
+#undef aSvxClipboardFormatItem_Impl
 #undef aSvxColorItem_Impl
 #undef aSvxContourItem_Impl
 #undef aSvxCrossedOutItem_Impl
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index ce261fb3aa8f..ae5bb94123e1 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -524,7 +524,7 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
             case SID_CLIPBOARD_FORMAT_ITEMS:
                 if ( bPastePossible )
                 {
-                    SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+                    SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
                     TransferableDataHelper aDataHelper(
                             TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
 
@@ -913,8 +913,8 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
             SfxItemSet aAttr( GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE );
             nId = EE_PARA_LRSPACE;
             SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(),
-                rItem.GetRight(), rItem.GetTxtLeft(),
-                rItem.GetTxtFirstLineOfst(), nId );
+                rItem.GetRight(), rItem.GetTextLeft(),
+                rItem.GetTextFirstLineOfst(), nId );
             aAttr.Put( aLRSpaceItem );
             pView->SetAttributes( aAttr );
         }
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index a2e6a82ebde9..1c03ba30758d 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -86,8 +86,8 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
     // aNewAttr.Put( SvxParaDlgLimitsItem( 567 * 50, 5670) );
 
     aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
-    aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
-    aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT)  );
+    aNewAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
+    aNewAttr.Put( SvxFormatSplitItem( true, SID_ATTR_PARA_SPLIT)  );
     aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
     aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
 
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 3beb0784296a..6e03ef1e5d0c 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -29,7 +29,7 @@
 #include "formatsh.hxx"
 #include "address.hxx"
 
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
 class TransferableDataHelper;
 class TransferableClipboardListener;
 class AbstractScLinkedAreaDlg;
@@ -52,7 +52,7 @@ private:
     CellShell_Impl* pImpl;
     bool            bPastePossible;
 
-    void        GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats );
+    void        GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats );
     void        ExecuteExternalSource(
                     const OUString& _rFile, const OUString& _rFilter, const OUString& _rOptions,
                     const OUString& _rSource, sal_uLong _nRefresh, SfxRequest& _rRequest );
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 728d17c5f8fd..a56c36f8293f 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -306,13 +306,13 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
             else if ( aPropertyName == SC_UNO_RASTERVIS )
                 aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
             else if ( aPropertyName == SC_UNO_RASTERRESX )
-                aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+                aGridOpt.SetFieldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
             else if ( aPropertyName == SC_UNO_RASTERRESY )
-                aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+                aGridOpt.SetFieldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
             else if ( aPropertyName == SC_UNO_RASTERSUBX )
-                aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+                aGridOpt.SetFieldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
             else if ( aPropertyName == SC_UNO_RASTERSUBY )
-                aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+                aGridOpt.SetFieldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
             else if ( aPropertyName == SC_UNO_RASTERSYNC )
                 aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
             else
@@ -442,13 +442,13 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
             else if ( aPropertyName == SC_UNO_RASTERVIS )
                 ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetGridVisible() );
             else if ( aPropertyName == SC_UNO_RASTERRESX )
-                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() );
+                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawX() );
             else if ( aPropertyName == SC_UNO_RASTERRESY )
-                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() );
+                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawY() );
             else if ( aPropertyName == SC_UNO_RASTERSUBX )
-                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() );
+                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionX() );
             else if ( aPropertyName == SC_UNO_RASTERSUBY )
-                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() );
+                aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionY() );
             else if ( aPropertyName == SC_UNO_RASTERSYNC )
                 ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetSynchronize() );
             else
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index b8627ba945c1..aba13687fb3f 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -365,7 +365,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
     }
 }
 
-static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHelper& rDataHelper,
+static bool lcl_TestFormat( SvxClipboardFormatItem& rFormats, const TransferableDataHelper& rDataHelper,
                         SotClipboardFormatId nFormatId )
 {
     if ( rDataHelper.HasFormat( nFormatId ) )
@@ -399,7 +399,7 @@ static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDat
     return false;
 }
 
-void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats )
+void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats )
 {
     vcl::Window* pWin = GetViewData()->GetActiveWin();
     bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
@@ -569,7 +569,7 @@ void ScCellShell::GetClipState( SfxItemSet& rSet )
     }
     else if ( rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) != SfxItemState::UNKNOWN )
     {
-        SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+        SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
         GetPossibleClipboardFormats( aFormats );
         rSet.Put( aFormats );
     }
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 1b81de7c4eb7..6fd0e5074493 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1564,7 +1564,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     {
                         bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
 
-                        SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+                        SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
                         GetPossibleClipboardFormats( aFormats );
 
                         sal_uInt16 nFormatCount = aFormats.Count();
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 94b89305b738..2c258c6e7662 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -612,13 +612,13 @@ void ScDrawView::UpdateUserViewOptions()
         SetSnapEnabled( rGrid.GetUseGridSnap() );
         SetGridSnap( rGrid.GetUseGridSnap() );
 
-        Fraction aFractX( rGrid.GetFldDrawX(), rGrid.GetFldDivisionX() + 1 );
-        Fraction aFractY( rGrid.GetFldDrawY(), rGrid.GetFldDivisionY() + 1 );
+        Fraction aFractX( rGrid.GetFieldDrawX(), rGrid.GetFieldDivisionX() + 1 );
+        Fraction aFractY( rGrid.GetFieldDrawY(), rGrid.GetFieldDivisionY() + 1 );
         SetSnapGridWidth( aFractX, aFractY );
 
-        SetGridCoarse( Size( rGrid.GetFldDrawX(), rGrid.GetFldDrawY() ) );
-        SetGridFine( Size( rGrid.GetFldDrawX() / (rGrid.GetFldDivisionX() + 1),
-                           rGrid.GetFldDrawY() / (rGrid.GetFldDivisionY() + 1) ) );
+        SetGridCoarse( Size( rGrid.GetFieldDrawX(), rGrid.GetFieldDrawY() ) );
+        SetGridFine( Size( rGrid.GetFieldDrawX() / (rGrid.GetFieldDivisionX() + 1),
+                           rGrid.GetFieldDrawY() / (rGrid.GetFieldDivisionY() + 1) ) );
     }
 }
 
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 763157ff21bf..ea1a91265caa 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -801,7 +801,7 @@ void ScEditShell::GetClipState( SfxItemSet& rSet )
             case SID_CLIPBOARD_FORMAT_ITEMS:
                 if( bPastePossible )
                 {
-                    SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+                    SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
                     TransferableDataHelper aDataHelper(
                             TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
 
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index a2872ba3ca5a..22d46dcd7f05 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2722,13 +2722,13 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe
             pSettings[SC_RASTERVIS].Name = SC_UNO_RASTERVIS;
             ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERVIS].Value, aGridOpt.GetGridVisible() );
             pSettings[SC_RASTERRESX].Name = SC_UNO_RASTERRESX;
-            pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() );
+            pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawX() );
             pSettings[SC_RASTERRESY].Name = SC_UNO_RASTERRESY;
-            pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() );
+            pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawY() );
             pSettings[SC_RASTERSUBX].Name = SC_UNO_RASTERSUBX;
-            pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() );
+            pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionX() );
             pSettings[SC_RASTERSUBY].Name = SC_UNO_RASTERSUBY;
-            pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() );
+            pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionY() );
             pSettings[SC_RASTERSYNC].Name = SC_UNO_RASTERSYNC;
             ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERSYNC].Value, aGridOpt.GetSynchronize() );
         }
@@ -2878,13 +2878,13 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
             else if ( sName == SC_UNO_RASTERVIS )
                 aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
             else if ( sName == SC_UNO_RASTERRESX )
-                aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+                aGridOpt.SetFieldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
             else if ( sName == SC_UNO_RASTERRESY )
-                aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+                aGridOpt.SetFieldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
             else if ( sName == SC_UNO_RASTERSUBX )
-                aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+                aGridOpt.SetFieldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
             else if ( sName == SC_UNO_RASTERSUBY )
-                aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+                aGridOpt.SetFieldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
             else if ( sName == SC_UNO_RASTERSYNC )
                 aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
             pOptions->SetGridOptions(aGridOpt);
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 2b26fda54c1e..b9b4558adf4f 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -356,7 +356,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
-    aLRSpaceItem.SetTxtFirstLineOfst(600);      // Indentation of first line: 6mm; right: 0
+    aLRSpaceItem.SetTextFirstLineOfst(600);      // Indentation of first line: 6mm; right: 0
     pISet->Put(aLRSpaceItem);
 
     // Title
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 3c8e33b0958a..5a8de34029fe 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2164,7 +2164,7 @@ SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, P
 
             const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>( aSet.Get(EE_PARA_LRSPACE) );
             SvxLRSpaceItem aNewLRItem(rLRItem);
-            aNewLRItem.SetTxtLeft(0);
+            aNewLRItem.SetTextLeft(0);
             aSet.Put(aNewLRItem);
 
             pNewObj->SetMergedItemSet(aSet);
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 944c77ebb2d3..f4eee3948da8 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -417,7 +417,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
         // #i16874# enable kerning by default but only for new documents
         rSubtitleSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) );
-        aSvxLRSpaceItem.SetTxtLeft(0);
+        aSvxLRSpaceItem.SetTextLeft(0);
         rSubtitleSet.Put(aSvxLRSpaceItem);
 
         vcl::Font aTmpFont( GetBulletFont() );
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 223f4c39e41d..a3b018cddec7 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -576,11 +576,11 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems)
         if (rSet.GetItemState(EE_PARA_LRSPACE) != SfxItemState::SET || !bOnlyMissingItems)
         {
             const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>(pCurSet->Get(EE_PARA_LRSPACE));
-            double fIndentFraction = double(rLRItem.GetTxtLeft()) / nOldHeight;
+            double fIndentFraction = double(rLRItem.GetTextLeft()) / nOldHeight;
             SvxLRSpaceItem aNewLRItem(rLRItem);
-            aNewLRItem.SetTxtLeft(fIndentFraction * nNewHeight);
-            double fFirstIndentFraction = double(rLRItem.GetTxtFirstLineOfst()) / nOldHeight;
-            aNewLRItem.SetTxtFirstLineOfst((short)(fFirstIndentFraction * nNewHeight));
+            aNewLRItem.SetTextLeft(fIndentFraction * nNewHeight);
+            double fFirstIndentFraction = double(rLRItem.GetTextFirstLineOfst()) / nOldHeight;
+            aNewLRItem.SetTextFirstLineOfst((short)(fFirstIndentFraction * nNewHeight));
             rSet.Put(aNewLRItem);
         }
 
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index fa6dd6c3a4cb..46a986dee476 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -299,10 +299,10 @@ bool SdTransformOOo2xDocument::transformItemSet( SfxItemSet& rSet, bool bNumberi
     if( bNumbering )
     {
         SvxLRSpaceItem aItem( *static_cast<const SvxLRSpaceItem*>(rSet.GetItem( EE_PARA_LRSPACE )) );
-        if( (aItem.GetLeft() != 0) || (aItem.GetTxtFirstLineOfst() != 0) )
+        if( (aItem.GetLeft() != 0) || (aItem.GetTextFirstLineOfst() != 0) )
         {
             aItem.SetLeftValue( 0 );
-            aItem.SetTxtFirstLineOfst( 0 );
+            aItem.SetTextFirstLineOfst( 0 );
             rSet.Put( aItem );
             bRet = true;
         }
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index f16a6af69c9e..4e8ef7296313 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -992,12 +992,12 @@ void SdOptionsGrid::SetDefaults()
 {
     const sal_uInt32 nVal = 1000;
 
-    SetFldDivisionX( nVal );
-    SetFldDivisionY( nVal );
-    SetFldDrawX( nVal );
-    SetFldDrawY( nVal );
-    SetFldSnapX( nVal );
-    SetFldSnapY( nVal );
+    SetFieldDivisionX( nVal );
+    SetFieldDivisionY( nVal );
+    SetFieldDrawX( nVal );
+    SetFieldDrawY( nVal );
+    SetFieldSnapX( nVal );
+    SetFieldSnapY( nVal );
     SetUseGridSnap( false );
     SetSynchronize( true );
     SetGridVisible( false );
@@ -1006,12 +1006,12 @@ void SdOptionsGrid::SetDefaults()
 
 bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const
 {
-    return( GetFldDrawX() == rOpt.GetFldDrawX() &&
-            GetFldDivisionX() == rOpt.GetFldDivisionX() &&
-            GetFldDrawY() == rOpt.GetFldDrawY() &&
-            GetFldDivisionY() == rOpt.GetFldDivisionY() &&
-            GetFldSnapX() == rOpt.GetFldSnapX() &&
-            GetFldSnapY() == rOpt.GetFldSnapY() &&
+    return( GetFieldDrawX() == rOpt.GetFieldDrawX() &&
+            GetFieldDivisionX() == rOpt.GetFieldDivisionX() &&
+            GetFieldDrawY() == rOpt.GetFieldDrawY() &&
+            GetFieldDivisionY() == rOpt.GetFieldDivisionY() &&
+            GetFieldSnapX() == rOpt.GetFieldSnapX() &&
+            GetFieldSnapY() == rOpt.GetFieldSnapY() &&
             IsUseGridSnap() == rOpt.IsUseGridSnap() &&
             IsSynchronize() == rOpt.IsSynchronize() &&
             IsGridVisible() == rOpt.IsGridVisible() &&
@@ -1060,23 +1060,23 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
 
 bool SdOptionsGrid::ReadData( const Any* pValues )
 {
-    if( pValues[0].hasValue() ) SetFldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) );
-    if( pValues[1].hasValue() ) SetFldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) );
+    if( pValues[0].hasValue() ) SetFieldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) );
+    if( pValues[1].hasValue() ) SetFieldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) );
 
     if( pValues[2].hasValue() )
     {
         const sal_uInt32 nDivX = FRound( *static_cast<double const *>(pValues[ 2 ].getValue()) );
-        SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) );
+        SetFieldDivisionX( SvxOptionsGrid::GetFieldDrawX() / ( nDivX + 1 ) );
     }
 
     if( pValues[3].hasValue() )
     {
         const sal_uInt32 nDivY = FRound( *static_cast<double const *>(pValues[ 3 ].getValue()) );
-        SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) );
+        SetFieldDivisionY( SvxOptionsGrid::GetFieldDrawY() / ( nDivY + 1 ) );
     }
 
-    if( pValues[4].hasValue() ) SetFldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) );
-    if( pValues[5].hasValue() ) SetFldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) );
+    if( pValues[4].hasValue() ) SetFieldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) );
+    if( pValues[5].hasValue() ) SetFieldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) );
     if( pValues[6].hasValue() ) SetUseGridSnap( *static_cast<sal_Bool const *>(pValues[ 6 ].getValue()) );
     if( pValues[7].hasValue() ) SetSynchronize( *static_cast<sal_Bool const *>(pValues[ 7 ].getValue()) );
     if( pValues[8].hasValue() ) SetGridVisible( *static_cast<sal_Bool const *>(pValues[ 8 ].getValue()) );
@@ -1087,12 +1087,12 @@ bool SdOptionsGrid::ReadData( const Any* pValues )
 
 bool SdOptionsGrid::WriteData( Any* pValues ) const
 {
-    pValues[ 0 ] <<= (sal_Int32) GetFldDrawX();
-    pValues[ 1 ] <<= (sal_Int32) GetFldDrawY();
-    pValues[ 2 ] <<= ( GetFldDivisionX() ? ( (double) GetFldDrawX() / GetFldDivisionX() - 1.0 ) : (double) 0 );
-    pValues[ 3 ] <<= ( GetFldDivisionY() ? ( (double) GetFldDrawY() / GetFldDivisionY() - 1.0 ) : (double) 0 );
-    pValues[ 4 ] <<= (sal_Int32) GetFldSnapX();
-    pValues[ 5 ] <<= (sal_Int32) GetFldSnapY();
+    pValues[ 0 ] <<= (sal_Int32) GetFieldDrawX();
+    pValues[ 1 ] <<= (sal_Int32) GetFieldDrawY();
+    pValues[ 2 ] <<= ( GetFieldDivisionX() ? ( (double) GetFieldDrawX() / GetFieldDivisionX() - 1.0 ) : (double) 0 );
+    pValues[ 3 ] <<= ( GetFieldDivisionY() ? ( (double) GetFieldDrawY() / GetFieldDivisionY() - 1.0 ) : (double) 0 );
+    pValues[ 4 ] <<= (sal_Int32) GetFieldSnapX();
+    pValues[ 5 ] <<= (sal_Int32) GetFieldSnapY();
     pValues[ 6 ] <<= IsUseGridSnap();
     pValues[ 7 ] <<= IsSynchronize();
     pValues[ 8 ] <<= IsGridVisible();
@@ -1115,23 +1115,23 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
 
     if( pView )
     {
-        SetFldDrawX( pView->GetGridCoarse().Width() );
-        SetFldDrawY( pView->GetGridCoarse().Height() );
-        SetFldDivisionX( pView->GetGridFine().Width() ? ( GetFldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 );
-        SetFldDivisionY( pView->GetGridFine().Height() ? ( GetFldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 );
-        SetFldSnapX( long(pView->GetSnapGridWidthX()) );
-        SetFldSnapY( long(pView->GetSnapGridWidthY()) );
+        SetFieldDrawX( pView->GetGridCoarse().Width() );
+        SetFieldDrawY( pView->GetGridCoarse().Height() );
+        SetFieldDivisionX( pView->GetGridFine().Width() ? ( GetFieldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 );
+        SetFieldDivisionY( pView->GetGridFine().Height() ? ( GetFieldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 );
+        SetFieldSnapX( long(pView->GetSnapGridWidthX()) );
+        SetFieldSnapY( long(pView->GetSnapGridWidthY()) );
         SetUseGridSnap( pView->IsGridSnap() );
         SetGridVisible( pView->IsGridVisible() );
     }
     else
     {
-        SetFldDrawX( pOpts->GetFldDrawX() );
-        SetFldDrawY( pOpts->GetFldDrawY() );
-        SetFldDivisionX( pOpts->GetFldDivisionX() ? ( pOpts->GetFldDrawX() / pOpts->GetFldDivisionX() - 1 ) : 0 );
-        SetFldDivisionY( pOpts->GetFldDivisionY() ? ( pOpts->GetFldDrawY() / pOpts->GetFldDivisionY() - 1 ) : 0 );
-        SetFldSnapX( pOpts->GetFldSnapX() );
-        SetFldSnapY( pOpts->GetFldSnapY() );
+        SetFieldDrawX( pOpts->GetFieldDrawX() );
+        SetFieldDrawY( pOpts->GetFieldDrawY() );
+        SetFieldDivisionX( pOpts->GetFieldDivisionX() ? ( pOpts->GetFieldDrawX() / pOpts->GetFieldDivisionX() - 1 ) : 0 );
+        SetFieldDivisionY( pOpts->GetFieldDivisionY() ? ( pOpts->GetFieldDrawY() / pOpts->GetFieldDivisionY() - 1 ) : 0 );
+        SetFieldSnapX( pOpts->GetFieldSnapX() );
+        SetFieldSnapY( pOpts->GetFieldSnapY() );
         SetUseGridSnap( pOpts->IsUseGridSnap() );
         SetGridVisible( pOpts->IsGridVisible() );
     }
@@ -1139,12 +1139,12 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
 
 void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const
 {
-    pOpts->SetFldDrawX( GetFldDrawX() );
-    pOpts->SetFldDivisionX( GetFldDrawX() / ( GetFldDivisionX() + 1 ) );
-    pOpts->SetFldDrawY( GetFldDrawY() );
-    pOpts->SetFldDivisionY( GetFldDrawY() / ( GetFldDivisionY() + 1 ) );
-    pOpts->SetFldSnapX( GetFldSnapX() );
-    pOpts->SetFldSnapY( GetFldSnapY() );
+    pOpts->SetFieldDrawX( GetFieldDrawX() );
+    pOpts->SetFieldDivisionX( GetFieldDrawX() / ( GetFieldDivisionX() + 1 ) );
+    pOpts->SetFieldDrawY( GetFieldDrawY() );
+    pOpts->SetFieldDivisionY( GetFieldDrawY() / ( GetFieldDivisionY() + 1 ) );
+    pOpts->SetFieldSnapX( GetFieldSnapX() );
+    pOpts->SetFieldSnapY( GetFieldSnapY() );
     pOpts->SetUseGridSnap( GetUseGridSnap() );
     pOpts->SetSynchronize( GetSynchronize() );
     pOpts->SetGridVisible( GetGridVisible() );
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index a817f5ed2767..da621f689b55 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -334,11 +334,11 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
             svtools::ColorConfig aConfig;
             svtools::ColorConfigEntry eEntry =
                 INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS;
-            pInfo->SetTxtColor( aConfig.GetColorValue(eEntry).nColor );
+            pInfo->SetTextColor( aConfig.GetColorValue(eEntry).nColor );
         }
         else if ( dynamic_cast< const SdrMeasureField* >(pField))
         {
-            pInfo->ClearFldColor();
+            pInfo->ClearFieldColor();
         }
         else
         {
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index 7d1393ac2108..fc4031d03d8b 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -78,7 +78,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
         aNewAttr.Put( aEditAttr );
 
         // left border is offset
-        const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTxtLeft();
+        const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTextLeft();
         // conversion since TabulatorTabPage always uses Twips!
         SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff );
         aNewAttr.Put( aOff );
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 73f17fb8577e..405e7af90876 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -42,7 +42,7 @@ class TransferableDataHelper;
 class TransferableClipboardListener;
 class AbstractSvxNameDialog;
 class SdrLayer;
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
 struct ESelection;
 
 namespace sd {
@@ -431,7 +431,7 @@ private:
         content that are supported both by that content and by the
         DrawViewShell.
     */
-    ::std::unique_ptr<SvxClipboardFmtItem> mpCurrentClipboardFormats;
+    ::std::unique_ptr<SvxClipboardFormatItem> mpCurrentClipboardFormats;
 
     /** On some occasions it is necessary to make SwitchPage calls
         asynchronously.
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index f2bb07312507..4e13f9725fe0 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -456,23 +456,23 @@ public:
     void    SetDefaults();
     bool    operator==( const SdOptionsGrid& rOpt ) const;
 
-    sal_uInt32  GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); }
-    sal_uInt32  GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); }
-    sal_uInt32  GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); }
-    sal_uInt32  GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); }
-    sal_uInt32  GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); }
-    sal_uInt32  GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); }
+    sal_uInt32  GetFieldDrawX() const { Init(); return SvxOptionsGrid::GetFieldDrawX(); }
+    sal_uInt32  GetFieldDivisionX() const { Init(); return SvxOptionsGrid::GetFieldDivisionX(); }
+    sal_uInt32  GetFieldDrawY() const { Init(); return SvxOptionsGrid::GetFieldDrawY(); }
+    sal_uInt32  GetFieldDivisionY() const { Init(); return SvxOptionsGrid::GetFieldDivisionY(); }
+    sal_uInt32  GetFieldSnapX() const { Init(); return SvxOptionsGrid::GetFieldSnapX(); }
+    sal_uInt32  GetFieldSnapY() const { Init(); return SvxOptionsGrid::GetFieldSnapY(); }
     bool    IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); }
     bool    IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); }
     bool    IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); }
     bool    IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); }
 
-    void    SetFldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } }
-    void    SetFldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } }
-    void    SetFldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } }
-    void    SetFldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } }
-    void    SetFldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } }
-    void    SetFldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } }
+    void    SetFieldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawX( nSet ); } }
+    void    SetFieldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionX( nSet ); } }
+    void    SetFieldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawY( nSet ); } }
+    void    SetFieldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionY( nSet ); } }
+    void    SetFieldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldSnapX( nSet ); } }
+    void    SetFieldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldSnapY( nSet ); } }
     void    SetUseGridSnap( bool bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } }
     void    SetSynchronize( bool bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } }
     void    SetGridVisible( bool bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } }
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index ac9ecbca1f6a..22ca54640576 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -782,8 +782,8 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
 
                 nId = EE_PARA_LRSPACE;
                 SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(),
-                        rItem.GetRight(), rItem.GetTxtLeft(),
-                        rItem.GetTxtFirstLineOfst(), nId );
+                        rItem.GetRight(), rItem.GetTextLeft(),
+                        rItem.GetTextFirstLineOfst(), nId );
 
                 const sal_Int16 nOutlineLevel = static_cast<const SfxInt16Item&>(aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
                 const SvxLRSpaceItem& rOrigLRSpaceItem = static_cast<const SvxLRSpaceItem&>( aEditAttr.Get( EE_PARA_LRSPACE ));
@@ -801,28 +801,28 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
                     // become negative - EditEngine really does not
                     // like that.
                     const short nAbsLSpace=aFormat.GetAbsLSpace();
-                    const long  nTxtLeft=rItem.GetTxtLeft();
+                    const long  nTxtLeft=rItem.GetTextLeft();
                     const long  nLeftIndent=std::max(0L,nTxtLeft - nAbsLSpace);
-                    aLRSpaceItem.SetTxtLeft(nLeftIndent);
+                    aLRSpaceItem.SetTextLeft(nLeftIndent);
                     // control for clipped left indent - remainder
                     // reduces number format first line indent
                     aFormat.SetAbsLSpace(nTxtLeft - nLeftIndent);
 
                     // negative first line indent goes to the number
                     // format, positive to the lrSpace item
-                    if( rItem.GetTxtFirstLineOfst() < 0 )
+                    if( rItem.GetTextFirstLineOfst() < 0 )
                     {
                         aFormat.SetFirstLineOffset(
-                            rItem.GetTxtFirstLineOfst()
-                            - rOrigLRSpaceItem.GetTxtFirstLineOfst()
+                            rItem.GetTextFirstLineOfst()
+                            - rOrigLRSpaceItem.GetTextFirstLineOfst()
                             + aFormat.GetCharTextDistance());
-                        aLRSpaceItem.SetTxtFirstLineOfst(0);
+                        aLRSpaceItem.SetTextFirstLineOfst(0);
                     }
                     else
                     {
                         aFormat.SetFirstLineOffset(0);
-                        aLRSpaceItem.SetTxtFirstLineOfst(
-                            rItem.GetTxtFirstLineOfst()
+                        aLRSpaceItem.SetTextFirstLineOfst(
+                            rItem.GetTextFirstLineOfst()
                             - aFormat.GetFirstLineOffset()
                             + aFormat.GetCharTextDistance());
                     }
@@ -916,8 +916,8 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
                     const SvxLRSpaceItem& rLRSpaceItem = static_cast<const SvxLRSpaceItem&>( aEditAttr.Get( EE_PARA_LRSPACE ) );
                     sal_uInt16 nId = SID_ATTR_PARA_LRSPACE;
                     SvxLRSpaceItem aLRSpaceItem( rLRSpaceItem.GetLeft(),
-                            rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(),
-                            rLRSpaceItem.GetTxtFirstLineOfst(), nId );
+                            rLRSpaceItem.GetRight(), rLRSpaceItem.GetTextLeft(),
+                            rLRSpaceItem.GetTextFirstLineOfst(), nId );
 
                     const sal_Int16 nOutlineLevel = static_cast<const SfxInt16Item&>( aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
                     const SvxNumBulletItem& rNumBulletItem = static_cast<const SvxNumBulletItem&>( aEditAttr.Get( EE_PARA_NUMBULLET ) );
@@ -926,9 +926,9 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
                         rNumBulletItem.GetNumRule()->GetLevelCount() > nOutlineLevel )
                     {
                         const SvxNumberFormat& rFormat = rNumBulletItem.GetNumRule()->GetLevel(nOutlineLevel);
-                        aLRSpaceItem.SetTxtLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTxtLeft());
-                        aLRSpaceItem.SetTxtFirstLineOfst(
-                            rLRSpaceItem.GetTxtFirstLineOfst() + rFormat.GetFirstLineOffset()
+                        aLRSpaceItem.SetTextLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTextLeft());
+                        aLRSpaceItem.SetTextFirstLineOfst(
+                            rLRSpaceItem.GetTextFirstLineOfst() + rFormat.GetFirstLineOffset()
                             - rFormat.GetCharTextDistance());
                     }
 
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 183b09808415..8b6d968a3bcb 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -93,13 +93,13 @@ using namespace ::com::sun::star::linguistic2;
 
 /** Create a list of clipboard formats that are supported both from the
     current clipboard content and the DrawViewShell.
-    The list is stored in a new instance of SvxClipboardFmtItem.
+    The list is stored in a new instance of SvxClipboardFormatItem.
 */
-::std::unique_ptr<SvxClipboardFmtItem> GetSupportedClipboardFormats (
+::std::unique_ptr<SvxClipboardFormatItem> GetSupportedClipboardFormats (
     TransferableDataHelper& rDataHelper)
 {
-    ::std::unique_ptr<SvxClipboardFmtItem> pResult (
-        new SvxClipboardFmtItem(SID_CLIPBOARD_FORMAT_ITEMS));
+    ::std::unique_ptr<SvxClipboardFormatItem> pResult (
+        new SvxClipboardFormatItem(SID_CLIPBOARD_FORMAT_ITEMS));
 
     sal_uInt32 nFormatCount (rDataHelper.GetFormatCount());
     for (sal_uInt32 i=0; i<nFormatCount; i++)
@@ -193,7 +193,7 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper
         // exit immediately.
         TransferableDataHelper aDataHelper (
             TransferableDataHelper::CreateFromSystemClipboard(GetActiveWindow()));
-        ::std::unique_ptr<SvxClipboardFmtItem> pFormats (GetSupportedClipboardFormats(aDataHelper));
+        ::std::unique_ptr<SvxClipboardFormatItem> pFormats (GetSupportedClipboardFormats(aDataHelper));
         if (mpDrawView == NULL)
             return 0;
         mpCurrentClipboardFormats = std::move(pFormats);
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 44338eb2763d..329fa9cff449 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -298,10 +298,10 @@ void FrameView::Update(SdOptions* pOptions)
 
         SetSolidDragging( pOptions->IsSolidDragging() );
 
-        SetGridCoarse( Size( pOptions->GetFldDrawX(), pOptions->GetFldDrawY() ) );
-        SetGridFine( Size( pOptions->GetFldDivisionX(), pOptions->GetFldDivisionY() ) );
-        Fraction aFractX(pOptions->GetFldDrawX(), pOptions->GetFldDrawX() / ( pOptions->GetFldDivisionX() ? pOptions->GetFldDivisionX() : 1 ));
-        Fraction aFractY(pOptions->GetFldDrawY(), pOptions->GetFldDrawY() / ( pOptions->GetFldDivisionY() ? pOptions->GetFldDivisionY() : 1 ));
+        SetGridCoarse( Size( pOptions->GetFieldDrawX(), pOptions->GetFieldDrawY() ) );
+        SetGridFine( Size( pOptions->GetFieldDivisionX(), pOptions->GetFieldDivisionY() ) );
+        Fraction aFractX(pOptions->GetFieldDrawX(), pOptions->GetFieldDrawX() / ( pOptions->GetFieldDivisionX() ? pOptions->GetFieldDivisionX() : 1 ));
+        Fraction aFractY(pOptions->GetFieldDrawY(), pOptions->GetFieldDrawY() / ( pOptions->GetFieldDivisionY() ? pOptions->GetFieldDivisionY() : 1 ));
         SetSnapGridWidth(aFractX, aFractY);
         SetQuickEdit(pOptions->IsQuickEdit());
 
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 1656a6f76425..13a2afa8fe89 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4176,7 +4176,7 @@ SfxVoidItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS
     Synchron;
 
     /* status: */
-    SlotType = SvxClipboardFmtItem
+    SlotType = SvxClipboardFormatItem
 
     /* config: */
     AccelConfig = FALSE,
diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi
index f0f1795b5293..1d7649e1d98d 100644
--- a/sfx2/sdi/sfxitems.sdi
+++ b/sfx2/sdi/sfxitems.sdi
@@ -104,7 +104,7 @@
         String Language MID_SCRIPT_ORGANIZER_LANGUAGE;
     };
     item SfxScriptOrganizer SfxScriptOrganizerItem;
-    item String     SvxClipboardFmtItem;    //! Dummy
+    item String     SvxClipboardFormatItem;    //! Dummy
 
     struct SvxZoom
     {
diff --git a/starmath/sdi/smitems.sdi b/starmath/sdi/smitems.sdi
index 017fc16a65f4..279f7eea421d 100644
--- a/starmath/sdi/smitems.sdi
+++ b/starmath/sdi/smitems.sdi
@@ -279,12 +279,12 @@ struct SvxFmtBreak
     BOOL        Auto        MID_AUTOBREAK;
     UINT16      Break       MID_BREAKxxx;
 }
-item SvxFmtBreak SvxFmtBreakItem;
+item SvxFmtBreak SvxFormatBreakItem;
 
 
 
-item BOOL SvxFmtKeepItem;
-item BOOL SvxFmtSplitItem;
+item BOOL SvxFormatKeepItem;
+item BOOL SvxFormatSplitItem;
 
 struct SvxFontHeight
 {
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8b8f03f3e15d..d17954ec99cf 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -2969,7 +2969,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
 
 SvNumberFormatterMergeMap SvNumberFormatter::ConvertMergeTableToMap()
 {
-    if (!HasMergeFmtTbl())
+    if (!HasMergeFormatTable())
     {
         return SvNumberFormatterMergeMap();
     }
@@ -3837,7 +3837,7 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr
     return nDefault;
 }
 
-sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const
+sal_uInt32 SvNumberFormatter::GetMergeFormatIndex( sal_uInt32 nOldFmt ) const
 {
     if (pMergeTable)
     {
@@ -3850,7 +3850,7 @@ sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const
     return nOldFmt;
 }
 
-bool SvNumberFormatter::HasMergeFmtTbl() const
+bool SvNumberFormatter::HasMergeFormatTable() const
 {
     return pMergeTable && !pMergeTable->empty();
 }
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 5b5354081bd2..50c231390e0d 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -550,7 +550,7 @@ void SvParser::Continue( int )
 {
 }
 
-void SvParser::BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap,
+void SvParser::BuildWhichTable( std::vector<sal_uInt16> &rWhichMap,
                               sal_uInt16 *pWhichIds,
                               sal_uInt16 nWhichIds )
 {
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 9d9f7694fed7..91f08bf8ba60 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8299,7 +8299,7 @@ SfxVoidItem OutlineUp SID_OUTLINE_UP
 ]
 
 
-SvxFmtBreakItem Pagebreak SID_ATTR_PARA_PAGEBREAK
+SvxFormatBreakItem Pagebreak SID_ATTR_PARA_PAGEBREAK
 
 [
     /* flags: */
@@ -8486,7 +8486,7 @@ SfxVoidItem ParagraphDialog SID_PARA_DLG
 ]
 
 
-SvxFmtKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
+SvxFormatKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
 
 [
     /* flags: */
@@ -8513,7 +8513,7 @@ SvxFmtKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
 ]
 
 
-SvxFmtSplitItem ParaSplit SID_ATTR_PARA_SPLIT
+SvxFormatSplitItem ParaSplit SID_ATTR_PARA_SPLIT
 
 [
     /* flags: */
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index 6ee210581d40..b8d771160d06 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -321,9 +321,9 @@ item BOOL                   SvxBlinkItem;
 item BOOL                   SvxAutoKernItem;
 item INT32                  SvxColorItem;
 item BOOL                   SvxContourItem;
-item INT16                  SvxFmtBreakItem;  // enum
-item BOOL                   SvxFmtKeepItem;
-item BOOL                   SvxFmtSplitItem;
+item INT16                  SvxFormatBreakItem;  // enum
+item BOOL                   SvxFormatKeepItem;
+item BOOL                   SvxFormatSplitItem;
 item INT16                  SvxKerningItem;
 item INT16                  SvxLanguageItem;
 item BOOL                   SvxNoHyphenItem;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index a890925a0801..34768b21677f 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -322,7 +322,7 @@ Size FontPrevWin_Impl::CalcTextSize(vcl::RenderContext& rRenderContext, OutputDe
                                     ((nScript == css::i18n::ScriptType::COMPLEX) ?
                                         maCTLFont :
                                         rInFont);
-        sal_uIntPtr nWidth = rFont.GetTxtSize(_pPrinter, maText, nStart, nEnd - nStart).Width();
+        sal_uIntPtr nWidth = rFont.GetTextSize(_pPrinter, maText, nStart, nEnd - nStart).Width();
         if (nIdx >= maTextWidth.size())
             break;
 
@@ -771,12 +771,12 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl
             if (pImpl->mcStartBracket)
             {
                 OUString sBracket(pImpl->mcStartBracket);
-                nStartBracketWidth = rFont.GetTxtSize(pPrinter, sBracket).Width();
+                nStartBracketWidth = rFont.GetTextSize(pPrinter, sBracket).Width();
             }
             if (pImpl->mcEndBracket)
             {
                 OUString sBracket(pImpl->mcEndBracket);
-                nEndBracketWidth = rFont.GetTxtSize(pPrinter, sBracket).Width();
+                nEndBracketWidth = rFont.GetTextSize(pPrinter, sBracket).Width();
             }
             nTextWidth = pImpl->CalcTextSize(rRenderContext, pPrinter, aSmallFont).Width();
             long nResultWidth = nStartBracketWidth;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 5f3f1b4b216b..421795807ceb 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -626,9 +626,9 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt )
 
             long nIndentValue = 0.0;
             if (nIndex == INDENT_LEFT_MARGIN)
-                nIndentValue = mxParaItem->GetTxtLeft();
+                nIndentValue = mxParaItem->GetTextLeft();
             else if (nIndex == INDENT_FIRST_LINE)
-                nIndentValue = mxParaItem->GetTxtFirstLineOfst();
+                nIndentValue = mxParaItem->GetTextFirstLineOfst();
             else if (nIndex == INDENT_RIGHT_MARGIN)
                 nIndentValue = mxParaItem->GetRight();
 
@@ -908,14 +908,14 @@ void SvxRuler::UpdatePara()
 
         if(bRTLText)
         {
-            leftMargin    = nRightFrameMargin - mxParaItem->GetTxtLeft() + lAppNullOffset;
-            leftFirstLine = leftMargin - mxParaItem->GetTxtFirstLineOfst();
+            leftMargin    = nRightFrameMargin - mxParaItem->GetTextLeft() + lAppNullOffset;
+            leftFirstLine = leftMargin - mxParaItem->GetTextFirstLineOfst();
             rightMargin   = nLeftFrameMargin + mxParaItem->GetRight() + lAppNullOffset;
         }
         else
         {
-            leftMargin    = nLeftFrameMargin + mxParaItem->GetTxtLeft() + lAppNullOffset;
-            leftFirstLine = leftMargin + mxParaItem->GetTxtFirstLineOfst();
+            leftMargin    = nLeftFrameMargin + mxParaItem->GetTextLeft() + lAppNullOffset;
+            leftFirstLine = leftMargin + mxParaItem->GetTextFirstLineOfst();
             rightMargin   = nRightFrameMargin - mxParaItem->GetRight() + lAppNullOffset;
         }
 
@@ -1089,7 +1089,7 @@ void SvxRuler::UpdateTabs()
         long nRightFrameMargin = GetRightFrameMargin();
 
         //#i24363# tab stops relative to indent
-        const long nParaItemTxtLeft = mxParaItem->GetTxtLeft();
+        const long nParaItemTxtLeft = mxParaItem->GetTextLeft();
 
         const long lParaIndent = nLeftFrameMargin + nParaItemTxtLeft;
 
@@ -2218,8 +2218,8 @@ void SvxRuler::ApplyIndents()
         nNewRight           = RoundToCurrentMapMode(nNewRight);
     }
 
-    mxParaItem->SetTxtFirstLineOfst(sal::static_int_cast<short>(nNewFirstLineOffset));
-    mxParaItem->SetTxtLeft(nNewTxtLeft);
+    mxParaItem->SetTextFirstLineOfst(sal::static_int_cast<short>(nNewFirstLineOffset));
+    mxParaItem->SetTextLeft(nNewTxtLeft);
     mxParaItem->SetRight(nNewRight);
 
     sal_uInt16 nParagraphId  = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
@@ -2608,7 +2608,7 @@ void SvxRuler::Click()
     if(mxTabStopItem.get() &&
        (nFlags & SvxRulerSupportFlags::TABS) == SvxRulerSupportFlags::TABS)
     {
-        bool bContentProtected = mxRulerImpl->aProtectItem.IsCntntProtected();
+        bool bContentProtected = mxRulerImpl->aProtectItem.IsContentProtected();
         if( bContentProtected ) return;
         const long lPos = GetClickPos();
         if((bRTL && lPos < std::min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
@@ -2686,7 +2686,7 @@ void SvxRuler::CalcMinMax()
                 //top border is not moveable when table rows are displayed
                 // protection of content means the margin is not moveable
                 // - it's just a page break inside of a cell
-                if(bHorz && !mxRulerImpl->aProtectItem.IsCntntProtected())
+                if(bHorz && !mxRulerImpl->aProtectItem.IsContentProtected())
                 {
                     nMaxLeft = mpBorders[0].nMinPos + lNullPix;
                     if(nDragType & SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL)
@@ -2777,7 +2777,7 @@ void SvxRuler::CalcMinMax()
             {
                 // get the bottom move range from the last border position - only available for rows!
                 // protection of content means the margin is not moveable - it's just a page break inside of a cell
-                if(bHorz || mxRulerImpl->aProtectItem.IsCntntProtected())
+                if(bHorz || mxRulerImpl->aProtectItem.IsContentProtected())
                 {
                     nMaxLeft = nMaxRight = mpBorders[mxColumnItem->Count() - 1].nMaxPos + lNullPix;
                 }
@@ -3196,7 +3196,7 @@ bool SvxRuler::StartDrag()
        <SvxRuler::CalcMinMax()>
        <SvxRuler::EndDrag()>
     */
-    bool bContentProtected = mxRulerImpl->aProtectItem.IsCntntProtected();
+    bool bContentProtected = mxRulerImpl->aProtectItem.IsContentProtected();
 
     if(!bValid)
         return false;
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index eafce45383d1..c16ba6f24490 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -24,41 +24,41 @@
 #include <svx/clipfmtitem.hxx>
 #include <com/sun/star/frame/status/ClipboardFormats.hpp>
 
-struct SvxClipboardFmtItem_Impl
+struct SvxClipboardFormatItem_Impl
 {
     std::vector<OUString> aFmtNms;
     std::vector<SotClipboardFormatId> aFmtIds;
 
-    SvxClipboardFmtItem_Impl() {}
-    SvxClipboardFmtItem_Impl( const SvxClipboardFmtItem_Impl& );
+    SvxClipboardFormatItem_Impl() {}
+    SvxClipboardFormatItem_Impl( const SvxClipboardFormatItem_Impl& );
 };
 
-TYPEINIT1_FACTORY( SvxClipboardFmtItem, SfxPoolItem , new  SvxClipboardFmtItem(0));
+TYPEINIT1_FACTORY( SvxClipboardFormatItem, SfxPoolItem , new  SvxClipboardFormatItem(0));
 
-SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl(
-                            const SvxClipboardFmtItem_Impl& rCpy )
+SvxClipboardFormatItem_Impl::SvxClipboardFormatItem_Impl(
+                            const SvxClipboardFormatItem_Impl& rCpy )
     : aFmtNms(rCpy.aFmtNms)
     , aFmtIds(rCpy.aFmtIds)
 {
 }
 
-SvxClipboardFmtItem::SvxClipboardFmtItem( sal_uInt16 nId )
-    : SfxPoolItem( nId ), pImpl( new SvxClipboardFmtItem_Impl )
+SvxClipboardFormatItem::SvxClipboardFormatItem( sal_uInt16 nId )
+    : SfxPoolItem( nId ), pImpl( new SvxClipboardFormatItem_Impl )
 {
 }
 
-SvxClipboardFmtItem::SvxClipboardFmtItem( const SvxClipboardFmtItem& rCpy )
+SvxClipboardFormatItem::SvxClipboardFormatItem( const SvxClipboardFormatItem& rCpy )
     : SfxPoolItem( rCpy.Which() ),
-    pImpl( new SvxClipboardFmtItem_Impl( *rCpy.pImpl ) )
+    pImpl( new SvxClipboardFormatItem_Impl( *rCpy.pImpl ) )
 {
 }
 
-SvxClipboardFmtItem::~SvxClipboardFmtItem()
+SvxClipboardFormatItem::~SvxClipboardFormatItem()
 {
     delete pImpl;
 }
 
-bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
+bool SvxClipboardFormatItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     sal_uInt16 nCount = Count();
 
@@ -76,7 +76,7 @@ bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8
     return true;
 }
 
-bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
+bool SvxClipboardFormatItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     ::com::sun::star::frame::status::ClipboardFormats aClipFormats;
     if ( rVal >>= aClipFormats )
@@ -94,9 +94,9 @@ bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_
     return false;
 }
 
-bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
+bool SvxClipboardFormatItem::operator==( const SfxPoolItem& rComp ) const
 {
-    const SvxClipboardFmtItem& rCmp = static_cast<const SvxClipboardFmtItem&>(rComp);
+    const SvxClipboardFormatItem& rCmp = static_cast<const SvxClipboardFormatItem&>(rComp);
     if(rCmp.pImpl->aFmtNms.size() != pImpl->aFmtNms.size())
         return false;
 
@@ -114,12 +114,12 @@ bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
     return nRet;
 }
 
-SfxPoolItem* SvxClipboardFmtItem::Clone( SfxItemPool * /*pPool*/ ) const
+SfxPoolItem* SvxClipboardFormatItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
-    return new SvxClipboardFmtItem( *this );
+    return new SvxClipboardFormatItem( *this );
 }
 
-void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos )
+void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos )
 {
     if( nPos > pImpl->aFmtNms.size() )
         nPos = pImpl->aFmtNms.size();
@@ -128,7 +128,7 @@ void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16
     pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId );
 }
 
-void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName,
+void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName,
                             sal_uInt16 nPos )
 {
     if( nPos > pImpl->aFmtNms.size() )
@@ -138,17 +138,17 @@ void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUSt
     pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId );
 }
 
-sal_uInt16 SvxClipboardFmtItem::Count() const
+sal_uInt16 SvxClipboardFormatItem::Count() const
 {
     return pImpl->aFmtIds.size();
 }
 
-SotClipboardFormatId SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
+SotClipboardFormatId SvxClipboardFormatItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
 {
     return pImpl->aFmtIds[ nPos ];
 }
 
-const OUString SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
+const OUString SvxClipboardFormatItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
 {
     return pImpl->aFmtNms[nPos];
 }
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 08d68167b8fb..b1b5b39b4195 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -198,8 +198,8 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ):
     sIntName = rHyperlinkItem.sIntName;
     nMacroEvents = rHyperlinkItem.nMacroEvents;
 
-    if( rHyperlinkItem.GetMacroTbl() )
-        pMacroTable = new SvxMacroTableDtor( *rHyperlinkItem.GetMacroTbl() );
+    if( rHyperlinkItem.GetMacroTable() )
+        pMacroTable = new SvxMacroTableDtor( *rHyperlinkItem.GetMacroTable() );
     else
         pMacroTable=NULL;
 
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index 5b7255bff356..a0eb16f61b3c 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -63,7 +63,7 @@ SvxClipBoardControl::~SvxClipBoardControl()
 
 VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow()
 {
-    const SvxClipboardFmtItem* pFmtItem = PTR_CAST( SvxClipboardFmtItem, pClipboardFmtItem );
+    const SvxClipboardFormatItem* pFmtItem = PTR_CAST( SvxClipboardFormatItem, pClipboardFmtItem );
     if ( pFmtItem )
     {
         if (pPopup)
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 838e1c749114..7c7e2c491f7a 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -421,7 +421,7 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
     vcl::Font rActBulletFont = pActualBullets[nIndex]->aFont;
 
     sal_uInt16 nMask = 1;
-    OUString sBulletCharFmtName = GetBulCharFmtName();
+    OUString sBulletCharFormatName = GetBulCharFmtName();
     for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
     {
         if(mLevel & nMask)
@@ -430,7 +430,7 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
             aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
             aFmt.SetBulletFont(&rActBulletFont);
             aFmt.SetBulletChar(cChar );
-            aFmt.SetCharFmtName(sBulletCharFmtName);
+            aFmt.SetCharFormatName(sBulletCharFormatName);
             OUString aEmptyStr;
             aFmt.SetPrefix( aEmptyStr );
             aFmt.SetSuffix( aEmptyStr );
@@ -686,7 +686,7 @@ bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, s
             aFmt.SetNumberingType(nSetNumberingType);
             aFmt.SetPrefix( aEmptyStr );
             aFmt.SetSuffix( aEmptyStr );
-            aFmt.SetCharFmtName( sNumCharFmtName );
+            aFmt.SetCharFormatName( sNumCharFmtName );
 
                     Graphic aGraphic;
                     if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, pEntry->nGallaryIndex, &aGraphic))
@@ -1149,7 +1149,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
         //vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
         vcl::Font rActBulletFont = static_cast<BulletsSettings_Impl*>(pCurrentBullets->pBullets)->aFont;
         sal_uInt16 nMask = 1;
-        OUString sBulletCharFmtName = GetBulCharFmtName();
+        OUString sBulletCharFormatName = GetBulCharFmtName();
         for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
         {
             if(mLevel & nMask)
@@ -1159,7 +1159,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
                 aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
                 aFmt.SetBulletFont(&rActBulletFont);
                 aFmt.SetBulletChar(cChar );
-                aFmt.SetCharFmtName(sBulletCharFmtName);
+                aFmt.SetCharFormatName(sBulletCharFormatName);
                 OUString aEmptyStr;
                 aFmt.SetPrefix( aEmptyStr );
                 aFmt.SetSuffix( aEmptyStr );
@@ -1187,7 +1187,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
                 aFmt.SetNumberingType(nSetNumberingType);
                 aFmt.SetPrefix( aEmptyStr );
                 aFmt.SetSuffix( aEmptyStr );
-                aFmt.SetCharFmtName( sNumCharFmtName );
+                aFmt.SetCharFormatName( sNumCharFmtName );
                 if ( pCurrentBullets->nIndexDefault == (sal_uInt16)0xFFFF && pEntry->pGrfObj )
                 {
                     Size aSize = pEntry->aSize;
@@ -1428,7 +1428,7 @@ bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uIn
             aFmt.SetPrefix(_pSet->pNumSetting->sPrefix);
             aFmt.SetSuffix(_pSet->pNumSetting->sSuffix);
 
-            aFmt.SetCharFmtName(sNumCharFmtName);
+            aFmt.SetCharFormatName(sNumCharFmtName);
             if (isResetSize) aFmt.SetBulletRelSize(100);
             aNum.SetLevel(i, aFmt);
         }
@@ -1711,7 +1711,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
     NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr;
 
     NumSettings_ImplPtr pLevelSettings = 0;
-    OUString sBulletCharFmtName = GetBulCharFmtName();
+    OUString sBulletCharFormatName = GetBulCharFmtName();
     for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
     {
         if(pNumSettingsArr->size() > i)
@@ -1774,7 +1774,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
             }
 
             aFmt.SetBulletChar(cChar);
-            aFmt.SetCharFmtName( sBulletCharFmtName );
+            aFmt.SetCharFormatName( sBulletCharFormatName );
             if (isResetSize) aFmt.SetBulletRelSize(45);
         }else if ((aFmt.GetNumberingType()&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) {
             if (pLevelSettings->pBrushItem) {
@@ -1793,7 +1793,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
         } else
         {
             aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? aNum.GetLevelCount() : 0));
-            aFmt.SetCharFmtName(sBulletCharFmtName);
+            aFmt.SetCharFormatName(sBulletCharFormatName);
                 if (isResetSize) aFmt.SetBulletRelSize(100);
         }
         if(pNumSettingsArr->size() > i) {
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 2604ea250a40..35a0305eb3b3 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -250,9 +250,9 @@ void ParaPropertyPanel::initial()
 IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl)
 {
     SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-    aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
+    aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
     aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-    aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+    aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
     GetBindings()->GetDispatcher()->Execute(
         SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -283,9 +283,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
                     maTxtLeft += INDENT_STEP;
                     sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
                     nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
-                    aMargin.SetTxtLeft( (const long)nVal );
+                    aMargin.SetTextLeft( (const long)nVal );
                     aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-                    aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+                    aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
                     GetBindings()->GetDispatcher()->Execute(
                         SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -317,9 +317,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
                     sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
                     nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
 
-                    aMargin.SetTxtLeft( (const long)nVal );
+                    aMargin.SetTextLeft( (const long)nVal );
                     aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-                    aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+                    aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
                     GetBindings()->GetDispatcher()->Execute(
                         SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -329,9 +329,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
         else if (aCommand == UNO_HANGINGINDENT)
         {
             SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-            aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+            aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
             aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-            aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
+            aMargin.SetTextFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
 
             GetBindings()->GetDispatcher()->Execute(
                 SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -353,9 +353,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl,
         else if (aCommand == UNO_HANGINGINDENT2)
         {
             SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-            aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+            aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
             aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
-            aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
+            aMargin.SetTextFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
 
             GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
         }
@@ -466,7 +466,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
     if( pState && eState >= SfxItemState::DEFAULT )
     {
         const SvxLRSpaceItem* pSpace = static_cast<const SvxLRSpaceItem*>(pState);
-        maTxtLeft = pSpace->GetTxtLeft();
+        maTxtLeft = pSpace->GetTextLeft();
         maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
         maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
 
@@ -474,7 +474,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
         aTxtRight = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
         aTxtRight = OutputDevice::LogicToLogic( aTxtRight, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
 
-        long aTxtFirstLineOfst = pSpace->GetTxtFirstLineOfst();
+        long aTxtFirstLineOfst = pSpace->GetTextFirstLineOfst();
         aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
         aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
 
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index 9ef4ffdc64d2..ab1271ac8fe0 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -168,7 +168,7 @@ bool CommonStylePreviewRenderer::recalculate()
 
 Size CommonStylePreviewRenderer::getRenderSize()
 {
-    maPixelSize = maFont.GetTxtSize(&mrOutputDev, maStyleName);
+    maPixelSize = maFont.GetTextSize(&mrOutputDev, maStyleName);
     if (maPixelSize.Height() > mnMaxHeight)
         maPixelSize.Height() = mnMaxHeight;
     return maPixelSize;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index b2712615e1f9..8e5b31dd72d6 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -493,14 +493,14 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
         bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),true,pTxtCol,pFldCol,rStr);
         if (bOk) {
             if (pTxtCol!=NULL) {
-                pFI->SetTxtColor(*pTxtCol);
+                pFI->SetTextColor(*pTxtCol);
                 delete pTxtCol;
             }
             if (pFldCol!=NULL) {
-                pFI->SetFldColor(*pFldCol);
+                pFI->SetFieldColor(*pFldCol);
                 delete pFldCol;
             } else {
-                pFI->SetFldColor(Color(COL_LIGHTGRAY)); // TODO: remove this later on (357)
+                pFI->SetFieldColor(Color(COL_LIGHTGRAY)); // TODO: remove this later on (357)
             }
         }
     }
diff --git a/sw/README b/sw/README
index 0fcfd163050f..027e4eb6ffed 100644
--- a/sw/README
+++ b/sw/README
@@ -81,19 +81,19 @@ actions; these are created by the StartUndo/EndUndo wrapper methods.
 === Text Attributes ===
 
 The sub-structure of paragraphs is stored in the SwpHintsArray member
-SwTxtNode::m_pSwpHints.  There is a base class SwTxtAttr with numerous
-subclasses; the SwTxtAttr has a start and end index and a SfxPoolItem
+SwTextNode::m_pSwpHints.  There is a base class SwTextAttr with numerous
+subclasses; the SwTextAttr has a start and end index and a SfxPoolItem
 to store the actual formatting attribute.
 
-There are several sub-categories of SwTxtAttr:
+There are several sub-categories of SwTextAttr:
 
-- formatting attributes: Character Styles (SwTxtCharFmt, RES_TXTATR_CHARFMT)
+- formatting attributes: Character Styles (SwTextCharFormat, RES_TXTATR_CHARFMT)
   and Automatic Styles (no special class, RES_TXTATR_AUTOFMT):
   these are handled by SwpHintsArray::BuildPortions and MergePortions,
   which create non-overlapping portions of formatting attributes.
 
-- nesting attributes: Hyperlinks (SwTxtINetFmt, RES_TXTATR_INETFMT),
-  Ruby (SwTxtRuby, RES_TXTATR_CJK_RUBY) and Meta/MetaField (SwTxtMeta,
+- nesting attributes: Hyperlinks (SwTextINetFormat, RES_TXTATR_INETFMT),
+  Ruby (SwTextRuby, RES_TXTATR_CJK_RUBY) and Meta/MetaField (SwTextMeta,
   RES_TXTATR_META/RES_TXTATR_METAFIELD):
   these maintain a properly nested tree structure.
   The Meta/Metafield are "special" because they have both start/end
@@ -116,26 +116,26 @@ There are multiple model classes involved for fields:
   For most types of fields there is one shared instance of this per type,
   which is created in DocumentFieldsManager::_InitFieldTypes()
   but for some there are more than one, and they are dynamically created, see
-  DocumentFieldsManager::InsertFldType().  An example for the latter are
-  variable fields (RES_GETEXPFLD/RES_SETEXPFLD), with one SwFldType per
+  DocumentFieldsManager::InsertFieldType().  An example for the latter are
+  variable fields (RES_GETEXPFLD/RES_SETEXPFLD), with one SwFieldType per
   variable.
 - SwXFieldMaster is the UNO wrapper of a field type.
   It is a SwClient registered at the SwFieldType.
   Its life-cycle is determined by UNO clients outside of sw; it will get
   disposed when the SwFieldType dies.
-- SwFmtFld is the SfxPoolItem of a field.
-  The SwFmtFld is a SwClient registered at its SwFldType.
-  The SwFmtFld owns the SwField of the field.
+- SwFormatField is the SfxPoolItem of a field.
+  The SwFormatField is a SwClient registered at its SwFieldType.
+  The SwFormatField owns the SwField of the field.
 - SwField contains the core logic of a field.
-  The SwField is owned by the SwFmtFld of the field.
+  The SwField is owned by the SwFormatField of the field.
   There are many subclasses of SwField, one for each different type of field.
   Note that there are not many places that can Expand the field to its
   correct value, since for example page number fields require a View
   with an up to date layout; therefore the correct expansion is cached.
-- SwTxtFld is the text attribute of a field.
-  It owns the SwFmtFld of the field (like all text attributes).
+- SwTextField is the text attribute of a field.
+  It owns the SwFormatField of the field (like all text attributes).
 - SwXTextField is the UNO wrapper object of a field.
-  It is a SwClient registered at the SwFmtFld.
+  It is a SwClient registered at the SwFormatField.
   Its life-cycle is determined by UNO clients outside of sw; it will get
-  disposed when the SwFmtFld dies.
+  disposed when the SwFormatField dies.
 
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index e18e91e99d94..f72468059736 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -35,7 +35,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
                          SwPostItMgr& aMgr,
                          SwPostItBits aBits,
                          SwSidebarItem& rSidebarItem,
-                         SwFmtFld* aField );
+                         SwFormatField* aField );
         virtual ~SwAnnotationWin();
         virtual void dispose() SAL_OVERRIDE;
 
@@ -62,8 +62,8 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
         virtual SvxLanguageItem GetLanguage() SAL_OVERRIDE;
         sal_uInt32 CountFollowing();
 
-        SwFmtFld*       mpFmtFld;
-        SwPostItField*  mpFld;
+        SwFormatField*       mpFormatField;
+        SwPostItField*  mpField;
         PopupMenu*      mpButtonPopup;
 
 };
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index d2363177dadb..74da45127883 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -38,10 +38,10 @@ class SwFrm;
 class SwLinePortion;
 class SwPageFrm;
 class SwPrintData;
-class SwTxtPainter;
+class SwTextPainter;
 class SwEditShell;
 class StringRangeEnumerator;
-class SwTxtNode;
+class SwTextNode;
 class SwNumRule;
 class SwTable;
 class SwNumberTreeNode;
@@ -59,19 +59,19 @@ class SvxLanguageItem;
  *                                          Part
  *                                          Art
  * SwSection                                Sect
- * SwFtnContFrm and SwFlyFrm                Div
- * SwFmt "Quotations"                       BlockQuote
- * SwFmt "Caption"                          Caption
+ * SwFootnoteContFrm and SwFlyFrm                Div
+ * SwFormat "Quotations"                       BlockQuote
+ * SwFormat "Caption"                          Caption
  * SwSection (TOC)                          TOC
- * SwTxtNode in TOC                         TOCI
+ * SwTextNode in TOC                         TOCI
  * SwSection (Index)                        Index
  *
  * Block-Level Structure Elements:
  *
- * SwTxtNode                                P
- * SwFmt "Heading"                          H
- * SwTxtNode with Outline                   H1 - H6
- * SwTxtNode with NumRule                   L, LI, LBody
+ * SwTextNode                                P
+ * SwFormat "Heading"                          H
+ * SwTextNode with Outline                   H1 - H6
+ * SwTextNode with NumRule                   L, LI, LBody
  * SwTable                                  Table
  * SwRowFrm                                 TR
  * SwCellFrm in Headline row or
@@ -80,18 +80,18 @@ class SvxLanguageItem;
  *
  * Inline-Level Structure Elements:
  *
- * SwTxtPortion                             Span
- * SwFmt "Quotation"                        Quote
- * SwFtnFrm                                 Note
+ * SwTextPortion                             Span
+ * SwFormat "Quotation"                        Quote
+ * SwFootnoteFrm                                 Note
  *                                          Form
  *                                          Reference
- * SwFldPortion (AuthorityField)            BibEntry
- * SwFmt "Source Text"                      Code
- * SwFtnPortion, SwFldPortion (RefField)    Link
+ * SwFieldPortion (AuthorityField)            BibEntry
+ * SwFormat "Source Text"                      Code
+ * SwFootnotePortion, SwFieldPortion (RefField)    Link
  *
  * Illustration elements:
  *
- * SwFlyFrm with SwNoTxtFrm                 Figure
+ * SwFlyFrm with SwNoTextFrm                 Figure
  * SwFlyFrm with Math OLE Object            Formula
  *
  */
@@ -111,9 +111,9 @@ struct Frm_Info
 struct Por_Info
 {
     const SwLinePortion& mrPor;
-    const SwTxtPainter& mrTxtPainter;
-    Por_Info( const SwLinePortion& rPor, const SwTxtPainter& rTxtPainer )
-            : mrPor( rPor ), mrTxtPainter( rTxtPainer ) {};
+    const SwTextPainter& mrTextPainter;
+    Por_Info( const SwLinePortion& rPor, const SwTextPainter& rTextPainer )
+            : mrPor( rPor ), mrTextPainter( rTextPainer ) {};
 };
 
 struct lt_TableColumn
@@ -224,7 +224,7 @@ class SwEnhancedPDFExportHelper
     std::vector< sal_Int32 > CalcOutputPageNums( const SwRect& rRect ) const;
 
     void MakeHeaderFooterLinks( vcl::PDFExtOutDevData& rPDFExtOutDevData,
-                                const SwTxtNode& rTNd, const SwRect& rLinkRect,
+                                const SwTextNode& rTNd, const SwRect& rLinkRect,
                                 sal_Int32 nDestId, const OUString& rURL, bool bIntern ) const;
 
     public:
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index ac9d4b0f13a5..17eb50cb0142 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_INC_HANDLEANCHORNODECHG_HXX
 #define INCLUDED_SW_INC_HANDLEANCHORNODECHG_HXX
 
-class SwFlyFrmFmt;
-class SwFmtAnchor;
+class SwFlyFrameFormat;
+class SwFormatAnchor;
 class SwFlyFrm;
 
 // helper class to track change of anchor node of at-paragraph respectively
@@ -37,21 +37,21 @@ public:
 
         @author OD
 
-        @param _rFlyFrmFmt
+        @param _rFlyFrameFormat
         reference to the fly frame format instance, which is handled.
 
-        @param _rNewAnchorFmt
+        @param _rNewAnchorFormat
         new anchor attribute, which will be applied at the given fly frame format
 
         @param _pKeepThisFlyFrm
         optional parameter - pointer to a fly frame of the given fly frame format,
         which isn't deleted, if re-creation of fly frames is necessary.
     */
-    SwHandleAnchorNodeChg( SwFlyFrmFmt& _rFlyFrmFmt,
-                           const SwFmtAnchor& _rNewAnchorFmt,
+    SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat,
+                           const SwFormatAnchor& _rNewAnchorFormat,
                            SwFlyFrm* _pKeepThisFlyFrm = 0L );
 
-    /** calls <SwFlyFrmFmt::MakeFrms>, if re-creation of fly frames is necessary.
+    /** calls <SwFlyFrameFormat::MakeFrms>, if re-creation of fly frames is necessary.
 
         @author OD
     */
@@ -59,7 +59,7 @@ public:
 
 private:
     // fly frame format, which is tracked for a anchor node change.
-    SwFlyFrmFmt& mrFlyFrmFmt;
+    SwFlyFrameFormat& mrFlyFrameFormat;
     // internal flag, which indicates that the certain anchor node change occurs
     // and that re-creation of fly frames is necessary.
     bool mbAnchorNodeChanged;
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 9a866e600d4a..91ca8ce45d0d 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -33,11 +33,11 @@ class SfxItemSet;
 class SfxPoolItem;
 class GraphicObject;
 class SdrObject;
-class SwFrmFmt;
-class SwDrawFrmFmt;
-class SwFlyFrmFmt;
+class SwFrameFormat;
+class SwDrawFrameFormat;
+class SwFlyFrameFormat;
 class SwNodeIndex;
-class SwFmtFld;
+class SwFormatField;
 
 namespace utl { class TransliterationWrapper; }
 namespace svt { class EmbeddedObjectRef; }
@@ -111,7 +111,7 @@ public:
     */
     virtual void DeleteSection(SwNode* pNode) = 0;
 
-    /** Delete a range SwFlyFrmFmt.
+    /** Delete a range SwFlyFrameFormat.
     */
     virtual bool DeleteRange(SwPaM&) = 0;
 
@@ -151,11 +151,11 @@ public:
 
     /** Insert graphic or formula. The XXXX are copied.
      */
-    virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic,
-                        const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+    virtual SwFlyFrameFormat* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic,
+                        const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
 
-    virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
-        const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+    virtual SwFlyFrameFormat* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
+        const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
 
     /** Transpose graphic (with undo)
      */
@@ -164,23 +164,23 @@ public:
     /** Insert a DrawObject. The object must be already registered
         in DrawModel.
     */
-    virtual SwDrawFrmFmt* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) = 0;
+    virtual SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) = 0;
 
     /** Insert OLE-objects.
     */
-    virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
-        const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+    virtual SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
+        const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
 
-    virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
-                           const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+    virtual SwFlyFrameFormat* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
+                           const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
 
-    /** Split a node at rPos (implemented only for TxtNode).
+    /** Split a node at rPos (implemented only for TextNode).
     */
     virtual bool SplitNode(const SwPosition &rPos, bool bChkTableStart) = 0;
 
-    virtual bool AppendTxtNode(SwPosition& rPos) = 0;
+    virtual bool AppendTextNode(SwPosition& rPos) = 0;
 
-    /** Replace selected range in a TxtNode with string.
+    /** Replace selected range in a TextNode with string.
         Intended for search & replace.
         bRegExpRplc - replace tabs (\\t) and insert the found string
         ( not \& ). E.g.: Find: "zzz", Replace: "xx\t\\t..&..\&"
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index 36c012924185..3d8f3e5db324 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -23,17 +23,17 @@
 #include <sal/types.h>
 #include <tools/solar.h>
 
-class SwFldTypes;
+class SwFieldTypes;
 class SwFieldType;
 class SfxPoolItem;
 struct SwPosition;
-class SwDocUpdtFld;
+class SwDocUpdateField;
 class SwCalc;
-class SwTxtFld;
+class SwTextField;
 class SwField;
 class SwMsgPoolItem;
 class DateTime;
-class _SetGetExpFld;
+class _SetGetExpField;
 struct SwHash;
 class SwNode;
 
@@ -46,19 +46,19 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
  class IDocumentFieldsAccess
  {
  public:
-    virtual const SwFldTypes *GetFldTypes() const = 0;
+    virtual const SwFieldTypes *GetFieldTypes() const = 0;
 
-    virtual SwFieldType *InsertFldType(const SwFieldType &) = 0;
+    virtual SwFieldType *InsertFieldType(const SwFieldType &) = 0;
 
-    virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const = 0;
+    virtual SwFieldType *GetSysFieldType( const sal_uInt16 eWhich ) const = 0;
 
-    virtual SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const = 0;
+    virtual SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const = 0;
 
-    virtual void RemoveFldType(size_t nFld) = 0;
+    virtual void RemoveFieldType(size_t nField) = 0;
 
-    virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB) = 0;
+    virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) = 0;
 
-    virtual void InsDeletedFldType(SwFieldType &) = 0;
+    virtual void InsDeletedFieldType(SwFieldType &) = 0;
 
     /**
        Puts a value into a field at a certain position.
@@ -78,33 +78,33 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
 
     /** Updates a field.
 
-        @param rDstFmtFld field to update
-        @param rSrcFld field containing the new values
-        @param pMsgHnt
-        @param bUpdateTblFlds TRUE: update table fields, too.
+        @param rDstFormatField field to update
+        @param rSrcField field containing the new values
+        @param pMsgHint
+        @param bUpdateTableFields TRUE: update table fields, too.
 
         @retval true             update was successful
         @retval false            else
     */
-    virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) = 0;
+    virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) = 0;
 
-    virtual void UpdateRefFlds(SfxPoolItem* pHt) = 0;
+    virtual void UpdateRefFields(SfxPoolItem* pHt) = 0;
 
-    virtual void UpdateTblFlds(SfxPoolItem* pHt) = 0;
+    virtual void UpdateTableFields(SfxPoolItem* pHt) = 0;
 
-    virtual void UpdateExpFlds(SwTxtFld* pFld, bool bUpdateRefFlds) = 0;
+    virtual void UpdateExpFields(SwTextField* pField, bool bUpdateRefFields) = 0;
 
-    virtual void UpdateUsrFlds() = 0;
+    virtual void UpdateUsrFields() = 0;
 
-    virtual void UpdatePageFlds(SfxPoolItem*) = 0;
+    virtual void UpdatePageFields(SfxPoolItem*) = 0;
 
-    virtual void LockExpFlds() = 0;
+    virtual void LockExpFields() = 0;
 
-    virtual void UnlockExpFlds() = 0;
+    virtual void UnlockExpFields() = 0;
 
-    virtual bool IsExpFldsLocked() const = 0;
+    virtual bool IsExpFieldsLocked() const = 0;
 
-    virtual SwDocUpdtFld& GetUpdtFlds() const = 0;
+    virtual SwDocUpdateField& GetUpdateFields() const = 0;
 
     /*  @@@MAINTAINABILITY-HORROR@@@
         SwNode (see parameter pChk) is (?) part of the private
@@ -118,17 +118,17 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
     // (Node [ + ::com::sun::star::ucb::Content]).
     // A generated list of all fields may be passed along too
     // (if the addreess != 0 and the pointer == 0 a new list will be returned).
-    virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0;
+    virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0;
 
-    virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld) = 0;
+    virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) = 0;
 
-    virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld) = 0;
+    virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) = 0;
 
-    virtual bool IsNewFldLst() const = 0;
+    virtual bool IsNewFieldLst() const = 0;
 
-    virtual void SetNewFldLst( bool bFlag) = 0;
+    virtual void SetNewFieldLst( bool bFlag) = 0;
 
-    virtual void InsDelFldInFldLst(bool bIns, const SwTxtFld& rFld) = 0;
+    virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) = 0;
 
 protected:
     virtual ~IDocumentFieldsAccess() {};
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index 37b51ef7c065..ab02daa108df 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -24,10 +24,10 @@
 
 class SwViewShell;
 class SwRootFrm;
-class SwFrmFmt;
+class SwFrameFormat;
 class SfxItemSet;
 class SwLayouter;
-class SwFmtAnchor;
+class SwFormatAnchor;
 
 /** Provides access to the layout of a document.
 */
@@ -49,7 +49,7 @@ public:
 
     /**
     */
-    virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet ) = 0;
+    virtual SwFrameFormat* MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet ) = 0;
 
     /**
     */
@@ -59,12 +59,12 @@ public:
 
     /**
     */
-    virtual void DelLayoutFmt( SwFrmFmt *pFmt ) = 0;
+    virtual void DelLayoutFormat( SwFrameFormat *pFormat ) = 0;
 
     /**
     */
-    virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor,
-                                     bool bSetTxtFlyAtt, bool bMakeFrms ) = 0;
+    virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor,
+                                     bool bSetTextFlyAtt, bool bMakeFrms ) = 0;
 
 protected:
 
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 3e73066d7ec5..7de0f2ffd5ae 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -26,7 +26,7 @@
 
 class SwPaM;
 struct SwPosition;
-class SwTxtNode;
+class SwTextNode;
 
 namespace sw { namespace mark {
     class SaveBookmark; // FIXME: Ugly: SaveBookmark is a core-internal class, and should not be used in the interface
@@ -93,7 +93,7 @@ class IDocumentMarkAccess
         /** Returns a mark in the document for a paragraph.
             If there is none, a mark will be created.
 
-           @param rTxtNode
+           @param rTextNode
            [in] the paragraph being marked (a selection over the paragraph is marked)
 
            @param eMark
@@ -102,7 +102,7 @@ class IDocumentMarkAccess
            @returns
            a pointer to the new mark (name might have changed).
         */
-        virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode,
+        virtual ::sw::mark::IMark* getMarkForTextNode(const SwTextNode& rTextNode,
             MarkType eMark) =0;
 
         /** Moves an existing mark to a new selection and performs needed updates.
diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx
index f5ec75fca5e6..5803f7077482 100644
--- a/sw/inc/IDocumentOutlineNodes.hxx
+++ b/sw/inc/IDocumentOutlineNodes.hxx
@@ -23,14 +23,14 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <vector>
-class SwTxtNode;
+class SwTextNode;
 
 /** Provides outline nodes of a document.
 */
 class IDocumentOutlineNodes
 {
 public:
-    typedef ::std::vector< const SwTxtNode* > tSortedOutlineNodeList;
+    typedef ::std::vector< const SwTextNode* > tSortedOutlineNodeList;
 
     virtual sal_Int32 getOutlineNodesCount() const = 0;
 
@@ -38,8 +38,8 @@ public:
     virtual OUString getOutlineText( const sal_Int32 nIdx,
                                    const bool bWithNumber = true,
                                    const bool bWithSpacesForLevel = false,
-                                   const bool bWithFtn = true ) const = 0;
-    virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const = 0;
+                                   const bool bWithFootnote = true ) const = 0;
+    virtual SwTextNode* getOutlineNode( const sal_Int32 nIdx ) const = 0;
 
     virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const = 0;
 
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 4ff9600139bd..eb37a3ac63d6 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -30,8 +30,8 @@
 class SwRangeRedline;
 class SwTableRowRedline;
 class SwTableCellRedline;
-class SwRedlineTbl;
-class SwExtraRedlineTbl;
+class SwRedlineTable;
+class SwExtraRedlineTable;
 class SwPaM;
 struct SwPosition;
 class SwStartNode;
@@ -126,11 +126,11 @@ public:
 
     virtual bool IsIgnoreRedline() const = 0;
 
-    virtual const SwRedlineTbl& GetRedlineTbl() const = 0;
-    virtual SwRedlineTbl& GetRedlineTbl() = 0;
-    virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const = 0;
-    virtual SwExtraRedlineTbl& GetExtraRedlineTbl() = 0;
-    virtual bool HasExtraRedlineTbl() const = 0;
+    virtual const SwRedlineTable& GetRedlineTable() const = 0;
+    virtual SwRedlineTable& GetRedlineTable() = 0;
+    virtual const SwExtraRedlineTable& GetExtraRedlineTable() const = 0;
+    virtual SwExtraRedlineTable& GetExtraRedlineTable() = 0;
+    virtual bool HasExtraRedlineTable() const = 0;
 
     virtual bool IsInRedlines(const SwNode& rNode) const = 0;
 
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index ab907b2d30fa..73a5d547a993 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -186,14 +186,14 @@ enum class DocumentSettingId
        @returns
        the current field update mode.
     */
-    virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const = 0;
+    virtual SwFieldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const = 0;
 
     /** Set the current field update mode.
 
        @param nMode
        [in] the new field update mode.
     */
-    virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags nMode )  = 0;
+    virtual void setFieldUpdateFlags( /*[in]*/ SwFieldUpdateFlags nMode )  = 0;
 
     /** Get the character compression type for Asian characters.
 
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index bc4034cc46e0..a6fc748d16b9 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -44,7 +44,7 @@ public:
     */
     virtual bool IsLoaded() const = 0;
 
-    virtual bool IsUpdateExpFld() const  = 0;
+    virtual bool IsUpdateExpField() const  = 0;
 
     virtual bool IsNewDoc() const = 0;
 
@@ -54,7 +54,7 @@ public:
 
     virtual void SetNewDoc(bool b) = 0;
 
-    virtual void SetUpdateExpFldStat(bool b) = 0;
+    virtual void SetUpdateExpFieldStat(bool b) = 0;
 
     virtual void SetLoaded(bool b = true) = 0;
 
diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx
index 81ec03587e27..c56104b32164 100644
--- a/sw/inc/IDocumentStylePoolAccess.hxx
+++ b/sw/inc/IDocumentStylePoolAccess.hxx
@@ -22,10 +22,10 @@
 
 #include <sal/types.h>
 
-class SwTxtFmtColl;
-class SwCharFmt;
-class SwFmt;
-class SwFrmFmt;
+class SwTextFormatColl;
+class SwCharFormat;
+class SwFormat;
+class SwFrameFormat;
 class SwNumRule;
 class SwPageDesc;
 
@@ -40,17 +40,17 @@ public:
         If string pointer is defined request only description
         of attributes, do not create style sheet!
     */
-    virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0;
+    virtual SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0;
 
     /** Return required automatic format base class.
     */
-    virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ) = 0;
+    virtual SwFormat* GetFormatFromPool( sal_uInt16 nId ) = 0;
 
     /** Return required automatic format.
      */
-    virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) = 0;
+    virtual SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) = 0;
 
-    virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) = 0;
+    virtual SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) = 0;
 
     /** Return required automatic page style.
      */
@@ -60,8 +60,8 @@ public:
 
     /** Check whether this "auto-collection" is used in document.
      */
-    virtual bool IsPoolTxtCollUsed( sal_uInt16 nId ) const = 0;
-    virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const = 0;
+    virtual bool IsPoolTextCollUsed( sal_uInt16 nId ) const = 0;
+    virtual bool IsPoolFormatUsed( sal_uInt16 nId ) const = 0;
     virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const = 0;
 
 protected:
diff --git a/sw/inc/IGrammarContact.hxx b/sw/inc/IGrammarContact.hxx
index 62c053f90fcb..58dc2ebb1ef5 100644
--- a/sw/inc/IGrammarContact.hxx
+++ b/sw/inc/IGrammarContact.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_SW_INC_IGRAMMARCONTACT_HXX
 
 struct SwPosition;
-class SwTxtNode;
+class SwTextNode;
 class SwGrammarMarkUp;
 class SwDoc;
 
-/** Organizer of the contact between SwTxtNodes and grammar checker
+/** Organizer of the contact between SwTextNodes and grammar checker
 */
 class IGrammarContact
 {
@@ -42,9 +42,9 @@ public:
     /** getGrammarCheck checks if the given text node is blocked by the current cursor
         if not, the normal markup list is returned
         if blocked, it will return a markup list "proxy"
-    @returns a markup list (grammar) for the given SwTxtNode
+    @returns a markup list (grammar) for the given SwTextNode
     */
-    virtual SwGrammarMarkUp* getGrammarCheck( SwTxtNode& rTxtNode, bool bCreate ) = 0;
+    virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool bCreate ) = 0;
 
     /** finishGrammarCheck() has to be called if a grammar checking has been completed
         for a text node. If this text node has not been hided by the current proxy list
@@ -52,7 +52,7 @@ public:
         repaint will be triggered by a timer
     @returns void
     */
-    virtual void finishGrammarCheck( SwTxtNode& rTxtNode ) = 0;
+    virtual void finishGrammarCheck( SwTextNode& rTextNode ) = 0;
 
 public:
     virtual ~IGrammarContact() {}
@@ -68,12 +68,12 @@ IGrammarContact* createGrammarContact();
 /** getGrammarContact() delivers the grammar contact of the document (for a given textnode)
 @returns grammar contact
 */
-IGrammarContact* getGrammarContact( const SwTxtNode& );
+IGrammarContact* getGrammarContact( const SwTextNode& );
 
 /** finishGrammarCheck() calls the same function of the grammar contact of the document (for a given textnode)
 @returns void
 */
-void finishGrammarCheck( SwTxtNode& );
+void finishGrammarCheck( SwTextNode& );
 
 #endif // INCLUDED_SW_INC_IGRAMMARCONTACT_HXX
 
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 859e07434a00..8d1ddd0d65f8 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -40,7 +40,7 @@ class SwWrtShell;
 class SwDoc;
 class SwView;
 class SwPostItField;
-class SwFmtFld;
+class SwFormatField;
 class SwField;
 class SfxBroadcaster;
 class SfxHint;
@@ -89,10 +89,10 @@ struct SwPostItPageItem
 
 struct FieldShadowState
 {
-    const SwPostItField* mpShadowFld;
+    const SwPostItField* mpShadowField;
     bool bCursor;
     bool bMouse;
-    FieldShadowState(): mpShadowFld(0),bCursor(false),bMouse(false)
+    FieldShadowState(): mpShadowField(0),bCursor(false),bMouse(false)
     {
     }
 };
@@ -142,7 +142,7 @@ class SwPostItMgr: public SfxListener
         SwView*                         mpView;
         SwWrtShell*                     mpWrtShell;
         VclPtr<SwEditWin>               mpEditWin;
-        std::list< SwSidebarItem*>      mvPostItFlds;
+        std::list< SwSidebarItem*>      mvPostItFields;
         std::vector<SwPostItPageItem*>  mPages;
         ImplSVEvent *                   mnEventId;
         bool                            mbWaitingForCalcRects;
@@ -194,8 +194,8 @@ class SwPostItMgr: public SfxListener
             virtual ~SwPostItMgr();
 
             typedef std::list< SwSidebarItem* >::const_iterator const_iterator;
-            const_iterator begin()  const { return mvPostItFlds.begin(); }
-            const_iterator end()    const { return mvPostItFlds.end();  }
+            const_iterator begin()  const { return mvPostItFields.begin(); }
+            const_iterator end()    const { return mvPostItFields.end();  }
 
             void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
@@ -236,7 +236,7 @@ class SwPostItMgr: public SfxListener
             bool IsHit(const Point &aPointPixel);
             Color GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) const;
 
-            sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pFld) const;
+            sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pField) const;
 
             sw::sidebarwindows::SwSidebarWin* GetNextPostIt( sal_uInt16 aDirection,
                                                              sw::sidebarwindows::SwSidebarWin* aPostIt);
@@ -255,7 +255,7 @@ class SwPostItMgr: public SfxListener
             sal_Int32 GetMinimumSizeWithMeta() const;
             sal_Int32 GetSidebarScrollerHeight() const;
 
-            void SetShadowState(const SwPostItField* pFld,bool bCursor = true);
+            void SetShadowState(const SwPostItField* pField,bool bCursor = true);
 
             void SetSpellChecking();
 
@@ -269,15 +269,15 @@ class SwPostItMgr: public SfxListener
             void StartSpelling();
 
             sal_uInt16 Replace(SvxSearchItem* pItem);
-            sal_uInt16 SearchReplace(const SwFmtFld &pFld, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
+            sal_uInt16 SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
             sal_uInt16 FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
 
             // get the PostIt window by index
-            sal_Int32 GetPostItCount() const {return mvPostItFlds.size();}
+            sal_Int32 GetPostItCount() const {return mvPostItFields.size();}
             void AssureStdModeAtShell();
 
             void ConnectSidebarWinToFrm( const SwFrm& rFrm,
-                                         const SwFmtFld& rFmtFld,
+                                         const SwFormatField& rFormatField,
                                          sw::sidebarwindows::SwSidebarWin& rSidebarWin );
             void DisconnectSidebarWinFromFrm( const SwFrm& rFrm,
                                               sw::sidebarwindows::SwSidebarWin& rSidebarWin );
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 92ec2d49c09a..9514ac0eca90 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -49,7 +49,7 @@ namespace sw { namespace overlay {
 
 namespace sw { namespace sidebarwindows {
 
-class SidebarTxtControl;
+class SidebarTextControl;
 class AnchorOverlayObject;
 class ShadowOverlayObject;
 
@@ -211,7 +211,7 @@ class SwSidebarWin : public vcl::Window
         OutlinerView*   mpOutlinerView;
         Outliner*       mpOutliner;
 
-        VclPtr<sw::sidebarwindows::SidebarTxtControl> mpSidebarTxtControl;
+        VclPtr<sw::sidebarwindows::SidebarTextControl> mpSidebarTextControl;
         VclPtr<ScrollBar>      mpVScrollbar;
         VclPtr<Edit>           mpMetadataAuthor;
         VclPtr<Edit>           mpMetadataDate;
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 81e96800613d..64cf8cea492e 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -22,22 +22,22 @@
 
 #include <SwNumberTree.hxx>
 
-class SwTxtNode;
+class SwTextNode;
 struct SwPosition;
 class SwNumRule;
-class SwNumFmt;
+class SwNumFormat;
 
 class SW_DLLPUBLIC SwNodeNum : public SwNumberTreeNode
 {
 public:
 
-    explicit SwNodeNum( SwTxtNode* pTxtNode );
+    explicit SwNodeNum( SwTextNode* pTextNode );
     explicit SwNodeNum( SwNumRule* pNumRule );
     virtual ~SwNodeNum();
 
     SwNumRule* GetNumRule() const { return mpNumRule;}
     void ChangeNumRule( SwNumRule& rNumRule );
-    SwTxtNode* GetTxtNode() const { return mpTxtNode;}
+    SwTextNode* GetTextNode() const { return mpTextNode;}
 
     virtual bool IsNotificationEnabled() const SAL_OVERRIDE;
 
@@ -68,7 +68,7 @@ public:
 
         @author OD
     */
-    const SwNodeNum* GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const;
+    const SwNodeNum* GetPrecedingNodeNumOf( const SwTextNode& rTextNode ) const;
 
 protected:
     virtual SwNumberTreeNode * Create() const SAL_OVERRIDE;
@@ -82,7 +82,7 @@ protected:
     // method called at a child after this child has been removed from the list tree
     virtual void PostRemove() SAL_OVERRIDE;
 private:
-    SwTxtNode * mpTxtNode;
+    SwTextNode * mpTextNode;
     SwNumRule * mpNumRule;
 
     static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum );
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 3a27cbc28479..0f55905dbba2 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -49,9 +49,9 @@
  *
  * 1. Paragraph contains the Text, Lists, Extra, Register, Doc and HTML
  *    name arrays.
- * 2. Character contains the ChrFmt and HTMLChrFmt name arrays.
+ * 2. Character contains the ChrFormat and HTMLChrFormat name arrays.
  * 3. Page contains the PageDesc name array.
- * 4. Frame contains the FrmFmt name array.
+ * 4. Frame contains the FrameFormat name array.
  * 5. Numbering Rule contains the NumRule name array.
  */
 
@@ -88,9 +88,9 @@ protected:
                             *pRegisterUINameArray,
                             *pDocUINameArray,
                             *pHTMLUINameArray,
-                            *pFrmFmtUINameArray,
-                            *pChrFmtUINameArray,
-                            *pHTMLChrFmtUINameArray,
+                            *pFrameFormatUINameArray,
+                            *pChrFormatUINameArray,
+                            *pHTMLChrFormatUINameArray,
                             *pPageDescUINameArray,
                             *pNumRuleUINameArray,
     // Programmatic Name tables
@@ -100,9 +100,9 @@ protected:
                             *pRegisterProgNameArray,
                             *pDocProgNameArray,
                             *pHTMLProgNameArray,
-                            *pFrmFmtProgNameArray,
-                            *pChrFmtProgNameArray,
-                            *pHTMLChrFmtProgNameArray,
+                            *pFrameFormatProgNameArray,
+                            *pChrFormatProgNameArray,
+                            *pHTMLChrFormatProgNameArray,
                             *pPageDescProgNameArray,
                             *pNumRuleProgNameArray;
 
@@ -171,9 +171,9 @@ public:
     static const ::std::vector<OUString>& GetRegisterUINameArray();
     static const ::std::vector<OUString>& GetDocUINameArray();
     static const ::std::vector<OUString>& GetHTMLUINameArray();
-    static const ::std::vector<OUString>& GetFrmFmtUINameArray();
-    static const ::std::vector<OUString>& GetChrFmtUINameArray();
-    static const ::std::vector<OUString>& GetHTMLChrFmtUINameArray();
+    static const ::std::vector<OUString>& GetFrameFormatUINameArray();
+    static const ::std::vector<OUString>& GetChrFormatUINameArray();
+    static const ::std::vector<OUString>& GetHTMLChrFormatUINameArray();
     static const ::std::vector<OUString>& GetPageDescUINameArray();
     static const ::std::vector<OUString>& GetNumRuleUINameArray();
 
@@ -183,9 +183,9 @@ public:
     static const ::std::vector<OUString>& GetRegisterProgNameArray();
     static const ::std::vector<OUString>& GetDocProgNameArray();
     static const ::std::vector<OUString>& GetHTMLProgNameArray();
-    static const ::std::vector<OUString>& GetFrmFmtProgNameArray();
-    static const ::std::vector<OUString>& GetChrFmtProgNameArray();
-    static const ::std::vector<OUString>& GetHTMLChrFmtProgNameArray();
+    static const ::std::vector<OUString>& GetFrameFormatProgNameArray();
+    static const ::std::vector<OUString>& GetChrFormatProgNameArray();
+    static const ::std::vector<OUString>& GetHTMLChrFormatProgNameArray();
     static const ::std::vector<OUString>& GetPageDescProgNameArray();
     static const ::std::vector<OUString>& GetNumRuleProgNameArray();
 };
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index e34dd2c8cdba..2a8a6b4540d9 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -44,7 +44,7 @@ public:
 class SwUndoFieldFromDoc : public SwUndoField
 {
     SwField * pOldField, * pNewField;
-    SwMsgPoolItem * pHnt;
+    SwMsgPoolItem * pHint;
     bool bUpdate;
 
     void DoImpl();
@@ -52,7 +52,7 @@ class SwUndoFieldFromDoc : public SwUndoField
 public:
     SwUndoFieldFromDoc(const SwPosition & rPos, const SwField & aOldField,
                        const SwField & aNewField,
-                       SwMsgPoolItem * pHnt, bool bUpdate,
+                       SwMsgPoolItem * pHint, bool bUpdate,
                        SwUndoId nId = UNDO_FIELD );
 
     virtual ~SwUndoFieldFromDoc();
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 2e439c05f2d8..a8b06d0bdf95 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -15,7 +15,7 @@
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
-class SwTxtNode;
+class SwTextNode;
 
 class ToxLinkProcessorTest;
 
@@ -41,7 +41,7 @@ public:
 
     /** Insert the found links as attributes to a text node */
     void
-    InsertLinkAttributes(SwTxtNode& node);
+    InsertLinkAttributes(SwTextNode& node);
 
 private:
     /** Obtain the pool id which belongs to a character style.
@@ -66,9 +66,9 @@ private:
      */
     struct ClosedLink {
         ClosedLink(const OUString& url, sal_Int32 startPosition, sal_Int32 endPosition) :
-                mINetFmt(url, OUString()), mStartTextPos(endPosition), mEndTextPos(startPosition) {
+                mINetFormat(url, OUString()), mStartTextPos(endPosition), mEndTextPos(startPosition) {
         }
-        SwFmtINetFmt mINetFmt;
+        SwFormatINetFormat mINetFormat;
         sal_Int32 mStartTextPos;
         sal_Int32 mEndTextPos;
     };
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx
index a0d9e421c190..7e5be38eac81 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -19,7 +19,7 @@
 struct SwFormToken;
 class SwPageDesc;
 class SwRootFrm;
-class SwTxtNode;
+class SwTextNode;
 
 namespace sw {
 
@@ -45,7 +45,7 @@ public:
      *          and to provide the returned SvxTabStop to the attributes of the node.
      */
     virtual HandledTabStopToken
-    HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode,
+    HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
             const SwRootFrm *currentLayout) const = 0;
 };
 
@@ -83,7 +83,7 @@ public:
      * method behaves differently when deriving the tab stop position.
      */
     ToxTabStopTokenHandler::HandledTabStopToken
-    HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode,
+    HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
             const SwRootFrm *currentLayout) const SAL_OVERRIDE;
 
 private:
@@ -92,14 +92,14 @@ private:
      * Is used to determine how to find tab stop position.
      */
     static bool
-    CanUseLayoutRectangle(const SwTxtNode& targetNode, const SwRootFrm *currentLayout);
+    CanUseLayoutRectangle(const SwTextNode& targetNode, const SwRootFrm *currentLayout);
 
     /** Calculate the page margin from the page description.
      *
      * This is the fallback method to determine the position of a tab stop.
      */
     long
-    CalculatePageMarginFromPageDescription(const SwTxtNode& targetNode) const;
+    CalculatePageMarginFromPageDescription(const SwTextNode& targetNode) const;
 
     sal_uInt32 mIndexOfSectionNode;
     const SwPageDesc& mDefaultPageDescription;
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 57f908963ed0..94f142c83ff3 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -29,18 +29,18 @@
 
 class SfxItemSet;
 class SwAttrPool;
-class SwFmtAutoFmt;
+class SwFormatAutoFormat;
 class SwChapterField;
 class SwChapterFieldType;
-class SwCntntFrm;
-class SwCntntNode;
+class SwContentFrm;
+class SwContentNode;
 class SwDoc;
 class SwForm;
 struct SwFormToken;
 class SwPageDesc;
 class SwRootFrm;
-class SwTxtAttr;
-class SwTxtNode;
+class SwTextAttr;
+class SwTextNode;
 struct SwTOXSortTabBase;
 class SvxTabStop;
 class ToxTextGeneratorTest;
@@ -80,7 +80,7 @@ private:
      */
     struct HandledTextToken {
         OUString text;
-        std::vector<SwFmtAutoFmt*> autoFormats;
+        std::vector<SwFormatAutoFormat*> autoFormats;
         std::vector<sal_Int32> startPositions;
         std::vector<sal_Int32> endPositions;
     };
@@ -94,7 +94,7 @@ private:
 
     /** Applies the result of a handled text token to a target node. */
     static void
-    ApplyHandledTextToken(const HandledTextToken& htt, SwTxtNode& targetNode);
+    ApplyHandledTextToken(const HandledTextToken& htt, SwTextNode& targetNode);
 
     /** Handle a page number token.
      *
@@ -117,11 +117,11 @@ private:
      * @param pool The attribute pool for the new items
      */
     static std::shared_ptr<SfxItemSet>
-    CollectAttributesForTox(const SwTxtAttr& hint, SwAttrPool& pool);
+    CollectAttributesForTox(const SwTextAttr& hint, SwAttrPool& pool);
 
     /** This method will call GetNumStringOfFirstNode() of the first node in the provided SwTOXSortTabBase.
      *
-     * The parameters @p bUsePrefix and @p nLevel are passed to SwTxtNode::GetNumString()
+     * The parameters @p bUsePrefix and @p nLevel are passed to SwTextNode::GetNumString()
      *
      * @internal
      * The method is only called if several preconditions for @p rBase are true. Check the implementation
@@ -138,8 +138,8 @@ private:
     /** Generate the text for a chapter token.
      */
     OUString
-    GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwCntntFrm* contentFrame,
-            const SwCntntNode *contentNode) const;
+    GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrm* contentFrame,
+            const SwContentNode *contentNode) const;
 
     /** Obtain a ChapterField to use for the text generation.
      * @internal
@@ -147,7 +147,7 @@ private:
      */
     virtual SwChapterField
     ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
-            const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) const;
+            const SwContentFrm* contentFrame, const SwContentNode *contentNode) const;
 
     friend class ::ToxTextGeneratorTest;
 };
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 2cb5a567319b..bf9dcd1c613a 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -38,7 +38,7 @@ class SwAccessibleParagraph;
 class SwViewShell;
 class Rectangle;
 class SwFrm;
-class SwTxtFrm;
+class SwTextFrm;
 class SwPageFrm;
 class SwAccessibleContext;
 class SwAccessibleContextMap_Impl;
@@ -203,7 +203,7 @@ public:
 
     void InvalidateContent( const SwFrm *pFrm );
 
-    void InvalidateAttr( const SwTxtFrm& rTxtFrm );
+    void InvalidateAttr( const SwTextFrm& rTextFrm );
 
     void InvalidateCursorPosition( const SwFrm *pFrm );
     void InvalidateFocus();
@@ -221,7 +221,7 @@ public:
 
         @author OD
 
-        @param _rTxtFrm
+        @param _rTextFrm
         input parameter - reference to paragraph, whose CONTENT_FLOWS_FROM/_TO
         has to be invalidated.
 
@@ -229,14 +229,14 @@ public:
         input parameter - boolean indicating, if relation CONTENT_FLOWS_FROM
         (value <true>) or CONTENT_FLOWS_TO (value <false>) has to be invalidated.
     */
-    void InvalidateParaFlowRelation( const SwTxtFrm& _rTxtFrm,
+    void InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm,
                                      const bool _bFrom );
 
     /** invalidation of text selection of a paragraph
 
         @author OD
     */
-    void InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm );
+    void InvalidateParaTextSelection( const SwTextFrm& _rTextFrm );
 
     /** invalidation of text selection of all paragraphs
 
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 55fdb78c0c93..1a869f1fd2bc 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -135,8 +135,8 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         }
 
         // accessors to the format
-        virtual SwFrmFmt& GetFrmFmt() SAL_OVERRIDE;
-        virtual const SwFrmFmt& GetFrmFmt() const SAL_OVERRIDE;
+        virtual SwFrameFormat& GetFrameFormat() SAL_OVERRIDE;
+        virtual const SwFrameFormat& GetFrameFormat() const SAL_OVERRIDE;
 
         // accessors to the object area and its position
         virtual const SwRect GetObjRect() const SAL_OVERRIDE;
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index c31afee52daa..31b596a9ac72 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -27,13 +27,13 @@
 class SdrObject;
 class SwFrm;
 class SwLayoutFrm;
-class SwTxtFrm;
+class SwTextFrm;
 
 class SwPageFrm;
 class SwObjPositioningInProgress;
 
-class SwFrmFmt;
-class SwFmtAnchor;
+class SwFrameFormat;
+class SwFormatAnchor;
 
 /** wrapper class for the positioning of Writer fly frames and drawing objects
 
@@ -143,8 +143,8 @@ class SW_DLLPUBLIC SwAnchoredObject
             input parameter - reference to the text frame containing the anchor
             character.
         */
-        void _CheckCharRect( const SwFmtAnchor& _rAnch,
-                             const SwTxtFrm& _rAnchorCharFrm );
+        void _CheckCharRect( const SwFormatAnchor& _rAnch,
+                             const SwTextFrm& _rAnchorCharFrm );
 
         /** check top of line
 
@@ -162,12 +162,12 @@ class SW_DLLPUBLIC SwAnchoredObject
             input parameter - reference to the text frame containing the anchor
             character.
         */
-        void _CheckTopOfLine( const SwFmtAnchor& _rAnch,
-                              const SwTxtFrm& _rAnchorCharFrm );
+        void _CheckTopOfLine( const SwFormatAnchor& _rAnch,
+                              const SwTextFrm& _rAnchorCharFrm );
 
         // method <sw_HideObj(..)> sets needed data structure values for the
         // object positioning
-        friend bool sw_HideObj( const SwTxtFrm& _rFrm,
+        friend bool sw_HideObj( const SwTextFrm& _rFrm,
                                  const RndStdIds _eAnchorType,
                                  const sal_Int32 _nObjAnchorPos,
                                  SwAnchoredObject* _pAnchoredObj );
@@ -260,11 +260,11 @@ class SW_DLLPUBLIC SwAnchoredObject
 
             @author OD
 
-            @return SwTxtFrm*
+            @return SwTextFrm*
             text frame containing the anchor character. It's NULL, if the object
             isn't anchored at-character resp. as-character.
         */
-        SwTxtFrm* FindAnchorCharFrm();
+        SwTextFrm* FindAnchorCharFrm();
 
         // accessors to data of position calculation:
         // frame vertical position is orient at
@@ -357,8 +357,8 @@ class SW_DLLPUBLIC SwAnchoredObject
         void SetCurrRelPos( Point _aRelPos );
 
         // accessors to the format
-        virtual SwFrmFmt& GetFrmFmt() = 0;
-        virtual const SwFrmFmt& GetFrmFmt() const = 0;
+        virtual SwFrameFormat& GetFrameFormat() = 0;
+        virtual const SwFrameFormat& GetFrameFormat() const = 0;
 
         // accessors to the object area and its position
         virtual const SwRect GetObjRect() const = 0;
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 949d08d3c7f2..4dcba72214bd 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -110,8 +110,8 @@ public:
         return *m_pForbidden;
     }
 
-    sal_uInt16 GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const;
-    SvtScriptType GetAllScriptsOfText( const OUString& rTxt ) const;
+    sal_uInt16 GetRealScriptOfText( const OUString& rText, sal_Int32 nPos ) const;
+    SvtScriptType GetAllScriptsOfText( const OUString& rText ) const;
 
     sal_Int32 getGraphemeCount(const OUString& rStr,
         sal_Int32 nStart, sal_Int32 nEnd) const;
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 55cc98f0a54f..1fcbfa5c0517 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -134,16 +134,16 @@ struct SwHash
 struct SwCalcExp : public SwHash
 {
     SwSbxValue  nValue;
-    const SwFieldType* pFldType;
+    const SwFieldType* pFieldType;
 
     SwCalcExp( const OUString& rStr, const SwSbxValue& rVal,
-                const SwFieldType* pFldType = 0 );
+                const SwFieldType* pFieldType = 0 );
 };
 
 SwHash* Find( const OUString& rSrch, SwHash* const * ppTable,
-                sal_uInt16 nTblSize, sal_uInt16* pPos = 0 );
+                sal_uInt16 nTableSize, sal_uInt16* pPos = 0 );
 
-void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTblSize );
+void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTableSize );
 
 // if _CalcOp != 0, this is a valid operator
 struct _CalcOp;
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index f11765e58c5e..ce677d9c746c 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -28,18 +28,18 @@
 
 namespace rtl { class OUString; }
 
-class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item
+class SW_DLLPUBLIC SwTableBoxNumFormat : public SfxUInt32Item
 {
     bool bAuto;     ///< automatically given flag
 public:
-    SwTblBoxNumFormat( sal_uInt32 nFormat = css::util::NumberFormat::TEXT,
+    SwTableBoxNumFormat( sal_uInt32 nFormat = css::util::NumberFormat::TEXT,
                         bool bAuto = false );
 
     // "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
 
-    inline SwTblBoxNumFormat& operator=( const SwTblBoxNumFormat& rAttr )
+    inline SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr )
     {
         SetValue( rAttr.GetValue() );
         SetAutoFlag( rAttr.GetAutoFlag() );
@@ -50,14 +50,14 @@ public:
     void SetAutoFlag( bool bFlag = true )       { bAuto = bFlag; }
 };
 
-class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula
+class SwTableBoxFormula : public SfxPoolItem, public SwTableFormula
 {
     SwModify* pDefinedIn;   // Modify object where the formula is located
                             // can only be TableBoxFormat
 
 public:
-    SwTblBoxFormula( const OUString& rFormula );
-    virtual ~SwTblBoxFormula() {};
+    SwTableBoxFormula( const OUString& rFormula );
+    virtual ~SwTableBoxFormula() {};
 
     // "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -71,24 +71,24 @@ public:
 
           SwTableBox* GetTableBox();
     const SwTableBox* GetTableBox() const
-        { return const_cast<SwTblBoxFormula*>(this)->GetTableBox(); }
+        { return const_cast<SwTableBoxFormula*>(this)->GetTableBox(); }
 
     void ChangeState( const SfxPoolItem* pItem );
-    void Calc( SwTblCalcPara& rCalcPara, double& rValue );
+    void Calc( SwTableCalcPara& rCalcPara, double& rValue );
 };
 
-class SW_DLLPUBLIC SwTblBoxValue : public SfxPoolItem
+class SW_DLLPUBLIC SwTableBoxValue : public SfxPoolItem
 {
     double nValue;
 public:
-    SwTblBoxValue();
-    SwTblBoxValue( const double aVal );
+    SwTableBoxValue();
+    SwTableBoxValue( const double aVal );
 
     // "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
 
-    inline SwTblBoxValue& operator=( const SwTblBoxValue& rCmp )
+    inline SwTableBoxValue& operator=( const SwTableBoxValue& rCmp )
     {
         nValue = rCmp.nValue;
         return *this;
@@ -97,19 +97,19 @@ public:
     double GetValue() const                     { return nValue; }
 };
 
-inline const SwTblBoxNumFormat      &SwAttrSet::GetTblBoxNumFmt(bool bInP) const
-    {   return static_cast<const SwTblBoxNumFormat&>(Get( RES_BOXATR_FORMAT,bInP)); }
-inline const SwTblBoxFormula        &SwAttrSet::GetTblBoxFormula(bool bInP) const
-    {   return static_cast<const SwTblBoxFormula&>(Get( RES_BOXATR_FORMULA,bInP)); }
-inline const SwTblBoxValue          &SwAttrSet::GetTblBoxValue(bool bInP) const
-    {   return static_cast<const SwTblBoxValue&>(Get( RES_BOXATR_VALUE, bInP)); }
-
-inline const SwTblBoxNumFormat      &SwFmt::GetTblBoxNumFmt(bool bInP) const
-    {   return m_aSet.GetTblBoxNumFmt(bInP); }
-inline const SwTblBoxFormula        &SwFmt::GetTblBoxFormula(bool bInP) const
-    {   return m_aSet.GetTblBoxFormula(bInP); }
-inline const SwTblBoxValue          &SwFmt::GetTblBoxValue(bool bInP) const
-    {   return m_aSet.GetTblBoxValue(bInP); }
+inline const SwTableBoxNumFormat      &SwAttrSet::GetTableBoxNumFormat(bool bInP) const
+    {   return static_cast<const SwTableBoxNumFormat&>(Get( RES_BOXATR_FORMAT,bInP)); }
+inline const SwTableBoxFormula        &SwAttrSet::GetTableBoxFormula(bool bInP) const
+    {   return static_cast<const SwTableBoxFormula&>(Get( RES_BOXATR_FORMULA,bInP)); }
+inline const SwTableBoxValue          &SwAttrSet::GetTableBoxValue(bool bInP) const
+    {   return static_cast<const SwTableBoxValue&>(Get( RES_BOXATR_VALUE, bInP)); }
+
+inline const SwTableBoxNumFormat      &SwFormat::GetTableBoxNumFormat(bool bInP) const
+    {   return m_aSet.GetTableBoxNumFormat(bInP); }
+inline const SwTableBoxFormula        &SwFormat::GetTableBoxFormula(bool bInP) const
+    {   return m_aSet.GetTableBoxFormula(bInP); }
+inline const SwTableBoxValue          &SwFormat::GetTableBoxValue(bool bInP) const
+    {   return m_aSet.GetTableBoxValue(bInP); }
 
 #endif
 
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 880e2918b329..11386ef6d48e 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -28,27 +28,27 @@ class SwTableSortBoxes;
 class SwSelBoxes;
 class SwCalc;
 class SwTableBox;
-class SwTableFmlUpdate;
+class SwTableFormulaUpdate;
 class SwDoc;
 
-class SwTblCalcPara
+class SwTableCalcPara
 {
-    const SwTableBox* pLastTblBox;
+    const SwTableBox* pLastTableBox;
     sal_uInt16 nStackCnt, nMaxSize;
 
 public:
     SwTableSortBoxes *pBoxStk;  ///< stack for recognizing recursion
     SwCalc& rCalc;              ///< current Calculator
-    const SwTable* pTbl;        ///< current table
+    const SwTable* pTable;        ///< current table
 
-    SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable );
-    ~SwTblCalcPara();
+    SwTableCalcPara( SwCalc& rCalculator, const SwTable& rTable );
+    ~SwTableCalcPara();
 
     bool CalcWithStackOverflow();
     bool IsStackOverflow() const        { return nMaxSize == nStackCnt; }
     bool IncStackCnt()                  { return nMaxSize == ++nStackCnt; }
     void DecStackCnt()                  { if( nStackCnt ) --nStackCnt; }
-    void SetLastTblBox( const SwTableBox* pBox )    { pLastTblBox = pBox; }
+    void SetLastTableBox( const SwTableBox* pBox )    { pLastTableBox = pBox; }
 };
 
 class SwTableFormula
@@ -68,7 +68,7 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&,
                         void* pPara = 0 ) const;
     void _MakeFormula( const SwTable&, OUString&, OUString&, OUString* = 0,
                         void* pPara = 0 ) const;
-    void _GetFmlBoxes( const SwTable&, OUString&, OUString&, OUString* = 0,
+    void _GetFormulaBoxes( const SwTable&, OUString&, OUString&, OUString* = 0,
                         void* pPara = 0 ) const;
     void _HasValidBoxes( const SwTable&, OUString&, OUString&, OUString* = 0,
                         void* pPara = 0 ) const;
@@ -77,7 +77,7 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&,
 
     static void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd,
                     SwSelBoxes& rBoxes );
-    OUString ScanString( FnScanFormula fnFormula, const SwTable& rTbl,
+    OUString ScanString( FnScanFormula fnFormula, const SwTable& rTable,
                         void* = 0 ) const;
 
     static const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm );
@@ -97,13 +97,13 @@ protected:
 
     SwTableFormula( const OUString& rFormula );
 
-    OUString MakeFormula( SwTblCalcPara& rCalcPara ) const
+    OUString MakeFormula( SwTableCalcPara& rCalcPara ) const
     {
         return ScanString( &SwTableFormula::_MakeFormula,
-                            *rCalcPara.pTbl, &rCalcPara );
+                            *rCalcPara.pTable, &rCalcPara );
     }
 
-    static sal_uInt16 GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox );
+    static sal_uInt16 GetLnPosInTable( const SwTable& rTable, const SwTableBox* pBox );
 
 public:
 
@@ -118,13 +118,13 @@ public:
     }
 
     /// create from the internal formula (for CORE) the external formula (for UI)
-    void PtrToBoxNm( const SwTable* pTbl );
+    void PtrToBoxNm( const SwTable* pTable );
     /// create from the external formula the internal
-    void BoxNmToPtr( const SwTable* pTbl );
+    void BoxNmToPtr( const SwTable* pTable );
     /// create from the external/internal formula the relative formula
-    void ToRelBoxNm( const SwTable* pTbl );
+    void ToRelBoxNm( const SwTable* pTable );
     /// gets called before/after merging/splitting of tables
-    void ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd );
+    void ToSplitMergeBoxNm( SwTableFormulaUpdate& rTableUpd );
 
     bool IsIntrnlName() const               { return m_eNmType == INTRNL_NAME; }
     NameType GetNameType() const            { return m_eNmType; }
@@ -140,7 +140,7 @@ public:
         m_bValidValue = false;
     }
 
-    void GetBoxesOfFormula(const SwTable& rTbl, SwSelBoxes& rBoxes);
+    void GetBoxesOfFormula(const SwTable& rTable, SwSelBoxes& rBoxes);
     // are all boxes valid which this formula relies on?
     bool HasValidBoxes() const;
 };
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 1fa539091d57..9634ce66f0c8 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -132,71 +132,71 @@ inline const SvxBoxItem          &SwAttrSet::GetCharBorder( bool bInP ) const
 inline const SvxShadowItem       &SwAttrSet::GetCharShadow( bool bInP ) const
     {   return static_cast<const SvxShadowItem&>(Get( RES_CHRATR_SHADOW, bInP )); }
 
-// implementation of the character attribute methods of SwFmt
+// implementation of the character attribute methods of SwFormat
 
-inline const SvxPostureItem          &SwFmt::GetPosture(bool bInP) const
+inline const SvxPostureItem          &SwFormat::GetPosture(bool bInP) const
     {   return m_aSet.GetPosture(bInP); }
-inline const SvxWeightItem           &SwFmt::GetWeight(bool bInP) const
+inline const SvxWeightItem           &SwFormat::GetWeight(bool bInP) const
     {   return m_aSet.GetWeight(bInP); }
-inline const SvxShadowedItem         &SwFmt::GetShadowed(bool bInP) const
+inline const SvxShadowedItem         &SwFormat::GetShadowed(bool bInP) const
     {   return m_aSet.GetShadowed(bInP); }
-inline const SvxAutoKernItem         &SwFmt::GetAutoKern(bool bInP) const
+inline const SvxAutoKernItem         &SwFormat::GetAutoKern(bool bInP) const
     {   return m_aSet.GetAutoKern(bInP); }
-inline const SvxWordLineModeItem     &SwFmt::GetWordLineMode(bool bInP) const
+inline const SvxWordLineModeItem     &SwFormat::GetWordLineMode(bool bInP) const
     {   return m_aSet.GetWordLineMode(bInP); }
-inline const SvxContourItem          &SwFmt::GetContour(bool bInP) const
+inline const SvxContourItem          &SwFormat::GetContour(bool bInP) const
     {   return m_aSet.GetContour(bInP); }
-inline const SvxKerningItem          &SwFmt::GetKerning(bool bInP) const
+inline const SvxKerningItem          &SwFormat::GetKerning(bool bInP) const
     {   return m_aSet.GetKerning(bInP); }
-inline const SvxUnderlineItem        &SwFmt::GetUnderline(bool bInP) const
+inline const SvxUnderlineItem        &SwFormat::GetUnderline(bool bInP) const
     {   return m_aSet.GetUnderline(bInP); }
-inline const SvxOverlineItem         &SwFmt::GetOverline(bool bInP) const
+inline const SvxOverlineItem         &SwFormat::GetOverline(bool bInP) const
     {   return m_aSet.GetOverline(bInP); }
-inline const SvxCrossedOutItem       &SwFmt::GetCrossedOut(bool bInP) const
+inline const SvxCrossedOutItem       &SwFormat::GetCrossedOut(bool bInP) const
     {   return m_aSet.GetCrossedOut(bInP); }
-inline const SvxFontHeightItem             &SwFmt::GetSize(bool bInP) const
+inline const SvxFontHeightItem             &SwFormat::GetSize(bool bInP) const
     {   return m_aSet.GetSize(bInP); }
-inline const SvxPropSizeItem         &SwFmt::GetPropSize(bool bInP) const
+inline const SvxPropSizeItem         &SwFormat::GetPropSize(bool bInP) const
     {   return m_aSet.GetPropSize(bInP); }
-inline const SvxFontItem             &SwFmt::GetFont(bool bInP) const
+inline const SvxFontItem             &SwFormat::GetFont(bool bInP) const
     {   return m_aSet.GetFont(bInP); }
-inline const SvxFontItem         &SwFmt::GetCJKFont(bool bInP) const
+inline const SvxFontItem         &SwFormat::GetCJKFont(bool bInP) const
     {   return m_aSet.GetCJKFont(bInP); }
-inline const SvxFontItem         &SwFmt::GetCTLFont(bool bInP) const
+inline const SvxFontItem         &SwFormat::GetCTLFont(bool bInP) const
     {   return m_aSet.GetCTLFont(bInP); }
-inline const SvxColorItem            &SwFmt::GetColor(bool bInP) const
+inline const SvxColorItem            &SwFormat::GetColor(bool bInP) const
     {   return m_aSet.GetColor(bInP); }
-    inline const SvxCharSetColorItem    &SwFmt::GetCharSetColor(bool bInP) const
+    inline const SvxCharSetColorItem    &SwFormat::GetCharSetColor(bool bInP) const
     {   return m_aSet.GetCharSetColor(bInP); }
-inline const SvxLanguageItem         &SwFmt::GetLanguage(bool bInP) const
+inline const SvxLanguageItem         &SwFormat::GetLanguage(bool bInP) const
     {   return m_aSet.GetLanguage(bInP); }
-inline const SvxEscapementItem       &SwFmt::GetEscapement(bool bInP) const
+inline const SvxEscapementItem       &SwFormat::GetEscapement(bool bInP) const
     {   return m_aSet.GetEscapement(bInP); }
-inline const SvxCaseMapItem          &SwFmt::GetCaseMap(bool bInP) const
+inline const SvxCaseMapItem          &SwFormat::GetCaseMap(bool bInP) const
     {   return m_aSet.GetCaseMap(bInP); }
-inline const SvxNoHyphenItem        &SwFmt::GetNoHyphenHere(bool bInP) const
+inline const SvxNoHyphenItem        &SwFormat::GetNoHyphenHere(bool bInP) const
     {   return m_aSet.GetNoHyphenHere(bInP); }
-inline const SvxBlinkItem           &SwFmt::GetBlink(bool bInP) const
+inline const SvxBlinkItem           &SwFormat::GetBlink(bool bInP) const
     {   return m_aSet.GetBlink(bInP); }
-inline const SvxBrushItem           &SwFmt::GetChrBackground(bool bInP) const
+inline const SvxBrushItem           &SwFormat::GetChrBackground(bool bInP) const
     {   return m_aSet.GetChrBackground(bInP); }
-inline const SvxBrushItem &SwFmt::GetChrHighlight(bool bInP) const
+inline const SvxBrushItem &SwFormat::GetChrHighlight(bool bInP) const
     {   return m_aSet.GetChrHighlight(bInP); }
-inline const SvxEmphasisMarkItem   &SwFmt::GetEmphasisMark( bool bInP ) const
+inline const SvxEmphasisMarkItem   &SwFormat::GetEmphasisMark( bool bInP ) const
     {   return m_aSet.GetEmphasisMark(bInP); }
-inline const SvxTwoLinesItem       &SwFmt::Get2Lines( bool bInP ) const
+inline const SvxTwoLinesItem       &SwFormat::Get2Lines( bool bInP ) const
     {   return m_aSet.Get2Lines(bInP); }
-inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( bool bInP ) const
+inline const SvxCharScaleWidthItem &SwFormat::GetCharScaleW( bool bInP ) const
     {   return m_aSet.GetCharScaleW(bInP); }
-inline const SvxCharRotateItem     &SwFmt::GetCharRotate( bool bInP ) const
+inline const SvxCharRotateItem     &SwFormat::GetCharRotate( bool bInP ) const
     {   return m_aSet.GetCharRotate(bInP); }
-inline const SvxCharReliefItem     &SwFmt::GetCharRelief( bool bInP ) const
+inline const SvxCharReliefItem     &SwFormat::GetCharRelief( bool bInP ) const
     {   return m_aSet.GetCharRelief(bInP); }
-inline const SvxCharHiddenItem      &SwFmt::GetCharHidden( bool bInP ) const
+inline const SvxCharHiddenItem      &SwFormat::GetCharHidden( bool bInP ) const
     {   return m_aSet.GetCharHidden(bInP); }
-inline const SvxBoxItem     &SwFmt::GetCharBorder( bool bInP ) const
+inline const SvxBoxItem     &SwFormat::GetCharBorder( bool bInP ) const
     {   return m_aSet.GetCharBorder(bInP); }
-inline const SvxShadowItem  &SwFmt::GetCharShadow( bool bInP ) const
+inline const SvxShadowItem  &SwFormat::GetCharShadow( bool bInP ) const
     {   return m_aSet.GetCharShadow(bInP); }
 
 #endif
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index db67d1def83c..a9d029924a01 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -21,18 +21,18 @@
 
 #include <format.hxx>
 
-class SW_DLLPUBLIC SwCharFmt : public SwFmt
+class SW_DLLPUBLIC SwCharFormat : public SwFormat
 {
     friend class SwDoc;
-    friend class SwTxtFmtColl;
+    friend class SwTextFormatColl;
 
-    SwCharFmt( SwAttrPool& rPool, const sal_Char* pFmtName,
-                SwCharFmt *pDerivedFrom )
-          : SwFmt( rPool, pFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
+    SwCharFormat( SwAttrPool& rPool, const sal_Char* pFormatName,
+                SwCharFormat *pDerivedFrom )
+          : SwFormat( rPool, pFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT )
     {}
-    SwCharFmt( SwAttrPool& rPool, const OUString &rFmtName,
-                SwCharFmt *pDerivedFrom )
-          : SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
+    SwCharFormat( SwAttrPool& rPool, const OUString &rFormatName,
+                SwCharFormat *pDerivedFrom )
+          : SwFormat( rPool, rFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT )
     {}
 
 public:
@@ -41,11 +41,11 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-namespace CharFmt
+namespace CharFormat
 {
     SW_DLLPUBLIC extern const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr );
-    extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich );
-    extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr );
+    extern const SfxPoolItem* GetItem( const SwTextAttr& rAttr, sal_uInt16 nWhich );
+    extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTextAttr *pAttr );
 }
 
 #endif
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index dc59de1e1e61..5f22ceb36ec5 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -22,8 +22,8 @@
 #include "fldbas.hxx"
 
 class SwFrm;
-class SwCntntNode;
-class SwTxtNode;
+class SwContentNode;
+class SwTextNode;
 class ToxTextGeneratorTest;
 
 enum SwChapterFormat
@@ -60,13 +60,13 @@ class SW_DLLPUBLIC SwChapterField : public SwField
     virtual SwField* Copy() const SAL_OVERRIDE;
 
 public:
-    SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0);
+    SwChapterField(SwChapterFieldType*, sal_uInt32 nFormat = 0);
 
     // #i53420#
     void ChangeExpansion( const SwFrm*,
-                          const SwCntntNode*,
+                          const SwContentNode*,
         bool bSrchNum = false);
-    void ChangeExpansion(const SwTxtNode &rNd, bool bSrchNum);
+    void ChangeExpansion(const SwTextNode &rNd, bool bSrchNum);
 
     inline sal_uInt8 GetLevel() const;
     inline void SetLevel(sal_uInt8);
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index e07ca6fda4e0..7c15b3a88fbf 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -144,7 +144,7 @@
                                                         CalcLayout */
 
 #define FN_REDLINE_ACCEPT            (FN_EDIT2 + 29) /* Redlining Accept/Reject */
-#define FN_ATTR_COLUMNS              (FN_EDIT2 + 31) /* SlotId for SwFmtCol */
+#define FN_ATTR_COLUMNS              (FN_EDIT2 + 31) /* SlotId for SwFormatCol */
 #define FN_EDIT_CURRENT_TOX          (FN_EDIT2 + 32) /* edit current index */
 #define FN_EDIT_AUTH_ENTRY_DLG       (FN_EDIT2 + 33) /* edit authorities entry*/
 #define FN_UPDATE_CHARTS             (FN_EDIT2 + 34) /* update all charts */
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 84fbb87245c3..2fdcac8ba2c5 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -41,30 +41,30 @@
 
 class SfxItemSet;
 class SfxPoolItem;
-class SwCntntFrm;
+class SwContentFrm;
 class SwCrsrShell;
 class SwCursor;
 class SwField;
 class SwFieldType;
-class SwFmt;
-class SwFmtFld;
+class SwFormat;
+class SwFormatField;
 class SwNodeIndex;
 class SwPaM;
 class SwShellCrsr;
 class SwShellTableCrsr;
 class SwTableNode;
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwVisCrsr;
-class SwTxtINetFmt;
-class SwFmtINetFmt;
-class SwTxtAttr;
+class SwTextINetFormat;
+class SwFormatINetFormat;
+class SwTextAttr;
 class SwTableBox;
 class SwTOXMark;
 class SwRangeRedline;
 class IBlockCursor;
-class SwCntntNode;
+class SwContentNode;
 class SwPostItField;
-class SwTxtFld;
+class SwTextField;
 struct SwPosition;
 
 namespace com { namespace sun { namespace star { namespace util {
@@ -103,26 +103,26 @@ struct SwContentAtPos
         ,SW_CURR_ATTRS      = 0x4000        ///< only for debugging
         ,SW_TABLEBOXVALUE   = 0x8000        ///< only for debugging
 #endif
-    } eCntntAtPos;
+    } eContentAtPos;
 
     union {
-        const SwField* pFld;
+        const SwField* pField;
         const SfxPoolItem* pAttr;
         const SwRangeRedline* pRedl;
-        SwCntntNode * pNode;
-        const sw::mark::IFieldmark* pFldmark;
+        SwContentNode * pNode;
+        const sw::mark::IFieldmark* pFieldmark;
     } aFnd;
 
     int nDist;
 
     OUString sStr;
-    const SwTxtAttr* pFndTxtAttr;
+    const SwTextAttr* pFndTextAttr;
 
     SwContentAtPos( int eGetAtPos = 0xffff )
-        : eCntntAtPos( (IsAttrAtPos)eGetAtPos )
+        : eContentAtPos( (IsAttrAtPos)eGetAtPos )
     {
-        aFnd.pFld = 0;
-        pFndTxtAttr = 0;
+        aFnd.pField = 0;
+        pFndTextAttr = 0;
         nDist = 0; // #i23726#
     }
 
@@ -179,7 +179,7 @@ private:
 
     IBlockCursor *m_pBlockCrsr;   ///< interface of cursor for block (=rectangular) selection
 
-    SwShellTableCrsr* m_pTblCrsr; /**< table Crsr; only in tables when the
+    SwShellTableCrsr* m_pTableCrsr; /**< table Crsr; only in tables when the
                                    selection lays over 2 columns */
 
     SwNodeIndex* m_pBoxIdx;       ///< for recognizing of the changed
@@ -189,7 +189,7 @@ private:
                                    in the same column */
     long m_nLeftFrmPos;
     sal_uLong m_nAktNode;             // save CursorPos at Start-Action
-    sal_Int32 m_nAktCntnt;
+    sal_Int32 m_nAktContent;
     sal_uInt16 m_nAktNdTyp;
     bool m_bAktSelection;
 
@@ -222,7 +222,7 @@ private:
     bool m_bGCAttr : 1;           // true -> non expanded attributes exist.
     bool m_bIgnoreReadonly : 1;   // true -> make the cursor visible on next
                                 // EndAction in spite of Readonly
-    bool m_bSelTblCells : 1;      // true -> select cells over the InputWin
+    bool m_bSelTableCells : 1;      // true -> select cells over the InputWin
     bool m_bAutoUpdateCells : 1;  // true -> autoformat cells
     bool m_bBasicHideCrsr : 1;    // true -> HideCrsr from Basic
     bool m_bSetCrsrInReadOnly : 1;// true -> Cursor is allowed in ReadOnly-Areas
@@ -260,7 +260,7 @@ private:
 
     SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;
 
-    SAL_DLLPRIVATE bool isInHiddenTxtFrm(SwShellCrsr* pShellCrsr);
+    SAL_DLLPRIVATE bool isInHiddenTextFrm(SwShellCrsr* pShellCrsr);
 
 typedef bool (SwCursor:: *FNCrsr)();
     SAL_DLLPRIVATE bool CallCrsrFN( FNCrsr );
@@ -290,7 +290,7 @@ protected:
     void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos,
                     const sal_Int32 nOffset = 0 );
 
-    bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
+    bool _SelTableRowOrCol( bool bRow, bool bRowSimple = false );
 
     bool SetInFrontOfLabel( bool bNew );
 
@@ -318,7 +318,7 @@ public:
     ///< delete the current cursor and make the following into the current
     bool DestroyCrsr();
     ///< transform TableCursor to normal cursor, nullify Tablemode
-    void TblCrsrToCursor();
+    void TableCrsrToCursor();
     ///< enter block mode, change normal cursor into block cursor
     void CrsrToBlockCrsr();
     ///< leave block mode, change block cursor into normal cursor
@@ -333,8 +333,8 @@ public:
     /// If document body starts with a table.
     bool StartsWithTable();
 
-    SwPaM* GetCrsr( bool bMakeTblCrsr = true ) const;
-    inline SwCursor* GetSwCrsr( bool bMakeTblCrsr = true ) const;
+    SwPaM* GetCrsr( bool bMakeTableCrsr = true ) const;
+    inline SwCursor* GetSwCrsr( bool bMakeTableCrsr = true ) const;
     // return only the current cursor
           SwShellCrsr* _GetCrsr()                       { return m_pCurCrsr; }
     const SwShellCrsr* _GetCrsr() const                 { return m_pCurCrsr; }
@@ -380,10 +380,10 @@ public:
                 bool& bCancel,
                 FindRanges eRng, bool bReplace = false );
 
-    sal_uLong Find( const SwTxtFmtColl& rFmtColl,
+    sal_uLong Find( const SwTextFormatColl& rFormatColl,
                 SwDocPositions eStart, SwDocPositions eEnd,
                 bool& bCancel,
-                FindRanges eRng, const SwTxtFmtColl* pReplFmt = 0 );
+                FindRanges eRng, const SwTextFormatColl* pReplFormat = 0 );
 
     sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections,
                 SwDocPositions eStart, SwDocPositions eEnd,
@@ -470,7 +470,7 @@ public:
     void SetOverwriteCrsr( bool bFlag ) { m_bOverwriteCrsr = bFlag; }
 
     // Return current frame in which the cursor is placed.
-    SwCntntFrm *GetCurrFrm( const bool bCalcFrm = true ) const;
+    SwContentFrm *GetCurrFrm( const bool bCalcFrm = true ) const;
 
     //true if cursor is hidden because of readonly.
     //false if it is working despite readonly.
@@ -574,21 +574,21 @@ public:
 
     // get the selected text at the current cursor. it will be filled with
     // fields etc.
-    OUString GetSelTxt() const;
+    OUString GetSelText() const;
     // return only the text starting from the current cursor position (to the
     // end of the node)
     OUString GetText() const;
 
     // Check of SPoint or Mark of current cursor are placed within a table.
-    inline const SwTableNode* IsCrsrInTbl( bool bIsPtInTbl = true ) const;
+    inline const SwTableNode* IsCrsrInTable( bool bIsPtInTable = true ) const;
 
     inline Point& GetCrsrDocPos( bool bPoint = true ) const;
     inline bool IsCrsrPtAtEnd() const;
 
-    inline const  SwPaM* GetTblCrs() const;
-    inline        SwPaM* GetTblCrs();
+    inline const  SwPaM* GetTableCrs() const;
+    inline        SwPaM* GetTableCrs();
 
-    bool IsTblComplexForChart();
+    bool IsTableComplexForChart();
     // get current table selection as text
     OUString GetBoxNms() const;
 
@@ -599,11 +599,11 @@ public:
     bool GotoTable( const OUString& rName );
 
     // select a table row, column or box (based on the current cursor)
-    bool SelTblRow() { return _SelTblRowOrCol( true  ); }
-    bool SelTblCol() { return _SelTblRowOrCol( false ); }
-    bool SelTblBox();
+    bool SelTableRow() { return _SelTableRowOrCol( true  ); }
+    bool SelTableCol() { return _SelTableRowOrCol( false ); }
+    bool SelTableBox();
 
-    bool SelTbl();
+    bool SelTable();
 
     bool GotoNextNum();
     bool GotoPrevNum();
@@ -624,14 +624,14 @@ public:
     /** Delivers the current shell cursor
 
         Some operations have to run on the current cursor ring,
-        some on the m_pTblCrsr (if exist) or the current cursor ring and
-        some on the m_pTblCrsr or m_pBlockCrsr or the current cursor ring.
+        some on the m_pTableCrsr (if exist) or the current cursor ring and
+        some on the m_pTableCrsr or m_pBlockCrsr or the current cursor ring.
         This small function checks the existence and delivers the wished cursor.
 
         @param bBlock [bool]
         if the block cursor is of interest or not
 
-        @return m_pTblCrsr if exist,
+        @return m_pTableCrsr if exist,
         m_pBlockCrsr if exist and of interest (param bBlock)
         otherwise m_pCurCrsr
     */
@@ -644,20 +644,20 @@ public:
     IBlockCursor* GetBlockCrsr() { return m_pBlockCrsr; }
 
     // is the Crsr in a table and is the selection over 2 columns
-    bool IsTableMode() const { return 0 != m_pTblCrsr; }
+    bool IsTableMode() const { return 0 != m_pTableCrsr; }
 
-    const SwShellTableCrsr* GetTableCrsr() const { return m_pTblCrsr; }
-    SwShellTableCrsr* GetTableCrsr() { return m_pTblCrsr; }
-    size_t UpdateTblSelBoxes();
+    const SwShellTableCrsr* GetTableCrsr() const { return m_pTableCrsr; }
+    SwShellTableCrsr* GetTableCrsr() { return m_pTableCrsr; }
+    size_t UpdateTableSelBoxes();
 
-    bool GotoFtnTxt();      ///< jump from content to footnote
-    bool GotoFtnAnchor();   ///< jump from footnote to anchor
-    bool GotoPrevFtnAnchor();
-    bool GotoNextFtnAnchor();
+    bool GotoFootnoteText();      ///< jump from content to footnote
+    bool GotoFootnoteAnchor();   ///< jump from footnote to anchor
+    bool GotoPrevFootnoteAnchor();
+    bool GotoNextFootnoteAnchor();
 
     bool GotoFlyAnchor();       ///< jump from the frame to the anchor
-    bool GotoHeaderTxt();       ///< jump from the content to the header
-    bool GotoFooterTxt();       ///< jump from the content to the footer
+    bool GotoHeaderText();       ///< jump from the content to the header
+    bool GotoFooterText();       ///< jump from the content to the footer
     // jump to the header/footer of the given or current PageDesc
     bool SetCrsrInHdFt( size_t nDescNo = SIZE_MAX,
                         bool bInHeader = true );
@@ -675,7 +675,7 @@ public:
 
     // jump to the next or previous table formula
     // optionally only to broken formulas
-    bool GotoNxtPrvTblFormula( bool bNext = true,
+    bool GotoNxtPrvTableFormula( bool bNext = true,
                                bool bOnlyErrors = false );
     // jump to the next / previous hyperlink - inside text and also
     // on graphics
@@ -695,26 +695,26 @@ public:
     inline void UnSetVisCrsr();
 
     // jump to the next or previous field of the corresponding type
-    bool MoveFldType(
-        const SwFieldType* pFldType,
+    bool MoveFieldType(
+        const SwFieldType* pFieldType,
         const bool bNext,
         const sal_uInt16 nResType = USHRT_MAX,
-        const bool bAddSetExpressionFldsToInputFlds = true );
+        const bool bAddSetExpressionFieldsToInputFields = true );
 
-    bool GotoFld( const SwFmtFld& rFld );
+    bool GotoFormatField( const SwFormatField& rField );
 
-    static SwTxtFld* GetTxtFldAtPos(
+    static SwTextField* GetTextFieldAtPos(
         const SwPosition* pPos,
-        const bool bIncludeInputFldAtStart );
+        const bool bIncludeInputFieldAtStart );
     static SwField* GetFieldAtCrsr(
         const SwPaM* pCrsr,
-        const bool bIncludeInputFldAtStart );
-    SwField* GetCurFld( const bool bIncludeInputFldAtStart = false ) const;
-    bool CrsrInsideInputFld() const;
-    static bool PosInsideInputFld( const SwPosition& rPos );
-    bool DocPtInsideInputFld( const Point& rDocPt ) const;
-    static sal_Int32 StartOfInputFldAtPos( const SwPosition& rPos );
-    static sal_Int32 EndOfInputFldAtPos( const SwPosition& rPos );
+        const bool bIncludeInputFieldAtStart );
+    SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const;
+    bool CrsrInsideInputField() const;
+    static bool PosInsideInputField( const SwPosition& rPos );
+    bool DocPtInsideInputField( const Point& rDocPt ) const;
+    static sal_Int32 StartOfInputFieldAtPos( const SwPosition& rPos );
+    static sal_Int32 EndOfInputFieldAtPos( const SwPosition& rPos );
 
     // Return number of cursors in ring (The flag indicates whether
     // only cursors containing selections are requested).
@@ -750,7 +750,7 @@ public:
     // its TextNode (or StartNode?)
     // They all get created on the next ::GetCrsr again
     // Used for Drag&Drop/Clipboard-Paste in tables
-    bool ParkTblCrsr();
+    bool ParkTableCrsr();
 
     // Non expanded attributes?
     bool IsGCAttr() const { return m_bGCAttr; }
@@ -768,12 +768,12 @@ public:
     virtual void MakeSelVisible();
 
     // set the cursor to a NOT protected/hidden node
-    bool FindValidCntntNode( bool bOnlyText = false );
+    bool FindValidContentNode( bool bOnlyText = false );
 
     bool GetContentAtPos( const Point& rPt,
-                          SwContentAtPos& rCntntAtPos,
+                          SwContentAtPos& rContentAtPos,
                           bool bSetCrsr = false,
-                          SwRect* pFldRect = 0 );
+                          SwRect* pFieldRect = 0 );
 
     const SwPostItField* GetPostItFieldAtCursor() const;
 
@@ -791,20 +791,20 @@ public:
 
     bool IsPageAtPos( const Point &rPt ) const;
 
-    bool SelectTxtAttr( sal_uInt16 nWhich, bool bExpand, const SwTxtAttr* pAttr = 0 );
-    bool GotoINetAttr( const SwTxtINetFmt& rAttr );
-    const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const;
+    bool SelectTextAttr( sal_uInt16 nWhich, bool bExpand, const SwTextAttr* pAttr = 0 );
+    bool GotoINetAttr( const SwTextINetFormat& rAttr );
+    const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const;
 
-    bool SelectTxt( const sal_Int32 nStart,
+    bool SelectText( const sal_Int32 nStart,
                         const sal_Int32 nEnd );
 
-    bool CheckTblBoxCntnt( const SwPosition* pPos = 0 );
-    void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
-    void ClearTblBoxCntnt();
-    bool EndAllTblBoxEdit();
+    bool CheckTableBoxContent( const SwPosition* pPos = 0 );
+    void SaveTableBoxContent( const SwPosition* pPos = 0 );
+    void ClearTableBoxContent();
+    bool EndAllTableBoxEdit();
 
-    void SetSelTblCells( bool bFlag )           { m_bSelTblCells = bFlag; }
-    bool IsSelTblCells() const                  { return m_bSelTblCells; }
+    void SetSelTableCells( bool bFlag )           { m_bSelTableCells = bFlag; }
+    bool IsSelTableCells() const                  { return m_bSelTableCells; }
 
     bool IsAutoUpdateCells() const              { return m_bAutoUpdateCells; }
     void SetAutoUpdateCells( bool bFlag )       { m_bAutoUpdateCells = bFlag; }
@@ -861,9 +861,9 @@ inline SwMoveFnCollection* SwCrsrShell::MakeFindRange(
     return m_pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam );
 }
 
-inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const
+inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTableCrsr ) const
 {
-    return static_cast<SwCursor*>(GetCrsr( bMakeTblCrsr ));
+    return static_cast<SwCursor*>(GetCrsr( bMakeTableCrsr ));
 }
 
 inline SwPaM* SwCrsrShell::GetStkCrsr() const { return m_pCrsrStk; }
@@ -888,9 +888,9 @@ inline bool SwCrsrShell::IsSelOnePara() const
            m_pCurCrsr->GetPoint()->nNode == m_pCurCrsr->GetMark()->nNode;
 }
 
-inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( bool bIsPtInTbl ) const
+inline const SwTableNode* SwCrsrShell::IsCrsrInTable( bool bIsPtInTable ) const
 {
-    return m_pCurCrsr->GetNode( bIsPtInTbl ).FindTableNode();
+    return m_pCurCrsr->GetNode( bIsPtInTable ).FindTableNode();
 }
 
 inline bool SwCrsrShell::IsCrsrPtAtEnd() const
@@ -903,14 +903,14 @@ inline Point& SwCrsrShell::GetCrsrDocPos( bool bPoint ) const
     return bPoint ? m_pCurCrsr->GetPtPos() : m_pCurCrsr->GetMkPos();
 }
 
-inline const SwPaM* SwCrsrShell::GetTblCrs() const
+inline const SwPaM* SwCrsrShell::GetTableCrs() const
 {
-    return m_pTblCrsr;
+    return m_pTableCrsr;
 }
 
-inline SwPaM* SwCrsrShell::GetTblCrs()
+inline SwPaM* SwCrsrShell::GetTableCrs()
 {
-    return m_pTblCrsr;
+    return m_pTableCrsr;
 }
 
 inline void SwCrsrShell::UnSetVisCrsr()
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 53e3db095bae..fdba24133fd3 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -65,7 +65,7 @@ struct Sw2LinesPos
 
 /**
  *  SwSpecialPos. This structure is used to pass some additional information
- *  during the call of SwTxtFrm::GetCharRect(). An SwSpecialPos defines a position
+ *  during the call of SwTextFrm::GetCharRect(). An SwSpecialPos defines a position
  *  inside a portion which does not have a representation in the core string or
  *  which is only represented by one position,  e.g., field portions,
  *  number portions, ergo sum and quo vadis portions.
@@ -82,7 +82,7 @@ struct Sw2LinesPos
  *
  *      Get the position of the second character inside a number portion:
  *          nCharOfst = 2; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_BEFORE;
- *          Call SwTxtFrm:::GetCharRect with core string position 0.
+ *          Call SwTextFrm:::GetCharRect with core string position 0.
  *
  *  Example 2)
  *
@@ -91,7 +91,7 @@ struct Sw2LinesPos
  *      Get the position of the third character in follow field B, core position
  *      of field A is 33.
  *          nCharOfst = 7; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_NONE;
- *          Call SwTxtFrm:::GetCharRect with core string position 33.
+ *          Call SwTextFrm:::GetCharRect with core string position 33.
  */
 
 #define SP_EXTEND_RANGE_NONE    0
@@ -134,9 +134,9 @@ struct SwCrsrMoveState
     bool bRealHeight;           ///< should the real height be calculated?
     bool bFieldInfo;            ///< should be fields recognized?
     bool bPosCorr;              ///< Point had to be corrected
-    bool bFtnNoInfo;            ///< recognized footnote numbering
+    bool bFootnoteNoInfo;            ///< recognized footnote numbering
     bool bExactOnly;            /**< let GetCrsrOfst look for exact matches only,
-                                         i.e. never let it run into GetCntntPos */
+                                         i.e. never let it run into GetContentPos */
     bool bFillRet;              ///< only used temporary in FillMode
     bool bSetInReadOnly;        ///< ReadOnly areas may be entered
     bool bRealWidth;            ///< Calculation of the width required
@@ -146,7 +146,7 @@ struct SwCrsrMoveState
                                        position if screen position is inside second
                                        have of bound rect */
 
-    bool bCntntCheck;           // #i43742# Cursor position over content?
+    bool bContentCheck;           // #i43742# Cursor position over content?
 
     // #i27615#
     /**
@@ -166,7 +166,7 @@ struct SwCrsrMoveState
         bRealHeight( false ),
         bFieldInfo( false ),
         bPosCorr( false ),
-        bFtnNoInfo( false ),
+        bFootnoteNoInfo( false ),
         bExactOnly( false ),
         bFillRet( false ),
         bSetInReadOnly( false ),
@@ -174,7 +174,7 @@ struct SwCrsrMoveState
         b2Lines( false ),
         bNoScroll( false ),
         bPosMatchesBounds( false ),
-        bCntntCheck( false ), // #i43742#
+        bContentCheck( false ), // #i43742#
         bInFrontOfLabel( false ), // #i27615#
         bInNumPortion(false), // #i26726#
         nInNumPostionOffset(0) // #i26726#
@@ -189,7 +189,7 @@ struct SwCrsrMoveState
         bRealHeight( false ),
         bFieldInfo( false ),
         bPosCorr( false ),
-        bFtnNoInfo( false ),
+        bFootnoteNoInfo( false ),
         bExactOnly( false ),
         bFillRet( false ),
         bSetInReadOnly( false ),
@@ -197,7 +197,7 @@ struct SwCrsrMoveState
         b2Lines( false ),
         bNoScroll( false ),
         bPosMatchesBounds( false ),
-        bCntntCheck( false ), // #i43742#
+        bContentCheck( false ), // #i43742#
         bInFrontOfLabel( false ), // #i27615#
         bInNumPortion(false), // #i23726#
         nInNumPostionOffset(0) // #i23726#
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index 0509b9116ee2..2ba43ffef947 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -23,7 +23,7 @@
 #include "swdllapi.h"
 
 class SwPaM;
-class SwCntntFrm;
+class SwContentFrm;
 class SwLayoutFrm;
 
 // Structure for SwPaM. Contains the method-pointers for cursor movement.
@@ -31,13 +31,13 @@ struct SwMoveFnCollection;
 typedef SwMoveFnCollection* SwMoveFn;
 
 // Type definition for CrsrShell.
-// Direction-parameter for MovePage (initialized in SwCntntFrm).
+// Direction-parameter for MovePage (initialized in SwContentFrm).
 typedef SwLayoutFrm * (*SwWhichPage)( const SwLayoutFrm * );
-typedef SwCntntFrm  * (*SwPosPage)( const SwLayoutFrm * );
+typedef SwContentFrm  * (*SwPosPage)( const SwLayoutFrm * );
 extern SwWhichPage fnPagePrev, fnPageCurr, fnPageNext;
 extern SwPosPage fnPageStart, fnPageEnd;
 
-// Direction-parameter for MovePara (initialized in SwCntntFrm).
+// Direction-parameter for MovePara (initialized in SwContentFrm).
 typedef SwMoveFnCollection* SwPosPara;
 typedef bool (*SwWhichPara)( SwPaM&, SwPosPara );
 extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext;
@@ -57,7 +57,7 @@ extern SwPosTable fnTableStart, fnTableEnd;
 
 // Direction-parameter for MoveColumn
 typedef SwLayoutFrm * (*SwWhichColumn)( const SwLayoutFrm * );
-typedef SwCntntFrm  * (*SwPosColumn)( const SwLayoutFrm * );
+typedef SwContentFrm  * (*SwPosColumn)( const SwLayoutFrm * );
 extern SwWhichColumn fnColumnPrev, fnColumnCurr, fnColumnNext;
 extern SwPosColumn fnColumnStart, fnColumnEnd;
 
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 7df97ef6d9b0..7f3d6533ad71 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -24,7 +24,7 @@
 #include "swdbdata.hxx"
 
 class SwDoc;
-class SwTxtFld;
+class SwTextField;
 class SwFrm;
 
 // Database field.
@@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
     OUString aContent;
     OUString sFieldCode; ///< contains Word's field code
     sal_uInt16  nSubType;
-    bool    bIsInBodyTxt    : 1;
+    bool    bIsInBodyText    : 1;
     bool    bValidValue     : 1;
     bool    bInitialized    : 1;
 
@@ -68,7 +68,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
     virtual SwField*    Copy() const SAL_OVERRIDE;
 
 public:
-    SwDBField(SwDBFieldType*, sal_uLong nFmt = 0);
+    SwDBField(SwDBFieldType*, sal_uLong nFormat = 0);
     virtual ~SwDBField();
 
     virtual SwFieldType*    ChgTyp( SwFieldType* ) SAL_OVERRIDE;
@@ -88,11 +88,11 @@ public:
     void                Evaluate();
 
     /// Evaluation for header and footer.
-    void                ChangeExpansion( const SwFrm*, const SwTxtFld* );
+    void                ChangeExpansion( const SwFrm*, const SwTextField* );
     void                InitContent();
     void                InitContent(const OUString& rExpansion);
 
-    inline void         ChgBodyTxtFlag( bool bIsInBody );
+    inline void         ChgBodyTextFlag( bool bIsInBody );
 
     inline bool         IsInitialized() const   { return bInitialized; }
     inline void         ClearInitialized()      { bInitialized = false; }
@@ -110,16 +110,16 @@ public:
     virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 
-    static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFmt,
+    static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFormat,
                              double &aNumber, sal_Int32 nColumnType, SwDBField *pField = NULL );
 };
 
 inline  void SwDBField::SetExpansion(const OUString& rStr)
     { aContent = rStr; }
 
-/// set from UpdateExpFlds (the Node-Position is known there)
-inline void SwDBField::ChgBodyTxtFlag( bool bIsInBody )
-    { bIsInBodyTxt = bIsInBody; }
+/// set from UpdateExpFields (the Node-Position is known there)
+inline void SwDBField::ChgBodyTextFlag( bool bIsInBody )
+    { bIsInBodyText = bIsInBody; }
 
 // Base class for all other database fields.
 class SW_DLLPUBLIC SwDBNameInfField : public SwField
@@ -131,7 +131,7 @@ protected:
     const SwDBData& GetDBData() const {return aDBData;}
     SwDBData&       GetDBData() {return aDBData;}
 
-    SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt = 0);
+    SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFormat = 0);
 
 public:
     /// DBName
@@ -249,7 +249,7 @@ public:
 class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
 {
 public:
-    SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
+    SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0);
 
     virtual OUString Expand() const SAL_OVERRIDE;
     virtual SwField* Copy() const SAL_OVERRIDE;
@@ -271,7 +271,7 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
 {
     long    nNumber;
 public:
-    SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
+    SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0);
 
     virtual OUString Expand() const SAL_OVERRIDE;
     virtual         SwField* Copy() const SAL_OVERRIDE;
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 6b98c528b2a8..5fcf8af7460b 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -26,10 +26,10 @@
 #include <cstdio>
 #include <unordered_map>
 
-class SwCntntNode;
+class SwContentNode;
 class SwNode;
-class SwTxtAttr;
-class SwTxtNode;
+class SwTextAttr;
+class SwTextNode;
 class SwpHints;
 class SfxPoolItem;
 class SfxItemSet;
@@ -38,14 +38,14 @@ class SwPaM;
 class SwNodeNum;
 class SwUndo;
 class SwRect;
-class SwFrmFmt;
-class SwFrmFmts;
+class SwFrameFormat;
+class SwFrameFormats;
 class SwNodes;
 class SwRewriter;
-class SwNumRuleTbl;
+class SwNumRuleTable;
 class SwNumRule;
 class SwOutlineNodes;
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwNodeRange;
 
 extern bool bDbgOutStdErr;
@@ -54,12 +54,12 @@ extern bool bDbgOutPrintAttrSet;
 SW_DLLPUBLIC const char * dbg_out(const void * pVoid);
 SW_DLLPUBLIC const char * dbg_out(const OUString & aStr);
 SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect);
-SW_DLLPUBLIC const char * dbg_out(const SwFrmFmt & rFrmFmt);
+SW_DLLPUBLIC const char * dbg_out(const SwFrameFormat & rFrameFormat);
 SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode);
 SW_DLLPUBLIC const char * dbg_out(const SwNode * pNode);
-SW_DLLPUBLIC const char * dbg_out(const SwCntntNode * pNode);
-SW_DLLPUBLIC const char * dbg_out(const SwTxtNode * pNode);
-SW_DLLPUBLIC const char * dbg_out(const SwTxtAttr & rAttr);
+SW_DLLPUBLIC const char * dbg_out(const SwContentNode * pNode);
+SW_DLLPUBLIC const char * dbg_out(const SwTextNode * pNode);
+SW_DLLPUBLIC const char * dbg_out(const SwTextAttr & rAttr);
 SW_DLLPUBLIC const char * dbg_out(const SwpHints &rHints);
 SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem);
 SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem);
@@ -72,9 +72,9 @@ SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo);
 SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes & rNodes);
 SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter);
 SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule);
-SW_DLLPUBLIC const char * dbg_out(const SwTxtFmtColl & rFmt);
-SW_DLLPUBLIC const char * dbg_out(const SwFrmFmts & rFrmFmts);
-SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTbl & rTbl);
+SW_DLLPUBLIC const char * dbg_out(const SwTextFormatColl & rFormat);
+SW_DLLPUBLIC const char * dbg_out(const SwFrameFormats & rFrameFormats);
+SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTable & rTable);
 SW_DLLPUBLIC const char * dbg_out(const SwNodeRange & rRange);
 
 template<typename tKey, typename tMember, typename fHashFunction>
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 47defa8e0c44..5bf5432fdc0e 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -186,7 +186,7 @@ class SW_DLLPUBLIC SwDBManager
 {
 friend class SwConnectionDisposedListener_Impl;
 
-    OUString            sEMailAddrFld;      ///< Mailing: Column name of email address.
+    OUString            sEMailAddrField;      ///< Mailing: Column name of email address.
     OUString            sSubject;           ///< Mailing: Subject
     OUString            sAttached;          ///< Mailing: Attached Files.
     bool            bCancel;            ///< Mail merge canceled.
@@ -251,7 +251,7 @@ public:
     void     SetSingleJobs(bool b)   { bSingleJobs = b;  }
 
     /// Mailing: Set email data.
-    inline void     SetEMailColumn(const OUString& sColName) { sEMailAddrFld = sColName; }
+    inline void     SetEMailColumn(const OUString& sColName) { sEMailAddrField = sColName; }
     inline void     SetSubject(const OUString& sSbj) { sSubject = sSbj; }
     inline void     SetAttachment(const OUString& sAtt) { sAttached = sAtt; }
 
@@ -265,16 +265,16 @@ public:
                             css::uno::Reference< css::sdbc::XConnection> xConnection,
                             const OUString& rTableName, bool bAppend = false);
 
-    static sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
+    static sal_uLong GetColumnFormat( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
                             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
                             ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xColumn,
-                            SvNumberFormatter* pNFmtr,
+                            SvNumberFormatter* pNFormatr,
                             long nLanguage );
 
-    sal_uLong GetColumnFmt( const OUString& rDBName,
+    sal_uLong GetColumnFormat( const OUString& rDBName,
                             const OUString& rTableName,
                             const OUString& rColNm,
-                            SvNumberFormatter* pNFmtr,
+                            SvNumberFormatter* pNFormatr,
                             long nLanguage );
     sal_Int32 GetColumnType( const OUString& rDBName,
                           const OUString& rTableName,
@@ -301,7 +301,7 @@ public:
                             const OUString& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage,
                             OUString& rResult, double* pNumber);
     /** create and store or find an already stored connection to a data source for use
-    in SwFldMgr and SwDBTreeList */
+    in SwFieldMgr and SwDBTreeList */
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>
                     RegisterConnection(OUString& rSource);
 
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 01298ee7689a..07b5cca5e5ca 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -30,13 +30,13 @@
 #include <anchoreddrawobject.hxx>
 
 class SfxPoolItem;
-class SwFrmFmt;
-class SwFlyFrmFmt;
+class SwFrameFormat;
+class SwFlyFrameFormat;
 class SwFlyFrm;
 class SwFrm;
 class SwPageFrm;
 class SwVirtFlyDrawObj;
-class SwFmtAnchor;
+class SwFormatAnchor;
 class SwFlyDrawObj;
 class SwRect;
 class SwDrawContact;
@@ -49,9 +49,9 @@ class SdrTextObj;
  If not it is a simple DrawObject. It has a UserCall which
  is client of the format we are looking for.
  Implementation in dcontact.cxx. */
-SW_DLLPUBLIC SwFrmFmt *FindFrmFmt( SdrObject *pObj );
-inline const SwFrmFmt *FindFrmFmt( const SdrObject *pObj )
-{   return ::FindFrmFmt( const_cast<SdrObject*>(pObj) ); }
+SW_DLLPUBLIC SwFrameFormat *FindFrameFormat( SdrObject *pObj );
+inline const SwFrameFormat *FindFrameFormat( const SdrObject *pObj )
+{   return ::FindFrameFormat( const_cast<SdrObject*>(pObj) ); }
 bool HasWrap( const SdrObject* pObj );
 
 void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor );
@@ -105,7 +105,7 @@ public:
     TYPEINFO_OVERRIDE();
 
     /// For reader. Only the connection is created.
-    SwContact( SwFrmFmt *pToRegisterIn );
+    SwContact( SwFrameFormat *pToRegisterIn );
     virtual ~SwContact();
 
     virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const = 0;
@@ -115,9 +115,9 @@ public:
     virtual SdrObject *GetMaster() = 0;
     virtual void SetMaster( SdrObject* _pNewMaster ) = 0;
 
-          SwFrmFmt  *GetFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
-    const SwFrmFmt  *GetFmt() const
-        { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
+          SwFrameFormat  *GetFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+    const SwFrameFormat  *GetFormat() const
+        { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
 
     bool IsInDTOR() const { return mbInDTOR;}
 
@@ -145,27 +145,27 @@ public:
 
     /** some virtual helper methods for information
      about the object (Writer fly frame resp. drawing object) */
-    const SwFmtAnchor& GetAnchorFmt() const
+    const SwFormatAnchor& GetAnchorFormat() const
     {
-        assert( GetFmt() );
+        assert( GetFormat() );
 
-        return GetFmt()->GetAnchor();
+        return GetFormat()->GetAnchor();
     }
 
-    RndStdIds GetAnchorId() const { return GetAnchorFmt().GetAnchorId(); }
+    RndStdIds GetAnchorId() const { return GetAnchorFormat().GetAnchorId(); }
     bool      ObjAnchoredAtPage() const { return GetAnchorId() == FLY_AT_PAGE; }
     bool      ObjAnchoredAtFly()  const { return GetAnchorId() == FLY_AT_FLY; }
     bool      ObjAnchoredAtPara() const { return GetAnchorId() == FLY_AT_PARA; }
     bool      ObjAnchoredAtChar() const { return GetAnchorId() == FLY_AT_CHAR; }
     bool      ObjAnchoredAsChar() const { return GetAnchorId() == FLY_AS_CHAR; }
 
-    const SwPosition&  GetCntntAnchor() const
+    const SwPosition&  GetContentAnchor() const
     {
-        assert( GetAnchorFmt().GetCntntAnchor() );
-        return *(GetAnchorFmt().GetCntntAnchor());
+        assert( GetAnchorFormat().GetContentAnchor() );
+        return *(GetAnchorFormat().GetContentAnchor());
     }
 
-    const SwIndex&     GetCntntAnchorIndex() const;
+    const SwIndex&     GetContentAnchorIndex() const;
 
     /** get data collection of anchored objects, handled by with contact
 
@@ -198,7 +198,7 @@ public:
     TYPEINFO_OVERRIDE();
 
     /// Creates DrawObject and registers it with the Model.
-    SwFlyDrawContact( SwFlyFrmFmt* pToRegisterIn, SdrModel* pMod );
+    SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod );
     virtual ~SwFlyDrawContact();
 
     virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE;
@@ -390,7 +390,7 @@ class SwDrawContact : public SwContact
     public:
         TYPEINFO_OVERRIDE();
 
-        SwDrawContact( SwFrmFmt *pToRegisterIn, SdrObject *pObj );
+        SwDrawContact( SwFrameFormat *pToRegisterIn, SdrObject *pObj );
         virtual ~SwDrawContact();
 
         virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE;
@@ -419,9 +419,9 @@ class SwDrawContact : public SwContact
         SwPageFrm* FindPage( const SwRect &rRect );
 
         /** Inserts SdrObject in the arrays of the layout ((SwPageFrm and SwFrm).
-         The anchor is determined according to the attribute SwFmtAnchor.
+         The anchor is determined according to the attribute SwFormatAnchor.
          If required the object gets unregistered with the old anchor. */
-        void ConnectToLayout( const SwFmtAnchor *pAnch = 0 );
+        void ConnectToLayout( const SwFormatAnchor *pAnch = 0 );
         /** method to insert 'master' drawing object
          into drawing page */
         void InsertMasterIntoDrawPage();
@@ -459,7 +459,7 @@ class SwDrawContact : public SwContact
         /** get data collection of anchored objects, handled by with contact
         */
 
-        static void GetTextObjectsFromFmt( std::list<SdrTextObj*>&, SwDoc* );
+        static void GetTextObjectsFromFormat( std::list<SdrTextObj*>&, SwDoc* );
         virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE;
 };
 
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 5459308496a9..77a045880e3b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -82,72 +82,72 @@ class SwAutoCompleteWord;
 class SwAutoCorrExceptWord;
 class SwCalc;
 class SwCellFrm;
-class SwCharFmt;
-class SwCharFmts;
-class SwConditionTxtFmtColl;
+class SwCharFormat;
+class SwCharFormats;
+class SwConditionTextFormatColl;
 class SwCrsrShell;
 class SwCursor;
 class SwDBNameInfField;
 class SwDocShell;
-class SwDocUpdtFld;
-class SwDrawFrmFmt;
+class SwDocUpdateField;
+class SwDrawFrameFormat;
 class SwDrawView;
 class SwEditShell;
 class SwFieldType;
 class SwField;
-class SwTxtFld;
-class SwFldTypes;
-class SwFlyFrmFmt;
-class SwFmtsBase;
-class SwFmt;
-class SwFmtINetFmt;
-class SwFmtRefMark;
-class SwFrmFmt;
-class SwFrmFmts;
-class SwFtnIdxs;
-class SwFtnInfo;
+class SwTextField;
+class SwFieldTypes;
+class SwFlyFrameFormat;
+class SwFormatsBase;
+class SwFormat;
+class SwFormatINetFormat;
+class SwFormatRefMark;
+class SwFrameFormat;
+class SwFrameFormats;
+class SwFootnoteIdxs;
+class SwFootnoteInfo;
 class SwEndNoteInfo;
 class GraphicObject;
-class SwGrfFmtColl;
-class SwGrfFmtColls;
+class SwGrfFormatColl;
+class SwGrfFormatColls;
 class SwLineNumberInfo;
 class SwDBManager;
-class SwNoTxtNode;
+class SwNoTextNode;
 class SwNodeIndex;
 class SwNodeRange;
 class SwNodes;
 class SwNumRule;
-class SwNumRuleTbl;
+class SwNumRuleTable;
 class SwPageDesc;
 class SwPagePreviewPrtData;
 class SwRangeRedline;
-class SwRedlineTbl;
-class SwExtraRedlineTbl;
+class SwRedlineTable;
+class SwExtraRedlineTable;
 class SwRootFrm;
 class SwRubyList;
 class SwRubyListEntry;
-class SwSectionFmt;
-class SwSectionFmts;
+class SwSectionFormat;
+class SwSectionFormats;
 class SwSectionData;
 class SwSelBoxes;
 class SwTOXBaseSection;
 class SwTOXTypes;
 class SwTabCols;
 class SwTable;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
 class SwTableBox;
-class SwTableBoxFmt;
-class SwTableFmt;
-class SwTableLineFmt;
+class SwTableBoxFormat;
+class SwTableFormat;
+class SwTableLineFormat;
 class SwTableNode;
 class SwTextBlocks;
-class SwTxtFmtColl;
-class SwTxtFmtColls;
+class SwTextFormatColl;
+class SwTextFormatColls;
 class SwURLStateChanged;
 class SwUnoCrsr;
-class SwUnoCrsrTbl;
+class SwUnoCrsrTable;
 class SwViewShell;
-class _SetGetExpFld;
+class _SetGetExpField;
 class SwDrawContact;
 class SwLayouter;
 class SdrView;
@@ -191,7 +191,7 @@ class IDocumentState;
 class IDocumentLayoutAccess;
 class IDocumentStylePoolAccess;
 class IDocumentExternalData;
-class _SetGetExpFlds;
+class _SetGetExpFields;
 
 namespace sw { namespace mark {
     class MarkManager;
@@ -291,20 +291,20 @@ class SW_DLLPUBLIC SwDoc :
     const ::boost::scoped_ptr< ::sw::DocumentExternalDataManager > m_pDocumentExternalDataManager;
 
     // Pointer
-    SwFrmFmt        *mpDfltFrmFmt;       //< Default formats.
-    SwFrmFmt        *mpEmptyPageFmt;     //< Format for the default empty page
-    SwFrmFmt        *mpColumnContFmt;    //< Format for column container
-    SwCharFmt       *mpDfltCharFmt;
-    SwTxtFmtColl    *mpDfltTxtFmtColl;   //< Defaultformatcollections
-    SwGrfFmtColl    *mpDfltGrfFmtColl;
-
-    SwFrmFmts       *mpFrmFmtTbl;        //< Format table
-    SwCharFmts      *mpCharFmtTbl;
-    SwFrmFmts       *mpSpzFrmFmtTbl;
-    SwSectionFmts   *mpSectionFmtTbl;
-    SwFrmFmts       *mpTblFrmFmtTbl;     //< For tables
-    SwTxtFmtColls   *mpTxtFmtCollTbl;    //< FormatCollections
-    SwGrfFmtColls   *mpGrfFmtCollTbl;
+    SwFrameFormat        *mpDfltFrameFormat;       //< Default formats.
+    SwFrameFormat        *mpEmptyPageFormat;     //< Format for the default empty page
+    SwFrameFormat        *mpColumnContFormat;    //< Format for column container
+    SwCharFormat       *mpDfltCharFormat;
+    SwTextFormatColl    *mpDfltTextFormatColl;   //< Defaultformatcollections
+    SwGrfFormatColl    *mpDfltGrfFormatColl;
+
+    SwFrameFormats       *mpFrameFormatTable;        //< Format table
+    SwCharFormats      *mpCharFormatTable;
+    SwFrameFormats       *mpSpzFrameFormatTable;
+    SwSectionFormats   *mpSectionFormatTable;
+    SwFrameFormats       *mpTableFrameFormatTable;     //< For tables
+    SwTextFormatColls   *mpTextFormatCollTable;    //< FormatCollections
+    SwGrfFormatColls   *mpGrfFormatCollTable;
 
     SwTOXTypes      *mpTOXTypes;         //< Tables/indices
     SwDefTOXBase_Impl * mpDefTOXBases;   //< defaults of SwTOXBase's
@@ -315,10 +315,10 @@ class SW_DLLPUBLIC SwDoc :
     SwDoc           *mpGlossaryDoc;      //< Pointer to glossary-document.
 
     SwNumRule       *mpOutlineRule;
-    SwFtnInfo       *mpFtnInfo;
+    SwFootnoteInfo       *mpFootnoteInfo;
     SwEndNoteInfo   *mpEndNoteInfo;
     SwLineNumberInfo*mpLineNumberInfo;
-    SwFtnIdxs       *mpFtnIdxs;
+    SwFootnoteIdxs       *mpFootnoteIdxs;
 
     SwDocShell      *mpDocShell;         //< Ptr to SfxDocShell of Doc.
     SfxObjectShellLock mxTmpDocShell;    //< A temporary shell that is used to copy OLE-Nodes
@@ -328,12 +328,12 @@ class SW_DLLPUBLIC SwDoc :
     SwURLStateChanged *mpURLStateChgd;   //< SfxClient for changes in INetHistory
     SvNumberFormatter *mpNumberFormatter;//< NumFormatter for tables / fields
 
-    mutable SwNumRuleTbl    *mpNumRuleTbl;   //< List of all named NumRules.
+    mutable SwNumRuleTable    *mpNumRuleTable;   //< List of all named NumRules.
 
     // Hash map to find numrules by name
     mutable std::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap;
 
-    SwUnoCrsrTbl    *mpUnoCrsrTbl;
+    SwUnoCrsrTable    *mpUnoCrsrTable;
 
     SwPagePreviewPrtData *mpPgPViewPrtData;  //< Indenting / spacing for printing of page view.
     SwPaM           *mpExtInputRing;
@@ -373,13 +373,13 @@ private:
     bool mbInXMLImport           : 1;    //< TRUE: During xml import, attribute portion building is not necessary.
     bool mbUpdateTOX             : 1;    //< TRUE: After loading document, update TOX.
     bool mbInLoadAsynchron       : 1;    //< TRUE: Document is in the process of being loaded asynchronously.
-    bool mbIsAutoFmtRedline      : 1;    //< TRUE: Redlines are recorded by Autoformat.
+    bool mbIsAutoFormatRedline      : 1;    //< TRUE: Redlines are recorded by Autoformat.
     bool mbOLEPrtNotifyPending   : 1;    /**< TRUE: Printer has changed. At creation of
                                                 View
                                                 notification of OLE-Objects PrtOLENotify() is required. */
     bool mbAllOLENotify          : 1;    //< True: Notification of all objects is required.
     bool mbIsRedlineMove         : 1;    //< True: Redlines are moved into to / out of the section.
-    bool mbInsOnlyTxtGlssry      : 1;    //< True: insert 'only text' glossary into doc
+    bool mbInsOnlyTextGlssry      : 1;    //< True: insert 'only text' glossary into doc
     bool mbContains_MSVBasic     : 1;    //< True: MS-VBasic exist is in our storage
     bool mbClipBoard             : 1;    //< TRUE: this document represents the clipboard
     bool mbColumnSelection       : 1;    /**< TRUE: this content has bee created by a column selection
@@ -397,20 +397,20 @@ private:
     static SwAutoCompleteWord *mpACmpltWords;  //< List of all words for AutoComplete
 
     // private methods
-    SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos,
-                                const SwCntntNode& rNode, RndStdIds eRequestId,
+    SwFlyFrameFormat* _MakeFlySection( const SwPosition& rAnchPos,
+                                const SwContentNode& rNode, RndStdIds eRequestId,
                                 const SfxItemSet* pFlyAttrSet,
-                                SwFrmFmt* = 0 );
-    sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool bNewFrms );
-
-    typedef SwFmt* (SwDoc:: *FNCopyFmt)( const OUString&, SwFmt*, bool, bool );
-    SwFmt* CopyFmt( const SwFmt& rFmt, const SwFmtsBase& rFmtArr,
-                        FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt );
-    void CopyFmtArr( const SwFmtsBase& rSourceArr, SwFmtsBase& rDestArr,
-                        FNCopyFmt fnCopyFmt, SwFmt& rDfltFmt );
+                                SwFrameFormat* = 0 );
+    sal_Int8 SetFlyFrmAnchor( SwFrameFormat& rFlyFormat, SfxItemSet& rSet, bool bNewFrms );
+
+    typedef SwFormat* (SwDoc:: *FNCopyFormat)( const OUString&, SwFormat*, bool, bool );
+    SwFormat* CopyFormat( const SwFormat& rFormat, const SwFormatsBase& rFormatArr,
+                        FNCopyFormat fnCopyFormat, const SwFormat& rDfltFormat );
+    void CopyFormatArr( const SwFormatsBase& rSourceArr, SwFormatsBase& rDestArr,
+                        FNCopyFormat fnCopyFormat, SwFormat& rDfltFormat );
     void CopyPageDescHeaderFooterImpl( bool bCpyHeader,
-                                const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt );
-    static SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName );
+                                const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat );
+    static SwFormat* FindFormatByName( const SwFormatsBase& rFormatArr, const OUString& rName );
 
     SwDoc( const SwDoc &) SAL_DELETED_FUNCTION;
 
@@ -428,15 +428,15 @@ private:
 
     void _CreateNumberFormatter();
 
-    bool _UnProtectTblCells( SwTable& rTbl );
+    bool _UnProtectTableCells( SwTable& rTable );
 
     /** Create sub-documents according to the given collection.
      If no collection is given, take chapter style of the 1st level. */
     bool SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
-                        const SwTxtFmtColl* pSplitColl, int nOutlineLevel = 0 );
+                        const SwTextFormatColl* pSplitColl, int nOutlineLevel = 0 );
 
     // Update charts of given table.
-    void _UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const;
+    void _UpdateCharts( const SwTable& rTable, SwViewShell const & rVSh ) const;
 
     static bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
                                 sal_uInt16 nMode );
@@ -446,11 +446,11 @@ private:
     DECL_LINK_TYPED( DoUpdateModifiedOLE, Idle *, void );
 
 public:
-    SwFmt *_MakeCharFmt(const OUString &, SwFmt *, bool, bool );
-    SwFmt *_MakeFrmFmt(const OUString &, SwFmt *, bool, bool );
+    SwFormat *_MakeCharFormat(const OUString &, SwFormat *, bool, bool );
+    SwFormat *_MakeFrameFormat(const OUString &, SwFormat *, bool, bool );
 
 private:
-    SwFmt *_MakeTxtFmtColl(const OUString &, SwFmt *, bool, bool );
+    SwFormat *_MakeTextFormatColl(const OUString &, SwFormat *, bool, bool );
 
 private:
     bool mbReadOnly;
@@ -532,7 +532,7 @@ public:
     ::sw::DocumentContentOperationsManager const & GetDocumentContentOperationsManager() const;
     ::sw::DocumentContentOperationsManager & GetDocumentContentOperationsManager();
 
-    bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 );
+    bool UpdateParRsid( SwTextNode *pTextNode, sal_uInt32 nVal = 0 );
     bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen );
 
     // IDocumentStylePoolAccess
@@ -635,18 +635,18 @@ public:
      have to be surrounded completely by ::com::sun::star::awt::Selection.
      ( Start < Pos < End ) !!!
      (Required for Writers.) */
-    SwPosFlyFrms GetAllFlyFmts( const SwPaM* = 0,
+    SwPosFlyFrms GetAllFlyFormats( const SwPaM* = 0,
                         bool bDrawAlso = false,
                         bool bAsCharAlso = false ) const;
 
     // Because swrtf.cxx and define private public here now.
-    SwFlyFrmFmt  *MakeFlyFrmFmt (const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
-    SwDrawFrmFmt *MakeDrawFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
+    SwFlyFrameFormat  *MakeFlyFrameFormat (const OUString &rFormatName, SwFrameFormat *pDerivedFrom);
+    SwDrawFrameFormat *MakeDrawFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom);
 
     // From now on this interface has to be used for Flys.
     // pAnchorPos must be set, if they are not attached to pages AND
-    // Anchor is not already set at valid CntntPos
-    // in FlySet/FrmFmt.
+    // Anchor is not already set at valid ContentPos
+    // in FlySet/FrameFormat.
     /* new parameter bCalledFromShell
 
        true: An existing adjust item at pAnchorPos is propagated to
@@ -656,14 +656,14 @@ public:
 
        false: no propagation
     */
-    SwFlyFrmFmt* MakeFlySection( RndStdIds eAnchorType,
+    SwFlyFrameFormat* MakeFlySection( RndStdIds eAnchorType,
                                  const SwPosition* pAnchorPos,
                                  const SfxItemSet* pSet = 0,
-                                 SwFrmFmt *pParent = 0,
+                                 SwFrameFormat *pParent = 0,
                                  bool bCalledFromShell = false );
-    SwFlyFrmFmt* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
+    SwFlyFrameFormat* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
                                 const SwSelBoxes* pSelBoxes = 0,
-                                SwFrmFmt *pParent = 0 );
+                                SwFrameFormat *pParent = 0 );
 
     //UUUU Helper that checks for unique items for DrawingLayer items of type NameOrIndex
     // and evtl. corrects that items to ensure unique names for that type. This call may
@@ -672,25 +672,25 @@ public:
     // these items work for the UNO API and thus e.g. for ODF im/export)
     void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet);
 
-    bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet );
+    bool SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet );
 
-    bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
+    bool SetFrameFormatToFly( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFormat,
                         SfxItemSet* pSet = 0, bool bKeepOrient = false );
-    void SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
+    void SetFlyFrmTitle( SwFlyFrameFormat& rFlyFrameFormat,
                          const OUString& sNewTitle );
-    void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
+    void SetFlyFrmDescription( SwFlyFrameFormat& rFlyFrameFormat,
                                const OUString& sNewDescription );
 
     // Footnotes
     // Footnote information
-    const SwFtnInfo& GetFtnInfo() const         { return *mpFtnInfo; }
-    void SetFtnInfo(const SwFtnInfo& rInfo);
+    const SwFootnoteInfo& GetFootnoteInfo() const         { return *mpFootnoteInfo; }
+    void SetFootnoteInfo(const SwFootnoteInfo& rInfo);
     const SwEndNoteInfo& GetEndNoteInfo() const { return *mpEndNoteInfo; }
     void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
-          SwFtnIdxs& GetFtnIdxs()       { return *mpFtnIdxs; }
-    const SwFtnIdxs& GetFtnIdxs() const { return *mpFtnIdxs; }
+          SwFootnoteIdxs& GetFootnoteIdxs()       { return *mpFootnoteIdxs; }
+    const SwFootnoteIdxs& GetFootnoteIdxs() const { return *mpFootnoteIdxs; }
     // change footnotes in area
-    bool SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
+    bool SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr,
                     sal_uInt16 nNumber, bool bIsEndNote );
 
     /** Operations on the content of the document e.g.
@@ -712,7 +712,7 @@ public:
 
     // Glossary Document
     void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; }
-    bool IsInsOnlyTextGlossary() const      { return mbInsOnlyTxtGlssry; }
+    bool IsInsOnlyTextGlossary() const      { return mbInsOnlyTextGlssry; }
 
     void Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bImpress );
 
@@ -747,34 +747,34 @@ public:
 
     std::set<SwRootFrm*> GetAllLayouts();
 
-    void SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName );
-    const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const;
+    void SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName );
+    const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const;
 
-    static void GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName, OUString* pFltName );
+    static void GetGrfNms( const SwFlyFrameFormat& rFormat, OUString* pGrfName, OUString* pFltName );
 
     // Set a valid name for all Flys that have none (Called by Readers after reading).
     void SetAllUniqueFlyNames();
 
-    /** Reset attributes. All TxtHints and (if completely selected) all hard-
+    /** Reset attributes. All TextHints and (if completely selected) all hard-
      formatted stuff (auto-formats) are removed.
      Introduce new optional parameter <bSendDataChangedEvents> in order to
      control, if the side effect "send data changed events" is triggered or not. */
     void ResetAttrs( const SwPaM &rRg,
-                     bool bTxtAttr = true,
+                     bool bTextAttr = true,
                      const std::set<sal_uInt16> &rAttrs = std::set<sal_uInt16>(),
                      const bool bSendDataChangedEvents = true );
-    void RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark = false, bool bExactRange = false );
+    void RstTextAttrs(const SwPaM &rRg, bool bInclRefToxMark = false, bool bExactRange = false );
 
     /** Set attribute in given format.1y
      *  If Undo is enabled, the old values is added to the Undo history. */
-    void SetAttr( const SfxPoolItem&, SwFmt& );
+    void SetAttr( const SfxPoolItem&, SwFormat& );
     /** Set attribute in given format.1y
      *  If Undo is enabled, the old values is added to the Undo history. */
-    void SetAttr( const SfxItemSet&, SwFmt& );
+    void SetAttr( const SfxItemSet&, SwFormat& );
 
     // method to reset a certain attribute at the given format
     void ResetAttrAtFormat( const sal_uInt16 nWhichId,
-                            SwFmt& rChangedFormat );
+                            SwFormat& rChangedFormat );
 
     /** Set attribute as new default attribute in current document.
      If Undo is activated, the old one is listed in Undo-History. */
@@ -782,107 +782,107 @@ public:
     void SetDefault( const SfxItemSet& );
 
     // Query default attribute in this document.
-    const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
+    const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
 
     // Do not expand text attributes.
-    bool DontExpandFmt( const SwPosition& rPos, bool bFlag = true );
+    bool DontExpandFormat( const SwPosition& rPos, bool bFlag = true );
 
     // Formats
-    const SwFrmFmts* GetFrmFmts() const     { return mpFrmFmtTbl; }
-          SwFrmFmts* GetFrmFmts()           { return mpFrmFmtTbl; }
-    const SwCharFmts* GetCharFmts() const   { return mpCharFmtTbl;}
-          SwCharFmts* GetCharFmts()         { return mpCharFmtTbl;}
+    const SwFrameFormats* GetFrameFormats() const     { return mpFrameFormatTable; }
+          SwFrameFormats* GetFrameFormats()           { return mpFrameFormatTable; }
+    const SwCharFormats* GetCharFormats() const   { return mpCharFormatTable;}
+          SwCharFormats* GetCharFormats()         { return mpCharFormatTable;}
 
     // LayoutFormats (frames, DrawObjects), sometimes const sometimes not
-    const SwFrmFmts* GetSpzFrmFmts() const   { return mpSpzFrmFmtTbl; }
-          SwFrmFmts* GetSpzFrmFmts()         { return mpSpzFrmFmtTbl; }
-
-    const SwFrmFmt *GetDfltFrmFmt() const   { return mpDfltFrmFmt; }
-          SwFrmFmt *GetDfltFrmFmt()         { return mpDfltFrmFmt; }
-    const SwFrmFmt *GetEmptyPageFmt() const { return mpEmptyPageFmt; }
-          SwFrmFmt *GetEmptyPageFmt()       { return mpEmptyPageFmt; }
-    const SwFrmFmt *GetColumnContFmt() const{ return mpColumnContFmt; }
-          SwFrmFmt *GetColumnContFmt()      { return mpColumnContFmt; }
-    const SwCharFmt *GetDfltCharFmt() const { return mpDfltCharFmt;}
-          SwCharFmt *GetDfltCharFmt()       { return mpDfltCharFmt;}
+    const SwFrameFormats* GetSpzFrameFormats() const   { return mpSpzFrameFormatTable; }
+          SwFrameFormats* GetSpzFrameFormats()         { return mpSpzFrameFormatTable; }
+
+    const SwFrameFormat *GetDfltFrameFormat() const   { return mpDfltFrameFormat; }
+          SwFrameFormat *GetDfltFrameFormat()         { return mpDfltFrameFormat; }
+    const SwFrameFormat *GetEmptyPageFormat() const { return mpEmptyPageFormat; }
+          SwFrameFormat *GetEmptyPageFormat()       { return mpEmptyPageFormat; }
+    const SwFrameFormat *GetColumnContFormat() const{ return mpColumnContFormat; }
+          SwFrameFormat *GetColumnContFormat()      { return mpColumnContFormat; }
+    const SwCharFormat *GetDfltCharFormat() const { return mpDfltCharFormat;}
+          SwCharFormat *GetDfltCharFormat()       { return mpDfltCharFormat;}
 
     // @return the interface of the management of (auto)styles
     IStyleAccess& GetIStyleAccess() { return *mpStyleAccess; }
 
     // Remove all language dependencies from all existing formats
-    void RemoveAllFmtLanguageDependencies();
+    void RemoveAllFormatLanguageDependencies();
 
-    SwFrmFmt  *MakeFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom,
+    SwFrameFormat  *MakeFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom,
                           bool bBroadcast = false, bool bAuto = true);
-    void       DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false );
-    SwFrmFmt* FindFrmFmtByName( const OUString& rName ) const
-        {   return static_cast<SwFrmFmt*>(FindFmtByName( static_cast<SwFmtsBase&>(*mpFrmFmtTbl), rName )); }
+    void       DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast = false );
+    SwFrameFormat* FindFrameFormatByName( const OUString& rName ) const
+        {   return static_cast<SwFrameFormat*>(FindFormatByName( static_cast<SwFormatsBase&>(*mpFrameFormatTable), rName )); }
 
-    SwCharFmt *MakeCharFmt(const OUString &rFmtName, SwCharFmt *pDerivedFrom,
+    SwCharFormat *MakeCharFormat(const OUString &rFormatName, SwCharFormat *pDerivedFrom,
                            bool bBroadcast = false,
                            bool bAuto = true );
-    void       DelCharFmt(size_t nFmt, bool bBroadcast = false);
-    void       DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false);
-    SwCharFmt* FindCharFmtByName( const OUString& rName ) const
-        {   return static_cast<SwCharFmt*>(FindFmtByName( (SwFmtsBase&)*mpCharFmtTbl, rName )); }
+    void       DelCharFormat(size_t nFormat, bool bBroadcast = false);
+    void       DelCharFormat(SwCharFormat* pFormat, bool bBroadcast = false);
+    SwCharFormat* FindCharFormatByName( const OUString& rName ) const
+        {   return static_cast<SwCharFormat*>(FindFormatByName( (SwFormatsBase&)*mpCharFormatTable, rName )); }
 
     // Formatcollections (styles)
     // TXT
-    const SwTxtFmtColl* GetDfltTxtFmtColl() const { return mpDfltTxtFmtColl; }
-    SwTxtFmtColl* GetDfltTxtFmtColl() { return mpDfltTxtFmtColl; }
-    const SwTxtFmtColls *GetTxtFmtColls() const { return mpTxtFmtCollTbl; }
-    SwTxtFmtColls *GetTxtFmtColls() { return mpTxtFmtCollTbl; }
-    SwTxtFmtColl *MakeTxtFmtColl( const OUString &rFmtName,
-                                  SwTxtFmtColl *pDerivedFrom,
+    const SwTextFormatColl* GetDfltTextFormatColl() const { return mpDfltTextFormatColl; }
+    SwTextFormatColl* GetDfltTextFormatColl() { return mpDfltTextFormatColl; }
+    const SwTextFormatColls *GetTextFormatColls() const { return mpTextFormatCollTable; }
+    SwTextFormatColls *GetTextFormatColls() { return mpTextFormatCollTable; }
+    SwTextFormatColl *MakeTextFormatColl( const OUString &rFormatName,
+                                  SwTextFormatColl *pDerivedFrom,
                                   bool bBroadcast = false,
                                   bool bAuto = true );
-    SwConditionTxtFmtColl* MakeCondTxtFmtColl( const OUString &rFmtName,
-                                               SwTxtFmtColl *pDerivedFrom,
+    SwConditionTextFormatColl* MakeCondTextFormatColl( const OUString &rFormatName,
+                                               SwTextFormatColl *pDerivedFrom,
                                                bool bBroadcast = false);
-    void DelTxtFmtColl(size_t nFmt, bool bBroadcast = false);
-    void DelTxtFmtColl( SwTxtFmtColl* pColl, bool bBroadcast = false );
+    void DelTextFormatColl(size_t nFormat, bool bBroadcast = false);
+    void DelTextFormatColl( SwTextFormatColl* pColl, bool bBroadcast = false );
     /** Add 4th optional parameter <bResetListAttrs>.
-     'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard
+     'side effect' of <SetTextFormatColl> with <bReset = true> is that the hard
      attributes of the affected text nodes are cleared, except the break
      attribute, the page description attribute and the list style attribute.
      The new parameter <bResetListAttrs> indicates, if the list attributes
      (list style, restart at and restart with) are cleared as well in case
      that <bReset = true> and the paragraph style has a list style attribute set. */
-    bool SetTxtFmtColl(const SwPaM &rRg, SwTxtFmtColl *pFmt,
+    bool SetTextFormatColl(const SwPaM &rRg, SwTextFormatColl *pFormat,
                        const bool bReset = true,
                        const bool bResetListAttrs = false);
-    SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const
-        {   return static_cast<SwTxtFmtColl*>(FindFmtByName( (SwFmtsBase&)*mpTxtFmtCollTbl, rName )); }
+    SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const
+        {   return static_cast<SwTextFormatColl*>(FindFormatByName( (SwFormatsBase&)*mpTextFormatCollTable, rName )); }
 
     void ChkCondColls();
 
-    const SwGrfFmtColl* GetDfltGrfFmtColl() const   { return mpDfltGrfFmtColl; }
-    SwGrfFmtColl* GetDfltGrfFmtColl()  { return mpDfltGrfFmtColl; }
-    const SwGrfFmtColls *GetGrfFmtColls() const     { return mpGrfFmtCollTbl; }
-    SwGrfFmtColl *MakeGrfFmtColl(const OUString &rFmtName,
-                                    SwGrfFmtColl *pDerivedFrom);
-    SwGrfFmtColl* FindGrfFmtCollByName( const OUString& rName ) const
-        {   return static_cast<SwGrfFmtColl*>(FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName )); }
+    const SwGrfFormatColl* GetDfltGrfFormatColl() const   { return mpDfltGrfFormatColl; }
+    SwGrfFormatColl* GetDfltGrfFormatColl()  { return mpDfltGrfFormatColl; }
+    const SwGrfFormatColls *GetGrfFormatColls() const     { return mpGrfFormatCollTable; }
+    SwGrfFormatColl *MakeGrfFormatColl(const OUString &rFormatName,
+                                    SwGrfFormatColl *pDerivedFrom);
+    SwGrfFormatColl* FindGrfFormatCollByName( const OUString& rName ) const
+        {   return static_cast<SwGrfFormatColl*>(FindFormatByName( (SwFormatsBase&)*mpGrfFormatCollTable, rName )); }
 
     // Table formatting
-    const SwFrmFmts* GetTblFrmFmts() const  { return mpTblFrmFmtTbl; }
-          SwFrmFmts* GetTblFrmFmts()        { return mpTblFrmFmtTbl; }
-    size_t GetTblFrmFmtCount( bool bUsed ) const;
-    SwFrmFmt& GetTblFrmFmt(size_t nFmt, bool bUsed ) const;
-    SwTableFmt* MakeTblFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
-    void        DelTblFrmFmt( SwTableFmt* pFmt );
-    SwTableFmt* FindTblFmtByName( const OUString& rName, bool bAll = false ) const;
+    const SwFrameFormats* GetTableFrameFormats() const  { return mpTableFrameFormatTable; }
+          SwFrameFormats* GetTableFrameFormats()        { return mpTableFrameFormatTable; }
+    size_t GetTableFrameFormatCount( bool bUsed ) const;
+    SwFrameFormat& GetTableFrameFormat(size_t nFormat, bool bUsed ) const;
+    SwTableFormat* MakeTableFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom);
+    void        DelTableFrameFormat( SwTableFormat* pFormat );
+    SwTableFormat* FindTableFormatByName( const OUString& rName, bool bAll = false ) const;
 
     /** Access to frames.
     Iterate over Flys - forr Basic-Collections. */
     size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const;
-    SwFrmFmt* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false );
+    SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false );
 
     // Copy formats in own arrays and return them.
-    SwFrmFmt  *CopyFrmFmt ( const SwFrmFmt& );
-    SwCharFmt *CopyCharFmt( const SwCharFmt& );
-    SwTxtFmtColl* CopyTxtColl( const SwTxtFmtColl& rColl );
-    SwGrfFmtColl* CopyGrfColl( const SwGrfFmtColl& rColl );
+    SwFrameFormat  *CopyFrameFormat ( const SwFrameFormat& );
+    SwCharFormat *CopyCharFormat( const SwCharFormat& );
+    SwTextFormatColl* CopyTextColl( const SwTextFormatColl& rColl );
+    SwGrfFormatColl* CopyGrfColl( const SwGrfFormatColl& rColl );
 
     // Replace all styles with those from rSource.
     void ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles = true );
@@ -948,19 +948,19 @@ public:
     bool        ContainsPageDesc(const SwPageDesc *pDesc, size_t* pPos = NULL);
 
     /** Copy the complete PageDesc - beyond document and "deep"!
-     Optionally copying of PoolFmtId, -HlpId can be prevented. */
+     Optionally copying of PoolFormatId, -HlpId can be prevented. */
     void CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
                         bool bCopyPoolIds = true );
 
-    /** Copy header (with contents) from SrcFmt to DestFmt
+    /** Copy header (with contents) from SrcFormat to DestFormat
      (can also be copied into other document). */
-    void CopyHeader( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
-        { CopyPageDescHeaderFooterImpl( true, rSrcFmt, rDestFmt ); }
+    void CopyHeader( const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat )
+        { CopyPageDescHeaderFooterImpl( true, rSrcFormat, rDestFormat ); }
 
-    /** Copy footer (with contents) from SrcFmt to DestFmt.
+    /** Copy footer (with contents) from SrcFormat to DestFormat.
      (can also be copied into other document). */
-    void CopyFooter( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
-        { CopyPageDescHeaderFooterImpl( false, rSrcFmt, rDestFmt ); }
+    void CopyFooter( const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat )
+        { CopyPageDescHeaderFooterImpl( false, rSrcFormat, rDestFormat ); }
 
     // For Reader
     void ChgPageDesc( const OUString & rName, const SwPageDesc& );
@@ -977,7 +977,7 @@ public:
     /** The html import sometimes overwrites the
      page sizes set in the page descriptions. This function is used to
      correct this. */
-    void CheckDefaultPageFmt();
+    void CheckDefaultPageFormat();
 
     // Methods for tables/indices
     static sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& );
@@ -1041,7 +1041,7 @@ public:
     sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const;
 
     // Sort table text.
-    bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&);
+    bool SortTable(const SwSelBoxes& rBoxes, const SwSortOptions&);
     bool SortText(const SwPaM&, const SwSortOptions&);
 
     // Correct the SwPosition-Objects that are registered with the document
@@ -1118,7 +1118,7 @@ public:
 
     static SwNumRule* GetNumRuleAtPos( const SwPosition& rPos );
 
-    const SwNumRuleTbl& GetNumRuleTbl() const { return *mpNumRuleTbl; }
+    const SwNumRuleTable& GetNumRuleTable() const { return *mpNumRuleTable; }
 
     /**
        Add numbering rule to document.
@@ -1143,7 +1143,7 @@ public:
     OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const;
 
     void UpdateNumRule();   // Update all invalids.
-    void ChgNumRuleFmts( const SwNumRule& rRule );
+    void ChgNumRuleFormats( const SwNumRule& rRule );
     bool ReplaceNumRule( const SwPosition& rPos, const OUString& rOldRule,
                         const OUString& rNewRule );
 
@@ -1213,28 +1213,28 @@ public:
        propagation.
        false: do not propagate
     */
-    const SwTable* InsertTable( const SwInsertTableOptions& rInsTblOpts,  // HEADLINE_NO_BORDER
+    const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts,  // HEADLINE_NO_BORDER
                                 const SwPosition& rPos, sal_uInt16 nRows,
                                 sal_uInt16 nCols, short eAdjust,
-                                const SwTableAutoFmt* pTAFmt = 0,
+                                const SwTableAutoFormat* pTAFormat = 0,
                                 const std::vector<sal_uInt16> *pColArr = 0,
                                 bool bCalledFromShell = false,
                                 bool bNewModel = true );
 
     // If index is in a table, return TableNode, else 0.
-                 SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx );
-    inline const SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ) const;
+                 SwTableNode* IsIdxInTable( const SwNodeIndex& rIdx );
+    inline const SwTableNode* IsIdxInTable( const SwNodeIndex& rIdx ) const;
 
     // Create a balanced table out of the selected range.
-    const SwTable* TextToTable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER,
+    const SwTable* TextToTable( const SwInsertTableOptions& rInsTableOpts, // HEADLINE_NO_BORDER,
                                 const SwPaM& rRange, sal_Unicode cCh,
                                 short eAdjust,
-                                const SwTableAutoFmt* = 0 );
+                                const SwTableAutoFormat* = 0 );
 
     // text to table conversion - API support
     const SwTable* TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes );
 
-    bool TableToText( const SwTableNode* pTblNd, sal_Unicode cCh );
+    bool TableToText( const SwTableNode* pTableNd, sal_Unicode cCh );
 
     // Create columns / rows in table.
     bool InsertCol( const SwCursor& rCursor,
@@ -1252,15 +1252,15 @@ public:
     bool DeleteCol( const SwCursor& rCursor );
 
     // Split / concatenate boxes in table.
-    bool SplitTbl( const SwSelBoxes& rBoxes, bool bVert = true,
+    bool SplitTable( const SwSelBoxes& rBoxes, bool bVert = true,
                        sal_uInt16 nCnt = 1, bool bSameHeight = false );
 
     // @return enum TableMergeErr.
-    sal_uInt16 MergeTbl( SwPaM& rPam );
-    OUString GetUniqueTblName() const;
-    bool IsInsTblFormatNum() const;
-    bool IsInsTblChangeNumFormat() const;
-    bool IsInsTblAlignNum() const;
+    sal_uInt16 MergeTable( SwPaM& rPam );
+    OUString GetUniqueTableName() const;
+    bool IsInsTableFormatNum() const;
+    bool IsInsTableChangeNumFormat() const;
+    bool IsInsTableAlignNum() const;
 
     // From FEShell (for Undo and BModified).
     static void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
@@ -1279,34 +1279,34 @@ public:
     void SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet );
 
     // AutoFormat for table/table selection.
-    bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew );
+    bool SetTableAutoFormat( const SwSelBoxes& rBoxes, const SwTableAutoFormat& rNew );
 
     // Query attributes.
-    bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet );
+    bool GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet );
 
     void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable );
 
     bool SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                 SwTwips nAbsDiff, SwTwips nRelDiff );
-    SwTableBoxFmt* MakeTableBoxFmt();
-    SwTableLineFmt* MakeTableLineFmt();
+    SwTableBoxFormat* MakeTableBoxFormat();
+    SwTableLineFormat* MakeTableLineFormat();
 
     // Check if box has numerical valule. Change format of box if required.
-    void ChkBoxNumFmt( SwTableBox& rAktBox, bool bCallUpdate );
-    void SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet );
+    void ChkBoxNumFormat( SwTableBox& rAktBox, bool bCallUpdate );
+    void SetTableBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet );
     void ClearBoxNumAttrs( const SwNodeIndex& rNode );
     void ClearLineNumAttrs( SwPosition & rPos );
 
-    bool InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
-                        const SwTable* pCpyTbl = 0, bool bCpyName = false,
+    bool InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
+                        const SwTable* pCpyTable = 0, bool bCpyName = false,
                         bool bCorrPos = false );
 
-    bool UnProtectCells( const OUString& rTblName );
+    bool UnProtectCells( const OUString& rTableName );
     bool UnProtectCells( const SwSelBoxes& rBoxes );
-    bool UnProtectTbls( const SwPaM& rPam );
-    bool HasTblAnyProtection( const SwPosition* pPos,
-                              const OUString* pTblName = 0,
-                              bool* pFullTblProtection = 0 );
+    bool UnProtectTables( const SwPaM& rPam );
+    bool HasTableAnyProtection( const SwPosition* pPos,
+                              const OUString* pTableName = 0,
+                              bool* pFullTableProtection = 0 );
 
     // Split table at baseline position, i.e. create a new table.
     bool SplitTable( const SwPosition& rPos, sal_uInt16 eMode = 0,
@@ -1324,26 +1324,26 @@ public:
     void UpdateAllCharts()          { DoUpdateAllCharts(); }
 
     // Table is renamed and refreshes charts.
-    void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName );
+    void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName );
 
     // @return the reference in document that is set for name.
-    const SwFmtRefMark* GetRefMark( const OUString& rName ) const;
+    const SwFormatRefMark* GetRefMark( const OUString& rName ) const;
 
     // @return RefMark via index - for UNO.
-    const SwFmtRefMark* GetRefMark( sal_uInt16 nIndex ) const;
+    const SwFormatRefMark* GetRefMark( sal_uInt16 nIndex ) const;
 
     /** @return names of all references that are set in document.
      If array pointer is 0 return only whether a RefMark is set in document. */
     sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const;
 
     // Insert label. If a FlyFormat is created, return it.
-    SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator,
+    SwFlyFrameFormat* InsertLabel( const SwLabelType eType, const OUString &rText, const OUString& rSeparator,
                     const OUString& rNumberingSeparator,
                     const bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx,
                     const OUString& rCharacterStyle,
                     const bool bCpyBrd = true );
-    SwFlyFrmFmt* InsertDrawLabel(
-        const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberSeparator,
+    SwFlyFrameFormat* InsertDrawLabel(
+        const OUString &rText, const OUString& rSeparator, const OUString& rNumberSeparator,
         const sal_uInt16 nId, const OUString& rCharacterStyle, SdrObject& rObj );
 
     // Query attribute pool.
@@ -1366,10 +1366,10 @@ public:
     static sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange,
                                 const SwNode** ppSttNd = 0 );
     static SwSection* GetCurrSection( const SwPosition& rPos );
-    SwSectionFmts& GetSections() { return *mpSectionFmtTbl; }
-    const SwSectionFmts& GetSections() const { return *mpSectionFmtTbl; }
-    SwSectionFmt *MakeSectionFmt( SwSectionFmt *pDerivedFrom );
-    void DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes = false );
+    SwSectionFormats& GetSections() { return *mpSectionFormatTable; }
+    const SwSectionFormats& GetSections() const { return *mpSectionFormatTable; }
+    SwSectionFormat *MakeSectionFormat( SwSectionFormat *pDerivedFrom );
+    void DelSectionFormat( SwSectionFormat *pFormat, bool bDelNodes = false );
     void UpdateSection(size_t const nSect, SwSectionData &,
             SfxItemSet const*const = 0, bool const bPreventLinkUpdate = false);
     OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const;
@@ -1426,7 +1426,7 @@ public:
     SwAutoCorrExceptWord* GetAutoCorrExceptWord()       { return mpACEWord; }
     void DeleteAutoCorrExceptWord();
 
-    const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const;
+    const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const;
 
     // Call into intransparent Basic; expect possible Return String.
     bool ExecMacro( const SvxMacro& rMacro, OUString* pRet = 0, SbxArray* pArgs = 0 );
@@ -1457,10 +1457,10 @@ public:
     // Create sub-documents according to given collection.
     // If no collection is given, use chapter styles for 1st level.
     bool GenerateGlobalDoc( const OUString& rPath,
-                                const SwTxtFmtColl* pSplitColl = 0 );
+                                const SwTextFormatColl* pSplitColl = 0 );
     bool GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel = 0 );
     bool GenerateHTMLDoc( const OUString& rPath,
-                                const SwTxtFmtColl* pSplitColl = 0 );
+                                const SwTextFormatColl* pSplitColl = 0 );
     bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel = 0 );
 
     //  Compare two documents.
@@ -1469,13 +1469,13 @@ public:
     // Merge two documents.
     long MergeDoc( const SwDoc& rDoc );
 
-    bool IsAutoFmtRedline() const           { return mbIsAutoFmtRedline; }
-    void SetAutoFmtRedline( bool bFlag )    { mbIsAutoFmtRedline = bFlag; }
+    bool IsAutoFormatRedline() const           { return mbIsAutoFormatRedline; }
+    void SetAutoFormatRedline( bool bFlag )    { mbIsAutoFormatRedline = bFlag; }
 
     // For AutoFormat: with Undo/Redlining.
-    void SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId,
+    void SetTextFormatCollByAutoFormat( const SwPosition& rPos, sal_uInt16 nPoolId,
                                 const SfxItemSet* pSet = 0 );
-    void SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& );
+    void SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& );
 
     // Only for SW-textbloxks! Does not pay any attention to layout!
     void ClearDoc();        // Deletes all content!
@@ -1493,8 +1493,8 @@ public:
     void SetOLEObjModified();
 
     // Uno - Interfaces
-    const SwUnoCrsrTbl& GetUnoCrsrTbl() const       { return *mpUnoCrsrTbl; }
-    SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr = false );
+    const SwUnoCrsrTable& GetUnoCrsrTable() const       { return *mpUnoCrsrTable; }
+    SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTableCrsr = false );
 
     // FeShell - Interfaces
     // !!! These assume always an existing layout !!!
@@ -1503,10 +1503,10 @@ public:
                         const bool _bSameOnly,
                         const bool _bPosCorr );
 
-    void SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew );
-    static void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz );
-    void SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew );
-    static void GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz );
+    void SetRowHeight( const SwCursor& rCursor, const SwFormatFrmSize &rNew );
+    static void GetRowHeight( const SwCursor& rCursor, SwFormatFrmSize *& rpSz );
+    void SetRowSplit( const SwCursor& rCursor, const SwFormatRowSplit &rNew );
+    static void GetRowSplit( const SwCursor& rCursor, SwFormatRowSplit *& rpSz );
     bool BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly = true );
     void SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew );
     static bool GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill );
@@ -1531,9 +1531,9 @@ public:
     static sal_uInt16 GetBoxAlign( const SwCursor& rCursor );
     void AdjustCellWidth( const SwCursor& rCursor, bool bBalance = false );
 
-    SwChainRet Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest );
-    SwChainRet Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest );
-    void Unchain( SwFrmFmt &rFmt );
+    SwChainRet Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest );
+    SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest );
+    void Unchain( SwFrameFormat &rFormat );
 
     // For Copy/Move from FrmShell.
     SdrObject* CloneSdrObj( const SdrObject&, bool bMoveWithinDoc = false,
@@ -1545,7 +1545,7 @@ public:
     SwExtTextInput* CreateExtTextInput( const SwPaM& rPam );
     void DeleteExtTextInput( SwExtTextInput* pDel );
     SwExtTextInput* GetExtTextInput( const SwNode& rNd,
-                                sal_Int32 nCntntPos = -1) const;
+                                sal_Int32 nContentPos = -1) const;
     SwExtTextInput* GetExtTextInput() const;
 
     // Interface for access to AutoComplete-List.
@@ -1599,9 +1599,9 @@ public:
                         const bool bValue );
 
     // Change a format undoable.
-    void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
+    void ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet);
 
-    void RenameFmt(SwFmt & rFmt, const OUString & sNewName,
+    void RenameFormat(SwFormat & rFormat, const OUString & sNewName,
                    bool bBroadcast = false);
 
     // Change a TOX undoable.
@@ -1671,18 +1671,18 @@ public:
 
 private:
     // Copies master header to left / first one, if necessary - used by ChgPageDesc().
-    void CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc &pDesc, bool bLeft, bool bFirst);
+    void CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader &rHead, SwPageDesc &pDesc, bool bLeft, bool bFirst);
     // Copies master footer to left / first one, if necessary - used by ChgPageDesc().
-    void CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc &pDesc, bool bLeft, bool bFirst);
+    void CopyMasterFooter(const SwPageDesc &rChged, const SwFormatFooter &rFoot, SwPageDesc &pDesc, bool bLeft, bool bFirst);
 
 };
 
 // This method is called in Dtor of SwDoc and deletes cache of ContourObjects.
 void ClrContourCache();
 
-inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const
+inline const SwTableNode* SwDoc::IsIdxInTable( const SwNodeIndex& rIdx ) const
 {
-    return const_cast<SwDoc*>(this)->IsIdxInTbl( rIdx );
+    return const_cast<SwDoc*>(this)->IsIdxInTable( rIdx );
 }
 
 inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate )
@@ -1704,7 +1704,7 @@ inline void SwDoc::SetOLEPrtNotifyPending( bool bSet )
         mbAllOLENotify = false;
 }
 
-bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst );
+bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFields * pSrtLst );
 
 #endif  //_DOC_HXX
 
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index c671a695b921..2d2871f37df5 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -48,13 +48,13 @@ namespace com { namespace sun { namespace star { namespace i18n {
 #include <numrule.hxx>
 
 /** provides some methods for generic operations on lists that contain
-SwFmt* subclasses. */
-class SwFmtsBase
+SwFormat* subclasses. */
+class SwFormatsBase
 {
 public:
-    virtual size_t GetFmtCount() const = 0;
-    virtual SwFmt* GetFmt(size_t idx) const = 0;
-    virtual ~SwFmtsBase() {};
+    virtual size_t GetFormatCount() const = 0;
+    virtual SwFormat* GetFormat(size_t idx) const = 0;
+    virtual ~SwFormatsBase() {};
 };
 
 template<typename Value>
@@ -112,86 +112,86 @@ public:
 };
 
 template<typename Value>
-class SwFmtsModifyBase : public SwVectorModifyBase<Value>, public SwFmtsBase
+class SwFormatsModifyBase : public SwVectorModifyBase<Value>, public SwFormatsBase
 {
 protected:
-    SwFmtsModifyBase(typename SwVectorModifyBase<Value>::DestructorPolicy
+    SwFormatsModifyBase(typename SwVectorModifyBase<Value>::DestructorPolicy
             policy = SwVectorModifyBase<Value>::DestructorPolicy::FreeElements)
         : SwVectorModifyBase<Value>(policy) {}
 
 public:
-    virtual size_t GetFmtCount() const SAL_OVERRIDE
+    virtual size_t GetFormatCount() const SAL_OVERRIDE
         { return std::vector<Value>::size(); }
 
-    virtual Value GetFmt(size_t idx) const SAL_OVERRIDE
+    virtual Value GetFormat(size_t idx) const SAL_OVERRIDE
         { return std::vector<Value>::operator[](idx); }
 
-    inline size_t GetPos(const SwFmt *p) const
-        { return SwVectorModifyBase<Value>::GetPos( static_cast<Value>( const_cast<SwFmt*>( p ) ) ); }
-    inline bool Contains(const SwFmt *p) const {
-        Value p2 = dynamic_cast<Value>(const_cast<SwFmt*>(p));
+    inline size_t GetPos(const SwFormat *p) const
+        { return SwVectorModifyBase<Value>::GetPos( static_cast<Value>( const_cast<SwFormat*>( p ) ) ); }
+    inline bool Contains(const SwFormat *p) const {
+        Value p2 = dynamic_cast<Value>(const_cast<SwFormat*>(p));
         return p2 != nullptr && SwVectorModifyBase<Value>::Contains(p2);
     }
 };
 
-class SwGrfFmtColls : public SwFmtsModifyBase<SwGrfFmtColl*>
+class SwGrfFormatColls : public SwFormatsModifyBase<SwGrfFormatColl*>
 {
 public:
-    SwGrfFmtColls() : SwFmtsModifyBase( DestructorPolicy::KeepElements ) {}
+    SwGrfFormatColls() : SwFormatsModifyBase( DestructorPolicy::KeepElements ) {}
 };
 
 /// Specific frame formats (frames, DrawObjects).
-class SW_DLLPUBLIC SwFrmFmts : public SwFmtsModifyBase<SwFrmFmt*>
+class SW_DLLPUBLIC SwFrameFormats : public SwFormatsModifyBase<SwFrameFormat*>
 {
 public:
     void dumpAsXml(struct _xmlTextWriter* pWriter, const char* pName) const;
 };
 
-class SwCharFmts : public SwFmtsModifyBase<SwCharFmt*>
+class SwCharFormats : public SwFormatsModifyBase<SwCharFormat*>
 {
 public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-class SwTxtFmtColls : public SwFmtsModifyBase<SwTxtFmtColl*>
+class SwTextFormatColls : public SwFormatsModifyBase<SwTextFormatColl*>
 {
 public:
-    SwTxtFmtColls() : SwFmtsModifyBase( DestructorPolicy::KeepElements ) {}
+    SwTextFormatColls() : SwFormatsModifyBase( DestructorPolicy::KeepElements ) {}
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 /// Array of Undo-history.
-class SW_DLLPUBLIC SwSectionFmts : public SwFmtsModifyBase<SwSectionFmt*>
+class SW_DLLPUBLIC SwSectionFormats : public SwFormatsModifyBase<SwSectionFormat*>
 {
 public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-class SwFldTypes : public SwVectorModifyBase<SwFieldType*> {
+class SwFieldTypes : public SwVectorModifyBase<SwFieldType*> {
 public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 class SwTOXTypes : public SwVectorModifyBase<SwTOXType*> {};
 
-class SW_DLLPUBLIC SwNumRuleTbl : public SwVectorModifyBase<SwNumRule*> {
+class SW_DLLPUBLIC SwNumRuleTable : public SwVectorModifyBase<SwNumRule*> {
 public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-struct CompareSwRedlineTbl
+struct CompareSwRedlineTable
 {
     bool operator()(SwRangeRedline* const &lhs, SwRangeRedline* const &rhs) const;
 };
-class _SwRedlineTbl
-    : public o3tl::sorted_vector<SwRangeRedline*, CompareSwRedlineTbl,
+class _SwRedlineTable
+    : public o3tl::sorted_vector<SwRangeRedline*, CompareSwRedlineTable,
                 o3tl::find_partialorder_ptrequals>
 {
 public:
-    ~_SwRedlineTbl();
+    ~_SwRedlineTable();
 };
 
-class SwRedlineTbl : private _SwRedlineTbl
+class SwRedlineTable : private _SwRedlineTable
 {
 public:
     bool Contains(const SwRangeRedline* p) const { return find(const_cast<SwRangeRedline* const>(p)) != end(); }
@@ -221,30 +221,30 @@ public:
     /**
      Find the redline at the given position.
 
-     @param tableIndex position in SwRedlineTbl to start searching at, will be updated with the index of the returned
+     @param tableIndex position in SwRedlineTable to start searching at, will be updated with the index of the returned
                        redline (or the next redline after the given position if not found)
      @param next true: redline starts at position and ends after, false: redline starts before position and ends at or after
     */
     const SwRangeRedline* FindAtPosition( const SwPosition& startPosition, sal_uInt16& tableIndex, bool next = true ) const;
 
-    using _SwRedlineTbl::const_iterator;
-    using _SwRedlineTbl::begin;
-    using _SwRedlineTbl::end;
-    using _SwRedlineTbl::size;
-    using _SwRedlineTbl::size_type;
-    using _SwRedlineTbl::operator[];
-    using _SwRedlineTbl::empty;
-    using _SwRedlineTbl::Resort;
+    using _SwRedlineTable::const_iterator;
+    using _SwRedlineTable::begin;
+    using _SwRedlineTable::end;
+    using _SwRedlineTable::size;
+    using _SwRedlineTable::size_type;
+    using _SwRedlineTable::operator[];
+    using _SwRedlineTable::empty;
+    using _SwRedlineTable::Resort;
 };
 
 /// Table that holds 'extra' redlines, such as 'table row insert\delete', 'paragraph moves' etc...
-class SwExtraRedlineTbl
+class SwExtraRedlineTable
 {
 private:
     std::vector<SwExtraRedline*>    m_aExtraRedlines;
 
 public:
-    ~SwExtraRedlineTbl();
+    ~SwExtraRedlineTable();
 
     bool Insert( SwExtraRedline* p );
 
@@ -262,10 +262,10 @@ public:
     bool DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
 };
 
-class SwUnoCrsrTbl : public std::set<SwUnoCrsr*> {
+class SwUnoCrsrTable : public std::set<SwUnoCrsr*> {
 public:
     /// the destructor will free all objects still in the set
-    ~SwUnoCrsrTbl();
+    ~SwUnoCrsrTable();
 };
 
 typedef std::vector<SwOLENode*> SwOLENodes;
diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx
index 4a7a88364ca1..fd53d80bfcbf 100644
--- a/sw/inc/docstat.hxx
+++ b/sw/inc/docstat.hxx
@@ -24,7 +24,7 @@
 
 struct SW_DLLPUBLIC SwDocStat
 {
-    sal_uInt16          nTbl;
+    sal_uInt16          nTable;
     sal_uInt16          nGrf;
     sal_uInt16          nOLE;
     sal_uLong           nPage;
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index acf16d94aac3..1298cc618467 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -32,9 +32,9 @@
 class SwDoc;
 class SwDocStyleSheetPool;
 class SwPageDesc;
-class SwCharFmt;
-class SwTxtFmtColl;
-class SwFrmFmt;
+class SwCharFormat;
+class SwTextFormatColl;
+class SwFrameFormat;
 class SwNumRule;
 
 // Temporary StyleSheet.
@@ -43,9 +43,9 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
     friend class SwDocStyleSheetPool;
     friend class SwStyleSheetIterator;
 
-    SwCharFmt*          pCharFmt;
-    SwTxtFmtColl*       pColl;
-    SwFrmFmt*           pFrmFmt;
+    SwCharFormat*          pCharFormat;
+    SwTextFormatColl*       pColl;
+    SwFrameFormat*           pFrameFormat;
     const SwPageDesc*   pDesc;
     const SwNumRule*    pNumRule;
 
@@ -125,9 +125,9 @@ public:
     virtual OUString        GetDescription() SAL_OVERRIDE;
     virtual OUString        GetDescription(SfxMapUnit eUnit) SAL_OVERRIDE;
 
-    SwCharFmt*              GetCharFmt();
-    SwTxtFmtColl*           GetCollection();
-    SwFrmFmt*               GetFrmFmt();
+    SwCharFormat*              GetCharFormat();
+    SwTextFormatColl*           GetCollection();
+    SwFrameFormat*               GetFrameFormat();
     const SwPageDesc*       GetPageDesc();
     const SwNumRule*        GetNumRule();
     void                    SetNumRule(const SwNumRule& rRule);
@@ -139,14 +139,14 @@ public:
 class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
 {
     // Local helper class.
-    class SwPoolFmtList
+    class SwPoolFormatList
     {
         std::vector<OUString> maImpl;
         typedef std::unordered_map<OUString, sal_uInt32, OUStringHash> UniqueHash;
         UniqueHash maUnique;
         void rehash();
     public:
-        SwPoolFmtList() {}
+        SwPoolFormatList() {}
         void Append( char cChar, const OUString& rStr );
         void clear() { maImpl.clear(); maUnique.clear(); }
         size_t size() { return maImpl.size(); }
@@ -158,7 +158,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
 
     rtl::Reference< SwDocStyleSheet > mxIterSheet;
     rtl::Reference< SwDocStyleSheet > mxStyleSheet;
-    SwPoolFmtList       aLst;
+    SwPoolFormatList       aLst;
     sal_uInt32          nLastPos;
     bool                bFirstCalled;
 
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 5bb92646b171..f7d8cf46dd94 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -27,12 +27,12 @@
 #include "fldbas.hxx"
 #include "numrule.hxx"
 
-class _SetGetExpFlds;
-class SwTxtFld;
+class _SetGetExpFields;
+class SwTextField;
 class SwFrm;
 class OutlinerParaObject;
 class SwTextAPIObject;
-class SwFmtFld;
+class SwFormatField;
 
 enum SwAuthorFormat
 {
@@ -137,10 +137,10 @@ class SwPageNumberFieldType : public SwFieldType
 public:
     SwPageNumberFieldType();
 
-    OUString Expand( sal_uInt32 nFmt, short nOff, sal_uInt16 const nPageNumber,
+    OUString Expand( sal_uInt32 nFormat, short nOff, sal_uInt16 const nPageNumber,
                      sal_uInt16 const nMaxPage, const OUString& ) const;
     void ChangeExpansion( SwDoc* pDoc,
-                            bool bVirtPageNum, const sal_Int16* pNumFmt = 0 );
+                            bool bVirtPageNum, const sal_Int16* pNumFormat = 0 );
     virtual SwFieldType* Copy() const SAL_OVERRIDE;
 };
 
@@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwPageNumberField : public SwField
 
 public:
     SwPageNumberField(SwPageNumberFieldType*, sal_uInt16 nSub = PG_RANDOM,
-                      sal_uInt32 nFmt = 0, short nOff = 0,
+                      sal_uInt32 nFormat = 0, short nOff = 0,
                       sal_uInt16 const nPageNumber = 0,
                       sal_uInt16 const nMaxPage = 0);
 
@@ -191,7 +191,7 @@ class SwAuthorField : public SwField
     OUString aContent;
 
 public:
-    SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFmt = 0);
+    SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFormat = 0);
 
     virtual OUString    Expand() const SAL_OVERRIDE;
     virtual SwField*    Copy() const SAL_OVERRIDE;
@@ -218,7 +218,7 @@ class SW_DLLPUBLIC SwFileNameField : public SwField
     OUString aContent;
 
 public:
-    SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFmt = 0);
+    SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFormat = 0);
 
     virtual OUString    Expand() const SAL_OVERRIDE;
     virtual SwField*    Copy() const SAL_OVERRIDE;
@@ -243,7 +243,7 @@ public:
 class SW_DLLPUBLIC SwTemplNameField : public SwField
 {
 public:
-    SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFmt = 0);
+    SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFormat = 0);
 
     virtual OUString    Expand() const SAL_OVERRIDE;
     virtual SwField*    Copy() const SAL_OVERRIDE;
@@ -259,10 +259,10 @@ class SwDocStatFieldType : public SwFieldType
 
 public:
     SwDocStatFieldType(SwDoc*);
-    OUString                Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const;
+    OUString                Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const;
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 
-    inline void             SetNumFormat( sal_Int16 eFmt )  { nNumberingType = eFmt; }
+    inline void             SetNumFormat( sal_Int16 eFormat )  { nNumberingType = eFormat; }
 };
 
 class SW_DLLPUBLIC SwDocStatField : public SwField
@@ -271,7 +271,7 @@ class SW_DLLPUBLIC SwDocStatField : public SwField
 
 public:
     SwDocStatField( SwDocStatFieldType*,
-                    sal_uInt16 nSubType = 0, sal_uInt32 nFmt = 0);
+                    sal_uInt16 nSubType = 0, sal_uInt32 nFormat = 0);
 
     void ChangeExpansion( const SwFrm* pFrm );
 
@@ -284,11 +284,11 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-class SwHiddenTxtFieldType : public SwFieldType
+class SwHiddenTextFieldType : public SwFieldType
 {
     bool bHidden;
 public:
-    SwHiddenTxtFieldType(bool bSetHidden = true);
+    SwHiddenTextFieldType(bool bSetHidden = true);
 
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 
@@ -296,10 +296,10 @@ public:
     inline bool             GetHiddenFlag() const { return bHidden; }
 };
 
-class SwHiddenTxtField : public SwField
+class SwHiddenTextField : public SwField
 {
-    OUString aTRUETxt;         ///< Text if condition true.
-    OUString aFALSETxt;        ///< If condition false.
+    OUString aTRUEText;         ///< Text if condition true.
+    OUString aFALSEText;        ///< If condition false.
     OUString aContent;         ///< Evaluated DB-text.
 
     OUString aCond;            ///< Condition.
@@ -313,14 +313,14 @@ class SwHiddenTxtField : public SwField
     virtual SwField*    Copy() const SAL_OVERRIDE;
 
 public:
-    SwHiddenTxtField( SwHiddenTxtFieldType*,
+    SwHiddenTextField( SwHiddenTextFieldType*,
                      bool   bConditional,
                      const OUString& rCond,
-                     const OUString& rTxt,
+                     const OUString& rText,
                      bool   bHidden  = false,
                      sal_uInt16 nSubType = TYP_HIDDENTXTFLD);
 
-    SwHiddenTxtField( SwHiddenTxtFieldType*,
+    SwHiddenTextField( SwHiddenTextFieldType*,
                       const OUString& rCond,
                       const OUString& rTrue,
                       const OUString& rFalse,
@@ -400,7 +400,7 @@ class SW_DLLPUBLIC SwMacroField : public SwField
 public:
     /// Direct input, delete old value.
     SwMacroField( SwMacroFieldType*, const OUString& rLibAndName,
-                  const OUString& rTxt);
+                  const OUString& rText);
 
     inline OUString  GetMacro() const { return aMacro; }
     OUString         GetLibName() const;
@@ -443,7 +443,7 @@ public:
 
 class SW_DLLPUBLIC SwPostItField : public SwField
 {
-    OUString sTxt;
+    OUString sText;
     OUString sAuthor;
     OUString sInitials; ///< Initials of the author.
     OUString sName;     ///< Name of the comment.
@@ -454,7 +454,7 @@ class SW_DLLPUBLIC SwPostItField : public SwField
 public:
     SwPostItField( SwPostItFieldType*,
                    const OUString& rAuthor,
-                   const OUString& rTxt,
+                   const OUString& rText,
                    const OUString& rInitials,
                    const OUString& rName,
                    const DateTime& rDate);
@@ -474,7 +474,7 @@ public:
     /// Text
     virtual OUString   GetPar2() const SAL_OVERRIDE;
     virtual void            SetPar2(const OUString& rStr) SAL_OVERRIDE;
-    const OUString&         GetTxt() const { return sTxt; }
+    const OUString&         GetText() const { return sText; }
     const OUString&         GetInitials() const { return sInitials;}
     void                    SetName(const OUString& rStr);
     const OUString&         GetName() const { return sName;}
@@ -508,8 +508,8 @@ class SW_DLLPUBLIC SwDocInfoField : public SwValueField
     virtual SwField*        Copy() const SAL_OVERRIDE;
 
 public:
-    SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFmt=0);
-    SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFmt=0);
+    SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFormat=0);
+    SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFormat=0);
 
     virtual void            SetSubType(sal_uInt16) SAL_OVERRIDE;
     virtual sal_uInt16          GetSubType() const SAL_OVERRIDE;
@@ -541,7 +541,7 @@ class SwExtUserField : public SwField
     sal_uInt16  nType;
 
 public:
-    SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFmt=0);
+    SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFormat=0);
 
     virtual OUString    Expand() const SAL_OVERRIDE;
     virtual SwField*    Copy() const SAL_OVERRIDE;
@@ -598,30 +598,30 @@ class SwRefPageGetFieldType : public SwFieldType
     SwDoc*          pDoc;
     sal_Int16       nNumberingType;
 
-    void UpdateField( SwTxtFld* pTxtFld, _SetGetExpFlds& rSetList );
+    void UpdateField( SwTextField* pTextField, _SetGetExpFields& rSetList );
 protected:
     /// overwritten to update all RefPageGet fields
    virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE;
 public:
     SwRefPageGetFieldType( SwDoc* pDoc );
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
-    bool MakeSetList( _SetGetExpFlds& rTmpLst );
+    bool MakeSetList( _SetGetExpFields& rTmpLst );
     SwDoc*  GetDoc() const                  { return pDoc; }
 };
 
 // Query relative page numbering.
 class SwRefPageGetField : public SwField
 {
-    OUString sTxt;
+    OUString sText;
 public:
-    SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFmt );
+    SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFormat );
 
     virtual OUString    Expand() const SAL_OVERRIDE;
     virtual SwField*    Copy() const SAL_OVERRIDE;
 
-    void SetText( const OUString& rTxt )      { sTxt = rTxt; }
+    void SetText( const OUString& rText )      { sText = rText; }
 
-    void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld );
+    void ChangeExpansion( const SwFrm* pFrm, const SwTextField* pField );
     virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
@@ -636,12 +636,12 @@ public:
     SwJumpEditFieldType( SwDoc* pDoc );
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 
-    SwCharFmt* GetCharFmt();
+    SwCharFormat* GetCharFormat();
 };
 
 class SwJumpEditField : public SwField
 {
-    OUString sTxt, sHelp;
+    OUString sText, sHelp;
 public:
     SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat,
                      const OUString& sText, const OUString& sHelp );
@@ -657,8 +657,8 @@ public:
     virtual OUString  GetPar2() const SAL_OVERRIDE;
     virtual void    SetPar2(const OUString& rStr) SAL_OVERRIDE;
 
-    SwCharFmt* GetCharFmt() const
-        { return static_cast<SwJumpEditFieldType*>(GetTyp())->GetCharFmt(); }
+    SwCharFormat* GetCharFormat() const
+        { return static_cast<SwJumpEditFieldType*>(GetTyp())->GetCharFormat(); }
     virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c95e682dd85f..c80d81d32642 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -60,35 +60,35 @@ class SwDBManager;
 struct SwDocStat;
 class SwAutoCompleteWord;
 
-class SwFmtRefMark;
+class SwFormatRefMark;
 
 class SwNumRule;
 
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwGrfNode;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
 
-class SwFrmFmt;
-class SwCharFmt;
+class SwFrameFormat;
+class SwCharFormat;
 class SwExtTextInput;
 class Graphic;
 class GraphicObject;
-class SwFmtINetFmt;
+class SwFormatINetFormat;
 class SwTable;
 class SwTextBlocks;
-class SwFmtFtn;
+class SwFormatFootnote;
 class SwSection;
 class SwSectionData;
-class SwSectionFmt;
-class SwTableAutoFmt;
+class SwSectionFormat;
+class SwTableAutoFormat;
 class SwPageDesc;
-class SwTxtINetFmt;
-class SwSeqFldList;
+class SwTextINetFormat;
+class SwSeqFieldList;
 class SwGlblDocContent;
 class SwGlblDocContents;
 class SwRangeRedline;
 class SwRedlineData;
-class SwFtnInfo;
+class SwFootnoteInfo;
 class SwEndNoteInfo;
 class SwLineNumberInfo;
 class SwAuthEntry;
@@ -119,10 +119,10 @@ namespace sw {
 struct SwGetINetAttr
 {
     OUString sText;
-    const SwTxtINetFmt& rINetAttr;
+    const SwTextINetFormat& rINetAttr;
 
-    SwGetINetAttr( const OUString& rTxt, const SwTxtINetFmt& rAttr )
-        : sText( rTxt ), rINetAttr( rAttr )
+    SwGetINetAttr( const OUString& rText, const SwTextINetFormat& rAttr )
+        : sText( rText ), rINetAttr( rAttr )
     {}
 };
 typedef boost::ptr_vector<SwGetINetAttr> SwGetINetAttrs;
@@ -133,13 +133,13 @@ typedef boost::ptr_vector<SwGetINetAttr> SwGetINetAttrs;
 #define CNT_OLE 0x0010
 
 // Test USHORT for a defined form of content.
-#define CNT_HasTxt(USH) ((USH)&CNT_TXT)
+#define CNT_HasText(USH) ((USH)&CNT_TXT)
 #define CNT_HasGrf(USH) ((USH)&CNT_GRF)
 #define CNT_HasOLE(USH) ((USH)&CNT_OLE)
 
 class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
 {
-    static SvxSwAutoFmtFlags* s_pAutoFmtFlags;
+    static SvxSwAutoFormatFlags* s_pAutoFormatFlags;
 
     /// For the private methods DelRange and those of AutoCorrect.
     friend class SwAutoFormat;
@@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
     /// For the PamCorrAbs/-Rel methods.
     friend class SwUndo;
 
-    SAL_DLLPRIVATE SfxPoolItem& _GetChrFmt( SfxPoolItem& ) const;
+    SAL_DLLPRIVATE SfxPoolItem& _GetChrFormat( SfxPoolItem& ) const;
 
     /** Returns pointer to a SwGrfNode
      that will be used by GetGraphic() and GetGraphicSize(). */
@@ -156,9 +156,9 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
 
     SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, bool* pUndo = 0 );
 
-    SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet );
+    SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFormat& rSectFormat, const SfxItemSet& rSet );
 
-    using SwViewShell::UpdateFlds;
+    using SwViewShell::UpdateFields;
     using SwModify::GetInfo;
 
 public:
@@ -207,8 +207,8 @@ public:
     bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
 
     long SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true );
-    bool AppendTxtNode();
-    void AutoFmtBySplitNode();
+    bool AppendTextNode();
+    void AutoFormatBySplitNode();
 
     /** If cursor is in a INetAttribute it will be deleted completely
      including the descriptive text (needed at drag & drop). */
@@ -216,7 +216,7 @@ public:
 
     /** If Cursor is at the end of a character style in which the DontExpand-flag
      is not yet set, the latter will be set (==> return TRUE). */
-    bool DontExpandFmt();
+    bool DontExpandFormat();
 
     /** Apply / remove attributes.
      @return attributes in required AttributeSet.
@@ -272,7 +272,7 @@ public:
     void SetDefault( const SfxPoolItem& );
 
     /// Query default attribute of document.
-    const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
+    const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
 
     void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCrsr = NULL );
     void GCAttr();
@@ -284,17 +284,17 @@ public:
     sal_uInt16 GetCurLang() const;
 
     /// TABLE
-    size_t GetTblFrmFmtCount( bool bUsed = false ) const;
-    SwFrmFmt& GetTblFrmFmt(size_t nFmt, bool bUsed = false ) const;
-    OUString GetUniqueTblName() const;
+    size_t GetTableFrameFormatCount( bool bUsed = false ) const;
+    SwFrameFormat& GetTableFrameFormat(size_t nFormat, bool bUsed = false ) const;
+    OUString GetUniqueTableName() const;
 
     /// CHAR
-    sal_uInt16 GetCharFmtCount() const;
-    SwCharFmt& GetCharFmt(sal_uInt16 nFmt) const;
-    SwCharFmt* GetCurCharFmt() const;
-    void FillByEx(SwCharFmt*, bool bReset = false);
-    SwCharFmt* MakeCharFmt( const OUString& rName, SwCharFmt* pDerivedFrom = 0 );
-    SwCharFmt* FindCharFmtByName( const OUString& rName ) const;
+    sal_uInt16 GetCharFormatCount() const;
+    SwCharFormat& GetCharFormat(sal_uInt16 nFormat) const;
+    SwCharFormat* GetCurCharFormat() const;
+    void FillByEx(SwCharFormat*, bool bReset = false);
+    SwCharFormat* MakeCharFormat( const OUString& rName, SwCharFormat* pDerivedFrom = 0 );
+    SwCharFormat* FindCharFormatByName( const OUString& rName ) const;
 
     /* FormatCollections (new) - Explaining the general naming pattern:
      * GetXXXCount() returns the count of xxx in the document.
@@ -307,20 +307,20 @@ public:
      */
 
     // TXT
-    SwTxtFmtColl& GetDfltTxtFmtColl() const;
-    sal_uInt16 GetTxtFmtCollCount() const;
-    SwTxtFmtColl& GetTxtFmtColl( sal_uInt16 nTxtFmtColl) const;
+    SwTextFormatColl& GetDfltTextFormatColl() const;
+    sal_uInt16 GetTextFormatCollCount() const;
+    SwTextFormatColl& GetTextFormatColl( sal_uInt16 nTextFormatColl) const;
     /**
      * Get the named paragraph format of the current selection.
      *
-     * @see GetPaMTxtFmtColl()
+     * @see GetPaMTextFormatColl()
      *
      * @return the named paragraph format of the first node that contains one.
      * Nodes are sort by order of appearance in the selections ;
      * selections are sort by their order of creation
      * (last created selection first, oldest selection at last).
      */
-    SwTxtFmtColl* GetCurTxtFmtColl() const;
+    SwTextFormatColl* GetCurTextFormatColl() const;
     /**
      * Get the named paragraph format of the selection(s) described by a SwPaM.
      *
@@ -329,21 +329,21 @@ public:
      *
      * @return the named paragraph format of the first node that contains one.
      */
-    SwTxtFmtColl* GetPaMTxtFmtColl( SwPaM* pPaM ) const;
+    SwTextFormatColl* GetPaMTextFormatColl( SwPaM* pPaM ) const;
 
     // #i62675#
-    /// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTxtFmtColl(..)>
-    void SetTxtFmtColl(SwTxtFmtColl*, const bool bResetListAttrs = false);
-    SwTxtFmtColl *MakeTxtFmtColl(const OUString &rFmtCollName,
-        SwTxtFmtColl *pDerivedFrom = 0);
-    void FillByEx(SwTxtFmtColl*, bool bReset = false);
-    SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const;
+    /// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTextFormatColl(..)>
+    void SetTextFormatColl(SwTextFormatColl*, const bool bResetListAttrs = false);
+    SwTextFormatColl *MakeTextFormatColl(const OUString &rFormatCollName,
+        SwTextFormatColl *pDerivedFrom = 0);
+    void FillByEx(SwTextFormatColl*, bool bReset = false);
+    SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const;
 
     /// @return "Auto-Collection" with given Id. If it does not exist create it.
-    SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId );
+    SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId );
 
     /// @return required automatic format base class.
-    SwFmt* GetFmtFromPool( sal_uInt16 nId );
+    SwFormat* GetFormatFromPool( sal_uInt16 nId );
 
     /// @return required automatic page style.
     SwPageDesc* GetPageDescFromPool( sal_uInt16 nId );
@@ -352,21 +352,21 @@ public:
     bool IsUsed( const SwModify& ) const;
 
     /// @return required automatic format.
-    SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId )
-        { return static_cast<SwFrmFmt*>(SwEditShell::GetFmtFromPool( nId )); }
-    SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId )
-        { return static_cast<SwCharFmt*>(SwEditShell::GetFmtFromPool( nId )); }
+    SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId )
+        { return static_cast<SwFrameFormat*>(SwEditShell::GetFormatFromPool( nId )); }
+    SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId )
+        { return static_cast<SwCharFormat*>(SwEditShell::GetFormatFromPool( nId )); }
 
     void Insert2(SwField&, const bool bForceExpandHints = false);
 
-    void UpdateFlds( SwField & );   ///< One single field.
+    void UpdateFields( SwField & );   ///< One single field.
 
-    sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
-    SwFieldType* GetFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
-    SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName) const;
+    sal_uInt16 GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
+    SwFieldType* GetFieldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
+    SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName) const;
 
-    void RemoveFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX);
-    void RemoveFldType(sal_uInt16 nResId, const OUString& rName);
+    void RemoveFieldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX);
+    void RemoveFieldType(sal_uInt16 nResId, const OUString& rName);
 
     void FieldToText( SwFieldType* pType );
 
@@ -385,17 +385,17 @@ public:
 
     /// Check whether DB fields point to an available data source and returns it.
     bool IsFieldDataSourceAvailable(OUString& rUsedDataSource) const;
-    void UpdateExpFlds(bool bCloseDB = false);///< only every expression fields update
-    void LockExpFlds();
-    void UnlockExpFlds();
+    void UpdateExpFields(bool bCloseDB = false);///< only every expression fields update
+    void LockExpFields();
+    void UnlockExpFields();
 
-    SwFldUpdateFlags GetFldUpdateFlags(bool bDocSettings = false) const;
-    void SetFldUpdateFlags( SwFldUpdateFlags eFlags );
+    SwFieldUpdateFlags GetFieldUpdateFlags(bool bDocSettings = false) const;
+    void SetFieldUpdateFlags( SwFieldUpdateFlags eFlags );
 
     /// For evaluation of DB fields (new DB-manager).
     SwDBManager* GetDBManager() const;
 
-    SwFieldType* InsertFldType(const SwFieldType &);
+    SwFieldType* InsertFieldType(const SwFieldType &);
 
     /// Changes in document?
     bool IsModified() const;
@@ -519,7 +519,7 @@ public:
     bool SelectionHasBullet() const;
 
     OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const;
-    void ChgNumRuleFmts( const SwNumRule& rRule );
+    void ChgNumRuleFormats( const SwNumRule& rRule );
 
     /// Set (and query if) a numbering with StartFlag starts at current PointPos.
     void SetNumRuleStart( bool bFlag = true, SwPaM* pCrsr = NULL );
@@ -614,7 +614,7 @@ public:
      else give a rap on the knuckles!
      If a string-ptr != 0 return the respective name. */
     void GetGrfNms( OUString* pGrfName, OUString* pFltName,
-                    const SwFlyFrmFmt* = 0 ) const;
+                    const SwFlyFrameFormat* = 0 ) const;
 
     /// Re-read if graphic is not ok. Current graphic is replaced by the new one.
     void ReRead( const OUString& rGrfName, const OUString& rFltName,
@@ -627,14 +627,14 @@ public:
     // #i73788#
     /// Remove default parameter, because method always called this default value.
     Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys!
-    const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const;
+    const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const;
 
     /** @return a ClientObject, if CurCrsr->Point() points to a SwOLENode
      (and mark is neither set not pointint to same ClientObject)
      else give rap on the knuckles. */
     svt::EmbeddedObjectRef&  GetOLEObject() const;
 
-    /// Is there an OLEObject with this name (SwFmt)?
+    /// Is there an OLEObject with this name (SwFormat)?
     bool HasOLEObj( const OUString &rName ) const;
 
     /// @return pointer to the data of the chart in which Cursr is.
@@ -653,13 +653,13 @@ public:
      including styles. */
     sal_uInt16 MakeGlossary( SwTextBlocks& rToFill, const OUString& rName,
                          const OUString& rShortName, bool bSaveRelFile = false,
-                         const OUString* pOnlyTxt=0 );
+                         const OUString* pOnlyText=0 );
 
     /// Save complete content of doc as glossary.
     sal_uInt16 SaveGlossaryDoc( SwTextBlocks& rGlossary, const OUString& rName,
                             const OUString& rShortName,
                             bool bSaveRelFile = false,
-                            bool bOnlyTxt = false );
+                            bool bOnlyText = false );
 
     // Linguistics...
     /// Save selections.
@@ -675,35 +675,35 @@ public:
     /// For Inserting SoftHyphen. Position is offset within the syllabificated word.
     static void InsertSoftHyph( const sal_Int32 nHyphPos );
 
-    const SwTable& InsertTable( const SwInsertTableOptions& rInsTblOpts,  ///< ALL_TBL_INS_ATTR
+    const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts,  ///< ALL_TBL_INS_ATTR
                                 sal_uInt16 nRows, sal_uInt16 nCols,
                                 sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL,
-                                const SwTableAutoFmt* pTAFmt = 0 );
+                                const SwTableAutoFormat* pTAFormat = 0 );
 
-    void InsertDDETable( const SwInsertTableOptions& rInsTblOpts,  ///< HEADLINE_NO_BORDER
+    void InsertDDETable( const SwInsertTableOptions& rInsTableOpts,  ///< HEADLINE_NO_BORDER
                          SwDDEFieldType* pDDEType,
                          sal_uInt16 nRows, sal_uInt16 nCols,
                          sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL );
 
     void UpdateTable();
-    void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName );
+    void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName );
 
-    SwFrmFmt *GetTableFmt();
-    bool TextToTable( const SwInsertTableOptions& rInsTblOpts,  ///< ALL_TBL_INS_ATTR
+    SwFrameFormat *GetTableFormat();
+    bool TextToTable( const SwInsertTableOptions& rInsTableOpts,  ///< ALL_TBL_INS_ATTR
                       sal_Unicode cCh,
                       sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL,
-                      const SwTableAutoFmt* pTAFmt = 0 );
+                      const SwTableAutoFormat* pTAFormat = 0 );
     bool TableToText( sal_Unicode cCh );
     bool IsTextToTableAvailable() const;
 
-    bool GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const;
-    void SetTblBoxFormulaAttrs( const SfxItemSet& rSet );
+    bool GetTableBoxFormulaAttrs( SfxItemSet& rSet ) const;
+    void SetTableBoxFormulaAttrs( const SfxItemSet& rSet );
 
     bool IsTableBoxTextFormat() const;
     OUString GetTableBoxText() const;
 
-    TblChgMode GetTblChgMode() const;
-    void SetTblChgMode( TblChgMode eMode );
+    TableChgMode GetTableChgMode() const;
+    void SetTableChgMode( TableChgMode eMode );
 
     /// Split table at cursor position.
     bool SplitTable( sal_uInt16 eMode );
@@ -766,7 +766,7 @@ public:
     void SetLinguRange( SwDocPositions eStart, SwDocPositions eEnd );
 
     /// @return reference set in document according to given name.
-    const SwFmtRefMark* GetRefMark( const OUString& rName ) const;
+    const SwFormatRefMark* GetRefMark( const OUString& rName ) const;
 
     /**  @return names of all references set in document.
       If ArrayPointer == 0 then return only whether a RefMark is set in document. */
@@ -778,20 +778,20 @@ public:
     bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord );
 
     /// Set our styles according to the respective rules.
-    void AutoFormat( const SvxSwAutoFmtFlags* pAFlags = 0 );
+    void AutoFormat( const SvxSwAutoFormatFlags* pAFlags = 0 );
 
-    static SvxSwAutoFmtFlags* GetAutoFmtFlags();
-    static void SetAutoFmtFlags(SvxSwAutoFmtFlags *);
+    static SvxSwAutoFormatFlags* GetAutoFormatFlags();
+    static void SetAutoFormatFlags(SvxSwAutoFormatFlags *);
 
     /// Calculates selection.
     OUString Calculate();
 
-    bool InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr,
+    bool InsertURL( const SwFormatINetFormat& rFormat, const OUString& rStr,
                     bool bKeepSelection = false );
     void GetINetAttrs( SwGetINetAttrs& rArr );
 
-    OUString GetDropTxt( const sal_Int32 nChars ) const;
-    void   ReplaceDropTxt( const OUString &rStr, SwPaM* pPaM = NULL );
+    OUString GetDropText( const sal_Int32 nChars ) const;
+    void   ReplaceDropText( const OUString &rStr, SwPaM* pPaM = NULL );
 
     /** May an outline be moved or copied?
      Check whether it's in text body, not in table, and not read-only (move). */
@@ -801,11 +801,11 @@ public:
     sal_uInt16 GetLineCount( bool bActPos = true );
 
     /// Query and set footnote-text/number. Set.. to current SSelection!
-    bool GetCurFtn( SwFmtFtn* pToFillFtn = 0 );
-    bool SetCurFtn( const SwFmtFtn& rFillFtn );
-    bool HasFtns( bool bEndNotes = false ) const;
+    bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = 0 );
+    bool SetCurFootnote( const SwFormatFootnote& rFillFootnote );
+    bool HasFootnotes( bool bEndNotes = false ) const;
 
-    size_t GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false );
+    size_t GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes = false );
     /// @return list of all footnotes and their first portions of text.
 
     SwSection const* InsertSection(
@@ -820,10 +820,10 @@ public:
      and not an inner one. */
     SwSection* GetAnySection( bool bOutOfTab = false, const Point* pPt = 0 );
 
-    size_t GetSectionFmtCount() const;
-    size_t GetSectionFmtPos(const SwSectionFmt&) const;
-    const SwSectionFmt& GetSectionFmt(size_t nFmt) const;
-    void DelSectionFmt( size_t nFmt);
+    size_t GetSectionFormatCount() const;
+    size_t GetSectionFormatPos(const SwSectionFormat&) const;
+    const SwSectionFormat& GetSectionFormat(size_t nFormat) const;
+    void DelSectionFormat( size_t nFormat);
     void UpdateSection( size_t const nSect, SwSectionData &,
             SfxItemSet const*const  = 0);
     bool IsAnySectionInDoc( bool bChkReadOnly = false,
@@ -833,7 +833,7 @@ public:
     OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const;
 
     /// Set attributes.
-    void SetSectionAttr(const SfxItemSet& rSet, SwSectionFmt* pSectFmt = 0);
+    void SetSectionAttr(const SfxItemSet& rSet, SwSectionFormat* pSectFormat = 0);
 
     /** Search inside the cursor selection for full selected sections.
      if any part of section in the selection @return 0.
@@ -911,8 +911,8 @@ public:
     long MergeDoc( const SwDoc& rDoc );
 
     /// Footnote attributes global to document.
-    const SwFtnInfo& GetFtnInfo() const;
-    void  SetFtnInfo(const SwFtnInfo& rInfo);
+    const SwFootnoteInfo& GetFootnoteInfo() const;
+    void  SetFootnoteInfo(const SwFootnoteInfo& rInfo);
     const SwEndNoteInfo& GetEndNoteInfo() const;
     void  SetEndNoteInfo(const SwEndNoteInfo& rInfo);
 
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index e58953cc7380..149ba2b94dba 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -26,47 +26,47 @@
 #include <vector>
 
 class SfxPoolItem;
-class SwTxtNode;
+class SwTextNode;
 class SwFrm;
 struct SwPosition;
-class SwTxtFld;
+class SwTextField;
 class SwDoc;
-class SwFmtFld;
-class _SetGetExpFlds;
+class SwFormatField;
+class _SetGetExpFields;
 class SwEditShell;
 
-/// Forward declaration: get "BodyTxtNode" for exp.fld in Fly's headers/footers/footnotes.
-const SwTxtNode* GetBodyTxtNode( const SwDoc& pDoc, SwPosition& rPos,
+/// Forward declaration: get "BodyTextNode" for exp.fld in Fly's headers/footers/footnotes.
+const SwTextNode* GetBodyTextNode( const SwDoc& pDoc, SwPosition& rPos,
                                  const SwFrm& rFrm );
 
 OUString ReplacePoint(const OUString& sTmpName, bool bWithCommandType = false);
 
-struct _SeqFldLstElem
+struct _SeqFieldLstElem
 {
     OUString sDlgEntry;
     sal_uInt16 nSeqNo;
 
-    _SeqFldLstElem( const OUString& rStr, sal_uInt16 nNo )
+    _SeqFieldLstElem( const OUString& rStr, sal_uInt16 nNo )
         : sDlgEntry( rStr ), nSeqNo( nNo )
     {}
 };
 
-class SW_DLLPUBLIC SwSeqFldList
+class SW_DLLPUBLIC SwSeqFieldList
 {
-    std::vector<_SeqFldLstElem*> maData;
+    std::vector<_SeqFieldLstElem*> maData;
 public:
-    ~SwSeqFldList()
+    ~SwSeqFieldList()
     {
-        for( std::vector<_SeqFldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it )
+        for( std::vector<_SeqFieldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it )
             delete *it;
     }
 
-    bool InsertSort(_SeqFldLstElem* pNew);
-    bool SeekEntry(const _SeqFldLstElem& rNew, size_t* pPos) const;
+    bool InsertSort(_SeqFieldLstElem* pNew);
+    bool SeekEntry(const _SeqFieldLstElem& rNew, size_t* pPos) const;
 
     size_t Count() { return maData.size(); }
-    _SeqFldLstElem* operator[](size_t nIndex) { return maData[nIndex]; }
-    const _SeqFldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; }
+    _SeqFieldLstElem* operator[](size_t nIndex) { return maData[nIndex]; }
+    const _SeqFieldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; }
     void Clear() { maData.clear(); }
 };
 
@@ -85,7 +85,7 @@ protected:
 class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
 {
     OUString        sExpand;
-    bool            bIsInBodyTxt;
+    bool            bIsInBodyText;
     sal_uInt16          nSubType;
 
     bool            bLateInitialization; // #i82544#
@@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
 
 public:
     SwGetExpField( SwGetExpFieldType*, const OUString& rFormel,
-                   sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFmt = 0);
+                   sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFormat = 0);
 
     virtual void                SetValue( const double& rVal ) SAL_OVERRIDE;
     virtual void                SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE;
@@ -104,14 +104,14 @@ public:
     inline void                 ChgExpStr(const OUString& rExpand);
 
     /// Called by formatting.
-    inline bool                 IsInBodyTxt() const;
+    inline bool                 IsInBodyText() const;
 
-    /// Set by UpdateExpFlds where node position is known.
-    inline void                 ChgBodyTxtFlag( bool bIsInBody );
+    /// Set by UpdateExpFields where node position is known.
+    inline void                 ChgBodyTextFlag( bool bIsInBody );
 
     /** For fields in header/footer/footnotes/flys:
      Only called by formatting!! */
-    void                        ChangeExpansion( const SwFrm&, const SwTxtFld& );
+    void                        ChangeExpansion( const SwFrm&, const SwTextField& );
 
     virtual OUString    GetFieldName() const SAL_OVERRIDE;
 
@@ -124,7 +124,7 @@ public:
     virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 
-    static sal_Int32    GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc, sal_Int32 nHint = 0);
+    static sal_Int32    GetReferenceTextPos( const SwFormatField& rFormat, SwDoc& rDoc, sal_Int32 nHint = 0);
     // #i82544#
     void                SetLateInitialization() { bLateInitialization = true;}
 };
@@ -136,12 +136,12 @@ inline OUString SwGetExpField::GetExpStr() const
     { return sExpand;   }
 
  /// Called by formatting.
-inline bool SwGetExpField::IsInBodyTxt() const
-    { return bIsInBodyTxt; }
+inline bool SwGetExpField::IsInBodyText() const
+    { return bIsInBodyText; }
 
- /// Set by UpdateExpFlds where node position is known.
-inline void SwGetExpField::ChgBodyTxtFlag( bool bIsInBody )
-    { bIsInBodyTxt = bIsInBody; }
+ /// Set by UpdateExpFields where node position is known.
+inline void SwGetExpField::ChgBodyTextFlag( bool bIsInBody )
+    { bIsInBodyText = bIsInBody; }
 
 class SwSetExpField;
 
@@ -175,9 +175,9 @@ public:
     /// Overlay, because set-field takes care for its being updated by itself.
     inline OUString         GetSetRefName() const;
 
-    sal_uInt16 SetSeqRefNo( SwSetExpField& rFld );
+    sal_uInt16 SetSeqRefNo( SwSetExpField& rField );
 
-    size_t GetSeqFldList( SwSeqFldList& rList );
+    size_t GetSeqFieldList( SwSeqFieldList& rList );
     OUString MakeSeqName( sal_uInt16 nSeqNo );
 
     /// Number sequence fields chapterwise if required.
@@ -185,9 +185,9 @@ public:
     void SetDelimiter( const OUString& s )    { sDelim = s; }
     sal_uInt8 GetOutlineLvl() const                 { return nLevel; }
     void SetOutlineLvl( sal_uInt8 n )           { nLevel = n; }
-    void SetChapter( SwSetExpField& rFld, const SwNode& rNd );
+    void SetChapter( SwSetExpField& rField, const SwNode& rNd );
 
-    /** Member only for SwDoc::UpdateExpFld.
+    /** Member only for SwDoc::UpdateExpField.
      It is needed only at runtime of sequence field types! */
     const SwNode* GetOutlineChgNd() const   { return pOutlChgNd; }
     void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; }
@@ -215,16 +215,16 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
     bool            bInput;
     sal_uInt16          nSeqNo;
     sal_uInt16          nSubType;
-    SwFmtFld * mpFmtFld; /// pool item to which the SwSetExpField belongs
+    SwFormatField * mpFormatField; /// pool item to which the SwSetExpField belongs
 
     virtual OUString            Expand() const SAL_OVERRIDE;
     virtual SwField*            Copy() const SAL_OVERRIDE;
 
 public:
-    SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFmt = 0);
+    SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFormat = 0);
 
-    void SetFmtFld(SwFmtFld & rFmtFld);
-    SwFmtFld* GetFmtFld() { return mpFmtFld;}
+    void SetFormatField(SwFormatField & rFormatField);
+    SwFormatField* GetFormatField() { return mpFormatField;}
 
     virtual void                SetValue( const double& rVal ) SAL_OVERRIDE;
 
@@ -243,7 +243,7 @@ public:
     virtual sal_uInt16              GetSubType() const SAL_OVERRIDE;
     virtual void                SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
 
-    inline bool                 IsSequenceFld() const;
+    inline bool                 IsSequenceField() const;
 
     /// Logical number, sequence fields.
     inline void                 SetSeqNumber( sal_uInt16 n )    { nSeqNo = n; }
@@ -277,7 +277,7 @@ inline void SwSetExpField::SetInputFlag(bool bInp)
 inline bool SwSetExpField::GetInputFlag() const
     { return bInput; }
 
-inline bool SwSetExpField::IsSequenceFld() const
+inline bool SwSetExpField::IsSequenceField() const
     { return 0 != (nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(GetTyp())->GetType()); }
 
 class SwInputFieldType : public SwFieldType
@@ -300,7 +300,7 @@ class SW_DLLPUBLIC SwInputField : public SwField
     sal_uInt16 nSubType;
     bool mbIsFormField;
 
-    SwFmtFld* mpFmtFld; // attribute to which the <SwInputField> belongs to
+    SwFormatField* mpFormatField; // attribute to which the <SwInputField> belongs to
 
     virtual OUString        Expand() const SAL_OVERRIDE;
     virtual SwField*        Copy() const SAL_OVERRIDE;
@@ -318,12 +318,12 @@ public:
         const OUString& rContent,
         const OUString& rPrompt,
         sal_uInt16 nSubType = 0,
-        sal_uLong nFmt = 0,
+        sal_uLong nFormat = 0,
         bool bIsFormField = true );
     virtual ~SwInputField();
 
-    void SetFmtFld( SwFmtFld& rFmtFld );
-    SwFmtFld* GetFmtFld() { return mpFmtFld;}
+    void SetFormatField( SwFormatField& rFormatField );
+    SwFormatField* GetFormatField() { return mpFormatField;}
 
     // Providing new Input Field's content:
     // Fill Input Field's content depending on <nSupType>.
@@ -374,19 +374,19 @@ public:
 
 private:
     SwEditShell*              pSh;
-    _SetGetExpFlds*           pSrtLst;
-    std::set<const SwTxtFld*> aTmpLst;
+    _SetGetExpFields*           pSrtLst;
+    std::set<const SwTextField*> aTmpLst;
 };
 
  /// Implementation in tblcalc.cxx.
-class SwTblFieldType : public SwValueFieldType
+class SwTableFieldType : public SwValueFieldType
 {
 public:
-    SwTblFieldType(SwDoc* pDocPtr);
+    SwTableFieldType(SwDoc* pDocPtr);
     virtual SwFieldType* Copy() const SAL_OVERRIDE;
 };
 
-class SwTblField : public SwValueField, public SwTableFormula
+class SwTableField : public SwValueField, public SwTableFormula
 {
     OUString      sExpand;
     sal_uInt16      nSubType;
@@ -400,8 +400,8 @@ class SwTblField : public SwValueField, public SwTableFormula
     OUString GetCommand();
 
 public:
-    SwTblField( SwTblFieldType*, const OUString& rFormel,
-                sal_uInt16 nSubType = 0, sal_uLong nFmt = 0);
+    SwTableField( SwTableFieldType*, const OUString& rFormel,
+                sal_uInt16 nSubType = 0, sal_uLong nFormat = 0);
 
     virtual void        SetValue( const double& rVal ) SAL_OVERRIDE;
     virtual sal_uInt16      GetSubType() const SAL_OVERRIDE;
@@ -410,7 +410,7 @@ public:
     OUString            GetExpStr() const               { return sExpand; }
     void                ChgExpStr(const OUString& rStr) { sExpand = rStr; }
 
-    void                CalcField( SwTblCalcPara& rCalcPara );
+    void                CalcField( SwTableCalcPara& rCalcPara );
 
     virtual OUString    GetFieldName() const SAL_OVERRIDE;
 
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index d70f43a18a82..0e044b0b9dbb 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -24,29 +24,29 @@
 #include <format.hxx>
 #include <charfmt.hxx>
 
-class SwTxtCharFmt;
+class SwTextCharFormat;
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtCharFmt: public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatCharFormat: public SfxPoolItem, public SwClient
 {
-    friend class SwTxtCharFmt;
-    SwTxtCharFmt* pTxtAttr;     ///< My text attribute.
+    friend class SwTextCharFormat;
+    SwTextCharFormat* pTextAttr;     ///< My text attribute.
 
 public:
-    SwFmtCharFmt() : pTxtAttr(0) {}
+    SwFormatCharFormat() : pTextAttr(0) {}
 
     /// single argument ctors shall be explicit.
-    explicit SwFmtCharFmt( SwCharFmt *pFmt );
-    virtual ~SwFmtCharFmt();
+    explicit SwFormatCharFormat( SwCharFormat *pFormat );
+    virtual ~SwFormatCharFormat();
 
     /// @@@ public copy ctor, but no copy assignment?
-    SwFmtCharFmt( const SwFmtCharFmt& rAttr );
+    SwFormatCharFormat( const SwFormatCharFormat& rAttr );
 protected:
    virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
 
 private:
     /// @@@ public copy ctor, but no copy assignment?
-    SwFmtCharFmt & operator= (const SwFmtCharFmt &) SAL_DELETED_FUNCTION;
+    SwFormatCharFormat & operator= (const SwFormatCharFormat &) SAL_DELETED_FUNCTION;
 public:
 
     TYPEINFO_OVERRIDE();
@@ -65,8 +65,8 @@ public:
 
     virtual bool    GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
 
-    void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); }
-    SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); }
+    void SetCharFormat( SwFormat* pFormat ) { pFormat->Add(this); }
+    SwCharFormat* GetCharFormat() const { return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); }
 };
 #endif
 
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 6925032b79ae..b3bbfcda8aa9 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -43,15 +43,15 @@ class SwFlyFrm;
 class SwTabCols;
 class SvxBrushItem;
 class SvxFrameDirectionItem;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
 class SwFrm;
-class SwFmtFrmSize;
-class SwFmtRowSplit;
+class SwFormatFrmSize;
+class SwFormatRowSplit;
 class SdrObject;
 class Color;
 class Outliner;
 class SotDataObject;
-class SwFrmFmt;
+class SwFrameFormat;
 struct SwSortOptions;
 class SdrMarkList;
 
@@ -139,9 +139,9 @@ enum CurRectType
 
 struct SwGetCurColNumPara
 {
-    const SwFrmFmt* pFrmFmt;
+    const SwFrameFormat* pFrameFormat;
     const SwRect* pPrtRect, *pFrmRect;
-    SwGetCurColNumPara() : pFrmFmt( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {}
+    SwGetCurColNumPara() : pFrameFormat( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {}
 };
 
 #define SW_PASTESDR_INSERT      1
@@ -235,7 +235,7 @@ public:
     virtual ~SwFEShell();
 
     /// Copy and Paste methods for internal clipboard.
-    bool Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt = 0 );
+    bool Copy( SwDoc* pClpDoc, const OUString* pNewClpText = 0 );
     bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false);
 
     /// Paste some pages into another doc - used in mailmerge.
@@ -248,7 +248,7 @@ public:
     void SelectFlyFrm( SwFlyFrm& rFrm, bool bNew = false );
 
     /// Is selected frame within another frame?
-    const SwFrmFmt* IsFlyInFly();
+    const SwFrameFormat* IsFlyInFly();
 
     /** If an object as been given, exactly this object is selected
      (instead of searching over position). */
@@ -311,12 +311,12 @@ public:
                         const RndStdIds _nAnchorId,
                         const sal_Int16 _eHoriRelOrient = com::sun::star::text::RelOrientation::FRAME,
                         const sal_Int16 _eVertRelOrient = com::sun::star::text::RelOrientation::FRAME,
-                        const SwPosition* _pToCharCntntPos = NULL,
+                        const SwPosition* _pToCharContentPos = NULL,
                         const bool _bFollowTextFlow = false,
                         bool _bMirror = false,
                         Point* _opRef = NULL,
                         Size* _opPercent = NULL,
-                        const SwFmtFrmSize* pFmtFrmSize = 0 ) const;
+                        const SwFormatFrmSize* pFormatFrmSize = 0 ) const;
 
     /// Set size of draw objects.
     void SetObjRect( const SwRect& rRect );
@@ -332,18 +332,18 @@ public:
     Size  GetObjSize()       const;
 
     /// SS for envelopes: get all page-bound objects and set them to new page.
-    void GetPageObjs( std::vector<SwFrmFmt*>& rFillArr );
-    void SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffset = 1 );
+    void GetPageObjs( std::vector<SwFrameFormat*>& rFillArr );
+    void SetPageObjsNewPage( std::vector<SwFrameFormat*>& rFillArr, int nOffset = 1 );
 
     /// Show current selection (frame / draw object as required).
     virtual void MakeSelVisible() SAL_OVERRIDE;
 
-    /** @return FrmFmt of object that may be under Point.
+    /** @return FrameFormat of object that may be under Point.
      Object does not become selected! */
-    const SwFrmFmt* GetFmtFromObj( const Point& rPt, SwRect** pRectToFill = 0 ) const;
+    const SwFrameFormat* GetFormatFromObj( const Point& rPt, SwRect** pRectToFill = 0 ) const;
 
     /// @return a format too, if the point is over the text of any fly.
-    const SwFrmFmt* GetFmtFromAnyObj( const Point& rPt ) const;
+    const SwFrameFormat* GetFormatFromAnyObj( const Point& rPt ) const;
 
     /** Which Protection is set at selected object?
      returns several flags in sal_uInt8 */
@@ -363,8 +363,8 @@ public:
     bool GetFlyFrmAttr( SfxItemSet &rSet ) const;
     bool SetFlyFrmAttr( SfxItemSet &rSet );
     bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 );
-    const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false,
-                         SwFrmFmt *pParent = 0 );
+    const SwFrameFormat *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false,
+                         SwFrameFormat *pParent = 0 );
     void SetFlyPos( const Point &rAbsPos);
     Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false );
 
@@ -373,12 +373,12 @@ public:
      - add output parameter <bVertL2R> */
     bool IsFrmVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const;
 
-    SwFrmFmt* GetCurFrmFmt() const; ///< If frame then frame style, else 0.
-    void SetFrmFmt( SwFrmFmt *pFmt, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style.
+    SwFrameFormat* GetCurFrameFormat() const; ///< If frame then frame style, else 0.
+    void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style.
     const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); }
 
     /// Find/delete fly containing the cursor.
-    SwFrmFmt* WizzardGetFly();
+    SwFrameFormat* WizzardGetFly();
 
     /// Independent selecting of flys.
     bool GotoNextFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY )
@@ -388,14 +388,14 @@ public:
 
    /// Iterate over flys  - for Basic-collections.
     size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const;
-    const SwFrmFmt* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const;
+    const SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const;
 
-    /// If a fly is selected, it draws cursor into the first CntntFrm.
-    const SwFrmFmt* SelFlyGrabCrsr();
+    /// If a fly is selected, it draws cursor into the first ContentFrm.
+    const SwFrameFormat* SelFlyGrabCrsr();
 
     /// Get FlyFrameFormat; fuer UI Macro Anbindung an Flys
-    const SwFrmFmt* GetFlyFrmFmt() const;
-          SwFrmFmt* GetFlyFrmFmt();
+    const SwFrameFormat* GetFlyFrameFormat() const;
+          SwFrameFormat* GetFlyFrameFormat();
 
     /** OLE. Server requires new size. Desired values are adjusted as frame attributes.
      If the values are not allowed, the formatting clips and determines scaling.
@@ -413,7 +413,7 @@ public:
     virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
                                   const SwRect *pFlyPrtRect = 0,
                                   const SwRect *pFlyFrmRect = 0,
-                                  const bool bNoTxtFrmPrtAreaChanged = false ) = 0;
+                                  const bool bNoTextFrmPrtAreaChanged = false ) = 0;
 
     /** Connect objects with ActivateWhenVisible at Paint.
      Called by notxtfrm::Paint, implemented in wrtsh. */
@@ -445,16 +445,16 @@ public:
                   bool bSelFrame = true );
 
     /// Position is a graphic with URL?
-    const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0,
+    const SwFrameFormat* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0,
                                     OUString *pTargetFrameName = 0,
                                     OUString *pURLDescription = 0 ) const;
 
     /** For Chain always connect Fly specified by format with that hit by point.
      rRect contains rect of Fly (for its highlight). */
-    SwChainRet Chainable( SwRect &rRect, const SwFrmFmt &rSource, const Point &rPt ) const;
-    SwChainRet Chain( SwFrmFmt &rSource, const Point &rPt );
-    SwChainRet Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest );
-    void Unchain( SwFrmFmt &rFmt );
+    SwChainRet Chainable( SwRect &rRect, const SwFrameFormat &rSource, const Point &rPt ) const;
+    SwChainRet Chain( SwFrameFormat &rSource, const Point &rPt );
+    SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest );
+    void Unchain( SwFrameFormat &rFormat );
     void HideChainMarker();
     void SetChainMarker();
 
@@ -530,7 +530,7 @@ public:
 
     /** Get selected DrawObj as graphics (MetaFile/Bitmap).
      Return value indicates if it was converted. */
-    bool GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) const;
+    bool GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) const;
 
     void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 );
     bool Paste( const Graphic &rGrf, const OUString& rURL );
@@ -544,7 +544,7 @@ public:
                 const Graphic* pGraphic = 0,
                 const SfxItemSet* pFlyAttrSet = 0,
                 const SfxItemSet* pGrfAttrSet = 0,
-                SwFrmFmt* = 0 );
+                SwFrameFormat* = 0 );
 
     /// Insertion of a drawing object which have to be already inserted in the DrawModel.
     void InsertDrawObj( SdrObject& rDrawObj,
@@ -562,7 +562,7 @@ public:
     void AlignAllFormulasToBaseline();
 
     /// Provide information about content situated closes to given Point.
-    Point GetCntntPos( const Point& rPoint, bool bNext ) const;
+    Point GetContentPos( const Point& rPoint, bool bNext ) const;
 
     /// Convert document position into position relative to the current page.
     Point GetRelativePagePosition(const Point& rDocPos);
@@ -595,14 +595,14 @@ public:
     sal_uInt16 GetPageNumber( const Point &rPoint ) const;
     bool GetPageNumber( long nYPos, bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const;
 
-    SwFlyFrmFmt* InsertObject( const svt::EmbeddedObjectRef&,
+    SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&,
                 const SfxItemSet* pFlyAttrSet = 0,
                 const SfxItemSet* pGrfAttrSet = 0,
-                SwFrmFmt* = 0 );
+                SwFrameFormat* = 0 );
     bool    FinishOLEObj(); ///< Shutdown server.
 
-    void GetTblAttr( SfxItemSet & ) const;
-    void SetTblAttr( const SfxItemSet & );
+    void GetTableAttr( SfxItemSet & ) const;
+    void SetTableAttr( const SfxItemSet & );
 
     bool HasWholeTabSelection() const;
 
@@ -615,7 +615,7 @@ public:
     bool DeleteTable();
     bool DeleteRow(bool bCompleteTable = false);
 
-    bool DeleteTblSel();        ///< Current selection, may be whole table.
+    bool DeleteTableSel();        ///< Current selection, may be whole table.
 
     sal_uInt16 MergeTab();          /**< Merge selected parts of table.
                                       @return error via enum. */
@@ -624,13 +624,13 @@ public:
     bool SplitTab( bool nVert = true, sal_uInt16 nCnt = 1, bool bSameHeight = false );
     bool Sort(const SwSortOptions&);    //Sortieren.
 
-    void SetRowHeight( const SwFmtFrmSize &rSz );
+    void SetRowHeight( const SwFormatFrmSize &rSz );
 
     /// Pointer must be detroyed by caller != 0.
-    void GetRowHeight( SwFmtFrmSize *&rpSz ) const;
+    void GetRowHeight( SwFormatFrmSize *&rpSz ) const;
 
-    void SetRowSplit( const SwFmtRowSplit &rSz );
-    void GetRowSplit( SwFmtRowSplit *&rpSz ) const;
+    void SetRowSplit( const SwFormatRowSplit &rSz );
+    void GetRowSplit( SwFormatRowSplit *&rpSz ) const;
 
     void   SetBoxAlign( sal_uInt16 nOrient );
     sal_uInt16 GetBoxAlign() const;         ///< USHRT_MAX if ambiguous.
@@ -662,7 +662,7 @@ public:
                           const Point &rPt );
 
     /// pEnd will be used during MouseMove
-    bool SelTblRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
+    bool SelTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
 
     void GetTabRows( SwTabCols &rToFill ) const;
     void SetTabRows( const SwTabCols &rNew, bool bCurColOnly );
@@ -672,9 +672,9 @@ public:
     void ProtectCells();    /**< If a table selection exists it is destroyed in case
                              cursor is not allowed in readonly. */
     void UnProtectCells();  ///< Refers to table selection.
-    void UnProtectTbls();   ///< Unprotect all tables in selection.
-    bool HasTblAnyProtection( const OUString* pTblName = 0,
-                              bool* pFullTblProtection = 0 );
+    void UnProtectTables();   ///< Unprotect all tables in selection.
+    bool HasTableAnyProtection( const OUString* pTableName = 0,
+                              bool* pFullTableProtection = 0 );
     bool CanUnProtectCells() const;
 
     sal_uInt16 GetRowsToRepeat() const;
@@ -700,13 +700,13 @@ public:
     bool BalanceCellWidth( bool bTstOnly );
 
     /// AutoFormat for table/ table selection.
-    bool SetTableAutoFmt( const SwTableAutoFmt& rNew );
+    bool SetTableAutoFormat( const SwTableAutoFormat& rNew );
 
-    bool GetTableAutoFmt( SwTableAutoFmt& rGet );
+    bool GetTableAutoFormat( SwTableAutoFormat& rGet );
 
     bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff = 283 );
 
-    bool GetAutoSum( OUString& rFml ) const;
+    bool GetAutoSum( OUString& rFormula ) const;
 
     /** Phy: real page count.
      Virt: consider offset that may have been set by user. */
@@ -716,7 +716,7 @@ public:
     void SetPageOffset( sal_uInt16 nOffset );   ///< Changes last page offset.
     sal_uInt16 GetPageOffset() const;           ///< @return last page offset.
 
-    void InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator,
+    void InsertLabel( const SwLabelType eType, const OUString &rText, const OUString& rSeparator,
                       const OUString& rNumberSeparator,
                       const bool bBefore, const sal_uInt16 nId,
                       const OUString& rCharacterStyle,
@@ -737,10 +737,10 @@ public:
     bool IsLastCellInRow() const;
 
     /// Width of current range for column-dialog.
-    long GetSectionWidth( SwFmt const & rFmt ) const;
+    long GetSectionWidth( SwFormat const & rFormat ) const;
 
-    void GetConnectableFrmFmts
-    (SwFrmFmt & rFmt, const OUString & rReference, bool bSuccessors,
+    void GetConnectableFrameFormats
+    (SwFrameFormat & rFormat, const OUString & rReference, bool bSuccessors,
      ::std::vector< OUString > & aPrevPageVec,
      ::std::vector< OUString > & aThisPageVec,
      ::std::vector< OUString > & aNextPageVec,
@@ -775,10 +775,10 @@ public:
 
     void ParkCursorInTab();
 
-    SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot);
+    SwTextNode * GetNumRuleNodeAtPos(const Point &rPot);
     bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
 
-    static bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
+    static bool IsVerticalModeAtNdAndPos( const SwTextNode& _rTextNode,
                                    const Point& _rDocPos );
 
     void ToggleHeaderFooterEdit( );
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index cc365ed6b2ec..7447fdb86096 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -78,7 +78,7 @@ enum RES_FIELDS
 };
 
  /// List of FieldTypes at UI.
-enum SwFldTypesEnum
+enum SwFieldTypesEnum
 {
     TYP_BEGIN,
     TYP_DATEFLD = TYP_BEGIN,    // 0
@@ -224,7 +224,7 @@ enum SwDateTimeSubType
 };
 
 /// General tools.
-OUString  GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang = LANGUAGE_SYSTEM);
+OUString  GetResult(double nVal, sal_uInt32 nNumFormat, sal_uInt16 nLang = LANGUAGE_SYSTEM);
 void      SetErrorStr(const OUString& rStr);
 OUString  FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat);
 
@@ -240,9 +240,9 @@ class SW_DLLPUBLIC SwFieldType : public SwModify
     sal_uInt16 m_nWhich;
 
     friend void _FinitUI();     ///< In order to delete pointer!
-    static  std::vector<OUString>* s_pFldNames;
+    static  std::vector<OUString>* s_pFieldNames;
 
-    static void _GetFldName();  ///< Sets up FldNames; fldmgr.cxx!
+    static void _GetFieldName();  ///< Sets up FieldNames; fldmgr.cxx!
 
 protected:
     /// Single argument ctors shall be explicit.
@@ -267,10 +267,10 @@ public:
 
             sal_uInt16          Which() const { return m_nWhich; }
 
-    inline  void            UpdateFlds() const;
+    inline  void            UpdateFields() const;
 };
 
-inline void SwFieldType::UpdateFlds() const
+inline void SwFieldType::UpdateFields() const
 {
     const_cast<SwFieldType*>(this)->ModifyNotification( 0, 0 );
 }
@@ -297,7 +297,7 @@ protected:
     void                SetFormat(sal_uInt32 const nSet) { m_nFormat = nSet; }
 
     SwField( SwFieldType* pTyp,
-             sal_uInt32 nFmt = 0,
+             sal_uInt32 nFormat = 0,
              sal_uInt16 nLang = LANGUAGE_SYSTEM,
              bool m_bUseFieldValueCache = true );
 
@@ -314,7 +314,7 @@ public:
         @remark     most callers should use the cached field value.
                     this is because various fields need special handing
                     (ChangeExpansion()) to return correct values, and only
-                    SwTxtFormatter::NewFldPortion() sets things up properly.
+                    SwTextFormatter::NewFieldPortion() sets things up properly.
         @return     the generated text (suitable for display)
       */
     OUString            ExpandField(bool const bCached, ToxAuthorityField eField = AUTH_FIELD_IDENTIFIER) const;
@@ -396,9 +396,9 @@ public:
     inline bool     UseFormat() const                   { return m_bUseFormat; }
     inline void     EnableFormat(bool bFormat = true)   { m_bUseFormat = bFormat; }
 
-    OUString        ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const;
+    OUString        ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng=0) const;
     OUString        DoubleToString(const double &rVal, LanguageType eLng) const;
-    OUString        DoubleToString(const double &rVal, sal_uInt32 nFmt) const;
+    OUString        DoubleToString(const double &rVal, sal_uInt32 nFormat) const;
 };
 
 class SW_DLLPUBLIC SwValueField : public SwField
@@ -407,8 +407,8 @@ private:
     double m_fValue;
 
 protected:
-    SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
-    SwValueField( const SwValueField& rFld );
+    SwValueField( SwValueFieldType* pFieldType, sal_uInt32 nFormat = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
+    SwValueField( const SwValueField& rField );
 
 public:
     virtual                 ~SwValueField();
@@ -421,10 +421,10 @@ public:
     virtual double          GetValue() const;
     virtual void            SetValue( const double& rVal );
 
-    inline OUString ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const
-        { return static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, nFmt, nLng); }
+    inline OUString ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng=0) const
+        { return static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, nFormat, nLng); }
 
-    static sal_uInt32       GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt);
+    static sal_uInt32       GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFormat);
 };
 
 class SW_DLLPUBLIC SwFormulaField : public SwValueField
@@ -433,8 +433,8 @@ private:
     OUString m_sFormula;
 
 protected:
-    SwFormulaField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, const double fVal = 0.0 );
-    SwFormulaField( const SwFormulaField& rFld );
+    SwFormulaField( SwValueFieldType* pFieldType, sal_uInt32 nFormat = 0, const double fVal = 0.0 );
+    SwFormulaField( const SwFormulaField& rField );
 
 public:
     virtual OUString        GetFormula() const SAL_OVERRIDE;
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 2bfbec12cc6f..f99eb558d7ab 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwDateTimeField : public SwValueField
 
 public:
         SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD,
-                    sal_uLong nFmt = 0, sal_uInt16 nLng = 0);
+                    sal_uLong nFormat = 0, sal_uInt16 nLng = 0);
 
         virtual sal_uInt16          GetSubType() const SAL_OVERRIDE;
         virtual void            SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index 99d77062483d..ab53fea827da 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -22,7 +22,7 @@
 #include "rcid.hrc"
 
 /*--------------------------------------------------------------------
-    TypeId, see SwFldTypesEnum
+    TypeId, see SwFieldTypesEnum
  --------------------------------------------------------------------*/
 
 #define STR_TYPE_BEGIN      RC_FLDDLG_BEGIN
diff --git a/sw/inc/fldupde.hxx b/sw/inc/fldupde.hxx
index 788ec5966282..6995b403dbb1 100644
--- a/sw/inc/fldupde.hxx
+++ b/sw/inc/fldupde.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_FLDUPDE_HXX
 #define INCLUDED_SW_INC_FLDUPDE_HXX
 
-enum SwFldUpdateFlags
+enum SwFieldUpdateFlags
 {
     AUTOUPD_OFF,
     AUTOUPD_FIELD_ONLY,
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index f3434bdb2ed9..0a912d06ce2f 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -23,20 +23,20 @@
 #include <boost/shared_ptr.hpp>
 #include <set>
 
-class SwFrmFmt;
+class SwFrameFormat;
 class SwNodeIndex;
 
 /// For querying current flys in document.
 class SW_DLLPUBLIC SwPosFlyFrm
 {
-    const SwFrmFmt* pFrmFmt;    ///< FlyFrmFmt
+    const SwFrameFormat* pFrameFormat;    ///< FlyFrameFormat
     SwNodeIndex* pNdIdx;        ///< Index for node is sufficient.
     sal_uInt32 nOrdNum;
 public:
-    SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, sal_uInt16 nArrPos );
+    SwPosFlyFrm( const SwNodeIndex& , const SwFrameFormat*, sal_uInt16 nArrPos );
     virtual ~SwPosFlyFrm(); ///< Virtual for Writer (DLL !!)
 
-    const SwFrmFmt& GetFmt() const { return *pFrmFmt; }
+    const SwFrameFormat& GetFormat() const { return *pFrameFormat; }
     const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
     sal_uInt32 GetOrdNum() const { return nOrdNum; }
 };
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 38bedd19415f..54468ab91cb5 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -31,9 +31,9 @@ struct SwPosition;
 class IntlWrapper;
 
 /// FlyAnchors
-class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatAnchor: public SfxPoolItem
 {
-    ::boost::scoped_ptr<SwPosition> m_pCntntAnchor; /**< 0 for page-bound frames.
+    ::boost::scoped_ptr<SwPosition> m_pContentAnchor; /**< 0 for page-bound frames.
                                                      Index for paragraph-bound frames.
                                                      Position for character-bound frames. */
     RndStdIds  nAnchorId;
@@ -44,11 +44,11 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
     static sal_uInt32 mnOrderCounter;
 
 public:
-    SwFmtAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 );
-    SwFmtAnchor( const SwFmtAnchor &rCpy );
-    virtual ~SwFmtAnchor();
+    SwFormatAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 );
+    SwFormatAnchor( const SwFormatAnchor &rCpy );
+    virtual ~SwFormatAnchor();
 
-    SwFmtAnchor &operator=( const SwFmtAnchor& );
+    SwFormatAnchor &operator=( const SwFormatAnchor& );
 
     /// "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -64,7 +64,7 @@ public:
 
     RndStdIds GetAnchorId() const { return nAnchorId; }
     sal_uInt16 GetPageNum() const { return nPageNum; }
-    const SwPosition *GetCntntAnchor() const { return m_pCntntAnchor.get(); }
+    const SwPosition *GetContentAnchor() const { return m_pContentAnchor.get(); }
     // #i28701#
     sal_uInt32 GetOrder() const { return mnOrder;}
 
@@ -75,10 +75,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtAnchor &SwAttrSet::GetAnchor(bool bInP) const
-    { return static_cast<const SwFmtAnchor&>(Get(RES_ANCHOR, bInP)); }
+inline const SwFormatAnchor &SwAttrSet::GetAnchor(bool bInP) const
+    { return static_cast<const SwFormatAnchor&>(Get(RES_ANCHOR, bInP)); }
 
- inline const SwFmtAnchor &SwFmt::GetAnchor(bool bInP) const
+ inline const SwFormatAnchor &SwFormat::GetAnchor(bool bInP) const
      { return m_aSet.GetAnchor(bInP); }
 
 #endif
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index e7816237226c..048307c15c2b 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -23,21 +23,21 @@
 #include <format.hxx>
 #include <memory>
 
-class SwFmtAutoFmt: public SfxPoolItem
+class SwFormatAutoFormat: public SfxPoolItem
 {
     std::shared_ptr<SfxItemSet> mpHandle;
 
 public:
-    SwFmtAutoFmt( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT );
+    SwFormatAutoFormat( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT );
 
     /// single argument ctors shall be explicit.
-    virtual ~SwFmtAutoFmt();
+    virtual ~SwFormatAutoFormat();
 
     /// @@@ public copy ctor, but no copy assignment?
-    SwFmtAutoFmt( const SwFmtAutoFmt& rAttr );
+    SwFormatAutoFormat( const SwFormatAutoFormat& rAttr );
 private:
     /// @@@ public copy ctor, but no copy assignment?
-    SwFmtAutoFmt & operator= (const SwFmtAutoFmt &) SAL_DELETED_FUNCTION;
+    SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) SAL_DELETED_FUNCTION;
 public:
 
     TYPEINFO_OVERRIDE();
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index e7371a468fe4..cd4a34ab2768 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -25,10 +25,10 @@
 #include "swdllapi.h"
 
 /// If text in multi-column sections should be evenly distributed.
-class SW_DLLPUBLIC SwFmtNoBalancedColumns : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatNoBalancedColumns : public SfxBoolItem
 {
 public:
-    SwFmtNoBalancedColumns( bool bFlag = false )
+    SwFormatNoBalancedColumns( bool bFlag = false )
         : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {}
 
     /// "pure virtual methods" of SfxPoolItem
@@ -36,10 +36,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const
-    { return static_cast<const SwFmtNoBalancedColumns&>(Get( RES_COLUMNBALANCE, bInP )); }
+inline const SwFormatNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const
+    { return static_cast<const SwFormatNoBalancedColumns&>(Get( RES_COLUMNBALANCE, bInP )); }
 
-inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(bool bInP) const
+inline const SwFormatNoBalancedColumns &SwFormat::GetBalancedColumns(bool bInP) const
     { return m_aSet.GetBalancedColumns( bInP ); }
 
 #endif
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 267d54190e63..18f25baa75ee 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -68,7 +68,7 @@ enum SwColLineAdj
     COLADJ_BOTTOM
 };
 
-class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
+class SW_DLLPUBLIC SwFormatCol : public SfxPoolItem
 {
     editeng::SvxBorderStyle m_eLineStyle;     ///< style of the separator line
     sal_uLong   m_nLineWidth;                 ///< Width of the separator line.
@@ -92,14 +92,14 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
     SAL_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct );
 
 public:
-    SwFmtCol();
-    SwFmtCol( const SwFmtCol& );
-    virtual ~SwFmtCol();
+    SwFormatCol();
+    SwFormatCol( const SwFormatCol& );
+    virtual ~SwFormatCol();
     //#i120133#
     sal_Int16 GetAdjustValue() const { return m_aWidthAdjustValue; }
     void SetAdjustValue( const sal_Int16& n ) { m_aWidthAdjustValue = n; }
 
-    SwFmtCol& operator=( const SwFmtCol& );
+    SwFormatCol& operator=( const SwFormatCol& );
 
     /// "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -166,10 +166,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtCol &SwAttrSet::GetCol(bool bInP) const
-    { return static_cast<const SwFmtCol&>(Get( RES_COL,bInP)); }
+inline const SwFormatCol &SwAttrSet::GetCol(bool bInP) const
+    { return static_cast<const SwFormatCol&>(Get( RES_COL,bInP)); }
 
-inline const SwFmtCol &SwFmt::GetCol(bool bInP) const
+inline const SwFormatCol &SwFormat::GetCol(bool bInP) const
     { return m_aSet.GetCol(bInP); }
 
 #endif
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index 9c908b18893b..ce848e2ae4b9 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -28,16 +28,16 @@
 class IntlWrapper;
 
 /// Connection (text flow) between two FlyFrms.
-class SW_DLLPUBLIC SwFmtChain: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatChain: public SfxPoolItem
 {
-    SwClient aPrev, ///< Previous SwFlyFrmFmt (if existent).
-             aNext; ///< Next SwFlyFrmFmt (if existent).
+    SwClient aPrev, ///< Previous SwFlyFrameFormat (if existent).
+             aNext; ///< Next SwFlyFrameFormat (if existent).
 
 public:
-    SwFmtChain() : SfxPoolItem( RES_CHAIN ) {}
-    SwFmtChain( const SwFmtChain &rCpy );
+    SwFormatChain() : SfxPoolItem( RES_CHAIN ) {}
+    SwFormatChain( const SwFormatChain &rCpy );
 
-    inline SwFmtChain &operator=( const SwFmtChain& );
+    inline SwFormatChain &operator=( const SwFormatChain& );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -50,24 +50,24 @@ public:
 
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
 
-    SwFlyFrmFmt* GetPrev() const { return const_cast<SwFlyFrmFmt*>(static_cast<const SwFlyFrmFmt*>(aPrev.GetRegisteredIn())); }
-    SwFlyFrmFmt* GetNext() const { return const_cast<SwFlyFrmFmt*>(static_cast<const SwFlyFrmFmt*>(aNext.GetRegisteredIn())); }
+    SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aPrev.GetRegisteredIn())); }
+    SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aNext.GetRegisteredIn())); }
 
-    void SetPrev( SwFlyFrmFmt *pFmt );
-    void SetNext( SwFlyFrmFmt *pFmt );
+    void SetPrev( SwFlyFrameFormat *pFormat );
+    void SetNext( SwFlyFrameFormat *pFormat );
 };
 
-SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy )
+SwFormatChain &SwFormatChain::operator=( const SwFormatChain &rCpy )
 {
     SetPrev( rCpy.GetPrev() );
     SetNext( rCpy.GetNext() );
     return *this;
 }
 
-inline const SwFmtChain &SwAttrSet::GetChain(bool bInP) const
-    { return static_cast<const SwFmtChain&>(Get( RES_CHAIN,bInP)); }
+inline const SwFormatChain &SwAttrSet::GetChain(bool bInP) const
+    { return static_cast<const SwFormatChain&>(Get( RES_CHAIN,bInP)); }
 
-inline const SwFmtChain &SwFmt::GetChain(bool bInP) const
+inline const SwFormatChain &SwFormat::GetChain(bool bInP) const
     { return m_aSet.GetChain(bInP); }
 
 #endif
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index b11c160a3f02..77c33f9eaeaa 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -26,33 +26,33 @@
 class SwNodeIndex;
 class SwStartNode;
 
-/// Cntnt, content of frame (header, footer, fly).
-class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem
+/// Content, content of frame (header, footer, fly).
+class SW_DLLPUBLIC SwFormatContent: public SfxPoolItem
 {
     SwNodeIndex *pStartNode;
 
-    SwFmtCntnt &operator=( const SwFmtCntnt & ) SAL_DELETED_FUNCTION;
+    SwFormatContent &operator=( const SwFormatContent & ) SAL_DELETED_FUNCTION;
 
 public:
-    SwFmtCntnt( const SwStartNode* pStartNode = 0 );
-    SwFmtCntnt( const SwFmtCntnt &rCpy );
-    virtual ~SwFmtCntnt();
+    SwFormatContent( const SwStartNode* pStartNode = 0 );
+    SwFormatContent( const SwFormatContent &rCpy );
+    virtual ~SwFormatContent();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
 
-    const SwNodeIndex *GetCntntIdx() const { return pStartNode; }
-    void SetNewCntntIdx( const SwNodeIndex *pIdx );
+    const SwNodeIndex *GetContentIdx() const { return pStartNode; }
+    void SetNewContentIdx( const SwNodeIndex *pIdx );
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtCntnt &SwAttrSet::GetCntnt(bool bInP) const
-    { return static_cast<const SwFmtCntnt&>(Get( RES_CNTNT,bInP)); }
+inline const SwFormatContent &SwAttrSet::GetContent(bool bInP) const
+    { return static_cast<const SwFormatContent&>(Get( RES_CNTNT,bInP)); }
 
-inline const SwFmtCntnt &SwFmt::GetCntnt(bool bInP) const
-    { return m_aSet.GetCntnt(bInP); }
+inline const SwFormatContent &SwFormat::GetContent(bool bInP) const
+    { return m_aSet.GetContent(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 4d4b047c9897..b3529802206c 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -28,33 +28,33 @@
 class SwDoc;
 namespace sw{ class DocumentStylePoolManager; }
 
-class SwFmtColl : public SwFmt
+class SwFormatColl : public SwFormat
 {
 protected:
-    SwFmtColl( SwAttrPool& rPool, const sal_Char* pFmtName,
-                const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
-                sal_uInt16 nFmtWhich )
-          : SwFmt( rPool, pFmtName, pWhichRanges, pDerFrom, nFmtWhich )
+    SwFormatColl( SwAttrPool& rPool, const sal_Char* pFormatName,
+                const sal_uInt16* pWhichRanges, SwFormatColl* pDerFrom,
+                sal_uInt16 nFormatWhich )
+          : SwFormat( rPool, pFormatName, pWhichRanges, pDerFrom, nFormatWhich )
     { SetAuto( false ); }
 
-    SwFmtColl( SwAttrPool& rPool, const OUString &rFmtName,
-                const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
-                sal_uInt16 nFmtWhich )
-          : SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich )
+    SwFormatColl( SwAttrPool& rPool, const OUString &rFormatName,
+                const sal_uInt16* pWhichRanges, SwFormatColl* pDerFrom,
+                sal_uInt16 nFormatWhich )
+          : SwFormat( rPool, rFormatName, pWhichRanges, pDerFrom, nFormatWhich )
     { SetAuto( false ); }
 
 private:
-    SwFmtColl(const SwFmtColl & ) SAL_DELETED_FUNCTION;
-    const SwFmtColl &operator=(const SwFmtColl &) SAL_DELETED_FUNCTION;
+    SwFormatColl(const SwFormatColl & ) SAL_DELETED_FUNCTION;
+    const SwFormatColl &operator=(const SwFormatColl &) SAL_DELETED_FUNCTION;
 };
 
 /// Represents the style of a paragraph.
-class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
+class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl
 {
     friend class SwDoc;
     friend class ::sw::DocumentStylePoolManager;
 
-    SwTxtFmtColl(const SwTxtFmtColl & rRef) SAL_DELETED_FUNCTION;
+    SwTextFormatColl(const SwTextFormatColl & rRef) SAL_DELETED_FUNCTION;
 
     bool mbStayAssignedToListLevelOfOutlineStyle;
 
@@ -62,26 +62,26 @@ protected:
 
     bool mbAssignedToOutlineStyle;
 
-    SwTxtFmtColl *pNextTxtFmtColl;
+    SwTextFormatColl *pNextTextFormatColl;
 
-    SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
-                    SwTxtFmtColl* pDerFrom = 0,
-                    sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
-        : SwFmtColl(rPool, pFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh)
+    SwTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
+                    SwTextFormatColl* pDerFrom = 0,
+                    sal_uInt16 nFormatWh = RES_TXTFMTCOLL )
+        : SwFormatColl(rPool, pFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh)
         , mbStayAssignedToListLevelOfOutlineStyle(false)
         , mbAssignedToOutlineStyle(false)
     {
-        pNextTxtFmtColl = this;
+        pNextTextFormatColl = this;
     }
 
-    SwTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
-                    SwTxtFmtColl* pDerFrom = 0,
-                    sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
-        : SwFmtColl(rPool, rFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh)
+    SwTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName,
+                    SwTextFormatColl* pDerFrom = 0,
+                    sal_uInt16 nFormatWh = RES_TXTFMTCOLL )
+        : SwFormatColl(rPool, rFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh)
         , mbStayAssignedToListLevelOfOutlineStyle(false)
         , mbAssignedToOutlineStyle(false)
     {
-        pNextTxtFmtColl = this;
+        pNextTextFormatColl = this;
     }
 
     /// To get UL- / LR- / FontHeight-changes.
@@ -91,8 +91,8 @@ public:
 
     TYPEINFO_OVERRIDE(); ///< Already in base class Client.
 
-    inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
-    SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
+    inline void SetNextTextFormatColl(SwTextFormatColl& rNext);
+    SwTextFormatColl& GetNextTextFormatColl() const { return *pNextTextFormatColl; }
 
     bool IsAtDocNodeSet() const;
 
@@ -117,12 +117,12 @@ public:
 
     /** Override to recognize changes on the <SwNumRuleItem> and register/unregister
      the paragragh style at the corresponding <SwNumRule> instance. */
-    virtual bool SetFmtAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE;
-    virtual bool SetFmtAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
-    virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
+    virtual bool SetFormatAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE;
+    virtual bool SetFormatAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
 
-    /// Override <ResetAllFmtAttr()> to stay assigned to list level of outline style.
-    virtual sal_uInt16 ResetAllFmtAttr() SAL_OVERRIDE;
+    /// Override <ResetAllFormatAttr()> to stay assigned to list level of outline style.
+    virtual sal_uInt16 ResetAllFormatAttr() SAL_OVERRIDE;
 
     inline bool StayAssignedToListLevelOfOutlineStyle() const
     {
@@ -134,19 +134,19 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-class SwGrfFmtColl: public SwFmtColl
+class SwGrfFormatColl: public SwFormatColl
 {
     friend class SwDoc;
 protected:
-    SwGrfFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
-                    SwGrfFmtColl* pDerFrom = 0 )
-        : SwFmtColl( rPool, pFmtCollName, aGrfFmtCollSetRange,
+    SwGrfFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
+                    SwGrfFormatColl* pDerFrom = 0 )
+        : SwFormatColl( rPool, pFormatCollName, aGrfFormatCollSetRange,
                     pDerFrom, RES_GRFFMTCOLL )
     {}
 
-    SwGrfFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
-                    SwGrfFmtColl* pDerFrom = 0 )
-        : SwFmtColl( rPool, rFmtCollName, aGrfFmtCollSetRange,
+    SwGrfFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName,
+                    SwGrfFormatColl* pDerFrom = 0 )
+        : SwFormatColl( rPool, rFormatCollName, aGrfFormatCollSetRange,
                     pDerFrom, RES_GRFFMTCOLL )
     {}
 
@@ -178,15 +178,15 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient
     union
     {
         sal_uLong nSubCondition;
-        OUString* pFldExpression;
+        OUString* pFieldExpression;
     } aSubCondition;
 
 public:
     TYPEINFO_OVERRIDE(); ///< Already in base class Client.
 
-    SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+    SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
                     sal_uLong nSubCond = 0 );
-    SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+    SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
                     const OUString& rSubExp );
     virtual ~SwCollCondition();
 
@@ -203,50 +203,50 @@ public:
 
     sal_uLong GetCondition() const      { return nCondition; }
     sal_uLong GetSubCondition() const   { return aSubCondition.nSubCondition; }
-    const OUString* GetFldExpression() const
-                                    { return aSubCondition.pFldExpression; }
+    const OUString* GetFieldExpression() const
+                                    { return aSubCondition.pFieldExpression; }
 
     void SetCondition( sal_uLong nCond, sal_uLong nSubCond );
-    SwTxtFmtColl* GetTxtFmtColl() const     { return const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(GetRegisteredIn())); }
-    void RegisterToFormat( SwFmt& );
+    SwTextFormatColl* GetTextFormatColl() const     { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); }
+    void RegisterToFormat( SwFormat& );
 };
 
-class SwFmtCollConditions : public boost::ptr_vector<SwCollCondition> {};
+class SwFormatCollConditions : public boost::ptr_vector<SwCollCondition> {};
 
-class SW_DLLPUBLIC SwConditionTxtFmtColl : public SwTxtFmtColl
+class SW_DLLPUBLIC SwConditionTextFormatColl : public SwTextFormatColl
 {
     friend class SwDoc;
     friend class ::sw::DocumentStylePoolManager;
 protected:
-    SwFmtCollConditions aCondColls;
+    SwFormatCollConditions aCondColls;
 
-    SwConditionTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
-                            SwTxtFmtColl* pDerFrom = 0 )
-        : SwTxtFmtColl( rPool, pFmtCollName, pDerFrom, RES_CONDTXTFMTCOLL )
+    SwConditionTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
+                            SwTextFormatColl* pDerFrom = 0 )
+        : SwTextFormatColl( rPool, pFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL )
     {}
-    SwConditionTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
-                            SwTxtFmtColl* pDerFrom = 0 )
-        : SwTxtFmtColl( rPool, rFmtCollName, pDerFrom, RES_CONDTXTFMTCOLL )
+    SwConditionTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName,
+                            SwTextFormatColl* pDerFrom = 0 )
+        : SwTextFormatColl( rPool, rFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL )
     {}
 
 public:
     TYPEINFO_OVERRIDE(); ///< Already in base class Client.
 
-    virtual ~SwConditionTxtFmtColl();
+    virtual ~SwConditionTextFormatColl();
 
     const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
-    const SwFmtCollConditions& GetCondColls() const     { return aCondColls; }
+    const SwFormatCollConditions& GetCondColls() const     { return aCondColls; }
     void InsertCondition( const SwCollCondition& rCond );
     bool RemoveCondition( const SwCollCondition& rCond );
 
-    void SetConditions( const SwFmtCollConditions& );
+    void SetConditions( const SwFormatCollConditions& );
 };
 
 // FEATURE::CONDCOLL
 /// Inline implementations.
-inline void SwTxtFmtColl::SetNextTxtFmtColl( SwTxtFmtColl& rNext )
+inline void SwTextFormatColl::SetNextTextFormatColl( SwTextFormatColl& rNext )
 {
-    pNextTxtFmtColl = &rNext;
+    pNextTextFormatColl = &rNext;
 }
 #endif
 
diff --git a/sw/inc/fmtcolfunc.hxx b/sw/inc/fmtcolfunc.hxx
index e8b4771908c9..e6b12d0ef61b 100644
--- a/sw/inc/fmtcolfunc.hxx
+++ b/sw/inc/fmtcolfunc.hxx
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_SW_INC_FMTCOLFUNC_HXX
 #define INCLUDED_SW_INC_FMTCOLFUNC_HXX
 
-class SwFmt;
+class SwFormat;
 class SwNumRuleItem;
 
-// namespace <TxtFmtCollFunc> for functions and procedures working on
-// paragraph styles (instances of <SwTxtFmtColl>
-namespace TxtFmtCollFunc
+// namespace <TextFormatCollFunc> for functions and procedures working on
+// paragraph styles (instances of <SwTextFormatColl>
+namespace TextFormatCollFunc
 {
     /** Checks, if assignment of paragraph style to list level of outline style
         has to be deleted, and deletes the assignment, if needed.
@@ -36,43 +36,43 @@ namespace TxtFmtCollFunc
 
         @author OD
     */
-    void CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle(
-                                    SwFmt* pFmt,
+    void CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle(
+                                    SwFormat* pFormat,
                                     const SwNumRuleItem* pNewNumRuleItem = 0L );
 
     /** determines the list style, which directly set at the given paragraph style
 
         @author OD
 
-        @param rTxtFmtColl
+        @param rTextFormatColl
         input parameter - paragraph style for which the list style should be retrieved
 
         @return pointer to <SwNumRule> instance, if the given paragraph style
         has directly set a list style, 0 otherwise
     */
-    SwNumRule* GetNumRule( SwTxtFmtColl& rTxtFmtColl );
+    SwNumRule* GetNumRule( SwTextFormatColl& rTextFormatColl );
 
     /** adds the given paragraph style at the directly set list style
 
         Note: If the given paragraph style has no directly set list style, nothing happens
 
-        @param rTxtFmtColl
+        @param rTextFormatColl
         input parameter - paragraph style which is added to its directly set list style
 
         @author OD
     */
-    void AddToNumRule( SwTxtFmtColl& rTxtFmtColl );
+    void AddToNumRule( SwTextFormatColl& rTextFormatColl );
 
     /** removes te given paragraph style from the directly set list style
 
         Note: If the given paragraph style has no directly set list style, nothing happens
 
-        @param rTxtFmtColl
+        @param rTextFormatColl
         input parameter - paragraph style which is removed from its directly set list style
 
         @author OD
     */
-    void RemoveFromNumRule( SwTxtFmtColl& rTxtFmtColl );
+    void RemoveFromNumRule( SwTextFormatColl& rTextFormatColl );
 }
 #endif
 
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index 6c4045ca1994..6d2625579bd5 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -26,10 +26,10 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtEditInReadonly : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatEditInReadonly : public SfxBoolItem
 {
 public:
-    SwFmtEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY,
+    SwFormatEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY,
                      bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {}
 
     /// "pure virtual methos" of SfxPoolItem
@@ -42,10 +42,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const
-    { return static_cast<const SwFmtEditInReadonly&>(Get( RES_EDIT_IN_READONLY,bInP)); }
+inline const SwFormatEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const
+    { return static_cast<const SwFormatEditInReadonly&>(Get( RES_EDIT_IN_READONLY,bInP)); }
 
-inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(bool bInP) const
+inline const SwFormatEditInReadonly &SwFormat::GetEditInReadonly(bool bInP) const
     { return m_aSet.GetEditInReadonly(bInP); }
 
 #endif
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 136038d69209..64115f61d5eb 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -21,33 +21,33 @@
 
 #include <svl/poolitem.hxx>
 
-class SwFrmFmt;
-class SwTxtFlyCnt;
+class SwFrameFormat;
+class SwTextFlyCnt;
 
 /**
  * Format of a fly content.
  *
  * A pool item that is attached to the placeholder character of an as-character frame. (TextFrame, etc.)
  */
-class SwFmtFlyCnt : public SfxPoolItem
+class SwFormatFlyCnt : public SfxPoolItem
 {
-    friend class SwTxtFlyCnt;
-    SwTxtFlyCnt* pTxtAttr;
-    SwFrmFmt* pFmt; ///< My Fly/DrawFrame-format.
-    SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION;
+    friend class SwTextFlyCnt;
+    SwTextFlyCnt* pTextAttr;
+    SwFrameFormat* pFormat; ///< My Fly/DrawFrame-format.
+    SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION;
 
 public:
-    SwFmtFlyCnt( SwFrmFmt *pFrmFmt );
+    SwFormatFlyCnt( SwFrameFormat *pFrameFormat );
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
 
-    inline SwFrmFmt *GetFrmFmt() const { return pFmt; }
+    inline SwFrameFormat *GetFrameFormat() const { return pFormat; }
     /// For Undo: delete the FlyFrmFormat "logically"; it is kept in Undo-object.
-    inline void SetFlyFmt( SwFrmFmt* pNew = 0 )   { pFmt = pNew; }
+    inline void SetFlyFormat( SwFrameFormat* pNew = 0 )   { pFormat = pNew; }
 
-    const SwTxtFlyCnt *GetTxtFlyCnt() const { return pTxtAttr; }
-          SwTxtFlyCnt *GetTxtFlyCnt()       { return pTxtAttr; }
+    const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; }
+          SwTextFlyCnt *GetTextFlyCnt()       { return pTextAttr; }
 
     bool Sw3ioExportAllowed() const;
 };
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index c4f5e973a5d6..0d4f86bf58f1 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -31,27 +31,27 @@
 #include <calbck.hxx>
 
 class SwField;
-class SwTxtFld;
+class SwTextField;
 class SwView;
 class SwFieldType;
 
 // ATT_FLD
-class SW_DLLPUBLIC SwFmtFld
+class SW_DLLPUBLIC SwFormatField
     : public SfxPoolItem
     , public SwModify
     , public SfxBroadcaster
 {
     friend void _InitCore();
-    SwFmtFld( sal_uInt16 nWhich ); // for default-Attibute
+    SwFormatField( sal_uInt16 nWhich ); // for default-Attibute
 
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XTextField> m_wXTextField;
 
     SwField* mpField;
-    SwTxtFld* mpTxtFld; // the TextAttribute
+    SwTextField* mpTextField; // the TextAttribute
 
     // @@@ copy construction allowed, but copy assignment is not? @@@
-    SwFmtFld& operator=(const SwFmtFld& rFld) SAL_DELETED_FUNCTION;
+    SwFormatField& operator=(const SwFormatField& rField) SAL_DELETED_FUNCTION;
 
 protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
@@ -61,12 +61,12 @@ public:
     TYPEINFO_OVERRIDE();
 
     /// Single argument constructors shall be explicit.
-    explicit SwFmtFld( const SwField &rFld );
+    explicit SwFormatField( const SwField &rField );
 
     /// @@@ copy construction allowed, but copy assignment is not? @@@
-    SwFmtFld( const SwFmtFld& rAttr );
+    SwFormatField( const SwFormatField& rAttr );
 
-    virtual ~SwFmtFld();
+    virtual ~SwFormatField();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -94,19 +94,19 @@ public:
      */
     void SetField( SwField * pField );
 
-    const SwTxtFld* GetTxtFld() const
+    const SwTextField* GetTextField() const
     {
-        return mpTxtFld;
+        return mpTextField;
     }
-    SwTxtFld* GetTxtFld()
+    SwTextField* GetTextField()
     {
-        return mpTxtFld;
+        return mpTextField;
     }
-    void SetTxtFld( SwTxtFld& rTxtFld );
-    void ClearTxtFld();
+    void SetTextField( SwTextField& rTextField );
+    void ClearTextField();
 
     void RegisterToFieldType( SwFieldType& );
-    bool IsFldInDoc() const;
+    bool IsFieldInDoc() const;
     bool IsProtect() const;
 
     SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
@@ -117,7 +117,7 @@ public:
             { m_wXTextField = xTextField; }
 };
 
-enum class SwFmtFldHintWhich
+enum class SwFormatFieldHintWhich
 {
     INSERTED   = 1,
     REMOVED    = 2,
@@ -126,21 +126,21 @@ enum class SwFmtFldHintWhich
     LANGUAGE   = 5
 };
 
-class SW_DLLPUBLIC SwFmtFldHint : public SfxHint
+class SW_DLLPUBLIC SwFormatFieldHint : public SfxHint
 {
-    const SwFmtFld*   pFld;
-    SwFmtFldHintWhich nWhich;
+    const SwFormatField*   pField;
+    SwFormatFieldHintWhich nWhich;
     const SwView*     pView;
 
 public:
-    SwFmtFldHint( const SwFmtFld* p, SwFmtFldHintWhich n, const SwView* pV = 0)
-        : pFld(p)
+    SwFormatFieldHint( const SwFormatField* p, SwFormatFieldHintWhich n, const SwView* pV = 0)
+        : pField(p)
         , nWhich(n)
         , pView(pV)
     {}
 
-    const SwFmtFld* GetField() const { return pFld; }
-    SwFmtFldHintWhich Which() const { return nWhich; }
+    const SwFormatField* GetField() const { return pField; }
+    SwFormatFieldHintWhich Which() const { return nWhich; }
     const SwView* GetView() const { return pView; }
 };
 
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 7152b7f0f764..431eb4d3fddd 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -26,10 +26,10 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtFollowTextFlow : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatFollowTextFlow : public SfxBoolItem
 {
 public:
-    SwFmtFollowTextFlow( bool bFlag = false )
+    SwFormatFollowTextFlow( bool bFlag = false )
         : SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {}
 
     TYPEINFO_OVERRIDE();
@@ -45,10 +45,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const
-    { return static_cast<const SwFmtFollowTextFlow&>(Get( RES_FOLLOW_TEXT_FLOW, bInP )); }
+inline const SwFormatFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const
+    { return static_cast<const SwFormatFollowTextFlow&>(Get( RES_FOLLOW_TEXT_FLOW, bInP )); }
 
-inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(bool bInP) const
+inline const SwFormatFollowTextFlow &SwFormat::GetFollowTextFlow(bool bInP) const
     { return m_aSet.GetFollowTextFlow( bInP ); }
 
 #endif
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 4c9fd044afa0..259a5dc7c9da 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -33,11 +33,11 @@ enum SwFillOrder
     SW_FILL_ORDER_END
 };
 
-class SwFmtFillOrder: public SfxEnumItem
+class SwFormatFillOrder: public SfxEnumItem
 {
 public:
-    SwFmtFillOrder( SwFillOrder = ATT_TOP_DOWN );
-    inline SwFmtFillOrder &operator=( const SwFmtFillOrder &rCpy );
+    SwFormatFillOrder( SwFillOrder = ATT_TOP_DOWN );
+    inline SwFormatFillOrder &operator=( const SwFormatFillOrder &rCpy );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -46,16 +46,16 @@ public:
     SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); }
 };
 
-inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy )
+inline SwFormatFillOrder &SwFormatFillOrder::operator=( const SwFormatFillOrder &rCpy )
 {
     SetValue( rCpy.GetValue() );
     return *this;
 }
 
-inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(bool bInP) const
-    { return static_cast<const SwFmtFillOrder&>(Get( RES_FILL_ORDER,bInP)); }
+inline const SwFormatFillOrder &SwAttrSet::GetFillOrder(bool bInP) const
+    { return static_cast<const SwFormatFillOrder&>(Get( RES_FILL_ORDER,bInP)); }
 
-inline const SwFmtFillOrder &SwFmt::GetFillOrder(bool bInP) const
+inline const SwFormatFillOrder &SwFormat::GetFillOrder(bool bInP) const
     { return m_aSet.GetFillOrder(bInP); }
 
 #endif
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index c448feee7701..2a5cf5558c29 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -38,7 +38,7 @@ enum SwFrmSize
                          (can be exceeded but not be less). */
 };
 
-class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatFrmSize: public SfxPoolItem
 {
     Size      m_aSize;
     SwFrmSize m_eFrmHeightType;
@@ -60,9 +60,9 @@ class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem
     // minus borders in BrowseView if the environment is the page.
 
 public:
-    SwFmtFrmSize( SwFrmSize eSize = ATT_VAR_SIZE,
+    SwFormatFrmSize( SwFrmSize eSize = ATT_VAR_SIZE,
                   SwTwips nWidth = 0, SwTwips nHeight = 0 );
-    SwFmtFrmSize& operator=( const SwFmtFrmSize& rCpy );
+    SwFormatFrmSize& operator=( const SwFormatFrmSize& rCpy );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -101,10 +101,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(bool bInP) const
-    { return static_cast<const SwFmtFrmSize&>(Get( RES_FRM_SIZE,bInP)); }
+inline const SwFormatFrmSize &SwAttrSet::GetFrmSize(bool bInP) const
+    { return static_cast<const SwFormatFrmSize&>(Get( RES_FRM_SIZE,bInP)); }
 
-inline const SwFmtFrmSize &SwFmt::GetFrmSize(bool bInP) const
+inline const SwFormatFrmSize &SwFormat::GetFrmSize(bool bInP) const
     { return m_aSet.GetFrmSize(bInP); }
 
 #endif
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index 51e6a215919c..2e6a78894ee1 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -31,28 +31,28 @@ namespace com { namespace sun { namespace star {
 } } }
 
 class SwDoc;
-class SwTxtFtn;
+class SwTextFootnote;
 
 // ATT_FTN
 
-class SW_DLLPUBLIC SwFmtFtn
+class SW_DLLPUBLIC SwFormatFootnote
     : public SfxPoolItem
     , public SwModify
 {
-    friend class SwTxtFtn;
-    SwTxtFtn* m_pTxtAttr;   ///< My TextAttribute.
+    friend class SwTextFootnote;
+    SwTextFootnote* m_pTextAttr;   ///< My TextAttribute.
     OUString m_aNumber;     ///< User-defined 'Number'.
     sal_uInt16 m_nNumber;   ///< Automatische Nummerierung
     bool    m_bEndNote;     ///< Is it an End note?
 
     css::uno::WeakReference<css::text::XFootnote> m_wXFootnote;
 
-    SwFmtFtn& operator=(const SwFmtFtn& rFtn) SAL_DELETED_FUNCTION;
-    SwFmtFtn( const SwFmtFtn& ) SAL_DELETED_FUNCTION;
+    SwFormatFootnote& operator=(const SwFormatFootnote& rFootnote) SAL_DELETED_FUNCTION;
+    SwFormatFootnote( const SwFormatFootnote& ) SAL_DELETED_FUNCTION;
 
 public:
-    SwFmtFtn( bool bEndNote = false );
-    virtual ~SwFmtFtn();
+    SwFormatFootnote( bool bEndNote = false );
+    virtual ~SwFormatFootnote();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -72,16 +72,16 @@ public:
     void SetNumber( sal_uInt16 nNo )       { m_nNumber = nNo; }
     void SetEndNote( bool b );
 
-    void SetNumber( const SwFmtFtn& rFtn )
+    void SetNumber( const SwFormatFootnote& rFootnote )
     {
-        m_nNumber = rFtn.m_nNumber;
-        m_aNumber = rFtn.m_aNumber;
+        m_nNumber = rFootnote.m_nNumber;
+        m_aNumber = rFootnote.m_aNumber;
     }
 
-    const SwTxtFtn *GetTxtFtn() const   { return m_pTxtAttr; }
-          SwTxtFtn *GetTxtFtn()         { return m_pTxtAttr; }
+    const SwTextFootnote *GetTextFootnote() const   { return m_pTextAttr; }
+          SwTextFootnote *GetTextFootnote()         { return m_pTextAttr; }
 
-    void GetFtnText( OUString& rStr ) const;
+    void GetFootnoteText( OUString& rStr ) const;
 
     /// Returns string to be displayed of footnote / endnote.
     OUString GetViewNumStr( const SwDoc& rDoc, bool bInclStrs = false ) const;
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 48ec7c6b286a..cfb7c7346d46 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -25,7 +25,7 @@
 #include <numrule.hxx>
 #include "swdllapi.h"
 
-enum SwFtnEndPosEnum
+enum SwFootnoteEndPosEnum
 {
     FTNEND_ATPGORDOCEND,                ///< at page or document end
     FTNEND_ATTXTEND,                    ///< at end of the current text end
@@ -34,20 +34,20 @@ enum SwFtnEndPosEnum
     FTNEND_ATTXTEND_END
 };
 
-class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem
+class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem
 {
     OUString sPrefix;
     OUString sSuffix;
-    SvxNumberType aFmt;
+    SvxNumberType aFormat;
     sal_uInt16      nOffset;
 
 protected:
-    SwFmtFtnEndAtTxtEnd( sal_uInt16 nWhichL, SwFtnEndPosEnum ePos )
+    SwFormatFootnoteEndAtTextEnd( sal_uInt16 nWhichL, SwFootnoteEndPosEnum ePos )
         : SfxEnumItem( nWhichL, sal::static_int_cast< sal_uInt16 >(ePos) ), nOffset( 0 )
     {}
-    SwFmtFtnEndAtTxtEnd( const SwFmtFtnEndAtTxtEnd& rAttr )
+    SwFormatFootnoteEndAtTextEnd( const SwFormatFootnoteEndAtTextEnd& rAttr )
         : SfxEnumItem( rAttr ), sPrefix( rAttr.sPrefix ),
-        sSuffix( rAttr.sSuffix ), aFmt( rAttr.aFmt ),
+        sSuffix( rAttr.sSuffix ), aFormat( rAttr.aFormat ),
         nOffset( rAttr.nOffset )
     {}
 
@@ -67,12 +67,12 @@ public:
 
     inline bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
 
-    SwFmtFtnEndAtTxtEnd & operator=( const SwFmtFtnEndAtTxtEnd & rAttr );
+    SwFormatFootnoteEndAtTextEnd & operator=( const SwFormatFootnoteEndAtTextEnd & rAttr );
 
-    sal_Int16 GetNumType() const        { return aFmt.GetNumberingType(); }
-    void SetNumType( sal_Int16 eType )  { aFmt.SetNumberingType(eType); }
+    sal_Int16 GetNumType() const        { return aFormat.GetNumberingType(); }
+    void SetNumType( sal_Int16 eType )  { aFormat.SetNumberingType(eType); }
 
-    const SvxNumberType& GetSwNumType() const   { return aFmt; }
+    const SvxNumberType& GetSwNumType() const   { return aFormat; }
 
     sal_uInt16 GetOffset() const                { return nOffset; }
     void SetOffset( sal_uInt16 nOff )           { nOffset = nOff; }
@@ -84,21 +84,21 @@ public:
     void SetSuffix(const OUString& rSet)   { sSuffix = rSet; }
 };
 
-class SW_DLLPUBLIC SwFmtFtnAtTxtEnd : public SwFmtFtnEndAtTxtEnd
+class SW_DLLPUBLIC SwFormatFootnoteAtTextEnd : public SwFormatFootnoteEndAtTextEnd
 {
 public:
-    SwFmtFtnAtTxtEnd( SwFtnEndPosEnum ePos = FTNEND_ATPGORDOCEND )
-        : SwFmtFtnEndAtTxtEnd( RES_FTN_AT_TXTEND, ePos )
+    SwFormatFootnoteAtTextEnd( SwFootnoteEndPosEnum ePos = FTNEND_ATPGORDOCEND )
+        : SwFormatFootnoteEndAtTextEnd( RES_FTN_AT_TXTEND, ePos )
     {}
 
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwFmtEndAtTxtEnd : public SwFmtFtnEndAtTxtEnd
+class SW_DLLPUBLIC SwFormatEndAtTextEnd : public SwFormatFootnoteEndAtTextEnd
 {
 public:
-    SwFmtEndAtTxtEnd( SwFtnEndPosEnum ePos = FTNEND_ATPGORDOCEND )
-        : SwFmtFtnEndAtTxtEnd( RES_END_AT_TXTEND, ePos )
+    SwFormatEndAtTextEnd( SwFootnoteEndPosEnum ePos = FTNEND_ATPGORDOCEND )
+        : SwFormatFootnoteEndAtTextEnd( RES_END_AT_TXTEND, ePos )
     {
         SetNumType( SVX_NUM_ROMAN_LOWER );
     }
@@ -106,15 +106,15 @@ public:
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 };
 
-inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(bool bInP) const
-    { return static_cast<const SwFmtFtnAtTxtEnd&>(Get( RES_FTN_AT_TXTEND, bInP)); }
-inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(bool bInP) const
-    { return static_cast<const SwFmtEndAtTxtEnd&>(Get( RES_END_AT_TXTEND, bInP)); }
+inline const SwFormatFootnoteAtTextEnd &SwAttrSet::GetFootnoteAtTextEnd(bool bInP) const
+    { return static_cast<const SwFormatFootnoteAtTextEnd&>(Get( RES_FTN_AT_TXTEND, bInP)); }
+inline const SwFormatEndAtTextEnd &SwAttrSet::GetEndAtTextEnd(bool bInP) const
+    { return static_cast<const SwFormatEndAtTextEnd&>(Get( RES_END_AT_TXTEND, bInP)); }
 
-inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(bool bInP) const
-    { return m_aSet.GetFtnAtTxtEnd(bInP); }
-inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(bool bInP) const
-    { return m_aSet.GetEndAtTxtEnd(bInP); }
+inline const SwFormatFootnoteAtTextEnd &SwFormat::GetFootnoteAtTextEnd(bool bInP) const
+    { return m_aSet.GetFootnoteAtTextEnd(bInP); }
+inline const SwFormatEndAtTextEnd &SwFormat::GetEndAtTextEnd(bool bInP) const
+    { return m_aSet.GetEndAtTextEnd(bInP); }
 
 #endif
 
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 84caf2e15c27..2130ac1db86b 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -26,21 +26,21 @@
 #include <frmfmt.hxx>
 
 class IntlWrapper;
-class SwFmt;
+class SwFormat;
 
  /** Header, for PageFormats
- Client of FrmFmt describing the header. */
+ Client of FrameFormat describing the header. */
 
-class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatHeader: public SfxPoolItem, public SwClient
 {
     bool bActive;       ///< Only for controlling (creation of content).
 
 public:
-    SwFmtHeader( bool bOn = false );
-    SwFmtHeader( SwFrmFmt *pHeaderFmt );
-    SwFmtHeader( const SwFmtHeader &rCpy );
-    virtual ~SwFmtHeader();
-    SwFmtHeader& operator=( const SwFmtHeader &rCpy );
+    SwFormatHeader( bool bOn = false );
+    SwFormatHeader( SwFrameFormat *pHeaderFormat );
+    SwFormatHeader( const SwFormatHeader &rCpy );
+    virtual ~SwFormatHeader();
+    SwFormatHeader& operator=( const SwFormatHeader &rCpy );
 
     TYPEINFO_OVERRIDE();
 
@@ -53,27 +53,27 @@ public:
                                     OUString &rText,
                                     const IntlWrapper*    pIntl = 0 ) const SAL_OVERRIDE;
 
-    const SwFrmFmt *GetHeaderFmt() const { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
-          SwFrmFmt *GetHeaderFmt()       { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
+    const SwFrameFormat *GetHeaderFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
+          SwFrameFormat *GetHeaderFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
 
-    void RegisterToFormat( SwFmt& rFmt );
+    void RegisterToFormat( SwFormat& rFormat );
     bool IsActive() const { return bActive; }
     void SetActive( bool bNew = true ) { bActive = bNew; }
 };
 
  /**Footer, for pageformats
- Client of FrmFmt describing the footer */
+ Client of FrameFormat describing the footer */
 
-class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatFooter: public SfxPoolItem, public SwClient
 {
     bool bActive;       // Only for controlling (creation of content).
 
 public:
-    SwFmtFooter( bool bOn = false );
-    SwFmtFooter( SwFrmFmt *pFooterFmt );
-    SwFmtFooter( const SwFmtFooter &rCpy );
-    virtual ~SwFmtFooter();
-    SwFmtFooter& operator=( const SwFmtFooter &rCpy );
+    SwFormatFooter( bool bOn = false );
+    SwFormatFooter( SwFrameFormat *pFooterFormat );
+    SwFormatFooter( const SwFormatFooter &rCpy );
+    virtual ~SwFormatFooter();
+    SwFormatFooter& operator=( const SwFormatFooter &rCpy );
 
     TYPEINFO_OVERRIDE();
 
@@ -86,22 +86,22 @@ public:
                                     OUString &rText,
                                     const IntlWrapper*    pIntl = 0 ) const SAL_OVERRIDE;
 
-    const SwFrmFmt *GetFooterFmt() const { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
-          SwFrmFmt *GetFooterFmt()       { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
+    const SwFrameFormat *GetFooterFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
+          SwFrameFormat *GetFooterFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
 
-    void RegisterToFormat( SwFmt& rFmt );
+    void RegisterToFormat( SwFormat& rFormat );
     bool IsActive() const { return bActive; }
     void SetActive( bool bNew = true ) { bActive = bNew; }
 };
 
-inline const SwFmtHeader &SwAttrSet::GetHeader(bool bInP) const
-    { return static_cast<const SwFmtHeader&>(Get( RES_HEADER,bInP)); }
-inline const SwFmtFooter &SwAttrSet::GetFooter(bool bInP) const
-    { return static_cast<const SwFmtFooter&>(Get( RES_FOOTER,bInP)); }
+inline const SwFormatHeader &SwAttrSet::GetHeader(bool bInP) const
+    { return static_cast<const SwFormatHeader&>(Get( RES_HEADER,bInP)); }
+inline const SwFormatFooter &SwAttrSet::GetFooter(bool bInP) const
+    { return static_cast<const SwFormatFooter&>(Get( RES_FOOTER,bInP)); }
 
-inline const SwFmtHeader &SwFmt::GetHeader(bool bInP) const
+inline const SwFormatHeader &SwFormat::GetHeader(bool bInP) const
     { return m_aSet.GetHeader(bInP); }
-inline const SwFmtFooter &SwFmt::GetFooter(bool bInP) const
+inline const SwFormatFooter &SwFormat::GetFooter(bool bInP) const
     { return m_aSet.GetFooter(bInP); }
 
 #endif
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index d3c4d6b8b48f..35d7a7dc88ec 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -24,29 +24,29 @@
 
 class SvxMacro;
 class SvxMacroTableDtor;
-class SwTxtINetFmt;
+class SwTextINetFormat;
 class IntlWrapper;
 
 // ATT_INETFMT
 
-class SW_DLLPUBLIC SwFmtINetFmt: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatINetFormat: public SfxPoolItem
 {
-    friend class SwTxtINetFmt;
+    friend class SwTextINetFormat;
 
     OUString msURL;                  ///< URL.
     OUString msTargetFrame;          ///< Target frame for URL.
-    OUString msINetFmtName;
-    OUString msVisitedFmtName;
+    OUString msINetFormatName;
+    OUString msVisitedFormatName;
     OUString msHyperlinkName;        ///< Name of the link.
-    SvxMacroTableDtor* mpMacroTbl;
-    SwTxtINetFmt* mpTxtAttr;         ///< My TextAttribute.
-    sal_uInt16 mnINetFmtId;
-    sal_uInt16 mnVisitedFmtId;
+    SvxMacroTableDtor* mpMacroTable;
+    SwTextINetFormat* mpTextAttr;         ///< My TextAttribute.
+    sal_uInt16 mnINetFormatId;
+    sal_uInt16 mnVisitedFormatId;
 public:
-    SwFmtINetFmt( const OUString& rURL, const OUString& rTarget );
-    SwFmtINetFmt( const SwFmtINetFmt& rAttr );
-    SwFmtINetFmt();                     ///< For TypeInfo.
-    virtual ~SwFmtINetFmt();
+    SwFormatINetFormat( const OUString& rURL, const OUString& rTarget );
+    SwFormatINetFormat( const SwFormatINetFormat& rAttr );
+    SwFormatINetFormat();                     ///< For TypeInfo.
+    virtual ~SwFormatINetFormat();
 
     TYPEINFO_OVERRIDE();
 
@@ -64,13 +64,13 @@ public:
     virtual bool PutValue( const com::sun::star::uno::Any& rVal,
                                         sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
 
-    const SwTxtINetFmt* GetTxtINetFmt() const
+    const SwTextINetFormat* GetTextINetFormat() const
     {
-        return mpTxtAttr;
+        return mpTextAttr;
     }
-    SwTxtINetFmt* GetTxtINetFmt()
+    SwTextINetFormat* GetTextINetFormat()
     {
-        return mpTxtAttr;
+        return mpTextAttr;
     }
 
     const OUString& GetValue() const
@@ -92,47 +92,47 @@ public:
         return msTargetFrame;
     }
 
-    void SetINetFmtAndId(
+    void SetINetFormatAndId(
             const OUString& rNm,
             const sal_uInt16 nId )
     {
-        msINetFmtName = rNm;
-        mnINetFmtId = nId;
+        msINetFormatName = rNm;
+        mnINetFormatId = nId;
     }
 
-    const OUString& GetINetFmt() const
+    const OUString& GetINetFormat() const
     {
-        return msINetFmtName;
+        return msINetFormatName;
     }
 
-    sal_uInt16 GetINetFmtId() const
+    sal_uInt16 GetINetFormatId() const
     {
-        return mnINetFmtId;
+        return mnINetFormatId;
     }
 
-    void SetVisitedFmtAndId(
+    void SetVisitedFormatAndId(
             const OUString& rNm,
             const sal_uInt16 nId )
     {
-        msVisitedFmtName = rNm;
-        mnVisitedFmtId = nId;
+        msVisitedFormatName = rNm;
+        mnVisitedFormatId = nId;
     }
 
-    const OUString& GetVisitedFmt() const
+    const OUString& GetVisitedFormat() const
     {
-        return msVisitedFmtName;
+        return msVisitedFormatName;
     }
 
-    sal_uInt16 GetVisitedFmtId() const
+    sal_uInt16 GetVisitedFormatId() const
     {
-        return mnVisitedFmtId;
+        return mnVisitedFormatId;
     }
 
     /// Set a new MacroTable or clear the current one.
-    void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 );
-    const SvxMacroTableDtor* GetMacroTbl() const
+    void SetMacroTable( const SvxMacroTableDtor* pTable = 0 );
+    const SvxMacroTableDtor* GetMacroTable() const
     {
-        return mpMacroTbl;
+        return mpMacroTable;
     }
 
     /// Macro getter and setter.
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index cd5d85e3d605..e6373b137502 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -26,14 +26,14 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtLineNumber: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatLineNumber: public SfxPoolItem
 {
     sal_uLong nStartValue   :24; ///< Starting value for the paragraph. 0 == no starting value.
     bool      bCountLines   :1;  ///< Also count lines of paragraph.
 
 public:
-    SwFmtLineNumber();
-    virtual ~SwFmtLineNumber();
+    SwFormatLineNumber();
+    virtual ~SwFormatLineNumber();
 
     TYPEINFO_OVERRIDE();
 
@@ -55,8 +55,8 @@ public:
     void SetCountLines( bool b )     { bCountLines = b;    }
 };
 
-inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(bool bInP) const
-    { return static_cast<const SwFmtLineNumber&>(Get( RES_LINENUMBER,bInP)); }
+inline const SwFormatLineNumber &SwAttrSet::GetLineNumber(bool bInP) const
+    { return static_cast<const SwFormatLineNumber&>(Get( RES_LINENUMBER,bInP)); }
 
 #endif
 
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 1a1f94104795..d08dd84fe6d0 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -26,10 +26,10 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtLayoutSplit : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatLayoutSplit : public SfxBoolItem
 {
 public:
-    SwFmtLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
+    SwFormatLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
 
     /// "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -40,10 +40,10 @@ public:
                                     const IntlWrapper*    pIntl = 0 ) const SAL_OVERRIDE;
 };
 
-inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const
-    { return static_cast<const SwFmtLayoutSplit&>(Get( RES_LAYOUT_SPLIT,bInP)); }
+inline const SwFormatLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const
+    { return static_cast<const SwFormatLayoutSplit&>(Get( RES_LAYOUT_SPLIT,bInP)); }
 
-inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(bool bInP) const
+inline const SwFormatLayoutSplit &SwFormat::GetLayoutSplit(bool bInP) const
     { return m_aSet.GetLayoutSplit(bInP); }
 
 #endif
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index d79a5808b16e..f73ec36f3a53 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -39,8 +39,8 @@ namespace com { namespace sun { namespace star {
 /**
  * The classes that make up a meta entity are:
  * <dl>
- *   <dt>SwTxtMeta</dt><dd>the text hint</dd>
- *   <dt>SwFmtMeta</dt><dd>the pool item</dd>
+ *   <dt>SwTextMeta</dt><dd>the text hint</dd>
+ *   <dt>SwFormatMeta</dt><dd>the pool item</dd>
  *   <dt>sw::Meta</dt><dd>the metadatable entity itself</dd>
  *   <dt>SwXMeta</dt><dd>the UNO wrapper object</dd>
  * </dl>
@@ -74,47 +74,47 @@ namespace com { namespace sun { namespace star {
  * </ol>
  */
 
-class SwTxtMeta;
+class SwTextMeta;
 class SwXMeta;
 class SwXMetaField;
-class SwTxtNode;
+class SwTextNode;
 namespace sw {
     class Meta;
     class MetaFieldManager;
 }
 
-class SwFmtMeta
+class SwFormatMeta
     : public SfxPoolItem
 {
 private:
-    friend class SwTxtMeta; ///< needs SetTxtAttr, DoCopy
-    friend class ::sw::Meta; ///< needs m_pTxtAttr
+    friend class SwTextMeta; ///< needs SetTextAttr, DoCopy
+    friend class ::sw::Meta; ///< needs m_pTextAttr
 
     ::boost::shared_ptr< ::sw::Meta > m_pMeta;
-    SwTxtMeta * m_pTxtAttr;
+    SwTextMeta * m_pTextAttr;
 
-    SwTxtMeta * GetTxtAttr() { return m_pTxtAttr; }
-    void SetTxtAttr(SwTxtMeta * const i_pTxtAttr);
+    SwTextMeta * GetTextAttr() { return m_pTextAttr; }
+    void SetTextAttr(SwTextMeta * const i_pTextAttr);
 
     /// this method <em>must</em> be called when the hint is actually copied
     void DoCopy(::sw::MetaFieldManager & i_rTargetDocManager,
-        SwTxtNode & i_rTargetTxtNode);
+        SwTextNode & i_rTargetTextNode);
 
-    explicit SwFmtMeta( const sal_uInt16 i_nWhich );
+    explicit SwFormatMeta( const sal_uInt16 i_nWhich );
 
 public:
     /// takes ownership
-    explicit SwFmtMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
+    explicit SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
                         const sal_uInt16 i_nWhich );
-    virtual ~SwFmtMeta();
+    virtual ~SwFormatMeta();
 
     /// SfxPoolItem
     virtual bool             operator==( const SfxPoolItem & ) const SAL_OVERRIDE;
     virtual SfxPoolItem *    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 
     /// notify clients registered at m_pMeta that this meta is being (re-)moved
-    void NotifyChangeTxtNode(SwTxtNode *const pTxtNode);
-    static SwFmtMeta * CreatePoolDefault( const sal_uInt16 i_nWhich );
+    void NotifyChangeTextNode(SwTextNode *const pTextNode);
+    static SwFormatMeta * CreatePoolDefault( const sal_uInt16 i_nWhich );
     ::sw::Meta * GetMeta() { return m_pMeta.get(); }
 };
 
@@ -125,23 +125,23 @@ class Meta
     , public SwModify
 {
 protected:
-    friend class ::SwFmtMeta; ///< SetFmtMeta, NotifyChangeTxtNode
-    friend class ::SwXMeta;   ///< GetTxtNode, GetTxtAttr, Get/SetXMeta
+    friend class ::SwFormatMeta; ///< SetFormatMeta, NotifyChangeTextNode
+    friend class ::SwXMeta;   ///< GetTextNode, GetTextAttr, Get/SetXMeta
 
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::rdf::XMetadatable> m_wXMeta;
 
-    SwFmtMeta * m_pFmt;
-    SwTxtNode * m_pTxtNode;
+    SwFormatMeta * m_pFormat;
+    SwTextNode * m_pTextNode;
 
-    SwTxtMeta * GetTxtAttr() const;
-    SwTxtNode * GetTxtNode() const { return m_pTxtNode;} ///< @return 0 if not in document (undo)
+    SwTextMeta * GetTextAttr() const;
+    SwTextNode * GetTextNode() const { return m_pTextNode;} ///< @return 0 if not in document (undo)
 
-    SwFmtMeta * GetFmtMeta() const { return m_pFmt; }
-    void SetFmtMeta( SwFmtMeta * const i_pFmt ) { m_pFmt = i_pFmt; };
+    SwFormatMeta * GetFormatMeta() const { return m_pFormat; }
+    void SetFormatMeta( SwFormatMeta * const i_pFormat ) { m_pFormat = i_pFormat; };
 
-    void NotifyChangeTxtNodeImpl();
-    void NotifyChangeTxtNode(SwTxtNode *const pTxtNode);
+    void NotifyChangeTextNodeImpl();
+    void NotifyChangeTextNode(SwTextNode *const pTextNode);
 
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::rdf::XMetadatable> const& GetXMeta() const
@@ -154,7 +154,7 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
 
 public:
-    explicit Meta(SwFmtMeta * const i_pFmt = 0);
+    explicit Meta(SwFormatMeta * const i_pFormat = 0);
     virtual ~Meta();
 
     /// sfx2::Metadatable
@@ -170,7 +170,7 @@ class MetaField
     : public Meta
 {
 private:
-    friend class ::SwFmtMeta;
+    friend class ::SwFormatMeta;
     friend class ::SwXMetaField;
     friend class ::sw::MetaFieldManager;
 
@@ -182,7 +182,7 @@ private:
     bool IsFixedLanguage() const    { return m_bIsFixedLanguage; }
     void SetIsFixedLanguage(bool b) { m_bIsFixedLanguage = b; }
 
-    explicit MetaField(SwFmtMeta * const i_pFmt = 0,
+    explicit MetaField(SwFormatMeta * const i_pFormat = 0,
             const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
             const bool bIsFixedLanguage = false );
 
@@ -203,7 +203,7 @@ private:
 public:
     MetaFieldManager();
     ::boost::shared_ptr<MetaField> makeMetaField(
-                SwFmtMeta * const i_pFmt = 0,
+                SwFormatMeta * const i_pFormat = 0,
                 const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
                 const bool bIsFixedLanguage = false );
     /// get all meta fields
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index cde5b958d595..87b9f8f4977c 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -30,16 +30,16 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatVertOrient: public SfxPoolItem
 {
     SwTwips         m_nYPos;  ///< Contains *always* the current RelPos.
     sal_Int16       m_eOrient;
     sal_Int16       m_eRelation;
 public:
     TYPEINFO_OVERRIDE();
-    SwFmtVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE,
+    SwFormatVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE,
                      sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA );
-    inline SwFmtVertOrient &operator=( const SwFmtVertOrient &rCpy );
+    inline SwFormatVertOrient &operator=( const SwFormatVertOrient &rCpy );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -66,7 +66,7 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem
 {
     SwTwips         m_nXPos;              ///< Contains *always* the current RelPos.
     sal_Int16       m_eOrient;
@@ -74,9 +74,9 @@ class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem
     bool            m_bPosToggle : 1; ///< Flip position on even pages.
 public:
     TYPEINFO_OVERRIDE();
-    SwFmtHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE,
+    SwFormatHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE,
         sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, bool bPos = false );
-    inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy );
+    inline SwFormatHoriOrient &operator=( const SwFormatHoriOrient &rCpy );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -103,14 +103,14 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline SwFmtVertOrient &SwFmtVertOrient::operator=( const SwFmtVertOrient &rCpy )
+inline SwFormatVertOrient &SwFormatVertOrient::operator=( const SwFormatVertOrient &rCpy )
 {
     m_nYPos = rCpy.GetPos();
     m_eOrient = rCpy.GetVertOrient();
     m_eRelation = rCpy.GetRelationOrient();
     return *this;
 }
-inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy )
+inline SwFormatHoriOrient &SwFormatHoriOrient::operator=( const SwFormatHoriOrient &rCpy )
 {
     m_nXPos = rCpy.GetPos();
     m_eOrient = rCpy.GetHoriOrient();
@@ -119,14 +119,14 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy
     return *this;
 }
 
-inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(bool bInP) const
-    { return static_cast<const SwFmtVertOrient&>(Get( RES_VERT_ORIENT,bInP)); }
-inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const
-    { return static_cast<const SwFmtHoriOrient&>(Get( RES_HORI_ORIENT,bInP)); }
+inline const SwFormatVertOrient &SwAttrSet::GetVertOrient(bool bInP) const
+    { return static_cast<const SwFormatVertOrient&>(Get( RES_VERT_ORIENT,bInP)); }
+inline const SwFormatHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const
+    { return static_cast<const SwFormatHoriOrient&>(Get( RES_HORI_ORIENT,bInP)); }
 
-inline const SwFmtVertOrient &SwFmt::GetVertOrient(bool bInP) const
+inline const SwFormatVertOrient &SwFormat::GetVertOrient(bool bInP) const
     { return m_aSet.GetVertOrient(bInP); }
-inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(bool bInP) const
+inline const SwFormatHoriOrient &SwFormat::GetHoriOrient(bool bInP) const
     { return m_aSet.GetHoriOrient(bInP); }
 
 #endif
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index f4d6de755c09..0195015709b8 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -36,7 +36,7 @@ class SwEndNoteInfo;
 /** Pagedescriptor
  Client of SwPageDesc that is "described" by the attribute. */
 
-class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatPageDesc : public SfxPoolItem, public SwClient
 {
     /** This "Doc"-function is made friend in order to be able
      to set the auto-flag after copying!! */
@@ -45,16 +45,16 @@ class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient
     ::boost::optional<sal_uInt16> oNumOffset;          ///< Offset page number.
     sal_uInt16 nDescNameIdx;        ///< SW3-Reader: stringpool-index of style name.
     SwModify* pDefinedIn;       /**< Points to the object in which the
-                                 attribute was set (CntntNode/Format). */
+                                 attribute was set (ContentNode/Format). */
 protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
     virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) SAL_OVERRIDE;
 
 public:
-    SwFmtPageDesc( const SwPageDesc *pDesc = 0 );
-    SwFmtPageDesc( const SwFmtPageDesc &rCpy );
-    SwFmtPageDesc &operator=( const SwFmtPageDesc &rCpy );
-    virtual ~SwFmtPageDesc();
+    SwFormatPageDesc( const SwPageDesc *pDesc = 0 );
+    SwFormatPageDesc( const SwFormatPageDesc &rCpy );
+    SwFormatPageDesc &operator=( const SwFormatPageDesc &rCpy );
+    virtual ~SwFormatPageDesc();
 
     TYPEINFO_OVERRIDE();
 
@@ -84,10 +84,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(bool bInP) const
-    { return static_cast<const SwFmtPageDesc&>(Get( RES_PAGEDESC,bInP)); }
+inline const SwFormatPageDesc &SwAttrSet::GetPageDesc(bool bInP) const
+    { return static_cast<const SwFormatPageDesc&>(Get( RES_PAGEDESC,bInP)); }
 
-inline const SwFmtPageDesc &SwFmt::GetPageDesc(bool bInP) const
+inline const SwFormatPageDesc &SwFormat::GetPageDesc(bool bInP) const
     { return m_aSet.GetPageDesc(bInP); }
 
 #endif
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index cfa8efd67d8f..8e054f660859 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -29,26 +29,26 @@ namespace com { namespace sun { namespace star {
     namespace text { class XTextContent; }
 } } }
 
-class SwTxtRefMark;
+class SwTextRefMark;
 
 // ATT_REFMARK
 
-class SwFmtRefMark
+class SwFormatRefMark
     : public SfxPoolItem
     , public SwModify
 {
-    friend class SwTxtRefMark;
-    SwTxtRefMark* pTxtAttr;
+    friend class SwTextRefMark;
+    SwTextRefMark* pTextAttr;
 
-    SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark) SAL_DELETED_FUNCTION;
+    SwFormatRefMark& operator=(const SwFormatRefMark& rRefMark) SAL_DELETED_FUNCTION;
     OUString aRefName;
 
     css::uno::WeakReference<css::text::XTextContent> m_wXReferenceMark;
 
 public:
-    SwFmtRefMark( const OUString& rTxt );
-    SwFmtRefMark( const SwFmtRefMark& rRefMark );
-    virtual ~SwFmtRefMark( );
+    SwFormatRefMark( const OUString& rText );
+    SwFormatRefMark( const SwFormatRefMark& rRefMark );
+    virtual ~SwFormatRefMark( );
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -60,8 +60,8 @@ public:
 
     void InvalidateRefMark();
 
-    const SwTxtRefMark *GetTxtRefMark() const   { return pTxtAttr; }
-    SwTxtRefMark *GetTxtRefMark()               { return pTxtAttr; }
+    const SwTextRefMark *GetTextRefMark() const   { return pTextAttr; }
+    SwTextRefMark *GetTextRefMark()               { return pTextAttr; }
 
     inline       OUString &GetRefName()       { return aRefName; }
     inline const OUString &GetRefName() const { return aRefName; }
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index 5ac88cca87e0..dd2dceebecd8 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -26,10 +26,10 @@
 
 class IntlWrapper;
 
-class SW_DLLPUBLIC SwFmtRowSplit : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatRowSplit : public SfxBoolItem
 {
 public:
-    SwFmtRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {}
+    SwFormatRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {}
 
     // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -40,10 +40,10 @@ public:
                                     const IntlWrapper*    pIntl = 0 ) const SAL_OVERRIDE;
 };
 
-inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(bool bInP) const
-    { return static_cast<const SwFmtRowSplit&>(Get( RES_ROW_SPLIT,bInP)); }
+inline const SwFormatRowSplit &SwAttrSet::GetRowSplit(bool bInP) const
+    { return static_cast<const SwFormatRowSplit&>(Get( RES_ROW_SPLIT,bInP)); }
 
-inline const SwFmtRowSplit &SwFmt::GetRowSplit(bool bInP) const
+inline const SwFormatRowSplit &SwFormat::GetRowSplit(bool bInP) const
     { return m_aSet.GetRowSplit(bInP); }
 
 #endif
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index f0945e6227d1..219f3ddab687 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -21,25 +21,25 @@
 
 #include <svl/poolitem.hxx>
 
-class SwTxtRuby;
+class SwTextRuby;
 
-class SW_DLLPUBLIC SwFmtRuby : public SfxPoolItem
+class SW_DLLPUBLIC SwFormatRuby : public SfxPoolItem
 {
-    friend class SwTxtRuby;
+    friend class SwTextRuby;
 
-    OUString sRubyTxt;                      ///< The ruby txt.
-    OUString sCharFmtName;                  ///< Name of the charformat.
-    SwTxtRuby* pTxtAttr;                    ///< The TextAttribute.
-    sal_uInt16 nCharFmtId;                  ///< PoolId of the charformat.
+    OUString sRubyText;                      ///< The ruby txt.
+    OUString sCharFormatName;                  ///< Name of the charformat.
+    SwTextRuby* pTextAttr;                    ///< The TextAttribute.
+    sal_uInt16 nCharFormatId;                  ///< PoolId of the charformat.
     sal_uInt16 nPosition;                   ///< Position of the Ruby-character.
     sal_uInt16 nAdjustment;                 ///< Specific adjustment of the Ruby-ch.
 
 public:
-    SwFmtRuby( const OUString& rRubyTxt );
-    SwFmtRuby( const SwFmtRuby& rAttr );
-    virtual ~SwFmtRuby();
+    SwFormatRuby( const OUString& rRubyText );
+    SwFormatRuby( const SwFormatRuby& rAttr );
+    virtual ~SwFormatRuby();
 
-    SwFmtRuby& operator=( const SwFmtRuby& rAttr );
+    SwFormatRuby& operator=( const SwFormatRuby& rAttr );
 
     // "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -56,17 +56,17 @@ public:
     virtual bool PutValue( const com::sun::star::uno::Any& rVal,
                                         sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
 
-    const SwTxtRuby* GetTxtRuby() const         { return pTxtAttr; }
-    SwTxtRuby* GetTxtRuby()                     { return pTxtAttr; }
+    const SwTextRuby* GetTextRuby() const         { return pTextAttr; }
+    SwTextRuby* GetTextRuby()                     { return pTextAttr; }
 
-    OUString GetText() const                    { return sRubyTxt; }
-    void SetText( const OUString& rTxt )        { sRubyTxt = rTxt; }
+    OUString GetText() const                    { return sRubyText; }
+    void SetText( const OUString& rText )        { sRubyText = rText; }
 
-    OUString GetCharFmtName() const             { return sCharFmtName; }
-    void SetCharFmtName( const OUString& rNm )  { sCharFmtName = rNm; }
+    OUString GetCharFormatName() const             { return sCharFormatName; }
+    void SetCharFormatName( const OUString& rNm )  { sCharFormatName = rNm; }
 
-    sal_uInt16 GetCharFmtId() const                 { return nCharFmtId; }
-    void SetCharFmtId( sal_uInt16 nNew )            { nCharFmtId = nNew; }
+    sal_uInt16 GetCharFormatId() const                 { return nCharFormatId; }
+    void SetCharFormatId( sal_uInt16 nNew )            { nCharFormatId = nNew; }
 
     sal_uInt16 GetPosition() const                  { return nPosition; }
     void SetPosition( sal_uInt16 nNew )             { nPosition = nNew; }
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 23009806fb35..5b933e99b287 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -27,16 +27,16 @@
 #include <fmtsrndenum.hxx>
 class IntlWrapper;
 
-// SwFmtSurround: How document content under the frame shall behave.
-class SW_DLLPUBLIC SwFmtSurround: public SfxEnumItem
+// SwFormatSurround: How document content under the frame shall behave.
+class SW_DLLPUBLIC SwFormatSurround: public SfxEnumItem
 {
     bool    bAnchorOnly :1;
     bool    bContour    :1;
     bool    bOutside    :1;
 public:
-    SwFmtSurround( SwSurround eNew = SURROUND_PARALLEL );
-    SwFmtSurround( const SwFmtSurround & );
-    inline SwFmtSurround &operator=( const SwFmtSurround &rCpy );
+    SwFormatSurround( SwSurround eNew = SURROUND_PARALLEL );
+    SwFormatSurround( const SwFormatSurround & );
+    inline SwFormatSurround &operator=( const SwFormatSurround &rCpy );
 
     // "Pure virtual Methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -62,7 +62,7 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy )
+inline SwFormatSurround &SwFormatSurround::operator=( const SwFormatSurround &rCpy )
 {
     bAnchorOnly = rCpy.IsAnchorOnly();
     bContour = rCpy.IsContour();
@@ -71,10 +71,10 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy )
     return *this;
 }
 
-inline const SwFmtSurround &SwAttrSet::GetSurround(bool bInP) const
-    { return static_cast<const SwFmtSurround&>(Get( RES_SURROUND,bInP)); }
+inline const SwFormatSurround &SwAttrSet::GetSurround(bool bInP) const
+    { return static_cast<const SwFormatSurround&>(Get( RES_SURROUND,bInP)); }
 
-inline const SwFmtSurround &SwFmt::GetSurround(bool bInP) const
+inline const SwFormatSurround &SwFormat::GetSurround(bool bInP) const
     { return m_aSet.GetSurround(bInP); }
 
 #endif
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 766b59d4f8f2..bdcf92f8283e 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -29,7 +29,7 @@ class IntlWrapper;
 
 // URL, ServerMap und ClientMap
 
-class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatURL: public SfxPoolItem
 {
     OUString  sTargetFrameName; ///< Target frame for URL.
     OUString  sURL;             ///< Simple URL.
@@ -38,15 +38,15 @@ class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem
 
     bool      bIsServerMap;     ///< A ServerSideImageMap with the URL.
 
-    SwFmtURL& operator=( const SwFmtURL& ) SAL_DELETED_FUNCTION;
+    SwFormatURL& operator=( const SwFormatURL& ) SAL_DELETED_FUNCTION;
 
 public:
-    SwFmtURL();
+    SwFormatURL();
 
     /// @@@ copy construction allowed, but assigment is not? @@@
-    SwFmtURL( const SwFmtURL& );
+    SwFormatURL( const SwFormatURL& );
 
-    virtual ~SwFmtURL();
+    virtual ~SwFormatURL();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -73,10 +73,10 @@ public:
     void SetName( const OUString& rNm )     { sName = rNm; }
 };
 
-inline const SwFmtURL &SwAttrSet::GetURL(bool bInP) const
-    { return static_cast<const SwFmtURL&>(Get( RES_URL,bInP)); }
+inline const SwFormatURL &SwAttrSet::GetURL(bool bInP) const
+    { return static_cast<const SwFormatURL&>(Get( RES_URL,bInP)); }
 
-inline const SwFmtURL &SwFmt::GetURL(bool bInP) const
+inline const SwFormatURL &SwFormat::GetURL(bool bInP) const
     { return m_aSet.GetURL(bInP); }
 
 #endif
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index ff6dc2315e20..88e86a2c46d4 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -24,7 +24,7 @@
 #include <svl/poolitem.hxx>
 #include <com/sun/star/text/WrapInfluenceOnPosition.hpp>
 
-class SW_DLLPUBLIC SwFmtWrapInfluenceOnObjPos: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatWrapInfluenceOnObjPos: public SfxPoolItem
 {
 private:
     sal_Int16 mnWrapInfluenceOnPosition;
@@ -33,15 +33,15 @@ public:
     TYPEINFO_OVERRIDE();
 
     // #i35017# - constant name has changed
-    SwFmtWrapInfluenceOnObjPos(
+    SwFormatWrapInfluenceOnObjPos(
             sal_Int16 _nWrapInfluenceOnPosition =
             com::sun::star::text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
-    SwFmtWrapInfluenceOnObjPos(
-            const SwFmtWrapInfluenceOnObjPos& _rCpy );
-    virtual ~SwFmtWrapInfluenceOnObjPos();
+    SwFormatWrapInfluenceOnObjPos(
+            const SwFormatWrapInfluenceOnObjPos& _rCpy );
+    virtual ~SwFormatWrapInfluenceOnObjPos();
 
-    SwFmtWrapInfluenceOnObjPos& operator=(
-            const SwFmtWrapInfluenceOnObjPos& _rSource );
+    SwFormatWrapInfluenceOnObjPos& operator=(
+            const SwFormatWrapInfluenceOnObjPos& _rSource );
 
     /// pure virtual methods of class <SfxPoolItem>
     virtual bool operator==( const SfxPoolItem& _rAttr ) const SAL_OVERRIDE;
@@ -60,10 +60,10 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
 
-inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const
-    { return static_cast<const SwFmtWrapInfluenceOnObjPos&>(Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP)); }
+inline const SwFormatWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const
+    { return static_cast<const SwFormatWrapInfluenceOnObjPos&>(Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP)); }
 
- inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(bool bInP) const
+ inline const SwFormatWrapInfluenceOnObjPos& SwFormat::GetWrapInfluenceOnObjPos(bool bInP) const
     { return m_aSet.GetWrapInfluenceOnObjPos(bInP); }
 
 #endif
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 63bb3bb13472..11ed94319e81 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -41,39 +41,39 @@ namespace drawinglayer { namespace attribute {
 }}
 
 /// Base class for various Writer styles.
-class SW_DLLPUBLIC SwFmt : public SwModify
+class SW_DLLPUBLIC SwFormat : public SwModify
 {
-    OUString m_aFmtName;
+    OUString m_aFormatName;
     SwAttrSet m_aSet;
 
     sal_uInt16 m_nWhichId;
-    sal_uInt16 m_nPoolFmtId;        /**< Id for "automatically" created formats.
+    sal_uInt16 m_nPoolFormatId;        /**< Id for "automatically" created formats.
                                        (is not hard attribution!!!) */
     sal_uInt16 m_nPoolHelpId;       ///< HelpId for this Pool-style.
     sal_uInt8 m_nPoolHlpFileId;     ///< FilePos to Doc to these style helps.
     bool   m_bWritten : 1;      ///< TRUE: already written.
-    bool   m_bAutoFmt : 1;      /**< FALSE: it is a template.
+    bool   m_bAutoFormat : 1;      /**< FALSE: it is a template.
                                        default is true! */
-    bool   m_bFmtInDTOR : 1;    /**< TRUE: Format becomes deleted. In order to be able
-                                       to recognize this in FmtChg-message!! */
-    bool   m_bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole paragraph
+    bool   m_bFormatInDTOR : 1;    /**< TRUE: Format becomes deleted. In order to be able
+                                       to recognize this in FormatChg-message!! */
+    bool   m_bAutoUpdateFormat : 1;/**< TRUE: Set attributes of a whole paragraph
                                        at format (UI-side!). */
     bool m_bHidden : 1;
     std::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style InteropGrabBag.
 
 protected:
-    SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-            const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
-    SwFmt( SwAttrPool& rPool, const OUString &rFmtNm, const sal_uInt16* pWhichRanges,
-            SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
-    SwFmt( const SwFmt& rFmt );
+    SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+            const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich );
+    SwFormat( SwAttrPool& rPool, const OUString &rFormatNm, const sal_uInt16* pWhichRanges,
+            SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich );
+    SwFormat( const SwFormat& rFormat );
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
 
 public:
     TYPEINFO_OVERRIDE();     ///< Already in base class Client.
 
-    virtual ~SwFmt();
-    SwFmt &operator=(const SwFmt&);
+    virtual ~SwFormat();
+    SwFormat &operator=(const SwFormat&);
 
     /// for Querying of Writer-functions.
     sal_uInt16 Which() const { return m_nWhichId; }
@@ -82,36 +82,36 @@ public:
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
 
     /// Copy attributes even among documents.
-    void CopyAttrs( const SwFmt&, bool bReplace=true );
+    void CopyAttrs( const SwFormat&, bool bReplace=true );
 
-    /// Delete all attributes that are not in rFmt.
+    /// Delete all attributes that are not in rFormat.
     void DelDiffs( const SfxItemSet& rSet );
-    void DelDiffs( const SwFmt& rFmt ) { DelDiffs( rFmt.GetAttrSet() ); }
+    void DelDiffs( const SwFormat& rFormat ) { DelDiffs( rFormat.GetAttrSet() ); }
 
     /// 0 is Default.
-    bool SetDerivedFrom(SwFmt *pDerivedFrom = 0);
+    bool SetDerivedFrom(SwFormat *pDerivedFrom = 0);
 
     /// If bInParents is FALSE, search only in this format for attribute.
     //UUUUinline
-    const SfxPoolItem& GetFmtAttr( sal_uInt16 nWhich,
+    const SfxPoolItem& GetFormatAttr( sal_uInt16 nWhich,
                                    bool bInParents = true ) const;
     //UUUUinline
     SfxItemState GetItemState( sal_uInt16 nWhich, bool bSrchInParent = true,
                                     const SfxPoolItem **ppItem = 0 ) const;
     SfxItemState GetBackgroundState(SvxBrushItem &rItem,
                                     bool bSrchInParent = true) const;
-    virtual bool SetFmtAttr( const SfxPoolItem& rAttr );
-    virtual bool SetFmtAttr( const SfxItemSet& rSet );
-    virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
+    virtual bool SetFormatAttr( const SfxPoolItem& rAttr );
+    virtual bool SetFormatAttr( const SfxItemSet& rSet );
+    virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
 
     /** Takes all hints from Delta-Array,
         @return count of deleted hints. */
-    virtual sal_uInt16 ResetAllFmtAttr();
+    virtual sal_uInt16 ResetAllFormatAttr();
 
-    inline SwFmt* DerivedFrom() const { return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); }
+    inline SwFormat* DerivedFrom() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); }
     inline bool IsDefault() const { return DerivedFrom() == 0; }
 
-    inline OUString GetName() const   { return m_aFmtName; }
+    inline OUString GetName() const   { return m_aFormatName; }
     void SetName( const OUString& rNewName, bool bBroadcast=false );
     inline void SetName( const sal_Char* pNewName,
                          bool bBroadcast=false);
@@ -145,8 +145,8 @@ public:
     IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess();
 
     /// Get and set Pool style IDs.
-    sal_uInt16 GetPoolFmtId() const { return m_nPoolFmtId; }
-    void SetPoolFmtId( sal_uInt16 nId ) { m_nPoolFmtId = nId; }
+    sal_uInt16 GetPoolFormatId() const { return m_nPoolFormatId; }
+    void SetPoolFormatId( sal_uInt16 nId ) { m_nPoolFormatId = nId; }
 
     /// Get and set Help-IDs for document templates.
     sal_uInt16 GetPoolHelpId() const { return m_nPoolHelpId; }
@@ -162,9 +162,9 @@ public:
     /// Format-ID for reading/writing:
     void   ResetWritten()    { m_bWritten = false; }
 
-    /// Query / set AutoFmt-flag.
-    bool IsAuto() const                 { return m_bAutoFmt; }
-    void SetAuto( bool bNew = false )   { m_bAutoFmt = bNew; }
+    /// Query / set AutoFormat-flag.
+    bool IsAuto() const                 { return m_bAutoFormat; }
+    void SetAuto( bool bNew = false )   { m_bAutoFormat = bNew; }
 
     bool IsHidden() const                 { return m_bHidden; }
     void SetHidden( bool bValue = false ) { m_bHidden = bValue; }
@@ -172,11 +172,11 @@ public:
     void GetGrabBagItem(com::sun::star::uno::Any& rVal) const;
     void SetGrabBagItem(const com::sun::star::uno::Any& rVal);
 
-    /// Query / set bAutoUpdateFmt-flag.
-    bool IsAutoUpdateFmt() const                { return m_bAutoUpdateFmt; }
-    void SetAutoUpdateFmt( bool bNew = true )   { m_bAutoUpdateFmt = bNew; }
+    /// Query / set bAutoUpdateFormat-flag.
+    bool IsAutoUpdateFormat() const                { return m_bAutoUpdateFormat; }
+    void SetAutoUpdateFormat( bool bNew = true )   { m_bAutoUpdateFormat = bNew; }
 
-    bool IsFmtInDTOR() const { return m_bFmtInDTOR; }
+    bool IsFormatInDTOR() const { return m_bFormatInDTOR; }
 
     /** GetMethods: Bool indicates whether to search only in Set (FALSE)
      or also in Parents.
@@ -227,48 +227,48 @@ public:
     inline const SvxShadowItem   &GetCharShadow( bool = true ) const;
 
     /// Frame-attributes - implemented in frmatr.hxx.
-    inline const SwFmtFillOrder           &GetFillOrder( bool = true ) const;
-    inline const SwFmtFrmSize             &GetFrmSize( bool = true ) const;
-    inline const SwFmtHeader          &GetHeader( bool = true ) const;
-    inline const SwFmtFooter          &GetFooter( bool = true ) const;
-    inline const SwFmtSurround            &GetSurround( bool = true ) const;
-    inline const SwFmtHoriOrient      &GetHoriOrient( bool = true ) const;
-    inline const SwFmtAnchor          &GetAnchor( bool = true ) const;
-    inline const SwFmtCol                 &GetCol( bool = true ) const;
+    inline const SwFormatFillOrder           &GetFillOrder( bool = true ) const;
+    inline const SwFormatFrmSize             &GetFrmSize( bool = true ) const;
+    inline const SwFormatHeader          &GetHeader( bool = true ) const;
+    inline const SwFormatFooter          &GetFooter( bool = true ) const;
+    inline const SwFormatSurround            &GetSurround( bool = true ) const;
+    inline const SwFormatHoriOrient      &GetHoriOrient( bool = true ) const;
+    inline const SwFormatAnchor          &GetAnchor( bool = true ) const;
+    inline const SwFormatCol                 &GetCol( bool = true ) const;
     inline const SvxPaperBinItem      &GetPaperBin( bool = true ) const;
     inline const SvxLRSpaceItem           &GetLRSpace( bool = true ) const;
     inline const SvxULSpaceItem           &GetULSpace( bool = true ) const;
-    inline const SwFmtCntnt           &GetCntnt( bool = true ) const;
+    inline const SwFormatContent           &GetContent( bool = true ) const;
     inline const SvxPrintItem             &GetPrint( bool = true ) const;
     inline const SvxOpaqueItem            &GetOpaque( bool = true ) const;
     inline const SvxProtectItem           &GetProtect( bool = true ) const;
-    inline const SwFmtVertOrient      &GetVertOrient( bool = true ) const;
+    inline const SwFormatVertOrient      &GetVertOrient( bool = true ) const;
     inline const SvxBoxItem               &GetBox( bool = true ) const;
-    inline const SvxFmtKeepItem         &GetKeep( bool = true ) const;
+    inline const SvxFormatKeepItem         &GetKeep( bool = true ) const;
 
     //UUUU Create SvxBrushItem for Background fill (partially for backwards compatibility)
     SvxBrushItem makeBackgroundBrushItem( bool = true ) const;
 
     inline const SvxShadowItem            &GetShadow( bool = true ) const;
-    inline const SwFmtPageDesc            &GetPageDesc( bool = true ) const;
-    inline const SvxFmtBreakItem      &GetBreak( bool = true ) const;
+    inline const SwFormatPageDesc            &GetPageDesc( bool = true ) const;
+    inline const SvxFormatBreakItem      &GetBreak( bool = true ) const;
     inline const SvxMacroItem             &GetMacro( bool = true ) const;
-    inline const SwFmtURL             &GetURL( bool = true ) const;
-    inline const SwFmtEditInReadonly  &GetEditInReadonly( bool = true ) const;
-    inline const SwFmtLayoutSplit     &GetLayoutSplit( bool = true ) const;
-    inline const SwFmtRowSplit          &GetRowSplit( bool = true ) const;
-    inline const SwFmtChain               &GetChain( bool = true ) const;
-    inline const SwFmtLineNumber      &GetLineNumber( bool = true ) const;
-    inline const SwFmtFtnAtTxtEnd     &GetFtnAtTxtEnd( bool = true ) const;
-    inline const SwFmtEndAtTxtEnd     &GetEndAtTxtEnd( bool = true ) const;
-    inline const SwFmtNoBalancedColumns &GetBalancedColumns( bool = true ) const;
+    inline const SwFormatURL             &GetURL( bool = true ) const;
+    inline const SwFormatEditInReadonly  &GetEditInReadonly( bool = true ) const;
+    inline const SwFormatLayoutSplit     &GetLayoutSplit( bool = true ) const;
+    inline const SwFormatRowSplit          &GetRowSplit( bool = true ) const;
+    inline const SwFormatChain               &GetChain( bool = true ) const;
+    inline const SwFormatLineNumber      &GetLineNumber( bool = true ) const;
+    inline const SwFormatFootnoteAtTextEnd     &GetFootnoteAtTextEnd( bool = true ) const;
+    inline const SwFormatEndAtTextEnd     &GetEndAtTextEnd( bool = true ) const;
+    inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const;
     inline const SvxFrameDirectionItem    &GetFrmDir( bool = true ) const;
     inline const SwTextGridItem         &GetTextGrid( bool = true ) const;
     inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const;
     // #i18732#
-    inline const SwFmtFollowTextFlow    &GetFollowTextFlow(bool = true) const;
+    inline const SwFormatFollowTextFlow    &GetFollowTextFlow(bool = true) const;
     // #i28701#
-    inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
+    inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
     inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const;
 
     /// Graphics-attributes - implemented in grfatr.hxx
@@ -288,14 +288,14 @@ public:
     /// Paragraph-attributes - implemented in paratr.hxx.
     inline const SvxLineSpacingItem       &GetLineSpacing( bool = true ) const;
     inline const SvxAdjustItem            &GetAdjust( bool = true ) const;
-    inline const SvxFmtSplitItem      &GetSplit( bool = true ) const;
+    inline const SvxFormatSplitItem      &GetSplit( bool = true ) const;
     inline const SwRegisterItem           &GetRegister( bool = true ) const;
     inline const SwNumRuleItem            &GetNumRule( bool = true ) const;
     inline const SvxWidowsItem            &GetWidows( bool = true ) const;
     inline const SvxOrphansItem           &GetOrphans( bool = true ) const;
     inline const SvxTabStopItem           &GetTabStops( bool = true ) const;
     inline const SvxHyphenZoneItem        &GetHyphenZone( bool = true ) const;
-    inline const SwFmtDrop                &GetDrop( bool = true ) const;
+    inline const SwFormatDrop                &GetDrop( bool = true ) const;
     inline const SvxScriptSpaceItem       &GetScriptSpace(bool = true) const;
     inline const SvxHangingPunctuationItem &GetHangingPunctuation(bool = true) const;
     inline const SvxForbiddenRuleItem     &GetForbiddenRule(bool = true) const;
@@ -304,11 +304,11 @@ public:
     inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const;
 
     /// TableBox attributes - implemented in cellatr.hxx.
-    inline  const SwTblBoxNumFormat     &GetTblBoxNumFmt( bool = true ) const;
-    inline  const SwTblBoxFormula       &GetTblBoxFormula( bool = true ) const;
-    inline  const SwTblBoxValue         &GetTblBoxValue( bool = true ) const;
+    inline  const SwTableBoxNumFormat     &GetTableBoxNumFormat( bool = true ) const;
+    inline  const SwTableBoxFormula       &GetTableBoxFormula( bool = true ) const;
+    inline  const SwTableBoxValue         &GetTableBoxValue( bool = true ) const;
 
-    /** SwFmt::IsBackgroundTransparent
+    /** SwFormat::IsBackgroundTransparent
 
         Virtual method to determine, if background of format is transparent.
         Default implementation returns false. Thus, subclasses have to override
@@ -325,7 +325,7 @@ public:
     virtual bool supportsFullDrawingLayerFillAttributeSet() const;
 };
 
-inline void SwFmt::SetName( const sal_Char* pNewName,
+inline void SwFormat::SetName( const sal_Char* pNewName,
                              bool bBroadcast )
 {
     SetName(OUString::createFromAscii(pNewName), bBroadcast);
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index 4a68855a734b..4685e24ddbd1 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.hxx
@@ -53,14 +53,14 @@ inline const SvxProtectItem &SwAttrSet::GetProtect(bool bInP) const
     { return static_cast<const SvxProtectItem&>(Get( RES_PROTECT,bInP)); }
 inline const SvxBoxItem &SwAttrSet::GetBox(bool bInP) const
     { return static_cast<const SvxBoxItem&>(Get( RES_BOX,bInP)); }
-inline const SvxFmtKeepItem &SwAttrSet::GetKeep(bool bInP) const
-    { return static_cast<const SvxFmtKeepItem&>(Get( RES_KEEP,bInP)); }
+inline const SvxFormatKeepItem &SwAttrSet::GetKeep(bool bInP) const
+    { return static_cast<const SvxFormatKeepItem&>(Get( RES_KEEP,bInP)); }
 inline const SvxBrushItem &SwAttrSet::GetBackground(bool bInP) const
     { return static_cast<const SvxBrushItem&>(Get( RES_BACKGROUND,bInP)); }
 inline const SvxShadowItem &SwAttrSet::GetShadow(bool bInP) const
     { return static_cast<const SvxShadowItem&>(Get( RES_SHADOW,bInP)); }
-inline const SvxFmtBreakItem &SwAttrSet::GetBreak(bool bInP) const
-    { return static_cast<const SvxFmtBreakItem&>(Get( RES_BREAK,bInP)); }
+inline const SvxFormatBreakItem &SwAttrSet::GetBreak(bool bInP) const
+    { return static_cast<const SvxFormatBreakItem&>(Get( RES_BREAK,bInP)); }
 inline const SvxMacroItem &SwAttrSet::GetMacro(bool bInP) const
     { return static_cast<const SvxMacroItem&>(Get( RES_FRMMACRO,bInP)); }
 inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const
@@ -68,32 +68,32 @@ inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const
 inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) const
     { return static_cast<const SdrTextVertAdjustItem&>(Get( RES_TEXT_VERT_ADJUST,bInP)); }
 
-// Implementation of FrameAttribute methods of SwFmt.
-inline const SvxPaperBinItem &SwFmt::GetPaperBin(bool bInP) const
+// Implementation of FrameAttribute methods of SwFormat.
+inline const SvxPaperBinItem &SwFormat::GetPaperBin(bool bInP) const
     { return m_aSet.GetPaperBin(bInP); }
-inline const SvxLRSpaceItem &SwFmt::GetLRSpace(bool bInP) const
+inline const SvxLRSpaceItem &SwFormat::GetLRSpace(bool bInP) const
     { return m_aSet.GetLRSpace(bInP); }
-inline const SvxULSpaceItem &SwFmt::GetULSpace(bool bInP) const
+inline const SvxULSpaceItem &SwFormat::GetULSpace(bool bInP) const
     { return m_aSet.GetULSpace(bInP); }
-inline const SvxPrintItem &SwFmt::GetPrint(bool bInP) const
+inline const SvxPrintItem &SwFormat::GetPrint(bool bInP) const
     { return m_aSet.GetPrint(bInP); }
-inline const SvxOpaqueItem &SwFmt::GetOpaque(bool bInP) const
+inline const SvxOpaqueItem &SwFormat::GetOpaque(bool bInP) const
     { return m_aSet.GetOpaque(bInP); }
-inline const SvxProtectItem &SwFmt::GetProtect(bool bInP) const
+inline const SvxProtectItem &SwFormat::GetProtect(bool bInP) const
     { return m_aSet.GetProtect(bInP); }
-inline const SvxBoxItem &SwFmt::GetBox(bool bInP) const
+inline const SvxBoxItem &SwFormat::GetBox(bool bInP) const
     { return m_aSet.GetBox(bInP); }
-inline const SvxFmtKeepItem &SwFmt::GetKeep(bool bInP) const
+inline const SvxFormatKeepItem &SwFormat::GetKeep(bool bInP) const
     { return m_aSet.GetKeep(bInP); }
-inline const SvxShadowItem &SwFmt::GetShadow(bool bInP) const
+inline const SvxShadowItem &SwFormat::GetShadow(bool bInP) const
     { return m_aSet.GetShadow(bInP); }
-inline const SvxFmtBreakItem &SwFmt::GetBreak(bool bInP) const
+inline const SvxFormatBreakItem &SwFormat::GetBreak(bool bInP) const
     { return m_aSet.GetBreak(bInP); }
-inline const SvxMacroItem &SwFmt::GetMacro(bool bInP) const
+inline const SvxMacroItem &SwFormat::GetMacro(bool bInP) const
     { return m_aSet.GetMacro(bInP); }
-inline const SvxFrameDirectionItem  &SwFmt::GetFrmDir(bool bInP) const
+inline const SvxFrameDirectionItem  &SwFormat::GetFrmDir(bool bInP) const
     { return m_aSet.GetFrmDir(bInP); }
-inline const SdrTextVertAdjustItem &SwFmt::GetTextVertAdjust(bool bInP) const
+inline const SdrTextVertAdjustItem &SwFormat::GetTextVertAdjust(bool bInP) const
     { return m_aSet.GetTextVertAdjust(bInP); }
 
 #endif // INCLUDED_SW_INC_FRMATR_HXX
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 33a16b2019c8..2b88accce81f 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -36,7 +36,7 @@ class SdrObject;
 namespace sw { class DocumentLayoutManager; }
 
 /// Style of a layout element.
-class SW_DLLPUBLIC SwFrmFmt: public SwFmt
+class SW_DLLPUBLIC SwFrameFormat: public SwFormat
 {
     friend class SwDoc;
     friend class SwPageDesc;    ///< Is allowed to call protected CTor.
@@ -49,25 +49,25 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr  maFillAttributes;
 
 protected:
-    SwFrmFmt(
+    SwFrameFormat(
         SwAttrPool& rPool,
-        const sal_Char* pFmtNm,
-        SwFrmFmt *pDrvdFrm,
-        sal_uInt16 nFmtWhich = RES_FRMFMT,
+        const sal_Char* pFormatNm,
+        SwFrameFormat *pDrvdFrm,
+        sal_uInt16 nFormatWhich = RES_FRMFMT,
         const sal_uInt16* pWhichRange = 0);
 
-    SwFrmFmt(
+    SwFrameFormat(
         SwAttrPool& rPool,
-        const OUString &rFmtNm,
-        SwFrmFmt *pDrvdFrm,
-        sal_uInt16 nFmtWhich = RES_FRMFMT,
+        const OUString &rFormatNm,
+        SwFrameFormat *pDrvdFrm,
+        sal_uInt16 nFormatWhich = RES_FRMFMT,
         const sal_uInt16* pWhichRange = 0);
 
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
 
 public:
     TYPEINFO_OVERRIDE();     ///< Already in base class Client.
-    virtual ~SwFrmFmt();
+    virtual ~SwFrameFormat();
 
     /// Destroys all Frms in aDepend (Frms are identified via PTR_CAST).
     virtual void DelFrms();
@@ -95,21 +95,21 @@ public:
        The UserCall knows its SdrObject. */
           SwContact *FindContactObj();
     const SwContact *FindContactObj() const
-        { return const_cast<SwFrmFmt*>(this)->FindContactObj(); }
+        { return const_cast<SwFrameFormat*>(this)->FindContactObj(); }
 
     /** @return the SdrObject, that is connected to the ContactObject.
-       Only DrawFrmFmts are connected to the "real SdrObject". FlyFrmFmts
+       Only DrawFrameFormats are connected to the "real SdrObject". FlyFrameFormats
        are connected to a Master and all FlyFrms has the "real SdrObject".
        "Real SdrObject" has position and a Z-order. */
           SdrObject *FindSdrObject();
     const SdrObject *FindSdrObject() const
-        { return const_cast<SwFrmFmt*>(this)->FindSdrObject(); }
+        { return const_cast<SwFrameFormat*>(this)->FindSdrObject(); }
 
           SdrObject *FindRealSdrObject();
     const SdrObject *FindRealSdrObject() const
-        { return const_cast<SwFrmFmt*>(this)->FindRealSdrObject(); }
+        { return const_cast<SwFrameFormat*>(this)->FindRealSdrObject(); }
 
-    bool IsLowerOf( const SwFrmFmt& rFmt ) const;
+    bool IsLowerOf( const SwFrameFormat& rFormat ) const;
 
     enum tLayoutDir
     {
@@ -119,8 +119,8 @@ public:
         VERT_L2R    ///< Not supported yet.
     };
 
-    virtual SwFrmFmt::tLayoutDir GetLayoutDir() const;
-    virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir );
+    virtual SwFrameFormat::tLayoutDir GetLayoutDir() const;
+    virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir );
 
     virtual sal_Int16 GetPositionLayoutDir() const;
     virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir );
@@ -134,8 +134,8 @@ public:
                     ::com::sun::star::uno::XInterface> const& xObject)
             { m_wXObject = xObject; }
 
-    DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrmFmt)
-    void RegisterToFormat( SwFmt& rFmt );
+    DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrameFormat)
+    void RegisterToFormat( SwFormat& rFormat );
 
     //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
@@ -146,7 +146,7 @@ public:
 
 // The FlyFrame-Format
 
-class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
+class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat
 {
     friend class SwDoc;
     OUString msTitle;
@@ -158,22 +158,22 @@ class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
        when they get borders (this is done in SwWrtShell::CalcAndGetScale) */
     Point   m_aLastFlyFrmPrtRectPos;
 
-    SwFlyFrmFmt( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
-    SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
+    SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
+    SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
 
 protected:
-    SwFlyFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FLYFRMFMT )
+    SwFlyFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FLYFRMFMT )
     {}
-    SwFlyFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FLYFRMFMT )
+    SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FLYFRMFMT )
     {}
 
 public:
     TYPEINFO_OVERRIDE();
-    virtual ~SwFlyFrmFmt();
+    virtual ~SwFlyFrameFormat();
 
     /// Creates the views.
     virtual void MakeFrms() SAL_OVERRIDE;
@@ -193,7 +193,7 @@ public:
     OUString GetObjDescription() const;
     void SetObjDescription( const OUString& rDescription, bool bBroadcast = false );
 
-    /** SwFlyFrmFmt::IsBackgroundTransparent
+    /** SwFlyFrameFormat::IsBackgroundTransparent
 
         Override virtual method and its default implementation,
         because format of fly frame provides transparent backgrounds.
@@ -206,7 +206,7 @@ public:
     */
     virtual bool IsBackgroundTransparent() const SAL_OVERRIDE;
 
-    /** SwFlyFrmFmt::IsBackgroundBrushInherited
+    /** SwFlyFrameFormat::IsBackgroundBrushInherited
 
         Method to determine, if the brush for drawing the
         background is "inherited" from its parent/grandparent.
@@ -222,45 +222,45 @@ public:
     const Point & GetLastFlyFrmPrtRectPos() const       { return m_aLastFlyFrmPrtRectPos; }
     void SetLastFlyFrmPrtRectPos( const Point &rPoint ) { m_aLastFlyFrmPrtRectPos = rPoint; }
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrmFmt)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrameFormat)
 };
 
 //The DrawFrame-Format
 
-class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt
+class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat
 {
     friend class SwDoc;
 
     mutable const SdrObject * pSdrObjCached;
     mutable OUString sSdrObjCachedComment;
 
-    SwDrawFrmFmt( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
-    SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
+    SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
+    SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
 
-    SwFrmFmt::tLayoutDir meLayoutDir;
+    SwFrameFormat::tLayoutDir meLayoutDir;
 
     sal_Int16 mnPositionLayoutDir;
 
     bool mbPosAttrSet;
 
 protected:
-    SwDrawFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
+    SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
           pSdrObjCached(NULL),
 
-          meLayoutDir( SwFrmFmt::HORI_L2R ),
+          meLayoutDir( SwFrameFormat::HORI_L2R ),
 
           mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
 
           mbPosAttrSet( false )
 
     {}
-    SwDrawFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
+    SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
           pSdrObjCached(NULL),
-          meLayoutDir( SwFrmFmt::HORI_L2R ),
+          meLayoutDir( SwFrameFormat::HORI_L2R ),
 
           mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
 
@@ -269,7 +269,7 @@ protected:
 
 public:
     TYPEINFO_OVERRIDE();
-    virtual ~SwDrawFrmFmt();
+    virtual ~SwDrawFrameFormat();
 
     /** DrawObjects are removed from the arrays at the layout.
      The DrawObjects are marked as deleted. */
@@ -281,8 +281,8 @@ public:
 
     virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE;
 
-    virtual SwFrmFmt::tLayoutDir GetLayoutDir() const SAL_OVERRIDE;
-    virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ) SAL_OVERRIDE;
+    virtual SwFrameFormat::tLayoutDir GetLayoutDir() const SAL_OVERRIDE;
+    virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir ) SAL_OVERRIDE;
 
     virtual sal_Int16 GetPositionLayoutDir() const SAL_OVERRIDE;
     virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) SAL_OVERRIDE;
@@ -297,10 +297,10 @@ public:
 
     virtual OUString GetDescription() const SAL_OVERRIDE;
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt);
+    DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrameFormat);
 };
 
-SW_DLLPUBLIC bool IsFlyFrmFmtInHeader(const SwFrmFmt& rFmt);
+SW_DLLPUBLIC bool IsFlyFrameFormatInHeader(const SwFrameFormat& rFormat);
 
 #endif
 
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index ee695e18ff06..b79a57e72980 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -23,44 +23,44 @@
 #include <sal/types.h>
 #include <o3tl/sorted_vector.hxx>
 
-class SwTxtFtn;
+class SwTextFootnote;
 class SwNodeIndex;
 class SwSectionNode;
 
 // Everywhere where NodeIndex is used, the header files missing here
 // are already included. Therefore put here as defines only and
 // not as inline methods (saves compile time).
-#define _SwTxtFtn_GetIndex( pFIdx ) (pFIdx->GetTxtNode().GetIndex())
+#define _SwTextFootnote_GetIndex( pFIdx ) (pFIdx->GetTextNode().GetIndex())
 
-struct CompareSwFtnIdxs
+struct CompareSwFootnoteIdxs
 {
-    bool operator()(SwTxtFtn* const& lhs, SwTxtFtn* const& rhs) const;
+    bool operator()(SwTextFootnote* const& lhs, SwTextFootnote* const& rhs) const;
 };
 
-class SwFtnIdxs : public o3tl::sorted_vector<SwTxtFtn*, CompareSwFtnIdxs>
+class SwFootnoteIdxs : public o3tl::sorted_vector<SwTextFootnote*, CompareSwFootnoteIdxs>
 {
 public:
-    SwFtnIdxs() {}
+    SwFootnoteIdxs() {}
 
-    void UpdateFtn( const SwNodeIndex& rStt ); // Update all from pos.
-    void UpdateAllFtn();                       // Update all footnotes.
+    void UpdateFootnote( const SwNodeIndex& rStt ); // Update all from pos.
+    void UpdateAllFootnote();                       // Update all footnotes.
 
-    SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = 0 ) const;
+    SwTextFootnote* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = 0 ) const;
 };
 
-class SwUpdFtnEndNtAtEnd
+class SwUpdFootnoteEndNtAtEnd
 {
-    std::vector<const SwSectionNode*> aFtnSects, aEndSects;
-    std::vector<sal_uInt16> aFtnNums, aEndNums;
+    std::vector<const SwSectionNode*> aFootnoteSects, aEndSects;
+    std::vector<sal_uInt16> aFootnoteNums, aEndNums;
 
 public:
-    SwUpdFtnEndNtAtEnd() : aFtnSects(), aEndSects() {}
+    SwUpdFootnoteEndNtAtEnd() : aFootnoteSects(), aEndSects() {}
 
     static const SwSectionNode* FindSectNdWithEndAttr(
-                                            const SwTxtFtn& rTxtFtn );
+                                            const SwTextFootnote& rTextFootnote );
 
-    sal_uInt16 GetNumber( const SwTxtFtn& rTxtFtn, const SwSectionNode& rNd );
-    sal_uInt16 ChkNumber( const SwTxtFtn& rTxtFtn );
+    sal_uInt16 GetNumber( const SwTextFootnote& rTextFootnote, const SwSectionNode& rNd );
+    sal_uInt16 ChkNumber( const SwTextFootnote& rTextFootnote );
 };
 
 #endif // INCLUDED_SW_INC_FTNIDX_HXX
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index 2b250287892b..fc5a4e5f0bb7 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -25,15 +25,15 @@
 #include <editeng/numitem.hxx>
 #include <fmtcol.hxx>
 
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwPageDesc;
-class SwCharFmt;
+class SwCharFormat;
 class SwDoc;
 
 class SW_DLLPUBLIC SwEndNoteInfo : public SwClient
 {
     SwDepend    aPageDescDep;
-    SwDepend    aCharFmtDep, aAnchorCharFmtDep;
+    SwDepend    aCharFormatDep, aAnchorCharFormatDep;
     OUString sPrefix;
     OUString sSuffix;
 protected:
@@ -41,29 +41,29 @@ protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
 
 public:
-    SvxNumberType aFmt;
-    sal_uInt16    nFtnOffset;
+    SvxNumberType aFormat;
+    sal_uInt16    nFootnoteOffset;
 
     void        ChgPageDesc( SwPageDesc *pDesc );
     SwPageDesc* GetPageDesc( SwDoc &rDoc ) const;
     bool        KnowsPageDesc() const;
     bool        DependsOn( const SwPageDesc* ) const;
 
-    void SetFtnTxtColl(SwTxtFmtColl& rColl);
-    SwTxtFmtColl* GetFtnTxtColl() const { return const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(GetRegisteredIn())); } // can be 0.
+    void SetFootnoteTextColl(SwTextFormatColl& rColl);
+    SwTextFormatColl* GetFootnoteTextColl() const { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); } // can be 0.
 
-    SwCharFmt* GetCharFmt(SwDoc &rDoc) const;
-    void SetCharFmt( SwCharFmt* );
-    SwClient   *GetCharFmtDep() const { return (SwClient*)&aCharFmtDep; }
+    SwCharFormat* GetCharFormat(SwDoc &rDoc) const;
+    void SetCharFormat( SwCharFormat* );
+    SwClient   *GetCharFormatDep() const { return (SwClient*)&aCharFormatDep; }
 
-    SwCharFmt* GetAnchorCharFmt(SwDoc &rDoc) const;
-    void SetAnchorCharFmt( SwCharFmt* );
-    SwClient   *GetAnchorCharFmtDep() const { return (SwClient*)&aAnchorCharFmtDep; }
+    SwCharFormat* GetAnchorCharFormat(SwDoc &rDoc) const;
+    void SetAnchorCharFormat( SwCharFormat* );
+    SwClient   *GetAnchorCharFormatDep() const { return (SwClient*)&aAnchorCharFormatDep; }
 
     SwEndNoteInfo & operator=(const SwEndNoteInfo&);
     bool operator==( const SwEndNoteInfo &rInf ) const;
 
-    SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0);
+    SwEndNoteInfo( SwTextFormatColl *pTextColl = 0);
     SwEndNoteInfo(const SwEndNoteInfo&);
 
     const OUString& GetPrefix() const  { return sPrefix; }
@@ -74,34 +74,34 @@ public:
     void ReleaseCollection() { if ( GetRegisteredInNonConst() ) GetRegisteredInNonConst()->Remove( this ); }
 };
 
-enum SwFtnPos
+enum SwFootnotePos
 {
     // Momentarily only PAGE and CHAPTER. CHAPTER == document-endnotes.
     FTNPOS_PAGE = 1,
     FTNPOS_CHAPTER = 8
 };
 
-enum SwFtnNum
+enum SwFootnoteNum
 {
     FTNNUM_PAGE, FTNNUM_CHAPTER, FTNNUM_DOC
 };
 
-class SW_DLLPUBLIC SwFtnInfo: public SwEndNoteInfo
+class SW_DLLPUBLIC SwFootnoteInfo: public SwEndNoteInfo
 {
     using SwEndNoteInfo::operator ==;
 
 public:
     OUString  aQuoVadis;
     OUString  aErgoSum;
-    SwFtnPos  ePos;
-    SwFtnNum  eNum;
+    SwFootnotePos  ePos;
+    SwFootnoteNum  eNum;
 
-    SwFtnInfo& operator=(const SwFtnInfo&);
+    SwFootnoteInfo& operator=(const SwFootnoteInfo&);
 
-    bool operator==( const SwFtnInfo &rInf ) const;
+    bool operator==( const SwFootnoteInfo &rInf ) const;
 
-    SwFtnInfo(SwTxtFmtColl* pTxtColl = 0);
-    SwFtnInfo(const SwFtnInfo&);
+    SwFootnoteInfo(SwTextFormatColl* pTextColl = 0);
+    SwFootnoteInfo(const SwFootnoteInfo&);
 };
 
 #endif
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 2f09cb190435..3b7fed9b6df6 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -314,30 +314,30 @@ inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(bool bInP) const
 inline const SwDrawModeGrf      &SwAttrSet::GetDrawModeGrf(bool bInP) const
     { return static_cast<const SwDrawModeGrf&>(Get( RES_GRFATR_DRAWMODE,bInP)); }
 
-// Implementation of graphics attributes methods of SwFmt
-inline const SwMirrorGrf &SwFmt::GetMirrorGrf(bool bInP) const
+// Implementation of graphics attributes methods of SwFormat
+inline const SwMirrorGrf &SwFormat::GetMirrorGrf(bool bInP) const
     { return m_aSet.GetMirrorGrf(bInP); }
-inline const SwCropGrf   &SwFmt::GetCropGrf(bool bInP) const
+inline const SwCropGrf   &SwFormat::GetCropGrf(bool bInP) const
     { return m_aSet.GetCropGrf(bInP); }
-inline const SwRotationGrf &SwFmt::GetRotationGrf(bool bInP) const
+inline const SwRotationGrf &SwFormat::GetRotationGrf(bool bInP) const
     { return m_aSet.GetRotationGrf(bInP); }
-inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(bool bInP) const
+inline const SwLuminanceGrf &SwFormat::GetLuminanceGrf(bool bInP) const
     { return m_aSet.GetLuminanceGrf( bInP); }
-inline const SwContrastGrf &SwFmt::GetContrastGrf(bool bInP) const
+inline const SwContrastGrf &SwFormat::GetContrastGrf(bool bInP) const
     { return m_aSet.GetContrastGrf( bInP); }
-inline const SwChannelRGrf &SwFmt::GetChannelRGrf(bool bInP) const
+inline const SwChannelRGrf &SwFormat::GetChannelRGrf(bool bInP) const
     { return m_aSet.GetChannelRGrf( bInP); }
-inline const SwChannelGGrf &SwFmt::GetChannelGGrf(bool bInP) const
+inline const SwChannelGGrf &SwFormat::GetChannelGGrf(bool bInP) const
     { return m_aSet.GetChannelGGrf( bInP); }
-inline const SwChannelBGrf &SwFmt::GetChannelBGrf(bool bInP) const
+inline const SwChannelBGrf &SwFormat::GetChannelBGrf(bool bInP) const
     { return m_aSet.GetChannelBGrf( bInP); }
-inline const SwGammaGrf &SwFmt::GetGammaGrf(bool bInP) const
+inline const SwGammaGrf &SwFormat::GetGammaGrf(bool bInP) const
     { return m_aSet.GetGammaGrf( bInP); }
-inline const SwInvertGrf &SwFmt::GetInvertGrf(bool bInP) const
+inline const SwInvertGrf &SwFormat::GetInvertGrf(bool bInP) const
     { return m_aSet.GetInvertGrf( bInP); }
-inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(bool bInP) const
+inline const SwTransparencyGrf &SwFormat::GetTransparencyGrf(bool bInP) const
     { return m_aSet.GetTransparencyGrf( bInP); }
-inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(bool bInP) const
+inline const SwDrawModeGrf &SwFormat::GetDrawModeGrf(bool bInP) const
     { return m_aSet.GetDrawModeGrf(bInP); }
 
 #endif // INCLUDED_SW_INC_GRFATR_HXX
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index fe1a417d6d95..f648b84083b9 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -43,7 +43,7 @@ public:
 inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const
     { return static_cast<const SwHeaderAndFooterEatSpacingItem&>(Get( RES_HEADER_FOOTER_EAT_SPACING,bInP)); }
 
-inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(bool bInP) const
+inline const SwHeaderAndFooterEatSpacingItem &SwFormat::GetHeaderAndFooterEatSpacing(bool bInP) const
     { return m_aSet.GetHeaderAndFooterEatSpacing(bInP); }
 
 #endif
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 43c1e326f53c..61c8c437558f 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion
     sal_uInt16      m_nPageStart;     ///< first checked page
 
     bool        m_bIsDrawObj;
-    bool        m_bIsOtherCntnt;
+    bool        m_bIsOtherContent;
     bool        m_bStartChk;
     bool        m_bIsSelection;       ///< true if only the selected text should be converted
     bool        m_bStartDone;
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index f98b10389497..93af3fba2a0e 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -24,7 +24,7 @@
 #include <svx/xdef.hxx>
 #include "swdllapi.h"
 
-// For SwTxtHints without end index the following char is added:
+// For SwTextHints without end index the following char is added:
 
 #define CH_TXTATR_BREAKWORD     ((sal_Unicode)0x01)
 #define CH_TXTATR_INWORD        ((sal_Unicode)0xFFF9)
@@ -109,7 +109,7 @@ RES_TXTATR_BEGIN = RES_CHRATR_END,
 
 /** text attributes with start and end.
    #i105453#:
-   Hints (SwTxtAttr) with the same start and end position are sorted by
+   Hints (SwTextAttr) with the same start and end position are sorted by
    WhichId, i.e., the TXTATR constants defined here.
    The text formatting (SwAttrIter) poses some requirements on TXTATR order:
    - AUTOFMT must precede CHARFMT, so that auto style can overwrite char style.
@@ -118,7 +118,7 @@ RES_TXTATR_BEGIN = RES_CHRATR_END,
       hints on insertion, but on exporting to ODF. if CHARFMT would precede
       INETFMT, then exporting and importing will effectively change precedence)
 
-   Nesting hints (SwTxtAttrNesting) also have requirements on TXTATR order,
+   Nesting hints (SwTextAttrNesting) also have requirements on TXTATR order,
    to ensure proper nesting (because CJK_RUBY and INETFMT have no CH_TXTATR):
    - INETFMT should precede CJK_RUBY (for UNO API it does not matter...)
    - META and METAFIELD must precede CJK_RUBY and INETFMT
@@ -438,35 +438,35 @@ SW_DLLPUBLIC sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript
 // This function returns
 //      CH_TXTATR_BREAKWORD for Textattribute which breaks a word (default)
 //      CH_TXTATR_INWORD    for Textattribute which dont breaks a word
-class SwTxtAttr;
-sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr );
+class SwTextAttr;
+sal_Unicode GetCharOfTextAttr( const SwTextAttr& rAttr );
 
 // all Sets defined in init.cxx
 
 // AttrSet-Range for the 3 Break-Attribute
 extern sal_uInt16 aBreakSetRange[];
-// AttrSet-Range for TxtFmtColl
-extern sal_uInt16 aTxtFmtCollSetRange[];
-// AttrSet-Range for GrfFmtColl
-extern sal_uInt16 aGrfFmtCollSetRange[];
+// AttrSet-Range for TextFormatColl
+extern sal_uInt16 aTextFormatCollSetRange[];
+// AttrSet-Range for GrfFormatColl
+extern sal_uInt16 aGrfFormatCollSetRange[];
 // AttrSet-Range for TextNode
-SW_DLLPUBLIC extern sal_uInt16 aTxtNodeSetRange[];
-// AttrSet-Range for NoTxtNode
-extern sal_uInt16 aNoTxtNodeSetRange[];
+SW_DLLPUBLIC extern sal_uInt16 aTextNodeSetRange[];
+// AttrSet-Range for NoTextNode
+extern sal_uInt16 aNoTextNodeSetRange[];
 // AttrSet-Range for SwTable
 extern sal_uInt16 aTableSetRange[];
 // AttrSet-Range for SwTableLine
 extern sal_uInt16 aTableLineSetRange[];
 // AttrSet-Range for SwTableBox
 extern sal_uInt16 aTableBoxSetRange[];
-// AttrSet-Range for SwFrmFmt
-SW_DLLPUBLIC extern sal_uInt16 aFrmFmtSetRange[];
-// AttrSet-Range for SwCharFmt
-extern sal_uInt16 aCharFmtSetRange[];
+// AttrSet-Range for SwFrameFormat
+SW_DLLPUBLIC extern sal_uInt16 aFrameFormatSetRange[];
+// AttrSet-Range for SwCharFormat
+extern sal_uInt16 aCharFormatSetRange[];
 // AttrSet-Range for the autostyles
-extern sal_uInt16 aCharAutoFmtSetRange[];
-// AttrSet-Range for SwPageDescFmt
-extern sal_uInt16 aPgFrmFmtSetRange[];
+extern sal_uInt16 aCharAutoFormatSetRange[];
+// AttrSet-Range for SwPageDescFormat
+extern sal_uInt16 aPgFrameFormatSetRange[];
 
 // check if ID is InRange of AttrSet-Ids
 bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId );
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 92a5744bbb7f..5920b042f270 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -23,15 +23,15 @@
 #include <vcl/vclptr.hxx>
 #include <vector>
 
-class SwFmt;
+class SwFormat;
 class OutputDevice;
 class SwTable;
 class SwNode;
 class SwNodes;
-class SwCntntNode;
+class SwContentNode;
 class SwPageFrm;
 class SwFrm;
-class SwTxtNode;
+class SwTextNode;
 class SwHistory;
 
 // Base class for all Message-Hints:
@@ -59,23 +59,23 @@ public:
 };
 
 /*
- * SwFmtChg is sent when a format has changed to another format. 2 Hints are always sent
+ * SwFormatChg is sent when a format has changed to another format. 2 Hints are always sent
  * the old and the new format
  */
-class SwFmtChg: public SwMsgPoolItem
+class SwFormatChg: public SwMsgPoolItem
 {
 public:
-    SwFmt *pChangedFmt;
-    SwFmtChg( SwFmt *pFmt );
+    SwFormat *pChangedFormat;
+    SwFormatChg( SwFormat *pFormat );
 };
 
-class SwInsTxt: public SwMsgPoolItem
+class SwInsText: public SwMsgPoolItem
 {
 public:
     sal_Int32 nPos;
     sal_Int32 nLen;
 
-    SwInsTxt( sal_Int32 nP, sal_Int32 nL );
+    SwInsText( sal_Int32 nP, sal_Int32 nL );
 };
 
 class SwDelChr: public SwMsgPoolItem
@@ -86,13 +86,13 @@ public:
     SwDelChr( sal_Int32 nP );
 };
 
-class SwDelTxt: public SwMsgPoolItem
+class SwDelText: public SwMsgPoolItem
 {
 public:
     sal_Int32 nStart;
     sal_Int32 nLen;
 
-    SwDelTxt( sal_Int32 nS, sal_Int32 nL );
+    SwDelText( sal_Int32 nS, sal_Int32 nL );
 };
 
 class SwUpdateAttr : public SwMsgPoolItem
@@ -101,7 +101,7 @@ private:
     sal_Int32 nStart;
     sal_Int32 nEnd;
     sal_uInt16 nWhichAttr;
-    std::vector<sal_uInt16> aWhichFmtAttr; // attributes changed inside RES_TXTATR_AUTOFMT
+    std::vector<sal_uInt16> aWhichFormatAttr; // attributes changed inside RES_TXTATR_AUTOFMT
 
 public:
     SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW );
@@ -121,16 +121,16 @@ public:
         return nWhichAttr;
     }
 
-    const std::vector<sal_uInt16>& getFmtAttr() const
+    const std::vector<sal_uInt16>& getFormatAttr() const
     {
-        return aWhichFmtAttr;
+        return aWhichFormatAttr;
     }
 };
 
-/** SwRefMarkFldUpdate is sent when the referencemarks should be updated.
+/** SwRefMarkFieldUpdate is sent when the referencemarks should be updated.
      To determine Page- / chapternumbers the current frame has to be asked.
       For this we need the current outputdevice */
-class SwRefMarkFldUpdate : public SwMsgPoolItem
+class SwRefMarkFieldUpdate : public SwMsgPoolItem
 {
 public:
     VclPtr<OutputDevice> pOut; ///< pointer to the current output device
@@ -139,7 +139,7 @@ public:
         To get the page/chapter number, the frame has to be asked. For that we need
         the current OutputDevice.
     */
-    SwRefMarkFldUpdate( OutputDevice* );
+    SwRefMarkFieldUpdate( OutputDevice* );
 };
 
 /** SwDocPosUpdate is sent to signal that only the frames from or to a specified document-global position
@@ -151,39 +151,39 @@ public:
     SwDocPosUpdate( const long nDocPos );
 };
 
-/// SwTableFmlUpdate is sent when the table has to be newly calculated or when a table itself is merged or splitted
-enum TableFmlUpdtFlags { TBL_CALC = 0,
+/// SwTableFormulaUpdate is sent when the table has to be newly calculated or when a table itself is merged or splitted
+enum TableFormulaUpdateFlags { TBL_CALC = 0,
                          TBL_BOXNAME,
                          TBL_BOXPTR,
                          TBL_RELBOXNAME,
                          TBL_MERGETBL,
                          TBL_SPLITTBL
                        };
-class SwTableFmlUpdate : public SwMsgPoolItem
+class SwTableFormulaUpdate : public SwMsgPoolItem
 {
 public:
-    const SwTable* pTbl;         ///< Pointer to the current table
+    const SwTable* pTable;         ///< Pointer to the current table
     union {
-        const SwTable* pDelTbl;  ///< Merge: Pointer to the table to be removed
-        const OUString* pNewTblNm; ///< Split: the name of the new table
+        const SwTable* pDelTable;  ///< Merge: Pointer to the table to be removed
+        const OUString* pNewTableNm; ///< Split: the name of the new table
     } DATA;
     SwHistory* pHistory;
     sal_uInt16 nSplitLine;       ///< Split: from this BaseLine on will be splitted
-    TableFmlUpdtFlags eFlags;
+    TableFormulaUpdateFlags eFlags;
     bool bModified : 1;
     bool bBehindSplitLine : 1;
 
     /** Is sent if a table should be recalculated */
-    SwTableFmlUpdate( const SwTable* );
+    SwTableFormulaUpdate( const SwTable* );
 };
 
-class SwAutoFmtGetDocNode: public SwMsgPoolItem
+class SwAutoFormatGetDocNode: public SwMsgPoolItem
 {
 public:
-    const SwCntntNode* pCntntNode;
+    const SwContentNode* pContentNode;
     const SwNodes* pNodes;
 
-    SwAutoFmtGetDocNode( const SwNodes* pNds );
+    SwAutoFormatGetDocNode( const SwNodes* pNds );
 };
 
 /*
@@ -219,8 +219,8 @@ public:
 class SwCondCollCondChg: public SwMsgPoolItem
 {
 public:
-    SwFmt *pChangedFmt;
-    SwCondCollCondChg( SwFmt *pFmt );
+    SwFormat *pChangedFormat;
+    SwCondCollCondChg( SwFormat *pFormat );
 };
 
 class SwVirtPageNumInfo: public SwMsgPoolItem
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 27cb7bc2e94e..928ae53023d6 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -30,7 +30,7 @@ class SwTableBox;
 class SwTable;
 class SwHTMLTableLayout;
 class SwDoc;
-class SwFrmFmt;
+class SwFrameFormat;
 
 #define HTMLTABLE_RESIZE_NOW (ULONG_MAX)
 
@@ -239,7 +239,7 @@ class SwHTMLTableLayout
     void SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol, sal_uInt16 nColSpan ) const;
 
     const SwStartNode *GetAnyBoxStartNode() const;
-    SwFrmFmt *FindFlyFrmFmt() const;
+    SwFrameFormat *FindFlyFrameFormat() const;
     const SwDoc *GetDoc() const { return GetAnyBoxStartNode()->GetDoc(); }
 
     void ClearPass1Info() { nMin = nMax = 0; }
@@ -251,7 +251,7 @@ class SwHTMLTableLayout
     static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc );
 public:
 
-    SwHTMLTableLayout( const SwTable *pSwTbl,
+    SwHTMLTableLayout( const SwTable *pSwTable,
                        sal_uInt16 nRows, sal_uInt16 nCols, bool bColsOpt, bool ColTgs,
                        sal_uInt16 nWidth, bool bPrcWidth, sal_uInt16 nBorderOpt,
                        sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust,
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index f5a6f3c22a92..a1e2695dcf2f 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -23,7 +23,7 @@
 #include <editeng/numitem.hxx>
 #include "swdllapi.h"
 
-class SwCharFmt;
+class SwCharFormat;
 class IDocumentStylePoolAccess;
 
 enum LineNumberPosition
@@ -59,8 +59,8 @@ public:
     SwLineNumberInfo& operator=(const SwLineNumberInfo&);
     bool operator==( const SwLineNumberInfo& rInf ) const;
 
-    SwCharFmt *GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const;
-    void SetCharFmt( SwCharFmt* );
+    SwCharFormat *GetCharFormat( IDocumentStylePoolAccess& rIDSPA ) const;
+    void SetCharFormat( SwCharFormat* );
 
     const SvxNumberType &GetNumType() const             { return aType; }
     void                SetNumType( SvxNumberType aNew ){ aType = aNew; }
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index ca4dcf4c7943..1e21326cdcd2 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -54,7 +54,7 @@ void EnableCmdInterface(bool bEnable = true);
 void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect );
 
 // Read ChgMode for tables from configuration.
-TblChgMode GetTblChgDefaultMode();
+TableChgMode GetTableChgDefaultMode();
 
 bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark );
 
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 7088f2784fe9..06fc3f1412f5 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -36,7 +36,7 @@ class SwModuleOptions;
 class InsCaptionOpt;
 
 // text format for the sending of messages ------------------------------
-enum class MailTxtFormats
+enum class MailTextFormats
 {
     NONE      = 0x00,
     ASCII     = 0x01,
@@ -46,7 +46,7 @@ enum class MailTxtFormats
 };
 namespace o3tl
 {
-    template<> struct typed_flags<MailTxtFormats> : is_typed_flags<MailTxtFormats, 0x0f> {};
+    template<> struct typed_flags<MailTextFormats> : is_typed_flags<MailTextFormats, 0x0f> {};
 }
 
 
@@ -122,7 +122,7 @@ class SwInsertConfig : public utl::ConfigItem
     bool            bInsWithCaption;       //Insert/Caption/Automatic
     bool            bCaptionOrderNumberingFirst; //#i61007# caption order starting with numbering
 
-    SwInsertTableOptions    aInsTblOpts;
+    SwInsertTableOptions    aInsTableOpts;
     bool            bIsWeb;
 
     const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
@@ -142,15 +142,15 @@ class SwTableConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
 
-    sal_uInt16      nTblHMove;          //int Table/Shift/Row
-    sal_uInt16      nTblVMove;          //int Table/Shift/Column
-    sal_uInt16      nTblHInsert;        //int Table/Insert/Row
-    sal_uInt16      nTblVInsert;        //int Table/Insert/Column
-    TblChgMode  eTblChgMode;        //int Table/Change/Effect
+    sal_uInt16      nTableHMove;          //int Table/Shift/Row
+    sal_uInt16      nTableVMove;          //int Table/Shift/Column
+    sal_uInt16      nTableHInsert;        //int Table/Insert/Row
+    sal_uInt16      nTableVInsert;        //int Table/Insert/Column
+    TableChgMode  eTableChgMode;        //int Table/Change/Effect
 
-    bool    bInsTblFormatNum;       // Table/Input/NumberRecognition        // Automatic recognition of numbers.
-    bool    bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition  // Automatic recognition of number formats.
-    bool    bInsTblAlignNum;        // Table/Input/Alignment                // Align numbers.
+    bool    bInsTableFormatNum;       // Table/Input/NumberRecognition        // Automatic recognition of numbers.
+    bool    bInsTableChangeNumFormat; // Table/Input/NumberFormatRecognition  // Automatic recognition of number formats.
+    bool    bInsTableAlignNum;        // Table/Input/Alignment                // Align numbers.
 
     static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
 
@@ -177,7 +177,7 @@ class SwMiscConfig : public utl::ConfigItem
     bool        bSinglePrintJob;            // FormLetter/PrintOutput/SinglePrintJobs
     bool        bIsNameFromColumn;          // FormLetter/FileOutput/FileName/Generation
     bool        bAskForMailMergeInPrint;    // Ask if documents containing fields should be 'mailmerged'
-    MailTxtFormats nMailingFormats;            // FormLetter/MailingOutput/Formats
+    MailTextFormats nMailingFormats;            // FormLetter/MailingOutput/Formats
     OUString    sNameFromColumn;            // FormLetter/FileOutput/FileName/FromDatabaseField (string!)
     OUString    sMailingPath;               // FormLetter/FileOutput/Path
     OUString    sMailName;                  // FormLetter/FileOutput/FileName/FromManualSetting (string!)
@@ -214,24 +214,24 @@ class SW_DLLPUBLIC SwModuleOptions
 public:
     SwModuleOptions();
 
-    TblChgMode  GetTblMode() const { return aTableConfig.eTblChgMode;}
-    void        SetTblMode( TblChgMode  eSet ) { aTableConfig.eTblChgMode = eSet;
+    TableChgMode  GetTableMode() const { return aTableConfig.eTableChgMode;}
+    void        SetTableMode( TableChgMode  eSet ) { aTableConfig.eTableChgMode = eSet;
                                                 aTableConfig.SetModified();}
 
-    sal_uInt16      GetTblHMove() const { return aTableConfig.nTblHMove;}
-    void        SetTblHMove( sal_uInt16 nSet ) {    aTableConfig.nTblHMove = nSet;
+    sal_uInt16      GetTableHMove() const { return aTableConfig.nTableHMove;}
+    void        SetTableHMove( sal_uInt16 nSet ) {    aTableConfig.nTableHMove = nSet;
                                                 aTableConfig.SetModified();}
 
-    sal_uInt16      GetTblVMove() const { return aTableConfig.nTblVMove;}
-    void        SetTblVMove( sal_uInt16 nSet ) {    aTableConfig.nTblVMove = nSet;
+    sal_uInt16      GetTableVMove() const { return aTableConfig.nTableVMove;}
+    void        SetTableVMove( sal_uInt16 nSet ) {    aTableConfig.nTableVMove = nSet;
                                                 aTableConfig.SetModified();}
 
-    sal_uInt16      GetTblHInsert() const {return aTableConfig.nTblHInsert;}
-    void        SetTblHInsert( sal_uInt16 nSet ) {  aTableConfig.nTblHInsert = nSet;
+    sal_uInt16      GetTableHInsert() const {return aTableConfig.nTableHInsert;}
+    void        SetTableHInsert( sal_uInt16 nSet ) {  aTableConfig.nTableHInsert = nSet;
                                                 aTableConfig.SetModified();}
 
-    sal_uInt16      GetTblVInsert() const {return aTableConfig.nTblVInsert;}
-    void        SetTblVInsert( sal_uInt16 nSet ) {  aTableConfig.nTblVInsert = nSet;
+    sal_uInt16      GetTableVInsert() const {return aTableConfig.nTableVInsert;}
+    void        SetTableVInsert( sal_uInt16 nSet ) {  aTableConfig.nTableVInsert = nSet;
                                                 aTableConfig.SetModified();}
 
     const AuthorCharAttr    &GetInsertAuthorAttr() const { return aRevisionConfig.aInsertAttr; }
@@ -271,28 +271,28 @@ public:
                     }
                 }
 
-    bool        IsInsTblFormatNum(bool bHTML) const
-                    { return bHTML ? aWebTableConfig.bInsTblFormatNum : aTableConfig.bInsTblFormatNum; }
-    void        SetInsTblFormatNum( bool bHTML, bool b )
-                    { bHTML ? (aWebTableConfig.bInsTblFormatNum = b) : (aTableConfig.bInsTblFormatNum = b);
+    bool        IsInsTableFormatNum(bool bHTML) const
+                    { return bHTML ? aWebTableConfig.bInsTableFormatNum : aTableConfig.bInsTableFormatNum; }
+    void        SetInsTableFormatNum( bool bHTML, bool b )
+                    { bHTML ? (aWebTableConfig.bInsTableFormatNum = b) : (aTableConfig.bInsTableFormatNum = b);
                       bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
 
-    bool        IsInsTblChangeNumFormat(bool bHTML) const
-                    { return bHTML ? aWebTableConfig.bInsTblChangeNumFormat : aTableConfig.bInsTblChangeNumFormat; }
-    void        SetInsTblChangeNumFormat( bool bHTML, bool b )
-                    { bHTML ? (aWebTableConfig.bInsTblChangeNumFormat = b) : (aTableConfig.bInsTblChangeNumFormat = b);
+    bool        IsInsTableChangeNumFormat(bool bHTML) const
+                    { return bHTML ? aWebTableConfig.bInsTableChangeNumFormat : aTableConfig.bInsTableChangeNumFormat; }
+    void        SetInsTableChangeNumFormat( bool bHTML, bool b )
+                    { bHTML ? (aWebTableConfig.bInsTableChangeNumFormat = b) : (aTableConfig.bInsTableChangeNumFormat = b);
                       bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
 
-    bool        IsInsTblAlignNum(bool bHTML) const
-                    { return bHTML ? aWebTableConfig.bInsTblAlignNum : aTableConfig.bInsTblAlignNum; }
-    void        SetInsTblAlignNum( bool bHTML, bool b )
-                    { bHTML ? (aWebTableConfig.bInsTblAlignNum = b) : (aTableConfig.bInsTblAlignNum = b);
+    bool        IsInsTableAlignNum(bool bHTML) const
+                    { return bHTML ? aWebTableConfig.bInsTableAlignNum : aTableConfig.bInsTableAlignNum; }
+    void        SetInsTableAlignNum( bool bHTML, bool b )
+                    { bHTML ? (aWebTableConfig.bInsTableAlignNum = b) : (aTableConfig.bInsTableAlignNum = b);
                         bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
 
-    SwInsertTableOptions GetInsTblFlags(bool bHTML) const
-                    { return bHTML ? aWebInsertConfig.aInsTblOpts : aInsertConfig.aInsTblOpts;}
-    void        SetInsTblFlags( bool bHTML, const SwInsertTableOptions& rOpts ) {
-                    bHTML ? (aWebInsertConfig.aInsTblOpts = rOpts) : (aInsertConfig.aInsTblOpts = rOpts);
+    SwInsertTableOptions GetInsTableFlags(bool bHTML) const
+                    { return bHTML ? aWebInsertConfig.aInsTableOpts : aInsertConfig.aInsTableOpts;}
+    void        SetInsTableFlags( bool bHTML, const SwInsertTableOptions& rOpts ) {
+                    bHTML ? (aWebInsertConfig.aInsTableOpts = rOpts) : (aInsertConfig.aInsTableOpts = rOpts);
                     bHTML ? aWebInsertConfig.SetModified() : aInsertConfig.SetModified();}
 
     const InsCaptionOpt* GetCapOption(bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId);
@@ -302,8 +302,8 @@ public:
     void        SetGrfToGalleryAsLnk( bool b )  { aMiscConfig.bGrfToGalleryAsLnk = b;
                                                   aMiscConfig.SetModified();}
 
-    MailTxtFormats GetMailingFormats() const               { return aMiscConfig.nMailingFormats;}
-    void           SetMailingFormats( MailTxtFormats nSet ) { aMiscConfig.nMailingFormats = nSet;
+    MailTextFormats GetMailingFormats() const               { return aMiscConfig.nMailingFormats;}
+    void           SetMailingFormats( MailTextFormats nSet ) { aMiscConfig.nMailingFormats = nSet;
                                                             aMiscConfig.SetModified();}
 
     bool        IsSinglePrintJob() const        { return aMiscConfig.bSinglePrintJob; }
diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx
index 386b536b50dc..15bf06052554 100644
--- a/sw/inc/modeltoviewhelper.hxx
+++ b/sw/inc/modeltoviewhelper.hxx
@@ -25,7 +25,7 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <vector>
 
-class SwTxtNode;
+class SwTextNode;
 
 /** Some helpers for converting model strings to view strings.
 
@@ -36,7 +36,7 @@ class SwTxtNode;
     helper functions are provided to convert model positions to view positions
     and vice versa.
 
-           CH_TXTATR_BREAKWORD -> SwTxtNode will have field attributes associated with these
+           CH_TXTATR_BREAKWORD -> SwTextNode will have field attributes associated with these
                 .       .
                 .       .
                 .       .
@@ -125,7 +125,7 @@ public:
         ModelPosition() : mnPos(0), mnSubPos(0), mbIsField(false) {}
     };
 
-    ModelToViewHelper(const SwTxtNode &rNode,
+    ModelToViewHelper(const SwTextNode &rNode,
             // defaults are appropriate for spell/grammar checking
             ExpandMode eMode = ExpandMode::ExpandFields | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     ModelToViewHelper() //pass through filter, view == model
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 158b8dc2d0a8..4ff30a8749be 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -38,9 +38,9 @@ class Graphic;
 class GraphicObject;
 class SwAttrSet;
 class SfxItemSet;
-class SwCntntNode;
+class SwContentNode;
 class SwDoc;
-class SwGrfFmtColl;
+class SwGrfFormatColl;
 class SwGrfNode;
 class SwHistory;
 class SwNode;
@@ -50,20 +50,20 @@ class SwOLENode;
 class SwOutlineNodes;
 class SwPaM;
 class SwSectionData;
-class SwSectionFmt;
+class SwSectionFormat;
 class SwTOXBase;
 class SwSectionNode;
 class SwStartNode;
-class SwTableBoxFmt;
-class SwTableFmt;
+class SwTableBoxFormat;
+class SwTableFormat;
 class SwTableLine;
-class SwTableLineFmt;
+class SwTableLineFormat;
 class SwTableNode;
-class SwTblToTxtSaves;
-class SwTxtFmtColl;
-class SwTxtNode;
-class SwUndoTblToTxt;
-class SwUndoTxtToTbl;
+class SwTableToTextSaves;
+class SwTextFormatColl;
+class SwTextNode;
+class SwUndoTableToText;
+class SwUndoTextToTable;
 struct SwPosition;
 
 namespace sw { class DocumentContentOperationsManager; }
@@ -123,10 +123,10 @@ class SW_DLLPUBLIC SwNodes
     void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize,
                   SwNodeIndex& rInsPos, bool bNewFrms );
 
-    void UpdtOutlineIdx( const SwNode& );   ///< Update all OutlineNodes starting from Node.
+    void UpdateOutlineIdx( const SwNode& );   ///< Update all OutlineNodes starting from Node.
 
     void _CopyNodes( const SwNodeRange&, const SwNodeIndex&,
-                    bool bNewFrms = true, bool bTblInsDummyNode = false ) const;
+                    bool bNewFrms = true, bool bTableInsDummyNode = false ) const;
     void _DelDummyNodes( const SwNodeRange& rRg );
 
 protected:
@@ -186,19 +186,19 @@ public:
     static void GoStartOfSection(SwNodeIndex *);
     static void GoEndOfSection(SwNodeIndex *);
 
-    SwCntntNode* GoNext(SwNodeIndex *) const;
-    static SwCntntNode* GoPrevious(SwNodeIndex *);
+    SwContentNode* GoNext(SwNodeIndex *) const;
+    static SwContentNode* GoPrevious(SwNodeIndex *);
 
-    /** Go to next/previous Cntnt/Table-node for which LayoutFrames exist.
+    /** Go to next/previous Content/Table-node for which LayoutFrames exist.
      While doing this do not leave Header/Footer/Frame etc. */
     SwNode* GoNextWithFrm(SwNodeIndex *) const;
     SwNode* GoPreviousWithFrm(SwNodeIndex *) const;
 
     /** Go to next content-node that is not protected or hidden
        (Both set FALSE ==> GoNext/GoPrevious!!!). */
-    SwCntntNode* GoNextSection( SwNodeIndex *, bool bSkipHidden  = true,
+    SwContentNode* GoNextSection( SwNodeIndex *, bool bSkipHidden  = true,
                                            bool bSkipProtect = true ) const;
-    static SwCntntNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden  = true,
+    static SwContentNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden  = true,
                                            bool bSkipProtect = true );
 
     /** Create an empty section of Start- and EndNote. It may be called
@@ -208,35 +208,35 @@ public:
                                     SwStartNodeType = SwNormalStartNode );
 
     /// Implementations of "Make...Node" are in the given .cxx-files.
-    SwTxtNode *MakeTxtNode( const SwNodeIndex & rWhere,
-                            SwTxtFmtColl *pColl,
+    SwTextNode *MakeTextNode( const SwNodeIndex & rWhere,
+                            SwTextFormatColl *pColl,
                             SwAttrSet* pAutoAttr = 0 ); ///< in ndtxt.cxx
     SwStartNode* MakeTextSection( const SwNodeIndex & rWhere,
                             SwStartNodeType eSttNdTyp,
-                            SwTxtFmtColl *pColl,
+                            SwTextFormatColl *pColl,
                             SwAttrSet* pAutoAttr = 0 );
 
     static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
                             const OUString& rGrfName,
                             const OUString& rFltName,
                             const Graphic* pGraphic,
-                            SwGrfFmtColl *pColl,
+                            SwGrfFormatColl *pColl,
                             SwAttrSet* pAutoAttr = 0,
                             bool bDelayed = false );    ///< in ndgrf.cxx
 
     static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
                             const GraphicObject& rGrfObj,
-                            SwGrfFmtColl *pColl,
+                            SwGrfFormatColl *pColl,
                             SwAttrSet* pAutoAttr = 0 ); ///< in ndgrf.cxx
 
     SwOLENode *MakeOLENode( const SwNodeIndex & rWhere,
                             const svt::EmbeddedObjectRef&,
-                            SwGrfFmtColl *pColl,
+                            SwGrfFormatColl *pColl,
                             SwAttrSet* pAutoAttr = 0 ); ///< in ndole.cxx
     SwOLENode *MakeOLENode( const SwNodeIndex & rWhere,
                             const OUString &rName,
                             sal_Int64 nAspect,
-                            SwGrfFmtColl *pColl,
+                            SwGrfFormatColl *pColl,
                             SwAttrSet* pAutoAttr ); ///< in ndole.cxx
 
     /// Array of all OutlineNodes.
@@ -250,46 +250,46 @@ public:
 
        New parameter pAttrSet: If pAttrSet is non-null and contains an
        adjust item it is propagated to the table cells. If there is an
-       adjust in pCntntTxtColl or pHeadlineTxtColl this adjust item
+       adjust in pContentTextColl or pHeadlineTextColl this adjust item
        overrides the item in pAttrSet. */
 
     static SwTableNode* InsertTable( const SwNodeIndex& rNdIdx,
-                        sal_uInt16 nBoxes, SwTxtFmtColl* pCntntTxtColl,
+                        sal_uInt16 nBoxes, SwTextFormatColl* pContentTextColl,
                         sal_uInt16 nLines = 0, sal_uInt16 nRepeat = 0,
-                        SwTxtFmtColl* pHeadlineTxtColl = 0,
+                        SwTextFormatColl* pHeadlineTextColl = 0,
                         const SwAttrSet * pAttrSet = 0);
 
     /// Create balanced table from selected range.
     SwTableNode* TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
-                                SwTableFmt* pTblFmt,
-                                SwTableLineFmt* pLineFmt,
-                                SwTableBoxFmt* pBoxFmt,
-                                SwTxtFmtColl* pTxtColl,
-                                SwUndoTxtToTbl* pUndo = 0 );
+                                SwTableFormat* pTableFormat,
+                                SwTableLineFormat* pLineFormat,
+                                SwTableBoxFormat* pBoxFormat,
+                                SwTextFormatColl* pTextColl,
+                                SwUndoTextToTable* pUndo = 0 );
 
     static SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange);
 
     /// create a table from a vector of NodeRanges - API support
     SwTableNode* TextToTable( const TableRanges_t& rTableNodes,
-                                SwTableFmt* pTblFmt,
-                                SwTableLineFmt* pLineFmt,
-                                SwTableBoxFmt* pBoxFmt,
-                                SwTxtFmtColl* pTxtColl
+                                SwTableFormat* pTableFormat,
+                                SwTableLineFormat* pLineFormat,
+                                SwTableBoxFormat* pBoxFormat,
+                                SwTextFormatColl* pTextColl
                                 /*, SwUndo... pUndo*/ );
 
     /// Create regular text from what was table.
     bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
-                        SwUndoTblToTxt* = 0 );
+                        SwUndoTableToText* = 0 );
     /// Is in untbl.cxx and may called only by Undo-object.
     SwTableNode* UndoTableToText( sal_uLong nStt, sal_uLong nEnd,
-                        const SwTblToTxtSaves& rSavedData );
+                        const SwTableToTextSaves& rSavedData );
 
     /** Insert a new box in the line before InsPos. Its format
        is taken from the following one (or from the previous one if we are
        at the end). In the line there must be a box already. */
-    bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFmt*,
+    bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFormat*,
                         /// Formats for TextNode of box.
-                        SwTxtFmtColl*, const SfxItemSet* pAutoAttr,
+                        SwTextFormatColl*, const SfxItemSet* pAutoAttr,
                         sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 );
     /** Splits a table at the base-line which contains the index.
        All base lines behind it are moved to a new table/ -node.
@@ -305,7 +305,7 @@ public:
 
     /// Insert a new SwSection.
     SwSectionNode* InsertTextSection(SwNodeIndex const& rNdIdx,
-                                SwSectionFmt& rSectionFmt,
+                                SwSectionFormat& rSectionFormat,
                                 SwSectionData const&,
                                 SwTOXBase const*const pTOXBase,
                                 SwNodeIndex const*const pEnde,
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index bdf9e77961f3..668c5f5ecc61 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -27,13 +27,13 @@
 #include <boost/weak_ptr.hpp>
 class SwAsyncRetrieveInputStreamThreadConsumer;
 
-class SwGrfFmtColl;
+class SwGrfFormatColl;
 class SwDoc;
 class GraphicAttr;
 class SotStorage;
 
 // SwGrfNode
-class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
+class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
 {
     friend class SwNodes;
 
@@ -57,16 +57,16 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
     SwGrfNode( const SwNodeIndex& rWhere,
                const OUString& rGrfName, const OUString& rFltName,
                const Graphic* pGraphic,
-               SwGrfFmtColl* pGrfColl,
+               SwGrfFormatColl* pGrfColl,
                SwAttrSet* pAutoAttr = 0 );
     ///< Ctor for reading (SW/G) without graphics.
     SwGrfNode( const SwNodeIndex& rWhere,
                const OUString& rGrfName, const OUString& rFltName,
-               SwGrfFmtColl* pGrfColl,
+               SwGrfFormatColl* pGrfColl,
                SwAttrSet* pAutoAttr = 0 );
     SwGrfNode( const SwNodeIndex& rWhere,
                const GraphicObject& rGrfObj,
-               SwGrfFmtColl* pGrfColl,
+               SwGrfFormatColl* pGrfColl,
                SwAttrSet* pAutoAttr = 0 );
 
     void InsertLink( const OUString& rGrfName, const OUString& rFltName );
@@ -125,7 +125,7 @@ public:
     const Graphic&          GetGrf(bool bWait = false) const;
     const GraphicObject&    GetGrfObj(bool bWait = false) const;
     const GraphicObject* GetReplacementGrfObj() const;
-    virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
+    virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
 
     /// isolated only way to set GraphicObject to allow more actions when doing so
     void SetGraphic(const Graphic& rGraphic, const OUString& rLink);
@@ -157,7 +157,7 @@ public:
     void SetScaleImageMap( bool b )      { bScaleImageMap = b; }
 
     /// in ndcopy.cxx
-    virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+    virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
 
     /** Re-read in case graphic was not OK. The current one
        gets replaced by the new one. */
@@ -206,7 +206,7 @@ public:
     bool IsAsyncRetrieveInputStreamPossible() const;
 };
 
-// Inline methods from Node.hxx - it is only now that we know TxtNode!!
+// Inline methods from Node.hxx - it is only now that we know TextNode!!
 inline       SwGrfNode   *SwNode::GetGrfNode()
 {
      return ND_GRFNODE == nNodeType ? static_cast<SwGrfNode*>(this) : 0;
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 86e7fd452ff8..44c853b98f1f 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -24,10 +24,10 @@
 
 #include "swtypes.hxx"
 
-class SwTxtNode;
+class SwTextNode;
 class SwRegHistory;                 // Is in RolBck.hxx.
-class SwTxtAttr;
-class SwTxtAttrNesting;
+class SwTextAttr;
+class SwTextAttrNesting;
 
 class SfxPoolItem;
 class SfxItemSet;
@@ -38,28 +38,28 @@ typedef enum {
     NEW  = int(false),
 } CopyOrNew_t;
 
-/// if COPY then pTxtNode must be given!
-SwTxtAttr * MakeTxtAttr(
+/// if COPY then pTextNode must be given!
+SwTextAttr * MakeTextAttr(
     SwDoc & rDoc,
     SfxPoolItem & rNew,
     sal_Int32 const nStt,
     sal_Int32 const nEnd,
     CopyOrNew_t const bIsCopy = NEW,
-    SwTxtNode *const pTxtNode = 0 );
+    SwTextNode *const pTextNode = 0 );
 
-SwTxtAttr * MakeTxtAttr(
+SwTextAttr * MakeTextAttr(
     SwDoc & rDoc,
     const SfxItemSet & rSet,
     sal_Int32 nStt,
     sal_Int32 nEnd );
 
 /// create redline dummy text hint that must not be inserted into hints array
-SwTxtAttr* MakeRedlineTxtAttr(
+SwTextAttr* MakeRedlineTextAttr(
     SwDoc & rDoc,
     SfxPoolItem& rAttr );
 
 /** Class SwpHints is derived indirectly via SwpHts, because only the
-   class SwTxtNode should be allowed to insert and remove attributes.
+   class SwTextNode should be allowed to insert and remove attributes.
    Other classes like the Frames are given only reading access via
    the index-operator.
    Size when created is 1 because an array is created only if
@@ -69,16 +69,16 @@ SwTxtAttr* MakeRedlineTxtAttr(
 
 struct CompareSwpHtStart
 {
-    bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
+    bool operator()(SwTextAttr* const lhs, SwTextAttr* const rhs) const;
 };
-class SwpHtStart : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtStart,
+class SwpHtStart : public o3tl::sorted_vector<SwTextAttr*, CompareSwpHtStart,
     o3tl::find_partialorder_ptrequals> {};
 
 struct CompareSwpHtEnd
 {
-    bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
+    bool operator()(SwTextAttr* const lhs, SwTextAttr* const rhs) const;
 };
-class SwpHtEnd : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtEnd,
+class SwpHtEnd : public o3tl::sorted_vector<SwTextAttr*, CompareSwpHtEnd,
     o3tl::find_partialorder_ptrequals> {};
 
 /// Class SwpHintsArr
@@ -97,31 +97,31 @@ protected:
 
     //FIXME: why are the non-const methods public?
 public:
-    void Insert( const SwTxtAttr *pHt );
+    void Insert( const SwTextAttr *pHt );
     void DeleteAtPos( const size_t nPosInStart );
     void Resort();
-    SwTxtAttr * Cut( const size_t nPosInStart )
+    SwTextAttr * Cut( const size_t nPosInStart )
     {
-        SwTxtAttr *pHt = GetTextHint(nPosInStart);
+        SwTextAttr *pHt = GetTextHint(nPosInStart);
         DeleteAtPos( nPosInStart );
         return pHt;
     }
-    const SwTxtAttr * GetStart( const size_t nPos ) const
+    const SwTextAttr * GetStart( const size_t nPos ) const
     {
         assert(nPos < m_HintStarts.size());
         return m_HintStarts[nPos];
     }
-    const SwTxtAttr * GetEnd( const size_t nPos ) const
+    const SwTextAttr * GetEnd( const size_t nPos ) const
     {
         assert(nPos < m_HintEnds.size());
         return m_HintEnds[nPos];
     }
-    SwTxtAttr * GetStart( const size_t nPos )
+    SwTextAttr * GetStart( const size_t nPos )
     {
         assert(nPos < m_HintStarts.size());
         return m_HintStarts[nPos];
     }
-    SwTxtAttr * GetEnd( const size_t nPos )
+    SwTextAttr * GetEnd( const size_t nPos )
     {
         assert(nPos < m_HintEnds.size());
         return m_HintEnds[nPos];
@@ -130,10 +130,10 @@ public:
     size_t GetEndCount()   const { return m_HintEnds.size(); }
     size_t GetStartCount() const { return m_HintStarts.size(); }
 
-    size_t GetStartOf( const SwTxtAttr *pHt ) const
+    size_t GetStartOf( const SwTextAttr *pHt ) const
     {
         SwpHtStart::const_iterator const it =
-            m_HintStarts.find(const_cast<SwTxtAttr*>(pHt));
+            m_HintStarts.find(const_cast<SwTextAttr*>(pHt));
         if ( it == m_HintStarts.end() )
         {
             return SAL_MAX_SIZE;
@@ -141,13 +141,13 @@ public:
         return it - m_HintStarts.begin();
     }
 
-    bool Contains( const SwTxtAttr *pHt ) const;
+    bool Contains( const SwTextAttr *pHt ) const;
 
-    const SwTxtAttr * GetTextHint( const size_t nIdx ) const
+    const SwTextAttr * GetTextHint( const size_t nIdx ) const
         { return GetStart(nIdx); }
-    SwTxtAttr * GetTextHint( const size_t nIdx )
+    SwTextAttr * GetTextHint( const size_t nIdx )
         { return GetStart(nIdx); }
-    const SwTxtAttr * operator[]( const size_t nIdx ) const
+    const SwTextAttr * operator[]( const size_t nIdx ) const
         { return GetStart(nIdx); }
     size_t Count() const { return GetStartCount(); }
 
@@ -169,22 +169,22 @@ private:
     bool m_bInSplitNode         : 1;
     /// m_bHasHiddenParaField is invalid, call CalcHiddenParaField()
     bool m_bCalcHiddenParaField : 1;
-    bool m_bHasHiddenParaField  : 1;   ///< HiddenParaFld
+    bool m_bHasHiddenParaField  : 1;   ///< HiddenParaField
     bool m_bFootnote            : 1;   ///< footnotes
     bool m_bDDEFields           : 1;   ///< the TextNode has DDE fields
 
     /// records a new attibute in m_pHistory.
-    void NoteInHistory( SwTxtAttr *pAttr, const bool bNew = false );
+    void NoteInHistory( SwTextAttr *pAttr, const bool bNew = false );
 
     void CalcFlags( );
 
     /** Delete methods may only be called by the TextNode!
        Because the TextNode also guarantees removal of the Character for
        attributes without an end. */
-    friend class SwTxtNode;
+    friend class SwTextNode;
     void DeleteAtPos( const size_t nPos );
     /// Delete the given Hint. The Hint must actually be in the array!
-    void Delete( SwTxtAttr* pTxtHt );
+    void Delete( SwTextAttr* pTextHt );
 
     void SetInSplitNode(bool bInSplit) { m_bInSplitNode = bInSplit; }
     void SetCalcHiddenParaField() { m_bCalcHiddenParaField = true; }
@@ -198,11 +198,11 @@ private:
         return m_bHasHiddenParaField;
     }
 
-    void InsertNesting(SwTxtAttrNesting & rNewHint);
-    bool TryInsertNesting(SwTxtNode & rNode, SwTxtAttrNesting & rNewHint);
-    void BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
+    void InsertNesting(SwTextAttrNesting & rNewHint);
+    bool TryInsertNesting(SwTextNode & rNode, SwTextAttrNesting & rNewHint);
+    void BuildPortions( SwTextNode& rNode, SwTextAttr& rNewHint,
             const SetAttrMode nMode );
-    bool MergePortions( SwTxtNode& rNode );
+    bool MergePortions( SwTextNode& rNode );
 
 public:
     SwpHints();
@@ -217,10 +217,10 @@ public:
 
     /// try to insert the hint
     /// @return true iff hint successfully inserted
-    bool TryInsertHint( SwTxtAttr * const pHint, SwTxtNode & rNode,
+    bool TryInsertHint( SwTextAttr * const pHint, SwTextNode & rNode,
             const SetAttrMode nMode = SetAttrMode::DEFAULT );
 
-    bool HasFtn() const          { return m_bFootnote; }
+    bool HasFootnote() const          { return m_bFootnote; }
     bool IsInSplitNode() const   { return m_bInSplitNode; }
 
     /// calc current value of m_bHasHiddenParaField, returns true iff changed
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 584fd5c24baa..ec0f494f6112 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -23,12 +23,12 @@
 
 namespace tools { class PolyPolygon; }
 
-// SwNoTxtNode
+// SwNoTextNode
 
-class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
+class SW_DLLPUBLIC SwNoTextNode : public SwContentNode
 {
     friend class SwNodes;
-    friend class SwNoTxtFrm;
+    friend class SwNoTextFrm;
 
     tools::PolyPolygon *pContour;
     bool bAutomaticContour : 1; // automatic contour polygon, not manipulated
@@ -38,22 +38,22 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
     bool bPixelContour : 1;     // contour map mode is invalid and pixel.
 
     // Creates for all derivations an AttrSet with ranges for frame- and
-    // graphics-attributes (only called by SwCntntNode).
+    // graphics-attributes (only called by SwContentNode).
     virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
 
-    SwNoTxtNode( const SwNoTxtNode& ) SAL_DELETED_FUNCTION;
-    SwNoTxtNode &operator=( const SwNoTxtNode& ) SAL_DELETED_FUNCTION;
+    SwNoTextNode( const SwNoTextNode& ) SAL_DELETED_FUNCTION;
+    SwNoTextNode &operator=( const SwNoTextNode& ) SAL_DELETED_FUNCTION;
 
 protected:
-    SwNoTxtNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
-                SwGrfFmtColl *pGrColl, SwAttrSet* pAutoAttr = 0 );
+    SwNoTextNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
+                SwGrfFormatColl *pGrColl, SwAttrSet* pAutoAttr = 0 );
 
 public:
-    virtual ~SwNoTxtNode();
+    virtual ~SwNoTextNode();
 
-    virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
+    virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
 
-    inline SwGrfFmtColl *GetGrfColl() const { return const_cast<SwGrfFmtColl*>(static_cast<const SwGrfFmtColl*>(GetRegisteredIn())); }
+    inline SwGrfFormatColl *GetGrfColl() const { return const_cast<SwGrfFormatColl*>(static_cast<const SwGrfFormatColl*>(GetRegisteredIn())); }
 
     virtual Size GetTwipSize() const = 0;
 
@@ -90,14 +90,14 @@ public:
     Graphic GetGraphic() const;
 };
 
-// Inline methods from Node.hxx - we know TxtNode only here!!
-inline SwNoTxtNode *SwNode::GetNoTxtNode()
+// Inline methods from Node.hxx - we know TextNode only here!!
+inline SwNoTextNode *SwNode::GetNoTextNode()
 {
-    return ND_NOTXTNODE & nNodeType ? static_cast<SwNoTxtNode*>(this) : 0;
+    return ND_NOTXTNODE & nNodeType ? static_cast<SwNoTextNode*>(this) : 0;
 }
-inline const SwNoTxtNode *SwNode::GetNoTxtNode() const
+inline const SwNoTextNode *SwNode::GetNoTextNode() const
 {
-    return ND_NOTXTNODE & nNodeType ? static_cast<const SwNoTxtNode*>(this) : 0;
+    return ND_NOTXTNODE & nNodeType ? static_cast<const SwNoTextNode*>(this) : 0;
 }
 
 #endif // INCLUDED_SW_INC_NDNOTXT_HXX
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 3091cc03abf9..b2787a393f78 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -23,7 +23,7 @@
 
 #include <svtools/embedhlp.hxx>
 
-class SwGrfFmtColl;
+class SwGrfFormatColl;
 class SwDoc;
 class SwOLENode;
 
@@ -66,11 +66,11 @@ public:
 
 // SwOLENode
 
-class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
+class SW_DLLPUBLIC SwOLENode: public SwNoTextNode
 {
     friend class SwNodes;
     mutable SwOLEObj aOLEObj;
-    OUString sChartTblName;     ///< with chart objects: name of referenced table.
+    OUString sChartTableName;     ///< with chart objects: name of referenced table.
     bool   bOLESizeInvalid; /**< Should be considered at SwDoc::PrtOLENotify
                                    (e.g. copied). Is not persistent. */
 
@@ -79,28 +79,28 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
 
     SwOLENode(  const SwNodeIndex &rWhere,
                 const svt::EmbeddedObjectRef&,
-                SwGrfFmtColl *pGrfColl,
+                SwGrfFormatColl *pGrfColl,
                 SwAttrSet* pAutoAttr = 0 );
 
     SwOLENode(  const SwNodeIndex &rWhere,
                 const OUString &rName,
                 sal_Int64 nAspect,
-                SwGrfFmtColl *pGrfColl,
+                SwGrfFormatColl *pGrfColl,
                 SwAttrSet* pAutoAttr = 0 );
 
     SwOLENode( const SwOLENode & ) SAL_DELETED_FUNCTION;
 
-    using SwNoTxtNode::GetGraphic;
+    using SwNoTextNode::GetGraphic;
 
 public:
     const SwOLEObj& GetOLEObj() const { return aOLEObj; }
           SwOLEObj& GetOLEObj()       { return aOLEObj; }
     virtual ~SwOLENode();
 
-    virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
+    virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
 
     /// Is in ndcopy.cxx.
-    virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+    virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
 
     virtual Size GetTwipSize() const SAL_OVERRIDE;
 
@@ -133,8 +133,8 @@ public:
     // #i99665#
     bool IsChart() const;
 
-    OUString GetChartTblName() const { return sChartTblName; }
-    void SetChartTblName( const OUString& rNm ) { sChartTblName = rNm; }
+    OUString GetChartTableName() const { return sChartTableName; }
+    void SetChartTableName( const OUString& rNm ) { sChartTableName = rNm; }
 };
 
 /// Inline methods from Node.hxx
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 87a29ec1bd7d..94ffd6a7401b 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -44,10 +44,10 @@ namespace utl {
     class TransliterationWrapper;
 }
 
-class SwTxtFmtColl;
-class SwCntntFrm;
-class SwTxtFld;
-class SwTxtInputFld;
+class SwTextFormatColl;
+class SwContentFrm;
+class SwTextField;
+class SwTextInputField;
 class SfxItemSet;
 class SwUndoTransliterate;
 struct SwSpellArgs;
@@ -69,14 +69,14 @@ namespace com { namespace sun { namespace star {
 
 typedef std::set< sal_Int32 > SwSoftPageBreakList;
 
-/// SwTxtNode is a paragraph in the document model.
-class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
+/// SwTextNode is a paragraph in the document model.
+class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable
 {
-    friend class SwCntntNode;
+    friend class SwContentNode;
     /// For creating the first TextNode.
-    friend class SwDoc;         ///< CTOR and AppendTxtNode()
+    friend class SwDoc;         ///< CTOR and AppendTextNode()
     friend class SwNodes;
-    friend class SwTxtFrm;
+    friend class SwTextFrm;
     friend class SwScriptInfo;
 
     /** May be 0. It is only then not 0 if it contains hard attributes.
@@ -118,22 +118,22 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
     //UUUU DrawingLayer FillAttributes in a preprocessed form for primitive usage
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr  maFillAttributes;
 
-    SAL_DLLPRIVATE SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl,
+    SAL_DLLPRIVATE SwTextNode( const SwNodeIndex &rWhere, SwTextFormatColl *pTextColl,
                              const SfxItemSet* pAutoAttr = 0 );
 
     /// Copies the attributes at nStart to pDest.
-    SAL_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
+    SAL_DLLPRIVATE void CopyAttr( SwTextNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
 
-    SAL_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, bool bNext = true,
+    SAL_DLLPRIVATE SwTextNode* _MakeNewTextNode( const SwNodeIndex&, bool bNext = true,
                                 bool bChgFollow = true );
 
     SAL_DLLPRIVATE void CutImpl(
-          SwTxtNode * const pDest, const SwIndex & rDestStart,
+          SwTextNode * const pDest, const SwIndex & rDestStart,
           const SwIndex & rStart, /*const*/ sal_Int32 nLen,
           const bool bUpdate = true );
 
     /// Move all comprising hard attributes to the AttrSet of the paragraph.
-    SAL_DLLPRIVATE void MoveTxtAttr_To_AttrSet();  // Called by SplitNode.
+    SAL_DLLPRIVATE void MoveTextAttr_To_AttrSet();  // Called by SplitNode.
 
     /// Create the specific AttrSet.
     SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
@@ -177,11 +177,11 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
 
     inline void TryDeleteSwpHints();
 
-    SAL_DLLPRIVATE void impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet);
+    SAL_DLLPRIVATE void impl_FormatToTextAttr(const SfxItemSet& i_rAttrSet);
 
-    const SwTxtInputFld* GetOverlappingInputFld( const SwTxtAttr& rTxtAttr ) const;
+    const SwTextInputField* GetOverlappingInputField( const SwTextAttr& rTextAttr ) const;
 
-    void DelFrms_TxtNodePart();
+    void DelFrms_TextNodePart();
 
 public:
     bool IsWordCountDirty() const;
@@ -206,14 +206,14 @@ public:
     /// End: Data collected during idle time
 
 protected:
-    /// for hanging TxtFmtCollections somewhere else (Outline-Numbering!)
+    /// for hanging TextFormatCollections somewhere else (Outline-Numbering!)
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
     virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
 
 public:
-    using SwCntntNode::GetAttr;
+    using SwContentNode::GetAttr;
 
-    const OUString& GetTxt() const { return m_Text; }
+    const OUString& GetText() const { return m_Text; }
 
     // returns the maximum number of characters that can still be added to the node
     inline sal_Int32 GetSpaceLeft() const;
@@ -226,7 +226,7 @@ public:
     inline       bool   HasHints() const { return m_pSwpHints != nullptr; }
     inline       SwpHints &GetOrCreateSwpHints();
 
-    virtual ~SwTxtNode();
+    virtual ~SwTextNode();
 
     virtual sal_Int32 Len() const SAL_OVERRIDE;
 
@@ -270,7 +270,7 @@ public:
         only the ones which have exactly same range. Don't delete the ones
         which are simply included in the range.
      */
-    void RstTxtAttr(
+    void RstTextAttr(
         const SwIndex &rIdx,
         const sal_Int32 nLen,
         const sal_uInt16 nWhich = 0,
@@ -280,7 +280,7 @@ public:
     void    GCAttr();
 
     // Delete text attribute (needs to be deregistered at Pool!)
-    void    DestroyAttr( SwTxtAttr* pAttr );
+    void    DestroyAttr( SwTextAttr* pAttr );
 
     // delete all attributes from SwpHintsArray.
     void    ClearSwpHintsArr( bool bDelFields );
@@ -289,16 +289,16 @@ public:
     void    FileLoadedInitHints();
 
     /// Insert pAttr into hints array. @return true iff inserted successfully
-    bool    InsertHint( SwTxtAttr * const pAttr,
+    bool    InsertHint( SwTextAttr * const pAttr,
                   const SetAttrMode nMode = SetAttrMode::DEFAULT );
     /// create new text attribute from rAttr and insert it
     /// @return     inserted hint; 0 if not sure the hint is inserted
-    SwTxtAttr* InsertItem( SfxPoolItem& rAttr,
+    SwTextAttr* InsertItem( SfxPoolItem& rAttr,
                   const sal_Int32 nStart, const sal_Int32 nEnd,
                   const SetAttrMode nMode = SetAttrMode::DEFAULT );
 
     /** Set these attributes at TextNode. If the whole range is comprised
-       set them only in AutoAttrSet (SwCntntNode::SetAttr). */
+       set them only in AutoAttrSet (SwContentNode::SetAttr). */
     bool SetAttr( const SfxItemSet& rSet,
                   sal_Int32 nStt, sal_Int32 nEnd,
                   const SetAttrMode nMode = SetAttrMode::DEFAULT );
@@ -306,38 +306,38 @@ public:
        Introduce 4th optional parameter <bMergeIndentValuesOfNumRule>.
        If <bMergeIndentValuesOfNumRule> == true, the indent attributes of
        the corresponding list level of an applied list style is merged into
-       the requested item set as a LR-SPACE item, if <bOnlyTxtAttr> == false,
+       the requested item set as a LR-SPACE item, if <bOnlyTextAttr> == false,
        corresponding node has not its own indent attributes and the
        position-and-space mode of the list level is SvxNumberFormat::LABEL_ALIGNMENT. */
     bool GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
-                  const bool bOnlyTxtAttr  = false,
-                  const bool bGetFromChrFmt = true,
+                  const bool bOnlyTextAttr  = false,
+                  const bool bGetFromChrFormat = true,
                   const bool bMergeIndentValuesOfNumRule = false ) const;
 
-    /// Convey attributes of an AttrSet (AutoFmt) to SwpHintsArray.
-    void FmtToTxtAttr( SwTxtNode* pNd );
+    /// Convey attributes of an AttrSet (AutoFormat) to SwpHintsArray.
+    void FormatToTextAttr( SwTextNode* pNd );
 
     /// delete all attributes of type nWhich at nStart (opt. end nEnd)
     void DeleteAttributes( const sal_uInt16 nWhich,
                   const sal_Int32 nStart, const sal_Int32 nEnd = 0 );
-    /// delete the attribute pTxtAttr
-    void DeleteAttribute ( SwTxtAttr * const pTxtAttr );
+    /// delete the attribute pTextAttr
+    void DeleteAttribute ( SwTextAttr * const pTextAttr );
 
     /** Actions on text and attributes.
        introduce optional parameter to control, if all attributes have to be copied. */
-    void CopyText( SwTxtNode * const pDest,
+    void CopyText( SwTextNode * const pDest,
                const SwIndex &rStart,
                const sal_Int32 nLen,
                const bool bForceCopyOfAllAttrs = false );
-    void CopyText( SwTxtNode * const pDest,
+    void CopyText( SwTextNode * const pDest,
                const SwIndex &rDestStart,
                const SwIndex &rStart,
                sal_Int32 nLen,
                const bool bForceCopyOfAllAttrs = false );
 
-    void        CutText(SwTxtNode * const pDest,
+    void        CutText(SwTextNode * const pDest,
                     const SwIndex & rStart, const sal_Int32 nLen);
-    inline void CutText(SwTxtNode * const pDest, const SwIndex &rDestStart,
+    inline void CutText(SwTextNode * const pDest, const SwIndex &rDestStart,
                     const SwIndex & rStart, const sal_Int32 nLen);
 
     /// replace nDelLen characters at rStart with rText
@@ -349,19 +349,19 @@ public:
             const OUString& rText,
             const ::com::sun::star::uno::Sequence<sal_Int32>& rOffsets );
 
-    /// Virtual methods from CntntNode.
-    virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
-    virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
-    virtual SwCntntNode *JoinNext() SAL_OVERRIDE;
-    virtual SwCntntNode *JoinPrev() SAL_OVERRIDE;
+    /// Virtual methods from ContentNode.
+    virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
+    virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
+    virtual SwContentNode *JoinNext() SAL_OVERRIDE;
+    virtual SwContentNode *JoinPrev() SAL_OVERRIDE;
 
-    SwCntntNode *AppendNode( const SwPosition & );
+    SwContentNode *AppendNode( const SwPosition & );
 
     /// When appropriate set DontExpand-flag at INet or character styles respectively.
-    bool DontExpandFmt( const SwIndex& rIdx, bool bFlag = true,
-                        bool bFmtToTxtAttributes = true );
+    bool DontExpandFormat( const SwIndex& rIdx, bool bFlag = true,
+                        bool bFormatToTextAttributes = true );
 
-    enum GetTxtAttrMode {
+    enum GetTextAttrMode {
         DEFAULT,    /// DEFAULT: (Start <= nIndex <  End)
         EXPAND,     /// EXPAND : (Start <  nIndex <= End)
         PARENT,     /// PARENT : (Start <  nIndex <  End)
@@ -369,25 +369,25 @@ public:
 
     /** get the innermost text attribute covering position nIndex.
         @param nWhich   only attribute with this id is returned.
-        @param eMode    the predicate for matching (@see GetTxtAttrMode).
+        @param eMode    the predicate for matching (@see GetTextAttrMode).
 
         ATTENTION: this function is not well-defined for those
         hints of which several may cover a single position, like
         RES_TXTATR_CHARFMT, RES_TXTATR_REFMARK, RES_TXTATR_TOXMARK
      */
-    SwTxtAttr *GetTxtAttrAt(
+    SwTextAttr *GetTextAttrAt(
         sal_Int32 const nIndex,
         RES_TXTATR const nWhich,
-        enum GetTxtAttrMode const eMode = DEFAULT ) const;
+        enum GetTextAttrMode const eMode = DEFAULT ) const;
 
     /** get the innermost text attributes covering position nIndex.
         @param nWhich   only attributes with this id are returned.
-        @param eMode    the predicate for matching (@see GetTxtAttrMode).
+        @param eMode    the predicate for matching (@see GetTextAttrMode).
      */
-    ::std::vector<SwTxtAttr *> GetTxtAttrsAt(
+    ::std::vector<SwTextAttr *> GetTextAttrsAt(
         sal_Int32 const nIndex,
         RES_TXTATR const nWhich,
-        enum GetTxtAttrMode const eMode = DEFAULT ) const;
+        enum GetTextAttrMode const eMode = DEFAULT ) const;
 
     /** get the text attribute at position nIndex which owns
         the dummy character CH_TXTATR_* at that position, if one exists.
@@ -396,27 +396,27 @@ public:
                         attribute with given which id
         @return the text attribute at nIndex of type nWhich, if it exists
     */
-    SwTxtAttr *GetTxtAttrForCharAt(
+    SwTextAttr *GetTextAttrForCharAt(
         const sal_Int32 nIndex,
         const RES_TXTATR nWhich = RES_TXTATR_END ) const;
 
-    SwTxtFld* GetFldTxtAttrAt(
+    SwTextField* GetFieldTextAttrAt(
         const sal_Int32 nIndex,
-        const bool bIncludeInputFldAtStart = false ) const;
+        const bool bIncludeInputFieldAtStart = false ) const;
 
     OUString GetCurWord(sal_Int32) const;
     bool Spell(SwSpellArgs*);
     bool Convert( SwConversionArgs & );
 
-    inline SwTxtFmtColl *GetTxtColl() const;
-    virtual SwFmtColl *ChgFmtColl( SwFmtColl* ) SAL_OVERRIDE;
-    void _ChgTxtCollUpdateNum( const SwTxtFmtColl* pOld,
-                                const SwTxtFmtColl* pNew );
+    inline SwTextFormatColl *GetTextColl() const;
+    virtual SwFormatColl *ChgFormatColl( SwFormatColl* ) SAL_OVERRIDE;
+    void _ChgTextCollUpdateNum( const SwTextFormatColl* pOld,
+                                const SwTextFormatColl* pNew );
 
     /** Copy collection with all auto formats to dest-node.
         The latter might be in an other document!
        (Method in ndcopy.cxx!!). */
-    void CopyCollFmt( SwTxtNode& rDestNd );
+    void CopyCollFormat( SwTextNode& rDestNd );
 
     // BEGIN OF BULLET/NUMBERING/OUTLINE STUFF:
 
@@ -473,11 +473,11 @@ public:
     /**
        Returns the additional indents of this text node and its numbering.
 
-       @param bTxtLeft  ???
+       @param bTextLeft  ???
 
        @return additional indents
      */
-     long GetLeftMarginWithNum( bool bTxtLeft = false ) const;
+     long GetLeftMarginWithNum( bool bTextLeft = false ) const;
 
     /**
        Returns the combined first line indent of this text node and
@@ -529,7 +529,7 @@ public:
         This node is numbered if it has a SwNodeNum and it has a
         numbering rule and has not a hidden SwNodeNum.
 
-        ATTENTION: Returns true even if the SwNumFmt has type
+        ATTENTION: Returns true even if the SwNumFormat has type
         SVX_NUM_NUMBER_NONE.
 
         @retval true      This node is numbered.
@@ -579,7 +579,7 @@ public:
        Otherwise the text node has no outline level (NO_NUMBERING).
 
        NOTE: The outline level of text nodes is subject to change. The
-       plan is to have an SwTxtNode::nOutlineLevel member that is
+       plan is to have an SwTextNode::nOutlineLevel member that is
        updated from a paragraph style upon appliance of that paragraph
        style.
 
@@ -670,9 +670,9 @@ public:
 
     /// in ndcopy.cxx
     bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx.
-    virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+    virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
 
-    /// Interactive hyphenation: we find TxtFrm and call its CalcHyph.
+    /// Interactive hyphenation: we find TextFrm and call its CalcHyph.
     bool Hyphenate( SwInterHyphInfo &rHyphInf );
     void DelSoftHyph( const sal_Int32 nStart, const sal_Int32 nEnd );
 
@@ -682,20 +682,20 @@ public:
        add 5th optional parameter <bWithSpacesForLevel> indicating, if additional
        spaces are inserted in front of the expanded text string depending on
        the list level. */
-    OUString GetExpandTxt(  const sal_Int32 nIdx = 0,
+    OUString GetExpandText(  const sal_Int32 nIdx = 0,
                             const sal_Int32 nLen = -1,
                             const bool bWithNum = false,
                             const bool bAddSpaceAfterListLabelStr = false,
                             const bool bWithSpacesForLevel = false,
-                            const bool bWithFtn = true ) const;
-    bool GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0,
+                            const bool bWithFootnote = true ) const;
+    bool GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx = 0,
                            sal_Int32 nIdx = 0, sal_Int32 nLen = -1,
-                           bool bWithNum = false, bool bWithFtn = true,
+                           bool bWithNum = false, bool bWithFootnote = true,
                            bool bReplaceTabsWithSpaces = false ) const;
 
-    OUString GetRedlineTxt( sal_Int32 nIdx = 0,
+    OUString GetRedlineText( sal_Int32 nIdx = 0,
                           sal_Int32 nLen = SAL_MAX_INT32,
-                          bool bExpandFlds = false,
+                          bool bExpandFields = false,
                           bool bWithNum = false ) const;
 
     /** @return actual count of initial chars for initial-function.
@@ -800,31 +800,31 @@ public:
     sal_uInt32 GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const;
     sal_uInt32 GetParRsid() const;
 
-    bool CompareRsid( const SwTxtNode &rTxtNode, sal_Int32 nStt1, sal_Int32 nStt2,
+    bool CompareRsid( const SwTextNode &rTextNode, sal_Int32 nStt1, sal_Int32 nStt2,
             sal_Int32 nEnd1 = 0,  sal_Int32 nEnd2 = 0 ) const;
-    bool CompareParRsid( const SwTxtNode &rTxtNode ) const;
+    bool CompareParRsid( const SwTextNode &rTextNode ) const;
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTxtNode)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTextNode)
 
     //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
 
     /// In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it
-    static bool IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich);
+    static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich);
 };
 
-inline SwpHints & SwTxtNode::GetSwpHints()
+inline SwpHints & SwTextNode::GetSwpHints()
 {
     assert( m_pSwpHints );
     return *m_pSwpHints;
 }
-inline const SwpHints &SwTxtNode::GetSwpHints() const
+inline const SwpHints &SwTextNode::GetSwpHints() const
 {
     assert( m_pSwpHints );
     return *m_pSwpHints;
 }
 
-inline SwpHints& SwTxtNode::GetOrCreateSwpHints()
+inline SwpHints& SwTextNode::GetOrCreateSwpHints()
 {
     if ( !m_pSwpHints )
     {
@@ -833,7 +833,7 @@ inline SwpHints& SwTxtNode::GetOrCreateSwpHints()
     return *m_pSwpHints;
 }
 
-inline void SwTxtNode::TryDeleteSwpHints()
+inline void SwTextNode::TryDeleteSwpHints()
 {
     if ( m_pSwpHints && m_pSwpHints->CanBeDeleted() )
     {
@@ -841,30 +841,30 @@ inline void SwTxtNode::TryDeleteSwpHints()
     }
 }
 
-inline SwTxtFmtColl* SwTxtNode::GetTxtColl() const
+inline SwTextFormatColl* SwTextNode::GetTextColl() const
 {
-    return static_cast<SwTxtFmtColl*>(const_cast<SwModify*>(GetRegisteredIn()));
+    return static_cast<SwTextFormatColl*>(const_cast<SwModify*>(GetRegisteredIn()));
 }
 
 /// Inline methods from Node.hxx
-inline SwTxtNode *SwNode::GetTxtNode()
+inline SwTextNode *SwNode::GetTextNode()
 {
-     return ND_TEXTNODE == nNodeType ? static_cast<SwTxtNode*>(this) : 0;
+     return ND_TEXTNODE == nNodeType ? static_cast<SwTextNode*>(this) : 0;
 }
 
-inline const SwTxtNode *SwNode::GetTxtNode() const
+inline const SwTextNode *SwNode::GetTextNode() const
 {
-     return ND_TEXTNODE == nNodeType ? static_cast<const SwTxtNode*>(this) : 0;
+     return ND_TEXTNODE == nNodeType ? static_cast<const SwTextNode*>(this) : 0;
 }
 
 inline void
-SwTxtNode::CutText(SwTxtNode * const pDest, const SwIndex & rDestStart,
+SwTextNode::CutText(SwTextNode * const pDest, const SwIndex & rDestStart,
                     const SwIndex & rStart, const sal_Int32 nLen)
 {
     CutImpl( pDest, rDestStart, rStart, nLen, true );
 }
 
-inline sal_Int32 SwTxtNode::GetSpaceLeft() const
+inline sal_Int32 SwTextNode::GetSpaceLeft() const
 {
     // do not fill the String up to the max - need to be able to have a
     // SwPosition "behind" the last character, i.e., at index TXTNODE_MAX + 1
diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx
index cbf71abfe00e..081ccadf1637 100644
--- a/sw/inc/ndtyp.hxx
+++ b/sw/inc/ndtyp.hxx
@@ -33,7 +33,7 @@ const sal_uInt8 ND_OLENODE      = 0x20;
 const sal_uInt8 ND_SECTIONNODE  = 0x40 | ND_STARTNODE; ///< SwSectionNode is derived from SwStartNode.
 const sal_uInt8 ND_PLACEHOLDER  = 0x80;
 
-// NoTxtNode (if any of the 2 bits are set).
+// NoTextNode (if any of the 2 bits are set).
 const sal_uInt8 ND_NOTXTNODE    = ND_GRFNODE | ND_OLENODE;
 // ContentNode (if any of the 3 bits are set).
 const sal_uInt8 ND_CONTENTNODE  = ND_TEXTNODE | ND_NOTXTNODE;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index d27494db31ef..bc8f8d090a31 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -32,19 +32,19 @@
 #include <memory>
 #include <vector>
 
-class SwCntntFrm;
-class SwCntntNode;
+class SwContentFrm;
+class SwContentNode;
 class SwDoc;
 class SwEndNode;
 class SwFrm;
-class SwFrmFmt;
+class SwFrameFormat;
 class SwGrfNode;
-class SwNoTxtNode;
+class SwNoTextNode;
 class SwNodeIndex;
 class SwOLENode;
 class SwRect;
 class SwSection;
-class SwSectionFmt;
+class SwSectionFormat;
 class SwTOXBase;
 class SwSectionNode;
 class SwStartNode;
@@ -53,7 +53,7 @@ class SwRootFrm;
 class SwTable;
 class SwTableNode;
 class SwTableBox;
-class SwTxtNode;
+class SwTextNode;
 class SwPageDesc;
 class SwViewShell;
 struct SwPosition;
@@ -85,7 +85,7 @@ class SW_DLLPUBLIC SwNode
     sal_uInt8 nNodeType;
 
     /// For text nodes: level of auto format. Was put here because we had still free bits.
-    sal_uInt8 nAFmtNumLvl : 3;
+    sal_uInt8 nAFormatNumLvl : 3;
     bool bSetNumLSpace : 1;         ///< For numbering: TRUE: set indent.
     bool bIgnoreDontExpand : 1;     ///< for Text Attributes - ignore the flag
 
@@ -94,10 +94,10 @@ class SW_DLLPUBLIC SwNode
     long m_nSerial;
 #endif
 
-    /// all SwFrmFmt that are anchored at the node
-    /// invariant: SwFrmFmt is in the list iff
-    /// SwFrmFmt::GetAnchor().GetCntntAnchor() points to this node
-    std::unique_ptr<std::vector<SwFrmFmt*>> m_pAnchoredFlys;
+    /// all SwFrameFormat that are anchored at the node
+    /// invariant: SwFrameFormat is in the list iff
+    /// SwFrameFormat::GetAnchor().GetContentAnchor() points to this node
+    std::unique_ptr<std::vector<SwFrameFormat*>> m_pAnchoredFlys;
 
 protected:
     SwStartNode* pStartOfSection;
@@ -126,8 +126,8 @@ public:
     inline const SwEndNode* EndOfSectionNode() const;
     inline         SwEndNode* EndOfSectionNode();
 
-    inline sal_uInt8 GetAutoFmtLvl() const     { return nAFmtNumLvl; }
-    inline void SetAutoFmtLvl( sal_uInt8 nVal )      { nAFmtNumLvl = nVal; }
+    inline sal_uInt8 GetAutoFormatLvl() const     { return nAFormatNumLvl; }
+    inline void SetAutoFormatLvl( sal_uInt8 nVal )      { nAFormatNumLvl = nVal; }
 
     inline bool IsSetNumLSpace() const  { return bSetNumLSpace; }
     inline void SetNumLSpace( bool bFlag )        { bSetNumLSpace = bFlag; }
@@ -139,16 +139,16 @@ public:
 
     inline       SwStartNode *GetStartNode();
     inline const SwStartNode *GetStartNode() const;
-    inline       SwCntntNode *GetCntntNode();
-    inline const SwCntntNode *GetCntntNode() const;
+    inline       SwContentNode *GetContentNode();
+    inline const SwContentNode *GetContentNode() const;
     inline       SwEndNode   *GetEndNode();
     inline const SwEndNode   *GetEndNode() const;
-    inline       SwTxtNode   *GetTxtNode();
-    inline const SwTxtNode   *GetTxtNode() const;
+    inline       SwTextNode   *GetTextNode();
+    inline const SwTextNode   *GetTextNode() const;
     inline       SwOLENode   *GetOLENode();
     inline const SwOLENode   *GetOLENode() const;
-    inline       SwNoTxtNode *GetNoTxtNode();
-    inline const SwNoTxtNode *GetNoTxtNode() const;
+    inline       SwNoTextNode *GetNoTextNode();
+    inline const SwNoTextNode *GetNoTextNode() const;
     inline       SwGrfNode   *GetGrfNode();
     inline const SwGrfNode   *GetGrfNode() const;
     inline       SwTableNode *GetTableNode();
@@ -157,13 +157,13 @@ public:
     inline const SwSectionNode *GetSectionNode() const;
 
     inline bool IsStartNode() const;
-    inline bool IsCntntNode() const;
+    inline bool IsContentNode() const;
     inline bool IsEndNode() const;
-    inline bool IsTxtNode() const;
+    inline bool IsTextNode() const;
     inline bool IsTableNode() const;
     inline bool IsSectionNode() const;
     inline bool IsOLENode() const;
-    inline bool IsNoTxtNode() const;
+    inline bool IsNoTextNode() const;
     inline bool IsGrfNode() const;
 
     /**
@@ -271,20 +271,20 @@ public:
     const SwPageDesc* FindPageDesc( bool bCalcLay, size_t* pPgDescNdIdx = 0 ) const;
 
     /// If node is in a fly return the respective format.
-    SwFrmFmt* GetFlyFmt() const;
+    SwFrameFormat* GetFlyFormat() const;
 
     /// If node is in a table return the respective table box.
-    SwTableBox* GetTblBox() const;
+    SwTableBox* GetTableBox() const;
 
     inline sal_uLong GetIndex() const { return GetPos(); }
 
-    const SwTxtNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const;
+    const SwTextNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const;
 
     sal_uInt8 HasPrevNextLayNode() const;
 
-    std::vector<SwFrmFmt *> const* GetAnchoredFlys() const { return m_pAnchoredFlys.get(); }
-    void AddAnchoredFly(SwFrmFmt *);
-    void RemoveAnchoredFly(SwFrmFmt *);
+    std::vector<SwFrameFormat *> const* GetAnchoredFlys() const { return m_pAnchoredFlys.get(); }
+    void AddAnchoredFly(SwFrameFormat *);
+    void RemoveAnchoredFly(SwFrameFormat *);
 
     /**
      * Dumps the node structure to the given destination (file nodes.xml in the current directory by default)
@@ -349,9 +349,9 @@ private:
     SwEndNode & operator= ( const SwEndNode & rNode ) SAL_DELETED_FUNCTION;
 };
 
-// SwCntntNode
+// SwContentNode
 
-class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexReg
+class SW_DLLPUBLIC SwContentNode: public SwModify, public SwNode, public SwIndexReg
 {
 
 //FEATURE::CONDCOLL
@@ -360,14 +360,14 @@ class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexRe
     mutable bool mbSetModifyAtAttr;
 
 protected:
-    SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeType,
-                SwFmtColl *pFmtColl );
+    SwContentNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeType,
+                SwFormatColl *pFormatColl );
     /** the = 0 forces the class to be an abstract base class, but the dtor can be still called
        from subclasses */
-    virtual ~SwCntntNode() = 0;
+    virtual ~SwContentNode() = 0;
 
-    /**  Attribute-set for all auto attributes of a CntntNode.
-      (e.g. TxtNode or NoTxtNode). */
+    /**  Attribute-set for all auto attributes of a ContentNode.
+      (e.g. TextNode or NoTextNode). */
     std::shared_ptr<const SfxItemSet> mpAttrSet;
 
     /// Make respective nodes create the specific AttrSets.
@@ -384,12 +384,12 @@ public:
 
     /** MakeFrm will be called for a certain layout
        pSib is another SwFrm of the same layout (e.g. the SwRootFrm itself, a sibling, the parent) */
-    virtual SwCntntFrm *MakeFrm( SwFrm* pSib ) = 0;
+    virtual SwContentFrm *MakeFrm( SwFrm* pSib ) = 0;
 
-    virtual SwCntntNode *SplitCntntNode(const SwPosition & ) = 0;
+    virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0;
 
-    virtual SwCntntNode *JoinNext();
-    virtual SwCntntNode *JoinPrev();
+    virtual SwContentNode *JoinNext();
+    virtual SwContentNode *JoinPrev();
     /** Is it possible to join two nodes?
        In pIdx the second position can be returned. */
     bool CanJoinNext( SwNodeIndex* pIdx =0 ) const;
@@ -402,7 +402,7 @@ public:
     bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const;
 
     /// Replacement for good old GetFrm(..):
-    SwCntntFrm *getLayoutFrm( const SwRootFrm*,
+    SwContentFrm *getLayoutFrm( const SwRootFrm*,
                         const Point* pDocPos = 0,
                         const SwPosition *pPos = 0,
                         const bool bCalcFrm = true ) const;
@@ -417,7 +417,7 @@ public:
 
     /** Method creates all views of document for given node. The content
        frames that are created are put in the respective layout. */
-    void MakeFrms( SwCntntNode& rNode );
+    void MakeFrms( SwContentNode& rNode );
 
     /** Method deletes all views of document for the node. The content-
         frames are removed from the respective layout.
@@ -430,7 +430,7 @@ public:
        There are differences between text node and formula node. */
     virtual sal_Int32 Len() const;
 
-    virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0;
+    virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0;
 
     /// Get information from Client.
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
@@ -456,13 +456,13 @@ public:
     inline const SwAttrSet *GetpSwAttrSet() const { return static_cast<const SwAttrSet*>(mpAttrSet.get()); }
     inline bool  HasSwAttrSet() const { return mpAttrSet != nullptr; }
 
-    virtual SwFmtColl* ChgFmtColl( SwFmtColl* );
-    SwFmtColl* GetFmtColl() const { return const_cast<SwFmtColl*>(static_cast<const SwFmtColl*>(GetRegisteredIn())); }
+    virtual SwFormatColl* ChgFormatColl( SwFormatColl* );
+    SwFormatColl* GetFormatColl() const { return const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn())); }
 
 //FEATURE::CONDCOLL
-    inline SwFmtColl& GetAnyFmtColl() const;
-    void SetCondFmtColl( SwFmtColl* );
-    inline SwFmtColl* GetCondFmtColl() const;
+    inline SwFormatColl& GetAnyFormatColl() const;
+    void SetCondFormatColl( SwFormatColl* );
+    inline SwFormatColl* GetCondFormatColl() const;
 
     bool IsAnyCondition( SwCollCondition& rTmp ) const;
     void ChkCondColl();
@@ -480,14 +480,14 @@ public:
     inline void SetModifyAtAttr( bool bSetModifyAtAttr ) const { mbSetModifyAtAttr = bSetModifyAtAttr; }
     inline bool GetModifyAtAttr() const { return mbSetModifyAtAttr; }
 
-    static SwOLENodes* CreateOLENodesArray( const SwFmtColl& rColl, bool bOnlyWithInvalidSize );
+    static SwOLENodes* CreateOLENodesArray( const SwFormatColl& rColl, bool bOnlyWithInvalidSize );
 
     //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
 
 private:
-    SwCntntNode( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION;
-    SwCntntNode & operator= ( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION;
+    SwContentNode( const SwContentNode & rNode ) SAL_DELETED_FUNCTION;
+    SwContentNode & operator= ( const SwContentNode & rNode ) SAL_DELETED_FUNCTION;
 };
 
 // SwTableNode
@@ -544,7 +544,7 @@ protected:
 
 public:
     SwSectionNode(SwNodeIndex const&,
-        SwSectionFmt & rFmt, SwTOXBase const*const pTOXBase);
+        SwSectionFormat & rFormat, SwTOXBase const*const pTOXBase);
 
     const SwSection& GetSection() const { return *m_pSection; }
           SwSection& GetSection()       { return *m_pSection; }
@@ -572,7 +572,7 @@ public:
 
     /** Check for not hidden areas whether there is content that is not in
        a hidden sub-area. */
-    bool IsCntntHidden() const;
+    bool IsContentHidden() const;
 
 };
 
@@ -620,20 +620,20 @@ inline const SwSectionNode *SwNode::GetSectionNode() const
 {
      return ND_SECTIONNODE == nNodeType ? static_cast<const SwSectionNode*>(this) : 0;
 }
-inline       SwCntntNode *SwNode::GetCntntNode()
+inline       SwContentNode *SwNode::GetContentNode()
 {
-     return ND_CONTENTNODE & nNodeType ? static_cast<SwCntntNode*>(this) : 0;
+     return ND_CONTENTNODE & nNodeType ? static_cast<SwContentNode*>(this) : 0;
 }
-inline const SwCntntNode *SwNode::GetCntntNode() const
+inline const SwContentNode *SwNode::GetContentNode() const
 {
-     return ND_CONTENTNODE & nNodeType ? static_cast<const SwCntntNode*>(this) : 0;
+     return ND_CONTENTNODE & nNodeType ? static_cast<const SwContentNode*>(this) : 0;
 }
 
 inline bool SwNode::IsStartNode() const
 {
     return (ND_STARTNODE & nNodeType) != 0;
 }
-inline bool SwNode::IsCntntNode() const
+inline bool SwNode::IsContentNode() const
 {
     return (ND_CONTENTNODE & nNodeType) != 0;
 }
@@ -641,7 +641,7 @@ inline bool SwNode::IsEndNode() const
 {
     return ND_ENDNODE == nNodeType;
 }
-inline bool SwNode::IsTxtNode() const
+inline bool SwNode::IsTextNode() const
 {
     return ND_TEXTNODE == nNodeType;
 }
@@ -653,7 +653,7 @@ inline bool SwNode::IsSectionNode() const
 {
     return ND_SECTIONNODE == nNodeType;
 }
-inline bool SwNode::IsNoTxtNode() const
+inline bool SwNode::IsNoTextNode() const
 {
     return (ND_NOTXTNODE & nNodeType) != 0;
 }
@@ -716,26 +716,26 @@ inline const SwDoc* SwNode::GetDoc() const
     return GetNodes().GetDoc();
 }
 
-inline SwFmtColl* SwCntntNode::GetCondFmtColl() const
+inline SwFormatColl* SwContentNode::GetCondFormatColl() const
 {
-    return pCondColl ? static_cast<SwFmtColl*>(pCondColl->GetRegisteredIn()) : 0;
+    return pCondColl ? static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn()) : 0;
 }
 
-inline SwFmtColl& SwCntntNode::GetAnyFmtColl() const
+inline SwFormatColl& SwContentNode::GetAnyFormatColl() const
 {
     return pCondColl && pCondColl->GetRegisteredIn()
-                ? *static_cast<SwFmtColl*>(pCondColl->GetRegisteredIn())
-                : *const_cast<SwFmtColl*>(static_cast<const SwFmtColl*>(GetRegisteredIn()));
+                ? *static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn())
+                : *const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn()));
 }
 
-inline const SwAttrSet& SwCntntNode::GetSwAttrSet() const
+inline const SwAttrSet& SwContentNode::GetSwAttrSet() const
 {
-    return mpAttrSet ? *GetpSwAttrSet() : GetAnyFmtColl().GetAttrSet();
+    return mpAttrSet ? *GetpSwAttrSet() : GetAnyFormatColl().GetAttrSet();
 }
 
 //FEATURE::CONDCOLL
 
-inline const SfxPoolItem& SwCntntNode::GetAttr( sal_uInt16 nWhich,
+inline const SfxPoolItem& SwContentNode::GetAttr( sal_uInt16 nWhich,
                                                 bool bInParents ) const
 {
     return GetSwAttrSet().Get( nWhich, bInParents );
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index c83d1de861f7..585937dfe188 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -33,7 +33,7 @@
 #include <vector>
 #include <charfmt.hxx>
 
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class IDocumentListsAccess;
 class SwNodeNum;
 namespace vcl { class Font; }
@@ -41,15 +41,15 @@ class SvxBrushItem;
 class SfxGrabBagItem;
 class SvxNumRule;
 class SwDoc;
-class SwFmtVertOrient;
-class SwTxtNode;
+class SwFormatVertOrient;
+class SwTextNode;
 class Size;
 
 const sal_Unicode cBulletChar = 0x2022; ///< Character for lists.
 
-class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient
+class SW_DLLPUBLIC SwNumFormat : public SvxNumberFormat, public SwClient
 {
-    SwFmtVertOrient* pVertOrient;
+    SwFormatVertOrient* pVertOrient;
     //For i120928,record the cp info of graphic within bullet
     sal_Unicode     cGrfBulletCP;
     SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
@@ -62,22 +62,22 @@ protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
 
 public:
-    SwNumFmt();
-    SwNumFmt( const SwNumFmt& );
-    SwNumFmt( const SvxNumberFormat&, SwDoc* pDoc);
+    SwNumFormat();
+    SwNumFormat( const SwNumFormat& );
+    SwNumFormat( const SvxNumberFormat&, SwDoc* pDoc);
 
-    virtual ~SwNumFmt();
+    virtual ~SwNumFormat();
 
-    SwNumFmt& operator=( const SwNumFmt& );
+    SwNumFormat& operator=( const SwNumFormat& );
 
-    bool operator==( const SwNumFmt& ) const;
-    bool operator!=( const SwNumFmt& r ) const { return !(*this == r); }
+    bool operator==( const SwNumFormat& ) const;
+    bool operator!=( const SwNumFormat& r ) const { return !(*this == r); }
 
-    SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); }
-    void       SetCharFmt( SwCharFmt* );
+    SwCharFormat* GetCharFormat() const { return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); }
+    void       SetCharFormat( SwCharFormat* );
 
-    void                    SetCharFmtName(const OUString& rSet);
-    virtual OUString        GetCharFmtName() const SAL_OVERRIDE;
+    void                    SetCharFormatName(const OUString& rSet);
+    virtual OUString        GetCharFormatName() const SAL_OVERRIDE;
 
     //For i120928,access the cp info of graphic within bullet
     void            SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;}
@@ -87,7 +87,7 @@ public:
 
     virtual void                SetVertOrient(sal_Int16 eSet) SAL_OVERRIDE;
     virtual sal_Int16   GetVertOrient() const SAL_OVERRIDE;
-    const SwFmtVertOrient*      GetGraphicOrientation() const;
+    const SwFormatVertOrient*      GetGraphicOrientation() const;
 
     bool IsEnumeration() const; // #i22362#
     bool IsItemize() const; // #i29560#
@@ -99,8 +99,8 @@ class SW_DLLPUBLIC SwNumRule
 {
 
 public:
-    typedef std::vector< SwTxtNode* > tTxtNodeList;
-    typedef std::vector< SwTxtFmtColl* > tParagraphStyleList;
+    typedef std::vector< SwTextNode* > tTextNodeList;
+    typedef std::vector< SwTextFormatColl* > tParagraphStyleList;
 
     struct Extremities
     {
@@ -111,16 +111,16 @@ public:
 private:
     friend void _FinitCore();
 
-    static SwNumFmt* maBaseFmts [ RULE_END ][ MAXLEVEL ];
+    static SwNumFormat* maBaseFormats [ RULE_END ][ MAXLEVEL ];
     static const sal_uInt16 maDefNumIndents[ MAXLEVEL ];
     /// default list level properties for position-and-space mode LABEL_ALIGNMENT
-    static SwNumFmt* maLabelAlignmentBaseFmts [ RULE_END ][ MAXLEVEL ];
+    static SwNumFormat* maLabelAlignmentBaseFormats [ RULE_END ][ MAXLEVEL ];
     static sal_uInt16 mnRefCount;
 
-    SwNumFmt* maFmts[ MAXLEVEL ];
+    SwNumFormat* maFormats[ MAXLEVEL ];
 
     /** container for associated text nodes */
-    tTxtNodeList maTxtNodeList;
+    tTextNodeList maTextNodeList;
 
     /** container for associated paragraph styles */
     tParagraphStyleList maParagraphStyleList;
@@ -130,7 +130,7 @@ private:
 
     OUString msName;
     SwNumRuleType meRuleType;
-    sal_uInt16 mnPoolFmtId;      ///< Id-for NumRules created "automatically"
+    sal_uInt16 mnPoolFormatId;      ///< Id-for NumRules created "automatically"
     sal_uInt16 mnPoolHelpId;     ///< HelpId for this Pool-style.
     sal_uInt8 mnPoolHlpFileId;   ///< FilePos at Doc on style helps.
     bool mbAutoRuleFlag : 1;
@@ -158,14 +158,14 @@ public:
     bool operator==( const SwNumRule& ) const;
     bool operator!=( const SwNumRule& r ) const { return !(*this == r); }
 
-    const SwNumFmt* GetNumFmt( sal_uInt16 i ) const;
-    const SwNumFmt& Get( sal_uInt16 i ) const;
+    const SwNumFormat* GetNumFormat( sal_uInt16 i ) const;
+    const SwNumFormat& Get( sal_uInt16 i ) const;
 
     bool IsHidden( ) const { return mbHidden; }
     void SetHidden( bool bValue ) { mbHidden = bValue; }
 
-    void Set( sal_uInt16 i, const SwNumFmt* );
-    void Set( sal_uInt16 i, const SwNumFmt& );
+    void Set( sal_uInt16 i, const SwNumFormat* );
+    void Set( sal_uInt16 i, const SwNumFormat& );
     OUString MakeNumString( const SwNodeNum&, bool bInclStrings = true,
                             bool bOnlyArabic = false ) const;
     /** - add optional parameter <_nRestrictToThisLevel> in order to
@@ -183,15 +183,15 @@ public:
 
        @return list of associated text nodes
     */
-    void GetTxtNodeList( SwNumRule::tTxtNodeList& rTxtNodeList ) const;
-    SwNumRule::tTxtNodeList::size_type GetTxtNodeListSize() const;
+    void GetTextNodeList( SwNumRule::tTextNodeList& rTextNodeList ) const;
+    SwNumRule::tTextNodeList::size_type GetTextNodeListSize() const;
 
-    void AddTxtNode( SwTxtNode& rTxtNode );
-    void RemoveTxtNode( SwTxtNode& rTxtNode );
+    void AddTextNode( SwTextNode& rTextNode );
+    void RemoveTextNode( SwTextNode& rTextNode );
 
     SwNumRule::tParagraphStyleList::size_type GetParagraphStyleListSize() const;
-    void AddParagraphStyle( SwTxtFmtColl& rTxtFmtColl );
-    void RemoveParagraphStyle( SwTxtFmtColl& rTxtFmtColl );
+    void AddParagraphStyle( SwTextFormatColl& rTextFormatColl );
+    void RemoveParagraphStyle( SwTextFormatColl& rTextFormatColl );
 
     inline void SetDefaultListId( const OUString& sDefaultListId )
     {
@@ -225,7 +225,7 @@ public:
 
     /** Tests whether the CharFormats are from the given doc
        and copies them if appropriate. */
-    void CheckCharFmts( SwDoc* pDoc );
+    void CheckCharFormats( SwDoc* pDoc );
 
     OUString GetName() const { return msName; }
 
@@ -250,8 +250,8 @@ public:
     void SetCountPhantoms(bool bCountPhantoms);
 
     /// Query and set PoolFormat IDs.
-    sal_uInt16 GetPoolFmtId() const         { return mnPoolFmtId; }
-    void SetPoolFmtId( sal_uInt16 nId )     { mnPoolFmtId = nId; }
+    sal_uInt16 GetPoolFormatId() const         { return mnPoolFormatId; }
+    void SetPoolFormatId( sal_uInt16 nId )     { mnPoolFormatId = nId; }
 
     /// Query and set Help-IDs for document styles.
     sal_uInt16 GetPoolHelpId() const        { return mnPoolHelpId; }
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index b25e9af8ca11..5bdb73884dbf 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -28,11 +28,11 @@
 #include <editeng/borderline.hxx>
 
 class SfxPoolItem;
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwNode;
 
 /// Separator line adjustment.
-enum SwFtnAdj
+enum SwFootnoteAdj
 {
     FTNADJ_LEFT,
     FTNADJ_CENTER,
@@ -40,7 +40,7 @@ enum SwFtnAdj
 };
 
 /// Footnote information.
-class SW_DLLPUBLIC SwPageFtnInfo
+class SW_DLLPUBLIC SwPageFootnoteInfo
 {
 private:
     SwTwips     m_nMaxHeight;   ///< maximum height of the footnote area.
@@ -48,7 +48,7 @@ private:
     editeng::SvxBorderStyle m_eLineStyle;  ///< Style of the separator line
     Color       m_LineColor;    ///< color of the separator line
     Fraction    m_Width;        ///< percentage width of the separator line.
-    SwFtnAdj    m_eAdjust;      ///< line adjustment.
+    SwFootnoteAdj    m_eAdjust;      ///< line adjustment.
     SwTwips     m_nTopDist;     ///< distance between body and separator.
     SwTwips     m_nBottomDist;  ///< distance between separator and first footnote
 
@@ -58,7 +58,7 @@ public:
     const Color& GetLineColor() const   { return m_LineColor;}
     editeng::SvxBorderStyle  GetLineStyle() const { return m_eLineStyle; }
     const Fraction& GetWidth() const    { return m_Width; }
-    SwFtnAdj    GetAdj() const          { return m_eAdjust; }
+    SwFootnoteAdj    GetAdj() const          { return m_eAdjust; }
     SwTwips     GetTopDist() const      { return m_nTopDist; }
     SwTwips     GetBottomDist() const   { return m_nBottomDist; }
 
@@ -67,19 +67,19 @@ public:
     void SetLineStyle(editeng::SvxBorderStyle const eSet) {m_eLineStyle = eSet;}
     void SetLineColor(const Color& rCol)    { m_LineColor = rCol;}
     void SetWidth(const Fraction & rNew)    { m_Width = rNew; }
-    void SetAdj(SwFtnAdj const eNew)        { m_eAdjust = eNew; }
+    void SetAdj(SwFootnoteAdj const eNew)        { m_eAdjust = eNew; }
     void SetTopDist   (SwTwips const nNew)  { m_nTopDist = nNew; }
     void SetBottomDist(SwTwips const nNew)  { m_nBottomDist = nNew; }
 
-    SwPageFtnInfo();
-    SwPageFtnInfo( const SwPageFtnInfo& );
-    SwPageFtnInfo& operator=( const SwPageFtnInfo& );
+    SwPageFootnoteInfo();
+    SwPageFootnoteInfo( const SwPageFootnoteInfo& );
+    SwPageFootnoteInfo& operator=( const SwPageFootnoteInfo& );
 
-    bool operator ==( const SwPageFtnInfo& ) const;
+    bool operator ==( const SwPageFootnoteInfo& ) const;
 };
 
 /*
- *  Use of UseOnPage (m_eUse) and of FrmFmts
+ *  Use of UseOnPage (m_eUse) and of FrameFormats
  *
  *  RIGHT   - m_Master only for right hand (odd) pages, left hand (even) pages
  *            always empty.
@@ -134,11 +134,11 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
 
     OUString    m_StyleName;
     SvxNumberType m_NumType;
-    SwFrmFmt    m_Master;
-    SwFrmFmt    m_Left;
+    SwFrameFormat    m_Master;
+    SwFrameFormat    m_Left;
     // FIXME epicycles growing here - page margins need to be stored differently
-    SwFrmFmt    m_FirstMaster;
-    SwFrmFmt    m_FirstLeft;
+    SwFrameFormat    m_FirstMaster;
+    SwFrameFormat    m_FirstLeft;
     SwDepend    m_Depend; ///< Because of grid alignment (Registerhaltigkeit).
     SwPageDesc *m_pFollow;
     sal_uInt16  m_nRegHeight; ///< Sentence spacing and fontascent of style.
@@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
     bool        m_IsHidden;
 
     /// Footnote information.
-    SwPageFtnInfo m_IsFtnInfo;
+    SwPageFootnoteInfo m_IsFootnoteInfo;
 
     /** Called for mirroring of Chg (doc).
        No adjustment at any other place. */
@@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
 
     SAL_DLLPRIVATE void ResetAllAttr( bool bLeft );
 
-    SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc );
+    SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrameFormat*, SwDoc *pDc );
 
 protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) SAL_OVERRIDE;
@@ -172,9 +172,9 @@ public:
     const SvxNumberType &GetNumType() const { return m_NumType; }
     void  SetNumType(const SvxNumberType& rNew) { m_NumType = rNew; }
 
-    const SwPageFtnInfo &GetFtnInfo() const { return m_IsFtnInfo; }
-          SwPageFtnInfo &GetFtnInfo()       { return m_IsFtnInfo; }
-    void  SetFtnInfo(const SwPageFtnInfo &rNew) { m_IsFtnInfo = rNew; }
+    const SwPageFootnoteInfo &GetFootnoteInfo() const { return m_IsFootnoteInfo; }
+          SwPageFootnoteInfo &GetFootnoteInfo()       { return m_IsFootnoteInfo; }
+    void  SetFootnoteInfo(const SwPageFootnoteInfo &rNew) { m_IsFootnoteInfo = rNew; }
 
     inline bool IsHeaderShared() const;
     inline bool IsFooterShared() const;
@@ -192,14 +192,14 @@ public:
     void      WriteUseOn(UseOnPage const eNew) { m_eUse = eNew; }
     UseOnPage ReadUseOn() const { return m_eUse; }
 
-          SwFrmFmt &GetMaster()      { return m_Master; }
-          SwFrmFmt &GetLeft()        { return m_Left; }
-          SwFrmFmt &GetFirstMaster() { return m_FirstMaster; }
-          SwFrmFmt &GetFirstLeft()   { return m_FirstLeft; }
-    const SwFrmFmt &GetMaster() const      { return m_Master; }
-    const SwFrmFmt &GetLeft()   const      { return m_Left; }
-    const SwFrmFmt &GetFirstMaster() const { return m_FirstMaster; }
-    const SwFrmFmt &GetFirstLeft()   const { return m_FirstLeft; }
+          SwFrameFormat &GetMaster()      { return m_Master; }
+          SwFrameFormat &GetLeft()        { return m_Left; }
+          SwFrameFormat &GetFirstMaster() { return m_FirstMaster; }
+          SwFrameFormat &GetFirstLeft()   { return m_FirstLeft; }
+    const SwFrameFormat &GetMaster() const      { return m_Master; }
+    const SwFrameFormat &GetLeft()   const      { return m_Left; }
+    const SwFrameFormat &GetFirstMaster() const { return m_FirstMaster; }
+    const SwFrameFormat &GetFirstLeft()   const { return m_FirstLeft; }
 
     /** Reset all attrs of the format but keep the ones a pagedesc
        cannot live without. */
@@ -208,10 +208,10 @@ public:
 
     /** Layout uses the following methods to obtain a format in order
        to be able to create a page. */
-           SwFrmFmt *GetRightFmt(bool const bFirst = false);
-    inline const SwFrmFmt *GetRightFmt(bool const bFirst = false) const;
-           SwFrmFmt *GetLeftFmt(bool const bFirst = false);
-    inline const SwFrmFmt *GetLeftFmt(bool const bFirst = false) const;
+           SwFrameFormat *GetRightFormat(bool const bFirst = false);
+    inline const SwFrameFormat *GetRightFormat(bool const bFirst = false) const;
+           SwFrameFormat *GetLeftFormat(bool const bFirst = false);
+    inline const SwFrameFormat *GetLeftFormat(bool const bFirst = false) const;
 
     sal_uInt16 GetRegHeight() const { return m_nRegHeight; }
     sal_uInt16 GetRegAscent() const { return m_nRegAscent; }
@@ -222,13 +222,13 @@ public:
     const SwPageDesc* GetFollow() const { return m_pFollow; }
           SwPageDesc* GetFollow() { return m_pFollow; }
 
-    void SetRegisterFmtColl( const SwTxtFmtColl* rFmt );
-    const SwTxtFmtColl* GetRegisterFmtColl() const;
+    void SetRegisterFormatColl( const SwTextFormatColl* rFormat );
+    const SwTextFormatColl* GetRegisterFormatColl() const;
     void RegisterChange();
 
     /// Query and set PoolFormat-Id.
-    sal_uInt16 GetPoolFmtId() const         { return m_Master.GetPoolFmtId(); }
-    void SetPoolFmtId(sal_uInt16 const nId) { m_Master.SetPoolFmtId(nId); }
+    sal_uInt16 GetPoolFormatId() const         { return m_Master.GetPoolFormatId(); }
+    void SetPoolFormatId(sal_uInt16 const nId) { m_Master.SetPoolFormatId(nId); }
     sal_uInt16 GetPoolHelpId() const        { return m_Master.GetPoolHelpId(); }
     void SetPoolHelpId(sal_uInt16 const nId){ m_Master.SetPoolHelpId(nId); }
     sal_uInt8 GetPoolHlpFileId() const      { return m_Master.GetPoolHlpFileId(); }
@@ -237,7 +237,7 @@ public:
     /// Query information from Client.
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
 
-    const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd,
+    const SwFrameFormat* GetPageFormatOfNode( const SwNode& rNd,
                                     bool bCheckForThisPgDc = true ) const;
     bool IsFollowNextPageOfNode( const SwNode& rNd ) const;
 
@@ -310,13 +310,13 @@ inline void SwPageDesc::ResetAllLeftAttr()
     ResetAllAttr( true );
 }
 
-inline const SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst) const
+inline const SwFrameFormat *SwPageDesc::GetRightFormat(bool const bFirst) const
 {
-    return const_cast<SwPageDesc*>(this)->GetRightFmt(bFirst);
+    return const_cast<SwPageDesc*>(this)->GetRightFormat(bFirst);
 }
-inline const SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst) const
+inline const SwFrameFormat *SwPageDesc::GetLeftFormat(bool const bFirst) const
 {
-    return const_cast<SwPageDesc*>(this)->GetLeftFmt(bFirst);
+    return const_cast<SwPageDesc*>(this)->GetLeftFormat(bFirst);
 }
 
 class SwPageDescExt
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 916e4e0a585e..451895460a67 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -30,12 +30,12 @@
 
 #include <iostream>
 
-class SwFmt;
+class SwFormat;
 class SfxPoolItem;
 class SfxItemSet;
 class SwDoc;
 class SwNode;
-class SwCntntNode;
+class SwContentNode;
 class SwPaM;
 class Point;
 
@@ -53,10 +53,10 @@ struct SW_DLLPUBLIC SwPosition
     SwNodeIndex nNode;
     SwIndex nContent;
 
-    SwPosition( const SwNodeIndex &rNode, const SwIndex &rCntnt );
+    SwPosition( const SwNodeIndex &rNode, const SwIndex &rContent );
     explicit SwPosition( const SwNodeIndex &rNode );
     explicit SwPosition( const SwNode& rNode );
-    explicit SwPosition( SwCntntNode& rNode, const sal_Int32 nOffset = 0 );
+    explicit SwPosition( SwContentNode& rNode, const sal_Int32 nOffset = 0 );
 
     SwPosition( const SwPosition & );
     SwPosition &operator=(const SwPosition &);
@@ -147,10 +147,10 @@ typedef bool (*SwGoInDoc)( SwPaM& rPam, SwMoveFn fnMove );
 SW_DLLPUBLIC extern SwGoInDoc fnGoDoc;
 extern SwGoInDoc fnGoSection;
 SW_DLLPUBLIC extern SwGoInDoc fnGoNode;
-SW_DLLPUBLIC extern SwGoInDoc fnGoCntnt; ///< SwPam::Move() default argument.
-extern SwGoInDoc fnGoCntntCells;
-extern SwGoInDoc fnGoCntntSkipHidden;
-extern SwGoInDoc fnGoCntntCellsSkipHidden;
+SW_DLLPUBLIC extern SwGoInDoc fnGoContent; ///< SwPam::Move() default argument.
+extern SwGoInDoc fnGoContentCells;
+extern SwGoInDoc fnGoContentSkipHidden;
+extern SwGoInDoc fnGoContentCellsSkipHidden;
 
 void _InitPam();
 
@@ -175,12 +175,12 @@ public:
            long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 );
     SwPaM( const SwNode& rMk, const SwNode& rPt,
            long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 );
-    SwPaM(  const SwNodeIndex& rMk, sal_Int32 nMkCntnt,
-            const SwNodeIndex& rPt, sal_Int32 nPtCntnt, SwPaM* pRing = 0 );
-    SwPaM(  const SwNode& rMk, sal_Int32 nMkCntnt,
-            const SwNode& rPt, sal_Int32 nPtCntnt, SwPaM* pRing = 0 );
-    SwPaM( const SwNode& rNd, sal_Int32 nCntnt = 0, SwPaM* pRing = 0 );
-    SwPaM( const SwNodeIndex& rNd, sal_Int32 nCntnt = 0, SwPaM* pRing = 0 );
+    SwPaM(  const SwNodeIndex& rMk, sal_Int32 nMkContent,
+            const SwNodeIndex& rPt, sal_Int32 nPtContent, SwPaM* pRing = 0 );
+    SwPaM(  const SwNode& rMk, sal_Int32 nMkContent,
+            const SwNode& rPt, sal_Int32 nPtContent, SwPaM* pRing = 0 );
+    SwPaM( const SwNode& rNd, sal_Int32 nContent = 0, SwPaM* pRing = 0 );
+    SwPaM( const SwNodeIndex& rNd, sal_Int32 nContent = 0, SwPaM* pRing = 0 );
     virtual ~SwPaM();
 
     /// this takes a second parameter, which indicates the Ring that
@@ -191,15 +191,15 @@ public:
 
     /// Movement of cursor.
     bool Move( SwMoveFn fnMove = fnMoveForward,
-                SwGoInDoc fnGo = fnGoCntnt );
+                SwGoInDoc fnGo = fnGoContent );
 
     /// Search.
     bool Find(  const com::sun::star::util::SearchOptions& rSearchOpt,
                 bool bSearchInNotes,
-                utl::TextSearch& rSTxt,
+                utl::TextSearch& rSText,
                 SwMoveFn fnMove = fnMoveForward,
                 const SwPaM *pPam =0, bool bInReadOnly = false);
-    bool Find(  const SwFmt& rFmt,
+    bool Find(  const SwFormat& rFormat,
                 SwMoveFn fnMove = fnMoveForward,
                 const SwPaM *pPam =0, bool bInReadOnly = false);
     bool Find(  const SfxPoolItem& rAttr, bool bValue = true,
@@ -209,9 +209,9 @@ public:
                 SwMoveFn fnMove,
                 const SwPaM *pPam, bool bInReadOnly, bool bMoveFirst );
 
-    bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
+    bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSText,
                    SwMoveFn fnMove, bool bSrchForward, bool bRegSearch, bool bChkEmptyPara, bool bChkParaEnd,
-                   sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTxtLen, SwNode* pNode, SwPaM* pPam);
+                   sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTextLen, SwNode* pNode, SwPaM* pPam);
 
     inline bool IsInFrontOfLabel() const        { return m_bIsInFrontOfLabel; }
     inline void _SetInFrontOfLabel( bool bNew ) { m_bIsInFrontOfLabel = bNew; }
@@ -271,9 +271,9 @@ public:
     }
 
     /// @return current ContentNode at Point/Mark
-    SwCntntNode* GetCntntNode( bool bPoint = true ) const
+    SwContentNode* GetContentNode( bool bPoint = true ) const
     {
-        return GetNode(bPoint).GetCntntNode();
+        return GetNode(bPoint).GetContentNode();
     }
 
     /**
@@ -306,7 +306,7 @@ public:
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
 
-    OUString GetTxt() const;
+    OUString GetText() const;
     void InvalidatePaM();
     SwPaM* GetNext()
         { return GetNextInRing(); }
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 6fbe6c99415d..d0a11094c25a 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -40,35 +40,35 @@
 #include <editeng/paravertalignitem.hxx>
 #include <editeng/pgrditem.hxx>
 
-class SwCharFmt;
+class SwCharFormat;
 class IntlWrapper;
 
 #define DROP_WHOLEWORD ((sal_uInt16)0x0001)
 
-/** If SwFmtDrop is a Client, it is the CharFmt that describes the font for the
-   DropCaps. If it is not a Client, formatting uses the CharFmt of the paragraph.
-   If the CharFmt is modified, this change is propagated to the paragraphs
-   via the Modify of SwFmtDrop. */
-class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient
+/** If SwFormatDrop is a Client, it is the CharFormat that describes the font for the
+   DropCaps. If it is not a Client, formatting uses the CharFormat of the paragraph.
+   If the CharFormat is modified, this change is propagated to the paragraphs
+   via the Modify of SwFormatDrop. */
+class SW_DLLPUBLIC SwFormatDrop: public SfxPoolItem, public SwClient
 {
     SwModify* pDefinedIn;       /**< Modify-Object, that contains DropCaps.
-                                  Can only be TxtFmtCollection/TxtNode. */
+                                  Can only be TextFormatCollection/TextNode. */
     sal_uInt16 nDistance;       ///< Distance to beginning of text.
-    sal_uInt16 nReadFmt;        ///< For Sw3-Reader: CharFormat-Id (load Pool!).
+    sal_uInt16 nReadFormat;        ///< For Sw3-Reader: CharFormat-Id (load Pool!).
     sal_uInt8  nLines;          ///< Line count.
     sal_uInt8  nChars;          ///< Character count.
     bool   bWholeWord;      ///< First word with initials.
 public:
     TYPEINFO_OVERRIDE(); ///< Already in base class SwClient.
 
-    SwFmtDrop();
-    virtual ~SwFmtDrop();
+    SwFormatDrop();
+    virtual ~SwFormatDrop();
 
     // @@@ public copy ctor, but no copy assignment?
-    SwFmtDrop( const SwFmtDrop & );
+    SwFormatDrop( const SwFormatDrop & );
 private:
     // @@@ public copy ctor, but no copy assignment?
-    SwFmtDrop & operator= (const SwFmtDrop &) SAL_DELETED_FUNCTION;
+    SwFormatDrop & operator= (const SwFormatDrop &) SAL_DELETED_FUNCTION;
 
 protected:
    virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
@@ -98,9 +98,9 @@ public:
     inline sal_uInt16 GetDistance() const { return nDistance; }
     inline sal_uInt16 &GetDistance() { return nDistance; }
 
-    inline const SwCharFmt *GetCharFmt() const { return static_cast<const SwCharFmt*>(GetRegisteredIn()); }
-    inline SwCharFmt *GetCharFmt()       { return static_cast<SwCharFmt*>(GetRegisteredIn()); }
-    void SetCharFmt( SwCharFmt *pNew );
+    inline const SwCharFormat *GetCharFormat() const { return static_cast<const SwCharFormat*>(GetRegisteredIn()); }
+    inline SwCharFormat *GetCharFormat()       { return static_cast<SwCharFormat*>(GetRegisteredIn()); }
+    void SetCharFormat( SwCharFormat *pNew );
     /// Get information from Client.
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
 
@@ -207,8 +207,8 @@ inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(bool bInP) const
     {   return static_cast<const SvxLineSpacingItem&>(Get( RES_PARATR_LINESPACING,bInP)); }
 inline const SvxAdjustItem &SwAttrSet::GetAdjust(bool bInP) const
     {   return static_cast<const SvxAdjustItem&>(Get( RES_PARATR_ADJUST,bInP)); }
-inline const SvxFmtSplitItem &SwAttrSet::GetSplit(bool bInP) const
-    {   return static_cast<const SvxFmtSplitItem&>(Get( RES_PARATR_SPLIT,bInP)); }
+inline const SvxFormatSplitItem &SwAttrSet::GetSplit(bool bInP) const
+    {   return static_cast<const SvxFormatSplitItem&>(Get( RES_PARATR_SPLIT,bInP)); }
 inline const SwRegisterItem &SwAttrSet::GetRegister(bool bInP) const
     {   return static_cast<const SwRegisterItem&>(Get( RES_PARATR_REGISTER,bInP)); }
 inline const SvxWidowsItem &SwAttrSet::GetWidows(bool bInP) const
@@ -219,8 +219,8 @@ inline const SvxTabStopItem &SwAttrSet::GetTabStops(bool bInP) const
     {   return static_cast<const SvxTabStopItem&>(Get( RES_PARATR_TABSTOP,bInP)); }
 inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(bool bInP) const
     {   return static_cast<const SvxHyphenZoneItem&>(Get(RES_PARATR_HYPHENZONE,bInP)); }
-inline const SwFmtDrop &SwAttrSet::GetDrop(bool bInP) const
-    {   return static_cast<const SwFmtDrop&>(Get(RES_PARATR_DROP,bInP)); }
+inline const SwFormatDrop &SwAttrSet::GetDrop(bool bInP) const
+    {   return static_cast<const SwFormatDrop&>(Get(RES_PARATR_DROP,bInP)); }
 inline const SwNumRuleItem &SwAttrSet::GetNumRule(bool bInP) const
     {   return static_cast<const SwNumRuleItem&>(Get(RES_PARATR_NUMRULE,bInP)); }
 inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(bool bInP) const
@@ -236,38 +236,38 @@ inline const SvxParaGridItem &SwAttrSet::GetParaGrid(bool bInP) const
 inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(bool bInP) const
     {   return static_cast<const SwParaConnectBorderItem&>(Get( RES_PARATR_CONNECT_BORDER, bInP )); }
 
-// Implementation of paragraph-attributes methods of SwFmt
-inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(bool bInP) const
+// Implementation of paragraph-attributes methods of SwFormat
+inline const SvxLineSpacingItem &SwFormat::GetLineSpacing(bool bInP) const
     {   return m_aSet.GetLineSpacing(bInP); }
-inline const SvxAdjustItem &SwFmt::GetAdjust(bool bInP) const
+inline const SvxAdjustItem &SwFormat::GetAdjust(bool bInP) const
     {   return m_aSet.GetAdjust(bInP); }
-inline const SvxFmtSplitItem &SwFmt::GetSplit(bool bInP) const
+inline const SvxFormatSplitItem &SwFormat::GetSplit(bool bInP) const
     {   return m_aSet.GetSplit(bInP); }
-inline const SwRegisterItem &SwFmt::GetRegister(bool bInP) const
+inline const SwRegisterItem &SwFormat::GetRegister(bool bInP) const
     {   return m_aSet.GetRegister(bInP); }
-inline const SvxWidowsItem &SwFmt::GetWidows(bool bInP) const
+inline const SvxWidowsItem &SwFormat::GetWidows(bool bInP) const
     {   return m_aSet.GetWidows(bInP); }
-inline const SvxOrphansItem &SwFmt::GetOrphans(bool bInP) const
+inline const SvxOrphansItem &SwFormat::GetOrphans(bool bInP) const
     {   return m_aSet.GetOrphans(bInP); }
-inline const SvxTabStopItem &SwFmt::GetTabStops(bool bInP) const
+inline const SvxTabStopItem &SwFormat::GetTabStops(bool bInP) const
     {   return m_aSet.GetTabStops(bInP); }
-inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(bool bInP) const
+inline const SvxHyphenZoneItem &SwFormat::GetHyphenZone(bool bInP) const
     {   return m_aSet.GetHyphenZone(bInP); }
-inline const SwFmtDrop &SwFmt::GetDrop(bool bInP) const
+inline const SwFormatDrop &SwFormat::GetDrop(bool bInP) const
     {   return m_aSet.GetDrop(bInP); }
-inline const SwNumRuleItem &SwFmt::GetNumRule(bool bInP) const
+inline const SwNumRuleItem &SwFormat::GetNumRule(bool bInP) const
     {   return m_aSet.GetNumRule(bInP); }
-inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(bool bInP) const
+inline const SvxScriptSpaceItem& SwFormat::GetScriptSpace(bool bInP) const
     {   return m_aSet.GetScriptSpace(bInP) ; }
-inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(bool bInP) const
+inline const SvxHangingPunctuationItem &SwFormat::GetHangingPunctuation(bool bInP) const
     {   return m_aSet.GetHangingPunctuation(bInP) ; }
-inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(bool bInP) const
+inline const SvxForbiddenRuleItem &SwFormat::GetForbiddenRule(bool bInP) const
     {   return static_cast<const SvxForbiddenRuleItem&>(m_aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP)); }
-inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(bool bInP) const
+inline const SvxParaVertAlignItem &SwFormat::GetParaVertAlign(bool bInP) const
     {   return static_cast<const SvxParaVertAlignItem&>(m_aSet.Get( RES_PARATR_VERTALIGN, bInP )); }
-inline const SvxParaGridItem &SwFmt::GetParaGrid(bool bInP) const
+inline const SvxParaGridItem &SwFormat::GetParaGrid(bool bInP) const
     {   return static_cast<const SvxParaGridItem&>(m_aSet.Get( RES_PARATR_SNAPTOGRID, bInP )); }
-inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(bool bInP) const
+inline const SwParaConnectBorderItem &SwFormat::GetParaConnectBorder(bool bInP) const
     {   return static_cast<const SwParaConnectBorderItem&>(m_aSet.Get( RES_PARATR_CONNECT_BORDER, bInP )); }
 
 #endif
diff --git a/sw/inc/poolfmt.awk b/sw/inc/poolfmt.awk
index 3c196fc8fe2d..58f758c94640 100644
--- a/sw/inc/poolfmt.awk
+++ b/sw/inc/poolfmt.awk
@@ -40,7 +40,7 @@ function Main() {
 	print
     print  "void main( int , char *[] ) {"
     sStr = "#define"
-    print  "    int nSize = (sizeof(ppPoolIds) / sizeof(PoolFmtIds)) - 1;"
+    print  "    int nSize = (sizeof(ppPoolIds) / sizeof(PoolFormatIds)) - 1;"
     print  "    for( int n = 0; n < nSize; n++ )"
     print  "        printf( \"" sStr " %s\\t%8d\\n\", ppPoolIds[ n ].pStr, ppPoolIds[ n ].nId );"
     print  "}"
@@ -48,8 +48,8 @@ function Main() {
 
 function TableHead() {
 	print
-    print "struct PoolFmtIds { int nId; const char* pStr; };"
-    print "static PoolFmtIds ppPoolIds[] = {"
+    print "struct PoolFormatIds { int nId; const char* pStr; };"
+    print "static PoolFormatIds ppPoolIds[] = {"
 }
 
 function TableTail() {
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index df029593b836..b80e0ed8e6a2 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -82,7 +82,7 @@ const sal_uInt16 POOLGRP_NUMRULE        = (3 << 11) + POOLGRP_NOCOLLID;
 const sal_uInt16 POOL_IDUSER_FMT =
         USHRT_MAX & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID);
 
-inline bool IsPoolUserFmt( sal_uInt16 nId )
+inline bool IsPoolUserFormat( sal_uInt16 nId )
 {
     return POOL_IDUSER_FMT == (nId & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID));
 }
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index e8fa575ae36c..47e8c3fb9721 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -27,7 +27,7 @@
 #include <SidebarWindowsTypes.hxx>
 
 class SfxBroadcaster;
-class SwTxtFld;
+class SwTextField;
 class SwRootFrm;
 class SwPostItMgr;
 class SwEditWin;
@@ -112,7 +112,7 @@ public:
 
     virtual SwPosition GetAnchorPosition() const = 0;
     virtual bool UseElement() = 0;
-    virtual const SwFmtFld& GetFmtFld() const = 0;
+    virtual const SwFormatField& GetFormatField() const = 0;
     virtual const SfxBroadcaster* GetBroadCaster() const = 0;
     virtual VclPtr<sw::sidebarwindows::SwSidebarWin> GetSidebarWindow( SwEditWin& rEditWin,
                                                                 WinBits nBits,
@@ -124,11 +124,11 @@ class SwAnnotationItem: public SwSidebarItem
 {
 public:
     SwAnnotationItem(
-        SwFmtFld& rFmtFld,
+        SwFormatField& rFormatField,
         const bool aShow,
         const bool aFocus)
         : SwSidebarItem( aShow, aFocus )
-        , mrFmtFld( rFmtFld )
+        , mrFormatField( rFormatField )
     {
     }
 
@@ -138,13 +138,13 @@ public:
 
     virtual SwPosition GetAnchorPosition() const SAL_OVERRIDE;
     virtual bool UseElement() SAL_OVERRIDE;
-    virtual const SwFmtFld& GetFmtFld() const SAL_OVERRIDE
+    virtual const SwFormatField& GetFormatField() const SAL_OVERRIDE
     {
-        return mrFmtFld;
+        return mrFormatField;
     }
     virtual const SfxBroadcaster* GetBroadCaster() const SAL_OVERRIDE
     {
-        return dynamic_cast<const SfxBroadcaster *> (&mrFmtFld);
+        return dynamic_cast<const SfxBroadcaster *> (&mrFormatField);
     }
     virtual VclPtr<sw::sidebarwindows::SwSidebarWin> GetSidebarWindow(
         SwEditWin& rEditWin,
@@ -153,7 +153,7 @@ public:
         SwPostItBits aBits ) SAL_OVERRIDE;
 
 private:
-    SwFmtFld& mrFmtFld;
+    SwFormatField& mrFormatField;
 };
 
 #endif // INCLUDED_SW_INC_POSTITHELPER_HXX
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 6c5e6f3efae7..5f7b7cb0a9c0 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -33,7 +33,7 @@
 
 class SwDoc;
 class SwDocShell;
-class _SetGetExpFlds;
+class _SetGetExpFields;
 class SwViewOption;
 class OutputDevice;
 class SwViewOptionAdjust_Impl;
@@ -233,8 +233,8 @@ class SwRenderData
 public:
 
     // PostIt relevant data
-    /// an array of "_SetGetExpFld *" sorted by page and line numbers
-    ::boost::scoped_ptr<_SetGetExpFlds> m_pPostItFields;
+    /// an array of "_SetGetExpField *" sorted by page and line numbers
+    ::boost::scoped_ptr<_SetGetExpFields> m_pPostItFields;
     /// this contains a SwDoc with the post-it content
     ::boost::scoped_ptr<SwViewShell>      m_pPostItShell;
 
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 533c027628a2..6fd7ad6f2ed9 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -49,15 +49,15 @@ public:
     virtual bool operator == ( const SwRedlineExtraData& ) const;
 };
 
-class SwRedlineExtraData_FmtColl : public SwRedlineExtraData
+class SwRedlineExtraData_FormatColl : public SwRedlineExtraData
 {
-    OUString sFmtNm;
+    OUString sFormatNm;
     SfxItemSet* pSet;
     sal_uInt16 nPoolId;
 public:
-    SwRedlineExtraData_FmtColl( const OUString& rColl, sal_uInt16 nPoolFmtId,
+    SwRedlineExtraData_FormatColl( const OUString& rColl, sal_uInt16 nPoolFormatId,
                                 const SfxItemSet* pSet = 0 );
-    virtual ~SwRedlineExtraData_FmtColl();
+    virtual ~SwRedlineExtraData_FormatColl();
     virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE;
     virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE;
     virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE;
@@ -149,7 +149,7 @@ public:
     void SetComment( const OUString& rS )     { sComment = rS; }
     void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; }
 
-    void SetAutoFmtFlag()
+    void SetAutoFormatFlag()
   { eType = (RedlineType_t)(eType | nsRedlineType_t::REDLINE_FORM_AUTOFMT); }
     bool CanCombine( const SwRedlineData& rCmp ) const
         {
@@ -182,7 +182,7 @@ public:
 class SW_DLLPUBLIC SwRangeRedline : public SwPaM
 {
     SwRedlineData* pRedlineData;
-    SwNodeIndex* pCntntSect;
+    SwNodeIndex* pContentSect;
     bool bDelLastPara : 1;
     bool bIsLastParaDelete : 1;
     bool bIsVisible : 1;
@@ -199,13 +199,13 @@ public:
     // For sw3io: pData is taken over!
     SwRangeRedline(SwRedlineData* pData, const SwPosition& rPos, bool bVsbl,
                bool bDelLP, bool bIsPD) :
-        SwPaM( rPos ), pRedlineData( pData ), pCntntSect( 0 ),
+        SwPaM( rPos ), pRedlineData( pData ), pContentSect( 0 ),
         bDelLastPara( bDelLP ), bIsLastParaDelete( bIsPD ), bIsVisible( bVsbl )
     {}
     SwRangeRedline( const SwRangeRedline& );
     virtual ~SwRangeRedline();
 
-    SwNodeIndex* GetContentIdx() const { return pCntntSect; }
+    SwNodeIndex* GetContentIdx() const { return pContentSect; }
     // For Undo.
     void SetContentIdx( const SwNodeIndex* );
 
@@ -230,7 +230,7 @@ public:
         { return *pRedlineData == rCmp; }
     bool operator!=( const SwRedlineData& rCmp ) const
         { return *pRedlineData != rCmp; }
-    void SetAutoFmtFlag()               { pRedlineData->SetAutoFmtFlag(); }
+    void SetAutoFormatFlag()               { pRedlineData->SetAutoFormatFlag(); }
 
     sal_uInt16 GetStackCount() const;
     sal_uInt16 GetAuthor( sal_uInt16 nPos = 0) const;
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 058d57d815ca..a6ececb2cd96 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -23,11 +23,11 @@
 
 class SfxPoolItem;
 class SwDoc;
-class SwTxtNode;
-class SwTxtFld;
+class SwTextNode;
+class SwTextField;
 
-bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
-                    const SwTxtNode& rBehindNd, sal_Int32 nSttPos );
+bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos,
+                    const SwTextNode& rBehindNd, sal_Int32 nSttPos );
 
 enum REFERENCESUBTYPE
 {
@@ -74,7 +74,7 @@ public:
 
     void MergeWithOtherDoc( SwDoc& rDestDoc );
 
-    static SwTxtNode* FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
+    static SwTextNode* FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
                                         sal_uInt16 nSubType, sal_uInt16 nSeqNo,
                                         sal_Int32* pStt, sal_Int32* pEnd = 0 );
 };
@@ -83,7 +83,7 @@ class SW_DLLPUBLIC SwGetRefField : public SwField
 {
 private:
     OUString sSetRefName;
-    OUString sTxt;
+    OUString sText;
     sal_uInt16 nSubType;
     sal_uInt16 nSeqNo;
 
@@ -91,13 +91,13 @@ private:
     virtual SwField*    Copy() const SAL_OVERRIDE;
 
     // #i81002#
-    static OUString MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
-                          const SwTxtNode& rTxtNodeOfReferencedItem,
+    static OUString MakeRefNumStr( const SwTextNode& rTextNodeOfField,
+                          const SwTextNode& rTextNodeOfReferencedItem,
                           const sal_uInt32 nRefNumFormat );
 
 public:
     SwGetRefField( SwGetRefFieldType*, const OUString& rSetRef,
-                    sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFmt );
+                    sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFormat );
 
     virtual ~SwGetRefField();
 
@@ -106,15 +106,15 @@ public:
     OUString GetSetRefName() const { return sSetRefName; }
 
     // #i81002#
-    /** The <SwTxtFld> instance, which represents the text attribute for the
+    /** The <SwTextField> instance, which represents the text attribute for the
        <SwGetRefField> instance, has to be passed to the method.
-       This <SwTxtFld> instance is needed for the reference format type REF_UPDOWN
+       This <SwTextField> instance is needed for the reference format type REF_UPDOWN
        and REF_NUMBER.
        Note: This instance may be NULL (field in Undo/Redo). This will cause
        no update for these reference format types. */
-    void                UpdateField( const SwTxtFld* pFldTxtAttr );
+    void                UpdateField( const SwTextField* pFieldTextAttr );
 
-    void                SetExpand( const OUString& rStr ) { sTxt = rStr; }
+    void                SetExpand( const OUString& rStr ) { sText = rStr; }
 
     /// Get/set sub type.
     virtual sal_uInt16      GetSubType() const SAL_OVERRIDE;
@@ -123,9 +123,9 @@ public:
     // --> #i81002#
     bool IsRefToHeadingCrossRefBookmark() const;
     bool IsRefToNumItemCrossRefBookmark() const;
-    const SwTxtNode* GetReferencedTxtNode() const;
+    const SwTextNode* GetReferencedTextNode() const;
     // #i85090#
-    OUString GetExpandedTxtOfReferencedTxtNode() const;
+    OUString GetExpandedTextOfReferencedTextNode() const;
 
     /// Get/set SequenceNo (of interest only for REF_SEQUENCEFLD).
     sal_uInt16              GetSeqNo() const        { return nSeqNo; }
diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx
index 5dfd0bd0a6f7..38572b2e71da 100644
--- a/sw/inc/rubylist.hxx
+++ b/sw/inc/rubylist.hxx
@@ -26,7 +26,7 @@
 class SwRubyListEntry
 {
     OUString m_sText;
-    SwFmtRuby m_aRubyAttr;
+    SwFormatRuby m_aRubyAttr;
 public:
     SwRubyListEntry() : m_aRubyAttr( OUString() ) {}
     ~SwRubyListEntry();
@@ -34,9 +34,9 @@ public:
     OUString GetText() const                    { return m_sText; }
     void SetText( const OUString& rStr )        { m_sText = rStr; }
 
-    const SwFmtRuby& GetRubyAttr() const        { return m_aRubyAttr; }
-          SwFmtRuby& GetRubyAttr()              { return m_aRubyAttr; }
-    void SetRubyAttr( const SwFmtRuby& rAttr )  { m_aRubyAttr = rAttr; }
+    const SwFormatRuby& GetRubyAttr() const        { return m_aRubyAttr; }
+          SwFormatRuby& GetRubyAttr()              { return m_aRubyAttr; }
+    void SetRubyAttr( const SwFormatRuby& rAttr )  { m_aRubyAttr = rAttr; }
 };
 
 class SwRubyList : public boost::ptr_vector<SwRubyListEntry> {};
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 6dc7d17a4d88..a3d34be61988 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
     namespace text { class XTextSection; }
 } } }
 
-class SwSectionFmt;
+class SwSectionFormat;
 class SwDoc;
 class SwSection;
 class SwSectionNode;
@@ -162,7 +162,7 @@ public:
     TYPEINFO_OVERRIDE();     // rtti
 
     SwSection(SectionType const eType, OUString const& rName,
-                SwSectionFmt & rFormat);
+                SwSectionFormat & rFormat);
     virtual ~SwSection();
 
     bool DataEquals(SwSectionData const& rCmp) const;
@@ -174,8 +174,8 @@ public:
     SectionType GetType() const             { return m_Data.GetType(); }
     void SetType(SectionType const eType)   { return m_Data.SetType(eType); }
 
-    inline SwSectionFmt* GetFmt();
-    inline SwSectionFmt const * GetFmt() const;
+    inline SwSectionFormat* GetFormat();
+    inline SwSectionFormat const * GetFormat() const;
 
     // Set hidden/protected -> update the whole tree!
     // (Attributes/flags are set/get.)
@@ -256,34 +256,34 @@ public:
 class SwSectionFrmMoveAndDeleteHint : public SfxSimpleHint
 {
     public:
-        SwSectionFrmMoveAndDeleteHint( const bool bSaveCntnt )
+        SwSectionFrmMoveAndDeleteHint( const bool bSaveContent )
             : SfxSimpleHint( SFX_HINT_DYING )
-            , mbSaveCntnt( bSaveCntnt )
+            , mbSaveContent( bSaveContent )
         {}
 
         virtual ~SwSectionFrmMoveAndDeleteHint()
         {}
 
-        bool IsSaveCntnt() const
+        bool IsSaveContent() const
         {
-            return mbSaveCntnt;
+            return mbSaveContent;
         }
 
     private:
-        const bool mbSaveCntnt;
+        const bool mbSaveContent;
 };
 
 enum SectionSort { SORTSECT_NOT, SORTSECT_NAME, SORTSECT_POS };
 
-class SW_DLLPUBLIC SwSectionFmt
-    : public SwFrmFmt
+class SW_DLLPUBLIC SwSectionFormat
+    : public SwFrameFormat
     , public ::sfx2::Metadatable
 {
     friend class SwDoc;
 
-    /** Why does this exist in addition to the m_wXObject in SwFrmFmt?
+    /** Why does this exist in addition to the m_wXObject in SwFrameFormat?
         in case of an index, both a SwXDocumentIndex and a SwXTextSection
-        register at this SwSectionFmt, so we need to have two refs.
+        register at this SwSectionFormat, so we need to have two refs.
      */
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XTextSection> m_wXTextSection;
@@ -291,12 +291,12 @@ class SW_DLLPUBLIC SwSectionFmt
     SAL_DLLPRIVATE void UpdateParent();      // Parent has been changed.
 
 protected:
-    SwSectionFmt( SwFrmFmt* pDrvdFrm, SwDoc *pDoc );
+    SwSectionFormat( SwFrameFormat* pDrvdFrm, SwDoc *pDoc );
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
 
 public:
     TYPEINFO_OVERRIDE();     // Already contained in base class client.
-    virtual ~SwSectionFmt();
+    virtual ~SwSectionFormat();
 
     // Deletes all Frms in aDepend (Frms are recognized via PTR_CAST).
     virtual void DelFrms() SAL_OVERRIDE;
@@ -308,7 +308,7 @@ public:
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
 
     SwSection* GetSection() const;
-    inline SwSectionFmt* GetParent() const;
+    inline SwSectionFormat* GetParent() const;
     inline SwSection* GetParentSection() const;
 
     //  All sections that are derived from this one:
@@ -323,7 +323,7 @@ public:
 
           SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false);
     const SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false) const
-        { return const_cast<SwSectionFmt *>(this)
+        { return const_cast<SwSectionFormat *>(this)
                 ->GetSectionNode(bEvenIfInUndo); }
 
     // Is section a valid one for global document?
@@ -347,36 +347,36 @@ public:
 
 };
 
-SwSectionFmt* SwSection::GetFmt()
+SwSectionFormat* SwSection::GetFormat()
 {
-    return static_cast<SwSectionFmt*>(GetRegisteredIn());
+    return static_cast<SwSectionFormat*>(GetRegisteredIn());
 }
 
-SwSectionFmt const * SwSection::GetFmt() const
+SwSectionFormat const * SwSection::GetFormat() const
 {
-    return static_cast<SwSectionFmt const *>(GetRegisteredIn());
+    return static_cast<SwSectionFormat const *>(GetRegisteredIn());
 }
 
 inline SwSection* SwSection::GetParent() const
 {
-    SwSectionFmt const * pFmt = GetFmt();
+    SwSectionFormat const * pFormat = GetFormat();
     SwSection* pRet = 0;
-    if( pFmt )
-        pRet = pFmt->GetParentSection();
+    if( pFormat )
+        pRet = pFormat->GetParentSection();
     return pRet;
 }
 
-inline SwSectionFmt* SwSectionFmt::GetParent() const
+inline SwSectionFormat* SwSectionFormat::GetParent() const
 {
-    SwSectionFmt* pRet = 0;
+    SwSectionFormat* pRet = 0;
     if( GetRegisteredIn() )
-        pRet = const_cast<SwSectionFmt*>(PTR_CAST( SwSectionFmt, GetRegisteredIn() ));
+        pRet = const_cast<SwSectionFormat*>(PTR_CAST( SwSectionFormat, GetRegisteredIn() ));
     return pRet;
 }
 
-inline SwSection* SwSectionFmt::GetParentSection() const
+inline SwSection* SwSectionFormat::GetParentSection() const
 {
-    SwSectionFmt* pParent = GetParent();
+    SwSectionFormat* pParent = GetParent();
     SwSection* pRet = 0;
     if( pParent )
     {
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index b7e36ddb70a1..da2622d60241 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -47,7 +47,7 @@ class SfxMedium;
 class SvStream;
 class SvxFontItem;
 class SvxMacroTableDtor;
-class SwCntntNode;
+class SwContentNode;
 class SwCrsrShell;
 class SwDoc;
 class SwPaM;
@@ -106,42 +106,42 @@ class SwgReaderOption
     SwAsciiOptions aASCIIOpts;
     union
     {
-        bool bFmtsOnly;
+        bool bFormatsOnly;
         struct
         {
-            bool bFrmFmts: 1;
+            bool bFrameFormats: 1;
             bool bPageDescs: 1;
-            bool bTxtFmts: 1;
+            bool bTextFormats: 1;
             bool bNumRules: 1;
             bool bMerge:1;
-        }  Fmts;
+        }  Formats;
     } What;
 
 public:
-    void ResetAllFmtsOnly() { What.bFmtsOnly = false; }
-    bool IsFmtsOnly() const { return What.bFmtsOnly; }
+    void ResetAllFormatsOnly() { What.bFormatsOnly = false; }
+    bool IsFormatsOnly() const { return What.bFormatsOnly; }
 
-    bool IsFrmFmts() const { return What.Fmts.bFrmFmts; }
-    void SetFrmFmts( const bool bNew) { What.Fmts.bFrmFmts = bNew; }
+    bool IsFrameFormats() const { return What.Formats.bFrameFormats; }
+    void SetFrameFormats( const bool bNew) { What.Formats.bFrameFormats = bNew; }
 
-    bool IsPageDescs() const { return What.Fmts.bPageDescs; }
-    void SetPageDescs( const bool bNew) { What.Fmts.bPageDescs = bNew; }
+    bool IsPageDescs() const { return What.Formats.bPageDescs; }
+    void SetPageDescs( const bool bNew) { What.Formats.bPageDescs = bNew; }
 
-    bool IsTxtFmts() const { return What.Fmts.bTxtFmts; }
-    void SetTxtFmts( const bool bNew) { What.Fmts.bTxtFmts = bNew; }
+    bool IsTextFormats() const { return What.Formats.bTextFormats; }
+    void SetTextFormats( const bool bNew) { What.Formats.bTextFormats = bNew; }
 
-    bool IsNumRules() const { return What.Fmts.bNumRules; }
-    void SetNumRules( const bool bNew) { What.Fmts.bNumRules = bNew; }
+    bool IsNumRules() const { return What.Formats.bNumRules; }
+    void SetNumRules( const bool bNew) { What.Formats.bNumRules = bNew; }
 
-    bool IsMerge() const { return What.Fmts.bMerge; }
-    void SetMerge( const bool bNew ) { What.Fmts.bMerge = bNew; }
+    bool IsMerge() const { return What.Formats.bMerge; }
+    void SetMerge( const bool bNew ) { What.Formats.bMerge = bNew; }
 
     const SwAsciiOptions& GetASCIIOpts() const { return aASCIIOpts; }
     void SetASCIIOpts( const SwAsciiOptions& rOpts ) { aASCIIOpts = rOpts; }
     void ResetASCIIOpts() { aASCIIOpts.Reset(); }
 
     SwgReaderOption()
-    {   ResetAllFmtsOnly(); aASCIIOpts.Reset(); }
+    {   ResetAllFormatsOnly(); aASCIIOpts.Reset(); }
 };
 
 class SW_DLLPUBLIC SwReader: public SwDocFac
@@ -225,11 +225,11 @@ public:
     virtual void SetFltName( const OUString& rFltNm );
 
     // Adapt item-set of a Frm-Format to the old format.
-    static void ResetFrmFmtAttrs( SfxItemSet &rFrmSet );
+    static void ResetFrameFormatAttrs( SfxItemSet &rFrmSet );
 
     // Adapt Frame-/Graphics-/OLE- styles to the old format
     // (without borders etc.).
-    static void ResetFrmFmts( SwDoc& rDoc );
+    static void ResetFrameFormats( SwDoc& rDoc );
 
     // Load filter template, set it and release it again.
     SwDoc* GetTemplateDoc();
@@ -339,8 +339,8 @@ public:
     OUString GetFileName() const;           // Filename of pImp.
     bool IsReadOnly() const;            // ReadOnly-flag of pImp.
 
-    bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl );
-    bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTbl );
+    bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTable );
+    bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTable );
 
     bool StartPutMuchBlockEntries();
     void EndPutMuchBlockEntries();
@@ -381,7 +381,7 @@ protected:
     void ResetWriter();
     bool CopyNextPam( SwPaM ** );
 
-    void PutNumFmtFontsInAttrPool();
+    void PutNumFormatFontsInAttrPool();
     void PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL = true );
 
     virtual sal_uLong WriteStream() = 0;
@@ -434,9 +434,9 @@ public:
     sal_Int32 FindPos_Bkmk( const SwPosition& rPos ) const;
     // Build a bookmark table, which is sort by the node position. The
     // OtherPos of the bookmarks also inserted.
-    void CreateBookmarkTbl();
+    void CreateBookmarkTable();
     // Search alle Bookmarks in the range and return it in the Array.
-    bool GetBookmarks( const SwCntntNode& rNd,
+    bool GetBookmarks( const SwContentNode& rNd,
                         sal_Int32 nStt, sal_Int32 nEnd,
                         std::vector< const ::sw::mark::IMark* >& rArr );
 
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 60ab4a16cb3a..ca89be7dd7c6 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -42,10 +42,10 @@ struct SW_DLLPUBLIC ShellResource : public Resource
     OUString        aCalc_Error;
 
     // For GetRefField - up/down.
-    OUString        aGetRefFld_Up;
-    OUString        aGetRefFld_Down;
+    OUString        aGetRefField_Up;
+    OUString        aGetRefField_Down;
     // For GetRefField - referenced item not found.
-    OUString        aGetRefFld_RefItemNotFound;
+    OUString        aGetRefField_RefItemNotFound;
     // For dynamic menu - string "all".
     OUString        aStrAllPageHeadFoot;
     // For some list boxes - string "none"
@@ -71,7 +71,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource
     std::vector<OUString> aDocInfoLst;
 
     // The autoFormat-Redline comments.
-    inline const std::vector<OUString>& GetAutoFmtNameLst() const;
+    inline const std::vector<OUString>& GetAutoFormatNameLst() const;
 
     enum PageNameMode
     {
@@ -88,18 +88,18 @@ struct SW_DLLPUBLIC ShellResource : public Resource
     ~ShellResource();
 
 private:
-    void _GetAutoFmtNameLst() const;
-    mutable std::vector<OUString> *pAutoFmtNameLst;
+    void _GetAutoFormatNameLst() const;
+    mutable std::vector<OUString> *pAutoFormatNameLst;
     OUString        sPageDescFirstName;
     OUString        sPageDescFollowName;
     OUString        sPageDescName;
 };
 
-inline const std::vector<OUString>& ShellResource::GetAutoFmtNameLst() const
+inline const std::vector<OUString>& ShellResource::GetAutoFormatNameLst() const
 {
-    if( !pAutoFmtNameLst )
-        _GetAutoFmtNameLst();
-    return *pAutoFmtNameLst;
+    if( !pAutoFormatNameLst )
+        _GetAutoFormatNameLst();
+    return *pAutoFormatNameLst;
 }
 
 #endif // INCLUDED_SW_INC_SHELLRES_HXX
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 8a09c261b437..cce7388ff0e6 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -28,30 +28,30 @@
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 
-class SwTxtNode;
+class SwTextNode;
 class SwIndex;
 namespace vcl { class Font; }
 
 struct SwArgsBase     // used for text conversion (Hangul/Hanja, ...)
 {
-    SwTxtNode  *pStartNode;
+    SwTextNode  *pStartNode;
     SwIndex    *pStartIdx;
-    SwTxtNode  *pEndNode;
+    SwTextNode  *pEndNode;
     SwIndex    *pEndIdx;
 
     SwArgsBase(
-            SwTxtNode* pStart, SwIndex& rStart,
-            SwTxtNode* pEnd, SwIndex& rEnd )
+            SwTextNode* pStart, SwIndex& rStart,
+            SwTextNode* pEnd, SwIndex& rEnd )
         : pStartNode( pStart ), pStartIdx( &rStart ),
           pEndNode( pEnd ), pEndIdx( &rEnd )
         {}
 
-    void SetStart(SwTxtNode* pStart, SwIndex& rStart )
+    void SetStart(SwTextNode* pStart, SwIndex& rStart )
     {
         pStartNode = pStart;    pStartIdx = &rStart ;
     }
 
-    void SetEnd( SwTxtNode* pEnd, SwIndex& rEnd  )
+    void SetEnd( SwTextNode* pEnd, SwIndex& rEnd  )
     {
         pEndNode = pEnd;        pEndIdx = &rEnd ;
     }
@@ -71,8 +71,8 @@ struct SwConversionArgs : SwArgsBase
     bool            bAllowImplicitChangesForNotConvertibleText;
 
     SwConversionArgs( LanguageType nLang,
-            SwTxtNode* pStart, SwIndex& rStart,
-            SwTxtNode* pEnd, SwIndex& rEnd )
+            SwTextNode* pStart, SwIndex& rStart,
+            SwTextNode* pEnd, SwIndex& rEnd )
         : SwArgsBase( pStart, rStart, pEnd, rEnd ),
           nConvSrcLang( nLang ),
           nConvTextLang( LANGUAGE_NONE ),
@@ -94,8 +94,8 @@ struct SwSpellArgs : SwArgsBase
 
     SwSpellArgs(::com::sun::star::uno::Reference<
             ::com::sun::star::linguistic2::XSpellChecker1 > &rxSplChk,
-            SwTxtNode* pStart, SwIndex& rStart,
-            SwTxtNode* pEnd, SwIndex& rEnd,
+            SwTextNode* pStart, SwIndex& rStart,
+            SwTextNode* pEnd, SwIndex& rEnd,
             bool bGrammar )
         :   SwArgsBase( pStart, rStart, pEnd, rEnd ),
             xSpeller( rxSplChk ),
@@ -105,8 +105,8 @@ struct SwSpellArgs : SwArgsBase
 
 // Parameter-class for Hyphenate.
 // docedt.cxx:  SwDoc::Hyphenate()
-// txtedt.cxx:  SwTxtNode::Hyphenate()
-// txthyph.cxx: SwTxtFrm::Hyphenate()
+// txtedt.cxx:  SwTextNode::Hyphenate()
+// txthyph.cxx: SwTextFrm::Hyphenate()
 
 class SwInterHyphInfo
 {
diff --git a/sw/inc/sw3convert.hxx b/sw/inc/sw3convert.hxx
index d837db2aa776..1c500f06195b 100644
--- a/sw/inc/sw3convert.hxx
+++ b/sw/inc/sw3convert.hxx
@@ -25,7 +25,7 @@
 class SwDoc;
 
 SW_DLLPUBLIC void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
-                                sal_uInt16& rSubType, sal_uLong &rFmt,
+                                sal_uInt16& rSubType, sal_uLong &rFormat,
                                 sal_uInt16 nVersion );
 
 #endif
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index a4fa8d788185..cb5ec2feb3f5 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -47,7 +47,7 @@ class SfxStyleSheetBase;
 class SwGlossaryHdl;
 class SwField;
 
-class SwLabFmtPage;
+class SwLabFormatPage;
 class SwLabRec;
 class SwAsciiOptions;
 class SwDocShell;
@@ -55,7 +55,7 @@ class SvStream;
 class SwWrtShell;
 class SfxRequest;
 class SwView;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
 class SwTOXMgr;
 class SwForm;
 struct CurTOXType;
@@ -101,7 +101,7 @@ public:
     virtual OUString        GetCurrShortName() const = 0;
 };
 
-class AbstractFldInputDlg : public VclAbstractTerminatedDialog
+class AbstractFieldInputDlg : public VclAbstractTerminatedDialog
 {
 public:
     //from class SalFrame
@@ -125,8 +125,8 @@ class AbstractInsTableDlg : public VclAbstractDialog
 {
 public:
     virtual void            GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                                SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName,
-                                SwTableAutoFmt *& prTAFmt ) = 0;
+                                SwInsertTableOptions& rInsTableFlags, OUString& rTableAutoFormatName,
+                                SwTableAutoFormat *& prTAFormat ) = 0;
 };
 
 class AbstractJavaEditDialog : public VclAbstractDialog
@@ -225,8 +225,8 @@ class AbstractSwConvertTableDlg :  public VclAbstractDialog
 {
 public:
     virtual void GetValues( sal_Unicode& rDelim,
-                    SwInsertTableOptions& rInsTblFlags,
-                    SwTableAutoFmt const*& prTAFmt ) = 0;
+                    SwInsertTableOptions& rInsTableFlags,
+                    SwTableAutoFormat const*& prTAFormat ) = 0;
 };
 
 class AbstractSwInsertDBColAutoPilot :  public VclAbstractDialog
@@ -264,10 +264,10 @@ public:
 class AbstractSwAutoFormatDlg : public VclAbstractDialog
 {
 public:
-    virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const = 0;
+    virtual void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const = 0;
 };
 
-class AbstractSwFldDlg : public SfxAbstractTabDialog
+class AbstractSwFieldDlg : public SfxAbstractTabDialog
 {
 public:
     virtual void                Start( bool bShow = true ) = 0;  //this method from sfxtabdialog
@@ -339,7 +339,7 @@ public:
     virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0;
     virtual VclAbstractDialog   * CreateSwChangeDBDlg(SwView& rVw) = 0;
     virtual SfxAbstractTabDialog *  CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
-        sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0;
+        sal_uInt8 nDialogMode, const OUString* pFormatStr = 0) = 0;
     virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0;
     virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) = 0;
 
@@ -369,11 +369,11 @@ public:
     virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) = 0;
 
     virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) = 0;
-    virtual AbstractSplitTableDialog * CreateSplitTblDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0;
+    virtual AbstractSplitTableDialog * CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0;
 
     virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell,
-                                                            bool bSetAutoFmt = true,
-                                                            const SwTableAutoFmt* pSelFmt = 0 ) = 0;
+                                                            bool bSetAutoFormat = true,
+                                                            const SwTableAutoFormat* pSelFormat = 0 ) = 0;
     virtual SfxAbstractDialog * CreateSwBorderDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) = 0;
     virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0;
 
@@ -381,21 +381,21 @@ public:
     virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool,
         const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0;
 
-    virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0;
-    virtual SfxAbstractDialog*   CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0;
+    virtual AbstractSwFieldDlg * CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0;
+    virtual SfxAbstractDialog*   CreateSwFieldEditDlg ( SwView& rVw, int nResId ) = 0;
     virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0;
     virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0;
 
-    virtual VclAbstractDialog*          CreateTblMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0;
+    virtual VclAbstractDialog*          CreateTableMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0;
     virtual SfxAbstractTabDialog*       CreateFrmTabDialog(const OUString &rDialogType,
                                                 SfxViewFrame *pFrame, vcl::Window *pParent,
                                                 const SfxItemSet& rCoreSet,
                                                 bool bNewFrm = true,
-                                                bool bFmt = false,
+                                                bool bFormat = false,
                                                 const OString& sDefPage = OString(),
-                                                const OUString* pFmtStr = 0) = 0;
+                                                const OUString* pFormatStr = 0) = 0;
     /// @param nSlot
     /// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
     /// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
@@ -409,7 +409,7 @@ public:
     virtual AbstractGlossaryDlg*        CreateGlossaryDlg(SfxViewFrame* pViewFrame,
                                                 SwGlossaryHdl* pGlosHdl,
                                                 SwWrtShell *pWrtShell) = 0;
-    virtual AbstractFldInputDlg*        CreateFldInputDlg(vcl::Window *pParent,
+    virtual AbstractFieldInputDlg*        CreateFieldInputDlg(vcl::Window *pParent,
         SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0;
     virtual AbstractInsFootNoteDlg*     CreateInsFootNoteDlg(vcl::Window * pParent,
         SwWrtShell &rSh, bool bEd = false) = 0;
@@ -421,7 +421,7 @@ public:
     virtual AbstractMailMergeDlg*       CreateMailMergeDlg( int nResId,
                                                 vcl::Window* pParent, SwWrtShell& rSh,
                                                  const OUString& rSourceName,
-                                                const OUString& rTblName,
+                                                const OUString& rTableName,
                                                 sal_Int32 nCommandType,
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
                                                 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0;
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 867f269e2d7a..160f858fabc3 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -57,45 +57,45 @@ class SvxCharReliefItem;
 class SvxCharHiddenItem;
 
 // Frame attributes
-class SwFmtFillOrder;
-class SwFmtFrmSize;
+class SwFormatFillOrder;
+class SwFormatFrmSize;
 class SvxPaperBinItem;
 class SvxLRSpaceItem;
 class SvxULSpaceItem;
-class SwFmtCntnt;
-class SwFmtHeader;
-class SwFmtFooter;
+class SwFormatContent;
+class SwFormatHeader;
+class SwFormatFooter;
 class SvxPrintItem;
 class SvxOpaqueItem;
 class SvxProtectItem;
-class SwFmtSurround;
-class SwFmtVertOrient;
-class SwFmtHoriOrient;
-class SwFmtAnchor;
+class SwFormatSurround;
+class SwFormatVertOrient;
+class SwFormatHoriOrient;
+class SwFormatAnchor;
 class SvxBoxItem;
 class SvxBrushItem;
 class XFillStyleItem;
 class XFillGradientItem;
 class SvxShadowItem;
-class SwFmtPageDesc;
-class SvxFmtBreakItem;
-class SwFmtCol;
+class SwFormatPageDesc;
+class SvxFormatBreakItem;
+class SwFormatCol;
 class SvxMacroItem;
-class SvxFmtKeepItem;
-class SwFmtURL;
-class SwFmtLineNumber;
-class SwFmtEditInReadonly;
-class SwFmtLayoutSplit;
-class SwFmtRowSplit;
-class SwFmtChain;
-class SwFmtFtnAtTxtEnd;
-class SwFmtEndAtTxtEnd;
-class SwFmtNoBalancedColumns;
+class SvxFormatKeepItem;
+class SwFormatURL;
+class SwFormatLineNumber;
+class SwFormatEditInReadonly;
+class SwFormatLayoutSplit;
+class SwFormatRowSplit;
+class SwFormatChain;
+class SwFormatFootnoteAtTextEnd;
+class SwFormatEndAtTextEnd;
+class SwFormatNoBalancedColumns;
 class SvxFrameDirectionItem;
 class SwTextGridItem;
 class SwHeaderAndFooterEatSpacingItem;
-class SwFmtFollowTextFlow;
-class SwFmtWrapInfluenceOnObjPos;
+class SwFormatFollowTextFlow;
+class SwFormatWrapInfluenceOnObjPos;
 class SdrTextVertAdjustItem;
 
 // Graphic attributes
@@ -115,14 +115,14 @@ class SwDrawModeGrf;
 // Paragraph attributes
 class SvxLineSpacingItem;
 class SvxAdjustItem;
-class SvxFmtSplitItem;
+class SvxFormatSplitItem;
 class SwRegisterItem;
 class SwNumRuleItem;
 class SvxWidowsItem;
 class SvxOrphansItem;
 class SvxTabStopItem;
 class SvxHyphenZoneItem;
-class SwFmtDrop;
+class SwFormatDrop;
 class SvxScriptSpaceItem;
 class SvxHangingPunctuationItem;
 class SvxForbiddenRuleItem;
@@ -131,9 +131,9 @@ class SvxParaGridItem;
 class SwParaConnectBorderItem;
 
 // TableBox attributes
-class SwTblBoxNumFormat;
-class SwTblBoxFormula;
-class SwTblBoxValue;
+class SwTableBoxNumFormat;
+class SwTableBoxFormula;
+class SwTableBoxValue;
 
 class SwAttrPool : public SfxItemPool
 {
@@ -206,10 +206,10 @@ public:
 
     // Special treatment for some attributes.
     // Set Modify-pointer (the old pDefinedIn) at the following attributes:
-    //  - SwFmtDropCaps
-    //  - SwFmtPageDesc
+    //  - SwFormatDropCaps
+    //  - SwFormatPageDesc
     // (Is called at insert in formats/nodes.)
-    // Second version is for the SwAttrSet handles of SwCntntNode.
+    // Second version is for the SwAttrSet handles of SwContentNode.
     bool SetModifyAtAttr( const SwModify* pModify );
 
     // Document is set at SwAttrPool. Therefore it is always accessible.
@@ -262,43 +262,43 @@ public:
     inline const SvxShadowItem      &GetCharShadow( bool = true ) const;
 
     // Frame attributes. Implementation in frmatr.hxx.
-    inline const SwFmtFillOrder       &GetFillOrder( bool = true ) const;
-    inline const SwFmtFrmSize             &GetFrmSize( bool = true ) const;
+    inline const SwFormatFillOrder       &GetFillOrder( bool = true ) const;
+    inline const SwFormatFrmSize             &GetFrmSize( bool = true ) const;
     inline const SvxPaperBinItem      &GetPaperBin( bool = true ) const;
     inline const SvxLRSpaceItem           &GetLRSpace( bool = true ) const;
     inline const SvxULSpaceItem           &GetULSpace( bool = true ) const;
-    inline const SwFmtCntnt           &GetCntnt( bool = true ) const;
-    inline const SwFmtHeader          &GetHeader( bool = true ) const;
-    inline const SwFmtFooter          &GetFooter( bool = true ) const;
+    inline const SwFormatContent           &GetContent( bool = true ) const;
+    inline const SwFormatHeader          &GetHeader( bool = true ) const;
+    inline const SwFormatFooter          &GetFooter( bool = true ) const;
     inline const SvxPrintItem             &GetPrint( bool = true ) const;
     inline const SvxOpaqueItem            &GetOpaque( bool = true ) const;
     inline const SvxProtectItem           &GetProtect( bool = true ) const;
-    inline const SwFmtSurround            &GetSurround( bool = true ) const;
-    inline const SwFmtVertOrient      &GetVertOrient( bool = true ) const;
-    inline const SwFmtHoriOrient      &GetHoriOrient( bool = true ) const;
-    inline const SwFmtAnchor          &GetAnchor( bool = true ) const;
+    inline const SwFormatSurround            &GetSurround( bool = true ) const;
+    inline const SwFormatVertOrient      &GetVertOrient( bool = true ) const;
+    inline const SwFormatHoriOrient      &GetHoriOrient( bool = true ) const;
+    inline const SwFormatAnchor          &GetAnchor( bool = true ) const;
     inline const SvxBoxItem               &GetBox( bool = true ) const;
-    inline const SvxFmtKeepItem         &GetKeep( bool = true ) const;
+    inline const SvxFormatKeepItem         &GetKeep( bool = true ) const;
     inline const SvxBrushItem           &GetBackground( bool = true ) const;
     inline const SvxShadowItem            &GetShadow( bool = true ) const;
-    inline const SwFmtPageDesc            &GetPageDesc( bool = true ) const;
-    inline const SvxFmtBreakItem      &GetBreak( bool = true ) const;
-    inline const SwFmtCol                 &GetCol( bool = true ) const;
+    inline const SwFormatPageDesc            &GetPageDesc( bool = true ) const;
+    inline const SvxFormatBreakItem      &GetBreak( bool = true ) const;
+    inline const SwFormatCol                 &GetCol( bool = true ) const;
     inline const SvxMacroItem             &GetMacro( bool = true ) const;
-    inline const SwFmtURL             &GetURL( bool = true ) const;
-    inline const SwFmtEditInReadonly  &GetEditInReadonly( bool = true ) const;
-    inline const SwFmtLayoutSplit     &GetLayoutSplit( bool = true ) const;
-    inline const SwFmtRowSplit          &GetRowSplit( bool = true ) const;
-    inline const SwFmtChain             &GetChain( bool = true ) const;
-    inline const SwFmtLineNumber      &GetLineNumber( bool = true ) const;
-    inline const SwFmtFtnAtTxtEnd     &GetFtnAtTxtEnd( bool = true ) const;
-    inline const SwFmtEndAtTxtEnd     &GetEndAtTxtEnd( bool = true ) const;
-    inline const SwFmtNoBalancedColumns &GetBalancedColumns( bool = true ) const;
+    inline const SwFormatURL             &GetURL( bool = true ) const;
+    inline const SwFormatEditInReadonly  &GetEditInReadonly( bool = true ) const;
+    inline const SwFormatLayoutSplit     &GetLayoutSplit( bool = true ) const;
+    inline const SwFormatRowSplit          &GetRowSplit( bool = true ) const;
+    inline const SwFormatChain             &GetChain( bool = true ) const;
+    inline const SwFormatLineNumber      &GetLineNumber( bool = true ) const;
+    inline const SwFormatFootnoteAtTextEnd     &GetFootnoteAtTextEnd( bool = true ) const;
+    inline const SwFormatEndAtTextEnd     &GetEndAtTextEnd( bool = true ) const;
+    inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const;
     inline const SvxFrameDirectionItem    &GetFrmDir( bool = true ) const;
     inline const SwTextGridItem         &GetTextGrid( bool = true ) const;
     inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const;
-    inline const SwFmtFollowTextFlow    &GetFollowTextFlow(bool = true) const;
-    inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
+    inline const SwFormatFollowTextFlow    &GetFollowTextFlow(bool = true) const;
+    inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
     inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const;
 
     // Graphic attributes   - implementation in grfatr.hxx
@@ -318,14 +318,14 @@ public:
     // Paragraph attributes - implementation in paratr.hxx
     inline const SvxLineSpacingItem       &GetLineSpacing( bool = true ) const;
     inline const SvxAdjustItem            &GetAdjust( bool = true ) const;
-    inline const SvxFmtSplitItem      &GetSplit( bool = true ) const;
+    inline const SvxFormatSplitItem      &GetSplit( bool = true ) const;
     inline const SwRegisterItem           &GetRegister( bool = true ) const;
     inline const SwNumRuleItem            &GetNumRule( bool = true ) const;
     inline const SvxWidowsItem            &GetWidows( bool = true ) const;
     inline const SvxOrphansItem           &GetOrphans( bool = true ) const;
     inline const SvxTabStopItem           &GetTabStops( bool = true ) const;
     inline const SvxHyphenZoneItem        &GetHyphenZone( bool = true ) const;
-    inline const SwFmtDrop                &GetDrop( bool = true ) const;
+    inline const SwFormatDrop                &GetDrop( bool = true ) const;
     inline const SvxScriptSpaceItem       &GetScriptSpace(bool = true) const;
     inline const SvxHangingPunctuationItem &GetHangingPunctuation(bool = true) const;
     inline const SvxForbiddenRuleItem     &GetForbiddenRule(bool = true) const;
@@ -334,9 +334,9 @@ public:
     inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const;
 
     // Tablebox attributes  - implementation in cellatr.hxx
-    inline  const SwTblBoxNumFormat       &GetTblBoxNumFmt( bool = true ) const;
-    inline  const SwTblBoxFormula     &GetTblBoxFormula( bool = true ) const;
-    inline  const SwTblBoxValue           &GetTblBoxValue( bool = true ) const;
+    inline  const SwTableBoxNumFormat       &GetTableBoxNumFormat( bool = true ) const;
+    inline  const SwTableBoxFormula     &GetTableBoxFormula( bool = true ) const;
+    inline  const SwTableBoxValue           &GetTableBoxValue( bool = true ) const;
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwAttrSet)
 };
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 8da7be7bd1bb..3a09b6c91b2b 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -22,7 +22,7 @@
 #include <sfx2/lnkbase.hxx>
 
 class SwNode;
-class SwCntntNode;
+class SwContentNode;
 class ReReadThread;
 long GrfNodeChanged( void* pLink, void* pCaller );
 
@@ -30,7 +30,7 @@ class SwBaseLink : public ::sfx2::SvBaseLink
 {
     friend long GrfNodeChanged( void* pLink, void* pCaller );
 
-    SwCntntNode* pCntntNode;
+    SwContentNode* pContentNode;
     bool bSwapIn : 1;
     bool bNoDataFlag : 1;
     bool bIgnoreDataChanged : 1;
@@ -42,8 +42,8 @@ protected:
 public:
     TYPEINFO_OVERRIDE();
 
-    SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwCntntNode* pNode = 0 )
-        : ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ),
+    SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = 0 )
+        : ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ),
         bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ),
         m_pReReadThread(0)
     {}
@@ -56,7 +56,7 @@ public:
 
     virtual const SwNode* GetAnchor() const;
 
-    SwCntntNode *GetCntntNode() { return pCntntNode; }
+    SwContentNode *GetContentNode() { return pContentNode; }
 
     // For graphics only.
     bool SwapIn( bool bWaitForData = false, bool bNativFormat = false );
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 5e3ea0a228b0..7e55f59a8cae 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -78,7 +78,7 @@ protected:
 
     const _SwCursor_SavePos* GetSavePos() const { return m_pSavePos; }
 
-    virtual const SwCntntFrm* DoSetBidiLevelLeftRight(
+    virtual const SwContentFrm* DoSetBidiLevelLeftRight(
         bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr);
     virtual void DoSetBidiLevelUpDown();
     virtual bool IsSelOvrCheck(int eFlags);
@@ -97,7 +97,7 @@ public:
     virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
 
     virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO
-    virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
+    virtual void SaveTableBoxContent( const SwPosition* pPos = 0 );
 
     void FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const;
     SwMoveFnCollection* MakeFindRange( SwDocPositions, SwDocPositions,
@@ -109,11 +109,11 @@ public:
                 bool& bCancel,
                 FindRanges = FND_IN_BODY,
                 bool bReplace = false );
-    sal_uLong Find( const SwTxtFmtColl& rFmtColl,
+    sal_uLong Find( const SwTextFormatColl& rFormatColl,
                 SwDocPositions nStart, SwDocPositions nEnde,
                 bool& bCancel,
                 FindRanges = FND_IN_BODY,
-                const SwTxtFmtColl* pReplFmt = 0 );
+                const SwTextFormatColl* pReplFormat = 0 );
     sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections,
                 SwDocPositions nStart, SwDocPositions nEnde,
                 bool& bCancel,
@@ -172,14 +172,14 @@ public:
     bool GoNextCell( sal_uInt16 nCnt = 1 )  { return GoPrevNextCell( true, nCnt ); }
     bool GoPrevCell( sal_uInt16 nCnt = 1 )  { return GoPrevNextCell( false, nCnt ); }
     virtual bool GotoTable( const OUString& rName );
-    bool GotoTblBox( const OUString& rName );
+    bool GotoTableBox( const OUString& rName );
     bool GotoRegion( const OUString& rName );
-    bool GotoFtnAnchor();
-    bool GotoFtnTxt();
-    bool GotoNextFtnAnchor();
-    bool GotoPrevFtnAnchor();
-    bool GotoNextFtnCntnt();
-    bool GotoPrevFtnCntnt();
+    bool GotoFootnoteAnchor();
+    bool GotoFootnoteText();
+    bool GotoNextFootnoteAnchor();
+    bool GotoPrevFootnoteAnchor();
+    bool GotoNextFootnoteContent();
+    bool GotoPrevFootnoteContent();
 
     bool MovePara( SwWhichPara, SwPosPara );
     bool MoveSection( SwWhichSection, SwPosSection );
@@ -194,7 +194,7 @@ public:
                                   nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ));
     bool IsInProtectTable( bool bMove = false,
                                    bool bChgCrsr = true );
-    bool IsNoCntnt() const;
+    bool IsNoContent() const;
 
     /** Restore cursor state to the one saved by SwCrsrSaveState **/
     void RestoreSavePos();
@@ -240,12 +240,12 @@ public:
 struct _SwCursor_SavePos
 {
     sal_uLong nNode;
-    sal_Int32 nCntnt;
+    sal_Int32 nContent;
     _SwCursor_SavePos* pNext;
 
     _SwCursor_SavePos( const SwCursor& rCrsr )
         : nNode( rCrsr.GetPoint()->nNode.GetIndex() ),
-        nCntnt( rCrsr.GetPoint()->nContent.GetIndex() ),
+        nContent( rCrsr.GetPoint()->nContent.GetIndex() ),
         pNext( 0 )
     {}
     virtual ~_SwCursor_SavePos() {}
@@ -257,10 +257,10 @@ class SwTableCursor : public virtual SwCursor
 {
 
 protected:
-    sal_uLong m_nTblPtNd;
-    sal_uLong m_nTblMkNd;
-    sal_Int32 m_nTblPtCnt;
-    sal_Int32 m_nTblMkCnt;
+    sal_uLong m_nTablePtNd;
+    sal_uLong m_nTableMkNd;
+    sal_Int32 m_nTablePtCnt;
+    sal_Int32 m_nTableMkCnt;
     SwSelBoxes m_SelectedBoxes;
     bool m_bChanged : 1;
     bool m_bParked : 1;       // Table-cursor was parked.
@@ -276,7 +276,7 @@ public:
         bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ) SAL_OVERRIDE;
     virtual bool GotoTable( const OUString& rName ) SAL_OVERRIDE;
 
-    void InsertBox( const SwTableBox& rTblBox );
+    void InsertBox( const SwTableBox& rTableBox );
     void DeleteBox(size_t nPos);
     size_t GetSelectedBoxesCount() const { return m_SelectedBoxes.size(); }
     const SwSelBoxes& GetSelectedBoxes() const { return m_SelectedBoxes; }
@@ -287,14 +287,14 @@ public:
     bool HasReadOnlyBoxSel() const;
 
     // Has table cursor been changed? If so, save new values immediately.
-    bool IsCrsrMovedUpdt();
+    bool IsCrsrMovedUpdate();
     // Has table cursor been changed?
     bool IsCrsrMoved() const
     {
-        return  m_nTblMkNd != GetMark()->nNode.GetIndex() ||
-                m_nTblPtNd != GetPoint()->nNode.GetIndex() ||
-                m_nTblMkCnt != GetMark()->nContent.GetIndex() ||
-                m_nTblPtCnt != GetPoint()->nContent.GetIndex();
+        return  m_nTableMkNd != GetMark()->nNode.GetIndex() ||
+                m_nTablePtNd != GetPoint()->nNode.GetIndex() ||
+                m_nTableMkCnt != GetMark()->nContent.GetIndex() ||
+                m_nTablePtCnt != GetPoint()->nContent.GetIndex();
     }
 
     bool IsChgd() const { return m_bChanged; }
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index 025fe81ce21c..ec76169e7309 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -38,16 +38,16 @@ public:
     void ChangeContent();
     bool  NoDDETable();
 
-    SwDDEFieldType* GetDDEFldType();
-    inline const SwDDEFieldType* GetDDEFldType() const;
+    SwDDEFieldType* GetDDEFieldType();
+    inline const SwDDEFieldType* GetDDEFieldType() const;
 protected:
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
     virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
 };
 
-inline const SwDDEFieldType* SwDDETable::GetDDEFldType() const
+inline const SwDDEFieldType* SwDDETable::GetDDEFieldType() const
 {
-    return const_cast<SwDDETable*>(this)->GetDDEFldType();
+    return const_cast<SwDDETable*>(this)->GetDDEFieldType();
 }
 
 #endif
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 356c7bf56ba6..e2ca9302d2fd 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -51,8 +51,8 @@
 #define     STR_SW_EVENT_FRM_RESIZE           11
 #define     STR_SW_EVENT_FRM_MOVE             12
 
-class SwFrmFmt;
-class SwFmtINetFmt;
+class SwFrameFormat;
+class SwFormatINetFormat;
 class IMapObject;
 
 // Enum for objects that call events into Basic or JavaScript.
@@ -73,43 +73,43 @@ struct SwCallMouseEvent
     union
     {
         // EVENT_OBJECT_IMAGE/EVENT_OBJECT_URLITEM
-        const SwFrmFmt* pFmt;
+        const SwFrameFormat* pFormat;
 
         // EVENT_OBJECT_INETATTR
-        const SwFmtINetFmt* pINetAttr;
+        const SwFormatINetFormat* pINetAttr;
 
         // EVENT_OBJECT_IMAGEMAP
         struct
         {
-            const SwFrmFmt* pFmt;
+            const SwFrameFormat* pFormat;
             const IMapObject* pIMapObj;
         } IMAP;
     } PTR;
 
     SwCallMouseEvent()
         : eType( EVENT_OBJECT_NONE )
-        { PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; }
+        { PTR.pFormat = 0; PTR.IMAP.pIMapObj = 0; }
 
-    void Set( SwCallEventObjectType eTyp, const SwFrmFmt* pFmt )
-        { eType = eTyp; PTR.pFmt = pFmt; PTR.IMAP.pIMapObj = 0; }
+    void Set( SwCallEventObjectType eTyp, const SwFrameFormat* pFormat )
+        { eType = eTyp; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = 0; }
 
-    void Set( const SwFrmFmt* pFmt, const IMapObject* pIMapObj )
-        { eType = EVENT_OBJECT_IMAGEMAP; PTR.pFmt = pFmt; PTR.IMAP.pIMapObj = pIMapObj; }
+    void Set( const SwFrameFormat* pFormat, const IMapObject* pIMapObj )
+        { eType = EVENT_OBJECT_IMAGEMAP; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = pIMapObj; }
 
-    void Set( const SwFmtINetFmt* pINetAttr )
+    void Set( const SwFormatINetFormat* pINetAttr )
         { eType = EVENT_OBJECT_INETATTR; PTR.pINetAttr = pINetAttr; PTR.IMAP.pIMapObj = 0; }
 
     bool operator==( const SwCallMouseEvent& rEvent ) const
         {
             return eType == rEvent.eType &&
-                    PTR.pFmt == rEvent.PTR.pFmt &&
+                    PTR.pFormat == rEvent.PTR.pFormat &&
                     PTR.IMAP.pIMapObj == rEvent.PTR.IMAP.pIMapObj;
         }
     bool operator!=( const SwCallMouseEvent& rEvent ) const
         {   return !( *this == rEvent );    }
 
     void Clear()
-        { eType = EVENT_OBJECT_NONE; PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; }
+        { eType = EVENT_OBJECT_NONE; PTR.pFormat = 0; PTR.IMAP.pIMapObj = 0; }
 
     bool HasEvent() const { return EVENT_OBJECT_NONE != eType; }
 };
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 0b5504a57c3a..6c3dc36c738f 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -152,7 +152,7 @@ public:
                                      sal_uInt16 nDest = VIEWOPT_DEST_VIEW );
     void ApplyUserMetric( FieldUnit eMetric, bool bWeb );
     void ApplyRulerMetric( FieldUnit eMetric, bool bHorizontal, bool bWeb );
-    void ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags);
+    void ApplyFieldUpdateFlags(SwFieldUpdateFlags eFieldFlags);
     void ApplyLinkMode(sal_Int32 nNewLinkMode);
 
     // Default page mode for text grid.
@@ -184,9 +184,9 @@ public:
     static void ShowDBObj( SwView& rView, const SwDBData& rData, bool bOnlyIfAvailable = false);
 
     // Table modi.
-    bool            IsInsTblFormatNum(bool bHTML) const;
-    bool            IsInsTblChangeNumFormat(bool bHTML) const;
-    bool            IsInsTblAlignNum(bool bHTML) const;
+    bool            IsInsTableFormatNum(bool bHTML) const;
+    bool            IsInsTableChangeNumFormat(bool bHTML) const;
+    bool            IsInsTableAlignNum(bool bHTML) const;
 
     // Redlining.
     sal_uInt16          GetRedlineAuthor();
@@ -214,7 +214,7 @@ public:
 
     // Pass update-statuses.
     sal_uInt16 GetLinkUpdMode( bool bWeb ) const;
-    SwFldUpdateFlags GetFldUpdateFlags( bool bWeb ) const;
+    SwFieldUpdateFlags GetFieldUpdateFlags( bool bWeb ) const;
 
     // Virtual methods for options dialog.
     virtual SfxItemSet*  CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx
index 2e2749fe0496..40fcfcb9801a 100644
--- a/sw/inc/swscanner.hxx
+++ b/sw/inc/swscanner.hxx
@@ -23,14 +23,14 @@
 #include <i18nlangtag/lang.h>
 #include <modeltoviewhelper.hxx>
 
-class SwTxtNode;
+class SwTextNode;
 
 // Helper class that provides consecutively the words of a selected area
 // during spell check
 class SwScanner
 {
     OUString aWord;
-    const SwTxtNode& rNode;
+    const SwTextNode& rNode;
     const OUString aPreDashReplacementText;
     OUString aText;
     const LanguageType* pLanguage;
@@ -45,7 +45,7 @@ class SwScanner
     bool bClip;
 
 public:
-    SwScanner( const SwTxtNode& rNd, const OUString& rTxt,
+    SwScanner( const SwTextNode& rNd, const OUString& rText,
                const LanguageType* pLang,
                const ModelToViewHelper& rConvMap,
                sal_uInt16 nWordType,
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 3da7b1a28df4..053912718280 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -36,7 +36,7 @@ protected:
     enum ServerModes { BOOKMARK_SERVER, TABLE_SERVER, SECTION_SERVER, NONE_SERVER } eType;
     union {
         ::sw::mark::IMark* pBkmk;
-        SwTableNode* pTblNd;
+        SwTableNode* pTableNd;
         SwSectionNode* pSectNd;
     } CNTNT_TYPE;
 
@@ -51,7 +51,7 @@ public:
     SwServerObject( SwTableNode& rTableNd )
         : eType( TABLE_SERVER )
     {
-        CNTNT_TYPE.pTblNd = &rTableNd;
+        CNTNT_TYPE.pTableNd = &rTableNd;
     }
     SwServerObject( SwSectionNode& rSectNd )
         : eType( SECTION_SERVER )
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 088c01b82703..f3197b567a9d 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -33,12 +33,12 @@
 #include <o3tl/sorted_vector.hxx>
 
 class SwStartNode;
-class SwFmt;
+class SwFormat;
 class Color;
-class SwFrmFmt;
-class SwTableFmt;
-class SwTableLineFmt;
-class SwTableBoxFmt;
+class SwFrameFormat;
+class SwTableFormat;
+class SwTableLineFormat;
+class SwTableBoxFormat;
 class SwHTMLTableLayout;
 class SwTableLine;
 class SwTableBox;
@@ -46,22 +46,22 @@ class SwTableNode;
 class SwTabCols;
 class SwDoc;
 class SwSelBoxes;
-class SwTblCalcPara;
+class SwTableCalcPara;
 struct SwPosition;
 class SwNodeIndex;
 class SwNode;
 class SfxPoolItem;
-class SwUndoTblMerge;
+class SwUndoTableMerge;
 class SwUndo;
 class SwPaM;
 class SwTableBox_Impl;
-class SwUndoTblCpyTbl;
+class SwUndoTableCpyTable;
 class SwBoxSelection;
 struct SwSaveRowSpan;
 struct Parm;
 class SwServerObject;
 
-void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm );
+void sw_GetTableBoxColStr( sal_uInt16 nCol, OUString& rNm );
 
 class SwTableLines : public std::vector<SwTableLine*> {
 public:
@@ -91,7 +91,7 @@ public:
 class SwTableSortBoxes : public o3tl::sorted_vector<SwTableBox*> {};
 
 /// SwTable is one table in the document model, containing rows (which contain cells).
-class SW_DLLPUBLIC SwTable: public SwClient          //Client of FrmFmt.
+class SW_DLLPUBLIC SwTable: public SwClient          //Client of FrameFormat.
 {
 
 protected:
@@ -108,7 +108,7 @@ protected:
     SwTableNode* pTableNode;
 
     // Should that be adjustable for every table?
-    TblChgMode  eTblChgMode;
+    TableChgMode  eTableChgMode;
 
     sal_uInt16      nGrfsThatResize;    // Count of Grfs that initiate a resize of table
                                         // at HTML-import.
@@ -136,7 +136,7 @@ public:
     TYPEINFO_OVERRIDE();
 
     // single argument ctors shall be explicit.
-    explicit SwTable( SwTableFmt* );
+    explicit SwTable( SwTableFormat* );
     virtual ~SwTable();
 
     // @@@ public copy ctor, but no copy assignment?
@@ -146,10 +146,10 @@ private:
     SwTable & operator= (const SwTable &) SAL_DELETED_FUNCTION;
     // no default ctor.
     SwTable();
-    bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* );
+    bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTableMerge* );
     bool OldSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool );
     bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged,
-                   SwTableBox*, SwUndoTblMerge* );
+                   SwTableBox*, SwUndoTableMerge* );
     bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool );
     SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const;
     void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt );
@@ -184,8 +184,8 @@ public:
           SwTableLines &GetTabLines() { return aLines; }
     const SwTableLines &GetTabLines() const { return aLines; }
 
-    SwTableFmt* GetFrmFmt()       { return static_cast<SwTableFmt*>(GetRegisteredIn()); }
-    SwTableFmt* GetFrmFmt() const { return const_cast<SwTableFmt*>(static_cast<const SwTableFmt*>(GetRegisteredIn())); }
+    SwTableFormat* GetFrameFormat()       { return static_cast<SwTableFormat*>(GetRegisteredIn()); }
+    SwTableFormat* GetFrameFormat() const { return const_cast<SwTableFormat*>(static_cast<const SwTableFormat*>(GetRegisteredIn())); }
 
     void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
                      bool bHidden = false, bool bCurRowOnly = false ) const;
@@ -213,7 +213,7 @@ public:
 // It's not allowed to change the table model after the first call of one of these functions.
 
     bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged,
-                SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 )
+                SwTableBox* pMergeBox, SwUndoTableMerge* pUndo = 0 )
     {
 #ifdef DBG_UTIL
         m_bDontChangeModel = true;
@@ -231,7 +231,7 @@ public:
                            OldSplitRow( pDoc, rBoxes, nCnt, bSameHeight );
     }
     bool PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
-        SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo );
+        SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo );
     void ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax ) const;
     void PrepareDeleteCol( long nMin, long nMax );
 
@@ -244,7 +244,7 @@ public:
         SwUndo* pUndo, const bool bDelMakeFrms, const bool bCorrBorder );
     bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 );
     bool Merge( const SwSelBoxes& rBoxes,
-                SwTableBox* pMergeBox, SwUndoTblMerge* = 0 );
+                SwTableBox* pMergeBox, SwUndoTableMerge* = 0 );
 
     void FindSuperfluousRows( SwSelBoxes& rBoxes )
         { _FindSuperfluousRows( rBoxes, 0, 0 ); }
@@ -253,7 +253,7 @@ public:
           SwTableSortBoxes& GetTabSortBoxes()       { return m_TabSortContentBoxes; }
     const SwTableSortBoxes& GetTabSortBoxes() const { return m_TabSortContentBoxes; }
 
-    // Read 1st number and delete it from string (used by GetTblBox and SwTblFld).
+    // Read 1st number and delete it from string (used by GetTableBox and SwTableField).
 
     // #i80314#
     // add 3rd parameter in order to control validation check on <rStr>
@@ -266,31 +266,31 @@ public:
     // #i80314#
     // add 2nd parameter in order to control validation check in called method
     // <_GetBoxNum(..)>
-    const SwTableBox* GetTblBox( const OUString& rName,
+    const SwTableBox* GetTableBox( const OUString& rName,
                                  const bool bPerformValidCheck = false ) const;
     // Copy selected boxes to another document.
     bool MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&,
                     bool bCpyNds = true, bool bCpyName = false ) const;
     // Copy table in this
-    bool InsTable( const SwTable& rCpyTbl, const SwNodeIndex&,
-                    SwUndoTblCpyTbl* pUndo = 0 );
-    bool InsTable( const SwTable& rCpyTbl, const SwSelBoxes&,
-                    SwUndoTblCpyTbl* pUndo = 0 );
-    bool InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&,
-                      SwUndoTblCpyTbl* pUndo );
+    bool InsTable( const SwTable& rCpyTable, const SwNodeIndex&,
+                    SwUndoTableCpyTable* pUndo = 0 );
+    bool InsTable( const SwTable& rCpyTable, const SwSelBoxes&,
+                    SwUndoTableCpyTable* pUndo = 0 );
+    bool InsNewTable( const SwTable& rCpyTable, const SwSelBoxes&,
+                      SwUndoTableCpyTable* pUndo );
     // Copy headline of table (with content!) into an other one.
-    bool CopyHeadlineIntoTable( SwTableNode& rTblNd );
+    bool CopyHeadlineIntoTable( SwTableNode& rTableNd );
 
     // Get box, whose start index is set on nBoxStt.
-          SwTableBox* GetTblBox( sal_uLong nSttIdx );
-    const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const
-                        {   return const_cast<SwTable*>(this)->GetTblBox( nSttIdx );  }
+          SwTableBox* GetTableBox( sal_uLong nSttIdx );
+    const SwTableBox* GetTableBox( sal_uLong nSttIdx ) const
+                        {   return const_cast<SwTable*>(this)->GetTableBox( nSttIdx );  }
 
     // Returns true if table contains nestings.
-    bool IsTblComplex() const;
+    bool IsTableComplex() const;
 
     // Returns true if table or selection is balanced.
-    bool IsTblComplexForChart( const OUString& rSel ) const;
+    bool IsTableComplexForChart( const OUString& rSel ) const;
 
     // Search all content-bearing boxes of the base line on which this box stands.
     // rBoxes as a return value for immediate use.
@@ -303,7 +303,7 @@ public:
     virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
 
     // Search in format for registered table.
-    static SwTable * FindTable( SwFrmFmt const*const pFmt );
+    static SwTable * FindTable( SwFrameFormat const*const pFormat );
 
     // Clean up structure a bit.
     void GCLines();
@@ -320,14 +320,14 @@ public:
     // Fill data for chart.
     void UpdateCharts() const;
 
-    TblChgMode GetTblChgMode() const        { return eTblChgMode; }
-    void SetTblChgMode( TblChgMode eMode )  { eTblChgMode = eMode; }
+    TableChgMode GetTableChgMode() const        { return eTableChgMode; }
+    void SetTableChgMode( TableChgMode eMode )  { eTableChgMode = eMode; }
 
     bool SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                         SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
     bool SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                         SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
-    void RegisterToFormat( SwFmt& rFmt );
+    void RegisterToFormat( SwFormat& rFormat );
 #ifdef DBG_UTIL
     void CheckConsistency() const;
 #endif
@@ -336,7 +336,7 @@ public:
 };
 
 /// SwTableLine is one table row in the document model.
-class SW_DLLPUBLIC SwTableLine: public SwClient     // Client of FrmFmt.
+class SW_DLLPUBLIC SwTableLine: public SwClient     // Client of FrameFormat.
 {
     SwTableBoxes aBoxes;
     SwTableBox *pUpper;
@@ -346,7 +346,7 @@ public:
 
     SwTableLine() : pUpper(0) {}
 
-    SwTableLine( SwTableLineFmt*, sal_uInt16 nBoxes, SwTableBox *pUp );
+    SwTableLine( SwTableLineFormat*, sal_uInt16 nBoxes, SwTableBox *pUp );
     virtual ~SwTableLine();
 
           SwTableBoxes &GetTabBoxes() { return aBoxes; }
@@ -356,27 +356,27 @@ public:
     const SwTableBox *GetUpper() const { return pUpper; }
     void SetUpper( SwTableBox *pNew ) { pUpper = pNew; }
 
-    SwFrmFmt* GetFrmFmt()       { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat* GetFrameFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+    SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 
-    // Creates a own FrmFmt if more lines depend on it.
-    SwFrmFmt* ClaimFrmFmt();
-    void ChgFrmFmt( SwTableLineFmt* pNewFmt );
+    // Creates a own FrameFormat if more lines depend on it.
+    SwFrameFormat* ClaimFrameFormat();
+    void ChgFrameFormat( SwTableLineFormat* pNewFormat );
 
     // Search next/previous box with content.
     SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0,
-                            bool bOvrTblLns=true ) const;
+                            bool bOvrTableLns=true ) const;
     SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0,
-                            bool bOvrTblLns=true ) const;
+                            bool bOvrTableLns=true ) const;
 
     SwTwips GetTableLineHeight( bool& bLayoutAvailable ) const;
 
     bool hasSoftPageBreak() const;
-    void RegisterToFormat( SwFmt& rFmt );
+    void RegisterToFormat( SwFormat& rFormat );
 };
 
 /// SwTableBox is one table cell in the document model.
-class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrmFmt.
+class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrameFormat.
 {
     friend class SwNodes;           // Transpose index.
     friend void DelBoxNode(SwTableSortBoxes&);  // Delete StartNode* !
@@ -392,16 +392,16 @@ class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrmFmt.
 
     // In case Format contains formulas/values already,
     // a new one must be created for the new box.
-    static SwTableBoxFmt* CheckBoxFmt( SwTableBoxFmt* );
+    static SwTableBoxFormat* CheckBoxFormat( SwTableBoxFormat* );
 
 public:
     TYPEINFO_OVERRIDE();
 
     SwTableBox() : pSttNd(0), pUpper(0), pImpl(0) {}
 
-    SwTableBox( SwTableBoxFmt*, sal_uInt16 nLines, SwTableLine *pUp = 0 );
-    SwTableBox( SwTableBoxFmt*, const SwStartNode&, SwTableLine *pUp = 0 );
-    SwTableBox( SwTableBoxFmt*, const SwNodeIndex&, SwTableLine *pUp = 0 );
+    SwTableBox( SwTableBoxFormat*, sal_uInt16 nLines, SwTableLine *pUp = 0 );
+    SwTableBox( SwTableBoxFormat*, const SwStartNode&, SwTableLine *pUp = 0 );
+    SwTableBox( SwTableBoxFormat*, const SwNodeIndex&, SwTableLine *pUp = 0 );
     virtual ~SwTableBox();
 
           SwTableLines &GetTabLines() { return aLines; }
@@ -411,12 +411,12 @@ public:
     const SwTableLine *GetUpper() const { return pUpper; }
     void SetUpper( SwTableLine *pNew ) { pUpper = pNew; }
 
-    SwFrmFmt* GetFrmFmt()       { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat* GetFrameFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+    SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 
-    // Creates its own FrmFmt if more boxes depend on it.
-    SwFrmFmt* ClaimFrmFmt();
-    void ChgFrmFmt( SwTableBoxFmt *pNewFmt );
+    // Creates its own FrameFormat if more boxes depend on it.
+    SwFrameFormat* ClaimFrameFormat();
+    void ChgFrameFormat( SwTableBoxFormat *pNewFormat );
 
     void RemoveFromTable();
     const SwStartNode *GetSttNd() const { return pSttNd; }
@@ -424,25 +424,25 @@ public:
 
     // Search next/previous box with content.
     SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0,
-                            bool bOvrTblLns=true ) const;
+                            bool bOvrTableLns=true ) const;
     SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0,
-                            bool bOvrTblLns=true ) const;
+                            bool bOvrTableLns=true ) const;
     // Return name of this box. It is determined dynamically and
     // is calculated from the position in the lines/boxes/table.
     OUString GetName() const;
     // Return "value" of box (for calculating in table).
-    double GetValue( SwTblCalcPara& rPara ) const;
+    double GetValue( SwTableCalcPara& rPara ) const;
 
     // Computes "coordinates" of a box, used to computed selection
     // width or height when inserting cols or rows
     Point GetCoordinates() const;
 
-    bool IsInHeadline( const SwTable* pTbl = 0 ) const;
+    bool IsInHeadline( const SwTable* pTable = 0 ) const;
 
     // Contains box contents, that can be formatted as a number?
-    bool HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
-                    bool& rIsEmptyTxtNd ) const;
-    sal_uLong IsValidNumTxtNd( bool bCheckAttr = true ) const;
+    bool HasNumContent( double& rNum, sal_uInt32& rFormatIndex,
+                    bool& rIsEmptyTextNd ) const;
+    sal_uLong IsValidNumTextNd( bool bCheckAttr = true ) const;
     // If a table formula is set, test if box contents is congruent with number.
     // (For Redo of change of NumFormat!).
     bool IsNumberChanged() const;
@@ -459,9 +459,9 @@ public:
 
     // Access on internal data - currently used for the NumFormatter.
     inline const Color* GetSaveUserColor()  const;
-    inline const Color* GetSaveNumFmtColor() const;
+    inline const Color* GetSaveNumFormatColor() const;
     inline void SetSaveUserColor(const Color* p );
-    inline void SetSaveNumFmtColor( const Color* p );
+    inline void SetSaveNumFormatColor( const Color* p );
 
     long getRowSpan() const;
     void setRowSpan( long nNewRowSpan );
@@ -477,7 +477,7 @@ public:
     const SwTableBox& FindEndOfRowSpan( const SwTable& rTable,
         sal_uInt16 nMaxStep = USHRT_MAX ) const
         { return const_cast<SwTableBox*>(this)->FindEndOfRowSpan( rTable, nMaxStep ); }
-    void RegisterToFormat( SwFmt& rFmt ) ;
+    void RegisterToFormat( SwFormat& rFormat ) ;
 };
 
 class SwCellFrm;
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 181bf23b67b0..336bb39a0193 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -23,62 +23,62 @@
 
 class SwDoc;
 
-class SW_DLLPUBLIC SwTableFmt : public SwFrmFmt
+class SW_DLLPUBLIC SwTableFormat : public SwFrameFormat
 {
     friend class SwDoc;
 
 protected:
-    SwTableFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
+    SwTableFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
     {}
-    SwTableFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
+    SwTableFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
     {}
 
 public:
     TYPEINFO_OVERRIDE();     // Already in base class Content.
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTableFormat)
 
     virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
 };
 
-class SwTableLineFmt : public SwFrmFmt
+class SwTableLineFormat : public SwFrameFormat
 {
     friend class SwDoc;
 
 protected:
-    SwTableLineFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
+    SwTableLineFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
     {}
-    SwTableLineFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
+    SwTableLineFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
     {}
 
 public:
     TYPEINFO_OVERRIDE();     // Already in base class Content.
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFormat)
 
     virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwTableBoxFmt : public SwFrmFmt
+class SW_DLLPUBLIC SwTableBoxFormat : public SwFrameFormat
 {
     friend class SwDoc;
 
 protected:
-    SwTableBoxFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
+    SwTableBoxFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
     {}
-    SwTableBoxFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                    SwFrmFmt *pDrvdFrm )
-        : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
+    SwTableBoxFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+                    SwFrameFormat *pDrvdFrm )
+        : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
     {}
 
    // For recognition of changes (especially TableBoxAttribute).
@@ -87,7 +87,7 @@ protected:
 public:
     TYPEINFO_OVERRIDE();     // Already in base class Content.
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFmt)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFormat)
 
     virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
 };
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index b5107323d63f..b724fbdc3313 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -130,7 +130,7 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
 #define INIT_SEQ_FLDTYPES   4
 
 // The former Rendevouz-IDs live on:
-// There are IDs for the anchors (SwFmtAnchor) and some others
+// There are IDs for the anchors (SwFormatAnchor) and some others
 // that are only of importance for interfaces (SwDoc).
 enum RndStdIds
 {
@@ -257,7 +257,7 @@ enum PrepareHint
                             // (Check for Fly-break). In void* of Prepare()
                             // a sal_Bool& is passed. If this is sal_True,
                             // it indicateds that a format has been executed.
-    PREP_UL_SPACE,          // UL-Space has changed, TxtFrms have to
+    PREP_UL_SPACE,          // UL-Space has changed, TextFrms have to
                             // re-calculate line space.
     PREP_MUST_FIT,          // Make frm fit (split) even if the attributes do
                             // not allow that (e.g. "keep together").
@@ -269,7 +269,7 @@ enum PrepareHint
                             // order to format the text into it.
     PREP_BOSS_CHGD,         // If a Frm changes its column/page this additional
                             // Prepare is sended to POS_CHGD in MoveFwd/Bwd
-                            // (join Ftn-numbers etc.)
+                            // (join Footnote-numbers etc.)
                             // Direction is communicated via pVoid:
                             //     MoveFwd: pVoid == 0
                             //     MoveBwd: pVoid == pOldPage
@@ -279,7 +279,7 @@ enum PrepareHint
     PREP_MOVEFTN,           // A footnote changes its page. Its contents receives at first a
                             // height of zero in order to avoid too much noise. At formatting
                             // it checks whether it fits and if necessary changes its page again.
-    PREP_ERGOSUM,           // Needed because of movement in FtnFrms. Check QuoVadis/ErgoSum.
+    PREP_ERGOSUM,           // Needed because of movement in FootnoteFrms. Check QuoVadis/ErgoSum.
     PREP_END                // END.
 };
 
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 8c96abafcc87..8f51b2287392 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -62,7 +62,7 @@ struct SwAfVersions;
 
 class SvNumberFormatter;
 
-class SwBoxAutoFmt
+class SwBoxAutoFormat
 {
     // common attributes of Calc and Writer
     // --- from 641 on: CJK and CTL font settings
@@ -95,7 +95,7 @@ class SwBoxAutoFmt
     // Writer specific
     SvxAdjustItem       aAdjust;
     SvxFrameDirectionItem m_aTextOrientation;
-    SwFmtVertOrient m_aVerticalAlignment;
+    SwFormatVertOrient m_aVerticalAlignment;
 
     // Calc specific
     SvxHorJustifyItem   aHorJustify;
@@ -107,16 +107,16 @@ class SwBoxAutoFmt
     SvxRotateModeItem   aRotateMode;
 
     // number format
-    OUString            sNumFmtString;
-    LanguageType        eSysLanguage, eNumFmtLanguage;
+    OUString            sNumFormatString;
+    LanguageType        eSysLanguage, eNumFormatLanguage;
 
 public:
-    SwBoxAutoFmt();
-    SwBoxAutoFmt( const SwBoxAutoFmt& rNew );
-    ~SwBoxAutoFmt();
+    SwBoxAutoFormat();
+    SwBoxAutoFormat( const SwBoxAutoFormat& rNew );
+    ~SwBoxAutoFormat();
 
-    int operator==( const SwBoxAutoFmt& rCmp ) const;
-    SwBoxAutoFmt& operator=( const SwBoxAutoFmt& rNew );
+    int operator==( const SwBoxAutoFormat& rCmp ) const;
+    SwBoxAutoFormat& operator=( const SwBoxAutoFormat& rNew );
 
     // The get-methods.
     const SvxFontItem       &GetFont() const        { return aFont; }
@@ -139,13 +139,13 @@ public:
     const SvxColorItem      &GetColor() const       { return aColor; }
     const SvxAdjustItem     &GetAdjust() const      { return aAdjust; }
     const SvxFrameDirectionItem& GetTextOrientation() const { return m_aTextOrientation; }
-    const SwFmtVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; }
+    const SwFormatVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; }
     const SvxBoxItem        &GetBox() const         { return aBox; }
     const SvxLineItem       &GetTLBR() const        { return aTLBR; }
     const SvxLineItem       &GetBLTR() const        { return aBLTR; }
     const SvxBrushItem      &GetBackground() const  { return aBackground; }
-    void GetValueFormat( OUString& rFmt, LanguageType& rLng, LanguageType& rSys ) const
-        { rFmt = sNumFmtString; rLng = eNumFmtLanguage; rSys = eSysLanguage; }
+    void GetValueFormat( OUString& rFormat, LanguageType& rLng, LanguageType& rSys ) const
+        { rFormat = sNumFormatString; rLng = eNumFormatLanguage; rSys = eSysLanguage; }
 
     // The set-methods.
     void SetFont( const SvxFontItem& rNew )             { aFont = rNew; }
@@ -173,11 +173,11 @@ public:
             aAdjust.SetLastBlock( rNew.GetLastBlock() );
         }
     void SetTextOrientation(const SvxFrameDirectionItem& rNew) { m_aTextOrientation = rNew; }
-    void SetVerticalAlignment(const SwFmtVertOrient& rNew) { m_aVerticalAlignment = rNew; }
+    void SetVerticalAlignment(const SwFormatVertOrient& rNew) { m_aVerticalAlignment = rNew; }
     void SetBox( const SvxBoxItem& rNew )               { aBox = rNew; }
     void SetBackground( const SvxBrushItem& rNew )      { aBackground = rNew; }
-    void SetValueFormat( const OUString& rFmt, LanguageType eLng, LanguageType eSys )
-        { sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage = eSys; }
+    void SetValueFormat( const OUString& rFormat, LanguageType eLng, LanguageType eSys )
+        { sNumFormatString = rFormat; eNumFormatLanguage = eLng; eSysLanguage = eSys; }
 
     bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer );
     bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const;
@@ -228,10 +228,10 @@ The properties saved are divided into three categories:
 Character and box properties are stored per cell (and are lossy for tables larger than 4x4). Table
 properties are stored per-table, and are lossless.
 */
-class SW_DLLPUBLIC SwTableAutoFmt
+class SW_DLLPUBLIC SwTableAutoFormat
 {
     friend void _FinitCore();       // To destroy default pointer.
-    static SwBoxAutoFmt* pDfltBoxAutoFmt;
+    static SwBoxAutoFormat* pDfltBoxAutoFormat;
 
     OUString m_aName;
     sal_uInt16 nStrResId;
@@ -246,12 +246,12 @@ class SW_DLLPUBLIC SwTableAutoFmt
     // Calc specific flags.
     bool bInclWidthHeight : 1;
 
-    SwBoxAutoFmt* aBoxAutoFmt[ 16 ];
+    SwBoxAutoFormat* aBoxAutoFormat[ 16 ];
 
     // Writer-specific options
-    SvxFmtBreakItem m_aBreak;
-    SwFmtPageDesc m_aPageDesc;
-    SvxFmtKeepItem m_aKeepWithNextPara;
+    SvxFormatBreakItem m_aBreak;
+    SwFormatPageDesc m_aPageDesc;
+    SvxFormatKeepItem m_aKeepWithNextPara;
     sal_uInt16 m_aRepeatHeading;
     bool m_bLayoutSplit;
     bool m_bRowSplit;
@@ -259,14 +259,14 @@ class SW_DLLPUBLIC SwTableAutoFmt
     SvxShadowItem m_aShadow;
 
 public:
-    SwTableAutoFmt( const OUString& rName );
-    SwTableAutoFmt( const SwTableAutoFmt& rNew );
-    ~SwTableAutoFmt();
+    SwTableAutoFormat( const OUString& rName );
+    SwTableAutoFormat( const SwTableAutoFormat& rNew );
+    ~SwTableAutoFormat();
 
-    SwTableAutoFmt& operator=( const SwTableAutoFmt& rNew );
+    SwTableAutoFormat& operator=( const SwTableAutoFormat& rNew );
 
-    void SetBoxFmt( const SwBoxAutoFmt& rNew, sal_uInt8 nPos );
-    const SwBoxAutoFmt& GetBoxFmt( sal_uInt8 nPos ) const;
+    void SetBoxFormat( const SwBoxAutoFormat& rNew, sal_uInt8 nPos );
+    const SwBoxAutoFormat& GetBoxFormat( sal_uInt8 nPos ) const;
 
     void SetName( const OUString& rNew ) { m_aName = rNew; nStrResId = USHRT_MAX; }
     OUString GetName() const { return m_aName; }
@@ -297,7 +297,7 @@ public:
     bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const;
 };
 
-class SW_DLLPUBLIC SwTableAutoFmtTbl
+class SW_DLLPUBLIC SwTableAutoFormatTable
 {
     struct Impl;
     ::boost::scoped_ptr<Impl> m_pImpl;
@@ -306,15 +306,15 @@ class SW_DLLPUBLIC SwTableAutoFmtTbl
     SAL_DLLPRIVATE bool Save( SvStream& rStream ) const;
 
 public:
-    explicit SwTableAutoFmtTbl();
-    ~SwTableAutoFmtTbl();
+    explicit SwTableAutoFormatTable();
+    ~SwTableAutoFormatTable();
 
     size_t size() const;
-    SwTableAutoFmt const& operator[](size_t i) const;
-    SwTableAutoFmt      & operator[](size_t i);
-    void InsertAutoFmt(size_t i, SwTableAutoFmt * pFmt);
-    void EraseAutoFmt(size_t i);
-    SwTableAutoFmt* ReleaseAutoFmt(size_t i);
+    SwTableAutoFormat const& operator[](size_t i) const;
+    SwTableAutoFormat      & operator[](size_t i);
+    void InsertAutoFormat(size_t i, SwTableAutoFormat * pFormat);
+    void EraseAutoFormat(size_t i);
+    SwTableAutoFormat* ReleaseAutoFormat(size_t i);
 
     bool Load();
     bool Save() const;
diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx
index e99713af88f4..0fef6bb66504 100644
--- a/sw/inc/tblenum.hxx
+++ b/sw/inc/tblenum.hxx
@@ -20,35 +20,35 @@
 #define INCLUDED_SW_INC_TBLENUM_HXX
 
 // For changing table columns/rows widths/heights.
-typedef sal_uInt16 TblChgWidthHeightType;
+typedef sal_uInt16 TableChgWidthHeightType;
 
-namespace nsTblChgWidthHeightType
+namespace nsTableChgWidthHeightType
 {
-    const TblChgWidthHeightType WH_COL_LEFT = 0;
-    const TblChgWidthHeightType WH_COL_RIGHT = 1;
-    const TblChgWidthHeightType WH_ROW_TOP = 2;
-    const TblChgWidthHeightType WH_ROW_BOTTOM = 3;
-    const TblChgWidthHeightType WH_CELL_LEFT = 4;
-    const TblChgWidthHeightType WH_CELL_RIGHT = 5;
-    const TblChgWidthHeightType WH_CELL_TOP = 6;
-    const TblChgWidthHeightType WH_CELL_BOTTOM = 7;
+    const TableChgWidthHeightType WH_COL_LEFT = 0;
+    const TableChgWidthHeightType WH_COL_RIGHT = 1;
+    const TableChgWidthHeightType WH_ROW_TOP = 2;
+    const TableChgWidthHeightType WH_ROW_BOTTOM = 3;
+    const TableChgWidthHeightType WH_CELL_LEFT = 4;
+    const TableChgWidthHeightType WH_CELL_RIGHT = 5;
+    const TableChgWidthHeightType WH_CELL_TOP = 6;
+    const TableChgWidthHeightType WH_CELL_BOTTOM = 7;
 
     // The following can "or"ed into.
-    const TblChgWidthHeightType WH_FLAG_INSDEL  = 0x4000;           // Insert/Del-mode: the Bigger-Flag
+    const TableChgWidthHeightType WH_FLAG_INSDEL  = 0x4000;           // Insert/Del-mode: the Bigger-Flag
                                                                     // tells what happens:
                                                                     // bBigger -> box gets removed.
                                                                     // !bBigger-> box gets inserted.
-    const TblChgWidthHeightType WH_FLAG_BIGGER  = 0x8000;           // Box becomes larger -> else smaller.
+    const TableChgWidthHeightType WH_FLAG_BIGGER  = 0x8000;           // Box becomes larger -> else smaller.
 }
 
-enum TblChgMode
+enum TableChgMode
 {
     TBLFIX_CHGABS,          // Table fixed width, change neighbour.
     TBLFIX_CHGPROP,         // Table fixed width, change all neighbours.
     TBLVAR_CHGABS           // Table variable, change all neighbours.
 };
 
-enum SplitTbl_HeadlineOption
+enum SplitTable_HeadlineOption
 {
     HEADLINE_NONE = 0,          // Leave everything in place.
     HEADLINE_BORDERCOPY,        // Copy border of the previous line.
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 10d237ea62eb..aa1001607b8f 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -38,7 +38,7 @@ class SwLayoutFrm;
 class SwPaM;
 class SwNode;
 class SwTable;
-class SwUndoTblMerge;
+class SwUndoTableMerge;
 class SwCellFrm;
 
 typedef ::std::deque< SwCellFrm* > SwCellFrms;
@@ -56,32 +56,32 @@ class SwSelBoxes : public o3tl::sorted_vector<SwTableBox*, CompareSwSelBoxes> {}
 // Selection gets extended in given direction according to enum-parameter.
 // Boxes are collected via the Layout; works correctly if tables are split.
 // (Cf. MakeSelUnions().)
-typedef sal_uInt16 SwTblSearchType;
-namespace nsSwTblSearchType
+typedef sal_uInt16 SwTableSearchType;
+namespace nsSwTableSearchType
 {
-    const SwTblSearchType TBLSEARCH_NONE = 0x1;       // No extension.
-    const SwTblSearchType TBLSEARCH_ROW  = 0x2;       // Extend to rows.
-    const SwTblSearchType TBLSEARCH_COL  = 0x3;       // Extend to columns.
+    const SwTableSearchType TBLSEARCH_NONE = 0x1;       // No extension.
+    const SwTableSearchType TBLSEARCH_ROW  = 0x2;       // Extend to rows.
+    const SwTableSearchType TBLSEARCH_COL  = 0x3;       // Extend to columns.
 
     // As flag to the other values!
-    const SwTblSearchType TBLSEARCH_PROTECT = 0x8;      // Collect protected boxes too.
-    const SwTblSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not correct collected Union.
+    const SwTableSearchType TBLSEARCH_PROTECT = 0x8;      // Collect protected boxes too.
+    const SwTableSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not correct collected Union.
 }
 
-SW_DLLPUBLIC void GetTblSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
-                const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+SW_DLLPUBLIC void GetTableSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
+                const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 
-void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
-                const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+void GetTableSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
+                const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 
 // As before, but don't start from selection but from Start- EndFrms.
-void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
+void GetTableSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
                 SwSelBoxes& rBoxes, SwCellFrms* pCells,
-                const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+                const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 
 // As before but directly via PaMs.
-void GetTblSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes );
-void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes );
+void GetTableSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes );
+void GetTableSelCrs( const SwTableCursor& rTableCrsr, SwSelBoxes& rBoxes );
 
 // Collect boxes relevant for auto sum.
 bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
@@ -93,16 +93,16 @@ bool HasProtectedCells( const SwSelBoxes& rBoxes );
 bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd);
 
 // Check if cell is part of SSelection.
-// (Became a function, in order to make sure that GetTblSel() and MakeTblCrsr()
+// (Became a function, in order to make sure that GetTableSel() and MakeTableCrsr()
 // have always the same concept of the selection.
-bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell );
+bool IsFrmInTableSel( const SwRect& rUnion, const SwFrm* pCell );
 
 // Determine boxes to be merged.
 // In this process the rectangle gets "adapted" on the base of the layout,
 // i.e. boxes are added if some overlap at the sides.
 // Additionally a new box is created and filled with the relevant content.
 void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
-                  SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo = 0 );
+                  SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo = 0 );
 
 // Check if selected boxes allow for a valid merge.
 sal_uInt16 CheckMergeSel( const SwPaM& rPam );
@@ -112,9 +112,9 @@ bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam );
 
 // Check if Split or InsertCol lead to a box becoming smaller than MINLAY.
 bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv,
-                        const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+                        const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
-                        const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+                        const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 
 // For working on tab selection also for split tables.
 class SwSelUnion
@@ -138,11 +138,11 @@ typedef boost::ptr_vector<SwSelUnion> SwSelUnions;
 
 // Gets the tables involved in a table selection and the union-rectangles of the selections
 // - also for split tables.
-// If a parameter is passed that != nsSwTblSearchType::TBLSEARCH_NONE
+// If a parameter is passed that != nsSwTableSearchType::TBLSEARCH_NONE
 // the selection is extended in the given direction.
 void MakeSelUnions( SwSelUnions&, const SwLayoutFrm *pStart,
                     const SwLayoutFrm *pEnd,
-                    const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+                    const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
 
 // These classes copy the current table selections (rBoxes) into a
 // separate structure while keeping the table structure.
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 89802c3d41f2..f4fb97a3dc6d 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -24,9 +24,9 @@
 class SdrPage;
 class SdrObject;
 class SfxItemSet;
-class SwFrmFmt;
-class SwFrmFmts;
-class SwFmtCntnt;
+class SwFrameFormat;
+class SwFrameFormats;
+class SwFormatContent;
 class SwDoc;
 class Rectangle;
 class _ZSortFly;
@@ -42,58 +42,58 @@ class SW_DLLPUBLIC SwTextBoxHelper
 {
 public:
     /// Maps a draw format to a fly format.
-    typedef std::map<const SwFrmFmt*, const SwFrmFmt*> SavedLink;
+    typedef std::map<const SwFrameFormat*, const SwFrameFormat*> SavedLink;
     /// Maps a draw format to content.
-    typedef std::map<const SwFrmFmt*, SwFmtCntnt> SavedContent;
+    typedef std::map<const SwFrameFormat*, SwFormatContent> SavedContent;
     /// Create a TextBox for a shape.
-    static void create(SwFrmFmt* pShape);
+    static void create(SwFrameFormat* pShape);
     /// Destroy a TextBox for a shape.
-    static void destroy(SwFrmFmt* pShape);
+    static void destroy(SwFrameFormat* pShape);
     /// Get interface of a shape's TextBox, if there is any.
-    static css::uno::Any queryInterface(SwFrmFmt* pShape, const css::uno::Type& rType);
+    static css::uno::Any queryInterface(SwFrameFormat* pShape, const css::uno::Type& rType);
 
     /// Sync property of TextBox with the one of the shape.
-    static void syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, const css::uno::Any& rValue);
+    static void syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, const css::uno::Any& rValue);
     /// Does the same, but works on properties which lack an sw-specific WID / MemberID.
-    static void syncProperty(SwFrmFmt* pShape, const OUString& rPropertyName, const css::uno::Any& rValue);
+    static void syncProperty(SwFrameFormat* pShape, const OUString& rPropertyName, const css::uno::Any& rValue);
     /// Get a property of the underlying TextFrame.
-    static void getProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue);
+    static void getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue);
 
     /// Similar to syncProperty(), but used by the internal API (e.g. for UI purposes).
-    static void syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet);
+    static void syncFlyFrmAttr(SwFrameFormat& rShape, SfxItemSet& rSet);
 
     /// If we have an associated TextFrame, then return that.
-    static SwFrmFmt* findTextBox(const SwFrmFmt* pShape);
-    static SwFrmFmt* findTextBox(css::uno::Reference<css::drawing::XShape> xShape);
+    static SwFrameFormat* findTextBox(const SwFrameFormat* pShape);
+    static SwFrameFormat* findTextBox(css::uno::Reference<css::drawing::XShape> xShape);
     /// Return the textbox rectangle of a draw shape (in twips).
-    static Rectangle getTextRectangle(SwFrmFmt* pShape, bool bAbsolute = true);
+    static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = true);
 
     /// Look up TextFrames in a document, which are in fact TextBoxes.
-    static std::set<const SwFrmFmt*> findTextBoxes(const SwDoc* pDoc);
+    static std::set<const SwFrameFormat*> findTextBoxes(const SwDoc* pDoc);
     /**
      * Look up TextFrames in a document, which are in fact TextBoxes.
      *
-     * If rNode has a matching SwCntntFrm, then only TextBoxes of rNode are
+     * If rNode has a matching SwContentFrm, then only TextBoxes of rNode are
      * returned.
      */
-    static std::set<const SwFrmFmt*> findTextBoxes(const SwNode& rNode);
+    static std::set<const SwFrameFormat*> findTextBoxes(const SwNode& rNode);
     /// Is pObject a textbox of a drawinglayer shape?
     static bool isTextBox(const SdrObject* pObject);
     /// Build a textbox -> shape format map.
-    static std::map<SwFrmFmt*, SwFrmFmt*> findShapes(const SwDoc* pDoc);
+    static std::map<SwFrameFormat*, SwFrameFormat*> findShapes(const SwDoc* pDoc);
     /// Count number of shapes in the document, excluding TextBoxes.
-    static sal_Int32 getCount(SdrPage* pPage, std::set<const SwFrmFmt*>& rTextBoxes);
+    static sal_Int32 getCount(SdrPage* pPage, std::set<const SwFrameFormat*>& rTextBoxes);
     /// Get a shape by index, excluding TextBoxes.
-    static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrmFmt*>& rTextBoxes) throw(css::lang::IndexOutOfBoundsException);
+    static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrameFormat*>& rTextBoxes) throw(css::lang::IndexOutOfBoundsException);
     /// Get the order of the shape, excluding TextBoxes.
-    static sal_Int32 getOrdNum(const SdrObject* pObject, std::set<const SwFrmFmt*>& rTextBoxes);
+    static sal_Int32 getOrdNum(const SdrObject* pObject, std::set<const SwFrameFormat*>& rTextBoxes);
 
     /// Saves the current shape -> textbox links in a map, so they can be restored later.
-    static void saveLinks(const SwFrmFmts& rFormats, std::map<const SwFrmFmt*, const SwFrmFmt*>& rLinks);
+    static void saveLinks(const SwFrameFormats& rFormats, std::map<const SwFrameFormat*, const SwFrameFormat*>& rLinks);
     /// Reset the shape -> textbox link on the shape, and save it to the map, so it can be restored later.
-    static void resetLink(SwFrmFmt* pShape, std::map<const SwFrmFmt*, SwFmtCntnt>& rOldContent);
+    static void resetLink(SwFrameFormat* pShape, std::map<const SwFrameFormat*, SwFormatContent>& rOldContent);
     /// Undo the effect of saveLinks() + individual resetLink() calls.
-    static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrmFmt*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent);
+    static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent);
 };
 
 #endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index 8e67ce5b032f..de112998501d 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -108,7 +108,7 @@ public:
 
 inline const SwTextGridItem &SwAttrSet::GetTextGrid(bool bInP) const
     {   return static_cast<const SwTextGridItem&>(Get( RES_TEXTGRID, bInP )); }
-inline const SwTextGridItem &SwFmt::GetTextGrid(bool bInP) const
+inline const SwTextGridItem &SwFormat::GetTextGrid(bool bInP) const
     {   return static_cast<const SwTextGridItem&>(m_aSet.Get( RES_TEXTGRID, bInP )); }
 
 #endif
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 6e394742b0bb..1b75da2d9472 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star {
 
 class SwTOXType;
 class SwTOXMark;
-class SwTxtTOXMark;
+class SwTextTOXMark;
 class SwDoc;
 
 typedef std::vector<SwTOXMark*> SwTOXMarks;
@@ -54,7 +54,7 @@ class SW_DLLPUBLIC SwTOXMark
     , public SwModify
 {
     friend void _InitCore();
-    friend class SwTxtTOXMark;
+    friend class SwTextTOXMark;
 
     OUString aAltText;    // Text of caption is different.
     OUString aPrimaryKey;
@@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwTOXMark
     OUString aPrimaryKeyReading;
     OUString aSecondaryKeyReading;
 
-    SwTxtTOXMark* pTxtAttr;
+    SwTextTOXMark* pTextAttr;
 
     sal_uInt16  nLevel;
     OUString    m_aBookmarkName;
@@ -137,8 +137,8 @@ public:
 
     inline const SwTOXType*    GetTOXType() const;
 
-    const SwTxtTOXMark* GetTxtTOXMark() const   { return pTxtAttr; }
-          SwTxtTOXMark* GetTxtTOXMark()         { return pTxtAttr; }
+    const SwTextTOXMark* GetTextTOXMark() const   { return pTextAttr; }
+          SwTextTOXMark* GetTextTOXMark()         { return pTextAttr; }
 
     SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const
@@ -332,7 +332,7 @@ public:
     static OUString GetFormLinkStt();
     static OUString GetFormLinkEnd();
     static OUString GetFormEntryNum();
-    static OUString GetFormEntryTxt();
+    static OUString GetFormEntryText();
     static OUString GetFormChapterMark();
     static OUString GetFormText();
     static OUString GetFormAuth();
@@ -585,10 +585,10 @@ inline void SwTOXMark::SetSecondaryKey( const OUString& rKey )
     aSecondaryKey = rKey;
 }
 
-inline void SwTOXMark::SetTextReading( const OUString& rTxt )
+inline void SwTOXMark::SetTextReading( const OUString& rText )
 {
     SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
-    aTextReading = rTxt;
+    aTextReading = rText;
 }
 
 inline void SwTOXMark::SetPrimaryKeyReading( const OUString& rKey )
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index d1588022cc15..b83e34906146 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -45,7 +45,7 @@ public:
 
     void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLcl = rLocale; }
 
-    OUString GetIndexKey( const OUString& rTxt, const OUString& rTxtReading,
+    OUString GetIndexKey( const OUString& rText, const OUString& rTextReading,
                         const ::com::sun::star::lang::Locale& rLocale ) const;
 
     OUString GetFollowingText( bool bMorePages ) const;
@@ -56,9 +56,9 @@ public:
     bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl,
                             const OUString& sSortAlgorithm, long nOptions ) const;
 
-    sal_Int16 CompareIndexEntry( const OUString& rTxt1, const OUString& rTxtReading1,
+    sal_Int16 CompareIndexEntry( const OUString& rText1, const OUString& rTextReading1,
                                  const ::com::sun::star::lang::Locale& rLcl1,
-                                 const OUString& rTxt2, const OUString& rTxtReading2,
+                                 const OUString& rText2, const OUString& rTextReading2,
                                  const ::com::sun::star::lang::Locale& rLcl2 ) const;
 };
 
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index d8ccb02eded6..f1f70b431555 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -38,7 +38,7 @@
 class SfxItemPool;
 class SvXMLAttrContainerItem;
 
-class SwTxtAttr : private boost::noncopyable
+class SwTextAttr : private boost::noncopyable
 {
 private:
     SfxPoolItem * const m_pAttr;
@@ -47,23 +47,23 @@ private:
     bool m_bLockExpandFlag      : 1;
 
     bool m_bDontMoveAttr        : 1;    // refmarks, toxmarks
-    bool m_bCharFmtAttr         : 1;    // charfmt, inet
+    bool m_bCharFormatAttr         : 1;    // charfmt, inet
     bool m_bOverlapAllowedAttr  : 1;    // refmarks, toxmarks
     bool m_bPriorityAttr        : 1;    // attribute has priority (redlining)
     bool m_bDontExpandStart     : 1;    // don't expand start at paragraph start (ruby)
-    bool m_bNesting             : 1;    // SwTxtAttrNesting
+    bool m_bNesting             : 1;    // SwTextAttrNesting
     bool m_bHasDummyChar        : 1;    // without end + meta
     bool m_bFormatIgnoreStart   : 1;    ///< text formatting should ignore start
     bool m_bFormatIgnoreEnd     : 1;    ///< text formatting should ignore end
     bool m_bHasContent          : 1;    // text attribute with content
 
 protected:
-    SwTxtAttr( SfxPoolItem& rAttr, sal_Int32 nStart );
-    virtual ~SwTxtAttr();
+    SwTextAttr( SfxPoolItem& rAttr, sal_Int32 nStart );
+    virtual ~SwTextAttr();
 
     void SetLockExpandFlag( bool bFlag )    { m_bLockExpandFlag = bFlag; }
     void SetDontMoveAttr( bool bFlag )      { m_bDontMoveAttr = bFlag; }
-    void SetCharFmtAttr( bool bFlag )       { m_bCharFmtAttr = bFlag; }
+    void SetCharFormatAttr( bool bFlag )       { m_bCharFormatAttr = bFlag; }
     void SetOverlapAllowedAttr( bool bFlag ){ m_bOverlapAllowedAttr = bFlag; }
     void SetDontExpandStartAttr(bool bFlag) { m_bDontExpandStart = bFlag; }
     void SetNesting(const bool bFlag)       { m_bNesting = bFlag; }
@@ -73,7 +73,7 @@ protected:
 public:
 
     /// destroy instance
-    static void Destroy( SwTxtAttr * pToDestroy, SfxItemPool& rPool );
+    static void Destroy( SwTextAttr * pToDestroy, SfxItemPool& rPool );
 
     /// start position
                   sal_Int32& GetStart()        { return m_nStart; }
@@ -89,7 +89,7 @@ public:
     bool DontExpand() const                 { return m_bDontExpand; }
     bool IsLockExpandFlag() const           { return m_bLockExpandFlag; }
     bool IsDontMoveAttr() const             { return m_bDontMoveAttr; }
-    bool IsCharFmtAttr() const              { return m_bCharFmtAttr; }
+    bool IsCharFormatAttr() const              { return m_bCharFormatAttr; }
     bool IsOverlapAllowedAttr() const       { return m_bOverlapAllowedAttr; }
     bool IsPriorityAttr() const             { return m_bPriorityAttr; }
     void SetPriorityAttr( bool bFlag )      { m_bPriorityAttr = bFlag; }
@@ -106,66 +106,66 @@ public:
     inline       SfxPoolItem& GetAttr();
     inline sal_uInt16 Which() const { return GetAttr().Which(); }
 
-    bool operator==( const SwTxtAttr& ) const;
+    bool operator==( const SwTextAttr& ) const;
 
-    inline const SwFmtCharFmt           &GetCharFmt() const;
-    inline const SwFmtAutoFmt           &GetAutoFmt() const;
-    inline const SwFmtFld               &GetFmtFld() const;
-    inline const SwFmtFtn               &GetFtn() const;
-    inline const SwFmtFlyCnt            &GetFlyCnt() const;
+    inline const SwFormatCharFormat           &GetCharFormat() const;
+    inline const SwFormatAutoFormat           &GetAutoFormat() const;
+    inline const SwFormatField               &GetFormatField() const;
+    inline const SwFormatFootnote               &GetFootnote() const;
+    inline const SwFormatFlyCnt            &GetFlyCnt() const;
     inline const SwTOXMark              &GetTOXMark() const;
-    inline const SwFmtRefMark           &GetRefMark() const;
-    inline const SwFmtINetFmt           &GetINetFmt() const;
-    inline const SwFmtRuby              &GetRuby() const;
-    inline const SwFmtMeta              &GetMeta() const;
+    inline const SwFormatRefMark           &GetRefMark() const;
+    inline const SwFormatINetFormat           &GetINetFormat() const;
+    inline const SwFormatRuby              &GetRuby() const;
+    inline const SwFormatMeta              &GetMeta() const;
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-class SwTxtAttrEnd : public virtual SwTxtAttr
+class SwTextAttrEnd : public virtual SwTextAttr
 {
 protected:
     sal_Int32 m_nEnd;
 
 public:
-    SwTxtAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+    SwTextAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
 
     virtual sal_Int32* GetEnd() SAL_OVERRIDE;
 };
 
 // attribute that must not overlap others
-class SwTxtAttrNesting : public SwTxtAttrEnd
+class SwTextAttrNesting : public SwTextAttrEnd
 {
 protected:
-    SwTxtAttrNesting( SfxPoolItem & i_rAttr,
+    SwTextAttrNesting( SfxPoolItem & i_rAttr,
         const sal_Int32 i_nStart, const sal_Int32 i_nEnd );
-    virtual ~SwTxtAttrNesting();
+    virtual ~SwTextAttrNesting();
 };
 
-inline const sal_Int32* SwTxtAttr::End() const
+inline const sal_Int32* SwTextAttr::End() const
 {
-    return const_cast<SwTxtAttr * >(this)->GetEnd();
+    return const_cast<SwTextAttr * >(this)->GetEnd();
 }
 
-inline const sal_Int32* SwTxtAttr::GetAnyEnd() const
+inline const sal_Int32* SwTextAttr::GetAnyEnd() const
 {
     const sal_Int32* pEnd = End();
     return pEnd ? pEnd : &GetStart();
 }
 
-inline const SfxPoolItem& SwTxtAttr::GetAttr() const
+inline const SfxPoolItem& SwTextAttr::GetAttr() const
 {
     assert( m_pAttr );
     return *m_pAttr;
 }
 
-inline SfxPoolItem& SwTxtAttr::GetAttr()
+inline SfxPoolItem& SwTextAttr::GetAttr()
 {
     return const_cast<SfxPoolItem&>(
-            const_cast<const SwTxtAttr*>(this)->GetAttr());
+            const_cast<const SwTextAttr*>(this)->GetAttr());
 }
 
-inline void SwTxtAttr::SetDontExpand( bool bDontExpand )
+inline void SwTextAttr::SetDontExpand( bool bDontExpand )
 {
     if ( !m_bLockExpandFlag )
     {
@@ -173,68 +173,68 @@ inline void SwTxtAttr::SetDontExpand( bool bDontExpand )
     }
 }
 
-inline const SwFmtCharFmt& SwTxtAttr::GetCharFmt() const
+inline const SwFormatCharFormat& SwTextAttr::GetCharFormat() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_CHARFMT );
-    return static_cast<const SwFmtCharFmt&>(*m_pAttr);
+    return static_cast<const SwFormatCharFormat&>(*m_pAttr);
 }
 
-inline const SwFmtAutoFmt& SwTxtAttr::GetAutoFmt() const
+inline const SwFormatAutoFormat& SwTextAttr::GetAutoFormat() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_AUTOFMT );
-    return static_cast<const SwFmtAutoFmt&>(*m_pAttr);
+    return static_cast<const SwFormatAutoFormat&>(*m_pAttr);
 }
 
-inline const SwFmtFld& SwTxtAttr::GetFmtFld() const
+inline const SwFormatField& SwTextAttr::GetFormatField() const
 {
     assert( m_pAttr
             && ( m_pAttr->Which() == RES_TXTATR_FIELD
                  || m_pAttr->Which() == RES_TXTATR_ANNOTATION
                  || m_pAttr->Which() == RES_TXTATR_INPUTFIELD ));
-    return static_cast<const SwFmtFld&>(*m_pAttr);
+    return static_cast<const SwFormatField&>(*m_pAttr);
 }
 
-inline const SwFmtFtn& SwTxtAttr::GetFtn() const
+inline const SwFormatFootnote& SwTextAttr::GetFootnote() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_FTN );
-    return static_cast<const SwFmtFtn&>(*m_pAttr);
+    return static_cast<const SwFormatFootnote&>(*m_pAttr);
 }
 
-inline const SwFmtFlyCnt& SwTxtAttr::GetFlyCnt() const
+inline const SwFormatFlyCnt& SwTextAttr::GetFlyCnt() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_FLYCNT );
-    return static_cast<const SwFmtFlyCnt&>(*m_pAttr);
+    return static_cast<const SwFormatFlyCnt&>(*m_pAttr);
 }
 
-inline const SwTOXMark& SwTxtAttr::GetTOXMark() const
+inline const SwTOXMark& SwTextAttr::GetTOXMark() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_TOXMARK );
     return static_cast<const SwTOXMark&>(*m_pAttr);
 }
 
-inline const SwFmtRefMark& SwTxtAttr::GetRefMark() const
+inline const SwFormatRefMark& SwTextAttr::GetRefMark() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_REFMARK );
-    return static_cast<const SwFmtRefMark&>(*m_pAttr);
+    return static_cast<const SwFormatRefMark&>(*m_pAttr);
 }
 
-inline const SwFmtINetFmt& SwTxtAttr::GetINetFmt() const
+inline const SwFormatINetFormat& SwTextAttr::GetINetFormat() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_INETFMT );
-    return static_cast<const SwFmtINetFmt&>(*m_pAttr);
+    return static_cast<const SwFormatINetFormat&>(*m_pAttr);
 }
 
-inline const SwFmtRuby& SwTxtAttr::GetRuby() const
+inline const SwFormatRuby& SwTextAttr::GetRuby() const
 {
     assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_CJK_RUBY );
-    return static_cast<const SwFmtRuby&>(*m_pAttr);
+    return static_cast<const SwFormatRuby&>(*m_pAttr);
 }
 
-inline const SwFmtMeta& SwTxtAttr::GetMeta() const
+inline const SwFormatMeta& SwTextAttr::GetMeta() const
 {
     assert( m_pAttr && (m_pAttr->Which() == RES_TXTATR_META ||
         m_pAttr->Which() == RES_TXTATR_METAFIELD) );
-    return static_cast<const SwFmtMeta&>(*m_pAttr);
+    return static_cast<const SwFormatMeta&>(*m_pAttr);
 }
 
 // these should be static_casts but with virtual inheritance it's not possible
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index ced47511f808..6ab4f0c1a06d 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -26,8 +26,8 @@
 #include <swtypes.hxx>
 #include <deque>
 
-class SwTxtNode;
-class SwTxtAttr;
+class SwTextNode;
+class SwTextAttr;
 class SfxPoolItem;
 
 class SwScriptIterator
@@ -48,22 +48,22 @@ public:
     const OUString& GetText() const { return m_rText; }
 };
 
-class SwTxtAttrIterator
+class SwTextAttrIterator
 {
     SwScriptIterator aSIter;
-    std::deque<const SwTxtAttr*> aStack;
-    const SwTxtNode& rTxtNd;
+    std::deque<const SwTextAttr*> aStack;
+    const SwTextNode& rTextNd;
     const SfxPoolItem *pParaItem, *pCurItem;
     size_t nAttrPos;
     sal_Int32 nChgPos;
     sal_uInt16 nWhichId;
     bool bIsUseGetWhichOfScript;
 
-    void AddToStack( const SwTxtAttr& rAttr );
+    void AddToStack( const SwTextAttr& rAttr );
     void SearchNextChg();
 
 public:
-    SwTxtAttrIterator( const SwTxtNode& rTxtNd, sal_uInt16 nWhichId,
+    SwTextAttrIterator( const SwTextNode& rTextNd, sal_uInt16 nWhichId,
                         sal_Int32 nStart = 0, bool bUseGetWhichOfScript = true );
 
     bool Next();
@@ -72,13 +72,13 @@ public:
     sal_Int32 GetChgPos() const        { return nChgPos; }
 };
 
-class SwLanguageIterator : public SwTxtAttrIterator
+class SwLanguageIterator : public SwTextAttrIterator
 {
 public:
-    SwLanguageIterator( const SwTxtNode& rTxtNode, sal_Int32 nStart = 0,
+    SwLanguageIterator( const SwTextNode& rTextNode, sal_Int32 nStart = 0,
                         sal_uInt16 nWhich = RES_CHRATR_LANGUAGE,
                         bool bUseGetWhichOfScript = true )
-        : SwTxtAttrIterator( rTxtNode, nWhich, nStart, bUseGetWhichOfScript )
+        : SwTextAttrIterator( rTextNode, nWhich, nStart, bUseGetWhichOfScript )
     {}
 
     sal_uInt16 GetLanguage() const
diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx
index 5dc18ecd303c..7f7e330b6134 100644
--- a/sw/inc/txtannotationfld.hxx
+++ b/sw/inc/txtannotationfld.hxx
@@ -25,15 +25,15 @@
 
 class SwDoc;
 
-class SwTxtAnnotationFld : public SwTxtFld
+class SwTextAnnotationField : public SwTextField
 {
 public:
-    SwTxtAnnotationFld(
-        SwFmtFld & rAttr,
+    SwTextAnnotationField(
+        SwFormatField & rAttr,
         sal_Int32 const nStart,
         bool const bInClipboard );
 
-    virtual ~SwTxtAnnotationFld();
+    virtual ~SwTextAnnotationField();
 
     ::sw::mark::IMark* GetAnnotationMark(
         SwDoc* pDoc = NULL ) const;
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index a5a4e1d8b282..02e5a1f2b82d 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -22,82 +22,82 @@
 #include <txatbase.hxx>
 #include <calbck.hxx>
 
-class SwTxtNode;
-class SwCharFmt;
+class SwTextNode;
+class SwCharFormat;
 
 namespace sw {
     class MetaFieldManager;
 }
 
-class SwTxtCharFmt : public SwTxtAttrEnd
+class SwTextCharFormat : public SwTextAttrEnd
 {
-    SwTxtNode * m_pTxtNode;
+    SwTextNode * m_pTextNode;
     sal_uInt16 m_nSortNumber;
 
 public:
-    SwTxtCharFmt( SwFmtCharFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
-    virtual ~SwTxtCharFmt( );
+    SwTextCharFormat( SwFormatCharFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+    virtual ~SwTextCharFormat( );
 
-    // Passed from SwFmtCharFmt (no derivation from SwClient!).
+    // Passed from SwFormatCharFormat (no derivation from SwClient!).
     void ModifyNotification( const SfxPoolItem*, const SfxPoolItem* );
     bool GetInfo( SfxPoolItem& rInfo ) const;
 
-    // get and set TxtNode pointer
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    // get and set TextNode pointer
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 
     void SetSortNumber( sal_uInt16 nSortNumber ) { m_nSortNumber = nSortNumber; }
     sal_uInt16 GetSortNumber() const { return m_nSortNumber; }
 };
 
 
-class SwTxtMeta : public SwTxtAttrNesting
+class SwTextMeta : public SwTextAttrNesting
 {
 private:
-    SwTxtMeta( SwFmtMeta & i_rAttr,
+    SwTextMeta( SwFormatMeta & i_rAttr,
         const sal_Int32 i_nStart, const sal_Int32 i_nEnd );
 
 public:
-    static SwTxtMeta * CreateTxtMeta(
+    static SwTextMeta * CreateTextMeta(
         ::sw::MetaFieldManager & i_rTargetDocManager,
-        SwTxtNode *const i_pTargetTxtNode,
-        SwFmtMeta & i_rAttr,
+        SwTextNode *const i_pTargetTextNode,
+        SwFormatMeta & i_rAttr,
         sal_Int32 const i_nStart, sal_Int32 const i_nEnd,
         bool const i_bIsCopy);
 
-    virtual ~SwTxtMeta();
+    virtual ~SwTextMeta();
 
-    void ChgTxtNode(SwTxtNode * const pNode);
+    void ChgTextNode(SwTextNode * const pNode);
 };
 
 
-class SW_DLLPUBLIC SwTxtRuby : public SwTxtAttrNesting, public SwClient
+class SW_DLLPUBLIC SwTextRuby : public SwTextAttrNesting, public SwClient
 {
-    SwTxtNode* m_pTxtNode;
+    SwTextNode* m_pTextNode;
 protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 public:
-    SwTxtRuby( SwFmtRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
-    virtual ~SwTxtRuby();
+    SwTextRuby( SwFormatRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+    virtual ~SwTextRuby();
     TYPEINFO_OVERRIDE();
 
     virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
 
-    SAL_DLLPRIVATE void InitRuby(SwTxtNode & rNode);
+    SAL_DLLPRIVATE void InitRuby(SwTextNode & rNode);
 
-    /// Get and set TxtNode pointer.
-           const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
-    inline const SwTxtNode& GetTxtNode() const;
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    /// Get and set TextNode pointer.
+           const SwTextNode* GetpTextNode() const { return m_pTextNode; }
+    inline const SwTextNode& GetTextNode() const;
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 
-          SwCharFmt* GetCharFmt();
-    const SwCharFmt* GetCharFmt() const
-            { return (const_cast<SwTxtRuby*>(this))->GetCharFmt(); }
+          SwCharFormat* GetCharFormat();
+    const SwCharFormat* GetCharFormat() const
+            { return (const_cast<SwTextRuby*>(this))->GetCharFormat(); }
 };
 
-inline const SwTxtNode& SwTxtRuby::GetTxtNode() const
+inline const SwTextNode& SwTextRuby::GetTextNode() const
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
+    assert( m_pTextNode );
+    return *m_pTextNode;
 }
 
 #endif
diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx
index b3e2b6cfb103..74f78691db0f 100644
--- a/sw/inc/txtflcnt.hxx
+++ b/sw/inc/txtflcnt.hxx
@@ -23,34 +23,34 @@
 
 class SwFlyInCntFrm;
 class SwFrm;
-class SwTxtNode;
+class SwTextNode;
 class SwDoc;
 
 // Attribute for line-bound frames (without end index).
-class SwTxtFlyCnt : public SwTxtAttr
+class SwTextFlyCnt : public SwTextAttr
 {
     SwFlyInCntFrm  *_GetFlyFrm( const SwFrm *pCurrFrm );
 public:
-    SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStart );
+    SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStart );
 
-    // Sets anchor in pFmt and
-    void    SetAnchor( const SwTxtNode *pNode );
+    // Sets anchor in pFormat and
+    void    SetAnchor( const SwTextNode *pNode );
 
     inline        SwFlyInCntFrm  *GetFlyFrm( const SwFrm *pCurrFrm );
     inline const  SwFlyInCntFrm  *GetFlyFrm( const SwFrm *pCurrFrm ) const;
 
     // creates for itself a new FlyFrameFormat.
-    void CopyFlyFmt( SwDoc* pDoc );
+    void CopyFlyFormat( SwDoc* pDoc );
 };
 
-inline SwFlyInCntFrm *SwTxtFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm )
+inline SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm )
 {
     return _GetFlyFrm( pCurrFrm );
 }
 
-inline const SwFlyInCntFrm *SwTxtFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) const
+inline const SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) const
 {
-    return (const_cast<SwTxtFlyCnt*>(this))->_GetFlyFrm( pCurrFrm );
+    return (const_cast<SwTextFlyCnt*>(this))->_GetFlyFrm( pCurrFrm );
 }
 
 #endif
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index fa40f76090d3..d4189ed6f8cd 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -26,70 +26,70 @@
 #include <boost/shared_ptr.hpp>
 
 class SwPaM;
-class SwTxtNode;
+class SwTextNode;
 
-class SwTxtFld : public virtual SwTxtAttr
+class SwTextField : public virtual SwTextAttr
 {
-    mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTxtFld()>
-    SwTxtNode * m_pTxtNode;
+    mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTextField()>
+    SwTextNode * m_pTextNode;
 
 public:
-    SwTxtFld(
-        SwFmtFld & rAttr,
+    SwTextField(
+        SwFormatField & rAttr,
         sal_Int32 const nStart,
         bool const bInClipboard );
 
-    virtual ~SwTxtFld();
+    virtual ~SwTextField();
 
-    void CopyTxtFld( SwTxtFld *pDest ) const;
+    void CopyTextField( SwTextField *pDest ) const;
 
-    void ExpandTxtFld( const bool bForceNotify = false ) const;
+    void ExpandTextField( const bool bForceNotify = false ) const;
 
-    // get and set TxtNode pointer
-    SwTxtNode* GetpTxtNode() const
+    // get and set TextNode pointer
+    SwTextNode* GetpTextNode() const
     {
-        return m_pTxtNode;
+        return m_pTextNode;
     }
-    SwTxtNode& GetTxtNode() const
+    SwTextNode& GetTextNode() const
     {
-        OSL_ENSURE( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" );
-        return *m_pTxtNode;
+        OSL_ENSURE( m_pTextNode, "SwTextField:: where is my TextNode?" );
+        return *m_pTextNode;
     }
-    void ChgTxtNode( SwTxtNode* pNew )
+    void ChgTextNode( SwTextNode* pNew )
     {
-        m_pTxtNode = pNew;
+        m_pTextNode = pNew;
     }
 
-    bool IsFldInDoc() const;
+    bool IsFieldInDoc() const;
 
     // enable notification that field content has changed and needs reformatting
-    virtual void NotifyContentChange( SwFmtFld& rFmtFld );
+    virtual void NotifyContentChange( SwFormatField& rFormatField );
 
     // deletes the given field via removing the corresponding text selection from the document's content
-    static void DeleteTxtFld( const SwTxtFld& rTxtFld );
+    static void DeleteTextField( const SwTextField& rTextField );
 
     // return text selection for the given field
-    static void GetPamForTxtFld( const SwTxtFld& rTxtFld,
-                                 boost::shared_ptr< SwPaM >& rPamForTxtFld );
+    static void GetPamForTextField( const SwTextField& rTextField,
+                                 boost::shared_ptr< SwPaM >& rPamForTextField );
 
 };
 
-class SwTxtInputFld
-    : public SwTxtAttrNesting
-    , public SwTxtFld
+class SwTextInputField
+    : public SwTextAttrNesting
+    , public SwTextField
 {
 public:
-    SwTxtInputFld(
-        SwFmtFld & rAttr,
+    SwTextInputField(
+        SwFormatField & rAttr,
         sal_Int32 const nStart,
         sal_Int32 const nEnd,
         bool const bInClipboard );
 
-    virtual ~SwTxtInputFld();
+    virtual ~SwTextInputField();
 
     void LockNotifyContentChange();
     void UnlockNotifyContentChange();
-    virtual void NotifyContentChange( SwFmtFld& rFmtFld ) SAL_OVERRIDE;
+    virtual void NotifyContentChange( SwFormatField& rFormatField ) SAL_OVERRIDE;
 
     void UpdateTextNodeContent( const OUString& rNewContent );
 
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 94b2712c2f0a..2d34daaabae6 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -24,34 +24,34 @@
 namespace rtl { class OUString; }
 
 class SwNodeIndex;
-class SwTxtNode;
+class SwTextNode;
 class SwNodes;
 class SwDoc;
 class SwFrm;
 
-class SW_DLLPUBLIC SwTxtFtn : public SwTxtAttr
+class SW_DLLPUBLIC SwTextFootnote : public SwTextAttr
 {
     SwNodeIndex * m_pStartNode;
-    SwTxtNode * m_pTxtNode;
+    SwTextNode * m_pTextNode;
     sal_uInt16 m_nSeqNo;
 
 public:
-    SwTxtFtn( SwFmtFtn& rAttr, sal_Int32 nStart );
-    virtual ~SwTxtFtn();
+    SwTextFootnote( SwFormatFootnote& rAttr, sal_Int32 nStart );
+    virtual ~SwTextFootnote();
 
     inline SwNodeIndex *GetStartNode() const { return m_pStartNode; }
     void SetStartNode( const SwNodeIndex *pNode, bool bDelNodes = true );
     void SetNumber( const sal_uInt16 nNumber, const OUString &sNumStr );
-    void CopyFtn(SwTxtFtn & rDest, SwTxtNode & rDestNode) const;
+    void CopyFootnote(SwTextFootnote & rDest, SwTextNode & rDestNode) const;
 
-    // Get and set TxtNode pointer.
-    inline const SwTxtNode& GetTxtNode() const;
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    // Get and set TextNode pointer.
+    inline const SwTextNode& GetTextNode() const;
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 
     // Create a new empty TextSection for this footnote.
     void MakeNewTextSection( SwNodes& rNodes );
 
-    // Delete the FtnFrame from page.
+    // Delete the FootnoteFrame from page.
     void DelFrms( const SwFrm* );
 
     // Check conditional paragraph styles.
@@ -65,10 +65,10 @@ public:
     static void SetUniqueSeqRefNo( SwDoc& rDoc );
 };
 
-inline const SwTxtNode& SwTxtFtn::GetTxtNode() const
+inline const SwTextNode& SwTextFootnote::GetTextNode() const
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
+    assert( m_pTextNode );
+    return *m_pTextNode;
 }
 
 #endif
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index 8e70df02e96c..9a08f70faa67 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -23,12 +23,12 @@
 #include <txtatr.hxx>
 #include <calbck.hxx>
 
-class SwTxtNode;
-class SwCharFmt;
+class SwTextNode;
+class SwCharFormat;
 
-class SW_DLLPUBLIC SwTxtINetFmt : public SwTxtAttrNesting, public SwClient
+class SW_DLLPUBLIC SwTextINetFormat : public SwTextAttrNesting, public SwClient
 {
-    SwTxtNode * m_pTxtNode;
+    SwTextNode * m_pTextNode;
     bool m_bVisited         : 1; // visited link?
     bool m_bVisitedValid    : 1; // is m_bVisited valid?
 
@@ -36,23 +36,23 @@ protected:
 virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 
 public:
-    SwTxtINetFmt( SwFmtINetFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
-    virtual ~SwTxtINetFmt();
+    SwTextINetFormat( SwFormatINetFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+    virtual ~SwTextINetFormat();
     TYPEINFO_OVERRIDE();
 
     virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
 
-    SAL_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode);
+    SAL_DLLPRIVATE void InitINetFormat(SwTextNode & rNode);
 
-    // get and set TxtNode pointer
-    const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
-    inline const SwTxtNode& GetTxtNode() const;
-    inline SwTxtNode& GetTxtNode();
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    // get and set TextNode pointer
+    const SwTextNode* GetpTextNode() const { return m_pTextNode; }
+    inline const SwTextNode& GetTextNode() const;
+    inline SwTextNode& GetTextNode();
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 
-          SwCharFmt* GetCharFmt();
-    const SwCharFmt* GetCharFmt() const
-            { return const_cast<SwTxtINetFmt*>(this)->GetCharFmt(); }
+          SwCharFormat* GetCharFormat();
+    const SwCharFormat* GetCharFormat() const
+            { return const_cast<SwTextINetFormat*>(this)->GetCharFormat(); }
 
     bool IsVisited() const { return m_bVisited; }
     void SetVisited( bool bNew ) { m_bVisited = bNew; }
@@ -63,15 +63,15 @@ public:
     bool IsProtect() const;
 };
 
-inline const SwTxtNode& SwTxtINetFmt::GetTxtNode() const
+inline const SwTextNode& SwTextINetFormat::GetTextNode() const
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
+    assert( m_pTextNode );
+    return *m_pTextNode;
 }
 
-inline SwTxtNode& SwTxtINetFmt::GetTxtNode()
+inline SwTextNode& SwTextINetFormat::GetTextNode()
 {
-    return const_cast<SwTxtNode&>( const_cast<SwTxtINetFmt const*>(this)->GetTxtNode() );
+    return const_cast<SwTextNode&>( const_cast<SwTextINetFormat const*>(this)->GetTextNode() );
 }
 
 #endif
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index eee21e2f9f32..ab72f76d3cf0 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.hxx
@@ -21,29 +21,29 @@
 
 #include <txatbase.hxx>
 
-class SwTxtNode;
+class SwTextNode;
 
 // Attribute for content-/position references in text.
-class SwTxtRefMark : public SwTxtAttrEnd
+class SwTextRefMark : public SwTextAttrEnd
 {
-    SwTxtNode * m_pTxtNode;
+    SwTextNode * m_pTextNode;
     sal_Int32 * m_pEnd; // end is optional (point reference)
 
 public:
-    SwTxtRefMark( SwFmtRefMark& rAttr,
+    SwTextRefMark( SwFormatRefMark& rAttr,
             sal_Int32 const nStart, sal_Int32 const*const pEnd = 0);
 
-    virtual sal_Int32* GetEnd() SAL_OVERRIDE;       // SwTxtAttr
+    virtual sal_Int32* GetEnd() SAL_OVERRIDE;       // SwTextAttr
 
-    // get and set TxtNode pointer
-    inline const SwTxtNode& GetTxtNode() const;
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    // get and set TextNode pointer
+    inline const SwTextNode& GetTextNode() const;
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 };
 
-inline const SwTxtNode& SwTxtRefMark::GetTxtNode() const
+inline const SwTextNode& SwTextRefMark::GetTextNode() const
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
+    assert( m_pTextNode );
+    return *m_pTextNode;
 }
 
 #endif
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index 6436b859f342..f935254fc682 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -21,34 +21,34 @@
 
 #include <txatbase.hxx>
 
-class SwTxtNode;
+class SwTextNode;
 class SwDoc;
 
 // Attribute for indices/tables of contents.
-class SwTxtTOXMark : public SwTxtAttrEnd
+class SwTextTOXMark : public SwTextAttrEnd
 {
-    SwTxtNode * m_pTxtNode;
+    SwTextNode * m_pTextNode;
     sal_Int32 * m_pEnd;   // 0 if SwTOXMark without AlternativeText
 
 public:
-    SwTxtTOXMark( SwTOXMark& rAttr,
+    SwTextTOXMark( SwTOXMark& rAttr,
             sal_Int32 const nStart, sal_Int32 const*const pEnd = 0);
-    virtual ~SwTxtTOXMark();
+    virtual ~SwTextTOXMark();
 
-    virtual sal_Int32 *GetEnd() SAL_OVERRIDE;     // SwTxtAttr
+    virtual sal_Int32 *GetEnd() SAL_OVERRIDE;     // SwTextAttr
 
     void CopyTOXMark( SwDoc* pDestDoc );
 
-    // get and set TxtNode pointer
-    inline const SwTxtNode* GetpTxtNd() const { return m_pTxtNode; }
-    inline const SwTxtNode& GetTxtNode() const;
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+    // get and set TextNode pointer
+    inline const SwTextNode* GetpTextNd() const { return m_pTextNode; }
+    inline const SwTextNode& GetTextNode() const;
+    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
 };
 
-inline const SwTxtNode& SwTxtTOXMark::GetTxtNode() const
+inline const SwTextNode& SwTextTOXMark::GetTextNode() const
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
+    assert( m_pTextNode );
+    return *m_pTextNode;
 }
 
 #endif
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 9ec5e4dc7d88..69703760d8a5 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -34,8 +34,8 @@ class SwIndex;
 class SwPaM;
 struct SwPosition;
 class SwDoc;
-class SwTxtFmtColl;
-class SwFrmFmt;
+class SwTextFormatColl;
+class SwFrameFormat;
 class SwNodeIndex;
 class SwNodeRange;
 class SwRedlineData;
@@ -116,30 +116,30 @@ public:
     // Save and set Redline data.
     static bool FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData,
                               bool bDelRange = true, bool bCopyNext = true );
-    static bool FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& );
+    static bool FillSaveDataForFormat( const SwPaM& , SwRedlineSaveDatas& );
     static void SetSaveData( SwDoc& rDoc, SwRedlineSaveDatas& rSData );
     static bool HasHiddenRedlines( const SwRedlineSaveDatas& rSData );
 };
 
-typedef sal_uInt16 DelCntntType;
-namespace nsDelCntntType
+typedef sal_uInt16 DelContentType;
+namespace nsDelContentType
 {
-    const DelCntntType DELCNT_FTN = 0x01;
-    const DelCntntType DELCNT_FLY = 0x02;
-    const DelCntntType DELCNT_TOC = 0x04;
-    const DelCntntType DELCNT_BKM = 0x08;
-    const DelCntntType DELCNT_ALL = 0x0F;
-    const DelCntntType DELCNT_CHKNOCNTNT = 0x80;
+    const DelContentType DELCNT_FTN = 0x01;
+    const DelContentType DELCNT_FLY = 0x02;
+    const DelContentType DELCNT_TOC = 0x04;
+    const DelContentType DELCNT_BKM = 0x08;
+    const DelContentType DELCNT_ALL = 0x0F;
+    const DelContentType DELCNT_CHKNOCNTNT = 0x80;
 }
 
-/// will DelCntntIndex destroy a frame anchored at character at rAnchorPos?
+/// will DelContentIndex destroy a frame anchored at character at rAnchorPos?
 bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos,
         SwPosition const & rStart, SwPosition const & rEnd, const SwDoc* doc,
-        DelCntntType const nDelCntntType = nsDelCntntType::DELCNT_ALL);
+        DelContentType const nDelContentType = nsDelContentType::DELCNT_ALL);
 
 // This class has to be inherited into an Undo-object if it saves content
 // for Redo/Undo...
-class SwUndoSaveCntnt
+class SwUndoSaveContent
 {
 protected:
 
@@ -166,16 +166,16 @@ protected:
 
     // Before moving stuff into UndoNodes-Array care has to be taken that
     // the content-bearing attributes are removed from the nodes-array.
-    void DelCntntIndex( const SwPosition& pMark, const SwPosition& pPoint,
-                        DelCntntType nDelCntntType = nsDelCntntType::DELCNT_ALL );
+    void DelContentIndex( const SwPosition& pMark, const SwPosition& pPoint,
+                        DelContentType nDelContentType = nsDelContentType::DELCNT_ALL );
 
 public:
-    SwUndoSaveCntnt();
-    ~SwUndoSaveCntnt();
+    SwUndoSaveContent();
+    ~SwUndoSaveContent();
 };
 
 // Save a complete section in nodes-array.
-class SwUndoSaveSection : private SwUndoSaveCntnt
+class SwUndoSaveSection : private SwUndoSaveContent
 {
     SwNodeIndex *pMvStt;
     SwRedlineSaveDatas* pRedlSaveData;
@@ -205,27 +205,27 @@ class SwUndRng
 {
 public:
     sal_uLong nSttNode, nEndNode;
-    sal_Int32 nSttCntnt, nEndCntnt;
+    sal_Int32 nSttContent, nEndContent;
 
     SwUndRng();
     SwUndRng( const SwPaM& );
 
     void SetValues( const SwPaM& rPam );
-    void SetPaM( SwPaM&, bool bCorrToCntnt = false ) const;
+    void SetPaM( SwPaM&, bool bCorrToContent = false ) const;
     SwPaM & AddUndoRedoPaM(
-        ::sw::UndoRedoContext &, bool const bCorrToCntnt = false) const;
+        ::sw::UndoRedoContext &, bool const bCorrToContent = false) const;
 };
 
-class SwUndoInsLayFmt;
+class SwUndoInsLayFormat;
 
 // base class for insertion of Document, Glossaries and Copy
-class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveCntnt
+class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveContent
 {
-    SwTxtFmtColl *pTxtFmtColl, *pLastNdColl;
-    std::vector<SwFrmFmt*>* pFrmFmts;
-    ::std::vector< ::boost::shared_ptr<SwUndoInsLayFmt> > m_FlyUndos;
+    SwTextFormatColl *pTextFormatColl, *pLastNdColl;
+    std::vector<SwFrameFormat*>* pFrameFormats;
+    ::std::vector< ::boost::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
     SwRedlineData* pRedlData;
-    bool bSttWasTxtNd;
+    bool bSttWasTextNd;
 protected:
     sal_uLong nNdDiff;
     /// start of Content in UndoNodes for Redo
@@ -242,7 +242,7 @@ public:
 
     // Set destination range after reading.
     void SetInsertRange( const SwPaM&, bool bScanFlys = true,
-                         bool bSttWasTxtNd = true );
+                         bool bSttWasTextNd = true );
 };
 
 class SwUndoInsDoc : public SwUndoInserts
@@ -260,16 +260,16 @@ public:
 class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection
 {
 protected:
-    SwFrmFmt* pFrmFmt;          // The saved FlyFormat.
+    SwFrameFormat* pFrameFormat;          // The saved FlyFormat.
     sal_uLong nNdPgPos;
     sal_Int32 nCntPos;         // Page at/in paragraph.
     sal_uInt16 nRndId;
-    bool bDelFmt;           // Delete saved format.
+    bool bDelFormat;           // Delete saved format.
 
     void InsFly(::sw::UndoRedoContext & rContext, bool bShowSel = true);
     void DelFly( SwDoc* );
 
-    SwUndoFlyBase( SwFrmFmt* pFormat, SwUndoId nUndoId );
+    SwUndoFlyBase( SwFrameFormat* pFormat, SwUndoId nUndoId );
 
     SwNodeIndex* GetMvSttIdx() const { return SwUndoSaveSection::GetMvSttIdx(); }
     sal_uLong GetMvNodeCnt() const { return SwUndoSaveSection::GetMvNodeCnt(); }
@@ -279,14 +279,14 @@ public:
 
 };
 
-class SwUndoInsLayFmt : public SwUndoFlyBase
+class SwUndoInsLayFormat : public SwUndoFlyBase
 {
     sal_uLong mnCrsrSaveIndexPara;           // Cursor position
     sal_Int32 mnCrsrSaveIndexPos;            // for undo
 public:
-    SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx );
+    SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx );
 
-    virtual ~SwUndoInsLayFmt();
+    virtual ~SwUndoInsLayFormat();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -296,11 +296,11 @@ public:
 
 };
 
-class SwUndoDelLayFmt : public SwUndoFlyBase
+class SwUndoDelLayFormat : public SwUndoFlyBase
 {
     bool bShowSelFrm;
 public:
-    SwUndoDelLayFmt( SwFrmFmt* pFormat );
+    SwUndoDelLayFormat( SwFrameFormat* pFormat );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 8f135031bb52..ebee75cf4092 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -58,7 +58,7 @@ class SwTableBox;
 class SwUnoCrsr;
 struct SwRangeDescriptor;
 class SwSelBoxes;
-class SwFrmFmt;
+class SwFrameFormat;
 
 bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const OUString &rCellRangeName );
 
@@ -190,7 +190,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    SwFrmFmt*       GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat*       GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 
     void        AddDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence );
     void        RemoveDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence );
@@ -265,7 +265,7 @@ class SwChartDataSequence :
     ::com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataProvider >    xDataProvider;
     SwChartDataProvider *                   pDataProvider;
 
-    SwUnoCrsr*                  pTblCrsr;   // cursor spanned over cells to use
+    SwUnoCrsr*                  pTableCrsr;   // cursor spanned over cells to use
     SwDepend                    aCursorDepend; //the cursor is removed after the doc has been removed
 
     const SfxItemPropertySet*   _pPropSet;
@@ -281,7 +281,7 @@ protected:
 
 public:
     SwChartDataSequence( SwChartDataProvider &rProvider,
-                         SwFrmFmt   &rTblFmt,
+                         SwFrameFormat   &rTableFormat,
                          SwUnoCrsr  *pTableCursor );
     virtual ~SwChartDataSequence();
 
@@ -345,7 +345,7 @@ public:
     virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    SwFrmFmt*   GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat*   GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
     bool    DeleteBox( const SwTableBox &rBox );
 
     void        FillRangeDesc( SwRangeDescriptor &rRangeDesc ) const;
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 4426e3582028..ff27c0ad0586 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -31,7 +31,7 @@
 #include "swdllapi.h"
 
 class SwDoc;
-class SwFrmFmt;
+class SwFrameFormat;
 namespace com{namespace sun {namespace star {namespace text
 {
     class XTextTable;
@@ -39,12 +39,12 @@ namespace com{namespace sun {namespace star {namespace text
     class XFootnote;
 }}}}
 class SwXFrame;
-class SwFrmFmt;
-class SwFmtFtn;
+class SwFrameFormat;
+class SwFormatFootnote;
 class XBookmark;
 class SwXReferenceMark;
-class SwSectionFmt;
-class SwFmtRefMark;
+class SwSectionFormat;
+class SwFormatRefMark;
 class SwXReferenceMark;
 class SwXBookmark;
 struct SvEventDescription;
@@ -290,7 +290,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-    static css::uno::Reference<css::text::XTextTable> GetObject(SwFrmFmt& rFmt);
+    static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat);
 };
 
 typedef
@@ -404,7 +404,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFormat& rFormat );
 };
 
 class SwXBookmarks : public SwCollectionBaseClass,
@@ -487,7 +487,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFormatFootnote& rFormat );
 };
 
 class SwXReferenceMarks : public SwCollectionBaseClass,
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 66aa05ab7c5f..c32905025539 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -35,7 +35,7 @@ public:
 
 protected:
 
-    virtual const SwCntntFrm* DoSetBidiLevelLeftRight(
+    virtual const SwContentFrm* DoSetBidiLevelLeftRight(
         bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr) SAL_OVERRIDE;
     virtual void DoSetBidiLevelUpDown() SAL_OVERRIDE;
 
@@ -74,7 +74,7 @@ class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor
     // The selection has the same order as the table boxes, i.e.
     // if something is deleted from the one array at a certain position
     // it has also to be deleted from the other!
-    SwCursor m_aTblSel;
+    SwCursor m_aTableSel;
 
     using SwTableCursor::MakeBoxSels;
 
@@ -93,8 +93,8 @@ public:
 
     void MakeBoxSels();
 
-          SwCursor& GetSelRing()            { return m_aTblSel; }
-    const SwCursor& GetSelRing() const      { return m_aTblSel; }
+          SwCursor& GetSelRing()            { return m_aTableSel; }
+    const SwCursor& GetSelRing() const      { return m_aTableSel; }
 };
 
 #endif
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 4d14357831b0..a7bd39e0ab40 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -33,11 +33,11 @@ class SfxItemSet;
 class SfxItemPropertySet;
 struct SfxItemPropertySimpleEntry;
 class SdrObject;
-class SwTxtNode;
+class SwTextNode;
 class SwCursor;
 class SwUnoCrsr;
 class SwUnoTableCrsr;
-class SwFmtColl;
+class SwFormatColl;
 struct SwSortOptions;
 class SwDoc;
 
@@ -76,22 +76,22 @@ namespace SwUnoCursorHelper
     };
 
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
-        GetNestedTextContent(SwTxtNode & rTextNode, sal_Int32 const nIndex,
+        GetNestedTextContent(SwTextNode & rTextNode, sal_Int32 const nIndex,
             bool const bParent);
 
     bool                    getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
                                         , SwPaM& rPam
                                         , com::sun::star::uno::Any *pAny
                                         , com::sun::star::beans::PropertyState& eState
-                                        , const SwTxtNode* pNode = 0 );
+                                        , const SwTextNode* pNode = 0 );
 
     void                        GetCurPageStyle(SwPaM& rPaM, OUString &rString);
 
     inline bool             IsStartOfPara(SwPaM& rUnoCrsr)
                                         { return rUnoCrsr.GetPoint()->nContent == 0;}
     inline bool             IsEndOfPara(SwPaM& rUnoCrsr)
-                                        { return rUnoCrsr.GetCntntNode() &&
-                                            rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetCntntNode()->Len();}
+                                        { return rUnoCrsr.GetContentNode() &&
+                                            rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetContentNode()->Len();}
 
     void                        resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam);
     void                        InsertFile(SwUnoCrsr* pUnoCrsr,
@@ -135,10 +135,10 @@ namespace SwUnoCursorHelper
                      const SetAttrMode nAttrMode,
                      const bool bTableMode = false);
     void GetCrsrAttr(SwPaM & rPam, SfxItemSet & rSet,
-                     const bool bOnlyTxtAttr = false,
-                     const bool bGetFromChrFmt = true);
+                     const bool bOnlyTextAttr = false,
+                     const bool bGetFromChrFormat = true);
     void GetTextFromPam(SwPaM & rPam, OUString & rBuffer);
-    SwFmtColl * GetCurTxtFmtColl(SwPaM & rPam, const bool bConditional);
+    SwFormatColl * GetCurTextFormatColl(SwPaM & rPam, const bool bConditional);
 
     void SelectPam(SwPaM & rPam, const bool bExpand);
     void SetString(SwCursor & rCursor, const OUString & rString);
@@ -216,7 +216,7 @@ namespace SwUnoCursorHelper
     bool SetPageDesc(
             const ::com::sun::star::uno::Any& rValue,
             SwDoc & rDoc, SfxItemSet & rSet);
-    void SetTxtFmtColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM)
+    void SetTextFormatColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM)
         throw (::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException);
     bool SetCursorPropertyValue(
             SfxItemPropertySimpleEntry const& rEntry,
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 68e4d40e2910..ce894a9687b7 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -119,7 +119,7 @@ public:
     void    InvalidateSwDoc(); // {pDoc = 0;}
     SwDoc* GetDoc();
     /// Same as getByIndex(nIndex), except that it also takes a set of formats to ignore, so the method itself doesn't have to generate such a list.
-    css::uno::Any getByIndex(sal_Int32 nIndex, std::set<const SwFrmFmt*>* pTextBoxes) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
+    css::uno::Any getByIndex(sal_Int32 nIndex, std::set<const SwFrameFormat*>* pTextBoxes) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
 };
 
 class SwShapeDescriptor_Impl;
@@ -273,11 +273,11 @@ public:
     virtual OUString SAL_CALL getShapeType(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     SwShapeDescriptor_Impl*     GetDescImpl() {return pImpl;}
-    SwFrmFmt*               GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat*               GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >                 GetAggregationInterface() {return xShapeAgg;}
 
     // helper
-    static void AddExistingShapeToFmt( SdrObject& _rObj );
+    static void AddExistingShapeToFormat( SdrObject& _rObj );
 };
 
 class SwXGroupShape :
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index 1d1fbb1701a2..1b1cab829262 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -43,7 +43,7 @@ protected:
 public:
     SwXTextFieldMasters(SwDoc* pDoc);
 
-    static bool getInstanceName(const SwFieldType& rFldType, OUString& rName);
+    static bool getInstanceName(const SwFieldType& rFieldType, OUString& rName);
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 281098940a4f..730a93954c97 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -39,8 +39,8 @@
 
 class SdrObject;
 class SwDoc;
-class SwFmt;
-class SwFlyFrmFmt;
+class SwFormat;
+class SwFlyFrameFormat;
 
 class BaseFrameProperties_Impl;
 class SwXFrame : public cppu::WeakImplHelper
@@ -80,12 +80,12 @@ protected:
     SwXFrame(FlyCntType eSet,
                 const SfxItemPropertySet*    pPropSet,
                 SwDoc *pDoc ); //Descriptor-If
-    SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet,
+    SwXFrame(SwFrameFormat& rFrameFormat, FlyCntType eSet,
                 const SfxItemPropertySet*    pPropSet);
 
     template<class Interface, class Impl>
     static css::uno::Reference<Interface>
-    CreateXFrame(SwDoc & rDoc, SwFrmFmt *const pFrmFmt);
+    CreateXFrame(SwDoc & rDoc, SwFrameFormat *const pFrameFormat);
 
 public:
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -139,13 +139,13 @@ public:
     void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
     void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
 
-    const SwFrmFmt* GetFrmFmt() const
+    const SwFrameFormat* GetFrameFormat() const
     {
-        return PTR_CAST ( SwFrmFmt, GetRegisteredIn() );
+        return PTR_CAST ( SwFrameFormat, GetRegisteredIn() );
     }
-    SwFrmFmt* GetFrmFmt()
+    SwFrameFormat* GetFrameFormat()
     {
-        return PTR_CAST ( SwFrmFmt, GetRegisteredIn() );
+        return PTR_CAST ( SwFrameFormat, GetRegisteredIn() );
     }
     FlyCntType      GetFlyCntType()const {return eType;}
 
@@ -153,7 +153,7 @@ public:
     void            ResetDescriptor();
     //copy text from a given source PaM
     void            SetSelection(SwPaM& rCopySource);
-    static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrmFmt &rFmt);
+    static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrameFormat &rFormat);
 };
 
 typedef cppu::WeakImplHelper
@@ -181,11 +181,11 @@ protected:
     virtual ~SwXTextFrame();
 
     SwXTextFrame(SwDoc *pDoc);
-    SwXTextFrame(SwFrmFmt& rFmt);
+    SwXTextFrame(SwFrameFormat& rFormat);
 
 public:
     static SW_DLLPUBLIC css::uno::Reference<css::text::XTextFrame>
-            CreateXTextFrame(SwDoc & rDoc, SwFrmFmt * pFrmFmt);
+            CreateXTextFrame(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
     // FIXME: EVIL HACK:  make available for SwXFrame::attachToRange
     void SetDoc(SwDoc *const pDoc) { SwXText::SetDoc(pDoc); };
@@ -254,12 +254,12 @@ protected:
     virtual ~SwXTextGraphicObject();
 
     SwXTextGraphicObject( SwDoc *pDoc );
-    SwXTextGraphicObject(SwFrmFmt& rFmt);
+    SwXTextGraphicObject(SwFrameFormat& rFormat);
 
 public:
 
     static css::uno::Reference<css::text::XTextContent>
-        CreateXTextGraphicObject(SwDoc & rDoc, SwFrmFmt * pFrmFmt);
+        CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL acquire(  ) throw() SAL_OVERRIDE;
@@ -307,12 +307,12 @@ protected:
     virtual ~SwXTextEmbeddedObject();
 
     SwXTextEmbeddedObject( SwDoc *pDoc );
-    SwXTextEmbeddedObject(SwFrmFmt& rFmt);
+    SwXTextEmbeddedObject(SwFrameFormat& rFormat);
 
 public:
 
     static css::uno::Reference<css::text::XTextContent>
-        CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrmFmt * pFrmFmt);
+        CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL acquire(  ) throw() SAL_OVERRIDE;
@@ -357,9 +357,9 @@ class SwXOLEListener : public cppu::WeakImplHelper
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLEModel;
 
-    SwFmt*       GetFmt() const    {  return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); }
+    SwFormat*       GetFormat() const    {  return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); }
 public:
-    SwXOLEListener(SwFmt& rOLEFmt, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE);
+    SwXOLEListener(SwFormat& rOLEFormat, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE);
     virtual ~SwXOLEListener();
     TYPEINFO_OVERRIDE();
 
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index bc0794409c74..db8ba9335565 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -90,7 +90,7 @@
 #define MID_COLUMNS                             0
 #define MID_COLUMN_SEPARATOR_LINE               1
 
-//SwFmtFtnAtTxtEnd
+//SwFormatFootnoteAtTextEnd
 #define MID_COLLECT                             0
 #define MID_RESTART_NUM                         1
 #define MID_NUM_START_AT                        2
@@ -109,7 +109,7 @@
 #define MID_LINE_FOOTNOTE_DIST                  6
 #define MID_FTN_LINE_STYLE                      7
 
-//SwFmtRuby
+//SwFormatRuby
 #define MID_RUBY_TEXT           0
 #define MID_RUBY_ADJUST         1
 #define MID_RUBY_CHARSTYLE      2
@@ -143,7 +143,7 @@
 #define MID_ENV_SHIFT_RIGHT     12
 #define MID_ENV_SHIFT_DOWN      13
 
-// SwFmtWrapInfluenceOnObjPos
+// SwFormatWrapInfluenceOnObjPos
 #define MID_WRAP_INFLUENCE      0
 
 #endif
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index 8c048865fcf5..5bca49d1912b 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -43,7 +43,7 @@ struct SwPosition;
 class SwPaM;
 class SwUnoCrsr;
 class SwStartNode;
-class SwTxtNode;
+class SwTextNode;
 class SwTable;
 class SwXText;
 
@@ -74,7 +74,7 @@ private:
 
     SwXParagraph(::com::sun::star::uno::Reference<
                     ::com::sun::star::text::XText > const & xParent,
-            SwTxtNode & rTxtNode,
+            SwTextNode & rTextNode,
             const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1);
 
     /// descriptor
@@ -84,17 +84,17 @@ public:
 
     static ::com::sun::star::uno::Reference<
             ::com::sun::star::text::XTextContent>
-        CreateXParagraph(SwDoc & rDoc, SwTxtNode * pTxtNode,
+        CreateXParagraph(SwDoc & rDoc, SwTextNode * pTextNode,
             ::com::sun::star::uno::Reference< ::com::sun::star::text::XText>
                 const& xParentText = 0,
             const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1);
 
-    const SwTxtNode * GetTxtNode() const;
+    const SwTextNode * GetTextNode() const;
     bool            IsDescriptor() const;
     /// make rPaM select the paragraph
     bool SelectPaM(SwPaM & rPaM);
     /// for SwXText
-    void attachToText(SwXText & rParent, SwTxtNode & rTxtNode);
+    void attachToText(SwXText & rParent, SwTextNode & rTextNode);
 
     // MetadatableMixin
     virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE;
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 2f97eb84bc1d..94935ad8a2ac 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -34,10 +34,10 @@
 #include <svl/itemprop.hxx>
 
 class SwDoc;
-class SwFmtCol;
+class SwFormatCol;
 class SwDocShell;
 class SwNumRule;
-class SwNumFmt;
+class SwNumFormat;
 
 class SwXFootnoteProperties : public cppu::WeakAggImplHelper2
 <
@@ -206,11 +206,11 @@ public:
     void    Invalidate()    {pDocShell = 0;}
     OUString                GetCreatedNumRuleName() const {return m_sCreatedNumRuleName;}
 
-    static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFmt(
-            const SwNumFmt& rFmt, OUString const& rCharFormatName,
+    static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFormat(
+            const SwNumFormat& rFormat, OUString const& rCharFormatName,
             OUString const* pHeadingStyleName);
-    static void SetPropertiesToNumFmt(
-            SwNumFmt & aFmt,
+    static void SetPropertiesToNumFormat(
+            SwNumFormat & aFormat,
             OUString & rCharStyleName,
             OUString *const pBulletFontName,
             OUString *const pHeadingStyleName,
@@ -264,7 +264,7 @@ protected:
     virtual ~SwXTextColumns();
 public:
     SwXTextColumns(sal_uInt16 nColCount);
-    SwXTextColumns(const SwFmtCol& rFmtCol);
+    SwXTextColumns(const SwFormatCol& rFormatCol);
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index ffe6985b43ec..11b30a346ca7 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -48,9 +48,9 @@ class SwTable;
 class SwTableBox;
 class SwTableLine;
 class SwTableCursor;
-class SwTableBoxFmt;
+class SwTableBoxFormat;
 class SwChartDataProvider;
-class SwFrmFmt;
+class SwFrameFormat;
 
 typedef
 cppu::WeakImplHelper
@@ -65,8 +65,8 @@ class SwXCell SAL_FINAL : public SwXCellBaseClass,
     public SwXText,
     public SwClient
 {
-    friend void   sw_setString( SwXCell &rCell, const OUString &rTxt,
-                                bool bKeepNumberFmt );
+    friend void   sw_setString( SwXCell &rCell, const OUString &rText,
+                                bool bKeepNumberFormat );
     friend double sw_getValue( SwXCell &rCell );
     friend void   sw_setValue( SwXCell &rCell, double nVal );
 
@@ -95,8 +95,8 @@ protected:
     virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE;
 
 public:
-    SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, size_t nPos = NOTFOUND);
-    SwXCell(SwFrmFmt* pTblFmt, const SwStartNode& rStartNode); // XML import interface
+    SwXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, size_t nPos = NOTFOUND);
+    SwXCell(SwFrameFormat* pTableFormat, const SwStartNode& rStartNode); // XML import interface
 
     TYPEINFO_OVERRIDE();
 
@@ -147,11 +147,11 @@ public:
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    SwTableBox*   GetTblBox()const {return pBox;}
-    static SwXCell*     CreateXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, SwTable *pTbl = 0 );
+    SwTableBox*   GetTableBox()const {return pBox;}
+    static SwXCell*     CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable = 0 );
     SwTableBox*     FindBox(SwTable* pTable, SwTableBox* pBox);
 
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 };
 
 class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
@@ -164,8 +164,8 @@ class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
     const SfxItemPropertySet*   m_pPropSet;
     SwTableLine*            pLine;
 
-    SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
-    const SwFrmFmt* GetFrmFmt() const { return const_cast<SwXTextTableRow*>(this)->GetFrmFmt(); }
+    SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+    const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTextTableRow*>(this)->GetFrameFormat(); }
 protected:
     virtual ~SwXTextTableRow();
     //SwClient
@@ -173,7 +173,7 @@ protected:
     virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE;
 
 public:
-    SwXTextTableRow(SwFrmFmt* pFmt, SwTableLine* pLine);
+    SwXTextTableRow(SwFrameFormat* pFormat, SwTableLine* pLine);
 
     TYPEINFO_OVERRIDE();
 
@@ -197,7 +197,7 @@ public:
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-    const SwTableLine*  GetTblRow() const {return pLine;}
+    const SwTableLine*  GetTableRow() const {return pLine;}
     static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
 };
 
@@ -216,8 +216,8 @@ class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base
 protected:
     virtual ~SwXTextTableCursor();
 public:
-    SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox);
-    SwXTextTableCursor(SwFrmFmt& rTableFmt,
+    SwXTextTableCursor(SwFrameFormat* pFormat, SwTableBox* pBox);
+    SwXTextTableCursor(SwFrameFormat& rTableFormat,
                         const SwTableCursor* pTableSelection);
 
     DECLARE_XINTERFACE()
@@ -275,7 +275,7 @@ public:
 
     const SwUnoCrsr*            GetCrsr() const;
     SwUnoCrsr*                  GetCrsr();
-    SwFrmFmt*       GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat*       GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 };
 
 struct SwRangeDescriptor
@@ -324,11 +324,11 @@ private:
 protected:
     virtual ~SwXTextTable();
     SwXTextTable();
-    SwXTextTable(SwFrmFmt& rFrmFmt);
+    SwXTextTable(SwFrameFormat& rFrameFormat);
 
 public:
     static css::uno::Reference<css::text::XTextTable>
-            CreateXTextTable(SwFrmFmt * pFrmFmt);
+            CreateXTextTable(SwFrameFormat * pFrameFormat);
 
     SW_DLLPUBLIC static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
@@ -428,14 +428,14 @@ public:
 
     sal_uInt16          getRowCount();
     sal_uInt16          getColumnCount();
-    static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >     GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable,
+    static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >     GetRangeByName(SwFrameFormat* pFormat, SwTable* pTable,
                         const OUString& sTLName, const OUString& sBRName,
                         SwRangeDescriptor& rDesc);
 
     //SwClient
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 };
 
 class SwXCellRange : public cppu::WeakImplHelper
@@ -457,7 +457,7 @@ class SwXCellRange : public cppu::WeakImplHelper
     SwRangeDescriptor           aRgDesc;
     const SfxItemPropertySet*   m_pPropSet;
 
-    SwUnoCrsr*                  pTblCrsr;
+    SwUnoCrsr*                  pTableCrsr;
 
     bool m_bFirstRowAsLabel;
     bool m_bFirstColumnAsLabel;
@@ -466,7 +466,7 @@ class SwXCellRange : public cppu::WeakImplHelper
     void setLabelDescriptions(const css::uno::Sequence<OUString>& rDesc, bool bRow);
 
 public:
-    SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt, SwRangeDescriptor& rDesc);
+    SwXCellRange(SwUnoCrsr* pCrsr, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc);
     void SetLabels(bool bFirstRowAsLabel, bool bFirstColumnAsLabel)
         { m_bFirstRowAsLabel = bFirstRowAsLabel, m_bFirstColumnAsLabel = bFirstColumnAsLabel; }
     std::vector< css::uno::Reference< css::table::XCell > > getCells();
@@ -538,16 +538,16 @@ public:
     //SwClient
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 
-    SwFrmFmt*   GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat*   GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
     sal_uInt16      getRowCount();
     sal_uInt16      getColumnCount();
 
-    const SwUnoCrsr* GetTblCrsr() const;
+    const SwUnoCrsr* GetTableCrsr() const;
 
     // for SwChartDataSequence
     void GetDataSequence(
             ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > *pAnySeq,
-            ::com::sun::star::uno::Sequence< OUString > *pTxtSeq,
+            ::com::sun::star::uno::Sequence< OUString > *pTextSeq,
             ::com::sun::star::uno::Sequence< double > *pDblSeq,
             bool bForceNumberResults = false ) throw (::com::sun::star::uno::RuntimeException);
 
@@ -561,12 +561,12 @@ class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper
     public SwClient
 
 {
-    SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
-    const SwFrmFmt* GetFrmFmt() const { return const_cast<SwXTableRows*>(this)->GetFrmFmt(); }
+    SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+    const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTableRows*>(this)->GetFrameFormat(); }
 protected:
     virtual ~SwXTableRows();
 public:
-    SwXTableRows(SwFrmFmt& rFrmFmt);
+    SwXTableRows(SwFrameFormat& rFrameFormat);
 
     TYPEINFO_OVERRIDE();
 
@@ -603,11 +603,11 @@ class SwXTableColumns : public cppu::WeakImplHelper
     public SwClient
 
 {
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
 protected:
     virtual ~SwXTableColumns();
 public:
-    SwXTableColumns(SwFrmFmt& rFrmFmt);
+    SwXTableColumns(SwFrameFormat& rFrameFormat);
 
     TYPEINFO_OVERRIDE();
 
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index 71662286ff6d..6f46a3905734 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -30,7 +30,7 @@
 #include <unotext.hxx>
 
 class SwDoc;
-class SwFrmFmt;
+class SwFrameFormat;
 class SwXTextCursor;
 
 typedef ::cppu::WeakAggImplHelper2
@@ -134,12 +134,12 @@ protected:
 
     virtual ~SwXHeadFootText();
 
-    SwXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader);
+    SwXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader);
 
 public:
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
-        CreateXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader);
+        CreateXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader);
     static bool IsXHeadFootText(SwClient *const pClient);
 
     // XInterface
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index 312b68eec8a8..b7f7ae90b743 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -37,7 +37,7 @@
 
 class SwDoc;
 class SwUnoCrsr;
-class SwFrmFmt;
+class SwFrameFormat;
 
 class SW_DLLPUBLIC SwUnoInternalPaM
     : public SwPaM
@@ -114,7 +114,7 @@ public:
                 ::com::sun::star::text::XText > & xParent,
             const enum RangePosition eRange = RANGE_IN_TEXT);
     // only for RANGE_IS_TABLE
-    SwXTextRange(SwFrmFmt& rTblFmt);
+    SwXTextRange(SwFrameFormat& rTableFormat);
 
     const SwDoc* GetDoc() const;
           SwDoc* GetDoc();
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index b7fb3d0e4f9c..90e7f02b9335 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -148,7 +148,7 @@ private:
 
     css::uno::Reference< css::text::XText >                 xBodyText;
     SwXBodyText*            pBodyText;
-    css::uno::Reference< css::uno::XAggregation >           xNumFmtAgg;
+    css::uno::Reference< css::uno::XAggregation >           xNumFormatAgg;
 
     css::uno::Reference< css::container::XIndexAccess > *     pxXNumberingRules;
     css::uno::Reference< css::container::XIndexAccess > *     pxXFootnotes;
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index ef4c88d0dfbf..e0d1730c5ce7 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -41,10 +41,10 @@ public:
     virtual OUString        GetName() const SAL_OVERRIDE;
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 
-    OUString                Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng);
+    OUString                Expand(sal_uInt32 nFormat, sal_uInt16 nSubType, sal_uInt16 nLng);
 
-    OUString                GetContent( sal_uInt32 nFmt = 0 );
-           void             SetContent( const OUString& rStr, sal_uInt32 nFmt = 0 );
+    OUString                GetContent( sal_uInt32 nFormat = 0 );
+           void             SetContent( const OUString& rStr, sal_uInt32 nFormat = 0 );
 
     inline bool             IsValid() const;
     inline void             ChgValid( bool bNew );
@@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwUserField : public SwValueField
     virtual SwField*        Copy() const SAL_OVERRIDE;
 
 public:
-    SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFmt = 0);
+    SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFormat = 0);
 
     virtual sal_uInt16          GetSubType() const SAL_OVERRIDE;
     virtual void            SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 8f10c195d0e6..64c1e269f2f6 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -157,7 +157,7 @@ protected:
     sal_uInt16          nZoom;          // In percent.
     SvxZoomType     eZoom;              // 'enum' for zoom.
 
-    sal_uInt8            nTblDest;      // Destination for table background.
+    sal_uInt8            nTableDest;      // Destination for table background.
 
 #ifdef DBG_UTIL
     // Corresponds to statements in ui/config/cfgvw.src.
@@ -236,8 +236,8 @@ public:
     inline void SetSoftHyph( bool b )
         { b ? (nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); }
 
-    inline bool IsFldName() const       { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) != 0; }
-    inline void SetFldName( bool b )
+    inline bool IsFieldName() const       { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) != 0; }
+    inline void SetFieldName( bool b )
         { b ? (nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( nCoreOptions &= ~VIEWOPT_1_FLDNAME); }
 
     inline bool IsPostIts() const
@@ -462,7 +462,7 @@ public:
 
     SvxZoomType    GetZoomType()      const { return eZoom; }
 
-    sal_uInt8   GetTblDest() const    { return nTblDest; }
+    sal_uInt8   GetTableDest() const    { return nTableDest; }
 
     void   SetViewVScrollBar(bool b)
         { b ? (nUIOptions |= VIEWOPT_2_VSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_VSCROLLBAR); }
@@ -480,7 +480,7 @@ public:
         { b ? (nUIOptions |= VIEWOPT_2_SCROLLBAR_TIPS) : (nUIOptions &= ~VIEWOPT_2_SCROLLBAR_TIPS); }
 
     void            SetZoomType     (SvxZoomType eZoom_){ eZoom = eZoom_;  }
-    void            SetTblDest( sal_uInt8 nNew )    { nTblDest = nNew;  }
+    void            SetTableDest( sal_uInt8 nNew )    { nTableDest = nNew;  }
 
     const OUString& GetSymbolFont() const {return sSymbolFont;}
     void            SetSymbolFont(const OUString& sSet) {sSymbolFont = sSet;}
@@ -597,7 +597,7 @@ inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const
 inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt )
 {
     nUIOptions = rVOpt.nUIOptions;
-    nTblDest = rVOpt.nTblDest;
+    nTableDest = rVOpt.nTableDest;
     nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode;
 }
 
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index fee06ba39842..b63eaeffd284 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -70,7 +70,7 @@ class SwRegionRects;
 class SwFrm;
 class SvtAccessibilityOptions;
 class SwPagePreviewLayout;
-class SwTxtFrm;
+class SwTextFrm;
 class BitmapEx;
 
 struct SwAccessibilityOptions;
@@ -381,7 +381,7 @@ public:
     void CalcPagesForPrint( sal_uInt16 nMax );
 
     // All about fields.
-    void UpdateFlds(bool bCloseDB = false);
+    void UpdateFields(bool bCloseDB = false);
     bool IsAnyFieldInDoc() const;
     // Update all charts, for that exists any table.
     void UpdateAllCharts();
@@ -520,18 +520,18 @@ public:
 
         @author OD
 
-        @param _pFromTxtFrm
+        @param _pFromTextFrm
         input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM
         has to be invalidated.
         If NULL, no CONTENT_FLOWS_FROM relation has to be invalidated
 
-        @param _pToTxtFrm
+        @param _pToTextFrm
         input parameter - paragraph frame, for which the relation CONTENT_FLOWS_TO
         has to be invalidated.
         If NULL, no CONTENT_FLOWS_TO relation has to be invalidated
     */
-    void InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
-                                               const SwTxtFrm* _pToTxtFrm );
+    void InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
+                                               const SwTextFrm* _pToTextFrm );
 
     /** invalidate text selection for paragraphs
 
@@ -546,10 +546,10 @@ public:
 
         @author OD
 
-        @param rTxtFrm
+        @param rTextFrm
         input parameter - paragraph frame, whose attributes have changed
     */
-    void InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm );
+    void InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm );
 
     SwAccessibleMap* GetAccessibleMap();
 
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 99b25f761f22..a15dbd30b04b 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -28,7 +28,7 @@
 
 class SwCrsrShell;
 class SwShellCrsr;
-class SwTxtInputFld;
+class SwTextInputField;
 
 // From here classes/methods for non-text cursor.
 
@@ -40,7 +40,7 @@ class SwVisCrsr
     bool m_bIsVisible;
     bool m_bIsDragCrsr;
 
-    vcl::Cursor m_aTxtCrsr;
+    vcl::Cursor m_aTextCrsr;
     const SwCrsrShell* m_pCrsrShell;
 
     void _SetPosAndShow();
@@ -79,10 +79,10 @@ class SwSelPaintRects : public SwRects
     void setCursorOverlay(sdr::overlay::OverlayObject* pNew) { m_pCursorOverlay = pNew; }
 #endif
 
-    bool m_bShowTxtInputFldOverlay;
-    sw::overlay::OverlayRangesOutline* m_pTxtInputFldOverlay;
+    bool m_bShowTextInputFieldOverlay;
+    sw::overlay::OverlayRangesOutline* m_pTextInputFieldOverlay;
 
-    void HighlightInputFld();
+    void HighlightInputField();
 
 public:
     SwSelPaintRects( const SwCrsrShell& rCSh );
@@ -100,9 +100,9 @@ public:
     void Hide();
     void Invalidate( const SwRect& rRect );
 
-    inline void SetShowTxtInputFldOverlay( const bool bShow )
+    inline void SetShowTextInputFieldOverlay( const bool bShow )
     {
-        m_bShowTxtInputFldOverlay = bShow;
+        m_bShowTextInputFieldOverlay = bShow;
     }
 
     const SwCrsrShell* GetShell() const { return m_pCursorShell; }
@@ -152,7 +152,7 @@ public:
     virtual SwCursor* Create( SwPaM* pRing = 0 ) const SAL_OVERRIDE;
 
     virtual short MaxReplaceArived() SAL_OVERRIDE; //returns RET_YES/RET_CANCEL/RET_NO
-    virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
+    virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
 
     bool UpDown( bool bUp, sal_uInt16 nCnt = 1 );
 
@@ -192,7 +192,7 @@ public:
     virtual SwCursor* Create( SwPaM* pRing = 0 ) const SAL_OVERRIDE;
 
     virtual short MaxReplaceArived() SAL_OVERRIDE; //returns RET_YES/RET_CANCEL/RET_NO
-    virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
+    virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
 
     // true: Cursor can be set to this position.
     virtual bool IsAtValidPos( bool bPoint = true ) const SAL_OVERRIDE;
diff --git a/sw/qa/complex/accessibility/AccessibleRelationSet.java b/sw/qa/complex/accessibility/AccessibleRelationSet.java
index 562bcfe98d7e..b1d0b4cc58ea 100644
--- a/sw/qa/complex/accessibility/AccessibleRelationSet.java
+++ b/sw/qa/complex/accessibility/AccessibleRelationSet.java
@@ -71,11 +71,11 @@ public class AccessibleRelationSet {
             "didn't gain correct relation type for paragraph 0", types[2],
             types[firstrelation]);
 
-        XAccessibleText paraTxt2 =
+        XAccessibleText paraText2 =
           UnoRuntime.queryInterface(XAccessibleText.class, para2);
         assertEquals(
             "didn't gain correct target paragraph", atarget.getText(),
-            paraTxt2.getText());
+            paraText2.getText());
     }
 
     @Test public void contents_flows_from() {
@@ -131,21 +131,21 @@ public class AccessibleRelationSet {
             "didn't gain correct relation type for paragraph 1", types[1],
             types[relationtypes[0]]);
 
-        XAccessibleText paraTxt1 =
+        XAccessibleText paraText1 =
           UnoRuntime.queryInterface(XAccessibleText.class, para1);
         assertEquals(
             "didn't gain correct target paragraph", atargets[0].getText(),
-            paraTxt1.getText());
+            paraText1.getText());
 
         assertEquals(
             "didn't gain correct relation type for paragraph 3", types[2],
             types[relationtypes[1]]);
 
-        XAccessibleText paraTxt3 =
+        XAccessibleText paraText3 =
           UnoRuntime.queryInterface(XAccessibleText.class, para3);
         assertEquals(
             "didn't gain correct target paragraph", atargets[1].getText(),
-            paraTxt3.getText());
+            paraText3.getText());
     }
 
     @Before public void before()
diff --git a/sw/qa/complex/writer/CheckCrossReferences.java b/sw/qa/complex/writer/CheckCrossReferences.java
index 508ca6cf6a04..651604b439b7 100644
--- a/sw/qa/complex/writer/CheckCrossReferences.java
+++ b/sw/qa/complex/writer/CheckCrossReferences.java
@@ -33,7 +33,7 @@ public class CheckCrossReferences {
 
     private com.sun.star.container.XEnumeration xParaEnum;
     private com.sun.star.container.XEnumeration xPortionEnum;
-    private com.sun.star.util.XRefreshable xFldsRefresh;
+    private com.sun.star.util.XRefreshable xFieldsRefresh;
 
     public com.sun.star.text.XTextField getNextField()
         throws com.sun.star.uno.Exception
@@ -86,18 +86,18 @@ public class CheckCrossReferences {
     public void checkField( com.sun.star.text.XTextField xField,
             com.sun.star.beans.XPropertySet xProps,
             short nFormat,
-            String aExpectedFldResult )
+            String aExpectedFieldResult )
         throws com.sun.star.uno.Exception
     {
         // set requested format
         xProps.setPropertyValue("ReferenceFieldPart", Short.valueOf(nFormat));
 
         // refresh fields in order to get new format applied
-        xFldsRefresh.refresh();
+        xFieldsRefresh.refresh();
 
-        String aFldResult = xField.getPresentation( false );
+        String aFieldResult = xField.getPresentation( false );
         assertEquals( "set reference field format doesn't result in correct field result",
-                      aExpectedFldResult, aFldResult);
+                      aExpectedFieldResult, aFieldResult);
     }
 
     @Test public void checkCrossReferences() throws com.sun.star.uno.Exception {
@@ -114,25 +114,25 @@ public class CheckCrossReferences {
             com.sun.star.text.XTextFieldsSupplier xFieldSupp =
                     UnoRuntime.queryInterface(
             com.sun.star.text.XTextFieldsSupplier.class, document);
-            xFldsRefresh = UnoRuntime.queryInterface(
+            xFieldsRefresh = UnoRuntime.queryInterface(
                     com.sun.star.util.XRefreshable.class, xFieldSupp.getTextFields());
         }
 
         // check first reference field
         {
             // strings for checking
-            final String FldResult1 = "*i*";
-            final String FldResult2 = "+b+*i*";
-            final String FldResult3 = "-1-+b+*i*";
-            final String FldResult4 = "1";
-            final String FldResult5 = "1";
-            final String FldResult6 = "A.1";
-            final String FldResult7 = "2(a)";
-            final String FldResult8 = "2(b)";
-            final String FldResult9 = "2";
-            final String FldResult10 = "1(a)";
-            final String FldResult11 = "(b)";
-            final String FldResult12 = "(a)";
+            final String FieldResult1 = "*i*";
+            final String FieldResult2 = "+b+*i*";
+            final String FieldResult3 = "-1-+b+*i*";
+            final String FieldResult4 = "1";
+            final String FieldResult5 = "1";
+            final String FieldResult6 = "A.1";
+            final String FieldResult7 = "2(a)";
+            final String FieldResult8 = "2(b)";
+            final String FieldResult9 = "2";
+            final String FieldResult10 = "1(a)";
+            final String FieldResult11 = "(b)";
+            final String FieldResult12 = "(a)";
 
             // variables for current field
             com.sun.star.text.XTextField xField = null;
@@ -140,75 +140,75 @@ public class CheckCrossReferences {
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult2 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult1 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult3 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult2 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult1 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult3 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult1 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult1 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult3 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult1 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult1 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult3 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult3 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult1 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult3 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult3 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult1 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult3 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult5 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult5 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult6 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult6 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult6 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult6 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult6 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult7 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult12 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult7 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult7 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult12 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult7 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult8 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult11 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult8 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult8 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult11 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult8 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult9 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult9 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult9 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult9 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult9 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult9 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult4 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult10 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult12 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult10 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult10 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult12 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult10 );
 
             xField = getNextField();
             xProps = getFieldProps( xField );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult12 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult12 );
-            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult7 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult12 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult12 );
+            checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult7 );
         }
 
         // insert a certain cross-reference bookmark and a reference field to this bookmark
@@ -267,7 +267,7 @@ public class CheckCrossReferences {
                         UnoRuntime.queryInterface(
                 com.sun.star.text.XTextRange.class, xParaEnum.nextElement());
                 xNewField.attach(xFieldTextRange.getEnd());
-                xFldsRefresh.refresh();
+                xFieldsRefresh.refresh();
             }
 
             // check inserted reference field
@@ -278,7 +278,7 @@ public class CheckCrossReferences {
                           "J", xField.getPresentation( false ) );
 
             xParaTextRange.getStart().setString( "Hallo new bookmark: " );
-            xFldsRefresh.refresh();
+            xFieldsRefresh.refresh();
             assertEquals( "inserted reference field doesn't has correct field result",
                           "Hallo new bookmark: J", xField.getPresentation( false ) );
         }
diff --git a/sw/qa/complex/writer/CheckTable.java b/sw/qa/complex/writer/CheckTable.java
index 83b92da818f8..e4d33d3ee6f1 100644
--- a/sw/qa/complex/writer/CheckTable.java
+++ b/sw/qa/complex/writer/CheckTable.java
@@ -275,7 +275,7 @@ public class CheckTable
         // get anchor
         XTextRange xAnchor = xTable.getAnchor();
         // check all properties on the anchor - shouldn't crash despite
-        // pointing to a non-SwTxtNode
+        // pointing to a non-SwTextNode
         XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, xAnchor);
         XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo();
         Property[] props = xPropsInfo.getProperties();
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index c754bb431517..5b90d8acfe80 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -193,14 +193,14 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
     SwPaM aPaM(aIdx);
 
     IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
-    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    rIDCO.AppendTextNode(*aPaM.GetPoint());
     rIDCO.InsertString(aPaM, OUString("A"));
-    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    rIDCO.AppendTextNode(*aPaM.GetPoint());
     rIDCO.InsertString(aPaM, OUString("A"));
-    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    rIDCO.AppendTextNode(*aPaM.GetPoint());
     aPaM.Move(fnMoveBackward, fnGoNode);
     aPaM.Move(fnMoveBackward, fnGoNode);
-    aPaM.Move(fnMoveBackward, fnGoCntnt);
+    aPaM.Move(fnMoveBackward, fnGoContent);
     aPaM.SetMark();
     aPaM.Move(fnMoveForward, fnGoDoc);
     IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
@@ -210,7 +210,7 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
     // select so pMark start position is on a node that is fully deleted
     aPaM.Move(fnMoveBackward, fnGoNode);
     // must leave un-selected content in last node to get the bJoinPrev flag!
-    aPaM.Move(fnMoveBackward, fnGoCntnt);
+    aPaM.Move(fnMoveBackward, fnGoContent);
     aPaM.Exchange();
     aPaM.Move(fnMoveBackward, fnGoDoc);
     // delete
@@ -219,8 +219,8 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
     for (IDocumentMarkAccess::const_iterator_t i = rIDMA.getAllMarksBegin(); i != rIDMA.getAllMarksEnd(); ++i)
     {
         // problem was that the nContent was pointing at deleted node
-        CPPUNIT_ASSERT((*i)->GetMarkStart().nNode.GetNode().GetCntntNode() ==
-            static_cast<const SwCntntNode*>((*i)->GetMarkStart().nContent.GetIdxReg()));
+        CPPUNIT_ASSERT((*i)->GetMarkStart().nNode.GetNode().GetContentNode() ==
+            static_cast<const SwContentNode*>((*i)->GetMarkStart().nContent.GetIdxReg()));
     }
 }
 
@@ -232,11 +232,11 @@ void SwMacrosTest::testBookmarkDeleteTdf90816()
     SwPaM aPaM(aIdx);
 
     IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
-    rIDCO.AppendTxtNode(*aPaM.GetPoint());
+    rIDCO.AppendTextNode(*aPaM.GetPoint());
     rIDCO.InsertString(aPaM, OUString("ABC"));
-    aPaM.Move(fnMoveBackward, fnGoCntnt);
+    aPaM.Move(fnMoveBackward, fnGoContent);
     aPaM.SetMark();
-    aPaM.Move(fnMoveBackward, fnGoCntnt);
+    aPaM.Move(fnMoveBackward, fnGoContent);
     IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
     sw::mark::IMark *pMark =
         rIDMA.makeMark(aPaM, "test", IDocumentMarkAccess::MarkType::BOOKMARK);
@@ -435,18 +435,18 @@ void SwMacrosTest::testFindReplace()
     // we need a full document with view and layout etc. because ::GetNode()
     Reference<lang::XComponent> const xComponent =
         loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument");
-    SwXTextDocument *const pTxtDoc = dynamic_cast<SwXTextDocument *>(xComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwDoc *const pDoc = pTxtDoc->GetDocShell()->GetDoc();
+    SwXTextDocument *const pTextDoc = dynamic_cast<SwXTextDocument *>(xComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwDoc *const pDoc = pTextDoc->GetDocShell()->GetDoc();
     SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
     // use a UnoCrsr so it will be corrected when deleting nodes
     SwUnoCrsr *const pPaM(pDoc->CreateUnoCrsr(SwPosition(aIdx), false));
 
     IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
     rIDCO.InsertString(*pPaM, OUString("foo"));
-    rIDCO.AppendTxtNode(*pPaM->GetPoint());
+    rIDCO.AppendTextNode(*pPaM->GetPoint());
     rIDCO.InsertString(*pPaM, OUString("bar"));
-    rIDCO.AppendTxtNode(*pPaM->GetPoint());
+    rIDCO.AppendTextNode(*pPaM->GetPoint());
     rIDCO.InsertString(*pPaM, OUString("baz"));
     pPaM->Move(fnMoveBackward, fnGoDoc);
 
@@ -467,7 +467,7 @@ void SwMacrosTest::testFindReplace()
             opts, false, DOCPOS_CURR, DOCPOS_END, bCancel, FND_IN_BODY, false);
     CPPUNIT_ASSERT(bFound);
     CPPUNIT_ASSERT(pPaM->HasMark());
-    CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText());
 
     // now do another Find, inside the selection from the first Find
 //    opts.searchFlags = 71680;
@@ -475,7 +475,7 @@ void SwMacrosTest::testFindReplace()
             opts, false, DOCPOS_CURR, DOCPOS_END, bCancel, FND_IN_SEL, false);
     CPPUNIT_ASSERT(bFound);
     CPPUNIT_ASSERT(pPaM->HasMark());
-    CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText());
 
     rIDCO.ReplaceRange(*pPaM, " ", true);
 
@@ -484,10 +484,10 @@ void SwMacrosTest::testFindReplace()
 
     // problem was that after the 2nd Find, the wrong newline was selected
     CPPUNIT_ASSERT_EQUAL(OUString("foo bar"),
-            pPaM->Start()->nNode.GetNode().GetTxtNode()->GetTxt());
+            pPaM->Start()->nNode.GetNode().GetTextNode()->GetText());
     pPaM->Move(fnMoveForward, fnGoNode);
     CPPUNIT_ASSERT_EQUAL(OUString("baz"),
-            pPaM->End()->nNode.GetNode().GetTxtNode()->GetTxt());
+            pPaM->End()->nNode.GetNode().GetTextNode()->GetText());
 }
 
 SwMacrosTest::SwMacrosTest()
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx
index 7c16c18b03a6..e768c210ce2b 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -104,8 +104,8 @@ ToxLinkProcessorTest::LinkIsCreatedCorrectly()
     sut.StartNewLink(0, STYLE_NAME_1);
     sut.CloseLink(1, URL_1);
 
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link", STYLE_NAME_1, sut.mClosedLinks.at(0).mINetFmt.GetVisitedFmt());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link", URL_1, sut.mClosedLinks.at(0).mINetFmt.GetValue());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link", STYLE_NAME_1, sut.mClosedLinks.at(0).mINetFormat.GetVisitedFormat());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link", URL_1, sut.mClosedLinks.at(0).mINetFormat.GetValue());
 }
 
 void
@@ -122,18 +122,18 @@ ToxLinkProcessorTest::LinkSequenceIsPreserved()
 
     // check first closed element
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link",
-            STYLE_NAME_2, sut.mClosedLinks.at(0).mINetFmt.GetVisitedFmt());
+            STYLE_NAME_2, sut.mClosedLinks.at(0).mINetFormat.GetVisitedFormat());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Pool id is stored correctly in link",
-            POOL_ID_2, sut.mClosedLinks.at(0).mINetFmt.GetINetFmtId());
+            POOL_ID_2, sut.mClosedLinks.at(0).mINetFormat.GetINetFormatId());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link",
-            URL_2, sut.mClosedLinks.at(0).mINetFmt.GetValue());
+            URL_2, sut.mClosedLinks.at(0).mINetFormat.GetValue());
     // check second closed element
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link",
-            STYLE_NAME_1, sut.mClosedLinks.at(1).mINetFmt.GetVisitedFmt());
+            STYLE_NAME_1, sut.mClosedLinks.at(1).mINetFormat.GetVisitedFormat());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Pool id is stored correctly in link",
-            POOL_ID_1, sut.mClosedLinks.at(1).mINetFmt.GetINetFmtId());
+            POOL_ID_1, sut.mClosedLinks.at(1).mINetFormat.GetINetFormatId());
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link",
-            URL_1, sut.mClosedLinks.at(1).mINetFmt.GetValue());
+            URL_1, sut.mClosedLinks.at(1).mINetFormat.GetValue());
 }
 
 // Put the test suite in the registry
diff --git a/sw/qa/core/test_ToxTextGenerator.cxx b/sw/qa/core/test_ToxTextGenerator.cxx
index 2101c4a8b825..0dcda9f18717 100644
--- a/sw/qa/core/test_ToxTextGenerator.cxx
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
@@ -86,7 +86,7 @@ void
 ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet()
 {
     MockedSortTab sortTab;
-    sortTab.pTxtMark = NULL;
+    sortTab.pTextMark = NULL;
 
     OUString expected("");
     OUString actual = ToxTextGenerator::GetNumStringOfFirstNode(sortTab, false, 0);
@@ -97,7 +97,7 @@ void
 ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty()
 {
     MockedSortTab sortTab;
-    sortTab.pTxtMark = reinterpret_cast<SwTxtTOXMark*>(1);
+    sortTab.pTextMark = reinterpret_cast<SwTextTOXMark*>(1);
 
     OUString expected("");
     OUString actual = ToxTextGenerator::GetNumStringOfFirstNode(sortTab, false, 0);
@@ -107,7 +107,7 @@ ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty()
 class MockedToxTabStopTokenHandler : public ToxTabStopTokenHandler {
 public:
     virtual HandledTabStopToken
-    HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode,
+    HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
             const SwRootFrm *currentLayout) const SAL_OVERRIDE {
         (void)(aToken); (void)(targetNode); (void)(currentLayout); // avoid unused warnings.
         return HandledTabStopToken();
@@ -128,7 +128,7 @@ public:
 private:
     SwChapterField
     ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
-            const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) const SAL_OVERRIDE {
+            const SwContentFrm* contentFrame, const SwContentNode *contentNode) const SAL_OVERRIDE {
         // get rid of 'unused-parameters' warnings
         (void)(chapterFieldType);(void)(chapterToken);(void)(contentFrame);(void)(contentNode);
         return mChapterField;
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 6e7e3092942f..966a2aa23bbf 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -270,30 +270,30 @@ void SwDocTest::testUserPerceivedCharCount()
     CPPUNIT_ASSERT_MESSAGE("Surrogate Pair should be counted as single character", nCount == 1);
 }
 
-SwTxtNode* getModelToViewTestDocument(SwDoc *pDoc)
+SwTextNode* getModelToViewTestDocument(SwDoc *pDoc)
 {
     SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
     SwPaM aPaM(aIdx);
 
-    SwFmtFtn aFtn;
-    aFtn.SetNumStr(OUString("foo"));
+    SwFormatFootnote aFootnote;
+    aFootnote.SetNumStr(OUString("foo"));
 
-    pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+    pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("AAAAA BBBBB "));
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
     sal_Int32 nPos = aPaM.GetPoint()->nContent.GetIndex();
-    pTxtNode->InsertItem(aFtn, nPos, nPos);
+    pTextNode->InsertItem(aFootnote, nPos, nPos);
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(" CCCCC "));
     nPos = aPaM.GetPoint()->nContent.GetIndex();
-    pTxtNode->InsertItem(aFtn, nPos, nPos);
+    pTextNode->InsertItem(aFootnote, nPos, nPos);
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(" DDDDD"));
-    CPPUNIT_ASSERT(pTxtNode->GetTxt().getLength() == (4*5) + 5 + 2);
+    CPPUNIT_ASSERT(pTextNode->GetText().getLength() == (4*5) + 5 + 2);
 
     //set start of selection to first B
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 6);
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 6);
     aPaM.SetMark();
     //set end of selection to last C
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 14);
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 14);
     //set character attribute hidden on range
     SvxCharHiddenItem aHidden(true, RES_CHRATR_HIDDEN);
     pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, aHidden );
@@ -305,24 +305,24 @@ SwTxtNode* getModelToViewTestDocument(SwDoc *pDoc)
     CPPUNIT_ASSERT_MESSAGE("redlines should be visible", IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineMode()));
 
     //set start of selection to last A
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 4);
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 4);
     aPaM.SetMark();
     //set end of selection to second last B
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 9);
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 9);
     pDoc->getIDocumentContentOperations().DeleteAndJoin(aPaM);    //redline-aware deletion api
     aPaM.DeleteMark();
 
-    return pTxtNode;
+    return pTextNode;
 }
 
-SwTxtNode* getModelToViewTestDocument2(SwDoc *pDoc)
+SwTextNode* getModelToViewTestDocument2(SwDoc *pDoc)
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(pDoc);
 
     SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
     SwPaM aPaM(aIdx);
 
-    pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+    pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("AAAAA"));
     IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess();
     sw::mark::IFieldmark *pFieldmark = dynamic_cast<sw::mark::IFieldmark*>(
@@ -333,28 +333,28 @@ SwTxtNode* getModelToViewTestDocument2(SwDoc *pDoc)
     (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries);
     (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] = uno::makeAny(sal_Int32(0));
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("CCCCC"));
-    pTxtNode = aPaM.GetNode().GetTxtNode();
+    pTextNode = aPaM.GetNode().GetTextNode();
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(11),
-            pTxtNode->GetTxt().getLength());
+            pTextNode->GetText().getLength());
 
-    return pTxtNode;
+    return pTextNode;
 }
 
 void SwDocTest::testModelToViewHelperPassthrough()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::PassThrough);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::PassThrough);
     OUString sViewText = aModelToViewHelper.getViewText();
-    OUString sModelText = pTxtNode->GetTxt();
+    OUString sModelText = pTextNode->GetText();
     CPPUNIT_ASSERT_EQUAL(sModelText, sViewText);
 }
 
 void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnote()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
         OUString("AAAAA BBBBB foo CCCCC foo DDDDD"), sViewText);
@@ -362,9 +362,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnote()
 
 void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
             ExpandMode::ExpandFields | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
@@ -382,9 +382,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode()
 
 void SwDocTest::testModelToViewHelperExpandFields()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
         OUString("AAAAA BBBBB  CCCCC  DDDDD"), sViewText);
@@ -392,9 +392,9 @@ void SwDocTest::testModelToViewHelperExpandFields()
 
 void SwDocTest::testModelToViewHelperExpandFieldsReplaceMode()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
         ExpandMode::ExpandFields | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(OUString("AAAAA BBBBB  CCCCC  DDDDD"),
@@ -407,9 +407,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsReplaceMode()
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideInvisible()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::HideInvisible);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::HideInvisible);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
         OUString("AAAAA CCCCC " + OUStringLiteral1<CH_TXTATR_BREAKWORD>() + " DDDDD"),
@@ -418,9 +418,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideInvisible()
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideRedlined()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::HideDeletions);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::HideDeletions);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
         OUString("AAAABB " + OUStringLiteral1<CH_TXTATR_BREAKWORD>() + " CCCCC " + OUStringLiteral1<CH_TXTATR_BREAKWORD>() + " DDDDD"),
@@ -429,18 +429,18 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideRedlined()
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleExpandFootnote()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::ExpandFootnote);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::ExpandFootnote);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(OUString("AAAAA CCCCC foo DDDDD"), sViewText);
 }
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleExpandFootnoteReplaceMode()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
         ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
@@ -456,9 +456,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleExpandFootnoteRepl
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnote()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
         OUString("AAAABB foo CCCCC foo DDDDD"), sViewText);
@@ -466,9 +466,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnote(
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnoteReplaceMode()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
         ExpandMode::ExpandFields | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
@@ -486,9 +486,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnoteR
 
 void SwDocTest::testModelToViewHelperHideInvisibleHideRedlined()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::HideInvisible | ExpandMode::HideDeletions);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::HideInvisible | ExpandMode::HideDeletions);
     OUString sViewText = aModelToViewHelper.getViewText();
     OUStringBuffer aBuffer;
     aBuffer.append("AAAACCCCC ");
@@ -499,18 +499,18 @@ void SwDocTest::testModelToViewHelperHideInvisibleHideRedlined()
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpandFootnote()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(OUString("AAAACCCCC foo DDDDD"), sViewText);
 }
 
 void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpandFootnoteReplaceMode()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
         ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(sViewText,
@@ -525,18 +525,18 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpand
 
 void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnote2()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument2(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument2(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
+    ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(OUString("AAAAABBBBBCCCCC"), sViewText);
 }
 
 void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode2()
 {
-    SwTxtNode* pTxtNode = getModelToViewTestDocument2(m_pDoc);
+    SwTextNode* pTextNode = getModelToViewTestDocument2(m_pDoc);
 
-    ModelToViewHelper aModelToViewHelper(*pTxtNode,
+    ModelToViewHelper aModelToViewHelper(*pTextNode,
         ExpandMode::ExpandFields | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
     OUString sViewText = aModelToViewHelper.getViewText();
     CPPUNIT_ASSERT_EQUAL(
@@ -555,16 +555,16 @@ void SwDocTest::testSwScanner()
     SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -1);
     SwPaM aPaM(aIdx);
 
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
 
-    CPPUNIT_ASSERT_MESSAGE("Has Text Node", pTxtNode);
+    CPPUNIT_ASSERT_MESSAGE("Has Text Node", pTextNode);
 
     //See https://bugs.libreoffice.org/show_bug.cgi?id=40449
     //See https://bugs.libreoffice.org/show_bug.cgi?id=39365
     //Use a temporary OUString as the arg, as that's the trouble behind
     //fdo#40449 and fdo#39365
     {
-        SwScanner aScanner(*pTxtNode,
+        SwScanner aScanner(*pTextNode,
             OUString("Hello World"),
             0, ModelToViewHelper(), i18n::WordType::DICTIONARY_WORD, 0,
             RTL_CONSTASCII_LENGTH("Hello World"));
@@ -595,8 +595,8 @@ void SwDocTest::testSwScanner()
         m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, aWestLangItem );
 
         SwDocStat aDocStat;
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(IDEOGRAPHICFULLSTOP_D));
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(IDEOGRAPHICFULLSTOP_D));
 
         CPPUNIT_ASSERT_MESSAGE("Should be 2", aDocStat.nChar == 2);
         CPPUNIT_ASSERT_MESSAGE("Should be 2", aDocStat.nCharExcludingSpaces == 2);
@@ -621,7 +621,7 @@ void SwDocTest::testSwScanner()
             0x0020, 0x0064, 0x006F, 0x0065, 0x0073, 0x0020, 0x0074, 0x0068,
             0x0069, 0x0073, 0x0020, 0x0064, 0x006F, 0x003F, 0x0020, 0x0020
         };
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(test,
             SAL_N_ELEMENTS(test)));
 
@@ -631,8 +631,8 @@ void SwDocTest::testSwScanner()
         m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, aWestLangItem );
 
         SwDocStat aDocStat;
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(test));
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(test));
         CPPUNIT_ASSERT_MESSAGE("58 words", aDocStat.nWord == 58);
         CPPUNIT_ASSERT_MESSAGE("43 Asian characters and Korean syllables", aDocStat.nAsianWord == 43);
         CPPUNIT_ASSERT_MESSAGE("105 non-whitespace chars", aDocStat.nCharExcludingSpaces == 105);
@@ -650,10 +650,10 @@ void SwDocTest::testSwScanner()
             0x0065, 0x0065, 0x2019
         };
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(aShouldBeThree, SAL_N_ELEMENTS(aShouldBeThree)));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeThree));
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeThree));
         CPPUNIT_ASSERT_MESSAGE("Should be 3", aDocStat.nWord == 3);
 
         const sal_Unicode aShouldBeFive[] = {
@@ -667,11 +667,11 @@ void SwDocTest::testSwScanner()
             0x006C, 0x0065, 0x0072, 0x3000, 0x00BB
         };
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(aShouldBeFive, SAL_N_ELEMENTS(aShouldBeFive)));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
+        pTextNode = aPaM.GetNode().GetTextNode();
         aDocStat.Reset();
-        pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive));
+        pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive));
         CPPUNIT_ASSERT_MESSAGE("Should be 5", aDocStat.nWord == 5);
     }
 
@@ -679,47 +679,47 @@ void SwDocTest::testSwScanner()
     {
         SwDocStat aDocStat;
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Apple"));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
+        pTextNode = aPaM.GetNode().GetTextNode();
         sal_Int32 nPos = aPaM.GetPoint()->nContent.GetIndex();
-        SwFmtFtn aFtn;
-        aFtn.SetNumStr(OUString("banana"));
-        SwTxtAttr* pTA = pTxtNode->InsertItem(aFtn, nPos, nPos);
+        SwFormatFootnote aFootnote;
+        aFootnote.SetNumStr(OUString("banana"));
+        SwTextAttr* pTA = pTextNode->InsertItem(aFootnote, nPos, nPos);
         CPPUNIT_ASSERT(pTA);
-        CPPUNIT_ASSERT(pTxtNode->Len() == 6); //Apple + 0x02
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        CPPUNIT_ASSERT(pTextNode->Len() == 6); //Apple + 0x02
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 1);
         CPPUNIT_ASSERT_MESSAGE("footnote should be expanded", aDocStat.nChar == 11);
 
         const sal_Int32 nNextPos = aPaM.GetPoint()->nContent.GetIndex();
         CPPUNIT_ASSERT(nNextPos == nPos+1);
-        SwFmtRefMark aRef(OUString("refmark"));
-        pTA = pTxtNode->InsertItem(aRef, nNextPos, nNextPos);
+        SwFormatRefMark aRef(OUString("refmark"));
+        pTA = pTextNode->InsertItem(aRef, nNextPos, nNextPos);
         CPPUNIT_ASSERT(pTA);
 
         aDocStat.Reset();
-        pTxtNode->SetWordCountDirty(true);
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode->SetWordCountDirty(true);
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 1);
         CPPUNIT_ASSERT_MESSAGE("refmark anchor should not be counted", aDocStat.nChar == 11);
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Apple"));
 
         DateTime aDate(DateTime::SYSTEM);
         SwPostItField aPostIt(
-            static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD)), OUString("An Author"),
+            static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_POSTITFLD)), OUString("An Author"),
             OUString("Some Text"), OUString("Initials"), OUString("Name"), aDate );
-        m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, SwFmtFld(aPostIt));
+        m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, SwFormatField(aPostIt));
 
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Apple"));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
+        pTextNode = aPaM.GetNode().GetTextNode();
         aDocStat.Reset();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 1);
         CPPUNIT_ASSERT_MESSAGE("postit anchor should effectively not exist", aDocStat.nChar == 10);
-        CPPUNIT_ASSERT(pTxtNode->Len() == 11);
+        CPPUNIT_ASSERT(pTextNode->Len() == 11);
 
         aDocStat.Reset();
     }
@@ -729,10 +729,10 @@ void SwDocTest::testSwScanner()
         SwDocStat aDocStat;
 
         const char aString[] = "Lorem ipsum";
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(aString));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(2));
 
         //turn on red-lining and show changes
@@ -742,17 +742,17 @@ void SwDocTest::testSwScanner()
 
         //delete everything except the first word
         aPaM.SetMark(); //set start of selection to current pos
-        aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 5);   //set end of selection to fifth char of current node
+        aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 5);   //set end of selection to fifth char of current node
         m_pDoc->getIDocumentContentOperations().DeleteAndJoin(aPaM);    //redline-aware deletion api
         //"real underlying text should be the same"
-        CPPUNIT_ASSERT_EQUAL(pTxtNode->GetTxt(), OUString(aString));
+        CPPUNIT_ASSERT_EQUAL(pTextNode->GetText(), OUString(aString));
 
         aDocStat.Reset();
-        pTxtNode->SetWordCountDirty(true);
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //but word-counting the text should only count the non-deleted text
+        pTextNode->SetWordCountDirty(true);
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //but word-counting the text should only count the non-deleted text
         CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(1));
 
-        pTxtNode->SetWordCountDirty(true);
+        pTextNode->SetWordCountDirty(true);
 
         //keep red-lining on but hide changes
         m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(nsRedlineMode_t::REDLINE_ON);
@@ -760,28 +760,28 @@ void SwDocTest::testSwScanner()
         CPPUNIT_ASSERT_MESSAGE("redlines should be invisible", !IDocumentRedlineAccess::IsShowChanges(m_pDoc->getIDocumentRedlineAccess().GetRedlineMode()));
 
         aDocStat.Reset();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //but word-counting the text should only count the non-deleted text
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //but word-counting the text should only count the non-deleted text
         CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(1));
 
-        OUString sLorem = pTxtNode->GetTxt();
+        OUString sLorem = pTextNode->GetText();
         CPPUNIT_ASSERT(sLorem == "Lorem");
 
-        const SwRedlineTbl& rTbl = m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+        const SwRedlineTable& rTable = m_pDoc->getIDocumentRedlineAccess().GetRedlineTable();
 
         SwNodes& rNds = m_pDoc->GetNodes();
-        CPPUNIT_ASSERT(rTbl.size() == 1);
+        CPPUNIT_ASSERT(rTable.size() == 1);
 
-        SwNodeIndex* pNodeIdx = rTbl[0]->GetContentIdx();
+        SwNodeIndex* pNodeIdx = rTable[0]->GetContentIdx();
         CPPUNIT_ASSERT(pNodeIdx);
 
-        pTxtNode = rNds[ pNodeIdx->GetIndex() + 1 ]->GetTxtNode();        //first deleted txtnode
-        CPPUNIT_ASSERT(pTxtNode);
+        pTextNode = rNds[ pNodeIdx->GetIndex() + 1 ]->GetTextNode();        //first deleted txtnode
+        CPPUNIT_ASSERT(pTextNode);
 
-        OUString sIpsum = pTxtNode->GetTxt();
+        OUString sIpsum = pTextNode->GetText();
         CPPUNIT_ASSERT(sIpsum == " ipsum");
 
         aDocStat.Reset();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //word-counting the text should only count the non-deleted text, and this whole chunk should be ignored
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //word-counting the text should only count the non-deleted text, and this whole chunk should be ignored
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(0), aDocStat.nWord);
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(0), aDocStat.nChar);
 
@@ -789,18 +789,18 @@ void SwDocTest::testSwScanner()
         // redline *added* text though
         m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_DELETE|nsRedlineMode_t::REDLINE_SHOW_INSERT);
         aPaM.DeleteMark();
-        aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 0);
+        aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 0);
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, "redline-new-text ");
         aDocStat.Reset();
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->SetWordCountDirty(true);
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->SetWordCountDirty(true);
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(2), aDocStat.nWord);
         //redline-new-text Lorem ipsum
         //+++++++++++++++++     ------
         //select start of original text and part of deleted text
         aDocStat.Reset();
-        pTxtNode->CountWords(aDocStat, 17, 25);
+        pTextNode->CountWords(aDocStat, 17, 25);
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(5), aDocStat.nChar);
     }
 
@@ -810,73 +810,73 @@ void SwDocTest::testSwScanner()
 
         OUString sTemplate("ThisXis a test.");
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', ' '));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
                        aDocStat.nCharExcludingSpaces == 12 &&
                        aDocStat.nChar == 15);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" = ")));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 17);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" _ ")));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 17);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" -- ")));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
                        aDocStat.nCharExcludingSpaces == 14 &&
                        aDocStat.nChar == 18);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', '_'));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', '-'));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2012));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2015));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
@@ -884,19 +884,19 @@ void SwDocTest::testSwScanner()
 
         //But default configuration should, msword-alike treak emdash
         //and endash as word separators for word-counting
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2013));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
         aDocStat.Reset();
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2014));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 15);
@@ -904,10 +904,10 @@ void SwDocTest::testSwScanner()
 
         const sal_Unicode aChunk[] = {' ', 0x2013, ' '};
         OUString sChunk(aChunk, SAL_N_ELEMENTS(aChunk));
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), sChunk));
-        pTxtNode = aPaM.GetNode().GetTxtNode();
-        pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+        pTextNode = aPaM.GetNode().GetTextNode();
+        pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
         CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
                        aDocStat.nCharExcludingSpaces == 13 &&
                        aDocStat.nChar == 17);
@@ -921,26 +921,26 @@ void SwDocTest::testMergePortionsDeleteNotSorted()
     SwPaM aPaM(aIdx);
     m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("  AABBCC"));
 
-    SwCharFmt *const pCharFmt(m_pDoc->MakeCharFmt("foo", 0));
-    SwFmtCharFmt const charFmt(pCharFmt);
+    SwCharFormat *const pCharFormat(m_pDoc->MakeCharFormat("foo", 0));
+    SwFormatCharFormat const charFormat(pCharFormat);
 
-    SwFmtINetFmt const inetFmt("http://example.com", "");
+    SwFormatINetFormat const inetFormat("http://example.com", "");
 
     IDocumentContentOperations & rIDCO(m_pDoc->getIDocumentContentOperations());
     aPaM.SetMark();
     aPaM.GetPoint()->nContent = 2;
     aPaM.GetMark()->nContent = 4;
-    rIDCO.InsertPoolItem(aPaM, charFmt);
+    rIDCO.InsertPoolItem(aPaM, charFormat);
     aPaM.GetPoint()->nContent = 2;
     aPaM.GetMark()->nContent = 5;
-    rIDCO.InsertPoolItem(aPaM, inetFmt);
+    rIDCO.InsertPoolItem(aPaM, inetFormat);
     aPaM.GetPoint()->nContent = 6;
     aPaM.GetMark()->nContent = 8;
-    rIDCO.InsertPoolItem(aPaM, charFmt);
+    rIDCO.InsertPoolItem(aPaM, charFormat);
     aPaM.GetPoint()->nContent = 4;
     aPaM.GetMark()->nContent = 6;
     // this triggered an STL assert in SwpHints::MergePortions()
-    rIDCO.InsertPoolItem(aPaM, charFmt);
+    rIDCO.InsertPoolItem(aPaM, charFormat);
 }
 
 //See https://bugs.libreoffice.org/show_bug.cgi?id=40599
@@ -952,34 +952,34 @@ void SwDocTest::testGraphicAnchorDeletion()
     SwPaM aPaM(aIdx);
 
     m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 1"));
-    m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+    m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
 
     m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("graphic anchor>><<graphic anchor"));
     SwNodeIndex nPara2 = aPaM.GetPoint()->nNode;
-    m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+    m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
 
     m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 3"));
 
     aPaM.GetPoint()->nNode = nPara2;
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), RTL_CONSTASCII_LENGTH("graphic anchor>>"));
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), RTL_CONSTASCII_LENGTH("graphic anchor>>"));
 
     //Insert a graphic at X of >>X<< in paragraph 2
     SfxItemSet aFlySet(m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1);
-    SwFmtAnchor aAnchor(FLY_AS_CHAR);
+    SwFormatAnchor aAnchor(FLY_AS_CHAR);
     aAnchor.SetAnchor(aPaM.GetPoint());
     aFlySet.Put(aAnchor);
-    SwFlyFrmFmt *pFrame = m_pDoc->getIDocumentContentOperations().Insert(aPaM, OUString(), OUString(), NULL, &aFlySet, NULL, NULL);
+    SwFlyFrameFormat *pFrame = m_pDoc->getIDocumentContentOperations().Insert(aPaM, OUString(), OUString(), NULL, &aFlySet, NULL, NULL);
     CPPUNIT_ASSERT_MESSAGE("Expected frame", pFrame != NULL);
 
     CPPUNIT_ASSERT_MESSAGE("Should be 1 graphic", m_pDoc->GetFlyCount(FLYCNTTYPE_GRF) == 1);
 
     //Delete >X<
     aPaM.GetPoint()->nNode = nPara2;
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(),
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(),
         RTL_CONSTASCII_LENGTH("graphic anchor>><")+1);
     aPaM.SetMark();
     aPaM.GetPoint()->nNode = nPara2;
-    aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), RTL_CONSTASCII_LENGTH("graphic anchor>"));
+    aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), RTL_CONSTASCII_LENGTH("graphic anchor>"));
     m_pDoc->getIDocumentContentOperations().DeleteRange(aPaM);
 
 #ifdef DEBUG_AS_HTML
@@ -1143,7 +1143,7 @@ translitTest(SwDoc & rDoc, SwPaM & rPaM, sal_uInt32 const nType)
     utl::TransliterationWrapper aTrans(
             ::comphelper::getProcessComponentContext(), nType);
     rDoc.getIDocumentContentOperations().TransliterateText(rPaM, aTrans);
-    return rPaM.GetTxt();
+    return rPaM.GetText();
 }
 
 void SwDocTest::testTransliterate()
@@ -1154,7 +1154,7 @@ void SwDocTest::testTransliterate()
     m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("foobar"));
     aPaM.SetMark();
     aPaM.GetPoint()->nContent = 0;
-    CPPUNIT_ASSERT_EQUAL(OUString("foobar"), aPaM.GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("foobar"), aPaM.GetText());
 
     CPPUNIT_ASSERT_EQUAL(OUString("FOOBAR"),
             translitTest(*m_pDoc, aPaM,
@@ -1223,13 +1223,13 @@ void SwDocTest::testMarkMove()
         aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
         pMarksAccess->makeMark(aPaM, OUString("Para1"), IDocumentMarkAccess::MarkType::BOOKMARK);
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 2"));
         aPaM.SetMark();
         aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
         pMarksAccess->makeMark(aPaM, OUString("Para2"), IDocumentMarkAccess::MarkType::BOOKMARK);
 
-        m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+        m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
         m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 3"));
         aPaM.SetMark();
         aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
@@ -1239,7 +1239,7 @@ void SwDocTest::testMarkMove()
     // join paragraph 2 and 3 and check
     {
         SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -2);
-        SwTxtNode& rParaNode2 = dynamic_cast<SwTxtNode&>(aIdx.GetNode());
+        SwTextNode& rParaNode2 = dynamic_cast<SwTextNode&>(aIdx.GetNode());
         rParaNode2.JoinNext();
     }
     ::sw::mark::IMark* pBM1 = pMarksAccess->findMark("Para1")->get();
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 0126b711d4d3..b1abdec46fd8 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -164,9 +164,9 @@ void Test::testLinkedGraphicRT()
         xComponent->dispose();
         mxComponent = loadFromDesktop(aTempFile.GetURL(), "com.sun.star.text.TextDocument");
 
-        SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-        CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pTxtDoc);
-        SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+        SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+        CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pTextDoc);
+        SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
         CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pDoc);
         SwNodes& aNodes = pDoc->GetNodes();
 
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx
index 52a29e2fdb91..973b8304bda1 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -28,10 +28,10 @@ class HtmlImportTest : public SwModelTestBase
 
 DECLARE_HTMLIMPORT_TEST(testPictureImport, "picture.html")
 {
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
     // The document contains two pictures stored as a link.
-    sfx2::LinkManager& rLinkManager = pTxtDoc->GetDocShell()->GetDoc()->GetEditShell()->GetLinkManager();
+    sfx2::LinkManager& rLinkManager = pTextDoc->GetDocShell()->GetDoc()->GetEditShell()->GetLinkManager();
     CPPUNIT_ASSERT_EQUAL(size_t(2), rLinkManager.GetLinks().size());
     rLinkManager.Remove(0,2);
     CPPUNIT_ASSERT_EQUAL(size_t(0), rLinkManager.GetLinks().size());
@@ -44,11 +44,11 @@ DECLARE_HTMLIMPORT_TEST(testPictureImport, "picture.html")
 
 DECLARE_HTMLIMPORT_TEST(testInlinedImage, "inlined_image.html")
 {
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
     // The document contains only one embedded picture inlined in img's src attribute.
 
-    SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+    SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
     SwEditShell* pEditShell = pDoc->GetEditShell();
     CPPUNIT_ASSERT(pEditShell);
 
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index fd9472624c6c..a3bda095bf37 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -304,9 +304,9 @@ private:
         xmlTextWriterStartDocument(pXmlWriter, NULL, NULL, NULL);
 
         // create the dump
-        SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-        CPPUNIT_ASSERT(pTxtDoc);
-        SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+        SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+        CPPUNIT_ASSERT(pTextDoc);
+        SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
         SwRootFrm* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
         pLayout->dumpAsXml(pXmlWriter);
 
@@ -327,9 +327,9 @@ protected:
 
     void calcLayout()
     {
-        SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-        CPPUNIT_ASSERT(pTxtDoc);
-        SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+        SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+        CPPUNIT_ASSERT(pTextDoc);
+        SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
         pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
     }
 
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 2c9e164bea24..42d2385387a1 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -47,9 +47,9 @@ public:
         {
             if (mnCurOutputType == text::MailMergeType::SHELL)
             {
-                SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument*>(mxMMComponent.get());
-                CPPUNIT_ASSERT(pTxtDoc);
-                pTxtDoc->GetDocShell()->DoClose();
+                SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxMMComponent.get());
+                CPPUNIT_ASSERT(pTextDoc);
+                pTextDoc->GetDocShell()->DoClose();
             }
             else
                 mxMMComponent->dispose();
@@ -235,9 +235,9 @@ protected:
 
 int MMTest::documentStartPageNumber( int document ) const
 {   // See SwMailMergeOutputPage::documentStartPageNumber() .
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* shell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* shell = pTextDoc->GetDocShell()->GetWrtShell();
     IDocumentMarkAccess* marks = shell->GetDoc()->getIDocumentMarkAccess();
     // Unfortunately, the pages are marked using UNO bookmarks, which have internals names, so they cannot be referred to by their names.
     // Assume that there are no other UNO bookmarks than the ones used by mail merge, and that they are in the sorted order.
@@ -266,9 +266,9 @@ DECLARE_SHELL_MAILMERGE_TEST(testMultiPageAnchoredDraws, "multiple-page-anchored
 {
     executeMailMerge();
 
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    sal_uInt16 nPhysPages = pTxtDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    sal_uInt16 nPhysPages = pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum();
     CPPUNIT_ASSERT_EQUAL(sal_uInt16(8), nPhysPages);
 
     uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxMMComponent, uno::UNO_QUERY);
@@ -303,8 +303,8 @@ DECLARE_FILE_MAILMERGE_TEST(testMissingDefaultLineColor, "missing-default-line-c
     uno::Reference<beans::XPropertySet> xPropertySet(xDraws->getByIndex(0), uno::UNO_QUERY);
     // Lines do not have a line color.
     CPPUNIT_ASSERT( !xPropertySet->getPropertySetInfo()->hasPropertyByName( "LineColor" ));
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
     uno::Reference< lang::XMultiServiceFactory > xFact( mxComponent, uno::UNO_QUERY );
     uno::Reference< beans::XPropertySet > xDefaults( xFact->createInstance( "com.sun.star.drawing.Defaults" ), uno::UNO_QUERY );
     CPPUNIT_ASSERT( xDefaults.is());
@@ -369,9 +369,9 @@ DECLARE_SHELL_MAILMERGE_TEST(testPageBoundariesSimpleMailMerge, "simple-mail-mer
     // SwMailMergeOutputPage::documentStartPageNumber() ).
     executeMailMerge();
     // Here getPages() works on the source document, so get pages of the resulting one.
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    CPPUNIT_ASSERT_EQUAL( sal_uInt16( 19 ), pTxtDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 10 pages, but each sub-document starts on odd page number
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    CPPUNIT_ASSERT_EQUAL( sal_uInt16( 19 ), pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 10 pages, but each sub-document starts on odd page number
     for( int doc = 0;
          doc < 10;
          ++doc )
@@ -383,9 +383,9 @@ DECLARE_SHELL_MAILMERGE_TEST(testPageBoundariesSimpleMailMerge, "simple-mail-mer
 DECLARE_SHELL_MAILMERGE_TEST(testPageBoundaries2Pages, "simple-mail-merge-2pages.odt", "10-testing-addresses.ods", "testing-addresses")
 {
     executeMailMerge();
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    CPPUNIT_ASSERT_EQUAL( sal_uInt16( 20 ), pTxtDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 20 pages, each sub-document starts on odd page number
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    CPPUNIT_ASSERT_EQUAL( sal_uInt16( 20 ), pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 20 pages, each sub-document starts on odd page number
     for( int doc = 0;
          doc < 10;
          ++doc )
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 625905da206e..4ed43afa89b4 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -331,9 +331,9 @@ DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(422), xShape->getPosition().Y); // Was -2371
 }
 
-DECLARE_ODFIMPORT_TEST(testCalcFtnCntnt, "ooo32780-1.odt")
+DECLARE_ODFIMPORT_TEST(testCalcFootnoteContent, "ooo32780-1.odt")
 {
-    //this was a CalcFtnCntnt crash
+    //this was a CalcFootnoteContent crash
 }
 
 DECLARE_ODFIMPORT_TEST(testMoveSubTree, "ooo77837-1.odt")
@@ -431,36 +431,36 @@ DECLARE_ODFIMPORT_TEST(testTdf89802, "tdf89802.fodt")
 
 DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
 {
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
 
     {
         pWrtShell->SelAll(); // Selects A1.
-        SwTxtNode& rCellEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
+        SwTextNode& rCellEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
         // fdo#72486 This was "Hello.", i.e. a single select-all selected the whole document, not just the cell only.
-        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rCellEnd.GetTxt());
+        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rCellEnd.GetText());
 
         pWrtShell->SelAll(); // Selects the whole table.
         pWrtShell->SelAll(); // Selects the whole document.
-        SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
-        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+        SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
+        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
 
-        SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
+        SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
         // This was "A1", i.e. Ctrl-A only selected the A1 cell of the table, not the whole document.
-        CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetTxt());
+        CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
     }
 
     {
         pWrtShell->SttEndDoc(false); // Go to the end of the doc.
         pWrtShell->SelAll(); // And now that we're outside of the table, try Ctrl-A again.
-        SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
+        SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
         // This was "Hello", i.e. Ctrl-A did not select the starting table.
-        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+        CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
 
-        SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
-        CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetTxt());
+        SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+        CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
     }
 
     {
@@ -468,17 +468,17 @@ DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
         // And make sure the table got deleted as well.
         SwNodes& rNodes = pWrtShell->GetDoc()->GetNodes();
         SwNodeIndex nNode(rNodes.GetEndOfExtras());
-        SwCntntNode* pCntntNode = rNodes.GoNext(&nNode);
+        SwContentNode* pContentNode = rNodes.GoNext(&nNode);
         // First content node was in a table -> table wasn't deleted.
-        CPPUNIT_ASSERT(!pCntntNode->FindTableNode());
+        CPPUNIT_ASSERT(!pContentNode->FindTableNode());
     }
 }
 
 DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
 {
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
     // Ctrl-A
     pWrtShell->SelAll(); // Selects A1.
     pWrtShell->SelAll(); // Selects the whole table.
@@ -506,46 +506,46 @@ DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
 DECLARE_ODFIMPORT_TEST(testFdo69862, "fdo69862.odt")
 {
     // The test doc is special in that it starts with a table and it also has a footnote.
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
 
     pWrtShell->SelAll(); // Selects A1.
     pWrtShell->SelAll(); // Selects the whole table.
     pWrtShell->SelAll(); // Selects the whole document.
-    SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
+    SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
     // This was "Footnote.", as Ctrl-A also selected footnotes, but it should not.
-    CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
 
-    SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
-    CPPUNIT_ASSERT_EQUAL(OUString("H" "\x01" "ello."), rEnd.GetTxt());
+    SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+    CPPUNIT_ASSERT_EQUAL(OUString("H" "\x01" "ello."), rEnd.GetText());
 }
 
 DECLARE_ODFIMPORT_TEST(testFdo69979, "fdo69979.odt")
 {
     // The test doc is special in that it starts with a table and it also has a header.
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
 
     pWrtShell->SelAll(); // Selects A1.
     pWrtShell->SelAll(); // Selects the whole table.
     pWrtShell->SelAll(); // Selects the whole document.
-    SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
+    SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
     // This was "", as Ctrl-A also selected headers, but it should not.
-    CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
 
-    SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
-    CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetTxt());
+    SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+    CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
 }
 
 DECLARE_ODFIMPORT_TEST(testSpellmenuRedline, "spellmenu-redline.odt")
 {
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
     OUString aParaText;
     uno::Reference<linguistic2::XSpellAlternatives> xAlt;
     SwSpellPopup aPopup(pWrtShell, xAlt, aParaText);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 19c079ede5ef..2f45f74bd6d1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -79,7 +79,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo68418, "fdo68418.docx")
 {
     // The problem was that in 'MSWordExportBase::SectionProperties' function in 'wrt8sty.cxx'
     // it checked if it 'IsPlausableSingleWordSection'.
-    // The 'IsPlausableSingleWordSection' compared different aspects of 2 'SwFrmFmt' objects.
+    // The 'IsPlausableSingleWordSection' compared different aspects of 2 'SwFrameFormat' objects.
     // One of the checks was 'do both formats have the same distance from the top and bottom ?'
     // This check is correct if both have headers or both don't have headers.
     // However - if one has a header, and the other one has an empty header (no header) - it is not correct to compare
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index a7f6078c6f7d..47589f6dafc0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -761,7 +761,7 @@ DECLARE_OOXMLEXPORT_TEST(testHeaderBorder, "header-border.docx")
     }
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTblpprShape, "tblppr-shape.docx")
+DECLARE_OOXMLEXPORT_TEST(testTablepprShape, "tblppr-shape.docx")
 {
     // Unhandled exception due to unexpected w:tblpPr resulted in not importing page size, either.
     uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2014bc870df4..66b844005f03 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1366,7 +1366,7 @@ DECLARE_OOXMLIMPORT_TEST(testTableWidth, "table_width.docx")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty<sal_Int32>(xFrames->getByIndex(0), "FrameWidthPercent"));
 }
 
-DECLARE_OOXMLIMPORT_TEST(testConditionalstylesTbllook, "conditionalstyles-tbllook.docx")
+DECLARE_OOXMLIMPORT_TEST(testConditionalstylesTablelook, "conditionalstyles-tbllook.docx")
 {
     uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
     uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b42f05cd3f56..da6fdb5235ec 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -125,7 +125,7 @@ void SwTiledRenderingTest::testPostKeyEvent()
     pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0);
     pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0);
     // Did we manage to insert the character after the first one?
-    CPPUNIT_ASSERT_EQUAL(OUString("Axaa bbb."), pShellCrsr->GetPoint()->nNode.GetNode().GetTxtNode()->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("Axaa bbb."), pShellCrsr->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
 }
 
 void SwTiledRenderingTest::testPostMouseEvent()
@@ -155,19 +155,19 @@ void SwTiledRenderingTest::testSetTextSelection()
     pWrtShell->SelWrd();
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
     // Did we indeed manage to select the second word?
-    CPPUNIT_ASSERT_EQUAL(OUString("bbb"), pShellCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("bbb"), pShellCrsr->GetText());
 
     // Now use setTextSelection() to move the start of the selection 1000 twips left.
     Point aStart = pShellCrsr->GetSttPos();
     aStart.setX(aStart.getX() - 1000);
     pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_START, aStart.getX(), aStart.getY());
     // The new selection must include the first word, too -- but not the ending dot.
-    CPPUNIT_ASSERT_EQUAL(OUString("Aaa bbb"), pShellCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("Aaa bbb"), pShellCrsr->GetText());
 
     // Next: test that LOK_SETTEXTSELECTION_RESET + LOK_SETTEXTSELECTION_END can be used to create a selection.
     pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_RESET, aStart.getX(), aStart.getY());
     pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_END, aStart.getX() + 1000, aStart.getY());
-    CPPUNIT_ASSERT_EQUAL(OUString("Aaa b"), pShellCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("Aaa b"), pShellCrsr->GetText());
 }
 
 void SwTiledRenderingTest::testSetGraphicSelection()
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index e8ffdd78b976..43aeb6317661 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -143,18 +143,18 @@ SwDoc* SwUiWriterTest::createDoc(const char* pName)
         pName = "empty.odt";
     load(DATA_DIRECTORY, pName);
 
-    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
-    CPPUNIT_ASSERT(pTxtDoc);
-    return pTxtDoc->GetDocShell()->GetDoc();
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    return pTextDoc->GetDocShell()->GetDoc();
 }
 
 //Replacement tests
 
 static void lcl_selectCharacters(SwPaM& rPaM, sal_Int32 first, sal_Int32 end)
 {
-    rPaM.GetPoint()->nContent.Assign(rPaM.GetCntntNode(), first);
+    rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), first);
     rPaM.SetMark();
-    rPaM.GetPoint()->nContent.Assign(rPaM.GetCntntNode(), end);
+    rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), end);
 }
 
 static const OUString ORIGINAL_REPLACE_CONTENT("toto titi tutu");
@@ -171,15 +171,15 @@ void SwUiWriterTest::testReplaceForward()
 
     pDoc->getIDocumentContentOperations().InsertString(aPaM, ORIGINAL_REPLACE_CONTENT);
 
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
     lcl_selectCharacters(aPaM, 5, 9);
     pDoc->getIDocumentContentOperations().ReplaceRange(aPaM, OUString("toto"), false);
 
-    CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTxtNode->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTextNode->GetText());
 
     rUndoManager.Undo();
 
-    CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTxtNode->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTextNode->GetText());
 }
 
 void SwUiWriterTest::testFdo75110()
@@ -220,16 +220,16 @@ void SwUiWriterTest::testReplaceBackward()
     SwPaM aPaM(aIdx);
 
     pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("toto titi tutu"));
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
     lcl_selectCharacters(aPaM, 9, 5);
 
     pDoc->getIDocumentContentOperations().ReplaceRange(aPaM, OUString("toto"), false);
 
-    CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTxtNode->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTextNode->GetText());
 
     rUndoManager.Undo();
 
-    CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTxtNode->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTextNode->GetText());
 }
 
 void SwUiWriterTest::testFdo69893()
@@ -241,9 +241,9 @@ void SwUiWriterTest::testFdo69893()
     pWrtShell->SelAll(); // Selects the whole document.
 
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
-    SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
+    SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
     // Selection did not include the para after table, this was "B1".
-    CPPUNIT_ASSERT_EQUAL(OUString("Para after table."), rEnd.GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("Para after table."), rEnd.GetText());
 }
 
 void SwUiWriterTest::testFdo70807()
@@ -292,8 +292,8 @@ void SwUiWriterTest::testImportRTF()
     CPPUNIT_ASSERT_EQUAL(sal_uLong(0), aReader.Read(*pRTFReader));
 
     sal_uLong nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
-    CPPUNIT_ASSERT_EQUAL(OUString("fooHello world!"), pDoc->GetNodes()[nIndex - 1]->GetTxtNode()->GetTxt());
-    CPPUNIT_ASSERT_EQUAL(OUString("bar"), pDoc->GetNodes()[nIndex]->GetTxtNode()->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("fooHello world!"), pDoc->GetNodes()[nIndex - 1]->GetTextNode()->GetText());
+    CPPUNIT_ASSERT_EQUAL(OUString("bar"), pDoc->GetNodes()[nIndex]->GetTextNode()->GetText());
 }
 
 void SwUiWriterTest::testExportRTF()
@@ -339,13 +339,13 @@ void SwUiWriterTest::testFdo74981()
     // create a document with an input field
     SwDoc* pDoc = createDoc();
     SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-    SwInputField aField(static_cast<SwInputFieldType*>(pWrtShell->GetFldType(0, RES_INPUTFLD)), OUString("foo"), OUString("bar"), 0, 0);
+    SwInputField aField(static_cast<SwInputFieldType*>(pWrtShell->GetFieldType(0, RES_INPUTFLD)), OUString("foo"), OUString("bar"), 0, 0);
     pWrtShell->Insert(aField);
 
     // expect hints
     SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
-    SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT(pTxtNode->HasHints());
+    SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
+    CPPUNIT_ASSERT(pTextNode->HasHints());
 
     // go to the begin of the paragraph and split this node
     pWrtShell->Left(CRSR_SKIP_CHARS, false, 100, false);
@@ -353,11 +353,11 @@ void SwUiWriterTest::testFdo74981()
 
     // expect only the second paragraph to have hints
     aIdx = SwNodeIndex(pDoc->GetNodes().GetEndOfContent(), -1);
-    pTxtNode = aIdx.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT(pTxtNode->HasHints());
+    pTextNode = aIdx.GetNode().GetTextNode();
+    CPPUNIT_ASSERT(pTextNode->HasHints());
     --aIdx;
-    pTxtNode = aIdx.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT(!pTxtNode->HasHints());
+    pTextNode = aIdx.GetNode().GetTextNode();
+    CPPUNIT_ASSERT(!pTextNode->HasHints());
 }
 
 void SwUiWriterTest::testShapeTextboxSelect()
@@ -368,14 +368,14 @@ void SwUiWriterTest::testShapeTextboxSelect()
     SdrObject* pObject = pPage->GetObj(1);
     SwContact* pTextBox = static_cast<SwContact*>(pObject->GetUserCall());
     // First, make sure that pTextBox is a fly frame (textbox of a shape).
-    CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, static_cast<RES_FMT>(pTextBox->GetFmt()->Which()));
+    CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, static_cast<RES_FMT>(pTextBox->GetFormat()->Which()));
 
     // Then select it.
     pWrtShell->SelectObj(Point(), 0, pObject);
     const SdrMarkList& rMarkList = pWrtShell->GetDrawView()->GetMarkedObjectList();
     SwDrawContact* pShape = static_cast<SwDrawContact*>(rMarkList.GetMark(0)->GetMarkedSdrObj()->GetUserCall());
     // And finally make sure the shape got selected, not just the textbox itself.
-    CPPUNIT_ASSERT_EQUAL(RES_DRAWFRMFMT, static_cast<RES_FMT>(pShape->GetFmt()->Which()));
+    CPPUNIT_ASSERT_EQUAL(RES_DRAWFRMFMT, static_cast<RES_FMT>(pShape->GetFormat()->Which()));
 }
 
 void SwUiWriterTest::testShapeTextboxDelete()
@@ -400,22 +400,22 @@ void SwUiWriterTest::testCp1000071()
     SwDoc* pDoc = createDoc("cp1000071.odt");
     SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 
-    const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-    CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTbl.size());
-    sal_uLong redlineStart0NodeIndex = rTbl[ 0 ]->Start()->nNode.GetIndex();
-    sal_Int32 redlineStart0Index = rTbl[ 0 ]->Start()->nContent.GetIndex();
-    sal_uLong redlineEnd0NodeIndex = rTbl[ 0 ]->End()->nNode.GetIndex();
-    sal_Int32 redlineEnd0Index = rTbl[ 0 ]->End()->nContent.GetIndex();
-    sal_uLong redlineStart1NodeIndex = rTbl[ 1 ]->Start()->nNode.GetIndex();
-    sal_Int32 redlineStart1Index = rTbl[ 1 ]->Start()->nContent.GetIndex();
-    sal_uLong redlineEnd1NodeIndex = rTbl[ 1 ]->End()->nNode.GetIndex();
-    sal_Int32 redlineEnd1Index = rTbl[ 1 ]->End()->nContent.GetIndex();
+    const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+    CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTable.size());
+    sal_uLong redlineStart0NodeIndex = rTable[ 0 ]->Start()->nNode.GetIndex();
+    sal_Int32 redlineStart0Index = rTable[ 0 ]->Start()->nContent.GetIndex();
+    sal_uLong redlineEnd0NodeIndex = rTable[ 0 ]->End()->nNode.GetIndex();
+    sal_Int32 redlineEnd0Index = rTable[ 0 ]->End()->nContent.GetIndex();
+    sal_uLong redlineStart1NodeIndex = rTable[ 1 ]->Start()->nNode.GetIndex();
+    sal_Int32 redlineStart1Index = rTable[ 1 ]->Start()->nContent.GetIndex();
+    sal_uLong redlineEnd1NodeIndex = rTable[ 1 ]->End()->nNode.GetIndex();
+    sal_Int32 redlineEnd1Index = rTable[ 1 ]->End()->nContent.GetIndex();
 
     // Change the document layout to be 2 columns, and then undo.
     pWrtShell->SelAll();
     SwSectionData section(CONTENT_SECTION, pWrtShell->GetUniqueSectionName());
     SfxItemSet set( pDoc->GetDocShell()->GetPool(), RES_COL, RES_COL, 0 );
-    SwFmtCol col;
+    SwFormatCol col;
     col.Init( 2, 0, 10000 );
     set.Put( col );
     pWrtShell->InsertSection( section, &set );
@@ -423,15 +423,15 @@ void SwUiWriterTest::testCp1000071()
     rUndoManager.Undo();
 
     // Check that redlines are the same like at the beginning.
-    CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTbl.size());
-    CPPUNIT_ASSERT_EQUAL( redlineStart0NodeIndex, rTbl[ 0 ]->Start()->nNode.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineStart0Index, rTbl[ 0 ]->Start()->nContent.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineEnd0NodeIndex, rTbl[ 0 ]->End()->nNode.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineEnd0Index, rTbl[ 0 ]->End()->nContent.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineStart1NodeIndex, rTbl[ 1 ]->Start()->nNode.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineStart1Index, rTbl[ 1 ]->Start()->nContent.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineEnd1NodeIndex, rTbl[ 1 ]->End()->nNode.GetIndex());
-    CPPUNIT_ASSERT_EQUAL( redlineEnd1Index, rTbl[ 1 ]->End()->nContent.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTable.size());
+    CPPUNIT_ASSERT_EQUAL( redlineStart0NodeIndex, rTable[ 0 ]->Start()->nNode.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineStart0Index, rTable[ 0 ]->Start()->nContent.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineEnd0NodeIndex, rTable[ 0 ]->End()->nNode.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineEnd0Index, rTable[ 0 ]->End()->nContent.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineStart1NodeIndex, rTable[ 1 ]->Start()->nNode.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineStart1Index, rTable[ 1 ]->Start()->nContent.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineEnd1NodeIndex, rTable[ 1 ]->End()->nNode.GetIndex());
+    CPPUNIT_ASSERT_EQUAL( redlineEnd1Index, rTable[ 1 ]->End()->nContent.GetIndex());
 }
 
 void SwUiWriterTest::testShapeTextboxVertadjust()
@@ -439,9 +439,9 @@ void SwUiWriterTest::testShapeTextboxVertadjust()
     SwDoc* pDoc = createDoc("shape-textbox-vertadjust.odt");
     SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
     SdrObject* pObject = pPage->GetObj(1);
-    SwFrmFmt* pFmt = static_cast<SwContact*>(pObject->GetUserCall())->GetFmt();
+    SwFrameFormat* pFormat = static_cast<SwContact*>(pObject->GetUserCall())->GetFormat();
     // This was SDRTEXTVERTADJUST_TOP.
-    CPPUNIT_ASSERT_EQUAL(SDRTEXTVERTADJUST_CENTER, pFmt->GetTextVertAdjust().GetValue());
+    CPPUNIT_ASSERT_EQUAL(SDRTEXTVERTADJUST_CENTER, pFormat->GetTextVertAdjust().GetValue());
 }
 
 void SwUiWriterTest::testShapeTextboxAutosize()
@@ -464,7 +464,7 @@ void SwUiWriterTest::testFdo82191()
 {
     SwDoc* pDoc = createDoc("fdo82191.odt");
     SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
-    std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+    std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
     // Make sure we have a single draw shape.
     CPPUNIT_ASSERT_EQUAL(sal_Int32(1), SwTextBoxHelper::getCount(pPage, aTextBoxes));
 
@@ -531,8 +531,8 @@ void SwUiWriterTest::testChineseConversionBlank()
 
 
     // Then
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT_EQUAL(OUString(), pTxtNode->GetTxt());
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+    CPPUNIT_ASSERT_EQUAL(OUString(), pTextNode->GetText());
 
 }
 
@@ -557,8 +557,8 @@ void SwUiWriterTest::testChineseConversionNonChineseText()
 
 
     // Then
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT_EQUAL(NON_CHINESE_CONTENT, pTxtNode->GetTxt());
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+    CPPUNIT_ASSERT_EQUAL(NON_CHINESE_CONTENT, pTextNode->GetText());
 
 }
 
@@ -583,8 +583,8 @@ void SwUiWriterTest::testChineseConversionTraditionalToSimplified()
 
 
     // Then
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT_EQUAL(CHINESE_SIMPLIFIED_CONTENT, pTxtNode->GetTxt());
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+    CPPUNIT_ASSERT_EQUAL(CHINESE_SIMPLIFIED_CONTENT, pTextNode->GetText());
 
 }
 
@@ -609,8 +609,8 @@ void SwUiWriterTest::testChineseConversionSimplifiedToTraditional()
 
 
     // Then
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT_EQUAL(CHINESE_TRADITIONAL_CONTENT, pTxtNode->GetTxt());
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+    CPPUNIT_ASSERT_EQUAL(CHINESE_TRADITIONAL_CONTENT, pTextNode->GetText());
 
 }
 
@@ -648,7 +648,7 @@ void SwUiWriterTest::testAutoCorr()
     pWrtShell->Insert("tset");
     pWrtShell->AutoCorrect(corr, cIns);
     sal_uLong nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
-    CPPUNIT_ASSERT_EQUAL(OUString("Test "), static_cast<SwTxtNode*>(pDoc->GetNodes()[nIndex])->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("Test "), static_cast<SwTextNode*>(pDoc->GetNodes()[nIndex])->GetText());
 
     //AutoCorrect with change style to bolt
     pWrtShell->Insert("Bolt");
@@ -830,8 +830,8 @@ void SwUiWriterTest::testTdf68183()
 
     SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
     SwPaM aPaM(aIdx);
-    SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-    CPPUNIT_ASSERT_EQUAL(false, pTxtNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
+    SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+    CPPUNIT_ASSERT_EQUAL(false, pTextNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
 
     // Then enable storing of RSID and make sure that the attribute is inserted.
     SW_MOD()->GetModuleConfig()->SetStoreRsid(true);
@@ -839,7 +839,7 @@ void SwUiWriterTest::testTdf68183()
     pWrtShell->DelToStartOfLine();
     pWrtShell->Insert2("X");
 
-    CPPUNIT_ASSERT_EQUAL(true, pTxtNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
+    CPPUNIT_ASSERT_EQUAL(true, pTextNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
 }
 
 void SwUiWriterTest::testCp1000115()
@@ -888,14 +888,14 @@ void SwUiWriterTest::testSearchWithTransliterate()
     //transliteration option set so that at least one of the search strings is not found
     sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY,false);
     SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(true);
-    CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetText());
     CPPUNIT_ASSERT_EQUAL(0,(int)case1);
     SearchOpt.searchString = "paragraph";
     SearchOpt.transliterateFlags = com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
     //transliteration option set so that all search strings are found
     sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY,false);
     pShellCrsr = pWrtShell->getShellCrsr(true);
-    CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCrsr->GetText());
     CPPUNIT_ASSERT_EQUAL(1,(int)case2);
 }
 
@@ -933,13 +933,13 @@ void SwUiWriterTest::testUndoCharAttribute()
         pCrsr->Move(fnMoveBackward);
     }
     // Check that correct text was selected
-    CPPUNIT_ASSERT_EQUAL(OUString("be bolded"), pCrsr->GetTxt());
+    CPPUNIT_ASSERT_EQUAL(OUString("be bolded"), pCrsr->GetText());
     // Apply a "Bold" attribute to selection
     SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
     rIDCO.InsertPoolItem(*pCrsr, aWeightItem);
     SfxItemSet aSet( pDoc->GetAttrPool(), RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT);
     // Adds selected text's attributes to aSet
-    pCrsr->GetNode().GetTxtNode()->GetAttr(aSet, 10, 19);
+    pCrsr->GetNode().GetTextNode()->GetAttr(aSet, 10, 19);
     SfxPoolItem const * aPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
     SfxPoolItem& ampPoolItem = aWeightItem;
     // Check that bold is active on the selection; checks if it's in aSet
@@ -948,7 +948,7 @@ void SwUiWriterTest::testUndoCharAttribute()
     rUndoManager.Undo();
     // Check that bold is no longer active
     aSet.ClearItem(RES_CHRATR_WEIGHT);
-    pCrsr->GetNode().GetTxtNode()->GetAttr(aSet, 10, 19);
+    pCrsr->GetNode().GetTextNode()->GetAttr(aSet, 10, 19);
     aPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
     CPPUNIT_ASSERT_EQUAL((*aPoolItem == ampPoolItem), false);
 }
@@ -957,8 +957,8 @@ void SwUiWriterTest::testTdf86639()
 {
     SwDoc* pDoc = createDoc("tdf86639.rtf");
     SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-    SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName("Heading");
-    pWrtShell->SetTxtFmtColl(pColl);
+    SwTextFormatColl* pColl = pDoc->FindTextFormatCollByName("Heading");
+    pWrtShell->SetTextFormatColl(pColl);
     OUString aExpected = pColl->GetAttrSet().GetFont().GetFamilyName();
     // This was Calibri, should be Liberation Sans.
     CPPUNIT_ASSERT_EQUAL(aExpected, getProperty<OUString>(getRun(getParagraph(1), 1), "CharFontName"));
@@ -970,7 +970,7 @@ void SwUiWriterTest::testTdf90883TableBoxGetCoordinates()
     SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
     pWrtShell->Down(true);
     SwSelBoxes aBoxes;
-    ::GetTblSel( *pWrtShell, aBoxes );
+    ::GetTableSel( *pWrtShell, aBoxes );
     CPPUNIT_ASSERT_EQUAL( 2, (int)aBoxes.size() );
     Point pos ( aBoxes[0]->GetCoordinates() );
     CPPUNIT_ASSERT_EQUAL( 1, (int)pos.X() );
diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py
index 95db0b4281b4..f31ac913105b 100644
--- a/sw/qa/python/check_table.py
+++ b/sw/qa/python/check_table.py
@@ -246,7 +246,7 @@ class CheckTable(unittest.TestCase):
         xAnchor = xTable.getAnchor()
 
     # check all properties on the anchor - shouldn't crash despite
-    # pointing to a non-SwTxtNode
+    # pointing to a non-SwTextNode
         xPropsInfo = xAnchor.getPropertySetInfo()
         for i in xPropsInfo.getProperties():
             try:
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 9e3189f8653a..6080438fcd1d 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -55,7 +55,7 @@ interface BaseText
     SID_ATTR_BRUSH_CHAR // status()
     [
         ExecMethod = Execute ;
-        StateMethod = GetTxtCtrlState ;
+        StateMethod = GetTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
@@ -1180,26 +1180,26 @@ interface BaseText
     ]
     SID_ATTR_PARA_SPLIT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_KEEP // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_WIDOWS // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_ORPHANS // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_PAGEBREAK // status(final|play)
@@ -1271,49 +1271,49 @@ interface BaseText
     ]
     SID_ATTR_PARA_HYPHENZONE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_RELIEF
     [
-        ExecMethod = ExecTxtCtrl ;
+        ExecMethod = ExecTextCtrl ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_FONT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_FONT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_FONT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_FONTHEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_FONTHEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_FONTHEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_COLOR_BACKGROUND // status()
@@ -1342,68 +1342,68 @@ interface BaseText
     ]
     SID_ATTR_CHAR_COLOR // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_WEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_WEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_WEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_POSTURE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_POSTURE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_POSTURE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_UNDERLINE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_OVERLINE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_FLASH // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_STRIKEOUT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_UNDERLINE_DOUBLE // status(final|play)
@@ -1414,26 +1414,26 @@ interface BaseText
     ]
     SID_ATTR_CHAR_CONTOUR // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_SHADOWED // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_AUTOKERN // // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_ESCAPEMENT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_SET_SUPER_SCRIPT
@@ -1450,20 +1450,20 @@ interface BaseText
     ]
     SID_ATTR_CHAR_CASEMAP // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_LANGUAGE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_KERNING // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_CHAR_DLG // status(final|play)
@@ -1484,8 +1484,8 @@ interface BaseText
     ]
     SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState ;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_GROW_FONT_SIZE // status(final|play)
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 53ed9110ef09..4bdcea5e7135 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -159,49 +159,49 @@ interface TextDrawText
     SID_ATTR_CHAR_WEIGHT // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_POSTURE // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_UNDERLINE // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_OVERLINE // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_CONTOUR
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_SHADOWED
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_STRIKEOUT
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
@@ -473,7 +473,7 @@ interface TextDrawText
     SID_AUTOSPELL_CHECK
     [
         ExecMethod = Execute;
-        StateMethod = GetDrawTxtCtrlState
+        StateMethod = GetDrawTextCtrlState
     ]
 
     SID_SEARCH_DLG
@@ -622,13 +622,13 @@ interface TextDrawText
     FN_GROW_FONT_SIZE
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_SHRINK_FONT_SIZE
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 }
@@ -639,57 +639,57 @@ interface TextDrawFont
     SID_ATTR_CHAR_FONT // status()
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_FONTHEIGHT // status()
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_COLOR // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_RELIEF
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_LANGUAGE // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_KERNING // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_AUTOKERN // // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_ESCAPEMENT // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
diff --git a/sw/sdi/switems.sdi b/sw/sdi/switems.sdi
index c00514fbc736..e0dd9ee1b259 100644
--- a/sw/sdi/switems.sdi
+++ b/sw/sdi/switems.sdi
@@ -24,9 +24,9 @@ struct SwLineNumber
     BOOL    CountLines          MID_LINENUMBER_COUNT;
     INT32   StartValue          MID_LINENUMBER_STARTVALUE;
 };
-item SwLineNumber SwFmtLineNumber;
+item SwLineNumber SwFormatLineNumber;
 
-struct INetFmt
+struct INetFormat
 {
     String      URL             MID_URL_URL;
     String      Target          MID_URL_TARGET;
@@ -34,7 +34,7 @@ struct INetFmt
     String      VisitedFormat   MID_URL_VISITED_FMT;
     String      UnvisitedFormat MID_URL_UNVISITED_FMT;
 };
-item INetFmt SwFmtINetFmt;
+item INetFormat SwFormatINetFormat;
 
 struct Drop
 {
@@ -44,7 +44,7 @@ struct Drop
     BOOL    WholeWord   MID_DROPCAP_WHOLE_WORD;
 //    String  Style       MID_DROPCAP_CHAR_STYLE_NAME;
 };
-item Drop SwFmtDrop;
+item Drop SwFormatDrop;
 
 struct Envelope
 {
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index c7d9dfdda9e3..76987c789f3b 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -1846,7 +1846,7 @@ SfxVoidItem FormatColumns FN_FORMAT_COLUMN
     GroupId = GID_FORMAT;
 ]
 
-SwFmtDrop FormatDropcap FN_FORMAT_DROPCAPS
+SwFormatDrop FormatDropcap FN_FORMAT_DROPCAPS
 
 [
     /* flags: */
@@ -8785,7 +8785,7 @@ SfxUInt16Item NumNewStartAt FN_NUMBER_NEWSTART_AT
     GroupId = GID_FORMAT;
 ]
 
-SwFmtLineNumber LineNumber FN_FORMAT_LINENUMBER
+SwFormatLineNumber LineNumber FN_FORMAT_LINENUMBER
 
 [
     /* flags: */
@@ -8887,7 +8887,7 @@ SfxVoidItem JumpToFootnoteArea FN_TO_FOOTNOTE_AREA
     GroupId = GID_NAVIGATOR;
 ]
 
-SwFmtINetFmt HyperlinkAttributes FN_TXTATR_INET
+SwFormatINetFormat HyperlinkAttributes FN_TXTATR_INET
 
 [
     /* flags: */
diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi
index f2f635e6d643..4df069ef3087 100644
--- a/sw/sdi/tabsh.sdi
+++ b/sw/sdi/tabsh.sdi
@@ -33,13 +33,13 @@ interface TextTable : BaseTextTable
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 /*
-    SvxFmtSplitItem TableSplit SID_ATTR_PARA_SPLIT // status(final|play)
+    SvxFormatSplitItem TableSplit SID_ATTR_PARA_SPLIT // status(final|play)
     [
         ExecMethod = Execute;
         StateMethod = GetState;
         GroupId = GID_TABLE ;
     ]
-    SvxFmtKeepItem TableKeepTogether SID_ATTR_PARA_KEEP // status(final|play)
+    SvxFormatKeepItem TableKeepTogether SID_ATTR_PARA_KEEP // status(final|play)
     [
         ExecMethod = Execute;
         StateMethod = GetState;
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index a8821bbbec2d..ff59bddf23f8 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -25,16 +25,16 @@
 #include <IDocumentListItems.hxx>
 #include <doc.hxx>
 
-SwNodeNum::SwNodeNum( SwTxtNode* pTxtNode )
+SwNodeNum::SwNodeNum( SwTextNode* pTextNode )
     : SwNumberTreeNode(),
-      mpTxtNode( pTxtNode ),
+      mpTextNode( pTextNode ),
       mpNumRule( 0 )
 {
 }
 
 SwNodeNum::SwNodeNum( SwNumRule* pNumRule )
     : SwNumberTreeNode(),
-      mpTxtNode( 0 ),
+      mpTextNode( 0 ),
       mpNumRule( pNumRule )
 {
 }
@@ -47,26 +47,26 @@ SwNodeNum::~SwNodeNum()
 
 void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule )
 {
-    OSL_ENSURE( GetNumRule() && GetTxtNode(),
+    OSL_ENSURE( GetNumRule() && GetTextNode(),
             "<SwNodeNum::ChangeNumRule(..)> - missing list style and/or text node. Serious defect -> please informm OD." );
-    if ( GetNumRule() && GetTxtNode() )
+    if ( GetNumRule() && GetTextNode() )
     {
-        GetNumRule()->RemoveTxtNode( *(GetTxtNode()) );
+        GetNumRule()->RemoveTextNode( *(GetTextNode()) );
     }
 
     mpNumRule = &rNumRule;
 
-    if ( GetNumRule() && GetTxtNode() )
+    if ( GetNumRule() && GetTextNode() )
     {
-        GetNumRule()->AddTxtNode( *(GetTxtNode()) );
+        GetNumRule()->AddTextNode( *(GetTextNode()) );
     }
 }
 
 SwPosition SwNodeNum::GetPosition() const
 {
-    OSL_ENSURE( GetTxtNode(),
+    OSL_ENSURE( GetTextNode(),
             "<SwNodeNum::GetPosition()> - no text node set at <SwNodeNum> instance" );
-    return SwPosition(*mpTxtNode);
+    return SwPosition(*mpTextNode);
 }
 
 SwNumberTreeNode * SwNodeNum::Create() const
@@ -78,45 +78,45 @@ SwNumberTreeNode * SwNodeNum::Create() const
 
 void SwNodeNum::PreAdd()
 {
-    OSL_ENSURE( GetTxtNode(),
+    OSL_ENSURE( GetTextNode(),
             "<SwNodeNum::PreAdd()> - no text node set at <SwNodeNum> instance" );
-    if ( !GetNumRule() && GetTxtNode() )
+    if ( !GetNumRule() && GetTextNode() )
     {
-        mpNumRule = GetTxtNode()->GetNumRule();
+        mpNumRule = GetTextNode()->GetNumRule();
     }
     OSL_ENSURE( GetNumRule(),
             "<SwNodeNum::PreAdd()> - no list style set at <SwNodeNum> instance" );
-    if ( GetNumRule() && GetTxtNode() )
+    if ( GetNumRule() && GetTextNode() )
     {
-        GetNumRule()->AddTxtNode( *(GetTxtNode()) );
+        GetNumRule()->AddTextNode( *(GetTextNode()) );
     }
 
     {
-        if ( GetTxtNode() &&
-             GetTxtNode()->GetNodes().IsDocNodes() )
+        if ( GetTextNode() &&
+             GetTextNode()->GetNodes().IsDocNodes() )
         {
-            GetTxtNode()->getIDocumentListItems().addListItem( *this );
+            GetTextNode()->getIDocumentListItems().addListItem( *this );
         }
     }
 }
 
 void SwNodeNum::PostRemove()
 {
-    OSL_ENSURE( GetTxtNode(),
+    OSL_ENSURE( GetTextNode(),
             "<SwNodeNum::PostRemove()> - no text node set at <SwNodeNum> instance" );
     OSL_ENSURE( GetNumRule(),
             "<SwNodeNum::PostRemove()> - no list style set at <SwNodeNum> instance" );
 
-    if ( GetTxtNode() )
+    if ( GetTextNode() )
     {
-        GetTxtNode()->getIDocumentListItems().removeListItem( *this );
+        GetTextNode()->getIDocumentListItems().removeListItem( *this );
     }
 
     if ( GetNumRule() )
     {
-        if ( GetTxtNode() )
+        if ( GetTextNode() )
         {
-            GetNumRule()->RemoveTxtNode( *(GetTxtNode()) );
+            GetNumRule()->RemoveTextNode( *(GetTextNode()) );
         }
         mpNumRule = 0;
     }
@@ -126,8 +126,8 @@ bool SwNodeNum::IsNotifiable() const
 {
     bool aResult = true;
 
-    if ( GetTxtNode() )
-        aResult = GetTxtNode()->IsNotifiable();
+    if ( GetTextNode() )
+        aResult = GetTextNode()->IsNotifiable();
 
     return aResult;
 }
@@ -136,8 +136,8 @@ bool SwNodeNum::IsNotificationEnabled() const
 {
     bool aResult = true;
 
-    if ( GetTxtNode() )
-        aResult = GetTxtNode()->IsNotificationEnabled();
+    if ( GetTextNode() )
+        aResult = GetTextNode()->IsNotificationEnabled();
 
     return aResult;
 }
@@ -167,11 +167,11 @@ bool SwNodeNum::IsCounted() const
 {
     bool aResult = false;
 
-    if ( GetTxtNode() )
+    if ( GetTextNode() )
     {
         // #i59559#
-        // <SwTxtNode::IsCounted()> determines, if a text node is counted for numbering
-        aResult = GetTxtNode()->IsCountedInList();
+        // <SwTextNode::IsCounted()> determines, if a text node is counted for numbering
+        aResult = GetTextNode()->IsCountedInList();
     }
     else
         aResult = SwNumberTreeNode::IsCounted();
@@ -208,18 +208,18 @@ bool SwNodeNum::IsCountedForNumbering() const
 {
     return IsCounted() &&
            ( IsPhantom() ||                 // phantoms
-             !GetTxtNode() ||               // root node
-             GetTxtNode()->HasNumber() ||   // text node
-             GetTxtNode()->HasBullet() );   // text node
+             !GetTextNode() ||               // root node
+             GetTextNode()->HasNumber() ||   // text node
+             GetTextNode()->HasBullet() );   // text node
 }
 
 void SwNodeNum::NotifyNode()
 {
     ValidateMe();
 
-    if (mpTxtNode)
+    if (mpTextNode)
     {
-        mpTxtNode->NumRuleChgd();
+        mpTextNode->NumRuleChgd();
     }
 }
 
@@ -228,13 +228,13 @@ bool SwNodeNum::LessThan(const SwNumberTreeNode & rNode) const
     bool bResult = false;
     const SwNodeNum & rTmpNode = static_cast<const SwNodeNum &>(rNode);
 
-    if (mpTxtNode == NULL && rTmpNode.mpTxtNode != NULL)
+    if (mpTextNode == NULL && rTmpNode.mpTextNode != NULL)
         bResult = true;
-    else if (mpTxtNode != NULL && rTmpNode.mpTxtNode != NULL)
+    else if (mpTextNode != NULL && rTmpNode.mpTextNode != NULL)
     {
         // #i83479# - refactoring
         // simplify comparison by comparing the indexes of the text nodes
-        bResult = ( mpTxtNode->GetIndex() < rTmpNode.mpTxtNode->GetIndex() );
+        bResult = ( mpTextNode->GetIndex() < rTmpNode.mpTextNode->GetIndex() );
     }
 
     return bResult;
@@ -244,9 +244,9 @@ bool SwNodeNum::IsRestart() const
 {
     bool bIsRestart = false;
 
-    if ( GetTxtNode() )
+    if ( GetTextNode() )
     {
-        bIsRestart = GetTxtNode()->IsListRestart();
+        bIsRestart = GetTextNode()->IsListRestart();
     }
 
     return bIsRestart;
@@ -273,9 +273,9 @@ SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const
 {
     SwNumberTree::tSwNumTreeNumber aResult = 1;
 
-    if ( IsRestart() && GetTxtNode() )
+    if ( IsRestart() && GetTextNode() )
     {
-        aResult = GetTxtNode()->GetActualListStartValue();
+        aResult = GetTextNode()->GetActualListStartValue();
     }
     else
     {
@@ -287,10 +287,10 @@ SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const
 
             if (nLevel >= 0 && nLevel < MAXLEVEL)
             {
-                const SwNumFmt * pFmt = pRule->GetNumFmt( static_cast<sal_uInt16>(nLevel));
+                const SwNumFormat * pFormat = pRule->GetNumFormat( static_cast<sal_uInt16>(nLevel));
 
-                if (pFmt)
-                    aResult = pFmt->GetStart();
+                if (pFormat)
+                    aResult = pFormat->GetStart();
             }
         }
     }
@@ -343,10 +343,10 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
 
     if ( !bIsPhantom )
     {
-        SwTxtNode* pTxtNode( rNodeNum.GetTxtNode() );
-        if ( pTxtNode )
+        SwTextNode* pTextNode( rNodeNum.GetTextNode() );
+        if ( pTextNode )
         {
-            pTxtNode->RemoveFromList();
+            pTextNode->RemoveFromList();
             // --> clear all list attributes and the list style
             std::set<sal_uInt16> aResetAttrsArray;
             aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_ID );
@@ -355,8 +355,8 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
             aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_RESTARTVALUE );
             aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_ISCOUNTED );
             aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_NUMRULE );
-            SwPaM aPam( *pTxtNode );
-            pTxtNode->GetDoc()->ResetAttrs( aPam, false,
+            SwPaM aPam( *pTextNode );
+            pTextNode->GetDoc()->ResetAttrs( aPam, false,
                                             aResetAttrsArray,
                                             false );
         }
@@ -364,17 +364,17 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
 }
 
 // #i81002#
-const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const
+const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTextNode& rTextNode ) const
 {
     const SwNodeNum* pPrecedingNodeNum( 0 );
 
     // #i83479#
-    SwNodeNum aNodeNumForTxtNode( const_cast<SwTxtNode*>(&rTxtNode) );
+    SwNodeNum aNodeNumForTextNode( const_cast<SwTextNode*>(&rTextNode) );
 
     pPrecedingNodeNum = dynamic_cast<const SwNodeNum*>(
                             GetRoot()
-                            ? GetRoot()->GetPrecedingNodeOf( aNodeNumForTxtNode )
-                            : GetPrecedingNodeOf( aNodeNumForTxtNode ) );
+                            ? GetRoot()->GetPrecedingNodeOf( aNodeNumForTextNode )
+                            : GetPrecedingNodeOf( aNodeNumForTextNode ) );
 
     return pPrecedingNodeNum;
 }
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index b52f9a476eef..4bab7aca9f32 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -337,13 +337,13 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId()
 
 // XAccessibleValue
 
-SwFrmFmt* SwAccessibleCell::GetTblBoxFormat() const
+SwFrameFormat* SwAccessibleCell::GetTableBoxFormat() const
 {
     assert(GetFrm());
     assert(GetFrm()->IsCellFrm());
 
     const SwCellFrm* pCellFrm = static_cast<const SwCellFrm*>( GetFrm() );
-    return pCellFrm->GetTabBox()->GetFrmFmt();
+    return pCellFrm->GetTabBox()->GetFrameFormat();
 }
 
 //Implement TableCell currentValue
@@ -354,7 +354,7 @@ uno::Any SwAccessibleCell::getCurrentValue( )
     CHECK_FOR_DEFUNC( XAccessibleValue );
 
     uno::Any aAny;
-    aAny <<= GetTblBoxFormat()->GetTblBoxValue().GetValue();
+    aAny <<= GetTableBoxFormat()->GetTableBoxValue().GetValue();
     return aAny;
 }
 
@@ -368,8 +368,8 @@ sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber )
     bool bValid = (aNumber >>= fValue);
     if( bValid )
     {
-        SwTblBoxValue aValue( fValue );
-        GetTblBoxFormat()->SetFmtAttr( aValue );
+        SwTableBoxValue aValue( fValue );
+        GetTableBoxFormat()->SetFormatAttr( aValue );
     }
     return bValid;
 }
@@ -418,10 +418,10 @@ static OUString ReplaceFourChar(const OUString& oldOUString)
     SolarMutexGuard g;
 
     ::com::sun::star::uno::Any strRet;
-    SwFrmFmt *pFrmFmt = GetTblBoxFormat();
-    assert(pFrmFmt);
+    SwFrameFormat *pFrameFormat = GetTableBoxFormat();
+    assert(pFrameFormat);
 
-    const SwTblBoxFormula& tbl_formula = pFrmFmt->GetTblBoxFormula();
+    const SwTableBoxFormula& tbl_formula = pFrameFormat->GetTableBoxFormula();
 
     OUString strFormula = ReplaceFourChar(tbl_formula.GetFormula());
     OUString strFor("Formula:");
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 1a9991ff7e1a..5049b560b5d2 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -26,7 +26,7 @@
 
 class SwCellFrm;
 class SwAccessibleTable;
-class SwFrmFmt;
+class SwFrameFormat;
 
 class SwAccessibleCell : public SwAccessibleContext,
                   ::com::sun::star::accessibility::XAccessibleValue,
@@ -113,7 +113,7 @@ public:
     ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
         throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
 private:
-    SwFrmFmt* GetTblBoxFormat() const;
+    SwFrameFormat* GetTableBoxFormat() const;
 
 public:
     virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( )
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 30b19f62f059..09e5372440cb 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -920,22 +920,22 @@ void SAL_CALL SwAccessibleContext::grabFocus()
     }
     else
     {
-        const SwCntntFrm *pCFrm = 0;
-        if( GetFrm()->IsCntntFrm() )
-            pCFrm = static_cast< const SwCntntFrm * >( GetFrm() );
+        const SwContentFrm *pCFrm = 0;
+        if( GetFrm()->IsContentFrm() )
+            pCFrm = static_cast< const SwContentFrm * >( GetFrm() );
         else if( GetFrm()->IsLayoutFrm() )
-            pCFrm = static_cast< const SwLayoutFrm * >( GetFrm() )->ContainsCntnt();
+            pCFrm = static_cast< const SwLayoutFrm * >( GetFrm() )->ContainsContent();
 
-        if( pCFrm && pCFrm->IsTxtFrm() )
+        if( pCFrm && pCFrm->IsTextFrm() )
         {
-            const SwTxtFrm *pTxtFrm = static_cast< const SwTxtFrm * >( pCFrm );
-            const SwTxtNode *pTxtNd = pTxtFrm->GetTxtNode();
-            if( pTxtNd )
+            const SwTextFrm *pTextFrm = static_cast< const SwTextFrm * >( pCFrm );
+            const SwTextNode *pTextNd = pTextFrm->GetTextNode();
+            if( pTextNd )
             {
                 // create pam for selection
-                SwIndex aIndex( const_cast< SwTxtNode * >( pTxtNd ),
-                                pTxtFrm->GetOfst() );
-                SwPosition aStartPos( *pTxtNd, aIndex );
+                SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
+                                pTextFrm->GetOfst() );
+                SwPosition aStartPos( *pTextNd, aIndex );
                 SwPaM aPaM( aStartPos );
 
                 // set PaM at cursor shell
@@ -1425,7 +1425,7 @@ bool SwAccessibleContext::HasAdditionalAccessibleChildren()
 {
     bool bRet( false );
 
-    if ( GetFrm()->IsTxtFrm() )
+    if ( GetFrm()->IsTextFrm() )
     {
         SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
         if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
@@ -1442,7 +1442,7 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
 {
     vcl::Window* pAdditionalAccessibleChild( 0 );
 
-    if ( GetFrm()->IsTxtFrm() )
+    if ( GetFrm()->IsTextFrm() )
     {
         SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
         if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
@@ -1458,7 +1458,7 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
 /** #i88070# - get all additional accessible children */
 void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< vcl::Window* >* pChildren )
 {
-    if ( GetFrm()->IsTxtFrm() )
+    if ( GetFrm()->IsTextFrm() )
     {
         SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
         if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 435a2474be5a..d31a6f3be31c 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -593,32 +593,32 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
         sAttrName = "line-number:";
 
-        SwCntntFrm* pCurrFrm = pCrsrShell->GetCurrFrm();
+        SwContentFrm* pCurrFrm = pCrsrShell->GetCurrFrm();
         SwPageFrm* pCurrPage=static_cast<SwFrm*>(pCurrFrm)->FindPageFrm();
         sal_uLong nLineNum = 0;
-        SwTxtFrm* pTxtFrm = NULL;
-        SwTxtFrm* pCurrTxtFrm = NULL;
-        pTxtFrm = static_cast< SwTxtFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsCntnt());
+        SwTextFrm* pTextFrm = NULL;
+        SwTextFrm* pCurrTextFrm = NULL;
+        pTextFrm = static_cast< SwTextFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsContent());
         if (pCurrFrm->IsInFly())//such as, graphic,chart
         {
             SwFlyFrm *pFlyFrm = pCurrFrm->FindFlyFrm();
-            const SwFmtAnchor& rAnchor = pFlyFrm->GetFmt()->GetAnchor();
+            const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor();
             RndStdIds eAnchorId = rAnchor.GetAnchorId();
             if(eAnchorId == FLY_AS_CHAR)
             {
                 const SwFrm *pSwFrm = pFlyFrm->GetAnchorFrm();
-                if(pSwFrm->IsTxtFrm())
-                    pCurrTxtFrm = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pSwFrm));
+                if(pSwFrm->IsTextFrm())
+                    pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pSwFrm));
             }
         }
         else
-            pCurrTxtFrm = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm* >(pCurrFrm));
+            pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm* >(pCurrFrm));
         //check whether the text frame where the Graph/OLE/Frame anchored is in the Header/Footer
-        SwFrm* pFrm = pCurrTxtFrm;
+        SwFrm* pFrm = pCurrTextFrm;
         while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
             pFrm = pFrm->GetUpper();
         if ( pFrm )
-            pCurrTxtFrm = NULL;
+            pCurrTextFrm = NULL;
         //check shape
         if(pCrsrShell->Imp()->GetDrawView())
         {
@@ -626,48 +626,48 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
             for ( size_t i = 0; i < rMrkList.GetMarkCount(); ++i )
             {
                 SdrObject *pObj = rMrkList.GetMark(i)->GetMarkedSdrObj();
-                SwFrmFmt* pFmt = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFmt();
-                const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+                SwFrameFormat* pFormat = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFormat();
+                const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
                 if( FLY_AS_CHAR != rAnchor.GetAnchorId() )
-                    pCurrTxtFrm = NULL;
+                    pCurrTextFrm = NULL;
             }
         }
         //calculate line number
-        if (pCurrTxtFrm && pTxtFrm)
+        if (pCurrTextFrm && pTextFrm)
         {
-            if (!(pCurrTxtFrm->IsInTab() || pCurrTxtFrm->IsInFtn()))
+            if (!(pCurrTextFrm->IsInTab() || pCurrTextFrm->IsInFootnote()))
             {
-                while( pTxtFrm != pCurrTxtFrm )
+                while( pTextFrm != pCurrTextFrm )
                 {
                     //check header/footer
-                    pFrm = pTxtFrm;
+                    pFrm = pTextFrm;
                     while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
                         pFrm = pFrm->GetUpper();
                     if ( pFrm )
                     {
-                        pTxtFrm = static_cast< SwTxtFrm*>(pTxtFrm->GetNextCntntFrm());
+                        pTextFrm = static_cast< SwTextFrm*>(pTextFrm->GetNextContentFrm());
                         continue;
                     }
-                    if (!(pTxtFrm->IsInTab() || pTxtFrm->IsInFtn() || pTxtFrm->IsInFly()))
-                        nLineNum += pTxtFrm->GetThisLines();
-                    pTxtFrm = static_cast< SwTxtFrm* >(pTxtFrm ->GetNextCntntFrm());
+                    if (!(pTextFrm->IsInTab() || pTextFrm->IsInFootnote() || pTextFrm->IsInFly()))
+                        nLineNum += pTextFrm->GetThisLines();
+                    pTextFrm = static_cast< SwTextFrm* >(pTextFrm ->GetNextContentFrm());
                 }
                 SwPaM* pCaret = pCrsrShell->GetCrsr();
-                if (!pCurrTxtFrm->IsEmpty() && pCaret)
+                if (!pCurrTextFrm->IsEmpty() && pCaret)
                 {
-                    if (pCurrTxtFrm->IsTxtFrm())
+                    if (pCurrTextFrm->IsTextFrm())
                     {
                         const SwPosition* pPoint = NULL;
-                        if(pCurrTxtFrm->IsInFly())
+                        if(pCurrTextFrm->IsInFly())
                         {
-                            SwFlyFrm *pFlyFrm = pCurrTxtFrm->FindFlyFrm();
-                            const SwFmtAnchor& rAnchor = pFlyFrm->GetFmt()->GetAnchor();
-                            pPoint= rAnchor.GetCntntAnchor();
+                            SwFlyFrm *pFlyFrm = pCurrTextFrm->FindFlyFrm();
+                            const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor();
+                            pPoint= rAnchor.GetContentAnchor();
                         }
                         else
                             pPoint = pCaret->GetPoint();
                         const sal_Int32 nActPos = pPoint->nContent.GetIndex();
-                        nLineNum += pCurrTxtFrm->GetLineCount( nActPos );
+                        nLineNum += pCurrTextFrm->GetLineCount( nActPos );
                     }
                     else//graphic, form, shape, etc.
                     {
@@ -676,7 +676,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
                         if( pCrsrShell->GetLayout()->GetCrsrOfst( pPoint, aPt/*,* &eTmpState*/ ) )
                         {
                             const sal_Int32 nActPos = pPoint->nContent.GetIndex();
-                            nLineNum += pCurrTxtFrm->GetLineCount( nActPos );
+                            nLineNum += pCurrTextFrm->GetLineCount( nActPos );
                         }
                     }
                 }
@@ -722,8 +722,8 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
         sAttrName = "total-columns:";
 
-        const SwFmtCol &rFmtCol=pCurrPage->GetAttrSet()->GetCol();
-        sal_uInt16 nColCount=rFmtCol.GetNumCols();
+        const SwFormatCol &rFormatCol=pCurrPage->GetAttrSet()->GetCol();
+        sal_uInt16 nColCount=rFormatCol.GetNumCols();
         nColCount = nColCount>0?nColCount:1;
         sValue += sAttrName;
         sValue += OUString::number( nColCount ) ;
@@ -772,8 +772,8 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
             //section-total-columns
             sAttrName = "section-total-columns:";
-            const SwFmtCol &rFmtSctCol=pCurrSctFrm->GetAttrSet()->GetCol();
-            sal_uInt16 nSctColCount=rFmtSctCol.GetNumCols();
+            const SwFormatCol &rFormatSctCol=pCurrSctFrm->GetAttrSet()->GetCol();
+            sal_uInt16 nSctColCount=rFormatSctCol.GetNumCols();
             nSctColCount = nSctColCount>0?nSctColCount:1;
             sValue += sAttrName;
             sValue += OUString::number( nSctColCount ) ;
@@ -868,24 +868,24 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
         if ( pCrsrShell )
         {
             SwPaM *_pStartCrsr = pCrsrShell->GetCrsr(), *__pStartCrsr = _pStartCrsr;
-            SwCntntNode* pPrevNode = NULL;
+            SwContentNode* pPrevNode = NULL;
             std::vector<SwFrm*> vFrmList;
             do
             {
                 if ( _pStartCrsr && _pStartCrsr->HasMark() )
                 {
-                    SwCntntNode* pCntntNode = _pStartCrsr->GetCntntNode();
-                    if ( pCntntNode == pPrevNode )
+                    SwContentNode* pContentNode = _pStartCrsr->GetContentNode();
+                    if ( pContentNode == pPrevNode )
                     {
                         continue;
                     }
-                    SwFrm* pFrm = pCntntNode ? pCntntNode->getLayoutFrm( pCrsrShell->GetLayout() ) : NULL;
+                    SwFrm* pFrm = pContentNode ? pContentNode->getLayoutFrm( pCrsrShell->GetLayout() ) : NULL;
                     if ( pFrm )
                     {
                         vFrmList.push_back( pFrm );
                     }
 
-                    pPrevNode = pCntntNode;
+                    pPrevNode = pContentNode;
                 }
             }
 
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 90eabf85d952..57684d5e55d3 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -113,11 +113,11 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementation
     if( pFFrm )
     {
         style = "style:";
-        SwCntntFrm* pCFrm;
-        pCFrm = pFFrm->ContainsCntnt();
+        SwContentFrm* pCFrm;
+        pCFrm = pFFrm->ContainsContent();
         if( pCFrm )
         {
-            SwCntntNode* pCNode = pCFrm->GetNode();
+            SwContentNode* pCNode = pCFrm->GetNode();
             if( pCNode )
             {
                 style += static_cast<SwOLENode*>(pCNode)->GetOLEObj().GetStyleString();
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 84d728dec50b..c71e3fab4690 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -45,10 +45,10 @@ const sal_Char sImplementationNameEndnote[] = "com.sun.star.comp.Writer.SwAccess
 SwAccessibleFootnote::SwAccessibleFootnote(
         SwAccessibleMap* pInitMap,
         bool bIsEndnote,
-        const SwFtnFrm *pFtnFrm ) :
+        const SwFootnoteFrm *pFootnoteFrm ) :
     SwAccessibleContext( pInitMap,
         bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE,
-        pFtnFrm )
+        pFootnoteFrm )
 {
     SolarMutexGuard aGuard;
 
@@ -56,12 +56,12 @@ SwAccessibleFootnote::SwAccessibleFootnote(
                                    : STR_ACCESS_FOOTNOTE_NAME;
 
     OUString sArg;
-    const SwTxtFtn *pTxtFtn =
-        static_cast< const SwFtnFrm *>( GetFrm() )->GetAttr();
-    if( pTxtFtn )
+    const SwTextFootnote *pTextFootnote =
+        static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr();
+    if( pTextFootnote )
     {
         const SwDoc *pDoc = GetShell()->GetDoc();
-        sArg = pTxtFtn->GetFtn().GetViewNumStr( *pDoc );
+        sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc );
     }
 
     SetName( GetResource( nResId, &sArg ) );
@@ -83,12 +83,12 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
         : STR_ACCESS_FOOTNOTE_DESC ;
 
     OUString sArg;
-    const SwTxtFtn *pTxtFtn =
-        static_cast< const SwFtnFrm *>( GetFrm() )->GetAttr();
-    if( pTxtFtn )
+    const SwTextFootnote *pTextFootnote =
+        static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr();
+    if( pTextFootnote )
     {
         const SwDoc *pDoc = GetMap()->GetShell()->GetDoc();
-        sArg = pTxtFtn->GetFtn().GetViewNumStr( *pDoc );
+        sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc );
     }
 
     return GetResource( nResId, &sArg );
@@ -128,10 +128,10 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId()
     return css::uno::Sequence<sal_Int8>();
 }
 
-bool SwAccessibleFootnote::IsEndnote( const SwFtnFrm *pFtnFrm )
+bool SwAccessibleFootnote::IsEndnote( const SwFootnoteFrm *pFootnoteFrm )
 {
-    const SwTxtFtn *pTxtFtn = pFtnFrm ->GetAttr();
-    return pTxtFtn && pTxtFtn->GetFtn().IsEndNote() ;
+    const SwTextFootnote *pTextFootnote = pFootnoteFrm ->GetAttr();
+    return pTextFootnote && pTextFootnote->GetFootnote().IsEndNote() ;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index b0862a25b661..d03b94f0e1ed 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -24,7 +24,7 @@
 #include <acccontext.hxx>
 
 class SwAccessibleMap;
-class SwFtnFrm;
+class SwFootnoteFrm;
 
 class SwAccessibleFootnote : public SwAccessibleContext
 {
@@ -34,7 +34,7 @@ protected:
 public:
     SwAccessibleFootnote( SwAccessibleMap* pInitMap,
                           bool bIsEndnote,
-                          const SwFtnFrm *pFtnFrm );
+                          const SwFootnoteFrm *pFootnoteFrm );
 
     // XAccessibleContext
 
@@ -64,7 +64,7 @@ public:
     // XTypeProvider
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    static bool IsEndnote( const SwFtnFrm *pFrm );
+    static bool IsEndnote( const SwFootnoteFrm *pFrm );
 };
 
 #endif
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 9a34ec721236..6582cca998b0 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -433,12 +433,12 @@ const SwFrm* SwAccessibleFrame::GetParent( const SwAccessibleChild& rFrmOrObj,
 OUString SwAccessibleFrame::GetFormattedPageNumber() const
 {
     sal_uInt16 nPageNum = GetFrm()->GetVirtPageNum();
-    sal_uInt32 nFmt = GetFrm()->FindPageFrm()->GetPageDesc()
+    sal_uInt32 nFormat = GetFrm()->FindPageFrm()->GetPageDesc()
                               ->GetNumType().GetNumberingType();
-    if( SVX_NUM_NUMBER_NONE == nFmt )
-        nFmt = SVX_NUM_ARABIC;
+    if( SVX_NUM_NUMBER_NONE == nFormat )
+        nFormat = SVX_NUM_ARABIC;
 
-    OUString sRet( FormatNumber( nPageNum, nFmt ) );
+    OUString sRet( FormatNumber( nPageNum, nFormat ) );
     return sRet;
 }
 
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index d5bb32af6ae3..bfffd2dc871a 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -99,22 +99,22 @@ sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrm *pFlyFrm )
     sal_uInt8 nType = ND_TEXTNODE;
     if( pFlyFrm->Lower() )
     {
-         if( pFlyFrm->Lower()->IsNoTxtFrm() )
+         if( pFlyFrm->Lower()->IsNoTextFrm() )
         {
-            const SwCntntFrm *pCntFrm =
-                static_cast<const SwCntntFrm *>( pFlyFrm->Lower() );
+            const SwContentFrm *pCntFrm =
+                static_cast<const SwContentFrm *>( pFlyFrm->Lower() );
             nType = pCntFrm->GetNode()->GetNodeType();
         }
     }
     else
     {
-        const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-        const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-        const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
+        const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+        const SwFormatContent& rContent = pFrameFormat->GetContent();
+        const SwNodeIndex *pNdIdx = rContent.GetContentIdx();
         if( pNdIdx )
         {
-            const SwCntntNode *pCNd =
-                (pNdIdx->GetNodes())[pNdIdx->GetIndex()+1]->GetCntntNode();
+            const SwContentNode *pCNd =
+                (pNdIdx->GetNodes())[pNdIdx->GetIndex()+1]->GetContentNode();
             if( pCNd )
                 nType = pCNd->GetNodeType();
         }
@@ -132,10 +132,10 @@ SwAccessibleFrameBase::SwAccessibleFrameBase(
 {
     SolarMutexGuard aGuard;
 
-    const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-    const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
+    const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+    const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
 
-    SetName( pFrmFmt->GetName() );
+    SetName( pFrameFormat->GetName() );
 
     bIsSelected = IsSelected();
 }
@@ -221,14 +221,14 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
     case RES_NAME_CHANGED:
         if(  pFlyFrm )
         {
-            const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-            assert(pFrmFmt == GetRegisteredIn() && "invalid frame");
+            const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+            assert(pFrameFormat == GetRegisteredIn() && "invalid frame");
 
             const OUString sOldName( GetName() );
             assert( !pOld ||
                     static_cast<const SwStringMsgPoolItem *>(pOld)->GetString() == GetName());
 
-            SetName( pFrmFmt->GetName() );
+            SetName( pFrameFormat->GetName() );
             assert( !pNew ||
                     static_cast<const SwStringMsgPoolItem *>(pNew)->GetString() == GetName());
 
@@ -250,8 +250,8 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
 
     case RES_FMT_CHG:
         if( pOld &&
-            static_cast< const SwFmtChg * >(pNew)->pChangedFmt == GetRegisteredIn() &&
-            static_cast< const SwFmtChg * >(pOld)->pChangedFmt->IsFmtInDTOR() )
+            static_cast< const SwFormatChg * >(pNew)->pChangedFormat == GetRegisteredIn() &&
+            static_cast< const SwFormatChg * >(pOld)->pChangedFormat->IsFormatInDTOR() )
             GetRegisteredInNonConst()->Remove( this );
         break;
 
@@ -306,18 +306,18 @@ bool SwAccessibleFrameBase::GetSelectedState( )
 
     // SELETED.
     SwFlyFrm* pFlyFrm = getFlyFrm();
-    const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-    const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
-    const SwPosition *pPos = pAnchor.GetCntntAnchor();
+    const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+    const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
+    const SwPosition *pPos = pAnchor.GetContentAnchor();
     if( !pPos )
         return false;
     int pIndex = pPos->nContent.GetIndex();
-    if( pPos->nNode.GetNode().GetTxtNode() )
+    if( pPos->nNode.GetNode().GetTextNode() )
     {
         SwPaM* pCrsr = GetCrsr();
         if( pCrsr != NULL )
         {
-            const SwTxtNode* pNode = pPos->nNode.GetNode().GetTxtNode();
+            const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode();
             sal_uLong nHere = pNode->GetIndex();
 
             // iterate over ring
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index c6c40fa28088..ce9d3d875e3e 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -156,9 +156,9 @@ bool SwAccessibleChild::IsBoundAsChar() const
     }
     else if ( mpDrawObj )
     {
-        const SwFrmFmt* mpFrmFmt = ::FindFrmFmt( mpDrawObj );
-        bRet = mpFrmFmt
-               && (FLY_AS_CHAR == mpFrmFmt->GetAnchor().GetAnchorId());
+        const SwFrameFormat* mpFrameFormat = ::FindFrameFormat( mpDrawObj );
+        bRet = mpFrameFormat
+               && (FLY_AS_CHAR == mpFrameFormat->GetAnchor().GetAnchorId());
     }
     else if ( mpWindow )
     {
@@ -351,9 +351,9 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
         OSL_ENSURE( pContact, "sdr contact is missing" );
         if( pContact )
         {
-            const SwFrmFmt *pFrmFmt = pContact->GetFmt();
-            OSL_ENSURE( pFrmFmt, "frame format is missing" );
-            if( pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
+            const SwFrameFormat *pFrameFormat = pContact->GetFormat();
+            OSL_ENSURE( pFrameFormat, "frame format is missing" );
+            if( pFrameFormat && FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId() )
             {
                 // For FLY_AS_CHAR the parent is the anchor
                 pParent = pContact->GetAnchorFrm();
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 773e1baa4beb..05168a432a36 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -76,7 +76,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
             }
         }
     }
-    else if( rFrm.IsTxtFrm() )
+    else if( rFrm.IsTextFrm() )
     {
         const SwSortedObjs *pObjs = rFrm.GetDrawObjs();
         if ( pObjs )
@@ -153,7 +153,7 @@ bool SwAccessibleChildMap::IsSortingRequired( const SwFrm& rFrm )
 {
     return ( rFrm.IsPageFrm() &&
              static_cast< const SwPageFrm& >( rFrm ).GetSortedObjs() ) ||
-           ( rFrm.IsTxtFrm() &&
+           ( rFrm.IsTextFrm() &&
              rFrm.GetDrawObjs() );
 }
 
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 68f9fbfd4b48..348eabc7bca1 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -46,7 +46,7 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
                 aCurr = (*pObjs)[nNextObj++]->GetDrawObj();
             }
         }
-        else if( rFrm.IsTxtFrm() )
+        else if( rFrm.IsTextFrm() )
         {
             const SwSortedObjs *pObjs = rFrm.GetDrawObjs();
             if ( pObjs && pObjs->size() )
@@ -112,7 +112,7 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
                     ? (*pObjs)[nNextObj++]->GetDrawObj()
                     : static_cast< const SdrObject *>( 0 );
         }
-        else if( rFrm.IsTxtFrm() )
+        else if( rFrm.IsTextFrm() )
         {
             const SwSortedObjs* pObjs = rFrm.GetDrawObjs();
             const size_t nObjsCount = pObjs ? pObjs->size() : 0;
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index 661ae5e1abda..ed4138e4c1d4 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -76,7 +76,7 @@ sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole()
 {
     SolarMutexGuard g;
 
-    SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() );
+    SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
 
     if (aURL.GetMap())
         return AccessibleRole::IMAGE_MAP;
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 09d2d69a70b2..7b9e25b94382 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -44,22 +44,22 @@ SwAccessibleHyperlink::SwAccessibleHyperlink( size_t nHPos,
 {
 }
 
-const SwTxtAttr *SwAccessibleHyperlink::GetTxtAttr() const
+const SwTextAttr *SwAccessibleHyperlink::GetTextAttr() const
 {
-    const SwTxtAttr *pTxtAttr = 0;
+    const SwTextAttr *pTextAttr = 0;
     if( xPara.is() && xPara->GetMap() )
     {
-        const SwTxtNode *pTxtNd = xPara->GetTxtNode();
-        const SwpHints *pHints = pTxtNd->GetpSwpHints();
+        const SwTextNode *pTextNd = xPara->GetTextNode();
+        const SwpHints *pHints = pTextNd->GetpSwpHints();
         if( pHints && nHintPos < pHints->Count() )
         {
-            const SwTxtAttr *pHt = (*pHints)[nHintPos];
+            const SwTextAttr *pHt = (*pHints)[nHintPos];
             if( RES_TXTATR_INETFMT == pHt->Which() )
-                pTxtAttr = pHt;
+                pTextAttr = pHt;
         }
     }
 
-    return pTxtAttr;
+    return pTextAttr;
 }
 
 // XAccessibleAction
@@ -78,24 +78,24 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
 
     if(nIndex != 0)
         throw lang::IndexOutOfBoundsException();
-    const SwTxtAttr *pTxtAttr = GetTxtAttr();
-    if( pTxtAttr )
+    const SwTextAttr *pTextAttr = GetTextAttr();
+    if( pTextAttr )
     {
-        const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
-        if( !rINetFmt.GetValue().isEmpty() )
+        const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+        if( !rINetFormat.GetValue().isEmpty() )
         {
             SwViewShell *pVSh = xPara->GetShell();
             if( pVSh )
             {
-                LoadURL(*pVSh, rINetFmt.GetValue(), URLLOAD_NOFILTER,
-                         rINetFmt.GetTargetFrame());
-                OSL_ENSURE( pTxtAttr == rINetFmt.GetTxtINetFmt(),
+                LoadURL(*pVSh, rINetFormat.GetValue(), URLLOAD_NOFILTER,
+                         rINetFormat.GetTargetFrame());
+                OSL_ENSURE( pTextAttr == rINetFormat.GetTextINetFormat(),
                          "lost my txt attr" );
-                const SwTxtINetFmt* pTxtAttr2 = rINetFmt.GetTxtINetFmt();
-                if( pTxtAttr2 )
+                const SwTextINetFormat* pTextAttr2 = rINetFormat.GetTextINetFormat();
+                if( pTextAttr2 )
                 {
-                    const_cast<SwTxtINetFmt*>(pTxtAttr2)->SetVisited(true);
-                    const_cast<SwTxtINetFmt*>(pTxtAttr2)->SetVisitedValid(true);
+                    const_cast<SwTextINetFormat*>(pTextAttr2)->SetVisited(true);
+                    const_cast<SwTextINetFormat*>(pTextAttr2)->SetVisitedValid(true);
                 }
                 bRet = true;
             }
@@ -112,11 +112,11 @@ OUString SAL_CALL SwAccessibleHyperlink::getAccessibleActionDescription(
     if(nIndex != 0)
         throw lang::IndexOutOfBoundsException();
 
-    const SwTxtAttr *pTxtAttr = GetTxtAttr();
-    if( pTxtAttr )
+    const SwTextAttr *pTextAttr = GetTextAttr();
+    if( pTextAttr )
     {
-        const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
-        return rINetFmt.GetValue();
+        const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+        return rINetFormat.GetValue();
     }
 
     return OUString();
@@ -169,12 +169,12 @@ uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionObject(
 
     if(nIndex != 0)
         throw lang::IndexOutOfBoundsException();
-    const SwTxtAttr *pTxtAttr = GetTxtAttr();
+    const SwTextAttr *pTextAttr = GetTextAttr();
     OUString retText;
-    if( pTxtAttr )
+    if( pTextAttr )
     {
-        const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
-        retText = OUString( rINetFmt.GetValue() );
+        const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+        retText = OUString( rINetFormat.GetValue() );
     }
     uno::Any aRet;
     aRet <<= retText;
@@ -199,12 +199,12 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid(  )
     SolarMutexGuard aGuard;
     if (xPara.is())
     {
-        const SwTxtAttr *pTxtAttr = GetTxtAttr();
+        const SwTextAttr *pTextAttr = GetTextAttr();
         OUString sText;
-        if( pTxtAttr )
+        if( pTextAttr )
         {
-            const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
-            sText = OUString( rINetFmt.GetValue() );
+            const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+            sText = OUString( rINetFormat.GetValue() );
             OUString sToken = "#";
             sal_Int32 nPos = sText.indexOf(sToken);
             if (nPos==0)//document link
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index ba71c62d2f57..06570c899969 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -26,7 +26,7 @@
 #include <fmtinfmt.hxx>
 
 class SwAccessibleParagraph;
-class SwTxtAttr;
+class SwTextAttr;
 
 class SwAccessibleHyperlink :
         public ::cppu::WeakImplHelper<
@@ -43,7 +43,7 @@ class SwAccessibleHyperlink :
                            SwAccessibleParagraph *p,
                               sal_Int32 nStt, sal_Int32 nEnd    );
 
-    const SwTxtAttr *GetTxtAttr() const;
+    const SwTextAttr *GetTextAttr() const;
     void Invalidate();
 
 public:
diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx
index eb081e77c9ba..e35b58718a70 100644
--- a/sw/source/core/access/acchypertextdata.hxx
+++ b/sw/source/core/access/acchypertextdata.hxx
@@ -23,21 +23,21 @@
 #include <cppuhelper/weakref.hxx>
 #include <map>
 
-class SwTxtAttr;
+class SwTextAttr;
 namespace com { namespace sun { namespace star {
     namespace accessibility { class XAccessibleHyperlink; }
 } } }
 
-typedef ::std::less< const SwTxtAttr * > SwTxtAttrPtrLess;
+typedef ::std::less< const SwTextAttr * > SwTextAttrPtrLess;
 
 class SwAccessibleHyperTextData
 {
 public:
-    typedef const SwTxtAttr *                                           key_type;
+    typedef const SwTextAttr *                                           key_type;
     typedef ::com::sun::star::uno::WeakReference<
         com::sun::star::accessibility::XAccessibleHyperlink >           mapped_type;
     typedef std::pair<const key_type,mapped_type>                       value_type;
-    typedef SwTxtAttrPtrLess                                            key_compare;
+    typedef SwTextAttrPtrLess                                            key_compare;
     typedef std::map<key_type,mapped_type,key_compare>::iterator        iterator;
 private:
     std::map<key_type,mapped_type,key_compare> maMap;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index b4c0782d42b8..7e47ad3c6dd5 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -556,7 +556,7 @@ void SwAccessibleEventList_Impl::MoveInvalidXAccToEnd()
 // There are two reason for this. First of all, a new accessible shape
 // for the XShape might be created soon. It's then cheaper if the XShape
 // still exists. The other reason are situations where an accessible shape
-// is destroyed within an SwFrmFmt::Modify. In this case, destroying
+// is destroyed within an SwFrameFormat::Modify. In this case, destroying
 // the XShape at the same time (indirectly by destroying the accessible
 // shape) leads to an assert, because a client of the Modify is destroyed
 // within a Modify call.
@@ -1162,14 +1162,14 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                 bool bMarked = false;
                 SwAccessibleChild pFrm( (*aIter).first );
 
-                const SwFrmFmt *pFrmFmt = (*aIter).first ? ::FindFrmFmt( (*aIter).first ) : nullptr;
-                if( !pFrmFmt )
+                const SwFrameFormat *pFrameFormat = (*aIter).first ? ::FindFrameFormat( (*aIter).first ) : nullptr;
+                if( !pFrameFormat )
                 {
                     ++aIter;
                     continue;
                 }
-                const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
-                const SwPosition *pPos = pAnchor.GetCntntAnchor();
+                const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
+                const SwPosition *pPos = pAnchor.GetContentAnchor();
 
                 if(pAnchor.GetAnchorId() == FLY_AT_PAGE)
                 {
@@ -1186,12 +1186,12 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                     ++aIter;
                     continue;
                 }
-                if( pPos->nNode.GetNode().GetTxtNode() )
+                if( pPos->nNode.GetNode().GetTextNode() )
                 {
                     int pIndex = pPos->nContent.GetIndex();
                     if( pCrsr != NULL )
                     {
-                        const SwTxtNode* pNode = pPos->nNode.GetNode().GetTxtNode();
+                        const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode();
                         sal_uLong nHere = pNode->GetIndex();
 
                         for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
@@ -1286,10 +1286,10 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                     if (bFrmChanged)
                     {
                         const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( pFrm );
-                        const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-                        if (pFrmFmt)
+                        const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+                        if (pFrameFormat)
                         {
-                            const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
+                            const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
                             if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
                             {
                                 uno::Reference< XAccessible > xAccParent = pAccFrame->getAccessibleParent();
@@ -1335,16 +1335,16 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                 while(nStartIndex <= nEndIndex)
                 {
                     SwFrm *pFrm = NULL;
-                    if(nStartIndex.GetNode().IsCntntNode())
+                    if(nStartIndex.GetNode().IsContentNode())
                     {
-                        SwCntntNode* pCNd = static_cast<SwCntntNode*>(&(nStartIndex.GetNode()));
-                        pFrm = SwIterator<SwFrm, SwCntntNode>(*pCNd).First();
+                        SwContentNode* pCNd = static_cast<SwContentNode*>(&(nStartIndex.GetNode()));
+                        pFrm = SwIterator<SwFrm, SwContentNode>(*pCNd).First();
                     }
                     else if( nStartIndex.GetNode().IsTableNode() )
                     {
                         SwTableNode * pTable = static_cast<SwTableNode *>(&(nStartIndex.GetNode()));
-                        SwTableFmt* pFmt = const_cast<SwTableFmt*>(pTable->GetTable().GetFrmFmt());
-                        pFrm = SwIterator<SwFrm, SwTableFmt>(*pFmt).First();
+                        SwTableFormat* pFormat = const_cast<SwTableFormat*>(pTable->GetTable().GetFrameFormat());
+                        pFrm = SwIterator<SwFrm, SwTableFormat>(*pFormat).First();
                     }
 
                     if( pFrm && mpFrmMap)
@@ -1557,10 +1557,10 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=fa
             if (pAccShape)
             {
                 SdrObject *pObj = GetSdrObjectFromXShape(pAccShape->GetXShape());
-                SwFrmFmt *pFrmFmt = pObj ? FindFrmFmt( pObj ) : NULL;
-                if (pFrmFmt)
+                SwFrameFormat *pFrameFormat = pObj ? FindFrameFormat( pObj ) : NULL;
+                if (pFrameFormat)
                 {
-                    const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
+                    const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
                     if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
                     {
                         uno::Reference< XAccessible > xPara = pAccShape->getAccessibleParent();
@@ -1891,7 +1891,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
                 case FRM_TXT:
                     mnPara++;
                     pAcc = new SwAccessibleParagraph( *this,
-                                    static_cast< const SwTxtFrm& >( *pFrm ) );
+                                    static_cast< const SwTextFrm& >( *pFrm ) );
                     break;
                 case FRM_HEADER:
                     pAcc = new SwAccessibleHeaderFooter( this,
@@ -1903,13 +1903,13 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
                     break;
                 case FRM_FTN:
                     {
-                        const SwFtnFrm *pFtnFrm =
-                            static_cast < const SwFtnFrm * >( pFrm );
+                        const SwFootnoteFrm *pFootnoteFrm =
+                            static_cast < const SwFootnoteFrm * >( pFrm );
                         bool bIsEndnote =
-                            SwAccessibleFootnote::IsEndnote( pFtnFrm );
+                            SwAccessibleFootnote::IsEndnote( pFootnoteFrm );
                         pAcc = new SwAccessibleFootnote( this, bIsEndnote,
                                     /*(bIsEndnote ? mnEndnote++ : mnFootnote++),*/
-                                    pFtnFrm );
+                                    pFootnoteFrm );
                     }
                     break;
                 case FRM_FLY:
@@ -2318,7 +2318,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
                 (xParentAccImpl.is() || xShapeAccImpl.is()) )
             {
                 // Keep a reference to the XShape to avoid that it
-                // is deleted with a SwFrmFmt::Modify.
+                // is deleted with a SwFrameFormat::Modify.
                 uno::Reference < drawing::XShape > xShape(
                     const_cast< SdrObject * >( pObj )->getUnoShape(),
                     uno::UNO_QUERY );
@@ -2469,7 +2469,7 @@ so the new graphic accessible 'parent is NULL,
 so run here: save the parent's SwFrm not the accessible object parent,
 */
             bool bIsValidFrm = false;
-            bool bIsTxtParent = false;
+            bool bIsTextParent = false;
             if (aFrmOrObj.GetSwFrm())
             {
                 int nType = pFrm->GetType();
@@ -2483,12 +2483,12 @@ so run here: save the parent's SwFrm not the accessible object parent,
                 int nType = pParent->GetType();
                 if (FRM_TXT == nType)
                 {
-                    bIsTxtParent =true;
+                    bIsTextParent =true;
                 }
             }
 //          bool bIsVisibleChildrenOnly =aFrmOrObj.IsVisibleChildrenOnly() ;
 //          bool bIsBoundAsChar =aFrmOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar &&
-            if((bIsValidFrm || bIsTxtParent) )
+            if((bIsValidFrm || bIsTextParent) )
             {
                 if( GetShell()->ActionPend() )
                 {
@@ -2544,9 +2544,9 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
     }
 }
 
-void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm )
+void SwAccessibleMap::InvalidateAttr( const SwTextFrm& rTextFrm )
 {
-    SwAccessibleChild aFrmOrObj( &rTxtFrm );
+    SwAccessibleChild aFrmOrObj( &rTextFrm );
     if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
     {
         uno::Reference < XAccessible > xAcc;
@@ -2922,17 +2922,17 @@ void SwAccessibleMap::InvalidateRelationSet( const SwFrm* pMaster,
 }
 
 // invalidation of CONTENT_FLOW_FROM/_TO relation of a paragraph
-void SwAccessibleMap::InvalidateParaFlowRelation( const SwTxtFrm& _rTxtFrm,
+void SwAccessibleMap::InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm,
                                                   const bool _bFrom )
 {
-    _InvalidateRelationSet( &_rTxtFrm, _bFrom );
+    _InvalidateRelationSet( &_rTextFrm, _bFrom );
 }
 
 // invalidation of text selection of a paragraph
-void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm )
+void SwAccessibleMap::InvalidateParaTextSelection( const SwTextFrm& _rTextFrm )
 {
     // first, see if this frame is accessible, and if so, get the respective
-    SwAccessibleChild aFrmOrObj( &_rTxtFrm );
+    SwAccessibleChild aFrmOrObj( &_rTextFrm );
     if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
     {
         uno::Reference < XAccessible > xAcc;
@@ -2960,7 +2960,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm )
                 SwAccessibleEvent_Impl aEvent(
                     SwAccessibleEvent_Impl::CARET_OR_STATES,
                     pAccImpl,
-                    SwAccessibleChild( &_rTxtFrm ),
+                    SwAccessibleChild( &_rTextFrm ),
                     AccessibleStates::TEXT_SELECTION_CHANGED );
                 AppendEvent( aEvent );
             }
@@ -3443,8 +3443,8 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
         // for a selection the cursor has to have a mark.
         // for safety reasons assure that point and mark are in text nodes
         if ( pCrsr->HasMark() &&
-             pCrsr->GetPoint()->nNode.GetNode().IsTxtNode() &&
-             pCrsr->GetMark()->nNode.GetNode().IsTxtNode() )
+             pCrsr->GetPoint()->nNode.GetNode().IsTextNode() &&
+             pCrsr->GetMark()->nNode.GetNode().IsTextNode() )
         {
             SwPosition* pStartPos = pCrsr->Start();
             SwPosition* pEndPos = pCrsr->End();
@@ -3452,24 +3452,24 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
             SwNodeIndex aIdx( pStartPos->nNode );
             for ( ; aIdx.GetIndex() <= pEndPos->nNode.GetIndex(); ++aIdx )
             {
-                SwTxtNode* pTxtNode( aIdx.GetNode().GetTxtNode() );
-                if ( pTxtNode )
+                SwTextNode* pTextNode( aIdx.GetNode().GetTextNode() );
+                if ( pTextNode )
                 {
                     // loop on all text frames registered at the text node.
-                    SwIterator<SwTxtFrm,SwTxtNode> aIter( *pTxtNode );
-                    for( SwTxtFrm* pTxtFrm = aIter.First(); pTxtFrm; pTxtFrm = aIter.Next() )
+                    SwIterator<SwTextFrm,SwTextNode> aIter( *pTextNode );
+                    for( SwTextFrm* pTextFrm = aIter.First(); pTextFrm; pTextFrm = aIter.Next() )
                         {
                             uno::WeakReference < XAccessible > xWeakAcc;
                             SwAccessibleContextMap_Impl::iterator aMapIter =
-                                                    mpFrmMap->find( pTxtFrm );
+                                                    mpFrmMap->find( pTextFrm );
                             if( aMapIter != mpFrmMap->end() )
                             {
                                 xWeakAcc = (*aMapIter).second;
                                 SwAccessibleParaSelection aDataEntry(
-                                    pTxtNode == &(pStartPos->nNode.GetNode())
+                                    pTextNode == &(pStartPos->nNode.GetNode())
                                                 ? pStartPos->nContent.GetIndex()
                                                 : 0,
-                                    pTxtNode == &(pEndPos->nNode.GetNode())
+                                    pTextNode == &(pEndPos->nNode.GetNode())
                                                 ? pEndPos->nContent.GetIndex()
                                                 : -1 );
                                 SwAccessibleSelectedParas_Impl::value_type
@@ -3552,13 +3552,13 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
                                 static_cast<SwAccessibleContext*>( xAcc.get() ) );
                     if ( xAccImpl.is() && xAccImpl->GetFrm() )
                     {
-                        const SwTxtFrm* pTxtFrm(
-                            dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
-                        OSL_ENSURE( pTxtFrm,
+                        const SwTextFrm* pTextFrm(
+                            dynamic_cast<const SwTextFrm*>(xAccImpl->GetFrm()) );
+                        OSL_ENSURE( pTextFrm,
                                 "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexpected type of frame" );
-                        if ( pTxtFrm )
+                        if ( pTextFrm )
                         {
-                            InvalidateParaTextSelection( *pTxtFrm );
+                            InvalidateParaTextSelection( *pTextFrm );
                         }
                     }
                 }
@@ -3580,13 +3580,13 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
                             static_cast<SwAccessibleContext*>( xAcc.get() ) );
                 if ( xAccImpl.is() && xAccImpl->GetFrm() )
                 {
-                    const SwTxtFrm* pTxtFrm(
-                            dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
-                    OSL_ENSURE( pTxtFrm,
+                    const SwTextFrm* pTextFrm(
+                            dynamic_cast<const SwTextFrm*>(xAccImpl->GetFrm()) );
+                    OSL_ENSURE( pTextFrm,
                             "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexpected type of frame" );
-                    if ( pTxtFrm )
+                    if ( pTextFrm )
                     {
-                        InvalidateParaTextSelection( *pTxtFrm );
+                        InvalidateParaTextSelection( *pTextFrm );
                     }
                 }
             }
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 4be902866469..cee5edbcf05b 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -41,18 +41,18 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using utl::AccessibleRelationSetHelper;
 
-const SwNoTxtNode *SwAccessibleNoTextFrame::GetNoTxtNode() const
+const SwNoTextNode *SwAccessibleNoTextFrame::GetNoTextNode() const
 {
-    const SwNoTxtNode *pNd  = 0;
+    const SwNoTextNode *pNd  = 0;
     const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm *>( GetFrm() );
-    if( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTxtFrm() )
+    if( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTextFrm() )
     {
-        const SwCntntFrm *pCntFrm =
-            static_cast<const SwCntntFrm *>( pFlyFrm->Lower() );
-        const SwCntntNode* pSwCntntNode = pCntFrm->GetNode();
-        if(pSwCntntNode != NULL)
+        const SwContentFrm *pCntFrm =
+            static_cast<const SwContentFrm *>( pFlyFrm->Lower() );
+        const SwContentNode* pSwContentNode = pCntFrm->GetNode();
+        if(pSwContentNode != NULL)
         {
-            pNd = pSwCntntNode->GetNoTxtNode();
+            pNd = pSwContentNode->GetNoTextNode();
         }
     }
 
@@ -64,11 +64,11 @@ SwAccessibleNoTextFrame::SwAccessibleNoTextFrame(
         sal_Int16 nInitRole,
         const SwFlyFrm* pFlyFrm  ) :
     SwAccessibleFrameBase( pInitMap, nInitRole, pFlyFrm ),
-    aDepend( this, const_cast < SwNoTxtNode * >( GetNoTxtNode() ) ),
+    aDepend( this, const_cast < SwNoTextNode * >( GetNoTextNode() ) ),
     msTitle(),
     msDesc()
 {
-    const SwNoTxtNode* pNd = GetNoTxtNode();
+    const SwNoTextNode* pNd = GetNoTextNode();
     // #i73249#
     // consider new attributes Title and Description
     if( pNd )
@@ -102,7 +102,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
             return; // probably was deleted - avoid doing anything
     }
 
-    const SwNoTxtNode *pNd = GetNoTxtNode();
+    const SwNoTextNode *pNd = GetNoTextNode();
     OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), "invalid frame" );
     switch( nWhich )
     {
@@ -308,7 +308,7 @@ throw (uno::RuntimeException, std::exception)
     CHECK_FOR_DEFUNC( XAccessibleHypertext );
 
     sal_Int32 nCount = 0;
-    SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() );
+    SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
 
     if(aURL.GetMap() || !aURL.GetURL().isEmpty())
         nCount = 1;
@@ -325,7 +325,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
 
     uno::Reference< XAccessibleHyperlink > xRet;
 
-    SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() );
+    SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
 
     if( nLinkIndex > 0 )
         throw lang::IndexOutOfBoundsException();
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 4776cdb1a471..196b8eaf6c30 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -30,7 +30,7 @@ namespace com { namespace star {
 } }
 
 class SwFlyFrm;
-class SwNoTxtNode;
+class SwNoTextNode;
 class SwAccessibleNoTextHyperlink;
 
 class SwAccessibleNoTextFrame : public  SwAccessibleFrameBase,
@@ -47,7 +47,7 @@ class SwAccessibleNoTextFrame : public  SwAccessibleFrameBase,
 protected:
     virtual ~SwAccessibleNoTextFrame();
 
-    const SwNoTxtNode *GetNoTxtNode() const;
+    const SwNoTextNode *GetNoTextNode() const;
 
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index 4044c3e541a4..ba6117b33c8b 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -49,7 +49,7 @@ sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionCount()
 {
     SolarMutexGuard g;
 
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
     {
@@ -72,7 +72,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn
         throw lang::IndexOutOfBoundsException();
 
     bool bRet = false;
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
     {
@@ -113,7 +113,7 @@ OUString SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionDescription(
     if(nIndex < 0 || nIndex >= getAccessibleActionCount())
         throw lang::IndexOutOfBoundsException();
 
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
     {
@@ -141,7 +141,7 @@ Reference< XAccessibleKeyBinding > SAL_CALL
         throw lang::IndexOutOfBoundsException();
 
     bool bIsValid = false;
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
     {
@@ -197,7 +197,7 @@ Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionObject(
     if(nIndex < 0 || nIndex >= getAccessibleActionCount())
         throw lang::IndexOutOfBoundsException();
 
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
     OUString retText;
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
@@ -231,7 +231,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid(  )
 {
     SolarMutexGuard g;
 
-    SwFmtURL aURL( GetFmt()->GetURL() );
+    SwFormatURL aURL( GetFormat()->GetURL() );
 
     if( aURL.GetMap() || !aURL.GetURL().isEmpty() )
         return sal_True;
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index 0dae5fef8256..79a9b9817bc8 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -37,9 +37,9 @@ class SwAccessibleNoTextHyperlink :
     ::rtl::Reference< SwAccessibleNoTextFrame > xFrame;
     const SwFrm *mpFrm;
 
-    SwFrmFmt *GetFmt()
+    SwFrameFormat *GetFormat()
     {
-        return const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(mpFrm))->GetFmt();
+        return const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(mpFrm))->GetFormat();
     }
 public:
 
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 87580385fe97..fab40746f65c 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -119,12 +119,12 @@ namespace com { namespace sun { namespace star {
 const sal_Char sServiceName[] = "com.sun.star.text.AccessibleParagraphView";
 const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleParagraphView";
 
-const SwTxtNode* SwAccessibleParagraph::GetTxtNode() const
+const SwTextNode* SwAccessibleParagraph::GetTextNode() const
 {
     const SwFrm* pFrm = GetFrm();
-    OSL_ENSURE( pFrm->IsTxtFrm(), "The text frame has mutated!" );
+    OSL_ENSURE( pFrm->IsTextFrm(), "The text frame has mutated!" );
 
-    const SwTxtNode* pNode = static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode();
+    const SwTextNode* pNode = static_cast<const SwTextFrm*>(pFrm)->GetTextNode();
     OSL_ENSURE( pNode != NULL, "A text frame without a text node." );
 
     return pNode;
@@ -150,7 +150,7 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos()
 
     if( pCaret != NULL )
     {
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
 
         // check whether the point points into 'our' node
         SwPosition* pPoint = pCaret->GetPoint();
@@ -162,8 +162,8 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos()
             if(!GetPortionData().IsValidCorePosition( nIndex ) ||
                 ( GetPortionData().IsZeroCorePositionData() && nIndex== 0) )
             {
-                const SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
-                bool bFormat = (pTxtFrm && pTxtFrm->HasPara());
+                const SwTextFrm *pTextFrm = PTR_CAST( SwTextFrm, GetFrm() );
+                bool bFormat = (pTextFrm && pTextFrm->HasPara());
                 if(bFormat)
                 {
                     ClearPortionData();
@@ -208,7 +208,7 @@ bool SwAccessibleParagraph::GetSelection(
     if( pCrsr != NULL )
     {
         // get SwPosition for my node
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
@@ -346,8 +346,8 @@ SwPaM* SwAccessibleParagraph::GetCursor( const bool _bForSelection )
 
 bool SwAccessibleParagraph::IsHeading() const
 {
-    const SwTxtNode *pTxtNd = GetTxtNode();
-    return pTxtNd->IsOutline();
+    const SwTextNode *pTextNd = GetTextNode();
+    return pTextNd->IsOutline();
 }
 
 void SwAccessibleParagraph::GetStates(
@@ -369,9 +369,9 @@ void SwAccessibleParagraph::GetStates(
 
     // FOCUSED (simulates node index of cursor)
     SwPaM* pCaret = GetCursor( false ); // #i27301# - consider adjusted method signature
-    const SwTxtNode* pTxtNd = GetTxtNode();
-    if( pCaret != 0 && pTxtNd != 0 &&
-        pTxtNd->GetIndex() == pCaret->GetPoint()->nNode.GetIndex() &&
+    const SwTextNode* pTextNd = GetTextNode();
+    if( pCaret != 0 && pTextNd != 0 &&
+        pTextNd->GetIndex() == pCaret->GetPoint()->nNode.GetIndex() &&
         nOldCaretPos != -1)
     {
         vcl::Window *pWin = GetWindow();
@@ -532,9 +532,9 @@ void SwAccessibleParagraph::_InvalidateFocus()
 
 SwAccessibleParagraph::SwAccessibleParagraph(
         SwAccessibleMap& rInitMap,
-        const SwTxtFrm& rTxtFrm )
-    : SwClient( const_cast<SwTxtNode*>(rTxtFrm.GetTxtNode()) ) // #i108125#
-    , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTxtFrm )
+        const SwTextFrm& rTextFrm )
+    : SwClient( const_cast<SwTextNode*>(rTextFrm.GetTextNode()) ) // #i108125#
+    , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTextFrm )
     , sDesc()
     , pPortionData( NULL )
     , pHyperTextData( NULL )
@@ -543,7 +543,7 @@ SwAccessibleParagraph::SwAccessibleParagraph(
     //Get the real heading level, Heading1 ~ Heading10
     , nHeadingLevel (-1)
     , aSelectionHelper( *this )
-    , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTxtFrm ) ) // #i108125#
+    , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTextFrm ) ) // #i108125#
     , m_bLastHasSelection(false)  //To add TEXT_SELECTION_CHANGED event
 {
     SolarMutexGuard aGuard;
@@ -577,13 +577,13 @@ void SwAccessibleParagraph::UpdatePortionData()
 {
     // obtain the text frame
     OSL_ENSURE( GetFrm() != NULL, "The text frame has vanished!" );
-    OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" );
-    const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() );
+    OSL_ENSURE( GetFrm()->IsTextFrm(), "The text frame has mutated!" );
+    const SwTextFrm* pFrm = static_cast<const SwTextFrm*>( GetFrm() );
 
     // build new portion data
     delete pPortionData;
     pPortionData = new SwAccessiblePortionData(
-        pFrm->GetTxtNode(), GetMap()->GetShell()->GetViewOptions() );
+        pFrm->GetTextNode(), GetMap()->GetShell()->GetViewOptions() );
     pFrm->VisitPortions( *pPortionData );
 
     OSL_ENSURE( pPortionData != NULL, "UpdatePortionData() failed" );
@@ -637,10 +637,10 @@ SwXTextPortion* SwAccessibleParagraph::CreateUnoPortion(
                         GetPortionData().GetModelPosition( nEndIndex );
 
     // create UNO cursor
-    SwTxtNode* pTxtNode = const_cast<SwTxtNode*>( GetTxtNode() );
-    SwIndex aIndex( pTxtNode, nStart );
-    SwPosition aStartPos( *pTxtNode, aIndex );
-    SwUnoCrsr* pUnoCursor = pTxtNode->GetDoc()->CreateUnoCrsr( aStartPos );
+    SwTextNode* pTextNode = const_cast<SwTextNode*>( GetTextNode() );
+    SwIndex aIndex( pTextNode, nStart );
+    SwPosition aStartPos( *pTextNode, aIndex );
+    SwUnoCrsr* pUnoCursor = pTextNode->GetDoc()->CreateUnoCrsr( aStartPos );
     pUnoCursor->SetMark();
     pUnoCursor->GetMark()->nContent = nEnd;
 
@@ -675,10 +675,10 @@ bool SwAccessibleParagraph::IsValidRange(
 
 SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase()
 {
-    const SwTxtNode* pTxtNd = GetTxtNode();
-    if( pTxtNd )
+    const SwTextNode* pTextNd = GetTextNode();
+    if( pTextNd )
     {
-        const SwSectionNode * pSectNd = pTxtNd->FindSectionNode();
+        const SwSectionNode * pSectNd = pTextNd->FindSectionNode();
         if( pSectNd )
         {
             const SwSection * pSect = &pSectNd->GetSection();
@@ -691,7 +691,7 @@ SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase()
                 for(size_t nIndex = 0; nIndex<nSize; nIndex++ )
                 {
                     pSortBase = pTOXBaseSect->GetTOXSortTabBases()[nIndex];
-                    if( pSortBase->pTOXNd == pTxtNd )
+                    if( pSortBase->pTOXNd == pTextNd )
                         break;
                 }
 
@@ -713,7 +713,7 @@ const SwRangeRedline* SwAccessibleParagraph::GetRedlineAtIndex( sal_Int32 )
     if ( pCrSr )
     {
         SwPosition* pStart = pCrSr->Start();
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
         if ( pNode )
         {
             const SwDoc* pDoc = pNode->GetDoc();
@@ -757,7 +757,7 @@ bool SwAccessibleParagraph::GetWordBoundary(
         // get locale for this position
         const sal_Int32 nModelPos = GetPortionData().GetModelPosition( nPos );
         lang::Locale aLocale = g_pBreakIt->GetLocale(
-                              GetTxtNode()->GetLang( nModelPos ) );
+                              GetTextNode()->GetLang( nModelPos ) );
 
         // which type of word are we interested in?
         // (DICTIONARY_WORD includes punctuation, ANY_WORD doesn't.)
@@ -844,7 +844,7 @@ bool SwAccessibleParagraph::GetGlyphBoundary(
         // get locale for this position
         const sal_Int32 nModelPos = GetPortionData().GetModelPosition( nPos );
         lang::Locale aLocale = g_pBreakIt->GetLocale(
-                              GetTxtNode()->GetLang( nModelPos ) );
+                              GetTextNode()->GetLang( nModelPos ) );
 
         // get word boundary, as the Break-Iterator sees fit.
         const sal_Int16 nIterMode = i18n::CharacterIteratorMode::SKIPCELL;
@@ -945,14 +945,14 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale()
 {
     SolarMutexGuard aGuard;
 
-    const SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
-    if( !pTxtFrm )
+    const SwTextFrm *pTextFrm = PTR_CAST( SwTextFrm, GetFrm() );
+    if( !pTextFrm )
     {
         THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (no text frame)" );
     }
 
-    const SwTxtNode *pTxtNd = pTxtFrm->GetTxtNode();
-    lang::Locale aLoc( g_pBreakIt->GetLocale( pTxtNd->GetLang( 0 ) ) );
+    const SwTextNode *pTextNd = pTextFrm->GetTextNode();
+    lang::Locale aLoc( g_pBreakIt->GetLocale( pTextNd->GetLang( 0 ) ) );
 
     return aLoc;
 }
@@ -966,12 +966,12 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
 
     utl::AccessibleRelationSetHelper* pHelper = new utl::AccessibleRelationSetHelper();
 
-    const SwTxtFrm* pTxtFrm = dynamic_cast<const SwTxtFrm*>(GetFrm());
-    OSL_ENSURE( pTxtFrm,
+    const SwTextFrm* pTextFrm = dynamic_cast<const SwTextFrm*>(GetFrm());
+    OSL_ENSURE( pTextFrm,
             "<SwAccessibleParagraph::getAccessibleRelationSet()> - missing text frame");
-    if ( pTxtFrm )
+    if ( pTextFrm )
     {
-        const SwCntntFrm* pPrevCntFrm( pTxtFrm->FindPrevCnt( true ) );
+        const SwContentFrm* pPrevCntFrm( pTextFrm->FindPrevCnt( true ) );
         if ( pPrevCntFrm )
         {
             uno::Sequence< uno::Reference<XInterface> > aSequence(1);
@@ -981,7 +981,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
             pHelper->AddRelation( aAccRel );
         }
 
-        const SwCntntFrm* pNextCntFrm( pTxtFrm->FindNextCnt( true ) );
+        const SwContentFrm* pNextCntFrm( pTextFrm->FindNextCnt( true ) );
         if ( pNextCntFrm )
         {
             uno::Sequence< uno::Reference<XInterface> > aSequence(1);
@@ -1005,18 +1005,18 @@ void SAL_CALL SwAccessibleParagraph::grabFocus()
     // get cursor shell
     SwCrsrShell *pCrsrSh = GetCrsrShell();
     SwPaM *pCrsr = GetCursor( false ); // #i27301# - consider new method signature
-    const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
-    const SwTxtNode* pTxtNd = pTxtFrm->GetTxtNode();
+    const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+    const SwTextNode* pTextNd = pTextFrm->GetTextNode();
 
-    if( pCrsrSh != 0 && pTxtNd != 0 &&
+    if( pCrsrSh != 0 && pTextNd != 0 &&
         ( pCrsr == 0 ||
-           pCrsr->GetPoint()->nNode.GetIndex() != pTxtNd->GetIndex() ||
-          !pTxtFrm->IsInside( pCrsr->GetPoint()->nContent.GetIndex()) ) )
+           pCrsr->GetPoint()->nNode.GetIndex() != pTextNd->GetIndex() ||
+          !pTextFrm->IsInside( pCrsr->GetPoint()->nContent.GetIndex()) ) )
     {
         // create pam for selection
-        SwIndex aIndex( const_cast< SwTxtNode * >( pTxtNd ),
-                        pTxtFrm->GetOfst() );
-        SwPosition aStartPos( *pTxtNd, aIndex );
+        SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
+                        pTextFrm->GetOfst() );
+        SwPosition aStartPos( *pTextNd, aIndex );
         SwPaM aPaM( aStartPos );
 
         // set PaM at cursor shell
@@ -1321,7 +1321,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex )
     if( pCrsrShell != NULL )
     {
         // create pam for selection
-        SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+        SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
         SwIndex aIndex( pNode, GetPortionData().GetModelPosition(nIndex));
         SwPosition aStartPos( *pNode, aIndex );
         SwPaM aPaM( aStartPos );
@@ -1373,7 +1373,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
     aMoveState.bRealHeight = true;
     aMoveState.bRealWidth = true;
     SwSpecialPos aSpecialPos;
-    SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+    SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
 
     /*  #i12332# FillSpecialPos does not accept nIndex ==
          GetString().getLength(). In that case nPos is set to the
@@ -1381,7 +1381,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
          returns the rectangle for a cursor at the end of the
          paragraph. */
     const sal_Int32 nPos = bBehindText
-        ? pNode->GetTxt().getLength()
+        ? pNode->GetText().getLength()
         : GetPortionData().FillSpecialPos(nIndex, aSpecialPos, aMoveState.pSpecialPos );
 
     // call GetCharRect
@@ -1392,7 +1392,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
 
     // already get the caret position
     com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs;
-    const sal_Int32 nStrLen = GetTxtNode()->GetTxt().getLength();
+    const sal_Int32 nStrLen = GetTextNode()->GetText().getLength();
     if( nStrLen > 0 )
     {
         SwFrm* pTFrm = const_cast<SwFrm*>(GetFrm());
@@ -1432,38 +1432,38 @@ struct IndexCompare
 OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
 {
     OUString strTypeName;
-    SwFldMgr aMgr;
-    SwTxtFld* pTxtFld = NULL;
-    SwTxtNode* pTxtNd = const_cast<SwTxtNode*>( GetTxtNode() );
-    SwIndex fldIndex( pTxtNd, nIndex );
-    sal_Int32 nFldIndex = GetPortionData().GetFieldIndex(nIndex);
-    if (nFldIndex >= 0)
-    {
-        const SwpHints* pSwpHints = GetTxtNode()->GetpSwpHints();
+    SwFieldMgr aMgr;
+    SwTextField* pTextField = NULL;
+    SwTextNode* pTextNd = const_cast<SwTextNode*>( GetTextNode() );
+    SwIndex fldIndex( pTextNd, nIndex );
+    sal_Int32 nFieldIndex = GetPortionData().GetFieldIndex(nIndex);
+    if (nFieldIndex >= 0)
+    {
+        const SwpHints* pSwpHints = GetTextNode()->GetpSwpHints();
         if (pSwpHints)
         {
             const size_t nSize = pSwpHints->Count();
             for( size_t i = 0; i < nSize; ++i )
             {
-                const SwTxtAttr* pHt = (*pSwpHints)[i];
+                const SwTextAttr* pHt = (*pSwpHints)[i];
                 if ( ( pHt->Which() == RES_TXTATR_FIELD
                        || pHt->Which() == RES_TXTATR_ANNOTATION
                        || pHt->Which() == RES_TXTATR_INPUTFIELD )
-                     && (nFldIndex-- == 0))
+                     && (nFieldIndex-- == 0))
                 {
-                    pTxtFld = const_cast<SwTxtFld*>(
-                                static_txtattr_cast<SwTxtFld const*>(pHt));
+                    pTextField = const_cast<SwTextField*>(
+                                static_txtattr_cast<SwTextField const*>(pHt));
                     break;
                 }
                 else if (pHt->Which() == RES_TXTATR_REFMARK
-                         && (nFldIndex-- == 0))
+                         && (nFieldIndex-- == 0))
                     strTypeName = "set reference";
             }
         }
     }
-    if (pTxtFld)
+    if (pTextField)
     {
-        const SwField* pField = (pTxtFld->GetFmtFld()).GetField();
+        const SwField* pField = (pTextField->GetFormatField()).GetField();
         if (pField)
         {
             strTypeName = SwFieldType::GetTypeStr(pField->GetTypeId());
@@ -1481,10 +1481,10 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
                     {
                     case REF_BOOKMARK:
                         {
-                            const SwGetRefField* pRefFld = dynamic_cast<const SwGetRefField*>(pField);
-                            if ( pRefFld && pRefFld->IsRefToHeadingCrossRefBookmark() )
+                            const SwGetRefField* pRefField = dynamic_cast<const SwGetRefField*>(pField);
+                            if ( pRefField && pRefField->IsRefToHeadingCrossRefBookmark() )
                                 sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Headings"));
-                            else if ( pRefFld && pRefFld->IsRefToNumItemCrossRefBookmark() )
+                            else if ( pRefField && pRefField->IsRefToNumItemCrossRefBookmark() )
                                 sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Numbered Paragraphs"));
                             else
                                 sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmarks"));
@@ -1683,10 +1683,10 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
 
         pValues = aValues.getArray();
 
-        const SwTxtNode* pTxtNode( GetTxtNode() );
+        const SwTextNode* pTextNode( GetTextNode() );
         PropertyValue& rValue = pValues[aValues.getLength() - 1 ];
         rValue.Name = "NumberingPrefix";
-        OUString sNumBullet = pTxtNode->GetNumString();
+        OUString sNumBullet = pTextNode->GetNumString();
         rValue.Value <<= sNumBullet;
         rValue.Handle = -1;
         rValue.State = PropertyState_DIRECT_VALUE;
@@ -1740,11 +1740,11 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
         const bool bOnlyCharAttrs )
 {
     // retrieve default attributes
-    const SwTxtNode* pTxtNode( GetTxtNode() );
+    const SwTextNode* pTextNode( GetTextNode() );
     ::boost::scoped_ptr<SfxItemSet> pSet;
     if ( !bOnlyCharAttrs )
     {
-        pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+        pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
                                RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
                                RES_PARATR_BEGIN, RES_PARATR_END - 1,
                                RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
@@ -1752,7 +1752,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
     }
     else
     {
-        pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+        pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
                                RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
                                0 ) );
     }
@@ -1760,26 +1760,26 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
     // attributes are the character attributes, which are set at the paragraph style
     // of the paragraph. The character attributes set at the automatic paragraph
     // style of the paragraph are treated as run attributes.
-    //    pTxtNode->SwCntntNode::GetAttr( *pSet );
+    //    pTextNode->SwContentNode::GetAttr( *pSet );
     // get default paragraph attributes, if needed, and merge these into <pSet>
     if ( !bOnlyCharAttrs )
     {
-        SfxItemSet aParaSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+        SfxItemSet aParaSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
                              RES_PARATR_BEGIN, RES_PARATR_END - 1,
                              RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
                              0 );
-        pTxtNode->SwCntntNode::GetAttr( aParaSet );
+        pTextNode->SwContentNode::GetAttr( aParaSet );
         pSet->Put( aParaSet );
     }
     // get default character attributes and merge these into <pSet>
-    OSL_ENSURE( pTxtNode->GetTxtColl(),
+    OSL_ENSURE( pTextNode->GetTextColl(),
             "<SwAccessibleParagraph::_getDefaultAttributesImpl(..)> - missing paragraph style. Serious defect, please inform OD!" );
-    if ( pTxtNode->GetTxtColl() )
+    if ( pTextNode->GetTextColl() )
     {
-        SfxItemSet aCharSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+        SfxItemSet aCharSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
                              RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
                              0 );
-        SetPutRecursive( aCharSet, pTxtNode->GetTxtColl()->GetAttrSet() );
+        SetPutRecursive( aCharSet, pTextNode->GetTextColl()->GetAttrSet() );
         pSet->Put( aCharSet );
     }
 
@@ -1811,13 +1811,13 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
 
         // #i72800#
         // add property value entry for the paragraph style
-        if ( !bOnlyCharAttrs && pTxtNode->GetTxtColl() )
+        if ( !bOnlyCharAttrs && pTextNode->GetTextColl() )
         {
             if ( aDefAttrSeq.find( UNO_NAME_PARA_STYLE_NAME ) == aDefAttrSeq.end() )
             {
                 PropertyValue rPropVal;
                 rPropVal.Name = UNO_NAME_PARA_STYLE_NAME;
-                uno::Any aVal( uno::makeAny( pTxtNode->GetTxtColl()->GetName() ) );
+                uno::Any aVal( uno::makeAny( pTextNode->GetTextColl()->GetName() ) );
                 rPropVal.Value = aVal;
                 rPropVal.Handle = -1;
                 rPropVal.State = beans::PropertyState_DEFAULT_VALUE;
@@ -1957,11 +1957,11 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
     // create PaM for character at position <nIndex>
     SwPaM* pPaM( 0 );
     {
-        const SwTxtNode* pTxtNode( GetTxtNode() );
-        SwPosition* pStartPos = new SwPosition( *pTxtNode );
-        pStartPos->nContent.Assign( const_cast<SwTxtNode*>(pTxtNode), nIndex );
-        SwPosition* pEndPos = new SwPosition( *pTxtNode );
-        pEndPos->nContent.Assign( const_cast<SwTxtNode*>(pTxtNode), nIndex+1 );
+        const SwTextNode* pTextNode( GetTextNode() );
+        SwPosition* pStartPos = new SwPosition( *pTextNode );
+        pStartPos->nContent.Assign( const_cast<SwTextNode*>(pTextNode), nIndex );
+        SwPosition* pEndPos = new SwPosition( *pTextNode );
+        pEndPos->nContent.Assign( const_cast<SwTextNode*>(pTextNode), nIndex+1 );
 
         pPaM = new SwPaM( *pStartPos, *pEndPos );
 
@@ -1980,13 +1980,13 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
     //    SwXTextCursor::GetCrsrAttr( *pPaM, aSet, sal_True, sal_True );
     // get character attributes from automatic paragraph style and merge these into <aSet>
     {
-        const SwTxtNode* pTxtNode( GetTxtNode() );
-        if ( pTxtNode->HasSwAttrSet() )
+        const SwTextNode* pTextNode( GetTextNode() );
+        if ( pTextNode->HasSwAttrSet() )
         {
             SfxItemSet aAutomaticParaStyleCharAttrs( pPaM->GetDoc()->GetAttrPool(),
                                                      RES_CHRATR_BEGIN, RES_CHRATR_END -1,
                                                      0 );
-            aAutomaticParaStyleCharAttrs.Put( *(pTxtNode->GetpSwAttrSet()), false );
+            aAutomaticParaStyleCharAttrs.Put( *(pTextNode->GetpSwAttrSet()), false );
             aSet.Put( aAutomaticParaStyleCharAttrs );
         }
     }
@@ -2101,9 +2101,9 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
         const uno::Sequence< OUString >& aRequestedAttributes,
         tAccParaPropValMap& rSupplementalAttrSeq )
 {
-    const SwTxtNode* pTxtNode( GetTxtNode() );
+    const SwTextNode* pTextNode( GetTextNode() );
     ::boost::scoped_ptr<SfxItemSet> pSet;
-    pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+    pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
         RES_PARATR_ADJUST, RES_PARATR_ADJUST,
         RES_PARATR_TABSTOP, RES_PARATR_TABSTOP,
         RES_PARATR_LINESPACING, RES_PARATR_LINESPACING,
@@ -2113,13 +2113,13 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
         RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
         0 ) );
 
-    if ( pTxtNode->HasBullet() || pTxtNode->HasNumber() )
+    if ( pTextNode->HasBullet() || pTextNode->HasNumber() )
     {
-        pSet->Put( pTxtNode->GetAttr(RES_PARATR_LIST_LEVEL, true) );
+        pSet->Put( pTextNode->GetAttr(RES_PARATR_LIST_LEVEL, true) );
     }
-    pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_UL_SPACE) );
-    pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_LR_SPACE) );
-    pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_PARATR_ADJUST) );
+    pSet->Put( pTextNode->SwContentNode::GetAttr(RES_UL_SPACE) );
+    pSet->Put( pTextNode->SwContentNode::GetAttr(RES_LR_SPACE) );
+    pSet->Put( pTextNode->SwContentNode::GetAttr(RES_PARATR_ADJUST) );
 
     tAccParaPropValMap aSupplementalAttrSeq;
     {
@@ -2227,7 +2227,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
 
     PropertyValue* pValues = rValues.getArray();
 
-    const SwTxtNode* pTxtNode( GetTxtNode() );
+    const SwTextNode* pTextNode( GetTextNode() );
 
     sal_Int32 nValues = rValues.getLength();
     for (sal_Int32 i = 0;  i < nValues;  ++i)
@@ -2291,12 +2291,12 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
             SwCrsrShell* pCrsrShell = GetCrsrShell();
             if( pCrsrShell != NULL && pCrsrShell->GetViewOptions() && pCrsrShell->GetViewOptions()->IsOnlineSpell())
             {
-                const SwWrongList* pWrongList = pTxtNode->GetWrong();
+                const SwWrongList* pWrongList = pTextNode->GetWrong();
                 if( NULL != pWrongList )
                 {
                     sal_Int32 nBegin = nIndex;
                     sal_Int32 nLen = 1;
-                    if( pWrongList->InWrongWord(nBegin,nLen) && !pTxtNode->IsSymbol(nBegin) )
+                    if( pWrongList->InWrongWord(nBegin,nLen) && !pTextNode->IsSymbol(nBegin) )
                     {
                         rValue.Value <<= (sal_uInt16)UNDERLINE_WAVE;
                     }
@@ -2312,12 +2312,12 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
             SwCrsrShell* pCrsrShell = GetCrsrShell();
             if( pCrsrShell != NULL && pCrsrShell->GetViewOptions() && pCrsrShell->GetViewOptions()->IsOnlineSpell())
             {
-                const SwWrongList* pWrongList = pTxtNode->GetWrong();
+                const SwWrongList* pWrongList = pTextNode->GetWrong();
                 if( NULL != pWrongList )
                 {
                     sal_Int32 nBegin = nIndex;
                     sal_Int32 nLen = 1;
-                    if( pWrongList->InWrongWord(nBegin,nLen) && !pTxtNode->IsSymbol(nBegin) )
+                    if( pWrongList->InWrongWord(nBegin,nLen) && !pTextNode->IsSymbol(nBegin) )
                     {
                         rValue.Value <<= (sal_Int32)0x00ff0000;
                         continue;
@@ -2367,10 +2367,10 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
         //number bullet
         if (rValue.Name == UNO_NAME_NUMBERING_RULES)
         {
-            if ( pTxtNode->HasBullet() || pTxtNode->HasNumber() )
+            if ( pTextNode->HasBullet() || pTextNode->HasNumber() )
             {
                 uno::Any aVal;
-                SwNumRule* pNumRule = pTxtNode->GetNumRule();
+                SwNumRule* pNumRule = pTextNode->GetNumRule();
                 if (pNumRule)
                 {
                     uno::Reference< container::XIndexReplace >  xNum = new SwXNumberingRules(*pNumRule);
@@ -2416,7 +2416,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
     aMoveState.bRealHeight = true;
     aMoveState.bRealWidth = true;
     SwSpecialPos aSpecialPos;
-    SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+    SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
 
     /**  #i12332# FillSpecialPos does not accept nIndex ==
          GetString().getLength(). In that case nPos is set to the
@@ -2424,7 +2424,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
          returns the rectangle for a cursor at the end of the
          paragraph. */
     const sal_Int32 nPos = bBehindText
-        ? pNode->GetTxt().getLength()
+        ? pNode->GetText().getLength()
         : GetPortionData().FillSpecialPos(nIndex, aSpecialPos, aMoveState.pSpecialPos );
 
     // call GetCharRect
@@ -2467,7 +2467,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
     CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
 
     // construct SwPosition (where GetCrsrOfst() will put the result into)
-    SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+    SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
     SwIndex aIndex( pNode, 0);
     SwPosition aPos( *pNode, aIndex );
 
@@ -2500,14 +2500,14 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
 
     // ask core for position
     OSL_ENSURE( GetFrm() != NULL, "The text frame has vanished!" );
-    OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" );
-    const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() );
+    OSL_ENSURE( GetFrm()->IsTextFrm(), "The text frame has mutated!" );
+    const SwTextFrm* pFrm = static_cast<const SwTextFrm*>( GetFrm() );
     SwCrsrMoveState aMoveState;
     aMoveState.bPosMatchesBounds = true;
     const bool bSuccess = pFrm->GetCrsrOfst( &aPos, aCorePoint, &aMoveState );
 
-    SwIndex aCntntIdx = aPos.nContent;
-    const sal_Int32 nIndex = aCntntIdx.GetIndex();
+    SwIndex aContentIdx = aPos.nContent;
+    const sal_Int32 nIndex = aContentIdx.GetIndex();
     if ( nIndex > 0 )
     {
         SwRect aResultRect;
@@ -2594,7 +2594,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
     if( pCrsrShell != NULL )
     {
         // create pam for selection
-        SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+        SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
         SwIndex aIndex( pNode, GetPortionData().GetModelPosition(nStartIndex));
         SwPosition aStartPos( *pNode, aIndex );
         SwPaM aPaM( aStartPos );
@@ -2914,7 +2914,7 @@ sal_Bool SwAccessibleParagraph::replaceText(
         if( !IsEditableState() )
             return sal_False;
 
-        SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+        SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
 
         // translate positions
         sal_Int32 nStart;
@@ -3089,31 +3089,31 @@ class SwHyperlinkIter_Impl
     size_t nPos;
 
 public:
-    SwHyperlinkIter_Impl( const SwTxtFrm *pTxtFrm );
-    const SwTxtAttr *next();
+    SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm );
+    const SwTextAttr *next();
     size_t getCurrHintPos() const { return nPos-1; }
 
     sal_Int32 startIdx() const { return nStt; }
     sal_Int32 endIdx() const { return nEnd; }
 };
 
-SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTxtFrm *pTxtFrm ) :
-    pHints( pTxtFrm->GetTxtNode()->GetpSwpHints() ),
-    nStt( pTxtFrm->GetOfst() ),
+SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm ) :
+    pHints( pTextFrm->GetTextNode()->GetpSwpHints() ),
+    nStt( pTextFrm->GetOfst() ),
     nPos( 0 )
 {
-    const SwTxtFrm *pFollFrm = pTxtFrm->GetFollow();
-    nEnd = pFollFrm ? pFollFrm->GetOfst() : pTxtFrm->GetTxtNode()->Len();
+    const SwTextFrm *pFollFrm = pTextFrm->GetFollow();
+    nEnd = pFollFrm ? pFollFrm->GetOfst() : pTextFrm->GetTextNode()->Len();
 }
 
-const SwTxtAttr *SwHyperlinkIter_Impl::next()
+const SwTextAttr *SwHyperlinkIter_Impl::next()
 {
-    const SwTxtAttr *pAttr = 0;
+    const SwTextAttr *pAttr = 0;
     if( pHints )
     {
         while( !pAttr && nPos < pHints->Count() )
         {
-            const SwTxtAttr *pHt = (*pHints)[nPos];
+            const SwTextAttr *pHt = (*pHints)[nPos];
             if( RES_TXTATR_INETFMT == pHt->Which() )
             {
                 const sal_Int32 nHtStt = pHt->GetStart();
@@ -3142,8 +3142,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount()
     sal_Int32 nCount = 0;
     // #i77108# - provide hyperlinks also in editable documents.
 
-    const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
-    SwHyperlinkIter_Impl aIter( pTxtFrm );
+    const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+    SwHyperlinkIter_Impl aIter( pTextFrm );
     while( aIter.next() )
         nCount++;
 
@@ -3159,11 +3159,11 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
 
     uno::Reference< XAccessibleHyperlink > xRet;
 
-    const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
-    SwHyperlinkIter_Impl aHIter( pTxtFrm );
+    const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+    SwHyperlinkIter_Impl aHIter( pTextFrm );
     sal_Int32 nTIndex = -1;
     SwTOXSortTabBase* pTBase = GetTOXSortTabBase();
-    SwTxtAttr* pHt = const_cast<SwTxtAttr*>(aHIter.next());
+    SwTextAttr* pHt = const_cast<SwTextAttr*>(aHIter.next());
     while( (nLinkIndex < getHyperLinkCount()) && nTIndex < nLinkIndex)
     {
         sal_Int32 nHStt = -1;
@@ -3227,7 +3227,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
         // iterate next
         if( bH )
             // iterate next hyperlink
-            pHt = const_cast<SwTxtAttr*>(aHIter.next());
+            pHt = const_cast<SwTextAttr*>(aHIter.next());
         else if(bTOC)
             continue;
         else
@@ -3256,12 +3256,12 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde
     sal_Int32 nRet = -1;
     // #i77108#
     {
-        const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
-        SwHyperlinkIter_Impl aHIter( pTxtFrm );
+        const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+        SwHyperlinkIter_Impl aHIter( pTextFrm );
 
         const sal_Int32 nIdx = GetPortionData().GetModelPosition( nCharIndex );
         sal_Int32 nPos = 0;
-        const SwTxtAttr *pHt = aHIter.next();
+        const SwTextAttr *pHt = aHIter.next();
         while( pHt && !(nIdx >= pHt->GetStart() && nIdx < *pHt->GetAnyEnd()) )
         {
             pHt = aHIter.next();
@@ -3298,7 +3298,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar
         break;
         default:
         {
-            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) );
+            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) );
         }
     }
 
@@ -3323,7 +3323,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount(  )
     if( pCrsr != NULL )
     {
         // get SwPosition for my node
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
@@ -3398,7 +3398,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
         bool bRet = false;
 
         // get SwPosition for my node
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
@@ -3523,7 +3523,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta
         break;
         default:
         {
-            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) );
+            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) );
         }
     }
 
@@ -3558,7 +3558,7 @@ uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL
         break;
         default:
         {
-            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) );
+            pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) );
         }
     }
 
@@ -3696,7 +3696,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex(
     if( pCrsr != NULL )
     {
         // get SwPosition for my node
-        const SwTxtNode* pNode = GetTxtNode();
+        const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index d0e53dccda8f..bc604fbb5a65 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -34,8 +34,8 @@
 #include <unordered_map>
 
 class SwField;
-class SwTxtFrm;
-class SwTxtNode;
+class SwTextFrm;
+class SwTextNode;
 class SwPaM;
 class SwAccessiblePortionData;
 class SwAccessibleHyperTextData;
@@ -90,8 +90,8 @@ class SwAccessibleParagraph :
 
     SwParaChangeTrackingInfo* mpParaChangeTrackInfo; // #i108125#
 
-    /// get the SwTxtNode (requires frame; check before)
-    const SwTxtNode* GetTxtNode() const;
+    /// get the SwTextNode (requires frame; check before)
+    const SwTextNode* GetTextNode() const;
 
     /// get the (accessible) text string (requires frame; check before)
     OUString GetString();
@@ -240,7 +240,7 @@ protected:
 public:
 
     SwAccessibleParagraph( SwAccessibleMap& rInitMap,
-                           const SwTxtFrm& rTxtFrm );
+                           const SwTextFrm& rTextFrm );
 
     inline operator ::com::sun::star::accessibility::XAccessibleText *();
 
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index f9359fe76666..486c40c432fd 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -66,10 +66,10 @@ using i18n::Boundary;
 #define PORATTR_TERM        128
 
 SwAccessiblePortionData::SwAccessiblePortionData(
-    const SwTxtNode* pTxtNd,
+    const SwTextNode* pTextNd,
     const SwViewOption* pViewOpt ) :
     SwPortionHandler(),
-    pTxtNode( pTxtNd ),
+    pTextNode( pTextNd ),
     aBuffer(),
     nModelPosition( 0 ),
     pViewOptions( pViewOpt ),
@@ -85,7 +85,7 @@ SwAccessiblePortionData::SwAccessiblePortionData(
     bFinished( false ),
     bLastIsSpecial( false )
 {
-    OSL_ENSURE( pTxtNode != NULL, "Text node is needed!" );
+    OSL_ENSURE( pTextNode != NULL, "Text node is needed!" );
 
     // reserve some space to reduce memory allocations
     aLineBreaks.reserve( 5 );
@@ -103,7 +103,7 @@ SwAccessiblePortionData::~SwAccessiblePortionData()
 
 void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/)
 {
-    OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(),
+    OSL_ENSURE( (nModelPosition + nLength) <= pTextNode->GetText().getLength(),
                 "portion exceeds model string!" );
 
     OSL_ENSURE( !bFinished, "We are already done!" );
@@ -121,15 +121,15 @@ void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int3
     aPortionAttrs.push_back( nAttr );
 
     // update buffer + nModelPosition
-    aBuffer.append( pTxtNode->GetTxt().copy(nModelPosition, nLength) );
+    aBuffer.append( pTextNode->GetText().copy(nModelPosition, nLength) );
     nModelPosition += nLength;
 
     bLastIsSpecial = false;
 }
 
-void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFldType )
+void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFieldType )
 {
-    aAttrFieldType.push_back(nAttrFldType);
+    aAttrFieldType.push_back(nAttrFieldType);
     return;
 }
 
@@ -137,7 +137,7 @@ void SwAccessiblePortionData::Special(
     sal_Int32 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/, const SwFont* /*pFont*/)
 {
     OSL_ENSURE( nModelPosition >= 0, "illegal position" );
-    OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(),
+    OSL_ENSURE( (nModelPosition + nLength) <= pTextNode->GetText().getLength(),
                 "portion exceeds model string!" );
 
     OSL_ENSURE( !bFinished, "We are already done!" );
@@ -187,7 +187,7 @@ void SwAccessiblePortionData::Special(
         // #i111768# - apply patch from kstribley:
         // Include the control characters.
         case POR_CONTROLCHAR:
-            sDisplay = rText + OUString( pTxtNode->GetTxt()[nModelPosition] );
+            sDisplay = rText + OUString( pTextNode->GetText()[nModelPosition] );
             break;
         default:
             sDisplay = rText;
@@ -235,7 +235,7 @@ void SwAccessiblePortionData::Skip(sal_Int32 nLength)
 {
     OSL_ENSURE( !bFinished, "We are already done!" );
     OSL_ENSURE( aModelPositions.empty(), "Never Skip() after portions" );
-    OSL_ENSURE( nLength <= pTxtNode->GetTxt().getLength(),
+    OSL_ENSURE( nLength <= pTextNode->GetText().getLength(),
             "skip exceeds model string!" );
 
     nModelPosition += nLength;
@@ -278,7 +278,7 @@ bool SwAccessiblePortionData::IsReadOnlyPortion( size_t nPortionNo ) const
 bool SwAccessiblePortionData::IsGrayPortionType( sal_uInt16 nType ) const
 {
     // gray portions?
-    // Compare with: inftxt.cxx, SwTxtPaintInfo::DrawViewOpt(...)
+    // Compare with: inftxt.cxx, SwTextPaintInfo::DrawViewOpt(...)
     bool bGray = false;
     switch( nType )
     {
@@ -390,7 +390,7 @@ sal_Int32 SwAccessiblePortionData::GetModelPosition( sal_Int32 nPos ) const
     }
     // else: return nStartPos unmodified
 
-    OSL_ENSURE( nStartPos >= 0, "There's something weird in number of characters of SwTxtNode" );
+    OSL_ENSURE( nStartPos >= 0, "There's something weird in number of characters of SwTextNode" );
     return nStartPos;
 }
 
@@ -505,7 +505,7 @@ void SwAccessiblePortionData::GetSentenceBoundary(
 
                 sal_Int32 nNew = g_pBreakIt->GetBreakIter()->endOfSentence(
                     sAccessibleString, nCurrent,
-                    g_pBreakIt->GetLocale(pTxtNode->GetLang(nModelPos)) ) + 1;
+                    g_pBreakIt->GetLocale(pTextNode->GetLang(nModelPos)) ) + 1;
 
                 if( (nNew < 0) && (nNew > nLength) )
                     nNew = nLength;
@@ -536,7 +536,7 @@ void SwAccessiblePortionData::GetAttributeBoundary(
     Boundary& rBound,
     sal_Int32 nPos) const
 {
-    OSL_ENSURE( pTxtNode != NULL, "Need SwTxtNode!" );
+    OSL_ENSURE( pTextNode != NULL, "Need SwTextNode!" );
 
     // attribute boundaries can only occur on portion boundaries
     FillBoundary( rBound, aAccessiblePositions,
@@ -545,7 +545,7 @@ void SwAccessiblePortionData::GetAttributeBoundary(
 
 sal_Int32 SwAccessiblePortionData::GetAccessiblePosition( sal_Int32 nPos ) const
 {
-    OSL_ENSURE( nPos <= pTxtNode->GetTxt().getLength(), "illegal position" );
+    OSL_ENSURE( nPos <= pTextNode->GetText().getLength(), "illegal position" );
 
     // find the portion number
     // #i70538# - consider "empty" model portions - e.g. number portion
@@ -614,7 +614,7 @@ sal_Int32 SwAccessiblePortionData::FillSpecialPos(
 
         // if we have anything except plain text, compute nExtend + nRefPos
         if( (nModelEndPos - nModelPos == 1) &&
-            (pTxtNode->GetTxt()[nModelPos] != sAccessibleString[nPos]))
+            (pTextNode->GetText()[nModelPos] != sAccessibleString[nPos]))
         {
             // case 1: a one-character, non-text portion
             // reference position is the first accessibilty for our
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index d3f879862b05..5650b25998da 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -25,7 +25,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <vector>
 
-class SwTxtNode;
+class SwTextNode;
 struct SwSpecialPos;
 class SwViewOption;
 namespace com { namespace sun { namespace star {
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star {
 class SwAccessiblePortionData : public SwPortionHandler
 {
     // the node this portion is referring to
-    const SwTxtNode* pTxtNode;
+    const SwTextNode* pTextNode;
 
     // variables used while collecting the data
     OUStringBuffer aBuffer;
@@ -92,7 +92,7 @@ class SwAccessiblePortionData : public SwPortionHandler
                          sal_Int32& nCorePos, bool& bEdit ) const;
 
 public:
-    SwAccessiblePortionData( const SwTxtNode* pTxtNd,
+    SwAccessiblePortionData( const SwTextNode* pTextNd,
                              const SwViewOption* pViewOpt = NULL );
     virtual ~SwAccessiblePortionData();
 
@@ -103,7 +103,7 @@ public:
     virtual void Skip(sal_Int32 nLength) SAL_OVERRIDE;
     virtual void Finish() SAL_OVERRIDE;
 
-    virtual void SetAttrFieldType( sal_uInt16 nAttrFldType ) SAL_OVERRIDE;
+    virtual void SetAttrFieldType( sal_uInt16 nAttrFieldType ) SAL_OVERRIDE;
     bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos );
     bool IsIndexInFootnode(sal_Int32 nIndex);
     bool IsInGrayPortion( sal_Int32 nPos );
@@ -146,7 +146,7 @@ public:
     sal_Int32 GetModelPosition( sal_Int32 nPos ) const;
 
     /// fill a SwSpecialPos structure, suitable for calling
-    /// SwTxtFrm->GetCharRect
+    /// SwTextFrm->GetCharRect
     /// Returns the core position, and fills rpPos either with NULL or
     /// with the &rPos, after putting the appropriate data into it.
     sal_Int32 FillSpecialPos( sal_Int32 nPos,
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 3211f0b8e73e..cec061212223 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -301,10 +301,10 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
             }
             else
             {
-                const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-                if (pFrmFmt)
+                const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+                if (pFrameFormat)
                 {
-                    const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
+                    const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
                     if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
                     {
                         const SwFrm  *pParaFrm =  SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrm), m_rContext.IsInPagePreview() );
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 0c96b054f421..0deb99b4b10e 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -775,12 +775,12 @@ SwAccessibleTable::SwAccessibleTable(
 {
     SolarMutexGuard aGuard;
 
-    const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
-    const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
+    const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+    const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
 
-    SetName( pFrmFmt->GetName() + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
+    SetName( pFrameFormat->GetName() + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
 
-    const OUString sArg1( static_cast< const SwTabFrm * >( GetFrm() )->GetFmt()->GetName() );
+    const OUString sArg1( static_cast< const SwTabFrm * >( GetFrm() )->GetFormat()->GetName() );
     const OUString sArg2( GetFormattedPageNumber() );
 
     sDesc = GetResource( STR_ACCESS_TABLE_DESC, &sArg1, &sArg2 );
@@ -803,11 +803,11 @@ void SwAccessibleTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew
     case RES_NAME_CHANGED:
         if( pTabFrm )
         {
-            const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
-            OSL_ENSURE( pFrmFmt == GetRegisteredIn(), "invalid frame" );
+            const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+            OSL_ENSURE( pFrameFormat == GetRegisteredIn(), "invalid frame" );
 
             const OUString sOldName( GetName() );
-            const OUString sNewTabName = pFrmFmt->GetName();
+            const OUString sNewTabName = pFrameFormat->GetName();
 
             SetName( sNewTabName + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
 
@@ -1520,7 +1520,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
 
     // if we have a selection in a table, check if it's in the
     // same table that we're trying to select in
-    const SwTableNode* pSelectedTable = pCrsrShell->IsCrsrInTbl();
+    const SwTableNode* pSelectedTable = pCrsrShell->IsCrsrInTable();
     if( pSelectedTable != NULL )
     {
         // get top-most table line
@@ -1535,7 +1535,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
 
     // create the new selection
     const SwStartNode* pStartNode = pBox->GetSttNd();
-    if( pSelectedTable == NULL || !pCrsrShell->GetTblCrs() )
+    if( pSelectedTable == NULL || !pCrsrShell->GetTableCrs() )
     {
         pCrsrShell->StartAction();
         // Set cursor into current cell. This deletes any table cursor.
@@ -1547,7 +1547,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
         pCrsrShell->SetMark();
         pCrsrShell->MoveTable( fnTableCurr, fnTableEnd );
         // now set the cursor into the cell again.
-        SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+        SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
                                                     : pCrsrShell->GetCrsr();
         *pPaM->GetPoint() = *pPaM->GetMark();
         pCrsrShell->EndAction();
@@ -1561,7 +1561,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
         SwPaM aPaM( *pStartNode );
         aPaM.Move( fnMoveForward, fnGoNode );
         aPaM.SetMark();
-        const SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+        const SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
                                                     : pCrsrShell->GetCrsr();
         *(aPaM.GetMark()) = *pPaM->GetMark();
         Select( aPaM );
@@ -1681,7 +1681,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
     // If we unselect point, then set cursor to mark. If we clear another
     // selected box, then set cursor to point.
     // reduce selection to mark.
-    SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+    SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
                                                 : pCrsrShell->GetCrsr();
     bool bDeselectPoint =
         pBox->GetSttNd() ==
@@ -1698,7 +1698,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
     pCrsrShell->SetMark();
     pCrsrShell->MoveTable( fnTableCurr, fnTableEnd );
     // now set the cursor into the cell again.
-    pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+    pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
                                         : pCrsrShell->GetCrsr();
     *pPaM->GetPoint() = *pPaM->GetMark();
     pCrsrShell->EndAction();
@@ -1867,9 +1867,9 @@ SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2
 {
     SolarMutexGuard aGuard;
 
-    const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
-    const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
-    const OUString aName = pFrmFmt->GetName() + "-ColumnHeaders";
+    const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+    const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
+    const OUString aName = pFrameFormat->GetName() + "-ColumnHeaders";
 
     SetName( aName + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
 
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index b176c49c54de..cc88805cf511 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -50,11 +50,11 @@ SwAccessibleTextFrame::SwAccessibleTextFrame(
     msTitle(),
     msDesc()
 {
-    const SwFlyFrmFmt* pFlyFrmFmt =
-                    dynamic_cast<const SwFlyFrmFmt*>( rFlyFrm.GetFmt() );
-    msTitle = pFlyFrmFmt->GetObjTitle();
+    const SwFlyFrameFormat* pFlyFrameFormat =
+                    dynamic_cast<const SwFlyFrameFormat*>( rFlyFrm.GetFormat() );
+    msTitle = pFlyFrameFormat->GetObjTitle();
 
-    msDesc = pFlyFrmFmt->GetObjDescription();
+    msDesc = pFlyFrameFormat->GetObjDescription();
     if ( msDesc.isEmpty() &&
          msTitle != GetName() )
     {
@@ -101,9 +101,9 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
             aEvent.NewValue <<= msTitle;
             FireAccessibleEvent( aEvent );
 
-            const SwFlyFrmFmt* pFlyFrmFmt =
-                            dynamic_cast<const SwFlyFrmFmt*>( pFlyFrm->GetFmt() );
-            if (!pFlyFrmFmt || !pFlyFrmFmt->GetObjDescription().isEmpty())
+            const SwFlyFrameFormat* pFlyFrameFormat =
+                            dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() );
+            if (!pFlyFrameFormat || !pFlyFrameFormat->GetObjDescription().isEmpty())
             {
                 break;
             }
@@ -115,9 +115,9 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
             {
                 const OUString sOldDesc( msDesc );
 
-                const SwFlyFrmFmt* pFlyFrmFmt =
-                                dynamic_cast<const SwFlyFrmFmt*>( pFlyFrm->GetFmt() );
-                const OUString& rDesc = pFlyFrmFmt->GetObjDescription();
+                const SwFlyFrameFormat* pFlyFrameFormat =
+                                dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() );
+                const OUString& rDesc = pFlyFrameFormat->GetObjDescription();
                 msDesc = rDesc;
                 if ( msDesc.isEmpty() &&
                      msTitle != GetName() )
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index f9d2d5fa6b8a..405f4228f327 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -31,7 +31,7 @@
 #include <algorithm>
 
 namespace {
-    void initChangeTrackTextMarkupLists( const SwTxtFrm& rTxtFrm,
+    void initChangeTrackTextMarkupLists( const SwTextFrm& rTextFrm,
                                          SwWrongList*& opChangeTrackInsertionTextMarkupList,
                                          SwWrongList*& opChangeTrackDeletionTextMarkupList,
                                          SwWrongList*& opChangeTrackFormatChangeTextMarkupList )
@@ -40,14 +40,14 @@ namespace {
         opChangeTrackDeletionTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING );
         opChangeTrackFormatChangeTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING );
 
-        if ( !rTxtFrm.GetTxtNode() )
+        if ( !rTextFrm.GetTextNode() )
         {
-            OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTxtNode> instance!" );
+            OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTextNode> instance!" );
             return;
         }
-        const SwTxtNode& rTxtNode( *(rTxtFrm.GetTxtNode()) );
+        const SwTextNode& rTextNode( *(rTextFrm.GetTextNode()) );
 
-        const IDocumentRedlineAccess* pIDocChangeTrack( rTxtNode.getIDocumentRedlineAccess() );
+        const IDocumentRedlineAccess* pIDocChangeTrack( rTextNode.getIDocumentRedlineAccess() );
         if ( !pIDocChangeTrack )
         {
             OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <IDocumentRedlineAccess> instance!" );
@@ -55,47 +55,47 @@ namespace {
         }
 
         if ( !IDocumentRedlineAccess::IsShowChanges( pIDocChangeTrack->GetRedlineMode() ) ||
-             pIDocChangeTrack->GetRedlineTbl().empty() )
+             pIDocChangeTrack->GetRedlineTable().empty() )
         {
             // nothing to do --> empty change track text markup lists.
             return;
         }
 
-        const sal_uInt16 nIdxOfFirstRedlineForTxtNode =
-                    pIDocChangeTrack->GetRedlinePos( rTxtNode, USHRT_MAX );
-        if ( nIdxOfFirstRedlineForTxtNode == USHRT_MAX )
+        const sal_uInt16 nIdxOfFirstRedlineForTextNode =
+                    pIDocChangeTrack->GetRedlinePos( rTextNode, USHRT_MAX );
+        if ( nIdxOfFirstRedlineForTextNode == USHRT_MAX )
         {
             // nothing to do --> empty change track text markup lists.
             return;
         }
 
-        const sal_Int32 nTxtFrmTextStartPos = rTxtFrm.IsFollow()
-                                               ? rTxtFrm.GetOfst()
+        const sal_Int32 nTextFrmTextStartPos = rTextFrm.IsFollow()
+                                               ? rTextFrm.GetOfst()
                                                : 0;
-        const sal_Int32 nTxtFrmTextEndPos = rTxtFrm.HasFollow()
-                                             ? rTxtFrm.GetFollow()->GetOfst()
-                                             : rTxtFrm.GetTxt().getLength();
+        const sal_Int32 nTextFrmTextEndPos = rTextFrm.HasFollow()
+                                             ? rTextFrm.GetFollow()->GetOfst()
+                                             : rTextFrm.GetText().getLength();
 
         // iteration over the redlines which overlap with the text node.
-        const SwRedlineTbl& rRedlineTbl = pIDocChangeTrack->GetRedlineTbl();
-        const sal_uInt16 nRedlineCount( rRedlineTbl.size() );
-        for ( sal_uInt16 nActRedline = nIdxOfFirstRedlineForTxtNode;
+        const SwRedlineTable& rRedlineTable = pIDocChangeTrack->GetRedlineTable();
+        const sal_uInt16 nRedlineCount( rRedlineTable.size() );
+        for ( sal_uInt16 nActRedline = nIdxOfFirstRedlineForTextNode;
               nActRedline < nRedlineCount;
               ++nActRedline)
         {
-            const SwRangeRedline* pActRedline = rRedlineTbl[ nActRedline ];
-            if ( pActRedline->Start()->nNode > rTxtNode.GetIndex() )
+            const SwRangeRedline* pActRedline = rRedlineTable[ nActRedline ];
+            if ( pActRedline->Start()->nNode > rTextNode.GetIndex() )
             {
                 break;
             }
 
-            sal_Int32 nTxtNodeChangeTrackStart(COMPLETE_STRING);
-            sal_Int32 nTxtNodeChangeTrackEnd(COMPLETE_STRING);
-            pActRedline->CalcStartEnd( rTxtNode.GetIndex(),
-                                       nTxtNodeChangeTrackStart,
-                                       nTxtNodeChangeTrackEnd );
-            if ( nTxtNodeChangeTrackStart > nTxtFrmTextEndPos ||
-                 nTxtNodeChangeTrackEnd < nTxtFrmTextStartPos )
+            sal_Int32 nTextNodeChangeTrackStart(COMPLETE_STRING);
+            sal_Int32 nTextNodeChangeTrackEnd(COMPLETE_STRING);
+            pActRedline->CalcStartEnd( rTextNode.GetIndex(),
+                                       nTextNodeChangeTrackStart,
+                                       nTextNodeChangeTrackEnd );
+            if ( nTextNodeChangeTrackStart > nTextFrmTextEndPos ||
+                 nTextNodeChangeTrackEnd < nTextFrmTextStartPos )
             {
                 // Consider only redlines which overlap with the text frame's text.
                 continue;
@@ -126,23 +126,23 @@ namespace {
             }
             if ( pMarkupList )
             {
-                const sal_Int32 nTxtFrmChangeTrackStart =
-                    std::max(nTxtNodeChangeTrackStart, nTxtFrmTextStartPos);
+                const sal_Int32 nTextFrmChangeTrackStart =
+                    std::max(nTextNodeChangeTrackStart, nTextFrmTextStartPos);
 
-                const sal_Int32 nTxtFrmChangeTrackEnd =
-                    std::min(nTxtNodeChangeTrackEnd, nTxtFrmTextEndPos);
+                const sal_Int32 nTextFrmChangeTrackEnd =
+                    std::min(nTextNodeChangeTrackEnd, nTextFrmTextEndPos);
 
                 pMarkupList->Insert( OUString(), 0,
-                                     nTxtFrmChangeTrackStart,
-                                     nTxtFrmChangeTrackEnd - nTxtFrmChangeTrackStart,
+                                     nTextFrmChangeTrackStart,
+                                     nTextFrmChangeTrackEnd - nTextFrmChangeTrackStart,
                                      pMarkupList->Count() );
             }
         } // eof iteration over the redlines which overlap with the text node
     }
 } // eof anonymous namespace
 
-SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTxtFrm& rTxtFrm )
-    : mrTxtFrm( rTxtFrm )
+SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm )
+    : mrTextFrm( rTextFrm )
     , mpChangeTrackInsertionTextMarkupList( 0 )
     , mpChangeTrackDeletionTextMarkupList( 0 )
     , mpChangeTrackFormatChangeTextMarkupList( 0 )
@@ -176,7 +176,7 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co
                 "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackDeletionTextMarkupList> expected to be NULL." );
         OSL_ENSURE( mpChangeTrackFormatChangeTextMarkupList == 0,
                 "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackFormatChangeTextMarkupList> expected to be NULL." );
-        initChangeTrackTextMarkupLists( mrTxtFrm,
+        initChangeTrackTextMarkupLists( mrTextFrm,
                                         mpChangeTrackInsertionTextMarkupList,
                                         mpChangeTrackDeletionTextMarkupList,
                                         mpChangeTrackFormatChangeTextMarkupList );
diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx
index 5eaed9e6fe65..a8592529f1f0 100644
--- a/sw/source/core/access/parachangetrackinginfo.hxx
+++ b/sw/source/core/access/parachangetrackinginfo.hxx
@@ -22,13 +22,13 @@
 
 #include <sal/types.h>
 
-class SwTxtFrm;
+class SwTextFrm;
 class SwWrongList;
 
 class SwParaChangeTrackingInfo
 {
     public:
-        explicit SwParaChangeTrackingInfo( const SwTxtFrm& rTxtFrm );
+        explicit SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm );
         ~SwParaChangeTrackingInfo();
 
         void reset();
@@ -39,7 +39,7 @@ class SwParaChangeTrackingInfo
         SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
         SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
 
-        const SwTxtFrm& mrTxtFrm;
+        const SwTextFrm& mrTextFrm;
 
         SwWrongList* mpChangeTrackInsertionTextMarkupList;
         SwWrongList* mpChangeTrackDeletionTextMarkupList;
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index 2217f9d84c2d..d316b21ba9c2 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star;
 
 // helper functions
 namespace {
-    const SwWrongList* getTextMarkupList( const SwTxtNode& rTxtNode,
+    const SwWrongList* getTextMarkupList( const SwTextNode& rTextNode,
                                           const sal_Int32 nTextMarkupType )
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException)
@@ -43,7 +43,7 @@ namespace {
         {
             case text::TextMarkupType::SPELLCHECK:
             {
-                pTextMarkupList = rTxtNode.GetWrong();
+                pTextMarkupList = rTextNode.GetWrong();
             }
             break;
             case text::TextMarkupType::PROOFREADING:
@@ -70,10 +70,10 @@ namespace {
 
 // implementation of class <SwTextMarkupoHelper>
 SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
-                                        const SwTxtNode& rTxtNode )
+                                        const SwTextNode& rTextNode )
     : mrPortionData( rPortionData )
     // #i108125#
-    , mpTxtNode( &rTxtNode )
+    , mpTextNode( &rTextNode )
     , mpTextMarkupList( 0 )
 {
 }
@@ -82,7 +82,7 @@ SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionD
 SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
                                         const SwWrongList& rTextMarkupList )
     : mrPortionData( rPortionData )
-    , mpTxtNode( 0 )
+    , mpTextNode( 0 )
     , mpTextMarkupList( &rTextMarkupList )
 {
 }
@@ -97,7 +97,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
     const SwWrongList* pTextMarkupList =
                             mpTextMarkupList
                             ? mpTextMarkupList
-                            : getTextMarkupList( *mpTxtNode, nTextMarkupType );
+                            : getTextMarkupList( *mpTextNode, nTextMarkupType );
     if ( pTextMarkupList )
     {
         nTextMarkupCount = pTextMarkupList->Count();
@@ -127,7 +127,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
     const SwWrongList* pTextMarkupList =
                             mpTextMarkupList
                             ? mpTextMarkupList
-                            : getTextMarkupList( *mpTxtNode, nTextMarkupType );
+                            : getTextMarkupList( *mpTextNode, nTextMarkupType );
     if ( pTextMarkupList )
     {
         const SwWrongArea* pTextMarkup =
@@ -174,7 +174,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
     const SwWrongList* pTextMarkupList =
                             mpTextMarkupList
                             ? mpTextMarkupList
-                            : getTextMarkupList( *mpTxtNode, nTextMarkupType );
+                            : getTextMarkupList( *mpTextNode, nTextMarkupType );
     ::std::vector< ::com::sun::star::accessibility::TextSegment > aTmpTextMarkups;
     if ( pTextMarkupList )
     {
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index e38dba18ad92..37dd9f073a47 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -30,13 +30,13 @@ struct TextSegment;
 } } } }
 
 class SwAccessiblePortionData;
-class SwTxtNode;
+class SwTextNode;
 class SwWrongList; // #i108125#
 class SwTextMarkupHelper
 {
     public:
         SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
-                            const SwTxtNode& rTxtNode );
+                            const SwTextNode& rTextNode );
         SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
                             const SwWrongList& rTextMarkupList ); // #i108125#
         ~SwTextMarkupHelper() {}
@@ -66,7 +66,7 @@ class SwTextMarkupHelper
         const SwAccessiblePortionData& mrPortionData;
 
         // #i108125#
-        const SwTxtNode* mpTxtNode;
+        const SwTextNode* mpTextNode;
         const SwWrongList* mpTextMarkupList;
 };
 #endif
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 4e56fbaeee75..5cda63a62d3a 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -31,41 +31,41 @@
 #include <calbck.hxx>
 #include <swtable.hxx>
 
-SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, bool bFlag )
+SwTableBoxNumFormat::SwTableBoxNumFormat( sal_uInt32 nFormat, bool bFlag )
     : SfxUInt32Item( RES_BOXATR_FORMAT, nFormat ), bAuto( bFlag )
 {
 }
 
-bool SwTblBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const
+bool SwTableBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return GetValue() == static_cast<const SwTblBoxNumFormat&>(rAttr).GetValue() &&
-           bAuto == static_cast<const SwTblBoxNumFormat&>(rAttr).bAuto;
+    return GetValue() == static_cast<const SwTableBoxNumFormat&>(rAttr).GetValue() &&
+           bAuto == static_cast<const SwTableBoxNumFormat&>(rAttr).bAuto;
 }
 
-SfxPoolItem* SwTblBoxNumFormat::Clone( SfxItemPool* ) const
+SfxPoolItem* SwTableBoxNumFormat::Clone( SfxItemPool* ) const
 {
-    return new SwTblBoxNumFormat( GetValue(), bAuto );
+    return new SwTableBoxNumFormat( GetValue(), bAuto );
 }
 
-SwTblBoxFormula::SwTblBoxFormula( const OUString& rFormula )
+SwTableBoxFormula::SwTableBoxFormula( const OUString& rFormula )
     : SfxPoolItem( RES_BOXATR_FORMULA ),
     SwTableFormula( rFormula ),
     pDefinedIn( 0 )
 {
 }
 
-bool SwTblBoxFormula::operator==( const SfxPoolItem& rAttr ) const
+bool SwTableBoxFormula::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return GetFormula() == static_cast<const SwTblBoxFormula&>(rAttr).GetFormula() &&
-           pDefinedIn == static_cast<const SwTblBoxFormula&>(rAttr).pDefinedIn;
+    return GetFormula() == static_cast<const SwTableBoxFormula&>(rAttr).GetFormula() &&
+           pDefinedIn == static_cast<const SwTableBoxFormula&>(rAttr).pDefinedIn;
 }
 
-SfxPoolItem* SwTblBoxFormula::Clone( SfxItemPool* ) const
+SfxPoolItem* SwTableBoxFormula::Clone( SfxItemPool* ) const
 {
     // switch to external rendering
-    SwTblBoxFormula* pNew = new SwTblBoxFormula( GetFormula() );
+    SwTableBoxFormula* pNew = new SwTableBoxFormula( GetFormula() );
     pNew->SwTableFormula::operator=( *this );
     return pNew;
 }
@@ -77,7 +77,7 @@ SfxPoolItem* SwTblBoxFormula::Clone( SfxItemPool* ) const
 
     Caution: Must override when inheriting.
 */
-const SwNode* SwTblBoxFormula::GetNodeOfFormula() const
+const SwNode* SwTableBoxFormula::GetNodeOfFormula() const
 {
     const SwNode* pRet = 0;
     if( pDefinedIn )
@@ -89,7 +89,7 @@ const SwNode* SwTblBoxFormula::GetNodeOfFormula() const
     return pRet;
 }
 
-SwTableBox* SwTblBoxFormula::GetTableBox()
+SwTableBox* SwTableBoxFormula::GetTableBox()
 {
     SwTableBox* pBox = 0;
     if( pDefinedIn )
@@ -97,12 +97,12 @@ SwTableBox* SwTblBoxFormula::GetTableBox()
     return pBox;
 }
 
-void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
+void SwTableBoxFormula::ChangeState( const SfxPoolItem* pItem )
 {
     if( !pDefinedIn )
         return ;
 
-    SwTableFmlUpdate* pUpdtFld;
+    SwTableFormulaUpdate* pUpdateField;
     if( !pItem || RES_TABLEFML_UPDATE != pItem->Which() )
     {
         // reset value flag
@@ -110,109 +110,109 @@ void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
         return ;
     }
 
-    pUpdtFld = const_cast<SwTableFmlUpdate*>(static_cast<const SwTableFmlUpdate*>(pItem));
+    pUpdateField = const_cast<SwTableFormulaUpdate*>(static_cast<const SwTableFormulaUpdate*>(pItem));
 
     // detect table that contains this attribute
-    const SwTableNode* pTblNd;
+    const SwTableNode* pTableNd;
     const SwNode* pNd = GetNodeOfFormula();
     if( pNd && &pNd->GetNodes() == &pNd->GetDoc()->GetNodes() &&
-        0 != ( pTblNd = pNd->FindTableNode() ))
+        0 != ( pTableNd = pNd->FindTableNode() ))
     {
-        switch( pUpdtFld->eFlags )
+        switch( pUpdateField->eFlags )
         {
         case TBL_CALC:
             // reset value flag
             ChgValid( false );
             break;
         case TBL_BOXNAME:
-            if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+            if( &pTableNd->GetTable() == pUpdateField->pTable )
                 // use external rendering
-                PtrToBoxNm( pUpdtFld->pTbl );
+                PtrToBoxNm( pUpdateField->pTable );
             break;
         case TBL_BOXPTR:
             // internal rendering
-            BoxNmToPtr( &pTblNd->GetTable() );
+            BoxNmToPtr( &pTableNd->GetTable() );
             break;
         case TBL_RELBOXNAME:
-            if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+            if( &pTableNd->GetTable() == pUpdateField->pTable )
                 // relative rendering
-                ToRelBoxNm( pUpdtFld->pTbl );
+                ToRelBoxNm( pUpdateField->pTable );
             break;
 
         case TBL_SPLITTBL:
-            if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+            if( &pTableNd->GetTable() == pUpdateField->pTable )
             {
-                sal_uInt16 nLnPos = SwTableFormula::GetLnPosInTbl(
-                                        pTblNd->GetTable(), GetTableBox() );
-                pUpdtFld->bBehindSplitLine = USHRT_MAX != nLnPos &&
-                                            pUpdtFld->nSplitLine <= nLnPos;
+                sal_uInt16 nLnPos = SwTableFormula::GetLnPosInTable(
+                                        pTableNd->GetTable(), GetTableBox() );
+                pUpdateField->bBehindSplitLine = USHRT_MAX != nLnPos &&
+                                            pUpdateField->nSplitLine <= nLnPos;
             }
             else
-                pUpdtFld->bBehindSplitLine = false;
+                pUpdateField->bBehindSplitLine = false;
             // no break
         case TBL_MERGETBL:
-            if( pUpdtFld->pHistory )
+            if( pUpdateField->pHistory )
             {
                 // for a history record the unchanged formula is needed
-                SwTblBoxFormula aCopy( *this );
-                pUpdtFld->bModified = false;
-                ToSplitMergeBoxNm( *pUpdtFld );
+                SwTableBoxFormula aCopy( *this );
+                pUpdateField->bModified = false;
+                ToSplitMergeBoxNm( *pUpdateField );
 
-                if( pUpdtFld->bModified )
+                if( pUpdateField->bModified )
                 {
                     // external rendering
-                    aCopy.PtrToBoxNm( &pTblNd->GetTable() );
-                    pUpdtFld->pHistory->Add(
+                    aCopy.PtrToBoxNm( &pTableNd->GetTable() );
+                    pUpdateField->pHistory->Add(
                         &aCopy,
                         &aCopy,
                         pNd->FindTableBoxStartNode()->GetIndex());
                 }
             }
             else
-                ToSplitMergeBoxNm( *pUpdtFld );
+                ToSplitMergeBoxNm( *pUpdateField );
             break;
         }
     }
 }
 
-void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue )
+void SwTableBoxFormula::Calc( SwTableCalcPara& rCalcPara, double& rValue )
 {
     if( !rCalcPara.rCalc.IsCalcError() )
     {
         // create pointers from box names
-        BoxNmToPtr( rCalcPara.pTbl );
-        const OUString sFml( MakeFormula( rCalcPara ));
+        BoxNmToPtr( rCalcPara.pTable );
+        const OUString sFormula( MakeFormula( rCalcPara ));
         if( !rCalcPara.rCalc.IsCalcError() )
-            rValue = rCalcPara.rCalc.Calculate( sFml ).GetDouble();
+            rValue = rCalcPara.rCalc.Calculate( sFormula ).GetDouble();
         else
             rValue = DBL_MAX;
         ChgValid( !rCalcPara.IsStackOverflow() ); // value is now valid again
     }
 }
 
-SwTblBoxValue::SwTblBoxValue()
+SwTableBoxValue::SwTableBoxValue()
     : SfxPoolItem( RES_BOXATR_VALUE ), nValue( 0 )
 {
 }
 
-SwTblBoxValue::SwTblBoxValue( const double nVal )
+SwTableBoxValue::SwTableBoxValue( const double nVal )
     : SfxPoolItem( RES_BOXATR_VALUE ), nValue( nVal )
 {
 }
 
-bool SwTblBoxValue::operator==( const SfxPoolItem& rAttr ) const
+bool SwTableBoxValue::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    SwTblBoxValue const& rOther( static_cast<SwTblBoxValue const&>(rAttr) );
+    SwTableBoxValue const& rOther( static_cast<SwTableBoxValue const&>(rAttr) );
     // items with NaN should be equal to enable pooling
     return ::rtl::math::isNan( nValue )
         ?   ::rtl::math::isNan( rOther.nValue )
         :   ( nValue == rOther.nValue );
 }
 
-SfxPoolItem* SwTblBoxValue::Clone( SfxItemPool* ) const
+SfxPoolItem* SwTableBoxValue::Clone( SfxItemPool* ) const
 {
-    return new SwTblBoxValue( nValue );
+    return new SwTableBoxValue( nValue );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx b/sw/source/core/attr/fmtfollowtextflow.cxx
index 5660cdba5b3e..7cd973a47fb8 100644
--- a/sw/source/core/attr/fmtfollowtextflow.cxx
+++ b/sw/source/core/attr/fmtfollowtextflow.cxx
@@ -19,11 +19,11 @@
 
 #include <fmtfollowtextflow.hxx>
 
-TYPEINIT1(SwFmtFollowTextFlow, SfxBoolItem);
+TYPEINIT1(SwFormatFollowTextFlow, SfxBoolItem);
 
-SfxPoolItem*    SwFmtFollowTextFlow::Clone( SfxItemPool * ) const
+SfxPoolItem*    SwFormatFollowTextFlow::Clone( SfxItemPool * ) const
 {
-    return new SwFmtFollowTextFlow(*this);
+    return new SwFormatFollowTextFlow(*this);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index 0224f4fb9605..6ee45e2c913e 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -25,45 +25,45 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-TYPEINIT1(SwFmtWrapInfluenceOnObjPos, SfxPoolItem);
+TYPEINIT1(SwFormatWrapInfluenceOnObjPos, SfxPoolItem);
 
-SwFmtWrapInfluenceOnObjPos::SwFmtWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
+SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
     : SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS ),
     mnWrapInfluenceOnPosition( _nWrapInfluenceOnPosition )
 {
 }
 
-SwFmtWrapInfluenceOnObjPos::SwFmtWrapInfluenceOnObjPos( const SwFmtWrapInfluenceOnObjPos& _rCpy )
+SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( const SwFormatWrapInfluenceOnObjPos& _rCpy )
     : SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS ),
     mnWrapInfluenceOnPosition( _rCpy.GetWrapInfluenceOnObjPos() )
 {
 }
 
-SwFmtWrapInfluenceOnObjPos::~SwFmtWrapInfluenceOnObjPos()
+SwFormatWrapInfluenceOnObjPos::~SwFormatWrapInfluenceOnObjPos()
 {
 }
 
-SwFmtWrapInfluenceOnObjPos& SwFmtWrapInfluenceOnObjPos::operator=( const SwFmtWrapInfluenceOnObjPos& _rSource )
+SwFormatWrapInfluenceOnObjPos& SwFormatWrapInfluenceOnObjPos::operator=( const SwFormatWrapInfluenceOnObjPos& _rSource )
 {
     mnWrapInfluenceOnPosition = _rSource.GetWrapInfluenceOnObjPos();
 
     return *this;
 }
 
-bool SwFmtWrapInfluenceOnObjPos::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatWrapInfluenceOnObjPos::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
     return ( mnWrapInfluenceOnPosition ==
-                    static_cast<const SwFmtWrapInfluenceOnObjPos&>(rAttr).
+                    static_cast<const SwFormatWrapInfluenceOnObjPos&>(rAttr).
                                                 GetWrapInfluenceOnObjPos() );
 }
 
-SfxPoolItem* SwFmtWrapInfluenceOnObjPos::Clone( SfxItemPool * ) const
+SfxPoolItem* SwFormatWrapInfluenceOnObjPos::Clone( SfxItemPool * ) const
 {
-    return new SwFmtWrapInfluenceOnObjPos(*this);
+    return new SwFormatWrapInfluenceOnObjPos(*this);
 }
 
-bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     bool bRet = true;
@@ -73,13 +73,13 @@ bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) co
     }
     else
     {
-        OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+        OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
         bRet = false;
     }
     return bRet;
 }
 
-bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     bool bRet = false;
@@ -98,17 +98,17 @@ bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId
         }
         else
         {
-            OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
+            OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
         }
     }
     else
     {
-        OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - unknown MemberId" );
+        OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::PutValue(..)> - unknown MemberId" );
     }
     return bRet;
 }
 
-void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
+void SwFormatWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
 {
     // #i35017# - constant names have changed and consider new value <ITERATIVE>
     if ( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
@@ -119,13 +119,13 @@ void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInflu
     }
     else
     {
-        OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
+        OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
     }
 }
 
 // #i35017# - add parameter <_bIterativeAsOnceConcurrent> to control, if
 // value <ITERATIVE> has to be treated as <ONCE_CONCURRENT>
-sal_Int16 SwFmtWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
+sal_Int16 SwFormatWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
                                 const bool _bIterativeAsOnceConcurrent ) const
 {
     sal_Int16 nWrapInfluenceOnPosition( mnWrapInfluenceOnPosition );
@@ -139,9 +139,9 @@ sal_Int16 SwFmtWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
     return nWrapInfluenceOnPosition;
 }
 
-void SwFmtWrapInfluenceOnObjPos::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatWrapInfluenceOnObjPos::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtWrapInfluenceOnObjPos"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatWrapInfluenceOnObjPos"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWrapInfluenceOnPosition"), BAD_CAST(OString::number(mnWrapInfluenceOnPosition).getStr()));
     xmlTextWriterEndElement(pWriter);
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 9344426e9b4b..f5df08fa9860 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -38,72 +38,72 @@
 
 using namespace com::sun::star;
 
-TYPEINIT1( SwFmt, SwClient );
+TYPEINIT1( SwFormat, SwClient );
 
-SwFmt::SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-              const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm,
-              sal_uInt16 nFmtWhich )
+SwFormat::SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+              const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm,
+              sal_uInt16 nFormatWhich )
     : SwModify( pDrvdFrm ),
-    m_aFmtName( OUString::createFromAscii(pFmtNm) ),
+    m_aFormatName( OUString::createFromAscii(pFormatNm) ),
     m_aSet( rPool, pWhichRanges ),
-    m_nWhichId( nFmtWhich ),
-    m_nPoolFmtId( USHRT_MAX ),
+    m_nWhichId( nFormatWhich ),
+    m_nPoolFormatId( USHRT_MAX ),
     m_nPoolHelpId( USHRT_MAX ),
     m_nPoolHlpFileId( UCHAR_MAX )
 {
-    m_bAutoUpdateFmt = false; // LAYER_IMPL
-    m_bAutoFmt = true;
-    m_bWritten = m_bFmtInDTOR = m_bHidden = false;
+    m_bAutoUpdateFormat = false; // LAYER_IMPL
+    m_bAutoFormat = true;
+    m_bWritten = m_bFormatInDTOR = m_bHidden = false;
 
     if( pDrvdFrm )
         m_aSet.SetParent( &pDrvdFrm->m_aSet );
 }
 
-SwFmt::SwFmt( SwAttrPool& rPool, const OUString& rFmtNm,
-              const sal_uInt16* pWhichRanges, SwFmt* pDrvdFrm,
-              sal_uInt16 nFmtWhich )
+SwFormat::SwFormat( SwAttrPool& rPool, const OUString& rFormatNm,
+              const sal_uInt16* pWhichRanges, SwFormat* pDrvdFrm,
+              sal_uInt16 nFormatWhich )
     : SwModify( pDrvdFrm ),
-    m_aFmtName( rFmtNm ),
+    m_aFormatName( rFormatNm ),
     m_aSet( rPool, pWhichRanges ),
-    m_nWhichId( nFmtWhich ),
-    m_nPoolFmtId( USHRT_MAX ),
+    m_nWhichId( nFormatWhich ),
+    m_nPoolFormatId( USHRT_MAX ),
     m_nPoolHelpId( USHRT_MAX ),
     m_nPoolHlpFileId( UCHAR_MAX )
 {
-    m_bAutoUpdateFmt = false; // LAYER_IMPL
-    m_bAutoFmt = true;
-    m_bWritten = m_bFmtInDTOR = m_bHidden = false;
+    m_bAutoUpdateFormat = false; // LAYER_IMPL
+    m_bAutoFormat = true;
+    m_bWritten = m_bFormatInDTOR = m_bHidden = false;
 
     if( pDrvdFrm )
         m_aSet.SetParent( &pDrvdFrm->m_aSet );
 }
 
-SwFmt::SwFmt( const SwFmt& rFmt )
-    : SwModify( rFmt.DerivedFrom() ),
-    m_aFmtName( rFmt.m_aFmtName ),
-    m_aSet( rFmt.m_aSet ),
-    m_nWhichId( rFmt.m_nWhichId ),
-    m_nPoolFmtId( rFmt.GetPoolFmtId() ),
-    m_nPoolHelpId( rFmt.GetPoolHelpId() ),
-    m_nPoolHlpFileId( rFmt.GetPoolHlpFileId() )
+SwFormat::SwFormat( const SwFormat& rFormat )
+    : SwModify( rFormat.DerivedFrom() ),
+    m_aFormatName( rFormat.m_aFormatName ),
+    m_aSet( rFormat.m_aSet ),
+    m_nWhichId( rFormat.m_nWhichId ),
+    m_nPoolFormatId( rFormat.GetPoolFormatId() ),
+    m_nPoolHelpId( rFormat.GetPoolHelpId() ),
+    m_nPoolHlpFileId( rFormat.GetPoolHlpFileId() )
 {
-    m_bWritten = m_bFmtInDTOR = false; // LAYER_IMPL
-    m_bAutoFmt = rFmt.m_bAutoFmt;
-    m_bHidden = rFmt.m_bHidden;
-    m_bAutoUpdateFmt = rFmt.m_bAutoUpdateFmt;
+    m_bWritten = m_bFormatInDTOR = false; // LAYER_IMPL
+    m_bAutoFormat = rFormat.m_bAutoFormat;
+    m_bHidden = rFormat.m_bHidden;
+    m_bAutoUpdateFormat = rFormat.m_bAutoUpdateFormat;
 
-    if( rFmt.DerivedFrom() )
-        m_aSet.SetParent( &rFmt.DerivedFrom()->m_aSet );
+    if( rFormat.DerivedFrom() )
+        m_aSet.SetParent( &rFormat.DerivedFrom()->m_aSet );
     // a few special treatments for attributes
     m_aSet.SetModifyAtAttr( this );
 }
 
-SwFmt &SwFmt::operator=(const SwFmt& rFmt)
+SwFormat &SwFormat::operator=(const SwFormat& rFormat)
 {
-    m_nWhichId = rFmt.m_nWhichId;
-    m_nPoolFmtId = rFmt.GetPoolFmtId();
-    m_nPoolHelpId = rFmt.GetPoolHelpId();
-    m_nPoolHlpFileId = rFmt.GetPoolHlpFileId();
+    m_nWhichId = rFormat.m_nWhichId;
+    m_nPoolFormatId = rFormat.GetPoolFormatId();
+    m_nPoolHelpId = rFormat.GetPoolHelpId();
+    m_nPoolHlpFileId = rFormat.GetPoolHlpFileId();
 
     if ( IsInCache() )
     {
@@ -115,8 +115,8 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
     // copy only array with attributes delta
     SwAttrSet aOld( *m_aSet.GetPool(), m_aSet.GetRanges() ),
               aNew( *m_aSet.GetPool(), m_aSet.GetRanges() );
-    m_aSet.Intersect_BC( rFmt.m_aSet, &aOld, &aNew );
-    (void)m_aSet.Put_BC( rFmt.m_aSet, &aOld, &aNew );
+    m_aSet.Intersect_BC( rFormat.m_aSet, &aOld, &aNew );
+    (void)m_aSet.Put_BC( rFormat.m_aSet, &aOld, &aNew );
 
     // a few special treatments for attributes
     m_aSet.SetModifyAtAttr( this );
@@ -129,39 +129,39 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
         ModifyNotification( &aChgOld, &aChgNew ); // send all modified ones
     }
 
-    if( GetRegisteredIn() != rFmt.GetRegisteredIn() )
+    if( GetRegisteredIn() != rFormat.GetRegisteredIn() )
     {
         if( GetRegisteredIn() )
             GetRegisteredInNonConst()->Remove(this);
-        if( rFmt.GetRegisteredIn() )
+        if( rFormat.GetRegisteredIn() )
         {
-            const_cast<SwFmt&>(rFmt).GetRegisteredInNonConst()->Add(this);
-            m_aSet.SetParent( &rFmt.m_aSet );
+            const_cast<SwFormat&>(rFormat).GetRegisteredInNonConst()->Add(this);
+            m_aSet.SetParent( &rFormat.m_aSet );
         }
         else
         {
             m_aSet.SetParent( 0 );
         }
     }
-    m_bAutoFmt = rFmt.m_bAutoFmt;
-    m_bHidden = rFmt.m_bHidden;
-    m_bAutoUpdateFmt = rFmt.m_bAutoUpdateFmt;
+    m_bAutoFormat = rFormat.m_bAutoFormat;
+    m_bHidden = rFormat.m_bHidden;
+    m_bAutoUpdateFormat = rFormat.m_bAutoUpdateFormat;
     return *this;
 }
 
-void SwFmt::SetName( const OUString& rNewName, bool bBroadcast )
+void SwFormat::SetName( const OUString& rNewName, bool bBroadcast )
 {
     OSL_ENSURE( !IsDefault(), "SetName: Defaultformat" );
     if( bBroadcast )
     {
-        SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFmtName );
+        SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFormatName );
         SwStringMsgPoolItem aNew( RES_NAME_CHANGED, rNewName );
-        m_aFmtName = rNewName;
+        m_aFormatName = rNewName;
         ModifyNotification( &aOld, &aNew );
     }
     else
     {
-        m_aFmtName = rNewName;
+        m_aFormatName = rNewName;
     }
 }
 
@@ -176,7 +176,7 @@ void SwFmt::SetName( const OUString& rNewName, bool bBroadcast )
     in which <this> is defined. Currently this is important for DropCaps
     because that contains data that needs to be copied deeply.
 */
-void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
+void SwFormat::CopyAttrs( const SwFormat& rFormat, bool bReplace )
 {
     // copy only array with attributes delta
     if ( IsInCache() )
@@ -187,12 +187,12 @@ void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
     SetInSwFntCache( false );
 
     // special treatments for some attributes
-    SwAttrSet* pChgSet = const_cast<SwAttrSet*>(&rFmt.m_aSet);
+    SwAttrSet* pChgSet = const_cast<SwAttrSet*>(&rFormat.m_aSet);
 
     if( !bReplace )     // refresh only those that are not set?
     {
-        if( pChgSet == &rFmt.m_aSet )
-            pChgSet = new SwAttrSet( rFmt.m_aSet );
+        if( pChgSet == &rFormat.m_aSet )
+            pChgSet = new SwAttrSet( rFormat.m_aSet );
         pChgSet->Differentiate( m_aSet );
     }
 
@@ -215,42 +215,42 @@ void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
         }
     }
 
-    if( pChgSet != &rFmt.m_aSet ) // was a Set created?
+    if( pChgSet != &rFormat.m_aSet ) // was a Set created?
         delete pChgSet;
 }
 
-SwFmt::~SwFmt()
+SwFormat::~SwFormat()
 {
     // This happens at a ObjectDying message. Thus put all dependent
     // ones on DerivedFrom.
     if( HasWriterListeners() )
     {
-        OSL_ENSURE( DerivedFrom(), "SwFmt::~SwFmt: Def dependents!" );
+        OSL_ENSURE( DerivedFrom(), "SwFormat::~SwFormat: Def dependents!" );
 
-        m_bFmtInDTOR = true;
+        m_bFormatInDTOR = true;
 
-        SwFmt* pParentFmt = DerivedFrom();
-        if( !pParentFmt )
+        SwFormat* pParentFormat = DerivedFrom();
+        if( !pParentFormat )
         {
             SAL_WARN(
                 "sw.core",
-                "~SwFmt: parent format missing from: " << GetName() );
+                "~SwFormat: parent format missing from: " << GetName() );
         }
         else
         {
-            SwFmtChg aOldFmt( this );
-            SwFmtChg aNewFmt( pParentFmt );
-            SwIterator<SwClient,SwFmt> aIter(*this);
-            for(SwClient* pClient = aIter.First(); pClient && pParentFmt; pClient = aIter.Next())
+            SwFormatChg aOldFormat( this );
+            SwFormatChg aNewFormat( pParentFormat );
+            SwIterator<SwClient,SwFormat> aIter(*this);
+            for(SwClient* pClient = aIter.First(); pClient && pParentFormat; pClient = aIter.Next())
             {
-                pParentFmt->Add( pClient );
-                pClient->ModifyNotification( &aOldFmt, &aNewFmt );
+                pParentFormat->Add( pClient );
+                pClient->ModifyNotification( &aOldFormat, &aNewFormat );
             }
         }
     }
 }
 
-void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
+void SwFormat::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
 {
     bool bContinue = true; // true = pass on to dependent ones
 
@@ -265,15 +265,15 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
         {
             // If the dying object is the parent format of this format so
             // attach this to the parent of the parent
-            SwFmt* pFmt = static_cast<SwFmt*>(static_cast<const SwPtrMsgPoolItem*>(pNewValue)->pObject);
+            SwFormat* pFormat = static_cast<SwFormat*>(static_cast<const SwPtrMsgPoolItem*>(pNewValue)->pObject);
 
             // do not move if this is the topmost format
-            if( GetRegisteredIn() && GetRegisteredIn() == pFmt )
+            if( GetRegisteredIn() && GetRegisteredIn() == pFormat )
             {
-                if( pFmt->GetRegisteredIn() )
+                if( pFormat->GetRegisteredIn() )
                 {
                     // if parent so register in new parent
-                    pFmt->DerivedFrom()->Add( this );
+                    pFormat->DerivedFrom()->Add( this );
                     m_aSet.SetParent( &DerivedFrom()->m_aSet );
                 }
                 else
@@ -306,8 +306,8 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
 
         // skip my own Modify
         if ( pOldValue && pNewValue &&
-            static_cast<const SwFmtChg*>(pOldValue)->pChangedFmt != this &&
-            static_cast<const SwFmtChg*>(pNewValue)->pChangedFmt == GetRegisteredIn() )
+            static_cast<const SwFormatChg*>(pOldValue)->pChangedFormat != this &&
+            static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat == GetRegisteredIn() )
         {
             // attach Set to new parent
             m_aSet.SetParent( DerivedFrom() ? &DerivedFrom()->m_aSet : 0 );
@@ -322,7 +322,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
             // mba: move the code that ignores this event to the clients
 
             // pass Hint only to dependent formats (no Frames)
-            //ModifyBroadcast( pOldValue, pNewValue, TYPE(SwFmt) );
+            //ModifyBroadcast( pOldValue, pNewValue, TYPE(SwFormat) );
             //bContinue = false;
         }
         break;
@@ -345,17 +345,17 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
     }
 }
 
-bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
+bool SwFormat::SetDerivedFrom(SwFormat *pDerFrom)
 {
     if ( pDerFrom )
     {
-        const SwFmt* pFmt = pDerFrom;
-        while ( pFmt != 0 )
+        const SwFormat* pFormat = pDerFrom;
+        while ( pFormat != 0 )
         {
-            if ( pFmt == this )
+            if ( pFormat == this )
                 return false;
 
-            pFmt=pFmt->DerivedFrom();
+            pFormat=pFormat->DerivedFrom();
         }
     }
     else
@@ -384,19 +384,19 @@ bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
     pDerFrom->Add( this );
     m_aSet.SetParent( &pDerFrom->m_aSet );
 
-    SwFmtChg aOldFmt( this );
-    SwFmtChg aNewFmt( this );
-    ModifyNotification( &aOldFmt, &aNewFmt );
+    SwFormatChg aOldFormat( this );
+    SwFormatChg aNewFormat( this );
+    ModifyNotification( &aOldFormat, &aNewFormat );
 
     return true;
 }
 
-bool SwFmt::supportsFullDrawingLayerFillAttributeSet() const
+bool SwFormat::supportsFullDrawingLayerFillAttributeSet() const
 {
     return false;
 }
 
-const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, bool bInParents ) const
+const SfxPoolItem& SwFormat::GetFormatAttr( sal_uInt16 nWhich, bool bInParents ) const
 {
     if (RES_BACKGROUND == nWhich && supportsFullDrawingLayerFillAttributeSet())
     {
@@ -415,12 +415,12 @@ const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, bool bInParents ) const
     return m_aSet.Get( nWhich, bInParents );
 }
 
-SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const SfxPoolItem **ppItem ) const
+SfxItemState SwFormat::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const SfxPoolItem **ppItem ) const
 {
     if (RES_BACKGROUND == nWhich && supportsFullDrawingLayerFillAttributeSet())
     {
         //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
-        SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or SwFmt::GetBackgroundStat (simple fallback is in place and used)");
+        SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or SwFormat::GetBackgroundStat (simple fallback is in place and used)");
         const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFill = getSdrAllFillAttributesHelper();
 
         // check if the new fill attributes are used
@@ -450,7 +450,7 @@ SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const S
     return m_aSet.GetItemState( nWhich, bSrchInParent, ppItem );
 }
 
-SfxItemState SwFmt::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent) const
+SfxItemState SwFormat::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent) const
 {
     if (supportsFullDrawingLayerFillAttributeSet())
     {
@@ -478,7 +478,7 @@ SfxItemState SwFmt::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent)
     return eRet;
 }
 
-bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
+bool SwFormat::SetFormatAttr( const SfxPoolItem& rAttr )
 {
     if ( IsInCache() || IsInSwFntCache() )
     {
@@ -529,19 +529,19 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
     }
 
     // if Modify is locked then no modifications will be sent;
-    // but call Modify always for FrmFmts
-    const sal_uInt16 nFmtWhich = Which();
+    // but call Modify always for FrameFormats
+    const sal_uInt16 nFormatWhich = Which();
     if( IsModifyLocked() ||
         ( !HasWriterListeners() &&
-          (RES_GRFFMTCOLL == nFmtWhich  ||
-           RES_TXTFMTCOLL == nFmtWhich ) ) )
+          (RES_GRFFMTCOLL == nFormatWhich  ||
+           RES_TXTFMTCOLL == nFormatWhich ) ) )
     {
         if( ( bRet = (0 != m_aSet.Put( rAttr ))) )
             m_aSet.SetModifyAtAttr( this );
         // #i71574#
-        if ( nFmtWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE )
+        if ( nFormatWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE )
         {
-            TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( this );
+            TextFormatCollFunc::CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle( this );
         }
     }
     else
@@ -564,7 +564,7 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
     return bRet;
 }
 
-bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
+bool SwFormat::SetFormatAttr( const SfxItemSet& rSet )
 {
     if( !rSet.Count() )
         return false;
@@ -634,19 +634,19 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
     }
 
     // if Modify is locked then no modifications will be sent;
-    // but call Modify always for FrmFmts
-    const sal_uInt16 nFmtWhich = Which();
+    // but call Modify always for FrameFormats
+    const sal_uInt16 nFormatWhich = Which();
     if ( IsModifyLocked() ||
          ( !HasWriterListeners() &&
-           ( RES_GRFFMTCOLL == nFmtWhich ||
-             RES_TXTFMTCOLL == nFmtWhich ) ) )
+           ( RES_GRFFMTCOLL == nFormatWhich ||
+             RES_TXTFMTCOLL == nFormatWhich ) ) )
     {
         if( ( bRet = m_aSet.Put( aTempSet )) )
             m_aSet.SetModifyAtAttr( this );
         // #i71574#
-        if ( nFmtWhich == RES_TXTFMTCOLL )
+        if ( nFormatWhich == RES_TXTFMTCOLL )
         {
-            TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( this );
+            TextFormatCollFunc::CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle( this );
         }
     }
     else
@@ -667,7 +667,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
 }
 
 // remove Hint using nWhich from array with delta
-bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwFormat::ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     if( !m_aSet.Count() )
         return false;
@@ -700,7 +700,7 @@ bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 }
 
 // #i73790#
-sal_uInt16 SwFmt::ResetAllFmtAttr()
+sal_uInt16 SwFormat::ResetAllFormatAttr()
 {
     if( !m_aSet.Count() )
         return 0;
@@ -728,12 +728,12 @@ sal_uInt16 SwFmt::ResetAllFmtAttr()
     return aNew.Count();
 }
 
-bool SwFmt::GetInfo( SfxPoolItem& rInfo ) const
+bool SwFormat::GetInfo( SfxPoolItem& rInfo ) const
 {
     return SwModify::GetInfo( rInfo );
 }
 
-void SwFmt::DelDiffs( const SfxItemSet& rSet )
+void SwFormat::DelDiffs( const SfxItemSet& rSet )
 {
     if( !m_aSet.Count() )
         return;
@@ -763,7 +763,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
     }
 }
 
-/** SwFmt::IsBackgroundTransparent
+/** SwFormat::IsBackgroundTransparent
 
     Virtual method to determine, if background of format is transparent.
     Default implementation returns false. Thus, subclasses have to override
@@ -771,7 +771,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
 
     @return false, default implementation
 */
-bool SwFmt::IsBackgroundTransparent() const
+bool SwFormat::IsBackgroundTransparent() const
 {
     return false;
 }
@@ -779,16 +779,16 @@ bool SwFmt::IsBackgroundTransparent() const
 /*
  * Document Interface Access
  */
-const IDocumentSettingAccess* SwFmt::getIDocumentSettingAccess() const { return & GetDoc()->GetDocumentSettingManager(); }
-const IDocumentDrawModelAccess* SwFmt::getIDocumentDrawModelAccess() const { return & GetDoc()->getIDocumentDrawModelAccess(); }
-IDocumentDrawModelAccess* SwFmt::getIDocumentDrawModelAccess() { return & GetDoc()->getIDocumentDrawModelAccess(); }
-const IDocumentLayoutAccess* SwFmt::getIDocumentLayoutAccess() const { return &GetDoc()->getIDocumentLayoutAccess(); }
-IDocumentLayoutAccess* SwFmt::getIDocumentLayoutAccess() { return &GetDoc()->getIDocumentLayoutAccess(); }
-IDocumentTimerAccess* SwFmt::getIDocumentTimerAccess() { return & GetDoc()->getIDocumentTimerAccess(); }
-IDocumentFieldsAccess* SwFmt::getIDocumentFieldsAccess() { return &GetDoc()->getIDocumentFieldsAccess(); }
-IDocumentChartDataProviderAccess* SwFmt::getIDocumentChartDataProviderAccess() { return & GetDoc()->getIDocumentChartDataProviderAccess(); }
-
-void SwFmt::GetGrabBagItem(uno::Any& rVal) const
+const IDocumentSettingAccess* SwFormat::getIDocumentSettingAccess() const { return & GetDoc()->GetDocumentSettingManager(); }
+const IDocumentDrawModelAccess* SwFormat::getIDocumentDrawModelAccess() const { return & GetDoc()->getIDocumentDrawModelAccess(); }
+IDocumentDrawModelAccess* SwFormat::getIDocumentDrawModelAccess() { return & GetDoc()->getIDocumentDrawModelAccess(); }
+const IDocumentLayoutAccess* SwFormat::getIDocumentLayoutAccess() const { return &GetDoc()->getIDocumentLayoutAccess(); }
+IDocumentLayoutAccess* SwFormat::getIDocumentLayoutAccess() { return &GetDoc()->getIDocumentLayoutAccess(); }
+IDocumentTimerAccess* SwFormat::getIDocumentTimerAccess() { return & GetDoc()->getIDocumentTimerAccess(); }
+IDocumentFieldsAccess* SwFormat::getIDocumentFieldsAccess() { return &GetDoc()->getIDocumentFieldsAccess(); }
+IDocumentChartDataProviderAccess* SwFormat::getIDocumentChartDataProviderAccess() { return & GetDoc()->getIDocumentChartDataProviderAccess(); }
+
+void SwFormat::GetGrabBagItem(uno::Any& rVal) const
 {
     if (m_pGrabBagItem.get())
         m_pGrabBagItem->QueryValue(rVal);
@@ -799,7 +799,7 @@ void SwFmt::GetGrabBagItem(uno::Any& rVal) const
     }
 }
 
-void SwFmt::SetGrabBagItem(const uno::Any& rVal)
+void SwFormat::SetGrabBagItem(const uno::Any& rVal)
 {
     if (!m_pGrabBagItem.get())
         m_pGrabBagItem.reset(new SfxGrabBagItem);
@@ -808,7 +808,7 @@ void SwFmt::SetGrabBagItem(const uno::Any& rVal)
 }
 
 //UUUU
-SvxBrushItem SwFmt::makeBackgroundBrushItem(bool bInP) const
+SvxBrushItem SwFormat::makeBackgroundBrushItem(bool bInP) const
 {
     if (supportsFullDrawingLayerFillAttributeSet())
     {
@@ -825,7 +825,7 @@ SvxBrushItem SwFmt::makeBackgroundBrushItem(bool bInP) const
 }
 
 //UUUU
-drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFmt::getSdrAllFillAttributesHelper() const
+drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFormat::getSdrAllFillAttributesHelper() const
 {
     return drawinglayer::attribute::SdrAllFillAttributesHelperPtr();
 }
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index c1e79806fdd2..266e2f155170 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -24,12 +24,12 @@
 #include <ndtxt.hxx>
 #include <swtypes.hxx>
 
-SwFmtChg::SwFmtChg( SwFmt* pFmt )
-    : SwMsgPoolItem( RES_FMT_CHG ), pChangedFmt( pFmt )
+SwFormatChg::SwFormatChg( SwFormat* pFormat )
+    : SwMsgPoolItem( RES_FMT_CHG ), pChangedFormat( pFormat )
 {
 }
 
-SwInsTxt::SwInsTxt( sal_Int32 nP, sal_Int32 nL )
+SwInsText::SwInsText( sal_Int32 nP, sal_Int32 nL )
     : SwMsgPoolItem( RES_INS_TXT ), nPos( nP ), nLen( nL )
 {
 }
@@ -39,17 +39,17 @@ SwDelChr::SwDelChr( sal_Int32 nP )
 {
 }
 
-SwDelTxt::SwDelTxt( sal_Int32 nS, sal_Int32 nL )
+SwDelText::SwDelText( sal_Int32 nS, sal_Int32 nL )
     : SwMsgPoolItem( RES_DEL_TXT ), nStart( nS ), nLen( nL )
 {
 }
 
 SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW )
-    : SwMsgPoolItem( RES_UPDATE_ATTR ), nStart( nS ), nEnd( nE ), nWhichAttr( nW ), aWhichFmtAttr()
+    : SwMsgPoolItem( RES_UPDATE_ATTR ), nStart( nS ), nEnd( nE ), nWhichAttr( nW ), aWhichFormatAttr()
 {
 }
 
-SwRefMarkFldUpdate::SwRefMarkFldUpdate( OutputDevice* pOutput )
+SwRefMarkFieldUpdate::SwRefMarkFieldUpdate( OutputDevice* pOutput )
     : SwMsgPoolItem( RES_REFMARKFLD_UPDATE ),
     pOut( pOutput )
 {
@@ -61,18 +61,18 @@ SwDocPosUpdate::SwDocPosUpdate( const SwTwips nDcPos )
 {
 }
 
-SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl )
+SwTableFormulaUpdate::SwTableFormulaUpdate( const SwTable* pNewTable )
     : SwMsgPoolItem( RES_TABLEFML_UPDATE ),
-    pTbl( pNewTbl ), pHistory( 0 ), nSplitLine( USHRT_MAX ),
+    pTable( pNewTable ), pHistory( 0 ), nSplitLine( USHRT_MAX ),
     eFlags( TBL_CALC )
 {
-    DATA.pDelTbl = 0;
+    DATA.pDelTable = 0;
     bModified = bBehindSplitLine = false;
-    OSL_ENSURE( pTbl, "No Table pointer" );
+    OSL_ENSURE( pTable, "No Table pointer" );
 }
 
-SwAutoFmtGetDocNode::SwAutoFmtGetDocNode( const SwNodes* pNds )
-    : SwMsgPoolItem( RES_AUTOFMT_DOCNODE ), pCntntNode( 0 ), pNodes( pNds )
+SwAutoFormatGetDocNode::SwAutoFormatGetDocNode( const SwNodes* pNds )
+    : SwMsgPoolItem( RES_AUTOFMT_DOCNODE ), pContentNode( 0 ), pNodes( pNds )
 {
 }
 
@@ -129,7 +129,7 @@ const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
     OSL_ASSERT( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN );
 
     SfxPoolItem *pHt = aAttrTab[ nWhich - POOLATTR_BEGIN ];
-    OSL_ENSURE( pHt, "GetDfltFmtAttr(): Dflt == 0" );
+    OSL_ENSURE( pHt, "GetDfltFormatAttr(): Dflt == 0" );
     return pHt;
 }
 #else
@@ -139,8 +139,8 @@ const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
 }
 #endif
 
-SwCondCollCondChg::SwCondCollCondChg( SwFmt *pFmt )
-    : SwMsgPoolItem( RES_CONDCOLL_CONDCHG ), pChangedFmt( pFmt )
+SwCondCollCondChg::SwCondCollCondChg( SwFormat *pFormat )
+    : SwMsgPoolItem( RES_CONDCOLL_CONDCHG ), pChangedFormat( pFormat )
 {
 }
 
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 8631b06e784c..13806f1a5b25 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -254,8 +254,8 @@ void  SwAttrSet::Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew )
 /** special treatment for some attributes
 
     Set the Modify pointer (old pDefinedIn) for the following attributes:
-     - SwFmtDropCaps
-     - SwFmtPageDesc
+     - SwFormatDropCaps
+     - SwFormatPageDesc
 
     (Is called at inserts into formats/nodes)
 */
@@ -265,32 +265,32 @@ bool SwAttrSet::SetModifyAtAttr( const SwModify* pModify )
 
     const SfxPoolItem* pItem;
     if( SfxItemState::SET == GetItemState( RES_PAGEDESC, false, &pItem ) &&
-        static_cast<const SwFmtPageDesc*>(pItem)->GetDefinedIn() != pModify  )
+        static_cast<const SwFormatPageDesc*>(pItem)->GetDefinedIn() != pModify  )
     {
-        const_cast<SwFmtPageDesc*>(static_cast<const SwFmtPageDesc*>(pItem))->ChgDefinedIn( pModify );
+        const_cast<SwFormatPageDesc*>(static_cast<const SwFormatPageDesc*>(pItem))->ChgDefinedIn( pModify );
         bSet = true;
     }
 
     if( SfxItemState::SET == GetItemState( RES_PARATR_DROP, false, &pItem ) &&
-        static_cast<const SwFmtDrop*>(pItem)->GetDefinedIn() != pModify )
+        static_cast<const SwFormatDrop*>(pItem)->GetDefinedIn() != pModify )
     {
         // If CharFormat is set and it is set in different attribute pools then
         // the CharFormat has to be copied.
-        SwCharFmt* pCharFmt;
-        if( 0 != ( pCharFmt = const_cast<SwFmtDrop*>(static_cast<const SwFmtDrop*>(pItem))->GetCharFmt() )
-            && GetPool() != pCharFmt->GetAttrSet().GetPool() )
+        SwCharFormat* pCharFormat;
+        if( 0 != ( pCharFormat = const_cast<SwFormatDrop*>(static_cast<const SwFormatDrop*>(pItem))->GetCharFormat() )
+            && GetPool() != pCharFormat->GetAttrSet().GetPool() )
         {
-           pCharFmt = GetDoc()->CopyCharFmt( *pCharFmt );
-           const_cast<SwFmtDrop*>(static_cast<const SwFmtDrop*>(pItem))->SetCharFmt( pCharFmt );
+           pCharFormat = GetDoc()->CopyCharFormat( *pCharFormat );
+           const_cast<SwFormatDrop*>(static_cast<const SwFormatDrop*>(pItem))->SetCharFormat( pCharFormat );
         }
-        const_cast<SwFmtDrop*>(static_cast<const SwFmtDrop*>(pItem))->ChgDefinedIn( pModify );
+        const_cast<SwFormatDrop*>(static_cast<const SwFormatDrop*>(pItem))->ChgDefinedIn( pModify );
         bSet = true;
     }
 
     if( SfxItemState::SET == GetItemState( RES_BOXATR_FORMULA, false, &pItem ) &&
-        static_cast<const SwTblBoxFormula*>(pItem)->GetDefinedIn() != pModify )
+        static_cast<const SwTableBoxFormula*>(pItem)->GetDefinedIn() != pModify )
     {
-        const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->ChgDefinedIn( pModify );
+        const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->ChgDefinedIn( pModify );
         bSet = true;
     }
 
@@ -300,10 +300,10 @@ bool SwAttrSet::SetModifyAtAttr( const SwModify* pModify )
 void SwAttrSet::CopyToModify( SwModify& rMod ) const
 {
     // copy attributes across multiple documents if needed
-    SwCntntNode* pCNd = PTR_CAST( SwCntntNode, &rMod );
-    SwFmt* pFmt = PTR_CAST( SwFmt, &rMod );
+    SwContentNode* pCNd = PTR_CAST( SwContentNode, &rMod );
+    SwFormat* pFormat = PTR_CAST( SwFormat, &rMod );
 
-    if( pCNd || pFmt )
+    if( pCNd || pFormat )
     {
         if( Count() )
         {
@@ -312,7 +312,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
 
             const SfxPoolItem* pItem;
             const SwDoc *pSrcDoc = GetDoc();
-            SwDoc *pDstDoc = pCNd ? pCNd->GetDoc() : pFmt->GetDoc();
+            SwDoc *pDstDoc = pCNd ? pCNd->GetDoc() : pFormat->GetDoc();
 
             // Does the NumRule has to be copied?
             if( pSrcDoc != pDstDoc &&
@@ -332,7 +332,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
             // copy list and if needed also the corresponding list style
             // for text nodes
             if ( pSrcDoc != pDstDoc &&
-                 pCNd && pCNd->IsTxtNode() &&
+                 pCNd && pCNd->IsTextNode() &&
                  GetItemState( RES_PARATR_LIST_ID, false, &pItem ) == SfxItemState::SET )
             {
                 const OUString& sListId =
@@ -383,7 +383,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
             const SwPageDesc* pPgDesc;
             if( pSrcDoc != pDstDoc && SfxItemState::SET == GetItemState(
                                             RES_PAGEDESC, false, &pItem ) &&
-                0 != ( pPgDesc = static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc()) )
+                0 != ( pPgDesc = static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc()) )
             {
                 if( !tmpSet )
                     tmpSet.reset( new SfxItemSet( *this ));
@@ -394,13 +394,13 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
                     pDstPgDesc = pDstDoc->MakePageDesc(pPgDesc->GetName());
                     pDstDoc->CopyPageDesc( *pPgDesc, *pDstPgDesc );
                 }
-                SwFmtPageDesc aDesc( pDstPgDesc );
-                aDesc.SetNumOffset( static_cast<const SwFmtPageDesc*>(pItem)->GetNumOffset() );
+                SwFormatPageDesc aDesc( pDstPgDesc );
+                aDesc.SetNumOffset( static_cast<const SwFormatPageDesc*>(pItem)->GetNumOffset() );
                 tmpSet->Put( aDesc );
             }
 
             if( pSrcDoc != pDstDoc && SfxItemState::SET == GetItemState( RES_ANCHOR, false, &pItem )
-                && static_cast< const SwFmtAnchor* >( pItem )->GetCntntAnchor() != NULL )
+                && static_cast< const SwFormatAnchor* >( pItem )->GetContentAnchor() != NULL )
             {
                 if( !tmpSet )
                     tmpSet.reset( new SfxItemSet( *this ));
@@ -422,7 +422,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
                 }
                 else
                 {
-                    pFmt->SetFmtAttr( *tmpSet );
+                    pFormat->SetFormatAttr( *tmpSet );
                 }
             }
             else if( pCNd )
@@ -441,7 +441,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
             }
             else
             {
-                pFmt->SetFmtAttr( *this );
+                pFormat->SetFormatAttr( *this );
             }
 
             // #i92811#
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index b1c834926519..83285a49e847 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -97,44 +97,44 @@ void SwBreakIt::_GetForbidden( const LanguageType aLang )
     m_pForbidden = new i18n::ForbiddenCharacters( aWrap.getForbiddenCharacters() );
 }
 
-sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const
+sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rText, sal_Int32 nPos ) const
 {
     createBreakIterator();
     sal_uInt16 nScript = i18n::ScriptType::WEAK;
-    if( xBreak.is() && !rTxt.isEmpty() )
+    if( xBreak.is() && !rText.isEmpty() )
     {
-        if( nPos && nPos == rTxt.getLength() )
+        if( nPos && nPos == rText.getLength() )
             --nPos;
         else if( nPos < 0)
             nPos = 0;
 
-        nScript = xBreak->getScriptType( rTxt, nPos );
+        nScript = xBreak->getScriptType( rText, nPos );
         sal_Int32 nChgPos = 0;
-        if (i18n::ScriptType::WEAK == nScript && nPos >= 0 && nPos + 1 < rTxt.getLength())
+        if (i18n::ScriptType::WEAK == nScript && nPos >= 0 && nPos + 1 < rText.getLength())
         {
             // A weak character followed by a mark may be meant to combine with
             // the mark, so prefer the following character's script
-            switch (u_charType(rTxt[nPos + 1]))
+            switch (u_charType(rText[nPos + 1]))
             {
                 case U_NON_SPACING_MARK:
                 case U_ENCLOSING_MARK:
                 case U_COMBINING_SPACING_MARK:
-                    nScript = xBreak->getScriptType( rTxt, nPos+1 );
+                    nScript = xBreak->getScriptType( rText, nPos+1 );
                     break;
             }
         }
         if( i18n::ScriptType::WEAK == nScript &&
             nPos &&
-            0 < ( nChgPos = xBreak->beginOfScript( rTxt, nPos, nScript ) ) )
+            0 < ( nChgPos = xBreak->beginOfScript( rText, nPos, nScript ) ) )
         {
-            nScript = xBreak->getScriptType( rTxt, nChgPos-1 );
+            nScript = xBreak->getScriptType( rText, nChgPos-1 );
         }
 
         if( i18n::ScriptType::WEAK == nScript &&
-            rTxt.getLength() > ( nChgPos = xBreak->endOfScript( rTxt, nPos, nScript ) ) &&
+            rText.getLength() > ( nChgPos = xBreak->endOfScript( rText, nPos, nScript ) ) &&
             0 <= nChgPos )
         {
-            nScript = xBreak->getScriptType( rTxt, nChgPos );
+            nScript = xBreak->getScriptType( rText, nChgPos );
         }
     }
     if( i18n::ScriptType::WEAK == nScript )
@@ -142,7 +142,7 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos
     return nScript;
 }
 
-SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rTxt ) const
+SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rText ) const
 {
     const SvtScriptType coAllScripts = ( SvtScriptType::LATIN |
                                       SvtScriptType::ASIAN |
@@ -154,12 +154,12 @@ SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rTxt ) const
     {
         nRet = coAllScripts;
     }
-    else if( !rTxt.isEmpty() )
+    else if( !rText.isEmpty() )
     {
-        for( sal_Int32 n = 0, nEnd = rTxt.getLength(); n < nEnd;
-                n = xBreak->endOfScript(rTxt, n, nScript) )
+        for( sal_Int32 n = 0, nEnd = rText.getLength(); n < nEnd;
+                n = xBreak->endOfScript(rText, n, nScript) )
         {
-            switch( nScript = xBreak->getScriptType( rTxt, n ) )
+            switch( nScript = xBreak->getScriptType( rText, n ) )
             {
             case i18n::ScriptType::LATIN:   nRet |= SvtScriptType::LATIN;   break;
             case i18n::ScriptType::ASIAN:   nRet |= SvtScriptType::ASIAN;   break;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index be2939e8eec6..1eb97f33e5e9 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -186,14 +186,14 @@ _CalcOp* FindOperator( const OUString& rSrch )
 }
 
 SwHash* Find( const OUString& rStr, SwHash* const * ppTable,
-              sal_uInt16 nTblSize, sal_uInt16* pPos )
+              sal_uInt16 nTableSize, sal_uInt16* pPos )
 {
     sal_uLong ii = 0;
     for( sal_Int32 n = 0; n < rStr.getLength(); ++n )
     {
         ii = ii << 1 ^ rStr[n];
     }
-    ii %= nTblSize;
+    ii %= nTableSize;
 
     if( pPos )
         *pPos = static_cast<sal_uInt16>(ii);
@@ -312,7 +312,7 @@ SwCalc::SwCalc( SwDoc& rD )
 
     static sal_uInt16 SwDocStat::* const aDocStat1[ 3 ] =
     {
-        &SwDocStat::nTbl, &SwDocStat::nGrf, &SwDocStat::nOLE
+        &SwDocStat::nTable, &SwDocStat::nGrf, &SwDocStat::nOLE
     };
     static sal_uLong SwDocStat::* const aDocStat2[ 4 ] =
     {
@@ -458,14 +458,14 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
     if( !pFnd )
     {
         // then check doc
-        SwHash* const * ppDocTbl = rDoc.getIDocumentFieldsAccess().GetUpdtFlds().GetFldTypeTable();
-        for( SwHash* pEntry = *(ppDocTbl+ii); pEntry; pEntry = pEntry->pNext )
+        SwHash* const * ppDocTable = rDoc.getIDocumentFieldsAccess().GetUpdateFields().GetFieldTypeTable();
+        for( SwHash* pEntry = *(ppDocTable+ii); pEntry; pEntry = pEntry->pNext )
         {
             if( aStr == pEntry->aStr )
             {
                 // then insert here
                 pFnd = new SwCalcExp( aStr, SwSbxValue(),
-                                    static_cast<SwCalcFldType*>(pEntry)->pFldType );
+                                    static_cast<SwCalcFieldType*>(pEntry)->pFieldType );
                 pFnd->pNext = *(VarTable+ii);
                 *(VarTable+ii) = pFnd;
                 break;
@@ -477,14 +477,14 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
     {
         SwCalcExp* pFndExp = static_cast<SwCalcExp*>(pFnd);
 
-        if( pFndExp->pFldType && pFndExp->pFldType->Which() == RES_USERFLD )
+        if( pFndExp->pFieldType && pFndExp->pFieldType->Which() == RES_USERFLD )
         {
-            SwUserFieldType* pUFld = const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFndExp->pFldType));
-            if( nsSwGetSetExpType::GSE_STRING & pUFld->GetType() )
+            SwUserFieldType* pUField = const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFndExp->pFieldType));
+            if( nsSwGetSetExpType::GSE_STRING & pUField->GetType() )
             {
-                pFndExp->nValue.PutString( pUFld->GetContent() );
+                pFndExp->nValue.PutString( pUField->GetContent() );
             }
-            else if( !pUFld->IsValid() )
+            else if( !pUField->IsValid() )
             {
                 // Save the current values...
                 sal_uInt16          nOld_ListPor        = nListPor;
@@ -494,7 +494,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
                 SwCalcOper      eOld_CurrOper       = eCurrOper;
                 SwCalcOper      eOld_CurrListOper   = eCurrListOper;
 
-                pFndExp->nValue.PutDouble( pUFld->GetValue( *this ) );
+                pFndExp->nValue.PutDouble( pUField->GetValue( *this ) );
 
                 // ...and write them back.
                 nListPor        = nOld_ListPor;
@@ -506,7 +506,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
             }
             else
             {
-                pFndExp->nValue.PutDouble( pUFld->GetValue() );
+                pFndExp->nValue.PutDouble( pUField->GetValue() );
             }
         }
         return pFndExp;
@@ -1589,7 +1589,7 @@ SwCalcExp::SwCalcExp(const OUString& rStr, const SwSbxValue& rVal,
                       const SwFieldType* pType)
     : SwHash(rStr)
     , nValue(rVal)
-    , pFldType(pType)
+    , pFieldType(pType)
 {
 }
 
@@ -1660,8 +1660,8 @@ void main()
         sNType24, sNType25, sNType26
     };
 
-    const unsigned short nTblSize = 47;
-    int aArr[ nTblSize ] = { 0 };
+    const unsigned short nTableSize = 47;
+    int aArr[ nTableSize ] = { 0 };
     sal_Char ch;
 
     for( int n = 0; n < 27; ++n )
@@ -1673,7 +1673,7 @@ void main()
         {
             ii = ii << 1 ^ *pp++;
         }
-        ii %= nTblSize;
+        ii %= nTableSize;
 
         ch = aArr[ ii ] ? 'X' : ' ';
         aArr[ ii ] = 1;
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index c83070914984..7439d300bd1f 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -141,10 +141,10 @@ sal_uInt16 aBreakSetRange[] = {
     0
 };
 
-// AttrSet range for TxtFmtColl
+// AttrSet range for TextFormatColl
 // list attributes ( RES_PARATR_LIST_BEGIN - RES_PARATR_LIST_END ) are not
 // included in the paragraph style's itemset.
-sal_uInt16 aTxtFmtCollSetRange[] = {
+sal_uInt16 aTextFormatCollSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
     RES_PARATR_BEGIN, RES_PARATR_END-1,
@@ -156,8 +156,8 @@ sal_uInt16 aTxtFmtCollSetRange[] = {
     0
 };
 
-// AttrSet range for GrfFmtColl
-sal_uInt16 aGrfFmtCollSetRange[] = {
+// AttrSet range for GrfFormatColl
+sal_uInt16 aGrfFormatCollSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_GRFATR_BEGIN, RES_GRFATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -165,7 +165,7 @@ sal_uInt16 aGrfFmtCollSetRange[] = {
 };
 
 // AttrSet range for TextNode
-sal_uInt16 aTxtNodeSetRange[] = {
+sal_uInt16 aTextNodeSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
     RES_PARATR_BEGIN, RES_PARATR_END-1,
@@ -178,8 +178,8 @@ sal_uInt16 aTxtNodeSetRange[] = {
     0
 };
 
-// AttrSet range for NoTxtNode
-sal_uInt16 aNoTxtNodeSetRange[] = {
+// AttrSet range for NoTextNode
+sal_uInt16 aNoTextNodeSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_GRFATR_BEGIN, RES_GRFATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -227,8 +227,8 @@ sal_uInt16 aTableBoxSetRange[] = {
     0
 };
 
-// AttrSet range for SwFrmFmt
-sal_uInt16 aFrmFmtSetRange[] = {
+// AttrSet range for SwFrameFormat
+sal_uInt16 aFrameFormatSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
 
@@ -238,23 +238,23 @@ sal_uInt16 aFrmFmtSetRange[] = {
     0
 };
 
-// AttrSet range for SwCharFmt
-sal_uInt16 aCharFmtSetRange[] = {
+// AttrSet range for SwCharFormat
+sal_uInt16 aCharFormatSetRange[] = {
     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
     0
 };
 
 // AttrSet range for character autostyles
-sal_uInt16 aCharAutoFmtSetRange[] = {
+sal_uInt16 aCharAutoFormatSetRange[] = {
     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
     RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
     0
 };
 
-// AttrSet range for SwPageDescFmt
-sal_uInt16 aPgFrmFmtSetRange[] = {
+// AttrSet range for SwPageDescFormat
+sal_uInt16 aPgFrameFormatSetRange[] = {
     RES_FRMATR_BEGIN, RES_FRMATR_END-1,
     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
     0
@@ -518,21 +518,21 @@ void _InitCore()
     aAttrTab[ RES_CHRATR_BIDIRTL - POOLATTR_BEGIN ] = new SfxInt16Item( RES_CHRATR_BIDIRTL, sal_Int16(-1) );
     aAttrTab[ RES_CHRATR_IDCTHINT - POOLATTR_BEGIN ] = new SfxInt16Item( RES_CHRATR_IDCTHINT, sal_Int16(-1) );
 
-    aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] =       new SwFmtRefMark( OUString() );
+    aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] =       new SwFormatRefMark( OUString() );
     aAttrTab[ RES_TXTATR_TOXMARK - POOLATTR_BEGIN ] =       new SwTOXMark;
-    aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] =          SwFmtMeta::CreatePoolDefault(RES_TXTATR_META);
-    aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] =     SwFmtMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
-    aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] =        new SwFmtAutoFmt;
-    aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] =       new SwFmtINetFmt( OUString(), OUString() );
-    aAttrTab[ RES_TXTATR_CHARFMT- POOLATTR_BEGIN ] =        new SwFmtCharFmt( 0 );
-    aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] =      new SwFmtRuby( OUString() );
+    aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] =          SwFormatMeta::CreatePoolDefault(RES_TXTATR_META);
+    aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] =     SwFormatMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
+    aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] =        new SwFormatAutoFormat;
+    aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] =       new SwFormatINetFormat( OUString(), OUString() );
+    aAttrTab[ RES_TXTATR_CHARFMT- POOLATTR_BEGIN ] =        new SwFormatCharFormat( 0 );
+    aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] =      new SwFormatRuby( OUString() );
     aAttrTab[ RES_TXTATR_UNKNOWN_CONTAINER - POOLATTR_BEGIN ] = new SvXMLAttrContainerItem( RES_TXTATR_UNKNOWN_CONTAINER );
-    aAttrTab[ RES_TXTATR_INPUTFIELD - POOLATTR_BEGIN ] = new SwFmtFld( RES_TXTATR_INPUTFIELD );
+    aAttrTab[ RES_TXTATR_INPUTFIELD - POOLATTR_BEGIN ] = new SwFormatField( RES_TXTATR_INPUTFIELD );
 
-    aAttrTab[ RES_TXTATR_FIELD- POOLATTR_BEGIN ] =          new SwFmtFld( RES_TXTATR_FIELD );
-    aAttrTab[ RES_TXTATR_FLYCNT - POOLATTR_BEGIN ] =        new SwFmtFlyCnt( 0 );
-    aAttrTab[ RES_TXTATR_FTN - POOLATTR_BEGIN ] =           new SwFmtFtn;
-    aAttrTab[ RES_TXTATR_ANNOTATION - POOLATTR_BEGIN ] = new SwFmtFld( RES_TXTATR_ANNOTATION );
+    aAttrTab[ RES_TXTATR_FIELD- POOLATTR_BEGIN ] =          new SwFormatField( RES_TXTATR_FIELD );
+    aAttrTab[ RES_TXTATR_FLYCNT - POOLATTR_BEGIN ] =        new SwFormatFlyCnt( 0 );
+    aAttrTab[ RES_TXTATR_FTN - POOLATTR_BEGIN ] =           new SwFormatFootnote;
+    aAttrTab[ RES_TXTATR_ANNOTATION - POOLATTR_BEGIN ] = new SwFormatField( RES_TXTATR_ANNOTATION );
 
 // TextAttr - Dummies
     aAttrTab[ RES_TXTATR_DUMMY1 - POOLATTR_BEGIN ] =        new SfxBoolItem( RES_TXTATR_DUMMY1 );
@@ -541,7 +541,7 @@ void _InitCore()
 
     aAttrTab[ RES_PARATR_LINESPACING- POOLATTR_BEGIN ] =    new SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING );
     aAttrTab[ RES_PARATR_ADJUST- POOLATTR_BEGIN ] =         new SvxAdjustItem( SVX_ADJUST_LEFT, RES_PARATR_ADJUST );
-    aAttrTab[ RES_PARATR_SPLIT- POOLATTR_BEGIN ] =          new SvxFmtSplitItem( true, RES_PARATR_SPLIT );
+    aAttrTab[ RES_PARATR_SPLIT- POOLATTR_BEGIN ] =          new SvxFormatSplitItem( true, RES_PARATR_SPLIT );
     aAttrTab[ RES_PARATR_WIDOWS- POOLATTR_BEGIN ] =         new SvxWidowsItem( 0, RES_PARATR_WIDOWS );
     aAttrTab[ RES_PARATR_ORPHANS- POOLATTR_BEGIN ] =        new SvxOrphansItem( 0, RES_PARATR_ORPHANS );
     aAttrTab[ RES_PARATR_TABSTOP- POOLATTR_BEGIN ] =        new SvxTabStopItem( 1, SVX_TAB_DEFDIST, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
@@ -550,7 +550,7 @@ void _InitCore()
     static_cast<SvxHyphenZoneItem*>(pItem)->GetMaxHyphens() = 0; // Default: 0
     aAttrTab[ RES_PARATR_HYPHENZONE- POOLATTR_BEGIN ] =     pItem;
 
-    aAttrTab[ RES_PARATR_DROP- POOLATTR_BEGIN ] =           new SwFmtDrop;
+    aAttrTab[ RES_PARATR_DROP- POOLATTR_BEGIN ] =           new SwFormatDrop;
     aAttrTab[ RES_PARATR_REGISTER - POOLATTR_BEGIN ] =      new SwRegisterItem( false );
     aAttrTab[ RES_PARATR_NUMRULE - POOLATTR_BEGIN ] =       new SwNumRuleItem( OUString() );
 
@@ -571,51 +571,51 @@ void _InitCore()
     aAttrTab[ RES_PARATR_LIST_RESTARTVALUE - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_RESTARTVALUE, 1 );
     aAttrTab[ RES_PARATR_LIST_ISCOUNTED - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISCOUNTED, true );
 
-    aAttrTab[ RES_FILL_ORDER- POOLATTR_BEGIN ] =            new SwFmtFillOrder;
-    aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] =              new SwFmtFrmSize;
+    aAttrTab[ RES_FILL_ORDER- POOLATTR_BEGIN ] =            new SwFormatFillOrder;
+    aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] =              new SwFormatFrmSize;
     aAttrTab[ RES_PAPER_BIN- POOLATTR_BEGIN ] =             new SvxPaperBinItem( RES_PAPER_BIN );
     aAttrTab[ RES_LR_SPACE- POOLATTR_BEGIN ] =              new SvxLRSpaceItem( RES_LR_SPACE );
     aAttrTab[ RES_UL_SPACE- POOLATTR_BEGIN ] =              new SvxULSpaceItem( RES_UL_SPACE );
-    aAttrTab[ RES_PAGEDESC- POOLATTR_BEGIN ] =              new SwFmtPageDesc;
-    aAttrTab[ RES_BREAK- POOLATTR_BEGIN ] =                 new SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK);
-    aAttrTab[ RES_CNTNT- POOLATTR_BEGIN ] =                 new SwFmtCntnt;
-    aAttrTab[ RES_HEADER- POOLATTR_BEGIN ] =                new SwFmtHeader;
-    aAttrTab[ RES_FOOTER- POOLATTR_BEGIN ] =                new SwFmtFooter;
+    aAttrTab[ RES_PAGEDESC- POOLATTR_BEGIN ] =              new SwFormatPageDesc;
+    aAttrTab[ RES_BREAK- POOLATTR_BEGIN ] =                 new SvxFormatBreakItem( SVX_BREAK_NONE, RES_BREAK);
+    aAttrTab[ RES_CNTNT- POOLATTR_BEGIN ] =                 new SwFormatContent;
+    aAttrTab[ RES_HEADER- POOLATTR_BEGIN ] =                new SwFormatHeader;
+    aAttrTab[ RES_FOOTER- POOLATTR_BEGIN ] =                new SwFormatFooter;
     aAttrTab[ RES_PRINT- POOLATTR_BEGIN ] =                 new SvxPrintItem( RES_PRINT );
     aAttrTab[ RES_OPAQUE- POOLATTR_BEGIN ] =                new SvxOpaqueItem( RES_OPAQUE );
     aAttrTab[ RES_PROTECT- POOLATTR_BEGIN ] =               new SvxProtectItem( RES_PROTECT );
-    aAttrTab[ RES_SURROUND- POOLATTR_BEGIN ] =              new SwFmtSurround;
-    aAttrTab[ RES_VERT_ORIENT- POOLATTR_BEGIN ] =           new SwFmtVertOrient;
-    aAttrTab[ RES_HORI_ORIENT- POOLATTR_BEGIN ] =           new SwFmtHoriOrient;
-    aAttrTab[ RES_ANCHOR- POOLATTR_BEGIN ] =                new SwFmtAnchor;
+    aAttrTab[ RES_SURROUND- POOLATTR_BEGIN ] =              new SwFormatSurround;
+    aAttrTab[ RES_VERT_ORIENT- POOLATTR_BEGIN ] =           new SwFormatVertOrient;
+    aAttrTab[ RES_HORI_ORIENT- POOLATTR_BEGIN ] =           new SwFormatHoriOrient;
+    aAttrTab[ RES_ANCHOR- POOLATTR_BEGIN ] =                new SwFormatAnchor;
     aAttrTab[ RES_BACKGROUND- POOLATTR_BEGIN ] =            new SvxBrushItem( RES_BACKGROUND );
     aAttrTab[ RES_BOX- POOLATTR_BEGIN ] =                   new SvxBoxItem( RES_BOX );
     aAttrTab[ RES_SHADOW- POOLATTR_BEGIN ] =                new SvxShadowItem( RES_SHADOW );
     aAttrTab[ RES_FRMMACRO- POOLATTR_BEGIN ] =              new SvxMacroItem( RES_FRMMACRO );
-    aAttrTab[ RES_COL- POOLATTR_BEGIN ] =                   new SwFmtCol;
-    aAttrTab[ RES_KEEP - POOLATTR_BEGIN ] =                 new SvxFmtKeepItem( false, RES_KEEP );
-    aAttrTab[ RES_URL - POOLATTR_BEGIN ] =                  new SwFmtURL();
-    aAttrTab[ RES_EDIT_IN_READONLY - POOLATTR_BEGIN ] =     new SwFmtEditInReadonly;
-    aAttrTab[ RES_LAYOUT_SPLIT - POOLATTR_BEGIN ] =         new SwFmtLayoutSplit;
-    aAttrTab[ RES_CHAIN - POOLATTR_BEGIN ] =                new SwFmtChain;
+    aAttrTab[ RES_COL- POOLATTR_BEGIN ] =                   new SwFormatCol;
+    aAttrTab[ RES_KEEP - POOLATTR_BEGIN ] =                 new SvxFormatKeepItem( false, RES_KEEP );
+    aAttrTab[ RES_URL - POOLATTR_BEGIN ] =                  new SwFormatURL();
+    aAttrTab[ RES_EDIT_IN_READONLY - POOLATTR_BEGIN ] =     new SwFormatEditInReadonly;
+    aAttrTab[ RES_LAYOUT_SPLIT - POOLATTR_BEGIN ] =         new SwFormatLayoutSplit;
+    aAttrTab[ RES_CHAIN - POOLATTR_BEGIN ] =                new SwFormatChain;
     aAttrTab[ RES_TEXTGRID - POOLATTR_BEGIN ] =             new SwTextGridItem;
     aAttrTab[ RES_HEADER_FOOTER_EAT_SPACING - POOLATTR_BEGIN ] = new SwHeaderAndFooterEatSpacingItem;
-    aAttrTab[ RES_LINENUMBER - POOLATTR_BEGIN ] =           new SwFmtLineNumber;
-    aAttrTab[ RES_FTN_AT_TXTEND - POOLATTR_BEGIN ] =        new SwFmtFtnAtTxtEnd;
-    aAttrTab[ RES_END_AT_TXTEND - POOLATTR_BEGIN ] =        new SwFmtEndAtTxtEnd;
-    aAttrTab[ RES_COLUMNBALANCE - POOLATTR_BEGIN ] =        new SwFmtNoBalancedColumns;
+    aAttrTab[ RES_LINENUMBER - POOLATTR_BEGIN ] =           new SwFormatLineNumber;
+    aAttrTab[ RES_FTN_AT_TXTEND - POOLATTR_BEGIN ] =        new SwFormatFootnoteAtTextEnd;
+    aAttrTab[ RES_END_AT_TXTEND - POOLATTR_BEGIN ] =        new SwFormatEndAtTextEnd;
+    aAttrTab[ RES_COLUMNBALANCE - POOLATTR_BEGIN ] =        new SwFormatNoBalancedColumns;
     aAttrTab[ RES_FRAMEDIR - POOLATTR_BEGIN ] =             new SvxFrameDirectionItem( FRMDIR_ENVIRONMENT, RES_FRAMEDIR );
-    aAttrTab[ RES_ROW_SPLIT - POOLATTR_BEGIN ] =            new SwFmtRowSplit;
+    aAttrTab[ RES_ROW_SPLIT - POOLATTR_BEGIN ] =            new SwFormatRowSplit;
 
     // #i18732#
-    aAttrTab[ RES_FOLLOW_TEXT_FLOW - POOLATTR_BEGIN ] =     new SwFmtFollowTextFlow(false);
+    aAttrTab[ RES_FOLLOW_TEXT_FLOW - POOLATTR_BEGIN ] =     new SwFormatFollowTextFlow(false);
     // collapsing borders #i29550#
     aAttrTab[ RES_COLLAPSING_BORDERS - POOLATTR_BEGIN ] =   new SfxBoolItem( RES_COLLAPSING_BORDERS, false );
     // #i28701#
     // #i35017# - constant name has changed
-    aAttrTab[ RES_WRAP_INFLUENCE_ON_OBJPOS - POOLATTR_BEGIN ] = new SwFmtWrapInfluenceOnObjPos( text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
+    aAttrTab[ RES_WRAP_INFLUENCE_ON_OBJPOS - POOLATTR_BEGIN ] = new SwFormatWrapInfluenceOnObjPos( text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
 
-    aAttrTab[ RES_AUTO_STYLE - POOLATTR_BEGIN ] =           new SwFmtAutoFmt( RES_AUTO_STYLE );
+    aAttrTab[ RES_AUTO_STYLE - POOLATTR_BEGIN ] =           new SwFormatAutoFormat( RES_AUTO_STYLE );
     aAttrTab[ RES_FRMATR_STYLE_NAME - POOLATTR_BEGIN ] =    new SfxStringItem( RES_FRMATR_STYLE_NAME, OUString());
     aAttrTab[ RES_FRMATR_CONDITIONAL_STYLE_NAME - POOLATTR_BEGIN ] = new SfxStringItem( RES_FRMATR_CONDITIONAL_STYLE_NAME, OUString() );
     aAttrTab[ RES_FRMATR_GRABBAG - POOLATTR_BEGIN ] = new SfxGrabBagItem(RES_FRMATR_GRABBAG);
@@ -641,9 +641,9 @@ void _InitCore()
     aAttrTab[ RES_GRFATR_DUMMY4 - POOLATTR_BEGIN ] =        new SfxBoolItem( RES_GRFATR_DUMMY4 );
     aAttrTab[ RES_GRFATR_DUMMY5 - POOLATTR_BEGIN ] =        new SfxBoolItem( RES_GRFATR_DUMMY5 );
 
-    aAttrTab[ RES_BOXATR_FORMAT- POOLATTR_BEGIN ] =         new SwTblBoxNumFormat;
-    aAttrTab[ RES_BOXATR_FORMULA- POOLATTR_BEGIN ] =        new SwTblBoxFormula( OUString() );
-    aAttrTab[ RES_BOXATR_VALUE- POOLATTR_BEGIN ] =          new SwTblBoxValue;
+    aAttrTab[ RES_BOXATR_FORMAT- POOLATTR_BEGIN ] =         new SwTableBoxNumFormat;
+    aAttrTab[ RES_BOXATR_FORMULA- POOLATTR_BEGIN ] =        new SwTableBoxFormula( OUString() );
+    aAttrTab[ RES_BOXATR_VALUE- POOLATTR_BEGIN ] =          new SwTableBoxValue;
 
     aAttrTab[ RES_UNKNOWNATR_CONTAINER- POOLATTR_BEGIN ] =
                 new SvXMLAttrContainerItem( RES_UNKNOWNATR_CONTAINER );
@@ -740,7 +740,7 @@ void _InitCore()
 
     pGlobalOLEExcludeList = new std::vector<SvGlobalName*>;
 
-    const SvxSwAutoFmtFlags& rAFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
+    const SvxSwAutoFormatFlags& rAFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
     SwDoc::mpACmpltWords = new SwAutoCompleteWord( rAFlags.nAutoCmpltListLen,
                                             rAFlags.nAutoCmpltWordLen );
 }
@@ -758,12 +758,12 @@ void _FinitCore()
     delete pCaseCollator;
 
     // destroy default TableAutoFormat
-    delete SwTableAutoFmt::pDfltBoxAutoFmt;
+    delete SwTableAutoFormat::pDfltBoxAutoFormat;
 
     delete SwSelPaintRects::s_pMapMode;
     delete SwFntObj::pPixMap;
 
-    delete SwEditShell::s_pAutoFmtFlags;
+    delete SwEditShell::s_pAutoFormatFlags;
 
 #if OSL_DEBUG_LEVEL > 0
     // free defaults to prevent assertions
@@ -778,9 +778,9 @@ void _FinitCore()
     delete SwStyleNameMapper::pRegisterUINameArray;
     delete SwStyleNameMapper::pDocUINameArray;
     delete SwStyleNameMapper::pHTMLUINameArray;
-    delete SwStyleNameMapper::pFrmFmtUINameArray;
-    delete SwStyleNameMapper::pChrFmtUINameArray;
-    delete SwStyleNameMapper::pHTMLChrFmtUINameArray;
+    delete SwStyleNameMapper::pFrameFormatUINameArray;
+    delete SwStyleNameMapper::pChrFormatUINameArray;
+    delete SwStyleNameMapper::pHTMLChrFormatUINameArray;
     delete SwStyleNameMapper::pPageDescUINameArray;
     delete SwStyleNameMapper::pNumRuleUINameArray;
 
@@ -791,9 +791,9 @@ void _FinitCore()
     delete SwStyleNameMapper::pRegisterProgNameArray;
     delete SwStyleNameMapper::pDocProgNameArray;
     delete SwStyleNameMapper::pHTMLProgNameArray;
-    delete SwStyleNameMapper::pFrmFmtProgNameArray;
-    delete SwStyleNameMapper::pChrFmtProgNameArray;
-    delete SwStyleNameMapper::pHTMLChrFmtProgNameArray;
+    delete SwStyleNameMapper::pFrameFormatProgNameArray;
+    delete SwStyleNameMapper::pChrFormatProgNameArray;
+    delete SwStyleNameMapper::pHTMLChrFormatProgNameArray;
     delete SwStyleNameMapper::pPageDescProgNameArray;
     delete SwStyleNameMapper::pNumRuleProgNameArray;
 
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index d22cc8d79c4f..0910dd967beb 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -58,7 +58,7 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoInsert )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwPaM )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwCursor )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtNode )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTextNode )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj )
@@ -72,10 +72,10 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFmt )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFmt )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTextFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFormat )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFormat )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFormat )
 IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos )
 
 Size GetGraphicSizeTwip(const Graphic& rGraphic, vcl::RenderContext* pOutDev)
diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx
index d66427fee1c6..0a308ecf69d2 100644
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -51,15 +51,15 @@ namespace sw { namespace mark
 
     void AnnotationMark::InitDoc(SwDoc* const io_pDoc)
     {
-        SwTxtNode *pTxtNode = GetMarkEnd().nNode.GetNode().GetTxtNode();
+        SwTextNode *pTextNode = GetMarkEnd().nNode.GetNode().GetTextNode();
 
-        SwTxtFld* pTxtFld = pTxtNode ?
-            pTxtNode->GetFldTxtAttrAt(
+        SwTextField* pTextField = pTextNode ?
+            pTextNode->GetFieldTextAttrAt(
             GetMarkEnd().nContent.GetIndex()-1, true ) : NULL;
-        OSL_ENSURE( pTxtFld != NULL, "<AnnotationMark::InitDoc(..)> - missing text attribute for annotation field!" );
-        if ( pTxtFld != NULL )
+        OSL_ENSURE( pTextField != NULL, "<AnnotationMark::InitDoc(..)> - missing text attribute for annotation field!" );
+        if ( pTextField != NULL )
         {
-            const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pTxtFld->GetFmtFld().GetField());
+            const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pTextField->GetFormatField().GetField());
             OSL_ENSURE( pPostItField != NULL, "<AnnotationMark::InitDoc(..)> - annotation field missing!" );
             if ( pPostItField != NULL )
             {
@@ -81,33 +81,33 @@ namespace sw { namespace mark
         io_pDoc->getIDocumentState().SetModified();
     }
 
-    const SwFmtFld* AnnotationMark::GetAnnotationFmtFld() const
+    const SwFormatField* AnnotationMark::GetAnnotationFormatField() const
     {
         SwDoc* pDoc = GetMarkPos().GetDoc();
         if ( pDoc == NULL )
         {
-            OSL_ENSURE( false, "<AnnotationMark::GetAnnotationFmtFld()> - missing document at annotation mark" );
+            OSL_ENSURE( false, "<AnnotationMark::GetAnnotationFormatField()> - missing document at annotation mark" );
             return NULL;
         }
 
-        SwFmtFld* pAnnotationFmtFld = NULL;
+        SwFormatField* pAnnotationFormatField = NULL;
 
-        SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetFldType( RES_POSTITFLD, OUString(), false );
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld != NULL; pFmtFld = aIter.Next() )
+        SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetFieldType( RES_POSTITFLD, OUString(), false );
+        SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField != NULL; pFormatField = aIter.Next() )
         {
-            if ( pFmtFld->IsFldInDoc() )
+            if ( pFormatField->IsFieldInDoc() )
             {
-                const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pFmtFld->GetField());
+                const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pFormatField->GetField());
                 if (pPostItField != NULL && pPostItField->GetName() == GetName())
                 {
-                    pAnnotationFmtFld = pFmtFld;
+                    pAnnotationFormatField = pFormatField;
                     break;
                 }
             }
         }
 
-        return pAnnotationFmtFld;
+        return pAnnotationFormatField;
     }
 }}
 
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 862fdb64adca..6b81556660ed 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -44,22 +44,22 @@ namespace
     static void lcl_FixPosition(SwPosition& rPos)
     {
         // make sure the position has 1) the proper node, and 2) a proper index
-        SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
-        if(pTxtNode == NULL && rPos.nContent.GetIndex() > 0)
+        SwTextNode* pTextNode = rPos.nNode.GetNode().GetTextNode();
+        if(pTextNode == NULL && rPos.nContent.GetIndex() > 0)
         {
             SAL_INFO(
                 "sw.core",
                 "illegal position: " << rPos.nContent.GetIndex()
-                    << " without proper TxtNode");
+                    << " without proper TextNode");
             rPos.nContent.Assign(NULL, 0);
         }
-        else if(pTxtNode != NULL && rPos.nContent.GetIndex() > pTxtNode->Len())
+        else if(pTextNode != NULL && rPos.nContent.GetIndex() > pTextNode->Len())
         {
             SAL_INFO(
                 "sw.core",
                 "illegal position: " << rPos.nContent.GetIndex()
-                    << " is beyond " << pTxtNode->Len());
-            rPos.nContent.Assign(pTxtNode, pTxtNode->Len());
+                    << " is beyond " << pTextNode->Len());
+            rPos.nContent.Assign(pTextNode, pTextNode->Len());
         }
     }
 
@@ -71,9 +71,9 @@ namespace
         io_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_UI_REPLACE, NULL);
 
         SwPosition rStart = pField->GetMarkStart();
-        SwTxtNode const*const pStartTxtNode = rStart.nNode.GetNode().GetTxtNode();
-        const sal_Unicode ch_start = ( rStart.nContent.GetIndex() >= pStartTxtNode->GetTxt().getLength() ) ? 0 :
-            pStartTxtNode->GetTxt()[rStart.nContent.GetIndex()];
+        SwTextNode const*const pStartTextNode = rStart.nNode.GetNode().GetTextNode();
+        const sal_Unicode ch_start = ( rStart.nContent.GetIndex() >= pStartTextNode->GetText().getLength() ) ? 0 :
+            pStartTextNode->GetText()[rStart.nContent.GetIndex()];
         if( ( ch_start != aStartMark ) && ( aEndMark != CH_TXT_ATR_FORMELEMENT ) )
         {
             SwPaM aStartPaM(rStart);
@@ -83,10 +83,10 @@ namespace
         }
 
         SwPosition& rEnd = pField->GetMarkEnd();
-        SwTxtNode const*const pEndTxtNode = rEnd.nNode.GetNode().GetTxtNode();
+        SwTextNode const*const pEndTextNode = rEnd.nNode.GetNode().GetTextNode();
         const sal_Int32 nEndPos = ( rEnd == rStart ||  rEnd.nContent.GetIndex() == 0 ) ?
             rEnd.nContent.GetIndex() : rEnd.nContent.GetIndex() - 1;
-        const sal_Unicode ch_end = nEndPos >= pEndTxtNode->GetTxt().getLength() ? 0 : pEndTxtNode->GetTxt()[nEndPos];
+        const sal_Unicode ch_end = nEndPos >= pEndTextNode->GetText().getLength() ? 0 : pEndTextNode->GetText()[nEndPos];
         if ( aEndMark && ( ch_end != aEndMark ) )
         {
             SwPaM aEndPaM(rEnd);
@@ -105,9 +105,9 @@ namespace
         io_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_UI_REPLACE, NULL);
 
         const SwPosition& rStart = pField->GetMarkStart();
-        SwTxtNode const*const pStartTxtNode = rStart.nNode.GetNode().GetTxtNode();
+        SwTextNode const*const pStartTextNode = rStart.nNode.GetNode().GetTextNode();
         const sal_Unicode ch_start =
-            pStartTxtNode->GetTxt()[rStart.nContent.GetIndex()];
+            pStartTextNode->GetText()[rStart.nContent.GetIndex()];
 
         if( ch_start == aStartMark )
         {
@@ -117,11 +117,11 @@ namespace
         }
 
         const SwPosition& rEnd = pField->GetMarkEnd();
-        SwTxtNode const*const pEndTxtNode = rEnd.nNode.GetNode().GetTxtNode();
+        SwTextNode const*const pEndTextNode = rEnd.nNode.GetNode().GetTextNode();
         const sal_Int32 nEndPos = ( rEnd == rStart ||  rEnd.nContent.GetIndex() == 0 )
                                    ? rEnd.nContent.GetIndex()
                                    : rEnd.nContent.GetIndex() - 1;
-        const sal_Unicode ch_end = pEndTxtNode->GetTxt()[nEndPos];
+        const sal_Unicode ch_end = pEndTextNode->GetText()[nEndPos];
         if ( ch_end == aEndMark )
         {
             SwPaM aEnd(rEnd, rEnd);
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 60ddc4601b03..76e8e3bcfc77 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -36,9 +36,9 @@
 #include <breakit.hxx>
 #include <vcl/window.hxx>
 
-SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktCntnt,
+SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent,
                         sal_uInt8 nAktNdTyp, long nLRPos, bool bAktSelection )
-    : rShell( rSh ), nNode( nAktNode ), nCntnt( nAktCntnt ),
+    : rShell( rSh ), nNode( nAktNode ), nContent( nAktContent ),
       nNdTyp( nAktNdTyp ), nLeftFrmPos( nLRPos ),
       bHasSelection( bAktSelection )
 {
@@ -48,15 +48,15 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
     : rShell( rSh )
 {
     // remember SPoint-values of current cursor
-    SwPaM* pCrsr = rShell.IsTableMode() ? rShell.GetTblCrs() : rShell.GetCrsr();
+    SwPaM* pCrsr = rShell.IsTableMode() ? rShell.GetTableCrs() : rShell.GetCrsr();
     SwNode& rNd = pCrsr->GetPoint()->nNode.GetNode();
     nNode = rNd.GetIndex();
-    nCntnt = pCrsr->GetPoint()->nContent.GetIndex();
+    nContent = pCrsr->GetPoint()->nContent.GetIndex();
     nNdTyp = rNd.GetNodeType();
     bHasSelection = ( *pCrsr->GetPoint() != *pCrsr->GetMark() );
 
-    if( rNd.IsTxtNode() )
-        nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(), *rNd.GetTxtNode(), nCntnt,
+    if( rNd.IsTextNode() )
+        nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(), *rNd.GetTextNode(), nContent,
                                             !rShell.ActionPend() );
     else
     {
@@ -65,14 +65,14 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
         // A special treatment for SwFeShell:
         // When deleting the header/footer, footnotes SwFeShell sets the
         // Cursor to NULL (Node + Content).
-        // If the Cursor is not on a CntntNode (ContentNode) this fact gets
+        // If the Cursor is not on a ContentNode (ContentNode) this fact gets
         // saved in NdType.
         if( ND_CONTENTNODE & nNdTyp )
             nNdTyp = 0;
     }
 }
 
-static void lcl_notifyRow(const SwCntntNode* pNode, SwCrsrShell& rShell)
+static void lcl_notifyRow(const SwContentNode* pNode, SwCrsrShell& rShell)
 {
     if ( !pNode )
         return;
@@ -95,7 +95,7 @@ static void lcl_notifyRow(const SwCntntNode* pNode, SwCrsrShell& rShell)
         {
             if (pContent->GetType() == FRM_TAB)
             {
-                SwFmtFrmSize pSize = pLine->GetFrmFmt()->GetFrmSize();
+                SwFormatFrmSize pSize = pLine->GetFrameFormat()->GetFrmSize();
                 pRow->ModifyNotification(NULL, &pSize);
                 return;
             }
@@ -110,22 +110,22 @@ SwCallLink::~SwCallLink()
 
     // If travelling over Nodes check formats and register them anew at the
     // new Node.
-    SwPaM* pCurCrsr = rShell.IsTableMode() ? rShell.GetTblCrs() : rShell.GetCrsr();
-    SwCntntNode * pCNd = pCurCrsr->GetCntntNode();
+    SwPaM* pCurCrsr = rShell.IsTableMode() ? rShell.GetTableCrs() : rShell.GetCrsr();
+    SwContentNode * pCNd = pCurCrsr->GetContentNode();
     if( !pCNd )
         return;
 
     lcl_notifyRow(pCNd, rShell);
 
     const SwDoc *pDoc=rShell.GetDoc();
-    const SwCntntNode *pNode = NULL;
+    const SwContentNode *pNode = NULL;
     if ( ( pDoc != NULL && nNode < pDoc->GetNodes( ).Count( ) ) )
     {
-        pNode = pDoc->GetNodes()[nNode]->GetCntntNode();
+        pNode = pDoc->GetNodes()[nNode]->GetContentNode();
     }
     lcl_notifyRow(pNode, rShell);
 
-    sal_Int32 nCmp, nAktCntnt = pCurCrsr->GetPoint()->nContent.GetIndex();
+    sal_Int32 nCmp, nAktContent = pCurCrsr->GetPoint()->nContent.GetIndex();
     sal_uInt16 nNdWhich = pCNd->GetNodeType();
     sal_uLong nAktNode = pCurCrsr->GetPoint()->nNode.GetIndex();
 
@@ -147,32 +147,32 @@ SwCallLink::~SwCallLink()
         rShell.CallChgLnk();
     }
     else if( rShell.m_aChgLnk.IsSet() && ND_TEXTNODE == nNdWhich &&
-             nCntnt != nAktCntnt )
+             nContent != nAktContent )
     {
         // If travelling with left/right only and the frame is
         // unchanged (columns!) then check text hints.
-        if( nLeftFrmPos == SwCallLink::getLayoutFrm( rShell.GetLayout(), *pCNd->GetTxtNode(), nAktCntnt,
+        if( nLeftFrmPos == SwCallLink::getLayoutFrm( rShell.GetLayout(), *pCNd->GetTextNode(), nAktContent,
                                                     !rShell.ActionPend() ) &&
-            (( nCmp = nCntnt ) + 1 == nAktCntnt ||          // Right
-            nCntnt -1 == ( nCmp = nAktCntnt )) )            // Left
+            (( nCmp = nContent ) + 1 == nAktContent ||          // Right
+            nContent -1 == ( nCmp = nAktContent )) )            // Left
         {
-            if( nCmp == nAktCntnt && pCurCrsr->HasMark() ) // left & select
+            if( nCmp == nAktContent && pCurCrsr->HasMark() ) // left & select
                 ++nCmp;
 
-            if ( pCNd->GetTxtNode()->HasHints() )
+            if ( pCNd->GetTextNode()->HasHints() )
             {
-                const SwpHints &rHts = pCNd->GetTxtNode()->GetSwpHints();
+                const SwpHints &rHts = pCNd->GetTextNode()->GetSwpHints();
 
                 for( size_t n = 0; n < rHts.Count(); ++n )
                 {
-                    const SwTxtAttr* pHt = rHts[ n ];
+                    const SwTextAttr* pHt = rHts[ n ];
                     const sal_Int32 *pEnd = pHt->End();
                     const sal_Int32 nStart = pHt->GetStart();
 
                     // If "only start" or "start and end equal" then call on
                     // every overflow of start.
                     if( ( !pEnd || ( nStart == *pEnd ) ) &&
-                        ( nStart == nCntnt || nStart == nAktCntnt) )
+                        ( nStart == nContent || nStart == nAktContent) )
                     {
                         rShell.CallChgLnk();
                         return;
@@ -193,10 +193,10 @@ SwCallLink::~SwCallLink()
 
             if( g_pBreakIt->GetBreakIter().is() )
             {
-                const OUString rTxt = pCNd->GetTxtNode()->GetTxt();
+                const OUString rText = pCNd->GetTextNode()->GetText();
                 if( !nCmp ||
-                    g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nCmp )
-                     != g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nCmp - 1 ))
+                    g_pBreakIt->GetBreakIter()->getScriptType( rText, nCmp )
+                     != g_pBreakIt->GetBreakIter()->getScriptType( rText, nCmp - 1 ))
                 {
                     rShell.CallChgLnk();
                     return;
@@ -215,8 +215,8 @@ SwCallLink::~SwCallLink()
     if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->getLayoutFrm(rShell.GetLayout(), 0, 0, false) ) &&
         0 != ( pFlyFrm = pFrm->FindFlyFrm() ) && !rShell.IsTableMode() )
     {
-        const SwNodeIndex* pIndex = pFlyFrm->GetFmt()->GetCntnt().GetCntntIdx();
-        OSL_ENSURE( pIndex, "Fly without Cntnt" );
+        const SwNodeIndex* pIndex = pFlyFrm->GetFormat()->GetContent().GetContentIdx();
+        OSL_ENSURE( pIndex, "Fly without Content" );
 
         if (!pIndex)
             return;
@@ -225,14 +225,14 @@ SwCallLink::~SwCallLink()
 
         if( rStNd.EndOfSectionNode()->StartOfSectionIndex() > nNode ||
             nNode > rStNd.EndOfSectionIndex() )
-            rShell.GetFlyMacroLnk().Call( (void*)pFlyFrm->GetFmt() );
+            rShell.GetFlyMacroLnk().Call( (void*)pFlyFrm->GetFormat() );
     }
 }
 
-long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTxtNode& rNd, sal_Int32 nCntPos, bool bCalcFrm )
+long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrm )
 {
-    SwTxtFrm* pFrm = static_cast<SwTxtFrm*>(rNd.getLayoutFrm(pRoot,0,0,bCalcFrm));
-    SwTxtFrm* pNext;
+    SwTextFrm* pFrm = static_cast<SwTextFrm*>(rNd.getLayoutFrm(pRoot,0,0,bCalcFrm));
+    SwTextFrm* pNext;
     if ( pFrm && !pFrm->IsHiddenNow() )
     {
         if( pFrm->HasFollow() )
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 85e9799472c9..b0aebe7aa21b 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -23,7 +23,7 @@
 #include <tools/solar.h>
 
 class SwCrsrShell;
-class SwTxtNode;
+class SwTextNode;
 class SwRootFrm;
 
 class SwCallLink
@@ -31,18 +31,18 @@ class SwCallLink
 public:
     SwCrsrShell & rShell;
     sal_uLong nNode;
-    sal_Int32 nCntnt;
+    sal_Int32 nContent;
     sal_uInt8 nNdTyp;
     long nLeftFrmPos;
     bool bHasSelection;
 
     explicit SwCallLink( SwCrsrShell & rSh );
-    SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktCntnt,
+    SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent,
                                     sal_uInt8 nAktNdTyp, long nLRPos,
                                     bool bAktSelection );
     ~SwCallLink();
 
-    static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, sal_Int32 nCntPos, bool bCalcFrm );
+    static long getLayoutFrm( const SwRootFrm*, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrm );
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 67a25d07520c..9ec38bdc5e29 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -51,7 +51,7 @@ namespace sw { namespace mark
 
     void CrossRefBookmark::SetMarkPos(const SwPosition& rNewPos)
     {
-        assert(rNewPos.nNode.GetNode().GetTxtNode() &&
+        assert(rNewPos.nNode.GetNode().GetTextNode() &&
             "<sw::mark::CrossRefBookmark::SetMarkPos(..)>"
             " - new bookmark position for cross-reference bookmark doesn't mark text node");
         assert(rNewPos.nContent.GetIndex() == 0 &&
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 4aa3dcd7bc2f..98dc7fddc554 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -181,28 +181,28 @@ SwPaM & SwCrsrShell::GetCurrentShellCursor()
  * Return pointer to the current shell cursor
  * @return - returns pointer to current `SwPaM` shell cursor
  */
-SwPaM* SwCrsrShell::GetCrsr( bool bMakeTblCrsr ) const
+SwPaM* SwCrsrShell::GetCrsr( bool bMakeTableCrsr ) const
 {
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
     {
-        if( bMakeTblCrsr && m_pTblCrsr->IsCrsrMovedUpdt() )
+        if( bMakeTableCrsr && m_pTableCrsr->IsCrsrMovedUpdate() )
         {
             //don't re-create 'parked' cursors
-            const SwCntntNode* pCNd;
-            if( m_pTblCrsr->GetPoint()->nNode.GetIndex() &&
-                m_pTblCrsr->GetMark()->nNode.GetIndex() &&
-                0 != ( pCNd = m_pTblCrsr->GetCntntNode() ) && pCNd->getLayoutFrm( GetLayout() ) &&
-                0 != ( pCNd = m_pTblCrsr->GetCntntNode(false) ) && pCNd->getLayoutFrm( GetLayout() ) )
+            const SwContentNode* pCNd;
+            if( m_pTableCrsr->GetPoint()->nNode.GetIndex() &&
+                m_pTableCrsr->GetMark()->nNode.GetIndex() &&
+                0 != ( pCNd = m_pTableCrsr->GetContentNode() ) && pCNd->getLayoutFrm( GetLayout() ) &&
+                0 != ( pCNd = m_pTableCrsr->GetContentNode(false) ) && pCNd->getLayoutFrm( GetLayout() ) )
             {
-                SwShellTableCrsr* pTC = (SwShellTableCrsr*)m_pTblCrsr;
-                GetLayout()->MakeTblCrsrs( *pTC );
+                SwShellTableCrsr* pTC = (SwShellTableCrsr*)m_pTableCrsr;
+                GetLayout()->MakeTableCrsrs( *pTC );
             }
         }
 
-        if( m_pTblCrsr->IsChgd() )
+        if( m_pTableCrsr->IsChgd() )
         {
             const_cast<SwCrsrShell*>(this)->m_pCurCrsr =
-                dynamic_cast<SwShellCrsr*>(m_pTblCrsr->MakeBoxSels( m_pCurCrsr ));
+                dynamic_cast<SwShellCrsr*>(m_pTableCrsr->MakeBoxSels( m_pCurCrsr ));
         }
     }
     return m_pCurCrsr;
@@ -215,11 +215,11 @@ void SwCrsrShell::StartAction()
         // save for update of the ribbon bar
         const SwNode& rNd = m_pCurCrsr->GetPoint()->nNode.GetNode();
         m_nAktNode = rNd.GetIndex();
-        m_nAktCntnt = m_pCurCrsr->GetPoint()->nContent.GetIndex();
+        m_nAktContent = m_pCurCrsr->GetPoint()->nContent.GetIndex();
         m_nAktNdTyp = rNd.GetNodeType();
         m_bAktSelection = *m_pCurCrsr->GetPoint() != *m_pCurCrsr->GetMark();
-        if( rNd.IsTxtNode() )
-            m_nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), const_cast<SwTxtNode&>(*rNd.GetTxtNode()), m_nAktCntnt, true );
+        if( rNd.IsTextNode() )
+            m_nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), const_cast<SwTextNode&>(*rNd.GetTextNode()), m_nAktContent, true );
         else
             m_nLeftFrmPos = 0;
     }
@@ -273,7 +273,7 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
 
             {
                 // watch Crsr-Moves, call Link if needed, the DTOR is key here!
-                SwCallLink aLk( *this, m_nAktNode, m_nAktCntnt, (sal_uInt8)m_nAktNdTyp,
+                SwCallLink aLk( *this, m_nAktNode, m_nAktContent, (sal_uInt8)m_nAktNdTyp,
                                 m_nLeftFrmPos, m_bAktSelection );
 
             }
@@ -295,7 +295,7 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
         SwCallLink aLk( *this );        // watch Crsr-Moves
         aLk.nNode = m_nAktNode;           // call Link if needed
         aLk.nNdTyp = (sal_uInt8)m_nAktNdTyp;
-        aLk.nCntnt = m_nAktCntnt;
+        aLk.nContent = m_nAktContent;
         aLk.nLeftFrmPos = m_nLeftFrmPos;
 
         if( !m_nCrsrMove ||
@@ -343,7 +343,7 @@ bool SwCrsrShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
     bool bRet = false;
 
     // #i27615# Handle cursor in front of label.
-    const SwTxtNode* pTxtNd = 0;
+    const SwTextNode* pTextNd = 0;
 
     if( m_pBlockCrsr )
         m_pBlockCrsr->clearPoints();
@@ -360,8 +360,8 @@ bool SwCrsrShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
     // to the left will simply set the bInFrontOfLabel flag:
     else if ( bLeft && 0 == pShellCrsr->GetPoint()->nContent.GetIndex() &&
              !pShellCrsr->IsInFrontOfLabel() && !pShellCrsr->HasMark() &&
-             0 != ( pTxtNd = pShellCrsr->GetNode().GetTxtNode() ) &&
-             pTxtNd->HasVisibleNumberingOrBullet() )
+             0 != ( pTextNd = pShellCrsr->GetNode().GetTextNode() ) &&
+             pTextNd->HasVisibleNumberingOrBullet() )
     {
         SetInFrontOfLabel( true );
         bRet = true;
@@ -412,23 +412,23 @@ void SwCrsrShell::MarkListLevel( const OUString& sListId,
 
 void SwCrsrShell::UpdateMarkedListLevel()
 {
-    SwTxtNode * pTxtNd = _GetCrsr()->GetNode().GetTxtNode();
+    SwTextNode * pTextNd = _GetCrsr()->GetNode().GetTextNode();
 
-    if ( pTxtNd )
+    if ( pTextNd )
     {
-        if ( !pTxtNd->IsNumbered() )
+        if ( !pTextNd->IsNumbered() )
         {
             m_pCurCrsr->_SetInFrontOfLabel( false );
             MarkListLevel( OUString(), 0 );
         }
         else if ( m_pCurCrsr->IsInFrontOfLabel() )
         {
-            if ( pTxtNd->IsInList() )
+            if ( pTextNd->IsInList() )
             {
-                OSL_ENSURE( pTxtNd->GetActualListLevel() >= 0 &&
-                        pTxtNd->GetActualListLevel() < MAXLEVEL, "Which level?");
-                MarkListLevel( pTxtNd->GetListId(),
-                               pTxtNd->GetActualListLevel() );
+                OSL_ENSURE( pTextNd->GetActualListLevel() >= 0 &&
+                        pTextNd->GetActualListLevel() < MAXLEVEL, "Which level?");
+                MarkListLevel( pTextNd->GetListId(),
+                               pTextNd->GetActualListLevel() );
             }
         }
         else
@@ -525,11 +525,11 @@ bool SwCrsrShell::UpDown( bool bUp, sal_uInt16 nCnt )
         m_eMvState = MV_UPDOWN; // status for Crsr travelling - GetCrsrOfst
         if( !ActionPend() )
         {
-            CrsrFlag eUpdtMode = SwCrsrShell::SCROLLWIN;
+            CrsrFlag eUpdateMode = SwCrsrShell::SCROLLWIN;
             if( !bTableMode )
-                eUpdtMode = (CrsrFlag) (eUpdtMode
+                eUpdateMode = (CrsrFlag) (eUpdateMode
                             | SwCrsrShell::UPDOWN | SwCrsrShell::CHKRANGE);
-            UpdateCrsr( static_cast<sal_uInt16>(eUpdtMode) );
+            UpdateCrsr( static_cast<sal_uInt16>(eUpdateMode) );
         }
     }
     return bRet;
@@ -554,8 +554,8 @@ bool SwCrsrShell::LRMargin( bool bLeft, bool bAPI)
 
     if ( bLeft && !bTableMode && bRet && bWasAtLM && !_GetCrsr()->HasMark() )
     {
-        const SwTxtNode * pTxtNd = _GetCrsr()->GetNode().GetTxtNode();
-        if ( pTxtNd && pTxtNd->HasVisibleNumberingOrBullet() )
+        const SwTextNode * pTextNd = _GetCrsr()->GetNode().GetTextNode();
+        if ( pTextNd && pTextNd->HasVisibleNumberingOrBullet() )
             SetInFrontOfLabel( true );
     }
     else if ( !bLeft )
@@ -605,7 +605,7 @@ void SwCrsrShell::ExtendedSelectAll(bool bFootnotes)
     pPos->nContent.Assign( rNodes.GoNext( &pPos->nNode ), 0 );
     pPos = m_pCurCrsr->GetMark();
     pPos->nNode = rNodes.GetEndOfContent();
-    SwCntntNode* pCNd = SwNodes::GoPrevious( &pPos->nNode );
+    SwContentNode* pCNd = SwNodes::GoPrevious( &pPos->nNode );
     pPos->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
 }
 
@@ -613,10 +613,10 @@ bool SwCrsrShell::ExtendedSelectedAll(bool bFootnotes)
 {
     SwNodes& rNodes = GetDoc()->GetNodes();
     SwNodeIndex nNode = bFootnotes ? rNodes.GetEndOfPostIts() : rNodes.GetEndOfAutotext();
-    SwCntntNode* pStart = rNodes.GoNext(&nNode);
+    SwContentNode* pStart = rNodes.GoNext(&nNode);
 
     nNode = rNodes.GetEndOfContent();
-    SwCntntNode* pEnd = SwNodes::GoPrevious(&nNode);
+    SwContentNode* pEnd = SwNodes::GoPrevious(&nNode);
 
     if (!pStart || !pEnd)
         return false;
@@ -631,8 +631,8 @@ bool SwCrsrShell::StartsWithTable()
 {
     SwNodes& rNodes = GetDoc()->GetNodes();
     SwNodeIndex nNode(rNodes.GetEndOfExtras());
-    SwCntntNode* pCntntNode = rNodes.GoNext(&nNode);
-    return pCntntNode->FindTableNode();
+    SwContentNode* pContentNode = rNodes.GoNext(&nNode);
+    return pContentNode->FindTableNode();
 }
 
 bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
@@ -640,14 +640,14 @@ bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
     bool bRet = false;
 
     // never jump of section borders at selection
-    if( !m_pCurCrsr->HasMark() || !m_pCurCrsr->IsNoCntnt() )
+    if( !m_pCurCrsr->HasMark() || !m_pCurCrsr->IsNoContent() )
     {
         SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
         SET_CURR_SHELL( this );
 
         SwCrsrSaveState aSaveState( *m_pCurCrsr );
         Point& rPt = m_pCurCrsr->GetPtPos();
-        SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->
+        SwContentFrm * pFrm = m_pCurCrsr->GetContentNode()->
                             getLayoutFrm( GetLayout(), &rPt, m_pCurCrsr->GetPoint(), false );
         if( pFrm && ( bRet = GetFrmInPage( pFrm, fnWhichPage,
                                            fnPosPage, m_pCurCrsr )  ) &&
@@ -660,12 +660,12 @@ bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
     return bRet;
 }
 
-bool SwCrsrShell::isInHiddenTxtFrm(SwShellCrsr* pShellCrsr)
+bool SwCrsrShell::isInHiddenTextFrm(SwShellCrsr* pShellCrsr)
 {
-    SwCntntNode *pCNode = pShellCrsr->GetCntntNode();
-    SwCntntFrm  *pFrm = pCNode ?
+    SwContentNode *pCNode = pShellCrsr->GetContentNode();
+    SwContentFrm  *pFrm = pCNode ?
         pCNode->getLayoutFrm( GetLayout(), &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false ) : 0;
-    return !pFrm || (pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow());
+    return !pFrm || (pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsHiddenNow());
 }
 
 bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
@@ -680,7 +680,7 @@ bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
         //which is what SwCrsrShell::UpdateCrsrPos will reset
         //the position to if we pass it a position in an
         //invisible hidden paragraph field
-        while (isInHiddenTxtFrm(pTmpCrsr))
+        while (isInHiddenTextFrm(pTmpCrsr))
         {
             if (!pTmpCrsr->MovePara(fnWhichPara, fnPosPara))
                 break;
@@ -708,10 +708,10 @@ bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
 static SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
 {
     SwFrm* pFrm = 0;
-    SwCntntNode* pCNd = rIdx.GetNode().GetCntntNode();
+    SwContentNode* pCNd = rIdx.GetNode().GetContentNode();
     if( pCNd )
     {
-        SwCntntFrm *pCntFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, 0, false );
+        SwContentFrm *pCntFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, 0, false );
         pFrm = pCntFrm ? pCntFrm->GetUpper() : NULL;
         while( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
             pFrm = pFrm->IsFlyFrm() ? static_cast<SwFlyFrm*>(pFrm)->AnchorFrm()
@@ -741,12 +741,12 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
                                     bOnlyText ?  MV_SETONLYTEXT : MV_NONE );
     aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
 
-    SwTxtNode * pTxtNd = pCrsr->GetNode().GetTxtNode();
+    SwTextNode * pTextNd = pCrsr->GetNode().GetTextNode();
 
-    if ( pTxtNd && !IsTableMode() &&
+    if ( pTextNd && !IsTableMode() &&
         // #i37515# No bInFrontOfLabel during selection
         !pCrsr->HasMark() &&
-        pTxtNd->HasVisibleNumberingOrBullet() )
+        pTextNd->HasVisibleNumberingOrBullet() )
     {
         aTmpState.bInFrontOfLabel = true; // #i27615#
     }
@@ -792,12 +792,12 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
                 if( pFrm->Frm().IsInside( rAktCrsrPt ))
                     return bRet;
             }
-            else if( aPos.nNode.GetNode().IsCntntNode() )
+            else if( aPos.nNode.GetNode().IsContentNode() )
             {
                 // in the same frame?
-                SwFrm* pOld = static_cast<SwCntntNode&>(aPos.nNode.GetNode()).getLayoutFrm(
+                SwFrm* pOld = static_cast<SwContentNode&>(aPos.nNode.GetNode()).getLayoutFrm(
                                 GetLayout(), &m_aCharRect.Pos(), 0, false );
-                SwFrm* pNew = static_cast<SwCntntNode&>(aPos.nNode.GetNode()).getLayoutFrm(
+                SwFrm* pNew = static_cast<SwContentNode&>(aPos.nNode.GetNode()).getLayoutFrm(
                                 GetLayout(), &aPt, 0, false );
                 if( pNew == pOld )
                     return bRet;
@@ -836,7 +836,7 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
     }
     else if( bOnlyText && !m_pCurCrsr->HasMark() )
     {
-        if( FindValidCntntNode( bOnlyText ) )
+        if( FindValidContentNode( bOnlyText ) )
         {
             // position cursor in a valid content
             if( aPos == *pCrsr->GetPoint() )
@@ -863,10 +863,10 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
     return bRet;
 }
 
-void SwCrsrShell::TblCrsrToCursor()
+void SwCrsrShell::TableCrsrToCursor()
 {
-    OSL_ENSURE( m_pTblCrsr, "TblCrsrToCursor: Why?" );
-    delete m_pTblCrsr, m_pTblCrsr = 0;
+    OSL_ENSURE( m_pTableCrsr, "TableCrsrToCursor: Why?" );
+    delete m_pTableCrsr, m_pTableCrsr = 0;
 }
 
 void SwCrsrShell::BlockCrsrToCrsr()
@@ -907,7 +907,7 @@ void SwCrsrShell::CrsrToBlockCrsr()
 void SwCrsrShell::ClearMark()
 {
     // is there any GetMark?
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
     {
         std::vector<SwViewShell*> vShells;
         for(SwViewShell& rShell : GetRingContainer())
@@ -915,13 +915,13 @@ void SwCrsrShell::ClearMark()
                 vShells.push_back(&rShell);
         for(SwViewShell* pShell : vShells)
             delete pShell;
-        m_pTblCrsr->DeleteMark();
+        m_pTableCrsr->DeleteMark();
 
         m_pCurCrsr->DeleteMark();
 
-        *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
-        m_pCurCrsr->GetPtPos() = m_pTblCrsr->GetPtPos();
-        delete m_pTblCrsr, m_pTblCrsr = 0;
+        *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
+        m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
+        delete m_pTableCrsr, m_pTableCrsr = 0;
         m_pCurCrsr->SwSelPaintRects::Show();
     }
     else
@@ -965,8 +965,8 @@ bool SwCrsrShell::ChgCurrPam(
     SET_CURR_SHELL( this );
 
     // check if the SPoint is in a table selection
-    if( bTstOnly && m_pTblCrsr )
-        return m_pTblCrsr->IsInside( rPt );
+    if( bTstOnly && m_pTableCrsr )
+        return m_pTableCrsr->IsInside( rPt );
 
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     // search position <rPt> in document
@@ -999,21 +999,21 @@ bool SwCrsrShell::ChgCurrPam(
 void SwCrsrShell::KillPams()
 {
     // Does any exist for deletion?
-    if( !m_pTblCrsr && !m_pBlockCrsr && !m_pCurCrsr->IsMultiSelection() )
+    if( !m_pTableCrsr && !m_pBlockCrsr && !m_pCurCrsr->IsMultiSelection() )
         return;
 
     while( m_pCurCrsr->GetNext() != m_pCurCrsr )
         delete m_pCurCrsr->GetNext();
     m_pCurCrsr->SetColumnSelection( false );
 
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
     {
         // delete the ring of cursors
         m_pCurCrsr->DeleteMark();
-        *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
-        m_pCurCrsr->GetPtPos() = m_pTblCrsr->GetPtPos();
-        delete m_pTblCrsr;
-        m_pTblCrsr = 0;
+        *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
+        m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
+        delete m_pTableCrsr;
+        m_pTableCrsr = 0;
     }
     else if( m_pBlockCrsr )
     {
@@ -1079,7 +1079,7 @@ bool SwCrsrShell::IsSttPara() const
 {   return m_pCurCrsr->GetPoint()->nContent == 0; }
 
 bool SwCrsrShell::IsEndPara() const
-{   return m_pCurCrsr->GetPoint()->nContent == m_pCurCrsr->GetCntntNode()->Len(); }
+{   return m_pCurCrsr->GetPoint()->nContent == m_pCurCrsr->GetContentNode()->Len(); }
 
 bool SwCrsrShell::IsEndOfTable() const
 {
@@ -1087,14 +1087,14 @@ bool SwCrsrShell::IsEndOfTable() const
     {
         return false;
     }
-    SwTableNode const*const pTableNode( IsCrsrInTbl() );
+    SwTableNode const*const pTableNode( IsCrsrInTable() );
     if (!pTableNode)
     {
         return false;
     }
     SwEndNode const*const pEndTableNode(pTableNode->EndOfSectionNode());
     SwNodeIndex const lastNode(*pEndTableNode, -2);
-    SAL_WARN_IF(!lastNode.GetNode().GetTxtNode(), "sw.core",
+    SAL_WARN_IF(!lastNode.GetNode().GetTextNode(), "sw.core",
             "text node expected");
     return (lastNode == m_pCurCrsr->GetPoint()->nNode);
 }
@@ -1130,7 +1130,7 @@ bool SwCrsrShell::GotoPage( sal_uInt16 nPage )
 
 bool SwCrsrShell::GetCharRectAt(SwRect& rRect, const SwPosition* pPos)
 {
-    SwCntntFrm* pFrm = GetCurrFrm();
+    SwContentFrm* pFrm = GetCurrFrm();
     return pFrm->GetCharRect( rRect, *pPos );
 }
 
@@ -1139,7 +1139,7 @@ void SwCrsrShell::GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
 {
     SET_CURR_SHELL( this );
     // page number: first visible page or the one at the cursor
-    const SwCntntFrm* pCFrm;
+    const SwContentFrm* pCFrm;
     const SwPageFrm *pPg = 0;
 
     if( !bAtCrsrPos || 0 == (pCFrm = GetCurrFrm( bCalcFrm )) ||
@@ -1258,7 +1258,7 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
 
     if( m_bHasFocus && !m_bBasicHideCrsr )
     {
-        SwShellCrsr* pAktCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+        SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
 
         if( !ActionPend() )
         {
@@ -1314,7 +1314,7 @@ void SwCrsrShell::UpdateCrsrPos()
     SwShellCrsr* pShellCrsr = getShellCrsr( true );
     Size aOldSz( GetDocSize() );
 
-    if( isInHiddenTxtFrm(pShellCrsr) )
+    if( isInHiddenTextFrm(pShellCrsr) )
     {
         SwCrsrMoveState aTmpState( MV_NONE );
         aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
@@ -1351,18 +1351,18 @@ static bool lcl_CheckHiddenSection( SwNodeIndex& rIdx )
 static void lcl_CheckHiddenPara( SwPosition& rPos )
 {
     SwNodeIndex aTmp( rPos.nNode );
-    SwTxtNode* pTxtNd = aTmp.GetNode().GetTxtNode();
-    while( pTxtNd && pTxtNd->HasHiddenCharAttribute( true ) )
+    SwTextNode* pTextNd = aTmp.GetNode().GetTextNode();
+    while( pTextNd && pTextNd->HasHiddenCharAttribute( true ) )
     {
-        SwCntntNode* pCntnt = aTmp.GetNodes().GoNext( &aTmp );
-        if ( pCntnt && pCntnt->IsTxtNode() )
-            pTxtNd = pCntnt->GetTxtNode();
+        SwContentNode* pContent = aTmp.GetNodes().GoNext( &aTmp );
+        if ( pContent && pContent->IsTextNode() )
+            pTextNd = pContent->GetTextNode();
         else
-            pTxtNd = 0;
+            pTextNd = 0;
     }
 
-    if ( pTxtNd )
-        rPos = SwPosition( aTmp, SwIndex( pTxtNd, 0 ) );
+    if ( pTextNd )
+        rPos = SwPosition( aTmp, SwIndex( pTextNd, 0 ) );
 }
 
 // #i27301# - helper class that notifies the accessibility about invalid text
@@ -1409,14 +1409,14 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         CheckRange( m_pCurCrsr );             // overlapping ranges
 
     if( !bIdleEnd )
-        CheckTblBoxCntnt();
+        CheckTableBoxContent();
 
     // If the current cursor is in a table and point/mark in different boxes,
-    // then the table mode is active (also if it is already active: m_pTblCrsr)
+    // then the table mode is active (also if it is already active: m_pTableCrsr)
     SwPaM* pTstCrsr = getShellCrsr( true );
     if( pTstCrsr->HasMark() && !m_pBlockCrsr &&
-        mpDoc->IsIdxInTbl( pTstCrsr->GetPoint()->nNode ) &&
-          ( m_pTblCrsr ||
+        mpDoc->IsIdxInTable( pTstCrsr->GetPoint()->nNode ) &&
+          ( m_pTableCrsr ||
             pTstCrsr->GetNode( true ).StartOfSectionNode() !=
             pTstCrsr->GetNode( false ).StartOfSectionNode() ) && !mbSelectAll)
     {
@@ -1436,36 +1436,36 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             lcl_CheckHiddenPara( *pITmpCrsr->GetMark() );
         }
 
-        SwCntntFrm *pTblFrm = pPos->nNode.GetNode().GetCntntNode()->
+        SwContentFrm *pTableFrm = pPos->nNode.GetNode().GetContentNode()->
                               getLayoutFrm( GetLayout(), &aTmpPt, pPos, false );
 
-        OSL_ENSURE( pTblFrm, "Tabelle Crsr nicht im Content ??" );
+        OSL_ENSURE( pTableFrm, "Tabelle Crsr nicht im Content ??" );
 
         // --> Make code robust. The table cursor may point
         // to a table in a currently inactive header.
-        SwTabFrm *pTab = pTblFrm ? pTblFrm->FindTabFrm() : 0;
+        SwTabFrm *pTab = pTableFrm ? pTableFrm->FindTabFrm() : 0;
 
         if ( pTab && pTab->GetTable()->GetRowsToRepeat() > 0 )
         {
             // First check if point is in repeated headline:
-            bool bInRepeatedHeadline = pTab->IsFollow() && pTab->IsInHeadline( *pTblFrm );
+            bool bInRepeatedHeadline = pTab->IsFollow() && pTab->IsInHeadline( *pTableFrm );
 
             // Second check if mark is in repeated headline:
             if ( !bInRepeatedHeadline )
             {
-                SwCntntFrm* pMarkTblFrm = pITmpCrsr->GetCntntNode( false )->
+                SwContentFrm* pMarkTableFrm = pITmpCrsr->GetContentNode( false )->
                     getLayoutFrm( GetLayout(), &aTmpMk, pITmpCrsr->GetMark(), false );
-                OSL_ENSURE( pMarkTblFrm, "Tabelle Crsr nicht im Content ??" );
+                OSL_ENSURE( pMarkTableFrm, "Tabelle Crsr nicht im Content ??" );
 
-                if ( pMarkTblFrm )
+                if ( pMarkTableFrm )
                 {
-                    SwTabFrm* pMarkTab = pMarkTblFrm->FindTabFrm();
+                    SwTabFrm* pMarkTab = pMarkTableFrm->FindTabFrm();
                     OSL_ENSURE( pMarkTab, "Tabelle Crsr nicht im Content ??" );
 
                     // Make code robust:
                     if ( pMarkTab )
                     {
-                        bInRepeatedHeadline = pMarkTab->IsFollow() && pMarkTab->IsInHeadline( *pMarkTblFrm );
+                        bInRepeatedHeadline = pMarkTab->IsFollow() && pMarkTab->IsInHeadline( *pMarkTableFrm );
                     }
                 }
             }
@@ -1473,20 +1473,20 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             // No table cursor in repeated headlines:
             if ( bInRepeatedHeadline )
             {
-                pTblFrm = 0;
+                pTableFrm = 0;
 
                 SwPosSection fnPosSect = *pPos <  *pITmpCrsr->GetMark()
                                             ? fnSectionStart
                                             : fnSectionEnd;
 
                 // then only select inside the Box
-                if( m_pTblCrsr )
+                if( m_pTableCrsr )
                 {
                     m_pCurCrsr->SetMark();
-                    *m_pCurCrsr->GetMark() = *m_pTblCrsr->GetMark();
-                    m_pCurCrsr->GetMkPos() = m_pTblCrsr->GetMkPos();
-                    m_pTblCrsr->DeleteMark();
-                    m_pTblCrsr->SwSelPaintRects::Hide();
+                    *m_pCurCrsr->GetMark() = *m_pTableCrsr->GetMark();
+                    m_pCurCrsr->GetMkPos() = m_pTableCrsr->GetMkPos();
+                    m_pTableCrsr->DeleteMark();
+                    m_pTableCrsr->SwSelPaintRects::Hide();
                 }
 
                 *m_pCurCrsr->GetPoint() = *m_pCurCrsr->GetMark();
@@ -1495,18 +1495,18 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         }
 
         // we really want a table selection
-        if( pTab && pTblFrm )
+        if( pTab && pTableFrm )
         {
-            if( !m_pTblCrsr )
+            if( !m_pTableCrsr )
             {
-                m_pTblCrsr = new SwShellTableCrsr( *this,
+                m_pTableCrsr = new SwShellTableCrsr( *this,
                                 *m_pCurCrsr->GetMark(), m_pCurCrsr->GetMkPos(),
                                 *pPos, aTmpPt );
                 m_pCurCrsr->DeleteMark();
                 m_pCurCrsr->SwSelPaintRects::Hide();
 
-                CheckTblBoxCntnt();
-                if(!m_pTblCrsr)
+                CheckTableBoxContent();
+                if(!m_pTableCrsr)
                 {
                     SAL_WARN("sw", "fdo#74854: "
                         "this should not happen, but better lose the selection "
@@ -1517,13 +1517,13 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
 
             SwCrsrMoveState aTmpState( MV_NONE );
             aTmpState.bRealHeight = true;
-            if( !pTblFrm->GetCharRect( m_aCharRect, *m_pTblCrsr->GetPoint(), &aTmpState ) )
+            if( !pTableFrm->GetCharRect( m_aCharRect, *m_pTableCrsr->GetPoint(), &aTmpState ) )
             {
                 Point aCentrPt( m_aCharRect.Center() );
                 aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
-                pTblFrm->GetCrsrOfst( m_pTblCrsr->GetPoint(), aCentrPt, &aTmpState );
+                pTableFrm->GetCrsrOfst( m_pTableCrsr->GetPoint(), aCentrPt, &aTmpState );
                 bool const bResult =
-                    pTblFrm->GetCharRect( m_aCharRect, *m_pTblCrsr->GetPoint() );
+                    pTableFrm->GetCharRect( m_aCharRect, *m_pTableCrsr->GetPoint() );
                 OSL_ENSURE( bResult, "GetCharRect failed." );
                 (void) bResult; // non-debug: unused
             }
@@ -1534,7 +1534,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
                 (HasSelection() || eFlags & SwCrsrShell::READONLY ||
                  !IsCrsrReadonly()) )
             {
-                SwFrm* pBoxFrm = pTblFrm;
+                SwFrm* pBoxFrm = pTableFrm;
                 while( pBoxFrm && !pBoxFrm->IsCellFrm() )
                     pBoxFrm = pBoxFrm->GetUpper();
                 if( pBoxFrm && pBoxFrm->Frm().HasArea() )
@@ -1544,14 +1544,14 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             }
 
             // let Layout create the Cursors in the Boxes
-            if( m_pTblCrsr->IsCrsrMovedUpdt() )
-                GetLayout()->MakeTblCrsrs( *m_pTblCrsr );
+            if( m_pTableCrsr->IsCrsrMovedUpdate() )
+                GetLayout()->MakeTableCrsrs( *m_pTableCrsr );
             if( m_bHasFocus && !m_bBasicHideCrsr )
-                m_pTblCrsr->Show();
+                m_pTableCrsr->Show();
 
             // set Cursor-Points to the new Positions
-            m_pTblCrsr->GetPtPos().setX(m_aCharRect.Left());
-            m_pTblCrsr->GetPtPos().setY(m_aCharRect.Top());
+            m_pTableCrsr->GetPtPos().setX(m_aCharRect.Left());
+            m_pTableCrsr->GetPtPos().setY(m_aCharRect.Top());
 
             if( m_bSVCrsrVis )
             {
@@ -1561,21 +1561,21 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
                 m_pVisCrsr->Show(); // show again
             }
             m_eMvState = MV_NONE;  // state for cursor travelling - GetCrsrOfst
-            if( pTblFrm && Imp()->IsAccessible() )
-                Imp()->InvalidateAccessibleCursorPosition( pTblFrm );
+            if( pTableFrm && Imp()->IsAccessible() )
+                Imp()->InvalidateAccessibleCursorPosition( pTableFrm );
             return;
         }
     }
 
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
     {
         // delete Ring
         while( m_pCurCrsr->GetNext() != m_pCurCrsr )
             delete m_pCurCrsr->GetNext();
         m_pCurCrsr->DeleteMark();
-        *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
-        m_pCurCrsr->GetPtPos() = m_pTblCrsr->GetPtPos();
-        delete m_pTblCrsr, m_pTblCrsr = 0;
+        *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
+        m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
+        delete m_pTableCrsr, m_pTableCrsr = 0;
     }
 
     m_pVisCrsr->Hide(); // always hide visible Cursor
@@ -1591,7 +1591,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
              ( !mpDoc->GetDocShell() ||
                !mpDoc->GetDocShell()->IsReadOnly() || m_bAllProtect )) ) )
         {
-            if( !FindValidCntntNode( !HasDrawView() ||
+            if( !FindValidContentNode( !HasDrawView() ||
                     0 == Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()))
             {
                 // everything protected/hidden -> special mode
@@ -1637,18 +1637,18 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         bool bPointIsStart = ( rCmp.Start() == rCmp.GetPoint() );
 
         // move point; forward if it's the start, backwards if it's the end
-        if( ! rCmp.GetPoint()->nNode.GetNode().IsCntntNode() )
+        if( ! rCmp.GetPoint()->nNode.GetNode().IsContentNode() )
             rCmp.Move( bPointIsStart ? fnMoveForward : fnMoveBackward,
-                        fnGoCntnt );
+                        fnGoContent );
 
         // move mark (if exists); forward if it's the start, else backwards
         if( rCmp.HasMark() )
         {
-            if( ! rCmp.GetMark()->nNode.GetNode().IsCntntNode() )
+            if( ! rCmp.GetMark()->nNode.GetNode().IsContentNode() )
             {
                 rCmp.Exchange();
                 rCmp.Move( !bPointIsStart ? fnMoveForward : fnMoveBackward,
-                            fnGoCntnt );
+                            fnGoContent );
                 rCmp.Exchange();
             }
         }
@@ -1656,7 +1656,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
 
     SwRect aOld( m_aCharRect );
     bool bFirst = true;
-    SwCntntFrm *pFrm;
+    SwContentFrm *pFrm;
     int nLoopCnt = 100;
     SwShellCrsr* pShellCrsr = getShellCrsr( true );
 
@@ -1664,7 +1664,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         bool bAgainst;
         do {
             bAgainst = false;
-            pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
+            pFrm = pShellCrsr->GetContentNode()->getLayoutFrm( GetLayout(),
                         &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false );
             // if the Frm doesn't exist anymore, the complete Layout has to be
             // created, because there used to be a Frm here!
@@ -1673,7 +1673,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
                 do
                 {
                     CalcLayout();
-                    pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
+                    pFrm = pShellCrsr->GetContentNode()->getLayoutFrm( GetLayout(),
                                 &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false );
                 }  while( !pFrm );
             }
@@ -1690,7 +1690,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             {
                 // look for a valid position
                 bool bChgState = true;
-                if( !FindValidCntntNode(!HasDrawView() ||
+                if( !FindValidContentNode(!HasDrawView() ||
                     0 == Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()))
                 {
                     // everything is protected / hidden -> special Mode
@@ -1809,8 +1809,8 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
 
     if( !bIdleEnd && m_bHasFocus && !m_bBasicHideCrsr )
     {
-        if( m_pTblCrsr )
-            m_pTblCrsr->SwSelPaintRects::Show();
+        if( m_pTableCrsr )
+            m_pTableCrsr->SwSelPaintRects::Show();
         else
         {
             m_pCurCrsr->SwSelPaintRects::Show();
@@ -1858,7 +1858,7 @@ void SwCrsrShell::RefreshBlockCursor()
     OSL_ENSURE( m_pBlockCrsr, "Don't call me without a block cursor" );
     SwShellCrsr &rBlock = m_pBlockCrsr->getShellCrsr();
     Point aPt = rBlock.GetPtPos();
-    SwCntntFrm* pFrm = rBlock.GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), false );
+    SwContentFrm* pFrm = rBlock.GetContentNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), false );
     Point aMk;
     if( m_pBlockCrsr->getEndPoint() && m_pBlockCrsr->getStartPoint() )
     {
@@ -1970,7 +1970,7 @@ void SwCrsrShell::Push()
     // fdo#60513: if we have a table cursor, copy that; else copy current.
     // This seems to work because UpdateCrsr() will fix this up on Pop(),
     // then MakeBoxSels() will re-create the current m_pCurCrsr cell ring.
-    SwShellCrsr *const pCurrent((m_pTblCrsr) ? m_pTblCrsr : m_pCurCrsr);
+    SwShellCrsr *const pCurrent((m_pTableCrsr) ? m_pTableCrsr : m_pCurCrsr);
     m_pCrsrStk = new SwShellCrsr( *this, *pCurrent->GetPoint(),
                                     pCurrent->GetPtPos(), m_pCrsrStk );
 
@@ -2092,7 +2092,7 @@ void SwCrsrShell::HideCrsrs()
         m_pVisCrsr->Hide();
     }
     // revoke inversion of SSelection
-    SwShellCrsr* pAktCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+    SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
     pAktCrsr->Hide();
 }
 
@@ -2102,7 +2102,7 @@ void SwCrsrShell::ShowCrsrs( bool bCrsrVis )
         return;
 
     SET_CURR_SHELL( this );
-    SwShellCrsr* pAktCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+    SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
     pAktCrsr->Show();
 
     if( m_bSVCrsrVis && bCrsrVis ) // also show SV cursor again
@@ -2114,7 +2114,7 @@ void SwCrsrShell::ShowCrsr()
     if( !m_bBasicHideCrsr )
     {
         m_bSVCrsrVis = true;
-        m_pCurCrsr->SetShowTxtInputFldOverlay( true );
+        m_pCurCrsr->SetShowTextInputFieldOverlay( true );
 
         if (isTiledRendering())
             libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr());
@@ -2130,7 +2130,7 @@ void SwCrsrShell::HideCrsr()
         m_bSVCrsrVis = false;
         // possibly reverse selected areas!!
         SET_CURR_SHELL( this );
-        m_pCurCrsr->SetShowTxtInputFldOverlay( false );
+        m_pCurCrsr->SetShowTextInputFieldOverlay( false );
         m_pVisCrsr->Hide();
 
         if (isTiledRendering())
@@ -2158,11 +2158,11 @@ void SwCrsrShell::ShGetFcs( bool bUpdate )
 }
 
 /** Get current frame in which the cursor is positioned. */
-SwCntntFrm *SwCrsrShell::GetCurrFrm( const bool bCalcFrm ) const
+SwContentFrm *SwCrsrShell::GetCurrFrm( const bool bCalcFrm ) const
 {
     SET_CURR_SHELL( (SwViewShell*)this );
-    SwCntntFrm *pRet = 0;
-    SwCntntNode *pNd = m_pCurCrsr->GetCntntNode();
+    SwContentFrm *pRet = 0;
+    SwContentNode *pNd = m_pCurCrsr->GetContentNode();
     if ( pNd )
     {
         if ( bCalcFrm )
@@ -2201,7 +2201,7 @@ void SwCrsrShell::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
             nWhich == RES_ATTRSET_CHG ))
         // messages are not forwarded
         // #i6681#: RES_UPDATE_ATTR is implicitly unset in
-        // SwTxtNode::Insert(SwTxtHint*, sal_uInt16); we react here and thus do
+        // SwTextNode::Insert(SwTextHint*, sal_uInt16); we react here and thus do
         // not need to send the expensive RES_FMT_CHG in Insert.
         CallChgLnk();
 
@@ -2235,36 +2235,36 @@ void SwCrsrShell::CallChgLnk()
 }
 
 /// get selected text of a node at current cursor
-OUString SwCrsrShell::GetSelTxt() const
+OUString SwCrsrShell::GetSelText() const
 {
-    OUString aTxt;
+    OUString aText;
     if( m_pCurCrsr->GetPoint()->nNode.GetIndex() ==
         m_pCurCrsr->GetMark()->nNode.GetIndex() )
     {
-        SwTxtNode* pTxtNd = m_pCurCrsr->GetNode().GetTxtNode();
-        if( pTxtNd )
+        SwTextNode* pTextNd = m_pCurCrsr->GetNode().GetTextNode();
+        if( pTextNd )
         {
             const sal_Int32 nStt = m_pCurCrsr->Start()->nContent.GetIndex();
-            aTxt = pTxtNd->GetExpandTxt( nStt,
+            aText = pTextNd->GetExpandText( nStt,
                     m_pCurCrsr->End()->nContent.GetIndex() - nStt );
         }
     }
-    return aTxt;
+    return aText;
 }
 
 /// get text only from current cursor position (until end of node)
 OUString SwCrsrShell::GetText() const
 {
-    OUString aTxt;
+    OUString aText;
     if( m_pCurCrsr->GetPoint()->nNode.GetIndex() ==
         m_pCurCrsr->GetMark()->nNode.GetIndex() )
     {
-        SwTxtNode* pTxtNd = m_pCurCrsr->GetNode().GetTxtNode();
-        if( pTxtNd )
-            aTxt = pTxtNd->GetTxt().copy(
+        SwTextNode* pTextNd = m_pCurCrsr->GetNode().GetTextNode();
+        if( pTextNd )
+            aText = pTextNd->GetText().copy(
                     m_pCurCrsr->GetPoint()->nContent.GetIndex() );
     }
-    return aTxt;
+    return aText;
 }
 
 /** get the nth character of the current SSelection
@@ -2279,12 +2279,12 @@ sal_Unicode SwCrsrShell::GetChar( bool bEnd, long nOffset )
 
     const SwPosition* pPos = !m_pCurCrsr->HasMark() ? m_pCurCrsr->GetPoint()
                                 : bEnd ? m_pCurCrsr->End() : m_pCurCrsr->Start();
-    SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-    if( !pTxtNd )
+    SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+    if( !pTextNd )
         return 0;
 
     const sal_Int32 nPos = pPos->nContent.GetIndex();
-    const OUString& rStr = pTxtNd->GetTxt();
+    const OUString& rStr = pTextNd->GetText();
     sal_Unicode cCh = 0;
 
     if (((nPos+nOffset) >= 0 ) && (nPos+nOffset) < rStr.getLength())
@@ -2304,13 +2304,13 @@ bool SwCrsrShell::ExtendSelection( bool bEnd, sal_Int32 nCount )
         return false; // no selection
 
     SwPosition* pPos = bEnd ? m_pCurCrsr->End() : m_pCurCrsr->Start();
-    SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNd, "no text node; how should this then be extended?" );
+    SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+    OSL_ENSURE( pTextNd, "no text node; how should this then be extended?" );
 
     sal_Int32 nPos = pPos->nContent.GetIndex();
     if( bEnd )
     {
-        if ((nPos + nCount) <= pTxtNd->GetTxt().getLength())
+        if ((nPos + nCount) <= pTextNd->GetText().getLength())
             nPos = nPos + nCount;
         else
             return false; // not possible
@@ -2347,17 +2347,17 @@ bool SwCrsrShell::SetVisCrsr( const Point &rPt )
     SetInFrontOfLabel( false ); // #i27615#
 
     // show only in TextNodes
-    SwTxtNode* pTxtNd = aPos.nNode.GetNode().GetTxtNode();
-    if( !pTxtNd )
+    SwTextNode* pTextNd = aPos.nNode.GetNode().GetTextNode();
+    if( !pTextNd )
         return false;
 
-    const SwSectionNode* pSectNd = pTxtNd->FindSectionNode();
+    const SwSectionNode* pSectNd = pTextNd->FindSectionNode();
     if( pSectNd && (pSectNd->GetSection().IsHiddenFlag() ||
                     ( !IsReadOnlyAvailable() &&
                       pSectNd->GetSection().IsProtectFlag())) )
         return false;
 
-    SwCntntFrm *pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, &aPos );
+    SwContentFrm *pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt, &aPos );
     if ( Imp()->IsIdleAction() )
         pFrm->PrepareCrsr();
     SwRect aTmp( m_aCharRect );
@@ -2423,9 +2423,9 @@ bool SwCrsrShell::IsStartOfDoc() const
     if( m_pCurCrsr->GetPoint()->nContent.GetIndex() )
         return false;
 
-    // after EndOfIcons comes the content selection (EndNd+StNd+CntntNd)
+    // after EndOfIcons comes the content selection (EndNd+StNd+ContentNd)
     SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfExtras(), 2 );
-    if( !aIdx.GetNode().IsCntntNode() )
+    if( !aIdx.GetNode().IsContentNode() )
         GetDoc()->GetNodes().GoNext( &aIdx );
     return aIdx == m_pCurCrsr->GetPoint()->nNode;
 }
@@ -2433,7 +2433,7 @@ bool SwCrsrShell::IsStartOfDoc() const
 bool SwCrsrShell::IsEndOfDoc() const
 {
     SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfContent(), -1 );
-    SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+    SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
     if( !pCNd )
         pCNd = SwNodes::GoPrevious( &aIdx );
 
@@ -2448,19 +2448,19 @@ bool SwCrsrShell::IsEndOfDoc() const
 
     This is needed for Drag&Drop/ Clipboard-paste in tables.
 */
-bool SwCrsrShell::ParkTblCrsr()
+bool SwCrsrShell::ParkTableCrsr()
 {
-    if( !m_pTblCrsr )
+    if( !m_pTableCrsr )
         return false;
 
-    m_pTblCrsr->ParkCrsr();
+    m_pTableCrsr->ParkCrsr();
 
     while( m_pCurCrsr->GetNext() != m_pCurCrsr )
         delete m_pCurCrsr->GetNext();
 
     // *always* move cursor's Point and Mark
     m_pCurCrsr->DeleteMark();
-    *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
+    *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
 
     return true;
 }
@@ -2572,16 +2572,16 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
                 pSh->_ParkPams( pNew, &pSh->m_pCrsrStk );
 
             pSh->_ParkPams( pNew, &pSh->m_pCurCrsr );
-            if( pSh->m_pTblCrsr )
+            if( pSh->m_pTableCrsr )
             {
                 // set table cursor always to 0 and the current one always to
                 // the beginning of the table
-                SwPaM* pTCrsr = pSh->GetTblCrs();
-                SwNode* pTblNd = pTCrsr->GetPoint()->nNode.GetNode().FindTableNode();
-                if ( pTblNd )
+                SwPaM* pTCrsr = pSh->GetTableCrs();
+                SwNode* pTableNd = pTCrsr->GetPoint()->nNode.GetNode().FindTableNode();
+                if ( pTableNd )
                 {
                     pTCrsr->DeleteMark();
-                    pSh->m_pCurCrsr->GetPoint()->nNode = *pTblNd;
+                    pSh->m_pCurCrsr->GetPoint()->nNode = *pTableNd;
                 }
             }
         }
@@ -2599,13 +2599,13 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin )
     , SwModify( 0 )
     , m_pCrsrStk( 0 )
     , m_pBlockCrsr( 0 )
-    , m_pTblCrsr( 0 )
+    , m_pTableCrsr( 0 )
     , m_pBoxIdx( 0 )
     , m_pBoxPtr( 0 )
     , m_nUpDownX(0)
     , m_nLeftFrmPos(0)
     , m_nAktNode(0)
-    , m_nAktCntnt(0)
+    , m_nAktContent(0)
     , m_nAktNdTyp(0)
     , m_bAktSelection(false)
     , m_nCrsrMove( 0 )
@@ -2618,10 +2618,10 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin )
     SET_CURR_SHELL( this );
     // only keep the position of the current cursor of the copy shell
     m_pCurCrsr = new SwShellCrsr( *this, *(rShell.m_pCurCrsr->GetPoint()) );
-    m_pCurCrsr->GetCntntNode()->Add( this );
+    m_pCurCrsr->GetContentNode()->Add( this );
 
     m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
-    m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr =
+    m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCrsr =
     m_bOverwriteCrsr = false;
     m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
     m_bSVCrsrVis = true;
@@ -2641,13 +2641,13 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
     , SwModify( 0 )
     , m_pCrsrStk( 0 )
     , m_pBlockCrsr( 0 )
-    , m_pTblCrsr( 0 )
+    , m_pTableCrsr( 0 )
     , m_pBoxIdx( 0 )
     , m_pBoxPtr( 0 )
     , m_nUpDownX(0)
     , m_nLeftFrmPos(0)
     , m_nAktNode(0)
-    , m_nAktCntnt(0)
+    , m_nAktContent(0)
     , m_nAktNdTyp(0)
     , m_bAktSelection(false)
     , m_nCrsrMove( 0 )
@@ -2662,7 +2662,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
     SwNodes& rNds = rDoc.GetNodes();
 
     SwNodeIndex aNodeIdx( *rNds.GetEndOfContent().StartOfSectionNode() );
-    SwCntntNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to the first ContentNode
+    SwContentNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to the first ContentNode
 
     m_pCurCrsr = new SwShellCrsr( *this, SwPosition( aNodeIdx, SwIndex( pCNd, 0 )));
 
@@ -2671,7 +2671,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
     pCNd->Add( this );
 
     m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
-    m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr =
+    m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCrsr =
     m_bOverwriteCrsr = false;
     m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
     m_bSVCrsrVis = true;
@@ -2689,13 +2689,13 @@ SwCrsrShell::~SwCrsrShell()
 {
     // if it is not the last view then at least the field should be updated
     if( !unique() )
-        CheckTblBoxCntnt( m_pCurCrsr->GetPoint() );
+        CheckTableBoxContent( m_pCurCrsr->GetPoint() );
     else
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
 
     delete m_pVisCrsr;
     delete m_pBlockCrsr;
-    delete m_pTblCrsr;
+    delete m_pTableCrsr;
 
     // release cursors
     while(m_pCurCrsr->GetNext() != m_pCurCrsr)
@@ -2718,8 +2718,8 @@ SwCrsrShell::~SwCrsrShell()
 
 SwShellCrsr* SwCrsrShell::getShellCrsr( bool bBlock )
 {
-    if( m_pTblCrsr )
-        return m_pTblCrsr;
+    if( m_pTableCrsr )
+        return m_pTableCrsr;
     if( m_pBlockCrsr && bBlock )
         return &m_pBlockCrsr->getShellCrsr();
     return m_pCurCrsr;
@@ -2742,13 +2742,13 @@ bool SwCrsrShell::ShouldWait() const
             pPam->End()->nNode.GetIndex();
 }
 
-size_t SwCrsrShell::UpdateTblSelBoxes()
+size_t SwCrsrShell::UpdateTableSelBoxes()
 {
-    if (m_pTblCrsr && (m_pTblCrsr->IsChgd() || !m_pTblCrsr->GetSelectedBoxesCount()))
+    if (m_pTableCrsr && (m_pTableCrsr->IsChgd() || !m_pTableCrsr->GetSelectedBoxesCount()))
     {
-         GetLayout()->MakeTblCrsrs( *m_pTblCrsr );
+         GetLayout()->MakeTableCrsrs( *m_pTableCrsr );
     }
-    return (m_pTblCrsr) ? m_pTblCrsr->GetSelectedBoxesCount() : 0;
+    return (m_pTableCrsr) ? m_pTableCrsr->GetSelectedBoxesCount() : 0;
 }
 
 /// show the current selected "object"
@@ -2787,9 +2787,9 @@ void SwCrsrShell::MakeSelVisible()
 }
 
 /// search a valid content position (not protected/hidden)
-bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
+bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
 {
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
     {
         OSL_ENSURE( false, "Did not remove table selection!" );
         return false;
@@ -2807,8 +2807,8 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
     SwNodeIndex& rNdIdx = m_pCurCrsr->GetPoint()->nNode;
     sal_uLong nNdIdx = rNdIdx.GetIndex(); // keep backup
     SwNodes& rNds = mpDoc->GetNodes();
-    SwCntntNode* pCNd = rNdIdx.GetNode().GetCntntNode();
-    const SwCntntFrm * pFrm;
+    SwContentNode* pCNd = rNdIdx.GetNode().GetContentNode();
+    const SwContentFrm * pFrm;
 
     if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( GetLayout(), 0, m_pCurCrsr->GetPoint(), false)) &&
         !IsReadOnlyAvailable() && pFrm->IsProtected() &&
@@ -2834,7 +2834,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
         }
         *m_pCurCrsr->GetPoint() = *aPam.GetPoint();
     }
-    else if( bOnlyText && pCNd && pCNd->IsNoTxtNode() )
+    else if( bOnlyText && pCNd && pCNd->IsNoTextNode() )
     {
         // set to beginning of document
         rNdIdx = mpDoc->GetNodes().GetEndOfExtras();
@@ -2857,7 +2857,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
         // move forward into non-protected area.
         SwPaM aPam( rNdIdx.GetNode(), 0 );
         while( aPam.GetNode().IsProtect() &&
-               aPam.Move( fnMoveForward, fnGoCntnt ) )
+               aPam.Move( fnMoveForward, fnGoContent ) )
             ; // nothing to do in the loop; the aPam.Move does the moving!
 
         // didn't work? then go backwards!
@@ -2866,7 +2866,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
             SwPaM aTmpPaM( rNdIdx.GetNode(), 0 );
             aPam = aTmpPaM;
             while( aPam.GetNode().IsProtect() &&
-                   aPam.Move( fnMoveBackward, fnGoCntnt ) )
+                   aPam.Move( fnMoveBackward, fnGoContent ) )
                 ; // nothing to do in the loop; the aPam.Move does the moving!
         }
 
@@ -2930,7 +2930,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
                     // also check for Fly - might be protected as well
                     if( 0 == (pFrm = pCNd->getLayoutFrm( GetLayout(), 0, 0, false)) ||
                         ( !IsReadOnlyAvailable() && pFrm->IsProtected() ) ||
-                        ( bOnlyText && pCNd->IsNoTxtNode() ) )
+                        ( bOnlyText && pCNd->IsNoTextNode() ) )
                     {
                         // continue search
                         bOk = false;
@@ -2949,13 +2949,13 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
     }
     if( bOk )
     {
-        pCNd = rNdIdx.GetNode().GetCntntNode();
-        const sal_Int32 nCntnt = rNdIdx.GetIndex() < nNdIdx ? pCNd->Len() : 0;
-        m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, nCntnt );
+        pCNd = rNdIdx.GetNode().GetContentNode();
+        const sal_Int32 nContent = rNdIdx.GetIndex() < nNdIdx ? pCNd->Len() : 0;
+        m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, nContent );
     }
     else
     {
-        pCNd = rNdIdx.GetNode().GetCntntNode();
+        pCNd = rNdIdx.GetNode().GetContentNode();
         // if cursor in hidden frame, always move it
         if( !pCNd || !pCNd->getLayoutFrm( GetLayout(), 0, 0, false) )
         {
@@ -2978,9 +2978,9 @@ bool SwCrsrShell::IsCrsrReadonly() const
         const SwSection* pSection;
 
         if( pFrm && pFrm->IsInFly() &&
-            (pFly = pFrm->FindFlyFrm())->GetFmt()->GetEditInReadonly().GetValue() &&
+            (pFly = pFrm->FindFlyFrm())->GetFormat()->GetEditInReadonly().GetValue() &&
             pFly->Lower() &&
-            !pFly->Lower()->IsNoTxtFrm() &&
+            !pFly->Lower()->IsNoTextFrm() &&
             !GetDrawView()->GetMarkedObjectList().GetMarkCount() )
         {
             return false;
@@ -2992,7 +2992,7 @@ bool SwCrsrShell::IsCrsrReadonly() const
         {
             return false;
         }
-        else if ( !IsMultiSelection() && CrsrInsideInputFld() )
+        else if ( !IsMultiSelection() && CrsrInsideInputField() )
         {
             return false;
         }
@@ -3027,10 +3027,10 @@ bool SwCrsrShell::HasReadonlySel(bool bAnnotationMode) const
     // If protected area is to be ignored, then selections are never read-only.
     if ((IsReadOnlyAvailable() || GetViewOptions()->IsFormView()) && !GetViewOptions()->IsIgnoreProtectedArea())
     {
-        if ( m_pTblCrsr != NULL )
+        if ( m_pTableCrsr != NULL )
         {
-            bRet = m_pTblCrsr->HasReadOnlyBoxSel()
-                   || m_pTblCrsr->HasReadonlySel( GetViewOptions()->IsFormView() );
+            bRet = m_pTableCrsr->HasReadOnlyBoxSel()
+                   || m_pTableCrsr->HasReadonlySel( GetViewOptions()->IsFormView() );
         }
         else
         {
@@ -3062,7 +3062,7 @@ bool SwCrsrShell::IsSelFullPara() const
             nStt = nEnd;
             nEnd = nTmp;
         }
-        const SwCntntNode* pCNd = m_pCurCrsr->GetCntntNode();
+        const SwContentNode* pCNd = m_pCurCrsr->GetContentNode();
         bRet = pCNd && !nStt && nEnd == pCNd->Len();
     }
     return bRet;
@@ -3105,7 +3105,7 @@ bool SwCrsrShell::SelectHiddenRange()
     if ( !GetViewOptions()->IsShowHiddenChar() && !m_pCurCrsr->HasMark() )
     {
         SwPosition& rPt = *m_pCurCrsr->GetPoint();
-        const SwTxtNode* pNode = rPt.nNode.GetNode().GetTxtNode();
+        const SwTextNode* pNode = rPt.nNode.GetNode().GetTextNode();
         if ( pNode )
         {
             const sal_Int32 nPos = rPt.nContent.GetIndex();
@@ -3134,9 +3134,9 @@ sal_uLong SwCrsrShell::Find( const SearchOptions& rSearchOpt,
                              FindRanges eRng,
                              bool bReplace )
 {
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
         GetCrsr();
-    delete m_pTblCrsr, m_pTblCrsr = 0;
+    delete m_pTableCrsr, m_pTableCrsr = 0;
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     sal_uLong nRet = m_pCurCrsr->Find( rSearchOpt, bSearchInNotes, eStart, eEnd,
                                      bCancel, eRng, bReplace );
@@ -3145,18 +3145,18 @@ sal_uLong SwCrsrShell::Find( const SearchOptions& rSearchOpt,
     return nRet;
 }
 
-sal_uLong SwCrsrShell::Find( const SwTxtFmtColl& rFmtColl,
+sal_uLong SwCrsrShell::Find( const SwTextFormatColl& rFormatColl,
                              SwDocPositions eStart, SwDocPositions eEnd,
                              bool& bCancel,
                              FindRanges eRng,
-                             const SwTxtFmtColl* pReplFmt )
+                             const SwTextFormatColl* pReplFormat )
 {
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
         GetCrsr();
-    delete m_pTblCrsr, m_pTblCrsr = 0;
+    delete m_pTableCrsr, m_pTableCrsr = 0;
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    sal_uLong nRet = m_pCurCrsr->Find( rFmtColl, eStart, eEnd, bCancel, eRng,
-                                     pReplFmt );
+    sal_uLong nRet = m_pCurCrsr->Find( rFormatColl, eStart, eEnd, bCancel, eRng,
+                                     pReplFormat );
     if( nRet )
         UpdateCrsr();
     return nRet;
@@ -3170,9 +3170,9 @@ sal_uLong SwCrsrShell::Find( const SfxItemSet& rSet,
                              const SearchOptions* pSearchOpt,
                              const SfxItemSet* rReplSet )
 {
-    if( m_pTblCrsr )
+    if( m_pTableCrsr )
         GetCrsr();
-    delete m_pTblCrsr, m_pTblCrsr = 0;
+    delete m_pTableCrsr, m_pTableCrsr = 0;
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     sal_uLong nRet = m_pCurCrsr->Find( rSet, bNoCollections, eStart, eEnd,
                                      bCancel, eRng, pSearchOpt, rReplSet );
@@ -3227,7 +3227,7 @@ static const SwStartNode* lcl_NodeContext( const SwNode& rNode )
 */
 bool sw_PosOk(const SwPosition & aPos)
 {
-    return NULL != aPos.nNode.GetNode().GetCntntNode() &&
+    return NULL != aPos.nNode.GetNode().GetContentNode() &&
            aPos.nContent.GetIdxReg();
 }
 
@@ -3301,8 +3301,8 @@ void SwCrsrShell::ClearUpCrsrs()
 
     // If at least one of the cursors in the ring have been deleted or replaced,
     // remove the table cursor.
-    if (m_pTblCrsr != NULL && bChanged)
-        TblCrsrToCursor();
+    if (m_pTableCrsr != NULL && bChanged)
+        TableCrsrToCursor();
 }
 
 OUString SwCrsrShell::GetCrsrDescr() const
@@ -3359,7 +3359,7 @@ static void lcl_FillRecognizerData( uno::Sequence< OUString >& rSmartTagTypes,
 }
 
 static void lcl_FillTextRange( uno::Reference<text::XTextRange>& rRange,
-                   SwTxtNode& rNode, sal_Int32 nBegin, sal_Int32 nLen )
+                   SwTextNode& rNode, sal_Int32 nBegin, sal_Int32 nLen )
 {
     // create SwPosition for nStartIndex
     SwIndex aIndex( &rNode, nBegin );
@@ -3384,7 +3384,7 @@ void SwCrsrShell::GetSmartTagTerm( uno::Sequence< OUString >& rSmartTagTypes,
 
     SwPaM* pCrsr = GetCrsr();
     SwPosition aPos( *pCrsr->GetPoint() );
-    SwTxtNode *pNode = aPos.nNode.GetNode().GetTxtNode();
+    SwTextNode *pNode = aPos.nNode.GetNode().GetTextNode();
     if ( pNode && !pNode->IsInProtectSect() )
     {
         const SwWrongList *pSmartTagList = pNode->GetSmartTags();
@@ -3426,11 +3426,11 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
     SwCrsrMoveState eTmpState( MV_SETONLYTEXT );
     SwSpecialPos aSpecialPos;
     eTmpState.pSpecialPos = &aSpecialPos;
-    SwTxtNode *pNode;
+    SwTextNode *pNode;
     const SwWrongList *pSmartTagList;
 
     if( GetLayout()->GetCrsrOfst( &aPos, aPt, &eTmpState ) &&
-        0 != (pNode = aPos.nNode.GetNode().GetTxtNode()) &&
+        0 != (pNode = aPos.nNode.GetNode().GetTextNode()) &&
         0 != (pSmartTagList = pNode->GetSmartTags()) &&
         !pNode->IsInProtectSect() )
     {
@@ -3452,7 +3452,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             lcl_FillTextRange( rRange, *pNode, nBegin, nLen );
 
             // get smarttag word
-            OUString aText( pNode->GetTxt().copy(nBegin, nLen) );
+            OUString aText( pNode->GetText().copy(nBegin, nLen) );
 
             //save the start and end positions of the line and the starting point
             Push();
@@ -3492,13 +3492,13 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             SwRect aStartRect;
             SwCrsrMoveState aState;
             aState.bRealWidth = true;
-            SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
-            SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), false);
+            SwContentNode* pContentNode = pCrsr->GetContentNode();
+            SwContentFrm *pContentFrame = pContentNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), false);
 
-            pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
+            pContentFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
             rContent = nWordEnd - 1;
             SwRect aEndRect;
-            pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
+            pContentFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
             rSelectRect = aStartRect.Union( aEndRect );
             Pop(false);
         }
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 3b0d097ef515..99c8a56ab622 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -80,7 +80,7 @@ void SwCrsrShell::MoveCrsrToNum()
     // try to set cursor onto this position, at half of the char-
     // SRectangle's height
     Point aPt( m_pCurCrsr->GetPtPos() );
-    SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), &aPt,
+    SwContentFrm * pFrm = m_pCurCrsr->GetContentNode()->getLayoutFrm( GetLayout(), &aPt,
                                                 m_pCurCrsr->GetPoint() );
     pFrm->GetCharRect( m_aCharRect, *m_pCurCrsr->GetPoint() );
     pFrm->Calc();
@@ -122,13 +122,13 @@ bool SwCrsrShell::GotoPrevNum()
 }
 
 /// jump from content to header
-bool SwCrsrShell::GotoHeaderTxt()
+bool SwCrsrShell::GotoHeaderText()
 {
     const SwFrm* pFrm = GetCurrFrm()->FindPageFrm();
     while( pFrm && !pFrm->IsHeaderFrm() )
         pFrm = pFrm->GetLower();
     // found header, search 1. content frame
-    while( pFrm && !pFrm->IsCntntFrm() )
+    while( pFrm && !pFrm->IsContentFrm() )
         pFrm = pFrm->GetLower();
 
     if( pFrm )
@@ -150,7 +150,7 @@ bool SwCrsrShell::GotoHeaderTxt()
 }
 
 /// jump from content to footer
-bool SwCrsrShell::GotoFooterTxt()
+bool SwCrsrShell::GotoFooterText()
 {
     const SwPageFrm* pFrm = GetCurrFrm()->FindPageFrm();
     if( pFrm )
@@ -160,7 +160,7 @@ bool SwCrsrShell::GotoFooterTxt()
         while( pLower && !pLower->IsFooterFrm() )
             pLower = pLower->GetLower();
         // found footer, search 1. content frame
-        while( pLower && !pLower->IsCntntFrm() )
+        while( pLower && !pLower->IsContentFrm() )
             pLower = pLower->GetLower();
 
         if( pLower )
@@ -209,25 +209,25 @@ bool SwCrsrShell::SetCrsrInHdFt( size_t nDescNo, bool bInHeader )
     if( pDesc )
     {
         // check if the attribute exists
-        const SwFmtCntnt* pCnt = 0;
+        const SwFormatContent* pCnt = 0;
         if( bInHeader )
         {
             // mirrored pages? ignore for now
-            const SwFmtHeader& rHd = pDesc->GetMaster().GetHeader();
-            if( rHd.GetHeaderFmt() )
-                pCnt = &rHd.GetHeaderFmt()->GetCntnt();
+            const SwFormatHeader& rHd = pDesc->GetMaster().GetHeader();
+            if( rHd.GetHeaderFormat() )
+                pCnt = &rHd.GetHeaderFormat()->GetContent();
         }
         else
         {
-            const SwFmtFooter& rFt = pDesc->GetMaster().GetFooter();
-            if( rFt.GetFooterFmt() )
-                pCnt = &rFt.GetFooterFmt()->GetCntnt();
+            const SwFormatFooter& rFt = pDesc->GetMaster().GetFooter();
+            if( rFt.GetFooterFormat() )
+                pCnt = &rFt.GetFooterFormat()->GetContent();
         }
 
-        if( pCnt && pCnt->GetCntntIdx() )
+        if( pCnt && pCnt->GetContentIdx() )
         {
-            SwNodeIndex aIdx( *pCnt->GetCntntIdx(), 1 );
-            SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+            SwNodeIndex aIdx( *pCnt->GetContentIdx(), 1 );
+            SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
             if( !pCNd )
                 pCNd = pMyDoc->GetNodes().GoNext( &aIdx );
 
@@ -260,15 +260,15 @@ bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
 {
     bool bRet = false;
 
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
-    SwCntntNode* pFnd = 0;
-    for( SwSectionFmts::size_type n = rFmts.size(); n; )
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
+    SwContentNode* pFnd = 0;
+    for( SwSectionFormats::size_type n = rFormats.size(); n; )
     {
-        const SwSection* pSect = rFmts[ --n ]->GetSection();
+        const SwSection* pSect = rFormats[ --n ]->GetSection();
         if (TOX_CONTENT_SECTION == pSect->GetType())
         {
             SwSectionNode const*const pSectNd(
-                    pSect->GetFmt()->GetSectionNode());
+                    pSect->GetFormat()->GetSectionNode());
             if (   pSectNd
                 && m_pCurCrsr->GetPoint()->nNode < pSectNd->GetIndex()
                 && (!pFnd  || pFnd->GetIndex() > pSectNd->GetIndex())
@@ -276,13 +276,13 @@ bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
                     static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()))
             {
                 SwNodeIndex aIdx(*pSectNd, 1);
-                SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if (!pCNd)
                     pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
                 if (pCNd &&
                     pCNd->EndOfSectionIndex() <= pSectNd->EndOfSectionIndex())
                 {
-                    SwCntntFrm const*const pCFrm(
+                    SwContentFrm const*const pCFrm(
                             pCNd->getLayoutFrm(GetLayout()));
                     if (pCFrm &&
                         (IsReadOnlyAvailable() || !pCFrm->IsProtected()))
@@ -311,15 +311,15 @@ bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
 {
     bool bRet = false;
 
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
-    SwCntntNode* pFnd = 0;
-    for( SwSectionFmts::size_type n = rFmts.size(); n; )
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
+    SwContentNode* pFnd = 0;
+    for( SwSectionFormats::size_type n = rFormats.size(); n; )
     {
-        const SwSection* pSect = rFmts[ --n ]->GetSection();
+        const SwSection* pSect = rFormats[ --n ]->GetSection();
         if (TOX_CONTENT_SECTION == pSect->GetType())
         {
             SwSectionNode const*const pSectNd(
-                    pSect->GetFmt()->GetSectionNode());
+                    pSect->GetFormat()->GetSectionNode());
             if (   pSectNd
                 && m_pCurCrsr->GetPoint()->nNode > pSectNd->EndOfSectionIndex()
                 && (!pFnd  || pFnd->GetIndex() < pSectNd->GetIndex())
@@ -327,13 +327,13 @@ bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
                     static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()))
             {
                 SwNodeIndex aIdx(*pSectNd, 1);
-                SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if (!pCNd)
                     pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
                 if (pCNd &&
                     pCNd->EndOfSectionIndex() <= pSectNd->EndOfSectionIndex())
                 {
-                    SwCntntFrm const*const pCFrm(
+                    SwContentFrm const*const pCFrm(
                             pCNd->getLayoutFrm(GetLayout()));
                     if (pCFrm &&
                         (IsReadOnlyAvailable() || !pCFrm->IsProtected()))
@@ -372,19 +372,19 @@ bool SwCrsrShell::GotoTOXMarkBase()
         const SwTOXType* pType = aMarks[0]->GetTOXType();
         SwIterator<SwTOXBase,SwTOXType> aIter( *pType );
         const SwSectionNode* pSectNd;
-        const SwSectionFmt* pSectFmt;
+        const SwSectionFormat* pSectFormat;
 
         for( SwTOXBase* pTOX = aIter.First(); pTOX; pTOX = aIter.Next() )
         {
             if( pTOX->ISA( SwTOXBaseSection ) &&
-                0 != ( pSectFmt = static_cast<SwTOXBaseSection*>(pTOX)->GetFmt() ) &&
-                0 != ( pSectNd = pSectFmt->GetSectionNode() ))
+                0 != ( pSectFormat = static_cast<SwTOXBaseSection*>(pTOX)->GetFormat() ) &&
+                0 != ( pSectNd = pSectFormat->GetSectionNode() ))
             {
                 SwNodeIndex aIdx( *pSectNd, 1 );
-                SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if( !pCNd )
                     pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
-                const SwCntntFrm* pCFrm;
+                const SwContentFrm* pCFrm;
                 if( pCNd &&
                     pCNd->EndOfSectionIndex() < pSectNd->EndOfSectionIndex() &&
                     0 != ( pCFrm = pCNd->getLayoutFrm( GetLayout() ) ) &&
@@ -408,7 +408,7 @@ bool SwCrsrShell::GotoTOXMarkBase()
 
 /// Jump to next/previous table formula
 /// Optionally it is possible to also jump to broken formulas
-bool SwCrsrShell::GotoNxtPrvTblFormula( bool bNext, bool bOnlyErrors )
+bool SwCrsrShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors )
 {
     if( IsTableMode() )
         return false;
@@ -420,22 +420,22 @@ bool SwCrsrShell::GotoNxtPrvTblFormula( bool bNext, bool bOnlyErrors )
     SwPosition aFndPos( GetDoc()->GetNodes().GetEndOfContent() );
     if( !bNext )
         aFndPos.nNode = 0;
-    _SetGetExpFld aFndGEF( aFndPos ), aCurGEF( rPos );
+    _SetGetExpField aFndGEF( aFndPos ), aCurGEF( rPos );
 
     {
         const SwNode* pSttNd = rPos.nNode.GetNode().FindTableBoxStartNode();
         if( pSttNd )
         {
             const SwTableBox* pTBox = pSttNd->FindTableNode()->GetTable().
-                                        GetTblBox( pSttNd->GetIndex() );
+                                        GetTableBox( pSttNd->GetIndex() );
             if( pTBox )
-                aCurGEF = _SetGetExpFld( *pTBox );
+                aCurGEF = _SetGetExpField( *pTBox );
         }
     }
 
     if( rPos.nNode < GetDoc()->GetNodes().GetEndOfExtras() )
         // also at collection use only the first frame
-        aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(),
+        aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetContentNode()->getLayoutFrm( GetLayout(),
                                 &aPt, &rPos, false ) );
     {
         const SfxPoolItem* pItem;
@@ -445,19 +445,19 @@ bool SwCrsrShell::GotoNxtPrvTblFormula( bool bNext, bool bOnlyErrors )
         for( n = 0; n < nMaxItems; ++n )
             if( 0 != (pItem = GetDoc()->GetAttrPool().GetItem2(
                                         RES_BOXATR_FORMULA, n ) ) &&
-                0 != (pTBox = static_cast<const SwTblBoxFormula*>(pItem)->GetTableBox() ) &&
+                0 != (pTBox = static_cast<const SwTableBoxFormula*>(pItem)->GetTableBox() ) &&
                 pTBox->GetSttNd() &&
                 pTBox->GetSttNd()->GetNodes().IsDocNodes() &&
                 ( !bOnlyErrors ||
-                  !static_cast<const SwTblBoxFormula*>(pItem)->HasValidBoxes() ) )
+                  !static_cast<const SwTableBoxFormula*>(pItem)->HasValidBoxes() ) )
             {
-                const SwCntntFrm* pCFrm;
+                const SwContentFrm* pCFrm;
                 SwNodeIndex aIdx( *pTBox->GetSttNd() );
-                const SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
+                const SwContentNode* pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
                 if( pCNd && 0 != ( pCFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, 0, false ) ) &&
                     (IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
                 {
-                    _SetGetExpFld aCmp( *pTBox );
+                    _SetGetExpField aCmp( *pTBox );
                     aCmp.SetBodyPos( *pCFrm );
 
                     if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF )
@@ -500,32 +500,32 @@ bool SwCrsrShell::GotoNxtPrvTOXMark( bool bNext )
     SwPosition aFndPos( GetDoc()->GetNodes().GetEndOfContent() );
     if( !bNext )
         aFndPos.nNode = 0;
-    _SetGetExpFld aFndGEF( aFndPos ), aCurGEF( rPos );
+    _SetGetExpField aFndGEF( aFndPos ), aCurGEF( rPos );
 
     if( rPos.nNode.GetIndex() < GetDoc()->GetNodes().GetEndOfExtras().GetIndex() )
         // also at collection use only the first frame
         aCurGEF.SetBodyPos( *rPos.nNode.GetNode().
-                        GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, false ) );
+                        GetContentNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, false ) );
 
     {
-        const SwTxtNode* pTxtNd;
-        const SwTxtTOXMark* pTxtTOX;
+        const SwTextNode* pTextNd;
+        const SwTextTOXMark* pTextTOX;
         sal_uInt32 n, nMaxItems = GetDoc()->GetAttrPool().GetItemCount2( RES_TXTATR_TOXMARK );
 
         for( n = 0; n < nMaxItems; ++n )
         {
             const SfxPoolItem* pItem;
-            const SwCntntFrm* pCFrm;
+            const SwContentFrm* pCFrm;
 
             if( 0 != (pItem = GetDoc()->GetAttrPool().GetItem2(
                                         RES_TXTATR_TOXMARK, n ) ) &&
-                0 != (pTxtTOX = static_cast<const SwTOXMark*>(pItem)->GetTxtTOXMark() ) &&
-                ( pTxtNd = &pTxtTOX->GetTxtNode())->GetNodes().IsDocNodes() &&
-                0 != ( pCFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, 0, false )) &&
+                0 != (pTextTOX = static_cast<const SwTOXMark*>(pItem)->GetTextTOXMark() ) &&
+                ( pTextNd = &pTextTOX->GetTextNode())->GetNodes().IsDocNodes() &&
+                0 != ( pCFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt, 0, false )) &&
                 ( IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
             {
-                SwNodeIndex aNdIndex( *pTxtNd ); // UNIX needs this object
-                _SetGetExpFld aCmp( aNdIndex, *pTxtTOX, 0 );
+                SwNodeIndex aNdIndex( *pTextNd ); // UNIX needs this object
+                _SetGetExpField aCmp( aNdIndex, *pTextTOX, 0 );
                 aCmp.SetBodyPos( *pCFrm );
 
                 if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF )
@@ -566,9 +566,9 @@ const SwTOXMark& SwCrsrShell::GotoTOXMark( const SwTOXMark& rStart,
                                                     IsReadOnlyAvailable() );
     // set position
     SwPosition& rPos = *GetCrsr()->GetPoint();
-    rPos.nNode = rNewMark.GetTxtTOXMark()->GetTxtNode();
-    rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
-                         rNewMark.GetTxtTOXMark()->GetStart() );
+    rPos.nNode = rNewMark.GetTextTOXMark()->GetTextNode();
+    rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
+                         rNewMark.GetTextTOXMark()->GetStart() );
 
     if( !m_pCurCrsr->IsSelOvr() )
         UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
@@ -578,30 +578,30 @@ const SwTOXMark& SwCrsrShell::GotoTOXMark( const SwTOXMark& rStart,
 }
 
 /// jump to next/previous field type
-void lcl_MakeFldLst(
-    _SetGetExpFlds& rLst,
-    const SwFieldType& rFldType,
+void lcl_MakeFieldLst(
+    _SetGetExpFields& rLst,
+    const SwFieldType& rFieldType,
     const bool bInReadOnly,
     const bool bChkInpFlag = false )
 {
     // always search the 1. frame
     Point aPt;
-    SwTxtFld* pTxtFld = NULL;
-    SwIterator<SwFmtFld,SwFieldType> aIter(rFldType);
-    for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+    SwTextField* pTextField = NULL;
+    SwIterator<SwFormatField,SwFieldType> aIter(rFieldType);
+    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
     {
-        pTxtFld = pFmtFld->GetTxtFld();
-        if ( pTxtFld != NULL
+        pTextField = pFormatField->GetTextField();
+        if ( pTextField != NULL
              && ( !bChkInpFlag
-                  || static_cast<const SwSetExpField*>(pTxtFld->GetFmtFld().GetField())->GetInputFlag() ) )
+                  || static_cast<const SwSetExpField*>(pTextField->GetFormatField().GetField())->GetInputFlag() ) )
         {
-            const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
-            const SwCntntFrm* pCFrm =
-                rTxtNode.getLayoutFrm( rTxtNode.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+            const SwTextNode& rTextNode = pTextField->GetTextNode();
+            const SwContentFrm* pCFrm =
+                rTextNode.getLayoutFrm( rTextNode.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
             if ( pCFrm != NULL
                  && ( bInReadOnly || !pCFrm->IsProtected() ) )
             {
-                _SetGetExpFld* pNew = new _SetGetExpFld( SwNodeIndex( rTxtNode ), pTxtFld );
+                _SetGetExpField* pNew = new _SetGetExpField( SwNodeIndex( rTextNode ), pTextField );
                 pNew->SetBodyPos( *pCFrm );
                 rLst.insert( pNew );
             }
@@ -609,81 +609,81 @@ void lcl_MakeFldLst(
     }
 }
 
-static _SetGetExpFlds::const_iterator
-lcl_FindField(bool & o_rFound, _SetGetExpFlds const& rSrtLst,
-        SwRootFrm *const pLayout, SwTxtNode *const pTxtNode,
-        SwTxtFld *const pTxtFld, SwPosition const& rPos,
+static _SetGetExpFields::const_iterator
+lcl_FindField(bool & o_rFound, _SetGetExpFields const& rSrtLst,
+        SwRootFrm *const pLayout, SwTextNode *const pTextNode,
+        SwTextField *const pTextField, SwPosition const& rPos,
         sal_Int32 const nContentOffset)
 {
-    boost::scoped_ptr<_SetGetExpFld> pSrch;
+    boost::scoped_ptr<_SetGetExpField> pSrch;
     boost::scoped_ptr<SwIndex> pIndex;
     if (-1 == nContentOffset)
     {
-        pSrch.reset(new _SetGetExpFld(rPos.nNode, pTxtFld, &rPos.nContent));
+        pSrch.reset(new _SetGetExpField(rPos.nNode, pTextField, &rPos.nContent));
     }
     else
     {
-        pIndex.reset(new SwIndex(rPos.nNode.GetNode().GetCntntNode(), nContentOffset));
-        pSrch.reset(new _SetGetExpFld(rPos.nNode, pTxtFld, pIndex.get()));
+        pIndex.reset(new SwIndex(rPos.nNode.GetNode().GetContentNode(), nContentOffset));
+        pSrch.reset(new _SetGetExpField(rPos.nNode, pTextField, pIndex.get()));
     }
 
-    if (rPos.nNode.GetIndex() < pTxtNode->GetNodes().GetEndOfExtras().GetIndex())
+    if (rPos.nNode.GetIndex() < pTextNode->GetNodes().GetEndOfExtras().GetIndex())
     {
         // also at collection use only the first frame
         Point aPt;
-        pSrch->SetBodyPos(*pTxtNode->getLayoutFrm(pLayout, &aPt, &rPos, false));
+        pSrch->SetBodyPos(*pTextNode->getLayoutFrm(pLayout, &aPt, &rPos, false));
     }
 
-    _SetGetExpFlds::const_iterator it = rSrtLst.lower_bound(pSrch.get());
+    _SetGetExpFields::const_iterator it = rSrtLst.lower_bound(pSrch.get());
 
     o_rFound = (it != rSrtLst.end()) && (**it == *pSrch);
     return it;
 }
 
-bool SwCrsrShell::MoveFldType(
-    const SwFieldType* pFldType,
+bool SwCrsrShell::MoveFieldType(
+    const SwFieldType* pFieldType,
     const bool bNext,
     const sal_uInt16 nResType,
-    const bool bAddSetExpressionFldsToInputFlds )
+    const bool bAddSetExpressionFieldsToInputFields )
 {
     // sorted list of all fields
-    _SetGetExpFlds aSrtLst;
+    _SetGetExpFields aSrtLst;
 
-    if ( pFldType )
+    if ( pFieldType )
     {
-        if( RES_INPUTFLD != pFldType->Which() && !pFldType->HasWriterListeners() )
+        if( RES_INPUTFLD != pFieldType->Which() && !pFieldType->HasWriterListeners() )
         {
             return false;
         }
 
         // found Modify object, add all fields to array
-        ::lcl_MakeFldLst( aSrtLst, *pFldType, IsReadOnlyAvailable() );
+        ::lcl_MakeFieldLst( aSrtLst, *pFieldType, IsReadOnlyAvailable() );
 
-        if( RES_INPUTFLD == pFldType->Which() && bAddSetExpressionFldsToInputFlds )
+        if( RES_INPUTFLD == pFieldType->Which() && bAddSetExpressionFieldsToInputFields )
         {
             // there are hidden input fields in the set exp. fields
-            const SwFldTypes& rFldTypes = *mpDoc->getIDocumentFieldsAccess().GetFldTypes();
-            const size_t nSize = rFldTypes.size();
+            const SwFieldTypes& rFieldTypes = *mpDoc->getIDocumentFieldsAccess().GetFieldTypes();
+            const size_t nSize = rFieldTypes.size();
             for( size_t i=0; i < nSize; ++i )
             {
-                pFldType = rFldTypes[ i ];
-                if ( RES_SETEXPFLD == pFldType->Which() )
+                pFieldType = rFieldTypes[ i ];
+                if ( RES_SETEXPFLD == pFieldType->Which() )
                 {
-                    ::lcl_MakeFldLst( aSrtLst, *pFldType, IsReadOnlyAvailable(), true );
+                    ::lcl_MakeFieldLst( aSrtLst, *pFieldType, IsReadOnlyAvailable(), true );
                 }
             }
         }
     }
     else
     {
-        const SwFldTypes& rFldTypes = *mpDoc->getIDocumentFieldsAccess().GetFldTypes();
-        const size_t nSize = rFldTypes.size();
+        const SwFieldTypes& rFieldTypes = *mpDoc->getIDocumentFieldsAccess().GetFieldTypes();
+        const size_t nSize = rFieldTypes.size();
         for( size_t i=0; i < nSize; ++i )
         {
-            pFldType = rFldTypes[ i ];
-            if( nResType == pFldType->Which() )
+            pFieldType = rFieldTypes[ i ];
+            if( nResType == pFieldType->Which() )
             {
-                ::lcl_MakeFldLst( aSrtLst, *pFldType, IsReadOnlyAvailable() );
+                ::lcl_MakeFieldLst( aSrtLst, *pFieldType, IsReadOnlyAvailable() );
             }
         }
     }
@@ -692,7 +692,7 @@ bool SwCrsrShell::MoveFldType(
     if( aSrtLst.empty() )
         return false;
 
-    _SetGetExpFlds::const_iterator it;
+    _SetGetExpFields::const_iterator it;
     SwCursor* pCrsr = getShellCrsr( true );
     {
         // (1998): Always use field for search so that the right one is found as
@@ -700,39 +700,39 @@ bool SwCrsrShell::MoveFldType(
         // field
         const SwPosition& rPos = *pCrsr->GetPoint();
 
-        SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
-        OSL_ENSURE( pTNd, "No CntntNode" );
+        SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
+        OSL_ENSURE( pTNd, "No ContentNode" );
 
-        SwTxtFld * pTxtFld = pTNd->GetFldTxtAttrAt( rPos.nContent.GetIndex(), true );
-        const bool bDelFld = ( pTxtFld == NULL );
+        SwTextField * pTextField = pTNd->GetFieldTextAttrAt( rPos.nContent.GetIndex(), true );
+        const bool bDelField = ( pTextField == NULL );
         sal_Int32 nContentOffset = -1;
 
-        if( bDelFld )
+        if( bDelField )
         {
             // create dummy for the search
-            SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField(
-                static_cast<SwDateTimeFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFldType( RES_DATETIMEFLD ) ) ) );
+            SwFormatField* pFormatField = new SwFormatField( SwDateTimeField(
+                static_cast<SwDateTimeFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_DATETIMEFLD ) ) ) );
 
-            pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex(),
+            pTextField = new SwTextField( *pFormatField, rPos.nContent.GetIndex(),
                         mpDoc->IsClipBoard() );
-            pTxtFld->ChgTxtNode( pTNd );
+            pTextField->ChgTextNode( pTNd );
         }
         else
         {
             // the cursor might be anywhere inside the input field,
             // but we will be searching for the field start
-            if (pTxtFld->Which() == RES_TXTATR_INPUTFIELD
-                    && rPos.nContent.GetIndex() != pTxtFld->GetStart())
-                nContentOffset = pTxtFld->GetStart();
+            if (pTextField->Which() == RES_TXTATR_INPUTFIELD
+                    && rPos.nContent.GetIndex() != pTextField->GetStart())
+                nContentOffset = pTextField->GetStart();
         }
         bool isSrch;
         it = lcl_FindField(isSrch, aSrtLst,
-                GetLayout(), pTNd, pTxtFld, rPos, nContentOffset);
+                GetLayout(), pTNd, pTextField, rPos, nContentOffset);
 
-        if( bDelFld )
+        if( bDelField )
         {
-            delete static_cast<SwFmtFld*>(&pTxtFld->GetAttr());
-            delete pTxtFld;
+            delete static_cast<SwFormatField*>(&pTextField->GetAttr());
+            delete pTextField;
         }
 
         if( it != aSrtLst.end() && isSrch ) // found
@@ -764,7 +764,7 @@ bool SwCrsrShell::MoveFldType(
             }
         }
     }
-    const _SetGetExpFld& rFnd = **it;
+    const _SetGetExpField& rFnd = **it;
 
     SET_CURR_SHELL( this );
     SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -778,10 +778,10 @@ bool SwCrsrShell::MoveFldType(
     return bRet;
 }
 
-bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
+bool SwCrsrShell::GotoFormatField( const SwFormatField& rField )
 {
     bool bRet = false;
-    if( rFld.GetTxtFld() )
+    if( rField.GetTextField() )
     {
         SET_CURR_SHELL( this );
         SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -789,9 +789,9 @@ bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
         SwCursor* pCrsr = getShellCrsr( true );
         SwCrsrSaveState aSaveState( *pCrsr );
 
-        SwTxtNode* pTNd = rFld.GetTxtFld()->GetpTxtNode();
+        SwTextNode* pTNd = rField.GetTextField()->GetpTextNode();
         pCrsr->GetPoint()->nNode = *pTNd;
-        pCrsr->GetPoint()->nContent.Assign( pTNd, rFld.GetTxtFld()->GetStart() );
+        pCrsr->GetPoint()->nContent.Assign( pTNd, rField.GetTextField()->GetStart() );
 
         bRet = !pCrsr->IsSelOvr();
         if( bRet )
@@ -800,45 +800,45 @@ bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
     return bRet;
 }
 
-SwTxtFld * SwCrsrShell::GetTxtFldAtPos(
+SwTextField * SwCrsrShell::GetTextFieldAtPos(
     const SwPosition* pPos,
-    const bool bIncludeInputFldAtStart )
+    const bool bIncludeInputFieldAtStart )
 {
-    SwTxtFld* pTxtFld = NULL;
+    SwTextField* pTextField = NULL;
 
-    SwTxtNode * const pNode = pPos->nNode.GetNode().GetTxtNode();
+    SwTextNode * const pNode = pPos->nNode.GetNode().GetTextNode();
     if ( pNode != NULL )
     {
-        pTxtFld = pNode->GetFldTxtAttrAt( pPos->nContent.GetIndex(), bIncludeInputFldAtStart );
+        pTextField = pNode->GetFieldTextAttrAt( pPos->nContent.GetIndex(), bIncludeInputFieldAtStart );
     }
 
-    return pTxtFld;
+    return pTextField;
 }
 
 SwField* SwCrsrShell::GetFieldAtCrsr(
     const SwPaM* pCrsr,
-    const bool bIncludeInputFldAtStart )
+    const bool bIncludeInputFieldAtStart )
 {
     SwField* pFieldAtCrsr = NULL;
 
-    SwTxtFld* pTxtFld = GetTxtFldAtPos( pCrsr->Start(), bIncludeInputFldAtStart );
-    if ( pTxtFld != NULL
+    SwTextField* pTextField = GetTextFieldAtPos( pCrsr->Start(), bIncludeInputFieldAtStart );
+    if ( pTextField != NULL
         && pCrsr->Start()->nNode == pCrsr->End()->nNode )
     {
-        const sal_Int32 nTxtFldLength =
-            pTxtFld->End() != NULL
-            ? *(pTxtFld->End()) - pTxtFld->GetStart()
+        const sal_Int32 nTextFieldLength =
+            pTextField->End() != NULL
+            ? *(pTextField->End()) - pTextField->GetStart()
             : 1;
-        if ( ( pCrsr->End()->nContent.GetIndex() - pCrsr->Start()->nContent.GetIndex() ) <= nTxtFldLength )
+        if ( ( pCrsr->End()->nContent.GetIndex() - pCrsr->Start()->nContent.GetIndex() ) <= nTextFieldLength )
         {
-            pFieldAtCrsr = const_cast<SwField*>(pTxtFld->GetFmtFld().GetField());
+            pFieldAtCrsr = const_cast<SwField*>(pTextField->GetFormatField().GetField());
         }
     }
 
     return pFieldAtCrsr;
 }
 
-SwField* SwCrsrShell::GetCurFld( const bool bIncludeInputFldAtStart ) const
+SwField* SwCrsrShell::GetCurField( const bool bIncludeInputFieldAtStart ) const
 {
     SwPaM* pCrsr = GetCrsr();
     if ( pCrsr->IsMultiSelection() )
@@ -847,19 +847,19 @@ SwField* SwCrsrShell::GetCurFld( const bool bIncludeInputFldAtStart ) const
         return NULL;
     }
 
-    SwField* pCurFld = GetFieldAtCrsr( pCrsr, bIncludeInputFldAtStart );;
-    if ( pCurFld != NULL
-         && RES_TABLEFLD == pCurFld->GetTyp()->Which() )
+    SwField* pCurField = GetFieldAtCrsr( pCrsr, bIncludeInputFieldAtStart );;
+    if ( pCurField != NULL
+         && RES_TABLEFLD == pCurField->GetTyp()->Which() )
     {
         // TabellenFormel ? wandel internen in externen Namen um
-        const SwTableNode* pTblNd = IsCrsrInTbl();
-        static_cast<SwTblField*>(pCurFld)->PtrToBoxNm( pTblNd ? &pTblNd->GetTable() : 0 );
+        const SwTableNode* pTableNd = IsCrsrInTable();
+        static_cast<SwTableField*>(pCurField)->PtrToBoxNm( pTableNd ? &pTableNd->GetTable() : 0 );
     }
 
-    return pCurFld;
+    return pCurField;
 }
 
-bool SwCrsrShell::CrsrInsideInputFld() const
+bool SwCrsrShell::CrsrInsideInputField() const
 {
     for(SwPaM& rCrsr : GetCrsr()->GetRingContainer())
     {
@@ -869,42 +869,42 @@ bool SwCrsrShell::CrsrInsideInputFld() const
     return false;
 }
 
-bool SwCrsrShell::PosInsideInputFld( const SwPosition& rPos )
+bool SwCrsrShell::PosInsideInputField( const SwPosition& rPos )
 {
-    return dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, false )) != NULL;
+    return dynamic_cast<const SwTextInputField*>(GetTextFieldAtPos( &rPos, false )) != NULL;
 }
 
-bool SwCrsrShell::DocPtInsideInputFld( const Point& rDocPt ) const
+bool SwCrsrShell::DocPtInsideInputField( const Point& rDocPt ) const
 {
     SwPosition aPos( *(GetCrsr()->Start()) );
     Point aDocPt( rDocPt );
     if ( GetLayout()->GetCrsrOfst( &aPos, aDocPt ) )
     {
-        return PosInsideInputFld( aPos );
+        return PosInsideInputField( aPos );
     }
     return false;
 }
 
-sal_Int32 SwCrsrShell::StartOfInputFldAtPos( const SwPosition& rPos )
+sal_Int32 SwCrsrShell::StartOfInputFieldAtPos( const SwPosition& rPos )
 {
-    const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, true ));
-    if ( pTxtInputFld == NULL )
+    const SwTextInputField* pTextInputField = dynamic_cast<const SwTextInputField*>(GetTextFieldAtPos( &rPos, true ));
+    if ( pTextInputField == NULL )
     {
-        OSL_ENSURE( false, "<SwEditShell::StartOfInputFldAtPos(..)> - no Input Field at given position" );
+        OSL_ENSURE( false, "<SwEditShell::StartOfInputFieldAtPos(..)> - no Input Field at given position" );
         return 0;
     }
-    return pTxtInputFld->GetStart();
+    return pTextInputField->GetStart();
 }
 
-sal_Int32 SwCrsrShell::EndOfInputFldAtPos( const SwPosition& rPos )
+sal_Int32 SwCrsrShell::EndOfInputFieldAtPos( const SwPosition& rPos )
 {
-    const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, true ));
-    if ( pTxtInputFld == NULL )
+    const SwTextInputField* pTextInputField = dynamic_cast<const SwTextInputField*>(GetTextFieldAtPos( &rPos, true ));
+    if ( pTextInputField == NULL )
     {
-        OSL_ENSURE( false, "<SwEditShell::EndOfInputFldAtPos(..)> - no Input Field at given position" );
+        OSL_ENSURE( false, "<SwEditShell::EndOfInputFieldAtPos(..)> - no Input Field at given position" );
         return 0;
     }
-    return *(pTxtInputFld->End());
+    return *(pTextInputField->End());
 }
 
 void SwCrsrShell::GotoOutline( sal_uInt16 nIdx )
@@ -916,9 +916,9 @@ void SwCrsrShell::GotoOutline( sal_uInt16 nIdx )
     SwCrsrSaveState aSaveState( *pCrsr );
 
     const SwNodes& rNds = GetDoc()->GetNodes();
-    SwTxtNode* pTxtNd = rNds.GetOutLineNds()[ nIdx ]->GetTxtNode();
-    pCrsr->GetPoint()->nNode = *pTxtNd;
-    pCrsr->GetPoint()->nContent.Assign( pTxtNd, 0 );
+    SwTextNode* pTextNd = rNds.GetOutLineNds()[ nIdx ]->GetTextNode();
+    pCrsr->GetPoint()->nNode = *pTextNd;
+    pCrsr->GetPoint()->nContent.Assign( pTextNd, 0 );
 
     if( !pCrsr->IsSelOvr() )
         UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
@@ -961,7 +961,7 @@ bool SwCrsrShell::GotoNextOutline()
     SwCallLink aLk( *this ); // watch Crsr-Moves
     SwCrsrSaveState aSaveState( *pCrsr );
     pCrsr->GetPoint()->nNode = *pNd;
-    pCrsr->GetPoint()->nContent.Assign( pNd->GetTxtNode(), 0 );
+    pCrsr->GetPoint()->nContent.Assign( pNd->GetTextNode(), 0 );
 
     bool bRet = !pCrsr->IsSelOvr();
     if( bRet )
@@ -990,7 +990,7 @@ bool SwCrsrShell::GotoPrevOutline()
         SwCallLink aLk( *this ); // watch Crsr-Moves
         SwCrsrSaveState aSaveState( *pCrsr );
         pCrsr->GetPoint()->nNode = *pNd;
-        pCrsr->GetPoint()->nContent.Assign( pNd->GetTxtNode(), 0 );
+        pCrsr->GetPoint()->nContent.Assign( pNd->GetTextNode(), 0 );
 
         bRet = !pCrsr->IsSelOvr();
         if( bRet )
@@ -1014,7 +1014,7 @@ sal_uInt16 SwCrsrShell::GetOutlinePos( sal_uInt8 nLevel )
     {
         pNd = rNds.GetOutLineNds()[ nPos ];
 
-        if( pNd->GetTxtNode()->GetAttrOutlineLevel()-1 <= nLevel )
+        if( pNd->GetTextNode()->GetAttrOutlineLevel()-1 <= nLevel )
             return nPos;
 
     }
@@ -1045,11 +1045,11 @@ bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
 
     if( bWithChildren )
     {
-        const int nLevel = pEndNd->GetTxtNode()->GetAttrOutlineLevel()-1;
+        const int nLevel = pEndNd->GetTextNode()->GetAttrOutlineLevel()-1;
         for( ++nEndPos; nEndPos < rOutlNds.size(); ++nEndPos )
         {
             pEndNd = rOutlNds[ nEndPos ];
-            const int nNxtLevel = pEndNd->GetTxtNode()->GetAttrOutlineLevel()-1;
+            const int nNxtLevel = pEndNd->GetTextNode()->GetAttrOutlineLevel()-1;
             if( nNxtLevel <= nLevel )
                 break; // EndPos is now on the next one
         }
@@ -1067,7 +1067,7 @@ bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
 
     // set end to the end of the previous content node
     m_pCurCrsr->GetPoint()->nNode = *pSttNd;
-    m_pCurCrsr->GetPoint()->nContent.Assign( pSttNd->GetCntntNode(), 0 );
+    m_pCurCrsr->GetPoint()->nContent.Assign( pSttNd->GetContentNode(), 0 );
     m_pCurCrsr->SetMark();
     m_pCurCrsr->GetPoint()->nNode = *pEndNd;
     m_pCurCrsr->Move( fnMoveBackward, fnGoNode ); // end of predecessor
@@ -1088,12 +1088,12 @@ bool SwCrsrShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
     SwCrsrSaveState aSaveState( *m_pCurCrsr );
 
     sal_Int32 nPos = -1;
-    SwTxtNode* pTxtNd = SwGetRefFieldType::FindAnchor( GetDoc(), rRefMark,
+    SwTextNode* pTextNd = SwGetRefFieldType::FindAnchor( GetDoc(), rRefMark,
                                                     nSubType, nSeqNo, &nPos );
-    if( pTxtNd && pTxtNd->GetNodes().IsDocNodes() )
+    if( pTextNd && pTextNd->GetNodes().IsDocNodes() )
     {
-        m_pCurCrsr->GetPoint()->nNode = *pTxtNd;
-        m_pCurCrsr->GetPoint()->nContent.Assign( pTxtNd, nPos );
+        m_pCurCrsr->GetPoint()->nNode = *pTextNd;
+        m_pCurCrsr->GetPoint()->nContent.Assign( pTextNd, nPos );
 
         if( !m_pCurCrsr->IsSelOvr() )
         {
@@ -1112,9 +1112,9 @@ bool SwCrsrShell::IsPageAtPos( const Point &rPt ) const
 }
 
 bool SwCrsrShell::GetContentAtPos( const Point& rPt,
-                                   SwContentAtPos& rCntntAtPos,
+                                   SwContentAtPos& rContentAtPos,
                                    bool bSetCrsr,
-                                   SwRect* pFldRect )
+                                   SwRect* pFieldRect )
 {
     SET_CURR_SHELL( this );
     bool bRet = false;
@@ -1124,64 +1124,64 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
         Point aPt( rPt );
         SwPosition aPos( *m_pCurCrsr->GetPoint() );
 
-        SwTxtNode* pTxtNd;
-        SwCntntFrm *pFrm(0);
-        SwTxtAttr* pTxtAttr;
+        SwTextNode* pTextNd;
+        SwContentFrm *pFrm(0);
+        SwTextAttr* pTextAttr;
         SwCrsrMoveState aTmpState;
         aTmpState.bFieldInfo = true;
-        aTmpState.bExactOnly = !( SwContentAtPos::SW_OUTLINE & rCntntAtPos.eCntntAtPos );
-        aTmpState.bCntntCheck = (SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos) != 0;
+        aTmpState.bExactOnly = !( SwContentAtPos::SW_OUTLINE & rContentAtPos.eContentAtPos );
+        aTmpState.bContentCheck = (SwContentAtPos::SW_CONTENT_CHECK & rContentAtPos.eContentAtPos) != 0;
         aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
 
         SwSpecialPos aSpecialPos;
-        aTmpState.pSpecialPos = ( SwContentAtPos::SW_SMARTTAG & rCntntAtPos.eCntntAtPos ) ?
+        aTmpState.pSpecialPos = ( SwContentAtPos::SW_SMARTTAG & rContentAtPos.eContentAtPos ) ?
                                 &aSpecialPos : 0;
 
         const bool bCrsrFoundExact = GetLayout()->GetCrsrOfst( &aPos, aPt, &aTmpState );
-        pTxtNd = aPos.nNode.GetNode().GetTxtNode();
+        pTextNd = aPos.nNode.GetNode().GetTextNode();
 
         const SwNodes& rNds = GetDoc()->GetNodes();
-        if( pTxtNd
-            && SwContentAtPos::SW_OUTLINE & rCntntAtPos.eCntntAtPos
+        if( pTextNd
+            && SwContentAtPos::SW_OUTLINE & rContentAtPos.eContentAtPos
             && !rNds.GetOutLineNds().empty() )
         {
-            const SwTxtNode* pONd = pTxtNd->FindOutlineNodeOfLevel( MAXLEVEL-1);
+            const SwTextNode* pONd = pTextNd->FindOutlineNodeOfLevel( MAXLEVEL-1);
             if( pONd )
             {
-                rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_OUTLINE;
-                rCntntAtPos.sStr = pONd->GetExpandTxt( 0, -1, true, true );
+                rContentAtPos.eContentAtPos = SwContentAtPos::SW_OUTLINE;
+                rContentAtPos.sStr = pONd->GetExpandText( 0, -1, true, true );
                 bRet = true;
             }
         }
-        else if ( SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos
+        else if ( SwContentAtPos::SW_CONTENT_CHECK & rContentAtPos.eContentAtPos
                   && bCrsrFoundExact )
         {
             bRet = true;
         }
-        else if( pTxtNd
-                 && SwContentAtPos::SW_NUMLABEL & rCntntAtPos.eCntntAtPos)
+        else if( pTextNd
+                 && SwContentAtPos::SW_NUMLABEL & rContentAtPos.eContentAtPos)
         {
             bRet = aTmpState.bInNumPortion;
-            rCntntAtPos.aFnd.pNode = pTxtNd;
+            rContentAtPos.aFnd.pNode = pTextNd;
 
             Size aSizeLogic(aTmpState.nInNumPostionOffset, 0);
             Size aSizePixel = GetWin()->LogicToPixel(aSizeLogic);
-            rCntntAtPos.nDist = aSizePixel.Width();
+            rContentAtPos.nDist = aSizePixel.Width();
         }
-        else if( bCrsrFoundExact && pTxtNd )
+        else if( bCrsrFoundExact && pTextNd )
         {
             if( !aTmpState.bPosCorr )
             {
                 if ( !bRet
-                     && SwContentAtPos::SW_SMARTTAG & rCntntAtPos.eCntntAtPos
-                     && !aTmpState.bFtnNoInfo )
+                     && SwContentAtPos::SW_SMARTTAG & rContentAtPos.eContentAtPos
+                     && !aTmpState.bFootnoteNoInfo )
                 {
-                    const SwWrongList* pSmartTagList = pTxtNd->GetSmartTags();
+                    const SwWrongList* pSmartTagList = pTextNd->GetSmartTags();
                     sal_Int32 nCurrent = aPos.nContent.GetIndex();
                     const sal_Int32 nBegin = nCurrent;
                     sal_Int32 nLen = 1;
 
-                    if ( pSmartTagList && pSmartTagList->InWrongWord( nCurrent, nLen ) && !pTxtNd->IsSymbol(nBegin) )
+                    if ( pSmartTagList && pSmartTagList->InWrongWord( nCurrent, nLen ) && !pTextNd->IsSymbol(nBegin) )
                     {
                         const sal_uInt16 nIndex = pSmartTagList->GetWrongPos( nBegin );
                         const SwWrongList* pSubList = pSmartTagList->SubList( nIndex );
@@ -1208,32 +1208,32 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                         }
                         if( bRet )
                         {
-                            rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_SMARTTAG;
+                            rContentAtPos.eContentAtPos = SwContentAtPos::SW_SMARTTAG;
 
-                            if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                                pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                            if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                                pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
                         }
                     }
                 }
 
                 if ( !bRet
-                     && ( SwContentAtPos::SW_FIELD | SwContentAtPos::SW_CLICKFIELD ) & rCntntAtPos.eCntntAtPos
-                     && !aTmpState.bFtnNoInfo )
+                     && ( SwContentAtPos::SW_FIELD | SwContentAtPos::SW_CLICKFIELD ) & rContentAtPos.eContentAtPos
+                     && !aTmpState.bFootnoteNoInfo )
                 {
-                    pTxtAttr = pTxtNd->GetFldTxtAttrAt( aPos.nContent.GetIndex() );
-                    const SwField* pFld = pTxtAttr != NULL
-                                          ? pTxtAttr->GetFmtFld().GetField()
+                    pTextAttr = pTextNd->GetFieldTextAttrAt( aPos.nContent.GetIndex() );
+                    const SwField* pField = pTextAttr != NULL
+                                          ? pTextAttr->GetFormatField().GetField()
                                           : 0;
-                    if ( SwContentAtPos::SW_CLICKFIELD & rCntntAtPos.eCntntAtPos
-                         && pFld && !pFld->HasClickHdl() )
+                    if ( SwContentAtPos::SW_CLICKFIELD & rContentAtPos.eContentAtPos
+                         && pField && !pField->HasClickHdl() )
                     {
-                        pFld = 0;
+                        pField = 0;
                     }
 
-                    if ( pFld )
+                    if ( pField )
                     {
-                        if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                            pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                        if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                            pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
 
                         if( bSetCrsr )
                         {
@@ -1245,60 +1245,60 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                             {
                                 // allow click fields in protected sections
                                 // only placeholder is not possible
-                                if( SwContentAtPos::SW_FIELD & rCntntAtPos.eCntntAtPos
-                                    || RES_JUMPEDITFLD == pFld->Which() )
-                                    pFld = 0;
+                                if( SwContentAtPos::SW_FIELD & rContentAtPos.eContentAtPos
+                                    || RES_JUMPEDITFLD == pField->Which() )
+                                    pField = 0;
                             }
                             else
                                 UpdateCrsr();
                         }
-                        else if( RES_TABLEFLD == pFld->Which() &&
-                            static_cast<const SwTblField*>(pFld)->IsIntrnlName() )
+                        else if( RES_TABLEFLD == pField->Which() &&
+                            static_cast<const SwTableField*>(pField)->IsIntrnlName() )
                         {
                             // create from internal (for CORE) the external
                             // (for UI) formula
-                            const SwTableNode* pTblNd = pTxtNd->FindTableNode();
-                            if( pTblNd )        // steht in einer Tabelle
-                                const_cast<SwTblField*>(static_cast<const SwTblField*>(pFld))->PtrToBoxNm( &pTblNd->GetTable() );
+                            const SwTableNode* pTableNd = pTextNd->FindTableNode();
+                            if( pTableNd )        // steht in einer Tabelle
+                                const_cast<SwTableField*>(static_cast<const SwTableField*>(pField))->PtrToBoxNm( &pTableNd->GetTable() );
                         }
                     }
 
-                    if( pFld )
+                    if( pField )
                     {
-                        rCntntAtPos.aFnd.pFld = pFld;
-                        rCntntAtPos.pFndTxtAttr = pTxtAttr;
-                        rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FIELD;
+                        rContentAtPos.aFnd.pField = pField;
+                        rContentAtPos.pFndTextAttr = pTextAttr;
+                        rContentAtPos.eContentAtPos = SwContentAtPos::SW_FIELD;
                         bRet = true;
                     }
                 }
 
-                if( !bRet && SwContentAtPos::SW_FORMCTRL & rCntntAtPos.eCntntAtPos )
+                if( !bRet && SwContentAtPos::SW_FORMCTRL & rContentAtPos.eContentAtPos )
                 {
                     IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess( );
-                    sw::mark::IFieldmark* pFldBookmark = pMarksAccess->getFieldmarkFor( aPos );
-                    if( bCrsrFoundExact && pTxtNd && pFldBookmark) {
-                        rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FORMCTRL;
-                        rCntntAtPos.aFnd.pFldmark = pFldBookmark;
+                    sw::mark::IFieldmark* pFieldBookmark = pMarksAccess->getFieldmarkFor( aPos );
+                    if( bCrsrFoundExact && pTextNd && pFieldBookmark) {
+                        rContentAtPos.eContentAtPos = SwContentAtPos::SW_FORMCTRL;
+                        rContentAtPos.aFnd.pFieldmark = pFieldBookmark;
                         bRet=true;
                     }
                 }
 
-                if( !bRet && SwContentAtPos::SW_FTN & rCntntAtPos.eCntntAtPos )
+                if( !bRet && SwContentAtPos::SW_FTN & rContentAtPos.eContentAtPos )
                 {
-                    if( aTmpState.bFtnNoInfo )
+                    if( aTmpState.bFootnoteNoInfo )
                     {
                         // over the footnote's char
                         bRet = true;
                         if( bSetCrsr )
                         {
                             *m_pCurCrsr->GetPoint() = aPos;
-                            if( !GotoFtnAnchor() )
+                            if( !GotoFootnoteAnchor() )
                                 bRet = false;
                         }
                         if( bRet )
-                            rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FTN;
+                            rContentAtPos.eContentAtPos = SwContentAtPos::SW_FTN;
                     }
-                    else if ( 0 != ( pTxtAttr = pTxtNd->GetTxtAttrForCharAt(
+                    else if ( 0 != ( pTextAttr = pTextNd->GetTextAttrForCharAt(
                         aPos.nContent.GetIndex(), RES_TXTATR_FTN )) )
                     {
                         bRet = true;
@@ -1306,8 +1306,8 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                         {
                             SwCallLink aLk( *this ); // watch Crsr-Moves
                             SwCrsrSaveState aSaveState( *m_pCurCrsr );
-                            m_pCurCrsr->GetPoint()->nNode = *static_cast<SwTxtFtn*>(pTxtAttr)->GetStartNode();
-                            SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection(
+                            m_pCurCrsr->GetPoint()->nNode = *static_cast<SwTextFootnote*>(pTextAttr)->GetStartNode();
+                            SwContentNode* pCNd = GetDoc()->GetNodes().GoNextSection(
                                 &m_pCurCrsr->GetPoint()->nNode,
                                 true, !IsReadOnlyAvailable() );
 
@@ -1326,45 +1326,45 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                         if( bRet )
                         {
-                            rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FTN;
-                            rCntntAtPos.pFndTxtAttr = pTxtAttr;
-                            rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
+                            rContentAtPos.eContentAtPos = SwContentAtPos::SW_FTN;
+                            rContentAtPos.pFndTextAttr = pTextAttr;
+                            rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
 
-                            if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                                pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                            if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                                pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
                         }
                     }
                 }
 
                 if( !bRet
-                    && ( SwContentAtPos::SW_TOXMARK | SwContentAtPos::SW_REFMARK ) & rCntntAtPos.eCntntAtPos
-                    && !aTmpState.bFtnNoInfo )
+                    && ( SwContentAtPos::SW_TOXMARK | SwContentAtPos::SW_REFMARK ) & rContentAtPos.eContentAtPos
+                    && !aTmpState.bFootnoteNoInfo )
                 {
-                    pTxtAttr = 0;
-                    if( SwContentAtPos::SW_TOXMARK & rCntntAtPos.eCntntAtPos )
+                    pTextAttr = 0;
+                    if( SwContentAtPos::SW_TOXMARK & rContentAtPos.eContentAtPos )
                     {
-                        ::std::vector<SwTxtAttr *> const marks(
-                            pTxtNd->GetTxtAttrsAt(
+                        ::std::vector<SwTextAttr *> const marks(
+                            pTextNd->GetTextAttrsAt(
                                aPos.nContent.GetIndex(), RES_TXTATR_TOXMARK));
                         if (marks.size())
                         {   // hmm... can only return 1 here
-                            pTxtAttr = *marks.begin();
+                            pTextAttr = *marks.begin();
                         }
                     }
 
-                    if( !pTxtAttr &&
-                        SwContentAtPos::SW_REFMARK & rCntntAtPos.eCntntAtPos )
+                    if( !pTextAttr &&
+                        SwContentAtPos::SW_REFMARK & rContentAtPos.eContentAtPos )
                     {
-                        ::std::vector<SwTxtAttr *> const marks(
-                            pTxtNd->GetTxtAttrsAt(
+                        ::std::vector<SwTextAttr *> const marks(
+                            pTextNd->GetTextAttrsAt(
                                aPos.nContent.GetIndex(), RES_TXTATR_REFMARK));
                         if (marks.size())
                         {   // hmm... can only return 1 here
-                            pTxtAttr = *marks.begin();
+                            pTextAttr = *marks.begin();
                         }
                     }
 
-                    if( pTxtAttr )
+                    if( pTextAttr )
                     {
                         bRet = true;
                         if( bSetCrsr )
@@ -1381,35 +1381,35 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                         if( bRet )
                         {
-                            const sal_Int32* pEnd = pTxtAttr->GetEnd();
+                            const sal_Int32* pEnd = pTextAttr->GetEnd();
                             if( pEnd )
-                                rCntntAtPos.sStr =
-                                    pTxtNd->GetExpandTxt( pTxtAttr->GetStart(), *pEnd - pTxtAttr->GetStart() );
-                            else if( RES_TXTATR_TOXMARK == pTxtAttr->Which())
-                                rCntntAtPos.sStr =
-                                    pTxtAttr->GetTOXMark().GetAlternativeText();
-
-                            rCntntAtPos.eCntntAtPos =
-                                RES_TXTATR_TOXMARK == pTxtAttr->Which()
+                                rContentAtPos.sStr =
+                                    pTextNd->GetExpandText( pTextAttr->GetStart(), *pEnd - pTextAttr->GetStart() );
+                            else if( RES_TXTATR_TOXMARK == pTextAttr->Which())
+                                rContentAtPos.sStr =
+                                    pTextAttr->GetTOXMark().GetAlternativeText();
+
+                            rContentAtPos.eContentAtPos =
+                                RES_TXTATR_TOXMARK == pTextAttr->Which()
                                 ? SwContentAtPos::SW_TOXMARK
                                 : SwContentAtPos::SW_REFMARK;
-                            rCntntAtPos.pFndTxtAttr = pTxtAttr;
-                            rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
+                            rContentAtPos.pFndTextAttr = pTextAttr;
+                            rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
 
-                            if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                                pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                            if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                                pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
                         }
                     }
                 }
 
                 if ( !bRet
-                     && SwContentAtPos::SW_INETATTR & rCntntAtPos.eCntntAtPos
-                     && !aTmpState.bFtnNoInfo )
+                     && SwContentAtPos::SW_INETATTR & rContentAtPos.eContentAtPos
+                     && !aTmpState.bFootnoteNoInfo )
                 {
-                    pTxtAttr = pTxtNd->GetTxtAttrAt(
+                    pTextAttr = pTextNd->GetTextAttrAt(
                             aPos.nContent.GetIndex(), RES_TXTATR_INETFMT);
                     // "detect" only INetAttrs with URLs
-                    if( pTxtAttr && !pTxtAttr->GetINetFmt().GetValue().isEmpty() )
+                    if( pTextAttr && !pTextAttr->GetINetFormat().GetValue().isEmpty() )
                     {
                         bRet = true;
                         if( bSetCrsr )
@@ -1426,66 +1426,66 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                         }
                         if( bRet )
                         {
-                            rCntntAtPos.sStr = pTxtNd->GetExpandTxt(
-                                pTxtAttr->GetStart(),
-                                *pTxtAttr->GetEnd() - pTxtAttr->GetStart() );
+                            rContentAtPos.sStr = pTextNd->GetExpandText(
+                                pTextAttr->GetStart(),
+                                *pTextAttr->GetEnd() - pTextAttr->GetStart() );
 
-                            rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
-                            rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_INETATTR;
-                            rCntntAtPos.pFndTxtAttr = pTxtAttr;
+                            rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
+                            rContentAtPos.eContentAtPos = SwContentAtPos::SW_INETATTR;
+                            rContentAtPos.pFndTextAttr = pTextAttr;
 
-                            if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                                pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                            if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                                pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
                         }
                     }
                 }
 
-                if( !bRet && SwContentAtPos::SW_REDLINE & rCntntAtPos.eCntntAtPos )
+                if( !bRet && SwContentAtPos::SW_REDLINE & rContentAtPos.eContentAtPos )
                 {
                     const SwRangeRedline* pRedl = GetDoc()->getIDocumentRedlineAccess().GetRedline(aPos, NULL);
                     if( pRedl )
                     {
-                        rCntntAtPos.aFnd.pRedl = pRedl;
-                        rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_REDLINE;
-                        rCntntAtPos.pFndTxtAttr = 0;
+                        rContentAtPos.aFnd.pRedl = pRedl;
+                        rContentAtPos.eContentAtPos = SwContentAtPos::SW_REDLINE;
+                        rContentAtPos.pFndTextAttr = 0;
                         bRet = true;
 
-                        if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
-                            pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+                        if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+                            pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
                     }
                 }
             }
 
             if( !bRet
-                 && ( SwContentAtPos::SW_TABLEBOXFML & rCntntAtPos.eCntntAtPos
+                 && ( SwContentAtPos::SW_TABLEBOXFML & rContentAtPos.eContentAtPos
 #ifdef DBG_UTIL
-                      || SwContentAtPos::SW_TABLEBOXVALUE & rCntntAtPos.eCntntAtPos
+                      || SwContentAtPos::SW_TABLEBOXVALUE & rContentAtPos.eContentAtPos
 #endif
                 ) )
             {
-                const SwTableNode* pTblNd;
+                const SwTableNode* pTableNd;
                 const SwTableBox* pBox;
-                const SwStartNode* pSttNd = pTxtNd->FindTableBoxStartNode();
+                const SwStartNode* pSttNd = pTextNd->FindTableBoxStartNode();
                 const SfxPoolItem* pItem;
-                if( pSttNd && 0 != ( pTblNd = pTxtNd->FindTableNode()) &&
-                    0 != ( pBox = pTblNd->GetTable().GetTblBox(
+                if( pSttNd && 0 != ( pTableNd = pTextNd->FindTableNode()) &&
+                    0 != ( pBox = pTableNd->GetTable().GetTableBox(
                     pSttNd->GetIndex() )) &&
 #ifdef DBG_UTIL
-                    ( SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+                    ( SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
                     RES_BOXATR_FORMULA, false, &pItem ) ||
-                    SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+                    SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
                     RES_BOXATR_VALUE, false, &pItem ))
 #else
-                    SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+                    SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
                     RES_BOXATR_FORMULA, false, &pItem )
 #endif
                     )
                 {
-                    SwFrm* pF = pTxtNd->getLayoutFrm( GetLayout(), &aPt );
+                    SwFrm* pF = pTextNd->getLayoutFrm( GetLayout(), &aPt );
                     if( pF )
                     {
                         // then the CellFrame
-                        pFrm = static_cast<SwCntntFrm*>(pF);
+                        pFrm = static_cast<SwContentFrm*>(pF);
                         while( pF && !pF->IsCellFrm() )
                             pF = pF->GetUpper();
                     }
@@ -1502,13 +1502,13 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                     {
                         // create from internal (for CORE) the external
                         // (for UI) formula
-                        rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXFML;
+                        rContentAtPos.eContentAtPos = SwContentAtPos::SW_TABLEBOXFML;
 #ifdef DBG_UTIL
                         if( RES_BOXATR_VALUE == pItem->Which() )
-                            rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXVALUE;
+                            rContentAtPos.eContentAtPos = SwContentAtPos::SW_TABLEBOXVALUE;
                         else
 #endif
-                            const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->PtrToBoxNm( &pTblNd->GetTable() );
+                            const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->PtrToBoxNm( &pTableNd->GetTable() );
 
                         bRet = true;
                         if( bSetCrsr )
@@ -1525,29 +1525,29 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                         if( bRet )
                         {
-                            if( pFldRect )
+                            if( pFieldRect )
                             {
-                                *pFldRect = pF->Prt();
-                                *pFldRect += pF->Frm().Pos();
+                                *pFieldRect = pF->Prt();
+                                *pFieldRect += pF->Frm().Pos();
                             }
-                            rCntntAtPos.pFndTxtAttr = 0;
-                            rCntntAtPos.aFnd.pAttr = pItem;
+                            rContentAtPos.pFndTextAttr = 0;
+                            rContentAtPos.aFnd.pAttr = pItem;
                         }
                     }
                 }
             }
 
 #ifdef DBG_UTIL
-            if( !bRet && SwContentAtPos::SW_CURR_ATTRS & rCntntAtPos.eCntntAtPos )
+            if( !bRet && SwContentAtPos::SW_CURR_ATTRS & rContentAtPos.eContentAtPos )
             {
                 const sal_Int32 n = aPos.nContent.GetIndex();
                 SfxItemSet aSet( GetDoc()->GetAttrPool(), POOLATTR_BEGIN,
                     POOLATTR_END - 1 );
-                if( pTxtNd->GetpSwpHints() )
+                if( pTextNd->GetpSwpHints() )
                 {
-                    for( size_t i = 0; i < pTxtNd->GetSwpHints().Count(); ++i )
+                    for( size_t i = 0; i < pTextNd->GetSwpHints().Count(); ++i )
                     {
-                        const SwTxtAttr* pHt = pTxtNd->GetSwpHints()[i];
+                        const SwTextAttr* pHt = pTextNd->GetSwpHints()[i];
                         const sal_Int32 nAttrStart = pHt->GetStart();
                         if( nAttrStart > n ) // over the section
                             break;
@@ -1562,29 +1562,29 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                             aSet.Put( pHt->GetAttr() );
                         }
                     }
-                    if( pTxtNd->HasSwAttrSet() &&
-                        pTxtNd->GetpSwAttrSet()->Count() )
+                    if( pTextNd->HasSwAttrSet() &&
+                        pTextNd->GetpSwAttrSet()->Count() )
                     {
-                        SfxItemSet aFmtSet( pTxtNd->GetSwAttrSet() );
+                        SfxItemSet aFormatSet( pTextNd->GetSwAttrSet() );
                         // remove all from format set that are also in TextSet
-                        aFmtSet.Differentiate( aSet );
+                        aFormatSet.Differentiate( aSet );
                         // now merge all together
-                        aSet.Put( aFmtSet );
+                        aSet.Put( aFormatSet );
                     }
                 }
                 else
-                    pTxtNd->SwCntntNode::GetAttr( aSet );
-
-                rCntntAtPos.sStr = "Pos: (";
-                rCntntAtPos.sStr += OUString::number( aPos.nNode.GetIndex());
-                rCntntAtPos.sStr += ":";
-                rCntntAtPos.sStr += OUString::number( aPos.nContent.GetIndex());
-                rCntntAtPos.sStr += ")";
-                rCntntAtPos.sStr += "\nParagraph Style: ";
-                rCntntAtPos.sStr += pTxtNd->GetFmtColl()->GetName();
-                if( pTxtNd->GetCondFmtColl() )
+                    pTextNd->SwContentNode::GetAttr( aSet );
+
+                rContentAtPos.sStr = "Pos: (";
+                rContentAtPos.sStr += OUString::number( aPos.nNode.GetIndex());
+                rContentAtPos.sStr += ":";
+                rContentAtPos.sStr += OUString::number( aPos.nContent.GetIndex());
+                rContentAtPos.sStr += ")";
+                rContentAtPos.sStr += "\nParagraph Style: ";
+                rContentAtPos.sStr += pTextNd->GetFormatColl()->GetName();
+                if( pTextNd->GetCondFormatColl() )
                 {
-                    rCntntAtPos.sStr += "\nConditional Style: " + pTxtNd->GetCondFmtColl()->GetName();
+                    rContentAtPos.sStr += "\nConditional Style: " + pTextNd->GetCondFormatColl()->GetName();
                 }
 
                 if( aSet.Count() )
@@ -1609,13 +1609,13 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                     }
                     if (!sAttrs.isEmpty())
                     {
-                        if( !rCntntAtPos.sStr.isEmpty() )
-                            rCntntAtPos.sStr += "\n";
-                        rCntntAtPos.sStr += "Attr: " + sAttrs;
+                        if( !rContentAtPos.sStr.isEmpty() )
+                            rContentAtPos.sStr += "\n";
+                        rContentAtPos.sStr += "Attr: " + sAttrs;
                     }
                 }
                 bRet = true;
-                rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_CURR_ATTRS;
+                rContentAtPos.eContentAtPos = SwContentAtPos::SW_CURR_ATTRS;
             }
 #endif
         }
@@ -1623,8 +1623,8 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
     if( !bRet )
     {
-        rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_NOTHING;
-        rCntntAtPos.aFnd.pFld = 0;
+        rContentAtPos.eContentAtPos = SwContentAtPos::SW_NOTHING;
+        rContentAtPos.aFnd.pField = 0;
     }
     return bRet;
 }
@@ -1632,45 +1632,45 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 // #i90516#
 const SwPostItField* SwCrsrShell::GetPostItFieldAtCursor() const
 {
-    const SwPostItField* pPostItFld = 0;
+    const SwPostItField* pPostItField = 0;
 
     if ( !IsTableMode() )
     {
         const SwPosition* pCursorPos = _GetCrsr()->GetPoint();
-        const SwTxtNode* pTxtNd = pCursorPos->nNode.GetNode().GetTxtNode();
-        if ( pTxtNd )
+        const SwTextNode* pTextNd = pCursorPos->nNode.GetNode().GetTextNode();
+        if ( pTextNd )
         {
-            SwTxtAttr* pTxtAttr = pTxtNd->GetFldTxtAttrAt( pCursorPos->nContent.GetIndex() );
-            const SwField* pFld = pTxtAttr != NULL ? pTxtAttr->GetFmtFld().GetField() : 0;
-            if ( pFld && pFld->Which()== RES_POSTITFLD )
+            SwTextAttr* pTextAttr = pTextNd->GetFieldTextAttrAt( pCursorPos->nContent.GetIndex() );
+            const SwField* pField = pTextAttr != NULL ? pTextAttr->GetFormatField().GetField() : 0;
+            if ( pField && pField->Which()== RES_POSTITFLD )
             {
-                pPostItFld = static_cast<const SwPostItField*>(pFld);
+                pPostItField = static_cast<const SwPostItField*>(pField);
             }
         }
     }
 
-    return pPostItFld;
+    return pPostItField;
 }
 
 /// is the node in a protected section?
 bool SwContentAtPos::IsInProtectSect() const
 {
-    const SwTxtNode* pNd = 0;
-    if( pFndTxtAttr )
+    const SwTextNode* pNd = 0;
+    if( pFndTextAttr )
     {
-        switch( eCntntAtPos )
+        switch( eContentAtPos )
         {
         case SW_FIELD:
         case SW_CLICKFIELD:
-            pNd = static_txtattr_cast<SwTxtFld const*>(pFndTxtAttr)->GetpTxtNode();
+            pNd = static_txtattr_cast<SwTextField const*>(pFndTextAttr)->GetpTextNode();
             break;
 
         case SW_FTN:
-            pNd = &static_cast<const SwTxtFtn*>(pFndTxtAttr)->GetTxtNode();
+            pNd = &static_cast<const SwTextFootnote*>(pFndTextAttr)->GetTextNode();
             break;
 
         case SW_INETATTR:
-            pNd = static_txtattr_cast<SwTxtINetFmt const*>(pFndTxtAttr)->GetpTxtNode();
+            pNd = static_txtattr_cast<SwTextINetFormat const*>(pFndTextAttr)->GetpTextNode();
             break;
 
         default:
@@ -1678,7 +1678,7 @@ bool SwContentAtPos::IsInProtectSect() const
         }
     }
 
-    const SwCntntFrm* pFrm;
+    const SwContentFrm* pFrm;
     return pNd && ( pNd->IsInProtectSect() ||
                     ( 0 != ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false)) &&
                         pFrm->IsProtected() ));
@@ -1687,24 +1687,24 @@ bool SwContentAtPos::IsInProtectSect() const
 bool SwContentAtPos::IsInRTLText()const
 {
     bool bRet = false;
-    const SwTxtNode* pNd = 0;
-    if (pFndTxtAttr && (eCntntAtPos == SW_FTN))
+    const SwTextNode* pNd = 0;
+    if (pFndTextAttr && (eContentAtPos == SW_FTN))
     {
-        const SwTxtFtn* pTxtFtn = static_cast<const SwTxtFtn*>(pFndTxtAttr);
-        if(pTxtFtn->GetStartNode())
+        const SwTextFootnote* pTextFootnote = static_cast<const SwTextFootnote*>(pFndTextAttr);
+        if(pTextFootnote->GetStartNode())
         {
-            SwStartNode* pSttNd = pTxtFtn->GetStartNode()->GetNode().GetStartNode();
+            SwStartNode* pSttNd = pTextFootnote->GetStartNode()->GetNode().GetStartNode();
             SwPaM aTemp( *pSttNd );
             aTemp.Move(fnMoveForward, fnGoNode);
-            SwCntntNode* pCntntNode = aTemp.GetCntntNode();
-            if(pCntntNode && pCntntNode->IsTxtNode())
-                pNd = pCntntNode->GetTxtNode();
+            SwContentNode* pContentNode = aTemp.GetContentNode();
+            if(pContentNode && pContentNode->IsTextNode())
+                pNd = pContentNode->GetTextNode();
         }
     }
     if(pNd)
     {
-        SwIterator<SwTxtFrm,SwTxtNode> aIter(*pNd);
-        SwTxtFrm* pTmpFrm = aIter.First();
+        SwIterator<SwTextFrm,SwTextNode> aIter(*pNd);
+        SwTextFrm* pTmpFrm = aIter.First();
         while( pTmpFrm )
         {
                 if ( !pTmpFrm->IsFollow())
@@ -1718,7 +1718,7 @@ bool SwContentAtPos::IsInRTLText()const
     return bRet;
 }
 
-bool SwCrsrShell::SelectTxt( const sal_Int32 nStart,
+bool SwCrsrShell::SelectText( const sal_Int32 nStart,
                                  const sal_Int32 nEnd )
 {
     SET_CURR_SHELL( this );
@@ -1742,39 +1742,39 @@ bool SwCrsrShell::SelectTxt( const sal_Int32 nStart,
     return bRet;
 }
 
-bool SwCrsrShell::SelectTxtAttr( sal_uInt16 nWhich,
+bool SwCrsrShell::SelectTextAttr( sal_uInt16 nWhich,
                                      bool bExpand,
-                                     const SwTxtAttr* pTxtAttr )
+                                     const SwTextAttr* pTextAttr )
 {
     SET_CURR_SHELL( this );
     bool bRet = false;
 
     if( !IsTableMode() )
     {
-        if( !pTxtAttr )
+        if( !pTextAttr )
         {
             SwPosition& rPos = *m_pCurCrsr->GetPoint();
-            SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-            pTxtAttr = (pTxtNd)
-                ? pTxtNd->GetTxtAttrAt(rPos.nContent.GetIndex(),
+            SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+            pTextAttr = (pTextNd)
+                ? pTextNd->GetTextAttrAt(rPos.nContent.GetIndex(),
                         static_cast<RES_TXTATR>(nWhich),
-                        (bExpand) ? SwTxtNode::EXPAND : SwTxtNode::DEFAULT)
+                        (bExpand) ? SwTextNode::EXPAND : SwTextNode::DEFAULT)
                 : 0;
         }
 
-        if( pTxtAttr )
+        if( pTextAttr )
         {
-            const sal_Int32* pEnd = pTxtAttr->End();
-            bRet = SelectTxt( pTxtAttr->GetStart(), ( pEnd ? *pEnd : pTxtAttr->GetStart() + 1 ) );
+            const sal_Int32* pEnd = pTextAttr->End();
+            bRet = SelectText( pTextAttr->GetStart(), ( pEnd ? *pEnd : pTextAttr->GetStart() + 1 ) );
         }
     }
     return bRet;
 }
 
-bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
+bool SwCrsrShell::GotoINetAttr( const SwTextINetFormat& rAttr )
 {
     bool bRet = false;
-    if( rAttr.GetpTxtNode() )
+    if( rAttr.GetpTextNode() )
     {
         SwCursor* pCrsr = getShellCrsr( true );
 
@@ -1782,8 +1782,8 @@ bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
         SwCallLink aLk( *this ); // watch Crsr-Moves
         SwCrsrSaveState aSaveState( *pCrsr );
 
-        pCrsr->GetPoint()->nNode = *rAttr.GetpTxtNode();
-        pCrsr->GetPoint()->nContent.Assign( const_cast<SwTxtNode*>(rAttr.GetpTxtNode()),
+        pCrsr->GetPoint()->nNode = *rAttr.GetpTextNode();
+        pCrsr->GetPoint()->nContent.Assign( const_cast<SwTextNode*>(rAttr.GetpTextNode()),
                                             rAttr.GetStart() );
         bRet = !pCrsr->IsSelOvr();
         if( bRet )
@@ -1792,7 +1792,7 @@ bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
     return bRet;
 }
 
-const SwFmtINetFmt* SwCrsrShell::FindINetAttr( const OUString& rName ) const
+const SwFormatINetFormat* SwCrsrShell::FindINetAttr( const OUString& rName ) const
 {
     return mpDoc->FindINetAttr( rName );
 }
@@ -1844,7 +1844,7 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
             SwCallLink aLk( *this ); // watch Crsr-Moves
             StartAction();
 
-            SwCntntNode* pCNd = aPos.nNode.GetNode().GetCntntNode();
+            SwContentNode* pCNd = aPos.nNode.GetNode().GetContentNode();
             SwUndoId nUndoId = UNDO_INS_FROM_SHADOWCRSR;
             // If only the paragraph attributes "Adjust" or "LRSpace" are set,
             // then the following should not delete those again.
@@ -1857,10 +1857,10 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
 
             GetDoc()->GetIDocumentUndoRedo().StartUndo( nUndoId, NULL );
 
-            SwTxtFmtColl* pNextFmt = 0;
-            SwTxtNode* pTNd = pCNd ? pCNd->GetTxtNode() : NULL;
+            SwTextFormatColl* pNextFormat = 0;
+            SwTextNode* pTNd = pCNd ? pCNd->GetTextNode() : NULL;
             if( pTNd )
-                pNextFmt = &pTNd->GetTxtColl()->GetNextTxtFmtColl();
+                pNextFormat = &pTNd->GetTextColl()->GetNextTextFormatColl();
 
             const SwSectionNode* pSectNd = pCNd ? pCNd->FindSectionNode() : NULL;
             if( pSectNd && aFPos.nParaCnt )
@@ -1878,17 +1878,17 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
 
             for( sal_uInt16 n = 0; n < aFPos.nParaCnt + aFPos.nColumnCnt; ++n )
             {
-                GetDoc()->getIDocumentContentOperations().AppendTxtNode( aPos );
-                if( !n && pNextFmt )
+                GetDoc()->getIDocumentContentOperations().AppendTextNode( aPos );
+                if( !n && pNextFormat )
                 {
                     *m_pCurCrsr->GetPoint() = aPos;
-                    GetDoc()->SetTxtFmtColl( *m_pCurCrsr, pNextFmt, false );
+                    GetDoc()->SetTextFormatColl( *m_pCurCrsr, pNextFormat, false );
                 }
                 if( n < aFPos.nColumnCnt )
                 {
                     *m_pCurCrsr->GetPoint() = aPos;
                     GetDoc()->getIDocumentContentOperations().InsertPoolItem( *m_pCurCrsr,
-                            SvxFmtBreakItem( SVX_BREAK_COLUMN_BEFORE, RES_BREAK ) );
+                            SvxFormatBreakItem( SVX_BREAK_COLUMN_BEFORE, RES_BREAK ) );
                 }
             }
 
@@ -1896,7 +1896,7 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
             switch( aFPos.eMode )
             {
             case FILL_INDENT:
-                if( 0 != (pCNd = aPos.nNode.GetNode().GetCntntNode() ))
+                if( 0 != (pCNd = aPos.nNode.GetNode().GetContentNode() ))
                 {
                     SfxItemSet aSet( GetDoc()->GetAttrPool(),
                                     RES_LR_SPACE, RES_LR_SPACE,
@@ -1904,8 +1904,8 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                                     0 );
                     SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(
                                         pCNd->GetAttr( RES_LR_SPACE ) ) );
-                    aLR.SetTxtLeft( aFPos.nTabCnt );
-                    aLR.SetTxtFirstLineOfst( 0 );
+                    aLR.SetTextLeft( aFPos.nTabCnt );
+                    aLR.SetTextFirstLineOfst( 0 );
                     aSet.Put( aLR );
 
                     const SvxAdjustItem& rAdj = static_cast<const SvxAdjustItem&>(pCNd->
@@ -1916,7 +1916,7 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                     GetDoc()->getIDocumentContentOperations().InsertItemSet( *m_pCurCrsr, aSet );
                 }
                 else {
-                    OSL_ENSURE( false, "No CntntNode" );
+                    OSL_ENSURE( false, "No ContentNode" );
                 }
                 break;
 
@@ -2003,14 +2003,14 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelec
     SwCallLink aLk( *this ); // watch Crsr-Moves
     SwCrsrSaveState aSaveState( *m_pCurCrsr );
 
-    pFnd = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl()[ nArrPos ];
+    pFnd = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable()[ nArrPos ];
     if( pFnd )
     {
         *m_pCurCrsr->GetPoint() = *pFnd->Start();
 
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         SwNodeIndex* pIdx = &m_pCurCrsr->GetPoint()->nNode;
-        if( !pIdx->GetNode().IsCntntNode() &&
+        if( !pIdx->GetNode().IsContentNode() &&
             0 != ( pCNd = GetDoc()->GetNodes().GoNextSection( pIdx,
                                     true, IsReadOnlyAvailable() )) )
         {
@@ -2025,7 +2025,7 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelec
             m_pCurCrsr->SetMark();
             if( nsRedlineType_t::REDLINE_FMTCOLL == pFnd->GetType() )
             {
-                pCNd = pIdx->GetNode().GetCntntNode();
+                pCNd = pIdx->GetNode().GetContentNode();
                 m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
                 m_pCurCrsr->GetMark()->nContent.Assign( pCNd, 0 );
             }
@@ -2033,7 +2033,7 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelec
                 *m_pCurCrsr->GetPoint() = *pFnd->End();
 
             pIdx = &m_pCurCrsr->GetPoint()->nNode;
-            if( !pIdx->GetNode().IsCntntNode() &&
+            if( !pIdx->GetNode().IsContentNode() &&
                 0 != ( pCNd = SwNodes::GoPrevSection( pIdx,
                                             true, IsReadOnlyAvailable() )) )
             {
@@ -2072,8 +2072,8 @@ const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
     {
         SET_CURR_SHELL( this );
 
-        const SwRedlineTbl& rTbl = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
-        const SwRangeRedline* pTmp = rTbl[ nArrPos ];
+        const SwRedlineTable& rTable = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+        const SwRangeRedline* pTmp = rTable[ nArrPos ];
         sal_uInt16 nSeqNo = pTmp->GetSeqNo();
         if( nSeqNo && bSelect )
         {
@@ -2089,7 +2089,7 @@ const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
 
                 if( pTmp && bCheck )
                 {
-                    // Check for overlaps. These can happen when FmtColl-
+                    // Check for overlaps. These can happen when FormatColl-
                     // Redlines were stretched over a whole paragraph
                     SwPaM* pCur = m_pCurCrsr;
                     SwPaM* pNextPam = pCur->GetNext();
@@ -2149,11 +2149,11 @@ const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
                 }
 
                 sal_uInt16 nFndPos = 2 == nLoopCnt
-                                    ? rTbl.FindNextOfSeqNo( nArrPos )
-                                    : rTbl.FindPrevOfSeqNo( nArrPos );
+                                    ? rTable.FindNextOfSeqNo( nArrPos )
+                                    : rTable.FindPrevOfSeqNo( nArrPos );
                 if( USHRT_MAX != nFndPos ||
                     ( 0 != ( --nLoopCnt ) && USHRT_MAX != (
-                            nFndPos = rTbl.FindPrevOfSeqNo( nArrSavPos ))) )
+                            nFndPos = rTable.FindPrevOfSeqNo( nArrSavPos ))) )
                 {
                     if( pTmp )
                     {
@@ -2182,47 +2182,47 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
     sal_uLong nBodySttNdIdx = pBodySttNd->GetIndex();
     Point aPt;
 
-    _SetGetExpFld aCmpPos( SwPosition( bNext ? *pBodyEndNd : *pBodySttNd ) );
-    _SetGetExpFld aCurPos( bNext ? *m_pCurCrsr->End() : *m_pCurCrsr->Start() );
+    _SetGetExpField aCmpPos( SwPosition( bNext ? *pBodyEndNd : *pBodySttNd ) );
+    _SetGetExpField aCurPos( bNext ? *m_pCurCrsr->End() : *m_pCurCrsr->Start() );
     if( aCurPos.GetNode() < nBodySttNdIdx )
     {
-        const SwCntntNode* pCNd = aCurPos.GetNodeFromCntnt()->GetCntntNode();
-        SwCntntFrm* pFrm;
+        const SwContentNode* pCNd = aCurPos.GetNodeFromContent()->GetContentNode();
+        SwContentFrm* pFrm;
         if( pCNd && 0 != ( pFrm = pCNd->getLayoutFrm( GetLayout(), &aPt )) )
             aCurPos.SetBodyPos( *pFrm );
     }
 
     // check first all the hyperlink fields
     {
-        const SwTxtNode* pTxtNd;
-        const SwCharFmts* pFmts = GetDoc()->GetCharFmts();
-        for( SwCharFmts::size_type n = pFmts->size(); 1 < n; )
+        const SwTextNode* pTextNd;
+        const SwCharFormats* pFormats = GetDoc()->GetCharFormats();
+        for( SwCharFormats::size_type n = pFormats->size(); 1 < n; )
         {
-            SwIterator<SwTxtINetFmt,SwCharFmt> aIter(*(*pFmts)[--n]);
+            SwIterator<SwTextINetFormat,SwCharFormat> aIter(*(*pFormats)[--n]);
 
-            for( SwTxtINetFmt* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
-                if( 0 != ( pTxtNd = pFnd->GetpTxtNode()) &&
-                    pTxtNd->GetNodes().IsDocNodes() )
+            for( SwTextINetFormat* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
+                if( 0 != ( pTextNd = pFnd->GetpTextNode()) &&
+                    pTextNd->GetNodes().IsDocNodes() )
                 {
-                    SwTxtINetFmt& rAttr = *pFnd;
-                    SwPosition aTmpPos( *pTxtNd );
-                    _SetGetExpFld aPos( aTmpPos.nNode, rAttr );
-                    SwCntntFrm* pFrm;
-                    if( pTxtNd->GetIndex() < nBodySttNdIdx &&
-                        0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt )) )
+                    SwTextINetFormat& rAttr = *pFnd;
+                    SwPosition aTmpPos( *pTextNd );
+                    _SetGetExpField aPos( aTmpPos.nNode, rAttr );
+                    SwContentFrm* pFrm;
+                    if( pTextNd->GetIndex() < nBodySttNdIdx &&
+                        0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt )) )
                         aPos.SetBodyPos( *pFrm );
 
                     if( bNext
                         ? ( aPos < aCmpPos && aCurPos < aPos )
                         : ( aCmpPos < aPos && aPos < aCurPos ))
                     {
-                        OUString sTxt( pTxtNd->GetExpandTxt( rAttr.GetStart(),
+                        OUString sText( pTextNd->GetExpandText( rAttr.GetStart(),
                                         *rAttr.GetEnd() - rAttr.GetStart() ) );
 
-                        sTxt = comphelper::string::remove(sTxt, 0x0a);
-                        sTxt = comphelper::string::strip(sTxt, ' ');
+                        sText = comphelper::string::remove(sText, 0x0a);
+                        sText = comphelper::string::strip(sText, ' ');
 
-                        if( !sTxt.isEmpty() )
+                        if( !sText.isEmpty() )
                             aCmpPos = aPos;
                     }
                 }
@@ -2231,19 +2231,19 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
 
     // then check all the Flys with a URL or imapge map
     {
-        const SwFrmFmts* pFmts = GetDoc()->GetSpzFrmFmts();
-        for( SwFrmFmts::size_type n = 0, nEnd = pFmts->size(); n < nEnd; ++n )
+        const SwFrameFormats* pFormats = GetDoc()->GetSpzFrameFormats();
+        for( SwFrameFormats::size_type n = 0, nEnd = pFormats->size(); n < nEnd; ++n )
         {
-            SwFlyFrmFmt* pFmt = static_cast<SwFlyFrmFmt*>((*pFmts)[ n ]);
-            const SwFmtURL& rURLItem = pFmt->GetURL();
+            SwFlyFrameFormat* pFormat = static_cast<SwFlyFrameFormat*>((*pFormats)[ n ]);
+            const SwFormatURL& rURLItem = pFormat->GetURL();
             if( rURLItem.GetMap() || !rURLItem.GetURL().isEmpty() )
             {
-                SwFlyFrm* pFly = pFmt->GetFrm( &aPt, false );
+                SwFlyFrm* pFly = pFormat->GetFrm( &aPt, false );
                 SwPosition aTmpPos( *pBodySttNd );
                 if( pFly &&
-                    GetBodyTxtNode( *GetDoc(), aTmpPos, *pFly->GetLower() ) )
+                    GetBodyTextNode( *GetDoc(), aTmpPos, *pFly->GetLower() ) )
                 {
-                    _SetGetExpFld aPos( *pFmt, &aTmpPos );
+                    _SetGetExpField aPos( *pFormat, &aTmpPos );
 
                     if( bNext
                             ? ( aPos < aCmpPos && aCurPos < aPos )
@@ -2256,9 +2256,9 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
 
     // found any URL ?
     bool bRet = false;
-    const SwTxtINetFmt* pFndAttr = aCmpPos.GetINetFmt();
-    const SwFlyFrmFmt* pFndFmt = aCmpPos.GetFlyFmt();
-    if( pFndAttr || pFndFmt )
+    const SwTextINetFormat* pFndAttr = aCmpPos.GetINetFormat();
+    const SwFlyFrameFormat* pFndFormat = aCmpPos.GetFlyFormat();
+    if( pFndAttr || pFndFormat )
     {
         SET_CURR_SHELL( this );
         SwCallLink aLk( *this );
@@ -2281,9 +2281,9 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
             }
         }
         // found a draw object ?
-        else if( RES_DRAWFRMFMT == pFndFmt->Which() )
+        else if( RES_DRAWFRMFMT == pFndFormat->Which() )
         {
-            const SdrObject* pSObj = pFndFmt->FindSdrObject();
+            const SdrObject* pSObj = pFndFormat->FindSdrObject();
             if (pSObj)
             {
                 static_cast<SwFEShell*>(this)->SelectObj( pSObj->GetCurrentBoundRect().Center() );
@@ -2293,7 +2293,7 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
         }
         else // then is it a fly
         {
-            SwFlyFrm* pFly = pFndFmt->GetFrm(&aPt, false );
+            SwFlyFrm* pFly = pFndFormat->GetFrm(&aPt, false );
             if( pFly )
             {
                 static_cast<SwFEShell*>(this)->SelectFlyFrm( *pFly, true );
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index d0cdeaa50b6c..9ff5944d7e5c 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-typedef std::set<SwFmt*> SwpFmts;
+typedef std::set<SwFormat*> SwpFormats;
 
 // Special case for SvxFontItem: only compare the name
 bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
@@ -66,9 +66,9 @@ bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
     case RES_PAGEDESC:
         bool bNumOffsetEqual = false;
         ::boost::optional<sal_uInt16> const oNumOffset1 =
-            static_cast<const SwFmtPageDesc&>(rItem1).GetNumOffset();
+            static_cast<const SwFormatPageDesc&>(rItem1).GetNumOffset();
         ::boost::optional<sal_uInt16> const oNumOffset2 =
-            static_cast<const SwFmtPageDesc&>(rItem2).GetNumOffset();
+            static_cast<const SwFormatPageDesc&>(rItem2).GetNumOffset();
         if (!oNumOffset1 && !oNumOffset2)
         {
             bNumOffsetEqual = true;
@@ -85,33 +85,33 @@ bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
         if (!bNumOffsetEqual)
             return false;
 
-        return static_cast<const SwFmtPageDesc&>(rItem1).GetPageDesc() == static_cast<const SwFmtPageDesc&>(rItem2).GetPageDesc();
+        return static_cast<const SwFormatPageDesc&>(rItem1).GetPageDesc() == static_cast<const SwFormatPageDesc&>(rItem2).GetPageDesc();
     }
     return rItem1 == rItem2;
 }
 
-const SwTxtAttr* GetFrwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
-                                    sal_Int32 nCntntPos )
+const SwTextAttr* GetFrwrdTextHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
+                                    sal_Int32 nContentPos )
 {
     while( rPos < rHtsArr.Count() )
     {
-        const SwTxtAttr *pTxtHt = rHtsArr.GetStart( rPos++ );
+        const SwTextAttr *pTextHt = rHtsArr.GetStart( rPos++ );
         // the start of an attribute has to be in the section
-        if( pTxtHt->GetStart() >= nCntntPos )
-            return pTxtHt; // valid text attribute
+        if( pTextHt->GetStart() >= nContentPos )
+            return pTextHt; // valid text attribute
     }
     return 0; // invalid text attribute
 }
 
-const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
-                                  sal_Int32 nCntntPos )
+const SwTextAttr* GetBkwrdTextHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
+                                  sal_Int32 nContentPos )
 {
     while( rPos > 0 )
     {
-        const SwTxtAttr *pTxtHt = rHtsArr.GetStart( --rPos );
+        const SwTextAttr *pTextHt = rHtsArr.GetStart( --rPos );
         // the start of an attribute has to be in the section
-        if( pTxtHt->GetStart() < nCntntPos )
-            return pTxtHt; // valid text attribute
+        if( pTextHt->GetStart() < nContentPos )
+            return pTextHt; // valid text attribute
     }
     return 0; // invalid text attribute
 }
@@ -119,22 +119,22 @@ const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
 static void lcl_SetAttrPam( SwPaM& rPam, sal_Int32 nStart, const sal_Int32* pEnd,
                      const bool bSaveMark )
 {
-    sal_Int32 nCntntPos;
+    sal_Int32 nContentPos;
     if( bSaveMark )
-        nCntntPos = rPam.GetMark()->nContent.GetIndex();
+        nContentPos = rPam.GetMark()->nContent.GetIndex();
     else
-        nCntntPos = rPam.GetPoint()->nContent.GetIndex();
+        nContentPos = rPam.GetPoint()->nContent.GetIndex();
     bool bTstEnd = rPam.GetPoint()->nNode == rPam.GetMark()->nNode;
 
-    SwCntntNode* pCNd = rPam.GetCntntNode();
+    SwContentNode* pCNd = rPam.GetContentNode();
     rPam.GetPoint()->nContent.Assign( pCNd, nStart );
     rPam.SetMark(); // Point == GetMark
 
     // Point points to end of search area or end of attribute
     if( pEnd )
     {
-        if( bTstEnd && *pEnd > nCntntPos )
-            rPam.GetPoint()->nContent = nCntntPos;
+        if( bTstEnd && *pEnd > nContentPos )
+            rPam.GetPoint()->nContent = nContentPos;
         else
             rPam.GetPoint()->nContent = *pEnd;
     }
@@ -147,30 +147,30 @@ static void lcl_SetAttrPam( SwPaM& rPam, sal_Int32 nStart, const sal_Int32* pEnd
     If that is found then the SwPaM contains the section that surrounds the
     attribute (w.r.t. the search area).
 
-    @param rTxtNd   Text node to search in.
+    @param rTextNd   Text node to search in.
     @param rPam     ???
     @param rCmpItem ???
     @param fnMove   ???
     @param bValue   ???
     @return Returns <true> if found, <false> otherwise.
 */
-static bool lcl_Search( const SwTxtNode& rTxtNd, SwPaM& rPam,
+static bool lcl_Search( const SwTextNode& rTextNd, SwPaM& rPam,
                     const SfxPoolItem& rCmpItem,
                     SwMoveFn fnMove, bool bValue )
 {
-    if ( !rTxtNd.HasHints() )
+    if ( !rTextNd.HasHints() )
         return false;
 
-    const SwTxtAttr *pTxtHt = 0;
+    const SwTextAttr *pTextHt = 0;
     bool bForward = fnMove == fnMoveForward;
-    sal_uInt16 nPos = bForward ? 0 : rTxtNd.GetSwpHints().Count();
-    sal_Int32 nCntntPos = rPam.GetPoint()->nContent.GetIndex();
+    sal_uInt16 nPos = bForward ? 0 : rTextNd.GetSwpHints().Count();
+    sal_Int32 nContentPos = rPam.GetPoint()->nContent.GetIndex();
 
-    while( 0 != ( pTxtHt=(*fnMove->fnGetHint)(rTxtNd.GetSwpHints(),nPos,nCntntPos)))
-        if( pTxtHt->Which() == rCmpItem.Which() &&
-            ( !bValue || CmpAttr( pTxtHt->GetAttr(), rCmpItem )))
+    while( 0 != ( pTextHt=(*fnMove->fnGetHint)(rTextNd.GetSwpHints(),nPos,nContentPos)))
+        if( pTextHt->Which() == rCmpItem.Which() &&
+            ( !bValue || CmpAttr( pTextHt->GetAttr(), rCmpItem )))
         {
-            lcl_SetAttrPam( rPam, pTxtHt->GetStart(), pTxtHt->End(), bForward );
+            lcl_SetAttrPam( rPam, pTextHt->GetStart(), pTextHt->End(), bForward );
             return true;
         }
     return false;
@@ -204,7 +204,7 @@ public:
     SwAttrCheckArr( const SfxItemSet& rSet, bool bForward, bool bNoCollections );
     ~SwAttrCheckArr();
 
-    void SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam );
+    void SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam );
 
     /// how many attributes are there in total?
     sal_uInt16 Count() const    { return aCmpSet.Count(); }
@@ -217,8 +217,8 @@ public:
     sal_Int32 GetNdStt() const { return nNdStt; }
     sal_Int32 GetNdEnd() const { return nNdEnd; }
 
-    bool SetAttrFwd( const SwTxtAttr& rAttr );
-    bool SetAttrBwd( const SwTxtAttr& rAttr );
+    bool SetAttrFwd( const SwTextAttr& rAttr );
+    bool SetAttrBwd( const SwTextAttr& rAttr );
 };
 
 SwAttrCheckArr::SwAttrCheckArr( const SfxItemSet& rSet, bool bFwd,
@@ -251,7 +251,7 @@ SwAttrCheckArr::~SwAttrCheckArr()
     delete[] reinterpret_cast<char*>(pStackArr);
 }
 
-void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
+void SwAttrCheckArr::SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam )
 {
     memset( pFndArr, 0, nArrLen * sizeof(_SwSrchChrAttr) );
     memset( pStackArr, 0, nArrLen * sizeof(_SwSrchChrAttr) );
@@ -263,7 +263,7 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
         nNdStt = rPam.GetPoint()->nContent.GetIndex();
         nNdEnd = rPam.GetPoint()->nNode == rPam.GetMark()->nNode
                 ? rPam.GetMark()->nContent.GetIndex()
-                : rTxtNd.GetTxt().getLength();
+                : rTextNd.GetText().getLength();
     }
     else
     {
@@ -273,10 +273,10 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
                 : 0;
     }
 
-    if( bNoColls && !rTxtNd.HasSwAttrSet() )
+    if( bNoColls && !rTextNd.HasSwAttrSet() )
         return ;
 
-    const SfxItemSet& rSet = rTxtNd.GetSwAttrSet();
+    const SfxItemSet& rSet = rTextNd.GetSwAttrSet();
 
     SfxItemIter aIter( aCmpSet );
     const SfxPoolItem* pItem = aIter.GetCurItem();
@@ -333,7 +333,7 @@ lcl_IsAttributeIgnorable(sal_Int32 const nNdStart, sal_Int32 const nNdEnd,
             : ((rTmp.nEnd <= nNdStart) || (nNdEnd <= rTmp.nStt)));
 }
 
-bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
+bool SwAttrCheckArr::SetAttrFwd( const SwTextAttr& rAttr )
 {
     _SwSrchChrAttr aTmp( rAttr.GetAttr(), rAttr.GetStart(), *rAttr.GetAnyEnd() );
 
@@ -354,7 +354,7 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
         if( bNoColls && RES_TXTATR_CHARFMT == nWhch )
             return Found();
         pTmpItem = NULL;
-        pSet = CharFmt::GetItemSet( rAttr.GetAttr() );
+        pSet = CharFormat::GetItemSet( rAttr.GetAttr() );
         if ( pSet )
         {
             pIter = new SfxWhichIter( *pSet );
@@ -486,7 +486,7 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
     return Found();
 }
 
-bool SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
+bool SwAttrCheckArr::SetAttrBwd( const SwTextAttr& rAttr )
 {
     _SwSrchChrAttr aTmp( rAttr.GetAttr(), rAttr.GetStart(), *rAttr.GetAnyEnd() );
 
@@ -507,7 +507,7 @@ bool SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
         if( bNoColls && RES_TXTATR_CHARFMT == nWhch )
             return Found();
 
-        pSet = CharFmt::GetItemSet( rAttr.GetAttr() );
+        pSet = CharFormat::GetItemSet( rAttr.GetAttr() );
         if ( pSet )
         {
             pIter = new SfxWhichIter( *pSet );
@@ -693,12 +693,12 @@ bool SwAttrCheckArr::CheckStack()
     return nFound == aCmpSet.Count();
 }
 
-static bool lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
+static bool lcl_SearchForward( const SwTextNode& rTextNd, SwAttrCheckArr& rCmpArr,
                             SwPaM& rPam )
 {
     sal_Int32 nEndPos;
-    rCmpArr.SetNewSet( rTxtNd, rPam );
-    if( !rTxtNd.HasHints() )
+    rCmpArr.SetNewSet( rTextNd, rPam );
+    if( !rTextNd.HasHints() )
     {
         if( !rCmpArr.Found() )
             return false;
@@ -707,8 +707,8 @@ static bool lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
         return true;
     }
 
-    const SwpHints& rHtArr = rTxtNd.GetSwpHints();
-    const SwTxtAttr* pAttr;
+    const SwpHints& rHtArr = rTextNd.GetSwpHints();
+    const SwTextAttr* pAttr;
     size_t nPos = 0;
 
     // if everything is already there then check with which it will be ended
@@ -767,12 +767,12 @@ static bool lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
     return true;
 }
 
-static bool lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
+static bool lcl_SearchBackward( const SwTextNode& rTextNd, SwAttrCheckArr& rCmpArr,
                             SwPaM& rPam )
 {
     sal_Int32 nEndPos;
-    rCmpArr.SetNewSet( rTxtNd, rPam );
-    if( !rTxtNd.HasHints() )
+    rCmpArr.SetNewSet( rTextNd, rPam );
+    if( !rTextNd.HasHints() )
     {
         if( !rCmpArr.Found() )
             return false;
@@ -781,8 +781,8 @@ static bool lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr
         return true;
     }
 
-    const SwpHints& rHtArr = rTxtNd.GetSwpHints();
-    const SwTxtAttr* pAttr;
+    const SwpHints& rHtArr = rTextNd.GetSwpHints();
+    const SwTextAttr* pAttr;
     size_t nPos = rHtArr.Count();
     sal_Int32 nSttPos;
 
@@ -845,7 +845,7 @@ static bool lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr
     return true;
 }
 
-static bool lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, bool bNoColls )
+static bool lcl_Search( const SwContentNode& rCNd, const SfxItemSet& rCmpSet, bool bNoColls )
 {
     // search only hard attribution?
     if( bNoColls && !rCNd.HasSwAttrSet() )
@@ -893,20 +893,20 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
     bool bFound = false;
     bool bFirst = true;
     const bool bSrchForward = fnMove == fnMoveForward;
-    SwCntntNode * pNode;
+    SwContentNode * pNode;
     const SfxPoolItem* pItem;
-    SwpFmts aFmtArr;
+    SwpFormats aFormatArr;
 
     // if at beginning/end then move it out of the node
     if( bSrchForward
-        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
+        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetContentNode()->Len()
         : !pPam->GetPoint()->nContent.GetIndex() )
     {
         if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
         {
             return false;
         }
-        SwCntntNode *pNd = pPam->GetCntntNode();
+        SwContentNode *pNd = pPam->GetContentNode();
         pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() );
     }
 
@@ -914,11 +914,11 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
     {
         if( bCharAttr )
         {
-            if( !pNode->IsTxtNode() ) // CharAttr are only in text nodes
+            if( !pNode->IsTextNode() ) // CharAttr are only in text nodes
                 continue;
 
-            if( pNode->GetTxtNode()->HasHints() &&
-                lcl_Search( *pNode->GetTxtNode(), *pPam, rAttr, fnMove,  bValue ))
+            if( pNode->GetTextNode()->HasHints() &&
+                lcl_Search( *pNode->GetTextNode(), *pPam, rAttr, fnMove,  bValue ))
             {
                 // set to the values of the attribute
                 SetMark();
@@ -934,10 +934,10 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
         // no hard attribution, so check if node was asked for this attr before
         if( !pNode->HasSwAttrSet() )
         {
-            SwFmt* pTmpFmt = pNode->GetFmtColl();
-            if( aFmtArr.find( pTmpFmt ) != aFmtArr.end() )
+            SwFormat* pTmpFormat = pNode->GetFormatColl();
+            if( aFormatArr.find( pTmpFormat ) != aFormatArr.end() )
                 continue; // collection was requested earlier
-            aFmtArr.insert( pTmpFmt );
+            aFormatArr.insert( pTmpFormat );
         }
 
         if( SfxItemState::SET == pNode->GetSwAttrSet().GetItemState( nWhich,
@@ -961,7 +961,7 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
     return bFound;
 }
 
-typedef bool (*FnSearchAttr)( const SwTxtNode&, SwAttrCheckArr&, SwPaM& );
+typedef bool (*FnSearchAttr)( const SwTextNode&, SwAttrCheckArr&, SwPaM& );
 
 bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
                   const SwPaM *pRegion, bool bInReadOnly, bool bMoveFirst )
@@ -971,8 +971,8 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
     bool bFound = false;
     bool bFirst = true;
     const bool bSrchForward = fnMove == fnMoveForward;
-    SwCntntNode * pNode;
-    SwpFmts aFmtArr;
+    SwContentNode * pNode;
+    SwpFormats aFormatArr;
 
     // check which text/char attributes are searched
     SwAttrCheckArr aCmpArr( rSet, bSrchForward, bNoColls );
@@ -987,14 +987,14 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
     // if at beginning/end then move it out of the node
     if( bMoveFirst &&
         ( bSrchForward
-        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
+        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetContentNode()->Len()
         : !pPam->GetPoint()->nContent.GetIndex() ) )
     {
         if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
         {
             return false;
         }
-        SwCntntNode *pNd = pPam->GetCntntNode();
+        SwContentNode *pNd = pPam->GetContentNode();
         pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() );
     }
 
@@ -1002,12 +1002,12 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
     {
         if( aCmpArr.Count() )
         {
-            if( !pNode->IsTxtNode() ) // CharAttr are only in text nodes
+            if( !pNode->IsTextNode() ) // CharAttr are only in text nodes
                 continue;
 
             if( (!aOtherSet.Count() ||
                 lcl_Search( *pNode, aOtherSet, bNoColls )) &&
-                (*fnSearch)( *pNode->GetTxtNode(), aCmpArr, *pPam ))
+                (*fnSearch)( *pNode->GetTextNode(), aCmpArr, *pPam ))
             {
                 // set to the values of the attribute
                 SetMark();
@@ -1025,10 +1025,10 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
         // no hard attribution, so check if node was asked for this attr before
         if( !pNode->HasSwAttrSet() )
         {
-            SwFmt* pTmpFmt = pNode->GetFmtColl();
-            if( aFmtArr.find( pTmpFmt ) != aFmtArr.end() )
+            SwFormat* pTmpFormat = pNode->GetFormatColl();
+            if( aFormatArr.find( pTmpFormat ) != aFormatArr.end() )
                 continue; // collection was requested earlier
-            aFmtArr.insert( pTmpFmt );
+            aFormatArr.insert( pTmpFormat );
         }
 
         if( lcl_Search( *pNode, aOtherSet, bNoColls ))
@@ -1058,15 +1058,15 @@ struct SwFindParaAttr : public SwFindParas
     const SfxItemSet *pSet, *pReplSet;
     const SearchOptions *pSearchOpt;
     SwCursor& rCursor;
-    utl::TextSearch* pSTxt;
+    utl::TextSearch* pSText;
 
     SwFindParaAttr( const SfxItemSet& rSet, bool bNoCollection,
                     const SearchOptions* pOpt, const SfxItemSet* pRSet,
                     SwCursor& rCrsr )
         : bValue( bNoCollection ), pSet( &rSet ), pReplSet( pRSet ),
-          pSearchOpt( pOpt ), rCursor( rCrsr ),pSTxt( 0 ) {}
+          pSearchOpt( pOpt ), rCursor( rCrsr ),pSText( 0 ) {}
 
-    virtual ~SwFindParaAttr()   { delete pSTxt; }
+    virtual ~SwFindParaAttr()   { delete pSText; }
 
     virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
     virtual bool IsReplaceMode() const SAL_OVERRIDE;
@@ -1076,11 +1076,11 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
                           bool bInReadOnly )
 {
     // replace string (only if text given and search is not parameterized)?
-    bool bReplaceTxt = pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
+    bool bReplaceText = pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
                                     !pSet->Count() );
     bool bReplaceAttr = pReplSet && pReplSet->Count();
     bool bMoveFirst = !bReplaceAttr;
-    if( bInReadOnly && (bReplaceAttr || bReplaceTxt ))
+    if( bInReadOnly && (bReplaceAttr || bReplaceText ))
         bInReadOnly = false;
 
     // We search for attributes, should we search for text as well?
@@ -1107,7 +1107,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
                 return FIND_NOT_FOUND;
 
             // then search in text of it
-            if( !pSTxt )
+            if( !pSText )
             {
                 SearchOptions aTmp( *pSearchOpt );
 
@@ -1117,14 +1117,14 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
 
                 aTmp.Locale = SvtSysLocale().GetLanguageTag().getLocale();
 
-                pSTxt = new utl::TextSearch( aTmp );
+                pSText = new utl::TextSearch( aTmp );
             }
 
             // TODO: searching for attributes in Outliner text?!
             bool bSearchInNotes = false;
 
             // continue search in correct section (pTextRegion)
-            if( aSrchPam.Find( *pSearchOpt, bSearchInNotes, *pSTxt, fnMove, pTextRegion, bInReadOnly ) &&
+            if( aSrchPam.Find( *pSearchOpt, bSearchInNotes, *pSText, fnMove, pTextRegion, bInReadOnly ) &&
                 *aSrchPam.GetMark() != *aSrchPam.GetPoint() )
                 break; // found
             else if( !pSet->Count() )
@@ -1138,7 +1138,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
         *pCrsr->GetMark() = *aSrchPam.GetMark();
     }
 
-    if( bReplaceTxt )
+    if( bReplaceText )
     {
         const bool bRegExp(
                 SearchAlgorithms_REGEXP == pSearchOpt->algorithmType);
@@ -1158,7 +1158,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
         rCursor.GetDoc()->getIDocumentContentOperations().ReplaceRange( *pCrsr,
             (pRepl.get()) ? *pRepl : pSearchOpt->replaceString,
             bRegExp );
-        rCursor.SaveTblBoxCntnt( pCrsr->GetPoint() );
+        rCursor.SaveTableBoxContent( pCrsr->GetPoint() );
 
         if( bRegExp )
         {
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index 62e9e799fb18..762e53309f18 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -28,45 +28,45 @@
 #include <comcore.hrc>
 
 /// parameters for a search for FormatCollections
-struct SwFindParaFmtColl : public SwFindParas
+struct SwFindParaFormatColl : public SwFindParas
 {
-    const SwTxtFmtColl *pFmtColl, *pReplColl;
+    const SwTextFormatColl *pFormatColl, *pReplColl;
     SwCursor& rCursor;
-    SwFindParaFmtColl( const SwTxtFmtColl& rFmtColl,
-                        const SwTxtFmtColl* pRpColl, SwCursor& rCrsr )
-        : pFmtColl( &rFmtColl ), pReplColl( pRpColl ), rCursor( rCrsr )
+    SwFindParaFormatColl( const SwTextFormatColl& rFormatColl,
+                        const SwTextFormatColl* pRpColl, SwCursor& rCrsr )
+        : pFormatColl( &rFormatColl ), pReplColl( pRpColl ), rCursor( rCrsr )
     {}
-    virtual ~SwFindParaFmtColl() {}
+    virtual ~SwFindParaFormatColl() {}
     virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
     virtual bool IsReplaceMode() const SAL_OVERRIDE;
 };
 
-int SwFindParaFmtColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
+int SwFindParaFormatColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
                              bool bInReadOnly )
 {
     int nRet = FIND_FOUND;
     if( bInReadOnly && pReplColl )
         bInReadOnly = false;
 
-    if( !pCrsr->Find( *pFmtColl, fnMove, pRegion, bInReadOnly ) )
+    if( !pCrsr->Find( *pFormatColl, fnMove, pRegion, bInReadOnly ) )
         nRet = FIND_NOT_FOUND;
     else if( pReplColl )
     {
-        pCrsr->GetDoc()->SetTxtFmtColl( *pCrsr, const_cast<SwTxtFmtColl*>(pReplColl) );
+        pCrsr->GetDoc()->SetTextFormatColl( *pCrsr, const_cast<SwTextFormatColl*>(pReplColl) );
         nRet = FIND_NO_RING;
     }
     return nRet;
 }
 
-bool SwFindParaFmtColl::IsReplaceMode() const
+bool SwFindParaFormatColl::IsReplaceMode() const
 {
     return 0 != pReplColl;
 }
 
 /// search for Format-Collections
-sal_uLong SwCursor::Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart,
+sal_uLong SwCursor::Find( const SwTextFormatColl& rFormatColl, SwDocPositions nStart,
                           SwDocPositions nEnd, bool& bCancel,
-                          FindRanges eFndRngs, const SwTxtFmtColl* pReplFmtColl )
+                          FindRanges eFndRngs, const SwTextFormatColl* pReplFormatColl )
 {
     // switch off OLE-notifications
     SwDoc* pDoc = GetDoc();
@@ -74,24 +74,24 @@ sal_uLong SwCursor::Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart,
     pDoc->SetOle2Link( Link<>() );
 
     bool const bStartUndo =
-        pDoc->GetIDocumentUndoRedo().DoesUndo() && pReplFmtColl;
+        pDoc->GetIDocumentUndoRedo().DoesUndo() && pReplFormatColl;
     if (bStartUndo)
     {
         SwRewriter aRewriter;
-        aRewriter.AddRule(UndoArg1, rFmtColl.GetName());
+        aRewriter.AddRule(UndoArg1, rFormatColl.GetName());
         aRewriter.AddRule(UndoArg2, SW_RES(STR_YIELDS));
-        aRewriter.AddRule(UndoArg3, pReplFmtColl->GetName());
+        aRewriter.AddRule(UndoArg3, pReplFormatColl->GetName());
 
         pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_UI_REPLACE_STYLE,
                 &aRewriter );
     }
 
-    SwFindParaFmtColl aSwFindParaFmtColl( rFmtColl, pReplFmtColl, *this );
+    SwFindParaFormatColl aSwFindParaFormatColl( rFormatColl, pReplFormatColl, *this );
 
-    sal_uLong nRet = FindAll( aSwFindParaFmtColl, nStart, nEnd, eFndRngs, bCancel );
+    sal_uLong nRet = FindAll( aSwFindParaFormatColl, nStart, nEnd, eFndRngs, bCancel );
     pDoc->SetOle2Link( aLnk );
 
-    if( nRet && pReplFmtColl )
+    if( nRet && pReplFormatColl )
         pDoc->getIDocumentState().SetModified();
 
     if (bStartUndo)
diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx
index 8ffc5b307b06..e9e745514557 100644
--- a/sw/source/core/crsr/findfmt.cxx
+++ b/sw/source/core/crsr/findfmt.cxx
@@ -21,7 +21,7 @@
 #include <pamtyp.hxx>
 #include <boost/scoped_ptr.hpp>
 
-bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
+bool SwPaM::Find( const SwFormat& rFormat, SwMoveFn fnMove,
                   const SwPaM *pRegion, bool bInReadOnly  )
 {
     bool bFound = false;
@@ -30,24 +30,24 @@ bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
 
     // if at beginning/end then move it out of the node
     if( bSrchForward
-        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
+        ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetContentNode()->Len()
         : !pPam->GetPoint()->nContent.GetIndex() )
     {
         if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
         {
             return false;
         }
-        SwCntntNode *pNd = pPam->GetPoint()->nNode.GetNode().GetCntntNode();
+        SwContentNode *pNd = pPam->GetPoint()->nNode.GetNode().GetContentNode();
         pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() );
     }
 
     bool bFirst = true;
-    SwCntntNode* pNode;
+    SwContentNode* pNode;
     while( 0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly )))
     {
-        if ( pNode->GetFmtColl() == &rFmt )
+        if ( pNode->GetFormatColl() == &rFormat )
         {
-            // if a FormatCollection is found then it is definitely a SwCntntNode
+            // if a FormatCollection is found then it is definitely a SwContentNode
 
             // FORWARD:  SPoint at the end, GetMark at the beginning of the node
             // BACKWARD: SPoint at the beginning, GetMark at the end of the node
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index ba7dcbdefe01..9a2a8a1e7060 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -51,10 +51,10 @@ using namespace ::com::sun::star;
 using namespace util;
 
 static OUString
-lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
+lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
              std::vector<sal_Int32> &rArr, bool const bRemoveSoftHyphen)
 {
-    OUStringBuffer buf(rNd.GetTxt());
+    OUStringBuffer buf(rNd.GetText());
     rArr.clear();
 
     const SwpHints *pHts = rNd.GetpSwpHints();
@@ -77,7 +77,7 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
         if ( bNewSoftHyphen )
         {
             nSoftHyphen = (bRemoveSoftHyphen)
-                    ?  rNd.GetTxt().indexOf(CHAR_SOFTHYPHEN, nSoftHyphen)
+                    ?  rNd.GetText().indexOf(CHAR_SOFTHYPHEN, nSoftHyphen)
                     : -1;
         }
 
@@ -115,7 +115,7 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
 
         if ( bNewHint )
         {
-            const SwTxtAttr* pHt = (*pHts)[n];
+            const SwTextAttr* pHt = (*pHts)[n];
             if ( pHt->HasDummyChar() && (nStt >= nStart) )
             {
                 switch( pHt->Which() )
@@ -139,7 +139,7 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
                         const bool bEmpty =
                             ( pHt->Which() != RES_TXTATR_FIELD
                               && pHt->Which() != RES_TXTATR_ANNOTATION )
-                            || (static_txtattr_cast<SwTxtFld const*>(pHt)->GetFmtFld().GetField()->ExpandField(true).isEmpty());;
+                            || (static_txtattr_cast<SwTextField const*>(pHt)->GetFormatField().GetField()->ExpandField(true).isEmpty());;
                         if ( bEmpty && nStart == nAkt )
                         {
                             rArr.push_back( nAkt );
@@ -195,8 +195,8 @@ size_t GetPostIt(sal_Int32 aCount,const SwpHints *pHts)
         for (size_t i = 0; i < pHts->Count(); ++i )
         {
             aIndex++;
-            const SwTxtAttr* pTxtAttr = (*pHts)[i];
-            if ( pTxtAttr->Which() == RES_TXTATR_ANNOTATION )
+            const SwTextAttr* pTextAttr = (*pHts)[i];
+            if ( pTextAttr->Which() == RES_TXTATR_ANNOTATION )
             {
                 aCount--;
                 if (!aCount)
@@ -207,8 +207,8 @@ size_t GetPostIt(sal_Int32 aCount,const SwpHints *pHts)
     // throw away all following non postits
     for( size_t i = aIndex; i < pHts->Count(); ++i )
     {
-        const SwTxtAttr* pTxtAttr = (*pHts)[i];
-        if ( pTxtAttr->Which() == RES_TXTATR_ANNOTATION )
+        const SwTextAttr* pTextAttr = (*pHts)[i];
+        if ( pTextAttr->Which() == RES_TXTATR_ANNOTATION )
             break;
         else
             aIndex++;
@@ -216,7 +216,7 @@ size_t GetPostIt(sal_Int32 aCount,const SwpHints *pHts)
     return aIndex;
 }
 
-bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::TextSearch& rSTxt,
+bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::TextSearch& rSText,
                   SwMoveFn fnMove, const SwPaM * pRegion,
                   bool bInReadOnly )
 {
@@ -226,13 +226,13 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
     SwPaM* pPam = MakeRegion( fnMove, pRegion );
     const bool bSrchForward = fnMove == fnMoveForward;
     SwNodeIndex& rNdIdx = pPam->GetPoint()->nNode;
-    SwIndex& rCntntIdx = pPam->GetPoint()->nContent;
+    SwIndex& rContentIdx = pPam->GetPoint()->nContent;
 
     // If bFound is true then the string was found and is between nStart and nEnd
     bool bFound = false;
     // start position in text or initial position
     bool bFirst = true;
-    SwCntntNode * pNode;
+    SwContentNode * pNode;
 
     const bool bRegSearch = SearchAlgorithms_REGEXP == rSearchOpt.algorithmType;
     const bool bChkEmptyPara = bRegSearch && 2 == rSearchOpt.searchString.getLength() &&
@@ -243,22 +243,22 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
     // LanguageType eLastLang = 0;
     while( 0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly ) ))
     {
-        if( pNode->IsTxtNode() )
+        if( pNode->IsTextNode() )
         {
-            SwTxtNode& rTxtNode = *pNode->GetTxtNode();
-            sal_Int32 nTxtLen = rTxtNode.GetTxt().getLength();
+            SwTextNode& rTextNode = *pNode->GetTextNode();
+            sal_Int32 nTextLen = rTextNode.GetText().getLength();
             sal_Int32 nEnd;
             if( rNdIdx == pPam->GetMark()->nNode )
                 nEnd = pPam->GetMark()->nContent.GetIndex();
             else
-                nEnd = bSrchForward ? nTxtLen : 0;
-            sal_Int32 nStart = rCntntIdx.GetIndex();
+                nEnd = bSrchForward ? nTextLen : 0;
+            sal_Int32 nStart = rContentIdx.GetIndex();
 
             /* #i80135# */
             // if there are SwPostItFields inside our current node text, we
             // split the text into separate pieces and search for text inside
             // the pieces as well as inside the fields
-            const SwpHints *pHts = rTxtNode.GetpSwpHints();
+            const SwpHints *pHts = rTextNode.GetpSwpHints();
 
             // count PostItFields by looping over all fields
             sal_Int32 aNumberPostits = 0;
@@ -272,10 +272,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
 
                 for( size_t i = 0; i < pHts->Count(); ++i )
                 {
-                    const SwTxtAttr* pTxtAttr = (*pHts)[i];
-                    if ( pTxtAttr->Which()==RES_TXTATR_ANNOTATION )
+                    const SwTextAttr* pTextAttr = (*pHts)[i];
+                    if ( pTextAttr->Which()==RES_TXTATR_ANNOTATION )
                     {
-                        const sal_Int32 aPos = pTxtAttr->GetStart();
+                        const sal_Int32 aPos = pTextAttr->GetStart();
                         if ( (aPos >= nStart) && (aPos <= nEnd) )
                             aNumberPostits++;
                         else
@@ -323,11 +323,11 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
 
             // If there are any shapes anchored to this node, search there.
             SwPaM aPaM(pNode->GetDoc()->GetNodes().GetEndOfContent());
-            aPaM.GetPoint()->nNode = rTxtNode;
-            aPaM.GetPoint()->nContent.Assign(aPaM.GetPoint()->nNode.GetNode().GetTxtNode(), nStart);
+            aPaM.GetPoint()->nNode = rTextNode;
+            aPaM.GetPoint()->nContent.Assign(aPaM.GetPoint()->nNode.GetNode().GetTextNode(), nStart);
             aPaM.SetMark();
-            aPaM.GetMark()->nNode = rTxtNode.GetIndex() + 1;
-            aPaM.GetMark()->nContent.Assign(aPaM.GetMark()->nNode.GetNode().GetTxtNode(), 0);
+            aPaM.GetMark()->nNode = rTextNode.GetIndex() + 1;
+            aPaM.GetMark()->nContent.Assign(aPaM.GetMark()->nNode.GetNode().GetTextNode(), 0);
             if (pNode->GetDoc()->getIDocumentDrawModelAccess().Search(aPaM, aSearchItem))
             {
                 bFound = true;
@@ -373,18 +373,18 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
                     {
                         nStartInside = aLoop==0 ? nStart : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)]->GetStart()+1;
                         nEndInside = aLoop==aNumberPostits ? nEnd : (*pHts)[GetPostIt(aLoop+aIgnore,pHts)]->GetStart();
-                        nTxtLen = nEndInside - nStartInside;
+                        nTextLen = nEndInside - nStartInside;
                     }
                     else
                     {
                         nStartInside =  aLoop==aNumberPostits ? nStart : (*pHts)[GetPostIt(aLoop+aIgnore,pHts)]->GetStart();
                         nEndInside = aLoop==0 ? nEnd : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)]->GetStart()+1;
-                        nTxtLen = nStartInside - nEndInside;
+                        nTextLen = nStartInside - nEndInside;
                     }
                     // search inside the text between a note
-                    bFound = DoSearch( rSearchOpt, rSTxt, fnMove, bSrchForward,
+                    bFound = DoSearch( rSearchOpt, rSText, fnMove, bSrchForward,
                                        bRegSearch, bChkEmptyPara, bChkParaEnd,
-                                       nStartInside, nEndInside, nTxtLen, pNode,
+                                       nStartInside, nEndInside, nTextLen, pNode,
                                        pPam );
                     if ( bFound )
                         break;
@@ -393,9 +393,9 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
                         // we should now be right in front of a note, search inside
                         if ( (bSrchForward && (GetPostIt(aLoop + aIgnore,pHts) < pHts->Count()) ) || ( !bSrchForward && (aLoop!=0) ))
                         {
-                            const SwTxtAttr* pTxtAttr = bSrchForward ?  (*pHts)[GetPostIt(aLoop+aIgnore,pHts)] : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)];
+                            const SwTextAttr* pTextAttr = bSrchForward ?  (*pHts)[GetPostIt(aLoop+aIgnore,pHts)] : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)];
                             if (pPostItMgr && pPostItMgr->SearchReplace(
-                                    static_txtattr_cast<SwTxtFld const*>(pTxtAttr)->GetFmtFld(),rSearchOpt,bSrchForward))
+                                    static_txtattr_cast<SwTextField const*>(pTextAttr)->GetFormatField(),rSearchOpt,bSrchForward))
                             {
                                 bFound = true ;
                                 break;
@@ -409,9 +409,9 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
             {
                 // if there is no SwPostItField inside or searching inside notes
                 // is disabled, we search the whole length just like before
-                bFound = DoSearch( rSearchOpt, rSTxt, fnMove, bSrchForward,
+                bFound = DoSearch( rSearchOpt, rSText, fnMove, bSrchForward,
                                    bRegSearch, bChkEmptyPara, bChkParaEnd,
-                                   nStart, nEnd, nTxtLen, pNode, pPam );
+                                   nStart, nEnd, nTextLen, pNode, pPam );
             }
             if (bFound)
                 break;
@@ -421,10 +421,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
     return bFound;
 }
 
-bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
+bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSText,
                       SwMoveFn fnMove, bool bSrchForward, bool bRegSearch,
                       bool bChkEmptyPara, bool bChkParaEnd,
-                      sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTxtLen,
+                      sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTextLen,
                       SwNode* pNode, SwPaM* pPam)
 {
     bool bFound = false;
@@ -456,10 +456,10 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
     }
 
     if( bSrchForward )
-        sCleanStr = lcl_CleanStr(*pNode->GetTxtNode(), nStart, nEnd,
+        sCleanStr = lcl_CleanStr(*pNode->GetTextNode(), nStart, nEnd,
                         aFltArr, bRemoveSoftHyphens);
     else
-        sCleanStr = lcl_CleanStr(*pNode->GetTxtNode(), nEnd, nStart,
+        sCleanStr = lcl_CleanStr(*pNode->GetTextNode(), nEnd, nStart,
                         aFltArr, bRemoveSoftHyphens);
 
     SwScriptIterator* pScriptIter = 0;
@@ -488,7 +488,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
             if ( nSearchScript == nCurrScript )
             {
                 const LanguageType eCurrLang =
-                        pNode->GetTxtNode()->GetLang( bSrchForward ?
+                        pNode->GetTextNode()->GetLang( bSrchForward ?
                                                       nStart :
                                                       nEnd );
 
@@ -496,7 +496,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
                 {
                     const lang::Locale aLocale(
                             g_pBreakIt->GetLocale( eCurrLang ) );
-                    rSTxt.SetLocale( rSearchOpt, aLocale );
+                    rSText.SetLocale( rSearchOpt, aLocale );
                     eLastLang = eCurrLang;
                 }
             }
@@ -505,7 +505,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
         sal_Int32 nProxyStart = nStart;
         sal_Int32 nProxyEnd = nEnd;
         if( nSearchScript == nCurrScript &&
-                (rSTxt.*fnMove->fnSearch)( sCleanStr, &nProxyStart, &nProxyEnd, 0 ) &&
+                (rSText.*fnMove->fnSearch)( sCleanStr, &nProxyStart, &nProxyEnd, 0 ) &&
                 !(bZeroMatch = (nProxyStart == nProxyEnd)))
         {
             nStart = nProxyStart;
@@ -558,16 +558,16 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
 
     if ( bFound )
         return true;
-    else if( ( bChkEmptyPara && !nStart && !nTxtLen ) || bChkParaEnd)
+    else if( ( bChkEmptyPara && !nStart && !nTextLen ) || bChkParaEnd)
     {
         *GetPoint() = *pPam->GetPoint();
-        GetPoint()->nContent = bChkParaEnd ? nTxtLen : 0;
+        GetPoint()->nContent = bChkParaEnd ? nTextLen : 0;
         SetMark();
         /* FIXME: this condition does not work for !bSrchForward backward
          * search, it probably never did. (pSttNd != &rNdIdx.GetNode())
          * is never true in this case. */
         if( (bSrchForward || pSttNd != &rNdIdx.GetNode()) &&
-            Move( fnMoveForward, fnGoCntnt ) &&
+            Move( fnMoveForward, fnGoContent ) &&
             (!bSrchForward || pSttNd != &GetPoint()->nNode.GetNode()) &&
             1 == std::abs( (int)( GetPoint()->nNode.GetIndex() -
                              GetMark()->nNode.GetIndex()) ) )
@@ -586,12 +586,12 @@ struct SwFindParaText : public SwFindParas
 {
     const SearchOptions& rSearchOpt;
     SwCursor& rCursor;
-    utl::TextSearch aSTxt;
+    utl::TextSearch aSText;
     bool bReplace;
     bool bSearchInNotes;
 
     SwFindParaText( const SearchOptions& rOpt, bool bSearchNotes, bool bRepl, SwCursor& rCrsr )
-        : rSearchOpt( rOpt ), rCursor( rCrsr ), aSTxt( rOpt ), bReplace( bRepl ), bSearchInNotes( bSearchNotes )
+        : rSearchOpt( rOpt ), rCursor( rCrsr ), aSText( rOpt ), bReplace( bRepl ), bSearchInNotes( bSearchNotes )
     {}
     virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
     virtual bool IsReplaceMode() const SAL_OVERRIDE;
@@ -608,7 +608,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
     if( bInReadOnly && bReplace )
         bInReadOnly = false;
 
-    const bool bFnd = pCrsr->Find( rSearchOpt, bSearchInNotes, aSTxt, fnMove, pRegion, bInReadOnly );
+    const bool bFnd = pCrsr->Find( rSearchOpt, bSearchInNotes, aSText, fnMove, pRegion, bInReadOnly );
 
     if( bFnd && bReplace ) // replace string
     {
@@ -631,7 +631,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
                 *pCrsr,
                 (pRepl.get()) ? *pRepl : rSearchOpt.replaceString,
                 bRegExp );
-        rCursor.SaveTblBoxCntnt( pCrsr->GetPoint() );
+        rCursor.SaveTableBoxContent( pCrsr->GetPoint() );
 
         if( bRegExp )
         {
@@ -649,7 +649,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
             bool bRet = ((fnMoveForward == fnMove) ? &GoNextPara : &GoPrevPara)
                 (*pCrsr, fnMove);
             (void) bRet;
-            assert(bRet); // if join failed, next node must be SwTxtNode
+            assert(bRet); // if join failed, next node must be SwTextNode
         }
         else
             pCrsr->Start()->nContent = nSttCnt;
@@ -702,18 +702,18 @@ OUString *ReplaceBackReferences( const SearchOptions& rSearchOpt, SwPaM* pPam )
     if( pPam && pPam->HasMark() &&
         SearchAlgorithms_REGEXP == rSearchOpt.algorithmType )
     {
-        const SwCntntNode* pTxtNode = pPam->GetCntntNode( true );
-        if( pTxtNode && pTxtNode->IsTxtNode() && pTxtNode == pPam->GetCntntNode( false ) )
+        const SwContentNode* pTextNode = pPam->GetContentNode( true );
+        if( pTextNode && pTextNode->IsTextNode() && pTextNode == pPam->GetContentNode( false ) )
         {
-            utl::TextSearch aSTxt( rSearchOpt );
-            const OUString& rStr = pTxtNode->GetTxtNode()->GetTxt();
+            utl::TextSearch aSText( rSearchOpt );
+            const OUString& rStr = pTextNode->GetTextNode()->GetText();
             sal_Int32 nStart = pPam->Start()->nContent.GetIndex();
             sal_Int32 nEnd = pPam->End()->nContent.GetIndex();
             SearchResult aResult;
-            if( aSTxt.SearchForward( rStr, &nStart, &nEnd, &aResult ) )
+            if( aSText.SearchForward( rStr, &nStart, &nEnd, &aResult ) )
             {
                 OUString aReplaceStr( rSearchOpt.replaceString );
-                aSTxt.ReplaceBackReferences( aReplaceStr, rStr, aResult );
+                aSText.ReplaceBackReferences( aReplaceStr, rStr, aResult );
                 pRet = new OUString( aReplaceStr );
             }
         }
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 95794338782f..a1cbabf2f112 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -44,27 +44,27 @@
 #include <xmloff/odffields.hxx>
 
 // for the dump "MSC-" compiler
-inline sal_Int32 GetSttOrEnd( bool bCondition, const SwCntntNode& rNd )
+inline sal_Int32 GetSttOrEnd( bool bCondition, const SwContentNode& rNd )
 {
     return bCondition ? 0 : rNd.Len();
 }
 
-SwPosition::SwPosition( const SwNodeIndex & rNodeIndex, const SwIndex & rCntnt )
-    : nNode( rNodeIndex ), nContent( rCntnt )
+SwPosition::SwPosition( const SwNodeIndex & rNodeIndex, const SwIndex & rContent )
+    : nNode( rNodeIndex ), nContent( rContent )
 {
 }
 
 SwPosition::SwPosition( const SwNodeIndex & rNodeIndex )
-    : nNode( rNodeIndex ), nContent( nNode.GetNode().GetCntntNode() )
+    : nNode( rNodeIndex ), nContent( nNode.GetNode().GetContentNode() )
 {
 }
 
 SwPosition::SwPosition( const SwNode& rNode )
-    : nNode( rNode ), nContent( nNode.GetNode().GetCntntNode() )
+    : nNode( rNode ), nContent( nNode.GetNode().GetContentNode() )
 {
 }
 
-SwPosition::SwPosition( SwCntntNode & rNode, const sal_Int32 nOffset )
+SwPosition::SwPosition( SwContentNode & rNode, const sal_Int32 nOffset )
     : nNode( rNode ), nContent( &rNode, nOffset )
 {
 }
@@ -279,22 +279,22 @@ bool CheckNodesRange( const SwNodeIndex& rStt,
 
 bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
 {
-    if( pNd->IsCntntNode() )
-        return static_cast<SwCntntNode*>(pNd)->GoNext( pIdx, nMode );
+    if( pNd->IsContentNode() )
+        return static_cast<SwContentNode*>(pNd)->GoNext( pIdx, nMode );
     return false;
 }
 
 bool GoPrevious( SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
 {
-    if( pNd->IsCntntNode() )
-        return static_cast<SwCntntNode*>(pNd)->GoPrevious( pIdx, nMode );
+    if( pNd->IsContentNode() )
+        return static_cast<SwContentNode*>(pNd)->GoPrevious( pIdx, nMode );
     return false;
 }
 
-SwCntntNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
+SwContentNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
 {
     SwNodeIndex aIdx( *pIdx );
-    SwCntntNode* pNd = aIdx.GetNodes().GoNext( &aIdx );
+    SwContentNode* pNd = aIdx.GetNodes().GoNext( &aIdx );
     if( pNd )
     {
         if( bChk && 1 != aIdx.GetIndex() - pIdx->GetIndex() &&
@@ -306,10 +306,10 @@ SwCntntNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
     return pNd;
 }
 
-SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, bool bChk )
+SwContentNode* GoPreviousNds( SwNodeIndex * pIdx, bool bChk )
 {
     SwNodeIndex aIdx( *pIdx );
-    SwCntntNode* pNd = SwNodes::GoPrevious( &aIdx );
+    SwContentNode* pNd = SwNodes::GoPrevious( &aIdx );
     if( pNd )
     {
         if( bChk && 1 != pIdx->GetIndex() - aIdx.GetIndex() &&
@@ -358,8 +358,8 @@ SwPaM::SwPaM( const SwNodeIndex& rMark, const SwNodeIndex& rPoint,
     {
         m_pPoint->nNode += nPointOffset;
     }
-    m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetCntntNode(), 0 );
-    m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetCntntNode(), 0 );
+    m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetContentNode(), 0 );
+    m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetContentNode(), 0 );
 }
 
 SwPaM::SwPaM( const SwNode& rMark, const SwNode& rPoint,
@@ -379,12 +379,12 @@ SwPaM::SwPaM( const SwNode& rMark, const SwNode& rPoint,
     {
         m_pPoint->nNode += nPointOffset;
     }
-    m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetCntntNode(), 0 );
-    m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetCntntNode(), 0 );
+    m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetContentNode(), 0 );
+    m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetContentNode(), 0 );
 }
 
-SwPaM::SwPaM( const SwNodeIndex& rMark, sal_Int32 nMarkCntnt,
-              const SwNodeIndex& rPoint, sal_Int32 nPointCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNodeIndex& rMark, sal_Int32 nMarkContent,
+              const SwNodeIndex& rPoint, sal_Int32 nPointContent, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rMark )
     , m_Bound2( rPoint )
@@ -392,12 +392,12 @@ SwPaM::SwPaM( const SwNodeIndex& rMark, sal_Int32 nMarkCntnt,
     , m_pMark( &m_Bound1 )
     , m_bIsInFrontOfLabel( false )
 {
-    m_pPoint->nContent.Assign( rPoint.GetNode().GetCntntNode(), nPointCntnt);
-    m_pMark ->nContent.Assign( rMark .GetNode().GetCntntNode(), nMarkCntnt );
+    m_pPoint->nContent.Assign( rPoint.GetNode().GetContentNode(), nPointContent);
+    m_pMark ->nContent.Assign( rMark .GetNode().GetContentNode(), nMarkContent );
 }
 
-SwPaM::SwPaM( const SwNode& rMark, sal_Int32 nMarkCntnt,
-              const SwNode& rPoint, sal_Int32 nPointCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNode& rMark, sal_Int32 nMarkContent,
+              const SwNode& rPoint, sal_Int32 nPointContent, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rMark )
     , m_Bound2( rPoint )
@@ -405,13 +405,13 @@ SwPaM::SwPaM( const SwNode& rMark, sal_Int32 nMarkCntnt,
     , m_pMark( &m_Bound1 )
     , m_bIsInFrontOfLabel( false )
 {
-    m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetCntntNode(),
-        nPointCntnt);
-    m_pMark ->nContent.Assign( m_pMark ->nNode.GetNode().GetCntntNode(),
-        nMarkCntnt );
+    m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetContentNode(),
+        nPointContent);
+    m_pMark ->nContent.Assign( m_pMark ->nNode.GetNode().GetContentNode(),
+        nMarkContent );
 }
 
-SwPaM::SwPaM( const SwNode& rNode, sal_Int32 nCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNode& rNode, sal_Int32 nContent, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rNode )
     , m_Bound2( m_Bound1.nNode.GetNode().GetNodes() ) // default initialize
@@ -419,11 +419,11 @@ SwPaM::SwPaM( const SwNode& rNode, sal_Int32 nCntnt, SwPaM* pRing )
     , m_pMark( &m_Bound1 )
     , m_bIsInFrontOfLabel( false )
 {
-    m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetCntntNode(),
-        nCntnt );
+    m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetContentNode(),
+        nContent );
 }
 
-SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, sal_Int32 nCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, sal_Int32 nContent, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rNodeIdx )
     , m_Bound2( rNodeIdx.GetNode().GetNodes() ) // default initialize
@@ -431,7 +431,7 @@ SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, sal_Int32 nCntnt, SwPaM* pRing )
     , m_pMark( &m_Bound1 )
     , m_bIsInFrontOfLabel( false )
 {
-    m_pPoint->nContent.Assign( rNodeIdx.GetNode().GetCntntNode(), nCntnt );
+    m_pPoint->nContent.Assign( rNodeIdx.GetNode().GetContentNode(), nContent );
 }
 
 SwPaM::~SwPaM() {}
@@ -543,12 +543,12 @@ SwPaM & SwPaM::Normalize(bool bPointFirst)
 /// return page number at cursor (for reader and page bound frames)
 sal_uInt16 SwPaM::GetPageNum( bool bAtPoint, const Point* pLayPos )
 {
-    const SwCntntFrm* pCFrm;
+    const SwContentFrm* pCFrm;
     const SwPageFrm *pPg;
-    const SwCntntNode *pNd ;
+    const SwContentNode *pNd ;
     const SwPosition* pPos = bAtPoint ? m_pPoint : m_pMark;
 
-    if( 0 != ( pNd = pPos->nNode.GetNode().GetCntntNode() ) &&
+    if( 0 != ( pNd = pPos->nNode.GetNode().GetContentNode() ) &&
         0 != ( pCFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), pLayPos, pPos, false )) &&
         0 != ( pPg = pCFrm->FindPageFrm() ))
         return pPg->GetPhyPageNum();
@@ -564,9 +564,9 @@ static const SwFrm* lcl_FindEditInReadonlyFrm( const SwFrm& rFrm )
     const SwSectionFrm* pSectionFrm;
 
     if( rFrm.IsInFly() &&
-       (pFly = rFrm.FindFlyFrm())->GetFmt()->GetEditInReadonly().GetValue() &&
+       (pFly = rFrm.FindFlyFrm())->GetFormat()->GetEditInReadonly().GetValue() &&
         pFly->Lower() &&
-       !pFly->Lower()->IsNoTxtFrm() )
+       !pFly->Lower()->IsNoTextFrm() )
     {
        pRet = pFly;
     }
@@ -585,8 +585,8 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
 {
     bool bRet = false;
 
-    const SwCntntNode* pNd = GetPoint()->nNode.GetNode().GetCntntNode();
-    const SwCntntFrm *pFrm = NULL;
+    const SwContentNode* pNd = GetPoint()->nNode.GetNode().GetContentNode();
+    const SwContentFrm *pFrm = NULL;
     if ( pNd != NULL )
     {
         Point aTmpPt;
@@ -618,7 +618,7 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
          && HasMark()
          && GetPoint()->nNode != GetMark()->nNode )
     {
-        pNd = GetMark()->nNode.GetNode().GetCntntNode();
+        pNd = GetMark()->nNode.GetNode().GetContentNode();
         pFrm = NULL;
         if ( pNd != NULL )
         {
@@ -668,20 +668,20 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
 
             // If a protected section should be between nodes, then the
             // selection needs to contain already x nodes.
-            // (TxtNd, SectNd, TxtNd, EndNd, TxtNd )
+            // (TextNd, SectNd, TextNd, EndNd, TextNd )
             if( nSttIdx + 3 < nEndIdx )
             {
-                const SwSectionFmts& rFmts = GetDoc()->GetSections();
-                for( SwSectionFmts::size_type n = rFmts.size(); n;  )
+                const SwSectionFormats& rFormats = GetDoc()->GetSections();
+                for( SwSectionFormats::size_type n = rFormats.size(); n;  )
                 {
-                    const SwSectionFmt* pFmt = rFmts[ --n ];
-                    if( pFmt->GetProtect().IsCntntProtected() )
+                    const SwSectionFormat* pFormat = rFormats[ --n ];
+                    if( pFormat->GetProtect().IsContentProtected() )
                     {
-                        const SwFmtCntnt& rCntnt = pFmt->GetCntnt(false);
-                        OSL_ENSURE( rCntnt.GetCntntIdx(), "where is the SectionNode?" );
-                        sal_uLong nIdx = rCntnt.GetCntntIdx()->GetIndex();
+                        const SwFormatContent& rContent = pFormat->GetContent(false);
+                        OSL_ENSURE( rContent.GetContentIdx(), "where is the SectionNode?" );
+                        sal_uLong nIdx = rContent.GetContentIdx()->GetIndex();
                         if( nSttIdx <= nIdx && nEndIdx >= nIdx &&
-                            rCntnt.GetCntntIdx()->GetNode().GetNodes().IsDocNodes() )
+                            rContent.GetContentIdx()->GetNode().GetNodes().IsDocNodes() )
                         {
                             bRet = true;
                             break;
@@ -729,7 +729,7 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
     // the 'comment anchor', unless the cursor is inside the annotation.
     if (!bRet && !bAnnotationMode)
     {
-        if (!pA && GetPoint() && GetPoint()->nNode.GetNode().IsTxtNode() && GetPoint()->nContent.GetIndex() > 0)
+        if (!pA && GetPoint() && GetPoint()->nNode.GetNode().IsTextNode() && GetPoint()->nContent.GetIndex() > 0)
         {
             // getFieldmarkFor() searches for >= start and < end, so check for
             // the previous character, to also get the fieldmark, if we're
@@ -749,25 +749,25 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
 /// left or the next is out of the area, then a null-pointer is returned.
 /// @param rbFirst If <true> than first time request. If so than the position of
 ///        the PaM must not be changed!
-SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
+SwContentNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
                       bool bInReadOnly )
 {
-    SwCntntNode * pNd = 0;
-    SwCntntFrm* pFrm;
+    SwContentNode * pNd = 0;
+    SwContentFrm* pFrm;
     if( ((*rPam.GetPoint()).*fnMove->fnCmpOp)( *rPam.GetMark() ) ||
         ( *rPam.GetPoint() == *rPam.GetMark() && rbFirst ) )
     {
         if( rbFirst )
         {
             rbFirst = false;
-            pNd = rPam.GetCntntNode();
+            pNd = rPam.GetContentNode();
             if( pNd )
             {
                 if(
                     (
                         0 == ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ) ||
                         ( !bInReadOnly && pFrm->IsProtected() ) ||
-                        (pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow())
+                        (pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsHiddenNow())
                     ) ||
                     ( !bInReadOnly && pNd->FindSectionNode() &&
                         pNd->FindSectionNode()->GetSection().IsProtect()
@@ -779,13 +779,13 @@ SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
             }
         }
 
-        if( !pNd ) // is the cursor not on a CntntNode?
+        if( !pNd ) // is the cursor not on a ContentNode?
         {
             SwPosition aPos( *rPam.GetPoint() );
             bool bSrchForward = fnMove == fnMoveForward;
             SwNodes& rNodes = aPos.nNode.GetNodes();
 
-            // go to next/previous CntntNode
+            // go to next/previous ContentNode
             while( true )
             {
                 pNd = bSrchForward
@@ -800,8 +800,8 @@ SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
                         // only in AutoTextSection can be nodes that are hidden
                         if( 0 == ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ) ||
                             ( !bInReadOnly && pFrm->IsProtected() ) ||
-                            ( pFrm->IsTxtFrm() &&
-                                static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow() ) )
+                            ( pFrm->IsTextFrm() &&
+                                static_cast<SwTextFrm*>(pFrm)->IsHiddenNow() ) )
                         {
                             pNd = 0;
                             continue;
@@ -824,7 +824,7 @@ void GoStartDoc( SwPosition * pPos )
     SwNodes& rNodes = pPos->nNode.GetNodes();
     pPos->nNode = *rNodes.GetEndOfContent().StartOfSectionNode();
     // we always need to find a ContentNode!
-    SwCntntNode* pCNd = rNodes.GoNext( &pPos->nNode );
+    SwContentNode* pCNd = rNodes.GoNext( &pPos->nNode );
     if( pCNd )
         pCNd->MakeStartIndex( &pPos->nContent );
 }
@@ -833,7 +833,7 @@ void GoEndDoc( SwPosition * pPos )
 {
     SwNodes& rNodes = pPos->nNode.GetNodes();
     pPos->nNode = rNodes.GetEndOfContent();
-    SwCntntNode* pCNd = GoPreviousNds( &pPos->nNode, true );
+    SwContentNode* pCNd = GoPreviousNds( &pPos->nNode, true );
     if( pCNd )
         pCNd->MakeEndIndex( &pPos->nContent );
 }
@@ -847,8 +847,8 @@ void GoStartSection( SwPosition * pPos )
         nLevel--;
     do { SwNodes::GoStartOfSection( &pPos->nNode ); } while( nLevel-- );
 
-    // already on a CntntNode
-    pPos->nNode.GetNode().GetCntntNode()->MakeStartIndex( &pPos->nContent );
+    // already on a ContentNode
+    pPos->nNode.GetNode().GetContentNode()->MakeStartIndex( &pPos->nContent );
 }
 
 /// go to the end of the current base section
@@ -861,9 +861,9 @@ void GoEndSection( SwPosition * pPos )
         nLevel--;
     do { SwNodes::GoEndOfSection( &pPos->nNode ); } while( nLevel-- );
 
-    // now on a EndNode, thus to the previous CntntNode
+    // now on a EndNode, thus to the previous ContentNode
     if( GoPreviousNds( &pPos->nNode, true ) )
-        pPos->nNode.GetNode().GetCntntNode()->MakeEndIndex( &pPos->nContent );
+        pPos->nNode.GetNode().GetContentNode()->MakeEndIndex( &pPos->nContent );
 }
 
 bool GoInDoc( SwPaM & rPam, SwMoveFn fnMove )
@@ -880,14 +880,14 @@ bool GoInSection( SwPaM & rPam, SwMoveFn fnMove )
 
 bool GoInNode( SwPaM & rPam, SwMoveFn fnMove )
 {
-    SwCntntNode *pNd = (*fnMove->fnNds)( &rPam.GetPoint()->nNode, true );
+    SwContentNode *pNd = (*fnMove->fnNds)( &rPam.GetPoint()->nNode, true );
     if( pNd )
         rPam.GetPoint()->nContent.Assign( pNd,
                         ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
     return pNd;
 }
 
-bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContent( SwPaM & rPam, SwMoveFn fnMove )
 {
     if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
                         &rPam.GetPoint()->nContent, CRSR_SKIP_CHARS ))
@@ -895,7 +895,7 @@ bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove )
     return GoInNode( rPam, fnMove );
 }
 
-bool GoInCntntCells( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContentCells( SwPaM & rPam, SwMoveFn fnMove )
 {
     if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
                          &rPam.GetPoint()->nContent, CRSR_SKIP_CELLS ))
@@ -903,7 +903,7 @@ bool GoInCntntCells( SwPaM & rPam, SwMoveFn fnMove )
     return GoInNode( rPam, fnMove );
 }
 
-bool GoInCntntSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContentSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
 {
     if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
                         &rPam.GetPoint()->nContent, CRSR_SKIP_CHARS | CRSR_SKIP_HIDDEN ) )
@@ -911,7 +911,7 @@ bool GoInCntntSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
     return GoInNode( rPam, fnMove );
 }
 
-bool GoInCntntCellsSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContentCellsSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
 {
     if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
                          &rPam.GetPoint()->nContent, CRSR_SKIP_CELLS | CRSR_SKIP_HIDDEN ) )
@@ -923,9 +923,9 @@ bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
 {
     if( rPam.Move( fnMoveBackward, fnGoNode ) )
     {
-        // always on a CntntNode
+        // always on a ContentNode
         SwPosition& rPos = *rPam.GetPoint();
-        SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
+        SwContentNode * pNd = rPos.nNode.GetNode().GetContentNode();
         rPos.nContent.Assign( pNd,
                             ::GetSttOrEnd( aPosPara == fnMoveForward, *pNd ) );
         return true;
@@ -936,7 +936,7 @@ bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
 bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
 {
     SwPosition& rPos = *rPam.GetPoint();
-    SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode * pNd = rPos.nNode.GetNode().GetContentNode();
     if( pNd )
     {
         const sal_Int32 nOld = rPos.nContent.GetIndex();
@@ -948,7 +948,7 @@ bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
             return true;
         }
     }
-    // move node to next/previous CntntNode
+    // move node to next/previous ContentNode
     if( ( aPosPara==fnParaStart && 0 != ( pNd =
             GoPreviousNds( &rPos.nNode, true ))) ||
         ( aPosPara==fnParaEnd && 0 != ( pNd =
@@ -965,9 +965,9 @@ bool GoNextPara( SwPaM & rPam, SwPosPara aPosPara )
 {
     if( rPam.Move( fnMoveForward, fnGoNode ) )
     {
-        // always on a CntntNode
+        // always on a ContentNode
         SwPosition& rPos = *rPam.GetPoint();
-        SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
+        SwContentNode * pNd = rPos.nNode.GetNode().GetContentNode();
         rPos.nContent.Assign( pNd,
                         ::GetSttOrEnd( aPosPara == fnMoveForward, *pNd ) );
         return true;
@@ -980,8 +980,8 @@ bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
     SwPosition& rPos = *rPam.GetPoint();
     SwPosition aSavePos( rPos ); // position for comparison
     (fnMove->fnSection)( &rPos.nNode );
-    SwCntntNode *pNd;
-    if( 0 == ( pNd = rPos.nNode.GetNode().GetCntntNode()) &&
+    SwContentNode *pNd;
+    if( 0 == ( pNd = rPos.nNode.GetNode().GetContentNode()) &&
         0 == ( pNd = (*fnMove->fnNds)( &rPos.nNode, true )) )
     {
         rPos = aSavePos; // do not change cursor
@@ -999,14 +999,14 @@ bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
     SwPosition aSavePos( rPos ); // position for comparison
     SwNodes::GoEndOfSection( &rPos.nNode );
 
-    // no other CntntNode existent?
-    if( !GoInCntnt( rPam, fnMoveForward ) )
+    // no other ContentNode existent?
+    if( !GoInContent( rPam, fnMoveForward ) )
     {
         rPos = aSavePos; // do not change cursor
         return false;
     }
     (fnMove->fnSection)( &rPos.nNode );
-    SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode *pNd = rPos.nNode.GetNode().GetContentNode();
     rPos.nContent.Assign( pNd,
                         ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
     return true;
@@ -1018,20 +1018,20 @@ bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
     SwPosition aSavePos( rPos ); // position for comparison
     SwNodes::GoStartOfSection( &rPos.nNode );
 
-    // no further CntntNode existent?
-    if( !GoInCntnt( rPam, fnMoveBackward ))
+    // no further ContentNode existent?
+    if( !GoInContent( rPam, fnMoveBackward ))
     {
         rPos = aSavePos; // do not change cursor
         return false;
     }
     (fnMove->fnSection)( &rPos.nNode );
-    SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode *pNd = rPos.nNode.GetNode().GetContentNode();
     rPos.nContent.Assign( pNd,
                             ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ));
     return true;
 }
 
-OUString SwPaM::GetTxt() const
+OUString SwPaM::GetText() const
 {
     OUString aResult;
 
@@ -1044,11 +1044,11 @@ OUString SwPaM::GetTxt() const
     for (;;)
     {
         const bool bIsEndNode = aNodeIndex == End()->nNode;
-        SwTxtNode * pTxtNode = aNodeIndex.GetNode().GetTxtNode();
+        SwTextNode * pTextNode = aNodeIndex.GetNode().GetTextNode();
 
-        if (pTxtNode != NULL)
+        if (pTextNode != NULL)
         {
-            const OUString aTmpStr = pTxtNode->GetTxt();
+            const OUString aTmpStr = pTextNode->GetText();
 
             if (bIsStartNode || bIsEndNode)
             {
@@ -1083,13 +1083,13 @@ OUString SwPaM::GetTxt() const
 void SwPaM::InvalidatePaM()
 {
     const SwNode &_pNd = this->GetNode();
-    const SwTxtNode *_pTxtNd = _pNd.GetTxtNode();
-    if (_pTxtNd != NULL)
+    const SwTextNode *_pTextNd = _pNd.GetTextNode();
+    if (_pTextNd != NULL)
     {
         // pretend that the PaM marks inserted text to recalc the portion...
-        SwInsTxt aHint( Start()->nContent.GetIndex(),
+        SwInsText aHint( Start()->nContent.GetIndex(),
                         End()->nContent.GetIndex() - Start()->nContent.GetIndex() + 1 );
-        SwModify *_pModify=(SwModify*)_pTxtNd;
+        SwModify *_pModify=(SwModify*)_pTextNd;
         _pModify->ModifyNotification( 0, &aHint);
     }
 }
diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx
index 4069a1225ce9..479fa12745d4 100644
--- a/sw/source/core/crsr/paminit.cxx
+++ b/sw/source/core/crsr/paminit.cxx
@@ -28,7 +28,7 @@ static SwMoveFnCollection aFwrd = {
     /* fnDoc        */  &GoEndDoc,
     /* fnSections   */  &GoEndSection,
     /* fnCmpOp      */  &SwPosition::operator<,
-    /* fnGetHint    */  &GetFrwrdTxtHint,
+    /* fnGetHint    */  &GetFrwrdTextHint,
     /* fnSearch     */  &utl::TextSearch::SearchForward,
     /* fnSection    */  &SwNodes::GoStartOfSection
 };
@@ -39,7 +39,7 @@ static SwMoveFnCollection aBwrd = {
     /* fnDoc        */  &GoStartDoc,
     /* fnSections   */  &GoStartSection,
     /* fnCmpOp      */  &SwPosition::operator>,
-    /* fnGetHint    */  &GetBkwrdTxtHint,
+    /* fnGetHint    */  &GetBkwrdTextHint,
     /* fnSearch     */  &utl::TextSearch::SearchBackward,
     /* fnSection    */  &SwNodes::GoEndOfSection
 };
@@ -47,10 +47,10 @@ static SwMoveFnCollection aBwrd = {
 SwGoInDoc fnGoDoc       = &GoInDoc;
 SwGoInDoc fnGoSection   = &GoInSection;
 SwGoInDoc fnGoNode      = &GoInNode;
-SwGoInDoc fnGoCntnt     = &GoInCntnt;
-SwGoInDoc fnGoCntntCells = &GoInCntntCells;
-SwGoInDoc fnGoCntntSkipHidden      = &GoInCntntSkipHidden;
-SwGoInDoc fnGoCntntCellsSkipHidden = &GoInCntntCellsSkipHidden;
+SwGoInDoc fnGoContent     = &GoInContent;
+SwGoInDoc fnGoContentCells = &GoInContentCells;
+SwGoInDoc fnGoContentSkipHidden      = &GoInContentSkipHidden;
+SwGoInDoc fnGoContentCellsSkipHidden = &GoInContentCellsSkipHidden;
 
 SwWhichPara fnParaPrev  = &GoPrevPara;
 SwWhichPara fnParaCurr  = &GoCurrPara;
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 1df0894774ed..9baa90101297 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -187,7 +187,7 @@ _SwCursor_SavePos* SwCursor::CreateNewSavePos() const
 }
 
 /// determine if point is outside of the node-array's content area
-bool SwCursor::IsNoCntnt() const
+bool SwCursor::IsNoContent() const
 {
     return GetPoint()->nNode.GetIndex() <
             GetDoc()->GetNodes().GetEndOfExtras().GetIndex();
@@ -210,7 +210,7 @@ bool SwTableCursor::IsSelOvrCheck(int eFlags)
         if( !CheckNodesRange( aOldPos, GetPoint()->nNode, true ))
         {
             GetPoint()->nNode = aOldPos;
-            GetPoint()->nContent.Assign( GetCntntNode(), GetSavePos()->nCntnt );
+            GetPoint()->nContent.Assign( GetContentNode(), GetSavePos()->nContent );
             return true;
         }
     }
@@ -219,12 +219,12 @@ bool SwTableCursor::IsSelOvrCheck(int eFlags)
 
 namespace
 {
-    const SwTxtAttr* InputFieldAtPos(SwPosition *pPos)
+    const SwTextAttr* InputFieldAtPos(SwPosition *pPos)
     {
-        SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-        if (!pTxtNd)
+        SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+        if (!pTextNd)
             return NULL;
-        return pTxtNd->GetTxtAttrAt(pPos->nContent.GetIndex(), RES_TXTATR_INPUTFIELD, SwTxtNode::PARENT);
+        return pTextNd->GetTextAttrAt(pPos->nContent.GetIndex(), RES_TXTATR_INPUTFIELD, SwTextNode::PARENT);
     }
 }
 
@@ -261,9 +261,9 @@ bool SwCursor::IsSelOvr( int eFlags )
 
             // set cursor to new position:
             SwNodeIndex aIdx( rPtIdx );
-            sal_Int32 nCntntPos = m_pSavePos->nCntnt;
+            sal_Int32 nContentPos = m_pSavePos->nContent;
             bool bGoNxt = m_pSavePos->nNode < rPtIdx.GetIndex();
-            SwCntntNode* pCNd = bGoNxt
+            SwContentNode* pCNd = bGoNxt
                 ? rNds.GoNextSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections)
                 : SwNodes::GoPrevSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections);
             if( !pCNd && ( nsSwCursorSelOverFlags::SELOVER_ENABLEREVDIREKTION & eFlags ))
@@ -279,12 +279,12 @@ bool SwCursor::IsSelOvr( int eFlags )
             if( !bValidNodesRange )
             {
                 rPtIdx = m_pSavePos->nNode;
-                if( 0 == ( pCNd = rPtIdx.GetNode().GetCntntNode() ) )
+                if( 0 == ( pCNd = rPtIdx.GetNode().GetContentNode() ) )
                 {
                     bIsValidPos = false;
-                    nCntntPos = 0;
+                    nContentPos = 0;
                     rPtIdx = aIdx;
-                    if( 0 == ( pCNd = rPtIdx.GetNode().GetCntntNode() ) )
+                    if( 0 == ( pCNd = rPtIdx.GetNode().GetContentNode() ) )
                     {
                         // then to the beginning of the document
                         rPtIdx = rNds.GetEndOfExtras();
@@ -294,7 +294,7 @@ bool SwCursor::IsSelOvr( int eFlags )
             }
 
             // register ContentIndex:
-            const sal_Int32 nTmpPos = bIsValidPos ? (bGoNxt ? 0 : pCNd->Len()) : nCntntPos;
+            const sal_Int32 nTmpPos = bIsValidPos ? (bGoNxt ? 0 : pCNd->Len()) : nContentPos;
             GetPoint()->nContent.Assign( pCNd, nTmpPos );
             if( !bIsValidPos || !bValidNodesRange ||
                 IsInProtectTable( true ) )
@@ -313,20 +313,20 @@ bool SwCursor::IsSelOvr( int eFlags )
                 nEndIdx = nTmp;
             }
 
-            const SwSectionFmts& rFmts = pDoc->GetSections();
-            for( SwSectionFmts::size_type n = 0; n < rFmts.size(); ++n )
+            const SwSectionFormats& rFormats = pDoc->GetSections();
+            for( SwSectionFormats::size_type n = 0; n < rFormats.size(); ++n )
             {
-                const SwSectionFmt* pFmt = rFmts[n];
-                const SvxProtectItem& rProtect = pFmt->GetProtect();
-                if( rProtect.IsCntntProtected() )
+                const SwSectionFormat* pFormat = rFormats[n];
+                const SvxProtectItem& rProtect = pFormat->GetProtect();
+                if( rProtect.IsContentProtected() )
                 {
-                    const SwFmtCntnt& rCntnt = pFmt->GetCntnt(false);
-                    OSL_ENSURE( rCntnt.GetCntntIdx(), "No SectionNode?" );
-                    sal_uLong nIdx = rCntnt.GetCntntIdx()->GetIndex();
+                    const SwFormatContent& rContent = pFormat->GetContent(false);
+                    OSL_ENSURE( rContent.GetContentIdx(), "No SectionNode?" );
+                    sal_uLong nIdx = rContent.GetContentIdx()->GetIndex();
                     if( nSttIdx <= nIdx && nEndIdx >= nIdx )
                     {
                         // if it is no linked section then we cannot select it
-                        const SwSection& rSect = *pFmt->GetSection();
+                        const SwSection& rSect = *pFormat->GetSection();
                         if( CONTENT_SECTION == rSect.GetType() )
                         {
                             RestoreSavePos();
@@ -339,9 +339,9 @@ bool SwCursor::IsSelOvr( int eFlags )
     }
 
     const SwNode* pNd = &GetPoint()->nNode.GetNode();
-    if( pNd->IsCntntNode() && !dynamic_cast<SwUnoCrsr*>(this) )
+    if( pNd->IsContentNode() && !dynamic_cast<SwUnoCrsr*>(this) )
     {
-        const SwCntntFrm* pFrm = static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+        const SwContentFrm* pFrm = static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
         if ( (nsSwCursorSelOverFlags::SELOVER_CHANGEPOS & eFlags)   //allowed to change position if it's a bad one
             && pFrm && pFrm->IsValid() && !pFrm->Frm().Height()     //a bad zero height position
             && !InputFieldAtPos(GetPoint()) )                       //unless it's a (vertical) input field
@@ -349,7 +349,7 @@ bool SwCursor::IsSelOvr( int eFlags )
             // skip to the next/prev valid paragraph with a layout
             SwNodeIndex& rPtIdx = GetPoint()->nNode;
             bool bGoNxt = m_pSavePos->nNode < rPtIdx.GetIndex();
-            while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextCntntFrm() : pFrm->GetPrevCntntFrm() ))
+            while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextContentFrm() : pFrm->GetPrevContentFrm() ))
                    && 0 == pFrm->Frm().Height() )
                 ;
 
@@ -358,18 +358,18 @@ bool SwCursor::IsSelOvr( int eFlags )
             if( !pFrm )
             {
                 bGoNxt = !bGoNxt;
-                pFrm = static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+                pFrm = static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
                 while ( pFrm && 0 == pFrm->Frm().Height() )
                 {
-                    pFrm = bGoNxt ? pFrm->GetNextCntntFrm()
-                        :   pFrm->GetPrevCntntFrm();
+                    pFrm = bGoNxt ? pFrm->GetNextContentFrm()
+                        :   pFrm->GetPrevContentFrm();
                 }
             }
 
-            SwCntntNode* pCNd = (pFrm != NULL) ? const_cast<SwCntntNode*>(pFrm->GetNode()) : NULL;
+            SwContentNode* pCNd = (pFrm != NULL) ? const_cast<SwContentNode*>(pFrm->GetNode()) : NULL;
             if ( pCNd != NULL )
             {
-                // set this CntntNode as new position
+                // set this ContentNode as new position
                 rPtIdx = *pCNd;
 
                 // assign corresponding ContentIndex
@@ -377,7 +377,7 @@ bool SwCursor::IsSelOvr( int eFlags )
                 GetPoint()->nContent.Assign( pCNd, nTmpPos );
 
                 if (rPtIdx.GetIndex() == m_pSavePos->nNode
-                    && nTmpPos == m_pSavePos->nCntnt)
+                    && nTmpPos == m_pSavePos->nContent)
                 {
                     // new position equals saved one
                     // --> trigger restore of saved pos by setting <pFrm> to NULL - see below
@@ -420,8 +420,8 @@ bool SwCursor::IsSelOvr( int eFlags )
         return true; // we need a frame
     }
 
-    if( (pNd = &GetMark()->nNode.GetNode())->IsCntntNode()
-        && !static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() )
+    if( (pNd = &GetMark()->nNode.GetNode())->IsContentNode()
+        && !static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() )
         && !dynamic_cast<SwUnoCrsr*>(this) )
     {
         DeleteMark();
@@ -431,10 +431,10 @@ bool SwCursor::IsSelOvr( int eFlags )
 
     // ensure that selection is only inside an InputField or contains the InputField completely
     {
-        const SwTxtAttr* pInputFldTxtAttrAtPoint = InputFieldAtPos(GetPoint());
-        const SwTxtAttr* pInputFldTxtAttrAtMark = InputFieldAtPos(GetMark());
+        const SwTextAttr* pInputFieldTextAttrAtPoint = InputFieldAtPos(GetPoint());
+        const SwTextAttr* pInputFieldTextAttrAtMark = InputFieldAtPos(GetMark());
 
-        if ( pInputFldTxtAttrAtPoint != pInputFldTxtAttrAtMark )
+        if ( pInputFieldTextAttrAtPoint != pInputFieldTextAttrAtMark )
         {
             const sal_uLong nRefNodeIdx =
                 ( nsSwCursorSelOverFlags::SELOVER_TOGGLE & eFlags )
@@ -442,27 +442,27 @@ bool SwCursor::IsSelOvr( int eFlags )
                 : GetMark()->nNode.GetIndex();
             const sal_Int32 nRefContentIdx =
                 ( nsSwCursorSelOverFlags::SELOVER_TOGGLE & eFlags )
-                ? m_pSavePos->nCntnt
+                ? m_pSavePos->nContent
                 : GetMark()->nContent.GetIndex();
             const bool bIsForwardSelection =
                 nRefNodeIdx < GetPoint()->nNode.GetIndex()
                 || ( nRefNodeIdx == GetPoint()->nNode.GetIndex()
                      && nRefContentIdx < GetPoint()->nContent.GetIndex() );
 
-            if ( pInputFldTxtAttrAtPoint != NULL )
+            if ( pInputFieldTextAttrAtPoint != NULL )
             {
                 const sal_Int32 nNewPointPos =
-                    bIsForwardSelection ? *(pInputFldTxtAttrAtPoint->End()) : pInputFldTxtAttrAtPoint->GetStart();
-                SwTxtNode* pTxtNdAtPoint = GetPoint()->nNode.GetNode().GetTxtNode();
-                GetPoint()->nContent.Assign( pTxtNdAtPoint, nNewPointPos );
+                    bIsForwardSelection ? *(pInputFieldTextAttrAtPoint->End()) : pInputFieldTextAttrAtPoint->GetStart();
+                SwTextNode* pTextNdAtPoint = GetPoint()->nNode.GetNode().GetTextNode();
+                GetPoint()->nContent.Assign( pTextNdAtPoint, nNewPointPos );
             }
 
-            if ( pInputFldTxtAttrAtMark != NULL )
+            if ( pInputFieldTextAttrAtMark != NULL )
             {
                 const sal_Int32 nNewMarkPos =
-                    bIsForwardSelection ? pInputFldTxtAttrAtMark->GetStart() : *(pInputFldTxtAttrAtMark->End());
-                SwTxtNode* pTxtNdAtMark = GetMark()->nNode.GetNode().GetTxtNode();
-                GetMark()->nContent.Assign( pTxtNdAtMark, nNewMarkPos );
+                    bIsForwardSelection ? pInputFieldTextAttrAtMark->GetStart() : *(pInputFieldTextAttrAtMark->End());
+                SwTextNode* pTextNdAtMark = GetMark()->nNode.GetNode().GetTextNode();
+                GetMark()->nContent.Assign( pTextNdAtMark, nNewMarkPos );
             }
         }
     }
@@ -492,12 +492,12 @@ bool SwCursor::IsSelOvr( int eFlags )
 
         do { // loop for table after table
             sal_uLong nSEIdx = pPtNd->EndOfSectionIndex();
-            sal_uLong nSttEndTbl = nSEIdx + 1;
+            sal_uLong nSttEndTable = nSEIdx + 1;
 
             if( bSelTop )
-                nSttEndTbl = rNds[ nSEIdx ]->StartOfSectionIndex() - 1;
+                nSttEndTable = rNds[ nSEIdx ]->StartOfSectionIndex() - 1;
 
-            GetPoint()->nNode = nSttEndTbl;
+            GetPoint()->nNode = nSttEndTable;
             const SwNode* pMyNd = &(GetNode());
 
             if( pMyNd->IsSectionNode() || ( pMyNd->IsEndNode() &&
@@ -516,7 +516,7 @@ bool SwCursor::IsSelOvr( int eFlags )
             }
 
             // we permit these
-            if( pMyNd->IsCntntNode() &&
+            if( pMyNd->IsContentNode() &&
                 ::CheckNodesRange( GetMark()->nNode,
                 GetPoint()->nNode, true ))
             {
@@ -526,7 +526,7 @@ bool SwCursor::IsSelOvr( int eFlags )
                     pMyNd = pOuterTableNd;
                 else
                 {
-                    SwCntntNode* pCNd = const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pMyNd));
+                    SwContentNode* pCNd = const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pMyNd));
                     GetPoint()->nContent.Assign( pCNd, bSelTop ? pCNd->Len() : 0 );
                     return false;
                 }
@@ -545,7 +545,7 @@ bool SwCursor::IsSelOvr( int eFlags )
 
 bool SwCursor::IsInProtectTable( bool bMove, bool bChgCrsr )
 {
-    SwCntntNode* pCNd = GetCntntNode();
+    SwContentNode* pCNd = GetContentNode();
     if( !pCNd )
         return false;
 
@@ -562,7 +562,7 @@ bool SwCursor::IsInProtectTable( bool bMove, bool bChgCrsr )
     bool bInCoveredCell = false;
     const SwStartNode* pTmpSttNode = pCNd->FindTableBoxStartNode();
     OSL_ENSURE( pTmpSttNode, "In table, therefore I expect to get a SwTableBoxStartNode" );
-    const SwTableBox* pBox = pTmpSttNode ? pTableNode->GetTable().GetTblBox( pTmpSttNode->GetIndex() ) : 0; //Robust #151355
+    const SwTableBox* pBox = pTmpSttNode ? pTableNode->GetTable().GetTableBox( pTmpSttNode->GetIndex() ) : 0; //Robust #151355
     if ( pBox && pBox->getRowSpan() < 1 ) // Robust #151270
         bInCoveredCell = true;
 
@@ -602,7 +602,7 @@ GoNextCell:
             if( !aCellStt.GetNode().IsStartNode() )
                 break;
             ++aCellStt;
-            if( 0 == ( pCNd = aCellStt.GetNode().GetCntntNode() ))
+            if( 0 == ( pCNd = aCellStt.GetNode().GetContentNode() ))
                 pCNd = aCellStt.GetNodes().GoNext( &aCellStt );
             if( !( bProt = pCNd->IsProtect() ))
                 break;
@@ -613,7 +613,7 @@ SetNextCrsr:
         if( !bProt ) // found free cell
         {
             GetPoint()->nNode = aCellStt;
-            SwCntntNode* pTmpCNd = GetCntntNode();
+            SwContentNode* pTmpCNd = GetContentNode();
             if( pTmpCNd )
             {
                 GetPoint()->nContent.Assign( pTmpCNd, 0 );
@@ -651,7 +651,7 @@ GoPrevCell:
             if( !( pNd = &aCellStt.GetNode())->IsEndNode() )
                 break;
             aCellStt.Assign( *pNd->StartOfSectionNode(), +1 );
-            if( 0 == ( pCNd = aCellStt.GetNode().GetCntntNode() ))
+            if( 0 == ( pCNd = aCellStt.GetNode().GetContentNode() ))
                 pCNd = pNd->GetNodes().GoNext( &aCellStt );
             if( !( bProt = pCNd->IsProtect() ))
                 break;
@@ -662,7 +662,7 @@ SetPrevCrsr:
         if( !bProt ) // found free cell
         {
             GetPoint()->nNode = aCellStt;
-            SwCntntNode* pTmpCNd = GetCntntNode();
+            SwContentNode* pTmpCNd = GetContentNode();
             if( pTmpCNd )
             {
                 GetPoint()->nContent.Assign( pTmpCNd, 0 );
@@ -695,7 +695,7 @@ bool SwCursor::IsAtValidPos( bool bPoint ) const
     const SwPosition* pPos = bPoint ? GetPoint() : GetMark();
     const SwNode* pNd = &pPos->nNode.GetNode();
 
-    if( pNd->IsCntntNode() && !static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
+    if( pNd->IsContentNode() && !static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
         !dynamic_cast<const SwUnoCrsr*>(this) )
     {
         return false;
@@ -717,7 +717,7 @@ bool SwCursor::IsAtValidPos( bool bPoint ) const
     return true;
 }
 
-void SwCursor::SaveTblBoxCntnt( const SwPosition* ) {}
+void SwCursor::SaveTableBoxContent( const SwPosition* ) {}
 
 /// set range for search in document
 SwMoveFnCollection* SwCursor::MakeFindRange( SwDocPositions nStart,
@@ -867,7 +867,7 @@ static bool lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
 
     SwNodes& rNds = rPam.GetDoc()->GetNodes();
     rPam.DeleteMark();
-    SwCntntNode* pCNd;
+    SwContentNode* pCNd;
     if( !bFirst )
     {
         rPam.GetPoint()->nNode = rSttNd;
@@ -899,7 +899,7 @@ static bool lcl_MakeSelBkwrd( const SwNode& rSttNd, const SwNode& rEndNd,
 
     SwNodes& rNds = rPam.GetDoc()->GetNodes();
     rPam.DeleteMark();
-    SwCntntNode* pCNd;
+    SwContentNode* pCNd;
     if( !bFirst )
     {
         rPam.GetPoint()->nNode = rSttNd;
@@ -1081,7 +1081,7 @@ sal_uLong SwCursor::FindAll( SwFindParas& rParas,
 void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
 {
     bool bIsStart = true;
-    SwCntntNode* pCNd = 0;
+    SwContentNode* pCNd = 0;
     SwNodes& rNds = GetDoc()->GetNodes();
 
     switch( ePos )
@@ -1162,13 +1162,13 @@ bool SwCursor::SelectWord( SwViewShell* pViewShell, const Point* pPt )
 bool SwCursor::IsStartWordWT( sal_Int16 nWordType ) const
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         const sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
         bRet = g_pBreakIt->GetBreakIter()->isBeginWord(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos )),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos )),
                             nWordType );
     }
     return bRet;
@@ -1177,13 +1177,13 @@ bool SwCursor::IsStartWordWT( sal_Int16 nWordType ) const
 bool SwCursor::IsEndWordWT( sal_Int16 nWordType ) const
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         const sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
         bRet = g_pBreakIt->GetBreakIter()->isEndWord(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                             nWordType );
 
     }
@@ -1193,13 +1193,13 @@ bool SwCursor::IsEndWordWT( sal_Int16 nWordType ) const
 bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         const sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
         Boundary aBoundary = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                             nWordType,
                             true );
 
@@ -1209,7 +1209,7 @@ bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
         if(bRet)
         {
             const CharClass& rCC = GetAppCharClass();
-            bRet = rCC.isLetterNumeric( pTxtNd->GetTxt(), aBoundary.startPos );
+            bRet = rCC.isLetterNumeric( pTextNd->GetText(), aBoundary.startPos );
         }
     }
     return bRet;
@@ -1218,7 +1218,7 @@ bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
 bool SwCursor::IsStartEndSentence( bool bEnd ) const
 {
     bool bRet = bEnd ?
-                    GetCntntNode() && GetPoint()->nContent == GetCntntNode()->Len() :
+                    GetContentNode() && GetPoint()->nContent == GetContentNode()->Len() :
                     GetPoint()->nContent.GetIndex() == 0;
 
     if( !bRet )
@@ -1234,18 +1234,18 @@ bool SwCursor::IsStartEndSentence( bool bEnd ) const
 bool SwCursor::GoStartWordWT( sal_Int16 nWordType )
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
         nPtPos = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                             nWordType,
                             false ).startPos;
 
-        if (nPtPos < pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+        if (nPtPos < pTextNd->GetText().getLength() && nPtPos >= 0)
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
@@ -1258,18 +1258,18 @@ bool SwCursor::GoStartWordWT( sal_Int16 nWordType )
 bool SwCursor::GoEndWordWT( sal_Int16 nWordType )
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
         nPtPos = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                             nWordType,
                             true ).endPos;
 
-        if (nPtPos <= pTxtNd->GetTxt().getLength() && nPtPos >= 0 &&
+        if (nPtPos <= pTextNd->GetText().getLength() && nPtPos >= 0 &&
             GetPoint()->nContent.GetIndex() != nPtPos )
         {
             GetPoint()->nContent = nPtPos;
@@ -1283,18 +1283,18 @@ bool SwCursor::GoEndWordWT( sal_Int16 nWordType )
 bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
 
         nPtPos = g_pBreakIt->GetBreakIter()->nextWord(
-                                pTxtNd->GetTxt(), nPtPos,
-            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos, 1 ) ),
+                                pTextNd->GetText(), nPtPos,
+            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos, 1 ) ),
                     nWordType ).startPos;
 
-        if (nPtPos < pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+        if (nPtPos < pTextNd->GetText().getLength() && nPtPos >= 0)
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
@@ -1307,8 +1307,8 @@ bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
 bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         SwCrsrSaveState aSave( *this );
         sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
@@ -1317,11 +1317,11 @@ bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
         if( nPtPos )
             --nPtPos;
         nPtPos = g_pBreakIt->GetBreakIter()->previousWord(
-                                pTxtNd->GetTxt(), nPtStart,
-            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos, 1 ) ),
+                                pTextNd->GetText(), nPtStart,
+            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos, 1 ) ),
                     nWordType ).startPos;
 
-        if (nPtPos < pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+        if (nPtPos < pTextNd->GetText().getLength() && nPtPos >= 0)
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
@@ -1346,8 +1346,8 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
         pLayout->GetCrsrOfst( GetPoint(), aPt );
     }
 
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
         // Should we select the whole fieldmark?
         const IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess( );
@@ -1374,8 +1374,8 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
         {
             sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
             Boundary aBndry( g_pBreakIt->GetBreakIter()->getWordBoundary(
-                                pTxtNd->GetTxt(), nPtPos,
-                                g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                                pTextNd->GetText(), nPtPos,
+                                g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                                 nWordType,
                                 bForward ));
 
@@ -1384,8 +1384,8 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
                 // nPtPos is the end of the paragraph, select the last word then.
                 --nPtPos;
                 aBndry = Boundary( g_pBreakIt->GetBreakIter()->getWordBoundary(
-                                    pTxtNd->GetTxt(), nPtPos,
-                                    g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                                    pTextNd->GetText(), nPtPos,
+                                    g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                                     nWordType,
                                     bForward ));
             }
@@ -1424,28 +1424,28 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
     return bRet;
 }
 
-static OUString lcl_MaskDeletedRedlines( const SwTxtNode* pTxtNd )
+static OUString lcl_MaskDeletedRedlines( const SwTextNode* pTextNd )
 {
     OUString aRes;
-    if (pTxtNd)
+    if (pTextNd)
     {
         //mask deleted redlines
-        OUString sNodeText(pTxtNd->GetTxt());
-        const SwDoc& rDoc = *pTxtNd->GetDoc();
+        OUString sNodeText(pTextNd->GetText());
+        const SwDoc& rDoc = *pTextNd->GetDoc();
         const bool nShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineMode() );
         if ( nShowChg )
         {
-            sal_uInt16 nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( *pTxtNd, USHRT_MAX );
-            for ( ; nAct < rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size(); nAct++ )
+            sal_uInt16 nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( *pTextNd, USHRT_MAX );
+            for ( ; nAct < rDoc.getIDocumentRedlineAccess().GetRedlineTable().size(); nAct++ )
             {
-                const SwRangeRedline* pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nAct ];
-                if ( pRed->Start()->nNode > pTxtNd->GetIndex() )
+                const SwRangeRedline* pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ];
+                if ( pRed->Start()->nNode > pTextNd->GetIndex() )
                     break;
 
                 if( nsRedlineType_t::REDLINE_DELETE == pRed->GetType() )
                 {
                     sal_Int32 nStart, nEnd;
-                    pRed->CalcStartEnd( pTxtNd->GetIndex(), nStart, nEnd );
+                    pRed->CalcStartEnd( pTextNd->GetIndex(), nStart, nEnd );
 
                     while ( nStart < nEnd && nStart < sNodeText.getLength() )
                         sNodeText = sNodeText.replaceAt( nStart++, 1, OUString(CH_TXTATR_INWORD) );
@@ -1460,10 +1460,10 @@ static OUString lcl_MaskDeletedRedlines( const SwTxtNode* pTxtNd )
 bool SwCursor::GoSentence( SentenceMoveType eMoveType )
 {
     bool bRet = false;
-    const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
-    if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+    const SwTextNode* pTextNd = GetNode().GetTextNode();
+    if( pTextNd && g_pBreakIt->GetBreakIter().is() )
     {
-        OUString sNodeText( lcl_MaskDeletedRedlines( pTxtNd ) );
+        OUString sNodeText( lcl_MaskDeletedRedlines( pTextNd ) );
 
         SwCrsrSaveState aSave( *this );
         sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
@@ -1473,22 +1473,22 @@ bool SwCursor::GoSentence( SentenceMoveType eMoveType )
             nPtPos = g_pBreakIt->GetBreakIter()->beginOfSentence(
                                     sNodeText,
                                     nPtPos, g_pBreakIt->GetLocale(
-                                            pTxtNd->GetLang( nPtPos ) ));
+                                            pTextNd->GetLang( nPtPos ) ));
             break;
         case END_SENT: /* when modifying: see also ExpandToSentenceBorders below! */
             nPtPos = g_pBreakIt->GetBreakIter()->endOfSentence(
                                     sNodeText,
                                     nPtPos, g_pBreakIt->GetLocale(
-                                                pTxtNd->GetLang( nPtPos ) ));
+                                                pTextNd->GetLang( nPtPos ) ));
             break;
         case NEXT_SENT:
             {
                 nPtPos = g_pBreakIt->GetBreakIter()->endOfSentence(
                                         sNodeText,
                                         nPtPos, g_pBreakIt->GetLocale(
-                                                    pTxtNd->GetLang( nPtPos ) ));
+                                                    pTextNd->GetLang( nPtPos ) ));
                 while (nPtPos>=0 && ++nPtPos < sNodeText.getLength()
-                       && sNodeText[nPtPos] == ' ' /*isWhiteSpace( aTxt.GetChar(nPtPos)*/ )
+                       && sNodeText[nPtPos] == ' ' /*isWhiteSpace( aText.GetChar(nPtPos)*/ )
                     ;
                 break;
             }
@@ -1496,20 +1496,20 @@ bool SwCursor::GoSentence( SentenceMoveType eMoveType )
             nPtPos = g_pBreakIt->GetBreakIter()->beginOfSentence(
                                     sNodeText,
                                     nPtPos, g_pBreakIt->GetLocale(
-                                                pTxtNd->GetLang( nPtPos ) ));
+                                                pTextNd->GetLang( nPtPos ) ));
             if (nPtPos == 0)
                 return false;   // the previous sentence is not in this paragraph
             if (nPtPos > 0)
                 nPtPos = g_pBreakIt->GetBreakIter()->beginOfSentence(
                                     sNodeText,
                                     nPtPos - 1, g_pBreakIt->GetLocale(
-                                                pTxtNd->GetLang( nPtPos ) ));
+                                                pTextNd->GetLang( nPtPos ) ));
             break;
         }
 
         // it is allowed to place the PaM just behind the last
         // character in the text thus <= ...Len
-        if (nPtPos <= pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+        if (nPtPos <= pTextNd->GetText().getLength() && nPtPos >= 0)
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
@@ -1522,8 +1522,8 @@ bool SwCursor::GoSentence( SentenceMoveType eMoveType )
 bool SwCursor::ExpandToSentenceBorders()
 {
     bool bRes = false;
-    const SwTxtNode* pStartNd = Start()->nNode.GetNode().GetTxtNode();
-    const SwTxtNode* pEndNd   = End()->nNode.GetNode().GetTxtNode();
+    const SwTextNode* pStartNd = Start()->nNode.GetNode().GetTextNode();
+    const SwTextNode* pEndNd   = End()->nNode.GetNode().GetTextNode();
     if (pStartNd && pEndNd && g_pBreakIt->GetBreakIter().is())
     {
         if (!HasMark())
@@ -1546,12 +1546,12 @@ bool SwCursor::ExpandToSentenceBorders()
         // it is allowed to place the PaM just behind the last
         // character in the text thus <= ...Len
         bool bChanged = false;
-        if (nStartPos <= pStartNd->GetTxt().getLength() && nStartPos >= 0)
+        if (nStartPos <= pStartNd->GetText().getLength() && nStartPos >= 0)
         {
             GetMark()->nContent = nStartPos;
             bChanged = true;
         }
-        if (nEndPos <= pEndNd->GetTxt().getLength() && nEndPos >= 0)
+        if (nEndPos <= pEndNd->GetText().getLength() && nEndPos >= 0)
         {
             GetPoint()->nContent = nEndPos;
             bChanged = true;
@@ -1570,17 +1570,17 @@ bool SwTableCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 /*nMode*/
 }
 
 // calculate cursor bidi level: extracted from LeftRight()
-const SwCntntFrm*
+const SwContentFrm*
 SwCursor::DoSetBidiLevelLeftRight(
     bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr)
 {
     // calculate cursor bidi level
-    const SwCntntFrm* pSttFrm = NULL;
+    const SwContentFrm* pSttFrm = NULL;
     SwNode& rNode = GetPoint()->nNode.GetNode();
 
-    if( rNode.IsTxtNode() )
+    if( rNode.IsTextNode() )
     {
-        const SwTxtNode& rTNd = *rNode.GetTxtNode();
+        const SwTextNode& rTNd = *rNode.GetTextNode();
         SwIndex& rIdx = GetPoint()->nContent;
         sal_Int32 nPos = rIdx.GetIndex();
 
@@ -1597,7 +1597,7 @@ SwCursor::DoSetBidiLevelLeftRight(
             {
                 sal_uInt8 nCrsrLevel = GetCrsrBidiLevel();
                 bool bForward = ! io_rbLeft;
-                const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pSttFrm))->PrepareVisualMove( nPos, nCrsrLevel,
+                const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pSttFrm))->PrepareVisualMove( nPos, nCrsrLevel,
                                                          bForward, bInsertCrsr );
                 rIdx = nPos;
                 SetCrsrBidiLevel( nCrsrLevel );
@@ -1624,7 +1624,7 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
 {
     // calculate cursor bidi level
     SwNode& rNode = GetPoint()->nNode.GetNode();
-    const SwCntntFrm* pSttFrm = // may side-effect bLeft!
+    const SwContentFrm* pSttFrm = // may side-effect bLeft!
         DoSetBidiLevelLeftRight(bLeft, bVisualAllowed, bInsertCrsr);
 
     // can the cursor be moved n times?
@@ -1633,9 +1633,9 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
 
     SwGoInDoc fnGo;
     if ( bSkipHidden )
-        fnGo = CRSR_SKIP_CELLS == nMode ? fnGoCntntCellsSkipHidden : fnGoCntntSkipHidden;
+        fnGo = CRSR_SKIP_CELLS == nMode ? fnGoContentCellsSkipHidden : fnGoContentSkipHidden;
     else
-        fnGo = CRSR_SKIP_CELLS == nMode ? fnGoCntntCells : fnGoCntnt;
+        fnGo = CRSR_SKIP_CELLS == nMode ? fnGoContentCells : fnGoContent;
 
     while( nCnt )
     {
@@ -1663,7 +1663,7 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
             if ( bCellChanged )
             {
                 // Set cursor to start/end of covered cell:
-                SwTableBox* pTableBox = pOldTabBoxSttNode->GetTblBox();
+                SwTableBox* pTableBox = pOldTabBoxSttNode->GetTableBox();
                 if ( pTableBox && pTableBox->getRowSpan() > 1 )
                 {
                     pTableBox = & pTableBox->FindEndOfRowSpan(
@@ -1674,10 +1674,10 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
                     rPtIdx = aNewIdx;
 
                     GetDoc()->GetNodes().GoNextSection( &rPtIdx, false, false );
-                    SwCntntNode* pCntntNode = GetCntntNode();
-                    if ( pCntntNode )
+                    SwContentNode* pContentNode = GetContentNode();
+                    if ( pContentNode )
                     {
-                        GetPoint()->nContent.Assign( pCntntNode, bLeft ? pCntntNode->Len() : 0 );
+                        GetPoint()->nContent.Assign( pContentNode, bLeft ? pContentNode->Len() : 0 );
 
                         // Redo the move:
                         if ( !Move( fnMove, fnGo ) )
@@ -1693,24 +1693,24 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
         const SwNode* pTableBoxStartNode = GetPoint()->nNode.GetNode().FindTableBoxStartNode();
         if ( pTableBoxStartNode )
         {
-            const SwTableBox* pTableBox = pTableBoxStartNode->GetTblBox();
+            const SwTableBox* pTableBox = pTableBoxStartNode->GetTableBox();
             if ( pTableBox && pTableBox->getRowSpan() < 1 )
             {
                 // Store the row span offset:
                 m_nRowSpanOffset = pTableBox->getRowSpan();
 
                 // Move cursor to non-covered cell:
-                const SwTableNode* pTblNd = pTableBoxStartNode->FindTableNode();
-                pTableBox = & pTableBox->FindStartOfRowSpan( pTblNd->GetTable(), USHRT_MAX );
+                const SwTableNode* pTableNd = pTableBoxStartNode->FindTableNode();
+                pTableBox = & pTableBox->FindStartOfRowSpan( pTableNd->GetTable(), USHRT_MAX );
                  SwNodeIndex& rPtIdx = GetPoint()->nNode;
                 SwNodeIndex aNewIdx( *pTableBox->GetSttNd() );
                 rPtIdx = aNewIdx;
 
                 GetDoc()->GetNodes().GoNextSection( &rPtIdx, false, false );
-                SwCntntNode* pCntntNode = GetCntntNode();
-                if ( pCntntNode )
+                SwContentNode* pContentNode = GetContentNode();
+                if ( pContentNode )
                 {
-                    GetPoint()->nContent.Assign( pCntntNode, bLeft ? pCntntNode->Len() : 0 );
+                    GetPoint()->nContent.Assign( pContentNode, bLeft ? pContentNode->Len() : 0 );
                 }
             }
         }
@@ -1721,10 +1721,10 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
     if ( pSttFrm )
     {
         SwNode& rTmpNode = GetPoint()->nNode.GetNode();
-        if ( &rTmpNode != &rNode && rTmpNode.IsTxtNode() )
+        if ( &rTmpNode != &rNode && rTmpNode.IsTextNode() )
         {
             Point aPt;
-            const SwCntntFrm* pEndFrm = rTmpNode.GetTxtNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+            const SwContentFrm* pEndFrm = rTmpNode.GetTextNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
             if ( pEndFrm )
             {
                 if ( ! pEndFrm->IsRightToLeft() != ! pSttFrm->IsRightToLeft() )
@@ -1747,16 +1747,16 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
 void SwCursor::DoSetBidiLevelUpDown()
 {
     SwNode& rNode = GetPoint()->nNode.GetNode();
-    if ( rNode.IsTxtNode() )
+    if ( rNode.IsTextNode() )
     {
         const SwScriptInfo* pSI =
-            SwScriptInfo::GetScriptInfo( *rNode.GetTxtNode() );
+            SwScriptInfo::GetScriptInfo( *rNode.GetTextNode() );
         if ( pSI )
         {
             SwIndex& rIdx = GetPoint()->nContent;
             const sal_Int32 nPos = rIdx.GetIndex();
 
-            if (nPos && nPos < rNode.GetTxtNode()->GetTxt().getLength())
+            if (nPos && nPos < rNode.GetTextNode()->GetText().getLength())
             {
                 const sal_uInt8 nCurrLevel = pSI->DirType( nPos );
                 const sal_uInt8 nPrevLevel = pSI->DirType( nPos - 1 );
@@ -1776,12 +1776,12 @@ void SwCursor::DoSetBidiLevelUpDown()
 bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
                             Point* pPt, long nUpDownX )
 {
-    SwTableCursor* pTblCrsr = dynamic_cast<SwTableCursor*>(this);
+    SwTableCursor* pTableCrsr = dynamic_cast<SwTableCursor*>(this);
     bool bAdjustTableCrsr = false;
 
     // If the point/mark of the table cursor in the same box then set cursor to
     // beginning of the box
-    if( pTblCrsr && GetNode( true ).StartOfSectionNode() ==
+    if( pTableCrsr && GetNode( true ).StartOfSectionNode() ==
                     GetNode( false ).StartOfSectionNode() )
     {
         if ( End() != GetPoint() )
@@ -1793,7 +1793,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
     Point aPt;
     if( pPt )
         aPt = *pPt;
-    SwCntntFrm* pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+    SwContentFrm* pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
 
     if( pFrm )
     {
@@ -1811,7 +1811,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
         }
 
         // It is allowed to move footnotes in other footnotes but not sections
-        const bool bChkRange = !pFrm->IsInFtn() || HasMark();
+        const bool bChkRange = !pFrm->IsInFootnote() || HasMark();
         const SwPosition aOldPos( *GetPoint() );
         const bool bInReadOnly = IsReadOnlyAvailable();
 
@@ -1821,15 +1821,15 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
             // than one paragraph. If we want to go down, we have to set the
             // point to the last frame in the table box. This is only necessary
             // if we do not already have a table selection
-            const SwStartNode* pTblNd = GetNode( true ).FindTableBoxStartNode();
-            OSL_ENSURE( pTblNd, "pTblCrsr without SwTableNode?" );
+            const SwStartNode* pTableNd = GetNode( true ).FindTableBoxStartNode();
+            OSL_ENSURE( pTableNd, "pTableCrsr without SwTableNode?" );
 
-            if ( pTblNd ) // safety first
+            if ( pTableNd ) // safety first
             {
-                const SwNode* pEndNd = pTblNd->EndOfSectionNode();
+                const SwNode* pEndNd = pTableNd->EndOfSectionNode();
                 GetPoint()->nNode = *pEndNd;
-                pTblCrsr->Move( fnMoveBackward, fnGoNode );
-                   pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+                pTableCrsr->Move( fnMoveBackward, fnGoNode );
+                   pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
             }
         }
 
@@ -1838,7 +1838,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
                     : pFrm->UnitDown( this, nUpDownX, bInReadOnly ) ) &&
                 CheckNodesRange( aOldPos.nNode, GetPoint()->nNode, bChkRange ))
         {
-               pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+               pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
             --nCnt;
         }
 
@@ -1846,10 +1846,10 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
         if( !nCnt && !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                                 nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
         {
-            if( !pTblCrsr )
+            if( !pTableCrsr )
             {
                 // try to position the cursor at half of the char-rect's height
-                pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+                pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
                 SwCrsrMoveState eTmpState( MV_UPDOWN );
                 eTmpState.bSetInReadOnly = bInReadOnly;
                 SwRect aTmpRect;
@@ -1881,7 +1881,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 bool SwCursor::LeftRightMargin( bool bLeft, bool bAPI )
 {
     Point aPt;
-    SwCntntFrm * pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+    SwContentFrm * pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
 
     // calculate cursor bidi level
     if ( pFrm )
@@ -1897,7 +1897,7 @@ bool SwCursor::IsAtLeftRightMargin( bool bLeft, bool bAPI ) const
 {
     bool bRet = false;
     Point aPt;
-    SwCntntFrm * pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+    SwContentFrm * pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
     if( pFrm )
     {
         SwPaM aPam( *GetPoint() );
@@ -1916,7 +1916,7 @@ bool SwCursor::SttEndDoc( bool bStt )
     // Never jump over section boundaries during selection!
     // Can the cursor still moved on?
     SwMoveFn fnMove = bStt ? fnMoveBackward : fnMoveForward;
-    bool bRet = (!HasMark() || !IsNoCntnt() ) &&
+    bool bRet = (!HasMark() || !IsNoContent() ) &&
                     Move( fnMove, fnGoDoc ) &&
                     !IsInProtectTable( true ) &&
                     !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
@@ -1927,8 +1927,8 @@ bool SwCursor::SttEndDoc( bool bStt )
 
 bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
 {
-    const SwTableNode* pTblNd = GetPoint()->nNode.GetNode().FindTableNode();
-    if( !pTblNd )
+    const SwTableNode* pTableNd = GetPoint()->nNode.GetNode().FindTableNode();
+    if( !pTableNd )
         return false;
 
     // If there is another EndNode in front of the cell's StartNode then there
@@ -1939,7 +1939,7 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
     while( nCnt-- )
     {
         const SwNode* pTableBoxStartNode = rPtIdx.GetNode().FindTableBoxStartNode();
-        const SwTableBox* pTableBox = pTableBoxStartNode->GetTblBox();
+        const SwTableBox* pTableBox = pTableBoxStartNode->GetTableBox();
 
         // Check if we have to move the cursor to a covered cell before
         // proceeding:
@@ -1947,7 +1947,7 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
         {
             if ( pTableBox && pTableBox->getRowSpan() > 1 )
             {
-                pTableBox = & pTableBox->FindEndOfRowSpan( pTblNd->GetTable(),
+                pTableBox = & pTableBox->FindEndOfRowSpan( pTableNd->GetTable(),
                     static_cast<sal_uInt16>(pTableBox->getRowSpan() + m_nRowSpanOffset));
                 SwNodeIndex aNewIdx( *pTableBox->GetSttNd() );
                 rPtIdx = aNewIdx;
@@ -1968,21 +1968,21 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
         rPtIdx = bNext ? aCellIdx : SwNodeIndex(*aCellIdx.GetNode().StartOfSectionNode());
 
         pTableBoxStartNode = rPtIdx.GetNode().FindTableBoxStartNode();
-        pTableBox = pTableBoxStartNode->GetTblBox();
+        pTableBox = pTableBoxStartNode->GetTableBox();
         if ( pTableBox && pTableBox->getRowSpan() < 1 )
         {
             m_nRowSpanOffset = pTableBox->getRowSpan();
             // move cursor to non-covered cell:
-            pTableBox = & pTableBox->FindStartOfRowSpan( pTblNd->GetTable(), USHRT_MAX );
+            pTableBox = & pTableBox->FindStartOfRowSpan( pTableNd->GetTable(), USHRT_MAX );
             SwNodeIndex aNewIdx( *pTableBox->GetSttNd() );
             rPtIdx = aNewIdx;
         }
     }
 
     ++rPtIdx;
-    if( !rPtIdx.GetNode().IsCntntNode() )
+    if( !rPtIdx.GetNode().IsContentNode() )
         GetDoc()->GetNodes().GoNextSection( &rPtIdx, true, false );
-    GetPoint()->nContent.Assign( GetCntntNode(), 0 );
+    GetPoint()->nContent.Assign( GetContentNode(), 0 );
 
     return !IsInProtectTable( true );
 }
@@ -1997,35 +1997,35 @@ bool SwCursor::GotoTable( const OUString& rName )
     bool bRet = false;
     if ( !HasMark() )
     {
-        SwTable* pTmpTbl = SwTable::FindTable( GetDoc()->FindTblFmtByName( rName ) );
-        if( pTmpTbl )
+        SwTable* pTmpTable = SwTable::FindTable( GetDoc()->FindTableFormatByName( rName ) );
+        if( pTmpTable )
         {
             // a table in a normal nodes array
             SwCrsrSaveState aSave( *this );
-            GetPoint()->nNode = *pTmpTbl->GetTabSortBoxes()[ 0 ]->
+            GetPoint()->nNode = *pTmpTable->GetTabSortBoxes()[ 0 ]->
                                 GetSttNd()->FindTableNode();
-            Move( fnMoveForward, fnGoCntnt );
+            Move( fnMoveForward, fnGoContent );
             bRet = !IsSelOvr();
         }
     }
     return bRet;
 }
 
-bool SwCursor::GotoTblBox( const OUString& rName )
+bool SwCursor::GotoTableBox( const OUString& rName )
 {
     bool bRet = false;
-    const SwTableNode* pTblNd = GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    const SwTableNode* pTableNd = GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         // retrieve box by name
-        const SwTableBox* pTblBox = pTblNd->GetTable().GetTblBox( rName );
-        if( pTblBox && pTblBox->GetSttNd() &&
-            ( !pTblBox->GetFrmFmt()->GetProtect().IsCntntProtected() ||
+        const SwTableBox* pTableBox = pTableNd->GetTable().GetTableBox( rName );
+        if( pTableBox && pTableBox->GetSttNd() &&
+            ( !pTableBox->GetFrameFormat()->GetProtect().IsContentProtected() ||
               IsReadOnlyAvailable() ) )
         {
             SwCrsrSaveState aSave( *this );
-            GetPoint()->nNode = *pTblBox->GetSttNd();
-            Move( fnMoveForward, fnGoCntnt );
+            GetPoint()->nNode = *pTableBox->GetSttNd();
+            Move( fnMoveForward, fnGoContent );
             bRet = !IsSelOvr();
         }
     }
@@ -2043,19 +2043,19 @@ bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
         // If fnWhichPara == fnParaCurr then (*fnWhichPara)( *this, fnPosPara )
         // can already move the cursor to a different text node. In this case
         // we better check if IsSelOvr().
-        const SwCntntNode* pCntntNd = pNd->GetCntntNode();
-        if ( pCntntNd )
+        const SwContentNode* pContentNd = pNd->GetContentNode();
+        if ( pContentNd )
         {
-            const sal_Int32 nSttEnd = fnPosPara == fnMoveForward ? 0 : pCntntNd->Len();
+            const sal_Int32 nSttEnd = fnPosPara == fnMoveForward ? 0 : pContentNd->Len();
             if ( GetPoint()->nContent.GetIndex() != nSttEnd )
                 bShortCut = true;
         }
     }
     else
     {
-        if ( pNd->IsTxtNode() &&
+        if ( pNd->IsTextNode() &&
              pNd->GetNodes()[ pNd->GetIndex() +
-                    (fnWhichPara == fnParaNext ? 1 : -1 ) ]->IsTxtNode() )
+                    (fnWhichPara == fnParaNext ? 1 : -1 ) ]->IsTextNode() )
             bShortCut = true;
     }
 
@@ -2094,17 +2094,17 @@ void SwCursor::RestoreSavePos()
         GetPoint()->nNode = m_pSavePos->nNode;
 
         sal_Int32 nIdx = 0;
-        if ( GetCntntNode() )
+        if ( GetContentNode() )
         {
-            if (m_pSavePos->nCntnt <= GetCntntNode()->Len())
-                nIdx = m_pSavePos->nCntnt;
+            if (m_pSavePos->nContent <= GetContentNode()->Len())
+                nIdx = m_pSavePos->nContent;
             else
             {
-                nIdx = GetCntntNode()->Len();
+                nIdx = GetContentNode()->Len();
                 OSL_FAIL("SwCursor::RestoreSavePos: invalid content index");
             }
         }
-        GetPoint()->nContent.Assign( GetCntntNode(), nIdx );
+        GetPoint()->nContent.Assign( GetContentNode(), nIdx );
     }
 }
 
@@ -2113,8 +2113,8 @@ SwTableCursor::SwTableCursor( const SwPosition &rPos, SwPaM* pRing )
 {
     m_bParked = false;
     m_bChanged = false;
-    m_nTblPtNd = 0, m_nTblMkNd = 0;
-    m_nTblPtCnt = 0, m_nTblMkCnt = 0;
+    m_nTablePtNd = 0, m_nTableMkNd = 0;
+    m_nTablePtCnt = 0, m_nTableMkCnt = 0;
 }
 
 SwTableCursor::~SwTableCursor() {}
@@ -2185,22 +2185,22 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
             {
                 SwNodeIndex aIdx( *pSttNd, 1 );
                 const SwNode* pNd = &aIdx.GetNode();
-                if( !pNd->IsCntntNode() )
+                if( !pNd->IsContentNode() )
                     pNd = rNds.GoNextSection( &aIdx, true, false );
 
                 SwPosition* pPos = pCur->GetMark();
                 if( pNd != &pPos->nNode.GetNode() )
                     pPos->nNode = *pNd;
-                pPos->nContent.Assign( const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd)), 0 );
+                pPos->nContent.Assign( const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd)), 0 );
 
                 aIdx.Assign( *pSttNd->EndOfSectionNode(), - 1 );
-                if( !( pNd = &aIdx.GetNode())->IsCntntNode() )
+                if( !( pNd = &aIdx.GetNode())->IsContentNode() )
                     pNd = SwNodes::GoPrevSection( &aIdx, true, false );
 
                 pPos = pCur->GetPoint();
                 if (pNd && pNd != &pPos->nNode.GetNode())
                     pPos->nNode = *pNd;
-                pPos->nContent.Assign(const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd)), pNd ? static_cast<const SwCntntNode*>(pNd)->Len() : 0);
+                pPos->nContent.Assign(const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd)), pNd ? static_cast<const SwContentNode*>(pNd)->Len() : 0);
 
                 aTmp.erase( aTmp.begin() + nPos );
             }
@@ -2227,30 +2227,30 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
             if( &aIdx.GetNodes() != &rNds )
                 break;
             SwNode* pNd = &aIdx.GetNode();
-            if( !pNd->IsCntntNode() )
+            if( !pNd->IsContentNode() )
                 pNd = rNds.GoNextSection( &aIdx, true, false );
 
             SwPaM *const pNew = (!pAktCrsr->IsMultiSelection() && !pAktCrsr->HasMark())
                 ? pAktCrsr
                 : pAktCrsr->Create( pAktCrsr );
             pNew->GetPoint()->nNode = *pNd;
-            pNew->GetPoint()->nContent.Assign( static_cast<SwCntntNode*>(pNd), 0 );
+            pNew->GetPoint()->nContent.Assign( static_cast<SwContentNode*>(pNd), 0 );
             pNew->SetMark();
 
             SwPosition* pPos = pNew->GetPoint();
             pPos->nNode.Assign( *pSttNd->EndOfSectionNode(), - 1 );
-            if( !( pNd = &pPos->nNode.GetNode())->IsCntntNode() )
+            if( !( pNd = &pPos->nNode.GetNode())->IsContentNode() )
                 pNd = SwNodes::GoPrevSection( &pPos->nNode, true, false );
 
-            pPos->nContent.Assign(static_cast<SwCntntNode*>(pNd), pNd ? static_cast<SwCntntNode*>(pNd)->Len() : 0);
+            pPos->nContent.Assign(static_cast<SwContentNode*>(pNd), pNd ? static_cast<SwContentNode*>(pNd)->Len() : 0);
         }
     }
     return pAktCrsr;
 }
 
-void SwTableCursor::InsertBox( const SwTableBox& rTblBox )
+void SwTableCursor::InsertBox( const SwTableBox& rTableBox )
 {
-    SwTableBox* pBox = const_cast<SwTableBox*>(&rTblBox);
+    SwTableBox* pBox = const_cast<SwTableBox*>(&rTableBox);
     m_SelectedBoxes.insert(pBox);
     m_bChanged = true;
 }
@@ -2264,8 +2264,8 @@ void SwTableCursor::DeleteBox(size_t const nPos)
 bool SwTableCursor::NewTableSelection()
 {
     bool bRet = false;
-    const SwNode *pStart = GetCntntNode()->FindTableBoxStartNode();
-    const SwNode *pEnd = GetCntntNode(false)->FindTableBoxStartNode();
+    const SwNode *pStart = GetContentNode()->FindTableBoxStartNode();
+    const SwNode *pEnd = GetContentNode(false)->FindTableBoxStartNode();
     if( pStart && pEnd )
     {
         const SwTableNode *pTableNode = pStart->FindTableNode();
@@ -2317,15 +2317,15 @@ void SwTableCursor::ActualizeSelection( const SwSelBoxes &rNew )
     }
 }
 
-bool SwTableCursor::IsCrsrMovedUpdt()
+bool SwTableCursor::IsCrsrMovedUpdate()
 {
     if( !IsCrsrMoved() )
         return false;
 
-    m_nTblMkNd = GetMark()->nNode.GetIndex();
-    m_nTblPtNd = GetPoint()->nNode.GetIndex();
-    m_nTblMkCnt = GetMark()->nContent.GetIndex();
-    m_nTblPtCnt = GetPoint()->nContent.GetIndex();
+    m_nTableMkNd = GetMark()->nNode.GetIndex();
+    m_nTablePtNd = GetPoint()->nNode.GetIndex();
+    m_nTableMkCnt = GetMark()->nContent.GetIndex();
+    m_nTablePtCnt = GetPoint()->nContent.GetIndex();
     return true;
 }
 
@@ -2354,7 +2354,7 @@ bool SwTableCursor::HasReadOnlyBoxSel() const
     bool bRet = false;
     for (size_t n = m_SelectedBoxes.size(); n; )
     {
-        if (m_SelectedBoxes[--n]->GetFrmFmt()->GetProtect().IsCntntProtected())
+        if (m_SelectedBoxes[--n]->GetFrameFormat()->GetProtect().IsContentProtected())
         {
             bRet = true;
             break;
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index ffd22a28cd78..e5b5c865fdb5 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -44,22 +44,22 @@ SwLayoutFrm* GetPrevColumn( const SwLayoutFrm* pLayFrm )
     return pActCol ? static_cast<SwLayoutFrm*>(pActCol->GetPrev()) : 0;
 }
 
-SwCntntFrm* GetColumnStt( const SwLayoutFrm* pColFrm )
+SwContentFrm* GetColumnStt( const SwLayoutFrm* pColFrm )
 {
-    return pColFrm ? const_cast<SwCntntFrm*>(pColFrm->ContainsCntnt()) : 0;
+    return pColFrm ? const_cast<SwContentFrm*>(pColFrm->ContainsContent()) : 0;
 }
 
-SwCntntFrm* GetColumnEnd( const SwLayoutFrm* pColFrm )
+SwContentFrm* GetColumnEnd( const SwLayoutFrm* pColFrm )
 {
-    SwCntntFrm *pRet = GetColumnStt( pColFrm );
+    SwContentFrm *pRet = GetColumnStt( pColFrm );
     if( !pRet )
         return 0;
 
-    SwCntntFrm *pNxt = pRet->GetNextCntntFrm();
+    SwContentFrm *pNxt = pRet->GetNextContentFrm();
     while( pNxt && pColFrm->IsAnLower( pNxt ) )
     {
         pRet = pNxt;
-        pNxt = pNxt->GetNextCntntFrm();
+        pNxt = pNxt->GetNextContentFrm();
     }
     return pRet;
 }
@@ -73,12 +73,12 @@ SwPosColumn fnColumnEnd = &GetColumnEnd;
 bool SwCrsrShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol )
 {
     bool bRet = false;
-    if( !m_pTblCrsr )
+    if( !m_pTableCrsr )
     {
         SwLayoutFrm* pLayFrm = GetCurrFrm()->GetUpper();
         if( pLayFrm && 0 != ( pLayFrm = (*fnWhichCol)( pLayFrm )) )
         {
-            SwCntntFrm* pCnt = (*fnPosCol)( pLayFrm );
+            SwContentFrm* pCnt = (*fnPosCol)( pLayFrm );
             if( pCnt )
             {
                 SET_CURR_SHELL( this );
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index 62cdca2b27e2..31fe101dd889 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -46,22 +46,22 @@ bool SwCrsrShell::CallCrsrFN( FNCrsr fnCrsr )
     return bRet;
 }
 
-bool SwCursor::GotoFtnTxt()
+bool SwCursor::GotoFootnoteText()
 {
     // jump from content to footnote
     bool bRet = false;
-    SwTxtNode* pTxtNd = GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pTextNd = GetPoint()->nNode.GetNode().GetTextNode();
 
-    SwTxtAttr *const pFtn( (pTxtNd)
-        ? pTxtNd->GetTxtAttrForCharAt(
+    SwTextAttr *const pFootnote( (pTextNd)
+        ? pTextNd->GetTextAttrForCharAt(
             GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN)
         : 0);
-    if (pFtn)
+    if (pFootnote)
     {
         SwCrsrSaveState aSaveState( *this );
-        GetPoint()->nNode = *static_cast<SwTxtFtn*>(pFtn)->GetStartNode();
+        GetPoint()->nNode = *static_cast<SwTextFootnote*>(pFootnote)->GetStartNode();
 
-        SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection(
+        SwContentNode* pCNd = GetDoc()->GetNodes().GoNextSection(
                                             &GetPoint()->nNode,
                                             true, !IsReadOnlyAvailable() );
         if( pCNd )
@@ -74,36 +74,36 @@ bool SwCursor::GotoFtnTxt()
     return bRet;
 }
 
-bool SwCrsrShell::GotoFtnTxt()
+bool SwCrsrShell::GotoFootnoteText()
 {
-    bool bRet = CallCrsrFN( &SwCursor::GotoFtnTxt );
+    bool bRet = CallCrsrFN( &SwCursor::GotoFootnoteText );
     if( !bRet )
     {
-        SwTxtNode* pTxtNd = _GetCrsr() ?
-                   _GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode() : NULL;
-        if( pTxtNd )
+        SwTextNode* pTextNd = _GetCrsr() ?
+                   _GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode() : NULL;
+        if( pTextNd )
         {
-            const SwFrm *pFrm = pTxtNd->getLayoutFrm( GetLayout(), &_GetCrsr()->GetSttPos(),
+            const SwFrm *pFrm = pTextNd->getLayoutFrm( GetLayout(), &_GetCrsr()->GetSttPos(),
                                                  _GetCrsr()->Start() );
-            const SwFtnBossFrm* pFtnBoss;
-            bool bSkip = pFrm && pFrm->IsInFtn();
-            while( pFrm && 0 != ( pFtnBoss = pFrm->FindFtnBossFrm() ) )
+            const SwFootnoteBossFrm* pFootnoteBoss;
+            bool bSkip = pFrm && pFrm->IsInFootnote();
+            while( pFrm && 0 != ( pFootnoteBoss = pFrm->FindFootnoteBossFrm() ) )
             {
-                if( 0 != ( pFrm = pFtnBoss->FindFtnCont() ) )
+                if( 0 != ( pFrm = pFootnoteBoss->FindFootnoteCont() ) )
                 {
                     if( bSkip )
                         bSkip = false;
                     else
                     {
-                        const SwCntntFrm* pCnt = static_cast<const SwLayoutFrm*>
-                                                        (pFrm)->ContainsCntnt();
+                        const SwContentFrm* pCnt = static_cast<const SwLayoutFrm*>
+                                                        (pFrm)->ContainsContent();
                         if( pCnt )
                         {
-                            const SwCntntNode* pNode = pCnt->GetNode();
+                            const SwContentNode* pNode = pCnt->GetNode();
                             _GetCrsr()->GetPoint()->nNode = *pNode;
                             _GetCrsr()->GetPoint()->nContent.Assign(
-                                const_cast<SwCntntNode*>(pNode),
-                                static_cast<const SwTxtFrm*>(pCnt)->GetOfst() );
+                                const_cast<SwContentNode*>(pNode),
+                                static_cast<const SwTextFrm*>(pCnt)->GetOfst() );
                             UpdateCrsr( SwCrsrShell::SCROLLWIN |
                                 SwCrsrShell::CHKRANGE | SwCrsrShell::READONLY );
                             bRet = true;
@@ -111,34 +111,34 @@ bool SwCrsrShell::GotoFtnTxt()
                         }
                     }
                 }
-                if( pFtnBoss->GetNext() && !pFtnBoss->IsPageFrm() )
-                    pFrm = pFtnBoss->GetNext();
+                if( pFootnoteBoss->GetNext() && !pFootnoteBoss->IsPageFrm() )
+                    pFrm = pFootnoteBoss->GetNext();
                 else
-                    pFrm = pFtnBoss->GetUpper();
+                    pFrm = pFootnoteBoss->GetUpper();
             }
         }
     }
     return bRet;
 }
 
-bool SwCursor::GotoFtnAnchor()
+bool SwCursor::GotoFootnoteAnchor()
 {
     // jump from footnote to anchor
     const SwNode* pSttNd = GetNode().FindFootnoteStartNode();
     if( pSttNd )
     {
         // search in all footnotes in document for this StartIndex
-        const SwTxtFtn* pTxtFtn;
-        const SwFtnIdxs& rFtnArr = pSttNd->GetDoc()->GetFtnIdxs();
-        for( size_t n = 0; n < rFtnArr.size(); ++n )
-            if( 0 != ( pTxtFtn = rFtnArr[ n ])->GetStartNode() &&
-                pSttNd == &pTxtFtn->GetStartNode()->GetNode() )
+        const SwTextFootnote* pTextFootnote;
+        const SwFootnoteIdxs& rFootnoteArr = pSttNd->GetDoc()->GetFootnoteIdxs();
+        for( size_t n = 0; n < rFootnoteArr.size(); ++n )
+            if( 0 != ( pTextFootnote = rFootnoteArr[ n ])->GetStartNode() &&
+                pSttNd == &pTextFootnote->GetStartNode()->GetNode() )
             {
                 SwCrsrSaveState aSaveState( *this );
 
-                SwTxtNode& rTNd = (SwTxtNode&)pTxtFtn->GetTxtNode();
+                SwTextNode& rTNd = (SwTextNode&)pTextFootnote->GetTextNode();
                 GetPoint()->nNode = rTNd;
-                GetPoint()->nContent.Assign( &rTNd, pTxtFtn->GetStart() );
+                GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() );
 
                 return !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
                                   nsSwCursorSelOverFlags::SELOVER_TOGGLE );
@@ -147,11 +147,11 @@ bool SwCursor::GotoFtnAnchor()
     return false;
 }
 
-bool SwCrsrShell::GotoFtnAnchor()
+bool SwCrsrShell::GotoFootnoteAnchor()
 {
     // jump from footnote to anchor
     SwCallLink aLk( *this ); // watch Crsr-Moves
-    bool bRet = m_pCurCrsr->GotoFtnAnchor();
+    bool bRet = m_pCurCrsr->GotoFootnoteAnchor();
     if( bRet )
     {
         // special treatment for table header row
@@ -162,99 +162,99 @@ bool SwCrsrShell::GotoFtnAnchor()
     return bRet;
 }
 
-inline bool CmpLE( const SwTxtFtn& rFtn, sal_uLong nNd, sal_Int32 nCnt )
+inline bool CmpLE( const SwTextFootnote& rFootnote, sal_uLong nNd, sal_Int32 nCnt )
 {
-    const sal_uLong nTNd = rFtn.GetTxtNode().GetIndex();
-    return nTNd < nNd || ( nTNd == nNd && rFtn.GetStart() <= nCnt );
+    const sal_uLong nTNd = rFootnote.GetTextNode().GetIndex();
+    return nTNd < nNd || ( nTNd == nNd && rFootnote.GetStart() <= nCnt );
 }
 
-inline bool CmpL( const SwTxtFtn& rFtn, sal_uLong nNd, sal_Int32 nCnt )
+inline bool CmpL( const SwTextFootnote& rFootnote, sal_uLong nNd, sal_Int32 nCnt )
 {
-    const sal_uLong nTNd = rFtn.GetTxtNode().GetIndex();
-    return nTNd < nNd || ( nTNd == nNd && rFtn.GetStart() < nCnt );
+    const sal_uLong nTNd = rFootnote.GetTextNode().GetIndex();
+    return nTNd < nNd || ( nTNd == nNd && rFootnote.GetStart() < nCnt );
 }
 
-bool SwCursor::GotoNextFtnAnchor()
+bool SwCursor::GotoNextFootnoteAnchor()
 {
-    const SwFtnIdxs& rFtnArr = GetDoc()->GetFtnIdxs();
-    const SwTxtFtn* pTxtFtn = 0;
+    const SwFootnoteIdxs& rFootnoteArr = GetDoc()->GetFootnoteIdxs();
+    const SwTextFootnote* pTextFootnote = 0;
     size_t nPos = 0;
 
-    if( rFtnArr.SeekEntry( GetPoint()->nNode, &nPos ))
+    if( rFootnoteArr.SeekEntry( GetPoint()->nNode, &nPos ))
     {
         // there is a footnote with this index, so search also for the next one
-        if( nPos < rFtnArr.size() )
+        if( nPos < rFootnoteArr.size() )
         {
             sal_uLong nNdPos = GetPoint()->nNode.GetIndex();
             const sal_Int32 nCntPos = GetPoint()->nContent.GetIndex();
 
-            pTxtFtn = rFtnArr[ nPos ];
+            pTextFootnote = rFootnoteArr[ nPos ];
             // search forwards
-            if( CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
+            if( CmpLE( *pTextFootnote, nNdPos, nCntPos ) )
             {
-                pTxtFtn = 0;
-                for( ++nPos; nPos < rFtnArr.size(); ++nPos )
+                pTextFootnote = 0;
+                for( ++nPos; nPos < rFootnoteArr.size(); ++nPos )
                 {
-                    pTxtFtn = rFtnArr[ nPos ];
-                    if( !CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
+                    pTextFootnote = rFootnoteArr[ nPos ];
+                    if( !CmpLE( *pTextFootnote, nNdPos, nCntPos ) )
                         break; // found
-                    pTxtFtn = 0;
+                    pTextFootnote = 0;
                 }
             }
             else if( nPos )
             {
                 // search backwards
-                pTxtFtn = 0;
+                pTextFootnote = 0;
                 while( nPos )
                 {
-                    pTxtFtn = rFtnArr[ --nPos ];
-                    if( CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
+                    pTextFootnote = rFootnoteArr[ --nPos ];
+                    if( CmpLE( *pTextFootnote, nNdPos, nCntPos ) )
                     {
-                        pTxtFtn = rFtnArr[ ++nPos ];
+                        pTextFootnote = rFootnoteArr[ ++nPos ];
                         break; // found
                     }
                 }
             }
         }
     }
-    else if( nPos < rFtnArr.size() )
-        pTxtFtn = rFtnArr[ nPos ];
+    else if( nPos < rFootnoteArr.size() )
+        pTextFootnote = rFootnoteArr[ nPos ];
 
-    bool bRet = 0 != pTxtFtn;
+    bool bRet = 0 != pTextFootnote;
     if( bRet )
     {
         SwCrsrSaveState aSaveState( *this );
 
-        SwTxtNode& rTNd = (SwTxtNode&)pTxtFtn->GetTxtNode();
+        SwTextNode& rTNd = (SwTextNode&)pTextFootnote->GetTextNode();
         GetPoint()->nNode = rTNd;
-        GetPoint()->nContent.Assign( &rTNd, pTxtFtn->GetStart() );
+        GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() );
         bRet = !IsSelOvr();
     }
     return bRet;
 }
 
-bool SwCursor::GotoPrevFtnAnchor()
+bool SwCursor::GotoPrevFootnoteAnchor()
 {
-    const SwFtnIdxs& rFtnArr = GetDoc()->GetFtnIdxs();
-    const SwTxtFtn* pTxtFtn = 0;
+    const SwFootnoteIdxs& rFootnoteArr = GetDoc()->GetFootnoteIdxs();
+    const SwTextFootnote* pTextFootnote = 0;
     size_t nPos = 0;
 
-    if( rFtnArr.SeekEntry( GetPoint()->nNode, &nPos ) )
+    if( rFootnoteArr.SeekEntry( GetPoint()->nNode, &nPos ) )
     {
         // there is a footnote with this index, so search also for the next one
         sal_uLong nNdPos = GetPoint()->nNode.GetIndex();
         const sal_Int32 nCntPos = GetPoint()->nContent.GetIndex();
 
-        pTxtFtn = rFtnArr[ nPos ];
+        pTextFootnote = rFootnoteArr[ nPos ];
         // search forwards
-        if( CmpL( *pTxtFtn, nNdPos, nCntPos ))
+        if( CmpL( *pTextFootnote, nNdPos, nCntPos ))
         {
-            for( ++nPos; nPos < rFtnArr.size(); ++nPos )
+            for( ++nPos; nPos < rFootnoteArr.size(); ++nPos )
             {
-                pTxtFtn = rFtnArr[ nPos ];
-                if( !CmpL( *pTxtFtn, nNdPos, nCntPos ) )
+                pTextFootnote = rFootnoteArr[ nPos ];
+                if( !CmpL( *pTextFootnote, nNdPos, nCntPos ) )
                 {
-                    pTxtFtn = rFtnArr[ nPos-1 ];
+                    pTextFootnote = rFootnoteArr[ nPos-1 ];
                     break;
                 }
             }
@@ -262,42 +262,42 @@ bool SwCursor::GotoPrevFtnAnchor()
         else if( nPos )
         {
             // search backwards
-            pTxtFtn = 0;
+            pTextFootnote = 0;
             while( nPos )
             {
-                pTxtFtn = rFtnArr[ --nPos ];
-                if( CmpL( *pTxtFtn, nNdPos, nCntPos ))
+                pTextFootnote = rFootnoteArr[ --nPos ];
+                if( CmpL( *pTextFootnote, nNdPos, nCntPos ))
                     break; // found
-                pTxtFtn = 0;
+                pTextFootnote = 0;
             }
         }
         else
-            pTxtFtn = 0;
+            pTextFootnote = 0;
     }
     else if( nPos )
-        pTxtFtn = rFtnArr[ nPos-1 ];
+        pTextFootnote = rFootnoteArr[ nPos-1 ];
 
-    bool bRet = 0 != pTxtFtn;
+    bool bRet = 0 != pTextFootnote;
     if( bRet )
     {
         SwCrsrSaveState aSaveState( *this );
 
-        SwTxtNode& rTNd = (SwTxtNode&)pTxtFtn->GetTxtNode();
+        SwTextNode& rTNd = (SwTextNode&)pTextFootnote->GetTextNode();
         GetPoint()->nNode = rTNd;
-        GetPoint()->nContent.Assign( &rTNd, pTxtFtn->GetStart() );
+        GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() );
         bRet = !IsSelOvr();
     }
     return bRet;
 }
 
-bool SwCrsrShell::GotoNextFtnAnchor()
+bool SwCrsrShell::GotoNextFootnoteAnchor()
 {
-    return CallCrsrFN( &SwCursor::GotoNextFtnAnchor );
+    return CallCrsrFN( &SwCursor::GotoNextFootnoteAnchor );
 }
 
-bool SwCrsrShell::GotoPrevFtnAnchor()
+bool SwCrsrShell::GotoPrevFootnoteAnchor()
 {
-    return CallCrsrFN( &SwCursor::GotoPrevFtnAnchor );
+    return CallCrsrFN( &SwCursor::GotoPrevFootnoteAnchor );
 }
 
 /// jump from border to anchor
@@ -326,7 +326,7 @@ bool SwCrsrShell::GotoFlyAnchor()
                 : pFrm->Frm().Left());
 
     const SwPageFrm* pPageFrm = pFrm->FindPageFrm();
-    const SwCntntFrm* pFndFrm = pPageFrm->GetCntntPos( aPt, false, true );
+    const SwContentFrm* pFndFrm = pPageFrm->GetContentPos( aPt, false, true );
     pFndFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
 
     bool bRet = !m_pCurCrsr->IsInProtectTable() && !m_pCurCrsr->IsSelOvr();
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index 92d40ed3e3a5..8c2ba4e36b2e 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -53,7 +53,7 @@ bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             else if( fnPosRegion == fnMoveForward )
             {
                 aIdx = *pNd;
-                SwCntntNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
+                SwContentNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
                                                 true, !bInReadOnly );
                 if( !pCNd )
                 {
@@ -65,7 +65,7 @@ bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             else
             {
                 aIdx = *pNd->EndOfSectionNode();
-                SwCntntNode* pCNd = SwNodes::GoPrevSection( &aIdx,
+                SwContentNode* pCNd = SwNodes::GoPrevSection( &aIdx,
                                                 true, !bInReadOnly );
                 if( !pCNd )
                 {
@@ -107,7 +107,7 @@ bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             else if( fnPosRegion == fnMoveForward )
             {
                 aIdx = *pNd;
-                SwCntntNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
+                SwContentNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
                                                 true, !bInReadOnly );
                 if( !pCNd )
                 {
@@ -119,7 +119,7 @@ bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             else
             {
                 aIdx = *pNd->EndOfSectionNode();
-                SwCntntNode* pCNd = SwNodes::GoPrevSection( &aIdx,
+                SwContentNode* pCNd = SwNodes::GoPrevSection( &aIdx,
                                                 true, !bInReadOnly );
                 if( !pCNd )
                 {
@@ -145,7 +145,7 @@ bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
     SwPosition* pPos = rCurCrsr.GetPoint();
     bool bMoveBackward = fnPosRegion == fnMoveBackward;
 
-    SwCntntNode* pCNd;
+    SwContentNode* pCNd;
     if( bMoveBackward )
     {
         SwNodeIndex aIdx( *pNd->EndOfSectionNode() );
@@ -178,7 +178,7 @@ bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
     bool bMoveBackward = fnPosRegion == fnMoveBackward;
 
     do {
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         if( bMoveBackward ) // to the end of the section
         {
             SwNodeIndex aIdx( *pNd->EndOfSectionNode() );
@@ -205,7 +205,7 @@ bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
 
         // try also the parent of this section
         SwSection* pParent = pNd->GetSection().GetParent();
-        pNd = pParent ? pParent->GetFmt()->GetSectionNode() : 0;
+        pNd = pParent ? pParent->GetFormat()->GetSectionNode() : 0;
     } while( pNd );
     return false;
 }
@@ -217,13 +217,13 @@ bool SwCursor::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion
             (*fnWhichRegion)( *this, fnPosRegion, IsReadOnlyAvailable()  ) &&
             !IsSelOvr() &&
             (GetPoint()->nNode.GetIndex() != m_pSavePos->nNode ||
-             GetPoint()->nContent.GetIndex() != m_pSavePos->nCntnt);
+             GetPoint()->nContent.GetIndex() != m_pSavePos->nContent);
 }
 
 bool SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves;call Link if needed
-    bool bRet = !m_pTblCrsr && m_pCurCrsr->MoveRegion( fnWhichRegion, fnPosRegion );
+    bool bRet = !m_pTableCrsr && m_pCurCrsr->MoveRegion( fnWhichRegion, fnPosRegion );
     if( bRet )
         UpdateCrsr();
     return bRet;
@@ -232,22 +232,22 @@ bool SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegi
 bool SwCursor::GotoRegion( const OUString& rName )
 {
     bool bRet = false;
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
-    for( SwSectionFmts::size_type n = rFmts.size(); n; )
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
+    for( SwSectionFormats::size_type n = rFormats.size(); n; )
     {
-        const SwSectionFmt* pFmt = rFmts[ --n ];
+        const SwSectionFormat* pFormat = rFormats[ --n ];
         const SwNodeIndex* pIdx = 0;
         const SwSection* pSect;
-        if( 0 != ( pSect = pFmt->GetSection() ) &&
+        if( 0 != ( pSect = pFormat->GetSection() ) &&
             pSect->GetSectionName() == rName &&
-            0 != ( pIdx = pFmt->GetCntnt().GetCntntIdx() ) &&
+            0 != ( pIdx = pFormat->GetContent().GetContentIdx() ) &&
             pIdx->GetNode().GetNodes().IsDocNodes() )
         {
             // area in normal nodes array
             SwCrsrSaveState aSaveState( *this );
 
             GetPoint()->nNode = *pIdx;
-            Move( fnMoveForward, fnGoCntnt );
+            Move( fnMoveForward, fnGoContent );
             bRet = !IsSelOvr();
         }
     }
@@ -257,7 +257,7 @@ bool SwCursor::GotoRegion( const OUString& rName )
 bool SwCrsrShell::GotoRegion( const OUString& rName )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves;call Link if needed
-    bool bRet = !m_pTblCrsr && m_pCurCrsr->GotoRegion( rName );
+    bool bRet = !m_pTableCrsr && m_pCurCrsr->GotoRegion( rName );
     if( bRet )
         UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
                     SwCrsrShell::READONLY );
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 33d29140a431..6c7ae407b910 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -44,11 +44,11 @@
 bool SwCrsrShell::GoNextCell( bool bAppendLine )
 {
     bool bRet = false;
-    const SwTableNode* pTblNd = 0;
+    const SwTableNode* pTableNd = 0;
 
-    if( IsTableMode() || 0 != ( pTblNd = IsCrsrInTbl() ))
+    if( IsTableMode() || 0 != ( pTableNd = IsCrsrInTable() ))
     {
-        SwCursor* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+        SwCursor* pCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
         SwCallLink aLk( *this ); // watch Crsr-Moves
         bRet = true;
 
@@ -59,13 +59,13 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
 
         if ( pCrsr->GetCrsrRowSpanOffset() )
         {
-            pTableBox = pTableBoxStartNode->GetTblBox();
+            pTableBox = pTableBoxStartNode->GetTableBox();
             if ( pTableBox->getRowSpan() > 1 )
             {
-                if ( !pTblNd )
-                    pTblNd = IsCrsrInTbl();
-                assert (pTblNd);
-                pTableBox = & pTableBox->FindEndOfRowSpan( pTblNd->GetTable(),
+                if ( !pTableNd )
+                    pTableNd = IsCrsrInTable();
+                assert (pTableNd);
+                pTableBox = & pTableBox->FindEndOfRowSpan( pTableNd->GetTable(),
                                                            (sal_uInt16)(pTableBox->getRowSpan() + pCrsr->GetCrsrRowSpanOffset() ) );
                 pTableBoxStartNode = pTableBox->GetSttNd();
             }
@@ -79,11 +79,11 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
         {
             if( pCrsr->HasMark() || !bAppendLine )
                 bRet = false;
-            else if (pTblNd)
+            else if (pTableNd)
             {
                 // if there is no list anymore then create new one
                 if ( !pTableBox )
-                    pTableBox = pTblNd->GetTable().GetTblBox(
+                    pTableBox = pTableNd->GetTable().GetTableBox(
                                     pCrsr->GetPoint()->nNode.GetNode().
                                     StartOfSectionIndex() );
 
@@ -105,9 +105,9 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
 bool SwCrsrShell::GoPrevCell()
 {
     bool bRet = false;
-    if( IsTableMode() || IsCrsrInTbl() )
+    if( IsTableMode() || IsCrsrInTable() )
     {
-        SwCursor* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+        SwCursor* pCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
         SwCallLink aLk( *this ); // watch Crsr-Moves
         bRet = pCrsr->GoPrevCell();
         if( bRet )
@@ -128,7 +128,7 @@ static const SwFrm* lcl_FindMostUpperCellFrm( const SwFrm* pFrm )
     return pFrm;
 }
 
-bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
+bool SwCrsrShell::_SelTableRowOrCol( bool bRow, bool bRowSimple )
 {
     // check if the current cursor's SPoint/Mark are in a table
     SwFrm *pFrm = GetCurrFrm();
@@ -146,15 +146,15 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
 
     // search box based on layout
     SwSelBoxes aBoxes;
-    SwTblSearchType eType = bRow ? nsSwTblSearchType::TBLSEARCH_ROW : nsSwTblSearchType::TBLSEARCH_COL;
+    SwTableSearchType eType = bRow ? nsSwTableSearchType::TBLSEARCH_ROW : nsSwTableSearchType::TBLSEARCH_COL;
     const bool bCheckProtected = !IsReadOnlyAvailable();
 
     if( bCheckProtected )
-        eType = (SwTblSearchType)(eType | nsSwTblSearchType::TBLSEARCH_PROTECT);
+        eType = (SwTableSearchType)(eType | nsSwTableSearchType::TBLSEARCH_PROTECT);
 
     if ( !bRowSimple )
     {
-        GetTblSel( *this, aBoxes, eType );
+        GetTableSel( *this, aBoxes, eType );
 
         if( aBoxes.empty() )
             return false;
@@ -178,7 +178,7 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
     {
         const SwShellCrsr *pCrsr = _GetCrsr();
         const SwFrm* pStartFrm = pFrm;
-        const SwCntntNode *pCNd = pCrsr->GetCntntNode( false );
+        const SwContentNode *pCNd = pCrsr->GetContentNode( false );
         const SwFrm* pEndFrm   = pCNd ? pCNd->getLayoutFrm( GetLayout(), &pCrsr->GetMkPos() ) : 0;
 
         if ( bRow )
@@ -194,13 +194,13 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
 
         // If we select upwards it is sufficient to set pStt and pEnd
         // to the first resp. last box of the selection obtained from
-        // GetTblSel. However, selecting downwards requires the frames
+        // GetTableSel. However, selecting downwards requires the frames
         // located at the corners of the selection. This does not work
         // for column selections in vertical tables:
         const bool bSelectUp = ( bVert && !bRow ) ||
                                 *pCrsr->GetPoint() <= *pCrsr->GetMark();
         SwCellFrms aCells;
-        GetTblSel( static_cast<const SwCellFrm*>(pStartFrm),
+        GetTableSel( static_cast<const SwCellFrm*>(pStartFrm),
                    static_cast<const SwCellFrm*>(pEndFrm),
                    aBoxes, bSelectUp ? 0 : &aCells, eType );
 
@@ -222,26 +222,26 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
     }
 
     // if no table cursor exists, create one
-    if( !m_pTblCrsr )
+    if( !m_pTableCrsr )
     {
-        m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+        m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
         m_pCurCrsr->DeleteMark();
         m_pCurCrsr->SwSelPaintRects::Hide();
     }
 
-    m_pTblCrsr->DeleteMark();
+    m_pTableCrsr->DeleteMark();
 
     // set start and end of a column
-    m_pTblCrsr->GetPoint()->nNode = *pEnd->GetSttNd();
-    m_pTblCrsr->Move( fnMoveForward, fnGoCntnt );
-    m_pTblCrsr->SetMark();
-    m_pTblCrsr->GetPoint()->nNode = *pStt->GetSttNd()->EndOfSectionNode();
-    m_pTblCrsr->Move( fnMoveBackward, fnGoCntnt );
+    m_pTableCrsr->GetPoint()->nNode = *pEnd->GetSttNd();
+    m_pTableCrsr->Move( fnMoveForward, fnGoContent );
+    m_pTableCrsr->SetMark();
+    m_pTableCrsr->GetPoint()->nNode = *pStt->GetSttNd()->EndOfSectionNode();
+    m_pTableCrsr->Move( fnMoveBackward, fnGoContent );
 
     // set PtPos 'close' to the reference table, otherwise we might get problems
     // with the repeated headlines check in UpdateCrsr():
     if ( !bRow )
-        m_pTblCrsr->GetPtPos() = pMasterTabFrm->IsVertical()
+        m_pTableCrsr->GetPtPos() = pMasterTabFrm->IsVertical()
                                    ? pMasterTabFrm->Frm().TopRight()
                                    : pMasterTabFrm->Frm().TopLeft();
 
@@ -249,40 +249,40 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
     return true;
 }
 
-bool SwCrsrShell::SelTbl()
+bool SwCrsrShell::SelTable()
 {
     // check if the current cursor's SPoint/Mark are in a table
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm->IsInTab() )
         return false;
 
-    const SwTabFrm *pTblFrm = pFrm->ImplFindTabFrm();
-    const SwTabFrm* pMasterTabFrm = pTblFrm->IsFollow() ? pTblFrm->FindMaster( true ) : pTblFrm;
-    const SwTableNode* pTblNd = pTblFrm->GetTable()->GetTableNode();
+    const SwTabFrm *pTableFrm = pFrm->ImplFindTabFrm();
+    const SwTabFrm* pMasterTabFrm = pTableFrm->IsFollow() ? pTableFrm->FindMaster( true ) : pTableFrm;
+    const SwTableNode* pTableNd = pTableFrm->GetTable()->GetTableNode();
 
     SET_CURR_SHELL( this );
 
-    if( !m_pTblCrsr )
+    if( !m_pTableCrsr )
     {
-        m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+        m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
         m_pCurCrsr->DeleteMark();
         m_pCurCrsr->SwSelPaintRects::Hide();
     }
 
-    m_pTblCrsr->DeleteMark();
-    m_pTblCrsr->GetPoint()->nNode = *pTblNd;
-    m_pTblCrsr->Move( fnMoveForward, fnGoCntnt );
-    m_pTblCrsr->SetMark();
+    m_pTableCrsr->DeleteMark();
+    m_pTableCrsr->GetPoint()->nNode = *pTableNd;
+    m_pTableCrsr->Move( fnMoveForward, fnGoContent );
+    m_pTableCrsr->SetMark();
     // set MkPos 'close' to the master table, otherwise we might get problems
     // with the repeated headlines check in UpdateCrsr():
-    m_pTblCrsr->GetMkPos() = pMasterTabFrm->IsVertical() ? pMasterTabFrm->Frm().TopRight() : pMasterTabFrm->Frm().TopLeft();
-    m_pTblCrsr->GetPoint()->nNode = *pTblNd->EndOfSectionNode();
-    m_pTblCrsr->Move( fnMoveBackward, fnGoCntnt );
+    m_pTableCrsr->GetMkPos() = pMasterTabFrm->IsVertical() ? pMasterTabFrm->Frm().TopRight() : pMasterTabFrm->Frm().TopLeft();
+    m_pTableCrsr->GetPoint()->nNode = *pTableNd->EndOfSectionNode();
+    m_pTableCrsr->Move( fnMoveBackward, fnGoContent );
     UpdateCrsr();
     return true;
 }
 
-bool SwCrsrShell::SelTblBox()
+bool SwCrsrShell::SelTableBox()
 {
     // if we're in a table, create a table cursor, and select the cell
     // that the current cursor's point resides in
@@ -305,26 +305,26 @@ bool SwCrsrShell::SelTblBox()
     SET_CURR_SHELL( this );
 
     // create a table cursor, if there isn't one already
-    if( !m_pTblCrsr )
+    if( !m_pTableCrsr )
     {
-        m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+        m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
         m_pCurCrsr->DeleteMark();
         m_pCurCrsr->SwSelPaintRects::Hide();
     }
 
-    // select the complete box with our shiny new m_pTblCrsr
+    // select the complete box with our shiny new m_pTableCrsr
     // 1. delete mark, and move point to first content node in box
-    m_pTblCrsr->DeleteMark();
-    *(m_pTblCrsr->GetPoint()) = SwPosition( *pStartNode );
-    m_pTblCrsr->Move( fnMoveForward, fnGoNode );
+    m_pTableCrsr->DeleteMark();
+    *(m_pTableCrsr->GetPoint()) = SwPosition( *pStartNode );
+    m_pTableCrsr->Move( fnMoveForward, fnGoNode );
 
     // 2. set mark, and move point to last content node in box
-    m_pTblCrsr->SetMark();
-    *(m_pTblCrsr->GetPoint()) = SwPosition( *(pStartNode->EndOfSectionNode()) );
-    m_pTblCrsr->Move( fnMoveBackward, fnGoNode );
+    m_pTableCrsr->SetMark();
+    *(m_pTableCrsr->GetPoint()) = SwPosition( *(pStartNode->EndOfSectionNode()) );
+    m_pTableCrsr->Move( fnMoveBackward, fnGoNode );
 
     // 3. exchange
-    m_pTblCrsr->Exchange();
+    m_pTableCrsr->Exchange();
 
     // with some luck, UpdateCrsr() will now update everything that
     // needs updating
@@ -348,18 +348,18 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
     SwNodeIndex aTmp( rIdx, 2 ); // TableNode + StartNode
 
     // the resulting cell should be in that table:
-    const SwTableNode* pTblNd = rIdx.GetNode().GetTableNode();
+    const SwTableNode* pTableNd = rIdx.GetNode().GetTableNode();
 
-    if ( !pTblNd )
+    if ( !pTableNd )
     {
         OSL_FAIL( "lcl_FindNextCell not celled with table start node!" );
         return false;
     }
 
-    const SwNode* pTableEndNode = pTblNd->EndOfSectionNode();
+    const SwNode* pTableEndNode = pTableNd->EndOfSectionNode();
 
     SwNodes& rNds = aTmp.GetNode().GetNodes();
-    SwCntntNode* pCNd = aTmp.GetNode().GetCntntNode();
+    SwContentNode* pCNd = aTmp.GetNode().GetContentNode();
 
     // no content node => go to next content node
     if( !pCNd )
@@ -369,9 +369,9 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
     if ( !pCNd )
         return false;
 
-    SwCntntFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+    SwContentFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
 
-    if ( 0 == pFrm || pCNd->FindTableNode() != pTblNd ||
+    if ( 0 == pFrm || pCNd->FindTableNode() != pTableNd ||
         (!bInReadOnly && pFrm->IsProtected() ) )
     {
         // we are not located inside a 'valid' cell. We have to continue searching...
@@ -392,7 +392,7 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
                 return false;
 
             // ok, get the next content node:
-            pCNd = aTmp.GetNode().GetCntntNode();
+            pCNd = aTmp.GetNode().GetContentNode();
             if( 0 == pCNd )
                 pCNd = rNds.GoNext( &aTmp );
 
@@ -403,7 +403,7 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
             // check if we have found a suitable table cell:
             pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
 
-            if ( 0 != pFrm && pCNd->FindTableNode() == pTblNd &&
+            if ( 0 != pFrm && pCNd->FindTableNode() == pTableNd &&
                 (bInReadOnly || !pFrm->IsProtected() ) )
             {
                 // finally, we have found a suitable table cell => set index and return
@@ -425,15 +425,15 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
     SwNodeIndex aTmp( rIdx, -2 ); // TableNode + EndNode
 
     const SwNode* pTableEndNode = &rIdx.GetNode();
-    const SwTableNode* pTblNd = pTableEndNode->StartOfSectionNode()->GetTableNode();
+    const SwTableNode* pTableNd = pTableEndNode->StartOfSectionNode()->GetTableNode();
 
-    if ( !pTblNd )
+    if ( !pTableNd )
     {
         OSL_FAIL( "lcl_FindPrevCell not celled with table start node!" );
         return false;
     }
 
-    SwCntntNode* pCNd = aTmp.GetNode().GetCntntNode();
+    SwContentNode* pCNd = aTmp.GetNode().GetContentNode();
 
     if( !pCNd )
         pCNd = SwNodes::GoPrevious( &aTmp );
@@ -441,9 +441,9 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
     if ( !pCNd )
         return false;
 
-    SwCntntFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+    SwContentFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
 
-    if( 0 == pFrm || pCNd->FindTableNode() != pTblNd ||
+    if( 0 == pFrm || pCNd->FindTableNode() != pTableNd ||
         (!bInReadOnly && pFrm->IsProtected() ))
     {
         // skip before current section
@@ -452,10 +452,10 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
         {
             SwNode* pNd = &aTmp.GetNode();
 
-            if( pNd == pTblNd || pNd->GetIndex() < pTblNd->GetIndex() )
+            if( pNd == pTableNd || pNd->GetIndex() < pTableNd->GetIndex() )
                 return false;
 
-            pCNd = aTmp.GetNode().GetCntntNode();
+            pCNd = aTmp.GetNode().GetContentNode();
             if( 0 == pCNd )
                 pCNd = SwNodes::GoPrevious( &aTmp );
 
@@ -464,7 +464,7 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
 
             pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
 
-            if( 0 != pFrm && pCNd->FindTableNode() == pTblNd &&
+            if( 0 != pFrm && pCNd->FindTableNode() == pTableNd &&
                 (bInReadOnly || !pFrm->IsProtected() ) )
             {
                 rIdx = *pCNd;
@@ -477,40 +477,40 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
     return true;
 }
 
-bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTable,
                     bool bInReadOnly )
 {
     SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
 
-    SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = aIdx.GetNode().FindTableNode();
+    if( pTableNd )
     {
         // #i26532#: If we are inside a table, we may not go backward to the
         // table start node, because we would miss any tables inside this table.
-        SwTableNode* pInnerTblNd = 0;
+        SwTableNode* pInnerTableNd = 0;
         SwNodeIndex aTmpIdx( aIdx );
         while( aTmpIdx.GetIndex() &&
-                0 == ( pInnerTblNd = aTmpIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
+                0 == ( pInnerTableNd = aTmpIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
             --aTmpIdx;
 
-        if( pInnerTblNd == pTblNd )
-            aIdx.Assign( *pTblNd, - 1 );
+        if( pInnerTableNd == pTableNd )
+            aIdx.Assign( *pTableNd, - 1 );
     }
 
     do {
         while( aIdx.GetIndex() &&
-            0 == ( pTblNd = aIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
+            0 == ( pTableNd = aIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
             --aIdx;
 
-        if( pTblNd ) // any further table node?
+        if( pTableNd ) // any further table node?
         {
-            if( fnPosTbl == fnMoveForward ) // at the beginning?
+            if( fnPosTable == fnMoveForward ) // at the beginning?
             {
                 aIdx = *aIdx.GetNode().StartOfSectionNode();
                 if( !lcl_FindNextCell( aIdx, bInReadOnly ))
                 {
                     // skip table
-                    aIdx.Assign( *pTblNd, -1 );
+                    aIdx.Assign( *pTableNd, -1 );
                     continue;
                 }
             }
@@ -520,48 +520,48 @@ bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
                 if( !lcl_FindNextCell( aIdx, bInReadOnly ))
                 {
                     // skip table
-                    aIdx.Assign( *pTblNd, -1 );
+                    aIdx.Assign( *pTableNd, -1 );
                     continue;
                 }
             }
 
-            SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
-            if ( pTxtNode )
+            SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
+            if ( pTextNode )
             {
-                rCurCrsr.GetPoint()->nNode = *pTxtNode;
-                rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
-                                                      pTxtNode->Len() :
+                rCurCrsr.GetPoint()->nNode = *pTextNode;
+                rCurCrsr.GetPoint()->nContent.Assign( pTextNode, fnPosTable == fnMoveBackward ?
+                                                      pTextNode->Len() :
                                                       0 );
             }
             return true;
         }
-    } while( pTblNd );
+    } while( pTableNd );
 
     return false;
 }
 
-bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTable,
                     bool bInReadOnly )
 {
     SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
-    SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
+    SwTableNode* pTableNd = aIdx.GetNode().FindTableNode();
 
-    if( pTblNd )
-        aIdx.Assign( *pTblNd->EndOfSectionNode(), 1 );
+    if( pTableNd )
+        aIdx.Assign( *pTableNd->EndOfSectionNode(), 1 );
 
     sal_uLong nLastNd = rCurCrsr.GetDoc()->GetNodes().Count() - 1;
     do {
         while( aIdx.GetIndex() < nLastNd &&
-                0 == ( pTblNd = aIdx.GetNode().GetTableNode()) )
+                0 == ( pTableNd = aIdx.GetNode().GetTableNode()) )
             ++aIdx;
-        if( pTblNd ) // any further table node?
+        if( pTableNd ) // any further table node?
         {
-            if( fnPosTbl == fnMoveForward ) // at the beginning?
+            if( fnPosTable == fnMoveForward ) // at the beginning?
             {
                 if( !lcl_FindNextCell( aIdx, bInReadOnly ))
                 {
                     // skip table
-                    aIdx.Assign( *pTblNd->EndOfSectionNode(), + 1 );
+                    aIdx.Assign( *pTableNd->EndOfSectionNode(), + 1 );
                     continue;
                 }
             }
@@ -572,93 +572,93 @@ bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
                 if( !lcl_FindNextCell( aIdx, bInReadOnly ))
                 {
                     // skip table
-                    aIdx.Assign( *pTblNd->EndOfSectionNode(), + 1 );
+                    aIdx.Assign( *pTableNd->EndOfSectionNode(), + 1 );
                     continue;
                 }
             }
 
-            SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
-            if ( pTxtNode )
+            SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
+            if ( pTextNode )
             {
-                rCurCrsr.GetPoint()->nNode = *pTxtNode;
-                rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
-                                                      pTxtNode->Len() :
+                rCurCrsr.GetPoint()->nNode = *pTextNode;
+                rCurCrsr.GetPoint()->nContent.Assign( pTextNode, fnPosTable == fnMoveBackward ?
+                                                      pTextNode->Len() :
                                                       0 );
             }
             return true;
         }
-    } while( pTblNd );
+    } while( pTableNd );
 
     return false;
 }
 
-bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTable,
                     bool bInReadOnly )
 {
-    SwTableNode* pTblNd = rCurCrsr.GetPoint()->nNode.GetNode().FindTableNode();
-    if( !pTblNd )
+    SwTableNode* pTableNd = rCurCrsr.GetPoint()->nNode.GetNode().FindTableNode();
+    if( !pTableNd )
         return false;
 
-    SwTxtNode* pTxtNode = 0;
-    if( fnPosTbl == fnMoveBackward ) // to the end of the table
+    SwTextNode* pTextNode = 0;
+    if( fnPosTable == fnMoveBackward ) // to the end of the table
     {
-        SwNodeIndex aIdx( *pTblNd->EndOfSectionNode() );
+        SwNodeIndex aIdx( *pTableNd->EndOfSectionNode() );
         if( !lcl_FindPrevCell( aIdx, bInReadOnly ))
             return false;
-        pTxtNode = aIdx.GetNode().GetTxtNode();
+        pTextNode = aIdx.GetNode().GetTextNode();
     }
     else
     {
-        SwNodeIndex aIdx( *pTblNd );
+        SwNodeIndex aIdx( *pTableNd );
         if( !lcl_FindNextCell( aIdx, bInReadOnly ))
             return false;
-        pTxtNode = aIdx.GetNode().GetTxtNode();
+        pTextNode = aIdx.GetNode().GetTextNode();
     }
 
-    if ( pTxtNode )
+    if ( pTextNode )
     {
-        rCurCrsr.GetPoint()->nNode = *pTxtNode;
-        rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
-                                                        pTxtNode->Len() :
+        rCurCrsr.GetPoint()->nNode = *pTextNode;
+        rCurCrsr.GetPoint()->nContent.Assign( pTextNode, fnPosTable == fnMoveBackward ?
+                                                        pTextNode->Len() :
                                                         0 );
     }
 
     return true;
 }
 
-bool SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
+bool SwCursor::MoveTable( SwWhichTable fnWhichTable, SwPosTable fnPosTable )
 {
     bool bRet = false;
-    SwTableCursor* m_pTblCrsr = dynamic_cast<SwTableCursor*>(this);
+    SwTableCursor* m_pTableCrsr = dynamic_cast<SwTableCursor*>(this);
 
-    if( m_pTblCrsr || !HasMark() )
+    if( m_pTableCrsr || !HasMark() )
     {
         SwCrsrSaveState aSaveState( *this );
-        bRet = (*fnWhichTbl)( *this, fnPosTbl, IsReadOnlyAvailable() ) &&
+        bRet = (*fnWhichTable)( *this, fnPosTable, IsReadOnlyAvailable() ) &&
                 !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
                            nsSwCursorSelOverFlags::SELOVER_TOGGLE );
     }
     return bRet;
 }
 
-bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
+bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTable, SwPosTable fnPosTable )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
 
-    SwShellCrsr* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+    SwShellCrsr* pCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
     bool bCheckPos;
     bool bRet;
     sal_uLong nPtNd = 0;
     sal_Int32 nPtCnt = 0;
 
-    if ( !m_pTblCrsr && m_pCurCrsr->HasMark() )
+    if ( !m_pTableCrsr && m_pCurCrsr->HasMark() )
     {
         // switch to table mode
-        m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+        m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
         m_pCurCrsr->DeleteMark();
         m_pCurCrsr->SwSelPaintRects::Hide();
-        m_pTblCrsr->SetMark();
-        pCrsr = m_pTblCrsr;
+        m_pTableCrsr->SetMark();
+        pCrsr = m_pTableCrsr;
         bCheckPos = false;
     }
     else
@@ -668,7 +668,7 @@ bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
         nPtCnt = pCrsr->GetPoint()->nContent.GetIndex();
     }
 
-    bRet = pCrsr->MoveTable( fnWhichTbl, fnPosTbl );
+    bRet = pCrsr->MoveTable( fnWhichTable, fnPosTable );
 
     if( bRet )
     {
@@ -685,7 +685,7 @@ bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
     return bRet;
 }
 
-bool SwCrsrShell::IsTblComplexForChart()
+bool SwCrsrShell::IsTableComplexForChart()
 {
     bool bRet = false;
 
@@ -696,9 +696,9 @@ bool SwCrsrShell::IsTblComplexForChart()
     {
         // in a table; check if table or section is balanced
         OUString sSel;
-        if( m_pTblCrsr )
+        if( m_pTableCrsr )
             sSel = GetBoxNms();
-        bRet = pTNd->GetTable().IsTblComplexForChart( sSel );
+        bRet = pTNd->GetTable().IsTableComplexForChart( sSel );
     }
     EndAction();
 
@@ -713,7 +713,7 @@ OUString SwCrsrShell::GetBoxNms() const
 
     if( IsTableMode() )
     {
-        SwCntntNode *pCNd = m_pTblCrsr->Start()->nNode.GetNode().GetCntntNode();
+        SwContentNode *pCNd = m_pTableCrsr->Start()->nNode.GetNode().GetContentNode();
         pFrm = pCNd ? pCNd->getLayoutFrm( GetLayout() ) : 0;
         if( !pFrm )
             return sNm;
@@ -729,17 +729,17 @@ OUString SwCrsrShell::GetBoxNms() const
 
         sNm = static_cast<SwCellFrm*>(pFrm)->GetTabBox()->GetName();
         sNm += ":";
-        pPos = m_pTblCrsr->End();
+        pPos = m_pTableCrsr->End();
     }
     else
     {
-        const SwTableNode* pTblNd = IsCrsrInTbl();
-        if( !pTblNd )
+        const SwTableNode* pTableNd = IsCrsrInTable();
+        if( !pTableNd )
             return sNm;
         pPos = GetCrsr()->GetPoint();
     }
 
-    SwCntntNode* pCNd = pPos->nNode.GetNode().GetCntntNode();
+    SwContentNode* pCNd = pPos->nNode.GetNode().GetContentNode();
     pFrm = pCNd ? pCNd->getLayoutFrm( GetLayout() ) : 0;
 
     if( pFrm )
@@ -757,7 +757,7 @@ OUString SwCrsrShell::GetBoxNms() const
 bool SwCrsrShell::GotoTable( const OUString& rName )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves
-    bool bRet = !m_pTblCrsr && m_pCurCrsr->GotoTable( rName );
+    bool bRet = !m_pTableCrsr && m_pCurCrsr->GotoTable( rName );
     if( bRet )
     {
         m_pCurCrsr->GetPtPos() = Point();
@@ -767,9 +767,9 @@ bool SwCrsrShell::GotoTable( const OUString& rName )
     return bRet;
 }
 
-bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
+bool SwCrsrShell::CheckTableBoxContent( const SwPosition* pPos )
 {
-    if( !m_pBoxIdx || !m_pBoxPtr || IsSelTblCells() || !IsAutoUpdateCells() )
+    if( !m_pBoxIdx || !m_pBoxPtr || IsSelTableCells() || !IsAutoUpdateCells() )
         return false;
 
     // check if box content is consistent with given box format, reset if not
@@ -782,13 +782,13 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
             0 != ( pSttNd = m_pBoxIdx->GetNode().GetStartNode() ) &&
             SwTableBoxStartNode == pSttNd->GetStartNodeType() &&
             m_pBoxPtr == pSttNd->FindTableNode()->GetTable().
-                        GetTblBox( m_pBoxIdx->GetIndex() ) )
+                        GetTableBox( m_pBoxIdx->GetIndex() ) )
             pChkBox = m_pBoxPtr;
     }
     else if( 0 != ( pSttNd = pPos->nNode.GetNode().
                                 FindSttNodeByType( SwTableBoxStartNode )) )
     {
-        pChkBox = pSttNd->FindTableNode()->GetTable().GetTblBox( pSttNd->GetIndex() );
+        pChkBox = pSttNd->FindTableNode()->GetTable().GetTableBox( pSttNd->GetIndex() );
     }
 
     // box has more than one paragraph
@@ -797,7 +797,7 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
 
     // destroy pointer before next action starts
     if( !pPos && !pChkBox )
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
 
     // cursor not anymore in this section?
     if( pChkBox && !pPos &&
@@ -809,11 +809,11 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
     // could not restore the content properly.
     if( pChkBox )
     {
-        const SwTxtNode* pNd = GetDoc()->GetNodes()[
-                                    pSttNd->GetIndex() + 1 ]->GetTxtNode();
+        const SwTextNode* pNd = GetDoc()->GetNodes()[
+                                    pSttNd->GetIndex() + 1 ]->GetTextNode();
         if( !pNd ||
-            ( pNd->GetTxt() == SwViewShell::GetShellRes()->aCalc_Error &&
-              SfxItemState::SET == pChkBox->GetFrmFmt()->
+            ( pNd->GetText() == SwViewShell::GetShellRes()->aCalc_Error &&
+              SfxItemState::SET == pChkBox->GetFrameFormat()->
                             GetItemState( RES_BOXATR_FORMULA )) )
             pChkBox = 0;
     }
@@ -821,18 +821,18 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
     if( pChkBox )
     {
         // destroy pointer before next action starts
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
         StartAction();
-        GetDoc()->ChkBoxNumFmt( *pChkBox, true );
+        GetDoc()->ChkBoxNumFormat( *pChkBox, true );
         EndAction();
     }
 
     return 0 != pChkBox;
 }
 
-void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
+void SwCrsrShell::SaveTableBoxContent( const SwPosition* pPos )
 {
-    if( IsSelTblCells() || !IsAutoUpdateCells() )
+    if( IsSelTableCells() || !IsAutoUpdateCells() )
         return ;
 
     if( !pPos )
@@ -855,12 +855,12 @@ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
     {
         // check m_pBoxIdx
         SwPosition aPos( *m_pBoxIdx );
-        CheckTblBoxCntnt( &aPos );
+        CheckTableBoxContent( &aPos );
     }
 
     if( pSttNd )
     {
-        m_pBoxPtr = pSttNd->FindTableNode()->GetTable().GetTblBox( pSttNd->GetIndex() );
+        m_pBoxPtr = pSttNd->FindTableNode()->GetTable().GetTableBox( pSttNd->GetIndex() );
 
         if( m_pBoxIdx )
             *m_pBoxIdx = *pSttNd;
@@ -869,19 +869,19 @@ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
     }
 }
 
-void SwCrsrShell::ClearTblBoxCntnt()
+void SwCrsrShell::ClearTableBoxContent()
 {
     delete m_pBoxIdx, m_pBoxIdx = 0;
     m_pBoxPtr = 0;
 }
 
-bool SwCrsrShell::EndAllTblBoxEdit()
+bool SwCrsrShell::EndAllTableBoxEdit()
 {
     bool bRet = false;
     for(SwViewShell& rSh : GetRingContainer())
     {
         if( rSh.IsA( TYPE( SwCrsrShell ) ) )
-            bRet |= static_cast<SwCrsrShell*>(&rSh)->CheckTblBoxCntnt(
+            bRet |= static_cast<SwCrsrShell*>(&rSh)->CheckTableBoxContent(
                         static_cast<SwCrsrShell*>(&rSh)->m_pCurCrsr->GetPoint() );
 
     }
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 991c5548612b..1366935e485c 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -68,16 +68,16 @@ MapMode* SwSelPaintRects::s_pMapMode = 0;
 SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
     : m_pCrsrShell( pCShell )
 {
-    pCShell->GetWin()->SetCursor( &m_aTxtCrsr );
-    m_bIsVisible = m_aTxtCrsr.IsVisible();
+    pCShell->GetWin()->SetCursor( &m_aTextCrsr );
+    m_bIsVisible = m_aTextCrsr.IsVisible();
     m_bIsDragCrsr = false;
-    m_aTxtCrsr.SetWidth( 0 );
+    m_aTextCrsr.SetWidth( 0 );
 }
 
 SwVisCrsr::~SwVisCrsr()
 {
-    if( m_bIsVisible && m_aTxtCrsr.IsVisible() )
-        m_aTxtCrsr.Hide();
+    if( m_bIsVisible && m_aTextCrsr.IsVisible() )
+        m_aTextCrsr.Hide();
 
     m_pCrsrShell->GetWin()->SetCursor( 0 );
 }
@@ -100,8 +100,8 @@ void SwVisCrsr::Hide()
     {
         m_bIsVisible = false;
 
-        if( m_aTxtCrsr.IsVisible() )      // Shouldn't the flags be in effect?
-            m_aTxtCrsr.Hide();
+        if( m_aTextCrsr.IsVisible() )      // Shouldn't the flags be in effect?
+            m_aTextCrsr.Hide();
     }
 }
 
@@ -112,7 +112,7 @@ void SwVisCrsr::_SetPosAndShow()
     if( 0 > nTmpY )
     {
         nTmpY = -nTmpY;
-        m_aTxtCrsr.SetOrientation( 900 );
+        m_aTextCrsr.SetOrientation( 900 );
         aRect = SwRect( m_pCrsrShell->m_aCharRect.Pos(),
            Size( m_pCrsrShell->m_aCharRect.Height(), nTmpY ) );
         aRect.Pos().setX(aRect.Pos().getX() + m_pCrsrShell->m_aCrsrHeight.getX());
@@ -121,30 +121,30 @@ void SwVisCrsr::_SetPosAndShow()
     }
     else
     {
-        m_aTxtCrsr.SetOrientation( 0 );
+        m_aTextCrsr.SetOrientation( 0 );
         aRect = SwRect( m_pCrsrShell->m_aCharRect.Pos(),
            Size( m_pCrsrShell->m_aCharRect.Width(), nTmpY ) );
         aRect.Pos().setY(aRect.Pos().getY() + m_pCrsrShell->m_aCrsrHeight.getX());
     }
 
     // check if cursor should show the current cursor bidi level
-    m_aTxtCrsr.SetDirection( CursorDirection::NONE );
+    m_aTextCrsr.SetDirection( CursorDirection::NONE );
     const SwCursor* pTmpCrsr = m_pCrsrShell->_GetCrsr();
 
     if ( pTmpCrsr && !m_pCrsrShell->IsOverwriteCrsr() )
     {
         SwNode& rNode = pTmpCrsr->GetPoint()->nNode.GetNode();
-        if( rNode.IsTxtNode() )
+        if( rNode.IsTextNode() )
         {
-            const SwTxtNode& rTNd = *rNode.GetTxtNode();
+            const SwTextNode& rTNd = *rNode.GetTextNode();
             const SwFrm* pFrm = rTNd.getLayoutFrm( m_pCrsrShell->GetLayout(), 0, 0, false );
             if ( pFrm )
             {
-                const SwScriptInfo* pSI = static_cast<const SwTxtFrm*>(pFrm)->GetScriptInfo();
+                const SwScriptInfo* pSI = static_cast<const SwTextFrm*>(pFrm)->GetScriptInfo();
                  // cursor level has to be shown
                 if ( pSI && pSI->CountDirChg() > 1 )
                 {
-                    m_aTxtCrsr.SetDirection(
+                    m_aTextCrsr.SetDirection(
                         ( pTmpCrsr->GetCrsrBidiLevel() % 2 ) ?
                           CursorDirection::RTL :
                           CursorDirection::LTR );
@@ -173,9 +173,9 @@ void SwVisCrsr::_SetPosAndShow()
         m_pCrsrShell->IsSelection() )
         aRect.Width( 0 );
 
-    m_aTxtCrsr.SetSize( aRect.SSize() );
+    m_aTextCrsr.SetSize( aRect.SSize() );
 
-    m_aTxtCrsr.SetPos( aRect.Pos() );
+    m_aTextCrsr.SetPos( aRect.Pos() );
 
     if (m_pCrsrShell->isTiledRendering())
     {
@@ -191,13 +191,13 @@ void SwVisCrsr::_SetPosAndShow()
                     !m_pCrsrShell->IsSelection() );
 
         sal_uInt16 nStyle = m_bIsDragCrsr ? CURSOR_SHADOW : 0;
-        if( nStyle != m_aTxtCrsr.GetStyle() )
+        if( nStyle != m_aTextCrsr.GetStyle() )
         {
-            m_aTxtCrsr.SetStyle( nStyle );
-            m_aTxtCrsr.SetWindow( m_bIsDragCrsr ? m_pCrsrShell->GetWin() : 0 );
+            m_aTextCrsr.SetStyle( nStyle );
+            m_aTextCrsr.SetWindow( m_bIsDragCrsr ? m_pCrsrShell->GetWin() : 0 );
         }
 
-        m_aTxtCrsr.Show();
+        m_aTextCrsr.Show();
     }
 }
 
@@ -206,8 +206,8 @@ SwSelPaintRects::SwSelPaintRects( const SwCrsrShell& rCSh )
     , m_pCursorShell( &rCSh )
 #if HAVE_FEATURE_DESKTOP
     , m_pCursorOverlay(nullptr)
-    , m_bShowTxtInputFldOverlay(true)
-    , m_pTxtInputFldOverlay(nullptr)
+    , m_bShowTextInputFieldOverlay(true)
+    , m_pTextInputFieldOverlay(nullptr)
 #endif
 {
 }
@@ -227,13 +227,13 @@ void SwSelPaintRects::swapContent(SwSelPaintRects& rSwap)
     setCursorOverlay(rSwap.getCursorOverlay());
     rSwap.setCursorOverlay(pTempOverlay);
 
-    const bool bTempShowTxtInputFldOverlay = m_bShowTxtInputFldOverlay;
-    m_bShowTxtInputFldOverlay = rSwap.m_bShowTxtInputFldOverlay;
-    rSwap.m_bShowTxtInputFldOverlay = bTempShowTxtInputFldOverlay;
+    const bool bTempShowTextInputFieldOverlay = m_bShowTextInputFieldOverlay;
+    m_bShowTextInputFieldOverlay = rSwap.m_bShowTextInputFieldOverlay;
+    rSwap.m_bShowTextInputFieldOverlay = bTempShowTextInputFieldOverlay;
 
-    sw::overlay::OverlayRangesOutline* pTempTxtInputFldOverlay = m_pTxtInputFldOverlay;
-    m_pTxtInputFldOverlay = rSwap.m_pTxtInputFldOverlay;
-    rSwap.m_pTxtInputFldOverlay = pTempTxtInputFldOverlay;
+    sw::overlay::OverlayRangesOutline* pTempTextInputFieldOverlay = m_pTextInputFieldOverlay;
+    m_pTextInputFieldOverlay = rSwap.m_pTextInputFieldOverlay;
+    rSwap.m_pTextInputFieldOverlay = pTempTextInputFieldOverlay;
 #endif
 }
 
@@ -246,10 +246,10 @@ void SwSelPaintRects::Hide()
         m_pCursorOverlay = nullptr;
     }
 
-    if (m_pTxtInputFldOverlay != nullptr)
+    if (m_pTextInputFieldOverlay != nullptr)
     {
-        delete m_pTxtInputFldOverlay;
-        m_pTxtInputFldOverlay = nullptr;
+        delete m_pTextInputFieldOverlay;
+        m_pTextInputFieldOverlay = nullptr;
     }
 #endif
 
@@ -266,8 +266,8 @@ void SwSelPaintRects::Hide()
  */
 static SwRect lcl_getLayoutRect(const Point& rPoint, const SwPosition& rPosition)
 {
-    const SwCntntNode* pNode = rPosition.nNode.GetNode().GetCntntNode();
-    const SwCntntFrm* pFrm = pNode->getLayoutFrm(pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPoint, &rPosition);
+    const SwContentNode* pNode = rPosition.nNode.GetNode().GetContentNode();
+    const SwContentFrm* pFrm = pNode->getLayoutFrm(pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPoint, &rPosition);
     SwRect aRect;
     pFrm->GetCharRect(aRect, rPosition);
     return aRect;
@@ -338,7 +338,7 @@ void SwSelPaintRects::Show()
             }
         }
 
-        HighlightInputFld();
+        HighlightInputField();
 #endif
 
         // Tiled editing does not expose the draw and writer cursor, it just
@@ -384,42 +384,42 @@ void SwSelPaintRects::Show()
     }
 }
 
-void SwSelPaintRects::HighlightInputFld()
+void SwSelPaintRects::HighlightInputField()
 {
-    std::vector< basegfx::B2DRange > aInputFldRanges;
+    std::vector< basegfx::B2DRange > aInputFieldRanges;
 
-    if (m_bShowTxtInputFldOverlay)
+    if (m_bShowTextInputFieldOverlay)
     {
-        SwTxtInputFld* pCurTxtInputFldAtCrsr =
-            dynamic_cast<SwTxtInputFld*>(SwCrsrShell::GetTxtFldAtPos( GetShell()->GetCrsr()->Start(), false ));
-        if ( pCurTxtInputFldAtCrsr != NULL )
+        SwTextInputField* pCurTextInputFieldAtCrsr =
+            dynamic_cast<SwTextInputField*>(SwCrsrShell::GetTextFieldAtPos( GetShell()->GetCrsr()->Start(), false ));
+        if ( pCurTextInputFieldAtCrsr != NULL )
         {
-            SwTxtNode* pTxtNode = pCurTxtInputFldAtCrsr->GetpTxtNode();
-            ::boost::scoped_ptr<SwShellCrsr> pCrsrForInputTxtFld(
-                new SwShellCrsr( *GetShell(), SwPosition( *pTxtNode, pCurTxtInputFldAtCrsr->GetStart() ) ) );
-            pCrsrForInputTxtFld->SetMark();
-            pCrsrForInputTxtFld->GetMark()->nNode = *pTxtNode;
-            pCrsrForInputTxtFld->GetMark()->nContent.Assign( pTxtNode, *(pCurTxtInputFldAtCrsr->End()) );
-
-            pCrsrForInputTxtFld->FillRects();
-            SwRects* pRects = static_cast<SwRects*>(pCrsrForInputTxtFld.get());
+            SwTextNode* pTextNode = pCurTextInputFieldAtCrsr->GetpTextNode();
+            ::boost::scoped_ptr<SwShellCrsr> pCrsrForInputTextField(
+                new SwShellCrsr( *GetShell(), SwPosition( *pTextNode, pCurTextInputFieldAtCrsr->GetStart() ) ) );
+            pCrsrForInputTextField->SetMark();
+            pCrsrForInputTextField->GetMark()->nNode = *pTextNode;
+            pCrsrForInputTextField->GetMark()->nContent.Assign( pTextNode, *(pCurTextInputFieldAtCrsr->End()) );
+
+            pCrsrForInputTextField->FillRects();
+            SwRects* pRects = static_cast<SwRects*>(pCrsrForInputTextField.get());
             for (size_t a(0); a < pRects->size(); ++a)
             {
                 const SwRect aNextRect((*pRects)[a]);
                 const Rectangle aPntRect(aNextRect.SVRect());
 
-                aInputFldRanges.push_back(basegfx::B2DRange(
+                aInputFieldRanges.push_back(basegfx::B2DRange(
                     aPntRect.Left(), aPntRect.Top(),
                     aPntRect.Right() + 1, aPntRect.Bottom() + 1));
             }
         }
     }
 
-    if ( aInputFldRanges.size() > 0 )
+    if ( aInputFieldRanges.size() > 0 )
     {
-        if (m_pTxtInputFldOverlay != nullptr)
+        if (m_pTextInputFieldOverlay != nullptr)
         {
-            m_pTxtInputFldOverlay->setRanges( aInputFldRanges );
+            m_pTextInputFieldOverlay->setRanges( aInputFieldRanges );
         }
         else
         {
@@ -434,18 +434,18 @@ void SwSelPaintRects::HighlightInputFld()
                 Color aHighlight(aSvtOptionsDrawinglayer.getHilightColor());
                 aHighlight.DecreaseLuminance( 128 );
 
-                m_pTxtInputFldOverlay = new sw::overlay::OverlayRangesOutline(
-                        aHighlight, aInputFldRanges );
-                xTargetOverlay->add( *m_pTxtInputFldOverlay );
+                m_pTextInputFieldOverlay = new sw::overlay::OverlayRangesOutline(
+                        aHighlight, aInputFieldRanges );
+                xTargetOverlay->add( *m_pTextInputFieldOverlay );
             }
         }
     }
     else
     {
-        if (m_pTxtInputFldOverlay != nullptr)
+        if (m_pTextInputFieldOverlay != nullptr)
         {
-            delete m_pTxtInputFldOverlay;
-            m_pTxtInputFldOverlay = nullptr;
+            delete m_pTextInputFieldOverlay;
+            m_pTextInputFieldOverlay = nullptr;
         }
     }
 }
@@ -556,11 +556,11 @@ void SwShellCrsr::FillRects()
 {
     // calculate the new rectangles
     if( HasMark() &&
-        GetPoint()->nNode.GetNode().IsCntntNode() &&
-        GetPoint()->nNode.GetNode().GetCntntNode()->getLayoutFrm( GetShell()->GetLayout() ) &&
+        GetPoint()->nNode.GetNode().IsContentNode() &&
+        GetPoint()->nNode.GetNode().GetContentNode()->getLayoutFrm( GetShell()->GetLayout() ) &&
         (GetMark()->nNode == GetPoint()->nNode ||
-        (GetMark()->nNode.GetNode().IsCntntNode() &&
-         GetMark()->nNode.GetNode().GetCntntNode()->getLayoutFrm( GetShell()->GetLayout() ) )   ))
+        (GetMark()->nNode.GetNode().IsContentNode() &&
+         GetMark()->nNode.GetNode().GetContentNode()->getLayoutFrm( GetShell()->GetLayout() ) )   ))
         GetShell()->GetLayout()->CalcFrmRects( *this );
 }
 
@@ -642,9 +642,9 @@ short SwShellCrsr::MaxReplaceArived()
     return nRet;
 }
 
-void SwShellCrsr::SaveTblBoxCntnt( const SwPosition* pPos )
+void SwShellCrsr::SaveTableBoxContent( const SwPosition* pPos )
 {
-    const_cast<SwCrsrShell*>(GetShell())->SaveTblBoxCntnt( pPos );
+    const_cast<SwCrsrShell*>(GetShell())->SaveTableBoxContent( pPos );
 }
 
 bool SwShellCrsr::UpDown( bool bUp, sal_uInt16 nCnt )
@@ -696,9 +696,9 @@ short SwShellTableCrsr::MaxReplaceArived()
     return SwShellCrsr::MaxReplaceArived();
 }
 
-void SwShellTableCrsr::SaveTblBoxCntnt( const SwPosition* pPos )
+void SwShellTableCrsr::SaveTableBoxContent( const SwPosition* pPos )
 {
-    SwShellCrsr::SaveTblBoxCntnt( pPos );
+    SwShellCrsr::SaveTableBoxContent( pPos );
 }
 
 void SwShellTableCrsr::FillRects()
@@ -716,20 +716,20 @@ void SwShellTableCrsr::FillRects()
     for (size_t n = 0; n < m_SelectedBoxes.size(); ++n)
     {
         const SwStartNode* pSttNd = m_SelectedBoxes[n]->GetSttNd();
-        const SwTableNode* pSelTblNd = pSttNd->FindTableNode();
+        const SwTableNode* pSelTableNd = pSttNd->FindTableNode();
 
         SwNodeIndex aIdx( *pSttNd );
-        SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
+        SwContentNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
 
         // table in table
         // (see also lcl_FindTopLevelTable in unoobj2.cxx for a different
         // version to do this)
-        const SwTableNode* pCurTblNd = pCNd ? pCNd->FindTableNode() : NULL;
-        while ( pSelTblNd != pCurTblNd && pCurTblNd )
+        const SwTableNode* pCurTableNd = pCNd ? pCNd->FindTableNode() : NULL;
+        while ( pSelTableNd != pCurTableNd && pCurTableNd )
         {
-            aIdx = pCurTblNd->EndOfSectionIndex();
+            aIdx = pCurTableNd->EndOfSectionIndex();
             pCNd = rNds.GoNextSection( &aIdx, true, false );
-            pCurTblNd = pCNd->FindTableNode();
+            pCurTableNd = pCNd->FindTableNode();
         }
 
         if( !pCNd )
@@ -780,7 +780,7 @@ bool SwShellTableCrsr::IsInside( const Point& rPt ) const
     for (size_t n = 0; n < m_SelectedBoxes.size(); ++n)
     {
         SwNodeIndex aIdx( *m_SelectedBoxes[n]->GetSttNd() );
-        SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
+        SwContentNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
         if( !pCNd )
             continue;
 
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 1f0260e1c1d0..119376d84e3d 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -54,16 +54,16 @@ namespace
     static const int BEHIND_SAME_NODE = 3;     // Same node index but content index behind given content index
     static const int BEHIND_NODE = 4;          // Position behind the given node index
 
-    static int lcl_RelativePosition( const SwPosition& rPos, sal_uLong nNode, sal_Int32 nCntnt )
+    static int lcl_RelativePosition( const SwPosition& rPos, sal_uLong nNode, sal_Int32 nContent )
     {
         sal_uLong nIndex = rPos.nNode.GetIndex();
         int nReturn = BEFORE_NODE;
         if( nIndex == nNode )
         {
             const sal_Int32 nCntIdx = rPos.nContent.GetIndex();
-            if( nCntIdx < nCntnt )
+            if( nCntIdx < nContent )
                 nReturn = BEFORE_SAME_NODE;
-            else if( nCntIdx == nCntnt )
+            else if( nCntIdx == nContent )
                 nReturn = SAME_POSITION;
             else
                 nReturn = BEHIND_SAME_NODE;
@@ -76,11 +76,11 @@ namespace
     {
         long int m_nIdx;
         bool m_bOther;
-        sal_Int32 m_nCntnt;
+        sal_Int32 m_nContent;
 #if 0
         void Dump()
         {
-            SAL_INFO("sw.core", "Index: " << m_nIdx << "\tOther: " << m_bOther << "\tContent: " << m_nCntnt);
+            SAL_INFO("sw.core", "Index: " << m_nIdx << "\tOther: " << m_bOther << "\tContent: " << m_nContent);
         }
 #endif
     };
@@ -88,33 +88,33 @@ namespace
     {
         SwPaM* m_pPaM;
         bool m_isMark;
-        sal_Int32 m_nCntnt;
+        sal_Int32 m_nContent;
     };
     struct OffsetUpdater
     {
-        const SwCntntNode* m_pNewCntntNode;
+        const SwContentNode* m_pNewContentNode;
         const sal_Int32 m_nOffset;
-        OffsetUpdater(SwCntntNode* pNewCntntNode, sal_Int32 nOffset)
-            : m_pNewCntntNode(pNewCntntNode), m_nOffset(nOffset) {};
-        void operator()(SwPosition& rPos, sal_Int32 nCntnt) const
+        OffsetUpdater(SwContentNode* pNewContentNode, sal_Int32 nOffset)
+            : m_pNewContentNode(pNewContentNode), m_nOffset(nOffset) {};
+        void operator()(SwPosition& rPos, sal_Int32 nContent) const
         {
-            rPos.nNode = *m_pNewCntntNode;
-            rPos.nContent.Assign(const_cast<SwCntntNode*>(m_pNewCntntNode), nCntnt + m_nOffset);
+            rPos.nNode = *m_pNewContentNode;
+            rPos.nContent.Assign(const_cast<SwContentNode*>(m_pNewContentNode), nContent + m_nOffset);
         };
     };
     struct LimitUpdater
     {
-        const SwCntntNode* m_pNewCntntNode;
+        const SwContentNode* m_pNewContentNode;
         const sal_uLong m_nLen;
         const sal_Int32 m_nCorrLen;
-        LimitUpdater(SwCntntNode* pNewCntntNode, sal_uLong nLen, sal_Int32 nCorrLen)
-            : m_pNewCntntNode(pNewCntntNode), m_nLen(nLen), m_nCorrLen(nCorrLen) {};
-        void operator()(SwPosition& rPos, sal_Int32 nCntnt) const
+        LimitUpdater(SwContentNode* pNewContentNode, sal_uLong nLen, sal_Int32 nCorrLen)
+            : m_pNewContentNode(pNewContentNode), m_nLen(nLen), m_nCorrLen(nCorrLen) {};
+        void operator()(SwPosition& rPos, sal_Int32 nContent) const
         {
-            rPos.nNode = *m_pNewCntntNode;
-            if( nCntnt < m_nCorrLen )
+            rPos.nNode = *m_pNewContentNode;
+            if( nContent < m_nCorrLen )
             {
-                rPos.nContent.Assign(const_cast<SwCntntNode*>(m_pNewCntntNode), std::min( nCntnt, static_cast<sal_Int32>(m_nLen) ) );
+                rPos.nContent.Assign(const_cast<SwContentNode*>(m_pNewContentNode), std::min( nContent, static_cast<sal_Int32>(m_nLen) ) );
             }
             else
             {
@@ -122,14 +122,14 @@ namespace
             }
         };
     };
-    struct CntntIdxStoreImpl : sw::mark::CntntIdxStore
+    struct ContentIdxStoreImpl : sw::mark::ContentIdxStore
     {
         std::vector<MarkEntry> m_aBkmkEntries;
         std::vector<MarkEntry> m_aRedlineEntries;
         std::vector<MarkEntry> m_aFlyEntries;
         std::vector<PaMEntry> m_aUnoCrsrEntries;
         std::vector<PaMEntry> m_aShellCrsrEntries;
-        typedef boost::function<void (SwPosition& rPos, sal_Int32 nCntnt)> updater_t;
+        typedef boost::function<void (SwPosition& rPos, sal_Int32 nContent)> updater_t;
         virtual void Clear() SAL_OVERRIDE
         {
             m_aBkmkEntries.clear();
@@ -142,17 +142,17 @@ namespace
         {
             return m_aBkmkEntries.empty() && m_aRedlineEntries.empty() && m_aFlyEntries.empty() && m_aUnoCrsrEntries.empty() && m_aShellCrsrEntries.empty();
         }
-        virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit=false) SAL_OVERRIDE
+        virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit=false) SAL_OVERRIDE
         {
-            SaveBkmks(pDoc, nNode, nCntnt);
-            SaveRedlines(pDoc, nNode, nCntnt);
-            SaveFlys(pDoc, nNode, nCntnt, bSaveFlySplit);
-            SaveUnoCrsrs(pDoc, nNode, nCntnt);
-            SaveShellCrsrs(pDoc, nNode, nCntnt);
+            SaveBkmks(pDoc, nNode, nContent);
+            SaveRedlines(pDoc, nNode, nContent);
+            SaveFlys(pDoc, nNode, nContent, bSaveFlySplit);
+            SaveUnoCrsrs(pDoc, nNode, nContent);
+            SaveShellCrsrs(pDoc, nNode, nContent);
         }
         virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nOffset=0, bool bAuto = false) SAL_OVERRIDE
         {
-            SwCntntNode* pCNd = pDoc->GetNodes()[ nNode ]->GetCntntNode();
+            SwContentNode* pCNd = pDoc->GetNodes()[ nNode ]->GetContentNode();
             updater_t aUpdater = OffsetUpdater(pCNd, nOffset);
             RestoreBkmks(pDoc, aUpdater);
             RestoreRedlines(pDoc, aUpdater);
@@ -162,7 +162,7 @@ namespace
         }
         virtual void Restore(SwNode& rNd, sal_Int32 nLen, sal_Int32 nCorrLen) SAL_OVERRIDE
         {
-            SwCntntNode* pCNd = rNd.GetCntntNode();
+            SwContentNode* pCNd = rNd.GetContentNode();
             SwDoc* pDoc = rNd.GetDoc();
             updater_t aUpdater = LimitUpdater(pCNd, nLen, nCorrLen);
             RestoreBkmks(pDoc, aUpdater);
@@ -171,36 +171,36 @@ namespace
             RestoreUnoCrsrs(aUpdater);
             RestoreShellCrsrs(aUpdater);
         }
-        virtual ~CntntIdxStoreImpl(){};
+        virtual ~ContentIdxStoreImpl(){};
         private:
-            inline void SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+            inline void SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
             inline void RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater);
-            inline void SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+            inline void SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
             inline void RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater);
-            inline void SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit);
+            inline void SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit);
             inline void RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto);
-            inline void SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+            inline void SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
             inline void RestoreUnoCrsrs(updater_t& rUpdater);
-            inline void SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+            inline void SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
             inline void RestoreShellCrsrs(updater_t& rUpdater);
             static inline const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther)
                 { return bOther ? pMark->GetOtherMarkPos() : pMark->GetMarkPos(); };
             static inline void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos)
                 { bOther ? pMark->SetOtherMarkPos(*pPos) : pMark->SetMarkPos(*pPos); };
     };
-    static inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nCntnt, SwPaM& rPaM, const bool bPoint)
+    static inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM, const bool bPoint)
     {
         const SwPosition* pPos = &rPaM.GetBound( bPoint );
-        if( pPos->nNode.GetIndex() == nNode && pPos->nContent.GetIndex() < nCntnt )
+        if( pPos->nNode.GetIndex() == nNode && pPos->nContent.GetIndex() < nContent )
         {
             const PaMEntry aEntry = { &rPaM, bPoint, pPos->nContent.GetIndex() };
             rPaMEntries.push_back(aEntry);
         }
     }
-    static inline void lcl_ChkPaMBoth( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nCntnt, SwPaM& rPaM)
+    static inline void lcl_ChkPaMBoth( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM)
     {
-        lcl_ChkPaM(rPaMEntries, nNode, nCntnt, rPaM, true);
-        lcl_ChkPaM(rPaMEntries, nNode, nCntnt, rPaM, false);
+        lcl_ChkPaM(rPaMEntries, nNode, nContent, rPaM, true);
+        lcl_ChkPaM(rPaMEntries, nNode, nContent, rPaM, false);
     }
 
 #if 0
@@ -212,7 +212,7 @@ namespace
 #endif
 }
 
-void CntntIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
 {
     IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
     const IDocumentMarkAccess::const_iterator_t ppBkmkEnd = pMarkAccess->getAllMarksEnd();
@@ -224,19 +224,19 @@ void CntntIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt
         const ::sw::mark::IMark* pBkmk = ppBkmk->get();
         bool bMarkPosEqual = false;
         if(pBkmk->GetMarkPos().nNode.GetIndex() == nNode
-            && pBkmk->GetMarkPos().nContent.GetIndex() <= nCntnt)
+            && pBkmk->GetMarkPos().nContent.GetIndex() <= nContent)
         {
-            if(pBkmk->GetMarkPos().nContent.GetIndex() < nCntnt)
+            if(pBkmk->GetMarkPos().nContent.GetIndex() < nContent)
             {
                 const MarkEntry aEntry = { ppBkmk - pMarkAccess->getAllMarksBegin(), false, pBkmk->GetMarkPos().nContent.GetIndex() };
                 m_aBkmkEntries.push_back(aEntry);
             }
-            else // if a bookmark position is equal nCntnt, the other position
+            else // if a bookmark position is equal nContent, the other position
                 bMarkPosEqual = true; // has to decide if it is added to the array
         }
         if(pBkmk->IsExpanded()
             && pBkmk->GetOtherMarkPos().nNode.GetIndex() == nNode
-            && pBkmk->GetOtherMarkPos().nContent.GetIndex() <= nCntnt)
+            && pBkmk->GetOtherMarkPos().nContent.GetIndex() <= nContent)
         {
             if(bMarkPosEqual)
             { // the other position is before, the (main) position is equal
@@ -249,7 +249,7 @@ void CntntIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt
     }
 }
 
-void CntntIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater)
 {
     IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
     for (const MarkEntry& aEntry : m_aBkmkEntries)
@@ -257,20 +257,20 @@ void CntntIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater)
         if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aEntry.m_nIdx].get()))
         {
             SwPosition aNewPos(GetRightMarkPos(pMark, aEntry.m_bOther));
-            rUpdater(aNewPos, aEntry.m_nCntnt);
+            rUpdater(aNewPos, aEntry.m_nContent);
             SetRightMarkPos(pMark, aEntry.m_bOther, &aNewPos);
         }
     }
 }
 
-void CntntIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
 {
-    SwRedlineTbl const & pRedlineTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+    SwRedlineTable const & pRedlineTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
     long int nIdx = 0;
-    for (const SwRangeRedline* pRdl : pRedlineTbl)
+    for (const SwRangeRedline* pRdl : pRedlineTable)
     {
-        int nPointPos = lcl_RelativePosition( *pRdl->GetPoint(), nNode, nCntnt );
-        int nMarkPos = pRdl->HasMark() ? lcl_RelativePosition( *pRdl->GetMark(), nNode, nCntnt ) :
+        int nPointPos = lcl_RelativePosition( *pRdl->GetPoint(), nNode, nContent );
+        int nMarkPos = pRdl->HasMark() ? lcl_RelativePosition( *pRdl->GetMark(), nNode, nContent ) :
                                           nPointPos;
         // #i59534: We have to store the positions inside the same node before the insert position
         // and the one at the insert position if the corresponding Point/Mark position is before
@@ -291,21 +291,21 @@ void CntntIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCn
     }
 }
 
-void CntntIdxStoreImpl::RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater)
 {
-    const SwRedlineTbl& rRedlTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+    const SwRedlineTable& rRedlTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
     for (const MarkEntry& aEntry : m_aRedlineEntries)
     {
         SwPosition* const pPos = aEntry.m_bOther
-            ? rRedlTbl[ aEntry.m_nIdx ]->GetMark()
-            : rRedlTbl[ aEntry.m_nIdx ]->GetPoint();
-        rUpdater(*pPos, aEntry.m_nCntnt);
+            ? rRedlTable[ aEntry.m_nIdx ]->GetMark()
+            : rRedlTable[ aEntry.m_nIdx ]->GetPoint();
+        rUpdater(*pPos, aEntry.m_nContent);
     }
 }
 
-void CntntIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit)
+void ContentIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit)
 {
-    SwCntntNode *pNode = pDoc->GetNodes()[nNode]->GetCntntNode();
+    SwContentNode *pNode = pDoc->GetNodes()[nNode]->GetContentNode();
     if( !pNode )
         return;
     SwFrm* pFrm = pNode->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
@@ -315,22 +315,22 @@ void CntntIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt,
             return; // if we have a layout and no DrawObjs, we can skip this
     }
     MarkEntry aSave = { 0, false, 0 };
-    for (const SwFrmFmt* pFrmFmt : *pDoc->GetSpzFrmFmts())
+    for (const SwFrameFormat* pFrameFormat : *pDoc->GetSpzFrameFormats())
     {
-        if ( RES_FLYFRMFMT == pFrmFmt->Which() || RES_DRAWFRMFMT == pFrmFmt->Which() )
+        if ( RES_FLYFRMFMT == pFrameFormat->Which() || RES_DRAWFRMFMT == pFrameFormat->Which() )
         {
-            const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-            SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+            const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+            SwPosition const*const pAPos = rAnchor.GetContentAnchor();
             if ( pAPos && ( nNode == pAPos->nNode.GetIndex() ) &&
                  ( FLY_AT_PARA == rAnchor.GetAnchorId() ||
                    FLY_AT_CHAR == rAnchor.GetAnchorId() ) )
             {
                 bool bSkip = false;
                 aSave.m_bOther = false;
-                aSave.m_nCntnt = pAPos->nContent.GetIndex();
+                aSave.m_nContent = pAPos->nContent.GetIndex();
                 if ( FLY_AT_CHAR == rAnchor.GetAnchorId() )
                 {
-                    if( nCntnt <= aSave.m_nCntnt )
+                    if( nContent <= aSave.m_nContent )
                     {
                         if( bSaveFlySplit )
                             aSave.m_bOther = true;
@@ -346,65 +346,65 @@ void CntntIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt,
     }
 }
 
-void CntntIdxStoreImpl::RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto)
+void ContentIdxStoreImpl::RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto)
 {
-    SwFrmFmts* pSpz = pDoc->GetSpzFrmFmts();
+    SwFrameFormats* pSpz = pDoc->GetSpzFrameFormats();
     for (const MarkEntry& aEntry : m_aFlyEntries)
     {
         if(!aEntry.m_bOther)
         {
-            SwFrmFmt *pFrmFmt = (*pSpz)[ aEntry.m_nIdx ];
-            const SwFmtAnchor& rFlyAnchor = pFrmFmt->GetAnchor();
-            if( rFlyAnchor.GetCntntAnchor() )
+            SwFrameFormat *pFrameFormat = (*pSpz)[ aEntry.m_nIdx ];
+            const SwFormatAnchor& rFlyAnchor = pFrameFormat->GetAnchor();
+            if( rFlyAnchor.GetContentAnchor() )
             {
-                SwFmtAnchor aNew( rFlyAnchor );
-                SwPosition aNewPos( *rFlyAnchor.GetCntntAnchor() );
-                rUpdater(aNewPos, aEntry.m_nCntnt);
+                SwFormatAnchor aNew( rFlyAnchor );
+                SwPosition aNewPos( *rFlyAnchor.GetContentAnchor() );
+                rUpdater(aNewPos, aEntry.m_nContent);
                 if ( FLY_AT_CHAR != rFlyAnchor.GetAnchorId() )
                 {
                     aNewPos.nContent.Assign( 0, 0 );
                 }
                 aNew.SetAnchor( &aNewPos );
-                pFrmFmt->SetFmtAttr( aNew );
+                pFrameFormat->SetFormatAttr( aNew );
             }
         }
         else if( bAuto )
         {
-            SwFrmFmt *pFrmFmt = (*pSpz)[ aEntry.m_nIdx ];
-            SfxPoolItem *pAnchor = (SfxPoolItem*)&pFrmFmt->GetAnchor();
-            pFrmFmt->NotifyClients( pAnchor, pAnchor );
+            SwFrameFormat *pFrameFormat = (*pSpz)[ aEntry.m_nIdx ];
+            SfxPoolItem *pAnchor = (SfxPoolItem*)&pFrameFormat->GetAnchor();
+            pFrameFormat->NotifyClients( pAnchor, pAnchor );
         }
     }
 }
 
-void CntntIdxStoreImpl::SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
 {
-    for (const SwUnoCrsr* pUnoCrsr : pDoc->GetUnoCrsrTbl())
+    for (const SwUnoCrsr* pUnoCrsr : pDoc->GetUnoCrsrTable())
     {
         for(SwPaM& rPaM : (const_cast<SwUnoCrsr*>(pUnoCrsr))->GetRingContainer())
         {
-            lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nCntnt, rPaM);
+            lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nContent, rPaM);
         }
-        const SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<const SwUnoTableCrsr*>(pUnoCrsr);
-        if( pUnoTblCrsr )
+        const SwUnoTableCrsr* pUnoTableCrsr = dynamic_cast<const SwUnoTableCrsr*>(pUnoCrsr);
+        if( pUnoTableCrsr )
         {
-            for(SwPaM& rPaM : (&(const_cast<SwUnoTableCrsr*>(pUnoTblCrsr))->GetSelRing())->GetRingContainer())
+            for(SwPaM& rPaM : (&(const_cast<SwUnoTableCrsr*>(pUnoTableCrsr))->GetSelRing())->GetRingContainer())
             {
-                lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nCntnt, rPaM);
+                lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nContent, rPaM);
             }
         }
     }
 }
 
-void CntntIdxStoreImpl::RestoreUnoCrsrs(updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreUnoCrsrs(updater_t& rUpdater)
 {
     for (const PaMEntry& aEntry : m_aUnoCrsrEntries)
     {
-        rUpdater(aEntry.m_pPaM->GetBound(!aEntry.m_isMark), aEntry.m_nCntnt);
+        rUpdater(aEntry.m_pPaM->GetBound(!aEntry.m_isMark), aEntry.m_nContent);
     }
 }
 
-void CntntIdxStoreImpl::SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
 {
     SwCrsrShell* pShell = pDoc->GetEditShell();
     if( !pShell )
@@ -416,30 +416,30 @@ void CntntIdxStoreImpl::SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 n
             SwPaM *_pStkCrsr = static_cast<SwCrsrShell*>(&rCurShell)->GetStkCrsr();
             if( _pStkCrsr )
                 do {
-                    lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nCntnt, *_pStkCrsr);
+                    lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nContent, *_pStkCrsr);
                 } while ( (_pStkCrsr != 0 ) &&
                     ((_pStkCrsr = _pStkCrsr->GetNext()) != static_cast<SwCrsrShell*>(&rCurShell)->GetStkCrsr()) );
 
             for(SwPaM& rPaM : (static_cast<SwCrsrShell*>(&rCurShell)->_GetCrsr())->GetRingContainer())
             {
-                lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nCntnt, rPaM);
+                lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nContent, rPaM);
             }
         }
     }
 }
 
-void CntntIdxStoreImpl::RestoreShellCrsrs(updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreShellCrsrs(updater_t& rUpdater)
 {
     for (const PaMEntry& aEntry : m_aShellCrsrEntries)
     {
-        rUpdater(aEntry.m_pPaM->GetBound(aEntry.m_isMark), aEntry.m_nCntnt);
+        rUpdater(aEntry.m_pPaM->GetBound(aEntry.m_isMark), aEntry.m_nContent);
     }
 }
 
 namespace sw { namespace mark {
-    std::shared_ptr<CntntIdxStore> CntntIdxStore::Create()
+    std::shared_ptr<ContentIdxStore> ContentIdxStore::Create()
     {
-       return std::make_shared<CntntIdxStoreImpl>();
+       return std::make_shared<ContentIdxStoreImpl>();
     }
 }}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
index cd8d0e3352d1..a24cd7b22517 100644
--- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx
+++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
@@ -58,7 +58,7 @@ void DocumentChartDataProviderManager::CreateChartInternalDataProviders( const S
 {
     if (pTable)
     {
-        OUString aName( pTable->GetFrmFmt()->GetName() );
+        OUString aName( pTable->GetFrameFormat()->GetName() );
         SwOLENode *pONd;
         SwStartNode *pStNd;
         SwNodeIndex aIdx( *m_rDoc.GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
@@ -66,7 +66,7 @@ void DocumentChartDataProviderManager::CreateChartInternalDataProviders( const S
         {
             ++aIdx;
             if( 0 != ( pONd = aIdx.GetNode().GetOLENode() ) &&
-                aName == pONd->GetChartTblName() /* OLE node is chart? */ &&
+                aName == pONd->GetChartTableName() /* OLE node is chart? */ &&
                 0 != (pONd->getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout() )) /* chart frame is not hidden */ )
             {
                 uno::Reference < embed::XEmbeddedObject > xIP = pONd->GetOLEObj().GetOleRef();
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 349e457de7dc..06c0c4c8ad82 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -83,13 +83,13 @@ namespace
     static bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
                         sal_uLong nInsNd )
     {
-        const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
+        const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
 
-        for( size_t n = 0; n < rFrmFmtTbl.size(); ++n )
+        for( size_t n = 0; n < rFrameFormatTable.size(); ++n )
         {
-            SwFrmFmt const*const  pFmt = rFrmFmtTbl[n];
-            SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-            SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+            SwFrameFormat const*const  pFormat = rFrameFormatTable[n];
+            SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+            SwPosition const*const pAPos = pAnchor->GetContentAnchor();
             if (pAPos &&
                 ((FLY_AS_CHAR == pAnchor->GetAnchorId()) ||
                  (FLY_AT_CHAR == pAnchor->GetAnchorId()) ||
@@ -98,10 +98,10 @@ namespace
                 nSttNd <= pAPos->nNode.GetIndex() &&
                 pAPos->nNode.GetIndex() < nEndNd )
             {
-                const SwFmtCntnt& rCntnt = pFmt->GetCntnt();
+                const SwFormatContent& rContent = pFormat->GetContent();
                 SwStartNode* pSNd;
-                if( !rCntnt.GetCntntIdx() ||
-                    0 == ( pSNd = rCntnt.GetCntntIdx()->GetNode().GetStartNode() ))
+                if( !rContent.GetContentIdx() ||
+                    0 == ( pSNd = rContent.GetContentIdx()->GetNode().GetStartNode() ))
                     continue;
 
                 if( pSNd->GetIndex() < nInsNd &&
@@ -169,20 +169,20 @@ namespace
         sal_uLong nNdOff = rOrigPos.nNode.GetIndex();
         nNdOff -= rOrigStt.nNode.GetIndex();
         nNdOff -= nDelCount;
-        sal_Int32 nCntntPos = rOrigPos.nContent.GetIndex();
+        sal_Int32 nContentPos = rOrigPos.nContent.GetIndex();
 
         // Always adjust <nNode> at to be changed <SwPosition> instance <rChgPos>
         rChgPos.nNode = nNdOff + rCpyStt.nNode.GetIndex();
         if( !nNdOff )
         {
             // dann nur den Content anpassen
-            if( nCntntPos > rOrigStt.nContent.GetIndex() )
-                nCntntPos -= rOrigStt.nContent.GetIndex();
+            if( nContentPos > rOrigStt.nContent.GetIndex() )
+                nContentPos -= rOrigStt.nContent.GetIndex();
             else
-                nCntntPos = 0;
-            nCntntPos += rCpyStt.nContent.GetIndex();
+                nContentPos = 0;
+            nContentPos += rCpyStt.nContent.GetIndex();
         }
-        rChgPos.nContent.Assign( rChgPos.nNode.GetNode().GetCntntNode(), nCntntPos );
+        rChgPos.nContent.Assign( rChgPos.nNode.GetNode().GetContentNode(), nContentPos );
     }
 
     // TODO: use SaveBookmark (from _DelBookmarks)
@@ -288,8 +288,8 @@ namespace
     static void lcl_DeleteRedlines( const SwPaM& rPam, SwPaM& rCpyPam )
     {
         const SwDoc* pSrcDoc = rPam.GetDoc();
-        const SwRedlineTbl& rTbl = pSrcDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-        if( !rTbl.empty() )
+        const SwRedlineTable& rTable = pSrcDoc->getIDocumentRedlineAccess().GetRedlineTable();
+        if( !rTable.empty() )
         {
             SwDoc* pDestDoc = rCpyPam.GetDoc();
             SwPosition* pCpyStt = rCpyPam.Start(), *pCpyEnd = rCpyPam.End();
@@ -301,9 +301,9 @@ namespace
 
             sal_uInt16 n = 0;
             pSrcDoc->getIDocumentRedlineAccess().GetRedline( *pStt, &n );
-            for( ; n < rTbl.size(); ++n )
+            for( ; n < rTable.size(); ++n )
             {
-                const SwRangeRedline* pRedl = rTbl[ n ];
+                const SwRangeRedline* pRedl = rTable[ n ];
                 if( nsRedlineType_t::REDLINE_DELETE == pRedl->GetType() && pRedl->IsVisible() )
                 {
                     const SwPosition *pRStt = pRedl->Start(), *pREnd = pRedl->End();
@@ -319,7 +319,7 @@ namespace
                     case POS_COLLIDE_START:
                     case POS_BEHIND:
                         // Pos1 is after Pos2
-                        n = rTbl.size();
+                        n = rTable.size();
                         break;
 
                     default:
@@ -369,7 +369,7 @@ namespace
     static void lcl_DeleteRedlines( const SwNodeRange& rRg, SwNodeRange& rCpyRg )
     {
         SwDoc* pSrcDoc = rRg.aStart.GetNode().GetDoc();
-        if( !pSrcDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+        if( !pSrcDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
         {
             SwPaM aRgTmp( rRg.aStart, rRg.aEnd );
             SwPaM aCpyTmp( rCpyRg.aStart, rCpyRg.aEnd );
@@ -377,19 +377,19 @@ namespace
         }
     }
 
-    static void lcl_ChainFmts( SwFlyFrmFmt *pSrc, SwFlyFrmFmt *pDest )
+    static void lcl_ChainFormats( SwFlyFrameFormat *pSrc, SwFlyFrameFormat *pDest )
     {
-        SwFmtChain aSrc( pSrc->GetChain() );
+        SwFormatChain aSrc( pSrc->GetChain() );
         if ( !aSrc.GetNext() )
         {
             aSrc.SetNext( pDest );
-            pSrc->SetFmtAttr( aSrc );
+            pSrc->SetFormatAttr( aSrc );
         }
-        SwFmtChain aDest( pDest->GetChain() );
+        SwFormatChain aDest( pDest->GetChain() );
         if ( !aDest.GetPrev() )
         {
             aDest.SetPrev( pSrc );
-            pDest->SetFmtAttr( aDest );
+            pDest->SetFormatAttr( aDest );
         }
     }
 
@@ -398,10 +398,10 @@ namespace
     {
         bool bRet = false;
 
-        const SwTxtNode* pTxtNd = rPam.Start()->nNode.GetNode().GetTxtNode();
-        const SwTxtNode* pEndTxtNd = rPam.End()->nNode.GetNode().GetTxtNode();
-        if ( pTxtNd && pTxtNd->IsInList() &&
-             pEndTxtNd && pEndTxtNd->IsInList() )
+        const SwTextNode* pTextNd = rPam.Start()->nNode.GetNode().GetTextNode();
+        const SwTextNode* pEndTextNd = rPam.End()->nNode.GetNode().GetTextNode();
+        if ( pTextNd && pTextNd->IsInList() &&
+             pEndTextNd && pEndTextNd->IsInList() )
         {
             bRet = true;
             SwNodeIndex aIdx(rPam.Start()->nNode);
@@ -409,14 +409,14 @@ namespace
             do
             {
                 ++aIdx;
-                pTxtNd = aIdx.GetNode().GetTxtNode();
+                pTextNd = aIdx.GetNode().GetTextNode();
 
-                if ( !pTxtNd || !pTxtNd->IsInList() )
+                if ( !pTextNd || !pTextNd->IsInList() )
                 {
                     bRet = false;
                     break;
                 }
-            } while ( pTxtNd && pTxtNd != pEndTxtNd );
+            } while ( pTextNd && pTextNd != pEndTextNd );
         }
 
         return bRet;
@@ -430,8 +430,8 @@ namespace
 
         if (NULL != pStt && NULL != pEnd)
         {
-            const SwTxtNode* pSttNd = pStt->nNode.GetNode().GetTxtNode();
-            const SwTxtNode* pEndNd = pEnd->nNode.GetNode().GetTxtNode();
+            const SwTextNode* pSttNd = pStt->nNode.GetNode().GetTextNode();
+            const SwTextNode* pEndNd = pEnd->nNode.GetNode().GetTextNode();
 
             if (NULL != pSttNd && NULL != pEndNd &&
                 pStt->nContent.GetIndex() == 0 &&
@@ -451,25 +451,25 @@ namespace
     static void
     lcl_CalcBreaks( ::std::vector<sal_Int32> & rBreaks, SwPaM const & rPam )
     {
-        SwTxtNode const * const pTxtNode(
-                rPam.End()->nNode.GetNode().GetTxtNode() );
-        if (!pTxtNode)
+        SwTextNode const * const pTextNode(
+                rPam.End()->nNode.GetNode().GetTextNode() );
+        if (!pTextNode)
             return; // left-overlap only possible at end of selection...
 
         const sal_Int32 nStart(rPam.Start()->nContent.GetIndex());
         const sal_Int32 nEnd  (rPam.End  ()->nContent.GetIndex());
-        if (nEnd == pTxtNode->Len())
+        if (nEnd == pTextNode->Len())
             return; // paragraph selected until the end
 
         for (sal_Int32 i = nStart; i < nEnd; ++i)
         {
-            const sal_Unicode c(pTxtNode->GetTxt()[i]);
+            const sal_Unicode c(pTextNode->GetText()[i]);
             if ((CH_TXTATR_INWORD == c) || (CH_TXTATR_BREAKWORD == c))
             {
-                SwTxtAttr const * const pAttr( pTxtNode->GetTxtAttrForCharAt(i) );
+                SwTextAttr const * const pAttr( pTextNode->GetTextAttrForCharAt(i) );
                 if (pAttr && pAttr->End() && (*pAttr->End() > nEnd))
                 {
-                    OSL_ENSURE(pAttr->HasDummyChar(), "GetTxtAttrForCharAt broken?");
+                    OSL_ENSURE(pAttr->HasDummyChar(), "GetTextAttrForCharAt broken?");
                     rBreaks.push_back(i);
                 }
             }
@@ -529,11 +529,11 @@ namespace
         if( rPam.GetPoint()->nNode != rPam.GetMark()->nNode )
         {
             const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End();
-            const SwTxtNode* pEndNd = pEnd->nNode.GetNode().GetTxtNode();
-            if( (0 != pEndNd) && pStt->nNode.GetNode().IsTxtNode() )
+            const SwTextNode* pEndNd = pEnd->nNode.GetNode().GetTextNode();
+            if( (0 != pEndNd) && pStt->nNode.GetNode().IsTextNode() )
             {
                 const sal_uInt64 nSum = pStt->nContent.GetIndex() +
-                    pEndNd->GetTxt().getLength() - pEnd->nContent.GetIndex();
+                    pEndNd->GetText().getLength() - pEnd->nContent.GetIndex();
                 return nSum > static_cast<sal_uInt64>(SAL_MAX_INT32);
             }
         }
@@ -598,22 +598,22 @@ namespace
         void SetPos( sal_uInt32 nInsPos )
         {
             pRedl->GetPoint()->nNode = nInsPos + nStt;
-            pRedl->GetPoint()->nContent.Assign( pRedl->GetCntntNode(), nSttCnt );
+            pRedl->GetPoint()->nContent.Assign( pRedl->GetContentNode(), nSttCnt );
             if( pRedl->HasMark() )
             {
                 pRedl->GetMark()->nNode = nInsPos + nEnd;
-                pRedl->GetMark()->nContent.Assign( pRedl->GetCntntNode(false), nEndCnt );
+                pRedl->GetMark()->nContent.Assign( pRedl->GetContentNode(false), nEndCnt );
             }
         }
 
         void SetPos( const SwPosition& aPos )
         {
             pRedl->GetPoint()->nNode = aPos.nNode.GetIndex() + nStt;
-            pRedl->GetPoint()->nContent.Assign( pRedl->GetCntntNode(), nSttCnt + ( nStt == 0 ? aPos.nContent.GetIndex() : 0 ) );
+            pRedl->GetPoint()->nContent.Assign( pRedl->GetContentNode(), nSttCnt + ( nStt == 0 ? aPos.nContent.GetIndex() : 0 ) );
             if( pRedl->HasMark() )
             {
                 pRedl->GetMark()->nNode = aPos.nNode.GetIndex() + nEnd;
-                pRedl->GetMark()->nContent.Assign( pRedl->GetCntntNode(false), nEndCnt  + ( nEnd == 0 ? aPos.nContent.GetIndex() : 0 ) );
+                pRedl->GetMark()->nContent.Assign( pRedl->GetContentNode(false), nEndCnt  + ( nEnd == 0 ? aPos.nContent.GetIndex() : 0 ) );
             }
         }
     };
@@ -639,7 +639,7 @@ namespace
 
         // iterate over relevant redlines and decide for each whether it should
         // be saved, or split + saved
-        SwRedlineTbl& rRedlineTable = const_cast<SwRedlineTbl&>( pDoc->getIDocumentRedlineAccess().GetRedlineTbl() );
+        SwRedlineTable& rRedlineTable = const_cast<SwRedlineTable&>( pDoc->getIDocumentRedlineAccess().GetRedlineTable() );
         for( ; nCurrentRedline < rRedlineTable.size(); nCurrentRedline++ )
         {
             SwRangeRedline* pCurrent = rRedlineTable[ nCurrentRedline ];
@@ -706,18 +706,18 @@ namespace
         SwDoc* pDoc = rRg.aStart.GetNode().GetDoc();
         sal_uInt16 nRedlPos;
         SwPosition aSrchPos( rRg.aStart ); aSrchPos.nNode--;
-        aSrchPos.nContent.Assign( aSrchPos.nNode.GetNode().GetCntntNode(), 0 );
+        aSrchPos.nContent.Assign( aSrchPos.nNode.GetNode().GetContentNode(), 0 );
         if( pDoc->getIDocumentRedlineAccess().GetRedline( aSrchPos, &nRedlPos ) && nRedlPos )
             --nRedlPos;
-        else if( nRedlPos >= pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() )
+        else if( nRedlPos >= pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() )
             return ;
 
         RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode();
         pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON ));
-        SwRedlineTbl& rRedlTbl = (SwRedlineTbl&)pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+        SwRedlineTable& rRedlTable = (SwRedlineTable&)pDoc->getIDocumentRedlineAccess().GetRedlineTable();
 
         do {
-            SwRangeRedline* pTmp = rRedlTbl[ nRedlPos ];
+            SwRangeRedline* pTmp = rRedlTable[ nRedlPos ];
 
             const SwPosition* pRStt = pTmp->Start(),
                             * pREnd = pTmp->GetMark() == pRStt
@@ -733,7 +733,7 @@ namespace
                     SwPosition* pTmpPos = pNewRedl->Start();
                     pTmpPos->nNode = rRg.aStart;
                     pTmpPos->nContent.Assign(
-                                pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+                                pTmpPos->nNode.GetNode().GetContentNode(), 0 );
 
                     _SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
                     rArr.push_back( pSave );
@@ -741,19 +741,19 @@ namespace
                     pTmpPos = pTmp->End();
                     pTmpPos->nNode = rRg.aEnd;
                     pTmpPos->nContent.Assign(
-                                pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+                                pTmpPos->nNode.GetNode().GetContentNode(), 0 );
                 }
                 else if( pREnd->nNode == rRg.aStart )
                 {
                     SwPosition* pTmpPos = pTmp->End();
                     pTmpPos->nNode = rRg.aEnd;
                     pTmpPos->nContent.Assign(
-                                pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+                                pTmpPos->nNode.GetNode().GetContentNode(), 0 );
                 }
             }
             else if( pRStt->nNode < rRg.aEnd )
             {
-                rRedlTbl.Remove( nRedlPos-- );
+                rRedlTable.Remove( nRedlPos-- );
                 if( pREnd->nNode < rRg.aEnd ||
                     ( pREnd->nNode == rRg.aEnd && !pREnd->nContent.GetIndex()) )
                 {
@@ -768,7 +768,7 @@ namespace
                     SwPosition* pTmpPos = pNewRedl->End();
                     pTmpPos->nNode = rRg.aEnd;
                     pTmpPos->nContent.Assign(
-                                pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+                                pTmpPos->nNode.GetNode().GetContentNode(), 0 );
 
                     _SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
                     rArr.push_back( pSave );
@@ -776,14 +776,14 @@ namespace
                     pTmpPos = pTmp->Start();
                     pTmpPos->nNode = rRg.aEnd;
                     pTmpPos->nContent.Assign(
-                                pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+                                pTmpPos->nNode.GetNode().GetContentNode(), 0 );
                     pDoc->getIDocumentRedlineAccess().AppendRedline( pTmp, true );
                 }
             }
             else
                 break;
 
-        } while( ++nRedlPos < pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() );
+        } while( ++nRedlPos < pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() );
         pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
     }
 
@@ -801,110 +801,110 @@ namespace
         pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
     }
 
-    static bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
+    static bool lcl_SaveFootnote( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
                      const SwNodeIndex& rInsPos,
-                     SwFtnIdxs& rFtnArr, SwFtnIdxs& rSaveArr,
+                     SwFootnoteIdxs& rFootnoteArr, SwFootnoteIdxs& rSaveArr,
                      const SwIndex* pSttCnt = 0, const SwIndex* pEndCnt = 0 )
     {
-        bool bUpdateFtn = false;
+        bool bUpdateFootnote = false;
         const SwNodes& rNds = rInsPos.GetNodes();
-        const bool bDelFtn = rInsPos.GetIndex() < rNds.GetEndOfAutotext().GetIndex() &&
+        const bool bDelFootnote = rInsPos.GetIndex() < rNds.GetEndOfAutotext().GetIndex() &&
                     rSttNd.GetIndex() >= rNds.GetEndOfAutotext().GetIndex();
-        const bool bSaveFtn = !bDelFtn &&
+        const bool bSaveFootnote = !bDelFootnote &&
                         rInsPos.GetIndex() >= rNds.GetEndOfExtras().GetIndex();
-        if( !rFtnArr.empty() )
+        if( !rFootnoteArr.empty() )
         {
 
             size_t nPos = 0;
-            rFtnArr.SeekEntry( rSttNd, &nPos );
-            SwTxtFtn* pSrch;
-            const SwNode* pFtnNd;
+            rFootnoteArr.SeekEntry( rSttNd, &nPos );
+            SwTextFootnote* pSrch;
+            const SwNode* pFootnoteNd;
 
             // Delete/save all that come after it
-            while( nPos < rFtnArr.size() && ( pFtnNd =
-                &( pSrch = rFtnArr[ nPos ] )->GetTxtNode())->GetIndex()
+            while( nPos < rFootnoteArr.size() && ( pFootnoteNd =
+                &( pSrch = rFootnoteArr[ nPos ] )->GetTextNode())->GetIndex()
                         <= rEndNd.GetIndex() )
             {
-                const sal_Int32 nFtnSttIdx = pSrch->GetStart();
+                const sal_Int32 nFootnoteSttIdx = pSrch->GetStart();
                 if( ( pEndCnt && pSttCnt )
-                    ? (( &rSttNd.GetNode() == pFtnNd &&
-                         pSttCnt->GetIndex() > nFtnSttIdx) ||
-                       ( &rEndNd.GetNode() == pFtnNd &&
-                        nFtnSttIdx >= pEndCnt->GetIndex() ))
-                    : ( &rEndNd.GetNode() == pFtnNd ))
+                    ? (( &rSttNd.GetNode() == pFootnoteNd &&
+                         pSttCnt->GetIndex() > nFootnoteSttIdx) ||
+                       ( &rEndNd.GetNode() == pFootnoteNd &&
+                        nFootnoteSttIdx >= pEndCnt->GetIndex() ))
+                    : ( &rEndNd.GetNode() == pFootnoteNd ))
                 {
                     ++nPos;     // continue searching
                 }
                 else
                 {
                     // delete it
-                    if( bDelFtn )
+                    if( bDelFootnote )
                     {
-                        SwTxtNode& rTxtNd = (SwTxtNode&)pSrch->GetTxtNode();
-                        SwIndex aIdx( &rTxtNd, nFtnSttIdx );
-                        rTxtNd.EraseText( aIdx, 1 );
+                        SwTextNode& rTextNd = (SwTextNode&)pSrch->GetTextNode();
+                        SwIndex aIdx( &rTextNd, nFootnoteSttIdx );
+                        rTextNd.EraseText( aIdx, 1 );
                     }
                     else
                     {
                         pSrch->DelFrms(0);
-                        rFtnArr.erase( rFtnArr.begin() + nPos );
-                        if( bSaveFtn )
+                        rFootnoteArr.erase( rFootnoteArr.begin() + nPos );
+                        if( bSaveFootnote )
                             rSaveArr.insert( pSrch );
                     }
-                    bUpdateFtn = true;
+                    bUpdateFootnote = true;
                 }
             }
 
-            while( nPos-- && ( pFtnNd = &( pSrch = rFtnArr[ nPos ] )->
-                    GetTxtNode())->GetIndex() >= rSttNd.GetIndex() )
+            while( nPos-- && ( pFootnoteNd = &( pSrch = rFootnoteArr[ nPos ] )->
+                    GetTextNode())->GetIndex() >= rSttNd.GetIndex() )
             {
-                const sal_Int32 nFtnSttIdx = pSrch->GetStart();
+                const sal_Int32 nFootnoteSttIdx = pSrch->GetStart();
                 if( !pEndCnt || !pSttCnt ||
-                    !( (( &rSttNd.GetNode() == pFtnNd &&
-                        pSttCnt->GetIndex() > nFtnSttIdx ) ||
-                       ( &rEndNd.GetNode() == pFtnNd &&
-                        nFtnSttIdx >= pEndCnt->GetIndex() )) ))
+                    !( (( &rSttNd.GetNode() == pFootnoteNd &&
+                        pSttCnt->GetIndex() > nFootnoteSttIdx ) ||
+                       ( &rEndNd.GetNode() == pFootnoteNd &&
+                        nFootnoteSttIdx >= pEndCnt->GetIndex() )) ))
                 {
-                    if( bDelFtn )
+                    if( bDelFootnote )
                     {
                         // delete it
-                        SwTxtNode& rTxtNd = (SwTxtNode&)pSrch->GetTxtNode();
-                        SwIndex aIdx( &rTxtNd, nFtnSttIdx );
-                        rTxtNd.EraseText( aIdx, 1 );
+                        SwTextNode& rTextNd = (SwTextNode&)pSrch->GetTextNode();
+                        SwIndex aIdx( &rTextNd, nFootnoteSttIdx );
+                        rTextNd.EraseText( aIdx, 1 );
                     }
                     else
                     {
                         pSrch->DelFrms(0);
-                        rFtnArr.erase( rFtnArr.begin() + nPos );
-                        if( bSaveFtn )
+                        rFootnoteArr.erase( rFootnoteArr.begin() + nPos );
+                        if( bSaveFootnote )
                             rSaveArr.insert( pSrch );
                     }
-                    bUpdateFtn = true;
+                    bUpdateFootnote = true;
                 }
             }
         }
         // When moving from redline section into document content section, e.g.
         // after loading a document with (delete-)redlines, the footnote array
         // has to be adjusted... (#i70572)
-        if( bSaveFtn )
+        if( bSaveFootnote )
         {
             SwNodeIndex aIdx( rSttNd );
             while( aIdx < rEndNd ) // Check the moved section
             {
                 SwNode* pNode = &aIdx.GetNode();
-                if( pNode->IsTxtNode() ) // Looking for text nodes...
+                if( pNode->IsTextNode() ) // Looking for text nodes...
                 {
-                    SwpHints *pHints = pNode->GetTxtNode()->GetpSwpHints();
-                    if( pHints && pHints->HasFtn() ) //...with footnotes
+                    SwpHints *pHints = pNode->GetTextNode()->GetpSwpHints();
+                    if( pHints && pHints->HasFootnote() ) //...with footnotes
                     {
-                        bUpdateFtn = true; // Heureka
+                        bUpdateFootnote = true; // Heureka
                         const size_t nCount = pHints->Count();
                         for( size_t i = 0; i < nCount; ++i )
                         {
-                            SwTxtAttr *pAttr = pHints->GetTextHint( i );
+                            SwTextAttr *pAttr = pHints->GetTextHint( i );
                             if ( pAttr->Which() == RES_TXTATR_FTN )
                             {
-                                rSaveArr.insert( static_cast<SwTxtFtn*>(pAttr) );
+                                rSaveArr.insert( static_cast<SwTextFootnote*>(pAttr) );
                             }
                         }
                     }
@@ -912,17 +912,17 @@ namespace
                 ++aIdx;
             }
         }
-        return bUpdateFtn;
+        return bUpdateFootnote;
     }
 
-    static bool lcl_MayOverwrite( const SwTxtNode *pNode, const sal_Int32 nPos )
+    static bool lcl_MayOverwrite( const SwTextNode *pNode, const sal_Int32 nPos )
     {
-        sal_Unicode const cChr = pNode->GetTxt()[nPos];
+        sal_Unicode const cChr = pNode->GetText()[nPos];
         switch (cChr)
         {
             case CH_TXTATR_BREAKWORD:
             case CH_TXTATR_INWORD:
-                return !pNode->GetTxtAttrForCharAt(nPos);// how could there be none?
+                return !pNode->GetTextAttrForCharAt(nPos);// how could there be none?
             case CH_TXT_ATR_FIELDSTART:
             case CH_TXT_ATR_FIELDEND:
             case CH_TXT_ATR_FORMELEMENT:
@@ -932,7 +932,7 @@ namespace
         }
     }
 
-    static void lcl_SkipAttr( const SwTxtNode *pNode, SwIndex &rIdx, sal_Int32 &rStart )
+    static void lcl_SkipAttr( const SwTextNode *pNode, SwIndex &rIdx, sal_Int32 &rStart )
     {
         if( !lcl_MayOverwrite( pNode, rStart ) )
         {
@@ -940,7 +940,7 @@ namespace
             do {
                 ++rIdx;
                 rStart = rIdx.GetIndex();
-            } while (rStart < pNode->GetTxt().getLength()
+            } while (rStart < pNode->GetText().getLength()
                    && !lcl_MayOverwrite(pNode, rStart) );
         }
     }
@@ -986,7 +986,7 @@ namespace //local functions originally from docfmt.cxx
     #define DELETECHARSETS if ( bDelete ) { delete pCharSet; delete pOtherSet; }
 
     /// Insert Hints according to content types;
-    // Is used in SwDoc::Insert(..., SwFmtHint &rHt)
+    // Is used in SwDoc::Insert(..., SwFormatHint &rHt)
 
     static bool lcl_InsAttr(
         SwDoc *const pDoc,
@@ -1072,15 +1072,15 @@ namespace //local functions originally from docfmt.cxx
         SwHistory* pHistory = pUndo ? &pUndo->GetHistory() : 0;
         bool bRet = false;
         const SwPosition *pStt = rRg.Start(), *pEnd = rRg.End();
-        SwCntntNode* pNode = pStt->nNode.GetNode().GetCntntNode();
+        SwContentNode* pNode = pStt->nNode.GetNode().GetContentNode();
 
-        if( pNode && pNode->IsTxtNode() )
+        if( pNode && pNode->IsTextNode() )
         {
             // #i27615#
             if (rRg.IsInFrontOfLabel())
             {
-                SwTxtNode * pTxtNd = pNode->GetTxtNode();
-                SwNumRule * pNumRule = pTxtNd->GetNumRule();
+                SwTextNode * pTextNd = pNode->GetTextNode();
+                SwNumRule * pNumRule = pTextNd->GetNumRule();
 
                 if ( !pNumRule )
                 {
@@ -1089,7 +1089,7 @@ namespace //local functions originally from docfmt.cxx
                     return false;
                 }
 
-                int nLevel = pTxtNd->GetActualListLevel();
+                int nLevel = pTextNd->GetActualListLevel();
 
                 if (nLevel < 0)
                     nLevel = 0;
@@ -1097,17 +1097,17 @@ namespace //local functions originally from docfmt.cxx
                 if (nLevel >= MAXLEVEL)
                     nLevel = MAXLEVEL - 1;
 
-                SwNumFmt aNumFmt = pNumRule->Get(static_cast<sal_uInt16>(nLevel));
-                SwCharFmt * pCharFmt =
-                    pDoc->FindCharFmtByName(aNumFmt.GetCharFmtName());
+                SwNumFormat aNumFormat = pNumRule->Get(static_cast<sal_uInt16>(nLevel));
+                SwCharFormat * pCharFormat =
+                    pDoc->FindCharFormatByName(aNumFormat.GetCharFormatName());
 
-                if (pCharFmt)
+                if (pCharFormat)
                 {
                     if (pHistory)
-                        pHistory->Add(pCharFmt->GetAttrSet(), *pCharFmt);
+                        pHistory->Add(pCharFormat->GetAttrSet(), *pCharFormat);
 
                     if ( pCharSet )
-                        pCharFmt->SetFmtAttr(*pCharSet);
+                        pCharFormat->SetFormatAttr(*pCharSet);
                 }
 
                 DELETECHARSETS
@@ -1119,17 +1119,17 @@ namespace //local functions originally from docfmt.cxx
             // Attributes without an end do not have a range
             if ( !bCharAttr && !bOtherAttr )
             {
-                SfxItemSet aTxtSet( pDoc->GetAttrPool(),
+                SfxItemSet aTextSet( pDoc->GetAttrPool(),
                             RES_TXTATR_NOEND_BEGIN, RES_TXTATR_NOEND_END-1 );
-                aTxtSet.Put( rChgSet );
-                if( aTxtSet.Count() )
+                aTextSet.Put( rChgSet );
+                if( aTextSet.Count() )
                 {
                     SwRegHistory history( pNode, *pNode, pHistory );
                     bRet = history.InsertItems(
-                        aTxtSet, rSt.GetIndex(), rSt.GetIndex(), nFlags ) || bRet;
+                        aTextSet, rSt.GetIndex(), rSt.GetIndex(), nFlags ) || bRet;
 
                     if (bRet && (pDoc->getIDocumentRedlineAccess().IsRedlineOn() || (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline()
-                                    && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty())))
+                                    && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty())))
                     {
                         SwPaM aPam( pStt->nNode, pStt->nContent.GetIndex()-1,
                                     pStt->nNode, pStt->nContent.GetIndex() );
@@ -1148,43 +1148,43 @@ namespace //local functions originally from docfmt.cxx
             // TextAttributes with an end never expand their range
             if ( !bCharAttr && !bOtherAttr )
             {
-                // CharFmt and URL attributes are treated separately!
-                // TEST_TEMP ToDo: AutoFmt!
-                SfxItemSet aTxtSet( pDoc->GetAttrPool(),
+                // CharFormat and URL attributes are treated separately!
+                // TEST_TEMP ToDo: AutoFormat!
+                SfxItemSet aTextSet( pDoc->GetAttrPool(),
                                     RES_TXTATR_REFMARK, RES_TXTATR_TOXMARK,
                                     RES_TXTATR_META, RES_TXTATR_METAFIELD,
                                     RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY,
                                     RES_TXTATR_INPUTFIELD, RES_TXTATR_INPUTFIELD,
                                     0 );
 
-                aTxtSet.Put( rChgSet );
-                if( aTxtSet.Count() )
+                aTextSet.Put( rChgSet );
+                if( aTextSet.Count() )
                 {
                     const sal_Int32 nInsCnt = rSt.GetIndex();
                     const sal_Int32 nEnd = pStt->nNode == pEnd->nNode
                                     ? pEnd->nContent.GetIndex()
                                     : pNode->Len();
                     SwRegHistory history( pNode, *pNode, pHistory );
-                    bRet = history.InsertItems( aTxtSet, nInsCnt, nEnd, nFlags )
+                    bRet = history.InsertItems( aTextSet, nInsCnt, nEnd, nFlags )
                            || bRet;
 
                     if (bRet && (pDoc->getIDocumentRedlineAccess().IsRedlineOn() || (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline()
-                                    && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty())))
+                                    && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty())))
                     {
                         // Was text content inserted? (RefMark/TOXMarks without an end)
-                        bool bTxtIns = nInsCnt != rSt.GetIndex();
+                        bool bTextIns = nInsCnt != rSt.GetIndex();
                         // Was content inserted or set over the selection?
-                        SwPaM aPam( pStt->nNode, bTxtIns ? nInsCnt + 1 : nEnd,
+                        SwPaM aPam( pStt->nNode, bTextIns ? nInsCnt + 1 : nEnd,
                                     pStt->nNode, nInsCnt );
                         if( pUndo )
-                            pUndo->SaveRedlineData( aPam, bTxtIns );
+                            pUndo->SaveRedlineData( aPam, bTextIns );
 
                         if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() )
                             pDoc->getIDocumentRedlineAccess().AppendRedline(
                                 new SwRangeRedline(
-                                    bTxtIns ? nsRedlineType_t::REDLINE_INSERT : nsRedlineType_t::REDLINE_FORMAT, aPam ),
+                                    bTextIns ? nsRedlineType_t::REDLINE_INSERT : nsRedlineType_t::REDLINE_FORMAT, aPam ),
                                     true);
-                        else if( bTxtIns )
+                        else if( bTextIns )
                             pDoc->getIDocumentRedlineAccess().SplitRedline( aPam );
                     }
                 }
@@ -1194,28 +1194,28 @@ namespace //local functions originally from docfmt.cxx
         // We always have to set the auto flag for PageDescs that are set at the Node!
         if( pOtherSet && pOtherSet->Count() )
         {
-            SwTableNode* pTblNd;
-            const SwFmtPageDesc* pDesc;
+            SwTableNode* pTableNd;
+            const SwFormatPageDesc* pDesc;
             if( SfxItemState::SET == pOtherSet->GetItemState( RES_PAGEDESC,
                             false, reinterpret_cast<const SfxPoolItem**>(&pDesc) ))
             {
                 if( pNode )
                 {
                     // Set auto flag. Only in the template it's without auto!
-                    SwFmtPageDesc aNew( *pDesc );
+                    SwFormatPageDesc aNew( *pDesc );
 
                     // Tables now also know line breaks
                     if( !(nFlags & SetAttrMode::APICALL) &&
-                        0 != ( pTblNd = pNode->FindTableNode() ) )
+                        0 != ( pTableNd = pNode->FindTableNode() ) )
                     {
-                        SwTableNode* pCurTblNd = pTblNd;
-                        while ( 0 != ( pCurTblNd = pCurTblNd->StartOfSectionNode()->FindTableNode() ) )
-                            pTblNd = pCurTblNd;
+                        SwTableNode* pCurTableNd = pTableNd;
+                        while ( 0 != ( pCurTableNd = pCurTableNd->StartOfSectionNode()->FindTableNode() ) )
+                            pTableNd = pCurTableNd;
 
                         // set the table format
-                        SwFrmFmt* pFmt = pTblNd->GetTable().GetFrmFmt();
-                        SwRegHistory aRegH( pFmt, *pTblNd, pHistory );
-                        pFmt->SetFmtAttr( aNew );
+                        SwFrameFormat* pFormat = pTableNd->GetTable().GetFrameFormat();
+                        SwRegHistory aRegH( pFormat, *pTableNd, pHistory );
+                        pFormat->SetFormatAttr( aNew );
                         bRet = true;
                     }
                     else
@@ -1240,20 +1240,20 @@ namespace //local functions originally from docfmt.cxx
             }
 
             // Tables now also know line breaks
-            const SvxFmtBreakItem* pBreak;
+            const SvxFormatBreakItem* pBreak;
             if( pNode && !(nFlags & SetAttrMode::APICALL) &&
-                0 != (pTblNd = pNode->FindTableNode() ) &&
+                0 != (pTableNd = pNode->FindTableNode() ) &&
                 SfxItemState::SET == pOtherSet->GetItemState( RES_BREAK,
                             false, reinterpret_cast<const SfxPoolItem**>(&pBreak) ) )
             {
-                SwTableNode* pCurTblNd = pTblNd;
-                while ( 0 != ( pCurTblNd = pCurTblNd->StartOfSectionNode()->FindTableNode() ) )
-                    pTblNd = pCurTblNd;
+                SwTableNode* pCurTableNd = pTableNd;
+                while ( 0 != ( pCurTableNd = pCurTableNd->StartOfSectionNode()->FindTableNode() ) )
+                    pTableNd = pCurTableNd;
 
                  // set the table format
-                SwFrmFmt* pFmt = pTblNd->GetTable().GetFrmFmt();
-                SwRegHistory aRegH( pFmt, *pTblNd, pHistory );
-                pFmt->SetFmtAttr( *pBreak );
+                SwFrameFormat* pFormat = pTableNd->GetTable().GetFrameFormat();
+                SwRegHistory aRegH( pFormat, *pTableNd, pHistory );
+                pFormat->SetFormatAttr( *pBreak );
                 bRet = true;
 
                 // bOtherAttr = true means that pOtherSet == rChgSet. In this case
@@ -1291,17 +1291,17 @@ namespace //local functions originally from docfmt.cxx
                 return bRet;
             }
 
-            if( pNode->IsTxtNode() && pCharSet && pCharSet->Count() )
+            if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
             {
-                SwTxtNode* pTxtNd = pNode->GetTxtNode();
+                SwTextNode* pTextNd = pNode->GetTextNode();
                 const SwIndex& rSt = pStt->nContent;
                 sal_Int32 nMkPos, nPtPos = rSt.GetIndex();
-                const OUString& rStr = pTxtNd->GetTxt();
+                const OUString& rStr = pTextNd->GetText();
 
                 // Special case: if the Crsr is located within a URL attribute, we take over it's area
-                SwTxtAttr const*const pURLAttr(
-                    pTxtNd->GetTxtAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
-                if (pURLAttr && !pURLAttr->GetINetFmt().GetValue().isEmpty())
+                SwTextAttr const*const pURLAttr(
+                    pTextNd->GetTextAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
+                if (pURLAttr && !pURLAttr->GetINetFormat().GetValue().isEmpty())
                 {
                     nMkPos = pURLAttr->GetStart();
                     nPtPos = *pURLAttr->End();
@@ -1311,8 +1311,8 @@ namespace //local functions originally from docfmt.cxx
                     Boundary aBndry;
                     if( g_pBreakIt->GetBreakIter().is() )
                         aBndry = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                                    pTxtNd->GetTxt(), nPtPos,
-                                    g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                                    pTextNd->GetText(), nPtPos,
+                                    g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                                     WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
                                     true );
 
@@ -1330,23 +1330,23 @@ namespace //local functions originally from docfmt.cxx
                 // These attributes are inserted as FormatAttributes and
                 // never override the TextAttributes!
                 if( !(nFlags & SetAttrMode::DONTREPLACE ) &&
-                    pTxtNd->HasHints() && !nMkPos && nPtPos == rStr.getLength())
+                    pTextNd->HasHints() && !nMkPos && nPtPos == rStr.getLength())
                 {
-                    SwIndex aSt( pTxtNd );
+                    SwIndex aSt( pTextNd );
                     if( pHistory )
                     {
                         // Save all attributes for the Undo.
-                        SwRegHistory aRHst( *pTxtNd, pHistory );
-                        pTxtNd->GetpSwpHints()->Register( &aRHst );
-                        pTxtNd->RstTxtAttr( aSt, nPtPos, 0, pCharSet );
-                        if( pTxtNd->GetpSwpHints() )
-                            pTxtNd->GetpSwpHints()->DeRegister();
+                        SwRegHistory aRHst( *pTextNd, pHistory );
+                        pTextNd->GetpSwpHints()->Register( &aRHst );
+                        pTextNd->RstTextAttr( aSt, nPtPos, 0, pCharSet );
+                        if( pTextNd->GetpSwpHints() )
+                            pTextNd->GetpSwpHints()->DeRegister();
                     }
                     else
-                        pTxtNd->RstTxtAttr( aSt, nPtPos, 0, pCharSet );
+                        pTextNd->RstTextAttr( aSt, nPtPos, 0, pCharSet );
                 }
 
-                // the SwRegHistory inserts the attribute into the TxtNode!
+                // the SwRegHistory inserts the attribute into the TextNode!
                 SwRegHistory history( pNode, *pNode, pHistory );
                 bRet = history.InsertItems( *pCharSet, nMkPos, nPtPos, nFlags )
                     || bRet;
@@ -1399,8 +1399,8 @@ namespace //local functions originally from docfmt.cxx
 
             if( pStt->nContent.GetIndex() != 0 || aCntEnd.GetIndex() != nLen )
             {
-                // the SwRegHistory inserts the attribute into the TxtNode!
-                if( pNode->IsTxtNode() && pCharSet && pCharSet->Count() )
+                // the SwRegHistory inserts the attribute into the TextNode!
+                if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
                 {
                     SwRegHistory history( pNode, *pNode, pHistory );
                     bRet = history.InsertItems(*pCharSet,
@@ -1427,7 +1427,7 @@ namespace //local functions originally from docfmt.cxx
 
                     if (bExpandCharToPara && pCharSet && pCharSet->Count() ==1 )
                     {
-                        SwTxtNode* pCurrentNd = pStt->nNode.GetNode().GetTxtNode();
+                        SwTextNode* pCurrentNd = pStt->nNode.GetNode().GetTextNode();
 
                         if (pCurrentNd)
                         {
@@ -1455,13 +1455,13 @@ namespace //local functions originally from docfmt.cxx
          */
         if( pStt->nNode < pEnd->nNode )
         {
-            pNode = pEnd->nNode.GetNode().GetCntntNode();
+            pNode = pEnd->nNode.GetNode().GetContentNode();
             if(pNode)
             {
                 if( aCntEnd.GetIndex() != pNode->Len() )
                 {
-                    // the SwRegHistory inserts the attribute into the TxtNode!
-                    if( pNode->IsTxtNode() && pCharSet && pCharSet->Count() )
+                    // the SwRegHistory inserts the attribute into the TextNode!
+                    if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
                     {
                         SwRegHistory history( pNode, *pNode, pHistory );
                         (void)history.InsertItems(*pCharSet,
@@ -1492,8 +1492,8 @@ namespace //local functions originally from docfmt.cxx
         // Reset all attributes from the set!
         if( pCharSet && pCharSet->Count() && !( SetAttrMode::DONTREPLACE & nFlags ) )
         {
-            ::sw::DocumentContentOperationsManager::ParaRstFmt aPara( pStt, pEnd, pHistory, 0, pCharSet );
-            pDoc->GetNodes().ForEach( aSt, aEnd, ::sw::DocumentContentOperationsManager::lcl_RstTxtAttr, &aPara );
+            ::sw::DocumentContentOperationsManager::ParaRstFormat aPara( pStt, pEnd, pHistory, 0, pCharSet );
+            pDoc->GetNodes().ForEach( aSt, aEnd, ::sw::DocumentContentOperationsManager::lcl_RstTextAttr, &aPara );
         }
 
         bool bCreateSwpHints = pCharSet && (
@@ -1502,11 +1502,11 @@ namespace //local functions originally from docfmt.cxx
 
         for(; aSt < aEnd; ++aSt )
         {
-            pNode = aSt.GetNode().GetCntntNode();
+            pNode = aSt.GetNode().GetContentNode();
             if( !pNode )
                 continue;
 
-            SwTxtNode* pTNd = pNode->GetTxtNode();
+            SwTextNode* pTNd = pNode->GetTextNode();
             if( pHistory )
             {
                 SwRegHistory aRegH( pNode, *pNode, pHistory );
@@ -1518,7 +1518,7 @@ namespace //local functions originally from docfmt.cxx
                     if( pSwpHints )
                         pSwpHints->Register( &aRegH );
 
-                    pTNd->SetAttr(*pCharSet, 0, pTNd->GetTxt().getLength(), nFlags);
+                    pTNd->SetAttr(*pCharSet, 0, pTNd->GetText().getLength(), nFlags);
                     if( pSwpHints )
                         pSwpHints->DeRegister();
                 }
@@ -1528,7 +1528,7 @@ namespace //local functions originally from docfmt.cxx
             else
             {
                 if( pTNd && pCharSet && pCharSet->Count() )
-                    pTNd->SetAttr(*pCharSet, 0, pTNd->GetTxt().getLength(), nFlags);
+                    pTNd->SetAttr(*pCharSet, 0, pTNd->GetText().getLength(), nFlags);
                 if( pOtherSet && pOtherSet->Count() )
                     pNode->SetAttr( *pOtherSet );
             }
@@ -1547,7 +1547,7 @@ namespace //local functions originally from docfmt.cxx
             SwPosition aStartPos (*rRg.Start());
             SwPosition aEndPos (*rRg.End());
 
-            if (aEndPos.nNode.GetNode().GetTxtNode() && aEndPos.nContent != aEndPos.nNode.GetNode().GetTxtNode()->Len())
+            if (aEndPos.nNode.GetNode().GetTextNode() && aEndPos.nContent != aEndPos.nNode.GetNode().GetTextNode()->Len())
                 aEndPos.nNode--;
 
             sal_uLong nStart = aStartPos.nNode.GetIndex();
@@ -1555,9 +1555,9 @@ namespace //local functions originally from docfmt.cxx
             for(; nStart <= nEnd; ++nStart)
             {
                 SwNode* pNd = pDoc->GetNodes()[ nStart ];
-                if (!pNd || !pNd->IsTxtNode())
+                if (!pNd || !pNd->IsTextNode())
                     continue;
-                SwTxtNode *pCurrentNd = pNd->GetTxtNode();
+                SwTextNode *pCurrentNd = pNd->GetTextNode();
                 pCurrentNd->TryCharSetExpandToNum(*pCharSet);
             }
         }
@@ -1595,10 +1595,10 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
                 nEnd = pEnd->nNode.GetIndex(),
                 nDiff = nEnd - nStt +1;
         SwNode* pNd = m_rDoc.GetNodes()[ nStt ];
-        if( pNd->IsCntntNode() && pStt->nContent.GetIndex() )
+        if( pNd->IsContentNode() && pStt->nContent.GetIndex() )
             ++nStt, --nDiff;
-        if( (pNd = m_rDoc.GetNodes()[ nEnd ])->IsCntntNode() &&
-            static_cast<SwCntntNode*>(pNd)->Len() != pEnd->nContent.GetIndex() )
+        if( (pNd = m_rDoc.GetNodes()[ nEnd ])->IsContentNode() &&
+            static_cast<SwContentNode*>(pNd)->Len() != pEnd->nContent.GetIndex() )
             --nEnd, --nDiff;
         if( nDiff &&
             lcl_ChkFlyFly( pDoc, nStt, nEnd, rPos.nNode.GetIndex() ) )
@@ -1609,7 +1609,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
 
     SwPaM* pRedlineRange = 0;
     if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ||
-        (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() ) )
+        (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) )
         pRedlineRange = new SwPaM( rPos );
 
     RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode();
@@ -1622,7 +1622,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
     }
     else if( ! ( *pStt <= rPos && rPos < *pEnd &&
             ( pStt->nNode != pEnd->nNode ||
-              !pStt->nNode.GetNode().IsTxtNode() )) )
+              !pStt->nNode.GetNode().IsTextNode() )) )
     {
         // Copy to a position outside of the area, or copy a single TextNode
         // Do an ordinary copy
@@ -1661,7 +1661,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
 
             aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
             aPam.SetMark();
-            SwCntntNode* pNode = SwNodes::GoPrevious( &aPam.GetMark()->nNode );
+            SwContentNode* pNode = SwNodes::GoPrevious( &aPam.GetMark()->nNode );
             pNode->MakeEndIndex( &aPam.GetMark()->nContent );
 
             aPam.GetPoint()->nNode = *aPam.GetNode().StartOfSectionNode();
@@ -1670,7 +1670,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
             // move to desired position
             pDoc->getIDocumentContentOperations().MoveRange( aPam, rPos, SwMoveFlags::DEFAULT );
 
-            pNode = aPam.GetCntntNode();
+            pNode = aPam.GetContentNode();
             *aPam.GetPoint() = rPos;      // Move the cursor for Undo
             aPam.SetMark();               // also move the Mark
             aPam.DeleteMark();            // But don't mark any area
@@ -1757,26 +1757,26 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
 
     /* #i9185# This whould lead to a segmentation fault if not caught above. */
     sal_uLong nNextNd = rEnd.nNode.GetIndex() + 1;
-    SwTableNode *const pTblNd = m_rDoc.GetNodes()[ nNextNd ]->GetTableNode();
+    SwTableNode *const pTableNd = m_rDoc.GetNodes()[ nNextNd ]->GetTableNode();
 
-    if( pTblNd && pNd->IsCntntNode() )
+    if( pTableNd && pNd->IsContentNode() )
     {
-        SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
+        SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
 
         {
             const SfxPoolItem *pItem;
-            const SfxItemSet* pSet = static_cast<const SwCntntNode*>(pNd)->GetpSwAttrSet();
+            const SfxItemSet* pSet = static_cast<const SwContentNode*>(pNd)->GetpSwAttrSet();
             if( pSet && SfxItemState::SET == pSet->GetItemState( RES_PAGEDESC,
                 false, &pItem ) )
             {
-                pTableFmt->SetFmtAttr( *pItem );
+                pTableFormat->SetFormatAttr( *pItem );
                 bSavePageDesc = true;
             }
 
             if( pSet && SfxItemState::SET == pSet->GetItemState( RES_BREAK,
                 false, &pItem ) )
             {
-                pTableFmt->SetFmtAttr( *pItem );
+                pTableFormat->SetFormatAttr( *pItem );
                 bSavePageBreak = true;
             }
         }
@@ -1791,10 +1791,10 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
             rPam.Exchange();
         rPam.GetPoint()->nNode++;
 
-        SwCntntNode *pTmpNode = rPam.GetPoint()->nNode.GetNode().GetCntntNode();
+        SwContentNode *pTmpNode = rPam.GetPoint()->nNode.GetNode().GetContentNode();
         rPam.GetPoint()->nContent.Assign( pTmpNode, 0 );
         bool bGoNext = (0 == pTmpNode);
-        pTmpNode = rPam.GetMark()->nNode.GetNode().GetCntntNode();
+        pTmpNode = rPam.GetMark()->nNode.GetNode().GetContentNode();
         rPam.GetMark()->nContent.Assign( pTmpNode, 0 );
 
         m_rDoc.GetIDocumentUndoRedo().ClearRedo();
@@ -1846,25 +1846,25 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
             // What's with Flys?
         {
             // If there are FlyFrames left, delete these too
-            for( size_t n = 0; n < m_rDoc.GetSpzFrmFmts()->size(); ++n )
+            for( size_t n = 0; n < m_rDoc.GetSpzFrameFormats()->size(); ++n )
             {
-                SwFrmFmt* pFly = (*m_rDoc.GetSpzFrmFmts())[n];
-                const SwFmtAnchor* pAnchor = &pFly->GetAnchor();
-                SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+                SwFrameFormat* pFly = (*m_rDoc.GetSpzFrameFormats())[n];
+                const SwFormatAnchor* pAnchor = &pFly->GetAnchor();
+                SwPosition const*const pAPos = pAnchor->GetContentAnchor();
                 if (pAPos &&
                     ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
                      (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
                     aRg.aStart <= pAPos->nNode && pAPos->nNode <= aRg.aEnd )
                 {
-                    m_rDoc.getIDocumentLayoutAccess().DelLayoutFmt( pFly );
+                    m_rDoc.getIDocumentLayoutAccess().DelLayoutFormat( pFly );
                     --n;
                 }
             }
         }
 
-        SwCntntNode *pTmpNode = rPam.GetBound( true ).nNode.GetNode().GetCntntNode();
+        SwContentNode *pTmpNode = rPam.GetBound( true ).nNode.GetNode().GetContentNode();
         rPam.GetBound( true ).nContent.Assign( pTmpNode, 0 );
-        pTmpNode = rPam.GetBound( false ).nNode.GetNode().GetCntntNode();
+        pTmpNode = rPam.GetBound( false ).nNode.GetNode().GetContentNode();
         rPam.GetBound( false ).nContent.Assign( pTmpNode, 0 );
         m_rDoc.GetNodes().Delete( aRg.aStart, nNodeDiff+1 );
     }
@@ -1903,7 +1903,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
 
     // save redlines (if DOC_MOVEREDLINES is used)
     _SaveRedlines aSaveRedl;
-    if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         lcl_SaveRedlines( rPaM, aSaveRedl );
 
@@ -1920,8 +1920,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
             &pEnd->nContent);
     }
 
-    bool bUpdateFtn = false;
-    SwFtnIdxs aTmpFntIdx;
+    bool bUpdateFootnote = false;
+    SwFootnoteIdxs aTmpFntIdx;
 
     SwUndoMove * pUndoMove = 0;
     if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -1932,8 +1932,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
     }
     else
     {
-        bUpdateFtn = lcl_SaveFtn( pStt->nNode, pEnd->nNode, rPos.nNode,
-                                    m_rDoc.GetFtnIdxs(), aTmpFntIdx,
+        bUpdateFootnote = lcl_SaveFootnote( pStt->nNode, pEnd->nNode, rPos.nNode,
+                                    m_rDoc.GetFootnoteIdxs(), aTmpFntIdx,
                                     &pStt->nContent, &pEnd->nContent );
     }
 
@@ -1945,32 +1945,32 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
         rPaM.Exchange();
 
     // If there is a TextNode before and after the Move, create a JoinNext in the EditShell.
-    SwTxtNode* pSrcNd = rPaM.GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pSrcNd = rPaM.GetPoint()->nNode.GetNode().GetTextNode();
     bool bCorrSavePam = pSrcNd && pStt->nNode != pEnd->nNode;
 
     // If one ore more TextNodes are moved, SwNodes::Move will do a SplitNode.
     // However, this does not update the cursor. So we create a TextNode to keep
     // updating the indices. After the Move the Node is optionally deleted.
-    SwTxtNode * pTNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode * pTNd = rPos.nNode.GetNode().GetTextNode();
     if( pTNd && rPaM.GetPoint()->nNode != rPaM.GetMark()->nNode &&
         ( rPos.nContent.GetIndex() || ( pTNd->Len() && bCorrSavePam  )) )
     {
         bSplit = true;
-        const sal_Int32 nMkCntnt = rPaM.GetMark()->nContent.GetIndex();
+        const sal_Int32 nMkContent = rPaM.GetMark()->nContent.GetIndex();
 
-        const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-        pCntntStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
+        const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+        pContentStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
 
-        pTNd = pTNd->SplitCntntNode( rPos )->GetTxtNode();
+        pTNd = pTNd->SplitContentNode( rPos )->GetTextNode();
 
-        if( !pCntntStore->Empty() )
-            pCntntStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
+        if( !pContentStore->Empty() )
+            pContentStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
 
         // correct the PaM!
         if( rPos.nNode == rPaM.GetMark()->nNode )
         {
             rPaM.GetMark()->nNode = rPos.nNode.GetIndex()-1;
-            rPaM.GetMark()->nContent.Assign( pTNd, nMkCntnt );
+            rPaM.GetMark()->nContent.Assign( pTNd, nMkContent );
         }
     }
 
@@ -1978,8 +1978,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
     // the manipulated range.
     // If there's no content anymore, set it to the StartNode (that's
     // always there).
-    const bool bNullCntnt = !aSavePam.Move( fnMoveBackward, fnGoCntnt );
-    if( bNullCntnt )
+    const bool bNullContent = !aSavePam.Move( fnMoveBackward, fnGoContent );
+    if( bNullContent )
     {
         aSavePam.GetPoint()->nNode--;
     }
@@ -2012,16 +2012,16 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
         rPaM.DeleteMark();
 
     OSL_ENSURE( *aSavePam.GetMark() == rPos ||
-            ( aSavePam.GetMark()->nNode.GetNode().GetCntntNode() == NULL ),
+            ( aSavePam.GetMark()->nNode.GetNode().GetContentNode() == NULL ),
             "PaM was not moved. Aren't there ContentNodes at the beginning/end?" );
     *aSavePam.GetMark() = rPos;
 
     rPaM.SetMark();         // create a Sel. around the new range
-    pTNd = aSavePam.GetNode().GetTxtNode();
+    pTNd = aSavePam.GetNode().GetTextNode();
     if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
     {
         // correct the SavePam's Content first
-        if( bNullCntnt )
+        if( bNullContent )
         {
             aSavePam.GetPoint()->nContent = 0;
         }
@@ -2030,16 +2030,16 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
         // where the rPaM is located.
         // If the Content was moved to the back and the SavePam's SPoint is
         // in the next Node, we have to deal with this when saving the Undo object!
-        SwTxtNode * pPamTxtNd = nullptr;
+        SwTextNode * pPamTextNd = nullptr;
 
         // Is passed to SwUndoMove, which happens when subsequently calling Undo JoinNext.
         // If it's not possible to call Undo JoinNext here.
         bool bJoin = bSplit && pTNd;
         if( bCorrSavePam )
         {
-            pPamTxtNd = rPaM.GetNode().GetTxtNode();
-            bCorrSavePam = (pPamTxtNd != nullptr)
-                            && pPamTxtNd->CanJoinNext()
+            pPamTextNd = rPaM.GetNode().GetTextNode();
+            bCorrSavePam = (pPamTextNd != nullptr)
+                            && pPamTextNd->CanJoinNext()
                             && (*rPaM.GetPoint() <= *aSavePam.GetPoint());
         }
 
@@ -2052,11 +2052,11 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
             if( bCorrSavePam && rPaM.GetPoint()->nNode.GetIndex()+1 ==
                                 aSavePam.GetPoint()->nNode.GetIndex() )
             {
-                aSavePam.GetPoint()->nContent += pPamTxtNd->Len();
+                aSavePam.GetPoint()->nContent += pPamTextNd->Len();
             }
             bJoin = false;
         }
-        else if ( !aSavePam.Move( fnMoveForward, fnGoCntnt ) )
+        else if ( !aSavePam.Move( fnMoveForward, fnGoContent ) )
         {
             aSavePam.GetPoint()->nNode++;
         }
@@ -2080,14 +2080,14 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
                 bRemove = false;
             }
         }
-        if( bNullCntnt )
+        if( bNullContent )
         {
             aSavePam.GetPoint()->nNode++;
-            aSavePam.GetPoint()->nContent.Assign( aSavePam.GetCntntNode(), 0 );
+            aSavePam.GetPoint()->nContent.Assign( aSavePam.GetContentNode(), 0 );
         }
         else if( bRemove ) // No move forward after joining with next paragraph
         {
-            aSavePam.Move( fnMoveForward, fnGoCntnt );
+            aSavePam.Move( fnMoveForward, fnGoContent );
         }
     }
 
@@ -2112,15 +2112,15 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
         lcl_RestoreRedlines( &m_rDoc, *aSavePam.Start(), aSaveRedl );
     }
 
-    if( bUpdateFtn )
+    if( bUpdateFootnote )
     {
         if( !aTmpFntIdx.empty() )
         {
-            m_rDoc.GetFtnIdxs().insert( aTmpFntIdx );
+            m_rDoc.GetFootnoteIdxs().insert( aTmpFntIdx );
             aTmpFntIdx.clear();
         }
 
-        m_rDoc.GetFtnIdxs().UpdateAllFtn();
+        m_rDoc.GetFootnoteIdxs().UpdateAllFootnote();
     }
 
     m_rDoc.getIDocumentState().SetModified();
@@ -2137,9 +2137,9 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
 
     // Or else delete the Frames for all footnotes that are being moved
     // and have it rebuild after the Move (footnotes can change pages).
-    // Additionally we have to correct the FtnIdx array's sorting.
-    bool bUpdateFtn = false;
-    SwFtnIdxs aTmpFntIdx;
+    // Additionally we have to correct the FootnoteIdx array's sorting.
+    bool bUpdateFootnote = false;
+    SwFootnoteIdxs aTmpFntIdx;
 
     SwUndoMove* pUndo = 0;
     if ((SwMoveFlags::CREATEUNDOOBJ & eMvFlags ) && m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -2148,13 +2148,13 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
     }
     else
     {
-        bUpdateFtn = lcl_SaveFtn( rRange.aStart, rRange.aEnd, rPos,
-                                    m_rDoc.GetFtnIdxs(), aTmpFntIdx );
+        bUpdateFootnote = lcl_SaveFootnote( rRange.aStart, rRange.aEnd, rPos,
+                                    m_rDoc.GetFootnoteIdxs(), aTmpFntIdx );
     }
 
     _SaveRedlines aSaveRedl;
     std::vector<SwRangeRedline*> aSavRedlInsPosArr;
-    if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         lcl_SaveRedlines( rRange, aSaveRedl );
 
@@ -2165,14 +2165,14 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
         {
             const SwPosition *pRStt, *pREnd;
             do {
-                SwRangeRedline* pTmp = m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos ];
+                SwRangeRedline* pTmp = m_rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos ];
                 pRStt = pTmp->Start();
                 pREnd = pTmp->End();
                 if( pREnd->nNode == rPos && pRStt->nNode < rPos )
                 {
                     aSavRedlInsPosArr.push_back( pTmp );
                 }
-            } while( pRStt->nNode < rPos && ++nRedlPos < m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size());
+            } while( pRStt->nNode < rPos && ++nRedlPos < m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size());
         }
     }
 
@@ -2184,7 +2184,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
 
     // Save the paragraph-bound Flys, so that they can be moved.
     _SaveFlyArr aSaveFlyArr;
-    if( !m_rDoc.GetSpzFrmFmts()->empty() )
+    if( !m_rDoc.GetSpzFrameFormats()->empty() )
         _SaveFlyInRange( rRange, aSaveFlyArr );
 
     // Set it to before the Position, so that it cannot be moved further.
@@ -2225,11 +2225,11 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
         for( size_t n = 0; n < aSavRedlInsPosArr.size(); ++n )
         {
             SwRangeRedline* pTmp = aSavRedlInsPosArr[ n ];
-            if( m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().Contains( pTmp ) )
+            if( m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().Contains( pTmp ) )
             {
                 SwPosition* pEnd = pTmp->End();
                 pEnd->nNode = aIdx;
-                pEnd->nContent.Assign( pNewNd->GetCntntNode(), 0 );
+                pEnd->nContent.Assign( pNewNd->GetContentNode(), 0 );
             }
         }
     }
@@ -2245,15 +2245,15 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
 
     delete pSaveInsPos;
 
-    if( bUpdateFtn )
+    if( bUpdateFootnote )
     {
         if( !aTmpFntIdx.empty() )
         {
-            m_rDoc.GetFtnIdxs().insert( aTmpFntIdx );
+            m_rDoc.GetFootnoteIdxs().insert( aTmpFntIdx );
             aTmpFntIdx.clear();
         }
 
-        m_rDoc.GetFtnIdxs().UpdateAllFtn();
+        m_rDoc.GetFootnoteIdxs().UpdateAllFootnote();
     }
 
     m_rDoc.getIDocumentState().SetModified();
@@ -2263,24 +2263,24 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
 bool DocumentContentOperationsManager::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
 {
     SwNodeIndex aIdx( rPaM.Start()->nNode );
-    bool bJoinTxt = aIdx.GetNode().IsTxtNode();
+    bool bJoinText = aIdx.GetNode().IsTextNode();
     bool bOneNode = rPaM.GetPoint()->nNode == rPaM.GetMark()->nNode;
     aIdx--;             // in front of the move area!
 
     bool bRet = MoveRange( rPaM, rPos, eMvFlags );
     if( bRet && !bOneNode )
     {
-        if( bJoinTxt )
+        if( bJoinText )
             ++aIdx;
-        SwTxtNode * pTxtNd = aIdx.GetNode().GetTxtNode();
+        SwTextNode * pTextNd = aIdx.GetNode().GetTextNode();
         SwNodeIndex aNxtIdx( aIdx );
-        if( pTxtNd && pTxtNd->CanJoinNext( &aNxtIdx ) )
+        if( pTextNd && pTextNd->CanJoinNext( &aNxtIdx ) )
         {
             {   // Block so SwIndex into node is deleted before Join
-                m_rDoc.CorrRel( aNxtIdx, SwPosition( aIdx, SwIndex(pTxtNd,
-                            pTxtNd->GetTxt().getLength()) ), 0, true );
+                m_rDoc.CorrRel( aNxtIdx, SwPosition( aIdx, SwIndex(pTextNd,
+                            pTextNd->GetText().getLength()) ), 0, true );
             }
-            pTxtNd->JoinNext();
+            pTextNd->JoinNext();
         }
     }
     return bRet;
@@ -2296,7 +2296,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
         m_rDoc.DeleteAutoCorrExceptWord();
     }
 
-    SwTxtNode *pNode = rPt.nNode.GetNode().GetTxtNode();
+    SwTextNode *pNode = rPt.nNode.GetNode().GetTextNode();
     if (!pNode || rStr.getLength() > pNode->GetSpaceLeft()) // worst case: no erase
     {
         return false;
@@ -2320,7 +2320,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
     {
         // start behind the characters (to fix the attributes!)
         nStart = rIdx.GetIndex();
-        if  (nStart < pNode->GetTxt().getLength())
+        if  (nStart < pNode->GetText().getLength())
         {
             lcl_SkipAttr( pNode, rIdx, nStart );
         }
@@ -2348,7 +2348,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
         else
         {
             // start behind the characters (to fix the attributes!)
-            if (nStart < pNode->GetTxt().getLength())
+            if (nStart < pNode->GetText().getLength())
                 ++rIdx;
             pNode->InsertText( OUString(c), rIdx, SwInsertFlags::EMPTYEXPAND );
             if( nStart+1 < rIdx.GetIndex() )
@@ -2370,7 +2370,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
     }
 
     if (!m_rDoc.GetIDocumentUndoRedo().DoesUndo() &&
-        !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty())
+        !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty())
     {
         SwPaM aPam( rPt.nNode, nStart, rPt.nNode, rPt.nContent.GetIndex() );
         m_rDoc.getIDocumentRedlineAccess().DeleteRedline( aPam, true, USHRT_MAX );
@@ -2406,7 +2406,7 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS
         m_rDoc.DeleteAutoCorrExceptWord();
     }
 
-    SwTxtNode *const pNode = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode *const pNode = rPos.nNode.GetNode().GetTextNode();
     if(!pNode)
         return false;
 
@@ -2463,10 +2463,10 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS
         }
     }
 
-    // To-Do - add 'SwExtraRedlineTbl' also ?
-    if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+    // To-Do - add 'SwExtraRedlineTable' also ?
+    if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
-        SwPaM aPam( rPos.nNode, aTmp.GetCntnt(),
+        SwPaM aPam( rPos.nNode, aTmp.GetContent(),
                     rPos.nNode, rPos.nContent.GetIndex());
         if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() )
         {
@@ -2498,7 +2498,7 @@ void DocumentContentOperationsManager::TransliterateText(
     sal_Int32 nSttCnt = pStt->nContent.GetIndex();
     sal_Int32 nEndCnt = pEnd->nContent.GetIndex();
 
-    SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = pStt->nNode.GetNode().GetTextNode();
     if( pStt == pEnd && pTNd )  // no selection?
     {
         // set current word as 'area of effect'
@@ -2506,7 +2506,7 @@ void DocumentContentOperationsManager::TransliterateText(
         Boundary aBndry;
         if( g_pBreakIt->GetBreakIter().is() )
             aBndry = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                        pTNd->GetTxt(), nSttCnt,
+                        pTNd->GetText(), nSttCnt,
                         g_pBreakIt->GetLocale( pTNd->GetLang( nSttCnt ) ),
                         WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
                         true );
@@ -2529,20 +2529,20 @@ void DocumentContentOperationsManager::TransliterateText(
             ++aIdx;
             if( pTNd )
                 pTNd->TransliterateText(
-                        rTrans, nSttCnt, pTNd->GetTxt().getLength(), pUndo);
+                        rTrans, nSttCnt, pTNd->GetText().getLength(), pUndo);
         }
 
         for( ; aIdx.GetIndex() < nEndNd; ++aIdx )
         {
-            pTNd = aIdx.GetNode().GetTxtNode();
+            pTNd = aIdx.GetNode().GetTextNode();
             if (pTNd)
             {
                 pTNd->TransliterateText(
-                        rTrans, 0, pTNd->GetTxt().getLength(), pUndo);
+                        rTrans, 0, pTNd->GetText().getLength(), pUndo);
             }
         }
 
-        if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTxtNode() ))
+        if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTextNode() ))
             pTNd->TransliterateText( rTrans, 0, nEndCnt, pUndo );
     }
     else if( pTNd && nSttCnt < nEndCnt )
@@ -2560,80 +2560,80 @@ void DocumentContentOperationsManager::TransliterateText(
     m_rDoc.getIDocumentState().SetModified();
 }
 
-SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg,
+SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg,
                             const OUString& rGrfName,
                             const OUString& rFltName,
                             const Graphic* pGraphic,
                             const SfxItemSet* pFlyAttrSet,
                             const SfxItemSet* pGrfAttrSet,
-                            SwFrmFmt* pFrmFmt )
+                            SwFrameFormat* pFrameFormat )
 {
-    if( !pFrmFmt )
-        pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
+    if( !pFrameFormat )
+        pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_GRAPHIC );
     SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             rGrfName, rFltName, pGraphic,
-                            m_rDoc.GetDfltGrfFmtColl() );
-    SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
-                            pFlyAttrSet, pGrfAttrSet, pFrmFmt );
-    return pSwFlyFrmFmt;
+                            m_rDoc.GetDfltGrfFormatColl() );
+    SwFlyFrameFormat* pSwFlyFrameFormat = _InsNoTextNode( *rRg.GetPoint(), pSwGrfNode,
+                            pFlyAttrSet, pGrfAttrSet, pFrameFormat );
+    return pSwFlyFrameFormat;
 }
 
-SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj,
+SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj,
                             const SfxItemSet* pFlyAttrSet,
                             const SfxItemSet* pGrfAttrSet,
-                            SwFrmFmt* pFrmFmt )
+                            SwFrameFormat* pFrameFormat )
 {
-    if( !pFrmFmt )
-        pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
+    if( !pFrameFormat )
+        pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_GRAPHIC );
     SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
-                            rGrfObj, m_rDoc.GetDfltGrfFmtColl() );
-    SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
-                            pFlyAttrSet, pGrfAttrSet, pFrmFmt );
-    return pSwFlyFrmFmt;
+                            rGrfObj, m_rDoc.GetDfltGrfFormatColl() );
+    SwFlyFrameFormat* pSwFlyFrameFormat = _InsNoTextNode( *rRg.GetPoint(), pSwGrfNode,
+                            pFlyAttrSet, pGrfAttrSet, pFrameFormat );
+    return pSwFlyFrameFormat;
 }
 
-SwFlyFrmFmt* DocumentContentOperationsManager::Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,
+SwFlyFrameFormat* DocumentContentOperationsManager::Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,
                         const SfxItemSet* pFlyAttrSet,
                         const SfxItemSet* pGrfAttrSet,
-                        SwFrmFmt* pFrmFmt )
+                        SwFrameFormat* pFrameFormat )
 {
-    if( !pFrmFmt )
+    if( !pFrameFormat )
     {
         sal_uInt16 nId = RES_POOLFRM_OLE;
         SvGlobalName aClassName( xObj->getClassID() );
         if (SotExchange::IsMath(aClassName))
             nId = RES_POOLFRM_FORMEL;
 
-        pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( nId );
+        pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( nId );
     }
-    return _InsNoTxtNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode(
+    return _InsNoTextNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             xObj,
-                            m_rDoc.GetDfltGrfFmtColl() ),
+                            m_rDoc.GetDfltGrfFormatColl() ),
                             pFlyAttrSet, pGrfAttrSet,
-                            pFrmFmt );
+                            pFrameFormat );
 }
 
-SwFlyFrmFmt* DocumentContentOperationsManager::InsertOLE(const SwPaM &rRg, const OUString& rObjName,
+SwFlyFrameFormat* DocumentContentOperationsManager::InsertOLE(const SwPaM &rRg, const OUString& rObjName,
                         sal_Int64 nAspect,
                         const SfxItemSet* pFlyAttrSet,
                         const SfxItemSet* pGrfAttrSet,
-                        SwFrmFmt* pFrmFmt )
+                        SwFrameFormat* pFrameFormat )
 {
-    if( !pFrmFmt )
-        pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_OLE );
+    if( !pFrameFormat )
+        pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_OLE );
 
-    return _InsNoTxtNode( *rRg.GetPoint(),
+    return _InsNoTextNode( *rRg.GetPoint(),
                             m_rDoc.GetNodes().MakeOLENode(
                                 SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                                 rObjName,
                                 nAspect,
-                                m_rDoc.GetDfltGrfFmtColl(),
+                                m_rDoc.GetDfltGrfFormatColl(),
                                 0 ),
                             pFlyAttrSet, pGrfAttrSet,
-                            pFrmFmt );
+                            pFrameFormat );
 }
 
 void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrfName,
@@ -2661,31 +2661,31 @@ void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrf
 }
 
 // Insert drawing object, which has to be already inserted in the DrawModel
-SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
+SwDrawFrameFormat* DocumentContentOperationsManager::InsertDrawObj(
     const SwPaM &rRg,
     SdrObject& rDrawObj,
     const SfxItemSet& rFlyAttrSet )
 {
-    SwDrawFrmFmt* pFmt = m_rDoc.MakeDrawFrmFmt( OUString(), m_rDoc.GetDfltFrmFmt() );
+    SwDrawFrameFormat* pFormat = m_rDoc.MakeDrawFrameFormat( OUString(), m_rDoc.GetDfltFrameFormat() );
 
-    const SwFmtAnchor* pAnchor = 0;
+    const SwFormatAnchor* pAnchor = 0;
     rFlyAttrSet.GetItemState( RES_ANCHOR, false, reinterpret_cast<const SfxPoolItem**>(&pAnchor) );
-    pFmt->SetFmtAttr( rFlyAttrSet );
+    pFormat->SetFormatAttr( rFlyAttrSet );
 
     // Didn't set the Anchor yet?
     // DrawObjecte must never end up in the Header/Footer!
-    RndStdIds eAnchorId = pAnchor != NULL ? pAnchor->GetAnchorId() : pFmt->GetAnchor().GetAnchorId();
-    const bool bIsAtCntnt = (FLY_AT_PAGE != eAnchorId);
+    RndStdIds eAnchorId = pAnchor != NULL ? pAnchor->GetAnchorId() : pFormat->GetAnchor().GetAnchorId();
+    const bool bIsAtContent = (FLY_AT_PAGE != eAnchorId);
 
     const SwNodeIndex* pChkIdx = 0;
     if ( pAnchor == NULL )
     {
         pChkIdx = &rRg.GetPoint()->nNode;
     }
-    else if ( bIsAtCntnt )
+    else if ( bIsAtContent )
     {
         pChkIdx =
-            pAnchor->GetCntntAnchor() ? &pAnchor->GetCntntAnchor()->nNode : &rRg.GetPoint()->nNode;
+            pAnchor->GetContentAnchor() ? &pAnchor->GetContentAnchor()->nNode : &rRg.GetPoint()->nNode;
     }
 
     // allow drawing objects in header/footer, but control objects aren't allowed in header/footer.
@@ -2695,14 +2695,14 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
     {
         // apply at-page anchor format
         eAnchorId = FLY_AT_PAGE;
-        pFmt->SetFmtAttr( SwFmtAnchor( eAnchorId ) );
+        pFormat->SetFormatAttr( SwFormatAnchor( eAnchorId ) );
     }
     else if( pAnchor == NULL
-             || ( bIsAtCntnt
-                  && pAnchor->GetCntntAnchor() == NULL ) )
+             || ( bIsAtContent
+                  && pAnchor->GetContentAnchor() == NULL ) )
     {
         // apply anchor format
-        SwFmtAnchor aAnch( pAnchor != NULL ? *pAnchor : pFmt->GetAnchor() );
+        SwFormatAnchor aAnch( pAnchor != NULL ? *pAnchor : pFormat->GetAnchor() );
         eAnchorId = aAnch.GetAnchorId();
         if ( eAnchorId == FLY_AT_FLY )
         {
@@ -2718,23 +2718,23 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
                 aAnch.SetType( eAnchorId );
             }
         }
-        pFmt->SetFmtAttr( aAnch );
+        pFormat->SetFormatAttr( aAnch );
     }
 
     // insert text attribute for as-character anchored drawing object
     if ( eAnchorId == FLY_AS_CHAR )
     {
         bool bAnchorAtPageAsFallback = true;
-        const SwFmtAnchor& rDrawObjAnchorFmt = pFmt->GetAnchor();
-        if ( rDrawObjAnchorFmt.GetCntntAnchor() != NULL )
+        const SwFormatAnchor& rDrawObjAnchorFormat = pFormat->GetAnchor();
+        if ( rDrawObjAnchorFormat.GetContentAnchor() != NULL )
         {
-            SwTxtNode* pAnchorTxtNode =
-                    rDrawObjAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetTxtNode();
-            if ( pAnchorTxtNode != NULL )
+            SwTextNode* pAnchorTextNode =
+                    rDrawObjAnchorFormat.GetContentAnchor()->nNode.GetNode().GetTextNode();
+            if ( pAnchorTextNode != NULL )
             {
-                const sal_Int32 nStt = rDrawObjAnchorFmt.GetCntntAnchor()->nContent.GetIndex();
-                SwFmtFlyCnt aFmt( pFmt );
-                pAnchorTxtNode->InsertItem( aFmt, nStt, nStt );
+                const sal_Int32 nStt = rDrawObjAnchorFormat.GetContentAnchor()->nContent.GetIndex();
+                SwFormatFlyCnt aFormat( pFormat );
+                pAnchorTextNode->InsertItem( aFormat, nStt, nStt );
                 bAnchorAtPageAsFallback = false;
             }
         }
@@ -2742,17 +2742,17 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
         if ( bAnchorAtPageAsFallback )
         {
             OSL_ENSURE( false, "DocumentContentOperationsManager::InsertDrawObj(..) - missing content anchor for as-character anchored drawing object --> anchor at-page" );
-            pFmt->SetFmtAttr( SwFmtAnchor( FLY_AT_PAGE ) );
+            pFormat->SetFormatAttr( SwFormatAnchor( FLY_AT_PAGE ) );
         }
     }
 
-    SwDrawContact* pContact = new SwDrawContact( pFmt, &rDrawObj );
+    SwDrawContact* pContact = new SwDrawContact( pFormat, &rDrawObj );
 
     // Create Frames if necessary
     if( m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() )
     {
         // create layout representation
-        pFmt->MakeFrms();
+        pFormat->MakeFrms();
         // #i42319# - follow-up of #i35635#
         // move object to visible layer
         // #i79391#
@@ -2764,16 +2764,16 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
 
     if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
     {
-        m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsLayFmt(pFmt, 0, 0) );
+        m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsLayFormat(pFormat, 0, 0) );
     }
 
     m_rDoc.getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
 bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool bChkTableStart )
 {
-    SwCntntNode *pNode = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode *pNode = rPos.nNode.GetNode().GetContentNode();
     if(0 == pNode)
         return false;
 
@@ -2788,7 +2788,7 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
     {
         m_rDoc.GetIDocumentUndoRedo().ClearRedo();
         // insert the Undo object (currently only for TextNode)
-        if( pNode->IsTxtNode() )
+        if( pNode->IsTextNode() )
         {
             pUndo = new SwUndoSplitNode( &m_rDoc, rPos, bChkTableStart );
             m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
@@ -2797,30 +2797,30 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
 
     // Update the rsid of the old and the new node unless
     // the old node is split at the beginning or at the end
-    SwTxtNode *pTxtNode =  rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode *pTextNode =  rPos.nNode.GetNode().GetTextNode();
     const sal_Int32 nPos = rPos.nContent.GetIndex();
-    if( pTxtNode && nPos && nPos != pTxtNode->Len() )
+    if( pTextNode && nPos && nPos != pTextNode->Len() )
     {
-        m_rDoc.UpdateParRsid( pTxtNode );
+        m_rDoc.UpdateParRsid( pTextNode );
     }
 
     //JP 28.01.97: Special case for SplitNode at table start:
     //             If it is at the beginning of a Doc/Fly/Footer/... or right at after a table
     //             then insert a paragraph before it.
-    if( bChkTableStart && !rPos.nContent.GetIndex() && pNode->IsTxtNode() )
+    if( bChkTableStart && !rPos.nContent.GetIndex() && pNode->IsTextNode() )
     {
         sal_uLong nPrevPos = rPos.nNode.GetIndex() - 1;
-        const SwTableNode* pTblNd;
+        const SwTableNode* pTableNd;
         const SwNode* pNd = m_rDoc.GetNodes()[ nPrevPos ];
         if( pNd->IsStartNode() &&
             SwTableBoxStartNode == static_cast<const SwStartNode*>(pNd)->GetStartNodeType() &&
-            0 != ( pTblNd = m_rDoc.GetNodes()[ --nPrevPos ]->GetTableNode() ) &&
+            0 != ( pTableNd = m_rDoc.GetNodes()[ --nPrevPos ]->GetTableNode() ) &&
             ((( pNd = m_rDoc.GetNodes()[ --nPrevPos ])->IsStartNode() &&
                SwTableBoxStartNode != static_cast<const SwStartNode*>(pNd)->GetStartNodeType() )
                || ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsTableNode() )
-               || pNd->IsCntntNode() ))
+               || pNd->IsContentNode() ))
         {
-            if( pNd->IsCntntNode() )
+            if( pNd->IsContentNode() )
             {
                 //JP 30.04.99 Bug 65660:
                 // There are no page breaks outside of the normal body area,
@@ -2830,44 +2830,44 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
                 else
                 {
                     // Only if the table has page breaks!
-                    const SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt();
-                    if( SfxItemState::SET != pFrmFmt->GetItemState(RES_PAGEDESC, false) &&
-                        SfxItemState::SET != pFrmFmt->GetItemState( RES_BREAK, false ) )
+                    const SwFrameFormat* pFrameFormat = pTableNd->GetTable().GetFrameFormat();
+                    if( SfxItemState::SET != pFrameFormat->GetItemState(RES_PAGEDESC, false) &&
+                        SfxItemState::SET != pFrameFormat->GetItemState( RES_BREAK, false ) )
                         pNd = 0;
                 }
             }
 
             if( pNd )
             {
-                SwTxtNode* pTxtNd = m_rDoc.GetNodes().MakeTxtNode(
-                                        SwNodeIndex( *pTblNd ),
-                                        m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
-                if( pTxtNd )
+                SwTextNode* pTextNd = m_rDoc.GetNodes().MakeTextNode(
+                                        SwNodeIndex( *pTableNd ),
+                                        m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ));
+                if( pTextNd )
                 {
-                    const_cast<SwPosition&>(rPos).nNode = pTblNd->GetIndex()-1;
-                    const_cast<SwPosition&>(rPos).nContent.Assign( pTxtNd, 0 );
+                    const_cast<SwPosition&>(rPos).nNode = pTableNd->GetIndex()-1;
+                    const_cast<SwPosition&>(rPos).nContent.Assign( pTextNd, 0 );
 
                     // only add page breaks/styles to the body area
                     if( nPrevPos > m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
                     {
-                        SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt();
+                        SwFrameFormat* pFrameFormat = pTableNd->GetTable().GetFrameFormat();
                         const SfxPoolItem *pItem;
-                        if( SfxItemState::SET == pFrmFmt->GetItemState( RES_PAGEDESC,
+                        if( SfxItemState::SET == pFrameFormat->GetItemState( RES_PAGEDESC,
                             false, &pItem ) )
                         {
-                            pTxtNd->SetAttr( *pItem );
-                            pFrmFmt->ResetFmtAttr( RES_PAGEDESC );
+                            pTextNd->SetAttr( *pItem );
+                            pFrameFormat->ResetFormatAttr( RES_PAGEDESC );
                         }
-                        if( SfxItemState::SET == pFrmFmt->GetItemState( RES_BREAK,
+                        if( SfxItemState::SET == pFrameFormat->GetItemState( RES_BREAK,
                             false, &pItem ) )
                         {
-                            pTxtNd->SetAttr( *pItem );
-                            pFrmFmt->ResetFmtAttr( RES_BREAK );
+                            pTextNd->SetAttr( *pItem );
+                            pFrameFormat->ResetFormatAttr( RES_BREAK );
                         }
                     }
 
                     if( pUndo )
-                        pUndo->SetTblFlag();
+                        pUndo->SetTableFlag();
                     m_rDoc.getIDocumentState().SetModified();
                     return true;
                 }
@@ -2875,19 +2875,19 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
         }
     }
 
-    const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-    pCntntStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
-    // FIXME: only SwTxtNode has a valid implementation of SplitCntntNode!
-    OSL_ENSURE(pNode->IsTxtNode(), "splitting non-text node?");
-    pNode = pNode->SplitCntntNode( rPos );
+    const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+    pContentStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
+    // FIXME: only SwTextNode has a valid implementation of SplitContentNode!
+    OSL_ENSURE(pNode->IsTextNode(), "splitting non-text node?");
+    pNode = pNode->SplitContentNode( rPos );
     if (pNode)
     {
         // move all bookmarks, TOXMarks, FlyAtCnt
-        if( !pCntntStore->Empty() )
-            pCntntStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
+        if( !pContentStore->Empty() )
+            pContentStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
 
-        // To-Do - add 'SwExtraRedlineTbl' also ?
-        if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+        // To-Do - add 'SwExtraRedlineTable' also ?
+        if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ))
         {
             SwPaM aPam( rPos );
             aPam.SetMark();
@@ -2903,19 +2903,19 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
     return true;
 }
 
-bool DocumentContentOperationsManager::AppendTxtNode( SwPosition& rPos )
+bool DocumentContentOperationsManager::AppendTextNode( SwPosition& rPos )
 {
     // create new node before EndOfContent
-    SwTxtNode * pCurNode = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode * pCurNode = rPos.nNode.GetNode().GetTextNode();
     if( !pCurNode )
     {
         // so then one can be created!
         SwNodeIndex aIdx( rPos.nNode, 1 );
-        pCurNode = m_rDoc.GetNodes().MakeTxtNode( aIdx,
-                        m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+        pCurNode = m_rDoc.GetNodes().MakeTextNode( aIdx,
+                        m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
     }
     else
-        pCurNode = pCurNode->AppendNode( rPos )->GetTxtNode();
+        pCurNode = pCurNode->AppendNode( rPos )->GetTextNode();
 
     rPos.nNode++;
     rPos.nContent.Assign( pCurNode, 0 );
@@ -2925,8 +2925,8 @@ bool DocumentContentOperationsManager::AppendTxtNode( SwPosition& rPos )
         m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsert( rPos.nNode ) );
     }
 
-    // To-Do - add 'SwExtraRedlineTbl' also ?
-    if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+    // To-Do - add 'SwExtraRedlineTable' also ?
+    if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
         SwPaM aPam( rPos );
         aPam.SetMark();
@@ -3073,14 +3073,14 @@ bool DocumentContentOperationsManager::InsertItemSet ( const SwPaM &rRg, const S
 
 void DocumentContentOperationsManager::RemoveLeadingWhiteSpace(const SwPosition & rPos )
 {
-    const SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
+    const SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
     if ( pTNd )
     {
-        const OUString& rTxt = pTNd->GetTxt();
+        const OUString& rText = pTNd->GetText();
         sal_Int32 nIdx = 0;
-        while (nIdx < rTxt.getLength())
+        while (nIdx < rText.getLength())
         {
-            sal_Unicode const cCh = rTxt[nIdx];
+            sal_Unicode const cCh = rText[nIdx];
             if (('\t' != cCh) && (' ' != cCh))
             {
                 break;
@@ -3184,18 +3184,18 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
     // managed in the DrawModel).
     SwDoc *const pDest = rStartIdx.GetNode().GetDoc();
     ::std::set< _ZSortFly > aSet;
-    const size_t nArrLen = m_rDoc.GetSpzFrmFmts()->size();
+    const size_t nArrLen = m_rDoc.GetSpzFrameFormats()->size();
 
     SwTextBoxHelper::SavedLink aOldTextBoxes;
-    SwTextBoxHelper::saveLinks(*m_rDoc.GetSpzFrmFmts(), aOldTextBoxes);
+    SwTextBoxHelper::saveLinks(*m_rDoc.GetSpzFrameFormats(), aOldTextBoxes);
     SwTextBoxHelper::SavedContent aOldContent;
 
     for ( size_t n = 0; n < nArrLen; ++n )
     {
-        SwFrmFmt* pFmt = (*m_rDoc.GetSpzFrmFmts())[n];
-        SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-        SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
-        bool bAtCntnt = (pAnchor->GetAnchorId() == FLY_AT_PARA);
+        SwFrameFormat* pFormat = (*m_rDoc.GetSpzFrameFormats())[n];
+        SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+        SwPosition const*const pAPos = pAnchor->GetContentAnchor();
+        bool bAtContent = (pAnchor->GetAnchorId() == FLY_AT_PARA);
         if ( !pAPos )
             continue;
         switch ( pAnchor->GetAnchorId() )
@@ -3231,10 +3231,10 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
             bool bLastNode = false;
             // is the node empty?
             const SwNodes& rNodes = pAPos->nNode.GetNodes();
-            SwTxtNode* pTxtNode;
-            if( 0 != ( pTxtNode = pAPos->nNode.GetNode().GetTxtNode() ))
+            SwTextNode* pTextNode;
+            if( 0 != ( pTextNode = pAPos->nNode.GetNode().GetTextNode() ))
             {
-                bEmptyNode = pTxtNode->GetTxt().isEmpty();
+                bEmptyNode = pTextNode->GetText().isEmpty();
                 if( bEmptyNode )
                 {
                     //last node information is only necessary to know for the last TextNode
@@ -3254,7 +3254,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
             bAdd = bLastNode && bEmptyNode;
             if( !bAdd )
             {
-                if( bAtCntnt )
+                if( bAtContent )
                     bAdd = nEndContentIndex > 0;
                 else
                     bAdd = pAPos->nContent <= nEndContentIndex;
@@ -3264,24 +3264,24 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         {
             // Make sure draw formats don't refer to content, so that such
             // content can be removed without problems.
-            SwTextBoxHelper::resetLink(pFmt, aOldContent);
-            aSet.insert( _ZSortFly( pFmt, pAnchor, nArrLen + aSet.size() ));
+            SwTextBoxHelper::resetLink(pFormat, aOldContent);
+            aSet.insert( _ZSortFly( pFormat, pAnchor, nArrLen + aSet.size() ));
         }
     }
 
     // Store all copied (and also the newly created) frames in another array.
     // They are stored as matching the originals, so that we will be later
     // able to build the chains accordingly.
-    ::std::vector< SwFrmFmt* > aVecSwFrmFmt;
+    ::std::vector< SwFrameFormat* > aVecSwFrameFormat;
     ::std::set< _ZSortFly >::const_iterator it=aSet.begin();
 
     while (it != aSet.end())
     {
         // #i59964#
         // correct determination of new anchor position
-        SwFmtAnchor aAnchor( *(*it).GetAnchor() );
-        assert( aAnchor.GetCntntAnchor() != NULL );
-        SwPosition newPos = *aAnchor.GetCntntAnchor();
+        SwFormatAnchor aAnchor( *(*it).GetAnchor() );
+        assert( aAnchor.GetContentAnchor() != NULL );
+        SwPosition newPos = *aAnchor.GetContentAnchor();
         // for at-paragraph and at-character anchored objects the new anchor
         // position can *not* be determined by the difference of the current
         // anchor position to the start of the copied range, because not
@@ -3294,28 +3294,28 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         {
             // First, determine number of anchor text node in the copied range.
             // Note: The anchor text node *have* to be inside the copied range.
-            sal_uLong nAnchorTxtNdNumInRange( 0L );
-            bool bAnchorTxtNdFound( false );
+            sal_uLong nAnchorTextNdNumInRange( 0L );
+            bool bAnchorTextNdFound( false );
             SwNodeIndex aIdx( rRg.aStart );
-            while ( !bAnchorTxtNdFound && aIdx <= rRg.aEnd )
+            while ( !bAnchorTextNdFound && aIdx <= rRg.aEnd )
             {
-                if ( aIdx.GetNode().IsTxtNode() )
+                if ( aIdx.GetNode().IsTextNode() )
                 {
-                    ++nAnchorTxtNdNumInRange;
-                    bAnchorTxtNdFound = aAnchor.GetCntntAnchor()->nNode == aIdx;
+                    ++nAnchorTextNdNumInRange;
+                    bAnchorTextNdFound = aAnchor.GetContentAnchor()->nNode == aIdx;
                 }
 
                 ++aIdx;
             }
             if ( bMergedFirstNode )
-                nAnchorTxtNdNumInRange--;
+                nAnchorTextNdNumInRange--;
 
-            if ( !bAnchorTxtNdFound )
+            if ( !bAnchorTextNdFound )
             {
                 // This case can *not* happen, but to be robust take the first
                 // text node in the destination document.
                 OSL_FAIL( "<SwDoc::_CopyFlyInFly(..)> - anchor text node in copied range not found" );
-                nAnchorTxtNdNumInRange = 1;
+                nAnchorTextNdNumInRange = 1;
             }
             // Second, search corresponding text node in destination document
             // by counting forward from start insert position <rStartIdx> the
@@ -3324,24 +3324,24 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
             SwNodeIndex aAnchorNdIdx( rStartIdx );
             const SwNode& aEndOfContentNd =
                                     aIdx.GetNode().GetNodes().GetEndOfContent();
-            while ( nAnchorTxtNdNumInRange > 0 &&
+            while ( nAnchorTextNdNumInRange > 0 &&
                     &(aIdx.GetNode()) != &aEndOfContentNd )
             {
-                if ( aIdx.GetNode().IsTxtNode() )
+                if ( aIdx.GetNode().IsTextNode() )
                 {
-                    --nAnchorTxtNdNumInRange;
+                    --nAnchorTextNdNumInRange;
                     aAnchorNdIdx = aIdx;
                 }
 
                 ++aIdx;
             }
-            if ( !aAnchorNdIdx.GetNode().IsTxtNode() )
+            if ( !aAnchorNdIdx.GetNode().IsTextNode() )
             {
                 // This case can *not* happen, but to be robust take the first
                 // text node in the destination document.
                 OSL_FAIL( "<SwDoc::_CopyFlyInFly(..)> - found anchor node index isn't a text node" );
                 aAnchorNdIdx = rStartIdx;
-                while ( !aAnchorNdIdx.GetNode().IsTxtNode() )
+                while ( !aAnchorNdIdx.GetNode().IsTextNode() )
                 {
                     ++aAnchorNdIdx;
                 }
@@ -3357,9 +3357,9 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         }
         // Set the character bound Flys back at the original character
         if ((FLY_AT_CHAR == aAnchor.GetAnchorId()) &&
-             newPos.nNode.GetNode().IsTxtNode() )
+             newPos.nNode.GetNode().IsTextNode() )
         {
-            newPos.nContent.Assign( newPos.nNode.GetNode().GetTxtNode(), newPos.nContent.GetIndex() );
+            newPos.nContent.Assign( newPos.nNode.GetNode().GetTextNode(), newPos.nContent.GetIndex() );
         }
         else
         {
@@ -3370,10 +3370,10 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         // Check recursion: copy content in its own frame, then don't copy it.
         if( pDest == &m_rDoc )
         {
-            const SwFmtCntnt& rCntnt = (*it).GetFmt()->GetCntnt();
+            const SwFormatContent& rContent = (*it).GetFormat()->GetContent();
             const SwStartNode* pSNd;
-            if( rCntnt.GetCntntIdx() &&
-                0 != ( pSNd = rCntnt.GetCntntIdx()->GetNode().GetStartNode() ) &&
+            if( rContent.GetContentIdx() &&
+                0 != ( pSNd = rContent.GetContentIdx()->GetNode().GetStartNode() ) &&
                 pSNd->GetIndex() < rStartIdx.GetIndex() &&
                 rStartIdx.GetIndex() < pSNd->EndOfSectionIndex() )
             {
@@ -3383,36 +3383,36 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         }
 
         // Copy the format and set the new anchor
-        aVecSwFrmFmt.push_back( pDest->getIDocumentLayoutAccess().CopyLayoutFmt( *(*it).GetFmt(),
+        aVecSwFrameFormat.push_back( pDest->getIDocumentLayoutAccess().CopyLayoutFormat( *(*it).GetFormat(),
                 aAnchor, false, true ) );
         ++it;
     }
 
     // Rebuild as much as possible of all chains that are available in the original,
-    OSL_ENSURE( aSet.size() == aVecSwFrmFmt.size(), "Missing new Flys" );
-    if ( aSet.size() == aVecSwFrmFmt.size() )
+    OSL_ENSURE( aSet.size() == aVecSwFrameFormat.size(), "Missing new Flys" );
+    if ( aSet.size() == aVecSwFrameFormat.size() )
     {
         size_t n = 0;
         for (::std::set< _ZSortFly >::const_iterator nIt=aSet.begin() ; nIt != aSet.end(); ++nIt, ++n )
         {
-            const SwFrmFmt *pFmtN = (*nIt).GetFmt();
-            const SwFmtChain &rChain = pFmtN->GetChain();
+            const SwFrameFormat *pFormatN = (*nIt).GetFormat();
+            const SwFormatChain &rChain = pFormatN->GetChain();
             int nCnt = int(0 != 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 )
             {
-                const SwFrmFmt *pFmtK = (*kIt).GetFmt();
-                if ( rChain.GetPrev() == pFmtK )
+                const SwFrameFormat *pFormatK = (*kIt).GetFormat();
+                if ( rChain.GetPrev() == pFormatK )
                 {
-                    ::lcl_ChainFmts( static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[k]),
-                                     static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[n]) );
+                    ::lcl_ChainFormats( static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[k]),
+                                     static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[n]) );
                     --nCnt;
                 }
-                else if ( rChain.GetNext() == pFmtK )
+                else if ( rChain.GetNext() == pFormatK )
                 {
-                    ::lcl_ChainFmts( static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[n]),
-                                     static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[k]) );
+                    ::lcl_ChainFormats( static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[n]),
+                                     static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[k]) );
                     --nCnt;
                 }
             }
@@ -3420,27 +3420,27 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
 
         // Re-create content property of draw formats, knowing how old shapes
         // were paired with old fly formats (aOldTextBoxes) and that aSet is
-        // parallel with aVecSwFrmFmt.
-        SwTextBoxHelper::restoreLinks(aSet, aVecSwFrmFmt, aOldTextBoxes, aOldContent);
+        // parallel with aVecSwFrameFormat.
+        SwTextBoxHelper::restoreLinks(aSet, aVecSwFrameFormat, aOldTextBoxes, aOldContent);
     }
 }
 
 /*
  * Reset the text's hard formatting
  */
-/** @params pArgs contains the document's ChrFmtTable
+/** @params pArgs contains the document's ChrFormatTable
  *                Is need for selections at the beginning/end and with no SSelection.
  */
-bool DocumentContentOperationsManager::lcl_RstTxtAttr( const SwNodePtr& rpNd, void* pArgs )
+bool DocumentContentOperationsManager::lcl_RstTextAttr( const SwNodePtr& rpNd, void* pArgs )
 {
-    ParaRstFmt* pPara = static_cast<ParaRstFmt*>(pArgs);
-    SwTxtNode * pTxtNode = rpNd->GetTxtNode();
-    if( pTxtNode && pTxtNode->GetpSwpHints() )
+    ParaRstFormat* pPara = static_cast<ParaRstFormat*>(pArgs);
+    SwTextNode * pTextNode = rpNd->GetTextNode();
+    if( pTextNode && pTextNode->GetpSwpHints() )
     {
-        SwIndex aSt( pTxtNode, 0 );
-        sal_Int32 nEnd = pTxtNode->Len();
+        SwIndex aSt( pTextNode, 0 );
+        sal_Int32 nEnd = pTextNode->Len();
 
-        if( &pPara->pSttNd->nNode.GetNode() == pTxtNode &&
+        if( &pPara->pSttNd->nNode.GetNode() == pTextNode &&
             pPara->pSttNd->nContent.GetIndex() )
             aSt = pPara->pSttNd->nContent.GetIndex();
 
@@ -3450,15 +3450,15 @@ bool DocumentContentOperationsManager::lcl_RstTxtAttr( const SwNodePtr& rpNd, vo
         if( pPara->pHistory )
         {
             // Save all attributes for the Undo.
-            SwRegHistory aRHst( *pTxtNode, pPara->pHistory );
-            pTxtNode->GetpSwpHints()->Register( &aRHst );
-            pTxtNode->RstTxtAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
+            SwRegHistory aRHst( *pTextNode, pPara->pHistory );
+            pTextNode->GetpSwpHints()->Register( &aRHst );
+            pTextNode->RstTextAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
                                   pPara->pDelSet, pPara->bInclRefToxMark, pPara->bExactRange );
-            if( pTxtNode->GetpSwpHints() )
-                pTxtNode->GetpSwpHints()->DeRegister();
+            if( pTextNode->GetpSwpHints() )
+                pTextNode->GetpSwpHints()->DeRegister();
         }
         else
-            pTxtNode->RstTxtAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
+            pTextNode->RstTextAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
                                   pPara->pDelSet, pPara->bInclRefToxMark, pPara->bExactRange );
     }
     return true;
@@ -3528,8 +3528,8 @@ bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
 bool DocumentContentOperationsManager::DeleteAndJoinImpl( SwPaM & rPam,
                                const bool bForceJoinNext )
 {
-    bool bJoinTxt, bJoinPrev;
-    ::sw_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
+    bool bJoinText, bJoinPrev;
+    ::sw_GetJoinFlags( rPam, bJoinText, bJoinPrev );
     // #i100466#
     if ( bForceJoinNext )
     {
@@ -3542,7 +3542,7 @@ bool DocumentContentOperationsManager::DeleteAndJoinImpl( SwPaM & rPam,
             return false;
     }
 
-    if( bJoinTxt )
+    if( bJoinText )
     {
         ::sw_JoinText( rPam, bJoinPrev );
     }
@@ -3584,22 +3584,22 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
 
     {
         // Delete all empty TextHints at the Mark's position
-        SwTxtNode* pTxtNd = rPam.GetMark()->nNode.GetNode().GetTxtNode();
+        SwTextNode* pTextNd = rPam.GetMark()->nNode.GetNode().GetTextNode();
         SwpHints* pHts;
-        if( pTxtNd &&  0 != ( pHts = pTxtNd->GetpSwpHints()) && pHts->Count() )
+        if( pTextNd &&  0 != ( pHts = pTextNd->GetpSwpHints()) && pHts->Count() )
         {
             const sal_Int32 *pEndIdx;
             const sal_Int32 nMkCntPos = rPam.GetMark()->nContent.GetIndex();
             for( size_t n = pHts->Count(); n; )
             {
-                const SwTxtAttr* pAttr = (*pHts)[ --n ];
+                const SwTextAttr* pAttr = (*pHts)[ --n ];
                 if( nMkCntPos > pAttr->GetStart() )
                     break;
 
                 if( nMkCntPos == pAttr->GetStart() &&
                     0 != (pEndIdx = pAttr->End()) &&
                     *pEndIdx == pAttr->GetStart() )
-                    pTxtNd->DestroyAttr( pHts->Cut( n ) );
+                    pTextNd->DestroyAttr( pHts->Cut( n ) );
             }
         }
     }
@@ -3636,7 +3636,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
         return true;
     }
 
-    if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
         m_rDoc.getIDocumentRedlineAccess().DeleteRedline( rPam, true, USHRT_MAX );
 
     // Delete and move all "Flys at the paragraph", which are within the Selection
@@ -3649,13 +3649,13 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
         &pEnd->nContent);
 
     SwNodeIndex aSttIdx( pStt->nNode );
-    SwCntntNode * pCNd = aSttIdx.GetNode().GetCntntNode();
+    SwContentNode * pCNd = aSttIdx.GetNode().GetContentNode();
 
     do {        // middle checked loop!
         if( pCNd )
         {
-            SwTxtNode * pStartTxtNode( pCNd->GetTxtNode() );
-            if ( pStartTxtNode )
+            SwTextNode * pStartTextNode( pCNd->GetTextNode() );
+            if ( pStartTextNode )
             {
                 // now move the Content to the new Node
                 bool bOneNd = pStt->nNode == pEnd->nNode;
@@ -3666,12 +3666,12 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
                 // Don't call again, if already empty
                 if( nLen )
                 {
-                    pStartTxtNode->EraseText( pStt->nContent, nLen );
+                    pStartTextNode->EraseText( pStt->nContent, nLen );
 
-                    if( !pStartTxtNode->Len() )
+                    if( !pStartTextNode->Len() )
                     {
                 // METADATA: remove reference if empty (consider node deleted)
-                        pStartTxtNode->RemoveMetadataReference();
+                        pStartTextNode->RemoveMetadataReference();
                     }
                 }
 
@@ -3688,22 +3688,22 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
             }
         }
 
-        pCNd = pEnd->nNode.GetNode().GetCntntNode();
+        pCNd = pEnd->nNode.GetNode().GetContentNode();
         if( pCNd )
         {
-            SwTxtNode * pEndTxtNode( pCNd->GetTxtNode() );
-            if( pEndTxtNode )
+            SwTextNode * pEndTextNode( pCNd->GetTextNode() );
+            if( pEndTextNode )
             {
                 // if already empty, don't call again
                 if( pEnd->nContent.GetIndex() )
                 {
                     SwIndex aIdx( pCNd, 0 );
-                    pEndTxtNode->EraseText( aIdx, pEnd->nContent.GetIndex() );
+                    pEndTextNode->EraseText( aIdx, pEnd->nContent.GetIndex() );
 
-                    if( !pEndTxtNode->Len() )
+                    if( !pEndTextNode->Len() )
                     {
                         // METADATA: remove reference if empty (consider node deleted)
-                        pEndTxtNode->RemoveMetadataReference();
+                        pEndTextNode->RemoveMetadataReference();
                     }
                 }
             }
@@ -3728,7 +3728,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
 
         // If the Node that contained the Cursor has been deleted,
         // the Content has to be assigned to the current Content.
-        pStt->nContent.Assign( pStt->nNode.GetNode().GetCntntNode(),
+        pStt->nContent.Assign( pStt->nNode.GetNode().GetContentNode(),
                                 pStt->nContent.GetIndex() );
 
         // If we deleted across Node boundaries we have to correct the PaM,
@@ -3739,7 +3739,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
 
     } while( false );
 
-    if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
         m_rDoc.getIDocumentRedlineAccess().CompressRedlines();
     m_rDoc.getIDocumentState().SetModified();
 
@@ -3754,8 +3754,8 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
     if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark() )
         return false;
 
-    bool bJoinTxt, bJoinPrev;
-    ::sw_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
+    bool bJoinText, bJoinPrev;
+    ::sw_GetJoinFlags( rPam, bJoinText, bJoinPrev );
 
     {
         // Create a copy of the Cursor in order to move all Pams from
@@ -3774,7 +3774,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
 
         // Own Undo?
         OUString sRepl( rStr );
-        SwTxtNode* pTxtNd = pStt->nNode.GetNode().GetTxtNode();
+        SwTextNode* pTextNd = pStt->nNode.GetNode().GetTextNode();
         sal_Int32 nStt = pStt->nContent.GetIndex();
         sal_Int32 nEnd;
 
@@ -3800,7 +3800,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
                     *aDelPam.GetMark() = pBkmk->GetOtherMarkPos();
                 m_rDoc.getIDocumentMarkAccess()->deleteMark(pBkmk);
                 pStt = aDelPam.Start();
-                pTxtNd = pStt->nNode.GetNode().GetTxtNode();
+                pTextNd = pStt->nNode.GetNode().GetTextNode();
                 nStt = pStt->nContent.GetIndex();
             }
 
@@ -3811,7 +3811,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
                             RES_CHRATR_BEGIN,     RES_TXTATR_WITHEND_END - 1,
                             RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
                             0 );
-                pTxtNd->GetAttr( aSet, nStt+1, nStt+1 );
+                pTextNd->GetAttr( aSet, nStt+1, nStt+1 );
 
                 aSet.ClearItem( RES_TXTATR_REFMARK );
                 aSet.ClearItem( RES_TXTATR_TOXMARK );
@@ -3842,7 +3842,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
                         ++aMkNd;
                         aDelPam.GetMark()->nNode = aMkNd;
                         aDelPam.GetMark()->nContent.Assign(
-                                    aMkNd.GetNode().GetCntntNode(), nMkCnt );
+                                    aMkNd.GetNode().GetContentNode(), nMkCnt );
                         bFirst = false;
                     }
                     else
@@ -3858,11 +3858,11 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
 
                 ++aPtNd;
                 aDelPam.GetPoint()->nNode = aPtNd;
-                aDelPam.GetPoint()->nContent.Assign( aPtNd.GetNode().GetCntntNode(),
+                aDelPam.GetPoint()->nContent.Assign( aPtNd.GetNode().GetContentNode(),
                                                     nPtCnt);
                 *aTmpRange.GetMark() = *aDelPam.GetPoint();
 
-                m_rDoc.RstTxtAttrs( aTmpRange );
+                m_rDoc.RstTextAttrs( aTmpRange );
                 InsertItemSet( aTmpRange, aSet );
             }
 
@@ -3897,11 +3897,11 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
                     *rPam.GetMark() = pBkmk->GetOtherMarkPos();
                 m_rDoc.getIDocumentMarkAccess()->deleteMark(pBkmk);
             }
-            bJoinTxt = false;
+            bJoinText = false;
         }
         else
         {
-            if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size() )
+            if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size() )
                 m_rDoc.getIDocumentRedlineAccess().DeleteRedline( aDelPam, true, USHRT_MAX );
 
             SwUndoReplace* pUndoRpl = 0;
@@ -3922,19 +3922,19 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
             // Set the values again, if Frames or footnotes on the Text have been removed.
             nStt = nPtCnt;
             nEnd = bOneNode ? pEnd->nContent.GetIndex()
-                            : pTxtNd->GetTxt().getLength();
+                            : pTextNd->GetText().getLength();
 
             bool bFirst = true;
             OUString sIns;
             while ( lcl_GetTokenToParaBreak( sRepl, sIns, bRegExReplace ) )
             {
-                if (!bFirst || nStt == pTxtNd->GetTxt().getLength())
+                if (!bFirst || nStt == pTextNd->GetText().getLength())
                 {
                     InsertString( aDelPam, sIns );
                 }
                 else if( nStt < nEnd || !sIns.isEmpty() )
                 {
-                    pTxtNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
+                    pTextNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
                 }
                 SplitNode( *pStt, false);
                 bFirst = false;
@@ -3942,23 +3942,23 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
 
             if( bFirst || !sIns.isEmpty() )
             {
-                if (!bFirst || nStt == pTxtNd->GetTxt().getLength())
+                if (!bFirst || nStt == pTextNd->GetText().getLength())
                 {
                     InsertString( aDelPam, sIns );
                 }
                 else if( nStt < nEnd || !sIns.isEmpty() )
                 {
-                    pTxtNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
+                    pTextNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
                 }
             }
 
             *rPam.GetPoint() = *aDelPam.GetMark();
             ++aPtNd;
             rPam.GetMark()->nNode = aPtNd;
-            rPam.GetMark()->nContent.Assign( aPtNd.GetNode().GetCntntNode(),
+            rPam.GetMark()->nContent.Assign( aPtNd.GetNode().GetContentNode(),
                                                 nPtCnt );
 
-            if (bJoinTxt)
+            if (bJoinText)
             {
                 assert(rPam.GetPoint() == rPam.End());
                 // move so that SetEnd remembers position after sw_JoinText
@@ -3978,7 +3978,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
     }
 
     bool bRet(true);
-    if (bJoinTxt)
+    if (bJoinText)
     {
         bRet = ::sw_JoinText(rPam, bJoinPrev);
     }
@@ -3987,20 +3987,20 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
     return bRet;
 }
 
-SwFlyFrmFmt* DocumentContentOperationsManager::_InsNoTxtNode( const SwPosition& rPos, SwNoTxtNode* pNode,
+SwFlyFrameFormat* DocumentContentOperationsManager::_InsNoTextNode( const SwPosition& rPos, SwNoTextNode* pNode,
                                     const SfxItemSet* pFlyAttrSet,
                                     const SfxItemSet* pGrfAttrSet,
-                                    SwFrmFmt* pFrmFmt)
+                                    SwFrameFormat* pFrameFormat)
 {
-    SwFlyFrmFmt *pFmt = 0;
+    SwFlyFrameFormat *pFormat = 0;
     if( pNode )
     {
-        pFmt = m_rDoc._MakeFlySection( rPos, *pNode, FLY_AT_PARA,
-                                pFlyAttrSet, pFrmFmt );
+        pFormat = m_rDoc._MakeFlySection( rPos, *pNode, FLY_AT_PARA,
+                                pFlyAttrSet, pFrameFormat );
         if( pGrfAttrSet )
             pNode->SetAttr( *pGrfAttrSet );
     }
-    return pFmt;
+    return pFormat;
 }
 
 #define NUMRULE_STATE \
@@ -4010,18 +4010,18 @@ SwFlyFrmFmt* DocumentContentOperationsManager::_InsNoTxtNode( const SwPosition&
      SfxStringItem aListIdItem( RES_PARATR_LIST_ID, OUString() ); \
 
 #define PUSH_NUMRULE_STATE \
-     lcl_PushNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTxtNd );
+     lcl_PushNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTextNd );
 
 #define POP_NUMRULE_STATE \
-     lcl_PopNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTxtNd, rPam );
+     lcl_PopNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTextNd, rPam );
 
 static void lcl_PushNumruleState( SfxItemState &aNumRuleState, SwNumRuleItem &aNumRuleItem,
                                   SfxItemState &aListIdState, SfxStringItem &aListIdItem,
-                                  const SwTxtNode *pDestTxtNd )
+                                  const SwTextNode *pDestTextNd )
 {
     // Safe numrule item at destination.
     // #i86492# - Safe also <ListId> item of destination.
-    const SfxItemSet * pAttrSet = pDestTxtNd->GetpSwAttrSet();
+    const SfxItemSet * pAttrSet = pDestTextNd->GetpSwAttrSet();
     if (pAttrSet != NULL)
     {
         const SfxPoolItem * pItem = NULL;
@@ -4040,7 +4040,7 @@ static void lcl_PushNumruleState( SfxItemState &aNumRuleState, SwNumRuleItem &aN
 
 static void lcl_PopNumruleState( SfxItemState aNumRuleState, const SwNumRuleItem &aNumRuleItem,
                                  SfxItemState aListIdState, const SfxStringItem &aListIdItem,
-                                 SwTxtNode *pDestTxtNd, const SwPaM& rPam )
+                                 SwTextNode *pDestTextNd, const SwPaM& rPam )
 {
     /* If only a part of one paragraph is copied
        restore the numrule at the destination. */
@@ -4049,19 +4049,19 @@ static void lcl_PopNumruleState( SfxItemState aNumRuleState, const SwNumRuleItem
     {
         if (SfxItemState::SET == aNumRuleState)
         {
-            pDestTxtNd->SetAttr(aNumRuleItem);
+            pDestTextNd->SetAttr(aNumRuleItem);
         }
         else
         {
-            pDestTxtNd->ResetAttr(RES_PARATR_NUMRULE);
+            pDestTextNd->ResetAttr(RES_PARATR_NUMRULE);
         }
         if (SfxItemState::SET == aListIdState)
         {
-            pDestTxtNd->SetAttr(aListIdItem);
+            pDestTextNd->SetAttr(aListIdItem);
         }
         else
         {
-            pDestTxtNd->ResetAttr(RES_PARATR_LIST_ID);
+            pDestTextNd->ResetAttr(RES_PARATR_LIST_ID);
         }
     }
 }
@@ -4093,7 +4093,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // removing the redlines so use cursor that is corrected by PaMCorrAbs
     std::unique_ptr<SwUnoCrsr> const pCopyPam(pDoc->CreateUnoCrsr(rPos));
 
-    SwTblNumFmtMerge aTNFM( m_rDoc, *pDoc );
+    SwTableNumFormatMerge aTNFM( m_rDoc, *pDoc );
 
     if (pDoc->GetIDocumentUndoRedo().DoesUndo())
     {
@@ -4107,7 +4107,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // Move the PaM one node back from the insert position, so that
     // the position doesn't get moved
     pCopyPam->SetMark();
-    bool bCanMoveBack = pCopyPam->Move(fnMoveBackward, fnGoCntnt);
+    bool bCanMoveBack = pCopyPam->Move(fnMoveBackward, fnGoContent);
     // If the position was shifted from more than one node, an end node has been skipped
     bool bAfterTable = false;
     if ((rPos.nNode.GetIndex() - pCopyPam->GetPoint()->nNode.GetIndex()) > 1)
@@ -4125,14 +4125,14 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     SwNodeRange aRg( pStt->nNode, pEnd->nNode );
     SwNodeIndex aInsPos( rPos.nNode );
     const bool bOneNode = pStt->nNode == pEnd->nNode;
-    SwTxtNode* pSttTxtNd = pStt->nNode.GetNode().GetTxtNode();
-    SwTxtNode* pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
-    SwTxtNode* pDestTxtNd = aInsPos.GetNode().GetTxtNode();
-    bool bCopyCollFmt = !pDoc->IsInsOnlyTextGlossary() &&
-                        ( (pDestTxtNd && !pDestTxtNd->GetTxt().getLength()) ||
+    SwTextNode* pSttTextNd = pStt->nNode.GetNode().GetTextNode();
+    SwTextNode* pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
+    SwTextNode* pDestTextNd = aInsPos.GetNode().GetTextNode();
+    bool bCopyCollFormat = !pDoc->IsInsOnlyTextGlossary() &&
+                        ( (pDestTextNd && !pDestTextNd->GetText().getLength()) ||
                           ( !bOneNode && !rPos.nContent.GetIndex() ) );
     bool bCopyBookmarks = true;
-    bool bStartIsTxtNode = 0 != pSttTxtNd;
+    bool bStartIsTextNode = 0 != pSttTextNd;
 
     // #i104585# copy outline num rule to clipboard (for ASCII filter)
     if (pDoc->IsClipBoard() && m_rDoc.GetOutlineNumRule())
@@ -4158,8 +4158,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // - destination is an empty paragraph which is not in a list and
     // - source contains at least one paragraph which is not in a list
     if ( pNumRuleToPropagate &&
-         pDestTxtNd && !pDestTxtNd->GetTxt().getLength() &&
-         !pDestTxtNd->IsInList() &&
+         pDestTextNd && !pDestTextNd->GetText().getLength() &&
+         !pDestTextNd->IsInList() &&
          !lcl_ContainsOnlyParagraphsInList( rPam ) )
     {
         pNumRuleToPropagate = 0;
@@ -4169,31 +4169,31 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
 
     // This do/while block is only there so that we can break out of it!
     do {
-        if( pSttTxtNd )
+        if( pSttTextNd )
         {
             // Don't copy the beginning completely?
-            if( !bCopyCollFmt || bColumnSel || pStt->nContent.GetIndex() )
+            if( !bCopyCollFormat || bColumnSel || pStt->nContent.GetIndex() )
             {
                 bHandledStartNode = true;
 
                 SwIndex aDestIdx( rPos.nContent );
                 bool bCopyOk = false;
-                if( !pDestTxtNd )
+                if( !pDestTextNd )
                 {
                     if( pStt->nContent.GetIndex() || bOneNode )
-                        pDestTxtNd = pDoc->GetNodes().MakeTxtNode( aInsPos,
-                            pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD));
+                        pDestTextNd = pDoc->GetNodes().MakeTextNode( aInsPos,
+                            pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD));
                     else
                     {
-                        pDestTxtNd = pSttTxtNd->MakeCopy( pDoc, aInsPos )->GetTxtNode();
+                        pDestTextNd = pSttTextNd->MakeCopy( pDoc, aInsPos )->GetTextNode();
                         bCopyOk = true;
                     }
-                    aDestIdx.Assign( pDestTxtNd, 0 );
-                    bCopyCollFmt = true;
+                    aDestIdx.Assign( pDestTextNd, 0 );
+                    bCopyCollFormat = true;
                 }
                 else if( !bOneNode || bColumnSel )
                 {
-                    const sal_Int32 nCntntEnd = pEnd->nContent.GetIndex();
+                    const sal_Int32 nContentEnd = pEnd->nContent.GetIndex();
                     {
                         ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                         pDoc->getIDocumentContentOperations().SplitNode( rPos, false );
@@ -4202,13 +4202,13 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                     if (bCanMoveBack && rPos == *pCopyPam->GetPoint())
                     {
                         // after the SplitNode, span the CpyPam correctly again
-                        pCopyPam->Move( fnMoveBackward, fnGoCntnt );
-                        pCopyPam->Move( fnMoveBackward, fnGoCntnt );
+                        pCopyPam->Move( fnMoveBackward, fnGoContent );
+                        pCopyPam->Move( fnMoveBackward, fnGoContent );
                     }
 
-                    pDestTxtNd = pDoc->GetNodes()[ aInsPos.GetIndex()-1 ]->GetTxtNode();
+                    pDestTextNd = pDoc->GetNodes()[ aInsPos.GetIndex()-1 ]->GetTextNode();
                     aDestIdx.Assign(
-                            pDestTxtNd, pDestTxtNd->GetTxt().getLength());
+                            pDestTextNd, pDestTextNd->GetText().getLength());
 
                     // Correct the area again
                     if( bEndEqualIns )
@@ -4216,25 +4216,25 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                         bool bChg = pEnd != rPam.GetPoint();
                         if( bChg )
                             rPam.Exchange();
-                        rPam.Move( fnMoveBackward, fnGoCntnt );
+                        rPam.Move( fnMoveBackward, fnGoContent );
                         if( bChg )
                             rPam.Exchange();
 
                         aRg.aEnd = pEnd->nNode;
-                        pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
+                        pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
                     }
                     else if( rPos == *pEnd )
                     {
                         // The end was also moved
                         pEnd->nNode--;
-                        pEnd->nContent.Assign( pDestTxtNd, nCntntEnd );
+                        pEnd->nContent.Assign( pDestTextNd, nContentEnd );
                         aRg.aEnd = pEnd->nNode;
-                        pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
+                        pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
                     }
                 }
 
                 NUMRULE_STATE
-                if( bCopyCollFmt && bOneNode )
+                if( bCopyCollFormat && bOneNode )
                 {
                     PUSH_NUMRULE_STATE
                 }
@@ -4243,37 +4243,37 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                 {
                     const sal_Int32 nCpyLen = ( (bOneNode)
                                            ? pEnd->nContent.GetIndex()
-                                           : pSttTxtNd->GetTxt().getLength())
+                                           : pSttTextNd->GetText().getLength())
                                          - pStt->nContent.GetIndex();
-                    pSttTxtNd->CopyText( pDestTxtNd, aDestIdx,
+                    pSttTextNd->CopyText( pDestTextNd, aDestIdx,
                                             pStt->nContent, nCpyLen );
                     if( bEndEqualIns )
                         pEnd->nContent -= nCpyLen;
                 }
 
-                if( bCopyCollFmt && bOneNode )
+                if( bCopyCollFormat && bOneNode )
                 {
-                    pSttTxtNd->CopyCollFmt( *pDestTxtNd );
+                    pSttTextNd->CopyCollFormat( *pDestTextNd );
                     POP_NUMRULE_STATE
                 }
             }
         }
-        else if( pDestTxtNd )
+        else if( pDestTextNd )
         {
             // Problems with insertion of table selections into "normal" text solved.
             // We have to set the correct PaM for Undo, if this PaM starts in a textnode,
             // the undo operation will try to merge this node after removing the table.
             // If we didn't split a textnode, the PaM should start at the inserted table node
-            if( rPos.nContent.GetIndex() == pDestTxtNd->Len() )
+            if( rPos.nContent.GetIndex() == pDestTextNd->Len() )
             {    // Insertion at the last position of a textnode (empty or not)
                 ++aInsPos; // The table will be inserted behind the text node
             }
             else if( rPos.nContent.GetIndex() )
             {   // Insertion in the middle of a text node, it has to be split
                 // (and joined from undo)
-                bStartIsTxtNode = true;
+                bStartIsTextNode = true;
 
-                const sal_Int32 nCntntEnd = pEnd->nContent.GetIndex();
+                const sal_Int32 nContentEnd = pEnd->nContent.GetIndex();
                 {
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                     pDoc->getIDocumentContentOperations().SplitNode( rPos, false );
@@ -4282,8 +4282,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                 if (bCanMoveBack && rPos == *pCopyPam->GetPoint())
                 {
                     // after the SplitNode, span the CpyPam correctly again
-                    pCopyPam->Move( fnMoveBackward, fnGoCntnt );
-                    pCopyPam->Move( fnMoveBackward, fnGoCntnt );
+                    pCopyPam->Move( fnMoveBackward, fnGoContent );
+                    pCopyPam->Move( fnMoveBackward, fnGoContent );
                 }
 
                 // Correct the area again
@@ -4293,8 +4293,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                 else if( rPos == *pEnd )
                 {
                     rPos.nNode-=2;
-                    rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
-                                            nCntntEnd );
+                    rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
+                                            nContentEnd );
                     rPos.nNode++;
                     aRg.aEnd--;
                 }
@@ -4311,41 +4311,41 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
             }
         }
 
-        pDestTxtNd = aInsPos.GetNode().GetTxtNode();
-        if( pEndTxtNd && (!bOneNode || !bHandledStartNode) )
+        pDestTextNd = aInsPos.GetNode().GetTextNode();
+        if( pEndTextNd && (!bOneNode || !bHandledStartNode) )
         {
             SwIndex aDestIdx( rPos.nContent );
-            if( !pDestTxtNd )
+            if( !pDestTextNd )
             {
-                pDestTxtNd = pDoc->GetNodes().MakeTxtNode( aInsPos,
-                            pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD));
-                aDestIdx.Assign( pDestTxtNd, 0  );
+                pDestTextNd = pDoc->GetNodes().MakeTextNode( aInsPos,
+                            pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD));
+                aDestIdx.Assign( pDestTextNd, 0  );
                 aInsPos--;
 
                 // if we have to insert an extra text node
                 // at the destination, this node will be our new destination
-                // (text) node, and thus we set bStartisTxtNode to true. This
+                // (text) node, and thus we set bStartisTextNode to true. This
                 // will ensure that this node will be deleted during Undo
                 // using JoinNext.
-                OSL_ENSURE( !bStartIsTxtNode, "Oops, undo may be instable now." );
-                bStartIsTxtNode = true;
+                OSL_ENSURE( !bStartIsTextNode, "Oops, undo may be instable now." );
+                bStartIsTextNode = true;
             }
 
-            const bool bEmptyDestNd = pDestTxtNd->GetTxt().isEmpty();
+            const bool bEmptyDestNd = pDestTextNd->GetText().isEmpty();
 
             NUMRULE_STATE
-            if( bCopyCollFmt && ( bOneNode || bEmptyDestNd ))
+            if( bCopyCollFormat && ( bOneNode || bEmptyDestNd ))
             {
                 PUSH_NUMRULE_STATE
             }
 
-            pEndTxtNd->CopyText( pDestTxtNd, aDestIdx, SwIndex( pEndTxtNd ),
+            pEndTextNd->CopyText( pDestTextNd, aDestIdx, SwIndex( pEndTextNd ),
                             pEnd->nContent.GetIndex() );
 
             // Also copy all format templates
-            if( bCopyCollFmt && ( bOneNode || bEmptyDestNd ))
+            if( bCopyCollFormat && ( bOneNode || bEmptyDestNd ))
             {
-                pEndTxtNd->CopyCollFmt( *pDestTxtNd );
+                pEndTextNd->CopyCollFormat( *pDestTextNd );
                 if ( bOneNode )
                 {
                     POP_NUMRULE_STATE
@@ -4356,13 +4356,13 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
         if( bCopyAll || aRg.aStart != aRg.aEnd )
         {
             SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
-            if( !bOneNode && pSttTxtNd && bCopyCollFmt && pDestTxtNd->HasSwAttrSet() )
+            if( !bOneNode && pSttTextNd && bCopyCollFormat && pDestTextNd->HasSwAttrSet() )
             {
-                aBrkSet.Put( *pDestTxtNd->GetpSwAttrSet() );
+                aBrkSet.Put( *pDestTextNd->GetpSwAttrSet() );
                 if( SfxItemState::SET == aBrkSet.GetItemState( RES_BREAK, false ) )
-                    pDestTxtNd->ResetAttr( RES_BREAK );
+                    pDestTextNd->ResetAttr( RES_BREAK );
                 if( SfxItemState::SET == aBrkSet.GetItemState( RES_PAGEDESC, false ) )
-                    pDestTxtNd->ResetAttr( RES_PAGEDESC );
+                    pDestTextNd->ResetAttr( RES_PAGEDESC );
             }
 
             if( aInsPos == pEnd->nNode )
@@ -4372,7 +4372,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                                   false, false, bHandledStartNode );
                 ++aSaveIdx;
                 pEnd->nNode = aSaveIdx;
-                pEnd->nContent.Assign( aSaveIdx.GetNode().GetTxtNode(), 0 );
+                pEnd->nContent.Assign( aSaveIdx.GetNode().GetTextNode(), 0 );
             }
             else
                 CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, &rPam,
@@ -4381,29 +4381,29 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
             bCopyBookmarks = false;
 
             // Put the breaks back into the first node
-            if( aBrkSet.Count() && 0 != ( pDestTxtNd = pDoc->GetNodes()[
-                    pCopyPam->GetPoint()->nNode.GetIndex()+1 ]->GetTxtNode()))
+            if( aBrkSet.Count() && 0 != ( pDestTextNd = pDoc->GetNodes()[
+                    pCopyPam->GetPoint()->nNode.GetIndex()+1 ]->GetTextNode()))
             {
-                pDestTxtNd->SetAttr( aBrkSet );
+                pDestTextNd->SetAttr( aBrkSet );
             }
         }
     } while( false );
 
     // Adjust position (in case it was moved / in another node)
-    rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
+    rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
                             rPos.nContent.GetIndex() );
 
     if( rPos.nNode != aInsPos )
     {
         pCopyPam->GetMark()->nNode = aInsPos;
-        pCopyPam->GetMark()->nContent.Assign(pCopyPam->GetCntntNode(false), 0);
+        pCopyPam->GetMark()->nContent.Assign(pCopyPam->GetContentNode(false), 0);
         rPos = *pCopyPam->GetMark();
     }
     else
         *pCopyPam->GetMark() = rPos;
 
     if ( !bAfterTable )
-        pCopyPam->Move( fnMoveForward, bCanMoveBack ? fnGoCntnt : fnGoNode );
+        pCopyPam->Move( fnMoveForward, bCanMoveBack ? fnGoContent : fnGoNode );
     else
     {
         // Reset the offset to 0 as it was before the insertion
@@ -4434,7 +4434,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // If Undo is enabled, store the inserted area
     if (pDoc->GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo->SetInsertRange( *pCopyPam, true, bStartIsTxtNode );
+        pUndo->SetInsertRange( *pCopyPam, true, bStartIsTextNode );
     }
 
     if( pCpyRange )
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx
index 6dd362a19b82..fc1f86b79c09 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -340,7 +340,7 @@ void DocumentDeviceManager::PrtDataChanged()
             pFntCache->Flush();
 
             std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts();
-            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
+            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
 
             for(SwViewShell& rShell : pSh->GetRingContainer())
                 rShell.InitPrt(getPrinter(false));
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index bed970f0d55e..50a3ab13af53 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -226,8 +226,8 @@ SwDrawModel* DocumentDrawModelManager::_MakeDrawModel()
         // Broadcast, so that the FormShell can be connected to the DrawView
         if( m_rDoc.GetDocShell() )
         {
-            SfxSimpleHint aHnt( SW_BROADCAST_DRAWVIEWS_CREATED );
-            m_rDoc.GetDocShell()->Broadcast( aHnt );
+            SfxSimpleHint aHint( SW_BROADCAST_DRAWVIEWS_CREATED );
+            m_rDoc.GetDocShell()->Broadcast( aHint );
         }
     }
     return mpDrawModel;
@@ -372,19 +372,19 @@ SdrLayerID DocumentDrawModelManager::GetInvisibleLayerIdByVisibleOne( const SdrL
 
 bool DocumentDrawModelManager::Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem)
 {
-    SwPosFlyFrms aFrames = m_rDoc.GetAllFlyFmts(&rPaM, /*bDrawAlso=*/true);
+    SwPosFlyFrms aFrames = m_rDoc.GetAllFlyFormats(&rPaM, /*bDrawAlso=*/true);
 
     for (const SwPosFlyFrmPtr& pPosFlyFrm : aFrames)
     {
         // Filter for at-paragraph anchored draw frames.
-        const SwFrmFmt& rFrmFmt = pPosFlyFrm->GetFmt();
-        const SwFmtAnchor& rAnchor = rFrmFmt.GetAnchor();
-        if (rAnchor.GetAnchorId() != FLY_AT_PARA || rFrmFmt.Which() != RES_DRAWFRMFMT)
+        const SwFrameFormat& rFrameFormat = pPosFlyFrm->GetFormat();
+        const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
+        if (rAnchor.GetAnchorId() != FLY_AT_PARA || rFrameFormat.Which() != RES_DRAWFRMFMT)
             continue;
 
         // Does the shape have matching text?
         SdrOutliner& rOutliner = GetDrawModel()->GetDrawOutliner();
-        SdrObject* pObject = const_cast<SdrObject*>(rFrmFmt.FindSdrObject());
+        SdrObject* pObject = const_cast<SdrObject*>(rFrameFormat.FindSdrObject());
         SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>(pObject);
         if (!pTextObj)
             continue;
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index a3fe65064e19..dc6122b0a181 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -57,9 +57,9 @@ namespace
 {
     #if HAVE_FEATURE_DBCONNECTIVITY
 
-    static OUString lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
+    static OUString lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBField )
     {
-        SwDBData aDBData( rDBFld.GetDBData( &rDoc ));
+        SwDBData aDBData( rDBField.GetDBData( &rDoc ));
         OUString sDBNumNm;
         SwDBData aDocData = rDoc.GetDBData();
 
@@ -77,56 +77,56 @@ namespace
 
     #endif
 
-    static void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFld,
+    static void lcl_CalcField( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpField& rSGEField,
                             SwDBManager* pMgr )
     {
-        const SwTxtFld* pTxtFld = rSGEFld.GetTxtFld();
-        if( !pTxtFld )
+        const SwTextField* pTextField = rSGEField.GetTextField();
+        if( !pTextField )
             return ;
 
-        const SwField* pFld = pTxtFld->GetFmtFld().GetField();
-        const sal_uInt16 nFldWhich = pFld->GetTyp()->Which();
+        const SwField* pField = pTextField->GetFormatField().GetField();
+        const sal_uInt16 nFieldWhich = pField->GetTyp()->Which();
 
-        if( RES_SETEXPFLD == nFldWhich )
+        if( RES_SETEXPFLD == nFieldWhich )
         {
             SwSbxValue aValue;
-            if( nsSwGetSetExpType::GSE_EXPR & pFld->GetSubType() )
-                aValue.PutDouble( static_cast<const SwSetExpField*>(pFld)->GetValue() );
+            if( nsSwGetSetExpType::GSE_EXPR & pField->GetSubType() )
+                aValue.PutDouble( static_cast<const SwSetExpField*>(pField)->GetValue() );
             else
                 // Extension to calculate with Strings
-                aValue.PutString( static_cast<const SwSetExpField*>(pFld)->GetExpStr() );
+                aValue.PutString( static_cast<const SwSetExpField*>(pField)->GetExpStr() );
 
             // set the new value in Calculator
-            rCalc.VarChange( pFld->GetTyp()->GetName(), aValue );
+            rCalc.VarChange( pField->GetTyp()->GetName(), aValue );
         }
         else if( pMgr )
         {
     #if !HAVE_FEATURE_DBCONNECTIVITY
             (void) rDoc;
     #else
-            switch( nFldWhich )
+            switch( nFieldWhich )
             {
             case RES_DBNUMSETFLD:
                 {
-                    SwDBNumSetField* pDBFld = const_cast<SwDBNumSetField*>(static_cast<const SwDBNumSetField*>(pFld));
+                    SwDBNumSetField* pDBField = const_cast<SwDBNumSetField*>(static_cast<const SwDBNumSetField*>(pField));
 
-                    SwDBData aDBData(pDBFld->GetDBData(&rDoc));
+                    SwDBData aDBData(pDBField->GetDBData(&rDoc));
 
-                    if( pDBFld->IsCondValid() &&
+                    if( pDBField->IsCondValid() &&
                         pMgr->OpenDataSource( aDBData.sDataSource, aDBData.sCommand ))
-                        rCalc.VarChange( lcl_GetDBVarName( rDoc, *pDBFld),
-                                        pDBFld->GetFormat() );
+                        rCalc.VarChange( lcl_GetDBVarName( rDoc, *pDBField),
+                                        pDBField->GetFormat() );
                 }
                 break;
             case RES_DBNEXTSETFLD:
                 {
-                    SwDBNextSetField* pDBFld = const_cast<SwDBNextSetField*>(static_cast<const SwDBNextSetField*>(pFld));
-                    SwDBData aDBData(pDBFld->GetDBData(&rDoc));
-                    if( !pDBFld->IsCondValid() ||
+                    SwDBNextSetField* pDBField = const_cast<SwDBNextSetField*>(static_cast<const SwDBNextSetField*>(pField));
+                    SwDBData aDBData(pDBField->GetDBData(&rDoc));
+                    if( !pDBField->IsCondValid() ||
                         !pMgr->OpenDataSource( aDBData.sDataSource, aDBData.sCommand ))
                         break;
 
-                    OUString sDBNumNm(lcl_GetDBVarName( rDoc, *pDBFld));
+                    OUString sDBNumNm(lcl_GetDBVarName( rDoc, *pDBField));
                     SwCalcExp* pExp = rCalc.VarLook( sDBNumNm );
                     if( pExp )
                         rCalc.VarChange( sDBNumNm, pExp->nValue.GetLong() + 1 );
@@ -143,38 +143,38 @@ namespace sw
 {
 
 DocumentFieldsManager::DocumentFieldsManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ),
-                                                                  mbNewFldLst(true),
-                                                                  mpUpdtFlds( new SwDocUpdtFld( &m_rDoc ) ),
-                                                                  mpFldTypes( new SwFldTypes() ),
-                                                                  mnLockExpFld( 0 )
+                                                                  mbNewFieldLst(true),
+                                                                  mpUpdateFields( new SwDocUpdateField( &m_rDoc ) ),
+                                                                  mpFieldTypes( new SwFieldTypes() ),
+                                                                  mnLockExpField( 0 )
 {
 }
 
-const SwFldTypes* DocumentFieldsManager::GetFldTypes() const
+const SwFieldTypes* DocumentFieldsManager::GetFieldTypes() const
 {
-    return mpFldTypes;
+    return mpFieldTypes;
 }
 
 /** Insert field types
  *
- * @param rFldTyp ???
+ * @param rFieldTyp ???
  * @return Always returns a pointer to the type, if it's new or already added.
  */
-SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp)
+SwFieldType* DocumentFieldsManager::InsertFieldType(const SwFieldType &rFieldTyp)
 {
-    sal_uInt16 nSize = mpFldTypes->size(),
-            nFldWhich = rFldTyp.Which();
+    sal_uInt16 nSize = mpFieldTypes->size(),
+            nFieldWhich = rFieldTyp.Which();
 
     sal_uInt16 i = INIT_FLDTYPES;
 
-    switch( nFldWhich )
+    switch( nFieldWhich )
     {
     case RES_SETEXPFLD:
             //JP 29.01.96: SequenceFields start at INIT_FLDTYPES - 3!!
             //             Or we get doubble number circles!!
             //MIB 14.03.95: From now on also the SW3-Reader relies on &m_rDoc, when
             //constructing string pools and when reading SetExp fields
-            if( nsSwGetSetExpType::GSE_SEQ & static_cast<const SwSetExpFieldType&>(rFldTyp).GetType() )
+            if( nsSwGetSetExpType::GSE_SEQ & static_cast<const SwSetExpFieldType&>(rFieldTyp).GetType() )
                 i -= INIT_SEQ_FLDTYPES;
         // no break;
     case RES_DBFLD:
@@ -182,28 +182,28 @@ SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp)
     case RES_DDEFLD:
         {
             const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
-            OUString sFldNm( rFldTyp.GetName() );
+            OUString sFieldNm( rFieldTyp.GetName() );
             for( ; i < nSize; ++i )
-                if( nFldWhich == (*mpFldTypes)[i]->Which() &&
-                    rSCmp.isEqual( sFldNm, (*mpFldTypes)[i]->GetName() ))
-                        return (*mpFldTypes)[i];
+                if( nFieldWhich == (*mpFieldTypes)[i]->Which() &&
+                    rSCmp.isEqual( sFieldNm, (*mpFieldTypes)[i]->GetName() ))
+                        return (*mpFieldTypes)[i];
         }
         break;
 
     case RES_AUTHORITY:
         for( ; i < nSize; ++i )
-            if( nFldWhich == (*mpFldTypes)[i]->Which() )
-                return (*mpFldTypes)[i];
+            if( nFieldWhich == (*mpFieldTypes)[i]->Which() )
+                return (*mpFieldTypes)[i];
         break;
 
     default:
         for( i = 0; i < nSize; ++i )
-            if( nFldWhich == (*mpFldTypes)[i]->Which() )
-                return (*mpFldTypes)[i];
+            if( nFieldWhich == (*mpFieldTypes)[i]->Which() )
+                return (*mpFieldTypes)[i];
     }
 
-    SwFieldType* pNew = rFldTyp.Copy();
-    switch( nFldWhich )
+    SwFieldType* pNew = rFieldTyp.Copy();
+    switch( nFieldWhich )
     {
     case RES_DDEFLD:
         static_cast<SwDDEFieldType*>(pNew)->SetDoc( &m_rDoc );
@@ -220,36 +220,36 @@ SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp)
     case RES_SETEXPFLD:
         static_cast<SwValueFieldType*>(pNew)->SetDoc( &m_rDoc );
         // JP 29.07.96: Optionally prepare FieldList for Calculator:
-        mpUpdtFlds->InsertFldType( *pNew );
+        mpUpdateFields->InsertFieldType( *pNew );
         break;
     case RES_AUTHORITY :
         static_cast<SwAuthorityFieldType*>(pNew)->SetDoc( &m_rDoc );
         break;
     }
 
-    mpFldTypes->insert( mpFldTypes->begin() + nSize, pNew );
+    mpFieldTypes->insert( mpFieldTypes->begin() + nSize, pNew );
     m_rDoc.getIDocumentState().SetModified();
 
-    return (*mpFldTypes)[ nSize ];
+    return (*mpFieldTypes)[ nSize ];
 }
 
 /// @returns the field type of the Doc
-SwFieldType *DocumentFieldsManager::GetSysFldType( const sal_uInt16 eWhich ) const
+SwFieldType *DocumentFieldsManager::GetSysFieldType( const sal_uInt16 eWhich ) const
 {
     for( sal_uInt16 i = 0; i < INIT_FLDTYPES; ++i )
-        if( eWhich == (*mpFldTypes)[i]->Which() )
-            return (*mpFldTypes)[i];
+        if( eWhich == (*mpFieldTypes)[i]->Which() )
+            return (*mpFieldTypes)[i];
     return 0;
 }
 
 /// Find first type with ResId and name
-SwFieldType* DocumentFieldsManager::GetFldType(
+SwFieldType* DocumentFieldsManager::GetFieldType(
     sal_uInt16 nResId,
     const OUString& rName,
     bool bDbFieldMatching // used in some UNO calls for RES_DBFLD to use different string matching code #i51815#
     ) const
 {
-    sal_uInt16 nSize = mpFldTypes->size(), i = 0;
+    sal_uInt16 nSize = mpFieldTypes->size(), i = 0;
     const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
 
     switch( nResId )
@@ -273,16 +273,16 @@ SwFieldType* DocumentFieldsManager::GetFldType(
     SwFieldType* pRet = 0;
     for( ; i < nSize; ++i )
     {
-        SwFieldType* pFldType = (*mpFldTypes)[i];
+        SwFieldType* pFieldType = (*mpFieldTypes)[i];
 
-        OUString aFldName( pFldType->GetName() );
+        OUString aFieldName( pFieldType->GetName() );
         if (bDbFieldMatching && nResId == RES_DBFLD)    // #i51815#
-            aFldName = aFldName.replace(DB_DELIM, '.');
+            aFieldName = aFieldName.replace(DB_DELIM, '.');
 
-        if( nResId == pFldType->Which() &&
-            rSCmp.isEqual( rName, aFldName ))
+        if( nResId == pFieldType->Which() &&
+            rSCmp.isEqual( rName, aFieldName ))
         {
-            pRet = pFldType;
+            pRet = pFieldType;
             break;
         }
     }
@@ -290,24 +290,24 @@ SwFieldType* DocumentFieldsManager::GetFldType(
 }
 
 /// Remove field type
-void DocumentFieldsManager::RemoveFldType(size_t nFld)
+void DocumentFieldsManager::RemoveFieldType(size_t nField)
 {
-    OSL_ENSURE( INIT_FLDTYPES <= nFld,  "don't remove InitFlds" );
+    OSL_ENSURE( INIT_FLDTYPES <= nField,  "don't remove InitFields" );
     /*
      * Dependent fields present -> ErrRaise
      */
-    size_t nSize = mpFldTypes->size();
-    if(nFld < nSize)
+    size_t nSize = mpFieldTypes->size();
+    if(nField < nSize)
     {
-        SwFieldType* pTmp = (*mpFldTypes)[nFld];
+        SwFieldType* pTmp = (*mpFieldTypes)[nField];
 
-        // JP 29.07.96: Optionally prepare FldLst for Calculator
+        // JP 29.07.96: Optionally prepare FieldLst for Calculator
         sal_uInt16 nWhich = pTmp->Which();
         switch( nWhich )
         {
         case RES_SETEXPFLD:
         case RES_USERFLD:
-            mpUpdtFlds->RemoveFldType( *pTmp );
+            mpUpdateFields->RemoveFieldType( *pTmp );
             // no break;
         case RES_DDEFLD:
             if( pTmp->HasWriterListeners() && !m_rDoc.IsUsed( *pTmp ) )
@@ -329,20 +329,20 @@ void DocumentFieldsManager::RemoveFldType(size_t nFld)
             // delete field type
             delete pTmp;
         }
-        mpFldTypes->erase( mpFldTypes->begin() + nFld );
+        mpFieldTypes->erase( mpFieldTypes->begin() + nField );
         m_rDoc.getIDocumentState().SetModified();
     }
 }
 
 // All have to be re-evaluated.
-void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
+void DocumentFieldsManager::UpdateFields( SfxPoolItem *pNewHt, bool bCloseDB )
 {
     // Call Modify() for every field type,
-    // dependent SwTxtFld get notified ...
+    // dependent SwTextField get notified ...
 
-    for( sal_uInt16 i=0; i < mpFldTypes->size(); ++i)
+    for( sal_uInt16 i=0; i < mpFieldTypes->size(); ++i)
     {
-        switch( (*mpFldTypes)[i]->Which() )
+        switch( (*mpFieldTypes)[i]->Which() )
         {
             // Update table fields second to last
             // Update references last
@@ -358,10 +358,10 @@ void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
             if( !pNewHt )
             {
                 SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL );
-                (*mpFldTypes)[i]->ModifyNotification( 0, &aUpdateDDE );
+                (*mpFieldTypes)[i]->ModifyNotification( 0, &aUpdateDDE );
             }
             else
-                (*mpFldTypes)[i]->ModifyNotification( 0, pNewHt );
+                (*mpFieldTypes)[i]->ModifyNotification( 0, pNewHt );
             break;
         }
         case RES_GETEXPFLD:
@@ -372,18 +372,18 @@ void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
             if( !pNewHt )
                 break;
         default:
-            (*mpFldTypes)[i]->ModifyNotification ( 0, pNewHt );
+            (*mpFieldTypes)[i]->ModifyNotification ( 0, pNewHt );
         }
     }
 
-    if( !IsExpFldsLocked() )
-        UpdateExpFlds( 0, false );      // update expression fields
+    if( !IsExpFieldsLocked() )
+        UpdateExpFields( 0, false );      // update expression fields
 
     // Tables
-    UpdateTblFlds(pNewHt);
+    UpdateTableFields(pNewHt);
 
     // References
-    UpdateRefFlds(pNewHt);
+    UpdateRefFields(pNewHt);
     if( bCloseDB )
     {
 #if HAVE_FEATURE_DBCONNECTIVITY
@@ -394,40 +394,40 @@ void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
     m_rDoc.getIDocumentState().SetModified();
 }
 
-void DocumentFieldsManager::InsDeletedFldType( SwFieldType& rFldTyp )
+void DocumentFieldsManager::InsDeletedFieldType( SwFieldType& rFieldTyp )
 {
-    // The FldType was marked as deleted and removed from the array.
+    // The FieldType was marked as deleted and removed from the array.
     // One has to look &m_rDoc up again, now.
     // - If it's not present, it can be re-inserted.
     // - If the same type is found, the deleted one has to be renamed.
 
-    sal_uInt16 nSize = mpFldTypes->size(), nFldWhich = rFldTyp.Which();
+    sal_uInt16 nSize = mpFieldTypes->size(), nFieldWhich = rFieldTyp.Which();
     sal_uInt16 i = INIT_FLDTYPES;
 
-    OSL_ENSURE( RES_SETEXPFLD == nFldWhich ||
-            RES_USERFLD == nFldWhich ||
-            RES_DDEFLD == nFldWhich, "Wrong FldType" );
+    OSL_ENSURE( RES_SETEXPFLD == nFieldWhich ||
+            RES_USERFLD == nFieldWhich ||
+            RES_DDEFLD == nFieldWhich, "Wrong FieldType" );
 
     const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
-    const OUString& rFldNm = rFldTyp.GetName();
+    const OUString& rFieldNm = rFieldTyp.GetName();
     SwFieldType* pFnd;
 
     for( ; i < nSize; ++i )
-        if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
-            rSCmp.isEqual( rFldNm, pFnd->GetName() ) )
+        if( nFieldWhich == (pFnd = (*mpFieldTypes)[i])->Which() &&
+            rSCmp.isEqual( rFieldNm, pFnd->GetName() ) )
         {
             // find new name
             sal_uInt16 nNum = 1;
             do {
-                OUString sSrch = rFldNm + OUString::number( nNum );
+                OUString sSrch = rFieldNm + OUString::number( nNum );
                 for( i = INIT_FLDTYPES; i < nSize; ++i )
-                    if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
+                    if( nFieldWhich == (pFnd = (*mpFieldTypes)[i])->Which() &&
                         rSCmp.isEqual( sSrch, pFnd->GetName() ) )
                         break;
 
                 if( i >= nSize )        // not found
                 {
-                    const_cast<OUString&>(rFldNm) = sSrch;
+                    const_cast<OUString&>(rFieldNm) = sSrch;
                     break;      // exit while loop
                 }
                 ++nNum;
@@ -436,17 +436,17 @@ void DocumentFieldsManager::InsDeletedFldType( SwFieldType& rFldTyp )
         }
 
     // not found, so insert and delete flag
-    mpFldTypes->insert( mpFldTypes->begin() + nSize, &rFldTyp );
-    switch( nFldWhich )
+    mpFieldTypes->insert( mpFieldTypes->begin() + nSize, &rFieldTyp );
+    switch( nFieldWhich )
     {
     case RES_SETEXPFLD:
-        static_cast<SwSetExpFieldType&>(rFldTyp).SetDeleted( false );
+        static_cast<SwSetExpFieldType&>(rFieldTyp).SetDeleted( false );
         break;
     case RES_USERFLD:
-        static_cast<SwUserFieldType&>(rFldTyp).SetDeleted( false );
+        static_cast<SwUserFieldType&>(rFieldTyp).SetDeleted( false );
         break;
     case RES_DDEFLD:
-        static_cast<SwDDEFieldType&>(rFldTyp).SetDeleted( false );
+        static_cast<SwDDEFieldType&>(rFieldTyp).SetDeleted( false );
         break;
     }
 }
@@ -467,74 +467,74 @@ bool DocumentFieldsManager::PutValueToField(const SwPosition & rPos,
     return pField->PutValue(rVal, nWhich);
 }
 
-bool DocumentFieldsManager::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
-                      SwMsgPoolItem * pMsgHnt,
-                      bool bUpdateFlds)
+bool DocumentFieldsManager::UpdateField(SwTextField * pDstTextField, SwField & rSrcField,
+                      SwMsgPoolItem * pMsgHint,
+                      bool bUpdateFields)
 {
-    OSL_ENSURE(pDstTxtFld, "no field to update!");
+    OSL_ENSURE(pDstTextField, "no field to update!");
 
-    bool bTblSelBreak = false;
+    bool bTableSelBreak = false;
 
-    SwFmtFld * pDstFmtFld = const_cast<SwFmtFld*>(&pDstTxtFld->GetFmtFld());
-    SwField * pDstFld = pDstFmtFld->GetField();
-    sal_uInt16 nFldWhich = rSrcFld.GetTyp()->Which();
-    SwNodeIndex aTblNdIdx(pDstTxtFld->GetTxtNode());
+    SwFormatField * pDstFormatField = const_cast<SwFormatField*>(&pDstTextField->GetFormatField());
+    SwField * pDstField = pDstFormatField->GetField();
+    sal_uInt16 nFieldWhich = rSrcField.GetTyp()->Which();
+    SwNodeIndex aTableNdIdx(pDstTextField->GetTextNode());
 
-    if (pDstFld->GetTyp()->Which() ==
-        rSrcFld.GetTyp()->Which())
+    if (pDstField->GetTyp()->Which() ==
+        rSrcField.GetTyp()->Which())
     {
         if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
         {
-            SwPosition aPosition( pDstTxtFld->GetTxtNode() );
-            aPosition.nContent = pDstTxtFld->GetStart();
+            SwPosition aPosition( pDstTextField->GetTextNode() );
+            aPosition.nContent = pDstTextField->GetStart();
 
-            SwUndo *const pUndo( new SwUndoFieldFromDoc( aPosition, *pDstFld, rSrcFld, pMsgHnt, bUpdateFlds) );
+            SwUndo *const pUndo( new SwUndoFieldFromDoc( aPosition, *pDstField, rSrcField, pMsgHint, bUpdateFields) );
             m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
-        SwField * pNewFld = rSrcFld.CopyField();
-        pDstFmtFld->SetField(pNewFld);
+        SwField * pNewField = rSrcField.CopyField();
+        pDstFormatField->SetField(pNewField);
 
-        switch( nFldWhich )
+        switch( nFieldWhich )
         {
         case RES_SETEXPFLD:
         case RES_GETEXPFLD:
         case RES_HIDDENTXTFLD:
         case RES_HIDDENPARAFLD:
-            UpdateExpFlds( pDstTxtFld, true );
+            UpdateExpFields( pDstTextField, true );
             break;
 
         case RES_TABLEFLD:
             {
-                const SwTableNode* pTblNd =
-                    m_rDoc.IsIdxInTbl(aTblNdIdx);
-                if( pTblNd )
+                const SwTableNode* pTableNd =
+                    m_rDoc.IsIdxInTable(aTableNdIdx);
+                if( pTableNd )
                 {
-                    SwTableFmlUpdate aTblUpdate( &pTblNd->
+                    SwTableFormulaUpdate aTableUpdate( &pTableNd->
                                                  GetTable() );
-                    if (bUpdateFlds)
-                        UpdateTblFlds( &aTblUpdate );
+                    if (bUpdateFields)
+                        UpdateTableFields( &aTableUpdate );
                     else
-                        pNewFld->GetTyp()->ModifyNotification(0, &aTblUpdate);
+                        pNewField->GetTyp()->ModifyNotification(0, &aTableUpdate);
 
-                    if (! bUpdateFlds)
-                        bTblSelBreak = true;
+                    if (! bUpdateFields)
+                        bTableSelBreak = true;
                 }
             }
             break;
 
         case RES_MACROFLD:
-            if( bUpdateFlds && pDstTxtFld->GetpTxtNode() )
-                (pDstTxtFld->GetpTxtNode())->
-                    ModifyNotification( 0, pDstFmtFld );
+            if( bUpdateFields && pDstTextField->GetpTextNode() )
+                (pDstTextField->GetpTextNode())->
+                    ModifyNotification( 0, pDstFormatField );
             break;
 
         case RES_DBNAMEFLD:
         case RES_DBNEXTSETFLD:
         case RES_DBNUMSETFLD:
         case RES_DBSETNUMBERFLD:
-            m_rDoc.ChgDBData(static_cast<SwDBNameInfField*>( pNewFld)->GetRealDBData());
-            pNewFld->GetTyp()->UpdateFlds();
+            m_rDoc.ChgDBData(static_cast<SwDBNameInfField*>( pNewField)->GetRealDBData());
+            pNewField->GetTyp()->UpdateFields();
 
             break;
 
@@ -543,97 +543,97 @@ bool DocumentFieldsManager::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
             {
                 // JP 10.02.96: call ChgValue, so that the style change sets the
                 // ContentString correctly
-                SwDBField* pDBFld = static_cast<SwDBField*>(pNewFld);
-                if (pDBFld->IsInitialized())
-                    pDBFld->ChgValue( pDBFld->GetValue(), true );
+                SwDBField* pDBField = static_cast<SwDBField*>(pNewField);
+                if (pDBField->IsInitialized())
+                    pDBField->ChgValue( pDBField->GetValue(), true );
 
-                pDBFld->ClearInitialized();
-                pDBFld->InitContent();
+                pDBField->ClearInitialized();
+                pDBField->InitContent();
             }
 #endif
             // no break;
 
         default:
-            pDstFmtFld->ModifyNotification( 0, pMsgHnt );
+            pDstFormatField->ModifyNotification( 0, pMsgHint );
         }
 
         // The fields we can calculate here are being triggered for an update
         // here explicitly.
-        if( nFldWhich == RES_USERFLD )
-            UpdateUsrFlds();
+        if( nFieldWhich == RES_USERFLD )
+            UpdateUsrFields();
     }
 
-    return bTblSelBreak;
+    return bTableSelBreak;
 }
 
 /// Update reference and table fields
-void DocumentFieldsManager::UpdateRefFlds( SfxPoolItem* pHt )
+void DocumentFieldsManager::UpdateRefFields( SfxPoolItem* pHt )
 {
-    SwFieldType* pFldType;
-    for( sal_uInt16 i = 0; i < mpFldTypes->size(); ++i )
-        if( RES_GETREFFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
-            pFldType->ModifyNotification( 0, pHt );
+    SwFieldType* pFieldType;
+    for( sal_uInt16 i = 0; i < mpFieldTypes->size(); ++i )
+        if( RES_GETREFFLD == ( pFieldType = (*mpFieldTypes)[i] )->Which() )
+            pFieldType->ModifyNotification( 0, pHt );
 }
 
-void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
+void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
 {
     OSL_ENSURE( !pHt || RES_TABLEFML_UPDATE  == pHt->Which(),
             "What MessageItem is &m_rDoc?" );
 
-    SwFieldType* pFldType(0);
+    SwFieldType* pFieldType(0);
 
-    for (sal_uInt16 i = 0; i < mpFldTypes->size(); ++i)
+    for (sal_uInt16 i = 0; i < mpFieldTypes->size(); ++i)
     {
-        if( RES_TABLEFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
+        if( RES_TABLEFLD == ( pFieldType = (*mpFieldTypes)[i] )->Which() )
         {
-            SwTableFmlUpdate* pUpdtFld = 0;
+            SwTableFormulaUpdate* pUpdateField = 0;
             if( pHt && RES_TABLEFML_UPDATE == pHt->Which() )
-                pUpdtFld = static_cast<SwTableFmlUpdate*>(pHt);
+                pUpdateField = static_cast<SwTableFormulaUpdate*>(pHt);
 
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-            for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+            SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+            for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
             {
-                if( pFmtFld->GetTxtFld() )
+                if( pFormatField->GetTextField() )
                 {
-                    SwTblField* pFld = static_cast<SwTblField*>(pFmtFld->GetField());
+                    SwTableField* pField = static_cast<SwTableField*>(pFormatField->GetField());
 
-                    if( pUpdtFld )
+                    if( pUpdateField )
                     {
                         // table where &m_rDoc field is located
-                        const SwTableNode* pTblNd;
-                        const SwTxtNode& rTxtNd = pFmtFld->GetTxtFld()->GetTxtNode();
-                        if( !rTxtNd.GetNodes().IsDocNodes() ||
-                            0 == ( pTblNd = rTxtNd.FindTableNode() ) )
+                        const SwTableNode* pTableNd;
+                        const SwTextNode& rTextNd = pFormatField->GetTextField()->GetTextNode();
+                        if( !rTextNd.GetNodes().IsDocNodes() ||
+                            0 == ( pTableNd = rTextNd.FindTableNode() ) )
                             continue;
 
-                        switch( pUpdtFld->eFlags )
+                        switch( pUpdateField->eFlags )
                         {
                         case TBL_CALC:
                             // re-set the value flag
                             // JP 17.06.96: internal representation of all formulas
                             //              (reference to other table!!!)
-                            if( nsSwExtendedSubType::SUB_CMD & pFld->GetSubType() )
-                                pFld->PtrToBoxNm( pUpdtFld->pTbl );
+                            if( nsSwExtendedSubType::SUB_CMD & pField->GetSubType() )
+                                pField->PtrToBoxNm( pUpdateField->pTable );
                             else
-                                pFld->ChgValid( false );
+                                pField->ChgValid( false );
                             break;
                         case TBL_BOXNAME:
                             // is &m_rDoc the wanted table?
-                            if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+                            if( &pTableNd->GetTable() == pUpdateField->pTable )
                                 // to the external representation
-                                pFld->PtrToBoxNm( pUpdtFld->pTbl );
+                                pField->PtrToBoxNm( pUpdateField->pTable );
                             break;
                         case TBL_BOXPTR:
                             // to the internal representation
                             // JP 17.06.96: internal representation on all formulas
                             //              (reference to other table!!!)
-                            pFld->BoxNmToPtr( pUpdtFld->pTbl );
+                            pField->BoxNmToPtr( pUpdateField->pTable );
                             break;
                         case TBL_RELBOXNAME:
                             // is &m_rDoc the wanted table?
-                            if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+                            if( &pTableNd->GetTable() == pUpdateField->pTable )
                                 // to the relative representation
-                                pFld->ToRelBoxNm( pUpdtFld->pTbl );
+                                pField->ToRelBoxNm( pUpdateField->pTable );
                             break;
                         default:
                             break;
@@ -641,13 +641,13 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
                     }
                     else
                         // reset the value flag for all
-                        pFld->ChgValid( false );
+                        pField->ChgValid( false );
                 }
             }
 
             break;
         }
-        pFldType = 0;
+        pFieldType = 0;
     }
 
     // process all table box formulas
@@ -656,47 +656,47 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
     for (sal_uInt32 i = 0; i < nMaxItems; ++i)
     {
         if( 0 != (pItem = m_rDoc.GetAttrPool().GetItem2( RES_BOXATR_FORMULA, i ) ) &&
-            static_cast<const SwTblBoxFormula*>(pItem)->GetDefinedIn() )
+            static_cast<const SwTableBoxFormula*>(pItem)->GetDefinedIn() )
         {
-            const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->ChangeState( pHt );
+            const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->ChangeState( pHt );
         }
     }
 
     // all fields/boxes are now invalid, so we can start to calculate
     if( pHt && ( RES_TABLEFML_UPDATE != pHt->Which() ||
-                TBL_CALC != static_cast<SwTableFmlUpdate*>(pHt)->eFlags ))
+                TBL_CALC != static_cast<SwTableFormulaUpdate*>(pHt)->eFlags ))
         return ;
 
     SwCalc* pCalc = 0;
 
-    if( pFldType )
+    if( pFieldType )
     {
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-        for( SwFmtFld* pFmtFld = aIter.Last(); pFmtFld; pFmtFld = aIter.Previous() )
+        SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+        for( SwFormatField* pFormatField = aIter.Last(); pFormatField; pFormatField = aIter.Previous() )
         {
                 // start calculation at the end
                 // new fields are inserted at the beginning of the modify chain
                 // that gives faster calculation on import
                 // mba: do we really need &m_rDoc "optimization"? Is it still valid?
-                SwTblField* pFld;
-                if( !pFmtFld->GetTxtFld() || (nsSwExtendedSubType::SUB_CMD &
-                    (pFld = static_cast<SwTblField*>(pFmtFld->GetField()))->GetSubType() ))
+                SwTableField* pField;
+                if( !pFormatField->GetTextField() || (nsSwExtendedSubType::SUB_CMD &
+                    (pField = static_cast<SwTableField*>(pFormatField->GetField()))->GetSubType() ))
                     continue;
 
                 // needs to be recalculated
-                if( !pFld->IsValid() )
+                if( !pField->IsValid() )
                 {
                     // table where &m_rDoc field is located
-                    const SwTxtNode& rTxtNd = pFmtFld->GetTxtFld()->GetTxtNode();
-                    if( !rTxtNd.GetNodes().IsDocNodes() )
+                    const SwTextNode& rTextNd = pFormatField->GetTextField()->GetTextNode();
+                    if( !rTextNd.GetNodes().IsDocNodes() )
                         continue;
-                    const SwTableNode* pTblNd = rTxtNd.FindTableNode();
-                    if( !pTblNd )
+                    const SwTableNode* pTableNd = rTextNd.FindTableNode();
+                    if( !pTableNd )
                         continue;
 
                     // if &m_rDoc field is not in the to-be-updated table, skip it
-                    if( pHt && &pTblNd->GetTable() !=
-                                            static_cast<SwTableFmlUpdate*>(pHt)->pTbl )
+                    if( pHt && &pTableNd->GetTable() !=
+                                            static_cast<SwTableFormulaUpdate*>(pHt)->pTable )
                         continue;
 
                     if( !pCalc )
@@ -705,17 +705,17 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
                     // get the values of all SetExpression fields that are valid
                     // until the table
                     SwFrm* pFrm = 0;
-                    if( pTblNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
+                    if( pTableNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
                     {
                         // is in the special section, that's expensive!
                         Point aPt;      // return the first frame of the layout - Tab.Headline!!
-                        pFrm = rTxtNd.getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt );
+                        pFrm = rTextNd.getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt );
                         if( pFrm )
                         {
-                            SwPosition aPos( *pTblNd );
-                            if( GetBodyTxtNode( m_rDoc, aPos, *pFrm ) )
-                                FldsToCalc( *pCalc, _SetGetExpFld(
-                                    aPos.nNode, pFmtFld->GetTxtFld(),
+                            SwPosition aPos( *pTableNd );
+                            if( GetBodyTextNode( m_rDoc, aPos, *pFrm ) )
+                                FieldsToCalc( *pCalc, _SetGetExpField(
+                                    aPos.nNode, pFormatField->GetTextField(),
                                     &aPos.nContent ));
                             else
                                 pFrm = 0;
@@ -724,26 +724,26 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
                     if( !pFrm )
                     {
                         // create index to determine the TextNode
-                        SwNodeIndex aIdx( rTxtNd );
-                        FldsToCalc( *pCalc,
-                            _SetGetExpFld( aIdx, pFmtFld->GetTxtFld() ));
+                        SwNodeIndex aIdx( rTextNd );
+                        FieldsToCalc( *pCalc,
+                            _SetGetExpField( aIdx, pFormatField->GetTextField() ));
                     }
 
-                    SwTblCalcPara aPara( *pCalc, pTblNd->GetTable() );
-                    pFld->CalcField( aPara );
+                    SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() );
+                    pField->CalcField( aPara );
                     if( aPara.IsStackOverflow() )
                     {
                         bool const bResult = aPara.CalcWithStackOverflow();
                         if (bResult)
                         {
-                            pFld->CalcField( aPara );
+                            pField->CalcField( aPara );
                         }
                         OSL_ENSURE(bResult,
                                 "the chained formula could no be calculated");
                     }
                     pCalc->SetCalcError( CALC_NOERR );
                 }
-                pFmtFld->ModifyNotification( 0, pHt );
+                pFormatField->ModifyNotification( 0, pHt );
         }
     }
 
@@ -751,17 +751,17 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
     for (sal_uInt32 i = 0; i < nMaxItems; ++i )
     {
         if( 0 != (pItem = m_rDoc.GetAttrPool().GetItem2( RES_BOXATR_FORMULA, i ) ) &&
-            static_cast<const SwTblBoxFormula*>(pItem)->GetDefinedIn() &&
-            !static_cast<const SwTblBoxFormula*>(pItem)->IsValid() )
+            static_cast<const SwTableBoxFormula*>(pItem)->GetDefinedIn() &&
+            !static_cast<const SwTableBoxFormula*>(pItem)->IsValid() )
         {
-            SwTblBoxFormula* pFml = const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem));
-            SwTableBox* pBox = pFml->GetTableBox();
+            SwTableBoxFormula* pFormula = const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem));
+            SwTableBox* pBox = pFormula->GetTableBox();
             if( pBox && pBox->GetSttNd() &&
                 pBox->GetSttNd()->GetNodes().IsDocNodes() )
             {
-                const SwTableNode* pTblNd = pBox->GetSttNd()->FindTableNode();
-                if( !pHt || &pTblNd->GetTable() ==
-                                            static_cast<SwTableFmlUpdate*>(pHt)->pTbl )
+                const SwTableNode* pTableNd = pBox->GetSttNd()->FindTableNode();
+                if( !pHt || &pTableNd->GetTable() ==
+                                            static_cast<SwTableFormulaUpdate*>(pHt)->pTable )
                 {
                     double nValue;
                     if( !pCalc )
@@ -770,20 +770,20 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
                     // get the values of all SetExpression fields that are valid
                     // until the table
                     SwFrm* pFrm = 0;
-                    if( pTblNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
+                    if( pTableNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
                     {
                         // is in the special section, that's expensive!
                         Point aPt;      // return the first frame of the layout - Tab.Headline!!
-                        SwNodeIndex aCNdIdx( *pTblNd, +2 );
-                        SwCntntNode* pCNd = aCNdIdx.GetNode().GetCntntNode();
+                        SwNodeIndex aCNdIdx( *pTableNd, +2 );
+                        SwContentNode* pCNd = aCNdIdx.GetNode().GetContentNode();
                         if( !pCNd )
                             pCNd = m_rDoc.GetNodes().GoNext( &aCNdIdx );
 
                         if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt )) )
                         {
                             SwPosition aPos( *pCNd );
-                            if( GetBodyTxtNode( m_rDoc, aPos, *pFrm ) )
-                                FldsToCalc( *pCalc, _SetGetExpFld( aPos.nNode ));
+                            if( GetBodyTextNode( m_rDoc, aPos, *pFrm ) )
+                                FieldsToCalc( *pCalc, _SetGetExpField( aPos.nNode ));
                             else
                                 pFrm = 0;
                         }
@@ -791,34 +791,34 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
                     if( !pFrm )
                     {
                         // create index to determine the TextNode
-                        SwNodeIndex aIdx( *pTblNd );
-                        FldsToCalc( *pCalc, _SetGetExpFld( aIdx ));
+                        SwNodeIndex aIdx( *pTableNd );
+                        FieldsToCalc( *pCalc, _SetGetExpField( aIdx ));
                     }
 
-                    SwTblCalcPara aPara( *pCalc, pTblNd->GetTable() );
-                    pFml->Calc( aPara, nValue );
+                    SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() );
+                    pFormula->Calc( aPara, nValue );
 
                     if( aPara.IsStackOverflow() )
                     {
                         bool const bResult = aPara.CalcWithStackOverflow();
                         if (bResult)
                         {
-                            pFml->Calc( aPara, nValue );
+                            pFormula->Calc( aPara, nValue );
                         }
                         OSL_ENSURE(bResult,
                                 "the chained formula could no be calculated");
                     }
 
-                    SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
+                    SwFrameFormat* pFormat = pBox->ClaimFrameFormat();
                     SfxItemSet aTmp( m_rDoc.GetAttrPool(),
                                     RES_BOXATR_BEGIN,RES_BOXATR_END-1 );
 
                     if( pCalc->IsCalcError() )
                         nValue = DBL_MAX;
-                    aTmp.Put( SwTblBoxValue( nValue ));
-                    if( SfxItemState::SET != pFmt->GetItemState( RES_BOXATR_FORMAT ))
-                        aTmp.Put( SwTblBoxNumFormat( 0 ));
-                    pFmt->SetFmtAttr( aTmp );
+                    aTmp.Put( SwTableBoxValue( nValue ));
+                    if( SfxItemState::SET != pFormat->GetItemState( RES_BOXATR_FORMAT ))
+                        aTmp.Put( SwTableBoxNumFormat( 0 ));
+                    pFormat->SetFormatAttr( aTmp );
 
                     pCalc->SetCalcError( CALC_NOERR );
                 }
@@ -829,24 +829,24 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
     delete pCalc;
 }
 
-void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
+void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUpdRefFields )
 {
-    if( IsExpFldsLocked() || m_rDoc.IsInReading() )
+    if( IsExpFieldsLocked() || m_rDoc.IsInReading() )
         return;
 
-    bool bOldInUpdateFlds = mpUpdtFlds->IsInUpdateFlds();
-    mpUpdtFlds->SetInUpdateFlds( true );
+    bool bOldInUpdateFields = mpUpdateFields->IsInUpdateFields();
+    mpUpdateFields->SetInUpdateFields( true );
 
-    mpUpdtFlds->MakeFldList( m_rDoc, true, GETFLD_ALL );
-    mbNewFldLst = false;
+    mpUpdateFields->MakeFieldList( m_rDoc, true, GETFLD_ALL );
+    mbNewFieldLst = false;
 
-    if( mpUpdtFlds->GetSortLst()->empty() )
+    if( mpUpdateFields->GetSortLst()->empty() )
     {
-        if( bUpdRefFlds )
-            UpdateRefFlds(NULL);
+        if( bUpdRefFields )
+            UpdateRefFields(NULL);
 
-        mpUpdtFlds->SetInUpdateFlds( bOldInUpdateFlds );
-        mpUpdtFlds->SetFieldsDirty( false );
+        mpUpdateFields->SetInUpdateFields( bOldInUpdateFields );
+        mpUpdateFields->SetFieldsDirty( false );
         return ;
     }
 
@@ -854,34 +854,34 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
 
     // Hash table for all string replacements is filled on-the-fly.
     // Try to fabricate an uneven number.
-    sal_uInt16 nStrFmtCnt = (( mpFldTypes->size() / 7 ) + 1 ) * 7;
-    SwHash** pHashStrTbl = new SwHash*[ nStrFmtCnt ];
-    memset( pHashStrTbl, 0, sizeof( _HashStr* ) * nStrFmtCnt );
+    sal_uInt16 nStrFormatCnt = (( mpFieldTypes->size() / 7 ) + 1 ) * 7;
+    SwHash** pHashStrTable = new SwHash*[ nStrFormatCnt ];
+    memset( pHashStrTable, 0, sizeof( _HashStr* ) * nStrFormatCnt );
 
     {
-        const SwFieldType* pFldType;
+        const SwFieldType* pFieldType;
         // process separately:
-        for( n = mpFldTypes->size(); n; )
-            switch( ( pFldType = (*mpFldTypes)[ --n ] )->Which() )
+        for( n = mpFieldTypes->size(); n; )
+            switch( ( pFieldType = (*mpFieldTypes)[ --n ] )->Which() )
             {
             case RES_USERFLD:
                 {
                     // Entry present?
                     sal_uInt16 nPos;
-                    const OUString& rNm = pFldType->GetName();
-                    OUString sExpand(const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFldType))->Expand(nsSwGetSetExpType::GSE_STRING, 0, 0));
-                    SwHash* pFnd = Find( rNm, pHashStrTbl, nStrFmtCnt, &nPos );
+                    const OUString& rNm = pFieldType->GetName();
+                    OUString sExpand(const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFieldType))->Expand(nsSwGetSetExpType::GSE_STRING, 0, 0));
+                    SwHash* pFnd = Find( rNm, pHashStrTable, nStrFormatCnt, &nPos );
                     if( pFnd )
                         // modify entry in the hash table
                         static_cast<_HashStr*>(pFnd)->aSetStr = sExpand;
                     else
                         // insert the new entry
-                        *(pHashStrTbl + nPos ) = new _HashStr( rNm, sExpand,
-                                                static_cast<_HashStr*>(*(pHashStrTbl + nPos)) );
+                        *(pHashStrTable + nPos ) = new _HashStr( rNm, sExpand,
+                                                static_cast<_HashStr*>(*(pHashStrTable + nPos)) );
                 }
                 break;
             case RES_SETEXPFLD:
-                const_cast<SwSetExpFieldType*>(static_cast<const SwSetExpFieldType*>(pFldType))->SetOutlineChgNd( 0 );
+                const_cast<SwSetExpFieldType*>(static_cast<const SwSetExpFieldType*>(pFieldType))->SetOutlineChgNd( 0 );
                 break;
             }
     }
@@ -904,7 +904,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
 
     // 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( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != mpUpdtFlds->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())
@@ -912,7 +912,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
     }
 
     OUString aNew;
-    for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != mpUpdtFlds->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 )
@@ -947,45 +947,45 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
             continue;
         }
 
-        SwTxtFld* pTxtFld = const_cast<SwTxtFld*>((*it)->GetTxtFld());
-        if( !pTxtFld )
+        SwTextField* pTextField = const_cast<SwTextField*>((*it)->GetTextField());
+        if( !pTextField )
         {
             OSL_ENSURE( false, "what's wrong now'" );
             continue;
         }
 
-        SwFmtFld* pFmtFld = const_cast<SwFmtFld*>(&pTxtFld->GetFmtFld());
-        const SwField* pFld = pFmtFld->GetField();
+        SwFormatField* pFormatField = const_cast<SwFormatField*>(&pTextField->GetFormatField());
+        const SwField* pField = pFormatField->GetField();
 
-        switch( nWhich = pFld->GetTyp()->Which() )
+        switch( nWhich = pField->GetTyp()->Which() )
         {
         case RES_HIDDENTXTFLD:
         {
-            SwHiddenTxtField* pHFld = const_cast<SwHiddenTxtField*>(static_cast<const SwHiddenTxtField*>(pFld));
-            SwSbxValue aValue = aCalc.Calculate( pHFld->GetPar1() );
+            SwHiddenTextField* pHField = const_cast<SwHiddenTextField*>(static_cast<const SwHiddenTextField*>(pField));
+            SwSbxValue aValue = aCalc.Calculate( pHField->GetPar1() );
             bool bValue = !aValue.GetBool();
             if(!aValue.IsVoidValue())
             {
-                pHFld->SetValue( bValue );
+                pHField->SetValue( bValue );
                 // evaluate field
-                pHFld->Evaluate(&m_rDoc);
+                pHField->Evaluate(&m_rDoc);
             }
         }
         break;
         case RES_HIDDENPARAFLD:
         {
-            SwHiddenParaField* pHPFld = const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pFld));
-            SwSbxValue aValue = aCalc.Calculate( pHPFld->GetPar1() );
+            SwHiddenParaField* pHPField = const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pField));
+            SwSbxValue aValue = aCalc.Calculate( pHPField->GetPar1() );
             bool bValue = aValue.GetBool();
             if(!aValue.IsVoidValue())
-                pHPFld->SetHidden( bValue );
+                pHPField->SetHidden( bValue );
         }
         break;
         case RES_DBSETNUMBERFLD:
 #if HAVE_FEATURE_DBCONNECTIVITY
         {
-            const_cast<SwDBSetNumberField*>(static_cast<const SwDBSetNumberField*>(pFld))->Evaluate(&m_rDoc);
-            aCalc.VarChange( sDBNumNm, static_cast<const SwDBSetNumberField*>(pFld)->GetSetNumber());
+            const_cast<SwDBSetNumberField*>(static_cast<const SwDBSetNumberField*>(pField))->Evaluate(&m_rDoc);
+            aCalc.VarChange( sDBNumNm, static_cast<const SwDBSetNumberField*>(pField)->GetSetNumber());
         }
 #endif
         break;
@@ -993,7 +993,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
         case RES_DBNUMSETFLD:
 #if HAVE_FEATURE_DBCONNECTIVITY
         {
-            UpdateDBNumFlds( *const_cast<SwDBNameInfField*>(static_cast<const SwDBNameInfField*>(pFld)), aCalc );
+            UpdateDBNumFields( *const_cast<SwDBNameInfField*>(static_cast<const SwDBNameInfField*>(pField)), aCalc );
             if( bCanFill )
                 bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, true, aCalc );
         }
@@ -1003,20 +1003,20 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
         {
 #if HAVE_FEATURE_DBCONNECTIVITY
             // evaluate field
-            const_cast<SwDBField*>(static_cast<const SwDBField*>(pFld))->Evaluate();
+            const_cast<SwDBField*>(static_cast<const SwDBField*>(pField))->Evaluate();
 
-            SwDBData aTmpDBData(static_cast<const SwDBField*>(pFld)->GetDBData());
+            SwDBData aTmpDBData(static_cast<const SwDBField*>(pField)->GetDBData());
 
             if( pMgr->IsDataSourceOpen(aTmpDBData.sDataSource, aTmpDBData.sCommand, false))
                 aCalc.VarChange( sDBNumNm, pMgr->GetSelectedRecordId(aTmpDBData.sDataSource, aTmpDBData.sCommand, aTmpDBData.nCommandType));
 
-            const OUString& rName = pFld->GetTyp()->GetName();
+            const OUString& rName = pField->GetTyp()->GetName();
 
             // Add entry to hash table
             // Entry present?
             sal_uInt16 nPos;
-            SwHash* pFnd = Find( rName, pHashStrTbl, nStrFmtCnt, &nPos );
-            OUString const value(pFld->ExpandField(m_rDoc.IsClipBoard()));
+            SwHash* pFnd = Find( rName, pHashStrTable, nStrFormatCnt, &nPos );
+            OUString const value(pField->ExpandField(m_rDoc.IsClipBoard()));
             if( pFnd )
             {
                 // Modify entry in the hash table
@@ -1025,8 +1025,8 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
             else
             {
                 // insert new entry
-                *(pHashStrTbl + nPos ) = new _HashStr( rName,
-                    value, static_cast<_HashStr *>(*(pHashStrTbl + nPos)));
+                *(pHashStrTable + nPos ) = new _HashStr( rName,
+                    value, static_cast<_HashStr *>(*(pHashStrTable + nPos)));
             }
 #endif
         }
@@ -1034,47 +1034,47 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
         case RES_GETEXPFLD:
         case RES_SETEXPFLD:
         {
-            if( nsSwGetSetExpType::GSE_STRING & pFld->GetSubType() )        // replace String
+            if( nsSwGetSetExpType::GSE_STRING & pField->GetSubType() )        // replace String
             {
                 if( RES_GETEXPFLD == nWhich )
                 {
-                    SwGetExpField* pGFld = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pFld));
+                    SwGetExpField* pGField = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pField));
 
-                    if( (!pUpdtFld || pUpdtFld == pTxtFld )
-                        && pGFld->IsInBodyTxt() )
+                    if( (!pUpdateField || pUpdateField == pTextField )
+                        && pGField->IsInBodyText() )
                     {
-                        aNew = LookString( pHashStrTbl, nStrFmtCnt,
-                                    pGFld->GetFormula() );
-                        pGFld->ChgExpStr( aNew );
+                        aNew = LookString( pHashStrTable, nStrFormatCnt,
+                                    pGField->GetFormula() );
+                        pGField->ChgExpStr( aNew );
                     }
                 }
                 else
                 {
-                    SwSetExpField* pSFld = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pFld));
+                    SwSetExpField* pSField = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pField));
                     // is the "formula" a field?
-                    aNew = LookString( pHashStrTbl, nStrFmtCnt,
-                                pSFld->GetFormula() );
+                    aNew = LookString( pHashStrTable, nStrFormatCnt,
+                                pSField->GetFormula() );
 
                     if( aNew.isEmpty() )               // nothing found then the formula is the new value
-                        aNew = pSFld->GetFormula();
+                        aNew = pSField->GetFormula();
 
                     // only update one field
-                    if( !pUpdtFld || pUpdtFld == pTxtFld )
-                        pSFld->ChgExpStr( aNew );
+                    if( !pUpdateField || pUpdateField == pTextField )
+                        pSField->ChgExpStr( aNew );
 
                     // lookup the field's name
-                    aNew = static_cast<SwSetExpFieldType*>(pSFld->GetTyp())->GetSetRefName();
+                    aNew = static_cast<SwSetExpFieldType*>(pSField->GetTyp())->GetSetRefName();
                     // Entry present?
                     sal_uInt16 nPos;
-                    SwHash* pFnd = Find( aNew, pHashStrTbl, nStrFmtCnt, &nPos );
+                    SwHash* pFnd = Find( aNew, pHashStrTable, nStrFormatCnt, &nPos );
                     if( pFnd )
                         // Modify entry in the hash table
-                        static_cast<_HashStr*>(pFnd)->aSetStr = pSFld->GetExpStr();
+                        static_cast<_HashStr*>(pFnd)->aSetStr = pSField->GetExpStr();
                     else
                         // insert new entry
-                        *(pHashStrTbl + nPos ) = pFnd = new _HashStr( aNew,
-                                        pSFld->GetExpStr(),
-                                        static_cast<_HashStr*>(*(pHashStrTbl + nPos) ));
+                        *(pHashStrTable + nPos ) = pFnd = new _HashStr( aNew,
+                                        pSField->GetExpStr(),
+                                        static_cast<_HashStr*>(*(pHashStrTable + nPos) ));
 
                     // Extension for calculation with Strings
                     SwSbxValue aValue;
@@ -1086,70 +1086,70 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
             {
                 if( RES_GETEXPFLD == nWhich )
                 {
-                    SwGetExpField* pGFld = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pFld));
+                    SwGetExpField* pGField = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pField));
 
-                    if( (!pUpdtFld || pUpdtFld == pTxtFld )
-                        && pGFld->IsInBodyTxt() )
+                    if( (!pUpdateField || pUpdateField == pTextField )
+                        && pGField->IsInBodyText() )
                     {
                         SwSbxValue aValue = aCalc.Calculate(
-                                        pGFld->GetFormula());
+                                        pGField->GetFormula());
                         if(!aValue.IsVoidValue())
-                            pGFld->SetValue(aValue.GetDouble() );
+                            pGField->SetValue(aValue.GetDouble() );
                     }
                 }
                 else
                 {
-                    SwSetExpField* pSFld = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pFld));
-                    SwSetExpFieldType* pSFldTyp = static_cast<SwSetExpFieldType*>(pFld->GetTyp());
-                    aNew = pSFldTyp->GetName();
+                    SwSetExpField* pSField = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pField));
+                    SwSetExpFieldType* pSFieldTyp = static_cast<SwSetExpFieldType*>(pField->GetTyp());
+                    aNew = pSFieldTyp->GetName();
 
                     SwNode* pSeqNd = 0;
 
-                    if( pSFld->IsSequenceFld() )
+                    if( pSField->IsSequenceField() )
                     {
-                        const sal_uInt8 nLvl = pSFldTyp->GetOutlineLvl();
+                        const sal_uInt8 nLvl = pSFieldTyp->GetOutlineLvl();
                         if( MAXLEVEL > nLvl )
                         {
                             // test if the Number needs to be updated
                             pSeqNd = m_rDoc.GetNodes()[ (*it)->GetNode() ];
 
-                            const SwTxtNode* pOutlNd = pSeqNd->
+                            const SwTextNode* pOutlNd = pSeqNd->
                                     FindOutlineNodeOfLevel( nLvl );
-                            if( pSFldTyp->GetOutlineChgNd() != pOutlNd )
+                            if( pSFieldTyp->GetOutlineChgNd() != pOutlNd )
                             {
-                                pSFldTyp->SetOutlineChgNd( pOutlNd );
+                                pSFieldTyp->SetOutlineChgNd( pOutlNd );
                                 aCalc.VarChange( aNew, 0 );
                             }
                         }
                     }
 
                     aNew += "=";
-                    aNew += pSFld->GetFormula();
+                    aNew += pSField->GetFormula();
 
                     SwSbxValue aValue = aCalc.Calculate( aNew );
                     double nErg = aValue.GetDouble();
                     // only update one field
-                    if( !aValue.IsVoidValue() && (!pUpdtFld || pUpdtFld == pTxtFld) )
+                    if( !aValue.IsVoidValue() && (!pUpdateField || pUpdateField == pTextField) )
                     {
-                        pSFld->SetValue( nErg );
+                        pSField->SetValue( nErg );
 
                         if( pSeqNd )
-                            pSFldTyp->SetChapter( *pSFld, *pSeqNd );
+                            pSFieldTyp->SetChapter( *pSField, *pSeqNd );
                     }
                 }
             }
         }
         } // switch
 
-        pFmtFld->ModifyNotification( 0, 0 );        // trigger formatting
+        pFormatField->ModifyNotification( 0, 0 );        // trigger formatting
 
-        if( pUpdtFld == pTxtFld )       // if only &m_rDoc one is updated
+        if( pUpdateField == pTextField )       // if only &m_rDoc one is updated
         {
             if( RES_GETEXPFLD == nWhich ||      // only GetField or
-                RES_HIDDENTXTFLD == nWhich ||   // HiddenTxt?
-                RES_HIDDENPARAFLD == nWhich)    // HiddenParaFld?
+                RES_HIDDENTXTFLD == nWhich ||   // HiddenText?
+                RES_HIDDENPARAFLD == nWhich)    // HiddenParaField?
                 break;                          // quit
-            pUpdtFld = 0;                       // update all from here on
+            pUpdateField = 0;                       // update all from here on
         }
     }
 
@@ -1157,27 +1157,27 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
     pMgr->CloseAll(false);
 #endif
     // delete hash table
-    ::DeleteHashTable( pHashStrTbl, nStrFmtCnt );
+    ::DeleteHashTable( pHashStrTable, nStrFormatCnt );
 
     // update reference fields
-    if( bUpdRefFlds )
-        UpdateRefFlds(NULL);
+    if( bUpdRefFields )
+        UpdateRefFields(NULL);
 
-    mpUpdtFlds->SetInUpdateFlds( bOldInUpdateFlds );
-    mpUpdtFlds->SetFieldsDirty( false );
+    mpUpdateFields->SetInUpdateFields( bOldInUpdateFields );
+    mpUpdateFields->SetFieldsDirty( false );
 }
 
 /// Insert field type that was marked as deleted
-void DocumentFieldsManager::UpdateUsrFlds()
+void DocumentFieldsManager::UpdateUsrFields()
 {
     SwCalc* pCalc = 0;
-    const SwFieldType* pFldType;
-    for( sal_uInt16 i = INIT_FLDTYPES; i < mpFldTypes->size(); ++i )
-        if( RES_USERFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
+    const SwFieldType* pFieldType;
+    for( sal_uInt16 i = INIT_FLDTYPES; i < mpFieldTypes->size(); ++i )
+        if( RES_USERFLD == ( pFieldType = (*mpFieldTypes)[i] )->Which() )
         {
             if( !pCalc )
                 pCalc = new SwCalc( m_rDoc );
-            const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFldType))->GetValue( *pCalc );
+            const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFieldType))->GetValue( *pCalc );
         }
 
     if( pCalc )
@@ -1187,53 +1187,53 @@ void DocumentFieldsManager::UpdateUsrFlds()
     }
 }
 
-void DocumentFieldsManager::UpdatePageFlds( SfxPoolItem* pMsgHnt )
+void DocumentFieldsManager::UpdatePageFields( SfxPoolItem* pMsgHint )
 {
-    SwFieldType* pFldType;
+    SwFieldType* pFieldType;
     for( sal_uInt16 i = 0; i < INIT_FLDTYPES; ++i )
-        switch( ( pFldType = (*mpFldTypes)[ i ] )->Which() )
+        switch( ( pFieldType = (*mpFieldTypes)[ i ] )->Which() )
         {
         case RES_PAGENUMBERFLD:
         case RES_CHAPTERFLD:
         case RES_GETEXPFLD:
         case RES_REFPAGEGETFLD:
-            pFldType->ModifyNotification( 0, pMsgHnt );
+            pFieldType->ModifyNotification( 0, pMsgHint );
             break;
         case RES_DOCSTATFLD:
-            pFldType->ModifyNotification( 0, 0 );
+            pFieldType->ModifyNotification( 0, 0 );
             break;
         }
-    SetNewFldLst(true);
+    SetNewFieldLst(true);
 }
 
-void DocumentFieldsManager::LockExpFlds()
+void DocumentFieldsManager::LockExpFields()
 {
-    ++mnLockExpFld;
+    ++mnLockExpField;
 }
 
-void DocumentFieldsManager::UnlockExpFlds()
+void DocumentFieldsManager::UnlockExpFields()
 {
-    assert(mnLockExpFld != 0);
-    if( mnLockExpFld )
-        --mnLockExpFld;
+    assert(mnLockExpField != 0);
+    if( mnLockExpField )
+        --mnLockExpField;
 }
 
-bool DocumentFieldsManager::IsExpFldsLocked() const
+bool DocumentFieldsManager::IsExpFieldsLocked() const
 {
-    return 0 != mnLockExpFld;
+    return 0 != mnLockExpField;
 }
 
-SwDocUpdtFld& DocumentFieldsManager::GetUpdtFlds() const
+SwDocUpdateField& DocumentFieldsManager::GetUpdateFields() const
 {
-    return *mpUpdtFlds;
+    return *mpUpdateFields;
 }
 
 bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLong nLen )
 {
     // See if the supplied nodes actually contain fields.
     // If they don't, the flag doesn't need to be changed.
-    bool bFldsFnd = false;
-    if( b && pChk && !GetUpdtFlds().IsFieldsDirty() && !m_rDoc.IsInDtor()
+    bool bFieldsFnd = false;
+    if( b && pChk && !GetUpdateFields().IsFieldsDirty() && !m_rDoc.IsInDtor()
         // ?? what's up with Undo, this is also wanted there!
         /*&& &pChk->GetNodes() == &GetNodes()*/ )
     {
@@ -1244,7 +1244,7 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon
         const SwNodes& rNds = pChk->GetNodes();
         while( nLen-- )
         {
-            const SwTxtNode* pTNd = rNds[ nStt++ ]->GetTxtNode();
+            const SwTextNode* pTNd = rNds[ nStt++ ]->GetTextNode();
             if( pTNd )
             {
                 if( pTNd->GetAttrOutlineLevel() != 0 )
@@ -1255,7 +1255,7 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon
                     const size_t nEnd = pTNd->GetSwpHints().Count();
                     for( size_t n = 0 ; n < nEnd; ++n )
                     {
-                        const SwTxtAttr* pAttr = pTNd->GetSwpHints()[ n ];
+                        const SwTextAttr* pAttr = pTNd->GetSwpHints()[ n ];
                         if ( pAttr->Which() == RES_TXTATR_FIELD )
                         {
                             b = true;
@@ -1268,10 +1268,10 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon
                     break;
             }
         }
-        bFldsFnd = b;
+        bFieldsFnd = b;
     }
-    GetUpdtFlds().SetFieldsDirty( b );
-    return bFldsFnd;
+    GetUpdateFields().SetFieldsDirty( b );
+    return bFieldsFnd;
 }
 
 void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
@@ -1302,74 +1302,74 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN
 
     for( ; nStt < 5; ++nStt )
     {
-        SwFieldType* pFldType = GetSysFldType( aTypes[ nStt ] );
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+        SwFieldType* pFieldType = GetSysFieldType( aTypes[ nStt ] );
+        SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
         {
-            if( pFmtFld && pFmtFld->GetTxtFld() )
+            if( pFormatField && pFormatField->GetTextField() )
             {
                 bool bChgd = false;
                 switch( aTypes[ nStt ] )
                 {
                 case RES_DOCINFOFLD:
-                    if( static_cast<SwDocInfoField*>(pFmtFld->GetField())->IsFixed() )
+                    if( static_cast<SwDocInfoField*>(pFormatField->GetField())->IsFixed() )
                     {
                         bChgd = true;
-                        SwDocInfoField* pDocInfFld = static_cast<SwDocInfoField*>(pFmtFld->GetField());
-                        pDocInfFld->SetExpansion( static_cast<SwDocInfoFieldType*>(
-                                    pDocInfFld->GetTyp())->Expand(
-                                        pDocInfFld->GetSubType(),
-                                        pDocInfFld->GetFormat(),
-                                        pDocInfFld->GetLanguage(),
-                                        pDocInfFld->GetName() ) );
+                        SwDocInfoField* pDocInfField = static_cast<SwDocInfoField*>(pFormatField->GetField());
+                        pDocInfField->SetExpansion( static_cast<SwDocInfoFieldType*>(
+                                    pDocInfField->GetTyp())->Expand(
+                                        pDocInfField->GetSubType(),
+                                        pDocInfField->GetFormat(),
+                                        pDocInfField->GetLanguage(),
+                                        pDocInfField->GetName() ) );
                     }
                     break;
 
                 case RES_AUTHORFLD:
-                    if( static_cast<SwAuthorField*>(pFmtFld->GetField())->IsFixed() )
+                    if( static_cast<SwAuthorField*>(pFormatField->GetField())->IsFixed() )
                     {
                         bChgd = true;
-                        SwAuthorField* pAuthorFld = static_cast<SwAuthorField*>(pFmtFld->GetField());
-                        pAuthorFld->SetExpansion( SwAuthorFieldType::Expand( pAuthorFld->GetFormat() ) );
+                        SwAuthorField* pAuthorField = static_cast<SwAuthorField*>(pFormatField->GetField());
+                        pAuthorField->SetExpansion( SwAuthorFieldType::Expand( pAuthorField->GetFormat() ) );
                     }
                     break;
 
                 case RES_EXTUSERFLD:
-                    if( static_cast<SwExtUserField*>(pFmtFld->GetField())->IsFixed() )
+                    if( static_cast<SwExtUserField*>(pFormatField->GetField())->IsFixed() )
                     {
                         bChgd = true;
-                        SwExtUserField* pExtUserFld = static_cast<SwExtUserField*>(pFmtFld->GetField());
-                        pExtUserFld->SetExpansion( SwExtUserFieldType::Expand(
-                                            pExtUserFld->GetSubType(),
-                                            pExtUserFld->GetFormat()));
+                        SwExtUserField* pExtUserField = static_cast<SwExtUserField*>(pFormatField->GetField());
+                        pExtUserField->SetExpansion( SwExtUserFieldType::Expand(
+                                            pExtUserField->GetSubType(),
+                                            pExtUserField->GetFormat()));
                     }
                     break;
 
                 case RES_DATETIMEFLD:
-                    if( static_cast<SwDateTimeField*>(pFmtFld->GetField())->IsFixed() )
+                    if( static_cast<SwDateTimeField*>(pFormatField->GetField())->IsFixed() )
                     {
                         bChgd = true;
-                        static_cast<SwDateTimeField*>(pFmtFld->GetField())->SetDateTime(
+                        static_cast<SwDateTimeField*>(pFormatField->GetField())->SetDateTime(
                                                     DateTime(Date(nDate), tools::Time(nTime)) );
                     }
                     break;
 
                 case RES_FILENAMEFLD:
-                    if( static_cast<SwFileNameField*>(pFmtFld->GetField())->IsFixed() )
+                    if( static_cast<SwFileNameField*>(pFormatField->GetField())->IsFixed() )
                     {
                         bChgd = true;
-                        SwFileNameField* pFileNameFld =
-                            static_cast<SwFileNameField*>(pFmtFld->GetField());
-                        pFileNameFld->SetExpansion( static_cast<SwFileNameFieldType*>(
-                                    pFileNameFld->GetTyp())->Expand(
-                                            pFileNameFld->GetFormat() ) );
+                        SwFileNameField* pFileNameField =
+                            static_cast<SwFileNameField*>(pFormatField->GetField());
+                        pFileNameField->SetExpansion( static_cast<SwFileNameFieldType*>(
+                                    pFileNameField->GetTyp())->Expand(
+                                            pFileNameField->GetFormat() ) );
                     }
                     break;
                 }
 
                 // Trigger formatting
                 if( bChgd )
-                    pFmtFld->ModifyNotification( 0, 0 );
+                    pFormatField->ModifyNotification( 0, 0 );
             }
         }
     }
@@ -1378,11 +1378,11 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN
         m_rDoc.getIDocumentState().ResetModified();
 }
 
-void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
+void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, const _SetGetExpField& rToThisField )
 {
     // create the sorted list of all SetFields
-    mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_CALC );
-    mbNewFldLst = false;
+    mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_CALC );
+    mbNewFieldLst = false;
 
 #if !HAVE_FEATURE_DBCONNECTIVITY
     SwDBManager* pMgr = NULL;
@@ -1391,24 +1391,24 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToT
     pMgr->CloseAll(false);
 #endif
 
-    if( !mpUpdtFlds->GetSortLst()->empty() )
+    if( !mpUpdateFields->GetSortLst()->empty() )
     {
-        _SetGetExpFlds::const_iterator const itLast =
-            mpUpdtFlds->GetSortLst()->upper_bound(
-                const_cast<_SetGetExpFld*>(&rToThisFld));
-        for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
-            lcl_CalcFld( m_rDoc, rCalc, **it, pMgr );
+        _SetGetExpFields::const_iterator const itLast =
+            mpUpdateFields->GetSortLst()->upper_bound(
+                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
     pMgr->CloseAll(false);
 #endif
 }
 
-void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
+void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
 {
     // create the sorted list of all SetFields
-    mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_CALC );
-    mbNewFldLst = false;
+    mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_CALC );
+    mbNewFieldLst = false;
 
 #if !HAVE_FEATURE_DBCONNECTIVITY
     SwDBManager* pMgr = NULL;
@@ -1417,14 +1417,14 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uI
     pMgr->CloseAll(false);
 #endif
 
-    for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin();
-        it != mpUpdtFlds->GetSortLst()->end() &&
+    for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin();
+        it != mpUpdateFields->GetSortLst()->end() &&
         ( (*it)->GetNode() < nLastNd ||
-          ( (*it)->GetNode() == nLastNd && (*it)->GetCntnt() <= nLastCnt )
+          ( (*it)->GetNode() == nLastNd && (*it)->GetContent() <= nLastCnt )
         );
         ++it )
     {
-        lcl_CalcFld( m_rDoc, rCalc, **it, pMgr );
+        lcl_CalcField( m_rDoc, rCalc, **it, pMgr );
     }
 
 #if HAVE_FEATURE_DBCONNECTIVITY
@@ -1432,70 +1432,70 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uI
 #endif
 }
 
-void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblSize,
-                            const _SetGetExpFld& rToThisFld )
+void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& rTableSize,
+                            const _SetGetExpField& rToThisField )
 {
     // create the sorted list of all SetFields
-    mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_EXPAND );
-    mbNewFldLst = false;
+    mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_EXPAND );
+    mbNewFieldLst = false;
 
     // Hash table for all string replacements is filled on-the-fly.
     // Try to fabricate an uneven number.
-    rTblSize = (( mpUpdtFlds->GetSortLst()->size() / 7 ) + 1 ) * 7;
-    ppHashTbl = new SwHash*[ rTblSize ];
-    memset( ppHashTbl, 0, sizeof( _HashStr* ) * rTblSize );
+    rTableSize = (( mpUpdateFields->GetSortLst()->size() / 7 ) + 1 ) * 7;
+    ppHashTable = new SwHash*[ rTableSize ];
+    memset( ppHashTable, 0, sizeof( _HashStr* ) * rTableSize );
 
-    _SetGetExpFlds::const_iterator const itLast =
-        mpUpdtFlds->GetSortLst()->upper_bound(
-            const_cast<_SetGetExpFld*>(&rToThisFld));
+    _SetGetExpFields::const_iterator const itLast =
+        mpUpdateFields->GetSortLst()->upper_bound(
+            const_cast<_SetGetExpField*>(&rToThisField));
 
-    for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
+    for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it )
     {
-        const SwTxtFld* pTxtFld = (*it)->GetTxtFld();
-        if( !pTxtFld )
+        const SwTextField* pTextField = (*it)->GetTextField();
+        if( !pTextField )
             continue;
 
-        const SwField* pFld = pTxtFld->GetFmtFld().GetField();
-        switch( pFld->GetTyp()->Which() )
+        const SwField* pField = pTextField->GetFormatField().GetField();
+        switch( pField->GetTyp()->Which() )
         {
         case RES_SETEXPFLD:
-            if( nsSwGetSetExpType::GSE_STRING & pFld->GetSubType() )
+            if( nsSwGetSetExpType::GSE_STRING & pField->GetSubType() )
             {
                 // set the new value in the hash table
                 // is the formula a field?
-                SwSetExpField* pSFld = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pFld));
-                OUString aNew = LookString( ppHashTbl, rTblSize, pSFld->GetFormula() );
+                SwSetExpField* pSField = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pField));
+                OUString aNew = LookString( ppHashTable, rTableSize, pSField->GetFormula() );
 
                 if( aNew.isEmpty() )               // nothing found, then the formula is
-                    aNew = pSFld->GetFormula(); // the new value
+                    aNew = pSField->GetFormula(); // the new value
 
                 // #i3141# - update expression of field as in method
-                // <SwDoc::UpdateExpFlds(..)> for string/text fields
-                pSFld->ChgExpStr( aNew );
+                // <SwDoc::UpdateExpFields(..)> for string/text fields
+                pSField->ChgExpStr( aNew );
 
                 // look up the field's name
-                aNew = static_cast<SwSetExpFieldType*>(pSFld->GetTyp())->GetSetRefName();
+                aNew = static_cast<SwSetExpFieldType*>(pSField->GetTyp())->GetSetRefName();
                 // Entry present?
                 sal_uInt16 nPos;
-                SwHash* pFnd = Find( aNew, ppHashTbl, rTblSize, &nPos );
+                SwHash* pFnd = Find( aNew, ppHashTable, rTableSize, &nPos );
                 if( pFnd )
                     // modify entry in the hash table
-                    static_cast<_HashStr*>(pFnd)->aSetStr = pSFld->GetExpStr();
+                    static_cast<_HashStr*>(pFnd)->aSetStr = pSField->GetExpStr();
                 else
                     // insert the new entry
-                    *(ppHashTbl + nPos ) = new _HashStr( aNew,
-                            pSFld->GetExpStr(), static_cast<_HashStr*>(*(ppHashTbl + nPos)) );
+                    *(ppHashTable + nPos ) = new _HashStr( aNew,
+                            pSField->GetExpStr(), static_cast<_HashStr*>(*(ppHashTable + nPos)) );
             }
             break;
         case RES_DBFLD:
             {
-                const OUString& rName = pFld->GetTyp()->GetName();
+                const OUString& rName = pField->GetTyp()->GetName();
 
                 // Insert entry in the hash table
                 // Entry present?
                 sal_uInt16 nPos;
-                SwHash* pFnd = Find( rName, ppHashTbl, rTblSize, &nPos );
-                OUString const value(pFld->ExpandField(m_rDoc.IsClipBoard()));
+                SwHash* pFnd = Find( rName, ppHashTable, rTableSize, &nPos );
+                OUString const value(pField->ExpandField(m_rDoc.IsClipBoard()));
                 if( pFnd )
                 {
                     // modify entry in the hash table
@@ -1504,8 +1504,8 @@ void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblS
                 else
                 {
                     // insert the new entry
-                    *(ppHashTbl + nPos ) = new _HashStr( rName,
-                        value, static_cast<_HashStr *>(*(ppHashTbl + nPos)));
+                    *(ppHashTable + nPos ) = new _HashStr( rName,
+                        value, static_cast<_HashStr *>(*(ppHashTable + nPos)));
                 }
             }
             break;
@@ -1514,35 +1514,35 @@ void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblS
 }
 
 
-bool DocumentFieldsManager::IsNewFldLst() const
+bool DocumentFieldsManager::IsNewFieldLst() const
 {
-    return mbNewFldLst;
+    return mbNewFieldLst;
 }
 
-void DocumentFieldsManager::SetNewFldLst(bool bFlag)
+void DocumentFieldsManager::SetNewFieldLst(bool bFlag)
 {
-    mbNewFldLst = bFlag;
+    mbNewFieldLst = bFlag;
 }
 
-void DocumentFieldsManager::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
+void DocumentFieldsManager::InsDelFieldInFieldLst( bool bIns, const SwTextField& rField )
 {
-    if( !mbNewFldLst || !m_rDoc.IsInDtor() )
-        mpUpdtFlds->InsDelFldInFldLst( bIns, rFld );
+    if( !mbNewFieldLst || !m_rDoc.IsInDtor() )
+        mpUpdateFields->InsDelFieldInFieldLst( bIns, rField );
 }
 
 SwField * DocumentFieldsManager::GetFieldAtPos(const SwPosition & rPos)
 {
-    SwTxtFld * const pAttr = GetTxtFldAtPos(rPos);
+    SwTextField * const pAttr = GetTextFieldAtPos(rPos);
 
-    return (pAttr) ? const_cast<SwField *>( pAttr->GetFmtFld().GetField() ) : 0;
+    return (pAttr) ? const_cast<SwField *>( pAttr->GetFormatField().GetField() ) : 0;
 }
 
-SwTxtFld * DocumentFieldsManager::GetTxtFldAtPos(const SwPosition & rPos)
+SwTextField * DocumentFieldsManager::GetTextFieldAtPos(const SwPosition & rPos)
 {
-    SwTxtNode * const pNode = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode * const pNode = rPos.nNode.GetNode().GetTextNode();
 
     return (pNode != NULL)
-        ? pNode->GetFldTxtAttrAt( rPos.nContent.GetIndex(), true )
+        ? pNode->GetFieldTextAttrAt( rPos.nContent.GetIndex(), true )
         : 0;
 }
 
@@ -1550,10 +1550,10 @@ SwTxtFld * DocumentFieldsManager::GetTxtFldAtPos(const SwPosition & rPos)
 ///       optimization currently only available when no fields exist.
 bool DocumentFieldsManager::containsUpdatableFields()
 {
-    for (sal_uInt16 i = 0; i < mpFldTypes->size(); ++i)
+    for (sal_uInt16 i = 0; i < mpFieldTypes->size(); ++i)
     {
-        SwFieldType* pFldType = (*mpFldTypes)[i];
-        SwIterator<SwFmtFld,SwFieldType> aIter(*pFldType);
+        SwFieldType* pFieldType = (*mpFieldTypes)[i];
+        SwIterator<SwFormatField,SwFieldType> aIter(*pFieldType);
         if (aIter.First())
             return true;
     }
@@ -1563,96 +1563,96 @@ bool DocumentFieldsManager::containsUpdatableFields()
 /// Remove all unreferenced field types of a document
 void DocumentFieldsManager::GCFieldTypes()
 {
-    for( sal_uInt16 n = mpFldTypes->size(); n > INIT_FLDTYPES; )
-        if( !(*mpFldTypes)[ --n ]->HasWriterListeners() )
-            RemoveFldType( n );
+    for( sal_uInt16 n = mpFieldTypes->size(); n > INIT_FLDTYPES; )
+        if( !(*mpFieldTypes)[ --n ]->HasWriterListeners() )
+            RemoveFieldType( n );
 }
 
 void DocumentFieldsManager::_InitFieldTypes()       // is being called by the CTOR
 {
     // Field types
-    mpFldTypes->push_back( new SwDateTimeFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwChapterFieldType );
-    mpFldTypes->push_back( new SwPageNumberFieldType );
-    mpFldTypes->push_back( new SwAuthorFieldType );
-    mpFldTypes->push_back( new SwFileNameFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwDBNameFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwGetExpFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwGetRefFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwHiddenTxtFieldType );
-    mpFldTypes->push_back( new SwPostItFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwDocStatFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwDocInfoFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwInputFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwTblFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwMacroFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwHiddenParaFieldType );
-    mpFldTypes->push_back( new SwDBNextSetFieldType );
-    mpFldTypes->push_back( new SwDBNumSetFieldType );
-    mpFldTypes->push_back( new SwDBSetNumberFieldType );
-    mpFldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
-    mpFldTypes->push_back( new SwExtUserFieldType );
-    mpFldTypes->push_back( new SwRefPageSetFieldType );
-    mpFldTypes->push_back( new SwRefPageGetFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwJumpEditFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwScriptFieldType( &m_rDoc ) );
-    mpFldTypes->push_back( new SwCombinedCharFieldType );
-    mpFldTypes->push_back( new SwDropDownFieldType );
+    mpFieldTypes->push_back( new SwDateTimeFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwChapterFieldType );
+    mpFieldTypes->push_back( new SwPageNumberFieldType );
+    mpFieldTypes->push_back( new SwAuthorFieldType );
+    mpFieldTypes->push_back( new SwFileNameFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwDBNameFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwGetExpFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwGetRefFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwHiddenTextFieldType );
+    mpFieldTypes->push_back( new SwPostItFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwDocStatFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwDocInfoFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwInputFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwTableFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwMacroFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwHiddenParaFieldType );
+    mpFieldTypes->push_back( new SwDBNextSetFieldType );
+    mpFieldTypes->push_back( new SwDBNumSetFieldType );
+    mpFieldTypes->push_back( new SwDBSetNumberFieldType );
+    mpFieldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
+    mpFieldTypes->push_back( new SwExtUserFieldType );
+    mpFieldTypes->push_back( new SwRefPageSetFieldType );
+    mpFieldTypes->push_back( new SwRefPageGetFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwJumpEditFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwScriptFieldType( &m_rDoc ) );
+    mpFieldTypes->push_back( new SwCombinedCharFieldType );
+    mpFieldTypes->push_back( new SwDropDownFieldType );
 
     // Types have to be at the end!
-    // We expect &m_rDoc in the InsertFldType!
+    // We expect &m_rDoc in the InsertFieldType!
     // MIB 14.04.95: In Sw3StringPool::Setup (sw3imp.cxx) and
     //               lcl_sw3io_InSetExpField (sw3field.cxx) now also
-    mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+    mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
                 SW_RESSTR(STR_POOLCOLL_LABEL_ABB), nsSwGetSetExpType::GSE_SEQ) );
-    mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+    mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
                 SW_RESSTR(STR_POOLCOLL_LABEL_TABLE), nsSwGetSetExpType::GSE_SEQ) );
-    mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+    mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
                 SW_RESSTR(STR_POOLCOLL_LABEL_FRAME), nsSwGetSetExpType::GSE_SEQ) );
-    mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+    mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
                 SW_RESSTR(STR_POOLCOLL_LABEL_DRAWING), nsSwGetSetExpType::GSE_SEQ) );
 
-    assert( mpFldTypes->size() == INIT_FLDTYPES );
+    assert( mpFieldTypes->size() == INIT_FLDTYPES );
 }
 
 void DocumentFieldsManager::ClearFieldTypes()
 {
-    for(SwFldTypes::const_iterator it = mpFldTypes->begin() + INIT_FLDTYPES;
-        it != mpFldTypes->end(); ++it)
+    for(SwFieldTypes::const_iterator it = mpFieldTypes->begin() + INIT_FLDTYPES;
+        it != mpFieldTypes->end(); ++it)
         delete *it;
-    mpFldTypes->erase( mpFldTypes->begin() + INIT_FLDTYPES, mpFldTypes->end() );
+    mpFieldTypes->erase( mpFieldTypes->begin() + INIT_FLDTYPES, mpFieldTypes->end() );
 }
 
-void DocumentFieldsManager::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
+void DocumentFieldsManager::UpdateDBNumFields( SwDBNameInfField& rDBField, SwCalc& rCalc )
 {
 #if !HAVE_FEATURE_DBCONNECTIVITY
-    (void) rDBFld;
+    (void) rDBField;
     (void) rCalc;
 #else
     SwDBManager* pMgr = m_rDoc.GetDBManager();
 
-    sal_uInt16 nFldType = rDBFld.Which();
+    sal_uInt16 nFieldType = rDBField.Which();
 
-    bool bPar1 = rCalc.Calculate( rDBFld.GetPar1() ).GetBool();
+    bool bPar1 = rCalc.Calculate( rDBField.GetPar1() ).GetBool();
 
-    if( RES_DBNEXTSETFLD == nFldType )
-        static_cast<SwDBNextSetField&>(rDBFld).SetCondValid( bPar1 );
+    if( RES_DBNEXTSETFLD == nFieldType )
+        static_cast<SwDBNextSetField&>(rDBField).SetCondValid( bPar1 );
     else
-        static_cast<SwDBNumSetField&>(rDBFld).SetCondValid( bPar1 );
+        static_cast<SwDBNumSetField&>(rDBField).SetCondValid( bPar1 );
 
-    if( !rDBFld.GetRealDBData().sDataSource.isEmpty() )
+    if( !rDBField.GetRealDBData().sDataSource.isEmpty() )
     {
         // Edit a certain database
-        if( RES_DBNEXTSETFLD == nFldType )
-            static_cast<SwDBNextSetField&>(rDBFld).Evaluate(&m_rDoc);
+        if( RES_DBNEXTSETFLD == nFieldType )
+            static_cast<SwDBNextSetField&>(rDBField).Evaluate(&m_rDoc);
         else
-            static_cast<SwDBNumSetField&>(rDBFld).Evaluate(&m_rDoc);
+            static_cast<SwDBNumSetField&>(rDBField).Evaluate(&m_rDoc);
 
-        SwDBData aTmpDBData( rDBFld.GetDBData(&m_rDoc) );
+        SwDBData aTmpDBData( rDBField.GetDBData(&m_rDoc) );
 
         if( pMgr->OpenDataSource( aTmpDBData.sDataSource, aTmpDBData.sCommand, -1, false ))
-            rCalc.VarChange( lcl_GetDBVarName( m_rDoc, rDBFld),
+            rCalc.VarChange( lcl_GetDBVarName( m_rDoc, rDBField),
                         pMgr->GetSelectedRecordId(aTmpDBData.sDataSource, aTmpDBData.sCommand, aTmpDBData.nCommandType) );
     }
     else
@@ -1664,8 +1664,8 @@ void DocumentFieldsManager::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& r
 
 DocumentFieldsManager::~DocumentFieldsManager()
 {
-    delete mpUpdtFlds;
-    delete mpFldTypes;
+    delete mpUpdateFields;
+    delete mpFieldTypes;
 }
 
 }
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx
index ad23762a0c85..14dc9ab54ced 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -107,9 +107,9 @@ void DocumentLayoutManager::SetLayouter( SwLayouter* pNew )
 
     The format is put into the respective format array.
     If there already is a fitting format, it is returned instead. */
-SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
+SwFrameFormat *DocumentLayoutManager::MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet )
 {
-    SwFrmFmt *pFmt = 0;
+    SwFrameFormat *pFormat = 0;
     const bool bMod = m_rDoc.getIDocumentState().IsModified();
     bool bHeader = false;
 
@@ -126,16 +126,16 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
     case RND_STD_FOOTERL:
     case RND_STD_FOOTERR:
         {
-            pFmt = new SwFrmFmt( m_rDoc.GetAttrPool(),
+            pFormat = new SwFrameFormat( m_rDoc.GetAttrPool(),
                                  (bHeader ? "Right header" : "Right footer"),
-                                 m_rDoc.GetDfltFrmFmt() );
+                                 m_rDoc.GetDfltFrameFormat() );
 
             SwNodeIndex aTmpIdx( m_rDoc.GetNodes().GetEndOfAutotext() );
             SwStartNode* pSttNd =
                 m_rDoc.GetNodes().MakeTextSection
                 ( aTmpIdx,
                   bHeader ? SwHeaderStartNode : SwFooterStartNode,
-                  m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(static_cast<sal_uInt16>( bHeader
+                  m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(static_cast<sal_uInt16>( bHeader
                                      ? ( eRequest == RND_STD_HEADERL
                                          ? RES_POOLCOLL_HEADERL
                                          : eRequest == RND_STD_HEADERR
@@ -147,10 +147,10 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
                                          ? RES_POOLCOLL_FOOTERR
                                          : RES_POOLCOLL_FOOTER )
                                      ) ) );
-            pFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
+            pFormat->SetFormatAttr( SwFormatContent( pSttNd ));
 
             if( pSet )      // Set a few more attributes
-                pFmt->SetFmtAttr( *pSet );
+                pFormat->SetFormatAttr( *pSet );
 
             // Why set it back?  Doc has changed, or not?
             // In any case, wrong for the FlyFrames!
@@ -161,14 +161,14 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
 
     case RND_DRAW_OBJECT:
         {
-            pFmt = m_rDoc.MakeDrawFrmFmt( OUString(), m_rDoc.GetDfltFrmFmt() );
+            pFormat = m_rDoc.MakeDrawFrameFormat( OUString(), m_rDoc.GetDfltFrameFormat() );
             if( pSet )      // Set a few more attributes
-                pFmt->SetFmtAttr( *pSet );
+                pFormat->SetFormatAttr( *pSet );
 
             if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
             {
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(
-                    new SwUndoInsLayFmt(pFmt, 0, 0));
+                    new SwUndoInsLayFormat(pFormat, 0, 0));
             }
         }
         break;
@@ -188,32 +188,32 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
                 "LayoutFormat was requested with an invalid Request." );
 
     }
-    return pFmt;
+    return pFormat;
 }
 
 /// Deletes the denoted format and its content.
-void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
+void DocumentLayoutManager::DelLayoutFormat( SwFrameFormat *pFormat )
 {
     // A chain of frames needs to be merged, if necessary,
     // so that the Frame's contents are adjusted accordingly before we destroy the Frames.
-    const SwFmtChain &rChain = pFmt->GetChain();
+    const SwFormatChain &rChain = pFormat->GetChain();
     if ( rChain.GetPrev() )
     {
-        SwFmtChain aChain( rChain.GetPrev()->GetChain() );
+        SwFormatChain aChain( rChain.GetPrev()->GetChain() );
         aChain.SetNext( rChain.GetNext() );
         m_rDoc.SetAttr( aChain, *rChain.GetPrev() );
     }
     if ( rChain.GetNext() )
     {
-        SwFmtChain aChain( rChain.GetNext()->GetChain() );
+        SwFormatChain aChain( rChain.GetNext()->GetChain() );
         aChain.SetPrev( rChain.GetPrev() );
         m_rDoc.SetAttr( aChain, *rChain.GetNext() );
     }
 
     const SwNodeIndex* pCntIdx = 0;
     // The draw format doesn't own its content, it just has a pointer to it.
-    if (pFmt->Which() != RES_DRAWFRMFMT)
-        pCntIdx = pFmt->GetCntnt().GetCntntIdx();
+    if (pFormat->Which() != RES_DRAWFRMFMT)
+        pCntIdx = pFormat->GetContent().GetContentIdx();
     if (pCntIdx && !m_rDoc.GetIDocumentUndoRedo().DoesUndo())
     {
         // Disconnect if it's an OLE object
@@ -239,14 +239,14 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
     }
 
     // Destroy Frames
-    pFmt->DelFrms();
+    pFormat->DelFrms();
 
     // Only FlyFrames are undoable at first
-    const sal_uInt16 nWh = pFmt->Which();
+    const sal_uInt16 nWh = pFormat->Which();
     if (m_rDoc.GetIDocumentUndoRedo().DoesUndo() &&
         (RES_FLYFRMFMT == nWh || RES_DRAWFRMFMT == nWh))
     {
-        m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoDelLayFmt( pFmt ));
+        m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoDelLayFormat( pFormat ));
     }
     else
     {
@@ -254,35 +254,35 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
         if ( nWh == RES_FLYFRMFMT )
         {
             // determine frame formats of at-frame anchored objects
-            const SwNodeIndex* pCntntIdx = 0;
-            if (pFmt->Which() != RES_DRAWFRMFMT)
-                pCntntIdx = pFmt->GetCntnt().GetCntntIdx();
-            if (pCntntIdx)
+            const SwNodeIndex* pContentIdx = 0;
+            if (pFormat->Which() != RES_DRAWFRMFMT)
+                pContentIdx = pFormat->GetContent().GetContentIdx();
+            if (pContentIdx)
             {
-                const SwFrmFmts* pTbl = pFmt->GetDoc()->GetSpzFrmFmts();
-                if ( pTbl )
+                const SwFrameFormats* pTable = pFormat->GetDoc()->GetSpzFrameFormats();
+                if ( pTable )
                 {
-                    std::vector<SwFrmFmt*> aToDeleteFrmFmts;
-                    const sal_uLong nNodeIdxOfFlyFmt( pCntntIdx->GetIndex() );
+                    std::vector<SwFrameFormat*> aToDeleteFrameFormats;
+                    const sal_uLong nNodeIdxOfFlyFormat( pContentIdx->GetIndex() );
 
-                    for ( size_t i = 0; i < pTbl->size(); ++i )
+                    for ( size_t i = 0; i < pTable->size(); ++i )
                     {
-                        SwFrmFmt* pTmpFmt = (*pTbl)[i];
-                        const SwFmtAnchor &rAnch = pTmpFmt->GetAnchor();
+                        SwFrameFormat* pTmpFormat = (*pTable)[i];
+                        const SwFormatAnchor &rAnch = pTmpFormat->GetAnchor();
                         if ( rAnch.GetAnchorId() == FLY_AT_FLY &&
-                             rAnch.GetCntntAnchor()->nNode.GetIndex() == nNodeIdxOfFlyFmt )
+                             rAnch.GetContentAnchor()->nNode.GetIndex() == nNodeIdxOfFlyFormat )
                         {
-                            aToDeleteFrmFmts.push_back( pTmpFmt );
+                            aToDeleteFrameFormats.push_back( pTmpFormat );
                         }
                     }
 
                     // delete found frame formats
-                    while ( !aToDeleteFrmFmts.empty() )
+                    while ( !aToDeleteFrameFormats.empty() )
                     {
-                        SwFrmFmt* pTmpFmt = aToDeleteFrmFmts.back();
-                        pFmt->GetDoc()->getIDocumentLayoutAccess().DelLayoutFmt( pTmpFmt );
+                        SwFrameFormat* pTmpFormat = aToDeleteFrameFormats.back();
+                        pFormat->GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat( pTmpFormat );
 
-                        aToDeleteFrmFmts.pop_back();
+                        aToDeleteFrameFormats.pop_back();
                     }
                 }
             }
@@ -292,34 +292,34 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
         if( pCntIdx )
         {
             SwNode *pNode = &pCntIdx->GetNode();
-            const_cast<SwFmtCntnt&>(static_cast<const SwFmtCntnt&>(pFmt->GetFmtAttr( RES_CNTNT ))).SetNewCntntIdx( 0 );
+            const_cast<SwFormatContent&>(static_cast<const SwFormatContent&>(pFormat->GetFormatAttr( RES_CNTNT ))).SetNewContentIdx( 0 );
             m_rDoc.getIDocumentContentOperations().DeleteSection( pNode );
         }
 
         // Delete the character for FlyFrames anchored as char (if necessary)
-        const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-        if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) && rAnchor.GetCntntAnchor())
+        const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
+        if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) && rAnchor.GetContentAnchor())
         {
-            const SwPosition* pPos = rAnchor.GetCntntAnchor();
-            SwTxtNode *pTxtNd = pPos->nNode.GetNode().GetTxtNode();
+            const SwPosition* pPos = rAnchor.GetContentAnchor();
+            SwTextNode *pTextNd = pPos->nNode.GetNode().GetTextNode();
 
             // attribute is still in text node, delete it
-            if ( pTxtNd )
+            if ( pTextNd )
             {
-                SwTxtFlyCnt* const pAttr = static_cast<SwTxtFlyCnt*>(
-                    pTxtNd->GetTxtAttrForCharAt( pPos->nContent.GetIndex(),
+                SwTextFlyCnt* const pAttr = static_cast<SwTextFlyCnt*>(
+                    pTextNd->GetTextAttrForCharAt( pPos->nContent.GetIndex(),
                         RES_TXTATR_FLYCNT ));
-                if ( pAttr && (pAttr->GetFlyCnt().GetFrmFmt() == pFmt) )
+                if ( pAttr && (pAttr->GetFlyCnt().GetFrameFormat() == pFormat) )
                 {
                     // dont delete, set pointer to 0
-                    const_cast<SwFmtFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFmt();
+                    const_cast<SwFormatFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFormat();
                     SwIndex aIdx( pPos->nContent );
-                    pTxtNd->EraseText( aIdx, 1 );
+                    pTextNd->EraseText( aIdx, 1 );
                 }
             }
         }
 
-        m_rDoc.DelFrmFmt( pFmt );
+        m_rDoc.DelFrameFormat( pFormat );
     }
     m_rDoc.getIDocumentState().SetModified();
 }
@@ -330,10 +330,10 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
     If the source format is located in another document, also copy correctly
     in this case.
     The Anchor attribute's position is always set to 0! */
-SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
-    const SwFrmFmt& rSource,
-    const SwFmtAnchor& rNewAnchor,
-    bool bSetTxtFlyAtt,
+SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
+    const SwFrameFormat& rSource,
+    const SwFormatAnchor& rNewAnchor,
+    bool bSetTextFlyAtt,
     bool bMakeFrms )
 {
     const bool bFly = RES_FLYFRMFMT == rSource.Which();
@@ -356,8 +356,8 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
             ((FLY_AT_PARA == rNewAnchor.GetAnchorId()) ||
              (FLY_AT_FLY  == rNewAnchor.GetAnchorId()) ||
              (FLY_AT_CHAR == rNewAnchor.GetAnchorId())) &&
-            rNewAnchor.GetCntntAnchor() &&
-            m_rDoc.IsInHeaderFooter( rNewAnchor.GetCntntAnchor()->nNode ) &&
+            rNewAnchor.GetContentAnchor() &&
+            m_rDoc.IsInHeaderFooter( rNewAnchor.GetContentAnchor()->nNode ) &&
             pDrawContact != NULL  &&
             pDrawContact->GetMaster() != NULL  &&
             CheckControlLayer( pDrawContact->GetMaster() );
@@ -367,9 +367,9 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
     if( bMayNotCopy )
         return NULL;
 
-    SwFrmFmt* pDest = m_rDoc.GetDfltFrmFmt();
-    if( rSource.GetRegisteredIn() != pSrcDoc->GetDfltFrmFmt() )
-        pDest = m_rDoc.CopyFrmFmt( *static_cast<const SwFrmFmt*>(rSource.GetRegisteredIn()) );
+    SwFrameFormat* pDest = m_rDoc.GetDfltFrameFormat();
+    if( rSource.GetRegisteredIn() != pSrcDoc->GetDfltFrameFormat() )
+        pDest = m_rDoc.CopyFrameFormat( *static_cast<const SwFrameFormat*>(rSource.GetRegisteredIn()) );
     if( bFly )
     {
         // #i11176#
@@ -378,36 +378,36 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
         // These are then added to the DrawingLayer (which needs to exist).
         // Together with correct sorting of all drawinglayer based objects
         // before cloning ZOrder transfer works correctly then.
-        SwFlyFrmFmt *pFormat = m_rDoc.MakeFlyFrmFmt( rSource.GetName(), pDest );
+        SwFlyFrameFormat *pFormat = m_rDoc.MakeFlyFrameFormat( rSource.GetName(), pDest );
         pDest = pFormat;
 
         SwXFrame::GetOrCreateSdrObject(*pFormat);
     }
     else
-        pDest = m_rDoc.MakeDrawFrmFmt( OUString(), pDest );
+        pDest = m_rDoc.MakeDrawFrameFormat( OUString(), pDest );
 
     // Copy all other or new attributes
     pDest->CopyAttrs( rSource );
 
     // Do not copy chains
-    pDest->ResetFmtAttr( RES_CHAIN );
+    pDest->ResetFormatAttr( RES_CHAIN );
 
     if( bFly )
     {
         // Duplicate the content.
-        const SwNode& rCSttNd = rSource.GetCntnt().GetCntntIdx()->GetNode();
+        const SwNode& rCSttNd = rSource.GetContent().GetContentIdx()->GetNode();
         SwNodeRange aRg( rCSttNd, 1, *rCSttNd.EndOfSectionNode() );
 
         SwNodeIndex aIdx( m_rDoc.GetNodes().GetEndOfAutotext() );
         SwStartNode* pSttNd = SwNodes::MakeEmptySection( aIdx, SwFlyStartNode );
 
-        // Set the Anchor/CntntIndex first.
-        // Within the copying part, we can access the values (DrawFmt in Headers and Footers)
+        // Set the Anchor/ContentIndex first.
+        // Within the copying part, we can access the values (DrawFormat in Headers and Footers)
         aIdx = *pSttNd;
-        SwFmtCntnt aAttr( rSource.GetCntnt() );
-        aAttr.SetNewCntntIdx( &aIdx );
-        pDest->SetFmtAttr( aAttr );
-        pDest->SetFmtAttr( rNewAnchor );
+        SwFormatContent aAttr( rSource.GetContent() );
+        aAttr.SetNewContentIdx( &aIdx );
+        pDest->SetFormatAttr( aAttr );
+        pDest->SetFormatAttr( rNewAnchor );
 
         if( !m_rDoc.IsCopyIsMove() || &m_rDoc != pSrcDoc )
         {
@@ -434,14 +434,14 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
 
         if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
         {
-            m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFmt(pDest,0,0));
+            m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFormat(pDest,0,0));
         }
 
         // Make sure that FlyFrames in FlyFrames are copied
         aIdx = *pSttNd->EndOfSectionNode();
 
         //fdo#36631 disable (scoped) any undo operations associated with the
-        //contact object itself. They should be managed by SwUndoInsLayFmt.
+        //contact object itself. They should be managed by SwUndoInsLayFormat.
         const ::sw::DrawUndoGuard drawUndoGuard(m_rDoc.GetIDocumentUndoRedo());
 
         pSrcDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aIdx, NULL, false, true, true );
@@ -452,17 +452,17 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
         // #i52780# - Note: moving object to visible layer not needed.
         const SwDrawContact* pSourceContact = static_cast<const SwDrawContact *>(rSource.FindContactObj());
 
-        SwDrawContact* pContact = new SwDrawContact( static_cast<SwDrawFrmFmt*>(pDest),
+        SwDrawContact* pContact = new SwDrawContact( static_cast<SwDrawFrameFormat*>(pDest),
                                 m_rDoc.CloneSdrObj( *pSourceContact->GetMaster(),
                                         m_rDoc.IsCopyIsMove() && &m_rDoc == pSrcDoc ) );
         // #i49730# - notify draw frame format that position attributes are
         // already set, if the position attributes are already set at the
         // source draw frame format.
-        if ( pDest->ISA(SwDrawFrmFmt) &&
-             rSource.ISA(SwDrawFrmFmt) &&
-             static_cast<const SwDrawFrmFmt&>(rSource).IsPosAttrSet() )
+        if ( pDest->ISA(SwDrawFrameFormat) &&
+             rSource.ISA(SwDrawFrameFormat) &&
+             static_cast<const SwDrawFrameFormat&>(rSource).IsPosAttrSet() )
         {
-            static_cast<SwDrawFrmFmt*>(pDest)->PosAttrSet();
+            static_cast<SwDrawFrameFormat*>(pDest)->PosAttrSet();
         }
 
         if( pDest->GetAnchor() == rNewAnchor )
@@ -474,33 +474,33 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
             }
         }
         else
-            pDest->SetFmtAttr( rNewAnchor );
+            pDest->SetFormatAttr( rNewAnchor );
 
         if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
         {
-            m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFmt(pDest,0,0));
+            m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFormat(pDest,0,0));
         }
     }
 
-    if (bSetTxtFlyAtt && (FLY_AS_CHAR == rNewAnchor.GetAnchorId()))
+    if (bSetTextFlyAtt && (FLY_AS_CHAR == rNewAnchor.GetAnchorId()))
     {
-        const SwPosition* pPos = rNewAnchor.GetCntntAnchor();
-        SwFmtFlyCnt aFmt( pDest );
-        pPos->nNode.GetNode().GetTxtNode()->InsertItem(
-            aFmt, pPos->nContent.GetIndex(), 0 );
+        const SwPosition* pPos = rNewAnchor.GetContentAnchor();
+        SwFormatFlyCnt aFormat( pDest );
+        pPos->nNode.GetNode().GetTextNode()->InsertItem(
+            aFormat, pPos->nContent.GetIndex(), 0 );
     }
 
     if( bMakeFrms )
         pDest->MakeFrms();
 
     // If the draw format has a TextBox, then copy its fly format as well.
-    if (SwFrmFmt* pSourceTextBox = SwTextBoxHelper::findTextBox(&rSource))
+    if (SwFrameFormat* pSourceTextBox = SwTextBoxHelper::findTextBox(&rSource))
     {
-        SwFrmFmt* pDestTextBox = CopyLayoutFmt(*pSourceTextBox, rNewAnchor, bSetTxtFlyAtt, bMakeFrms);
+        SwFrameFormat* pDestTextBox = CopyLayoutFormat(*pSourceTextBox, rNewAnchor, bSetTextFlyAtt, bMakeFrms);
         SwAttrSet aSet(pDest->GetAttrSet());
-        SwFmtCntnt aCntnt(pDestTextBox->GetCntnt().GetCntntIdx()->GetNode().GetStartNode());
-        aSet.Put(aCntnt);
-        pDest->SetFmtAttr(aSet);
+        SwFormatContent aContent(pDestTextBox->GetContent().GetContentIdx()->GetNode().GetStartNode());
+        aSet.Put(aContent);
+        pDest->SetFormatAttr(aSet);
     }
 
     return pDest;
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 7ed4e7bf9b7f..2e2db8c74f6f 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -53,11 +53,11 @@ namespace
     struct _FindItem
     {
         const OUString m_Item;
-        SwTableNode* pTblNd;
+        SwTableNode* pTableNd;
         SwSectionNode* pSectNd;
 
         _FindItem(const OUString& rS)
-            : m_Item(rS), pTblNd(0), pSectNd(0)
+            : m_Item(rS), pTableNd(0), pSectNd(0)
         {}
      };
 
@@ -112,9 +112,9 @@ namespace
     }
 
 
-    bool lcl_FindSection( const SwSectionFmt* pSectFmt, _FindItem * const pItem, bool bCaseSensitive )
+    bool lcl_FindSection( const SwSectionFormat* pSectFormat, _FindItem * const pItem, bool bCaseSensitive )
     {
-        SwSection* pSect = pSectFmt->GetSection();
+        SwSection* pSect = pSectFormat->GetSection();
         if( pSect )
         {
             OUString sNm( (bCaseSensitive)
@@ -127,8 +127,8 @@ namespace
             {
                 // found, so get the data
                 const SwNodeIndex* pIdx;
-                if( 0 != (pIdx = pSectFmt->GetCntnt().GetCntntIdx() ) &&
-                    &pSectFmt->GetDoc()->GetNodes() == &pIdx->GetNodes() )
+                if( 0 != (pIdx = pSectFormat->GetContent().GetContentIdx() ) &&
+                    &pSectFormat->GetDoc()->GetNodes() == &pIdx->GetNodes() )
                 {
                     // a table in the normal NodesArr
                     pItem->pSectNd = pIdx->GetNode().GetSectionNode();
@@ -141,20 +141,20 @@ namespace
         return true;
     }
 
-    bool lcl_FindTable( const SwFrmFmt* pTableFmt, _FindItem * const pItem )
+    bool lcl_FindTable( const SwFrameFormat* pTableFormat, _FindItem * const pItem )
     {
-        OUString sNm( GetAppCharClass().lowercase( pTableFmt->GetName() ));
+        OUString sNm( GetAppCharClass().lowercase( pTableFormat->GetName() ));
         if ( sNm == pItem->m_Item )
         {
-            SwTable* pTmpTbl;
+            SwTable* pTmpTable;
             SwTableBox* pFBox;
-            if( 0 != ( pTmpTbl = SwTable::FindTable( pTableFmt ) ) &&
-                0 != ( pFBox = pTmpTbl->GetTabSortBoxes()[0] ) &&
+            if( 0 != ( pTmpTable = SwTable::FindTable( pTableFormat ) ) &&
+                0 != ( pFBox = pTmpTable->GetTabSortBoxes()[0] ) &&
                 pFBox->GetSttNd() &&
-                &pTableFmt->GetDoc()->GetNodes() == &pFBox->GetSttNd()->GetNodes() )
+                &pTableFormat->GetDoc()->GetNodes() == &pFBox->GetSttNd()->GetNodes() )
             {
                 // a table in the normal NodesArr
-                pItem->pTblNd = const_cast<SwTableNode*>(
+                pItem->pTableNd = const_cast<SwTableNode*>(
                                             pFBox->GetSttNd()->FindTableNode());
                 return false;
             }
@@ -247,9 +247,9 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O
         // Do we already have the Item?
         OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
         _FindItem aPara( sItem );
-        for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+        for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
         {
-            if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+            if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
                 break;
         }
         if( aPara.pSectNd )
@@ -263,14 +263,14 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O
     }
 
     _FindItem aPara( GetAppCharClass().lowercase( rItem ));
-    for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+    for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
     {
-        if (!(lcl_FindTable(pFmt, &aPara)))
+        if (!(lcl_FindTable(pFormat, &aPara)))
             break;
     }
-    if( aPara.pTblNd )
+    if( aPara.pTableNd )
     {
-        return SwServerObject( *aPara.pTblNd ).GetData( rValue, rMimeType );
+        return SwServerObject( *aPara.pTableNd ).GetData( rValue, rMimeType );
     }
 
     return false;
@@ -292,9 +292,9 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
         // Do we already have the Item?
         OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
         _FindItem aPara( sItem );
-        for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+        for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
         {
-            if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+            if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
                 break;
         }
         if( aPara.pSectNd )
@@ -309,9 +309,9 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
 
     OUString sItem(GetAppCharClass().lowercase(rItem));
     _FindItem aPara( sItem );
-    for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+    for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
     {
-        if (!(lcl_FindTable(pFmt, &aPara)))
+        if (!(lcl_FindTable(pFormat, &aPara)))
             break;
     }
 
@@ -341,9 +341,9 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
 
         _FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
         // sections
-        for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+        for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
         {
-            if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+            if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
                 break;
         }
 
@@ -364,17 +364,17 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
 
     _FindItem aPara( GetAppCharClass().lowercase(rItem) );
     // tables
-    for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+    for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
     {
-        if (!(lcl_FindTable(pFmt, &aPara)))
+        if (!(lcl_FindTable(pFormat, &aPara)))
             break;
     }
-    if(aPara.pTblNd
-        && (0 == (pObj = aPara.pTblNd->GetTable().GetObject())))
+    if(aPara.pTableNd
+        && (0 == (pObj = aPara.pTableNd->GetTable().GetObject())))
     {
         // table found, but no link yet -> create hotlink
-        pObj = new SwServerObject(*aPara.pTblNd);
-        aPara.pTblNd->GetTable().SetRefObject(pObj);
+        pObj = new SwServerObject(*aPara.pTableNd);
+        aPara.pTableNd->GetTable().SetRefObject(pObj);
         GetLinkManager().InsertServer(pObj);
     }
     return pObj;
@@ -453,15 +453,15 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
         if( sCmp == "table" )
         {
             sName = rCC.lowercase( sName );
-            for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+            for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
             {
-                if (!(lcl_FindTable(pFmt, &aPara)))
+                if (!(lcl_FindTable(pFormat, &aPara)))
                     break;
             }
-            if( aPara.pTblNd )
+            if( aPara.pTableNd )
             {
-                rpRange = new SwNodeRange( *aPara.pTblNd, 0,
-                                *aPara.pTblNd->EndOfSectionNode(), 1 );
+                rpRange = new SwNodeRange( *aPara.pTableNd, 0,
+                                *aPara.pTableNd->EndOfSectionNode(), 1 );
                 return true;
             }
         }
@@ -469,10 +469,10 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
         {
             SwNodeIndex* pIdx;
             SwNode* pNd;
-            const SwFlyFrmFmt* pFlyFmt = m_rDoc.FindFlyByName( sName );
-            if( pFlyFmt &&
-                0 != ( pIdx = const_cast<SwNodeIndex*>(pFlyFmt->GetCntnt().GetCntntIdx()) ) &&
-                !( pNd = &pIdx->GetNode())->IsNoTxtNode() )
+            const SwFlyFrameFormat* pFlyFormat = m_rDoc.FindFlyByName( sName );
+            if( pFlyFormat &&
+                0 != ( pIdx = const_cast<SwNodeIndex*>(pFlyFormat->GetContent().GetContentIdx()) ) &&
+                !( pNd = &pIdx->GetNode())->IsNoTextNode() )
             {
                 rpRange = new SwNodeRange( *pNd, 1, *pNd->EndOfSectionNode() );
                 return true;
@@ -489,7 +489,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
             if( m_rDoc.GotoOutline( aPos, sName ))
             {
                 SwNode* pNd = &aPos.nNode.GetNode();
-                const int nLvl = pNd->GetTxtNode()->GetAttrOutlineLevel()-1;
+                const int nLvl = pNd->GetTextNode()->GetAttrOutlineLevel()-1;
 
                 const SwOutlineNodes& rOutlNds = m_rDoc.GetNodes().GetOutLineNds();
                 sal_uInt16 nTmpPos;
@@ -499,7 +499,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
                 // look for the section's end, now
                 for( ++nTmpPos;
                         nTmpPos < rOutlNds.size() &&
-                        nLvl < rOutlNds[ nTmpPos ]->GetTxtNode()->
+                        nLvl < rOutlNds[ nTmpPos ]->GetTextNode()->
                                 GetAttrOutlineLevel()-1;
                     ++nTmpPos )
                     ;       // there is no block
@@ -534,9 +534,9 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
 
         if( !m_rDoc.GetSections().empty() )
         {
-            for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+            for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
             {
-                if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+                if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
                     break;
             }
             if( aPara.pSectNd )
diff --git a/sw/source/core/doc/DocumentListItemsManager.cxx b/sw/source/core/doc/DocumentListItemsManager.cxx
index 5844fd27abed..66de4083f0c7 100644
--- a/sw/source/core/doc/DocumentListItemsManager.cxx
+++ b/sw/source/core/doc/DocumentListItemsManager.cxx
@@ -70,8 +70,8 @@ OUString DocumentListItemsManager::getListItemText( const SwNodeNum& rNodeNum,
                                const bool bWithNumber,
                                const bool bWithSpacesForLevel ) const
 {
-    return rNodeNum.GetTxtNode()
-           ? rNodeNum.GetTxtNode()->GetExpandTxt( 0, -1, bWithNumber,
+    return rNodeNum.GetTextNode()
+           ? rNodeNum.GetTextNode()->GetExpandText( 0, -1, bWithNumber,
                                                   bWithNumber, bWithSpacesForLevel )
            : OUString();
 }
@@ -100,7 +100,7 @@ void DocumentListItemsManager::getNumItems( tSortedNodeNumList& orNodeNumList )
     {
         const SwNodeNum* pNodeNum = (*aIter);
         if ( pNodeNum->IsCounted() &&
-             pNodeNum->GetTxtNode() && pNodeNum->GetTxtNode()->HasNumber() )
+             pNodeNum->GetTextNode() && pNodeNum->GetTextNode()->HasNumber() )
         {
             orNodeNumList.push_back( pNodeNum );
         }
diff --git a/sw/source/core/doc/DocumentOutlineNodesManager.cxx b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
index 5e006164618d..95d0789fe849 100644
--- a/sw/source/core/doc/DocumentOutlineNodesManager.cxx
+++ b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
@@ -35,22 +35,22 @@ sal_Int32 DocumentOutlineNodesManager::getOutlineNodesCount() const
 int DocumentOutlineNodesManager::getOutlineLevel( const sal_Int32 nIdx ) const
 {
     return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->
-                                GetTxtNode()->GetAttrOutlineLevel()-1;
+                                GetTextNode()->GetAttrOutlineLevel()-1;
 }
 
 OUString DocumentOutlineNodesManager::getOutlineText( const sal_Int32 nIdx,
                               const bool bWithNumber,
                               const bool bWithSpacesForLevel,
-                              const bool bWithFtn ) const
+                              const bool bWithFootnote ) const
 {
     return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->
-                GetTxtNode()->GetExpandTxt( 0, -1, bWithNumber,
-                                            bWithNumber, bWithSpacesForLevel, bWithFtn );
+                GetTextNode()->GetExpandText( 0, -1, bWithNumber,
+                                            bWithNumber, bWithSpacesForLevel, bWithFootnote );
 }
 
-SwTxtNode* DocumentOutlineNodesManager::getOutlineNode( const sal_Int32 nIdx ) const
+SwTextNode* DocumentOutlineNodesManager::getOutlineNode( const sal_Int32 nIdx ) const
 {
-    return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->GetTxtNode();
+    return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->GetTextNode();
 }
 
 void DocumentOutlineNodesManager::getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const
@@ -62,7 +62,7 @@ void DocumentOutlineNodesManager::getOutlineNodes( IDocumentOutlineNodes::tSorte
     for ( sal_Int32 i = 0; i < nOutlCount; ++i )
     {
         orOutlineNodeList.push_back(
-            m_rDoc.GetNodes().GetOutLineNds()[i]->GetTxtNode() );
+            m_rDoc.GetNodes().GetOutLineNds()[i]->GetTextNode() );
     }
 }
 
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index e9c7dffeba44..99892d69b102 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -47,14 +47,14 @@ using namespace com::sun::star;
             assert(dynamic_cast<SwIndexReg*>(&pPos->nNode.GetNode())
                     == pPos->nContent.GetIdxReg());
 
-            SwTxtNode* pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-            if( pTxtNode == NULL )
+            SwTextNode* pTextNode = pPos->nNode.GetNode().GetTextNode();
+            if( pTextNode == NULL )
             {
                 assert(pPos->nContent == 0);
             }
             else
             {
-                assert(pPos->nContent >= 0 && pPos->nContent <= pTxtNode->Len());
+                assert(pPos->nContent >= 0 && pPos->nContent <= pTextNode->Len());
             }
         }
 
@@ -69,25 +69,25 @@ using namespace com::sun::star;
         // sure the redlines are sorted and non-overlapping.
         static void lcl_CheckRedline( IDocumentRedlineAccess& redlineAccess )
         {
-            const SwRedlineTbl& rTbl = redlineAccess.GetRedlineTbl();
+            const SwRedlineTable& rTable = redlineAccess.GetRedlineTable();
 
             // verify valid redline positions
-            for( sal_uInt16 i = 0; i < rTbl.size(); ++i )
-                lcl_CheckPam( rTbl[ i ] );
+            for( sal_uInt16 i = 0; i < rTable.size(); ++i )
+                lcl_CheckPam( rTable[ i ] );
 
-            for( sal_uInt16 j = 0; j < rTbl.size(); ++j )
+            for( sal_uInt16 j = 0; j < rTable.size(); ++j )
             {
                 // check for empty redlines
-                OSL_ENSURE( ( *(rTbl[j]->GetPoint()) != *(rTbl[j]->GetMark()) ) ||
-                            ( rTbl[j]->GetContentIdx() != NULL ),
+                OSL_ENSURE( ( *(rTable[j]->GetPoint()) != *(rTable[j]->GetMark()) ) ||
+                            ( rTable[j]->GetContentIdx() != NULL ),
                             _ERROR_PREFIX "empty redline" );
              }
 
             // verify proper redline sorting
-            for( sal_uInt16 n = 1; n < rTbl.size(); ++n )
+            for( sal_uInt16 n = 1; n < rTable.size(); ++n )
             {
-                const SwRangeRedline* pPrev = rTbl[ n-1 ];
-                const SwRangeRedline* pCurrent = rTbl[ n ];
+                const SwRangeRedline* pPrev = rTable[ n-1 ];
+                const SwRangeRedline* pCurrent = rTable[ n ];
 
                 // check redline sorting
                 SAL_WARN_IF( *pPrev->Start() > *pCurrent->Start(), "sw",
@@ -98,7 +98,7 @@ using namespace com::sun::star;
                              _ERROR_PREFIX "overlapping redlines" );
             }
 
-            assert(std::is_sorted(rTbl.begin(), rTbl.end(), CompareSwRedlineTbl()));
+            assert(std::is_sorted(rTable.begin(), rTable.end(), CompareSwRedlineTable()));
         }
     }
 
@@ -114,14 +114,14 @@ namespace
 {
     static inline bool IsPrevPos( const SwPosition & rPos1, const SwPosition & rPos2 )
     {
-        const SwCntntNode* pCNd;
+        const SwContentNode* pCNd;
         return 0 == rPos2.nContent.GetIndex() &&
                rPos2.nNode.GetIndex() - 1 == rPos1.nNode.GetIndex() &&
-               0 != ( pCNd = rPos1.nNode.GetNode().GetCntntNode() ) &&
+               0 != ( pCNd = rPos1.nNode.GetNode().GetContentNode() ) &&
                rPos1.nContent.GetIndex() == pCNd->Len();
     }
 
-    static bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
+    static bool lcl_AcceptRedline( SwRedlineTable& rArr, sal_uInt16& rPos,
                             bool bCallDelete,
                             const SwPosition* pSttRng = 0,
                             const SwPosition* pEndRng = 0 )
@@ -240,8 +240,8 @@ namespace
                 if( pDelStt && pDelEnd )
                 {
                     SwPaM aPam( *pDelStt, *pDelEnd );
-                    SwCntntNode* pCSttNd = pDelStt->nNode.GetNode().GetCntntNode();
-                    SwCntntNode* pCEndNd = pDelEnd->nNode.GetNode().GetCntntNode();
+                    SwContentNode* pCSttNd = pDelStt->nNode.GetNode().GetContentNode();
+                    SwContentNode* pCEndNd = pDelEnd->nNode.GetNode().GetContentNode();
 
                     if( bDelRedl )
                         delete pRedl;
@@ -280,7 +280,7 @@ namespace
         return bRet;
     }
 
-    static bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
+    static bool lcl_RejectRedline( SwRedlineTable& rArr, sal_uInt16& rPos,
                             bool bCallDelete,
                             const SwPosition* pSttRng = 0,
                             const SwPosition* pEndRng = 0 )
@@ -350,8 +350,8 @@ namespace
                 {
                     SwPaM aPam( *pDelStt, *pDelEnd );
 
-                    SwCntntNode* pCSttNd = pDelStt->nNode.GetNode().GetCntntNode();
-                    SwCntntNode* pCEndNd = pDelEnd->nNode.GetNode().GetCntntNode();
+                    SwContentNode* pCSttNd = pDelStt->nNode.GetNode().GetContentNode();
+                    SwContentNode* pCEndNd = pDelEnd->nNode.GetNode().GetContentNode();
 
                     if( bDelRedl )
                         delete pRedl;
@@ -484,14 +484,14 @@ namespace
         return bRet;
     }
 
-    typedef bool (*Fn_AcceptReject)( SwRedlineTbl& rArr, sal_uInt16& rPos,
+    typedef bool (*Fn_AcceptReject)( SwRedlineTable& rArr, sal_uInt16& rPos,
                             bool bCallDelete,
                             const SwPosition* pSttRng,
                             const SwPosition* pEndRng);
 
 
     static int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
-                                SwRedlineTbl& rArr, bool bCallDelete,
+                                SwRedlineTable& rArr, bool bCallDelete,
                                 const SwPaM& rPam)
     {
         sal_uInt16 n = 0;
@@ -545,7 +545,7 @@ namespace
                                                    : rPam.GetPoint();
         SwDoc* pDoc = rPam.GetDoc();
         if( !pStt->nContent.GetIndex() &&
-            !pDoc->GetNodes()[ pStt->nNode.GetIndex() - 1 ]->IsCntntNode() )
+            !pDoc->GetNodes()[ pStt->nNode.GetIndex() - 1 ]->IsContentNode() )
         {
             const SwRangeRedline* pRedl = pDoc->getIDocumentRedlineAccess().GetRedline( *pStt, 0 );
             if( pRedl )
@@ -556,9 +556,9 @@ namespace
                     *pStt = *pRStt;
             }
         }
-        if( pEnd->nNode.GetNode().IsCntntNode() &&
-            !pDoc->GetNodes()[ pEnd->nNode.GetIndex() + 1 ]->IsCntntNode() &&
-            pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetCntntNode()->Len()    )
+        if( pEnd->nNode.GetNode().IsContentNode() &&
+            !pDoc->GetNodes()[ pEnd->nNode.GetIndex() + 1 ]->IsContentNode() &&
+            pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetContentNode()->Len()    )
         {
             const SwRangeRedline* pRedl = pDoc->getIDocumentRedlineAccess().GetRedline( *pEnd, 0 );
             if( pRedl )
@@ -577,12 +577,12 @@ namespace sw
 
 DocumentRedlineManager::DocumentRedlineManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ),
                                                                     meRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)),
-                                                                    mpRedlineTbl( new SwRedlineTbl ),
-                                                                    mpExtraRedlineTbl ( new SwExtraRedlineTbl ),
-                                                                    mpAutoFmtRedlnComment( 0 ),
+                                                                    mpRedlineTable( new SwRedlineTable ),
+                                                                    mpExtraRedlineTable ( new SwExtraRedlineTable ),
+                                                                    mpAutoFormatRedlnComment( 0 ),
                                                                     mbIsRedlineMove(false),
                                                                     mbReadlineChecked(false),
-                                                                    mnAutoFmtRedlnCommentNo( 0 )
+                                                                    mnAutoFormatRedlnCommentNo( 0 )
 {
 }
 
@@ -627,12 +627,12 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode )
             if (pFnc)
             {
                 for (sal_uInt16 nLoop = 1; nLoop <= 2; ++nLoop)
-                    for (size_t i = 0; i < mpRedlineTbl->size(); ++i)
-                        ((*mpRedlineTbl)[i]->*pFnc)(nLoop, i);
+                    for (size_t i = 0; i < mpRedlineTable->size(); ++i)
+                        ((*mpRedlineTable)[i]->*pFnc)(nLoop, i);
 
                 //SwRangeRedline::MoveFromSection routinely changes
-                //the keys that mpRedlineTbl is sorted by
-                mpRedlineTbl->Resort();
+                //the keys that mpRedlineTable is sorted by
+                mpRedlineTable->Resort();
             }
 
             CheckAnchoredFlyConsistency(m_rDoc);
@@ -643,7 +643,7 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode )
         m_rDoc.getIDocumentState().SetModified();
     }
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::IsRedlineOn() const
@@ -661,29 +661,29 @@ void DocumentRedlineManager::SetRedlineMode_intern(RedlineMode_t eMode)
     meRedlineMode = eMode;
 }
 
-const SwRedlineTbl& DocumentRedlineManager::GetRedlineTbl() const
+const SwRedlineTable& DocumentRedlineManager::GetRedlineTable() const
 {
-    return *mpRedlineTbl;
+    return *mpRedlineTable;
 }
 
-SwRedlineTbl& DocumentRedlineManager::GetRedlineTbl()
+SwRedlineTable& DocumentRedlineManager::GetRedlineTable()
 {
-    return *mpRedlineTbl;
+    return *mpRedlineTable;
 }
 
-const SwExtraRedlineTbl& DocumentRedlineManager::GetExtraRedlineTbl() const
+const SwExtraRedlineTable& DocumentRedlineManager::GetExtraRedlineTable() const
 {
-    return *mpExtraRedlineTbl;
+    return *mpExtraRedlineTable;
 }
 
-SwExtraRedlineTbl& DocumentRedlineManager::GetExtraRedlineTbl()
+SwExtraRedlineTable& DocumentRedlineManager::GetExtraRedlineTable()
 {
-    return *mpExtraRedlineTbl;
+    return *mpExtraRedlineTable;
 }
 
-bool DocumentRedlineManager::HasExtraRedlineTbl() const
+bool DocumentRedlineManager::HasExtraRedlineTable() const
 {
-    return mpExtraRedlineTbl != nullptr;
+    return mpExtraRedlineTable != nullptr;
 }
 
 bool DocumentRedlineManager::IsInRedlines(const SwNode & rNode) const
@@ -739,13 +739,13 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
     {
         pNewRedl->InvalidateRange();
 
-        if( m_rDoc.IsAutoFmtRedline() )
+        if( m_rDoc.IsAutoFormatRedline() )
         {
-            pNewRedl->SetAutoFmtFlag();
-            if( mpAutoFmtRedlnComment && !mpAutoFmtRedlnComment->isEmpty() )
+            pNewRedl->SetAutoFormatFlag();
+            if( mpAutoFormatRedlnComment && !mpAutoFormatRedlnComment->isEmpty() )
             {
-                pNewRedl->SetComment( *mpAutoFmtRedlnComment );
-                pNewRedl->SetSeqNo( mnAutoFmtRedlnCommentNo );
+                pNewRedl->SetComment( *mpAutoFormatRedlnComment );
+                pNewRedl->SetSeqNo( mnAutoFormatRedlnCommentNo );
             }
         }
 
@@ -753,8 +753,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                   * pEnd = pStt == pNewRedl->GetPoint() ? pNewRedl->GetMark()
                                                         : pNewRedl->GetPoint();
         {
-            SwTxtNode* pTxtNode = pStt->nNode.GetNode().GetTxtNode();
-            if( pTxtNode == NULL )
+            SwTextNode* pTextNode = pStt->nNode.GetNode().GetTextNode();
+            if( pTextNode == NULL )
             {
                 if( pStt->nContent > 0 )
                 {
@@ -764,14 +764,14 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
             }
             else
             {
-                if( pStt->nContent > pTxtNode->Len() )
+                if( pStt->nContent > pTextNode->Len() )
                 {
                     OSL_ENSURE( false, "Redline start: index after text" );
-                    pStt->nContent = pTxtNode->Len();
+                    pStt->nContent = pTextNode->Len();
                 }
             }
-            pTxtNode = pEnd->nNode.GetNode().GetTxtNode();
-            if( pTxtNode == NULL )
+            pTextNode = pEnd->nNode.GetNode().GetTextNode();
+            if( pTextNode == NULL )
             {
                 if( pEnd->nContent > 0 )
                 {
@@ -781,10 +781,10 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
             }
             else
             {
-                if( pEnd->nContent > pTxtNode->Len() )
+                if( pEnd->nContent > pTextNode->Len() )
                 {
                     OSL_ENSURE( false, "Redline end: index after text" );
-                    pEnd->nContent = pTxtNode->Len();
+                    pEnd->nContent = pTextNode->Len();
                 }
             }
         }
@@ -801,11 +801,11 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
             --n;
         bool bDec = false;
 
-        for( ; pNewRedl && n < mpRedlineTbl->size(); bDec ? n : ++n )
+        for( ; pNewRedl && n < mpRedlineTable->size(); bDec ? n : ++n )
         {
             bDec = false;
 
-            SwRangeRedline* pRedl = (*mpRedlineTbl)[ n ];
+            SwRangeRedline* pRedl = (*mpRedlineTable)[ n ];
             SwPosition* pRStt = pRedl->Start(),
                       * pREnd = pRStt == pRedl->GetPoint() ? pRedl->GetMark()
                                                            : pRedl->GetPoint();
@@ -814,7 +814,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
             if( ( *pRStt == *pREnd ) &&
                 ( pRedl->GetContentIdx() == NULL ) )
             {
-                mpRedlineTbl->DeleteAndDestroy(n);
+                mpRedlineTable->DeleteAndDestroy(n);
                 continue;
             }
 
@@ -836,16 +836,16 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                              ( POS_COLLIDE_START == eCmpPos ) ||
                              ( POS_OVERLAP_BEHIND == eCmpPos ) ) &&
                             pRedl->CanCombine( *pNewRedl ) &&
-                            ( n+1 >= (sal_uInt16)mpRedlineTbl->size() ||
-                             ( *(*mpRedlineTbl)[ n+1 ]->Start() >= *pEnd &&
-                             *(*mpRedlineTbl)[ n+1 ]->Start() != *pREnd ) ) )
+                            ( n+1 >= (sal_uInt16)mpRedlineTable->size() ||
+                             ( *(*mpRedlineTable)[ n+1 ]->Start() >= *pEnd &&
+                             *(*mpRedlineTable)[ n+1 ]->Start() != *pREnd ) ) )
                         {
                             pRedl->SetEnd( *pEnd, pREnd );
                             if( !pRedl->HasValidRange() )
                             {
                                 // re-insert
-                                mpRedlineTbl->Remove( n );
-                                mpRedlineTbl->Insert( pRedl );
+                                mpRedlineTable->Remove( n );
+                                mpRedlineTable->Insert( pRedl );
                             }
 
                             bMerged = true;
@@ -857,12 +857,12 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                   ( POS_OVERLAP_BEFORE == eCmpPos ) ) &&
                             pRedl->CanCombine( *pNewRedl ) &&
                             ( !n ||
-                             *(*mpRedlineTbl)[ n-1 ]->End() != *pRStt ))
+                             *(*mpRedlineTable)[ n-1 ]->End() != *pRStt ))
                         {
                             pRedl->SetStart( *pStt, pRStt );
                             // re-insert
-                            mpRedlineTbl->Remove( n );
-                            mpRedlineTbl->Insert( pRedl );
+                            mpRedlineTable->Remove( n );
+                            mpRedlineTable->Insert( pRedl );
 
                             bMerged = true;
                             bDelete = true;
@@ -871,7 +871,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         {
                             // own insert-over-insert redlines:
                             // just scrap the inside ones
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         else if( POS_OVERLAP_BEHIND == eCmpPos )
@@ -904,20 +904,20 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         {
                             SwRangeRedline* pCpy = new SwRangeRedline( *pRedl );
                             pCpy->SetStart( *pEnd );
-                            mpRedlineTbl->Insert( pCpy );
+                            mpRedlineTable->Insert( pCpy );
                         }
                         pRedl->SetEnd( *pStt, pREnd );
                         if( ( *pStt == *pRStt ) &&
                             ( pRedl->GetContentIdx() == NULL ) )
                         {
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         else if( !pRedl->HasValidRange() )
                         {
                             // re-insert
-                            mpRedlineTbl->Remove( n );
-                            mpRedlineTbl->Insert( pRedl );
+                            mpRedlineTable->Remove( n );
+                            mpRedlineTable->Insert( pRedl );
                         }
                     }
                     else if ( POS_OUTSIDE == eCmpPos )
@@ -930,7 +930,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         SwRangeRedline* pSplit = new SwRangeRedline( *pNewRedl );
                         pSplit->SetEnd( *pRStt );
                         pNewRedl->SetStart( *pREnd );
-                        mpRedlineTbl->Insert( pSplit );
+                        mpRedlineTable->Insert( pSplit );
                         if( *pStt == *pEnd && pNewRedl->GetContentIdx() == NULL )
                         {
                             delete pNewRedl;
@@ -964,20 +964,20 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         {
                             SwRangeRedline* pCpy = new SwRangeRedline( *pRedl );
                             pCpy->SetStart( *pEnd );
-                            mpRedlineTbl->Insert( pCpy );
+                            mpRedlineTable->Insert( pCpy );
                         }
                         pRedl->SetEnd( *pStt, pREnd );
                         if( ( *pStt == *pRStt ) &&
                             ( pRedl->GetContentIdx() == NULL ) )
                         {
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         else if( !pRedl->HasValidRange() )
                         {
                             // re-insert
-                            mpRedlineTbl->Remove( n );
-                            mpRedlineTbl->Insert( pRedl, n );
+                            mpRedlineTable->Remove( n );
+                            mpRedlineTable->Insert( pRedl, n );
                         }
                     }
                     else if ( POS_OUTSIDE == eCmpPos )
@@ -990,7 +990,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         SwRangeRedline* pSplit = new SwRangeRedline( *pNewRedl );
                         pSplit->SetEnd( *pRStt );
                         pNewRedl->SetStart( *pREnd );
-                        mpRedlineTbl->Insert( pSplit );
+                        mpRedlineTable->Insert( pSplit );
                         if( *pStt == *pEnd && pNewRedl->GetContentIdx() == NULL )
                         {
                             delete pNewRedl;
@@ -1002,7 +1002,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     {
                         // handle identical redlines in broken documents
                         // delete old (delete) redline
-                        mpRedlineTbl->DeleteAndDestroy( n );
+                        mpRedlineTable->DeleteAndDestroy( n );
                         bDec = true;
                     }
                     else if ( POS_OVERLAP_BEHIND == eCmpPos )
@@ -1016,8 +1016,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     case POS_OVERLAP_BEFORE:
                         pRedl->SetStart( *pEnd, pRStt );
                         // re-insert
-                        mpRedlineTbl->Remove( n );
-                        mpRedlineTbl->Insert( pRedl, n );
+                        mpRedlineTable->Remove( n );
+                        mpRedlineTable->Insert( pRedl, n );
                         bDec = true;
                         break;
 
@@ -1025,7 +1025,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         pRedl->SetEnd( *pStt, pREnd );
                         if( *pStt == *pRStt && pRedl->GetContentIdx() == NULL )
                         {
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         break;
@@ -1034,7 +1034,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     case POS_OUTSIDE:
                         // Overlaps the current one completely or has the
                         // same dimension, delete the old one
-                        mpRedlineTbl->DeleteAndDestroy( n );
+                        mpRedlineTable->DeleteAndDestroy( n );
                         bDec = true;
                         break;
 
@@ -1049,7 +1049,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 pNew->SetStart( *pEnd );
                                 pRedl->SetEnd( *pStt, pREnd );
                                 if( *pStt == *pRStt && pRedl->GetContentIdx() == NULL )
-                                    mpRedlineTbl->DeleteAndDestroy( n );
+                                    mpRedlineTable->DeleteAndDestroy( n );
                                 AppendRedline( pNew, bCallDelete );
                                 n = 0;      // re-initialize
                                 bDec = true;
@@ -1108,7 +1108,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 pNewRedl->SetStart( *pRStt, pStt );
                             else
                                 pNewRedl->SetEnd( *pREnd, pEnd );
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         else if( POS_OVERLAP_BEHIND == eCmpPos )
@@ -1127,9 +1127,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 // Before we can merge, we make it visible!
                                 // We insert temporarily so that pNew is
                                 // also dealt with when moving the indices.
-                                mpRedlineTbl->Insert(pNewRedl);
-                                pRedl->Show(0, mpRedlineTbl->GetPos(pRedl));
-                                mpRedlineTbl->Remove( pNewRedl );
+                                mpRedlineTable->Insert(pNewRedl);
+                                pRedl->Show(0, mpRedlineTable->GetPos(pRedl));
+                                mpRedlineTable->Remove( pNewRedl );
                                 pRStt = pRedl->Start();
                                 pREnd = pRedl->End();
                             }
@@ -1159,7 +1159,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 bDec = true;
                             }
 
-                            mpRedlineTbl->DeleteAndDestroy( nToBeDeleted );
+                            mpRedlineTable->DeleteAndDestroy( nToBeDeleted );
                         }
                         break;
                     default:
@@ -1183,7 +1183,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         {
                         case POS_EQUAL:
                             bCompress = true;
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                             // no break!
 
@@ -1203,7 +1203,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 {
                                     pEnd->nNode--;
                                     pEnd->nContent.Assign(
-                                        pEnd->nNode.GetNode().GetTxtNode(), 0);
+                                        pEnd->nNode.GetNode().GetTextNode(), 0);
                                     m_rDoc.getIDocumentContentOperations().DelFullPara( *pNewRedl );
                                 }
                                 else
@@ -1216,15 +1216,15 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
 
                         case POS_OUTSIDE:
                             {
-                                mpRedlineTbl->Remove( n );
+                                mpRedlineTable->Remove( n );
                                 bDec = true;
                                 // We insert temporarily so that pNew is
                                 // also dealt with when moving the indices.
                                 if( bCallDelete )
                                 {
-                                    mpRedlineTbl->Insert( pNewRedl );
+                                    mpRedlineTable->Insert( pNewRedl );
                                     m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pRedl );
-                                    if( !mpRedlineTbl->Remove( pNewRedl ) )
+                                    if( !mpRedlineTable->Remove( pNewRedl ) )
                                         pNewRedl = 0;
                                 }
                                 delete pRedl;
@@ -1236,22 +1236,22 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 SwPaM aPam( *pRStt, *pEnd );
 
                                 if( *pEnd == *pREnd )
-                                    mpRedlineTbl->DeleteAndDestroy( n );
+                                    mpRedlineTable->DeleteAndDestroy( n );
                                 else
                                 {
                                     pRedl->SetStart( *pEnd, pRStt );
                                     // re-insert
-                                    mpRedlineTbl->Remove( n );
-                                    mpRedlineTbl->Insert( pRedl, n );
+                                    mpRedlineTable->Remove( n );
+                                    mpRedlineTable->Insert( pRedl, n );
                                 }
 
                                 if( bCallDelete )
                                 {
                                     // We insert temporarily so that pNew is
                                     // also dealt with when moving the indices.
-                                    mpRedlineTbl->Insert( pNewRedl );
+                                    mpRedlineTable->Insert( pNewRedl );
                                     m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
-                                    if( !mpRedlineTbl->Remove( pNewRedl ) )
+                                    if( !mpRedlineTable->Remove( pNewRedl ) )
                                         pNewRedl = 0;
                                     n = 0;      // re-initialize
                                 }
@@ -1265,7 +1265,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
 
                                 if( *pStt == *pRStt )
                                 {
-                                    mpRedlineTbl->DeleteAndDestroy( n );
+                                    mpRedlineTable->DeleteAndDestroy( n );
                                     bDec = true;
                                 }
                                 else
@@ -1275,9 +1275,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 {
                                     // We insert temporarily so that pNew is
                                     // also dealt with when moving the indices.
-                                    mpRedlineTbl->Insert( pNewRedl );
+                                    mpRedlineTable->Insert( pNewRedl );
                                     m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
-                                    if( !mpRedlineTbl->Remove( pNewRedl ) )
+                                    if( !mpRedlineTable->Remove( pNewRedl ) )
                                         pNewRedl = 0;
                                     n = 0;      // re-initialize
                                     bDec = true;
@@ -1306,7 +1306,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 delete pNewRedl, pNewRedl = 0;
                                 if( IsHideChanges( meRedlineMode ))
                                 {
-                                    pRedl->Hide(0, mpRedlineTbl->GetPos(pRedl));
+                                    pRedl->Hide(0, mpRedlineTable->GetPos(pRedl));
                                 }
                                 bCompress = true;
                             }
@@ -1323,8 +1323,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                         pNewRedl->PushData( *pRedl, false );
                                         pRedl->SetStart( *pEnd, pRStt );
                                         // re-insert
-                                        mpRedlineTbl->Remove( n );
-                                        mpRedlineTbl->Insert( pRedl, n );
+                                        mpRedlineTable->Remove( n );
+                                        mpRedlineTable->Insert( pRedl, n );
                                         bDec = true;
                                     }
                                 }
@@ -1340,8 +1340,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                     if( !pRedl->HasValidRange() )
                                     {
                                         // re-insert
-                                        mpRedlineTbl->Remove( n );
-                                        mpRedlineTbl->Insert( pRedl, n );
+                                        mpRedlineTable->Remove( n );
+                                        mpRedlineTable->Insert( pRedl, n );
                                     }
                                 }
                             }
@@ -1370,9 +1370,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                     pNewRedl->SetEnd( *pRStt, pEnd );
                                     if( IsHideChanges( meRedlineMode ))
                                     {
-                                        mpRedlineTbl->Insert(pNewRedl);
-                                        pRedl->Hide(0, mpRedlineTbl->GetPos(pRedl));
-                                        mpRedlineTbl->Remove( pNewRedl );
+                                        mpRedlineTable->Insert(pNewRedl);
+                                        pRedl->Hide(0, mpRedlineTable->GetPos(pRedl));
+                                        mpRedlineTable->Remove( pNewRedl );
                                     }
                                 }
                                 else
@@ -1383,8 +1383,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                     pNewRedl->SetEnd( *pRStt, pEnd );
                                     pRedl->SetStart( *pNew->End(), pRStt ) ;
                                     // re-insert
-                                    mpRedlineTbl->Remove( n );
-                                    mpRedlineTbl->Insert( pRedl );
+                                    mpRedlineTable->Remove( n );
+                                    mpRedlineTable->Insert( pRedl );
                                     bDec = true;
                                 }
                             }
@@ -1398,9 +1398,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                     pNewRedl->SetStart( *pREnd, pStt );
                                     if( IsHideChanges( meRedlineMode ))
                                     {
-                                        mpRedlineTbl->Insert( pNewRedl );
-                                        pRedl->Hide(0, mpRedlineTbl->GetPos(pRedl));
-                                        mpRedlineTbl->Remove( pNewRedl );
+                                        mpRedlineTable->Insert( pNewRedl );
+                                        pRedl->Hide(0, mpRedlineTable->GetPos(pRedl));
+                                        mpRedlineTable->Remove( pNewRedl );
                                     }
                                 }
                                 else
@@ -1413,8 +1413,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                     if( !pRedl->HasValidRange() )
                                     {
                                         // re-insert
-                                        mpRedlineTbl->Remove( n );
-                                        mpRedlineTbl->Insert( pRedl );
+                                        mpRedlineTable->Remove( n );
+                                        mpRedlineTable->Insert( pRedl );
                                     }
                                 }
                             }
@@ -1426,7 +1426,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         // insert the pNew part (if it exists)
                         if( pNew )
                         {
-                            mpRedlineTbl->Insert( pNew );
+                            mpRedlineTable->Insert( pNew );
 
                             // pNew must be deleted if Insert() wasn't
                             // successful. But that can't happen, since pNew is
@@ -1447,8 +1447,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     case POS_OVERLAP_BEFORE:
                         pRedl->SetStart( *pEnd, pRStt );
                         // re-insert
-                        mpRedlineTbl->Remove( n );
-                        mpRedlineTbl->Insert( pRedl, n );
+                        mpRedlineTable->Remove( n );
+                        mpRedlineTable->Insert( pRedl, n );
                         bDec = true;
                         break;
 
@@ -1460,7 +1460,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     case POS_OUTSIDE:
                         // Overlaps the current one completely or has the
                         // same dimension, delete the old one
-                        mpRedlineTbl->DeleteAndDestroy( n );
+                        mpRedlineTable->DeleteAndDestroy( n );
                         bDec = true;
                         break;
 
@@ -1476,7 +1476,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 pRedl->SetEnd( *pStt, pREnd );
                                 if( ( *pStt == *pRStt ) &&
                                     ( pRedl->GetContentIdx() == NULL ) )
-                                    mpRedlineTbl->DeleteAndDestroy( n );
+                                    mpRedlineTable->DeleteAndDestroy( n );
                                 AppendRedline( pNew, bCallDelete );
                                 n = 0;      // re-initialize
                                 bDec = true;
@@ -1544,7 +1544,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         {
                             // Overlaps the current one completely or has the
                             // same dimension, delete the old one
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         break;
@@ -1563,8 +1563,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                             // or else only shorten the current one
                             pRedl->SetStart( *pEnd, pRStt );
                             // re-insert
-                            mpRedlineTbl->Remove( n );
-                            mpRedlineTbl->Insert( pRedl, n );
+                            mpRedlineTable->Remove( n );
+                            mpRedlineTable->Insert( pRedl, n );
                             bDec = true;
                         }
                         else
@@ -1591,7 +1591,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                                 pNewRedl->SetStart( *pRStt, pStt );
                             else
                                 pNewRedl->SetEnd( *pREnd, pEnd );
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = false;
                         }
                         else if( POS_OVERLAP_BEHIND == eCmpPos )
@@ -1603,25 +1603,25 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                     case POS_COLLIDE_END:
                         if( pRedl->IsOwnRedline( *pNewRedl ) &&
                             pRedl->CanCombine( *pNewRedl ) && n &&
-                            *(*mpRedlineTbl)[ n-1 ]->End() < *pStt )
+                            *(*mpRedlineTable)[ n-1 ]->End() < *pStt )
                         {
                             // If that's the case we can merge it, meaning
                             // the new one covers this well
                             pNewRedl->SetEnd( *pREnd, pEnd );
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         break;
                     case POS_COLLIDE_START:
                         if( pRedl->IsOwnRedline( *pNewRedl ) &&
                             pRedl->CanCombine( *pNewRedl ) &&
-                            n+1 < (sal_uInt16)mpRedlineTbl->size() &&
-                            *(*mpRedlineTbl)[ n+1 ]->Start() < *pEnd )
+                            n+1 < (sal_uInt16)mpRedlineTable->size() &&
+                            *(*mpRedlineTable)[ n+1 ]->Start() < *pEnd )
                         {
                             // If that's the case we can merge it, meaning
                             // the new one covers this well
                             pNewRedl->SetStart( *pRStt, pStt );
-                            mpRedlineTbl->DeleteAndDestroy( n );
+                            mpRedlineTable->DeleteAndDestroy( n );
                             bDec = true;
                         }
                         break;
@@ -1652,7 +1652,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                 pNewRedl = 0;
             }
             else
-                mpRedlineTbl->Insert( pNewRedl );
+                mpRedlineTable->Insert( pNewRedl );
         }
 
         if( bCompress )
@@ -1695,7 +1695,7 @@ bool DocumentRedlineManager::AppendTableRowRedline( SwTableRowRedline* pNewRedl,
 
         // Make equivalent of 'AppendRedline' checks inside here too
 
-        mpExtraRedlineTbl->Insert( pNewRedl );
+        mpExtraRedlineTable->Insert( pNewRedl );
     }
     else
     {
@@ -1740,7 +1740,7 @@ bool DocumentRedlineManager::AppendTableCellRedline( SwTableCellRedline* pNewRed
 
         // Make equivalent of 'AppendRedline' checks inside here too
 
-        mpExtraRedlineTbl->Insert( pNewRedl );
+        mpExtraRedlineTable->Insert( pNewRedl );
     }
     else
     {
@@ -1782,10 +1782,10 @@ void DocumentRedlineManager::CompressRedlines()
     }
 
     // Try to merge identical ones
-    for( sal_uInt16 n = 1; n < mpRedlineTbl->size(); ++n )
+    for( sal_uInt16 n = 1; n < mpRedlineTable->size(); ++n )
     {
-        SwRangeRedline* pPrev = (*mpRedlineTbl)[ n-1 ],
-                    * pCur = (*mpRedlineTbl)[ n ];
+        SwRangeRedline* pPrev = (*mpRedlineTable)[ n-1 ],
+                    * pCur = (*mpRedlineTable)[ n ];
         const SwPosition* pPrevStt = pPrev->Start(),
                         * pPrevEnd = pPrevStt == pPrev->GetPoint()
                             ? pPrev->GetMark() : pPrev->GetPoint();
@@ -1803,7 +1803,7 @@ void DocumentRedlineManager::CompressRedlines()
             pCur->Show(0, n);
 
             pPrev->SetEnd( *pCur->End() );
-            mpRedlineTbl->DeleteAndDestroy( n );
+            mpRedlineTable->DeleteAndDestroy( n );
             --n;
             if( pFnc )
                 (pPrev->*pFnc)(0, nPrevIndex);
@@ -1811,7 +1811,7 @@ void DocumentRedlineManager::CompressRedlines()
     }
     _CHECK_REDLINE( *this )
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange )
@@ -1821,9 +1821,9 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange )
     const SwPosition* pStt = rRange.Start();
     const SwPosition* pEnd = rRange.End();
     GetRedline( *pStt, &n );
-    for ( ; n < mpRedlineTbl->size(); ++n)
+    for ( ; n < mpRedlineTable->size(); ++n)
     {
-        SwRangeRedline * pRedline = (*mpRedlineTbl)[ n ];
+        SwRangeRedline * pRedline = (*mpRedlineTable)[ n ];
         SwPosition *const pRedlineStart = pRedline->Start();
         SwPosition *const pRedlineEnd = pRedline->End();
         if (*pRedlineStart <= *pStt && *pStt <= *pRedlineEnd &&
@@ -1855,25 +1855,25 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange )
 
             case 3:
                 pRedline->InvalidateRange();
-                mpRedlineTbl->DeleteAndDestroy( n-- );
+                mpRedlineTable->DeleteAndDestroy( n-- );
                 pRedline = nullptr;
                 break;
             }
             if (pRedline && !pRedline->HasValidRange())
             {
                 // re-insert
-                mpRedlineTbl->Remove( n );
-                mpRedlineTbl->Insert( pRedline, n );
+                mpRedlineTable->Remove( n );
+                mpRedlineTable->Insert( pRedline, n );
             }
             if( pNew )
-                mpRedlineTbl->Insert( pNew, n );
+                mpRedlineTable->Insert( pNew, n );
         }
         else if (*pEnd < *pRedlineStart)
             break;
     }
     return bChg;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo,
@@ -1901,9 +1901,9 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
                                                        : rRange.GetPoint();
     sal_uInt16 n = 0;
     GetRedline( *pStt, &n );
-    for( ; n < mpRedlineTbl->size() ; ++n )
+    for( ; n < mpRedlineTable->size() ; ++n )
     {
-        SwRangeRedline* pRedl = (*mpRedlineTbl)[ n ];
+        SwRangeRedline* pRedl = (*mpRedlineTable)[ n ];
         if( USHRT_MAX != nDelType && nDelType != pRedl->GetType() )
             continue;
 
@@ -1915,7 +1915,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
         case POS_EQUAL:
         case POS_OUTSIDE:
             pRedl->InvalidateRange();
-            mpRedlineTbl->DeleteAndDestroy( n-- );
+            mpRedlineTable->DeleteAndDestroy( n-- );
             bChg = true;
             break;
 
@@ -1923,8 +1923,8 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
                 pRedl->InvalidateRange();
                 pRedl->SetStart( *pEnd, pRStt );
                 // re-insert
-                mpRedlineTbl->Remove( n );
-                mpRedlineTbl->Insert( pRedl );
+                mpRedlineTable->Remove( n );
+                mpRedlineTable->Insert( pRedl );
                 --n;
             break;
 
@@ -1934,8 +1934,8 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
                 if( !pRedl->HasValidRange() )
                 {
                     // re-insert
-                    mpRedlineTbl->Remove( n );
-                    mpRedlineTbl->Insert( pRedl );
+                    mpRedlineTable->Remove( n );
+                    mpRedlineTable->Insert( pRedl );
                     --n;
                 }
             break;
@@ -1948,8 +1948,8 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
                 {
                     pRedl->SetStart( *pEnd, pRStt );
                     // re-insert
-                    mpRedlineTbl->Remove( n );
-                    mpRedlineTbl->Insert( pRedl );
+                    mpRedlineTable->Remove( n );
+                    mpRedlineTable->Insert( pRedl );
                     --n;
                 }
                 else
@@ -1966,19 +1966,19 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
                     if( !pRedl->HasValidRange() )
                     {
                         // re-insert
-                        mpRedlineTbl->Remove( n );
-                        mpRedlineTbl->Insert( pRedl );
+                        mpRedlineTable->Remove( n );
+                        mpRedlineTable->Insert( pRedl );
                         --n;
                     }
                     if( pCpy )
-                        mpRedlineTbl->Insert( pCpy );
+                        mpRedlineTable->Insert( pCpy );
                 }
             }
             break;
 
         case POS_COLLIDE_END:
         case POS_BEFORE:
-            n = mpRedlineTbl->size();
+            n = mpRedlineTable->size();
             break;
         default:
             break;
@@ -1990,7 +1990,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
 
     return bChg;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::DeleteRedline( const SwStartNode& rNode, bool bSaveInUndo,
@@ -2003,9 +2003,9 @@ bool DocumentRedlineManager::DeleteRedline( const SwStartNode& rNode, bool bSave
 sal_uInt16 DocumentRedlineManager::GetRedlinePos( const SwNode& rNd, sal_uInt16 nType ) const
 {
     const sal_uLong nNdIdx = rNd.GetIndex();
-    for( sal_uInt16 n = 0; n < mpRedlineTbl->size() ; ++n )
+    for( sal_uInt16 n = 0; n < mpRedlineTable->size() ; ++n )
     {
-        const SwRangeRedline* pTmp = (*mpRedlineTbl)[ n ];
+        const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
         sal_uLong nPt = pTmp->GetPoint()->nNode.GetIndex(),
               nMk = pTmp->GetMark()->nNode.GetIndex();
         if( nPt < nMk ) { long nTmp = nMk; nMk = nPt; nPt = nTmp; }
@@ -2019,20 +2019,20 @@ sal_uInt16 DocumentRedlineManager::GetRedlinePos( const SwNode& rNd, sal_uInt16
     }
     return USHRT_MAX;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos,
                                     sal_uInt16* pFndPos ) const
 {
-    sal_uInt16 nO = mpRedlineTbl->size(), nM, nU = 0;
+    sal_uInt16 nO = mpRedlineTable->size(), nM, nU = 0;
     if( nO > 0 )
     {
         nO--;
         while( nU <= nO )
         {
             nM = nU + ( nO - nU ) / 2;
-            const SwRangeRedline* pRedl = (*mpRedlineTbl)[ nM ];
+            const SwRangeRedline* pRedl = (*mpRedlineTable)[ nM ];
             const SwPosition* pStt = pRedl->Start();
             const SwPosition* pEnd = pStt == pRedl->GetPoint()
                                         ? pRedl->GetMark()
@@ -2041,11 +2041,11 @@ const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos
                     ? *pStt == rPos
                     : ( *pStt <= rPos && rPos < *pEnd ) )
             {
-                while( nM && rPos == *(*mpRedlineTbl)[ nM - 1 ]->End() &&
-                    rPos == *(*mpRedlineTbl)[ nM - 1 ]->Start() )
+                while( nM && rPos == *(*mpRedlineTable)[ nM - 1 ]->End() &&
+                    rPos == *(*mpRedlineTable)[ nM - 1 ]->Start() )
                 {
                     --nM;
-                    pRedl = (*mpRedlineTbl)[ nM ];
+                    pRedl = (*mpRedlineTable)[ nM ];
                 }
                 // if there are format and insert changes in the same position
                 // show insert change first.
@@ -2053,19 +2053,19 @@ const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos
                 // before and after the current redline
                 if( nsRedlineType_t::REDLINE_FORMAT == pRedl->GetType() )
                 {
-                    if( nM && rPos >= *(*mpRedlineTbl)[ nM - 1 ]->Start() &&
-                        rPos <= *(*mpRedlineTbl)[ nM - 1 ]->End() &&
-                        ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTbl)[ nM - 1 ]->GetType() ) )
+                    if( nM && rPos >= *(*mpRedlineTable)[ nM - 1 ]->Start() &&
+                        rPos <= *(*mpRedlineTable)[ nM - 1 ]->End() &&
+                        ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTable)[ nM - 1 ]->GetType() ) )
                     {
                         --nM;
-                        pRedl = (*mpRedlineTbl)[ nM ];
+                        pRedl = (*mpRedlineTable)[ nM ];
                     }
-                    else if( ( nM + 1 ) <= nO && rPos >= *(*mpRedlineTbl)[ nM + 1 ]->Start() &&
-                        rPos <= *(*mpRedlineTbl)[ nM + 1 ]->End() &&
-                        ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTbl)[ nM + 1 ]->GetType() ) )
+                    else if( ( nM + 1 ) <= nO && rPos >= *(*mpRedlineTable)[ nM + 1 ]->Start() &&
+                        rPos <= *(*mpRedlineTable)[ nM + 1 ]->End() &&
+                        ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTable)[ nM + 1 ]->GetType() ) )
                     {
                         ++nM;
-                        pRedl = (*mpRedlineTbl)[ nM ];
+                        pRedl = (*mpRedlineTable)[ nM ];
                     }
                 }
 
@@ -2089,7 +2089,7 @@ const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos
         *pFndPos = nU;
     return 0;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
@@ -2101,7 +2101,7 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
         (nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) )
       SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | meRedlineMode));
 
-    SwRangeRedline* pTmp = (*mpRedlineTbl)[ nPos ];
+    SwRangeRedline* pTmp = (*mpRedlineTable)[ nPos ];
     if( pTmp->HasMark() && pTmp->IsVisible() )
     {
         if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -2123,19 +2123,19 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
 
-            bRet |= lcl_AcceptRedline( *mpRedlineTbl, nPos, bCallDelete );
+            bRet |= lcl_AcceptRedline( *mpRedlineTable, nPos, bCallDelete );
 
             if( nSeqNo )
             {
                 if( USHRT_MAX == nPos )
                     nPos = 0;
                 sal_uInt16 nFndPos = 2 == nLoopCnt
-                                    ? mpRedlineTbl->FindNextSeqNo( nSeqNo, nPos )
-                                    : mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos );
+                                    ? mpRedlineTable->FindNextSeqNo( nSeqNo, nPos )
+                                    : mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos );
                 if( USHRT_MAX != nFndPos || ( 0 != ( --nLoopCnt ) &&
                     USHRT_MAX != ( nFndPos =
-                        mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos ))) )
-                    pTmp = (*mpRedlineTbl)[ nPos = nFndPos ];
+                        mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos ))) )
+                    pTmp = (*mpRedlineTable)[ nPos = nFndPos ];
                 else
                     nLoopCnt = 0;
             }
@@ -2157,7 +2157,7 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
     }
     return bRet;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete )
@@ -2179,7 +2179,7 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete
         m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoAcceptRedline( aPam ));
     }
 
-    int nRet = lcl_AcceptRejectRedl( lcl_AcceptRedline, *mpRedlineTbl,
+    int nRet = lcl_AcceptRejectRedl( lcl_AcceptRedline, *mpRedlineTable,
                                      bCallDelete, aPam );
     if( nRet > 0 )
     {
@@ -2203,7 +2203,7 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete
     }
     return nRet != 0;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
@@ -2215,7 +2215,7 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
         (nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) )
       SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | meRedlineMode));
 
-    SwRangeRedline* pTmp = (*mpRedlineTbl)[ nPos ];
+    SwRangeRedline* pTmp = (*mpRedlineTable)[ nPos ];
     if( pTmp->HasMark() && pTmp->IsVisible() )
     {
         if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -2237,19 +2237,19 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
 
-            bRet |= lcl_RejectRedline( *mpRedlineTbl, nPos, bCallDelete );
+            bRet |= lcl_RejectRedline( *mpRedlineTable, nPos, bCallDelete );
 
             if( nSeqNo )
             {
                 if( USHRT_MAX == nPos )
                     nPos = 0;
                 sal_uInt16 nFndPos = 2 == nLoopCnt
-                                    ? mpRedlineTbl->FindNextSeqNo( nSeqNo, nPos )
-                                    : mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos );
+                                    ? mpRedlineTable->FindNextSeqNo( nSeqNo, nPos )
+                                    : mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos );
                 if( USHRT_MAX != nFndPos || ( 0 != ( --nLoopCnt ) &&
                     USHRT_MAX != ( nFndPos =
-                            mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos ))) )
-                    pTmp = (*mpRedlineTbl)[ nPos = nFndPos ];
+                            mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos ))) )
+                    pTmp = (*mpRedlineTable)[ nPos = nFndPos ];
                 else
                     nLoopCnt = 0;
             }
@@ -2271,7 +2271,7 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
     }
     return bRet;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete )
@@ -2293,7 +2293,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete
         m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoRejectRedline(aPam) );
     }
 
-    int nRet = lcl_AcceptRejectRedl( lcl_RejectRedline, *mpRedlineTbl,
+    int nRet = lcl_AcceptRejectRedl( lcl_RejectRedline, *mpRedlineTable,
                                         bCallDelete, aPam );
     if( nRet > 0 )
     {
@@ -2318,7 +2318,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete
 
     return nRet != 0;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) const
@@ -2333,14 +2333,14 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
     // If the starting position points to the last valid ContentNode,
     // we take the next Redline in any case.
     sal_uInt16 n = 0;
-    const SwRangeRedline* pFnd = GetRedlineTbl().FindAtPosition( rSttPos, n, true );
+    const SwRangeRedline* pFnd = GetRedlineTable().FindAtPosition( rSttPos, n, true );
     if( pFnd )
     {
         const SwPosition* pEnd = pFnd->End();
-        if( !pEnd->nNode.GetNode().IsCntntNode() )
+        if( !pEnd->nNode.GetNode().IsContentNode() )
         {
             SwNodeIndex aTmp( pEnd->nNode );
-            SwCntntNode* pCNd = SwNodes::GoPrevSection( &aTmp );
+            SwContentNode* pCNd = SwNodes::GoPrevSection( &aTmp );
             if( !pCNd || ( aTmp == rSttPos.nNode &&
                 pCNd->Len() == rSttPos.nContent.GetIndex() ))
                 pFnd = 0;
@@ -2352,9 +2352,9 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
     do {
         bRestart = false;
 
-        for( ; !pFnd && n < mpRedlineTbl->size(); ++n )
+        for( ; !pFnd && n < mpRedlineTable->size(); ++n )
         {
-            pFnd = (*mpRedlineTbl)[ n ];
+            pFnd = (*mpRedlineTable)[ n ];
             if( pFnd->HasMark() && pFnd->IsVisible() )
             {
                 *rPam.GetMark() = *pFnd->Start();
@@ -2370,9 +2370,9 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
             // Merge all of the same type and author that are
             // consecutive into one Selection.
             const SwPosition* pPrevEnd = pFnd->End();
-            while( ++n < mpRedlineTbl->size() )
+            while( ++n < mpRedlineTable->size() )
             {
-                const SwRangeRedline* pTmp = (*mpRedlineTbl)[ n ];
+                const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
                 if( pTmp->HasMark() && pTmp->IsVisible() )
                 {
                     const SwPosition *pRStt;
@@ -2394,9 +2394,9 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
         {
             const SwRangeRedline* pSaveFnd = pFnd;
 
-            SwCntntNode* pCNd;
+            SwContentNode* pCNd;
             SwNodeIndex* pIdx = &rPam.GetMark()->nNode;
-            if( !pIdx->GetNode().IsCntntNode() &&
+            if( !pIdx->GetNode().IsContentNode() &&
                 0 != ( pCNd = m_rDoc.GetNodes().GoNextSection( pIdx )) )
             {
                 if( *pIdx <= rPam.GetPoint()->nNode )
@@ -2408,7 +2408,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
             if( pFnd )
             {
                 pIdx = &rPam.GetPoint()->nNode;
-                if( !pIdx->GetNode().IsCntntNode() &&
+                if( !pIdx->GetNode().IsContentNode() &&
                     0 != ( pCNd = SwNodes::GoPrevSection( pIdx )) )
                 {
                     if( *pIdx >= rPam.GetMark()->nNode )
@@ -2420,7 +2420,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
 
             if( !pFnd || *rPam.GetMark() == *rPam.GetPoint() )
             {
-                if( n < mpRedlineTbl->size() )
+                if( n < mpRedlineTable->size() )
                 {
                     bRestart = true;
                     *rPam.GetPoint() = *pSaveFnd->End();
@@ -2437,7 +2437,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
 
     return pFnd;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) const
@@ -2452,14 +2452,14 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
     // If the starting position points to the last valid ContentNode,
     // we take the previous Redline in any case.
     sal_uInt16 n = 0;
-    const SwRangeRedline* pFnd = GetRedlineTbl().FindAtPosition( rSttPos, n, false );
+    const SwRangeRedline* pFnd = GetRedlineTable().FindAtPosition( rSttPos, n, false );
     if( pFnd )
     {
         const SwPosition* pStt = pFnd->Start();
-        if( !pStt->nNode.GetNode().IsCntntNode() )
+        if( !pStt->nNode.GetNode().IsContentNode() )
         {
             SwNodeIndex aTmp( pStt->nNode );
-            SwCntntNode* pCNd = m_rDoc.GetNodes().GoNextSection( &aTmp );
+            SwContentNode* pCNd = m_rDoc.GetNodes().GoNextSection( &aTmp );
             if( !pCNd || ( aTmp == rSttPos.nNode &&
                 !rSttPos.nContent.GetIndex() ))
                 pFnd = 0;
@@ -2473,7 +2473,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
 
         while( !pFnd && 0 < n )
         {
-            pFnd = (*mpRedlineTbl)[ --n ];
+            pFnd = (*mpRedlineTable)[ --n ];
             if( pFnd->HasMark() && pFnd->IsVisible() )
             {
                 *rPam.GetMark() = *pFnd->End();
@@ -2490,7 +2490,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
             const SwPosition* pNextStt = pFnd->Start();
             while( 0 < n )
             {
-                const SwRangeRedline* pTmp = (*mpRedlineTbl)[ --n ];
+                const SwRangeRedline* pTmp = (*mpRedlineTable)[ --n ];
                 if( pTmp->HasMark() && pTmp->IsVisible() )
                 {
                     const SwPosition *pREnd;
@@ -2515,9 +2515,9 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
         {
             const SwRangeRedline* pSaveFnd = pFnd;
 
-            SwCntntNode* pCNd;
+            SwContentNode* pCNd;
             SwNodeIndex* pIdx = &rPam.GetMark()->nNode;
-            if( !pIdx->GetNode().IsCntntNode() &&
+            if( !pIdx->GetNode().IsContentNode() &&
                 0 != ( pCNd = SwNodes::GoPrevSection( pIdx )) )
             {
                 if( *pIdx >= rPam.GetPoint()->nNode )
@@ -2529,7 +2529,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
             if( pFnd )
             {
                 pIdx = &rPam.GetPoint()->nNode;
-                if( !pIdx->GetNode().IsCntntNode() &&
+                if( !pIdx->GetNode().IsContentNode() &&
                     0 != ( pCNd = m_rDoc.GetNodes().GoNextSection( pIdx )) )
                 {
                     if( *pIdx <= rPam.GetMark()->nNode )
@@ -2558,7 +2558,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
 
     return pFnd;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 // Set comment at the Redline
@@ -2569,12 +2569,12 @@ bool DocumentRedlineManager::SetRedlineComment( const SwPaM& rPaM, const OUStrin
                     * pEnd = pStt == rPaM.GetPoint() ? rPaM.GetMark()
                                                      : rPaM.GetPoint();
     sal_uInt16 n = 0;
-    if( GetRedlineTbl().FindAtPosition( *pStt, n, true ) )
+    if( GetRedlineTable().FindAtPosition( *pStt, n, true ) )
     {
-        for( ; n < mpRedlineTbl->size(); ++n )
+        for( ; n < mpRedlineTable->size(); ++n )
         {
             bRet = true;
-            SwRangeRedline* pTmp = (*mpRedlineTbl)[ n ];
+            SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
             if( pStt != pEnd && *pTmp->Start() > *pEnd )
                 break;
 
@@ -2588,7 +2588,7 @@ bool DocumentRedlineManager::SetRedlineComment( const SwPaM& rPaM, const OUStrin
 
     return bRet;
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 // Create a new author if necessary
@@ -2605,15 +2605,15 @@ sal_uInt16 DocumentRedlineManager::InsertRedlineAuthor( const OUString& rNew )
 
 void DocumentRedlineManager::UpdateRedlineAttr()
 {
-    const SwRedlineTbl& rTbl = GetRedlineTbl();
-    for( sal_uInt16 n = 0; n < rTbl.size(); ++n )
+    const SwRedlineTable& rTable = GetRedlineTable();
+    for( sal_uInt16 n = 0; n < rTable.size(); ++n )
     {
-        SwRangeRedline* pRedl = rTbl[ n ];
+        SwRangeRedline* pRedl = rTable[ n ];
         if( pRedl->IsVisible() )
             pRedl->InvalidateRange();
     }
 
-    // #TODO - add 'SwExtraRedlineTbl' also ?
+    // #TODO - add 'SwExtraRedlineTable' also ?
 }
 
 const uno::Sequence <sal_Int8>& DocumentRedlineManager::GetRedlinePassword() const
@@ -2632,30 +2632,30 @@ void DocumentRedlineManager::SetRedlinePassword(
 /// AppendRedline. Is used by Autoformat.
 /// A null pointer resets the mode. The pointer is not copied, so it
 /// needs to stay valid!
-void DocumentRedlineManager::SetAutoFmtRedlineComment( const OUString* pTxt, sal_uInt16 nSeqNo )
+void DocumentRedlineManager::SetAutoFormatRedlineComment( const OUString* pText, sal_uInt16 nSeqNo )
 {
-    m_rDoc.SetAutoFmtRedline( 0 != pTxt );
-    if( pTxt )
+    m_rDoc.SetAutoFormatRedline( 0 != pText );
+    if( pText )
     {
-        if( !mpAutoFmtRedlnComment )
-            mpAutoFmtRedlnComment = new OUString( *pTxt );
+        if( !mpAutoFormatRedlnComment )
+            mpAutoFormatRedlnComment = new OUString( *pText );
         else
-            *mpAutoFmtRedlnComment = *pTxt;
+            *mpAutoFormatRedlnComment = *pText;
     }
     else
-        delete mpAutoFmtRedlnComment, mpAutoFmtRedlnComment = 0;
+        delete mpAutoFormatRedlnComment, mpAutoFormatRedlnComment = 0;
 
-    mnAutoFmtRedlnCommentNo = nSeqNo;
+    mnAutoFormatRedlnCommentNo = nSeqNo;
 }
 
 #define MAX_REDLINE_COUNT   250
 
 void DocumentRedlineManager::checkRedlining(RedlineMode_t& _rReadlineMode)
 {
-    const SwRedlineTbl& rRedlineTbl = GetRedlineTbl();
+    const SwRedlineTable& rRedlineTable = GetRedlineTable();
     SwEditShell* pEditShell = m_rDoc.GetEditShell();
     vcl::Window* pParent = pEditShell ? pEditShell->GetWin() : NULL;
-    if ( pParent && !mbReadlineChecked && rRedlineTbl.size() > MAX_REDLINE_COUNT
+    if ( pParent && !mbReadlineChecked && rRedlineTable.size() > MAX_REDLINE_COUNT
         && !((_rReadlineMode & nsRedlineMode_t::REDLINE_SHOW_DELETE) == nsRedlineMode_t::REDLINE_SHOW_DELETE) )
     {
         ScopedVclPtrInstance< MessageDialog > aQuery(pParent, "QueryShowChangesDialog", "modules/swriter/ui/queryshowchangesdialog.ui");
@@ -2672,9 +2672,9 @@ void DocumentRedlineManager::checkRedlining(RedlineMode_t& _rReadlineMode)
 
 DocumentRedlineManager::~DocumentRedlineManager()
 {
-    delete mpRedlineTbl; mpRedlineTbl = 0;
-    delete mpExtraRedlineTbl; mpExtraRedlineTbl = 0;
-    delete mpAutoFmtRedlnComment; mpAutoFmtRedlnComment = 0;
+    delete mpRedlineTable; mpRedlineTable = 0;
+    delete mpExtraRedlineTable; mpExtraRedlineTable = 0;
+    delete mpAutoFormatRedlnComment; mpAutoFormatRedlnComment = 0;
 }
 
 }
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index 83ba90f99e78..6970d1f8044e 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -39,7 +39,7 @@
 sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc)
     :m_rDoc(rDoc),
     mnLinkUpdMode( GLOBALSETTING ),
-    meFldUpdMode( AUTOUPD_GLOBALSETTING ),
+    meFieldUpdMode( AUTOUPD_GLOBALSETTING ),
     meChrCmprType( CHARCOMPRESS_NONE ),
     mn32DummyCompatibilityOptions1(0),
     mn32DummyCompatibilityOptions2(0),
@@ -210,9 +210,9 @@ void sw::DocumentSettingManager::set(/*[in]*/ DocumentSettingId id, /*[in]*/ boo
             {
                 mbOldNumbering = value;
 
-                const SwNumRuleTbl& rNmTbl = m_rDoc.GetNumRuleTbl();
-                for( SwNumRuleTbl::size_type n = 0; n < rNmTbl.size(); ++n )
-                    rNmTbl[n]->SetInvalidRule(true);
+                const SwNumRuleTable& rNmTable = m_rDoc.GetNumRuleTable();
+                for( SwNumRuleTable::size_type n = 0; n < rNmTable.size(); ++n )
+                    rNmTable[n]->SetInvalidRule(true);
 
                 m_rDoc.UpdateNumRule();
 
@@ -417,7 +417,7 @@ void sw::DocumentSettingManager::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLan
     {
         pTmpRoot->StartAllAction();
         std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts();
-        std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
+        std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
         pTmpRoot->EndAllAction();
     }
     m_rDoc.getIDocumentState().SetModified();
@@ -450,17 +450,17 @@ void sw::DocumentSettingManager::setLinkUpdateMode( /*[in]*/sal_uInt16 eMode )
     mnLinkUpdMode = eMode;
 }
 
-SwFldUpdateFlags sw::DocumentSettingManager::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const
+SwFieldUpdateFlags sw::DocumentSettingManager::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const
 {
-    SwFldUpdateFlags eRet = meFldUpdMode;
+    SwFieldUpdateFlags eRet = meFieldUpdMode;
     if( bGlobalSettings && AUTOUPD_GLOBALSETTING == eRet )
-        eRet = SW_MOD()->GetFldUpdateFlags(get(DocumentSettingId::HTML_MODE));
+        eRet = SW_MOD()->GetFieldUpdateFlags(get(DocumentSettingId::HTML_MODE));
     return eRet;
 }
 
-void sw::DocumentSettingManager::setFieldUpdateFlags(/*[in]*/SwFldUpdateFlags eMode )
+void sw::DocumentSettingManager::setFieldUpdateFlags(/*[in]*/SwFieldUpdateFlags eMode )
 {
-    meFldUpdMode = eMode;
+    meFieldUpdMode = eMode;
 }
 
 SwCharCompressType sw::DocumentSettingManager::getCharacterCompressionType() const
@@ -487,7 +487,7 @@ void sw::DocumentSettingManager::setCharacterCompressionType( /*[in]*/SwCharComp
         {
             pTmpRoot->StartAllAction();
             std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts();
-            std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
+            std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
             pTmpRoot->EndAllAction();
         }
         m_rDoc.getIDocumentState().SetModified();
diff --git a/sw/source/core/doc/DocumentStateManager.cxx b/sw/source/core/doc/DocumentStateManager.cxx
index 1e55f30d8d0e..601525073574 100644
--- a/sw/source/core/doc/DocumentStateManager.cxx
+++ b/sw/source/core/doc/DocumentStateManager.cxx
@@ -31,7 +31,7 @@ DocumentStateManager::DocumentStateManager( SwDoc& i_rSwdoc ) :
     m_rDoc( i_rSwdoc ),
     mbModified(false),
     mbLoaded(false),
-    mbUpdateExpFld(false),
+    mbUpdateExpField(false),
     mbNewDoc(false),
     mbPageNums(false),
     mbInCallModified(false)
@@ -89,9 +89,9 @@ bool DocumentStateManager::IsLoaded() const
     return mbLoaded;
 }
 
-bool DocumentStateManager::IsUpdateExpFld() const
+bool DocumentStateManager::IsUpdateExpField() const
 {
-    return mbUpdateExpFld;
+    return mbUpdateExpField;
 }
 
 bool DocumentStateManager::IsNewDoc() const
@@ -114,9 +114,9 @@ void DocumentStateManager::SetNewDoc(bool b)
     mbNewDoc = b;
 }
 
-void DocumentStateManager::SetUpdateExpFldStat(bool b)
+void DocumentStateManager::SetUpdateExpFieldStat(bool b)
 {
-    mbUpdateExpFld = b;
+    mbUpdateExpField = b;
 }
 
 void DocumentStateManager::SetLoaded(bool b)
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 5f231eca35fd..4fed190ea0e8 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -79,8 +79,8 @@ DocumentStatisticsManager::DocumentStatisticsManager( SwDoc& i_rSwdoc ) : m_rDoc
 
 void DocumentStatisticsManager::DocInfoChgd( )
 {
-    m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )->UpdateFlds();
-    m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_TEMPLNAMEFLD )->UpdateFlds();
+    m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_DOCINFOFLD )->UpdateFields();
+    m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_TEMPLNAMEFLD )->UpdateFields();
     m_rDoc.getIDocumentState().SetModified();
 }
 
@@ -140,14 +140,14 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
         case ND_TEXTNODE:
         {
             long const nOldChars(mpDocStat->nChar);
-            SwTxtNode *pTxt = static_cast< SwTxtNode * >( pNd );
-            if (pTxt->CountWords(*mpDocStat, 0, pTxt->GetTxt().getLength()))
+            SwTextNode *pText = static_cast< SwTextNode * >( pNd );
+            if (pText->CountWords(*mpDocStat, 0, pText->GetText().getLength()))
             {
                 nChars -= (mpDocStat->nChar - nOldChars);
             }
             break;
         }
-        case ND_TABLENODE:      ++mpDocStat->nTbl;   break;
+        case ND_TABLENODE:      ++mpDocStat->nTable;   break;
         case ND_GRFNODE:        ++mpDocStat->nGrf;   break;
         case ND_OLENODE:        ++mpDocStat->nOLE;   break;
         case ND_SECTIONNODE:    break;
@@ -156,14 +156,14 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
 
     // #i93174#: notes contain paragraphs that are not nodes
     {
-        SwFieldType * const pPostits( m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD) );
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pPostits );
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld;  pFmtFld = aIter.Next() )
+        SwFieldType * const pPostits( m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_POSTITFLD) );
+        SwIterator<SwFormatField,SwFieldType> aIter( *pPostits );
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField;  pFormatField = aIter.Next() )
         {
-            if (pFmtFld->IsFldInDoc())
+            if (pFormatField->IsFieldInDoc())
             {
                 SwPostItField const * const pField(
-                    static_cast<SwPostItField const*>(pFmtFld->GetField()));
+                    static_cast<SwPostItField const*>(pFormatField->GetField()));
                 mpDocStat->nAllPara += pField->GetNumberOfParagraphs();
             }
         }
@@ -175,7 +175,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7);
     sal_Int32 n=0;
     aStat[n].Name = "TableCount";
-    aStat[n++].Value <<= (sal_Int32)mpDocStat->nTbl;
+    aStat[n++].Value <<= (sal_Int32)mpDocStat->nTable;
     aStat[n].Name = "ImageCount";
     aStat[n++].Value <<= (sal_Int32)mpDocStat->nGrf;
     aStat[n].Name = "ObjectCount";
@@ -218,8 +218,8 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
     // optionally update stat. fields
     if (bFields)
     {
-        SwFieldType *pType = m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DOCSTATFLD);
-        pType->UpdateFlds();
+        SwFieldType *pType = m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_DOCSTATFLD);
+        pType->UpdateFields();
     }
 
     return nChars < 0;
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index b9403e8e38b1..f652f56d1670 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -94,11 +94,11 @@ namespace
     {
         // Make sure that the printer settings are taken over to the standard
         // page style
-        const SwFrmFmt& rPgDscFmt = rDoc.GetPageDesc( 0 ).GetMaster();
-        const SvxLRSpaceItem& rLR = rPgDscFmt.GetLRSpace();
+        const SwFrameFormat& rPgDscFormat = rDoc.GetPageDesc( 0 ).GetMaster();
+        const SvxLRSpaceItem& rLR = rPgDscFormat.GetLRSpace();
         const long nLeft = rLR.GetLeft();
         const long nRight = rLR.GetRight();
-        const long nWidth = rPgDscFmt.GetFrmSize().GetWidth();
+        const long nWidth = rPgDscFormat.GetFrmSize().GetWidth();
         return nWidth - nLeft - nRight;
     }
 
@@ -154,7 +154,7 @@ namespace
         }
     }
 
-    static void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
+    static void lcl_SetHeadline( SwDoc* pDoc, SwTextFormatColl* pColl,
                             SfxItemSet& rSet,
                             sal_uInt16 nOutLvlBits, sal_uInt8 nLevel, bool bItalic )
     {
@@ -184,16 +184,16 @@ namespace
                 if( !bHTMLMode )
                 {
                     SwNumRule * pOutlineRule = pDoc->GetOutlineNumRule();
-                    const SwNumFmt& rNFmt = pOutlineRule->Get( nLevel );
+                    const SwNumFormat& rNFormat = pOutlineRule->Get( nLevel );
 
-                    if ( rNFmt.GetPositionAndSpaceMode() ==
+                    if ( rNFormat.GetPositionAndSpaceMode() ==
                                         SvxNumberFormat::LABEL_WIDTH_AND_POSITION &&
-                         ( rNFmt.GetAbsLSpace() || rNFmt.GetFirstLineOffset() ) )
+                         ( rNFormat.GetAbsLSpace() || rNFormat.GetFirstLineOffset() ) )
                     {
-                        SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFmtAttr( RES_LR_SPACE )) );
-                        aLR.SetTxtFirstLineOfstValue( rNFmt.GetFirstLineOffset() );
-                        aLR.SetTxtLeft( rNFmt.GetAbsLSpace() );
-                        pColl->SetFmtAttr( aLR );
+                        SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFormatAttr( RES_LR_SPACE )) );
+                        aLR.SetTextFirstLineOfstValue( rNFormat.GetFirstLineOffset() );
+                        aLR.SetTextLeft( rNFormat.GetAbsLSpace() );
+                        pColl->SetFormatAttr( aLR );
                     }
 
                     // #i71764#
@@ -203,11 +203,11 @@ namespace
                     {
                         SwNumRuleItem aItem(pOutlineRule->GetName());
 
-                        pColl->SetFmtAttr(aItem);
+                        pColl->SetFormatAttr(aItem);
                     }
                 }
             }
-            pColl->SetNextTxtFmtColl( *pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(
+            pColl->SetNextTextFormatColl( *pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(
                                             RES_POOLCOLL_TEXT ));
         }
     }
@@ -217,7 +217,7 @@ namespace
     {
         SvxLRSpaceItem aLR( RES_LR_SPACE );
         sal_uInt16 nLeft = nFact ? GetMetricVal( CM_05 ) * nFact : 0;
-        aLR.SetTxtLeft( nLeft );
+        aLR.SetTextLeft( nLeft );
 
         rSet.Put( aLR );
         if( bHeader )
@@ -236,26 +236,26 @@ namespace
         }
     }
 
-    static void lcl_SetNumBul( SwDoc* pDoc, SwTxtFmtColl* pColl,
+    static void lcl_SetNumBul( SwDoc* pDoc, SwTextFormatColl* pColl,
                             SfxItemSet& rSet,
                             sal_uInt16 nNxt, SwTwips nEZ, SwTwips nLeft,
                             SwTwips nUpper, SwTwips nLower )
     {
 
         SvxLRSpaceItem aLR( RES_LR_SPACE ); SvxULSpaceItem aUL( RES_UL_SPACE );
-        aLR.SetTxtFirstLineOfst( sal_uInt16(nEZ) ); aLR.SetTxtLeft( sal_uInt16(nLeft) );
+        aLR.SetTextFirstLineOfst( sal_uInt16(nEZ) ); aLR.SetTextLeft( sal_uInt16(nLeft) );
         aUL.SetUpper( sal_uInt16(nUpper) ); aUL.SetLower( sal_uInt16(nLower) );
         rSet.Put( aLR );
         rSet.Put( aUL );
 
         if( pColl )
-            pColl->SetNextTxtFmtColl( *pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nNxt ));
+            pColl->SetNextTextFormatColl( *pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nNxt ));
     }
 
     static void lcl_PutStdPageSizeIntoItemSet( SwDoc* pDoc, SfxItemSet& rSet )
     {
         SwPageDesc* pStdPgDsc = pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_STANDARD );
-        SwFmtFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
+        SwFormatFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
         if( pStdPgDsc->GetLandscape() )
         {
             SwTwips nTmp = aFrmSz.GetHeight();
@@ -274,7 +274,7 @@ DocumentStylePoolManager::DocumentStylePoolManager( SwDoc& i_rSwdoc ) : m_rDoc(
 {
 }
 
-SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
+SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
 {
     OSL_ENSURE(
         (RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END) ||
@@ -285,11 +285,11 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END),
             "Wrong  AutoFormat Id" );
 
-    SwTxtFmtColl* pNewColl;
+    SwTextFormatColl* pNewColl;
     sal_uInt16 nOutLvlBits = 0;
-    for( sal_uInt16 n = 0; n < m_rDoc.GetTxtFmtColls()->size(); ++n )
+    for( sal_uInt16 n = 0; n < m_rDoc.GetTextFormatColls()->size(); ++n )
     {
-        if( nId == ( pNewColl = (*m_rDoc.GetTxtFmtColls())[ n ] )->GetPoolFmtId() )
+        if( nId == ( pNewColl = (*m_rDoc.GetTextFormatColls())[ n ] )->GetPoolFormatId() )
         {
             return pNewColl;
         }
@@ -315,29 +315,29 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 
     OSL_ENSURE( nResId, "Invalid Pool ID" );
     if( !nResId )
-        return GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
+        return GetTextCollFromPool( RES_POOLCOLL_STANDARD );
 
     ResId aResId( nResId + nId, *pSwResMgr );
     OUString aNm( aResId );
 
     // A Set for all to-be-set Attributes
-    SwAttrSet aSet( m_rDoc.GetAttrPool(), aTxtFmtCollSetRange );
+    SwAttrSet aSet( m_rDoc.GetAttrPool(), aTextFormatCollSetRange );
     sal_uInt16 nParent = GetPoolParent( nId );
 
     {
 
 //FEATURE::CONDCOLL
         if(::IsConditionalByPoolId( nId ))
-            pNewColl = new SwConditionTxtFmtColl( m_rDoc.GetAttrPool(), aNm, !nParent
-                                                ? m_rDoc.GetDfltTxtFmtColl()
-                                                : GetTxtCollFromPool( nParent ));
+            pNewColl = new SwConditionTextFormatColl( m_rDoc.GetAttrPool(), aNm, !nParent
+                                                ? m_rDoc.GetDfltTextFormatColl()
+                                                : GetTextCollFromPool( nParent ));
         else
 //FEATURE::CONDCOLL
-            pNewColl = new SwTxtFmtColl( m_rDoc.GetAttrPool(), aNm, !nParent
-                                            ? m_rDoc.GetDfltTxtFmtColl()
-                                            : GetTxtCollFromPool( nParent ));
-        pNewColl->SetPoolFmtId( nId );
-        m_rDoc.GetTxtFmtColls()->push_back( pNewColl );
+            pNewColl = new SwTextFormatColl( m_rDoc.GetAttrPool(), aNm, !nParent
+                                            ? m_rDoc.GetDfltTextFormatColl()
+                                            : GetTextCollFromPool( nParent ));
+        pNewColl->SetPoolFormatId( nId );
+        m_rDoc.GetTextFormatColls()->push_back( pNewColl );
     }
 
     bool bNoDefault = m_rDoc.GetDocumentSettingManager().get( DocumentSettingId::STYLES_NODEFAULT );
@@ -379,15 +379,15 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TEXT_IDENT:           // Text body indentation
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtFirstLineOfst( GetMetricVal( CM_05 ));
+                aLR.SetTextFirstLineOfst( GetMetricVal( CM_05 ));
                 aSet.Put( aLR );
             }
             break;
         case RES_POOLCOLL_TEXT_NEGIDENT:        // Text body neg. indentation
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtFirstLineOfst( -(short)GetMetricVal( CM_05 ));
-                aLR.SetTxtLeft( GetMetricVal( CM_1 ));
+                aLR.SetTextFirstLineOfst( -(short)GetMetricVal( CM_05 ));
+                aLR.SetTextLeft( GetMetricVal( CM_1 ));
                 SvxTabStopItem aTStops(RES_PARATR_TABSTOP);    aTStops.Insert( SvxTabStop( 0 ));
 
                 aSet.Put( aLR );
@@ -397,7 +397,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TEXT_MOVE:            // Text body move
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtLeft( GetMetricVal( CM_05 ));
+                aLR.SetTextLeft( GetMetricVal( CM_05 ));
                 aSet.Put( aLR );
             }
             break;
@@ -405,9 +405,9 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_CONFRONTATION:    // Text body confrontation
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtFirstLineOfst( - short( GetMetricVal( CM_1 ) * 4 +
+                aLR.SetTextFirstLineOfst( - short( GetMetricVal( CM_1 ) * 4 +
                                                   GetMetricVal( CM_05)) );
-                aLR.SetTxtLeft( GetMetricVal( CM_1 ) * 5 );
+                aLR.SetTextLeft( GetMetricVal( CM_1 ) * 5 );
                 SvxTabStopItem aTStops( RES_PARATR_TABSTOP );    aTStops.Insert( SvxTabStop( 0 ));
 
                 aSet.Put( aLR );
@@ -417,7 +417,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_MARGINAL:         // Text body marginal
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtLeft( GetMetricVal( CM_1 ) * 4 );
+                aLR.SetTextLeft( GetMetricVal( CM_1 ) * 4 );
                 aSet.Put( aLR );
             }
             break;
@@ -466,9 +466,9 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
                 SvxULSpaceItem aUL( PT_12, PT_6, RES_UL_SPACE );
                 if( m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) )
                     aUL.SetLower( HTML_PARSPACE );
-                aSet.Put( SvxFmtKeepItem( true, RES_KEEP ));
+                aSet.Put( SvxFormatKeepItem( true, RES_KEEP ));
 
-                pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
+                pNewColl->SetNextTextFormatColl( *GetTextCollFromPool( RES_POOLCOLL_TEXT ));
 
                 aSet.Put( aUL );
                 SetAllScriptItem( aSet, aFntSize );
@@ -483,7 +483,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_SIGNATURE:            // Signatures
         case RES_POOLCOLL_TABLE:                // Tabele content
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -569,7 +569,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_FOOTERL:
         case RES_POOLCOLL_FOOTERR:
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
 
                 long nRightMargin = lcl_GetRightMargin( m_rDoc );
@@ -586,7 +586,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
             {
                 SetAllScriptItem( aSet, SvxWeightItem( WEIGHT_BOLD, RES_CHRATR_WEIGHT ) );
                 aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ) );
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -595,11 +595,11 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_ENDNOTE:              // paragraph style Endnote
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtFirstLineOfst( -(short)( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ) );
-                aLR.SetTxtLeft( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) );
+                aLR.SetTextFirstLineOfst( -(short)( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ) );
+                aLR.SetTextLeft( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) );
                 SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, RES_CHRATR_FONTSIZE ) );
                 aSet.Put( aLR );
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -610,7 +610,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
                 aSet.Put( aUL );
                 SetAllScriptItem( aSet, SvxPostureItem( ITALIC_NORMAL, RES_CHRATR_POSTURE ) );
                 SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, RES_CHRATR_FONTSIZE ) );
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -626,7 +626,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
             {
                 SvxULSpaceItem aUL( RES_UL_SPACE ); aUL.SetLower( PT_3 );
                 aSet.Put( aUL );
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -640,7 +640,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
                     SvxULSpaceItem aUL( RES_UL_SPACE ); aUL.SetLower( PT_3 );
                     aSet.Put( aUL );
                 }
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -649,7 +649,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TOX_USERH:            // Header
             lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -688,7 +688,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TOX_IDXH:         // Header
             lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -709,7 +709,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TOX_CNTNTH:       // Header
             lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -750,7 +750,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
         case RES_POOLCOLL_TOX_AUTHORITIESH:
             lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -960,7 +960,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 
                 aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ) );
 
-                pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
+                pNewColl->SetNextTextFormatColl( *GetTextCollFromPool( RES_POOLCOLL_TEXT ));
             }
             break;
 
@@ -972,7 +972,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 
                 aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ));
 
-                pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool(
+                pNewColl->SetNextTextFormatColl( *GetTextCollFromPool(
                                                     RES_POOLCOLL_TEXT ));
             }
             break;
@@ -1019,13 +1019,13 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 
                 SvxULSpaceItem aUL( RES_UL_SPACE );
                 {
-                    pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool(
+                    pNewColl->SetNextTextFormatColl( *GetTextCollFromPool(
                                                     RES_POOLCOLL_TEXT ));
                     aUL = pNewColl->GetULSpace();
                 }
                 aUL.SetLower( HTML_PARSPACE );
                 aSet.Put( aUL);
-                SwFmtLineNumber aLN; aLN.SetCountLines( false );
+                SwFormatLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -1043,7 +1043,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
                 {
-                    pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool(
+                    pNewColl->SetNextTextFormatColl( *GetTextCollFromPool(
                                                         RES_POOLCOLL_HTML_DD ));
                     aLR = pNewColl->GetLRSpace();
                 }
@@ -1058,7 +1058,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
     if( aSet.Count() )
     {
         {
-            pNewColl->SetFmtAttr( aSet );
+            pNewColl->SetFormatAttr( aSet );
         }
     }
     return pNewColl;
@@ -1066,12 +1066,12 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
 
 /// Return the AutomaticFormat with the supplied Id. If it doesn't
 /// exist, create it.
-SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
+SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
 {
-    SwFmt *pNewFmt = 0;
-    SwFmt *pDeriveFmt = 0;
+    SwFormat *pNewFormat = 0;
+    SwFormat *pDeriveFormat = 0;
 
-    SwFmtsBase* pArray[ 2 ];
+    SwFormatsBase* pArray[ 2 ];
     sal_uInt16 nArrCnt = 1, nRCId = 0;
     sal_uInt16* pWhichRange = 0;
 
@@ -1079,14 +1079,14 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
     {
     case POOLGRP_CHARFMT:
         {
-            pArray[0] = m_rDoc.GetCharFmts();
-            pDeriveFmt = m_rDoc.GetDfltCharFmt();
+            pArray[0] = m_rDoc.GetCharFormats();
+            pDeriveFormat = m_rDoc.GetDfltCharFormat();
 
             if( nId > RES_POOLCHR_NORMAL_END )
                 nRCId = RC_POOLCHRFMT_HTML_BEGIN - RES_POOLCHR_HTML_BEGIN;
             else
                 nRCId = RC_POOLCHRFMT_BEGIN - RES_POOLCHR_BEGIN;
-            pWhichRange =  aCharFmtSetRange;
+            pWhichRange =  aCharFormatSetRange;
 
             // Fault: unknown Format, but a CharFormat
             //             -> return the first one
@@ -1099,12 +1099,12 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
         break;
     case POOLGRP_FRAMEFMT:
         {
-            pArray[0] = m_rDoc.GetFrmFmts();
-            pArray[1] = m_rDoc.GetSpzFrmFmts();
-            pDeriveFmt = m_rDoc.GetDfltFrmFmt();
+            pArray[0] = m_rDoc.GetFrameFormats();
+            pArray[1] = m_rDoc.GetSpzFrameFormats();
+            pDeriveFormat = m_rDoc.GetDfltFrameFormat();
             nArrCnt = 2;
             nRCId = RC_POOLFRMFMT_BEGIN - RES_POOLFRM_BEGIN;
-            pWhichRange = aFrmFmtSetRange;
+            pWhichRange = aFrameFormatSetRange;
 
             // Fault: unknown Format, but a FrameFormat
             //             -> return the first one
@@ -1124,11 +1124,11 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
     OSL_ENSURE( nRCId, "invalid Id" );
 
     while( nArrCnt-- )
-        for( size_t n = 0; n < (*pArray[nArrCnt]).GetFmtCount(); ++n )
-            if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )->
-                    GetPoolFmtId() )
+        for( size_t n = 0; n < (*pArray[nArrCnt]).GetFormatCount(); ++n )
+            if( nId == ( pNewFormat = (*pArray[ nArrCnt ] ).GetFormat( n ) )->
+                    GetPoolFormatId() )
             {
-                return pNewFmt;
+                return pNewFormat;
             }
 
     ResId aResId( nRCId + nId, *pSwResMgr );
@@ -1143,10 +1143,10 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
             switch (nId & (COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID) )
             {
                 case POOLGRP_CHARFMT:
-                    pNewFmt = m_rDoc._MakeCharFmt(aNm, pDeriveFmt, false, true);
+                    pNewFormat = m_rDoc._MakeCharFormat(aNm, pDeriveFormat, false, true);
                     break;
                 case POOLGRP_FRAMEFMT:
-                    pNewFmt = m_rDoc._MakeFrmFmt(aNm, pDeriveFmt, false, true);
+                    pNewFormat = m_rDoc._MakeFrameFormat(aNm, pDeriveFormat, false, true);
                     break;
                 default:
                     break;
@@ -1155,8 +1155,8 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
 
         if( !bIsModified )
             m_rDoc.getIDocumentState().ResetModified();
-        pNewFmt->SetPoolFmtId( nId );
-        pNewFmt->SetAuto( false );      // no AutoFormat
+        pNewFormat->SetPoolFormatId( nId );
+        pNewFormat->SetAuto( false );      // no AutoFormat
     }
 
     switch( nId )
@@ -1258,16 +1258,16 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
         {
             if ( m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) )
             {
-                aSet.Put( SwFmtAnchor( FLY_AS_CHAR ));
-                aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::LINE_CENTER, text::RelOrientation::PRINT_AREA ) );
-                aSet.Put( SwFmtSurround( SURROUND_NONE ) );
+                aSet.Put( SwFormatAnchor( FLY_AS_CHAR ));
+                aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::LINE_CENTER, text::RelOrientation::PRINT_AREA ) );
+                aSet.Put( SwFormatSurround( SURROUND_NONE ) );
             }
             else
             {
-                aSet.Put( SwFmtAnchor( FLY_AT_PARA ));
-                aSet.Put( SwFmtSurround( SURROUND_PARALLEL ) );
-                aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::PRINT_AREA ) );
-                aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
+                aSet.Put( SwFormatAnchor( FLY_AT_PARA ));
+                aSet.Put( SwFormatSurround( SURROUND_PARALLEL ) );
+                aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::PRINT_AREA ) );
+                aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
                 Color aCol( COL_BLACK );
                 SvxBorderLine aLine( &aCol, DEF_LINE_WIDTH_0 );
                 SvxBoxItem aBox( RES_BOX );
@@ -1288,44 +1288,44 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
     case RES_POOLFRM_GRAPHIC:
     case RES_POOLFRM_OLE:
         {
-            aSet.Put( SwFmtAnchor( FLY_AT_PARA ));
-            aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
-            aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
-            aSet.Put( SwFmtSurround( SURROUND_IDEAL ));
+            aSet.Put( SwFormatAnchor( FLY_AT_PARA ));
+            aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatSurround( SURROUND_IDEAL ));
         }
         break;
     case RES_POOLFRM_FORMEL:
         {
-            aSet.Put( SwFmtAnchor( FLY_AS_CHAR ) );
-            aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::CHAR_CENTER, text::RelOrientation::FRAME ) );
+            aSet.Put( SwFormatAnchor( FLY_AS_CHAR ) );
+            aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::CHAR_CENTER, text::RelOrientation::FRAME ) );
             aSet.Put( SvxLRSpaceItem( 114, 114, 0, 0, RES_LR_SPACE ) );
         }
         break;
     case RES_POOLFRM_MARGINAL:
         {
-            aSet.Put( SwFmtAnchor( FLY_AT_PARA ));
-            aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME ));
-            aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
-            aSet.Put( SwFmtSurround( SURROUND_PARALLEL ));
+            aSet.Put( SwFormatAnchor( FLY_AT_PARA ));
+            aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatSurround( SURROUND_PARALLEL ));
             // Set the default width to 3.5 cm, use the minimum value for the height
-            aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE,
+            aSet.Put( SwFormatFrmSize( ATT_MIN_SIZE,
                     GetMetricVal( CM_1 ) * 3 + GetMetricVal( CM_05 ),
                     MM50 ));
         }
         break;
     case RES_POOLFRM_WATERSIGN:
         {
-            aSet.Put( SwFmtAnchor( FLY_AT_PAGE ));
-            aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
-            aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatAnchor( FLY_AT_PAGE ));
+            aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
+            aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ));
             aSet.Put( SvxOpaqueItem( RES_OPAQUE, false ));
-            aSet.Put( SwFmtSurround( SURROUND_THROUGHT ));
+            aSet.Put( SwFormatSurround( SURROUND_THROUGHT ));
         }
         break;
     case RES_POOLFRM_LABEL:
         {
-            aSet.Put( SwFmtAnchor( FLY_AS_CHAR ) );
-            aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
+            aSet.Put( SwFormatAnchor( FLY_AS_CHAR ) );
+            aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
             aSet.Put( SvxLRSpaceItem( 114, 114, 0, 0, RES_LR_SPACE ) );
 
             SvxProtectItem aProtect( RES_PROTECT );
@@ -1333,27 +1333,27 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
             aProtect.SetPosProtect( true );
             aSet.Put( aProtect );
 
-            pNewFmt->SetAutoUpdateFmt( true );
+            pNewFormat->SetAutoUpdateFormat( true );
         }
         break;
     }
     if( aSet.Count() )
     {
         {
-            pNewFmt->SetFmtAttr( aSet );
+            pNewFormat->SetFormatAttr( aSet );
         }
     }
-    return pNewFmt;
+    return pNewFormat;
 }
 
-SwFrmFmt* DocumentStylePoolManager::GetFrmFmtFromPool( sal_uInt16 nId )
+SwFrameFormat* DocumentStylePoolManager::GetFrameFormatFromPool( sal_uInt16 nId )
 {
-    return static_cast<SwFrmFmt*>(GetFmtFromPool( nId ));
+    return static_cast<SwFrameFormat*>(GetFormatFromPool( nId ));
 }
 
-SwCharFmt* DocumentStylePoolManager::GetCharFmtFromPool( sal_uInt16 nId )
+SwCharFormat* DocumentStylePoolManager::GetCharFormatFromPool( sal_uInt16 nId )
 {
-    return static_cast<SwCharFmt*>(GetFmtFromPool( nId ));
+    return static_cast<SwCharFormat*>(GetFormatFromPool( nId ));
 }
 
 SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
@@ -1363,7 +1363,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
 
     for( size_t n = 0; n < m_rDoc.GetPageDescCnt(); ++n )
     {
-        if ( nId == m_rDoc.GetPageDesc(n).GetPoolFmtId() )
+        if ( nId == m_rDoc.GetPageDesc(n).GetPoolFormatId() )
         {
             return &m_rDoc.GetPageDesc(n);
         }
@@ -1387,7 +1387,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
             pNewPgDsc = m_rDoc.MakePageDesc(aNm, 0, bRegardLanguage);
         }
 
-        pNewPgDsc->SetPoolFmtId( nId );
+        pNewPgDsc->SetPoolFormatId( nId );
         if ( !bIsModified )
         {
             m_rDoc.getIDocumentState().ResetModified();
@@ -1405,7 +1405,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
         aUL.SetLower( (sal_uInt16)aLR.GetLeft() );
     }
 
-    SwAttrSet aSet( m_rDoc.GetAttrPool(), aPgFrmFmtSetRange );
+    SwAttrSet aSet( m_rDoc.GetAttrPool(), aPgFrameFormatSetRange );
     bool bSetLeft = true;
 
     switch( nId )
@@ -1457,7 +1457,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
         {
             Size aPSize( SvxPaperInfo::GetPaperSize( PAPER_ENV_C65 ) );
             LandscapeSwap( aPSize );
-            aSet.Put( SwFmtFrmSize( ATT_FIX_SIZE, aPSize.Width(), aPSize.Height() ));
+            aSet.Put( SwFormatFrmSize( ATT_FIX_SIZE, aPSize.Width(), aPSize.Height() ));
             aLR.SetLeft( 0 ); aLR.SetRight( 0 );
             aUL.SetUpper( 0 ); aUL.SetLower( 0 );
             aSet.Put( aLR );
@@ -1488,18 +1488,18 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
             aSet.Put( aLR );
             aSet.Put( aUL );
             pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL );
-            SwPageFtnInfo aInf( pNewPgDsc->GetFtnInfo() );
+            SwPageFootnoteInfo aInf( pNewPgDsc->GetFootnoteInfo() );
             aInf.SetLineWidth( 0 );
             aInf.SetTopDist( 0 );
             aInf.SetBottomDist( 0 );
-            pNewPgDsc->SetFtnInfo( aInf );
+            pNewPgDsc->SetFootnoteInfo( aInf );
         }
         break;
 
     case RES_POOLPAGE_LANDSCAPE:    // "Landscape"
         {
             SwPageDesc* pStdPgDsc = GetPageDescFromPool( RES_POOLPAGE_STANDARD );
-            SwFmtFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
+            SwFormatFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
             if ( !pStdPgDsc->GetLandscape() )
             {
                 const SwTwips nTmp = aFrmSz.GetHeight();
@@ -1520,11 +1520,11 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
     {
         if( bSetLeft )
         {
-            pNewPgDsc->GetLeft().SetFmtAttr( aSet );
-            pNewPgDsc->GetFirstLeft().SetFmtAttr( aSet );
+            pNewPgDsc->GetLeft().SetFormatAttr( aSet );
+            pNewPgDsc->GetFirstLeft().SetFormatAttr( aSet );
         }
-        pNewPgDsc->GetMaster().SetFmtAttr( aSet );
-        pNewPgDsc->GetFirstMaster().SetFmtAttr( aSet );
+        pNewPgDsc->GetMaster().SetFormatAttr( aSet );
+        pNewPgDsc->GetFirstMaster().SetFormatAttr( aSet );
     }
     return pNewPgDsc;
 }
@@ -1536,9 +1536,9 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
     SwNumRule* pNewRule;
 
-    for (size_t n = 0; n < m_rDoc.GetNumRuleTbl().size(); ++n )
+    for (size_t n = 0; n < m_rDoc.GetNumRuleTable().size(); ++n )
     {
-        if (nId == ( pNewRule = m_rDoc.GetNumRuleTbl()[ n ] )->GetPoolFmtId())
+        if (nId == ( pNewRule = m_rDoc.GetNumRuleTable()[ n ] )->GetPoolFormatId())
         {
             return pNewRule;
         }
@@ -1554,7 +1554,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
     ResId aResId( sal_uInt32(RC_POOLNUMRULE_BEGIN + nId - RES_POOLNUMRULE_BEGIN), *pSwResMgr );
     OUString aNm( aResId );
 
-    SwCharFmt *pNumCFmt = 0, *pBullCFmt = 0;
+    SwCharFormat *pNumCFormat = 0, *pBullCFormat = 0;
 
     const SvxNumberFormat::SvxNumPositionAndSpaceMode eNumberFormatPositionAndSpaceMode
                                   = numfunc::GetDefaultPositionAndSpaceMode(); //#i89178#
@@ -1563,16 +1563,16 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
         sal_uInt16 n = m_rDoc.MakeNumRule( aNm, 0, false, eNumberFormatPositionAndSpaceMode );
 
-        pNewRule = m_rDoc.GetNumRuleTbl()[ n ];
-        pNewRule->SetPoolFmtId( nId );
+        pNewRule = m_rDoc.GetNumRuleTable()[ n ];
+        pNewRule->SetPoolFormatId( nId );
         pNewRule->SetAutoRule( false );
 
         if( RES_POOLNUMRULE_NUM1 <= nId && nId <= RES_POOLNUMRULE_NUM5 )
-            pNumCFmt = GetCharFmtFromPool( RES_POOLCHR_NUM_LEVEL );
+            pNumCFormat = GetCharFormatFromPool( RES_POOLCHR_NUM_LEVEL );
 
         if( ( RES_POOLNUMRULE_BUL1 <= nId && nId <= RES_POOLNUMRULE_BUL5 ) ||
             RES_POOLNUMRULE_NUM5 == nId )
-            pBullCFmt = GetCharFmtFromPool( RES_POOLCHR_NUM_LEVEL );
+            pBullCFormat = GetCharFormatFromPool( RES_POOLCHR_NUM_LEVEL );
 
         if( !bIsModified )
             m_rDoc.getIDocumentState().ResetModified();
@@ -1582,13 +1582,13 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
     {
     case RES_POOLNUMRULE_NUM1:
         {
-            SwNumFmt aFmt;
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_ARABIC);
-            aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetSuffix( "." );
+            SwNumFormat aFormat;
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_ARABIC);
+            aFormat.SetCharFormat( pNumCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetSuffix( "." );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -1599,27 +1599,27 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
@@ -1634,16 +1634,16 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
                 };
 
             const sal_uInt16* pArr = aAbsSpace;
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_ARABIC);
-            aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetIncludeUpperLevels( 1 );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_ARABIC);
+            aFormat.SetCharFormat( pNumCFormat );
+            aFormat.SetIncludeUpperLevels( 1 );
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
             }
 
             sal_uInt16 nSpace = 0;
@@ -1651,69 +1651,69 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( nSpace = nSpace + pArr[ n ] );
-                    aFmt.SetFirstLineOffset( - pArr[ n ] );
+                    aFormat.SetAbsLSpace( nSpace = nSpace + pArr[ n ] );
+                    aFormat.SetFirstLineOffset( - pArr[ n ] );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( nSpace = nSpace + pArr[ n ] );
-                    aFmt.SetIndentAt( nSpace );
-                    aFmt.SetFirstLineIndent( - pArr[ n ] );
+                    aFormat.SetListtabPos( nSpace = nSpace + pArr[ n ] );
+                    aFormat.SetIndentAt( nSpace );
+                    aFormat.SetFirstLineIndent( - pArr[ n ] );
                 }
 
-                aFmt.SetStart( n+1 );
-                pNewRule->Set( n, aFmt );
+                aFormat.SetStart( n+1 );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_NUM3:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_ARABIC);
-            aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetIncludeUpperLevels( 1 );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_ARABIC);
+            aFormat.SetCharFormat( pNumCFormat );
+            aFormat.SetIncludeUpperLevels( 1 );
 
             sal_uInt16 nOffs = GetMetricVal( CM_1 ) * 3;
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - nOffs );
+                aFormat.SetFirstLineOffset( - nOffs );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - nOffs );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - nOffs );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( (n+1) * nOffs );
+                    aFormat.SetAbsLSpace( (n+1) * nOffs );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
                     long nPos = (n+1) * static_cast<long>(nOffs);
-                    aFmt.SetListtabPos(nPos);
-                    aFmt.SetIndentAt(nPos);
+                    aFormat.SetListtabPos(nPos);
+                    aFormat.SetIndentAt(nPos);
                 }
 
-                aFmt.SetStart( n+1 );
-                pNewRule->Set( n, aFmt );
+                aFormat.SetStart( n+1 );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_NUM4:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER);
-            aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetSuffix( "." );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_ROMAN_UPPER);
+            aFormat.SetCharFormat( pNumCFormat );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetSuffix( "." );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -1724,29 +1724,29 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::SPACE );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::SPACE );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
-                aFmt.SetStart( n + 1 );
+                aFormat.SetStart( n + 1 );
 
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
@@ -1761,118 +1761,118 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
                 };
 
             const sal_uInt16* pArr0to2 = aAbsSpace0to2;
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_ARABIC);
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetSuffix( "." );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_ARABIC);
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetSuffix( "." );
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
             }
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( -pArr0to2[0] );    // == 0.40 cm
-                aFmt.SetAbsLSpace( pArr0to2[1] );           // == 0.40 cm
+                aFormat.SetFirstLineOffset( -pArr0to2[0] );    // == 0.40 cm
+                aFormat.SetAbsLSpace( pArr0to2[1] );           // == 0.40 cm
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetFirstLineIndent( -pArr0to2[0] );
-                aFmt.SetListtabPos( pArr0to2[1] );
-                aFmt.SetIndentAt( pArr0to2[1] );
+                aFormat.SetFirstLineIndent( -pArr0to2[0] );
+                aFormat.SetListtabPos( pArr0to2[1] );
+                aFormat.SetIndentAt( pArr0to2[1] );
             }
 
-            aFmt.SetCharFmt( pNumCFmt );
-            pNewRule->Set( 0, aFmt );
+            aFormat.SetCharFormat( pNumCFormat );
+            pNewRule->Set( 0, aFormat );
 
-            aFmt.SetIncludeUpperLevels( 2 );
-            aFmt.SetStart( 2 );
+            aFormat.SetIncludeUpperLevels( 2 );
+            aFormat.SetStart( 2 );
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( -pArr0to2[2] );    // == 0.65 cm
-                aFmt.SetAbsLSpace( pArr0to2[3] );           // == 1.10 cm
+                aFormat.SetFirstLineOffset( -pArr0to2[2] );    // == 0.65 cm
+                aFormat.SetAbsLSpace( pArr0to2[3] );           // == 1.10 cm
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetFirstLineIndent( -pArr0to2[2] );
-                aFmt.SetListtabPos( pArr0to2[3] );
-                aFmt.SetIndentAt( pArr0to2[3] );
+                aFormat.SetFirstLineIndent( -pArr0to2[2] );
+                aFormat.SetListtabPos( pArr0to2[3] );
+                aFormat.SetIndentAt( pArr0to2[3] );
             }
 
-            pNewRule->Set( 1, aFmt );
+            pNewRule->Set( 1, aFormat );
 
-            aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
-            aFmt.SetSuffix(OUString(static_cast<sal_Unicode>(')')));
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetStart( 3 );
+            aFormat.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
+            aFormat.SetSuffix(OUString(static_cast<sal_Unicode>(')')));
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetStart( 3 );
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - pArr0to2[4] );   // == 0.45cm
-                aFmt.SetAbsLSpace( pArr0to2[5] );           // == 1.55 cm
+                aFormat.SetFirstLineOffset( - pArr0to2[4] );   // == 0.45cm
+                aFormat.SetAbsLSpace( pArr0to2[5] );           // == 1.55 cm
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetFirstLineIndent( -pArr0to2[4] );
-                aFmt.SetListtabPos( pArr0to2[5] );
-                aFmt.SetIndentAt( pArr0to2[5] );
+                aFormat.SetFirstLineIndent( -pArr0to2[4] );
+                aFormat.SetListtabPos( pArr0to2[5] );
+                aFormat.SetIndentAt( pArr0to2[5] );
             }
 
-            pNewRule->Set( 2, aFmt );
+            pNewRule->Set( 2, aFormat );
 
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetBulletFont(  &numfunc::GetDefBulletFont() );
-            aFmt.SetBulletChar( cBulletChar );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetBulletFont(  &numfunc::GetDefBulletFont() );
+            aFormat.SetBulletChar( cBulletChar );
             sal_Int16 nOffs = GetMetricVal( CM_01 ) * 4,
                    nOffs2 = GetMetricVal( CM_1 ) * 2;
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - nOffs );
+                aFormat.SetFirstLineOffset( - nOffs );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetFirstLineIndent( - nOffs );
+                aFormat.SetFirstLineIndent( - nOffs );
             }
 
-            aFmt.SetSuffix( OUString() );
+            aFormat.SetSuffix( OUString() );
             for (sal_uInt16 n = 3; n < MAXLEVEL; ++n)
             {
-                aFmt.SetStart( n+1 );
+                aFormat.SetStart( n+1 );
 
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( nOffs2 + ((n-3) * nOffs) );
+                    aFormat.SetAbsLSpace( nOffs2 + ((n-3) * nOffs) );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
                     long nPos = nOffs2 + ((n-3) * static_cast<long>(nOffs));
-                    aFmt.SetListtabPos(nPos);
-                    aFmt.SetIndentAt(nPos);
+                    aFormat.SetListtabPos(nPos);
+                    aFormat.SetIndentAt(nPos);
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
 
     case RES_POOLNUMRULE_BUL1:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
-            aFmt.SetBulletChar( cBulletChar );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
+            aFormat.SetBulletChar( cBulletChar );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -1883,41 +1883,41 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_BUL2:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetBulletFont(  &numfunc::GetDefBulletFont() );
-            aFmt.SetBulletChar( 0x2013 );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetBulletFont(  &numfunc::GetDefBulletFont() );
+            aFormat.SetBulletChar( 0x2013 );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -1928,83 +1928,83 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_BUL3:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
 
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetBulletFont(  &numfunc::GetDefBulletFont() );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetBulletFont(  &numfunc::GetDefBulletFont() );
 
             sal_uInt16 nOffs = GetMetricVal( CM_01 ) * 4;
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - nOffs );
+                aFormat.SetFirstLineOffset( - nOffs );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - nOffs );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - nOffs );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
             {
-                aFmt.SetBulletChar( ( n & 1 ? 0x25a1 : 0x2611 ) );
+                aFormat.SetBulletChar( ( n & 1 ? 0x25a1 : 0x2611 ) );
 
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( ((n & 1) +1) * nOffs );
+                    aFormat.SetAbsLSpace( ((n & 1) +1) * nOffs );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
                     long nPos = ((n & 1) +1) * static_cast<long>(nOffs);
-                    aFmt.SetListtabPos(nPos);
-                    aFmt.SetIndentAt(nPos);
+                    aFormat.SetListtabPos(nPos);
+                    aFormat.SetIndentAt(nPos);
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_BUL4:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetBulletFont(  &numfunc::GetDefBulletFont() );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetBulletFont(  &numfunc::GetDefBulletFont() );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -2016,48 +2016,48 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::SPACE );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::SPACE );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
                 switch( n )
                 {
-                case 0:     aFmt.SetBulletChar( 0x27a2 );   break;
-                case 1:     aFmt.SetBulletChar( 0xE006 );   break;
-                default:    aFmt.SetBulletChar( 0xE004 );   break;
+                case 0:     aFormat.SetBulletChar( 0x27a2 );   break;
+                case 1:     aFormat.SetBulletChar( 0xE006 );   break;
+                default:    aFormat.SetBulletChar( 0xE004 );   break;
                 }
 
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
     case RES_POOLNUMRULE_BUL5:
         {
-            SwNumFmt aFmt;
+            SwNumFormat aFormat;
 
-            aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
-            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStart( 1 );
-            aFmt.SetIncludeUpperLevels( 1 );
-            aFmt.SetBulletChar( 0x2717 );
-            aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+            aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+            aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aFormat.SetCharFormat( pBullCFormat );
+            aFormat.SetStart( 1 );
+            aFormat.SetIncludeUpperLevels( 1 );
+            aFormat.SetBulletChar( 0x2717 );
+            aFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
 
             static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
                 {
@@ -2068,27 +2068,27 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aFmt.SetFirstLineOffset( - (*pArr) );
+                aFormat.SetFirstLineOffset( - (*pArr) );
             }
             else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-                aFmt.SetFirstLineIndent( - (*pArr) );
+                aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                aFormat.SetFirstLineIndent( - (*pArr) );
             }
 
             for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
             {
                 if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
-                    aFmt.SetAbsLSpace( *pArr );
+                    aFormat.SetAbsLSpace( *pArr );
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    aFmt.SetListtabPos( *pArr );
-                    aFmt.SetIndentAt( *pArr );
+                    aFormat.SetListtabPos( *pArr );
+                    aFormat.SetIndentAt( *pArr );
                 }
 
-                pNewRule->Set( n, aFmt );
+                pNewRule->Set( n, aFormat );
             }
         }
         break;
@@ -2098,7 +2098,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
 }
 
 /// Check if this AutoCollection is already/still in use in this Document
-bool DocumentStylePoolManager::IsPoolTxtCollUsed( sal_uInt16 nId ) const
+bool DocumentStylePoolManager::IsPoolTextCollUsed( sal_uInt16 nId ) const
 {
     OSL_ENSURE(
         (RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END) ||
@@ -2109,38 +2109,38 @@ bool DocumentStylePoolManager::IsPoolTxtCollUsed( sal_uInt16 nId ) const
         (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END),
             "Wrong AutoFormat Id" );
 
-    SwTxtFmtColl* pNewColl = 0;
+    SwTextFormatColl* pNewColl = 0;
     bool bFnd = false;
-    for( sal_uInt16 n = 0; !bFnd && n < m_rDoc.GetTxtFmtColls()->size(); ++n )
+    for( sal_uInt16 n = 0; !bFnd && n < m_rDoc.GetTextFormatColls()->size(); ++n )
     {
-        pNewColl = (*m_rDoc.GetTxtFmtColls())[ n ];
-        if( nId == pNewColl->GetPoolFmtId() )
+        pNewColl = (*m_rDoc.GetTextFormatColls())[ n ];
+        if( nId == pNewColl->GetPoolFormatId() )
             bFnd = true;
     }
 
     if( !bFnd || !pNewColl->HasWriterListeners() )
         return false;
 
-    SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() );
+    SwAutoFormatGetDocNode aGetHt( &m_rDoc.GetNodes() );
     return !pNewColl->GetInfo( aGetHt );
 }
 
 /// Check if this AutoCollection is already/still in use
-bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 nId ) const
+bool DocumentStylePoolManager::IsPoolFormatUsed( sal_uInt16 nId ) const
 {
-    const SwFmt *pNewFmt = 0;
-    const SwFmtsBase* pArray[ 2 ];
+    const SwFormat *pNewFormat = 0;
+    const SwFormatsBase* pArray[ 2 ];
     sal_uInt16 nArrCnt = 1;
     bool bFnd = true;
 
     if (RES_POOLCHR_BEGIN <= nId && nId < RES_POOLCHR_END)
     {
-        pArray[0] = m_rDoc.GetCharFmts();
+        pArray[0] = m_rDoc.GetCharFormats();
     }
     else if (RES_POOLFRM_BEGIN <= nId && nId < RES_POOLFRM_END)
     {
-        pArray[0] = m_rDoc.GetFrmFmts();
-        pArray[1] = m_rDoc.GetSpzFrmFmts();
+        pArray[0] = m_rDoc.GetFrameFormats();
+        pArray[1] = m_rDoc.GetSpzFrameFormats();
         nArrCnt = 2;
     }
     else
@@ -2155,19 +2155,19 @@ bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 nId ) const
     {
         bFnd = false;
         while( nArrCnt-- && !bFnd )
-            for( size_t n = 0; !bFnd && n < (*pArray[nArrCnt]).GetFmtCount(); ++n )
-                if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )->
-                        GetPoolFmtId() )
+            for( size_t n = 0; !bFnd && n < (*pArray[nArrCnt]).GetFormatCount(); ++n )
+                if( nId == ( pNewFormat = (*pArray[ nArrCnt ] ).GetFormat( n ) )->
+                        GetPoolFormatId() )
                     bFnd = true;
     }
 
     // Not found or no dependencies?
-    if( bFnd && pNewFmt->HasWriterListeners() )
+    if( bFnd && pNewFormat->HasWriterListeners() )
     {
         // Check if we have dependent ContentNodes in the Nodes array
         // (also indirect ones for derived Formats)
-        SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() );
-        bFnd = !pNewFmt->GetInfo( aGetHt );
+        SwAutoFormatGetDocNode aGetHt( &m_rDoc.GetNodes() );
+        bFnd = !pNewFormat->GetInfo( aGetHt );
     }
     else
         bFnd = false;
@@ -2185,7 +2185,7 @@ bool DocumentStylePoolManager::IsPoolPageDescUsed( sal_uInt16 nId ) const
     for( size_t n = 0; !bFnd && n < m_rDoc.GetPageDescCnt(); ++n )
     {
         pNewPgDsc = &m_rDoc.GetPageDesc(n);
-        if( nId == pNewPgDsc->GetPoolFmtId() )
+        if( nId == pNewPgDsc->GetPoolFormatId() )
             bFnd = true;
     }
 
@@ -2195,7 +2195,7 @@ bool DocumentStylePoolManager::IsPoolPageDescUsed( sal_uInt16 nId ) const
 
     // Check if we have dependent ContentNodes in the Nodes array
     // (also indirect ones for derived Formats)
-    SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() );
+    SwAutoFormatGetDocNode aGetHt( &m_rDoc.GetNodes() );
     return !pNewPgDsc->GetInfo( aGetHt );
 }
 
diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx
index 210eb3689424..8ac66584af7d 100644
--- a/sw/source/core/doc/DocumentTimerManager.cxx
+++ b/sw/source/core/doc/DocumentTimerManager.cxx
@@ -124,23 +124,23 @@ IMPL_LINK_TYPED( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void )
             }
         }
 
-        SwFldUpdateFlags nFldUpdFlag = m_rDoc.GetDocumentSettingManager().getFieldUpdateFlags(true);
-        if( ( AUTOUPD_FIELD_ONLY == nFldUpdFlag
-                    || AUTOUPD_FIELD_AND_CHARTS == nFldUpdFlag ) &&
-                m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().IsFieldsDirty()
+        SwFieldUpdateFlags nFieldUpdFlag = m_rDoc.GetDocumentSettingManager().getFieldUpdateFlags(true);
+        if( ( AUTOUPD_FIELD_ONLY == nFieldUpdFlag
+                    || AUTOUPD_FIELD_AND_CHARTS == nFieldUpdFlag ) &&
+                m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().IsFieldsDirty()
                 // If we switch the field name the Fields are not updated.
                 // So the "background update" should always be carried out
-                /* && !pStartSh->GetViewOptions()->IsFldName()*/ )
+                /* && !pStartSh->GetViewOptions()->IsFieldName()*/ )
         {
-            if ( m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().IsInUpdateFlds() ||
-                 m_rDoc.getIDocumentFieldsAccess().IsExpFldsLocked() )
+            if ( m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().IsInUpdateFields() ||
+                 m_rDoc.getIDocumentFieldsAccess().IsExpFieldsLocked() )
             {
                 pIdle->Start();
                 return;
             }
 
             //  Action brackets!
-            m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetInUpdateFlds( true );
+            m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().SetInUpdateFields( true );
 
             pTmpRoot->StartAllAction();
 
@@ -148,17 +148,17 @@ IMPL_LINK_TYPED( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void )
             const bool bOldLockView = pShell->IsViewLocked();
             pShell->LockView( true );
 
-            m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_CHAPTERFLD )->ModifyNotification( 0, 0 );    // ChapterField
-            m_rDoc.getIDocumentFieldsAccess().UpdateExpFlds( 0, false );      // Updates ExpressionFields
-            m_rDoc.getIDocumentFieldsAccess().UpdateTblFlds(NULL);                // Tables
-            m_rDoc.getIDocumentFieldsAccess().UpdateRefFlds(NULL);                // References
+            m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_CHAPTERFLD )->ModifyNotification( 0, 0 );    // ChapterField
+            m_rDoc.getIDocumentFieldsAccess().UpdateExpFields( 0, false );      // Updates ExpressionFields
+            m_rDoc.getIDocumentFieldsAccess().UpdateTableFields(NULL);                // Tables
+            m_rDoc.getIDocumentFieldsAccess().UpdateRefFields(NULL);                // References
 
             pTmpRoot->EndAllAction();
 
             pShell->LockView( bOldLockView );
 
-            m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetInUpdateFlds( false );
-            m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetFieldsDirty( false );
+            m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().SetInUpdateFields( false );
+            m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().SetFieldsDirty( false );
         }
     }
 #ifdef TIMELOG
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index dab5cf8a00c7..43db6abb9dc7 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -37,9 +37,9 @@ extern ResMgr* pSwResMgr;
                 *SwStyleNameMapper::pRegisterUINameArray = 0,
                 *SwStyleNameMapper::pDocUINameArray = 0,
                 *SwStyleNameMapper::pHTMLUINameArray = 0,
-                *SwStyleNameMapper::pFrmFmtUINameArray = 0,
-                *SwStyleNameMapper::pChrFmtUINameArray = 0,
-                *SwStyleNameMapper::pHTMLChrFmtUINameArray = 0,
+                *SwStyleNameMapper::pFrameFormatUINameArray = 0,
+                *SwStyleNameMapper::pChrFormatUINameArray = 0,
+                *SwStyleNameMapper::pHTMLChrFormatUINameArray = 0,
                 *SwStyleNameMapper::pPageDescUINameArray = 0,
                 *SwStyleNameMapper::pNumRuleUINameArray = 0,
 
@@ -50,9 +50,9 @@ extern ResMgr* pSwResMgr;
                 *SwStyleNameMapper::pRegisterProgNameArray = 0,
                 *SwStyleNameMapper::pDocProgNameArray = 0,
                 *SwStyleNameMapper::pHTMLProgNameArray = 0,
-                *SwStyleNameMapper::pFrmFmtProgNameArray = 0,
-                *SwStyleNameMapper::pChrFmtProgNameArray = 0,
-                *SwStyleNameMapper::pHTMLChrFmtProgNameArray = 0,
+                *SwStyleNameMapper::pFrameFormatProgNameArray = 0,
+                *SwStyleNameMapper::pChrFormatProgNameArray = 0,
+                *SwStyleNameMapper::pHTMLChrFormatProgNameArray = 0,
                 *SwStyleNameMapper::pPageDescProgNameArray = 0,
                 *SwStyleNameMapper::pNumRuleProgNameArray = 0;
 
@@ -233,7 +233,7 @@ const struct SwTableEntry HTMLProgNameTable [] =
     { 0, NULL }
 };
 
-const struct SwTableEntry FrmFmtProgNameTable [] =
+const struct SwTableEntry FrameFormatProgNameTable [] =
 {
     ENTRY( "Frame" ), // RES_POOLFRM_FRAME
     ENTRY( "Graphics" ),
@@ -245,7 +245,7 @@ const struct SwTableEntry FrmFmtProgNameTable [] =
     { 0, NULL }
 };
 
-const struct SwTableEntry ChrFmtProgNameTable [] =
+const struct SwTableEntry ChrFormatProgNameTable [] =
 {
     ENTRY( "Footnote Symbol" ), // RES_POOLCHR_FOOTNOTE
     ENTRY( "Page Number" ),
@@ -267,7 +267,7 @@ const struct SwTableEntry ChrFmtProgNameTable [] =
     { 0, NULL }
 };
 
-const struct SwTableEntry HTMLChrFmtProgNameTable [] =
+const struct SwTableEntry HTMLChrFormatProgNameTable [] =
 {
     ENTRY( "Emphasis" ), // RES_POOLCHR_HTML_EMPHASIS
     ENTRY( "Citation" ),
@@ -447,14 +447,14 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
         case nsSwGetPoolIdFromName::GET_POOLID_CHRFMT:
         {
             pHashPointer = bProgName ? &pCharProgMap : &pCharUIMap;
-            vIndexes.push_back( boost::make_tuple(RES_POOLCHR_NORMAL_BEGIN, RES_POOLCHR_NORMAL_END, bProgName ? &GetChrFmtProgNameArray : &GetChrFmtUINameArray) );
-            vIndexes.push_back( boost::make_tuple(RES_POOLCHR_HTML_BEGIN, RES_POOLCHR_HTML_END, bProgName ? &GetHTMLChrFmtProgNameArray : &GetHTMLChrFmtUINameArray) );
+            vIndexes.push_back( boost::make_tuple(RES_POOLCHR_NORMAL_BEGIN, RES_POOLCHR_NORMAL_END, bProgName ? &GetChrFormatProgNameArray : &GetChrFormatUINameArray) );
+            vIndexes.push_back( boost::make_tuple(RES_POOLCHR_HTML_BEGIN, RES_POOLCHR_HTML_END, bProgName ? &GetHTMLChrFormatProgNameArray : &GetHTMLChrFormatUINameArray) );
         }
         break;
         case nsSwGetPoolIdFromName::GET_POOLID_FRMFMT:
         {
             pHashPointer = bProgName ? &pFrameProgMap : &pFrameUIMap;
-            vIndexes.push_back( boost::make_tuple(RES_POOLFRM_BEGIN, RES_POOLFRM_END, bProgName ? &GetFrmFmtProgNameArray : &GetFrmFmtUINameArray) );
+            vIndexes.push_back( boost::make_tuple(RES_POOLFRM_BEGIN, RES_POOLFRM_END, bProgName ? &GetFrameFormatProgNameArray : &GetFrameFormatUINameArray) );
         }
         break;
         case nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC:
@@ -637,19 +637,19 @@ const OUString& SwStyleNameMapper::getNameFromId(
     case POOLGRP_CHARFMT:
         if( RES_POOLCHR_NORMAL_BEGIN <= nId && nId < RES_POOLCHR_NORMAL_END )
         {
-            pStrArr = bProgName ? &GetChrFmtProgNameArray() : &GetChrFmtUINameArray();
+            pStrArr = bProgName ? &GetChrFormatProgNameArray() : &GetChrFormatUINameArray();
             nStt = RES_POOLCHR_NORMAL_BEGIN;
         }
         else if( RES_POOLCHR_HTML_BEGIN <= nId && nId < RES_POOLCHR_HTML_END )
         {
-            pStrArr = bProgName ? &GetHTMLChrFmtProgNameArray() : &GetHTMLChrFmtUINameArray();
+            pStrArr = bProgName ? &GetHTMLChrFormatProgNameArray() : &GetHTMLChrFormatUINameArray();
             nStt = RES_POOLCHR_HTML_BEGIN;
         }
         break;
     case POOLGRP_FRAMEFMT:
         if( RES_POOLFRM_BEGIN <= nId && nId < RES_POOLFRM_END )
         {
-            pStrArr = bProgName ? &GetFrmFmtProgNameArray() : &GetFrmFmtUINameArray();
+            pStrArr = bProgName ? &GetFrameFormatProgNameArray() : &GetFrameFormatUINameArray();
             nStt = RES_POOLFRM_BEGIN;
         }
         break;
@@ -769,28 +769,28 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray()
     return *pHTMLUINameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetFrmFmtUINameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray()
 {
-    if (!pFrmFmtUINameArray)
-        pFrmFmtUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
+    if (!pFrameFormatUINameArray)
+        pFrameFormatUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
             RC_POOLFRMFMT_BEGIN + (RES_POOLFRM_END - RES_POOLFRM_BEGIN) );
-    return *pFrmFmtUINameArray;
+    return *pFrameFormatUINameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetChrFmtUINameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray()
 {
-    if (!pChrFmtUINameArray)
-        pChrFmtUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
+    if (!pChrFormatUINameArray)
+        pChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
             RC_POOLCHRFMT_BEGIN + (RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN) );
-    return *pChrFmtUINameArray;
+    return *pChrFormatUINameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFmtUINameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray()
 {
-    if (!pHTMLChrFmtUINameArray)
-        pHTMLChrFmtUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
+    if (!pHTMLChrFormatUINameArray)
+        pHTMLChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
             RC_POOLCHRFMT_HTML_BEGIN + (RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN) );
-    return *pHTMLChrFmtUINameArray;
+    return *pHTMLChrFormatUINameArray;
 }
 
 const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray()
@@ -857,28 +857,28 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLProgNameArray()
     return *pHTMLProgNameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetFrmFmtProgNameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatProgNameArray()
 {
-    if (!pFrmFmtProgNameArray)
-        pFrmFmtProgNameArray = lcl_NewProgNameArray( FrmFmtProgNameTable,
-            sizeof ( FrmFmtProgNameTable ) / sizeof ( SwTableEntry ) );
-    return *pFrmFmtProgNameArray;
+    if (!pFrameFormatProgNameArray)
+        pFrameFormatProgNameArray = lcl_NewProgNameArray( FrameFormatProgNameTable,
+            sizeof ( FrameFormatProgNameTable ) / sizeof ( SwTableEntry ) );
+    return *pFrameFormatProgNameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetChrFmtProgNameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatProgNameArray()
 {
-    if (!pChrFmtProgNameArray)
-        pChrFmtProgNameArray = lcl_NewProgNameArray( ChrFmtProgNameTable,
-            sizeof ( ChrFmtProgNameTable ) / sizeof ( SwTableEntry ) );
-    return *pChrFmtProgNameArray;
+    if (!pChrFormatProgNameArray)
+        pChrFormatProgNameArray = lcl_NewProgNameArray( ChrFormatProgNameTable,
+            sizeof ( ChrFormatProgNameTable ) / sizeof ( SwTableEntry ) );
+    return *pChrFormatProgNameArray;
 }
 
-const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFmtProgNameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatProgNameArray()
 {
-    if (!pHTMLChrFmtProgNameArray)
-        pHTMLChrFmtProgNameArray = lcl_NewProgNameArray( HTMLChrFmtProgNameTable,
-            sizeof ( HTMLChrFmtProgNameTable ) / sizeof ( SwTableEntry ) );
-    return *pHTMLChrFmtProgNameArray;
+    if (!pHTMLChrFormatProgNameArray)
+        pHTMLChrFormatProgNameArray = lcl_NewProgNameArray( HTMLChrFormatProgNameTable,
+            sizeof ( HTMLChrFormatProgNameTable ) / sizeof ( SwTableEntry ) );
+    return *pHTMLChrFormatProgNameArray;
 }
 
 const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescProgNameArray()
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 05e2b821a5f9..50afa2e7ad1a 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -297,7 +297,7 @@ const char * dbg_out(const SfxItemSet & rSet)
     return dbg_out(lcl_dbg_out(rSet));
 }
 
-static const OUString lcl_dbg_out(const SwTxtAttr & rAttr)
+static const OUString lcl_dbg_out(const SwTextAttr & rAttr)
 {
     OUString aStr("[ ");
 
@@ -312,7 +312,7 @@ static const OUString lcl_dbg_out(const SwTxtAttr & rAttr)
     return aStr;
 }
 
-const char * dbg_out(const SwTxtAttr & rAttr)
+const char * dbg_out(const SwTextAttr & rAttr)
 {
     return dbg_out(lcl_dbg_out(rAttr));
 }
@@ -413,31 +413,31 @@ const char * dbg_out(const SwRect & rRect)
     return dbg_out(lcl_dbg_out(rRect));
 }
 
-static OUString lcl_dbg_out(const SwFrmFmt & rFrmFmt)
+static OUString lcl_dbg_out(const SwFrameFormat & rFrameFormat)
 {
     OUString aResult("[ ");
 
     char sBuffer[256];
-    sprintf(sBuffer, "%p", &rFrmFmt);
+    sprintf(sBuffer, "%p", &rFrameFormat);
 
     aResult += OUString(sBuffer, strlen(sBuffer), RTL_TEXTENCODING_ASCII_US);
     aResult += "(";
-    aResult += rFrmFmt.GetName();
+    aResult += rFrameFormat.GetName();
     aResult += ")";
 
-    if (rFrmFmt.IsAuto())
+    if (rFrameFormat.IsAuto())
         aResult += "*";
 
     aResult += " ,";
-    aResult += lcl_dbg_out(rFrmFmt.FindLayoutRect());
+    aResult += lcl_dbg_out(rFrameFormat.FindLayoutRect());
     aResult += " ]";
 
     return aResult;
 }
 
-const char * dbg_out(const SwFrmFmt & rFrmFmt)
+const char * dbg_out(const SwFrameFormat & rFrameFormat)
 {
-    return dbg_out(lcl_dbg_out(rFrmFmt));
+    return dbg_out(lcl_dbg_out(rFrameFormat));
 }
 
 static const OUString lcl_AnchoredFrames(const SwNode & rNode)
@@ -447,16 +447,16 @@ static const OUString lcl_AnchoredFrames(const SwNode & rNode)
     const SwDoc * pDoc = rNode.GetDoc();
     if (pDoc)
     {
-        const SwFrmFmts * pFrmFmts = pDoc->GetSpzFrmFmts();
+        const SwFrameFormats * pFrameFormats = pDoc->GetSpzFrameFormats();
 
-        if (pFrmFmts)
+        if (pFrameFormats)
         {
             bool bFirst = true;
-            for (SwFrmFmts::const_iterator i(pFrmFmts->begin());
-                 i != pFrmFmts->end(); ++i)
+            for (SwFrameFormats::const_iterator i(pFrameFormats->begin());
+                 i != pFrameFormats->end(); ++i)
             {
-                const SwFmtAnchor & rAnchor = (*i)->GetAnchor();
-                const SwPosition * pPos = rAnchor.GetCntntAnchor();
+                const SwFormatAnchor & rAnchor = (*i)->GetAnchor();
+                const SwPosition * pPos = rAnchor.GetContentAnchor();
 
                 if (pPos && &pPos->nNode.GetNode() == &rNode)
                 {
@@ -542,31 +542,31 @@ static OUString lcl_dbg_out(const SwNode & rNode)
 
     aTmpStr += "\">";
 
-    const SwTxtNode * pTxtNode = rNode.GetTxtNode();
+    const SwTextNode * pTextNode = rNode.GetTextNode();
 
-    if (rNode.IsTxtNode())
+    if (rNode.IsTextNode())
     {
-        const SfxItemSet * pAttrSet = pTxtNode->GetpSwAttrSet();
+        const SfxItemSet * pAttrSet = pTextNode->GetpSwAttrSet();
 
         aTmpStr += "<txt>";
-        aTmpStr += pTxtNode->GetTxt().getLength() > 10 ? pTxtNode->GetTxt().copy(0, 10) : pTxtNode->GetTxt();
+        aTmpStr += pTextNode->GetText().getLength() > 10 ? pTextNode->GetText().copy(0, 10) : pTextNode->GetText();
         aTmpStr += "</txt>";
 
         if (rNode.IsTableNode())
             aTmpStr += "<tbl/>";
 
         aTmpStr += "<outlinelevel>";
-        aTmpStr += OUString::number(pTxtNode->GetAttrOutlineLevel()-1);
+        aTmpStr += OUString::number(pTextNode->GetAttrOutlineLevel()-1);
         aTmpStr += "</outlinelevel>";
 
-        const SwNumRule * pNumRule = pTxtNode->GetNumRule();
+        const SwNumRule * pNumRule = pTextNode->GetNumRule();
 
         if (pNumRule != NULL)
         {
             aTmpStr += "<number>";
-            if ( pTxtNode->GetNum() )
+            if ( pTextNode->GetNum() )
             {
-                aTmpStr += lcl_dbg_out(*(pTxtNode->GetNum()));
+                aTmpStr += lcl_dbg_out(*(pTextNode->GetNum()));
             }
             aTmpStr += "</number>";
 
@@ -585,25 +585,25 @@ static OUString lcl_dbg_out(const SwNode & rNode)
                 aTmpStr += "*";
             }
 
-            const SwNumFmt * pNumFmt = NULL;
+            const SwNumFormat * pNumFormat = NULL;
             aTmpStr += "</rule>";
 
-            if (pTxtNode->GetActualListLevel() > 0)
-                pNumFmt = pNumRule->GetNumFmt( static_cast< sal_uInt16 >(pTxtNode->GetActualListLevel()) );
+            if (pTextNode->GetActualListLevel() > 0)
+                pNumFormat = pNumRule->GetNumFormat( static_cast< sal_uInt16 >(pTextNode->GetActualListLevel()) );
 
-            if (pNumFmt)
+            if (pNumFormat)
             {
                 aTmpStr += "<numformat>";
                 aTmpStr +=
-                    lcl_dbg_out_NumType(pNumFmt->GetNumberingType());
+                    lcl_dbg_out_NumType(pNumFormat->GetNumberingType());
                 aTmpStr += "</numformat>";
             }
         }
 
-        if (pTxtNode->IsCountedInList())
+        if (pTextNode->IsCountedInList())
             aTmpStr += "<counted/>";
 
-        SwFmtColl * pColl = pTxtNode->GetFmtColl();
+        SwFormatColl * pColl = pTextNode->GetFormatColl();
 
         if (pColl)
         {
@@ -612,10 +612,10 @@ static OUString lcl_dbg_out(const SwNode & rNode)
 
             aTmpStr += "(";
 
-            SwTxtFmtColl *pTxtColl = static_cast<SwTxtFmtColl*>(pColl);
-            if (pTxtColl->IsAssignedToListLevelOfOutlineStyle())
+            SwTextFormatColl *pTextColl = static_cast<SwTextFormatColl*>(pColl);
+            if (pTextColl->IsAssignedToListLevelOfOutlineStyle())
             {
-                aTmpStr += OUString::number(pTxtColl->GetAssignedOutlineStyleLevel());
+                aTmpStr += OUString::number(pTextColl->GetAssignedOutlineStyleLevel());
             }
             else
             {
@@ -624,7 +624,7 @@ static OUString lcl_dbg_out(const SwNode & rNode)
 
             const SwNumRuleItem & rItem =
                 static_cast<const SwNumRuleItem &>
-                (pColl->GetFmtAttr(RES_PARATR_NUMRULE));
+                (pColl->GetFormatAttr(RES_PARATR_NUMRULE));
             const OUString sNumruleName = rItem.GetValue();
 
             if (!sNumruleName.isEmpty())
@@ -636,7 +636,7 @@ static OUString lcl_dbg_out(const SwNode & rNode)
             aTmpStr += "</coll>";
         }
 
-        SwFmtColl * pCColl = pTxtNode->GetCondFmtColl();
+        SwFormatColl * pCColl = pTextNode->GetCondFormatColl();
 
         if (pCColl)
         {
@@ -652,7 +652,7 @@ static OUString lcl_dbg_out(const SwNode & rNode)
         if (bDbgOutPrintAttrSet)
         {
             aTmpStr += "<attrs>";
-            aTmpStr += lcl_dbg_out(pTxtNode->GetSwAttrSet());
+            aTmpStr += lcl_dbg_out(pTextNode->GetSwAttrSet());
             aTmpStr += "</attrs>";
         }
     }
@@ -687,7 +687,7 @@ const char * dbg_out(const SwNode * pNode)
         return NULL;
 }
 
-const char * dbg_out(const SwCntntNode * pNode)
+const char * dbg_out(const SwContentNode * pNode)
 {
     if (NULL != pNode)
         return dbg_out(*pNode);
@@ -695,7 +695,7 @@ const char * dbg_out(const SwCntntNode * pNode)
         return NULL;
 }
 
-const char * dbg_out(const SwTxtNode * pNode)
+const char * dbg_out(const SwTextNode * pNode)
 {
     if (NULL != pNode)
         return dbg_out(*pNode);
@@ -829,11 +829,11 @@ const char * dbg_out(const SwRewriter & rRewriter)
     return dbg_out(lcl_dbg_out(rRewriter));
 }
 
-static OUString lcl_dbg_out(const SvxNumberFormat & rFmt)
+static OUString lcl_dbg_out(const SvxNumberFormat & rFormat)
 {
     OUString aResult;
 
-    aResult = lcl_dbg_out_NumType(rFmt.GetNumberingType());
+    aResult = lcl_dbg_out_NumType(rFormat.GetNumberingType());
 
     return aResult;
 }
@@ -865,45 +865,45 @@ const char * dbg_out(const SwNumRule & rRule)
     return dbg_out(lcl_dbg_out(rRule));
 }
 
-static OUString lcl_dbg_out(const SwTxtFmtColl & rFmt)
+static OUString lcl_dbg_out(const SwTextFormatColl & rFormat)
 {
-    OUString aResult(rFmt.GetName());
+    OUString aResult(rFormat.GetName());
 
     aResult += "(";
-    aResult += OUString::number(rFmt.GetAttrOutlineLevel());
+    aResult += OUString::number(rFormat.GetAttrOutlineLevel());
     aResult += ")";
 
     return aResult;
 }
 
-const char * dbg_out(const SwTxtFmtColl & rFmt)
+const char * dbg_out(const SwTextFormatColl & rFormat)
 {
-    return dbg_out(lcl_dbg_out(rFmt));
+    return dbg_out(lcl_dbg_out(rFormat));
 }
 
-static OUString lcl_dbg_out(const SwFrmFmts & rFrmFmts)
+static OUString lcl_dbg_out(const SwFrameFormats & rFrameFormats)
 {
-    return lcl_dbg_out_SvPtrArr<SwFrmFmts>(rFrmFmts);
+    return lcl_dbg_out_SvPtrArr<SwFrameFormats>(rFrameFormats);
 }
 
-const char * dbg_out(const SwFrmFmts & rFrmFmts)
+const char * dbg_out(const SwFrameFormats & rFrameFormats)
 {
-    return dbg_out(lcl_dbg_out(rFrmFmts));
+    return dbg_out(lcl_dbg_out(rFrameFormats));
 }
 
-static OUString lcl_dbg_out(const SwNumRuleTbl & rTbl)
+static OUString lcl_dbg_out(const SwNumRuleTable & rTable)
 {
     OUString aResult("[");
 
-    for (size_t n = 0; n < rTbl.size(); n++)
+    for (size_t n = 0; n < rTable.size(); n++)
     {
         if (n > 0)
             aResult += ", ";
 
-        aResult += rTbl[n]->GetName();
+        aResult += rTable[n]->GetName();
 
         char sBuffer[256];
-        sprintf(sBuffer, "(%p)", rTbl[n]);
+        sprintf(sBuffer, "(%p)", rTable[n]);
         aResult += OUString(sBuffer, strlen(sBuffer), RTL_TEXTENCODING_ASCII_US);
     }
 
@@ -912,9 +912,9 @@ static OUString lcl_dbg_out(const SwNumRuleTbl & rTbl)
     return aResult;
 }
 
-const char * dbg_out(const SwNumRuleTbl & rTbl)
+const char * dbg_out(const SwNumRuleTable & rTable)
 {
-    return dbg_out(lcl_dbg_out(rTbl));
+    return dbg_out(lcl_dbg_out(rTable));
 }
 
 static OUString lcl_TokenType2Str(FormTokenType nType)
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index e90448e836df..f1880db1d6ae 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -500,13 +500,13 @@ void SwDoc::ChgDBData(const SwDBData& rNewData)
         maDBData = rNewData;
         getIDocumentState().SetModified();
     }
-    getIDocumentFieldsAccess().GetSysFldType(RES_DBNAMEFLD)->UpdateFlds();
+    getIDocumentFieldsAccess().GetSysFieldType(RES_DBNAMEFLD)->UpdateFields();
 }
 
-struct _PostItFld : public _SetGetExpFld
+struct _PostItField : public _SetGetExpField
 {
-    _PostItFld( const SwNodeIndex& rNdIdx, const SwTxtFld* pFld,  const SwIndex* pIdx = 0 )
-        : _SetGetExpFld( rNdIdx, pFld, pIdx ) {}
+    _PostItField( const SwNodeIndex& rNdIdx, const SwTextField* pField,  const SwIndex* pIdx = 0 )
+        : _SetGetExpField( rNdIdx, pField, pIdx ) {}
 
     sal_uInt16 GetPageNo( const StringRangeEnumerator &rRangeEnum,
             const std::set< sal_Int32 > &rPossiblePages,
@@ -514,24 +514,24 @@ struct _PostItFld : public _SetGetExpFld
 
     const SwPostItField* GetPostIt() const
     {
-        return static_cast<const SwPostItField*>( GetTxtFld()->GetFmtFld().GetField() );
+        return static_cast<const SwPostItField*>( GetTextField()->GetFormatField().GetField() );
     }
 };
 
-sal_uInt16 _PostItFld::GetPageNo(
+sal_uInt16 _PostItField::GetPageNo(
     const StringRangeEnumerator &rRangeEnum,
     const std::set< sal_Int32 > &rPossiblePages,
     /* out */ sal_uInt16& rVirtPgNo, /* out */ sal_uInt16& rLineNo )
 {
-    //Problem: If a PostItFld is contained in a Node that is represented
+    //Problem: If a PostItField is contained in a Node that is represented
     //by more than one layout instance,
     //we have to decide whether it should be printed once or n-times.
     //Probably only once. For the page number we don't select a random one,
     //but the PostIt's first occurrence in the selected area.
     rVirtPgNo = 0;
-    const sal_Int32 nPos = GetCntnt();
-    SwIterator<SwTxtFrm,SwTxtNode> aIter( GetTxtFld()->GetTxtNode() );
-    for( SwTxtFrm* pFrm = aIter.First(); pFrm;  pFrm = aIter.Next() )
+    const sal_Int32 nPos = GetContent();
+    SwIterator<SwTextFrm,SwTextNode> aIter( GetTextField()->GetTextNode() );
+    for( SwTextFrm* pFrm = aIter.First(); pFrm;  pFrm = aIter.Next() )
     {
         if( pFrm->GetOfst() > nPos ||
             (pFrm->HasFollow() && pFrm->GetFollow()->GetOfst() <= nPos) )
@@ -550,28 +550,28 @@ sal_uInt16 _PostItFld::GetPageNo(
 
 bool sw_GetPostIts(
     IDocumentFieldsAccess* pIDFA,
-    _SetGetExpFlds * pSrtLst )
+    _SetGetExpFields * pSrtLst )
 {
     bool bHasPostIts = false;
 
-    SwFieldType* pFldType = pIDFA->GetSysFldType( RES_POSTITFLD );
-    OSL_ENSURE( pFldType, "no PostItType ? ");
+    SwFieldType* pFieldType = pIDFA->GetSysFieldType( RES_POSTITFLD );
+    OSL_ENSURE( pFieldType, "no PostItType ? ");
 
-    if( pFldType->HasWriterListeners() )
+    if( pFieldType->HasWriterListeners() )
     {
         // Found modify object; insert all fields into the array
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-        for( SwFmtFld* pFld = aIter.First(); pFld;  pFld = aIter.Next() )
+        SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+        for( SwFormatField* pField = aIter.First(); pField;  pField = aIter.Next() )
         {
-            const SwTxtFld* pTxtFld;
-            if( 0 != ( pTxtFld = pFld->GetTxtFld() ) &&
-                pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+            const SwTextField* pTextField;
+            if( 0 != ( pTextField = pField->GetTextField() ) &&
+                pTextField->GetTextNode().GetNodes().IsDocNodes() )
             {
                 bHasPostIts = true;
                 if (pSrtLst)
                 {
-                    SwNodeIndex aIdx( pTxtFld->GetTxtNode() );
-                    _PostItFld* pNew = new _PostItFld( aIdx, pTxtFld );
+                    SwNodeIndex aIdx( pTextField->GetTextNode() );
+                    _PostItField* pNew = new _PostItField( aIdx, pTextField );
                     pSrtLst->insert( pNew );
                 }
                 else
@@ -596,7 +596,7 @@ static void lcl_FormatPostIt(
 
     if (bNewPage)
     {
-        pIDCO->InsertPoolItem( aPam, SvxFmtBreakItem( SVX_BREAK_PAGE_AFTER, RES_BREAK ) );
+        pIDCO->InsertPoolItem( aPam, SvxFormatBreakItem( SVX_BREAK_PAGE_AFTER, RES_BREAK ) );
         pIDCO->SplitNode( *aPam.GetPoint(), false );
     }
     else if (!bIsFirstPostIt)
@@ -641,9 +641,9 @@ static sal_Int32 lcl_GetPaperBin( const SwPageFrm *pStartFrm )
 {
     sal_Int32 nRes = -1;
 
-    const SwFrmFmt &rFmt = pStartFrm->GetPageDesc()->GetMaster();
+    const SwFrameFormat &rFormat = pStartFrm->GetPageDesc()->GetMaster();
     const SfxPoolItem *pItem = NULL;
-    SfxItemState eState = rFmt.GetItemState( RES_PAPER_BIN, false, &pItem );
+    SfxItemState eState = rFormat.GetItemState( RES_PAPER_BIN, false, &pItem );
     const SvxPaperBinItem *pPaperBinItem = dynamic_cast< const SvxPaperBinItem * >(pItem);
     if (eState > SfxItemState::DEFAULT && pPaperBinItem)
         nRes = pPaperBinItem->GetValue();
@@ -742,7 +742,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
     sal_Int16 nPostItMode = (sal_Int16) rOptions.getIntValue( "PrintAnnotationMode", 0 );
     OSL_ENSURE(nPostItMode == POSTITS_NONE || rData.HasPostItData(),
             "print post-its without post-it data?" );
-    const _SetGetExpFlds::size_type nPostItCount =
+    const _SetGetExpFields::size_type nPostItCount =
         rData.HasPostItData() ? rData.m_pPostItFields->size() : 0;
     if (nPostItMode != POSTITS_NONE && nPostItCount > 0)
     {
@@ -770,9 +770,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 (_SetGetExpFlds::size_type i = 0; i < nPostItCount; ++i)
+        for (_SetGetExpFields::size_type i = 0; i < nPostItCount; ++i)
         {
-            _PostItFld& rPostIt = static_cast<_PostItFld&>(*(*rData.m_pPostItFields)[ i ]);
+            _PostItField& rPostIt = static_cast<_PostItField&>(*(*rData.m_pPostItFields)[ i ]);
             nLastPageNum = nPhyPageNum;
             nPhyPageNum = rPostIt.GetPageNo(
                     aRangeEnum, rData.GetValidPagesSet(), nVirtPg, nLineNo );
@@ -1016,7 +1016,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
 }
 
 /// @return the reference in the doc for the name
-const SwFmtRefMark* SwDoc::GetRefMark( const OUString& rName ) const
+const SwFormatRefMark* SwDoc::GetRefMark( const OUString& rName ) const
 {
     sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
     for( sal_uInt32 n = 0; n < nMaxItems; ++n )
@@ -1025,20 +1025,20 @@ const SwFmtRefMark* SwDoc::GetRefMark( const OUString& rName ) const
         if( 0 == (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n ) ))
             continue;
 
-        const SwFmtRefMark* pFmtRef = static_cast<const SwFmtRefMark*>(pItem);
-        const SwTxtRefMark* pTxtRef = pFmtRef->GetTxtRefMark();
-        if( pTxtRef && &pTxtRef->GetTxtNode().GetNodes() == &GetNodes() &&
-            rName == pFmtRef->GetRefName() )
-            return pFmtRef;
+        const SwFormatRefMark* pFormatRef = static_cast<const SwFormatRefMark*>(pItem);
+        const SwTextRefMark* pTextRef = pFormatRef->GetTextRefMark();
+        if( pTextRef && &pTextRef->GetTextNode().GetNodes() == &GetNodes() &&
+            rName == pFormatRef->GetRefName() )
+            return pFormatRef;
     }
     return 0;
 }
 
 /// @return the RefMark per index - for Uno
-const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
+const SwFormatRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
 {
-    const SwTxtRefMark* pTxtRef;
-    const SwFmtRefMark* pRet = 0;
+    const SwTextRefMark* pTextRef;
+    const SwFormatRefMark* pRet = 0;
 
     sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
     sal_uInt32 nCount = 0;
@@ -1047,12 +1047,12 @@ const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
         const SfxPoolItem* pItem;
 
         if( 0 != (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n )) &&
-            0 != (pTxtRef = static_cast<const SwFmtRefMark*>(pItem)->GetTxtRefMark()) &&
-            &pTxtRef->GetTxtNode().GetNodes() == &GetNodes() )
+            0 != (pTextRef = static_cast<const SwFormatRefMark*>(pItem)->GetTextRefMark()) &&
+            &pTextRef->GetTextNode().GetNodes() == &GetNodes() )
         {
             if(nCount == nIndex)
             {
-                pRet = static_cast<const SwFmtRefMark*>(pItem);
+                pRet = static_cast<const SwFormatRefMark*>(pItem);
                 break;
             }
             nCount++;
@@ -1066,7 +1066,7 @@ const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
 // OS 25.06.96: From now on we always return the reference count
 sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
 {
-    const SwTxtRefMark* pTxtRef;
+    const SwTextRefMark* pTextRef;
 
     const sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
     sal_uInt16 nCount = 0;
@@ -1075,12 +1075,12 @@ sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
         const SfxPoolItem* pItem;
 
         if( 0 != (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n )) &&
-            0 != (pTxtRef = static_cast<const SwFmtRefMark*>(pItem)->GetTxtRefMark()) &&
-            &pTxtRef->GetTxtNode().GetNodes() == &GetNodes() )
+            0 != (pTextRef = static_cast<const SwFormatRefMark*>(pItem)->GetTextRefMark()) &&
+            &pTextRef->GetTextNode().GetNodes() == &GetNodes() )
         {
             if( pNames )
             {
-                OUString pTmp(static_cast<const SwFmtRefMark*>(pItem)->GetRefName());
+                OUString pTmp(static_cast<const SwFormatRefMark*>(pItem)->GetRefName());
                 pNames->insert(pNames->begin() + nCount, pTmp);
             }
             ++nCount;
@@ -1092,27 +1092,27 @@ sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
 
 static bool lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
 {
-    SwTxtNode *pTxtNode = rpNd->GetTxtNode();
+    SwTextNode *pTextNode = rpNd->GetTextNode();
     bool bOnlyWrong = *static_cast<sal_Bool*>(pArgs);
-    if( pTxtNode )
+    if( pTextNode )
     {
         if( bOnlyWrong )
         {
-            if( pTxtNode->GetWrong() &&
-                pTxtNode->GetWrong()->InvalidateWrong() )
-                pTxtNode->SetWrongDirty( true );
-            if( pTxtNode->GetGrammarCheck() &&
-                pTxtNode->GetGrammarCheck()->InvalidateWrong() )
-                pTxtNode->SetGrammarCheckDirty( true );
+            if( pTextNode->GetWrong() &&
+                pTextNode->GetWrong()->InvalidateWrong() )
+                pTextNode->SetWrongDirty( true );
+            if( pTextNode->GetGrammarCheck() &&
+                pTextNode->GetGrammarCheck()->InvalidateWrong() )
+                pTextNode->SetGrammarCheckDirty( true );
         }
         else
         {
-            pTxtNode->SetWrongDirty( true );
-            if( pTxtNode->GetWrong() )
-                pTxtNode->GetWrong()->SetInvalid( 0, COMPLETE_STRING );
-            pTxtNode->SetGrammarCheckDirty( true );
-            if( pTxtNode->GetGrammarCheck() )
-                pTxtNode->GetGrammarCheck()->SetInvalid( 0, COMPLETE_STRING );
+            pTextNode->SetWrongDirty( true );
+            if( pTextNode->GetWrong() )
+                pTextNode->GetWrong()->SetInvalid( 0, COMPLETE_STRING );
+            pTextNode->SetGrammarCheckDirty( true );
+            if( pTextNode->GetGrammarCheck() )
+                pTextNode->GetGrammarCheck()->SetInvalid( 0, COMPLETE_STRING );
         }
     }
     return true;
@@ -1120,13 +1120,13 @@ static bool lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
 
 static bool lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void*  )
 {
-    SwTxtNode *pTxtNode = rpNd->GetTxtNode();
-    if( pTxtNode )
+    SwTextNode *pTextNode = rpNd->GetTextNode();
+    if( pTextNode )
     {
-        pTxtNode->SetSmartTagDirty( true );
-        if( pTxtNode->GetSmartTags() )
+        pTextNode->SetSmartTagDirty( true );
+        if( pTextNode->GetSmartTags() )
         {
-            pTxtNode->SetSmartTags( NULL );
+            pTextNode->SetSmartTags( NULL );
         }
     }
     return true;
@@ -1166,28 +1166,28 @@ void SwDoc::InvalidateAutoCompleteFlag()
         std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllInvalidateAutoCompleteWords));
         for( sal_uLong nNd = 1, nCnt = GetNodes().Count(); nNd < nCnt; ++nNd )
         {
-            SwTxtNode* pTxtNode = GetNodes()[ nNd ]->GetTxtNode();
-            if ( pTxtNode ) pTxtNode->SetAutoCompleteWordDirty( true );
+            SwTextNode* pTextNode = GetNodes()[ nNd ]->GetTextNode();
+            if ( pTextNode ) pTextNode->SetAutoCompleteWordDirty( true );
         }
 
         std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::SetIdleFlags));
     }
 }
 
-const SwFmtINetFmt* SwDoc::FindINetAttr( const OUString& rName ) const
+const SwFormatINetFormat* SwDoc::FindINetAttr( const OUString& rName ) const
 {
-    const SwFmtINetFmt* pItem;
-    const SwTxtINetFmt* pTxtAttr;
-    const SwTxtNode* pTxtNd;
+    const SwFormatINetFormat* pItem;
+    const SwTextINetFormat* pTextAttr;
+    const SwTextNode* pTextNd;
     sal_uInt32 n, nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_INETFMT );
     for( n = 0; n < nMaxItems; ++n )
     {
-        pItem = static_cast<const SwFmtINetFmt*>( GetAttrPool().GetItem2( RES_TXTATR_INETFMT, n ) );
+        pItem = static_cast<const SwFormatINetFormat*>( GetAttrPool().GetItem2( RES_TXTATR_INETFMT, n ) );
         if( 0 != pItem &&
             pItem->GetName() == rName &&
-            0 != ( pTxtAttr = pItem->GetTxtINetFmt()) &&
-            0 != ( pTxtNd = pTxtAttr->GetpTxtNode() ) &&
-            &pTxtNd->GetNodes() == &GetNodes() )
+            0 != ( pTextAttr = pItem->GetTextINetFormat()) &&
+            0 != ( pTextNd = pTextAttr->GetpTextNode() ) &&
+            &pTextNd->GetNodes() == &GetNodes() )
         {
             return pItem;
         }
@@ -1207,7 +1207,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm
             ::SetProgressState( static_cast<long>(i), GetDocShell() );
             const sal_uLong nIndex = rOutNds[ i ]->GetIndex();
 
-            const int nLvl = GetNodes()[ nIndex ]->GetTxtNode()->GetAttrOutlineLevel()-1;
+            const int nLvl = GetNodes()[ nIndex ]->GetTextNode()->GetAttrOutlineLevel()-1;
             if( nLvl > nLevel )
                 continue;
             long nEndOfs = 1;
@@ -1216,42 +1216,42 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm
                 rOutNds[ i + 1 ]->GetIndex() : GetNodes().Count();
             bool bKeep = false;
             while( ( nWish || bKeep ) && nIndex + nEndOfs < nNextOutNd &&
-                   GetNodes()[ nIndex + nEndOfs ]->IsTxtNode() )
+                   GetNodes()[ nIndex + nEndOfs ]->IsTextNode() )
             {
-                SwTxtNode* pTxtNode = GetNodes()[ nIndex+nEndOfs ]->GetTxtNode();
-                if (pTxtNode->GetTxt().getLength() && nWish)
+                SwTextNode* pTextNode = GetNodes()[ nIndex+nEndOfs ]->GetTextNode();
+                if (pTextNode->GetText().getLength() && nWish)
                     --nWish;
-                bKeep = pTxtNode->GetSwAttrSet().GetKeep().GetValue();
+                bKeep = pTextNode->GetSwAttrSet().GetKeep().GetValue();
                 ++nEndOfs;
             }
 
             SwNodeRange aRange( *rOutNds[ i ], 0, *rOutNds[ i ], nEndOfs );
             GetNodes()._Copy( aRange, aEndOfDoc );
         }
-        const SwTxtFmtColls *pColl = pExtDoc->GetTxtFmtColls();
-        for( SwTxtFmtColls::size_type i = 0; i < pColl->size(); ++i )
-            (*pColl)[ i ]->ResetFmtAttr( RES_PAGEDESC, RES_BREAK );
+        const SwTextFormatColls *pColl = pExtDoc->GetTextFormatColls();
+        for( SwTextFormatColls::size_type i = 0; i < pColl->size(); ++i )
+            (*pColl)[ i ]->ResetFormatAttr( RES_PAGEDESC, RES_BREAK );
         SwNodeIndex aIndx( pExtDoc->GetNodes().GetEndOfExtras() );
         ++aEndOfDoc;
         while( aIndx < aEndOfDoc )
         {
             SwNode *pNode;
             bool bDelete = false;
-            if( (pNode = &aIndx.GetNode())->IsTxtNode() )
+            if( (pNode = &aIndx.GetNode())->IsTextNode() )
             {
-                SwTxtNode *pNd = pNode->GetTxtNode();
+                SwTextNode *pNd = pNode->GetTextNode();
                 if( pNd->HasSwAttrSet() )
                     pNd->ResetAttr( RES_PAGEDESC, RES_BREAK );
                 if( bImpress )
                 {
-                    SwTxtFmtColl* pMyColl = pNd->GetTxtColl();
+                    SwTextFormatColl* pMyColl = pNd->GetTextColl();
 
                     const sal_uInt16 nHeadLine = static_cast<sal_uInt16>(
                                 !pMyColl->IsAssignedToListLevelOfOutlineStyle()
                                 ? RES_POOLCOLL_HEADLINE2
                                 : RES_POOLCOLL_HEADLINE1 );
-                    pMyColl = pExtDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nHeadLine );
-                    pNd->ChgFmtColl( pMyColl );
+                    pMyColl = pExtDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nHeadLine );
+                    pNd->ChgFormatColl( pMyColl );
                 }
                 if( !pNd->Len() &&
                     pNd->StartOfSectionIndex()+2 < pNd->EndOfSectionIndex() )
@@ -1274,26 +1274,26 @@ bool SwDoc::RemoveInvisibleContent()
     GetIDocumentUndoRedo().StartUndo( UNDO_UI_DELETE_INVISIBLECNTNT, NULL );
 
     {
-        SwTxtNode* pTxtNd;
-        SwIterator<SwFmtFld,SwFieldType> aIter( *getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENPARAFLD )  );
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld;  pFmtFld = aIter.Next() )
+        SwTextNode* pTextNd;
+        SwIterator<SwFormatField,SwFieldType> aIter( *getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENPARAFLD )  );
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField;  pFormatField = aIter.Next() )
         {
-            if( pFmtFld->GetTxtFld() &&
-                0 != ( pTxtNd = pFmtFld->GetTxtFld()->GetpTxtNode() ) &&
-                pTxtNd->GetpSwpHints() && pTxtNd->HasHiddenParaField() &&
-                &pTxtNd->GetNodes() == &GetNodes() )
+            if( pFormatField->GetTextField() &&
+                0 != ( pTextNd = pFormatField->GetTextField()->GetpTextNode() ) &&
+                pTextNd->GetpSwpHints() && pTextNd->HasHiddenParaField() &&
+                &pTextNd->GetNodes() == &GetNodes() )
             {
                 bRet = true;
-                SwPaM aPam(*pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().getLength());
+                SwPaM aPam(*pTextNd, 0, *pTextNd, pTextNd->GetText().getLength());
 
                 // Remove hidden paragraph or delete contents:
                 // Delete contents if
                 // 1. removing the paragraph would result in an empty section or
                 // 2. if the paragraph is the last paragraph in the section and
                 //    there is no paragraph in front of the paragraph:
-                if ( ( 2 == pTxtNd->EndOfSectionIndex() - pTxtNd->StartOfSectionIndex() ) ||
-                     ( 1 == pTxtNd->EndOfSectionIndex() - pTxtNd->GetIndex() &&
-                       !GetNodes()[ pTxtNd->GetIndex() - 1 ]->GetTxtNode() ) )
+                if ( ( 2 == pTextNd->EndOfSectionIndex() - pTextNd->StartOfSectionIndex() ) ||
+                     ( 1 == pTextNd->EndOfSectionIndex() - pTextNd->GetIndex() &&
+                       !GetNodes()[ pTextNd->GetIndex() - 1 ]->GetTextNode() ) )
                 {
                     getIDocumentContentOperations().DeleteRange( aPam );
                 }
@@ -1309,12 +1309,12 @@ bool SwDoc::RemoveInvisibleContent()
     // Remove any hidden paragraph (hidden text attribute)
     for( sal_uLong n = GetNodes().Count(); n; )
     {
-        SwTxtNode* pTxtNd = GetNodes()[ --n ]->GetTxtNode();
-        if ( pTxtNd )
+        SwTextNode* pTextNd = GetNodes()[ --n ]->GetTextNode();
+        if ( pTextNd )
         {
             bool bRemoved = false;
-            SwPaM aPam(*pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().getLength());
-            if ( pTxtNd->HasHiddenCharAttribute( true ) )
+            SwPaM aPam(*pTextNd, 0, *pTextNd, pTextNd->GetText().getLength());
+            if ( pTextNd->HasHiddenCharAttribute( true ) )
             {
                 bRemoved = true;
                 bRet = true;
@@ -1324,9 +1324,9 @@ bool SwDoc::RemoveInvisibleContent()
                 // 1. removing the paragraph would result in an empty section or
                 // 2. if the paragraph is the last paragraph in the section and
                 //    there is no paragraph in front of the paragraph:
-                if ( ( 2 == pTxtNd->EndOfSectionIndex() - pTxtNd->StartOfSectionIndex() ) ||
-                     ( 1 == pTxtNd->EndOfSectionIndex() - pTxtNd->GetIndex() &&
-                       !GetNodes()[ pTxtNd->GetIndex() - 1 ]->GetTxtNode() ) )
+                if ( ( 2 == pTextNd->EndOfSectionIndex() - pTextNd->StartOfSectionIndex() ) ||
+                     ( 1 == pTextNd->EndOfSectionIndex() - pTextNd->GetIndex() &&
+                       !GetNodes()[ pTextNd->GetIndex() - 1 ]->GetTextNode() ) )
                 {
                     getIDocumentContentOperations().DeleteRange( aPam );
                 }
@@ -1336,11 +1336,11 @@ bool SwDoc::RemoveInvisibleContent()
                     getIDocumentContentOperations().DelFullPara( aPam );
                 }
             }
-            else if ( pTxtNd->HasHiddenCharAttribute( false ) )
+            else if ( pTextNd->HasHiddenCharAttribute( false ) )
             {
                 bRemoved = true;
                 bRet = true;
-                SwScriptInfo::DeleteHiddenRanges( *pTxtNd );
+                SwScriptInfo::DeleteHiddenRanges( *pTextNd );
             }
 
             // Footnotes/Frames may have been removed, therefore we have
@@ -1352,16 +1352,16 @@ bool SwDoc::RemoveInvisibleContent()
 
     {
         // Delete/empty all hidden areas
-        SwSectionFmts aSectFmts;
-        SwSectionFmts& rSectFmts = GetSections();
+        SwSectionFormats aSectFormats;
+        SwSectionFormats& rSectFormats = GetSections();
 
-        for( SwSectionFmts::size_type n = rSectFmts.size(); n; )
+        for( SwSectionFormats::size_type n = rSectFormats.size(); n; )
         {
-            SwSectionFmt* pSectFmt = rSectFmts[ --n ];
+            SwSectionFormat* pSectFormat = rSectFormats[ --n ];
             // don't add sections in Undo/Redo
-            if( !pSectFmt->IsInNodesArr())
+            if( !pSectFormat->IsInNodesArr())
                 continue;
-            SwSection* pSect = pSectFmt->GetSection();
+            SwSection* pSect = pSectFormat->GetSection();
             if( pSect->CalcHiddenFlag() )
             {
                 SwSection* pParent = pSect, *pTmp;
@@ -1372,10 +1372,10 @@ bool SwDoc::RemoveInvisibleContent()
                     pParent = pTmp;
                 }
 
-                SwSectionFmts::iterator it = std::find(
-                        aSectFmts.begin(), aSectFmts.end(), pSect->GetFmt() );
-                if (it == aSectFmts.end())
-                    aSectFmts.insert( aSectFmts.begin(), pSect->GetFmt() );
+                SwSectionFormats::iterator it = std::find(
+                        aSectFormats.begin(), aSectFormats.end(), pSect->GetFormat() );
+                if (it == aSectFormats.end())
+                    aSectFormats.insert( aSectFormats.begin(), pSect->GetFormat() );
             }
             if( !pSect->GetCondition().isEmpty() )
             {
@@ -1386,14 +1386,14 @@ bool SwDoc::RemoveInvisibleContent()
             }
         }
 
-        SwSectionFmts::size_type n = aSectFmts.size();
+        SwSectionFormats::size_type n = aSectFormats.size();
 
         if( 0 != n )
         {
             while( n )
             {
-                SwSectionFmt* pSectFmt = aSectFmts[ --n ];
-                SwSectionNode* pSectNd = pSectFmt->GetSectionNode();
+                SwSectionFormat* pSectFormat = aSectFormats[ --n ];
+                SwSectionNode* pSectNd = pSectFormat->GetSectionNode();
                 if( pSectNd )
                 {
                     bRet = true;
@@ -1405,7 +1405,7 @@ bool SwDoc::RemoveInvisibleContent()
                         pSectNd->EndOfSectionIndex() + 1 )
                     {
                         // only delete the content
-                        SwCntntNode* pCNd = GetNodes().GoNext(
+                        SwContentNode* pCNd = GetNodes().GoNext(
                                                 &aPam.GetPoint()->nNode );
                         aPam.GetPoint()->nContent.Assign( pCNd, 0 );
                         aPam.SetMark();
@@ -1426,7 +1426,7 @@ bool SwDoc::RemoveInvisibleContent()
 
                 }
             }
-            aSectFmts.clear();
+            aSectFormats.clear();
         }
     }
 
@@ -1438,29 +1438,29 @@ bool SwDoc::RemoveInvisibleContent()
 
 bool SwDoc::HasInvisibleContent() const
 {
-    if(SwIterator<SwFmtFld,SwFieldType>(*getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENPARAFLD)).First())
+    if(SwIterator<SwFormatField,SwFieldType>(*getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENPARAFLD)).First())
         return true;
 
     // Search for any hidden paragraph (hidden text attribute)
     for( sal_uLong n = GetNodes().Count()-1; n; --n)
     {
-        SwTxtNode* pTxtNd = GetNodes()[ n ]->GetTxtNode();
-        if ( pTxtNd )
+        SwTextNode* pTextNd = GetNodes()[ n ]->GetTextNode();
+        if ( pTextNd )
         {
-            SwPaM aPam(*pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().getLength());
-            if( pTxtNd->HasHiddenCharAttribute( true ) ||  ( pTxtNd->HasHiddenCharAttribute( false ) ) )
+            SwPaM aPam(*pTextNd, 0, *pTextNd, pTextNd->GetText().getLength());
+            if( pTextNd->HasHiddenCharAttribute( true ) ||  ( pTextNd->HasHiddenCharAttribute( false ) ) )
                 return true;
         }
     }
 
-    const SwSectionFmts& rSectFmts = GetSections();
-    for( SwSectionFmts::size_type n = rSectFmts.size()-1; n; --n )
+    const SwSectionFormats& rSectFormats = GetSections();
+    for( SwSectionFormats::size_type n = rSectFormats.size()-1; n; --n )
     {
-        SwSectionFmt* pSectFmt = rSectFmts[ n ];
+        SwSectionFormat* pSectFormat = rSectFormats[ n ];
         // don't add sections in Undo/Redo
-        if( !pSectFmt->IsInNodesArr())
+        if( !pSectFormat->IsInNodesArr())
             continue;
-        SwSection* pSect = pSectFmt->GetSection();
+        SwSection* pSect = pSectFormat->GetSection();
         if( pSect->IsHidden() )
             return true;
     }
@@ -1483,40 +1483,40 @@ bool SwDoc::RestoreInvisibleContent()
 bool SwDoc::ConvertFieldsToText()
 {
     bool bRet = false;
-    getIDocumentFieldsAccess().LockExpFlds();
+    getIDocumentFieldsAccess().LockExpFields();
     GetIDocumentUndoRedo().StartUndo( UNDO_UI_REPLACE, NULL );
 
-    const SwFldTypes* pMyFldTypes = getIDocumentFieldsAccess().GetFldTypes();
-    const SwFldTypes::size_type nCount = pMyFldTypes->size();
+    const SwFieldTypes* pMyFieldTypes = getIDocumentFieldsAccess().GetFieldTypes();
+    const SwFieldTypes::size_type nCount = pMyFieldTypes->size();
     //go backward, field types are removed
-    for(SwFldTypes::size_type nType = nCount; nType > 0; --nType)
+    for(SwFieldTypes::size_type nType = nCount; nType > 0; --nType)
     {
-        const SwFieldType *pCurType = (*pMyFldTypes)[nType - 1];
+        const SwFieldType *pCurType = (*pMyFieldTypes)[nType - 1];
 
         if ( RES_POSTITFLD == pCurType->Which() )
             continue;
 
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pCurType );
-        ::std::vector<const SwFmtFld*> aFieldFmts;
-        for( SwFmtFld* pCurFldFmt = aIter.First(); pCurFldFmt; pCurFldFmt = aIter.Next() )
-            aFieldFmts.push_back(pCurFldFmt);
+        SwIterator<SwFormatField,SwFieldType> aIter( *pCurType );
+        ::std::vector<const SwFormatField*> aFieldFormats;
+        for( SwFormatField* pCurFieldFormat = aIter.First(); pCurFieldFormat; pCurFieldFormat = aIter.Next() )
+            aFieldFormats.push_back(pCurFieldFormat);
 
-        ::std::vector<const SwFmtFld*>::iterator aBegin = aFieldFmts.begin();
-        ::std::vector<const SwFmtFld*>::iterator aEnd = aFieldFmts.end();
+        ::std::vector<const SwFormatField*>::iterator aBegin = aFieldFormats.begin();
+        ::std::vector<const SwFormatField*>::iterator aEnd = aFieldFormats.end();
         while(aBegin != aEnd)
         {
-            const SwTxtFld *pTxtFld = (*aBegin)->GetTxtFld();
+            const SwTextField *pTextField = (*aBegin)->GetTextField();
             // skip fields that are currently not in the document
             // e.g. fields in undo or redo array
 
-            bool bSkip = !pTxtFld ||
-                         !pTxtFld->GetpTxtNode()->GetNodes().IsDocNodes();
+            bool bSkip = !pTextField ||
+                         !pTextField->GetpTextNode()->GetNodes().IsDocNodes();
 
             if (!bSkip)
             {
-                bool bInHeaderFooter = IsInHeaderFooter(SwNodeIndex(*pTxtFld->GetpTxtNode()));
-                const SwFmtFld& rFmtFld = pTxtFld->GetFmtFld();
-                const SwField*  pField = rFmtFld.GetField();
+                bool bInHeaderFooter = IsInHeaderFooter(SwNodeIndex(*pTextField->GetpTextNode()));
+                const SwFormatField& rFormatField = pTextField->GetFormatField();
+                const SwField*  pField = rFormatField.GetField();
 
                 //#i55595# some fields have to be excluded in headers/footers
                 sal_uInt16 nWhich = pField->GetTyp()->Which();
@@ -1535,15 +1535,15 @@ bool SwDoc::ConvertFieldsToText()
                     if( RES_DBFLD == pCurType->Which() && !static_cast<const SwDBField*>(pField)->IsInitialized())
                         sText.clear();
 
-                    SwPaM aInsertPam(*pTxtFld->GetpTxtNode(), pTxtFld->GetStart());
+                    SwPaM aInsertPam(*pTextField->GetpTextNode(), pTextField->GetStart());
                     aInsertPam.SetMark();
 
                     // go to the end of the field
-                    const SwTxtFld *pFieldAtEnd = sw::DocumentFieldsManager::GetTxtFldAtPos(*aInsertPam.End());
+                    const SwTextField *pFieldAtEnd = sw::DocumentFieldsManager::GetTextFieldAtPos(*aInsertPam.End());
                     if (pFieldAtEnd && pFieldAtEnd->Which() == RES_TXTATR_INPUTFIELD)
                     {
                         SwPosition &rEndPos = *aInsertPam.GetPoint();
-                        rEndPos.nContent = SwCrsrShell::EndOfInputFldAtPos( *aInsertPam.End() );
+                        rEndPos.nContent = SwCrsrShell::EndOfInputFieldAtPos( *aInsertPam.End() );
                     }
                     else
                     {
@@ -1580,24 +1580,24 @@ bool SwDoc::ConvertFieldsToText()
     if( bRet )
         getIDocumentState().SetModified();
     GetIDocumentUndoRedo().EndUndo( UNDO_UI_REPLACE, NULL );
-    getIDocumentFieldsAccess().UnlockExpFlds();
+    getIDocumentFieldsAccess().UnlockExpFields();
     return bRet;
 
 }
 
-bool SwDoc::IsInsTblFormatNum() const
+bool SwDoc::IsInsTableFormatNum() const
 {
-    return SW_MOD()->IsInsTblFormatNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
+    return SW_MOD()->IsInsTableFormatNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
 }
 
-bool SwDoc::IsInsTblChangeNumFormat() const
+bool SwDoc::IsInsTableChangeNumFormat() const
 {
-    return SW_MOD()->IsInsTblChangeNumFormat(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
+    return SW_MOD()->IsInsTableChangeNumFormat(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
 }
 
-bool SwDoc::IsInsTblAlignNum() const
+bool SwDoc::IsInsTableAlignNum() const
 {
-    return SW_MOD()->IsInsTblAlignNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
+    return SW_MOD()->IsInsTableAlignNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
 }
 
 /// Set up the InsertDB as Undo table
@@ -1605,11 +1605,11 @@ void SwDoc::AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable )
 {
     if( bIsTable )
     {
-        const SwTableNode* pTblNd = rPam.GetPoint()->nNode.GetNode().FindTableNode();
-        if( pTblNd )
+        const SwTableNode* pTableNd = rPam.GetPoint()->nNode.GetNode().FindTableNode();
+        if( pTableNd )
         {
-            SwUndoCpyTbl* pUndo = new SwUndoCpyTbl;
-            pUndo->SetTableSttIdx( pTblNd->GetIndex() );
+            SwUndoCpyTable* pUndo = new SwUndoCpyTable;
+            pUndo->SetTableSttIdx( pTableNd->GetIndex() );
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
     }
@@ -1645,15 +1645,15 @@ OUString SwDoc::GetPaMDescr(const SwPaM & rPam)
 {
     if (&rPam.GetNode(true) == &rPam.GetNode(false))
     {
-        SwTxtNode * pTxtNode = rPam.GetNode(true).GetTxtNode();
+        SwTextNode * pTextNode = rPam.GetNode(true).GetTextNode();
 
-        if (0 != pTxtNode)
+        if (0 != pTextNode)
         {
             const sal_Int32 nStart = rPam.Start()->nContent.GetIndex();
             const sal_Int32 nEnd = rPam.End()->nContent.GetIndex();
 
             return SW_RESSTR(STR_START_QUOTE)
-                + ShortenString(pTxtNode->GetTxt().copy(nStart, nEnd - nStart),
+                + ShortenString(pTextNode->GetText().copy(nStart, nEnd - nStart),
                                 nUndoStringLength,
                                 SW_RESSTR(STR_LDOTS))
                 + SW_RESSTR(STR_END_QUOTE);
@@ -1672,30 +1672,30 @@ bool SwDoc::ContainsHiddenChars() const
     for( sal_uLong n = GetNodes().Count(); n; )
     {
         SwNode* pNd = GetNodes()[ --n ];
-        if ( pNd->IsTxtNode() && pNd->GetTxtNode()->HasHiddenCharAttribute( false ) )
+        if ( pNd->IsTextNode() && pNd->GetTextNode()->HasHiddenCharAttribute( false ) )
             return true;
     }
 
     return false;
 }
 
-SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr )
+SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool bTableCrsr )
 {
     SwUnoCrsr* pNew;
-    if( bTblCrsr )
+    if( bTableCrsr )
         pNew = new SwUnoTableCrsr( rPos );
     else
         pNew = new SwUnoCrsr( rPos );
 
-    mpUnoCrsrTbl->insert( pNew );
+    mpUnoCrsrTable->insert( pNew );
     return pNew;
 }
 
 void SwDoc::ChkCondColls()
 {
-     for (SwTxtFmtColls::size_type n = 0; n < mpTxtFmtCollTbl->size(); ++n)
+     for (SwTextFormatColls::size_type n = 0; n < mpTextFormatCollTable->size(); ++n)
      {
-        SwTxtFmtColl *pColl = (*mpTxtFmtCollTbl)[n];
+        SwTextFormatColl *pColl = (*mpTextFormatCollTable)[n];
         if (RES_CONDTXTFMTCOLL == pColl->Which())
             pColl->CallSwClientNotify( SwAttrHint(RES_CONDTXTFMTCOLL) );
      }
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index e28666606618..48c92bb71d9d 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -137,7 +137,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
         return 0;
 
     sal_uInt16 nRet = 0;
-    const SvxMacroTableDtor* pTbl = 0;
+    const SvxMacroTableDtor* pTable = 0;
     switch( rCallEvent.eType )
     {
     case EVENT_OBJECT_INETATTR:
@@ -156,20 +156,20 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
             }
         }
         if( !bCheckPtr )
-            pTbl = rCallEvent.PTR.pINetAttr->GetMacroTbl();
+            pTable = rCallEvent.PTR.pINetAttr->GetMacroTable();
         break;
 
     case EVENT_OBJECT_URLITEM:
     case EVENT_OBJECT_IMAGE:
         {
-            const SwFrmFmt* pFmt = rCallEvent.PTR.pFmt;
+            const SwFrameFormat* pFormat = rCallEvent.PTR.pFormat;
             if( bCheckPtr )
             {
-                if ( GetSpzFrmFmts()->Contains( pFmt ) )
+                if ( GetSpzFrameFormats()->Contains( pFormat ) )
                     bCheckPtr = false;      // misuse as a flag
             }
             if( !bCheckPtr )
-                pTbl = &pFmt->GetMacro().GetMacroTable();
+                pTable = &pFormat->GetMacro().GetMacroTable();
         }
         break;
 
@@ -178,10 +178,10 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
             const IMapObject* pIMapObj = rCallEvent.PTR.IMAP.pIMapObj;
             if( bCheckPtr )
             {
-                const SwFrmFmt* pFmt = rCallEvent.PTR.IMAP.pFmt;
+                const SwFrameFormat* pFormat = rCallEvent.PTR.IMAP.pFormat;
                 const ImageMap* pIMap;
-                if( GetSpzFrmFmts()->Contains( pFmt ) &&
-                    0 != (pIMap = pFmt->GetURL().GetMap()) )
+                if( GetSpzFrameFormats()->Contains( pFormat ) &&
+                    0 != (pIMap = pFormat->GetURL().GetMap()) )
                 {
                     for( size_t nPos = pIMap->GetIMapObjectCount(); nPos; )
                         if( pIMapObj == pIMap->GetIMapObject( --nPos ))
@@ -192,19 +192,19 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
                 }
             }
             if( !bCheckPtr )
-                pTbl = &pIMapObj->GetMacroTable();
+                pTable = &pIMapObj->GetMacroTable();
         }
         break;
     default:
         break;
     }
 
-    if( pTbl )
+    if( pTable )
     {
         nRet = 0x1;
-        if( pTbl->IsKeyValid( nEvent ) )
+        if( pTable->IsKeyValid( nEvent ) )
         {
-            const SvxMacro& rMacro = *pTbl->Get( nEvent );
+            const SvxMacro& rMacro = *pTable->Get( nEvent );
             if( STARBASIC == rMacro.GetScriptType() )
             {
                 nRet += 0 == mpDocShell->CallBasic( rMacro.GetMacName(),
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 3975e13b0a35..9b9f143320d7 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -101,25 +101,25 @@ namespace
             pMark);
     }
 
-    static inline ::std::unique_ptr<SwPosition> lcl_PositionFromCntntNode(
-        SwCntntNode * const pCntntNode,
+    static inline ::std::unique_ptr<SwPosition> lcl_PositionFromContentNode(
+        SwContentNode * const pContentNode,
         const bool bAtEnd=false)
     {
-        ::std::unique_ptr<SwPosition> pResult(new SwPosition(*pCntntNode));
-        pResult->nContent.Assign(pCntntNode, bAtEnd ? pCntntNode->Len() : 0);
+        ::std::unique_ptr<SwPosition> pResult(new SwPosition(*pContentNode));
+        pResult->nContent.Assign(pContentNode, bAtEnd ? pContentNode->Len() : 0);
         return pResult;
     }
 
-    // return a position at the begin of rEnd, if it is a CntntNode
+    // return a position at the begin of rEnd, if it is a ContentNode
     // else set it to the begin of the Node after rEnd, if there is one
     // else set it to the end of the node before rStt
-    // else set it to the CntntNode of the Pos outside the Range
+    // else set it to the ContentNode of the Pos outside the Range
     static inline ::std::unique_ptr<SwPosition> lcl_FindExpelPosition(
         const SwNodeIndex& rStt,
         const SwNodeIndex& rEnd,
         const SwPosition& rOtherPosition)
     {
-        SwCntntNode * pNode = rEnd.GetNode().GetCntntNode();
+        SwContentNode * pNode = rEnd.GetNode().GetContentNode();
         bool bPosAtEndOfNode = false;
         if ( pNode == NULL)
         {
@@ -135,7 +135,7 @@ namespace
         }
         if ( pNode != NULL )
         {
-            return lcl_PositionFromCntntNode( pNode, bPosAtEndOfNode );
+            return lcl_PositionFromContentNode( pNode, bPosAtEndOfNode );
         }
 
         return ::std::unique_ptr<SwPosition>(new SwPosition(rOtherPosition));
@@ -333,11 +333,11 @@ OUString IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()
 
 bool IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM )
 {
-    return rPaM.Start()->nNode.GetNode().IsTxtNode() &&
+    return rPaM.Start()->nNode.GetNode().IsTextNode() &&
            rPaM.Start()->nContent.GetIndex() == 0 &&
            ( !rPaM.HasMark() ||
              ( rPaM.GetMark()->nNode == rPaM.GetPoint()->nNode &&
-               rPaM.End()->nContent.GetIndex() == rPaM.End()->nNode.GetNode().GetTxtNode()->Len() ) );
+               rPaM.End()->nContent.GetIndex() == rPaM.End()->nNode.GetNode().GetTextNode()->Len() ) );
 }
 
 namespace sw { namespace mark
@@ -369,7 +369,7 @@ namespace sw { namespace mark
                 pPos2->nContent.GetIndex());
         }
 #endif
-        // see for example _SaveCntntIdx, Shells
+        // see for example _SaveContentIdx, Shells
         OSL_PRECOND(m_vAllMarks.size() < USHRT_MAX,
             "MarkManager::makeMark(..)"
             " - more than USHRT_MAX marks are not supported correctly");
@@ -494,12 +494,12 @@ namespace sw { namespace mark
         return pFieldMark;
     }
 
-    ::sw::mark::IMark* MarkManager::getMarkForTxtNode(
-        const SwTxtNode& rTxtNode,
+    ::sw::mark::IMark* MarkManager::getMarkForTextNode(
+        const SwTextNode& rTextNode,
         const IDocumentMarkAccess::MarkType eType )
     {
-        SwPosition aPos(rTxtNode);
-        aPos.nContent.Assign(&(const_cast<SwTxtNode&>(rTxtNode)), 0);
+        SwPosition aPos(rTextNode);
+        aPos.nContent.Assign(&(const_cast<SwTextNode&>(rTextNode)), 0);
         const iterator_t ppExistingMark = lcl_FindMarkAtPos(m_vBookmarks, aPos, eType);
         if(ppExistingMark != m_vBookmarks.end())
             return ppExistingMark->get();
@@ -1208,31 +1208,31 @@ SaveBookmark::SaveBookmark(
         }
     }
     m_nNode1 = rBkmk.GetMarkPos().nNode.GetIndex();
-    m_nCntnt1 = rBkmk.GetMarkPos().nContent.GetIndex();
+    m_nContent1 = rBkmk.GetMarkPos().nContent.GetIndex();
 
     if(m_bSavePos)
     {
         m_nNode1 -= rMvPos.GetIndex();
         if(pIdx && !m_nNode1)
-            m_nCntnt1 -= pIdx->GetIndex();
+            m_nContent1 -= pIdx->GetIndex();
     }
 
     if(rBkmk.IsExpanded())
     {
         m_nNode2 = rBkmk.GetOtherMarkPos().nNode.GetIndex();
-        m_nCntnt2 = rBkmk.GetOtherMarkPos().nContent.GetIndex();
+        m_nContent2 = rBkmk.GetOtherMarkPos().nContent.GetIndex();
 
         if(m_bSaveOtherPos)
         {
             m_nNode2 -= rMvPos.GetIndex();
             if(pIdx && !m_nNode2)
-                m_nCntnt2 -= pIdx->GetIndex();
+                m_nContent2 -= pIdx->GetIndex();
         }
     }
     else
     {
         m_nNode2 = ULONG_MAX;
-        m_nCntnt2 = -1;
+        m_nContent2 = -1;
     }
 }
 
@@ -1253,14 +1253,14 @@ void SaveBookmark::SetInDoc(
         {
             aPam.GetMark()->nNode += m_nNode2;
             if(pIdx && !m_nNode2)
-                aPam.GetMark()->nContent += m_nCntnt2;
+                aPam.GetMark()->nContent += m_nContent2;
             else
-                aPam.GetMark()->nContent.Assign(aPam.GetCntntNode(false), m_nCntnt2);
+                aPam.GetMark()->nContent.Assign(aPam.GetContentNode(false), m_nContent2);
         }
         else
         {
             aPam.GetMark()->nNode = m_nNode2;
-            aPam.GetMark()->nContent.Assign(aPam.GetCntntNode(false), m_nCntnt2);
+            aPam.GetMark()->nContent.Assign(aPam.GetContentNode(false), m_nContent2);
         }
     }
 
@@ -1269,14 +1269,14 @@ void SaveBookmark::SetInDoc(
         aPam.GetPoint()->nNode += m_nNode1;
 
         if(pIdx && !m_nNode1)
-            aPam.GetPoint()->nContent += m_nCntnt1;
+            aPam.GetPoint()->nContent += m_nContent1;
         else
-            aPam.GetPoint()->nContent.Assign(aPam.GetCntntNode(), m_nCntnt1);
+            aPam.GetPoint()->nContent.Assign(aPam.GetContentNode(), m_nContent1);
     }
     else
     {
         aPam.GetPoint()->nNode = m_nNode1;
-        aPam.GetPoint()->nContent.Assign(aPam.GetCntntNode(), m_nCntnt1);
+        aPam.GetPoint()->nContent.Assign(aPam.GetContentNode(), m_nContent1);
     }
 
     if(!aPam.HasMark()
@@ -1321,11 +1321,11 @@ void _DelBookmarks(
     // Copy all Redlines which are in the move area into an array
     // which holds all position information as offset.
     // Assignement happens after moving.
-    SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-    for(SwRedlineTbl::size_type nCnt = 0; nCnt < rTbl.size(); ++nCnt )
+    SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+    for(SwRedlineTable::size_type nCnt = 0; nCnt < rTable.size(); ++nCnt )
     {
         // Is at position?
-        SwRangeRedline* pRedl = rTbl[ nCnt ];
+        SwRangeRedline* pRedl = rTable[ nCnt ];
 
         SwPosition *const pRStt = pRedl->Start();
         SwPosition *const pREnd = pRedl->End();
@@ -1338,7 +1338,7 @@ void _DelBookmarks(
             else
             {
                 bool bStt = true;
-                SwCntntNode* pCNd = pRStt->nNode.GetNode().GetCntntNode();
+                SwContentNode* pCNd = pRStt->nNode.GetNode().GetContentNode();
                 if( !pCNd && 0 == ( pCNd = pDoc->GetNodes().GoNext( &pRStt->nNode )) )
                 {
                     bStt = false;
@@ -1346,7 +1346,7 @@ void _DelBookmarks(
                     if( 0 == ( pCNd = SwNodes::GoPrevious( &pRStt->nNode )) )
                     {
                         pRStt->nNode = pREnd->nNode;
-                        pCNd = pRStt->nNode.GetNode().GetCntntNode();
+                        pCNd = pRStt->nNode.GetNode().GetContentNode();
                     }
                 }
                 pRStt->nContent.Assign( pCNd, bStt ? 0 : pCNd->Len() );
@@ -1360,7 +1360,7 @@ void _DelBookmarks(
             else
             {
                 bool bStt = false;
-                SwCntntNode* pCNd = pREnd->nNode.GetNode().GetCntntNode();
+                SwContentNode* pCNd = pREnd->nNode.GetNode().GetContentNode();
                 if( !pCNd && 0 == ( pCNd = SwNodes::GoPrevious( &pREnd->nNode )) )
                 {
                     bStt = true;
@@ -1368,7 +1368,7 @@ void _DelBookmarks(
                     if( 0 == ( pCNd = pDoc->GetNodes().GoNext( &pREnd->nNode )) )
                     {
                         pREnd->nNode = pRStt->nNode;
-                        pCNd = pREnd->nNode.GetNode().GetCntntNode();
+                        pCNd = pREnd->nNode.GetNode().GetContentNode();
                     }
                 }
                 pREnd->nContent.Assign( pCNd, bStt ? 0 : pCNd->Len() );
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 6c5b45997824..1354afaa51f5 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -43,10 +43,10 @@
 
 void SwTable::UpdateCharts() const
 {
-    GetFrmFmt()->GetDoc()->UpdateCharts( GetFrmFmt()->GetName() );
+    GetFrameFormat()->GetDoc()->UpdateCharts( GetFrameFormat()->GetName() );
 }
 
-bool SwTable::IsTblComplexForChart( const OUString& rSelection ) const
+bool SwTable::IsTableComplexForChart( const OUString& rSelection ) const
 {
     const SwTableBox* pSttBox, *pEndBox;
     if( 2 < rSelection.getLength() )
@@ -59,8 +59,8 @@ bool SwTable::IsTblComplexForChart( const OUString& rSelection ) const
         const sal_Int32 nLength {'>' == rSelection[ rSelection.getLength()-1 ]
             ? rSelection.getLength()-1 : rSelection.getLength()};
 
-        pSttBox = GetTblBox(rSelection.copy( nOffset, nSeparator - nOffset ));
-        pEndBox = GetTblBox(rSelection.copy( nSeparator+1, nLength - (nSeparator+1) ));
+        pSttBox = GetTableBox(rSelection.copy( nOffset, nSeparator - nOffset ));
+        pEndBox = GetTableBox(rSelection.copy( nSeparator+1, nLength - (nSeparator+1) ));
     }
     else
     {
@@ -90,26 +90,26 @@ void SwDoc::DoUpdateAllCharts()
     SwViewShell* pVSh = getIDocumentLayoutAccess().GetCurrentViewShell();
     if( pVSh )
     {
-        const SwFrmFmts& rTblFmts = *GetTblFrmFmts();
-        for( size_t n = 0; n < rTblFmts.size(); ++n )
+        const SwFrameFormats& rTableFormats = *GetTableFrameFormats();
+        for( size_t n = 0; n < rTableFormats.size(); ++n )
         {
-            SwTable* pTmpTbl;
-            const SwTableNode* pTblNd;
-            const SwFrmFmt* pFmt = rTblFmts[ n ];
+            SwTable* pTmpTable;
+            const SwTableNode* pTableNd;
+            const SwFrameFormat* pFormat = rTableFormats[ n ];
 
-            if( 0 != ( pTmpTbl = SwTable::FindTable( pFmt ) ) &&
-                0 != ( pTblNd = pTmpTbl->GetTableNode() ) &&
-                pTblNd->GetNodes().IsDocNodes() )
+            if( 0 != ( pTmpTable = SwTable::FindTable( pFormat ) ) &&
+                0 != ( pTableNd = pTmpTable->GetTableNode() ) &&
+                pTableNd->GetNodes().IsDocNodes() )
             {
-                _UpdateCharts( *pTmpTbl, *pVSh );
+                _UpdateCharts( *pTmpTable, *pVSh );
             }
         }
     }
 }
 
-void SwDoc::_UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const
+void SwDoc::_UpdateCharts( const SwTable& rTable, SwViewShell const & rVSh ) const
 {
-    OUString aName( rTbl.GetFrmFmt()->GetName() );
+    OUString aName( rTable.GetFrameFormat()->GetName() );
     SwStartNode *pStNd;
     SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
     while( 0 != (pStNd = aIdx.GetNode().GetStartNode()) )
@@ -117,12 +117,12 @@ void SwDoc::_UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const
         ++aIdx;
         SwOLENode *pONd;
         if( 0 != ( pONd = aIdx.GetNode().GetOLENode() ) &&
-            aName == pONd->GetChartTblName() &&
+            aName == pONd->GetChartTableName() &&
             pONd->getLayoutFrm( rVSh.GetLayout() ) )
         {
             SwChartDataProvider *pPCD = getIDocumentChartDataProviderAccess().GetChartDataProvider();
             if (pPCD)
-                pPCD->InvalidateTable( &rTbl );
+                pPCD->InvalidateTable( &rTable );
             // following this the framework will now take care of repainting
             // the chart or it's replacement image...
         }
@@ -132,29 +132,29 @@ void SwDoc::_UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const
 
 void SwDoc::UpdateCharts( const OUString &rName ) const
 {
-    SwTable* pTmpTbl = SwTable::FindTable( FindTblFmtByName( rName ) );
-    if( pTmpTbl )
+    SwTable* pTmpTable = SwTable::FindTable( FindTableFormatByName( rName ) );
+    if( pTmpTable )
     {
         SwViewShell const * pVSh = getIDocumentLayoutAccess().GetCurrentViewShell();
 
         if( pVSh )
-            _UpdateCharts( *pTmpTbl, *pVSh );
+            _UpdateCharts( *pTmpTable, *pVSh );
     }
 }
 
-void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
+void SwDoc::SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName )
 {
-    const OUString aOldName( rTblFmt.GetName() );
+    const OUString aOldName( rTableFormat.GetName() );
 
     bool bNameFound = rNewName.isEmpty();
     if( !bNameFound )
     {
-        const SwFrmFmts& rTbl = *GetTblFrmFmts();
-        for( size_t i = rTbl.size(); i; )
+        const SwFrameFormats& rTable = *GetTableFrameFormats();
+        for( size_t i = rTable.size(); i; )
         {
-            const SwFrmFmt* pFmt;
-            if( !( pFmt = rTbl[ --i ] )->IsDefault() &&
-                pFmt->GetName() == rNewName && IsUsed( *pFmt ) )
+            const SwFrameFormat* pFormat;
+            if( !( pFormat = rTable[ --i ] )->IsDefault() &&
+                pFormat->GetName() == rNewName && IsUsed( *pFormat ) )
             {
                 bNameFound = true;
                 break;
@@ -163,9 +163,9 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
     }
 
     if( !bNameFound )
-        rTblFmt.SetName( rNewName, true );
+        rTableFormat.SetName( rNewName, true );
     else
-        rTblFmt.SetName( GetUniqueTblName(), true );
+        rTableFormat.SetName( GetUniqueTableName(), true );
 
     SwStartNode *pStNd;
     SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
@@ -173,11 +173,11 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
     {
         ++aIdx;
         SwOLENode *pNd = aIdx.GetNode().GetOLENode();
-        if( pNd && aOldName == pNd->GetChartTblName() )
+        if( pNd && aOldName == pNd->GetChartTableName() )
         {
-            pNd->SetChartTblName( rNewName );
+            pNd->SetChartTableName( rNewName );
 
-            SwTable* pTable = SwTable::FindTable( &rTblFmt );
+            SwTable* pTable = SwTable::FindTable( &rTableFormat );
             SwChartDataProvider *pPCD = getIDocumentChartDataProviderAccess().GetChartDataProvider();
             if (pPCD)
                 pPCD->InvalidateTable( pTable );
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index e53e37c09409..df1886680394 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -146,11 +146,11 @@ public:
     }
 };
 
-class CompareFrmFmtText : public CompareData
+class CompareFrameFormatText : public CompareData
 {
     const SwNodeIndex &m_rIndex;
 public:
-    CompareFrmFmtText(SwDoc &rD, const SwNodeIndex &rIndex, bool bRecordDiff=true)
+    CompareFrameFormatText(SwDoc &rD, const SwNodeIndex &rIndex, bool bRecordDiff=true)
         : CompareData(rD, bRecordDiff)
         , m_rIndex(rIndex)
     {
@@ -261,14 +261,14 @@ public:
 class WordArrayComparator : public ArrayComparator
 {
 private:
-    const SwTxtNode *pTxtNd1, *pTxtNd2;
+    const SwTextNode *pTextNd1, *pTextNd2;
     int *pPos1, *pPos2;
     int nCnt1, nCnt2;		// number of words
 
-    static void CalcPositions( int *pPos, const SwTxtNode *pTxtNd, int &nCnt );
+    static void CalcPositions( int *pPos, const SwTextNode *pTextNd, int &nCnt );
 
 public:
-    WordArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 );
+    WordArrayComparator( const SwTextNode *pNode1, const SwTextNode *pNode2 );
     virtual ~WordArrayComparator();
 
     virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE;
@@ -281,17 +281,17 @@ public:
 class CharArrayComparator : public ArrayComparator
 {
 private:
-    const SwTxtNode *pTxtNd1, *pTxtNd2;
+    const SwTextNode *pTextNd1, *pTextNd2;
 
 public:
-    CharArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 )
-        : pTxtNd1( pNode1 ), pTxtNd2( pNode2 )
+    CharArrayComparator( const SwTextNode *pNode1, const SwTextNode *pNode2 )
+        : pTextNd1( pNode1 ), pTextNd2( pNode2 )
     {
     }
 
     virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE;
-    virtual int GetLen1() const SAL_OVERRIDE { return pTxtNd1->GetTxt().getLength(); }
-    virtual int GetLen2() const SAL_OVERRIDE { return pTxtNd2->GetTxt().getLength(); }
+    virtual int GetLen1() const SAL_OVERRIDE { return pTextNd1->GetText().getLength(); }
+    virtual int GetLen2() const SAL_OVERRIDE { return pTextNd2->GetText().getLength(); }
 };
 
 /// Options set in Tools->Options->Writer->Comparison
@@ -999,10 +999,10 @@ public:
     virtual sal_uLong GetHashValue() const SAL_OVERRIDE;
     virtual bool Compare( const CompareLine& rLine ) const SAL_OVERRIDE;
 
-    static sal_uLong GetTxtNodeHashValue( const SwTxtNode& rNd, sal_uLong nVal );
+    static sal_uLong GetTextNodeHashValue( const SwTextNode& rNd, sal_uLong nVal );
     static bool CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd );
-    static bool CompareTxtNd( const SwTxtNode& rDstNd,
-                              const SwTxtNode& rSrcNd );
+    static bool CompareTextNd( const SwTextNode& rDstNd,
+                              const SwTextNode& rSrcNd );
 
     bool ChangesInLine( const SwCompareLine& rLine,
                             SwPaM *& rpInsRing, SwPaM*& rpDelRing ) const;
@@ -1030,7 +1030,7 @@ sal_uLong SwCompareLine::GetHashValue() const
     switch( rNode.GetNodeType() )
     {
     case ND_TEXTNODE:
-        nRet = GetTxtNodeHashValue( *rNode.GetTxtNode(), nRet );
+        nRet = GetTextNodeHashValue( *rNode.GetTextNode(), nRet );
         break;
 
     case ND_TABLENODE:
@@ -1039,8 +1039,8 @@ sal_uLong SwCompareLine::GetHashValue() const
             SwNodeIndex aIdx( rNode );
             while( &aIdx.GetNode() != pEndNd )
             {
-                if( aIdx.GetNode().IsTxtNode() )
-                    nRet = GetTxtNodeHashValue( *aIdx.GetNode().GetTxtNode(), nRet );
+                if( aIdx.GetNode().IsTextNode() )
+                    nRet = GetTextNodeHashValue( *aIdx.GetNode().GetTextNode(), nRet );
                 ++aIdx;
             }
         }
@@ -1097,13 +1097,13 @@ namespace
         SwNodeIndex aIdx( rNode );
         while (&aIdx.GetNode() != pEndNd)
         {
-            if (aIdx.GetNode().IsTxtNode())
+            if (aIdx.GetNode().IsTextNode())
             {
                 if (sRet.getLength())
                 {
                     sRet.append( '\n' );
                 }
-                sRet.append( aIdx.GetNode().GetTxtNode()->GetExpandTxt() );
+                sRet.append( aIdx.GetNode().GetTextNode()->GetExpandText() );
             }
             ++aIdx;
         }
@@ -1121,8 +1121,8 @@ bool SwCompareLine::CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd )
     switch( rDstNd.GetNodeType() )
     {
     case ND_TEXTNODE:
-        bRet = CompareTxtNd( *rDstNd.GetTxtNode(), *rSrcNd.GetTxtNode() )
-            && ( !CmpOptions.bUseRsid || rDstNd.GetTxtNode()->CompareParRsid( *rSrcNd.GetTxtNode() ) );
+        bRet = CompareTextNd( *rDstNd.GetTextNode(), *rSrcNd.GetTextNode() )
+            && ( !CmpOptions.bUseRsid || rDstNd.GetTextNode()->CompareParRsid( *rSrcNd.GetTextNode() ) );
         break;
 
     case ND_TABLENODE:
@@ -1210,7 +1210,7 @@ OUString SwCompareLine::GetText() const
     switch( rNode.GetNodeType() )
     {
     case ND_TEXTNODE:
-        sRet = rNode.GetTxtNode()->GetExpandTxt();
+        sRet = rNode.GetTextNode()->GetExpandText();
         break;
 
     case ND_TABLENODE:
@@ -1261,20 +1261,20 @@ OUString SwCompareLine::GetText() const
     return sRet;
 }
 
-sal_uLong SwCompareLine::GetTxtNodeHashValue( const SwTxtNode& rNd, sal_uLong nVal )
+sal_uLong SwCompareLine::GetTextNodeHashValue( const SwTextNode& rNd, sal_uLong nVal )
 {
-    OUString sStr( rNd.GetExpandTxt() );
+    OUString sStr( rNd.GetExpandText() );
     for( sal_Int32 n = 0; n < sStr.getLength(); ++n )
         ( nVal <<= 1 ) += sStr[ n ];
     return nVal;
 }
 
-bool SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
-                                  const SwTxtNode& rSrcNd )
+bool SwCompareLine::CompareTextNd( const SwTextNode& rDstNd,
+                                  const SwTextNode& rSrcNd )
 {
     bool bRet = false;
     // Very simple at first
-    if( rDstNd.GetTxt() == rSrcNd.GetTxt() )
+    if( rDstNd.GetText() == rSrcNd.GetText() )
     {
         // The text is the same, but are the "special attributes" (0xFF) also the same?
         bRet = true;
@@ -1291,14 +1291,14 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
     if( ND_TEXTNODE == rNode.GetNodeType() &&
         ND_TEXTNODE == rLine.GetNode().GetNodeType() )
     {
-        SwTxtNode& rDstNd = *const_cast<SwTxtNode*>(rNode.GetTxtNode());
-        const SwTxtNode& rSrcNd = *rLine.GetNode().GetTxtNode();
+        SwTextNode& rDstNd = *const_cast<SwTextNode*>(rNode.GetTextNode());
+        const SwTextNode& rSrcNd = *rLine.GetNode().GetTextNode();
         SwDoc* pDstDoc = rDstNd.GetDoc();
 
         int nLcsLen = 0;
 
-        int nDstLen = rDstNd.GetTxt().getLength();
-        int nSrcLen = rSrcNd.GetTxt().getLength();
+        int nDstLen = rDstNd.GetText().getLength();
+        int nSrcLen = rSrcNd.GetText().getLength();
 
         int nMinLen = std::min( nDstLen , nSrcLen );
         int nAvgLen = ( nDstLen + nSrcLen )/2;
@@ -1669,7 +1669,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
             if( pTmp->GetPoint()->nContent == 0 )
             {
                 ++pTmp->GetPoint()->nNode;
-                pTmp->GetPoint()->nContent.Assign( pTmp->GetCntntNode(), 0 );
+                pTmp->GetPoint()->nContent.Assign( pTmp->GetContentNode(), 0 );
             }
             // #i101009#
             // prevent redlines that end on structural end node
@@ -1677,7 +1677,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
                 & pTmp->GetPoint()->nNode.GetNode())
             {
                 --pTmp->GetPoint()->nNode;
-                SwCntntNode *const pContentNode( pTmp->GetCntntNode() );
+                SwContentNode *const pContentNode( pTmp->GetContentNode() );
                 pTmp->GetPoint()->nContent.Assign( pContentNode,
                         (pContentNode) ? pContentNode->Len() : 0 );
             }
@@ -1701,7 +1701,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
             if( pTmp->GetPoint()->nContent == 0 )
             {
                 ++pTmp->GetPoint()->nNode;
-                pTmp->GetPoint()->nContent.Assign( pTmp->GetCntntNode(), 0 );
+                pTmp->GetPoint()->nContent.Assign( pTmp->GetContentNode(), 0 );
             }
             // #i101009#
             // prevent redlines that end on structural end node
@@ -1709,7 +1709,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
                 & pTmp->GetPoint()->nNode.GetNode())
             {
                 --pTmp->GetPoint()->nNode;
-                SwCntntNode *const pContentNode( pTmp->GetCntntNode() );
+                SwContentNode *const pContentNode( pTmp->GetContentNode() );
                 pTmp->GetPoint()->nContent.Assign( pContentNode,
                         (pContentNode) ? pContentNode->Len() : 0 );
             }
@@ -1720,14 +1720,14 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
         // combine consecutive
         if( pTmp->GetNext() != pInsRing )
         {
-            const SwCntntNode* pCNd;
+            const SwContentNode* pCNd;
             do {
                 SwPosition& rSttEnd = *pTmp->End(),
                           & rEndStt = *(pTmp->GetNext())->Start();
                 if( rSttEnd == rEndStt ||
                     (!rEndStt.nContent.GetIndex() &&
                     rEndStt.nNode.GetIndex() - 1 == rSttEnd.nNode.GetIndex() &&
-                    0 != ( pCNd = rSttEnd.nNode.GetNode().GetCntntNode() ) &&
+                    0 != ( pCNd = rSttEnd.nNode.GetNode().GetContentNode() ) &&
                     rSttEnd.nContent.GetIndex() == pCNd->Len()))
                 {
                     if( pTmp->GetNext() == pInsRing )
@@ -1774,16 +1774,16 @@ namespace
                                                   CompareDataPtr(new CompareMainText(rDestDoc))));
 
         //if we have the same number of frames then try to compare within them
-        const SwFrmFmts *pSrcFrmFmts = rSrcDoc.GetSpzFrmFmts();
-        const SwFrmFmts *pDestFrmFmts = rDestDoc.GetSpzFrmFmts();
-        if (pSrcFrmFmts->size() == pDestFrmFmts->size())
+        const SwFrameFormats *pSrcFrameFormats = rSrcDoc.GetSpzFrameFormats();
+        const SwFrameFormats *pDestFrameFormats = rDestDoc.GetSpzFrameFormats();
+        if (pSrcFrameFormats->size() == pDestFrameFormats->size())
         {
-            for (size_t i = 0; i < pSrcFrmFmts->size(); ++i)
+            for (size_t i = 0; i < pSrcFrameFormats->size(); ++i)
             {
-                const SwFrmFmt& rSrcFmt = *(*pSrcFrmFmts)[i];
-                const SwFrmFmt& rDestFmt = *(*pDestFrmFmts)[i];
-                const SwNodeIndex* pSrcIdx = rSrcFmt.GetCntnt().GetCntntIdx();
-                const SwNodeIndex* pDestIdx = rDestFmt.GetCntnt().GetCntntIdx();
+                const SwFrameFormat& rSrcFormat = *(*pSrcFrameFormats)[i];
+                const SwFrameFormat& rDestFormat = *(*pDestFrameFormats)[i];
+                const SwNodeIndex* pSrcIdx = rSrcFormat.GetContent().GetContentIdx();
+                const SwNodeIndex* pDestIdx = rDestFormat.GetContent().GetContentIdx();
                 if (!pSrcIdx && !pDestIdx)
                     continue;
                 if (!pSrcIdx || !pDestIdx)
@@ -1794,8 +1794,8 @@ namespace
                     continue;
                 if (!pSrcNode || !pDestNode)
                     break;
-                aComparisons.push_back(CompareDataPtrPair(CompareDataPtr(new CompareFrmFmtText(rSrcDoc, *pSrcIdx)),
-                                                          CompareDataPtr(new CompareFrmFmtText(rDestDoc, *pDestIdx))));
+                aComparisons.push_back(CompareDataPtrPair(CompareDataPtr(new CompareFrameFormatText(rSrcDoc, *pSrcIdx)),
+                                                          CompareDataPtr(new CompareFrameFormatText(rDestDoc, *pDestIdx))));
             }
         }
         return aComparisons;
@@ -1894,8 +1894,8 @@ SaveMergeRedline::SaveMergeRedline( const SwNode& rDstNd,
     SwPosition aPos( rDstNd );
 
     const SwPosition* pStt = rSrcRedl.Start();
-    if( rDstNd.IsCntntNode() )
-        aPos.nContent.Assign( const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(&rDstNd)), pStt->nContent.GetIndex() );
+    if( rDstNd.IsContentNode() )
+        aPos.nContent.Assign( const_cast<SwContentNode*>(static_cast<const SwContentNode*>(&rDstNd)), pStt->nContent.GetIndex() );
     pDestRedl = new SwRangeRedline( rSrcRedl.GetRedlineData(), aPos );
 
     if( nsRedlineType_t::REDLINE_DELETE == pDestRedl->GetType() )
@@ -1908,7 +1908,7 @@ SaveMergeRedline::SaveMergeRedline( const SwNode& rDstNd,
         pDestRedl->SetMark();
         pDestRedl->GetPoint()->nNode += pEnd->nNode.GetIndex() -
                                         pStt->nNode.GetIndex();
-        pDestRedl->GetPoint()->nContent.Assign( pDestRedl->GetCntntNode(),
+        pDestRedl->GetPoint()->nContent.Assign( pDestRedl->GetContentNode(),
                                                 pEnd->nContent.GetIndex() );
     }
 }
@@ -1938,7 +1938,7 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline)
         pDestRedl->SetMark();
         ++aSaveNd;
         pDestRedl->GetMark()->nNode = aSaveNd;
-        pDestRedl->GetMark()->nContent.Assign( aSaveNd.GetNode().GetCntntNode(),
+        pDestRedl->GetMark()->nContent.Assign( aSaveNd.GetNode().GetContentNode(),
                                                 nSaveCnt );
 
         if( pLastDestRedline && *pLastDestRedline->GetPoint() == *pDestRedl->GetPoint() )
@@ -1956,10 +1956,10 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline)
         if( !pDoc->getIDocumentRedlineAccess().GetRedline( *pDStt, &n ) && n )
             --n;
 
-        const SwRedlineTbl& rRedlineTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-        for( ; n < rRedlineTbl.size(); ++n )
+        const SwRedlineTable& rRedlineTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+        for( ; n < rRedlineTable.size(); ++n )
         {
-            SwRangeRedline* pRedl = rRedlineTbl[ n ];
+            SwRangeRedline* pRedl = rRedlineTable[ n ];
             SwPosition* pRStt = pRedl->Start(),
                       * pREnd = pRStt == pRedl->GetPoint() ? pRedl->GetMark()
                                                            : pRedl->GetPoint();
@@ -1980,7 +1980,7 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline)
 
                 case POS_COLLIDE_END:
                 case POS_BEFORE:
-                    n = rRedlineTbl.size();
+                    n = rRedlineTable.size();
                     break;
 
                 case POS_OUTSIDE:
@@ -2073,12 +2073,12 @@ long SwDoc::MergeDoc( const SwDoc& rDoc )
 
         // look for all insert redlines from the SourceDoc and determine their position in the DestDoc
         std::list<SaveMergeRedline> vRedlines;
-        const SwRedlineTbl& rSrcRedlTbl = rSrcDoc.getIDocumentRedlineAccess().GetRedlineTbl();
+        const SwRedlineTable& rSrcRedlTable = rSrcDoc.getIDocumentRedlineAccess().GetRedlineTable();
         sal_uLong nEndOfExtra = rSrcDoc.GetNodes().GetEndOfExtras().GetIndex();
         sal_uLong nMyEndOfExtra = GetNodes().GetEndOfExtras().GetIndex();
-        for( SwRedlineTbl::size_type n = 0; n < rSrcRedlTbl.size(); ++n )
+        for( SwRedlineTable::size_type n = 0; n < rSrcRedlTable.size(); ++n )
         {
-            const SwRangeRedline* pRedl = rSrcRedlTbl[ n ];
+            const SwRangeRedline* pRedl = rSrcRedlTable[ n ];
             sal_uLong nNd = pRedl->GetPoint()->nNode.GetIndex();
             RedlineType_t eType = pRedl->GetType();
             if( nEndOfExtra < nNd &&
@@ -2140,17 +2140,17 @@ bool LineArrayComparator::Compare( int nIdx1, int nIdx2 ) const
         return false;
     }
 
-    const SwTxtNode *pTxtNd1 = static_cast<const SwCompareLine*>( rData1.GetLine( nFirst1 + nIdx1 ) )->GetNode().GetTxtNode();
-    const SwTxtNode *pTxtNd2 = static_cast<const SwCompareLine*>( rData2.GetLine( nFirst2 + nIdx2 ) )->GetNode().GetTxtNode();
+    const SwTextNode *pTextNd1 = static_cast<const SwCompareLine*>( rData1.GetLine( nFirst1 + nIdx1 ) )->GetNode().GetTextNode();
+    const SwTextNode *pTextNd2 = static_cast<const SwCompareLine*>( rData2.GetLine( nFirst2 + nIdx2 ) )->GetNode().GetTextNode();
 
-    if( !pTxtNd1 || !pTxtNd2
-        || ( CmpOptions.bUseRsid && !pTxtNd1->CompareParRsid( *pTxtNd2 ) ) )
+    if( !pTextNd1 || !pTextNd2
+        || ( CmpOptions.bUseRsid && !pTextNd1->CompareParRsid( *pTextNd2 ) ) )
     {
         return false;
     }
 
-    const sal_Int32 nPar1Len = pTxtNd1->Len();
-    const sal_Int32 nPar2Len = pTxtNd2->Len();
+    const sal_Int32 nPar1Len = pTextNd1->Len();
+    const sal_Int32 nPar2Len = pTextNd2->Len();
 
     if( std::min( nPar1Len, nPar2Len ) * 3 < std::max( nPar1Len, nPar2Len ) )
     {
@@ -2176,13 +2176,13 @@ bool LineArrayComparator::Compare( int nIdx1, int nIdx2 ) const
     }
     for( i = 0; i < nBorderLen; i++ )
     {
-        nHash = nHash*nMul + pTxtNd1->GetTxt()[i];
+        nHash = nHash*nMul + pTextNd1->GetText()[i];
     }
     aHashes.insert( nHash );
     for( ; i < nPar1Len; i++ )
     {
-        nHash = nHash - nPow*pTxtNd1->GetTxt()[ i - nBorderLen ];
-        nHash = nHash*nMul + pTxtNd1->GetTxt()[ i ];
+        nHash = nHash - nPow*pTextNd1->GetText()[ i - nBorderLen ];
+        nHash = nHash*nMul + pTextNd1->GetText()[ i ];
 
         aHashes.insert( nHash );
     }
@@ -2190,7 +2190,7 @@ bool LineArrayComparator::Compare( int nIdx1, int nIdx2 ) const
     nHash = 0;
     for( i = 0; i < nBorderLen; i++ )
     {
-        nHash = nHash*nMul + pTxtNd2->GetTxt()[ i ];
+        nHash = nHash*nMul + pTextNd2->GetText()[ i ];
     }
 
     if( aHashes.find( nHash ) != aHashes.end() )
@@ -2200,8 +2200,8 @@ bool LineArrayComparator::Compare( int nIdx1, int nIdx2 ) const
 
     for( ; i < nPar2Len; i++ )
     {
-        nHash = nHash - nPow*pTxtNd2->GetTxt()[ i - nBorderLen ];
-        nHash = nHash*nMul + pTxtNd2->GetTxt()[ i ];
+        nHash = nHash - nPow*pTextNd2->GetText()[ i - nBorderLen ];
+        nHash = nHash*nMul + pTextNd2->GetText()[ i ];
         if( aHashes.find( nHash ) != aHashes.end() )
         {
             return true;
@@ -2219,19 +2219,19 @@ bool CharArrayComparator::Compare( int nIdx1, int nIdx2 ) const
     }
 
     return ( !CmpOptions.bUseRsid
-            || pTxtNd1->CompareRsid(  *pTxtNd2, nIdx1 + 1, nIdx2 + 1 ) )
-            && pTxtNd1->GetTxt()[ nIdx1 ] == pTxtNd2->GetTxt()[ nIdx2 ];
+            || pTextNd1->CompareRsid(  *pTextNd2, nIdx1 + 1, nIdx2 + 1 ) )
+            && pTextNd1->GetText()[ nIdx1 ] == pTextNd2->GetText()[ nIdx2 ];
 }
 
-WordArrayComparator::WordArrayComparator( const SwTxtNode *pNode1,
-                                            const SwTxtNode *pNode2 )
-    : pTxtNd1( pNode1 ), pTxtNd2( pNode2 )
+WordArrayComparator::WordArrayComparator( const SwTextNode *pNode1,
+                                            const SwTextNode *pNode2 )
+    : pTextNd1( pNode1 ), pTextNd2( pNode2 )
 {
-    pPos1 = new int[ pTxtNd1->GetTxt().getLength() + 1 ];
-    pPos2 = new int[ pTxtNd2->GetTxt().getLength() + 1 ];
+    pPos1 = new int[ pTextNd1->GetText().getLength() + 1 ];
+    pPos2 = new int[ pTextNd2->GetText().getLength() + 1 ];
 
-    CalcPositions( pPos1, pTxtNd1, nCnt1 );
-    CalcPositions( pPos2, pTxtNd2, nCnt2 );
+    CalcPositions( pPos1, pTextNd1, nCnt1 );
+    CalcPositions( pPos2, pTextNd2, nCnt2 );
 }
 
 WordArrayComparator::~WordArrayComparator()
@@ -2249,9 +2249,9 @@ bool WordArrayComparator::Compare( int nIdx1, int nIdx2 ) const
     }
     for( int i = 0; i < nLen; i++)
     {
-        if( pTxtNd1->GetTxt()[ pPos1[ nIdx1 ] + i ]
-            != pTxtNd2->GetTxt()[ pPos2[ nIdx2 ] + i ]
-            || ( CmpOptions.bUseRsid && !pTxtNd1->CompareRsid( *pTxtNd2,
+        if( pTextNd1->GetText()[ pPos1[ nIdx1 ] + i ]
+            != pTextNd2->GetText()[ pPos2[ nIdx2 ] + i ]
+            || ( CmpOptions.bUseRsid && !pTextNd1->CompareRsid( *pTextNd2,
                                 pPos1[ nIdx1 ] + i, pPos2[ nIdx2 ] + i ) ) )
         {
             return false;
@@ -2277,8 +2277,8 @@ int WordArrayComparator::GetCharSequence( const int *pWordLcs1,
             pSubseq1[ nLen ] = pPos1[ pWordLcs1[i] ] + j;
             pSubseq2[ nLen ] = pPos2[ pWordLcs2[i] ] + j;
 
-            if( pTxtNd1->GetTxt()[ pPos1[ pWordLcs1[i] ] + j ]
-             != pTxtNd2->GetTxt()[ pPos2[ pWordLcs2[i] ] + j ] )
+            if( pTextNd1->GetText()[ pPos1[ pWordLcs1[i] ] + j ]
+             != pTextNd2->GetText()[ pPos2[ pWordLcs2[i] ] + j ] )
             {
                 nLen -= j;
                 break;
@@ -2290,15 +2290,15 @@ int WordArrayComparator::GetCharSequence( const int *pWordLcs1,
     return nLen;
 }
 
-void WordArrayComparator::CalcPositions( int *pPos, const SwTxtNode *pTxtNd,
+void WordArrayComparator::CalcPositions( int *pPos, const SwTextNode *pTextNd,
                                          int &nCnt )
 {
     nCnt = -1;
-    for (int i = 0; i <= pTxtNd->GetTxt().getLength(); ++i)
+    for (int i = 0; i <= pTextNd->GetText().getLength(); ++i)
     {
-        if (i == 0 || i == pTxtNd->GetTxt().getLength()
-                    || !isalnum( pTxtNd->GetTxt()[ i - 1 ])
-                    || !isalnum( pTxtNd->GetTxt()[ i ]))
+        if (i == 0 || i == pTextNd->GetText().getLength()
+                    || !isalnum( pTextNd->GetText()[ i - 1 ])
+                    || !isalnum( pTextNd->GetText()[ i ]))
         { // Begin new word
             nCnt++;
             pPos[ nCnt ] = i;
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 76aae573d962..dd260292d5bd 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -117,13 +117,13 @@ void PaMCorrAbs( const SwPaM& rRange,
             }
 
             if( pCrsrShell->IsTableMode() )
-                lcl_PaMCorrAbs( const_cast<SwPaM &>(*pCrsrShell->GetTblCrs()), aStart, aEnd, aNewPos );
+                lcl_PaMCorrAbs( const_cast<SwPaM &>(*pCrsrShell->GetTableCrs()), aStart, aEnd, aNewPos );
         }
     }
     {
-        SwUnoCrsrTbl& rTbl = const_cast<SwUnoCrsrTbl&>(pDoc->GetUnoCrsrTbl());
+        SwUnoCrsrTable& rTable = const_cast<SwUnoCrsrTable&>(pDoc->GetUnoCrsrTable());
 
-        for( SwUnoCrsrTbl::iterator it = rTbl.begin(); it != rTbl.end(); ++it )
+        for( SwUnoCrsrTable::iterator it = rTable.begin(); it != rTable.end(); ++it )
         {
             SwUnoCrsr *const pUnoCursor = *it;
 
@@ -142,11 +142,11 @@ void PaMCorrAbs( const SwPaM& rRange,
                 bChange |= lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos );
             }
 
-            SwUnoTableCrsr *const pUnoTblCrsr =
+            SwUnoTableCrsr *const pUnoTableCrsr =
                 dynamic_cast<SwUnoTableCrsr *>(*it);
-            if( pUnoTblCrsr )
+            if( pUnoTableCrsr )
             {
-                for(SwPaM& rPaM : (&pUnoTblCrsr->GetSelRing())->GetRingContainer())
+                for(SwPaM& rPaM : (&pUnoTableCrsr->GetSelRing())->GetRingContainer())
                 {
                     bChange |=
                         lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos );
@@ -170,27 +170,27 @@ void SwDoc::CorrAbs(const SwNodeIndex& rOldNode,
     const sal_Int32 nOffset,
     bool bMoveCrsr)
 {
-    SwCntntNode *const pCntntNode( rOldNode.GetNode().GetCntntNode() );
+    SwContentNode *const pContentNode( rOldNode.GetNode().GetContentNode() );
     SwPaM const aPam(rOldNode, 0,
-                     rOldNode, (pCntntNode) ? pCntntNode->Len() : 0);
+                     rOldNode, (pContentNode) ? pContentNode->Len() : 0);
     SwPosition aNewPos(rNewPos);
     aNewPos.nContent += nOffset;
 
     getIDocumentMarkAccess()->correctMarksAbsolute(rOldNode, rNewPos, nOffset);
     // fix redlines
     {
-        SwRedlineTbl& rTbl = getIDocumentRedlineAccess().GetRedlineTbl();
-        for (SwRedlineTbl::size_type n = 0; n < rTbl.size(); )
+        SwRedlineTable& rTable = getIDocumentRedlineAccess().GetRedlineTable();
+        for (SwRedlineTable::size_type n = 0; n < rTable.size(); )
         {
             // is on position ??
-            SwRangeRedline *const pRedline( rTbl[ n ] );
+            SwRangeRedline *const pRedline( rTable[ n ] );
             bool const bChanged =
                 lcl_PaMCorrAbs(*pRedline, *aPam.Start(), *aPam.End(), aNewPos);
             // clean up empty redlines: docredln.cxx asserts these as invalid
             if (bChanged && (*pRedline->GetPoint() == *pRedline->GetMark())
                          && (pRedline->GetContentIdx() == NULL))
             {
-                rTbl.DeleteAndDestroy(n);
+                rTable.DeleteAndDestroy(n);
             }
             else
             {
@@ -198,7 +198,7 @@ void SwDoc::CorrAbs(const SwNodeIndex& rOldNode,
             }
         }
 
-        // To-Do - need to add here 'SwExtraRedlineTbl' also ?
+        // To-Do - need to add here 'SwExtraRedlineTable' also ?
     }
 
     if(bMoveCrsr)
@@ -232,9 +232,9 @@ void SwDoc::CorrAbs(
 
     if(bMoveCrsr)
     {
-        SwCntntNode *const pCntntNode( rEndNode.GetNode().GetCntntNode() );
+        SwContentNode *const pContentNode( rEndNode.GetNode().GetContentNode() );
         SwPaM const aPam(rStartNode, 0,
-                         rEndNode, (pCntntNode) ? pCntntNode->Len() : 0);
+                         rEndNode, (pContentNode) ? pContentNode->Len() : 0);
         ::PaMCorrAbs(aPam, rNewPos);
     }
 }
@@ -271,23 +271,23 @@ void PaMCorrRel( const SwNodeIndex &rOldNode,
             }
 
             if( pCrsrShell->IsTableMode() )
-                lcl_PaMCorrRel1( pCrsrShell->GetTblCrs(), pOldNode, aNewPos, nCntIdx );
+                lcl_PaMCorrRel1( pCrsrShell->GetTableCrs(), pOldNode, aNewPos, nCntIdx );
        }
     }
     {
-        SwUnoCrsrTbl& rTbl = (SwUnoCrsrTbl&)pDoc->GetUnoCrsrTbl();
-        for( SwUnoCrsrTbl::iterator it = rTbl.begin(); it != rTbl.end(); ++it )
+        SwUnoCrsrTable& rTable = (SwUnoCrsrTable&)pDoc->GetUnoCrsrTable();
+        for( SwUnoCrsrTable::iterator it = rTable.begin(); it != rTable.end(); ++it )
         {
             for(SwPaM& rPaM : (*it)->GetRingContainer())
             {
                 lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx );
             }
 
-            SwUnoTableCrsr* pUnoTblCrsr =
+            SwUnoTableCrsr* pUnoTableCrsr =
                 dynamic_cast<SwUnoTableCrsr*>(*it);
-            if( pUnoTblCrsr )
+            if( pUnoTableCrsr )
             {
-                for(SwPaM& rPaM : (&pUnoTblCrsr->GetSelRing())->GetRingContainer())
+                for(SwPaM& rPaM : (&pUnoTableCrsr->GetSelRing())->GetRingContainer())
                 {
                     lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx );
                 }
@@ -304,15 +304,15 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
     getIDocumentMarkAccess()->correctMarksRelative(rOldNode, rNewPos, nOffset);
 
     { // fix the Redlines
-        SwRedlineTbl& rTbl = getIDocumentRedlineAccess().GetRedlineTbl();
+        SwRedlineTable& rTable = getIDocumentRedlineAccess().GetRedlineTable();
         SwPosition aNewPos(rNewPos);
-        for( SwRedlineTbl::size_type n = 0; n < rTbl.size(); ++n )
+        for( SwRedlineTable::size_type n = 0; n < rTable.size(); ++n )
         {
             // lies on the position ??
-            lcl_PaMCorrRel1( rTbl[ n ], &rOldNode.GetNode(), aNewPos, aNewPos.nContent.GetIndex() + nOffset );
+            lcl_PaMCorrRel1( rTable[ n ], &rOldNode.GetNode(), aNewPos, aNewPos.nContent.GetIndex() + nOffset );
         }
 
-        // To-Do - need to add here 'SwExtraRedlineTbl' also ?
+        // To-Do - need to add here 'SwExtraRedlineTable' also ?
     }
 
     if(bMoveCrsr)
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index fe6023b893ce..e24c4fa32279 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -62,18 +62,18 @@
 
 using namespace com::sun::star;
 
-static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
-                                SwFrmFmt &rFmt1,
-                                SwFrmFmt &rFmt2,
-                                SwFrmFmt &rFmt3,
-                                SwFrmFmt &rFmt4)
+static void lcl_DefaultPageFormat( sal_uInt16 nPoolFormatId,
+                                SwFrameFormat &rFormat1,
+                                SwFrameFormat &rFormat2,
+                                SwFrameFormat &rFormat3,
+                                SwFrameFormat &rFormat4)
 {
     // --> #i41075# Printer on demand
     // This function does not require a printer anymore.
     // The default page size is obtained from the application
     //locale
 
-    SwFmtFrmSize aFrmSize( ATT_FIX_SIZE );
+    SwFormatFrmSize aFrmSize( ATT_FIX_SIZE );
     const Size aPhysSize = SvxPaperInfo::GetDefaultPaperSize();
     aFrmSize.SetSize( aPhysSize );
 
@@ -87,7 +87,7 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
     // In the long term, this needs to be changed to always keep the
     // margins from the page desc.
     sal_Int32 nMinTop, nMinBottom, nMinLeft, nMinRight;
-    if( RES_POOLPAGE_HTML == nPoolFmtId )
+    if( RES_POOLPAGE_HTML == nPoolFormatId )
     {
         nMinRight = nMinTop = nMinBottom = GetMetricVal( CM_1 );
         nMinLeft = nMinRight * 2;
@@ -111,24 +111,24 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
     aLR.SetRight( nMinRight );
     aLR.SetLeft( nMinLeft );
 
-    rFmt1.SetFmtAttr( aFrmSize );
-    rFmt1.SetFmtAttr( aLR );
-    rFmt1.SetFmtAttr( aUL );
+    rFormat1.SetFormatAttr( aFrmSize );
+    rFormat1.SetFormatAttr( aLR );
+    rFormat1.SetFormatAttr( aUL );
 
-    rFmt2.SetFmtAttr( aFrmSize );
-    rFmt2.SetFmtAttr( aLR );
-    rFmt2.SetFmtAttr( aUL );
+    rFormat2.SetFormatAttr( aFrmSize );
+    rFormat2.SetFormatAttr( aLR );
+    rFormat2.SetFormatAttr( aUL );
 
-    rFmt3.SetFmtAttr( aFrmSize );
-    rFmt3.SetFmtAttr( aLR );
-    rFmt3.SetFmtAttr( aUL );
+    rFormat3.SetFormatAttr( aFrmSize );
+    rFormat3.SetFormatAttr( aLR );
+    rFormat3.SetFormatAttr( aUL );
 
-    rFmt4.SetFmtAttr( aFrmSize );
-    rFmt4.SetFmtAttr( aLR );
-    rFmt4.SetFmtAttr( aUL );
+    rFormat4.SetFormatAttr( aFrmSize );
+    rFormat4.SetFormatAttr( aLR );
+    rFormat4.SetFormatAttr( aUL );
 }
 
-static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
+static void lcl_DescSetAttr( const SwFrameFormat &rSource, SwFrameFormat &rDest,
                          const bool bPage = true )
 {
     // We should actually use ItemSet's Intersect here, but that doesn't work
@@ -169,7 +169,7 @@ static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
                     // All in aIdArr except from RES_HEADER_FOOTER_EAT_SPACING
                     case RES_HEADER_FOOTER_EAT_SPACING:
                     //UUUU take out SvxBrushItem; it's the result of the fallback
-                    // at SwFmt::GetItemState and not really in state SfxItemState::SET
+                    // at SwFormat::GetItemState and not really in state SfxItemState::SET
                     case RES_BACKGROUND:
                         bExecuteId = false;
                         break;
@@ -196,25 +196,25 @@ static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
             {
                 if (SfxItemState::SET == rSource.GetItemState(nId, false, &pItem))
                 {
-                    rDest.SetFmtAttr(*pItem);
+                    rDest.SetFormatAttr(*pItem);
                 }
                 else
                 {
-                    rDest.ResetFmtAttr(nId);
+                    rDest.ResetFormatAttr(nId);
                 }
             }
         }
     }
 
     // Transmit pool and help IDs too
-    rDest.SetPoolFmtId( rSource.GetPoolFmtId() );
+    rDest.SetPoolFormatId( rSource.GetPoolFormatId() );
     rDest.SetPoolHelpId( rSource.GetPoolHelpId() );
     rDest.SetPoolHlpFileId( rSource.GetPoolHlpFileId() );
 }
 
 namespace
 {
-    SwFrmFmt& getFrmFmt(SwPageDesc &rDesc, bool bLeft, bool bFirst)
+    SwFrameFormat& getFrameFormat(SwPageDesc &rDesc, bool bLeft, bool bFirst)
     {
         if (bFirst)
         {
@@ -225,20 +225,20 @@ namespace
         return rDesc.GetLeft();
     }
 
-    const SwFrmFmt& getConstFrmFmt(const SwPageDesc &rDesc, bool bLeft, bool bFirst)
+    const SwFrameFormat& getConstFrameFormat(const SwPageDesc &rDesc, bool bLeft, bool bFirst)
     {
-        return getFrmFmt(const_cast<SwPageDesc&>(rDesc), bLeft, bFirst);
+        return getFrameFormat(const_cast<SwPageDesc&>(rDesc), bLeft, bFirst);
     }
 }
 
-void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc &rDesc, bool bLeft, bool bFirst)
+void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader &rHead, SwPageDesc &rDesc, bool bLeft, bool bFirst)
 {
     assert(bLeft || bFirst);
-    SwFrmFmt& rDescFrmFmt = getFrmFmt(rDesc, bLeft, bFirst);
+    SwFrameFormat& rDescFrameFormat = getFrameFormat(rDesc, bLeft, bFirst);
     if (bFirst && bLeft)
     {
         // special case: always shared with something
-        rDescFrmFmt.SetFmtAttr( rChged.IsFirstShared()
+        rDescFrameFormat.SetFormatAttr( rChged.IsFirstShared()
                 ? rDesc.GetLeft().GetHeader()
                 : rDesc.GetFirstMaster().GetHeader());
     }
@@ -246,72 +246,72 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
          || !rHead.IsActive())
     {
         // Left or first shares the header with the Master.
-        rDescFrmFmt.SetFmtAttr( rDesc.GetMaster().GetHeader() );
+        rDescFrameFormat.SetFormatAttr( rDesc.GetMaster().GetHeader() );
     }
     else if ( rHead.IsActive() )
     {   // Left or first gets its own header if the Format doesn't alrady have one.
         // If it already has one and it points to the same Section as the
         // Right one, it needs to get an own Header.
         // The content is evidently copied.
-        const SwFmtHeader &rFmtHead = rDescFrmFmt.GetHeader();
-        if ( !rFmtHead.IsActive() )
+        const SwFormatHeader &rFormatHead = rDescFrameFormat.GetHeader();
+        if ( !rFormatHead.IsActive() )
         {
-            SwFmtHeader aHead( getIDocumentLayoutAccess().MakeLayoutFmt( RND_STD_HEADERL, 0 ) );
-            rDescFrmFmt.SetFmtAttr( aHead );
+            SwFormatHeader aHead( getIDocumentLayoutAccess().MakeLayoutFormat( RND_STD_HEADERL, 0 ) );
+            rDescFrameFormat.SetFormatAttr( aHead );
             // take over additional attributes (margins, borders ...)
-            ::lcl_DescSetAttr( *rHead.GetHeaderFmt(), *aHead.GetHeaderFmt(), false);
+            ::lcl_DescSetAttr( *rHead.GetHeaderFormat(), *aHead.GetHeaderFormat(), false);
         }
         else
         {
-            const SwFrmFmt *pRight = rHead.GetHeaderFmt();
-            const SwFmtCntnt &aRCnt = pRight->GetCntnt();
-            const SwFmtCntnt &aCnt = rFmtHead.GetHeaderFmt()->GetCntnt();
+            const SwFrameFormat *pRight = rHead.GetHeaderFormat();
+            const SwFormatContent &aRCnt = pRight->GetContent();
+            const SwFormatContent &aCnt = rFormatHead.GetHeaderFormat()->GetContent();
 
-            if (!aCnt.GetCntntIdx())
+            if (!aCnt.GetContentIdx())
             {
-                const SwFrmFmt& rChgedFrmFmt = getConstFrmFmt(rChged, bLeft, bFirst);
-                rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetHeader() );
+                const SwFrameFormat& rChgedFrameFormat = getConstFrameFormat(rChged, bLeft, bFirst);
+                rDescFrameFormat.SetFormatAttr( rChgedFrameFormat.GetHeader() );
             }
-            else if ((*aRCnt.GetCntntIdx() == *aCnt.GetCntntIdx()) ||
-                // The CntntIdx is _always_ different when called from
+            else if ((*aRCnt.GetContentIdx() == *aCnt.GetContentIdx()) ||
+                // The ContentIdx is _always_ different when called from
                 // SwDocStyleSheet::SetItemSet, because it deep-copies the
                 // PageDesc.  So check if it was previously shared.
                  ((bFirst) ? rDesc.IsFirstShared() : rDesc.IsHeaderShared()))
             {
-                SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(),
+                SwFrameFormat *pFormat = new SwFrameFormat( GetAttrPool(),
                         (bFirst) ? "First header" : "Left header",
-                                                GetDfltFrmFmt() );
-                ::lcl_DescSetAttr( *pRight, *pFmt, false );
+                                                GetDfltFrameFormat() );
+                ::lcl_DescSetAttr( *pRight, *pFormat, false );
                 // The section which the right header attribute is pointing
                 // is copied, and the Index to the StartNode is set to
                 // the left or first header attribute.
                 SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
                 SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmp, SwHeaderStartNode );
-                SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
-                            *aRCnt.GetCntntIdx()->GetNode().EndOfSectionNode() );
+                SwNodeRange aRange( aRCnt.GetContentIdx()->GetNode(), 0,
+                            *aRCnt.GetContentIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
                 GetNodes()._Copy( aRange, aTmp, false );
                 aTmp = *pSttNd;
                 GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, 0, aTmp);
 
-                pFmt->SetFmtAttr( SwFmtCntnt( pSttNd ) );
-                rDescFrmFmt.SetFmtAttr( SwFmtHeader( pFmt ) );
+                pFormat->SetFormatAttr( SwFormatContent( pSttNd ) );
+                rDescFrameFormat.SetFormatAttr( SwFormatHeader( pFormat ) );
             }
             else
                 ::lcl_DescSetAttr( *pRight,
-                               *const_cast<SwFrmFmt*>(rFmtHead.GetHeaderFmt()), false );
+                               *const_cast<SwFrameFormat*>(rFormatHead.GetHeaderFormat()), false );
         }
     }
 }
 
-void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc &rDesc, bool bLeft, bool bFirst)
+void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFormatFooter &rFoot, SwPageDesc &rDesc, bool bLeft, bool bFirst)
 {
     assert(bLeft || bFirst);
-    SwFrmFmt& rDescFrmFmt = getFrmFmt(rDesc, bLeft, bFirst);
+    SwFrameFormat& rDescFrameFormat = getFrameFormat(rDesc, bLeft, bFirst);
     if (bFirst && bLeft)
     {
         // special case: always shared with something
-        rDescFrmFmt.SetFmtAttr( rChged.IsFirstShared()
+        rDescFrameFormat.SetFormatAttr( rChged.IsFirstShared()
                 ? rDesc.GetLeft().GetFooter()
                 : rDesc.GetFirstMaster().GetFooter());
     }
@@ -319,59 +319,59 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
         || !rFoot.IsActive())
     {
         // Left or first shares the Header with the Master.
-        rDescFrmFmt.SetFmtAttr( rDesc.GetMaster().GetFooter() );
+        rDescFrameFormat.SetFormatAttr( rDesc.GetMaster().GetFooter() );
     }
     else if ( rFoot.IsActive() )
     {   // Left or first gets its own Footer if the Format does not already have one.
         // If the Format already has a Footer and it points to the same section as the Right one,
         // it needs to get an own one.
         // The content is evidently copied.
-        const SwFmtFooter &rFmtFoot = rDescFrmFmt.GetFooter();
-        if ( !rFmtFoot.IsActive() )
+        const SwFormatFooter &rFormatFoot = rDescFrameFormat.GetFooter();
+        if ( !rFormatFoot.IsActive() )
         {
-            SwFmtFooter aFoot( getIDocumentLayoutAccess().MakeLayoutFmt( RND_STD_FOOTER, 0 ) );
-            rDescFrmFmt.SetFmtAttr( aFoot );
+            SwFormatFooter aFoot( getIDocumentLayoutAccess().MakeLayoutFormat( RND_STD_FOOTER, 0 ) );
+            rDescFrameFormat.SetFormatAttr( aFoot );
             // Take over additional attributes (margins, borders ...).
-            ::lcl_DescSetAttr( *rFoot.GetFooterFmt(), *aFoot.GetFooterFmt(), false);
+            ::lcl_DescSetAttr( *rFoot.GetFooterFormat(), *aFoot.GetFooterFormat(), false);
         }
         else
         {
-            const SwFrmFmt *pRight = rFoot.GetFooterFmt();
-            const SwFmtCntnt &aRCnt = pRight->GetCntnt();
-            const SwFmtCntnt &aLCnt = rFmtFoot.GetFooterFmt()->GetCntnt();
-            if( !aLCnt.GetCntntIdx() )
+            const SwFrameFormat *pRight = rFoot.GetFooterFormat();
+            const SwFormatContent &aRCnt = pRight->GetContent();
+            const SwFormatContent &aLCnt = rFormatFoot.GetFooterFormat()->GetContent();
+            if( !aLCnt.GetContentIdx() )
             {
-                const SwFrmFmt& rChgedFrmFmt = getConstFrmFmt(rChged, bLeft, bFirst);
-                rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetFooter() );
+                const SwFrameFormat& rChgedFrameFormat = getConstFrameFormat(rChged, bLeft, bFirst);
+                rDescFrameFormat.SetFormatAttr( rChgedFrameFormat.GetFooter() );
             }
-            else if ((*aRCnt.GetCntntIdx() == *aLCnt.GetCntntIdx()) ||
-                // The CntntIdx is _always_ different when called from
+            else if ((*aRCnt.GetContentIdx() == *aLCnt.GetContentIdx()) ||
+                // The ContentIdx is _always_ different when called from
                 // SwDocStyleSheet::SetItemSet, because it deep-copies the
                 // PageDesc.  So check if it was previously shared.
                  ((bFirst) ? rDesc.IsFirstShared() : rDesc.IsFooterShared()))
             {
-                SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(),
+                SwFrameFormat *pFormat = new SwFrameFormat( GetAttrPool(),
                         (bFirst) ? "First footer" : "Left footer",
-                                                GetDfltFrmFmt() );
-                ::lcl_DescSetAttr( *pRight, *pFmt, false );
+                                                GetDfltFrameFormat() );
+                ::lcl_DescSetAttr( *pRight, *pFormat, false );
                 // The section to which the right footer attribute is pointing
                 // is copied, and the Index to the StartNode is set to
                 // the left footer attribute.
                 SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
                 SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmp, SwFooterStartNode );
-                SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
-                            *aRCnt.GetCntntIdx()->GetNode().EndOfSectionNode() );
+                SwNodeRange aRange( aRCnt.GetContentIdx()->GetNode(), 0,
+                            *aRCnt.GetContentIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
                 GetNodes()._Copy( aRange, aTmp, false );
                 aTmp = *pSttNd;
                 GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, 0, aTmp);
 
-                pFmt->SetFmtAttr( SwFmtCntnt( pSttNd ) );
-                rDescFrmFmt.SetFmtAttr( SwFmtFooter( pFmt ) );
+                pFormat->SetFormatAttr( SwFormatContent( pSttNd ) );
+                rDescFrameFormat.SetFormatAttr( SwFormatFooter( pFormat ) );
             }
             else
                 ::lcl_DescSetAttr( *pRight,
-                               *const_cast<SwFrmFmt*>(rFmtFoot.GetFooterFmt()), false );
+                               *const_cast<SwFrameFormat*>(rFormatFoot.GetFooterFormat()), false );
         }
     }
 }
@@ -409,17 +409,17 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
     {
         rDesc.SetNumType( rChged.GetNumType() );
         // Notify page number fields that NumFormat has changed
-        getIDocumentFieldsAccess().GetSysFldType( RES_PAGENUMBERFLD )->UpdateFlds();
-        getIDocumentFieldsAccess().GetSysFldType( RES_REFPAGEGETFLD )->UpdateFlds();
+        getIDocumentFieldsAccess().GetSysFieldType( RES_PAGENUMBERFLD )->UpdateFields();
+        getIDocumentFieldsAccess().GetSysFieldType( RES_REFPAGEGETFLD )->UpdateFields();
 
         // If the numbering scheme has changed we could have QuoVadis/ErgoSum texts
         // that refer to a changed page, so we invalidate foot notes.
-        SwFtnIdxs& rFtnIdxs = GetFtnIdxs();
-        for( SwFtnIdxs::size_type nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+        SwFootnoteIdxs& rFootnoteIdxs = GetFootnoteIdxs();
+        for( SwFootnoteIdxs::size_type nPos = 0; nPos < rFootnoteIdxs.size(); ++nPos )
         {
-            SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
-            const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-            pTxtFtn->SetNumber(rFtn.GetNumber(), rFtn.GetNumStr());
+            SwTextFootnote *pTextFootnote = rFootnoteIdxs[ nPos ];
+            const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+            pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr());
         }
     }
 
@@ -430,35 +430,35 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
     bool bHeaderFooterChanged = false;
 
     // Synch header.
-    const SwFmtHeader &rHead = rChged.GetMaster().GetHeader();
+    const SwFormatHeader &rHead = rChged.GetMaster().GetHeader();
     if (undoGuard.UndoWasEnabled())
     {
         // #i46909# no undo if header or footer changed
         // Did something change in the nodes?
-        const SwFmtHeader &rOldHead = rDesc.GetMaster().GetHeader();
+        const SwFormatHeader &rOldHead = rDesc.GetMaster().GetHeader();
         bHeaderFooterChanged |=
             ( rHead.IsActive() != rOldHead.IsActive() ||
               rChged.IsHeaderShared() != rDesc.IsHeaderShared() ||
               rChged.IsFirstShared() != rDesc.IsFirstShared() );
     }
-    rDesc.GetMaster().SetFmtAttr( rHead );
+    rDesc.GetMaster().SetFormatAttr( rHead );
     CopyMasterHeader(rChged, rHead, rDesc, true, false); // Copy left header
     CopyMasterHeader(rChged, rHead, rDesc, false, true); // Copy first master
     CopyMasterHeader(rChged, rHead, rDesc, true, true);  // Copy first left
     rDesc.ChgHeaderShare( rChged.IsHeaderShared() );
 
     // Synch Footer.
-    const SwFmtFooter &rFoot = rChged.GetMaster().GetFooter();
+    const SwFormatFooter &rFoot = rChged.GetMaster().GetFooter();
     if (undoGuard.UndoWasEnabled())
     {
         // #i46909# no undo if header or footer changed
         // Did something change in the Nodes?
-        const SwFmtFooter &rOldFoot = rDesc.GetMaster().GetFooter();
+        const SwFormatFooter &rOldFoot = rDesc.GetMaster().GetFooter();
         bHeaderFooterChanged |=
             ( rFoot.IsActive() != rOldFoot.IsActive() ||
               rChged.IsFooterShared() != rDesc.IsFooterShared() );
     }
-    rDesc.GetMaster().SetFmtAttr( rFoot );
+    rDesc.GetMaster().SetFormatAttr( rFoot );
     CopyMasterFooter(rChged, rFoot, rDesc, true, false); // Copy left footer
     CopyMasterFooter(rChged, rFoot, rDesc, false, true); // Copy first master
     CopyMasterFooter(rChged, rFoot, rDesc, true, true);  // Copy first left
@@ -470,7 +470,7 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
         rDesc.SetName( rChged.GetName() );
 
     // A RegisterChange is triggered, if necessary
-    rDesc.SetRegisterFmtColl( rChged.GetRegisterFmtColl() );
+    rDesc.SetRegisterFormatColl( rChged.GetRegisterFormatColl() );
 
     // If UseOn or the Follow change, the paragraphs need to know about it.
     bool bUseOn  = false;
@@ -511,9 +511,9 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
     ::lcl_DescSetAttr( rChged.GetFirstLeft(), rDesc.GetFirstLeft() );
 
     // If the FootnoteInfo changes, the pages are triggered.
-    if( !(rDesc.GetFtnInfo() == rChged.GetFtnInfo()) )
+    if( !(rDesc.GetFootnoteInfo() == rChged.GetFootnoteInfo()) )
     {
-        rDesc.SetFtnInfo( rChged.GetFtnInfo() );
+        rDesc.SetFootnoteInfo( rChged.GetFootnoteInfo() );
         sw::PageFootnoteHint aHint;
         rDesc.GetMaster().CallSwClientNotify(aHint);
         rDesc.GetLeft().CallSwClientNotify(aHint);
@@ -541,11 +541,11 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged )
 
     //h/f of first-left page must not be unique but same as first master or left
     assert((rDesc.IsFirstShared())
-        ? rDesc.GetFirstLeft().GetHeader().GetHeaderFmt() == rDesc.GetLeft().GetHeader().GetHeaderFmt()
-        : rDesc.GetFirstLeft().GetHeader().GetHeaderFmt() == rDesc.GetFirstMaster().GetHeader().GetHeaderFmt());
+        ? rDesc.GetFirstLeft().GetHeader().GetHeaderFormat() == rDesc.GetLeft().GetHeader().GetHeaderFormat()
+        : rDesc.GetFirstLeft().GetHeader().GetHeaderFormat() == rDesc.GetFirstMaster().GetHeader().GetHeaderFormat());
     assert((rDesc.IsFirstShared())
-        ? rDesc.GetFirstLeft().GetFooter().GetFooterFmt() == rDesc.GetLeft().GetFooter().GetFooterFmt()
-        : rDesc.GetFirstLeft().GetFooter().GetFooterFmt() == rDesc.GetFirstMaster().GetFooter().GetFooterFmt());
+        ? rDesc.GetFirstLeft().GetFooter().GetFooterFormat() == rDesc.GetLeft().GetFooter().GetFooterFormat()
+        : rDesc.GetFirstLeft().GetFooter().GetFooterFormat() == rDesc.GetFirstMaster().GetFooter().GetFooterFormat());
 }
 
 /// All descriptors whose Follow point to the to-be-deleted have to be adapted.
@@ -560,13 +560,13 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
     pDel->CallSwClientNotify( aHint );
 
     bool bHasLayout = getIDocumentLayoutAccess().HasLayout();
-    if ( mpFtnInfo->DependsOn( pDel ) )
+    if ( mpFootnoteInfo->DependsOn( pDel ) )
     {
-        mpFtnInfo->ChgPageDesc( &maPageDescs[0] );
+        mpFootnoteInfo->ChgPageDesc( &maPageDescs[0] );
         if ( bHasLayout )
         {
             std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
-            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), false));
+            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFootnotePageDescs), false));
         }
     }
     else if ( mpEndNoteInfo->DependsOn( pDel ) )
@@ -575,7 +575,7 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
         if ( bHasLayout )
         {
             std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
-            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), true));
+            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFootnotePageDescs), true));
         }
     }
 
@@ -646,25 +646,25 @@ SwPageDesc* SwDoc::MakePageDesc(const OUString &rName, const SwPageDesc *pCpy,
         pNew->SetName( rName );
         if( rName != pCpy->GetName() )
         {
-            pNew->SetPoolFmtId( USHRT_MAX );
+            pNew->SetPoolFormatId( USHRT_MAX );
             pNew->SetPoolHelpId( USHRT_MAX );
             pNew->SetPoolHlpFileId( UCHAR_MAX );
         }
     }
     else
     {
-        pNew = new SwPageDesc( rName, GetDfltFrmFmt(), this );
+        pNew = new SwPageDesc( rName, GetDfltFrameFormat(), this );
         // Set the default page format.
-        lcl_DefaultPageFmt( USHRT_MAX, pNew->GetMaster(), pNew->GetLeft(), pNew->GetFirstMaster(), pNew->GetFirstLeft() );
+        lcl_DefaultPageFormat( USHRT_MAX, pNew->GetMaster(), pNew->GetLeft(), pNew->GetFirstMaster(), pNew->GetFirstLeft() );
 
         SvxFrameDirection aFrameDirection = bRegardLanguage ?
             GetDefaultFrameDirection(GetAppLanguage())
             : FRMDIR_HORI_LEFT_TOP;
 
-        pNew->GetMaster().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
-        pNew->GetLeft().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
-        pNew->GetFirstMaster().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
-        pNew->GetFirstLeft().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
+        pNew->GetMaster().SetFormatAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
+        pNew->GetLeft().SetFormatAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
+        pNew->GetFirstMaster().SetFormatAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
+        pNew->GetFirstLeft().SetFormatAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
     }
     maPageDescs.push_back( pNew );
 
@@ -722,7 +722,7 @@ void SwDoc::PrtOLENotify( bool bAll )
 
         mbOLEPrtNotifyPending = mbAllOLENotify = false;
 
-        SwOLENodes *pNodes = SwCntntNode::CreateOLENodesArray( *GetDfltGrfFmtColl(), !bAll );
+        SwOLENodes *pNodes = SwContentNode::CreateOLENodesArray( *GetDfltGrfFormatColl(), !bAll );
         if ( pNodes )
         {
             ::StartProgress( STR_STATSTR_SWGPRTOLENOTIFY,
@@ -779,7 +779,7 @@ IMPL_LINK_NOARG_TYPED( SwDoc, DoUpdateModifiedOLE, Idle *, void )
     {
         mbOLEPrtNotifyPending = mbAllOLENotify = false;
 
-        SwOLENodes *pNodes = SwCntntNode::CreateOLENodesArray( *GetDfltGrfFmtColl(), true );
+        SwOLENodes *pNodes = SwContentNode::CreateOLENodesArray( *GetDfltGrfFormatColl(), true );
         if( pNodes )
         {
             ::StartProgress( STR_STATSTR_SWGPRTOLENOTIFY,
@@ -882,17 +882,17 @@ void SwDoc::ChgPageDesc( const OUString & rName, const SwPageDesc & rDesc)
  * know why. This function is meant to check the page descriptors for invalid
  * values.
  */
-void SwDoc::CheckDefaultPageFmt()
+void SwDoc::CheckDefaultPageFormat()
 {
     for ( size_t i = 0; i < GetPageDescCnt(); ++i )
     {
         SwPageDesc& rDesc = GetPageDesc( i );
 
-        SwFrmFmt& rMaster = rDesc.GetMaster();
-        SwFrmFmt& rLeft   = rDesc.GetLeft();
+        SwFrameFormat& rMaster = rDesc.GetMaster();
+        SwFrameFormat& rLeft   = rDesc.GetLeft();
 
-        const SwFmtFrmSize& rMasterSize  = rMaster.GetFrmSize();
-        const SwFmtFrmSize& rLeftSize    = rLeft.GetFrmSize();
+        const SwFormatFrmSize& rMasterSize  = rMaster.GetFrmSize();
+        const SwFormatFrmSize& rLeftSize    = rLeft.GetFrmSize();
 
         const bool bSetSize = LONG_MAX == rMasterSize.GetWidth() ||
                               LONG_MAX == rMasterSize.GetHeight() ||
@@ -900,7 +900,7 @@ void SwDoc::CheckDefaultPageFmt()
                               LONG_MAX == rLeftSize.GetHeight();
 
         if ( bSetSize )
-            lcl_DefaultPageFmt( rDesc.GetPoolFmtId(), rDesc.GetMaster(), rDesc.GetLeft(), rDesc.GetFirstMaster(), rDesc.GetFirstLeft() );
+            lcl_DefaultPageFormat( rDesc.GetPoolFormatId(), rDesc.GetMaster(), rDesc.GetLeft(), rDesc.GetFirstMaster(), rDesc.GetFirstLeft() );
     }
 }
 
@@ -920,13 +920,13 @@ void SwDoc::SetDefaultPageMode(bool bSquaredPageMode)
     {
         SwPageDesc& rDesc = GetPageDesc( i );
 
-        SwFrmFmt& rMaster = rDesc.GetMaster();
-        SwFrmFmt& rLeft = rDesc.GetLeft();
+        SwFrameFormat& rMaster = rDesc.GetMaster();
+        SwFrameFormat& rLeft = rDesc.GetLeft();
 
-        SwTextGridItem aGrid(static_cast<const SwTextGridItem&>(rMaster.GetFmtAttr(RES_TEXTGRID)));
+        SwTextGridItem aGrid(static_cast<const SwTextGridItem&>(rMaster.GetFormatAttr(RES_TEXTGRID)));
         aGrid.SwitchPaperMode( bSquaredPageMode );
-        rMaster.SetFmtAttr(aGrid);
-        rLeft.SetFmtAttr(aGrid);
+        rMaster.SetFormatAttr(aGrid);
+        rLeft.SetFormatAttr(aGrid);
     }
 }
 
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 5324063eec6c..85dd7b2d102f 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -78,7 +78,7 @@ using namespace ::com::sun::star::linguistic2;
  * Used for a newly formed group object <SwDoc::GroupSelection(..)>
  * and the members of a destroyed group <SwDoc::UnGroupSelection(..)>
  */
-static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
+static void lcl_AdjustPositioningAttr( SwDrawFrameFormat* _pFrameFormat,
                                 const SdrObject& _rSdrObj )
 {
     const SwContact* pContact = GetUserCall( &_rSdrObj );
@@ -90,8 +90,8 @@ static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
     {
         const SwFrm* pAnchorFrm = pContact->GetAnchoredObj( &_rSdrObj )->GetAnchorFrm();
         OSL_ENSURE( !pAnchorFrm ||
-                !pAnchorFrm->IsTxtFrm() ||
-                !static_cast<const SwTxtFrm*>(pAnchorFrm)->IsFollow(),
+                !pAnchorFrm->IsTextFrm() ||
+                !static_cast<const SwTextFrm*>(pAnchorFrm)->IsFollow(),
                 "<lcl_AdjustPositioningAttr(..)> - anchor frame is a follow. Please inform OD." );
         bool bVert = false;
         bool bR2L = false;
@@ -111,7 +111,7 @@ static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
             // If no anchor frame exist - e.g. because no layout exists - the
             // default layout direction is taken.
             const SvxFrameDirectionItem* pDirItem =
-                static_cast<const SvxFrameDirectionItem*>(&(_pFrmFmt->GetAttrSet().GetPool()->GetDefaultItem( RES_FRAMEDIR )));
+                static_cast<const SvxFrameDirectionItem*>(&(_pFrameFormat->GetAttrSet().GetPool()->GetDefaultItem( RES_FRAMEDIR )));
             switch ( pDirItem->GetValue() )
             {
                 case FRMDIR_VERT_TOP_LEFT:
@@ -173,10 +173,10 @@ static void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
         }
     }
 
-    _pFrmFmt->SetFmtAttr( SwFmtHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
-    _pFrmFmt->SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
+    _pFrameFormat->SetFormatAttr( SwFormatHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
+    _pFrameFormat->SetFormatAttr( SwFormatVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
     // #i44334#, #i44681# - positioning attributes already set
-    _pFrmFmt->PosAttrSet();
+    _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(..)>.
@@ -205,11 +205,11 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
     SwDrawContact* pNewContact = 0;
     if( bNoGroup )
     {
-        SwDrawFrmFmt *pFmt = 0L;
+        SwDrawFrameFormat *pFormat = 0L;
 
         // Revoke anchor attribute.
         SwDrawContact *pMyContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
-        const SwFmtAnchor aAnch( pMyContact->GetFmt()->GetAnchor() );
+        const SwFormatAnchor aAnch( pMyContact->GetFormat()->GetAnchor() );
 
         SwUndoDrawGroup *const pUndo = (!GetIDocumentUndoRedo().DoesUndo())
                                  ? 0
@@ -236,15 +236,15 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
                     "<SwDoc::GroupSelection(..)> - group members have different positioning status!" );
 #endif
 
-            pFmt = static_cast<SwDrawFrmFmt*>(pContact->GetFmt());
+            pFormat = static_cast<SwDrawFrameFormat*>(pContact->GetFormat());
             // Deletes itself!
             pContact->Changed(*pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
             pObj->SetUserCall( 0 );
 
             if( pUndo )
-                pUndo->AddObj( i, pFmt, pObj );
+                pUndo->AddObj( i, pFormat, pObj );
             else
-                DelFrmFmt( pFmt );
+                DelFrameFormat( pFormat );
 
             // #i45952# - re-introduce position normalization of group member
             // objects, because its anchor position is cleared, when they are
@@ -254,18 +254,18 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
             pObj->NbcMove( Size( aAnchorPos.getX(), aAnchorPos.getY() ) );
         }
 
-        pFmt = MakeDrawFrmFmt( OUString("DrawObject"),
-                                GetDfltFrmFmt() );
-        pFmt->SetFmtAttr( aAnch );
+        pFormat = MakeDrawFrameFormat( OUString("DrawObject"),
+                                GetDfltFrameFormat() );
+        pFormat->SetFormatAttr( aAnch );
         // #i36010# - set layout direction of the position
-        pFmt->SetPositionLayoutDir(
+        pFormat->SetPositionLayoutDir(
             text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
 
         rDrawView.GroupMarked();
         OSL_ENSURE( rMrkList.GetMarkCount() == 1, "GroupMarked more or none groups." );
 
         SdrObject* pNewGroupObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
-        pNewContact = new SwDrawContact( pFmt, pNewGroupObj );
+        pNewContact = new SwDrawContact( pFormat, pNewGroupObj );
         // #i35635#
         pNewContact->MoveObjToVisibleLayer( pNewGroupObj );
         pNewContact->ConnectToLayout();
@@ -274,12 +274,12 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
         if ( !bGroupMembersNotPositioned )
         {
             // #i26791# - Adjust positioning and alignment attributes.
-            lcl_AdjustPositioningAttr( pFmt, *pNewGroupObj );
+            lcl_AdjustPositioningAttr( pFormat, *pNewGroupObj );
         }
 
         if( pUndo )
         {
-            pUndo->SetGroupFmt( pFmt );
+            pUndo->SetGroupFormat( pFormat );
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
     }
@@ -310,22 +310,22 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
     SwDrawView::ReplaceMarkedDrawVirtObjs( rDrawView );
 
     const SdrMarkList &rMrkList = rDrawView.GetMarkedObjectList();
-    std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > >* pFmtsAndObjs( 0L );
+    std::vector< std::pair< SwDrawFrameFormat*, SdrObject* > >* pFormatsAndObjs( 0L );
     const size_t nMarkCount( rMrkList.GetMarkCount() );
     if ( nMarkCount )
     {
-        pFmtsAndObjs = new std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > >[nMarkCount];
+        pFormatsAndObjs = new std::vector< std::pair< SwDrawFrameFormat*, SdrObject* > >[nMarkCount];
         SdrObject *pMyObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
         if( !pMyObj->GetUpGroup() )
         {
-            OUString sDrwFmtNm("DrawObject");
+            OUString sDrwFormatNm("DrawObject");
             for ( size_t i = 0; i < nMarkCount; ++i )
             {
                 SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
                 if ( pObj->IsA( TYPE(SdrObjGroup) ) )
                 {
                     SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
-                    SwFmtAnchor aAnch( pContact->GetFmt()->GetAnchor() );
+                    SwFormatAnchor aAnch( pContact->GetFormat()->GetAnchor() );
                     SdrObjList *pLst = static_cast<SdrObjGroup*>(pObj)->GetSubList();
 
                     SwUndoDrawUnGroup* pUndo = 0;
@@ -338,16 +338,16 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
                     for ( size_t i2 = 0; i2 < pLst->GetObjCount(); ++i2 )
                     {
                         SdrObject* pSubObj = pLst->GetObj( i2 );
-                        SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( sDrwFmtNm,
-                                                            GetDfltFrmFmt() );
-                        pFmt->SetFmtAttr( aAnch );
+                        SwDrawFrameFormat *pFormat = MakeDrawFrameFormat( sDrwFormatNm,
+                                                            GetDfltFrameFormat() );
+                        pFormat->SetFormatAttr( aAnch );
                         // #i36010# - set layout direction of the position
-                        pFmt->SetPositionLayoutDir(
+                        pFormat->SetPositionLayoutDir(
                             text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
-                        pFmtsAndObjs[i].push_back( std::pair< SwDrawFrmFmt*, SdrObject* >( pFmt, pSubObj ) );
+                        pFormatsAndObjs[i].push_back( std::pair< SwDrawFrameFormat*, SdrObject* >( pFormat, pSubObj ) );
 
                         if( bUndo )
-                            pUndo->AddObj( static_cast<sal_uInt16>(i2), pFmt );
+                            pUndo->AddObj( static_cast<sal_uInt16>(i2), pFormat );
                     }
                 }
             }
@@ -365,24 +365,24 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
             GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
-        while ( pFmtsAndObjs[i].size() > 0 )
+        while ( pFormatsAndObjs[i].size() > 0 )
         {
-            SwDrawFrmFmt* pFmt( pFmtsAndObjs[i].back().first );
-            SdrObject* pObj( pFmtsAndObjs[i].back().second );
-            pFmtsAndObjs[i].pop_back();
+            SwDrawFrameFormat* pFormat( pFormatsAndObjs[i].back().first );
+            SdrObject* pObj( pFormatsAndObjs[i].back().second );
+            pFormatsAndObjs[i].pop_back();
 
-            SwDrawContact* pContact = new SwDrawContact( pFmt, pObj );
+            SwDrawContact* pContact = new SwDrawContact( pFormat, pObj );
             pContact->MoveObjToVisibleLayer( pObj );
             pContact->ConnectToLayout();
-            lcl_AdjustPositioningAttr( pFmt, *pObj );
+            lcl_AdjustPositioningAttr( pFormat, *pObj );
 
             if ( bUndo )
             {
-                pUndo->AddFmtAndObj( pFmt, pObj );
+                pUndo->AddFormatAndObj( pFormat, pObj );
             }
         }
     }
-    delete [] pFmtsAndObjs;
+    delete [] pFormatsAndObjs;
 }
 
 bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
@@ -399,11 +399,11 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
             SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
             if( pObj->ISA(SwVirtFlyDrawObj) )
             {
-                SwFlyFrmFmt* pFrmFmt =
-                    static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm()->GetFmt();
-                if( pFrmFmt )
+                SwFlyFrameFormat* pFrameFormat =
+                    static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm()->GetFormat();
+                if( pFrameFormat )
                 {
-                    getIDocumentLayoutAccess().DelLayoutFmt( pFrmFmt );
+                    getIDocumentLayoutAccess().DelLayoutFormat( pFrameFormat );
                     bDelMarked = false;
                 }
             }
@@ -415,13 +415,13 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
             if( !pObj->ISA(SwVirtFlyDrawObj) )
             {
                 SwDrawContact *pC = static_cast<SwDrawContact*>(GetUserCall(pObj));
-                SwDrawFrmFmt *pFrmFmt = static_cast<SwDrawFrmFmt*>(pC->GetFmt());
-                if( pFrmFmt &&
-                    FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
+                SwDrawFrameFormat *pFrameFormat = static_cast<SwDrawFrameFormat*>(pC->GetFormat());
+                if( pFrameFormat &&
+                    FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId() )
                 {
                     rDrawView.MarkObj( pObj, rDrawView.Imp().GetPageView(), true );
                     --i;
-                    getIDocumentLayoutAccess().DelLayoutFmt( pFrmFmt );
+                    getIDocumentLayoutAccess().DelLayoutFormat( pFrameFormat );
                 }
             }
         }
@@ -444,7 +444,7 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
                     SwDrawContact *pContact = static_cast<SwDrawContact*>(pObj->GetUserCall());
                     if( pContact ) // of course not for grouped objects
                     {
-                        SwDrawFrmFmt *pFmt = static_cast<SwDrawFrmFmt*>(pContact->GetFmt());
+                        SwDrawFrameFormat *pFormat = static_cast<SwDrawFrameFormat*>(pContact->GetFormat());
                         // before delete of selection is performed, marked
                         // <SwDrawVirtObj>-objects have to be replaced by its
                         // reference objects.  Thus, assert, if a
@@ -458,9 +458,9 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
                         pObj->SetUserCall( 0 );
 
                         if( pUndo )
-                            pUndo->AddObj( i, pFmt, rMark );
+                            pUndo->AddObj( i, pFormat, rMark );
                         else
-                            DelFrmFmt( pFmt );
+                            DelFrameFormat( pFormat );
                     }
                 }
 
@@ -479,34 +479,34 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
     return bCallBase;
 }
 
-_ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
+_ZSortFly::_ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAn,
                       sal_uInt32 nArrOrdNum )
-    : pFmt( pFrmFmt ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum )
+    : pFormat( pFrameFormat ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum )
 {
     // #i11176#
     // This also needs to work when no layout exists. Thus, for
     // FlyFrames an alternative method is used now in that case.
-    if( RES_FLYFRMFMT == pFmt->Which() )
+    if( RES_FLYFRMFMT == pFormat->Which() )
     {
-        if( pFmt->getIDocumentLayoutAccess()->GetCurrentViewShell() )
+        if( pFormat->getIDocumentLayoutAccess()->GetCurrentViewShell() )
         {
             // See if there is an SdrObject for it
-            SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFmt>( *pFrmFmt ).First();
+            SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFormat>( *pFrameFormat ).First();
             if( pFly )
                 nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum();
         }
         else
         {
             // See if there is an SdrObject for it
-            SwFlyDrawContact* pContact = SwIterator<SwFlyDrawContact,SwFmt>( *pFrmFmt ).First();
+            SwFlyDrawContact* pContact = SwIterator<SwFlyDrawContact,SwFormat>( *pFrameFormat ).First();
             if( pContact )
                 nOrdNum = pContact->GetMaster()->GetOrdNum();
         }
     }
-    else if( RES_DRAWFRMFMT == pFmt->Which() )
+    else if( RES_DRAWFRMFMT == pFormat->Which() )
     {
         // See if there is an SdrObject for it
-        SwDrawContact* pContact = SwIterator<SwDrawContact,SwFmt>( *pFrmFmt ).First();
+        SwDrawContact* pContact = SwIterator<SwDrawContact,SwFormat>( *pFrameFormat ).First();
         if( pContact )
             nOrdNum = pContact->GetMaster()->GetOrdNum();
     }
@@ -557,25 +557,25 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo)
                 break;
             }
 
-            sal_uInt16 nChrFmt;
+            sal_uInt16 nChrFormat;
 
             if (IsVisitedURL(static_cast<const SvxURLField*>(pField)->GetURL()))
-                nChrFmt = RES_POOLCHR_INET_VISIT;
+                nChrFormat = RES_POOLCHR_INET_VISIT;
             else
-                nChrFmt = RES_POOLCHR_INET_NORMAL;
+                nChrFormat = RES_POOLCHR_INET_NORMAL;
 
-            SwFmt *pFmt = getIDocumentStylePoolAccess().GetCharFmtFromPool(nChrFmt);
+            SwFormat *pFormat = getIDocumentStylePoolAccess().GetCharFormatFromPool(nChrFormat);
 
             Color aColor(COL_LIGHTBLUE);
-            if (pFmt)
-                aColor = pFmt->GetColor().GetValue();
+            if (pFormat)
+                aColor = pFormat->GetColor().GetValue();
 
-            pInfo->SetTxtColor(aColor);
+            pInfo->SetTextColor(aColor);
         }
         else if (pField && pField->ISA(SdrMeasureField))
         {
             // Measure field
-            pInfo->ClearFldColor();
+            pInfo->ClearFieldColor();
         }
         else if ( pField && pField->ISA(SvxExtTimeField))
         {
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index a83eb030d0fd..8bc9e088da7f 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -60,7 +60,7 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx,
     {
         // create new anchor
         _SaveFly& rSave = rArr[n];
-        SwFrmFmt* pFmt = rSave.pFrmFmt;
+        SwFrameFormat* pFormat = rSave.pFrameFormat;
 
         if( rSave.bInsertPosition )
         {
@@ -73,34 +73,34 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx,
             aPos.nNode = rSttIdx.GetIndex() + rSave.nNdDiff;
 
         aPos.nContent.Assign( 0, 0 );
-        SwFmtAnchor aAnchor( pFmt->GetAnchor() );
+        SwFormatAnchor aAnchor( pFormat->GetAnchor() );
         aAnchor.SetAnchor( &aPos );
-        pFmt->GetDoc()->GetSpzFrmFmts()->push_back( pFmt );
-        pFmt->SetFmtAttr( aAnchor );
-        SwCntntNode* pCNd = aPos.nNode.GetNode().GetCntntNode();
-        if( pCNd && pCNd->getLayoutFrm( pFmt->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false ) )
-            pFmt->MakeFrms();
+        pFormat->GetDoc()->GetSpzFrameFormats()->push_back( pFormat );
+        pFormat->SetFormatAttr( aAnchor );
+        SwContentNode* pCNd = aPos.nNode.GetNode().GetContentNode();
+        if( pCNd && pCNd->getLayoutFrm( pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false ) )
+            pFormat->MakeFrms();
     }
 }
 
 void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr )
 {
-    SwFrmFmts& rFmts = *rRg.aStart.GetNode().GetDoc()->GetSpzFrmFmts();
-    for( SwFrmFmts::size_type n = 0; n < rFmts.size(); ++n )
+    SwFrameFormats& rFormats = *rRg.aStart.GetNode().GetDoc()->GetSpzFrameFormats();
+    for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n )
     {
-        SwFrmFmt *const pFmt = rFmts[n];
-        SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-        SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+        SwFrameFormat *const pFormat = rFormats[n];
+        SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+        SwPosition const*const pAPos = pAnchor->GetContentAnchor();
         if (pAPos &&
             ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
              (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
             rRg.aStart <= pAPos->nNode && pAPos->nNode < rRg.aEnd )
         {
             _SaveFly aSave( pAPos->nNode.GetIndex() - rRg.aStart.GetIndex(),
-                            pFmt, false );
+                            pFormat, false );
             rArr.push_back( aSave );
-            pFmt->DelFrms();
-            rFmts.erase( rFmts.begin() + n-- );
+            pFormat->DelFrms();
+            rFormats.erase( rFormats.begin() + n-- );
         }
     }
 }
@@ -108,35 +108,35 @@ void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr )
 void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
                        _SaveFlyArr& rArr, bool bMoveAllFlys )
 {
-    SwFrmFmts& rFmts = *rPam.GetPoint()->nNode.GetNode().GetDoc()->GetSpzFrmFmts();
-    SwFrmFmt* pFmt;
-    const SwFmtAnchor* pAnchor;
+    SwFrameFormats& rFormats = *rPam.GetPoint()->nNode.GetNode().GetDoc()->GetSpzFrameFormats();
+    SwFrameFormat* pFormat;
+    const SwFormatAnchor* pAnchor;
 
     const SwPosition* pPos = rPam.Start();
     const SwNodeIndex& rSttNdIdx = pPos->nNode;
-    short nSttOff = (!bMoveAllFlys && rSttNdIdx.GetNode().IsCntntNode() &&
+    short nSttOff = (!bMoveAllFlys && rSttNdIdx.GetNode().IsContentNode() &&
                     pPos->nContent.GetIndex()) ? 1 : 0;
 
     pPos = rPam.GetPoint() == pPos ? rPam.GetMark() : rPam.GetPoint();
     const SwNodeIndex& rEndNdIdx = pPos->nNode;
-    short nOff = ( bMoveAllFlys || ( rEndNdIdx.GetNode().IsCntntNode() &&
-                pPos->nContent == rEndNdIdx.GetNode().GetCntntNode()->Len() ))
+    short nOff = ( bMoveAllFlys || ( rEndNdIdx.GetNode().IsContentNode() &&
+                pPos->nContent == rEndNdIdx.GetNode().GetContentNode()->Len() ))
                     ? 0 : 1;
 
-    const SwNodeIndex* pCntntIdx;
+    const SwNodeIndex* pContentIdx;
 
-    for( SwFrmFmts::size_type n = 0; n < rFmts.size(); ++n )
+    for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n )
     {
-        pFmt = (SwFrmFmt*)rFmts[n];
-        pAnchor = &pFmt->GetAnchor();
-        const SwPosition* pAPos = pAnchor->GetCntntAnchor();
+        pFormat = (SwFrameFormat*)rFormats[n];
+        pAnchor = &pFormat->GetAnchor();
+        const SwPosition* pAPos = pAnchor->GetContentAnchor();
         if (pAPos &&
             ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
              (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
-            // do not move if the InsPos is in the CntntArea of the Fly
-            ( 0 == ( pCntntIdx = pFmt->GetCntnt().GetCntntIdx() ) ||
-              !( *pCntntIdx < rInsPos &&
-                rInsPos < pCntntIdx->GetNode().EndOfSectionIndex() )) )
+            // do not move if the InsPos is in the ContentArea of the Fly
+            ( 0 == ( pContentIdx = pFormat->GetContent().GetContentIdx() ) ||
+              !( *pContentIdx < rInsPos &&
+                rInsPos < pContentIdx->GetNode().EndOfSectionIndex() )) )
         {
             bool bInsPos = false;
 
@@ -148,9 +148,9 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
                 {
                     // Only attach an anchor to the beginning or end
                     SwPosition aPos( rSttNdIdx );
-                    SwFmtAnchor aAnchor( *pAnchor );
+                    SwFormatAnchor aAnchor( *pAnchor );
                     aAnchor.SetAnchor( &aPos );
-                    pFmt->SetFmtAttr( aAnchor );
+                    pFormat->SetFormatAttr( aAnchor );
                 }
             }
             else if( ( rSttNdIdx.GetIndex() + nSttOff <= pAPos->nNode.GetIndex()
@@ -159,10 +159,10 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
 
             {
                 _SaveFly aSave( pAPos->nNode.GetIndex() - rSttNdIdx.GetIndex(),
-                                pFmt, bInsPos );
+                                pFormat, bInsPos );
                 rArr.push_back( aSave );
-                pFmt->DelFrms();
-                rFmts.erase( rFmts.begin() + n-- );
+                pFormat->DelFrms();
+                rFormats.erase( rFormats.begin() + n-- );
             }
         }
     }
@@ -176,12 +176,12 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
     const bool bDelFwrd = rMkNdIdx.GetIndex() <= rPtNdIdx.GetIndex();
 
     SwDoc* pDoc = rMkNdIdx.GetNode().GetDoc();
-    SwFrmFmts& rTbl = *pDoc->GetSpzFrmFmts();
-    for ( auto i = rTbl.size(); i; )
+    SwFrameFormats& rTable = *pDoc->GetSpzFrameFormats();
+    for ( auto i = rTable.size(); i; )
     {
-        SwFrmFmt *pFmt = rTbl[--i];
-        const SwFmtAnchor &rAnch = pFmt->GetAnchor();
-        SwPosition const*const pAPos = rAnch.GetCntntAnchor();
+        SwFrameFormat *pFormat = rTable[--i];
+        const SwFormatAnchor &rAnch = pFormat->GetAnchor();
+        SwPosition const*const pAPos = rAnch.GetContentAnchor();
         if (pAPos &&
             ((rAnch.GetAnchorId() == FLY_AT_PARA) ||
              (rAnch.GetAnchorId() == FLY_AT_CHAR)) &&
@@ -192,32 +192,32 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
             // Only move the Anchor??
             if( rPtNdIdx == pAPos->nNode )
             {
-                SwFmtAnchor aAnch( pFmt->GetAnchor() );
+                SwFormatAnchor aAnch( pFormat->GetAnchor() );
                 SwPosition aPos( rMkNdIdx );
                 aAnch.SetAnchor( &aPos );
-                pFmt->SetFmtAttr( aAnch );
+                pFormat->SetFormatAttr( aAnch );
             }
             else
             {
                 // If the Fly is deleted, all Flys in it's content have to be deleted too.
-                const SwFmtCntnt &rCntnt = pFmt->GetCntnt();
-                if( rCntnt.GetCntntIdx() )
+                const SwFormatContent &rContent = pFormat->GetContent();
+                if( rContent.GetContentIdx() )
                 {
-                    DelFlyInRange( *rCntnt.GetCntntIdx(),
-                                    SwNodeIndex( *rCntnt.GetCntntIdx()->
+                    DelFlyInRange( *rContent.GetContentIdx(),
+                                    SwNodeIndex( *rContent.GetContentIdx()->
                                             GetNode().EndOfSectionNode() ));
                     // Position could have been moved!
-                    if( i > rTbl.size() )
-                        i = rTbl.size();
-                    else if( pFmt != rTbl[i] )
-                        i = rTbl.GetPos( pFmt );
+                    if( i > rTable.size() )
+                        i = rTable.size();
+                    else if( pFormat != rTable[i] )
+                        i = rTable.GetPos( pFormat );
                 }
 
-                pDoc->getIDocumentLayoutAccess().DelLayoutFmt( pFmt );
+                pDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFormat );
 
-                // DelLayoutFmt can also trigger the deletion of objects.
-                if( i > rTbl.size() )
-                    i = rTbl.size();
+                // DelLayoutFormat can also trigger the deletion of objects.
+                if( i > rTable.size() )
+                    i = rTable.size();
             }
         }
     }
@@ -228,19 +228,19 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
 // 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 )
-    : pSavArr( 0 ), pSavIdx( 0 ), nSavCntnt( nCnt )
+    : pSavArr( 0 ), pSavIdx( 0 ), nSavContent( nCnt )
 {
     SwNode& rNd = rInsIdx.GetNode();
     SwDoc* pDest = rNd.GetDoc();
-    if( !pDest->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( !pDest->getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         sal_uInt16 nFndPos;
         const SwPosition* pEnd;
-        SwPosition aSrcPos( rInsIdx, SwIndex( rNd.GetCntntNode(), nCnt ));
+        SwPosition aSrcPos( rInsIdx, SwIndex( rNd.GetContentNode(), nCnt ));
         pDest->getIDocumentRedlineAccess().GetRedline( aSrcPos, &nFndPos );
         const SwRangeRedline* pRedl;
         while( nFndPos--
-              && *( pEnd = ( pRedl = pDest->getIDocumentRedlineAccess().GetRedlineTbl()[ nFndPos ] )->End() ) == aSrcPos
+              && *( pEnd = ( pRedl = pDest->getIDocumentRedlineAccess().GetRedlineTable()[ nFndPos ] )->End() ) == aSrcPos
               && *pRedl->Start() < aSrcPos )
         {
             if( !pSavArr )
@@ -262,12 +262,12 @@ _SaveRedlEndPosForRestore::~_SaveRedlEndPosForRestore()
 void _SaveRedlEndPosForRestore::_Restore()
 {
     ++(*pSavIdx);
-    SwCntntNode* pNode = pSavIdx->GetNode().GetCntntNode();
+    SwContentNode* pNode = pSavIdx->GetNode().GetContentNode();
     // If there's no content node at the remembered position, we will not restore the old position
     // This may happen if a table (or section?) will be inserted.
     if( pNode )
     {
-        SwPosition aPos( *pSavIdx, SwIndex( pNode, nSavCntnt ));
+        SwPosition aPos( *pSavIdx, SwIndex( pNode, nSavContent ));
         for( auto n = pSavArr->size(); n; )
             *(*pSavArr)[ --n ] = aPos;
     }
@@ -292,29 +292,29 @@ static std::vector<sal_uInt16> * lcl_RangesToVector(sal_uInt16 * pRanges)
     return pResult;
 }
 
-void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev )
+void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinText, bool& rJoinPrev )
 {
-    rJoinTxt = false;
+    rJoinText = false;
     rJoinPrev = false;
     if( rPam.GetPoint()->nNode != rPam.GetMark()->nNode )
     {
         const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End();
-        SwTxtNode *pSttNd = pStt->nNode.GetNode().GetTxtNode();
+        SwTextNode *pSttNd = pStt->nNode.GetNode().GetTextNode();
         if( pSttNd )
         {
-            SwTxtNode *pEndNd = pEnd->nNode.GetNode().GetTxtNode();
-            rJoinTxt = 0 != pEndNd;
-            if( rJoinTxt )
+            SwTextNode *pEndNd = pEnd->nNode.GetNode().GetTextNode();
+            rJoinText = 0 != pEndNd;
+            if( rJoinText )
             {
                 bool bExchange = pStt == rPam.GetPoint();
                 if( !pStt->nContent.GetIndex() &&
-                    pEndNd->GetTxt().getLength() != pEnd->nContent.GetIndex())
+                    pEndNd->GetText().getLength() != pEnd->nContent.GetIndex())
                     bExchange = !bExchange;
                 if( bExchange )
                     rPam.Exchange();
                 rJoinPrev = rPam.GetPoint() == pStt;
                 OSL_ENSURE( !pStt->nContent.GetIndex() &&
-                    pEndNd->GetTxt().getLength() != pEnd->nContent.GetIndex()
+                    pEndNd->GetText().getLength() != pEnd->nContent.GetIndex()
                     ? rPam.GetPoint()->nNode < rPam.GetMark()->nNode
                     : rPam.GetPoint()->nNode > rPam.GetMark()->nNode,
                     "sw_GetJoinFlags");
@@ -326,11 +326,11 @@ void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev )
 bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
 {
     SwNodeIndex aIdx( rPam.GetPoint()->nNode );
-    SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
+    SwTextNode *pTextNd = aIdx.GetNode().GetTextNode();
     SwNodeIndex aOldIdx( aIdx );
-    SwTxtNode *pOldTxtNd = pTxtNd;
+    SwTextNode *pOldTextNd = pTextNd;
 
-    if( pTxtNd && pTxtNd->CanJoinNext( &aIdx ) )
+    if( pTextNd && pTextNd->CanJoinNext( &aIdx ) )
     {
         SwDoc* pDoc = rPam.GetDoc();
         if( bJoinPrev )
@@ -349,24 +349,24 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
                 // There, we copy the AUTO PageBreak from the GetMarkNode!
 
                 /* The GetMarkNode */
-                if( ( pTxtNd = aIdx.GetNode().GetTxtNode())->HasSwAttrSet() )
+                if( ( pTextNd = aIdx.GetNode().GetTextNode())->HasSwAttrSet() )
                 {
                     const SfxPoolItem* pItem;
-                    if( SfxItemState::SET == pTxtNd->GetpSwAttrSet()->GetItemState(
+                    if( SfxItemState::SET == pTextNd->GetpSwAttrSet()->GetItemState(
                         RES_BREAK, false, &pItem ) )
-                        pTxtNd->ResetAttr( RES_BREAK );
-                    if( pTxtNd->HasSwAttrSet() &&
-                        SfxItemState::SET == pTxtNd->GetpSwAttrSet()->GetItemState(
+                        pTextNd->ResetAttr( RES_BREAK );
+                    if( pTextNd->HasSwAttrSet() &&
+                        SfxItemState::SET == pTextNd->GetpSwAttrSet()->GetItemState(
                         RES_PAGEDESC, false, &pItem ) )
-                        pTxtNd->ResetAttr( RES_PAGEDESC );
+                        pTextNd->ResetAttr( RES_PAGEDESC );
                 }
 
                 /* The PointNode */
-                if( pOldTxtNd->HasSwAttrSet() )
+                if( pOldTextNd->HasSwAttrSet() )
                 {
                     const SfxPoolItem* pItem;
                     SfxItemSet aSet( pDoc->GetAttrPool(), aBreakSetRange );
-                    const SfxItemSet* pSet = pOldTxtNd->GetpSwAttrSet();
+                    const SfxItemSet* pSet = pOldTextNd->GetpSwAttrSet();
                     if( SfxItemState::SET == pSet->GetItemState( RES_BREAK,
                         false, &pItem ) )
                         aSet.Put( *pItem );
@@ -374,28 +374,28 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
                         false, &pItem ) )
                         aSet.Put( *pItem );
                     if( aSet.Count() )
-                        pTxtNd->SetAttr( aSet );
+                        pTextNd->SetAttr( aSet );
                 }
-                pOldTxtNd->FmtToTxtAttr( pTxtNd );
+                pOldTextNd->FormatToTextAttr( pTextNd );
 
-                const std::shared_ptr< sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-                pCntntStore->Save( pDoc, aOldIdx.GetIndex(), pOldTxtNd->Len() );
+                const std::shared_ptr< sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+                pContentStore->Save( pDoc, aOldIdx.GetIndex(), pOldTextNd->Len() );
 
-                SwIndex aAlphaIdx(pTxtNd);
-                pOldTxtNd->CutText( pTxtNd, aAlphaIdx, SwIndex(pOldTxtNd),
-                                    pOldTxtNd->Len() );
+                SwIndex aAlphaIdx(pTextNd);
+                pOldTextNd->CutText( pTextNd, aAlphaIdx, SwIndex(pOldTextNd),
+                                    pOldTextNd->Len() );
                 SwPosition aAlphaPos( aIdx, aAlphaIdx );
                 pDoc->CorrRel( rPam.GetPoint()->nNode, aAlphaPos, 0, true );
 
                 // move all Bookmarks/TOXMarks
-                if( !pCntntStore->Empty() )
-                    pCntntStore->Restore( pDoc, aIdx.GetIndex() );
+                if( !pContentStore->Empty() )
+                    pContentStore->Restore( pDoc, aIdx.GetIndex() );
 
                 // If the passed PaM is not in the Crsr ring,
                 // treat it separately (e.g. when it's being called from AutoFormat)
-                if( pOldTxtNd == rPam.GetBound( true ).nContent.GetIdxReg() )
+                if( pOldTextNd == rPam.GetBound( true ).nContent.GetIdxReg() )
                     rPam.GetBound( true ) = aAlphaPos;
-                if( pOldTxtNd == rPam.GetBound( false ).nContent.GetIdxReg() )
+                if( pOldTextNd == rPam.GetBound( false ).nContent.GetIdxReg() )
                     rPam.GetBound( false ) = aAlphaPos;
             }
             // delete the Node, at last!
@@ -403,33 +403,33 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
         }
         else
         {
-            SwTxtNode* pDelNd = aIdx.GetNode().GetTxtNode();
-            if( pTxtNd->Len() )
-                pDelNd->FmtToTxtAttr( pTxtNd );
+            SwTextNode* pDelNd = aIdx.GetNode().GetTextNode();
+            if( pTextNd->Len() )
+                pDelNd->FormatToTextAttr( pTextNd );
             else
             {
                 /* This case was missed:
 
-                   <something></something>   <-- pTxtNd
+                   <something></something>   <-- pTextNd
                    <other>ccc</other>        <-- pDelNd
 
                    <something> and <other> are paragraph
                    attributes. The attribute <something> stayed if not
                    overwritten by an attribute in "ccc". Fixed by
                    first resetting all character attributes in first
-                   paragraph (pTxtNd).
+                   paragraph (pTextNd).
                 */
                 std::vector<sal_uInt16> * pShorts =
-                    lcl_RangesToVector(aCharFmtSetRange);
-                pTxtNd->ResetAttr(*pShorts);
+                    lcl_RangesToVector(aCharFormatSetRange);
+                pTextNd->ResetAttr(*pShorts);
                 delete pShorts;
 
                 if( pDelNd->HasSwAttrSet() )
                 {
                     // only copy the character attributes
-                    SfxItemSet aTmpSet( pDoc->GetAttrPool(), aCharFmtSetRange );
+                    SfxItemSet aTmpSet( pDoc->GetAttrPool(), aCharFormatSetRange );
                     aTmpSet.Put( *pDelNd->GetpSwAttrSet() );
-                    pTxtNd->SetAttr( aTmpSet );
+                    pTextNd->SetAttr( aTmpSet );
                 }
             }
 
@@ -437,25 +437,25 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
             // #i100466# adjust given <rPam>, if it does not belong to the cursors
             if ( pDelNd == rPam.GetBound( true ).nContent.GetIdxReg() )
             {
-                rPam.GetBound( true ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) );
+                rPam.GetBound( true ) = SwPosition( SwNodeIndex( *pTextNd ), SwIndex( pTextNd ) );
             }
             if( pDelNd == rPam.GetBound( false ).nContent.GetIdxReg() )
             {
-                rPam.GetBound( false ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) );
+                rPam.GetBound( false ) = SwPosition( SwNodeIndex( *pTextNd ), SwIndex( pTextNd ) );
             }
-            pTxtNd->JoinNext();
+            pTextNd->JoinNext();
         }
         return true;
     }
     else return false;
 }
 
-static void lcl_syncGrammarError( SwTxtNode &rTxtNode, linguistic2::ProofreadingResult& rResult,
+static void lcl_syncGrammarError( SwTextNode &rTextNode, linguistic2::ProofreadingResult& rResult,
     const ModelToViewHelper &rConversionMap )
 {
-    if( rTxtNode.IsGrammarCheckDirty() )
+    if( rTextNode.IsGrammarCheckDirty() )
         return;
-    SwGrammarMarkUp* pWrong = rTxtNode.GetGrammarCheck();
+    SwGrammarMarkUp* pWrong = rTextNode.GetGrammarCheck();
     linguistic2::SingleProofreadingError* pArray = rResult.aErrors.getArray();
     sal_uInt16 j = 0;
     if( pWrong )
@@ -486,13 +486,13 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
     SwSpellArgs      *pSpellArgs = 0;
     if (pConvArgs)
     {
-        pConvArgs->SetStart(pSttPos->nNode.GetNode().GetTxtNode(), pSttPos->nContent);
-        pConvArgs->SetEnd(  pEndPos->nNode.GetNode().GetTxtNode(), pEndPos->nContent );
+        pConvArgs->SetStart(pSttPos->nNode.GetNode().GetTextNode(), pSttPos->nContent);
+        pConvArgs->SetEnd(  pEndPos->nNode.GetNode().GetTextNode(), pEndPos->nContent );
     }
     else
         pSpellArgs = new SwSpellArgs( xSpeller,
-                            pSttPos->nNode.GetNode().GetTxtNode(), pSttPos->nContent,
-                            pEndPos->nNode.GetNode().GetTxtNode(), pEndPos->nContent,
+                            pSttPos->nNode.GetNode().GetTextNode(), pSttPos->nContent,
+                            pEndPos->nNode.GetNode().GetTextNode(), pEndPos->nContent,
                             bGrammarCheck );
 
     sal_uLong nCurrNd = pSttPos->nNode.GetIndex();
@@ -501,7 +501,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
     uno::Any aRet;
     if( nCurrNd <= nEndNd )
     {
-        SwCntntFrm* pCntFrm;
+        SwContentFrm* pCntFrm;
         bool bGoOn = true;
         while( bGoOn )
         {
@@ -509,14 +509,14 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
             switch( pNd->GetNodeType() )
             {
             case ND_TEXTNODE:
-                if( 0 != ( pCntFrm = pNd->GetTxtNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout() )) )
+                if( 0 != ( pCntFrm = pNd->GetTextNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout() )) )
                 {
                     // skip protected and hidden Cells and Flys
                     if( pCntFrm->IsProtected() )
                     {
                         nCurrNd = pNd->EndOfSectionIndex();
                     }
-                    else if( !static_cast<SwTxtFrm*>(pCntFrm)->IsHiddenNow() )
+                    else if( !static_cast<SwTextFrm*>(pCntFrm)->IsHiddenNow() )
                     {
                         if( pPageCnt && *pPageCnt && pPageSt )
                         {
@@ -543,7 +543,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
                             // if grammar checking starts inside of a sentence the start position has to be adjusted
                             if( nBeginGrammarCheck )
                             {
-                                SwIndex aStartIndex( dynamic_cast< SwTxtNode* >( pNd ), nBeginGrammarCheck );
+                                SwIndex aStartIndex( dynamic_cast< SwTextNode* >( pNd ), nBeginGrammarCheck );
                                 SwPosition aStart( *pNd, aStartIndex );
                                 SwCursor aCrsr(aStart, 0, false);
                                 SwPosition aOrigPos = *aCrsr.GetPoint();
@@ -555,13 +555,13 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
                             }
                             nEndGrammarCheck = (pSpellArgs->pEndNode == pNd)
                                 ? pSpellArgs->pEndIdx->GetIndex()
-                                : pNd->GetTxtNode()
-                                    ->GetTxt().getLength();
+                                : pNd->GetTextNode()
+                                    ->GetText().getLength();
                         }
 
-                        sal_Int32 nSpellErrorPosition = pNd->GetTxtNode()->GetTxt().getLength();
-                        if( (!pConvArgs && pNd->GetTxtNode()->Spell( pSpellArgs )) ||
-                            ( pConvArgs && pNd->GetTxtNode()->Convert( *pConvArgs )))
+                        sal_Int32 nSpellErrorPosition = pNd->GetTextNode()->GetText().getLength();
+                        if( (!pConvArgs && pNd->GetTextNode()->Spell( pSpellArgs )) ||
+                            ( pConvArgs && pNd->GetTextNode()->Convert( *pConvArgs )))
                         {
                             // Cancel and remember position
                             pSttPos->nNode = nCurrNd;
@@ -580,11 +580,11 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
                             {
                                 uno::Reference< lang::XComponent > xDoc( GetDocShell()->GetBaseModel(), uno::UNO_QUERY );
                                 // Expand the string:
-                                const ModelToViewHelper aConversionMap(*pNd->GetTxtNode());
+                                const ModelToViewHelper aConversionMap(*pNd->GetTextNode());
                                 OUString aExpandText = aConversionMap.getViewText();
 
                                 // get XFlatParagraph to use...
-                                uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *pNd->GetTxtNode(), aExpandText, aConversionMap );
+                                uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *pNd->GetTextNode(), aExpandText, aConversionMap );
 
                                 // get error position of cursor in XFlatParagraph
                                 linguistic2::ProofreadingResult aResult;
@@ -595,7 +595,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
                                     aResult = xGCIterator->checkSentenceAtPosition(
                                             xDoc, xFlatPara, aExpandText, lang::Locale(), nBeginGrammarCheck, -1, -1 );
 
-                                    lcl_syncGrammarError( *pNd->GetTxtNode(), aResult, aConversionMap );
+                                    lcl_syncGrammarError( *pNd->GetTextNode(), aResult, aConversionMap );
 
                                     // get suggestions to use for the specific error position
                                     nGrammarErrors = aResult.aErrors.getLength();
@@ -615,10 +615,10 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
                                     nCurrNd = pNd->GetIndex();
                                     pSttPos->nNode = nCurrNd;
                                     pEndPos->nNode = nCurrNd;
-                                    pSpellArgs->pStartNode = pNd->GetTxtNode();
-                                    pSpellArgs->pEndNode = pNd->GetTxtNode();
-                                    pSpellArgs->pStartIdx->Assign(pNd->GetTxtNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart ).mnPos );
-                                    pSpellArgs->pEndIdx->Assign(pNd->GetTxtNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart + rError.nErrorLength ).mnPos );
+                                    pSpellArgs->pStartNode = pNd->GetTextNode();
+                                    pSpellArgs->pEndNode = pNd->GetTextNode();
+                                    pSpellArgs->pStartIdx->Assign(pNd->GetTextNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart ).mnPos );
+                                    pSpellArgs->pEndIdx->Assign(pNd->GetTextNode(), aConversionMap.ConvertToModelPosition( rError.nErrorStart + rError.nErrorLength ).mnPos );
                                     nCurrNd = nEndNd;
                                 }
                             }
@@ -693,12 +693,12 @@ SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCrsrPos,
     nNode = pPoint->nNode.GetIndex();
 
     // Set start
-    pStart = pPoint->nNode.GetNode().GetTxtNode();
+    pStart = pPoint->nNode.GetNode().GetTextNode();
     nPamStart = pPoint->nContent.GetIndex();
 
     // Set End and Length
     const SwPosition *pMark = pPam->GetMark();
-    pEnd = pMark->nNode.GetNode().GetTxtNode();
+    pEnd = pMark->nNode.GetNode().GetTextNode();
     nPamLen = pMark->nContent.GetIndex();
     if( pPoint->nNode == pMark->nNode )
         nPamLen = nPamLen - pPoint->nContent.GetIndex();
@@ -717,9 +717,9 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const
     else
     {
         pPam->GetPoint()->nNode = nNode;
-        pPam->GetPoint()->nContent.Assign( pNode->GetCntntNode(), nWordStart );
+        pPam->GetPoint()->nContent.Assign( pNode->GetContentNode(), nWordStart );
         pPam->GetMark()->nNode = nNode;
-        pPam->GetMark()->nContent.Assign( pNode->GetCntntNode(),
+        pPam->GetMark()->nContent.Assign( pNode->GetContentNode(),
                                           nWordStart + nWordLen );
         OSL_ENSURE( nNode == pNode->GetIndex(),
                 "SwHyphArgs::SetPam: Pam disaster" );
@@ -730,12 +730,12 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const
 static bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* pArgs )
 {
     // Hyphenate returns true if there is a hyphenation point and sets pPam
-    SwTxtNode *pNode = rpNd->GetTxtNode();
+    SwTextNode *pNode = rpNd->GetTextNode();
     SwHyphArgs *pHyphArgs = static_cast<SwHyphArgs*>(pArgs);
     if( pNode )
     {
-        SwCntntFrm* pCntFrm = pNode->getLayoutFrm( pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
-        if( pCntFrm && !static_cast<SwTxtFrm*>(pCntFrm)->IsHiddenNow() )
+        SwContentFrm* pCntFrm = pNode->getLayoutFrm( pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+        if( pCntFrm && !static_cast<SwTextFrm*>(pCntFrm)->IsHiddenNow() )
         {
             sal_uInt16 *pPageSt = pHyphArgs->GetPageSt();
             sal_uInt16 *pPageCnt = pHyphArgs->GetPageCnt();
@@ -808,7 +808,7 @@ void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat )
     const sal_Int32 nSttCnt = pStt->nContent.GetIndex();
     const sal_Int32 nEndCnt = pEnd->nContent.GetIndex();
 
-    const SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
+    const SwTextNode* pTNd = pStt->nNode.GetNode().GetTextNode();
     if( pStt == pEnd && pTNd )                  // no region ?
     {
         // do nothing
@@ -822,14 +822,14 @@ void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat )
         {
             ++aIdx;
             if( pTNd )
-                pTNd->CountWords( rStat, nSttCnt, pTNd->GetTxt().getLength() );
+                pTNd->CountWords( rStat, nSttCnt, pTNd->GetText().getLength() );
         }
 
         for( ; aIdx.GetIndex() < nEndNd; ++aIdx )
-            if( 0 != ( pTNd = aIdx.GetNode().GetTxtNode() ))
-                pTNd->CountWords( rStat, 0, pTNd->GetTxt().getLength() );
+            if( 0 != ( pTNd = aIdx.GetNode().GetTextNode() ))
+                pTNd->CountWords( rStat, 0, pTNd->GetText().getLength() );
 
-        if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTxtNode() ))
+        if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTextNode() ))
             pTNd->CountWords( rStat, 0, nEndCnt );
     }
     else if( pTNd && nSttCnt < nEndCnt )
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index f3b6fe66679c..88015e375111 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -68,169 +68,169 @@ using namespace ::com::sun::star::uno;
 
 // the StartIndex can be supplied optionally (e.g. if it was queried before - is a virtual
 // method otherwise!)
-_SetGetExpFld::_SetGetExpFld(
+_SetGetExpField::_SetGetExpField(
     const SwNodeIndex& rNdIdx,
-    const SwTxtFld* pFld,
+    const SwTextField* pField,
     const SwIndex* pIdx )
 {
-    eSetGetExpFldType = TEXTFIELD;
-    CNTNT.pTxtFld = pFld;
+    eSetGetExpFieldType = TEXTFIELD;
+    CNTNT.pTextField = pField;
     nNode = rNdIdx.GetIndex();
     if( pIdx )
-        nCntnt = pIdx->GetIndex();
-    else if( pFld )
-        nCntnt = pFld->GetStart();
+        nContent = pIdx->GetIndex();
+    else if( pField )
+        nContent = pField->GetStart();
     else
-        nCntnt = 0;
+        nContent = 0;
 }
 
-_SetGetExpFld::_SetGetExpFld( const SwNodeIndex& rNdIdx,
-                            const SwTxtINetFmt& rINet, const SwIndex* pIdx )
+_SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx,
+                            const SwTextINetFormat& rINet, const SwIndex* pIdx )
 {
-    eSetGetExpFldType = TEXTINET;
-    CNTNT.pTxtINet = &rINet;
+    eSetGetExpFieldType = TEXTINET;
+    CNTNT.pTextINet = &rINet;
     nNode = rNdIdx.GetIndex();
     if( pIdx )
-        nCntnt = pIdx->GetIndex();
+        nContent = pIdx->GetIndex();
     else
-        nCntnt = rINet.GetStart();
+        nContent = rINet.GetStart();
 }
 
 // Extension for Sections:
 // these always have content position 0xffffffff!
 // There is never a field on this, only up to COMPLETE_STRING possible
-_SetGetExpFld::_SetGetExpFld( const SwSectionNode& rSectNd,
+_SetGetExpField::_SetGetExpField( const SwSectionNode& rSectNd,
                                 const SwPosition* pPos )
 {
-    eSetGetExpFldType = SECTIONNODE;
+    eSetGetExpFieldType = SECTIONNODE;
     CNTNT.pSection = &rSectNd.GetSection();
 
     if( pPos )
     {
         nNode = pPos->nNode.GetIndex();
-        nCntnt = pPos->nContent.GetIndex();
+        nContent = pPos->nContent.GetIndex();
     }
     else
     {
         nNode = rSectNd.GetIndex();
-        nCntnt = 0;
+        nContent = 0;
     }
 }
 
-_SetGetExpFld::_SetGetExpFld( const SwTableBox& rTBox, const SwPosition* pPos )
+_SetGetExpField::_SetGetExpField( const SwTableBox& rTBox, const SwPosition* pPos )
 {
-    eSetGetExpFldType = TABLEBOX;
+    eSetGetExpFieldType = TABLEBOX;
     CNTNT.pTBox = &rTBox;
 
     if( pPos )
     {
         nNode = pPos->nNode.GetIndex();
-        nCntnt = pPos->nContent.GetIndex();
+        nContent = pPos->nContent.GetIndex();
     }
     else
     {
         nNode = 0;
-        nCntnt = 0;
+        nContent = 0;
         if( rTBox.GetSttNd() )
         {
             SwNodeIndex aIdx( *rTBox.GetSttNd() );
-            const SwCntntNode* pNd = aIdx.GetNode().GetNodes().GoNext( &aIdx );
+            const SwContentNode* pNd = aIdx.GetNode().GetNodes().GoNext( &aIdx );
             if( pNd )
                 nNode = pNd->GetIndex();
         }
     }
 }
 
-_SetGetExpFld::_SetGetExpFld( const SwNodeIndex& rNdIdx,
-                                const SwTxtTOXMark& rTOX,
+_SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx,
+                                const SwTextTOXMark& rTOX,
                                 const SwIndex* pIdx )
 {
-    eSetGetExpFldType = TEXTTOXMARK;
-    CNTNT.pTxtTOX = &rTOX;
+    eSetGetExpFieldType = TEXTTOXMARK;
+    CNTNT.pTextTOX = &rTOX;
     nNode = rNdIdx.GetIndex();
     if( pIdx )
-        nCntnt = pIdx->GetIndex();
+        nContent = pIdx->GetIndex();
     else
-        nCntnt = rTOX.GetStart();
+        nContent = rTOX.GetStart();
 }
 
-_SetGetExpFld::_SetGetExpFld( const SwPosition& rPos )
+_SetGetExpField::_SetGetExpField( const SwPosition& rPos )
 {
-    eSetGetExpFldType = CRSRPOS;
+    eSetGetExpFieldType = CRSRPOS;
     CNTNT.pPos = &rPos;
     nNode = rPos.nNode.GetIndex();
-    nCntnt = rPos.nContent.GetIndex();
+    nContent = rPos.nContent.GetIndex();
 }
 
-_SetGetExpFld::_SetGetExpFld( const SwFlyFrmFmt& rFlyFmt,
+_SetGetExpField::_SetGetExpField( const SwFlyFrameFormat& rFlyFormat,
                                 const SwPosition* pPos  )
 {
-    eSetGetExpFldType = FLYFRAME;
-    CNTNT.pFlyFmt = &rFlyFmt;
+    eSetGetExpFieldType = FLYFRAME;
+    CNTNT.pFlyFormat = &rFlyFormat;
     if( pPos )
     {
         nNode = pPos->nNode.GetIndex();
-        nCntnt = pPos->nContent.GetIndex();
+        nContent = pPos->nContent.GetIndex();
     }
     else
     {
-        const SwFmtCntnt& rCntnt = rFlyFmt.GetCntnt();
-        nNode = rCntnt.GetCntntIdx()->GetIndex() + 1;
-        nCntnt = 0;
+        const SwFormatContent& rContent = rFlyFormat.GetContent();
+        nNode = rContent.GetContentIdx()->GetIndex() + 1;
+        nContent = 0;
     }
 }
 
-void _SetGetExpFld::GetPosOfContent( SwPosition& rPos ) const
+void _SetGetExpField::GetPosOfContent( SwPosition& rPos ) const
 {
-    const SwNode* pNd = GetNodeFromCntnt();
+    const SwNode* pNd = GetNodeFromContent();
     if( pNd )
-        pNd = pNd->GetCntntNode();
+        pNd = pNd->GetContentNode();
 
     if( pNd )
     {
         rPos.nNode = *pNd;
-        rPos.nContent.Assign( const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd)), GetCntPosFromCntnt() );
+        rPos.nContent.Assign( const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd)), GetCntPosFromContent() );
     }
     else
     {
         rPos.nNode = nNode;
-        rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(), nCntnt );
+        rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(), nContent );
     }
 }
 
-void _SetGetExpFld::SetBodyPos( const SwCntntFrm& rFrm )
+void _SetGetExpField::SetBodyPos( const SwContentFrm& rFrm )
 {
     if( !rFrm.IsInDocBody() )
     {
         SwNodeIndex aIdx( *rFrm.GetNode() );
         SwDoc& rDoc = *aIdx.GetNodes().GetDoc();
         SwPosition aPos( aIdx );
-        bool const bResult = ::GetBodyTxtNode( rDoc, aPos, rFrm );
+        bool const bResult = ::GetBodyTextNode( rDoc, aPos, rFrm );
         OSL_ENSURE(bResult, "Where is the field?");
         (void) bResult; // unused in non-debug
         nNode = aPos.nNode.GetIndex();
-        nCntnt = aPos.nContent.GetIndex();
+        nContent = aPos.nContent.GetIndex();
     }
 }
 
-bool _SetGetExpFld::operator==( const _SetGetExpFld& rFld ) const
+bool _SetGetExpField::operator==( const _SetGetExpField& rField ) const
 {
-    return nNode == rFld.nNode
-           && nCntnt == rFld.nCntnt
-           && ( !CNTNT.pTxtFld
-                || !rFld.CNTNT.pTxtFld
-                || CNTNT.pTxtFld == rFld.CNTNT.pTxtFld );
+    return nNode == rField.nNode
+           && nContent == rField.nContent
+           && ( !CNTNT.pTextField
+                || !rField.CNTNT.pTextField
+                || CNTNT.pTextField == rField.CNTNT.pTextField );
 }
 
-bool _SetGetExpFld::operator<( const _SetGetExpFld& rFld ) const
+bool _SetGetExpField::operator<( const _SetGetExpField& rField ) const
 {
-    if( nNode < rFld.nNode || ( nNode == rFld.nNode && nCntnt < rFld.nCntnt ))
+    if( nNode < rField.nNode || ( nNode == rField.nNode && nContent < rField.nContent ))
         return true;
-    else if( nNode != rFld.nNode || nCntnt != rFld.nCntnt )
+    else if( nNode != rField.nNode || nContent != rField.nContent )
         return false;
 
-    const SwNode *pFirst = GetNodeFromCntnt(),
-                 *pNext = rFld.GetNodeFromCntnt();
+    const SwNode *pFirst = GetNodeFromContent(),
+                 *pNext = rField.GetNodeFromContent();
 
     // Position is the same: continue only if both field pointers are set!
     if( !pFirst || !pNext )
@@ -241,23 +241,23 @@ bool _SetGetExpFld::operator<( const _SetGetExpFld& rFld ) const
     {
         // is one in the table?
         const SwNode *pFirstStt, *pNextStt;
-        const SwTableNode* pTblNd = pFirst->FindTableNode();
-        if( pTblNd )
-            pFirstStt = pTblNd->StartOfSectionNode();
+        const SwTableNode* pTableNd = pFirst->FindTableNode();
+        if( pTableNd )
+            pFirstStt = pTableNd->StartOfSectionNode();
         else
             pFirstStt = pFirst->StartOfSectionNode();
 
-        if( 0 != ( pTblNd = pNext->FindTableNode() ) )
-            pNextStt = pTblNd->StartOfSectionNode();
+        if( 0 != ( pTableNd = pNext->FindTableNode() ) )
+            pNextStt = pTableNd->StartOfSectionNode();
         else
             pNextStt = pNext->StartOfSectionNode();
 
         if( pFirstStt != pNextStt )
         {
-            if( pFirst->IsTxtNode() && pNext->IsTxtNode() &&
+            if( pFirst->IsTextNode() && pNext->IsTextNode() &&
                 ( pFirst->FindFlyStartNode() || pNext->FindFlyStartNode() ))
             {
-                return ::IsFrameBehind( *pNext->GetTxtNode(), nCntnt, *pFirst->GetTxtNode(), nCntnt );
+                return ::IsFrameBehind( *pNext->GetTextNode(), nContent, *pFirst->GetTextNode(), nContent );
             }
             return pFirstStt->GetIndex() < pNextStt->GetIndex();
         }
@@ -268,25 +268,25 @@ bool _SetGetExpFld::operator<( const _SetGetExpFld& rFld ) const
         return pFirst->GetIndex() < pNext->GetIndex();
 
     // same Node in the Section, check Position in the Node
-    return GetCntPosFromCntnt() < rFld.GetCntPosFromCntnt();
+    return GetCntPosFromContent() < rField.GetCntPosFromContent();
 }
 
-const SwNode* _SetGetExpFld::GetNodeFromCntnt() const
+const SwNode* _SetGetExpField::GetNodeFromContent() const
 {
     const SwNode* pRet = 0;
-    if( CNTNT.pTxtFld )
-        switch( eSetGetExpFldType )
+    if( CNTNT.pTextField )
+        switch( eSetGetExpFieldType )
         {
         case TEXTFIELD:
-            pRet = &CNTNT.pTxtFld->GetTxtNode();
+            pRet = &CNTNT.pTextField->GetTextNode();
             break;
 
         case TEXTINET:
-            pRet = &CNTNT.pTxtINet->GetTxtNode();
+            pRet = &CNTNT.pTextINet->GetTextNode();
             break;
 
         case SECTIONNODE:
-            pRet = CNTNT.pSection->GetFmt()->GetSectionNode();
+            pRet = CNTNT.pSection->GetFormat()->GetSectionNode();
             break;
 
         case CRSRPOS:
@@ -294,7 +294,7 @@ const SwNode* _SetGetExpFld::GetNodeFromCntnt() const
             break;
 
         case TEXTTOXMARK:
-            pRet = &CNTNT.pTxtTOX->GetTxtNode();
+            pRet = &CNTNT.pTextTOX->GetTextNode();
             break;
 
         case TABLEBOX:
@@ -307,7 +307,7 @@ const SwNode* _SetGetExpFld::GetNodeFromCntnt() const
 
         case FLYFRAME:
             {
-                SwNodeIndex aIdx( *CNTNT.pFlyFmt->GetCntnt().GetCntntIdx() );
+                SwNodeIndex aIdx( *CNTNT.pFlyFormat->GetContent().GetContentIdx() );
                 pRet = aIdx.GetNode().GetNodes().GoNext( &aIdx );
             }
             break;
@@ -315,16 +315,16 @@ const SwNode* _SetGetExpFld::GetNodeFromCntnt() const
     return pRet;
 }
 
-sal_Int32 _SetGetExpFld::GetCntPosFromCntnt() const
+sal_Int32 _SetGetExpField::GetCntPosFromContent() const
 {
     sal_Int32 nRet = 0;
-    if( CNTNT.pTxtFld )
-        switch( eSetGetExpFldType )
+    if( CNTNT.pTextField )
+        switch( eSetGetExpFieldType )
         {
         case TEXTFIELD:
         case TEXTINET:
         case TEXTTOXMARK:
-            nRet = CNTNT.pTxtFld->GetStart();
+            nRet = CNTNT.pTextField->GetStart();
             break;
         case CRSRPOS:
             nRet =  CNTNT.pPos->nContent.GetIndex();
@@ -343,10 +343,10 @@ _HashStr::_HashStr( const OUString& rName, const OUString& rText,
 }
 
 /// Look up the Name, if it is present, return it's String, otherwise return an empty String
-OUString LookString( SwHash** ppTbl, sal_uInt16 nSize, const OUString& rName,
+OUString LookString( SwHash** ppTable, sal_uInt16 nSize, const OUString& rName,
                      sal_uInt16* pPos )
 {
-    SwHash* pFnd = Find( comphelper::string::strip(rName, ' '), ppTbl, nSize, pPos );
+    SwHash* pFnd = Find( comphelper::string::strip(rName, ' '), ppTable, nSize, pPos );
     if( pFnd )
         return static_cast<_HashStr*>(pFnd)->aSetStr;
 
@@ -363,12 +363,12 @@ const SwDBData& SwDoc::GetDBDesc()
 #if HAVE_FEATURE_DBCONNECTIVITY
     if(maDBData.sDataSource.isEmpty())
     {
-        const SwFldTypes::size_type nSize = getIDocumentFieldsAccess().GetFldTypes()->size();
-        for(SwFldTypes::size_type i = 0; i < nSize && maDBData.sDataSource.isEmpty(); ++i)
+        const SwFieldTypes::size_type nSize = getIDocumentFieldsAccess().GetFieldTypes()->size();
+        for(SwFieldTypes::size_type i = 0; i < nSize && maDBData.sDataSource.isEmpty(); ++i)
         {
-            SwFieldType& rFldType = *((*getIDocumentFieldsAccess().GetFldTypes())[i]);
-            sal_uInt16 nWhich = rFldType.Which();
-            if(IsUsed(rFldType))
+            SwFieldType& rFieldType = *((*getIDocumentFieldsAccess().GetFieldTypes())[i]);
+            sal_uInt16 nWhich = rFieldType.Which();
+            if(IsUsed(rFieldType))
             {
                 switch(nWhich)
                 {
@@ -377,15 +377,15 @@ const SwDBData& SwDoc::GetDBDesc()
                     case RES_DBNUMSETFLD:
                     case RES_DBSETNUMBERFLD:
                     {
-                        SwIterator<SwFmtFld,SwFieldType> aIter( rFldType );
-                        for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+                        SwIterator<SwFormatField,SwFieldType> aIter( rFieldType );
+                        for( SwFormatField* pField = aIter.First(); pField; pField = aIter.Next() )
                         {
-                            if(pFld->IsFldInDoc())
+                            if(pField->IsFieldInDoc())
                             {
                                 if(RES_DBFLD == nWhich)
-                                    maDBData = (static_cast < SwDBFieldType * > (pFld->GetField()->GetTyp()))->GetDBData();
+                                    maDBData = (static_cast < SwDBFieldType * > (pField->GetField()->GetTyp()))->GetDBData();
                                 else
-                                    maDBData = (static_cast < SwDBNameInfField* > (pFld->GetField()))->GetRealDBData();
+                                    maDBData = (static_cast < SwDBNameInfField* > (pField->GetField()))->GetRealDBData();
                                 break;
                             }
                         }
@@ -438,7 +438,7 @@ void SwDoc::GetAllUsedDB( std::vector<OUString>& rDBNameList,
         pAllDBNames = &aAllDBNames;
     }
 
-    SwSectionFmts& rArr = GetSections();
+    SwSectionFormats& rArr = GetSections();
     for (auto n = rArr.size(); n; )
     {
         SwSection* pSect = rArr[ --n ]->GetSection();
@@ -458,35 +458,35 @@ void SwDoc::GetAllUsedDB( std::vector<OUString>& rDBNameList,
         if( 0 == (pItem = GetAttrPool().GetItem2( RES_TXTATR_FIELD, n ) ))
             continue;
 
-        const SwFmtFld* pFmtFld = static_cast<const SwFmtFld*>(pItem);
-        const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-        if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+        const SwFormatField* pFormatField = static_cast<const SwFormatField*>(pItem);
+        const SwTextField* pTextField = pFormatField->GetTextField();
+        if( !pTextField || !pTextField->GetTextNode().GetNodes().IsDocNodes() )
             continue;
 
-        const SwField* pFld = pFmtFld->GetField();
-        switch( pFld->GetTyp()->Which() )
+        const SwField* pField = pFormatField->GetField();
+        switch( pField->GetTyp()->Which() )
         {
             case RES_DBFLD:
                 AddUsedDBToList( rDBNameList,
-                                lcl_DBDataToString(static_cast<const SwDBField*>(pFld)->GetDBData() ));
+                                lcl_DBDataToString(static_cast<const SwDBField*>(pField)->GetDBData() ));
                 break;
 
             case RES_DBSETNUMBERFLD:
             case RES_DBNAMEFLD:
                 AddUsedDBToList( rDBNameList,
-                                lcl_DBDataToString(static_cast<const SwDBNameInfField*>(pFld)->GetRealDBData() ));
+                                lcl_DBDataToString(static_cast<const SwDBNameInfField*>(pField)->GetRealDBData() ));
                 break;
 
             case RES_DBNUMSETFLD:
             case RES_DBNEXTSETFLD:
                 AddUsedDBToList( rDBNameList,
-                                lcl_DBDataToString(static_cast<const SwDBNameInfField*>(pFld)->GetRealDBData() ));
+                                lcl_DBDataToString(static_cast<const SwDBNameInfField*>(pField)->GetRealDBData() ));
                 // no break  // JP: is that right like that?
 
             case RES_HIDDENTXTFLD:
             case RES_HIDDENPARAFLD:
                 AddUsedDBToList(rDBNameList, FindUsedDBs( *pAllDBNames,
-                                            pFld->GetPar1(), aUsedDBNames ));
+                                            pField->GetPar1(), aUsedDBNames ));
                 aUsedDBNames.clear();
                 break;
 
@@ -494,7 +494,7 @@ void SwDoc::GetAllUsedDB( std::vector<OUString>& rDBNameList,
             case RES_GETEXPFLD:
             case RES_TABLEFLD:
                 AddUsedDBToList(rDBNameList, FindUsedDBs( *pAllDBNames,
-                                        pFld->GetFormula(), aUsedDBNames ));
+                                        pField->GetFormula(), aUsedDBNames ));
                 aUsedDBNames.clear();
                 break;
         }
@@ -595,7 +595,7 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames,
     aNewDBData.sCommand = rNewName.getToken(1, DB_DELIM);
     aNewDBData.nCommandType = (short)rNewName.getToken(2, DB_DELIM).toInt32();
 
-    SwSectionFmts& rArr = GetSections();
+    SwSectionFormats& rArr = GetSections();
     for (auto n = rArr.size(); n; )
     {
         SwSection* pSect = rArr[ --n ]->GetSection();
@@ -614,30 +614,30 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames,
         if( !pItem )
             continue;
 
-        SwFmtFld* pFmtFld = const_cast<SwFmtFld*>(static_cast<const SwFmtFld*>(pItem));
-        SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-        if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+        SwFormatField* pFormatField = const_cast<SwFormatField*>(static_cast<const SwFormatField*>(pItem));
+        SwTextField* pTextField = pFormatField->GetTextField();
+        if( !pTextField || !pTextField->GetTextNode().GetNodes().IsDocNodes() )
             continue;
 
-        SwField* pFld = pFmtFld->GetField();
+        SwField* pField = pFormatField->GetField();
         bool bExpand = false;
 
-        switch( pFld->GetTyp()->Which() )
+        switch( pField->GetTyp()->Which() )
         {
             case RES_DBFLD:
 #if HAVE_FEATURE_DBCONNECTIVITY
-                if( IsNameInArray( rOldNames, lcl_DBDataToString(static_cast<SwDBField*>(pFld)->GetDBData())))
+                if( IsNameInArray( rOldNames, lcl_DBDataToString(static_cast<SwDBField*>(pField)->GetDBData())))
                 {
-                    SwDBFieldType* pOldTyp = static_cast<SwDBFieldType*>(pFld->GetTyp());
+                    SwDBFieldType* pOldTyp = static_cast<SwDBFieldType*>(pField->GetTyp());
 
-                    SwDBFieldType* pTyp = static_cast<SwDBFieldType*>(getIDocumentFieldsAccess().InsertFldType(
+                    SwDBFieldType* pTyp = static_cast<SwDBFieldType*>(getIDocumentFieldsAccess().InsertFieldType(
                             SwDBFieldType(this, pOldTyp->GetColumnName(), aNewDBData)));
 
-                    pFmtFld->RegisterToFieldType( *pTyp );
-                    pFld->ChgTyp(pTyp);
+                    pFormatField->RegisterToFieldType( *pTyp );
+                    pField->ChgTyp(pTyp);
 
-                    static_cast<SwDBField*>(pFld)->ClearInitialized();
-                    static_cast<SwDBField*>(pFld)->InitContent();
+                    static_cast<SwDBField*>(pField)->ClearInitialized();
+                    static_cast<SwDBField*>(pField)->InitContent();
 
                     bExpand = true;
                 }
@@ -647,9 +647,9 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames,
             case RES_DBSETNUMBERFLD:
             case RES_DBNAMEFLD:
                 if( IsNameInArray( rOldNames,
-                                lcl_DBDataToString(static_cast<SwDBNameInfField*>(pFld)->GetRealDBData())))
+                                lcl_DBDataToString(static_cast<SwDBNameInfField*>(pField)->GetRealDBData())))
                 {
-                    static_cast<SwDBNameInfField*>(pFld)->SetDBData(aNewDBData);
+                    static_cast<SwDBNameInfField*>(pField)->SetDBData(aNewDBData);
                     bExpand = true;
                 }
                 break;
@@ -657,27 +657,27 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames,
             case RES_DBNUMSETFLD:
             case RES_DBNEXTSETFLD:
                 if( IsNameInArray( rOldNames,
-                                lcl_DBDataToString(static_cast<SwDBNameInfField*>(pFld)->GetRealDBData())))
+                                lcl_DBDataToString(static_cast<SwDBNameInfField*>(pField)->GetRealDBData())))
                 {
-                    static_cast<SwDBNameInfField*>(pFld)->SetDBData(aNewDBData);
+                    static_cast<SwDBNameInfField*>(pField)->SetDBData(aNewDBData);
                 }
                 // no break;
             case RES_HIDDENTXTFLD:
             case RES_HIDDENPARAFLD:
-                pFld->SetPar1( ReplaceUsedDBs(rOldNames, rNewName, pFld->GetPar1()) );
+                pField->SetPar1( ReplaceUsedDBs(rOldNames, rNewName, pField->GetPar1()) );
                 bExpand = true;
                 break;
 
             case RES_SETEXPFLD:
             case RES_GETEXPFLD:
             case RES_TABLEFLD:
-                pFld->SetPar2( ReplaceUsedDBs(rOldNames, rNewName, pFld->GetFormula()) );
+                pField->SetPar2( ReplaceUsedDBs(rOldNames, rNewName, pField->GetFormula()) );
                 bExpand = true;
                 break;
         }
 
         if (bExpand)
-            pTxtFld->ExpandTxtFld( true );
+            pTextField->ExpandTextField( true );
     }
     getIDocumentState().SetModified();
 #endif
@@ -747,14 +747,14 @@ bool SwDoc::IsNameInArray( const std::vector<OUString>& rArr, const OUString& rN
 
 void SwDoc::ChangeAuthorityData( const SwAuthEntry* pNewData )
 {
-    const SwFldTypes::size_type nSize = getIDocumentFieldsAccess().GetFldTypes()->size();
+    const SwFieldTypes::size_type nSize = getIDocumentFieldsAccess().GetFieldTypes()->size();
 
-    for( SwFldTypes::size_type i = INIT_FLDTYPES; i < nSize; ++i )
+    for( SwFieldTypes::size_type i = INIT_FLDTYPES; i < nSize; ++i )
     {
-        SwFieldType* pFldType = (*getIDocumentFieldsAccess().GetFldTypes())[i];
-        if( RES_AUTHORITY  == pFldType->Which() )
+        SwFieldType* pFieldType = (*getIDocumentFieldsAccess().GetFieldTypes())[i];
+        if( RES_AUTHORITY  == pFieldType->Which() )
         {
-            SwAuthorityFieldType* pAuthType = static_cast<SwAuthorityFieldType*>(pFldType);
+            SwAuthorityFieldType* pAuthType = static_cast<SwAuthorityFieldType*>(pFieldType);
             pAuthType->ChangeEntryContent(pNewData);
             break;
         }
@@ -762,9 +762,9 @@ void SwDoc::ChangeAuthorityData( const SwAuthEntry* pNewData )
 
 }
 
-void SwDocUpdtFld::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
+void SwDocUpdateField::InsDelFieldInFieldLst( bool bIns, const SwTextField& rField )
 {
-    const sal_uInt16 nWhich = rFld.GetFmtFld().GetField()->GetTyp()->Which();
+    const sal_uInt16 nWhich = rField.GetFormatField().GetField()->GetTyp()->Which();
     switch( nWhich )
     {
     case RES_DBFLD:
@@ -782,54 +782,54 @@ void SwDocUpdtFld::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
     }
 
     SetFieldsDirty( true );
-    if( !pFldSortLst )
+    if( !pFieldSortLst )
     {
         if( !bIns )             // if list is present and deleted
             return;             // don't do a thing
-        pFldSortLst = new _SetGetExpFlds;
+        pFieldSortLst = new _SetGetExpFields;
     }
 
     if( bIns )      // insert anew:
-        GetBodyNode( rFld, nWhich );
+        GetBodyNode( rField, nWhich );
     else
     {
-        // look up via the pTxtFld pointer. It is a sorted list, but it's sorted by node
+        // 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( _SetGetExpFlds::size_type n = 0; n < pFldSortLst->size(); ++n )
-            if( &rFld == (*pFldSortLst)[ n ]->GetPointer() )
+        for( _SetGetExpFields::size_type n = 0; n < pFieldSortLst->size(); ++n )
+            if( &rField == (*pFieldSortLst)[ n ]->GetPointer() )
             {
-                delete (*pFldSortLst)[n];
-                pFldSortLst->erase(n);
+                delete (*pFieldSortLst)[n];
+                pFieldSortLst->erase(n);
                 n--; // one field can occur multiple times
             }
     }
 }
 
-void SwDocUpdtFld::MakeFldList( SwDoc& rDoc, bool bAll, int eGetMode )
+void SwDocUpdateField::MakeFieldList( SwDoc& rDoc, bool bAll, int eGetMode )
 {
-    if( !pFldSortLst || bAll || !( eGetMode & nFldLstGetMode ) ||
+    if( !pFieldSortLst || bAll || !( eGetMode & nFieldLstGetMode ) ||
         rDoc.GetNodes().Count() != nNodes )
-        _MakeFldList( rDoc, eGetMode );
+        _MakeFieldList( rDoc, eGetMode );
 }
 
-void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
+void SwDocUpdateField::_MakeFieldList( SwDoc& rDoc, int eGetMode )
 {
     // new version: walk all fields of the attribute pool
-    delete pFldSortLst;
-    pFldSortLst = new _SetGetExpFlds;
+    delete pFieldSortLst;
+    pFieldSortLst = new _SetGetExpFields;
 
     // consider and unhide sections
     //     with hide condition, only in mode GETFLD_ALL (<eGetMode == GETFLD_ALL>)
     //     notes by OD:
-    //         eGetMode == GETFLD_CALC in call from methods SwDoc::FldsToCalc
-    //         eGetMode == GETFLD_EXPAND in call from method SwDoc::FldsToExpand
-    //         eGetMode == GETFLD_ALL in call from method SwDoc::UpdateExpFlds
+    //         eGetMode == GETFLD_CALC in call from methods SwDoc::FieldsToCalc
+    //         eGetMode == GETFLD_EXPAND in call from method SwDoc::FieldsToExpand
+    //         eGetMode == GETFLD_ALL in call from method SwDoc::UpdateExpFields
     //         I figured out that hidden section only have to be shown,
-    //         if fields have updated (call by SwDoc::UpdateExpFlds) and thus
+    //         if fields have updated (call by SwDoc::UpdateExpFields) and thus
     //         the hide conditions of section have to be updated.
     //         For correct updating the hide condition of a section, its position
     //         have to be known in order to insert the hide condition as a new
-    //         expression field into the sorted field list (<pFldSortLst>).
+    //         expression field into the sorted field list (<pFieldSortLst>).
     if ( eGetMode == GETFLD_ALL )
     // Collect the sections first. Supply sections that are hidden by condition
     // with frames so that the contained fields are sorted properly.
@@ -838,19 +838,19 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
         // from top to bottom
         std::vector<sal_uLong> aTmpArr;
         std::vector<sal_uLong>::size_type nArrStt = 0;
-        SwSectionFmts& rArr = rDoc.GetSections();
+        SwSectionFormats& rArr = rDoc.GetSections();
         SwSectionNode* pSectNd = 0;
-        sal_uLong nSttCntnt = rDoc.GetNodes().GetEndOfExtras().GetIndex();
+        sal_uLong nSttContent = rDoc.GetNodes().GetEndOfExtras().GetIndex();
 
-        for (SwSectionFmts::size_type n = rArr.size(); n; )
+        for (SwSectionFormats::size_type n = rArr.size(); n; )
         {
             SwSection* pSect = rArr[ --n ]->GetSection();
             if( pSect && pSect->IsHidden() && !pSect->GetCondition().isEmpty() &&
-                0 != ( pSectNd = pSect->GetFmt()->GetSectionNode() ))
+                0 != ( pSectNd = pSect->GetFormat()->GetSectionNode() ))
             {
                 sal_uLong nIdx = pSectNd->GetIndex();
                 aTmpArr.push_back( nIdx );
-                if( nIdx < nSttCntnt )
+                if( nIdx < nSttContent )
                     ++nArrStt;
             }
         }
@@ -892,14 +892,14 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
         if( !pItem )
             continue;
 
-        const SwFmtFld* pFmtFld = static_cast<const SwFmtFld*>(pItem);
-        const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-        if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+        const SwFormatField* pFormatField = static_cast<const SwFormatField*>(pItem);
+        const SwTextField* pTextField = pFormatField->GetTextField();
+        if( !pTextField || !pTextField->GetTextNode().GetNodes().IsDocNodes() )
             continue;
 
         OUString sFormula;
-        const SwField* pFld = pFmtFld->GetField();
-        const sal_uInt16 nWhich = pFld->GetTyp()->Which();
+        const SwField* pField = pFormatField->GetField();
+        const sal_uInt16 nWhich = pField->GetTyp()->Which();
         switch( nWhich )
         {
             case RES_DBSETNUMBERFLD:
@@ -915,7 +915,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
 
             case RES_SETEXPFLD:
                 if ( !(eGetMode == GETFLD_EXPAND) ||
-                     (nsSwGetSetExpType::GSE_STRING & pFld->GetSubType()) )
+                     (nsSwGetSetExpType::GSE_STRING & pField->GetSubType()) )
                 {
                     sFormula = sTrue;
                 }
@@ -924,64 +924,64 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
             case RES_HIDDENPARAFLD:
                 if( GETFLD_ALL == eGetMode )
                 {
-                    sFormula = pFld->GetPar1();
+                    sFormula = pField->GetPar1();
                     if (sFormula.isEmpty() || sFormula==sFalse)
-                        const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pFld))->SetHidden( false );
+                        const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pField))->SetHidden( false );
                     else if (sFormula==sTrue)
-                        const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pFld))->SetHidden( true );
+                        const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pField))->SetHidden( true );
                     else
                         break;
 
                     sFormula.clear();
                     // trigger formatting
-                    const_cast<SwFmtFld*>(pFmtFld)->ModifyNotification( 0, 0 );
+                    const_cast<SwFormatField*>(pFormatField)->ModifyNotification( 0, 0 );
                 }
                 break;
 
             case RES_HIDDENTXTFLD:
                 if( GETFLD_ALL == eGetMode )
                 {
-                    sFormula = pFld->GetPar1();
+                    sFormula = pField->GetPar1();
                     if (sFormula.isEmpty() || sFormula==sFalse)
-                        const_cast<SwHiddenTxtField*>(static_cast<const SwHiddenTxtField*>(pFld))->SetValue( true );
+                        const_cast<SwHiddenTextField*>(static_cast<const SwHiddenTextField*>(pField))->SetValue( true );
                     else if (sFormula==sTrue)
-                        const_cast<SwHiddenTxtField*>(static_cast<const SwHiddenTxtField*>(pFld))->SetValue( false );
+                        const_cast<SwHiddenTextField*>(static_cast<const SwHiddenTextField*>(pField))->SetValue( false );
                     else
                         break;
 
                     sFormula.clear();
 
                     // evaluate field
-                    const_cast<SwHiddenTxtField*>(static_cast<const SwHiddenTxtField*>(pFld))->Evaluate(&rDoc);
+                    const_cast<SwHiddenTextField*>(static_cast<const SwHiddenTextField*>(pField))->Evaluate(&rDoc);
                     // trigger formatting
-                    const_cast<SwFmtFld*>(pFmtFld)->ModifyNotification( 0, 0 );
+                    const_cast<SwFormatField*>(pFormatField)->ModifyNotification( 0, 0 );
                 }
                 break;
 
 #if HAVE_FEATURE_DBCONNECTIVITY
             case RES_DBNUMSETFLD:
             {
-                SwDBData aDBData(const_cast<SwDBNumSetField*>(static_cast<const SwDBNumSetField*>(pFld))->GetDBData(&rDoc));
+                SwDBData aDBData(const_cast<SwDBNumSetField*>(static_cast<const SwDBNumSetField*>(pField))->GetDBData(&rDoc));
 
                 if (
                      (bIsDBManager && rDoc.GetDBManager()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) &&
-                     (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && static_cast<const SwDBNumSetField*>(pFld)->IsCondValid()))
+                     (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && static_cast<const SwDBNumSetField*>(pField)->IsCondValid()))
                    )
                 {
-                    sFormula = pFld->GetPar1();
+                    sFormula = pField->GetPar1();
                 }
             }
             break;
             case RES_DBNEXTSETFLD:
             {
-                SwDBData aDBData(const_cast<SwDBNextSetField*>(static_cast<const SwDBNextSetField*>(pFld))->GetDBData(&rDoc));
+                SwDBData aDBData(const_cast<SwDBNextSetField*>(static_cast<const SwDBNextSetField*>(pField))->GetDBData(&rDoc));
 
                 if (
                      (bIsDBManager && rDoc.GetDBManager()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) &&
-                     (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && static_cast<const SwDBNextSetField*>(pFld)->IsCondValid()))
+                     (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && static_cast<const SwDBNextSetField*>(pField)->IsCondValid()))
                    )
                 {
-                    sFormula = pFld->GetPar1();
+                    sFormula = pField->GetPar1();
                 }
             }
             break;
@@ -990,29 +990,29 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
 
         if (!sFormula.isEmpty())
         {
-            GetBodyNode( *pTxtFld, nWhich );
+            GetBodyNode( *pTextField, nWhich );
         }
     }
-    nFldLstGetMode = static_cast<sal_uInt8>( eGetMode );
+    nFieldLstGetMode = static_cast<sal_uInt8>( eGetMode );
     nNodes = rDoc.GetNodes().Count();
 }
 
-void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, sal_uInt16 nFldWhich )
+void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, sal_uInt16 nFieldWhich )
 {
-    const SwTxtNode& rTxtNd = rTFld.GetTxtNode();
-    const SwDoc& rDoc = *rTxtNd.GetDoc();
+    const SwTextNode& rTextNd = rTField.GetTextNode();
+    const SwDoc& rDoc = *rTextNd.GetDoc();
 
     // always the first! (in tab headline, header-/footer)
     Point aPt;
-    const SwCntntFrm* pFrm = rTxtNd.getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+    const SwContentFrm* pFrm = rTextNd.getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
 
-    _SetGetExpFld* pNew = NULL;
+    _SetGetExpField* pNew = NULL;
     bool bIsInBody = false;
 
     if( !pFrm || pFrm->IsInDocBody() )
     {
         // create index to determine the TextNode
-        SwNodeIndex aIdx( rTxtNd );
+        SwNodeIndex aIdx( rTextNd );
         bIsInBody = rDoc.GetNodes().GetEndOfExtras().GetIndex() < aIdx.GetIndex();
 
         // We don't want to update fields in redlines, or those
@@ -1020,40 +1020,40 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, sal_uInt16 nFldWhich )
         // 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( (pFrm != NULL) || bIsInBody )
-            pNew = new _SetGetExpFld( aIdx, &rTFld );
+            pNew = new _SetGetExpField( aIdx, &rTField );
     }
     else
     {
         // create index to determine the TextNode
         SwPosition aPos( rDoc.GetNodes().GetEndOfPostIts() );
-        bool const bResult = GetBodyTxtNode( rDoc, aPos, *pFrm );
+        bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrm );
         OSL_ENSURE(bResult, "where is the Field");
         (void) bResult; // unused in non-debug
-        pNew = new _SetGetExpFld( aPos.nNode, &rTFld, &aPos.nContent );
+        pNew = new _SetGetExpField( aPos.nNode, &rTField, &aPos.nContent );
     }
 
-    // always set the BodyTxtFlag in GetExp or DB fields
-    if( RES_GETEXPFLD == nFldWhich )
+    // always set the BodyTextFlag in GetExp or DB fields
+    if( RES_GETEXPFLD == nFieldWhich )
     {
-        SwGetExpField* pGetFld = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(rTFld.GetFmtFld().GetField()));
-        pGetFld->ChgBodyTxtFlag( bIsInBody );
+        SwGetExpField* pGetField = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(rTField.GetFormatField().GetField()));
+        pGetField->ChgBodyTextFlag( bIsInBody );
     }
 #if HAVE_FEATURE_DBCONNECTIVITY
-    else if( RES_DBFLD == nFldWhich )
+    else if( RES_DBFLD == nFieldWhich )
     {
-        SwDBField* pDBFld = const_cast<SwDBField*>(static_cast<const SwDBField*>(rTFld.GetFmtFld().GetField()));
-        pDBFld->ChgBodyTxtFlag( bIsInBody );
+        SwDBField* pDBField = const_cast<SwDBField*>(static_cast<const SwDBField*>(rTField.GetFormatField().GetField()));
+        pDBField->ChgBodyTextFlag( bIsInBody );
     }
 #endif
     if( pNew != NULL )
-        if( !pFldSortLst->insert( pNew ).second )
+        if( !pFieldSortLst->insert( pNew ).second )
             delete pNew;
 }
 
-void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
+void SwDocUpdateField::GetBodyNode( const SwSectionNode& rSectNd )
 {
     const SwDoc& rDoc = *rSectNd.GetDoc();
-    _SetGetExpFld* pNew = 0;
+    _SetGetExpField* pNew = 0;
 
     if( rSectNd.GetIndex() < rDoc.GetNodes().GetEndOfExtras().GetIndex() )
     {
@@ -1062,93 +1062,93 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
             // we need to get the anchor first
             // create index to determine the TextNode
             SwPosition aPos( rSectNd );
-            SwCntntNode* pCNd = rDoc.GetNodes().GoNext( &aPos.nNode ); // to the next ContentNode
+            SwContentNode* pCNd = rDoc.GetNodes().GoNext( &aPos.nNode ); // to the next ContentNode
 
-            if( !pCNd || !pCNd->IsTxtNode() )
+            if( !pCNd || !pCNd->IsTextNode() )
                 break;
 
             // always the first! (in tab headline, header-/footer)
             Point aPt;
-            const SwCntntFrm* pFrm = pCNd->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+            const SwContentFrm* pFrm = pCNd->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
             if( !pFrm )
                 break;
 
-            bool const bResult = GetBodyTxtNode( rDoc, aPos, *pFrm );
+            bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrm );
             OSL_ENSURE(bResult, "where is the Field");
             (void) bResult; // unused in non-debug
-            pNew = new _SetGetExpFld( rSectNd, &aPos );
+            pNew = new _SetGetExpField( rSectNd, &aPos );
 
         } while( false );
     }
 
     if( !pNew )
-        pNew = new _SetGetExpFld( rSectNd );
+        pNew = new _SetGetExpField( rSectNd );
 
-    if( !pFldSortLst->insert( pNew ).second )
+    if( !pFieldSortLst->insert( pNew ).second )
         delete pNew;
 }
 
-void SwDocUpdtFld::InsertFldType( const SwFieldType& rType )
+void SwDocUpdateField::InsertFieldType( const SwFieldType& rType )
 {
-    OUString sFldName;
+    OUString sFieldName;
     switch( rType.Which() )
     {
     case RES_USERFLD :
-        sFldName = static_cast<const SwUserFieldType&>(rType).GetName();
+        sFieldName = static_cast<const SwUserFieldType&>(rType).GetName();
         break;
     case RES_SETEXPFLD:
-        sFldName = static_cast<const SwSetExpFieldType&>(rType).GetName();
+        sFieldName = static_cast<const SwSetExpFieldType&>(rType).GetName();
         break;
     default:
         OSL_ENSURE( false, "kein gueltiger FeldTyp" );
     }
 
-    if( !sFldName.isEmpty() )
+    if( !sFieldName.isEmpty() )
     {
         SetFieldsDirty( true );
         // look up and remove from the hash table
-        sFldName = GetAppCharClass().lowercase( sFldName );
+        sFieldName = GetAppCharClass().lowercase( sFieldName );
         sal_uInt16 n;
 
-        SwHash* pFnd = Find( sFldName, GetFldTypeTable(), TBLSZ, &n );
+        SwHash* pFnd = Find( sFieldName, GetFieldTypeTable(), TBLSZ, &n );
 
         if( !pFnd )
         {
-            SwCalcFldType* pNew = new SwCalcFldType( sFldName, &rType );
-            pNew->pNext = aFldTypeTable[ n ];
-            aFldTypeTable[ n ] = pNew;
+            SwCalcFieldType* pNew = new SwCalcFieldType( sFieldName, &rType );
+            pNew->pNext = aFieldTypeTable[ n ];
+            aFieldTypeTable[ n ] = pNew;
         }
     }
 }
 
-void SwDocUpdtFld::RemoveFldType( const SwFieldType& rType )
+void SwDocUpdateField::RemoveFieldType( const SwFieldType& rType )
 {
-    OUString sFldName;
+    OUString sFieldName;
     switch( rType.Which() )
     {
     case RES_USERFLD :
-        sFldName = static_cast<const SwUserFieldType&>(rType).GetName();
+        sFieldName = static_cast<const SwUserFieldType&>(rType).GetName();
         break;
     case RES_SETEXPFLD:
-        sFldName = static_cast<const SwSetExpFieldType&>(rType).GetName();
+        sFieldName = static_cast<const SwSetExpFieldType&>(rType).GetName();
         break;
     }
 
-    if( !sFldName.isEmpty() )
+    if( !sFieldName.isEmpty() )
     {
         SetFieldsDirty( true );
         // look up and remove from the hash table
-        sFldName = GetAppCharClass().lowercase( sFldName );
+        sFieldName = GetAppCharClass().lowercase( sFieldName );
         sal_uInt16 n;
 
-        SwHash* pFnd = Find( sFldName, GetFldTypeTable(), TBLSZ, &n );
+        SwHash* pFnd = Find( sFieldName, GetFieldTypeTable(), TBLSZ, &n );
         if( pFnd )
         {
-            if( aFldTypeTable[ n ] == pFnd )
-                aFldTypeTable[ n ] = static_cast<SwCalcFldType*>(pFnd->pNext);
+            if( aFieldTypeTable[ n ] == pFnd )
+                aFieldTypeTable[ n ] = static_cast<SwCalcFieldType*>(pFnd->pNext);
             else
             {
-                SwHash* pPrev = aFldTypeTable[ n ];
+                SwHash* pPrev = aFieldTypeTable[ n ];
                 while( pPrev->pNext != pFnd )
                     pPrev = pPrev->pNext;
                 pPrev->pNext = pFnd->pNext;
@@ -1159,24 +1159,24 @@ void SwDocUpdtFld::RemoveFldType( const SwFieldType& rType )
     }
 }
 
-SwDocUpdtFld::SwDocUpdtFld(SwDoc* pDoc)
-    : pFldSortLst(0)
+SwDocUpdateField::SwDocUpdateField(SwDoc* pDoc)
+    : pFieldSortLst(0)
     , nNodes(0)
-    , nFldLstGetMode(0)
+    , nFieldLstGetMode(0)
     , pDocument(pDoc)
-    , bInUpdateFlds(false)
-    , bFldsDirty(false)
+    , bInUpdateFields(false)
+    , bFieldsDirty(false)
 
 {
-    memset( aFldTypeTable, 0, sizeof( aFldTypeTable ) );
+    memset( aFieldTypeTable, 0, sizeof( aFieldTypeTable ) );
 }
 
-SwDocUpdtFld::~SwDocUpdtFld()
+SwDocUpdateField::~SwDocUpdateField()
 {
-    delete pFldSortLst;
+    delete pFieldSortLst;
 
     for( int n = 0; n < TBLSZ; ++n )
-        delete aFldTypeTable[n];
+        delete aFieldTypeTable[n];
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 53edd19eed14..e3531caceb14 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -74,24 +74,24 @@ using namespace ::com::sun::star;
 
 size_t SwDoc::GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes ) const
 {
-    const SwFrmFmts& rFmts = *GetSpzFrmFmts();
-    const size_t nSize = rFmts.size();
+    const SwFrameFormats& rFormats = *GetSpzFrameFormats();
+    const size_t nSize = rFormats.size();
     size_t nCount = 0;
     const SwNodeIndex* pIdx;
 
-    std::set<const SwFrmFmt*> aTextBoxes;
+    std::set<const SwFrameFormat*> aTextBoxes;
     if (bIgnoreTextBoxes)
         aTextBoxes = SwTextBoxHelper::findTextBoxes(this);
 
     for ( size_t i = 0; i < nSize; ++i)
     {
-        const SwFrmFmt* pFlyFmt = rFmts[ i ];
+        const SwFrameFormat* pFlyFormat = rFormats[ i ];
 
-        if (bIgnoreTextBoxes && aTextBoxes.find(pFlyFmt) != aTextBoxes.end())
+        if (bIgnoreTextBoxes && aTextBoxes.find(pFlyFormat) != aTextBoxes.end())
             continue;
 
-        if( RES_FLYFRMFMT == pFlyFmt->Which()
-            && 0 != ( pIdx = pFlyFmt->GetCntnt().GetCntntIdx() )
+        if( RES_FLYFRMFMT == pFlyFormat->Which()
+            && 0 != ( pIdx = pFlyFormat->GetContent().GetContentIdx() )
             && pIdx->GetNodes().IsDocNodes()
             )
         {
@@ -100,7 +100,7 @@ size_t SwDoc::GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes ) const
             switch( eType )
             {
             case FLYCNTTYPE_FRM:
-                if(!pNd->IsNoTxtNode())
+                if(!pNd->IsNoTextNode())
                     nCount++;
                 break;
 
@@ -123,27 +123,27 @@ size_t SwDoc::GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes ) const
 }
 
 /// @attention If you change this, also update SwXFrameEnumeration in unocoll.
-SwFrmFmt* SwDoc::GetFlyNum( size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes )
+SwFrameFormat* SwDoc::GetFlyNum( size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes )
 {
-    SwFrmFmts& rFmts = *GetSpzFrmFmts();
-    SwFrmFmt* pRetFmt = 0;
-    const size_t nSize = rFmts.size();
+    SwFrameFormats& rFormats = *GetSpzFrameFormats();
+    SwFrameFormat* pRetFormat = 0;
+    const size_t nSize = rFormats.size();
     const SwNodeIndex* pIdx;
     size_t nCount = 0;
 
-    std::set<const SwFrmFmt*> aTextBoxes;
+    std::set<const SwFrameFormat*> aTextBoxes;
     if (bIgnoreTextBoxes)
         aTextBoxes = SwTextBoxHelper::findTextBoxes(this);
 
-    for( size_t i = 0; !pRetFmt && i < nSize; ++i )
+    for( size_t i = 0; !pRetFormat && i < nSize; ++i )
     {
-        SwFrmFmt* pFlyFmt = rFmts[ i ];
+        SwFrameFormat* pFlyFormat = rFormats[ i ];
 
-        if (bIgnoreTextBoxes && aTextBoxes.find(pFlyFmt) != aTextBoxes.end())
+        if (bIgnoreTextBoxes && aTextBoxes.find(pFlyFormat) != aTextBoxes.end())
             continue;
 
-        if( RES_FLYFRMFMT == pFlyFmt->Which()
-            && 0 != ( pIdx = pFlyFmt->GetCntnt().GetCntntIdx() )
+        if( RES_FLYFRMFMT == pFlyFormat->Which()
+            && 0 != ( pIdx = pFlyFormat->GetContent().GetContentIdx() )
             && pIdx->GetNodes().IsDocNodes()
             )
         {
@@ -151,37 +151,37 @@ SwFrmFmt* SwDoc::GetFlyNum( size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes
             switch( eType )
             {
             case FLYCNTTYPE_FRM:
-                if( !pNd->IsNoTxtNode() && nIdx == nCount++)
-                    pRetFmt = pFlyFmt;
+                if( !pNd->IsNoTextNode() && nIdx == nCount++)
+                    pRetFormat = pFlyFormat;
                 break;
             case FLYCNTTYPE_GRF:
                 if(pNd->IsGrfNode() && nIdx == nCount++ )
-                    pRetFmt = pFlyFmt;
+                    pRetFormat = pFlyFormat;
                 break;
             case FLYCNTTYPE_OLE:
                 if(pNd->IsOLENode() && nIdx == nCount++)
-                    pRetFmt = pFlyFmt;
+                    pRetFormat = pFlyFormat;
                 break;
             default:
                 if(nIdx == nCount++)
-                    pRetFmt = pFlyFmt;
+                    pRetFormat = pFlyFormat;
             }
         }
     }
-    return pRetFmt;
+    return pRetFormat;
 }
 
-static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
-                            const SwFrmFmt* pFlyFmt )
+static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFormatAnchor& rAnch,
+                            const SwFrameFormat* pFlyFormat )
 {
     Point aRet;
     if( rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() )
         switch( rAnch.GetAnchorId() )
         {
         case FLY_AS_CHAR:
-            if( pFlyFmt && rAnch.GetCntntAnchor() )
+            if( pFlyFormat && rAnch.GetContentAnchor() )
             {
-                const SwFrm* pOld = static_cast<const SwFlyFrmFmt*>(pFlyFmt)->GetFrm( &aRet, false );
+                const SwFrm* pOld = static_cast<const SwFlyFrameFormat*>(pFlyFormat)->GetFrm( &aRet, false );
                 if( pOld )
                     aRet = pOld->Frm().Pos();
             }
@@ -189,10 +189,10 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
 
         case FLY_AT_PARA:
         case FLY_AT_CHAR: // LAYER_IMPL
-            if( rAnch.GetCntntAnchor() )
+            if( rAnch.GetContentAnchor() )
             {
-                const SwPosition *pPos = rAnch.GetCntntAnchor();
-                const SwCntntNode* pNd = pPos->nNode.GetNode().GetCntntNode();
+                const SwPosition *pPos = rAnch.GetContentAnchor();
+                const SwContentNode* pNd = pPos->nNode.GetNode().GetContentNode();
                 const SwFrm* pOld = pNd ? pNd->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aRet, 0, false ) : 0;
                 if( pOld )
                     aRet = pOld->Frm().Pos();
@@ -200,11 +200,11 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
             break;
 
         case FLY_AT_FLY: // LAYER_IMPL
-            if( rAnch.GetCntntAnchor() )
+            if( rAnch.GetContentAnchor() )
             {
-                const SwFlyFrmFmt* pFmt = static_cast<SwFlyFrmFmt*>(rAnch.GetCntntAnchor()->
-                                                nNode.GetNode().GetFlyFmt());
-                const SwFrm* pOld = pFmt ? pFmt->GetFrm( &aRet, false ) : 0;
+                const SwFlyFrameFormat* pFormat = static_cast<SwFlyFrameFormat*>(rAnch.GetContentAnchor()->
+                                                nNode.GetNode().GetFlyFormat());
+                const SwFrm* pOld = pFormat ? pFormat->GetFrm( &aRet, false ) : 0;
                 if( pOld )
                     aRet = pOld->Frm().Pos();
             }
@@ -233,19 +233,19 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
 #define IGNOREANCHOR 1
 #define DONTMAKEFRMS 2
 
-sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms )
+sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrameFormat& rFormat, SfxItemSet& rSet, bool bNewFrms )
 {
     // Changing anchors is almost always allowed.
     // Exception: Paragraph and character bound frames must not become
     // page bound, if they are located in the header or footer.
-    const SwFmtAnchor &rOldAnch = rFmt.GetAnchor();
+    const SwFormatAnchor &rOldAnch = rFormat.GetAnchor();
     const RndStdIds nOld = rOldAnch.GetAnchorId();
 
-    SwFmtAnchor aNewAnch( static_cast<const SwFmtAnchor&>(rSet.Get( RES_ANCHOR )) );
+    SwFormatAnchor aNewAnch( static_cast<const SwFormatAnchor&>(rSet.Get( RES_ANCHOR )) );
     RndStdIds nNew = aNewAnch.GetAnchorId();
 
     // Is the new anchor valid?
-    if( !aNewAnch.GetCntntAnchor() && (FLY_AT_FLY == nNew ||
+    if( !aNewAnch.GetContentAnchor() && (FLY_AT_FLY == nNew ||
         (FLY_AT_PARA == nNew) || (FLY_AS_CHAR == nNew) ||
         (FLY_AT_CHAR == nNew) ))
     {
@@ -255,40 +255,40 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
     if( nOld == nNew )
         return DONTMAKEFRMS;
 
-    Point aOldAnchorPos( ::lcl_FindAnchorLayPos( *this, rOldAnch, &rFmt ));
+    Point aOldAnchorPos( ::lcl_FindAnchorLayPos( *this, rOldAnch, &rFormat ));
     Point aNewAnchorPos( ::lcl_FindAnchorLayPos( *this, aNewAnch, 0 ));
 
     // Destroy the old Frames.
     // The Views are hidden implicitly, so hiding them another time would be
     // kind of a show!
-    rFmt.DelFrms();
+    rFormat.DelFrms();
 
     if ( FLY_AS_CHAR == nOld )
     {
-        // We need to handle InCntnts in a special way:
-        // The TxtAttribut needs to be destroyed which, unfortunately, also
+        // We need to handle InContents in a special way:
+        // The TextAttribut needs to be destroyed which, unfortunately, also
         // destroys the format. To avoid that, we disconnect the format from
         // the attribute.
-        const SwPosition *pPos = rOldAnch.GetCntntAnchor();
-        SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-        OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+        const SwPosition *pPos = rOldAnch.GetContentAnchor();
+        SwTextNode *pTextNode = pPos->nNode.GetNode().GetTextNode();
+        OSL_ENSURE( pTextNode->HasHints(), "Missing FlyInCnt-Hint." );
         const sal_Int32 nIdx = pPos->nContent.GetIndex();
-        SwTxtAttr * const  pHnt =
-            pTxtNode->GetTxtAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
-        OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+        SwTextAttr * const  pHint =
+            pTextNode->GetTextAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
+        OSL_ENSURE( pHint && pHint->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
-        OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == &rFmt,
-                    "Wrong TxtFlyCnt-Hint." );
-        if (pHnt)
-            const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
+        OSL_ENSURE( pHint && pHint->GetFlyCnt().GetFrameFormat() == &rFormat,
+                    "Wrong TextFlyCnt-Hint." );
+        if (pHint)
+            const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt()).SetFlyFormat();
 
         // They are disconnected. We now have to destroy the attribute.
-        pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
+        pTextNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
     }
 
     // We can finally set the attribute. It needs to be the first one!
     // Undo depends on it!
-    rFmt.SetFmtAttr( aNewAnch );
+    rFormat.SetFormatAttr( aNewAnch );
 
     // Correct the position
     const SfxPoolItem* pItem;
@@ -298,17 +298,17 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
             // If no position attributes are received, we have to make sure
             // that no forbidden automatic alignment is left.
         {
-            const SwPosition *pPos = aNewAnch.GetCntntAnchor();
-            SwTxtNode *pNd = pPos->nNode.GetNode().GetTxtNode();
-            OSL_ENSURE( pNd, "Crsr does not point to TxtNode." );
+            const SwPosition *pPos = aNewAnch.GetContentAnchor();
+            SwTextNode *pNd = pPos->nNode.GetNode().GetTextNode();
+            OSL_ENSURE( pNd, "Crsr does not point to TextNode." );
 
-            SwFmtFlyCnt aFmt( static_cast<SwFlyFrmFmt*>(&rFmt) );
-            pNd->InsertItem( aFmt, pPos->nContent.GetIndex(), 0 );
+            SwFormatFlyCnt aFormat( static_cast<SwFlyFrameFormat*>(&rFormat) );
+            pNd->InsertItem( aFormat, pPos->nContent.GetIndex(), 0 );
         }
 
         if( SfxItemState::SET != rSet.GetItemState( RES_VERT_ORIENT, false, &pItem ))
         {
-            SwFmtVertOrient aOldV( rFmt.GetVertOrient() );
+            SwFormatVertOrient aOldV( rFormat.GetVertOrient() );
             bool bSet = true;
             switch( aOldV.GetVertOrient() )
             {
@@ -336,17 +336,17 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
             if( SfxItemState::SET != rSet.GetItemState( RES_HORI_ORIENT, false, &pItem ))
                 pItem = 0;
 
-            SwFmtHoriOrient aOldH( rFmt.GetHoriOrient() );
+            SwFormatHoriOrient aOldH( rFormat.GetHoriOrient() );
 
             if( text::HoriOrientation::NONE == aOldH.GetHoriOrient() && ( !pItem ||
-                aOldH.GetPos() == static_cast<const SwFmtHoriOrient*>(pItem)->GetPos() ))
+                aOldH.GetPos() == static_cast<const SwFormatHoriOrient*>(pItem)->GetPos() ))
             {
                 SwTwips nPos = (FLY_AS_CHAR == nOld) ? 0 : aOldH.GetPos();
                 nPos += aOldAnchorPos.getX() - aNewAnchorPos.getX();
 
                 if( pItem )
                 {
-                    SwFmtHoriOrient* pH = const_cast<SwFmtHoriOrient*>(static_cast<const SwFmtHoriOrient*>(pItem));
+                    SwFormatHoriOrient* pH = const_cast<SwFormatHoriOrient*>(static_cast<const SwFormatHoriOrient*>(pItem));
                     aOldH.SetHoriOrient( pH->GetHoriOrient() );
                     aOldH.SetRelationOrient( pH->GetRelationOrient() );
                 }
@@ -356,18 +356,18 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
 
             if( SfxItemState::SET != rSet.GetItemState( RES_VERT_ORIENT, false, &pItem ))
                 pItem = 0;
-            SwFmtVertOrient aOldV( rFmt.GetVertOrient() );
+            SwFormatVertOrient aOldV( rFormat.GetVertOrient() );
 
             // #i28922# - correction: compare <aOldV.GetVertOrient() with
             // <text::VertOrientation::NONE>
             if( text::VertOrientation::NONE == aOldV.GetVertOrient() && (!pItem ||
-                aOldV.GetPos() == static_cast<const SwFmtVertOrient*>(pItem)->GetPos() ) )
+                aOldV.GetPos() == static_cast<const SwFormatVertOrient*>(pItem)->GetPos() ) )
             {
                 SwTwips nPos = (FLY_AS_CHAR == nOld) ? 0 : aOldV.GetPos();
                 nPos += aOldAnchorPos.getY() - aNewAnchorPos.getY();
                 if( pItem )
                 {
-                    SwFmtVertOrient* pV = const_cast<SwFmtVertOrient*>(static_cast<const SwFmtVertOrient*>(pItem));
+                    SwFormatVertOrient* pV = const_cast<SwFormatVertOrient*>(static_cast<const SwFormatVertOrient*>(pItem));
                     aOldV.SetVertOrient( pV->GetVertOrient() );
                     aOldV.SetRelationOrient( pV->GetRelationOrient() );
                 }
@@ -381,18 +381,18 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
     }
 
     if( bNewFrms )
-        rFmt.MakeFrms();
+        rFormat.MakeFrms();
 
     return MAKEFRMS;
 }
 
 static bool
 lcl_SetFlyFrmAttr(SwDoc & rDoc,
-        sal_Int8 (SwDoc::*pSetFlyFrmAnchor)(SwFrmFmt &, SfxItemSet &, bool),
-        SwFrmFmt & rFlyFmt, SfxItemSet & rSet)
+        sal_Int8 (SwDoc::*pSetFlyFrmAnchor)(SwFrameFormat &, SfxItemSet &, bool),
+        SwFrameFormat & rFlyFormat, SfxItemSet & rSet)
 {
-    // #i32968# Inserting columns in the frame causes MakeFrmFmt to put two
-    // objects of type SwUndoFrmFmt on the undo stack. We don't want them.
+    // #i32968# Inserting columns in the frame causes MakeFrameFormat to put two
+    // objects of type SwUndoFrameFormat on the undo stack. We don't want them.
     ::sw::UndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
 
     // Is the anchor attribute included?
@@ -400,12 +400,12 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
     // if the Fly needs to be created anew, because we e.g change the FlyType.
     sal_Int8 const nMakeFrms =
         (SfxItemState::SET == rSet.GetItemState( RES_ANCHOR, false ))
-             ?  (rDoc.*pSetFlyFrmAnchor)( rFlyFmt, rSet, false )
+             ?  (rDoc.*pSetFlyFrmAnchor)( rFlyFormat, rSet, false )
              :  DONTMAKEFRMS;
 
     const SfxPoolItem* pItem;
     SfxItemIter aIter( rSet );
-    SfxItemSet aTmpSet( rDoc.GetAttrPool(), aFrmFmtSetRange );
+    SfxItemSet aTmpSet( rDoc.GetAttrPool(), aFrameFormatSetRange );
     sal_uInt16 nWhich = aIter.GetCurItem()->Which();
     do {
         switch( nWhich )
@@ -426,7 +426,7 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
 
         default:
             if( !IsInvalidItem( aIter.GetCurItem() ) && ( SfxItemState::SET !=
-                rFlyFmt.GetAttrSet().GetItemState( nWhich, true, &pItem ) ||
+                rFlyFormat.GetAttrSet().GetItemState( nWhich, true, &pItem ) ||
                 *pItem != *aIter.GetCurItem() ))
                 aTmpSet.Put( *aIter.GetCurItem() );
             break;
@@ -438,10 +438,10 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
     } while( 0 != ( nWhich = aIter.NextItem()->Which() ) );
 
     if( aTmpSet.Count() )
-        rFlyFmt.SetFmtAttr( aTmpSet );
+        rFlyFormat.SetFormatAttr( aTmpSet );
 
     if( MAKEFRMS == nMakeFrms )
-        rFlyFmt.MakeFrms();
+        rFlyFormat.MakeFrms();
 
     return aTmpSet.Count() || MAKEFRMS == nMakeFrms;
 }
@@ -504,20 +504,20 @@ void SwDoc::CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet)
     }
 }
 
-bool SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
+bool SwDoc::SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet )
 {
     if( !rSet.Count() )
         return false;
 
-    boost::scoped_ptr<SwUndoFmtAttrHelper> pSaveUndo;
+    boost::scoped_ptr<SwUndoFormatAttrHelper> pSaveUndo;
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         GetIDocumentUndoRedo().ClearRedo(); // AppendUndo far below, so leave it
-        pSaveUndo.reset( new SwUndoFmtAttrHelper( rFlyFmt ) );
+        pSaveUndo.reset( new SwUndoFormatAttrHelper( rFlyFormat ) );
     }
 
-    bool const bRet = lcl_SetFlyFrmAttr(*this, &SwDoc::SetFlyFrmAnchor, rFlyFmt, rSet);
+    bool const bRet = lcl_SetFlyFrmAttr(*this, &SwDoc::SetFlyFrmAnchor, rFlyFormat, rSet);
 
     if ( pSaveUndo.get() )
     {
@@ -529,16 +529,16 @@ bool SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
 
     getIDocumentState().SetModified();
 
-    SwTextBoxHelper::syncFlyFrmAttr(rFlyFmt, rSet);
+    SwTextBoxHelper::syncFlyFrmAttr(rFlyFormat, rSet);
 
     return bRet;
 }
 
 // #i73249#
-void SwDoc::SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
+void SwDoc::SetFlyFrmTitle( SwFlyFrameFormat& rFlyFrameFormat,
                             const OUString& sNewTitle )
 {
-    if ( rFlyFrmFmt.GetObjTitle() == sNewTitle )
+    if ( rFlyFrameFormat.GetObjTitle() == sNewTitle )
     {
         return;
     }
@@ -547,21 +547,21 @@ void SwDoc::SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        GetIDocumentUndoRedo().AppendUndo( new SwUndoFlyStrAttr( rFlyFrmFmt,
+        GetIDocumentUndoRedo().AppendUndo( new SwUndoFlyStrAttr( rFlyFrameFormat,
                                           UNDO_FLYFRMFMT_TITLE,
-                                          rFlyFrmFmt.GetObjTitle(),
+                                          rFlyFrameFormat.GetObjTitle(),
                                           sNewTitle ) );
     }
 
-    rFlyFrmFmt.SetObjTitle( sNewTitle, true );
+    rFlyFrameFormat.SetObjTitle( sNewTitle, true );
 
     getIDocumentState().SetModified();
 }
 
-void SwDoc::SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
+void SwDoc::SetFlyFrmDescription( SwFlyFrameFormat& rFlyFrameFormat,
                                   const OUString& sNewDescription )
 {
-    if ( rFlyFrmFmt.GetObjDescription() == sNewDescription )
+    if ( rFlyFrameFormat.GetObjDescription() == sNewDescription )
     {
         return;
     }
@@ -570,72 +570,72 @@ void SwDoc::SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        GetIDocumentUndoRedo().AppendUndo( new SwUndoFlyStrAttr( rFlyFrmFmt,
+        GetIDocumentUndoRedo().AppendUndo( new SwUndoFlyStrAttr( rFlyFrameFormat,
                                           UNDO_FLYFRMFMT_DESCRIPTION,
-                                          rFlyFrmFmt.GetObjDescription(),
+                                          rFlyFrameFormat.GetObjDescription(),
                                           sNewDescription ) );
     }
 
-    rFlyFrmFmt.SetObjDescription( sNewDescription, true );
+    rFlyFrameFormat.SetObjDescription( sNewDescription, true );
 
     getIDocumentState().SetModified();
 }
 
-bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
+bool SwDoc::SetFrameFormatToFly( SwFrameFormat& rFormat, SwFrameFormat& rNewFormat,
                             SfxItemSet* pSet, bool bKeepOrient )
 {
     bool bChgAnchor = false, bFrmSz = false;
 
-    const SwFmtFrmSize aFrmSz( rFmt.GetFrmSize() );
-    const SwFmtVertOrient aVert( rFmt.GetVertOrient() );
-    const SwFmtHoriOrient aHori( rFmt.GetHoriOrient() );
+    const SwFormatFrmSize aFrmSz( rFormat.GetFrmSize() );
+    const SwFormatVertOrient aVert( rFormat.GetVertOrient() );
+    const SwFormatHoriOrient aHori( rFormat.GetHoriOrient() );
 
-    SwUndoSetFlyFmt* pUndo = 0;
+    SwUndoSetFlyFormat* pUndo = 0;
     bool const bUndo = GetIDocumentUndoRedo().DoesUndo();
     if (bUndo)
     {
-        pUndo = new SwUndoSetFlyFmt( rFmt, rNewFmt );
+        pUndo = new SwUndoSetFlyFormat( rFormat, rNewFormat );
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
-    // #i32968# Inserting columns in the section causes MakeFrmFmt to put
-    // 2 objects of type SwUndoFrmFmt on the undo stack. We don't want them.
+    // #i32968# Inserting columns in the section causes MakeFrameFormat to put
+    // 2 objects of type SwUndoFrameFormat on the undo stack. We don't want them.
     ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
     // Set the column first, or we'll have trouble with
     //Set/Reset/Synch. and so on
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET != rNewFmt.GetAttrSet().GetItemState( RES_COL ))
-        rFmt.ResetFmtAttr( RES_COL );
+    if( SfxItemState::SET != rNewFormat.GetAttrSet().GetItemState( RES_COL ))
+        rFormat.ResetFormatAttr( RES_COL );
 
-    if( rFmt.DerivedFrom() != &rNewFmt )
+    if( rFormat.DerivedFrom() != &rNewFormat )
     {
-        rFmt.SetDerivedFrom( &rNewFmt );
+        rFormat.SetDerivedFrom( &rNewFormat );
 
         // 1. If not automatic = ignore; else = dispose
         // 2. Dispose of it!
-        if( SfxItemState::SET == rNewFmt.GetAttrSet().GetItemState( RES_FRM_SIZE, false ))
+        if( SfxItemState::SET == rNewFormat.GetAttrSet().GetItemState( RES_FRM_SIZE, false ))
         {
-            rFmt.ResetFmtAttr( RES_FRM_SIZE );
+            rFormat.ResetFormatAttr( RES_FRM_SIZE );
             bFrmSz = true;
         }
 
         const SfxItemSet* pAsk = pSet;
-        if( !pAsk ) pAsk = &rNewFmt.GetAttrSet();
+        if( !pAsk ) pAsk = &rNewFormat.GetAttrSet();
         if( SfxItemState::SET == pAsk->GetItemState( RES_ANCHOR, false, &pItem )
-            && static_cast<const SwFmtAnchor*>(pItem)->GetAnchorId() !=
-                rFmt.GetAnchor().GetAnchorId() )
+            && static_cast<const SwFormatAnchor*>(pItem)->GetAnchorId() !=
+                rFormat.GetAnchor().GetAnchorId() )
         {
             if( pSet )
-                bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFmt, *pSet, false );
+                bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFormat, *pSet, false );
             else
             {
-                // Needs to have the FlyFmt range, because we set attributes in it,
+                // Needs to have the FlyFormat range, because we set attributes in it,
                 // in SetFlyFrmAnchor.
-                SfxItemSet aFlySet( *rNewFmt.GetAttrSet().GetPool(),
-                                    rNewFmt.GetAttrSet().GetRanges() );
+                SfxItemSet aFlySet( *rNewFormat.GetAttrSet().GetPool(),
+                                    rNewFormat.GetAttrSet().GetRanges() );
                 aFlySet.Put( *pItem );
-                bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFmt, aFlySet, false);
+                bChgAnchor = MAKEFRMS == SetFlyFrmAnchor( rFormat, aFlySet, false);
             }
         }
     }
@@ -647,33 +647,33 @@ bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
     // text::HoriOrientation::NONE and text::VertOrientation::NONE are allowed now
     if (!bKeepOrient)
     {
-        rFmt.ResetFmtAttr(RES_VERT_ORIENT);
-        rFmt.ResetFmtAttr(RES_HORI_ORIENT);
+        rFormat.ResetFormatAttr(RES_VERT_ORIENT);
+        rFormat.ResetFormatAttr(RES_HORI_ORIENT);
     }
 
-    rFmt.ResetFmtAttr( RES_PRINT, RES_SURROUND );
-    rFmt.ResetFmtAttr( RES_LR_SPACE, RES_UL_SPACE );
-    rFmt.ResetFmtAttr( RES_BACKGROUND, RES_COL );
-    rFmt.ResetFmtAttr( RES_URL, RES_EDIT_IN_READONLY );
+    rFormat.ResetFormatAttr( RES_PRINT, RES_SURROUND );
+    rFormat.ResetFormatAttr( RES_LR_SPACE, RES_UL_SPACE );
+    rFormat.ResetFormatAttr( RES_BACKGROUND, RES_COL );
+    rFormat.ResetFormatAttr( RES_URL, RES_EDIT_IN_READONLY );
 
     if( !bFrmSz )
-        rFmt.SetFmtAttr( aFrmSz );
+        rFormat.SetFormatAttr( aFrmSz );
 
     if( bChgAnchor )
-        rFmt.MakeFrms();
+        rFormat.MakeFrms();
 
     if( pUndo )
-        pUndo->DeRegisterFromFormat( rFmt );
+        pUndo->DeRegisterFromFormat( rFormat );
 
     getIDocumentState().SetModified();
 
     return bChgAnchor;
 }
 
-void SwDoc::GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName,
+void SwDoc::GetGrfNms( const SwFlyFrameFormat& rFormat, OUString* pGrfName,
                        OUString* pFltName )
 {
-    SwNodeIndex aIdx( *rFmt.GetCntnt().GetCntntIdx(), 1 );
+    SwNodeIndex aIdx( *rFormat.GetContent().GetContentIdx(), 1 );
     const SwGrfNode* pGrfNd = aIdx.GetNode().GetGrfNode();
     if( pGrfNd && pGrfNd->IsLinkedFile() )
         pGrfNd->GetFileFilterNms( pGrfName, pFltName );
@@ -730,13 +730,13 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
             const RndStdIds eOldAnchorType = pContact->GetAnchorId();
             if ( !_bSameOnly && eOldAnchorType == FLY_AS_CHAR )
             {
-                xOldAsCharAnchorPos.reset(new SwPosition(pContact->GetCntntAnchor()));
+                xOldAsCharAnchorPos.reset(new SwPosition(pContact->GetContentAnchor()));
             }
 
             if ( _bSameOnly )
                 _eAnchorType = eOldAnchorType;
 
-            SwFmtAnchor aNewAnch( _eAnchorType );
+            SwFormatAnchor aNewAnch( _eAnchorType );
             SwAnchoredObject *pAnchoredObj = pContact->GetAnchoredObj(pObj);
             Rectangle aObjRect(pAnchoredObj->GetObjRect().SVRect());
             const Point aPt( aObjRect.TopLeft() );
@@ -753,9 +753,9 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
 
                     // allow drawing objects in header/footer
                     pNewAnchorFrm = ::FindAnchor( pOldAnchorFrm, aNewPoint, false );
-                    if ( pNewAnchorFrm->IsTxtFrm() && static_cast<const SwTxtFrm*>(pNewAnchorFrm)->IsFollow() )
+                    if ( pNewAnchorFrm->IsTextFrm() && static_cast<const SwTextFrm*>(pNewAnchorFrm)->IsFollow() )
                     {
-                        pNewAnchorFrm = static_cast<const SwTxtFrm*>(pNewAnchorFrm)->FindMaster();
+                        pNewAnchorFrm = static_cast<const SwTextFrm*>(pNewAnchorFrm)->FindMaster();
                     }
                     if ( pNewAnchorFrm->IsProtected() )
                     {
@@ -763,7 +763,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                     }
                     else
                     {
-                        SwPosition aPos( *static_cast<const SwCntntFrm*>(pNewAnchorFrm)->GetNode() );
+                        SwPosition aPos( *static_cast<const SwContentFrm*>(pNewAnchorFrm)->GetNode() );
                         aNewAnch.SetType( _eAnchorType );
                         aNewAnch.SetAnchor( &aPos );
                     }
@@ -773,7 +773,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
             case FLY_AT_FLY: // LAYER_IMPL
                 {
                     // Search the closest SwFlyFrm starting from the upper left corner.
-                    SwFrm *pTxtFrm;
+                    SwFrm *pTextFrm;
                     {
                         SwCrsrMoveState aState( MV_SETONLYTEXT );
                         SwPosition aPos( GetNodes() );
@@ -782,16 +782,16 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                         getIDocumentLayoutAccess().GetCurrentLayout()->GetCrsrOfst( &aPos, aPoint, &aState );
                         // consider that drawing objects can be in
                         // header/footer. Thus, <GetFrm()> by left-top-corner
-                        pTxtFrm = aPos.nNode.GetNode().
-                                        GetCntntNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+                        pTextFrm = aPos.nNode.GetNode().
+                                        GetContentNode()->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
                     }
-                    const SwFrm *pTmp = ::FindAnchor( pTxtFrm, aPt );
+                    const SwFrm *pTmp = ::FindAnchor( pTextFrm, aPt );
                     pNewAnchorFrm = pTmp->FindFlyFrm();
                     if( pNewAnchorFrm && !pNewAnchorFrm->IsProtected() )
                     {
-                        const SwFrmFmt *pTmpFmt = static_cast<const SwFlyFrm*>(pNewAnchorFrm)->GetFmt();
-                        const SwFmtCntnt& rCntnt = pTmpFmt->GetCntnt();
-                        SwPosition aPos( *rCntnt.GetCntntIdx() );
+                        const SwFrameFormat *pTmpFormat = static_cast<const SwFlyFrm*>(pNewAnchorFrm)->GetFormat();
+                        const SwFormatContent& rContent = pTmpFormat->GetContent();
+                        SwPosition aPos( *rContent.GetContentIdx() );
                         aNewAnch.SetAnchor( &aPos );
                         break;
                     }
@@ -818,7 +818,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                         pContact->ConnectToLayout();
                         pOldAnchorFrm = pContact->GetAnchorFrm();
                     }
-                    const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pOldAnchorFrm))->Prepare();
+                    const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pOldAnchorFrm))->Prepare();
                 }
                 else            // Change of anchors
                 {
@@ -834,7 +834,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                     Point aPoint( aPt );
                     aPoint.setX(aPoint.getX() - 1);    // Do not load in the DrawObj!
                     aNewAnch.SetType( FLY_AS_CHAR );
-                    SwPosition aPos( *static_cast<const SwCntntFrm*>(pNewAnchorFrm)->GetNode() );
+                    SwPosition aPos( *static_cast<const SwContentFrm*>(pNewAnchorFrm)->GetNode() );
                     if ( pNewAnchorFrm->Frm().IsInside( aPoint ) )
                     {
                     // We need to find a TextNode, because only there we can anchor a
@@ -844,23 +844,23 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                     }
                     else
                     {
-                        SwCntntNode &rCNd = (SwCntntNode&)
-                            *static_cast<const SwCntntFrm*>(pNewAnchorFrm)->GetNode();
+                        SwContentNode &rCNd = (SwContentNode&)
+                            *static_cast<const SwContentFrm*>(pNewAnchorFrm)->GetNode();
                         if ( pNewAnchorFrm->Frm().Bottom() < aPt.Y() )
                             rCNd.MakeStartIndex( &aPos.nContent );
                         else
                             rCNd.MakeEndIndex( &aPos.nContent );
                     }
                     aNewAnch.SetAnchor( &aPos );
-                    SetAttr( aNewAnch, *pContact->GetFmt() );
+                    SetAttr( aNewAnch, *pContact->GetFormat() );
                     // #i26791# - adjust vertical positioning to 'center to
                     // baseline'
-                    SetAttr( SwFmtVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ), *pContact->GetFmt() );
-                    SwTxtNode *pNd = aPos.nNode.GetNode().GetTxtNode();
-                    OSL_ENSURE( pNd, "Cursor not positioned at TxtNode." );
+                    SetAttr( SwFormatVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ), *pContact->GetFormat() );
+                    SwTextNode *pNd = aPos.nNode.GetNode().GetTextNode();
+                    OSL_ENSURE( pNd, "Cursor not positioned at TextNode." );
 
-                    SwFmtFlyCnt aFmt( pContact->GetFmt() );
-                    pNd->InsertItem( aFmt, aPos.nContent.GetIndex(), 0 );
+                    SwFormatFlyCnt aFormat( pContact->GetFormat() );
+                    pNd->InsertItem( aFormat, aPos.nContent.GetIndex(), 0 );
                 }
                 break;
             default:
@@ -874,7 +874,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                 // #i26791# - Direct object positioning no longer needed. Apply
                 // of attributes (method call <SetAttr(..)>) takes care of the
                 // invalidation of the object position.
-                SetAttr( aNewAnch, *pContact->GetFmt() );
+                SetAttr( aNewAnch, *pContact->GetFormat() );
                 if ( _bPosCorr )
                 {
                     // #i33313# - consider not connected 'virtual' drawing
@@ -904,20 +904,20 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
             {
                 if ( pNewAnchorFrm)
                 {
-                    // We need to handle InCntnts in a special way:
-                    // The TxtAttribut needs to be destroyed which, unfortunately, also
+                    // We need to handle InContents in a special way:
+                    // The TextAttribut needs to be destroyed which, unfortunately, also
                     // destroys the format. To avoid that, we disconnect the format from
                     // the attribute.
                     const sal_Int32 nIndx( xOldAsCharAnchorPos->nContent.GetIndex() );
-                    SwTxtNode* pTxtNode( xOldAsCharAnchorPos->nNode.GetNode().GetTxtNode() );
-                    assert(pTxtNode && "<SwDoc::ChgAnchor(..)> - missing previous anchor text node for as-character anchored object");
-                    SwTxtAttr * const pHnt =
-                        pTxtNode->GetTxtAttrForCharAt( nIndx, RES_TXTATR_FLYCNT );
-                    assert(pHnt && "Missing FlyInCnt-Hint.");
-                    const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
+                    SwTextNode* pTextNode( xOldAsCharAnchorPos->nNode.GetNode().GetTextNode() );
+                    assert(pTextNode && "<SwDoc::ChgAnchor(..)> - missing previous anchor text node for as-character anchored object");
+                    SwTextAttr * const pHint =
+                        pTextNode->GetTextAttrForCharAt( nIndx, RES_TXTATR_FLYCNT );
+                    assert(pHint && "Missing FlyInCnt-Hint.");
+                    const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt()).SetFlyFormat();
 
                     // They are disconnected. We now have to destroy the attribute.
-                    pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIndx, nIndx );
+                    pTextNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIndx, nIndx );
                 }
             }
         }
@@ -929,57 +929,57 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
     return bUnmark;
 }
 
-SwChainRet SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest )
+SwChainRet SwDoc::Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest )
 {
     // The Source must not yet have a Follow.
-    const SwFmtChain &rOldChain = rSource.GetChain();
+    const SwFormatChain &rOldChain = rSource.GetChain();
     if ( rOldChain.GetNext() )
         return SwChainRet::SOURCE_CHAINED;
 
     // Target must not be equal to Source and we also must not have a closed chain.
-    const SwFrmFmt *pFmt = &rDest;
+    const SwFrameFormat *pFormat = &rDest;
     do {
-        if( pFmt == &rSource )
+        if( pFormat == &rSource )
             return SwChainRet::SELF;
-        pFmt = pFmt->GetChain().GetNext();
-    } while ( pFmt );
+        pFormat = pFormat->GetChain().GetNext();
+    } while ( pFormat );
 
     // There must not be a chaining from outside to inside or the other way around.
     if( rDest.IsLowerOf( rSource ) || rSource .IsLowerOf( rDest ) )
         return SwChainRet::SELF;
 
     // The Target must not yet have a Master.
-    const SwFmtChain &rChain = rDest.GetChain();
+    const SwFormatChain &rChain = rDest.GetChain();
     if( rChain.GetPrev() )
         return SwChainRet::IS_IN_CHAIN;
 
     // Target must be empty.
-    const SwNodeIndex* pCntIdx = rDest.GetCntnt().GetCntntIdx();
+    const SwNodeIndex* pCntIdx = rDest.GetContent().GetContentIdx();
     if( !pCntIdx )
         return SwChainRet::NOT_FOUND;
 
     SwNodeIndex aNxtIdx( *pCntIdx, 1 );
-    const SwTxtNode* pTxtNd = aNxtIdx.GetNode().GetTxtNode();
-    if( !pTxtNd )
+    const SwTextNode* pTextNd = aNxtIdx.GetNode().GetTextNode();
+    if( !pTextNd )
         return SwChainRet::NOT_FOUND;
 
     const sal_uLong nFlySttNd = pCntIdx->GetIndex();
     if( 2 != ( pCntIdx->GetNode().EndOfSectionIndex() - nFlySttNd ) ||
-        pTxtNd->GetTxt().getLength() )
+        pTextNd->GetText().getLength() )
     {
         return SwChainRet::NOT_EMPTY;
     }
 
-    for( auto pSpzFrmFm : *GetSpzFrmFmts() )
+    for( auto pSpzFrmFm : *GetSpzFrameFormats() )
     {
-        const SwFmtAnchor& rAnchor = pSpzFrmFm->GetAnchor();
+        const SwFormatAnchor& rAnchor = pSpzFrmFm->GetAnchor();
         sal_uLong nTstSttNd;
         // #i20622# - to-frame anchored objects are allowed.
         if ( ((rAnchor.GetAnchorId() == FLY_AT_PARA) ||
               (rAnchor.GetAnchorId() == FLY_AT_CHAR)) &&
-             0 != rAnchor.GetCntntAnchor() &&
+             0 != rAnchor.GetContentAnchor() &&
              nFlySttNd <= ( nTstSttNd =
-                         rAnchor.GetCntntAnchor()->nNode.GetIndex() ) &&
+                         rAnchor.GetContentAnchor()->nNode.GetIndex() ) &&
              nTstSttNd < nFlySttNd + 2 )
         {
             return SwChainRet::NOT_EMPTY;
@@ -992,21 +992,21 @@ SwChainRet SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest )
     // one. e.g. if it's requested by the API.
 
     // both in the same fly, header, footer or on the page?
-    const SwFmtAnchor &rSrcAnchor = rSource.GetAnchor(),
+    const SwFormatAnchor &rSrcAnchor = rSource.GetAnchor(),
                       &rDstAnchor = rDest.GetAnchor();
     sal_uLong nEndOfExtras = GetNodes().GetEndOfExtras().GetIndex();
     bool bAllowed = false;
     if ( FLY_AT_PAGE == rSrcAnchor.GetAnchorId() )
     {
         if ( (FLY_AT_PAGE == rDstAnchor.GetAnchorId()) ||
-            ( rDstAnchor.GetCntntAnchor() &&
-              rDstAnchor.GetCntntAnchor()->nNode.GetIndex() > nEndOfExtras ))
+            ( rDstAnchor.GetContentAnchor() &&
+              rDstAnchor.GetContentAnchor()->nNode.GetIndex() > nEndOfExtras ))
             bAllowed = true;
     }
-    else if( rSrcAnchor.GetCntntAnchor() && rDstAnchor.GetCntntAnchor() )
+    else if( rSrcAnchor.GetContentAnchor() && rDstAnchor.GetContentAnchor() )
     {
-        const SwNodeIndex &rSrcIdx = rSrcAnchor.GetCntntAnchor()->nNode,
-                            &rDstIdx = rDstAnchor.GetCntntAnchor()->nNode;
+        const SwNodeIndex &rSrcIdx = rSrcAnchor.GetContentAnchor()->nNode,
+                            &rDstIdx = rDstAnchor.GetContentAnchor()->nNode;
         const SwStartNode* pSttNd = 0;
         if( rSrcIdx == rDstIdx ||
             ( !pSttNd &&
@@ -1026,37 +1026,37 @@ SwChainRet SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest )
     return bAllowed ? SwChainRet::OK : SwChainRet::WRONG_AREA;
 }
 
-SwChainRet SwDoc::Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest )
+SwChainRet SwDoc::Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest )
 {
     SwChainRet nErr = Chainable( rSource, rDest );
     if ( nErr == SwChainRet::OK )
     {
         GetIDocumentUndoRedo().StartUndo( UNDO_CHAINE, NULL );
 
-        SwFlyFrmFmt& rDestFmt = const_cast<SwFlyFrmFmt&>(static_cast<const SwFlyFrmFmt&>(rDest));
+        SwFlyFrameFormat& rDestFormat = const_cast<SwFlyFrameFormat&>(static_cast<const SwFlyFrameFormat&>(rDest));
 
         // Attach Follow to the Master.
-        SwFmtChain aChain = rDestFmt.GetChain();
-        aChain.SetPrev( &static_cast<SwFlyFrmFmt&>(rSource) );
-        SetAttr( aChain, rDestFmt );
+        SwFormatChain aChain = rDestFormat.GetChain();
+        aChain.SetPrev( &static_cast<SwFlyFrameFormat&>(rSource) );
+        SetAttr( aChain, rDestFormat );
 
         SfxItemSet aSet( GetAttrPool(), RES_FRM_SIZE, RES_FRM_SIZE,
                                         RES_CHAIN,  RES_CHAIN, 0 );
 
         // Attach Follow to the Master.
-        aChain.SetPrev( &static_cast<SwFlyFrmFmt&>(rSource) );
-        SetAttr( aChain, rDestFmt );
+        aChain.SetPrev( &static_cast<SwFlyFrameFormat&>(rSource) );
+        SetAttr( aChain, rDestFormat );
 
         // Attach Master to the Follow.
         // Make sure that the Master has a fixed height.
         aChain = rSource.GetChain();
-        aChain.SetNext( &rDestFmt );
+        aChain.SetNext( &rDestFormat );
         aSet.Put( aChain );
 
-        SwFmtFrmSize aSize( rSource.GetFrmSize() );
+        SwFormatFrmSize aSize( rSource.GetFrmSize() );
         if ( aSize.GetHeightSizeType() != ATT_FIX_SIZE )
         {
-            SwFlyFrm *pFly = SwIterator<SwFlyFrm,SwFmt>( rSource ).First();
+            SwFlyFrm *pFly = SwIterator<SwFlyFrm,SwFormat>( rSource ).First();
             if ( pFly )
                 aSize.SetHeight( pFly->Frm().Height() );
             aSize.SetHeightSizeType( ATT_FIX_SIZE );
@@ -1069,15 +1069,15 @@ SwChainRet SwDoc::Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest )
     return nErr;
 }
 
-void SwDoc::Unchain( SwFrmFmt &rFmt )
+void SwDoc::Unchain( SwFrameFormat &rFormat )
 {
-    SwFmtChain aChain( rFmt.GetChain() );
+    SwFormatChain aChain( rFormat.GetChain() );
     if ( aChain.GetNext() )
     {
         GetIDocumentUndoRedo().StartUndo( UNDO_UNCHAIN, NULL );
-        SwFrmFmt *pFollow = aChain.GetNext();
+        SwFrameFormat *pFollow = aChain.GetNext();
         aChain.SetNext( 0 );
-        SetAttr( aChain, rFmt );
+        SetAttr( aChain, rFormat );
         aChain = pFollow->GetChain();
         aChain.SetPrev( 0 );
         SetAttr( aChain, *pFollow );
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index c69872bbdb75..6750c6f84500 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -88,18 +88,18 @@ using namespace ::com::sun::star::uno;
  * Internal functions
  */
 
-static void SetTxtFmtCollNext( SwTxtFmtColl* pTxtColl, const SwTxtFmtColl* pDel )
+static void SetTextFormatCollNext( SwTextFormatColl* pTextColl, const SwTextFormatColl* pDel )
 {
-    if ( &pTxtColl->GetNextTxtFmtColl() == pDel )
+    if ( &pTextColl->GetNextTextFormatColl() == pDel )
     {
-        pTxtColl->SetNextTxtFmtColl( *pTxtColl );
+        pTextColl->SetNextTextFormatColl( *pTextColl );
     }
 }
 
 static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
 {
-    const sw::DocumentContentOperationsManager::ParaRstFmt* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFmt*>(pArgs);
-    SwCntntNode* pNode = rpNd->GetCntntNode();
+    const sw::DocumentContentOperationsManager::ParaRstFormat* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFormat*>(pArgs);
+    SwContentNode* pNode = rpNd->GetContentNode();
     if( pNode && pNode->HasSwAttrSet() )
     {
         const bool bLocked = pNode->IsModifyLocked();
@@ -144,10 +144,10 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
                 switch( aSavIds[ n ] )
                 {
                     case RES_PAGEDESC:
-                        bSave = 0 != static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc();
+                        bSave = 0 != static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc();
                     break;
                     case RES_BREAK:
-                        bSave = SVX_BREAK_NONE != static_cast<const SvxFmtBreakItem*>(pItem)->GetBreak();
+                        bSave = SVX_BREAK_NONE != static_cast<const SvxFormatBreakItem*>(pItem)->GetBreak();
                     break;
                     case RES_PARATR_NUMRULE:
                         bSave = !static_cast<const SwNumRuleItem*>(pItem)->GetValue().isEmpty();
@@ -219,7 +219,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
     return true;
 }
 
-void SwDoc::RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark, bool bExactRange )
+void SwDoc::RstTextAttrs(const SwPaM &rRg, bool bInclRefToxMark, bool bExactRange )
 {
     SwHistory* pHst = 0;
     SwDataChanged aTmp( rRg );
@@ -230,27 +230,27 @@ void SwDoc::RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark, bool bExactRange
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
     const SwPosition *pStt = rRg.Start(), *pEnd = rRg.End();
-    sw::DocumentContentOperationsManager::ParaRstFmt aPara( pStt, pEnd, pHst );
+    sw::DocumentContentOperationsManager::ParaRstFormat aPara( pStt, pEnd, pHst );
     aPara.bInclRefToxMark = bInclRefToxMark;
     aPara.bExactRange = bExactRange;
     GetNodes().ForEach( pStt->nNode.GetIndex(), pEnd->nNode.GetIndex()+1,
-                        sw::DocumentContentOperationsManager::lcl_RstTxtAttr, &aPara );
+                        sw::DocumentContentOperationsManager::lcl_RstTextAttr, &aPara );
     getIDocumentState().SetModified();
 }
 
 void SwDoc::ResetAttrs( const SwPaM &rRg,
-                        bool bTxtAttr,
+                        bool bTextAttr,
                         const std::set<sal_uInt16> &rAttrs,
                         const bool bSendDataChangedEvents )
 {
     SwPaM* pPam = const_cast<SwPaM*>(&rRg);
-    if( !bTxtAttr && !rAttrs.empty() && RES_TXTATR_END > *(rAttrs.begin()) )
-        bTxtAttr = true;
+    if( !bTextAttr && !rAttrs.empty() && RES_TXTATR_END > *(rAttrs.begin()) )
+        bTextAttr = true;
 
     if( !rRg.HasMark() )
     {
-        SwTxtNode* pTxtNd = rRg.GetPoint()->nNode.GetNode().GetTxtNode();
-        if( !pTxtNd )
+        SwTextNode* pTextNd = rRg.GetPoint()->nNode.GetNode().GetTextNode();
+        if( !pTextNd )
             return ;
 
         pPam = new SwPaM( *rRg.GetPoint() );
@@ -259,9 +259,9 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
         sal_Int32 nMkPos, nPtPos = rSt.GetIndex();
 
         // Special case: if the Crsr is located within a URL attribute, we take over it's area
-        SwTxtAttr const*const pURLAttr(
-            pTxtNd->GetTxtAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
-        if (pURLAttr && !pURLAttr->GetINetFmt().GetValue().isEmpty())
+        SwTextAttr const*const pURLAttr(
+            pTextNd->GetTextAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
+        if (pURLAttr && !pURLAttr->GetINetFormat().GetValue().isEmpty())
         {
             nMkPos = pURLAttr->GetStart();
             nPtPos = *pURLAttr->End();
@@ -271,8 +271,8 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
             Boundary aBndry;
             if( g_pBreakIt->GetBreakIter().is() )
                 aBndry = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            pTxtNd->GetTxt(), nPtPos,
-                            g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+                            pTextNd->GetText(), nPtPos,
+                            g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
                             WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
                             true );
 
@@ -284,8 +284,8 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
             else
             {
                 nPtPos = nMkPos = rSt.GetIndex();
-                if( bTxtAttr )
-                    pTxtNd->DontExpandFmt( rSt, true );
+                if( bTextAttr )
+                    pTextNd->DontExpandFormat( rSt, true );
             }
         }
 
@@ -304,7 +304,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         SwUndoResetAttr* pUndo = new SwUndoResetAttr( rRg,
-            static_cast<sal_uInt16>(bTxtAttr ? RES_CONDTXTFMTCOLL : RES_TXTFMTCOLL ));
+            static_cast<sal_uInt16>(bTextAttr ? RES_CONDTXTFMTCOLL : RES_TXTFMTCOLL ));
         if( !rAttrs.empty() )
         {
             pUndo->SetAttrs( rAttrs );
@@ -314,7 +314,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
     }
 
     const SwPosition *pStt = pPam->Start(), *pEnd = pPam->End();
-    sw::DocumentContentOperationsManager::ParaRstFmt aPara( pStt, pEnd, pHst );
+    sw::DocumentContentOperationsManager::ParaRstFormat aPara( pStt, pEnd, pHst );
 
     // mst: not including META here; it seems attrs with CH_TXTATR are omitted
     sal_uInt16 aResetableSetRange[] = {
@@ -347,39 +347,39 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
     SwNodeIndex aTmpEnd( pEnd->nNode );
     if( pStt->nContent.GetIndex() )     // just one part
     {
-        // set up a later, and all CharFmtAttr -> TxtFmtAttr
-        SwTxtNode* pTNd = aTmpStt.GetNode().GetTxtNode();
+        // set up a later, and all CharFormatAttr -> TextFormatAttr
+        SwTextNode* pTNd = aTmpStt.GetNode().GetTextNode();
         if( pTNd && pTNd->HasSwAttrSet() && pTNd->GetpSwAttrSet()->Count() )
         {
             if (pHst)
             {
                 SwRegHistory history(pTNd, *pTNd, pHst);
-                pTNd->FmtToTxtAttr(pTNd);
+                pTNd->FormatToTextAttr(pTNd);
             }
             else
             {
-                pTNd->FmtToTxtAttr(pTNd);
+                pTNd->FormatToTextAttr(pTNd);
             }
         }
 
         ++aTmpStt;
     }
-    if( pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetCntntNode()->Len() )
-         // set up a later, and all CharFmtAttr -> TxtFmtAttr
+    if( pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetContentNode()->Len() )
+         // set up a later, and all CharFormatAttr -> TextFormatAttr
         ++aTmpEnd, bAdd = false;
     else if( pStt->nNode != pEnd->nNode || !pStt->nContent.GetIndex() )
     {
-        SwTxtNode* pTNd = aTmpEnd.GetNode().GetTxtNode();
+        SwTextNode* pTNd = aTmpEnd.GetNode().GetTextNode();
         if( pTNd && pTNd->HasSwAttrSet() && pTNd->GetpSwAttrSet()->Count() )
         {
             if (pHst)
             {
                 SwRegHistory history(pTNd, *pTNd, pHst);
-                pTNd->FmtToTxtAttr(pTNd);
+                pTNd->FormatToTextAttr(pTNd);
             }
             else
             {
-                pTNd->FmtToTxtAttr(pTNd);
+                pTNd->FormatToTextAttr(pTNd);
             }
         }
     }
@@ -393,11 +393,11 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
         aPara.bResetAll = true ;
     }
 
-    if( bTxtAttr )
+    if( bTextAttr )
     {
         if( bAdd )
             ++aTmpEnd;
-        GetNodes().ForEach( pStt->nNode, aTmpEnd, sw::DocumentContentOperationsManager::lcl_RstTxtAttr, &aPara );
+        GetNodes().ForEach( pStt->nNode, aTmpEnd, sw::DocumentContentOperationsManager::lcl_RstTextAttr, &aPara );
     }
 
     getIDocumentState().SetModified();
@@ -414,8 +414,8 @@ bool SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen )
     if (!SW_MOD()->GetModuleConfig()->IsStoreRsid())
         return false;
 
-    SwTxtNode *pTxtNode = rRg.GetPoint()->nNode.GetNode().GetTxtNode();
-    if (!pTxtNode)
+    SwTextNode *pTextNode = rRg.GetPoint()->nNode.GetNode().GetTextNode();
+    if (!pTextNode)
     {
         return false;
     }
@@ -424,7 +424,7 @@ bool SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen )
 
     SfxItemSet aSet(GetAttrPool(), RES_CHRATR_RSID, RES_CHRATR_RSID);
     aSet.Put(aRsid);
-    bool const bRet(pTxtNode->SetAttr(aSet, nStart,
+    bool const bRet(pTextNode->SetAttr(aSet, nStart,
         rRg.GetPoint()->nContent.GetIndex(), SetAttrMode::DEFAULT));
 
     if (bRet && GetIDocumentUndoRedo().DoesUndo())
@@ -441,37 +441,37 @@ bool SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen )
     return bRet;
 }
 
-bool SwDoc::UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal )
+bool SwDoc::UpdateParRsid( SwTextNode *pTextNode, sal_uInt32 nVal )
 {
     if (!SW_MOD()->GetModuleConfig()->IsStoreRsid())
         return false;
 
-    if (!pTxtNode)
+    if (!pTextNode)
     {
         return false;
     }
 
     SvxRsidItem aRsid( nVal ? nVal : mnRsid, RES_PARATR_RSID );
-    return pTxtNode->SetAttr( aRsid );
+    return pTextNode->SetAttr( aRsid );
 }
 
 /// Set the attribute according to the stated format.
 /// If Undo is enabled, the old values is added to the Undo history.
-void SwDoc::SetAttr( const SfxPoolItem& rAttr, SwFmt& rFmt )
+void SwDoc::SetAttr( const SfxPoolItem& rAttr, SwFormat& rFormat )
 {
     SfxItemSet aSet( GetAttrPool(), rAttr.Which(), rAttr.Which() );
     aSet.Put( rAttr );
-    SetAttr( aSet, rFmt );
+    SetAttr( aSet, rFormat );
 }
 
 /// Set the attribute according to the stated format.
 /// If Undo is enabled, the old values is added to the Undo history.
-void SwDoc::SetAttr( const SfxItemSet& rSet, SwFmt& rFmt )
+void SwDoc::SetAttr( const SfxItemSet& rSet, SwFormat& rFormat )
 {
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndoFmtAttrHelper aTmp( rFmt );
-        rFmt.SetFmtAttr( rSet );
+        SwUndoFormatAttrHelper aTmp( rFormat );
+        rFormat.SetFormatAttr( rSet );
         if ( aTmp.GetUndo() )
         {
             GetIDocumentUndoRedo().AppendUndo( aTmp.ReleaseUndo() );
@@ -483,19 +483,19 @@ void SwDoc::SetAttr( const SfxItemSet& rSet, SwFmt& rFmt )
     }
     else
     {
-        rFmt.SetFmtAttr( rSet );
+        rFormat.SetFormatAttr( rSet );
     }
     getIDocumentState().SetModified();
 }
 
 void SwDoc::ResetAttrAtFormat( const sal_uInt16 nWhichId,
-                               SwFmt& rChangedFormat )
+                               SwFormat& rChangedFormat )
 {
     SwUndo *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
-        ?   new SwUndoFmtResetAttr( rChangedFormat, nWhichId )
+        ?   new SwUndoFormatResetAttr( rChangedFormat, nWhichId )
         :   0;
 
-    const bool bAttrReset = rChangedFormat.ResetFmtAttr( nWhichId );
+    const bool bAttrReset = rChangedFormat.ResetFormatAttr( nWhichId );
 
     if ( bAttrReset )
     {
@@ -516,7 +516,7 @@ static bool lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth,
     // Set the default values of all TabStops to the new value.
     // Attention: we always work with the PoolAttribut here, so that
     // we don't calculate the same value on the same TabStop (pooled!) for all sets.
-    // We send a FmtChg to modify.
+    // We send a FormatChg to modify.
 
     sal_uInt16 nOldCnt = rChgTabStop.Count();
     if( !nOldCnt || nOldWidth == nNewWidth )
@@ -563,29 +563,29 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
 
         if (isCHRATR(nWhich) || isTXTATR(nWhich))
         {
-            aCallMod.Add( mpDfltTxtFmtColl );
-            aCallMod.Add( mpDfltCharFmt );
+            aCallMod.Add( mpDfltTextFormatColl );
+            aCallMod.Add( mpDfltCharFormat );
             bCheckSdrDflt = 0 != pSdrPool;
         }
         else if ( isPARATR(nWhich) ||
                   isPARATR_LIST(nWhich) )
         {
-            aCallMod.Add( mpDfltTxtFmtColl );
+            aCallMod.Add( mpDfltTextFormatColl );
             bCheckSdrDflt = 0 != pSdrPool;
         }
         else if (isGRFATR(nWhich))
         {
-            aCallMod.Add( mpDfltGrfFmtColl );
+            aCallMod.Add( mpDfltGrfFormatColl );
         }
         else if (isFRMATR(nWhich) || isDrawingLayerAttribute(nWhich) ) //UUUU
         {
-            aCallMod.Add( mpDfltGrfFmtColl );
-            aCallMod.Add( mpDfltTxtFmtColl );
-            aCallMod.Add( mpDfltFrmFmt );
+            aCallMod.Add( mpDfltGrfFormatColl );
+            aCallMod.Add( mpDfltTextFormatColl );
+            aCallMod.Add( mpDfltFrameFormat );
         }
         else if (isBOXATR(nWhich))
         {
-            aCallMod.Add( mpDfltFrmFmt );
+            aCallMod.Add( mpDfltFrameFormat );
         }
 
         // also copy the defaults
@@ -624,7 +624,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
             // Set the default values of all TabStops to the new value.
             // Attention: we always work with the PoolAttribut here, so that
             // we don't calculate the same value on the same TabStop (pooled!) for all sets.
-            // We send a FmtChg to modify.
+            // We send a FormatChg to modify.
             SwTwips nNewWidth = (*static_cast<const SvxTabStopItem*>(pTmpItem))[ 0 ].GetTabPos(),
                     nOldWidth = static_cast<const SvxTabStopItem&>(aOld.Get(RES_PARATR_TABSTOP))[ 0 ].GetTabPos();
 
@@ -639,9 +639,9 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
             aOld.ClearItem( RES_PARATR_TABSTOP );
             if( bChg )
             {
-                SwFmtChg aChgFmt( mpDfltCharFmt );
+                SwFormatChg aChgFormat( mpDfltCharFormat );
                 // notify the frames
-                aCallMod.ModifyNotification( &aChgFmt, &aChgFmt );
+                aCallMod.ModifyNotification( &aChgFormat, &aChgFormat );
             }
         }
     }
@@ -662,15 +662,15 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
 }
 
 /// Get the default attribute in this document
-const SfxPoolItem& SwDoc::GetDefault( sal_uInt16 nFmtHint ) const
+const SfxPoolItem& SwDoc::GetDefault( sal_uInt16 nFormatHint ) const
 {
-    return GetAttrPool().GetDefaultItem( nFmtHint );
+    return GetAttrPool().GetDefaultItem( nFormatHint );
 }
 
 /// Delete the formats
-void SwDoc::DelCharFmt(size_t nFmt, bool bBroadcast)
+void SwDoc::DelCharFormat(size_t nFormat, bool bBroadcast)
 {
-    SwCharFmt * pDel = (*mpCharFmtTbl)[nFmt];
+    SwCharFormat * pDel = (*mpCharFormatTable)[nFormat];
 
     if (bBroadcast)
         BroadcastStyleOperation(pDel->GetName(), SFX_STYLE_FAMILY_CHAR,
@@ -679,287 +679,287 @@ void SwDoc::DelCharFmt(size_t nFmt, bool bBroadcast)
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         SwUndo * pUndo =
-            new SwUndoCharFmtDelete(pDel, this);
+            new SwUndoCharFormatDelete(pDel, this);
 
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
-    delete (*mpCharFmtTbl)[nFmt];
-    mpCharFmtTbl->erase(mpCharFmtTbl->begin() + nFmt);
+    delete (*mpCharFormatTable)[nFormat];
+    mpCharFormatTable->erase(mpCharFormatTable->begin() + nFormat);
 
     getIDocumentState().SetModified();
 }
 
-void SwDoc::DelCharFmt( SwCharFmt *pFmt, bool bBroadcast )
+void SwDoc::DelCharFormat( SwCharFormat *pFormat, bool bBroadcast )
 {
-    size_t nFmt = mpCharFmtTbl->GetPos( pFmt );
-    OSL_ENSURE( SIZE_MAX != nFmt, "Fmt not found," );
-    DelCharFmt( nFmt, bBroadcast );
+    size_t nFormat = mpCharFormatTable->GetPos( pFormat );
+    OSL_ENSURE( SIZE_MAX != nFormat, "Format not found," );
+    DelCharFormat( nFormat, bBroadcast );
 }
 
-void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast )
+void SwDoc::DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast )
 {
-    if( pFmt->ISA( SwTableBoxFmt ) || pFmt->ISA( SwTableLineFmt ))
+    if( pFormat->ISA( SwTableBoxFormat ) || pFormat->ISA( SwTableLineFormat ))
     {
         OSL_ENSURE( false, "Format is not in the DocArray any more, "
                        "so it can be deleted with delete" );
-        delete pFmt;
+        delete pFormat;
     }
     else
     {
 
         // The format has to be in the one or the other, we'll see in which one.
-        SwFrmFmts::iterator it = std::find( mpFrmFmtTbl->begin(), mpFrmFmtTbl->end(), pFmt );
-        if ( it != mpFrmFmtTbl->end() )
+        SwFrameFormats::iterator it = std::find( mpFrameFormatTable->begin(), mpFrameFormatTable->end(), pFormat );
+        if ( it != mpFrameFormatTable->end() )
         {
             if (bBroadcast)
-                BroadcastStyleOperation(pFmt->GetName(),
+                BroadcastStyleOperation(pFormat->GetName(),
                                         SFX_STYLE_FAMILY_FRAME,
                                         SfxStyleSheetHintId::ERASED);
 
             if (GetIDocumentUndoRedo().DoesUndo())
             {
-                SwUndo * pUndo = new SwUndoFrmFmtDelete(pFmt, this);
+                SwUndo * pUndo = new SwUndoFrameFormatDelete(pFormat, this);
 
                 GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
 
             delete *it;
-            mpFrmFmtTbl->erase(it);
+            mpFrameFormatTable->erase(it);
         }
         else
         {
-            SwFrmFmts::iterator it2 = std::find( GetSpzFrmFmts()->begin(), GetSpzFrmFmts()->end(), pFmt );
-            OSL_ENSURE( it2 != GetSpzFrmFmts()->end(), "FrmFmt not found." );
-            if( it2 != GetSpzFrmFmts()->end() )
+            SwFrameFormats::iterator it2 = std::find( GetSpzFrameFormats()->begin(), GetSpzFrameFormats()->end(), pFormat );
+            OSL_ENSURE( it2 != GetSpzFrameFormats()->end(), "FrameFormat not found." );
+            if( it2 != GetSpzFrameFormats()->end() )
             {
                 delete *it2;
-                GetSpzFrmFmts()->erase( it2 );
+                GetSpzFrameFormats()->erase( it2 );
             }
         }
     }
 }
 
-void SwDoc::DelTblFrmFmt( SwTableFmt *pFmt )
+void SwDoc::DelTableFrameFormat( SwTableFormat *pFormat )
 {
-    SwFrmFmts::iterator it = std::find( mpTblFrmFmtTbl->begin(), mpTblFrmFmtTbl->end(), pFmt );
-    OSL_ENSURE( it != mpTblFrmFmtTbl->end(), "Fmt not found," );
+    SwFrameFormats::iterator it = std::find( mpTableFrameFormatTable->begin(), mpTableFrameFormatTable->end(), pFormat );
+    OSL_ENSURE( it != mpTableFrameFormatTable->end(), "Format not found," );
     delete *it;
-    mpTblFrmFmtTbl->erase(it);
+    mpTableFrameFormatTable->erase(it);
 }
 
 /// Create the formats
-SwFlyFrmFmt *SwDoc::MakeFlyFrmFmt( const OUString &rFmtName,
-                                    SwFrmFmt *pDerivedFrom )
+SwFlyFrameFormat *SwDoc::MakeFlyFrameFormat( const OUString &rFormatName,
+                                    SwFrameFormat *pDerivedFrom )
 {
-    SwFlyFrmFmt *pFmt = new SwFlyFrmFmt( GetAttrPool(), rFmtName, pDerivedFrom );
-    GetSpzFrmFmts()->push_back(pFmt);
+    SwFlyFrameFormat *pFormat = new SwFlyFrameFormat( GetAttrPool(), rFormatName, pDerivedFrom );
+    GetSpzFrameFormats()->push_back(pFormat);
     getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
-SwDrawFrmFmt *SwDoc::MakeDrawFrmFmt( const OUString &rFmtName,
-                                     SwFrmFmt *pDerivedFrom )
+SwDrawFrameFormat *SwDoc::MakeDrawFrameFormat( const OUString &rFormatName,
+                                     SwFrameFormat *pDerivedFrom )
 {
-    SwDrawFrmFmt *pFmt = new SwDrawFrmFmt( GetAttrPool(), rFmtName, pDerivedFrom);
-    GetSpzFrmFmts()->push_back(pFmt);
+    SwDrawFrameFormat *pFormat = new SwDrawFrameFormat( GetAttrPool(), rFormatName, pDerivedFrom);
+    GetSpzFrameFormats()->push_back(pFormat);
     getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
-size_t SwDoc::GetTblFrmFmtCount(bool bUsed) const
+size_t SwDoc::GetTableFrameFormatCount(bool bUsed) const
 {
-    size_t nCount = mpTblFrmFmtTbl->size();
+    size_t nCount = mpTableFrameFormatTable->size();
     if(bUsed)
     {
-        SwAutoFmtGetDocNode aGetHt( &GetNodes() );
+        SwAutoFormatGetDocNode aGetHt( &GetNodes() );
         for ( size_t i = nCount; i; )
         {
-            if((*mpTblFrmFmtTbl)[--i]->GetInfo( aGetHt ))
+            if((*mpTableFrameFormatTable)[--i]->GetInfo( aGetHt ))
                 --nCount;
         }
     }
     return nCount;
 }
 
-SwFrmFmt& SwDoc::GetTblFrmFmt(size_t nFmt, bool bUsed ) const
+SwFrameFormat& SwDoc::GetTableFrameFormat(size_t nFormat, bool bUsed ) const
 {
     size_t nRemoved = 0;
     if(bUsed)
     {
-        SwAutoFmtGetDocNode aGetHt( &GetNodes() );
-        for ( size_t i = 0; i <= nFmt; ++i )
+        SwAutoFormatGetDocNode aGetHt( &GetNodes() );
+        for ( size_t i = 0; i <= nFormat; ++i )
         {
-            while ( (*mpTblFrmFmtTbl)[ i + nRemoved]->GetInfo( aGetHt ))
+            while ( (*mpTableFrameFormatTable)[ i + nRemoved]->GetInfo( aGetHt ))
             {
                 nRemoved++;
             }
         }
     }
-    return *((*mpTblFrmFmtTbl)[nRemoved + nFmt]);
+    return *((*mpTableFrameFormatTable)[nRemoved + nFormat]);
 }
 
-SwTableFmt* SwDoc::MakeTblFrmFmt( const OUString &rFmtName,
-                                    SwFrmFmt *pDerivedFrom )
+SwTableFormat* SwDoc::MakeTableFrameFormat( const OUString &rFormatName,
+                                    SwFrameFormat *pDerivedFrom )
 {
-    SwTableFmt* pFmt = new SwTableFmt( GetAttrPool(), rFmtName, pDerivedFrom );
-    mpTblFrmFmtTbl->push_back( pFmt );
+    SwTableFormat* pFormat = new SwTableFormat( GetAttrPool(), rFormatName, pDerivedFrom );
+    mpTableFrameFormatTable->push_back( pFormat );
     getIDocumentState().SetModified();
 
-    return pFmt;
+    return pFormat;
 }
 
-SwFrmFmt *SwDoc::MakeFrmFmt(const OUString &rFmtName,
-                            SwFrmFmt *pDerivedFrom,
+SwFrameFormat *SwDoc::MakeFrameFormat(const OUString &rFormatName,
+                            SwFrameFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
-    SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), rFmtName, pDerivedFrom );
+    SwFrameFormat *pFormat = new SwFrameFormat( GetAttrPool(), rFormatName, pDerivedFrom );
 
-    pFmt->SetAuto(bAuto);
-    mpFrmFmtTbl->push_back( pFmt );
+    pFormat->SetAuto(bAuto);
+    mpFrameFormatTable->push_back( pFormat );
     getIDocumentState().SetModified();
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndo * pUndo = new SwUndoFrmFmtCreate(pFmt, pDerivedFrom, this);
+        SwUndo * pUndo = new SwUndoFrameFormatCreate(pFormat, pDerivedFrom, this);
 
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
     if (bBroadcast)
     {
-        BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_FRAME,
+        BroadcastStyleOperation(rFormatName, SFX_STYLE_FAMILY_FRAME,
                                 SfxStyleSheetHintId::CREATED);
     }
 
-    return pFmt;
+    return pFormat;
 }
 
-SwFmt *SwDoc::_MakeFrmFmt(const OUString &rFmtName,
-                            SwFmt *pDerivedFrom,
+SwFormat *SwDoc::_MakeFrameFormat(const OUString &rFormatName,
+                            SwFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
-    SwFrmFmt *pFrmFmt = dynamic_cast<SwFrmFmt*>(pDerivedFrom);
-    pFrmFmt = MakeFrmFmt( rFmtName, pFrmFmt, bBroadcast, bAuto );
-    return dynamic_cast<SwFmt*>(pFrmFmt);
+    SwFrameFormat *pFrameFormat = dynamic_cast<SwFrameFormat*>(pDerivedFrom);
+    pFrameFormat = MakeFrameFormat( rFormatName, pFrameFormat, bBroadcast, bAuto );
+    return dynamic_cast<SwFormat*>(pFrameFormat);
 }
 
 // #i40550# - add parameter <bAuto> - not relevant
-SwCharFmt *SwDoc::MakeCharFmt( const OUString &rFmtName,
-                               SwCharFmt *pDerivedFrom,
+SwCharFormat *SwDoc::MakeCharFormat( const OUString &rFormatName,
+                               SwCharFormat *pDerivedFrom,
                                bool bBroadcast,
                                bool )
 {
-    SwCharFmt *pFmt = new SwCharFmt( GetAttrPool(), rFmtName, pDerivedFrom );
-    mpCharFmtTbl->push_back( pFmt );
-    pFmt->SetAuto( false );
+    SwCharFormat *pFormat = new SwCharFormat( GetAttrPool(), rFormatName, pDerivedFrom );
+    mpCharFormatTable->push_back( pFormat );
+    pFormat->SetAuto( false );
     getIDocumentState().SetModified();
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndo * pUndo = new SwUndoCharFmtCreate(pFmt, pDerivedFrom, this);
+        SwUndo * pUndo = new SwUndoCharFormatCreate(pFormat, pDerivedFrom, this);
 
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
     if (bBroadcast)
     {
-        BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_CHAR,
+        BroadcastStyleOperation(rFormatName, SFX_STYLE_FAMILY_CHAR,
                                 SfxStyleSheetHintId::CREATED);
     }
 
-    return pFmt;
+    return pFormat;
 }
 
-SwFmt *SwDoc::_MakeCharFmt(const OUString &rFmtName,
-                            SwFmt *pDerivedFrom,
+SwFormat *SwDoc::_MakeCharFormat(const OUString &rFormatName,
+                            SwFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
-    SwCharFmt *pCharFmt = dynamic_cast<SwCharFmt*>(pDerivedFrom);
-    pCharFmt = MakeCharFmt( rFmtName, pCharFmt, bBroadcast, bAuto );
-    return dynamic_cast<SwFmt*>(pCharFmt);
+    SwCharFormat *pCharFormat = dynamic_cast<SwCharFormat*>(pDerivedFrom);
+    pCharFormat = MakeCharFormat( rFormatName, pCharFormat, bBroadcast, bAuto );
+    return dynamic_cast<SwFormat*>(pCharFormat);
 }
 
 /// Create the FormatCollections
-SwTxtFmtColl* SwDoc::MakeTxtFmtColl( const OUString &rFmtName,
-                                     SwTxtFmtColl *pDerivedFrom,
+SwTextFormatColl* SwDoc::MakeTextFormatColl( const OUString &rFormatName,
+                                     SwTextFormatColl *pDerivedFrom,
                                      bool bBroadcast,
                                      bool )
 {
-    SwTxtFmtColl *pFmtColl = new SwTxtFmtColl( GetAttrPool(), rFmtName,
+    SwTextFormatColl *pFormatColl = new SwTextFormatColl( GetAttrPool(), rFormatName,
                                                 pDerivedFrom );
-    mpTxtFmtCollTbl->push_back(pFmtColl);
-    pFmtColl->SetAuto( false );
+    mpTextFormatCollTable->push_back(pFormatColl);
+    pFormatColl->SetAuto( false );
     getIDocumentState().SetModified();
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndo * pUndo = new SwUndoTxtFmtCollCreate(pFmtColl, pDerivedFrom,
+        SwUndo * pUndo = new SwUndoTextFormatCollCreate(pFormatColl, pDerivedFrom,
                                                     this);
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
     if (bBroadcast)
-        BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_PARA,
+        BroadcastStyleOperation(rFormatName, SFX_STYLE_FAMILY_PARA,
                                 SfxStyleSheetHintId::CREATED);
 
-    return pFmtColl;
+    return pFormatColl;
 }
 
-SwFmt *SwDoc::_MakeTxtFmtColl(const OUString &rFmtName,
-                            SwFmt *pDerivedFrom,
+SwFormat *SwDoc::_MakeTextFormatColl(const OUString &rFormatName,
+                            SwFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
-    SwTxtFmtColl *pTxtFmtColl = dynamic_cast<SwTxtFmtColl*>(pDerivedFrom);
-    pTxtFmtColl = MakeTxtFmtColl( rFmtName, pTxtFmtColl, bBroadcast, bAuto );
-    return dynamic_cast<SwFmt*>(pTxtFmtColl);
+    SwTextFormatColl *pTextFormatColl = dynamic_cast<SwTextFormatColl*>(pDerivedFrom);
+    pTextFormatColl = MakeTextFormatColl( rFormatName, pTextFormatColl, bBroadcast, bAuto );
+    return dynamic_cast<SwFormat*>(pTextFormatColl);
 }
 
 //FEATURE::CONDCOLL
-SwConditionTxtFmtColl* SwDoc::MakeCondTxtFmtColl( const OUString &rFmtName,
-                                                  SwTxtFmtColl *pDerivedFrom,
+SwConditionTextFormatColl* SwDoc::MakeCondTextFormatColl( const OUString &rFormatName,
+                                                  SwTextFormatColl *pDerivedFrom,
                                                   bool bBroadcast)
 {
-    SwConditionTxtFmtColl*pFmtColl = new SwConditionTxtFmtColl( GetAttrPool(),
-                                                    rFmtName, pDerivedFrom );
-    mpTxtFmtCollTbl->push_back(pFmtColl);
-    pFmtColl->SetAuto( false );
+    SwConditionTextFormatColl*pFormatColl = new SwConditionTextFormatColl( GetAttrPool(),
+                                                    rFormatName, pDerivedFrom );
+    mpTextFormatCollTable->push_back(pFormatColl);
+    pFormatColl->SetAuto( false );
     getIDocumentState().SetModified();
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndo * pUndo = new SwUndoCondTxtFmtCollCreate(pFmtColl, pDerivedFrom,
+        SwUndo * pUndo = new SwUndoCondTextFormatCollCreate(pFormatColl, pDerivedFrom,
                                                         this);
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
     if (bBroadcast)
-        BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_PARA,
+        BroadcastStyleOperation(rFormatName, SFX_STYLE_FAMILY_PARA,
                                 SfxStyleSheetHintId::CREATED);
 
-    return pFmtColl;
+    return pFormatColl;
 }
 //FEATURE::CONDCOLL
 
 // GRF
-SwGrfFmtColl* SwDoc::MakeGrfFmtColl( const OUString &rFmtName,
-                                     SwGrfFmtColl *pDerivedFrom )
+SwGrfFormatColl* SwDoc::MakeGrfFormatColl( const OUString &rFormatName,
+                                     SwGrfFormatColl *pDerivedFrom )
 {
-    SwGrfFmtColl *pFmtColl = new SwGrfFmtColl( GetAttrPool(), rFmtName,
+    SwGrfFormatColl *pFormatColl = new SwGrfFormatColl( GetAttrPool(), rFormatName,
                                                 pDerivedFrom );
-    mpGrfFmtCollTbl->push_back( pFmtColl );
-    pFmtColl->SetAuto( false );
+    mpGrfFormatCollTable->push_back( pFormatColl );
+    pFormatColl->SetAuto( false );
     getIDocumentState().SetModified();
-    return pFmtColl;
+    return pFormatColl;
 }
 
-void SwDoc::DelTxtFmtColl(size_t nFmtColl, bool bBroadcast)
+void SwDoc::DelTextFormatColl(size_t nFormatColl, bool bBroadcast)
 {
-    OSL_ENSURE( nFmtColl, "Remove fuer Coll 0." );
+    OSL_ENSURE( nFormatColl, "Remove fuer Coll 0." );
 
     // Who has the to-be-deleted as their Next?
-    SwTxtFmtColl *pDel = (*mpTxtFmtCollTbl)[nFmtColl];
-    if( mpDfltTxtFmtColl == pDel )
+    SwTextFormatColl *pDel = (*mpTextFormatCollTable)[nFormatColl];
+    if( mpDfltTextFormatColl == pDel )
         return;     // never delete default!
 
     if (bBroadcast)
@@ -968,64 +968,64 @@ void SwDoc::DelTxtFmtColl(size_t nFmtColl, bool bBroadcast)
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndoTxtFmtCollDelete * pUndo;
+        SwUndoTextFormatCollDelete * pUndo;
         if (RES_CONDTXTFMTCOLL == pDel->Which())
         {
-            pUndo = new SwUndoCondTxtFmtCollDelete(pDel, this);
+            pUndo = new SwUndoCondTextFormatCollDelete(pDel, this);
         }
         else
         {
-            pUndo = new SwUndoTxtFmtCollDelete(pDel, this);
+            pUndo = new SwUndoTextFormatCollDelete(pDel, this);
         }
 
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
-    // Remove the FmtColl
-    mpTxtFmtCollTbl->erase(mpTxtFmtCollTbl->begin() + nFmtColl);
+    // Remove the FormatColl
+    mpTextFormatCollTable->erase(mpTextFormatCollTable->begin() + nFormatColl);
     // Correct next
-    for( SwTxtFmtColls::const_iterator it = mpTxtFmtCollTbl->begin() + 1; it != mpTxtFmtCollTbl->end(); ++it )
-        SetTxtFmtCollNext( *it, pDel );
+    for( SwTextFormatColls::const_iterator it = mpTextFormatCollTable->begin() + 1; it != mpTextFormatCollTable->end(); ++it )
+        SetTextFormatCollNext( *it, pDel );
     delete pDel;
     getIDocumentState().SetModified();
 }
 
-void SwDoc::DelTxtFmtColl( SwTxtFmtColl *pColl, bool bBroadcast )
+void SwDoc::DelTextFormatColl( SwTextFormatColl *pColl, bool bBroadcast )
 {
-    size_t nFmt = mpTxtFmtCollTbl->GetPos( pColl );
-    OSL_ENSURE( SIZE_MAX != nFmt, "Collection not found," );
-    DelTxtFmtColl( nFmt, bBroadcast );
+    size_t nFormat = mpTextFormatCollTable->GetPos( pColl );
+    OSL_ENSURE( SIZE_MAX != nFormat, "Collection not found," );
+    DelTextFormatColl( nFormat, bBroadcast );
 }
 
-static bool lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
+static bool lcl_SetTextFormatColl( const SwNodePtr& rpNode, void* pArgs )
 {
-    SwCntntNode* pCNd = static_cast<SwCntntNode*>(rpNode->GetTxtNode());
+    SwContentNode* pCNd = static_cast<SwContentNode*>(rpNode->GetTextNode());
 
     if( pCNd == NULL)
         return true;
 
-    sw::DocumentContentOperationsManager::ParaRstFmt* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFmt*>(pArgs);
+    sw::DocumentContentOperationsManager::ParaRstFormat* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFormat*>(pArgs);
 
-    SwTxtFmtColl* pFmt = static_cast<SwTxtFmtColl*>(pPara->pFmtColl);
+    SwTextFormatColl* pFormat = static_cast<SwTextFormatColl*>(pPara->pFormatColl);
     if ( pPara->bReset )
     {
         lcl_RstAttr(pCNd, pPara);
 
         // #i62675# check, if paragraph style has changed
         if ( pPara->bResetListAttrs &&
-             pFmt != pCNd->GetFmtColl() &&
-             pFmt->GetItemState( RES_PARATR_NUMRULE ) == SfxItemState::SET )
+             pFormat != pCNd->GetFormatColl() &&
+             pFormat->GetItemState( RES_PARATR_NUMRULE ) == SfxItemState::SET )
         {
             // Check, if the list style of the paragraph will change.
             bool bChangeOfListStyleAtParagraph( true );
-            SwTxtNode* pTNd( dynamic_cast<SwTxtNode*>(pCNd) );
-            OSL_ENSURE( pTNd, "<lcl_SetTxtFmtColl(..)> - text node expected -> crash" );
+            SwTextNode* pTNd( dynamic_cast<SwTextNode*>(pCNd) );
+            OSL_ENSURE( pTNd, "<lcl_SetTextFormatColl(..)> - text node expected -> crash" );
             {
                 SwNumRule* pNumRuleAtParagraph( pTNd->GetNumRule() );
                 if ( pNumRuleAtParagraph )
                 {
                     const SwNumRuleItem& rNumRuleItemAtParagraphStyle =
-                        pFmt->GetNumRule();
+                        pFormat->GetNumRule();
                     if ( rNumRuleItemAtParagraphStyle.GetValue() ==
                             pNumRuleAtParagraph->GetName() )
                     {
@@ -1056,18 +1056,18 @@ static bool lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
 
     // add to History so that old data is saved, if necessary
     if( pPara->pHistory )
-        pPara->pHistory->Add( pCNd->GetFmtColl(), pCNd->GetIndex(),
+        pPara->pHistory->Add( pCNd->GetFormatColl(), pCNd->GetIndex(),
                 ND_TEXTNODE );
 
-    pCNd->ChgFmtColl( pFmt );
+    pCNd->ChgFormatColl( pFormat );
 
     pPara->nWhich++;
 
     return true;
 }
 
-bool SwDoc::SetTxtFmtColl(const SwPaM &rRg,
-                          SwTxtFmtColl *pFmt,
+bool SwDoc::SetTextFormatColl(const SwPaM &rRg,
+                          SwTextFormatColl *pFormat,
                           const bool bReset,
                           const bool bResetListAttrs)
 {
@@ -1078,21 +1078,21 @@ bool SwDoc::SetTxtFmtColl(const SwPaM &rRg,
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        SwUndoFmtColl* pUndo = new SwUndoFmtColl( rRg, pFmt,
+        SwUndoFormatColl* pUndo = new SwUndoFormatColl( rRg, pFormat,
                                                   bReset,
                                                   bResetListAttrs );
         pHst = pUndo->GetHistory();
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
-    sw::DocumentContentOperationsManager::ParaRstFmt aPara( pStt, pEnd, pHst );
-    aPara.pFmtColl = pFmt;
+    sw::DocumentContentOperationsManager::ParaRstFormat aPara( pStt, pEnd, pHst );
+    aPara.pFormatColl = pFormat;
     aPara.bReset = bReset;
     // #i62675#
     aPara.bResetListAttrs = bResetListAttrs;
 
     GetNodes().ForEach( pStt->nNode.GetIndex(), pEnd->nNode.GetIndex()+1,
-                        lcl_SetTxtFmtColl, &aPara );
+                        lcl_SetTextFormatColl, &aPara );
     if( !aPara.nWhich )
         bRet = false;           // didn't find a valid Node
 
@@ -1105,98 +1105,98 @@ bool SwDoc::SetTxtFmtColl(const SwPaM &rRg,
 }
 
 /// Copy the formats to itself
-SwFmt* SwDoc::CopyFmt( const SwFmt& rFmt,
-                        const SwFmtsBase& rFmtArr,
-                        FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt )
+SwFormat* SwDoc::CopyFormat( const SwFormat& rFormat,
+                        const SwFormatsBase& rFormatArr,
+                        FNCopyFormat fnCopyFormat, const SwFormat& rDfltFormat )
 {
     // It's no autoformat, default format or collection format,
     // then search for it.
-    if( !rFmt.IsAuto() || !rFmt.GetRegisteredIn() )
-        for( size_t n = 0; n < rFmtArr.GetFmtCount(); ++n )
+    if( !rFormat.IsAuto() || !rFormat.GetRegisteredIn() )
+        for( size_t n = 0; n < rFormatArr.GetFormatCount(); ++n )
         {
             // Does the Doc already contain the template?
-            if( rFmtArr.GetFmt(n)->GetName()==rFmt.GetName() )
-                return rFmtArr.GetFmt(n);
+            if( rFormatArr.GetFormat(n)->GetName()==rFormat.GetName() )
+                return rFormatArr.GetFormat(n);
         }
 
     // Search for the "parent" first
-    SwFmt* pParent = const_cast<SwFmt*>(&rDfltFmt);
-    if( rFmt.DerivedFrom() && pParent != rFmt.DerivedFrom() )
-        pParent = CopyFmt( *rFmt.DerivedFrom(), rFmtArr,
-                                fnCopyFmt, rDfltFmt );
+    SwFormat* pParent = const_cast<SwFormat*>(&rDfltFormat);
+    if( rFormat.DerivedFrom() && pParent != rFormat.DerivedFrom() )
+        pParent = CopyFormat( *rFormat.DerivedFrom(), rFormatArr,
+                                fnCopyFormat, rDfltFormat );
 
     // Create the format and copy the attributes
     // #i40550#
-    SwFmt* pNewFmt = (this->*fnCopyFmt)( rFmt.GetName(), pParent, false, true );
-    pNewFmt->SetAuto( rFmt.IsAuto() );
-    pNewFmt->CopyAttrs( rFmt, true );           // copy the attributes
+    SwFormat* pNewFormat = (this->*fnCopyFormat)( rFormat.GetName(), pParent, false, true );
+    pNewFormat->SetAuto( rFormat.IsAuto() );
+    pNewFormat->CopyAttrs( rFormat, true );           // copy the attributes
 
-    pNewFmt->SetPoolFmtId( rFmt.GetPoolFmtId() );
-    pNewFmt->SetPoolHelpId( rFmt.GetPoolHelpId() );
+    pNewFormat->SetPoolFormatId( rFormat.GetPoolFormatId() );
+    pNewFormat->SetPoolHelpId( rFormat.GetPoolHelpId() );
 
     // Always set the HelpFile Id to default!
-    pNewFmt->SetPoolHlpFileId( UCHAR_MAX );
+    pNewFormat->SetPoolHlpFileId( UCHAR_MAX );
 
-    return pNewFmt;
+    return pNewFormat;
 }
 
 /// copy the frame format
-SwFrmFmt* SwDoc::CopyFrmFmt( const SwFrmFmt& rFmt )
+SwFrameFormat* SwDoc::CopyFrameFormat( const SwFrameFormat& rFormat )
 {
-    return static_cast<SwFrmFmt*>(CopyFmt( rFmt, *GetFrmFmts(), &SwDoc::_MakeFrmFmt,
-                                *GetDfltFrmFmt() ));
+    return static_cast<SwFrameFormat*>(CopyFormat( rFormat, *GetFrameFormats(), &SwDoc::_MakeFrameFormat,
+                                *GetDfltFrameFormat() ));
 }
 
 /// copy the char format
-SwCharFmt* SwDoc::CopyCharFmt( const SwCharFmt& rFmt )
+SwCharFormat* SwDoc::CopyCharFormat( const SwCharFormat& rFormat )
 {
-    return static_cast<SwCharFmt*>(CopyFmt( rFmt, *GetCharFmts(),
-                                            &SwDoc::_MakeCharFmt,
-                                            *GetDfltCharFmt() ));
+    return static_cast<SwCharFormat*>(CopyFormat( rFormat, *GetCharFormats(),
+                                            &SwDoc::_MakeCharFormat,
+                                            *GetDfltCharFormat() ));
 }
 
 /// copy TextNodes
-SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
+SwTextFormatColl* SwDoc::CopyTextColl( const SwTextFormatColl& rColl )
 {
-    SwTxtFmtColl* pNewColl = FindTxtFmtCollByName( rColl.GetName() );
+    SwTextFormatColl* pNewColl = FindTextFormatCollByName( rColl.GetName() );
     if( pNewColl )
         return pNewColl;
 
     // search for the "parent" first
-    SwTxtFmtColl* pParent = mpDfltTxtFmtColl;
+    SwTextFormatColl* pParent = mpDfltTextFormatColl;
     if( pParent != rColl.DerivedFrom() )
-        pParent = CopyTxtColl( *static_cast<SwTxtFmtColl*>(rColl.DerivedFrom()) );
+        pParent = CopyTextColl( *static_cast<SwTextFormatColl*>(rColl.DerivedFrom()) );
 
 //FEATURE::CONDCOLL
     if( RES_CONDTXTFMTCOLL == rColl.Which() )
     {
-        pNewColl = new SwConditionTxtFmtColl( GetAttrPool(), rColl.GetName(),
+        pNewColl = new SwConditionTextFormatColl( GetAttrPool(), rColl.GetName(),
                                                 pParent);
-        mpTxtFmtCollTbl->push_back( pNewColl );
+        mpTextFormatCollTable->push_back( pNewColl );
         pNewColl->SetAuto( false );
         getIDocumentState().SetModified();
 
         // copy the conditions
-        static_cast<SwConditionTxtFmtColl*>(pNewColl)->SetConditions(
-                            static_cast<const SwConditionTxtFmtColl&>(rColl).GetCondColls() );
+        static_cast<SwConditionTextFormatColl*>(pNewColl)->SetConditions(
+                            static_cast<const SwConditionTextFormatColl&>(rColl).GetCondColls() );
     }
     else
 //FEATURE::CONDCOLL
-        pNewColl = MakeTxtFmtColl( rColl.GetName(), pParent );
+        pNewColl = MakeTextFormatColl( rColl.GetName(), pParent );
 
     // copy the auto formats or the attributes
     pNewColl->CopyAttrs( rColl, true );
 
     if(rColl.IsAssignedToListLevelOfOutlineStyle())
         pNewColl->AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel());
-    pNewColl->SetPoolFmtId( rColl.GetPoolFmtId() );
+    pNewColl->SetPoolFormatId( rColl.GetPoolFormatId() );
     pNewColl->SetPoolHelpId( rColl.GetPoolHelpId() );
 
     // Always set the HelpFile Id to default!
     pNewColl->SetPoolHlpFileId( UCHAR_MAX );
 
-    if( &rColl.GetNextTxtFmtColl() != &rColl )
-        pNewColl->SetNextTxtFmtColl( *CopyTxtColl( rColl.GetNextTxtFmtColl() ));
+    if( &rColl.GetNextTextFormatColl() != &rColl )
+        pNewColl->SetNextTextFormatColl( *CopyTextColl( rColl.GetNextTextFormatColl() ));
 
     // create the NumRule if necessary
     if( this != rColl.GetDoc() )
@@ -1223,24 +1223,24 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
 }
 
 /// copy the graphic nodes
-SwGrfFmtColl* SwDoc::CopyGrfColl( const SwGrfFmtColl& rColl )
+SwGrfFormatColl* SwDoc::CopyGrfColl( const SwGrfFormatColl& rColl )
 {
-    SwGrfFmtColl* pNewColl = FindGrfFmtCollByName( rColl.GetName() );
+    SwGrfFormatColl* pNewColl = FindGrfFormatCollByName( rColl.GetName() );
     if( pNewColl )
         return pNewColl;
 
      // Search for the "parent" first
-    SwGrfFmtColl* pParent = mpDfltGrfFmtColl;
+    SwGrfFormatColl* pParent = mpDfltGrfFormatColl;
     if( pParent != rColl.DerivedFrom() )
-        pParent = CopyGrfColl( *static_cast<SwGrfFmtColl*>(rColl.DerivedFrom()) );
+        pParent = CopyGrfColl( *static_cast<SwGrfFormatColl*>(rColl.DerivedFrom()) );
 
     // if not, copy them
-    pNewColl = MakeGrfFmtColl( rColl.GetName(), pParent );
+    pNewColl = MakeGrfFormatColl( rColl.GetName(), pParent );
 
     // copy the attributes
     pNewColl->CopyAttrs( rColl );
 
-    pNewColl->SetPoolFmtId( rColl.GetPoolFmtId() );
+    pNewColl->SetPoolFormatId( rColl.GetPoolFormatId() );
     pNewColl->SetPoolHelpId( rColl.GetPoolHelpId() );
 
     // Always set the HelpFile Id to default!
@@ -1249,49 +1249,49 @@ SwGrfFmtColl* SwDoc::CopyGrfColl( const SwGrfFmtColl& rColl )
     return pNewColl;
 }
 
-void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr,
-                        SwFmtsBase& rDestArr,
-                        FNCopyFmt fnCopyFmt,
-                        SwFmt& rDfltFmt )
+void SwDoc::CopyFormatArr( const SwFormatsBase& rSourceArr,
+                        SwFormatsBase& rDestArr,
+                        FNCopyFormat fnCopyFormat,
+                        SwFormat& rDfltFormat )
 {
-    SwFmt* pSrc, *pDest;
+    SwFormat* pSrc, *pDest;
 
     // 1st step: Create all formats (skip the 0th - it's the default one)
-    for( size_t nSrc = rSourceArr.GetFmtCount(); nSrc > 1; )
+    for( size_t nSrc = rSourceArr.GetFormatCount(); nSrc > 1; )
     {
-        pSrc = rSourceArr.GetFmt( --nSrc );
+        pSrc = rSourceArr.GetFormat( --nSrc );
         if( pSrc->IsDefault() || pSrc->IsAuto() )
             continue;
 
-        if( 0 == FindFmtByName( rDestArr, pSrc->GetName() ) )
+        if( 0 == FindFormatByName( rDestArr, pSrc->GetName() ) )
         {
             if( RES_CONDTXTFMTCOLL == pSrc->Which() )
-                MakeCondTxtFmtColl( pSrc->GetName(), static_cast<SwTxtFmtColl*>(&rDfltFmt) );
+                MakeCondTextFormatColl( pSrc->GetName(), static_cast<SwTextFormatColl*>(&rDfltFormat) );
             else
                 // #i40550#
-                (this->*fnCopyFmt)( pSrc->GetName(), &rDfltFmt, false, true );
+                (this->*fnCopyFormat)( pSrc->GetName(), &rDfltFormat, false, true );
         }
     }
 
     // 2nd step: Copy all attributes, set the right parents
-    for( size_t nSrc = rSourceArr.GetFmtCount(); nSrc > 1; )
+    for( size_t nSrc = rSourceArr.GetFormatCount(); nSrc > 1; )
     {
-        pSrc = rSourceArr.GetFmt( --nSrc );
+        pSrc = rSourceArr.GetFormat( --nSrc );
         if( pSrc->IsDefault() || pSrc->IsAuto() )
             continue;
 
-        pDest = FindFmtByName( rDestArr, pSrc->GetName() );
+        pDest = FindFormatByName( rDestArr, pSrc->GetName() );
         pDest->SetAuto( false );
         pDest->DelDiffs( *pSrc );
 
-        // #i94285#: existing <SwFmtPageDesc> instance, before copying attributes
+        // #i94285#: existing <SwFormatPageDesc> instance, before copying attributes
         const SfxPoolItem* pItem;
         if( &GetAttrPool() != pSrc->GetAttrSet().GetPool() &&
             SfxItemState::SET == pSrc->GetAttrSet().GetItemState(
             RES_PAGEDESC, false, &pItem ) &&
-            static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc() )
+            static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc() )
         {
-            SwFmtPageDesc aPageDesc( *static_cast<const SwFmtPageDesc*>(pItem) );
+            SwFormatPageDesc aPageDesc( *static_cast<const SwFormatPageDesc*>(pItem) );
             const OUString& rNm = aPageDesc.GetPageDesc()->GetName();
             SwPageDesc* pPageDesc = FindPageDesc( rNm );
             if( !pPageDesc )
@@ -1301,30 +1301,30 @@ void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr,
             aPageDesc.RegisterToPageDesc( *pPageDesc );
             SwAttrSet aTmpAttrSet( pSrc->GetAttrSet() );
             aTmpAttrSet.Put( aPageDesc );
-            pDest->SetFmtAttr( aTmpAttrSet );
+            pDest->SetFormatAttr( aTmpAttrSet );
         }
         else
         {
-            pDest->SetFmtAttr( pSrc->GetAttrSet() );
+            pDest->SetFormatAttr( pSrc->GetAttrSet() );
         }
 
-        pDest->SetPoolFmtId( pSrc->GetPoolFmtId() );
+        pDest->SetPoolFormatId( pSrc->GetPoolFormatId() );
         pDest->SetPoolHelpId( pSrc->GetPoolHelpId() );
 
         // Always set the HelpFile Id to default!
         pDest->SetPoolHlpFileId( UCHAR_MAX );
 
         if( pSrc->DerivedFrom() )
-            pDest->SetDerivedFrom( FindFmtByName( rDestArr,
+            pDest->SetDerivedFrom( FindFormatByName( rDestArr,
                                         pSrc->DerivedFrom()->GetName() ) );
         if( RES_TXTFMTCOLL == pSrc->Which() ||
             RES_CONDTXTFMTCOLL == pSrc->Which() )
         {
-            SwTxtFmtColl* pSrcColl = static_cast<SwTxtFmtColl*>(pSrc),
-                        * pDstColl = static_cast<SwTxtFmtColl*>(pDest);
-            if( &pSrcColl->GetNextTxtFmtColl() != pSrcColl )
-                pDstColl->SetNextTxtFmtColl( *static_cast<SwTxtFmtColl*>(FindFmtByName(
-                    rDestArr, pSrcColl->GetNextTxtFmtColl().GetName() ) ) );
+            SwTextFormatColl* pSrcColl = static_cast<SwTextFormatColl*>(pSrc),
+                        * pDstColl = static_cast<SwTextFormatColl*>(pDest);
+            if( &pSrcColl->GetNextTextFormatColl() != pSrcColl )
+                pDstColl->SetNextTextFormatColl( *static_cast<SwTextFormatColl*>(FindFormatByName(
+                    rDestArr, pSrcColl->GetNextTextFormatColl().GetName() ) ) );
 
             if(pSrcColl->IsAssignedToListLevelOfOutlineStyle())
                 pDstColl->AssignToListLevelOfOutlineStyle(pSrcColl->GetAssignedOutlineStyleLevel());
@@ -1332,66 +1332,66 @@ void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr,
 //FEATURE::CONDCOLL
             if( RES_CONDTXTFMTCOLL == pSrc->Which() )
                 // Copy the conditions, but delete the old ones first!
-                static_cast<SwConditionTxtFmtColl*>(pDstColl)->SetConditions(
-                            static_cast<SwConditionTxtFmtColl*>(pSrc)->GetCondColls() );
+                static_cast<SwConditionTextFormatColl*>(pDstColl)->SetConditions(
+                            static_cast<SwConditionTextFormatColl*>(pSrc)->GetCondColls() );
 //FEATURE::CONDCOLL
         }
     }
 }
 
 void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader,
-                                const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
+                                const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat )
 {
     // Treat the header and footer attributes in the right way:
     // Copy content nodes across documents!
     sal_uInt16 nAttr = static_cast<sal_uInt16>( bCpyHeader ? RES_HEADER : RES_FOOTER );
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET != rSrcFmt.GetAttrSet().GetItemState( nAttr, false, &pItem ))
+    if( SfxItemState::SET != rSrcFormat.GetAttrSet().GetItemState( nAttr, false, &pItem ))
         return ;
 
     // The header only contains the reference to the format from the other document!
     SfxPoolItem* pNewItem = pItem->Clone();
 
-    SwFrmFmt* pOldFmt;
+    SwFrameFormat* pOldFormat;
     if( bCpyHeader )
-         pOldFmt = static_cast<SwFmtHeader*>(pNewItem)->GetHeaderFmt();
+         pOldFormat = static_cast<SwFormatHeader*>(pNewItem)->GetHeaderFormat();
     else
-         pOldFmt = static_cast<SwFmtFooter*>(pNewItem)->GetFooterFmt();
+         pOldFormat = static_cast<SwFormatFooter*>(pNewItem)->GetFooterFormat();
 
-    if( pOldFmt )
+    if( pOldFormat )
     {
-        SwFrmFmt* pNewFmt = new SwFrmFmt( GetAttrPool(), "CpyDesc",
-                                            GetDfltFrmFmt() );
-        pNewFmt->CopyAttrs( *pOldFmt, true );
+        SwFrameFormat* pNewFormat = new SwFrameFormat( GetAttrPool(), "CpyDesc",
+                                            GetDfltFrameFormat() );
+        pNewFormat->CopyAttrs( *pOldFormat, true );
 
-        if( SfxItemState::SET == pNewFmt->GetAttrSet().GetItemState(
+        if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState(
             RES_CNTNT, false, &pItem ))
         {
-            const SwFmtCntnt* pCntnt = static_cast<const SwFmtCntnt*>(pItem);
-            if( pCntnt->GetCntntIdx() )
+            const SwFormatContent* pContent = static_cast<const SwFormatContent*>(pItem);
+            if( pContent->GetContentIdx() )
             {
                 SwNodeIndex aTmpIdx( GetNodes().GetEndOfAutotext() );
-                const SwNodes& rSrcNds = rSrcFmt.GetDoc()->GetNodes();
+                const SwNodes& rSrcNds = rSrcFormat.GetDoc()->GetNodes();
                 SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmpIdx,
                                                 bCpyHeader
                                                     ? SwHeaderStartNode
                                                     : SwFooterStartNode );
-                const SwNode& rCSttNd = pCntnt->GetCntntIdx()->GetNode();
+                const SwNode& rCSttNd = pContent->GetContentIdx()->GetNode();
                 SwNodeRange aRg( rCSttNd, 0, *rCSttNd.EndOfSectionNode() );
                 aTmpIdx = *pSttNd->EndOfSectionNode();
                 rSrcNds._Copy( aRg, aTmpIdx );
                 aTmpIdx = *pSttNd;
-                rSrcFmt.GetDoc()->GetDocumentContentOperationsManager().CopyFlyInFlyImpl( aRg, 0, aTmpIdx );
-                pNewFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
+                rSrcFormat.GetDoc()->GetDocumentContentOperationsManager().CopyFlyInFlyImpl( aRg, 0, aTmpIdx );
+                pNewFormat->SetFormatAttr( SwFormatContent( pSttNd ));
             }
             else
-                pNewFmt->ResetFmtAttr( RES_CNTNT );
+                pNewFormat->ResetFormatAttr( RES_CNTNT );
         }
         if( bCpyHeader )
-            static_cast<SwFmtHeader*>(pNewItem)->RegisterToFormat(*pNewFmt);
+            static_cast<SwFormatHeader*>(pNewItem)->RegisterToFormat(*pNewFormat);
         else
-            static_cast<SwFmtFooter*>(pNewItem)->RegisterToFormat(*pNewFmt);
-        rDestFmt.SetFmtAttr( *pNewItem );
+            static_cast<SwFormatFooter*>(pNewItem)->RegisterToFormat(*pNewFormat);
+        rDestFormat.SetFormatAttr( *pNewItem );
     }
     delete pNewItem;
 }
@@ -1412,7 +1412,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
 
     if( bCopyPoolIds )
     {
-        rDstDesc.SetPoolFmtId( rSrcDesc.GetPoolFmtId() );
+        rDstDesc.SetPoolFormatId( rSrcDesc.GetPoolFormatId() );
         rDstDesc.SetPoolHelpId( rSrcDesc.GetPoolHelpId() );
         // Always set the HelpFile Id to default!
         rDstDesc.SetPoolHlpFileId( UCHAR_MAX );
@@ -1440,7 +1440,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
         aAttrSet.ClearItem( RES_FOOTER );
 
         rDstDesc.GetMaster().DelDiffs( aAttrSet );
-        rDstDesc.GetMaster().SetFmtAttr( aAttrSet );
+        rDstDesc.GetMaster().SetFormatAttr( aAttrSet );
 
         aAttrSet.ClearItem();
         aAttrSet.Put( rSrcDesc.GetLeft().GetAttrSet() );
@@ -1448,7 +1448,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
         aAttrSet.ClearItem( RES_FOOTER );
 
         rDstDesc.GetLeft().DelDiffs( aAttrSet );
-        rDstDesc.GetLeft().SetFmtAttr( aAttrSet );
+        rDstDesc.GetLeft().SetFormatAttr( aAttrSet );
 
         aAttrSet.ClearItem();
         aAttrSet.Put( rSrcDesc.GetFirstMaster().GetAttrSet() );
@@ -1456,7 +1456,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
         aAttrSet.ClearItem( RES_FOOTER );
 
         rDstDesc.GetFirstMaster().DelDiffs( aAttrSet );
-        rDstDesc.GetFirstMaster().SetFmtAttr( aAttrSet );
+        rDstDesc.GetFirstMaster().SetFormatAttr( aAttrSet );
 
         aAttrSet.ClearItem();
         aAttrSet.Put( rSrcDesc.GetFirstLeft().GetAttrSet() );
@@ -1464,7 +1464,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
         aAttrSet.ClearItem( RES_FOOTER );
 
         rDstDesc.GetFirstLeft().DelDiffs( aAttrSet );
-        rDstDesc.GetFirstLeft().SetFmtAttr( aAttrSet );
+        rDstDesc.GetFirstLeft().SetFormatAttr( aAttrSet );
     }
 
     CopyHeader( rSrcDesc.GetMaster(), rDstDesc.GetMaster() );
@@ -1472,31 +1472,31 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
     if( !rDstDesc.IsHeaderShared() )
         CopyHeader( rSrcDesc.GetLeft(), rDstDesc.GetLeft() );
     else
-        rDstDesc.GetLeft().SetFmtAttr( rDstDesc.GetMaster().GetHeader() );
+        rDstDesc.GetLeft().SetFormatAttr( rDstDesc.GetMaster().GetHeader() );
     if( !rDstDesc.IsFirstShared() )
     {
         CopyHeader( rSrcDesc.GetFirstMaster(), rDstDesc.GetFirstMaster() );
-        rDstDesc.GetFirstLeft().SetFmtAttr(rDstDesc.GetFirstMaster().GetHeader());
+        rDstDesc.GetFirstLeft().SetFormatAttr(rDstDesc.GetFirstMaster().GetHeader());
     }
     else
     {
-        rDstDesc.GetFirstMaster().SetFmtAttr( rDstDesc.GetMaster().GetHeader() );
-        rDstDesc.GetFirstLeft().SetFmtAttr(rDstDesc.GetLeft().GetHeader());
+        rDstDesc.GetFirstMaster().SetFormatAttr( rDstDesc.GetMaster().GetHeader() );
+        rDstDesc.GetFirstLeft().SetFormatAttr(rDstDesc.GetLeft().GetHeader());
     }
 
     if( !rDstDesc.IsFooterShared() )
         CopyFooter( rSrcDesc.GetLeft(), rDstDesc.GetLeft() );
     else
-        rDstDesc.GetLeft().SetFmtAttr( rDstDesc.GetMaster().GetFooter() );
+        rDstDesc.GetLeft().SetFormatAttr( rDstDesc.GetMaster().GetFooter() );
     if( !rDstDesc.IsFirstShared() )
     {
         CopyFooter( rSrcDesc.GetFirstMaster(), rDstDesc.GetFirstMaster() );
-        rDstDesc.GetFirstLeft().SetFmtAttr(rDstDesc.GetFirstMaster().GetFooter());
+        rDstDesc.GetFirstLeft().SetFormatAttr(rDstDesc.GetFirstMaster().GetFooter());
     }
     else
     {
-        rDstDesc.GetFirstMaster().SetFmtAttr( rDstDesc.GetMaster().GetFooter() );
-        rDstDesc.GetFirstLeft().SetFmtAttr(rDstDesc.GetLeft().GetFooter());
+        rDstDesc.GetFirstMaster().SetFormatAttr( rDstDesc.GetMaster().GetFooter() );
+        rDstDesc.GetFirstLeft().SetFormatAttr(rDstDesc.GetLeft().GetFooter());
     }
 
     if( bNotifyLayout && pTmpRoot )
@@ -1506,10 +1506,10 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
     }
 
     // If foot notes change the pages have to be triggered
-    if( !(rDstDesc.GetFtnInfo() == rSrcDesc.GetFtnInfo()) )
+    if( !(rDstDesc.GetFootnoteInfo() == rSrcDesc.GetFootnoteInfo()) )
     {
         sw::PageFootnoteHint aHint;
-        rDstDesc.SetFtnInfo( rSrcDesc.GetFtnInfo() );
+        rDstDesc.SetFootnoteInfo( rSrcDesc.GetFootnoteInfo() );
         rDstDesc.GetMaster().CallSwClientNotify(aHint);
         rDstDesc.GetLeft().CallSwClientNotify(aHint);
         rDstDesc.GetFirstMaster().CallSwClientNotify(aHint);
@@ -1521,12 +1521,12 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
 {
     ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-    CopyFmtArr( *rSource.mpCharFmtTbl, *mpCharFmtTbl,
-                &SwDoc::_MakeCharFmt, *mpDfltCharFmt );
-    CopyFmtArr( *rSource.mpFrmFmtTbl, *mpFrmFmtTbl,
-                &SwDoc::_MakeFrmFmt, *mpDfltFrmFmt );
-    CopyFmtArr( *rSource.mpTxtFmtCollTbl, *mpTxtFmtCollTbl,
-                &SwDoc::_MakeTxtFmtColl, *mpDfltTxtFmtColl );
+    CopyFormatArr( *rSource.mpCharFormatTable, *mpCharFormatTable,
+                &SwDoc::_MakeCharFormat, *mpDfltCharFormat );
+    CopyFormatArr( *rSource.mpFrameFormatTable, *mpFrameFormatTable,
+                &SwDoc::_MakeFrameFormat, *mpDfltFrameFormat );
+    CopyFormatArr( *rSource.mpTextFormatCollTable, *mpTextFormatCollTable,
+                &SwDoc::_MakeTextFormatColl, *mpDfltTextFormatColl );
 
     //To-Do:
     //  a) in rtf export don't export our hideous pgdsctbl
@@ -1542,7 +1542,7 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
         if( nCnt )
         {
             // a different Doc -> Number formatter needs to be merged
-            SwTblNumFmtMerge aTNFM( rSource, *this );
+            SwTableNumFormatMerge aTNFM( rSource, *this );
 
             // 1st step: Create all formats (skip the 0th - it's the default!)
             while( nCnt )
@@ -1563,10 +1563,10 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
     }
 
     // then there are the numbering templates
-    const SwPageDescs::size_type nCnt = rSource.GetNumRuleTbl().size();
+    const SwPageDescs::size_type nCnt = rSource.GetNumRuleTable().size();
     if( nCnt )
     {
-        const SwNumRuleTbl& rArr = rSource.GetNumRuleTbl();
+        const SwNumRuleTable& rArr = rSource.GetNumRuleTable();
         for( SwPageDescs::size_type n = 0; n < nCnt; ++n )
         {
             const SwNumRule& rR = *rArr[ n ];
@@ -1598,16 +1598,16 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
     getIDocumentState().SetModified();
 }
 
-SwFmt* SwDoc::FindFmtByName( const SwFmtsBase& rFmtArr,
+SwFormat* SwDoc::FindFormatByName( const SwFormatsBase& rFormatArr,
                              const OUString& rName )
 {
-    SwFmt* pFnd = 0;
-    for( size_t n = 0; n < rFmtArr.GetFmtCount(); ++n )
+    SwFormat* pFnd = 0;
+    for( size_t n = 0; n < rFormatArr.GetFormatCount(); ++n )
     {
         // Does the Doc already contain the template?
-        if( rFmtArr.GetFmt(n)->GetName() == rName )
+        if( rFormatArr.GetFormat(n)->GetName() == rName )
         {
-            pFnd = rFmtArr.GetFmt(n);
+            pFnd = rFormatArr.GetFormat(n);
             break;
         }
     }
@@ -1631,10 +1631,10 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus )
     SwNodeIndex aIdx( rStt.nNode );
     while( aIdx <= rEnd.nNode )
     {
-        SwTxtNode* pTNd = aIdx.GetNode().GetTxtNode();
+        SwTextNode* pTNd = aIdx.GetNode().GetTextNode();
         if( pTNd )
         {
-            SvxLRSpaceItem aLS( static_cast<const SvxLRSpaceItem&>(pTNd->SwCntntNode::GetAttr( RES_LR_SPACE )) );
+            SvxLRSpaceItem aLS( static_cast<const SvxLRSpaceItem&>(pTNd->SwContentNode::GetAttr( RES_LR_SPACE )) );
 
             // #i93873# See also lcl_MergeListLevelIndentAsLRSpaceItem in thints.cxx
             if ( pTNd->AreListLevelIndentsApplicable() )
@@ -1645,17 +1645,17 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus )
                     const int nListLevel = pTNd->GetActualListLevel();
                     if ( nListLevel >= 0 )
                     {
-                        const SwNumFmt& rFmt = pRule->Get(static_cast<sal_uInt16>(nListLevel));
-                        if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+                        const SwNumFormat& rFormat = pRule->Get(static_cast<sal_uInt16>(nListLevel));
+                        if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
                         {
-                            aLS.SetTxtLeft( rFmt.GetIndentAt() );
-                            aLS.SetTxtFirstLineOfst( static_cast<short>(rFmt.GetFirstLineIndent()) );
+                            aLS.SetTextLeft( rFormat.GetIndentAt() );
+                            aLS.SetTextFirstLineOfst( static_cast<short>(rFormat.GetFirstLineIndent()) );
                         }
                     }
                 }
             }
 
-            long nNext = aLS.GetTxtLeft();
+            long nNext = aLS.GetTextLeft();
             if( bModulus )
                 nNext = ( nNext / nDefDist ) * nDefDist;
 
@@ -1665,7 +1665,7 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus )
                 if(nNext >0) // fdo#75936 set limit for decreasing indent
                     nNext -= nDefDist;
 
-            aLS.SetTxtLeft( nNext );
+            aLS.SetTextLeft( nNext );
 
             SwRegHistory aRegH( pTNd, *pTNd, pHistory );
             pTNd->SetAttr( aLS );
@@ -1675,35 +1675,35 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus )
     getIDocumentState().SetModified();
 }
 
-bool SwDoc::DontExpandFmt( const SwPosition& rPos, bool bFlag )
+bool SwDoc::DontExpandFormat( const SwPosition& rPos, bool bFlag )
 {
     bool bRet = false;
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( pTxtNd )
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( pTextNd )
     {
-        bRet = pTxtNd->DontExpandFmt( rPos.nContent, bFlag );
+        bRet = pTextNd->DontExpandFormat( rPos.nContent, bFlag );
         if( bRet && GetIDocumentUndoRedo().DoesUndo() )
         {
-            GetIDocumentUndoRedo().AppendUndo( new SwUndoDontExpandFmt(rPos) );
+            GetIDocumentUndoRedo().AppendUndo( new SwUndoDontExpandFormat(rPos) );
         }
     }
     return bRet;
 }
 
-SwTableBoxFmt* SwDoc::MakeTableBoxFmt()
+SwTableBoxFormat* SwDoc::MakeTableBoxFormat()
 {
-    SwTableBoxFmt* pFmt = new SwTableBoxFmt( GetAttrPool(), aEmptyOUStr,
-                                                mpDfltFrmFmt );
+    SwTableBoxFormat* pFormat = new SwTableBoxFormat( GetAttrPool(), aEmptyOUStr,
+                                                mpDfltFrameFormat );
     getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
-SwTableLineFmt* SwDoc::MakeTableLineFmt()
+SwTableLineFormat* SwDoc::MakeTableLineFormat()
 {
-    SwTableLineFmt* pFmt = new SwTableLineFmt( GetAttrPool(), aEmptyOUStr,
-                                                mpDfltFrmFmt );
+    SwTableLineFormat* pFormat = new SwTableLineFormat( GetAttrPool(), aEmptyOUStr,
+                                                mpDfltFrameFormat );
     getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
 void SwDoc::_CreateNumberFormatter()
@@ -1717,43 +1717,43 @@ void SwDoc::_CreateNumberFormatter()
     mpNumberFormatter->SetYear2000(static_cast<sal_uInt16>(::utl::MiscCfg().GetYear2000()));
 }
 
-SwTblNumFmtMerge::SwTblNumFmtMerge( const SwDoc& rSrc, SwDoc& rDest )
-    : pNFmt( 0 )
+SwTableNumFormatMerge::SwTableNumFormatMerge( const SwDoc& rSrc, SwDoc& rDest )
+    : pNFormat( 0 )
 {
     // a different Doc -> Number formatter needs to be merged
     SvNumberFormatter* pN;
     if( &rSrc != &rDest && 0 != ( pN = const_cast<SwDoc&>(rSrc).GetNumberFormatter( false ) ))
-        ( pNFmt = rDest.GetNumberFormatter( true ))->MergeFormatter( *pN );
+        ( pNFormat = rDest.GetNumberFormatter( true ))->MergeFormatter( *pN );
 
     if( &rSrc != &rDest )
-        static_cast<SwGetRefFieldType*>(rSrc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD ))->
+        static_cast<SwGetRefFieldType*>(rSrc.getIDocumentFieldsAccess().GetSysFieldType( RES_GETREFFLD ))->
             MergeWithOtherDoc( rDest );
 }
 
-SwTblNumFmtMerge::~SwTblNumFmtMerge()
+SwTableNumFormatMerge::~SwTableNumFormatMerge()
 {
-    if( pNFmt )
-        pNFmt->ClearMergeTable();
+    if( pNFormat )
+        pNFormat->ClearMergeTable();
 }
 
-void SwDoc::SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId,
+void SwDoc::SetTextFormatCollByAutoFormat( const SwPosition& rPos, sal_uInt16 nPoolId,
                                     const SfxItemSet* pSet )
 {
     SwPaM aPam( rPos );
-    SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
     assert(pTNd);
 
-    if (mbIsAutoFmtRedline)
+    if (mbIsAutoFormatRedline)
     {
         // create the redline object
-        const SwTxtFmtColl& rColl = *pTNd->GetTxtColl();
+        const SwTextFormatColl& rColl = *pTNd->GetTextColl();
         SwRangeRedline* pRedl = new SwRangeRedline( nsRedlineType_t::REDLINE_FMTCOLL, aPam );
         pRedl->SetMark();
 
         // Only those items that are not set by the Set again in the Node
         // are of interest. Thus, we take the difference.
-        SwRedlineExtraData_FmtColl aExtraData( rColl.GetName(),
-                                                rColl.GetPoolFmtId() );
+        SwRedlineExtraData_FormatColl aExtraData( rColl.GetName(),
+                                                rColl.GetPoolFormatId() );
         if( pSet && pTNd->HasSwAttrSet() )
         {
             SfxItemSet aTmp( *pTNd->GetpSwAttrSet() );
@@ -1771,24 +1771,24 @@ void SwDoc::SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId,
         getIDocumentRedlineAccess().AppendRedline( pRedl, true );
     }
 
-    SetTxtFmtColl( aPam, getIDocumentStylePoolAccess().GetTxtCollFromPool( nPoolId ) );
+    SetTextFormatColl( aPam, getIDocumentStylePoolAccess().GetTextCollFromPool( nPoolId ) );
 
     if (pSet && pSet->Count())
     {
         aPam.SetMark();
-        aPam.GetMark()->nContent.Assign(pTNd, pTNd->GetTxt().getLength());
+        aPam.GetMark()->nContent.Assign(pTNd, pTNd->GetText().getLength());
         getIDocumentContentOperations().InsertItemSet( aPam, *pSet );
     }
 }
 
-void SwDoc::SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& rSet )
+void SwDoc::SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& rSet )
 {
-    SwTxtNode* pTNd = rPam.GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = rPam.GetPoint()->nNode.GetNode().GetTextNode();
     assert(pTNd);
 
     RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode();
 
-    if (mbIsAutoFmtRedline)
+    if (mbIsAutoFormatRedline)
     {
         // create the redline object
         SwRangeRedline* pRedl = new SwRangeRedline( nsRedlineType_t::REDLINE_FORMAT, rPam );
@@ -1835,18 +1835,18 @@ void SwDoc::SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& rSet )
     getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
 }
 
-void SwDoc::ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet)
+void SwDoc::ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet)
 {
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         // copying <rSet> to <aSet>
         SfxItemSet aSet(rSet);
         // remove from <aSet> all items, which are already set at the format
-        aSet.Differentiate(rFmt.GetAttrSet());
+        aSet.Differentiate(rFormat.GetAttrSet());
         // <aSet> contains now all *new* items for the format
 
         // copying current format item set to <aOldSet>
-        SfxItemSet aOldSet(rFmt.GetAttrSet());
+        SfxItemSet aOldSet(rFormat.GetAttrSet());
         // insert new items into <aOldSet>
         aOldSet.Put(aSet);
         // invalidate all new items in <aOldSet> in order to clear these items,
@@ -1863,15 +1863,15 @@ void SwDoc::ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet)
             }
         }
 
-        SwUndo * pUndo = new SwUndoFmtAttr(aOldSet, rFmt);
+        SwUndo * pUndo = new SwUndoFormatAttr(aOldSet, rFormat);
 
         GetIDocumentUndoRedo().AppendUndo(pUndo);
     }
 
-    rFmt.SetFmtAttr(rSet);
+    rFormat.SetFormatAttr(rSet);
 }
 
-void SwDoc::RenameFmt(SwFmt & rFmt, const OUString & sNewName,
+void SwDoc::RenameFormat(SwFormat & rFormat, const OUString & sNewName,
                       bool bBroadcast)
 {
     SfxStyleFamily eFamily = SFX_STYLE_FAMILY_ALL;
@@ -1880,18 +1880,18 @@ void SwDoc::RenameFmt(SwFmt & rFmt, const OUString & sNewName,
     {
         SwUndo * pUndo = NULL;
 
-        switch (rFmt.Which())
+        switch (rFormat.Which())
         {
         case RES_CHRFMT:
-            pUndo = new SwUndoRenameCharFmt(rFmt.GetName(), sNewName, this);
+            pUndo = new SwUndoRenameCharFormat(rFormat.GetName(), sNewName, this);
             eFamily = SFX_STYLE_FAMILY_CHAR;
             break;
         case RES_TXTFMTCOLL:
-            pUndo = new SwUndoRenameFmtColl(rFmt.GetName(), sNewName, this);
+            pUndo = new SwUndoRenameFormatColl(rFormat.GetName(), sNewName, this);
             eFamily = SFX_STYLE_FAMILY_PARA;
             break;
         case RES_FRMFMT:
-            pUndo = new SwUndoRenameFrmFmt(rFmt.GetName(), sNewName, this);
+            pUndo = new SwUndoRenameFrameFormat(rFormat.GetName(), sNewName, this);
             eFamily = SFX_STYLE_FAMILY_FRAME;
             break;
 
@@ -1905,7 +1905,7 @@ void SwDoc::RenameFmt(SwFmt & rFmt, const OUString & sNewName,
         }
     }
 
-    rFmt.SetName(sNewName);
+    rFormat.SetName(sNewName);
 
     if (bBroadcast)
         BroadcastStyleOperation(sNewName, eFamily, SfxStyleSheetHintId::MODIFIED);
@@ -1927,15 +1927,15 @@ void SwDoc::dumpAsXml(xmlTextWriterPtr pWriter) const
     maDBData.dumpAsXml(pWriter);
     mpMarkManager->dumpAsXml(pWriter);
     m_pUndoManager->dumpAsXml(pWriter);
-    getIDocumentFieldsAccess().GetFldTypes()->dumpAsXml(pWriter);
-    mpTxtFmtCollTbl->dumpAsXml(pWriter);
-    mpCharFmtTbl->dumpAsXml(pWriter);
-    mpFrmFmtTbl->dumpAsXml(pWriter, "frmFmtTbl");
-    mpSpzFrmFmtTbl->dumpAsXml(pWriter, "spzFrmFmtTbl");
-    mpSectionFmtTbl->dumpAsXml(pWriter);
-    mpNumRuleTbl->dumpAsXml(pWriter);
-    getIDocumentRedlineAccess().GetRedlineTbl().dumpAsXml(pWriter);
-    getIDocumentRedlineAccess().GetExtraRedlineTbl().dumpAsXml(pWriter);
+    getIDocumentFieldsAccess().GetFieldTypes()->dumpAsXml(pWriter);
+    mpTextFormatCollTable->dumpAsXml(pWriter);
+    mpCharFormatTable->dumpAsXml(pWriter);
+    mpFrameFormatTable->dumpAsXml(pWriter, "frmFormatTable");
+    mpSpzFrameFormatTable->dumpAsXml(pWriter, "spzFrameFormatTable");
+    mpSectionFormatTable->dumpAsXml(pWriter);
+    mpNumRuleTable->dumpAsXml(pWriter);
+    getIDocumentRedlineAccess().GetRedlineTable().dumpAsXml(pWriter);
+    getIDocumentRedlineAccess().GetExtraRedlineTable().dumpAsXml(pWriter);
     if (const SdrModel* pModel = getIDocumentDrawModelAccess().GetDrawModel())
         pModel->dumpAsXml(pWriter);
 
@@ -1997,26 +1997,26 @@ namespace docfunc
         // format or the OpenOffice.org file format.
         bool bRet( false );
 
-        const SwTxtFmtColls* pTxtFmtColls( rDoc.GetTxtFmtColls() );
-        if ( pTxtFmtColls )
+        const SwTextFormatColls* pTextFormatColls( rDoc.GetTextFormatColls() );
+        if ( pTextFormatColls )
         {
-            for ( auto pTxtFmtColl : *pTxtFmtColls )
+            for ( auto pTextFormatColl : *pTextFormatColls )
             {
-                if ( pTxtFmtColl->IsDefault() ||
-                    ! pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )
+                if ( pTextFormatColl->IsDefault() ||
+                    ! pTextFormatColl->IsAssignedToListLevelOfOutlineStyle() )
                 {
                     continue;
                 }
 
-                const SwTxtFmtColl* pParentTxtFmtColl =
-                   dynamic_cast<const SwTxtFmtColl*>( pTxtFmtColl->DerivedFrom());
-                if ( !pParentTxtFmtColl )
+                const SwTextFormatColl* pParentTextFormatColl =
+                   dynamic_cast<const SwTextFormatColl*>( pTextFormatColl->DerivedFrom());
+                if ( !pParentTextFormatColl )
                     continue;
 
-                if ( SfxItemState::SET == pParentTxtFmtColl->GetItemState( RES_PARATR_NUMRULE ) )
+                if ( SfxItemState::SET == pParentTextFormatColl->GetItemState( RES_PARATR_NUMRULE ) )
                 {
                     // #i106218# consider that the outline style is set
-                    const SwNumRuleItem& rDirectItem = pParentTxtFmtColl->GetNumRule();
+                    const SwNumRuleItem& rDirectItem = pParentTextFormatColl->GetNumRule();
                     if ( rDirectItem.GetValue() != rDoc.GetOutlineNumRule()->GetName() )
                     {
                         bRet = true;
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 1b9c1beb6b3c..b89ae65d0110 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -39,8 +39,8 @@
 
 SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo)
 {
-    if( rInfo.GetFtnTxtColl() )
-        rInfo.GetFtnTxtColl()->Add(this);
+    if( rInfo.GetFootnoteTextColl() )
+        rInfo.GetFootnoteTextColl()->Add(this);
     else if ( GetRegisteredIn())
         GetRegisteredInNonConst()->Remove(this);
 
@@ -49,20 +49,20 @@ SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo)
     else if ( aPageDescDep.GetRegisteredIn() )
         const_cast<SwModify*>(aPageDescDep.GetRegisteredIn())->Remove( &aPageDescDep );
 
-    if ( rInfo.aCharFmtDep.GetRegisteredIn() )
-        const_cast<SwModify*>(rInfo.aCharFmtDep.GetRegisteredIn())->Add( &aCharFmtDep );
-    else if ( aCharFmtDep.GetRegisteredIn() )
-        const_cast<SwModify*>(aCharFmtDep.GetRegisteredIn())->Remove( &aCharFmtDep );
+    if ( rInfo.aCharFormatDep.GetRegisteredIn() )
+        const_cast<SwModify*>(rInfo.aCharFormatDep.GetRegisteredIn())->Add( &aCharFormatDep );
+    else if ( aCharFormatDep.GetRegisteredIn() )
+        const_cast<SwModify*>(aCharFormatDep.GetRegisteredIn())->Remove( &aCharFormatDep );
 
-    if ( rInfo.aAnchorCharFmtDep.GetRegisteredIn() )
-        const_cast<SwModify*>(rInfo.aAnchorCharFmtDep.GetRegisteredIn())->Add(
-                                                    &aAnchorCharFmtDep );
-    else if( aAnchorCharFmtDep.GetRegisteredIn() )
-        static_cast<SwModify*>(aAnchorCharFmtDep.GetRegisteredIn())->Remove(
-                                                    &aAnchorCharFmtDep );
+    if ( rInfo.aAnchorCharFormatDep.GetRegisteredIn() )
+        const_cast<SwModify*>(rInfo.aAnchorCharFormatDep.GetRegisteredIn())->Add(
+                                                    &aAnchorCharFormatDep );
+    else if( aAnchorCharFormatDep.GetRegisteredIn() )
+        static_cast<SwModify*>(aAnchorCharFormatDep.GetRegisteredIn())->Remove(
+                                                    &aAnchorCharFormatDep );
 
-    aFmt = rInfo.aFmt;
-    nFtnOffset = rInfo.nFtnOffset;
+    aFormat = rInfo.aFormat;
+    nFootnoteOffset = rInfo.nFootnoteOffset;
     m_bEndNote = rInfo.m_bEndNote;
     sPrefix = rInfo.sPrefix;
     sSuffix = rInfo.sSuffix;
@@ -73,49 +73,49 @@ bool SwEndNoteInfo::operator==( const SwEndNoteInfo& rInfo ) const
 {
     return  aPageDescDep.GetRegisteredIn() ==
                                 rInfo.aPageDescDep.GetRegisteredIn() &&
-            aCharFmtDep.GetRegisteredIn() ==
-                                rInfo.aCharFmtDep.GetRegisteredIn() &&
-            aAnchorCharFmtDep.GetRegisteredIn() ==
-                                rInfo.aAnchorCharFmtDep.GetRegisteredIn() &&
-            GetFtnTxtColl() == rInfo.GetFtnTxtColl() &&
-            aFmt.GetNumberingType() == rInfo.aFmt.GetNumberingType() &&
-            nFtnOffset == rInfo.nFtnOffset &&
+            aCharFormatDep.GetRegisteredIn() ==
+                                rInfo.aCharFormatDep.GetRegisteredIn() &&
+            aAnchorCharFormatDep.GetRegisteredIn() ==
+                                rInfo.aAnchorCharFormatDep.GetRegisteredIn() &&
+            GetFootnoteTextColl() == rInfo.GetFootnoteTextColl() &&
+            aFormat.GetNumberingType() == rInfo.aFormat.GetNumberingType() &&
+            nFootnoteOffset == rInfo.nFootnoteOffset &&
             m_bEndNote == rInfo.m_bEndNote &&
             sPrefix == rInfo.sPrefix &&
             sSuffix == rInfo.sSuffix;
 }
 
 SwEndNoteInfo::SwEndNoteInfo(const SwEndNoteInfo& rInfo) :
-    SwClient( rInfo.GetFtnTxtColl() ),
+    SwClient( rInfo.GetFootnoteTextColl() ),
     aPageDescDep( this, 0 ),
-    aCharFmtDep( this, 0 ),
-    aAnchorCharFmtDep( this, 0 ),
+    aCharFormatDep( this, 0 ),
+    aAnchorCharFormatDep( this, 0 ),
     sPrefix( rInfo.sPrefix ),
     sSuffix( rInfo.sSuffix ),
     m_bEndNote( true ),
-    aFmt( rInfo.aFmt ),
-    nFtnOffset( rInfo.nFtnOffset )
+    aFormat( rInfo.aFormat ),
+    nFootnoteOffset( rInfo.nFootnoteOffset )
 {
     if( rInfo.aPageDescDep.GetRegisteredIn() )
         const_cast<SwModify*>(rInfo.aPageDescDep.GetRegisteredIn())->Add( &aPageDescDep );
 
-    if( rInfo.aCharFmtDep.GetRegisteredIn() )
-        const_cast<SwModify*>(rInfo.aCharFmtDep.GetRegisteredIn())->Add( &aCharFmtDep );
+    if( rInfo.aCharFormatDep.GetRegisteredIn() )
+        const_cast<SwModify*>(rInfo.aCharFormatDep.GetRegisteredIn())->Add( &aCharFormatDep );
 
-    if( rInfo.aAnchorCharFmtDep.GetRegisteredIn() )
-        const_cast<SwModify*>(rInfo.aAnchorCharFmtDep.GetRegisteredIn())->Add(
-                &aAnchorCharFmtDep );
+    if( rInfo.aAnchorCharFormatDep.GetRegisteredIn() )
+        const_cast<SwModify*>(rInfo.aAnchorCharFormatDep.GetRegisteredIn())->Add(
+                &aAnchorCharFormatDep );
 }
 
-SwEndNoteInfo::SwEndNoteInfo(SwTxtFmtColl *pFmt) :
-    SwClient(pFmt),
+SwEndNoteInfo::SwEndNoteInfo(SwTextFormatColl *pFormat) :
+    SwClient(pFormat),
     aPageDescDep( this, 0 ),
-    aCharFmtDep( this, 0 ),
-    aAnchorCharFmtDep( this, 0 ),
+    aCharFormatDep( this, 0 ),
+    aAnchorCharFormatDep( this, 0 ),
     m_bEndNote( true ),
-    nFtnOffset( 0 )
+    nFootnoteOffset( 0 )
 {
-    aFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER);
+    aFormat.SetNumberingType(SVX_NUM_ROMAN_LOWER);
 }
 
 SwPageDesc *SwEndNoteInfo::GetPageDesc( SwDoc &rDoc ) const
@@ -145,43 +145,43 @@ void SwEndNoteInfo::ChgPageDesc( SwPageDesc *pDesc )
     pDesc->Add( &static_cast<SwClient&>(aPageDescDep) );
 }
 
-void SwEndNoteInfo::SetFtnTxtColl(SwTxtFmtColl& rFmt)
+void SwEndNoteInfo::SetFootnoteTextColl(SwTextFormatColl& rFormat)
 {
-    rFmt.Add(this);
+    rFormat.Add(this);
 }
 
-SwCharFmt* SwEndNoteInfo::GetCharFmt(SwDoc &rDoc) const
+SwCharFormat* SwEndNoteInfo::GetCharFormat(SwDoc &rDoc) const
 {
-    if ( !aCharFmtDep.GetRegisteredIn() )
+    if ( !aCharFormatDep.GetRegisteredIn() )
     {
-        SwCharFmt* pFmt = rDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool( static_cast<sal_uInt16>(
+        SwCharFormat* pFormat = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( static_cast<sal_uInt16>(
             m_bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE ) );
-        pFmt->Add( &const_cast<SwClient&>(static_cast<const SwClient&>(aCharFmtDep)) );
+        pFormat->Add( &const_cast<SwClient&>(static_cast<const SwClient&>(aCharFormatDep)) );
     }
-    return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(aCharFmtDep.GetRegisteredIn()));
+    return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(aCharFormatDep.GetRegisteredIn()));
 }
 
-void SwEndNoteInfo::SetCharFmt( SwCharFmt* pChFmt )
+void SwEndNoteInfo::SetCharFormat( SwCharFormat* pChFormat )
 {
-    OSL_ENSURE(pChFmt, "no CharFmt?");
-    pChFmt->Add( &static_cast<SwClient&>(aCharFmtDep) );
+    OSL_ENSURE(pChFormat, "no CharFormat?");
+    pChFormat->Add( &static_cast<SwClient&>(aCharFormatDep) );
 }
 
-SwCharFmt* SwEndNoteInfo::GetAnchorCharFmt(SwDoc &rDoc) const
+SwCharFormat* SwEndNoteInfo::GetAnchorCharFormat(SwDoc &rDoc) const
 {
-    if( !aAnchorCharFmtDep.GetRegisteredIn() )
+    if( !aAnchorCharFormatDep.GetRegisteredIn() )
     {
-        SwCharFmt* pFmt = rDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool( static_cast<sal_uInt16>(
+        SwCharFormat* pFormat = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( static_cast<sal_uInt16>(
             m_bEndNote ? RES_POOLCHR_ENDNOTE_ANCHOR : RES_POOLCHR_FOOTNOTE_ANCHOR ) );
-        pFmt->Add( &const_cast<SwClient&>(static_cast<const SwClient&>(aAnchorCharFmtDep)) );
+        pFormat->Add( &const_cast<SwClient&>(static_cast<const SwClient&>(aAnchorCharFormatDep)) );
     }
-    return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(aAnchorCharFmtDep.GetRegisteredIn()));
+    return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(aAnchorCharFormatDep.GetRegisteredIn()));
 }
 
-void SwEndNoteInfo::SetAnchorCharFmt( SwCharFmt* pChFmt )
+void SwEndNoteInfo::SetAnchorCharFormat( SwCharFormat* pChFormat )
 {
-    OSL_ENSURE(pChFmt, "no CharFmt?");
-    pChFmt->Add( &static_cast<SwClient&>(aAnchorCharFmtDep) );
+    OSL_ENSURE(pChFormat, "no CharFormat?");
+    pChFormat->Add( &static_cast<SwClient&>(aAnchorCharFormatDep) );
 }
 
 void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
@@ -192,18 +192,18 @@ void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         RES_FMT_CHG == nWhich )
     {
         SwDoc* pDoc;
-        if( aCharFmtDep.GetRegisteredIn() )
-            pDoc = static_cast<SwFmt*>(aCharFmtDep.GetRegisteredIn())->GetDoc();
+        if( aCharFormatDep.GetRegisteredIn() )
+            pDoc = static_cast<SwFormat*>(aCharFormatDep.GetRegisteredIn())->GetDoc();
         else
-            pDoc = static_cast<SwFmt*>(aAnchorCharFmtDep.GetRegisteredIn())->GetDoc();
-        SwFtnIdxs& rFtnIdxs = pDoc->GetFtnIdxs();
-        for( size_t nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+            pDoc = static_cast<SwFormat*>(aAnchorCharFormatDep.GetRegisteredIn())->GetDoc();
+        SwFootnoteIdxs& rFootnoteIdxs = pDoc->GetFootnoteIdxs();
+        for( size_t nPos = 0; nPos < rFootnoteIdxs.size(); ++nPos )
         {
-            SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
-            const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-            if ( rFtn.IsEndNote() == m_bEndNote )
+            SwTextFootnote *pTextFootnote = rFootnoteIdxs[ nPos ];
+            const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+            if ( rFootnote.IsEndNote() == m_bEndNote )
             {
-                pTxtFtn->SetNumber(rFtn.GetNumber(), rFtn.GetNumStr());
+                pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr());
             }
         }
     }
@@ -211,7 +211,7 @@ void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         CheckRegistration( pOld, pNew );
 }
 
-SwFtnInfo& SwFtnInfo::operator=(const SwFtnInfo& rInfo)
+SwFootnoteInfo& SwFootnoteInfo::operator=(const SwFootnoteInfo& rInfo)
 {
     SwEndNoteInfo::operator=(rInfo);
     aQuoVadis =  rInfo.aQuoVadis;
@@ -221,7 +221,7 @@ SwFtnInfo& SwFtnInfo::operator=(const SwFtnInfo& rInfo)
     return *this;
 }
 
-bool SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const
+bool SwFootnoteInfo::operator==( const SwFootnoteInfo& rInfo ) const
 {
     return  ePos == rInfo.ePos &&
             eNum == rInfo.eNum &&
@@ -230,7 +230,7 @@ bool SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const
             aErgoSum == rInfo.aErgoSum;
 }
 
-SwFtnInfo::SwFtnInfo(const SwFtnInfo& rInfo) :
+SwFootnoteInfo::SwFootnoteInfo(const SwFootnoteInfo& rInfo) :
     SwEndNoteInfo( rInfo ),
     aQuoVadis( rInfo.aQuoVadis ),
     aErgoSum( rInfo.aErgoSum ),
@@ -240,79 +240,79 @@ SwFtnInfo::SwFtnInfo(const SwFtnInfo& rInfo) :
     m_bEndNote = false;
 }
 
-SwFtnInfo::SwFtnInfo(SwTxtFmtColl *pFmt) :
-    SwEndNoteInfo( pFmt ),
+SwFootnoteInfo::SwFootnoteInfo(SwTextFormatColl *pFormat) :
+    SwEndNoteInfo( pFormat ),
     ePos( FTNPOS_PAGE ),
     eNum( FTNNUM_DOC )
 {
-    aFmt.SetNumberingType(SVX_NUM_ARABIC);
+    aFormat.SetNumberingType(SVX_NUM_ARABIC);
     m_bEndNote = false;
 }
 
-void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
+void SwDoc::SetFootnoteInfo(const SwFootnoteInfo& rInfo)
 {
     SwRootFrm* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout();
-    if( !(GetFtnInfo() == rInfo) )
+    if( !(GetFootnoteInfo() == rInfo) )
     {
-        const SwFtnInfo &rOld = GetFtnInfo();
+        const SwFootnoteInfo &rOld = GetFootnoteInfo();
 
         if (GetIDocumentUndoRedo().DoesUndo())
         {
             GetIDocumentUndoRedo().AppendUndo( new SwUndoFootNoteInfo(rOld) );
         }
 
-        bool bFtnPos  = rInfo.ePos != rOld.ePos;
-        bool bFtnDesc = rOld.ePos == FTNPOS_CHAPTER &&
+        bool bFootnotePos  = rInfo.ePos != rOld.ePos;
+        bool bFootnoteDesc = rOld.ePos == FTNPOS_CHAPTER &&
                             rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this );
         bool bExtra   = rInfo.aQuoVadis != rOld.aQuoVadis ||
                             rInfo.aErgoSum != rOld.aErgoSum ||
-                            rInfo.aFmt.GetNumberingType() != rOld.aFmt.GetNumberingType() ||
+                            rInfo.aFormat.GetNumberingType() != rOld.aFormat.GetNumberingType() ||
                             rInfo.GetPrefix() != rOld.GetPrefix() ||
                             rInfo.GetSuffix() != rOld.GetSuffix();
-        SwCharFmt *pOldChrFmt = rOld.GetCharFmt( *this ),
-                  *pNewChrFmt = rInfo.GetCharFmt( *this );
-        bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
+        SwCharFormat *pOldChrFormat = rOld.GetCharFormat( *this ),
+                  *pNewChrFormat = rInfo.GetCharFormat( *this );
+        bool bFootnoteChrFormats = pOldChrFormat != pNewChrFormat;
 
-        *mpFtnInfo = rInfo;
+        *mpFootnoteInfo = rInfo;
 
         if (pTmpRoot)
         {
             std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
-            if ( bFtnPos )
-                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllRemoveFtns));
+            if ( bFootnotePos )
+                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllRemoveFootnotes));
             else
             {
-                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
-                if ( bFtnDesc )
-                    std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), false));
+                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFootnoteNums));
+                if ( bFootnoteDesc )
+                    std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFootnotePageDescs), false));
                 if ( bExtra )
                 {
                     // For messages regarding ErgoSum etc. we save the extra code and use the
                     // available methods.
-                    SwFtnIdxs& rFtnIdxs = GetFtnIdxs();
-                    for( size_t nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+                    SwFootnoteIdxs& rFootnoteIdxs = GetFootnoteIdxs();
+                    for( size_t nPos = 0; nPos < rFootnoteIdxs.size(); ++nPos )
                     {
-                        SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
-                        const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-                        if ( !rFtn.IsEndNote() )
-                            pTxtFtn->SetNumber(rFtn.GetNumber(), rFtn.GetNumStr());
+                        SwTextFootnote *pTextFootnote = rFootnoteIdxs[ nPos ];
+                        const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+                        if ( !rFootnote.IsEndNote() )
+                            pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr());
                     }
                 }
             }
         }
         if( FTNNUM_PAGE != rInfo.eNum )
-            GetFtnIdxs().UpdateAllFtn();
-        else if( bFtnChrFmts )
+            GetFootnoteIdxs().UpdateAllFootnote();
+        else if( bFootnoteChrFormats )
         {
-            SwFmtChg aOld( pOldChrFmt );
-            SwFmtChg aNew( pNewChrFmt );
-            mpFtnInfo->ModifyNotification( &aOld, &aNew );
+            SwFormatChg aOld( pOldChrFormat );
+            SwFormatChg aNew( pNewChrFormat );
+            mpFootnoteInfo->ModifyNotification( &aOld, &aNew );
         }
 
         // #i81002# no update during loading
         if ( !IsInReading() )
         {
-            getIDocumentFieldsAccess().UpdateRefFlds(NULL);
+            getIDocumentFieldsAccess().UpdateRefFields(NULL);
         }
         getIDocumentState().SetModified();
     }
@@ -329,67 +329,67 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
             GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
-        bool bNumChg  = rInfo.nFtnOffset != GetEndNoteInfo().nFtnOffset;
-        // this seems to be an optimization: UpdateAllFtn() is only called
+        bool bNumChg  = rInfo.nFootnoteOffset != GetEndNoteInfo().nFootnoteOffset;
+        // this seems to be an optimization: UpdateAllFootnote() is only called
         // if the offset changes; if the offset is the same,
         // but type/prefix/suffix changes, just set new numbers.
         bool const bExtra = !bNumChg &&
-                (   (rInfo.aFmt.GetNumberingType() !=
-                        GetEndNoteInfo().aFmt.GetNumberingType())
+                (   (rInfo.aFormat.GetNumberingType() !=
+                        GetEndNoteInfo().aFormat.GetNumberingType())
                 ||  (rInfo.GetPrefix() != GetEndNoteInfo().GetPrefix())
                 ||  (rInfo.GetSuffix() != GetEndNoteInfo().GetSuffix())
                 );
-        bool bFtnDesc = rInfo.GetPageDesc( *this ) !=
+        bool bFootnoteDesc = rInfo.GetPageDesc( *this ) !=
                             GetEndNoteInfo().GetPageDesc( *this );
-        SwCharFmt *pOldChrFmt = GetEndNoteInfo().GetCharFmt( *this ),
-                  *pNewChrFmt = rInfo.GetCharFmt( *this );
-        bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
+        SwCharFormat *pOldChrFormat = GetEndNoteInfo().GetCharFormat( *this ),
+                  *pNewChrFormat = rInfo.GetCharFormat( *this );
+        bool bFootnoteChrFormats = pOldChrFormat != pNewChrFormat;
 
         *mpEndNoteInfo = rInfo;
 
         if ( pTmpRoot )
         {
-            if ( bFtnDesc )
+            if ( bFootnoteDesc )
             {
                 std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
-                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), true));
+                std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFootnotePageDescs), true));
             }
             if ( bExtra )
             {
                 // For messages regarding ErgoSum etc. we save the extra code and use the
                 // available methods.
-                SwFtnIdxs& rFtnIdxs = GetFtnIdxs();
-                for( size_t nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+                SwFootnoteIdxs& rFootnoteIdxs = GetFootnoteIdxs();
+                for( size_t nPos = 0; nPos < rFootnoteIdxs.size(); ++nPos )
                 {
-                    SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
-                    const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-                    if ( rFtn.IsEndNote() )
-                        pTxtFtn->SetNumber(rFtn.GetNumber(), rFtn.GetNumStr());
+                    SwTextFootnote *pTextFootnote = rFootnoteIdxs[ nPos ];
+                    const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+                    if ( rFootnote.IsEndNote() )
+                        pTextFootnote->SetNumber(rFootnote.GetNumber(), rFootnote.GetNumStr());
                 }
             }
         }
         if( bNumChg )
-            GetFtnIdxs().UpdateAllFtn();
-        else if( bFtnChrFmts )
+            GetFootnoteIdxs().UpdateAllFootnote();
+        else if( bFootnoteChrFormats )
         {
-            SwFmtChg aOld( pOldChrFmt );
-            SwFmtChg aNew( pNewChrFmt );
+            SwFormatChg aOld( pOldChrFormat );
+            SwFormatChg aNew( pNewChrFormat );
             mpEndNoteInfo->ModifyNotification( &aOld, &aNew );
         }
 
         // #i81002# no update during loading
         if ( !IsInReading() )
         {
-            getIDocumentFieldsAccess().UpdateRefFlds(NULL);
+            getIDocumentFieldsAccess().UpdateRefFields(NULL);
         }
         getIDocumentState().SetModified();
     }
 }
 
-bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
+bool SwDoc::SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr,
                        sal_uInt16 nNumber, bool bIsEndNote )
 {
-    SwFtnIdxs& rFtnArr = GetFtnIdxs();
+    SwFootnoteIdxs& rFootnoteArr = GetFootnoteIdxs();
     SwRootFrm* pTmpRoot = getIDocumentLayoutAccess().GetCurrentLayout();
 
     const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End();
@@ -399,7 +399,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
     const sal_Int32 nEndCnt = pEnd->nContent.GetIndex();
 
     size_t nPos = 0;
-    rFtnArr.SeekEntry( pStt->nNode, &nPos );
+    rFootnoteArr.SeekEntry( pStt->nNode, &nPos );
 
     SwUndoChangeFootNote* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
@@ -408,64 +408,64 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
         pUndo = new SwUndoChangeFootNote( rPam, rNumStr, nNumber, bIsEndNote );
     }
 
-    SwTxtFtn* pTxtFtn;
+    SwTextFootnote* pTextFootnote;
     sal_uLong nIdx;
     bool bChg = false;
     bool bTypeChgd = false;
     const size_t nPosSave = nPos;
-    while( nPos < rFtnArr.size() &&
-            (( nIdx = _SwTxtFtn_GetIndex((pTxtFtn = rFtnArr[ nPos++ ] )))
+    while( nPos < rFootnoteArr.size() &&
+            (( nIdx = _SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ nPos++ ] )))
                 < nEndNd || ( nIdx == nEndNd &&
-                nEndCnt >= pTxtFtn->GetStart() )) )
+                nEndCnt >= pTextFootnote->GetStart() )) )
         if( nIdx > nSttNd || ( nIdx == nSttNd &&
-                nSttCnt <= pTxtFtn->GetStart() ) )
+                nSttCnt <= pTextFootnote->GetStart() ) )
         {
-            const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-            if( rFtn.GetNumStr() != rNumStr ||
-                rFtn.IsEndNote() != bIsEndNote )
+            const SwFormatFootnote& rFootnote = pTextFootnote->GetFootnote();
+            if( rFootnote.GetNumStr() != rNumStr ||
+                rFootnote.IsEndNote() != bIsEndNote )
             {
                 bChg = true;
                 if ( pUndo )
                 {
-                    pUndo->GetHistory().Add( *pTxtFtn );
+                    pUndo->GetHistory().Add( *pTextFootnote );
                 }
 
-                pTxtFtn->SetNumber( nNumber, rNumStr );
-                if( rFtn.IsEndNote() != bIsEndNote )
+                pTextFootnote->SetNumber( nNumber, rNumStr );
+                if( rFootnote.IsEndNote() != bIsEndNote )
                 {
-                    const_cast<SwFmtFtn&>(rFtn).SetEndNote( bIsEndNote );
+                    const_cast<SwFormatFootnote&>(rFootnote).SetEndNote( bIsEndNote );
                     bTypeChgd = true;
-                    pTxtFtn->CheckCondColl();
+                    pTextFootnote->CheckCondColl();
                     //#i11339# dispose UNO wrapper when a footnote is changed to an endnote or vice versa
-                    const_cast<SwFmtFtn&>(rFtn).InvalidateFootnote();
+                    const_cast<SwFormatFootnote&>(rFootnote).InvalidateFootnote();
                 }
             }
         }
 
     nPos = nPosSave;       // There are more in the front!
     while( nPos &&
-            (( nIdx = _SwTxtFtn_GetIndex((pTxtFtn = rFtnArr[ --nPos ] )))
+            (( nIdx = _SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ --nPos ] )))
                 > nSttNd || ( nIdx == nSttNd &&
-                nSttCnt <= pTxtFtn->GetStart() )) )
+                nSttCnt <= pTextFootnote->GetStart() )) )
         if( nIdx < nEndNd || ( nIdx == nEndNd &&
-            nEndCnt >= pTxtFtn->GetStart() ) )
+            nEndCnt >= pTextFootnote->GetStart() ) )
         {
-            const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-            if( rFtn.GetNumStr() != rNumStr ||
-                rFtn.IsEndNote() != bIsEndNote )
+            const SwFormatFootnote& rFootnote = pTextFootnote->GetFootnote();
+            if( rFootnote.GetNumStr() != rNumStr ||
+                rFootnote.IsEndNote() != bIsEndNote )
             {
                 bChg = true;
                 if ( pUndo )
                 {
-                    pUndo->GetHistory().Add( *pTxtFtn );
+                    pUndo->GetHistory().Add( *pTextFootnote );
                 }
 
-                pTxtFtn->SetNumber( nNumber, rNumStr );
-                if( rFtn.IsEndNote() != bIsEndNote )
+                pTextFootnote->SetNumber( nNumber, rNumStr );
+                if( rFootnote.IsEndNote() != bIsEndNote )
                 {
-                    const_cast<SwFmtFtn&>(rFtn).SetEndNote( bIsEndNote );
+                    const_cast<SwFormatFootnote&>(rFootnote).SetEndNote( bIsEndNote );
                     bTypeChgd = true;
-                    pTxtFtn->CheckCondColl();
+                    pTextFootnote->CheckCondColl();
                 }
             }
         }
@@ -479,16 +479,16 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
         }
 
         if ( bTypeChgd )
-            rFtnArr.UpdateAllFtn();
-        if( FTNNUM_PAGE != GetFtnInfo().eNum )
+            rFootnoteArr.UpdateAllFootnote();
+        if( FTNNUM_PAGE != GetFootnoteInfo().eNum )
         {
             if ( !bTypeChgd )
-                rFtnArr.UpdateAllFtn();
+                rFootnoteArr.UpdateAllFootnote();
         }
         else if( pTmpRoot )
         {
             std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
-            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
+            std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFootnoteNums));
         }
         getIDocumentState().SetModified();
     }
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 0380e92b51f4..d2f129b334d9 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -61,7 +61,7 @@ enum SwSplitDocType
 };
 
 bool SwDoc::GenerateGlobalDoc( const OUString& rPath,
-                                   const SwTxtFmtColl* pSplitColl )
+                                   const SwTextFormatColl* pSplitColl )
 {
     return SplitDoc( SPLITDOC_TO_GLOBALDOC, rPath, false, pSplitColl, 0 );
 }
@@ -77,7 +77,7 @@ bool SwDoc::GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel )
 }
 
 bool SwDoc::GenerateHTMLDoc( const OUString& rPath,
-                                 const SwTxtFmtColl* pSplitColl )
+                                 const SwTextFormatColl* pSplitColl )
 {
     return SplitDoc( SPLITDOC_TO_HTML, rPath, false, pSplitColl, 0 );
 }
@@ -88,7 +88,7 @@ SwNodePtr GetStartNode( SwOutlineNodes* pOutlNds, int nOutlineLevel, sal_uInt16*
     SwNodePtr pNd;
 
     for( ; *nOutl < pOutlNds->size(); ++(*nOutl) )
-        if( ( pNd = (*pOutlNds)[ *nOutl ])->GetTxtNode()->GetAttrOutlineLevel() == nOutlineLevel && !pNd->FindTableNode() )
+        if( ( pNd = (*pOutlNds)[ *nOutl ])->GetTextNode()->GetAttrOutlineLevel() == nOutlineLevel && !pNd->FindTableNode() )
         {
             return pNd;
         }
@@ -104,7 +104,7 @@ SwNodePtr GetEndNode( SwOutlineNodes* pOutlNds, int nOutlineLevel, sal_uInt16* n
     {
         pNd = (*pOutlNds)[ *nOutl ];
 
-        const int nLevel = pNd->GetTxtNode()->GetAttrOutlineLevel();
+        const int nLevel = pNd->GetTextNode()->GetAttrOutlineLevel();
 
         if( ( 0 < nLevel && nLevel <= nOutlineLevel ) &&
             !pNd->FindTableNode() )
@@ -116,12 +116,12 @@ SwNodePtr GetEndNode( SwOutlineNodes* pOutlNds, int nOutlineLevel, sal_uInt16* n
 }
 
 // two helpers for collection mode
-SwNodePtr GetStartNode( const SwOutlineNodes* pOutlNds, const SwTxtFmtColl* pSplitColl, sal_uInt16* nOutl )
+SwNodePtr GetStartNode( const SwOutlineNodes* pOutlNds, const SwTextFormatColl* pSplitColl, sal_uInt16* nOutl )
 {
     SwNodePtr pNd;
     for( ; *nOutl < pOutlNds->size(); ++(*nOutl) )
-        if( ( pNd = (*pOutlNds)[ *nOutl ])->GetTxtNode()->
-                    GetTxtColl() == pSplitColl &&
+        if( ( pNd = (*pOutlNds)[ *nOutl ])->GetTextNode()->
+                    GetTextColl() == pSplitColl &&
             !pNd->FindTableNode() )
         {
             return pNd;
@@ -129,14 +129,14 @@ SwNodePtr GetStartNode( const SwOutlineNodes* pOutlNds, const SwTxtFmtColl* pSpl
     return 0;
 }
 
-SwNodePtr GetEndNode( const SwOutlineNodes* pOutlNds, const SwTxtFmtColl* pSplitColl, sal_uInt16* nOutl )
+SwNodePtr GetEndNode( const SwOutlineNodes* pOutlNds, const SwTextFormatColl* pSplitColl, sal_uInt16* nOutl )
 {
     SwNodePtr pNd;
 
     for( ++(*nOutl); *nOutl < pOutlNds->size(); ++(*nOutl) )
     {
         pNd = (*pOutlNds)[ *nOutl ];
-        SwTxtFmtColl* pTColl = pNd->GetTxtNode()->GetTxtColl();
+        SwTextFormatColl* pTColl = pNd->GetTextNode()->GetTextColl();
 
         if( ( pTColl == pSplitColl ||
               (   pSplitColl->GetAttrOutlineLevel() > 0 &&
@@ -151,7 +151,7 @@ SwNodePtr GetEndNode( const SwOutlineNodes* pOutlNds, const SwTxtFmtColl* pSplit
     return 0;
 }
 
-bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, const SwTxtFmtColl* pSplitColl, int nOutlineLevel )
+bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, const SwTextFormatColl* pSplitColl, int nOutlineLevel )
 {
     // Iterate over all the template's Nodes, creating an own
     // document for every single one and replace linked sections (GlobalDoc) for links (HTML).
@@ -173,8 +173,8 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
             {
                 xTmpOutlNds.reset(new SwOutlineNodes);
                 pOutlNds = xTmpOutlNds.get();
-                SwIterator<SwTxtNode,SwFmtColl> aIter( *pSplitColl );
-                for( SwTxtNode* pTNd = aIter.First(); pTNd; pTNd = aIter.Next() )
+                SwIterator<SwTextNode,SwFormatColl> aIter( *pSplitColl );
+                for( SwTextNode* pTNd = aIter.First(); pTNd; pTNd = aIter.Next() )
                     if( pTNd->GetNodes().IsDocNodes() )
                         pOutlNds->insert( pTNd );
 
@@ -185,11 +185,11 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
         else
         {
             // Look for the 1st level OutlineTemplate
-            const SwTxtFmtColls& rFmtColls =*GetTxtFmtColls();
-            for( SwTxtFmtColls::size_type n = rFmtColls.size(); n; )
-                if ( rFmtColls[ --n ]->GetAttrOutlineLevel() == 1 )
+            const SwTextFormatColls& rFormatColls =*GetTextFormatColls();
+            for( SwTextFormatColls::size_type n = rFormatColls.size(); n; )
+                if ( rFormatColls[ --n ]->GetAttrOutlineLevel() == 1 )
                 {
-                    pSplitColl = rFmtColls[ n ];
+                    pSplitColl = rFormatColls[ n ];
                     break;
                 }
 
@@ -290,7 +290,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                     OUString sTitle( xDocProps->getTitle() );
                     if (!sTitle.isEmpty())
                         sTitle += ": ";
-                    sTitle += pStartNd->GetTxtNode()->GetExpandTxt();
+                    sTitle += pStartNd->GetTextNode()->GetExpandText();
                     xDocProps->setTitle( sTitle );
 
                     // Replace template
@@ -325,7 +325,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                     // We need to have a Layout for the HTMLFilter, so that
                     // TextFrames/Controls/OLE objects can be exported correctly as graphics.
                     if( SPLITDOC_TO_HTML == eDocType &&
-                        !pDoc->GetSpzFrmFmts()->empty() )
+                        !pDoc->GetSpzFrameFormats()->empty() )
                     {
                             SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
                     }
@@ -372,19 +372,19 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                             CorrAbs( aSIdx, aEIdx, *aTmp.GetPoint(), true);
 
                             // If FlyFrames are still around, delete these too
-                            for( SwFrmFmts::size_type n = 0; n < GetSpzFrmFmts()->size(); ++n )
+                            for( SwFrameFormats::size_type n = 0; n < GetSpzFrameFormats()->size(); ++n )
                             {
-                                SwFrmFmt* pFly = (*GetSpzFrmFmts())[n];
-                                const SwFmtAnchor* pAnchor = &pFly->GetAnchor();
+                                SwFrameFormat* pFly = (*GetSpzFrameFormats())[n];
+                                const SwFormatAnchor* pAnchor = &pFly->GetAnchor();
                                 SwPosition const*const pAPos =
-                                    pAnchor->GetCntntAnchor();
+                                    pAnchor->GetContentAnchor();
                                 if (pAPos &&
                                     ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
                                      (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
                                     aSIdx <= pAPos->nNode &&
                                     pAPos->nNode < aEIdx )
                                 {
-                                    getIDocumentLayoutAccess().DelLayoutFmt( pFly );
+                                    getIDocumentLayoutAccess().DelLayoutFormat( pFly );
                                     --n;
                                 }
                             }
@@ -393,9 +393,9 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                         }
 
                         // set the link in the StartNode
-                        SwFmtINetFmt aINet( sFileName , OUString() );
-                        SwTxtNode* pTNd = pStartNd->GetTxtNode();
-                        pTNd->InsertItem(aINet, 0, pTNd->GetTxt().getLength());
+                        SwFormatINetFormat aINet( sFileName , OUString() );
+                        SwTextNode* pTNd = pStartNd->GetTextNode();
+                        pTNd->InsertItem(aINet, 0, pTNd->GetText().getLength());
 
                         // If the link cannot be found anymore,
                         // it has to be a bug!
@@ -410,7 +410,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                         const OUString sNm( INetURLObject( sFileName ).GetName() );
                         SwSectionData aSectData( FILE_LINK_SECTION,
                                         GetUniqueSectionName( &sNm ));
-                        SwSectionFmt* pFmt = MakeSectionFmt( 0 );
+                        SwSectionFormat* pFormat = MakeSectionFormat( 0 );
                         aSectData.SetLinkFileName(sFileName);
                         aSectData.SetProtectFlag(true);
 
@@ -429,7 +429,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                                     pStartNd->GetIndex() )
                             {
                                 bool bMvIdx = aEndIdx == *pSectEnd;
-                                DelSectionFmt( pSectNd->GetSection().GetFmt() );
+                                DelSectionFormat( pSectNd->GetSection().GetFormat() );
                                 if( bMvIdx )
                                     --aEndIdx;
                             }
@@ -465,12 +465,12 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                         if (aEndIdx >= aStartIdx)
                         {
                             pSectNd = GetNodes().InsertTextSection(aStartIdx,
-                                *pFmt, aSectData, 0, &aEndIdx, false);
+                                *pFormat, aSectData, 0, &aEndIdx, false);
                         }
                         else
                         {
                             pSectNd = GetNodes().InsertTextSection(aEndIdx,
-                                *pFmt, aSectData, 0, &aStartIdx, false);
+                                *pFormat, aSectData, 0, &aStartIdx, false);
                         }
                         // <- #i26762#
 
@@ -491,7 +491,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
         {
             // save all remaining sections
             while( !GetSections().empty() )
-                DelSectionFmt( GetSections().front() );
+                DelSectionFormat( GetSections().front() );
 
             SfxFilterContainer* pFCntnr = mpDocShell->GetFactory().GetFilterContainer();
             pFilter = pFCntnr->GetFilter4EA( pFilter->GetTypeName(), SfxFilterFlags::EXPORT );
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index a5299483e3f2..8cc57ff8ab34 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -133,8 +133,8 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
     const sal_uInt16 nIdx = rBlock.GetIndex( rEntry );
     if( USHRT_MAX != nIdx )
     {
-        bool bSav_IsInsGlossary = mbInsOnlyTxtGlssry;
-        mbInsOnlyTxtGlssry = rBlock.IsOnlyTextBlock( nIdx );
+        bool bSav_IsInsGlossary = mbInsOnlyTextGlssry;
+        mbInsOnlyTextGlssry = rBlock.IsOnlyTextBlock( nIdx );
 
         if( rBlock.BeginGetDoc( nIdx ) )
         {
@@ -153,19 +153,19 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
             pGDoc->getIDocumentFieldsAccess().SetFixFields(false, NULL);
 
             // StartAllAction();
-            getIDocumentFieldsAccess().LockExpFlds();
+            getIDocumentFieldsAccess().LockExpFields();
 
             SwNodeIndex aStt( pGDoc->GetNodes().GetEndOfExtras(), 1 );
-            SwCntntNode* pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
-            const SwTableNode* pTblNd = pCntntNd->FindTableNode();
-            SwPaM aCpyPam( pTblNd ? *(SwNode*)pTblNd : *(SwNode*)pCntntNd );
+            SwContentNode* pContentNd = pGDoc->GetNodes().GoNext( &aStt );
+            const SwTableNode* pTableNd = pContentNd->FindTableNode();
+            SwPaM aCpyPam( pTableNd ? *(SwNode*)pTableNd : *(SwNode*)pContentNd );
             aCpyPam.SetMark();
 
             // till the nodes array's end
             aCpyPam.GetPoint()->nNode = pGDoc->GetNodes().GetEndOfContent().GetIndex()-1;
-            pCntntNd = aCpyPam.GetCntntNode();
+            pContentNd = aCpyPam.GetContentNode();
             aCpyPam.GetPoint()->nContent.Assign(
-                    pCntntNd, (pCntntNd) ? pCntntNd->Len() : 0 );
+                    pContentNd, (pContentNd) ? pContentNd->Len() : 0 );
 
             GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
             SwPaM *_pStartCrsr = &rPaM, *__pStartCrsr = _pStartCrsr;
@@ -191,17 +191,17 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
 
                 aACD.RestoreDontExpandItems( rInsPos );
                 if( pShell )
-                    pShell->SaveTblBoxCntnt( &rInsPos );
+                    pShell->SaveTableBoxContent( &rInsPos );
             } while( (_pStartCrsr = static_cast<SwPaM *>(_pStartCrsr->GetNext())) !=
                         __pStartCrsr );
             GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, NULL );
 
-            getIDocumentFieldsAccess().UnlockExpFlds();
-            if( !getIDocumentFieldsAccess().IsExpFldsLocked() )
-                getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+            getIDocumentFieldsAccess().UnlockExpFields();
+            if( !getIDocumentFieldsAccess().IsExpFieldsLocked() )
+                getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
             bRet = true;
         }
-        mbInsOnlyTxtGlssry = bSav_IsInsGlossary;
+        mbInsOnlyTextGlssry = bSav_IsInsGlossary;
     }
     rBlock.EndGetDoc();
     return bRet;
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 0d0ebe4ef1a1..4d8a04b22e99 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -106,7 +106,7 @@ using namespace ::com::sun::star;
 
 #define DEF_FLY_WIDTH    2268   // Default width for FlyFrms (2268 == 4cm)
 
-static bool lcl_IsItemSet(const SwCntntNode & rNode, sal_uInt16 which)
+static bool lcl_IsItemSet(const SwContentNode & rNode, sal_uInt16 which)
 {
     bool bResult = false;
 
@@ -161,14 +161,14 @@ SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, bool bMoveWithinDoc,
     return pObj;
 }
 
-SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
-                                    const SwCntntNode& rNode,
+SwFlyFrameFormat* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
+                                    const SwContentNode& rNode,
                                     RndStdIds eRequestId,
                                     const SfxItemSet* pFlySet,
-                                    SwFrmFmt* pFrmFmt )
+                                    SwFrameFormat* pFrameFormat )
 {
-    if( !pFrmFmt )
-        pFrmFmt = getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_FRAME );
+    if( !pFrameFormat )
+        pFrameFormat = getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME );
 
     OUString sName;
     if( !mbInReading )
@@ -178,17 +178,17 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
         case ND_OLENODE:        sName = GetUniqueOLEName();     break;
         default:                sName = GetUniqueFrameName();   break;
         }
-    SwFlyFrmFmt* pFmt = MakeFlyFrmFmt( sName, pFrmFmt );
+    SwFlyFrameFormat* pFormat = MakeFlyFrameFormat( sName, pFrameFormat );
 
     // Create content and connect to the format.
-    // Create CntntNode and put it into the autotext selection.
+    // Create ContentNode and put it into the autotext selection.
     SwNodeRange aRange( GetNodes().GetEndOfAutotext(), -1,
                         GetNodes().GetEndOfAutotext() );
     GetNodes().SectionDown( &aRange, SwFlyStartNode );
 
-    pFmt->SetFmtAttr( SwFmtCntnt( rNode.StartOfSectionNode() ));
+    pFormat->SetFormatAttr( SwFormatContent( rNode.StartOfSectionNode() ));
 
-    const SwFmtAnchor* pAnchor = 0;
+    const SwFormatAnchor* pAnchor = 0;
     if( pFlySet )
     {
         pFlySet->GetItemState( RES_ANCHOR, false,
@@ -197,10 +197,10 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
         {
             SfxItemSet aTmpSet( *pFlySet );
             aTmpSet.ClearItem( RES_CNTNT );
-            pFmt->SetFmtAttr( aTmpSet );
+            pFormat->SetFormatAttr( aTmpSet );
         }
         else
-            pFmt->SetFmtAttr( *pFlySet );
+            pFormat->SetFormatAttr( *pFlySet );
     }
 
     // Anchor not yet set?
@@ -209,13 +209,13 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
     // content anchor set.
     if ( !pAnchor ||
          ( FLY_AT_PAGE != pAnchor->GetAnchorId() &&
-           !pAnchor->GetCntntAnchor() ) ||
+           !pAnchor->GetContentAnchor() ) ||
          ( FLY_AT_PAGE == pAnchor->GetAnchorId() &&
-           !pAnchor->GetCntntAnchor() &&
+           !pAnchor->GetContentAnchor() &&
            pAnchor->GetPageNum() == 0 ) )
     {
         // set it again, needed for Undo
-        SwFmtAnchor aAnch( pFmt->GetAnchor() );
+        SwFormatAnchor aAnch( pFormat->GetAnchor() );
         if (pAnchor && (FLY_AT_FLY == pAnchor->GetAnchorId()))
         {
             SwPosition aPos( *rAnchPos.nNode.GetNode().FindFlyStartNode() );
@@ -225,7 +225,7 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
         else
         {
             if( eRequestId != aAnch.GetAnchorId() &&
-                SfxItemState::SET != pFmt->GetItemState( RES_ANCHOR, true ) )
+                SfxItemState::SET != pFormat->GetItemState( RES_ANCHOR, true ) )
             {
                 aAnch.SetType( eRequestId );
             }
@@ -239,141 +239,141 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
                 aAnch.SetAnchor( &rAnchPos );
             }
         }
-        pFmt->SetFmtAttr( aAnch );
+        pFormat->SetFormatAttr( aAnch );
     }
     else
-        eAnchorId = pFmt->GetAnchor().GetAnchorId();
+        eAnchorId = pFormat->GetAnchor().GetAnchorId();
 
     if ( FLY_AS_CHAR == eAnchorId )
     {
         const sal_Int32 nStt = rAnchPos.nContent.GetIndex();
-        SwTxtNode * pTxtNode = rAnchPos.nNode.GetNode().GetTxtNode();
+        SwTextNode * pTextNode = rAnchPos.nNode.GetNode().GetTextNode();
 
-        OSL_ENSURE(pTxtNode!= 0, "There should be a SwTxtNode!");
+        OSL_ENSURE(pTextNode!= 0, "There should be a SwTextNode!");
 
-        if (pTxtNode != NULL)
+        if (pTextNode != NULL)
         {
-            SwFmtFlyCnt aFmt( pFmt );
+            SwFormatFlyCnt aFormat( pFormat );
             // may fail if there's no space left or header/ftr
-            if (!pTxtNode->InsertItem(aFmt, nStt, nStt))
-            {   // pFmt is dead now
+            if (!pTextNode->InsertItem(aFormat, nStt, nStt))
+            {   // pFormat is dead now
                 return 0;
             }
         }
     }
 
-    if( SfxItemState::SET != pFmt->GetAttrSet().GetItemState( RES_FRM_SIZE ))
+    if( SfxItemState::SET != pFormat->GetAttrSet().GetItemState( RES_FRM_SIZE ))
     {
-        SwFmtFrmSize aFmtSize( ATT_VAR_SIZE, 0, DEF_FLY_WIDTH );
-        const SwNoTxtNode* pNoTxtNode = rNode.GetNoTxtNode();
-        if( pNoTxtNode )
+        SwFormatFrmSize aFormatSize( ATT_VAR_SIZE, 0, DEF_FLY_WIDTH );
+        const SwNoTextNode* pNoTextNode = rNode.GetNoTextNode();
+        if( pNoTextNode )
         {
             // Set size
-             Size aSize( pNoTxtNode->GetTwipSize() );
+             Size aSize( pNoTextNode->GetTwipSize() );
             if( MINFLY > aSize.Width() )
                 aSize.Width() = DEF_FLY_WIDTH;
-            aFmtSize.SetWidth( aSize.Width() );
+            aFormatSize.SetWidth( aSize.Width() );
             if( aSize.Height() )
             {
-                aFmtSize.SetHeight( aSize.Height() );
-                aFmtSize.SetHeightSizeType( ATT_FIX_SIZE );
+                aFormatSize.SetHeight( aSize.Height() );
+                aFormatSize.SetHeightSizeType( ATT_FIX_SIZE );
             }
         }
-        pFmt->SetFmtAttr( aFmtSize );
+        pFormat->SetFormatAttr( aFormatSize );
     }
 
     // Set up frames
     if( getIDocumentLayoutAccess().GetCurrentViewShell() )
-        pFmt->MakeFrms();           // ???
+        pFormat->MakeFrms();           // ???
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         sal_uLong nNodeIdx = rAnchPos.nNode.GetIndex();
         const sal_Int32 nCntIdx = rAnchPos.nContent.GetIndex();
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoInsLayFmt( pFmt, nNodeIdx, nCntIdx ));
+            new SwUndoInsLayFormat( pFormat, nNodeIdx, nCntIdx ));
     }
 
     getIDocumentState().SetModified();
-    return pFmt;
+    return pFormat;
 }
 
-SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType,
+SwFlyFrameFormat* SwDoc::MakeFlySection( RndStdIds eAnchorType,
                                     const SwPosition* pAnchorPos,
                                     const SfxItemSet* pFlySet,
-                                    SwFrmFmt* pFrmFmt, bool bCalledFromShell )
+                                    SwFrameFormat* pFrameFormat, bool bCalledFromShell )
 {
-    SwFlyFrmFmt* pFmt = 0;
+    SwFlyFrameFormat* pFormat = 0;
     if ( !pAnchorPos && (FLY_AT_PAGE != eAnchorType) )
     {
-        const SwFmtAnchor* pAnch;
+        const SwFormatAnchor* pAnch;
         if( (pFlySet && SfxItemState::SET == pFlySet->GetItemState(
                 RES_ANCHOR, false, reinterpret_cast<const SfxPoolItem**>(&pAnch) )) ||
-            ( pFrmFmt && SfxItemState::SET == pFrmFmt->GetItemState(
+            ( pFrameFormat && SfxItemState::SET == pFrameFormat->GetItemState(
                 RES_ANCHOR, true, reinterpret_cast<const SfxPoolItem**>(&pAnch) )) )
         {
             if ( (FLY_AT_PAGE != pAnch->GetAnchorId()) )
             {
-                pAnchorPos = pAnch->GetCntntAnchor();
+                pAnchorPos = pAnch->GetContentAnchor();
             }
         }
     }
 
     if (pAnchorPos)
     {
-        if( !pFrmFmt )
-            pFrmFmt = getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_FRAME );
+        if( !pFrameFormat )
+            pFrameFormat = getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME );
 
         sal_uInt16 nCollId = static_cast<sal_uInt16>(
             GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) ? RES_POOLCOLL_TEXT : RES_POOLCOLL_FRAME );
 
         /* If there is no adjust item in the paragraph style for the content node of the new fly section
            propagate an existing adjust item at the anchor to the new content node. */
-        SwCntntNode * pNewTxtNd = GetNodes().MakeTxtNode
+        SwContentNode * pNewTextNd = GetNodes().MakeTextNode
             (SwNodeIndex( GetNodes().GetEndOfAutotext()),
-             getIDocumentStylePoolAccess().GetTxtCollFromPool( nCollId ));
-        SwCntntNode * pAnchorNode = pAnchorPos->nNode.GetNode().GetCntntNode();
+             getIDocumentStylePoolAccess().GetTextCollFromPool( nCollId ));
+        SwContentNode * pAnchorNode = pAnchorPos->nNode.GetNode().GetContentNode();
         assert(pAnchorNode); // pAnchorNode from cursor, must be valid
 
         const SfxPoolItem * pItem = NULL;
 
-        if (bCalledFromShell && !lcl_IsItemSet(*pNewTxtNd, RES_PARATR_ADJUST) &&
+        if (bCalledFromShell && !lcl_IsItemSet(*pNewTextNd, RES_PARATR_ADJUST) &&
             SfxItemState::SET == pAnchorNode->GetSwAttrSet().
             GetItemState(RES_PARATR_ADJUST, true, &pItem))
         {
-            static_cast<SwCntntNode *>(pNewTxtNd)->SetAttr(*pItem);
+            static_cast<SwContentNode *>(pNewTextNd)->SetAttr(*pItem);
         }
 
-         pFmt = _MakeFlySection( *pAnchorPos, *pNewTxtNd,
-                                eAnchorType, pFlySet, pFrmFmt );
+         pFormat = _MakeFlySection( *pAnchorPos, *pNewTextNd,
+                                eAnchorType, pFlySet, pFrameFormat );
     }
-    return pFmt;
+    return pFormat;
 }
 
-SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
+SwFlyFrameFormat* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
                                     const SwSelBoxes* pSelBoxes,
-                                    SwFrmFmt *pParent )
+                                    SwFrameFormat *pParent )
 {
-    const SwFmtAnchor& rAnch = static_cast<const SwFmtAnchor&>(rSet.Get( RES_ANCHOR ));
+    const SwFormatAnchor& rAnch = static_cast<const SwFormatAnchor&>(rSet.Get( RES_ANCHOR ));
 
     GetIDocumentUndoRedo().StartUndo( UNDO_INSLAYFMT, NULL );
 
-    SwFlyFrmFmt* pFmt = MakeFlySection( rAnch.GetAnchorId(), rPam.GetPoint(),
+    SwFlyFrameFormat* pFormat = MakeFlySection( rAnch.GetAnchorId(), rPam.GetPoint(),
                                         &rSet, pParent );
 
     // If content is selected, it becomes the new frame's content.
     // Namely, it is moved into the NodeArray's appropriate section.
 
-    if( pFmt )
+    if( pFormat )
     {
         do {        // middle check loop
-            const SwFmtCntnt &rCntnt = pFmt->GetCntnt();
-            OSL_ENSURE( rCntnt.GetCntntIdx(), "No content prepared." );
-            SwNodeIndex aIndex( *(rCntnt.GetCntntIdx()), 1 );
-            SwCntntNode *pNode = aIndex.GetNode().GetCntntNode();
+            const SwFormatContent &rContent = pFormat->GetContent();
+            OSL_ENSURE( rContent.GetContentIdx(), "No content prepared." );
+            SwNodeIndex aIndex( *(rContent.GetContentIdx()), 1 );
+            SwContentNode *pNode = aIndex.GetNode().GetContentNode();
 
             // Attention: Do not create an index on the stack, or we
-            // cannot delete CntntNode in the end!
+            // cannot delete ContentNode in the end!
             SwPosition aPos( aIndex );
             aPos.nContent.Assign( pNode, 0 );
 
@@ -384,39 +384,39 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
                 // original one and move (copy and delete) the selected boxes.
                 // The size is corrected on a percentage basis.
 
-                SwTableNode* pTblNd = const_cast<SwTableNode*>((*pSelBoxes)[0]->
+                SwTableNode* pTableNd = const_cast<SwTableNode*>((*pSelBoxes)[0]->
                                                 GetSttNd()->FindTableNode());
-                if( !pTblNd )
+                if( !pTableNd )
                     break;
 
-                SwTable& rTbl = pTblNd->GetTable();
+                SwTable& rTable = pTableNd->GetTable();
 
                 // Did we select the whole table?
-                if( pSelBoxes->size() == rTbl.GetTabSortBoxes().size() )
+                if( pSelBoxes->size() == rTable.GetTabSortBoxes().size() )
                 {
                     // move the whole table
-                    SwNodeRange aRg( *pTblNd, 0, *pTblNd->EndOfSectionNode(), 1 );
+                    SwNodeRange aRg( *pTableNd, 0, *pTableNd->EndOfSectionNode(), 1 );
 
                     // If we move the whole table and it is located within a
                     // FlyFrame, the we create a TextNode after it.
                     // So that this FlyFrame is preserved.
                     if( aRg.aEnd.GetNode().IsEndNode() )
-                        GetNodes().MakeTxtNode( aRg.aStart,
-                                    GetDfltTxtFmtColl() );
+                        GetNodes().MakeTextNode( aRg.aStart,
+                                    GetDfltTextFormatColl() );
 
                     getIDocumentContentOperations().MoveNodeRange( aRg, aPos.nNode, SwMoveFlags::DEFAULT );
                 }
                 else
                 {
-                    rTbl.MakeCopy( this, aPos, *pSelBoxes );
+                    rTable.MakeCopy( this, aPos, *pSelBoxes );
                     // Don't delete a part of a table with row span!!
                     // You could delete the content instead -> ToDo
-                    //rTbl.DeleteSel( this, *pSelBoxes, 0, 0, true, true );
+                    //rTable.DeleteSel( this, *pSelBoxes, 0, 0, true, true );
                 }
 
                 // If the table is within the frame, then copy without the following TextNode
-                aIndex = rCntnt.GetCntntIdx()->GetNode().EndOfSectionIndex() - 1;
-                OSL_ENSURE( aIndex.GetNode().GetTxtNode(),
+                aIndex = rContent.GetContentIdx()->GetNode().EndOfSectionIndex() - 1;
+                OSL_ENSURE( aIndex.GetNode().GetTextNode(),
                         "a TextNode should be here" );
                 aPos.nContent.Assign( 0, 0 );       // Deregister index!
                 GetNodes().Delete( aIndex, 1 );
@@ -465,7 +465,7 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
 
     GetIDocumentUndoRedo().EndUndo( UNDO_INSLAYFMT, NULL );
 
-    return pFmt;
+    return pFormat;
 }
 
 
@@ -509,20 +509,20 @@ static bool lcl_TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos,
     return bOk;
 }
 
-SwPosFlyFrms SwDoc::GetAllFlyFmts( const SwPaM* pCmpRange, bool bDrawAlso,
+SwPosFlyFrms SwDoc::GetAllFlyFormats( const SwPaM* pCmpRange, bool bDrawAlso,
                            bool bAsCharAlso ) const
 {
     SwPosFlyFrms aRetval;
 
     // collect all anchored somehow to paragraphs
-    for( auto pFly : *GetSpzFrmFmts() )
+    for( auto pFly : *GetSpzFrameFormats() )
     {
-        bool bDrawFmt = bDrawAlso && RES_DRAWFRMFMT == pFly->Which();
-        bool bFlyFmt = RES_FLYFRMFMT == pFly->Which();
-        if( bFlyFmt || bDrawFmt )
+        bool bDrawFormat = bDrawAlso && RES_DRAWFRMFMT == pFly->Which();
+        bool bFlyFormat = RES_FLYFRMFMT == pFly->Which();
+        if( bFlyFormat || bDrawFormat )
         {
-            const SwFmtAnchor& rAnchor = pFly->GetAnchor();
-            SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+            const SwFormatAnchor& rAnchor = pFly->GetAnchor();
+            SwPosition const*const pAPos = rAnchor.GetContentAnchor();
             if (pAPos &&
                 ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
                  (FLY_AT_FLY  == rAnchor.GetAnchorId()) ||
@@ -553,35 +553,35 @@ SwPosFlyFrms SwDoc::GetAllFlyFmts( const SwPaM* pCmpRange, bool bDrawAlso,
             for( size_t i = 0; i < rObjs.size(); ++i)
             {
                 SwAnchoredObject* pAnchoredObj = rObjs[i];
-                SwFrmFmt *pFly;
+                SwFrameFormat *pFly;
                 if ( pAnchoredObj->ISA(SwFlyFrm) )
-                    pFly = &(pAnchoredObj->GetFrmFmt());
+                    pFly = &(pAnchoredObj->GetFrameFormat());
                 else if ( bDrawAlso )
-                    pFly = &(pAnchoredObj->GetFrmFmt());
+                    pFly = &(pAnchoredObj->GetFrameFormat());
                 else
                     continue;
 
-                const SwFmtAnchor& rAnchor = pFly->GetAnchor();
+                const SwFormatAnchor& rAnchor = pFly->GetAnchor();
                 if ((FLY_AT_PARA != rAnchor.GetAnchorId()) &&
                     (FLY_AT_FLY  != rAnchor.GetAnchorId()) &&
                     (FLY_AT_CHAR != rAnchor.GetAnchorId()))
                 {
-                    const SwCntntFrm * pCntntFrm = pPage->FindFirstBodyCntnt();
-                    if ( !pCntntFrm )
+                    const SwContentFrm * pContentFrm = pPage->FindFirstBodyContent();
+                    if ( !pContentFrm )
                     {
                         // Oops! An empty page.
                         // In order not to lose the whole frame (RTF) we
-                        // look for the last Cntnt before the page.
+                        // look for the last Content before the page.
                         const SwPageFrm *pPrv = static_cast<const SwPageFrm*>(pPage->GetPrev());
-                        while ( !pCntntFrm && pPrv )
+                        while ( !pContentFrm && pPrv )
                         {
-                            pCntntFrm = pPrv->FindFirstBodyCntnt();
+                            pContentFrm = pPrv->FindFirstBodyContent();
                             pPrv = static_cast<const SwPageFrm*>(pPrv->GetPrev());
                         }
                     }
-                    if ( pCntntFrm )
+                    if ( pContentFrm )
                     {
-                        SwNodeIndex aIdx( *pCntntFrm->GetNode() );
+                        SwNodeIndex aIdx( *pContentFrm->GetNode() );
                         aRetval.insert(SwPosFlyFrmPtr(new SwPosFlyFrm(aIdx, pFly, aRetval.size())));
                     }
                 }
@@ -633,10 +633,10 @@ static void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uIn
 
 }
 
-static SwFlyFrmFmt *
-lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
+static SwFlyFrameFormat *
+lcl_InsertLabel(SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable,
         SwUndoInsertLabel *const pUndo,
-        SwLabelType const eType, OUString const& rTxt, OUString const& rSeparator,
+        SwLabelType const eType, OUString const& rText, OUString const& rSeparator,
             const OUString& rNumberingSeparator,
             const bool bBefore, const sal_uInt16 nId, const sal_uLong nNdIdx,
             const OUString& rCharacterStyle,
@@ -646,20 +646,20 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
     bool bTable = false;    // To save some code.
 
-    // Get the field first, because we retrieve the TxtColl via the field's name
-    OSL_ENSURE( nId == USHRT_MAX  || nId < rDoc.getIDocumentFieldsAccess().GetFldTypes()->size(),
-            "FldType index out of bounds." );
-    SwFieldType *pType = (nId != USHRT_MAX) ? (*rDoc.getIDocumentFieldsAccess().GetFldTypes())[nId] : NULL;
+    // Get the field first, because we retrieve the TextColl via the field's name
+    OSL_ENSURE( nId == USHRT_MAX  || nId < rDoc.getIDocumentFieldsAccess().GetFieldTypes()->size(),
+            "FieldType index out of bounds." );
+    SwFieldType *pType = (nId != USHRT_MAX) ? (*rDoc.getIDocumentFieldsAccess().GetFieldTypes())[nId] : NULL;
     OSL_ENSURE(!pType || pType->Which() == RES_SETEXPFLD, "wrong Id for Label");
 
-    SwTxtFmtColl * pColl = NULL;
+    SwTextFormatColl * pColl = NULL;
     if( pType )
     {
-        for( auto i = pTxtFmtCollTbl->size(); i; )
+        for( auto i = pTextFormatCollTable->size(); i; )
         {
-            if( (*pTxtFmtCollTbl)[ --i ]->GetName()==pType->GetName() )
+            if( (*pTextFormatCollTable)[ --i ]->GetName()==pType->GetName() )
             {
-                pColl = (*pTxtFmtCollTbl)[i];
+                pColl = (*pTextFormatCollTable)[i];
                 break;
             }
         }
@@ -668,11 +668,11 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
     if( !pColl )
     {
-        pColl = rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_LABEL );
+        pColl = rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_LABEL );
     }
 
-    SwTxtNode *pNew = NULL;
-    SwFlyFrmFmt* pNewFmt = NULL;
+    SwTextNode *pNew = NULL;
+    SwFlyFrameFormat* pNewFormat = NULL;
 
     switch ( eType )
     {
@@ -704,7 +704,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
                 // Create Node for labeling paragraph.
                 SwNodeIndex aIdx( rDoc.GetNodes(), nNode );
-                pNew = rDoc.GetNodes().MakeTxtNode( aIdx, pColl );
+                pNew = rDoc.GetNodes().MakeTextNode( aIdx, pColl );
             }
             break;
 
@@ -717,54 +717,54 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
                 // create Frames.
 
                 // Get the FlyFrame's Format and decouple the Layout.
-                SwFrmFmt *pOldFmt = rDoc.GetNodes()[nNdIdx]->GetFlyFmt();
-                OSL_ENSURE( pOldFmt, "Couldn't find the Fly's Format." );
+                SwFrameFormat *pOldFormat = rDoc.GetNodes()[nNdIdx]->GetFlyFormat();
+                OSL_ENSURE( pOldFormat, "Couldn't find the Fly's Format." );
                 // #i115719#
                 // <title> and <description> attributes are lost when calling <DelFrms()>.
                 // Thus, keep them and restore them after the calling <MakeFrms()>
-                const bool bIsSwFlyFrmFmtInstance( dynamic_cast<SwFlyFrmFmt*>(pOldFmt) != 0 );
-                const OUString sTitle( bIsSwFlyFrmFmtInstance
-                                     ? static_cast<SwFlyFrmFmt*>(pOldFmt)->GetObjTitle()
+                const bool bIsSwFlyFrameFormatInstance( dynamic_cast<SwFlyFrameFormat*>(pOldFormat) != 0 );
+                const OUString sTitle( bIsSwFlyFrameFormatInstance
+                                     ? static_cast<SwFlyFrameFormat*>(pOldFormat)->GetObjTitle()
                                      : OUString() );
-                const OUString sDescription( bIsSwFlyFrmFmtInstance
-                                           ? static_cast<SwFlyFrmFmt*>(pOldFmt)->GetObjDescription()
+                const OUString sDescription( bIsSwFlyFrameFormatInstance
+                                           ? static_cast<SwFlyFrameFormat*>(pOldFormat)->GetObjDescription()
                                            : OUString() );
-                pOldFmt->DelFrms();
+                pOldFormat->DelFrms();
 
-                pNewFmt = rDoc.MakeFlyFrmFmt( rDoc.GetUniqueFrameName(),
-                                rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool(RES_POOLFRM_FRAME) );
+                pNewFormat = rDoc.MakeFlyFrameFormat( rDoc.GetUniqueFrameName(),
+                                rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool(RES_POOLFRM_FRAME) );
 
                 /* #i6447#: Only the selected items are copied from the old
                    format. */
-                SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( true );
+                SfxItemSet* pNewSet = pNewFormat->GetAttrSet().Clone( true );
 
                 // Copy only the set attributes.
                 // The others should apply from the Templates.
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_PRINT );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_OPAQUE );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_PROTECT );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_SURROUND );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_VERT_ORIENT );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_HORI_ORIENT );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_LR_SPACE );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_UL_SPACE );
-                lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_BACKGROUND );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_PRINT );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_OPAQUE );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_PROTECT );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_SURROUND );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_VERT_ORIENT );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_HORI_ORIENT );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_LR_SPACE );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_UL_SPACE );
+                lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_BACKGROUND );
                 if( bCpyBrd )
                 {
                     // If there's no BoxItem at graphic, but the new Format has one, then set the
                     // default item in the new Set. Because the graphic's size has never changed!
                     const SfxPoolItem *pItem;
-                    if( SfxItemState::SET == pOldFmt->GetAttrSet().
+                    if( SfxItemState::SET == pOldFormat->GetAttrSet().
                             GetItemState( RES_BOX, true, &pItem ))
                         pNewSet->Put( *pItem );
-                    else if( SfxItemState::SET == pNewFmt->GetAttrSet().
+                    else if( SfxItemState::SET == pNewFormat->GetAttrSet().
                             GetItemState( RES_BOX, true ))
                         pNewSet->Put( *GetDfltAttr( RES_BOX ) );
 
-                    if( SfxItemState::SET == pOldFmt->GetAttrSet().
+                    if( SfxItemState::SET == pOldFormat->GetAttrSet().
                             GetItemState( RES_SHADOW, true, &pItem ))
                         pNewSet->Put( *pItem );
-                    else if( SfxItemState::SET == pNewFmt->GetAttrSet().
+                    else if( SfxItemState::SET == pNewFormat->GetAttrSet().
                             GetItemState( RES_SHADOW, true ))
                         pNewSet->Put( *GetDfltAttr( RES_SHADOW ) );
                 }
@@ -777,42 +777,42 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
                 }
 
                 // Always transfer the anchor, which is a hard attribute anyways.
-                pNewSet->Put( pOldFmt->GetAnchor() );
+                pNewSet->Put( pOldFormat->GetAnchor() );
 
                 // The new one should be changeable in its height.
-                SwFmtFrmSize aFrmSize( pOldFmt->GetFrmSize() );
+                SwFormatFrmSize aFrmSize( pOldFormat->GetFrmSize() );
                 aFrmSize.SetHeightSizeType( ATT_MIN_SIZE );
                 pNewSet->Put( aFrmSize );
 
                 SwStartNode* pSttNd = rDoc.GetNodes().MakeTextSection(
                             SwNodeIndex( rDoc.GetNodes().GetEndOfAutotext() ),
                             SwFlyStartNode, pColl );
-                pNewSet->Put( SwFmtCntnt( pSttNd ));
+                pNewSet->Put( SwFormatContent( pSttNd ));
 
-                pNewFmt->SetFmtAttr( *pNewSet );
+                pNewFormat->SetFormatAttr( *pNewSet );
 
-                // InCntnts need to be treated in a special way:
-                // The TxtAttribute needs to be destroyed.
+                // InContents need to be treated in a special way:
+                // The TextAttribute needs to be destroyed.
                 // Unfortunately, this also destroys the Format next to the Frames.
                 // To avoid this, we disconnect the attribute from the Format.
 
-                const SwFmtAnchor& rAnchor = pNewFmt->GetAnchor();
+                const SwFormatAnchor& rAnchor = pNewFormat->GetAnchor();
                 if ( FLY_AS_CHAR == rAnchor.GetAnchorId() )
                 {
-                    const SwPosition *pPos = rAnchor.GetCntntAnchor();
-                    SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-                    OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+                    const SwPosition *pPos = rAnchor.GetContentAnchor();
+                    SwTextNode *pTextNode = pPos->nNode.GetNode().GetTextNode();
+                    OSL_ENSURE( pTextNode->HasHints(), "Missing FlyInCnt-Hint." );
                     const sal_Int32 nIdx = pPos->nContent.GetIndex();
-                    SwTxtAttr * const pHnt =
-                        pTxtNode->GetTxtAttrForCharAt(nIdx, RES_TXTATR_FLYCNT);
+                    SwTextAttr * const pHint =
+                        pTextNode->GetTextAttrForCharAt(nIdx, RES_TXTATR_FLYCNT);
 
-                    OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+                    OSL_ENSURE( pHint && pHint->Which() == RES_TXTATR_FLYCNT,
                                 "Missing FlyInCnt-Hint." );
-                    OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pOldFmt,
-                                "Wrong TxtFlyCnt-Hint." );
+                    OSL_ENSURE( pHint && pHint->GetFlyCnt().GetFrameFormat() == pOldFormat,
+                                "Wrong TextFlyCnt-Hint." );
 
-                    const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt(
-                            pNewFmt );
+                    const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt()).SetFlyFormat(
+                            pNewFormat );
                 }
 
                 // The old one should not have a flow and it should be adjusted to above and
@@ -820,14 +820,14 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
                 // Also, the width should be 100% and it should also adjust the hight, if changed.
                 pNewSet->ClearItem();
 
-                pNewSet->Put( SwFmtSurround( SURROUND_NONE ) );
+                pNewSet->Put( SwFormatSurround( SURROUND_NONE ) );
                 pNewSet->Put( SvxOpaqueItem( RES_OPAQUE, true ) );
 
                 sal_Int16 eVert = bBefore ? text::VertOrientation::BOTTOM : text::VertOrientation::TOP;
-                pNewSet->Put( SwFmtVertOrient( 0, eVert ) );
-                pNewSet->Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER ) );
+                pNewSet->Put( SwFormatVertOrient( 0, eVert ) );
+                pNewSet->Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER ) );
 
-                aFrmSize = pOldFmt->GetFrmSize();
+                aFrmSize = pOldFormat->GetFrmSize();
                 aFrmSize.SetWidthPercent( 0 );
                 aFrmSize.SetHeightPercent( 255 );
                 pNewSet->Put( aFrmSize );
@@ -843,28 +843,28 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
                 pNewSet->Put( SvxULSpaceItem(RES_UL_SPACE) );
 
                 // The old one is paragraph-bound to the paragraph in the new one.
-                SwFmtAnchor aAnch( FLY_AT_PARA );
-                SwNodeIndex aAnchIdx( *pNewFmt->GetCntnt().GetCntntIdx(), 1 );
-                pNew = aAnchIdx.GetNode().GetTxtNode();
+                SwFormatAnchor aAnch( FLY_AT_PARA );
+                SwNodeIndex aAnchIdx( *pNewFormat->GetContent().GetContentIdx(), 1 );
+                pNew = aAnchIdx.GetNode().GetTextNode();
                 SwPosition aPos( aAnchIdx );
                 aAnch.SetAnchor( &aPos );
                 pNewSet->Put( aAnch );
 
                 if( pUndo )
-                    pUndo->SetFlys( *pOldFmt, *pNewSet, *pNewFmt );
+                    pUndo->SetFlys( *pOldFormat, *pNewSet, *pNewFormat );
                 else
-                    pOldFmt->SetFmtAttr( *pNewSet );
+                    pOldFormat->SetFormatAttr( *pNewSet );
 
                 delete pNewSet;
 
                 // Have only the FlyFrames created.
                 // We leave this to established methods (especially for InCntFlys).
-                pNewFmt->MakeFrms();
+                pNewFormat->MakeFrms();
                 // #i115719#
-                if ( bIsSwFlyFrmFmtInstance )
+                if ( bIsSwFlyFrameFormatInstance )
                 {
-                    static_cast<SwFlyFrmFmt*>(pOldFmt)->SetObjTitle( sTitle );
-                    static_cast<SwFlyFrmFmt*>(pOldFmt)->SetObjDescription( sDescription );
+                    static_cast<SwFlyFrameFormat*>(pOldFormat)->SetObjTitle( sTitle );
+                    static_cast<SwFlyFrameFormat*>(pOldFormat)->SetObjDescription( sDescription );
                 }
             }
             break;
@@ -878,49 +878,49 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
         // #i61007# order of captions
         bool bOrderNumberingFirst = SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst();
         // Work up OUString
-        OUString aTxt;
+        OUString aText;
         if( bOrderNumberingFirst )
         {
-            aTxt = rNumberingSeparator;
+            aText = rNumberingSeparator;
         }
         if( pType)
         {
-            aTxt += pType->GetName();
+            aText += pType->GetName();
             if( !bOrderNumberingFirst )
-                aTxt += " ";
+                aText += " ";
         }
-        sal_Int32 nIdx = aTxt.getLength();
-        if( !rTxt.isEmpty() )
+        sal_Int32 nIdx = aText.getLength();
+        if( !rText.isEmpty() )
         {
-            aTxt += rSeparator;
+            aText += rSeparator;
         }
-        const sal_Int32 nSepIdx = aTxt.getLength();
-        aTxt += rTxt;
+        const sal_Int32 nSepIdx = aText.getLength();
+        aText += rText;
 
         // Insert string
         SwIndex aIdx( pNew, 0 );
-        pNew->InsertText( aTxt, aIdx );
+        pNew->InsertText( aText, aIdx );
 
         // Insert field
         if(pType)
         {
-            SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pType), OUString(), SVX_NUM_ARABIC);
+            SwSetExpField aField( static_cast<SwSetExpFieldType*>(pType), OUString(), SVX_NUM_ARABIC);
             if( bOrderNumberingFirst )
                 nIdx = 0;
-            SwFmtFld aFmt( aFld );
-            pNew->InsertItem( aFmt, nIdx, nIdx );
+            SwFormatField aFormat( aField );
+            pNew->InsertItem( aFormat, nIdx, nIdx );
             if(!rCharacterStyle.isEmpty())
             {
-                SwCharFmt* pCharFmt = rDoc.FindCharFmtByName(rCharacterStyle);
-                if( !pCharFmt )
+                SwCharFormat* pCharFormat = rDoc.FindCharFormatByName(rCharacterStyle);
+                if( !pCharFormat )
                 {
                     const sal_uInt16 nMyId = SwStyleNameMapper::GetPoolIdFromUIName(rCharacterStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
-                    pCharFmt = rDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool( nMyId );
+                    pCharFormat = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( nMyId );
                 }
-                if (pCharFmt)
+                if (pCharFormat)
                 {
-                    SwFmtCharFmt aCharFmt( pCharFmt );
-                    pNew->InsertItem( aCharFmt, 0,
+                    SwFormatCharFormat aCharFormat( pCharFormat );
+                    pNew->InsertItem( aCharFormat, 0,
                         nSepIdx + 1, SetAttrMode::DONTEXPAND );
                 }
             }
@@ -931,15 +931,15 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
             if ( bBefore )
             {
                 if ( !pNew->GetSwAttrSet().GetKeep().GetValue()  )
-                    pNew->SetAttr( SvxFmtKeepItem( true, RES_KEEP ) );
+                    pNew->SetAttr( SvxFormatKeepItem( true, RES_KEEP ) );
             }
             else
             {
                 SwTableNode *const pNd =
                     rDoc.GetNodes()[nNdIdx]->GetStartNode()->GetTableNode();
-                SwTable &rTbl = pNd->GetTable();
-                if ( !rTbl.GetFrmFmt()->GetKeep().GetValue() )
-                    rTbl.GetFrmFmt()->SetFmtAttr( SvxFmtKeepItem( true, RES_KEEP ) );
+                SwTable &rTable = pNd->GetTable();
+                if ( !rTable.GetFrameFormat()->GetKeep().GetValue() )
+                    rTable.GetFrameFormat()->SetFormatAttr( SvxFormatKeepItem( true, RES_KEEP ) );
                 if ( pUndo )
                     pUndo->SetUndoKeep();
             }
@@ -947,12 +947,12 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
         rDoc.getIDocumentState().SetModified();
     }
 
-    return pNewFmt;
+    return pNewFormat;
 }
 
-SwFlyFrmFmt *
+SwFlyFrameFormat *
 SwDoc::InsertLabel(
-        SwLabelType const eType, OUString const& rTxt, OUString const& rSeparator,
+        SwLabelType const eType, OUString const& rText, OUString const& rSeparator,
         OUString const& rNumberingSeparator,
         bool const bBefore, sal_uInt16 const nId, sal_uLong const nNdIdx,
         OUString const& rCharacterStyle,
@@ -962,12 +962,12 @@ SwDoc::InsertLabel(
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         pUndo = new SwUndoInsertLabel(
-                        eType, rTxt, rSeparator, rNumberingSeparator,
+                        eType, rText, rSeparator, rNumberingSeparator,
                         bBefore, nId, rCharacterStyle, bCpyBrd );
     }
 
-    SwFlyFrmFmt *const pNewFmt = lcl_InsertLabel(*this, mpTxtFmtCollTbl, pUndo,
-            eType, rTxt, rSeparator, rNumberingSeparator, bBefore,
+    SwFlyFrameFormat *const pNewFormat = lcl_InsertLabel(*this, mpTextFormatCollTable, pUndo,
+            eType, rText, rSeparator, rNumberingSeparator, bBefore,
             nId, nNdIdx, rCharacterStyle, bCpyBrd);
 
     if (pUndo)
@@ -979,13 +979,13 @@ SwDoc::InsertLabel(
         GetIDocumentUndoRedo().DelAllUndoObj();
     }
 
-    return pNewFmt;
+    return pNewFormat;
 }
 
-static SwFlyFrmFmt *
-lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
-        SwUndoInsertLabel *const pUndo, SwDrawFrmFmt *const pOldFmt,
-        OUString const& rTxt,
+static SwFlyFrameFormat *
+lcl_InsertDrawLabel( SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable,
+        SwUndoInsertLabel *const pUndo, SwDrawFrameFormat *const pOldFormat,
+        OUString const& rText,
                                      const OUString& rSeparator,
                                      const OUString& rNumberSeparator,
                                      const sal_uInt16 nId,
@@ -995,20 +995,20 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
     ::sw::UndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
     ::sw::DrawUndoGuard const drawUndoGuard(rDoc.GetIDocumentUndoRedo());
 
-    // Because we get by the TxtColl's name, we need to create the field first.
-    OSL_ENSURE( nId == USHRT_MAX  || nId < rDoc.getIDocumentFieldsAccess().GetFldTypes()->size(),
-            "FldType index out of bounds" );
-    SwFieldType *pType = nId != USHRT_MAX ? (*rDoc.getIDocumentFieldsAccess().GetFldTypes())[nId] : 0;
+    // Because we get by the TextColl's name, we need to create the field first.
+    OSL_ENSURE( nId == USHRT_MAX  || nId < rDoc.getIDocumentFieldsAccess().GetFieldTypes()->size(),
+            "FieldType index out of bounds" );
+    SwFieldType *pType = nId != USHRT_MAX ? (*rDoc.getIDocumentFieldsAccess().GetFieldTypes())[nId] : 0;
     OSL_ENSURE( !pType || pType->Which() == RES_SETEXPFLD, "Wrong label id" );
 
-    SwTxtFmtColl *pColl = NULL;
+    SwTextFormatColl *pColl = NULL;
     if( pType )
     {
-        for( auto i = pTxtFmtCollTbl->size(); i; )
+        for( auto i = pTextFormatCollTable->size(); i; )
         {
-            if( (*pTxtFmtCollTbl)[ --i ]->GetName()==pType->GetName() )
+            if( (*pTextFormatCollTable)[ --i ]->GetName()==pType->GetName() )
             {
-                pColl = (*pTxtFmtCollTbl)[i];
+                pColl = (*pTextFormatCollTable)[i];
                 break;
             }
         }
@@ -1017,11 +1017,11 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
     if( !pColl )
     {
-        pColl = rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_LABEL );
+        pColl = rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_LABEL );
     }
 
-    SwTxtNode* pNew = NULL;
-    SwFlyFrmFmt* pNewFmt = NULL;
+    SwTextNode* pNew = NULL;
+    SwFlyFrameFormat* pNewFormat = NULL;
 
     // Destroy Frame,
     // insert new Frame,
@@ -1035,26 +1035,26 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
     //       Removing the frames of the drawing object changes its layer.
     const SdrLayerID nLayerId = rSdrObj.GetLayer();
 
-    pOldFmt->DelFrms();
+    pOldFormat->DelFrms();
 
-    // InCntnts need to be treated in a special way:
-    // The TxtAttribute needs to be destroyed.
+    // InContents need to be treated in a special way:
+    // The TextAttribute needs to be destroyed.
     // Unfortunately, this also destroys the Format next to the Frames.
     // To avoid this, we disconnect the attribute from the Format.
-    SfxItemSet* pNewSet = pOldFmt->GetAttrSet().Clone( false );
+    SfxItemSet* pNewSet = pOldFormat->GetAttrSet().Clone( false );
 
     // Protect the Frame's size and position
     if ( rSdrObj.IsMoveProtect() || rSdrObj.IsResizeProtect() )
     {
         SvxProtectItem aProtect(RES_PROTECT);
-        aProtect.SetCntntProtect( false );
+        aProtect.SetContentProtect( false );
         aProtect.SetPosProtect( rSdrObj.IsMoveProtect() );
         aProtect.SetSizeProtect( rSdrObj.IsResizeProtect() );
         pNewSet->Put( aProtect );
     }
 
     // Take over the text wrap
-    lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_SURROUND );
+    lcl_CpyAttr( *pNewSet, pOldFormat->GetAttrSet(), RES_SURROUND );
 
     // Send the frame to the back, if needed.
     // Consider the 'invisible' hell layer.
@@ -1068,64 +1068,64 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
     // Take over position
     // #i26791# - use directly drawing object's positioning attributes
-    pNewSet->Put( pOldFmt->GetHoriOrient() );
-    pNewSet->Put( pOldFmt->GetVertOrient() );
+    pNewSet->Put( pOldFormat->GetHoriOrient() );
+    pNewSet->Put( pOldFormat->GetVertOrient() );
 
-    pNewSet->Put( pOldFmt->GetAnchor() );
+    pNewSet->Put( pOldFormat->GetAnchor() );
 
     // The new one should be variable in its height!
      Size aSz( rSdrObj.GetCurrentBoundRect().GetSize() );
-    SwFmtFrmSize aFrmSize( ATT_MIN_SIZE, aSz.Width(), aSz.Height() );
+    SwFormatFrmSize aFrmSize( ATT_MIN_SIZE, aSz.Width(), aSz.Height() );
     pNewSet->Put( aFrmSize );
 
     // Apply the margin to the new Frame.
     // Don't set a border, use the one from the Template.
-    pNewSet->Put( pOldFmt->GetLRSpace() );
-    pNewSet->Put( pOldFmt->GetULSpace() );
+    pNewSet->Put( pOldFormat->GetLRSpace() );
+    pNewSet->Put( pOldFormat->GetULSpace() );
 
     SwStartNode* pSttNd =
         rDoc.GetNodes().MakeTextSection(
             SwNodeIndex( rDoc.GetNodes().GetEndOfAutotext() ),
                                     SwFlyStartNode, pColl );
 
-    pNewFmt = rDoc.MakeFlyFrmFmt( rDoc.GetUniqueFrameName(),
-                 rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_FRAME ) );
+    pNewFormat = rDoc.MakeFlyFrameFormat( rDoc.GetUniqueFrameName(),
+                 rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME ) );
 
     // Set border and shadow to default if the template contains any.
-    if( SfxItemState::SET == pNewFmt->GetAttrSet().GetItemState( RES_BOX, true ))
+    if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState( RES_BOX, true ))
         pNewSet->Put( *GetDfltAttr( RES_BOX ) );
 
-    if( SfxItemState::SET == pNewFmt->GetAttrSet().GetItemState(RES_SHADOW,true))
+    if( SfxItemState::SET == pNewFormat->GetAttrSet().GetItemState(RES_SHADOW,true))
         pNewSet->Put( *GetDfltAttr( RES_SHADOW ) );
 
-    pNewFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
-    pNewFmt->SetFmtAttr( *pNewSet );
+    pNewFormat->SetFormatAttr( SwFormatContent( pSttNd ));
+    pNewFormat->SetFormatAttr( *pNewSet );
 
-    const SwFmtAnchor& rAnchor = pNewFmt->GetAnchor();
+    const SwFormatAnchor& rAnchor = pNewFormat->GetAnchor();
     if ( FLY_AS_CHAR == rAnchor.GetAnchorId() )
     {
-        const SwPosition *pPos = rAnchor.GetCntntAnchor();
-        SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-        OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+        const SwPosition *pPos = rAnchor.GetContentAnchor();
+        SwTextNode *pTextNode = pPos->nNode.GetNode().GetTextNode();
+        OSL_ENSURE( pTextNode->HasHints(), "Missing FlyInCnt-Hint." );
         const sal_Int32 nIdx = pPos->nContent.GetIndex();
-        SwTxtAttr * const pHnt =
-            pTxtNode->GetTxtAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
+        SwTextAttr * const pHint =
+            pTextNode->GetTextAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
 
 #if OSL_DEBUG_LEVEL > 0
-        OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+        OSL_ENSURE( pHint && pHint->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
-        OSL_ENSURE( pHnt && pHnt->GetFlyCnt().
-                    GetFrmFmt() == (SwFrmFmt*)pOldFmt,
-                    "Wrong TxtFlyCnt-Hint." );
+        OSL_ENSURE( pHint && pHint->GetFlyCnt().
+                    GetFrameFormat() == (SwFrameFormat*)pOldFormat,
+                    "Wrong TextFlyCnt-Hint." );
 #endif
-        const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt( pNewFmt );
+        const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt()).SetFlyFormat( pNewFormat );
     }
 
     // The old one should not have a flow
     // and it should be adjusted to above and middle.
     pNewSet->ClearItem();
 
-    pNewSet->Put( SwFmtSurround( SURROUND_NONE ) );
+    pNewSet->Put( SwFormatSurround( SURROUND_NONE ) );
     if (nLayerId == rDoc.getIDocumentDrawModelAccess().GetHellId())
     {
     // Consider drawing objects in the 'invisible' hell layer
@@ -1139,31 +1139,31 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
     pNewSet->Put( SvxULSpaceItem( RES_UL_SPACE ) );
 
     // #i26791# - set position of the drawing object, which is labeled.
-    pNewSet->Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
-    pNewSet->Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ) );
+    pNewSet->Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
+    pNewSet->Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ) );
 
     // The old one is paragraph-bound to the new one's paragraph.
-    SwFmtAnchor aAnch( FLY_AT_PARA );
-    SwNodeIndex aAnchIdx( *pNewFmt->GetCntnt().GetCntntIdx(), 1 );
-    pNew = aAnchIdx.GetNode().GetTxtNode();
+    SwFormatAnchor aAnch( FLY_AT_PARA );
+    SwNodeIndex aAnchIdx( *pNewFormat->GetContent().GetContentIdx(), 1 );
+    pNew = aAnchIdx.GetNode().GetTextNode();
     SwPosition aPos( aAnchIdx );
     aAnch.SetAnchor( &aPos );
     pNewSet->Put( aAnch );
 
     if( pUndo )
     {
-        pUndo->SetFlys( *pOldFmt, *pNewSet, *pNewFmt );
+        pUndo->SetFlys( *pOldFormat, *pNewSet, *pNewFormat );
         // #i26791# - position no longer needed
         pUndo->SetDrawObj( nLayerId );
     }
     else
-        pOldFmt->SetFmtAttr( *pNewSet );
+        pOldFormat->SetFormatAttr( *pNewSet );
 
     delete pNewSet;
 
     // Have only the FlyFrames created.
     // We leave this to established methods (especially for InCntFlys).
-    pNewFmt->MakeFrms();
+    pNewFormat->MakeFrms();
 
     OSL_ENSURE( pNew, "No Label inserted" );
 
@@ -1173,57 +1173,57 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
         bool bOrderNumberingFirst = SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst();
 
         // prepare string
-        OUString aTxt;
+        OUString aText;
         if( bOrderNumberingFirst )
         {
-            aTxt = rNumberSeparator;
+            aText = rNumberSeparator;
         }
         if ( pType )
         {
-            aTxt += pType->GetName();
+            aText += pType->GetName();
             if( !bOrderNumberingFirst )
-                aTxt += " ";
+                aText += " ";
         }
-        sal_Int32 nIdx = aTxt.getLength();
-        aTxt += rSeparator;
-        const sal_Int32 nSepIdx = aTxt.getLength();
-        aTxt += rTxt;
+        sal_Int32 nIdx = aText.getLength();
+        aText += rSeparator;
+        const sal_Int32 nSepIdx = aText.getLength();
+        aText += rText;
 
         // insert text
         SwIndex aIdx( pNew, 0 );
-        pNew->InsertText( aTxt, aIdx );
+        pNew->InsertText( aText, aIdx );
 
         // insert field
         if ( pType )
         {
-            SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pType), OUString(), SVX_NUM_ARABIC );
+            SwSetExpField aField( static_cast<SwSetExpFieldType*>(pType), OUString(), SVX_NUM_ARABIC );
             if( bOrderNumberingFirst )
                 nIdx = 0;
-            SwFmtFld aFmt( aFld );
-            pNew->InsertItem( aFmt, nIdx, nIdx );
+            SwFormatField aFormat( aField );
+            pNew->InsertItem( aFormat, nIdx, nIdx );
             if ( !rCharacterStyle.isEmpty() )
             {
-                SwCharFmt * pCharFmt = rDoc.FindCharFmtByName(rCharacterStyle);
-                if ( !pCharFmt )
+                SwCharFormat * pCharFormat = rDoc.FindCharFormatByName(rCharacterStyle);
+                if ( !pCharFormat )
                 {
                     const sal_uInt16 nMyId = SwStyleNameMapper::GetPoolIdFromUIName( rCharacterStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
-                    pCharFmt = rDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool( nMyId );
+                    pCharFormat = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( nMyId );
                 }
-                if ( pCharFmt )
+                if ( pCharFormat )
                 {
-                    SwFmtCharFmt aCharFmt( pCharFmt );
-                    pNew->InsertItem( aCharFmt, 0, nSepIdx + 1,
+                    SwFormatCharFormat aCharFormat( pCharFormat );
+                    pNew->InsertItem( aCharFormat, 0, nSepIdx + 1,
                             SetAttrMode::DONTEXPAND );
                 }
             }
         }
     }
 
-    return pNewFmt;
+    return pNewFormat;
 }
 
-SwFlyFrmFmt* SwDoc::InsertDrawLabel(
-        OUString const& rTxt,
+SwFlyFrameFormat* SwDoc::InsertDrawLabel(
+        OUString const& rText,
         OUString const& rSeparator,
         OUString const& rNumberSeparator,
         sal_uInt16 const nId,
@@ -1232,13 +1232,13 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
 {
     SwDrawContact *const pContact =
         static_cast<SwDrawContact*>(GetUserCall( &rSdrObj ));
-    OSL_ENSURE( RES_DRAWFRMFMT == pContact->GetFmt()->Which(),
-            "InsertDrawLabel(): not a DrawFrmFmt" );
+    OSL_ENSURE( RES_DRAWFRMFMT == pContact->GetFormat()->Which(),
+            "InsertDrawLabel(): not a DrawFrameFormat" );
     if (!pContact)
         return 0;
 
-    SwDrawFrmFmt* pOldFmt = static_cast<SwDrawFrmFmt *>(pContact->GetFmt());
-    if (!pOldFmt)
+    SwDrawFrameFormat* pOldFormat = static_cast<SwDrawFrameFormat *>(pContact->GetFormat());
+    if (!pOldFormat)
         return 0;
 
     SwUndoInsertLabel * pUndo = 0;
@@ -1246,13 +1246,13 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
     {
         GetIDocumentUndoRedo().ClearRedo();
         pUndo = new SwUndoInsertLabel(
-            LTYPE_DRAW, rTxt, rSeparator, rNumberSeparator, false,
+            LTYPE_DRAW, rText, rSeparator, rNumberSeparator, false,
             nId, rCharacterStyle, false );
     }
 
-    SwFlyFrmFmt *const pNewFmt = lcl_InsertDrawLabel(
-        *this, mpTxtFmtCollTbl, pUndo, pOldFmt,
-        rTxt, rSeparator, rNumberSeparator, nId, rCharacterStyle, rSdrObj);
+    SwFlyFrameFormat *const pNewFormat = lcl_InsertDrawLabel(
+        *this, mpTextFormatCollTable, pUndo, pOldFormat,
+        rText, rSeparator, rNumberSeparator, nId, rCharacterStyle, rSdrObj);
 
     if (pUndo)
     {
@@ -1263,7 +1263,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
         GetIDocumentUndoRedo().DelAllUndoObj();
     }
 
-    return pNewFmt;
+    return pNewFormat;
 }
 
 IMPL_LINK( SwDoc, BackgroundDone, SvxBrushItem*, )
@@ -1288,7 +1288,7 @@ static OUString lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId )
     {
         OUString newName = "MailMergeFly"
             + OStringToOUString( DateTimeToOString( DateTime( DateTime::SYSTEM )), RTL_TEXTENCODING_ASCII_US )
-            + OUString::number( pDoc->GetSpzFrmFmts()->size() + 1 );
+            + OUString::number( pDoc->GetSpzFrameFormats()->size() + 1 );
         return newName;
     }
 
@@ -1296,25 +1296,25 @@ static OUString lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId )
     OUString aName( aId );
     sal_Int32 nNmLen = aName.getLength();
 
-    const SwFrmFmts& rFmts = *pDoc->GetSpzFrmFmts();
+    const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
 
-    std::vector<sal_uInt8> aSetFlags(rFmts.size()/8 + 2);
+    std::vector<sal_uInt8> aSetFlags(rFormats.size()/8 + 2);
 
-    for( SwFrmFmts::size_type n = 0; n < rFmts.size(); ++n )
+    for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n )
     {
-        const SwFrmFmt* pFlyFmt = rFmts[ n ];
-        if( RES_FLYFRMFMT == pFlyFmt->Which() &&
-            pFlyFmt->GetName().startsWith( aName ) )
+        const SwFrameFormat* pFlyFormat = rFormats[ n ];
+        if( RES_FLYFRMFMT == pFlyFormat->Which() &&
+            pFlyFormat->GetName().startsWith( aName ) )
         {
             // Only get and set the Flag
-            const sal_Int32 nNum = pFlyFmt->GetName().copy( nNmLen ).toInt32()-1;
-            if( nNum >= 0 && static_cast<SwFrmFmts::size_type>(nNum) < rFmts.size() )
+            const sal_Int32 nNum = pFlyFormat->GetName().copy( nNmLen ).toInt32()-1;
+            if( nNum >= 0 && static_cast<SwFrameFormats::size_type>(nNum) < rFormats.size() )
                 aSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
         }
     }
 
     // All numbers are flagged accordingly, so determine the right one
-    SwFrmFmts::size_type nNum = rFmts.size();
+    SwFrameFormats::size_type nNum = rFormats.size();
     for( std::vector<sal_uInt8>::size_type n=0; n<aSetFlags.size(); ++n )
     {
         sal_uInt8 nTmp = aSetFlags[ n ];
@@ -1346,15 +1346,15 @@ OUString SwDoc::GetUniqueFrameName() const
     return lcl_GetUniqueFlyName( this, STR_FRAME_DEFNAME );
 }
 
-const SwFlyFrmFmt* SwDoc::FindFlyByName( const OUString& rName, sal_Int8 nNdTyp ) const
+const SwFlyFrameFormat* SwDoc::FindFlyByName( const OUString& rName, sal_Int8 nNdTyp ) const
 {
-    const SwFrmFmts& rFmts = *GetSpzFrmFmts();
-    for( auto n = rFmts.size(); n; )
+    const SwFrameFormats& rFormats = *GetSpzFrameFormats();
+    for( auto n = rFormats.size(); n; )
     {
-        const SwFrmFmt* pFlyFmt = rFmts[ --n ];
+        const SwFrameFormat* pFlyFormat = rFormats[ --n ];
         const SwNodeIndex* pIdx = 0;
-        if( RES_FLYFRMFMT == pFlyFmt->Which() && pFlyFmt->GetName() == rName &&
-            0 != ( pIdx = pFlyFmt->GetCntnt().GetCntntIdx() ) &&
+        if( RES_FLYFRMFMT == pFlyFormat->Which() && pFlyFormat->GetName() == rName &&
+            0 != ( pIdx = pFlyFormat->GetContent().GetContentIdx() ) &&
             pIdx->GetNode().GetNodes().IsDocNodes() )
         {
             if( nNdTyp )
@@ -1362,24 +1362,24 @@ const SwFlyFrmFmt* SwDoc::FindFlyByName( const OUString& rName, sal_Int8 nNdTyp
                 // query for the right NodeType
                 const SwNode* pNd = GetNodes()[ pIdx->GetIndex()+1 ];
                 if( nNdTyp == ND_TEXTNODE
-                        ? !pNd->IsNoTxtNode()
+                        ? !pNd->IsNoTextNode()
                         : nNdTyp == pNd->GetNodeType() )
-                    return static_cast<const SwFlyFrmFmt*>(pFlyFmt);
+                    return static_cast<const SwFlyFrameFormat*>(pFlyFormat);
             }
             else
-                return static_cast<const SwFlyFrmFmt*>(pFlyFmt);
+                return static_cast<const SwFlyFrameFormat*>(pFlyFormat);
         }
     }
     return 0;
 }
 
-void SwDoc::SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName )
+void SwDoc::SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName )
 {
     OUString sName( rName );
     if( sName.isEmpty() || FindFlyByName( sName ) )
     {
         sal_uInt16 nTyp = STR_FRAME_DEFNAME;
-        const SwNodeIndex* pIdx = rFmt.GetCntnt().GetCntntIdx();
+        const SwNodeIndex* pIdx = rFormat.GetContent().GetContentIdx();
         if( pIdx && pIdx->GetNode().GetNodes().IsDocNodes() )
             switch( GetNodes()[ pIdx->GetIndex() + 1 ]->GetNodeType() )
             {
@@ -1388,7 +1388,7 @@ void SwDoc::SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName )
             }
         sName = lcl_GetUniqueFlyName( this, nTyp );
     }
-    rFmt.SetName( sName, true );
+    rFormat.SetName( sName, true );
     getIDocumentState().SetModified();
 }
 
@@ -1403,18 +1403,18 @@ void SwDoc::SetAllUniqueFlyNames()
     const OUString sGrfNm( nGrfId );
     const OUString sOLENm( nOLEId );
 
-    if( 255 < ( n = GetSpzFrmFmts()->size() ))
+    if( 255 < ( n = GetSpzFrameFormats()->size() ))
         n = 255;
-    SwFrmFmts aArr;
+    SwFrameFormats aArr;
     aArr.reserve( n );
-    SwFrmFmt* pFlyFmt;
+    SwFrameFormat* pFlyFormat;
     bool bContainsAtPageObjWithContentAnchor = false;
 
-    for( n = GetSpzFrmFmts()->size(); n; )
+    for( n = GetSpzFrameFormats()->size(); n; )
     {
-        if( RES_FLYFRMFMT == (pFlyFmt = (*GetSpzFrmFmts())[ --n ])->Which() )
+        if( RES_FLYFRMFMT == (pFlyFormat = (*GetSpzFrameFormats())[ --n ])->Which() )
         {
-            const OUString aNm = pFlyFmt->GetName();
+            const OUString aNm = pFlyFormat->GetName();
             if ( !aNm.isEmpty() )
             {
                 sal_Int32 *pNum = 0;
@@ -1444,14 +1444,14 @@ void SwDoc::SetAllUniqueFlyNames()
             }
             else
                 // we want to set that afterwards
-                aArr.push_back( pFlyFmt );
+                aArr.push_back( pFlyFormat );
 
         }
         if ( !bContainsAtPageObjWithContentAnchor )
         {
-            const SwFmtAnchor& rAnchor = pFlyFmt->GetAnchor();
+            const SwFormatAnchor& rAnchor = pFlyFormat->GetAnchor();
             if ( (FLY_AT_PAGE == rAnchor.GetAnchorId()) &&
-                 rAnchor.GetCntntAnchor() )
+                 rAnchor.GetContentAnchor() )
             {
                 bContainsAtPageObjWithContentAnchor = true;
             }
@@ -1463,39 +1463,39 @@ void SwDoc::SetAllUniqueFlyNames()
     {
         const SwNodeIndex* pIdx;
 
-        if( 0 != ( pIdx = ( pFlyFmt = aArr[ --n ])->GetCntnt().GetCntntIdx() )
+        if( 0 != ( pIdx = ( pFlyFormat = aArr[ --n ])->GetContent().GetContentIdx() )
             && pIdx->GetNode().GetNodes().IsDocNodes() )
         {
             switch( GetNodes()[ pIdx->GetIndex() + 1 ]->GetNodeType() )
             {
             case ND_GRFNODE:
-                pFlyFmt->SetName( sGrfNm + OUString::number( ++nGrfNum ));
+                pFlyFormat->SetName( sGrfNm + OUString::number( ++nGrfNum ));
                 break;
             case ND_OLENODE:
-                pFlyFmt->SetName( sOLENm + OUString::number( ++nOLENum ));
+                pFlyFormat->SetName( sOLENm + OUString::number( ++nOLENum ));
                 break;
             default:
-                pFlyFmt->SetName( sFlyNm + OUString::number( ++nFlyNum ));
+                pFlyFormat->SetName( sFlyNm + OUString::number( ++nFlyNum ));
                 break;
             }
         }
     }
     aArr.clear();
 
-    if( !GetFtnIdxs().empty() )
+    if( !GetFootnoteIdxs().empty() )
     {
-        SwTxtFtn::SetUniqueSeqRefNo( *this );
+        SwTextFootnote::SetUniqueSeqRefNo( *this );
         // #i52775# Chapter footnotes did not get updated correctly.
-        // Calling UpdateAllFtn() instead of UpdateFtn() solves this problem,
-        // but I do not dare to call UpdateAllFtn() in all cases: Safety first.
-        if ( FTNNUM_CHAPTER == GetFtnInfo().eNum )
+        // Calling UpdateAllFootnote() instead of UpdateFootnote() solves this problem,
+        // but I do not dare to call UpdateAllFootnote() in all cases: Safety first.
+        if ( FTNNUM_CHAPTER == GetFootnoteInfo().eNum )
         {
-            GetFtnIdxs().UpdateAllFtn();
+            GetFootnoteIdxs().UpdateAllFootnote();
         }
         else
         {
             SwNodeIndex aTmp( GetNodes() );
-            GetFtnIdxs().UpdateFtn( aTmp );
+            GetFootnoteIdxs().UpdateFootnote( aTmp );
         }
     }
 }
@@ -1513,36 +1513,36 @@ bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
     {
         // get up by using the Anchor
 #if OSL_DEBUG_LEVEL > 0
-        std::list<const SwFrmFmt*> checkFmts;
-        for( auto pFmt : *GetSpzFrmFmts() )
+        std::list<const SwFrameFormat*> checkFormats;
+        for( auto pFormat : *GetSpzFrameFormats() )
         {
-            const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
             if( pIdx && pFlyNd == &pIdx->GetNode() )
-                checkFmts.push_back( pFmt );
+                checkFormats.push_back( pFormat );
         }
 #endif
-        std::vector<SwFrmFmt*> const*const pFlys(pFlyNd->GetAnchoredFlys());
+        std::vector<SwFrameFormat*> const*const pFlys(pFlyNd->GetAnchoredFlys());
         bool bFound(false);
         for (size_t i = 0; pFlys && i < pFlys->size(); ++i)
         {
-            const SwFrmFmt *const pFmt = (*pFlys)[i];
-            const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const SwFrameFormat *const pFormat = (*pFlys)[i];
+            const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
             if( pIdx && pFlyNd == &pIdx->GetNode() )
             {
 #if OSL_DEBUG_LEVEL > 0
-                std::list<const SwFrmFmt*>::iterator checkPos = std::find(
-                        checkFmts.begin(), checkFmts.end(), pFmt );
-                assert( checkPos != checkFmts.end());
-                checkFmts.erase( checkPos );
+                std::list<const SwFrameFormat*>::iterator checkPos = std::find(
+                        checkFormats.begin(), checkFormats.end(), pFormat );
+                assert( checkPos != checkFormats.end());
+                checkFormats.erase( checkPos );
 #endif
-                const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+                const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
                 if ((FLY_AT_PAGE == rAnchor.GetAnchorId()) ||
-                    !rAnchor.GetCntntAnchor() )
+                    !rAnchor.GetContentAnchor() )
                 {
                     return false;
                 }
 
-                pNd = &rAnchor.GetCntntAnchor()->nNode.GetNode();
+                pNd = &rAnchor.GetContentAnchor()->nNode.GetNode();
                 pFlyNd = pNd->FindFlyStartNode();
                 bFound = true;
                 break;
@@ -1564,9 +1564,9 @@ short SwDoc::GetTextDirection( const SwPosition& rPos,
 {
     short nRet = -1;
 
-    SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode *pNd = rPos.nNode.GetNode().GetContentNode();
 
-    // #i42921# - use new method <SwCntntNode::GetTextDirection(..)>
+    // #i42921# - use new method <SwContentNode::GetTextDirection(..)>
     if ( pNd )
     {
         nRet = pNd->GetTextDirection( rPos, pPt );
@@ -1577,25 +1577,25 @@ short SwDoc::GetTextDirection( const SwPosition& rPos,
         if( pNd )
         {
             // Are we in a FlyFrame? Then look at that for the correct attribute
-            const SwFrmFmt* pFlyFmt = pNd->GetFlyFmt();
-            while( pFlyFmt )
+            const SwFrameFormat* pFlyFormat = pNd->GetFlyFormat();
+            while( pFlyFormat )
             {
-                pItem = &pFlyFmt->GetFrmDir();
+                pItem = &pFlyFormat->GetFrmDir();
                 if( FRMDIR_ENVIRONMENT == pItem->GetValue() )
                 {
                     pItem = 0;
-                    const SwFmtAnchor* pAnchor = &pFlyFmt->GetAnchor();
+                    const SwFormatAnchor* pAnchor = &pFlyFormat->GetAnchor();
                     if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) &&
-                        pAnchor->GetCntntAnchor())
+                        pAnchor->GetContentAnchor())
                     {
-                        pFlyFmt = pAnchor->GetCntntAnchor()->nNode.
-                                            GetNode().GetFlyFmt();
+                        pFlyFormat = pAnchor->GetContentAnchor()->nNode.
+                                            GetNode().GetFlyFormat();
                     }
                     else
-                        pFlyFmt = 0;
+                        pFlyFormat = 0;
                 }
                 else
-                    pFlyFmt = 0;
+                    pFlyFormat = 0;
             }
 
             if( !pItem )
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 60f9756069c7..3f60d4e6f697 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -123,11 +123,11 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::document;
 
-const sal_Char sFrmFmtStr[] = "Frameformat";
+const sal_Char sFrameFormatStr[] = "Frameformat";
 const sal_Char sEmptyPageStr[] = "Empty Page";
 const sal_Char sColumnCntStr[] = "Columncontainer";
-const sal_Char sCharFmtStr[] = "Character style";
-const sal_Char sTxtCollStr[] = "Paragraph style";
+const sal_Char sCharFormatStr[] = "Character style";
+const sal_Char sTextCollStr[] = "Paragraph style";
 const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
 
 /*
@@ -186,14 +186,14 @@ void StartGrammarChecking( SwDoc &rDoc )
 /*
  * internal functions
  */
-static void lcl_DelFmtIndices( SwFmt* pFmt )
+static void lcl_DelFormatIndices( SwFormat* pFormat )
 {
-    SwFmtCntnt &rFmtCntnt = (SwFmtCntnt&)pFmt->GetCntnt();
-    if ( rFmtCntnt.GetCntntIdx() )
-        rFmtCntnt.SetNewCntntIdx( 0 );
-    SwFmtAnchor &rFmtAnchor = (SwFmtAnchor&)pFmt->GetAnchor();
-    if ( rFmtAnchor.GetCntntAnchor() )
-        rFmtAnchor.SetAnchor( 0 );
+    SwFormatContent &rFormatContent = (SwFormatContent&)pFormat->GetContent();
+    if ( rFormatContent.GetContentIdx() )
+        rFormatContent.SetNewContentIdx( 0 );
+    SwFormatAnchor &rFormatAnchor = (SwFormatAnchor&)pFormat->GetAnchor();
+    if ( rFormatAnchor.GetContentAnchor() )
+        rFormatAnchor.SetAnchor( 0 );
 }
 
 /*
@@ -223,33 +223,33 @@ SwDoc::SwDoc()
     m_pDocumentLayoutManager( new ::sw::DocumentLayoutManager( *this ) ),
     m_pDocumentStylePoolManager( new ::sw::DocumentStylePoolManager( *this ) ),
     m_pDocumentExternalDataManager( new ::sw::DocumentExternalDataManager() ),
-    mpDfltFrmFmt( new SwFrmFmt( GetAttrPool(), sFrmFmtStr, 0 ) ),
-    mpEmptyPageFmt( new SwFrmFmt( GetAttrPool(), sEmptyPageStr, mpDfltFrmFmt ) ),
-    mpColumnContFmt( new SwFrmFmt( GetAttrPool(), sColumnCntStr, mpDfltFrmFmt ) ),
-    mpDfltCharFmt( new SwCharFmt( GetAttrPool(), sCharFmtStr, 0 ) ),
-    mpDfltTxtFmtColl( new SwTxtFmtColl( GetAttrPool(), sTxtCollStr ) ),
-    mpDfltGrfFmtColl( new SwGrfFmtColl( GetAttrPool(), sGrfCollStr ) ),
-    mpFrmFmtTbl( new SwFrmFmts() ),
-    mpCharFmtTbl( new SwCharFmts() ),
-    mpSpzFrmFmtTbl( new SwFrmFmts() ),
-    mpSectionFmtTbl( new SwSectionFmts() ),
-    mpTblFrmFmtTbl( new SwFrmFmts() ),
-    mpTxtFmtCollTbl( new SwTxtFmtColls() ),
-    mpGrfFmtCollTbl( new SwGrfFmtColls() ),
+    mpDfltFrameFormat( new SwFrameFormat( GetAttrPool(), sFrameFormatStr, 0 ) ),
+    mpEmptyPageFormat( new SwFrameFormat( GetAttrPool(), sEmptyPageStr, mpDfltFrameFormat ) ),
+    mpColumnContFormat( new SwFrameFormat( GetAttrPool(), sColumnCntStr, mpDfltFrameFormat ) ),
+    mpDfltCharFormat( new SwCharFormat( GetAttrPool(), sCharFormatStr, 0 ) ),
+    mpDfltTextFormatColl( new SwTextFormatColl( GetAttrPool(), sTextCollStr ) ),
+    mpDfltGrfFormatColl( new SwGrfFormatColl( GetAttrPool(), sGrfCollStr ) ),
+    mpFrameFormatTable( new SwFrameFormats() ),
+    mpCharFormatTable( new SwCharFormats() ),
+    mpSpzFrameFormatTable( new SwFrameFormats() ),
+    mpSectionFormatTable( new SwSectionFormats() ),
+    mpTableFrameFormatTable( new SwFrameFormats() ),
+    mpTextFormatCollTable( new SwTextFormatColls() ),
+    mpGrfFormatCollTable( new SwGrfFormatColls() ),
     mpTOXTypes( new SwTOXTypes() ),
     mpDefTOXBases( new SwDefTOXBase_Impl() ),
     mpGlossaryDoc( 0 ),
     mpOutlineRule( 0 ),
-    mpFtnInfo( new SwFtnInfo ),
+    mpFootnoteInfo( new SwFootnoteInfo ),
     mpEndNoteInfo( new SwEndNoteInfo ),
     mpLineNumberInfo( new SwLineNumberInfo ),
-    mpFtnIdxs( new SwFtnIdxs ),
+    mpFootnoteIdxs( new SwFootnoteIdxs ),
     mpDocShell( 0 ),
     mpACEWord( 0 ),
     mpURLStateChgd( 0 ),
     mpNumberFormatter( 0 ),
-    mpNumRuleTbl( new SwNumRuleTbl ),
-    mpUnoCrsrTbl( new SwUnoCrsrTbl() ),
+    mpNumRuleTable( new SwNumRuleTable ),
+    mpUnoCrsrTable( new SwUnoCrsrTable() ),
     mpPgPViewPrtData( 0 ),
     mpExtInputRing( 0 ),
     mpStyleAccess( 0 ),
@@ -265,10 +265,10 @@ SwDoc::SwDoc()
     mbInXMLImport(false),
     mbUpdateTOX(false),
     mbInLoadAsynchron(false),
-    mbIsAutoFmtRedline(false),
+    mbIsAutoFormatRedline(false),
     mbOLEPrtNotifyPending(false),
     mbAllOLENotify(false),
-    mbInsOnlyTxtGlssry(false),
+    mbInsOnlyTextGlssry(false),
     mbContains_MSVBasic(false),
     mbClipBoard( false ),
     mbColumnSelection( false ),
@@ -291,35 +291,35 @@ SwDoc::SwDoc()
     // style hierarchies) are created and to always set (but only at the root) the FillStyle
     // to NONE fixed; that will add that attribute to the file format. It will be hard to reset
     // attribbute sets (which is done at import and using UI). Also not a good solution.
-    // Luckily Writer uses pDfltTxtFmtColl as default parent for all paragraphs and similar, thus
+    // Luckily Writer uses pDfltTextFormatColl as default parent for all paragraphs and similar, thus
     // it is possible to set this attribute here. It will be not reset when importing.
-    mpDfltTxtFmtColl->SetFmtAttr(XFillStyleItem(drawing::FillStyle_NONE));
-    mpDfltFrmFmt->SetFmtAttr(XFillStyleItem(drawing::FillStyle_NONE));
+    mpDfltTextFormatColl->SetFormatAttr(XFillStyleItem(drawing::FillStyle_NONE));
+    mpDfltFrameFormat->SetFormatAttr(XFillStyleItem(drawing::FillStyle_NONE));
 
     /*
-     * DefaultFormats and DefaultFormatCollections (FmtColl)
+     * DefaultFormats and DefaultFormatCollections (FormatColl)
      * are inserted at position 0 at the respective array.
-     * The formats in the FmtColls are derived from the
+     * The formats in the FormatColls are derived from the
      * DefaultFormats and are also in the list.
      */
     /* Formats */
-    mpFrmFmtTbl->push_back(mpDfltFrmFmt);
-    mpCharFmtTbl->push_back(mpDfltCharFmt);
+    mpFrameFormatTable->push_back(mpDfltFrameFormat);
+    mpCharFormatTable->push_back(mpDfltCharFormat);
 
-    /* FmtColls */
+    /* FormatColls */
     // TXT
-    mpTxtFmtCollTbl->push_back(mpDfltTxtFmtColl);
+    mpTextFormatCollTable->push_back(mpDfltTextFormatColl);
     // GRF
-    mpGrfFmtCollTbl->push_back(mpDfltGrfFmtColl);
+    mpGrfFormatCollTable->push_back(mpDfltGrfFormatColl);
 
-    // Create PageDesc, EmptyPageFmt and ColumnFmt
+    // Create PageDesc, EmptyPageFormat and ColumnFormat
     if ( maPageDescs.empty() )
         getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_STANDARD );
 
     // Set to "Empty Page"
-    mpEmptyPageFmt->SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE ) );
-    // Set BodyFmt for columns
-    mpColumnContFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) );
+    mpEmptyPageFormat->SetFormatAttr( SwFormatFrmSize( ATT_FIX_SIZE ) );
+    // Set BodyFormat for columns
+    mpColumnContFormat->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ) );
 
     GetDocumentFieldsManager()._InitFieldTypes();
 
@@ -332,11 +332,11 @@ SwDoc::SwDoc()
     // Counting of phantoms depends on <IsOldNumbering()>
     mpOutlineRule->SetCountPhantoms( !GetDocumentSettingManager().get(DocumentSettingId::OLD_NUMBERING) );
 
-    new SwTxtNode(
+    new SwTextNode(
             SwNodeIndex(GetUndoManager().GetUndoNodes().GetEndOfContent()),
-            mpDfltTxtFmtColl );
-    new SwTxtNode( SwNodeIndex( GetNodes().GetEndOfContent() ),
-                    getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+            mpDfltTextFormatColl );
+    new SwTextNode( SwNodeIndex( GetNodes().GetEndOfContent() ),
+                    getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
 
     maOLEModifiedIdle.SetPriority( SchedulerPriority::LOWEST );
     maOLEModifiedIdle.SetIdleHdl( LINK( this, SwDoc, DoUpdateModifiedOLE ));
@@ -394,15 +394,15 @@ SwDoc::~SwDoc()
     delete mpGrammarContact;
     mpGrammarContact = 0;
 
-    //!! needs to be done to destroy a possible SwFmtDrop format that may
+    //!! needs to be done to destroy a possible SwFormatDrop format that may
     //!! be connected to a char format which may not otherwise be removed
-    //!! and thus would leave a unremoved SwFmt object. (TL)
+    //!! and thus would leave a unremoved SwFormat object. (TL)
     //!! (this is case is not possible via UI but via API...)
-    SwFmtDrop aDrop;
+    SwFormatDrop aDrop;
     SetDefault(aDrop);
-    //!! same for SwFmtCharFmt
-    SwFmtCharFmt aCharFmt(NULL);
-    SetDefault(aCharFmt);
+    //!! same for SwFormatCharFormat
+    SwFormatCharFormat aCharFormat(NULL);
+    SetDefault(aCharFormat);
 
     getIDocumentTimerAccess().StopIdling();   // stop idle timer
 
@@ -420,10 +420,10 @@ SwDoc::~SwDoc()
     mbDtor = true;
 
     //Clear the redline table before the nodes array is destroyed
-    getIDocumentRedlineAccess().GetRedlineTbl().DeleteAndDestroyAll();
-    getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteAndDestroyAll();
+    getIDocumentRedlineAccess().GetRedlineTable().DeleteAndDestroyAll();
+    getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteAndDestroyAll();
 
-    delete mpUnoCrsrTbl;
+    delete mpUnoCrsrTable;
     delete mpACEWord;
 
     // Release the BaseLinks
@@ -443,7 +443,7 @@ SwDoc::~SwDoc()
     SwNodes & rUndoNodes( GetUndoManager().GetUndoNodes() );
     rUndoNodes.pOutlineNds->clear();
 
-    mpFtnIdxs->clear();
+    mpFootnoteIdxs->clear();
 
     // indices could be registered in attributes
     m_pUndoManager->DelAllUndoObj();
@@ -475,15 +475,15 @@ SwDoc::~SwDoc()
 
     // Any of the FrmFormats can still have indices registered.
     // These need to be destroyed now at the latest.
-    for( SwFrmFmt* pFmt : *mpFrmFmtTbl )
-        lcl_DelFmtIndices( pFmt );
-    for( SwFrmFmt* pFmt : *mpSpzFrmFmtTbl )
-        lcl_DelFmtIndices( pFmt );
-    for( SwSectionFmt* pFmt : *mpSectionFmtTbl )
-        lcl_DelFmtIndices( pFmt );
+    for( SwFrameFormat* pFormat : *mpFrameFormatTable )
+        lcl_DelFormatIndices( pFormat );
+    for( SwFrameFormat* pFormat : *mpSpzFrameFormatTable )
+        lcl_DelFormatIndices( pFormat );
+    for( SwSectionFormat* pFormat : *mpSectionFormatTable )
+        lcl_DelFormatIndices( pFormat );
 
     // The formats/styles that follow depend on the default formats.
-    // Destroy these only after destroying the FmtIndices, because the content
+    // Destroy these only after destroying the FormatIndices, because the content
     // of headers/footers has to be deleted as well. If in the headers/footers
     // there are still Flys registered at that point, we have a problem.
     maPageDescs.clear();
@@ -498,25 +498,25 @@ SwDoc::~SwDoc()
 
     // Delete for Collections
     // So that we get rid of the dependencies
-    mpFtnInfo->ReleaseCollection();
+    mpFootnoteInfo->ReleaseCollection();
     mpEndNoteInfo->ReleaseCollection();
 
-    OSL_ENSURE( mpDfltTxtFmtColl == (*mpTxtFmtCollTbl)[0],
+    OSL_ENSURE( mpDfltTextFormatColl == (*mpTextFormatCollTable)[0],
             "Default-Text-Collection must always be at the start" );
 
     // Optimization: Based on the fact that Standard is always 2nd in the
     // array, we should delete it as the last. With this we avoid
     // reparenting the Formats all the time!
-    if( 2 < mpTxtFmtCollTbl->size() )
-        mpTxtFmtCollTbl->DeleteAndDestroy(2, mpTxtFmtCollTbl->size());
-    mpTxtFmtCollTbl->DeleteAndDestroy(1, mpTxtFmtCollTbl->size());
-    delete mpTxtFmtCollTbl;
+    if( 2 < mpTextFormatCollTable->size() )
+        mpTextFormatCollTable->DeleteAndDestroy(2, mpTextFormatCollTable->size());
+    mpTextFormatCollTable->DeleteAndDestroy(1, mpTextFormatCollTable->size());
+    delete mpTextFormatCollTable;
 
-    OSL_ENSURE( mpDfltGrfFmtColl == (*mpGrfFmtCollTbl)[0],
+    OSL_ENSURE( mpDfltGrfFormatColl == (*mpGrfFormatCollTable)[0],
             "DefaultGrfCollection must always be at the start" );
 
-    mpGrfFmtCollTbl->DeleteAndDestroy(1, mpGrfFmtCollTbl->size());
-    delete mpGrfFmtCollTbl;
+    mpGrfFormatCollTable->DeleteAndDestroy(1, mpGrfFormatCollTable->size());
+    delete mpGrfFormatCollTable;
 
     // Without explicitly freeing the DocumentDeviceManager
     // and relying on the implicit freeing there would be a crash
@@ -524,13 +524,13 @@ SwDoc::~SwDoc()
     m_pDeviceAccess.reset();
 
     /*
-     * DefaultFormats and DefaultFormatCollections (FmtColl)
+     * DefaultFormats and DefaultFormatCollections (FormatColl)
      * are at position 0 of their respective arrays.
      * In order to not be deleted by the array's dtor, we remove them
      * now.
      */
-    mpFrmFmtTbl->erase( mpFrmFmtTbl->begin() );
-    mpCharFmtTbl->erase( mpCharFmtTbl->begin() );
+    mpFrameFormatTable->erase( mpFrameFormatTable->begin() );
+    mpCharFormatTable->erase( mpCharFormatTable->begin() );
 
 #if HAVE_FEATURE_DBCONNECTIVITY
     DELETEZ( mpDBManager );
@@ -539,7 +539,7 @@ SwDoc::~SwDoc()
     // All Flys need to be destroyed before the Drawing Model,
     // because Flys can still contain DrawContacts, when no
     // Layout could be constructed due to a read error.
-    mpSpzFrmFmtTbl->DeleteAndDestroy( 0, mpSpzFrmFmtTbl->size() );
+    mpSpzFrameFormatTable->DeleteAndDestroy( 0, mpSpzFrameFormatTable->size() );
 
     // Only now destroy the Model, the drawing objects - which are also
     // contained in the Undo - need to remove their attributes from the
@@ -551,30 +551,30 @@ SwDoc::~SwDoc()
 
     // Clear the Tables before deleting the defaults, or we crash due to
     // dependencies on defaults.
-    delete mpFrmFmtTbl;
-    delete mpSpzFrmFmtTbl;
+    delete mpFrameFormatTable;
+    delete mpSpzFrameFormatTable;
 
     delete mpStyleAccess;
 
-    delete mpCharFmtTbl;
-    delete mpSectionFmtTbl;
-    delete mpTblFrmFmtTbl;
-    delete mpDfltTxtFmtColl;
-    delete mpDfltGrfFmtColl;
-    delete mpNumRuleTbl;
+    delete mpCharFormatTable;
+    delete mpSectionFormatTable;
+    delete mpTableFrameFormatTable;
+    delete mpDfltTextFormatColl;
+    delete mpDfltGrfFormatColl;
+    delete mpNumRuleTable;
 
     disposeXForms(); // #i113606#, dispose the XForms objects
 
     delete mpNumberFormatter;
-    delete mpFtnInfo;
+    delete mpFootnoteInfo;
     delete mpEndNoteInfo;
     delete mpLineNumberInfo;
-    delete mpFtnIdxs;
+    delete mpFootnoteIdxs;
     delete mpTOXTypes;
-    delete mpEmptyPageFmt;
-    delete mpColumnContFmt;
-    delete mpDfltCharFmt;
-    delete mpDfltFrmFmt;
+    delete mpEmptyPageFormat;
+    delete mpColumnContFormat;
+    delete mpDfltCharFormat;
+    delete mpDfltFrameFormat;
     delete mpLayoutCache;
 
     SfxItemPool::Free(mpAttrPool);
@@ -632,13 +632,13 @@ void SwDoc::ClearDoc()
     }
 
     // if there are still FlyFrames dangling around, delete them too
-    while ( !mpSpzFrmFmtTbl->empty() )
-        getIDocumentLayoutAccess().DelLayoutFmt((*mpSpzFrmFmtTbl)[mpSpzFrmFmtTbl->size()-1]);
+    while ( !mpSpzFrameFormatTable->empty() )
+        getIDocumentLayoutAccess().DelLayoutFormat((*mpSpzFrameFormatTable)[mpSpzFrameFormatTable->size()-1]);
     OSL_ENSURE( !GetDocumentDrawModelManager().GetDrawModel() || !GetDocumentDrawModelManager().GetDrawModel()->GetPage(0)->GetObjCount(),
                 "not all DrawObjects removed from the page" );
 
-    getIDocumentRedlineAccess().GetRedlineTbl().DeleteAndDestroyAll();
-    getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteAndDestroyAll();
+    getIDocumentRedlineAccess().GetRedlineTable().DeleteAndDestroyAll();
+    getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteAndDestroyAll();
 
     delete mpACEWord;
 
@@ -652,12 +652,12 @@ void SwDoc::ClearDoc()
 
     SwNodeIndex aSttIdx( *GetNodes().GetEndOfContent().StartOfSectionNode(), 1 );
     // create the first one over and over again (without attributes/style etc.
-    SwTxtNode* pFirstNd = GetNodes().MakeTxtNode( aSttIdx, mpDfltTxtFmtColl );
+    SwTextNode* pFirstNd = GetNodes().MakeTextNode( aSttIdx, mpDfltTextFormatColl );
 
     if( getIDocumentLayoutAccess().GetCurrentViewShell() )
     {
         // set the layout to the dummy pagedesc
-        pFirstNd->SetAttr( SwFmtPageDesc( pDummyPgDsc ));
+        pFirstNd->SetAttr( SwFormatPageDesc( pDummyPgDsc ));
 
         SwPosition aPos( *pFirstNd, SwIndex( pFirstNd ));
         SwPaM const tmpPaM(aSttIdx, SwNodeIndex(GetNodes().GetEndOfContent()));
@@ -671,9 +671,9 @@ void SwDoc::ClearDoc()
     // destruction of numbering rules and creation of new outline rule
     // *after* the document nodes are deleted.
     mpOutlineRule = NULL;
-    for( SwNumRule* pNumRule : *mpNumRuleTbl )
+    for( SwNumRule* pNumRule : *mpNumRuleTable )
         delete pNumRule;
-    mpNumRuleTbl->clear();
+    mpNumRuleTable->clear();
 
     // creation of new outline numbering rule
     mpOutlineRule = new SwNumRule( SwNumRule::GetOutlineRuleName(),
@@ -692,27 +692,27 @@ void SwDoc::ClearDoc()
 
     // Delete for Collections
     // So that we get rid of the dependencies
-    mpFtnInfo->ReleaseCollection();
+    mpFootnoteInfo->ReleaseCollection();
     mpEndNoteInfo->ReleaseCollection();
 
     // Optimization: Based on the fact that Standard is always 2nd in the
     // array, we should delete it as the last. With this we avoid
     // reparenting the Formats all the time!
-    if( 2 < mpTxtFmtCollTbl->size() )
-        mpTxtFmtCollTbl->DeleteAndDestroy(2, mpTxtFmtCollTbl->size());
-    mpTxtFmtCollTbl->DeleteAndDestroy(1, mpTxtFmtCollTbl->size());
-    mpGrfFmtCollTbl->DeleteAndDestroy(1, mpGrfFmtCollTbl->size());
-    mpCharFmtTbl->DeleteAndDestroy(1, mpCharFmtTbl->size());
+    if( 2 < mpTextFormatCollTable->size() )
+        mpTextFormatCollTable->DeleteAndDestroy(2, mpTextFormatCollTable->size());
+    mpTextFormatCollTable->DeleteAndDestroy(1, mpTextFormatCollTable->size());
+    mpGrfFormatCollTable->DeleteAndDestroy(1, mpGrfFormatCollTable->size());
+    mpCharFormatTable->DeleteAndDestroy(1, mpCharFormatTable->size());
 
     if( getIDocumentLayoutAccess().GetCurrentViewShell() )
     {
         // search the FrameFormat of the root frm. This is not allowed to delete
-        mpFrmFmtTbl->erase( std::find( mpFrmFmtTbl->begin(), mpFrmFmtTbl->end(), getIDocumentLayoutAccess().GetCurrentViewShell()->GetLayout()->GetFmt() ) );
-        mpFrmFmtTbl->DeleteAndDestroy(1, mpFrmFmtTbl->size());
-        mpFrmFmtTbl->push_back( getIDocumentLayoutAccess().GetCurrentViewShell()->GetLayout()->GetFmt() );
+        mpFrameFormatTable->erase( std::find( mpFrameFormatTable->begin(), mpFrameFormatTable->end(), getIDocumentLayoutAccess().GetCurrentViewShell()->GetLayout()->GetFormat() ) );
+        mpFrameFormatTable->DeleteAndDestroy(1, mpFrameFormatTable->size());
+        mpFrameFormatTable->push_back( getIDocumentLayoutAccess().GetCurrentViewShell()->GetLayout()->GetFormat() );
     }
     else
-        mpFrmFmtTbl->DeleteAndDestroy(1, mpFrmFmtTbl->size());
+        mpFrameFormatTable->DeleteAndDestroy(1, mpFrameFormatTable->size());
 
     mxForbiddenCharsTable.clear();
 
@@ -721,7 +721,7 @@ void SwDoc::ClearDoc()
     delete mpNumberFormatter, mpNumberFormatter = 0;
 
     getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_STANDARD );
-    pFirstNd->ChgFmtColl( getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+    pFirstNd->ChgFormatColl( getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
     nDummyPgDsc = maPageDescs.size();
     maPageDescs.push_back( pDummyPgDsc );
     // set the layout back to the new standard pagedesc
@@ -767,9 +767,9 @@ void SwDoc::WriteLayoutCache( SvStream& rStream )
     SwLayoutCache::Write( rStream, *this );
 }
 
-IGrammarContact* getGrammarContact( const SwTxtNode& rTxtNode )
+IGrammarContact* getGrammarContact( const SwTextNode& rTextNode )
 {
-    const SwDoc* pDoc = rTxtNode.GetDoc();
+    const SwDoc* pDoc = rTextNode.GetDoc();
     if( !pDoc || pDoc->IsInDtor() )
         return 0;
     return pDoc->getGrammarContact();
@@ -901,7 +901,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
     SwNodeIndex aSourceEndIdx( rSource.GetNodes().GetEndOfContent(), -1 );
     SwPaM aCpyPam( aSourceIdx );
 
-    if ( aSourceEndIdx.GetNode().IsTxtNode() ) {
+    if ( aSourceEndIdx.GetNode().IsTextNode() ) {
         aCpyPam.SetMark();
         // moves to the last content node before EOC; for single paragraph
         // documents this would result in [n, n], which is considered empty
@@ -949,7 +949,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
             // any marks, those are from the previous page: move them back
             // there, otherwise later we can't delete that empty text node.
             SwNodeIndex aNodeIndex(GetNodes().GetEndOfContent(), -1);
-            if (SwTxtNode* pTxtNode = aNodeIndex.GetNode().GetTxtNode())
+            if (SwTextNode* pTextNode = aNodeIndex.GetNode().GetTextNode())
             {
                 // Position of the last paragraph on the previous page.
                 --aNodeIndex;
@@ -957,7 +957,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
                 // Collect the marks starting or ending at this text node.
                 std::set<sw::mark::IMark*> aSeenMarks;
                 IDocumentMarkAccess* pMarkAccess = getIDocumentMarkAccess();
-                for (const SwIndex* pIndex = pTxtNode->GetFirstIndex(); pIndex; pIndex = pIndex->GetNext())
+                for (const SwIndex* pIndex = pTextNode->GetFirstIndex(); pIndex; pIndex = pIndex->GetNext())
                 {
                     sw::mark::IMark* pMark = const_cast<sw::mark::IMark*>(pIndex->GetMark());
                     if (!pMark)
@@ -992,7 +992,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
 #endif
 
     this->GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
-    this->getIDocumentFieldsAccess().LockExpFlds();
+    this->getIDocumentFieldsAccess().LockExpFields();
 
     // Position where the appended doc starts. Will be filled in later (uses GetEndOfContent() because SwNodeIndex has no default ctor).
     SwNodeIndex aStartAppendIndex( GetNodes().GetEndOfContent() );
@@ -1030,9 +1030,9 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
             for (sal_uLong nIdx = aPaM.Start()->nNode.GetIndex();
                     nIdx <= nEndIdx; ++nIdx)
             {
-                SwTxtNode *const pTxtNode = rDestNodes[nIdx]->GetTxtNode();
-                if ( pTxtNode )
-                    UpdateParRsid( pTxtNode );
+                SwTextNode *const pTextNode = rDestNodes[nIdx]->GetTextNode();
+                if ( pTextNode )
+                    UpdateParRsid( pTextNode );
             }
         }
 
@@ -1044,23 +1044,23 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
             // this keeps all other settings as in the pasted document
             if ( nStartPageNumber || pTargetPageDesc ) {
                 SfxPoolItem *pNewItem;
-                SwTxtNode *aTxtNd = 0;
-                SwFmt *pFmt = 0;
+                SwTextNode *aTextNd = 0;
+                SwFormat *pFormat = 0;
 
                 // find the first node allowed to contain a RES_PAGEDESC
                 while (true) {
                     aFixupIdx++;
 
                     SwNode &node = aFixupIdx.GetNode();
-                    if ( node.IsTxtNode() ) {
+                    if ( node.IsTextNode() ) {
                         // every document contains at least one text node!
-                        aTxtNd = node.GetTxtNode();
-                        pNewItem = aTxtNd->GetAttr( RES_PAGEDESC ).Clone();
+                        aTextNd = node.GetTextNode();
+                        pNewItem = aTextNd->GetAttr( RES_PAGEDESC ).Clone();
                         break;
                     }
                     else if ( node.IsTableNode() ) {
-                        pFmt = node.GetTableNode()->GetTable().GetFrmFmt();
-                        pNewItem = pFmt->GetFmtAttr( RES_PAGEDESC ).Clone();
+                        pFormat = node.GetTableNode()->GetTable().GetFrameFormat();
+                        pNewItem = pFormat->GetFormatAttr( RES_PAGEDESC ).Clone();
                         break;
                     }
                 }
@@ -1070,7 +1070,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu
     SAL_INFO( "sw.docappend", "Idx Fix " << CNTNT_IDX( aFixupIdx ) );
 #endif
                 // just update the original instead of overwriting
-                SwFmtPageDesc *aDesc = static_cast< SwFmtPageDesc* >( pNewItem );
+                SwFormatPageDesc *aDesc = static_cast< SwFormatPageDesc* >( pNewItem );
 #ifdef DBG_UTIL
 if ( aDesc->GetPageDesc() )
     SAL_INFO( "sw.docappend", "PD Update " << aDesc->GetPageDesc()->GetName() );
@@ -1081,10 +1081,10 @@ else
                     aDesc->SetNumOffset( nStartPageNumber );
                 if ( pTargetPageDesc )
                     aDesc->RegisterToPageDesc( *pTargetPageDesc );
-                if ( aTxtNd )
-                    aTxtNd->SetAttr( *aDesc );
+                if ( aTextNd )
+                    aTextNd->SetAttr( *aDesc );
                 else
-                    pFmt->SetFmtAttr( *aDesc );
+                    pFormat->SetFormatAttr( *aDesc );
                 delete pNewItem;
 
 #ifdef DBG_UTIL
@@ -1119,10 +1119,10 @@ else
         }
 
         // finally copy page bound frames
-        for ( auto pCpyFmt : *rSource.GetSpzFrmFmts() )
+        for ( auto pCpyFormat : *rSource.GetSpzFrameFormats() )
         {
-            const SwFrmFmt& rCpyFmt = *pCpyFmt;
-            SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
+            const SwFrameFormat& rCpyFormat = *pCpyFormat;
+            SwFormatAnchor aAnchor( rCpyFormat.GetAnchor() );
             if (FLY_AT_PAGE != aAnchor.GetAnchorId())
                 continue;
 #ifdef DBG_UTIL
@@ -1131,14 +1131,14 @@ else
 #endif
             if ( pageOffset != 0 )
                 aAnchor.SetPageNum( aAnchor.GetPageNum() + pageOffset );
-            this->getIDocumentLayoutAccess().CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
+            this->getIDocumentLayoutAccess().CopyLayoutFormat( rCpyFormat, aAnchor, true, true );
         }
     }
 
     this->GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, NULL );
 
-    getIDocumentFieldsAccess().UnlockExpFlds();
-    getIDocumentFieldsAccess().UpdateFlds(NULL, false);
+    getIDocumentFieldsAccess().UnlockExpFields();
+    getIDocumentFieldsAccess().UpdateFields(NULL, false);
 
     if ( pTargetShell )
         pTargetShell->EndAllAction();
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 9b4e5efedcd8..f23053b3d070 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -69,12 +69,12 @@ namespace {
         // On a selection setup a corresponding Point-and-Mark in order to get
         // the indentation attribute reset on all paragraphs touched by the selection
         if ( rPam.HasMark() &&
-             rPam.End()->nNode.GetNode().GetTxtNode() )
+             rPam.End()->nNode.GetNode().GetTextNode() )
         {
             SwPaM aPam( rPam.Start()->nNode,
                         rPam.End()->nNode );
             aPam.Start()->nContent = 0;
-            aPam.End()->nContent = rPam.End()->nNode.GetNode().GetTxtNode()->Len();
+            aPam.End()->nContent = rPam.End()->nNode.GetNode().GetTextNode()->Len();
             pDoc->ResetAttrs( aPam, false, aResetAttrsArray );
         }
         else
@@ -116,23 +116,23 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
     mpOutlineRule->SetAutoRule( true );
 
     // test whether the optional CharFormats are defined in this Document
-    mpOutlineRule->CheckCharFmts( this );
+    mpOutlineRule->CheckCharFormats( this );
 
     // notify text nodes, which are registered at the outline style, about the
     // changed outline style
-    SwNumRule::tTxtNodeList aTxtNodeList;
-    mpOutlineRule->GetTxtNodeList( aTxtNodeList );
-    for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
-          aIter != aTxtNodeList.end(); ++aIter )
+    SwNumRule::tTextNodeList aTextNodeList;
+    mpOutlineRule->GetTextNodeList( aTextNodeList );
+    for ( SwNumRule::tTextNodeList::iterator aIter = aTextNodeList.begin();
+          aIter != aTextNodeList.end(); ++aIter )
     {
-        SwTxtNode* pTxtNd = *aIter;
-        pTxtNd->NumRuleChgd();
+        SwTextNode* pTextNd = *aIter;
+        pTextNd->NumRuleChgd();
 
         // assure that list level corresponds to outline level
-        if ( pTxtNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle() &&
-             pTxtNd->GetAttrListLevel() != pTxtNd->GetTxtColl()->GetAssignedOutlineStyleLevel() )
+        if ( pTextNd->GetTextColl()->IsAssignedToListLevelOfOutlineStyle() &&
+             pTextNd->GetAttrListLevel() != pTextNd->GetTextColl()->GetAssignedOutlineStyleLevel() )
         {
-            pTxtNd->SetAttrListLevel( pTxtNd->GetTxtColl()->GetAssignedOutlineStyleLevel() );
+            pTextNd->SetAttrListLevel( pTextNd->GetTextColl()->GetAssignedOutlineStyleLevel() );
         }
     }
 
@@ -141,17 +141,17 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
     UpdateNumRule();
 
     // update if we have foot notes && numbering by chapter
-    if( !GetFtnIdxs().empty() && FTNNUM_CHAPTER == GetFtnInfo().eNum )
-        GetFtnIdxs().UpdateAllFtn();
+    if( !GetFootnoteIdxs().empty() && FTNNUM_CHAPTER == GetFootnoteInfo().eNum )
+        GetFootnoteIdxs().UpdateAllFootnote();
 
-    getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
 
     getIDocumentState().SetModified();
 }
 
 void SwDoc::PropagateOutlineRule()
 {
-    for (auto pColl : *mpTxtFmtCollTbl)
+    for (auto pColl : *mpTextFormatCollTable)
     {
         if(pColl->IsAssignedToListLevelOfOutlineStyle())
         {
@@ -167,7 +167,7 @@ void SwDoc::PropagateOutlineRule()
                 {
                     SwNumRuleItem aNumItem( pMyOutlineRule->GetName() );
 
-                    pColl->SetFmtAttr(aNumItem);
+                    pColl->SetFormatAttr(aNumItem);
                 }
             }
         }
@@ -200,15 +200,15 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
 
     // Here we go:
     // 1. Create the style array:
-    SwTxtFmtColl* aCollArr[ MAXLEVEL ];
-    memset( aCollArr, 0, sizeof( SwTxtFmtColl* ) * MAXLEVEL );
+    SwTextFormatColl* aCollArr[ MAXLEVEL ];
+    memset( aCollArr, 0, sizeof( SwTextFormatColl* ) * MAXLEVEL );
 
-    for( auto pTxtFmtColl : *mpTxtFmtCollTbl )
+    for( auto pTextFormatColl : *mpTextFormatCollTable )
     {
-        if (pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle())
+        if (pTextFormatColl->IsAssignedToListLevelOfOutlineStyle())
         {
-            const int nLevel = pTxtFmtColl->GetAssignedOutlineStyleLevel();
-            aCollArr[ nLevel ] = pTxtFmtColl;
+            const int nLevel = pTextFormatColl->GetAssignedOutlineStyleLevel();
+            aCollArr[ nLevel ] = pTextFormatColl;
         }
     }
 
@@ -231,8 +231,8 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
         {
             n++;
 
-            SwTxtFmtColl *aTmpColl =
-                getIDocumentStylePoolAccess().GetTxtCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
+            SwTextFormatColl *aTmpColl =
+                getIDocumentStylePoolAccess().GetTextCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
 
             if( aTmpColl->IsAssignedToListLevelOfOutlineStyle() &&
                 aTmpColl->GetAssignedOutlineStyleLevel() == n )
@@ -260,8 +260,8 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
         {
             n--;
 
-            SwTxtFmtColl *aTmpColl =
-                getIDocumentStylePoolAccess().GetTxtCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
+            SwTextFormatColl *aTmpColl =
+                getIDocumentStylePoolAccess().GetTextCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
 
             if( aTmpColl->IsAssignedToListLevelOfOutlineStyle() &&
                 aTmpColl->GetAssignedOutlineStyleLevel() == n )
@@ -337,8 +337,8 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
     bool bMoveApplicable = true;
     for (auto i = nSttPos; i < nEndPos; ++i)
     {
-        SwTxtNode* pTxtNd = rOutlNds[ i ]->GetTxtNode();
-        SwTxtFmtColl* pColl = pTxtNd->GetTxtColl();
+        SwTextNode* pTextNd = rOutlNds[ i ]->GetTextNode();
+        SwTextFormatColl* pColl = pTextNd->GetTextColl();
 
         if( pColl->IsAssignedToListLevelOfOutlineStyle() )
         {
@@ -351,7 +351,7 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
         // not an outline via a to outline style assigned paragraph style.
         else
         {
-            const int nNewOutlineLevel = pTxtNd->GetAttrOutlineLevel() + nOffset;
+            const int nNewOutlineLevel = pTextNd->GetAttrOutlineLevel() + nOffset;
             if ( nNewOutlineLevel < 1 || nNewOutlineLevel > MAXLEVEL )
             {
                 bMoveApplicable = false;
@@ -372,30 +372,30 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
     // 2. Apply the new style to all Nodes
     for (auto i = nSttPos; i < nEndPos; ++i)
     {
-        SwTxtNode* pTxtNd = rOutlNds[ i ]->GetTxtNode();
-        SwTxtFmtColl* pColl = pTxtNd->GetTxtColl();
+        SwTextNode* pTextNd = rOutlNds[ i ]->GetTextNode();
+        SwTextFormatColl* pColl = pTextNd->GetTextColl();
 
         if( pColl->IsAssignedToListLevelOfOutlineStyle() )
         {
             const int nLevel = pColl->GetAssignedOutlineStyleLevel();
 
             OSL_ENSURE(aMoveArr[nLevel] >= 0,
-                "move table: current TxtColl not found when building table!");
+                "move table: current TextColl not found when building table!");
 
             if (nLevel < MAXLEVEL && aMoveArr[nLevel] >= 0)
             {
                 pColl = aCollArr[ aMoveArr[nLevel] ];
 
                 if (pColl != NULL)
-                    pTxtNd->ChgFmtColl( pColl );
+                    pTextNd->ChgFormatColl( pColl );
             }
 
         }
-        else if( pTxtNd->GetAttrOutlineLevel() > 0)
+        else if( pTextNd->GetAttrOutlineLevel() > 0)
         {
-            int nLevel = pTxtNd->GetAttrOutlineLevel() + nOffset;
+            int nLevel = pTextNd->GetAttrOutlineLevel() + nOffset;
             if( 0 <= nLevel && nLevel <= MAXLEVEL)
-                pTxtNd->SetAttrOutlineLevel( nLevel );
+                pTextNd->SetAttrOutlineLevel( nLevel );
 
         }
         // Undo ???
@@ -431,8 +431,8 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
     int nOutLineLevel = MAXLEVEL;
     SwNode* pSrch = &aSttRg.GetNode();
 
-   if( pSrch->IsTxtNode())
-        nOutLineLevel = static_cast<sal_uInt8>(pSrch->GetTxtNode()->GetAttrOutlineLevel()-1);
+   if( pSrch->IsTextNode())
+        nOutLineLevel = static_cast<sal_uInt8>(pSrch->GetTextNode()->GetAttrOutlineLevel()-1);
     SwNode* pEndSrch = &aEndRg.GetNode();
     if( !GetNodes().GetOutLineNds().Seek_Entry( pSrch, &nAktPos ) )
     {
@@ -453,8 +453,8 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
     // The criteria has to be the outline level: sub level => incorporate, same/higher level => no.
     if( GetNodes().GetOutLineNds().Seek_Entry( pEndSrch, &nTmpPos ) )
     {
-        if( !pEndSrch->IsTxtNode() || pEndSrch == pSrch ||
-            nOutLineLevel < pEndSrch->GetTxtNode()->GetAttrOutlineLevel()-1 )
+        if( !pEndSrch->IsTextNode() || pEndSrch == pSrch ||
+            nOutLineLevel < pEndSrch->GetTextNode()->GetAttrOutlineLevel()-1 )
             ++nTmpPos; // For sub outlines only!
     }
 
@@ -562,25 +562,25 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
     return MoveParagraph( aPam, nOffs, true );
 }
 
-static SwTxtNode* lcl_FindOutlineName( const SwOutlineNodes& rOutlNds, const OUString& rName,
+static SwTextNode* lcl_FindOutlineName( const SwOutlineNodes& rOutlNds, const OUString& rName,
                             bool bExact )
 {
-    SwTxtNode* pSavedNode = nullptr;
+    SwTextNode* pSavedNode = nullptr;
     for( auto pOutlNd : rOutlNds )
     {
-        SwTxtNode* pTxtNd = pOutlNd->GetTxtNode();
-        const OUString sTxt( pTxtNd->GetExpandTxt() );
-        if (sTxt.startsWith(rName))
+        SwTextNode* pTextNd = pOutlNd->GetTextNode();
+        const OUString sText( pTextNd->GetExpandText() );
+        if (sText.startsWith(rName))
         {
-            if (sTxt.getLength() == rName.getLength())
+            if (sText.getLength() == rName.getLength())
             {
                 // Found "exact", set Pos to the Node
-                return pTxtNd;
+                return pTextNd;
             }
             if( !bExact && !pSavedNode )
             {
                 // maybe we just found the text's first part
-                pSavedNode = pTxtNd;
+                pSavedNode = pTextNd;
             }
         }
     }
@@ -588,7 +588,7 @@ static SwTxtNode* lcl_FindOutlineName( const SwOutlineNodes& rOutlNds, const OUS
     return pSavedNode;
 }
 
-static SwTxtNode* lcl_FindOutlineNum( const SwOutlineNodes& rOutlNds, OUString& rName )
+static SwTextNode* lcl_FindOutlineNum( const SwOutlineNodes& rOutlNds, OUString& rName )
 {
     // Valid numbers are (always just offsets!):
     //  ([Number]+\.)+  (as a regular expression!)
@@ -643,7 +643,7 @@ static SwTxtNode* lcl_FindOutlineNum( const SwOutlineNodes& rOutlNds, OUString&
     // search in the existing outline nodes for the required outline num array
     for( auto pOutlNd : rOutlNds )
     {
-        SwTxtNode* pNd = pOutlNd->GetTxtNode();
+        SwTextNode* pNd = pOutlNd->GetTextNode();
         if ( pNd->GetAttrOutlineLevel() == nLevel )
         {
             // #i51089#, #i68289#
@@ -695,10 +695,10 @@ bool SwDoc::GotoOutline( SwPosition& rPos, const OUString& rName ) const
 
         // 1. step: via the Number:
         OUString sName( rName );
-        SwTxtNode* pNd = ::lcl_FindOutlineNum( rOutlNds, sName );
+        SwTextNode* pNd = ::lcl_FindOutlineNum( rOutlNds, sName );
         if ( pNd )
         {
-            OUString sExpandedText = pNd->GetExpandTxt();
+            OUString sExpandedText = pNd->GetExpandText();
             //#i4533# leading numbers followed by a dot have been remove while
             //searching for the outline position
             //to compensate this they must be removed from the paragraphs text content, too
@@ -714,7 +714,7 @@ bool SwDoc::GotoOutline( SwPosition& rPos, const OUString& rName ) const
 
             if( sExpandedText != sName )
             {
-                SwTxtNode *pTmpNd = ::lcl_FindOutlineName( rOutlNds, sName, true );
+                SwTextNode *pTmpNd = ::lcl_FindOutlineName( rOutlNds, sName, true );
                 if ( pTmpNd )             // found via the Name
                 {
                     pNd = pTmpNd;
@@ -754,29 +754,29 @@ static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
     if (!pOld) //we cannot proceed without the old NumRule
         return;
 
-    sal_uInt16 nChgFmtLevel = 0;
+    sal_uInt16 nChgFormatLevel = 0;
     sal_uInt16 nMask = 1;
 
     for ( sal_uInt8 n = 0; n < MAXLEVEL; ++n, nMask <<= 1 )
     {
-        const SwNumFmt& rOldFmt = pOld->Get( n ), &rNewFmt = rRule.Get( n );
+        const SwNumFormat& rOldFormat = pOld->Get( n ), &rNewFormat = rRule.Get( n );
 
-        if ( rOldFmt != rNewFmt )
+        if ( rOldFormat != rNewFormat )
         {
-            nChgFmtLevel |= nMask;
+            nChgFormatLevel |= nMask;
         }
-        else if ( SVX_NUM_NUMBER_NONE > rNewFmt.GetNumberingType()
-                  && 1 < rNewFmt.GetIncludeUpperLevels()
-                  && 0 != ( nChgFmtLevel & GetUpperLvlChg( n, rNewFmt.GetIncludeUpperLevels(), nMask ) ) )
+        else if ( SVX_NUM_NUMBER_NONE > rNewFormat.GetNumberingType()
+                  && 1 < rNewFormat.GetIncludeUpperLevels()
+                  && 0 != ( nChgFormatLevel & GetUpperLvlChg( n, rNewFormat.GetIncludeUpperLevels(), nMask ) ) )
         {
-            nChgFmtLevel |= nMask;
+            nChgFormatLevel |= nMask;
         }
     }
 
-    if( !nChgFmtLevel )         // Nothing has been changed?
+    if( !nChgFormatLevel )         // Nothing has been changed?
     {
         const bool bInvalidateNumRule( pOld->IsContinusNum() != rRule.IsContinusNum() );
-        pOld->CheckCharFmts( &rDoc );
+        pOld->CheckCharFormats( &rDoc );
         pOld->SetContinusNum( rRule.IsContinusNum() );
 
         if ( bInvalidateNumRule )
@@ -787,29 +787,29 @@ static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
         return ;
     }
 
-    SwNumRule::tTxtNodeList aTxtNodeList;
-    pOld->GetTxtNodeList( aTxtNodeList );
+    SwNumRule::tTextNodeList aTextNodeList;
+    pOld->GetTextNodeList( aTextNodeList );
     sal_uInt8 nLvl( 0 );
-    for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
-          aIter != aTxtNodeList.end(); ++aIter )
+    for ( SwNumRule::tTextNodeList::iterator aIter = aTextNodeList.begin();
+          aIter != aTextNodeList.end(); ++aIter )
     {
-        SwTxtNode* pTxtNd = *aIter;
-        nLvl = static_cast<sal_uInt8>(pTxtNd->GetActualListLevel());
+        SwTextNode* pTextNd = *aIter;
+        nLvl = static_cast<sal_uInt8>(pTextNd->GetActualListLevel());
 
         if( nLvl < MAXLEVEL )
         {
-            if( nChgFmtLevel & ( 1 << nLvl ))
+            if( nChgFormatLevel & ( 1 << nLvl ))
             {
-                pTxtNd->NumRuleChgd();
+                pTextNd->NumRuleChgd();
             }
         }
     }
 
     for ( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
-        if ( nChgFmtLevel & ( 1 << n ) )
-            pOld->Set( n, rRule.GetNumFmt( n ) );
+        if ( nChgFormatLevel & ( 1 << n ) )
+            pOld->Set( n, rRule.GetNumFormat( n ) );
 
-    pOld->CheckCharFmts( &rDoc );
+    pOld->CheckCharFormats( &rDoc );
     pOld->SetInvalidRule( true );
     pOld->SetContinusNum( rRule.IsContinusNum() );
 
@@ -839,7 +839,7 @@ OUString SwDoc::SetNumRule( const SwPaM& rPam,
     if ( pNewOrChangedNumRule == NULL )
     {
         // create new numbering rule based on given one
-        pNewOrChangedNumRule = ( *mpNumRuleTbl )[MakeNumRule( rRule.GetName(), &rRule )];
+        pNewOrChangedNumRule = ( *mpNumRuleTable )[MakeNumRule( rRule.GetName(), &rRule )];
         bNewNumRuleCreated = true;
     }
     else if ( rRule != *pNewOrChangedNumRule )
@@ -887,31 +887,31 @@ OUString SwDoc::SetNumRule( const SwPaM& rPam,
 
     if ( !rPam.HasMark() )
     {
-        SwTxtNode * pTxtNd = rPam.GetPoint()->nNode.GetNode().GetTxtNode();
+        SwTextNode * pTextNd = rPam.GetPoint()->nNode.GetNode().GetTextNode();
         // robust code: consider case that the PaM doesn't denote a text node - e.g. it denotes a graphic node
-        if ( pTxtNd != NULL )
+        if ( pTextNd != NULL )
         {
-            SwNumRule * pRule = pTxtNd->GetNumRule();
+            SwNumRule * pRule = pTextNd->GetNumRule();
 
             if (pRule && pRule->GetName() == pNewOrChangedNumRule->GetName())
             {
                 bSetItem = false;
-                if ( !pTxtNd->IsInList() )
+                if ( !pTextNd->IsInList() )
                 {
-                    pTxtNd->AddToList();
+                    pTextNd->AddToList();
                 }
             }
             // Only clear numbering attribute at text node, if at paragraph
             // style the new numbering rule is found.
             else if ( !pRule )
             {
-                SwTxtFmtColl* pColl = pTxtNd->GetTxtColl();
+                SwTextFormatColl* pColl = pTextNd->GetTextColl();
                 if ( pColl )
                 {
                     SwNumRule* pCollRule = FindNumRulePtr(pColl->GetNumRule().GetValue());
                     if ( pCollRule && pCollRule->GetName() == pNewOrChangedNumRule->GetName() )
                     {
-                        pTxtNd->ResetAttr( RES_PARATR_NUMRULE );
+                        pTextNd->ResetAttr( RES_PARATR_NUMRULE );
                         bSetItem = false;
                     }
                 }
@@ -954,12 +954,12 @@ void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted)
 
 void SwDoc::SetNumRuleStart( const SwPosition& rPos, bool bFlag )
 {
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
 
-    if (pTxtNd)
+    if (pTextNd)
     {
-        const SwNumRule* pRule = pTxtNd->GetNumRule();
-        if( pRule && !bFlag != !pTxtNd->IsListRestart())
+        const SwNumRule* pRule = pTextNd->GetNumRule();
+        if( pRule && !bFlag != !pTextNd->IsListRestart())
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
@@ -967,7 +967,7 @@ void SwDoc::SetNumRuleStart( const SwPosition& rPos, bool bFlag )
                 GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
 
-            pTxtNd->SetListRestart(bFlag);
+            pTextNd->SetListRestart(bFlag);
 
             getIDocumentState().SetModified();
         }
@@ -976,19 +976,19 @@ void SwDoc::SetNumRuleStart( const SwPosition& rPos, bool bFlag )
 
 void SwDoc::SetNodeNumStart( const SwPosition& rPos, sal_uInt16 nStt )
 {
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
 
-    if (pTxtNd)
+    if (pTextNd)
     {
-        if ( !pTxtNd->HasAttrListRestartValue() ||
-             pTxtNd->GetAttrListRestartValue() != nStt )
+        if ( !pTextNd->HasAttrListRestartValue() ||
+             pTextNd->GetAttrListRestartValue() != nStt )
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
                 SwUndo *const pUndo( new SwUndoNumRuleStart(rPos, nStt) );
                 GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
-            pTxtNd->SetAttrListRestartValue( nStt );
+            pTextNd->SetAttrListRestartValue( nStt );
 
             getIDocumentState().SetModified();
         }
@@ -1003,18 +1003,18 @@ bool SwDoc::DelNumRule( const OUString& rName, bool bBroadcast )
     if (nPos == USHRT_MAX)
         return false;
 
-    if ( (*mpNumRuleTbl)[ nPos ] == GetOutlineNumRule() )
+    if ( (*mpNumRuleTable)[ nPos ] == GetOutlineNumRule() )
     {
         OSL_FAIL( "<SwDoc::DelNumRule(..)> - No deletion of outline list style. This is serious defect - please inform OD" );
         return false;
     }
 
-    if( !IsUsed( *(*mpNumRuleTbl)[ nPos ] ))
+    if( !IsUsed( *(*mpNumRuleTable)[ nPos ] ))
     {
         if (GetIDocumentUndoRedo().DoesUndo())
         {
             SwUndo * pUndo =
-                new SwUndoNumruleDelete(*(*mpNumRuleTbl)[nPos], this);
+                new SwUndoNumruleDelete(*(*mpNumRuleTable)[nPos], this);
             GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
@@ -1027,8 +1027,8 @@ bool SwDoc::DelNumRule( const OUString& rName, bool bBroadcast )
         // #i34097# DeleteAndDestroy deletes rName if
         // rName is directly taken from the numrule.
         const OUString aTmpName( rName );
-        delete (*mpNumRuleTbl)[ nPos ];
-        mpNumRuleTbl->erase( mpNumRuleTbl->begin() + nPos );
+        delete (*mpNumRuleTable)[ nPos ];
+        mpNumRuleTable->erase( mpNumRuleTable->begin() + nPos );
         maNumRuleMap.erase(aTmpName);
 
         getIDocumentState().SetModified();
@@ -1037,7 +1037,7 @@ bool SwDoc::DelNumRule( const OUString& rName, bool bBroadcast )
     return false;
 }
 
-void SwDoc::ChgNumRuleFmts( const SwNumRule& rRule )
+void SwDoc::ChgNumRuleFormats( const SwNumRule& rRule )
 {
     SwNumRule* pRule = FindNumRulePtr( rRule.GetName() );
     if( pRule )
@@ -1073,18 +1073,18 @@ bool SwDoc::RenameNumRule(const OUString & rOldName, const OUString & rNewName,
             GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
-        SwNumRule::tTxtNodeList aTxtNodeList;
-        pNumRule->GetTxtNodeList( aTxtNodeList );
+        SwNumRule::tTextNodeList aTextNodeList;
+        pNumRule->GetTextNodeList( aTextNodeList );
 
         pNumRule->SetName( rNewName, getIDocumentListsAccess() );
 
         SwNumRuleItem aItem(rNewName);
 
-        for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
-              aIter != aTxtNodeList.end(); ++aIter )
+        for ( SwNumRule::tTextNodeList::iterator aIter = aTextNodeList.begin();
+              aIter != aTextNodeList.end(); ++aIter )
         {
-            SwTxtNode * pTxtNd = *aIter;
-            pTxtNd->SetAttr(aItem);
+            SwTextNode * pTextNd = *aIter;
+            pTextNd->SetAttr(aItem);
         }
 
         bResult = true;
@@ -1099,16 +1099,16 @@ bool SwDoc::RenameNumRule(const OUString & rOldName, const OUString & rNewName,
 
 void SwDoc::StopNumRuleAnimations( OutputDevice* pOut )
 {
-    for( sal_uInt16 n = GetNumRuleTbl().size(); n; )
+    for( sal_uInt16 n = GetNumRuleTable().size(); n; )
     {
-        SwNumRule::tTxtNodeList aTxtNodeList;
-        GetNumRuleTbl()[ --n ]->GetTxtNodeList( aTxtNodeList );
-        for ( SwNumRule::tTxtNodeList::iterator aTxtNodeIter = aTxtNodeList.begin();
-              aTxtNodeIter != aTxtNodeList.end(); ++aTxtNodeIter )
+        SwNumRule::tTextNodeList aTextNodeList;
+        GetNumRuleTable()[ --n ]->GetTextNodeList( aTextNodeList );
+        for ( SwNumRule::tTextNodeList::iterator aTextNodeIter = aTextNodeList.begin();
+              aTextNodeIter != aTextNodeList.end(); ++aTextNodeIter )
         {
-            SwTxtNode* pTNd = *aTxtNodeIter;
-            SwIterator<SwTxtFrm,SwTxtNode> aIter(*pTNd);
-            for(SwTxtFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+            SwTextNode* pTNd = *aTextNodeIter;
+            SwIterator<SwTextFrm,SwTextNode> aIter(*pTNd);
+            for(SwTextFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
                 if( pFrm->HasAnimation() )
                     pFrm->StopAnimation( pOut );
         }
@@ -1132,36 +1132,36 @@ bool SwDoc::ReplaceNumRule( const SwPosition& rPos,
             GetIDocumentUndoRedo().AppendUndo(pUndo);
         }
 
-        SwNumRule::tTxtNodeList aTxtNodeList;
-        pOldRule->GetTxtNodeList( aTxtNodeList );
-        if ( aTxtNodeList.size() > 0 )
+        SwNumRule::tTextNodeList aTextNodeList;
+        pOldRule->GetTextNodeList( aTextNodeList );
+        if ( aTextNodeList.size() > 0 )
         {
             SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : 0 );
-            sal_uInt16 nChgFmtLevel = 0;
+            sal_uInt16 nChgFormatLevel = 0;
             for( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
             {
-                const SwNumFmt& rOldFmt = pOldRule->Get( n ),
-                    & rNewFmt = pNewRule->Get( n );
+                const SwNumFormat& rOldFormat = pOldRule->Get( n ),
+                    & rNewFormat = pNewRule->Get( n );
 
-                if( rOldFmt.GetAbsLSpace() != rNewFmt.GetAbsLSpace() ||
-                    rOldFmt.GetFirstLineOffset() != rNewFmt.GetFirstLineOffset() )
-                    nChgFmtLevel |= ( 1 << n );
+                if( rOldFormat.GetAbsLSpace() != rNewFormat.GetAbsLSpace() ||
+                    rOldFormat.GetFirstLineOffset() != rNewFormat.GetFirstLineOffset() )
+                    nChgFormatLevel |= ( 1 << n );
             }
 
-            const SwTxtNode* pGivenTxtNode = rPos.nNode.GetNode().GetTxtNode();
+            const SwTextNode* pGivenTextNode = rPos.nNode.GetNode().GetTextNode();
             SwNumRuleItem aRule( rNewRule );
-            for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
-                  aIter != aTxtNodeList.end(); ++aIter )
+            for ( SwNumRule::tTextNodeList::iterator aIter = aTextNodeList.begin();
+                  aIter != aTextNodeList.end(); ++aIter )
             {
-                SwTxtNode* pTxtNd = *aIter;
+                SwTextNode* pTextNd = *aIter;
 
-                if ( pGivenTxtNode &&
-                     pGivenTxtNode->GetListId() == pTxtNd->GetListId() )
+                if ( pGivenTextNode &&
+                     pGivenTextNode->GetListId() == pTextNd->GetListId() )
                 {
-                    aRegH.RegisterInModify( pTxtNd, *pTxtNd );
+                    aRegH.RegisterInModify( pTextNd, *pTextNd );
 
-                    pTxtNd->SetAttr( aRule );
-                    pTxtNd->NumRuleChgd();
+                    pTextNd->SetAttr( aRule );
+                    pTextNd->NumRuleChgd();
                 }
             }
             GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
@@ -1202,7 +1202,7 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
     const sal_uLong nEnd = rPaM.End()->nNode.GetIndex();
     for (sal_uLong n = nStt; n <= nEnd; n++)
     {
-        SwTxtNode * pCNd = GetNodes()[n]->GetTxtNode();
+        SwTextNode * pCNd = GetNodes()[n]->GetTextNode();
 
         if (pCNd)
         {
@@ -1262,7 +1262,7 @@ bool SwDoc::NoNum( const SwPaM& rPam )
     {
         // Set NoNum and Upate
         const SwNodeIndex& rIdx = rPam.GetPoint()->nNode;
-        SwTxtNode* pNd = rIdx.GetNode().GetTxtNode();
+        SwTextNode* pNd = rIdx.GetNode().GetTextNode();
         const SwNumRule* pRule = pNd->GetNumRule();
         if( pRule )
         {
@@ -1300,9 +1300,9 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
     const SwNode* pOutlNd = 0;
     for( ; nStt <= nEnd; ++nStt )
     {
-        SwTxtNode* pTNd = GetNodes()[ nStt ]->GetTxtNode();
-        SwNumRule* pNumRuleOfTxtNode = pTNd ? pTNd->GetNumRule() : 0;
-        if ( pTNd && pNumRuleOfTxtNode )
+        SwTextNode* pTNd = GetNodes()[ nStt ]->GetTextNode();
+        SwNumRule* pNumRuleOfTextNode = pTNd ? pTNd->GetNumRule() : 0;
+        if ( pTNd && pNumRuleOfTextNode )
         {
             // recognize changes of attribute for undo
             aRegH.RegisterInModify( pTNd, *pTNd );
@@ -1325,12 +1325,12 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
             pTNd->ResetAttr( RES_PARATR_LIST_RESTARTVALUE );
             pTNd->ResetAttr( RES_PARATR_LIST_ISCOUNTED );
 
-            if( RES_CONDTXTFMTCOLL == pTNd->GetFmtColl()->Which() )
+            if( RES_CONDTXTFMTCOLL == pTNd->GetFormatColl()->Which() )
             {
                 pTNd->ChkCondColl();
             }
             else if( !pOutlNd &&
-                     static_cast<SwTxtFmtColl*>(pTNd->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle() )
+                     static_cast<SwTextFormatColl*>(pTNd->GetFormatColl())->IsAssignedToListLevelOfOutlineStyle() )
             {
                 pOutlNd = pTNd;
             }
@@ -1341,13 +1341,13 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
     UpdateNumRule();
 
     if( pOutlNd )
-        GetNodes().UpdtOutlineIdx( *pOutlNd );
+        GetNodes().UpdateOutlineIdx( *pOutlNd );
 }
 
 void SwDoc::InvalidateNumRules()
 {
-    for (sal_uInt16 n = 0; n < mpNumRuleTbl->size(); ++n)
-        (*mpNumRuleTbl)[n]->SetInvalidRule(true);
+    for (sal_uInt16 n = 0; n < mpNumRuleTable->size(); ++n)
+        (*mpNumRuleTable)[n]->SetInvalidRule(true);
 }
 
 // To the next/preceding Bullet at the same Level
@@ -1394,7 +1394,7 @@ static bool lcl_IsValidPrevNextNumNode( const SwNodeIndex& rIdx )
 static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
                             bool bOverUpper, sal_uInt8* pUpper, sal_uInt8* pLower )
 {
-    const SwTxtNode* pNd = rPos.nNode.GetNode().GetTxtNode();
+    const SwTextNode* pNd = rPos.nNode.GetNode().GetTextNode();
     if( !pNd || 0 == pNd->GetNumRule() )
         return false;
 
@@ -1407,9 +1407,9 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
         bool bError = false;
         do {
             --aIdx;
-            if( aIdx.GetNode().IsTxtNode() )
+            if( aIdx.GetNode().IsTextNode() )
             {
-                pNd = aIdx.GetNode().GetTxtNode();
+                pNd = aIdx.GetNode().GetTextNode();
                 const SwNumRule* pRule = pNd->GetNumRule();
 
                 sal_uInt8 nTmpNum;
@@ -1435,7 +1435,7 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
     sal_uInt8 nLower = nSrchNum, nUpper = nSrchNum;
     bool bRet = false;
 
-    const SwTxtNode* pLast;
+    const SwTextNode* pLast;
     if( bNext )
         ++aIdx, pLast = pNd;
     else
@@ -1444,9 +1444,9 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
     while( bNext ? ( aIdx.GetIndex() < aIdx.GetNodes().Count() - 1 )
                  : aIdx.GetIndex() != 0 )
     {
-        if( aIdx.GetNode().IsTxtNode() )
+        if( aIdx.GetNode().IsTextNode() )
         {
-            pNd = aIdx.GetNode().GetTxtNode();
+            pNd = aIdx.GetNode().GetTextNode();
             const SwNumRule* pRule = pNd->GetNumRule();
             if( pRule )
             {
@@ -1454,7 +1454,7 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
                                     static_cast<sal_uInt8>(pNd->GetActualListLevel()) ))
                 {
                     rPos.nNode = aIdx;
-                    rPos.nContent.Assign( const_cast<SwTxtNode*>(pNd), 0 );
+                    rPos.nContent.Assign( const_cast<SwTextNode*>(pNd), 0 );
                     bRet = true;
                     break;
                 }
@@ -1478,13 +1478,13 @@ static bool lcl_GotoNextPrevNum( SwPosition& rPos, bool bNext,
         if( bNext )
         {
             rPos.nNode = aIdx;
-            if( aIdx.GetNode().IsCntntNode() )
-                rPos.nContent.Assign( aIdx.GetNode().GetCntntNode(), 0 );
+            if( aIdx.GetNode().IsContentNode() )
+                rPos.nContent.Assign( aIdx.GetNode().GetContentNode(), 0 );
         }
         else
         {
             rPos.nNode.Assign( *pLast );
-            rPos.nContent.Assign( const_cast<SwTxtNode*>(pLast), 0 );
+            rPos.nContent.Assign( const_cast<SwTextNode*>(pLast), 0 );
         }
         bRet = true;
     }
@@ -1514,10 +1514,10 @@ const SwNumRule *  SwDoc::SearchNumRule(const SwPosition & rPos,
                                         const bool bInvestigateStartNode)
 {
     const SwNumRule * pResult = NULL;
-    SwTxtNode * pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    SwNode * pStartFromNode = pTxtNd;
+    SwTextNode * pTextNd = rPos.nNode.GetNode().GetTextNode();
+    SwNode * pStartFromNode = pTextNd;
 
-    if (pTxtNd)
+    if (pTextNd)
     {
         SwNodeIndex aIdx(rPos.nNode);
 
@@ -1533,25 +1533,25 @@ const SwNumRule *  SwDoc::SearchNumRule(const SwPosition & rPos,
                     --aIdx;
             }
 
-            if (aIdx.GetNode().IsTxtNode())
+            if (aIdx.GetNode().IsTextNode())
             {
-                pTxtNd = aIdx.GetNode().GetTxtNode();
+                pTextNd = aIdx.GetNode().GetTextNode();
 
-                const SwNumRule * pNumRule = pTxtNd->GetNumRule();
+                const SwNumRule * pNumRule = pTextNd->GetNumRule();
                 if (pNumRule)
                 {
                     if ( ( pNumRule->IsOutlineRule() == bOutline ) &&
                          ( ( bNum && pNumRule->Get(0).IsEnumeration()) ||
                            ( !bNum && pNumRule->Get(0).IsItemize() ) ) ) // #i22362#, #i29560#
                     {
-                        pResult = pTxtNd->GetNumRule();
+                        pResult = pTextNd->GetNumRule();
                         // provide also the list id, to which the text node belongs.
-                        sListId = pTxtNd->GetListId();
+                        sListId = pTextNd->GetListId();
                     }
 
                     break;
                 }
-                else if (pTxtNd->Len() > 0 || NULL != pTxtNd->GetNumRule())
+                else if (pTextNd->Len() > 0 || NULL != pTextNd->GetNumRule())
                 {
                     if (nNonEmptyAllowed == 0)
                         break;
@@ -1600,11 +1600,11 @@ bool SwDoc::NumUpDown( const SwPaM& rPam, bool bDown )
     bool bOnlyNonOutline = true;
     for (sal_uLong n = nStt; n <= nEnd; n++)
     {
-        SwTxtNode * pTxtNd = GetNodes()[n]->GetTxtNode();
+        SwTextNode * pTextNd = GetNodes()[n]->GetTextNode();
 
-        if (pTxtNd)
+        if (pTextNd)
         {
-            SwNumRule * pRule = pTxtNd->GetNumRule();
+            SwNumRule * pRule = pTextNd->GetNumRule();
 
             if (pRule)
             {
@@ -1629,7 +1629,7 @@ bool SwDoc::NumUpDown( const SwPaM& rPam, bool bDown )
         */
         for (sal_uLong nTmp = nStt; nTmp <= nEnd; ++nTmp)
         {
-            SwTxtNode* pTNd = GetNodes()[ nTmp ]->GetTxtNode();
+            SwTextNode* pTNd = GetNodes()[ nTmp ]->GetTextNode();
 
             // Make code robust: consider case that the node doesn't denote a
             // text node.
@@ -1657,7 +1657,7 @@ bool SwDoc::NumUpDown( const SwPaM& rPam, bool bDown )
 
             for(sal_uLong nTmp = nStt; nTmp <= nEnd; ++nTmp )
             {
-                SwTxtNode* pTNd = GetNodes()[ nTmp ]->GetTxtNode();
+                SwTextNode* pTNd = GetNodes()[ nTmp ]->GetTextNode();
 
                 if( pTNd)
                 {
@@ -1787,14 +1787,14 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
         {
             SwPosition aStPos( *pStt ), aEndPos( *pEnd );
             aStPos.nContent = 0;
-            SwCntntNode* pCNd = pEnd->nNode.GetNode().GetCntntNode();
+            SwContentNode* pCNd = pEnd->nNode.GetNode().GetContentNode();
             aEndPos.nContent = pCNd ? pCNd->Len() : 1;
             bool bCheckDel = true;
 
             // There is a some Redline Delete Object for the range
-            for( ; nRedlPos < getIDocumentRedlineAccess().GetRedlineTbl().size(); ++nRedlPos )
+            for( ; nRedlPos < getIDocumentRedlineAccess().GetRedlineTable().size(); ++nRedlPos )
             {
-                const SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos ];
+                const SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos ];
                 if( !bCheckDel || nsRedlineType_t::REDLINE_DELETE == pTmp->GetType() )
                 {
                     const SwPosition *pRStt = pTmp->Start(), *pREnd = pTmp->End();
@@ -1802,7 +1802,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
                     {
                     case POS_COLLIDE_START:
                     case POS_BEHIND:            // Pos1 comes after Pos2
-                        nRedlPos = getIDocumentRedlineAccess().GetRedlineTbl().size();
+                        nRedlPos = getIDocumentRedlineAccess().GetRedlineTable().size();
                         break;
 
                     case POS_COLLIDE_END:
@@ -1842,10 +1842,10 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
         sal_uInt16 nRedlPos = getIDocumentRedlineAccess().GetRedlinePos( pStt->nNode.GetNode(), nsRedlineType_t::REDLINE_INSERT );
         if( USHRT_MAX != nRedlPos )
         {
-            SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos ];
+            SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos ];
             const SwPosition *pRStt = pTmp->Start(), *pREnd = pTmp->End();
             SwRangeRedline aTmpRedl( nsRedlineType_t::REDLINE_INSERT, rPam );
-            const SwCntntNode* pCEndNd = pEnd->nNode.GetNode().GetCntntNode();
+            const SwContentNode* pCEndNd = pEnd->nNode.GetNode().GetContentNode();
             // Is completely in the range and is the own Redline too?
             if( aTmpRedl.IsOwnRedline( *pTmp ) &&
                 (pRStt->nNode < pStt->nNode ||
@@ -1856,9 +1856,9 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
                          : !pREnd->nContent.GetIndex() )) )
             {
                 pOwnRedl = pTmp;
-                if( nRedlPos + 1 < (sal_uInt16)getIDocumentRedlineAccess().GetRedlineTbl().size() )
+                if( nRedlPos + 1 < (sal_uInt16)getIDocumentRedlineAccess().GetRedlineTable().size() )
                 {
-                    pTmp = getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos+1 ];
+                    pTmp = getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos+1 ];
                     if( *pTmp->Start() == *pREnd )
                         // then don't!
                         pOwnRedl = 0;
@@ -1879,7 +1879,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
 
             // First the Insert, then the Delete
             SwPosition aInsPos( aIdx );
-            aInsPos.nContent.Assign( aIdx.GetNode().GetCntntNode(), 0 );
+            aInsPos.nContent.Assign( aIdx.GetNode().GetContentNode(), 0 );
 
             SwPaM aPam( pStt->nNode, aMvRg.aEnd );
 
@@ -1887,7 +1887,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
             rOrigPam.DeleteMark();
             rOrigPam.GetPoint()->nNode = aIdx.GetIndex() - 1;
 
-            bool bDelLastPara = !aInsPos.nNode.GetNode().IsCntntNode();
+            bool bDelLastPara = !aInsPos.nNode.GetNode().IsContentNode();
 
             /* When copying to a non-content node Copy will
                insert a paragraph before that node and insert before
@@ -1909,7 +1909,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
                        found. The new position to insert the moved
                        paragraph at is before the inserted
                        paragraph. */
-                    getIDocumentContentOperations().AppendTxtNode(*aInsPam.GetPoint());
+                    getIDocumentContentOperations().AppendTextNode(*aInsPam.GetPoint());
                     aInsPos = *aInsPam.GetPoint();
                 }
             }
@@ -1919,25 +1919,25 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
             {
                 // We need to remove the last empty Node again
                 aIdx = aInsPos.nNode;
-                SwCntntNode* pCNd = SwNodes::GoPrevious( &aInsPos.nNode );
+                SwContentNode* pCNd = SwNodes::GoPrevious( &aInsPos.nNode );
                 aInsPos.nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
 
                 // All, that are in the to-be-deleted Node, need to be
                 // moved to the next Node
-                for( sal_uInt16 n = 0; n < getIDocumentRedlineAccess().GetRedlineTbl().size(); ++n )
+                for( sal_uInt16 n = 0; n < getIDocumentRedlineAccess().GetRedlineTable().size(); ++n )
                 {
-                    SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTbl()[ n ];
+                    SwRangeRedline* pTmp = getIDocumentRedlineAccess().GetRedlineTable()[ n ];
 
                     SwPosition* pPos;
                     if( ( pPos = &pTmp->GetBound(true))->nNode == aIdx )
                     {
                         ++pPos->nNode;
-                        pPos->nContent.Assign( pPos->nNode.GetNode().GetCntntNode(),0);
+                        pPos->nContent.Assign( pPos->nNode.GetNode().GetContentNode(),0);
                     }
                     if( ( pPos = &pTmp->GetBound(false))->nNode == aIdx )
                     {
                         ++pPos->nNode;
-                        pPos->nContent.Assign( pPos->nNode.GetNode().GetCntntNode(),0);
+                        pPos->nContent.Assign( pPos->nNode.GetNode().GetContentNode(),0);
                     }
                 }
                 CorrRel( aIdx, aInsPos, 0, false );
@@ -1947,7 +1947,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
             }
 
             ++rOrigPam.GetPoint()->nNode;
-            rOrigPam.GetPoint()->nContent.Assign( rOrigPam.GetCntntNode(), 0 );
+            rOrigPam.GetPoint()->nContent.Assign( rOrigPam.GetContentNode(), 0 );
 
             RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode();
             GetDocumentRedlineManager().checkRedlining(eOld);
@@ -1979,7 +1979,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
         }
     }
 
-    if( !pOwnRedl && !getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( !pOwnRedl && !getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         SwPaM aTemp(aIdx);
         getIDocumentRedlineAccess().SplitRedline(aTemp);
@@ -2020,12 +2020,12 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
         if( pRStt->nNode.GetIndex() != nRedlSttNd )
         {
             pRStt->nNode = nRedlSttNd;
-            pRStt->nContent.Assign( pRStt->nNode.GetNode().GetCntntNode(),0);
+            pRStt->nContent.Assign( pRStt->nNode.GetNode().GetContentNode(),0);
         }
         if( pREnd->nNode.GetIndex() != nRedlEndNd )
         {
             pREnd->nNode = nRedlEndNd;
-            SwCntntNode* pCNd = pREnd->nNode.GetNode().GetCntntNode();
+            SwContentNode* pCNd = pREnd->nNode.GetNode().GetContentNode();
             pREnd->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
         }
     }
@@ -2037,16 +2037,16 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
 bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool bDel )
 {
     bool bResult = false;
-    SwTxtNode * pTxtNd = rIdx.GetNode().GetTxtNode();
+    SwTextNode * pTextNd = rIdx.GetNode().GetTextNode();
 
-    if (pTxtNd && pTxtNd->GetNumRule() != NULL &&
-        (pTxtNd->HasNumber() || pTxtNd->HasBullet()))
+    if (pTextNd && pTextNd->GetNumRule() != NULL &&
+        (pTextNd->HasNumber() || pTextNd->HasBullet()))
     {
-        if ( !pTxtNd->IsCountedInList() == !bDel)
+        if ( !pTextNd->IsCountedInList() == !bDel)
         {
             bool bOldNum = bDel;
             bool bNewNum = !bDel;
-            pTxtNd->SetCountedInList(bNewNum);
+            pTextNd->SetCountedInList(bNewNum);
 
             getIDocumentState().SetModified();
 
@@ -2060,11 +2060,11 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool bDel )
                 GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
         }
-        else if (bDel && pTxtNd->GetNumRule(false) &&
-                 pTxtNd->GetActualListLevel() >= 0 &&
-                 pTxtNd->GetActualListLevel() < MAXLEVEL)
+        else if (bDel && pTextNd->GetNumRule(false) &&
+                 pTextNd->GetActualListLevel() >= 0 &&
+                 pTextNd->GetActualListLevel() < MAXLEVEL)
         {
-            SwPaM aPam(*pTxtNd);
+            SwPaM aPam(*pTextNd);
             DelNumRules(aPam);
 
             bResult = true;
@@ -2077,7 +2077,7 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool bDel )
 SwNumRule* SwDoc::GetNumRuleAtPos( const SwPosition& rPos )
 {
     SwNumRule* pRet = NULL;
-    SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
 
     if ( pTNd != NULL )
     {
@@ -2089,8 +2089,8 @@ SwNumRule* SwDoc::GetNumRuleAtPos( const SwPosition& rPos )
 
 sal_uInt16 SwDoc::FindNumRule( const OUString& rName ) const
 {
-    for( sal_uInt16 n = mpNumRuleTbl->size(); n; )
-        if( (*mpNumRuleTbl)[ --n ]->GetName() == rName )
+    for( sal_uInt16 n = mpNumRuleTable->size(); n; )
+        if( (*mpNumRuleTable)[ --n ]->GetName() == rName )
             return n;
 
     return USHRT_MAX;
@@ -2104,11 +2104,11 @@ SwNumRule* SwDoc::FindNumRulePtr( const OUString& rName ) const
 
     if ( !pResult )
     {
-        for (sal_uInt16 n = 0; n < mpNumRuleTbl->size(); ++n)
+        for (sal_uInt16 n = 0; n < mpNumRuleTable->size(); ++n)
         {
-            if ((*mpNumRuleTbl)[n]->GetName() == rName)
+            if ((*mpNumRuleTable)[n]->GetName() == rName)
             {
-                pResult = (*mpNumRuleTbl)[n];
+                pResult = (*mpNumRuleTable)[n];
 
                 break;
             }
@@ -2120,12 +2120,12 @@ SwNumRule* SwDoc::FindNumRulePtr( const OUString& rName ) const
 
 void SwDoc::AddNumRule(SwNumRule * pRule)
 {
-    if ((SAL_MAX_UINT16 - 1) <= mpNumRuleTbl->size())
+    if ((SAL_MAX_UINT16 - 1) <= mpNumRuleTable->size())
     {
         OSL_ENSURE(false, "SwDoc::AddNumRule: table full.");
         abort(); // this should never happen on real documents
     }
-    mpNumRuleTbl->push_back(pRule);
+    mpNumRuleTable->push_back(pRule);
     maNumRuleMap[pRule->GetName()] = pRule;
     pRule->SetNumRuleMap(&maNumRuleMap);
 
@@ -2146,12 +2146,12 @@ sal_uInt16 SwDoc::MakeNumRule( const OUString &rName,
 
         if( pNew->GetName() != rName )
         {
-            pNew->SetPoolFmtId( USHRT_MAX );
+            pNew->SetPoolFormatId( USHRT_MAX );
             pNew->SetPoolHelpId( USHRT_MAX );
             pNew->SetPoolHlpFileId( UCHAR_MAX );
             pNew->SetDefaultListId( OUString() );
         }
-        pNew->CheckCharFmts( this );
+        pNew->CheckCharFormats( this );
     }
     else
     {
@@ -2159,7 +2159,7 @@ sal_uInt16 SwDoc::MakeNumRule( const OUString &rName,
                               eDefaultNumberFormatPositionAndSpaceMode );
     }
 
-    sal_uInt16 nRet = mpNumRuleTbl->size();
+    sal_uInt16 nRet = mpNumRuleTable->size();
 
     AddNumRule(pNew);
 
@@ -2184,7 +2184,7 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
     {
         OUString newName = "MailMergeNumRule"
             + OStringToOUString( DateTimeToOString( DateTime( DateTime::SYSTEM )), RTL_TEXTENCODING_ASCII_US )
-            + OUString::number( mpNumRuleTbl->size() + 1 );
+            + OUString::number( mpNumRuleTable->size() + 1 );
         return newName;
     }
 
@@ -2216,7 +2216,7 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
         aName = SW_RESSTR( STR_NUMRULE_DEFNAME );
     }
 
-    sal_uInt16 nNum(0), nTmp, nFlagSize = ( mpNumRuleTbl->size() / 8 ) +2;
+    sal_uInt16 nNum(0), nTmp, nFlagSize = ( mpNumRuleTable->size() / 8 ) +2;
     sal_uInt8* pSetFlags = new sal_uInt8[ nFlagSize ];
     memset( pSetFlags, 0, nFlagSize );
 
@@ -2236,15 +2236,15 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
     const SwNumRule* pNumRule;
     sal_uInt16 n;
 
-    for( n = 0; n < mpNumRuleTbl->size(); ++n )
-        if( 0 != ( pNumRule = (*mpNumRuleTbl)[ n ] ) )
+    for( n = 0; n < mpNumRuleTable->size(); ++n )
+        if( 0 != ( pNumRule = (*mpNumRuleTable)[ n ] ) )
         {
             const OUString sNm = pNumRule->GetName();
             if( sNm.startsWith( aName ) )
             {
                 // Determine Number and set the Flag
                 nNum = (sal_uInt16)sNm.copy( nNmLen ).toInt32();
-                if( nNum-- && nNum < mpNumRuleTbl->size() )
+                if( nNum-- && nNum < mpNumRuleTable->size() )
                     pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
             }
             if( pChkStr && *pChkStr==sNm )
@@ -2254,7 +2254,7 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
     if( !pChkStr )
     {
         // All Numbers have been flagged accordingly, so identify the right Number
-        nNum = mpNumRuleTbl->size();
+        nNum = mpNumRuleTable->size();
         for( n = 0; n < nFlagSize; ++n )
             if( 0xff != ( nTmp = pSetFlags[ n ] ))
             {
@@ -2273,10 +2273,10 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
 
 void SwDoc::UpdateNumRule()
 {
-    const SwNumRuleTbl& rNmTbl = GetNumRuleTbl();
-    for( sal_uInt16 n = 0; n < rNmTbl.size(); ++n )
-        if( rNmTbl[ n ]->IsInvalidRule() )
-            rNmTbl[ n ]->Validate();
+    const SwNumRuleTable& rNmTable = GetNumRuleTable();
+    for( sal_uInt16 n = 0; n < rNmTable.size(); ++n )
+        if( rNmTable[ n ]->IsInvalidRule() )
+            rNmTable[ n ]->Validate();
 }
 
 void SwDoc::MarkListLevel( const OUString& sListId,
@@ -2303,10 +2303,10 @@ bool SwDoc::IsFirstOfNumRuleAtPos( const SwPosition & rPos )
 {
     bool bResult = false;
 
-    const SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
-    if ( pTxtNode != NULL )
+    const SwTextNode* pTextNode = rPos.nNode.GetNode().GetTextNode();
+    if ( pTextNode != NULL )
     {
-        bResult = pTxtNode->IsFirstOfNumRule();
+        bResult = pTextNode->IsFirstOfNumRule();
     }
 
     return bResult;
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 421333156160..3f71cf9a11fc 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -54,13 +54,13 @@ using namespace com::sun::star;
 
     void sw_DebugRedline( const SwDoc* pDoc )
     {
-        static SwRedlineTbl::size_type nWatch = 0;
-        const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-        for( SwRedlineTbl::size_type n = 0; n < rTbl.size(); ++n )
+        static SwRedlineTable::size_type nWatch = 0;
+        const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+        for( SwRedlineTable::size_type n = 0; n < rTable.size(); ++n )
         {
-            SwRedlineTbl::size_type nDummy = 0;
-            const SwRangeRedline* pCurrent = rTbl[ n ];
-            const SwRangeRedline* pNext = n+1 < rTbl.size() ? rTbl[ n+1 ] : 0;
+            SwRedlineTable::size_type nDummy = 0;
+            const SwRangeRedline* pCurrent = rTable[ n ];
+            const SwRangeRedline* pNext = n+1 < rTable.size() ? rTable[ n+1 ] : 0;
             if( pCurrent == pNext )
                 ++nDummy;
             if( n == nWatch )
@@ -71,14 +71,14 @@ using namespace com::sun::star;
 #endif
 
 
-SwExtraRedlineTbl::~SwExtraRedlineTbl()
+SwExtraRedlineTable::~SwExtraRedlineTable()
 {
     DeleteAndDestroyAll();
 }
 
-void SwExtraRedlineTbl::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwExtraRedlineTable::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swExtraRedlineTbl"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swExtraRedlineTable"));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
 
     for (sal_uInt16 nCurExtraRedlinePos = 0; nCurExtraRedlinePos < GetSize(); ++nCurExtraRedlinePos)
@@ -118,7 +118,7 @@ bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd )
 }
 #endif
 
-bool SwExtraRedlineTbl::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
+bool SwExtraRedlineTable::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
 {
     if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & pDoc->getIDocumentRedlineAccess().GetRedlineMode() )
         return false;
@@ -197,7 +197,7 @@ bool SwExtraRedlineTbl::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTab
     return bChg;
 }
 
-bool SwExtraRedlineTbl::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& rTableLine, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
+bool SwExtraRedlineTable::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& rTableLine, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
 {
     if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & pDoc->getIDocumentRedlineAccess().GetRedlineMode() )
         return false;
@@ -244,7 +244,7 @@ bool SwExtraRedlineTbl::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& r
     return bChg;
 }
 
-bool SwExtraRedlineTbl::DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
+bool SwExtraRedlineTable::DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete )
 {
     if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & pDoc->getIDocumentRedlineAccess().GetRedlineMode() )
         return false;
@@ -291,11 +291,11 @@ bool SwExtraRedlineTbl::DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& r
     return bChg;
 }
 
-bool SwRedlineTbl::Insert( SwRangeRedline* p, bool bIns )
+bool SwRedlineTable::Insert( SwRangeRedline* p, bool bIns )
 {
     if( p->HasValidRange() )
     {
-        std::pair<_SwRedlineTbl::const_iterator, bool> rv = insert( p );
+        std::pair<_SwRedlineTable::const_iterator, bool> rv = insert( p );
         size_t nP = rv.first - begin();
         p->CallDisplayFunc(0, nP);
         return rv.second;
@@ -307,11 +307,11 @@ bool SwRedlineTbl::Insert( SwRangeRedline* p, bool bIns )
     return false;
 }
 
-bool SwRedlineTbl::Insert( SwRangeRedline* p, sal_uInt16& rP, bool bIns )
+bool SwRedlineTable::Insert( SwRangeRedline* p, sal_uInt16& rP, bool bIns )
 {
     if( p->HasValidRange() )
     {
-        std::pair<_SwRedlineTbl::const_iterator, bool> rv = insert( p );
+        std::pair<_SwRedlineTable::const_iterator, bool> rv = insert( p );
         rP = rv.first - begin();
         p->CallDisplayFunc(0, rP);
         return rv.second;
@@ -323,7 +323,7 @@ bool SwRedlineTbl::Insert( SwRangeRedline* p, sal_uInt16& rP, bool bIns )
     return false;
 }
 
-bool SwRedlineTbl::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos )
+bool SwRedlineTable::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos )
 {
     // Create valid "sub-ranges" from the Selection
     bool bAnyIns = false;
@@ -331,9 +331,9 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos
               * pEnd = pStt == p->GetPoint() ? p->GetMark() : p->GetPoint();
     SwPosition aNewStt( *pStt );
     SwNodes& rNds = aNewStt.nNode.GetNodes();
-    SwCntntNode* pC;
+    SwContentNode* pC;
 
-    if( !aNewStt.nNode.GetNode().IsCntntNode() )
+    if( !aNewStt.nNode.GetNode().IsContentNode() )
     {
         pC = rNds.GoNext( &aNewStt.nNode );
         if( pC )
@@ -388,8 +388,8 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos
                             else
                                 break;
                         }
-                        else if( rCurNd.IsCntntNode() )
-                            pC = rCurNd.GetCntntNode();
+                        else if( rCurNd.IsContentNode() )
+                            pC = rCurNd.GetContentNode();
                         ++aNewStt.nNode;
                     } while( aNewStt.nNode.GetIndex() < pEnd->nNode.GetIndex() );
 
@@ -434,17 +434,17 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos
     return bAnyIns;
 }
 
-bool CompareSwRedlineTbl::operator()(SwRangeRedline* const &lhs, SwRangeRedline* const &rhs) const
+bool CompareSwRedlineTable::operator()(SwRangeRedline* const &lhs, SwRangeRedline* const &rhs) const
 {
     return *lhs < *rhs;
 }
 
-_SwRedlineTbl::~_SwRedlineTbl()
+_SwRedlineTable::~_SwRedlineTable()
 {
     DeleteAndDestroyAll();
 }
 
-sal_uInt16 SwRedlineTbl::GetPos(const SwRangeRedline* p) const
+sal_uInt16 SwRedlineTable::GetPos(const SwRangeRedline* p) const
 {
     const_iterator it = find(const_cast<SwRangeRedline* const>(p));
     if( it == end() )
@@ -452,7 +452,7 @@ sal_uInt16 SwRedlineTbl::GetPos(const SwRangeRedline* p) const
     return it - begin();
 }
 
-bool SwRedlineTbl::Remove( const SwRangeRedline* p )
+bool SwRedlineTable::Remove( const SwRangeRedline* p )
 {
     const sal_uInt16 nPos = GetPos(p);
     if (nPos == USHRT_MAX)
@@ -461,7 +461,7 @@ bool SwRedlineTbl::Remove( const SwRangeRedline* p )
     return true;
 }
 
-void SwRedlineTbl::Remove( sal_uInt16 nP )
+void SwRedlineTable::Remove( sal_uInt16 nP )
 {
     SwDoc* pDoc = 0;
     if( !nP && 1 == size() )
@@ -475,12 +475,12 @@ void SwRedlineTbl::Remove( sal_uInt16 nP )
         pSh->InvalidateWindows( SwRect( 0, 0, SAL_MAX_INT32, SAL_MAX_INT32 ) );
 }
 
-void SwRedlineTbl::DeleteAndDestroyAll()
+void SwRedlineTable::DeleteAndDestroyAll()
 {
     DeleteAndDestroy(0, size());
 }
 
-void SwRedlineTbl::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
+void SwRedlineTable::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
 {
     SwDoc* pDoc = 0;
     if( !nP && nL && nL == size() )
@@ -496,14 +496,14 @@ void SwRedlineTbl::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
         pSh->InvalidateWindows( SwRect( 0, 0, SAL_MAX_INT32, SAL_MAX_INT32 ) );
 }
 
-sal_uInt16 SwRedlineTbl::FindNextOfSeqNo( sal_uInt16 nSttPos ) const
+sal_uInt16 SwRedlineTable::FindNextOfSeqNo( sal_uInt16 nSttPos ) const
 {
     return static_cast<size_t>(nSttPos) + 1 < size()
                 ? FindNextSeqNo( operator[]( nSttPos )->GetSeqNo(), nSttPos+1 )
                 : USHRT_MAX;
 }
 
-sal_uInt16 SwRedlineTbl::FindPrevOfSeqNo( sal_uInt16 nSttPos ) const
+sal_uInt16 SwRedlineTable::FindPrevOfSeqNo( sal_uInt16 nSttPos ) const
 {
     return nSttPos ? FindPrevSeqNo( operator[]( nSttPos )->GetSeqNo(), nSttPos-1 )
                    : USHRT_MAX;
@@ -511,7 +511,7 @@ sal_uInt16 SwRedlineTbl::FindPrevOfSeqNo( sal_uInt16 nSttPos ) const
 
 /// Find the next or preceding Redline with the same seq.no.
 /// We can limit the search using look ahead (0 searches the whole array).
-sal_uInt16 SwRedlineTbl::FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
+sal_uInt16 SwRedlineTable::FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
                                     sal_uInt16 nLookahead ) const
 {
     sal_uInt16 nRet = USHRT_MAX;
@@ -537,7 +537,7 @@ sal_uInt16 SwRedlineTbl::FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
     return nRet;
 }
 
-sal_uInt16 SwRedlineTbl::FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
+sal_uInt16 SwRedlineTable::FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
                                     sal_uInt16 nLookahead ) const
 {
     sal_uInt16 nRet = USHRT_MAX;
@@ -558,7 +558,7 @@ sal_uInt16 SwRedlineTbl::FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
     return nRet;
 }
 
-const SwRangeRedline* SwRedlineTbl::FindAtPosition( const SwPosition& rSttPos,
+const SwRangeRedline* SwRedlineTable::FindAtPosition( const SwPosition& rSttPos,
                                         sal_uInt16& rPos,
                                         bool bNext ) const
 {
@@ -586,12 +586,12 @@ const SwRangeRedline* SwRedlineTbl::FindAtPosition( const SwPosition& rSttPos,
     return pFnd;
 }
 
-void SwRedlineTbl::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwRedlineTable::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swRedlineTbl"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swRedlineTable"));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
 
-    for (SwRedlineTbl::size_type nCurRedlinePos = 0; nCurRedlinePos < size(); ++nCurRedlinePos)
+    for (SwRedlineTable::size_type nCurRedlinePos = 0; nCurRedlinePos < size(); ++nCurRedlinePos)
         operator[](nCurRedlinePos)->dumpAsXml(pWriter);
 
     xmlTextWriterEndElement(pWriter);
@@ -610,44 +610,44 @@ bool SwRedlineExtraData::operator == ( const SwRedlineExtraData& ) const
     return false;
 }
 
-SwRedlineExtraData_FmtColl::SwRedlineExtraData_FmtColl( const OUString& rColl,
-                                                sal_uInt16 nPoolFmtId,
+SwRedlineExtraData_FormatColl::SwRedlineExtraData_FormatColl( const OUString& rColl,
+                                                sal_uInt16 nPoolFormatId,
                                                 const SfxItemSet* pItemSet )
-    : sFmtNm(rColl), pSet(0), nPoolId(nPoolFmtId)
+    : sFormatNm(rColl), pSet(0), nPoolId(nPoolFormatId)
 {
     if( pItemSet && pItemSet->Count() )
         pSet = new SfxItemSet( *pItemSet );
 }
 
-SwRedlineExtraData_FmtColl::~SwRedlineExtraData_FmtColl()
+SwRedlineExtraData_FormatColl::~SwRedlineExtraData_FormatColl()
 {
     delete pSet;
 }
 
-SwRedlineExtraData* SwRedlineExtraData_FmtColl::CreateNew() const
+SwRedlineExtraData* SwRedlineExtraData_FormatColl::CreateNew() const
 {
-    return new SwRedlineExtraData_FmtColl( sFmtNm, nPoolId, pSet );
+    return new SwRedlineExtraData_FormatColl( sFormatNm, nPoolId, pSet );
 }
 
-void SwRedlineExtraData_FmtColl::Reject( SwPaM& rPam ) const
+void SwRedlineExtraData_FormatColl::Reject( SwPaM& rPam ) const
 {
     SwDoc* pDoc = rPam.GetDoc();
 
     // What about Undo? Is it turned off?
-    SwTxtFmtColl* pColl = USHRT_MAX == nPoolId
-                            ? pDoc->FindTxtFmtCollByName( sFmtNm )
-                            : pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nPoolId );
+    SwTextFormatColl* pColl = USHRT_MAX == nPoolId
+                            ? pDoc->FindTextFormatCollByName( sFormatNm )
+                            : pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nPoolId );
     if( pColl )
-        pDoc->SetTxtFmtColl( rPam, pColl, false );
+        pDoc->SetTextFormatColl( rPam, pColl, false );
 
     if( pSet )
     {
         rPam.SetMark();
         SwPosition& rMark = *rPam.GetMark();
-        SwTxtNode* pTNd = rMark.nNode.GetNode().GetTxtNode();
+        SwTextNode* pTNd = rMark.nNode.GetNode().GetTextNode();
         if( pTNd )
         {
-            rMark.nContent.Assign(pTNd, pTNd->GetTxt().getLength());
+            rMark.nContent.Assign(pTNd, pTNd->GetText().getLength());
 
             if( pTNd->HasSwAttrSet() )
             {
@@ -666,15 +666,15 @@ void SwRedlineExtraData_FmtColl::Reject( SwPaM& rPam ) const
     }
 }
 
-bool SwRedlineExtraData_FmtColl::operator == ( const SwRedlineExtraData& r) const
+bool SwRedlineExtraData_FormatColl::operator == ( const SwRedlineExtraData& r) const
 {
-    const SwRedlineExtraData_FmtColl& rCmp = static_cast<const SwRedlineExtraData_FmtColl&>(r);
-    return sFmtNm == rCmp.sFmtNm && nPoolId == rCmp.nPoolId &&
+    const SwRedlineExtraData_FormatColl& rCmp = static_cast<const SwRedlineExtraData_FormatColl&>(r);
+    return sFormatNm == rCmp.sFormatNm && nPoolId == rCmp.nPoolId &&
             ( ( !pSet && !rCmp.pSet ) ||
                ( pSet && rCmp.pSet && *pSet == *rCmp.pSet ) );
 }
 
-void SwRedlineExtraData_FmtColl::SetItemSet( const SfxItemSet& rSet )
+void SwRedlineExtraData_FormatColl::SetItemSet( const SfxItemSet& rSet )
 {
     delete pSet;
     if( rSet.Count() )
@@ -856,7 +856,7 @@ OUString SwRedlineData::GetDescr() const
 SwRangeRedline::SwRangeRedline(RedlineType_t eTyp, const SwPaM& rPam )
     : SwPaM( *rPam.GetMark(), *rPam.GetPoint() ),
     pRedlineData( new SwRedlineData( eTyp, GetDoc()->getIDocumentRedlineAccess().GetRedlineAuthor() ) ),
-    pCntntSect( 0 )
+    pContentSect( 0 )
 {
     bDelLastPara = bIsLastParaDelete = false;
     bIsVisible = true;
@@ -867,7 +867,7 @@ SwRangeRedline::SwRangeRedline(RedlineType_t eTyp, const SwPaM& rPam )
 SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam )
     : SwPaM( *rPam.GetMark(), *rPam.GetPoint() ),
     pRedlineData( new SwRedlineData( rData )),
-    pCntntSect( 0 )
+    pContentSect( 0 )
 {
     bDelLastPara = bIsLastParaDelete = false;
     bIsVisible = true;
@@ -878,7 +878,7 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam )
 SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPosition& rPos )
     : SwPaM( rPos ),
     pRedlineData( new SwRedlineData( rData )),
-    pCntntSect( 0 )
+    pContentSect( 0 )
 {
     bDelLastPara = bIsLastParaDelete = false;
     bIsVisible = true;
@@ -887,7 +887,7 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPosition& rP
 SwRangeRedline::SwRangeRedline( const SwRangeRedline& rCpy )
     : SwPaM( *rCpy.GetMark(), *rCpy.GetPoint() ),
     pRedlineData( new SwRedlineData( *rCpy.pRedlineData )),
-    pCntntSect( 0 )
+    pContentSect( 0 )
 {
     bDelLastPara = bIsLastParaDelete = false;
     bIsVisible = true;
@@ -897,12 +897,12 @@ SwRangeRedline::SwRangeRedline( const SwRangeRedline& rCpy )
 
 SwRangeRedline::~SwRangeRedline()
 {
-    if( pCntntSect )
+    if( pContentSect )
     {
         // delete the ContentSection
         if( !GetDoc()->IsInDtor() )
-            GetDoc()->getIDocumentContentOperations().DeleteSection( &pCntntSect->GetNode() );
-        delete pCntntSect;
+            GetDoc()->getIDocumentContentOperations().DeleteSection( &pContentSect->GetNode() );
+        delete pContentSect;
     }
     delete pRedlineData;
 }
@@ -1067,12 +1067,12 @@ void SwRangeRedline::InvalidateRange()       // trigger the Layout
     {
         SwNode* pNode = rNds[n];
 
-        if (pNode && pNode->IsTxtNode())
+        if (pNode && pNode->IsTextNode())
         {
-            SwTxtNode* pNd = pNode->GetTxtNode();
+            SwTextNode* pNd = pNode->GetTextNode();
             SwUpdateAttr aHt(
                 n == nSttNd ? nSttCnt : 0,
-                n == nEndNd ? nEndCnt : pNd->GetTxt().getLength(),
+                n == nEndNd ? nEndCnt : pNd->GetText().getLength(),
                 RES_FMT_CHG);
 
             pNd->ModifyNotification(&aHt, &aHt);
@@ -1117,24 +1117,24 @@ void SwRangeRedline::CalcStartEnd( sal_uLong nNdIdx, sal_Int32& rStart, sal_Int3
 
 void SwRangeRedline::MoveToSection()
 {
-    if( !pCntntSect )
+    if( !pContentSect )
     {
         const SwPosition* pStt = Start(),
                         * pEnd = pStt == GetPoint() ? GetMark() : GetPoint();
 
         SwDoc* pDoc = GetDoc();
         SwPaM aPam( *pStt, *pEnd );
-        SwCntntNode* pCSttNd = pStt->nNode.GetNode().GetCntntNode();
-        SwCntntNode* pCEndNd = pEnd->nNode.GetNode().GetCntntNode();
+        SwContentNode* pCSttNd = pStt->nNode.GetNode().GetContentNode();
+        SwContentNode* pCEndNd = pEnd->nNode.GetNode().GetContentNode();
 
         if( !pCSttNd )
         {
             // In order to not move other Redlines' indices, we set them
             // to the end (is exclusive)
-            const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-            for( SwRedlineTbl::size_type n = 0; n < rTbl.size(); ++n )
+            const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+            for( SwRedlineTable::size_type n = 0; n < rTable.size(); ++n )
             {
-                SwRangeRedline* pRedl = rTbl[ n ];
+                SwRangeRedline* pRedl = rTable[ n ];
                 if( pRedl->GetBound(true) == *pStt )
                     pRedl->GetBound(true) = *pEnd;
                 if( pRedl->GetBound(false) == *pStt )
@@ -1146,18 +1146,18 @@ void SwRangeRedline::MoveToSection()
         SwNodes& rNds = pDoc->GetNodes();
         if( pCSttNd || pCEndNd )
         {
-            SwTxtFmtColl* pColl = (pCSttNd && pCSttNd->IsTxtNode() )
-                                    ? pCSttNd->GetTxtNode()->GetTxtColl()
-                                    : (pCEndNd && pCEndNd->IsTxtNode() )
-                                        ? pCEndNd->GetTxtNode()->GetTxtColl()
-                                        : pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
+            SwTextFormatColl* pColl = (pCSttNd && pCSttNd->IsTextNode() )
+                                    ? pCSttNd->GetTextNode()->GetTextColl()
+                                    : (pCEndNd && pCEndNd->IsTextNode() )
+                                        ? pCEndNd->GetTextNode()->GetTextColl()
+                                        : pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD);
 
             pSttNd = rNds.MakeTextSection( SwNodeIndex( rNds.GetEndOfRedlines() ),
                                             SwNormalStartNode, pColl );
-            SwTxtNode* pTxtNd = rNds[ pSttNd->GetIndex() + 1 ]->GetTxtNode();
+            SwTextNode* pTextNd = rNds[ pSttNd->GetIndex() + 1 ]->GetTextNode();
 
-            SwNodeIndex aNdIdx( *pTxtNd );
-            SwPosition aPos( aNdIdx, SwIndex( pTxtNd ));
+            SwNodeIndex aNdIdx( *pTextNd );
+            SwPosition aPos( aNdIdx, SwIndex( pTextNd ));
             if( pCSttNd && pCEndNd )
                 pDoc->getIDocumentContentOperations().MoveAndJoin( aPam, aPos, SwMoveFlags::DEFAULT );
             else
@@ -1177,7 +1177,7 @@ void SwRangeRedline::MoveToSection()
             pDoc->getIDocumentContentOperations().MoveRange( aPam, aPos,
                 SwMoveFlags::DEFAULT );
         }
-        pCntntSect = new SwNodeIndex( *pSttNd );
+        pContentSect = new SwNodeIndex( *pSttNd );
 
         if( pStt == GetPoint() )
             Exchange();
@@ -1190,13 +1190,13 @@ void SwRangeRedline::MoveToSection()
 
 void SwRangeRedline::CopyToSection()
 {
-    if( !pCntntSect )
+    if( !pContentSect )
     {
         const SwPosition* pStt = Start(),
                         * pEnd = pStt == GetPoint() ? GetMark() : GetPoint();
 
-        SwCntntNode* pCSttNd = pStt->nNode.GetNode().GetCntntNode();
-        SwCntntNode* pCEndNd = pEnd->nNode.GetNode().GetCntntNode();
+        SwContentNode* pCSttNd = pStt->nNode.GetNode().GetContentNode();
+        SwContentNode* pCEndNd = pEnd->nNode.GetNode().GetContentNode();
 
         SwStartNode* pSttNd;
         SwDoc* pDoc = GetDoc();
@@ -1215,29 +1215,29 @@ void SwRangeRedline::CopyToSection()
 
         if( pCSttNd )
         {
-            SwTxtFmtColl* pColl = (pCSttNd && pCSttNd->IsTxtNode() )
-                                    ? pCSttNd->GetTxtNode()->GetTxtColl()
-                                    : pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
+            SwTextFormatColl* pColl = (pCSttNd && pCSttNd->IsTextNode() )
+                                    ? pCSttNd->GetTextNode()->GetTextColl()
+                                    : pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD);
 
             pSttNd = rNds.MakeTextSection( SwNodeIndex( rNds.GetEndOfRedlines() ),
                                             SwNormalStartNode, pColl );
 
             SwNodeIndex aNdIdx( *pSttNd, 1 );
-            SwTxtNode* pTxtNd = aNdIdx.GetNode().GetTxtNode();
-            SwPosition aPos( aNdIdx, SwIndex( pTxtNd ));
+            SwTextNode* pTextNd = aNdIdx.GetNode().GetTextNode();
+            SwPosition aPos( aNdIdx, SwIndex( pTextNd ));
             pDoc->getIDocumentContentOperations().CopyRange( *this, aPos, /*bCopyAll=*/false, /*bCheckPos=*/true );
 
             // Take over the style from the EndNode if needed
             // We don't want this in Doc::Copy
             if( pCEndNd && pCEndNd != pCSttNd )
             {
-                SwCntntNode* pDestNd = aPos.nNode.GetNode().GetCntntNode();
+                SwContentNode* pDestNd = aPos.nNode.GetNode().GetContentNode();
                 if( pDestNd )
                 {
-                    if( pDestNd->IsTxtNode() && pCEndNd->IsTxtNode() )
-                        pCEndNd->GetTxtNode()->CopyCollFmt(*pDestNd->GetTxtNode());
+                    if( pDestNd->IsTextNode() && pCEndNd->IsTextNode() )
+                        pCEndNd->GetTextNode()->CopyCollFormat(*pDestNd->GetTextNode());
                     else
-                        pDestNd->ChgFmtColl( pCEndNd->GetFmtColl() );
+                        pDestNd->ChgFormatColl( pCEndNd->GetFormatColl() );
                 }
             }
         }
@@ -1258,7 +1258,7 @@ void SwRangeRedline::CopyToSection()
                 pDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aInsPos );
             }
         }
-        pCntntSect = new SwNodeIndex( *pSttNd );
+        pContentSect = new SwNodeIndex( *pSttNd );
 
         pDoc->SetCopyIsMove( bSaveCopyFlag );
         pDoc->getIDocumentRedlineAccess().SetRedlineMove( bSaveRdlMoveFlg );
@@ -1267,24 +1267,24 @@ void SwRangeRedline::CopyToSection()
 
 void SwRangeRedline::DelCopyOfSection(size_t nMyPos)
 {
-    if( pCntntSect )
+    if( pContentSect )
     {
         const SwPosition* pStt = Start(),
                         * pEnd = pStt == GetPoint() ? GetMark() : GetPoint();
 
         SwDoc* pDoc = GetDoc();
         SwPaM aPam( *pStt, *pEnd );
-        SwCntntNode* pCSttNd = pStt->nNode.GetNode().GetCntntNode();
-        SwCntntNode* pCEndNd = pEnd->nNode.GetNode().GetCntntNode();
+        SwContentNode* pCSttNd = pStt->nNode.GetNode().GetContentNode();
+        SwContentNode* pCEndNd = pEnd->nNode.GetNode().GetContentNode();
 
         if( !pCSttNd )
         {
             // In order to not move other Redlines' indices, we set them
             // to the end (is exclusive)
-            const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-            for( SwRedlineTbl::size_type n = 0; n < rTbl.size(); ++n )
+            const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+            for( SwRedlineTable::size_type n = 0; n < rTable.size(); ++n )
             {
-                SwRangeRedline* pRedl = rTbl[ n ];
+                SwRangeRedline* pRedl = rTable[ n ];
                 if( pRedl->GetBound(true) == *pStt )
                     pRedl->GetBound(true) = *pEnd;
                 if( pRedl->GetBound(false) == *pStt )
@@ -1311,21 +1311,21 @@ void SwRangeRedline::DelCopyOfSection(size_t nMyPos)
                 // table are sorted and the pEnd position is an endnode (see
                 // bDelLastPara condition above), only redlines before the
                 // current ones can be affected.
-                const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+                const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
                 size_t n = nMyPos;
                 OSL_ENSURE( n != USHRT_MAX, "How strange. We don't exist!" );
                 for( bool bBreak = false; !bBreak && n > 0; )
                 {
                     --n;
                     bBreak = true;
-                    if( rTbl[ n ]->GetBound(true) == *aPam.GetPoint() )
+                    if( rTable[ n ]->GetBound(true) == *aPam.GetPoint() )
                     {
-                        rTbl[ n ]->GetBound(true) = *pEnd;
+                        rTable[ n ]->GetBound(true) = *pEnd;
                         bBreak = false;
                     }
-                    if( rTbl[ n ]->GetBound(false) == *aPam.GetPoint() )
+                    if( rTable[ n ]->GetBound(false) == *aPam.GetPoint() )
                     {
-                        rTbl[ n ]->GetBound(false) = *pEnd;
+                        rTable[ n ]->GetBound(false) = *pEnd;
                         bBreak = false;
                     }
                 }
@@ -1355,27 +1355,27 @@ void SwRangeRedline::DelCopyOfSection(size_t nMyPos)
 
 void SwRangeRedline::MoveFromSection(size_t nMyPos)
 {
-    if( pCntntSect )
+    if( pContentSect )
     {
         SwDoc* pDoc = GetDoc();
-        const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+        const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
         std::vector<SwPosition*> aBeforeArr, aBehindArr;
         OSL_ENSURE( this, "this is not in the array?" );
         bool bBreak = false;
-        SwRedlineTbl::size_type n;
+        SwRedlineTable::size_type n;
 
-        for( n = nMyPos+1; !bBreak && n < rTbl.size(); ++n )
+        for( n = nMyPos+1; !bBreak && n < rTable.size(); ++n )
         {
             bBreak = true;
-            if( rTbl[ n ]->GetBound(true) == *GetPoint() )
+            if( rTable[ n ]->GetBound(true) == *GetPoint() )
             {
-                SwRangeRedline* pRedl = rTbl[n];
+                SwRangeRedline* pRedl = rTable[n];
                 aBehindArr.push_back(&pRedl->GetBound(true));
                 bBreak = false;
             }
-            if( rTbl[ n ]->GetBound(false) == *GetPoint() )
+            if( rTable[ n ]->GetBound(false) == *GetPoint() )
             {
-                SwRangeRedline* pRedl = rTbl[n];
+                SwRangeRedline* pRedl = rTable[n];
                 aBehindArr.push_back(&pRedl->GetBound(false));
                 bBreak = false;
             }
@@ -1384,34 +1384,34 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
         {
             --n;
             bBreak = true;
-            if( rTbl[ n ]->GetBound(true) == *GetPoint() )
+            if( rTable[ n ]->GetBound(true) == *GetPoint() )
             {
-                SwRangeRedline* pRedl = rTbl[n];
+                SwRangeRedline* pRedl = rTable[n];
                 aBeforeArr.push_back(&pRedl->GetBound(true));
                 bBreak = false;
             }
-            if( rTbl[ n ]->GetBound(false) == *GetPoint() )
+            if( rTable[ n ]->GetBound(false) == *GetPoint() )
             {
-                SwRangeRedline* pRedl = rTbl[n];
+                SwRangeRedline* pRedl = rTable[n];
                 aBeforeArr.push_back(&pRedl->GetBound(false));
                 bBreak = false;
             }
         }
 
-        const SwNode* pKeptCntntSectNode( &pCntntSect->GetNode() ); // #i95711#
+        const SwNode* pKeptContentSectNode( &pContentSect->GetNode() ); // #i95711#
         {
-            SwPaM aPam( pCntntSect->GetNode(),
-                        *pCntntSect->GetNode().EndOfSectionNode(), 1,
+            SwPaM aPam( pContentSect->GetNode(),
+                        *pContentSect->GetNode().EndOfSectionNode(), 1,
                         ( bDelLastPara ? -2 : -1 ) );
-            SwCntntNode* pCNd = aPam.GetCntntNode();
+            SwContentNode* pCNd = aPam.GetContentNode();
             if( pCNd )
                 aPam.GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
             else
                 ++aPam.GetPoint()->nNode;
 
-            SwFmtColl* pColl = pCNd && pCNd->Len() && aPam.GetPoint()->nNode !=
+            SwFormatColl* pColl = pCNd && pCNd->Len() && aPam.GetPoint()->nNode !=
                                         aPam.GetMark()->nNode
-                                ? pCNd->GetFmtColl() : 0;
+                                ? pCNd->GetFormatColl() : 0;
 
             SwNodeIndex aNdIdx( GetPoint()->nNode, -1 );
             const sal_Int32 nPos = GetPoint()->nContent.GetIndex();
@@ -1421,7 +1421,7 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
             {
                 --aPos.nNode;
 
-                pDoc->getIDocumentContentOperations().AppendTxtNode( aPos );
+                pDoc->getIDocumentContentOperations().AppendTextNode( aPos );
             }
             else
             {
@@ -1432,35 +1432,35 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
             SetMark();
             *GetPoint() = aPos;
             GetMark()->nNode = aNdIdx.GetIndex() + 1;
-            pCNd = GetMark()->nNode.GetNode().GetCntntNode();
+            pCNd = GetMark()->nNode.GetNode().GetContentNode();
             GetMark()->nContent.Assign( pCNd, nPos );
 
             if( bDelLastPara )
             {
                 ++GetPoint()->nNode;
-                GetPoint()->nContent.Assign( pCNd = GetCntntNode(), 0 );
+                GetPoint()->nContent.Assign( pCNd = GetContentNode(), 0 );
                 bDelLastPara = false;
             }
             else if( pColl )
-                pCNd = GetCntntNode();
+                pCNd = GetContentNode();
 
             if( pColl && pCNd )
-                pCNd->ChgFmtColl( pColl );
+                pCNd->ChgFormatColl( pColl );
         }
 
         // #i95771#
         // Under certain conditions the previous <SwDoc::Move(..)> has already
         // removed the change tracking section of this <SwRangeRedline> instance from
         // the change tracking nodes area.
-        // Thus, check if <pCntntSect> still points to the change tracking section
+        // Thus, check if <pContentSect> still points to the change tracking section
         // by comparing it with the "indexed" <SwNode> instance copied before
         // perform the intrinsic move.
         // Note: Such condition is e.g. a "delete" change tracking only containing a table.
-        if ( &pCntntSect->GetNode() == pKeptCntntSectNode )
+        if ( &pContentSect->GetNode() == pKeptContentSectNode )
         {
-            pDoc->getIDocumentContentOperations().DeleteSection( &pCntntSect->GetNode() );
+            pDoc->getIDocumentContentOperations().DeleteSection( &pContentSect->GetNode() );
         }
-        delete pCntntSect, pCntntSect = 0;
+        delete pContentSect, pContentSect = 0;
 
         // adjustment of redline table positions must take start and
         // end into account, not point and mark.
@@ -1476,14 +1476,14 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
 // for Undo
 void SwRangeRedline::SetContentIdx( const SwNodeIndex* pIdx )
 {
-    if( pIdx && !pCntntSect )
+    if( pIdx && !pContentSect )
     {
-        pCntntSect = new SwNodeIndex( *pIdx );
+        pContentSect = new SwNodeIndex( *pIdx );
         bIsVisible = false;
     }
-    else if( !pIdx && pCntntSect )
+    else if( !pIdx && pContentSect )
     {
-        delete pCntntSect, pCntntSect = 0;
+        delete pContentSect, pContentSect = 0;
         bIsVisible = false;
     }
     else
@@ -1595,20 +1595,20 @@ OUString SwRangeRedline::GetDescr(sal_uInt16 nPos)
     bool bDeletePaM = false;
 
     // if this redline is visible the content is in this PaM
-    if (NULL == pCntntSect)
+    if (NULL == pContentSect)
     {
         pPaM = this;
     }
-    else // otherwise it is saved in pCntntSect
+    else // otherwise it is saved in pContentSect
     {
-        SwNodeIndex aTmpIdx( *pCntntSect->GetNode().EndOfSectionNode() );
-        pPaM = new SwPaM(*pCntntSect, aTmpIdx );
+        SwNodeIndex aTmpIdx( *pContentSect->GetNode().EndOfSectionNode() );
+        pPaM = new SwPaM(*pContentSect, aTmpIdx );
         bDeletePaM = true;
     }
 
     // replace $1 in description by description of the redlines text
     const OUString aTmpStr = SW_RESSTR(STR_START_QUOTE)
-        + ShortenString(pPaM->GetTxt(), nUndoStringLength, SW_RESSTR(STR_LDOTS))
+        + ShortenString(pPaM->GetText(), nUndoStringLength, SW_RESSTR(STR_LDOTS))
         + SW_RESSTR(STR_END_QUOTE);
 
     SwRewriter aRewriter;
@@ -1654,14 +1654,14 @@ void SwRangeRedline::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-bool SwExtraRedlineTbl::Insert( SwExtraRedline* p )
+bool SwExtraRedlineTable::Insert( SwExtraRedline* p )
 {
     m_aExtraRedlines.push_back( p );
     //p->CallDisplayFunc();
     return true;
 }
 
-void SwExtraRedlineTbl::DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen )
+void SwExtraRedlineTable::DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     /*
     SwDoc* pDoc = 0;
@@ -1682,7 +1682,7 @@ void SwExtraRedlineTbl::DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen )
     */
 }
 
-void SwExtraRedlineTbl::DeleteAndDestroyAll()
+void SwExtraRedlineTable::DeleteAndDestroyAll()
 {
     DeleteAndDestroy(0, m_aExtraRedlines.size());
 }
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 6e3fb3d41489..f959d18999e8 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::i18n;
 /*
  * Members in the list:
  *   - String - the orig text
- *   - SwFmtRuby - the ruby attribute
+ *   - SwFormatRuby - the ruby attribute
  */
 sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList,
                             sal_uInt16 nMode )
@@ -184,10 +184,10 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
 {
     // Point must be the startposition, Mark is optional the end position
     SwPosition* pPos = rPam.GetPoint();
-       const SwTxtNode* pTNd = pPos->nNode.GetNode().GetTxtNode();
-    OUString const& rTxt = pTNd->GetTxt();
+       const SwTextNode* pTNd = pPos->nNode.GetNode().GetTextNode();
+    OUString const& rText = pTNd->GetText();
     sal_Int32 nStart = pPos->nContent.GetIndex();
-    sal_Int32 nEnd = rTxt.getLength();
+    sal_Int32 nEnd = rText.getLength();
 
     bool bHasMark = rPam.HasMark();
     if( bHasMark )
@@ -206,12 +206,12 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
     // search the start
     // look where a ruby attribute starts
     const SwpHints* pHts = pTNd->GetpSwpHints();
-    const SwTxtAttr* pAttr = 0;
+    const SwTextAttr* pAttr = 0;
     if( pHts )
     {
         for( size_t nHtIdx = 0; nHtIdx < pHts->Count(); ++nHtIdx )
         {
-            const SwTxtAttr* pHt = (*pHts)[ nHtIdx ];
+            const SwTextAttr* pHt = (*pHts)[ nHtIdx ];
             if( RES_TXTATR_CJK_RUBY == pHt->Which() &&
                 *pHt->GetAnyEnd() > nStart )
             {
@@ -233,7 +233,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
     {
         // skip to the word begin!
         const sal_Int32 nWordStt = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            rTxt, nStart,
+                            rText, nStart,
                             g_pBreakIt->GetLocale( pTNd->GetLang( nStart )),
                             WordType::ANYWORD_IGNOREWHITESPACES,
                             true ).startPos;
@@ -263,7 +263,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
             break;
         }
 
-        sal_Int32 nChType = rCC.getType(rTxt, nStart);
+        sal_Int32 nChType = rCC.getType(rText, nStart);
         bool bIgnoreChar = false, bIsAlphaNum = false, bChkNxtWrd = false;
         switch( nChType )
         {
@@ -303,7 +303,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
             {
                 // search the end of this word
                 nWordEnd = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                            rTxt, nStart,
+                            rText, nStart,
                             g_pBreakIt->GetLocale( pTNd->GetLang( nStart )),
                             WordType::ANYWORD_IGNOREWHITESPACES,
                             true ).endPos;
@@ -316,7 +316,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
     }
 
     nStart = rPam.GetMark()->nContent.GetIndex();
-    rEntry.SetText( rTxt.copy( nStart,
+    rEntry.SetText( rText.copy( nStart,
                            rPam.GetPoint()->nContent.GetIndex() - nStart ));
     return rPam.HasMark();
 }
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 69ee652d16fd..7173e13f010b 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -63,7 +63,7 @@ LocaleDataWrapper*  SwSortElement::pLclData = 0;
 
 // List of all sorted elements
 
-typedef ::boost::ptr_multiset<SwSortTxtElement> SwSortTxtElements;
+typedef ::boost::ptr_multiset<SwSortTextElement> SwSortTextElements;
 typedef ::boost::ptr_multiset<SwSortBoxElement> SwSortBoxElements;
 
 /// Construct a SortElement for the Sort
@@ -185,23 +185,23 @@ double SwSortElement::GetValue( sal_uInt16 nKey ) const
 }
 
 /// SortingElement for Text
-SwSortTxtElement::SwSortTxtElement(const SwNodeIndex& rPos)
+SwSortTextElement::SwSortTextElement(const SwNodeIndex& rPos)
     : nOrg(rPos.GetIndex()), aPos(rPos)
 {
 }
 
-SwSortTxtElement::~SwSortTxtElement()
+SwSortTextElement::~SwSortTextElement()
 {
 }
 
-OUString SwSortTxtElement::GetKey(sal_uInt16 nId) const
+OUString SwSortTextElement::GetKey(sal_uInt16 nId) const
 {
-    SwTxtNode* pTxtNd = aPos.GetNode().GetTxtNode();
-    if( !pTxtNd )
+    SwTextNode* pTextNd = aPos.GetNode().GetTextNode();
+    if( !pTextNd )
         return OUString();
 
     // for TextNodes
-    const OUString& rStr = pTxtNd->GetTxt();
+    const OUString& rStr = pTextNd->GetText();
 
     sal_Unicode nDeli = pOptions->cDeli;
     sal_uInt16 nDCount = pOptions->aKeys[nId]->nColumnId, i = 1;
@@ -256,8 +256,8 @@ OUString SwSortBoxElement::GetKey(sal_uInt16 nKey) const
             // Iterate over all the Box's TextNodes
             const SwNode *pNd = 0, *pEndNd = pMyBox->GetSttNd()->EndOfSectionNode();
             for( sal_uLong nIdx = pMyBox->GetSttIdx() + 1; pNd != pEndNd; ++nIdx )
-                if( ( pNd = pDoc->GetNodes()[ nIdx ])->IsTxtNode() )
-                    aRetStr += pNd->GetTxtNode()->GetTxt();
+                if( ( pNd = pDoc->GetNodes()[ nIdx ])->IsTextNode() )
+                    aRetStr += pNd->GetTextNode()->GetText();
         }
     }
     return aRetStr;
@@ -276,11 +276,11 @@ double SwSortBoxElement::GetValue( sal_uInt16 nKey ) const
     double nVal;
     if( pFndBox )
     {
-        const SwFmt *pFmt = pFndBox->GetBox()->GetFrmFmt();
-        if (pFmt->GetTblBoxNumFmt().GetValue() & css::util::NumberFormat::TEXT)
+        const SwFormat *pFormat = pFndBox->GetBox()->GetFrameFormat();
+        if (pFormat->GetTableBoxNumFormat().GetValue() & css::util::NumberFormat::TEXT)
             nVal = SwSortElement::GetValue( nKey );
         else
-            nVal = pFmt->GetTblBoxValue().GetValue();
+            nVal = pFormat->GetTableBoxValue().GetValue();
     }
     else
         nVal = 0;
@@ -295,10 +295,10 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
     const SwPosition *pStart = rPaM.Start(), *pEnd = rPaM.End();
 
     // Set index to the Selection's start
-    for ( const auto *pFmt : *GetSpzFrmFmts() )
+    for ( const auto *pFormat : *GetSpzFrameFormats() )
     {
-        SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-        SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+        SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+        SwPosition const*const pAPos = pAnchor->GetContentAnchor();
 
         if (pAPos && (FLY_AT_PARA == pAnchor->GetAnchorId()) &&
             pStart->nNode <= pAPos->nNode && pAPos->nNode <= pEnd->nNode )
@@ -311,7 +311,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
                         nEnd = pEnd->nNode.GetIndex();
         while( nStart <= nEnd )
             // Iterate over a selected range
-            if( !GetNodes()[ nStart++ ]->IsTxtNode() )
+            if( !GetNodes()[ nStart++ ]->IsTextNode() )
                 return false;
     }
 
@@ -325,11 +325,11 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
     SwUndoRedlineSort* pRedlUndo = 0;
     SwUndoSort* pUndoSort = 0;
 
-    // To-Do - add 'SwExtraRedlineTbl' also ?
-    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+    // To-Do - add 'SwExtraRedlineTable' also ?
+    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
         pRedlPam = new SwPaM( pStart->nNode, pEnd->nNode, -1, 1 );
-        SwCntntNode* pCNd = pRedlPam->GetCntntNode( false );
+        SwContentNode* pCNd = pRedlPam->GetContentNode( false );
         if( pCNd )
             pRedlPam->GetMark()->nContent = pCNd->Len();
 
@@ -349,14 +349,14 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
             getIDocumentRedlineAccess().DeleteRedline( *pRedlPam, true, USHRT_MAX );
 
             pRedlPam->GetMark()->nNode.Assign( pEnd->nNode.GetNode(), 1 );
-            pCNd = pRedlPam->GetCntntNode( false );
+            pCNd = pRedlPam->GetContentNode( false );
             pRedlPam->GetMark()->nContent.Assign( pCNd, 0 );
 
             pRedlPam->GetPoint()->nNode.Assign( aEndIdx.GetNode() );
-            pCNd = pRedlPam->GetCntntNode( true );
+            pCNd = pRedlPam->GetContentNode( true );
             sal_Int32 nCLen = 0;
             if( !pCNd &&
-                0 != (pCNd = GetNodes()[ aEndIdx.GetIndex()-1 ]->GetCntntNode()))
+                0 != (pCNd = GetNodes()[ aEndIdx.GetIndex()-1 ]->GetContentNode()))
             {
                 nCLen = pCNd->Len();
                 pRedlPam->GetPoint()->nNode.Assign( *pCNd );
@@ -375,11 +375,11 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
 
     SwNodeIndex aStart(pStart->nNode);
     SwSortElement::Init( this, rOpt );
-    SwSortTxtElements aSortSet;
+    SwSortTextElements aSortSet;
     while( aStart <= pEnd->nNode )
     {
         // Iterate over a selected range
-        SwSortTxtElement* pSE = new SwSortTxtElement( aStart );
+        SwSortTextElement* pSE = new SwSortTextElement( aStart );
         aSortSet.insert(pSE);
         ++aStart;
     }
@@ -397,7 +397,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
     GetIDocumentUndoRedo().DoUndo(false);
 
     size_t n = 0;
-    for (SwSortTxtElements::const_iterator it = aSortSet.begin();
+    for (SwSortTextElements::const_iterator it = aSortSet.begin();
             it != aSortSet.end(); ++it, ++n)
     {
         aStart      = nBeg + n;
@@ -439,7 +439,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
         // pRedlPam points to nodes that may be deleted (hidden) by
         // AppendRedline, so adjust it beforehand to prevent ASSERT
         pRedlPam->GetPoint()->nNode = aSttIdx;
-        SwCntntNode* pCNd = aSttIdx.GetNode().GetCntntNode();
+        SwContentNode* pCNd = aSttIdx.GetNode().GetContentNode();
         pRedlPam->GetPoint()->nContent.Assign( pCNd, 0 );
 
         getIDocumentRedlineAccess().AppendRedline(pDeleteRedline, true);
@@ -451,8 +451,8 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
         {
             SwNodeIndex aInsEndIdx( pRedlPam->GetMark()->nNode, -1 );
             pRedlPam->GetMark()->nNode = aInsEndIdx;
-            SwCntntNode *const pPrevNode =
-                pRedlPam->GetMark()->nNode.GetNode().GetCntntNode();
+            SwContentNode *const pPrevNode =
+                pRedlPam->GetMark()->nNode.GetNode().GetContentNode();
             pRedlPam->GetMark()->nContent.Assign( pPrevNode, pPrevNode->Len() );
 
             pRedlUndo->SetValues( *pRedlPam );
@@ -473,12 +473,12 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
 }
 
 /// Sort Table in the Document
-bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
+bool SwDoc::SortTable(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
 {
     // Via SwDoc for Undo!
     OSL_ENSURE( !rBoxes.empty(), "no valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // We begin sorting
@@ -486,17 +486,17 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
     _FndBox aFndBox( 0, 0 );
     {
         _FndPara aPara( rBoxes, &aFndBox );
-        ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
+        ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara );
     }
 
     if(aFndBox.GetLines().empty())
         return false;
 
-    if( !getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTbl().empty() )
-        getIDocumentRedlineAccess().DeleteRedline( *pTblNd, true, USHRT_MAX );
+    if( !getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() )
+        getIDocumentRedlineAccess().DeleteRedline( *pTableNd, true, USHRT_MAX );
 
     _FndLines::size_type nStart = 0;
-    if( pTblNd->GetTable().GetRowsToRepeat() > 0 && rOpt.eDirection == SRT_ROWS )
+    if( pTableNd->GetTable().GetRowsToRepeat() > 0 && rOpt.eDirection == SRT_ROWS )
     {
         // Uppermost selected Cell
         _FndLines& rLines = aFndBox.GetLines();
@@ -509,7 +509,7 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
             while ( pLine->GetUpper() )
                 pLine = pLine->GetUpper()->GetUpper();
 
-            if( pTblNd->GetTable().IsHeadline( *pLine ) )
+            if( pTableNd->GetTable().IsHeadline( *pLine ) )
                 nStart++;
             else
                 break;
@@ -520,9 +520,9 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
     }
 
     // Switch to relative Formulas
-    SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-    aMsgHnt.eFlags = TBL_RELBOXNAME;
-    getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+    aMsgHint.eFlags = TBL_RELBOXNAME;
+    getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     // Table as a flat array structure
     FlatFndBox aFlatBox(this, aFndBox);
@@ -531,14 +531,14 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
         return false;
 
     // Delete HTML layout
-    pTblNd->GetTable().SetHTMLTableLayout( 0 );
+    pTableNd->GetTable().SetHTMLTableLayout( 0 );
 
     // #i37739# A simple 'MakeFrms' after the node sorting
     // does not work if the table is inside a frame and has no prev/next.
-    SwNode2Layout aNode2Layout( *pTblNd );
+    SwNode2Layout aNode2Layout( *pTableNd );
 
     // Delete the Table's Frames
-    pTblNd->DelFrms();
+    pTableNd->DelFrms();
     // ? TL_CHART2: ?
 
     SwUndoSort* pUndoSort = 0;
@@ -546,7 +546,7 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
     {
         pUndoSort = new SwUndoSort( rBoxes[0]->GetSttIdx(),
                                     rBoxes.back()->GetSttIdx(),
-                                   *pTblNd, rOpt, aFlatBox.HasItemSets() );
+                                   *pTableNd, rOpt, aFlatBox.HasItemSets() );
         GetIDocumentUndoRedo().AppendUndo(pUndoSort);
     }
     ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
@@ -585,11 +585,11 @@ bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
     // Restore table frames:
     // #i37739# A simple 'MakeFrms' after the node sorting
     // does not work if the table is inside a frame and has no prev/next.
-    const sal_uLong nIdx = pTblNd->GetIndex();
+    const sal_uLong nIdx = pTableNd->GetIndex();
     aNode2Layout.RestoreUpperFrms( GetNodes(), nIdx, nIdx + 1 );
 
     // TL_CHART2: need to inform chart of probably changed cell names
-    UpdateCharts( pTblNd->GetTable().GetFrmFmt()->GetName() );
+    UpdateCharts( pTableNd->GetTable().GetFrameFormat()->GetName() );
 
     // Delete all Elements in the SortArray
     aSortList.clear();
@@ -622,22 +622,22 @@ void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT,
 
         if( pS != pT )
         {
-            SwFrmFmt* pTFmt = pT->GetFrmFmt();
+            SwFrameFormat* pTFormat = pT->GetFrameFormat();
             const SfxItemSet* pSSet = rBox.GetItemSet( i, nS );
 
             if( pSSet ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_FORMAT ) ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_FORMULA ) ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_VALUE ) )
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_FORMAT ) ||
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_FORMULA ) ||
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_VALUE ) )
             {
-                pTFmt = const_cast<SwTableBox*>(pT)->ClaimFrmFmt();
-                pTFmt->LockModify();
-                if( pTFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ) )
-                    pTFmt->ResetFmtAttr( RES_VERT_ORIENT );
+                pTFormat = const_cast<SwTableBox*>(pT)->ClaimFrameFormat();
+                pTFormat->LockModify();
+                if( pTFormat->ResetFormatAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ) )
+                    pTFormat->ResetFormatAttr( RES_VERT_ORIENT );
 
                 if( pSSet )
-                    pTFmt->SetFmtAttr( *pSSet );
-                pTFmt->UnlockModify();
+                    pTFormat->SetFormatAttr( *pSSet );
+                pTFormat->UnlockModify();
             }
         }
     }
@@ -666,22 +666,22 @@ void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT,
 
         if( pS != pT )
         {
-            SwFrmFmt* pTFmt = pT->GetFrmFmt();
+            SwFrameFormat* pTFormat = pT->GetFrameFormat();
             const SfxItemSet* pSSet = rBox.GetItemSet( nS, i );
 
             if( pSSet ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_FORMAT ) ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_FORMULA ) ||
-                SfxItemState::SET == pTFmt->GetItemState( RES_BOXATR_VALUE ) )
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_FORMAT ) ||
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_FORMULA ) ||
+                SfxItemState::SET == pTFormat->GetItemState( RES_BOXATR_VALUE ) )
             {
-                pTFmt = const_cast<SwTableBox*>(pT)->ClaimFrmFmt();
-                pTFmt->LockModify();
-                if( pTFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ) )
-                    pTFmt->ResetFmtAttr( RES_VERT_ORIENT );
+                pTFormat = const_cast<SwTableBox*>(pT)->ClaimFrameFormat();
+                pTFormat->LockModify();
+                if( pTFormat->ResetFormatAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ) )
+                    pTFormat->ResetFormatAttr( RES_VERT_ORIENT );
 
                 if( pSSet )
-                    pTFmt->SetFmtAttr( *pSSet );
-                pTFmt->UnlockModify();
+                    pTFormat->SetFormatAttr( *pSSet );
+                pTFormat->UnlockModify();
             }
         }
     }
@@ -707,8 +707,8 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
     // -> insert an empty Node and move the rest or the Mark
     // points to the first ContentNode
     if( pNd->StartOfSectionNode() == pSource->GetSttNd() )
-        pNd = pDoc->GetNodes().MakeTxtNode( aRg.aStart,
-                pDoc->GetDfltTxtFmtColl() );
+        pNd = pDoc->GetNodes().MakeTextNode( aRg.aStart,
+                pDoc->GetDfltTextFormatColl() );
     aRg.aEnd = *pNd->EndOfSectionNode();
 
     // If the Target is empty (there is one empty Node)
@@ -720,8 +720,8 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
     bool bDelFirst = false;
     if( nCount == 2 )
     {
-        OSL_ENSURE( pNd->GetCntntNode(), "No ContentNode");
-        bDelFirst = !pNd->GetCntntNode()->Len() && bMovedBefore;
+        OSL_ENSURE( pNd->GetContentNode(), "No ContentNode");
+        bDelFirst = !pNd->GetContentNode()->Len() && bMovedBefore;
     }
 
     if(!bDelFirst)
@@ -889,15 +889,15 @@ void FlatFndBox::FillFlat(const _FndBox& rBox, bool bLastBox)
                 *(pArr + nOff) = pBox;
 
                 // Save the Formula/Format/Value values
-                const SwFrmFmt* pFmt = pBox->GetBox()->GetFrmFmt();
-                if( SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_FORMAT ) ||
-                    SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_FORMULA ) ||
-                    SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_VALUE ) )
+                const SwFrameFormat* pFormat = pBox->GetBox()->GetFrameFormat();
+                if( SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_FORMAT ) ||
+                    SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_FORMULA ) ||
+                    SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_VALUE ) )
                 {
                     SfxItemSet* pSet = new SfxItemSet( pDoc->GetAttrPool(),
                                     RES_BOXATR_FORMAT, RES_BOXATR_VALUE,
                                     RES_VERT_ORIENT, RES_VERT_ORIENT, 0 );
-                    pSet->Put( pFmt->GetAttrSet() );
+                    pSet->Put( pFormat->GetAttrSet() );
                     if( !ppItemSets )
                     {
                         size_t nCount = static_cast<size_t>(nRows) * nCols;
diff --git a/sw/source/core/doc/docstat.cxx b/sw/source/core/doc/docstat.cxx
index 235db23854cc..c34e8d094ba2 100644
--- a/sw/source/core/doc/docstat.cxx
+++ b/sw/source/core/doc/docstat.cxx
@@ -20,7 +20,7 @@
 #include <docstat.hxx>
 
 SwDocStat::SwDocStat() :
-    nTbl(0),
+    nTable(0),
     nGrf(0),
     nOLE(0),
     nPage(1),
@@ -35,7 +35,7 @@ SwDocStat::SwDocStat() :
 
 void SwDocStat::Reset()
 {
-    nTbl    = 0;
+    nTable    = 0;
     nGrf    = 0;
     nOLE    = 0;
     nPage   = 1;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index c64a438ff8ce..988c70eed5cd 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -93,9 +93,9 @@ sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) c
         const SwTOXType* pTOXType = pItem->GetTOXType();
         if ( !pTOXType || pTOXType->GetType()!=TOX_INDEX )
             continue;
-        const SwTxtTOXMark* pMark = pItem->GetTxtTOXMark();
-        if ( pMark && pMark->GetpTxtNd() &&
-             pMark->GetpTxtNd()->GetNodes().IsDocNodes() )
+        const SwTextTOXMark* pMark = pItem->GetTextTOXMark();
+        if ( pMark && pMark->GetpTextNd() &&
+             pMark->GetpTextNd()->GetNodes().IsDocNodes() )
         {
             const OUString sStr = TOI_PRIMARY == eTyp
                 ? pItem->GetPrimaryKey()
@@ -114,11 +114,11 @@ sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
                                 SwTOXMarks& rArr )
 {
     // search on Position rPos for all SwTOXMarks
-    SwTxtNode *const pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( !pTxtNd || !pTxtNd->GetpSwpHints() )
+    SwTextNode *const pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( !pTextNd || !pTextNd->GetpSwpHints() )
         return 0;
 
-    const SwpHints & rHts = *pTxtNd->GetpSwpHints();
+    const SwpHints & rHts = *pTextNd->GetpSwpHints();
     sal_Int32 nSttIdx;
     const sal_Int32 *pEndIdx;
 
@@ -126,7 +126,7 @@ sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
 
     for( size_t n = 0; n < rHts.Count(); ++n )
     {
-        const SwTxtAttr* pHt = rHts[n];
+        const SwTextAttr* pHt = rHts[n];
         if( RES_TXTATR_TOXMARK != pHt->Which() )
             continue;
         if( ( nSttIdx = pHt->GetStart() ) < nAktPos )
@@ -150,75 +150,75 @@ sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
 /// Delete table of contents Mark
 void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark )
 {
-    const SwTxtTOXMark* pTxtTOXMark = pTOXMark->GetTxtTOXMark();
-    OSL_ENSURE( pTxtTOXMark, "No TxtTOXMark, cannot be deleted" );
+    const SwTextTOXMark* pTextTOXMark = pTOXMark->GetTextTOXMark();
+    OSL_ENSURE( pTextTOXMark, "No TextTOXMark, cannot be deleted" );
 
-    SwTxtNode& rTxtNd = const_cast<SwTxtNode&>(pTxtTOXMark->GetTxtNode());
-    OSL_ENSURE( rTxtNd.GetpSwpHints(), "cannot be deleted" );
+    SwTextNode& rTextNd = const_cast<SwTextNode&>(pTextTOXMark->GetTextNode());
+    OSL_ENSURE( rTextNd.GetpSwpHints(), "cannot be deleted" );
 
     std::unique_ptr<SwRegHistory> aRHst;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         // save attributes for Undo
         SwUndoResetAttr* pUndo = new SwUndoResetAttr(
-            SwPosition( rTxtNd, SwIndex( &rTxtNd, pTxtTOXMark->GetStart() ) ),
+            SwPosition( rTextNd, SwIndex( &rTextNd, pTextTOXMark->GetStart() ) ),
             RES_TXTATR_TOXMARK );
         GetIDocumentUndoRedo().AppendUndo( pUndo );
 
-        aRHst.reset(new SwRegHistory(rTxtNd, &pUndo->GetHistory()));
-        rTxtNd.GetpSwpHints()->Register(aRHst.get());
+        aRHst.reset(new SwRegHistory(rTextNd, &pUndo->GetHistory()));
+        rTextNd.GetpSwpHints()->Register(aRHst.get());
     }
 
-    rTxtNd.DeleteAttribute( const_cast<SwTxtTOXMark*>(pTxtTOXMark) );
+    rTextNd.DeleteAttribute( const_cast<SwTextTOXMark*>(pTextTOXMark) );
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        if( rTxtNd.GetpSwpHints() )
-            rTxtNd.GetpSwpHints()->DeRegister();
+        if( rTextNd.GetpSwpHints() )
+            rTextNd.GetpSwpHints()->DeRegister();
     }
     getIDocumentState().SetModified();
 }
 
 /// Travel between table of content Marks
-class CompareNodeCntnt
+class CompareNodeContent
 {
     sal_uLong nNode;
-    sal_Int32 nCntnt;
+    sal_Int32 nContent;
 public:
-    CompareNodeCntnt( sal_uLong nNd, sal_Int32 nCnt )
-        : nNode( nNd ), nCntnt( nCnt ) {}
-
-    bool operator==( const CompareNodeCntnt& rCmp ) const
-        { return nNode == rCmp.nNode && nCntnt == rCmp.nCntnt; }
-    bool operator!=( const CompareNodeCntnt& rCmp ) const
-        { return nNode != rCmp.nNode || nCntnt != rCmp.nCntnt; }
-    bool operator< ( const CompareNodeCntnt& rCmp ) const
+    CompareNodeContent( sal_uLong nNd, sal_Int32 nCnt )
+        : nNode( nNd ), nContent( nCnt ) {}
+
+    bool operator==( const CompareNodeContent& rCmp ) const
+        { return nNode == rCmp.nNode && nContent == rCmp.nContent; }
+    bool operator!=( const CompareNodeContent& rCmp ) const
+        { return nNode != rCmp.nNode || nContent != rCmp.nContent; }
+    bool operator< ( const CompareNodeContent& rCmp ) const
         { return nNode < rCmp.nNode ||
-            ( nNode == rCmp.nNode && nCntnt < rCmp.nCntnt); }
-    bool operator<=( const CompareNodeCntnt& rCmp ) const
+            ( nNode == rCmp.nNode && nContent < rCmp.nContent); }
+    bool operator<=( const CompareNodeContent& rCmp ) const
         { return nNode < rCmp.nNode ||
-            ( nNode == rCmp.nNode && nCntnt <= rCmp.nCntnt); }
-    bool operator> ( const CompareNodeCntnt& rCmp ) const
+            ( nNode == rCmp.nNode && nContent <= rCmp.nContent); }
+    bool operator> ( const CompareNodeContent& rCmp ) const
         { return nNode > rCmp.nNode ||
-            ( nNode == rCmp.nNode && nCntnt > rCmp.nCntnt); }
-    bool operator>=( const CompareNodeCntnt& rCmp ) const
+            ( nNode == rCmp.nNode && nContent > rCmp.nContent); }
+    bool operator>=( const CompareNodeContent& rCmp ) const
         { return nNode > rCmp.nNode ||
-            ( nNode == rCmp.nNode && nCntnt >= rCmp.nCntnt); }
+            ( nNode == rCmp.nNode && nContent >= rCmp.nContent); }
 };
 
 const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
                                     SwTOXSearch eDir, bool bInReadOnly )
 {
-    const SwTxtTOXMark* pMark = rCurTOXMark.GetTxtTOXMark();
-    OSL_ENSURE(pMark, "pMark==0 invalid TxtTOXMark");
+    const SwTextTOXMark* pMark = rCurTOXMark.GetTextTOXMark();
+    OSL_ENSURE(pMark, "pMark==0 invalid TextTOXMark");
 
-    const SwTxtNode *pTOXSrc = pMark->GetpTxtNd();
+    const SwTextNode *pTOXSrc = pMark->GetpTextNd();
 
-    CompareNodeCntnt aAbsIdx( pTOXSrc->GetIndex(), pMark->GetStart() );
-    CompareNodeCntnt aPrevPos( 0, 0 );
-    CompareNodeCntnt aNextPos( ULONG_MAX, SAL_MAX_INT32 );
-    CompareNodeCntnt aMax( 0, 0 );
-    CompareNodeCntnt aMin( ULONG_MAX, SAL_MAX_INT32 );
+    CompareNodeContent aAbsIdx( pTOXSrc->GetIndex(), pMark->GetStart() );
+    CompareNodeContent aPrevPos( 0, 0 );
+    CompareNodeContent aNextPos( ULONG_MAX, SAL_MAX_INT32 );
+    CompareNodeContent aMax( 0, 0 );
+    CompareNodeContent aMin( ULONG_MAX, SAL_MAX_INT32 );
 
     const SwTOXMark*    pNew    = 0;
     const SwTOXMark*    pMax    = &rCurTOXMark;
@@ -234,22 +234,22 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
         if ( pTOXMark == &rCurTOXMark )
             continue;
 
-        pMark = pTOXMark->GetTxtTOXMark();
+        pMark = pTOXMark->GetTextTOXMark();
         if (!pMark)
             continue;
 
-        pTOXSrc = pMark->GetpTxtNd();
+        pTOXSrc = pMark->GetpTextNd();
         if (!pTOXSrc)
             continue;
 
         Point aPt;
-        const SwCntntFrm* pCFrm = pTOXSrc->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+        const SwContentFrm* pCFrm = pTOXSrc->getLayoutFrm( getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
         if (!pCFrm)
             continue;
 
         if ( bInReadOnly || !pCFrm->IsProtected() )
         {
-            CompareNodeCntnt aAbsNew( pTOXSrc->GetIndex(), pMark->GetStart() );
+            CompareNodeContent aAbsNew( pTOXSrc->GetIndex(), pMark->GetStart() );
             switch( eDir )
             {
             // The following (a bit more complicated) statements make it
@@ -341,7 +341,7 @@ SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos,
         InsertSwSection( aPam, aSectionData, & rTOX, pSet, false ));
     if (pNewSection)
     {
-        SwSectionNode *const pSectNd = pNewSection->GetFmt()->GetSectionNode();
+        SwSectionNode *const pSectNd = pNewSection->GetFormat()->GetSectionNode();
         pNewSection->SetTOXName(sSectNm); // rTOX may have had no name...
 
         if( bExpand )
@@ -357,15 +357,15 @@ SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos,
             // then insert the headline section
             SwNodeIndex aIdx( *pSectNd, +1 );
 
-            SwTxtNode* pHeadNd = GetNodes().MakeTxtNode( aIdx,
-                            getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
+            SwTextNode* pHeadNd = GetNodes().MakeTextNode( aIdx,
+                            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ) );
 
             SwSectionData headerData( TOX_HEADER_SECTION, pNewSection->GetTOXName()+"_Head" );
 
             SwNodeIndex aStt( *pHeadNd ); --aIdx;
-            SwSectionFmt* pSectFmt = MakeSectionFmt( 0 );
+            SwSectionFormat* pSectFormat = MakeSectionFormat( 0 );
             GetNodes().InsertTextSection(
-                    aStt, *pSectFmt, headerData, 0, &aIdx, true, false);
+                    aStt, *pSectFormat, headerData, 0, &aIdx, true, false);
         }
     }
 
@@ -394,15 +394,15 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd
     SwSectionData aSectionData( TOX_CONTENT_SECTION, sSectNm );
 
     SwNodeIndex aStt( GetNodes(), nSttNd ), aEnd( GetNodes(), nEndNd );
-    SwSectionFmt* pFmt = MakeSectionFmt( 0 );
+    SwSectionFormat* pFormat = MakeSectionFormat( 0 );
     if(pSet)
-        pFmt->SetFmtAttr(*pSet);
+        pFormat->SetFormatAttr(*pSet);
 
     SwSectionNode *const pNewSectionNode =
-        GetNodes().InsertTextSection(aStt, *pFmt, aSectionData, &rTOX, &aEnd);
+        GetNodes().InsertTextSection(aStt, *pFormat, aSectionData, &rTOX, &aEnd);
     if (!pNewSectionNode)
     {
-        DelSectionFmt( pFmt );
+        DelSectionFormat( pFormat );
         return 0;
     }
 
@@ -438,9 +438,9 @@ const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase)
 {
     OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
     const SwTOXBaseSection& rTOXSect = static_cast<const SwTOXBaseSection&>(rTOXBase);
-    SwSectionFmt const * pFmt = rTOXSect.GetFmt();
-    OSL_ENSURE( pFmt, "invalid TOXBaseSection!" );
-    return pFmt->GetAttrSet();
+    SwSectionFormat const * pFormat = rTOXSect.GetFormat();
+    OSL_ENSURE( pFormat, "invalid TOXBaseSection!" );
+    return pFormat->GetAttrSet();
 }
 
 const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate )
@@ -451,7 +451,7 @@ const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate )
     case  TOX_CONTENT:          prBase = &mpDefTOXBases->pContBase; break;
     case  TOX_INDEX:            prBase = &mpDefTOXBases->pIdxBase;  break;
     case  TOX_USER:             prBase = &mpDefTOXBases->pUserBase; break;
-    case  TOX_TABLES:           prBase = &mpDefTOXBases->pTblBase;  break;
+    case  TOX_TABLES:           prBase = &mpDefTOXBases->pTableBase;  break;
     case  TOX_OBJECTS:          prBase = &mpDefTOXBases->pObjBase;  break;
     case  TOX_ILLUSTRATIONS:    prBase = &mpDefTOXBases->pIllBase;  break;
     case  TOX_AUTHORITIES:      prBase = &mpDefTOXBases->pAuthBase; break;
@@ -477,7 +477,7 @@ void    SwDoc::SetDefaultTOXBase(const SwTOXBase& rBase)
     case  TOX_CONTENT:          prBase = &mpDefTOXBases->pContBase; break;
     case  TOX_INDEX:            prBase = &mpDefTOXBases->pIdxBase;  break;
     case  TOX_USER:             prBase = &mpDefTOXBases->pUserBase; break;
-    case  TOX_TABLES:           prBase = &mpDefTOXBases->pTblBase;  break;
+    case  TOX_TABLES:           prBase = &mpDefTOXBases->pTableBase;  break;
     case  TOX_OBJECTS:          prBase = &mpDefTOXBases->pObjBase;  break;
     case  TOX_ILLUSTRATIONS:    prBase = &mpDefTOXBases->pIllBase;  break;
     case  TOX_AUTHORITIES:      prBase = &mpDefTOXBases->pAuthBase; break;
@@ -498,9 +498,9 @@ bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes )
     OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
 
     const SwTOXBaseSection& rTOXSect = static_cast<const SwTOXBaseSection&>(rTOXBase);
-    SwSectionFmt const * pFmt = rTOXSect.GetFmt();
+    SwSectionFormat const * pFormat = rTOXSect.GetFormat();
     /* Save the start node of the TOX' section. */
-    SwSectionNode const * pMyNode = pFmt ? pFmt->GetSectionNode() : NULL;
+    SwSectionNode const * pMyNode = pFormat ? pFormat->GetSectionNode() : NULL;
     if (pMyNode)
     {
         GetIDocumentUndoRedo().StartUndo( UNDO_CLEARTOXRANGE, NULL );
@@ -542,7 +542,7 @@ bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes )
                    TOX'. Append text node behind TOX' section. */
 
                 SwPosition aInsPos(*pMyNode->EndOfSectionNode());
-                getIDocumentContentOperations().AppendTxtNode(aInsPos);
+                getIDocumentContentOperations().AppendTextNode(aInsPos);
 
                 SwPaM aTmpPam1(aInsPos);
                 aSearchPam = aTmpPam1;
@@ -558,17 +558,17 @@ bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes )
         if( !bDelNodes )
         {
             SwSections aArr( 0 );
-            pFmt->GetChildSections( aArr, SORTSECT_NOT, false );
+            pFormat->GetChildSections( aArr, SORTSECT_NOT, false );
             for( const auto pSect : aArr )
             {
                 if( TOX_HEADER_SECTION == pSect->GetType() )
                 {
-                    DelSectionFmt( pSect->GetFmt(), bDelNodes );
+                    DelSectionFormat( pSect->GetFormat(), bDelNodes );
                 }
             }
         }
 
-        DelSectionFmt( const_cast<SwSectionFmt *>(pFmt), bDelNodes );
+        DelSectionFormat( const_cast<SwSectionFormat *>(pFormat), bDelNodes );
 
         GetIDocumentUndoRedo().EndUndo( UNDO_CLEARTOXRANGE, NULL );
         bRet = true;
@@ -610,7 +610,7 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
     {
         OUString newName = "MailMergeTOX"
             + OStringToOUString( DateTimeToOString( DateTime( DateTime::SYSTEM )), RTL_TEXTENCODING_ASCII_US )
-            + OUString::number( mpSectionFmtTbl->size() + 1 );
+            + OUString::number( mpSectionFormatTable->size() + 1 );
         if( !sChkStr.isEmpty())
             newName += sChkStr;
         return newName;
@@ -620,14 +620,14 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
     const OUString aName( rType.GetTypeName() );
     const sal_Int32 nNmLen = aName.getLength();
 
-    SwSectionFmts::size_type nNum = 0;
-    const SwSectionFmts::size_type nFlagSize = ( mpSectionFmtTbl->size() / 8 ) +2;
+    SwSectionFormats::size_type nNum = 0;
+    const SwSectionFormats::size_type nFlagSize = ( mpSectionFormatTable->size() / 8 ) +2;
     sal_uInt8* pSetFlags = new sal_uInt8[ nFlagSize ];
     memset( pSetFlags, 0, nFlagSize );
 
-    for( auto pSectionFmt : *mpSectionFmtTbl )
+    for( auto pSectionFormat : *mpSectionFormatTable )
     {
-        const SwSectionNode *pSectNd = pSectionFmt->GetSectionNode( false );
+        const SwSectionNode *pSectNd = pSectionFormat->GetSectionNode( false );
         if ( !pSectNd )
             continue;
 
@@ -639,7 +639,7 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
             {
                 // Calculate number and set the Flag
                 nNum = rNm.copy( nNmLen ).toInt32();
-                if( nNum-- && nNum < mpSectionFmtTbl->size() )
+                if( nNum-- && nNum < mpSectionFormatTable->size() )
                     pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
             }
             if ( bUseChkStr && sChkStr==rNm )
@@ -650,8 +650,8 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
     if( !bUseChkStr )
     {
         // All Numbers have been flagged accordingly, so get the right Number
-        nNum = mpSectionFmtTbl->size();
-        for( SwSectionFmts::size_type n = 0; n < nFlagSize; ++n )
+        nNum = mpSectionFormatTable->size();
+        for( SwSectionFormats::size_type n = 0; n < nFlagSize; ++n )
         {
             sal_uInt8 nTmp = pSetFlags[ n ];
             if( nTmp != 0xff )
@@ -689,7 +689,7 @@ bool SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const OUString& rName)
     return false;
 }
 
-static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl = 0 )
+static const SwTextNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl = 0 )
 {
     const SwNode* pNd = &rNd;
     if( pNd->GetNodes().GetEndOfExtras().GetIndex() > pNd->GetIndex() )
@@ -702,7 +702,7 @@ static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl =
         if( pFrm )
         {
             SwPosition aPos( *pNd );
-            pNd = GetBodyTxtNode( *pNd->GetDoc(), aPos, *pFrm );
+            pNd = GetBodyTextNode( *pNd->GetDoc(), aPos, *pFrm );
             OSL_ENSURE( pNd, "Where's the paragraph?" );
         }
     }
@@ -710,9 +710,9 @@ static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl =
 }
 
 // Table of contents class
-SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt)
+SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFormat & rFormat)
     : SwTOXBase( rBase )
-    , SwSection( TOX_CONTENT_SECTION, OUString(), rFmt )
+    , SwSection( TOX_CONTENT_SECTION, OUString(), rFormat )
 {
     SetProtect( rBase.IsProtected() );
     SetSectionName( GetTOXName() );
@@ -727,10 +727,10 @@ SwTOXBaseSection::~SwTOXBaseSection()
 bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, bool bAtStart ) const
 {
     bool bRet = false;
-    const SwSectionNode* pSectNd = GetFmt()->GetSectionNode();
+    const SwSectionNode* pSectNd = GetFormat()->GetSectionNode();
     if( pSectNd )
     {
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         sal_Int32 nC = 0;
         if( bAtStart )
         {
@@ -755,7 +755,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 {
     const SwSectionNode* pSectNd;
     if( !SwTOXBase::GetRegisteredIn()->HasWriterListeners() ||
-        !GetFmt() || 0 == (pSectNd = GetFmt()->GetSectionNode() ) ||
+        !GetFormat() || 0 == (pSectNd = GetFormat()->GetSectionNode() ) ||
         !pSectNd->GetNodes().IsDocNodes() ||
         IsHiddenFlag() )
     {
@@ -771,15 +771,15 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
     assert(pDoc); //Where is the document?
 
-    if (pAttr && GetFmt())
-        pDoc->ChgFmt(*GetFmt(), *pAttr);
+    if (pAttr && GetFormat())
+        pDoc->ChgFormat(*GetFormat(), *pAttr);
 
     // determine default page description, which will be used by the content nodes,
     // if no appropriate one is found.
     const SwPageDesc* pDefaultPageDesc;
     {
         pDefaultPageDesc =
-            pSectNd->GetSection().GetFmt()->GetPageDesc().GetPageDesc();
+            pSectNd->GetSection().GetFormat()->GetPageDesc().GetPageDesc();
         if ( !_bNewTOX && !pDefaultPageDesc )
         {
             // determine page description of table-of-content
@@ -799,7 +799,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         {
             // determine page description of content after table-of-content
             SwNodeIndex aIdx( *(pSectNd->EndOfSectionNode()) );
-            const SwCntntNode* pNdAfterTOX = pSectNd->GetNodes().GoNext( &aIdx );
+            const SwContentNode* pNdAfterTOX = pSectNd->GetNodes().GoNext( &aIdx );
             const SwAttrSet& aNdAttrSet = pNdAfterTOX->GetSwAttrSet();
             const SvxBreak eBreak = aNdAttrSet.GetBreak().GetBreak();
             if ( !( eBreak == SVX_BREAK_PAGE_BEFORE ||
@@ -842,7 +842,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
     // find the first layout node for this TOX, if it only find the content
     // in his own chapter
-    const SwTxtNode* pOwnChapterNode = IsFromChapter()
+    const SwTextNode* pOwnChapterNode = IsFromChapter()
             ? ::lcl_FindChapterNode( *pSectNd, 0 )
             : 0;
 
@@ -850,19 +850,19 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
     const_cast<SwSectionNode*>(pSectNd)->DelFrms();
 
     // remove old content an insert one empty textnode (to hold the layout!)
-    SwTxtNode* pFirstEmptyNd;
+    SwTextNode* pFirstEmptyNd;
     {
         pDoc->getIDocumentRedlineAccess().DeleteRedline( *pSectNd, true, USHRT_MAX );
 
         SwNodeIndex aSttIdx( *pSectNd, +1 );
         SwNodeIndex aEndIdx( *pSectNd->EndOfSectionNode() );
-        pFirstEmptyNd = pDoc->GetNodes().MakeTxtNode( aEndIdx,
-                        pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ) );
+        pFirstEmptyNd = pDoc->GetNodes().MakeTextNode( aEndIdx,
+                        pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ) );
 
         {
             // Task 70995 - save and restore PageDesc and Break Attributes
             SwNodeIndex aNxtIdx( aSttIdx );
-            const SwCntntNode* pCNd = aNxtIdx.GetNode().GetCntntNode();
+            const SwContentNode* pCNd = aNxtIdx.GetNode().GetContentNode();
             if( !pCNd )
                 pCNd = pDoc->GetNodes().GoNext( &aNxtIdx );
             if( pCNd->HasSwAttrSet() )
@@ -891,16 +891,16 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         // then insert the headline section
         SwNodeIndex aIdx( *pSectNd, +1 );
 
-        SwTxtNode* pHeadNd = pDoc->GetNodes().MakeTxtNode( aIdx,
-                                GetTxtFmtColl( FORM_TITLE ) );
+        SwTextNode* pHeadNd = pDoc->GetNodes().MakeTextNode( aIdx,
+                                GetTextFormatColl( FORM_TITLE ) );
         pHeadNd->InsertText( GetTitle(), SwIndex( pHeadNd ) );
 
         SwSectionData headerData( TOX_HEADER_SECTION, GetTOXName()+"_Head" );
 
         SwNodeIndex aStt( *pHeadNd ); --aIdx;
-        SwSectionFmt* pSectFmt = pDoc->MakeSectionFmt( 0 );
+        SwSectionFormat* pSectFormat = pDoc->MakeSectionFormat( 0 );
         pDoc->GetNodes().InsertTextSection(
-                aStt, *pSectFmt, headerData, 0, &aIdx, true, false);
+                aStt, *pSectFormat, headerData, 0, &aIdx, true, false);
     }
 
     // This would be a good time to update the Numbering
@@ -917,7 +917,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
     if( GetCreateType() & nsSwTOXElement::TOX_OLE ||
             TOX_OBJECTS == SwTOXBase::GetType())
-        UpdateCntnt( nsSwTOXElement::TOX_OLE, pOwnChapterNode );
+        UpdateContent( nsSwTOXElement::TOX_OLE, pOwnChapterNode );
 
     if( GetCreateType() & nsSwTOXElement::TOX_TABLE ||
             (TOX_TABLES == SwTOXBase::GetType() && IsFromObjectNames()) )
@@ -925,7 +925,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
     if( GetCreateType() & nsSwTOXElement::TOX_GRAPHIC ||
         (TOX_ILLUSTRATIONS == SwTOXBase::GetType() && IsFromObjectNames()))
-        UpdateCntnt( nsSwTOXElement::TOX_GRAPHIC, pOwnChapterNode );
+        UpdateContent( nsSwTOXElement::TOX_GRAPHIC, pOwnChapterNode );
 
     if( !GetSequenceName().isEmpty() && !IsFromObjectNames() &&
         (TOX_TABLES == SwTOXBase::GetType() ||
@@ -933,7 +933,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         UpdateSequence( pOwnChapterNode );
 
     if( GetCreateType() & nsSwTOXElement::TOX_FRAME )
-        UpdateCntnt( nsSwTOXElement::TOX_FRAME, pOwnChapterNode );
+        UpdateContent( nsSwTOXElement::TOX_FRAME, pOwnChapterNode );
 
     if(TOX_AUTHORITIES == SwTOXBase::GetType())
         UpdateAuthorities( aIntl );
@@ -944,7 +944,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         InsertAlphaDelimitter( aIntl );
 
     // Sort the List of all TOC Marks and TOC Sections
-    std::vector<SwTxtFmtColl*> aCollArr( GetTOXForm().GetFormMax(), 0 );
+    std::vector<SwTextFormatColl*> aCollArr( GetTOXForm().GetFormMax(), 0 );
     SwNodeIndex aInsPos( *pFirstEmptyNd, 1 );
     for( SwTOXSortTabBases::size_type nCnt = 0; nCnt < aSortArr.size(); ++nCnt )
     {
@@ -952,15 +952,15 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
         // Put the Text into the TOC
         sal_uInt16 nLvl = aSortArr[ nCnt ]->GetLevel();
-        SwTxtFmtColl* pColl = aCollArr[ nLvl ];
+        SwTextFormatColl* pColl = aCollArr[ nLvl ];
         if( !pColl )
         {
-            pColl = GetTxtFmtColl( nLvl );
+            pColl = GetTextFormatColl( nLvl );
             aCollArr[ nLvl ] = pColl;
         }
 
         // Generate: Set dynamic TabStops
-        SwTxtNode* pTOXNd = pDoc->GetNodes().MakeTxtNode( aInsPos , pColl );
+        SwTextNode* pTOXNd = pDoc->GetNodes().MakeTextNode( aInsPos , pColl );
         aSortArr[ nCnt ]->pTOXNd = pTOXNd;
 
         // Generate: Evaluate Form and insert the place holder for the
@@ -971,13 +971,13 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
                 GetTOXForm().IsCommaSeparated() &&
                 aSortArr[nCnt]->GetType() == TOX_SORT_INDEX)
         {
-            const SwTOXMark& rMark = aSortArr[nCnt]->pTxtMark->GetTOXMark();
+            const SwTOXMark& rMark = aSortArr[nCnt]->pTextMark->GetTOXMark();
             const OUString sPrimKey = rMark.GetPrimaryKey();
             const OUString sSecKey = rMark.GetSecondaryKey();
             const SwTOXMark* pNextMark = 0;
             while(aSortArr.size() > (nCnt + nRange)&&
                     aSortArr[nCnt + nRange]->GetType() == TOX_SORT_INDEX &&
-                    0 != (pNextMark = &(aSortArr[nCnt + nRange]->pTxtMark->GetTOXMark())) &&
+                    0 != (pNextMark = &(aSortArr[nCnt + nRange]->pTextMark->GetTOXMark())) &&
                     pNextMark->GetPrimaryKey() == sPrimKey &&
                     pNextMark->GetSecondaryKey() == sSecKey)
                 nRange++;
@@ -993,7 +993,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
                                 sw::DefaultToxTabStopTokenHandler::TABSTOPS_RELATIVE_TO_INDENT :
                                 sw::DefaultToxTabStopTokenHandler::TABSTOPS_RELATIVE_TO_PAGE);
         sw::ToxTextGenerator ttgn(GetTOXForm(), tabStopTokenHandler);
-        ttgn.GenerateText(GetFmt()->GetDoc(), aSortArr, nCnt, nRange);
+        ttgn.GenerateText(GetFormat()->GetDoc(), aSortArr, nCnt, nRange);
         nCnt += nRange - 1;
     }
 
@@ -1014,7 +1014,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
                 aEndIdx = *pSectNd;
             else
                 aEndIdx = *pFirstEmptyNd;
-            SwCntntNode* pCNd = pDoc->GetNodes().GoNext( &aEndIdx );
+            SwContentNode* pCNd = pDoc->GetNodes().GoNext( &aEndIdx );
             if( pCNd ) // Robust against defect documents, e.g. i60336
                 pCNd->SetAttr( *pFirstEmptyNd->GetpSwAttrSet() );
         }
@@ -1038,7 +1038,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
 void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     OUString sLastDeli;
     SwTOXSortTabBases::size_type i = 0;
     while( i < aSortArr.size() )
@@ -1051,7 +1051,7 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
         if( nLevel == FORM_ALPHA_DELIMITTER )
             continue;
 
-        const OUString sDeli = rIntl.GetIndexKey( aSortArr[i]->GetTxt(),
+        const OUString sDeli = rIntl.GetIndexKey( aSortArr[i]->GetText(),
                                    aSortArr[i]->GetLocale() );
 
         // Do we already have a Delimitter?
@@ -1077,87 +1077,87 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
 }
 
 /// Evaluate Template
-SwTxtFmtColl* SwTOXBaseSection::GetTxtFmtColl( sal_uInt16 nLevel )
+SwTextFormatColl* SwTOXBaseSection::GetTextFormatColl( sal_uInt16 nLevel )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     const OUString& rName = GetTOXForm().GetTemplate( nLevel );
-    SwTxtFmtColl* pColl = !rName.isEmpty() ? pDoc->FindTxtFmtCollByName(rName) :0;
+    SwTextFormatColl* pColl = !rName.isEmpty() ? pDoc->FindTextFormatCollByName(rName) :0;
     if( !pColl )
     {
-        sal_uInt16 nPoolFmt = 0;
+        sal_uInt16 nPoolFormat = 0;
         const TOXTypes eMyType = SwTOXBase::GetType();
         switch( eMyType )
         {
-        case TOX_INDEX:         nPoolFmt = RES_POOLCOLL_TOX_IDXH;       break;
+        case TOX_INDEX:         nPoolFormat = RES_POOLCOLL_TOX_IDXH;       break;
         case TOX_USER:
             if( nLevel < 6 )
-                nPoolFmt = RES_POOLCOLL_TOX_USERH;
+                nPoolFormat = RES_POOLCOLL_TOX_USERH;
             else
-                nPoolFmt = RES_POOLCOLL_TOX_USER6 - 6;
+                nPoolFormat = RES_POOLCOLL_TOX_USER6 - 6;
             break;
-        case TOX_ILLUSTRATIONS: nPoolFmt = RES_POOLCOLL_TOX_ILLUSH;     break;
-        case TOX_OBJECTS:       nPoolFmt = RES_POOLCOLL_TOX_OBJECTH;    break;
-        case TOX_TABLES:        nPoolFmt = RES_POOLCOLL_TOX_TABLESH;    break;
+        case TOX_ILLUSTRATIONS: nPoolFormat = RES_POOLCOLL_TOX_ILLUSH;     break;
+        case TOX_OBJECTS:       nPoolFormat = RES_POOLCOLL_TOX_OBJECTH;    break;
+        case TOX_TABLES:        nPoolFormat = RES_POOLCOLL_TOX_TABLESH;    break;
         case TOX_AUTHORITIES:
         case TOX_BIBLIOGRAPHY:
-            nPoolFmt = RES_POOLCOLL_TOX_AUTHORITIESH; break;
+            nPoolFormat = RES_POOLCOLL_TOX_AUTHORITIESH; break;
         case  TOX_CITATION: /** TODO */break;
         case TOX_CONTENT:
             // There's a jump in the ContentArea!
             if( nLevel < 6 )
-                nPoolFmt = RES_POOLCOLL_TOX_CNTNTH;
+                nPoolFormat = RES_POOLCOLL_TOX_CNTNTH;
             else
-                nPoolFmt = RES_POOLCOLL_TOX_CNTNT6 - 6;
+                nPoolFormat = RES_POOLCOLL_TOX_CNTNT6 - 6;
             break;
         }
 
         if(eMyType == TOX_AUTHORITIES && nLevel)
-            nPoolFmt = nPoolFmt + 1;
+            nPoolFormat = nPoolFormat + 1;
         else if(eMyType == TOX_INDEX && nLevel)
         {
             // pool: Level 1,2,3, Delimiter
             // SwForm: Delimiter, Level 1,2,3
-            nPoolFmt += 1 == nLevel ? nLevel + 3 : nLevel - 1;
+            nPoolFormat += 1 == nLevel ? nLevel + 3 : nLevel - 1;
         }
         else
-            nPoolFmt = nPoolFmt + nLevel;
-        pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nPoolFmt );
+            nPoolFormat = nPoolFormat + nLevel;
+        pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nPoolFormat );
     }
     return pColl;
 }
 
 /// Create from Marks
 void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
-                                    const SwTxtNode* pOwnChapterNode )
+                                    const SwTextNode* pOwnChapterNode )
 {
     const SwTOXType* pType = static_cast<SwTOXType*>( SwTOXBase::GetRegisteredIn() );
     if( !pType->HasWriterListeners() )
         return;
 
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     TOXTypes eTOXTyp = GetTOXType()->GetType();
     SwIterator<SwTOXMark,SwTOXType> aIter( *pType );
 
-    SwTxtTOXMark* pTxtMark;
+    SwTextTOXMark* pTextMark;
     SwTOXMark* pMark;
     for( pMark = aIter.First(); pMark; pMark = aIter.Next() )
     {
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
         if( pMark->GetTOXType()->GetType() == eTOXTyp &&
-            0 != ( pTxtMark = pMark->GetTxtTOXMark() ) )
+            0 != ( pTextMark = pMark->GetTextTOXMark() ) )
         {
-            const SwTxtNode* pTOXSrc = pTxtMark->GetpTxtNd();
+            const SwTextNode* pTOXSrc = pTextMark->GetpTextNd();
             // Only insert TOXMarks from the Doc, not from the
             // UNDO.
 
             // If selected use marks from the same chapter only
             if( pTOXSrc->GetNodes().IsDocNodes() &&
-                pTOXSrc->GetTxt().getLength() && pTOXSrc->HasWriterListeners() &&
+                pTOXSrc->GetText().getLength() && pTOXSrc->HasWriterListeners() &&
                 pTOXSrc->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
                (!IsFromChapter() || ::lcl_FindChapterNode( *pTOXSrc, 0 ) == pOwnChapterNode ) &&
                !pTOXSrc->HasHiddenParaField() &&
-               !SwScriptInfo::IsInHiddenRange( *pTOXSrc, pTxtMark->GetStart() ) )
+               !SwScriptInfo::IsInHiddenRange( *pTOXSrc, pTextMark->GetStart() ) )
             {
                 SwTOXSortTabBase* pBase = 0;
                 if(TOX_INDEX == eTOXTyp)
@@ -1167,21 +1167,21 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
                     if ( g_pBreakIt->GetBreakIter().is() )
                     {
                         aLocale = g_pBreakIt->GetLocale(
-                                        pTOXSrc->GetLang( pTxtMark->GetStart() ) );
+                                        pTOXSrc->GetLang( pTextMark->GetStart() ) );
                     }
 
-                    pBase = new SwTOXIndex( *pTOXSrc, pTxtMark,
+                    pBase = new SwTOXIndex( *pTOXSrc, pTextMark,
                                             GetOptions(), FORM_ENTRY, rIntl, aLocale );
                     InsertSorted(pBase);
                     if(GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY &&
-                        !pTxtMark->GetTOXMark().GetPrimaryKey().isEmpty())
+                        !pTextMark->GetTOXMark().GetPrimaryKey().isEmpty())
                     {
-                        pBase = new SwTOXIndex( *pTOXSrc, pTxtMark,
+                        pBase = new SwTOXIndex( *pTOXSrc, pTextMark,
                                                 GetOptions(), FORM_PRIMARY_KEY, rIntl, aLocale );
                         InsertSorted(pBase);
-                        if (!pTxtMark->GetTOXMark().GetSecondaryKey().isEmpty())
+                        if (!pTextMark->GetTOXMark().GetSecondaryKey().isEmpty())
                         {
-                            pBase = new SwTOXIndex( *pTOXSrc, pTxtMark,
+                            pBase = new SwTOXIndex( *pTOXSrc, pTextMark,
                                                     GetOptions(), FORM_SECONDARY_KEY, rIntl, aLocale );
                             InsertSorted(pBase);
                         }
@@ -1191,7 +1191,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
                     pMark->GetLevel() <= GetLevel())
                 {   // table of content mark
                     // also used for user marks
-                    pBase = new SwTOXContent( *pTOXSrc, pTxtMark, rIntl );
+                    pBase = new SwTOXContent( *pTOXSrc, pTextMark, rIntl );
                     InsertSorted(pBase);
                 }
             }
@@ -1200,34 +1200,34 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
 }
 
 /// Generate table of contents from outline
-void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode )
+void SwTOXBaseSection::UpdateOutline( const SwTextNode* pOwnChapterNode )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     SwNodes& rNds = pDoc->GetNodes();
 
     const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
     for( auto pOutlineNode : rOutlNds )
     {
         ::SetProgressState( 0, pDoc->GetDocShell() );
-        SwTxtNode* pTxtNd = pOutlineNode->GetTxtNode();
-        if( pTxtNd && pTxtNd->Len() && pTxtNd->HasWriterListeners() &&
-            sal_uInt16( pTxtNd->GetAttrOutlineLevel()) <= GetLevel() &&
-            pTxtNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
-           !pTxtNd->HasHiddenParaField() &&
-           !pTxtNd->HasHiddenCharAttribute( true ) &&
+        SwTextNode* pTextNd = pOutlineNode->GetTextNode();
+        if( pTextNd && pTextNd->Len() && pTextNd->HasWriterListeners() &&
+            sal_uInt16( pTextNd->GetAttrOutlineLevel()) <= GetLevel() &&
+            pTextNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
+           !pTextNd->HasHiddenParaField() &&
+           !pTextNd->HasHiddenCharAttribute( true ) &&
             ( !IsFromChapter() ||
-               ::lcl_FindChapterNode( *pTxtNd, 0 ) == pOwnChapterNode ))
+               ::lcl_FindChapterNode( *pTextNd, 0 ) == pOwnChapterNode ))
         {
-            SwTOXPara * pNew = new SwTOXPara( *pTxtNd, nsSwTOXElement::TOX_OUTLINELEVEL );
+            SwTOXPara * pNew = new SwTOXPara( *pTextNd, nsSwTOXElement::TOX_OUTLINELEVEL );
             InsertSorted( pNew );
         }
     }
 }
 
 /// Generate table of contents from template areas
-void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
+void SwTOXBaseSection::UpdateTemplate( const SwTextNode* pOwnChapterNode )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
     {
         const OUString sTmpStyleNames = GetStyleNames(i);
@@ -1237,7 +1237,7 @@ void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
         sal_Int32 nIndex = 0;
         while (nIndex >= 0)
         {
-            SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName(
+            SwTextFormatColl* pColl = pDoc->FindTextFormatCollByName(
                                     sTmpStyleNames.getToken( 0, TOX_STYLE_DELIMITER, nIndex ));
             //TODO: no outline Collections in content indexes if OutlineLevels are already included
             if( !pColl ||
@@ -1246,18 +1246,18 @@ void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
                     pColl->IsAssignedToListLevelOfOutlineStyle()) )
                 continue;
 
-            SwIterator<SwTxtNode,SwFmtColl> aIter( *pColl );
-            for( SwTxtNode* pTxtNd = aIter.First(); pTxtNd; pTxtNd = aIter.Next() )
+            SwIterator<SwTextNode,SwFormatColl> aIter( *pColl );
+            for( SwTextNode* pTextNd = aIter.First(); pTextNd; pTextNd = aIter.Next() )
             {
                 ::SetProgressState( 0, pDoc->GetDocShell() );
 
-                if (pTxtNd->GetTxt().getLength() &&
-                    pTxtNd->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
-                    pTxtNd->GetNodes().IsDocNodes() &&
+                if (pTextNd->GetText().getLength() &&
+                    pTextNd->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
+                    pTextNd->GetNodes().IsDocNodes() &&
                     ( !IsFromChapter() || pOwnChapterNode ==
-                        ::lcl_FindChapterNode( *pTxtNd, 0 ) ) )
+                        ::lcl_FindChapterNode( *pTextNd, 0 ) ) )
                 {
-                    SwTOXPara * pNew = new SwTOXPara( *pTxtNd, nsSwTOXElement::TOX_TEMPLATE, i + 1 );
+                    SwTOXPara * pNew = new SwTOXPara( *pTextNd, nsSwTOXElement::TOX_TEMPLATE, i + 1 );
                     InsertSorted(pNew);
                 }
             }
@@ -1266,42 +1266,42 @@ void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
 }
 
 /// Generate content from sequence fields
-void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
+void SwTOXBaseSection::UpdateSequence( const SwTextNode* pOwnChapterNode )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
-    SwFieldType* pSeqFld = pDoc->getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, GetSequenceName(), false);
-    if(!pSeqFld)
+    SwDoc* pDoc = GetFormat()->GetDoc();
+    SwFieldType* pSeqField = pDoc->getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, GetSequenceName(), false);
+    if(!pSeqField)
         return;
 
-    SwIterator<SwFmtFld,SwFieldType> aIter( *pSeqFld );
-    for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+    SwIterator<SwFormatField,SwFieldType> aIter( *pSeqField );
+    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
     {
-        const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-        if(!pTxtFld)
+        const SwTextField* pTextField = pFormatField->GetTextField();
+        if(!pTextField)
             continue;
-        const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
+        const SwTextNode& rTextNode = pTextField->GetTextNode();
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
-        if (rTxtNode.GetTxt().getLength() &&
-            rTxtNode.getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
-            rTxtNode.GetNodes().IsDocNodes() &&
+        if (rTextNode.GetText().getLength() &&
+            rTextNode.getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
+            rTextNode.GetNodes().IsDocNodes() &&
             ( !IsFromChapter() ||
-                ::lcl_FindChapterNode( rTxtNode, 0 ) == pOwnChapterNode ) )
+                ::lcl_FindChapterNode( rTextNode, 0 ) == pOwnChapterNode ) )
         {
-            const SwSetExpField& rSeqField = dynamic_cast<const SwSetExpField&>(*(pFmtFld->GetField()));
+            const SwSetExpField& rSeqField = dynamic_cast<const SwSetExpField&>(*(pFormatField->GetField()));
             const OUString sName = GetSequenceName()
                 + OUStringLiteral1<cSequenceMarkSeparator>()
                 + OUString::number( rSeqField.GetSeqNumber() );
-            SwTOXPara * pNew = new SwTOXPara( rTxtNode, nsSwTOXElement::TOX_SEQUENCE, 1, sName );
+            SwTOXPara * pNew = new SwTOXPara( rTextNode, nsSwTOXElement::TOX_SEQUENCE, 1, sName );
             // set indexes if the number or the reference text are to be displayed
             if( GetCaptionDisplay() == CAPTION_TEXT )
             {
                 pNew->SetStartIndex(
-                    SwGetExpField::GetReferenceTextPos( *pFmtFld, *pDoc ));
+                    SwGetExpField::GetReferenceTextPos( *pFormatField, *pDoc ));
             }
             else if(GetCaptionDisplay() == CAPTION_NUMBER)
             {
-                pNew->SetEndIndex(pTxtFld->GetStart() + 1);
+                pNew->SetEndIndex(pTextField->GetStart() + 1);
             }
             InsertSorted(pNew);
         }
@@ -1310,34 +1310,34 @@ void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
 
 void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
-    SwFieldType* pAuthFld = pDoc->getIDocumentFieldsAccess().GetFldType(RES_AUTHORITY, OUString(), false);
-    if(!pAuthFld)
+    SwDoc* pDoc = GetFormat()->GetDoc();
+    SwFieldType* pAuthField = pDoc->getIDocumentFieldsAccess().GetFieldType(RES_AUTHORITY, OUString(), false);
+    if(!pAuthField)
         return;
 
-    SwIterator<SwFmtFld,SwFieldType> aIter( *pAuthFld );
-    for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+    SwIterator<SwFormatField,SwFieldType> aIter( *pAuthField );
+    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
     {
-        const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
+        const SwTextField* pTextField = pFormatField->GetTextField();
         // undo
-        if(!pTxtFld)
+        if(!pTextField)
             continue;
-        const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
+        const SwTextNode& rTextNode = pTextField->GetTextNode();
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
-        if (rTxtNode.GetTxt().getLength() &&
-            rTxtNode.getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
-            rTxtNode.GetNodes().IsDocNodes() )
+        if (rTextNode.GetText().getLength() &&
+            rTextNode.getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout()) &&
+            rTextNode.GetNodes().IsDocNodes() )
         {
             //#106485# the body node has to be used!
-            SwCntntFrm *pFrm = rTxtNode.getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
-            SwPosition aFldPos(rTxtNode);
-            const SwTxtNode* pTxtNode = 0;
+            SwContentFrm *pFrm = rTextNode.getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+            SwPosition aFieldPos(rTextNode);
+            const SwTextNode* pTextNode = 0;
             if(pFrm && !pFrm->IsInDocBody())
-                pTxtNode = GetBodyTxtNode( *pDoc, aFldPos, *pFrm );
-            if(!pTxtNode)
-                pTxtNode = &rTxtNode;
-            SwTOXAuthority* pNew = new SwTOXAuthority( *pTxtNode, *pFmtFld, rIntl );
+                pTextNode = GetBodyTextNode( *pDoc, aFieldPos, *pFrm );
+            if(!pTextNode)
+                pTextNode = &rTextNode;
+            SwTOXAuthority* pNew = new SwTOXAuthority( *pTextNode, *pFormatField, rIntl );
 
             InsertSorted(pNew);
         }
@@ -1393,10 +1393,10 @@ static long lcl_IsSOObject( const SvGlobalName& rFactoryNm )
     return nRet;
 }
 
-void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
-                                    const SwTxtNode* pOwnChapterNode )
+void SwTOXBaseSection::UpdateContent( SwTOXElement eMyType,
+                                    const SwTextNode* pOwnChapterNode )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     SwNodes& rNds = pDoc->GetNodes();
     // on the 1st Node of the 1st Section
     sal_uLong nIdx = rNds.GetEndOfAutotext().StartOfSectionIndex() + 2,
@@ -1407,13 +1407,13 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
         SwNode* pNd = rNds[ nIdx ];
-        SwCntntNode* pCNd = 0;
+        SwContentNode* pCNd = 0;
         switch( eMyType )
         {
         case nsSwTOXElement::TOX_FRAME:
-            if( !pNd->IsNoTxtNode() )
+            if( !pNd->IsNoTextNode() )
             {
-                pCNd = pNd->GetCntntNode();
+                pCNd = pNd->GetContentNode();
                 if( !pCNd )
                 {
                     SwNodeIndex aTmp( *pNd );
@@ -1423,7 +1423,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
             break;
         case nsSwTOXElement::TOX_GRAPHIC:
             if( pNd->IsGrfNode() )
-                pCNd = static_cast<SwCntntNode*>(pNd);
+                pCNd = static_cast<SwContentNode*>(pNd);
             break;
         case nsSwTOXElement::TOX_OLE:
             if( pNd->IsOLENode() )
@@ -1450,7 +1450,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
                 }
 
                 if(bInclude)
-                    pCNd = static_cast<SwCntntNode*>(pNd);
+                    pCNd = static_cast<SwContentNode*>(pNd);
             }
             break;
         default: break;
@@ -1467,13 +1467,13 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
                     TOX_ILLUSTRATIONS != SwTOXBase::GetType() &&
                     TOX_OBJECTS != SwTOXBase::GetType() )
             {
-                const SwTxtNode* pOutlNd = ::lcl_FindChapterNode( *pCNd,
+                const SwTextNode* pOutlNd = ::lcl_FindChapterNode( *pCNd,
                                                         MAXLEVEL - 1 );
                 if( pOutlNd )
                 {
-                    if( pOutlNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
+                    if( pOutlNd->GetTextColl()->IsAssignedToListLevelOfOutlineStyle())
                     {
-                        nSetLevel = pOutlNd->GetTxtColl()->GetAttrOutlineLevel();
+                        nSetLevel = pOutlNd->GetTextColl()->GetAttrOutlineLevel();
                     }
                 }
             }
@@ -1494,27 +1494,27 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
 }
 
 /// Collect table entries
-void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
+void SwTOXBaseSection::UpdateTable( const SwTextNode* pOwnChapterNode )
 {
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     SwNodes& rNds = pDoc->GetNodes();
-    const SwFrmFmts& rArr = *pDoc->GetTblFrmFmts();
+    const SwFrameFormats& rArr = *pDoc->GetTableFrameFormats();
 
-    for( auto pFrmFmt : rArr )
+    for( auto pFrameFormat : rArr )
     {
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
-        SwTable* pTmpTbl = SwTable::FindTable( pFrmFmt );
+        SwTable* pTmpTable = SwTable::FindTable( pFrameFormat );
         SwTableBox* pFBox;
-        if( pTmpTbl && 0 != (pFBox = pTmpTbl->GetTabSortBoxes()[0] ) &&
+        if( pTmpTable && 0 != (pFBox = pTmpTable->GetTabSortBoxes()[0] ) &&
             pFBox->GetSttNd() && pFBox->GetSttNd()->GetNodes().IsDocNodes() )
         {
-            const SwTableNode* pTblNd = pFBox->GetSttNd()->FindTableNode();
-            SwNodeIndex aCntntIdx( *pTblNd, 1 );
+            const SwTableNode* pTableNd = pFBox->GetSttNd()->FindTableNode();
+            SwNodeIndex aContentIdx( *pTableNd, 1 );
 
-            SwCntntNode* pCNd;
-            while( 0 != ( pCNd = rNds.GoNext( &aCntntIdx ) ) &&
-                aCntntIdx.GetIndex() < pTblNd->EndOfSectionIndex() )
+            SwContentNode* pCNd;
+            while( 0 != ( pCNd = rNds.GoNext( &aContentIdx ) ) &&
+                aContentIdx.GetIndex() < pTableNd->EndOfSectionIndex() )
             {
                 if( pCNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) && (!IsFromChapter() ||
                     ::lcl_FindChapterNode( *pCNd, 0 ) == pOwnChapterNode ))
@@ -1522,13 +1522,13 @@ void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
                     SwTOXTable * pNew = new SwTOXTable( *pCNd );
                     if( IsLevelFromChapter() && TOX_TABLES != SwTOXBase::GetType())
                     {
-                        const SwTxtNode* pOutlNd =
+                        const SwTextNode* pOutlNd =
                             ::lcl_FindChapterNode( *pCNd, MAXLEVEL - 1 );
                         if( pOutlNd )
                         {
-                            if( pOutlNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
+                            if( pOutlNd->GetTextColl()->IsAssignedToListLevelOfOutlineStyle())
                             {
-                                const int nTmp = pOutlNd->GetTxtColl()->GetAttrOutlineLevel();
+                                const int nTmp = pOutlNd->GetTextColl()->GetAttrOutlineLevel();
                                 pNew->SetLevel(static_cast<sal_uInt16>(nTmp));
                             }
                         }
@@ -1550,7 +1550,7 @@ void SwTOXBaseSection::UpdatePageNum()
     // Insert the current PageNumber into the TOC
     SwPageFrm*  pAktPage    = 0;
     sal_uInt16      nPage       = 0;
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
 
     SwTOXInternational aIntl( GetLanguage(),
                               TOX_INDEX == GetTOXType()->GetType() ?
@@ -1569,13 +1569,13 @@ void SwTOXBaseSection::UpdatePageNum()
         if(GetTOXForm().IsCommaSeparated() &&
                 aSortArr[nCnt]->GetType() == TOX_SORT_INDEX)
         {
-            const SwTOXMark& rMark = aSortArr[nCnt]->pTxtMark->GetTOXMark();
+            const SwTOXMark& rMark = aSortArr[nCnt]->pTextMark->GetTOXMark();
             const OUString sPrimKey = rMark.GetPrimaryKey();
             const OUString sSecKey = rMark.GetSecondaryKey();
             const SwTOXMark* pNextMark = 0;
             while(aSortArr.size() > (nCnt + nRange)&&
                     aSortArr[nCnt + nRange]->GetType() == TOX_SORT_INDEX &&
-                    0 != (pNextMark = &(aSortArr[nCnt + nRange]->pTxtMark->GetTOXMark())) &&
+                    0 != (pNextMark = &(aSortArr[nCnt + nRange]->pTextMark->GetTOXMark())) &&
                     pNextMark->GetPrimaryKey() == sPrimKey &&
                     pNextMark->GetSecondaryKey() == sSecKey)
                 nRange++;
@@ -1594,15 +1594,15 @@ void SwTOXBaseSection::UpdatePageNum()
                 SwTOXSource& rTOXSource = pSortBase->aTOXSources[j];
                 if( rTOXSource.pNd )
                 {
-                    SwCntntFrm* pFrm = rTOXSource.pNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+                    SwContentFrm* pFrm = rTOXSource.pNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
                     OSL_ENSURE( pFrm || pDoc->IsUpdateTOX(), "TOX, no Frame found");
                     if( !pFrm )
                         continue;
-                    if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->HasFollow() )
+                    if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->HasFollow() )
                     {
                         // find the right one
-                        SwTxtFrm* pNext;
-                        while( 0 != ( pNext = static_cast<SwTxtFrm*>(pFrm->GetFollow()) )
+                        SwTextFrm* pNext;
+                        while( 0 != ( pNext = static_cast<SwTextFrm*>(pFrm->GetFollow()) )
                                 && rTOXSource.nPos >= pNext->GetOfst() )
                             pFrm = pNext;
                     }
@@ -1638,10 +1638,10 @@ void SwTOXBaseSection::UpdatePageNum()
             const SwTOXSortTabBase* pBase = aSortArr[ nCnt ];
             if(pBase->pTOXNd)
             {
-                const SwTxtNode* pTxtNd = pBase->pTOXNd->GetTxtNode();
-                OSL_ENSURE( pTxtNd, "no TextNode, wrong TOC" );
+                const SwTextNode* pTextNd = pBase->pTOXNd->GetTextNode();
+                OSL_ENSURE( pTextNd, "no TextNode, wrong TOC" );
 
-                _UpdatePageNum( const_cast<SwTxtNode*>(pTxtNd), aNums, aDescs, pMainNums,
+                _UpdatePageNum( const_cast<SwTextNode*>(pTextNd), aNums, aDescs, pMainNums,
                                 aIntl );
             }
             DELETEZ(pMainNums);
@@ -1667,7 +1667,7 @@ static bool lcl_HasMainEntry( const std::vector<sal_uInt16>* pMainEntryNums, sal
     return false;
 }
 
-void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
+void SwTOXBaseSection::_UpdatePageNum( SwTextNode* pNd,
                                     const std::vector<sal_uInt16>& rNums,
                                     const std::vector<SwPageDesc*>& rDescs,
                                     const std::vector<sal_uInt16>* pMainEntryNums,
@@ -1678,10 +1678,10 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
 
     OUString sSrchStr = OUStringBuffer().append(C_NUM_REPL).
         append(S_PAGE_DELI).append(C_NUM_REPL).makeStringAndClear();
-    sal_Int32 nStartPos = pNd->GetTxt().indexOf(sSrchStr);
+    sal_Int32 nStartPos = pNd->GetText().indexOf(sSrchStr);
     sSrchStr = OUStringBuffer().append(C_NUM_REPL).
         append(C_END_PAGE_NUM).makeStringAndClear();
-    sal_Int32 nEndPos = pNd->GetTxt().indexOf(sSrchStr);
+    sal_Int32 nEndPos = pNd->GetText().indexOf(sSrchStr);
 
     if (-1 == nEndPos || rNums.empty())
         return;
@@ -1701,18 +1701,18 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
 
     // Delete place holder
     SwIndex aPos(pNd, nStartPos);
-    SwCharFmt* pPageNoCharFmt = 0;
+    SwCharFormat* pPageNoCharFormat = 0;
     SwpHints* pHints = pNd->GetpSwpHints();
     if(pHints)
         for(size_t nHintIdx = 0; nHintIdx < pHints->GetStartCount(); ++nHintIdx)
         {
-            SwTxtAttr* pAttr = pHints->GetStart(nHintIdx);
+            SwTextAttr* pAttr = pHints->GetStart(nHintIdx);
             const sal_Int32 nTmpEnd = pAttr->End() ? *pAttr->End() : 0;
             if( nStartPos >= pAttr->GetStart() &&
                 (nStartPos + 2) <= nTmpEnd &&
                 pAttr->Which() == RES_TXTATR_CHARFMT)
             {
-                pPageNoCharFmt = pAttr->GetCharFmt().GetCharFmt();
+                pPageNoCharFormat = pAttr->GetCharFormat().GetCharFormat();
                 break;
             }
         }
@@ -1791,10 +1791,10 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
         }
     }
     pNd->InsertText( aNumStr, aPos, SwInsertFlags::EMPTYEXPAND | SwInsertFlags::FORCEHINTEXPAND );
-    if(pPageNoCharFmt)
+    if(pPageNoCharFormat)
     {
-        SwFmtCharFmt aCharFmt( pPageNoCharFmt );
-        pNd->InsertItem(aCharFmt, nStartPos, nStartPos + aNumStr.getLength(), SetAttrMode::DONTEXPAND);
+        SwFormatCharFormat aCharFormat( pPageNoCharFormat );
+        pNd->InsertItem(aCharFormat, nStartPos, nStartPos + aNumStr.getLength(), SetAttrMode::DONTEXPAND);
     }
 
     // The main entries should get their character style
@@ -1807,22 +1807,22 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
         // search by name
         SwDoc* pDoc = pNd->GetDoc();
         sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( GetMainEntryCharStyle(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
-        SwCharFmt* pCharFmt = 0;
+        SwCharFormat* pCharFormat = 0;
         if(USHRT_MAX != nPoolId)
-            pCharFmt = pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(nPoolId);
+            pCharFormat = pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(nPoolId);
         else
-            pCharFmt = pDoc->FindCharFmtByName( GetMainEntryCharStyle() );
-        if(!pCharFmt)
-            pCharFmt = pDoc->MakeCharFmt(GetMainEntryCharStyle(), 0);
+            pCharFormat = pDoc->FindCharFormatByName( GetMainEntryCharStyle() );
+        if(!pCharFormat)
+            pCharFormat = pDoc->MakeCharFormat(GetMainEntryCharStyle(), 0);
 
         // find the page numbers in aNumStr and set the character style
-        sal_Int32 nOffset = pNd->GetTxt().getLength() - aNumStr.getLength();
-        SwFmtCharFmt aCharFmt(pCharFmt);
+        sal_Int32 nOffset = pNd->GetText().getLength() - aNumStr.getLength();
+        SwFormatCharFormat aCharFormat(pCharFormat);
         for (sal_uInt16 j = 0; j < xCharStyleIdx->size(); j += 2)
         {
             sal_Int32 nStartIdx = (*xCharStyleIdx)[j] + nOffset;
             sal_Int32 nEndIdx   = (*xCharStyleIdx)[j + 1]  + nOffset;
-            pNd->InsertItem(aCharFmt, nStartIdx, nEndIdx, SetAttrMode::DONTEXPAND);
+            pNd->InsertItem(aCharFormat, nStartIdx, nEndIdx, SetAttrMode::DONTEXPAND);
         }
 
     }
@@ -1831,9 +1831,9 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
 void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
 {
     Range aRange(0, aSortArr.size());
-    if( TOX_INDEX == SwTOXBase::GetType() && pNew->pTxtMark )
+    if( TOX_INDEX == SwTOXBase::GetType() && pNew->pTextMark )
     {
-        const SwTOXMark& rMark = pNew->pTxtMark->GetTOXMark();
+        const SwTOXMark& rMark = pNew->pTextMark->GetTOXMark();
         // Evaluate Key
         // Calculate the range where to insert
         if( 0 == (GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY) &&
@@ -1942,7 +1942,7 @@ Range SwTOXBaseSection::GetKeyRange(const OUString& rStr, const OUString& rStrRe
     {
         SwTOXSortTabBase* pBase = aSortArr[i];
 
-        if( rIntl.IsEqual( pBase->GetTxt(), pBase->GetLocale(),
+        if( rIntl.IsEqual( pBase->GetText(), pBase->GetLocale(),
                            aToCompare, rNew.GetLocale() )  &&
                     pBase->GetLevel() == nLevel )
             break;
@@ -1975,10 +1975,10 @@ Range SwTOXBaseSection::GetKeyRange(const OUString& rStr, const OUString& rStrRe
 bool SwTOXBase::IsTOXBaseInReadonly() const
 {
     const SwTOXBaseSection *pSect = dynamic_cast<const SwTOXBaseSection*>(this);
-    if (!pSect || !pSect->GetFmt())
+    if (!pSect || !pSect->GetFormat())
         return false;
 
-    const SwSectionNode* pSectNode = pSect->GetFmt()->GetSectionNode();
+    const SwSectionNode* pSectNode = pSect->GetFormat()->GetSectionNode();
     if (!pSectNode)
         return false;
 
@@ -1999,16 +1999,16 @@ bool SwTOXBase::IsTOXBaseInReadonly() const
 const SfxItemSet* SwTOXBase::GetAttrSet() const
 {
     const SwTOXBaseSection *pSect = dynamic_cast<const SwTOXBaseSection*>(this);
-    if(pSect && pSect->GetFmt())
-        return &pSect->GetFmt()->GetAttrSet();
+    if(pSect && pSect->GetFormat())
+        return &pSect->GetFormat()->GetAttrSet();
     return 0;
 }
 
 void SwTOXBase::SetAttrSet( const SfxItemSet& rSet )
 {
     SwTOXBaseSection *pSect = dynamic_cast<SwTOXBaseSection*>(this);
-    if( pSect && pSect->GetFmt() )
-        pSect->GetFmt()->SetFmtAttr( rSet );
+    if( pSect && pSect->GetFormat() )
+        pSect->GetFormat()->SetFormatAttr( rSet );
 }
 
 bool SwTOXBase::GetInfo( SfxPoolItem& rInfo ) const
@@ -2018,8 +2018,8 @@ bool SwTOXBase::GetInfo( SfxPoolItem& rInfo ) const
     case RES_CONTENT_VISIBLE:
         {
             const SwTOXBaseSection *pSect = dynamic_cast<const SwTOXBaseSection*>(this);
-            if( pSect && pSect->GetFmt() )
-                pSect->GetFmt()->GetInfo( rInfo );
+            if( pSect && pSect->GetFormat() )
+                pSect->GetFormat()->GetInfo( rInfo );
         }
         return false;
     }
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index 052b555108dd..362842a2fce9 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -51,7 +51,7 @@ SwExtTextInput::~SwExtTextInput()
     SwDoc *const pDoc = GetDoc();
     if (pDoc->IsInDtor()) { return; /* #i58606# */ }
 
-    SwTxtNode* pTNd = GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = GetPoint()->nNode.GetNode().GetTextNode();
     if( pTNd )
     {
         SwIndex& rIdx = GetPoint()->nContent;
@@ -85,10 +85,10 @@ SwExtTextInput::~SwExtTextInput()
                 }
             }
             rIdx = nSttCnt;
-            const OUString sTxt( pTNd->GetTxt().copy(nSttCnt, nEndCnt - nSttCnt));
+            const OUString sText( pTNd->GetText().copy(nSttCnt, nEndCnt - nSttCnt));
             if( bIsOverwriteCursor && !sOverwriteText.isEmpty() )
             {
-                const sal_Int32 nLen = sTxt.getLength();
+                const sal_Int32 nLen = sText.getLength();
                 const sal_Int32 nOWLen = sOverwriteText.getLength();
                 if( nLen > nOWLen )
                 {
@@ -100,8 +100,8 @@ SwExtTextInput::~SwExtTextInput()
                     {
                         rIdx = nSttCnt;
                         pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_OVERWRITE, NULL );
-                        pDoc->getIDocumentContentOperations().Overwrite( *this, sTxt.copy( 0, nOWLen ) );
-                        pDoc->getIDocumentContentOperations().InsertString( *this, sTxt.copy( nOWLen ) );
+                        pDoc->getIDocumentContentOperations().Overwrite( *this, sText.copy( 0, nOWLen ) );
+                        pDoc->getIDocumentContentOperations().InsertString( *this, sText.copy( nOWLen ) );
                         pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_OVERWRITE, NULL );
                     }
                 }
@@ -111,7 +111,7 @@ SwExtTextInput::~SwExtTextInput()
                     if( bInsText )
                     {
                         rIdx = nSttCnt;
-                        pDoc->getIDocumentContentOperations().Overwrite( *this, sTxt );
+                        pDoc->getIDocumentContentOperations().Overwrite( *this, sText );
                     }
                 }
             }
@@ -121,7 +121,7 @@ SwExtTextInput::~SwExtTextInput()
 
                 if( bInsText )
                 {
-                    pDoc->getIDocumentContentOperations().InsertString( *this, sTxt );
+                    pDoc->getIDocumentContentOperations().InsertString( *this, sText );
                 }
             }
         }
@@ -130,7 +130,7 @@ SwExtTextInput::~SwExtTextInput()
 
 void SwExtTextInput::SetInputData( const CommandExtTextInputData& rData )
 {
-    SwTxtNode* pTNd = GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pTNd = GetPoint()->nNode.GetNode().GetTextNode();
     if( pTNd )
     {
         sal_Int32 nSttCnt = GetPoint()->nContent.GetIndex();
@@ -208,12 +208,12 @@ void SwExtTextInput::SetOverwriteCursor( bool bFlag )
     if (!bIsOverwriteCursor)
         return;
 
-    const SwTxtNode *const pTNd = GetPoint()->nNode.GetNode().GetTxtNode();
+    const SwTextNode *const pTNd = GetPoint()->nNode.GetNode().GetTextNode();
     if (pTNd)
     {
         const sal_Int32 nSttCnt = GetPoint()->nContent.GetIndex();
         const sal_Int32 nEndCnt = GetMark()->nContent.GetIndex();
-        sOverwriteText = pTNd->GetTxt().copy( std::min(nSttCnt, nEndCnt) );
+        sOverwriteText = pTNd->GetText().copy( std::min(nSttCnt, nEndCnt) );
         if( !sOverwriteText.isEmpty() )
         {
             const sal_Int32 nInPos = sOverwriteText.indexOf( CH_TXTATR_INWORD );
@@ -257,7 +257,7 @@ void SwDoc::DeleteExtTextInput( SwExtTextInput* pDel )
 }
 
 SwExtTextInput* SwDoc::GetExtTextInput( const SwNode& rNd,
-                                        sal_Int32 nCntntPos ) const
+                                        sal_Int32 nContentPos ) const
 {
     SwExtTextInput* pRet = 0;
     if( mpExtInputRing )
@@ -277,8 +277,8 @@ SwExtTextInput* SwDoc::GetExtTextInput( const SwNode& rNd,
             }
 
             if( nMk <= nNdIdx && nNdIdx <= nPt &&
-                ( nCntntPos<0 ||
-                    ( nMkCnt <= nCntntPos && nCntntPos <= nPtCnt )))
+                ( nContentPos<0 ||
+                    ( nMkCnt <= nContentPos && nContentPos <= nPtCnt )))
             {
                 pRet = pTmp;
                 break;
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index cafbb4791bdc..299a8cb6fc91 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -35,88 +35,88 @@
 #include <calbck.hxx>
 #include <svl/intitem.hxx>
 
-TYPEINIT1( SwTxtFmtColl, SwFmtColl );
-TYPEINIT1( SwGrfFmtColl, SwFmtColl );
-TYPEINIT1( SwConditionTxtFmtColl, SwTxtFmtColl );
+TYPEINIT1( SwTextFormatColl, SwFormatColl );
+TYPEINIT1( SwGrfFormatColl, SwFormatColl );
+TYPEINIT1( SwConditionTextFormatColl, SwTextFormatColl );
 TYPEINIT1( SwCollCondition, SwClient );
 
-namespace TxtFmtCollFunc
+namespace TextFormatCollFunc
 {
     // #i71574#
-    void CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle(
-                                            SwFmt* pFmt,
+    void CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle(
+                                            SwFormat* pFormat,
                                             const SwNumRuleItem* pNewNumRuleItem )
     {
-        SwTxtFmtColl* pTxtFmtColl = dynamic_cast<SwTxtFmtColl*>(pFmt);
-        if ( !pTxtFmtColl )
+        SwTextFormatColl* pTextFormatColl = dynamic_cast<SwTextFormatColl*>(pFormat);
+        if ( !pTextFormatColl )
         {
-            OSL_FAIL( "<TxtFmtCollFunc::CheckTxtFmtCollFuncForDeletionOfAssignmentToOutlineStyle> - misuse of method - it's only for instances of <SwTxtFmtColl>" );
+            OSL_FAIL( "<TextFormatCollFunc::CheckTextFormatCollFuncForDeletionOfAssignmentToOutlineStyle> - misuse of method - it's only for instances of <SwTextFormatColl>" );
             return;
         }
 
         // #i73790#
-        if ( !pTxtFmtColl->StayAssignedToListLevelOfOutlineStyle() &&
-             pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )
+        if ( !pTextFormatColl->StayAssignedToListLevelOfOutlineStyle() &&
+             pTextFormatColl->IsAssignedToListLevelOfOutlineStyle() )
         {
             if ( !pNewNumRuleItem )
             {
-                pTxtFmtColl->GetItemState( RES_PARATR_NUMRULE, false, reinterpret_cast<const SfxPoolItem**>(&pNewNumRuleItem) );
+                pTextFormatColl->GetItemState( RES_PARATR_NUMRULE, false, reinterpret_cast<const SfxPoolItem**>(&pNewNumRuleItem) );
             }
             if ( pNewNumRuleItem )
             {
                 OUString sNumRuleName = pNewNumRuleItem->GetValue();
                 if ( sNumRuleName.isEmpty() ||
-                     sNumRuleName != pTxtFmtColl->GetDoc()->GetOutlineNumRule()->GetName() )
+                     sNumRuleName != pTextFormatColl->GetDoc()->GetOutlineNumRule()->GetName() )
                 {
                     // delete assignment of paragraph style to list level of outline style.
-                    pTxtFmtColl->DeleteAssignmentToListLevelOfOutlineStyle();
+                    pTextFormatColl->DeleteAssignmentToListLevelOfOutlineStyle();
                 }
             }
         }
     }
 
-    SwNumRule* GetNumRule( SwTxtFmtColl& rTxtFmtColl )
+    SwNumRule* GetNumRule( SwTextFormatColl& rTextFormatColl )
     {
         SwNumRule* pNumRule( 0 );
 
         const SwNumRuleItem* pNumRuleItem( 0 );
-        rTxtFmtColl.GetItemState( RES_PARATR_NUMRULE, false, reinterpret_cast<const SfxPoolItem**>(&pNumRuleItem) );
+        rTextFormatColl.GetItemState( RES_PARATR_NUMRULE, false, reinterpret_cast<const SfxPoolItem**>(&pNumRuleItem) );
         if ( pNumRuleItem )
         {
             const OUString sNumRuleName = pNumRuleItem->GetValue();
             if ( !sNumRuleName.isEmpty() )
             {
-                pNumRule = rTxtFmtColl.GetDoc()->FindNumRulePtr( sNumRuleName );
+                pNumRule = rTextFormatColl.GetDoc()->FindNumRulePtr( sNumRuleName );
             }
         }
 
         return pNumRule;
     }
 
-    void AddToNumRule( SwTxtFmtColl& rTxtFmtColl )
+    void AddToNumRule( SwTextFormatColl& rTextFormatColl )
     {
-        SwNumRule* pNumRule = GetNumRule( rTxtFmtColl );
+        SwNumRule* pNumRule = GetNumRule( rTextFormatColl );
         if ( pNumRule )
         {
-            pNumRule->AddParagraphStyle( rTxtFmtColl );
+            pNumRule->AddParagraphStyle( rTextFormatColl );
         }
     }
 
-    void RemoveFromNumRule( SwTxtFmtColl& rTxtFmtColl )
+    void RemoveFromNumRule( SwTextFormatColl& rTextFormatColl )
     {
-        SwNumRule* pNumRule = GetNumRule( rTxtFmtColl );
+        SwNumRule* pNumRule = GetNumRule( rTextFormatColl );
         if ( pNumRule )
         {
-            pNumRule->RemoveParagraphStyle( rTxtFmtColl );
+            pNumRule->RemoveParagraphStyle( rTextFormatColl );
         }
     }
-} // end of namespace TxtFmtCollFunc
+} // end of namespace TextFormatCollFunc
 
-void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwTextFormatColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     if( GetDoc()->IsInDtor() )
     {
-        SwFmtColl::Modify( pOld, pNew );
+        SwFormatColl::Modify( pOld, pNew );
         return;
     }
 
@@ -200,7 +200,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     // #i70223#
     if ( bAssignedToListLevelOfOutlineStyle && pNewNumRuleItem )
     {
-        TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle(
+        TextFormatCollFunc::CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle(
                                                         this, pNewNumRuleItem );
     }
 
@@ -229,16 +229,16 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                 bChg |= nTmp != aNew.GetRight();
             }
             // We had a relative value -> recalculate
-            if( 100 != aNew.GetPropTxtFirstLineOfst() )
+            if( 100 != aNew.GetPropTextFirstLineOfst() )
             {
-                short nTmp = aNew.GetTxtFirstLineOfst();    // keep so that we can compare
-                aNew.SetTxtFirstLineOfst( pNewLRSpace->GetTxtFirstLineOfst(),
-                                            aNew.GetPropTxtFirstLineOfst() );
-                bChg |= nTmp != aNew.GetTxtFirstLineOfst();
+                short nTmp = aNew.GetTextFirstLineOfst();    // keep so that we can compare
+                aNew.SetTextFirstLineOfst( pNewLRSpace->GetTextFirstLineOfst(),
+                                            aNew.GetPropTextFirstLineOfst() );
+                bChg |= nTmp != aNew.GetTextFirstLineOfst();
             }
             if( bChg )
             {
-                SetFmtAttr( aNew );
+                SetFormatAttr( aNew );
                 bContinue = 0 != pOldChgSet || bNewParent;
             }
             // We set it to absolute -> do not propagate it further, unless
@@ -270,7 +270,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         }
         if( bChg )
         {
-            SetFmtAttr( aNew );
+            SetFormatAttr( aNew );
             bContinue = 0 != pOldChgSet || bNewParent;
         }
         // We set it to absolute -> do not propagate it further, unless
@@ -305,7 +305,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                                 pOldFSize->GetPropUnit() );
                 if( nTmp != aNew.GetHeight() )
                 {
-                    SetFmtAttr( aNew );
+                    SetFormatAttr( aNew );
                     bContinue = 0 != pOldChgSet || bNewParent;
                 }
                 // We set it to absolute -> do not propagate it further, unless
@@ -317,58 +317,58 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     }
 
     if( bContinue )
-        SwFmtColl::Modify( pOld, pNew );
+        SwFormatColl::Modify( pOld, pNew );
 }
 
-bool SwTxtFmtColl::IsAtDocNodeSet() const
+bool SwTextFormatColl::IsAtDocNodeSet() const
 {
-    SwIterator<SwCntntNode,SwFmtColl> aIter( *this );
+    SwIterator<SwContentNode,SwFormatColl> aIter( *this );
     const SwNodes& rNds = GetDoc()->GetNodes();
-    for( SwCntntNode* pNode = aIter.First(); pNode; pNode = aIter.Next() )
+    for( SwContentNode* pNode = aIter.First(); pNode; pNode = aIter.Next() )
         if( &(pNode->GetNodes()) == &rNds )
             return true;
 
     return false;
 }
 
-bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr )
+bool SwTextFormatColl::SetFormatAttr( const SfxPoolItem& rAttr )
 {
     const bool bIsNumRuleItem = rAttr.Which() == RES_PARATR_NUMRULE;
     if ( bIsNumRuleItem )
     {
-        TxtFmtCollFunc::RemoveFromNumRule( *this );
+        TextFormatCollFunc::RemoveFromNumRule( *this );
     }
 
-    const bool bRet = SwFmtColl::SetFmtAttr( rAttr );
+    const bool bRet = SwFormatColl::SetFormatAttr( rAttr );
 
     if ( bIsNumRuleItem )
     {
-        TxtFmtCollFunc::AddToNumRule( *this );
+        TextFormatCollFunc::AddToNumRule( *this );
     }
 
     return bRet;
 }
 
-bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet )
+bool SwTextFormatColl::SetFormatAttr( const SfxItemSet& rSet )
 {
     const bool bIsNumRuleItemAffected =
                 rSet.GetItemState( RES_PARATR_NUMRULE, false ) == SfxItemState::SET;
     if ( bIsNumRuleItemAffected )
     {
-        TxtFmtCollFunc::RemoveFromNumRule( *this );
+        TextFormatCollFunc::RemoveFromNumRule( *this );
     }
 
-    const bool bRet = SwFmtColl::SetFmtAttr( rSet );
+    const bool bRet = SwFormatColl::SetFormatAttr( rSet );
 
     if ( bIsNumRuleItemAffected )
     {
-        TxtFmtCollFunc::AddToNumRule( *this );
+        TextFormatCollFunc::AddToNumRule( *this );
     }
 
     return bRet;
 }
 
-bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwTextFormatColl::ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     const bool bIsNumRuleItemAffected =
                 ( nWhich2 != 0 && nWhich2 > nWhich1 )
@@ -377,16 +377,16 @@ bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
                 : nWhich1 == RES_PARATR_NUMRULE;
     if ( bIsNumRuleItemAffected )
     {
-        TxtFmtCollFunc::RemoveFromNumRule( *this );
+        TextFormatCollFunc::RemoveFromNumRule( *this );
     }
 
-    const bool bRet = SwFmtColl::ResetFmtAttr( nWhich1, nWhich2 );
+    const bool bRet = SwFormatColl::ResetFormatAttr( nWhich1, nWhich2 );
 
     return bRet;
 }
 
 // #i73790#
-sal_uInt16 SwTxtFmtColl::ResetAllFmtAttr()
+sal_uInt16 SwTextFormatColl::ResetAllFormatAttr()
 {
     const bool bOldState( mbStayAssignedToListLevelOfOutlineStyle );
     mbStayAssignedToListLevelOfOutlineStyle = true;
@@ -398,7 +398,7 @@ sal_uInt16 SwTxtFmtColl::ResetAllFmtAttr()
                                      ? GetAssignedOutlineStyleLevel()
                                      : -1;
 
-    sal_uInt16 nRet = SwFmtColl::ResetAllFmtAttr();
+    sal_uInt16 nRet = SwFormatColl::ResetAllFormatAttr();
 
     // #i70748#
     if ( nAssignedOutlineStyleLevel != -1 )
@@ -411,7 +411,7 @@ sal_uInt16 SwTxtFmtColl::ResetAllFmtAttr()
     return nRet;
 }
 
-bool SwTxtFmtColl::AreListLevelIndentsApplicable() const
+bool SwTextFormatColl::AreListLevelIndentsApplicable() const
 {
     bool bAreListLevelIndentsApplicable( true );
 
@@ -437,7 +437,7 @@ bool SwTxtFmtColl::AreListLevelIndentsApplicable() const
         // paragraph style has no hard-set indent attributes
 
         // check parent paragraph styles
-        const SwTxtFmtColl* pColl = dynamic_cast<const SwTxtFmtColl*>(DerivedFrom());
+        const SwTextFormatColl* pColl = dynamic_cast<const SwTextFormatColl*>(DerivedFrom());
         while ( pColl )
         {
             if ( pColl->GetAttrSet().GetItemState( RES_LR_SPACE, false ) == SfxItemState::SET )
@@ -455,46 +455,46 @@ bool SwTxtFmtColl::AreListLevelIndentsApplicable() const
                 break;
             }
 
-            pColl = dynamic_cast<const SwTxtFmtColl*>(pColl->DerivedFrom());
+            pColl = dynamic_cast<const SwTextFormatColl*>(pColl->DerivedFrom());
             OSL_ENSURE( pColl,
-                    "<SwTxtFmtColl::AreListLevelIndentsApplicable()> - something wrong in paragraph style hierarchy. The applied list style is not found." );
+                    "<SwTextFormatColl::AreListLevelIndentsApplicable()> - something wrong in paragraph style hierarchy. The applied list style is not found." );
         }
     }
 
     return bAreListLevelIndentsApplicable;
 }
 
-void SwTxtFmtColl::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwTextFormatColl::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swTxtFmtColl"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swTextFormatColl"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetName().toUtf8().getStr()));
     GetAttrSet().dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
-void SwTxtFmtColls::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwTextFormatColls::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swTxtFmtColls"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swTextFormatColls"));
     for (size_t i = 0; i < size(); ++i)
-        GetFmt(i)->dumpAsXml(pWriter);
+        GetFormat(i)->dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
 //FEATURE::CONDCOLL
 
-SwCollCondition::SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+SwCollCondition::SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
                                 sal_uLong nSubCond )
     : SwClient( pColl ), nCondition( nMasterCond )
 {
     aSubCondition.nSubCondition = nSubCond;
 }
 
-SwCollCondition::SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+SwCollCondition::SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
                                     const OUString& rSubExp )
     : SwClient( pColl ), nCondition( nMasterCond )
 {
     if( USRFLD_EXPRESSION & nCondition )
-        aSubCondition.pFldExpression = new OUString( rSubExp );
+        aSubCondition.pFieldExpression = new OUString( rSubExp );
     else
         aSubCondition.nSubCondition = 0;
 }
@@ -503,7 +503,7 @@ SwCollCondition::SwCollCondition( const SwCollCondition& rCopy )
     : SwClient( const_cast<SwModify*>(rCopy.GetRegisteredIn()) ), nCondition( rCopy.nCondition )
 {
     if( USRFLD_EXPRESSION & rCopy.nCondition )
-        aSubCondition.pFldExpression = new OUString( *rCopy.GetFldExpression() );
+        aSubCondition.pFieldExpression = new OUString( *rCopy.GetFieldExpression() );
     else
         aSubCondition.nSubCondition = rCopy.aSubCondition.nSubCondition;
 }
@@ -511,12 +511,12 @@ SwCollCondition::SwCollCondition( const SwCollCondition& rCopy )
 SwCollCondition::~SwCollCondition()
 {
     if( USRFLD_EXPRESSION & nCondition )
-        delete aSubCondition.pFldExpression;
+        delete aSubCondition.pFieldExpression;
 }
 
-void SwCollCondition::RegisterToFormat( SwFmt& rFmt )
+void SwCollCondition::RegisterToFormat( SwFormat& rFormat )
 {
-    rFmt.Add( this );
+    rFormat.Add( this );
 }
 
 bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
@@ -527,14 +527,14 @@ bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
         if( USRFLD_EXPRESSION & nCondition )
         {
             // The SubCondition contains the expression for the UserField
-            const OUString* pTmp = aSubCondition.pFldExpression;
+            const OUString* pTmp = aSubCondition.pFieldExpression;
             if( !pTmp )
-                pTmp = rCmp.aSubCondition.pFldExpression;
+                pTmp = rCmp.aSubCondition.pFieldExpression;
             if( pTmp )
             {
-                SwTxtFmtColl* pColl = GetTxtFmtColl();
+                SwTextFormatColl* pColl = GetTextFormatColl();
                 if( !pColl )
-                    pColl = rCmp.GetTxtFmtColl();
+                    pColl = rCmp.GetTextFormatColl();
 
                 if( pColl )
                 {
@@ -553,16 +553,16 @@ bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
 void SwCollCondition::SetCondition( sal_uLong nCond, sal_uLong nSubCond )
 {
     if( USRFLD_EXPRESSION & nCondition )
-        delete aSubCondition.pFldExpression;
+        delete aSubCondition.pFieldExpression;
     nCondition = nCond;
     aSubCondition.nSubCondition = nSubCond;
 }
 
-SwConditionTxtFmtColl::~SwConditionTxtFmtColl()
+SwConditionTextFormatColl::~SwConditionTextFormatColl()
 {
 }
 
-const SwCollCondition* SwConditionTxtFmtColl::HasCondition(
+const SwCollCondition* SwConditionTextFormatColl::HasCondition(
                         const SwCollCondition& rCond ) const
 {
     for( const auto &rFnd : aCondColls )
@@ -572,9 +572,9 @@ const SwCollCondition* SwConditionTxtFmtColl::HasCondition(
     return nullptr;
 }
 
-void SwConditionTxtFmtColl::InsertCondition( const SwCollCondition& rCond )
+void SwConditionTextFormatColl::InsertCondition( const SwCollCondition& rCond )
 {
-    for( SwFmtCollConditions::size_type n = 0; n < aCondColls.size(); ++n )
+    for( SwFormatCollConditions::size_type n = 0; n < aCondColls.size(); ++n )
         if( aCondColls[ n ] == rCond )
         {
             aCondColls.erase( aCondColls.begin() + n );
@@ -586,10 +586,10 @@ void SwConditionTxtFmtColl::InsertCondition( const SwCollCondition& rCond )
     aCondColls.push_back( pNew );
 }
 
-bool SwConditionTxtFmtColl::RemoveCondition( const SwCollCondition& rCond )
+bool SwConditionTextFormatColl::RemoveCondition( const SwCollCondition& rCond )
 {
     bool bRet = false;
-    for( SwFmtCollConditions::size_type n = 0; n < aCondColls.size(); ++n )
+    for( SwFormatCollConditions::size_type n = 0; n < aCondColls.size(); ++n )
         if( aCondColls[ n ] == rCond )
         {
             aCondColls.erase( aCondColls.begin() + n );
@@ -599,20 +599,20 @@ bool SwConditionTxtFmtColl::RemoveCondition( const SwCollCondition& rCond )
     return bRet;
 }
 
-void SwConditionTxtFmtColl::SetConditions( const SwFmtCollConditions& rCndClls )
+void SwConditionTextFormatColl::SetConditions( const SwFormatCollConditions& rCndClls )
 {
     // Copy the Conditions, but first delete the old ones
     aCondColls.clear();
     SwDoc& rDoc = *GetDoc();
     for( const auto &rFnd : rCndClls )
     {
-        SwTxtFmtColl* pTmpColl = rFnd.GetTxtFmtColl()
-                                    ? rDoc.CopyTxtColl( *rFnd.GetTxtFmtColl() )
+        SwTextFormatColl* pTmpColl = rFnd.GetTextFormatColl()
+                                    ? rDoc.CopyTextColl( *rFnd.GetTextFormatColl() )
                                     : 0;
         SwCollCondition* pNew;
         if( USRFLD_EXPRESSION & rFnd.GetCondition() )
             pNew = new SwCollCondition( pTmpColl, rFnd.GetCondition(),
-                                        *rFnd.GetFldExpression() );
+                                        *rFnd.GetFieldExpression() );
         else
             pNew = new SwCollCondition( pTmpColl, rFnd.GetCondition(),
                                         rFnd.GetSubCondition() );
@@ -621,59 +621,59 @@ void SwConditionTxtFmtColl::SetConditions( const SwFmtCollConditions& rCndClls )
 }
 
 // FEATURE::CONDCOLL
-void SwTxtFmtColl::SetAttrOutlineLevel( int nLevel)
+void SwTextFormatColl::SetAttrOutlineLevel( int nLevel)
 {
-    OSL_ENSURE( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTxtFmtColl: Level Out Of Range" );
-    SetFmtAttr( SfxUInt16Item( RES_PARATR_OUTLINELEVEL,
+    OSL_ENSURE( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTextFormatColl: Level Out Of Range" );
+    SetFormatAttr( SfxUInt16Item( RES_PARATR_OUTLINELEVEL,
                             static_cast<sal_uInt16>(nLevel) ) );
 }
 
-int SwTxtFmtColl::GetAttrOutlineLevel() const
+int SwTextFormatColl::GetAttrOutlineLevel() const
 {
-    return static_cast<const SfxUInt16Item &>(GetFmtAttr(RES_PARATR_OUTLINELEVEL)).GetValue();
+    return static_cast<const SfxUInt16Item &>(GetFormatAttr(RES_PARATR_OUTLINELEVEL)).GetValue();
 }
 
-int SwTxtFmtColl::GetAssignedOutlineStyleLevel() const
+int SwTextFormatColl::GetAssignedOutlineStyleLevel() const
 {
     OSL_ENSURE( IsAssignedToListLevelOfOutlineStyle(),
-        "<SwTxtFmtColl::GetAssignedOutlineStyleLevel()> - misuse of method");
+        "<SwTextFormatColl::GetAssignedOutlineStyleLevel()> - misuse of method");
     return GetAttrOutlineLevel() - 1;
 }
 
-void SwTxtFmtColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLevel)
+void SwTextFormatColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLevel)
 {
     mbAssignedToOutlineStyle = true;
     SetAttrOutlineLevel(nAssignedListLevel+1);
 
     // #i100277#
-    SwIterator<SwTxtFmtColl,SwFmtColl> aIter( *this );
-    SwTxtFmtColl* pDerivedTxtFmtColl = aIter.First();
-    while ( pDerivedTxtFmtColl != 0 )
+    SwIterator<SwTextFormatColl,SwFormatColl> aIter( *this );
+    SwTextFormatColl* pDerivedTextFormatColl = aIter.First();
+    while ( pDerivedTextFormatColl != 0 )
     {
-        if ( !pDerivedTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )
+        if ( !pDerivedTextFormatColl->IsAssignedToListLevelOfOutlineStyle() )
         {
-            if ( pDerivedTxtFmtColl->GetItemState( RES_PARATR_NUMRULE, false ) == SfxItemState::DEFAULT )
+            if ( pDerivedTextFormatColl->GetItemState( RES_PARATR_NUMRULE, false ) == SfxItemState::DEFAULT )
             {
                 SwNumRuleItem aItem(aEmptyOUStr);
-                pDerivedTxtFmtColl->SetFmtAttr( aItem );
+                pDerivedTextFormatColl->SetFormatAttr( aItem );
             }
-            if ( pDerivedTxtFmtColl->GetItemState( RES_PARATR_OUTLINELEVEL, false ) == SfxItemState::DEFAULT )
+            if ( pDerivedTextFormatColl->GetItemState( RES_PARATR_OUTLINELEVEL, false ) == SfxItemState::DEFAULT )
             {
-                pDerivedTxtFmtColl->SetAttrOutlineLevel( 0 );
+                pDerivedTextFormatColl->SetAttrOutlineLevel( 0 );
             }
         }
 
-        pDerivedTxtFmtColl = aIter.Next();
+        pDerivedTextFormatColl = aIter.Next();
     }
 }
 
-void SwTxtFmtColl::DeleteAssignmentToListLevelOfOutlineStyle(
+void SwTextFormatColl::DeleteAssignmentToListLevelOfOutlineStyle(
     const bool bResetOutlineLevel)
 {
     mbAssignedToOutlineStyle = false;
     if (bResetOutlineLevel)
     {
-        ResetFmtAttr(RES_PARATR_OUTLINELEVEL);
+        ResetFormatAttr(RES_PARATR_OUTLINELEVEL);
     }
 }
 
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 998996988767..c65ec4d42cf8 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -29,14 +29,14 @@
 #include <fmtftntx.hxx>
 #include <rootfrm.hxx>
 
-bool CompareSwFtnIdxs::operator()(SwTxtFtn* const& lhs, SwTxtFtn* const& rhs) const
+bool CompareSwFootnoteIdxs::operator()(SwTextFootnote* const& lhs, SwTextFootnote* const& rhs) const
 {
-    sal_uLong nIdxLHS = _SwTxtFtn_GetIndex( lhs );
-    sal_uLong nIdxRHS = _SwTxtFtn_GetIndex( rhs );
+    sal_uLong nIdxLHS = _SwTextFootnote_GetIndex( lhs );
+    sal_uLong nIdxRHS = _SwTextFootnote_GetIndex( rhs );
     return ( nIdxLHS == nIdxRHS && lhs->GetStart() < rhs->GetStart() ) || nIdxLHS < nIdxRHS;
 }
 
-void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
+void SwFootnoteIdxs::UpdateFootnote( const SwNodeIndex& rStt )
 {
     if( empty() )
         return;
@@ -45,14 +45,14 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
     SwDoc* pDoc = rStt.GetNode().GetDoc();
     if( pDoc->IsInReading() )
         return ;
-    SwTxtFtn* pTxtFtn;
+    SwTextFootnote* pTextFootnote;
 
     const SwEndNoteInfo& rEndInfo = pDoc->GetEndNoteInfo();
-    const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo();
+    const SwFootnoteInfo& rFootnoteInfo = pDoc->GetFootnoteInfo();
 
     // For normal foot notes we treat per-chapter and per-document numbering
     // separately. For Endnotes we only have per-document numbering.
-    if( FTNNUM_CHAPTER == rFtnInfo.eNum )
+    if( FTNNUM_CHAPTER == rFootnoteInfo.eNum )
     {
         const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
         const SwNode* pCapStt = &pDoc->GetNodes().GetEndOfExtras();
@@ -65,11 +65,11 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
             for( ; n < rOutlNds.size(); ++n )
                 if( rOutlNds[ n ]->GetIndex() > rStt.GetIndex() )
                     break;      // found it!
-                else if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
+                else if ( rOutlNds[ n ]->GetTextNode()->GetAttrOutlineLevel() == 1 )
                     pCapStt = rOutlNds[ n ];    // Beginning of a new Chapter
             // now find the end of the range
             for( ; n < rOutlNds.size(); ++n )
-                if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
+                if ( rOutlNds[ n ]->GetTextNode()->GetAttrOutlineLevel() == 1 )
                 {
                     nCapEnd = rOutlNds[ n ]->GetIndex();    // End of the found Chapter
                     break;
@@ -77,12 +77,12 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
         }
 
         size_t nPos = 0;
-        size_t nFtnNo = 1;
+        size_t nFootnoteNo = 1;
         if( SeekEntry( *pCapStt, &nPos ) && nPos )
         {
             // Step forward until the Index is not the same anymore
             const SwNode* pCmpNd = &rStt.GetNode();
-            while( nPos && pCmpNd == &((*this)[ --nPos ]->GetTxtNode()) )
+            while( nPos && pCmpNd == &((*this)[ --nPos ]->GetTextNode()) )
                 ;
             ++nPos;
         }
@@ -91,47 +91,47 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
             return;
 
         if( rOutlNds.empty() )
-            nFtnNo = nPos+1;
+            nFootnoteNo = nPos+1;
 
         for( ; nPos < size(); ++nPos )
         {
-            pTxtFtn = (*this)[ nPos ];
-            if( pTxtFtn->GetTxtNode().GetIndex() >= nCapEnd )
+            pTextFootnote = (*this)[ nPos ];
+            if( pTextFootnote->GetTextNode().GetIndex() >= nCapEnd )
                 break;
 
-            const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-            if( rFtn.GetNumStr().isEmpty() && !rFtn.IsEndNote() &&
-                !SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr( *pTxtFtn ))
+            const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+            if( rFootnote.GetNumStr().isEmpty() && !rFootnote.IsEndNote() &&
+                !SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr( *pTextFootnote ))
             {
-                pTxtFtn->SetNumber( rFtnInfo.nFtnOffset + nFtnNo++, rFtn.GetNumStr() );
+                pTextFootnote->SetNumber( rFootnoteInfo.nFootnoteOffset + nFootnoteNo++, rFootnote.GetNumStr() );
             }
         }
     }
 
-    SwUpdFtnEndNtAtEnd aNumArr;
+    SwUpdFootnoteEndNtAtEnd aNumArr;
 
     // unless we have per-document numbering, only look at endnotes here
-    const bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum;
+    const bool bEndNoteOnly = FTNNUM_DOC != rFootnoteInfo.eNum;
 
     size_t nPos;
-    size_t nFtnNo = 1;
+    size_t nFootnoteNo = 1;
     size_t nEndNo = 1;
     sal_uLong nUpdNdIdx = rStt.GetIndex();
     for( nPos = 0; nPos < size(); ++nPos )
     {
-        pTxtFtn = (*this)[ nPos ];
-        if( nUpdNdIdx <= pTxtFtn->GetTxtNode().GetIndex() )
+        pTextFootnote = (*this)[ nPos ];
+        if( nUpdNdIdx <= pTextFootnote->GetTextNode().GetIndex() )
             break;
 
-        const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-        if( rFtn.GetNumStr().isEmpty() )
+        const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+        if( rFootnote.GetNumStr().isEmpty() )
         {
-            if( !aNumArr.ChkNumber( *pTxtFtn ) )
+            if( !aNumArr.ChkNumber( *pTextFootnote ) )
             {
-                if( pTxtFtn->GetFtn().IsEndNote() )
+                if( pTextFootnote->GetFootnote().IsEndNote() )
                     nEndNo++;
                 else
-                    nFtnNo++;
+                    nFootnoteNo++;
             }
         }
     }
@@ -139,111 +139,111 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
     // Set the array number for all footnotes starting from nPos
     for( ; nPos < size(); ++nPos )
     {
-        pTxtFtn = (*this)[ nPos ];
-        const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-        if( rFtn.GetNumStr().isEmpty() )
+        pTextFootnote = (*this)[ nPos ];
+        const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+        if( rFootnote.GetNumStr().isEmpty() )
         {
-            sal_uInt16 nSectNo = aNumArr.ChkNumber( *pTxtFtn );
-            if( !nSectNo && ( rFtn.IsEndNote() || !bEndNoteOnly ))
-                nSectNo = rFtn.IsEndNote()
-                            ? rEndInfo.nFtnOffset + nEndNo++
-                            : rFtnInfo.nFtnOffset + nFtnNo++;
+            sal_uInt16 nSectNo = aNumArr.ChkNumber( *pTextFootnote );
+            if( !nSectNo && ( rFootnote.IsEndNote() || !bEndNoteOnly ))
+                nSectNo = rFootnote.IsEndNote()
+                            ? rEndInfo.nFootnoteOffset + nEndNo++
+                            : rFootnoteInfo.nFootnoteOffset + nFootnoteNo++;
 
             if( nSectNo )
             {
-                pTxtFtn->SetNumber( nSectNo, rFtn.GetNumStr() );
+                pTextFootnote->SetNumber( nSectNo, rFootnote.GetNumStr() );
             }
         }
     }
 }
 
-void SwFtnIdxs::UpdateAllFtn()
+void SwFootnoteIdxs::UpdateAllFootnote()
 {
     if( empty() )
         return;
 
     // Get the NodesArray via the StartIndex of the first Footnote
-    SwDoc* pDoc = const_cast<SwDoc*>((*this)[ 0 ]->GetTxtNode().GetDoc());
-    SwTxtFtn* pTxtFtn;
+    SwDoc* pDoc = const_cast<SwDoc*>((*this)[ 0 ]->GetTextNode().GetDoc());
+    SwTextFootnote* pTextFootnote;
     const SwEndNoteInfo& rEndInfo = pDoc->GetEndNoteInfo();
-    const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo();
+    const SwFootnoteInfo& rFootnoteInfo = pDoc->GetFootnoteInfo();
 
-    SwUpdFtnEndNtAtEnd aNumArr;
+    SwUpdFootnoteEndNtAtEnd aNumArr;
 
     SwRootFrm* pTmpRoot = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
     std::set<SwRootFrm*> aAllLayouts = pDoc->GetAllLayouts();
     // For normal Footnotes per-chapter and per-document numbering are treated separately.
     // For Endnotes we only have document-wise numbering.
-    if( FTNNUM_CHAPTER == rFtnInfo.eNum )
+    if( FTNNUM_CHAPTER == rFootnoteInfo.eNum )
     {
         const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
         sal_uInt16 nNo = 1;     // Number for the Footnotes
-        size_t nFtnIdx = 0;     // Index into theFtnIdx array
+        size_t nFootnoteIdx = 0;     // Index into theFootnoteIdx array
         for( size_t n = 0; n < rOutlNds.size(); ++n )
         {
-            if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
+            if ( rOutlNds[ n ]->GetTextNode()->GetAttrOutlineLevel() == 1 )
             {
                 sal_uLong nCapStt = rOutlNds[ n ]->GetIndex();  // Start of a new chapter
-                for( ; nFtnIdx < size(); ++nFtnIdx )
+                for( ; nFootnoteIdx < size(); ++nFootnoteIdx )
                 {
-                    pTxtFtn = (*this)[ nFtnIdx ];
-                    if( pTxtFtn->GetTxtNode().GetIndex() >= nCapStt )
+                    pTextFootnote = (*this)[ nFootnoteIdx ];
+                    if( pTextFootnote->GetTextNode().GetIndex() >= nCapStt )
                         break;
 
                     // Endnotes are per-document only
-                    const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-                    if( !rFtn.IsEndNote() && rFtn.GetNumStr().isEmpty() &&
-                        !SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr( *pTxtFtn ))
+                    const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+                    if( !rFootnote.IsEndNote() && rFootnote.GetNumStr().isEmpty() &&
+                        !SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr( *pTextFootnote ))
                     {
-                        pTxtFtn->SetNumber( rFtnInfo.nFtnOffset + nNo++, rFtn.GetNumStr() );
+                        pTextFootnote->SetNumber( rFootnoteInfo.nFootnoteOffset + nNo++, rFootnote.GetNumStr() );
                     }
                 }
-                if( nFtnIdx >= size() )
+                if( nFootnoteIdx >= size() )
                     break;          // ok, everything is updated
                 nNo = 1;
             }
         }
 
-        for( nNo = 1; nFtnIdx < size(); ++nFtnIdx )
+        for( nNo = 1; nFootnoteIdx < size(); ++nFootnoteIdx )
         {
             // Endnotes are per-document
-            pTxtFtn = (*this)[ nFtnIdx ];
-            const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-            if( !rFtn.IsEndNote() && rFtn.GetNumStr().isEmpty() &&
-                !SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr( *pTxtFtn ))
+            pTextFootnote = (*this)[ nFootnoteIdx ];
+            const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+            if( !rFootnote.IsEndNote() && rFootnote.GetNumStr().isEmpty() &&
+                !SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr( *pTextFootnote ))
             {
-                pTxtFtn->SetNumber( rFtnInfo.nFtnOffset + nNo++, rFtn.GetNumStr() );
+                pTextFootnote->SetNumber( rFootnoteInfo.nFootnoteOffset + nNo++, rFootnote.GetNumStr() );
             }
         }
     }
 
     // We use bool here, so that we also iterate through the Endnotes with a chapter setting.
-    const bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum;
-    sal_uInt16 nFtnNo = 0, nEndNo = 0;
+    const bool bEndNoteOnly = FTNNUM_DOC != rFootnoteInfo.eNum;
+    sal_uInt16 nFootnoteNo = 0, nEndNo = 0;
     for( size_t nPos = 0; nPos < size(); ++nPos )
     {
-        pTxtFtn = (*this)[ nPos ];
-        const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-        if( rFtn.GetNumStr().isEmpty() )
+        pTextFootnote = (*this)[ nPos ];
+        const SwFormatFootnote &rFootnote = pTextFootnote->GetFootnote();
+        if( rFootnote.GetNumStr().isEmpty() )
         {
-            sal_uInt16 nSectNo = aNumArr.ChkNumber( *pTxtFtn );
-            if( !nSectNo && ( rFtn.IsEndNote() || !bEndNoteOnly ))
-                nSectNo = rFtn.IsEndNote()
-                                ? rEndInfo.nFtnOffset + (++nEndNo)
-                                : rFtnInfo.nFtnOffset + (++nFtnNo);
+            sal_uInt16 nSectNo = aNumArr.ChkNumber( *pTextFootnote );
+            if( !nSectNo && ( rFootnote.IsEndNote() || !bEndNoteOnly ))
+                nSectNo = rFootnote.IsEndNote()
+                                ? rEndInfo.nFootnoteOffset + (++nEndNo)
+                                : rFootnoteInfo.nFootnoteOffset + (++nFootnoteNo);
 
             if( nSectNo )
             {
-                pTxtFtn->SetNumber( nSectNo, rFtn.GetNumStr() );
+                pTextFootnote->SetNumber( nSectNo, rFootnote.GetNumStr() );
             }
         }
     }
 
-    if( pTmpRoot && FTNNUM_PAGE == rFtnInfo.eNum )
-        std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
+    if( pTmpRoot && FTNNUM_PAGE == rFootnoteInfo.eNum )
+        std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFootnoteNums));
 }
 
-SwTxtFtn* SwFtnIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFndPos ) const
+SwTextFootnote* SwFootnoteIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFndPos ) const
 {
     sal_uLong nIdx = rPos.GetIndex();
 
@@ -255,7 +255,7 @@ SwTxtFtn* SwFtnIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFndPos ) const
         while( nU <= nO )
         {
             const size_t nM = nU + ( nO - nU ) / 2;
-            sal_uLong nNdIdx = _SwTxtFtn_GetIndex( (*this)[ nM ] );
+            sal_uLong nNdIdx = _SwTextFootnote_GetIndex( (*this)[ nM ] );
             if( nNdIdx == nIdx )
             {
                 if( pFndPos )
@@ -279,29 +279,29 @@ SwTxtFtn* SwFtnIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFndPos ) const
     return 0;
 }
 
-const SwSectionNode* SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr(
-                const SwTxtFtn& rTxtFtn )
+const SwSectionNode* SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr(
+                const SwTextFootnote& rTextFootnote )
 {
-    sal_uInt16 nWh = static_cast<sal_uInt16>( rTxtFtn.GetFtn().IsEndNote() ?
+    sal_uInt16 nWh = static_cast<sal_uInt16>( rTextFootnote.GetFootnote().IsEndNote() ?
                         RES_END_AT_TXTEND : RES_FTN_AT_TXTEND );
     sal_uInt16 nVal;
-    const SwSectionNode* pNd = rTxtFtn.GetTxtNode().FindSectionNode();
+    const SwSectionNode* pNd = rTextFootnote.GetTextNode().FindSectionNode();
     while( pNd && FTNEND_ATTXTEND_OWNNUMSEQ != ( nVal =
-            static_cast<const SwFmtFtnEndAtTxtEnd&>(pNd->GetSection().GetFmt()->
-            GetFmtAttr( nWh, true )).GetValue() ) &&
+            static_cast<const SwFormatFootnoteEndAtTextEnd&>(pNd->GetSection().GetFormat()->
+            GetFormatAttr( nWh, true )).GetValue() ) &&
             FTNEND_ATTXTEND_OWNNUMANDFMT != nVal )
         pNd = pNd->StartOfSectionNode()->FindSectionNode();
 
     return pNd;
 }
 
-sal_uInt16 SwUpdFtnEndNtAtEnd::GetNumber( const SwTxtFtn& rTxtFtn,
+sal_uInt16 SwUpdFootnoteEndNtAtEnd::GetNumber( const SwTextFootnote& rTextFootnote,
                                     const SwSectionNode& rNd )
 {
     sal_uInt16 nRet = 0, nWh;
     std::vector<const SwSectionNode*>* pArr;
     std::vector<sal_uInt16> *pNum;
-    if( rTxtFtn.GetFtn().IsEndNote() )
+    if( rTextFootnote.GetFootnote().IsEndNote() )
     {
         pArr = &aEndSects;
         pNum = &aEndNums;
@@ -309,8 +309,8 @@ sal_uInt16 SwUpdFtnEndNtAtEnd::GetNumber( const SwTxtFtn& rTxtFtn,
     }
     else
     {
-        pArr = &aFtnSects;
-        pNum = &aFtnNums;
+        pArr = &aFootnoteSects;
+        pNum = &aFootnoteNums;
         nWh = RES_FTN_AT_TXTEND;
     }
 
@@ -324,18 +324,18 @@ sal_uInt16 SwUpdFtnEndNtAtEnd::GetNumber( const SwTxtFtn& rTxtFtn,
     if( !nRet )
     {
         pArr->push_back( &rNd );
-        nRet = static_cast<const SwFmtFtnEndAtTxtEnd&>(rNd.GetSection().GetFmt()->
-                                GetFmtAttr( nWh )).GetOffset();
+        nRet = static_cast<const SwFormatFootnoteEndAtTextEnd&>(rNd.GetSection().GetFormat()->
+                                GetFormatAttr( nWh )).GetOffset();
         ++nRet;
         pNum->push_back( nRet );
     }
     return nRet;
 }
 
-sal_uInt16 SwUpdFtnEndNtAtEnd::ChkNumber( const SwTxtFtn& rTxtFtn )
+sal_uInt16 SwUpdFootnoteEndNtAtEnd::ChkNumber( const SwTextFootnote& rTextFootnote )
 {
-    const SwSectionNode* pSectNd = FindSectNdWithEndAttr( rTxtFtn );
-    return pSectNd ? GetNumber( rTxtFtn, *pSectNd ) : 0;
+    const SwSectionNode* pSectNd = FindSectNdWithEndAttr( rTextFootnote );
+    return pSectNd ? GetNumber( rTextFootnote, *pSectNd ) : 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index f5c7b75df09e..fa94c9ab4eed 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -30,11 +30,11 @@ inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, bool bTop )
     return bTop ? pBox->GetTop() : pBox->GetBottom();
 }
 
-bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrmFmt& rFmt )
+bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrameFormat& rFormat )
 {
     const SvxBorderLine* pBrd;
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET == rFmt.GetItemState( RES_BOX, true, &pItem ) &&
+    if( SfxItemState::SET == rFormat.GetItemState( RES_BOX, true, &pItem ) &&
         0 != ( pBrd = static_cast<const SvxBoxItem*>(pItem)->GetLeft() ) )
     {
         if( *pBrdLn == *pBrd )
@@ -66,7 +66,7 @@ static bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox* pBox, _SwGCBorder_BoxBrd
         return true;
     }
 
-    return pPara->CheckLeftBorderOfFormat( *pBox->GetFrmFmt() );
+    return pPara->CheckLeftBorderOfFormat( *pBox->GetFrameFormat() );
 }
 
 static void lcl_GCBorder_GetLastBox_B( const SwTableBox* pBox, SwTableBoxes* pPara );
@@ -91,7 +91,7 @@ static void lcl_GCBorder_GetLastBox_B( const SwTableBox* pBox, SwTableBoxes* pPa
 }
 
 // Find the "end" of the passed BorderLine. Returns the "Layout"Pos!
-static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB,
+static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTableLineBoxes& rCollTLB,
                         const SvxBorderLine& rBrdLn, size_t& rStt, bool bTop )
 {
     sal_uInt16 nPos, nLastPos = 0;
@@ -101,7 +101,7 @@ static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB,
         const SvxBorderLine* pBrd;
         const SwTableBox& rBox = rCollTLB.GetBox( rStt, &nPos );
 
-        if( SfxItemState::SET != rBox.GetFrmFmt()->GetItemState(RES_BOX,true, &pItem )
+        if( SfxItemState::SET != rBox.GetFrameFormat()->GetItemState(RES_BOX,true, &pItem )
             || 0 == ( pBrd = GetLineTB( static_cast<const SvxBoxItem*>(pItem), bTop ))
             || !( *pBrd == rBrdLn ))
             break;
@@ -114,17 +114,17 @@ static inline const SvxBorderLine* lcl_GCBorder_GetBorder( const SwTableBox& rBo
                                                 bool bTop,
                                                 const SfxPoolItem** ppItem )
 {
-    return SfxItemState::SET == rBox.GetFrmFmt()->GetItemState( RES_BOX, true, ppItem )
+    return SfxItemState::SET == rBox.GetFrameFormat()->GetItemState( RES_BOX, true, ppItem )
             ? GetLineTB( static_cast<const SvxBoxItem*>(*ppItem), bTop )
             : 0;
 }
 
-static void lcl_GCBorder_DelBorder( const SwCollectTblLineBoxes& rCollTLB,
+static void lcl_GCBorder_DelBorder( const SwCollectTableLineBoxes& rCollTLB,
                                 size_t& rStt, bool bTop,
                                 const SvxBorderLine& rLine,
                                 const SfxPoolItem* pItem,
                                 sal_uInt16 nEndPos,
-                                SwShareBoxFmts* pShareFmts )
+                                SwShareBoxFormats* pShareFormats )
 {
     SwTableBox* pBox = const_cast<SwTableBox*>(&rCollTLB.GetBox( rStt ));
     sal_uInt16 nNextPos;
@@ -139,10 +139,10 @@ static void lcl_GCBorder_DelBorder( const SwCollectTblLineBoxes& rCollTLB,
             else
                 aBox.SetLine( 0, SvxBoxItemLine::BOTTOM );
 
-            if( pShareFmts )
-                pShareFmts->SetAttr( *pBox, aBox );
+            if( pShareFormats )
+                pShareFormats->SetAttr( *pBox, aBox );
             else
-                pBox->ClaimFrmFmt()->SetFmtAttr( aBox );
+                pBox->ClaimFrameFormat()->SetFormatAttr( aBox );
         }
 
         if( ++rStt >= rCollTLB.Count() )
@@ -181,7 +181,7 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
             for( SwTableBoxes::size_type i = aBoxes.size(); i; )
             {
                 SwTableBox* pBox;
-                if( SfxItemState::SET == (pBox = aBoxes[ --i ])->GetFrmFmt()->
+                if( SfxItemState::SET == (pBox = aBoxes[ --i ])->GetFrameFormat()->
                     GetItemState( RES_BOX, true, &pItem ) &&
                     0 != ( pBrd = static_cast<const SvxBoxItem*>(pItem)->GetRight() ) )
                 {
@@ -192,10 +192,10 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
                     {
                         SvxBoxItem aBox( *static_cast<const SvxBoxItem*>(pItem) );
                         aBox.SetLine( 0, SvxBoxItemLine::RIGHT );
-                        if( pGCPara->pShareFmts )
-                            pGCPara->pShareFmts->SetAttr( *pBox, aBox );
+                        if( pGCPara->pShareFormats )
+                            pGCPara->pShareFormats->SetAttr( *pBox, aBox );
                         else
-                            pBox->ClaimFrmFmt()->SetFmtAttr( aBox );
+                            pBox->ClaimFrameFormat()->SetFormatAttr( aBox );
                     }
                 }
             }
@@ -207,8 +207,8 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
     // And now the own bottom edge with the succeeding top edge
     if( !pGCPara->IsLastLine() )
     {
-        SwCollectTblLineBoxes aBottom( false );
-        SwCollectTblLineBoxes aTop( true );
+        SwCollectTableLineBoxes aBottom( false );
+        SwCollectTableLineBoxes aTop( true );
 
         sw_Line_CollectBox( pLine, &aBottom );
 
@@ -254,7 +254,7 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
                     if( nTopPos <= nBtmEndPos )
                         lcl_GCBorder_DelBorder( aTop, --nSttTop, true,
                                             *pBtmLine, pTopItem, nBtmEndPos,
-                                            pGCPara->pShareFmts );
+                                            pGCPara->pShareFormats );
                     else
                         nSttBtm = nSavSttBtm;
                 }
@@ -265,7 +265,7 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
                     if( nBtmPos <= nTopEndPos )
                         lcl_GCBorder_DelBorder( aBottom, --nSttBtm, false,
                                             *pTopLine, pBtmItem, nTopEndPos,
-                                            pGCPara->pShareFmts );
+                                            pGCPara->pShareFormats );
                     else
                         nSttTop = nSavSttTop;
                 }
@@ -313,7 +313,7 @@ static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara )
     if( !pBox->GetTabLines().empty() )
     {
         _SwGCLineBorder aPara( *pBox );
-        aPara.pShareFmts = pPara->pShareFmts;
+        aPara.pShareFormats = pPara->pShareFormats;
         for( const SwTableLine* pLine : pBox->GetTabLines() )
             sw_GC_Line_Border( pLine, &aPara );
     }
@@ -322,32 +322,32 @@ static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara )
 struct _GCLinePara
 {
     SwTableLines* pLns;
-    SwShareBoxFmts* pShareFmts;
+    SwShareBoxFormats* pShareFormats;
 
     _GCLinePara( SwTableLines& rLns, _GCLinePara* pPara = 0 )
-        : pLns( &rLns ), pShareFmts( pPara ? pPara->pShareFmts : 0 )
+        : pLns( &rLns ), pShareFormats( pPara ? pPara->pShareFormats : 0 )
     {}
 };
 
 static bool lcl_MergeGCLine(SwTableLine* pLine, _GCLinePara* pPara);
 
-static bool lcl_MergeGCBox(SwTableBox* pTblBox, _GCLinePara* pPara)
+static bool lcl_MergeGCBox(SwTableBox* pTableBox, _GCLinePara* pPara)
 {
-    if( !pTblBox->GetTabLines().empty() )
+    if( !pTableBox->GetTabLines().empty() )
     {
         // ATTENTION: The Line count can change!
-        _GCLinePara aPara( pTblBox->GetTabLines(), pPara );
+        _GCLinePara aPara( pTableBox->GetTabLines(), pPara );
         for( SwTableLines::size_type n = 0;
-            n < pTblBox->GetTabLines().size() && lcl_MergeGCLine( pTblBox->GetTabLines()[n], &aPara );
+            n < pTableBox->GetTabLines().size() && lcl_MergeGCLine( pTableBox->GetTabLines()[n], &aPara );
             ++n )
             ;
 
-        if( 1 == pTblBox->GetTabLines().size() )
+        if( 1 == pTableBox->GetTabLines().size() )
         {
             // we have a box with a single line, so we just replace it by the line's boxes
-            SwTableLine* pInsLine = pTblBox->GetUpper();
-            SwTableLine* pCpyLine = pTblBox->GetTabLines()[0];
-            SwTableBoxes::iterator it = std::find( pInsLine->GetTabBoxes().begin(), pInsLine->GetTabBoxes().end(), pTblBox );
+            SwTableLine* pInsLine = pTableBox->GetUpper();
+            SwTableLine* pCpyLine = pTableBox->GetTabLines()[0];
+            SwTableBoxes::iterator it = std::find( pInsLine->GetTabBoxes().begin(), pInsLine->GetTabBoxes().end(), pTableBox );
             for( auto pTabBox : pCpyLine->GetTabBoxes() )
                 pTabBox->SetUpper( pInsLine );
 
@@ -357,7 +357,7 @@ static bool lcl_MergeGCBox(SwTableBox* pTblBox, _GCLinePara* pPara)
             pInsLine->GetTabBoxes().insert( it, pCpyLine->GetTabBoxes().begin(), pCpyLine->GetTabBoxes().end());
             pCpyLine->GetTabBoxes().clear();
             // destroy the removed box
-            delete pTblBox;
+            delete pTableBox;
 
             return false; // set up anew
         }
@@ -396,14 +396,14 @@ static bool lcl_MergeGCLine(SwTableLine* pLn, _GCLinePara* pGCPara)
             // JP 31.03.99: Bug 60000
             // Pass the attributes of the to-be-deleted Lines to the "inserted" one
             const SfxPoolItem* pItem;
-            if( SfxItemState::SET == pLn->GetFrmFmt()->GetItemState(
+            if( SfxItemState::SET == pLn->GetFrameFormat()->GetItemState(
                                     RES_BACKGROUND, true, &pItem ))
             {
                 SwTableLines& rBoxLns = pBox->GetTabLines();
                 for( auto pBoxLine : rBoxLns )
-                    if( SfxItemState::SET != pBoxLine->GetFrmFmt()->
+                    if( SfxItemState::SET != pBoxLine->GetFrameFormat()->
                             GetItemState( RES_BACKGROUND, true ))
-                        pGCPara->pShareFmts->SetAttr( *pBoxLine, *pItem );
+                        pGCPara->pShareFormats->SetAttr( *pBoxLine, *pItem );
             }
 
             pBox->GetTabLines().erase( pBox->GetTabLines().begin(), pBox->GetTabLines().begin() + nLines );  // Remove Lines from the array
@@ -431,8 +431,8 @@ void SwTable::GCLines()
 {
     // ATTENTION: The Line count can change!
     _GCLinePara aPara( GetTabLines() );
-    SwShareBoxFmts aShareFmts;
-    aPara.pShareFmts = &aShareFmts;
+    SwShareBoxFormats aShareFormats;
+    aPara.pShareFormats = &aShareFormats;
     for( SwTableLines::size_type n = 0; n < GetTabLines().size() &&
             lcl_MergeGCLine( GetTabLines()[n], &aPara ); ++n )
         ;
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index b88f026580d4..7ed7668f10db 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -319,7 +319,7 @@ void SwHTMLTableLayout::AddBorderWidth( sal_uLong &rMin, sal_uLong &rMax,
 void SwHTMLTableLayout::SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol,
                              sal_uInt16 nColSpan ) const
 {
-    SwFrmFmt *pFrmFmt = pBox->GetFrmFmt();
+    SwFrameFormat *pFrameFormat = pBox->GetFrameFormat();
 
     // calculate the box's width
     SwTwips nFrmWidth = 0;
@@ -327,7 +327,7 @@ void SwHTMLTableLayout::SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol,
         nFrmWidth += GetColumn( nCol++ )->GetRelColWidth();
 
     // and reset
-    pFrmFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nFrmWidth, 0 ));
+    pFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nFrmWidth, 0 ));
 }
 
 void SwHTMLTableLayout::GetAvail( sal_uInt16 nCol, sal_uInt16 nColSpan,
@@ -385,7 +385,7 @@ sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByTabFrm(
         // width is relevant not the frame's width.
         // For paragraph-bound frames we don't respect paragraph indents.
         const SwFrm *pAnchor = static_cast<const SwFlyFrm *>(pUpper)->GetAnchorFrm();
-        if( pAnchor->IsTxtFrm() )
+        if( pAnchor->IsTextFrm() )
             nWidth = pAnchor->Frm().Width();
         else
             nWidth = pAnchor->Prt().Width();
@@ -407,7 +407,7 @@ sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByTabFrm(
 sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByTable( const SwDoc& rDoc ) const
 {
     sal_uInt16 nBrowseWidth = 0;
-    SwTabFrm* pFrm = SwIterator<SwTabFrm,SwFmt>( *pSwTable->GetFrmFmt() ).First();
+    SwTabFrm* pFrm = SwIterator<SwTabFrm,SwFormat>( *pSwTable->GetFrameFormat() ).First();
     if( pFrm )
     {
         nBrowseWidth = GetBrowseWidthByTabFrm( *pFrm );
@@ -437,18 +437,18 @@ const SwStartNode *SwHTMLTableLayout::GetAnyBoxStartNode() const
     return pBoxSttNd;
 }
 
-SwFrmFmt *SwHTMLTableLayout::FindFlyFrmFmt() const
+SwFrameFormat *SwHTMLTableLayout::FindFlyFrameFormat() const
 {
-    const SwTableNode *pTblNd = GetAnyBoxStartNode()->FindTableNode();
-    OSL_ENSURE( pTblNd, "Kein Table-Node?" );
-    return pTblNd->GetFlyFmt();
+    const SwTableNode *pTableNd = GetAnyBoxStartNode()->FindTableNode();
+    OSL_ENSURE( pTableNd, "Kein Table-Node?" );
+    return pTableNd->GetFlyFormat();
 }
 
 static void lcl_GetMinMaxSize( sal_uLong& rMinNoAlignCnts, sal_uLong& rMaxNoAlignCnts,
                         sal_uLong& rAbsMinNoAlignCnts,
-                        SwTxtNode *pTxtNd, sal_uLong nIdx, bool bNoBreak )
+                        SwTextNode *pTextNd, sal_uLong nIdx, bool bNoBreak )
 {
-    pTxtNd->GetMinMaxSize( nIdx, rMinNoAlignCnts, rMaxNoAlignCnts,
+    pTextNd->GetMinMaxSize( nIdx, rMinNoAlignCnts, rMaxNoAlignCnts,
                            rAbsMinNoAlignCnts );
     OSL_ENSURE( rAbsMinNoAlignCnts <= rMinNoAlignCnts,
             "GetMinMaxSize: absmin > min" );
@@ -456,16 +456,16 @@ static void lcl_GetMinMaxSize( sal_uLong& rMinNoAlignCnts, sal_uLong& rMaxNoAlig
             "GetMinMaxSize: max > min" );
 
     // The maximal width for a <PRE> paragraph is the minimal width
-    const SwFmtColl *pColl = &pTxtNd->GetAnyFmtColl();
+    const SwFormatColl *pColl = &pTextNd->GetAnyFormatColl();
     while( pColl && !pColl->IsDefault() &&
-            (USER_FMT & pColl->GetPoolFmtId()) )
+            (USER_FMT & pColl->GetPoolFormatId()) )
     {
-        pColl = static_cast<const SwFmtColl *>(pColl->DerivedFrom());
+        pColl = static_cast<const SwFormatColl *>(pColl->DerivedFrom());
     }
 
     // <NOBR> in the whole cell apply to text but not to tables.
     // Netscape only considers this for graphics.
-    if( (pColl && RES_POOLCOLL_HTML_PRE==pColl->GetPoolFmtId()) || bNoBreak )
+    if( (pColl && RES_POOLCOLL_HTML_PRE==pColl->GetPoolFormatId()) || bNoBreak )
     {
         rMinNoAlignCnts = rMaxNoAlignCnts;
         rAbsMinNoAlignCnts = rMaxNoAlignCnts;
@@ -522,8 +522,8 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                         sal_uLong nIdx = pSttNd->GetIndex();
                         while( !(pDoc->GetNodes()[nIdx])->IsEndNode() )
                         {
-                            SwTxtNode *pTxtNd = (pDoc->GetNodes()[nIdx])->GetTxtNode();
-                            if( pTxtNd )
+                            SwTextNode *pTextNd = (pDoc->GetNodes()[nIdx])->GetTextNode();
+                            if( pTextNd )
                             {
                                 sal_uLong nMinNoAlignCnts = 0;
                                 sal_uLong nMaxNoAlignCnts = 0;
@@ -532,7 +532,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                                 lcl_GetMinMaxSize( nMinNoAlignCnts,
                                                    nMaxNoAlignCnts,
                                                    nAbsMinNoAlignCnts,
-                                                   pTxtNd, nIdx,
+                                                   pTextNd, nIdx,
                                                    pCnts->HasNoBreakTag() );
 
                                 if( nMinNoAlignCnts > nMinNoAlignCell )
@@ -1576,12 +1576,12 @@ static void lcl_ResizeBox( const SwTableBox* pBox, sal_uInt16* pWidth )
         sal_uInt16 nWidth = 0;
         for( const SwTableLine *pLine : pBox->GetTabLines() )
             lcl_ResizeLine( pLine, &nWidth );
-        pBox->GetFrmFmt()->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
+        pBox->GetFrameFormat()->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
         *pWidth = *pWidth + nWidth;
     }
     else
     {
-        *pWidth = *pWidth + (sal_uInt16)pBox->GetFrmFmt()->GetFrmSize().GetSize().Width();
+        *pWidth = *pWidth + (sal_uInt16)pBox->GetFrameFormat()->GetFrmSize().GetSize().Width();
     }
 }
 
@@ -1620,10 +1620,10 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
         {
             SwHTMLTableLayoutCell *pCell = GetCell( i, j );
 
-            SwHTMLTableLayoutCnts* pCntnts = pCell->GetContents();
-            while( pCntnts && !pCntnts->IsWidthSet(nWidthSet) )
+            SwHTMLTableLayoutCnts* pContents = pCell->GetContents();
+            while( pContents && !pContents->IsWidthSet(nWidthSet) )
             {
-                SwTableBox *pBox = pCntnts->GetTableBox();
+                SwTableBox *pBox = pContents->GetTableBox();
                 if( pBox )
                 {
                     SetBoxWidth( pBox, j, pCell->GetColSpan() );
@@ -1640,13 +1640,13 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
                         nRSpace = GetRightCellSpace( j, nColSpan );
                         nInhSpace = GetInhCellSpace( j, nColSpan );
                     }
-                    pCntnts->GetTable()->SetWidths( bCallPass2, nAbs, nRel,
+                    pContents->GetTable()->SetWidths( bCallPass2, nAbs, nRel,
                                                     nLSpace, nRSpace,
                                                     nInhSpace );
                 }
 
-                pCntnts->SetWidthSet( nWidthSet );
-                pCntnts = pCntnts->GetNext();
+                pContents->SetWidthSet( nWidthSet );
+                pContents = pContents->GetNext();
             }
         }
     }
@@ -1668,24 +1668,24 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
         // Lock the table format when altering it, or else the box formats
         // are altered again.
         // Also, we need to preserve a percent setting if it exists.
-        SwFrmFmt *pFrmFmt = pSwTable->GetFrmFmt();
+        SwFrameFormat *pFrameFormat = pSwTable->GetFrameFormat();
         const_cast<SwTable *>(pSwTable)->LockModify();
-        SwFmtFrmSize aFrmSize( pFrmFmt->GetFrmSize() );
+        SwFormatFrmSize aFrmSize( pFrameFormat->GetFrmSize() );
         aFrmSize.SetWidth( nRelTabWidth );
         bool bRel = bUseRelWidth &&
-                    text::HoriOrientation::FULL!=pFrmFmt->GetHoriOrient().GetHoriOrient();
+                    text::HoriOrientation::FULL!=pFrameFormat->GetHoriOrient().GetHoriOrient();
         aFrmSize.SetWidthPercent( (sal_uInt8)(bRel ? nWidthOption : 0) );
-        pFrmFmt->SetFmtAttr( aFrmSize );
+        pFrameFormat->SetFormatAttr( aFrmSize );
         const_cast<SwTable *>(pSwTable)->UnlockModify();
 
         // If the table is located in a frame, we also need to adapt the
         // frame's width.
         if( MayBeInFlyFrame() )
         {
-            SwFrmFmt *pFlyFrmFmt = FindFlyFrmFmt();
-            if( pFlyFrmFmt )
+            SwFrameFormat *pFlyFrameFormat = FindFlyFrameFormat();
+            if( pFlyFrameFormat )
             {
-                SwFmtFrmSize aFlyFrmSize( ATT_VAR_SIZE, nRelTabWidth, MINLAY );
+                SwFormatFrmSize aFlyFrmSize( ATT_VAR_SIZE, nRelTabWidth, MINLAY );
 
                 if( bUseRelWidth )
                 {
@@ -1694,14 +1694,14 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
                                                             : nMin );
                     aFlyFrmSize.SetWidthPercent( (sal_uInt8)nWidthOption );
                 }
-                pFlyFrmFmt->SetFmtAttr( aFlyFrmSize );
+                pFlyFrameFormat->SetFormatAttr( aFlyFrmSize );
             }
         }
 
 #ifdef DBG_UTIL
         {
             // check if the tables have correct widths
-            SwTwips nSize = pSwTable->GetFrmFmt()->GetFrmSize().GetWidth();
+            SwTwips nSize = pSwTable->GetFrameFormat()->GetFrmSize().GetWidth();
             const SwTableLines& rLines = pSwTable->GetTabLines();
             for (size_t n = 0; n < rLines.size(); ++n)
             {
@@ -1715,13 +1715,13 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
     {
         if( pLeftFillerBox )
         {
-            pLeftFillerBox->GetFrmFmt()->SetFmtAttr(
-                SwFmtFrmSize( ATT_VAR_SIZE, nRelLeftFill, 0 ));
+            pLeftFillerBox->GetFrameFormat()->SetFormatAttr(
+                SwFormatFrmSize( ATT_VAR_SIZE, nRelLeftFill, 0 ));
         }
         if( pRightFillerBox )
         {
-            pRightFillerBox->GetFrmFmt()->SetFmtAttr(
-                SwFmtFrmSize( ATT_VAR_SIZE, nRelRightFill, 0 ));
+            pRightFillerBox->GetFrameFormat()->SetFormatAttr(
+                SwFormatFrmSize( ATT_VAR_SIZE, nRelRightFill, 0 ));
         }
     }
 }
@@ -1774,7 +1774,7 @@ bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc,
     if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() && pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->GetViewOptions()->getBrowseMode() )
     {
         const sal_uInt16 nVisAreaWidth = GetBrowseWidthByVisArea( *pDoc );
-        if( nVisAreaWidth < nAbsAvail && !FindFlyFrmFmt() )
+        if( nVisAreaWidth < nAbsAvail && !FindFlyFrameFormat() )
             nAbsAvail = nVisAreaWidth;
     }
 
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index e000b9181292..578b5767c8a6 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -39,8 +39,8 @@ void SwDoc::SetLineNumberInfo( const SwLineNumberInfo &rNew )
         pTmpRoot->StartAllAction();
         // FME 2007-08-14 #i80120# Invalidate size, because ChgThisLines()
         // is only (onny may only be) called by the formatting routines
-        //pTmpRoot->InvalidateAllCntnt( INV_LINENUM | INV_SIZE );
-        std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_LINENUM | INV_SIZE));
+        //pTmpRoot->InvalidateAllContent( INV_LINENUM | INV_SIZE );
+        std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_LINENUM | INV_SIZE));
          pTmpRoot->EndAllAction();
     }
     *mpLineNumberInfo = rNew;
@@ -116,26 +116,26 @@ bool SwLineNumberInfo::operator==( const SwLineNumberInfo& rInf ) const
             bRestartEachPage == rInf.IsRestartEachPage();
 }
 
-SwCharFmt* SwLineNumberInfo::GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const
+SwCharFormat* SwLineNumberInfo::GetCharFormat( IDocumentStylePoolAccess& rIDSPA ) const
 {
     if ( !GetRegisteredIn() )
     {
-        SwCharFmt* pFmt = rIDSPA.GetCharFmtFromPool( RES_POOLCHR_LINENUM );
-        pFmt->Add( (SwClient*)this );
+        SwCharFormat* pFormat = rIDSPA.GetCharFormatFromPool( RES_POOLCHR_LINENUM );
+        pFormat->Add( (SwClient*)this );
     }
-    return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn()));
+    return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn()));
 }
 
-void SwLineNumberInfo::SetCharFmt( SwCharFmt *pChFmt )
+void SwLineNumberInfo::SetCharFormat( SwCharFormat *pChFormat )
 {
-    OSL_ENSURE( pChFmt, "SetCharFmt, 0 is not a valid pointer" );
-    pChFmt->Add( this );
+    OSL_ENSURE( pChFormat, "SetCharFormat, 0 is not a valid pointer" );
+    pChFormat->Add( this );
 }
 
 void SwLineNumberInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     CheckRegistration( pOld, pNew );
-    SwDoc *pDoc = static_cast<SwCharFmt*>(GetRegisteredIn())->GetDoc();
+    SwDoc *pDoc = static_cast<SwCharFormat*>(GetRegisteredIn())->GetDoc();
     SwRootFrm* pRoot = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
     if( pRoot )
     {
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index d94c17966e12..893104502584 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -82,19 +82,19 @@
 
 using namespace com::sun::star;
 
-inline bool GetRealURL( const SwGrfNode& rNd, OUString& rTxt )
+inline bool GetRealURL( const SwGrfNode& rNd, OUString& rText )
 {
-    bool bRet = rNd.GetFileFilterNms( &rTxt, 0 );
+    bool bRet = rNd.GetFileFilterNms( &rText, 0 );
     if( bRet )
-        rTxt = URIHelper::removePassword( rTxt, INetURLObject::WAS_ENCODED,
+        rText = URIHelper::removePassword( rText, INetURLObject::WAS_ENCODED,
                                            INetURLObject::DECODE_UNAMBIGUOUS);
-    if (rTxt.startsWith("data:image")) rTxt = "inline image";
+    if (rText.startsWith("data:image")) rText = "inline image";
 
     return bRet;
 }
 
 static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
-                           const SwViewShell &rSh, const SwNoTxtFrm *pFrm,
+                           const SwViewShell &rSh, const SwNoTextFrm *pFrm,
                            bool bDefect )
 {
     static vcl::Font *pFont = 0;
@@ -110,7 +110,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
 
     Color aCol( COL_RED );
     FontUnderline eUnderline = UNDERLINE_NONE;
-    const SwFmtURL &rURL = pFrm->FindFlyFrm()->GetFmt()->GetURL();
+    const SwFormatURL &rURL = pFrm->FindFlyFrm()->GetFormat()->GetURL();
     if( !rURL.GetURL().isEmpty() || rURL.GetMap() )
     {
         bool bVisited = false;
@@ -130,10 +130,10 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
         else if ( !rURL.GetURL().isEmpty() )
             bVisited = rSh.GetDoc()->IsVisitedURL( rURL.GetURL() );
 
-        SwFmt *pFmt = rSh.GetDoc()->getIDocumentStylePoolAccess().GetFmtFromPool( static_cast<sal_uInt16>
+        SwFormat *pFormat = rSh.GetDoc()->getIDocumentStylePoolAccess().GetFormatFromPool( static_cast<sal_uInt16>
             (bVisited ? RES_POOLCHR_INET_VISIT : RES_POOLCHR_INET_NORMAL ) );
-        aCol = pFmt->GetColor().GetValue();
-        eUnderline = pFmt->GetUnderline().GetLineStyle();
+        aCol = pFormat->GetColor().GetValue();
+        eUnderline = pFormat->GetUnderline().GetLineStyle();
     }
 
     pFont->SetUnderline( eUnderline );
@@ -143,31 +143,31 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
     Graphic::DrawEx( rSh.GetOut(), rText, *pFont, rBmp, rRect.Pos(), rRect.SSize() );
 }
 
-SwNoTxtFrm::SwNoTxtFrm(SwNoTxtNode * const pNode, SwFrm* pSib )
-    : SwCntntFrm( pNode, pSib )
+SwNoTextFrm::SwNoTextFrm(SwNoTextNode * const pNode, SwFrm* pSib )
+    : SwContentFrm( pNode, pSib )
 {
     InitCtor();
 }
 
 /// Initialization: Currently add the Frame to the Cache
-void SwNoTxtFrm::InitCtor()
+void SwNoTextFrm::InitCtor()
 {
     mnFrmType = FRM_NOTXT;
 }
 
-SwCntntFrm *SwNoTxtNode::MakeFrm( SwFrm* pSib )
+SwContentFrm *SwNoTextNode::MakeFrm( SwFrm* pSib )
 {
-    return new SwNoTxtFrm(this, pSib);
+    return new SwNoTextFrm(this, pSib);
 }
 
-void SwNoTxtFrm::DestroyImpl()
+void SwNoTextFrm::DestroyImpl()
 {
     StopAnimation();
 
-    SwCntntFrm::DestroyImpl();
+    SwContentFrm::DestroyImpl();
 }
 
-SwNoTxtFrm::~SwNoTxtFrm()
+SwNoTextFrm::~SwNoTextFrm()
 {
 }
 
@@ -215,7 +215,7 @@ static void lcl_ClearArea( const SwFrm &rFrm,
     }
 }
 
-void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
+void SwNoTextFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 {
     if ( Frm().IsEmpty() )
         return;
@@ -227,13 +227,13 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         // #i6467# - no paint of placeholder for page preview
         if ( pSh->GetWin() && !pSh->IsPreview() )
         {
-            const SwNoTxtNode* pNd = GetNode()->GetNoTxtNode();
-            OUString aTxt( pNd->GetTitle() );
-            if ( aTxt.isEmpty() && pNd->IsGrfNode() )
-                GetRealURL( *static_cast<const SwGrfNode*>(pNd), aTxt );
-            if( aTxt.isEmpty() )
-                aTxt = FindFlyFrm()->GetFmt()->GetName();
-            lcl_PaintReplacement( Frm(), aTxt, *pSh, this, false );
+            const SwNoTextNode* pNd = GetNode()->GetNoTextNode();
+            OUString aText( pNd->GetTitle() );
+            if ( aText.isEmpty() && pNd->IsGrfNode() )
+                GetRealURL( *static_cast<const SwGrfNode*>(pNd), aText );
+            if( aText.isEmpty() )
+                aText = FindFlyFrm()->GetFormat()->GetName();
+            lcl_PaintReplacement( Frm(), aText, *pSh, this, false );
         }
         return;
     }
@@ -250,7 +250,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     bool bClip = true;
     tools::PolyPolygon aPoly;
 
-    SwNoTxtNode& rNoTNd = const_cast<SwNoTxtNode&>(*static_cast<const SwNoTxtNode*>(GetNode()));
+    SwNoTextNode& rNoTNd = const_cast<SwNoTextNode&>(*static_cast<const SwNoTextNode*>(GetNode()));
     SwGrfNode* pGrfNd = rNoTNd.GetGrfNode();
     if( pGrfNd )
         pGrfNd->SetFrameInPaint( true );
@@ -337,7 +337,7 @@ static void lcl_CalcRect( Point& rPt, Size& rDim, sal_uInt16 nMirror )
 }
 
 /** Calculate the Bitmap's position and the size within the passed rectangle */
-void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
+void SwNoTextFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
                              bool ) const
 {
     // Currently only used for scaling, cropping and mirroring the contour of graphics!
@@ -367,7 +367,7 @@ void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
     // We read graphic from the Node, if needed.
     // It may fail, however.
     long nLeftCrop, nRightCrop, nTopCrop, nBottomCrop;
-    Size aOrigSz( static_cast<const SwNoTxtNode*>(GetNode())->GetTwipSize() );
+    Size aOrigSz( static_cast<const SwNoTextNode*>(GetNode())->GetTwipSize() );
     if ( !aOrigSz.Width() )
     {
         aOrigSz.Width() = Prt().Width();
@@ -455,7 +455,7 @@ void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
 }
 
 /** By returning the surrounding Fly's size which equals the graphic's size */
-const Size& SwNoTxtFrm::GetSize() const
+const Size& SwNoTextFrm::GetSize() const
 {
     // Return the Frame's size
     const SwFrm *pFly = FindFlyFrm();
@@ -464,9 +464,9 @@ const Size& SwNoTxtFrm::GetSize() const
     return pFly->Prt().SSize();
 }
 
-void SwNoTxtFrm::MakeAll()
+void SwNoTextFrm::MakeAll()
 {
-    SwCntntNotify aNotify( this );
+    SwContentNotify aNotify( this );
     SwBorderAttrAccess aAccess( SwFrm::GetCache(), this );
     const SwBorderAttrs &rAttrs = *aAccess.Get();
 
@@ -487,7 +487,7 @@ void SwNoTxtFrm::MakeAll()
 }
 
 /** Calculate the Bitmap's site, if needed */
-void SwNoTxtFrm::Format( const SwBorderAttrs * )
+void SwNoTextFrm::Format( const SwBorderAttrs * )
 {
     const Size aNewSize( GetSize() );
 
@@ -501,7 +501,7 @@ void SwNoTxtFrm::Format( const SwBorderAttrs * )
         Shrink( std::min(Prt().Height(), -nChgHght) );
 }
 
-bool SwNoTxtFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos,
+bool SwNoTextFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos,
                               SwCrsrMoveState *pCMS ) const
 {
     if ( &rPos.nNode.GetNode() != (SwNode*)GetNode() )
@@ -537,10 +537,10 @@ bool SwNoTxtFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos,
     return true;
 }
 
-bool SwNoTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& ,
+bool SwNoTextFrm::GetCrsrOfst(SwPosition* pPos, Point& ,
                              SwCrsrMoveState*, bool ) const
 {
-    SwCntntNode* pCNd = const_cast<SwCntntNode*>(GetNode());
+    SwContentNode* pCNd = const_cast<SwContentNode*>(GetNode());
     pPos->nNode = *pCNd;
     pPos->nContent.Assign( pCNd, 0 );
     return true;
@@ -548,25 +548,25 @@ bool SwNoTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& ,
 
 #define CLEARCACHE {\
     SwFlyFrm* pFly = FindFlyFrm();\
-    if( pFly && pFly->GetFmt()->GetSurround().IsContour() )\
+    if( pFly && pFly->GetFormat()->GetSurround().IsContour() )\
     {\
         ClrContourCache( pFly->GetVirtDrawObj() );\
         pFly->NotifyBackground( FindPageFrm(), Prt(), PREP_FLY_ATTR_CHG );\
     }\
 }
 
-void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwNoTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     sal_uInt16 nWhich = pNew ? pNew->Which() : pOld ? pOld->Which() : 0;
 
     // #i73788#
-    // no <SwCntntFrm::Modify(..)> for RES_LINKED_GRAPHIC_STREAM_ARRIVED
+    // no <SwContentFrm::Modify(..)> for RES_LINKED_GRAPHIC_STREAM_ARRIVED
     if ( RES_GRAPHIC_PIECE_ARRIVED != nWhich &&
          RES_GRAPHIC_ARRIVED != nWhich &&
          RES_GRF_REREAD_AND_INCACHE != nWhich &&
          RES_LINKED_GRAPHIC_STREAM_ARRIVED != nWhich )
     {
-        SwCntntFrm::Modify( pOld, pNew );
+        SwContentFrm::Modify( pOld, pNew );
     }
 
     bool bComplete = true;
@@ -832,11 +832,11 @@ void paintGraphicUsingPrimitivesHelper(vcl::RenderContext & rOutputDevice,
 
     @todo use aligned rectangle for drawing graphic.
     @todo pixel-align coordinations for drawing graphic. */
-void SwNoTxtFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea ) const
+void SwNoTextFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea ) const
 {
     SwViewShell* pShell = getRootFrm()->GetCurrShell();
 
-    SwNoTxtNode& rNoTNd = const_cast<SwNoTxtNode&>(*static_cast<const SwNoTxtNode*>(GetNode()));
+    SwNoTextNode& rNoTNd = const_cast<SwNoTextNode&>(*static_cast<const SwNoTextNode*>(GetNode()));
     SwGrfNode* pGrfNd = rNoTNd.GetGrfNode();
     SwOLENode* pOLENd = rNoTNd.GetOLENode();
 
@@ -901,14 +901,14 @@ void SwNoTxtFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea
                 if( !pGrfObj ||
                     !pGrfObj->IsDataComplete() ||
                     !(aTmpSz = pGrfNd->GetTwipSize()).Width() ||
-                    !aTmpSz.Height() || !pGrfNd->GetAutoFmtLvl() )
+                    !aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() )
                 {
                     pGrfNd->TriggerAsyncRetrieveInputStream(); // #i73788#
                 }
-                OUString aTxt( pGrfNd->GetTitle() );
-                if ( aTxt.isEmpty() )
-                    GetRealURL( *pGrfNd, aTxt );
-                ::lcl_PaintReplacement( aAlignedGrfArea, aTxt, *pShell, this, false );
+                OUString aText( pGrfNd->GetTitle() );
+                if ( aText.isEmpty() )
+                    GetRealURL( *pGrfNd, aText );
+                ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, false );
                 bContinue = false;
             }
         }
@@ -1060,7 +1060,7 @@ void SwNoTxtFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea
     }
 }
 
-bool SwNoTxtFrm::IsTransparent() const
+bool SwNoTextFrm::IsTransparent() const
 {
     const SwViewShell* pSh = getRootFrm()->GetCurrShell();
     if ( !pSh || !pSh->GetViewOptions()->IsGraphic() )
@@ -1074,7 +1074,7 @@ bool SwNoTxtFrm::IsTransparent() const
     return true;
 }
 
-void SwNoTxtFrm::StopAnimation( OutputDevice* pOut ) const
+void SwNoTextFrm::StopAnimation( OutputDevice* pOut ) const
 {
     // Stop animated graphics
     const SwGrfNode* pGrfNd = dynamic_cast< const SwGrfNode* >(GetNode()->GetGrfNode());
@@ -1085,7 +1085,7 @@ void SwNoTxtFrm::StopAnimation( OutputDevice* pOut ) const
     }
 }
 
-bool SwNoTxtFrm::HasAnimation() const
+bool SwNoTextFrm::HasAnimation() const
 {
     const SwGrfNode* pGrfNd = GetNode()->GetGrfNode();
     return pGrfNd && pGrfNd->IsAnimated();
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 085f5021a4bc..0a22fc1b13d7 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -57,10 +57,10 @@
 using namespace ::com::sun::star;
 
 sal_uInt16 SwNumRule::mnRefCount = 0;
-SwNumFmt* SwNumRule::maBaseFmts[ RULE_END ][ MAXLEVEL ] = {
+SwNumFormat* SwNumRule::maBaseFormats[ RULE_END ][ MAXLEVEL ] = {
     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
 
-SwNumFmt* SwNumRule::maLabelAlignmentBaseFmts[ RULE_END ][ MAXLEVEL ] = {
+SwNumFormat* SwNumRule::maLabelAlignmentBaseFormats[ RULE_END ][ MAXLEVEL ] = {
     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
 
 const sal_uInt16 SwNumRule::maDefNumIndents[ MAXLEVEL ] = {
@@ -74,24 +74,24 @@ OUString SwNumRule::GetOutlineRuleName()
     return OUString("Outline");
 }
 
-const SwNumFmt& SwNumRule::Get( sal_uInt16 i ) const
+const SwNumFormat& SwNumRule::Get( sal_uInt16 i ) const
 {
     OSL_ASSERT( i < MAXLEVEL && meRuleType < RULE_END );
-    return maFmts[ i ]
-           ? *maFmts[ i ]
+    return maFormats[ i ]
+           ? *maFormats[ i ]
            : ( meDefaultNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION
-               ? *maBaseFmts[ meRuleType ][ i ]
-               : *maLabelAlignmentBaseFmts[ meRuleType ][ i ] );
+               ? *maBaseFormats[ meRuleType ][ i ]
+               : *maLabelAlignmentBaseFormats[ meRuleType ][ i ] );
 }
 
-const SwNumFmt* SwNumRule::GetNumFmt( sal_uInt16 i ) const
+const SwNumFormat* SwNumRule::GetNumFormat( sal_uInt16 i ) const
 {
-    const SwNumFmt * pResult = NULL;
+    const SwNumFormat * pResult = NULL;
 
     OSL_ASSERT( i < MAXLEVEL && meRuleType < RULE_END );
     if ( i < MAXLEVEL && meRuleType < RULE_END)
     {
-        pResult = maFmts[ i ];
+        pResult = maFormats[ i ];
     }
 
     return pResult;
@@ -118,35 +118,35 @@ void SwNumRule::SetName( const OUString & rName,
     }
 }
 
-void SwNumRule::GetTxtNodeList( SwNumRule::tTxtNodeList& rTxtNodeList ) const
+void SwNumRule::GetTextNodeList( SwNumRule::tTextNodeList& rTextNodeList ) const
 {
-    rTxtNodeList = maTxtNodeList;
+    rTextNodeList = maTextNodeList;
 }
 
-SwNumRule::tTxtNodeList::size_type SwNumRule::GetTxtNodeListSize() const
+SwNumRule::tTextNodeList::size_type SwNumRule::GetTextNodeListSize() const
 {
-    return maTxtNodeList.size();
+    return maTextNodeList.size();
 }
 
-void SwNumRule::AddTxtNode( SwTxtNode& rTxtNode )
+void SwNumRule::AddTextNode( SwTextNode& rTextNode )
 {
-    tTxtNodeList::iterator aIter =
-        std::find( maTxtNodeList.begin(), maTxtNodeList.end(), &rTxtNode );
+    tTextNodeList::iterator aIter =
+        std::find( maTextNodeList.begin(), maTextNodeList.end(), &rTextNode );
 
-    if ( aIter == maTxtNodeList.end() )
+    if ( aIter == maTextNodeList.end() )
     {
-        maTxtNodeList.push_back( &rTxtNode );
+        maTextNodeList.push_back( &rTextNode );
     }
 }
 
-void SwNumRule::RemoveTxtNode( SwTxtNode& rTxtNode )
+void SwNumRule::RemoveTextNode( SwTextNode& rTextNode )
 {
-    tTxtNodeList::iterator aIter =
-        std::find( maTxtNodeList.begin(), maTxtNodeList.end(), &rTxtNode );
+    tTextNodeList::iterator aIter =
+        std::find( maTextNodeList.begin(), maTextNodeList.end(), &rTextNode );
 
-    if ( aIter != maTxtNodeList.end() )
+    if ( aIter != maTextNodeList.end() )
     {
-        maTxtNodeList.erase( aIter );
+        maTextNodeList.erase( aIter );
     }
 }
 
@@ -168,70 +168,70 @@ sal_uInt16 SwNumRule::GetBullIndent( sal_uInt8 nLvl )
     return maDefNumIndents[ nLvl ];
 }
 
-static void lcl_SetRuleChgd( SwTxtNode& rNd, sal_uInt8 nLevel )
+static void lcl_SetRuleChgd( SwTextNode& rNd, sal_uInt8 nLevel )
 {
     if( rNd.GetActualListLevel() == nLevel )
         rNd.NumRuleChgd();
 }
 
-SwNumFmt::SwNumFmt() :
+SwNumFormat::SwNumFormat() :
     SvxNumberFormat(SVX_NUM_ARABIC),
     SwClient( 0 ),
-    pVertOrient(new SwFmtVertOrient( 0, text::VertOrientation::NONE))
+    pVertOrient(new SwFormatVertOrient( 0, text::VertOrientation::NONE))
     ,cGrfBulletCP(USHRT_MAX)//For i120928,record the cp info of graphic within bullet
 {
 }
 
-SwNumFmt::SwNumFmt( const SwNumFmt& rFmt) :
-    SvxNumberFormat(rFmt),
-    SwClient( rFmt.GetRegisteredInNonConst() ),
-    pVertOrient(new SwFmtVertOrient( 0, rFmt.GetVertOrient()))
-    ,cGrfBulletCP(rFmt.cGrfBulletCP)//For i120928,record the cp info of graphic within bullet
+SwNumFormat::SwNumFormat( const SwNumFormat& rFormat) :
+    SvxNumberFormat(rFormat),
+    SwClient( rFormat.GetRegisteredInNonConst() ),
+    pVertOrient(new SwFormatVertOrient( 0, rFormat.GetVertOrient()))
+    ,cGrfBulletCP(rFormat.cGrfBulletCP)//For i120928,record the cp info of graphic within bullet
 {
-    sal_Int16 eMyVertOrient = rFmt.GetVertOrient();
-    SetGraphicBrush( rFmt.GetBrush(), &rFmt.GetGraphicSize(),
+    sal_Int16 eMyVertOrient = rFormat.GetVertOrient();
+    SetGraphicBrush( rFormat.GetBrush(), &rFormat.GetGraphicSize(),
                                                 &eMyVertOrient);
 }
 
-SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc)
-    : SvxNumberFormat(rNumFmt)
-    , pVertOrient(new SwFmtVertOrient( 0, rNumFmt.GetVertOrient()))
+SwNumFormat::SwNumFormat(const SvxNumberFormat& rNumFormat, SwDoc* pDoc)
+    : SvxNumberFormat(rNumFormat)
+    , pVertOrient(new SwFormatVertOrient( 0, rNumFormat.GetVertOrient()))
     , cGrfBulletCP(USHRT_MAX)
 {
-    sal_Int16 eMyVertOrient = rNumFmt.GetVertOrient();
-    SetGraphicBrush( rNumFmt.GetBrush(), &rNumFmt.GetGraphicSize(),
+    sal_Int16 eMyVertOrient = rNumFormat.GetVertOrient();
+    SetGraphicBrush( rNumFormat.GetBrush(), &rNumFormat.GetGraphicSize(),
                                                 &eMyVertOrient);
-    const OUString rCharStyleName = rNumFmt.SvxNumberFormat::GetCharFmtName();
+    const OUString rCharStyleName = rNumFormat.SvxNumberFormat::GetCharFormatName();
     if( !rCharStyleName.isEmpty() )
     {
-        SwCharFmt* pCFmt = pDoc->FindCharFmtByName( rCharStyleName );
-        if( !pCFmt )
+        SwCharFormat* pCFormat = pDoc->FindCharFormatByName( rCharStyleName );
+        if( !pCFormat )
         {
             sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rCharStyleName,
                                             nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
-            pCFmt = nId != USHRT_MAX
-                        ? pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( nId )
-                        : pDoc->MakeCharFmt( rCharStyleName, 0 );
+            pCFormat = nId != USHRT_MAX
+                        ? pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( nId )
+                        : pDoc->MakeCharFormat( rCharStyleName, 0 );
         }
-        pCFmt->Add( this );
+        pCFormat->Add( this );
     }
     else if( GetRegisteredIn() )
         GetRegisteredInNonConst()->Remove( this );
 }
 
-SwNumFmt::~SwNumFmt()
+SwNumFormat::~SwNumFormat()
 {
     delete pVertOrient;
 }
 
-void SwNumFmt::NotifyGraphicArrived()
+void SwNumFormat::NotifyGraphicArrived()
 {
-    if( GetCharFmt() )
-        UpdateNumNodes( GetCharFmt()->GetDoc() );
+    if( GetCharFormat() )
+        UpdateNumNodes( GetCharFormat()->GetDoc() );
 }
 
 // #i22362#
-bool SwNumFmt::IsEnumeration() const
+bool SwNumFormat::IsEnumeration() const
 {
     // #i30655# native numbering did not work any longer
     // using this code. Therefore HBRINKM and I agreed upon defining
@@ -239,7 +239,7 @@ bool SwNumFmt::IsEnumeration() const
     return !IsItemize();
 }
 
-bool SwNumFmt::IsItemize() const
+bool SwNumFormat::IsItemize() const
 {
     bool bResult;
 
@@ -259,67 +259,67 @@ bool SwNumFmt::IsItemize() const
 
 }
 
-SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
+SwNumFormat& SwNumFormat::operator=( const SwNumFormat& rNumFormat)
 {
-    SvxNumberFormat::operator=(rNumFmt);
-    if( rNumFmt.GetRegisteredIn() )
-        rNumFmt.GetRegisteredInNonConst()->Add( this );
+    SvxNumberFormat::operator=(rNumFormat);
+    if( rNumFormat.GetRegisteredIn() )
+        rNumFormat.GetRegisteredInNonConst()->Add( this );
     else if( GetRegisteredIn() )
         GetRegisteredInNonConst()->Remove( this );
     //For i120928,record the cp info of graphic within bullet
-    cGrfBulletCP = rNumFmt.cGrfBulletCP;
+    cGrfBulletCP = rNumFormat.cGrfBulletCP;
     return *this;
 }
 
-bool SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
+bool SwNumFormat::operator==( const SwNumFormat& rNumFormat) const
 {
-    bool bRet = SvxNumberFormat::operator==(rNumFmt) &&
-        GetRegisteredIn() == rNumFmt.GetRegisteredIn();
+    bool bRet = SvxNumberFormat::operator==(rNumFormat) &&
+        GetRegisteredIn() == rNumFormat.GetRegisteredIn();
     return bRet;
 }
 
-void SwNumFmt::SetCharFmt( SwCharFmt* pChFmt)
+void SwNumFormat::SetCharFormat( SwCharFormat* pChFormat)
 {
-    if( pChFmt )
-        pChFmt->Add( this );
+    if( pChFormat )
+        pChFormat->Add( this );
     else if( GetRegisteredIn() )
         GetRegisteredInNonConst()->Remove( this );
 }
 
-void SwNumFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwNumFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     // Look for the NumRules object in the Doc where this NumFormat is set.
     // The format does not need to exist!
-    const SwCharFmt* pFmt = 0;
+    const SwCharFormat* pFormat = 0;
     sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
     switch( nWhich )
     {
     case RES_ATTRSET_CHG:
     case RES_FMT_CHG:
-        pFmt = GetCharFmt();
+        pFormat = GetCharFormat();
         break;
     }
 
-    if( pFmt && !pFmt->GetDoc()->IsInDtor() )
-        UpdateNumNodes( const_cast<SwDoc*>(pFmt->GetDoc()) );
+    if( pFormat && !pFormat->GetDoc()->IsInDtor() )
+        UpdateNumNodes( const_cast<SwDoc*>(pFormat->GetDoc()) );
     else
         CheckRegistration( pOld, pNew );
 }
 
-void SwNumFmt::SetCharFmtName(const OUString& rSet)
+void SwNumFormat::SetCharFormatName(const OUString& rSet)
 {
-    SvxNumberFormat::SetCharFmtName(rSet);
+    SvxNumberFormat::SetCharFormatName(rSet);
 }
 
-OUString SwNumFmt::GetCharFmtName() const
+OUString SwNumFormat::GetCharFormatName() const
 {
-    if(static_cast<const SwCharFmt*>(GetRegisteredIn()))
-        return static_cast<const SwCharFmt*>(GetRegisteredIn())->GetName();
+    if(static_cast<const SwCharFormat*>(GetRegisteredIn()))
+        return static_cast<const SwCharFormat*>(GetRegisteredIn())->GetName();
 
     return OUString();
 }
 
-void    SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
+void    SwNumFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
     const sal_Int16* pOrient)
 {
     if(pOrient)
@@ -327,30 +327,30 @@ void    SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* p
     SvxNumberFormat::SetGraphicBrush( pBrushItem, pSize, pOrient);
 }
 
-void    SwNumFmt::SetVertOrient(sal_Int16 eSet)
+void    SwNumFormat::SetVertOrient(sal_Int16 eSet)
 {
     SvxNumberFormat::SetVertOrient(eSet);
 }
 
-sal_Int16   SwNumFmt::GetVertOrient() const
+sal_Int16   SwNumFormat::GetVertOrient() const
 {
     return SvxNumberFormat::GetVertOrient();
 }
 
-void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
+void SwNumFormat::UpdateNumNodes( SwDoc* pDoc )
 {
     bool bDocIsModified = pDoc->getIDocumentState().IsModified();
     bool bFnd = false;
-    for( SwNumRuleTbl::size_type n = pDoc->GetNumRuleTbl().size(); !bFnd && n; )
+    for( SwNumRuleTable::size_type n = pDoc->GetNumRuleTable().size(); !bFnd && n; )
     {
-        const SwNumRule* pRule = pDoc->GetNumRuleTbl()[ --n ];
+        const SwNumRule* pRule = pDoc->GetNumRuleTable()[ --n ];
         for( sal_uInt8 i = 0; i < MAXLEVEL; ++i )
-            if( pRule->GetNumFmt( i ) == this )
+            if( pRule->GetNumFormat( i ) == this )
             {
-                SwNumRule::tTxtNodeList aTxtNodeList;
-                pRule->GetTxtNodeList( aTxtNodeList );
-                for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
-                      aIter != aTxtNodeList.end(); ++aIter )
+                SwNumRule::tTextNodeList aTextNodeList;
+                pRule->GetTextNodeList( aTextNodeList );
+                for ( SwNumRule::tTextNodeList::iterator aIter = aTextNodeList.begin();
+                      aIter != aTextNodeList.end(); ++aIter )
                 {
                     lcl_SetRuleChgd( *(*aIter), i );
                 }
@@ -363,7 +363,7 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
         pDoc->getIDocumentState().ResetModified();
 }
 
-const SwFmtVertOrient*      SwNumFmt::GetGraphicOrientation() const
+const SwFormatVertOrient*      SwNumFormat::GetGraphicOrientation() const
 {
     sal_Int16  eOrient = SvxNumberFormat::GetVertOrient();
     if(text::VertOrientation::NONE == eOrient)
@@ -379,12 +379,12 @@ SwNumRule::SwNumRule( const OUString& rNm,
                       const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode,
                       SwNumRuleType eType,
                       bool bAutoFlg )
-  : maTxtNodeList(),
+  : maTextNodeList(),
     maParagraphStyleList(),
     mpNumRuleMap(0),
     msName( rNm ),
     meRuleType( eType ),
-    mnPoolFmtId( USHRT_MAX ),
+    mnPoolFormatId( USHRT_MAX ),
     mnPoolHelpId( USHRT_MAX ),
     mnPoolHlpFileId( UCHAR_MAX ),
     mbAutoRuleFlag( bAutoFlg ),
@@ -398,21 +398,21 @@ SwNumRule::SwNumRule( const OUString& rNm,
 {
     if( !mnRefCount++ )          // for the first time, initialize
     {
-        SwNumFmt* pFmt;
+        SwNumFormat* pFormat;
         sal_uInt8 n;
 
         // numbering:
         // position-and-space mode LABEL_WIDTH_AND_POSITION:
         for( n = 0; n < MAXLEVEL; ++n )
         {
-            pFmt = new SwNumFmt;
-            pFmt->SetIncludeUpperLevels( 1 );
-            pFmt->SetStart( 1 );
-            pFmt->SetAbsLSpace( lNumIndent + SwNumRule::GetNumIndent( n ) );
-            pFmt->SetFirstLineOffset( lNumFirstLineOffset );
-            pFmt->SetSuffix( "." );
-            pFmt->SetBulletChar( numfunc::GetBulletChar(n));
-            SwNumRule::maBaseFmts[ NUM_RULE ][ n ] = pFmt;
+            pFormat = new SwNumFormat;
+            pFormat->SetIncludeUpperLevels( 1 );
+            pFormat->SetStart( 1 );
+            pFormat->SetAbsLSpace( lNumIndent + SwNumRule::GetNumIndent( n ) );
+            pFormat->SetFirstLineOffset( lNumFirstLineOffset );
+            pFormat->SetSuffix( "." );
+            pFormat->SetBulletChar( numfunc::GetBulletChar(n));
+            SwNumRule::maBaseFormats[ NUM_RULE ][ n ] = pFormat;
         }
         // position-and-space mode LABEL_ALIGNMENT
         // first line indent of general numbering in inch: -0,25 inch
@@ -425,30 +425,30 @@ SwNumRule::SwNumRule( const OUString& rNm,
             1440*7/4,   1440*2,     1440*9/4,   1440*5/2,   1440*11/4 };
         for( n = 0; n < MAXLEVEL; ++n )
         {
-            pFmt = new SwNumFmt;
-            pFmt->SetIncludeUpperLevels( 1 );
-            pFmt->SetStart( 1 );
-            pFmt->SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
-            pFmt->SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-            pFmt->SetListtabPos( cIndentAt[ n ] );
-            pFmt->SetFirstLineIndent( cFirstLineIndent );
-            pFmt->SetIndentAt( cIndentAt[ n ] );
-            pFmt->SetSuffix( "." );
-            pFmt->SetBulletChar( numfunc::GetBulletChar(n));
-            SwNumRule::maLabelAlignmentBaseFmts[ NUM_RULE ][ n ] = pFmt;
+            pFormat = new SwNumFormat;
+            pFormat->SetIncludeUpperLevels( 1 );
+            pFormat->SetStart( 1 );
+            pFormat->SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
+            pFormat->SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+            pFormat->SetListtabPos( cIndentAt[ n ] );
+            pFormat->SetFirstLineIndent( cFirstLineIndent );
+            pFormat->SetIndentAt( cIndentAt[ n ] );
+            pFormat->SetSuffix( "." );
+            pFormat->SetBulletChar( numfunc::GetBulletChar(n));
+            SwNumRule::maLabelAlignmentBaseFormats[ NUM_RULE ][ n ] = pFormat;
         }
 
         // outline:
         // position-and-space mode LABEL_WIDTH_AND_POSITION:
         for( n = 0; n < MAXLEVEL; ++n )
         {
-            pFmt = new SwNumFmt;
-            pFmt->SetNumberingType(SVX_NUM_NUMBER_NONE);
-            pFmt->SetIncludeUpperLevels( MAXLEVEL );
-            pFmt->SetStart( 1 );
-            pFmt->SetCharTextDistance( lOutlineMinTextDistance );
-            pFmt->SetBulletChar( numfunc::GetBulletChar(n));
-            SwNumRule::maBaseFmts[ OUTLINE_RULE ][ n ] = pFmt;
+            pFormat = new SwNumFormat;
+            pFormat->SetNumberingType(SVX_NUM_NUMBER_NONE);
+            pFormat->SetIncludeUpperLevels( MAXLEVEL );
+            pFormat->SetStart( 1 );
+            pFormat->SetCharTextDistance( lOutlineMinTextDistance );
+            pFormat->SetBulletChar( numfunc::GetBulletChar(n));
+            SwNumRule::maBaseFormats[ OUTLINE_RULE ][ n ] = pFormat;
         }
         // position-and-space mode LABEL_ALIGNMENT:
         // indent values of default outline numbering in inch:
@@ -459,30 +459,30 @@ SwNumRule::SwNumRule( const OUString& rNm,
             1440*4/5,   1440*9/10,  1440,       1440*11/10, 1440*6/5 };
         for( n = 0; n < MAXLEVEL; ++n )
         {
-            pFmt = new SwNumFmt;
-            pFmt->SetNumberingType(SVX_NUM_NUMBER_NONE);
-            pFmt->SetIncludeUpperLevels( MAXLEVEL );
-            pFmt->SetStart( 1 );
-            pFmt->SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
-            pFmt->SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
-            pFmt->SetListtabPos( cOutlineIndentAt[ n ] );
-            pFmt->SetFirstLineIndent( -cOutlineIndentAt[ n ] );
-            pFmt->SetIndentAt( cOutlineIndentAt[ n ] );
-            pFmt->SetBulletChar( numfunc::GetBulletChar(n));
-            SwNumRule::maLabelAlignmentBaseFmts[ OUTLINE_RULE ][ n ] = pFmt;
+            pFormat = new SwNumFormat;
+            pFormat->SetNumberingType(SVX_NUM_NUMBER_NONE);
+            pFormat->SetIncludeUpperLevels( MAXLEVEL );
+            pFormat->SetStart( 1 );
+            pFormat->SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
+            pFormat->SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+            pFormat->SetListtabPos( cOutlineIndentAt[ n ] );
+            pFormat->SetFirstLineIndent( -cOutlineIndentAt[ n ] );
+            pFormat->SetIndentAt( cOutlineIndentAt[ n ] );
+            pFormat->SetBulletChar( numfunc::GetBulletChar(n));
+            SwNumRule::maLabelAlignmentBaseFormats[ OUTLINE_RULE ][ n ] = pFormat;
         }
     }
-    memset( maFmts, 0, sizeof( maFmts ));
+    memset( maFormats, 0, sizeof( maFormats ));
     OSL_ENSURE( !msName.isEmpty(), "NumRule without a name!" );
 }
 
 SwNumRule::SwNumRule( const SwNumRule& rNumRule )
-    : maTxtNodeList(),
+    : maTextNodeList(),
       maParagraphStyleList(),
       mpNumRuleMap(0),
       msName( rNumRule.msName ),
       meRuleType( rNumRule.meRuleType ),
-      mnPoolFmtId( rNumRule.GetPoolFmtId() ),
+      mnPoolFormatId( rNumRule.GetPoolFormatId() ),
       mnPoolHelpId( rNumRule.GetPoolHelpId() ),
       mnPoolHlpFileId( rNumRule.GetPoolHlpFileId() ),
       mbAutoRuleFlag( rNumRule.mbAutoRuleFlag ),
@@ -495,16 +495,16 @@ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
       msDefaultListId( rNumRule.msDefaultListId )
 {
     ++mnRefCount;
-    memset( maFmts, 0, sizeof( maFmts ));
+    memset( maFormats, 0, sizeof( maFormats ));
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
-        if( rNumRule.maFmts[ n ] )
-            Set( n, *rNumRule.maFmts[ n ] );
+        if( rNumRule.maFormats[ n ] )
+            Set( n, *rNumRule.maFormats[ n ] );
 }
 
 SwNumRule::~SwNumRule()
 {
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
-        delete maFmts[ n ];
+        delete maFormats[ n ];
 
     if (mpNumRuleMap)
     {
@@ -514,40 +514,40 @@ SwNumRule::~SwNumRule()
     if( !--mnRefCount )          // the last one closes the door (?)
     {
             // Numbering:
-            SwNumFmt** ppFmts = &SwNumRule::maBaseFmts[0][0];
+            SwNumFormat** ppFormats = &SwNumRule::maBaseFormats[0][0];
             int n;
 
-            for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
-                delete *ppFmts, *ppFmts = 0;
+            for( n = 0; n < MAXLEVEL; ++n, ++ppFormats )
+                delete *ppFormats, *ppFormats = 0;
 
             // Outline:
-            for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
-                delete *ppFmts, *ppFmts = 0;
-
-            ppFmts = &SwNumRule::maLabelAlignmentBaseFmts[0][0];
-            for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
-                delete *ppFmts, *ppFmts = 0;
-            for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
-                delete *ppFmts, *ppFmts = 0;
+            for( n = 0; n < MAXLEVEL; ++n, ++ppFormats )
+                delete *ppFormats, *ppFormats = 0;
+
+            ppFormats = &SwNumRule::maLabelAlignmentBaseFormats[0][0];
+            for( n = 0; n < MAXLEVEL; ++n, ++ppFormats )
+                delete *ppFormats, *ppFormats = 0;
+            for( n = 0; n < MAXLEVEL; ++n, ++ppFormats )
+                delete *ppFormats, *ppFormats = 0;
     }
 
-    maTxtNodeList.clear();
+    maTextNodeList.clear();
     maParagraphStyleList.clear();
 }
 
-void SwNumRule::CheckCharFmts( SwDoc* pDoc )
+void SwNumRule::CheckCharFormats( SwDoc* pDoc )
 {
     for( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
     {
-        SwCharFmt* pFmt;
-        if( maFmts[ n ] && 0 != ( pFmt = maFmts[ n ]->GetCharFmt() ) &&
-            pFmt->GetDoc() != pDoc )
+        SwCharFormat* pFormat;
+        if( maFormats[ n ] && 0 != ( pFormat = maFormats[ n ]->GetCharFormat() ) &&
+            pFormat->GetDoc() != pDoc )
         {
             // copy
-            SwNumFmt* pNew = new SwNumFmt( *maFmts[ n ] );
-            pNew->SetCharFmt( pDoc->CopyCharFmt( *pFmt ) );
-            delete maFmts[ n ];
-            maFmts[ n ] = pNew;
+            SwNumFormat* pNew = new SwNumFormat( *maFormats[ n ] );
+            pNew->SetCharFormat( pDoc->CopyCharFormat( *pFormat ) );
+            delete maFormats[ n ];
+            maFormats[ n ] = pNew;
         }
     }
 }
@@ -557,7 +557,7 @@ SwNumRule& SwNumRule::operator=( const SwNumRule& rNumRule )
     if( this != &rNumRule )
     {
         for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
-            Set( n, rNumRule.maFmts[ n ] );
+            Set( n, rNumRule.maFormats[ n ] );
 
         meRuleType = rNumRule.meRuleType;
         msName = rNumRule.msName;
@@ -566,7 +566,7 @@ SwNumRule& SwNumRule::operator=( const SwNumRule& rNumRule )
         mbContinusNum = rNumRule.mbContinusNum;
         mbAbsSpaces = rNumRule.mbAbsSpaces;
         mbHidden = rNumRule.mbHidden;
-        mnPoolFmtId = rNumRule.GetPoolFmtId();
+        mnPoolFormatId = rNumRule.GetPoolFormatId();
         mnPoolHelpId = rNumRule.GetPoolHelpId();
         mnPoolHlpFileId = rNumRule.GetPoolHlpFileId();
     }
@@ -580,7 +580,7 @@ bool SwNumRule::operator==( const SwNumRule& rRule ) const
                 mbAutoRuleFlag == rRule.mbAutoRuleFlag &&
                 mbContinusNum == rRule.mbContinusNum &&
                 mbAbsSpaces == rRule.mbAbsSpaces &&
-                mnPoolFmtId == rRule.GetPoolFmtId() &&
+                mnPoolFormatId == rRule.GetPoolFormatId() &&
                 mnPoolHelpId == rRule.GetPoolHelpId() &&
                 mnPoolHlpFileId == rRule.GetPoolHlpFileId();
     if( bRet )
@@ -595,38 +595,38 @@ bool SwNumRule::operator==( const SwNumRule& rRule ) const
     return bRet;
 }
 
-void SwNumRule::Set( sal_uInt16 i, const SwNumFmt& rNumFmt )
+void SwNumRule::Set( sal_uInt16 i, const SwNumFormat& rNumFormat )
 {
     OSL_ENSURE( i < MAXLEVEL, "Serious defect, please inform OD" );
     if( i < MAXLEVEL )
     {
-        if( !maFmts[ i ] || !(rNumFmt == Get( i )) )
+        if( !maFormats[ i ] || !(rNumFormat == Get( i )) )
         {
-            delete maFmts[ i ];
-            maFmts[ i ] = new SwNumFmt( rNumFmt );
+            delete maFormats[ i ];
+            maFormats[ i ] = new SwNumFormat( rNumFormat );
             mbInvalidRuleFlag = true;
         }
     }
 }
 
-void SwNumRule::Set( sal_uInt16 i, const SwNumFmt* pNumFmt )
+void SwNumRule::Set( sal_uInt16 i, const SwNumFormat* pNumFormat )
 {
     OSL_ENSURE( i < MAXLEVEL, "Serious defect, please inform OD" );
     if( i >= MAXLEVEL )
         return;
-    SwNumFmt* pOld = maFmts[ i ];
+    SwNumFormat* pOld = maFormats[ i ];
     if( !pOld )
     {
-        if( pNumFmt )
+        if( pNumFormat )
         {
-            maFmts[ i ] = new SwNumFmt( *pNumFmt );
+            maFormats[ i ] = new SwNumFormat( *pNumFormat );
             mbInvalidRuleFlag = true;
         }
     }
-    else if( !pNumFmt )
-        delete pOld, maFmts[ i ] = 0, mbInvalidRuleFlag = true;
-    else if( *pOld != *pNumFmt )
-        *pOld = *pNumFmt, mbInvalidRuleFlag = true;
+    else if( !pNumFormat )
+        delete pOld, maFormats[ i ] = 0, mbInvalidRuleFlag = true;
+    else if( *pOld != *pNumFormat )
+        *pOld = *pNumFormat, mbInvalidRuleFlag = true;
 }
 
 OUString SwNumRule::MakeNumString( const SwNodeNum& rNum, bool bInclStrings,
@@ -659,17 +659,17 @@ OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVecto
 
     if (nLevel < MAXLEVEL)
     {
-        const SwNumFmt& rMyNFmt = Get( static_cast<sal_uInt16>(nLevel) );
+        const SwNumFormat& rMyNFormat = Get( static_cast<sal_uInt16>(nLevel) );
 
         {
             sal_uInt8 i = static_cast<sal_uInt8>(nLevel);
 
             if( !IsContinusNum() &&
                 // - do not include upper levels, if level isn't numbered.
-                rMyNFmt.GetNumberingType() != SVX_NUM_NUMBER_NONE &&
-                rMyNFmt.GetIncludeUpperLevels() )  // Just the own level?
+                rMyNFormat.GetNumberingType() != SVX_NUM_NUMBER_NONE &&
+                rMyNFormat.GetIncludeUpperLevels() )  // Just the own level?
             {
-                sal_uInt8 n = rMyNFmt.GetIncludeUpperLevels();
+                sal_uInt8 n = rMyNFormat.GetIncludeUpperLevels();
                 if( 1 < n )
                 {
                     if( i+1 >= n )
@@ -681,8 +681,8 @@ OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVecto
 
             for( ; i <= nLevel; ++i )
             {
-                const SwNumFmt& rNFmt = Get( i );
-                if( SVX_NUM_NUMBER_NONE == rNFmt.GetNumberingType() )
+                const SwNumFormat& rNFormat = Get( i );
+                if( SVX_NUM_NUMBER_NONE == rNFormat.GetNumberingType() )
                 {
                     // Should 1.1.1 --> 2. NoNum --> 1..1 or 1.1 ??
                     //                 if( i != rNum.nMyLevel )
@@ -695,7 +695,7 @@ OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVecto
                     if( bOnlyArabic )
                         aStr += OUString::number( rNumVector[ i ] );
                     else
-                        aStr += rNFmt.GetNumStr( rNumVector[ i ] );
+                        aStr += rNFormat.GetNumStr( rNumVector[ i ] );
                 }
                 else
                     aStr += "0";        // all 0 level are a 0
@@ -706,11 +706,11 @@ OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVecto
             // The type doesn't have any number, so don't append
             // the post-/prefix string
             if( bInclStrings && !bOnlyArabic &&
-                SVX_NUM_CHAR_SPECIAL != rMyNFmt.GetNumberingType() &&
-                SVX_NUM_BITMAP != rMyNFmt.GetNumberingType() )
+                SVX_NUM_CHAR_SPECIAL != rMyNFormat.GetNumberingType() &&
+                SVX_NUM_BITMAP != rMyNFormat.GetNumberingType() )
             {
-                const OUString sPrefix = rMyNFmt.GetPrefix();
-                const OUString sSuffix = rMyNFmt.GetSuffix();
+                const OUString sPrefix = rMyNFormat.GetPrefix();
+                const OUString sSuffix = rMyNFormat.GetSuffix();
 
                 aStr = sPrefix + aStr + sSuffix;
                 if ( pExtremities )
@@ -749,15 +749,15 @@ OUString SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
                 if (nListLevel >= MAXLEVEL)
                     nListLevel = MAXLEVEL - 1;
 
-                SwNumFmt aFmt( Get( static_cast<sal_uInt16>(nListLevel) ) );
-                bMakeNumStringForPhantom = aFmt.IsEnumeration() &&
-                                           SVX_NUM_NUMBER_NONE != aFmt.GetNumberingType();
+                SwNumFormat aFormat( Get( static_cast<sal_uInt16>(nListLevel) ) );
+                bMakeNumStringForPhantom = aFormat.IsEnumeration() &&
+                                           SVX_NUM_NUMBER_NONE != aFormat.GetNumberingType();
 
             }
             if ( bMakeNumStringForPhantom ||
                  ( !pWorkingNodeNum->IsPhantom() &&
-                   pWorkingNodeNum->GetTxtNode() &&
-                   pWorkingNodeNum->GetTxtNode()->HasNumber() ) )
+                   pWorkingNodeNum->GetTextNode() &&
+                   pWorkingNodeNum->GetTextNode()->HasNumber() ) )
             {
                 Extremities aExtremities;
                 OUString aPrevStr = MakeNumString( pWorkingNodeNum->GetNumberVector(),
@@ -824,18 +824,18 @@ SwNumRule& SwNumRule::CopyNumRule( SwDoc* pDoc, const SwNumRule& rNumRule )
 {
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
-        Set( n, rNumRule.maFmts[ n ] );
-        if( maFmts[ n ] && maFmts[ n ]->GetCharFmt() &&
-            !pDoc->GetCharFmts()->Contains( maFmts[n]->GetCharFmt() ))
+        Set( n, rNumRule.maFormats[ n ] );
+        if( maFormats[ n ] && maFormats[ n ]->GetCharFormat() &&
+            !pDoc->GetCharFormats()->Contains( maFormats[n]->GetCharFormat() ))
             // If we copy across different Documents, then copy the
             // corresponding CharFormat into the new Document.
-            maFmts[n]->SetCharFmt( pDoc->CopyCharFmt( *maFmts[n]->
-                                        GetCharFmt() ) );
+            maFormats[n]->SetCharFormat( pDoc->CopyCharFormat( *maFormats[n]->
+                                        GetCharFormat() ) );
     }
     meRuleType = rNumRule.meRuleType;
     msName = rNumRule.msName;
     mbAutoRuleFlag = rNumRule.mbAutoRuleFlag;
-    mnPoolFmtId = rNumRule.GetPoolFmtId();
+    mnPoolFormatId = rNumRule.GetPoolFormatId();
     mnPoolHelpId = rNumRule.GetPoolHelpId();
     mnPoolHlpFileId = rNumRule.GetPoolHlpFileId();
     mbInvalidRuleFlag = true;
@@ -846,9 +846,9 @@ void SwNumRule::SetSvxRule(const SvxNumRule& rNumRule, SwDoc* pDoc)
 {
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
-        const SvxNumberFormat* pSvxFmt = rNumRule.Get(n);
-        delete maFmts[n];
-        maFmts[n] = pSvxFmt ? new SwNumFmt(*pSvxFmt, pDoc) : 0;
+        const SvxNumberFormat* pSvxFormat = rNumRule.Get(n);
+        delete maFormats[n];
+        maFormats[n] = pSvxFormat ? new SwNumFormat(*pSvxFormat, pDoc) : 0;
     }
 
     mbInvalidRuleFlag = true;
@@ -863,10 +863,10 @@ SvxNumRule SwNumRule::MakeSvxNumRule() const
                      meRuleType == NUM_RULE ? SvxNumRuleType::NUMBERING : SvxNumRuleType::OUTLINE_NUMBERING );
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
-        SwNumFmt aNumFmt = Get(n);
-        if(aNumFmt.GetCharFmt())
-            aNumFmt.SetCharFmtName(aNumFmt.GetCharFmt()->GetName());
-        aRule.SetLevel(n, aNumFmt, maFmts[n] != 0);
+        SwNumFormat aNumFormat = Get(n);
+        if(aNumFormat.GetCharFormat())
+            aNumFormat.SetCharFormatName(aNumFormat.GetCharFormat()->GetName());
+        aRule.SetLevel(n, aNumFormat, maFormats[n] != 0);
     }
     return aRule;
 }
@@ -876,12 +876,12 @@ void SwNumRule::SetInvalidRule(bool bFlag)
     if (bFlag)
     {
         std::set< SwList* > aLists;
-        tTxtNodeList::iterator aIter;
-        for ( aIter = maTxtNodeList.begin(); aIter != maTxtNodeList.end(); ++aIter )
+        tTextNodeList::iterator aIter;
+        for ( aIter = maTextNodeList.begin(); aIter != maTextNodeList.end(); ++aIter )
         {
-            const SwTxtNode* pTxtNode = *aIter;
+            const SwTextNode* pTextNode = *aIter;
             // #i111681# - applying patch from cmc
-            SwList* pList = pTxtNode->GetDoc()->getIDocumentListsAccess().getListByName( pTxtNode->GetListId() );
+            SwList* pList = pTextNode->GetDoc()->getIDocumentListsAccess().getListByName( pTextNode->GetListId() );
             OSL_ENSURE( pList, "<SwNumRule::SetInvalidRule(..)> - list at which the text node is registered at does not exist. This is a serious issue --> please inform OD.");
             if ( pList )
             {
@@ -900,35 +900,35 @@ void SwNumRule::ChangeIndent( const short nDiff )
 {
     for ( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
     {
-        SwNumFmt aTmpNumFmt( Get(i) );
+        SwNumFormat aTmpNumFormat( Get(i) );
 
         const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode(
-                                        aTmpNumFmt.GetPositionAndSpaceMode() );
+                                        aTmpNumFormat.GetPositionAndSpaceMode() );
         if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
         {
             short nNewIndent = nDiff +
-                               aTmpNumFmt.GetAbsLSpace();
+                               aTmpNumFormat.GetAbsLSpace();
             if ( nNewIndent < 0 )
             {
                 nNewIndent = 0;
             }
-            aTmpNumFmt.SetAbsLSpace( nNewIndent );
+            aTmpNumFormat.SetAbsLSpace( nNewIndent );
         }
         else if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
         {
             // adjust also the list tab position, if a list tab stop is applied
-            if ( aTmpNumFmt.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
+            if ( aTmpNumFormat.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
             {
-                const long nNewListTab = aTmpNumFmt.GetListtabPos() +  nDiff;
-                aTmpNumFmt.SetListtabPos( nNewListTab );
+                const long nNewListTab = aTmpNumFormat.GetListtabPos() +  nDiff;
+                aTmpNumFormat.SetListtabPos( nNewListTab );
             }
 
             const long nNewIndent = nDiff +
-                              aTmpNumFmt.GetIndentAt();
-            aTmpNumFmt.SetIndentAt( nNewIndent );
+                              aTmpNumFormat.GetIndentAt();
+            aTmpNumFormat.SetIndentAt( nNewIndent );
         }
 
-        Set( i, aTmpNumFmt );
+        Set( i, aTmpNumFormat );
     }
 
     SetInvalidRule( true );
@@ -938,25 +938,25 @@ void SwNumRule::ChangeIndent( const short nDiff )
 void SwNumRule::SetIndent( const short nNewIndent,
                            const sal_uInt16 nListLevel )
 {
-    SwNumFmt aTmpNumFmt( Get(nListLevel) );
+    SwNumFormat aTmpNumFormat( Get(nListLevel) );
 
     const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode(
-                                        aTmpNumFmt.GetPositionAndSpaceMode() );
+                                        aTmpNumFormat.GetPositionAndSpaceMode() );
     if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
-        aTmpNumFmt.SetAbsLSpace( nNewIndent );
+        aTmpNumFormat.SetAbsLSpace( nNewIndent );
     }
     else if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
     {
         // adjust also the list tab position, if a list tab stop is applied
-        if ( aTmpNumFmt.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
+        if ( aTmpNumFormat.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
         {
-            const long nNewListTab = aTmpNumFmt.GetListtabPos() +
-                                     ( nNewIndent - aTmpNumFmt.GetIndentAt() );
-            aTmpNumFmt.SetListtabPos( nNewListTab );
+            const long nNewListTab = aTmpNumFormat.GetListtabPos() +
+                                     ( nNewIndent - aTmpNumFormat.GetIndentAt() );
+            aTmpNumFormat.SetListtabPos( nNewListTab );
         }
 
-        aTmpNumFmt.SetIndentAt( nNewIndent );
+        aTmpNumFormat.SetIndentAt( nNewIndent );
     }
 
     SetInvalidRule( true );
@@ -966,21 +966,21 @@ void SwNumRule::SetIndent( const short nNewIndent,
 /// indents accordingly
 void SwNumRule::SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent )
 {
-    SwNumFmt aTmpNumFmt( Get(0) );
+    SwNumFormat aTmpNumFormat( Get(0) );
 
     short nDiff( 0 );
     const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode(
-                                        aTmpNumFmt.GetPositionAndSpaceMode() );
+                                        aTmpNumFormat.GetPositionAndSpaceMode() );
     if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
         nDiff = nNewIndent
-                - aTmpNumFmt.GetFirstLineOffset()
-                - aTmpNumFmt.GetAbsLSpace();
+                - aTmpNumFormat.GetFirstLineOffset()
+                - aTmpNumFormat.GetAbsLSpace();
     }
     else if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
     {
         nDiff = static_cast<short>(nNewIndent
-                                   - aTmpNumFmt.GetIndentAt());
+                                   - aTmpNumFormat.GetIndentAt());
     }
     if ( nDiff != 0  )
     {
@@ -991,11 +991,11 @@ void SwNumRule::SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent
 void SwNumRule::Validate()
 {
     std::set< SwList* > aLists;
-    tTxtNodeList::iterator aIter;
-    for ( aIter = maTxtNodeList.begin(); aIter != maTxtNodeList.end(); ++aIter )
+    tTextNodeList::iterator aIter;
+    for ( aIter = maTextNodeList.begin(); aIter != maTextNodeList.end(); ++aIter )
     {
-        const SwTxtNode* pTxtNode = *aIter;
-        aLists.insert( pTxtNode->GetDoc()->getIDocumentListsAccess().getListByName( pTxtNode->GetListId() ) );
+        const SwTextNode* pTextNode = *aIter;
+        aLists.insert( pTextNode->GetDoc()->getIDocumentListsAccess().getListByName( pTextNode->GetListId() ) );
     }
     std::for_each( aLists.begin(), aLists.end(),
                    std::mem_fun( &SwList::ValidateListTree ) );
@@ -1013,21 +1013,21 @@ SwNumRule::tParagraphStyleList::size_type SwNumRule::GetParagraphStyleListSize()
     return maParagraphStyleList.size();
 }
 
-void SwNumRule::AddParagraphStyle( SwTxtFmtColl& rTxtFmtColl )
+void SwNumRule::AddParagraphStyle( SwTextFormatColl& rTextFormatColl )
 {
     tParagraphStyleList::iterator aIter =
-        std::find( maParagraphStyleList.begin(), maParagraphStyleList.end(), &rTxtFmtColl );
+        std::find( maParagraphStyleList.begin(), maParagraphStyleList.end(), &rTextFormatColl );
 
     if ( aIter == maParagraphStyleList.end() )
     {
-        maParagraphStyleList.push_back( &rTxtFmtColl );
+        maParagraphStyleList.push_back( &rTextFormatColl );
     }
 }
 
-void SwNumRule::RemoveParagraphStyle( SwTxtFmtColl& rTxtFmtColl )
+void SwNumRule::RemoveParagraphStyle( SwTextFormatColl& rTextFormatColl )
 {
     tParagraphStyleList::iterator aIter =
-        std::find( maParagraphStyleList.begin(), maParagraphStyleList.end(), &rTxtFmtColl );
+        std::find( maParagraphStyleList.begin(), maParagraphStyleList.end(), &rTextFormatColl );
 
     if ( aIter != maParagraphStyleList.end() )
     {
@@ -1039,7 +1039,7 @@ void SwNumRule::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("swNumRule"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("msName"), BAD_CAST(msName.toUtf8().getStr()));
-    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("mnPoolFmtId"), BAD_CAST(OString::number(mnPoolFmtId).getStr()));
+    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("mnPoolFormatId"), BAD_CAST(OString::number(mnPoolFormatId).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("mbAutoRuleFlag"), BAD_CAST(OString::boolean(mbAutoRuleFlag).getStr()));
     xmlTextWriterEndElement(pWriter);
 }
@@ -1438,9 +1438,9 @@ namespace numfunc
     }
 }
 
-void SwNumRuleTbl::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwNumRuleTable::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swNumRuleTbl"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swNumRuleTable"));
     for (SwNumRule* pNumRule : *this)
         pNumRule->dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index bf9a98e38de0..f290b0590efd 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -118,14 +118,14 @@ bool SwDoc::IsUsed( const SwModify& rModify ) const
 {
     // Check if we have dependent ContentNodes in the Nodes array
     // (also indirect ones for derived Formats)
-    SwAutoFmtGetDocNode aGetHt( &GetNodes() );
+    SwAutoFormatGetDocNode aGetHt( &GetNodes() );
     return !rModify.GetInfo( aGetHt );
 }
 
 // See if the NumRule is used
 bool SwDoc::IsUsed( const SwNumRule& rRule )
 {
-    bool bUsed = rRule.GetTxtNodeListSize() > 0 ||
+    bool bUsed = rRule.GetTextNodeListSize() > 0 ||
                      rRule.GetParagraphStyleListSize() > 0;
 
     return bUsed;
@@ -280,16 +280,16 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
     return nRet;
 }
 
-void SwDoc::RemoveAllFmtLanguageDependencies()
+void SwDoc::RemoveAllFormatLanguageDependencies()
 {
     /* Restore the language independ pool defaults and styles. */
     GetAttrPool().ResetPoolDefaultItem( RES_PARATR_ADJUST );
 
-    SwTxtFmtColl * pTxtFmtColl = getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
+    SwTextFormatColl * pTextFormatColl = getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD );
 
-    pTxtFmtColl->ResetFmtAttr( RES_PARATR_ADJUST );
+    pTextFormatColl->ResetFormatAttr( RES_PARATR_ADJUST );
     /* koreans do not like SvxScriptItem(TRUE) */
-    pTxtFmtColl->ResetFmtAttr( RES_PARATR_SCRIPTSPACE );
+    pTextFormatColl->ResetFormatAttr( RES_PARATR_SCRIPTSPACE );
 
     SvxFrameDirectionItem aFrameDir( FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR );
 
@@ -297,8 +297,8 @@ void SwDoc::RemoveAllFmtLanguageDependencies()
     for( size_t i=0; i<nCount; ++i )
     {
         SwPageDesc& rDesc = GetPageDesc( i );
-        rDesc.GetMaster().SetFmtAttr( aFrameDir );
-        rDesc.GetLeft().SetFmtAttr( aFrameDir );
+        rDesc.GetMaster().SetFormatAttr( aFrameDir );
+        rDesc.GetLeft().SetFormatAttr( aFrameDir );
     }
 
     //#i16874# AutoKerning as default for new documents
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index 9a874c68062a..5960c35af5c0 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -72,8 +72,8 @@ bool SwServerObject::GetData( uno::Any & rData,
             break;
 
         case TABLE_SERVER:
-            pPam = new SwPaM( *CNTNT_TYPE.pTblNd,
-                            *CNTNT_TYPE.pTblNd->EndOfSectionNode() );
+            pPam = new SwPaM( *CNTNT_TYPE.pTableNd,
+                            *CNTNT_TYPE.pTableNd->EndOfSectionNode() );
             break;
 
         case SECTION_SERVER:
@@ -122,7 +122,7 @@ void SwServerObject::SendDataChanged( const SwPosition& rPos )
                 }
                 break;
 
-            case TABLE_SERVER:      pNd = CNTNT_TYPE.pTblNd;    break;
+            case TABLE_SERVER:      pNd = CNTNT_TYPE.pTableNd;    break;
             case SECTION_SERVER:    pNd = CNTNT_TYPE.pSectNd;   break;
             case NONE_SERVER: break;
         }
@@ -159,7 +159,7 @@ void SwServerObject::SendDataChanged( const SwPaM& rRange )
             }
             break;
 
-        case TABLE_SERVER:      pNd = CNTNT_TYPE.pTblNd;    break;
+        case TABLE_SERVER:      pNd = CNTNT_TYPE.pTableNd;    break;
         case SECTION_SERVER:    pNd = CNTNT_TYPE.pSectNd;   break;
         case NONE_SERVER: break;
         }
@@ -203,7 +203,7 @@ bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
         }
         break;
 
-    case TABLE_SERVER:      pNd = CNTNT_TYPE.pTblNd;    break;
+    case TABLE_SERVER:      pNd = CNTNT_TYPE.pTableNd;    break;
     case SECTION_SERVER:    pNd = CNTNT_TYPE.pSectNd;   break;
 
     case SECTION_SERVER+1:
@@ -284,14 +284,14 @@ SwDataChanged::SwDataChanged( const SwPaM& rPam )
     : pPam( &rPam ), pPos( 0 ), pDoc( rPam.GetDoc() )
 {
     nNode = rPam.GetPoint()->nNode.GetIndex();
-    nCntnt = rPam.GetPoint()->nContent.GetIndex();
+    nContent = rPam.GetPoint()->nContent.GetIndex();
 }
 
 SwDataChanged::SwDataChanged( SwDoc* pDc, const SwPosition& rPos )
     : pPam( 0 ), pPos( &rPos ), pDoc( pDc )
 {
     nNode = rPos.nNode.GetIndex();
-    nCntnt = rPos.nContent.GetIndex();
+    nContent = rPos.nContent.GetIndex();
 }
 
 SwDataChanged::~SwDataChanged()
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index a260ddfae52b..8cc23c510382 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -83,7 +83,7 @@ const sal_uInt16 AUTOFORMAT_ID          = AUTOFORMAT_ID_31005;
 const sal_uInt16 AUTOFORMAT_DATA_ID     = AUTOFORMAT_DATA_ID_31005;
 const sal_uInt16 AUTOFORMAT_FILE_VERSION= SOFFICE_FILEFORMAT_50;
 
-SwBoxAutoFmt* SwTableAutoFmt::pDfltBoxAutoFmt = 0;
+SwBoxAutoFormat* SwTableAutoFormat::pDfltBoxAutoFormat = 0;
 
 #define AUTOTABLE_FORMAT_NAME "autotbl.fmt"
 
@@ -185,7 +185,7 @@ public:
     sal_uInt16 nInt32Version;
     sal_uInt16 nRotateModeVersion;
 
-    sal_uInt16 nNumFmtVersion;
+    sal_uInt16 nNumFormatVersion;
 
     SwAfVersions();
     void Load( SvStream& rStream, sal_uInt16 nVer );
@@ -215,7 +215,7 @@ SwAfVersions::SwAfVersions() :
     nBoolVersion(0),
     nInt32Version(0),
     nRotateModeVersion(0),
-    nNumFmtVersion(0)
+    nNumFormatVersion(0)
 {
 }
 
@@ -253,10 +253,10 @@ void SwAfVersions::Load( SvStream& rStream, sal_uInt16 nVer )
         rStream.ReadUInt16( nInt32Version );
         rStream.ReadUInt16( nRotateModeVersion );
     }
-    rStream.ReadUInt16( nNumFmtVersion );
+    rStream.ReadUInt16( nNumFormatVersion );
 }
 
-SwBoxAutoFmt::SwBoxAutoFmt()
+SwBoxAutoFormat::SwBoxAutoFormat()
     : aFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_FONT )) ),
     aHeight( 240, 100, RES_CHRATR_FONTSIZE ),
     aWeight( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ),
@@ -297,11 +297,11 @@ SwBoxAutoFmt::SwBoxAutoFmt()
 //    aBLTR( RES_... ),
     aRotateMode( SVX_ROTATE_MODE_STANDARD, 0 )
 {
-    eSysLanguage = eNumFmtLanguage = ::GetAppLanguage();
+    eSysLanguage = eNumFormatLanguage = ::GetAppLanguage();
     aBox.SetDistance( 55 );
 }
 
-SwBoxAutoFmt::SwBoxAutoFmt( const SwBoxAutoFmt& rNew )
+SwBoxAutoFormat::SwBoxAutoFormat( const SwBoxAutoFormat& rNew )
     : aFont( rNew.aFont ),
     aHeight( rNew.aHeight ),
     aWeight( rNew.aWeight ),
@@ -334,17 +334,17 @@ SwBoxAutoFmt::SwBoxAutoFmt( const SwBoxAutoFmt& rNew )
     aLinebreak( rNew.aLinebreak ),
     aRotateAngle( rNew.aRotateAngle ),
     aRotateMode( rNew.aRotateMode ),
-    sNumFmtString( rNew.sNumFmtString ),
+    sNumFormatString( rNew.sNumFormatString ),
     eSysLanguage( rNew.eSysLanguage ),
-    eNumFmtLanguage( rNew.eNumFmtLanguage )
+    eNumFormatLanguage( rNew.eNumFormatLanguage )
 {
 }
 
-SwBoxAutoFmt::~SwBoxAutoFmt()
+SwBoxAutoFormat::~SwBoxAutoFormat()
 {
 }
 
-SwBoxAutoFmt& SwBoxAutoFmt::operator=( const SwBoxAutoFmt& rNew )
+SwBoxAutoFormat& SwBoxAutoFormat::operator=( const SwBoxAutoFormat& rNew )
 {
     aFont = rNew.aFont;
     aHeight = rNew.aHeight;
@@ -380,9 +380,9 @@ SwBoxAutoFmt& SwBoxAutoFmt::operator=( const SwBoxAutoFmt& rNew )
     aRotateAngle.SetValue( rNew.aRotateAngle.GetValue() );
     aRotateMode.SetValue( rNew.aRotateMode.GetValue() );
 
-    sNumFmtString = rNew.sNumFmtString;
+    sNumFormatString = rNew.sNumFormatString;
     eSysLanguage = rNew.eSysLanguage;
-    eNumFmtLanguage = rNew.eNumFmtLanguage;
+    eNumFormatLanguage = rNew.eNumFormatLanguage;
 
     return *this;
 }
@@ -392,7 +392,7 @@ SwBoxAutoFmt& SwBoxAutoFmt::operator=( const SwBoxAutoFmt& rNew )
     aItem = *static_cast<aItemType*>(pNew); \
     delete pNew;
 
-bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer )
+bool SwBoxAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer )
 {
     SfxPoolItem* pNew;
     SvxOrientationItem aOrientation( SVX_ORIENTATION_STANDARD, 0);
@@ -445,7 +445,7 @@ bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_u
     if (nVer >= AUTOFORMAT_DATA_ID_31005 && WriterSpecificBlockExists(rStream))
     {
         READ(m_aTextOrientation, SvxFrameDirectionItem, rVersions.m_nTextOrientationVersion);
-        READ(m_aVerticalAlignment, SwFmtVertOrient, rVersions.m_nVerticalAlignmentVersion);
+        READ(m_aVerticalAlignment, SwFormatVertOrient, rVersions.m_nVerticalAlignmentVersion);
     }
 
     READ( aHorJustify,  SvxHorJustifyItem , rVersions.nHorJustifyVersion)
@@ -468,15 +468,15 @@ bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_u
         delete pNew;
     }
 
-    if( 0 == rVersions.nNumFmtVersion )
+    if( 0 == rVersions.nNumFormatVersion )
     {
         sal_uInt16 eSys, eLge;
         // --- from 680/dr25 on: store strings as UTF-8
         rtl_TextEncoding eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet();
-        sNumFmtString = rStream.ReadUniOrByteString( eCharSet );
+        sNumFormatString = rStream.ReadUniOrByteString( eCharSet );
         rStream.ReadUInt16( eSys ).ReadUInt16( eLge );
         eSysLanguage = (LanguageType) eSys;
-        eNumFmtLanguage = (LanguageType) eLge;
+        eNumFormatLanguage = (LanguageType) eLge;
         if ( eSysLanguage == LANGUAGE_SYSTEM )      // from old versions (Calc)
             eSysLanguage = ::GetAppLanguage();
     }
@@ -487,7 +487,7 @@ bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_u
     return 0 == rStream.GetError();
 }
 
-bool SwBoxAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
+bool SwBoxAutoFormat::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
 {
     SvxOrientationItem aOrientation( aRotateAngle.GetValue(), aStacked.GetValue(), 0 );
 
@@ -533,14 +533,14 @@ bool SwBoxAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
     aRotateMode.Store( rStream, aRotateMode.GetVersion(fileVersion) );
 
     // --- from 680/dr25 on: store strings as UTF-8
-    write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString,
+    write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, sNumFormatString,
         RTL_TEXTENCODING_UTF8);
-    rStream.WriteUInt16( eSysLanguage ).WriteUInt16( eNumFmtLanguage );
+    rStream.WriteUInt16( eSysLanguage ).WriteUInt16( eNumFormatLanguage );
 
     return 0 == rStream.GetError();
 }
 
-bool SwBoxAutoFmt::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const
+bool SwBoxAutoFormat::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const
 {
     rStream.WriteUInt16( aFont.GetVersion( fileVersion ) );
     rStream.WriteUInt16( aHeight.GetVersion( fileVersion ) );
@@ -579,7 +579,7 @@ bool SwBoxAutoFmt::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) co
     return 0 == rStream.GetError();
 }
 
-SwTableAutoFmt::SwTableAutoFmt( const OUString& rName )
+SwTableAutoFormat::SwTableAutoFormat( const OUString& rName )
     : m_aName( rName )
     , nStrResId( USHRT_MAX )
     , m_aBreak( SVX_BREAK_NONE, RES_BREAK )
@@ -597,34 +597,34 @@ SwTableAutoFmt::SwTableAutoFmt( const OUString& rName )
     bInclValueFormat = true;
     bInclWidthHeight = true;
 
-    memset( aBoxAutoFmt, 0, sizeof( aBoxAutoFmt ) );
+    memset( aBoxAutoFormat, 0, sizeof( aBoxAutoFormat ) );
 }
 
-SwTableAutoFmt::SwTableAutoFmt( const SwTableAutoFmt& rNew )
+SwTableAutoFormat::SwTableAutoFormat( const SwTableAutoFormat& rNew )
     : m_aBreak( rNew.m_aBreak )
     , m_aKeepWithNextPara( false, RES_KEEP )
     , m_aShadow( RES_SHADOW )
 {
     for( sal_uInt8 n = 0; n < 16; ++n )
-        aBoxAutoFmt[ n ] = 0;
+        aBoxAutoFormat[ n ] = 0;
     *this = rNew;
 }
 
-SwTableAutoFmt& SwTableAutoFmt::operator=( const SwTableAutoFmt& rNew )
+SwTableAutoFormat& SwTableAutoFormat::operator=( const SwTableAutoFormat& rNew )
 {
     if (&rNew == this)
         return *this;
 
     for( sal_uInt8 n = 0; n < 16; ++n )
     {
-        if( aBoxAutoFmt[ n ] )
-            delete aBoxAutoFmt[ n ];
+        if( aBoxAutoFormat[ n ] )
+            delete aBoxAutoFormat[ n ];
 
-        SwBoxAutoFmt* pFmt = rNew.aBoxAutoFmt[ n ];
-        if( pFmt )      // if is set -> copy
-            aBoxAutoFmt[ n ] = new SwBoxAutoFmt( *pFmt );
+        SwBoxAutoFormat* pFormat = rNew.aBoxAutoFormat[ n ];
+        if( pFormat )      // if is set -> copy
+            aBoxAutoFormat[ n ] = new SwBoxAutoFormat( *pFormat );
         else            // else default
-            aBoxAutoFmt[ n ] = 0;
+            aBoxAutoFormat[ n ] = 0;
     }
 
     m_aName = rNew.m_aName;
@@ -648,99 +648,99 @@ SwTableAutoFmt& SwTableAutoFmt::operator=( const SwTableAutoFmt& rNew )
     return *this;
 }
 
-SwTableAutoFmt::~SwTableAutoFmt()
+SwTableAutoFormat::~SwTableAutoFormat()
 {
-    SwBoxAutoFmt** ppFmt = aBoxAutoFmt;
-    for( sal_uInt8 n = 0; n < 16; ++n, ++ppFmt )
-        if( *ppFmt )
-            delete *ppFmt;
+    SwBoxAutoFormat** ppFormat = aBoxAutoFormat;
+    for( sal_uInt8 n = 0; n < 16; ++n, ++ppFormat )
+        if( *ppFormat )
+            delete *ppFormat;
 }
 
-void SwTableAutoFmt::SetBoxFmt( const SwBoxAutoFmt& rNew, sal_uInt8 nPos )
+void SwTableAutoFormat::SetBoxFormat( const SwBoxAutoFormat& rNew, sal_uInt8 nPos )
 {
     OSL_ENSURE( nPos < 16, "wrong area" );
 
-    SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
-    if( pFmt )      // if is set -> copy
-        *aBoxAutoFmt[ nPos ] = rNew;
+    SwBoxAutoFormat* pFormat = aBoxAutoFormat[ nPos ];
+    if( pFormat )      // if is set -> copy
+        *aBoxAutoFormat[ nPos ] = rNew;
     else            // else set anew
-        aBoxAutoFmt[ nPos ] = new SwBoxAutoFmt( rNew );
+        aBoxAutoFormat[ nPos ] = new SwBoxAutoFormat( rNew );
 }
 
-const SwBoxAutoFmt& SwTableAutoFmt::GetBoxFmt( sal_uInt8 nPos ) const
+const SwBoxAutoFormat& SwTableAutoFormat::GetBoxFormat( sal_uInt8 nPos ) const
 {
     OSL_ENSURE( nPos < 16, "wrong area" );
 
-    SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
-    if( pFmt )      // if is set -> copy
-        return *pFmt;
+    SwBoxAutoFormat* pFormat = aBoxAutoFormat[ nPos ];
+    if( pFormat )      // if is set -> copy
+        return *pFormat;
     else            // else return the default
     {
         // If it doesn't exist yet:
-        if( !pDfltBoxAutoFmt )
-            pDfltBoxAutoFmt = new SwBoxAutoFmt;
-        return *pDfltBoxAutoFmt;
+        if( !pDfltBoxAutoFormat )
+            pDfltBoxAutoFormat = new SwBoxAutoFormat;
+        return *pDfltBoxAutoFormat;
     }
 }
 
-void SwTableAutoFmt::UpdateFromSet( sal_uInt8 nPos,
+void SwTableAutoFormat::UpdateFromSet( sal_uInt8 nPos,
                                     const SfxItemSet& rSet,
                                     UpdateFlags eFlags,
-                                    SvNumberFormatter* pNFmtr)
+                                    SvNumberFormatter* pNFormatr)
 {
     OSL_ENSURE( nPos < 16, "wrong area" );
 
-    SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
-    if( !pFmt )     // if is set -> copy
+    SwBoxAutoFormat* pFormat = aBoxAutoFormat[ nPos ];
+    if( !pFormat )     // if is set -> copy
     {
-        pFmt = new SwBoxAutoFmt;
-        aBoxAutoFmt[ nPos ] = pFmt;
+        pFormat = new SwBoxAutoFormat;
+        aBoxAutoFormat[ nPos ] = pFormat;
     }
 
     if( UPDATE_CHAR & eFlags )
     {
-        pFmt->SetFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_FONT )) );
-        pFmt->SetHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_FONTSIZE )) );
-        pFmt->SetWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_WEIGHT )) );
-        pFmt->SetPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_POSTURE )) );
-        pFmt->SetCJKFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_CJK_FONT )) );
-        pFmt->SetCJKHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_CJK_FONTSIZE )) );
-        pFmt->SetCJKWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_CJK_WEIGHT )) );
-        pFmt->SetCJKPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_CJK_POSTURE )) );
-        pFmt->SetCTLFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_CTL_FONT )) );
-        pFmt->SetCTLHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_CTL_FONTSIZE )) );
-        pFmt->SetCTLWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_CTL_WEIGHT )) );
-        pFmt->SetCTLPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_CTL_POSTURE )) );
-        pFmt->SetUnderline( static_cast<const SvxUnderlineItem&>(rSet.Get( RES_CHRATR_UNDERLINE )) );
-        pFmt->SetOverline( static_cast<const SvxOverlineItem&>(rSet.Get( RES_CHRATR_OVERLINE )) );
-        pFmt->SetCrossedOut( static_cast<const SvxCrossedOutItem&>(rSet.Get( RES_CHRATR_CROSSEDOUT )) );
-        pFmt->SetContour( static_cast<const SvxContourItem&>(rSet.Get( RES_CHRATR_CONTOUR )) );
-        pFmt->SetShadowed( static_cast<const SvxShadowedItem&>(rSet.Get( RES_CHRATR_SHADOWED )) );
-        pFmt->SetColor( static_cast<const SvxColorItem&>(rSet.Get( RES_CHRATR_COLOR )) );
-        pFmt->SetAdjust( static_cast<const SvxAdjustItem&>(rSet.Get( RES_PARATR_ADJUST )) );
+        pFormat->SetFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_FONT )) );
+        pFormat->SetHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_FONTSIZE )) );
+        pFormat->SetWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_WEIGHT )) );
+        pFormat->SetPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_POSTURE )) );
+        pFormat->SetCJKFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_CJK_FONT )) );
+        pFormat->SetCJKHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_CJK_FONTSIZE )) );
+        pFormat->SetCJKWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_CJK_WEIGHT )) );
+        pFormat->SetCJKPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_CJK_POSTURE )) );
+        pFormat->SetCTLFont( static_cast<const SvxFontItem&>(rSet.Get( RES_CHRATR_CTL_FONT )) );
+        pFormat->SetCTLHeight( static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_CTL_FONTSIZE )) );
+        pFormat->SetCTLWeight( static_cast<const SvxWeightItem&>(rSet.Get( RES_CHRATR_CTL_WEIGHT )) );
+        pFormat->SetCTLPosture( static_cast<const SvxPostureItem&>(rSet.Get( RES_CHRATR_CTL_POSTURE )) );
+        pFormat->SetUnderline( static_cast<const SvxUnderlineItem&>(rSet.Get( RES_CHRATR_UNDERLINE )) );
+        pFormat->SetOverline( static_cast<const SvxOverlineItem&>(rSet.Get( RES_CHRATR_OVERLINE )) );
+        pFormat->SetCrossedOut( static_cast<const SvxCrossedOutItem&>(rSet.Get( RES_CHRATR_CROSSEDOUT )) );
+        pFormat->SetContour( static_cast<const SvxContourItem&>(rSet.Get( RES_CHRATR_CONTOUR )) );
+        pFormat->SetShadowed( static_cast<const SvxShadowedItem&>(rSet.Get( RES_CHRATR_SHADOWED )) );
+        pFormat->SetColor( static_cast<const SvxColorItem&>(rSet.Get( RES_CHRATR_COLOR )) );
+        pFormat->SetAdjust( static_cast<const SvxAdjustItem&>(rSet.Get( RES_PARATR_ADJUST )) );
     }
     if( UPDATE_BOX & eFlags )
     {
-        pFmt->SetBox( static_cast<const SvxBoxItem&>(rSet.Get( RES_BOX )) );
+        pFormat->SetBox( static_cast<const SvxBoxItem&>(rSet.Get( RES_BOX )) );
 // FIXME - add attribute IDs for the diagonal line items
-//        pFmt->SetTLBR( (SvxLineItem&)rSet.Get( RES_... ) );
-//        pFmt->SetBLTR( (SvxLineItem&)rSet.Get( RES_... ) );
-        pFmt->SetBackground( static_cast<const SvxBrushItem&>(rSet.Get( RES_BACKGROUND )) );
-        pFmt->SetTextOrientation(static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR)));
-        pFmt->SetVerticalAlignment(static_cast<const SwFmtVertOrient&>(rSet.Get(RES_VERT_ORIENT)));
+//        pFormat->SetTLBR( (SvxLineItem&)rSet.Get( RES_... ) );
+//        pFormat->SetBLTR( (SvxLineItem&)rSet.Get( RES_... ) );
+        pFormat->SetBackground( static_cast<const SvxBrushItem&>(rSet.Get( RES_BACKGROUND )) );
+        pFormat->SetTextOrientation(static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR)));
+        pFormat->SetVerticalAlignment(static_cast<const SwFormatVertOrient&>(rSet.Get(RES_VERT_ORIENT)));
 
-        const SwTblBoxNumFormat* pNumFmtItem;
+        const SwTableBoxNumFormat* pNumFormatItem;
         const SvNumberformat* pNumFormat = 0;
         if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMAT, true,
-            reinterpret_cast<const SfxPoolItem**>(&pNumFmtItem) ) && pNFmtr &&
-            0 != (pNumFormat = pNFmtr->GetEntry( pNumFmtItem->GetValue() )) )
-            pFmt->SetValueFormat( pNumFormat->GetFormatstring(),
+            reinterpret_cast<const SfxPoolItem**>(&pNumFormatItem) ) && pNFormatr &&
+            0 != (pNumFormat = pNFormatr->GetEntry( pNumFormatItem->GetValue() )) )
+            pFormat->SetValueFormat( pNumFormat->GetFormatstring(),
                                     pNumFormat->GetLanguage(),
                                     ::GetAppLanguage());
         else
         {
             // default
-            pFmt->SetValueFormat( OUString(), LANGUAGE_SYSTEM,
+            pFormat->SetValueFormat( OUString(), LANGUAGE_SYSTEM,
                                   ::GetAppLanguage() );
         }
     }
@@ -748,10 +748,10 @@ void SwTableAutoFmt::UpdateFromSet( sal_uInt8 nPos,
     // we cannot handle the rest, that's specific to StarCalc
 }
 
-void SwTableAutoFmt::UpdateToSet(sal_uInt8 nPos, SfxItemSet& rSet,
-                                 UpdateFlags eFlags, SvNumberFormatter* pNFmtr) const
+void SwTableAutoFormat::UpdateToSet(sal_uInt8 nPos, SfxItemSet& rSet,
+                                 UpdateFlags eFlags, SvNumberFormatter* pNFormatr) const
 {
-    const SwBoxAutoFmt& rChg = GetBoxFmt( nPos );
+    const SwBoxAutoFormat& rChg = GetBoxFormat( nPos );
 
     if( UPDATE_CHAR & eFlags )
     {
@@ -817,19 +817,19 @@ void SwTableAutoFmt::UpdateToSet(sal_uInt8 nPos, SfxItemSet& rSet,
         rSet.Put(rChg.GetTextOrientation());
         rSet.Put(rChg.GetVerticalAlignment());
 
-        if( IsValueFormat() && pNFmtr )
+        if( IsValueFormat() && pNFormatr )
         {
-            OUString sFmt;
+            OUString sFormat;
             LanguageType eLng, eSys;
-            rChg.GetValueFormat( sFmt, eLng, eSys );
-            if( !sFmt.isEmpty() )
+            rChg.GetValueFormat( sFormat, eLng, eSys );
+            if( !sFormat.isEmpty() )
             {
                 short nType;
                 bool bNew;
                 sal_Int32 nCheckPos;
-                sal_uInt32 nKey = pNFmtr->GetIndexPuttingAndConverting( sFmt, eLng,
+                sal_uInt32 nKey = pNFormatr->GetIndexPuttingAndConverting( sFormat, eLng,
                                                                         eSys, nType, bNew, nCheckPos);
-                rSet.Put( SwTblBoxNumFormat( nKey ));
+                rSet.Put( SwTableBoxNumFormat( nKey ));
             }
             else
                 rSet.ClearItem( RES_BOXATR_FORMAT );
@@ -839,9 +839,9 @@ void SwTableAutoFmt::UpdateToSet(sal_uInt8 nPos, SfxItemSet& rSet,
     // we cannot handle the rest, that's specific to StarCalc
 }
 
-void SwTableAutoFmt::RestoreTableProperties(SwTable &table) const
+void SwTableAutoFormat::RestoreTableProperties(SwTable &table) const
 {
-    SwTableFmt* pFormat = table.GetFrmFmt();
+    SwTableFormat* pFormat = table.GetFrameFormat();
     if (!pFormat)
         return;
 
@@ -853,22 +853,22 @@ void SwTableAutoFmt::RestoreTableProperties(SwTable &table) const
 
     rSet.Put(m_aBreak);
     rSet.Put(m_aPageDesc);
-    rSet.Put(SwFmtLayoutSplit(m_bLayoutSplit));
+    rSet.Put(SwFormatLayoutSplit(m_bLayoutSplit));
     rSet.Put(SfxBoolItem(RES_COLLAPSING_BORDERS, m_bCollapsingBorders));
     rSet.Put(m_aKeepWithNextPara);
     rSet.Put(m_aShadow);
 
-    pFormat->SetFmtAttr(rSet);
+    pFormat->SetFormatAttr(rSet);
 
     SwEditShell *pShell = pDoc->GetEditShell();
-    pDoc->SetRowSplit(*pShell->getShellCrsr(false), SwFmtRowSplit(m_bRowSplit));
+    pDoc->SetRowSplit(*pShell->getShellCrsr(false), SwFormatRowSplit(m_bRowSplit));
 
     table.SetRowsToRepeat(m_aRepeatHeading);
 }
 
-void SwTableAutoFmt::StoreTableProperties(const SwTable &table)
+void SwTableAutoFormat::StoreTableProperties(const SwTable &table)
 {
-    SwTableFmt* pFormat = table.GetFrmFmt();
+    SwTableFormat* pFormat = table.GetFrameFormat();
     if (!pFormat)
         return;
 
@@ -877,7 +877,7 @@ void SwTableAutoFmt::StoreTableProperties(const SwTable &table)
         return;
 
     SwEditShell *pShell = pDoc->GetEditShell();
-    SwFmtRowSplit *pRowSplit = 0;
+    SwFormatRowSplit *pRowSplit = 0;
     SwDoc::GetRowSplit(*pShell->getShellCrsr(false), pRowSplit);
     m_bRowSplit = pRowSplit && pRowSplit->GetValue();
     delete pRowSplit;
@@ -885,18 +885,18 @@ void SwTableAutoFmt::StoreTableProperties(const SwTable &table)
 
     const SfxItemSet &rSet = pFormat->GetAttrSet();
 
-    m_aBreak = static_cast<const SvxFmtBreakItem&>(rSet.Get(RES_BREAK));
-    m_aPageDesc = static_cast<const SwFmtPageDesc&>(rSet.Get(RES_PAGEDESC));
-    const SwFmtLayoutSplit &layoutSplit = static_cast<const SwFmtLayoutSplit&>(rSet.Get(RES_LAYOUT_SPLIT));
+    m_aBreak = static_cast<const SvxFormatBreakItem&>(rSet.Get(RES_BREAK));
+    m_aPageDesc = static_cast<const SwFormatPageDesc&>(rSet.Get(RES_PAGEDESC));
+    const SwFormatLayoutSplit &layoutSplit = static_cast<const SwFormatLayoutSplit&>(rSet.Get(RES_LAYOUT_SPLIT));
     m_bLayoutSplit = layoutSplit.GetValue();
     m_bCollapsingBorders = static_cast<const SfxBoolItem&>(rSet.Get(RES_COLLAPSING_BORDERS)).GetValue();
 
-    m_aKeepWithNextPara = static_cast<const SvxFmtKeepItem&>(rSet.Get(RES_KEEP));
+    m_aKeepWithNextPara = static_cast<const SvxFormatKeepItem&>(rSet.Get(RES_KEEP));
     m_aRepeatHeading = table.GetRowsToRepeat();
     m_aShadow = static_cast<const SvxShadowItem&>(rSet.Get(RES_SHADOW));
 }
 
-bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
+bool SwTableAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions )
 {
     sal_uInt16  nVal = 0;
     rStream.ReadUInt16( nVal );
@@ -932,9 +932,9 @@ bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
         {
             SfxPoolItem* pNew = 0;
 
-            READ(m_aBreak, SvxFmtBreakItem, AUTOFORMAT_FILE_VERSION);
-            READ(m_aPageDesc, SwFmtPageDesc, AUTOFORMAT_FILE_VERSION);
-            READ(m_aKeepWithNextPara, SvxFmtKeepItem, AUTOFORMAT_FILE_VERSION);
+            READ(m_aBreak, SvxFormatBreakItem, AUTOFORMAT_FILE_VERSION);
+            READ(m_aPageDesc, SwFormatPageDesc, AUTOFORMAT_FILE_VERSION);
+            READ(m_aKeepWithNextPara, SvxFormatKeepItem, AUTOFORMAT_FILE_VERSION);
 
             rStream.ReadUInt16( m_aRepeatHeading ).ReadCharAsBool( m_bLayoutSplit ).ReadCharAsBool( m_bRowSplit ).ReadCharAsBool( m_bCollapsingBorders );
 
@@ -945,13 +945,13 @@ bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
 
         for( sal_uInt8 i = 0; bRet && i < 16; ++i )
         {
-            SwBoxAutoFmt* pFmt = new SwBoxAutoFmt;
-            bRet = pFmt->Load( rStream, rVersions, nVal );
+            SwBoxAutoFormat* pFormat = new SwBoxAutoFormat;
+            bRet = pFormat->Load( rStream, rVersions, nVal );
             if( bRet )
-                aBoxAutoFmt[ i ] = pFmt;
+                aBoxAutoFormat[ i ] = pFormat;
             else
             {
-                delete pFmt;
+                delete pFormat;
                 break;
             }
         }
@@ -959,7 +959,7 @@ bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
     return bRet;
 }
 
-bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
+bool SwTableAutoFormat::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
 {
     sal_uInt16 nVal = AUTOFORMAT_DATA_ID;
     rStream.WriteUInt16( nVal );
@@ -988,66 +988,66 @@ bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
 
     for( int i = 0; bRet && i < 16; ++i )
     {
-        SwBoxAutoFmt* pFmt = aBoxAutoFmt[ i ];
-        if( !pFmt )     // if not set -> write default
+        SwBoxAutoFormat* pFormat = aBoxAutoFormat[ i ];
+        if( !pFormat )     // if not set -> write default
         {
             // If it doesn't exist yet:
-            if( !pDfltBoxAutoFmt )
-                pDfltBoxAutoFmt = new SwBoxAutoFmt;
-            pFmt = pDfltBoxAutoFmt;
+            if( !pDfltBoxAutoFormat )
+                pDfltBoxAutoFormat = new SwBoxAutoFormat;
+            pFormat = pDfltBoxAutoFormat;
         }
-        bRet = pFmt->Save( rStream, fileVersion );
+        bRet = pFormat->Save( rStream, fileVersion );
     }
     return bRet;
 }
 
-struct SwTableAutoFmtTbl::Impl
+struct SwTableAutoFormatTable::Impl
 {
-    boost::ptr_vector<SwTableAutoFmt> m_AutoFormats;
+    boost::ptr_vector<SwTableAutoFormat> m_AutoFormats;
 };
 
-size_t SwTableAutoFmtTbl::size() const
+size_t SwTableAutoFormatTable::size() const
 {
     return m_pImpl->m_AutoFormats.size();
 }
 
-SwTableAutoFmt const& SwTableAutoFmtTbl::operator[](size_t const i) const
+SwTableAutoFormat const& SwTableAutoFormatTable::operator[](size_t const i) const
 {
     return m_pImpl->m_AutoFormats[i];
 }
-SwTableAutoFmt      & SwTableAutoFmtTbl::operator[](size_t const i)
+SwTableAutoFormat      & SwTableAutoFormatTable::operator[](size_t const i)
 {
     return m_pImpl->m_AutoFormats[i];
 }
 
 void
-SwTableAutoFmtTbl::InsertAutoFmt(size_t const i, SwTableAutoFmt *const pFmt)
+SwTableAutoFormatTable::InsertAutoFormat(size_t const i, SwTableAutoFormat *const pFormat)
 {
-    m_pImpl->m_AutoFormats.insert(m_pImpl->m_AutoFormats.begin() + i, pFmt);
+    m_pImpl->m_AutoFormats.insert(m_pImpl->m_AutoFormats.begin() + i, pFormat);
 }
 
-void SwTableAutoFmtTbl::EraseAutoFmt(size_t const i)
+void SwTableAutoFormatTable::EraseAutoFormat(size_t const i)
 {
     m_pImpl->m_AutoFormats.erase(m_pImpl->m_AutoFormats.begin() + i);
 }
 
-SwTableAutoFmt* SwTableAutoFmtTbl::ReleaseAutoFmt(size_t const i)
+SwTableAutoFormat* SwTableAutoFormatTable::ReleaseAutoFormat(size_t const i)
 {
     return m_pImpl->m_AutoFormats.release(m_pImpl->m_AutoFormats.begin() + i).release();
 }
 
-SwTableAutoFmtTbl::~SwTableAutoFmtTbl()
+SwTableAutoFormatTable::~SwTableAutoFormatTable()
 {
 }
 
-SwTableAutoFmtTbl::SwTableAutoFmtTbl()
+SwTableAutoFormatTable::SwTableAutoFormatTable()
     : m_pImpl(new Impl)
 {
     OUString sNm;
-    SwTableAutoFmt* pNew = new SwTableAutoFmt(
+    SwTableAutoFormat* pNew = new SwTableAutoFormat(
                             SwStyleNameMapper::GetUIName( RES_POOLCOLL_STANDARD, sNm ) );
 
-    SwBoxAutoFmt aNew;
+    SwBoxAutoFormat aNew;
 
     sal_uInt8 i;
 
@@ -1057,13 +1057,13 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl()
     aNew.SetColor( SvxColorItem(Color( COL_WHITE ), RES_CHRATR_COLOR) );
 
     for( i = 0; i < 4; ++i )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
 
     // 70% gray
     aBrushItem.SetColor( RGB_COLORDATA( 0x4d, 0x4d, 0x4d ) );
     aNew.SetBackground( aBrushItem );
     for( i = 4; i <= 12; i += 4 )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
 
     // 20% gray
     aBrushItem.SetColor( RGB_COLORDATA( 0xcc, 0xcc, 0xcc ) );
@@ -1071,16 +1071,16 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl()
     aColor.SetColor( COL_BLACK );
     aNew.SetColor( SvxColorItem( aColor, RES_CHRATR_COLOR) );
     for( i = 7; i <= 15; i += 4 )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
     for( i = 13; i <= 14; ++i )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
 
     aBrushItem.SetColor( Color( COL_WHITE ) );
     aNew.SetBackground( aBrushItem );
     for( i = 5; i <= 6; ++i )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
     for( i = 9; i <= 10; ++i )
-        pNew->SetBoxFmt( aNew, i );
+        pNew->SetBoxFormat( aNew, i );
 
     SvxBoxItem aBox( RES_BOX );
     aBox.SetDistance( 55 );
@@ -1092,13 +1092,13 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl()
     {
         aBox.SetLine( i <= 3 ? &aLn : 0, SvxBoxItemLine::TOP );
         aBox.SetLine( (3 == ( i & 3 )) ? &aLn : 0, SvxBoxItemLine::RIGHT );
-        const_cast<SwBoxAutoFmt&>(pNew->GetBoxFmt( i )).SetBox( aBox );
+        const_cast<SwBoxAutoFormat&>(pNew->GetBoxFormat( i )).SetBox( aBox );
     }
 
     m_pImpl->m_AutoFormats.push_back(pNew);
 }
 
-bool SwTableAutoFmtTbl::Load()
+bool SwTableAutoFormatTable::Load()
 {
     bool bRet = false;
     OUString sNm(AUTOTABLE_FORMAT_NAME);
@@ -1113,7 +1113,7 @@ bool SwTableAutoFmtTbl::Load()
     return bRet;
 }
 
-bool SwTableAutoFmtTbl::Save() const
+bool SwTableAutoFormatTable::Save() const
 {
     SvtPathOptions aPathOpt;
     const OUString sNm( aPathOpt.GetUserConfigPath() + "/" AUTOTABLE_FORMAT_NAME );
@@ -1121,7 +1121,7 @@ bool SwTableAutoFmtTbl::Save() const
     return Save( *aStream.GetOutStream() ) && aStream.Commit();
 }
 
-bool SwTableAutoFmtTbl::Load( SvStream& rStream )
+bool SwTableAutoFormatTable::Load( SvStream& rStream )
 {
     bool bRet = 0 == rStream.GetError();
     if (bRet)
@@ -1160,7 +1160,7 @@ bool SwTableAutoFmtTbl::Load( SvStream& rStream )
             {
                 aVersions.Load( rStream, nVal );        // Item versions
 
-                SwTableAutoFmt* pNew;
+                SwTableAutoFormat* pNew;
                 sal_uInt16 nCount = 0;
                 rStream.ReadUInt16( nCount );
 
@@ -1177,7 +1177,7 @@ bool SwTableAutoFmtTbl::Load( SvStream& rStream )
                     }
                     for (sal_uInt16 i = 0; i < nCount; ++i)
                     {
-                        pNew = new SwTableAutoFmt( OUString() );
+                        pNew = new SwTableAutoFormat( OUString() );
                         bRet = pNew->Load( rStream, aVersions );
                         if( bRet )
                         {
@@ -1200,7 +1200,7 @@ bool SwTableAutoFmtTbl::Load( SvStream& rStream )
     return bRet;
 }
 
-bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const
+bool SwTableAutoFormatTable::Save( SvStream& rStream ) const
 {
     bool bRet = 0 == rStream.GetError();
     if (bRet)
@@ -1218,7 +1218,7 @@ bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const
             return false;
 
         // Write this version number for all attributes
-        m_pImpl->m_AutoFormats[0].GetBoxFmt(0).SaveVersionNo(
+        m_pImpl->m_AutoFormats[0].GetBoxFormat(0).SaveVersionNo(
                 rStream, AUTOFORMAT_FILE_VERSION);
 
         rStream.WriteUInt16( m_pImpl->m_AutoFormats.size() - 1 );
@@ -1226,8 +1226,8 @@ bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const
 
         for (sal_uInt16 i = 1; bRet && i < m_pImpl->m_AutoFormats.size(); ++i)
         {
-            SwTableAutoFmt const& rFmt = m_pImpl->m_AutoFormats[i];
-            bRet = rFmt.Save(rStream, AUTOFORMAT_FILE_VERSION);
+            SwTableAutoFormat const& rFormat = m_pImpl->m_AutoFormats[i];
+            bRet = rFormat.Save(rStream, AUTOFORMAT_FILE_VERSION);
         }
     }
     rStream.Flush();
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index f2adfb50213c..91f5f1633b75 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -47,9 +47,9 @@
 #include <list>
 #include <boost/scoped_ptr.hpp>
 
-static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
-                    SwTable& rDstTbl, SwTableBox* pDstBox,
-                    bool bDelCntnt, SwUndoTblCpyTbl* pUndo );
+static void lcl_CpyBox( const SwTable& rCpyTable, const SwTableBox* pCpyBox,
+                    SwTable& rDstTable, SwTableBox* pDstBox,
+                    bool bDelContent, SwUndoTableCpyTable* pUndo );
 
 // The following type will be used by table copy functions to describe
 // the structure of tables (or parts of tables).
@@ -99,8 +99,8 @@ namespace
             { return maLines.size(); }
         void moreLines( const SwTable& rTable );
         void assignBoxes( const TableStructure &rSource );
-        void copyBoxes( const SwTable& rSource, SwTable& rDstTbl,
-                        SwUndoTblCpyTbl* pUndo ) const;
+        void copyBoxes( const SwTable& rSource, SwTable& rDstTable,
+                        SwUndoTableCpyTable* pUndo ) const;
     };
 
     SubTable::iterator insertSubLine( SubTable& rSubTable, SwTableLine& rLine,
@@ -325,7 +325,7 @@ namespace
         }
         else
             aInfo.mbSelected = false;
-        rnBorder += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        rnBorder += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
         const sal_uInt16 nLeftCol = rnCol;
         while( rpCol != maCols.end() && *rpCol < rnBorder )
         {
@@ -476,8 +476,8 @@ namespace
         }
     }
 
-    void TableStructure::copyBoxes( const SwTable& rSource, SwTable& rDstTbl,
-                                    SwUndoTblCpyTbl* pUndo ) const
+    void TableStructure::copyBoxes( const SwTable& rSource, SwTable& rDstTable,
+                                    SwUndoTableCpyTable* pUndo ) const
     {
         LineStructure::size_type nLineCount = maLines.size();
         for( LineStructure::size_type nLine = 0; nLine < nLineCount; ++nLine )
@@ -492,7 +492,7 @@ namespace
                 {
                     SwTableBox *pBox = rInfo.mpBox;
                     if( pBox && pBox->getRowSpan() > 0 )
-                        lcl_CpyBox( rSource, rInfo.mpCopy, rDstTbl, pBox,
+                        lcl_CpyBox( rSource, rInfo.mpCopy, rDstTable, pBox,
                                     true, pUndo );
                 }
             }
@@ -505,15 +505,15 @@ namespace
     is deleted by doing this.
     If no Box is left the remaining content goes to the Box of a "BaseLine".
     If there's no Line anymore, put it also into the last Box of a "BaseLine". */
-static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
-                    SwTable& rDstTbl, SwTableBox* pDstBox,
-                    bool bDelCntnt, SwUndoTblCpyTbl* pUndo )
+static void lcl_CpyBox( const SwTable& rCpyTable, const SwTableBox* pCpyBox,
+                    SwTable& rDstTable, SwTableBox* pDstBox,
+                    bool bDelContent, SwUndoTableCpyTable* pUndo )
 {
     OSL_ENSURE( ( !pCpyBox || pCpyBox->GetSttNd() ) && pDstBox->GetSttNd(),
             "No content in this Box" );
 
-    SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
-    SwDoc* pDoc = rDstTbl.GetFrmFmt()->GetDoc();
+    SwDoc* pCpyDoc = rCpyTable.GetFrameFormat()->GetDoc();
+    SwDoc* pDoc = rDstTable.GetFrameFormat()->GetDoc();
 
     // First copy the new content and then delete the old one.
     // Do not create empty Sections, otherwise they will be deleted!
@@ -521,12 +521,12 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
         new SwNodeRange ( *pCpyBox->GetSttNd(), 1,
         *pCpyBox->GetSttNd()->EndOfSectionNode() ) : 0 );
 
-    SwNodeIndex aInsIdx( *pDstBox->GetSttNd(), bDelCntnt ? 1 :
+    SwNodeIndex aInsIdx( *pDstBox->GetSttNd(), bDelContent ? 1 :
                         pDstBox->GetSttNd()->EndOfSectionIndex() -
                         pDstBox->GetSttIdx() );
 
     if( pUndo )
-        pUndo->AddBoxBefore( *pDstBox, bDelCntnt );
+        pUndo->AddBoxBefore( *pDstBox, bDelContent );
 
     bool bUndoRedline = pUndo && pDoc->getIDocumentRedlineAccess().IsRedlineOn();
     ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
@@ -535,7 +535,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
     if( pRg.get() )
         pCpyDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( *pRg, 0, aInsIdx, NULL, false );
     else
-        pDoc->GetNodes().MakeTxtNode( aInsIdx, pDoc->GetDfltTxtFmtColl() );
+        pDoc->GetNodes().MakeTextNode( aInsIdx, pDoc->GetDfltTextFormatColl() );
     ++aSavePos;
 
     SwTableLine* pLine = pDstBox->GetUpper();
@@ -543,7 +543,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
         pLine = pLine->GetUpper()->GetUpper();
 
     bool bReplaceColl = true;
-    if( bDelCntnt && !bUndoRedline )
+    if( bDelContent && !bUndoRedline )
     {
         // Delete the Fly first, then the corresponding Nodes
         SwNodeIndex aEndNdIdx( *aInsIdx.GetNode().EndOfSectionNode() );
@@ -551,31 +551,31 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
         // Move Bookmarks
         {
             SwPosition aMvPos( aInsIdx );
-            SwCntntNode* pCNd = SwNodes::GoPrevious( &aMvPos.nNode );
+            SwContentNode* pCNd = SwNodes::GoPrevious( &aMvPos.nNode );
             aMvPos.nContent.Assign( pCNd, pCNd->Len() );
             SwDoc::CorrAbs( aInsIdx, aEndNdIdx, aMvPos, false );
         }
 
         // If we still have FlyFrames hanging around, delete them too
-        for( const auto pFly : *pDoc->GetSpzFrmFmts() )
+        for( const auto pFly : *pDoc->GetSpzFrameFormats() )
         {
-            SwFmtAnchor const*const pAnchor = &pFly->GetAnchor();
-            SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+            SwFormatAnchor const*const pAnchor = &pFly->GetAnchor();
+            SwPosition const*const pAPos = pAnchor->GetContentAnchor();
             if (pAPos &&
                 ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
                  (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
                 aInsIdx <= pAPos->nNode && pAPos->nNode <= aEndNdIdx )
             {
-                pDoc->getIDocumentLayoutAccess().DelLayoutFmt( pFly );
+                pDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFly );
             }
         }
 
         // If DestBox is a Headline Box and has Table style set, then
         // DO NOT automatically set the TableHeadline style!
-        if( 1 < rDstTbl.GetTabLines().size() &&
-            pLine == rDstTbl.GetTabLines().front() )
+        if( 1 < rDstTable.GetTabLines().size() &&
+            pLine == rDstTable.GetTabLines().front() )
         {
-            SwCntntNode* pCNd = aInsIdx.GetNode().GetCntntNode();
+            SwContentNode* pCNd = aInsIdx.GetNode().GetContentNode();
             if( !pCNd )
             {
                 SwNodeIndex aTmp( aInsIdx );
@@ -584,7 +584,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
 
             if( pCNd &&
                 RES_POOLCOLL_TABLE_HDLN !=
-                    pCNd->GetFmtColl()->GetPoolFmtId() )
+                    pCNd->GetFormatColl()->GetPoolFormatId() )
                 bReplaceColl = false;
         }
 
@@ -593,21 +593,21 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
 
     //b6341295: Table copy redlining will be managed by AddBoxAfter()
     if( pUndo )
-        pUndo->AddBoxAfter( *pDstBox, aInsIdx, bDelCntnt );
+        pUndo->AddBoxAfter( *pDstBox, aInsIdx, bDelContent );
 
     // heading
-    SwTxtNode *const pTxtNd = aSavePos.GetNode().GetTxtNode();
-    if( pTxtNd )
+    SwTextNode *const pTextNd = aSavePos.GetNode().GetTextNode();
+    if( pTextNd )
     {
-        const sal_uInt16 nPoolId = pTxtNd->GetTxtColl()->GetPoolFmtId();
+        const sal_uInt16 nPoolId = pTextNd->GetTextColl()->GetPoolFormatId();
         if( bReplaceColl &&
-            (( 1 < rDstTbl.GetTabLines().size() &&
-                pLine == rDstTbl.GetTabLines().front() )
+            (( 1 < rDstTable.GetTabLines().size() &&
+                pLine == rDstTable.GetTabLines().front() )
                 // Is the Table's content sill valid?
                 ? RES_POOLCOLL_TABLE == nPoolId
                 : RES_POOLCOLL_TABLE_HDLN == nPoolId ) )
         {
-            SwTxtFmtColl* pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(
+            SwTextFormatColl* pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(
                 static_cast<sal_uInt16>(
                                     RES_POOLCOLL_TABLE == nPoolId
                                         ? RES_POOLCOLL_TABLE_HDLN
@@ -617,16 +617,16 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
                 SwPaM aPam( aSavePos );
                 aPam.SetMark();
                 aPam.Move( fnMoveForward, fnGoSection );
-                pDoc->SetTxtFmtColl( aPam, pColl );
+                pDoc->SetTextFormatColl( aPam, pColl );
             }
         }
 
         // Delete the current Formula/Format/Value values
-        if( SfxItemState::SET == pDstBox->GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT ) ||
-            SfxItemState::SET == pDstBox->GetFrmFmt()->GetItemState( RES_BOXATR_FORMULA ) ||
-            SfxItemState::SET == pDstBox->GetFrmFmt()->GetItemState( RES_BOXATR_VALUE ) )
+        if( SfxItemState::SET == pDstBox->GetFrameFormat()->GetItemState( RES_BOXATR_FORMAT ) ||
+            SfxItemState::SET == pDstBox->GetFrameFormat()->GetItemState( RES_BOXATR_FORMULA ) ||
+            SfxItemState::SET == pDstBox->GetFrameFormat()->GetItemState( RES_BOXATR_VALUE ) )
         {
-            pDstBox->ClaimFrmFmt()->ResetFmtAttr( RES_BOXATR_FORMAT,
+            pDstBox->ClaimFrameFormat()->ResetFormatAttr( RES_BOXATR_FORMAT,
                                                  RES_BOXATR_VALUE );
         }
 
@@ -635,35 +635,35 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
         {
             SfxItemSet aBoxAttrSet( pCpyDoc->GetAttrPool(), RES_BOXATR_FORMAT,
                                                             RES_BOXATR_VALUE );
-            aBoxAttrSet.Put( pCpyBox->GetFrmFmt()->GetAttrSet() );
+            aBoxAttrSet.Put( pCpyBox->GetFrameFormat()->GetAttrSet() );
             if( aBoxAttrSet.Count() )
             {
                 const SfxPoolItem* pItem;
                 SvNumberFormatter* pN = pDoc->GetNumberFormatter( false );
-                if( pN && pN->HasMergeFmtTbl() && SfxItemState::SET == aBoxAttrSet.
+                if( pN && pN->HasMergeFormatTable() && SfxItemState::SET == aBoxAttrSet.
                     GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
                 {
-                    sal_uLong nOldIdx = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
-                    sal_uLong nNewIdx = pN->GetMergeFmtIndex( nOldIdx );
+                    sal_uLong nOldIdx = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
+                    sal_uLong nNewIdx = pN->GetMergeFormatIndex( nOldIdx );
                     if( nNewIdx != nOldIdx )
-                        aBoxAttrSet.Put( SwTblBoxNumFormat( nNewIdx ));
+                        aBoxAttrSet.Put( SwTableBoxNumFormat( nNewIdx ));
                 }
-                pDstBox->ClaimFrmFmt()->SetFmtAttr( aBoxAttrSet );
+                pDstBox->ClaimFrameFormat()->SetFormatAttr( aBoxAttrSet );
             }
         }
     }
 }
 
-bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
-                        SwUndoTblCpyTbl* pUndo )
+bool SwTable::InsNewTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
+                        SwUndoTableCpyTable* pUndo )
 {
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
-    SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
+    SwDoc* pCpyDoc = rCpyTable.GetFrameFormat()->GetDoc();
 
-    SwTblNumFmtMerge aTNFM( *pCpyDoc, *pDoc );
+    SwTableNumFormatMerge aTNFM( *pCpyDoc, *pDoc );
 
     // Analyze source structure
-    TableStructure aCopyStruct( rCpyTbl );
+    TableStructure aCopyStruct( rCpyTable );
 
     // Analyze target structure (from start box) and selected substructure
     _FndBox aFndBox( 0, 0 );
@@ -692,9 +692,9 @@ bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
 
     {
         // Change table formulas into relative representation
-        SwTableFmlUpdate aMsgHnt( &rCpyTbl );
-        aMsgHnt.eFlags = TBL_RELBOXNAME;
-        pCpyDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rCpyTable );
+        aMsgHint.eFlags = TBL_RELBOXNAME;
+        pCpyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
     // delete frames
@@ -704,7 +704,7 @@ bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
     aFndBox.DelFrms( *this );
 
     // copy boxes
-    aTarget.copyBoxes( rCpyTbl, *this, pUndo );
+    aTarget.copyBoxes( rCpyTable, *this, pUndo );
 
     // adjust row span attributes accordingly
 
@@ -719,40 +719,40 @@ bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
     deleted by doing this.
     If no Box is left the remaining content goes to the Box of a "BaseLine".
     If there's no Line anymore, put it also into the last Box of a "BaseLine". */
-bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
-                        SwUndoTblCpyTbl* pUndo )
+bool SwTable::InsTable( const SwTable& rCpyTable, const SwNodeIndex& rSttBox,
+                        SwUndoTableCpyTable* pUndo )
 {
     SetHTMLTableLayout( 0 );    // Delete HTML Layout
 
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
 
-    SwTableNode* pTblNd = pDoc->IsIdxInTbl( rSttBox );
+    SwTableNode* pTableNd = pDoc->IsIdxInTable( rSttBox );
 
     // Find the Box, to which should be copied:
-    SwTableBox* pMyBox = GetTblBox(
+    SwTableBox* pMyBox = GetTableBox(
             rSttBox.GetNode().FindTableBoxStartNode()->GetIndex() );
 
     OSL_ENSURE( pMyBox, "Index is not in a Box in this Table" );
 
     // First delete the Table's Frames
     _FndBox aFndBox( 0, 0 );
-    aFndBox.DelFrms( pTblNd->GetTable() );
+    aFndBox.DelFrms( pTableNd->GetTable() );
 
-    SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
+    SwDoc* pCpyDoc = rCpyTable.GetFrameFormat()->GetDoc();
 
     {
         // Convert Table formulas to their relative representation
-        SwTableFmlUpdate aMsgHnt( &rCpyTbl );
-        aMsgHnt.eFlags = TBL_RELBOXNAME;
-        pCpyDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rCpyTable );
+        aMsgHint.eFlags = TBL_RELBOXNAME;
+        pCpyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
-    SwTblNumFmtMerge aTNFM( *pCpyDoc, *pDoc );
+    SwTableNumFormatMerge aTNFM( *pCpyDoc, *pDoc );
 
-    bool bDelCntnt = true;
+    bool bDelContent = true;
     const SwTableBox* pTmp;
 
-    for( auto pLine : rCpyTbl.GetTabLines() )
+    for( auto pLine : rCpyTable.GetTabLines() )
     {
         // Get the first from the CopyLine
         const SwTableBox* pCpyBox = pLine->GetTabBoxes().front();
@@ -762,14 +762,14 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
         do {
             // First copy the new content and then delete the old one.
             // Do not create empty Sections, otherwise they will be deleted!
-            lcl_CpyBox( rCpyTbl, pCpyBox, *this, pMyBox, bDelCntnt, pUndo );
+            lcl_CpyBox( rCpyTable, pCpyBox, *this, pMyBox, bDelContent, pUndo );
 
-            if( 0 == (pTmp = pCpyBox->FindNextBox( rCpyTbl, pCpyBox, false )))
+            if( 0 == (pTmp = pCpyBox->FindNextBox( rCpyTable, pCpyBox, false )))
                 break;      // no more Boxes
             pCpyBox = pTmp;
 
             if( 0 == ( pTmp = pMyBox->FindNextBox( *this, pMyBox, false )))
-                bDelCntnt = false;  // No space left?
+                bDelContent = false;  // No space left?
             else
                 pMyBox = const_cast<SwTableBox*>(pTmp);
 
@@ -782,7 +782,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
         const SwTableLines::size_type nPos = GetTabLines().GetPos( pNxtLine ) + 1;
         // Is there a next?
         if( nPos >= GetTabLines().size() )
-            bDelCntnt = false;      // there is none, all goes into the last Box
+            bDelContent = false;      // there is none, all goes into the last Box
         else
         {
             // Find the next Box with content
@@ -790,30 +790,30 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
             pMyBox = pNxtLine->GetTabBoxes().front();
             while( !pMyBox->GetTabLines().empty() )
                 pMyBox = pMyBox->GetTabLines().front()->GetTabBoxes().front();
-            bDelCntnt = true;
+            bDelContent = true;
         }
     }
 
-    aFndBox.MakeFrms( pTblNd->GetTable() );     // Create the Frames anew
+    aFndBox.MakeFrms( pTableNd->GetTable() );     // Create the Frames anew
     return true;
 }
 
-bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
-                        SwUndoTblCpyTbl* pUndo )
+bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
+                        SwUndoTableCpyTable* pUndo )
 {
     OSL_ENSURE( !rSelBoxes.empty(), "Missing selection" );
 
     SetHTMLTableLayout( 0 );    // Delete HTML Layout
 
-    if( IsNewModel() || rCpyTbl.IsNewModel() )
-        return InsNewTable( rCpyTbl, rSelBoxes, pUndo );
+    if( IsNewModel() || rCpyTable.IsNewModel() )
+        return InsNewTable( rCpyTable, rSelBoxes, pUndo );
 
-    OSL_ENSURE( !rCpyTbl.IsTblComplex(), "Table too complex" );
+    OSL_ENSURE( !rCpyTable.IsTableComplex(), "Table too complex" );
 
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
-    SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
+    SwDoc* pCpyDoc = rCpyTable.GetFrameFormat()->GetDoc();
 
-    SwTblNumFmtMerge aTNFM( *pCpyDoc, *pDoc );
+    SwTableNumFormatMerge aTNFM( *pCpyDoc, *pDoc );
 
     SwTableBox *pSttBox = (SwTableBox*)rSelBoxes[0];
 
@@ -827,7 +827,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
 
     // Special case: If a Box is located in a Table, copy it to all selected
     // Boxes!
-    if( 1 != rCpyTbl.GetTabSortBoxes().size() )
+    if( 1 != rCpyTable.GetTabSortBoxes().size() )
     {
         _FndBox* pFndBox;
 
@@ -844,7 +844,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
         {
             // Is there still enough space in the Table?
             if( (GetTabLines().size() - nSttLine ) <
-                rCpyTbl.GetTabLines().size() )
+                rCpyTable.GetTabLines().size() )
             {
                 // If we don't have enough Lines, then see if we can insert
                 // new ones to reach our goal. But only if the SSelection
@@ -852,7 +852,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                 if( 1 < rSelBoxes.size() )
                     return false;
 
-                const sal_uInt16 nNewLns = rCpyTbl.GetTabLines().size() -
+                const sal_uInt16 nNewLns = rCpyTable.GetTabLines().size() -
                                 (GetTabLines().size() - nSttLine );
 
                 // See if the Box count is high enough for the Lines
@@ -860,10 +860,10 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
 
                 pSttBox = pFLine->GetBoxes()[0].GetBox();
                 const SwTableBoxes::size_type nSttBox = pFLine->GetLine()->GetTabBoxes().GetPos( pSttBox );
-                for( SwTableLines::size_type n = rCpyTbl.GetTabLines().size() - nNewLns;
-                        n < rCpyTbl.GetTabLines().size(); ++n )
+                for( SwTableLines::size_type n = rCpyTable.GetTabLines().size() - nNewLns;
+                        n < rCpyTable.GetTabLines().size(); ++n )
                 {
-                    SwTableLine* pCpyLn = rCpyTbl.GetTabLines()[ n ];
+                    SwTableLine* pCpyLn = rCpyTable.GetTabLines()[ n ];
 
                     if( pLastLn->GetTabBoxes().size() < nSttBox ||
                         ( pLastLn->GetTabBoxes().size() - nSttBox ) <
@@ -879,7 +879,7 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                 // rows accordingly.
                 SwTableBox* pInsBox = pLastLn->GetTabBoxes()[ nSttBox ];
                 OSL_ENSURE( pInsBox && pInsBox->GetSttNd(),
-                    "no CntntBox or it's not in this Table" );
+                    "no ContentBox or it's not in this Table" );
                 SwSelBoxes aBoxes;
 
                 if( pUndo
@@ -890,9 +890,9 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                     return false;
             }
 
-            nTstLns = rCpyTbl.GetTabLines().size();        // copy this many
+            nTstLns = rCpyTable.GetTabLines().size();        // copy this many
         }
-        else if( 0 == (nFndCnt % rCpyTbl.GetTabLines().size()) )
+        else if( 0 == (nFndCnt % rCpyTable.GetTabLines().size()) )
             nTstLns = nFndCnt;
         else
             return false;       // not enough space for the rows
@@ -911,8 +911,8 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                                         &aFndBox );
                 pLine = pInsFLine->GetLine();
             }
-            SwTableLine* pCpyLn = rCpyTbl.GetTabLines()[ nLn %
-                                        rCpyTbl.GetTabLines().size() ];
+            SwTableLine* pCpyLn = rCpyTable.GetTabLines()[ nLn %
+                                        rCpyTable.GetTabLines().size() ];
 
             // Selected too few rows?
             if( pInsFLine )
@@ -982,9 +982,9 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
 
     {
         // Convert Table formulas to their relative representation
-        SwTableFmlUpdate aMsgHnt( &rCpyTbl );
-        aMsgHnt.eFlags = TBL_RELBOXNAME;
-        pCpyDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rCpyTable );
+        aMsgHint.eFlags = TBL_RELBOXNAME;
+        pCpyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
     // Delete the Frames
@@ -992,12 +992,12 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
     //Not dispose accessible table
     aFndBox.DelFrms( *this,false );
 
-    if( 1 == rCpyTbl.GetTabSortBoxes().size() )
+    if( 1 == rCpyTable.GetTabSortBoxes().size() )
     {
-        SwTableBox *pTmpBx = rCpyTbl.GetTabSortBoxes()[0];
+        SwTableBox *pTmpBx = rCpyTable.GetTabSortBoxes()[0];
         for (size_t n = 0; n < rSelBoxes.size(); ++n)
         {
-            lcl_CpyBox( rCpyTbl, pTmpBx, *this,
+            lcl_CpyBox( rCpyTable, pTmpBx, *this,
                         (SwTableBox*)rSelBoxes[n], true, pUndo );
         }
     }
@@ -1005,12 +1005,12 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
         for( _FndLines::size_type nLn = 0; nLn < aFndBox.GetLines().size(); ++nLn )
         {
             pFLine = &aFndBox.GetLines()[ nLn ];
-            SwTableLine* pCpyLn = rCpyTbl.GetTabLines()[
-                                nLn % rCpyTbl.GetTabLines().size() ];
+            SwTableLine* pCpyLn = rCpyTable.GetTabLines()[
+                                nLn % rCpyTable.GetTabLines().size() ];
             for( _FndBoxes::size_type nBx = 0; nBx < pFLine->GetBoxes().size(); ++nBx )
             {
                 // Copy the pCpyBox into pMyBox
-                lcl_CpyBox( rCpyTbl, pCpyLn->GetTabBoxes()[
+                lcl_CpyBox( rCpyTable, pCpyLn->GetTabBoxes()[
                             nBx % pCpyLn->GetTabBoxes().size() ],
                     *this, pFLine->GetBoxes()[nBx].GetBox(), true, pUndo );
             }
@@ -1020,23 +1020,23 @@ bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
     return true;
 }
 
-static void _FndCntntLine( const SwTableLine* pLine, SwSelBoxes* pPara );
+static void _FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara );
 
-static void _FndCntntBox( const SwTableBox* pBox, SwSelBoxes* pPara )
+static void _FndContentBox( const SwTableBox* pBox, SwSelBoxes* pPara )
 {
     if( !pBox->GetTabLines().empty() )
     {
         for( const SwTableLine* pLine : pBox->GetTabLines() )
-            _FndCntntLine( pLine, pPara );
+            _FndContentLine( pLine, pPara );
     }
     else
         pPara->insert( const_cast<SwTableBox*>(pBox) );
 }
 
-static void _FndCntntLine( const SwTableLine* pLine, SwSelBoxes* pPara )
+static void _FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara )
 {
     for( const SwTableBox* pBox : pLine->GetTabBoxes() )
-        _FndCntntBox(pBox, pPara );
+        _FndContentBox(pBox, pPara );
 }
 
 // Find all Boxes with content in this Box
@@ -1052,7 +1052,7 @@ SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
     rBoxes.clear();
     for( SwTableBoxes::iterator it = pLine->GetTabBoxes().begin();
              it != pLine->GetTabBoxes().end(); ++it)
-        _FndCntntBox(*it, &rBoxes );
+        _FndContentBox(*it, &rBoxes );
     return rBoxes;
 }
 
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index eee05b9d04a9..08db77b6c113 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -82,13 +82,13 @@ typedef std::map<SwTableLine*, sal_uInt16> SwTableLineWidthMap_t;
 struct _CpyTabFrm
 {
     union {
-        SwTableBoxFmt *pFrmFmt;     // for CopyCol
+        SwTableBoxFormat *pFrameFormat;     // for CopyCol
         SwTwips nSize;              // for DelCol
     } Value;
-    SwTableBoxFmt *pNewFrmFmt;
+    SwTableBoxFormat *pNewFrameFormat;
 
-    _CpyTabFrm( SwTableBoxFmt* pAktFrmFmt ) : pNewFrmFmt( 0 )
-    {   Value.pFrmFmt = pAktFrmFmt; }
+    _CpyTabFrm( SwTableBoxFormat* pAktFrameFormat ) : pNewFrameFormat( 0 )
+    {   Value.pFrameFormat = pAktFrameFormat; }
 
     _CpyTabFrm& operator=( const _CpyTabFrm& );
 
@@ -102,43 +102,43 @@ struct CR_SetBoxWidth
 {
     SwSelBoxes m_Boxes;
     SwTableLineWidthMap_t m_LineWidthMap;
-    SwShareBoxFmts aShareFmts;
-    SwTableNode* pTblNd;
-    SwUndoTblNdsChg* pUndo;
+    SwShareBoxFormats aShareFormats;
+    SwTableNode* pTableNd;
+    SwUndoTableNdsChg* pUndo;
     SwTwips nDiff, nSide, nMaxSize, nLowerDiff;
-    TblChgMode nMode;
-    sal_uInt16 nTblWidth, nRemainWidth, nBoxWidth;
+    TableChgMode nMode;
+    sal_uInt16 nTableWidth, nRemainWidth, nBoxWidth;
     bool bBigger, bLeft, bSplittBox, bAnyBoxFnd;
 
-    CR_SetBoxWidth( sal_uInt16 eType, SwTwips nDif, SwTwips nSid, SwTwips nTblW,
+    CR_SetBoxWidth( sal_uInt16 eType, SwTwips nDif, SwTwips nSid, SwTwips nTableW,
                     SwTwips nMax, SwTableNode* pTNd )
-        : pTblNd( pTNd ), pUndo( 0 ),
+        : pTableNd( pTNd ), pUndo( 0 ),
         nDiff( nDif ), nSide( nSid ), nMaxSize( nMax ), nLowerDiff( 0 ),
-        nTblWidth( (sal_uInt16)nTblW ), nRemainWidth( 0 ), nBoxWidth( 0 ),
+        nTableWidth( (sal_uInt16)nTableW ), nRemainWidth( 0 ), nBoxWidth( 0 ),
         bSplittBox( false ), bAnyBoxFnd( false )
     {
-        bLeft = nsTblChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) ||
-                nsTblChgWidthHeightType::WH_CELL_LEFT == ( eType & 0xff );
-        bBigger = 0 != (eType & nsTblChgWidthHeightType::WH_FLAG_BIGGER );
-        nMode = pTblNd->GetTable().GetTblChgMode();
+        bLeft = nsTableChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) ||
+                nsTableChgWidthHeightType::WH_CELL_LEFT == ( eType & 0xff );
+        bBigger = 0 != (eType & nsTableChgWidthHeightType::WH_FLAG_BIGGER );
+        nMode = pTableNd->GetTable().GetTableChgMode();
     }
     CR_SetBoxWidth( const CR_SetBoxWidth& rCpy )
         : m_LineWidthMap(rCpy.m_LineWidthMap)
         ,
-        pTblNd( rCpy.pTblNd ),
+        pTableNd( rCpy.pTableNd ),
         pUndo( rCpy.pUndo ),
         nDiff( rCpy.nDiff ), nSide( rCpy.nSide ),
         nMaxSize( rCpy.nMaxSize ), nLowerDiff( 0 ),
-        nMode( rCpy.nMode ), nTblWidth( rCpy.nTblWidth ),
+        nMode( rCpy.nMode ), nTableWidth( rCpy.nTableWidth ),
         nRemainWidth( rCpy.nRemainWidth ), nBoxWidth( rCpy.nBoxWidth ),
         bBigger( rCpy.bBigger ), bLeft( rCpy.bLeft ),
         bSplittBox( rCpy.bSplittBox ), bAnyBoxFnd( rCpy.bAnyBoxFnd )
     {
     }
 
-    SwUndoTblNdsChg* CreateUndo( SwUndoId eUndoType )
+    SwUndoTableNdsChg* CreateUndo( SwUndoId eUndoType )
     {
-        return pUndo = new SwUndoTblNdsChg( eUndoType, m_Boxes, *pTblNd );
+        return pUndo = new SwUndoTableNdsChg( eUndoType, m_Boxes, *pTableNd );
     }
 
     void LoopClear()
@@ -166,7 +166,7 @@ typedef bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, bool
 
 #define CHECKBOXWIDTH                                           \
     {                                                           \
-        SwTwips nSize = GetFrmFmt()->GetFrmSize().GetWidth();   \
+        SwTwips nSize = GetFrameFormat()->GetFrmSize().GetWidth();   \
         for (size_t nTmp = 0; nTmp < aLines.size(); ++nTmp)   \
             ::_CheckBoxWidth( *aLines[ nTmp ], nSize );         \
     }
@@ -175,8 +175,8 @@ typedef bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, bool
     {                                                               \
         for ( sal_uInt16 i = 0; i < GetTabLines().size(); ++i )        \
         {                                                           \
-            SwFrmFmt* pFmt = GetTabLines()[i]->GetFrmFmt();  \
-            SwIterator<SwRowFrm,SwFmt> aIter( *pFmt );              \
+            SwFrameFormat* pFormat = GetTabLines()[i]->GetFrameFormat();  \
+            SwIterator<SwRowFrm,SwFormat> aIter( *pFormat );              \
             for (SwRowFrm* pFrm=aIter.First(); pFrm; pFrm=aIter.Next())\
             {                                                       \
                 if ( pFrm->GetTabLine() == GetTabLines()[i] )       \
@@ -198,36 +198,36 @@ typedef bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, bool
 struct CR_SetLineHeight
 {
     SwSelBoxes m_Boxes;
-    SwShareBoxFmts aShareFmts;
-    SwTableNode* pTblNd;
-    SwUndoTblNdsChg* pUndo;
+    SwShareBoxFormats aShareFormats;
+    SwTableNode* pTableNd;
+    SwUndoTableNdsChg* pUndo;
     SwTwips nMaxSpace, nMaxHeight;
-    TblChgMode nMode;
+    TableChgMode nMode;
     sal_uInt16 nLines;
     bool bBigger, bTop, bSplittBox, bAnyBoxFnd;
 
     CR_SetLineHeight( sal_uInt16 eType, SwTableNode* pTNd )
-        : pTblNd( pTNd ), pUndo( 0 ),
+        : pTableNd( pTNd ), pUndo( 0 ),
         nMaxSpace( 0 ), nMaxHeight( 0 ), nLines( 0 ),
         bSplittBox( false ), bAnyBoxFnd( false )
     {
-        bTop = nsTblChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) || nsTblChgWidthHeightType::WH_CELL_TOP == ( eType & 0xff );
-        bBigger = 0 != (eType & nsTblChgWidthHeightType::WH_FLAG_BIGGER );
-        if( eType & nsTblChgWidthHeightType::WH_FLAG_INSDEL )
+        bTop = nsTableChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) || nsTableChgWidthHeightType::WH_CELL_TOP == ( eType & 0xff );
+        bBigger = 0 != (eType & nsTableChgWidthHeightType::WH_FLAG_BIGGER );
+        if( eType & nsTableChgWidthHeightType::WH_FLAG_INSDEL )
             bBigger = !bBigger;
-        nMode = pTblNd->GetTable().GetTblChgMode();
+        nMode = pTableNd->GetTable().GetTableChgMode();
     }
     CR_SetLineHeight( const CR_SetLineHeight& rCpy )
-        : pTblNd( rCpy.pTblNd ), pUndo( rCpy.pUndo ),
+        : pTableNd( rCpy.pTableNd ), pUndo( rCpy.pUndo ),
         nMaxSpace( rCpy.nMaxSpace ), nMaxHeight( rCpy.nMaxHeight ),
         nMode( rCpy.nMode ), nLines( rCpy.nLines ),
         bBigger( rCpy.bBigger ), bTop( rCpy.bTop ),
         bSplittBox( rCpy.bSplittBox ), bAnyBoxFnd( rCpy.bAnyBoxFnd )
     {}
 
-    SwUndoTblNdsChg* CreateUndo( SwUndoId nUndoType )
+    SwUndoTableNdsChg* CreateUndo( SwUndoId nUndoType )
     {
-        return pUndo = new SwUndoTblNdsChg( nUndoType, m_Boxes, *pTblNd );
+        return pUndo = new SwUndoTableNdsChg( nUndoType, m_Boxes, *pTableNd );
     }
 };
 
@@ -242,7 +242,7 @@ typedef bool (*FN_lcl_SetLineHeight)(SwTableLine*, CR_SetLineHeight&, SwTwips, b
 
 _CpyTabFrm& _CpyTabFrm::operator=( const _CpyTabFrm& rCpyTabFrm )
 {
-    pNewFrmFmt = rCpyTabFrm.pNewFrmFmt;
+    pNewFrameFormat = rCpyTabFrm.pNewFrameFormat;
     Value = rCpyTabFrm.Value;
     return *this;
 }
@@ -253,7 +253,7 @@ struct _CpyPara
 {
     boost::shared_ptr< std::vector< std::vector< sal_uLong > > > pWidths;
     SwDoc* pDoc;
-    SwTableNode* pTblNd;
+    SwTableNode* pTableNd;
     _CpyTabFrms& rTabFrmArr;
     SwTableLine* pInsLine;
     SwTableBox* pInsBox;
@@ -262,32 +262,32 @@ struct _CpyPara
     sal_uInt16 nCpyCnt, nInsPos;
     sal_uInt16 nLnIdx, nBoxIdx;
     sal_uInt8 nDelBorderFlag;
-    bool bCpyCntnt;
+    bool bCpyContent;
 
     _CpyPara( SwTableNode* pNd, sal_uInt16 nCopies, _CpyTabFrms& rFrmArr,
               bool bCopyContent = true )
-        : pDoc( pNd->GetDoc() ), pTblNd( pNd ), rTabFrmArr(rFrmArr),
+        : pDoc( pNd->GetDoc() ), pTableNd( pNd ), rTabFrmArr(rFrmArr),
         pInsLine(0), pInsBox(0), nOldSize(0), nNewSize(0),
         nMinLeft(ULONG_MAX), nMaxRight(0),
         nCpyCnt(nCopies), nInsPos(0),
         nLnIdx(0), nBoxIdx(0),
-        nDelBorderFlag(0), bCpyCntnt( bCopyContent )
+        nDelBorderFlag(0), bCpyContent( bCopyContent )
         {}
     _CpyPara( const _CpyPara& rPara, SwTableLine* pLine )
-        : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTblNd(rPara.pTblNd),
+        : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTableNd(rPara.pTableNd),
         rTabFrmArr(rPara.rTabFrmArr), pInsLine(pLine), pInsBox(rPara.pInsBox),
         nOldSize(0), nNewSize(rPara.nNewSize), nMinLeft( rPara.nMinLeft ),
         nMaxRight( rPara.nMaxRight ), nCpyCnt(rPara.nCpyCnt), nInsPos(0),
         nLnIdx( rPara.nLnIdx), nBoxIdx( rPara.nBoxIdx ),
-        nDelBorderFlag( rPara.nDelBorderFlag ), bCpyCntnt( rPara.bCpyCntnt )
+        nDelBorderFlag( rPara.nDelBorderFlag ), bCpyContent( rPara.bCpyContent )
         {}
     _CpyPara( const _CpyPara& rPara, SwTableBox* pBox )
-        : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTblNd(rPara.pTblNd),
+        : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTableNd(rPara.pTableNd),
         rTabFrmArr(rPara.rTabFrmArr), pInsLine(rPara.pInsLine), pInsBox(pBox),
         nOldSize(rPara.nOldSize), nNewSize(rPara.nNewSize),
         nMinLeft( rPara.nMinLeft ), nMaxRight( rPara.nMaxRight ),
         nCpyCnt(rPara.nCpyCnt), nInsPos(0), nLnIdx(rPara.nLnIdx), nBoxIdx(rPara.nBoxIdx),
-        nDelBorderFlag( rPara.nDelBorderFlag ), bCpyCntnt( rPara.bCpyCntnt )
+        nDelBorderFlag( rPara.nDelBorderFlag ), bCpyContent( rPara.bCpyContent )
         {}
 };
 
@@ -297,7 +297,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
 {
     // Look up the Frame Format in the Frame Format Array
     SwTableBox* pBox = rFndBox.GetBox();
-    _CpyTabFrm aFindFrm( static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt()) );
+    _CpyTabFrm aFindFrm( static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat()) );
 
     sal_uInt16 nFndPos;
     if( pCpyPara->nCpyCnt )
@@ -307,11 +307,11 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
         if( itFind == pCpyPara->rTabFrmArr.end() || !(*itFind == aFindFrm) )
         {
             // For nested copying, also save the new Format as an old one.
-            SwTableBoxFmt* pNewFmt = static_cast<SwTableBoxFmt*>(pBox->ClaimFrmFmt());
+            SwTableBoxFormat* pNewFormat = static_cast<SwTableBoxFormat*>(pBox->ClaimFrameFormat());
 
             // Find the selected Boxes in the Line:
             _FndLine const* pCmpLine = NULL;
-            SwFmtFrmSize aFrmSz( pNewFmt->GetFrmSize() );
+            SwFormatFrmSize aFrmSz( pNewFormat->GetFrmSize() );
 
             bool bDiffCount = false;
             if( pBox->GetTabLines().size() )
@@ -329,34 +329,34 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
                 for( auto n = rFndBoxes.size(); n; )
                 {
                     nSz += rFndBoxes[--n].GetBox()->
-                            GetFrmFmt()->GetFrmSize().GetWidth();
+                            GetFrameFormat()->GetFrmSize().GetWidth();
                 }
                 aFrmSz.SetWidth( aFrmSz.GetWidth() -
                                             nSz / ( pCpyPara->nCpyCnt + 1 ) );
-                pNewFmt->SetFmtAttr( aFrmSz );
+                pNewFormat->SetFormatAttr( aFrmSz );
                 aFrmSz.SetWidth( nSz / ( pCpyPara->nCpyCnt + 1 ) );
 
                 // Create a new Format for the new Box, specifying its size.
-                aFindFrm.pNewFrmFmt = reinterpret_cast<SwTableBoxFmt*>(pNewFmt->GetDoc()->
-                                            MakeTableLineFmt());
-                *aFindFrm.pNewFrmFmt = *pNewFmt;
-                aFindFrm.pNewFrmFmt->SetFmtAttr( aFrmSz );
+                aFindFrm.pNewFrameFormat = reinterpret_cast<SwTableBoxFormat*>(pNewFormat->GetDoc()->
+                                            MakeTableLineFormat());
+                *aFindFrm.pNewFrameFormat = *pNewFormat;
+                aFindFrm.pNewFrameFormat->SetFormatAttr( aFrmSz );
             }
             else
             {
                 aFrmSz.SetWidth( aFrmSz.GetWidth() / ( pCpyPara->nCpyCnt + 1 ) );
-                pNewFmt->SetFmtAttr( aFrmSz );
+                pNewFormat->SetFormatAttr( aFrmSz );
 
-                aFindFrm.pNewFrmFmt = pNewFmt;
+                aFindFrm.pNewFrameFormat = pNewFormat;
                 pCpyPara->rTabFrmArr.insert( aFindFrm );
-                aFindFrm.Value.pFrmFmt = pNewFmt;
+                aFindFrm.Value.pFrameFormat = pNewFormat;
                 pCpyPara->rTabFrmArr.insert( aFindFrm );
             }
         }
         else
         {
             aFindFrm = pCpyPara->rTabFrmArr[ nFndPos ];
-            pBox->ChgFrmFmt( aFindFrm.pNewFrmFmt );
+            pBox->ChgFrameFormat( aFindFrm.pNewFrameFormat );
         }
     }
     else
@@ -366,12 +366,12 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
             itFind != pCpyPara->rTabFrmArr.end() )
             aFindFrm = *itFind;
         else
-            aFindFrm.pNewFrmFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
+            aFindFrm.pNewFrameFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
     }
 
     if (!rFndBox.GetLines().empty())
     {
-        pBox = new SwTableBox( aFindFrm.pNewFrmFmt,
+        pBox = new SwTableBox( aFindFrm.pNewFrameFormat,
                     rFndBox.GetLines().size(), pCpyPara->pInsLine );
         pCpyPara->pInsLine->GetTabBoxes().insert( pCpyPara->pInsLine->GetTabBoxes().begin() + pCpyPara->nInsPos++, pBox );
         _CpyPara aPara( *pCpyPara, pBox );
@@ -382,20 +382,20 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
     }
     else
     {
-        ::_InsTblBox( pCpyPara->pDoc, pCpyPara->pTblNd, pCpyPara->pInsLine,
-                    aFindFrm.pNewFrmFmt, pBox, pCpyPara->nInsPos++ );
+        ::_InsTableBox( pCpyPara->pDoc, pCpyPara->pTableNd, pCpyPara->pInsLine,
+                    aFindFrm.pNewFrameFormat, pBox, pCpyPara->nInsPos++ );
 
         const _FndBoxes& rFndBxs = rFndBox.GetUpper()->GetBoxes();
         if( 8 > pCpyPara->nDelBorderFlag
                 ? pCpyPara->nDelBorderFlag != 0
                 : &rFndBox == &rFndBxs[rFndBxs.size() - 1] )
         {
-            const SvxBoxItem& rBoxItem = pBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rBoxItem = pBox->GetFrameFormat()->GetBox();
             if( 8 > pCpyPara->nDelBorderFlag
                     ? rBoxItem.GetTop()
                     : rBoxItem.GetRight() )
             {
-                aFindFrm.Value.pFrmFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
+                aFindFrm.Value.pFrameFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
 
                 SvxBoxItem aNew( rBoxItem );
                 if( 8 > pCpyPara->nDelBorderFlag )
@@ -411,11 +411,11 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
                                             pCpyPara->nInsPos - 1 ];
                 }
 
-                aFindFrm.pNewFrmFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
+                aFindFrm.pNewFrameFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
 
                 // Else we copy before that and the first Line keeps the TopLine
                 // and we remove it at the original
-                pBox->ClaimFrmFmt()->SetFmtAttr( aNew );
+                pBox->ClaimFrameFormat()->SetFormatAttr( aNew );
 
                 if( !pCpyPara->nCpyCnt )
                     pCpyPara->rTabFrmArr.insert( aFindFrm );
@@ -427,7 +427,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
 static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara)
 {
     SwTableLine* pNewLine = new SwTableLine(
-                            static_cast<SwTableLineFmt*>(rFndLine.GetLine()->GetFrmFmt()),
+                            static_cast<SwTableLineFormat*>(rFndLine.GetLine()->GetFrameFormat()),
                         rFndLine.GetBoxes().size(), pCpyPara->pInsBox );
     if( pCpyPara->pInsBox )
     {
@@ -436,7 +436,7 @@ static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara)
     }
     else
     {
-        SwTableLines& rLines = pCpyPara->pTblNd->GetTable().GetTabLines();
+        SwTableLines& rLines = pCpyPara->pTableNd->GetTable().GetTabLines();
         rLines.insert( rLines.begin() + pCpyPara->nInsPos++, pNewLine );
     }
 
@@ -488,7 +488,7 @@ static void lcl_InsCol( _FndLine* pFndLn, _CpyPara& rCpyPara, sal_uInt16 nCpyCnt
 
 SwRowFrm* GetRowFrm( SwTableLine& rLine )
 {
-    SwIterator<SwRowFrm,SwFmt> aIter( *rLine.GetFrmFmt() );
+    SwIterator<SwRowFrm,SwFormat> aIter( *rLine.GetFrameFormat() );
     for( SwRowFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
         if( pFrm->GetTabLine() == &rLine )
             return pFrm;
@@ -498,8 +498,8 @@ SwRowFrm* GetRowFrm( SwTableLine& rLine )
 bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
 {
     OSL_ENSURE( !rBoxes.empty() && nCnt, "No valid Box List" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     bool bRes = true;
@@ -526,7 +526,7 @@ bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt,
         // get notified about new rows/cols.
 
         _CpyTabFrms aTabFrmArr;
-        _CpyPara aCpyPara( pTblNd, nCnt, aTabFrmArr );
+        _CpyPara aCpyPara( pTableNd, nCnt, aTabFrmArr );
 
         for( auto &rLine : aFndBox.GetLines() )
             lcl_InsCol( &rLine, aCpyPara, nCnt, bBehind );
@@ -545,7 +545,7 @@ bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt,
     SwChartDataProvider *pPCD = pDoc->getIDocumentChartDataProviderAccess().GetChartDataProvider();
     if (pPCD && nCnt)
         pPCD->AddRowCols( *this, rBoxes, nCnt, bBehind );
-    pDoc->UpdateCharts( GetFrmFmt()->GetName() );
+    pDoc->UpdateCharts( GetFrameFormat()->GetName() );
 
     return bRes;
 }
@@ -554,8 +554,8 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
                         sal_uInt16 nCnt, bool bBehind )
 {
     OSL_ENSURE( pDoc && !rBoxes.empty() && nCnt, "No valid Box List" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
      // Find all Boxes/Lines
@@ -586,7 +586,7 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
 
     // Find Lines for the layout update
     const bool bLayout = !IsNewModel() &&
-        nullptr != SwIterator<SwTabFrm,SwFmt>( *GetFrmFmt() ).First();
+        nullptr != SwIterator<SwTabFrm,SwFormat>( *GetFrameFormat() ).First();
 
     if ( bLayout )
     {
@@ -598,7 +598,7 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     }
 
     _CpyTabFrms aTabFrmArr;
-    _CpyPara aCpyPara( pTblNd, 0, aTabFrmArr );
+    _CpyPara aCpyPara( pTableNd, 0, aTabFrmArr );
 
     SwTableLine* pLine = pFndBox->GetLines()[ bBehind ?
                     pFndBox->GetLines().size()-1 : 0 ].GetLine();
@@ -645,64 +645,64 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     SwChartDataProvider *pPCD = pDoc->getIDocumentChartDataProviderAccess().GetChartDataProvider();
     if (pPCD && nCnt)
         pPCD->AddRowCols( *this, rBoxes, nCnt, bBehind );
-    pDoc->UpdateCharts( GetFrmFmt()->GetName() );
+    pDoc->UpdateCharts( GetFrameFormat()->GetName() );
 
     return true;
 }
 
 static void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
-                            bool bFirst, SwShareBoxFmts& rShareFmts );
+                            bool bFirst, SwShareBoxFormats& rShareFormats );
 
 static void lcl_LastBoxSetWidthLine( SwTableLines &rLines, const long nOffset,
-                                bool bFirst, SwShareBoxFmts& rShareFmts )
+                                bool bFirst, SwShareBoxFormats& rShareFormats )
 {
     for ( auto pLine : rLines )
-        ::lcl_LastBoxSetWidth( pLine->GetTabBoxes(), nOffset, bFirst, rShareFmts );
+        ::lcl_LastBoxSetWidth( pLine->GetTabBoxes(), nOffset, bFirst, rShareFormats );
 }
 
 static void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
-                            bool bFirst, SwShareBoxFmts& rShareFmts )
+                            bool bFirst, SwShareBoxFormats& rShareFormats )
 {
     SwTableBox& rBox = *(bFirst ? rBoxes.front() : rBoxes.back());
     if( !rBox.GetSttNd() )
         ::lcl_LastBoxSetWidthLine( rBox.GetTabLines(), nOffset,
-                                    bFirst, rShareFmts );
+                                    bFirst, rShareFormats );
 
     // Adapt the Box
-    const SwFrmFmt *pBoxFmt = rBox.GetFrmFmt();
-    SwFmtFrmSize aNew( pBoxFmt->GetFrmSize() );
+    const SwFrameFormat *pBoxFormat = rBox.GetFrameFormat();
+    SwFormatFrmSize aNew( pBoxFormat->GetFrmSize() );
     aNew.SetWidth( aNew.GetWidth() + nOffset );
-    SwFrmFmt *pFmt = rShareFmts.GetFormat( *pBoxFmt, aNew );
-    if( pFmt )
-        rBox.ChgFrmFmt( static_cast<SwTableBoxFmt*>(pFmt) );
+    SwFrameFormat *pFormat = rShareFormats.GetFormat( *pBoxFormat, aNew );
+    if( pFormat )
+        rBox.ChgFrameFormat( static_cast<SwTableBoxFormat*>(pFormat) );
     else
     {
-        pFmt = rBox.ClaimFrmFmt();
+        pFormat = rBox.ClaimFrameFormat();
 
-        pFmt->LockModify();
-        pFmt->SetFmtAttr( aNew );
-        pFmt->UnlockModify();
+        pFormat->LockModify();
+        pFormat->SetFormatAttr( aNew );
+        pFormat->UnlockModify();
 
-        rShareFmts.AddFormat( *pBoxFmt, *pFmt );
+        rShareFormats.AddFormat( *pBoxFormat, *pFormat );
     }
 }
 
-void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo,
+void _DeleteBox( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo,
                 bool bCalcNewSize, const bool bCorrBorder,
-                SwShareBoxFmts* pShareFmts )
+                SwShareBoxFormats* pShareFormats )
 {
     do {
         SwTwips nBoxSz = bCalcNewSize ?
-                pBox->GetFrmFmt()->GetFrmSize().GetWidth() : 0;
+                pBox->GetFrameFormat()->GetFrmSize().GetWidth() : 0;
         SwTableLine* pLine = pBox->GetUpper();
-        SwTableBoxes& rTblBoxes = pLine->GetTabBoxes();
-        sal_uInt16 nDelPos = rTblBoxes.GetPos( pBox );
+        SwTableBoxes& rTableBoxes = pLine->GetTabBoxes();
+        sal_uInt16 nDelPos = rTableBoxes.GetPos( pBox );
         SwTableBox* pUpperBox = pBox->GetUpper()->GetUpper();
 
         // Special treatment for the border:
-        if( bCorrBorder && 1 < rTblBoxes.size() )
+        if( bCorrBorder && 1 < rTableBoxes.size() )
         {
-            const SvxBoxItem& rBoxItem = pBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rBoxItem = pBox->GetFrameFormat()->GetBox();
 
             if( rBoxItem.GetLeft() || rBoxItem.GetRight() )
             {
@@ -710,46 +710,46 @@ void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo,
 
                 // JP 02.04.97: 1st part for Bug 36271
                 // First the left/right edges
-                if( nDelPos + 1 < (sal_uInt16)rTblBoxes.size() )
+                if( nDelPos + 1 < (sal_uInt16)rTableBoxes.size() )
                 {
-                    SwTableBox* pNxtBox = rTblBoxes[ nDelPos + 1 ];
-                    const SvxBoxItem& rNxtBoxItem = pNxtBox->GetFrmFmt()->GetBox();
+                    SwTableBox* pNxtBox = rTableBoxes[ nDelPos + 1 ];
+                    const SvxBoxItem& rNxtBoxItem = pNxtBox->GetFrameFormat()->GetBox();
 
-                    SwTableBox* pPrvBox = nDelPos ? rTblBoxes[ nDelPos - 1 ] : 0;
+                    SwTableBox* pPrvBox = nDelPos ? rTableBoxes[ nDelPos - 1 ] : 0;
 
                     if( pNxtBox->GetSttNd() && !rNxtBoxItem.GetLeft() &&
-                        ( !pPrvBox || !pPrvBox->GetFrmFmt()->GetBox().GetRight()) )
+                        ( !pPrvBox || !pPrvBox->GetFrameFormat()->GetBox().GetRight()) )
                     {
                         SvxBoxItem aTmp( rNxtBoxItem );
                         aTmp.SetLine( rBoxItem.GetLeft() ? rBoxItem.GetLeft()
                                                          : rBoxItem.GetRight(),
                                                             SvxBoxItemLine::LEFT );
-                        if( pShareFmts )
-                            pShareFmts->SetAttr( *pNxtBox, aTmp );
+                        if( pShareFormats )
+                            pShareFormats->SetAttr( *pNxtBox, aTmp );
                         else
-                            pNxtBox->ClaimFrmFmt()->SetFmtAttr( aTmp );
+                            pNxtBox->ClaimFrameFormat()->SetFormatAttr( aTmp );
                         bChgd = true;
                     }
                 }
                 if( !bChgd && nDelPos )
                 {
-                    SwTableBox* pPrvBox = rTblBoxes[ nDelPos - 1 ];
-                    const SvxBoxItem& rPrvBoxItem = pPrvBox->GetFrmFmt()->GetBox();
+                    SwTableBox* pPrvBox = rTableBoxes[ nDelPos - 1 ];
+                    const SvxBoxItem& rPrvBoxItem = pPrvBox->GetFrameFormat()->GetBox();
 
-                    SwTableBox* pNxtBox = nDelPos + 1 < (sal_uInt16)rTblBoxes.size()
-                                            ? rTblBoxes[ nDelPos + 1 ] : 0;
+                    SwTableBox* pNxtBox = nDelPos + 1 < (sal_uInt16)rTableBoxes.size()
+                                            ? rTableBoxes[ nDelPos + 1 ] : 0;
 
                     if( pPrvBox->GetSttNd() && !rPrvBoxItem.GetRight() &&
-                        ( !pNxtBox || !pNxtBox->GetFrmFmt()->GetBox().GetLeft()) )
+                        ( !pNxtBox || !pNxtBox->GetFrameFormat()->GetBox().GetLeft()) )
                     {
                         SvxBoxItem aTmp( rPrvBoxItem );
                         aTmp.SetLine( rBoxItem.GetLeft() ? rBoxItem.GetLeft()
                                                          : rBoxItem.GetRight(),
                                                             SvxBoxItemLine::RIGHT );
-                        if( pShareFmts )
-                            pShareFmts->SetAttr( *pPrvBox, aTmp );
+                        if( pShareFormats )
+                            pShareFormats->SetAttr( *pPrvBox, aTmp );
                         else
-                            pPrvBox->ClaimFrmFmt()->SetFmtAttr( aTmp );
+                            pPrvBox->ClaimFrameFormat()->SetFormatAttr( aTmp );
                     }
                 }
             }
@@ -757,49 +757,49 @@ void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo,
 
         // Delete the Box first, then the Nodes!
         SwStartNode* pSttNd = const_cast<SwStartNode*>(pBox->GetSttNd());
-        if( pShareFmts )
-            pShareFmts->RemoveFormat( *rTblBoxes[ nDelPos ]->GetFrmFmt() );
+        if( pShareFormats )
+            pShareFormats->RemoveFormat( *rTableBoxes[ nDelPos ]->GetFrameFormat() );
 
         // Before deleting the 'Table Box' from memory - delete any redlines attached to it
-        if ( rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTbl() )
-            rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteTableCellRedline( rTbl.GetFrmFmt()->GetDoc(), *(rTblBoxes[nDelPos]), true, USHRT_MAX );
-        delete rTblBoxes[nDelPos];
-        rTblBoxes.erase( rTblBoxes.begin() + nDelPos );
+        if ( rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTable() )
+            rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteTableCellRedline( rTable.GetFrameFormat()->GetDoc(), *(rTableBoxes[nDelPos]), true, USHRT_MAX );
+        delete rTableBoxes[nDelPos];
+        rTableBoxes.erase( rTableBoxes.begin() + nDelPos );
 
         if( pSttNd )
         {
             // Has the UndoObject been prepared to save the Section?
             if( pUndo && pUndo->IsDelBox() )
-                static_cast<SwUndoTblNdsChg*>(pUndo)->SaveSection( pSttNd );
+                static_cast<SwUndoTableNdsChg*>(pUndo)->SaveSection( pSttNd );
             else
                 pSttNd->GetDoc()->getIDocumentContentOperations().DeleteSection( pSttNd );
         }
 
         // Also delete the Line?
-        if( !rTblBoxes.empty() )
+        if( !rTableBoxes.empty() )
         {
             // Then adapt the Frame-SSize
-            bool bLastBox = nDelPos == rTblBoxes.size();
+            bool bLastBox = nDelPos == rTableBoxes.size();
             if( bLastBox )
                 --nDelPos;
-            pBox = rTblBoxes[nDelPos];
+            pBox = rTableBoxes[nDelPos];
             if( bCalcNewSize )
             {
-                SwFmtFrmSize aNew( pBox->GetFrmFmt()->GetFrmSize() );
+                SwFormatFrmSize aNew( pBox->GetFrameFormat()->GetFrmSize() );
                 aNew.SetWidth( aNew.GetWidth() + nBoxSz );
-                if( pShareFmts )
-                    pShareFmts->SetSize( *pBox, aNew );
+                if( pShareFormats )
+                    pShareFormats->SetSize( *pBox, aNew );
                 else
-                    pBox->ClaimFrmFmt()->SetFmtAttr( aNew );
+                    pBox->ClaimFrameFormat()->SetFormatAttr( aNew );
 
                 if( !pBox->GetSttNd() )
                 {
                     // We need to this recursively in all Lines in all Cells!
-                    SwShareBoxFmts aShareFmts;
+                    SwShareBoxFormats aShareFormats;
                     ::lcl_LastBoxSetWidthLine( pBox->GetTabLines(), nBoxSz,
                                                 !bLastBox,
-                                                pShareFmts ? *pShareFmts
-                                                           : aShareFmts );
+                                                pShareFormats ? *pShareFormats
+                                                           : aShareFormats );
                 }
             }
             break;      // Stop deleting
@@ -808,36 +808,36 @@ void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo,
         if( !pUpperBox )
         {
             // Also delete the Line from the Table
-            nDelPos = rTbl.GetTabLines().GetPos( pLine );
-            if( pShareFmts )
-                pShareFmts->RemoveFormat( *rTbl.GetTabLines()[ nDelPos ]->GetFrmFmt() );
+            nDelPos = rTable.GetTabLines().GetPos( pLine );
+            if( pShareFormats )
+                pShareFormats->RemoveFormat( *rTable.GetTabLines()[ nDelPos ]->GetFrameFormat() );
 
-            SwTableLine* pTabLineToDelete = rTbl.GetTabLines()[ nDelPos ];
+            SwTableLine* pTabLineToDelete = rTable.GetTabLines()[ nDelPos ];
             // Before deleting the 'Table Line' from memory - delete any redlines attached to it
-            if ( rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTbl() )
-                rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteTableRowRedline( rTbl.GetFrmFmt()->GetDoc(), *pTabLineToDelete, true, USHRT_MAX );
+            if ( rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTable() )
+                rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteTableRowRedline( rTable.GetFrameFormat()->GetDoc(), *pTabLineToDelete, true, USHRT_MAX );
             delete pTabLineToDelete;
-            rTbl.GetTabLines().erase( rTbl.GetTabLines().begin() + nDelPos );
+            rTable.GetTabLines().erase( rTable.GetTabLines().begin() + nDelPos );
             break;      // we cannot delete more
         }
 
         // finally also delete the Line
         pBox = pUpperBox;
         nDelPos = pBox->GetTabLines().GetPos( pLine );
-        if( pShareFmts )
-            pShareFmts->RemoveFormat( *pBox->GetTabLines()[ nDelPos ]->GetFrmFmt() );
+        if( pShareFormats )
+            pShareFormats->RemoveFormat( *pBox->GetTabLines()[ nDelPos ]->GetFrameFormat() );
 
         SwTableLine* pTabLineToDelete = pBox->GetTabLines()[ nDelPos ];
         // Before deleting the 'Table Line' from memory - delete any redlines attached to it
-        if ( rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTbl() )
-            rTbl.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteTableRowRedline( rTbl.GetFrmFmt()->GetDoc(), *pTabLineToDelete, true, USHRT_MAX );
+        if ( rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().HasExtraRedlineTable() )
+            rTable.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteTableRowRedline( rTable.GetFrameFormat()->GetDoc(), *pTabLineToDelete, true, USHRT_MAX );
         delete pTabLineToDelete;
         pBox->GetTabLines().erase( pBox->GetTabLines().begin() + nDelPos );
     } while( pBox->GetTabLines().empty() );
 }
 
 static SwTableBox*
-lcl_FndNxtPrvDelBox( const SwTableLines& rTblLns,
+lcl_FndNxtPrvDelBox( const SwTableLines& rTableLns,
                                 SwTwips nBoxStt, SwTwips nBoxWidth,
                                 sal_uInt16 nLinePos, bool bNxt,
                                 SwSelBoxes* pAllDelBoxes, size_t *const pCurPos)
@@ -848,7 +848,7 @@ lcl_FndNxtPrvDelBox( const SwTableLines& rTblLns,
             ++nLinePos;
         else
             --nLinePos;
-        SwTableLine* pLine = rTblLns[ nLinePos ];
+        SwTableLine* pLine = rTableLns[ nLinePos ];
         SwTwips nFndBoxWidth = 0;
         SwTwips nFndWidth = nBoxStt + nBoxWidth;
 
@@ -860,7 +860,7 @@ lcl_FndNxtPrvDelBox( const SwTableLines& rTblLns,
                 break;
             }
             pFndBox = pBox;
-            nFndBoxWidth = pFndBox->GetFrmFmt()->GetFrmSize().GetWidth();
+            nFndBoxWidth = pFndBox->GetFrameFormat()->GetFrmSize().GetWidth();
             nFndWidth -= nFndBoxWidth;
         }
 
@@ -892,77 +892,77 @@ lcl_FndNxtPrvDelBox( const SwTableLines& rTblLns,
                 --*pCurPos;
             pAllDelBoxes->erase( pAllDelBoxes->begin() + nFndPos );
         }
-    } while( bNxt ? ( nLinePos + 1 < (sal_uInt16)rTblLns.size() ) : nLinePos != 0 );
+    } while( bNxt ? ( nLinePos + 1 < (sal_uInt16)rTableLns.size() ) : nLinePos != 0 );
     return pFndBox;
 }
 
 static void
-lcl_SaveUpperLowerBorder( SwTable& rTbl, const SwTableBox& rBox,
-                                SwShareBoxFmts& rShareFmts,
+lcl_SaveUpperLowerBorder( SwTable& rTable, const SwTableBox& rBox,
+                                SwShareBoxFormats& rShareFormats,
                                 SwSelBoxes* pAllDelBoxes = 0,
                                 size_t *const pCurPos = 0 )
 {
 //JP 16.04.97:  2. part for Bug 36271
     const SwTableLine* pLine = rBox.GetUpper();
-    const SwTableBoxes& rTblBoxes = pLine->GetTabBoxes();
+    const SwTableBoxes& rTableBoxes = pLine->GetTabBoxes();
     const SwTableBox* pUpperBox = &rBox;
-    sal_uInt16 nDelPos = rTblBoxes.GetPos( pUpperBox );
+    sal_uInt16 nDelPos = rTableBoxes.GetPos( pUpperBox );
     pUpperBox = rBox.GetUpper()->GetUpper();
-    const SvxBoxItem& rBoxItem = rBox.GetFrmFmt()->GetBox();
+    const SvxBoxItem& rBoxItem = rBox.GetFrameFormat()->GetBox();
 
     // then the top/bottom edges
     if( rBoxItem.GetTop() || rBoxItem.GetBottom() )
     {
         bool bChgd = false;
-        const SwTableLines* pTblLns;
+        const SwTableLines* pTableLns;
         if( pUpperBox )
-            pTblLns = &pUpperBox->GetTabLines();
+            pTableLns = &pUpperBox->GetTabLines();
         else
-            pTblLns = &rTbl.GetTabLines();
+            pTableLns = &rTable.GetTabLines();
 
-        sal_uInt16 nLnPos = pTblLns->GetPos( pLine );
+        sal_uInt16 nLnPos = pTableLns->GetPos( pLine );
 
         // Calculate the attribute position of the top-be-deleted Box and then
         // search in the top/bottom Line of the respective counterparts.
         SwTwips nBoxStt = 0;
         for( sal_uInt16 n = 0; n < nDelPos; ++n )
-            nBoxStt += rTblBoxes[ n ]->GetFrmFmt()->GetFrmSize().GetWidth();
-        SwTwips nBoxWidth = rBox.GetFrmFmt()->GetFrmSize().GetWidth();
+            nBoxStt += rTableBoxes[ n ]->GetFrameFormat()->GetFrmSize().GetWidth();
+        SwTwips nBoxWidth = rBox.GetFrameFormat()->GetFrmSize().GetWidth();
 
         SwTableBox *pPrvBox = 0, *pNxtBox = 0;
         if( nLnPos )        // Predecessor?
-            pPrvBox = ::lcl_FndNxtPrvDelBox( *pTblLns, nBoxStt, nBoxWidth,
+            pPrvBox = ::lcl_FndNxtPrvDelBox( *pTableLns, nBoxStt, nBoxWidth,
                                 nLnPos, false, pAllDelBoxes, pCurPos );
 
-        if( nLnPos + 1 < (sal_uInt16)pTblLns->size() )     // Successor?
-            pNxtBox = ::lcl_FndNxtPrvDelBox( *pTblLns, nBoxStt, nBoxWidth,
+        if( nLnPos + 1 < (sal_uInt16)pTableLns->size() )     // Successor?
+            pNxtBox = ::lcl_FndNxtPrvDelBox( *pTableLns, nBoxStt, nBoxWidth,
                                 nLnPos, true, pAllDelBoxes, pCurPos );
 
         if( pNxtBox && pNxtBox->GetSttNd() )
         {
-            const SvxBoxItem& rNxtBoxItem = pNxtBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rNxtBoxItem = pNxtBox->GetFrameFormat()->GetBox();
             if( !rNxtBoxItem.GetTop() && ( !pPrvBox ||
-                !pPrvBox->GetFrmFmt()->GetBox().GetBottom()) )
+                !pPrvBox->GetFrameFormat()->GetBox().GetBottom()) )
             {
                 SvxBoxItem aTmp( rNxtBoxItem );
                 aTmp.SetLine( rBoxItem.GetTop() ? rBoxItem.GetTop()
                                                 : rBoxItem.GetBottom(),
                                                 SvxBoxItemLine::TOP );
-                rShareFmts.SetAttr( *pNxtBox, aTmp );
+                rShareFormats.SetAttr( *pNxtBox, aTmp );
                 bChgd = true;
             }
         }
         if( !bChgd && pPrvBox && pPrvBox->GetSttNd() )
         {
-            const SvxBoxItem& rPrvBoxItem = pPrvBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rPrvBoxItem = pPrvBox->GetFrameFormat()->GetBox();
             if( !rPrvBoxItem.GetTop() && ( !pNxtBox ||
-                !pNxtBox->GetFrmFmt()->GetBox().GetTop()) )
+                !pNxtBox->GetFrameFormat()->GetBox().GetTop()) )
             {
                 SvxBoxItem aTmp( rPrvBoxItem );
                 aTmp.SetLine( rBoxItem.GetTop() ? rBoxItem.GetTop()
                                                 : rBoxItem.GetBottom(),
                                                 SvxBoxItemLine::BOTTOM );
-                rShareFmts.SetAttr( *pPrvBox, aTmp );
+                rShareFormats.SetAttr( *pPrvBox, aTmp );
             }
         }
     }
@@ -976,11 +976,11 @@ bool SwTable::DeleteSel(
     const bool bDelMakeFrms, const bool bCorrBorder )
 {
     OSL_ENSURE( pDoc, "No doc?" );
-    SwTableNode* pTblNd = 0;
+    SwTableNode* pTableNd = 0;
     if( !rBoxes.empty() )
     {
-        pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-        if( !pTblNd )
+        pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+        if( !pTableNd )
             return false;
     }
 
@@ -997,7 +997,7 @@ bool SwTable::DeleteSel(
         aFndBox.DelFrms( *this );
     }
 
-    SwShareBoxFmts aShareFmts;
+    SwShareBoxFormats aShareFormats;
 
     // First switch the Border, then delete
     if( bCorrBorder )
@@ -1005,7 +1005,7 @@ bool SwTable::DeleteSel(
         SwSelBoxes aBoxes( rBoxes );
         for (size_t n = 0; n < aBoxes.size(); ++n)
         {
-            ::lcl_SaveUpperLowerBorder( *this, *rBoxes[ n ], aShareFmts,
+            ::lcl_SaveUpperLowerBorder( *this, *rBoxes[ n ], aShareFormats,
                                         &aBoxes, &n );
         }
     }
@@ -1021,11 +1021,11 @@ bool SwTable::DeleteSel(
         // First adapt the data-sequence for chart if necessary
         // (needed to move the implementation cursor properly to it's new
         // position which can't be done properly if the cell is already gone)
-        if (pPCD && pTblNd)
-            pPCD->DeleteBox( &pTblNd->GetTable(), *rBoxes[nIdx] );
+        if (pPCD && pTableNd)
+            pPCD->DeleteBox( &pTableNd->GetTable(), *rBoxes[nIdx] );
 
         // ... then delete the boxes
-        _DeleteBox( *this, rBoxes[nIdx], pUndo, true, bCorrBorder, &aShareFmts );
+        _DeleteBox( *this, rBoxes[nIdx], pUndo, true, bCorrBorder, &aShareFormats );
     }
 
     // then clean up the structure of all Lines
@@ -1035,7 +1035,7 @@ bool SwTable::DeleteSel(
         aFndBox.MakeFrms( *this );
 
     // TL_CHART2: now inform chart that sth has changed
-    pDoc->UpdateCharts( GetFrmFmt()->GetName() );
+    pDoc->UpdateCharts( GetFrameFormat()->GetName() );
 
     CHECKTABLELAYOUT;
     CHECK_TABLE( *this );
@@ -1047,8 +1047,8 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
                         bool bSameHeight )
 {
     OSL_ENSURE( pDoc && !rBoxes.empty() && nCnt, "No valid values" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // TL_CHART2: splitting/merging of a number of cells or rows will usually make
@@ -1086,10 +1086,10 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
 
         // Insert nCnt new Lines into the Box
         SwTableLine* pInsLine = pSelBox->GetUpper();
-        SwTableBoxFmt* pFrmFmt = static_cast<SwTableBoxFmt*>(pSelBox->GetFrmFmt());
+        SwTableBoxFormat* pFrameFormat = static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat());
 
         // Respect the Line's height, reset if needed
-        SwFmtFrmSize aFSz( pInsLine->GetFrmFmt()->GetFrmSize() );
+        SwFormatFrmSize aFSz( pInsLine->GetFrameFormat()->GetFrmSize() );
         if ( bSameHeight && ATT_VAR_SIZE == aFSz.GetHeightSizeType() )
             aFSz.SetHeightSizeType( ATT_MIN_SIZE );
 
@@ -1098,7 +1098,7 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             aFSz.SetHeight( ( bSameHeight ? pRowHeights[ n ] : aFSz.GetHeight() ) /
                              (nCnt + 1) );
 
-        SwTableBox* pNewBox = new SwTableBox( pFrmFmt, nCnt, pInsLine );
+        SwTableBox* pNewBox = new SwTableBox( pFrameFormat, nCnt, pInsLine );
         sal_uInt16 nBoxPos = pInsLine->GetTabBoxes().GetPos( pSelBox );
         pInsLine->GetTabBoxes()[nBoxPos] = pNewBox; // overwrite old one
 
@@ -1111,26 +1111,26 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             sal_uLong nSttNd = pLastBox->GetSttIdx() + 1,
                     nEndNd = pLastBox->GetSttNd()->EndOfSectionIndex();
             while( nSttNd < nEndNd )
-                if( !pDoc->GetNodes()[ nSttNd++ ]->IsTxtNode() )
+                if( !pDoc->GetNodes()[ nSttNd++ ]->IsTextNode() )
                 {
                     bMoveNodes = false;
                     break;
                 }
         }
 
-        SwTableBoxFmt* pCpyBoxFrmFmt = static_cast<SwTableBoxFmt*>(pSelBox->GetFrmFmt());
-        bool bChkBorder = 0 != pCpyBoxFrmFmt->GetBox().GetTop();
+        SwTableBoxFormat* pCpyBoxFrameFormat = static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat());
+        bool bChkBorder = 0 != pCpyBoxFrameFormat->GetBox().GetTop();
         if( bChkBorder )
-            pCpyBoxFrmFmt = static_cast<SwTableBoxFmt*>(pSelBox->ClaimFrmFmt());
+            pCpyBoxFrameFormat = static_cast<SwTableBoxFormat*>(pSelBox->ClaimFrameFormat());
 
         for( sal_uInt16 i = 0; i <= nCnt; ++i )
         {
             // Create a new Line in the new Box
             SwTableLine* pNewLine = new SwTableLine(
-                    static_cast<SwTableLineFmt*>(pInsLine->GetFrmFmt()), 1, pNewBox );
+                    static_cast<SwTableLineFormat*>(pInsLine->GetFrameFormat()), 1, pNewBox );
             if( bChgLineSz )
             {
-                pNewLine->ClaimFrmFmt()->SetFmtAttr( aFSz );
+                pNewLine->ClaimFrameFormat()->SetFormatAttr( aFSz );
             }
 
             pNewBox->GetTabLines().insert( pNewBox->GetTabLines().begin() + i, pNewLine );
@@ -1142,15 +1142,15 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             }
             else
             {
-                ::_InsTblBox( pDoc, pTblNd, pNewLine, pCpyBoxFrmFmt,
+                ::_InsTableBox( pDoc, pTableNd, pNewLine, pCpyBoxFrameFormat,
                                 pLastBox, 0 );
 
                 if( bChkBorder )
                 {
-                    pCpyBoxFrmFmt = static_cast<SwTableBoxFmt*>(pNewLine->GetTabBoxes()[ 0 ]->ClaimFrmFmt());
-                    SvxBoxItem aTmp( pCpyBoxFrmFmt->GetBox() );
+                    pCpyBoxFrameFormat = static_cast<SwTableBoxFormat*>(pNewLine->GetTabBoxes()[ 0 ]->ClaimFrameFormat());
+                    SvxBoxItem aTmp( pCpyBoxFrameFormat->GetBox() );
                     aTmp.SetLine( 0, SvxBoxItemLine::TOP );
-                    pCpyBoxFrmFmt->SetFmtAttr( aTmp );
+                    pCpyBoxFrameFormat->SetFormatAttr( aTmp );
                     bChkBorder = false;
                 }
 
@@ -1170,9 +1170,9 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             }
         }
         // In Boxes with Lines, we can only have Size/Fillorder
-        pFrmFmt = static_cast<SwTableBoxFmt*>(pNewBox->ClaimFrmFmt());
-        pFrmFmt->ResetFmtAttr( RES_LR_SPACE, RES_FRMATR_END - 1 );
-        pFrmFmt->ResetFmtAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 );
+        pFrameFormat = static_cast<SwTableBoxFormat*>(pNewBox->ClaimFrameFormat());
+        pFrameFormat->ResetFormatAttr( RES_LR_SPACE, RES_FRMATR_END - 1 );
+        pFrameFormat->ResetFormatAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 );
     }
 
     delete[] pRowHeights;
@@ -1189,8 +1189,8 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
 bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
 {
     OSL_ENSURE( pDoc && !rBoxes.empty() && nCnt, "No valid values" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // TL_CHART2: splitting/merging of a number of cells or rows will usually make
@@ -1208,14 +1208,14 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
     aFndBox.DelFrms( *this );
 
     _CpyTabFrms aFrmArr;
-    std::vector<SwTableBoxFmt*> aLastBoxArr;
+    std::vector<SwTableBoxFormat*> aLastBoxArr;
     for (size_t n = 0; n < aSelBoxes.size(); ++n)
     {
         SwTableBox* pSelBox = aSelBoxes[n];
         OSL_ENSURE( pSelBox, "Box is not in the table" );
 
         // We don't want to split small table cells into very very small cells
-        if( pSelBox->GetFrmFmt()->GetFrmSize().GetWidth()/( nCnt + 1 ) < 10 )
+        if( pSelBox->GetFrameFormat()->GetFrmSize().GetWidth()/( nCnt + 1 ) < 10 )
             continue;
 
         // Then split the nCnt Box up into nCnt Boxes
@@ -1223,62 +1223,62 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
         sal_uInt16 nBoxPos = pInsLine->GetTabBoxes().GetPos( pSelBox );
 
         // Find the Frame Format in the Frame Format Array
-        SwTableBoxFmt* pLastBoxFmt;
-        _CpyTabFrm aFindFrm( static_cast<SwTableBoxFmt*>(pSelBox->GetFrmFmt()) );
+        SwTableBoxFormat* pLastBoxFormat;
+        _CpyTabFrm aFindFrm( static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat()) );
         _CpyTabFrms::const_iterator itFind = aFrmArr.lower_bound( aFindFrm );
         const size_t nFndPos = itFind - aFrmArr.begin();
         if( itFind == aFrmArr.end() || !(*itFind == aFindFrm) )
         {
-            // Change the FrmFmt
-            aFindFrm.pNewFrmFmt = static_cast<SwTableBoxFmt*>(pSelBox->ClaimFrmFmt());
-            SwTwips nBoxSz = aFindFrm.pNewFrmFmt->GetFrmSize().GetWidth();
+            // Change the FrameFormat
+            aFindFrm.pNewFrameFormat = static_cast<SwTableBoxFormat*>(pSelBox->ClaimFrameFormat());
+            SwTwips nBoxSz = aFindFrm.pNewFrameFormat->GetFrmSize().GetWidth();
             SwTwips nNewBoxSz = nBoxSz / ( nCnt + 1 );
-            aFindFrm.pNewFrmFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
+            aFindFrm.pNewFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE,
                                                         nNewBoxSz, 0 ) );
             aFrmArr.insert( aFindFrm );
 
-            pLastBoxFmt = aFindFrm.pNewFrmFmt;
+            pLastBoxFormat = aFindFrm.pNewFrameFormat;
             if( nBoxSz != ( nNewBoxSz * (nCnt + 1)))
             {
                 // We have a remainder, so we need to define an own Format
                 // for the last Box.
-                pLastBoxFmt = new SwTableBoxFmt( *aFindFrm.pNewFrmFmt );
-                pLastBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
+                pLastBoxFormat = new SwTableBoxFormat( *aFindFrm.pNewFrameFormat );
+                pLastBoxFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE,
                                 nBoxSz - ( nNewBoxSz * nCnt ), 0 ) );
             }
-            aLastBoxArr.insert( aLastBoxArr.begin() + nFndPos, pLastBoxFmt );
+            aLastBoxArr.insert( aLastBoxArr.begin() + nFndPos, pLastBoxFormat );
         }
         else
         {
             aFindFrm = aFrmArr[ nFndPos ];
-            pSelBox->ChgFrmFmt( aFindFrm.pNewFrmFmt );
-            pLastBoxFmt = aLastBoxArr[ nFndPos ];
+            pSelBox->ChgFrameFormat( aFindFrm.pNewFrameFormat );
+            pLastBoxFormat = aLastBoxArr[ nFndPos ];
         }
 
         // Insert the Boxes at the Position
         for( sal_uInt16 i = 1; i < nCnt; ++i )
-            ::_InsTblBox( pDoc, pTblNd, pInsLine, aFindFrm.pNewFrmFmt,
+            ::_InsTableBox( pDoc, pTableNd, pInsLine, aFindFrm.pNewFrameFormat,
                         pSelBox, nBoxPos + i ); // insert after
 
-        ::_InsTblBox( pDoc, pTblNd, pInsLine, pLastBoxFmt,
+        ::_InsTableBox( pDoc, pTableNd, pInsLine, pLastBoxFormat,
                     pSelBox, nBoxPos + nCnt );  // insert after
 
         // Special treatment for the Border:
-        const SvxBoxItem& aSelBoxItem = aFindFrm.pNewFrmFmt->GetBox();
+        const SvxBoxItem& aSelBoxItem = aFindFrm.pNewFrameFormat->GetBox();
         if( aSelBoxItem.GetRight() )
         {
-            pInsLine->GetTabBoxes()[ nBoxPos + nCnt ]->ClaimFrmFmt();
+            pInsLine->GetTabBoxes()[ nBoxPos + nCnt ]->ClaimFrameFormat();
 
             SvxBoxItem aTmp( aSelBoxItem );
             aTmp.SetLine( 0, SvxBoxItemLine::RIGHT );
-            aFindFrm.pNewFrmFmt->SetFmtAttr( aTmp );
+            aFindFrm.pNewFrameFormat->SetFormatAttr( aTmp );
 
             // Remove the Format from the "cache"
             for( auto i = aFrmArr.size(); i; )
             {
                 const _CpyTabFrm& rCTF = aFrmArr[ --i ];
-                if( rCTF.pNewFrmFmt == aFindFrm.pNewFrmFmt ||
-                    rCTF.Value.pFrmFmt == aFindFrm.pNewFrmFmt )
+                if( rCTF.pNewFrameFormat == aFindFrm.pNewFrameFormat ||
+                    rCTF.Value.pFrameFormat == aFindFrm.pNewFrameFormat )
                 {
                     aFrmArr.erase( aFrmArr.begin() + i );
                     aLastBoxArr.erase( aLastBoxArr.begin() + i );
@@ -1340,7 +1340,7 @@ static void lcl_CpyBoxes( sal_uInt16 nStt, sal_uInt16 nEnd,
 static void lcl_CalcWidth( SwTableBox* pBox )
 {
     // Assertion: Every Line in the Box is as large
-    SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
+    SwFrameFormat* pFormat = pBox->ClaimFrameFormat();
     OSL_ENSURE( pBox->GetTabLines().size(), "Box does not have any Lines" );
 
     SwTableLine* pLine = pBox->GetTabLines()[0];
@@ -1348,18 +1348,18 @@ static void lcl_CalcWidth( SwTableBox* pBox )
 
     long nWidth = 0;
     for( auto pTabBox : pLine->GetTabBoxes() )
-        nWidth += pTabBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        nWidth += pTabBox->GetFrameFormat()->GetFrmSize().GetWidth();
 
-    pFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
+    pFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
 
     // Boxes with Lines can only have Size/Fillorder
-    pFmt->ResetFmtAttr( RES_LR_SPACE, RES_FRMATR_END - 1 );
-    pFmt->ResetFmtAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 );
+    pFormat->ResetFormatAttr( RES_LR_SPACE, RES_FRMATR_END - 1 );
+    pFormat->ResetFormatAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 );
 }
 
 struct _InsULPara
 {
-    SwTableNode* pTblNd;
+    SwTableNode* pTableNd;
     SwTableLine* pInsLine;
     SwTableBox* pInsBox;
     bool bUL_LR : 1;        // Upper-Lower(true) or Left-Right(false) ?
@@ -1372,7 +1372,7 @@ struct _InsULPara
     _InsULPara( SwTableNode* pTNd, bool bUpperLower, bool bUpper,
                 SwTableBox* pLeft, SwTableBox* pMerge, SwTableBox* pRight,
                 SwTableLine* pLine=0, SwTableBox* pBox=0 )
-        : pTblNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ),
+        : pTableNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ),
         pLeftBox( pLeft ), pRightBox( pRight ), pMergeBox( pMerge )
         {   bUL_LR = bUpperLower; bUL = bUpper; }
 
@@ -1426,7 +1426,7 @@ static void lcl_Merge_MoveBox(_FndBox & rFndBox, _InsULPara *const pULPara)
     if (rFndBox.GetBox()->GetTabLines().size())
     {
         SwTableBox* pBox = new SwTableBox(
-                static_cast<SwTableBoxFmt*>(rFndBox.GetBox()->GetFrmFmt()),
+                static_cast<SwTableBoxFormat*>(rFndBox.GetBox()->GetFrameFormat()),
                 0, pULPara->pInsLine );
         _InsULPara aPara( *pULPara );
         aPara.pInsBox = pBox;
@@ -1459,7 +1459,7 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara)
         SwTableLine* pFndLn = rFndLine.GetLine();
         pLines = pFndLn->GetUpper() ?
                         &pFndLn->GetUpper()->GetTabLines() :
-                        &pULPara->pTblNd->GetTable().GetTabLines();
+                        &pULPara->pTableNd->GetTable().GetTabLines();
 
         SwTableBox* pLBx = rFndLine.GetBoxes().front().GetBox();
         SwTableBox* pRBx = rFndLine.GetBoxes().back().GetBox();
@@ -1491,10 +1491,10 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara)
             // inserted
             SwTableLine* pInsLine = pULPara->pLeftBox->GetUpper();
             SwTableBox* pLMBox = new SwTableBox(
-                static_cast<SwTableBoxFmt*>(pULPara->pLeftBox->GetFrmFmt()), 0, pInsLine );
+                static_cast<SwTableBoxFormat*>(pULPara->pLeftBox->GetFrameFormat()), 0, pInsLine );
             SwTableLine* pLMLn = new SwTableLine(
-                        static_cast<SwTableLineFmt*>(pInsLine->GetFrmFmt()), 2, pLMBox );
-            pLMLn->ClaimFrmFmt()->ResetFmtAttr( RES_FRM_SIZE );
+                        static_cast<SwTableLineFormat*>(pInsLine->GetFrameFormat()), 2, pLMBox );
+            pLMLn->ClaimFrameFormat()->ResetFormatAttr( RES_FRM_SIZE );
 
             pLMBox->GetTabLines().insert( pLMBox->GetTabLines().begin(), pLMLn );
 
@@ -1526,7 +1526,7 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara)
     pLines = &pULPara->pInsBox->GetTabLines();
 
     SwTableLine* pNewLine = new SwTableLine(
-        static_cast<SwTableLineFmt*>(rFndLine.GetLine()->GetFrmFmt()), 0, pULPara->pInsBox );
+        static_cast<SwTableLineFormat*>(rFndLine.GetLine()->GetFrameFormat()), 0, pULPara->pInsBox );
     _InsULPara aPara( *pULPara );       // copying
     aPara.pInsLine = pNewLine;
     _FndBoxes & rLineBoxes = rFndLine.GetBoxes();
@@ -1549,11 +1549,11 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara)
 static void lcl_BoxSetHeadCondColl( const SwTableBox* pBox );
 
 bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
-                        SwTableBox* pMergeBox, SwUndoTblMerge* pUndo )
+                        SwTableBox* pMergeBox, SwUndoTableMerge* pUndo )
 {
     OSL_ENSURE( !rBoxes.empty() && pMergeBox, "no valid values" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // Find all Boxes/Lines
@@ -1587,9 +1587,9 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     }
 
     SwTableLine* pInsLine = new SwTableLine(
-                static_cast<SwTableLineFmt*>(pFndBox->GetLines().front().GetLine()->GetFrmFmt()), 0,
+                static_cast<SwTableLineFormat*>(pFndBox->GetLines().front().GetLine()->GetFrameFormat()), 0,
                 !pFndBox->GetUpper() ? 0 : pFndBox->GetBox() );
-    pInsLine->ClaimFrmFmt()->ResetFmtAttr( RES_FRM_SIZE );
+    pInsLine->ClaimFrameFormat()->ResetFormatAttr( RES_FRM_SIZE );
 
     // Add the new Line
     SwTableLines* pLines =  pFndBox->GetUpper() ?
@@ -1599,18 +1599,18 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     sal_uInt16 nInsPos = pLines->GetPos( pNewLine );
     pLines->insert( pLines->begin() + nInsPos, pInsLine );
 
-    SwTableBox* pLeftBox = new SwTableBox( static_cast<SwTableBoxFmt*>(pMergeBox->GetFrmFmt()), 0, pInsLine );
-    SwTableBox* pRightBox = new SwTableBox( static_cast<SwTableBoxFmt*>(pMergeBox->GetFrmFmt()), 0, pInsLine );
+    SwTableBox* pLeftBox = new SwTableBox( static_cast<SwTableBoxFormat*>(pMergeBox->GetFrameFormat()), 0, pInsLine );
+    SwTableBox* pRightBox = new SwTableBox( static_cast<SwTableBoxFormat*>(pMergeBox->GetFrameFormat()), 0, pInsLine );
     pMergeBox->SetUpper( pInsLine );
     pInsLine->GetTabBoxes().insert( pInsLine->GetTabBoxes().begin(), pLeftBox );
-    pLeftBox->ClaimFrmFmt();
+    pLeftBox->ClaimFrameFormat();
     pInsLine->GetTabBoxes().insert( pInsLine->GetTabBoxes().begin() + 1, pMergeBox);
     pInsLine->GetTabBoxes().insert( pInsLine->GetTabBoxes().begin() + 2, pRightBox );
-    pRightBox->ClaimFrmFmt();
+    pRightBox->ClaimFrameFormat();
 
     // This contains all Lines that are above the selected Area,
     // thus they form a Upper/Lower Line
-    _InsULPara aPara( pTblNd, true, true, pLeftBox, pMergeBox, pRightBox, pInsLine );
+    _InsULPara aPara( pTableNd, true, true, pLeftBox, pMergeBox, pRightBox, pInsLine );
 
     // Move the overlapping upper/lower Lines of the selected Area
     _FndBoxes& rLineBoxes = pFndBox->GetLines().front().GetBoxes();
@@ -1669,14 +1669,14 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     return true;
 }
 
-static void lcl_CheckRowSpan( SwTable &rTbl )
+static void lcl_CheckRowSpan( SwTable &rTable )
 {
-    const long nLineCount = static_cast<long>(rTbl.GetTabLines().size());
+    const long nLineCount = static_cast<long>(rTable.GetTabLines().size());
     long nMaxSpan = nLineCount;
     long nMinSpan = 1;
     while( nMaxSpan )
     {
-        SwTableLine* pLine = rTbl.GetTabLines()[ nLineCount - nMaxSpan ];
+        SwTableLine* pLine = rTable.GetTabLines()[ nLineCount - nMaxSpan ];
         for( auto pBox : pLine->GetTabBoxes() )
         {
             long nRowSpan = pBox->getRowSpan();
@@ -1706,7 +1706,7 @@ static sal_uInt16 lcl_GetBoxOffset( const _FndBox& rBox )
         {
             if (pBox==pCmp)
                 break;
-            nRet = nRet + (sal_uInt16) pCmp->GetFrmFmt()->GetFrmSize().GetWidth();
+            nRet = nRet + (sal_uInt16) pCmp->GetFrameFormat()->GetFrmSize().GetWidth();
         }
         pBox = pBox->GetUpper()->GetUpper();
     } while( pBox );
@@ -1719,7 +1719,7 @@ static sal_uInt16 lcl_GetLineWidth( const _FndLine& rLine )
     for( auto n = rLine.GetBoxes().size(); n; )
     {
         nRet = nRet + static_cast<sal_uInt16>(rLine.GetBoxes()[--n].GetBox()
-                            ->GetFrmFmt()->GetFrmSize().GetWidth());
+                            ->GetFrameFormat()->GetFrmSize().GetWidth());
     }
     return nRet;
 }
@@ -1754,7 +1754,7 @@ static void lcl_CalcNewWidths( const _FndLines& rFndLines, _CpyPara& rPara )
                     {
                         SwTableBox* pBox = pLine->GetTabBoxes()[nBox++];
                         if( pBox != pSel )
-                            nPos += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+                            nPos += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
                         else
                             break;
                     }
@@ -1769,7 +1769,7 @@ static void lcl_CalcNewWidths( const _FndLines& rFndLines, _CpyPara& rPara )
                     for( nBox = 0; nBox < nBoxCount; )
                     {
                         nPos += pFndLine->GetBoxes()[nBox]
-                            .GetBox()->GetFrmFmt()->GetFrmSize().GetWidth();
+                            .GetBox()->GetFrameFormat()->GetFrmSize().GetWidth();
                         rWidth[ ++nBox ] = nPos;
                     }
                     // nPos: The right border of the last selected box
@@ -1816,7 +1816,7 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
     sal_uLong nRealSize;
     sal_uLong nDummy1 = 0;
     sal_uLong nDummy2 = 0;
-    if( pCpyPara->pTblNd->GetTable().IsNewModel() )
+    if( pCpyPara->pTableNd->GetTable().IsNewModel() )
     {
         if( pCpyPara->nBoxIdx == 1 )
             nDummy1 = (*pCpyPara->pWidths.get())[pCpyPara->nLnIdx][0];
@@ -1827,7 +1827,7 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
     else
     {
         nRealSize = pCpyPara->nNewSize;
-        nRealSize *= rFndBox.GetBox()->GetFrmFmt()->GetFrmSize().GetWidth();
+        nRealSize *= rFndBox.GetBox()->GetFrameFormat()->GetFrmSize().GetWidth();
         if (pCpyPara->nOldSize == 0)
             throw o3tl::divide_by_zero();
         nRealSize /= pCpyPara->nOldSize;
@@ -1845,29 +1845,29 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
     do
     {
         // Find the Frame Format in the list of all Frame Formats
-        _CpyTabFrm aFindFrm(static_cast<SwTableBoxFmt*>(rFndBox.GetBox()->GetFrmFmt()));
+        _CpyTabFrm aFindFrm(static_cast<SwTableBoxFormat*>(rFndBox.GetBox()->GetFrameFormat()));
 
-        SwFmtFrmSize aFrmSz;
+        SwFormatFrmSize aFrmSz;
         _CpyTabFrms::const_iterator itFind = pCpyPara->rTabFrmArr.lower_bound( aFindFrm );
         const _CpyTabFrms::size_type nFndPos = itFind - pCpyPara->rTabFrmArr.begin();
         if( itFind == pCpyPara->rTabFrmArr.end() || !(*itFind == aFindFrm) ||
-            ( aFrmSz = ( aFindFrm = pCpyPara->rTabFrmArr[ nFndPos ]).pNewFrmFmt->
+            ( aFrmSz = ( aFindFrm = pCpyPara->rTabFrmArr[ nFndPos ]).pNewFrameFormat->
                 GetFrmSize()).GetWidth() != (SwTwips)nSize )
         {
             // It doesn't exist yet, so copy it
-            aFindFrm.pNewFrmFmt = pCpyPara->pDoc->MakeTableBoxFmt();
-            aFindFrm.pNewFrmFmt->CopyAttrs( *rFndBox.GetBox()->GetFrmFmt() );
-            if( !pCpyPara->bCpyCntnt )
-                aFindFrm.pNewFrmFmt->ResetFmtAttr(  RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
+            aFindFrm.pNewFrameFormat = pCpyPara->pDoc->MakeTableBoxFormat();
+            aFindFrm.pNewFrameFormat->CopyAttrs( *rFndBox.GetBox()->GetFrameFormat() );
+            if( !pCpyPara->bCpyContent )
+                aFindFrm.pNewFrameFormat->ResetFormatAttr(  RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
             aFrmSz.SetWidth( nSize );
-            aFindFrm.pNewFrmFmt->SetFmtAttr( aFrmSz );
+            aFindFrm.pNewFrameFormat->SetFormatAttr( aFrmSz );
             pCpyPara->rTabFrmArr.insert( aFindFrm );
         }
 
         SwTableBox* pBox;
         if (!rFndBox.GetLines().empty())
         {
-            pBox = new SwTableBox( aFindFrm.pNewFrmFmt,
+            pBox = new SwTableBox( aFindFrm.pNewFrameFormat,
                         rFndBox.GetLines().size(), pCpyPara->pInsLine );
             pCpyPara->pInsLine->GetTabBoxes().insert( pCpyPara->pInsLine->GetTabBoxes().begin() + pCpyPara->nInsPos++, pBox );
             _CpyPara aPara( *pCpyPara, pBox );
@@ -1878,14 +1878,14 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
         else
         {
             // Create an empty Box
-            pCpyPara->pDoc->GetNodes().InsBoxen( pCpyPara->pTblNd, pCpyPara->pInsLine,
-                            aFindFrm.pNewFrmFmt,
-                            pCpyPara->pDoc->GetDfltTxtFmtColl(),
+            pCpyPara->pDoc->GetNodes().InsBoxen( pCpyPara->pTableNd, pCpyPara->pInsLine,
+                            aFindFrm.pNewFrameFormat,
+                            pCpyPara->pDoc->GetDfltTextFormatColl(),
                             0, pCpyPara->nInsPos );
             pBox = pCpyPara->pInsLine->GetTabBoxes()[ pCpyPara->nInsPos ];
             if( bDummy )
                 pBox->setDummyFlag( true );
-            else if( pCpyPara->bCpyCntnt )
+            else if( pCpyPara->bCpyContent )
             {
                 // Copy the content into this empty Box
                 pBox->setRowSpan(rFndBox.GetBox()->getRowSpan());
@@ -1894,23 +1894,23 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
                 {
                     SfxItemSet aBoxAttrSet( pCpyPara->pDoc->GetAttrPool(),
                                             RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
-                    aBoxAttrSet.Put(rFndBox.GetBox()->GetFrmFmt()->GetAttrSet());
+                    aBoxAttrSet.Put(rFndBox.GetBox()->GetFrameFormat()->GetAttrSet());
                     if( aBoxAttrSet.Count() )
                     {
                         const SfxPoolItem* pItem;
                         SvNumberFormatter* pN = pCpyPara->pDoc->GetNumberFormatter( false );
-                        if( pN && pN->HasMergeFmtTbl() && SfxItemState::SET == aBoxAttrSet.
+                        if( pN && pN->HasMergeFormatTable() && SfxItemState::SET == aBoxAttrSet.
                             GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
                         {
-                            sal_uLong nOldIdx = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
-                            sal_uLong nNewIdx = pN->GetMergeFmtIndex( nOldIdx );
+                            sal_uLong nOldIdx = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
+                            sal_uLong nNewIdx = pN->GetMergeFormatIndex( nOldIdx );
                             if( nNewIdx != nOldIdx )
-                                aBoxAttrSet.Put( SwTblBoxNumFormat( nNewIdx ));
+                                aBoxAttrSet.Put( SwTableBoxNumFormat( nNewIdx ));
                         }
-                        pBox->ClaimFrmFmt()->SetFmtAttr( aBoxAttrSet );
+                        pBox->ClaimFrameFormat()->SetFormatAttr( aBoxAttrSet );
                     }
                 }
-                SwDoc* pFromDoc = rFndBox.GetBox()->GetFrmFmt()->GetDoc();
+                SwDoc* pFromDoc = rFndBox.GetBox()->GetFrameFormat()->GetDoc();
                 SwNodeRange aCpyRg( *rFndBox.GetBox()->GetSttNd(), 1,
                         *rFndBox.GetBox()->GetSttNd()->EndOfSectionNode() );
                 SwNodeIndex aInsIdx( *pBox->GetSttNd(), 1 );
@@ -1941,19 +1941,19 @@ static void
 lcl_CopyLineToDoc(const _FndLine& rFndLine, _CpyPara *const pCpyPara)
 {
     // Find the Frame Format in the list of all Frame Formats
-    _CpyTabFrm aFindFrm( static_cast<SwTableBoxFmt*>(rFndLine.GetLine()->GetFrmFmt()) );
+    _CpyTabFrm aFindFrm( static_cast<SwTableBoxFormat*>(rFndLine.GetLine()->GetFrameFormat()) );
     _CpyTabFrms::const_iterator itFind = pCpyPara->rTabFrmArr.find( aFindFrm );
     if( itFind == pCpyPara->rTabFrmArr.end() )
     {
         // It doesn't exist yet, so copy it
-        aFindFrm.pNewFrmFmt = reinterpret_cast<SwTableBoxFmt*>(pCpyPara->pDoc->MakeTableLineFmt());
-        aFindFrm.pNewFrmFmt->CopyAttrs( *rFndLine.GetLine()->GetFrmFmt() );
+        aFindFrm.pNewFrameFormat = reinterpret_cast<SwTableBoxFormat*>(pCpyPara->pDoc->MakeTableLineFormat());
+        aFindFrm.pNewFrameFormat->CopyAttrs( *rFndLine.GetLine()->GetFrameFormat() );
         pCpyPara->rTabFrmArr.insert( aFindFrm );
     }
     else
         aFindFrm = *itFind;
 
-    SwTableLine* pNewLine = new SwTableLine( reinterpret_cast<SwTableLineFmt*>(aFindFrm.pNewFrmFmt),
+    SwTableLine* pNewLine = new SwTableLine( reinterpret_cast<SwTableLineFormat*>(aFindFrm.pNewFrameFormat),
                         rFndLine.GetBoxes().size(), pCpyPara->pInsBox );
     if( pCpyPara->pInsBox )
     {
@@ -1962,13 +1962,13 @@ lcl_CopyLineToDoc(const _FndLine& rFndLine, _CpyPara *const pCpyPara)
     }
     else
     {
-        SwTableLines& rLines = pCpyPara->pTblNd->GetTable().GetTabLines();
+        SwTableLines& rLines = pCpyPara->pTableNd->GetTable().GetTabLines();
         rLines.insert( rLines.begin() + pCpyPara->nInsPos++, pNewLine);
     }
 
     _CpyPara aPara( *pCpyPara, pNewLine );
 
-    if( pCpyPara->pTblNd->GetTable().IsNewModel() )
+    if( pCpyPara->pTableNd->GetTable().IsNewModel() )
     {
         aPara.nOldSize = 0; // will not be used
         aPara.nBoxIdx = 1;
@@ -1977,34 +1977,34 @@ lcl_CopyLineToDoc(const _FndLine& rFndLine, _CpyPara *const pCpyPara)
                     rFndLine.GetLine()->GetTabBoxes().size() )
     {
         // Get the Parent's size
-        const SwFrmFmt* pFmt;
+        const SwFrameFormat* pFormat;
 
         if( rFndLine.GetLine()->GetUpper() )
-            pFmt = rFndLine.GetLine()->GetUpper()->GetFrmFmt();
+            pFormat = rFndLine.GetLine()->GetUpper()->GetFrameFormat();
         else
-            pFmt = pCpyPara->pTblNd->GetTable().GetFrmFmt();
-        aPara.nOldSize = pFmt->GetFrmSize().GetWidth();
+            pFormat = pCpyPara->pTableNd->GetTable().GetFrameFormat();
+        aPara.nOldSize = pFormat->GetFrmSize().GetWidth();
     }
     else
         // Calculate it
         for( auto &rBox : rFndLine.GetBoxes() )
         {
-            aPara.nOldSize += rBox.GetBox()->GetFrmFmt()->GetFrmSize().GetWidth();
+            aPara.nOldSize += rBox.GetBox()->GetFrameFormat()->GetFrmSize().GetWidth();
         }
 
     const _FndBoxes& rBoxes = rFndLine.GetBoxes();
     for (_FndBoxes::const_iterator it = rBoxes.begin(); it != rBoxes.end(); ++it)
         lcl_CopyBoxToDoc(*it, &aPara);
-    if( pCpyPara->pTblNd->GetTable().IsNewModel() )
+    if( pCpyPara->pTableNd->GetTable().IsNewModel() )
         ++pCpyPara->nLnIdx;
 }
 
-bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTblNd )
+bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTableNd )
 {
     // Find all Boxes/Lines
     SwSelBoxes aSelBoxes;
     SwTableBox* pBox = GetTabSortBoxes()[ 0 ];
-    pBox = GetTblBox( pBox->GetSttNd()->StartOfSectionNode()->GetIndex() + 1 );
+    pBox = GetTableBox( pBox->GetSttNd()->StartOfSectionNode()->GetIndex() + 1 );
     SelLineFromBox( pBox, aSelBoxes, true );
 
     _FndBox aFndBox( 0, 0 );
@@ -2017,22 +2017,22 @@ bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTblNd )
 
     {
         // Convert Table formulas to their relative representation
-        SwTableFmlUpdate aMsgHnt( this );
-        aMsgHnt.eFlags = TBL_RELBOXNAME;
-        GetFrmFmt()->GetDoc()->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( this );
+        aMsgHint.eFlags = TBL_RELBOXNAME;
+        GetFrameFormat()->GetDoc()->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
-    _CpyTabFrms aCpyFmt;
-    _CpyPara aPara( &rTblNd, 1, aCpyFmt, true );
-    aPara.nNewSize = aPara.nOldSize = rTblNd.GetTable().GetFrmFmt()->GetFrmSize().GetWidth();
+    _CpyTabFrms aCpyFormat;
+    _CpyPara aPara( &rTableNd, 1, aCpyFormat, true );
+    aPara.nNewSize = aPara.nOldSize = rTableNd.GetTable().GetFrameFormat()->GetFrmSize().GetWidth();
     // Copy
     if( IsNewModel() )
         lcl_CalcNewWidths( aFndBox.GetLines(), aPara );
     for( _FndLine& rFndLine : aFndBox.GetLines() )
          lcl_CopyLineToDoc( rFndLine, &aPara );
-    if( rTblNd.GetTable().IsNewModel() )
+    if( rTableNd.GetTable().IsNewModel() )
     {   // The copied line must not contain any row span attributes > 1
-        SwTableLine* pLine = rTblNd.GetTable().GetTabLines()[0];
+        SwTableLine* pLine = rTableNd.GetTable().GetTabLines()[0];
         OSL_ENSURE( !pLine->GetTabBoxes().empty(), "Empty Table Line" );
         for( auto pTableBox : pLine->GetTabBoxes() )
         {
@@ -2059,63 +2059,63 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
 
     // First copy the PoolTemplates for the Table, so that the Tables are
     // actually copied and have valid values.
-    SwDoc* pSrcDoc = GetFrmFmt()->GetDoc();
+    SwDoc* pSrcDoc = GetFrameFormat()->GetDoc();
     if( pSrcDoc != pInsDoc )
     {
-        pInsDoc->CopyTxtColl( *pSrcDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TABLE ) );
-        pInsDoc->CopyTxtColl( *pSrcDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TABLE_HDLN ) );
+        pInsDoc->CopyTextColl( *pSrcDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TABLE ) );
+        pInsDoc->CopyTextColl( *pSrcDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TABLE_HDLN ) );
     }
 
-    SwTable* pNewTbl = const_cast<SwTable*>(pInsDoc->InsertTable(
+    SwTable* pNewTable = const_cast<SwTable*>(pInsDoc->InsertTable(
             SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ),
-            rPos, 1, 1, GetFrmFmt()->GetHoriOrient().GetHoriOrient(),
+            rPos, 1, 1, GetFrameFormat()->GetHoriOrient().GetHoriOrient(),
             0, 0, false, IsNewModel() ));
-    if( !pNewTbl )
+    if( !pNewTable )
         return false;
 
     SwNodeIndex aIdx( rPos.nNode, -1 );
-    SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
+    SwTableNode* pTableNd = aIdx.GetNode().FindTableNode();
     ++aIdx;
-    OSL_ENSURE( pTblNd, "Where is the TableNode now?" );
+    OSL_ENSURE( pTableNd, "Where is the TableNode now?" );
 
-    pTblNd->GetTable().SetRowsToRepeat( GetRowsToRepeat() );
+    pTableNd->GetTable().SetRowsToRepeat( GetRowsToRepeat() );
 
     if( IS_TYPE( SwDDETable, this ))
     {
         // A DDE-Table is being copied
         // Does the new Document actually have it's FieldType?
-        SwFieldType* pFldType = pInsDoc->getIDocumentFieldsAccess().InsertFldType(
-                                    *static_cast<const SwDDETable*>(this)->GetDDEFldType() );
-        OSL_ENSURE( pFldType, "unknown FieldType" );
+        SwFieldType* pFieldType = pInsDoc->getIDocumentFieldsAccess().InsertFieldType(
+                                    *static_cast<const SwDDETable*>(this)->GetDDEFieldType() );
+        OSL_ENSURE( pFieldType, "unknown FieldType" );
 
         // Change the Table Pointer at the Node
-        pNewTbl = new SwDDETable( *pNewTbl,
-                                 static_cast<SwDDEFieldType*>(pFldType) );
-        pTblNd->SetNewTable( pNewTbl, false );
+        pNewTable = new SwDDETable( *pNewTable,
+                                 static_cast<SwDDEFieldType*>(pFieldType) );
+        pTableNd->SetNewTable( pNewTable, false );
     }
 
-    pNewTbl->GetFrmFmt()->CopyAttrs( *GetFrmFmt() );
-    pNewTbl->SetTblChgMode( GetTblChgMode() );
+    pNewTable->GetFrameFormat()->CopyAttrs( *GetFrameFormat() );
+    pNewTable->SetTableChgMode( GetTableChgMode() );
 
     // Destroy the already created Frames
-    pTblNd->DelFrms();
+    pTableNd->DelFrms();
 
     {
         // Conver the Table formulas to their relative representation
-        SwTableFmlUpdate aMsgHnt( this );
-        aMsgHnt.eFlags = TBL_RELBOXNAME;
-        pSrcDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( this );
+        aMsgHint.eFlags = TBL_RELBOXNAME;
+        pSrcDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
-    SwTblNumFmtMerge aTNFM( *pSrcDoc, *pInsDoc );
+    SwTableNumFormatMerge aTNFM( *pSrcDoc, *pInsDoc );
 
     // Also copy Names or enforce a new unique one
     if( bCpyName )
-        pNewTbl->GetFrmFmt()->SetName( GetFrmFmt()->GetName() );
+        pNewTable->GetFrameFormat()->SetName( GetFrameFormat()->GetName() );
 
-    _CpyTabFrms aCpyFmt;
-    _CpyPara aPara( pTblNd, 1, aCpyFmt, bCpyNds );
-    aPara.nNewSize = aPara.nOldSize = GetFrmFmt()->GetFrmSize().GetWidth();
+    _CpyTabFrms aCpyFormat;
+    _CpyPara aPara( pTableNd, 1, aCpyFormat, bCpyNds );
+    aPara.nNewSize = aPara.nOldSize = GetFrameFormat()->GetFrmSize().GetWidth();
 
     if( IsNewModel() )
         lcl_CalcNewWidths( aFndBox.GetLines(), aPara );
@@ -2132,7 +2132,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
         if( USHRT_MAX != nLnPos && nLnPos )
         {
             // There is a Line before it
-            SwCollectTblLineBoxes aLnPara( false, HEADLINE_BORDERCOPY );
+            SwCollectTableLineBoxes aLnPara( false, HEADLINE_BORDERCOPY );
 
             pLn = GetTabLines()[ nLnPos - 1 ];
             for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
@@ -2143,10 +2143,10 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
                                 lcl_GetLineWidth( *pFndLn )) )
             {
                 aLnPara.SetValues( true );
-                pLn = pNewTbl->GetTabLines()[ 0 ];
+                pLn = pNewTable->GetTabLines()[ 0 ];
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
-                    sw_BoxSetSplitBoxFmts(*it, &aLnPara );
+                    sw_BoxSetSplitBoxFormats(*it, &aLnPara );
             }
         }
 
@@ -2157,7 +2157,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
         if( nLnPos < GetTabLines().size() - 1 )
         {
             // There is a Line following it
-            SwCollectTblLineBoxes aLnPara( true, HEADLINE_BORDERCOPY );
+            SwCollectTableLineBoxes aLnPara( true, HEADLINE_BORDERCOPY );
 
             pLn = GetTabLines()[ nLnPos + 1 ];
             for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
@@ -2168,24 +2168,24 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
                                 lcl_GetLineWidth( *pFndLn )) )
             {
                 aLnPara.SetValues( false );
-                pLn = pNewTbl->GetTabLines().back();
+                pLn = pNewTable->GetTabLines().back();
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
-                    sw_BoxSetSplitBoxFmts(*it, &aLnPara );
+                    sw_BoxSetSplitBoxFormats(*it, &aLnPara );
             }
         }
     }
 
     // We need to delete the initial Box
-    _DeleteBox( *pNewTbl, pNewTbl->GetTabLines().back()->GetTabBoxes()[0],
+    _DeleteBox( *pNewTable, pNewTable->GetTabLines().back()->GetTabBoxes()[0],
                 0, false, false );
 
-    if( pNewTbl->IsNewModel() )
-        lcl_CheckRowSpan( *pNewTbl );
+    if( pNewTable->IsNewModel() )
+        lcl_CheckRowSpan( *pNewTable );
     // Clean up
-    pNewTbl->GCLines();
+    pNewTable->GCLines();
 
-    pTblNd->MakeFrms( &aIdx );  // re-generate the Frames
+    pTableNd->MakeFrms( &aIdx );  // re-generate the Frames
 
     CHECKTABLELAYOUT
 
@@ -2193,8 +2193,8 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
 }
 
 // Find the next Box with content from this Line
-SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
-                     const SwTableBox* pSrchBox, bool bOvrTblLns ) const
+SwTableBox* SwTableLine::FindNextBox( const SwTable& rTable,
+                     const SwTableBox* pSrchBox, bool bOvrTableLns ) const
 {
     const SwTableLine* pLine = this;            // for M800
     SwTableBox* pBox;
@@ -2215,17 +2215,17 @@ SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
         OSL_ENSURE( USHRT_MAX != nFndPos, "Line is not in the Table" );
         // Is there another Line?
         if( nFndPos+1 >= (sal_uInt16)GetUpper()->GetTabLines().size() )
-            return GetUpper()->GetUpper()->FindNextBox( rTbl, GetUpper(), bOvrTblLns );
+            return GetUpper()->GetUpper()->FindNextBox( rTable, GetUpper(), bOvrTableLns );
         pLine = GetUpper()->GetTabLines()[nFndPos+1];
     }
-    else if( bOvrTblLns )       // Over a Table's the "BaseLines"??
+    else if( bOvrTableLns )       // Over a Table's the "BaseLines"??
     {
         // Search for the next Line in the Table
-        nFndPos = rTbl.GetTabLines().GetPos( pLine );
-        if( nFndPos + 1 >= (sal_uInt16)rTbl.GetTabLines().size() )
+        nFndPos = rTable.GetTabLines().GetPos( pLine );
+        if( nFndPos + 1 >= (sal_uInt16)rTable.GetTabLines().size() )
             return 0;           // there are no more Boxes
 
-        pLine = rTbl.GetTabLines()[ nFndPos+1 ];
+        pLine = rTable.GetTabLines()[ nFndPos+1 ];
     }
     else
         return 0;
@@ -2237,12 +2237,12 @@ SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
             pBox = pBox->GetTabLines().front()->GetTabBoxes().front();
         return pBox;
     }
-    return pLine->FindNextBox( rTbl, 0, bOvrTblLns );
+    return pLine->FindNextBox( rTable, 0, bOvrTableLns );
 }
 
 // Find the previous Box from this Line
-SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTbl,
-                         const SwTableBox* pSrchBox, bool bOvrTblLns ) const
+SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTable,
+                         const SwTableBox* pSrchBox, bool bOvrTableLns ) const
 {
     const SwTableLine* pLine = this;            // for M800
     SwTableBox* pBox;
@@ -2266,17 +2266,17 @@ SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTbl,
         OSL_ENSURE( USHRT_MAX != nFndPos, "Line is not in the Table" );
         // Is there another Line?
         if( !nFndPos )
-            return GetUpper()->GetUpper()->FindPreviousBox( rTbl, GetUpper(), bOvrTblLns );
+            return GetUpper()->GetUpper()->FindPreviousBox( rTable, GetUpper(), bOvrTableLns );
         pLine = GetUpper()->GetTabLines()[nFndPos-1];
     }
-    else if( bOvrTblLns )       // Over a Table's the "BaseLines"??
+    else if( bOvrTableLns )       // Over a Table's the "BaseLines"??
     {
         // Search for the next Line in the Table
-        nFndPos = rTbl.GetTabLines().GetPos( pLine );
+        nFndPos = rTable.GetTabLines().GetPos( pLine );
         if( !nFndPos )
             return 0;           // there are no more Boxes
 
-        pLine = rTbl.GetTabLines()[ nFndPos-1 ];
+        pLine = rTable.GetTabLines()[ nFndPos-1 ];
     }
     else
         return 0;
@@ -2291,28 +2291,28 @@ SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTbl,
         }
         return pBox;
     }
-    return pLine->FindPreviousBox( rTbl, 0, bOvrTblLns );
+    return pLine->FindPreviousBox( rTable, 0, bOvrTableLns );
 }
 
 // Find the next Box with content from this Line
-SwTableBox* SwTableBox::FindNextBox( const SwTable& rTbl,
-                         const SwTableBox* pSrchBox, bool bOvrTblLns ) const
+SwTableBox* SwTableBox::FindNextBox( const SwTable& rTable,
+                         const SwTableBox* pSrchBox, bool bOvrTableLns ) const
 {
     if( !pSrchBox  && GetTabLines().empty() )
         return const_cast<SwTableBox*>(this);
-    return GetUpper()->FindNextBox( rTbl, pSrchBox ? pSrchBox : this,
-                                        bOvrTblLns );
+    return GetUpper()->FindNextBox( rTable, pSrchBox ? pSrchBox : this,
+                                        bOvrTableLns );
 
 }
 
 // Find the next Box with content from this Line
-SwTableBox* SwTableBox::FindPreviousBox( const SwTable& rTbl,
-                         const SwTableBox* pSrchBox, bool bOvrTblLns ) const
+SwTableBox* SwTableBox::FindPreviousBox( const SwTable& rTable,
+                         const SwTableBox* pSrchBox, bool bOvrTableLns ) const
 {
     if( !pSrchBox && GetTabLines().empty() )
         return const_cast<SwTableBox*>(this);
-    return GetUpper()->FindPreviousBox( rTbl, pSrchBox ? pSrchBox : this,
-                                        bOvrTblLns );
+    return GetUpper()->FindPreviousBox( rTable, pSrchBox ? pSrchBox : this,
+                                        bOvrTableLns );
 }
 
 static void lcl_BoxSetHeadCondColl( const SwTableBox* pBox )
@@ -2346,7 +2346,7 @@ static SwTwips lcl_GetDistance( SwTableBox* pBox, bool bLeft )
         bFirst = false;
 
         while( nStt < nPos )
-            nRet += pLine->GetTabBoxes()[ nStt++ ]->GetFrmFmt()
+            nRet += pLine->GetTabBoxes()[ nStt++ ]->GetFrameFormat()
                             ->GetFrmSize().GetWidth();
         pBox = pLine->GetUpper();
     }
@@ -2359,8 +2359,8 @@ static bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
     SwTableBoxes& rBoxes = pLine->GetTabBoxes();
     for( auto pBox : rBoxes )
     {
-        SwFrmFmt* pFmt = pBox->GetFrmFmt();
-        const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+        SwFrameFormat* pFormat = pBox->GetFrameFormat();
+        const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
         SwTwips nWidth = rSz.GetWidth();
         bool bGreaterBox = false;
 
@@ -2411,7 +2411,7 @@ static bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                             - rParam.nSide ) < COLFUZZY ))
             {
                 // This column contains the Cursor - so decrease/increase
-                SwFmtFrmSize aNew( rSz );
+                SwFormatFrmSize aNew( rSz );
 
                 if( !nLowerDiff )
                 {
@@ -2433,7 +2433,7 @@ static bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                     aNew.SetWidth( nWidth + nLowerDiff );
                 else
                     aNew.SetWidth( nWidth - nLowerDiff );
-                rParam.aShareFmts.SetSize( *pBox, aNew );
+                rParam.aShareFormats.SetSize( *pBox, aNew );
                 break;
             }
         }
@@ -2457,8 +2457,8 @@ static bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
     SwTableBoxes& rBoxes = pLine->GetTabBoxes();
     for( auto pBox : rBoxes )
     {
-        SwFrmFmt* pFmt = pBox->GetFrmFmt();
-        const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+        SwFrameFormat* pFormat = pBox->GetFrameFormat();
+        const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
         SwTwips nWidth = rSz.GetWidth();
 
         if( bCheck )
@@ -2508,7 +2508,7 @@ static bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                                          : nDist >= rParam.nSide - COLFUZZY)
                  ) )
             {
-                SwFmtFrmSize aNew( rSz );
+                SwFormatFrmSize aNew( rSz );
 
                 if( !nLowerDiff )
                 {
@@ -2530,7 +2530,7 @@ static bool lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                 else
                     aNew.SetWidth( nWidth + nLowerDiff );
 
-                rParam.aShareFmts.SetSize( *pBox, aNew );
+                rParam.aShareFormats.SetSize( *pBox, aNew );
             }
         }
 
@@ -2549,8 +2549,8 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
     for( sal_uInt16 n = 0; n < rBoxes.size(); ++n )
     {
         SwTableBox* pBox = rBoxes[ n ];
-        SwTableBoxFmt* pFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
-        const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+        SwTableBoxFormat* pFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
+        const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
         SwTwips nWidth = rSz.GetWidth();
 
         int nCmp {0};
@@ -2572,7 +2572,7 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
             if( nCmp )
             {
                 rParam.bAnyBoxFnd = true;
-                if( pFmt->GetProtect().IsCntntProtected() )
+                if( pFormat->GetProtect().IsContentProtected() )
                     return false;
 
                 if( rParam.bSplittBox &&
@@ -2617,9 +2617,9 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                     if( !rParam.bSplittBox )
                     {
                         // the current Box on
-                        SwFmtFrmSize aNew( rSz );
+                        SwFormatFrmSize aNew( rSz );
                         aNew.SetWidth( nWidth + rParam.nDiff );
-                        rParam.aShareFmts.SetSize( *pBox, aNew );
+                        rParam.aShareFormats.SetSize( *pBox, aNew );
                     }
                 }
                 else
@@ -2629,32 +2629,32 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                     if( !rParam.bLeft && 3 != nCmp )
                         ++n;
 
-                    ::_InsTblBox( pFmt->GetDoc(), rParam.pTblNd,
-                                        pLine, pFmt, pBox, n );
+                    ::_InsTableBox( pFormat->GetDoc(), rParam.pTableNd,
+                                        pLine, pFormat, pBox, n );
 
                     SwTableBox* pNewBox = rBoxes[ n ];
-                    SwFmtFrmSize aNew( rSz );
+                    SwFormatFrmSize aNew( rSz );
                     aNew.SetWidth( rParam.nDiff );
-                    rParam.aShareFmts.SetSize( *pNewBox, aNew );
+                    rParam.aShareFormats.SetSize( *pNewBox, aNew );
 
                     // Special case: There is no space in the other Boxes, but in the Cell
                     if( rParam.bSplittBox )
                     {
                         // the current Box on
-                        SwFmtFrmSize aNewSize( rSz );
+                        SwFormatFrmSize aNewSize( rSz );
                         aNewSize.SetWidth( nWidth - rParam.nDiff );
-                        rParam.aShareFmts.SetSize( *pBox, aNewSize );
+                        rParam.aShareFormats.SetSize( *pBox, aNewSize );
                     }
 
                     // Special treatment for the Border
                     // The right one needs to be removed
                     {
-                        const SvxBoxItem& rBoxItem = pBox->GetFrmFmt()->GetBox();
+                        const SvxBoxItem& rBoxItem = pBox->GetFrameFormat()->GetBox();
                         if( rBoxItem.GetRight() )
                         {
                             SvxBoxItem aTmp( rBoxItem );
                             aTmp.SetLine( 0, SvxBoxItemLine::RIGHT );
-                            rParam.aShareFmts.SetAttr( rParam.bLeft
+                            rParam.aShareFormats.SetAttr( rParam.bLeft
                                                             ? *pNewBox
                                                             : *pBox, aTmp );
                         }
@@ -2691,12 +2691,12 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
         SwTwips nTmpDist = nDist;
         for( auto pBox : rBoxes )
         {
-            SwTwips nWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+            SwTwips nWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
             if( (nTmpDist + nWidth / 2 ) > rParam.nSide )
             {
                 rParam.nRemainWidth = rParam.bLeft
                                         ? sal_uInt16(nTmpDist)
-                                        : sal_uInt16(rParam.nTblWidth - nTmpDist);
+                                        : sal_uInt16(rParam.nTableWidth - nTmpDist);
                 break;
             }
             nTmpDist += nWidth;
@@ -2706,8 +2706,8 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
     for( SwTableBoxes::size_type n = 0; n < rBoxes.size(); ++n )
     {
         SwTableBox* pBox = rBoxes[ n ];
-        SwFrmFmt* pFmt = pBox->GetFrmFmt();
-        const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+        SwFrameFormat* pFormat = pBox->GetFrameFormat();
+        const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
         SwTwips nWidth = rSz.GetWidth();
 
         if( bCheck )
@@ -2721,7 +2721,7 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                                 (TBLFIX_CHGABS != rParam.nMode ||
                                 (n < rBoxes.size() &&
                                   (nDist + nWidth + rBoxes[ n+1 ]->
-                                   GetFrmFmt()->GetFrmSize().GetWidth() / 2)
+                                   GetFrameFormat()->GetFrmSize().GetWidth() / 2)
                                   > rParam.nSide) ))
                              : (nDist + nWidth / 2 ) > rParam.nSide
                 )
@@ -2754,7 +2754,7 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                             pTmpBox = pTmpBox->GetUpper()->GetUpper();
                             nBoxPos = pTmpBox->GetUpper()->GetTabBoxes().GetPos( pTmpBox );
                         }
-                        nTmpWidth = pTmpBox->GetFrmFmt()->GetFrmSize().GetWidth();
+                        nTmpWidth = pTmpBox->GetFrameFormat()->GetFrmSize().GetWidth();
                     }
 
                     if( nTmpWidth < nDiff || nTmpWidth - nDiff < MINLAY )
@@ -2781,7 +2781,7 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                                 (TBLFIX_CHGABS != rParam.nMode ||
                                 (n < rBoxes.size() &&
                                   (nDist + nWidth + rBoxes[ n+1 ]->
-                                   GetFrmFmt()->GetFrmSize().GetWidth() / 2)
+                                   GetFrameFormat()->GetFrmSize().GetWidth() / 2)
                                   > rParam.nSide) ))
                               : (nDist + nWidth / 2 ) > rParam.nSide ))
             {
@@ -2798,14 +2798,14 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                         nLowerDiff = rParam.nDiff;
                 }
 
-                SwFmtFrmSize aNew( rSz );
+                SwFormatFrmSize aNew( rSz );
                 rParam.nLowerDiff += nLowerDiff;
 
                 if( rParam.bBigger )
                     aNew.SetWidth( nWidth - nLowerDiff );
                 else
                     aNew.SetWidth( nWidth + nLowerDiff );
-                rParam.aShareFmts.SetSize( *pBox, aNew );
+                rParam.aShareFormats.SetSize( *pBox, aNew );
 
                 if( TBLFIX_CHGABS == rParam.nMode )
                     break;
@@ -2869,7 +2869,7 @@ static void lcl_DelSelBox_CorrLowers( SwTableLine& rLine, CR_SetBoxWidth& rParam
     SwTwips nBoxWidth = 0;
 
     for( auto n = rBoxes.size(); n; )
-        nBoxWidth += rBoxes[ --n ]->GetFrmFmt()->GetFrmSize().GetWidth();
+        nBoxWidth += rBoxes[ --n ]->GetFrameFormat()->GetFrmSize().GetWidth();
 
     if( COLFUZZY < std::abs( nWidth - nBoxWidth ))
     {
@@ -2877,13 +2877,13 @@ static void lcl_DelSelBox_CorrLowers( SwTableLine& rLine, CR_SetBoxWidth& rParam
         for( auto n = rBoxes.size(); n; )
         {
             SwTableBox* pBox = rBoxes[ --n ];
-            SwFmtFrmSize aNew( pBox->GetFrmFmt()->GetFrmSize() );
+            SwFormatFrmSize aNew( pBox->GetFrameFormat()->GetFrmSize() );
             long nDiff = aNew.GetWidth();
             nDiff *= nWidth;
             nDiff /= nBoxWidth;
             aNew.SetWidth( nDiff );
 
-            rParam.aShareFmts.SetSize( *pBox, aNew );
+            rParam.aShareFormats.SetSize( *pBox, aNew );
 
             if( !pBox->GetSttNd() )
             {
@@ -2897,7 +2897,7 @@ static void lcl_DelSelBox_CorrLowers( SwTableLine& rLine, CR_SetBoxWidth& rParam
 }
 
 static void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
-                    const SwFmtFrmSize& rOldSz,
+                    const SwFormatFrmSize& rOldSz,
                     sal_uInt16& rDelWidth, SwTwips nDist )
 {
     long nDiff = 0;
@@ -2917,7 +2917,7 @@ static void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
             if( rParam.bLeft )
                 rParam.nRemainWidth = sal_uInt16(nDist);
             else
-                rParam.nRemainWidth = sal_uInt16(rParam.nTblWidth - nDist);
+                rParam.nRemainWidth = sal_uInt16(rParam.nTableWidth - nDist);
         }
 
         // Calculate relatively
@@ -2944,9 +2944,9 @@ static void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
 
     if( bSetSize )
     {
-        SwFmtFrmSize aNew( rOldSz );
+        SwFormatFrmSize aNew( rOldSz );
         aNew.SetWidth( aNew.GetWidth() + nDiff );
-        rParam.aShareFmts.SetSize( rBox, aNew );
+        rParam.aShareFormats.SetSize( rBox, aNew );
 
         // Change the Lower once again
         for( auto i = rBox.GetTabLines().size(); i; )
@@ -2964,7 +2964,7 @@ static bool lcl_DeleteBox_Recursive( CR_SetBoxWidth& rParam, SwTableBox& rBox,
         if( bCheck )
         {
             rParam.bAnyBoxFnd = true;
-            if( rBox.GetFrmFmt()->GetProtect().IsCntntProtected() )
+            if( rBox.GetFrameFormat()->GetProtect().IsContentProtected() )
                 bRet = false;
             else
             {
@@ -2973,8 +2973,8 @@ static bool lcl_DeleteBox_Recursive( CR_SetBoxWidth& rParam, SwTableBox& rBox,
             }
         }
         else
-            ::_DeleteBox( rParam.pTblNd->GetTable(), &rBox,
-                            rParam.pUndo, false, true, &rParam.aShareFmts );
+            ::_DeleteBox( rParam.pTableNd->GetTable(), &rBox,
+                            rParam.pUndo, false, true, &rParam.aShareFormats );
     }
     else
     {
@@ -3026,8 +3026,8 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
         else
             pBox = rBoxes[ n++ ];
 
-        SwFrmFmt* pFmt = pBox->GetFrmFmt();
-        const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+        SwFrameFormat* pFormat = pBox->GetFrameFormat();
+        const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
         long nWidth = rSz.GetWidth();
         bool bDelBox = false, bChgLowers = false;
 
@@ -3117,13 +3117,13 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
                         nDelWidth != rParam.nBoxWidth ) &&
                      COLFUZZY > std::abs( rParam.bLeft
                                     ? nWidth - nDist
-                                    : (nDist + nWidth - rParam.nTblWidth )))
+                                    : (nDist + nWidth - rParam.nTableWidth )))
                     || !::lcl_DeleteBox_Recursive(rParam, *pBox, bCheck))
                 {
                     return false;
                 }
 
-                if( pFmt->GetProtect().IsCntntProtected() )
+                if( pFormat->GetProtect().IsContentProtected() )
                     return false;
             }
             else
@@ -3190,7 +3190,7 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
                 else
                 {
                     // Or else we need to adapt the Box's size
-                    SwFmtFrmSize aNew( rSz );
+                    SwFormatFrmSize aNew( rSz );
                     bool bCorrRel = false;
 
                     if( TBLVAR_CHGABS != rParam.nMode )
@@ -3233,7 +3233,7 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
                             if( rParam.bLeft )
                                 rParam.nRemainWidth = sal_uInt16(nDist - nLowerDiff);
                             else
-                                rParam.nRemainWidth = sal_uInt16(rParam.nTblWidth - nDist
+                                rParam.nRemainWidth = sal_uInt16(rParam.nTableWidth - nDist
                                                                 - nLowerDiff );
                         }
 
@@ -3245,7 +3245,7 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
                     }
                     else
                         aNew.SetWidth( aNew.GetWidth() - nLowerDiff );
-                    rParam.aShareFmts.SetSize( *pBox, aNew );
+                    rParam.aShareFormats.SetSize( *pBox, aNew );
 
                     if( bCorrLowers )
                     {
@@ -3278,12 +3278,12 @@ static void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam )
     SwTableBoxes& rBoxes = pLine->GetTabBoxes();
     for( auto pBox : rBoxes )
     {
-        SwFmtFrmSize aSz( pBox->GetFrmFmt()->GetFrmSize() );
+        SwFormatFrmSize aSz( pBox->GetFrameFormat()->GetFrmSize() );
         SwTwips nWidth = aSz.GetWidth();
         nWidth *= rParam.nDiff;
         nWidth /= rParam.nMaxSize;
         aSz.SetWidth( nWidth );
-        rParam.aShareFmts.SetSize( *pBox, aSz );
+        rParam.aShareFormats.SetSize( *pBox, aSz );
 
         for( auto pLn : pBox->GetTabLines() )
             ::lcl_AjustLines( pLn, rParam );
@@ -3300,7 +3300,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
     for (SwTableBoxes::const_iterator i(rBoxes.begin()); i != rBoxes.end(); ++i)
     {
         const SwTableBox* pBox = *i;
-        const SwTwips nBoxW = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        const SwTwips nBoxW = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
         nAktSize += nBoxW;
 
         for( auto pLn : pBox->GetTabLines() )
@@ -3319,42 +3319,42 @@ static _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo,
                                 SwTableSortBoxes& rTmpLst, SwTwips nDistStt )
 {
     // Find all Boxes/Lines
-    SwTable& rTbl = rParam.pTblNd->GetTable();
+    SwTable& rTable = rParam.pTableNd->GetTable();
 
     if (rParam.m_Boxes.empty())
     {
         // Get the Boxes
         if( rParam.bBigger )
-            for( auto pLn : rTbl.GetTabLines() )
+            for( auto pLn : rTable.GetTabLines() )
                 ::lcl_DelSelBox( pLn, rParam, nDistStt, true );
         else
-            for( auto pLn : rTbl.GetTabLines() )
+            for( auto pLn : rTable.GetTabLines() )
                 ::lcl_InsSelBox( pLn, rParam, nDistStt, true );
     }
 
     // Prevent deleting the whole Table
     if (rParam.bBigger
-        && rParam.m_Boxes.size() == rTbl.GetTabSortBoxes().size())
+        && rParam.m_Boxes.size() == rTable.GetTabSortBoxes().size())
     {
         return 0;
     }
 
     _FndBox* pFndBox = new _FndBox( 0, 0 );
     if( rParam.bBigger )
-        pFndBox->SetTableLines( rParam.m_Boxes, rTbl );
+        pFndBox->SetTableLines( rParam.m_Boxes, rTable );
     else
     {
         _FndPara aPara(rParam.m_Boxes, pFndBox);
-        ForEach_FndLineCopyCol( rTbl.GetTabLines(), &aPara );
+        ForEach_FndLineCopyCol( rTable.GetTabLines(), &aPara );
         OSL_ENSURE( pFndBox->GetLines().size(), "Where are the Boxes" );
-        pFndBox->SetTableLines( rTbl );
+        pFndBox->SetTableLines( rTable );
 
         if( ppUndo )
-            rTmpLst.insert( rTbl.GetTabSortBoxes() );
+            rTmpLst.insert( rTable.GetTabSortBoxes() );
     }
 
     // Find Lines for the Layout update
-    pFndBox->DelFrms( rTbl );
+    pFndBox->DelFrms( rTable );
 
     // TL_CHART2: this function gest called from SetColWidth exclusively,
     // thus it is currently speculated that nothing needs to be done here.
@@ -3368,16 +3368,16 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
 {
     SetHTMLTableLayout( 0 );    // Delete HTML Layout
 
-    const SwFmtFrmSize& rSz = GetFrmFmt()->GetFrmSize();
-    const SvxLRSpaceItem& rLR = GetFrmFmt()->GetLRSpace();
+    const SwFormatFrmSize& rSz = GetFrameFormat()->GetFrmSize();
+    const SvxLRSpaceItem& rLR = GetFrameFormat()->GetLRSpace();
 
     boost::scoped_ptr<_FndBox> xFndBox;                // for insertion/deletion
     SwTableSortBoxes aTmpLst;       // for Undo
     bool bBigger,
         bRet = false,
-        bLeft = nsTblChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) ||
-                nsTblChgWidthHeightType::WH_CELL_LEFT == ( eType & 0xff ),
-        bInsDel = 0 != (eType & nsTblChgWidthHeightType::WH_FLAG_INSDEL );
+        bLeft = nsTableChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) ||
+                nsTableChgWidthHeightType::WH_CELL_LEFT == ( eType & 0xff ),
+        bInsDel = 0 != (eType & nsTableChgWidthHeightType::WH_FLAG_INSDEL );
     sal_uInt16 n;
     sal_uLong nBoxIdx = rAktBox.GetSttIdx();
 
@@ -3397,7 +3397,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
         {
             fnSelBox = lcl_DelSelBox;
             fnOtherBox = lcl_DelOtherBox;
-            aParam.nBoxWidth = (sal_uInt16)rAktBox.GetFrmFmt()->GetFrmSize().GetWidth();
+            aParam.nBoxWidth = (sal_uInt16)rAktBox.GetFrameFormat()->GetFrmSize().GetWidth();
             if( bLeft )
                 nDistStt = rSz.GetWidth();
         }
@@ -3415,9 +3415,9 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
 
     switch( eType & 0xff )
     {
-    case nsTblChgWidthHeightType::WH_COL_RIGHT:
-    case nsTblChgWidthHeightType::WH_COL_LEFT:
-        if( TBLVAR_CHGABS == eTblChgMode )
+    case nsTableChgWidthHeightType::WH_COL_RIGHT:
+    case nsTableChgWidthHeightType::WH_COL_LEFT:
+        if( TBLVAR_CHGABS == eTableChgMode )
         {
             if( bInsDel )
                 bBigger = !bBigger;
@@ -3426,7 +3426,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
             bool bChgLRSpace = true;
             if( bBigger )
             {
-                if( GetFrmFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE) &&
+                if( GetFrameFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE) &&
                     !rSz.GetWidthPercent() )
                 {
                     bRet = rSz.GetWidth() < USHRT_MAX - nRelDiff;
@@ -3448,12 +3448,12 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                 if( !bRet )
                 {
                     // Then call itself recursively; only with another mode (proportional)
-                    TblChgMode eOld = eTblChgMode;
-                    eTblChgMode = TBLFIX_CHGPROP;
+                    TableChgMode eOld = eTableChgMode;
+                    eTableChgMode = TBLFIX_CHGPROP;
 
                     bRet = SetColWidth( rAktBox, eType, nAbsDiff, nRelDiff,
                                         ppUndo );
-                    eTblChgMode = eOld;
+                    eTableChgMode = eOld;
                     return bRet;
                 }
             }
@@ -3481,7 +3481,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                         aParam.m_Boxes.size() == m_TabSortContentBoxes.size())
                     {
                         // This whole Table is to be deleted!
-                        GetFrmFmt()->GetDoc()->DeleteRowCol(aParam.m_Boxes);
+                        GetFrameFormat()->GetDoc()->DeleteRowCol(aParam.m_Boxes);
                         return false;
                     }
 
@@ -3491,11 +3491,11 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                                                        : UNDO_TABLE_INSCOL );
                 }
                 else if( ppUndo )
-                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
+                    *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true );
 
                 long nFrmWidth = LONG_MAX;
                 LockModify();
-                SwFmtFrmSize aSz( rSz );
+                SwFormatFrmSize aSz( rSz );
                 SvxLRSpaceItem aLR( rLR );
                 if( bBigger )
                 {
@@ -3504,7 +3504,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                     {
                         // Break down to USHRT_MAX / 2
                         CR_SetBoxWidth aTmpPara( 0, aSz.GetWidth() / 2,
-                                        0, aSz.GetWidth(), aSz.GetWidth(), aParam.pTblNd );
+                                        0, aSz.GetWidth(), aSz.GetWidth(), aParam.pTableNd );
                         for( sal_uInt16 nLn = 0; nLn < aLines.size(); ++nLn )
                             ::lcl_AjustLines( aLines[ nLn ], aTmpPara );
                         aSz.SetWidth( aSz.GetWidth() / 2 );
@@ -3524,23 +3524,23 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                     aLR.SetRight( sal_uInt16( aLR.GetRight() + nAbsDiff ) );
 
                 if( bChgLRSpace )
-                    GetFrmFmt()->SetFmtAttr( aLR );
-                const SwFmtHoriOrient& rHOri = GetFrmFmt()->GetHoriOrient();
+                    GetFrameFormat()->SetFormatAttr( aLR );
+                const SwFormatHoriOrient& rHOri = GetFrameFormat()->GetHoriOrient();
                 if( text::HoriOrientation::FULL == rHOri.GetHoriOrient() ||
                     (text::HoriOrientation::LEFT == rHOri.GetHoriOrient() && aLR.GetLeft()) ||
                     (text::HoriOrientation::RIGHT == rHOri.GetHoriOrient() && aLR.GetRight()))
                 {
-                    SwFmtHoriOrient aHOri( rHOri );
+                    SwFormatHoriOrient aHOri( rHOri );
                     aHOri.SetHoriOrient( text::HoriOrientation::NONE );
-                    GetFrmFmt()->SetFmtAttr( aHOri );
+                    GetFrameFormat()->SetFormatAttr( aHOri );
 
                     // If the Table happens to contain relative values (USHORT_MAX),
                     // we need to convert them to absolute ones now.
                     // Bug 61494
-                    if( GetFrmFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE) &&
+                    if( GetFrameFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE) &&
                         !rSz.GetWidthPercent() )
                     {
-                        SwTabFrm* pTabFrm = SwIterator<SwTabFrm,SwFmt>( *GetFrmFmt() ).First();
+                        SwTabFrm* pTabFrm = SwIterator<SwTabFrm,SwFormat>( *GetFrameFormat() ).First();
                         if( pTabFrm &&
                             pTabFrm->Prt().Width() != rSz.GetWidth() )
                         {
@@ -3562,8 +3562,8 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                     aSz.SetWidthPercent( static_cast<sal_uInt8>(( aSz.GetWidth() * 100 ) /
                         ( aSz.GetWidth() + aLR.GetRight() + aLR.GetLeft())));
 
-                GetFrmFmt()->SetFmtAttr( aSz );
-                aParam.nTblWidth = sal_uInt16( aSz.GetWidth() );
+                GetFrameFormat()->SetFormatAttr( aSz );
+                aParam.nTableWidth = sal_uInt16( aSz.GetWidth() );
 
                 UnlockModify();
 
@@ -3579,9 +3579,9 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                 // Bug 61494
                 if( LONG_MAX != nFrmWidth )
                 {
-                    SwFmtFrmSize aAbsSz( aSz );
+                    SwFormatFrmSize aAbsSz( aSz );
                     aAbsSz.SetWidth( nFrmWidth );
-                    GetFrmFmt()->SetFmtAttr( aAbsSz );
+                    GetFrameFormat()->SetFormatAttr( aAbsSz );
                 }
             }
         }
@@ -3589,7 +3589,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                 ( bLeft ? nDist != 0 : std::abs( rSz.GetWidth() - nDist ) > COLFUZZY ) )
         {
             bRet = true;
-            if( bLeft && TBLFIX_CHGABS == eTblChgMode && !bInsDel )
+            if( bLeft && TBLFIX_CHGABS == eTableChgMode && !bInsDel )
                 aParam.bBigger = !bBigger;
 
             // First test if we have room at all
@@ -3625,7 +3625,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                             bRet = false;
                     }
 
-                    if( !bRet && rAktBox.GetFrmFmt()->GetFrmSize().GetWidth()
+                    if( !bRet && rAktBox.GetFrameFormat()->GetFrmSize().GetWidth()
                         - nRelDiff > COLFUZZY +
                             ( 567 / 2 /*leave room for at least 0.5 cm*/) )
                     {
@@ -3685,11 +3685,11 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                                                        : UNDO_TABLE_INSCOL );
                 }
                 else if( ppUndo )
-                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
+                    *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true );
 
                 if( bInsDel
-                    ? ( TBLFIX_CHGABS == eTblChgMode ? (bBigger && bLeft) : bLeft )
-                    : ( TBLFIX_CHGABS != eTblChgMode && bLeft ) )
+                    ? ( TBLFIX_CHGABS == eTableChgMode ? (bBigger && bLeft) : bLeft )
+                    : ( TBLFIX_CHGABS != eTableChgMode && bLeft ) )
                 {
                     for( n = aLines.size(); n; )
                     {
@@ -3715,23 +3715,23 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
         }
         break;
 
-    case nsTblChgWidthHeightType::WH_CELL_RIGHT:
-    case nsTblChgWidthHeightType::WH_CELL_LEFT:
-        if( TBLVAR_CHGABS == eTblChgMode )
+    case nsTableChgWidthHeightType::WH_CELL_RIGHT:
+    case nsTableChgWidthHeightType::WH_CELL_LEFT:
+        if( TBLVAR_CHGABS == eTableChgMode )
         {
             // Then call itself recursively; only with another mode (proportional)
-            TblChgMode eOld = eTblChgMode;
-            eTblChgMode = TBLFIX_CHGABS;
+            TableChgMode eOld = eTableChgMode;
+            eTableChgMode = TBLFIX_CHGABS;
 
             bRet = SetColWidth( rAktBox, eType, nAbsDiff, nRelDiff,
                                 ppUndo );
-            eTblChgMode = eOld;
+            eTableChgMode = eOld;
             return bRet;
         }
         else if( bInsDel || ( bLeft ? nDist != 0
                                     : (rSz.GetWidth() - nDist) > COLFUZZY ))
         {
-            if( bLeft && TBLFIX_CHGABS == eTblChgMode && !bInsDel )
+            if( bLeft && TBLFIX_CHGABS == eTableChgMode && !bInsDel )
                 aParam.bBigger = !bBigger;
 
             // First, see if there is enough room at all
@@ -3755,7 +3755,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                 if( bLeft )
                     aParam.nMaxSize = aParam.nSide;
                 else
-                    aParam.nMaxSize = pLine->GetUpper()->GetFrmFmt()->
+                    aParam.nMaxSize = pLine->GetUpper()->GetFrameFormat()->
                                     GetFrmSize().GetWidth() - aParam.nSide;
             }
 
@@ -3771,7 +3771,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                         bRet = false;
                 }
 
-                if( !bRet && !aParam.bBigger && rAktBox.GetFrmFmt()->
+                if( !bRet && !aParam.bBigger && rAktBox.GetFrameFormat()->
                     GetFrmSize().GetWidth() - nRelDiff > COLFUZZY +
                         ( 567 / 2 /*leave room for at least 0.5 cm*/) )
                 {
@@ -3800,11 +3800,11 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                                                        : UNDO_TABLE_INSCOL );
                 }
                 else if( ppUndo )
-                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
+                    *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true );
 
                 if( bInsDel
-                    ? ( TBLFIX_CHGABS == eTblChgMode ? (bBigger && bLeft) : bLeft )
-                    : ( TBLFIX_CHGABS != eTblChgMode && bLeft ) )
+                    ? ( TBLFIX_CHGABS == eTableChgMode ? (bBigger && bLeft) : bLeft )
+                    : ( TBLFIX_CHGABS != eTableChgMode && bLeft ) )
                 {
                     (*fnSelBox)( pLine, aParam, nDistStt, false );
                     (*fnOtherBox)( pLine, aParam1, nDistStt, false );
@@ -3837,10 +3837,10 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
 
         if( ppUndo && *ppUndo )
         {
-            aParam.pUndo->SetColWidthParam( nBoxIdx, static_cast<sal_uInt16>(eTblChgMode), eType,
+            aParam.pUndo->SetColWidthParam( nBoxIdx, static_cast<sal_uInt16>(eTableChgMode), eType,
                                             nAbsDiff, nRelDiff );
             if( !aParam.bBigger )
-                aParam.pUndo->SaveNewBoxes( *aParam.pTblNd, aTmpLst );
+                aParam.pUndo->SaveNewBoxes( *aParam.pTableNd, aTmpLst );
         }
     }
 
@@ -3857,33 +3857,33 @@ static _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
                                 SwTableSortBoxes& rTmpLst )
 {
     // Find all Boxes/Lines
-    SwTable& rTbl = rParam.pTblNd->GetTable();
+    SwTable& rTable = rParam.pTableNd->GetTable();
 
     OSL_ENSURE( !rParam.m_Boxes.empty(), "We can't go on without Boxes!" );
 
     // Prevent deleting the whole Table
     if (!rParam.bBigger
-        && rParam.m_Boxes.size() == rTbl.GetTabSortBoxes().size())
+        && rParam.m_Boxes.size() == rTable.GetTabSortBoxes().size())
     {
         return 0;
     }
 
     _FndBox* pFndBox = new _FndBox( 0, 0 );
     if( !rParam.bBigger )
-        pFndBox->SetTableLines( rParam.m_Boxes, rTbl );
+        pFndBox->SetTableLines( rParam.m_Boxes, rTable );
     else
     {
         _FndPara aPara(rParam.m_Boxes, pFndBox);
-        ForEach_FndLineCopyCol( rTbl.GetTabLines(), &aPara );
+        ForEach_FndLineCopyCol( rTable.GetTabLines(), &aPara );
         OSL_ENSURE( pFndBox->GetLines().size(), "Where are the Boxes?" );
-        pFndBox->SetTableLines( rTbl );
+        pFndBox->SetTableLines( rTable );
 
         if( ppUndo )
-            rTmpLst.insert( rTbl.GetTabSortBoxes() );
+            rTmpLst.insert( rTable.GetTabSortBoxes() );
     }
 
     // Find Lines for the Layout update
-    pFndBox->DelFrms( rTbl );
+    pFndBox->DelFrms( rTable );
 
     // TL_CHART2: it is currently unclear if sth has to be done here.
 
@@ -3896,7 +3896,7 @@ void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewHeight,
     SwLayoutFrm* pLineFrm = GetRowFrm( rLine );
     OSL_ENSURE( pLineFrm, "Where is the Frame from the SwTableLine?" );
 
-    SwFrmFmt* pFmt = rLine.ClaimFrmFmt();
+    SwFrameFormat* pFormat = rLine.ClaimFrameFormat();
 
     SwTwips nMyNewH, nMyOldH = pLineFrm->Frm().Height();
     if( !nOldHeight )                       // the BaseLine and absolute
@@ -3915,7 +3915,7 @@ void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewHeight,
         ( nMyOldH - nMyNewH ) > ( CalcRowRstHeight( pLineFrm ) + ROWFUZZY ))
         eSize = ATT_FIX_SIZE;
 
-    pFmt->SetFmtAttr( SwFmtFrmSize( eSize, 0, nMyNewH ) );
+    pFormat->SetFormatAttr( SwFormatFrmSize( eSize, 0, nMyNewH ) );
 
     // First adapt all internal ones
     for( auto pBox : rLine.GetTabBoxes() )
@@ -4004,39 +4004,39 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
     if( !bCheck )
     {
         SwTableBoxes& rBoxes = pLine->GetTabBoxes();
-        SwDoc* pDoc = pLine->GetFrmFmt()->GetDoc();
+        SwDoc* pDoc = pLine->GetFrameFormat()->GetDoc();
         if( !rParam.bBigger )
         {
             for (size_t n = rBoxes.size(); n; )
             {
-                ::lcl_SaveUpperLowerBorder( rParam.pTblNd->GetTable(),
+                ::lcl_SaveUpperLowerBorder( rParam.pTableNd->GetTable(),
                                                     *rBoxes[ --n ],
-                                                    rParam.aShareFmts );
+                                                    rParam.aShareFormats );
             }
             for (size_t n = rBoxes.size(); n; )
             {
-                ::_DeleteBox( rParam.pTblNd->GetTable(),
+                ::_DeleteBox( rParam.pTableNd->GetTable(),
                                     rBoxes[ --n ], rParam.pUndo, false,
-                                    false, &rParam.aShareFmts );
+                                    false, &rParam.aShareFormats );
             }
         }
         else
         {
             // Insert Line
-            SwTableLine* pNewLine = new SwTableLine( static_cast<SwTableLineFmt*>(pLine->GetFrmFmt()),
+            SwTableLine* pNewLine = new SwTableLine( static_cast<SwTableLineFormat*>(pLine->GetFrameFormat()),
                                         rBoxes.size(), pLine->GetUpper() );
             SwTableLines* pLines;
             if( pLine->GetUpper() )
                 pLines = &pLine->GetUpper()->GetTabLines();
             else
-                pLines = &rParam.pTblNd->GetTable().GetTabLines();
+                pLines = &rParam.pTableNd->GetTable().GetTabLines();
             sal_uInt16 nPos = pLines->GetPos( pLine );
             if( !rParam.bTop )
                 ++nPos;
             pLines->insert( pLines->begin() + nPos, pNewLine );
 
-            SwFrmFmt* pNewFmt = pNewLine->ClaimFrmFmt();
-            pNewFmt->SetFmtAttr( SwFmtFrmSize( ATT_MIN_SIZE, 0, nDist ) );
+            SwFrameFormat* pNewFormat = pNewLine->ClaimFrameFormat();
+            pNewFormat->SetFormatAttr( SwFormatFrmSize( ATT_MIN_SIZE, 0, nDist ) );
 
             // And once again calculate the Box count
             SwTableBoxes& rNewBoxes = pNewLine->GetTabBoxes();
@@ -4047,28 +4047,28 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
                 if( !pOld->GetSttNd() )
                 {
                     // Not a normal content Box, so fall back to the 1st next Box
-                    nWidth = pOld->GetFrmFmt()->GetFrmSize().GetWidth();
+                    nWidth = pOld->GetFrameFormat()->GetFrmSize().GetWidth();
                     while( !pOld->GetSttNd() )
                         pOld = pOld->GetTabLines()[ 0 ]->GetTabBoxes()[ 0 ];
                 }
-                ::_InsTblBox( pDoc, rParam.pTblNd, pNewLine,
-                                    static_cast<SwTableBoxFmt*>(pOld->GetFrmFmt()), pOld, n );
+                ::_InsTableBox( pDoc, rParam.pTableNd, pNewLine,
+                                    static_cast<SwTableBoxFormat*>(pOld->GetFrameFormat()), pOld, n );
 
                 // Special treatment for the border:
                 // The top one needs to be removed
-                const SvxBoxItem& rBoxItem = pOld->GetFrmFmt()->GetBox();
+                const SvxBoxItem& rBoxItem = pOld->GetFrameFormat()->GetBox();
                 if( rBoxItem.GetTop() )
                 {
                     SvxBoxItem aTmp( rBoxItem );
                     aTmp.SetLine( 0, SvxBoxItemLine::TOP );
-                    rParam.aShareFmts.SetAttr( rParam.bTop
+                    rParam.aShareFormats.SetAttr( rParam.bTop
                                                 ? *pOld
                                                 : *rNewBoxes[ n ], aTmp );
                 }
 
                 if( nWidth )
-                    rParam.aShareFmts.SetAttr( *rNewBoxes[ n ],
-                                SwFmtFrmSize( ATT_FIX_SIZE, nWidth, 0 ) );
+                    rParam.aShareFormats.SetAttr( *rNewBoxes[ n ],
+                                SwFormatFrmSize( ATT_FIX_SIZE, nWidth, 0 ) );
             }
         }
     }
@@ -4079,7 +4079,7 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
         for( auto n = rBoxes.size(); n; )
         {
             SwTableBox* pBox = rBoxes[ --n ];
-            if( pBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
+            if( pBox->GetFrameFormat()->GetProtect().IsContentProtected() )
                 return false;
 
             if( pBox->GetSttNd() )
@@ -4110,9 +4110,9 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
     SwTableSortBoxes aTmpLst;       // for Undo
     bool bBigger,
         bRet = false,
-        bTop = nsTblChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) ||
-                nsTblChgWidthHeightType::WH_CELL_TOP == ( eType & 0xff ),
-        bInsDel = 0 != (eType & nsTblChgWidthHeightType::WH_FLAG_INSDEL );
+        bTop = nsTableChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) ||
+                nsTableChgWidthHeightType::WH_CELL_TOP == ( eType & 0xff ),
+        bInsDel = 0 != (eType & nsTableChgWidthHeightType::WH_FLAG_INSDEL );
     sal_uInt16 nBaseLinePos = GetTabLines().GetPos( pBaseLine );
     sal_uLong nBoxIdx = rAktBox.GetSttIdx();
 
@@ -4131,8 +4131,8 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
     // How do we get to the height?
     switch( eType & 0xff )
     {
-    case nsTblChgWidthHeightType::WH_CELL_TOP:
-    case nsTblChgWidthHeightType::WH_CELL_BOTTOM:
+    case nsTableChgWidthHeightType::WH_CELL_TOP:
+    case nsTableChgWidthHeightType::WH_CELL_BOTTOM:
         if( pLine == pBaseLine )
             break;  // it doesn't work then!
 
@@ -4142,15 +4142,15 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
         pBaseLine = pLine;
         // no break!
 
-    case nsTblChgWidthHeightType::WH_ROW_TOP:
-    case nsTblChgWidthHeightType::WH_ROW_BOTTOM:
+    case nsTableChgWidthHeightType::WH_ROW_TOP:
+    case nsTableChgWidthHeightType::WH_ROW_BOTTOM:
         {
             if( bInsDel && !bBigger )       // By how much does it get higher?
             {
                 nAbsDiff = GetRowFrm( *pBaseLine )->Frm().Height();
             }
 
-            if( TBLVAR_CHGABS == eTblChgMode )
+            if( TBLVAR_CHGABS == eTableChgMode )
             {
                 // First test if we have room at all
                 if( bBigger )
@@ -4175,7 +4175,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                         if( !bBigger &&
                             aParam.m_Boxes.size() == m_TabSortContentBoxes.size())
                         {
-                            GetFrmFmt()->GetDoc()->DeleteRowCol(aParam.m_Boxes);
+                            GetFrameFormat()->GetDoc()->DeleteRowCol(aParam.m_Boxes);
                             return false;
                         }
 
@@ -4185,7 +4185,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                                 : UNDO_ROW_DELETE );
                     }
                     else if( ppUndo )
-                        *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
+                        *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true );
 
                     (*fnSelLine)( (*pLines)[ nBaseLinePos ], aParam,
                                     nAbsDiff, false );
@@ -4202,7 +4202,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                     nStt = nBaseLinePos + 1, nEnd = pLines->size();
 
                 // Get the current Lines' height
-                if( TBLFIX_CHGPROP == eTblChgMode )
+                if( TBLFIX_CHGPROP == eTableChgMode )
                 {
                     for( auto n = nStt; n < nEnd; ++n )
                     {
@@ -4263,10 +4263,10 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                                 : UNDO_ROW_DELETE );
                     }
                     else if( ppUndo )
-                        *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
+                        *ppUndo = new SwUndoAttrTable( *aParam.pTableNd, true );
 
                     CR_SetLineHeight aParam1( aParam );
-                    if( TBLFIX_CHGPROP == eTblChgMode && !bBigger &&
+                    if( TBLFIX_CHGPROP == eTableChgMode && !bBigger &&
                         !aParam.nMaxSpace )
                     {
                         // We need to distribute the space evenly among all the Lines.
@@ -4294,13 +4294,13 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                 else
                 {
                     // Then call itself recursively; only with another mode (proportional)
-                    TblChgMode eOld = eTblChgMode;
-                    eTblChgMode = TBLVAR_CHGABS;
+                    TableChgMode eOld = eTableChgMode;
+                    eTableChgMode = TBLVAR_CHGABS;
 
                     bRet = SetRowHeight( rAktBox, eType, nAbsDiff,
                                         nRelDiff, ppUndo );
 
-                    eTblChgMode = eOld;
+                    eTableChgMode = eOld;
                     xFndBox.reset();
                 }
             }
@@ -4323,10 +4323,10 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
 
         if (ppUndo && *ppUndo && aParam.pUndo)
         {
-            aParam.pUndo->SetColWidthParam( nBoxIdx, static_cast<sal_uInt16>(eTblChgMode), eType,
+            aParam.pUndo->SetColWidthParam( nBoxIdx, static_cast<sal_uInt16>(eTableChgMode), eType,
                                             nAbsDiff, nRelDiff );
             if( bBigger )
-                aParam.pUndo->SaveNewBoxes( *aParam.pTblNd, aTmpLst );
+                aParam.pUndo->SaveNewBoxes( *aParam.pTableNd, aTmpLst );
         }
     }
 
@@ -4335,11 +4335,11 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
     return bRet;
 }
 
-SwFrmFmt* SwShareBoxFmt::GetFormat( long nWidth ) const
+SwFrameFormat* SwShareBoxFormat::GetFormat( long nWidth ) const
 {
-    SwFrmFmt *pRet = 0, *pTmp;
-    for( auto n = aNewFmts.size(); n; )
-        if( ( pTmp = aNewFmts[ --n ])->GetFrmSize().GetWidth()
+    SwFrameFormat *pRet = 0, *pTmp;
+    for( auto n = aNewFormats.size(); n; )
+        if( ( pTmp = aNewFormats[ --n ])->GetFrmSize().GetWidth()
                 == nWidth )
         {
             pRet = pTmp;
@@ -4348,16 +4348,16 @@ SwFrmFmt* SwShareBoxFmt::GetFormat( long nWidth ) const
     return pRet;
 }
 
-SwFrmFmt* SwShareBoxFmt::GetFormat( const SfxPoolItem& rItem ) const
+SwFrameFormat* SwShareBoxFormat::GetFormat( const SfxPoolItem& rItem ) const
 {
     const SfxPoolItem* pItem;
     sal_uInt16 nWhich = rItem.Which();
-    SwFrmFmt *pRet = 0, *pTmp;
-    const SfxPoolItem& rFrmSz = pOldFmt->GetFmtAttr( RES_FRM_SIZE, false );
-    for( auto n = aNewFmts.size(); n; )
-        if( SfxItemState::SET == ( pTmp = aNewFmts[ --n ])->
+    SwFrameFormat *pRet = 0, *pTmp;
+    const SfxPoolItem& rFrmSz = pOldFormat->GetFormatAttr( RES_FRM_SIZE, false );
+    for( auto n = aNewFormats.size(); n; )
+        if( SfxItemState::SET == ( pTmp = aNewFormats[ --n ])->
             GetItemState( nWhich, false, &pItem ) && *pItem == rItem &&
-            pTmp->GetFmtAttr( RES_FRM_SIZE, false ) == rFrmSz )
+            pTmp->GetFormatAttr( RES_FRM_SIZE, false ) == rFrmSz )
         {
             pRet = pTmp;
             break;
@@ -4365,51 +4365,51 @@ SwFrmFmt* SwShareBoxFmt::GetFormat( const SfxPoolItem& rItem ) const
     return pRet;
 }
 
-void SwShareBoxFmt::AddFormat( SwFrmFmt& rNew )
+void SwShareBoxFormat::AddFormat( SwFrameFormat& rNew )
 {
-    aNewFmts.push_back( &rNew );
+    aNewFormats.push_back( &rNew );
 }
 
-bool SwShareBoxFmt::RemoveFormat( const SwFrmFmt& rFmt )
+bool SwShareBoxFormat::RemoveFormat( const SwFrameFormat& rFormat )
 {
     // returns true, if we can delete
-    if( pOldFmt == &rFmt )
+    if( pOldFormat == &rFormat )
         return true;
 
-    std::vector<SwFrmFmt*>::iterator it = std::find( aNewFmts.begin(), aNewFmts.end(), &rFmt );
-    if( aNewFmts.end() != it )
-        aNewFmts.erase( it );
-    return aNewFmts.empty();
+    std::vector<SwFrameFormat*>::iterator it = std::find( aNewFormats.begin(), aNewFormats.end(), &rFormat );
+    if( aNewFormats.end() != it )
+        aNewFormats.erase( it );
+    return aNewFormats.empty();
 }
 
-SwShareBoxFmts::~SwShareBoxFmts()
+SwShareBoxFormats::~SwShareBoxFormats()
 {
 }
 
-SwFrmFmt* SwShareBoxFmts::GetFormat( const SwFrmFmt& rFmt, long nWidth ) const
+SwFrameFormat* SwShareBoxFormats::GetFormat( const SwFrameFormat& rFormat, long nWidth ) const
 {
     sal_uInt16 nPos;
-    return Seek_Entry( rFmt, &nPos )
+    return Seek_Entry( rFormat, &nPos )
                     ? aShareArr[ nPos ].GetFormat( nWidth )
                     : 0;
 }
-SwFrmFmt* SwShareBoxFmts::GetFormat( const SwFrmFmt& rFmt,
+SwFrameFormat* SwShareBoxFormats::GetFormat( const SwFrameFormat& rFormat,
                                      const SfxPoolItem& rItem ) const
 {
     sal_uInt16 nPos;
-    return Seek_Entry( rFmt, &nPos )
+    return Seek_Entry( rFormat, &nPos )
                     ? aShareArr[ nPos ].GetFormat( rItem )
                     : 0;
 }
 
-void SwShareBoxFmts::AddFormat( const SwFrmFmt& rOld, SwFrmFmt& rNew )
+void SwShareBoxFormats::AddFormat( const SwFrameFormat& rOld, SwFrameFormat& rNew )
 {
     {
         sal_uInt16 nPos;
-        SwShareBoxFmt* pEntry;
+        SwShareBoxFormat* pEntry;
         if( !Seek_Entry( rOld, &nPos ))
         {
-            pEntry = new SwShareBoxFmt( rOld );
+            pEntry = new SwShareBoxFormat( rOld );
             aShareArr.insert( aShareArr.begin() + nPos, pEntry );
         }
         else
@@ -4419,22 +4419,22 @@ void SwShareBoxFmts::AddFormat( const SwFrmFmt& rOld, SwFrmFmt& rNew )
     }
 }
 
-void SwShareBoxFmts::ChangeFrmFmt( SwTableBox* pBox, SwTableLine* pLn,
-                                    SwFrmFmt& rFmt )
+void SwShareBoxFormats::ChangeFrameFormat( SwTableBox* pBox, SwTableLine* pLn,
+                                    SwFrameFormat& rFormat )
 {
     SwClient aCl;
-    SwFrmFmt* pOld = 0;
+    SwFrameFormat* pOld = 0;
     if( pBox )
     {
-        pOld = pBox->GetFrmFmt();
+        pOld = pBox->GetFrameFormat();
         pOld->Add( &aCl );
-        pBox->ChgFrmFmt( static_cast<SwTableBoxFmt*>(&rFmt) );
+        pBox->ChgFrameFormat( static_cast<SwTableBoxFormat*>(&rFormat) );
     }
     else if( pLn )
     {
-        pOld = pLn->GetFrmFmt();
+        pOld = pLn->GetFrameFormat();
         pOld->Add( &aCl );
-        pLn->ChgFrmFmt( static_cast<SwTableLineFmt*>(&rFmt) );
+        pLn->ChgFrameFormat( static_cast<SwTableLineFormat*>(&rFormat) );
     }
     if( pOld && pOld->HasOnlyOneListener() )
     {
@@ -4443,73 +4443,73 @@ void SwShareBoxFmts::ChangeFrmFmt( SwTableBox* pBox, SwTableLine* pLn,
     }
 }
 
-void SwShareBoxFmts::SetSize( SwTableBox& rBox, const SwFmtFrmSize& rSz )
+void SwShareBoxFormats::SetSize( SwTableBox& rBox, const SwFormatFrmSize& rSz )
 {
-    SwFrmFmt *pBoxFmt = rBox.GetFrmFmt(),
-             *pRet = GetFormat( *pBoxFmt, rSz.GetWidth() );
+    SwFrameFormat *pBoxFormat = rBox.GetFrameFormat(),
+             *pRet = GetFormat( *pBoxFormat, rSz.GetWidth() );
     if( pRet )
-        ChangeFrmFmt( &rBox, 0, *pRet );
+        ChangeFrameFormat( &rBox, 0, *pRet );
     else
     {
-        pRet = rBox.ClaimFrmFmt();
-        pRet->SetFmtAttr( rSz );
-        AddFormat( *pBoxFmt, *pRet );
+        pRet = rBox.ClaimFrameFormat();
+        pRet->SetFormatAttr( rSz );
+        AddFormat( *pBoxFormat, *pRet );
     }
 }
 
-void SwShareBoxFmts::SetAttr( SwTableBox& rBox, const SfxPoolItem& rItem )
+void SwShareBoxFormats::SetAttr( SwTableBox& rBox, const SfxPoolItem& rItem )
 {
-    SwFrmFmt *pBoxFmt = rBox.GetFrmFmt(),
-             *pRet = GetFormat( *pBoxFmt, rItem );
+    SwFrameFormat *pBoxFormat = rBox.GetFrameFormat(),
+             *pRet = GetFormat( *pBoxFormat, rItem );
     if( pRet )
-        ChangeFrmFmt( &rBox, 0, *pRet );
+        ChangeFrameFormat( &rBox, 0, *pRet );
     else
     {
-        pRet = rBox.ClaimFrmFmt();
-        pRet->SetFmtAttr( rItem );
-        AddFormat( *pBoxFmt, *pRet );
+        pRet = rBox.ClaimFrameFormat();
+        pRet->SetFormatAttr( rItem );
+        AddFormat( *pBoxFormat, *pRet );
     }
 }
 
-void SwShareBoxFmts::SetAttr( SwTableLine& rLine, const SfxPoolItem& rItem )
+void SwShareBoxFormats::SetAttr( SwTableLine& rLine, const SfxPoolItem& rItem )
 {
-    SwFrmFmt *pLineFmt = rLine.GetFrmFmt(),
-             *pRet = GetFormat( *pLineFmt, rItem );
+    SwFrameFormat *pLineFormat = rLine.GetFrameFormat(),
+             *pRet = GetFormat( *pLineFormat, rItem );
     if( pRet )
-        ChangeFrmFmt( 0, &rLine, *pRet );
+        ChangeFrameFormat( 0, &rLine, *pRet );
     else
     {
-        pRet = rLine.ClaimFrmFmt();
-        pRet->SetFmtAttr( rItem );
-        AddFormat( *pLineFmt, *pRet );
+        pRet = rLine.ClaimFrameFormat();
+        pRet->SetFormatAttr( rItem );
+        AddFormat( *pLineFormat, *pRet );
     }
 }
 
-void SwShareBoxFmts::RemoveFormat( const SwFrmFmt& rFmt )
+void SwShareBoxFormats::RemoveFormat( const SwFrameFormat& rFormat )
 {
     for( auto i = aShareArr.size(); i; )
-        if( aShareArr[ --i ].RemoveFormat( rFmt ))
+        if( aShareArr[ --i ].RemoveFormat( rFormat ))
             aShareArr.erase( aShareArr.begin() + i );
 }
 
-bool SwShareBoxFmts::Seek_Entry( const SwFrmFmt& rFmt, sal_uInt16* pPos ) const
+bool SwShareBoxFormats::Seek_Entry( const SwFrameFormat& rFormat, sal_uInt16* pPos ) const
 {
-    sal_uLong nIdx = reinterpret_cast<sal_uLong>(&rFmt);
-    _SwShareBoxFmts::size_type nO = aShareArr.size(), nU = 0;
+    sal_uLong nIdx = reinterpret_cast<sal_uLong>(&rFormat);
+    _SwShareBoxFormats::size_type nO = aShareArr.size(), nU = 0;
     if( nO > 0 )
     {
         nO--;
         while( nU <= nO )
         {
             const auto nM = nU + ( nO - nU ) / 2;
-            sal_uLong nFmt = reinterpret_cast<sal_uLong>(&aShareArr[ nM ].GetOldFormat());
-            if( nFmt == nIdx )
+            sal_uLong nFormat = reinterpret_cast<sal_uLong>(&aShareArr[ nM ].GetOldFormat());
+            if( nFormat == nIdx )
             {
                 if( pPos )
                     *pPos = nM;
                 return true;
             }
-            else if( nFmt < nIdx )
+            else if( nFormat < nIdx )
                 nU = nM + 1;
             else if( nM == 0 )
             {
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index f09e2e92e7cb..57c64f107b26 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -43,7 +43,7 @@
 
 using namespace com::sun::star;
 
-void SwTextBoxHelper::create(SwFrmFmt* pShape)
+void SwTextBoxHelper::create(SwFrameFormat* pShape)
 {
     // If TextBox wasn't enabled previously
     if (!pShape->GetAttrSet().HasItem(RES_CNTNT))
@@ -75,9 +75,9 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape)
         if (sw::XTextRangeToSwPaM(aInternalPaM, xTextBox))
         {
             SwAttrSet aSet(pShape->GetAttrSet());
-            SwFmtCntnt aCntnt(aInternalPaM.GetNode().StartOfSectionNode());
-            aSet.Put(aCntnt);
-            pShape->SetFmtAttr(aSet);
+            SwFormatContent aContent(aInternalPaM.GetNode().StartOfSectionNode());
+            aSet.Put(aContent);
+            pShape->SetFormatAttr(aSet);
         }
 
         // Also initialize the properties, which are not constant, but inherited from the shape's ones.
@@ -96,38 +96,38 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape)
     }
 }
 
-void SwTextBoxHelper::destroy(SwFrmFmt* pShape)
+void SwTextBoxHelper::destroy(SwFrameFormat* pShape)
 {
     // If a TextBox was enabled previously
     if (pShape->GetAttrSet().HasItem(RES_CNTNT))
     {
-        SwFrmFmt* pFmt = findTextBox(pShape);
+        SwFrameFormat* pFormat = findTextBox(pShape);
 
         // Unlink the TextBox's text range from the original shape.
-        pShape->ResetFmtAttr(RES_CNTNT);
+        pShape->ResetFormatAttr(RES_CNTNT);
 
         // Delete the associated TextFrame.
-        if (pFmt)
-            pShape->GetDoc()->getIDocumentLayoutAccess().DelLayoutFmt(pFmt);
+        if (pFormat)
+            pShape->GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat(pFormat);
     }
 }
 
-std::set<const SwFrmFmt*> SwTextBoxHelper::findTextBoxes(const SwDoc* pDoc)
+std::set<const SwFrameFormat*> SwTextBoxHelper::findTextBoxes(const SwDoc* pDoc)
 {
-    std::set<const SwFrmFmt*> aTextBoxes;
-    std::map<SwNodeIndex, const SwFrmFmt*> aFlyFormats, aDrawFormats;
+    std::set<const SwFrameFormat*> aTextBoxes;
+    std::map<SwNodeIndex, const SwFrameFormat*> aFlyFormats, aDrawFormats;
 
-    const SwFrmFmts& rSpzFrmFmts = *pDoc->GetSpzFrmFmts();
-    for (SwFrmFmts::const_iterator it = rSpzFrmFmts.begin(); it != rSpzFrmFmts.end(); ++it)
+    const SwFrameFormats& rSpzFrameFormats = *pDoc->GetSpzFrameFormats();
+    for (SwFrameFormats::const_iterator it = rSpzFrameFormats.begin(); it != rSpzFrameFormats.end(); ++it)
     {
-        const SwFrmFmt* pFormat = *it;
+        const SwFrameFormat* pFormat = *it;
 
         // A TextBox in the context of this class is a fly frame that has a
         // matching (same RES_CNTNT) draw frame.
-        if (!pFormat->GetAttrSet().HasItem(RES_CNTNT) || !pFormat->GetCntnt().GetCntntIdx())
+        if (!pFormat->GetAttrSet().HasItem(RES_CNTNT) || !pFormat->GetContent().GetContentIdx())
             continue;
 
-        const SwNodeIndex& rIndex = *pFormat->GetCntnt().GetCntntIdx();
+        const SwNodeIndex& rIndex = *pFormat->GetContent().GetContentIdx();
 
         if (pFormat->Which() == RES_FLYFRMFMT)
         {
@@ -148,23 +148,23 @@ std::set<const SwFrmFmt*> SwTextBoxHelper::findTextBoxes(const SwDoc* pDoc)
     return aTextBoxes;
 }
 
-std::set<const SwFrmFmt*> SwTextBoxHelper::findTextBoxes(const SwNode& rNode)
+std::set<const SwFrameFormat*> SwTextBoxHelper::findTextBoxes(const SwNode& rNode)
 {
     const SwDoc* pDoc = rNode.GetDoc();
-    const SwCntntNode* pCntntNode = 0;
-    const SwCntntFrm* pCntntFrm = 0;
+    const SwContentNode* pContentNode = 0;
+    const SwContentFrm* pContentFrm = 0;
     bool bHaveViewShell = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
-    if (bHaveViewShell && (pCntntNode = rNode.GetCntntNode()) && (pCntntFrm = pCntntNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout())))
+    if (bHaveViewShell && (pContentNode = rNode.GetContentNode()) && (pContentFrm = pContentNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout())))
     {
         // We can use the layout information to iterate over only the frames which are anchored to us.
-        std::set<const SwFrmFmt*> aRet;
-        const SwSortedObjs* pSortedObjs = pCntntFrm->GetDrawObjs();
+        std::set<const SwFrameFormat*> aRet;
+        const SwSortedObjs* pSortedObjs = pContentFrm->GetDrawObjs();
         if (pSortedObjs)
         {
             for (size_t i = 0; i < pSortedObjs->size(); ++i)
             {
                 SwAnchoredObject* pAnchoredObject = (*pSortedObjs)[i];
-                SwFrmFmt* pTextBox = findTextBox(&pAnchoredObject->GetFrmFmt());
+                SwFrameFormat* pTextBox = findTextBox(&pAnchoredObject->GetFrameFormat());
                 if (pTextBox)
                     aRet.insert(pTextBox);
             }
@@ -177,14 +177,14 @@ std::set<const SwFrmFmt*> SwTextBoxHelper::findTextBoxes(const SwNode& rNode)
         return findTextBoxes(pDoc);
 }
 
-std::map<SwFrmFmt*, SwFrmFmt*> SwTextBoxHelper::findShapes(const SwDoc* pDoc)
+std::map<SwFrameFormat*, SwFrameFormat*> SwTextBoxHelper::findShapes(const SwDoc* pDoc)
 {
-    std::map<SwFrmFmt*, SwFrmFmt*> aRet;
+    std::map<SwFrameFormat*, SwFrameFormat*> aRet;
 
-    const SwFrmFmts& rSpzFrmFmts = *pDoc->GetSpzFrmFmts();
-    for (SwFrmFmts::const_iterator it = rSpzFrmFmts.begin(); it != rSpzFrmFmts.end(); ++it)
+    const SwFrameFormats& rSpzFrameFormats = *pDoc->GetSpzFrameFormats();
+    for (SwFrameFormats::const_iterator it = rSpzFrameFormats.begin(); it != rSpzFrameFormats.end(); ++it)
     {
-        SwFrmFmt* pTextBox = findTextBox(*it);
+        SwFrameFormat* pTextBox = findTextBox(*it);
         if (pTextBox)
             aRet[pTextBox] = *it;
     }
@@ -193,10 +193,10 @@ std::map<SwFrmFmt*, SwFrmFmt*> SwTextBoxHelper::findShapes(const SwDoc* pDoc)
 }
 
 /// If the passed SdrObject is in fact a TextFrame, that is used as a TextBox.
-bool lcl_isTextBox(SdrObject* pSdrObject, std::set<const SwFrmFmt*>& rTextBoxes)
+bool lcl_isTextBox(SdrObject* pSdrObject, std::set<const SwFrameFormat*>& rTextBoxes)
 {
     SwVirtFlyDrawObj* pObject = PTR_CAST(SwVirtFlyDrawObj, pSdrObject);
-    return pObject && rTextBoxes.find(pObject->GetFmt()) != rTextBoxes.end();
+    return pObject && rTextBoxes.find(pObject->GetFormat()) != rTextBoxes.end();
 }
 
 bool SwTextBoxHelper::isTextBox(const SdrObject* pObject)
@@ -204,11 +204,11 @@ bool SwTextBoxHelper::isTextBox(const SdrObject* pObject)
     const SwVirtFlyDrawObj* pVirtFlyDrawObj = PTR_CAST(SwVirtFlyDrawObj, pObject);
     if (!pVirtFlyDrawObj)
         return false;
-    std::set<const SwFrmFmt*> aTextBoxes = findTextBoxes(pVirtFlyDrawObj->GetFmt()->GetDoc());
-    return aTextBoxes.find(pVirtFlyDrawObj->GetFmt()) != aTextBoxes.end();
+    std::set<const SwFrameFormat*> aTextBoxes = findTextBoxes(pVirtFlyDrawObj->GetFormat()->GetDoc());
+    return aTextBoxes.find(pVirtFlyDrawObj->GetFormat()) != aTextBoxes.end();
 }
 
-sal_Int32 SwTextBoxHelper::getCount(SdrPage* pPage, std::set<const SwFrmFmt*>& rTextBoxes)
+sal_Int32 SwTextBoxHelper::getCount(SdrPage* pPage, std::set<const SwFrameFormat*>& rTextBoxes)
 {
     sal_Int32 nRet = 0;
     for (size_t i = 0; i < pPage->GetObjCount(); ++i)
@@ -220,7 +220,7 @@ sal_Int32 SwTextBoxHelper::getCount(SdrPage* pPage, std::set<const SwFrmFmt*>& r
     return nRet;
 }
 
-uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrmFmt*>& rTextBoxes) throw(lang::IndexOutOfBoundsException)
+uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrameFormat*>& rTextBoxes) throw(lang::IndexOutOfBoundsException)
 {
     if (nIndex < 0)
         throw lang::IndexOutOfBoundsException();
@@ -245,7 +245,7 @@ uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<
     return uno::makeAny(uno::Reference<drawing::XShape>(pRet->getUnoShape(), uno::UNO_QUERY));
 }
 
-sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject, std::set<const SwFrmFmt*>& rTextBoxes)
+sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject, std::set<const SwFrameFormat*>& rTextBoxes)
 {
     if (const SdrPage* pPage = pObject->GetPage())
     {
@@ -264,31 +264,31 @@ sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject, std::set<const Sw
     return pObject->GetOrdNum();
 }
 
-SwFrmFmt* SwTextBoxHelper::findTextBox(uno::Reference<drawing::XShape> xShape)
+SwFrameFormat* SwTextBoxHelper::findTextBox(uno::Reference<drawing::XShape> xShape)
 {
     SwXShape* pShape = dynamic_cast<SwXShape*>(xShape.get());
     if (!pShape)
         return 0;
 
-    return findTextBox(pShape->GetFrmFmt());
+    return findTextBox(pShape->GetFrameFormat());
 }
 
-SwFrmFmt* SwTextBoxHelper::findTextBox(const SwFrmFmt* pShape)
+SwFrameFormat* SwTextBoxHelper::findTextBox(const SwFrameFormat* pShape)
 {
-    SwFrmFmt* pRet = 0;
+    SwFrameFormat* pRet = 0;
 
     // Only draw frames can have TextBoxes.
     if (pShape && pShape->Which() == RES_DRAWFRMFMT && pShape->GetAttrSet().HasItem(RES_CNTNT))
     {
-        const SwFmtCntnt& rCntnt = pShape->GetCntnt();
-        const SwFrmFmts& rSpzFrmFmts = *pShape->GetDoc()->GetSpzFrmFmts();
-        for (SwFrmFmts::const_iterator it = rSpzFrmFmts.begin(); it != rSpzFrmFmts.end(); ++it)
+        const SwFormatContent& rContent = pShape->GetContent();
+        const SwFrameFormats& rSpzFrameFormats = *pShape->GetDoc()->GetSpzFrameFormats();
+        for (SwFrameFormats::const_iterator it = rSpzFrameFormats.begin(); it != rSpzFrameFormats.end(); ++it)
         {
-            SwFrmFmt* pFmt = *it;
+            SwFrameFormat* pFormat = *it;
             // Only a fly frame can be a TextBox.
-            if (pFmt->Which() == RES_FLYFRMFMT && pFmt->GetAttrSet().HasItem(RES_CNTNT) && pFmt->GetCntnt() == rCntnt)
+            if (pFormat->Which() == RES_FLYFRMFMT && pFormat->GetAttrSet().HasItem(RES_CNTNT) && pFormat->GetContent() == rContent)
             {
-                pRet = pFmt;
+                pRet = pFormat;
                 break;
             }
         }
@@ -298,18 +298,18 @@ SwFrmFmt* SwTextBoxHelper::findTextBox(const SwFrmFmt* pShape)
 }
 
 template < typename T >
-void lcl_queryInterface(SwFrmFmt* pShape, uno::Any& rAny)
+void lcl_queryInterface(SwFrameFormat* pShape, uno::Any& rAny)
 {
-    if (SwFrmFmt* pFmt = SwTextBoxHelper::findTextBox(pShape))
+    if (SwFrameFormat* pFormat = SwTextBoxHelper::findTextBox(pShape))
     {
         uno::Reference<T> const xInterface(
-            SwXTextFrame::CreateXTextFrame(*pFmt->GetDoc(), pFmt),
+            SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), pFormat),
             uno::UNO_QUERY);
         rAny <<= xInterface;
     }
 }
 
-uno::Any SwTextBoxHelper::queryInterface(SwFrmFmt* pShape, const uno::Type& rType)
+uno::Any SwTextBoxHelper::queryInterface(SwFrameFormat* pShape, const uno::Type& rType)
 {
     uno::Any aRet;
 
@@ -330,7 +330,7 @@ uno::Any SwTextBoxHelper::queryInterface(SwFrmFmt* pShape, const uno::Type& rTyp
     return aRet;
 }
 
-Rectangle SwTextBoxHelper::getTextRectangle(SwFrmFmt* pShape, bool bAbsolute)
+Rectangle SwTextBoxHelper::getTextRectangle(SwFrameFormat* pShape, bool bAbsolute)
 {
     Rectangle aRet;
     aRet.SetEmpty();
@@ -363,7 +363,7 @@ Rectangle SwTextBoxHelper::getTextRectangle(SwFrmFmt* pShape, bool bAbsolute)
     return aRet;
 }
 
-void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, const OUString& rPropertyName, const css::uno::Any& rValue)
+void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, const OUString& rPropertyName, const css::uno::Any& rValue)
 {
     if (rPropertyName == "CustomShapeGeometry")
     {
@@ -378,22 +378,22 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, const OUString& rPropertyNa
             syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_POSITION, uno::makeAny(static_cast<sal_Int32>(convertTwipToMm100(aRectangle.Top()))));
         }
 
-        if (SwFrmFmt* pFmt = findTextBox(pShape))
+        if (SwFrameFormat* pFormat = findTextBox(pShape))
         {
             comphelper::SequenceAsHashMap aCustomShapeGeometry(rValue);
             // That would be the btLr text direction which we don't support at a frame level, so do it at a character level.
             if (aCustomShapeGeometry.find("TextPreRotateAngle") != aCustomShapeGeometry.end() && aCustomShapeGeometry["TextPreRotateAngle"].get<sal_Int32>() == -270)
             {
-                if (const SwNodeIndex* pNodeIndex = pFmt->GetCntnt().GetCntntIdx())
+                if (const SwNodeIndex* pNodeIndex = pFormat->GetContent().GetContentIdx())
                 {
-                    SwPaM aPaM(*pFmt->GetDoc()->GetNodes()[pNodeIndex->GetIndex() + 1], 0);
+                    SwPaM aPaM(*pFormat->GetDoc()->GetNodes()[pNodeIndex->GetIndex() + 1], 0);
                     aPaM.SetMark();
-                    if (SwTxtNode* pMark = pFmt->GetDoc()->GetNodes()[pNodeIndex->GetNode().EndOfSectionIndex() - 1]->GetTxtNode())
+                    if (SwTextNode* pMark = pFormat->GetDoc()->GetNodes()[pNodeIndex->GetNode().EndOfSectionIndex() - 1]->GetTextNode())
                     {
                         aPaM.GetMark()->nNode = *pMark;
-                        aPaM.GetMark()->nContent.Assign(pMark, pMark->GetTxt().getLength());
+                        aPaM.GetMark()->nContent.Assign(pMark, pMark->GetText().getLength());
                         SvxCharRotateItem aItem(900, false, RES_CHRATR_ROTATE);
-                        pFmt->GetDoc()->getIDocumentContentOperations().InsertPoolItem(aPaM, aItem);
+                        pFormat->GetDoc()->getIDocumentContentOperations().InsertPoolItem(aPaM, aItem);
                     }
                 }
             }
@@ -405,14 +405,14 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, const OUString& rPropertyNa
         syncProperty(pShape, RES_FRM_SIZE, MID_FRMSIZE_IS_AUTO_HEIGHT, rValue);
 }
 
-void SwTextBoxHelper::getProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberId, css::uno::Any& rValue)
+void SwTextBoxHelper::getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberId, css::uno::Any& rValue)
 {
     if (!pShape)
         return;
 
     nMemberId &= ~CONVERT_TWIPS;
 
-    if (SwFrmFmt* pFmt = findTextBox(pShape))
+    if (SwFrameFormat* pFormat = findTextBox(pShape))
     {
         if (nWID == RES_CHAIN)
         {
@@ -421,19 +421,19 @@ void SwTextBoxHelper::getProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 n
             case MID_CHAIN_PREVNAME:
             case MID_CHAIN_NEXTNAME:
             {
-                const SwFmtChain& rChain = pFmt->GetChain();
+                const SwFormatChain& rChain = pFormat->GetChain();
                 rChain.QueryValue(rValue, nMemberId);
             }
             break;
             case MID_CHAIN_NAME:
-                rValue = uno::makeAny(pFmt->GetName());
+                rValue = uno::makeAny(pFormat->GetName());
                 break;
             }
         }
     }
 }
 
-void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberId, const css::uno::Any& rValue)
+void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberId, const css::uno::Any& rValue)
 {
     // No shape yet? Then nothing to do, initial properties are set by create().
     if (!pShape)
@@ -442,7 +442,7 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
     uno::Any aValue(rValue);
     nMemberId &= ~CONVERT_TWIPS;
 
-    if (SwFrmFmt* pFmt = findTextBox(pShape))
+    if (SwFrameFormat* pFormat = findTextBox(pShape))
     {
         OUString aPropertyName;
         bool bAdjustX = false;
@@ -499,7 +499,7 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
                 if (aValue.get<text::TextContentAnchorType>() == text::TextContentAnchorType_AS_CHARACTER)
                 {
                     uno::Reference<beans::XPropertySet> const xPropertySet(
-                        SwXTextFrame::CreateXTextFrame(*pFmt->GetDoc(), pFmt),
+                        SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), pFormat),
                         uno::UNO_QUERY);
                     xPropertySet->setPropertyValue(UNO_NAME_SURROUND, uno::makeAny(text::WrapTextMode_THROUGHT));
                     return;
@@ -511,12 +511,12 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
         {
             uno::Reference<text::XTextRange> xRange;
             rValue >>= xRange;
-            SwUnoInternalPaM aInternalPaM(*pFmt->GetDoc());
+            SwUnoInternalPaM aInternalPaM(*pFormat->GetDoc());
             if (sw::XTextRangeToSwPaM(aInternalPaM, xRange))
             {
-                SwFmtAnchor aAnchor(pFmt->GetAnchor());
+                SwFormatAnchor aAnchor(pFormat->GetAnchor());
                 aAnchor.SetAnchor(aInternalPaM.Start());
-                pFmt->SetFmtAttr(aAnchor);
+                pFormat->SetFormatAttr(aAnchor);
             }
         }
         break;
@@ -565,60 +565,60 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
             }
 
             uno::Reference<beans::XPropertySet> const xPropertySet(
-                SwXTextFrame::CreateXTextFrame(*pFmt->GetDoc(), pFmt),
+                SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), pFormat),
                 uno::UNO_QUERY);
             xPropertySet->setPropertyValue(aPropertyName, aValue);
         }
     }
 }
 
-void SwTextBoxHelper::saveLinks(const SwFrmFmts& rFormats, std::map<const SwFrmFmt*, const SwFrmFmt*>& rLinks)
+void SwTextBoxHelper::saveLinks(const SwFrameFormats& rFormats, std::map<const SwFrameFormat*, const SwFrameFormat*>& rLinks)
 {
     for (size_t i = 0; i < rFormats.size(); ++i)
     {
-        const SwFrmFmt* pFmt = rFormats[i];
-        if (pFmt->Which() != RES_DRAWFRMFMT)
+        const SwFrameFormat* pFormat = rFormats[i];
+        if (pFormat->Which() != RES_DRAWFRMFMT)
             continue;
-        if (SwFrmFmt* pTextBox = findTextBox(pFmt))
-            rLinks[pFmt] = pTextBox;
+        if (SwFrameFormat* pTextBox = findTextBox(pFormat))
+            rLinks[pFormat] = pTextBox;
     }
 }
 
-void SwTextBoxHelper::resetLink(SwFrmFmt* pShape, std::map<const SwFrmFmt*, SwFmtCntnt>& rMap)
+void SwTextBoxHelper::resetLink(SwFrameFormat* pShape, std::map<const SwFrameFormat*, SwFormatContent>& rMap)
 {
     if (pShape->Which() == RES_DRAWFRMFMT)
     {
-        if (pShape->GetCntnt().GetCntntIdx())
-            rMap.insert(std::make_pair(pShape, pShape->GetCntnt()));
-        pShape->ResetFmtAttr(RES_CNTNT);
+        if (pShape->GetContent().GetContentIdx())
+            rMap.insert(std::make_pair(pShape, pShape->GetContent()));
+        pShape->ResetFormatAttr(RES_CNTNT);
     }
 }
 
-void SwTextBoxHelper::restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrmFmt*>& rNew, SavedLink& rSavedLinks, SavedContent& rOldContent)
+void SwTextBoxHelper::restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rOldContent)
 {
     size_t i = 0;
     for (std::set<_ZSortFly>::iterator aSetIt = rOld.begin(); aSetIt != rOld.end(); ++aSetIt, ++i)
     {
-        SavedLink::iterator aTextBoxIt = rSavedLinks.find(aSetIt->GetFmt());
+        SavedLink::iterator aTextBoxIt = rSavedLinks.find(aSetIt->GetFormat());
         if (aTextBoxIt != rSavedLinks.end())
         {
             size_t j = 0;
             for (std::set<_ZSortFly>::iterator aSetJt = rOld.begin(); aSetJt != rOld.end(); ++aSetJt, ++j)
             {
-                if (aSetJt->GetFmt() == aTextBoxIt->second)
-                    rNew[i]->SetFmtAttr(rNew[j]->GetCntnt());
+                if (aSetJt->GetFormat() == aTextBoxIt->second)
+                    rNew[i]->SetFormatAttr(rNew[j]->GetContent());
             }
         }
-        if (rOldContent.find(aSetIt->GetFmt()) != rOldContent.end())
-            const_cast<SwFrmFmt*>(aSetIt->GetFmt())->SetFmtAttr(rOldContent[aSetIt->GetFmt()]);
+        if (rOldContent.find(aSetIt->GetFormat()) != rOldContent.end())
+            const_cast<SwFrameFormat*>(aSetIt->GetFormat())->SetFormatAttr(rOldContent[aSetIt->GetFormat()]);
     }
 }
 
-void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
+void SwTextBoxHelper::syncFlyFrmAttr(SwFrameFormat& rShape, SfxItemSet& rSet)
 {
-    if (SwFrmFmt* pFmt = findTextBox(&rShape))
+    if (SwFrameFormat* pFormat = findTextBox(&rShape))
     {
-        SfxItemSet aTextBoxSet(pFmt->GetDoc()->GetAttrPool(), aFrmFmtSetRange);
+        SfxItemSet aTextBoxSet(pFormat->GetDoc()->GetAttrPool(), aFrameFormatSetRange);
 
         SfxItemIter aIter(rSet);
         sal_uInt16 nWhich = aIter.GetCurItem()->Which();
@@ -628,8 +628,8 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
             {
             case RES_VERT_ORIENT:
             {
-                const SwFmtVertOrient& rOrient = static_cast<const SwFmtVertOrient&>(*aIter.GetCurItem());
-                SwFmtVertOrient aOrient(rOrient);
+                const SwFormatVertOrient& rOrient = static_cast<const SwFormatVertOrient&>(*aIter.GetCurItem());
+                SwFormatVertOrient aOrient(rOrient);
 
                 Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false);
                 if (!aRect.IsEmpty())
@@ -638,7 +638,7 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
                 aTextBoxSet.Put(aOrient);
 
                 // restore height (shrinked for extending beyond the page bottom - tdf#91260)
-                SwFmtFrmSize aSize(pFmt->GetFrmSize());
+                SwFormatFrmSize aSize(pFormat->GetFrmSize());
                 if (!aRect.IsEmpty())
                 {
                     aSize.SetHeight(aRect.getHeight());
@@ -648,8 +648,8 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
             break;
             case RES_HORI_ORIENT:
             {
-                const SwFmtHoriOrient& rOrient = static_cast<const SwFmtHoriOrient&>(*aIter.GetCurItem());
-                SwFmtHoriOrient aOrient(rOrient);
+                const SwFormatHoriOrient& rOrient = static_cast<const SwFormatHoriOrient&>(*aIter.GetCurItem());
+                SwFormatHoriOrient aOrient(rOrient);
 
                 Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false);
                 if (!aRect.IsEmpty())
@@ -664,9 +664,9 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
                 // the position and the size of the textbox (e.g. larger
                 // rounded edges of a rectangle -> need to push right/down the
                 // textbox).
-                SwFmtVertOrient aVertOrient(rShape.GetVertOrient());
-                SwFmtHoriOrient aHoriOrient(rShape.GetHoriOrient());
-                SwFmtFrmSize aSize(pFmt->GetFrmSize());
+                SwFormatVertOrient aVertOrient(rShape.GetVertOrient());
+                SwFormatHoriOrient aHoriOrient(rShape.GetHoriOrient());
+                SwFormatFrmSize aSize(pFormat->GetFrmSize());
 
                 Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false);
                 if (!aRect.IsEmpty())
@@ -694,7 +694,7 @@ void SwTextBoxHelper::syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet)
         while (0 != (nWhich = aIter.NextItem()->Which()));
 
         if (aTextBoxSet.Count())
-            pFmt->GetDoc()->SetFlyFrmAttr(*pFmt, aTextBoxSet);
+            pFormat->GetDoc()->SetFlyFrmAttr(*pFormat, aTextBoxSet);
     }
 }
 
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 6f8ea5e8a177..c61bf3baf4bd 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -59,15 +59,15 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
         sal_uInt32 nMaxItems = pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_INETFMT );
         for( sal_uInt32 n = 0; n < nMaxItems; ++n )
         {
-            const SwFmtINetFmt* pItem = static_cast<const SwFmtINetFmt*>(pDoc->GetAttrPool().GetItem2(RES_TXTATR_INETFMT, n ));
+            const SwFormatINetFormat* pItem = static_cast<const SwFormatINetFormat*>(pDoc->GetAttrPool().GetItem2(RES_TXTATR_INETFMT, n ));
             if( pItem != 0 &&
                 ( pItem->GetValue() == sURL || ( !sBkmk.isEmpty() && pItem->GetValue() == sBkmk )))
             {
-                const SwTxtINetFmt* pTxtAttr = pItem->GetTxtINetFmt();
-                if (pTxtAttr != 0)
+                const SwTextINetFormat* pTextAttr = pItem->GetTextINetFormat();
+                if (pTextAttr != 0)
                 {
-                    const SwTxtNode* pTxtNd = pTxtAttr->GetpTxtNode();
-                    if (pTxtNd != 0)
+                    const SwTextNode* pTextNd = pTextAttr->GetpTextNode();
+                    if (pTextNd != 0)
                     {
                         if( !bAction && pESh )
                         {
@@ -76,14 +76,14 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
                             bUnLockView = !pESh->IsViewLocked();
                             pESh->LockView( true );
                         }
-                        const_cast<SwTxtINetFmt*>(pTxtAttr)->SetVisitedValid(false);
-                        const SwTxtAttr* pAttr = pTxtAttr;
+                        const_cast<SwTextINetFormat*>(pTextAttr)->SetVisitedValid(false);
+                        const SwTextAttr* pAttr = pTextAttr;
                         SwUpdateAttr aUpdateAttr(
                             pAttr->GetStart(),
                             *pAttr->End(),
                             RES_FMT_CHG);
 
-                        const_cast< SwTxtNode* >(pTxtNd)->ModifyNotification(&aUpdateAttr, &aUpdateAttr);
+                        const_cast< SwTextNode* >(pTextNd)->ModifyNotification(&aUpdateAttr, &aUpdateAttr);
                     }
                 }
             }
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 21dd4b9464ed..571407cacbe6 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -41,76 +41,76 @@
 
 // Structure for the mapping from old and new frame formats to the
 // boxes and lines of a table
-struct _MapTblFrmFmt
+struct _MapTableFrameFormat
 {
-    const SwFrmFmt *pOld;
-    SwFrmFmt *pNew;
-    _MapTblFrmFmt( const SwFrmFmt *pOldFmt, SwFrmFmt*pNewFmt )
-        : pOld( pOldFmt ), pNew( pNewFmt )
+    const SwFrameFormat *pOld;
+    SwFrameFormat *pNew;
+    _MapTableFrameFormat( const SwFrameFormat *pOldFormat, SwFrameFormat*pNewFormat )
+        : pOld( pOldFormat ), pNew( pNewFormat )
     {}
 };
 
-typedef std::vector<_MapTblFrmFmt> _MapTblFrmFmts;
+typedef std::vector<_MapTableFrameFormat> _MapTableFrameFormats;
 
-SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
+SwContentNode* SwTextNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
 {
     // the Copy-Textnode is the Node with the Text, the Copy-Attrnode is the
     // node with the collection and hard attributes. Normally is the same
     // node, but if insert a glossary without formatting, then the Attrnode
     // is the prev node of the destionation position in dest. document.
-    SwTxtNode* pCpyTxtNd = const_cast<SwTxtNode*>(this);
-    SwTxtNode* pCpyAttrNd = pCpyTxtNd;
+    SwTextNode* pCpyTextNd = const_cast<SwTextNode*>(this);
+    SwTextNode* pCpyAttrNd = pCpyTextNd;
 
     // Copy the formats to the other document
-    SwTxtFmtColl* pColl = 0;
+    SwTextFormatColl* pColl = 0;
     if( pDoc->IsInsOnlyTextGlossary() )
     {
         SwNodeIndex aIdx( rIdx, -1 );
-        if( aIdx.GetNode().IsTxtNode() )
+        if( aIdx.GetNode().IsTextNode() )
         {
-            pCpyAttrNd = aIdx.GetNode().GetTxtNode();
-            pColl = &pCpyAttrNd->GetTxtColl()->GetNextTxtFmtColl();
+            pCpyAttrNd = aIdx.GetNode().GetTextNode();
+            pColl = &pCpyAttrNd->GetTextColl()->GetNextTextFormatColl();
         }
     }
     if( !pColl )
-        pColl = pDoc->CopyTxtColl( *GetTxtColl() );
+        pColl = pDoc->CopyTextColl( *GetTextColl() );
 
-    SwTxtNode* pTxtNd = pDoc->GetNodes().MakeTxtNode( rIdx, pColl );
+    SwTextNode* pTextNd = pDoc->GetNodes().MakeTextNode( rIdx, pColl );
 
     // METADATA: register copy
-    pTxtNd->RegisterAsCopyOf(*pCpyTxtNd);
+    pTextNd->RegisterAsCopyOf(*pCpyTextNd);
 
     // Copy Attribute/Text
     if( !pCpyAttrNd->HasSwAttrSet() )
         // An AttrSet was added for numbering, so delete it
-        pTxtNd->ResetAllAttr();
+        pTextNd->ResetAllAttr();
 
     // if Copy-Textnode unequal to Copy-Attrnode, then copy first
     // the attributes into the new Node.
-    if( pCpyAttrNd != pCpyTxtNd )
+    if( pCpyAttrNd != pCpyTextNd )
     {
-        pCpyAttrNd->CopyAttr( pTxtNd, 0, 0 );
+        pCpyAttrNd->CopyAttr( pTextNd, 0, 0 );
         if( pCpyAttrNd->HasSwAttrSet() )
         {
             SwAttrSet aSet( *pCpyAttrNd->GetpSwAttrSet() );
             aSet.ClearItem( RES_PAGEDESC );
             aSet.ClearItem( RES_BREAK );
-            aSet.CopyToModify( *pTxtNd );
+            aSet.CopyToModify( *pTextNd );
         }
     }
 
     // Is that enough? What about PostIts/Fields/FieldTypes?
     // #i96213# - force copy of all attributes
-    pCpyTxtNd->CopyText( pTxtNd, SwIndex( pCpyTxtNd ),
-        pCpyTxtNd->GetTxt().getLength(), true );
+    pCpyTextNd->CopyText( pTextNd, SwIndex( pCpyTextNd ),
+        pCpyTextNd->GetText().getLength(), true );
 
     if( RES_CONDTXTFMTCOLL == pColl->Which() )
-        pTxtNd->ChkCondColl();
+        pTextNd->ChkCondColl();
 
-    return pTxtNd;
+    return pTextNd;
 }
 
-static bool lcl_SrchNew( const _MapTblFrmFmt& rMap, SwFrmFmt** pPara )
+static bool lcl_SrchNew( const _MapTableFrameFormat& rMap, SwFrameFormat** pPara )
 {
     if( rMap.pOld != *pPara )
         return true;
@@ -121,68 +121,68 @@ static bool lcl_SrchNew( const _MapTblFrmFmt& rMap, SwFrmFmt** pPara )
 struct _CopyTable
 {
     SwDoc* m_pDoc;
-    sal_uLong m_nOldTblSttIdx;
-    _MapTblFrmFmts& m_rMapArr;
+    sal_uLong m_nOldTableSttIdx;
+    _MapTableFrameFormats& m_rMapArr;
     SwTableLine* m_pInsLine;
     SwTableBox* m_pInsBox;
-    SwTableNode *m_pTblNd;
+    SwTableNode *m_pTableNd;
     const SwTable *m_pOldTable;
 
-    _CopyTable(SwDoc* pDc, _MapTblFrmFmts& rArr, sal_uLong nOldStt,
-               SwTableNode& rTblNd, const SwTable* pOldTable)
-        : m_pDoc(pDc), m_nOldTblSttIdx(nOldStt), m_rMapArr(rArr),
-          m_pInsLine(0), m_pInsBox(0), m_pTblNd(&rTblNd), m_pOldTable(pOldTable)
+    _CopyTable(SwDoc* pDc, _MapTableFrameFormats& rArr, sal_uLong nOldStt,
+               SwTableNode& rTableNd, const SwTable* pOldTable)
+        : m_pDoc(pDc), m_nOldTableSttIdx(nOldStt), m_rMapArr(rArr),
+          m_pInsLine(0), m_pInsBox(0), m_pTableNd(&rTableNd), m_pOldTable(pOldTable)
     {}
 };
 
-static void lcl_CopyTblLine( const SwTableLine* pLine, _CopyTable* pCT );
+static void lcl_CopyTableLine( const SwTableLine* pLine, _CopyTable* pCT );
 
-static void lcl_CopyTblBox( SwTableBox* pBox, _CopyTable* pCT )
+static void lcl_CopyTableBox( SwTableBox* pBox, _CopyTable* pCT )
 {
-    SwTableBoxFmt * pBoxFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
-    for (_MapTblFrmFmts::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it)
-        if ( !lcl_SrchNew( *it, reinterpret_cast<SwFrmFmt**>(&pBoxFmt) ) )
+    SwTableBoxFormat * pBoxFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
+    for (_MapTableFrameFormats::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it)
+        if ( !lcl_SrchNew( *it, reinterpret_cast<SwFrameFormat**>(&pBoxFormat) ) )
             break;
 
-    if (pBoxFmt == pBox->GetFrmFmt()) // Create a new one?
+    if (pBoxFormat == pBox->GetFrameFormat()) // Create a new one?
     {
         const SfxPoolItem* pItem;
-        if( SfxItemState::SET == pBoxFmt->GetItemState( RES_BOXATR_FORMULA, false,
-            &pItem ) && static_cast<const SwTblBoxFormula*>(pItem)->IsIntrnlName() )
+        if( SfxItemState::SET == pBoxFormat->GetItemState( RES_BOXATR_FORMULA, false,
+            &pItem ) && static_cast<const SwTableBoxFormula*>(pItem)->IsIntrnlName() )
         {
-            const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->PtrToBoxNm(pCT->m_pOldTable);
+            const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->PtrToBoxNm(pCT->m_pOldTable);
         }
 
-        pBoxFmt = pCT->m_pDoc->MakeTableBoxFmt();
-        pBoxFmt->CopyAttrs( *pBox->GetFrmFmt() );
+        pBoxFormat = pCT->m_pDoc->MakeTableBoxFormat();
+        pBoxFormat->CopyAttrs( *pBox->GetFrameFormat() );
 
         if( pBox->GetSttIdx() )
         {
             SvNumberFormatter* pN = pCT->m_pDoc->GetNumberFormatter(false);
-            if( pN && pN->HasMergeFmtTbl() && SfxItemState::SET == pBoxFmt->
+            if( pN && pN->HasMergeFormatTable() && SfxItemState::SET == pBoxFormat->
                 GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
             {
-                sal_uLong nOldIdx = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
-                sal_uLong nNewIdx = pN->GetMergeFmtIndex( nOldIdx );
+                sal_uLong nOldIdx = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
+                sal_uLong nNewIdx = pN->GetMergeFormatIndex( nOldIdx );
                 if( nNewIdx != nOldIdx )
-                    pBoxFmt->SetFmtAttr( SwTblBoxNumFormat( nNewIdx ));
+                    pBoxFormat->SetFormatAttr( SwTableBoxNumFormat( nNewIdx ));
 
             }
         }
 
-        pCT->m_rMapArr.push_back(_MapTblFrmFmt(pBox->GetFrmFmt(), pBoxFmt));
+        pCT->m_rMapArr.push_back(_MapTableFrameFormat(pBox->GetFrameFormat(), pBoxFormat));
     }
 
     sal_uInt16 nLines = pBox->GetTabLines().size();
     SwTableBox* pNewBox;
     if( nLines )
-        pNewBox = new SwTableBox(pBoxFmt, nLines, pCT->m_pInsLine);
+        pNewBox = new SwTableBox(pBoxFormat, nLines, pCT->m_pInsLine);
     else
     {
-        SwNodeIndex aNewIdx(*pCT->m_pTblNd, pBox->GetSttIdx() - pCT->m_nOldTblSttIdx);
+        SwNodeIndex aNewIdx(*pCT->m_pTableNd, pBox->GetSttIdx() - pCT->m_nOldTableSttIdx);
         OSL_ENSURE( aNewIdx.GetNode().IsStartNode(), "Index is not on the start node" );
 
-        pNewBox = new SwTableBox(pBoxFmt, aNewIdx, pCT->m_pInsLine);
+        pNewBox = new SwTableBox(pBoxFormat, aNewIdx, pCT->m_pInsLine);
         pNewBox->setRowSpan( pBox->getRowSpan() );
     }
 
@@ -193,30 +193,30 @@ static void lcl_CopyTblBox( SwTableBox* pBox, _CopyTable* pCT )
         _CopyTable aPara(*pCT);
         aPara.m_pInsBox = pNewBox;
         for( const SwTableLine* pLine : pBox->GetTabLines() )
-            lcl_CopyTblLine( pLine, &aPara );
+            lcl_CopyTableLine( pLine, &aPara );
     }
-    else if (pNewBox->IsInHeadline(&pCT->m_pTblNd->GetTable()))
+    else if (pNewBox->IsInHeadline(&pCT->m_pTableNd->GetTable()))
     {
         // In the headline, the paragraphs must match conditional styles
         pNewBox->GetSttNd()->CheckSectionCondColl();
     }
 }
 
-static void lcl_CopyTblLine( const SwTableLine* pLine, _CopyTable* pCT )
+static void lcl_CopyTableLine( const SwTableLine* pLine, _CopyTable* pCT )
 {
-    SwTableLineFmt * pLineFmt = static_cast<SwTableLineFmt*>(pLine->GetFrmFmt());
-    for (_MapTblFrmFmts::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it)
-        if ( !lcl_SrchNew( *it, reinterpret_cast<SwFrmFmt**>(&pLineFmt) ) )
+    SwTableLineFormat * pLineFormat = static_cast<SwTableLineFormat*>(pLine->GetFrameFormat());
+    for (_MapTableFrameFormats::const_iterator it = pCT->m_rMapArr.begin(); it != pCT->m_rMapArr.end(); ++it)
+        if ( !lcl_SrchNew( *it, reinterpret_cast<SwFrameFormat**>(&pLineFormat) ) )
             break;
 
-    if( pLineFmt == pLine->GetFrmFmt() ) // Create a new one?
+    if( pLineFormat == pLine->GetFrameFormat() ) // Create a new one?
     {
-        pLineFmt = pCT->m_pDoc->MakeTableLineFmt();
-        pLineFmt->CopyAttrs( *pLine->GetFrmFmt() );
-        pCT->m_rMapArr.push_back(_MapTblFrmFmt(pLine->GetFrmFmt(), pLineFmt));
+        pLineFormat = pCT->m_pDoc->MakeTableLineFormat();
+        pLineFormat->CopyAttrs( *pLine->GetFrameFormat() );
+        pCT->m_rMapArr.push_back(_MapTableFrameFormat(pLine->GetFrameFormat(), pLineFormat));
     }
 
-    SwTableLine* pNewLine = new SwTableLine(pLineFmt, pLine->GetTabBoxes().size(), pCT->m_pInsBox);
+    SwTableLine* pNewLine = new SwTableLine(pLineFormat, pLine->GetTabBoxes().size(), pCT->m_pInsBox);
     // Insert the new row into the table
     if (pCT->m_pInsBox)
     {
@@ -224,13 +224,13 @@ static void lcl_CopyTblLine( const SwTableLine* pLine, _CopyTable* pCT )
     }
     else
     {
-        pCT->m_pTblNd->GetTable().GetTabLines().push_back(pNewLine);
+        pCT->m_pTableNd->GetTable().GetTabLines().push_back(pNewLine);
     }
 
     pCT->m_pInsLine = pNewLine;
     for( SwTableBoxes::iterator it = const_cast<SwTableLine*>(pLine)->GetTabBoxes().begin();
              it != const_cast<SwTableLine*>(pLine)->GetTabBoxes().end(); ++it)
-        lcl_CopyTblBox(*it, pCT );
+        lcl_CopyTableBox(*it, pCT );
 }
 
 SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
@@ -244,47 +244,47 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
             return 0;
     }
 
-    // Copy the TableFrmFmt
-    OUString sTblName( GetTable().GetFrmFmt()->GetName() );
+    // Copy the TableFrameFormat
+    OUString sTableName( GetTable().GetFrameFormat()->GetName() );
     if( !pDoc->IsCopyIsMove() )
     {
-        const SwFrmFmts& rTblFmts = *pDoc->GetTblFrmFmts();
-        for( size_t n = rTblFmts.size(); n; )
-            if( rTblFmts[ --n ]->GetName() == sTblName )
+        const SwFrameFormats& rTableFormats = *pDoc->GetTableFrameFormats();
+        for( size_t n = rTableFormats.size(); n; )
+            if( rTableFormats[ --n ]->GetName() == sTableName )
             {
-                sTblName = pDoc->GetUniqueTblName();
+                sTableName = pDoc->GetUniqueTableName();
                 break;
             }
     }
 
-    SwFrmFmt* pTblFmt = pDoc->MakeTblFrmFmt( sTblName, pDoc->GetDfltFrmFmt() );
-    pTblFmt->CopyAttrs( *GetTable().GetFrmFmt() );
-    SwTableNode* pTblNd = new SwTableNode( rIdx );
-    SwEndNode* pEndNd = new SwEndNode( rIdx, *pTblNd );
+    SwFrameFormat* pTableFormat = pDoc->MakeTableFrameFormat( sTableName, pDoc->GetDfltFrameFormat() );
+    pTableFormat->CopyAttrs( *GetTable().GetFrameFormat() );
+    SwTableNode* pTableNd = new SwTableNode( rIdx );
+    SwEndNode* pEndNd = new SwEndNode( rIdx, *pTableNd );
     SwNodeIndex aInsPos( *pEndNd );
 
-    SwTable& rTbl = (SwTable&)pTblNd->GetTable();
-    rTbl.RegisterToFormat( *pTblFmt );
+    SwTable& rTable = (SwTable&)pTableNd->GetTable();
+    rTable.RegisterToFormat( *pTableFormat );
 
-    rTbl.SetRowsToRepeat( GetTable().GetRowsToRepeat() );
-    rTbl.SetTblChgMode( GetTable().GetTblChgMode() );
-    rTbl.SetTableModel( GetTable().IsNewModel() );
+    rTable.SetRowsToRepeat( GetTable().GetRowsToRepeat() );
+    rTable.SetTableChgMode( GetTable().GetTableChgMode() );
+    rTable.SetTableModel( GetTable().IsNewModel() );
 
     SwDDEFieldType* pDDEType = 0;
     if( IS_TYPE( SwDDETable, &GetTable() ))
     {
         // We're copying a DDE table
         // Is the field type available in the new document?
-        pDDEType = const_cast<SwDDETable&>(static_cast<const SwDDETable&>(GetTable())).GetDDEFldType();
+        pDDEType = const_cast<SwDDETable&>(static_cast<const SwDDETable&>(GetTable())).GetDDEFieldType();
         if( pDDEType->IsDeleted() )
-            pDoc->getIDocumentFieldsAccess().InsDeletedFldType( *pDDEType );
+            pDoc->getIDocumentFieldsAccess().InsDeletedFieldType( *pDDEType );
         else
-            pDDEType = static_cast<SwDDEFieldType*>(pDoc->getIDocumentFieldsAccess().InsertFldType( *pDDEType ));
+            pDDEType = static_cast<SwDDEFieldType*>(pDoc->getIDocumentFieldsAccess().InsertFieldType( *pDDEType ));
         OSL_ENSURE( pDDEType, "unknown FieldType" );
 
         // Swap the table pointers in the node
-        SwDDETable* pNewTable = new SwDDETable( pTblNd->GetTable(), pDDEType );
-        pTblNd->SetNewTable( pNewTable, false );
+        SwDDETable* pNewTable = new SwDDETable( pTableNd->GetTable(), pDDEType );
+        pTableNd->SetNewTable( pNewTable, false );
     }
     // First copy the content of the tables, we will later assign the
     // boxes/lines and create the frames
@@ -295,36 +295,36 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
     // (see IsUsed). Therefore the inner table gets the same name as the outer table.
     // We have to make sure that the table node of the SwTable is accessible, even
     // without any content in m_TabSortContentBoxes. #i26629#
-    pTblNd->GetTable().SetTableNode( pTblNd );
+    pTableNd->GetTable().SetTableNode( pTableNd );
     rNds._Copy( aRg, aInsPos, false );
-    pTblNd->GetTable().SetTableNode( 0 );
+    pTableNd->GetTable().SetTableNode( 0 );
 
     // Special case for a single box
     if( 1 == GetTable().GetTabSortBoxes().size() )
     {
-        aRg.aStart.Assign( *pTblNd, 1 );
-        aRg.aEnd.Assign( *pTblNd->EndOfSectionNode() );
+        aRg.aStart.Assign( *pTableNd, 1 );
+        aRg.aEnd.Assign( *pTableNd->EndOfSectionNode() );
         pDoc->GetNodes().SectionDown( &aRg, SwTableBoxStartNode );
     }
 
     // Delete all frames from the copied area, they will be created
     // during the generation of the table frame
-    pTblNd->DelFrms();
+    pTableNd->DelFrms();
 
-    _MapTblFrmFmts aMapArr;
-    _CopyTable aPara( pDoc, aMapArr, GetIndex(), *pTblNd, &GetTable() );
+    _MapTableFrameFormats aMapArr;
+    _CopyTable aPara( pDoc, aMapArr, GetIndex(), *pTableNd, &GetTable() );
 
     for( const SwTableLine* pLine : GetTable().GetTabLines() )
-        lcl_CopyTblLine( pLine, &aPara );
+        lcl_CopyTableLine( pLine, &aPara );
 
     if( pDDEType )
         pDDEType->IncRefCnt();
 
     CHECK_TABLE( GetTable() );
-    return pTblNd;
+    return pTableNd;
 }
 
-void SwTxtNode::CopyCollFmt( SwTxtNode& rDestNd )
+void SwTextNode::CopyCollFormat( SwTextNode& rDestNd )
 {
     // Copy the formats into the other document:
     // Special case for PageBreak/PageDesc/ColBrk
@@ -343,7 +343,7 @@ void SwTxtNode::CopyCollFmt( SwTxtNode& rDestNd )
             aPgBrkSet.Put( *pAttr );
     }
 
-    rDestNd.ChgFmtColl( pDestDoc->CopyTxtColl( *GetTxtColl() ));
+    rDestNd.ChgFormatColl( pDestDoc->CopyTextColl( *GetTextColl() ));
     if( 0 != ( pSet = GetpSwAttrSet() ) )
         pSet->CopyToModify( rDestNd );
 
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index 4c6f414c45fe..4c891ce2bfaf 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -36,11 +36,11 @@
 
 #include <frmfmt.hxx>
 
-SwNoTxtNode::SwNoTxtNode( const SwNodeIndex & rWhere,
+SwNoTextNode::SwNoTextNode( const SwNodeIndex & rWhere,
                   const sal_uInt8 nNdType,
-                  SwGrfFmtColl *pGrfColl,
+                  SwGrfFormatColl *pGrfColl,
                   SwAttrSet* pAutoAttr ) :
-    SwCntntNode( rWhere, nNdType, pGrfColl ),
+    SwContentNode( rWhere, nNdType, pGrfColl ),
     pContour( 0 ),
     bAutomaticContour( false ),
     bContourMapModeValid( true ),
@@ -51,42 +51,42 @@ SwNoTxtNode::SwNoTxtNode( const SwNodeIndex & rWhere,
         SetAttr( *pAutoAttr );
 }
 
-SwNoTxtNode::~SwNoTxtNode()
+SwNoTextNode::~SwNoTextNode()
 {
     delete pContour;
 }
 
 /// Creates an AttrSet for all derivations with ranges for frame-
 /// and graphics-attributes.
-void SwNoTxtNode::NewAttrSet( SwAttrPool& rPool )
+void SwNoTextNode::NewAttrSet( SwAttrPool& rPool )
 {
     OSL_ENSURE( !mpAttrSet.get(), "AttrSet is already set" );
-    SwAttrSet aNewAttrSet( rPool, aNoTxtNodeSetRange );
+    SwAttrSet aNewAttrSet( rPool, aNoTextNodeSetRange );
 
     // put names of parent style and conditional style:
-    const SwFmtColl* pFmtColl = GetFmtColl();
+    const SwFormatColl* pFormatColl = GetFormatColl();
     OUString sVal;
-    SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
-    SfxStringItem aFmtColl( RES_FRMATR_STYLE_NAME, sVal );
-    aNewAttrSet.Put( aFmtColl );
+    SwStyleNameMapper::FillProgName( pFormatColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+    SfxStringItem aFormatColl( RES_FRMATR_STYLE_NAME, sVal );
+    aNewAttrSet.Put( aFormatColl );
 
-    aNewAttrSet.SetParent( &GetFmtColl()->GetAttrSet() );
+    aNewAttrSet.SetParent( &GetFormatColl()->GetAttrSet() );
     mpAttrSet = GetDoc()->GetIStyleAccess().getAutomaticStyle( aNewAttrSet, IStyleAccess::AUTO_STYLE_NOTXT );
 }
 
 /// Dummies for loading/saving of persistent data
 /// when working with graphics and OLE objects
-bool SwNoTxtNode::RestorePersistentData()
+bool SwNoTextNode::RestorePersistentData()
 {
     return true;
 }
 
-bool SwNoTxtNode::SavePersistentData()
+bool SwNoTextNode::SavePersistentData()
 {
     return true;
 }
 
-void SwNoTxtNode::SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic )
+void SwNoTextNode::SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic )
 {
     delete pContour;
     if ( pPoly )
@@ -98,7 +98,7 @@ void SwNoTxtNode::SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic )
     bPixelContour = false;
 }
 
-void SwNoTxtNode::CreateContour()
+void SwNoTextNode::CreateContour()
 {
     OSL_ENSURE( !pContour, "Contour available." );
     pContour = new tools::PolyPolygon(SvxContourDlg::CreateAutoContour(GetGraphic()));
@@ -107,7 +107,7 @@ void SwNoTxtNode::CreateContour()
     bPixelContour = false;
 }
 
-const tools::PolyPolygon *SwNoTxtNode::HasContour() const
+const tools::PolyPolygon *SwNoTextNode::HasContour() const
 {
     if( !bContourMapModeValid )
     {
@@ -172,20 +172,20 @@ const tools::PolyPolygon *SwNoTxtNode::HasContour() const
                 }
             }
         }
-        const_cast<SwNoTxtNode *>(this)->bContourMapModeValid = true;
-        const_cast<SwNoTxtNode *>(this)->bPixelContour = false;
+        const_cast<SwNoTextNode *>(this)->bContourMapModeValid = true;
+        const_cast<SwNoTextNode *>(this)->bPixelContour = false;
     }
 
     return pContour;
 }
 
-void SwNoTxtNode::GetContour( tools::PolyPolygon &rPoly ) const
+void SwNoTextNode::GetContour( tools::PolyPolygon &rPoly ) const
 {
     OSL_ENSURE( pContour, "Contour not available." );
     rPoly = *HasContour();
 }
 
-void SwNoTxtNode::SetContourAPI( const tools::PolyPolygon *pPoly )
+void SwNoTextNode::SetContourAPI( const tools::PolyPolygon *pPoly )
 {
     delete pContour;
     if ( pPoly )
@@ -195,7 +195,7 @@ void SwNoTxtNode::SetContourAPI( const tools::PolyPolygon *pPoly )
     bContourMapModeValid = false;
 }
 
-bool SwNoTxtNode::GetContourAPI( tools::PolyPolygon &rContour ) const
+bool SwNoTextNode::GetContourAPI( tools::PolyPolygon &rContour ) const
 {
     if( !pContour )
         return false;
@@ -231,7 +231,7 @@ bool SwNoTxtNode::GetContourAPI( tools::PolyPolygon &rContour ) const
     return true;
 }
 
-bool SwNoTxtNode::IsPixelContour() const
+bool SwNoTextNode::IsPixelContour() const
 {
     bool bRet;
     if( bContourMapModeValid )
@@ -247,7 +247,7 @@ bool SwNoTxtNode::IsPixelContour() const
     return bRet;
 }
 
-Graphic SwNoTxtNode::GetGraphic() const
+Graphic SwNoTextNode::GetGraphic() const
 {
     Graphic aRet;
     if ( GetGrfNode() )
@@ -263,53 +263,53 @@ Graphic SwNoTxtNode::GetGraphic() const
 }
 
 // #i73249#
-void SwNoTxtNode::SetTitle( const OUString& rTitle, bool bBroadcast )
+void SwNoTextNode::SetTitle( const OUString& rTitle, bool bBroadcast )
 {
     // Title attribute of <SdrObject> replaces own AlternateText attribute
-    SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(GetFlyFmt());
-    OSL_ENSURE( pFlyFmt, "<SwNoTxtNode::SetTitle(..)> - missing <SwFlyFrmFmt> instance" );
-    if ( !pFlyFmt )
+    SwFlyFrameFormat* pFlyFormat = dynamic_cast<SwFlyFrameFormat*>(GetFlyFormat());
+    OSL_ENSURE( pFlyFormat, "<SwNoTextNode::SetTitle(..)> - missing <SwFlyFrameFormat> instance" );
+    if ( !pFlyFormat )
     {
         return;
     }
 
-    pFlyFmt->SetObjTitle( rTitle, bBroadcast );
+    pFlyFormat->SetObjTitle( rTitle, bBroadcast );
 }
 
-OUString SwNoTxtNode::GetTitle() const
+OUString SwNoTextNode::GetTitle() const
 {
-    const SwFlyFrmFmt* pFlyFmt = dynamic_cast<const SwFlyFrmFmt*>(GetFlyFmt());
-    OSL_ENSURE( pFlyFmt, "<SwNoTxtNode::GetTitle(..)> - missing <SwFlyFrmFmt> instance" );
-    if ( !pFlyFmt )
+    const SwFlyFrameFormat* pFlyFormat = dynamic_cast<const SwFlyFrameFormat*>(GetFlyFormat());
+    OSL_ENSURE( pFlyFormat, "<SwNoTextNode::GetTitle(..)> - missing <SwFlyFrameFormat> instance" );
+    if ( !pFlyFormat )
     {
         return OUString();
     }
 
-    return pFlyFmt->GetObjTitle();
+    return pFlyFormat->GetObjTitle();
 }
 
-void SwNoTxtNode::SetDescription( const OUString& rDescription, bool bBroadcast )
+void SwNoTextNode::SetDescription( const OUString& rDescription, bool bBroadcast )
 {
-    SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(GetFlyFmt());
-    OSL_ENSURE( pFlyFmt, "<SwNoTxtNode::SetDescription(..)> - missing <SwFlyFrmFmt> instance" );
-    if ( !pFlyFmt )
+    SwFlyFrameFormat* pFlyFormat = dynamic_cast<SwFlyFrameFormat*>(GetFlyFormat());
+    OSL_ENSURE( pFlyFormat, "<SwNoTextNode::SetDescription(..)> - missing <SwFlyFrameFormat> instance" );
+    if ( !pFlyFormat )
     {
         return;
     }
 
-    pFlyFmt->SetObjDescription( rDescription, bBroadcast );
+    pFlyFormat->SetObjDescription( rDescription, bBroadcast );
 }
 
-OUString SwNoTxtNode::GetDescription() const
+OUString SwNoTextNode::GetDescription() const
 {
-    const SwFlyFrmFmt* pFlyFmt = dynamic_cast<const SwFlyFrmFmt*>(GetFlyFmt());
-    OSL_ENSURE( pFlyFmt, "<SwNoTxtNode::GetDescription(..)> - missing <SwFlyFrmFmt> instance" );
-    if ( !pFlyFmt )
+    const SwFlyFrameFormat* pFlyFormat = dynamic_cast<const SwFlyFrameFormat*>(GetFlyFormat());
+    OSL_ENSURE( pFlyFormat, "<SwNoTextNode::GetDescription(..)> - missing <SwFlyFrameFormat> instance" );
+    if ( !pFlyFormat )
     {
         return OUString();
     }
 
-    return pFlyFmt->GetObjDescription();
+    return pFlyFormat->GetObjDescription();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index 8c8a542d804f..b462f5c81d8a 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -39,20 +39,20 @@ bool SwOutlineNodes::Seek_Entry(SwNode* rP, sal_uInt16* pnPos) const
 
 void SwNodes::UpdateOutlineNode(SwNode & rNd)
 {
-    SwTxtNode * pTxtNd = rNd.GetTxtNode();
+    SwTextNode * pTextNd = rNd.GetTextNode();
 
-    if (pTxtNd && pTxtNd->IsOutlineStateChanged())
+    if (pTextNd && pTextNd->IsOutlineStateChanged())
     {
-        bool bFound = pOutlineNds->find(pTxtNd) != pOutlineNds->end();
+        bool bFound = pOutlineNds->find(pTextNd) != pOutlineNds->end();
 
-        if (pTxtNd->IsOutline())
+        if (pTextNd->IsOutline())
         {
             if (! bFound)
             {
                 // assure that text is in the correct nodes array
-                if ( &(pTxtNd->GetNodes()) == this )
+                if ( &(pTextNd->GetNodes()) == this )
                 {
-                    pOutlineNds->insert(pTxtNd);
+                    pOutlineNds->insert(pTextNd);
                 }
                 else
                 {
@@ -63,17 +63,17 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
         else
         {
             if (bFound)
-                pOutlineNds->erase(pTxtNd);
+                pOutlineNds->erase(pTextNd);
         }
 
-        pTxtNd->UpdateOutlineState();
+        pTextNd->UpdateOutlineState();
 
         // update the structure fields
-        GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_CHAPTERFLD )->UpdateFlds();
+        GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_CHAPTERFLD )->UpdateFields();
     }
 }
 
-void SwNodes::UpdtOutlineIdx( const SwNode& rNd )
+void SwNodes::UpdateOutlineIdx( const SwNode& rNd )
 {
     if( pOutlineNds->empty() )     // no OutlineNodes present ?
         return;
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 71b418df1e48..e100b39b965c 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -60,15 +60,15 @@
 #include <ndsect.hxx>
 #include <tools/datetimeutils.hxx>
 
-// #i21457# - new implementation of local method <lcl_IsInSameTblBox(..)>.
+// #i21457# - new implementation of local method <lcl_IsInSameTableBox(..)>.
 // Method now determines the previous/next on its own. Thus, it can be controlled,
 // for which previous/next is checked, if it's visible.
-static bool lcl_IsInSameTblBox( SwNodes& _rNds,
+static bool lcl_IsInSameTableBox( SwNodes& _rNds,
                          const SwNode& _rNd,
                          const bool _bPrev )
 {
-    const SwTableNode* pTblNd = _rNd.FindTableNode();
-    if ( !pTblNd )
+    const SwTableNode* pTableNd = _rNd.FindTableNode();
+    if ( !pTableNd )
     {
         return true;
     }
@@ -87,13 +87,13 @@ static bool lcl_IsInSameTblBox( SwNodes& _rNds,
                  ? !SwNodes::GoPrevSection( &aChkIdx, false, false )
                  : !_rNds.GoNextSection( &aChkIdx, false, false ) )
             {
-                OSL_FAIL( "<lcl_IsInSameTblBox(..)> - no previous/next!" );
+                OSL_FAIL( "<lcl_IsInSameTableBox(..)> - no previous/next!" );
                 return false;
             }
             else
             {
-                if ( aChkIdx < pTblNd->GetIndex() ||
-                     aChkIdx > pTblNd->EndOfSectionNode()->GetIndex() )
+                if ( aChkIdx < pTableNd->GetIndex() ||
+                     aChkIdx > pTableNd->EndOfSectionNode()->GetIndex() )
                 {
                     return false;
                 }
@@ -103,7 +103,7 @@ static bool lcl_IsInSameTblBox( SwNodes& _rNds,
                     // is also inside the table.
                     SwSectionNode* pSectNd = aChkIdx.GetNode().FindSectionNode();
                     if ( !pSectNd ||
-                         pSectNd->GetIndex() < pTblNd->GetIndex() ||
+                         pSectNd->GetIndex() < pTableNd->GetIndex() ||
                          !pSectNd->GetSection().IsHiddenFlag() )
                     {
                         bFound = true;
@@ -114,7 +114,7 @@ static bool lcl_IsInSameTblBox( SwNodes& _rNds,
     }
 
     // Find the Box's StartNode
-    const SwTableSortBoxes& rSortBoxes = pTblNd->GetTable().GetTabSortBoxes();
+    const SwTableSortBoxes& rSortBoxes = pTableNd->GetTable().GetTabSortBoxes();
     sal_uLong nIdx = _rNd.GetIndex();
     for (size_t n = 0; n < rSortBoxes.size(); ++n)
     {
@@ -137,13 +137,13 @@ static void lcl_CheckEmptyLayFrm( SwNodes& rNds, SwSectionData& rSectionData,
     if( !SwNodes::GoPrevSection( &aIdx, true, false ) ||
         !CheckNodesRange( rStt, aIdx, true ) ||
         // #i21457#
-        !lcl_IsInSameTblBox( rNds, rStt, true ))
+        !lcl_IsInSameTableBox( rNds, rStt, true ))
     {
         aIdx = rEnd;
         if( !rNds.GoNextSection( &aIdx, true, false ) ||
             !CheckNodesRange( rEnd, aIdx, true ) ||
             // #i21457#
-            !lcl_IsInSameTblBox( rNds, rEnd, false ))
+            !lcl_IsInSameTableBox( rNds, rEnd, false ))
         {
             rSectionData.SetHidden( false );
         }
@@ -171,7 +171,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
     {
         const SwPosition *pStt = rRange.Start(), *pEnd = rRange.End();
         if( !pStt->nContent.GetIndex() &&
-            pEnd->nNode.GetNode().GetCntntNode()->Len() ==
+            pEnd->nNode.GetNode().GetContentNode()->Len() ==
             pEnd->nContent.GetIndex() )
         {
             ::lcl_CheckEmptyLayFrm( GetNodes(),
@@ -190,10 +190,10 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
         GetIDocumentUndoRedo().DoUndo(false);
     }
 
-    SwSectionFmt* const pFmt = MakeSectionFmt( 0 );
+    SwSectionFormat* const pFormat = MakeSectionFormat( 0 );
     if ( pAttr )
     {
-        pFmt->SetFmtAttr( *pAttr );
+        pFormat->SetFormatAttr( *pAttr );
     }
 
     SwSectionNode* pNewSectNode = 0;
@@ -216,7 +216,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
 
             --aEnd; // End is inclusive in the InsertSection
             pNewSectNode = GetNodes().InsertTextSection(
-                        aStt, *pFmt, rNewData, pTOXBase, & aEnd);
+                        aStt, *pFormat, rNewData, pTOXBase, & aEnd);
         }
         else
         {
@@ -225,8 +225,8 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
                 if( !( pPrvNd && 1 == nRegionRet ) &&
                     pSttPos->nContent.GetIndex() )
                 {
-                    SwTxtNode* const pTNd =
-                        pSttPos->nNode.GetNode().GetTxtNode();
+                    SwTextNode* const pTNd =
+                        pSttPos->nNode.GetNode().GetTextNode();
                     if (pTNd)
                     {
                         pUndoInsSect->SaveSplitNode( pTNd, true );
@@ -235,9 +235,9 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
 
                 if ( !( pPrvNd && 2 == nRegionRet ) )
                 {
-                    SwTxtNode *const pTNd =
-                        pEndPos->nNode.GetNode().GetTxtNode();
-                    if (pTNd && (pTNd->GetTxt().getLength()
+                    SwTextNode *const pTNd =
+                        pEndPos->nNode.GetNode().GetTextNode();
+                    if (pTNd && (pTNd->GetText().getLength()
                                     != pEndPos->nContent.GetIndex()))
                     {
                         pUndoInsSect->SaveSplitNode( pTNd, false );
@@ -248,7 +248,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
             if( pPrvNd && 1 == nRegionRet )
             {
                 pSttPos->nNode.Assign( *pPrvNd );
-                pSttPos->nContent.Assign( pSttPos->nNode.GetNode().GetCntntNode(), 0 );
+                pSttPos->nContent.Assign( pSttPos->nNode.GetNode().GetContentNode(), 0 );
             }
             else if( pSttPos->nContent.GetIndex() )
             {
@@ -258,61 +258,61 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
             if( pPrvNd && 2 == nRegionRet )
             {
                 pEndPos->nNode.Assign( *pPrvNd );
-                pEndPos->nContent.Assign( pEndPos->nNode.GetNode().GetCntntNode(), 0 );
+                pEndPos->nContent.Assign( pEndPos->nNode.GetNode().GetContentNode(), 0 );
             }
             else
             {
-                const SwCntntNode* pCNd = pEndPos->nNode.GetNode().GetCntntNode();
+                const SwContentNode* pCNd = pEndPos->nNode.GetNode().GetContentNode();
                 if( pCNd && pCNd->Len() != pEndPos->nContent.GetIndex() )
                 {
-                    sal_Int32 nCntnt = pSttPos->nContent.GetIndex();
+                    sal_Int32 nContent = pSttPos->nContent.GetIndex();
                     getIDocumentContentOperations().SplitNode( *pEndPos, false );
 
-                    SwTxtNode* pTNd;
+                    SwTextNode* pTNd;
                     if( pEndPos->nNode.GetIndex() == pSttPos->nNode.GetIndex() )
                     {
                         --pSttPos->nNode;
                         --pEndPos->nNode;
-                        pTNd = pSttPos->nNode.GetNode().GetTxtNode();
-                        pSttPos->nContent.Assign( pTNd, nCntnt );
+                        pTNd = pSttPos->nNode.GetNode().GetTextNode();
+                        pSttPos->nContent.Assign( pTNd, nContent );
                     }
                     else
                     {
                         // Set to the end of the previous
                         --pEndPos->nNode;
-                        pTNd = pEndPos->nNode.GetNode().GetTxtNode();
+                        pTNd = pEndPos->nNode.GetNode().GetTextNode();
                     }
-                    nCntnt = (pTNd) ? pTNd->GetTxt().getLength() : 0;
-                    pEndPos->nContent.Assign( pTNd, nCntnt );
+                    nContent = (pTNd) ? pTNd->GetText().getLength() : 0;
+                    pEndPos->nContent.Assign( pTNd, nContent );
                 }
             }
             pNewSectNode = GetNodes().InsertTextSection(
-                pSttPos->nNode, *pFmt, rNewData, pTOXBase, &pEndPos->nNode);
+                pSttPos->nNode, *pFormat, rNewData, pTOXBase, &pEndPos->nNode);
         }
     }
     else
     {
         const SwPosition* pPos = rRange.GetPoint();
-        const SwCntntNode* pCNd = pPos->nNode.GetNode().GetCntntNode();
+        const SwContentNode* pCNd = pPos->nNode.GetNode().GetContentNode();
         if( !pPos->nContent.GetIndex() )
         {
             pNewSectNode = GetNodes().InsertTextSection(
-                pPos->nNode, *pFmt, rNewData, pTOXBase, 0, true);
+                pPos->nNode, *pFormat, rNewData, pTOXBase, 0, true);
         }
         else if( pPos->nContent.GetIndex() == pCNd->Len() )
         {
             pNewSectNode = GetNodes().InsertTextSection(
-                pPos->nNode, *pFmt, rNewData, pTOXBase, 0, false);
+                pPos->nNode, *pFormat, rNewData, pTOXBase, 0, false);
         }
         else
         {
-            if( pUndoInsSect && pCNd->IsTxtNode() )
+            if( pUndoInsSect && pCNd->IsTextNode() )
             {
-                pUndoInsSect->SaveSplitNode( const_cast<SwTxtNode*>(static_cast<const SwTxtNode*>(pCNd)), true );
+                pUndoInsSect->SaveSplitNode( const_cast<SwTextNode*>(static_cast<const SwTextNode*>(pCNd)), true );
             }
             getIDocumentContentOperations().SplitNode( *pPos, false );
             pNewSectNode = GetNodes().InsertTextSection(
-                pPos->nNode, *pFmt, rNewData, pTOXBase, 0, true);
+                pPos->nNode, *pFormat, rNewData, pTOXBase, 0, true);
         }
     }
 
@@ -322,8 +322,8 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
 
     getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
 
-    // To-Do - add 'SwExtraRedlineTbl' also ?
-    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+    // To-Do - add 'SwExtraRedlineTable' also ?
+    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
         SwPaM aPam( *pNewSectNode->EndOfSectionNode(), *pNewSectNode, 1 );
         if( getIDocumentRedlineAccess().IsRedlineOn() )
@@ -343,31 +343,31 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
         SwCalc aCalc( *this );
         if( ! IsInReading() )
         {
-            getIDocumentFieldsAccess().FldsToCalc( aCalc, pNewSectNode->GetIndex(), USHRT_MAX );
+            getIDocumentFieldsAccess().FieldsToCalc( aCalc, pNewSectNode->GetIndex(), USHRT_MAX );
         }
         SwSection& rNewSect = pNewSectNode->GetSection();
         rNewSect.SetCondHidden( aCalc.Calculate( rNewSect.GetCondition() ).GetBool() );
     }
 
-    bool bUpdateFtn = false;
-    if( GetFtnIdxs().size() && pAttr )
+    bool bUpdateFootnote = false;
+    if( GetFootnoteIdxs().size() && pAttr )
     {
-        sal_uInt16 nVal = static_cast<const SwFmtFtnAtTxtEnd&>(pAttr->Get(
+        sal_uInt16 nVal = static_cast<const SwFormatFootnoteAtTextEnd&>(pAttr->Get(
                                             RES_FTN_AT_TXTEND )).GetValue();
            if( ( FTNEND_ATTXTEND_OWNNUMSEQ == nVal ||
               FTNEND_ATTXTEND_OWNNUMANDFMT == nVal ) ||
-            ( FTNEND_ATTXTEND_OWNNUMSEQ == ( nVal = static_cast<const SwFmtEndAtTxtEnd&>(
+            ( FTNEND_ATTXTEND_OWNNUMSEQ == ( nVal = static_cast<const SwFormatEndAtTextEnd&>(
                             pAttr->Get( RES_END_AT_TXTEND )).GetValue() ) ||
               FTNEND_ATTXTEND_OWNNUMANDFMT == nVal ))
         {
-            bUpdateFtn = true;
+            bUpdateFootnote = true;
         }
     }
 
     if( pUndoInsSect )
     {
         pUndoInsSect->SetSectNdPos( pNewSectNode->GetIndex() );
-        pUndoInsSect->SetUpdtFtnFlag( bUpdateFtn );
+        pUndoInsSect->SetUpdateFootnoteFlag( bUpdateFootnote );
         GetIDocumentUndoRedo().DoUndo(bUndo);
     }
 
@@ -376,9 +376,9 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
         pNewSectNode->GetSection().CreateLink( bUpdate ? CREATE_UPDATE : CREATE_CONNECT );
     }
 
-    if( bUpdateFtn )
+    if( bUpdateFootnote )
     {
-        GetFtnIdxs().UpdateFtn( SwNodeIndex( *pNewSectNode ));
+        GetFootnoteIdxs().UpdateFootnote( SwNodeIndex( *pNewSectNode ));
     }
 
     getIDocumentState().SetModified();
@@ -395,7 +395,7 @@ sal_uInt16 SwDoc::IsInsRegionAvailable( const SwPaM& rRange,
         const SwPosition* pStt = rRange.Start();
         const SwPosition* pEnd = rRange.End();
 
-        const SwCntntNode* pCNd = pEnd->nNode.GetNode().GetCntntNode();
+        const SwContentNode* pCNd = pEnd->nNode.GetNode().GetContentNode();
         const SwNode* pNd = &pStt->nNode.GetNode();
         const SwSectionNode* pSectNd = pNd->FindSectionNode();
         const SwSectionNode* pEndSectNd = pCNd ? pCNd->FindSectionNode() : 0;
@@ -506,29 +506,29 @@ SwSection* SwDoc::GetCurrSection( const SwPosition& rPos )
     return 0;
 }
 
-SwSectionFmt* SwDoc::MakeSectionFmt( SwSectionFmt *pDerivedFrom )
+SwSectionFormat* SwDoc::MakeSectionFormat( SwSectionFormat *pDerivedFrom )
 {
-    SwSectionFmt* pNew = new SwSectionFmt(
-        pDerivedFrom == 0 ? mpDfltFrmFmt : pDerivedFrom, this );
-    mpSectionFmtTbl->push_back( pNew );
+    SwSectionFormat* pNew = new SwSectionFormat(
+        pDerivedFrom == 0 ? mpDfltFrameFormat : pDerivedFrom, this );
+    mpSectionFormatTable->push_back( pNew );
     return pNew;
 }
 
-void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
+void SwDoc::DelSectionFormat( SwSectionFormat *pFormat, bool bDelNodes )
 {
-    SwSectionFmts::iterator itFmtPos = std::find( mpSectionFmtTbl->begin(), mpSectionFmtTbl->end(), pFmt );
+    SwSectionFormats::iterator itFormatPos = std::find( mpSectionFormatTable->begin(), mpSectionFormatTable->end(), pFormat );
 
     GetIDocumentUndoRedo().StartUndo(UNDO_DELSECTION, NULL);
 
-    if( mpSectionFmtTbl->end() != itFmtPos )
+    if( mpSectionFormatTable->end() != itFormatPos )
     {
-        const SwNodeIndex* pIdx = pFmt->GetCntnt( false ).GetCntntIdx();
-        const SfxPoolItem* pFtnEndAtTxtEnd;
-        if( SfxItemState::SET != pFmt->GetItemState(
-                            RES_FTN_AT_TXTEND, true, &pFtnEndAtTxtEnd ) ||
-            SfxItemState::SET != pFmt->GetItemState(
-                            RES_END_AT_TXTEND, true, &pFtnEndAtTxtEnd ))
-            pFtnEndAtTxtEnd = 0;
+        const SwNodeIndex* pIdx = pFormat->GetContent( false ).GetContentIdx();
+        const SfxPoolItem* pFootnoteEndAtTextEnd;
+        if( SfxItemState::SET != pFormat->GetItemState(
+                            RES_FTN_AT_TXTEND, true, &pFootnoteEndAtTextEnd ) ||
+            SfxItemState::SET != pFormat->GetItemState(
+                            RES_END_AT_TXTEND, true, &pFootnoteEndAtTextEnd ))
+            pFootnoteEndAtTextEnd = 0;
 
         const SwSectionNode* pSectNd;
 
@@ -540,22 +540,22 @@ void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
                 SwNodeIndex aUpdIdx( *pIdx );
                 SwPaM aPaM( *pSectNd->EndOfSectionNode(), *pSectNd );
                 GetIDocumentUndoRedo().AppendUndo( new SwUndoDelete( aPaM ));
-                if( pFtnEndAtTxtEnd )
-                    GetFtnIdxs().UpdateFtn( aUpdIdx );
+                if( pFootnoteEndAtTextEnd )
+                    GetFootnoteIdxs().UpdateFootnote( aUpdIdx );
                 getIDocumentState().SetModified();
                 //#126178# start/end undo have to be pairs!
                 GetIDocumentUndoRedo().EndUndo(UNDO_DELSECTION, NULL);
                 return ;
             }
-            GetIDocumentUndoRedo().AppendUndo( MakeUndoDelSection( *pFmt ) );
+            GetIDocumentUndoRedo().AppendUndo( MakeUndoDelSection( *pFormat ) );
         }
         else if( bDelNodes && pIdx && &GetNodes() == &pIdx->GetNodes() &&
                 0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
         {
             SwNodeIndex aUpdIdx( *pIdx );
             getIDocumentContentOperations().DeleteSection( (SwNode*)pSectNd );
-            if( pFtnEndAtTxtEnd )
-                GetFtnIdxs().UpdateFtn( aUpdIdx );
+            if( pFootnoteEndAtTextEnd )
+                GetFootnoteIdxs().UpdateFootnote( aUpdIdx );
             getIDocumentState().SetModified();
             //#126178# start/end undo have to be pairs!
             GetIDocumentUndoRedo().EndUndo(UNDO_DELSECTION, NULL);
@@ -563,17 +563,17 @@ void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
         }
 
         {
-            SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFmt );
-            pFmt->ModifyNotification( &aMsgHint, &aMsgHint );
+            SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFormat );
+            pFormat->ModifyNotification( &aMsgHint, &aMsgHint );
         }
 
         // A ClearRedo could result in a recursive call of this function and delete some section
-        // formats, thus the position inside the SectionFmtTbl could have changed
-        itFmtPos = std::find( mpSectionFmtTbl->begin(), mpSectionFmtTbl->end(), pFmt );
+        // formats, thus the position inside the SectionFormatTable could have changed
+        itFormatPos = std::find( mpSectionFormatTable->begin(), mpSectionFormatTable->end(), pFormat );
 
         // WARNING: First remove from the array and then delete,
         //          as the Section DTOR tries to delete it's format itself.
-        mpSectionFmtTbl->erase( itFmtPos );
+        mpSectionFormatTable->erase( itFormatPos );
 //FEATURE::CONDCOLL
         sal_uLong nCnt = 0, nSttNd = 0;
         if( pIdx && &GetNodes() == &pIdx->GetNodes() &&
@@ -584,19 +584,19 @@ void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
         }
 //FEATURE::CONDCOLL
 
-        delete pFmt;
+        delete pFormat;
 
-        if( nSttNd && pFtnEndAtTxtEnd )
+        if( nSttNd && pFootnoteEndAtTextEnd )
         {
             SwNodeIndex aUpdIdx( GetNodes(), nSttNd );
-            GetFtnIdxs().UpdateFtn( aUpdIdx );
+            GetFootnoteIdxs().UpdateFootnote( aUpdIdx );
         }
 
 //FEATURE::CONDCOLL
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         for( ; nCnt--; ++nSttNd )
-            if( 0 != (pCNd = GetNodes()[ nSttNd ]->GetCntntNode() ) &&
-                RES_CONDTXTFMTCOLL == pCNd->GetFmtColl()->Which() )
+            if( 0 != (pCNd = GetNodes()[ nSttNd ]->GetContentNode() ) &&
+                RES_CONDTXTFMTCOLL == pCNd->GetFormatColl()->Which() )
                 pCNd->ChkCondColl();
 //FEATURE::CONDCOLL
     }
@@ -609,8 +609,8 @@ void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
 void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
         SfxItemSet const*const pAttr, bool const bPreventLinkUpdate )
 {
-    SwSectionFmt* pFmt = (*mpSectionFmtTbl)[ nPos ];
-    SwSection* pSection = pFmt->GetSection();
+    SwSectionFormat* pFormat = (*mpSectionFormatTable)[ nPos ];
+    SwSection* pSection = pFormat->GetSection();
 
     /// remember hidden condition flag of SwSection before changes
     bool bOldCondHidden = pSection->IsCondHidden();
@@ -625,7 +625,7 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
             sal_uInt16 nWhich = aIter.GetCurItem()->Which();
             while( true )
             {
-                if( pFmt->GetFmtAttr( nWhich ) != *aIter.GetCurItem() )
+                if( pFormat->GetFormatAttr( nWhich ) != *aIter.GetCurItem() )
                 {
                     bOnlyAttrChg = true;
                     break;
@@ -642,13 +642,13 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
             if (GetIDocumentUndoRedo().DoesUndo())
             {
                 GetIDocumentUndoRedo().AppendUndo(
-                    MakeUndoUpdateSection( *pFmt, true ) );
+                    MakeUndoUpdateSection( *pFormat, true ) );
             }
-            // #i32968# Inserting columns in the section causes MakeFrmFmt
-            // to put two  objects of type SwUndoFrmFmt on the undo stack.
+            // #i32968# Inserting columns in the section causes MakeFrameFormat
+            // to put two  objects of type SwUndoFrameFormat on the undo stack.
             // We don't want them.
             ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
-            pFmt->SetFmtAttr( *pAttr );
+            pFormat->SetFormatAttr( *pAttr );
             getIDocumentState().SetModified();
         }
         return;
@@ -660,7 +660,7 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
     {
         if (rNewData.IsHidden())
         {
-            pIdx = pFmt->GetCntnt().GetCntntIdx();
+            pIdx = pFormat->GetContent().GetContentIdx();
             if (pIdx)
             {
                 const SwSectionNode* pSectNd =
@@ -676,10 +676,10 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        GetIDocumentUndoRedo().AppendUndo(MakeUndoUpdateSection(*pFmt, false));
+        GetIDocumentUndoRedo().AppendUndo(MakeUndoUpdateSection(*pFormat, false));
     }
-    // #i32968# Inserting columns in the section causes MakeFrmFmt to put two
-    // objects of type SwUndoFrmFmt on the undo stack. We don't want them.
+    // #i32968# Inserting columns in the section causes MakeFrameFormat to put two
+    // objects of type SwUndoFrameFormat on the undo stack. We don't want them.
     ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
     // The LinkFileName could only consist of separators
@@ -705,7 +705,7 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
     pSection->SetSectionData(rNewData);
 
     if( pAttr )
-        pSection->GetFmt()->SetFmtAttr( *pAttr );
+        pSection->GetFormat()->SetFormatAttr( *pAttr );
 
     if( !sSectName.isEmpty() )
     {
@@ -718,12 +718,12 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
         // Then calculate up to that position
         SwCalc aCalc( *this );
         if( !pIdx )
-            pIdx = pFmt->GetCntnt().GetCntntIdx();
-        getIDocumentFieldsAccess().FldsToCalc( aCalc, pIdx->GetIndex(), USHRT_MAX );
+            pIdx = pFormat->GetContent().GetContentIdx();
+        getIDocumentFieldsAccess().FieldsToCalc( aCalc, pIdx->GetIndex(), USHRT_MAX );
 
         /// Because on using SwSection::operator=() to set up <pSection>
         /// with <rNewData> and the above given note, the hidden condition flag
-        /// has to be set to false, if hidden condition flag of <pFmt->GetSection()>
+        /// has to be set to false, if hidden condition flag of <pFormat->GetSection()>
         /// (SwSection before the changes) is false (already saved in <bOldCondHidden>)
         /// and new calculated condition is true.
         /// This is necessary, because otherwise the <SetCondHidden> would have
@@ -748,18 +748,18 @@ void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
     getIDocumentState().SetModified();
 }
 
-void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
+void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
 {
-    SwFtnIdxs& rFtnArr = pNd->GetDoc()->GetFtnIdxs();
-    if( rFtnArr.size() )
+    SwFootnoteIdxs& rFootnoteArr = pNd->GetDoc()->GetFootnoteIdxs();
+    if( rFootnoteArr.size() )
     {
         size_t nPos = 0;
-        rFtnArr.SeekEntry( SwNodeIndex( *pNd ), &nPos );
-        SwTxtFtn* pSrch;
+        rFootnoteArr.SeekEntry( SwNodeIndex( *pNd ), &nPos );
+        SwTextFootnote* pSrch;
 
         // Delete all succeeding Footnotes
-        while( nPos < rFtnArr.size() &&
-            _SwTxtFtn_GetIndex( (pSrch = rFtnArr[ nPos ]) ) <= nEnd )
+        while( nPos < rFootnoteArr.size() &&
+            _SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) <= nEnd )
         {
             // If the Nodes are not deleted, they need to deregister at the Pages
             // (delete Frms) or else they will remain there (Undo does not delete them!)
@@ -768,7 +768,7 @@ void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
         }
 
         while( nPos-- &&
-            _SwTxtFtn_GetIndex( (pSrch = rFtnArr[ nPos ]) ) >= nStt )
+            _SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) >= nStt )
         {
             // If the Nodes are not deleted, they need to deregister at the Pages
             // (delete Frms) or else they will remain there (Undo does not delete them!)
@@ -784,7 +784,7 @@ static inline bool lcl_IsTOXSection(SwSectionData const& rSectionData)
 }
 
 SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
-                                SwSectionFmt& rSectionFmt,
+                                SwSectionFormat& rSectionFormat,
                                 SwSectionData const& rSectionData,
                                 SwTOXBase const*const pTOXBase,
                                 SwNodeIndex const*const pEnde,
@@ -824,7 +824,7 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
     }
 
     SwSectionNode *const pSectNd =
-            new SwSectionNode(aInsPos, rSectionFmt, pTOXBase);
+            new SwSectionNode(aInsPos, rSectionFormat, pTOXBase);
     if( pEnde )
     {
         // Special case for the Reader/Writer
@@ -857,10 +857,10 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
     }
     else
     {
-        SwTxtNode* pCpyTNd = rNdIdx.GetNode().GetTxtNode();
+        SwTextNode* pCpyTNd = rNdIdx.GetNode().GetTextNode();
         if( pCpyTNd )
         {
-            SwTxtNode* pTNd = new SwTxtNode( aInsPos, pCpyTNd->GetTxtColl() );
+            SwTextNode* pTNd = new SwTextNode( aInsPos, pCpyTNd->GetTextColl() );
             if( pCpyTNd->HasSwAttrSet() )
             {
                 // Move PageDesc/Break to the first Node of the section
@@ -885,12 +885,12 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
             pCpyTNd->MakeFrms( *pTNd );
         }
         else
-            new SwTxtNode( aInsPos, GetDoc()->GetDfltTxtFmtColl() );
+            new SwTextNode( aInsPos, GetDoc()->GetDfltTextFormatColl() );
     }
     new SwEndNode( aInsPos, *pSectNd );
 
     pSectNd->GetSection().SetSectionData(rSectionData);
-    SwSectionFmt* pSectFmt = pSectNd->GetSection().GetFmt();
+    SwSectionFormat* pSectFormat = pSectNd->GetSection().GetFormat();
 
     // We could optimize this, by not removing already contained Frames and recreating them,
     // but by simply rewiring them
@@ -924,8 +924,8 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
             // Make up the Format's nesting
             if( pNd->IsSectionNode() )
             {
-                static_cast<SwSectionNode*>(pNd)->GetSection().GetFmt()->
-                                    SetDerivedFrom( pSectFmt );
+                static_cast<SwSectionNode*>(pNd)->GetSection().GetFormat()->
+                                    SetDerivedFrom( pSectFormat );
                 static_cast<SwSectionNode*>(pNd)->DelFrms();
                 n = pNd->EndOfSectionIndex();
             }
@@ -938,11 +938,11 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
                     nSkipIdx = pNd->EndOfSectionIndex();
             }
         }
-        else if( pNd->IsCntntNode() )
-            static_cast<SwCntntNode*>(pNd)->DelFrms();
+        else if( pNd->IsContentNode() )
+            static_cast<SwContentNode*>(pNd)->DelFrms();
     }
 
-    sw_DeleteFtn( pSectNd, nStart, nEnde );
+    sw_DeleteFootnote( pSectNd, nStart, nEnde );
 
     if( bInsFrm )
     {
@@ -972,32 +972,32 @@ SwSectionNode* SwNode::FindSectionNode()
 // SwSectionNode
 
 // ugly hack to make m_pSection const
-static SwSectionFmt &
-lcl_initParent(SwSectionNode & rThis, SwSectionFmt & rFmt)
+static SwSectionFormat &
+lcl_initParent(SwSectionNode & rThis, SwSectionFormat & rFormat)
 {
     SwSectionNode *const pParent =
         rThis.StartOfSectionNode()->FindSectionNode();
     if( pParent )
     {
         // Register the Format at the right Parent
-        rFmt.SetDerivedFrom( pParent->GetSection().GetFmt() );
+        rFormat.SetDerivedFrom( pParent->GetSection().GetFormat() );
     }
-    return rFmt;
+    return rFormat;
 }
 
 SwSectionNode::SwSectionNode(SwNodeIndex const& rIdx,
-        SwSectionFmt & rFmt, SwTOXBase const*const pTOXBase)
+        SwSectionFormat & rFormat, SwTOXBase const*const pTOXBase)
     : SwStartNode( rIdx, ND_SECTIONNODE )
     , m_pSection( (pTOXBase)
-        ? new SwTOXBaseSection(*pTOXBase, lcl_initParent(*this, rFmt))
-        : new SwSection( CONTENT_SECTION, rFmt.GetName(),
-                lcl_initParent(*this, rFmt) ) )
+        ? new SwTOXBaseSection(*pTOXBase, lcl_initParent(*this, rFormat))
+        : new SwSection( CONTENT_SECTION, rFormat.GetName(),
+                lcl_initParent(*this, rFormat) ) )
 {
     // Set the connection from Format to Node
     // Suppress Modify; no one's interessted anyway
-    rFmt.LockModify();
-    rFmt.SetFmtAttr( SwFmtCntnt( this ) );
-    rFmt.UnlockModify();
+    rFormat.LockModify();
+    rFormat.SetFormatAttr( SwFormatContent( this ) );
+    rFormat.UnlockModify();
 }
 
 #ifdef DBG_UTIL
@@ -1034,15 +1034,15 @@ SwSectionNode::~SwSectionNode()
 {
     // mba: test if iteration works as clients will be removed in callback
     // use hint which allows to specify, if the content shall be saved or not
-    m_pSection->GetFmt()->CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( true ) );
-    SwSectionFmt* pFmt = m_pSection->GetFmt();
-    if( pFmt )
+    m_pSection->GetFormat()->CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( true ) );
+    SwSectionFormat* pFormat = m_pSection->GetFormat();
+    if( pFormat )
     {
         // Remove the Attributei, because the Section deletes it's Format
-        // and it will neutralize the Section, if the Cntnt Attribute is set
-        pFmt->LockModify();
-        pFmt->ResetFmtAttr( RES_CNTNT );
-        pFmt->UnlockModify();
+        // and it will neutralize the Section, if the Content Attribute is set
+        pFormat->LockModify();
+        pFormat->ResetFormatAttr( RES_CNTNT );
+        pFormat->UnlockModify();
     }
 }
 
@@ -1060,10 +1060,10 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
     SwNodes& rNds = GetNodes();
     if( rNds.IsDocNodes() && rNds.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
     {
-        if( GetSection().IsHidden() || IsCntntHidden() )
+        if( GetSection().IsHidden() || IsContentHidden() )
         {
             SwNodeIndex aIdx( *EndOfSectionNode() );
-            SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
+            SwContentNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
             if( !pCNd )
             {
                 aIdx = *this;
@@ -1071,8 +1071,8 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
                 if (!pCNd)
                     return;
             }
-            pCNd = aIdx.GetNode().GetCntntNode();
-            pCNd->MakeFrms( static_cast<SwCntntNode&>(rIdx.GetNode()) );
+            pCNd = aIdx.GetNode().GetContentNode();
+            pCNd->MakeFrms( static_cast<SwContentNode&>(rIdx.GetNode()) );
         }
         else
         {
@@ -1081,7 +1081,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
             while( 0 != (pFrm = aNode2Layout.NextFrm()) )
             {
                 OSL_ENSURE( pFrm->IsSctFrm(), "Depend of Section not a Section." );
-                SwFrm *pNew = rIdx.GetNode().GetCntntNode()->MakeFrm( pFrm );
+                SwFrm *pNew = rIdx.GetNode().GetContentNode()->MakeFrm( pFrm );
 
                 SwSectionNode* pS = rIdx.GetNode().FindSectionNode();
 
@@ -1118,15 +1118,15 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
                     // CONTENT_FLOWS_FROM/_TO relation.
                     // Relation CONTENT_FLOWS_FROM for next paragraph will change
                     // and relation CONTENT_FLOWS_TO for previous paragraph will change.
-                    if ( pNew->IsTxtFrm() )
+                    if ( pNew->IsTextFrm() )
                     {
                         SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
                         if ( pViewShell && pViewShell->GetLayout() &&
                              pViewShell->GetLayout()->IsAnyShellAccessible() )
                         {
                             pViewShell->InvalidateAccessibleParaFlowRelation(
-                                dynamic_cast<SwTxtFrm*>(pNew->FindNextCnt( true )),
-                                dynamic_cast<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
+                                dynamic_cast<SwTextFrm*>(pNew->FindNextCnt( true )),
+                                dynamic_cast<SwTextFrm*>(pNew->FindPrevCnt( true )) );
                         }
                     }
                     pNew = pSct;
@@ -1144,15 +1144,15 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
                 // CONTENT_FLOWS_FROM/_TO relation.
                 // Relation CONTENT_FLOWS_FROM for next paragraph will change
                 // and relation CONTENT_FLOWS_TO for previous paragraph will change.
-                if ( pNew->IsTxtFrm() )
+                if ( pNew->IsTextFrm() )
                 {
                     SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
                     if ( pViewShell && pViewShell->GetLayout() &&
                          pViewShell->GetLayout()->IsAnyShellAccessible() )
                     {
                         pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pNew->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pNew->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pNew->FindPrevCnt( true )) );
                     }
                 }
                 if ( bInitNewSect )
@@ -1163,7 +1163,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
 }
 
 // Create a new SectionFrm for every occurrence in the Layout and insert before
-// the corresponding CntntFrm
+// the corresponding ContentFrm
 void SwSectionNode::MakeFrms( SwNodeIndex* pIdxBehind, SwNodeIndex* pEndIdx )
 {
     OSL_ENSURE( pIdxBehind, "no Index" );
@@ -1193,26 +1193,26 @@ void SwSectionNode::DelFrms()
     }
 
     SwNodes& rNds = GetNodes();
-    m_pSection->GetFmt()->DelFrms();
+    m_pSection->GetFormat()->DelFrms();
 
     // Update our Flag
     m_pSection->m_Data.SetHiddenFlag(true);
 
     // If the Area is within a Fly or TableBox, we can only hide it if
     // there is more Content which has Frames.
-    // Or else the Fly/TblBox Frame does not have a Lower!
+    // Or else the Fly/TableBox Frame does not have a Lower!
     {
         SwNodeIndex aIdx( *this );
         if( !SwNodes::GoPrevSection( &aIdx, true, false ) ||
             !CheckNodesRange( *this, aIdx, true ) ||
             // #i21457#
-            !lcl_IsInSameTblBox( rNds, *this, true ))
+            !lcl_IsInSameTableBox( rNds, *this, true ))
         {
             aIdx = *EndOfSectionNode();
             if( !rNds.GoNextSection( &aIdx, true, false ) ||
                 !CheckNodesRange( *EndOfSectionNode(), aIdx, true ) ||
                 // #i21457#
-                !lcl_IsInSameTblBox( rNds, *EndOfSectionNode(), false ))
+                !lcl_IsInSameTableBox( rNds, *EndOfSectionNode(), false ))
             {
                 m_pSection->m_Data.SetHiddenFlag(false);
             }
@@ -1225,9 +1225,9 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
     // In which array am I: Nodes, UndoNodes?
     const SwNodes& rNds = GetNodes();
 
-    // Copy the SectionFrmFmt
-    SwSectionFmt* pSectFmt = pDoc->MakeSectionFmt( 0 );
-    pSectFmt->CopyAttrs( *GetSection().GetFmt() );
+    // Copy the SectionFrameFormat
+    SwSectionFormat* pSectFormat = pDoc->MakeSectionFormat( 0 );
+    pSectFormat->CopyAttrs( *GetSection().GetFormat() );
 
     boost::scoped_ptr<SwTOXBase> pTOXBase;
     if (TOX_CONTENT_SECTION == GetSection().GetType())
@@ -1239,7 +1239,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
     }
 
     SwSectionNode *const pSectNd =
-        new SwSectionNode(rIdx, *pSectFmt, pTOXBase.get());
+        new SwSectionNode(rIdx, *pSectFormat, pTOXBase.get());
     SwEndNode* pEndNd = new SwEndNode( rIdx, *pSectNd );
     SwNodeIndex aInsPos( *pEndNd );
 
@@ -1291,12 +1291,12 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
     }
 
     // METADATA: copy xml:id; must be done after insertion of node
-    pSectFmt->RegisterAsCopyOf(*GetSection().GetFmt());
+    pSectFormat->RegisterAsCopyOf(*GetSection().GetFormat());
 
     return pSectNd;
 }
 
-bool SwSectionNode::IsCntntHidden() const
+bool SwSectionNode::IsContentHidden() const
 {
     OSL_ENSURE( !m_pSection->IsHidden(),
             "That's simple: Hidden Section => Hidden Content" );
@@ -1313,7 +1313,7 @@ bool SwSectionNode::IsCntntHidden() const
         }
         else
         {
-            if( aTmp.GetNode().IsCntntNode() || aTmp.GetNode().IsTableNode() )
+            if( aTmp.GetNode().IsContentNode() || aTmp.GetNode().IsTableNode() )
                 return false; // We found non-hidden content
             OSL_ENSURE( aTmp.GetNode().IsEndNode(), "EndNode expected" );
         }
@@ -1324,26 +1324,26 @@ bool SwSectionNode::IsCntntHidden() const
 
 void SwSectionNode::NodesArrChgd()
 {
-    SwSectionFmt *const pFmt = m_pSection->GetFmt();
-    if( pFmt )
+    SwSectionFormat *const pFormat = m_pSection->GetFormat();
+    if( pFormat )
     {
         SwNodes& rNds = GetNodes();
-        SwDoc* pDoc = pFmt->GetDoc();
+        SwDoc* pDoc = pFormat->GetDoc();
 
         if( !rNds.IsDocNodes() )
         {
-            SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFmt );
-            pFmt->ModifyNotification( &aMsgHint, &aMsgHint );
+            SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFormat );
+            pFormat->ModifyNotification( &aMsgHint, &aMsgHint );
         }
 
-        pFmt->LockModify();
-        pFmt->SetFmtAttr( SwFmtCntnt( this ));
-        pFmt->UnlockModify();
+        pFormat->LockModify();
+        pFormat->SetFormatAttr( SwFormatContent( this ));
+        pFormat->UnlockModify();
 
         SwSectionNode* pSectNd = StartOfSectionNode()->FindSectionNode();
         // set the correct parent from the new section
-        pFmt->SetDerivedFrom( pSectNd ? pSectNd->GetSection().GetFmt()
-                                      : pDoc->GetDfltFrmFmt() );
+        pFormat->SetDerivedFrom( pSectNd ? pSectNd->GetSection().GetFormat()
+                                      : pDoc->GetDfltFrameFormat() );
 
         // Set the right StartNode for all in this Area
         sal_uLong nStart = GetIndex()+1, nEnde = EndOfSectionIndex();
@@ -1351,7 +1351,7 @@ void SwSectionNode::NodesArrChgd()
             // Make up the Format's nesting
             if( 0 != ( pSectNd = rNds[ n ]->GetSectionNode() ) )
             {
-                pSectNd->GetSection().GetFmt()->SetDerivedFrom( pFmt );
+                pSectNd->GetSection().GetFormat()->SetDerivedFrom( pFormat );
                 n = pSectNd->EndOfSectionIndex();
             }
 
@@ -1385,7 +1385,7 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
     {
         OUString newName = "MailMergeSection"
             + OStringToOUString( DateTimeToOString( DateTime( DateTime::SYSTEM )), RTL_TEXTENCODING_ASCII_US )
-            + OUString::number( mpSectionFmtTbl->size() + 1 );
+            + OUString::number( mpSectionFormatTable->size() + 1 );
         if( pChkStr )
             newName += *pChkStr;
         return newName;
@@ -1393,14 +1393,14 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
 
     const OUString aName( ResId( STR_REGION_DEFNAME, *pSwResMgr ) );
 
-    SwSectionFmts::size_type nNum = 0;
-    const SwSectionFmts::size_type nFlagSize = ( mpSectionFmtTbl->size() / 8 ) + 2;
+    SwSectionFormats::size_type nNum = 0;
+    const SwSectionFormats::size_type nFlagSize = ( mpSectionFormatTable->size() / 8 ) + 2;
     sal_uInt8* pSetFlags = new sal_uInt8[ nFlagSize ];
     memset( pSetFlags, 0, nFlagSize );
 
-    for( auto pFmt : *mpSectionFmtTbl )
+    for( auto pFormat : *mpSectionFormatTable )
     {
-        const SwSectionNode *const pSectNd = pFmt->GetSectionNode( false );
+        const SwSectionNode *const pSectNd = pFormat->GetSectionNode( false );
         if( pSectNd != nullptr )
         {
             const OUString rNm = pSectNd->GetSection().GetSectionName();
@@ -1408,7 +1408,7 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
             {
                 // Calculate the Number and reset the Flag
                 nNum = rNm.copy( aName.getLength() ).toInt32();
-                if( nNum-- && nNum < mpSectionFmtTbl->size() )
+                if( nNum-- && nNum < mpSectionFormatTable->size() )
                     pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
             }
             if( pChkStr && *pChkStr==rNm )
@@ -1419,8 +1419,8 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
     if( !pChkStr )
     {
         // Flagged all Numbers accordingly, so get the right Number
-        nNum = mpSectionFmtTbl->size();
-        for( SwSectionFmts::size_type n = 0; n < nFlagSize; ++n )
+        nNum = mpSectionFormatTable->size();
+        for( SwSectionFormats::size_type n = 0; n < nFlagSize; ++n )
         {
             auto nTmp = pSetFlags[ n ];
             if( nTmp != 0xFF )
diff --git a/sw/source/core/docnode/ndsect.hxx b/sw/source/core/docnode/ndsect.hxx
index 9ca5f60ddf78..19c3eadbfe2c 100644
--- a/sw/source/core/docnode/ndsect.hxx
+++ b/sw/source/core/docnode/ndsect.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX
 #define INCLUDED_SW_SOURCE_CORE_DOCNODE_NDSECT_HXX
 
-void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
+void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
 
 
 #endif
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index c9ebc129ace7..7a77906d430d 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -106,7 +106,7 @@ using namespace ::com::sun::star;
 
 const sal_Unicode T2T_PARA = 0x0a;
 
-static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
+static void lcl_SetDfltBoxAttr( SwFrameFormat& rFormat, sal_uInt8 nId )
 {
     bool bTop = false, bBottom = false, bLeft = false, bRight = false;
     switch ( nId )
@@ -117,7 +117,7 @@ static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
     case 3: bBottom = bLeft = bRight = true;        break;
     }
 
-    const bool bHTML = rFmt.getIDocumentSettingAccess()->get(DocumentSettingId::HTML_MODE);
+    const bool bHTML = rFormat.getIDocumentSettingAccess()->get(DocumentSettingId::HTML_MODE);
     Color aCol( bHTML ? COL_GRAY : COL_BLACK );
     SvxBorderLine aLine( &aCol, DEF_LINE_WIDTH_0 );
     if ( bHTML )
@@ -134,83 +134,83 @@ static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
         aBox.SetLine( &aLine, SvxBoxItemLine::LEFT );
     if ( bRight )
         aBox.SetLine( &aLine, SvxBoxItemLine::RIGHT );
-    rFmt.SetFmtAttr( aBox );
+    rFormat.SetFormatAttr( aBox );
 }
 
-typedef std::map<SwFrmFmt *, SwTableBoxFmt *> DfltBoxAttrMap_t;
+typedef std::map<SwFrameFormat *, SwTableBoxFormat *> DfltBoxAttrMap_t;
 typedef std::vector<DfltBoxAttrMap_t *> DfltBoxAttrList_t;
 
 static void
-lcl_SetDfltBoxAttr(SwTableBox& rBox, DfltBoxAttrList_t & rBoxFmtArr,
-        sal_uInt8 const nId, SwTableAutoFmt const*const pAutoFmt = 0)
+lcl_SetDfltBoxAttr(SwTableBox& rBox, DfltBoxAttrList_t & rBoxFormatArr,
+        sal_uInt8 const nId, SwTableAutoFormat const*const pAutoFormat = 0)
 {
-    DfltBoxAttrMap_t * pMap = rBoxFmtArr[ nId ];
+    DfltBoxAttrMap_t * pMap = rBoxFormatArr[ nId ];
     if (!pMap)
     {
         pMap = new DfltBoxAttrMap_t;
-        rBoxFmtArr[ nId ] = pMap;
+        rBoxFormatArr[ nId ] = pMap;
     }
 
-    SwTableBoxFmt* pNewTableBoxFmt = 0;
-    SwFrmFmt* pBoxFrmFmt = rBox.GetFrmFmt();
-    DfltBoxAttrMap_t::iterator const iter(pMap->find(pBoxFrmFmt));
+    SwTableBoxFormat* pNewTableBoxFormat = 0;
+    SwFrameFormat* pBoxFrameFormat = rBox.GetFrameFormat();
+    DfltBoxAttrMap_t::iterator const iter(pMap->find(pBoxFrameFormat));
     if (pMap->end() != iter)
     {
-        pNewTableBoxFmt = iter->second;
+        pNewTableBoxFormat = iter->second;
     }
     else
     {
-        SwDoc* pDoc = pBoxFrmFmt->GetDoc();
+        SwDoc* pDoc = pBoxFrameFormat->GetDoc();
         // format does not exist, so create it
-        pNewTableBoxFmt = pDoc->MakeTableBoxFmt();
-        pNewTableBoxFmt->SetFmtAttr( pBoxFrmFmt->GetAttrSet().Get( RES_FRM_SIZE ) );
+        pNewTableBoxFormat = pDoc->MakeTableBoxFormat();
+        pNewTableBoxFormat->SetFormatAttr( pBoxFrameFormat->GetAttrSet().Get( RES_FRM_SIZE ) );
 
-        if( pAutoFmt )
-            pAutoFmt->UpdateToSet( nId, (SfxItemSet&)pNewTableBoxFmt->GetAttrSet(),
-                                    SwTableAutoFmt::UPDATE_BOX,
+        if( pAutoFormat )
+            pAutoFormat->UpdateToSet( nId, (SfxItemSet&)pNewTableBoxFormat->GetAttrSet(),
+                                    SwTableAutoFormat::UPDATE_BOX,
                                     pDoc->GetNumberFormatter( true ) );
         else
-            ::lcl_SetDfltBoxAttr( *pNewTableBoxFmt, nId );
+            ::lcl_SetDfltBoxAttr( *pNewTableBoxFormat, nId );
 
-        (*pMap)[pBoxFrmFmt] = pNewTableBoxFmt;
+        (*pMap)[pBoxFrameFormat] = pNewTableBoxFormat;
     }
-    rBox.ChgFrmFmt( pNewTableBoxFmt );
+    rBox.ChgFrameFormat( pNewTableBoxFormat );
 }
 
-static SwTableBoxFmt *lcl_CreateDfltBoxFmt( SwDoc &rDoc, std::vector<SwTableBoxFmt*> &rBoxFmtArr,
+static SwTableBoxFormat *lcl_CreateDfltBoxFormat( SwDoc &rDoc, std::vector<SwTableBoxFormat*> &rBoxFormatArr,
                                     sal_uInt16 nCols, sal_uInt8 nId )
 {
-    if ( !rBoxFmtArr[nId] )
+    if ( !rBoxFormatArr[nId] )
     {
-        SwTableBoxFmt* pBoxFmt = rDoc.MakeTableBoxFmt();
+        SwTableBoxFormat* pBoxFormat = rDoc.MakeTableBoxFormat();
         if( USHRT_MAX != nCols )
-            pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
+            pBoxFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE,
                                             USHRT_MAX / nCols, 0 ));
-        ::lcl_SetDfltBoxAttr( *pBoxFmt, nId );
-        rBoxFmtArr[ nId ] = pBoxFmt;
+        ::lcl_SetDfltBoxAttr( *pBoxFormat, nId );
+        rBoxFormatArr[ nId ] = pBoxFormat;
     }
-    return rBoxFmtArr[nId];
+    return rBoxFormatArr[nId];
 }
 
-static SwTableBoxFmt *lcl_CreateAFmtBoxFmt( SwDoc &rDoc, std::vector<SwTableBoxFmt*> &rBoxFmtArr,
-                                    const SwTableAutoFmt& rAutoFmt,
+static SwTableBoxFormat *lcl_CreateAFormatBoxFormat( SwDoc &rDoc, std::vector<SwTableBoxFormat*> &rBoxFormatArr,
+                                    const SwTableAutoFormat& rAutoFormat,
                                     sal_uInt16 nCols, sal_uInt8 nId )
 {
-    if( !rBoxFmtArr[nId] )
+    if( !rBoxFormatArr[nId] )
     {
-        SwTableBoxFmt* pBoxFmt = rDoc.MakeTableBoxFmt();
-        rAutoFmt.UpdateToSet( nId, (SfxItemSet&)pBoxFmt->GetAttrSet(),
-                                SwTableAutoFmt::UPDATE_BOX,
+        SwTableBoxFormat* pBoxFormat = rDoc.MakeTableBoxFormat();
+        rAutoFormat.UpdateToSet( nId, (SfxItemSet&)pBoxFormat->GetAttrSet(),
+                                SwTableAutoFormat::UPDATE_BOX,
                                 rDoc.GetNumberFormatter( true ) );
         if( USHRT_MAX != nCols )
-            pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
+            pBoxFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE,
                                             USHRT_MAX / nCols, 0 ));
-        rBoxFmtArr[ nId ] = pBoxFmt;
+        rBoxFormatArr[ nId ] = pBoxFormat;
     }
-    return rBoxFmtArr[nId];
+    return rBoxFormatArr[nId];
 }
 
-SwTableNode* SwDoc::IsIdxInTbl(const SwNodeIndex& rIdx)
+SwTableNode* SwDoc::IsIdxInTable(const SwNodeIndex& rIdx)
 {
     SwTableNode* pTableNd = 0;
     sal_uLong nIndex = rIdx.GetIndex();
@@ -227,10 +227,10 @@ SwTableNode* SwDoc::IsIdxInTbl(const SwNodeIndex& rIdx)
 /**
  * Insert a new Box before the InsPos
  */
-bool SwNodes::InsBoxen( SwTableNode* pTblNd,
+bool SwNodes::InsBoxen( SwTableNode* pTableNd,
                         SwTableLine* pLine,
-                        SwTableBoxFmt* pBoxFmt,
-                        SwTxtFmtColl* pTxtColl,
+                        SwTableBoxFormat* pBoxFormat,
+                        SwTextFormatColl* pTextColl,
                         const SfxItemSet* pAutoAttr,
                         sal_uInt16 nInsPos,
                         sal_uInt16 nCnt )
@@ -246,30 +246,30 @@ bool SwNodes::InsBoxen( SwTableNode* pTblNd,
     {
         if( nInsPos < pLine->GetTabBoxes().size() )
         {
-            if( 0 == (pPrvBox = pLine->FindPreviousBox( pTblNd->GetTable(),
+            if( 0 == (pPrvBox = pLine->FindPreviousBox( pTableNd->GetTable(),
                             pLine->GetTabBoxes()[ nInsPos ] )))
-                pPrvBox = pLine->FindPreviousBox( pTblNd->GetTable() );
+                pPrvBox = pLine->FindPreviousBox( pTableNd->GetTable() );
         }
         else
         {
-            if( 0 == (pNxtBox = pLine->FindNextBox( pTblNd->GetTable(),
+            if( 0 == (pNxtBox = pLine->FindNextBox( pTableNd->GetTable(),
                             pLine->GetTabBoxes().back() )))
-                pNxtBox = pLine->FindNextBox( pTblNd->GetTable() );
+                pNxtBox = pLine->FindNextBox( pTableNd->GetTable() );
         }
     }
-    else if( 0 == ( pNxtBox = pLine->FindNextBox( pTblNd->GetTable() )))
-        pPrvBox = pLine->FindPreviousBox( pTblNd->GetTable() );
+    else if( 0 == ( pNxtBox = pLine->FindNextBox( pTableNd->GetTable() )))
+        pPrvBox = pLine->FindPreviousBox( pTableNd->GetTable() );
 
     if( !pPrvBox && !pNxtBox )
     {
         bool bSetIdxPos = true;
-        if( pTblNd->GetTable().GetTabLines().size() && !nInsPos )
+        if( pTableNd->GetTable().GetTabLines().size() && !nInsPos )
         {
-            const SwTableLine* pTblLn = pLine;
-            while( pTblLn->GetUpper() )
-                pTblLn = pTblLn->GetUpper()->GetUpper();
+            const SwTableLine* pTableLn = pLine;
+            while( pTableLn->GetUpper() )
+                pTableLn = pTableLn->GetUpper()->GetUpper();
 
-            if( pTblNd->GetTable().GetTabLines()[ 0 ] == pTblLn )
+            if( pTableNd->GetTable().GetTabLines()[ 0 ] == pTableLn )
             {
                 // Before the Table's first Box
                 while( ( pNxtBox = pLine->GetTabBoxes()[0])->GetTabLines().size() )
@@ -280,7 +280,7 @@ bool SwNodes::InsBoxen( SwTableNode* pTblNd,
         }
         if( bSetIdxPos )
             // Tables without content or at the end; move before the End
-            nIdxPos = pTblNd->EndOfSectionIndex();
+            nIdxPos = pTableNd->EndOfSectionIndex();
     }
     else if( pNxtBox ) // There is a successor
         nIdxPos = pNxtBox->GetSttIdx();
@@ -292,10 +292,10 @@ bool SwNodes::InsBoxen( SwTableNode* pTblNd,
     {
         SwStartNode* pSttNd = new SwStartNode( aEndIdx, ND_STARTNODE,
                                                 SwTableBoxStartNode );
-        pSttNd->pStartOfSection = pTblNd;
+        pSttNd->pStartOfSection = pTableNd;
         new SwEndNode( aEndIdx, *pSttNd );
 
-        pPrvBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
+        pPrvBox = new SwTableBox( pBoxFormat, *pSttNd, pLine );
 
         SwTableBoxes & rTabBoxes = pLine->GetTabBoxes();
         sal_uInt16 nRealInsPos = nInsPos + n;
@@ -304,21 +304,21 @@ bool SwNodes::InsBoxen( SwTableNode* pTblNd,
 
         rTabBoxes.insert( rTabBoxes.begin() + nRealInsPos, pPrvBox );
 
-        if( ! pTxtColl->IsAssignedToListLevelOfOutlineStyle()
+        if( ! pTextColl->IsAssignedToListLevelOfOutlineStyle()
 //FEATURE::CONDCOLL
-            && RES_CONDTXTFMTCOLL != pTxtColl->Which()
+            && RES_CONDTXTFMTCOLL != pTextColl->Which()
 //FEATURE::CONDCOLL
         )
-            new SwTxtNode( SwNodeIndex( *pSttNd->EndOfSectionNode() ),
-                                pTxtColl, pAutoAttr );
+            new SwTextNode( SwNodeIndex( *pSttNd->EndOfSectionNode() ),
+                                pTextColl, pAutoAttr );
         else
         {
             // Handle Outline numbering correctly!
-            SwTxtNode* pTNd = new SwTxtNode(
+            SwTextNode* pTNd = new SwTextNode(
                             SwNodeIndex( *pSttNd->EndOfSectionNode() ),
-                            GetDoc()->GetDfltTxtFmtColl(),
+                            GetDoc()->GetDfltTextFormatColl(),
                             pAutoAttr );
-            pTNd->ChgFmtColl( pTxtColl );
+            pTNd->ChgFormatColl( pTextColl );
         }
     }
     return true;
@@ -327,10 +327,10 @@ bool SwNodes::InsBoxen( SwTableNode* pTblNd,
 /**
  * Insert a new Table
  */
-const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
+const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTableOpts,
                                    const SwPosition& rPos, sal_uInt16 nRows,
                                    sal_uInt16 nCols, sal_Int16 eAdjust,
-                                   const SwTableAutoFmt* pTAFmt,
+                                   const SwTableAutoFormat* pTAFormat,
                                    const std::vector<sal_uInt16> *pColArr,
                                    bool bCalledFromShell,
                                    bool bNewModel )
@@ -350,68 +350,68 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
             pColArr = 0;
     }
 
-    OUString aTblName = GetUniqueTblName();
+    OUString aTableName = GetUniqueTableName();
 
     if( GetIDocumentUndoRedo().DoesUndo() )
     {
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoInsTbl( rPos, nCols, nRows, static_cast<sal_uInt16>(eAdjust),
-                                      rInsTblOpts, pTAFmt, pColArr,
-                                      aTblName));
+            new SwUndoInsTable( rPos, nCols, nRows, static_cast<sal_uInt16>(eAdjust),
+                                      rInsTableOpts, pTAFormat, pColArr,
+                                      aTableName));
     }
 
     // Start with inserting the Nodes and get the AutoFormat for the Table
-    SwTxtFmtColl *pBodyColl = getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TABLE ),
+    SwTextFormatColl *pBodyColl = getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TABLE ),
                  *pHeadColl = pBodyColl;
 
-    bool bDfltBorders = 0 != ( rInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER );
+    bool bDfltBorders = 0 != ( rInsTableOpts.mnInsMode & tabopts::DEFAULT_BORDER );
 
-    if( (rInsTblOpts.mnInsMode & tabopts::HEADLINE) && (1 != nRows || !bDfltBorders) )
-        pHeadColl = getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TABLE_HDLN );
+    if( (rInsTableOpts.mnInsMode & tabopts::HEADLINE) && (1 != nRows || !bDfltBorders) )
+        pHeadColl = getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TABLE_HDLN );
 
     const sal_uInt16 nRowsToRepeat =
-            tabopts::HEADLINE == (rInsTblOpts.mnInsMode & tabopts::HEADLINE) ?
-            rInsTblOpts.mnRowsToRepeat :
+            tabopts::HEADLINE == (rInsTableOpts.mnInsMode & tabopts::HEADLINE) ?
+            rInsTableOpts.mnRowsToRepeat :
             0;
 
     /* Save content node to extract FRAMEDIR from. */
-    const SwCntntNode * pCntntNd = rPos.nNode.GetNode().GetCntntNode();
+    const SwContentNode * pContentNd = rPos.nNode.GetNode().GetContentNode();
 
     /* If we are called from a shell pass the attrset from
-        pCntntNd (aka the node the table is inserted at) thus causing
+        pContentNd (aka the node the table is inserted at) thus causing
         SwNodes::InsertTable to propagate an adjust item if
         necessary. */
-    SwTableNode *pTblNd = SwNodes::InsertTable(
+    SwTableNode *pTableNd = SwNodes::InsertTable(
         rPos.nNode,
         nCols,
         pBodyColl,
         nRows,
         nRowsToRepeat,
         pHeadColl,
-        bCalledFromShell ? &pCntntNd->GetSwAttrSet() : 0 );
+        bCalledFromShell ? &pContentNd->GetSwAttrSet() : 0 );
 
     // Create the Box/Line/Table construct
-    SwTableLineFmt* pLineFmt = MakeTableLineFmt();
-    SwTableFmt* pTableFmt = MakeTblFrmFmt( aTblName, GetDfltFrmFmt() );
+    SwTableLineFormat* pLineFormat = MakeTableLineFormat();
+    SwTableFormat* pTableFormat = MakeTableFrameFormat( aTableName, GetDfltFrameFormat() );
 
     /* If the node to insert the table at is a context node and has a
        non-default FRAMEDIR propagate it to the table. */
-    if (pCntntNd)
+    if (pContentNd)
     {
-        const SwAttrSet & aNdSet = pCntntNd->GetSwAttrSet();
+        const SwAttrSet & aNdSet = pContentNd->GetSwAttrSet();
         const SfxPoolItem *pItem = NULL;
 
         if (SfxItemState::SET == aNdSet.GetItemState( RES_FRAMEDIR, true, &pItem )
             && pItem != NULL)
         {
-            pTableFmt->SetFmtAttr( *pItem );
+            pTableFormat->SetFormatAttr( *pItem );
         }
     }
 
-    // Set Orientation at the Table's Fmt
-    pTableFmt->SetFmtAttr( SwFmtHoriOrient( 0, eAdjust ) );
+    // Set Orientation at the Table's Format
+    pTableFormat->SetFormatAttr( SwFormatHoriOrient( 0, eAdjust ) );
     // All lines use the left-to-right Fill-Order!
-    pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ));
+    pLineFormat->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ));
 
     // Set USHRT_MAX as the Table's default SSize
     SwTwips nWidth = USHRT_MAX;
@@ -423,7 +423,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
         {
             sal_uInt16 nFrmWidth = nLastPos;
             nLastPos = (*pColArr)[ pColArr->size()-2 ];
-            pTableFmt->SetFmtAttr( SvxLRSpaceItem( nSttPos, nFrmWidth - nLastPos, 0, 0, RES_LR_SPACE ) );
+            pTableFormat->SetFormatAttr( SvxLRSpaceItem( nSttPos, nFrmWidth - nLastPos, 0, 0, RES_LR_SPACE ) );
         }
         nWidth = nLastPos - nSttPos;
     }
@@ -432,13 +432,13 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
         nWidth /= nCols;
         nWidth *= nCols; // to avoid rounding problems
     }
-    pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth ));
-    if( !(rInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
-        pTableFmt->SetFmtAttr( SwFmtLayoutSplit( false ));
+    pTableFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nWidth ));
+    if( !(rInsTableOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
+        pTableFormat->SetFormatAttr( SwFormatLayoutSplit( false ));
 
     // Move the hard PageDesc/PageBreak Attributes if needed
-    SwCntntNode* pNextNd = GetNodes()[ pTblNd->EndOfSectionIndex()+1 ]
-                            ->GetCntntNode();
+    SwContentNode* pNextNd = GetNodes()[ pTableNd->EndOfSectionIndex()+1 ]
+                            ->GetContentNode();
     if( pNextNd && pNextNd->HasSwAttrSet() )
     {
         const SfxItemSet* pNdSet = pNextNd->GetpSwAttrSet();
@@ -446,75 +446,75 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
         if( SfxItemState::SET == pNdSet->GetItemState( RES_PAGEDESC, false,
             &pItem ) )
         {
-            pTableFmt->SetFmtAttr( *pItem );
+            pTableFormat->SetFormatAttr( *pItem );
             pNextNd->ResetAttr( RES_PAGEDESC );
             pNdSet = pNextNd->GetpSwAttrSet();
         }
         if( pNdSet && SfxItemState::SET == pNdSet->GetItemState( RES_BREAK, false,
              &pItem ) )
         {
-            pTableFmt->SetFmtAttr( *pItem );
+            pTableFormat->SetFormatAttr( *pItem );
             pNextNd->ResetAttr( RES_BREAK );
         }
     }
 
-    SwTable& rNdTbl = pTblNd->GetTable();
-    rNdTbl.RegisterToFormat( *pTableFmt );
+    SwTable& rNdTable = pTableNd->GetTable();
+    rNdTable.RegisterToFormat( *pTableFormat );
 
-    rNdTbl.SetRowsToRepeat( nRowsToRepeat );
-    rNdTbl.SetTableModel( bNewModel );
+    rNdTable.SetRowsToRepeat( nRowsToRepeat );
+    rNdTable.SetTableModel( bNewModel );
 
-    std::vector<SwTableBoxFmt*> aBoxFmtArr;
-    SwTableBoxFmt* pBoxFmt = 0;
-    if( !bDfltBorders && !pTAFmt )
+    std::vector<SwTableBoxFormat*> aBoxFormatArr;
+    SwTableBoxFormat* pBoxFormat = 0;
+    if( !bDfltBorders && !pTAFormat )
     {
-        pBoxFmt = MakeTableBoxFmt();
-        pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX / nCols, 0 ));
+        pBoxFormat = MakeTableBoxFormat();
+        pBoxFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, USHRT_MAX / nCols, 0 ));
     }
     else
     {
-        const sal_uInt16 nBoxArrLen = pTAFmt ? 16 : 4;
-        aBoxFmtArr.resize( nBoxArrLen, NULL );
+        const sal_uInt16 nBoxArrLen = pTAFormat ? 16 : 4;
+        aBoxFormatArr.resize( nBoxArrLen, NULL );
     }
     SfxItemSet aCharSet( GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1 );
 
-    SwNodeIndex aNdIdx( *pTblNd, 1 ); // Set to StartNode of first Box
-    SwTableLines& rLines = rNdTbl.GetTabLines();
+    SwNodeIndex aNdIdx( *pTableNd, 1 ); // Set to StartNode of first Box
+    SwTableLines& rLines = rNdTable.GetTabLines();
     for( sal_uInt16 n = 0; n < nRows; ++n )
     {
-        SwTableLine* pLine = new SwTableLine( pLineFmt, nCols, 0 );
+        SwTableLine* pLine = new SwTableLine( pLineFormat, nCols, 0 );
         rLines.insert( rLines.begin() + n, pLine );
         SwTableBoxes& rBoxes = pLine->GetTabBoxes();
         for( sal_uInt16 i = 0; i < nCols; ++i )
         {
-            SwTableBoxFmt *pBoxF;
-            if( pTAFmt )
+            SwTableBoxFormat *pBoxF;
+            if( pTAFormat )
             {
                 sal_uInt8 nId = static_cast<sal_uInt8>(!n ? 0 : (( n+1 == nRows )
                                         ? 12 : (4 * (1 + ((n-1) & 1 )))));
                 nId = nId + static_cast<sal_uInt8>( !i ? 0 :
                             ( i+1 == nCols ? 3 : (1 + ((i-1) & 1))));
-                pBoxF = ::lcl_CreateAFmtBoxFmt( *this, aBoxFmtArr, *pTAFmt,
+                pBoxF = ::lcl_CreateAFormatBoxFormat( *this, aBoxFormatArr, *pTAFormat,
                                                 nCols, nId );
 
                 // Set the Paragraph/Character Attributes if needed
-                if( pTAFmt->IsFont() || pTAFmt->IsJustify() )
+                if( pTAFormat->IsFont() || pTAFormat->IsJustify() )
                 {
                     aCharSet.ClearItem();
-                    pTAFmt->UpdateToSet( nId, aCharSet,
-                                        SwTableAutoFmt::UPDATE_CHAR, 0 );
+                    pTAFormat->UpdateToSet( nId, aCharSet,
+                                        SwTableAutoFormat::UPDATE_CHAR, 0 );
                     if( aCharSet.Count() )
-                        GetNodes()[ aNdIdx.GetIndex()+1 ]->GetCntntNode()->
+                        GetNodes()[ aNdIdx.GetIndex()+1 ]->GetContentNode()->
                             SetAttr( aCharSet );
                 }
             }
             else if( bDfltBorders )
             {
                 sal_uInt8 nBoxId = (i < nCols - 1 ? 0 : 1) + (n ? 2 : 0 );
-                pBoxF = ::lcl_CreateDfltBoxFmt( *this, aBoxFmtArr, nCols, nBoxId);
+                pBoxF = ::lcl_CreateDfltBoxFormat( *this, aBoxFormatArr, nCols, nBoxId);
             }
             else
-                pBoxF = pBoxFmt;
+                pBoxF = pBoxFormat;
 
             // For AutoFormat on input: the columns are set when inserting the Table
             // The Array contains the columns positions and not their widths!
@@ -525,11 +525,11 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
                 {
                     if( pBoxF->HasWriterListeners() ) // Create new Format
                     {
-                        SwTableBoxFmt *pNewFmt = MakeTableBoxFmt();
-                        *pNewFmt = *pBoxF;
-                        pBoxF = pNewFmt;
+                        SwTableBoxFormat *pNewFormat = MakeTableBoxFormat();
+                        *pNewFormat = *pBoxF;
+                        pBoxF = pNewFormat;
                     }
-                    pBoxF->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth ));
+                    pBoxF->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nWidth ));
                 }
             }
 
@@ -540,12 +540,12 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
     }
     // Insert Frms
     GetNodes().GoNext( &aNdIdx ); // Go to the next ContentNode
-    pTblNd->MakeFrms( &aNdIdx );
+    pTableNd->MakeFrms( &aNdIdx );
 
-    // To-Do - add 'SwExtraRedlineTbl' also ?
-    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+    // To-Do - add 'SwExtraRedlineTable' also ?
+    if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
-        SwPaM aPam( *pTblNd->EndOfSectionNode(), *pTblNd, 1 );
+        SwPaM aPam( *pTableNd->EndOfSectionNode(), *pTableNd, 1 );
         if( getIDocumentRedlineAccess().IsRedlineOn() )
             getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aPam ), true);
         else
@@ -553,42 +553,42 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
     }
 
     getIDocumentState().SetModified();
-    CHECK_TABLE(rNdTbl);
-    return &rNdTbl;
+    CHECK_TABLE(rNdTable);
+    return &rNdTable;
 }
 
 SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx,
                                    sal_uInt16 nBoxes,
-                                   SwTxtFmtColl* pCntntTxtColl,
+                                   SwTextFormatColl* pContentTextColl,
                                    sal_uInt16 nLines,
                                    sal_uInt16 nRepeat,
-                                   SwTxtFmtColl* pHeadlineTxtColl,
+                                   SwTextFormatColl* pHeadlineTextColl,
                                    const SwAttrSet * pAttrSet)
 {
     if( !nBoxes )
         return 0;
 
     // If Lines is given, create the Matrix from Lines and Boxes
-    if( !pHeadlineTxtColl || !nLines )
-        pHeadlineTxtColl = pCntntTxtColl;
+    if( !pHeadlineTextColl || !nLines )
+        pHeadlineTextColl = pContentTextColl;
 
-    SwTableNode * pTblNd = new SwTableNode( rNdIdx );
-    SwEndNode* pEndNd = new SwEndNode( rNdIdx, *pTblNd );
+    SwTableNode * pTableNd = new SwTableNode( rNdIdx );
+    SwEndNode* pEndNd = new SwEndNode( rNdIdx, *pTableNd );
 
     if( !nLines ) // For the for loop
         ++nLines;
 
     SwNodeIndex aIdx( *pEndNd );
-    SwTxtFmtColl* pTxtColl = pHeadlineTxtColl;
+    SwTextFormatColl* pTextColl = pHeadlineTextColl;
     for( sal_uInt16 nL = 0; nL < nLines; ++nL )
     {
         for( sal_uInt16 nB = 0; nB < nBoxes; ++nB )
         {
             SwStartNode* pSttNd = new SwStartNode( aIdx, ND_STARTNODE,
                                                     SwTableBoxStartNode );
-            pSttNd->pStartOfSection = pTblNd;
+            pSttNd->pStartOfSection = pTableNd;
 
-            SwTxtNode * pTmpNd = new SwTxtNode( aIdx, pTxtColl );
+            SwTextNode * pTmpNd = new SwTextNode( aIdx, pTextColl );
 
             // #i60422# Propagate some more attributes.
             const SfxPoolItem* pItem = NULL;
@@ -605,7 +605,7 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx,
                 {
                     if ( SfxItemState::SET != pTmpNd->GetSwAttrSet().GetItemState( *pIdx ) &&
                          SfxItemState::SET == pAttrSet->GetItemState( *pIdx, true, &pItem ) )
-                        static_cast<SwCntntNode *>(pTmpNd)->SetAttr(*pItem);
+                        static_cast<SwContentNode *>(pTmpNd)->SetAttr(*pItem);
                     ++pIdx;
                 }
             }
@@ -613,41 +613,41 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx,
             new SwEndNode( aIdx, *pSttNd );
         }
         if ( nL + 1 >= nRepeat )
-            pTxtColl = pCntntTxtColl;
+            pTextColl = pContentTextColl;
     }
-    return pTblNd;
+    return pTableNd;
 }
 
 /**
  * Text to Table
  */
-const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
+const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTableOpts,
                                    const SwPaM& rRange, sal_Unicode cCh,
                                    sal_Int16 eAdjust,
-                                   const SwTableAutoFmt* pTAFmt )
+                                   const SwTableAutoFormat* pTAFormat )
 {
     // See if the selection contains a Table
     const SwPosition *pStt = rRange.Start(), *pEnd = rRange.End();
     {
         sal_uLong nCnt = pStt->nNode.GetIndex();
         for( ; nCnt <= pEnd->nNode.GetIndex(); ++nCnt )
-            if( !GetNodes()[ nCnt ]->IsTxtNode() )
+            if( !GetNodes()[ nCnt ]->IsTextNode() )
                 return 0;
     }
 
     // Save first node in the selection if it is a context node
-    SwCntntNode * pSttCntntNd = pStt->nNode.GetNode().GetCntntNode();
+    SwContentNode * pSttContentNd = pStt->nNode.GetNode().GetContentNode();
 
     SwPaM aOriginal( *pStt, *pEnd );
     pStt = aOriginal.GetMark();
     pEnd = aOriginal.GetPoint();
 
-    SwUndoTxtToTbl* pUndo = 0;
+    SwUndoTextToTable* pUndo = 0;
     if( GetIDocumentUndoRedo().DoesUndo() )
     {
         GetIDocumentUndoRedo().StartUndo( UNDO_TEXTTOTABLE, NULL );
-        pUndo = new SwUndoTxtToTbl( aOriginal, rInsTblOpts, cCh,
-                    static_cast<sal_uInt16>(eAdjust), pTAFmt );
+        pUndo = new SwUndoTextToTable( aOriginal, rInsTableOpts, cCh,
+                    static_cast<sal_uInt16>(eAdjust), pTAFormat );
         GetIDocumentUndoRedo().AppendUndo( pUndo );
 
         // Do not add splitting the TextNode to the Undo history
@@ -661,18 +661,18 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
     if( pStt->nContent.GetIndex() )
         getIDocumentContentOperations().SplitNode( *pStt, false );
 
-    bool bEndCntnt = 0 != pEnd->nContent.GetIndex();
+    bool bEndContent = 0 != pEnd->nContent.GetIndex();
 
     // Do not split at the End of a Line (except at the End of the Doc)
-    if( bEndCntnt )
+    if( bEndContent )
     {
-        if( pEnd->nNode.GetNode().GetCntntNode()->Len() != pEnd->nContent.GetIndex()
+        if( pEnd->nNode.GetNode().GetContentNode()->Len() != pEnd->nContent.GetIndex()
             || pEnd->nNode.GetIndex() >= GetNodes().GetEndOfContent().GetIndex()-1 )
         {
             getIDocumentContentOperations().SplitNode( *pEnd, false );
             --((SwNodeIndex&)pEnd->nNode);
             ((SwIndex&)pEnd->nContent).Assign(
-                                pEnd->nNode.GetNode().GetCntntNode(), 0 );
+                                pEnd->nNode.GetNode().GetContentNode(), 0 );
             // A Node and at the End?
             if( pStt->nNode.GetIndex() >= pEnd->nNode.GetIndex() )
                 --aRg.aStart;
@@ -693,78 +693,78 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
     GetIDocumentUndoRedo().DoUndo( 0 != pUndo );
 
     // Create the Box/Line/Table construct
-    SwTableBoxFmt* pBoxFmt = MakeTableBoxFmt();
-    SwTableLineFmt* pLineFmt = MakeTableLineFmt();
-    SwTableFmt* pTableFmt = MakeTblFrmFmt( GetUniqueTblName(), GetDfltFrmFmt() );
+    SwTableBoxFormat* pBoxFormat = MakeTableBoxFormat();
+    SwTableLineFormat* pLineFormat = MakeTableLineFormat();
+    SwTableFormat* pTableFormat = MakeTableFrameFormat( GetUniqueTableName(), GetDfltFrameFormat() );
 
     // All Lines have a left-to-right Fill Order
-    pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ));
+    pLineFormat->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ));
     // The Table's SSize is USHRT_MAX
-    pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
-    if( !(rInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
-        pTableFmt->SetFmtAttr( SwFmtLayoutSplit( false ));
+    pTableFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
+    if( !(rInsTableOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
+        pTableFormat->SetFormatAttr( SwFormatLayoutSplit( false ));
 
     /* If the first node in the selection is a context node and if it
        has an item FRAMEDIR set (no default) propagate the item to the
        replacing table. */
-    if (pSttCntntNd)
+    if (pSttContentNd)
     {
-        const SwAttrSet & aNdSet = pSttCntntNd->GetSwAttrSet();
+        const SwAttrSet & aNdSet = pSttContentNd->GetSwAttrSet();
         const SfxPoolItem *pItem = NULL;
 
         if (SfxItemState::SET == aNdSet.GetItemState( RES_FRAMEDIR, true, &pItem )
             && pItem != NULL)
         {
-            pTableFmt->SetFmtAttr( *pItem );
+            pTableFormat->SetFormatAttr( *pItem );
         }
     }
 
-    SwTableNode* pTblNd = GetNodes().TextToTable(
-            aRg, cCh, pTableFmt, pLineFmt, pBoxFmt,
-            getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ), pUndo );
+    SwTableNode* pTableNd = GetNodes().TextToTable(
+            aRg, cCh, pTableFormat, pLineFormat, pBoxFormat,
+            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ), pUndo );
 
-    SwTable& rNdTbl = pTblNd->GetTable();
+    SwTable& rNdTable = pTableNd->GetTable();
 
     const sal_uInt16 nRowsToRepeat =
-            tabopts::HEADLINE == (rInsTblOpts.mnInsMode & tabopts::HEADLINE) ?
-            rInsTblOpts.mnRowsToRepeat :
+            tabopts::HEADLINE == (rInsTableOpts.mnInsMode & tabopts::HEADLINE) ?
+            rInsTableOpts.mnRowsToRepeat :
             0;
-    rNdTbl.SetRowsToRepeat(nRowsToRepeat);
+    rNdTable.SetRowsToRepeat(nRowsToRepeat);
 
-    bool bUseBoxFmt = false;
-    if( !pBoxFmt->HasWriterListeners() )
+    bool bUseBoxFormat = false;
+    if( !pBoxFormat->HasWriterListeners() )
     {
         // The Box's Formats already have the right size, we must only set
-        // the right Border/AutoFmt.
-        bUseBoxFmt = true;
-        pTableFmt->SetFmtAttr( pBoxFmt->GetFrmSize() );
-        delete pBoxFmt;
+        // the right Border/AutoFormat.
+        bUseBoxFormat = true;
+        pTableFormat->SetFormatAttr( pBoxFormat->GetFrmSize() );
+        delete pBoxFormat;
         eAdjust = text::HoriOrientation::NONE;
     }
 
-    // Set Orientation in the Table's Fmt
-    pTableFmt->SetFmtAttr( SwFmtHoriOrient( 0, eAdjust ) );
+    // Set Orientation in the Table's Format
+    pTableFormat->SetFormatAttr( SwFormatHoriOrient( 0, eAdjust ) );
 
-    if( pTAFmt || ( rInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER) )
+    if( pTAFormat || ( rInsTableOpts.mnInsMode & tabopts::DEFAULT_BORDER) )
     {
-        sal_uInt8 nBoxArrLen = pTAFmt ? 16 : 4;
-        std::unique_ptr< DfltBoxAttrList_t > aBoxFmtArr1;
-        std::unique_ptr< std::vector<SwTableBoxFmt*> > aBoxFmtArr2;
-        if( bUseBoxFmt )
+        sal_uInt8 nBoxArrLen = pTAFormat ? 16 : 4;
+        std::unique_ptr< DfltBoxAttrList_t > aBoxFormatArr1;
+        std::unique_ptr< std::vector<SwTableBoxFormat*> > aBoxFormatArr2;
+        if( bUseBoxFormat )
         {
-            aBoxFmtArr1.reset(new DfltBoxAttrList_t( nBoxArrLen, NULL ));
+            aBoxFormatArr1.reset(new DfltBoxAttrList_t( nBoxArrLen, NULL ));
         }
         else
         {
-            aBoxFmtArr2.reset(new std::vector<SwTableBoxFmt*>( nBoxArrLen, NULL ));
+            aBoxFormatArr2.reset(new std::vector<SwTableBoxFormat*>( nBoxArrLen, NULL ));
         }
 
         SfxItemSet aCharSet( GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1 );
 
         SwHistory* pHistory = pUndo ? &pUndo->GetHistory() : 0;
 
-        SwTableBoxFmt *pBoxF = 0;
-        SwTableLines& rLines = rNdTbl.GetTabLines();
+        SwTableBoxFormat *pBoxF = 0;
+        SwTableLines& rLines = rNdTable.GetTabLines();
         const SwTableLines::size_type nRows = rLines.size();
         for( SwTableLines::size_type n = 0; n < nRows; ++n )
         {
@@ -775,34 +775,34 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
                 SwTableBox* pBox = rBoxes[ i ];
                 bool bChgSz = false;
 
-                if( pTAFmt )
+                if( pTAFormat )
                 {
                     sal_uInt8 nId = static_cast<sal_uInt8>(!n ? 0 : (( n+1 == nRows )
                                             ? 12 : (4 * (1 + ((n-1) & 1 )))));
                     nId = nId + static_cast<sal_uInt8>(!i ? 0 :
                                 ( i+1 == nCols ? 3 : (1 + ((i-1) & 1))));
-                    if( bUseBoxFmt )
-                        ::lcl_SetDfltBoxAttr( *pBox, *aBoxFmtArr1, nId, pTAFmt );
+                    if( bUseBoxFormat )
+                        ::lcl_SetDfltBoxAttr( *pBox, *aBoxFormatArr1, nId, pTAFormat );
                     else
                     {
-                        bChgSz = 0 == (*aBoxFmtArr2)[ nId ];
-                        pBoxF = ::lcl_CreateAFmtBoxFmt( *this, *aBoxFmtArr2,
-                                                *pTAFmt, USHRT_MAX, nId );
+                        bChgSz = 0 == (*aBoxFormatArr2)[ nId ];
+                        pBoxF = ::lcl_CreateAFormatBoxFormat( *this, *aBoxFormatArr2,
+                                                *pTAFormat, USHRT_MAX, nId );
                     }
 
                     // Set Paragraph/Character Attributes if needed
-                    if( pTAFmt->IsFont() || pTAFmt->IsJustify() )
+                    if( pTAFormat->IsFont() || pTAFormat->IsJustify() )
                     {
                         aCharSet.ClearItem();
-                        pTAFmt->UpdateToSet( nId, aCharSet,
-                                            SwTableAutoFmt::UPDATE_CHAR, 0 );
+                        pTAFormat->UpdateToSet( nId, aCharSet,
+                                            SwTableAutoFormat::UPDATE_CHAR, 0 );
                         if( aCharSet.Count() )
                         {
                             sal_uLong nSttNd = pBox->GetSttIdx()+1;
                             sal_uLong nEndNd = pBox->GetSttNd()->EndOfSectionIndex();
                             for( ; nSttNd < nEndNd; ++nSttNd )
                             {
-                                SwCntntNode* pNd = GetNodes()[ nSttNd ]->GetCntntNode();
+                                SwContentNode* pNd = GetNodes()[ nSttNd ]->GetContentNode();
                                 if( pNd )
                                 {
                                     if( pHistory )
@@ -820,51 +820,51 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
                 else
                 {
                     sal_uInt8 nId = (i < nCols - 1 ? 0 : 1) + (n ? 2 : 0 );
-                    if( bUseBoxFmt )
-                        ::lcl_SetDfltBoxAttr( *pBox, *aBoxFmtArr1, nId );
+                    if( bUseBoxFormat )
+                        ::lcl_SetDfltBoxAttr( *pBox, *aBoxFormatArr1, nId );
                     else
                     {
-                        bChgSz = 0 == (*aBoxFmtArr2)[ nId ];
-                        pBoxF = ::lcl_CreateDfltBoxFmt( *this, *aBoxFmtArr2,
+                        bChgSz = 0 == (*aBoxFormatArr2)[ nId ];
+                        pBoxF = ::lcl_CreateDfltBoxFormat( *this, *aBoxFormatArr2,
                                                         USHRT_MAX, nId );
                     }
                 }
 
-                if( !bUseBoxFmt )
+                if( !bUseBoxFormat )
                 {
                     if( bChgSz )
-                        pBoxF->SetFmtAttr( pBox->GetFrmFmt()->GetFrmSize() );
-                    pBox->ChgFrmFmt( pBoxF );
+                        pBoxF->SetFormatAttr( pBox->GetFrameFormat()->GetFrmSize() );
+                    pBox->ChgFrameFormat( pBoxF );
                 }
             }
         }
 
-        if( bUseBoxFmt )
+        if( bUseBoxFormat )
         {
             for( sal_uInt8 i = 0; i < nBoxArrLen; ++i )
             {
-                delete (*aBoxFmtArr1)[ i ];
+                delete (*aBoxFormatArr1)[ i ];
             }
         }
     }
 
     // Check the boxes for numbers
-    if( IsInsTblFormatNum() )
+    if( IsInsTableFormatNum() )
     {
-        for (size_t nBoxes = rNdTbl.GetTabSortBoxes().size(); nBoxes; )
+        for (size_t nBoxes = rNdTable.GetTabSortBoxes().size(); nBoxes; )
         {
-            ChkBoxNumFmt(*rNdTbl.GetTabSortBoxes()[ --nBoxes ], false);
+            ChkBoxNumFormat(*rNdTable.GetTabSortBoxes()[ --nBoxes ], false);
         }
     }
 
-    sal_uLong nIdx = pTblNd->GetIndex();
+    sal_uLong nIdx = pTableNd->GetIndex();
     aNode2Layout.RestoreUpperFrms( GetNodes(), nIdx, nIdx + 1 );
 
     {
         SwPaM& rTmp = (SwPaM&)rRange; // Point always at the Start
         rTmp.DeleteMark();
-        rTmp.GetPoint()->nNode = *pTblNd;
-        SwCntntNode* pCNd = GetNodes().GoNext( &rTmp.GetPoint()->nNode );
+        rTmp.GetPoint()->nNode = *pTableNd;
+        SwContentNode* pCNd = GetNodes().GoNext( &rTmp.GetPoint()->nNode );
         rTmp.GetPoint()->nContent.Assign( pCNd, 0 );
     }
 
@@ -875,44 +875,44 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
 
     getIDocumentState().SetModified();
     getIDocumentFieldsAccess().SetFieldsDirty(true, NULL, 0);
-    return &rNdTbl;
+    return &rNdTable;
 }
 
-static void lcl_RemoveBreaks(SwCntntNode & rNode, SwTableFmt *const pTableFmt)
+static void lcl_RemoveBreaks(SwContentNode & rNode, SwTableFormat *const pTableFormat)
 {
     // delete old layout frames, new ones need to be created...
     rNode.DelFrms();
 
-    if (!rNode.IsTxtNode())
+    if (!rNode.IsTextNode())
     {
         return;
     }
 
-    SwTxtNode & rTxtNode = *rNode.GetTxtNode();
+    SwTextNode & rTextNode = *rNode.GetTextNode();
     // remove PageBreaks/PageDesc/ColBreak
-    SfxItemSet const* pSet = rTxtNode.GetpSwAttrSet();
+    SfxItemSet const* pSet = rTextNode.GetpSwAttrSet();
     if (pSet)
     {
         const SfxPoolItem* pItem;
         if (SfxItemState::SET == pSet->GetItemState(RES_BREAK, false, &pItem))
         {
-            if (pTableFmt)
+            if (pTableFormat)
             {
-                pTableFmt->SetFmtAttr(*pItem);
+                pTableFormat->SetFormatAttr(*pItem);
             }
-            rTxtNode.ResetAttr(RES_BREAK);
-            pSet = rTxtNode.GetpSwAttrSet();
+            rTextNode.ResetAttr(RES_BREAK);
+            pSet = rTextNode.GetpSwAttrSet();
         }
 
         if (pSet
             && (SfxItemState::SET == pSet->GetItemState(RES_PAGEDESC, false, &pItem))
-            && static_cast<SwFmtPageDesc const*>(pItem)->GetPageDesc())
+            && static_cast<SwFormatPageDesc const*>(pItem)->GetPageDesc())
         {
-            if (pTableFmt)
+            if (pTableFormat)
             {
-                pTableFmt->SetFmtAttr(*pItem);
+                pTableFormat->SetFormatAttr(*pItem);
             }
-            rTxtNode.ResetAttr(RES_PAGEDESC);
+            rTextNode.ResetAttr(RES_PAGEDESC);
         }
     }
 }
@@ -922,8 +922,8 @@ static void lcl_RemoveBreaks(SwCntntNode & rNode, SwTableFmt *const pTableFmt)
  */
 static void
 lcl_BalanceTable(SwTable & rTable, size_t const nMaxBoxes,
-    SwTableNode & rTblNd, SwTableBoxFmt & rBoxFmt, SwTxtFmtColl & rTxtColl,
-    SwUndoTxtToTbl *const pUndo, std::vector<sal_uInt16> *const pPositions)
+    SwTableNode & rTableNd, SwTableBoxFormat & rBoxFormat, SwTextFormatColl & rTextColl,
+    SwUndoTextToTable *const pUndo, std::vector<sal_uInt16> *const pPositions)
 {
     for (size_t n = 0; n < rTable.GetTabLines().size(); ++n)
     {
@@ -931,7 +931,7 @@ lcl_BalanceTable(SwTable & rTable, size_t const nMaxBoxes,
         size_t const nBoxes = pCurrLine->GetTabBoxes().size();
         if (nMaxBoxes != nBoxes)
         {
-            rTblNd.GetNodes().InsBoxen(&rTblNd, pCurrLine, &rBoxFmt, &rTxtColl,
+            rTableNd.GetNodes().InsBoxen(&rTableNd, pCurrLine, &rBoxFormat, &rTextColl,
                     0, nBoxes, nMaxBoxes - nBoxes);
 
             if (pUndo)
@@ -953,7 +953,7 @@ lcl_BalanceTable(SwTable & rTable, size_t const nMaxBoxes,
 
 static void
 lcl_SetTableBoxWidths(SwTable & rTable, size_t const nMaxBoxes,
-        SwTableBoxFmt & rBoxFmt, SwDoc & rDoc,
+        SwTableBoxFormat & rBoxFormat, SwDoc & rDoc,
         std::vector<sal_uInt16> *const pPositions)
 {
     if (pPositions && !pPositions->empty())
@@ -962,71 +962,71 @@ lcl_SetTableBoxWidths(SwTable & rTable, size_t const nMaxBoxes,
         sal_uInt16 nLastPos = 0;
         for (size_t n = 0; n < pPositions->size(); ++n)
         {
-            SwTableBoxFmt *pNewFmt = rDoc.MakeTableBoxFmt();
-            pNewFmt->SetFmtAttr(
-                    SwFmtFrmSize(ATT_VAR_SIZE, (*pPositions)[n] - nLastPos));
+            SwTableBoxFormat *pNewFormat = rDoc.MakeTableBoxFormat();
+            pNewFormat->SetFormatAttr(
+                    SwFormatFrmSize(ATT_VAR_SIZE, (*pPositions)[n] - nLastPos));
             for (size_t nTmpLine = 0; nTmpLine < rLns.size(); ++nTmpLine)
             {
                 // Have to do an Add here, because the BoxFormat
                 // is still needed by the caller
-                pNewFmt->Add( rLns[ nTmpLine ]->GetTabBoxes()[ n ] );
+                pNewFormat->Add( rLns[ nTmpLine ]->GetTabBoxes()[ n ] );
             }
 
             nLastPos = (*pPositions)[ n ];
         }
 
         // propagate size upwards from format, so the table gets the right size
-        SAL_WARN_IF(rBoxFmt.HasWriterListeners(), "sw.core",
+        SAL_WARN_IF(rBoxFormat.HasWriterListeners(), "sw.core",
                 "who is still registered in the format?");
-        rBoxFmt.SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nLastPos ));
+        rBoxFormat.SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nLastPos ));
     }
     else
     {
         size_t nWidth = nMaxBoxes ? USHRT_MAX / nMaxBoxes : USHRT_MAX;
-        rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
+        rBoxFormat.SetFormatAttr(SwFormatFrmSize(ATT_VAR_SIZE, nWidth));
     }
 }
 
 SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
-                                    SwTableFmt* pTblFmt,
-                                    SwTableLineFmt* pLineFmt,
-                                    SwTableBoxFmt* pBoxFmt,
-                                    SwTxtFmtColl* pTxtColl,
-                                    SwUndoTxtToTbl* pUndo )
+                                    SwTableFormat* pTableFormat,
+                                    SwTableLineFormat* pLineFormat,
+                                    SwTableBoxFormat* pBoxFormat,
+                                    SwTextFormatColl* pTextColl,
+                                    SwUndoTextToTable* pUndo )
 {
     if( rRange.aStart >= rRange.aEnd )
         return 0;
 
-    SwTableNode * pTblNd = new SwTableNode( rRange.aStart );
-    new SwEndNode( rRange.aEnd, *pTblNd );
+    SwTableNode * pTableNd = new SwTableNode( rRange.aStart );
+    new SwEndNode( rRange.aEnd, *pTableNd );
 
     SwDoc* pDoc = GetDoc();
     std::vector<sal_uInt16> aPosArr;
-    SwTable& rTable = pTblNd->GetTable();
+    SwTable& rTable = pTableNd->GetTable();
     SwTableBox* pBox;
     sal_uInt16 nBoxes, nLines, nMaxBoxes = 0;
 
-    SwNodeIndex aSttIdx( *pTblNd, 1 );
+    SwNodeIndex aSttIdx( *pTableNd, 1 );
     SwNodeIndex aEndIdx( rRange.aEnd, -1 );
     for( nLines = 0, nBoxes = 0;
         aSttIdx.GetIndex() < aEndIdx.GetIndex();
         aSttIdx += 2, nLines++, nBoxes = 0 )
     {
-        SwTxtNode* pTxtNd = aSttIdx.GetNode().GetTxtNode();
-        OSL_ENSURE( pTxtNd, "Only add TextNodes to the Table" );
+        SwTextNode* pTextNd = aSttIdx.GetNode().GetTextNode();
+        OSL_ENSURE( pTextNd, "Only add TextNodes to the Table" );
 
         if( !nLines && 0x0b == cCh )
         {
             cCh = 0x09;
 
             // Get the separator's position from the first Node, in order for the Boxes to be set accordingly
-            SwTxtFrmInfo aFInfo( static_cast<SwTxtFrm*>(pTxtNd->getLayoutFrm( pTxtNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() )) );
+            SwTextFrmInfo aFInfo( static_cast<SwTextFrm*>(pTextNd->getLayoutFrm( pTextNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() )) );
             if( aFInfo.IsOneLine() ) // only makes sense in this case
             {
-                OUString const& rTxt(pTxtNd->GetTxt());
-                for (sal_Int32 nChPos = 0; nChPos < rTxt.getLength(); ++nChPos)
+                OUString const& rText(pTextNd->GetText());
+                for (sal_Int32 nChPos = 0; nChPos < rText.getLength(); ++nChPos)
                 {
-                    if (rTxt[nChPos] == cCh)
+                    if (rText[nChPos] == cCh)
                     {
                         aPosArr.push_back( static_cast<sal_uInt16>(
                                         aFInfo.GetCharPos( nChPos+1, false )) );
@@ -1041,34 +1041,34 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
             }
         }
 
-        lcl_RemoveBreaks(*pTxtNd, (0 == nLines) ? pTblFmt : 0);
+        lcl_RemoveBreaks(*pTextNd, (0 == nLines) ? pTableFormat : 0);
 
         // Set the TableNode as StartNode for all TextNodes in the Table
-        pTxtNd->pStartOfSection = pTblNd;
+        pTextNd->pStartOfSection = pTableNd;
 
-        SwTableLine* pLine = new SwTableLine( pLineFmt, 1, 0 );
+        SwTableLine* pLine = new SwTableLine( pLineFormat, 1, 0 );
         rTable.GetTabLines().insert(rTable.GetTabLines().begin() + nLines, pLine);
 
         SwStartNode* pSttNd;
-        SwPosition aCntPos( aSttIdx, SwIndex( pTxtNd ));
+        SwPosition aCntPos( aSttIdx, SwIndex( pTextNd ));
 
-        const std::shared_ptr< sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-        pCntntStore->Save( pDoc, aSttIdx.GetIndex(), pTxtNd->GetTxt().getLength() );
+        const std::shared_ptr< sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+        pContentStore->Save( pDoc, aSttIdx.GetIndex(), pTextNd->GetText().getLength() );
 
         if( T2T_PARA != cCh )
         {
-            for (sal_Int32 nChPos = 0; nChPos < pTxtNd->GetTxt().getLength();)
+            for (sal_Int32 nChPos = 0; nChPos < pTextNd->GetText().getLength();)
             {
-                if (pTxtNd->GetTxt()[nChPos] == cCh)
+                if (pTextNd->GetText()[nChPos] == cCh)
                 {
                     aCntPos.nContent = nChPos;
-                    SwCntntNode* pNewNd = pTxtNd->SplitCntntNode( aCntPos );
+                    SwContentNode* pNewNd = pTextNd->SplitContentNode( aCntPos );
 
-                    if( !pCntntStore->Empty() )
-                        pCntntStore->Restore( *pNewNd, nChPos, nChPos + 1 );
+                    if( !pContentStore->Empty() )
+                        pContentStore->Restore( *pNewNd, nChPos, nChPos + 1 );
 
                     // Delete separator and correct search string
-                    pTxtNd->EraseText( aCntPos.nContent, 1 );
+                    pTextNd->EraseText( aCntPos.nContent, 1 );
                     nChPos = 0;
 
                     // Set the TableNode as StartNode for all TextNodes in the Table
@@ -1079,7 +1079,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
                     pNewNd->pStartOfSection = pSttNd;
 
                     // Assign Section to the Box
-                    pBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
+                    pBox = new SwTableBox( pBoxFormat, *pSttNd, pLine );
                     pLine->GetTabBoxes().insert( pLine->GetTabBoxes().begin() + nBoxes++, pBox );
                 }
                 else
@@ -1090,26 +1090,26 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
         }
 
         // Now for the last substring
-        if( !pCntntStore->Empty())
-            pCntntStore->Restore( *pTxtNd, pTxtNd->GetTxt().getLength(), pTxtNd->GetTxt().getLength()+1 );
+        if( !pContentStore->Empty())
+            pContentStore->Restore( *pTextNd, pTextNd->GetText().getLength(), pTextNd->GetText().getLength()+1 );
 
         pSttNd = new SwStartNode( aCntPos.nNode, ND_STARTNODE, SwTableBoxStartNode );
         const SwNodeIndex aTmpIdx( aCntPos.nNode, 1 );
         new SwEndNode( aTmpIdx, *pSttNd  );
-        pTxtNd->pStartOfSection = pSttNd;
+        pTextNd->pStartOfSection = pSttNd;
 
-        pBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
+        pBox = new SwTableBox( pBoxFormat, *pSttNd, pLine );
         pLine->GetTabBoxes().insert( pLine->GetTabBoxes().begin() + nBoxes++, pBox );
         if( nMaxBoxes < nBoxes )
             nMaxBoxes = nBoxes;
     }
 
-    lcl_BalanceTable(rTable, nMaxBoxes, *pTblNd, *pBoxFmt, *pTxtColl,
+    lcl_BalanceTable(rTable, nMaxBoxes, *pTableNd, *pBoxFormat, *pTextColl,
             pUndo, &aPosArr);
-    rTable.RegisterToFormat(*pTblFmt);
-    lcl_SetTableBoxWidths(rTable, nMaxBoxes, *pBoxFmt, *pDoc, &aPosArr);
+    rTable.RegisterToFormat(*pTableFormat);
+    lcl_SetTableBoxWidths(rTable, nMaxBoxes, *pBoxFormat, *pDoc, &aPosArr);
 
-    return pTblNd;
+    return pTableNd;
 }
 
 const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes )
@@ -1128,7 +1128,7 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
         return NULL;
 
     /* Save first node in the selection if it is a content node. */
-    SwCntntNode * pSttCntntNd = rFirstRange.begin()->aStart.GetNode().GetCntntNode();
+    SwContentNode * pSttContentNd = rFirstRange.begin()->aStart.GetNode().GetContentNode();
 
     const SwNodeRange& rStartRange = *rFirstRange.begin();
     const SwNodeRange& rEndRange = *rLastRange.rbegin();
@@ -1152,18 +1152,18 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
     if( pStt->nContent.GetIndex() )
         getIDocumentContentOperations().SplitNode( *pStt, false );
 
-    bool bEndCntnt = 0 != pEnd->nContent.GetIndex();
+    bool bEndContent = 0 != pEnd->nContent.GetIndex();
 
     // Do not split at the End of a Line (except at the End of the Doc)
-    if( bEndCntnt )
+    if( bEndContent )
     {
-        if( pEnd->nNode.GetNode().GetCntntNode()->Len() != pEnd->nContent.GetIndex()
+        if( pEnd->nNode.GetNode().GetContentNode()->Len() != pEnd->nContent.GetIndex()
             || pEnd->nNode.GetIndex() >= GetNodes().GetEndOfContent().GetIndex()-1 )
         {
             getIDocumentContentOperations().SplitNode( *pEnd, false );
             --((SwNodeIndex&)pEnd->nNode);
             ((SwIndex&)pEnd->nContent).Assign(
-                                pEnd->nNode.GetNode().GetCntntNode(), 0 );
+                                pEnd->nNode.GetNode().GetContentNode(), 0 );
             // A Node and at the End?
             if( pStt->nNode.GetIndex() >= pEnd->nNode.GetIndex() )
                 --aRg.aStart;
@@ -1193,16 +1193,16 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
             {
                 assert(SwNodeIndex(*pPrev, +1) == cell->aStart);
                 SwPaM pam(cell->aStart, 0, *pPrev,
-                        (pPrev->GetNode().IsCntntNode())
-                            ? pPrev->GetNode().GetCntntNode()->Len() : 0);
+                        (pPrev->GetNode().IsContentNode())
+                            ? pPrev->GetNode().GetContentNode()->Len() : 0);
                 rIDRA.SplitRedline(pam);
                 pPrev = &cell->aEnd;
             }
         }
         // another one to break between last cell and node after table
         SwPaM pam(SwNodeIndex(*pPrev, +1), 0, *pPrev,
-                    (pPrev->GetNode().IsCntntNode())
-                        ? pPrev->GetNode().GetCntntNode()->Len() : 0);
+                    (pPrev->GetNode().IsContentNode())
+                        ? pPrev->GetNode().GetContentNode()->Len() : 0);
         rIDRA.SplitRedline(pam);
     }
 
@@ -1212,50 +1212,50 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
     GetIDocumentUndoRedo().DoUndo(bUndo);
 
     // Create the Box/Line/Table construct
-    SwTableBoxFmt* pBoxFmt = MakeTableBoxFmt();
-    SwTableLineFmt* pLineFmt = MakeTableLineFmt();
-    SwTableFmt* pTableFmt = MakeTblFrmFmt( GetUniqueTblName(), GetDfltFrmFmt() );
+    SwTableBoxFormat* pBoxFormat = MakeTableBoxFormat();
+    SwTableLineFormat* pLineFormat = MakeTableLineFormat();
+    SwTableFormat* pTableFormat = MakeTableFrameFormat( GetUniqueTableName(), GetDfltFrameFormat() );
 
     // All Lines have a left-to-right Fill Order
-    pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ));
+    pLineFormat->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ));
     // The Table's SSize is USHRT_MAX
-    pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
+    pTableFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
 
     /* If the first node in the selection is a context node and if it
        has an item FRAMEDIR set (no default) propagate the item to the
        replacing table. */
-    if (pSttCntntNd)
+    if (pSttContentNd)
     {
-        const SwAttrSet & aNdSet = pSttCntntNd->GetSwAttrSet();
+        const SwAttrSet & aNdSet = pSttContentNd->GetSwAttrSet();
         const SfxPoolItem *pItem = NULL;
 
         if (SfxItemState::SET == aNdSet.GetItemState( RES_FRAMEDIR, true, &pItem )
             && pItem != NULL)
         {
-            pTableFmt->SetFmtAttr( *pItem );
+            pTableFormat->SetFormatAttr( *pItem );
         }
     }
 
-    SwTableNode* pTblNd = GetNodes().TextToTable(
-            rTableNodes, pTableFmt, pLineFmt, pBoxFmt,
-            getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD )/*, pUndo*/ );
+    SwTableNode* pTableNd = GetNodes().TextToTable(
+            rTableNodes, pTableFormat, pLineFormat, pBoxFormat,
+            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD )/*, pUndo*/ );
 
-    SwTable& rNdTbl = pTblNd->GetTable();
+    SwTable& rNdTable = pTableNd->GetTable();
 
-    if( !pBoxFmt->HasWriterListeners() )
+    if( !pBoxFormat->HasWriterListeners() )
     {
         // The Box's Formats already have the right size, we must only set
-        // the right Border/AutoFmt.
-        pTableFmt->SetFmtAttr( pBoxFmt->GetFrmSize() );
-        delete pBoxFmt;
+        // the right Border/AutoFormat.
+        pTableFormat->SetFormatAttr( pBoxFormat->GetFrmSize() );
+        delete pBoxFormat;
     }
 
-    sal_uLong nIdx = pTblNd->GetIndex();
+    sal_uLong nIdx = pTableNd->GetIndex();
     aNode2Layout.RestoreUpperFrms( GetNodes(), nIdx, nIdx + 1 );
 
     getIDocumentState().SetModified();
     getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
-    return &rNdTbl;
+    return &rNdTable;
 }
 
 SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange)
@@ -1322,7 +1322,7 @@ SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange)
 
 static void
 lcl_SetTableBoxWidths2(SwTable & rTable, size_t const nMaxBoxes,
-        SwTableBoxFmt & rBoxFmt, SwDoc & rDoc)
+        SwTableBoxFormat & rBoxFormat, SwDoc & rDoc)
 {
     // rhbz#820283, fdo#55462: set default box widths so table width is covered
     SwTableLines & rLines = rTable.GetTabLines();
@@ -1333,35 +1333,35 @@ lcl_SetTableBoxWidths2(SwTable & rTable, size_t const nMaxBoxes,
         if (nMissing)
         {
             // default width for box at the end of an incomplete line
-            SwTableBoxFmt *const pNewFmt = rDoc.MakeTableBoxFmt();
+            SwTableBoxFormat *const pNewFormat = rDoc.MakeTableBoxFormat();
             size_t nWidth = nMaxBoxes ? USHRT_MAX / nMaxBoxes : USHRT_MAX;
-            pNewFmt->SetFmtAttr( SwFmtFrmSize(ATT_VAR_SIZE,
+            pNewFormat->SetFormatAttr( SwFormatFrmSize(ATT_VAR_SIZE,
                         nWidth * (nMissing + 1)) );
-            pNewFmt->Add(rBoxes.back());
+            pNewFormat->Add(rBoxes.back());
         }
     }
     size_t nWidth = nMaxBoxes ? USHRT_MAX / nMaxBoxes : USHRT_MAX;
     // default width for all boxes not at the end of an incomplete line
-    rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
+    rBoxFormat.SetFormatAttr(SwFormatFrmSize(ATT_VAR_SIZE, nWidth));
 }
 
 SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
-                                    SwTableFmt* pTblFmt,
-                                    SwTableLineFmt* pLineFmt,
-                                    SwTableBoxFmt* pBoxFmt,
-                                    SwTxtFmtColl* /*pTxtColl*/  /*, SwUndo... pUndo*/  )
+                                    SwTableFormat* pTableFormat,
+                                    SwTableLineFormat* pLineFormat,
+                                    SwTableBoxFormat* pBoxFormat,
+                                    SwTextFormatColl* /*pTextColl*/  /*, SwUndo... pUndo*/  )
 {
     if( !rTableNodes.size() )
         return 0;
 
-    SwTableNode * pTblNd = new SwTableNode( rTableNodes.begin()->begin()->aStart );
+    SwTableNode * pTableNd = new SwTableNode( rTableNodes.begin()->begin()->aStart );
     //insert the end node after the last text node
     SwNodeIndex aInsertIndex( rTableNodes.rbegin()->rbegin()->aEnd );
     ++aInsertIndex;
 
     //!! ownership will be transferred in c-tor to SwNodes array.
     //!! Thus no real problem here...
-    new SwEndNode( aInsertIndex, *pTblNd );
+    new SwEndNode( aInsertIndex, *pTableNd );
 
 #if OSL_DEBUG_LEVEL > 1
     const SwNodeRange& rStartRange = *rTableNodes.begin()->begin();
@@ -1371,7 +1371,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
 #endif
 
     SwDoc* pDoc = GetDoc();
-    SwTable& rTable = pTblNd->GetTable();
+    SwTable& rTable = pTableNd->GetTable();
     SwTableBox* pBox;
     sal_uInt16 nBoxes, nLines, nMaxBoxes = 0;
 
@@ -1380,10 +1380,10 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
     for( nLines = 0; aNodeIndex <= rTableNodes.rbegin()->rbegin()->aEnd; ++aNodeIndex,++nLines )
     {
         SwNode& rNode = aNodeIndex.GetNode();
-        if( rNode.IsCntntNode() )
+        if( rNode.IsContentNode() )
         {
-            lcl_RemoveBreaks(static_cast<SwCntntNode&>(rNode),
-                    (0 == nLines) ? pTblFmt : 0);
+            lcl_RemoveBreaks(static_cast<SwContentNode&>(rNode),
+                    (0 == nLines) ? pTableFormat : 0);
         }
     }
 
@@ -1392,7 +1392,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
         aRowIter != rTableNodes.end();
         ++aRowIter, nLines++, nBoxes = 0 )
     {
-        SwTableLine* pLine = new SwTableLine( pLineFmt, 1, 0 );
+        SwTableLine* pLine = new SwTableLine( pLineFormat, 1, 0 );
         rTable.GetTabLines().insert(rTable.GetTabLines().begin() + nLines, pLine);
 
         std::vector< SwNodeRange >::const_iterator aCellIter = aRowIter->begin();
@@ -1422,47 +1422,47 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
                 }
 
                 // assign Section to the Box
-                pBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
+                pBox = new SwTableBox( pBoxFormat, *pSttNd, pLine );
                 pLine->GetTabBoxes().insert( pLine->GetTabBoxes().begin() + nBoxes++, pBox );
         }
         if( nMaxBoxes < nBoxes )
             nMaxBoxes = nBoxes;
     }
 
-    rTable.RegisterToFormat(*pTblFmt);
-    lcl_SetTableBoxWidths2(rTable, nMaxBoxes, *pBoxFmt, *pDoc);
+    rTable.RegisterToFormat(*pTableFormat);
+    lcl_SetTableBoxWidths2(rTable, nMaxBoxes, *pBoxFormat, *pDoc);
 
-    return pTblNd;
+    return pTableNd;
 }
 
 /**
  * Table to Text
  */
-bool SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh )
+bool SwDoc::TableToText( const SwTableNode* pTableNd, sal_Unicode cCh )
 {
-    if( !pTblNd )
+    if( !pTableNd )
         return false;
 
     // #i34471#
-    // If this is trigged by SwUndoTblToTxt::Repeat() nobody ever deleted
+    // If this is trigged by SwUndoTableToText::Repeat() nobody ever deleted
     // the table cursor.
     SwEditShell* pESh = GetEditShell();
     if( pESh && pESh->IsTableMode() )
         pESh->ClearMark();
 
-    SwNodeRange aRg( *pTblNd, 0, *pTblNd->EndOfSectionNode() );
-    SwUndoTblToTxt* pUndo = 0;
+    SwNodeRange aRg( *pTableNd, 0, *pTableNd->EndOfSectionNode() );
+    SwUndoTableToText* pUndo = 0;
     SwNodeRange* pUndoRg = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         GetIDocumentUndoRedo().ClearRedo();
         pUndoRg = new SwNodeRange( aRg.aStart, -1, aRg.aEnd, +1 );
-        pUndo = new SwUndoTblToTxt( pTblNd->GetTable(), cCh );
+        pUndo = new SwUndoTableToText( pTableNd->GetTable(), cCh );
     }
 
-    SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-    aMsgHnt.eFlags = TBL_BOXNAME;
-    getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+    aMsgHint.eFlags = TBL_BOXNAME;
+    getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     bool bRet = GetNodes().TableToText( aRg, cCh, pUndo );
     if( pUndoRg )
@@ -1486,12 +1486,12 @@ bool SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh )
  */
 struct _DelTabPara
 {
-    SwTxtNode* pLastNd;
+    SwTextNode* pLastNd;
     SwNodes& rNds;
-    SwUndoTblToTxt* pUndo;
+    SwUndoTableToText* pUndo;
     sal_Unicode cCh;
 
-    _DelTabPara( SwNodes& rNodes, sal_Unicode cChar, SwUndoTblToTxt* pU ) :
+    _DelTabPara( SwNodes& rNodes, sal_Unicode cChar, SwUndoTableToText* pU ) :
         pLastNd(0), rNds( rNodes ), pUndo( pU ), cCh( cChar ) {}
     _DelTabPara( const _DelTabPara& rPara ) :
         pLastNd(rPara.pLastNd), rNds( rPara.rNds ),
@@ -1530,9 +1530,9 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
                             *pBox->GetSttNd()->EndOfSectionNode() );
         // Delete the Section
         pDelPara->rNds.SectionUp( &aDelRg );
-        const SwTxtNode* pCurTxtNd;
+        const SwTextNode* pCurTextNd;
         if( T2T_PARA != pDelPara->cCh && pDelPara->pLastNd &&
-            0 != ( pCurTxtNd = aDelRg.aStart.GetNode().GetTxtNode() ))
+            0 != ( pCurTextNd = aDelRg.aStart.GetNode().GetTextNode() ))
         {
             // Join the current text node with the last from the previous box if possible
             sal_uLong nNdIdx = aDelRg.aStart.GetIndex();
@@ -1541,21 +1541,21 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
             {
                 // Inserting the separator
                 SwIndex aCntIdx( pDelPara->pLastNd,
-                        pDelPara->pLastNd->GetTxt().getLength());
+                        pDelPara->pLastNd->GetText().getLength());
                 pDelPara->pLastNd->InsertText( OUString(pDelPara->cCh), aCntIdx,
                     SwInsertFlags::EMPTYEXPAND );
                 if( pDelPara->pUndo )
                     pDelPara->pUndo->AddBoxPos( *pDoc, nNdIdx, aDelRg.aEnd.GetIndex(),
                                                 aCntIdx.GetIndex() );
 
-                const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-                const sal_Int32 nOldTxtLen = aCntIdx.GetIndex();
-                pCntntStore->Save( pDoc, nNdIdx, pCurTxtNd->GetTxt().getLength() );
+                const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+                const sal_Int32 nOldTextLen = aCntIdx.GetIndex();
+                pContentStore->Save( pDoc, nNdIdx, pCurTextNd->GetText().getLength() );
 
                 pDelPara->pLastNd->JoinNext();
 
-                if( !pCntntStore->Empty() )
-                    pCntntStore->Restore( pDoc, pDelPara->pLastNd->GetIndex(), nOldTxtLen );
+                if( !pContentStore->Empty() )
+                    pContentStore->Restore( pDoc, pDelPara->pLastNd->GetIndex(), nOldTextLen );
             }
             else if( pDelPara->pUndo )
             {
@@ -1566,7 +1566,7 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
         else if( pDelPara->pUndo )
             pDelPara->pUndo->AddBoxPos( *pDoc, aDelRg.aStart.GetIndex(), aDelRg.aEnd.GetIndex() );
         --aDelRg.aEnd;
-        pDelPara->pLastNd = aDelRg.aEnd.GetNode().GetTxtNode();
+        pDelPara->pLastNd = aDelRg.aEnd.GetNode().GetTextNode();
 
         // Do not take over the NumberFormatting's adjustment
         if( pDelPara->pLastNd && pDelPara->pLastNd->HasSwAttrSet() )
@@ -1575,13 +1575,13 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
 }
 
 bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
-                            SwUndoTblToTxt* pUndo )
+                            SwUndoTableToText* pUndo )
 {
     // Is a Table selected?
-    SwTableNode* pTblNd;
+    SwTableNode* pTableNd;
     if( rRange.aStart.GetIndex() >= rRange.aEnd.GetIndex() ||
-        0 == ( pTblNd = rRange.aStart.GetNode().GetTableNode()) ||
-        &rRange.aEnd.GetNode() != pTblNd->EndOfSectionNode() )
+        0 == ( pTableNd = rRange.aStart.GetNode().GetTableNode()) ||
+        &rRange.aEnd.GetNode() != pTableNd->EndOfSectionNode() )
         return false;
 
     // If the Table was alone in a Section, create the Frames via the Table's Upper
@@ -1590,14 +1590,14 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
     SwNode* pFrmNd = FindPrvNxtFrmNode( aFrmIdx, &rRange.aEnd.GetNode() );
     if( !pFrmNd )
         // Collect all Uppers
-        pNode2Layout = new SwNode2Layout( *pTblNd );
+        pNode2Layout = new SwNode2Layout( *pTableNd );
 
     // Delete the Frames
-    pTblNd->DelFrms();
+    pTableNd->DelFrms();
 
     // "Delete" the Table and merge all Lines/Boxes
     _DelTabPara aDelPara( *this, cCh, pUndo );
-    for( SwTableLine *pLine : pTblNd->pTable->GetTabLines() )
+    for( SwTableLine *pLine : pTableNd->pTable->GetTabLines() )
         lcl_DelLine( pLine, &aDelPara );
 
     // We just created a TextNode with fitting separator for every TableLine.
@@ -1609,17 +1609,17 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
     // first Text Node
     {
         // What about UNDO?
-        const SfxItemSet& rTblSet = pTblNd->pTable->GetFrmFmt()->GetAttrSet();
+        const SfxItemSet& rTableSet = pTableNd->pTable->GetFrameFormat()->GetAttrSet();
         const SfxPoolItem *pBreak, *pDesc;
-        if( SfxItemState::SET != rTblSet.GetItemState( RES_PAGEDESC, false, &pDesc ))
+        if( SfxItemState::SET != rTableSet.GetItemState( RES_PAGEDESC, false, &pDesc ))
             pDesc = 0;
-        if( SfxItemState::SET != rTblSet.GetItemState( RES_BREAK, false, &pBreak ))
+        if( SfxItemState::SET != rTableSet.GetItemState( RES_BREAK, false, &pBreak ))
             pBreak = 0;
 
         if( pBreak || pDesc )
         {
-            SwNodeIndex aIdx( *pTblNd  );
-            SwCntntNode* pCNd = GoNext( &aIdx );
+            SwNodeIndex aIdx( *pTableNd  );
+            SwContentNode* pCNd = GoNext( &aIdx );
             if( pBreak )
                 pCNd->SetAttr( *pBreak );
             if( pDesc )
@@ -1638,14 +1638,14 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
     }
     else
     {
-        SwCntntNode *pCNd;
+        SwContentNode *pCNd;
         SwSectionNode *pSNd;
         while( aDelRg.aStart.GetIndex() < nEnd )
         {
-            if( 0 != ( pCNd = aDelRg.aStart.GetNode().GetCntntNode()))
+            if( 0 != ( pCNd = aDelRg.aStart.GetNode().GetContentNode()))
             {
-                if( pFrmNd->IsCntntNode() )
-                    static_cast<SwCntntNode*>(pFrmNd)->MakeFrms( *pCNd );
+                if( pFrmNd->IsContentNode() )
+                    static_cast<SwContentNode*>(pFrmNd)->MakeFrms( *pCNd );
                 else if( pFrmNd->IsTableNode() )
                     static_cast<SwTableNode*>(pFrmNd)->MakeFrms( aDelRg.aStart );
                 else if( pFrmNd->IsSectionNode() )
@@ -1654,7 +1654,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
             }
             else if( 0 != ( pSNd = aDelRg.aStart.GetNode().GetSectionNode()))
             {
-                if( !pSNd->GetSection().IsHidden() && !pSNd->IsCntntHidden() )
+                if( !pSNd->GetSection().IsHidden() && !pSNd->IsContentHidden() )
                 {
                     pSNd->MakeFrms( &aFrmIdx, &aDelRg.aEnd );
                     pFrmNd = pSNd;
@@ -1668,19 +1668,19 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
 
     // #i28006# Fly frames have to be restored even if the table was
     // #alone in the section
-    const SwFrmFmts& rFlyArr = *GetDoc()->GetSpzFrmFmts();
+    const SwFrameFormats& rFlyArr = *GetDoc()->GetSpzFrameFormats();
     for( auto pFly : rFlyArr )
     {
-        SwFrmFmt *const pFmt = (SwFrmFmt*)pFly;
-        const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-        SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+        SwFrameFormat *const pFormat = (SwFrameFormat*)pFly;
+        const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
+        SwPosition const*const pAPos = rAnchor.GetContentAnchor();
         if (pAPos &&
             ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
              (FLY_AT_CHAR == rAnchor.GetAnchorId())) &&
             nStt <= pAPos->nNode.GetIndex() &&
             pAPos->nNode.GetIndex() < nEnd )
         {
-            pFmt->MakeFrms();
+            pFormat->MakeFrms();
         }
     }
 
@@ -1692,12 +1692,12 @@ bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
  */
 bool SwDoc::InsertCol( const SwCursor& rCursor, sal_uInt16 nCnt, bool bBehind )
 {
-    if( !::CheckSplitCells( rCursor, nCnt + 1, nsSwTblSearchType::TBLSEARCH_COL ) )
+    if( !::CheckSplitCells( rCursor, nCnt + 1, nsSwTableSearchType::TBLSEARCH_COL ) )
         return false;
 
     // Find the Boxes via the Layout
     SwSelBoxes aBoxes;
-    ::GetTblSel( rCursor, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
+    ::GetTableSel( rCursor, aBoxes, nsSwTableSearchType::TBLSEARCH_COL );
 
     bool bRet = false;
     if( !aBoxes.empty() )
@@ -1708,32 +1708,32 @@ bool SwDoc::InsertCol( const SwCursor& rCursor, sal_uInt16 nCnt, bool bBehind )
 bool SwDoc::InsertCol( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
 {
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
-    SwTable& rTbl = pTblNd->GetTable();
-    if( rTbl.ISA( SwDDETable ))
+    SwTable& rTable = pTableNd->GetTable();
+    if( rTable.ISA( SwDDETable ))
         return false;
 
     SwTableSortBoxes aTmpLst;
-    SwUndoTblNdsChg* pUndo = 0;
+    SwUndoTableNdsChg* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo = new SwUndoTblNdsChg( UNDO_TABLE_INSCOL, rBoxes, *pTblNd,
+        pUndo = new SwUndoTableNdsChg( UNDO_TABLE_INSCOL, rBoxes, *pTableNd,
                                      0, 0, nCnt, bBehind, false );
-        aTmpLst.insert( rTbl.GetTabSortBoxes() );
+        aTmpLst.insert( rTable.GetTabSortBoxes() );
     }
 
     bool bRet(false);
     {
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-        SwTableFmlUpdate aMsgHnt( &rTbl );
-        aMsgHnt.eFlags = TBL_BOXPTR;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rTable );
+        aMsgHint.eFlags = TBL_BOXPTR;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
-        bRet = rTbl.InsertCol( this, rBoxes, nCnt, bBehind );
+        bRet = rTable.InsertCol( this, rBoxes, nCnt, bBehind );
         if (bRet)
         {
             getIDocumentState().SetModified();
@@ -1746,7 +1746,7 @@ bool SwDoc::InsertCol( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
     {
         if( bRet )
         {
-            pUndo->SaveNewBoxes( *pTblNd, aTmpLst );
+            pUndo->SaveNewBoxes( *pTableNd, aTmpLst );
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
         else
@@ -1759,7 +1759,7 @@ bool SwDoc::InsertRow( const SwCursor& rCursor, sal_uInt16 nCnt, bool bBehind )
 {
     // Find the Boxes via the Layout
     SwSelBoxes aBoxes;
-    GetTblSel( rCursor, aBoxes, nsSwTblSearchType::TBLSEARCH_ROW );
+    GetTableSel( rCursor, aBoxes, nsSwTableSearchType::TBLSEARCH_ROW );
 
     bool bRet = false;
     if( !aBoxes.empty() )
@@ -1770,32 +1770,32 @@ bool SwDoc::InsertRow( const SwCursor& rCursor, sal_uInt16 nCnt, bool bBehind )
 bool SwDoc::InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
 {
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
-    SwTable& rTbl = pTblNd->GetTable();
-    if( rTbl.ISA( SwDDETable ))
+    SwTable& rTable = pTableNd->GetTable();
+    if( rTable.ISA( SwDDETable ))
         return false;
 
     SwTableSortBoxes aTmpLst;
-    SwUndoTblNdsChg* pUndo = 0;
+    SwUndoTableNdsChg* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo = new SwUndoTblNdsChg( UNDO_TABLE_INSROW,rBoxes, *pTblNd,
+        pUndo = new SwUndoTableNdsChg( UNDO_TABLE_INSROW,rBoxes, *pTableNd,
                                      0, 0, nCnt, bBehind, false );
-        aTmpLst.insert( rTbl.GetTabSortBoxes() );
+        aTmpLst.insert( rTable.GetTabSortBoxes() );
     }
 
     bool bRet(false);
     {
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-        SwTableFmlUpdate aMsgHnt( &rTbl );
-        aMsgHnt.eFlags = TBL_BOXPTR;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rTable );
+        aMsgHint.eFlags = TBL_BOXPTR;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
-        bRet = rTbl.InsertRow( this, rBoxes, nCnt, bBehind );
+        bRet = rTable.InsertRow( this, rBoxes, nCnt, bBehind );
         if (bRet)
         {
             getIDocumentState().SetModified();
@@ -1808,7 +1808,7 @@ bool SwDoc::InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
     {
         if( bRet )
         {
-            pUndo->SaveNewBoxes( *pTblNd, aTmpLst );
+            pUndo->SaveNewBoxes( *pTableNd, aTmpLst );
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
         else
@@ -1825,7 +1825,7 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor )
 {
     // Find the Boxes via the Layout
     SwSelBoxes aBoxes;
-    GetTblSel( rCursor, aBoxes, nsSwTblSearchType::TBLSEARCH_ROW );
+    GetTableSel( rCursor, aBoxes, nsSwTableSearchType::TBLSEARCH_ROW );
     if( ::HasProtectedCells( aBoxes ))
         return false;
 
@@ -1834,16 +1834,16 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor )
     //  - when there's another Line, we place it in that one
     //  - when a Line precedes it, we place it in that one
     {
-        SwTableNode* pTblNd = rCursor.GetNode().FindTableNode();
+        SwTableNode* pTableNd = rCursor.GetNode().FindTableNode();
 
-        if( pTblNd->GetTable().ISA( SwDDETable ))
+        if( pTableNd->GetTable().ISA( SwDDETable ))
             return false;
 
         // Find all Boxes/Lines
         _FndBox aFndBox( 0, 0 );
         {
             _FndPara aPara( aBoxes, &aFndBox );
-            ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
+            ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara );
         }
 
         if( !aFndBox.GetLines().size() )
@@ -1874,11 +1874,11 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor )
                         pDelBox->GetTabLines().size()-1 ];
             pDelBox = pLn->GetTabBoxes().back();
         }
-        SwTableBox* pNextBox = pDelLine->FindNextBox( pTblNd->GetTable(),
+        SwTableBox* pNextBox = pDelLine->FindNextBox( pTableNd->GetTable(),
                                                         pDelBox, true );
         while( pNextBox &&
-                pNextBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
-            pNextBox = pNextBox->FindNextBox( pTblNd->GetTable(), pNextBox );
+                pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() )
+            pNextBox = pNextBox->FindNextBox( pTableNd->GetTable(), pNextBox );
 
         if( !pNextBox ) // No succeeding Boxes? Then take the preceding one
         {
@@ -1886,21 +1886,21 @@ bool SwDoc::DeleteRow( const SwCursor& rCursor )
             pDelBox = pDelLine->GetTabBoxes()[ 0 ];
             while( !pDelBox->GetSttNd() )
                 pDelBox = pDelBox->GetTabLines()[0]->GetTabBoxes()[0];
-            pNextBox = pDelLine->FindPreviousBox( pTblNd->GetTable(),
+            pNextBox = pDelLine->FindPreviousBox( pTableNd->GetTable(),
                                                         pDelBox, true );
             while( pNextBox &&
-                    pNextBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
-                pNextBox = pNextBox->FindPreviousBox( pTblNd->GetTable(), pNextBox );
+                    pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() )
+                pNextBox = pNextBox->FindPreviousBox( pTableNd->GetTable(), pNextBox );
         }
 
         sal_uLong nIdx;
         if( pNextBox ) // Place the Cursor here
             nIdx = pNextBox->GetSttIdx() + 1;
         else // Else after the Table
-            nIdx = pTblNd->EndOfSectionIndex() + 1;
+            nIdx = pTableNd->EndOfSectionIndex() + 1;
 
         SwNodeIndex aIdx( GetNodes(), nIdx );
-        SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+        SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
         if( !pCNd )
             pCNd = GetNodes().GoNext( &aIdx );
 
@@ -1927,7 +1927,7 @@ bool SwDoc::DeleteCol( const SwCursor& rCursor )
 {
     // Find the Boxes via the Layout
     SwSelBoxes aBoxes;
-    GetTblSel( rCursor, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
+    GetTableSel( rCursor, aBoxes, nsSwTableSearchType::TBLSEARCH_COL );
     if( ::HasProtectedCells( aBoxes ))
         return false;
 
@@ -1955,16 +1955,16 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
         return false;
 
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
-    if( pTblNd->GetTable().ISA( SwDDETable ))
+    if( pTableNd->GetTable().ISA( SwDDETable ))
         return false;
 
     ::ClearFEShellTabCols();
     SwSelBoxes aSelBoxes( rBoxes );
-    SwTable &rTable = pTblNd->GetTable();
+    SwTable &rTable = pTableNd->GetTable();
     long nMin = 0;
     long nMax = 0;
     if( rTable.IsNewModel() )
@@ -1976,35 +1976,35 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
     }
 
     // Are we deleting the whole Table?
-    const sal_uLong nTmpIdx1 = pTblNd->GetIndex();
+    const sal_uLong nTmpIdx1 = pTableNd->GetIndex();
     const sal_uLong nTmpIdx2 = aSelBoxes.back()->GetSttNd()->EndOfSectionIndex() + 1;
-    if( pTblNd->GetTable().GetTabSortBoxes().size() == aSelBoxes.size() &&
+    if( pTableNd->GetTable().GetTabSortBoxes().size() == aSelBoxes.size() &&
         aSelBoxes[0]->GetSttIdx()-1 == nTmpIdx1 &&
-        nTmpIdx2 == pTblNd->EndOfSectionIndex() )
+        nTmpIdx2 == pTableNd->EndOfSectionIndex() )
     {
-        bool bNewTxtNd = false;
+        bool bNewTextNd = false;
         // Is it alone in a FlyFrame?
-        SwNodeIndex aIdx( *pTblNd, -1 );
+        SwNodeIndex aIdx( *pTableNd, -1 );
         const SwStartNode* pSttNd = aIdx.GetNode().GetStartNode();
         if( pSttNd )
         {
-            const sal_uLong nTblEnd = pTblNd->EndOfSectionIndex() + 1;
+            const sal_uLong nTableEnd = pTableNd->EndOfSectionIndex() + 1;
             const sal_uLong nSectEnd = pSttNd->EndOfSectionIndex();
-            if( nTblEnd == nSectEnd )
+            if( nTableEnd == nSectEnd )
             {
                 if( SwFlyStartNode == pSttNd->GetStartNodeType() )
                 {
-                    SwFrmFmt* pFmt = pSttNd->GetFlyFmt();
-                    if( pFmt )
+                    SwFrameFormat* pFormat = pSttNd->GetFlyFormat();
+                    if( pFormat )
                     {
                         // That's the FlyFormat we're looking for
-                        getIDocumentLayoutAccess().DelLayoutFmt( pFmt );
+                        getIDocumentLayoutAccess().DelLayoutFormat( pFormat );
                         return true;
                     }
                 }
                 // No Fly? Thus Header or Footer: always leave a TextNode
                 // We can forget about Undo then!
-                bNewTxtNd = true;
+                bNewTextNd = true;
             }
         }
 
@@ -2013,44 +2013,44 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
         if (GetIDocumentUndoRedo().DoesUndo())
         {
             GetIDocumentUndoRedo().ClearRedo();
-            SwPaM aPaM( *pTblNd->EndOfSectionNode(), aIdx.GetNode() );
+            SwPaM aPaM( *pTableNd->EndOfSectionNode(), aIdx.GetNode() );
 
-            if( bNewTxtNd )
+            if( bNewTextNd )
             {
-                const SwNodeIndex aTmpIdx( *pTblNd->EndOfSectionNode(), 1 );
-                GetNodes().MakeTxtNode( aTmpIdx,
-                            getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
+                const SwNodeIndex aTmpIdx( *pTableNd->EndOfSectionNode(), 1 );
+                GetNodes().MakeTextNode( aTmpIdx,
+                            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ) );
             }
 
             // Save the cursors (UNO and otherwise)
-            SwPaM aSavePaM( SwNodeIndex( *pTblNd->EndOfSectionNode() ) );
+            SwPaM aSavePaM( SwNodeIndex( *pTableNd->EndOfSectionNode() ) );
             if( ! aSavePaM.Move( fnMoveForward, fnGoNode ) )
             {
-                *aSavePaM.GetMark() = SwPosition( *pTblNd );
+                *aSavePaM.GetMark() = SwPosition( *pTableNd );
                 aSavePaM.Move( fnMoveBackward, fnGoNode );
             }
             {
-                SwPaM const tmpPaM(*pTblNd, *pTblNd->EndOfSectionNode());
+                SwPaM const tmpPaM(*pTableNd, *pTableNd->EndOfSectionNode());
                 ::PaMCorrAbs(tmpPaM, *aSavePaM.GetMark());
             }
 
             // Move hard PageBreaks to the succeeding Node
             bool bSavePageBreak = false, bSavePageDesc = false;
-            sal_uLong nNextNd = pTblNd->EndOfSectionIndex()+1;
-            SwCntntNode* pNextNd = GetNodes()[ nNextNd ]->GetCntntNode();
+            sal_uLong nNextNd = pTableNd->EndOfSectionIndex()+1;
+            SwContentNode* pNextNd = GetNodes()[ nNextNd ]->GetContentNode();
             if( pNextNd )
             {
                 {
-                    SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
+                    SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
                     const SfxPoolItem *pItem;
-                    if( SfxItemState::SET == pTableFmt->GetItemState( RES_PAGEDESC,
+                    if( SfxItemState::SET == pTableFormat->GetItemState( RES_PAGEDESC,
                         false, &pItem ) )
                     {
                         pNextNd->SetAttr( *pItem );
                         bSavePageDesc = true;
                     }
 
-                    if( SfxItemState::SET == pTableFmt->GetItemState( RES_BREAK,
+                    if( SfxItemState::SET == pTableFormat->GetItemState( RES_BREAK,
                         false, &pItem ) )
                     {
                         pNextNd->SetAttr( *pItem );
@@ -2059,60 +2059,60 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
                 }
             }
             SwUndoDelete* pUndo = new SwUndoDelete( aPaM );
-            if( bNewTxtNd )
-                pUndo->SetTblDelLastNd();
+            if( bNewTextNd )
+                pUndo->SetTableDelLastNd();
             pUndo->SetPgBrkFlags( bSavePageBreak, bSavePageDesc );
-            pUndo->SetTableName(pTblNd->GetTable().GetFrmFmt()->GetName());
+            pUndo->SetTableName(pTableNd->GetTable().GetFrameFormat()->GetName());
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
         else
         {
-            if( bNewTxtNd )
+            if( bNewTextNd )
             {
-                const SwNodeIndex aTmpIdx( *pTblNd->EndOfSectionNode(), 1 );
-                GetNodes().MakeTxtNode( aTmpIdx,
-                            getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
+                const SwNodeIndex aTmpIdx( *pTableNd->EndOfSectionNode(), 1 );
+                GetNodes().MakeTextNode( aTmpIdx,
+                            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ) );
             }
 
             // Save the cursors (UNO and otherwise)
-            SwPaM aSavePaM( SwNodeIndex( *pTblNd->EndOfSectionNode() ) );
+            SwPaM aSavePaM( SwNodeIndex( *pTableNd->EndOfSectionNode() ) );
             if( ! aSavePaM.Move( fnMoveForward, fnGoNode ) )
             {
-                *aSavePaM.GetMark() = SwPosition( *pTblNd );
+                *aSavePaM.GetMark() = SwPosition( *pTableNd );
                 aSavePaM.Move( fnMoveBackward, fnGoNode );
             }
             {
-                SwPaM const tmpPaM(*pTblNd, *pTblNd->EndOfSectionNode());
+                SwPaM const tmpPaM(*pTableNd, *pTableNd->EndOfSectionNode());
                 ::PaMCorrAbs(tmpPaM, *aSavePaM.GetMark());
             }
 
             // Move hard PageBreaks to the succeeding Node
-            SwCntntNode* pNextNd = GetNodes()[ pTblNd->EndOfSectionIndex()+1 ]->GetCntntNode();
+            SwContentNode* pNextNd = GetNodes()[ pTableNd->EndOfSectionIndex()+1 ]->GetContentNode();
             if( pNextNd )
             {
-                SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
+                SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
                 const SfxPoolItem *pItem;
-                if( SfxItemState::SET == pTableFmt->GetItemState( RES_PAGEDESC,
+                if( SfxItemState::SET == pTableFormat->GetItemState( RES_PAGEDESC,
                     false, &pItem ) )
                     pNextNd->SetAttr( *pItem );
 
-                if( SfxItemState::SET == pTableFmt->GetItemState( RES_BREAK,
+                if( SfxItemState::SET == pTableFormat->GetItemState( RES_BREAK,
                     false, &pItem ) )
                     pNextNd->SetAttr( *pItem );
             }
 
-            pTblNd->DelFrms();
-            getIDocumentContentOperations().DeleteSection( pTblNd );
+            pTableNd->DelFrms();
+            getIDocumentContentOperations().DeleteSection( pTableNd );
         }
         getIDocumentState().SetModified();
         getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
         return true;
     }
 
-    SwUndoTblNdsChg* pUndo = 0;
+    SwUndoTableNdsChg* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo = new SwUndoTblNdsChg( UNDO_TABLE_DELBOX, aSelBoxes, *pTblNd,
+        pUndo = new SwUndoTableNdsChg( UNDO_TABLE_DELBOX, aSelBoxes, *pTableNd,
                                      nMin, nMax, 0, false, false );
     }
 
@@ -2120,9 +2120,9 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
     {
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-        SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-        aMsgHnt.eFlags = TBL_BOXPTR;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+        aMsgHint.eFlags = TBL_BOXPTR;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
         if (rTable.IsNewModel())
         {
@@ -2156,27 +2156,27 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
 /**
  * Split up/merge Boxes in the Table
  */
-bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
+bool SwDoc::SplitTable( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
                       bool bSameHeight )
 {
     OSL_ENSURE( !rBoxes.empty() && nCnt, "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
-    SwTable& rTbl = pTblNd->GetTable();
-    if( rTbl.ISA( SwDDETable ))
+    SwTable& rTable = pTableNd->GetTable();
+    if( rTable.ISA( SwDDETable ))
         return false;
 
     std::vector<sal_uLong> aNdsCnts;
     SwTableSortBoxes aTmpLst;
-    SwUndoTblNdsChg* pUndo = 0;
+    SwUndoTableNdsChg* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo = new SwUndoTblNdsChg( UNDO_TABLE_SPLIT, rBoxes, *pTblNd, 0, 0,
+        pUndo = new SwUndoTableNdsChg( UNDO_TABLE_SPLIT, rBoxes, *pTableNd, 0, 0,
                                      nCnt, bVert, bSameHeight );
 
-        aTmpLst.insert( rTbl.GetTabSortBoxes() );
+        aTmpLst.insert( rTable.GetTabSortBoxes() );
         if( !bVert )
         {
             for (size_t n = 0; n < rBoxes.size(); ++n)
@@ -2192,14 +2192,14 @@ bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
     {
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-        SwTableFmlUpdate aMsgHnt( &rTbl );
-        aMsgHnt.eFlags = TBL_BOXPTR;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &rTable );
+        aMsgHint.eFlags = TBL_BOXPTR;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
         if (bVert)
-            bRet = rTbl.SplitCol( this, rBoxes, nCnt );
+            bRet = rTable.SplitCol( this, rBoxes, nCnt );
         else
-            bRet = rTbl.SplitRow( this, rBoxes, nCnt, bSameHeight );
+            bRet = rTable.SplitRow( this, rBoxes, nCnt, bSameHeight );
 
         if (bRet)
         {
@@ -2213,9 +2213,9 @@ bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
         if( bRet )
         {
             if( bVert )
-                pUndo->SaveNewBoxes( *pTblNd, aTmpLst );
+                pUndo->SaveNewBoxes( *pTableNd, aTmpLst );
             else
-                pUndo->SaveNewBoxes( *pTblNd, aTmpLst, rBoxes, aNdsCnts );
+                pUndo->SaveNewBoxes( *pTableNd, aTmpLst, rBoxes, aNdsCnts );
             GetIDocumentUndoRedo().AppendUndo( pUndo );
         }
         else
@@ -2225,13 +2225,13 @@ bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
     return bRet;
 }
 
-sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
+sal_uInt16 SwDoc::MergeTable( SwPaM& rPam )
 {
     // Check if the current cursor's Point/Mark are inside a Table
-    SwTableNode* pTblNd = rPam.GetNode().FindTableNode();
-    if( !pTblNd )
+    SwTableNode* pTableNd = rPam.GetNode().FindTableNode();
+    if( !pTableNd )
         return TBLMERGE_NOSELECTION;
-    SwTable& rTable = pTblNd->GetTable();
+    SwTable& rTable = pTableNd->GetTable();
     if( rTable.ISA(SwDDETable) )
         return TBLMERGE_NOSELECTION;
     sal_uInt16 nRet = TBLMERGE_NOSELECTION;
@@ -2249,8 +2249,8 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
     RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode();
     getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE));
 
-    SwUndoTblMerge *const pUndo( (GetIDocumentUndoRedo().DoesUndo())
-        ?   new SwUndoTblMerge( rPam )
+    SwUndoTableMerge *const pUndo( (GetIDocumentUndoRedo().DoesUndo())
+        ?   new SwUndoTableMerge( rPam )
         :   0 );
 
     // Find the Boxes via the Layout
@@ -2303,11 +2303,11 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
         }
 
         // Merge them
-        SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-        aMsgHnt.eFlags = TBL_BOXPTR;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+        aMsgHint.eFlags = TBL_BOXPTR;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
-        if( pTblNd->GetTable().Merge( this, aBoxes, aMerged, pMergeBox, pUndo ))
+        if( pTableNd->GetTable().Merge( this, aBoxes, aMerged, pMergeBox, pUndo ))
         {
             nRet = TBLMERGE_OK;
             getIDocumentState().SetModified();
@@ -2339,10 +2339,10 @@ SwTableNode::SwTableNode( const SwNodeIndex& rIdx )
 SwTableNode::~SwTableNode()
 {
     // Notify UNO wrappers
-    SwFrmFmt* pTblFmt = GetTable().GetFrmFmt();
+    SwFrameFormat* pTableFormat = GetTable().GetFrameFormat();
     SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT,
-                                pTblFmt );
-    pTblFmt->ModifyNotification( &aMsgHint, &aMsgHint );
+                                pTableFormat );
+    pTableFormat->ModifyNotification( &aMsgHint, &aMsgHint );
     DelFrms();
     delete pTable;
 }
@@ -2358,11 +2358,11 @@ SwTabFrm *SwTableNode::MakeFrm( SwFrm* pSib )
  */
 void SwTableNode::MakeFrms(const SwNodeIndex & rIdx )
 {
-    if( !GetTable().GetFrmFmt()->HasWriterListeners()) // Do we actually have Frame?
+    if( !GetTable().GetFrameFormat()->HasWriterListeners()) // Do we actually have Frame?
         return;
 
     SwFrm *pFrm;
-    SwCntntNode * pNode = rIdx.GetNode().GetCntntNode();
+    SwContentNode * pNode = rIdx.GetNode().GetContentNode();
 
     OSL_ENSURE( pNode, "No ContentNode or CopyNode and new Node is identical");
 
@@ -2384,7 +2384,7 @@ void SwTableNode::MakeFrms(const SwNodeIndex & rIdx )
 }
 
 /**
- * Create a TblFrm for every Shell and insert before the corresponding CntntFrm.
+ * Create a TableFrm for every Shell and insert before the corresponding ContentFrm.
  */
 void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind )
 {
@@ -2412,8 +2412,8 @@ void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind )
                  pViewShell->GetLayout()->IsAnyShellAccessible() )
             {
                 pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pNew->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pNew->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pNew->FindPrevCnt( true )) );
             }
         }
         pNew->RegistFlys();
@@ -2423,10 +2423,10 @@ void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind )
 void SwTableNode::DelFrms()
 {
     /* For a start, cut out and delete the TabFrms (which will also delete the Columns and Rows)
-       The TabFrms are attached to the FrmFmt of the SwTable.
+       The TabFrms are attached to the FrameFormat of the SwTable.
        We need to delete them in a more cumbersome way, for the Master to also delete the Follows. */
 
-    SwIterator<SwTabFrm,SwFmt> aIter( *(pTable->GetFrmFmt()) );
+    SwIterator<SwTabFrm,SwFormat> aIter( *(pTable->GetFrameFormat()) );
     SwTabFrm *pFrm = aIter.First();
     while ( pFrm )
     {
@@ -2447,8 +2447,8 @@ void SwTableNode::DelFrms()
                          pViewShell->GetLayout()->IsAnyShellAccessible() )
                     {
                         pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pFrm->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pFrm->FindPrevCnt( true )) );
                     }
                 }
                 pFrm->Cut();
@@ -2478,9 +2478,9 @@ void SwTableNode::RemoveRedlines()
     SwDoc* pDoc = GetDoc();
     if (pDoc)
     {
-        SwTable& rTbl = GetTable();
-        if ( pDoc->getIDocumentRedlineAccess().HasExtraRedlineTbl() )
-            pDoc->getIDocumentRedlineAccess().GetExtraRedlineTbl().DeleteAllTableRedlines( pDoc, rTbl, true, USHRT_MAX );
+        SwTable& rTable = GetTable();
+        if ( pDoc->getIDocumentRedlineAccess().HasExtraRedlineTable() )
+            pDoc->getIDocumentRedlineAccess().GetExtraRedlineTable().DeleteAllTableRedlines( pDoc, rTable, true, USHRT_MAX );
     }
 }
 
@@ -2497,7 +2497,7 @@ void SwDoc::GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
     }
     else if( pCrsr )
     {
-        const SwCntntNode* pCNd = pCrsr->GetCntntNode();
+        const SwContentNode* pCNd = pCrsr->GetContentNode();
         if( !pCNd )
             return ;
 
@@ -2573,16 +2573,16 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
 
     // #i39552# Collection of the boxes of the current
     // column has to be done at the beginning of this function, because
-    // the table may be formatted in ::GetTblSel.
+    // the table may be formatted in ::GetTableSel.
     SwDeletionChecker aDelCheck( pBoxFrm );
 
     SwSelBoxes aBoxes;
-    const SwCntntFrm* pCntnt = ::GetCellCntnt( *pBoxFrm );
-    if ( pCntnt && pCntnt->IsTxtFrm() )
+    const SwContentFrm* pContent = ::GetCellContent( *pBoxFrm );
+    if ( pContent && pContent->IsTextFrm() )
     {
-        const SwPosition aPos( *static_cast<const SwTxtFrm*>(pCntnt)->GetTxtNode() );
+        const SwPosition aPos( *static_cast<const SwTextFrm*>(pContent)->GetTextNode() );
         const SwCursor aTmpCrsr( aPos, 0, false );
-        ::GetTblSel( aTmpCrsr, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
+        ::GetTableSel( aTmpCrsr, aBoxes, nsSwTableSearchType::TBLSEARCH_COL );
     }
 
     // Make code robust:
@@ -2711,7 +2711,7 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
     }
     else if( pCrsr )
     {
-        const SwCntntNode* pCNd = pCrsr->GetCntntNode();
+        const SwContentNode* pCNd = pCrsr->GetContentNode();
         if( !pCNd )
             return ;
 
@@ -2738,22 +2738,22 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
     // If the Table is still using relative values (USHRT_MAX)
     // we need to switch to absolute ones.
     SwTable& rTab = *pTab->GetTable();
-    const SwFmtFrmSize& rTblFrmSz = rTab.GetFrmFmt()->GetFrmSize();
+    const SwFormatFrmSize& rTableFrmSz = rTab.GetFrameFormat()->GetFrmSize();
     SWRECTFN( pTab )
     // #i17174# - With fix for #i9040# the shadow size is taken
     // from the table width. Thus, add its left and right size to current table
     // printing area width in order to get the correct table size attribute.
     SwTwips nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)();
     {
-        SvxShadowItem aShadow( rTab.GetFrmFmt()->GetShadow() );
+        SvxShadowItem aShadow( rTab.GetFrameFormat()->GetShadow() );
         nPrtWidth += aShadow.CalcShadowSpace( SvxShadowItemSide::LEFT ) +
                      aShadow.CalcShadowSpace( SvxShadowItemSide::RIGHT );
     }
-    if( nPrtWidth != rTblFrmSz.GetWidth() )
+    if( nPrtWidth != rTableFrmSz.GetWidth() )
     {
-        SwFmtFrmSize aSz( rTblFrmSz );
+        SwFormatFrmSize aSz( rTableFrmSz );
         aSz.SetWidth( nPrtWidth );
-        rTab.GetFrmFmt()->SetFmtAttr( aSz );
+        rTab.GetFrameFormat()->SetFormatAttr( aSz );
     }
 
     SwTabCols aOld( rNew.Count() );
@@ -2833,12 +2833,12 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor*
         const long nDiff = nNewRowHeight - nOldRowHeight;
         if ( std::abs( nDiff ) >= ROWFUZZY )
         {
-            // For the old table model pTxtFrm and pLine will be set for every box.
-            // For the new table model pTxtFrm will be set if the box is not covered,
+            // For the old table model pTextFrm and pLine will be set for every box.
+            // For the new table model pTextFrm will be set if the box is not covered,
             // but the pLine will be set if the box is not an overlapping box
             // In the new table model the row height can be adjusted,
             // when both variables are set.
-            const SwTxtFrm* pTxtFrm = 0;
+            const SwTextFrm* pTextFrm = 0;
             const SwTableLine* pLine = 0;
 
             // Iterate over all SwCellFrms with Bottom = nOldPos
@@ -2853,20 +2853,20 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor*
                     {
                         if ( !bCurColOnly || pFrm == pBoxFrm )
                         {
-                            const SwFrm* pCntnt = ::GetCellCntnt( static_cast<const SwCellFrm&>(*pFrm) );
+                            const SwFrm* pContent = ::GetCellContent( static_cast<const SwCellFrm&>(*pFrm) );
 
-                            if ( pCntnt && pCntnt->IsTxtFrm() )
+                            if ( pContent && pContent->IsTextFrm() )
                             {
                                 const SwTableBox* pBox = static_cast<const SwCellFrm*>(pFrm)->GetTabBox();
                                 const long nRowSpan = pBox->getRowSpan();
                                 if( nRowSpan > 0 ) // Not overlapped
-                                    pTxtFrm = static_cast<const SwTxtFrm*>(pCntnt);
+                                    pTextFrm = static_cast<const SwTextFrm*>(pContent);
                                 if( nRowSpan < 2 ) // Not overlapping for row height
                                     pLine = pBox->GetUpper();
-                                if( pLine && pTxtFrm ) // always for old table model
+                                if( pLine && pTextFrm ) // always for old table model
                                 {
                                     // The new row height must not to be calculated from a overlapping box
-                                    SwFmtFrmSize aNew( pLine->GetFrmFmt()->GetFrmSize() );
+                                    SwFormatFrmSize aNew( pLine->GetFrameFormat()->GetFrmSize() );
                                     const long nNewSize = (pFrm->Frm().*fnRect->fnGetHeight)() + nDiff;
                                     if( nNewSize != aNew.GetHeight() )
                                     {
@@ -2874,7 +2874,7 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor*
                                         if ( ATT_VAR_SIZE == aNew.GetHeightSizeType() )
                                             aNew.SetHeightSizeType( ATT_MIN_SIZE );
                                         // This position must not be in an overlapped box
-                                        const SwPosition aPos( *static_cast<const SwTxtFrm*>(pCntnt)->GetTxtNode() );
+                                        const SwPosition aPos( *static_cast<const SwTextFrm*>(pContent)->GetTextNode() );
                                         const SwCursor aTmpCrsr( aPos, 0, false );
                                         SetRowHeight( aTmpCrsr, aNew );
                                         // For the new table model we're done, for the old one
@@ -2907,7 +2907,7 @@ void SwDoc::SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rO
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoAttrTbl( *rTab.GetTableNode(), true ));
+            new SwUndoAttrTable( *rTab.GetTableNode(), true ));
     }
     rTab.SetTabCols( rNew, rOld, pStart, bCurRowOnly );
       ::ClearFEShellTabCols();
@@ -2922,30 +2922,30 @@ void SwDoc::SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet )
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoTblHeadline(rTable, rTable.GetRowsToRepeat(), nSet) );
+            new SwUndoTableHeadline(rTable, rTable.GetRowsToRepeat(), nSet) );
     }
 
     SwMsgPoolItem aChg( RES_TBLHEADLINECHG );
     rTable.SetRowsToRepeat( nSet );
-    rTable.GetFrmFmt()->ModifyNotification( &aChg, &aChg );
+    rTable.GetFrameFormat()->ModifyNotification( &aChg, &aChg );
     getIDocumentState().SetModified();
 }
 
-void SwCollectTblLineBoxes::AddToUndoHistory( const SwCntntNode& rNd )
+void SwCollectTableLineBoxes::AddToUndoHistory( const SwContentNode& rNd )
 {
     if( pHst )
-        pHst->Add( rNd.GetFmtColl(), rNd.GetIndex(), ND_TEXTNODE );
+        pHst->Add( rNd.GetFormatColl(), rNd.GetIndex(), ND_TEXTNODE );
 }
 
-void SwCollectTblLineBoxes::AddBox( const SwTableBox& rBox )
+void SwCollectTableLineBoxes::AddBox( const SwTableBox& rBox )
 {
     aPosArr.push_back(nWidth);
     SwTableBox* p = const_cast<SwTableBox*>(&rBox);
     m_Boxes.push_back(p);
-    nWidth = nWidth + (sal_uInt16)rBox.GetFrmFmt()->GetFrmSize().GetWidth();
+    nWidth = nWidth + (sal_uInt16)rBox.GetFrameFormat()->GetFrmSize().GetWidth();
 }
 
-const SwTableBox* SwCollectTblLineBoxes::GetBoxOfPos( const SwTableBox& rBox )
+const SwTableBox* SwCollectTableLineBoxes::GetBoxOfPos( const SwTableBox& rBox )
 {
     const SwTableBox* pRet = 0;
 
@@ -2965,13 +2965,13 @@ const SwTableBox* SwCollectTblLineBoxes::GetBoxOfPos( const SwTableBox& rBox )
         if( n >= aPosArr.size() )
             --n;
 
-        nWidth = nWidth + (sal_uInt16)rBox.GetFrmFmt()->GetFrmSize().GetWidth();
+        nWidth = nWidth + (sal_uInt16)rBox.GetFrameFormat()->GetFrmSize().GetWidth();
         pRet = m_Boxes[ n ];
     }
     return pRet;
 }
 
-bool SwCollectTblLineBoxes::Resize( sal_uInt16 nOffset, sal_uInt16 nOldWidth )
+bool SwCollectTableLineBoxes::Resize( sal_uInt16 nOffset, sal_uInt16 nOldWidth )
 {
     if( !aPosArr.empty() )
     {
@@ -3012,7 +3012,7 @@ bool SwCollectTblLineBoxes::Resize( sal_uInt16 nOffset, sal_uInt16 nOldWidth )
 
 bool sw_Line_CollectBox( const SwTableLine*& rpLine, void* pPara )
 {
-    SwCollectTblLineBoxes* pSplPara = static_cast<SwCollectTblLineBoxes*>(pPara);
+    SwCollectTableLineBoxes* pSplPara = static_cast<SwCollectTableLineBoxes*>(pPara);
     if( pSplPara->IsGetValues() )
         for( SwTableBoxes::iterator it = const_cast<SwTableLine*>(rpLine)->GetTabBoxes().begin();
                  it != const_cast<SwTableLine*>(rpLine)->GetTabBoxes().end(); ++it)
@@ -3020,11 +3020,11 @@ bool sw_Line_CollectBox( const SwTableLine*& rpLine, void* pPara )
     else
         for( SwTableBoxes::iterator it = const_cast<SwTableLine*>(rpLine)->GetTabBoxes().begin();
                  it != const_cast<SwTableLine*>(rpLine)->GetTabBoxes().end(); ++it)
-            sw_BoxSetSplitBoxFmts(*it, pSplPara );
+            sw_BoxSetSplitBoxFormats(*it, pSplPara );
     return true;
 }
 
-void sw_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
+void sw_Box_CollectBox( const SwTableBox* pBox, SwCollectTableLineBoxes* pSplPara )
 {
     auto nLen = pBox->GetTabLines().size();
     if( nLen )
@@ -3042,7 +3042,7 @@ void sw_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara
         pSplPara->AddBox( *pBox );
 }
 
-void sw_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
+void sw_BoxSetSplitBoxFormats( SwTableBox* pBox, SwCollectTableLineBoxes* pSplPara )
 {
     auto nLen = pBox->GetTabLines().size();
     if( nLen )
@@ -3059,17 +3059,17 @@ void sw_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
     else
     {
         const SwTableBox* pSrcBox = pSplPara->GetBoxOfPos( *pBox );
-        SwFrmFmt* pFmt = pSrcBox->GetFrmFmt();
+        SwFrameFormat* pFormat = pSrcBox->GetFrameFormat();
 
         if( HEADLINE_BORDERCOPY == pSplPara->GetMode() )
         {
-            const SvxBoxItem& rBoxItem = pBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rBoxItem = pBox->GetFrameFormat()->GetBox();
             if( !rBoxItem.GetTop() )
             {
                 SvxBoxItem aNew( rBoxItem );
-                aNew.SetLine( pFmt->GetBox().GetBottom(), SvxBoxItemLine::TOP );
+                aNew.SetLine( pFormat->GetBox().GetBottom(), SvxBoxItemLine::TOP );
                 if( aNew != rBoxItem )
-                    pBox->ClaimFrmFmt()->SetFmtAttr( aNew );
+                    pBox->ClaimFrameFormat()->SetFormatAttr( aNew );
             }
         }
         else
@@ -3081,27 +3081,27 @@ void sw_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara )
                 RES_VERT_ORIENT,    RES_VERT_ORIENT,
                 0 };
 
-            SfxItemSet aTmpSet( pFmt->GetDoc()->GetAttrPool(),
+            SfxItemSet aTmpSet( pFormat->GetDoc()->GetAttrPool(),
                                 aTableSplitBoxSetRange );
-            aTmpSet.Put( pFmt->GetAttrSet() );
+            aTmpSet.Put( pFormat->GetAttrSet() );
             if( aTmpSet.Count() )
-                pBox->ClaimFrmFmt()->SetFmtAttr( aTmpSet );
+                pBox->ClaimFrameFormat()->SetFormatAttr( aTmpSet );
 
             if( HEADLINE_BOXATRCOLLCOPY == pSplPara->GetMode() )
             {
                 SwNodeIndex aIdx( *pSrcBox->GetSttNd(), 1 );
-                SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if( !pCNd )
                     pCNd = aIdx.GetNodes().GoNext( &aIdx );
                 aIdx = *pBox->GetSttNd();
-                SwCntntNode* pDNd = aIdx.GetNodes().GoNext( &aIdx );
+                SwContentNode* pDNd = aIdx.GetNodes().GoNext( &aIdx );
 
                 // If the Node is alone in the Section
                 if( 2 == pDNd->EndOfSectionIndex() -
                         pDNd->StartOfSectionIndex() )
                 {
                     pSplPara->AddToUndoHistory( *pDNd );
-                    pDNd->ChgFmtColl( pCNd->GetFmtColl() );
+                    pDNd->ChgFormatColl( pCNd->GetFormatColl() );
                 }
             }
 
@@ -3131,22 +3131,22 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
     if( pTNd->GetTable().ISA( SwDDETable ))
         return false;
 
-    SwTable& rTbl = pTNd->GetTable();
-    rTbl.SetHTMLTableLayout( 0 ); // Delete HTML Layout
+    SwTable& rTable = pTNd->GetTable();
+    rTable.SetHTMLTableLayout( 0 ); // Delete HTML Layout
 
-    SwTableFmlUpdate aMsgHnt( &rTbl );
+    SwTableFormulaUpdate aMsgHint( &rTable );
 
     SwHistory aHistory;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        aMsgHnt.pHistory = &aHistory;
+        aMsgHint.pHistory = &aHistory;
     }
 
     {
         sal_uLong nSttIdx = pNd->FindTableBoxStartNode()->GetIndex();
 
         // Find top-level Line
-        SwTableBox* pBox = rTbl.GetTblBox( nSttIdx );
+        SwTableBox* pBox = rTable.GetTableBox( nSttIdx );
         if( pBox )
         {
             SwTableLine* pLine = pBox->GetUpper();
@@ -3154,29 +3154,29 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
                 pLine = pLine->GetUpper()->GetUpper();
 
             // pLine contains the top-level Line now
-            aMsgHnt.nSplitLine = rTbl.GetTabLines().GetPos( pLine );
+            aMsgHint.nSplitLine = rTable.GetTabLines().GetPos( pLine );
         }
 
-        OUString sNewTblNm( GetUniqueTblName() );
-        aMsgHnt.DATA.pNewTblNm = &sNewTblNm;
-        aMsgHnt.eFlags = TBL_SPLITTBL;
-        getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+        OUString sNewTableNm( GetUniqueTableName() );
+        aMsgHint.DATA.pNewTableNm = &sNewTableNm;
+        aMsgHint.eFlags = TBL_SPLITTBL;
+        getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
     // Find Lines for the Layout update
     _FndBox aFndBox( 0, 0 );
-    aFndBox.SetTableLines( rTbl );
-    aFndBox.DelFrms( rTbl );
+    aFndBox.SetTableLines( rTable );
+    aFndBox.DelFrms( rTable );
 
     SwTableNode* pNew = GetNodes().SplitTable( rPos.nNode, false, bCalcNewSize );
 
     if( pNew )
     {
-        SwSaveRowSpan* pSaveRowSp = pNew->GetTable().CleanUpTopRowSpan( rTbl.GetTabLines().size() );
-        SwUndoSplitTbl* pUndo = 0;
+        SwSaveRowSpan* pSaveRowSp = pNew->GetTable().CleanUpTopRowSpan( rTable.GetTabLines().size() );
+        SwUndoSplitTable* pUndo = 0;
         if (GetIDocumentUndoRedo().DoesUndo())
         {
-            pUndo = new SwUndoSplitTbl(
+            pUndo = new SwUndoSplitTable(
                         *pNew, pSaveRowSp, eHdlnMode, bCalcNewSize);
             GetIDocumentUndoRedo().AppendUndo(pUndo);
             if( aHistory.Count() )
@@ -3189,9 +3189,9 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
         // the upper Border of the current one
         case HEADLINE_BORDERCOPY:
             {
-                SwCollectTblLineBoxes aPara( false, eHdlnMode );
-                SwTableLine* pLn = rTbl.GetTabLines()[
-                            rTbl.GetTabLines().size() - 1 ];
+                SwCollectTableLineBoxes aPara( false, eHdlnMode );
+                SwTableLine* pLn = rTable.GetTabLines()[
+                            rTable.GetTabLines().size() - 1 ];
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
                     sw_Box_CollectBox(*it, &aPara );
@@ -3200,7 +3200,7 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
                 pLn = pNew->GetTable().GetTabLines()[ 0 ];
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
-                    sw_BoxSetSplitBoxFmts(*it, &aPara );
+                    sw_BoxSetSplitBoxFormats(*it, &aPara );
 
                 // Switch off repeating Header
                 pNew->GetTable().SetRowsToRepeat( 0 );
@@ -3215,8 +3215,8 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
                 if( HEADLINE_BOXATRCOLLCOPY == eHdlnMode && pUndo )
                     pHst = pUndo->GetHistory();
 
-                SwCollectTblLineBoxes aPara( true, eHdlnMode, pHst );
-                SwTableLine* pLn = rTbl.GetTabLines()[ 0 ];
+                SwCollectTableLineBoxes aPara( true, eHdlnMode, pHst );
+                SwTableLine* pLn = rTable.GetTabLines()[ 0 ];
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
                     sw_Box_CollectBox(*it, &aPara );
@@ -3225,14 +3225,14 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
                 pLn = pNew->GetTable().GetTabLines()[ 0 ];
                 for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
                          it != pLn->GetTabBoxes().end(); ++it)
-                    sw_BoxSetSplitBoxFmts(*it, &aPara );
+                    sw_BoxSetSplitBoxFormats(*it, &aPara );
             }
             break;
 
         case HEADLINE_CNTNTCOPY:
-            rTbl.CopyHeadlineIntoTable( *pNew );
+            rTable.CopyHeadlineIntoTable( *pNew );
             if( pUndo )
-                pUndo->SetTblNodeOffset( pNew->GetIndex() );
+                pUndo->SetTableNodeOffset( pNew->GetIndex() );
             break;
 
         case HEADLINE_NONE:
@@ -3247,78 +3247,78 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
         pNew->MakeFrms( &aNdIdx );
 
         // Insert a paragraph between the Table
-        GetNodes().MakeTxtNode( SwNodeIndex( *pNew ),
-                                getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ) );
+        GetNodes().MakeTextNode( SwNodeIndex( *pNew ),
+                                getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ) );
     }
 
     // Update Layout
-    aFndBox.MakeFrms( rTbl );
+    aFndBox.MakeFrms( rTable );
 
     // TL_CHART2: need to inform chart of probably changed cell names
-    UpdateCharts( rTbl.GetFrmFmt()->GetName() );
+    UpdateCharts( rTable.GetFrameFormat()->GetName() );
 
     getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
 
     return 0 != pNew;
 }
 
-static bool lcl_ChgTblSize( SwTable& rTbl )
+static bool lcl_ChgTableSize( SwTable& rTable )
 {
     // The Attribute must not be set via the Modify or else all Boxes are
     // set back to 0.
     // So lock the Format.
-    SwFrmFmt* pFmt = rTbl.GetFrmFmt();
-    SwFmtFrmSize aTblMaxSz( pFmt->GetFrmSize() );
+    SwFrameFormat* pFormat = rTable.GetFrameFormat();
+    SwFormatFrmSize aTableMaxSz( pFormat->GetFrmSize() );
 
-    if( USHRT_MAX == aTblMaxSz.GetWidth() )
+    if( USHRT_MAX == aTableMaxSz.GetWidth() )
         return false;
 
-    bool bLocked = pFmt->IsModifyLocked();
-    pFmt->LockModify();
+    bool bLocked = pFormat->IsModifyLocked();
+    pFormat->LockModify();
 
-    aTblMaxSz.SetWidth( 0 );
+    aTableMaxSz.SetWidth( 0 );
 
-    SwTableLines& rLns = rTbl.GetTabLines();
+    SwTableLines& rLns = rTable.GetTabLines();
     for( auto pLn : rLns )
     {
         SwTwips nMaxLnWidth = 0;
         SwTableBoxes& rBoxes = pLn->GetTabBoxes();
         for( auto pBox : rBoxes )
-            nMaxLnWidth += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+            nMaxLnWidth += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
 
-        if( nMaxLnWidth > aTblMaxSz.GetWidth() )
-            aTblMaxSz.SetWidth( nMaxLnWidth );
+        if( nMaxLnWidth > aTableMaxSz.GetWidth() )
+            aTableMaxSz.SetWidth( nMaxLnWidth );
     }
-    pFmt->SetFmtAttr( aTblMaxSz );
+    pFormat->SetFormatAttr( aTableMaxSz );
     if( !bLocked ) // Release the Lock if appropriate
-        pFmt->UnlockModify();
+        pFormat->UnlockModify();
 
     return true;
 }
 
 class _SplitTable_Para
 {
-    std::map<SwFrmFmt*, SwFrmFmt*> aSrcDestMap;
-    SwTableNode* pNewTblNd;
-    SwTable& rOldTbl;
+    std::map<SwFrameFormat*, SwFrameFormat*> aSrcDestMap;
+    SwTableNode* pNewTableNd;
+    SwTable& rOldTable;
 
 public:
     _SplitTable_Para( SwTableNode* pNew, SwTable& rOld )
-        : aSrcDestMap(), pNewTblNd( pNew ), rOldTbl( rOld )
+        : aSrcDestMap(), pNewTableNd( pNew ), rOldTable( rOld )
     {}
-    SwFrmFmt* GetDestFmt( SwFrmFmt* pSrcFmt ) const
+    SwFrameFormat* GetDestFormat( SwFrameFormat* pSrcFormat ) const
     {
-        std::map<SwFrmFmt*, SwFrmFmt*>::const_iterator it = aSrcDestMap.find( pSrcFmt );
+        std::map<SwFrameFormat*, SwFrameFormat*>::const_iterator it = aSrcDestMap.find( pSrcFormat );
         return it == aSrcDestMap.end() ? NULL : it->second;
     }
 
-    void InsertSrcDest( SwFrmFmt* pSrcFmt, SwFrmFmt* pDestFmt )
-            { aSrcDestMap[ pSrcFmt ] = pDestFmt; }
+    void InsertSrcDest( SwFrameFormat* pSrcFormat, SwFrameFormat* pDestFormat )
+            { aSrcDestMap[ pSrcFormat ] = pDestFormat; }
 
     void ChgBox( SwTableBox* pBox )
     {
-        rOldTbl.GetTabSortBoxes().erase( pBox );
-        pNewTblNd->GetTable().GetTabSortBoxes().insert( pBox );
+        rOldTable.GetTabSortBoxes().erase( pBox );
+        pNewTableNd->GetTable().GetTabSortBoxes().insert( pBox );
     }
 };
 
@@ -3326,14 +3326,14 @@ static void lcl_SplitTable_CpyBox( SwTableBox* pBox, _SplitTable_Para* pPara );
 
 static void lcl_SplitTable_CpyLine( SwTableLine* pLn, _SplitTable_Para* pPara )
 {
-    SwFrmFmt *pSrcFmt = pLn->GetFrmFmt();
-    SwTableLineFmt* pDestFmt = static_cast<SwTableLineFmt*>( pPara->GetDestFmt( pSrcFmt ) );
-    if( pDestFmt == NULL )
+    SwFrameFormat *pSrcFormat = pLn->GetFrameFormat();
+    SwTableLineFormat* pDestFormat = static_cast<SwTableLineFormat*>( pPara->GetDestFormat( pSrcFormat ) );
+    if( pDestFormat == NULL )
     {
-        pPara->InsertSrcDest( pSrcFmt, pLn->ClaimFrmFmt() );
+        pPara->InsertSrcDest( pSrcFormat, pLn->ClaimFrameFormat() );
     }
     else
-        pLn->ChgFrmFmt( pDestFmt );
+        pLn->ChgFrameFormat( pDestFormat );
 
     for( SwTableBoxes::iterator it = pLn->GetTabBoxes().begin();
              it != pLn->GetTabBoxes().end(); ++it)
@@ -3342,14 +3342,14 @@ static void lcl_SplitTable_CpyLine( SwTableLine* pLn, _SplitTable_Para* pPara )
 
 static void lcl_SplitTable_CpyBox( SwTableBox* pBox, _SplitTable_Para* pPara )
 {
-    SwFrmFmt *pSrcFmt = pBox->GetFrmFmt();
-    SwTableBoxFmt* pDestFmt = static_cast<SwTableBoxFmt*>(pPara->GetDestFmt( pSrcFmt ));
-    if( pDestFmt == NULL )
+    SwFrameFormat *pSrcFormat = pBox->GetFrameFormat();
+    SwTableBoxFormat* pDestFormat = static_cast<SwTableBoxFormat*>(pPara->GetDestFormat( pSrcFormat ));
+    if( pDestFormat == NULL )
     {
-        pPara->InsertSrcDest( pSrcFmt, pBox->ClaimFrmFmt() );
+        pPara->InsertSrcDest( pSrcFormat, pBox->ClaimFrameFormat() );
     }
     else
-        pBox->ChgFrmFmt( pDestFmt );
+        pBox->ChgFrameFormat( pDestFormat );
 
     if( pBox->GetSttNd() )
         pPara->ChgBox( pBox );
@@ -3369,8 +3369,8 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, bool bAfter,
     sal_uLong nSttIdx = pNd->FindTableBoxStartNode()->GetIndex();
 
     // Find this Box/top-level line
-    SwTable& rTbl = pTNd->GetTable();
-    SwTableBox* pBox = rTbl.GetTblBox( nSttIdx );
+    SwTable& rTable = pTNd->GetTable();
+    SwTableBox* pBox = rTable.GetTableBox( nSttIdx );
     if( !pBox )
         return 0;
 
@@ -3379,95 +3379,95 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, bool bAfter,
         pLine = pLine->GetUpper()->GetUpper();
 
     // pLine now contains the top-level line
-    sal_uInt16 nLinePos = rTbl.GetTabLines().GetPos( pLine );
+    sal_uInt16 nLinePos = rTable.GetTabLines().GetPos( pLine );
     if( USHRT_MAX == nLinePos ||
-        ( bAfter ? ++nLinePos >= rTbl.GetTabLines().size() : !nLinePos ))
+        ( bAfter ? ++nLinePos >= rTable.GetTabLines().size() : !nLinePos ))
         return 0; // Not found or last Line!
 
     // Find the first Box of the succeeding Line
-    SwTableLine* pNextLine = rTbl.GetTabLines()[ nLinePos ];
+    SwTableLine* pNextLine = rTable.GetTabLines()[ nLinePos ];
     pBox = pNextLine->GetTabBoxes()[0];
     while( !pBox->GetSttNd() )
         pBox = pBox->GetTabLines()[0]->GetTabBoxes()[0];
 
     // Insert an EndNode and TableNode into the Nodes Array
-    SwTableNode * pNewTblNd;
+    SwTableNode * pNewTableNd;
     {
-        SwEndNode* pOldTblEndNd = pTNd->EndOfSectionNode()->GetEndNode();
-        OSL_ENSURE( pOldTblEndNd, "Where is the EndNode?" );
+        SwEndNode* pOldTableEndNd = pTNd->EndOfSectionNode()->GetEndNode();
+        OSL_ENSURE( pOldTableEndNd, "Where is the EndNode?" );
 
         SwNodeIndex aIdx( *pBox->GetSttNd() );
         new SwEndNode( aIdx, *pTNd );
-        pNewTblNd = new SwTableNode( aIdx );
-        pNewTblNd->GetTable().SetTableModel( rTbl.IsNewModel() );
+        pNewTableNd = new SwTableNode( aIdx );
+        pNewTableNd->GetTable().SetTableModel( rTable.IsNewModel() );
 
-        pOldTblEndNd->pStartOfSection = pNewTblNd;
-        pNewTblNd->pEndOfSection = pOldTblEndNd;
+        pOldTableEndNd->pStartOfSection = pNewTableNd;
+        pNewTableNd->pEndOfSection = pOldTableEndNd;
 
         SwNode* pBoxNd = aIdx.GetNode().GetStartNode();
         do {
             OSL_ENSURE( pBoxNd->IsStartNode(), "This needs to be a StartNode!" );
-            pBoxNd->pStartOfSection = pNewTblNd;
+            pBoxNd->pStartOfSection = pNewTableNd;
             pBoxNd = (*this)[ pBoxNd->EndOfSectionIndex() + 1 ];
-        } while( pBoxNd != pOldTblEndNd );
+        } while( pBoxNd != pOldTableEndNd );
     }
 
     {
         // Move the Lines
-        SwTable& rNewTbl = pNewTblNd->GetTable();
-        rNewTbl.GetTabLines().insert( rNewTbl.GetTabLines().begin(),
-                      rTbl.GetTabLines().begin() + nLinePos, rTbl.GetTabLines().end() );
+        SwTable& rNewTable = pNewTableNd->GetTable();
+        rNewTable.GetTabLines().insert( rNewTable.GetTabLines().begin(),
+                      rTable.GetTabLines().begin() + nLinePos, rTable.GetTabLines().end() );
 
         /* From the back (bottom right) to the front (top left) deregister all Boxes from the
            Chart Data Provider. The Modify event is triggered in the calling function.
          TL_CHART2: */
-        SwChartDataProvider *pPCD = rTbl.GetFrmFmt()->getIDocumentChartDataProviderAccess()->GetChartDataProvider();
+        SwChartDataProvider *pPCD = rTable.GetFrameFormat()->getIDocumentChartDataProviderAccess()->GetChartDataProvider();
         if( pPCD )
         {
-            for (SwTableLines::size_type k = nLinePos;  k < rTbl.GetTabLines().size(); ++k)
+            for (SwTableLines::size_type k = nLinePos;  k < rTable.GetTabLines().size(); ++k)
             {
-                const SwTableLines::size_type nLineIdx = (rTbl.GetTabLines().size() - 1) - k + nLinePos;
-                const SwTableBoxes::size_type nBoxCnt = rTbl.GetTabLines()[ nLineIdx ]->GetTabBoxes().size();
+                const SwTableLines::size_type nLineIdx = (rTable.GetTabLines().size() - 1) - k + nLinePos;
+                const SwTableBoxes::size_type nBoxCnt = rTable.GetTabLines()[ nLineIdx ]->GetTabBoxes().size();
                 for (SwTableBoxes::size_type j = 0;  j < nBoxCnt;  ++j)
                 {
                     const SwTableBoxes::size_type nIdx = nBoxCnt - 1 - j;
-                    pPCD->DeleteBox( &rTbl, *rTbl.GetTabLines()[ nLineIdx ]->GetTabBoxes()[nIdx] );
+                    pPCD->DeleteBox( &rTable, *rTable.GetTabLines()[ nLineIdx ]->GetTabBoxes()[nIdx] );
                 }
             }
         }
 
         // Delete
-        sal_uInt16 nDeleted = rTbl.GetTabLines().size() - nLinePos;
-        rTbl.GetTabLines().erase( rTbl.GetTabLines().begin() + nLinePos, rTbl.GetTabLines().end() );
+        sal_uInt16 nDeleted = rTable.GetTabLines().size() - nLinePos;
+        rTable.GetTabLines().erase( rTable.GetTabLines().begin() + nLinePos, rTable.GetTabLines().end() );
 
         // Move the affected Boxes. Make the Formats unique and correct the StartNodes
-        _SplitTable_Para aPara( pNewTblNd, rTbl );
-        for( SwTableLine* pNewLine : rNewTbl.GetTabLines() )
+        _SplitTable_Para aPara( pNewTableNd, rTable );
+        for( SwTableLine* pNewLine : rNewTable.GetTabLines() )
             lcl_SplitTable_CpyLine( pNewLine, &aPara );
-        rTbl.CleanUpBottomRowSpan( nDeleted );
+        rTable.CleanUpBottomRowSpan( nDeleted );
     }
 
     {
         // Copy the Table FrmFormat
-        SwFrmFmt* pOldTblFmt = rTbl.GetFrmFmt();
-        SwFrmFmt* pNewTblFmt = pOldTblFmt->GetDoc()->MakeTblFrmFmt(
-                                pOldTblFmt->GetDoc()->GetUniqueTblName(),
-                                pOldTblFmt->GetDoc()->GetDfltFrmFmt() );
+        SwFrameFormat* pOldTableFormat = rTable.GetFrameFormat();
+        SwFrameFormat* pNewTableFormat = pOldTableFormat->GetDoc()->MakeTableFrameFormat(
+                                pOldTableFormat->GetDoc()->GetUniqueTableName(),
+                                pOldTableFormat->GetDoc()->GetDfltFrameFormat() );
 
-        *pNewTblFmt = *pOldTblFmt;
-        pNewTblNd->GetTable().RegisterToFormat( *pNewTblFmt );
+        *pNewTableFormat = *pOldTableFormat;
+        pNewTableNd->GetTable().RegisterToFormat( *pNewTableFormat );
 
         // Calculate a new Size?
-        // lcl_ChgTblSize: Only execute the second call if the first call was
+        // lcl_ChgTableSize: Only execute the second call if the first call was
         // successful, thus has an absolute Size
-        if( bCalcNewSize && lcl_ChgTblSize( rTbl ) )
-            lcl_ChgTblSize( pNewTblNd->GetTable() );
+        if( bCalcNewSize && lcl_ChgTableSize( rTable ) )
+            lcl_ChgTableSize( pNewTableNd->GetTable() );
     }
 
     // TL_CHART2: need to inform chart of probably changed cell names
-    rTbl.UpdateCharts();
+    rTable.UpdateCharts();
 
-    return pNewTblNd; // That's it!
+    return pNewTableNd; // That's it!
 }
 
 /**
@@ -3478,45 +3478,45 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, bool bAfter,
  */
 bool SwDoc::MergeTable( const SwPosition& rPos, bool bWithPrev, sal_uInt16 nMode )
 {
-    SwTableNode* pTblNd = rPos.nNode.GetNode().FindTableNode(), *pDelTblNd;
-    if( !pTblNd )
+    SwTableNode* pTableNd = rPos.nNode.GetNode().FindTableNode(), *pDelTableNd;
+    if( !pTableNd )
         return false;
 
     SwNodes& rNds = GetNodes();
     if( bWithPrev )
-        pDelTblNd = rNds[ pTblNd->GetIndex() - 1 ]->FindTableNode();
+        pDelTableNd = rNds[ pTableNd->GetIndex() - 1 ]->FindTableNode();
     else
-        pDelTblNd = rNds[ pTblNd->EndOfSectionIndex() + 1 ]->GetTableNode();
-    if( !pDelTblNd )
+        pDelTableNd = rNds[ pTableNd->EndOfSectionIndex() + 1 ]->GetTableNode();
+    if( !pDelTableNd )
         return false;
 
-    if( pTblNd->GetTable().ISA( SwDDETable ) ||
-        pDelTblNd->GetTable().ISA( SwDDETable ))
+    if( pTableNd->GetTable().ISA( SwDDETable ) ||
+        pDelTableNd->GetTable().ISA( SwDDETable ))
         return false;
 
     // Delete HTML Layout
-    pTblNd->GetTable().SetHTMLTableLayout( 0 );
-    pDelTblNd->GetTable().SetHTMLTableLayout( 0 );
+    pTableNd->GetTable().SetHTMLTableLayout( 0 );
+    pDelTableNd->GetTable().SetHTMLTableLayout( 0 );
 
     // Both Tables are present; we can start
-    SwUndoMergeTbl* pUndo = 0;
+    SwUndoMergeTable* pUndo = 0;
     SwHistory* pHistory = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo = new SwUndoMergeTbl( *pTblNd, *pDelTblNd, bWithPrev, nMode );
+        pUndo = new SwUndoMergeTable( *pTableNd, *pDelTableNd, bWithPrev, nMode );
         GetIDocumentUndoRedo().AppendUndo(pUndo);
         pHistory = new SwHistory;
     }
 
     // Adapt all "TableFormulas"
-    SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-    aMsgHnt.DATA.pDelTbl = &pDelTblNd->GetTable();
-    aMsgHnt.eFlags = TBL_MERGETBL;
-    aMsgHnt.pHistory = pHistory;
-    getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+    aMsgHint.DATA.pDelTable = &pDelTableNd->GetTable();
+    aMsgHint.eFlags = TBL_MERGETBL;
+    aMsgHint.pHistory = pHistory;
+    getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     // The actual merge
-    SwNodeIndex aIdx( bWithPrev ? *pTblNd : *pDelTblNd );
+    SwNodeIndex aIdx( bWithPrev ? *pTableNd : *pDelTableNd );
     bool bRet = rNds.MergeTable( aIdx, !bWithPrev, nMode, pHistory );
 
     if( pHistory )
@@ -3536,40 +3536,40 @@ bool SwDoc::MergeTable( const SwPosition& rPos, bool bWithPrev, sal_uInt16 nMode
 bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev,
                             sal_uInt16 nMode, SwHistory* )
 {
-    SwTableNode* pDelTblNd = rPos.GetNode().GetTableNode();
-    OSL_ENSURE( pDelTblNd, "Where did the TableNode go?" );
+    SwTableNode* pDelTableNd = rPos.GetNode().GetTableNode();
+    OSL_ENSURE( pDelTableNd, "Where did the TableNode go?" );
 
-    SwTableNode* pTblNd = (*this)[ rPos.GetIndex() - 1]->FindTableNode();
-    OSL_ENSURE( pTblNd, "Where did the TableNode go?" );
+    SwTableNode* pTableNd = (*this)[ rPos.GetIndex() - 1]->FindTableNode();
+    OSL_ENSURE( pTableNd, "Where did the TableNode go?" );
 
-    if( !pDelTblNd || !pTblNd )
+    if( !pDelTableNd || !pTableNd )
         return false;
 
-    pDelTblNd->DelFrms();
+    pDelTableNd->DelFrms();
 
-    SwTable& rDelTbl = pDelTblNd->GetTable();
-    SwTable& rTbl = pTblNd->GetTable();
+    SwTable& rDelTable = pDelTableNd->GetTable();
+    SwTable& rTable = pTableNd->GetTable();
 
     // Find Lines for the Layout update
     _FndBox aFndBox( 0, 0 );
-    aFndBox.SetTableLines( rTbl );
-    aFndBox.DelFrms( rTbl );
+    aFndBox.SetTableLines( rTable );
+    aFndBox.DelFrms( rTable );
 
     // TL_CHART2:
     // tell the charts about the table to be deleted and have them use their own data
-    GetDoc()->getIDocumentChartDataProviderAccess().CreateChartInternalDataProviders( &rDelTbl );
+    GetDoc()->getIDocumentChartDataProviderAccess().CreateChartInternalDataProviders( &rDelTable );
 
     // Sync the TableFormat's Width
     {
-        const SwFmtFrmSize& rTblSz = rTbl.GetFrmFmt()->GetFrmSize();
-        const SwFmtFrmSize& rDelTblSz = rDelTbl.GetFrmFmt()->GetFrmSize();
-        if( rTblSz != rDelTblSz )
+        const SwFormatFrmSize& rTableSz = rTable.GetFrameFormat()->GetFrmSize();
+        const SwFormatFrmSize& rDelTableSz = rDelTable.GetFrameFormat()->GetFrmSize();
+        if( rTableSz != rDelTableSz )
         {
             // The needs correction
             if( bWithPrev )
-                rDelTbl.GetFrmFmt()->SetFmtAttr( rTblSz );
+                rDelTable.GetFrameFormat()->SetFormatAttr( rTableSz );
             else
-                rTbl.GetFrmFmt()->SetFmtAttr( rDelTblSz );
+                rTable.GetFrameFormat()->SetFormatAttr( rDelTableSz );
         }
     }
 
@@ -3577,44 +3577,44 @@ bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev,
     {
         // Transfer all Attributes of the succeeding Table to the preceding one
         // We do this, because the succeeding one is deleted when deleting the Node
-        rTbl.SetRowsToRepeat( rDelTbl.GetRowsToRepeat() );
-        rTbl.SetTblChgMode( rDelTbl.GetTblChgMode() );
+        rTable.SetRowsToRepeat( rDelTable.GetRowsToRepeat() );
+        rTable.SetTableChgMode( rDelTable.GetTableChgMode() );
 
-        rTbl.GetFrmFmt()->LockModify();
-        *rTbl.GetFrmFmt() = *rDelTbl.GetFrmFmt();
+        rTable.GetFrameFormat()->LockModify();
+        *rTable.GetFrameFormat() = *rDelTable.GetFrameFormat();
         // Also switch the Name
-        rTbl.GetFrmFmt()->SetName( rDelTbl.GetFrmFmt()->GetName() );
-        rTbl.GetFrmFmt()->UnlockModify();
+        rTable.GetFrameFormat()->SetName( rDelTable.GetFrameFormat()->GetName() );
+        rTable.GetFrameFormat()->UnlockModify();
     }
 
     // Move the Lines and Boxes
-    SwTableLines::size_type nOldSize = rTbl.GetTabLines().size();
-    rTbl.GetTabLines().insert( rTbl.GetTabLines().begin() + nOldSize,
-                               rDelTbl.GetTabLines().begin(), rDelTbl.GetTabLines().end() );
-    rDelTbl.GetTabLines().clear();
+    SwTableLines::size_type nOldSize = rTable.GetTabLines().size();
+    rTable.GetTabLines().insert( rTable.GetTabLines().begin() + nOldSize,
+                               rDelTable.GetTabLines().begin(), rDelTable.GetTabLines().end() );
+    rDelTable.GetTabLines().clear();
 
-    rTbl.GetTabSortBoxes().insert( rDelTbl.GetTabSortBoxes() );
-    rDelTbl.GetTabSortBoxes().clear();
+    rTable.GetTabSortBoxes().insert( rDelTable.GetTabSortBoxes() );
+    rDelTable.GetTabSortBoxes().clear();
 
     // The preceding Table always remains, while the succeeding one is deleted
-    SwEndNode* pTblEndNd = pDelTblNd->EndOfSectionNode();
-    pTblNd->pEndOfSection = pTblEndNd;
+    SwEndNode* pTableEndNd = pDelTableNd->EndOfSectionNode();
+    pTableNd->pEndOfSection = pTableEndNd;
 
-    SwNodeIndex aIdx( *pDelTblNd, 1 );
+    SwNodeIndex aIdx( *pDelTableNd, 1 );
 
     SwNode* pBoxNd = aIdx.GetNode().GetStartNode();
     do {
         OSL_ENSURE( pBoxNd->IsStartNode(), "This needs to be a StartNode!" );
-        pBoxNd->pStartOfSection = pTblNd;
+        pBoxNd->pStartOfSection = pTableNd;
         pBoxNd = (*this)[ pBoxNd->EndOfSectionIndex() + 1 ];
-    } while( pBoxNd != pTblEndNd );
-    pBoxNd->pStartOfSection = pTblNd;
+    } while( pBoxNd != pTableEndNd );
+    pBoxNd->pStartOfSection = pTableNd;
 
     aIdx -= 2;
     DelNodes( aIdx, 2 );
 
     // tweak the conditional styles at the first inserted Line
-    const SwTableLine* pFirstLn = rTbl.GetTabLines()[ nOldSize ];
+    const SwTableLine* pFirstLn = rTable.GetTabLines()[ nOldSize ];
     if( 1 == nMode )
     {
         // Set Header Template in the Line and save in the History
@@ -3625,69 +3625,69 @@ bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev,
     // Clean up the Borders
     if( nOldSize )
     {
-        _SwGCLineBorder aPara( rTbl );
+        _SwGCLineBorder aPara( rTable );
         aPara.nLinePos = --nOldSize;
-        pFirstLn = rTbl.GetTabLines()[ nOldSize ];
+        pFirstLn = rTable.GetTabLines()[ nOldSize ];
         sw_GC_Line_Border( pFirstLn, &aPara );
     }
 
     // Update Layout
-    aFndBox.MakeFrms( rTbl );
+    aFndBox.MakeFrms( rTable );
 
     return true;
 }
 
 // Use the PtrArray's ForEach method
-struct _SetAFmtTabPara
+struct _SetAFormatTabPara
 {
-    SwTableAutoFmt& rTblFmt;
-    SwUndoTblAutoFmt* pUndo;
+    SwTableAutoFormat& rTableFormat;
+    SwUndoTableAutoFormat* pUndo;
     sal_uInt16 nEndBox, nCurBox;
-    sal_uInt8 nAFmtLine, nAFmtBox;
+    sal_uInt8 nAFormatLine, nAFormatBox;
 
-    _SetAFmtTabPara( const SwTableAutoFmt& rNew )
-        : rTblFmt( (SwTableAutoFmt&)rNew ), pUndo( 0 ),
-        nEndBox( 0 ), nCurBox( 0 ), nAFmtLine( 0 ), nAFmtBox( 0 )
+    _SetAFormatTabPara( const SwTableAutoFormat& rNew )
+        : rTableFormat( (SwTableAutoFormat&)rNew ), pUndo( 0 ),
+        nEndBox( 0 ), nCurBox( 0 ), nAFormatLine( 0 ), nAFormatBox( 0 )
     {}
 };
 
 // Forward declare so that the Lines and Boxes can use recursion
-static bool lcl_SetAFmtBox(_FndBox &, _SetAFmtTabPara *pSetPara);
-static bool lcl_SetAFmtLine(_FndLine &, _SetAFmtTabPara *pPara);
+static bool lcl_SetAFormatBox(_FndBox &, _SetAFormatTabPara *pSetPara);
+static bool lcl_SetAFormatLine(_FndLine &, _SetAFormatTabPara *pPara);
 
-static bool lcl_SetAFmtLine(_FndLine & rLine, _SetAFmtTabPara *pPara)
+static bool lcl_SetAFormatLine(_FndLine & rLine, _SetAFormatTabPara *pPara)
 {
     for (_FndBoxes::iterator it = rLine.GetBoxes().begin();
          it != rLine.GetBoxes().end(); ++it)
     {
-        lcl_SetAFmtBox(*it, pPara);
+        lcl_SetAFormatBox(*it, pPara);
     }
     return true;
 }
 
-static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
+static bool lcl_SetAFormatBox( _FndBox & rBox, _SetAFormatTabPara *pSetPara )
 {
     if (!rBox.GetUpper()->GetUpper()) // Box on first level?
     {
         if( !pSetPara->nCurBox )
-            pSetPara->nAFmtBox = 0;
+            pSetPara->nAFormatBox = 0;
         else if( pSetPara->nCurBox == pSetPara->nEndBox )
-            pSetPara->nAFmtBox = 3;
+            pSetPara->nAFormatBox = 3;
         else
-            pSetPara->nAFmtBox = (sal_uInt8)(1 + ((pSetPara->nCurBox-1) & 1));
+            pSetPara->nAFormatBox = (sal_uInt8)(1 + ((pSetPara->nCurBox-1) & 1));
     }
 
     if (rBox.GetBox()->GetSttNd())
     {
         SwTableBox* pSetBox = static_cast<SwTableBox*>(rBox.GetBox());
-        SwDoc* pDoc = pSetBox->GetFrmFmt()->GetDoc();
+        SwDoc* pDoc = pSetBox->GetFrameFormat()->GetDoc();
         SfxItemSet aCharSet( pDoc->GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1 );
         SfxItemSet aBoxSet( pDoc->GetAttrPool(), aTableBoxSetRange );
-        sal_uInt8 nPos = pSetPara->nAFmtLine * 4 + pSetPara->nAFmtBox;
-        pSetPara->rTblFmt.UpdateToSet( nPos, aCharSet,
-                                        SwTableAutoFmt::UPDATE_CHAR, 0 );
-        pSetPara->rTblFmt.UpdateToSet( nPos, aBoxSet,
-                                        SwTableAutoFmt::UPDATE_BOX,
+        sal_uInt8 nPos = pSetPara->nAFormatLine * 4 + pSetPara->nAFormatBox;
+        pSetPara->rTableFormat.UpdateToSet( nPos, aCharSet,
+                                        SwTableAutoFormat::UPDATE_CHAR, 0 );
+        pSetPara->rTableFormat.UpdateToSet( nPos, aBoxSet,
+                                        SwTableAutoFormat::UPDATE_BOX,
                                         pDoc->GetNumberFormatter( true ) );
         if( aCharSet.Count() )
         {
@@ -3695,7 +3695,7 @@ static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
             sal_uLong nEndNd = pSetBox->GetSttNd()->EndOfSectionIndex();
             for( ; nSttNd < nEndNd; ++nSttNd )
             {
-                SwCntntNode* pNd = pDoc->GetNodes()[ nSttNd ]->GetCntntNode();
+                SwContentNode* pNd = pDoc->GetNodes()[ nSttNd ]->GetContentNode();
                 if( pNd )
                     pNd->SetAttr( aCharSet );
             }
@@ -3705,15 +3705,15 @@ static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
         {
             if( pSetPara->pUndo &&
                 SfxItemState::SET == aBoxSet.GetItemState( RES_BOXATR_FORMAT ))
-                pSetPara->pUndo->SaveBoxCntnt( *pSetBox );
+                pSetPara->pUndo->SaveBoxContent( *pSetBox );
 
-            pSetBox->ClaimFrmFmt()->SetFmtAttr( aBoxSet );
+            pSetBox->ClaimFrameFormat()->SetFormatAttr( aBoxSet );
         }
     }
     else
     {
         for( _FndLine& rFndLine : rBox.GetLines() )
-            lcl_SetAFmtLine( rFndLine, pSetPara );
+            lcl_SetAFormatLine( rFndLine, pSetPara );
     }
 
     if (!rBox.GetUpper()->GetUpper()) // a BaseLine
@@ -3724,23 +3724,23 @@ static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
 /**
  * AutoFormat for the Table/TableSelection
  */
-bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew )
+bool SwDoc::SetTableAutoFormat( const SwSelBoxes& rBoxes, const SwTableAutoFormat& rNew )
 {
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // Find all Boxes/Lines
     _FndBox aFndBox( 0, 0 );
     {
         _FndPara aPara( rBoxes, &aFndBox );
-        ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
+        ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara );
     }
     if( aFndBox.GetLines().empty() )
         return false;
 
-    SwTable &table = pTblNd->GetTable();
+    SwTable &table = pTableNd->GetTable();
     table.SetHTMLTableLayout( 0 );
 
     _FndBox* pFndBox = &aFndBox;
@@ -3754,18 +3754,18 @@ bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNe
         pFndBox = pFndBox->GetUpper()->GetUpper();
 
     // Disable Undo, but first store parameters
-    SwUndoTblAutoFmt* pUndo = 0;
+    SwUndoTableAutoFormat* pUndo = 0;
     bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
     if (bUndo)
     {
-        pUndo = new SwUndoTblAutoFmt( *pTblNd, rNew );
+        pUndo = new SwUndoTableAutoFormat( *pTableNd, rNew );
         GetIDocumentUndoRedo().AppendUndo(pUndo);
         GetIDocumentUndoRedo().DoUndo(false);
     }
 
     rNew.RestoreTableProperties(table);
 
-    _SetAFmtTabPara aPara( rNew );
+    _SetAFormatTabPara aPara( rNew );
     _FndLines& rFLns = pFndBox->GetLines();
 
     for( _FndLines::size_type n = 0; n < rFLns.size(); ++n )
@@ -3777,20 +3777,20 @@ bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNe
         pLine->SetUpper( 0 );
 
         if( !n )
-            aPara.nAFmtLine = 0;
+            aPara.nAFormatLine = 0;
         else if (static_cast<size_t>(n+1) == rFLns.size())
-            aPara.nAFmtLine = 3;
+            aPara.nAFormatLine = 3;
         else
-            aPara.nAFmtLine = (sal_uInt8)(1 + ((n-1) & 1 ));
+            aPara.nAFormatLine = (sal_uInt8)(1 + ((n-1) & 1 ));
 
-        aPara.nAFmtBox = 0;
+        aPara.nAFormatBox = 0;
         aPara.nCurBox = 0;
         aPara.nEndBox = pLine->GetBoxes().size()-1;
         aPara.pUndo = pUndo;
         for (_FndBoxes::iterator it = pLine->GetBoxes().begin();
              it != pLine->GetBoxes().end(); ++it)
         {
-            lcl_SetAFmtBox(*it, &aPara);
+            lcl_SetAFormatBox(*it, &aPara);
         }
 
         pLine->SetUpper( pSaveBox );
@@ -3810,24 +3810,24 @@ bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNe
 /**
  * Find out who has the Attributes
  */
-bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet )
+bool SwDoc::GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet )
 {
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
-    if( !pTblNd )
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rBoxes[0]->GetSttNd()->FindTableNode());
+    if( !pTableNd )
         return false;
 
     // Find all Boxes/Lines
     _FndBox aFndBox( 0, 0 );
     {
         _FndPara aPara( rBoxes, &aFndBox );
-        ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
+        ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara );
     }
     if( aFndBox.GetLines().empty() )
         return false;
 
     // Store table properties
-    SwTable &table = pTblNd->GetTable();
+    SwTable &table = pTableNd->GetTable();
     rGet.StoreTableProperties(table);
 
     _FndBox* pFndBox = &aFndBox;
@@ -3867,15 +3867,15 @@ bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet )
 
             sal_uInt8 nPos = nLine * 4 + nBox;
             SwNodeIndex aIdx( *pFBox->GetSttNd(), 1 );
-            SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+            SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
             if( !pCNd )
                 pCNd = GetNodes().GoNext( &aIdx );
 
             if( pCNd )
                 rGet.UpdateFromSet( nPos, pCNd->GetSwAttrSet(),
-                                    SwTableAutoFmt::UPDATE_CHAR, 0 );
-            rGet.UpdateFromSet( nPos, pFBox->GetFrmFmt()->GetAttrSet(),
-                                SwTableAutoFmt::UPDATE_BOX,
+                                    SwTableAutoFormat::UPDATE_CHAR, 0 );
+            rGet.UpdateFromSet( nPos, pFBox->GetFrameFormat()->GetAttrSet(),
+                                SwTableAutoFormat::UPDATE_BOX,
                                 GetNumberFormatter( true ) );
         }
     }
@@ -3883,40 +3883,40 @@ bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet )
     return true;
 }
 
-OUString SwDoc::GetUniqueTblName() const
+OUString SwDoc::GetUniqueTableName() const
 {
     if( IsInMailMerge())
     {
         OUString newName = "MailMergeTable"
             + OStringToOUString( DateTimeToOString( DateTime( DateTime::SYSTEM )), RTL_TEXTENCODING_ASCII_US )
-            + OUString::number( mpTblFrmFmtTbl->size() + 1 );
+            + OUString::number( mpTableFrameFormatTable->size() + 1 );
         return newName;
     }
 
     ResId aId( STR_TABLE_DEFNAME, *pSwResMgr );
     const OUString aName( aId );
 
-    const size_t nFlagSize = ( mpTblFrmFmtTbl->size() / 8 ) + 2;
+    const size_t nFlagSize = ( mpTableFrameFormatTable->size() / 8 ) + 2;
 
     sal_uInt8* pSetFlags = new sal_uInt8[ nFlagSize ];
     memset( pSetFlags, 0, nFlagSize );
 
-    for( size_t n = 0; n < mpTblFrmFmtTbl->size(); ++n )
+    for( size_t n = 0; n < mpTableFrameFormatTable->size(); ++n )
     {
-        const SwFrmFmt* pFmt = (*mpTblFrmFmtTbl)[ n ];
-        if( !pFmt->IsDefault() && IsUsed( *pFmt )  &&
-            pFmt->GetName().startsWith( aName ) )
+        const SwFrameFormat* pFormat = (*mpTableFrameFormatTable)[ n ];
+        if( !pFormat->IsDefault() && IsUsed( *pFormat )  &&
+            pFormat->GetName().startsWith( aName ) )
         {
             // Get number and set the Flag
             const sal_Int32 nNmLen = aName.getLength();
-            size_t nNum = pFmt->GetName().copy( nNmLen ).toInt32();
-            if( nNum-- && nNum < mpTblFrmFmtTbl->size() )
+            size_t nNum = pFormat->GetName().copy( nNmLen ).toInt32();
+            if( nNum-- && nNum < mpTableFrameFormatTable->size() )
                 pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
         }
     }
 
     // All numbers are flagged properly, thus calculate the right number
-    size_t nNum = mpTblFrmFmtTbl->size();
+    size_t nNum = mpTableFrameFormatTable->size();
     for( size_t n = 0; n < nFlagSize; ++n )
     {
         auto nTmp = pSetFlags[ n ];
@@ -3937,60 +3937,60 @@ OUString SwDoc::GetUniqueTblName() const
     return aName + OUString::number( ++nNum );
 }
 
-SwTableFmt* SwDoc::FindTblFmtByName( const OUString& rName, bool bAll ) const
+SwTableFormat* SwDoc::FindTableFormatByName( const OUString& rName, bool bAll ) const
 {
-    const SwFmt* pRet = 0;
+    const SwFormat* pRet = 0;
     if( bAll )
-        pRet = FindFmtByName( *mpTblFrmFmtTbl, rName );
+        pRet = FindFormatByName( *mpTableFrameFormatTable, rName );
     else
     {
         // Only the ones set in the Doc
-        for( size_t n = 0; n < mpTblFrmFmtTbl->size(); ++n )
+        for( size_t n = 0; n < mpTableFrameFormatTable->size(); ++n )
         {
-            const SwFrmFmt* pFmt = (*mpTblFrmFmtTbl)[ n ];
-            if( !pFmt->IsDefault() && IsUsed( *pFmt ) &&
-                pFmt->GetName() == rName )
+            const SwFrameFormat* pFormat = (*mpTableFrameFormatTable)[ n ];
+            if( !pFormat->IsDefault() && IsUsed( *pFormat ) &&
+                pFormat->GetName() == rName )
             {
-                pRet = pFmt;
+                pRet = pFormat;
                 break;
             }
         }
     }
-    return const_cast<SwTableFmt*>(static_cast<const SwTableFmt*>(pRet));
+    return const_cast<SwTableFormat*>(static_cast<const SwTableFormat*>(pRet));
 }
 
 bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                     SwTwips nAbsDiff, SwTwips nRelDiff )
 {
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rAktBox.GetSttNd()->FindTableNode());
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rAktBox.GetSttNd()->FindTableNode());
     SwUndo* pUndo = 0;
 
-    if( nsTblChgWidthHeightType::WH_FLAG_INSDEL & eType && pTblNd->GetTable().ISA( SwDDETable ))
+    if( nsTableChgWidthHeightType::WH_FLAG_INSDEL & eType && pTableNd->GetTable().ISA( SwDDETable ))
         return false;
 
-    SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-    aMsgHnt.eFlags = TBL_BOXPTR;
-    getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+    aMsgHint.eFlags = TBL_BOXPTR;
+    getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
     bool bRet = false;
     switch( eType & 0xff )
     {
-    case nsTblChgWidthHeightType::WH_COL_LEFT:
-    case nsTblChgWidthHeightType::WH_COL_RIGHT:
-    case nsTblChgWidthHeightType::WH_CELL_LEFT:
-    case nsTblChgWidthHeightType::WH_CELL_RIGHT:
+    case nsTableChgWidthHeightType::WH_COL_LEFT:
+    case nsTableChgWidthHeightType::WH_COL_RIGHT:
+    case nsTableChgWidthHeightType::WH_CELL_LEFT:
+    case nsTableChgWidthHeightType::WH_CELL_RIGHT:
         {
-             bRet = pTblNd->GetTable().SetColWidth( rAktBox,
+             bRet = pTableNd->GetTable().SetColWidth( rAktBox,
                                 eType, nAbsDiff, nRelDiff,
                                 (bUndo) ? &pUndo : 0 );
         }
         break;
-    case nsTblChgWidthHeightType::WH_ROW_TOP:
-    case nsTblChgWidthHeightType::WH_ROW_BOTTOM:
-    case nsTblChgWidthHeightType::WH_CELL_TOP:
-    case nsTblChgWidthHeightType::WH_CELL_BOTTOM:
-        bRet = pTblNd->GetTable().SetRowHeight( rAktBox,
+    case nsTableChgWidthHeightType::WH_ROW_TOP:
+    case nsTableChgWidthHeightType::WH_ROW_BOTTOM:
+    case nsTableChgWidthHeightType::WH_CELL_TOP:
+    case nsTableChgWidthHeightType::WH_CELL_BOTTOM:
+        bRet = pTableNd->GetTable().SetRowHeight( rAktBox,
                             eType, nAbsDiff, nRelDiff,
                             (bUndo) ? &pUndo : 0 );
         break;
@@ -4005,28 +4005,28 @@ bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
     if( bRet )
     {
         getIDocumentState().SetModified();
-        if( nsTblChgWidthHeightType::WH_FLAG_INSDEL & eType )
+        if( nsTableChgWidthHeightType::WH_FLAG_INSDEL & eType )
             getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
     }
     return bRet;
 }
 
-void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, bool bCallUpdate )
+void SwDoc::ChkBoxNumFormat( SwTableBox& rBox, bool bCallUpdate )
 {
     // Optimization: If the Box says it's Text, it remains Text
-    const SfxPoolItem* pNumFmtItem = 0;
-    if( SfxItemState::SET == rBox.GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT,
-        false, &pNumFmtItem ) && GetNumberFormatter()->IsTextFormat(
-            static_cast<const SwTblBoxNumFormat*>(pNumFmtItem)->GetValue() ))
+    const SfxPoolItem* pNumFormatItem = 0;
+    if( SfxItemState::SET == rBox.GetFrameFormat()->GetItemState( RES_BOXATR_FORMAT,
+        false, &pNumFormatItem ) && GetNumberFormatter()->IsTextFormat(
+            static_cast<const SwTableBoxNumFormat*>(pNumFormatItem)->GetValue() ))
         return ;
 
-    SwUndoTblNumFmt* pUndo = 0;
+    SwUndoTableNumFormat* pUndo = 0;
 
-    bool bIsEmptyTxtNd;
+    bool bIsEmptyTextNd;
     bool bChgd = true;
-    sal_uInt32 nFmtIdx;
+    sal_uInt32 nFormatIdx;
     double fNumber;
-    if( rBox.HasNumCntnt( fNumber, nFmtIdx, bIsEmptyTxtNd ) )
+    if( rBox.HasNumContent( fNumber, nFormatIdx, bIsEmptyTextNd ) )
     {
         if( !rBox.IsNumberChanged() )
             bChgd = false;
@@ -4035,31 +4035,31 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, bool bCallUpdate )
             if (GetIDocumentUndoRedo().DoesUndo())
             {
                 GetIDocumentUndoRedo().StartUndo( UNDO_TABLE_AUTOFMT, NULL );
-                pUndo = new SwUndoTblNumFmt( rBox );
-                pUndo->SetNumFmt( nFmtIdx, fNumber );
+                pUndo = new SwUndoTableNumFormat( rBox );
+                pUndo->SetNumFormat( nFormatIdx, fNumber );
             }
 
-            SwTableBoxFmt* pBoxFmt = static_cast<SwTableBoxFmt*>(rBox.GetFrmFmt());
+            SwTableBoxFormat* pBoxFormat = static_cast<SwTableBoxFormat*>(rBox.GetFrameFormat());
             SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
 
             bool bLockModify = true;
             bool bSetNumberFormat = false;
-            const bool bForceNumberFormat = IsInsTblFormatNum() && IsInsTblChangeNumFormat();
+            const bool bForceNumberFormat = IsInsTableFormatNum() && IsInsTableChangeNumFormat();
 
             // if the user forced a number format in this cell previously,
             // keep it, unless the user set that she wants the full number
             // format recognition
-            if( pNumFmtItem && !bForceNumberFormat )
+            if( pNumFormatItem && !bForceNumberFormat )
             {
-                sal_uLong nOldNumFmt = static_cast<const SwTblBoxNumFormat*>(pNumFmtItem)->GetValue();
-                SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+                sal_uLong nOldNumFormat = static_cast<const SwTableBoxNumFormat*>(pNumFormatItem)->GetValue();
+                SvNumberFormatter* pNumFormatr = GetNumberFormatter();
 
-                short nFmtType = pNumFmtr->GetType( nFmtIdx );
-                if( nFmtType == pNumFmtr->GetType( nOldNumFmt ) || css::util::NumberFormat::NUMBER == nFmtType )
+                short nFormatType = pNumFormatr->GetType( nFormatIdx );
+                if( nFormatType == pNumFormatr->GetType( nOldNumFormat ) || css::util::NumberFormat::NUMBER == nFormatType )
                 {
                     // Current and specified NumFormat match
                     // -> keep old Format
-                    nFmtIdx = nOldNumFmt;
+                    nFormatIdx = nOldNumFormat;
                     bSetNumberFormat = true;
                 }
                 else
@@ -4072,58 +4072,58 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, bool bCallUpdate )
 
             if( bSetNumberFormat || bForceNumberFormat )
             {
-                pBoxFmt = static_cast<SwTableBoxFmt*>(rBox.ClaimFrmFmt());
+                pBoxFormat = static_cast<SwTableBoxFormat*>(rBox.ClaimFrameFormat());
 
-                aBoxSet.Put( SwTblBoxValue( fNumber ));
-                aBoxSet.Put( SwTblBoxNumFormat( nFmtIdx ));
+                aBoxSet.Put( SwTableBoxValue( fNumber ));
+                aBoxSet.Put( SwTableBoxNumFormat( nFormatIdx ));
             }
 
             // It's not enough to only reset the Formula.
             // Make sure that the Text is formatted accordingly
-            if( !bSetNumberFormat && !bIsEmptyTxtNd && pNumFmtItem )
+            if( !bSetNumberFormat && !bIsEmptyTextNd && pNumFormatItem )
             {
                 // Just resetting Attributes is not enough
                 // Make sure that the Text is formatted accordingly
-                pBoxFmt->SetFmtAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
+                pBoxFormat->SetFormatAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
             }
 
-            if( bLockModify ) pBoxFmt->LockModify();
-            pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
-            if( bLockModify ) pBoxFmt->UnlockModify();
+            if( bLockModify ) pBoxFormat->LockModify();
+            pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
+            if( bLockModify ) pBoxFormat->UnlockModify();
 
             if( bSetNumberFormat )
-                pBoxFmt->SetFmtAttr( aBoxSet );
+                pBoxFormat->SetFormatAttr( aBoxSet );
         }
     }
     else
     {
         // It's not a number
-        const SfxPoolItem* pValueItem = 0, *pFmtItem = 0;
-        SwTableBoxFmt* pBoxFmt = static_cast<SwTableBoxFmt*>(rBox.GetFrmFmt());
-        if( SfxItemState::SET == pBoxFmt->GetItemState( RES_BOXATR_FORMAT,
-                false, &pFmtItem ) ||
-            SfxItemState::SET == pBoxFmt->GetItemState( RES_BOXATR_VALUE,
+        const SfxPoolItem* pValueItem = 0, *pFormatItem = 0;
+        SwTableBoxFormat* pBoxFormat = static_cast<SwTableBoxFormat*>(rBox.GetFrameFormat());
+        if( SfxItemState::SET == pBoxFormat->GetItemState( RES_BOXATR_FORMAT,
+                false, &pFormatItem ) ||
+            SfxItemState::SET == pBoxFormat->GetItemState( RES_BOXATR_VALUE,
                 false, &pValueItem ))
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
                 GetIDocumentUndoRedo().StartUndo( UNDO_TABLE_AUTOFMT, NULL );
-                pUndo = new SwUndoTblNumFmt( rBox );
+                pUndo = new SwUndoTableNumFormat( rBox );
             }
 
-            pBoxFmt = static_cast<SwTableBoxFmt*>(rBox.ClaimFrmFmt());
+            pBoxFormat = static_cast<SwTableBoxFormat*>(rBox.ClaimFrameFormat());
 
             // Remove all number formats
             sal_uInt16 nWhich1 = RES_BOXATR_FORMULA;
-            if( !bIsEmptyTxtNd )
+            if( !bIsEmptyTextNd )
             {
                 nWhich1 = RES_BOXATR_FORMAT;
 
                 // Just resetting Attributes is not enough
                 // Make sure that the Text is formatted accordingly
-                pBoxFmt->SetFmtAttr( *GetDfltAttr( nWhich1 ));
+                pBoxFormat->SetFormatAttr( *GetDfltAttr( nWhich1 ));
             }
-            pBoxFmt->ResetFmtAttr( nWhich1, RES_BOXATR_VALUE );
+            pBoxFormat->ResetFormatAttr( nWhich1, RES_BOXATR_VALUE );
         }
         else
             bChgd = false;
@@ -4138,42 +4138,42 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, bool bCallUpdate )
             GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
         }
 
-        const SwTableNode* pTblNd = rBox.GetSttNd()->FindTableNode();
+        const SwTableNode* pTableNd = rBox.GetSttNd()->FindTableNode();
         if( bCallUpdate )
         {
-            SwTableFmlUpdate aTblUpdate( &pTblNd->GetTable() );
-            getIDocumentFieldsAccess().UpdateTblFlds( &aTblUpdate );
+            SwTableFormulaUpdate aTableUpdate( &pTableNd->GetTable() );
+            getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
 
             // TL_CHART2: update charts (when cursor leaves cell and
             // automatic update is enabled)
             if (AUTOUPD_FIELD_AND_CHARTS == GetDocumentSettingManager().getFieldUpdateFlags(true))
-                pTblNd->GetTable().UpdateCharts();
+                pTableNd->GetTable().UpdateCharts();
         }
         getIDocumentState().SetModified();
     }
 }
 
-void SwDoc::SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet )
+void SwDoc::SetTableBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet )
 {
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        GetIDocumentUndoRedo().AppendUndo( new SwUndoTblNumFmt(rBox, &rSet) );
+        GetIDocumentUndoRedo().AppendUndo( new SwUndoTableNumFormat(rBox, &rSet) );
     }
 
-    SwFrmFmt* pBoxFmt = rBox.ClaimFrmFmt();
+    SwFrameFormat* pBoxFormat = rBox.ClaimFrameFormat();
     if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMULA ))
     {
-        pBoxFmt->LockModify();
-        pBoxFmt->ResetFmtAttr( RES_BOXATR_VALUE );
-        pBoxFmt->UnlockModify();
+        pBoxFormat->LockModify();
+        pBoxFormat->ResetFormatAttr( RES_BOXATR_VALUE );
+        pBoxFormat->UnlockModify();
     }
     else if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_VALUE ))
     {
-        pBoxFmt->LockModify();
-        pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMULA );
-        pBoxFmt->UnlockModify();
+        pBoxFormat->LockModify();
+        pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMULA );
+        pBoxFormat->UnlockModify();
     }
-    pBoxFmt->SetFmtAttr( rSet );
+    pBoxFormat->SetFormatAttr( rSet );
     getIDocumentState().SetModified();
 }
 
@@ -4181,21 +4181,21 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos )
 {
     SwPaM aPam(rPos);
     aPam.Move(fnMoveBackward);
-    SwCntntNode *pNode = aPam.GetCntntNode();
+    SwContentNode *pNode = aPam.GetContentNode();
     if ( 0 == pNode )
         return ;
-    if( pNode->IsTxtNode() )
+    if( pNode->IsTextNode() )
     {
-        SwTxtNode * pTxtNode = pNode->GetTxtNode();
-        if (pTxtNode && pTxtNode->IsNumbered()
-            && pTxtNode->GetTxt().isEmpty())
+        SwTextNode * pTextNode = pNode->GetTextNode();
+        if (pTextNode && pTextNode->IsNumbered()
+            && pTextNode->GetText().isEmpty())
         {
-            const SfxPoolItem* pFmtItem = 0;
-            SfxItemSet rSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+            const SfxPoolItem* pFormatItem = 0;
+            SfxItemSet rSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
                         RES_PARATR_BEGIN, RES_PARATR_END - 1,
                         0);
-            pTxtNode->SwCntntNode::GetAttr( rSet );
-            if ( SfxItemState::SET == rSet.GetItemState( RES_PARATR_NUMRULE , false , &pFmtItem ) )
+            pTextNode->SwContentNode::GetAttr( rSet );
+            if ( SfxItemState::SET == rSet.GetItemState( RES_PARATR_NUMRULE , false , &pFormatItem ) )
             {
                 SwUndoDelNum * pUndo;
                 if( GetIDocumentUndoRedo().DoesUndo() )
@@ -4206,13 +4206,13 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos )
                 else
                     pUndo = 0;
                 SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : 0 );
-                aRegH.RegisterInModify( pTxtNode , *pTxtNode );
+                aRegH.RegisterInModify( pTextNode , *pTextNode );
                 if ( pUndo )
-                    pUndo->AddNode( *pTxtNode , false );
-                SfxStringItem * pNewItem = static_cast<SfxStringItem*>(pFmtItem->Clone());
+                    pUndo->AddNode( *pTextNode , false );
+                SfxStringItem * pNewItem = static_cast<SfxStringItem*>(pFormatItem->Clone());
                 pNewItem->SetValue(OUString());
                 rSet.Put( *pNewItem );
-                pTxtNode->SetAttr( rSet );
+                pTextNode->SetAttr( rSet );
                 delete pNewItem;
             }
         }
@@ -4227,32 +4227,32 @@ void SwDoc::ClearBoxNumAttrs( const SwNodeIndex& rNode )
         2 == pSttNd->EndOfSectionIndex() - pSttNd->GetIndex() )
     {
         SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().
-                            GetTblBox( pSttNd->GetIndex() );
+                            GetTableBox( pSttNd->GetIndex() );
 
-        const SfxPoolItem* pFmtItem = 0;
-        const SfxItemSet& rSet = pBox->GetFrmFmt()->GetAttrSet();
-        if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMAT, false, &pFmtItem ) ||
+        const SfxPoolItem* pFormatItem = 0;
+        const SfxItemSet& rSet = pBox->GetFrameFormat()->GetAttrSet();
+        if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMAT, false, &pFormatItem ) ||
             SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMULA, false ) ||
             SfxItemState::SET == rSet.GetItemState( RES_BOXATR_VALUE, false ))
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
-                GetIDocumentUndoRedo().AppendUndo(new SwUndoTblNumFmt(*pBox));
+                GetIDocumentUndoRedo().AppendUndo(new SwUndoTableNumFormat(*pBox));
             }
 
-            SwFrmFmt* pBoxFmt = pBox->ClaimFrmFmt();
+            SwFrameFormat* pBoxFormat = pBox->ClaimFrameFormat();
 
             // Keep TextFormats!
             sal_uInt16 nWhich1 = RES_BOXATR_FORMAT;
-            if( pFmtItem && GetNumberFormatter()->IsTextFormat(
-                    static_cast<const SwTblBoxNumFormat*>(pFmtItem)->GetValue() ))
+            if( pFormatItem && GetNumberFormatter()->IsTextFormat(
+                    static_cast<const SwTableBoxNumFormat*>(pFormatItem)->GetValue() ))
                 nWhich1 = RES_BOXATR_FORMULA;
             else
                 // Just resetting Attributes is not enough
                 // Make sure that the Text is formatted accordingly
-                pBoxFmt->SetFmtAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
+                pBoxFormat->SetFormatAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
 
-            pBoxFmt->ResetFmtAttr( nWhich1, RES_BOXATR_VALUE );
+            pBoxFormat->ResetFormatAttr( nWhich1, RES_BOXATR_VALUE );
             getIDocumentState().SetModified();
         }
     }
@@ -4261,34 +4261,34 @@ void SwDoc::ClearBoxNumAttrs( const SwNodeIndex& rNode )
 /**
  * Copies a Table from the same or another Doc into itself
  * We create a new Table or an existing one is filled with the Content.
- * We either fill in the Content from a certain Box or a certain TblSelection
+ * We either fill in the Content from a certain Box or a certain TableSelection
  *
  * This method is called by edglss.cxx/fecopy.cxx
  */
-bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
-                        const SwTable* pCpyTbl, bool bCpyName, bool bCorrPos )
+bool SwDoc::InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
+                        const SwTable* pCpyTable, bool bCpyName, bool bCorrPos )
 {
     bool bRet;
 
-    const SwTableNode* pSrcTblNd = pCpyTbl
-            ? pCpyTbl->GetTableNode()
+    const SwTableNode* pSrcTableNd = pCpyTable
+            ? pCpyTable->GetTableNode()
             : rBoxes[ 0 ]->GetSttNd()->FindTableNode();
 
-    SwTableNode * pInsTblNd = rInsPos.nNode.GetNode().FindTableNode();
+    SwTableNode * pInsTableNd = rInsPos.nNode.GetNode().FindTableNode();
 
     bool const bUndo( GetIDocumentUndoRedo().DoesUndo() );
-    if( !pCpyTbl && !pInsTblNd )
+    if( !pCpyTable && !pInsTableNd )
     {
-        SwUndoCpyTbl* pUndo = 0;
+        SwUndoCpyTable* pUndo = 0;
         if (bUndo)
         {
             GetIDocumentUndoRedo().ClearRedo();
-            pUndo = new SwUndoCpyTbl;
+            pUndo = new SwUndoCpyTable;
         }
 
         {
             ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
-            bRet = pSrcTblNd->GetTable().MakeCopy( this, rInsPos, rBoxes,
+            bRet = pSrcTableNd->GetTable().MakeCopy( this, rInsPos, rBoxes,
                                                 true, bCpyName );
         }
 
@@ -4301,9 +4301,9 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
             }
             else
             {
-                pInsTblNd = GetNodes()[ rInsPos.nNode.GetIndex() - 1 ]->FindTableNode();
+                pInsTableNd = GetNodes()[ rInsPos.nNode.GetIndex() - 1 ]->FindTableNode();
 
-                pUndo->SetTableSttIdx( pInsTblNd->GetIndex() );
+                pUndo->SetTableSttIdx( pInsTableNd->GetIndex() );
                 GetIDocumentUndoRedo().AppendUndo( pUndo );
             }
         }
@@ -4316,15 +4316,15 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
                                   nsRedlineMode_t::REDLINE_SHOW_INSERT |
                                   nsRedlineMode_t::REDLINE_SHOW_DELETE));
 
-        SwUndoTblCpyTbl* pUndo = 0;
+        SwUndoTableCpyTable* pUndo = 0;
         if (bUndo)
         {
             GetIDocumentUndoRedo().ClearRedo();
-            pUndo = new SwUndoTblCpyTbl;
+            pUndo = new SwUndoTableCpyTable;
             GetIDocumentUndoRedo().DoUndo(false);
         }
 
-        SwDoc* pCpyDoc = const_cast<SwDoc*>(pSrcTblNd->GetDoc());
+        SwDoc* pCpyDoc = const_cast<SwDoc*>(pSrcTableNd->GetDoc());
         bool bDelCpyDoc = pCpyDoc == this;
 
         if( bDelCpyDoc )
@@ -4334,7 +4334,7 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
             pCpyDoc->acquire();
 
             SwPosition aPos( SwNodeIndex( pCpyDoc->GetNodes().GetEndOfContent() ));
-            if( !pSrcTblNd->GetTable().MakeCopy( pCpyDoc, aPos, rBoxes, true, true ))
+            if( !pSrcTableNd->GetTable().MakeCopy( pCpyDoc, aPos, rBoxes, true, true ))
             {
                 if( pCpyDoc->release() == 0 )
                     delete pCpyDoc;
@@ -4348,7 +4348,7 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
                 return false;
             }
             aPos.nNode -= 1; // Set to the Table's EndNode
-            pSrcTblNd = aPos.nNode.GetNode().FindTableNode();
+            pSrcTableNd = aPos.nNode.GetNode().FindTableNode();
         }
 
         const SwStartNode* pSttNd = rInsPos.nNode.GetNode().FindTableBoxStartNode();
@@ -4356,7 +4356,7 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
         rInsPos.nContent.Assign( 0, 0 );
 
         // no complex into complex, but copy into or from new model is welcome
-        if( ( !pSrcTblNd->GetTable().IsTblComplex() || pInsTblNd->GetTable().IsNewModel() )
+        if( ( !pSrcTableNd->GetTable().IsTableComplex() || pInsTableNd->GetTable().IsNewModel() )
             && ( bDelCpyDoc || !rBoxes.empty() ) )
         {
             // Copy the Table "relatively"
@@ -4365,7 +4365,7 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
 
             if( bDelCpyDoc )
             {
-                SwTableBox* pBox = pInsTblNd->GetTable().GetTblBox(
+                SwTableBox* pBox = pInsTableNd->GetTable().GetTableBox(
                                         pSttNd->GetIndex() );
                 OSL_ENSURE( pBox, "Box is not in this Table" );
                 aBoxes.insert( pBox );
@@ -4375,13 +4375,13 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
                 pBoxes = &rBoxes;
 
             // Copy Table to the selected Lines
-            bRet = pInsTblNd->GetTable().InsTable( pSrcTblNd->GetTable(),
+            bRet = pInsTableNd->GetTable().InsTable( pSrcTableNd->GetTable(),
                                                         *pBoxes, pUndo );
         }
         else
         {
             SwNodeIndex aNdIdx( *pSttNd, 1 );
-            bRet = pInsTblNd->GetTable().InsTable( pSrcTblNd->GetTable(),
+            bRet = pInsTableNd->GetTable().InsTable( pSrcTableNd->GetTable(),
                                                     aNdIdx, pUndo );
         }
 
@@ -4419,20 +4419,20 @@ bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
     return bRet;
 }
 
-bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
+bool SwDoc::_UnProtectTableCells( SwTable& rTable )
 {
     bool bChgd = false;
-    SwUndoAttrTbl *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
-        ?   new SwUndoAttrTbl( *rTbl.GetTableNode() )
+    SwUndoAttrTable *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
+        ?   new SwUndoAttrTable( *rTable.GetTableNode() )
         :   0;
 
-    SwTableSortBoxes& rSrtBox = rTbl.GetTabSortBoxes();
+    SwTableSortBoxes& rSrtBox = rTable.GetTabSortBoxes();
     for (size_t i = rSrtBox.size(); i; )
     {
-        SwFrmFmt *pBoxFmt = rSrtBox[ --i ]->GetFrmFmt();
-        if( pBoxFmt->GetProtect().IsCntntProtected() )
+        SwFrameFormat *pBoxFormat = rSrtBox[ --i ]->GetFrameFormat();
+        if( pBoxFormat->GetProtect().IsContentProtected() )
         {
-            pBoxFmt->ResetFmtAttr( RES_PROTECT );
+            pBoxFormat->ResetFormatAttr( RES_PROTECT );
             bChgd = true;
         }
     }
@@ -4452,10 +4452,10 @@ bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
 bool SwDoc::UnProtectCells( const OUString& rName )
 {
     bool bChgd = false;
-    SwTableFmt* pFmt = FindTblFmtByName( rName );
-    if( pFmt )
+    SwTableFormat* pFormat = FindTableFormatByName( rName );
+    if( pFormat )
     {
-        bChgd = _UnProtectTblCells( *SwTable::FindTable( pFmt ) );
+        bChgd = _UnProtectTableCells( *SwTable::FindTable( pFormat ) );
         if( bChgd )
             getIDocumentState().SetModified();
     }
@@ -4468,27 +4468,27 @@ bool SwDoc::UnProtectCells( const SwSelBoxes& rBoxes )
     bool bChgd = false;
     if( !rBoxes.empty() )
     {
-        SwUndoAttrTbl *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
-                ? new SwUndoAttrTbl( *rBoxes[0]->GetSttNd()->FindTableNode() )
+        SwUndoAttrTable *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
+                ? new SwUndoAttrTable( *rBoxes[0]->GetSttNd()->FindTableNode() )
                 : 0;
 
-        std::map<SwFrmFmt*, SwTableBoxFmt*> aFmtsMap;
+        std::map<SwFrameFormat*, SwTableBoxFormat*> aFormatsMap;
         for (size_t i = rBoxes.size(); i; )
         {
             SwTableBox* pBox = rBoxes[ --i ];
-            SwFrmFmt* pBoxFmt = pBox->GetFrmFmt();
-            if( pBoxFmt->GetProtect().IsCntntProtected() )
+            SwFrameFormat* pBoxFormat = pBox->GetFrameFormat();
+            if( pBoxFormat->GetProtect().IsContentProtected() )
             {
-                std::map<SwFrmFmt*, SwTableBoxFmt*>::const_iterator const it =
-                    aFmtsMap.find(pBoxFmt);
-                if (aFmtsMap.end() != it)
-                    pBox->ChgFrmFmt(it->second);
+                std::map<SwFrameFormat*, SwTableBoxFormat*>::const_iterator const it =
+                    aFormatsMap.find(pBoxFormat);
+                if (aFormatsMap.end() != it)
+                    pBox->ChgFrameFormat(it->second);
                 else
                 {
-                    SwTableBoxFmt *const pNewBoxFmt(
-                        static_cast<SwTableBoxFmt*>(pBox->ClaimFrmFmt()));
-                    pNewBoxFmt->ResetFmtAttr( RES_PROTECT );
-                    aFmtsMap.insert(std::make_pair(pBoxFmt, pNewBoxFmt));
+                    SwTableBoxFormat *const pNewBoxFormat(
+                        static_cast<SwTableBoxFormat*>(pBox->ClaimFrameFormat()));
+                    pNewBoxFormat->ResetFormatAttr( RES_PROTECT );
+                    aFormatsMap.insert(std::make_pair(pBoxFormat, pNewBoxFormat));
                 }
                 bChgd = true;
             }
@@ -4507,21 +4507,21 @@ bool SwDoc::UnProtectCells( const SwSelBoxes& rBoxes )
     return bChgd;
 }
 
-bool SwDoc::UnProtectTbls( const SwPaM& rPam )
+bool SwDoc::UnProtectTables( const SwPaM& rPam )
 {
     GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
 
     bool bChgd = false, bHasSel = rPam.HasMark() ||
                                     rPam.GetNext() != &rPam;
-    SwFrmFmts& rFmts = *GetTblFrmFmts();
-    SwTable* pTbl;
-    const SwTableNode* pTblNd;
-    for( auto n = rFmts.size(); n ; )
-        if( 0 != (pTbl = SwTable::FindTable( rFmts[ --n ] )) &&
-            0 != (pTblNd = pTbl->GetTableNode() ) &&
-            pTblNd->GetNodes().IsDocNodes() )
+    SwFrameFormats& rFormats = *GetTableFrameFormats();
+    SwTable* pTable;
+    const SwTableNode* pTableNd;
+    for( auto n = rFormats.size(); n ; )
+        if( 0 != (pTable = SwTable::FindTable( rFormats[ --n ] )) &&
+            0 != (pTableNd = pTable->GetTableNode() ) &&
+            pTableNd->GetNodes().IsDocNodes() )
         {
-            sal_uLong nTblIdx = pTblNd->GetIndex();
+            sal_uLong nTableIdx = pTableNd->GetIndex();
 
             // Check whether the Table is within the Selection
             if( bHasSel )
@@ -4531,8 +4531,8 @@ bool SwDoc::UnProtectTbls( const SwPaM& rPam )
                 do {
                     const SwPosition *pStt = pTmp->Start(),
                                     *pEnd = pTmp->End();
-                    bFound = pStt->nNode.GetIndex() < nTblIdx &&
-                            nTblIdx < pEnd->nNode.GetIndex();
+                    bFound = pStt->nNode.GetIndex() < nTableIdx &&
+                            nTableIdx < pEnd->nNode.GetIndex();
 
                 } while( !bFound && &rPam != ( pTmp = static_cast<SwPaM*>(pTmp->GetNext()) ) );
                 if( !bFound )
@@ -4540,7 +4540,7 @@ bool SwDoc::UnProtectTbls( const SwPaM& rPam )
             }
 
             // Lift the protection
-            bChgd |= _UnProtectTblCells( *pTbl );
+            bChgd |= _UnProtectTableCells( *pTable );
         }
 
     GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
@@ -4550,40 +4550,40 @@ bool SwDoc::UnProtectTbls( const SwPaM& rPam )
     return bChgd;
 }
 
-bool SwDoc::HasTblAnyProtection( const SwPosition* pPos,
-                                 const OUString* pTblName,
-                                 bool* pFullTblProtection )
+bool SwDoc::HasTableAnyProtection( const SwPosition* pPos,
+                                 const OUString* pTableName,
+                                 bool* pFullTableProtection )
 {
     bool bHasProtection = false;
-    SwTable* pTbl = 0;
-    if( pTblName )
-        pTbl = SwTable::FindTable( FindTblFmtByName( *pTblName ) );
+    SwTable* pTable = 0;
+    if( pTableName )
+        pTable = SwTable::FindTable( FindTableFormatByName( *pTableName ) );
     else if( pPos )
     {
-        SwTableNode* pTblNd = pPos->nNode.GetNode().FindTableNode();
-        if( pTblNd )
-            pTbl = &pTblNd->GetTable();
+        SwTableNode* pTableNd = pPos->nNode.GetNode().FindTableNode();
+        if( pTableNd )
+            pTable = &pTableNd->GetTable();
     }
 
-    if( pTbl )
+    if( pTable )
     {
-        SwTableSortBoxes& rSrtBox = pTbl->GetTabSortBoxes();
+        SwTableSortBoxes& rSrtBox = pTable->GetTabSortBoxes();
         for (size_t i = rSrtBox.size(); i; )
         {
-            SwFrmFmt *pBoxFmt = rSrtBox[ --i ]->GetFrmFmt();
-            if( pBoxFmt->GetProtect().IsCntntProtected() )
+            SwFrameFormat *pBoxFormat = rSrtBox[ --i ]->GetFrameFormat();
+            if( pBoxFormat->GetProtect().IsContentProtected() )
             {
                 if( !bHasProtection )
                 {
                     bHasProtection = true;
-                    if( !pFullTblProtection )
+                    if( !pFullTableProtection )
                         break;
-                    *pFullTblProtection = true;
+                    *pFullTableProtection = true;
                 }
             }
-            else if( bHasProtection && pFullTblProtection )
+            else if( bHasProtection && pFullTableProtection )
             {
-                *pFullTblProtection = false;
+                *pFullTableProtection = false;
                 break;
             }
         }
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 341132376990..e405c5f2a2fa 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -60,25 +60,25 @@ using namespace ::com::sun::star;
 
 inline bool IsSame( long nA, long nB ) { return  std::abs(nA-nB) <= COLFUZZY; }
 
-class SwTblFmtCmp
+class SwTableFormatCmp
 {
 public:
-    SwFrmFmt *pOld,
+    SwFrameFormat *pOld,
              *pNew;
     sal_Int16     nType;
 
-    SwTblFmtCmp( SwFrmFmt *pOld, SwFrmFmt *pNew, sal_Int16 nType );
+    SwTableFormatCmp( SwFrameFormat *pOld, SwFrameFormat *pNew, sal_Int16 nType );
 
-    static SwFrmFmt *FindNewFmt( std::vector<SwTblFmtCmp*> &rArr, SwFrmFmt*pOld, sal_Int16 nType );
-    static void Delete( std::vector<SwTblFmtCmp*> &rArr );
+    static SwFrameFormat *FindNewFormat( std::vector<SwTableFormatCmp*> &rArr, SwFrameFormat*pOld, sal_Int16 nType );
+    static void Delete( std::vector<SwTableFormatCmp*> &rArr );
 };
 
-SwTblFmtCmp::SwTblFmtCmp( SwFrmFmt *pO, SwFrmFmt *pN, sal_Int16 nT )
+SwTableFormatCmp::SwTableFormatCmp( SwFrameFormat *pO, SwFrameFormat *pN, sal_Int16 nT )
     : pOld ( pO ), pNew ( pN ), nType( nT )
 {
 }
 
-SwFrmFmt *SwTblFmtCmp::FindNewFmt( std::vector<SwTblFmtCmp*> &rArr, SwFrmFmt *pOld, sal_Int16 nType )
+SwFrameFormat *SwTableFormatCmp::FindNewFormat( std::vector<SwTableFormatCmp*> &rArr, SwFrameFormat *pOld, sal_Int16 nType )
 {
     for ( auto pCmp : rArr )
     {
@@ -88,7 +88,7 @@ SwFrmFmt *SwTblFmtCmp::FindNewFmt( std::vector<SwTblFmtCmp*> &rArr, SwFrmFmt *pO
     return 0;
 }
 
-void SwTblFmtCmp::Delete( std::vector<SwTblFmtCmp*> &rArr )
+void SwTableFormatCmp::Delete( std::vector<SwTableFormatCmp*> &rArr )
 {
     for ( auto pCmp : rArr )
         delete pCmp;
@@ -97,7 +97,7 @@ void SwTblFmtCmp::Delete( std::vector<SwTblFmtCmp*> &rArr )
 static void lcl_GetStartEndCell( const SwCursor& rCrsr,
                         SwLayoutFrm *&prStart, SwLayoutFrm *&prEnd )
 {
-    OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( false ),
+    OSL_ENSURE( rCrsr.GetContentNode() && rCrsr.GetContentNode( false ),
             "Tab selection not at ContentNode" );
 
     Point aPtPos, aMkPos;
@@ -109,8 +109,8 @@ static void lcl_GetStartEndCell( const SwCursor& rCrsr,
     }
 
     // Robust:
-    SwCntntNode* pPointNd = rCrsr.GetCntntNode();
-    SwCntntNode* pMarkNd  = rCrsr.GetCntntNode(false);
+    SwContentNode* pPointNd = rCrsr.GetContentNode();
+    SwContentNode* pMarkNd  = rCrsr.GetContentNode(false);
 
     SwFrm* pPointFrm = pPointNd ? pPointNd->getLayoutFrm( pPointNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPtPos ) : 0;
     SwFrm* pMarkFrm  = pMarkNd  ? pMarkNd->getLayoutFrm( pMarkNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aMkPos )  : 0;
@@ -122,10 +122,10 @@ static void lcl_GetStartEndCell( const SwCursor& rCrsr,
 static bool lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
                     bool bAllCrsr = false )
 {
-    const SwTableCursor* pTblCrsr =
+    const SwTableCursor* pTableCrsr =
         dynamic_cast<const SwTableCursor*>(&rCursor);
-    if( pTblCrsr )
-        ::GetTblSelCrs( *pTblCrsr, rBoxes );
+    if( pTableCrsr )
+        ::GetTableSelCrs( *pTableCrsr, rBoxes );
     else
     {
         const SwPaM *pCurPam = &rCursor, *pSttPam = pCurPam;
@@ -134,7 +134,7 @@ static bool lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
             if( pNd )
             {
                 SwTableBox* pBox = const_cast<SwTableBox*>(pNd->FindTableNode()->GetTable().
-                                            GetTblBox( pNd->GetIndex() ));
+                                            GetTableBox( pNd->GetIndex() ));
                 rBoxes.insert( pBox );
             }
         } while( bAllCrsr &&
@@ -168,8 +168,8 @@ struct LinesAndTable
     const SwTable             &m_rTable;
     bool                      m_bInsertLines;
 
-    LinesAndTable(std::vector<SwTableLine*> &rL, const SwTable &rTbl) :
-          m_rLines(rL), m_rTable(rTbl), m_bInsertLines(true) {}
+    LinesAndTable(std::vector<SwTableLine*> &rL, const SwTable &rTable) :
+          m_rLines(rL), m_rTable(rTable), m_bInsertLines(true) {}
 };
 
 bool _FindLine( _FndLine & rLine, LinesAndTable* pPara );
@@ -253,46 +253,46 @@ static void lcl_CollectLines( std::vector<SwTableLine*> &rArr, const SwCursor& r
     }
 }
 
-static void lcl_ProcessRowAttr( std::vector<SwTblFmtCmp*>& rFmtCmp, SwTableLine* pLine, const SfxPoolItem& rNew )
+static void lcl_ProcessRowAttr( std::vector<SwTableFormatCmp*>& rFormatCmp, SwTableLine* pLine, const SfxPoolItem& rNew )
 {
-    SwFrmFmt *pNewFmt;
-    if ( 0 != (pNewFmt = SwTblFmtCmp::FindNewFmt( rFmtCmp, pLine->GetFrmFmt(), 0 )))
-        pLine->ChgFrmFmt( static_cast<SwTableLineFmt*>(pNewFmt) );
+    SwFrameFormat *pNewFormat;
+    if ( 0 != (pNewFormat = SwTableFormatCmp::FindNewFormat( rFormatCmp, pLine->GetFrameFormat(), 0 )))
+        pLine->ChgFrameFormat( static_cast<SwTableLineFormat*>(pNewFormat) );
     else
     {
-        SwFrmFmt *pOld = pLine->GetFrmFmt();
-        SwFrmFmt *pNew = pLine->ClaimFrmFmt();
-        pNew->SetFmtAttr( rNew );
-        rFmtCmp.push_back( new SwTblFmtCmp( pOld, pNew, 0 ) );
+        SwFrameFormat *pOld = pLine->GetFrameFormat();
+        SwFrameFormat *pNew = pLine->ClaimFrameFormat();
+        pNew->SetFormatAttr( rNew );
+        rFormatCmp.push_back( new SwTableFormatCmp( pOld, pNew, 0 ) );
     }
 }
 
-static void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *pBox, const SwFmtFrmSize &rNew );
+static void lcl_ProcessBoxSize( std::vector<SwTableFormatCmp*> &rFormatCmp, SwTableBox *pBox, const SwFormatFrmSize &rNew );
 
-static void lcl_ProcessRowSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableLine *pLine, const SwFmtFrmSize &rNew )
+static void lcl_ProcessRowSize( std::vector<SwTableFormatCmp*> &rFormatCmp, SwTableLine *pLine, const SwFormatFrmSize &rNew )
 {
-    lcl_ProcessRowAttr( rFmtCmp, pLine, rNew );
+    lcl_ProcessRowAttr( rFormatCmp, pLine, rNew );
     SwTableBoxes &rBoxes = pLine->GetTabBoxes();
     for ( auto pBox : rBoxes )
-        ::lcl_ProcessBoxSize( rFmtCmp, pBox, rNew );
+        ::lcl_ProcessBoxSize( rFormatCmp, pBox, rNew );
 }
 
-static void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *pBox, const SwFmtFrmSize &rNew )
+static void lcl_ProcessBoxSize( std::vector<SwTableFormatCmp*> &rFormatCmp, SwTableBox *pBox, const SwFormatFrmSize &rNew )
 {
     SwTableLines &rLines = pBox->GetTabLines();
     if ( !rLines.empty() )
     {
-        SwFmtFrmSize aSz( rNew );
+        SwFormatFrmSize aSz( rNew );
         aSz.SetHeight( rNew.GetHeight() ? rNew.GetHeight() / rLines.size() : 0 );
         for ( auto pLine : rLines )
-            ::lcl_ProcessRowSize( rFmtCmp, pLine, aSz );
+            ::lcl_ProcessRowSize( rFormatCmp, pLine, aSz );
     }
 }
 
-void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew )
+void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFormatRowSplit &rNew )
 {
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, false );
@@ -301,40 +301,40 @@ void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew )
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
-                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd));
+                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTable(*pTableNd));
             }
 
-            std::vector<SwTblFmtCmp*> aFmtCmp;
-            aFmtCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
+            std::vector<SwTableFormatCmp*> aFormatCmp;
+            aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
 
             for( auto pLn : aRowArr )
-                ::lcl_ProcessRowAttr( aFmtCmp, pLn, rNew );
+                ::lcl_ProcessRowAttr( aFormatCmp, pLn, rNew );
 
-            SwTblFmtCmp::Delete( aFmtCmp );
+            SwTableFormatCmp::Delete( aFormatCmp );
             getIDocumentState().SetModified();
         }
     }
 }
 
-void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz )
+void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFormatRowSplit *& rpSz )
 {
     rpSz = 0;
 
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, false );
 
         if( !aRowArr.empty() )
         {
-            rpSz = &(SwFmtRowSplit&)aRowArr[0]->GetFrmFmt()->GetRowSplit();
+            rpSz = &(SwFormatRowSplit&)aRowArr[0]->GetFrameFormat()->GetRowSplit();
 
             if (rpSz)
             {
                 for ( auto pLn : aRowArr )
                 {
-                    if ( (*rpSz).GetValue() != pLn->GetFrmFmt()->GetRowSplit().GetValue() )
+                    if ( (*rpSz).GetValue() != pLn->GetFrameFormat()->GetRowSplit().GetValue() )
                     {
                         rpSz = 0;
                         break;
@@ -342,7 +342,7 @@ void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz )
                 }
             }
             if ( rpSz )
-                rpSz = new SwFmtRowSplit( *rpSz );
+                rpSz = new SwFormatRowSplit( *rpSz );
         }
     }
 }
@@ -358,14 +358,14 @@ void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz )
  * a respective value that is calculated from the relation of the old and
  * new size of the topmost Line in the lower line's own size.
  *
- * All changed Lines may get an own FrmFmt.
+ * All changed Lines may get an own FrameFormat.
  * Of course we can only touch every Line once.
  */
 
-void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew )
+void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFormatFrmSize &rNew )
 {
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, true );
@@ -374,39 +374,39 @@ void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew )
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
-                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd));
+                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTable(*pTableNd));
             }
 
-            std::vector<SwTblFmtCmp*> aFmtCmp;
-            aFmtCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
+            std::vector<SwTableFormatCmp*> aFormatCmp;
+            aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
             for ( auto pLn : aRowArr )
-                ::lcl_ProcessRowSize( aFmtCmp, pLn, rNew );
-            SwTblFmtCmp::Delete( aFmtCmp );
+                ::lcl_ProcessRowSize( aFormatCmp, pLn, rNew );
+            SwTableFormatCmp::Delete( aFormatCmp );
 
             getIDocumentState().SetModified();
         }
     }
 }
 
-void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz )
+void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFormatFrmSize *& rpSz )
 {
     rpSz = 0;
 
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, true );
 
         if( !aRowArr.empty() )
         {
-            rpSz = &(SwFmtFrmSize&)aRowArr[0]->GetFrmFmt()->GetFrmSize();
+            rpSz = &(SwFormatFrmSize&)aRowArr[0]->GetFrameFormat()->GetFrmSize();
 
             if (rpSz)
             {
                 for ( auto pLn : aRowArr )
                 {
-                    if ( *rpSz != pLn->GetFrmFmt()->GetFrmSize() )
+                    if ( *rpSz != pLn->GetFrameFormat()->GetFrmSize() )
                     {
                         rpSz = 0;
                         break;
@@ -414,7 +414,7 @@ void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz )
                 }
             }
             if ( rpSz )
-                rpSz = new SwFmtFrmSize( *rpSz );
+                rpSz = new SwFormatFrmSize( *rpSz );
         }
     }
 }
@@ -422,8 +422,8 @@ void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz )
 bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly )
 {
     bool bRet = false;
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, true );
@@ -436,7 +436,7 @@ bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly )
 
                 for ( auto pLn : aRowArr )
                 {
-                    SwIterator<SwFrm,SwFmt> aIter( *pLn->GetFrmFmt() );
+                    SwIterator<SwFrm,SwFormat> aIter( *pLn->GetFrameFormat() );
                     SwFrm* pFrm = aIter.First();
                     while ( pFrm )
                     {
@@ -444,19 +444,19 @@ bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly )
                         pFrm = aIter.Next();
                     }
                 }
-                SwFmtFrmSize aNew( ATT_MIN_SIZE, 0, nHeight );
+                SwFormatFrmSize aNew( ATT_MIN_SIZE, 0, nHeight );
 
                 if (GetIDocumentUndoRedo().DoesUndo())
                 {
                     GetIDocumentUndoRedo().AppendUndo(
-                            new SwUndoAttrTbl(*pTblNd));
+                            new SwUndoAttrTable(*pTableNd));
                 }
 
-                std::vector<SwTblFmtCmp*> aFmtCmp;
-                aFmtCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
+                std::vector<SwTableFormatCmp*> aFormatCmp;
+                aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
                 for( auto pLn : aRowArr )
-                    ::lcl_ProcessRowSize( aFmtCmp, pLn, aNew );
-                SwTblFmtCmp::Delete( aFmtCmp );
+                    ::lcl_ProcessRowSize( aFormatCmp, pLn, aNew );
+                SwTableFormatCmp::Delete( aFormatCmp );
 
                 getIDocumentState().SetModified();
             }
@@ -468,8 +468,8 @@ bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly )
 
 void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew )
 {
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, true );
@@ -478,16 +478,16 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
-                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd));
+                GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTable(*pTableNd));
             }
 
-            std::vector<SwTblFmtCmp*> aFmtCmp;
-            aFmtCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
+            std::vector<SwTableFormatCmp*> aFormatCmp;
+            aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) );
 
             for( auto pLn : aRowArr )
-                ::lcl_ProcessRowAttr( aFmtCmp, pLn, rNew );
+                ::lcl_ProcessRowAttr( aFormatCmp, pLn, rNew );
 
-            SwTblFmtCmp::Delete( aFmtCmp );
+            SwTableFormatCmp::Delete( aFormatCmp );
             getIDocumentState().SetModified();
         }
     }
@@ -496,19 +496,19 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew
 bool SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill )
 {
     bool bRet = false;
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    if( pTableNd )
     {
         std::vector<SwTableLine*> aRowArr; // For Lines collecting
         ::lcl_CollectLines( aRowArr, rCursor, true );
 
         if( !aRowArr.empty() )
         {
-            rToFill = aRowArr[0]->GetFrmFmt()->makeBackgroundBrushItem();
+            rToFill = aRowArr[0]->GetFrameFormat()->makeBackgroundBrushItem();
 
             bRet = true;
             for ( std::vector<SwTableLine*>::size_type i = 1; i < aRowArr.size(); ++i )
-                if ( rToFill != aRowArr[i]->GetFrmFmt()->makeBackgroundBrushItem() )
+                if ( rToFill != aRowArr[i]->GetFrameFormat()->makeBackgroundBrushItem() )
                 {
                     bRet = false;
                     break;
@@ -549,9 +549,9 @@ static void lcl_CollectCells( std::vector<SwCellFrm*> &rArr, const SwRect &rUnio
 
 void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
 {
-    SwCntntNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetCntntNode();
-    SwTableNode* pTblNd = pCntNd ? pCntNd->FindTableNode() : 0;
-    if( !pTblNd )
+    SwContentNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetContentNode();
+    SwTableNode* pTableNd = pCntNd ? pCntNd->FindTableNode() : 0;
+    if( !pTableNd )
         return ;
 
     SwLayoutFrm *pStart, *pEnd;
@@ -562,14 +562,14 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
 
     if( !aUnions.empty() )
     {
-        SwTable& rTable = pTblNd->GetTable();
+        SwTable& rTable = pTableNd->GetTable();
         if (GetIDocumentUndoRedo().DoesUndo())
         {
-            GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTbl(*pTblNd) );
+            GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTable(*pTableNd) );
         }
 
-        std::vector<SwTblFmtCmp*> aFmtCmp;
-        aFmtCmp.reserve( 255 );
+        std::vector<SwTableFormatCmp*> aFormatCmp;
+        aFormatCmp.reserve( 255 );
         const SvxBoxItem* pSetBox;
         const SvxBoxInfoItem *pSetBoxInfo;
 
@@ -669,7 +669,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
                        pCell->IsInFollowFlowRow() ) )
                     continue;
 
-                SvxBoxItem aBox( pCell->GetFmt()->GetBox() );
+                SvxBoxItem aBox( pCell->GetFormat()->GetBox() );
 
                 sal_Int16 nType = 0;
 
@@ -781,15 +781,15 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
                 }
 
                 SwTableBox *pBox = const_cast<SwTableBox*>(pCell->GetTabBox());
-                SwFrmFmt *pNewFmt;
-                if ( 0 != (pNewFmt = SwTblFmtCmp::FindNewFmt( aFmtCmp, pBox->GetFrmFmt(), nType )))
-                    pBox->ChgFrmFmt( static_cast<SwTableBoxFmt*>(pNewFmt) );
+                SwFrameFormat *pNewFormat;
+                if ( 0 != (pNewFormat = SwTableFormatCmp::FindNewFormat( aFormatCmp, pBox->GetFrameFormat(), nType )))
+                    pBox->ChgFrameFormat( static_cast<SwTableBoxFormat*>(pNewFormat) );
                 else
                 {
-                    SwFrmFmt *pOld = pBox->GetFrmFmt();
-                    SwFrmFmt *pNew = pBox->ClaimFrmFmt();
-                    pNew->SetFmtAttr( aBox );
-                    aFmtCmp.push_back( new SwTblFmtCmp( pOld, pNew, nType ) );
+                    SwFrameFormat *pOld = pBox->GetFrameFormat();
+                    SwFrameFormat *pNew = pBox->ClaimFrameFormat();
+                    pNew->SetFormatAttr( aBox );
+                    aFormatCmp.push_back( new SwTableFormatCmp( pOld, pNew, nType ) );
                 }
             }
 
@@ -799,13 +799,13 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
         SwHTMLTableLayout *pTableLayout = rTable.GetHTMLTableLayout();
         if( pTableLayout )
         {
-            SwCntntFrm* pFrm = rCursor.GetCntntNode()->getLayoutFrm( rCursor.GetCntntNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+            SwContentFrm* pFrm = rCursor.GetContentNode()->getLayoutFrm( rCursor.GetContentNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
             SwTabFrm* pTabFrm = pFrm->ImplFindTabFrm();
 
             pTableLayout->BordersChanged(
                 pTableLayout->GetBrowseWidthByTabFrm( *pTabFrm ), true );
         }
-        SwTblFmtCmp::Delete( aFmtCmp );
+        SwTableFormatCmp::Delete( aFormatCmp );
         ::ClearFEShellTabCols();
         getIDocumentState().SetModified();
     }
@@ -833,9 +833,9 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
                              const Color* pColor, bool bSetLine,
                              const SvxBorderLine* pBorderLine )
 {
-    SwCntntNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetCntntNode();
-    SwTableNode* pTblNd = pCntNd ? pCntNd->FindTableNode() : 0;
-    if( !pTblNd )
+    SwContentNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetContentNode();
+    SwTableNode* pTableNd = pCntNd ? pCntNd->FindTableNode() : 0;
+    if( !pTableNd )
         return ;
 
     SwLayoutFrm *pStart, *pEnd;
@@ -846,10 +846,10 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
 
     if( !aUnions.empty() )
     {
-        SwTable& rTable = pTblNd->GetTable();
+        SwTable& rTable = pTableNd->GetTable();
         if (GetIDocumentUndoRedo().DoesUndo())
         {
-            GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd));
+            GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTable(*pTableNd));
         }
 
         for( auto &rU : aUnions )
@@ -866,9 +866,9 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
                 if ( pTab->IsFollow() && pTab->IsInHeadline( *pCell ) )
                     continue;
 
-                const_cast<SwTableBox*>(pCell->GetTabBox())->ClaimFrmFmt();
-                SwFrmFmt *pFmt = pCell->GetFmt();
-                SvxBoxItem aBox( pFmt->GetBox() );
+                const_cast<SwTableBox*>(pCell->GetTabBox())->ClaimFrameFormat();
+                SwFrameFormat *pFormat = pCell->GetFormat();
+                SvxBoxItem aBox( pFormat->GetBox() );
 
                 if ( !pBorderLine && bSetLine )
                     aBox = *static_cast<const SvxBoxItem*>(::GetDfltAttr( RES_BOX ));
@@ -887,14 +887,14 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
                         ::lcl_SetLineStyle( const_cast<SvxBorderLine*>(aBox.GetRight()),
                                         pColor, pBorderLine );
                 }
-                pFmt->SetFmtAttr( aBox );
+                pFormat->SetFormatAttr( aBox );
             }
         }
 
         SwHTMLTableLayout *pTableLayout = rTable.GetHTMLTableLayout();
         if( pTableLayout )
         {
-            SwCntntFrm* pFrm = rCursor.GetCntntNode()->getLayoutFrm( rCursor.GetCntntNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+            SwContentFrm* pFrm = rCursor.GetContentNode()->getLayoutFrm( rCursor.GetContentNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
             SwTabFrm* pTabFrm = pFrm->ImplFindTabFrm();
 
             pTableLayout->BordersChanged(
@@ -907,9 +907,9 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
 
 void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
 {
-    SwCntntNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetCntntNode();
-    SwTableNode* pTblNd = pCntNd ? pCntNd->FindTableNode() : 0;
-    if( !pTblNd )
+    SwContentNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetContentNode();
+    SwTableNode* pTableNd = pCntNd ? pCntNd->FindTableNode() : 0;
+    if( !pTableNd )
         return ;
 
     SwLayoutFrm *pStart, *pEnd;
@@ -973,8 +973,8 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
                     bLeftOver = bTmp;
                 }
 
-                const SwFrmFmt  *pFmt  = pCell->GetFmt();
-                const SvxBoxItem  &rBox  = pFmt->GetBox();
+                const SwFrameFormat  *pFormat  = pCell->GetFormat();
+                const SvxBoxItem  &rBox  = pFormat->GetBox();
 
                 // Top Border
                 if ( bFirst && bTopOver )
@@ -1128,44 +1128,44 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
 
 void SwDoc::SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew )
 {
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
     SwSelBoxes aBoxes;
-    if( pTblNd && ::lcl_GetBoxSel( rCursor, aBoxes, true ) )
+    if( pTableNd && ::lcl_GetBoxSel( rCursor, aBoxes, true ) )
     {
-        SwTable& rTable = pTblNd->GetTable();
+        SwTable& rTable = pTableNd->GetTable();
         if (GetIDocumentUndoRedo().DoesUndo())
         {
-            GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTbl(*pTblNd) );
+            GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTable(*pTableNd) );
         }
 
-        std::vector<SwTblFmtCmp*> aFmtCmp;
-        aFmtCmp.reserve(std::max<size_t>(255, aBoxes.size()));
+        std::vector<SwTableFormatCmp*> aFormatCmp;
+        aFormatCmp.reserve(std::max<size_t>(255, aBoxes.size()));
         for (size_t i = 0; i < aBoxes.size(); ++i)
         {
             SwTableBox *pBox = aBoxes[i];
 
-            SwFrmFmt *pNewFmt;
-            if ( 0 != (pNewFmt = SwTblFmtCmp::FindNewFmt( aFmtCmp, pBox->GetFrmFmt(), 0 )))
-                pBox->ChgFrmFmt( static_cast<SwTableBoxFmt*>(pNewFmt) );
+            SwFrameFormat *pNewFormat;
+            if ( 0 != (pNewFormat = SwTableFormatCmp::FindNewFormat( aFormatCmp, pBox->GetFrameFormat(), 0 )))
+                pBox->ChgFrameFormat( static_cast<SwTableBoxFormat*>(pNewFormat) );
             else
             {
-                SwFrmFmt *pOld = pBox->GetFrmFmt();
-                SwFrmFmt *pNew = pBox->ClaimFrmFmt();
-                pNew->SetFmtAttr( rNew );
-                aFmtCmp.push_back( new SwTblFmtCmp( pOld, pNew, 0 ) );
+                SwFrameFormat *pOld = pBox->GetFrameFormat();
+                SwFrameFormat *pNew = pBox->ClaimFrameFormat();
+                pNew->SetFormatAttr( rNew );
+                aFormatCmp.push_back( new SwTableFormatCmp( pOld, pNew, 0 ) );
             }
         }
 
         SwHTMLTableLayout *pTableLayout = rTable.GetHTMLTableLayout();
         if( pTableLayout )
         {
-            SwCntntFrm* pFrm = rCursor.GetCntntNode()->getLayoutFrm( rCursor.GetCntntNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+            SwContentFrm* pFrm = rCursor.GetContentNode()->getLayoutFrm( rCursor.GetContentNode()->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
             SwTabFrm* pTabFrm = pFrm->ImplFindTabFrm();
 
             pTableLayout->Resize(
                 pTableLayout->GetBrowseWidthByTabFrm( *pTabFrm ), true );
         }
-        SwTblFmtCmp::Delete( aFmtCmp );
+        SwTableFormatCmp::Delete( aFormatCmp );
         getIDocumentState().SetModified();
     }
 }
@@ -1173,9 +1173,9 @@ void SwDoc::SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew )
 bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill )
 {
     bool bRet = false;
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
     SwSelBoxes aBoxes;
-    if( pTblNd && lcl_GetBoxSel( rCursor, aBoxes ))
+    if( pTableNd && lcl_GetBoxSel( rCursor, aBoxes ))
     {
         bRet = true;
         bool bOneFound = false;
@@ -1187,7 +1187,7 @@ bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill )
                 case RES_BACKGROUND:
                 {
                     SvxBrushItem aBack =
-                        aBoxes[i]->GetFrmFmt()->makeBackgroundBrushItem();
+                        aBoxes[i]->GetFrameFormat()->makeBackgroundBrushItem();
                     if( !bOneFound )
                     {
                         static_cast<SvxBrushItem&>(rToFill) = aBack;
@@ -1201,7 +1201,7 @@ bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill )
                 case RES_FRAMEDIR:
                 {
                     const SvxFrameDirectionItem& rDir =
-                                    aBoxes[i]->GetFrmFmt()->GetFrmDir();
+                                    aBoxes[i]->GetFrameFormat()->GetFrmDir();
                     if( !bOneFound )
                     {
                         static_cast<SvxFrameDirectionItem&>(rToFill) = rDir;
@@ -1224,21 +1224,21 @@ void SwDoc::SetBoxAlign( const SwCursor& rCursor, sal_uInt16 nAlign )
     OSL_ENSURE( nAlign == text::VertOrientation::NONE   ||
             nAlign == text::VertOrientation::CENTER ||
             nAlign == text::VertOrientation::BOTTOM, "Wrong alignment" );
-    SwFmtVertOrient aVertOri( 0, nAlign );
+    SwFormatVertOrient aVertOri( 0, nAlign );
     SetBoxAttr( rCursor, aVertOri );
 }
 
 sal_uInt16 SwDoc::GetBoxAlign( const SwCursor& rCursor )
 {
     sal_uInt16 nAlign = USHRT_MAX;
-    SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
+    SwTableNode* pTableNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
     SwSelBoxes aBoxes;
-    if( pTblNd && ::lcl_GetBoxSel( rCursor, aBoxes ))
+    if( pTableNd && ::lcl_GetBoxSel( rCursor, aBoxes ))
     {
         for (size_t i = 0; i < aBoxes.size(); ++i)
         {
-            const SwFmtVertOrient &rOri =
-                            aBoxes[i]->GetFrmFmt()->GetVertOrient();
+            const SwFormatVertOrient &rOri =
+                            aBoxes[i]->GetFrameFormat()->GetVertOrient();
             if( USHRT_MAX == nAlign )
                 nAlign = static_cast<sal_uInt16>(rOri.GetVertOrient());
             else if( rOri.GetVertOrient() != nAlign )
@@ -1261,9 +1261,9 @@ static sal_uInt16 lcl_CalcCellFit( const SwLayoutFrm *pCell )
         const SwTwips nAdd = (pFrm->Frm().*fnRect->fnGetWidth)() -
                              (pFrm->Prt().*fnRect->fnGetWidth)();
 
-        // pFrm does not necessarily have to be a SwTxtFrm!
-        const SwTwips nCalcFitToContent = pFrm->IsTxtFrm() ?
-                                          const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pFrm))->CalcFitToContent() :
+        // pFrm does not necessarily have to be a SwTextFrm!
+        const SwTwips nCalcFitToContent = pFrm->IsTextFrm() ?
+                                          const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pFrm))->CalcFitToContent() :
                                           (pFrm->Prt().*fnRect->fnGetWidth)();
 
         nRet = std::max( nRet, nCalcFitToContent + nAdd );
@@ -1359,7 +1359,7 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
 {
     SwSelUnions aUnions;
     ::MakeSelUnions( aUnions, pStart, pEnd,
-                    bWishValues ? nsSwTblSearchType::TBLSEARCH_NONE : nsSwTblSearchType::TBLSEARCH_COL );
+                    bWishValues ? nsSwTableSearchType::TBLSEARCH_NONE : nsSwTableSearchType::TBLSEARCH_COL );
 
     for ( auto &rU : aUnions )
     {
@@ -1375,7 +1375,7 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
             continue;
         do
         {
-            if ( pCell->IsCellFrm() && pCell->FindTabFrm() == pTab && ::IsFrmInTblSel( rUnion, pCell ) )
+            if ( pCell->IsCellFrm() && pCell->FindTabFrm() == pTab && ::IsFrmInTableSel( rUnion, pCell ) )
             {
                 const long nCLeft  = (pCell->Frm().*fnRect->fnGetLeft)();
                 const long nCRight = (pCell->Frm().*fnRect->fnGetRight)();
@@ -1441,9 +1441,9 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
 void SwDoc::AdjustCellWidth( const SwCursor& rCursor, bool bBalance )
 {
     // Check whether the current Crsr has it's Point/Mark in a Table
-    SwCntntNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetCntntNode();
-    SwTableNode* pTblNd = pCntNd ? pCntNd->FindTableNode() : 0;
-    if( !pTblNd )
+    SwContentNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetContentNode();
+    SwTableNode* pTableNd = pCntNd ? pCntNd->FindTableNode() : 0;
+    if( !pTableNd )
         return ;
 
     SwLayoutFrm *pStart, *pEnd;
@@ -1471,7 +1471,7 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, bool bBalance )
     // It's more robust if we calculate the minimum values for the whole Table
     const SwTabFrm *pTab = pStart->ImplFindTabFrm();
     pStart = (SwLayoutFrm*)pTab->FirstCell();
-    pEnd   = const_cast<SwLayoutFrm*>(pTab->FindLastCntnt()->GetUpper());
+    pEnd   = const_cast<SwLayoutFrm*>(pTab->FindLastContent()->GetUpper());
     while( !pEnd->IsCellFrm() )
         pEnd = pEnd->GetUpper();
     ::lcl_CalcColValues( aMins, aTabCols, pStart, pEnd, false );
@@ -1553,19 +1553,19 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, bool bBalance )
 
     const long nNewRight = aTabCols.GetRight();
 
-    SwFrmFmt *pFmt = pTblNd->GetTable().GetFrmFmt();
-    const sal_Int16 nOriHori = pFmt->GetHoriOrient().GetHoriOrient();
+    SwFrameFormat *pFormat = pTableNd->GetTable().GetFrameFormat();
+    const sal_Int16 nOriHori = pFormat->GetHoriOrient().GetHoriOrient();
 
     // We can leave the "real" work to the SwTable now
     SetTabCols( aTabCols, false, 0, static_cast<SwCellFrm*>(pBoxFrm) );
 
     // Alignment might have been changed in SetTabCols; restore old value
-    const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient();
-    SwFmtHoriOrient aHori( rHori );
+    const SwFormatHoriOrient &rHori = pFormat->GetHoriOrient();
+    SwFormatHoriOrient aHori( rHori );
     if ( aHori.GetHoriOrient() != nOriHori )
     {
         aHori.SetHoriOrient( nOriHori );
-        pFmt->SetFmtAttr( aHori );
+        pFormat->SetFormatAttr( aHori );
     }
 
     // We switch to left-adjusted for automatic width
@@ -1575,7 +1575,7 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, bool bBalance )
         if( aHori.GetHoriOrient() == text::HoriOrientation::FULL )
         {
             aHori.SetHoriOrient( text::HoriOrientation::LEFT );
-            pFmt->SetFmtAttr( aHori );
+            pFormat->SetFormatAttr( aHori );
         }
     }
 
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 0f01281fb979..6cacd008e309 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -69,7 +69,7 @@
 
 using namespace ::com::sun::star::i18n;
 
-TYPEINIT2( SwCntntNode, SwModify, SwIndexReg )
+TYPEINIT2( SwContentNode, SwModify, SwIndexReg )
 
 /*
  * Some local helper functions for the attribute set handle of a content node.
@@ -82,14 +82,14 @@ namespace AttrSetHandleHelper
 {
 
 void GetNewAutoStyle( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-                      const SwCntntNode& rNode,
+                      const SwContentNode& rNode,
                       SwAttrSet& rNewAttrSet )
 {
     const SwAttrSet* pAttrSet = static_cast<const SwAttrSet*>(rpAttrSet.get());
     if( rNode.GetModifyAtAttr() )
         const_cast<SwAttrSet*>(pAttrSet)->SetModifyAtAttr( 0 );
     IStyleAccess& rSA = pAttrSet->GetPool()->GetDoc()->GetIStyleAccess();
-    rpAttrSet = rSA.getAutomaticStyle( rNewAttrSet, rNode.IsTxtNode() ?
+    rpAttrSet = rSA.getAutomaticStyle( rNewAttrSet, rNode.IsTextNode() ?
                                                      IStyleAccess::AUTO_STYLE_PARA :
                                                      IStyleAccess::AUTO_STYLE_NOTXT );
     const bool bSetModifyAtAttr = const_cast<SwAttrSet*>(static_cast<const SwAttrSet*>(rpAttrSet.get()))->SetModifyAtAttr( &rNode );
@@ -97,15 +97,15 @@ void GetNewAutoStyle( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 }
 
 void SetParent( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-                const SwCntntNode& rNode,
-                const SwFmt* pParentFmt,
-                const SwFmt* pConditionalFmt )
+                const SwContentNode& rNode,
+                const SwFormat* pParentFormat,
+                const SwFormat* pConditionalFormat )
 {
     const SwAttrSet* pAttrSet = static_cast<const SwAttrSet*>(rpAttrSet.get());
     OSL_ENSURE( pAttrSet, "no SwAttrSet" );
-    OSL_ENSURE( pParentFmt || !pConditionalFmt, "ConditionalFmt without ParentFmt?" );
+    OSL_ENSURE( pParentFormat || !pConditionalFormat, "ConditionalFormat without ParentFormat?" );
 
-    const SwAttrSet* pParentSet = pParentFmt ? &pParentFmt->GetAttrSet() : 0;
+    const SwAttrSet* pParentSet = pParentFormat ? &pParentFormat->GetAttrSet() : 0;
 
     if ( pParentSet != pAttrSet->GetParent() )
     {
@@ -115,17 +115,17 @@ void SetParent( std::shared_ptr<const SfxItemSet>& rpAttrSet,
         aNewSet.ClearItem( RES_FRMATR_CONDITIONAL_STYLE_NAME );
         OUString sVal;
 
-        if ( pParentFmt )
+        if ( pParentFormat )
         {
-            SwStyleNameMapper::FillProgName( pParentFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
-            const SfxStringItem aAnyFmtColl( RES_FRMATR_STYLE_NAME, sVal );
-            aNewSet.Put( aAnyFmtColl );
+            SwStyleNameMapper::FillProgName( pParentFormat->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+            const SfxStringItem aAnyFormatColl( RES_FRMATR_STYLE_NAME, sVal );
+            aNewSet.Put( aAnyFormatColl );
 
-            if ( pConditionalFmt != pParentFmt )
-                SwStyleNameMapper::FillProgName( pConditionalFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+            if ( pConditionalFormat != pParentFormat )
+                SwStyleNameMapper::FillProgName( pConditionalFormat->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
 
-            const SfxStringItem aFmtColl( RES_FRMATR_CONDITIONAL_STYLE_NAME, sVal );
-            aNewSet.Put( aFmtColl );
+            const SfxStringItem aFormatColl( RES_FRMATR_CONDITIONAL_STYLE_NAME, sVal );
+            aNewSet.Put( aFormatColl );
         }
 
         GetNewAutoStyle( rpAttrSet, rNode, aNewSet );
@@ -133,7 +133,7 @@ void SetParent( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 }
 
 const SfxPoolItem* Put( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-                        const SwCntntNode& rNode,
+                        const SwContentNode& rNode,
                         const SfxPoolItem& rAttr )
 {
     SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -143,7 +143,7 @@ const SfxPoolItem* Put( std::shared_ptr<const SfxItemSet>& rpAttrSet,
     return pRet;
 }
 
-bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwCntntNode& rNode,
+bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwContentNode& rNode,
          const SfxItemSet& rSet )
 {
     SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -172,7 +172,7 @@ bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwCntntNode& rNode
 }
 
 bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-            const SwCntntNode& rNode, const SfxPoolItem& rAttr,
+            const SwContentNode& rNode, const SfxPoolItem& rAttr,
             SwAttrSet* pOld, SwAttrSet* pNew )
 {
     SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -191,7 +191,7 @@ bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 }
 
 bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-            const SwCntntNode& rNode, const SfxItemSet& rSet,
+            const SwContentNode& rNode, const SfxItemSet& rSet,
             SwAttrSet* pOld, SwAttrSet* pNew )
 {
     SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -225,7 +225,7 @@ bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 }
 
 sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-                     const SwCntntNode& rNode, sal_uInt16 nWhich,
+                     const SwContentNode& rNode, sal_uInt16 nWhich,
                      SwAttrSet* pOld, SwAttrSet* pNew )
 {
     SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) );
@@ -238,7 +238,7 @@ sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 }
 
 sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
-                     const SwCntntNode& rNode,
+                     const SwContentNode& rNode,
                      sal_uInt16 nWhich1, sal_uInt16 nWhich2,
                      SwAttrSet* pOld, SwAttrSet* pNew )
 {
@@ -256,7 +256,7 @@ sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
 /** Returns the section level at the position given by aIndex.
  *
  * We use the following logic:
- * S = Start, E = End, C = CntntNode
+ * S = Start, E = End, C = ContentNode
  * Level   0 = E
  *         1 = S E
  *         2 = SC
@@ -283,7 +283,7 @@ long SwNode::s_nSerial = 0;
 
 SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType )
     : nNodeType( nNdType )
-    , nAFmtNumLvl( 0 )
+    , nAFormatNumLvl( 0 )
     , bSetNumLSpace( false )
     , bIgnoreDontExpand( false)
 #ifdef DBG_UTIL
@@ -316,7 +316,7 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType )
  */
 SwNode::SwNode( SwNodes& rNodes, sal_uLong nPos, const sal_uInt8 nNdType )
     : nNodeType( nNdType )
-    , nAFmtNumLvl( 0 )
+    , nAFormatNumLvl( 0 )
     , bSetNumLSpace( false )
     , bIgnoreDontExpand( false)
 #ifdef DBG_UTIL
@@ -361,7 +361,7 @@ SwTableNode* SwNode::FindTableNode()
 bool SwNode::IsInVisibleArea( SwViewShell const * pSh ) const
 {
     bool bRet = false;
-    const SwCntntNode* pNd;
+    const SwContentNode* pNd;
 
     if( ND_STARTNODE & nNodeType )
     {
@@ -374,7 +374,7 @@ bool SwNode::IsInVisibleArea( SwViewShell const * pSh ) const
         pNd = SwNodes::GoPrevious( &aIdx );
     }
     else
-        pNd = GetCntntNode();
+        pNd = GetContentNode();
 
     if( !pSh )
         // Get the Shell from the Doc
@@ -421,32 +421,32 @@ bool SwNode::IsProtect() const
 
     if( 0 != ( pSttNd = FindTableBoxStartNode() ) )
     {
-        SwCntntFrm* pCFrm;
-        if( IsCntntNode() && 0 != (pCFrm = static_cast<const SwCntntNode*>(this)->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ))
+        SwContentFrm* pCFrm;
+        if( IsContentNode() && 0 != (pCFrm = static_cast<const SwContentNode*>(this)->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ))
             return pCFrm->IsProtected();
 
         const SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().
-                                        GetTblBox( pSttNd->GetIndex() );
+                                        GetTableBox( pSttNd->GetIndex() );
         //Robust #149568
-        if( pBox && pBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
+        if( pBox && pBox->GetFrameFormat()->GetProtect().IsContentProtected() )
             return true;
     }
 
-    SwFrmFmt* pFlyFmt = GetFlyFmt();
-    if( pFlyFmt )
+    SwFrameFormat* pFlyFormat = GetFlyFormat();
+    if( pFlyFormat )
     {
-        if( pFlyFmt->GetProtect().IsCntntProtected() )
+        if( pFlyFormat->GetProtect().IsContentProtected() )
             return true;
-        const SwFmtAnchor& rAnchor = pFlyFmt->GetAnchor();
-        return rAnchor.GetCntntAnchor() && rAnchor.GetCntntAnchor()->nNode.GetNode().IsProtect();
+        const SwFormatAnchor& rAnchor = pFlyFormat->GetAnchor();
+        return rAnchor.GetContentAnchor() && rAnchor.GetContentAnchor()->nNode.GetNode().IsProtect();
     }
 
     if( 0 != ( pSttNd = FindFootnoteStartNode() ) )
     {
-        const SwTxtFtn* pTFtn = GetDoc()->GetFtnIdxs().SeekEntry(
+        const SwTextFootnote* pTFootnote = GetDoc()->GetFootnoteIdxs().SeekEntry(
                                 SwNodeIndex( *pSttNd ) );
-        if( pTFtn )
-            return pTFtn->GetTxtNode().IsProtect();
+        if( pTFootnote )
+            return pTFootnote->GetTextNode().IsProtect();
     }
 
     return false;
@@ -464,7 +464,7 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
 
     const SwPageDesc* pPgDesc = 0;
 
-    const SwCntntNode* pNode;
+    const SwContentNode* pNode;
     if( ND_STARTNODE & nNodeType )
     {
         SwNodeIndex aIdx( *this );
@@ -477,9 +477,9 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
     }
     else
     {
-        pNode = GetCntntNode();
+        pNode = GetContentNode();
         if( pNode )
-            pPgDesc = static_cast<const SwFmtPageDesc&>(pNode->GetAttr( RES_PAGEDESC )).GetPageDesc();
+            pPgDesc = static_cast<const SwFormatPageDesc&>(pNode->GetAttr( RES_PAGEDESC )).GetPageDesc();
     }
 
     // Are we going through the layout?
@@ -508,60 +508,60 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
             0 != ( pSttNd = pNd->FindFlyStartNode() ) )
         {
             // Find the right Anchor first
-            const SwFrmFmt* pFmt = 0;
-            const SwFrmFmts& rFmts = *pDoc->GetSpzFrmFmts();
+            const SwFrameFormat* pFormat = 0;
+            const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
 
-            for( size_t n = 0; n < rFmts.size(); ++n )
+            for( size_t n = 0; n < rFormats.size(); ++n )
             {
-                const SwFrmFmt* pFrmFmt = rFmts[ n ];
-                const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-                if( rCntnt.GetCntntIdx() &&
-                    &rCntnt.GetCntntIdx()->GetNode() == (SwNode*)pSttNd )
+                const SwFrameFormat* pFrameFormat = rFormats[ n ];
+                const SwFormatContent& rContent = pFrameFormat->GetContent();
+                if( rContent.GetContentIdx() &&
+                    &rContent.GetContentIdx()->GetNode() == (SwNode*)pSttNd )
                 {
-                    pFmt = pFrmFmt;
+                    pFormat = pFrameFormat;
                     break;
                 }
             }
 
-            if( pFmt )
+            if( pFormat )
             {
-                const SwFmtAnchor* pAnchor = &pFmt->GetAnchor();
+                const SwFormatAnchor* pAnchor = &pFormat->GetAnchor();
                 if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) &&
-                    pAnchor->GetCntntAnchor() )
+                    pAnchor->GetContentAnchor() )
                 {
-                    pNd = &pAnchor->GetCntntAnchor()->nNode.GetNode();
+                    pNd = &pAnchor->GetContentAnchor()->nNode.GetNode();
                     const SwNode* pFlyNd = pNd->FindFlyStartNode();
                     while( pFlyNd )
                     {
                         // Get up through the Anchor
                         size_t n;
-                        for( n = 0; n < rFmts.size(); ++n )
+                        for( n = 0; n < rFormats.size(); ++n )
                         {
-                            const SwFrmFmt* pFrmFmt = rFmts[ n ];
-                            const SwNodeIndex* pIdx = pFrmFmt->GetCntnt().
-                                                        GetCntntIdx();
+                            const SwFrameFormat* pFrameFormat = rFormats[ n ];
+                            const SwNodeIndex* pIdx = pFrameFormat->GetContent().
+                                                        GetContentIdx();
                             if( pIdx && pFlyNd == &pIdx->GetNode() )
                             {
-                                if( pFmt == pFrmFmt )
+                                if( pFormat == pFrameFormat )
                                 {
                                     pNd = pFlyNd;
                                     pFlyNd = 0;
                                     break;
                                 }
-                                pAnchor = &pFrmFmt->GetAnchor();
+                                pAnchor = &pFrameFormat->GetAnchor();
                                 if ((FLY_AT_PAGE == pAnchor->GetAnchorId()) ||
-                                    !pAnchor->GetCntntAnchor() )
+                                    !pAnchor->GetContentAnchor() )
                                 {
                                     pFlyNd = 0;
                                     break;
                                 }
 
-                                pFlyNd = pAnchor->GetCntntAnchor()->nNode.
+                                pFlyNd = pAnchor->GetContentAnchor()->nNode.
                                         GetNode().FindFlyStartNode();
                                 break;
                             }
                         }
-                        if( n >= rFmts.size() )
+                        if( n >= rFormats.size() )
                         {
                             OSL_ENSURE( false, "FlySection, but no Format found" );
                             return 0;
@@ -602,22 +602,22 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
                     for( size_t n = pDoc->GetPageDescCnt(); n && !pPgDesc; )
                     {
                         const SwPageDesc& rPgDsc = pDoc->GetPageDesc( --n );
-                        const SwFrmFmt* pFmt = &rPgDsc.GetMaster();
+                        const SwFrameFormat* pFormat = &rPgDsc.GetMaster();
                         int nStt = 0, nLast = 1;
                         if( !( eAskUse & rPgDsc.ReadUseOn() )) ++nLast;
 
-                        for( ; nStt < nLast; ++nStt, pFmt = &rPgDsc.GetLeft() )
+                        for( ; nStt < nLast; ++nStt, pFormat = &rPgDsc.GetLeft() )
                         {
-                            const SwFrmFmt * pHdFtFmt = nId == RES_HEADER
-                                ? static_cast<SwFmtHeader const &>(
-                                    pFmt->GetFmtAttr(nId)).GetHeaderFmt()
-                                : static_cast<SwFmtFooter const &>(
-                                    pFmt->GetFmtAttr(nId)).GetFooterFmt();
-                            if( pHdFtFmt )
+                            const SwFrameFormat * pHdFtFormat = nId == RES_HEADER
+                                ? static_cast<SwFormatHeader const &>(
+                                    pFormat->GetFormatAttr(nId)).GetHeaderFormat()
+                                : static_cast<SwFormatFooter const &>(
+                                    pFormat->GetFormatAttr(nId)).GetFooterFormat();
+                            if( pHdFtFormat )
                             {
-                                const SwFmtCntnt& rCntnt = pHdFtFmt->GetCntnt();
-                                if( rCntnt.GetCntntIdx() &&
-                                    &rCntnt.GetCntntIdx()->GetNode() ==
+                                const SwFormatContent& rContent = pHdFtFormat->GetContent();
+                                if( rContent.GetContentIdx() &&
+                                    &rContent.GetContentIdx()->GetNode() ==
                                     (SwNode*)pSttNd )
                                 {
                                     pPgDesc = &rPgDsc;
@@ -634,14 +634,14 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
                 else if( 0 != ( pSttNd = pNd->FindFootnoteStartNode() ))
                 {
                     // the Anchor can only be in the Body text
-                    const SwTxtFtn* pTxtFtn;
-                    const SwFtnIdxs& rFtnArr = pDoc->GetFtnIdxs();
-                    for( size_t n = 0; n < rFtnArr.size(); ++n )
-                        if( 0 != ( pTxtFtn = rFtnArr[ n ])->GetStartNode() &&
+                    const SwTextFootnote* pTextFootnote;
+                    const SwFootnoteIdxs& rFootnoteArr = pDoc->GetFootnoteIdxs();
+                    for( size_t n = 0; n < rFootnoteArr.size(); ++n )
+                        if( 0 != ( pTextFootnote = rFootnoteArr[ n ])->GetStartNode() &&
                             (SwNode*)pSttNd ==
-                            &pTxtFtn->GetStartNode()->GetNode() )
+                            &pTextFootnote->GetStartNode()->GetNode() )
                         {
-                            pNd = &pTxtFtn->GetTxtNode();
+                            pNd = &pTextFootnote->GetTextNode();
                             break;
                         }
                 }
@@ -667,27 +667,27 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
             {
                 const SfxPoolItem* pItem;
                 if( 0 != (pItem = pDoc->GetAttrPool().GetItem2( RES_PAGEDESC, i ) ) &&
-                    static_cast<const SwFmtPageDesc*>(pItem)->GetDefinedIn() )
+                    static_cast<const SwFormatPageDesc*>(pItem)->GetDefinedIn() )
                 {
-                    const SwModify* pMod = static_cast<const SwFmtPageDesc*>(pItem)->GetDefinedIn();
-                    if( pMod->ISA( SwCntntNode ) )
-                        aInfo.CheckNode( *static_cast<const SwCntntNode*>(pMod) );
-                    else if( pMod->ISA( SwFmt ))
-                        static_cast<const SwFmt*>(pMod)->GetInfo( aInfo );
+                    const SwModify* pMod = static_cast<const SwFormatPageDesc*>(pItem)->GetDefinedIn();
+                    if( pMod->ISA( SwContentNode ) )
+                        aInfo.CheckNode( *static_cast<const SwContentNode*>(pMod) );
+                    else if( pMod->ISA( SwFormat ))
+                        static_cast<const SwFormat*>(pMod)->GetInfo( aInfo );
                 }
             }
 
             if( 0 != ( pNd = aInfo.GetFoundNode() ))
             {
-                if( pNd->IsCntntNode() )
-                    pPgDesc = static_cast<const SwFmtPageDesc&>(pNd->GetCntntNode()->
+                if( pNd->IsContentNode() )
+                    pPgDesc = static_cast<const SwFormatPageDesc&>(pNd->GetContentNode()->
                                 GetAttr( RES_PAGEDESC )).GetPageDesc();
                 else if( pNd->IsTableNode() )
                     pPgDesc = pNd->GetTableNode()->GetTable().
-                            GetFrmFmt()->GetPageDesc().GetPageDesc();
+                            GetFrameFormat()->GetPageDesc().GetPageDesc();
                 else if( pNd->IsSectionNode() )
                     pPgDesc = pNd->GetSectionNode()->GetSection().
-                            GetFmt()->GetPageDesc().GetPageDesc();
+                            GetFormat()->GetPageDesc().GetPageDesc();
                 if ( pPgDescNdIdx )
                 {
                     *pPgDescNdIdx = pNd->GetIndex();
@@ -701,33 +701,33 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
 }
 
 /// If the node is located in a Fly, we return it formatted accordingly
-SwFrmFmt* SwNode::GetFlyFmt() const
+SwFrameFormat* SwNode::GetFlyFormat() const
 {
-    SwFrmFmt* pRet = 0;
+    SwFrameFormat* pRet = 0;
     const SwNode* pSttNd = FindFlyStartNode();
     if( pSttNd )
     {
-        if( IsCntntNode() )
+        if( IsContentNode() )
         {
-            SwCntntFrm* pFrm = SwIterator<SwCntntFrm,SwCntntNode>( *static_cast<const SwCntntNode*>(this) ).First();
+            SwContentFrm* pFrm = SwIterator<SwContentFrm,SwContentNode>( *static_cast<const SwContentNode*>(this) ).First();
             if( pFrm )
-                pRet = pFrm->FindFlyFrm()->GetFmt();
+                pRet = pFrm->FindFlyFrm()->GetFormat();
         }
         if( !pRet )
         {
             // The hard way through the Doc is our last way out
-            const SwFrmFmts& rFrmFmtTbl = *GetDoc()->GetSpzFrmFmts();
-            for( size_t n = 0; n < rFrmFmtTbl.size(); ++n )
+            const SwFrameFormats& rFrameFormatTable = *GetDoc()->GetSpzFrameFormats();
+            for( size_t n = 0; n < rFrameFormatTable.size(); ++n )
             {
-                SwFrmFmt* pFmt = rFrmFmtTbl[n];
+                SwFrameFormat* pFormat = rFrameFormatTable[n];
                 // Only Writer fly frames can contain Writer nodes.
-                if (pFmt->Which() != RES_FLYFRMFMT)
+                if (pFormat->Which() != RES_FLYFRMFMT)
                     continue;
-                const SwFmtCntnt& rCntnt = pFmt->GetCntnt();
-                if( rCntnt.GetCntntIdx() &&
-                    &rCntnt.GetCntntIdx()->GetNode() == pSttNd )
+                const SwFormatContent& rContent = pFormat->GetContent();
+                if( rContent.GetContentIdx() &&
+                    &rContent.GetContentIdx()->GetNode() == pSttNd )
                 {
-                    pRet = pFmt;
+                    pRet = pFormat;
                     break;
                 }
             }
@@ -736,12 +736,12 @@ SwFrmFmt* SwNode::GetFlyFmt() const
     return pRet;
 }
 
-SwTableBox* SwNode::GetTblBox() const
+SwTableBox* SwNode::GetTableBox() const
 {
     SwTableBox* pBox = 0;
     const SwNode* pSttNd = FindTableBoxStartNode();
     if( pSttNd )
-        pBox = const_cast<SwTableBox*>(pSttNd->FindTableNode()->GetTable().GetTblBox(
+        pBox = const_cast<SwTableBox*>(pSttNd->FindTableNode()->GetTable().GetTableBox(
                                                     pSttNd->GetIndex() ));
     return pBox;
 }
@@ -755,9 +755,9 @@ SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp )
     return eTyp == pTmp->GetStartNodeType() ? pTmp : 0;
 }
 
-const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const
+const SwTextNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const
 {
-    const SwTxtNode* pRet = 0;
+    const SwTextNode* pRet = 0;
     const SwOutlineNodes& rONds = GetNodes().GetOutLineNds();
     if( MAXLEVEL > nLvl && !rONds.empty() )
     {
@@ -776,9 +776,9 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const
         {
             // The first OutlineNode comes after the one asking. Test if it points to the same node.
             // If not it's invalid.
-            pRet = rONds[0]->GetTxtNode();
+            pRet = rONds[0]->GetTextNode();
 
-            const SwCntntNode* pCNd = GetCntntNode();
+            const SwContentNode* pCNd = GetContentNode();
 
             Point aPt( 0, 0 );
             const SwFrm* pFrm = pRet->getLayoutFrm( pRet->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false ),
@@ -795,12 +795,12 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const
         {
             // Or at the Field and get it from there!
             while( nPos &&
-                   nLvl < ( pRet = rONds[nPos]->GetTxtNode() )
+                   nLvl < ( pRet = rONds[nPos]->GetTextNode() )
                     ->GetAttrOutlineLevel() - 1 )
                 --nPos;
 
             if( !nPos )     // Get separately when 0
-                pRet = rONds[0]->GetTxtNode();
+                pRet = rONds[0]->GetTextNode();
         }
     }
     return pRet;
@@ -909,7 +909,7 @@ void SwStartNode::CheckSectionCondColl() const
     SwNodeIndex aIdx( *this );
     sal_uLong nEndIdx = EndOfSectionIndex();
     const SwNodes& rNds = GetNodes();
-    SwCntntNode* pCNd;
+    SwContentNode* pCNd;
     while( 0 != ( pCNd = rNds.GoNext( &aIdx )) && pCNd->GetIndex() < nEndIdx )
         pCNd->ChkCondColl();
 //FEATURE::CONDCOLL
@@ -959,7 +959,7 @@ void SwStartNode::dumpAsXml(xmlTextWriterPtr pWriter) const
     if (IsTableNode())
     {
         xmlTextWriterStartElement(pWriter, BAD_CAST("attrset"));
-        GetTableNode()->GetTable().GetFrmFmt()->GetAttrSet().dumpAsXml(pWriter);
+        GetTableNode()->GetTable().GetFrameFormat()->GetAttrSet().dumpAsXml(pWriter);
         xmlTextWriterEndElement(pWriter);
     }
 
@@ -991,16 +991,16 @@ SwEndNode::SwEndNode( SwNodes& rNds, sal_uLong nPos, SwStartNode& rSttNd )
     pStartOfSection->pEndOfSection = this;
 }
 
-SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
-                            SwFmtColl *pColl )
-    : SwModify( pColl ),     // CrsrsShell, FrameFmt,
+SwContentNode::SwContentNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
+                            SwFormatColl *pColl )
+    : SwModify( pColl ),     // CrsrsShell, FrameFormat,
     SwNode( rWhere, nNdType ),
     pCondColl( 0 ),
     mbSetModifyAtAttr( false )
 {
 }
 
-SwCntntNode::~SwCntntNode()
+SwContentNode::~SwContentNode()
 {
     // The base class SwClient of SwFrm excludes itself from the dependency list!
     // Thus, we need to delete all Frames in the dependency list.
@@ -1012,7 +1012,7 @@ SwCntntNode::~SwCntntNode()
         const_cast<SwAttrSet*>(static_cast<const SwAttrSet*>(mpAttrSet.get()))->SetModifyAtAttr( 0 );
 }
 
-void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
+void SwContentNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
 {
     sal_uInt16 nWhich = pOldValue ? pOldValue->Which() :
                     pNewValue ? pNewValue->Which() : 0 ;
@@ -1022,17 +1022,17 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
     case RES_OBJECTDYING :
         if (pNewValue)
         {
-            SwFmt * pFmt = static_cast<SwFmt *>( static_cast<const SwPtrMsgPoolItem *>(pNewValue)->pObject );
+            SwFormat * pFormat = static_cast<SwFormat *>( static_cast<const SwPtrMsgPoolItem *>(pNewValue)->pObject );
 
             // Do not mangle pointers if it is the upper-most format!
-            if( GetRegisteredIn() == pFmt )
+            if( GetRegisteredIn() == pFormat )
             {
-                if( pFmt->GetRegisteredIn() )
+                if( pFormat->GetRegisteredIn() )
                 {
                     // If Parent, register anew in the new Parent
-                    static_cast<SwModify*>(pFmt->GetRegisteredIn())->Add( this );
+                    static_cast<SwModify*>(pFormat->GetRegisteredIn())->Add( this );
                     if ( GetpSwAttrSet() )
-                        AttrSetHandleHelper::SetParent( mpAttrSet, *this, GetFmtColl(), GetFmtColl() );
+                        AttrSetHandleHelper::SetParent( mpAttrSet, *this, GetFormatColl(), GetFormatColl() );
                 }
                 else
                 {
@@ -1049,16 +1049,16 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
         // If the Format parent was switched, register the Attrset at the new one
         // Skip own Modify!
         if( GetpSwAttrSet() && pNewValue &&
-            static_cast<const SwFmtChg*>(pNewValue)->pChangedFmt == GetRegisteredIn() )
+            static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat == GetRegisteredIn() )
         {
             // Attach Set to the new parent
-            AttrSetHandleHelper::SetParent( mpAttrSet, *this, GetFmtColl(), GetFmtColl() );
+            AttrSetHandleHelper::SetParent( mpAttrSet, *this, GetFormatColl(), GetFormatColl() );
         }
         break;
 
 //FEATURE::CONDCOLL
     case RES_CONDCOLL_CONDCHG:
-        if( pNewValue && static_cast<const SwCondCollCondChg*>(pNewValue)->pChangedFmt == GetRegisteredIn() &&
+        if( pNewValue && static_cast<const SwCondCollCondChg*>(pNewValue)->pChangedFormat == GetRegisteredIn() &&
             &GetNodes() == &GetDoc()->GetNodes() )
         {
             ChkCondColl();
@@ -1067,24 +1067,24 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
 //FEATURE::CONDCOLL
 
     case RES_ATTRSET_CHG:
-        if (GetNodes().IsDocNodes() && IsTxtNode() && pOldValue)
+        if (GetNodes().IsDocNodes() && IsTextNode() && pOldValue)
         {
             if( SfxItemState::SET == static_cast<const SwAttrSetChg*>(pOldValue)->GetChgSet()->GetItemState(
                 RES_CHRATR_HIDDEN, false ) )
             {
-                static_cast<SwTxtNode*>(this)->SetCalcHiddenCharFlags();
+                static_cast<SwTextNode*>(this)->SetCalcHiddenCharFlags();
             }
         }
         break;
 
     case RES_UPDATE_ATTR:
-        if (GetNodes().IsDocNodes() && IsTxtNode() && pNewValue)
+        if (GetNodes().IsDocNodes() && IsTextNode() && pNewValue)
         {
             const sal_uInt16 nTmp = static_cast<const SwUpdateAttr*>(pNewValue)->getWhichAttr();
             if ( RES_ATTRSET_CHG == nTmp )
             {
                 // TODO: anybody wants to do some optimization here?
-                static_cast<SwTxtNode*>(this)->SetCalcHiddenCharFlags();
+                static_cast<SwTextNode*>(this)->SetCalcHiddenCharFlags();
             }
         }
         break;
@@ -1093,7 +1093,7 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
     NotifyClients( pOldValue, pNewValue );
 }
 
-bool SwCntntNode::InvalidateNumRule()
+bool SwContentNode::InvalidateNumRule()
 {
     SwNumRule* pRule = 0;
     const SfxPoolItem* pItem;
@@ -1108,25 +1108,25 @@ bool SwCntntNode::InvalidateNumRule()
     return 0 != pRule;
 }
 
-SwCntntFrm *SwCntntNode::getLayoutFrm( const SwRootFrm* _pRoot,
+SwContentFrm *SwContentNode::getLayoutFrm( const SwRootFrm* _pRoot,
     const Point* pPoint, const SwPosition *pPos, const bool bCalcFrm ) const
 {
-    return static_cast<SwCntntFrm*>( ::GetFrmOfModify( _pRoot, *(SwModify*)this, FRM_CNTNT,
+    return static_cast<SwContentFrm*>( ::GetFrmOfModify( _pRoot, *(SwModify*)this, FRM_CNTNT,
                                             pPoint, pPos, bCalcFrm ));
 }
 
-SwRect SwCntntNode::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
+SwRect SwContentNode::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
                                     const bool bCalcFrm ) const
 {
     SwRect aRet;
-    SwCntntFrm* pFrm = static_cast<SwCntntFrm*>( ::GetFrmOfModify( 0, *(SwModify*)this,
+    SwContentFrm* pFrm = static_cast<SwContentFrm*>( ::GetFrmOfModify( 0, *(SwModify*)this,
                                             FRM_CNTNT, pPoint, 0, bCalcFrm ) );
     if( pFrm )
         aRet = bPrtArea ? pFrm->Prt() : pFrm->Frm();
     return aRet;
 }
 
-SwRect SwCntntNode::FindPageFrmRect( const bool bPrtArea, const Point* pPoint,
+SwRect SwContentNode::FindPageFrmRect( const bool bPrtArea, const Point* pPoint,
                                     const bool bCalcFrm ) const
 {
     SwRect aRet;
@@ -1137,12 +1137,12 @@ SwRect SwCntntNode::FindPageFrmRect( const bool bPrtArea, const Point* pPoint,
     return aRet;
 }
 
-sal_Int32 SwCntntNode::Len() const { return 0; }
+sal_Int32 SwContentNode::Len() const { return 0; }
 
-SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
+SwFormatColl *SwContentNode::ChgFormatColl( SwFormatColl *pNewColl )
 {
     OSL_ENSURE( pNewColl, "Collectionpointer is 0." );
-    SwFmtColl *pOldColl = GetFmtColl();
+    SwFormatColl *pOldColl = GetFormatColl();
 
     if( pNewColl != pOldColl )
     {
@@ -1156,15 +1156,15 @@ SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
         // TODO: HACK: We need to recheck this condition according to the new template!
         if( true /*pNewColl */ )
         {
-            SetCondFmtColl( 0 );
+            SetCondFormatColl( 0 );
         }
 //FEATURE::CONDCOLL
 
         if( !IsModifyLocked() )
         {
-            SwFmtChg aTmp1( pOldColl );
-            SwFmtChg aTmp2( pNewColl );
-            SwCntntNode::Modify( &aTmp1, &aTmp2 );
+            SwFormatChg aTmp1( pOldColl );
+            SwFormatChg aTmp2( pNewColl );
+            SwContentNode::Modify( &aTmp1, &aTmp2 );
         }
     }
     if ( IsInCache() )
@@ -1175,16 +1175,16 @@ SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
     return pOldColl;
 }
 
-bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
+bool SwContentNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
 {
     bool bRet = true;
     if( pIdx->GetIndex() < Len() )
     {
-        if( !IsTxtNode() )
+        if( !IsTextNode() )
             ++(*pIdx);
         else
         {
-            const SwTxtNode& rTNd = *GetTxtNode();
+            const SwTextNode& rTNd = *GetTextNode();
             sal_Int32 nPos = pIdx->GetIndex();
             if( g_pBreakIt->GetBreakIter().is() )
             {
@@ -1192,7 +1192,7 @@ bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
                 sal_uInt16 nItrMode = ( CRSR_SKIP_CELLS & nMode ) ?
                                         CharacterIteratorMode::SKIPCELL :
                                         CharacterIteratorMode::SKIPCONTROLCHARACTER;
-                nPos = g_pBreakIt->GetBreakIter()->nextCharacters( rTNd.GetTxt(), nPos,
+                nPos = g_pBreakIt->GetBreakIter()->nextCharacters( rTNd.GetText(), nPos,
                                    g_pBreakIt->GetLocale( rTNd.GetLang( nPos ) ),
                                    nItrMode, 1, nDone );
 
@@ -1211,7 +1211,7 @@ bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
                 else
                     bRet = false;
             }
-            else if (nPos < rTNd.GetTxt().getLength())
+            else if (nPos < rTNd.GetText().getLength())
                 ++(*pIdx);
             else
                 bRet = false;
@@ -1222,16 +1222,16 @@ bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
     return bRet;
 }
 
-bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
+bool SwContentNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
 {
     bool bRet = true;
     if( pIdx->GetIndex() > 0 )
     {
-        if( !IsTxtNode() )
+        if( !IsTextNode() )
             --(*pIdx);
         else
         {
-            const SwTxtNode& rTNd = *GetTxtNode();
+            const SwTextNode& rTNd = *GetTextNode();
             sal_Int32 nPos = pIdx->GetIndex();
             if( g_pBreakIt->GetBreakIter().is() )
             {
@@ -1239,7 +1239,7 @@ bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
                 sal_uInt16 nItrMode = ( CRSR_SKIP_CELLS & nMode ) ?
                                         CharacterIteratorMode::SKIPCELL :
                                         CharacterIteratorMode::SKIPCONTROLCHARACTER;
-                nPos = g_pBreakIt->GetBreakIter()->previousCharacters( rTNd.GetTxt(), nPos,
+                nPos = g_pBreakIt->GetBreakIter()->previousCharacters( rTNd.GetText(), nPos,
                                    g_pBreakIt->GetLocale( rTNd.GetLang( nPos ) ),
                                    nItrMode, 1, nDone );
 
@@ -1273,7 +1273,7 @@ bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
  * Creates all Views for the Doc for this Node.
  * The created ContentFrames are attached to the corresponding Layout.
  */
-void SwCntntNode::MakeFrms( SwCntntNode& rNode )
+void SwContentNode::MakeFrms( SwContentNode& rNode )
 {
     OSL_ENSURE( &rNode != this,
             "No ContentNode or CopyNode and new Node identical." );
@@ -1297,15 +1297,15 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
         // CONTENT_FLOWS_FROM/_TO relation.
         // Relation CONTENT_FLOWS_FROM for next paragraph will change
         // and relation CONTENT_FLOWS_TO for previous paragraph will change.
-        if ( pNew->IsTxtFrm() )
+        if ( pNew->IsTextFrm() )
         {
             SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
             if ( pViewShell && pViewShell->GetLayout() &&
                  pViewShell->GetLayout()->IsAnyShellAccessible() )
             {
                 pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pNew->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pNew->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pNew->FindPrevCnt( true )) );
             }
         }
     }
@@ -1317,34 +1317,34 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
  *
  * An input param to identify if the acc table should be disposed.
  */
-void SwCntntNode::DelFrms( bool bIsDisposeAccTable )
+void SwContentNode::DelFrms( bool bIsDisposeAccTable )
 {
     if( !HasWriterListeners() )
         return;
 
-    SwIterator<SwCntntFrm,SwCntntNode> aIter( *this );
-    for( SwCntntFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+    SwIterator<SwContentFrm,SwContentNode> aIter( *this );
+    for( SwContentFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
     {
         // #i27138#
         // notify accessibility paragraphs objects about changed
         // CONTENT_FLOWS_FROM/_TO relation.
         // Relation CONTENT_FLOWS_FROM for current next paragraph will change
         // and relation CONTENT_FLOWS_TO for current previous paragraph will change.
-        if ( pFrm->IsTxtFrm() )
+        if ( pFrm->IsTextFrm() )
         {
             SwViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() );
             if ( pViewShell && pViewShell->GetLayout() &&
                  pViewShell->GetLayout()->IsAnyShellAccessible() )
             {
                 pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pFrm->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pFrm->FindPrevCnt( true )) );
             }
         }
 
         if( pFrm->IsFollow() )
         {
-            SwCntntFrm* pMaster = pFrm->FindMaster();
+            SwContentFrm* pMaster = pFrm->FindMaster();
             pMaster->SetFollow( pFrm->GetFollow() );
         }
         pFrm->SetFollow( 0 );//So it doesn't get funny ideas.
@@ -1355,17 +1355,17 @@ void SwCntntNode::DelFrms( bool bIsDisposeAccTable )
                                 //crushed here because we'll destroy all of it
                                 //anyway.
 
-        if( pFrm->GetUpper() && pFrm->IsInFtn() && !pFrm->GetIndNext() &&
+        if( pFrm->GetUpper() && pFrm->IsInFootnote() && !pFrm->GetIndNext() &&
             !pFrm->GetIndPrev() )
         {
-            SwFtnFrm *pFtn = pFrm->FindFtnFrm();
-            OSL_ENSURE( pFtn, "You promised a FtnFrm?" );
-            SwCntntFrm* pCFrm;
-            if( !pFtn->GetFollow() && !pFtn->GetMaster() &&
-                0 != ( pCFrm = pFtn->GetRefFromAttr()) && pCFrm->IsFollow() )
+            SwFootnoteFrm *pFootnote = pFrm->FindFootnoteFrm();
+            OSL_ENSURE( pFootnote, "You promised a FootnoteFrm?" );
+            SwContentFrm* pCFrm;
+            if( !pFootnote->GetFollow() && !pFootnote->GetMaster() &&
+                0 != ( pCFrm = pFootnote->GetRefFromAttr()) && pCFrm->IsFollow() )
             {
-                OSL_ENSURE( pCFrm->IsTxtFrm(), "NoTxtFrm has Footnote?" );
-                static_cast<SwTxtFrm*>(pCFrm->FindMaster())->Prepare( PREP_FTN_GONE );
+                OSL_ENSURE( pCFrm->IsTextFrm(), "NoTextFrm has Footnote?" );
+                static_cast<SwTextFrm*>(pCFrm->FindMaster())->Prepare( PREP_FTN_GONE );
             }
         }
         //Set acc table dispose state
@@ -1376,44 +1376,44 @@ void SwCntntNode::DelFrms( bool bIsDisposeAccTable )
         SwFrm::DestroyFrm(pFrm);
     }
 
-    if( bIsDisposeAccTable && IsTxtNode() )
+    if( bIsDisposeAccTable && IsTextNode() )
     {
-        GetTxtNode()->DelFrms_TxtNodePart();
+        GetTextNode()->DelFrms_TextNodePart();
     }
 }
 
-SwCntntNode *SwCntntNode::JoinNext()
+SwContentNode *SwContentNode::JoinNext()
 {
     return this;
 }
 
-SwCntntNode *SwCntntNode::JoinPrev()
+SwContentNode *SwContentNode::JoinPrev()
 {
     return this;
 }
 
 /// Get info from Modify
-bool SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
+bool SwContentNode::GetInfo( SfxPoolItem& rInfo ) const
 {
     switch( rInfo.Which() )
     {
     case RES_AUTOFMT_DOCNODE:
-        if( &GetNodes() == static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes )
+        if( &GetNodes() == static_cast<SwAutoFormatGetDocNode&>(rInfo).pNodes )
         {
-            static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = this;
+            static_cast<SwAutoFormatGetDocNode&>(rInfo).pContentNode = this;
             return false;
         }
         break;
 
     case RES_FINDNEARESTNODE:
-        if( static_cast<const SwFmtPageDesc&>(GetAttr( RES_PAGEDESC )).GetPageDesc() )
+        if( static_cast<const SwFormatPageDesc&>(GetAttr( RES_PAGEDESC )).GetPageDesc() )
             static_cast<SwFindNearestNode&>(rInfo).CheckNode( *this );
         return true;
 
     case RES_CONTENT_VISIBLE:
         {
             static_cast<SwPtrMsgPoolItem&>(rInfo).pObject =
-                SwIterator<SwFrm,SwCntntNode>(*this).First();
+                SwIterator<SwFrm,SwContentNode>(*this).First();
         }
         return false;
     }
@@ -1422,7 +1422,7 @@ bool SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
 }
 
 /// @param rAttr the attribute to set
-bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
+bool SwContentNode::SetAttr(const SfxPoolItem& rAttr )
 {
     if( !GetpSwAttrSet() ) // Have the Nodes created by the corresponding AttrSets
         NewAttrSet( GetDoc()->GetAttrPool() );
@@ -1458,7 +1458,7 @@ bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
 
 #include <svl/itemiter.hxx>
 
-bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
+bool SwContentNode::SetAttr( const SfxItemSet& rSet )
 {
     if ( IsInCache() )
     {
@@ -1470,7 +1470,7 @@ bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
     if( SfxItemState::SET == rSet.GetItemState( RES_AUTO_STYLE, false, &pFnd ) )
     {
         OSL_ENSURE( rSet.Count() == 1, "SetAutoStyle mixed with other attributes?!" );
-        const SwFmtAutoFmt* pTmp = static_cast<const SwFmtAutoFmt*>(pFnd);
+        const SwFormatAutoFormat* pTmp = static_cast<const SwFormatAutoFormat*>(pFnd);
 
         // If there already is an attribute set (usually containing a numbering
         // item), we have to merge the attribute of the new set into the old set:
@@ -1495,12 +1495,12 @@ bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
             // FME 2007-07-10 #i78124# If autostyle does not have a parent,
             // the string is empty.
             const SfxPoolItem* pNameItem = 0;
-            if ( 0 != GetCondFmtColl() ||
+            if ( 0 != GetCondFormatColl() ||
                  SfxItemState::SET != mpAttrSet->GetItemState( RES_FRMATR_STYLE_NAME, false, &pNameItem ) ||
                  static_cast<const SfxStringItem*>(pNameItem)->GetValue().isEmpty() )
-                AttrSetHandleHelper::SetParent( mpAttrSet, *this, &GetAnyFmtColl(), GetFmtColl() );
+                AttrSetHandleHelper::SetParent( mpAttrSet, *this, &GetAnyFormatColl(), GetFormatColl() );
             else
-                const_cast<SfxItemSet*>(mpAttrSet.get())->SetParent( &GetFmtColl()->GetAttrSet() );
+                const_cast<SfxItemSet*>(mpAttrSet.get())->SetParent( &GetFormatColl()->GetAttrSet() );
         }
 
         return true;
@@ -1534,7 +1534,7 @@ bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
 }
 
 // With nWhich it takes the Hint from the Delta array
-bool SwCntntNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwContentNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     if( !GetpSwAttrSet() )
         return false;
@@ -1583,7 +1583,7 @@ bool SwCntntNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
     return bRet;
 }
 
-bool SwCntntNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
+bool SwContentNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
 {
     if( !GetpSwAttrSet() )
         return false;
@@ -1623,7 +1623,7 @@ bool SwCntntNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
     return 0 != nDel ;
 }
 
-sal_uInt16 SwCntntNode::ResetAllAttr()
+sal_uInt16 SwContentNode::ResetAllAttr()
 {
     if( !GetpSwAttrSet() )
         return 0;
@@ -1661,7 +1661,7 @@ sal_uInt16 SwCntntNode::ResetAllAttr()
     return aNew.Count();
 }
 
-bool SwCntntNode::GetAttr( SfxItemSet& rSet, bool bInParent ) const
+bool SwContentNode::GetAttr( SfxItemSet& rSet, bool bInParent ) const
 {
     if( rSet.Count() )
         rSet.ClearItem();
@@ -1674,7 +1674,7 @@ bool SwCntntNode::GetAttr( SfxItemSet& rSet, bool bInParent ) const
     return rSet.Count() != 0;
 }
 
-sal_uInt16 SwCntntNode::ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds )
+sal_uInt16 SwContentNode::ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds )
 {
     sal_uInt16 nRet = 0;
     if ( 0 == rWhichIds.size() )
@@ -1694,7 +1694,7 @@ sal_uInt16 SwCntntNode::ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rW
     return nRet;
 }
 
-const SfxPoolItem* SwCntntNode::GetNoCondAttr( sal_uInt16 nWhich,
+const SfxPoolItem* SwContentNode::GetNoCondAttr( sal_uInt16 nWhich,
                                                bool bInParents ) const
 {
     const SfxPoolItem* pFnd = 0;
@@ -1703,7 +1703,7 @@ const SfxPoolItem* SwCntntNode::GetNoCondAttr( sal_uInt16 nWhich,
         if( !GetpSwAttrSet() || ( SfxItemState::SET != GetpSwAttrSet()->GetItemState(
                     nWhich, false, &pFnd ) && bInParents ))
         {
-            (void)static_cast<const SwFmt*>(GetRegisteredIn())->GetItemState( nWhich, bInParents, &pFnd );
+            (void)static_cast<const SwFormat*>(GetRegisteredIn())->GetItemState( nWhich, bInParents, &pFnd );
         }
     }
     // undo change of issue #i51029#
@@ -1723,18 +1723,18 @@ static bool lcl_CheckMaxLength(SwNode const& rPrev, SwNode const& rNext)
     {
         return false;
     }
-    if (!rPrev.IsTxtNode())
+    if (!rPrev.IsTextNode())
     {
         return true;
     }
 
     // Check if a node can contain the other (order is not significant)
-    return rPrev.GetTxtNode()->GetSpaceLeft() > rNext.GetTxtNode()->Len();
+    return rPrev.GetTextNode()->GetSpaceLeft() > rNext.GetTextNode()->Len();
 }
 
 /// Can we join two Nodes?
 /// We can return the 2nd position in pIdx.
-bool SwCntntNode::CanJoinNext( SwNodeIndex* pIdx ) const
+bool SwContentNode::CanJoinNext( SwNodeIndex* pIdx ) const
 {
     const SwNodes& rNds = GetNodes();
     SwNodeIndex aIdx( *this, 1 );
@@ -1758,7 +1758,7 @@ bool SwCntntNode::CanJoinNext( SwNodeIndex* pIdx ) const
 
 /// Can we join two Nodes?
 /// We can return the 2nd position in pIdx.
-bool SwCntntNode::CanJoinPrev( SwNodeIndex* pIdx ) const
+bool SwContentNode::CanJoinPrev( SwNodeIndex* pIdx ) const
 {
     SwNodeIndex aIdx( *this, -1 );
 
@@ -1780,12 +1780,12 @@ bool SwCntntNode::CanJoinPrev( SwNodeIndex* pIdx ) const
 }
 
 //FEATURE::CONDCOLL
-void SwCntntNode::SetCondFmtColl( SwFmtColl* pColl )
+void SwContentNode::SetCondFormatColl( SwFormatColl* pColl )
 {
     if( (!pColl && pCondColl) || ( pColl && !pCondColl ) ||
         ( pColl && pColl != pCondColl->GetRegisteredIn() ) )
     {
-        SwFmtColl* pOldColl = GetCondFmtColl();
+        SwFormatColl* pOldColl = GetCondFormatColl();
         delete pCondColl;
         if( pColl )
             pCondColl = new SwDepend( this, pColl );
@@ -1794,13 +1794,13 @@ void SwCntntNode::SetCondFmtColl( SwFmtColl* pColl )
 
         if( GetpSwAttrSet() )
         {
-            AttrSetHandleHelper::SetParent( mpAttrSet, *this, &GetAnyFmtColl(), GetFmtColl() );
+            AttrSetHandleHelper::SetParent( mpAttrSet, *this, &GetAnyFormatColl(), GetFormatColl() );
         }
 
         if( !IsModifyLocked() )
         {
-            SwFmtChg aTmp1( pOldColl ? pOldColl : GetFmtColl() );
-            SwFmtChg aTmp2( pColl ? pColl : GetFmtColl() );
+            SwFormatChg aTmp1( pOldColl ? pOldColl : GetFormatColl() );
+            SwFormatChg aTmp2( pColl ? pColl : GetFormatColl() );
             NotifyClients( &aTmp1, &aTmp2 );
         }
         if( IsInCache() )
@@ -1811,7 +1811,7 @@ void SwCntntNode::SetCondFmtColl( SwFmtColl* pColl )
     }
 }
 
-bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
+bool SwContentNode::IsAnyCondition( SwCollCondition& rTmp ) const
 {
     const SwNodes& rNds = GetNodes();
     {
@@ -1830,11 +1830,11 @@ bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
                 case SwTableBoxStartNode:
                     {
                         nCond = PARA_IN_TABLEBODY;
-                        const SwTableNode* pTblNd = pSttNd->FindTableNode();
+                        const SwTableNode* pTableNd = pSttNd->FindTableNode();
                         const SwTableBox* pBox;
-                        if( pTblNd && 0 != ( pBox = pTblNd->GetTable().
-                            GetTblBox( pSttNd->GetIndex() ) ) && pBox &&
-                            pBox->IsInHeadline( &pTblNd->GetTable() ) )
+                        if( pTableNd && 0 != ( pBox = pTableNd->GetTable().
+                            GetTableBox( pSttNd->GetIndex() ) ) && pBox &&
+                            pBox->IsInHeadline( &pTableNd->GetTable() ) )
                             nCond = PARA_IN_TABLEHEAD;
                     }
                     break;
@@ -1842,15 +1842,15 @@ bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
                 case SwFootnoteStartNode:
                     {
                         nCond = PARA_IN_FOOTENOTE;
-                        const SwFtnIdxs& rFtnArr = rNds.GetDoc()->GetFtnIdxs();
-                        const SwTxtFtn* pTxtFtn;
+                        const SwFootnoteIdxs& rFootnoteArr = rNds.GetDoc()->GetFootnoteIdxs();
+                        const SwTextFootnote* pTextFootnote;
                         const SwNode* pSrchNd = pSttNd;
 
-                        for( size_t n = 0; n < rFtnArr.size(); ++n )
-                            if( 0 != ( pTxtFtn = rFtnArr[ n ])->GetStartNode() &&
-                                pSrchNd == &pTxtFtn->GetStartNode()->GetNode() )
+                        for( size_t n = 0; n < rFootnoteArr.size(); ++n )
+                            if( 0 != ( pTextFootnote = rFootnoteArr[ n ])->GetStartNode() &&
+                                pSrchNd == &pTextFootnote->GetStartNode()->GetNode() )
                             {
-                                if( pTxtFtn->GetFtn().IsEndNote() )
+                                if( pTextFootnote->GetFootnote().IsEndNote() )
                                     nCond = PARA_IN_ENDNOTE;
                                 break;
                             }
@@ -1878,12 +1878,12 @@ bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
         const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
         if( !rOutlNds.empty() )
         {
-            if( !rOutlNds.Seek_Entry( const_cast<SwCntntNode*>(this), &nPos ) && nPos )
+            if( !rOutlNds.Seek_Entry( const_cast<SwContentNode*>(this), &nPos ) && nPos )
                 --nPos;
             if( nPos < rOutlNds.size() &&
                 rOutlNds[ nPos ]->GetIndex() < GetIndex() )
             {
-                SwTxtNode* pOutlNd = rOutlNds[ nPos ]->GetTxtNode();
+                SwTextNode* pOutlNd = rOutlNds[ nPos ]->GetTextNode();
 
                 if( pOutlNd->IsOutline())
                 {
@@ -1897,10 +1897,10 @@ bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
     return false;
 }
 
-void SwCntntNode::ChkCondColl()
+void SwContentNode::ChkCondColl()
 {
     // Check, just to be sure
-    if( RES_CONDTXTFMTCOLL == GetFmtColl()->Which() )
+    if( RES_CONDTXTFMTCOLL == GetFormatColl()->Which() )
     {
         SwCollCondition aTmp( 0, 0, 0 );
         const SwCollCondition* pCColl;
@@ -1909,39 +1909,39 @@ void SwCntntNode::ChkCondColl()
 
         if( IsAnyCondition( aTmp ))
         {
-            pCColl = static_cast<SwConditionTxtFmtColl*>(GetFmtColl())
+            pCColl = static_cast<SwConditionTextFormatColl*>(GetFormatColl())
                 ->HasCondition( aTmp );
 
             if (pCColl)
             {
-                SetCondFmtColl( pCColl->GetTxtFmtColl() );
+                SetCondFormatColl( pCColl->GetTextFormatColl() );
                 bDone = true;
             }
         }
 
         if (!bDone)
         {
-            if( IsTxtNode() && static_cast<SwTxtNode*>(this)->GetNumRule())
+            if( IsTextNode() && static_cast<SwTextNode*>(this)->GetNumRule())
             {
                 // Is at which Level in a list?
                 aTmp.SetCondition( PARA_IN_LIST,
-                                static_cast<SwTxtNode*>(this)->GetActualListLevel() );
-                pCColl = static_cast<SwConditionTxtFmtColl*>(GetFmtColl())->
+                                static_cast<SwTextNode*>(this)->GetActualListLevel() );
+                pCColl = static_cast<SwConditionTextFormatColl*>(GetFormatColl())->
                                 HasCondition( aTmp );
             }
             else
                 pCColl = 0;
 
             if( pCColl )
-                SetCondFmtColl( pCColl->GetTxtFmtColl() );
+                SetCondFormatColl( pCColl->GetTextFormatColl() );
             else if( pCondColl )
-                SetCondFmtColl( 0 );
+                SetCondFormatColl( 0 );
         }
     }
 }
 
 // #i42921#
-short SwCntntNode::GetTextDirection( const SwPosition& rPos,
+short SwContentNode::GetTextDirection( const SwPosition& rPos,
                                      const Point* pPt ) const
 {
     short nRet = -1;
@@ -1974,11 +1974,11 @@ short SwCntntNode::GetTextDirection( const SwPosition& rPos,
     return nRet;
 }
 
-SwOLENodes* SwCntntNode::CreateOLENodesArray( const SwFmtColl& rColl, bool bOnlyWithInvalidSize )
+SwOLENodes* SwContentNode::CreateOLENodesArray( const SwFormatColl& rColl, bool bOnlyWithInvalidSize )
 {
     SwOLENodes *pNodes = 0;
-    SwIterator<SwCntntNode,SwFmtColl> aIter( rColl );
-    for( SwCntntNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
+    SwIterator<SwContentNode,SwFormatColl> aIter( rColl );
+    for( SwContentNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
     {
         SwOLENode *pONd = pNd->GetOLENode();
         if ( pONd && (!bOnlyWithInvalidSize || pONd->IsOLESizeInvalid()) )
@@ -1993,7 +1993,7 @@ SwOLENodes* SwCntntNode::CreateOLENodesArray( const SwFmtColl& rColl, bool bOnly
 }
 
 //UUUU
-drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwCntntNode::getSdrAllFillAttributesHelper() const
+drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwContentNode::getSdrAllFillAttributesHelper() const
 {
     return drawinglayer::attribute::SdrAllFillAttributesHelperPtr();
 }
@@ -2029,27 +2029,27 @@ bool SwNode::IsInRedlines() const
     return bResult;
 }
 
-void SwNode::AddAnchoredFly(SwFrmFmt *const pFlyFmt)
+void SwNode::AddAnchoredFly(SwFrameFormat *const pFlyFormat)
 {
-    assert(pFlyFmt);
-    assert(&pFlyFmt->GetAnchor(false).GetCntntAnchor()->nNode.GetNode() == this);
-    // check node type, cf. SwFmtAnchor::SetAnchor()
-    assert(IsTxtNode() || IsStartNode() || IsTableNode());
+    assert(pFlyFormat);
+    assert(&pFlyFormat->GetAnchor(false).GetContentAnchor()->nNode.GetNode() == this);
+    // check node type, cf. SwFormatAnchor::SetAnchor()
+    assert(IsTextNode() || IsStartNode() || IsTableNode());
     if (!m_pAnchoredFlys)
     {
-        m_pAnchoredFlys.reset(new std::vector<SwFrmFmt*>);
+        m_pAnchoredFlys.reset(new std::vector<SwFrameFormat*>);
     }
-    m_pAnchoredFlys->push_back(pFlyFmt);
+    m_pAnchoredFlys->push_back(pFlyFormat);
 }
 
-void SwNode::RemoveAnchoredFly(SwFrmFmt *const pFlyFmt)
+void SwNode::RemoveAnchoredFly(SwFrameFormat *const pFlyFormat)
 {
-    assert(pFlyFmt);
+    assert(pFlyFormat);
     // cannot assert this in Remove because it is called when new anchor is already set
-//    assert(&pFlyFmt->GetAnchor(false).GetCntntAnchor()->nNode.GetNode() == this);
-    assert(IsTxtNode() || IsStartNode() || IsTableNode());
+//    assert(&pFlyFormat->GetAnchor(false).GetContentAnchor()->nNode.GetNode() == this);
+    assert(IsTextNode() || IsStartNode() || IsTableNode());
     assert(m_pAnchoredFlys);
-    auto it(std::find(m_pAnchoredFlys->begin(), m_pAnchoredFlys->end(), pFlyFmt));
+    auto it(std::find(m_pAnchoredFlys->begin(), m_pAnchoredFlys->end(), pFlyFormat));
     assert(it != m_pAnchoredFlys->end());
     m_pAnchoredFlys->erase(it);
     if (m_pAnchoredFlys->empty())
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index e9351873100b..4ed1518c2d56 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -68,10 +68,10 @@ SwNode* GoNextWithFrm(const SwNodes& rNodes, SwNodeIndex *pIdx)
     {
         pNd = &aTmp.GetNode();
         bool bFound = false;
-        if ( pNd->IsCntntNode() )
-            bFound = SwIterator<SwFrm,SwCntntNode>(*static_cast<SwCntntNode*>(pNd)).First();
+        if ( pNd->IsContentNode() )
+            bFound = SwIterator<SwFrm,SwContentNode>(*static_cast<SwContentNode*>(pNd)).First();
         else if ( pNd->IsTableNode() )
-            bFound = SwIterator<SwFrm,SwFmt>(*static_cast<SwTableNode*>(pNd)->GetTable().GetFrmFmt()).First() ;
+            bFound = SwIterator<SwFrm,SwFormat>(*static_cast<SwTableNode*>(pNd)->GetTable().GetFrameFormat()).First() ;
         else if( pNd->IsEndNode() && !pNd->StartOfSectionNode()->IsSectionNode() )
         {
             pNd = 0;
@@ -100,10 +100,10 @@ SwNode* GoPreviousWithFrm(SwNodeIndex *pIdx)
     {
         pNd = &aTmp.GetNode();
         bool bFound = false;
-        if ( pNd->IsCntntNode() )
-            bFound = SwIterator<SwFrm,SwCntntNode>(*static_cast<SwCntntNode*>(pNd)).First();
+        if ( pNd->IsContentNode() )
+            bFound = SwIterator<SwFrm,SwContentNode>(*static_cast<SwContentNode*>(pNd)).First();
         else if ( pNd->IsTableNode() )
-            bFound = SwIterator<SwFrm,SwFmt>(*static_cast<SwTableNode*>(pNd)->GetTable().GetFrmFmt()).First();
+            bFound = SwIterator<SwFrm,SwFormat>(*static_cast<SwTableNode*>(pNd)->GetTable().GetFrameFormat()).First();
         else if( pNd->IsStartNode() && !pNd->IsSectionNode() )
         {
             pNd = 0;
@@ -136,7 +136,7 @@ SwNode2LayImpl::SwNode2LayImpl( const SwNode& rNode, sal_uLong nIdx, bool bSearc
     const SwNode* pNd;
     if( bSearch || rNode.IsSectionNode() )
     {
-        // Find the next Cntnt/TableNode that contains a Frame, so that we can add
+        // Find the next Content/TableNode that contains a Frame, so that we can add
         // ourselves before/after it
         if( !bSearch && rNode.GetIndex() < nIndex )
         {
@@ -162,12 +162,12 @@ SwNode2LayImpl::SwNode2LayImpl( const SwNode& rNode, sal_uLong nIdx, bool bSearc
     }
     if( pNd )
     {
-        if( pNd->IsCntntNode() )
-            pMod = (SwModify*)pNd->GetCntntNode();
+        if( pNd->IsContentNode() )
+            pMod = (SwModify*)pNd->GetContentNode();
         else
         {
             OSL_ENSURE( pNd->IsTableNode(), "For Tablenodes only" );
-            pMod = pNd->GetTableNode()->GetTable().GetFrmFmt();
+            pMod = pNd->GetTableNode()->GetTable().GetFrameFormat();
         }
         pIter = new SwIterator<SwFrm,SwModify>( *pMod );
     }
@@ -207,7 +207,7 @@ SwFrm* SwNode2LayImpl::NextFrm()
     while( pRet )
     {
         SwFlowFrm* pFlow = SwFlowFrm::CastFlowFrm( pRet );
-        OSL_ENSURE( pFlow, "Cntnt or Table expected?!" );
+        OSL_ENSURE( pFlow, "Content or Table expected?!" );
         // Follows are pretty volatile, thus we ignore them.
         // Even if we insert after the Frame, we start from the Master
         // and iterate through it until the last Follow
@@ -227,14 +227,14 @@ SwFrm* SwNode2LayImpl::NextFrm()
                 // should be outside of it when looking at the Nodes.
                 // Thus, when dealing with Footnotes, we need to check whether the
                 // SectionFrm is also located within the Footnote and not outside of it.
-                if( !pRet->IsInFtn() || pSct->IsInFtn() )
+                if( !pRet->IsInFootnote() || pSct->IsInFootnote() )
                 {
                     OSL_ENSURE( pSct && pSct->GetSection(), "Where's my section?" );
-                    SwSectionNode* pNd = pSct->GetSection()->GetFmt()->GetSectionNode();
+                    SwSectionNode* pNd = pSct->GetSection()->GetFormat()->GetSectionNode();
                     OSL_ENSURE( pNd, "Lost SectionNode" );
                     // If the result Frame is located within a Section Frame
                     // whose Section does not contain the Node, we return with
-                    // the SectionFrm, else we return with the Cntnt/TabFrm
+                    // the SectionFrm, else we return with the Content/TabFrm
                     if( bMaster )
                     {
                         if( pNd->GetIndex() >= nIndex )
@@ -261,8 +261,8 @@ void SwNode2LayImpl::SaveUpperFrms()
         pFrm = pFrm->GetUpper();
         if( pFrm )
         {
-            if( pFrm->IsFtnFrm() )
-                static_cast<SwFtnFrm*>(pFrm)->ColLock();
+            if( pFrm->IsFootnoteFrm() )
+                static_cast<SwFootnoteFrm*>(pFrm)->ColLock();
             else if( pFrm->IsInSct() )
                 pFrm->FindSctFrm()->ColLock();
             if( pPrv && pPrv->IsSctFrm() )
@@ -347,7 +347,7 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, sal_uLong nStt, sal_uLong
         SwFrm* pNew = 0;
         SwFrm* pNxt;
         SwLayoutFrm* pUp;
-        if( (pNd = rNds[nStt])->IsCntntNode() )
+        if( (pNd = rNds[nStt])->IsContentNode() )
             for( std::vector<SwFrm*>::size_type n = 0; n < pUpperFrms->size(); )
             {
                 pNxt = (*pUpperFrms)[n++];
@@ -358,7 +358,7 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, sal_uLong nStt, sal_uLong
                     pNxt = pNxt->GetNext();
                 else
                     pNxt = pUp->Lower();
-                pNew = static_cast<SwCntntNode*>(pNd)->MakeFrm( pUp );
+                pNew = static_cast<SwContentNode*>(pNd)->MakeFrm( pUp );
                 pNew->Paste( pUp, pNxt );
                 (*pUpperFrms)[n-2] = pNew;
             }
@@ -399,8 +399,8 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, sal_uLong nStt, sal_uLong
     for( std::vector<SwFrm*>::size_type x = 0; x < pUpperFrms->size(); ++x )
     {
         SwFrm* pTmp = (*pUpperFrms)[++x];
-        if( pTmp->IsFtnFrm() )
-            static_cast<SwFtnFrm*>(pTmp)->ColUnlock();
+        if( pTmp->IsFootnoteFrm() )
+            static_cast<SwFootnoteFrm*>(pTmp)->ColUnlock();
         else if ( pTmp->IsInSct() )
         {
             SwSectionFrm* pSctFrm = pTmp->FindSctFrm();
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 807100a5648c..30e33ae5cd83 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -145,16 +145,16 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
             SwNode& rNd = aDelIdx.GetNode();
 
             // #i57920# - correction of refactoring done by cws swnumtree:
-            // - <SwTxtNode::SetLevel( NO_NUMBERING ) is deprecated and
+            // - <SwTextNode::SetLevel( NO_NUMBERING ) is deprecated and
             //   set <IsCounted> state of the text node to <false>, which
             //   isn't correct here.
-            if ( rNd.IsTxtNode() )
+            if ( rNd.IsTextNode() )
             {
-                SwTxtNode* pTxtNode = rNd.GetTxtNode();
+                SwTextNode* pTextNode = rNd.GetTextNode();
 
-                pTxtNode->RemoveFromList();
+                pTextNode->RemoveFromList();
 
-                if (pTxtNode->IsOutline())
+                if (pTextNode->IsOutline())
                 {
                     const SwNodePtr pSrch = (SwNodePtr)&rNd;
                     pOutlineNds->erase( pSrch );
@@ -163,26 +163,26 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
 
             BigPtrArray::Move( aDelIdx.GetIndex(), rInsPos.GetIndex() );
 
-            if( rNd.IsTxtNode() )
+            if( rNd.IsTextNode() )
             {
-                SwTxtNode& rTxtNd = static_cast<SwTxtNode&>(rNd);
+                SwTextNode& rTextNd = static_cast<SwTextNode&>(rNd);
 
-                rTxtNd.AddToList();
+                rTextNd.AddToList();
 
-                if (bInsOutlineIdx && rTxtNd.IsOutline())
+                if (bInsOutlineIdx && rTextNd.IsOutline())
                 {
                     const SwNodePtr pSrch = (SwNodePtr)&rNd;
                     pOutlineNds->insert( pSrch );
                 }
-                rTxtNd.InvalidateNumRule();
+                rTextNd.InvalidateNumRule();
 
 //FEATURE::CONDCOLL
-                if( RES_CONDTXTFMTCOLL == rTxtNd.GetTxtColl()->Which() )
-                    rTxtNd.ChkCondColl();
+                if( RES_CONDTXTFMTCOLL == rTextNd.GetTextColl()->Which() )
+                    rTextNd.ChkCondColl();
 //FEATURE::CONDCOLL
             }
-            else if( rNd.IsCntntNode() )
-                static_cast<SwCntntNode&>(rNd).InvalidateNumRule();
+            else if( rNd.IsContentNode() )
+                static_cast<SwContentNode&>(rNd).InvalidateNumRule();
         }
     }
     else
@@ -203,17 +203,17 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
             SwNode* pNd = &rDelPos.GetNode();
 
             // NoTextNode keep their persistent data
-            if( pNd->IsNoTxtNode() )
+            if( pNd->IsNoTextNode() )
             {
                 if( bSavePersData )
-                    static_cast<SwNoTxtNode*>(pNd)->SavePersistentData();
+                    static_cast<SwNoTextNode*>(pNd)->SavePersistentData();
             }
-            else if( pNd->IsTxtNode() )
+            else if( pNd->IsTextNode() )
             {
-                SwTxtNode* pTxtNd = static_cast<SwTxtNode*>(pNd);
+                SwTextNode* pTextNd = static_cast<SwTextNode*>(pNd);
 
                 // remove outline index from old nodes array
-                if (pTxtNd->IsOutline())
+                if (pTextNd->IsOutline())
                 {
                     pOutlineNds->erase( pNd );
                 }
@@ -221,7 +221,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                 // copy rules if needed
                 if( pDestDoc )
                 {
-                    const SwNumRule* pNumRule = pTxtNd->GetNumRule();
+                    const SwNumRule* pNumRule = pTextNd->GetNumRule();
                     if( pNumRule && sNumRule != pNumRule->GetName() )
                     {
                         sNumRule = pNumRule->GetName();
@@ -234,28 +234,28 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                 }
                 else
                     // if movement into the UndoNodes-array, update numbering
-                    pTxtNd->InvalidateNumRule();
+                    pTextNd->InvalidateNumRule();
 
-                pTxtNd->RemoveFromList();
+                pTextNd->RemoveFromList();
             }
 
             RemoveNode( rDelPos.GetIndex(), 1, false ); // move indices
-            SwCntntNode * pCNd = pNd->GetCntntNode();
+            SwContentNode * pCNd = pNd->GetContentNode();
             rNds.InsertNode( pNd, aInsPos );
 
             if( pCNd )
             {
-                SwTxtNode* pTxtNd = pCNd->GetTxtNode();
-                if( pTxtNd )
+                SwTextNode* pTextNd = pCNd->GetTextNode();
+                if( pTextNd )
                 {
-                    SwpHints * const pHts = pTxtNd->GetpSwpHints();
+                    SwpHints * const pHts = pTextNd->GetpSwpHints();
                     // OultineNodes set the new nodes in the array
-                    if (bInsOutlineIdx && pTxtNd->IsOutline())
+                    if (bInsOutlineIdx && pTextNd->IsOutline())
                     {
-                        rNds.pOutlineNds->insert( pTxtNd );
+                        rNds.pOutlineNds->insert( pTextNd );
                     }
 
-                    pTxtNd->AddToList();
+                    pTextNd->AddToList();
 
                     // special treatment for fields
                     if( pHts && pHts->Count() )
@@ -264,25 +264,25 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                             GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(rNds);
                         for( size_t i = pHts->Count(); i; )
                         {
-                            SwTxtAttr * const pAttr = pHts->GetTextHint( --i );
+                            SwTextAttr * const pAttr = pHts->GetTextHint( --i );
                             switch ( pAttr->Which() )
                             {
                             case RES_TXTATR_FIELD:
                             case RES_TXTATR_ANNOTATION:
                             case RES_TXTATR_INPUTFIELD:
                                 {
-                                    SwTxtFld* pTxtFld = static_txtattr_cast<SwTxtFld*>(pAttr);
-                                    rNds.GetDoc()->getIDocumentFieldsAccess().InsDelFldInFldLst( !bToUndo, *pTxtFld );
+                                    SwTextField* pTextField = static_txtattr_cast<SwTextField*>(pAttr);
+                                    rNds.GetDoc()->getIDocumentFieldsAccess().InsDelFieldInFieldLst( !bToUndo, *pTextField );
 
-                                    const SwFieldType* pTyp = pTxtFld->GetFmtFld().GetField()->GetTyp();
+                                    const SwFieldType* pTyp = pTextField->GetFormatField().GetField()->GetTyp();
                                     if ( RES_POSTITFLD == pTyp->Which() )
                                     {
                                         rNds.GetDoc()->GetDocShell()->Broadcast(
-                                            SwFmtFldHint(
-                                                &pTxtFld->GetFmtFld(),
-                                                ( pTxtFld->GetFmtFld().IsFldInDoc()
-                                                  ? SwFmtFldHintWhich::INSERTED
-                                                  : SwFmtFldHintWhich::REMOVED ) ) );
+                                            SwFormatFieldHint(
+                                                &pTextField->GetFormatField(),
+                                                ( pTextField->GetFormatField().IsFieldInDoc()
+                                                  ? SwFormatFieldHintWhich::INSERTED
+                                                  : SwFormatFieldHintWhich::REMOVED ) ) );
                                     }
                                     else if( RES_DDEFLD == pTyp->Which() )
                                     {
@@ -291,13 +291,13 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                                         else
                                             const_cast<SwDDEFieldType*>(static_cast<const SwDDEFieldType*>(pTyp))->IncRefCnt();
                                     }
-                                    static_cast<SwFmtFld&>(pAttr->GetAttr())
+                                    static_cast<SwFormatField&>(pAttr->GetAttr())
                                         .InvalidateField();
                                 }
                                 break;
 
                             case RES_TXTATR_FTN:
-                                static_cast<SwFmtFtn&>(pAttr->GetAttr())
+                                static_cast<SwFormatFootnote&>(pAttr->GetAttr())
                                     .InvalidateFootnote();
                                 break;
 
@@ -307,18 +307,18 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                                 break;
 
                             case RES_TXTATR_REFMARK:
-                                static_cast<SwFmtRefMark&>(pAttr->GetAttr())
+                                static_cast<SwFormatRefMark&>(pAttr->GetAttr())
                                     .InvalidateRefMark();
                                 break;
 
                             case RES_TXTATR_META:
                             case RES_TXTATR_METAFIELD:
                                 {
-                                    SwTxtMeta *const pTxtMeta(
-                                        static_txtattr_cast<SwTxtMeta*>(pAttr));
+                                    SwTextMeta *const pTextMeta(
+                                        static_txtattr_cast<SwTextMeta*>(pAttr));
                                     // force removal of UNO object
-                                    pTxtMeta->ChgTxtNode(0);
-                                    pTxtMeta->ChgTxtNode(pTxtNd);
+                                    pTextMeta->ChgTextNode(0);
+                                    pTextMeta->ChgTextNode(pTextNd);
                                 }
                                 break;
 
@@ -328,15 +328,15 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                         }
                     }
                     //FEATURE::CONDCOLL
-                    if( RES_CONDTXTFMTCOLL == pTxtNd->GetTxtColl()->Which() )
-                        pTxtNd->ChkCondColl();
+                    if( RES_CONDTXTFMTCOLL == pTextNd->GetTextColl()->Which() )
+                        pTextNd->ChkCondColl();
                     //FEATURE::CONDCOLL
                 }
                 else
                 {
                     // Moved into different Docs? Persist data again!
-                    if( pCNd->IsNoTxtNode() && bRestPersData )
-                        static_cast<SwNoTxtNode*>(pCNd)->RestorePersistentData();
+                    if( pCNd->IsNoTextNode() && bRestPersData )
+                        static_cast<SwNoTextNode*>(pCNd)->RestorePersistentData();
                 }
             }
         }
@@ -365,14 +365,14 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
             OSL_ENSURE( false, "here, something wrong happened" );
             aFrmNdIdx = rNds.GetEndOfContent();
             pFrmNd = SwNodes::GoPrevSection( &aFrmNdIdx, true, false );
-            if( pFrmNd && !static_cast<SwCntntNode*>(pFrmNd)->HasWriterListeners() )
+            if( pFrmNd && !static_cast<SwContentNode*>(pFrmNd)->HasWriterListeners() )
                 pFrmNd = 0;
             OSL_ENSURE( pFrmNd, "ChgNode() - no FrameNode found" );
         }
         if( pFrmNd )
             while( aIdx != rInsPos )
             {
-                SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if( pCNd )
                 {
                     if( pFrmNd->IsTableNode() )
@@ -380,7 +380,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                     else if( pFrmNd->IsSectionNode() )
                         static_cast<SwSectionNode*>(pFrmNd)->MakeFrms( aIdx );
                     else
-                        static_cast<SwCntntNode*>(pFrmNd)->MakeFrms( *pCNd );
+                        static_cast<SwContentNode*>(pFrmNd)->MakeFrms( *pCNd );
                     pFrmNd = pCNd;
                 }
                 ++aIdx;
@@ -480,7 +480,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                 SwStartNode* pSttNd = pAktNode->pStartOfSection;
                 if( pSttNd->IsTableNode() )
                 {
-                    SwTableNode* pTblNd = static_cast<SwTableNode*>(pSttNd);
+                    SwTableNode* pTableNd = static_cast<SwTableNode*>(pSttNd);
 
                     // move the whole table/range
                     nInsPos = (aRg.aEnd.GetIndex() -
@@ -495,25 +495,25 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
 
                     if( bNewFrms )
                         // delete all frames
-                        pTblNd->DelFrms();
+                        pTableNd->DelFrms();
                     if( &rNodes == this ) // move into self?
                     {
                         // move all Start/End/ContentNodes
                         // ContentNodes: delete also the frames!
-                        pTblNd->pStartOfSection = aIdx.GetNode().pStartOfSection;
+                        pTableNd->pStartOfSection = aIdx.GetNode().pStartOfSection;
                         for( sal_uLong n = 0; n < nInsPos; ++n )
                         {
                             SwNodeIndex aMvIdx( aRg.aEnd, 1 );
-                            SwCntntNode* pCNd = 0;
+                            SwContentNode* pCNd = 0;
                             SwNode* pTmpNd = &aMvIdx.GetNode();
-                            if( pTmpNd->IsCntntNode() )
+                            if( pTmpNd->IsContentNode() )
                             {
-                                pCNd = static_cast<SwCntntNode*>(pTmpNd);
-                                if( pTmpNd->IsTxtNode() )
-                                    static_cast<SwTxtNode*>(pTmpNd)->RemoveFromList();
+                                pCNd = static_cast<SwContentNode*>(pTmpNd);
+                                if( pTmpNd->IsTextNode() )
+                                    static_cast<SwTextNode*>(pTmpNd)->RemoveFromList();
 
                                 // remove outline index from old nodes array
-                                if (pCNd->IsTxtNode() && pCNd->GetTxtNode()->IsOutline())
+                                if (pCNd->IsTextNode() && pCNd->GetTextNode()->IsOutline())
                                 {
                                     pOutlineNds->erase( pCNd );
                                 }
@@ -525,8 +525,8 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
 
                             if( bInsOutlineIdx && pCNd )
                                 pOutlineNds->insert( pCNd );
-                            if( pTmpNd->IsTxtNode() )
-                                static_cast<SwTxtNode*>(pTmpNd)->AddToList();
+                            if( pTmpNd->IsTextNode() )
+                                static_cast<SwTextNode*>(pTmpNd)->AddToList();
                         }
                     }
                     else
@@ -545,7 +545,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                         {
                             SwNode* pNd = &aMvIdx.GetNode();
 
-                            const bool bOutlNd = pNd->IsTxtNode() && pNd->GetTxtNode()->IsOutline();
+                            const bool bOutlNd = pNd->IsTextNode() && pNd->GetTextNode()->IsOutline();
                             // delete outline indices from old node array
                             if( bOutlNd )
                                 pOutlineNds->erase( pNd );
@@ -569,10 +569,10 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                             }
                         }
 
-                        if( pTblNd->GetTable().IsA( TYPE( SwDDETable ) ))
+                        if( pTableNd->GetTable().IsA( TYPE( SwDDETable ) ))
                         {
-                            SwDDEFieldType* pTyp = static_cast<SwDDETable&>(pTblNd->
-                                                GetTable()).GetDDEFldType();
+                            SwDDEFieldType* pTyp = static_cast<SwDDETable&>(pTableNd->
+                                                GetTable()).GetDDEFieldType();
                             if( pTyp )
                             {
                                 if( rNodes.IsDocNodes() )
@@ -585,16 +585,16 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                         if (GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(
                                     rNodes))
                         {
-                            SwFrmFmt* pTblFmt = pTblNd->GetTable().GetFrmFmt();
+                            SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
                             SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT,
-                                                        pTblFmt );
-                            pTblFmt->ModifyNotification( &aMsgHint, &aMsgHint );
+                                                        pTableFormat );
+                            pTableFormat->ModifyNotification( &aMsgHint, &aMsgHint );
                         }
                     }
                     if( bNewFrms )
                     {
                         SwNodeIndex aTmp( aIdx );
-                        pTblNd->MakeFrms( &aTmp );
+                        pTableNd->MakeFrms( &aTmp );
                     }
                     aIdx -= nInsPos;
                     nInsPos = 0;
@@ -795,8 +795,8 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
         case ND_TEXTNODE:
             //Add special function to text node.
             {
-                if( bNewFrms && pAktNode->GetCntntNode() )
-                    static_cast<SwCntntNode*>(pAktNode)->DelFrms();
+                if( bNewFrms && pAktNode->GetContentNode() )
+                    static_cast<SwContentNode*>(pAktNode)->DelFrms();
                 pAktNode->pStartOfSection = aSttNdStack[ nLevel ];
                 nInsPos++;
                 --aRg.aEnd;
@@ -805,8 +805,8 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
         case ND_GRFNODE:
         case ND_OLENODE:
             {
-                if( bNewFrms && pAktNode->GetCntntNode() )
-                    static_cast<SwCntntNode*>(pAktNode)->DelFrms();
+                if( bNewFrms && pAktNode->GetContentNode() )
+                    static_cast<SwContentNode*>(pAktNode)->DelFrms();
 
                 pAktNode->pStartOfSection = aSttNdStack[ nLevel ];
                 nInsPos++;
@@ -873,13 +873,13 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
     if( this == &rNodes &&
         aRg.aEnd.GetIndex() >= aOrigInsPos.aStart.GetIndex() )
     {
-        UpdtOutlineIdx( aOrigInsPos.aStart.GetNode() );
-        UpdtOutlineIdx( aRg.aEnd.GetNode() );
+        UpdateOutlineIdx( aOrigInsPos.aStart.GetNode() );
+        UpdateOutlineIdx( aRg.aEnd.GetNode() );
     }
     else
     {
-        UpdtOutlineIdx( aRg.aEnd.GetNode() );
-        rNodes.UpdtOutlineIdx( aOrigInsPos.aStart.GetNode() );
+        UpdateOutlineIdx( aRg.aEnd.GetNode() );
+        rNodes.UpdateOutlineIdx( aOrigInsPos.aStart.GetNode() );
     }
 
     return true;
@@ -1114,26 +1114,26 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
             // delete the whole section?
             if( pAktNode->StartOfSectionIndex() > aRg.aStart.GetIndex() )
             {
-                SwTableNode* pTblNd = pAktNode->pStartOfSection->GetTableNode();
-                if( pTblNd )
-                    pTblNd->DelFrms();
+                SwTableNode* pTableNd = pAktNode->pStartOfSection->GetTableNode();
+                if( pTableNd )
+                    pTableNd->DelFrms();
 
                 SwNode *pNd, *pChkNd = pAktNode->pStartOfSection;
                 sal_uInt16 nIdxPos;
                 do {
                     pNd = &aRg.aEnd.GetNode();
 
-                    if( pNd->IsTxtNode() )
+                    if( pNd->IsTextNode() )
                     {
-                        SwTxtNode *const pTxtNode(pNd->GetTxtNode());
-                        if (pTxtNode->IsOutline() &&
+                        SwTextNode *const pTextNode(pNd->GetTextNode());
+                        if (pTextNode->IsOutline() &&
                                 pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
                         {
                             // remove outline indices
                             pOutlineNds->erase(nIdxPos);
                             bUpdateOutline = true;
                         }
-                        pTxtNode->InvalidateNumRule();
+                        pTextNode->InvalidateNumRule();
                     }
                     else if( pNd->IsEndNode() &&
                             pNd->pStartOfSection->IsTableNode() )
@@ -1187,19 +1187,19 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
         }
         else // "normal" node, so insert into TmpArray
         {
-            SwTxtNode* pTxtNd = pAktNode->GetTxtNode();
-            if( pTxtNd )
+            SwTextNode* pTextNd = pAktNode->GetTextNode();
+            if( pTextNd )
             {
-                if( pTxtNd->IsOutline())
+                if( pTextNd->IsOutline())
                 {
                     // delete outline indices
-                    pOutlineNds->erase( pTxtNd );
+                    pOutlineNds->erase( pTextNd );
                     bUpdateOutline = true;
                 }
-                pTxtNd->InvalidateNumRule();
+                pTextNd->InvalidateNumRule();
             }
-            else if( pAktNode->IsCntntNode() )
-                static_cast<SwCntntNode*>(pAktNode)->InvalidateNumRule();
+            else if( pAktNode->IsContentNode() )
+                static_cast<SwContentNode*>(pAktNode)->InvalidateNumRule();
 
             --aRg.aEnd;
             nCnt++;
@@ -1227,7 +1227,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
         // update numbering
         if( bUpdateOutline || bInDelUpdOutl )
         {
-            UpdtOutlineIdx( aRg.aEnd.GetNode() );
+            UpdateOutlineIdx( aRg.aEnd.GetNode() );
             bInDelUpdOutl = false;
         }
 
@@ -1263,7 +1263,7 @@ void SwNodes::GoStartOfSection(SwNodeIndex *pIdx)
 
     // If index points to no ContentNode, than go to one.
     // If there is no further available, do not change the index' position!
-    while( !aTmp.GetNode().IsCntntNode() )
+    while( !aTmp.GetNode().IsContentNode() )
     {   // go from this StartNode (can only be one) to its end
         if( *pIdx <= aTmp )
             return;     // ERROR: already after the section
@@ -1280,38 +1280,38 @@ void SwNodes::GoEndOfSection(SwNodeIndex *pIdx)
         (*pIdx) = *pIdx->GetNode().EndOfSectionNode();
 }
 
-SwCntntNode* SwNodes::GoNext(SwNodeIndex *pIdx) const
+SwContentNode* SwNodes::GoNext(SwNodeIndex *pIdx) const
 {
     if( pIdx->GetIndex() >= Count() - 1 )
         return 0;
 
     SwNodeIndex aTmp(*pIdx, +1);
     SwNode* pNd = 0;
-    while( aTmp < Count()-1 && !( pNd = &aTmp.GetNode())->IsCntntNode() )
+    while( aTmp < Count()-1 && !( pNd = &aTmp.GetNode())->IsContentNode() )
         ++aTmp;
 
     if( aTmp == Count()-1 )
         pNd = 0;
     else
         (*pIdx) = aTmp;
-    return static_cast<SwCntntNode*>(pNd);
+    return static_cast<SwContentNode*>(pNd);
 }
 
-SwCntntNode* SwNodes::GoPrevious(SwNodeIndex *pIdx)
+SwContentNode* SwNodes::GoPrevious(SwNodeIndex *pIdx)
 {
     if( !pIdx->GetIndex() )
         return 0;
 
     SwNodeIndex aTmp( *pIdx, -1 );
     SwNode* pNd = 0;
-    while( aTmp.GetIndex() && !( pNd = &aTmp.GetNode())->IsCntntNode() )
+    while( aTmp.GetIndex() && !( pNd = &aTmp.GetNode())->IsContentNode() )
         --aTmp;
 
     if( !aTmp.GetIndex() )
         pNd = 0;
     else
         (*pIdx) = aTmp;
-    return static_cast<SwCntntNode*>(pNd);
+    return static_cast<SwContentNode*>(pNd);
 }
 
 inline bool TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, sal_uLong nStt, sal_uLong nEnd )
@@ -1383,7 +1383,7 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, sal_uLong nCnt )
         {
             SwNode* pNd = (*this)[ n ];
 
-            if (pNd->IsTxtNode() && pNd->GetTxtNode()->IsOutline())
+            if (pNd->IsTextNode() && pNd->GetTextNode()->IsOutline())
             {
                 // remove the outline indices
                 sal_uInt16 nIdxPos;
@@ -1393,17 +1393,17 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, sal_uLong nCnt )
                     bUpdateNum = 1;
                 }
             }
-            if( pNd->IsCntntNode() )
+            if( pNd->IsContentNode() )
             {
-                static_cast<SwCntntNode*>(pNd)->InvalidateNumRule();
-                static_cast<SwCntntNode*>(pNd)->DelFrms();
+                static_cast<SwContentNode*>(pNd)->InvalidateNumRule();
+                static_cast<SwContentNode*>(pNd)->DelFrms();
             }
         }
         RemoveNode( nSttIdx, nCnt, true );
 
         // update numbering
         if( bUpdateNum )
-            UpdtOutlineIdx( rStart.GetNode() );
+            UpdateOutlineIdx( rStart.GetNode() );
     }
 }
 
@@ -1460,10 +1460,10 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
 
     SwNodeIndex aEndIdx( pEnd->nNode );
     SwNodeIndex aSttIdx( pStt->nNode );
-    SwTxtNode *const pSrcNd = aSttIdx.GetNode().GetTxtNode();
-    SwTxtNode * pDestNd = rPos.nNode.GetNode().GetTxtNode();
+    SwTextNode *const pSrcNd = aSttIdx.GetNode().GetTextNode();
+    SwTextNode * pDestNd = rPos.nNode.GetNode().GetTextNode();
     bool bSplitDestNd = true;
-    bool bCopyCollFmt = pDestNd && pDestNd->GetTxt().isEmpty();
+    bool bCopyCollFormat = pDestNd && pDestNd->GetText().isEmpty();
 
     if( pSrcNd )
     {
@@ -1471,13 +1471,13 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
         // be also a TextNode in the NodesArray to store the content
         if( !pDestNd )
         {
-            pDestNd = rNodes.MakeTxtNode( rPos.nNode, pSrcNd->GetTxtColl() );
+            pDestNd = rNodes.MakeTextNode( rPos.nNode, pSrcNd->GetTextColl() );
             --rPos.nNode;
             rPos.nContent.Assign( pDestNd, 0 );
-            bCopyCollFmt = true;
+            bCopyCollFormat = true;
         }
         bSplitDestNd = pDestNd->Len() > rPos.nContent.GetIndex() ||
-                        pEnd->nNode.GetNode().IsTxtNode();
+                        pEnd->nNode.GetNode().IsTextNode();
 
         // move the content into the new node
         bool bOneNd = pStt->nNode == pEnd->nNode;
@@ -1485,14 +1485,14 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
                 ( (bOneNd) ? pEnd->nContent.GetIndex() : pSrcNd->Len() )
                 - pStt->nContent.GetIndex();
 
-        if( !pEnd->nNode.GetNode().IsCntntNode() )
+        if( !pEnd->nNode.GetNode().IsContentNode() )
         {
             bOneNd = true;
             sal_uLong nSttNdIdx = pStt->nNode.GetIndex() + 1;
             const sal_uLong nEndNdIdx = pEnd->nNode.GetIndex();
             for( ; nSttNdIdx < nEndNdIdx; ++nSttNdIdx )
             {
-                if( (*this)[ nSttNdIdx ]->IsCntntNode() )
+                if( (*this)[ nSttNdIdx ]->IsContentNode() )
                 {
                     bOneNd = false;
                     break;
@@ -1505,7 +1505,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
         {
             if( !rPos.nContent.GetIndex() )
             {
-                bCopyCollFmt = true;
+                bCopyCollFormat = true;
             }
             if( rNodes.IsDocNodes() )
             {
@@ -1515,7 +1515,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
             }
             else
             {
-                pDestNd->SplitCntntNode( rPos );
+                pDestNd->SplitContentNode( rPos );
             }
 
             if( rPos.nNode == aEndIdx )
@@ -1524,7 +1524,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
             }
             bSplitDestNd = true;
 
-            pDestNd = rNodes[ rPos.nNode.GetIndex() - 1 ]->GetTxtNode();
+            pDestNd = rNodes[ rPos.nNode.GetIndex() - 1 ]->GetTextNode();
             if( nLen )
             {
                 pSrcNd->CutText( pDestNd, SwIndex( pDestNd, pDestNd->Len()),
@@ -1536,12 +1536,12 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
             pSrcNd->CutText( pDestNd, rPos.nContent, pStt->nContent, nLen );
         }
 
-        if( bCopyCollFmt )
+        if( bCopyCollFormat )
         {
             SwDoc* const pInsDoc = pDestNd->GetDoc();
             ::sw::UndoGuard const undoGuard(pInsDoc->GetIDocumentUndoRedo());
-            pSrcNd->CopyCollFmt( *pDestNd );
-            bCopyCollFmt = false;
+            pSrcNd->CopyCollFormat( *pDestNd );
+            bCopyCollFormat = false;
         }
 
         if( bOneNd )
@@ -1551,8 +1551,8 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
             // Also, a selection is invalidated.
             pEnd->nContent = pStt->nContent;
             rPam.DeleteMark();
-            GetDoc()->GetDocShell()->Broadcast( SwFmtFldHint( 0,
-                rNodes.IsDocNodes() ? SwFmtFldHintWhich::INSERTED : SwFmtFldHintWhich::REMOVED ) );
+            GetDoc()->GetDocShell()->Broadcast( SwFormatFieldHint( 0,
+                rNodes.IsDocNodes() ? SwFormatFieldHintWhich::INSERTED : SwFormatFieldHintWhich::REMOVED ) );
             return;
         }
 
@@ -1580,7 +1580,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
                 }
                 else
                 {
-                    pDestNd->SplitCntntNode( rPos );
+                    pDestNd->SplitContentNode( rPos );
                 }
 
                 if ( bCorrEnd )
@@ -1593,7 +1593,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
         bSplitDestNd = true;
     }
 
-    SwTxtNode* const pEndSrcNd = aEndIdx.GetNode().GetTxtNode();
+    SwTextNode* const pEndSrcNd = aEndIdx.GetNode().GetTextNode();
     if ( pEndSrcNd )
     {
         {
@@ -1606,13 +1606,13 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
                 }
 
                 pDestNd =
-                    rNodes.MakeTxtNode( rPos.nNode, pEndSrcNd->GetTxtColl() );
+                    rNodes.MakeTextNode( rPos.nNode, pEndSrcNd->GetTextColl() );
                 --rPos.nNode;
                 rPos.nContent.Assign( pDestNd, 0 );
             }
             else
             {
-                pDestNd = rPos.nNode.GetNode().GetTxtNode();
+                pDestNd = rPos.nNode.GetNode().GetTextNode();
             }
 
             if (pDestNd && pEnd->nContent.GetIndex())
@@ -1623,24 +1623,24 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
                                 pEnd->nContent.GetIndex());
             }
 
-            if (pDestNd && bCopyCollFmt)
+            if (pDestNd && bCopyCollFormat)
             {
                 SwDoc* const pInsDoc = pDestNd->GetDoc();
                 ::sw::UndoGuard const ug(pInsDoc->GetIDocumentUndoRedo());
-                pEndSrcNd->CopyCollFmt( *pDestNd );
+                pEndSrcNd->CopyCollFormat( *pDestNd );
             }
         }
     }
     else
     {
-        if ( pSrcNd && aEndIdx.GetNode().IsCntntNode() )
+        if ( pSrcNd && aEndIdx.GetNode().IsContentNode() )
         {
             ++aEndIdx;
         }
         if( !bSplitDestNd )
         {
             ++rPos.nNode;
-            rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(), 0 );
+            rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(), 0 );
         }
     }
 
@@ -1666,20 +1666,20 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
         OSL_ENSURE( bSuccess, "Move() - no ContentNode here" );
         (void) bSuccess;
     }
-    pStt->nContent.Assign( pStt->nNode.GetNode().GetCntntNode(),
+    pStt->nContent.Assign( pStt->nNode.GetNode().GetContentNode(),
                             pStt->nContent.GetIndex() );
     // Correct the PaM, because it might have happened that the move
     // went over the node borders (so the data might be in different nodes).
     // Also, a selection is invalidated.
     *pEnd = *pStt;
     rPam.DeleteMark();
-    GetDoc()->GetDocShell()->Broadcast( SwFmtFldHint( 0,
-                rNodes.IsDocNodes() ? SwFmtFldHintWhich::INSERTED : SwFmtFldHintWhich::REMOVED ) );
+    GetDoc()->GetDocShell()->Broadcast( SwFormatFieldHint( 0,
+                rNodes.IsDocNodes() ? SwFormatFieldHintWhich::INSERTED : SwFormatFieldHintWhich::REMOVED ) );
 }
 
 ///@see SwNodes::_MoveNodes (TODO: seems to be C&P programming here)
 void SwNodes::_CopyNodes( const SwNodeRange& rRange,
-            const SwNodeIndex& rIndex, bool bNewFrms, bool bTblInsDummyNode ) const
+            const SwNodeIndex& rIndex, bool bNewFrms, bool bTableInsDummyNode ) const
 {
     SwDoc* pDoc = rIndex.GetNode().GetDoc();
 
@@ -1753,7 +1753,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
                     nNodeCnt = 1;
 
                 // insert a DummyNode for a TableNode
-                if( bTblInsDummyNode )
+                if( bTableInsDummyNode )
                     new SwPlaceholderNode(aInsPos);
 
                 // copy all of the table's nodes into the current cell
@@ -1762,7 +1762,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
                     ++aRg.aStart )
                 {
                     // insert a DummyNode for the box-StartNode?
-                    if( bTblInsDummyNode )
+                    if( bTableInsDummyNode )
                         new SwPlaceholderNode(aInsPos);
 
                     SwStartNode* pSttNd = aRg.aStart.GetNode().GetStartNode();
@@ -1771,19 +1771,19 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
                                 aInsPos, bNewFrms, false );
 
                     // insert a DummyNode for the box-EndNode?
-                    if( bTblInsDummyNode )
+                    if( bTableInsDummyNode )
                         new SwPlaceholderNode(aInsPos);
                     aRg.aStart = *pSttNd->EndOfSectionNode();
                 }
                 // insert a DummyNode for the table-EndNode
-                if( bTblInsDummyNode )
+                if( bTableInsDummyNode )
                     new SwPlaceholderNode(aInsPos);
                 aRg.aStart = *pAktNode->EndOfSectionNode();
             }
             else
             {
                 SwNodeIndex nStt( aInsPos, -1 );
-                SwTableNode* pTblNd = static_cast<SwTableNode*>(pAktNode)->
+                SwTableNode* pTableNd = static_cast<SwTableNode*>(pAktNode)->
                                         MakeCopy( pDoc, aInsPos );
                 sal_uLong nDistance = aInsPos.GetIndex() - nStt.GetIndex() - 2;
                 if (nDistance < nNodeCnt)
@@ -1793,10 +1793,10 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
 
                 aRg.aStart = pAktNode->EndOfSectionIndex();
 
-                if( bNewFrms && pTblNd )
+                if( bNewFrms && pTableNd )
                 {
                     nStt = aInsPos;
-                    pTblNd->MakeFrms( &nStt );
+                    pTableNd->MakeFrms( &nStt );
                 }
             }
             break;
@@ -1855,7 +1855,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
         case ND_GRFNODE:
         case ND_OLENODE:
             {
-                SwCntntNode* pNew = static_cast<SwCntntNode*>(pAktNode)->MakeCopy(
+                SwContentNode* pNew = static_cast<SwContentNode*>(pAktNode)->MakeCopy(
                                             pDoc, aInsPos );
                 // frames are always created as default, so delete if needed
                 if( !bNewFrms )
@@ -1907,12 +1907,12 @@ SwStartNode* SwNodes::MakeEmptySection( const SwNodeIndex& rIdx,
 
 SwStartNode* SwNodes::MakeTextSection( const SwNodeIndex & rWhere,
                                         SwStartNodeType eSttNdTyp,
-                                        SwTxtFmtColl *pColl,
+                                        SwTextFormatColl *pColl,
                                         SwAttrSet* pAutoAttr )
 {
     SwStartNode* pSttNd = new SwStartNode( rWhere, ND_STARTNODE, eSttNdTyp );
     new SwEndNode( rWhere, *pSttNd );
-    MakeTxtNode( SwNodeIndex( rWhere, - 1 ), pColl, pAutoAttr );
+    MakeTextNode( SwNodeIndex( rWhere, - 1 ), pColl, pAutoAttr );
     return pSttNd;
 }
 
@@ -1929,7 +1929,7 @@ SwStartNode* SwNodes::MakeTextSection( const SwNodeIndex & rWhere,
  * @see SwNodes::GoPrevious
  * @see SwNodes::GoNextSection (TODO: seems to be C&P programming here)
 */
-SwCntntNode* SwNodes::GoNextSection( SwNodeIndex * pIdx,
+SwContentNode* SwNodes::GoNextSection( SwNodeIndex * pIdx,
                             bool bSkipHidden, bool bSkipProtect ) const
 {
     bool bFirst = true;
@@ -1971,7 +1971,7 @@ SwCntntNode* SwNodes::GoNextSection( SwNodeIndex * pIdx,
             else
             {
                 (*pIdx) = aTmp;
-                return const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd));
+                return const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd));
             }
         }
         ++aTmp;
@@ -1981,7 +1981,7 @@ SwCntntNode* SwNodes::GoNextSection( SwNodeIndex * pIdx,
 }
 
 ///@see SwNodes::GoNextSection (TODO: seems to be C&P programming here)
-SwCntntNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx,
+SwContentNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx,
                             bool bSkipHidden, bool bSkipProtect )
 {
     bool bFirst = true;
@@ -2029,7 +2029,7 @@ SwCntntNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx,
             else
             {
                 (*pIdx) = aTmp;
-                return const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd));
+                return const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd));
             }
         }
         --aTmp;
@@ -2079,7 +2079,7 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
             else
                 pNd = pSttNd;
 
-            if( ( pFrmNd = pNd )->IsCntntNode() )
+            if( ( pFrmNd = pNd )->IsContentNode() )
                 rFrmIdx = aIdx;
 
             // search forward or backward for a content node
@@ -2104,7 +2104,7 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
                     aIdx = rFrmIdx;
 
                 // NEVER leave the section when doing this!
-                if( ( pEnd && ( pFrmNd = &aIdx.GetNode())->IsCntntNode() ) ||
+                if( ( pEnd && ( pFrmNd = &aIdx.GetNode())->IsContentNode() ) ||
                     ( 0 != ( pFrmNd = GoNextSection( &aIdx, true, false )) &&
                     ::CheckNodesRange( aIdx, rFrmIdx, true ) &&
                     ( pFrmNd->FindTableNode() == pTableNd &&
@@ -2217,38 +2217,38 @@ void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong nSz, bool bDel )
         for (sal_uLong nCnt = 0; nCnt < nSz; nCnt++)
         {
             SwNode* pNode = ((*this)[ nDelPos + nCnt ]);
-            SwTxtNode * pTxtNd = pNode->GetTxtNode();
+            SwTextNode * pTextNd = pNode->GetTextNode();
 
-            if (pTxtNd)
+            if (pTextNd)
             {
-                pTxtNd->RemoveFromList();
+                pTextNd->RemoveFromList();
                 // remove FLY_AS_CHAR *before* adjusting SwNodeIndex
                 // so their anchor still points to correct node when deleted!
                 // NOTE: this will call RemoveNode() recursively!
                 // so adjust our indexes to account for removed nodes
-                sal_uLong const nPos = pTxtNd->GetIndex();
-                SwpHints *const pHints(pTxtNd->GetpSwpHints());
+                sal_uLong const nPos = pTextNd->GetIndex();
+                SwpHints *const pHints(pTextNd->GetpSwpHints());
                 if (pHints)
                 {
-                    std::vector<SwTxtAttr*> flys;
+                    std::vector<SwTextAttr*> flys;
                     for (size_t i = 0; i < pHints->Count(); ++i)
                     {
-                        SwTxtAttr *const pHint(pHints->GetTextHint(i));
+                        SwTextAttr *const pHint(pHints->GetTextHint(i));
                         if (RES_TXTATR_FLYCNT == pHint->Which())
                         {
                             flys.push_back(pHint);
                         }
                     }
-                    for (SwTxtAttr * pHint : flys)
+                    for (SwTextAttr * pHint : flys)
                     {
-                        pTxtNd->DeleteAttribute(pHint);
+                        pTextNd->DeleteAttribute(pHint);
                     }   // pHints may be dead now
-                    sal_uLong const nDiff = nPos - pTxtNd->GetIndex();
+                    sal_uLong const nDiff = nPos - pTextNd->GetIndex();
                     if (nDiff)
                     {
                         nDelPos -= nDiff;
                     }
-                    assert(pTxtNd == (*this)[nDelPos + nCnt]);
+                    assert(pTextNd == (*this)[nDelPos + nCnt]);
                     assert(pFirst == (*this)[nDelPos]);
                 }
             }
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index e993c42204a3..ffc6bc876b54 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -70,11 +70,11 @@ using namespace ::com::sun::star;
 
 class SwIntrnlSectRefLink : public SwBaseLink
 {
-    SwSectionFmt& rSectFmt;
+    SwSectionFormat& rSectFormat;
 public:
-    SwIntrnlSectRefLink( SwSectionFmt& rFmt, SfxLinkUpdateMode nUpdateType, SotClipboardFormatId nFmt )
-        : SwBaseLink( nUpdateType, nFmt ),
-        rSectFmt( rFmt )
+    SwIntrnlSectRefLink( SwSectionFormat& rFormat, SfxLinkUpdateMode nUpdateType, SotClipboardFormatId nFormat )
+        : SwBaseLink( nUpdateType, nFormat ),
+        rSectFormat( rFormat )
     {}
 
     virtual void Closed() SAL_OVERRIDE;
@@ -92,7 +92,7 @@ public:
     }
 };
 
-TYPEINIT1(SwSectionFmt,SwFrmFmt );
+TYPEINIT1(SwSectionFormat,SwFrameFormat );
 TYPEINIT1(SwSection,SwClient );
 
 SwSectionData::SwSectionData(SectionType const eType, OUString const& rName)
@@ -198,7 +198,7 @@ OUString SwSectionData::CollapseWhiteSpaces(const OUString& sName)
 }
 
 SwSection::SwSection(
-        SectionType const eType, OUString const& rName, SwSectionFmt & rFormat)
+        SectionType const eType, OUString const& rName, SwSectionFormat & rFormat)
     : SwClient(& rFormat)
     , m_Data(eType, rName)
 {
@@ -217,7 +217,7 @@ SwSection::SwSection(
 
     if (!m_Data.IsProtectFlag())
     {
-        m_Data.SetProtectFlag( rFormat.GetProtect().IsCntntProtected() );
+        m_Data.SetProtectFlag( rFormat.GetProtect().IsContentProtected() );
     }
 
     if (!m_Data.IsEditInReadonlyFlag()) // edit in readonly sections
@@ -228,21 +228,21 @@ SwSection::SwSection(
 
 SwSection::~SwSection()
 {
-    SwSectionFmt* pFmt = GetFmt();
-    if( !pFmt )
+    SwSectionFormat* pFormat = GetFormat();
+    if( !pFormat )
         return;
 
-    SwDoc* pDoc = pFmt->GetDoc();
+    SwDoc* pDoc = pFormat->GetDoc();
     if( pDoc->IsInDtor() )
     {
-        // We reattach our Format to the default FrameFmt
+        // We reattach our Format to the default FrameFormat
         // to not get any dependencies
-        if( pFmt->DerivedFrom() != pDoc->GetDfltFrmFmt() )
-            pFmt->RegisterToFormat( *pDoc->GetDfltFrmFmt() );
+        if( pFormat->DerivedFrom() != pDoc->GetDfltFrameFormat() )
+            pFormat->RegisterToFormat( *pDoc->GetDfltFrameFormat() );
     }
     else
     {
-        pFmt->Remove( this ); // remove
+        pFormat->Remove( this ); // remove
 
         if (CONTENT_SECTION != m_Data.GetType())
         {
@@ -255,13 +255,13 @@ SwSection::~SwSection()
         }
 
         // If the Section is the last Client in the Format we can delete it
-        SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFmt );
-        pFmt->ModifyNotification( &aMsgHint, &aMsgHint );
-        if( !pFmt->HasWriterListeners() )
+        SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFormat );
+        pFormat->ModifyNotification( &aMsgHint, &aMsgHint );
+        if( !pFormat->HasWriterListeners() )
         {
             // Do not add to the Undo. This should've happened earlier.
             ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-            pDoc->DelSectionFmt( pFmt );
+            pDoc->DelSectionFormat( pFormat );
         }
     }
     if (m_RefObj.Is())
@@ -301,9 +301,9 @@ bool SwSection::DataEquals(SwSectionData const& rCmp) const
 
 void SwSection::ImplSetHiddenFlag(bool const bTmpHidden, bool const bCondition)
 {
-    SwSectionFmt* pFmt = GetFmt();
-    OSL_ENSURE(pFmt, "ImplSetHiddenFlag: no format?");
-    if( pFmt )
+    SwSectionFormat* pFormat = GetFormat();
+    OSL_ENSURE(pFormat, "ImplSetHiddenFlag: no format?");
+    if( pFormat )
     {
         const bool bHide = bTmpHidden && bCondition;
 
@@ -316,24 +316,24 @@ void SwSection::ImplSetHiddenFlag(bool const bTmpHidden, bool const bCondition)
 
                 // Tell all Children that they are hidden
                 SwMsgPoolItem aMsgItem( RES_SECTION_HIDDEN );
-                pFmt->ModifyNotification( &aMsgItem, &aMsgItem );
+                pFormat->ModifyNotification( &aMsgItem, &aMsgItem );
 
                 // Delete all Frames
-                pFmt->DelFrms();
+                pFormat->DelFrms();
             }
         }
         else if (m_Data.IsHiddenFlag()) // show Nodes again
         {
             // Show all Frames (Child Sections are accounted for by MakeFrms)
             // Only if the Parent Section is not restricting us!
-            SwSection* pParentSect = pFmt->GetParentSection();
+            SwSection* pParentSect = pFormat->GetParentSection();
             if( !pParentSect || !pParentSect->IsHiddenFlag() )
             {
                 // Tell all Children that the Parent is not hidden anymore
                 SwMsgPoolItem aMsgItem( RES_SECTION_NOT_HIDDEN );
-                pFmt->ModifyNotification( &aMsgItem, &aMsgItem );
+                pFormat->ModifyNotification( &aMsgItem, &aMsgItem );
 
-                pFmt->MakeFrms();
+                pFormat->MakeFrms();
             }
         }
     }
@@ -352,20 +352,20 @@ bool SwSection::CalcHiddenFlag() const
 
 bool SwSection::IsProtect() const
 {
-    SwSectionFmt const *const pFmt( GetFmt() );
-    OSL_ENSURE(pFmt, "SwSection::IsProtect: no format?");
-    return (pFmt)
-        ?   pFmt->GetProtect().IsCntntProtected()
+    SwSectionFormat const *const pFormat( GetFormat() );
+    OSL_ENSURE(pFormat, "SwSection::IsProtect: no format?");
+    return (pFormat)
+        ?   pFormat->GetProtect().IsContentProtected()
         :   IsProtectFlag();
 }
 
 // edit in readonly sections
 bool SwSection::IsEditInReadonly() const
 {
-    SwSectionFmt const *const pFmt( GetFmt() );
-    OSL_ENSURE(pFmt, "SwSection::IsEditInReadonly: no format?");
-    return (pFmt)
-        ?   pFmt->GetEditInReadonly().GetValue()
+    SwSectionFormat const *const pFormat( GetFormat() );
+    OSL_ENSURE(pFormat, "SwSection::IsEditInReadonly: no format?");
+    return (pFormat)
+        ?   pFormat->GetEditInReadonly().GetValue()
         :   IsEditInReadonlyFlag();
 }
 
@@ -380,13 +380,13 @@ void SwSection::SetHidden(bool const bFlag)
 
 void SwSection::SetProtect(bool const bFlag)
 {
-    SwSectionFmt *const pFormat( GetFmt() );
+    SwSectionFormat *const pFormat( GetFormat() );
     OSL_ENSURE(pFormat, "SwSection::SetProtect: no format?");
     if (pFormat)
     {
         SvxProtectItem aItem( RES_PROTECT );
-        aItem.SetCntntProtect( bFlag );
-        pFormat->SetFmtAttr( aItem );
+        aItem.SetContentProtect( bFlag );
+        pFormat->SetFormatAttr( aItem );
         // note: this will call m_Data.SetProtectFlag via Modify!
     }
     else
@@ -398,13 +398,13 @@ void SwSection::SetProtect(bool const bFlag)
 // edit in readonly sections
 void SwSection::SetEditInReadonly(bool const bFlag)
 {
-    SwSectionFmt *const pFormat( GetFmt() );
+    SwSectionFormat *const pFormat( GetFormat() );
     OSL_ENSURE(pFormat, "SwSection::SetEditInReadonly: no format?");
     if (pFormat)
     {
-        SwFmtEditInReadonly aItem;
+        SwFormatEditInReadonly aItem;
         aItem.SetValue( bFlag );
-        pFormat->SetFmtAttr( aItem );
+        pFormat->SetFormatAttr( aItem );
         // note: this will call m_Data.SetEditInReadonlyFlag via Modify!
     }
     else
@@ -415,7 +415,7 @@ void SwSection::SetEditInReadonly(bool const bFlag)
 
 void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
-    bool bUpdateFtn = false;
+    bool bUpdateFootnote = false;
     switch( pOld ? pOld->Which() : pNew ? pNew->Which() : 0 )
     {
     case RES_ATTRSET_CHG:
@@ -429,7 +429,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                         RES_PROTECT, false, &pItem ) )
             {
                 m_Data.SetProtectFlag( static_cast<SvxProtectItem const*>(pItem)
-                        ->IsCntntProtected() );
+                        ->IsContentProtected() );
                 pNewSet->ClearItem( RES_PROTECT );
                 pOldSet->ClearItem( RES_PROTECT );
             }
@@ -439,7 +439,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                         RES_EDIT_IN_READONLY, false, &pItem ) )
             {
                 m_Data.SetEditInReadonlyFlag(
-                    static_cast<SwFmtEditInReadonly const*>(pItem)->GetValue());
+                    static_cast<SwFormatEditInReadonly const*>(pItem)->GetValue());
                 pNewSet->ClearItem( RES_EDIT_IN_READONLY );
                 pOldSet->ClearItem( RES_EDIT_IN_READONLY );
             }
@@ -449,7 +449,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                 SfxItemState::SET == pNewSet->GetItemState(
                         RES_END_AT_TXTEND, false, &pItem ))
             {
-                    bUpdateFtn = true;
+                    bUpdateFootnote = true;
             }
 
             if( !pNewSet->Count() )
@@ -461,7 +461,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         if( pNew )
         {
             bool bNewFlag =
-                static_cast<const SvxProtectItem*>(pNew)->IsCntntProtected();
+                static_cast<const SvxProtectItem*>(pNew)->IsContentProtected();
             if( !bNewFlag )
             {
                 // Switching off: See if there is protection transferred
@@ -485,7 +485,7 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         if( pNew )
         {
             const bool bNewFlag =
-                static_cast<const SwFmtEditInReadonly*>(pNew)->GetValue();
+                static_cast<const SwFormatEditInReadonly*>(pNew)->GetValue();
             m_Data.SetEditInReadonlyFlag( bNewFlag );
         }
         return;
@@ -506,14 +506,14 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     case RES_FTN_AT_TXTEND:
         if( pNew && pOld )
         {
-            bUpdateFtn = true;
+            bUpdateFootnote = true;
         }
         break;
 
     case RES_END_AT_TXTEND:
         if( pNew && pOld )
         {
-            bUpdateFtn = true;
+            bUpdateFootnote = true;
         }
         break;
 
@@ -522,11 +522,11 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         break;
     }
 
-    if( bUpdateFtn )
+    if( bUpdateFootnote )
     {
-        SwSectionNode* pSectNd = GetFmt()->GetSectionNode( false );
+        SwSectionNode* pSectNd = GetFormat()->GetSectionNode( false );
         if( pSectNd )
-            pSectNd->GetDoc()->GetFtnIdxs().UpdateFtn(SwNodeIndex( *pSectNd ));
+            pSectNd->GetDoc()->GetFootnoteIdxs().UpdateFootnote(SwNodeIndex( *pSectNd ));
     }
 }
 
@@ -567,7 +567,7 @@ OUString SwSection::GetLinkFileName() const
                     sTmp += OUString(sfx2::cTokenSeparator) + sFilter
                          +  OUString(sfx2::cTokenSeparator) + sRange;
                 }
-                else if( GetFmt() && !GetFmt()->GetSectionNode() )
+                else if( GetFormat() && !GetFormat()->GetSectionNode() )
                 {
                     // If the Section is in the UndoNodesArray, the LinkManager
                     // does not contain the Link, thus it cannot be queried for it.
@@ -630,20 +630,20 @@ const SwTOXBase* SwSection::GetTOXBase() const
     return pRet;
 }
 
-SwSectionFmt::SwSectionFmt( SwFrmFmt* pDrvdFrm, SwDoc *pDoc )
-    : SwFrmFmt( pDoc->GetAttrPool(), OUString(), pDrvdFrm )
+SwSectionFormat::SwSectionFormat( SwFrameFormat* pDrvdFrm, SwDoc *pDoc )
+    : SwFrameFormat( pDoc->GetAttrPool(), OUString(), pDrvdFrm )
 {
     LockModify();
-    SetFmtAttr( *GetDfltAttr( RES_COL ) );
+    SetFormatAttr( *GetDfltAttr( RES_COL ) );
     UnlockModify();
 }
 
-SwSectionFmt::~SwSectionFmt()
+SwSectionFormat::~SwSectionFormat()
 {
     if( !GetDoc()->IsInDtor() )
     {
         SwSectionNode* pSectNd;
-        const SwNodeIndex* pIdx = GetCntnt( false ).GetCntntIdx();
+        const SwNodeIndex* pIdx = GetContent( false ).GetContentIdx();
         if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
             0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
         {
@@ -672,32 +672,32 @@ SwSectionFmt::~SwSectionFmt()
             GetDoc()->GetNodes().SectionUp( &aRg );
         }
         LockModify();
-        ResetFmtAttr( RES_CNTNT );
+        ResetFormatAttr( RES_CNTNT );
         UnlockModify();
     }
 }
 
-SwSection * SwSectionFmt::GetSection() const
+SwSection * SwSectionFormat::GetSection() const
 {
-    return SwIterator<SwSection,SwSectionFmt>( *this ).First();
+    return SwIterator<SwSection,SwSectionFormat>( *this ).First();
 }
 
 // Do not destroy all Frms in aDepend (Frms are recognized with a PTR_CAST).
-void SwSectionFmt::DelFrms()
+void SwSectionFormat::DelFrms()
 {
     SwSectionNode* pSectNd;
-    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetContent(false).GetContentIdx();
     if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
         0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
     {
-        // First delete the <SwSectionFrm> of the <SwSectionFmt> instance
+        // First delete the <SwSectionFrm> of the <SwSectionFormat> instance
         // mba: test iteration as objects are removed in iteration
         // use hint which allows to specify, if the content shall be saved or not
         CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( false ) );
 
-        // Then delete frames of the nested <SwSectionFmt> instances
-        SwIterator<SwSectionFmt,SwSectionFmt> aIter( *this );
-        SwSectionFmt *pLast = aIter.First();
+        // Then delete frames of the nested <SwSectionFormat> instances
+        SwIterator<SwSectionFormat,SwSectionFormat> aIter( *this );
+        SwSectionFormat *pLast = aIter.First();
         while ( pLast )
         {
             pLast->DelFrms();
@@ -706,7 +706,7 @@ void SwSectionFmt::DelFrms()
 
         sal_uLong nEnde = pSectNd->EndOfSectionIndex();
         sal_uLong nStart = pSectNd->GetIndex()+1;
-        sw_DeleteFtn( pSectNd, nStart, nEnde );
+        sw_DeleteFootnote( pSectNd, nStart, nEnde );
     }
     if( pIdx )
     {
@@ -714,7 +714,7 @@ void SwSectionFmt::DelFrms()
         // Paste of the Framei tself would need to do this. But that leads
         // to subsequent errors, which we'd need to solve at run-time.
         SwNodeIndex aNextNd( *pIdx );
-        SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection( &aNextNd, true, false );
+        SwContentNode* pCNd = GetDoc()->GetNodes().GoNextSection( &aNextNd, true, false );
         if( pCNd )
         {
             const SfxPoolItem& rItem = pCNd->GetSwAttrSet().Get( RES_PAGEDESC );
@@ -724,10 +724,10 @@ void SwSectionFmt::DelFrms()
 }
 
 // Create the Views
-void SwSectionFmt::MakeFrms()
+void SwSectionFormat::MakeFrms()
 {
     SwSectionNode* pSectNd;
-    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetContent(false).GetContentIdx();
 
     if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
         0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
@@ -737,7 +737,7 @@ void SwSectionFmt::MakeFrms()
     }
 }
 
-void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwSectionFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     bool bClients = false;
     sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
@@ -816,7 +816,7 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         {
             // My Parents will be destroyed, so get the Parent's Parent
             // and update
-            SwFrmFmt::Modify( pOld, pNew ); // Rewire first!
+            SwFrameFormat::Modify( pOld, pNew ); // Rewire first!
             UpdateParent();
             return;
         }
@@ -824,17 +824,17 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 
     case RES_FMT_CHG:
         if( !GetDoc()->IsInDtor() &&
-            static_cast<const SwFmtChg*>(pNew)->pChangedFmt == (void*)GetRegisteredIn() &&
-            static_cast<const SwFmtChg*>(pNew)->pChangedFmt->IsA( TYPE( SwSectionFmt )) )
+            static_cast<const SwFormatChg*>(pNew)->pChangedFormat == (void*)GetRegisteredIn() &&
+            static_cast<const SwFormatChg*>(pNew)->pChangedFormat->IsA( TYPE( SwSectionFormat )) )
         {
             // My Parent will be changed, thus I need to update
-            SwFrmFmt::Modify( pOld, pNew ); // Rewire first!
+            SwFrameFormat::Modify( pOld, pNew ); // Rewire first!
             UpdateParent();
             return;
         }
         break;
     }
-    SwFrmFmt::Modify( pOld, pNew );
+    SwFrameFormat::Modify( pOld, pNew );
 
     if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
     {   // invalidate cached uno object
@@ -843,12 +843,12 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 }
 
 // Get info from the Format
-bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const
+bool SwSectionFormat::GetInfo( SfxPoolItem& rInfo ) const
 {
     switch( rInfo.Which() )
     {
     case RES_FINDNEARESTNODE:
-        if( static_cast<const SwFmtPageDesc&>(GetFmtAttr( RES_PAGEDESC )).GetPageDesc() )
+        if( static_cast<const SwFormatPageDesc&>(GetFormatAttr( RES_PAGEDESC )).GetPageDesc() )
         {
             const SwSectionNode* pNd = GetSectionNode();
             if( pNd )
@@ -858,15 +858,15 @@ bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const
 
     case RES_CONTENT_VISIBLE:
         {
-            SwFrm* pFrm = SwIterator<SwFrm,SwFmt>(*this).First();
+            SwFrm* pFrm = SwIterator<SwFrm,SwFormat>(*this).First();
             // if the current section has no own frame search for the children
             if(!pFrm)
             {
-                SwIterator<SwSectionFmt,SwSectionFmt> aFormatIter(*this);
-                SwSectionFmt* pChild = aFormatIter.First();
+                SwIterator<SwSectionFormat,SwSectionFormat> aFormatIter(*this);
+                SwSectionFormat* pChild = aFormatIter.First();
                 while(pChild && !pFrm)
                 {
-                    pFrm = SwIterator<SwFrm,SwFmt>(*pChild).First();
+                    pFrm = SwIterator<SwFrm,SwFormat>(*pChild).First();
                     pChild = aFormatIter.Next();
                 }
             }
@@ -879,14 +879,14 @@ bool SwSectionFmt::GetInfo( SfxPoolItem& rInfo ) const
 
 static bool lcl_SectionCmpPos( const SwSection *pFirst, const SwSection *pSecond)
 {
-    const SwSectionFmt* pFSectFmt = pFirst->GetFmt();
-    const SwSectionFmt* pSSectFmt = pSecond->GetFmt();
-    OSL_ENSURE( pFSectFmt && pSSectFmt &&
-            pFSectFmt->GetCntnt(false).GetCntntIdx() &&
-            pSSectFmt->GetCntnt(false).GetCntntIdx(),
+    const SwSectionFormat* pFSectFormat = pFirst->GetFormat();
+    const SwSectionFormat* pSSectFormat = pSecond->GetFormat();
+    OSL_ENSURE( pFSectFormat && pSSectFormat &&
+            pFSectFormat->GetContent(false).GetContentIdx() &&
+            pSSectFormat->GetContent(false).GetContentIdx(),
                 "ungueltige Sections" );
-    return pFSectFmt->GetCntnt(false).GetCntntIdx()->GetIndex() <
-                  pSSectFmt->GetCntnt(false).GetCntntIdx()->GetIndex();
+    return pFSectFormat->GetContent(false).GetContentIdx()->GetIndex() <
+                  pSSectFormat->GetContent(false).GetContentIdx()->GetIndex();
 }
 
 static bool lcl_SectionCmpNm( const SwSection *pFSect, const SwSection *pSSect)
@@ -896,7 +896,7 @@ static bool lcl_SectionCmpNm( const SwSection *pFSect, const SwSection *pSSect)
 }
 
 // get all Sections that have been derived from this one
-void SwSectionFmt::GetChildSections( SwSections& rArr,
+void SwSectionFormat::GetChildSections( SwSections& rArr,
                                         SectionSort eSort,
                                         bool bAllSections ) const
 {
@@ -904,12 +904,12 @@ void SwSectionFmt::GetChildSections( SwSections& rArr,
 
     if( HasWriterListeners() )
     {
-        SwIterator<SwSectionFmt,SwSectionFmt> aIter(*this);
+        SwIterator<SwSectionFormat,SwSectionFormat> aIter(*this);
         const SwNodeIndex* pIdx;
-        for( SwSectionFmt* pLast = aIter.First(); pLast; pLast = aIter.Next() )
+        for( SwSectionFormat* pLast = aIter.First(); pLast; pLast = aIter.Next() )
             if( bAllSections ||
-                ( 0 != ( pIdx = pLast->GetCntnt(false).
-                GetCntntIdx()) && &pIdx->GetNodes() == &GetDoc()->GetNodes() ))
+                ( 0 != ( pIdx = pLast->GetContent(false).
+                GetContentIdx()) && &pIdx->GetNodes() == &GetDoc()->GetNodes() ))
             {
                 SwSection* pDummy = pLast->GetSection();
                 rArr.push_back( pDummy );
@@ -932,14 +932,14 @@ void SwSectionFmt::GetChildSections( SwSections& rArr,
 }
 
 // See whether the Section is within the Nodes or the UndoNodes array
-bool SwSectionFmt::IsInNodesArr() const
+bool SwSectionFormat::IsInNodesArr() const
 {
-    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetContent(false).GetContentIdx();
     return pIdx && &pIdx->GetNodes() == &GetDoc()->GetNodes();
 }
 
 // Parent was changed
-void SwSectionFmt::UpdateParent()
+void SwSectionFormat::UpdateParent()
 {
     if( !HasWriterListeners() )
         return;
@@ -947,13 +947,13 @@ void SwSectionFmt::UpdateParent()
     SwSection* pSection = 0;
     const SvxProtectItem* pProtect(0);
     // edit in readonly sections
-    const SwFmtEditInReadonly* pEditInReadonly = 0;
+    const SwFormatEditInReadonly* pEditInReadonly = 0;
     bool bIsHidden = false;
 
-    SwIterator<SwClient,SwSectionFmt> aIter(*this);
+    SwIterator<SwClient,SwSectionFormat> aIter(*this);
     for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
     {
-        if( pLast->IsA( TYPE(SwSectionFmt) ) )
+        if( pLast->IsA( TYPE(SwSectionFormat) ) )
         {
             if( !pSection )
             {
@@ -961,9 +961,9 @@ void SwSectionFmt::UpdateParent()
                 if( GetRegisteredIn() )
                 {
                     const SwSection* pPS = GetParentSection();
-                    pProtect = &pPS->GetFmt()->GetProtect();
+                    pProtect = &pPS->GetFormat()->GetProtect();
                     // edit in readonly sections
-                    pEditInReadonly = &pPS->GetFmt()->GetEditInReadonly();
+                    pEditInReadonly = &pPS->GetFormat()->GetEditInReadonly();
                     bIsHidden = pPS->IsHiddenFlag();
                 }
                 else
@@ -974,7 +974,7 @@ void SwSectionFmt::UpdateParent()
                     bIsHidden = pSection->IsHidden();
                 }
             }
-            if (!pProtect->IsCntntProtected() !=
+            if (!pProtect->IsContentProtected() !=
                 !pSection->IsProtectFlag())
             {
                 pLast->ModifyNotification( (SfxPoolItem*)pProtect,
@@ -1004,9 +1004,9 @@ void SwSectionFmt::UpdateParent()
             if( GetRegisteredIn() )
             {
                 const SwSection* pPS = GetParentSection();
-                pProtect = &pPS->GetFmt()->GetProtect();
+                pProtect = &pPS->GetFormat()->GetProtect();
                 // edit in readonly sections
-                pEditInReadonly = &pPS->GetFmt()->GetEditInReadonly();
+                pEditInReadonly = &pPS->GetFormat()->GetEditInReadonly();
                 bIsHidden = pPS->IsHiddenFlag();
             }
             else
@@ -1020,16 +1020,16 @@ void SwSectionFmt::UpdateParent()
     }
 }
 
-SwSectionNode* SwSectionFmt::GetSectionNode(bool const bAlways)
+SwSectionNode* SwSectionFormat::GetSectionNode(bool const bAlways)
 {
-    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetContent(false).GetContentIdx();
     if( pIdx && ( bAlways || &pIdx->GetNodes() == &GetDoc()->GetNodes() ))
         return pIdx->GetNode().GetSectionNode();
     return 0;
 }
 
 // Is this Section valid for the GlobalDocument?
-const SwSection* SwSectionFmt::GetGlobalDocSection() const
+const SwSection* SwSectionFormat::GetGlobalDocSection() const
 {
     const SwSectionNode* pNd = GetSectionNode();
     if( pNd &&
@@ -1043,25 +1043,25 @@ const SwSection* SwSectionFmt::GetGlobalDocSection() const
 }
 
 // sw::Metadatable
-::sfx2::IXmlIdRegistry& SwSectionFmt::GetRegistry()
+::sfx2::IXmlIdRegistry& SwSectionFormat::GetRegistry()
 {
     return GetDoc()->GetXmlIdRegistry();
 }
 
-bool SwSectionFmt::IsInClipboard() const
+bool SwSectionFormat::IsInClipboard() const
 {
     return GetDoc()->IsClipBoard();
 }
 
-bool SwSectionFmt::IsInUndo() const
+bool SwSectionFormat::IsInUndo() const
 {
     return !IsInNodesArr();
 }
 
-bool SwSectionFmt::IsInContent() const
+bool SwSectionFormat::IsInContent() const
 {
-    SwNodeIndex const*const pIdx = GetCntnt(false).GetCntntIdx();
-    OSL_ENSURE(pIdx, "SwSectionFmt::IsInContent: no index?");
+    SwNodeIndex const*const pIdx = GetContent(false).GetContentIdx();
+    OSL_ENSURE(pIdx, "SwSectionFormat::IsInContent: no index?");
     return pIdx == nullptr || !GetDoc()->IsInHeaderFooter(*pIdx);
 }
 
@@ -1071,7 +1071,7 @@ bool SwSectionFmt::IsInContent() const
 // section format.  but here only one UNO object can be returned,
 // so always return the text section.
 uno::Reference< rdf::XMetadatable >
-SwSectionFmt::MakeUnoObject()
+SwSectionFormat::MakeUnoObject()
 {
     uno::Reference<rdf::XMetadatable> xMeta;
     SwSection *const pSection( GetSection() );
@@ -1084,19 +1084,19 @@ SwSectionFmt::MakeUnoObject()
     return xMeta;
 }
 
-void SwSectionFmt::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwSectionFormat::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swSectionFmt"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swSectionFormat"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetName().toUtf8().getStr()));
     GetAttrSet().dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
-void SwSectionFmts::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwSectionFormats::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swSectionFmts"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swSectionFormats"));
     for (size_t i = 0; i < size(); ++i)
-        GetFmt(i)->dumpAsXml(pWriter);
+        GetFormat(i)->dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
@@ -1185,8 +1185,8 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
 ::sfx2::SvBaseLink::UpdateResult SwIntrnlSectRefLink::DataChanged(
     const OUString& rMimeType, const uno::Any & rValue )
 {
-    SwSectionNode* pSectNd = rSectFmt.GetSectionNode( false );
-    SwDoc* pDoc = rSectFmt.GetDoc();
+    SwSectionNode* pSectNd = rSectFormat.GetSectionNode( false );
+    SwDoc* pDoc = rSectFormat.GetDoc();
 
     SotClipboardFormatId nDataFormat = SotExchange::GetFormatIdFromMimeType( rMimeType );
 
@@ -1213,13 +1213,13 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
     SwPaM* pPam;
     SwViewShell* pVSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
     SwEditShell* pESh = pDoc->GetEditShell();
-    pDoc->getIDocumentFieldsAccess().LockExpFlds();
+    pDoc->getIDocumentFieldsAccess().LockExpFields();
     {
         // Insert an empty TextNode at the Section's start
         SwNodeIndex aIdx( *pSectNd, +1 );
         SwNodeIndex aEndIdx( *pSectNd->EndOfSectionNode() );
-        SwTxtNode* pNewNd = pDoc->GetNodes().MakeTxtNode( aIdx,
-                        pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ) );
+        SwTextNode* pNewNd = pDoc->GetNodes().MakeTextNode( aIdx,
+                        pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ) );
 
         if( pESh )
             pESh->StartAllAction();
@@ -1361,7 +1361,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
                                 pDoc->GetNodes().GetEndOfExtras().GetIndex() ||
                                 rInsPos.GetNode().FindTableNode();
 
-                    SwTblNumFmtMerge aTNFM( *pSrcDoc, *pDoc );
+                    SwTableNumFormatMerge aTNFM( *pSrcDoc, *pDoc );
 
                     pSrcDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( *pCpyRg, 0, rInsPos, NULL, bCreateFrm );
                     ++aSave;
@@ -1438,9 +1438,9 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
     pDoc->GetIDocumentUndoRedo().DoUndo(bWasUndo);
     pDoc->getIDocumentLinksAdministration().SetVisibleLinks( bWasVisibleLinks );
 
-    pDoc->getIDocumentFieldsAccess().UnlockExpFlds();
-    if( !pDoc->getIDocumentFieldsAccess().IsExpFldsLocked() )
-        pDoc->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    pDoc->getIDocumentFieldsAccess().UnlockExpFields();
+    if( !pDoc->getIDocumentFieldsAccess().IsExpFieldsLocked() )
+        pDoc->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
 
     if( pESh )
         pESh->EndAllAction();
@@ -1453,14 +1453,14 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
 
 void SwIntrnlSectRefLink::Closed()
 {
-    SwDoc* pDoc = rSectFmt.GetDoc();
+    SwDoc* pDoc = rSectFormat.GetDoc();
     if( pDoc && !pDoc->IsInDtor() )
     {
         // Advise says goodbye: mark the Section as not protected
         // and change the Flag
-        const SwSectionFmts& rFmts = pDoc->GetSections();
-        for( auto n = rFmts.size(); n; )
-            if( rFmts[ --n ] == &rSectFmt )
+        const SwSectionFormats& rFormats = pDoc->GetSections();
+        for( auto n = rFormats.size(); n; )
+            if( rFormats[ --n ] == &rSectFormat )
             {
                 SwViewShell* pSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
                 SwEditShell* pESh = pDoc->GetEditShell();
@@ -1470,7 +1470,7 @@ void SwIntrnlSectRefLink::Closed()
                 else
                     pSh->StartAction();
 
-                SwSectionData aSectionData(*rSectFmt.GetSection());
+                SwSectionData aSectionData(*rSectFormat.GetSection());
                 aSectionData.SetType( CONTENT_SECTION );
                 aSectionData.SetLinkFileName( OUString() );
                 aSectionData.SetHidden( false );
@@ -1483,7 +1483,7 @@ void SwIntrnlSectRefLink::Closed()
                 pDoc->UpdateSection( n, aSectionData );
 
                 // Make all Links within the Section visible again
-                SwSectionNode* pSectNd = rSectFmt.GetSectionNode( false );
+                SwSectionNode* pSectNd = rSectFormat.GetSectionNode( false );
                 if( pSectNd )
                     SwSection::MakeChildLinksVisible( *pSectNd );
 
@@ -1499,9 +1499,9 @@ void SwIntrnlSectRefLink::Closed()
 
 void SwSection::CreateLink( LinkCreateType eCreateType )
 {
-    SwSectionFmt* pFmt = GetFmt();
-    OSL_ENSURE(pFmt, "SwSection::CreateLink: no format?");
-    if (!pFmt || (CONTENT_SECTION == m_Data.GetType()))
+    SwSectionFormat* pFormat = GetFormat();
+    OSL_ENSURE(pFormat, "SwSection::CreateLink: no format?");
+    if (!pFormat || (CONTENT_SECTION == m_Data.GetType()))
         return ;
 
     SfxLinkUpdateMode nUpdateType = SfxLinkUpdateMode::ALWAYS;
@@ -1509,11 +1509,11 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
     if (!m_RefLink.Is())
     {
         // create BaseLink
-        m_RefLink = new SwIntrnlSectRefLink( *pFmt, nUpdateType, SotClipboardFormatId::RTF );
+        m_RefLink = new SwIntrnlSectRefLink( *pFormat, nUpdateType, SotClipboardFormatId::RTF );
     }
     else
     {
-        pFmt->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink );
+        pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink );
     }
 
     SwIntrnlSectRefLink *const pLnk =
@@ -1521,13 +1521,13 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
 
     const OUString sCmd(SwSectionData::CollapseWhiteSpaces(m_Data.GetLinkFileName()));
     pLnk->SetUpdateMode( nUpdateType );
-    pLnk->SetVisible( pFmt->GetDoc()->getIDocumentLinksAdministration().IsVisibleLinks() );
+    pLnk->SetVisible( pFormat->GetDoc()->getIDocumentLinksAdministration().IsVisibleLinks() );
 
     switch (m_Data.GetType())
     {
     case DDE_LINK_SECTION:
         pLnk->SetLinkSourceName( sCmd );
-        pFmt->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( pLnk );
+        pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( pLnk );
         break;
     case FILE_LINK_SECTION:
         {
@@ -1536,7 +1536,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
             const OUString sFile(sCmd.getToken( 0, sfx2::cTokenSeparator, nIndex ));
             const OUString sFltr(sCmd.getToken( 0, sfx2::cTokenSeparator, nIndex ));
             const OUString sRange(sCmd.getToken( 0, sfx2::cTokenSeparator, nIndex ));
-            pFmt->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertFileLink( *pLnk,
+            pFormat->GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertFileLink( *pLnk,
                                 static_cast<sal_uInt16>(m_Data.GetType()),
                                 sFile,
                                 ( !sFltr.isEmpty() ? &sFltr : 0 ),
@@ -1574,7 +1574,7 @@ void SwSection::BreakLink()
     // Release link, if it exists
     if (m_RefLink.Is())
     {
-        SwSectionFmt *const pFormat( GetFmt() );
+        SwSectionFormat *const pFormat( GetFormat() );
         OSL_ENSURE(pFormat, "SwSection::BreakLink: no format?");
         if (pFormat)
         {
@@ -1591,13 +1591,13 @@ void SwSection::BreakLink()
 
 const SwNode* SwIntrnlSectRefLink::GetAnchor() const
 {
-    return rSectFmt.GetSectionNode( false );
+    return rSectFormat.GetSectionNode( false );
 }
 
 bool SwIntrnlSectRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
                                      sal_Int32 , sal_Int32 ) const
 {
-    SwStartNode* pSttNd = rSectFmt.GetSectionNode( false );
+    SwStartNode* pSttNd = rSectFormat.GetSectionNode( false );
     return pSttNd &&
             nSttNd < pSttNd->GetIndex() &&
             pSttNd->EndOfSectionIndex() < nEndNd;
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index edd25b63a154..a00c8f966c1c 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -60,19 +60,19 @@ TYPEINIT1( SwBaseLink, ::sfx2::SvBaseLink );
 
 static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
 {
-    //call fist all not SwNoTxtFrames, then the SwNoTxtFrames.
-    //              The reason is, that in the SwNoTxtFrames the Graphic
+    //call fist all not SwNoTextFrames, then the SwNoTextFrames.
+    //              The reason is, that in the SwNoTextFrames the Graphic
     //              after a Paint will be swapped out! So all other "behind"
     //              them havent't a loaded Graphic.
     rGrfNd.LockModify();
     {
         SwIterator<SwClient,SwGrfNode> aIter(rGrfNd);
         for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
-            if(!pLast->ISA(SwCntntFrm))
+            if(!pLast->ISA(SwContentFrm))
                 pLast->ModifyNotification(&rItem, &rItem);
     }
     {
-        SwIterator<SwCntntFrm,SwGrfNode> aIter(rGrfNd);
+        SwIterator<SwContentFrm,SwGrfNode> aIter(rGrfNd);
         for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
             pLast->ModifyNotification(&rItem, &rItem);
     }
@@ -82,23 +82,23 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
 ::sfx2::SvBaseLink::UpdateResult SwBaseLink::DataChanged(
     const OUString& rMimeType, const uno::Any & rValue )
 {
-    if( !pCntntNode )
+    if( !pContentNode )
     {
         OSL_ENSURE(false, "DataChanged without ContentNode" );
         return ERROR_GENERAL;
     }
 
-    SwDoc* pDoc = pCntntNode->GetDoc();
+    SwDoc* pDoc = pContentNode->GetDoc();
     if( pDoc->IsInDtor() || ChkNoDataFlag() || bIgnoreDataChanged )
     {
         bIgnoreDataChanged = false;
         return SUCCESS;
     }
 
-    SotClipboardFormatId nFmt = SotExchange::GetFormatIdFromMimeType( rMimeType );
+    SotClipboardFormatId nFormat = SotExchange::GetFormatIdFromMimeType( rMimeType );
 
-    if( pCntntNode->IsNoTxtNode() &&
-        nFmt == sfx2::LinkManager::RegisterStatusInfoId() )
+    if( pContentNode->IsNoTextNode() &&
+        nFormat == sfx2::LinkManager::RegisterStatusInfoId() )
     {
         // Only a status change - serve Events?
         OUString sState;
@@ -113,11 +113,11 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
             case sfx2::LinkManager::STATE_LOAD_ABORT:   nEvent = SVX_EVENT_IMAGE_ABORT; break;
             }
 
-            SwFrmFmt* pFmt;
-            if( nEvent && 0 != ( pFmt = pCntntNode->GetFlyFmt() ))
+            SwFrameFormat* pFormat;
+            if( nEvent && 0 != ( pFormat = pContentNode->GetFlyFormat() ))
             {
                 SwCallMouseEvent aCallEvent;
-                aCallEvent.Set( EVENT_OBJECT_IMAGE, pFmt );
+                aCallEvent.Set( EVENT_OBJECT_IMAGE, pFormat );
                 pDoc->CallEvent( nEvent, aCallEvent );
             }
         }
@@ -132,9 +132,9 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
 
     SwGrfNode* pSwGrfNode = NULL;
 
-    if (pCntntNode->IsGrfNode())
+    if (pContentNode->IsGrfNode())
     {
-        pSwGrfNode = pCntntNode->GetGrfNode();
+        pSwGrfNode = pContentNode->GetGrfNode();
         assert(pSwGrfNode && "Error, pSwGrfNode expected when node answers IsGrfNode() with true (!)");
         aOldSz = pSwGrfNode->GetTwipSize();
         const GraphicObject& rGrfObj = pSwGrfNode->GetGrfObj();
@@ -184,7 +184,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
         if ( bUpdate && !bGraphicArrived && !bGraphicPieceArrived )
             pSwGrfNode->SetTwipSize( Size(0,0) );
     }
-    else if( pCntntNode->IsOLENode() )
+    else if( pContentNode->IsOLENode() )
         bUpdate = true;
 
     SwViewShell *pSh = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
@@ -196,7 +196,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
         if ( (!pSh || !pSh->ActionPend()) && (!pESh || !pESh->ActionPend()) )
         {
             SwMsgPoolItem aMsgHint( RES_GRAPHIC_PIECE_ARRIVED );
-            pCntntNode->ModifyNotification( &aMsgHint, &aMsgHint );
+            pContentNode->ModifyNotification( &aMsgHint, &aMsgHint );
             bUpdate = false;
         }
     }
@@ -233,7 +233,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
                     pLnk->ISA( SwBaseLink ) && pLnk->GetObj() == GetObj() )
                 {
                     SwBaseLink* pBLink = static_cast<SwBaseLink*>(pLnk);
-                    SwGrfNode* pGrfNd = static_cast<SwGrfNode*>(pBLink->pCntntNode);
+                    SwGrfNode* pGrfNd = static_cast<SwGrfNode*>(pBLink->pContentNode);
 
                     if( pBLink != this &&
                         ( !bSwapIn ||
@@ -245,7 +245,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
                         pBLink->DataChanged( rMimeType, rValue );
                         pBLink->bIgnoreDataChanged = true;
 
-                        pGrfNd->SetGraphicArrived( static_cast<SwGrfNode*>(pCntntNode)->
+                        pGrfNd->SetGraphicArrived( static_cast<SwGrfNode*>(pContentNode)->
                                                     IsGraphicArrived() );
 
                         // Adjust the Fly's graphic
@@ -268,7 +268,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
         }
         else
         {
-            pCntntNode->ModifyNotification( &aMsgHint, &aMsgHint );
+            pContentNode->ModifyNotification( &aMsgHint, &aMsgHint );
         }
 
         if( pESh )
@@ -300,9 +300,9 @@ static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size& rO
     if ( !(aSz.Width() && aSz.Height()) &&
             rGrfSz.Width() && rGrfSz.Height() )
     {
-        SwFrmFmt* pFmt;
+        SwFrameFormat* pFormat;
         if( pGrfNd->IsChgTwipSize() &&
-            0 != (pFmt = pGrfNd->GetFlyFmt()) )
+            0 != (pFormat = pGrfNd->GetFlyFormat()) )
         {
             Size aCalcSz( aSz );
             if ( !aSz.Height() && aSz.Width() )
@@ -317,17 +317,17 @@ static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size& rO
                 // Take over height and width
                 aCalcSz = rGrfSz;
 
-            const SvxBoxItem     &rBox = pFmt->GetBox();
+            const SvxBoxItem     &rBox = pFormat->GetBox();
             aCalcSz.Width() += rBox.CalcLineSpace(SvxBoxItemLine::LEFT) +
                                rBox.CalcLineSpace(SvxBoxItemLine::RIGHT);
             aCalcSz.Height()+= rBox.CalcLineSpace(SvxBoxItemLine::TOP) +
                                rBox.CalcLineSpace(SvxBoxItemLine::BOTTOM);
-            const SwFmtFrmSize& rOldAttr = pFmt->GetFrmSize();
+            const SwFormatFrmSize& rOldAttr = pFormat->GetFrmSize();
             if( rOldAttr.GetSize() != aCalcSz )
             {
-                SwFmtFrmSize aAttr( rOldAttr  );
+                SwFormatFrmSize aAttr( rOldAttr  );
                 aAttr.SetSize( aCalcSz );
-                pFmt->SetFmtAttr( aAttr );
+                pFormat->SetFormatAttr( aAttr );
                 bRet = true;
             }
 
@@ -336,16 +336,16 @@ static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size& rO
                 // If the graphic is anchored in a table, we need to recalculate
                 // the table rows
                 const SwDoc *pDoc = pGrfNd->GetDoc();
-                const SwPosition* pAPos = pFmt->GetAnchor().GetCntntAnchor();
+                const SwPosition* pAPos = pFormat->GetAnchor().GetContentAnchor();
                 SwNode *pANd;
-                SwTableNode *pTblNd;
+                SwTableNode *pTableNd;
                 if( pAPos &&
                     0 != (pANd = & pAPos->nNode.GetNode()) &&
-                    0 != (pTblNd = pANd->FindTableNode()) )
+                    0 != (pTableNd = pANd->FindTableNode()) )
                 {
-                    const bool bLastGrf = !pTblNd->GetTable().DecGrfsThatResize();
+                    const bool bLastGrf = !pTableNd->GetTable().DecGrfsThatResize();
                     SwHTMLTableLayout *pLayout =
-                        pTblNd->GetTable().GetHTMLTableLayout();
+                        pTableNd->GetTable().GetHTMLTableLayout();
                     if( pLayout )
                     {
                         const sal_uInt16 nBrowseWidth =
@@ -431,24 +431,24 @@ bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
 
 void SwBaseLink::Closed()
 {
-    if( pCntntNode && !pCntntNode->GetDoc()->IsInDtor() )
+    if( pContentNode && !pContentNode->GetDoc()->IsInDtor() )
     {
         // Delete the connection
-        if( pCntntNode->IsGrfNode() )
-            static_cast<SwGrfNode*>(pCntntNode)->ReleaseLink();
+        if( pContentNode->IsGrfNode() )
+            static_cast<SwGrfNode*>(pContentNode)->ReleaseLink();
     }
     SvBaseLink::Closed();
 }
 
 const SwNode* SwBaseLink::GetAnchor() const
 {
-    if (pCntntNode)
+    if (pContentNode)
     {
-        SwFrmFmt *const pFmt = pCntntNode->GetFlyFmt();
-        if (pFmt)
+        SwFrameFormat *const pFormat = pContentNode->GetFlyFormat();
+        if (pFormat)
         {
-            const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-            SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+            const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
+            SwPosition const*const pAPos = rAnchor.GetContentAnchor();
             if (pAPos &&
                 ((FLY_AS_CHAR == rAnchor.GetAnchorId()) ||
                  (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index b0fe5b69c8a3..08e628b70b20 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -98,20 +98,20 @@ void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor )
  * Otherwise it is just a simple drawing object. This has a
  * UserCall and is the client of the searched format.
 */
-SwFrmFmt *FindFrmFmt( SdrObject *pObj )
+SwFrameFormat *FindFrameFormat( SdrObject *pObj )
 {
-    SwFrmFmt* pRetval = 0L;
+    SwFrameFormat* pRetval = 0L;
 
     if ( pObj->ISA(SwVirtFlyDrawObj) )
     {
-       pRetval = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFmt();
+       pRetval = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFormat();
     }
     else
     {
         SwDrawContact* pContact = static_cast<SwDrawContact*>(GetUserCall( pObj ));
         if ( pContact )
         {
-            pRetval = pContact->GetFmt();
+            pRetval = pContact->GetFormat();
         }
     }
     return pRetval;
@@ -121,10 +121,10 @@ bool HasWrap( const SdrObject* pObj )
 {
     if ( pObj )
     {
-        const SwFrmFmt* pFmt = ::FindFrmFmt( pObj );
-        if ( pFmt )
+        const SwFrameFormat* pFormat = ::FindFrameFormat( pObj );
+        if ( pFormat )
         {
-            return SURROUND_THROUGHT != pFmt->GetSurround().GetSurround();
+            return SURROUND_THROUGHT != pFormat->GetSurround().GetSurround();
         }
     }
 
@@ -169,7 +169,7 @@ bool IsMarqueeTextObj( const SdrObject& rObj )
          || SDRTEXTANI_ALTERNATE == eTKind || SDRTEXTANI_SLIDE == eTKind );
 }
 
-SwContact::SwContact( SwFrmFmt *pToRegisterIn ) :
+SwContact::SwContact( SwFrameFormat *pToRegisterIn ) :
     SwClient( pToRegisterIn ),
     mbInDTOR( false )
 {}
@@ -190,7 +190,7 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
 {
     // #i46297# - notify background about the arriving of
     // the object and invalidate its position.
-    const bool bNotify( !GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) );
+    const bool bNotify( !GetFormat()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) );
 
     _MoveObjToLayer( true, _pDrawObj );
 
@@ -220,7 +220,7 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
 void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
 {
     // #i46297# - notify background about the leaving of the object.
-    const bool bNotify( GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) );
+    const bool bNotify( GetFormat()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) );
 
     _MoveObjToLayer( false, _pDrawObj );
 
@@ -260,7 +260,7 @@ void SwContact::_MoveObjToLayer( const bool _bToVisible,
         return;
     }
 
-    const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrmFmt*>(GetRegisteredInNonConst())->getIDocumentDrawModelAccess();
+    const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrameFormat*>(GetRegisteredInNonConst())->getIDocumentDrawModelAccess();
     if ( !pIDDMA )
     {
         OSL_FAIL( "SwDrawContact::_MoveObjToLayer(..) - no writer document!" );
@@ -337,9 +337,9 @@ void SwContact::_MoveObjToLayer( const bool _bToVisible,
 // some virtual helper methods for information
 // about the object (Writer fly frame resp. drawing object)
 
-const SwIndex& SwContact::GetCntntAnchorIndex() const
+const SwIndex& SwContact::GetContentAnchorIndex() const
 {
-    return GetCntntAnchor().nContent;
+    return GetContentAnchor().nContent;
 }
 
 /// get minimum order number of anchored objects handled by with contact
@@ -390,7 +390,7 @@ sal_uInt32 SwContact::GetMaxOrdNum() const
     return nMaxOrdNum;
 }
 
-SwFlyDrawContact::SwFlyDrawContact( SwFlyFrmFmt *pToRegisterIn, SdrModel * ) :
+SwFlyDrawContact::SwFlyDrawContact( SwFlyFrameFormat *pToRegisterIn, SdrModel * ) :
     SwContact( pToRegisterIn )
 {
     // #i26791# - class <SwFlyDrawContact> contains the 'master'
@@ -481,7 +481,7 @@ void SwFlyDrawContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
     OSL_ENSURE( _pDrawObj->ISA(SwVirtFlyDrawObj),
             "<SwFlyDrawContact::MoveObjToVisibleLayer(..)> - wrong SdrObject type -> crash" );
 
-    if ( GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) )
+    if ( GetFormat()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) )
     {
         // nothing to do
         return;
@@ -522,7 +522,7 @@ void SwFlyDrawContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
     OSL_ENSURE( _pDrawObj->ISA(SwVirtFlyDrawObj),
             "<SwFlyDrawContact::MoveObjToInvisibleLayer(..)> - wrong SdrObject type -> crash" );
 
-    if ( !GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) )
+    if ( !GetFormat()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) )
     {
         // nothing to do
         return;
@@ -550,8 +550,8 @@ void SwFlyDrawContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
 /// get data collection of anchored objects, handled by with contact
 void SwFlyDrawContact::GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const
 {
-    const SwFrmFmt* pFmt = GetFmt();
-    SwFlyFrm::GetAnchoredObjects( _roAnchoredObjs, *pFmt );
+    const SwFrameFormat* pFormat = GetFormat();
+    SwFlyFrm::GetAnchoredObjects( _roAnchoredObjs, *pFormat );
 }
 
 // SwDrawContact
@@ -575,7 +575,7 @@ bool CheckControlLayer( const SdrObject *pObj )
     return false;
 }
 
-SwDrawContact::SwDrawContact( SwFrmFmt* pToRegisterIn, SdrObject* pObj ) :
+SwDrawContact::SwDrawContact( SwFrameFormat* pToRegisterIn, SdrObject* pObj ) :
     SwContact( pToRegisterIn ),
     maAnchoredDrawObj(),
     mbMasterObjCleared( false ),
@@ -610,7 +610,7 @@ SwDrawContact::SwDrawContact( SwFrmFmt* pToRegisterIn, SdrObject* pObj ) :
 
     // if there already exists an SwXShape for the object, ensure it knows about us, and the SdrObject
     // #i99056#
-    SwXShape::AddExistingShapeToFmt( *pObj );
+    SwXShape::AddExistingShapeToFormat( *pObj );
 }
 
 SwDrawContact::~SwDrawContact()
@@ -632,14 +632,14 @@ SwDrawContact::~SwDrawContact()
     }
 }
 
-void SwDrawContact::GetTextObjectsFromFmt( std::list<SdrTextObj*>& rTextObjects, SwDoc* pDoc )
+void SwDrawContact::GetTextObjectsFromFormat( std::list<SdrTextObj*>& rTextObjects, SwDoc* pDoc )
 {
-    for( sal_Int32 n=0; n<(sal_Int32)pDoc->GetSpzFrmFmts()->size(); n++ )
+    for( sal_Int32 n=0; n<(sal_Int32)pDoc->GetSpzFrameFormats()->size(); n++ )
     {
-        const SwFrmFmt* pFly = (*pDoc->GetSpzFrmFmts())[n];
-        if( pFly->IsA( TYPE(SwDrawFrmFmt) ) )
+        const SwFrameFormat* pFly = (*pDoc->GetSpzFrameFormats())[n];
+        if( pFly->IsA( TYPE(SwDrawFrameFormat) ) )
         {
-            SwDrawContact* pContact = SwIterator<SwDrawContact,SwFrmFmt>(*pFly).First();
+            SwDrawContact* pContact = SwIterator<SwDrawContact,SwFrameFormat>(*pFly).First();
             if( pContact )
             {
                 SdrObject* pSdrO = pContact->GetMaster();
@@ -889,10 +889,10 @@ SwDrawContact::VirtObjAnchoredAtFrmPred::VirtObjAnchoredAtFrmPred(
                                                 const SwFrm& _rAnchorFrm )
     : mpAnchorFrm( &_rAnchorFrm )
 {
-    if ( mpAnchorFrm->IsCntntFrm() )
+    if ( mpAnchorFrm->IsContentFrm() )
     {
-        const SwCntntFrm* pTmpFrm =
-                            static_cast<const SwCntntFrm*>( mpAnchorFrm );
+        const SwContentFrm* pTmpFrm =
+                            static_cast<const SwContentFrm*>( mpAnchorFrm );
         while ( pTmpFrm->IsFollow() )
         {
             pTmpFrm = pTmpFrm->FindMaster();
@@ -905,10 +905,10 @@ SwDrawContact::VirtObjAnchoredAtFrmPred::VirtObjAnchoredAtFrmPred(
 bool SwDrawContact::VirtObjAnchoredAtFrmPred::operator() ( const SwDrawVirtObj* _pDrawVirtObj )
 {
     const SwFrm* pObjAnchorFrm = _pDrawVirtObj->GetAnchorFrm();
-    if ( pObjAnchorFrm && pObjAnchorFrm->IsCntntFrm() )
+    if ( pObjAnchorFrm && pObjAnchorFrm->IsContentFrm() )
     {
-        const SwCntntFrm* pTmpFrm =
-                            static_cast<const SwCntntFrm*>( pObjAnchorFrm );
+        const SwContentFrm* pTmpFrm =
+                            static_cast<const SwContentFrm*>( pObjAnchorFrm );
         while ( pTmpFrm->IsFollow() )
         {
             pTmpFrm = pTmpFrm->FindMaster();
@@ -926,10 +926,10 @@ SdrObject* SwDrawContact::GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm )
 
     // #i26791# - compare master frames instead of direct frames
     const SwFrm* pProposedAnchorFrm = &_rAnchorFrm;
-    if ( pProposedAnchorFrm->IsCntntFrm() )
+    if ( pProposedAnchorFrm->IsContentFrm() )
     {
-        const SwCntntFrm* pTmpFrm =
-                            static_cast<const SwCntntFrm*>( pProposedAnchorFrm );
+        const SwContentFrm* pTmpFrm =
+                            static_cast<const SwContentFrm*>( pProposedAnchorFrm );
         while ( pTmpFrm->IsFollow() )
         {
             pTmpFrm = pTmpFrm->FindMaster();
@@ -938,10 +938,10 @@ SdrObject* SwDrawContact::GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm )
     }
 
     const SwFrm* pMasterObjAnchorFrm = GetAnchorFrm();
-    if ( pMasterObjAnchorFrm && pMasterObjAnchorFrm->IsCntntFrm() )
+    if ( pMasterObjAnchorFrm && pMasterObjAnchorFrm->IsContentFrm() )
     {
-        const SwCntntFrm* pTmpFrm =
-                            static_cast<const SwCntntFrm*>( pMasterObjAnchorFrm );
+        const SwContentFrm* pTmpFrm =
+                            static_cast<const SwContentFrm*>( pMasterObjAnchorFrm );
         while ( pTmpFrm->IsFollow() )
         {
             pTmpFrm = pTmpFrm->FindMaster();
@@ -1042,7 +1042,7 @@ void SwDrawContact::Changed( const SdrObject& rObj,
 {
     // #i26791# - no event handling, if existing <SwViewShell>
     // is in construction
-    SwDoc* pDoc = GetFmt()->GetDoc();
+    SwDoc* pDoc = GetFormat()->GetDoc();
     if ( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() &&
          pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->IsInConstructor() )
     {
@@ -1157,15 +1157,15 @@ class NestedUserCallHdl
 };
 
 /// Notify the format's textbox that it should reconsider its position / size.
-void lcl_textBoxSizeNotify(SwFrmFmt* pFmt)
+void lcl_textBoxSizeNotify(SwFrameFormat* pFormat)
 {
-    if (SwTextBoxHelper::findTextBox(pFmt))
+    if (SwTextBoxHelper::findTextBox(pFormat))
     {
         // Just notify the textbox that the size has changed, the actual object size is not interesting.
-        SfxItemSet aResizeSet(pFmt->GetDoc()->GetAttrPool(), RES_FRM_SIZE, RES_FRM_SIZE, 0);
-        SwFmtFrmSize aSize;
+        SfxItemSet aResizeSet(pFormat->GetDoc()->GetAttrPool(), RES_FRM_SIZE, RES_FRM_SIZE, 0);
+        SwFormatFrmSize aSize;
         aResizeSet.Put(aSize);
-        SwTextBoxHelper::syncFlyFrmAttr(*pFmt, aResizeSet);
+        SwTextBoxHelper::syncFlyFrmAttr(*pFormat, aResizeSet);
     }
 }
 
@@ -1188,8 +1188,8 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
     // #i35007#
     // improvement: determine as-character anchored object flag only once.
     const bool bAnchoredAsChar = ObjAnchoredAsChar();
-    const bool bNotify = !(GetFmt()->GetDoc()->IsInDtor()) &&
-                         ( SURROUND_THROUGHT != GetFmt()->GetSurround().GetSurround() ) &&
+    const bool bNotify = !(GetFormat()->GetDoc()->IsInDtor()) &&
+                         ( SURROUND_THROUGHT != GetFormat()->GetSurround().GetSurround() ) &&
                          !bAnchoredAsChar;
     switch( eType )
     {
@@ -1243,7 +1243,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
             {
                 if(::CheckControlLayer(maAnchoredDrawObj.DrawObj()))
                 {
-                    const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrmFmt*>(GetRegisteredInNonConst())->getIDocumentDrawModelAccess();
+                    const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrameFormat*>(GetRegisteredInNonConst())->getIDocumentDrawModelAccess();
                     const SdrLayerID aCurrentLayer(maAnchoredDrawObj.DrawObj()->GetLayer());
                     const SdrLayerID aControlLayerID(pIDDMA->GetControlsId());
                     const SdrLayerID aInvisibleControlLayerID(pIDDMA->GetInvisibleControlsId());
@@ -1308,8 +1308,8 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                 }
                 // #i31698# - determine layout direction
                 // via draw frame format.
-                SwFrmFmt::tLayoutDir eLayoutDir =
-                                pAnchoredDrawObj->GetFrmFmt().GetLayoutDir();
+                SwFrameFormat::tLayoutDir eLayoutDir =
+                                pAnchoredDrawObj->GetFrameFormat().GetLayoutDir();
                 // use geometry of drawing object
                 SwRect aObjRect( rObj.GetSnapRect() );
                 // If drawing object is a member of a group, the adjustment
@@ -1329,19 +1329,19 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                 SwTwips nYPosDiff(0L);
                 switch ( eLayoutDir )
                 {
-                    case SwFrmFmt::HORI_L2R:
+                    case SwFrameFormat::HORI_L2R:
                     {
                         nXPosDiff = aObjRect.Left() - aOldObjRect.Left();
                         nYPosDiff = aObjRect.Top() - aOldObjRect.Top();
                     }
                     break;
-                    case SwFrmFmt::HORI_R2L:
+                    case SwFrameFormat::HORI_R2L:
                     {
                         nXPosDiff = aOldObjRect.Right() - aObjRect.Right();
                         nYPosDiff = aObjRect.Top() - aOldObjRect.Top();
                     }
                     break;
-                    case SwFrmFmt::VERT_R2L:
+                    case SwFrameFormat::VERT_R2L:
                     {
                         nXPosDiff = aObjRect.Top() - aOldObjRect.Top();
                         nYPosDiff = aOldObjRect.Right() - aObjRect.Right();
@@ -1352,9 +1352,9 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                         OSL_FAIL( "<SwDrawContact::_Changed(..)> - unsupported layout direction" );
                     }
                 }
-                SfxItemSet aSet( GetFmt()->GetDoc()->GetAttrPool(),
+                SfxItemSet aSet( GetFormat()->GetDoc()->GetAttrPool(),
                                  RES_VERT_ORIENT, RES_HORI_ORIENT, 0 );
-                const SwFmtVertOrient& rVert = GetFmt()->GetVertOrient();
+                const SwFormatVertOrient& rVert = GetFormat()->GetVertOrient();
                 if ( nYPosDiff != 0 )
                 {
 
@@ -1363,15 +1363,15 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                     {
                         nYPosDiff = -nYPosDiff;
                     }
-                    aSet.Put( SwFmtVertOrient( rVert.GetPos()+nYPosDiff,
+                    aSet.Put( SwFormatVertOrient( rVert.GetPos()+nYPosDiff,
                                                text::VertOrientation::NONE,
                                                rVert.GetRelationOrient() ) );
                 }
 
-                const SwFmtHoriOrient& rHori = GetFmt()->GetHoriOrient();
+                const SwFormatHoriOrient& rHori = GetFormat()->GetHoriOrient();
                 if ( !bAnchoredAsChar && nXPosDiff != 0 )
                 {
-                    aSet.Put( SwFmtHoriOrient( rHori.GetPos()+nXPosDiff,
+                    aSet.Put( SwFormatHoriOrient( rHori.GetPos()+nXPosDiff,
                                                text::HoriOrientation::NONE,
                                                rHori.GetRelationOrient() ) );
                 }
@@ -1379,7 +1379,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                 if ( nYPosDiff ||
                      ( !bAnchoredAsChar && nXPosDiff != 0 ) )
                 {
-                    GetFmt()->GetDoc()->SetFlyFrmAttr( *(GetFmt()), aSet );
+                    GetFormat()->GetDoc()->SetFlyFrmAttr( *(GetFormat()), aSet );
                     // keep new object rectangle, to avoid multiple
                     // changes of the attributes by multiple event from
                     // the drawing layer - e.g. group objects and its members
@@ -1398,17 +1398,17 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                         SwFrm* pAnchorFrm = const_cast<SwAnchoredDrawObject*>(pAnchoredDrawObj)->AnchorFrm();
                         if(pAnchorFrm)
                         {
-                            pAnchorFrm->Prepare( PREP_FLY_ATTR_CHG, GetFmt() );
+                            pAnchorFrm->Prepare( PREP_FLY_ATTR_CHG, GetFormat() );
                         }
                     }
 
-                    lcl_textBoxSizeNotify(GetFmt());
+                    lcl_textBoxSizeNotify(GetFormat());
                 }
                 else if (eType == SDRUSERCALL_RESIZE)
                     // Even if the bounding box of the shape didn't change,
                     // notify about the size change, as an adjustment change
                     // may affect the size of the underlying textbox.
-                    lcl_textBoxSizeNotify(GetFmt());
+                    lcl_textBoxSizeNotify(GetFormat());
             }
         }
         break;
@@ -1425,20 +1425,20 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
 
 namespace
 {
-    static const SwFmtAnchor* lcl_getAnchorFmt( const SfxPoolItem& _rItem )
+    static const SwFormatAnchor* lcl_getAnchorFormat( const SfxPoolItem& _rItem )
     {
         sal_uInt16 nWhich = _rItem.Which();
-        const SwFmtAnchor* pAnchorFmt = NULL;
+        const SwFormatAnchor* pAnchorFormat = NULL;
         if ( RES_ATTRSET_CHG == nWhich )
         {
             static_cast<const SwAttrSetChg&>(_rItem).GetChgSet()->
-                GetItemState( RES_ANCHOR, false, reinterpret_cast<const SfxPoolItem**>(&pAnchorFmt) );
+                GetItemState( RES_ANCHOR, false, reinterpret_cast<const SfxPoolItem**>(&pAnchorFormat) );
         }
         else if ( RES_ANCHOR == nWhich )
         {
-            pAnchorFmt = &static_cast<const SwFmtAnchor&>(_rItem);
+            pAnchorFormat = &static_cast<const SwFormatAnchor&>(_rItem);
         }
-        return pAnchorFmt;
+        return pAnchorFormat;
     }
 }
 
@@ -1448,13 +1448,13 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
             "<SwDrawContact::Modify(..)> called during disconnection.");
 
     sal_uInt16 nWhich = pNew ? pNew->Which() : 0;
-    const SwFmtAnchor* pNewAnchorFmt = pNew ? lcl_getAnchorFmt( *pNew ) : NULL;
+    const SwFormatAnchor* pNewAnchorFormat = pNew ? lcl_getAnchorFormat( *pNew ) : NULL;
 
-    if ( pNewAnchorFmt )
+    if ( pNewAnchorFormat )
     {
         // Do not respond to a Reset Anchor !!!!!
         if ( SfxItemState::SET ==
-                GetFmt()->GetAttrSet().GetItemState( RES_ANCHOR, false ) )
+                GetFormat()->GetAttrSet().GetItemState( RES_ANCHOR, false ) )
         {
             // no connect to layout during disconnection
             if ( !mbDisconnectInProgress )
@@ -1471,13 +1471,13 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
                     pOldRect = &aOldRect;
                 }
                 // re-connect to layout due to anchor format change
-                ConnectToLayout( pNewAnchorFmt );
+                ConnectToLayout( pNewAnchorFormat );
                 // notify background of drawing objects
                 lcl_NotifyBackgroundOfObj( *this, *GetMaster(), pOldRect );
                 NotifyBackgrdOfAllVirtObjs( pOldRect );
 
-                const SwFmtAnchor* pOldAnchorFmt = pOld ? lcl_getAnchorFmt( *pOld ) : NULL;
-                if ( !pOldAnchorFmt || ( pOldAnchorFmt->GetAnchorId() != pNewAnchorFmt->GetAnchorId() ) )
+                const SwFormatAnchor* pOldAnchorFormat = pOld ? lcl_getAnchorFormat( *pOld ) : NULL;
+                if ( !pOldAnchorFormat || ( pOldAnchorFormat->GetAnchorId() != pNewAnchorFormat->GetAnchorId() ) )
                 {
                     OSL_ENSURE( maAnchoredDrawObj.DrawObj(), "SwDrawContact::Modify: no draw object here?" );
                     if ( maAnchoredDrawObj.DrawObj() )
@@ -1597,7 +1597,7 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
 
     // --> #i36181# - notify background of drawing object
     if ( _bMoveMasterToInvisibleLayer &&
-         !(GetFmt()->GetDoc()->IsInDtor()) &&
+         !(GetFormat()->GetDoc()->IsInDtor()) &&
          GetAnchorFrm() && !GetAnchorFrm()->IsInDtor() )
     {
         const Rectangle aOldRect( maAnchoredDrawObj.GetObjRectWithSpaces().SVRect() );
@@ -1633,7 +1633,7 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
         // Instead of removing 'master' object from drawing page, move the
         // 'master' drawing object into the corresponding invisible layer.
         {
-            //static_cast<SwFrmFmt*>(GetRegisteredIn())->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
+            //static_cast<SwFrameFormat*>(GetRegisteredIn())->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
             //                            RemoveObject( GetMaster()->GetOrdNum() );
             // #i18447# - in order to consider group object correct
             // use new method <SwDrawContact::MoveObjToInvisibleLayer(..)>
@@ -1652,7 +1652,7 @@ void SwDrawContact::RemoveMasterFromDrawPage()
         GetMaster()->SetUserCall( 0 );
         if ( GetMaster()->IsInserted() )
         {
-            static_cast<SwFrmFmt*>(GetRegisteredIn())->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
+            static_cast<SwFrameFormat*>(GetRegisteredIn())->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
                                         RemoveObject( GetMaster()->GetOrdNum() );
         }
     }
@@ -1701,21 +1701,21 @@ void SwDrawContact::DisconnectObjFromLayout( SdrObject* _pDrawObj )
     }
 }
 
-static SwTxtFrm* lcl_GetFlyInCntntAnchor( SwTxtFrm* _pProposedAnchorFrm,
-                                   const sal_Int32 _nTxtOfs )
+static SwTextFrm* lcl_GetFlyInContentAnchor( SwTextFrm* _pProposedAnchorFrm,
+                                   const sal_Int32 _nTextOfs )
 {
-    SwTxtFrm* pAct = _pProposedAnchorFrm;
-    SwTxtFrm* pTmp;
+    SwTextFrm* pAct = _pProposedAnchorFrm;
+    SwTextFrm* pTmp;
     do
     {
         pTmp = pAct;
         pAct = pTmp->GetFollow();
     }
-    while( pAct && _nTxtOfs >= pAct->GetOfst() );
+    while( pAct && _nTextOfs >= pAct->GetOfst() );
     return pTmp;
 }
 
-void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
+void SwDrawContact::ConnectToLayout( const SwFormatAnchor* pAnch )
 {
     // *no* connect to layout during disconnection from layout.
     if ( mbDisconnectInProgress )
@@ -1732,9 +1732,9 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
         return;
     }
 
-    SwFrmFmt* pDrawFrmFmt = static_cast<SwFrmFmt*>(GetRegisteredIn());
+    SwFrameFormat* pDrawFrameFormat = static_cast<SwFrameFormat*>(GetRegisteredIn());
 
-    if( !pDrawFrmFmt->getIDocumentLayoutAccess()->GetCurrentViewShell() )
+    if( !pDrawFrameFormat->getIDocumentLayoutAccess()->GetCurrentViewShell() )
         return;
 
     // remove 'virtual' drawing objects from writer
@@ -1744,7 +1744,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
 
     if ( !pAnch )
     {
-        pAnch = &(pDrawFrmFmt->GetAnchor());
+        pAnch = &(pDrawFrameFormat->GetAnchor());
     }
 
     switch ( pAnch->GetAnchorId() )
@@ -1752,7 +1752,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
         case FLY_AT_PAGE:
                 {
                 sal_uInt16 nPgNum = pAnch->GetPageNum();
-                SwViewShell *pShell = pDrawFrmFmt->getIDocumentLayoutAccess()->GetCurrentViewShell();
+                SwViewShell *pShell = pDrawFrameFormat->getIDocumentLayoutAccess()->GetCurrentViewShell();
                 if( !pShell )
                     break;
                 SwRootFrm* pRoot = pShell->GetLayout();
@@ -1786,26 +1786,26 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                 // but not control objects:
                 // anchor at first found frame the 'master' object and
                 // at the following frames 'virtual' drawing objects.
-                // Note: method is similar to <SwFlyFrmFmt::MakeFrms(..)>
+                // Note: method is similar to <SwFlyFrameFormat::MakeFrms(..)>
                 SwModify *pModify = 0;
-                if( pAnch->GetCntntAnchor() )
+                if( pAnch->GetContentAnchor() )
                 {
                     if ( pAnch->GetAnchorId() == FLY_AT_FLY )
                     {
-                        SwNodeIndex aIdx( pAnch->GetCntntAnchor()->nNode );
-                        SwCntntNode* pCNd = pDrawFrmFmt->GetDoc()->GetNodes().GoNext( &aIdx );
-                        if ( SwIterator<SwFrm,SwCntntNode>( *pCNd ).First() )
+                        SwNodeIndex aIdx( pAnch->GetContentAnchor()->nNode );
+                        SwContentNode* pCNd = pDrawFrameFormat->GetDoc()->GetNodes().GoNext( &aIdx );
+                        if ( SwIterator<SwFrm,SwContentNode>( *pCNd ).First() )
                             pModify = pCNd;
                         else
                         {
-                            const SwNodeIndex& rIdx = pAnch->GetCntntAnchor()->nNode;
-                            SwFrmFmts& rFmts = *(pDrawFrmFmt->GetDoc()->GetSpzFrmFmts());
-                            for( auto pFlyFmt : rFmts )
+                            const SwNodeIndex& rIdx = pAnch->GetContentAnchor()->nNode;
+                            SwFrameFormats& rFormats = *(pDrawFrameFormat->GetDoc()->GetSpzFrameFormats());
+                            for( auto pFlyFormat : rFormats )
                             {
-                                if( pFlyFmt->GetCntnt().GetCntntIdx() &&
-                                    rIdx == *(pFlyFmt->GetCntnt().GetCntntIdx()) )
+                                if( pFlyFormat->GetContent().GetContentIdx() &&
+                                    rIdx == *(pFlyFormat->GetContent().GetContentIdx()) )
                                 {
-                                    pModify = pFlyFmt;
+                                    pModify = pFlyFormat;
                                     break;
                                 }
                             }
@@ -1813,7 +1813,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                     }
                     else
                     {
-                        pModify = pAnch->GetCntntAnchor()->nNode.GetNode().GetCntntNode();
+                        pModify = pAnch->GetContentAnchor()->nNode.GetNode().GetContentNode();
                     }
                 }
 
@@ -1835,8 +1835,8 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                     // (1) proposed anchor frame isn't a follow and
                     // (2) drawing object isn't a control object to be anchored
                     //     in header/footer.
-                    const bool bAdd = ( !pFrm->IsCntntFrm() ||
-                                        !static_cast<SwCntntFrm*>(pFrm)->IsFollow() ) &&
+                    const bool bAdd = ( !pFrm->IsContentFrm() ||
+                                        !static_cast<SwContentFrm*>(pFrm)->IsFollow() ) &&
                                       ( !::CheckControlLayer( GetMaster() ) ||
                                         !pFrm->FindFooterOrHeader() );
 
@@ -1851,11 +1851,11 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
 
                         // find correct follow for as character anchored objects
                         if ((pAnch->GetAnchorId() == FLY_AS_CHAR) &&
-                             pFrm->IsTxtFrm() )
+                             pFrm->IsTextFrm() )
                         {
-                            pFrm = lcl_GetFlyInCntntAnchor(
-                                        static_cast<SwTxtFrm*>(pFrm),
-                                        pAnch->GetCntntAnchor()->nContent.GetIndex() );
+                            pFrm = lcl_GetFlyInContentAnchor(
+                                        static_cast<SwTextFrm*>(pFrm),
+                                        pAnch->GetContentAnchor()->nContent.GetIndex() );
                         }
 
                         if ( !pAnchorFrmOfMaster )
@@ -1902,7 +1902,7 @@ void SwDrawContact::InsertMasterIntoDrawPage()
 {
     if ( !GetMaster()->IsInserted() )
     {
-        GetFmt()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)
+        GetFormat()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)
                 ->InsertObject( GetMaster(), GetMaster()->GetOrdNumDirect() );
     }
     GetMaster()->SetUserCall( this );
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 56f39c5dac1c..ad6062f25ada 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -382,7 +382,7 @@ SwVirtFlyDrawObj::SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly) :
     SdrVirtObj( rNew ),
     pFlyFrm( pFly )
 {
-    const SvxProtectItem &rP = pFlyFrm->GetFmt()->GetProtect();
+    const SvxProtectItem &rP = pFlyFrm->GetFormat()->GetProtect();
     bMovProt = rP.IsPosProtected();
     bSizProt = rP.IsSizeProtected();
 }
@@ -393,13 +393,13 @@ SwVirtFlyDrawObj::~SwVirtFlyDrawObj()
         GetPage()->RemoveObject( GetOrdNum() );
 }
 
-const SwFrmFmt *SwVirtFlyDrawObj::GetFmt() const
+const SwFrameFormat *SwVirtFlyDrawObj::GetFormat() const
 {
-    return GetFlyFrm()->GetFmt();
+    return GetFlyFrm()->GetFormat();
 }
-SwFrmFmt *SwVirtFlyDrawObj::GetFmt()
+SwFrameFormat *SwVirtFlyDrawObj::GetFormat()
 {
-    return GetFlyFrm()->GetFmt();
+    return GetFlyFrm()->GetFormat();
 }
 
 // --> OD #i102707#
@@ -596,11 +596,11 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
 
     //If the Fly has a automatic align (right or top),
     //so preserve the automatic.
-    SwFrmFmt *pFmt = GetFlyFrm()->GetFmt();
-    const sal_Int16 eHori = pFmt->GetHoriOrient().GetHoriOrient();
-    const sal_Int16 eVert = pFmt->GetVertOrient().GetVertOrient();
-    const sal_Int16 eRelHori = pFmt->GetHoriOrient().GetRelationOrient();
-    const sal_Int16 eRelVert = pFmt->GetVertOrient().GetRelationOrient();
+    SwFrameFormat *pFormat = GetFlyFrm()->GetFormat();
+    const sal_Int16 eHori = pFormat->GetHoriOrient().GetHoriOrient();
+    const sal_Int16 eVert = pFormat->GetVertOrient().GetVertOrient();
+    const sal_Int16 eRelHori = pFormat->GetHoriOrient().GetRelationOrient();
+    const sal_Int16 eRelVert = pFormat->GetVertOrient().GetRelationOrient();
     //On paragraph bound Flys starting from the new position a new
     //anchor must be set. Anchor and the new RelPos is calculated and
     //placed by the Fly itself.
@@ -608,9 +608,9 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         static_cast<SwFlyAtCntFrm*>(GetFlyFrm())->SetAbsPos( aNewPos );
     else
     {
-        const SwFrmFmt *pTmpFmt = GetFmt();
-        const SwFmtVertOrient &rVert = pTmpFmt->GetVertOrient();
-        const SwFmtHoriOrient &rHori = pTmpFmt->GetHoriOrient();
+        const SwFrameFormat *pTmpFormat = GetFormat();
+        const SwFormatVertOrient &rVert = pTmpFormat->GetVertOrient();
+        const SwFormatHoriOrient &rHori = pTmpFormat->GetHoriOrient();
         long lXDiff = aNewPos.X() - aOldPos.X();
         if( rHori.IsPosToggle() && text::HoriOrientation::NONE == eHori &&
             !GetFlyFrm()->FindPageFrm()->OnRightPage() )
@@ -652,14 +652,14 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         GetFlyFrm()->ChgRelPos( aTmp );
     }
 
-    SwAttrSet aSet( pFmt->GetDoc()->GetAttrPool(),
+    SwAttrSet aSet( pFormat->GetDoc()->GetAttrPool(),
                                             RES_VERT_ORIENT, RES_HORI_ORIENT );
-    SwFmtHoriOrient aHori( pFmt->GetHoriOrient() );
-    SwFmtVertOrient aVert( pFmt->GetVertOrient() );
+    SwFormatHoriOrient aHori( pFormat->GetHoriOrient() );
+    SwFormatVertOrient aVert( pFormat->GetVertOrient() );
     bool bPut = false;
 
     if( !GetFlyFrm()->IsFlyLayFrm() &&
-        ::GetHtmlMode(pFmt->GetDoc()->GetDocShell()) )
+        ::GetHtmlMode(pFormat->GetDoc()->GetDocShell()) )
     {
         //In HTML-Mode only automatic aligns are allowed.
         //Only we can try a snap to left/right respectively left-/right border
@@ -729,7 +729,7 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         }
     }
     if ( bPut )
-        pFmt->SetFmtAttr( aSet );
+        pFormat->SetFormatAttr( aSet );
 }
 
 
@@ -804,11 +804,11 @@ void SwVirtFlyDrawObj::NbcCrop(const Point& rRef, const Fraction& xFact, const F
     pSh->SetAttrItem(aCrop);
 
     // Set new frame size
-    SwFrmFmt *pFmt = GetFmt();
-    SwFmtFrmSize aSz( pFmt->GetFrmSize() );
+    SwFrameFormat *pFormat = GetFormat();
+    SwFormatFrmSize aSz( pFormat->GetFrmSize() );
     aSz.SetWidth(aNewRect.GetWidth());
     aSz.SetHeight(aNewRect.GetHeight());
-    pFmt->GetDoc()->SetAttr( aSz, *pFmt );
+    pFormat->GetDoc()->SetAttr( aSz, *pFormat );
 
 //    pSh->EndUndo(UNDO_END);
     pSh->EndAllAction();
@@ -843,7 +843,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
             SwBorderAttrAccess aAccess( SwFrm::GetCache(), GetFlyFrm() );
             const SwBorderAttrs &rAttrs = *aAccess.Get();
             long nMin = rAttrs.CalcLeftLine()+rAttrs.CalcRightLine();
-            const SwFmtCol& rCol = rAttrs.GetAttrSet().GetCol();
+            const SwFormatCol& rCol = rAttrs.GetAttrSet().GetCol();
             if ( rCol.GetColumns().size() > 1 )
             {
                 for ( const auto &rC : rCol.GetColumns() )
@@ -855,10 +855,10 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
             aSz.Width() = std::max( aSz.Width(), nMin );
         }
 
-        SwFrmFmt *pFmt = GetFmt();
-        const SwFmtFrmSize aOldFrmSz( pFmt->GetFrmSize() );
+        SwFrameFormat *pFormat = GetFormat();
+        const SwFormatFrmSize aOldFrmSz( pFormat->GetFrmSize() );
         GetFlyFrm()->ChgSize( aSz );
-        SwFmtFrmSize aFrmSz( pFmt->GetFrmSize() );
+        SwFormatFrmSize aFrmSz( pFormat->GetFrmSize() );
         if ( aFrmSz.GetWidthPercent() || aFrmSz.GetHeightPercent() )
         {
             long nRelWidth, nRelHeight;
@@ -886,7 +886,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
             if ( aFrmSz.GetHeightPercent() && aFrmSz.GetHeightPercent() != 0xFF &&
                  aOldFrmSz.GetHeight() != aFrmSz.GetHeight() )
                 aFrmSz.SetHeightPercent( sal_uInt8(aSz.Height() * 100.0 / nRelHeight + 0.5) );
-            pFmt->GetDoc()->SetAttr( aFrmSz, *pFmt );
+            pFormat->GetDoc()->SetAttr( aFrmSz, *pFormat );
         }
     }
 
@@ -922,7 +922,7 @@ void SwVirtFlyDrawObj::Move(const Size& rSiz)
 {
     NbcMove( rSiz );
     SetChanged();
-    GetFmt()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
+    GetFormat()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
 }
 
 void SwVirtFlyDrawObj::Resize(const Point& rRef,
@@ -930,14 +930,14 @@ void SwVirtFlyDrawObj::Resize(const Point& rRef,
 {
     NbcResize( rRef, xFact, yFact );
     SetChanged();
-    GetFmt()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
+    GetFormat()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
 }
 
 void SwVirtFlyDrawObj::Crop(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
     NbcCrop( rRef, xFact, yFact );
     SetChanged();
-    GetFmt()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
+    GetFormat()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
 }
 
 void SwVirtFlyDrawObj::addCropHandles(SdrHdlList& rTarget) const
@@ -967,17 +967,17 @@ Pointer  SwVirtFlyDrawObj::GetMacroPointer(
 
 bool SwVirtFlyDrawObj::HasMacro() const
 {
-    const SwFmtURL &rURL = pFlyFrm->GetFmt()->GetURL();
+    const SwFormatURL &rURL = pFlyFrm->GetFormat()->GetURL();
     return rURL.GetMap() || !rURL.GetURL().isEmpty();
 }
 
 SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) const
 {
-    const SwFmtURL &rURL = pFlyFrm->GetFmt()->GetURL();
+    const SwFormatURL &rURL = pFlyFrm->GetFormat()->GetURL();
     if( rURL.GetMap() || !rURL.GetURL().isEmpty() )
     {
         SwRect aRect;
-        if ( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTxtFrm() )
+        if ( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTextFrm() )
         {
             aRect = pFlyFrm->Prt();
             aRect += pFlyFrm->Frm().Pos();
@@ -995,7 +995,7 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) cons
             if( aRect.IsInside( rRec.aPos ) )
             {
                 if( !rURL.GetMap() ||
-                    pFlyFrm->GetFmt()->GetIMapObject( rRec.aPos, pFlyFrm ))
+                    pFlyFrm->GetFormat()->GetIMapObject( rRec.aPos, pFlyFrm ))
                     return (SdrObject*)this;
 
                 return 0;
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 091ff77c3813..fe774a1ce1ca 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -111,7 +111,7 @@ SdrObject*  SwDPage::ReplaceObject( SdrObject* pNewObj, size_t nObjNum )
     OSL_ENSURE( pOld, "Oups, Object not replaced" );
     SdrObjUserCall* pContact;
     if ( 0 != ( pContact = GetUserCall(pOld) ) &&
-         RES_DRAWFRMFMT == static_cast<SwContact*>(pContact)->GetFmt()->Which())
+         RES_DRAWFRMFMT == static_cast<SwContact*>(pContact)->GetFormat()->Which())
         static_cast<SwDrawContact*>(pContact)->ChangeMasterObject( pNewObj );
     return FmFormPage::ReplaceObject( pNewObj, nObjNum );
 }
@@ -188,23 +188,23 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView,
              pObj->ISA(SwVirtFlyDrawObj) )
         {
             SwFlyFrm *pFly = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm();
-            const SwFmtURL &rURL = pFly->GetFmt()->GetURL();
-            OUString sTxt;
+            const SwFormatURL &rURL = pFly->GetFormat()->GetURL();
+            OUString sText;
             if( rURL.GetMap() )
             {
-                IMapObject *pTmpObj = pFly->GetFmt()->GetIMapObject( aPos, pFly );
+                IMapObject *pTmpObj = pFly->GetFormat()->GetIMapObject( aPos, pFly );
                 if( pTmpObj )
                 {
-                    sTxt = pTmpObj->GetAltText();
-                    if ( sTxt.isEmpty() )
-                        sTxt = URIHelper::removePassword( pTmpObj->GetURL(),
+                    sText = pTmpObj->GetAltText();
+                    if ( sText.isEmpty() )
+                        sText = URIHelper::removePassword( pTmpObj->GetURL(),
                                         INetURLObject::WAS_ENCODED,
                                            INetURLObject::DECODE_UNAMBIGUOUS);
                 }
             }
             else if ( !rURL.GetURL().isEmpty() )
             {
-                sTxt = URIHelper::removePassword( rURL.GetURL(),
+                sText = URIHelper::removePassword( rURL.GetURL(),
                                         INetURLObject::WAS_ENCODED,
                                            INetURLObject::DECODE_UNAMBIGUOUS);
 
@@ -217,12 +217,12 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView,
                     // without MapMode-Offset, without Offset, w ... !!!!!
                     aPt = pWindow->LogicToPixel(
                             aPt, MapMode( MAP_TWIP ) );
-                    sTxt += "?" + OUString::number( aPt.getX() )
+                    sText += "?" + OUString::number( aPt.getX() )
                           + "," + OUString::number( aPt.getY() );
                 }
             }
 
-            if ( !sTxt.isEmpty() )
+            if ( !sText.isEmpty() )
             {
                 // #i80029#
                 bool bExecHyperlinks = pDoc->GetDocShell()->IsReadOnly();
@@ -232,20 +232,20 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView,
                     bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
 
                     if ( !bExecHyperlinks )
-                        sTxt = SwViewShell::GetShellRes()->aLinkCtrlClick + ": " + sTxt;
+                        sText = SwViewShell::GetShellRes()->aLinkCtrlClick + ": " + sText;
                     else
-                        sTxt = SwViewShell::GetShellRes()->aLinkClick + ": " + sTxt;
+                        sText = SwViewShell::GetShellRes()->aLinkClick + ": " + sText;
                 }
 
                 if( rEvt.GetMode() & HelpEventMode::BALLOON )
                 {
-                    Help::ShowBalloon( pWindow, rEvt.GetMousePosPixel(), sTxt );
+                    Help::ShowBalloon( pWindow, rEvt.GetMousePosPixel(), sText );
                 }
                 else
                 {
                     // then display the help:
                     Rectangle aRect( rEvt.GetMousePosPixel(), Size(1,1) );
-                    Help::ShowQuickHelp( pWindow, aRect, sTxt );
+                    Help::ShowQuickHelp( pWindow, aRect, sText );
                 }
                 bContinue = false;
             }
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 4361ade375a0..0f005b878951 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -145,9 +145,9 @@ SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt
 
         if(pSwVirtFlyDrawObj)
         {
-            if(pSwVirtFlyDrawObj->GetFlyFrm()->Lower() && pSwVirtFlyDrawObj->GetFlyFrm()->Lower()->IsNoTxtFrm())
+            if(pSwVirtFlyDrawObj->GetFlyFrm()->Lower() && pSwVirtFlyDrawObj->GetFlyFrm()->Lower()->IsNoTextFrm())
             {
-                // the old method used IsNoTxtFrm (should be for SW's own OLE and
+                // the old method used IsNoTextFrm (should be for SW's own OLE and
                 // graphic's) to accept hit only based on outer bounds; nothing to do
             }
             else
@@ -209,13 +209,13 @@ void SwDrawView::AddCustomHdl()
 
     SdrObject *pObj = rMrkList.GetMark(0)->GetMarkedSdrObj();
     // make code robust
-    SwFrmFmt* pFrmFmt( ::FindFrmFmt( pObj ) );
-    if ( !pFrmFmt )
+    SwFrameFormat* pFrameFormat( ::FindFrameFormat( pObj ) );
+    if ( !pFrameFormat )
     {
         OSL_FAIL( "<SwDrawView::AddCustomHdl()> - missing frame format!" );
         return;
     }
-    const SwFmtAnchor &rAnchor = pFrmFmt->GetAnchor();
+    const SwFormatAnchor &rAnchor = pFrameFormat->GetAnchor();
 
     if (FLY_AS_CHAR == rAnchor.GetAnchorId())
         return;
@@ -536,8 +536,8 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
          ( !bMovedForward && nNewPos > 0 ) )
     {
         size_t nTmpNewPos( nNewPos );
-        const SwFrmFmt* pParentFrmFmt =
-                pParentAnchoredObj ? &(pParentAnchoredObj->GetFrmFmt()) : 0L;
+        const SwFrameFormat* pParentFrameFormat =
+                pParentAnchoredObj ? &(pParentAnchoredObj->GetFrameFormat()) : 0L;
         const SdrObject* pTmpObj = pDrawPage->GetObj( nNewPos + 1 );
         while ( pTmpObj )
         {
@@ -549,7 +549,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
             const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm
                                             ? pTmpAnchorFrm->FindFlyFrm() : 0L;
             if ( pTmpParentObj &&
-                 &(pTmpParentObj->GetFrmFmt()) != pParentFrmFmt )
+                 &(pTmpParentObj->GetFrameFormat()) != pParentFrameFormat )
             {
                 if ( bMovedForward )
                 {
@@ -717,12 +717,12 @@ const SwFrm* SwDrawView::CalcAnchor()
 
     if ( aPt != aMyPt )
     {
-        if ( pAnch && pAnch->IsCntntFrm() )
+        if ( pAnch && pAnch->IsContentFrm() )
         {
             // allow drawing objects in header/footer,
             // but exclude control objects.
             bool bBodyOnly = CheckControlLayer( pObj );
-            pAnch = ::FindAnchor( static_cast<const SwCntntFrm*>(pAnch), aPt, bBodyOnly );
+            pAnch = ::FindAnchor( static_cast<const SwContentFrm*>(pAnch), aPt, bBodyOnly );
         }
         else if ( !bFly )
         {
@@ -825,9 +825,9 @@ void SwDrawView::CheckPossibilities()
             if ( pFly  )
             {
                 pFrm = pFly->GetAnchorFrm();
-                if ( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
+                if ( pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
                 {
-                    SwOLENode *pNd = const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(pFly->Lower()))->GetNode()->GetOLENode();
+                    SwOLENode *pNd = const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pFly->Lower()))->GetNode()->GetOLENode();
                     if ( pNd )
                     {
                         uno::Reference < embed::XEmbeddedObject > xObj = pNd->GetOLEObj().GetOleRef();
@@ -842,7 +842,7 @@ void SwDrawView::CheckPossibilities()
                             // #i972: protect position if it is a Math object anchored 'as char' and baseline alignment is activated
                             SwDoc* pDoc = Imp().GetShell()->GetDoc();
                             const bool bProtectMathPos = SotExchange::IsMath( xObj->getClassID() )
-                                    && FLY_AS_CHAR == pFly->GetFmt()->GetAnchor().GetAnchorId()
+                                    && FLY_AS_CHAR == pFly->GetFormat()->GetAnchor().GetAnchorId()
                                     && pDoc->GetDocumentSettingManager().get( DocumentSettingId::MATH_BASELINE_ALIGNMENT );
                             if (bProtectMathPos)
                                 bMoveProtect = true;
@@ -860,13 +860,13 @@ void SwDrawView::CheckPossibilities()
         if ( pFrm )
             bProtect = pFrm->IsProtected(); //Frames, areas etc.
         {
-            SwFrmFmt* pFrmFmt( ::FindFrmFmt( const_cast<SdrObject*>(pObj) ) );
-            if ( !pFrmFmt )
+            SwFrameFormat* pFrameFormat( ::FindFrameFormat( const_cast<SdrObject*>(pObj) ) );
+            if ( !pFrameFormat )
             {
                 OSL_FAIL( "<SwDrawView::CheckPossibilities()> - missing frame format" );
                 bProtect = true;
             }
-            else if ((FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId()) &&
+            else if ((FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId()) &&
                       rMrkList.GetMarkCount() > 1 )
             {
                 bProtect = true;
@@ -941,13 +941,13 @@ void SwDrawView::DeleteMarked()
 
     // Check what textboxes have to be deleted afterwards.
     const SdrMarkList& rMarkList = GetMarkedObjectList();
-    std::vector<SwFrmFmt*> aTextBoxesToDelete;
+    std::vector<SwFrameFormat*> aTextBoxesToDelete;
     for (size_t i = 0; i < rMarkList.GetMarkCount(); ++i)
     {
         SdrObject *pObject = rMarkList.GetMark(i)->GetMarkedSdrObj();
         SwDrawContact* pDrawContact = static_cast<SwDrawContact*>(GetUserCall(pObject));
-        SwFrmFmt* pFmt = pDrawContact->GetFmt();
-        if (SwFrmFmt* pTextBox = SwTextBoxHelper::findTextBox(pFmt))
+        SwFrameFormat* pFormat = pDrawContact->GetFormat();
+        if (SwFrameFormat* pTextBox = SwTextBoxHelper::findTextBox(pFormat))
             aTextBoxesToDelete.push_back(pTextBox);
     }
 
@@ -957,8 +957,8 @@ void SwDrawView::DeleteMarked()
         ::FrameNotify( Imp().GetShell(), FLY_DRAG_END );
 
         // Only delete these now: earlier deletion would clear the mark list as well.
-        for (std::vector<SwFrmFmt*>::iterator i = aTextBoxesToDelete.begin(); i != aTextBoxesToDelete.end(); ++i)
-            pDoc->getIDocumentLayoutAccess().DelLayoutFmt(*i);
+        for (std::vector<SwFrameFormat*>::iterator i = aTextBoxesToDelete.begin(); i != aTextBoxesToDelete.end(); ++i)
+            pDoc->getIDocumentLayoutAccess().DelLayoutFormat(*i);
     }
     pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
     if( pTmpRoot )
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index c986957dd218..d3281eb391c2 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -101,7 +101,7 @@ SwAutoCorrDoc::~SwAutoCorrDoc()
 void SwAutoCorrDoc::DeleteSel( SwPaM& rDelPam )
 {
     SwDoc* pDoc = rEditSh.GetDoc();
-    if( pDoc->IsAutoFmtRedline() )
+    if( pDoc->IsAutoFormatRedline() )
     {
         // so that also the DelPam be moved,  include it in the
         // Shell-Cursr-Ring !!
@@ -125,14 +125,14 @@ bool SwAutoCorrDoc::Delete( sal_Int32 nStt, sal_Int32 nEnd )
     return true;
 }
 
-bool SwAutoCorrDoc::Insert( sal_Int32 nPos, const OUString& rTxt )
+bool SwAutoCorrDoc::Insert( sal_Int32 nPos, const OUString& rText )
 {
     SwPaM aPam( rCrsr.GetPoint()->nNode.GetNode(), nPos );
-    rEditSh.GetDoc()->getIDocumentContentOperations().InsertString( aPam, rTxt );
+    rEditSh.GetDoc()->getIDocumentContentOperations().InsertString( aPam, rText );
     if( !bUndoIdInitialized )
     {
         bUndoIdInitialized = true;
-        if( 1 == rTxt.getLength() )
+        if( 1 == rText.getLength() )
         {
             rEditSh.StartUndo( UNDO_AUTOCORRECT );
             ++m_nEndUndoCounter;
@@ -141,12 +141,12 @@ bool SwAutoCorrDoc::Insert( sal_Int32 nPos, const OUString& rTxt )
     return true;
 }
 
-bool SwAutoCorrDoc::Replace( sal_Int32 nPos, const OUString& rTxt )
+bool SwAutoCorrDoc::Replace( sal_Int32 nPos, const OUString& rText )
 {
-    return ReplaceRange( nPos, rTxt.getLength(), rTxt );
+    return ReplaceRange( nPos, rText.getLength(), rText );
 }
 
-bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const OUString& rTxt )
+bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const OUString& rText )
 {
     SwPaM* pPam = &rCrsr;
     if( pPam->GetPoint()->nContent.GetIndex() != nPos )
@@ -155,7 +155,7 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
         pPam->GetPoint()->nContent = nPos;
     }
 
-    SwTxtNode * const pNd = pPam->GetNode().GetTxtNode();
+    SwTextNode * const pNd = pPam->GetNode().GetTextNode();
     if ( !pNd )
     {
         return false;
@@ -163,12 +163,12 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
 
     // text attributes with dummy characters must not be replaced!
     bool bDoReplace = true;
-    sal_Int32 const nLen = rTxt.getLength();
+    sal_Int32 const nLen = rText.getLength();
     for ( sal_Int32 n = 0; n < nLen; ++n )
     {
-        sal_Unicode const Char = pNd->GetTxt()[n + nPos];
+        sal_Unicode const Char = pNd->GetText()[n + nPos];
         if ( ( CH_TXTATR_BREAKWORD == Char || CH_TXTATR_INWORD == Char )
-             && pNd->GetTxtAttrForCharAt( n + nPos ) )
+             && pNd->GetTextAttrForCharAt( n + nPos ) )
         {
             bDoReplace = false;
             break;
@@ -179,11 +179,11 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
     {
         SwDoc* pDoc = rEditSh.GetDoc();
 
-        if( pDoc->IsAutoFmtRedline() )
+        if( pDoc->IsAutoFormatRedline() )
         {
-            if (nPos == pNd->GetTxt().getLength()) // at the End do an Insert
+            if (nPos == pNd->GetText().getLength()) // at the End do an Insert
             {
-                pDoc->getIDocumentContentOperations().InsertString( *pPam, rTxt );
+                pDoc->getIDocumentContentOperations().InsertString( *pPam, rText );
             }
             else
             {
@@ -191,31 +191,31 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
 
                 pPam->SetMark();
                 pPam->GetPoint()->nContent = std::min<sal_Int32>(
-                        pNd->GetTxt().getLength(), nPos + nSourceLength);
-                pDoc->getIDocumentContentOperations().ReplaceRange( *pPam, rTxt, false );
+                        pNd->GetText().getLength(), nPos + nSourceLength);
+                pDoc->getIDocumentContentOperations().ReplaceRange( *pPam, rText, false );
                 pPam->Exchange();
                 pPam->DeleteMark();
             }
         }
         else
         {
-            if( nSourceLength != rTxt.getLength() )
+            if( nSourceLength != rText.getLength() )
             {
                 pPam->SetMark();
                 pPam->GetPoint()->nContent = std::min<sal_Int32>(
-                        pNd->GetTxt().getLength(), nPos + nSourceLength);
-                pDoc->getIDocumentContentOperations().ReplaceRange( *pPam, rTxt, false );
+                        pNd->GetText().getLength(), nPos + nSourceLength);
+                pDoc->getIDocumentContentOperations().ReplaceRange( *pPam, rText, false );
                 pPam->Exchange();
                 pPam->DeleteMark();
             }
             else
-                pDoc->getIDocumentContentOperations().Overwrite( *pPam, rTxt );
+                pDoc->getIDocumentContentOperations().Overwrite( *pPam, rText );
         }
 
         if( bUndoIdInitialized )
         {
             bUndoIdInitialized = true;
-            if( 1 == rTxt.getLength() )
+            if( 1 == rText.getLength() )
             {
                 rEditSh.StartUndo( UNDO_AUTOCORRECT );
                 ++m_nEndUndoCounter;
@@ -241,10 +241,10 @@ bool SwAutoCorrDoc::SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId,
     {
         rItem.SetWhich( nWhich );
 
-        SfxItemSet aSet( rPool, aCharFmtSetRange );
+        SfxItemSet aSet( rPool, aCharFormatSetRange );
         SetAllScriptItem( aSet, rItem );
 
-        rEditSh.GetDoc()->SetFmtItemByAutoFmt( aPam, aSet );
+        rEditSh.GetDoc()->SetFormatItemByAutoFormat( aPam, aSet );
 
         if( bUndoIdInitialized )
             bUndoIdInitialized = true;
@@ -259,8 +259,8 @@ bool SwAutoCorrDoc::SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString&
 
     SfxItemSet aSet( rEditSh.GetDoc()->GetAttrPool(),
                         RES_TXTATR_INETFMT, RES_TXTATR_INETFMT );
-    aSet.Put( SwFmtINetFmt( rURL, OUString() ));
-    rEditSh.GetDoc()->SetFmtItemByAutoFmt( aPam, aSet );
+    aSet.Put( SwFormatINetFormat( rURL, OUString() ));
+    rEditSh.GetDoc()->SetFormatItemByAutoFormat( aPam, aSet );
     if( bUndoIdInitialized )
         bUndoIdInitialized = true;
     return true;
@@ -281,14 +281,14 @@ OUString const* SwAutoCorrDoc::GetPrevPara(bool const bAtNormalPos)
     else
         --(*pIdx);
 
-    SwTxtNode* pTNd = pIdx->GetNode().GetTxtNode();
-    while (pTNd && !pTNd->GetTxt().getLength())
+    SwTextNode* pTNd = pIdx->GetNode().GetTextNode();
+    while (pTNd && !pTNd->GetText().getLength())
     {
         --(*pIdx);
-        pTNd = pIdx->GetNode().GetTxtNode();
+        pTNd = pIdx->GetNode().GetTextNode();
     }
     if( pTNd && 0 == pTNd->GetAttrOutlineLevel() )
-        pStr = & pTNd->GetTxt();
+        pStr = & pTNd->GetText();
 
     if( bUndoIdInitialized )
         bUndoIdInitialized = true;
@@ -305,8 +305,8 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
 
     // Found a beginning of a paragraph or a Blank,
     // search for the word Kuerzel (Shortcut) in the Auto
-    SwTxtNode* pTxtNd = rCrsr.GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNd, "where is the TextNode?" );
+    SwTextNode* pTextNd = rCrsr.GetNode().GetTextNode();
+    OSL_ENSURE( pTextNd, "where is the TextNode?" );
 
     bool bRet = false;
     if( nEndPos == rSttPos )
@@ -318,11 +318,11 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
     LanguageTag aLanguageTag( eLang);
 
     //JP 22.04.99: Bug 63883 - Special treatment for dots.
-    bool bLastCharIsPoint = nEndPos < pTxtNd->GetTxt().getLength() &&
-                            ('.' == pTxtNd->GetTxt()[nEndPos]);
+    bool bLastCharIsPoint = nEndPos < pTextNd->GetText().getLength() &&
+                            ('.' == pTextNd->GetText()[nEndPos]);
 
     const SvxAutocorrWord* pFnd = rACorrect.SearchWordsInList(
-                                pTxtNd->GetTxt(), rSttPos, nEndPos, *this, aLanguageTag );
+                                pTextNd->GetText(), rSttPos, nEndPos, *this, aLanguageTag );
     SwDoc* pDoc = rEditSh.GetDoc();
     if( pFnd )
     {
@@ -347,7 +347,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
             if( USHRT_MAX != nPos && aTBlks.BeginGetDoc( nPos ) )
             {
                 DeleteSel( aPam );
-                pDoc->DontExpandFmt( *aPam.GetPoint() );
+                pDoc->DontExpandFormat( *aPam.GetPoint() );
 
                 if( pPara )
                 {
@@ -357,22 +357,22 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
 
                 SwDoc* pAutoDoc = aTBlks.GetDoc();
                 SwNodeIndex aSttIdx( pAutoDoc->GetNodes().GetEndOfExtras(), 1 );
-                SwCntntNode* pCntntNd = pAutoDoc->GetNodes().GoNext( &aSttIdx );
+                SwContentNode* pContentNd = pAutoDoc->GetNodes().GoNext( &aSttIdx );
                 SwPaM aCpyPam( aSttIdx );
 
-                const SwTableNode* pTblNd = pCntntNd->FindTableNode();
-                if( pTblNd )
+                const SwTableNode* pTableNd = pContentNd->FindTableNode();
+                if( pTableNd )
                 {
                     aCpyPam.GetPoint()->nContent.Assign( 0, 0 );
-                    aCpyPam.GetPoint()->nNode = *pTblNd;
+                    aCpyPam.GetPoint()->nNode = *pTableNd;
                 }
                 aCpyPam.SetMark();
 
                 // then until the end of the Nodes Array
                 aCpyPam.GetPoint()->nNode.Assign( pAutoDoc->GetNodes().GetEndOfContent(), -1 );
-                pCntntNd = aCpyPam.GetCntntNode();
+                pContentNd = aCpyPam.GetContentNode();
                 aCpyPam.GetPoint()->nContent.Assign(
-                       pCntntNd, (pCntntNd) ? pCntntNd->Len() : 0);
+                       pContentNd, (pContentNd) ? pContentNd->Len() : 0);
 
                 SwDontExpandItem aExpItem;
                 aExpItem.SaveDontExpandItems( *aPam.GetPoint() );
@@ -384,7 +384,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
                 if( pPara )
                 {
                     ++(*pIdx);
-                    pTxtNd = pIdx->GetNode().GetTxtNode();
+                    pTextNd = pIdx->GetNode().GetTextNode();
                 }
                 bRet = true;
             }
@@ -392,8 +392,8 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
         }
     }
 
-    if( bRet && pPara && pTxtNd )
-        *pPara = pTxtNd->GetTxt();
+    if( bRet && pPara && pTextNd )
+        *pPara = pTextNd->GetText();
 
     return bRet;
 }
@@ -417,9 +417,9 @@ LanguageType SwAutoCorrDoc::GetLanguage( sal_Int32 nPos, bool bPrevPara ) const
 {
     LanguageType eRet = LANGUAGE_SYSTEM;
 
-    SwTxtNode* pNd = (( bPrevPara && pIdx )
+    SwTextNode* pNd = (( bPrevPara && pIdx )
                             ? *pIdx
-                            : rCrsr.GetPoint()->nNode ).GetNode().GetTxtNode();
+                            : rCrsr.GetPoint()->nNode ).GetNode().GetTextNode();
 
     if( pNd )
         eRet = pNd->GetLang( nPos, 0 );
@@ -460,35 +460,35 @@ SwDontExpandItem::~SwDontExpandItem()
 
 void SwDontExpandItem::SaveDontExpandItems( const SwPosition& rPos )
 {
-    const SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( pTxtNd )
+    const SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( pTextNd )
     {
-        pDontExpItems = new SfxItemSet( const_cast<SwDoc*>(pTxtNd->GetDoc())->GetAttrPool(),
-                                            aCharFmtSetRange );
+        pDontExpItems = new SfxItemSet( const_cast<SwDoc*>(pTextNd->GetDoc())->GetAttrPool(),
+                                            aCharFormatSetRange );
         const sal_Int32 n = rPos.nContent.GetIndex();
-        if( !pTxtNd->GetAttr( *pDontExpItems, n, n,
-                                n != pTxtNd->GetTxt().getLength() ))
+        if( !pTextNd->GetAttr( *pDontExpItems, n, n,
+                                n != pTextNd->GetText().getLength() ))
             delete pDontExpItems, pDontExpItems = 0;
     }
 }
 
 void SwDontExpandItem::RestoreDontExpandItems( const SwPosition& rPos )
 {
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( pTxtNd )
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( pTextNd )
     {
         const sal_Int32 nStart = rPos.nContent.GetIndex();
-        if( nStart == pTxtNd->GetTxt().getLength() )
-            pTxtNd->FmtToTxtAttr( pTxtNd );
+        if( nStart == pTextNd->GetText().getLength() )
+            pTextNd->FormatToTextAttr( pTextNd );
 
-        if( pTxtNd->GetpSwpHints() && pTxtNd->GetpSwpHints()->Count() )
+        if( pTextNd->GetpSwpHints() && pTextNd->GetpSwpHints()->Count() )
         {
-            const size_t nSize = pTxtNd->GetpSwpHints()->Count();
+            const size_t nSize = pTextNd->GetpSwpHints()->Count();
             sal_Int32 nAttrStart;
 
             for( size_t n = 0; n < nSize; ++n )
             {
-                SwTxtAttr* pHt = pTxtNd->GetpSwpHints()->GetTextHint( n );
+                SwTextAttr* pHt = pTextNd->GetpSwpHints()->GetTextHint( n );
                 nAttrStart = pHt->GetStart();
                 if( nAttrStart > nStart )       // beyond the area
                     break;
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 729a37529eca..af48083d1141 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -81,7 +81,7 @@ const int cnPosEnDash = 2, cnPosEmDash = 4;
 const sal_Unicode cStarSymbolEnDash = 0x2013;
 const sal_Unicode cStarSymbolEmDash = 0x2014;
 
-SvxSwAutoFmtFlags* SwEditShell::s_pAutoFmtFlags = nullptr;
+SvxSwAutoFormatFlags* SwEditShell::s_pAutoFormatFlags = nullptr;
 
 // Number of num-/bullet-paragraph templates. MAXLEVEL will soon be raised
 // to x, but not the number of templates. (Artifact from <= 4.0)
@@ -89,21 +89,21 @@ const sal_uInt16 cnNumBullColls = 4;
 
 class SwAutoFormat
 {
-    SvxSwAutoFmtFlags m_aFlags;
+    SvxSwAutoFormatFlags m_aFlags;
     SwPaM m_aDelPam;            // a Pam that can be used
     SwNodeIndex m_aNdIdx;       // the index on the current TextNode
     SwNodeIndex m_aEndNdIdx;    // index on the end of the area
 
     SwEditShell* m_pEditShell;
     SwDoc* m_pDoc;
-    SwTxtNode* m_pCurTxtNd;     // the current TextNode
-    SwTxtFrm* m_pCurTxtFrm;     // frame of the current TextNode
+    SwTextNode* m_pCurTextNd;     // the current TextNode
+    SwTextFrm* m_pCurTextFrm;     // frame of the current TextNode
     sal_uLong m_nEndNdIdx;      // for the percentage-display
     mutable boost::scoped_ptr<CharClass> m_pCharClass; // Character classification
     mutable LanguageType m_eCharClassLang;
 
     sal_uInt16 m_nLastHeadLvl, m_nLastCalcHeadLvl;
-    sal_uInt16 m_nRedlAutoFmtSeqId;
+    sal_uInt16 m_nRedlAutoFormatSeqId;
 
     enum
     {
@@ -154,18 +154,18 @@ class SwAutoFormat
     OUString GoNextPara();
     bool HasObjects( const SwNode& rNd );
 
-    // TxtNode methods
-    const SwTxtNode* GetNextNode() const;
-    static bool IsEmptyLine( const SwTxtNode& rNd )
-        {   return rNd.GetTxt().isEmpty() ||
-                rNd.GetTxt().getLength() == GetLeadingBlanks( rNd.GetTxt() ); }
-
-    bool IsOneLine( const SwTxtNode& ) const;
-    bool IsFastFullLine( const SwTxtNode& ) const;
-    bool IsNoAlphaLine( const SwTxtNode&) const;
-    bool IsEnumericChar( const SwTxtNode&) const;
-    static bool IsBlanksInString( const SwTxtNode&);
-    sal_uInt16 CalcLevel( const SwTxtNode&, sal_uInt16 *pDigitLvl = 0 ) const;
+    // TextNode methods
+    const SwTextNode* GetNextNode() const;
+    static bool IsEmptyLine( const SwTextNode& rNd )
+        {   return rNd.GetText().isEmpty() ||
+                rNd.GetText().getLength() == GetLeadingBlanks( rNd.GetText() ); }
+
+    bool IsOneLine( const SwTextNode& ) const;
+    bool IsFastFullLine( const SwTextNode& ) const;
+    bool IsNoAlphaLine( const SwTextNode&) const;
+    bool IsEnumericChar( const SwTextNode&) const;
+    static bool IsBlanksInString( const SwTextNode&);
+    sal_uInt16 CalcLevel( const SwTextNode&, sal_uInt16 *pDigitLvl = 0 ) const;
     sal_Int32 GetBigIndent( sal_Int32& rAktSpacePos ) const;
 
     static OUString DelLeadingBlanks(const OUString& rStr);
@@ -173,12 +173,12 @@ class SwAutoFormat
     static sal_Int32 GetLeadingBlanks( const OUString& rStr );
     static sal_Int32 GetTrailingBlanks( const OUString& rStr );
 
-    bool IsFirstCharCapital( const SwTxtNode& rNd ) const;
-    sal_uInt16 GetDigitLevel( const SwTxtNode& rTxtNd, sal_Int32& rPos,
+    bool IsFirstCharCapital( const SwTextNode& rNd ) const;
+    sal_uInt16 GetDigitLevel( const SwTextNode& rTextNd, sal_Int32& rPos,
                             OUString* pPrefix = 0, OUString* pPostfix = 0,
                             OUString* pNumTypes = 0 ) const;
     /// get the FORMATED TextFrame
-    SwTxtFrm* GetFrm( const SwTxtNode& rTxtNd ) const;
+    SwTextFrm* GetFrm( const SwTextNode& rTextNd ) const;
 
     void BuildIndent();
     void BuildText();
@@ -188,7 +188,7 @@ class SwAutoFormat
     void BuildHeadLine( sal_uInt16 nLvl );
 
     static bool HasSelBlanks( SwPaM& rPam );
-    static bool HasBreakAttr( const SwTxtNode& );
+    static bool HasBreakAttr( const SwTextNode& );
     void DeleteSel( SwPaM& rPam );
     bool DeleteCurNxtPara( const OUString& rNxtPara );
     /// delete in the node start and/or end
@@ -202,31 +202,31 @@ class SwAutoFormat
     /// execute AutoCorrect on current TextNode
     void AutoCorrect( sal_Int32 nSttPos = 0 );
 
-    bool CanJoin( const SwTxtNode* pTxtNd ) const
+    bool CanJoin( const SwTextNode* pTextNd ) const
     {
-        return !m_bEnd && pTxtNd &&
-             !IsEmptyLine( *pTxtNd ) &&
-             !IsNoAlphaLine( *pTxtNd) &&
-             !IsEnumericChar( *pTxtNd ) &&
-             ((COMPLETE_STRING - 50 - pTxtNd->GetTxt().getLength()) >
-                    m_pCurTxtNd->GetTxt().getLength()) &&
-             !HasBreakAttr( *pTxtNd );
+        return !m_bEnd && pTextNd &&
+             !IsEmptyLine( *pTextNd ) &&
+             !IsNoAlphaLine( *pTextNd) &&
+             !IsEnumericChar( *pTextNd ) &&
+             ((COMPLETE_STRING - 50 - pTextNd->GetText().getLength()) >
+                    m_pCurTextNd->GetText().getLength()) &&
+             !HasBreakAttr( *pTextNd );
     }
 
     /// is a dot at the end ??
-    static bool IsSentenceAtEnd( const SwTxtNode& rTxtNd );
+    static bool IsSentenceAtEnd( const SwTextNode& rTextNd );
 
     bool DoUnderline();
     bool DoTable();
 
-    void _SetRedlineTxt( sal_uInt16 nId );
-    bool SetRedlineTxt( sal_uInt16 nId )
-        { if( m_aFlags.bWithRedlining )   _SetRedlineTxt( nId );  return true; }
-    bool ClearRedlineTxt()
-        { if( m_aFlags.bWithRedlining )   m_pDoc->GetDocumentRedlineManager().SetAutoFmtRedlineComment(0);  return true; }
+    void _SetRedlineText( sal_uInt16 nId );
+    bool SetRedlineText( sal_uInt16 nId )
+        { if( m_aFlags.bWithRedlining )   _SetRedlineText( nId );  return true; }
+    bool ClearRedlineText()
+        { if( m_aFlags.bWithRedlining )   m_pDoc->GetDocumentRedlineManager().SetAutoFormatRedlineComment(0);  return true; }
 
 public:
-    SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
+    SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags& rFlags,
                 SwNodeIndex* pSttNd = 0, SwNodeIndex* pEndNd = 0 );
 };
 
@@ -237,30 +237,30 @@ const sal_Unicode* StrChr( const sal_Unicode* pSrc, sal_Unicode c )
     return *pSrc ? pSrc : 0;
 }
 
-SwTxtFrm* SwAutoFormat::GetFrm( const SwTxtNode& rTxtNd ) const
+SwTextFrm* SwAutoFormat::GetFrm( const SwTextNode& rTextNd ) const
 {
     // get the Frame
-    const SwCntntFrm *pFrm = rTxtNd.getLayoutFrm( m_pEditShell->GetLayout() );
+    const SwContentFrm *pFrm = rTextNd.getLayoutFrm( m_pEditShell->GetLayout() );
     OSL_ENSURE( pFrm, "For Autoformat a Layout is needed" );
-    if( m_aFlags.bAFmtByInput && !pFrm->IsValid() )
+    if( m_aFlags.bAFormatByInput && !pFrm->IsValid() )
     {
         SwRect aTmpFrm( pFrm->Frm() );
         SwRect aTmpPrt( pFrm->Prt() );
         pFrm->Calc();
         if( pFrm->Frm() != aTmpFrm || pFrm->Prt() != aTmpPrt ||
-            ( pFrm->IsTxtFrm() && !const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pFrm))->Paint().IsEmpty() ) )
+            ( pFrm->IsTextFrm() && !const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pFrm))->Paint().IsEmpty() ) )
             pFrm->SetCompletePaint();
     }
-    return const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pFrm))->GetFormatted();
+    return const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pFrm))->GetFormatted();
 }
 
-void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId )
+void SwAutoFormat::_SetRedlineText( sal_uInt16 nActionId )
 {
-    OUString sTxt;
+    OUString sText;
     sal_uInt16 nSeqNo = 0;
     if( STR_AUTOFMTREDL_END > nActionId )
     {
-        sTxt = SwViewShell::GetShellRes()->GetAutoFmtNameLst()[ nActionId ];
+        sText = SwViewShell::GetShellRes()->GetAutoFormatNameLst()[ nActionId ];
         switch( nActionId )
         {
         case STR_AUTOFMTREDL_SET_NUMBULET:
@@ -277,16 +277,16 @@ void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId )
         case STR_AUTOFMTREDL_DASH:
         case STR_AUTOFMTREDL_ORDINAL:
         case STR_AUTOFMTREDL_NON_BREAK_SPACE:
-            nSeqNo = ++m_nRedlAutoFmtSeqId;
+            nSeqNo = ++m_nRedlAutoFormatSeqId;
             break;
         }
     }
 #if OSL_DEBUG_LEVEL > 0
     else
-        sTxt = "Action text is missing";
+        sText = "Action text is missing";
 #endif
 
-    m_pDoc->GetDocumentRedlineManager().SetAutoFmtRedlineComment( &sTxt, nSeqNo );
+    m_pDoc->GetDocumentRedlineManager().SetAutoFormatRedlineComment( &sText, nSeqNo );
 }
 
 OUString SwAutoFormat::GoNextPara()
@@ -311,7 +311,7 @@ OUString SwAutoFormat::GoNextPara()
 
         // not a TextNode ->
         //      TableNode   : skip table
-        //      NoTxtNode   : skip nodes
+        //      NoTextNode   : skip nodes
         //      EndNode     : at the end, terminate
         if( pNewNd->IsEndNode() )
         {
@@ -326,15 +326,15 @@ OUString SwAutoFormat::GoNextPara()
             if( rSect.IsHiddenFlag() || rSect.IsProtectFlag() )
                 m_aNdIdx = *pNewNd->EndOfSectionNode();
         }
-    } while( !pNewNd->IsTxtNode() );
+    } while( !pNewNd->IsTextNode() );
 
-    if( !m_aFlags.bAFmtByInput )
+    if( !m_aFlags.bAFormatByInput )
         ::SetProgressState( m_aNdIdx.GetIndex() + m_nEndNdIdx - m_aEndNdIdx.GetIndex(),
                             m_pDoc->GetDocShell() );
 
-    m_pCurTxtNd = static_cast<SwTxtNode*>(pNewNd);
-    m_pCurTxtFrm = GetFrm( *m_pCurTxtNd );
-    return m_pCurTxtNd->GetTxt();
+    m_pCurTextNd = static_cast<SwTextNode*>(pNewNd);
+    m_pCurTextFrm = GetFrm( *m_pCurTextNd );
+    return m_pCurTextNd->GetText();
 }
 
 bool SwAutoFormat::HasObjects( const SwNode& rNd )
@@ -342,13 +342,13 @@ bool SwAutoFormat::HasObjects( const SwNode& rNd )
     // Is there something bound to the paragraph in the paragraph
     // like borders, DrawObjects, ...
     bool bRet = false;
-    const SwFrmFmts& rFmts = *m_pDoc->GetSpzFrmFmts();
-    for( auto pFrmFmt : rFmts )
+    const SwFrameFormats& rFormats = *m_pDoc->GetSpzFrameFormats();
+    for( auto pFrameFormat : rFormats )
     {
-        const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
+        const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
         if ((FLY_AT_PAGE != rAnchor.GetAnchorId()) &&
-            rAnchor.GetCntntAnchor() &&
-            &rAnchor.GetCntntAnchor()->nNode.GetNode() == &rNd )
+            rAnchor.GetContentAnchor() &&
+            &rAnchor.GetContentAnchor()->nNode.GetNode() == &rNd )
         {
             bRet = true;
             break;
@@ -357,45 +357,45 @@ bool SwAutoFormat::HasObjects( const SwNode& rNd )
     return bRet;
 }
 
-const SwTxtNode* SwAutoFormat::GetNextNode() const
+const SwTextNode* SwAutoFormat::GetNextNode() const
 {
     if( m_aNdIdx.GetIndex()+1 >= m_aEndNdIdx.GetIndex() )
         return 0;
-    return m_pDoc->GetNodes()[ m_aNdIdx.GetIndex() + 1 ]->GetTxtNode();
+    return m_pDoc->GetNodes()[ m_aNdIdx.GetIndex() + 1 ]->GetTextNode();
 }
 
-bool SwAutoFormat::IsOneLine( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsOneLine( const SwTextNode& rNd ) const
 {
-    SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
+    SwTextFrmInfo aFInfo( GetFrm( rNd ) );
     return aFInfo.IsOneLine();
 }
 
-bool SwAutoFormat::IsFastFullLine( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsFastFullLine( const SwTextNode& rNd ) const
 {
     bool bRet = m_aFlags.bRightMargin;
     if( bRet )
     {
-        SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
+        SwTextFrmInfo aFInfo( GetFrm( rNd ) );
         bRet = aFInfo.IsFilled( m_aFlags.nRightMargin );
     }
     return bRet;
 }
 
-bool SwAutoFormat::IsEnumericChar( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsEnumericChar( const SwTextNode& rNd ) const
 {
-    const OUString& rTxt = rNd.GetTxt();
-    sal_Int32 nBlnks = GetLeadingBlanks( rTxt );
-    const sal_Int32 nLen = rTxt.getLength() - nBlnks;
+    const OUString& rText = rNd.GetText();
+    sal_Int32 nBlnks = GetLeadingBlanks( rText );
+    const sal_Int32 nLen = rText.getLength() - nBlnks;
     if( !nLen )
         return false;
 
     // -, +, * separated by blank ??
-    if (2 < nLen && IsSpace(rTxt[nBlnks + 1]))
+    if (2 < nLen && IsSpace(rText[nBlnks + 1]))
     {
-        if (StrChr(pBulletChar, rTxt[nBlnks]))
+        if (StrChr(pBulletChar, rText[nBlnks]))
             return true;
         // Should there be a symbol font at the position?
-        SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
+        SwTextFrmInfo aFInfo( GetFrm( rNd ) );
         if( aFInfo.IsBullet( nBlnks ))
             return true;
     }
@@ -404,10 +404,10 @@ bool SwAutoFormat::IsEnumericChar( const SwTxtNode& rNd ) const
     return USHRT_MAX != GetDigitLevel( rNd, nBlnks );
 }
 
-bool SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd )
+bool SwAutoFormat::IsBlanksInString( const SwTextNode& rNd )
 {
     // Search more than 5 consecutive blanks/tabs in the string.
-    OUString sTmp( DelLeadingBlanks(rNd.GetTxt()) );
+    OUString sTmp( DelLeadingBlanks(rNd.GetText()) );
     const sal_Int32 nLen = sTmp.getLength();
     sal_Int32 nIdx = 0;
     while (nIdx < nLen)
@@ -426,28 +426,28 @@ bool SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd )
     return false;
 }
 
-sal_uInt16 SwAutoFormat::CalcLevel( const SwTxtNode& rNd, sal_uInt16 *pDigitLvl ) const
+sal_uInt16 SwAutoFormat::CalcLevel( const SwTextNode& rNd, sal_uInt16 *pDigitLvl ) const
 {
     sal_uInt16 nLvl = 0, nBlnk = 0;
-    const OUString& rTxt = rNd.GetTxt();
+    const OUString& rText = rNd.GetText();
     if( pDigitLvl )
         *pDigitLvl = USHRT_MAX;
 
-    if( RES_POOLCOLL_TEXT_MOVE == rNd.GetTxtColl()->GetPoolFmtId() )
+    if( RES_POOLCOLL_TEXT_MOVE == rNd.GetTextColl()->GetPoolFormatId() )
     {
-        if( m_aFlags.bAFmtByInput )
+        if( m_aFlags.bAFormatByInput )
         {
-            nLvl = rNd.GetAutoFmtLvl();
-            const_cast<SwTxtNode&>(rNd).SetAutoFmtLvl( 0 );
+            nLvl = rNd.GetAutoFormatLvl();
+            const_cast<SwTextNode&>(rNd).SetAutoFormatLvl( 0 );
             if( nLvl )
                 return nLvl;
         }
         ++nLvl;
     }
 
-    for (sal_Int32 n = 0, nEnd = rTxt.getLength(); n < nEnd; ++n)
+    for (sal_Int32 n = 0, nEnd = rText.getLength(); n < nEnd; ++n)
     {
-        switch (rTxt[n])
+        switch (rText[n])
         {
         case ' ':   if( 3 == ++nBlnk )
                         ++nLvl, nBlnk = 0;
@@ -466,12 +466,12 @@ sal_uInt16 SwAutoFormat::CalcLevel( const SwTxtNode& rNd, sal_uInt16 *pDigitLvl
 
 sal_Int32 SwAutoFormat::GetBigIndent( sal_Int32& rAktSpacePos ) const
 {
-    SwTxtFrmInfo aFInfo( GetFrm( *m_pCurTxtNd ) );
-    const SwTxtFrm* pNxtFrm = 0;
+    SwTextFrmInfo aFInfo( GetFrm( *m_pCurTextNd ) );
+    const SwTextFrm* pNxtFrm = 0;
 
     if( !m_bMoreLines )
     {
-        const SwTxtNode* pNxtNd = GetNextNode();
+        const SwTextNode* pNxtNd = GetNextNode();
         if( !CanJoin( pNxtNd ) || !IsOneLine( *pNxtNd ) )
             return 0;
 
@@ -481,9 +481,9 @@ sal_Int32 SwAutoFormat::GetBigIndent( sal_Int32& rAktSpacePos ) const
     return aFInfo.GetBigIndent( rAktSpacePos, pNxtFrm );
 }
 
-bool SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsNoAlphaLine( const SwTextNode& rNd ) const
 {
-    const OUString& rStr = rNd.GetTxt();
+    const OUString& rStr = rNd.GetText();
     if( rStr.isEmpty() )
         return false;
     // or better: determine via number of AlphaNum and !AlphaNum characters
@@ -507,13 +507,13 @@ bool SwAutoFormat::DoUnderline()
     if( !m_aFlags.bSetBorder )
         return false;
 
-    OUString const& rTxt(m_pCurTxtNd->GetTxt());
+    OUString const& rText(m_pCurTextNd->GetText());
     int eState = 0;
     sal_Int32 nCnt = 0;
-    while (nCnt < rTxt.getLength())
+    while (nCnt < rText.getLength())
     {
         int eTmp = 0;
-        switch (rTxt[nCnt])
+        switch (rText[nCnt])
         {
             case '-': eTmp = 1; break;
             case '_': eTmp = 2; break;
@@ -584,11 +584,11 @@ bool SwAutoFormat::DoUnderline()
 
 bool SwAutoFormat::DoTable()
 {
-    if( !m_aFlags.bCreateTable || !m_aFlags.bAFmtByInput ||
-        m_pCurTxtNd->FindTableNode() )
+    if( !m_aFlags.bCreateTable || !m_aFlags.bAFormatByInput ||
+        m_pCurTextNd->FindTableNode() )
         return false;
 
-    const OUString& rTmp = m_pCurTxtNd->GetTxt();
+    const OUString& rTmp = m_pCurTextNd->GetText();
     sal_Int32 nSttPlus = GetLeadingBlanks( rTmp );
     sal_Int32 nEndPlus = GetTrailingBlanks( rTmp );
     sal_Unicode cChar;
@@ -598,7 +598,7 @@ bool SwAutoFormat::DoTable()
         ( '+' != ( cChar = rTmp[nEndPlus - 1]) && '|' != cChar ))
         return false;
 
-    SwTxtFrmInfo aInfo( m_pCurTxtFrm );
+    SwTextFrmInfo aInfo( m_pCurTextFrm );
 
     sal_Int32 n = nSttPlus;
     std::vector<sal_uInt16> aPosArr;
@@ -632,7 +632,7 @@ bool SwAutoFormat::DoTable()
         sal_uInt16 nColCnt = aPosArr.size() - 1;
         SwTwips nSttPos = aPosArr[ 0 ];
         sal_Int16 eHori;
-        switch( m_pCurTxtNd->GetSwAttrSet().GetAdjust().GetAdjust() )
+        switch( m_pCurTextNd->GetSwAttrSet().GetAdjust().GetAdjust() )
         {
         case SVX_ADJUST_CENTER:     eHori = text::HoriOrientation::CENTER;    break;
         case SVX_ADJUST_RIGHT:      eHori = text::HoriOrientation::RIGHT;     break;
@@ -642,7 +642,7 @@ bool SwAutoFormat::DoTable()
             {
                 eHori = text::HoriOrientation::NONE;
                 // then - as last - we need to add the current frame width into the array
-                aPosArr.push_back( static_cast<sal_uInt16>(m_pCurTxtFrm->Frm().Width()) );
+                aPosArr.push_back( static_cast<sal_uInt16>(m_pCurTextFrm->Frm().Width()) );
             }
             else
                 eHori = text::HoriOrientation::LEFT;
@@ -705,15 +705,15 @@ sal_Int32 SwAutoFormat::GetTrailingBlanks( const OUString& rStr )
     return ++n;
 }
 
-bool SwAutoFormat::IsFirstCharCapital( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsFirstCharCapital( const SwTextNode& rNd ) const
 {
-    const OUString& rTxt = rNd.GetTxt();
-    for( sal_Int32 n = 0, nEnd = rTxt.getLength(); n < nEnd; ++n )
-        if (!IsSpace(rTxt[n]))
+    const OUString& rText = rNd.GetText();
+    for( sal_Int32 n = 0, nEnd = rText.getLength(); n < nEnd; ++n )
+        if (!IsSpace(rText[n]))
         {
             CharClass& rCC = GetCharClass( rNd.GetSwAttrSet().
                                         GetLanguage().GetLanguage() );
-            sal_Int32 nCharType = rCC.getCharacterType( rTxt, n );
+            sal_Int32 nCharType = rCC.getCharacterType( rText, n );
             return CharClass::isLetterType( nCharType ) &&
                    0 != ( i18n::KCharacterType::UPPER &
                                                     nCharType );
@@ -721,11 +721,11 @@ bool SwAutoFormat::IsFirstCharCapital( const SwTxtNode& rNd ) const
     return false;
 }
 
-sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, sal_Int32& rPos,
+sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTextNode& rNd, sal_Int32& rPos,
         OUString* pPrefix, OUString* pPostfix, OUString* pNumTypes ) const
 {
     // check for 1.) / 1. / 1.1.1 / (1). / (1) / ....
-    const OUString& rTxt = rNd.GetTxt();
+    const OUString& rText = rNd.GetText();
     sal_Int32 nPos = rPos;
     int eScan = NONE;
 
@@ -737,9 +737,9 @@ sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, sal_Int32& rPos,
 
     CharClass& rCC = GetCharClass( rNd.GetSwAttrSet().GetLanguage().GetLanguage() );
 
-    while (nPos < rTxt.getLength() && nDigitLvl < MAXLEVEL - 1)
+    while (nPos < rText.getLength() && nDigitLvl < MAXLEVEL - 1)
     {
-        const sal_Unicode cCurrentChar = rTxt[nPos];
+        const sal_Unicode cCurrentChar = rText[nPos];
         if( ('0' <= cCurrentChar &&  '9' >= cCurrentChar) ||
             (0xff10 <= cCurrentChar &&  0xff19 >= cCurrentChar) )
         {
@@ -771,12 +771,12 @@ sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, sal_Int32& rPos,
             nStart *= 10;
             nStart += cCurrentChar <= '9' ? cCurrentChar - '0' : cCurrentChar - 0xff10;
         }
-        else if( rCC.isAlpha( rTxt, nPos ) )
+        else if( rCC.isAlpha( rText, nPos ) )
         {
             bool bIsUpper =
                 0 != ( i18n::KCharacterType::UPPER &
-                                        rCC.getCharacterType( rTxt, nPos ));
-            sal_Unicode cLow = rCC.lowercase(rTxt, nPos, 1)[0], cNumTyp;
+                                        rCC.getCharacterType( rText, nPos ));
+            sal_Unicode cLow = rCC.lowercase(rText, nPos, 1)[0], cNumTyp;
             int eTmpScan;
 
             // Roman numbers are "mdclxvi". Since we want to start numbering with c or d more often,
@@ -927,9 +927,9 @@ CHECK_ROMAN_5:
                 nClosingParentheses++;
             // only if no numbers were read until here
             if( pPrefix && !( eScan & ( NO_DELIM | CHG )) )
-                *pPrefix += OUString(rTxt[nPos]);
+                *pPrefix += OUString(rText[nPos]);
             else if( pPostfix )
-                *pPostfix += OUString(rTxt[nPos]);
+                *pPostfix += OUString(rText[nPos]);
 
             if( NO_DELIM & eScan )
             {
@@ -947,7 +947,7 @@ CHECK_ROMAN_5:
         ++nPos;
     }
     if( !( CHG & eScan ) || rPos == nPos ||
-        nPos == rTxt.getLength() || !IsSpace(rTxt[nPos]) ||
+        nPos == rText.getLength() || !IsSpace(rText[nPos]) ||
         (nOpeningParentheses > nClosingParentheses))
         return USHRT_MAX;
 
@@ -962,7 +962,7 @@ void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText )
 {
     m_aDelPam.DeleteMark();
     m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
 
     // keep hard tabs, alignment, language, hyphenation, DropCaps and nearly all frame attributes
     SfxItemSet aSet( m_pDoc->GetAttrPool(),
@@ -972,9 +972,9 @@ void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText )
                         RES_BACKGROUND, RES_SHADOW,
                         0 );
 
-    if( m_pCurTxtNd->HasSwAttrSet() )
+    if( m_pCurTextNd->HasSwAttrSet() )
     {
-        aSet.Put( *m_pCurTxtNd->GetpSwAttrSet() );
+        aSet.Put( *m_pCurTextNd->GetpSwAttrSet() );
         // take HeaderLine/TextBody only if centered or right aligned, otherwise only justification
         SvxAdjustItem const * pAdj;
         if( SfxItemState::SET == aSet.GetItemState( RES_PARATR_ADJUST,
@@ -988,7 +988,7 @@ void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText )
         }
     }
 
-    m_pDoc->SetTxtFmtCollByAutoFmt( *m_aDelPam.GetPoint(), nId, &aSet );
+    m_pDoc->SetTextFormatCollByAutoFormat( *m_aDelPam.GetPoint(), nId, &aSet );
 }
 
 bool SwAutoFormat::HasSelBlanks( SwPaM& rPam )
@@ -997,17 +997,17 @@ bool SwAutoFormat::HasSelBlanks( SwPaM& rPam )
     // Do not delete it, it will be inserted again.
     SwPosition * pPos = rPam.End();
     sal_Int32 nBlnkPos = pPos->nContent.GetIndex();
-    SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-    if (nBlnkPos && nBlnkPos-- < pTxtNd->GetTxt().getLength() &&
-        (' ' == pTxtNd->GetTxt()[nBlnkPos]))
+    SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+    if (nBlnkPos && nBlnkPos-- < pTextNd->GetText().getLength() &&
+        (' ' == pTextNd->GetText()[nBlnkPos]))
         --pPos->nContent;
     else
     {
         pPos = rPam.GetPoint() == pPos ? rPam.GetMark() : rPam.GetPoint();
         nBlnkPos = pPos->nContent.GetIndex();
-        pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-        if (nBlnkPos < pTxtNd->GetTxt().getLength() &&
-            (' ' == pTxtNd->GetTxt()[nBlnkPos]))
+        pTextNd = pPos->nNode.GetNode().GetTextNode();
+        if (nBlnkPos < pTextNd->GetText().getLength() &&
+            (' ' == pTextNd->GetText()[nBlnkPos]))
             ++pPos->nContent;
         else
             return false;
@@ -1015,28 +1015,28 @@ bool SwAutoFormat::HasSelBlanks( SwPaM& rPam )
     return true;
 }
 
-bool SwAutoFormat::HasBreakAttr( const SwTxtNode& rTxtNd )
+bool SwAutoFormat::HasBreakAttr( const SwTextNode& rTextNd )
 {
-    const SfxItemSet* pSet = rTxtNd.GetpSwAttrSet();
+    const SfxItemSet* pSet = rTextNd.GetpSwAttrSet();
     if( !pSet )
         return false;
 
     const SfxPoolItem* pItem;
     if( SfxItemState::SET == pSet->GetItemState( RES_BREAK, false, &pItem )
-        && SVX_BREAK_NONE != static_cast<const SvxFmtBreakItem*>(pItem)->GetBreak() )
+        && SVX_BREAK_NONE != static_cast<const SvxFormatBreakItem*>(pItem)->GetBreak() )
         return true;
 
     if( SfxItemState::SET == pSet->GetItemState( RES_PAGEDESC, false, &pItem )
-        && static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc()
-        && nsUseOnPage::PD_NONE != static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc()->GetUseOn() )
+        && static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc()
+        && nsUseOnPage::PD_NONE != static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc()->GetUseOn() )
         return true;
     return false;
 }
 
 /// Is there a dot at the end?
-bool SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd )
+bool SwAutoFormat::IsSentenceAtEnd( const SwTextNode& rTextNd )
 {
-    const OUString& rStr = rTxtNd.GetTxt();
+    const OUString& rStr = rTextNd.GetText();
     sal_Int32 n = rStr.getLength();
     if( !n )
         return true;
@@ -1049,27 +1049,27 @@ bool SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd )
 /// Delete beginning and/or end in a node
 void SwAutoFormat::DeleteCurrentParagraph( bool bStart, bool bEnd )
 {
-    if( m_aFlags.bAFmtByInput
-        ? m_aFlags.bAFmtByInpDelSpacesAtSttEnd
-        : m_aFlags.bAFmtDelSpacesAtSttEnd )
+    if( m_aFlags.bAFormatByInput
+        ? m_aFlags.bAFormatByInpDelSpacesAtSttEnd
+        : m_aFlags.bAFormatDelSpacesAtSttEnd )
     {
         // delete blanks at the end of the current and at the beginning of the next one
         m_aDelPam.DeleteMark();
         m_aDelPam.GetPoint()->nNode = m_aNdIdx;
         sal_Int32 nPos(0);
-        if( bStart && 0 != ( nPos = GetLeadingBlanks( m_pCurTxtNd->GetTxt() )))
+        if( bStart && 0 != ( nPos = GetLeadingBlanks( m_pCurTextNd->GetText() )))
         {
-            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
             m_aDelPam.SetMark();
             m_aDelPam.GetPoint()->nContent = nPos;
             DeleteSel( m_aDelPam );
             m_aDelPam.DeleteMark();
         }
-        if (bEnd && m_pCurTxtNd->GetTxt().getLength() !=
-                    ( nPos = GetTrailingBlanks( m_pCurTxtNd->GetTxt() )) )
+        if (bEnd && m_pCurTextNd->GetText().getLength() !=
+                    ( nPos = GetTrailingBlanks( m_pCurTextNd->GetText() )) )
         {
             m_aDelPam.GetPoint()->nContent.Assign(
-                    m_pCurTxtNd, m_pCurTxtNd->GetTxt().getLength());
+                    m_pCurTextNd, m_pCurTextNd->GetText().getLength());
             m_aDelPam.SetMark();
             m_aDelPam.GetPoint()->nContent = nPos;
             DeleteSel( m_aDelPam );
@@ -1084,7 +1084,7 @@ void SwAutoFormat::DeleteSel( SwPaM& rDelPam )
     {
         // Add to Shell-Cursor-Ring so that DelPam will be moved as well!
         SwPaM* pShCrsr = m_pEditShell->_GetCrsr();
-        SwPaM aTmp( *m_pCurTxtNd, 0, pShCrsr );
+        SwPaM aTmp( *m_pCurTextNd, 0, pShCrsr );
 
         SwPaM* pPrev = rDelPam.GetPrev();
         rDelPam.GetRingContainer().merge( pShCrsr->GetRingContainer() );
@@ -1101,7 +1101,7 @@ void SwAutoFormat::DeleteSel( SwPaM& rDelPam )
         } while( p != pPrev );
 
         m_aNdIdx = aTmp.GetPoint()->nNode;
-        m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
+        m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
     }
     else
         m_pEditShell->DeleteSel( rDelPam );
@@ -1112,17 +1112,17 @@ bool SwAutoFormat::DeleteCurNxtPara( const OUString& rNxtPara )
     // delete blanks at the end of the current and at the beginning of the next one
     m_aDelPam.DeleteMark();
     m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd,
-                    GetTrailingBlanks( m_pCurTxtNd->GetTxt() ) );
+    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd,
+                    GetTrailingBlanks( m_pCurTextNd->GetText() ) );
     m_aDelPam.SetMark();
 
     ++m_aDelPam.GetPoint()->nNode;
-    SwTxtNode* pTNd = m_aDelPam.GetNode().GetTxtNode();
+    SwTextNode* pTNd = m_aDelPam.GetNode().GetTextNode();
     if( !pTNd )
     {
         // then delete only up to end of the paragraph
         --m_aDelPam.GetPoint()->nNode;
-        m_aDelPam.GetPoint()->nContent = m_pCurTxtNd->GetTxt().getLength();
+        m_aDelPam.GetPoint()->nContent = m_pCurTextNd->GetText().getLength();
     }
     else
         m_aDelPam.GetPoint()->nContent.Assign( pTNd,
@@ -1141,24 +1141,24 @@ bool SwAutoFormat::DeleteCurNxtPara( const OUString& rNxtPara )
 
 void SwAutoFormat::DelEmptyLine( bool bTstNextPara )
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_DEL_EMPTY_PARA );
+    SetRedlineText( STR_AUTOFMTREDL_DEL_EMPTY_PARA );
     // delete blanks in empty paragraph
     m_aDelPam.DeleteMark();
     m_aDelPam.GetPoint()->nNode = m_aNdIdx;
     m_aDelPam.GetPoint()->nContent.Assign(
-            m_pCurTxtNd, m_pCurTxtNd->GetTxt().getLength() );
+            m_pCurTextNd, m_pCurTextNd->GetText().getLength() );
     m_aDelPam.SetMark();
 
     --m_aDelPam.GetMark()->nNode;
-    SwTxtNode* pTNd = m_aDelPam.GetNode( false ).GetTxtNode();
+    SwTextNode* pTNd = m_aDelPam.GetNode( false ).GetTextNode();
     if( pTNd )
         // first use the previous text node
-        m_aDelPam.GetMark()->nContent.Assign(pTNd, pTNd->GetTxt().getLength());
+        m_aDelPam.GetMark()->nContent.Assign(pTNd, pTNd->GetText().getLength());
     else if( bTstNextPara )
     {
         // then try the next (at the beginning of a Doc, table cells, borders, ...)
         m_aDelPam.GetMark()->nNode += 2;
-        pTNd = m_aDelPam.GetNode( false ).GetTxtNode();
+        pTNd = m_aDelPam.GetNode( false ).GetTextNode();
         if( pTNd )
         {
             m_aDelPam.GetMark()->nContent.Assign( pTNd, 0 );
@@ -1169,28 +1169,28 @@ void SwAutoFormat::DelEmptyLine( bool bTstNextPara )
     {
         m_aDelPam.GetMark()->nNode = m_aNdIdx;
         m_aDelPam.GetMark()->nContent = 0;
-        pTNd = m_pCurTxtNd;
+        pTNd = m_pCurTextNd;
     }
     if( pTNd )
         DeleteSel( m_aDelPam );
 
     m_aDelPam.DeleteMark();
-    ClearRedlineTxt();
+    ClearRedlineText();
 }
 
 void SwAutoFormat::DelMoreLinesBlanks( bool bWithLineBreaks )
 {
-    if( m_aFlags.bAFmtByInput
-        ? m_aFlags.bAFmtByInpDelSpacesBetweenLines
-        : m_aFlags.bAFmtDelSpacesBetweenLines )
+    if( m_aFlags.bAFormatByInput
+        ? m_aFlags.bAFormatByInpDelSpacesBetweenLines
+        : m_aFlags.bAFormatDelSpacesBetweenLines )
     {
         // delete all blanks on the left and right of the indentation
         m_aDelPam.DeleteMark();
         m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-        m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+        m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
 
-        SwTxtFrmInfo aFInfo( m_pCurTxtFrm );
-        aFInfo.GetSpaces( m_aDelPam, !m_aFlags.bAFmtByInput || bWithLineBreaks );
+        SwTextFrmInfo aFInfo( m_pCurTextFrm );
+        aFInfo.GetSpaces( m_aDelPam, !m_aFlags.bAFormatByInput || bWithLineBreaks );
 
         do {
             SwPaM* pNxt = m_aDelPam.GetNext();
@@ -1218,15 +1218,15 @@ void SwAutoFormat::DelPrevPara()
 {
     m_aDelPam.DeleteMark();
     m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
     m_aDelPam.SetMark();
 
     --m_aDelPam.GetPoint()->nNode;
-    SwTxtNode* pTNd = m_aDelPam.GetNode().GetTxtNode();
+    SwTextNode* pTNd = m_aDelPam.GetNode().GetTextNode();
     if( pTNd )
     {
         // use the previous text node first
-        m_aDelPam.GetPoint()->nContent.Assign(pTNd, pTNd->GetTxt().getLength());
+        m_aDelPam.GetPoint()->nContent.Assign(pTNd, pTNd->GetText().getLength());
         DeleteSel( m_aDelPam );
     }
     m_aDelPam.DeleteMark();
@@ -1234,28 +1234,28 @@ void SwAutoFormat::DelPrevPara()
 
 void SwAutoFormat::BuildIndent()
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_INDENT );
+    SetRedlineText( STR_AUTOFMTREDL_SET_TMPL_INDENT );
 
     // read all succeeding paragraphs that belong to this indentation
     bool bBreak = true;
     if( m_bMoreLines )
         DelMoreLinesBlanks( true );
     else
-        bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
-                IsBlanksInString( *m_pCurTxtNd ) ||
-                IsSentenceAtEnd( *m_pCurTxtNd );
+        bBreak = !IsFastFullLine( *m_pCurTextNd ) ||
+                IsBlanksInString( *m_pCurTextNd ) ||
+                IsSentenceAtEnd( *m_pCurTextNd );
     SetColl( RES_POOLCOLL_TEXT_IDENT );
     if( !bBreak )
     {
-        SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
-        const SwTxtNode* pNxtNd = GetNextNode();
+        SetRedlineText( STR_AUTOFMTREDL_DEL_MORELINES );
+        const SwTextNode* pNxtNd = GetNextNode();
         if( pNxtNd && !m_bEnd )
         {
             do {
                 bBreak = !IsFastFullLine( *pNxtNd ) ||
                         IsBlanksInString( *pNxtNd ) ||
                         IsSentenceAtEnd( *pNxtNd );
-                if( DeleteCurNxtPara( pNxtNd->GetTxt() ))
+                if( DeleteCurNxtPara( pNxtNd->GetText() ))
                 {
                     m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, OUString(' ') );
                 }
@@ -1272,30 +1272,30 @@ void SwAutoFormat::BuildIndent()
 
 void SwAutoFormat::BuildTextIndent()
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_TEXT_INDENT);
+    SetRedlineText( STR_AUTOFMTREDL_SET_TMPL_TEXT_INDENT);
     // read all succeeding paragraphs that belong to this indentation
     bool bBreak = true;
     if( m_bMoreLines )
         DelMoreLinesBlanks( true );
     else
-        bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
-                    IsBlanksInString( *m_pCurTxtNd ) ||
-                    IsSentenceAtEnd( *m_pCurTxtNd );
+        bBreak = !IsFastFullLine( *m_pCurTextNd ) ||
+                    IsBlanksInString( *m_pCurTextNd ) ||
+                    IsSentenceAtEnd( *m_pCurTextNd );
 
-    if( m_aFlags.bAFmtByInput )
-        m_pCurTxtNd->SetAutoFmtLvl( (sal_uInt8)CalcLevel( *m_pCurTxtNd ) );
+    if( m_aFlags.bAFormatByInput )
+        m_pCurTextNd->SetAutoFormatLvl( (sal_uInt8)CalcLevel( *m_pCurTextNd ) );
 
     SetColl( RES_POOLCOLL_TEXT_MOVE );
     if( !bBreak )
     {
-        SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
-        const SwTxtNode* pNxtNd = GetNextNode();
+        SetRedlineText( STR_AUTOFMTREDL_DEL_MORELINES );
+        const SwTextNode* pNxtNd = GetNextNode();
         while(  CanJoin( pNxtNd ) &&
                 CalcLevel( *pNxtNd ) )
         {
             bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
                     IsSentenceAtEnd( *pNxtNd );
-            if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
+            if( DeleteCurNxtPara( pNxtNd->GetText() ) )
             {
                 m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, OUString(' ') );
             }
@@ -1310,32 +1310,32 @@ void SwAutoFormat::BuildTextIndent()
 
 void SwAutoFormat::BuildText()
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_TEXT );
+    SetRedlineText( STR_AUTOFMTREDL_SET_TMPL_TEXT );
     // read all succeeding paragraphs that belong to this text without indentation
     bool bBreak = true;
     if( m_bMoreLines )
         DelMoreLinesBlanks();
     else
-        bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
-                    IsBlanksInString( *m_pCurTxtNd ) ||
-                    IsSentenceAtEnd( *m_pCurTxtNd );
+        bBreak = !IsFastFullLine( *m_pCurTextNd ) ||
+                    IsBlanksInString( *m_pCurTextNd ) ||
+                    IsSentenceAtEnd( *m_pCurTextNd );
     SetColl( RES_POOLCOLL_TEXT, true );
     if( !bBreak )
     {
-        SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
-        const SwTxtNode* pNxtNd = GetNextNode();
+        SetRedlineText( STR_AUTOFMTREDL_DEL_MORELINES );
+        const SwTextNode* pNxtNd = GetNextNode();
         while(  CanJoin( pNxtNd ) &&
                 !CalcLevel( *pNxtNd ) )
         {
             bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
                     IsSentenceAtEnd( *pNxtNd );
-            if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
+            if( DeleteCurNxtPara( pNxtNd->GetText() ) )
             {
                 m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, OUString(' ') );
             }
             if( bBreak )
                 break;
-            const SwTxtNode* pCurrNode = pNxtNd;
+            const SwTextNode* pCurrNode = pNxtNd;
             pNxtNd = GetNextNode();
             if(!pNxtNd || pCurrNode == pNxtNd)
                 break;
@@ -1347,32 +1347,32 @@ void SwAutoFormat::BuildText()
 
 void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_SET_NUMBULET );
+    SetRedlineText( STR_AUTOFMTREDL_SET_NUMBULET );
 
     bool bBreak = true;
 
     // first, determine current indentation and frame width
-    SwTwips nFrmWidth = m_pCurTxtFrm->Prt().Width();;
-    SwTwips nLeftTxtPos;
+    SwTwips nFrmWidth = m_pCurTextFrm->Prt().Width();;
+    SwTwips nLeftTextPos;
     {
         sal_Int32 nPos(0);
-        while (nPos < m_pCurTxtNd->GetTxt().getLength() &&
-               IsSpace(m_pCurTxtNd->GetTxt()[nPos]))
+        while (nPos < m_pCurTextNd->GetText().getLength() &&
+               IsSpace(m_pCurTextNd->GetText()[nPos]))
         {
             ++nPos;
         }
 
-        SwTxtFrmInfo aInfo( m_pCurTxtFrm );
-        nLeftTxtPos = aInfo.GetCharPos(nPos);
-        nLeftTxtPos -= m_pCurTxtNd->GetSwAttrSet().GetLRSpace().GetLeft();
+        SwTextFrmInfo aInfo( m_pCurTextFrm );
+        nLeftTextPos = aInfo.GetCharPos(nPos);
+        nLeftTextPos -= m_pCurTextNd->GetSwAttrSet().GetLRSpace().GetLeft();
     }
 
     if( m_bMoreLines )
         DelMoreLinesBlanks();
     else
-        bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
-                    IsBlanksInString( *m_pCurTxtNd ) ||
-                    IsSentenceAtEnd( *m_pCurTxtNd );
+        bBreak = !IsFastFullLine( *m_pCurTextNd ) ||
+                    IsBlanksInString( *m_pCurTextNd ) ||
+                    IsSentenceAtEnd( *m_pCurTextNd );
     bool bRTL = m_pEditShell->IsInRightToLeftText();
     DeleteCurrentParagraph( true, true );
 
@@ -1385,27 +1385,27 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
                      numfunc::GetDefaultPositionAndSpaceMode() );
 
     const SwNumRule* pCur = 0;
-    if( m_aFlags.bSetNumRule && 0 != (pCur = m_pCurTxtNd->GetNumRule()) )
+    if( m_aFlags.bSetNumRule && 0 != (pCur = m_pCurTextNd->GetNumRule()) )
         aRule = *pCur;
 
     // replace bullet character with defined one
-    const OUString& rStr = m_pCurTxtNd->GetTxt();
-    sal_Int32 nTxtStt = 0;
+    const OUString& rStr = m_pCurTextNd->GetText();
+    sal_Int32 nTextStt = 0;
     const sal_Unicode* pFndBulletChr;
     if( m_aFlags.bChgEnumNum &&
         2 < rStr.getLength() &&
-        0 != ( pFndBulletChr = StrChr( pBulletChar, rStr[ nTxtStt ] ))
-        && IsSpace( rStr[ nTxtStt + 1 ] ) )
+        0 != ( pFndBulletChr = StrChr( pBulletChar, rStr[ nTextStt ] ))
+        && IsSpace( rStr[ nTextStt + 1 ] ) )
     {
-        if( m_aFlags.bAFmtByInput )
+        if( m_aFlags.bAFormatByInput )
         {
             if( m_aFlags.bSetNumRule )
             {
-                SwCharFmt* pCFmt = m_pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
+                SwCharFormat* pCFormat = m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
                                             RES_POOLCHR_BUL_LEVEL );
                 bChgBullet = true;
                 // Was the format already somewhere adjusted?
-                if( !aRule.GetNumFmt( nLvl ) )
+                if( !aRule.GetNumFormat( nLvl ) )
                 {
                     int nBulletPos = pFndBulletChr - pBulletChar;
                     sal_Unicode cBullChar;
@@ -1430,29 +1430,29 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
 
                     sal_uInt16 nAbsPos = lBullIndent;
                     sal_uInt16 nSpaceSteps = nLvl
-                                            ? sal_uInt16(nLeftTxtPos / nLvl)
+                                            ? sal_uInt16(nLeftTextPos / nLvl)
                                             : lBullIndent;
                     for( sal_uInt8 n = 0; n < MAXLEVEL; ++n, nAbsPos = nAbsPos + nSpaceSteps )
                     {
-                        SwNumFmt aFmt( aRule.Get( n ) );
-                        aFmt.SetBulletFont( pBullFnt );
-                        aFmt.SetBulletChar( cBullChar );
-                        aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+                        SwNumFormat aFormat( aRule.Get( n ) );
+                        aFormat.SetBulletFont( pBullFnt );
+                        aFormat.SetBulletChar( cBullChar );
+                        aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
                         // #i93908# clear suffix for bullet lists
-                        aFmt.SetPrefix(OUString());
-                        aFmt.SetSuffix(OUString());
-                        aFmt.SetFirstLineOffset( lBullFirstLineOffset );
-                        aFmt.SetAbsLSpace( nAbsPos );
-                        if( !aFmt.GetCharFmt() )
-                            aFmt.SetCharFmt( pCFmt );
+                        aFormat.SetPrefix(OUString());
+                        aFormat.SetSuffix(OUString());
+                        aFormat.SetFirstLineOffset( lBullFirstLineOffset );
+                        aFormat.SetAbsLSpace( nAbsPos );
+                        if( !aFormat.GetCharFormat() )
+                            aFormat.SetCharFormat( pCFormat );
                         if( bRTL )
-                            aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
+                            aFormat.SetNumAdjust( SVX_ADJUST_RIGHT );
 
-                        aRule.Set( n, aFmt );
+                        aRule.Set( n, aFormat );
 
                         if( n == nLvl &&
                             nFrmWidth < ( nSpaceSteps * MAXLEVEL ) )
-                            nSpaceSteps = static_cast<sal_uInt16>(( nFrmWidth - nLeftTxtPos ) /
+                            nSpaceSteps = static_cast<sal_uInt16>(( nFrmWidth - nLeftTextPos ) /
                                                 ( MAXLEVEL - nLvl ));
                     }
                 }
@@ -1472,14 +1472,14 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
         //             it is determined by the indentation level.
 
         OUString aPostfix, aPrefix, aNumTypes;
-        if( USHRT_MAX != ( nDigitLevel = GetDigitLevel( *m_pCurTxtNd, nTxtStt,
+        if( USHRT_MAX != ( nDigitLevel = GetDigitLevel( *m_pCurTextNd, nTextStt,
                                         &aPrefix, &aPostfix, &aNumTypes )) )
         {
             bChgEnum = true;
 
             // Level 0 and Indentation, determine level by left indentation and default NumIndent
-            if( !nDigitLevel && nLeftTxtPos )
-                nLvl = std::min( sal_uInt16( nLeftTxtPos / lNumIndent ),
+            if( !nDigitLevel && nLeftTextPos )
+                nLvl = std::min( sal_uInt16( nLeftTextPos / lNumIndent ),
                             sal_uInt16( MAXLEVEL - 1 ) );
             else
                 nLvl = nDigitLevel;
@@ -1489,73 +1489,73 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
         {
             if( !pCur )         // adjust NumRule if it is new
             {
-                SwCharFmt* pCFmt = m_pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
+                SwCharFormat* pCFormat = m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
                                             RES_POOLCHR_NUM_LEVEL );
                 if( !nDigitLevel )
                 {
-                    SwNumFmt aFmt( aRule.Get( nLvl ) );
-                    aFmt.SetStart( static_cast<sal_uInt16>(aPrefix.getToken( 1,
+                    SwNumFormat aFormat( aRule.Get( nLvl ) );
+                    aFormat.SetStart( static_cast<sal_uInt16>(aPrefix.getToken( 1,
                                             (sal_Unicode)1 ).toInt32()));
-                    aFmt.SetPrefix( aPrefix.getToken( 0, (sal_Unicode)1 ));
-                    aFmt.SetSuffix( aPostfix.getToken( 0, (sal_Unicode)1 ));
-                    aFmt.SetIncludeUpperLevels( 0 );
+                    aFormat.SetPrefix( aPrefix.getToken( 0, (sal_Unicode)1 ));
+                    aFormat.SetSuffix( aPostfix.getToken( 0, (sal_Unicode)1 ));
+                    aFormat.SetIncludeUpperLevels( 0 );
 
-                    if( !aFmt.GetCharFmt() )
-                        aFmt.SetCharFmt( pCFmt );
+                    if( !aFormat.GetCharFormat() )
+                        aFormat.SetCharFormat( pCFormat );
 
                     if( !aNumTypes.isEmpty() )
-                        aFmt.SetNumberingType(aNumTypes[ 0 ] - '0');
+                        aFormat.SetNumberingType(aNumTypes[ 0 ] - '0');
 
                     if( bRTL )
-                        aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
-                    aRule.Set( nLvl, aFmt );
+                        aFormat.SetNumAdjust( SVX_ADJUST_RIGHT );
+                    aRule.Set( nLvl, aFormat );
                 }
                 else
                 {
-                    sal_uInt16 nSpaceSteps = nLvl ? sal_uInt16(nLeftTxtPos / nLvl) : 0;
+                    sal_uInt16 nSpaceSteps = nLvl ? sal_uInt16(nLeftTextPos / nLvl) : 0;
                     sal_uInt8 n;
                     for( n = 0; n <= nLvl; ++n )
                     {
-                        SwNumFmt aFmt( aRule.Get( n ) );
+                        SwNumFormat aFormat( aRule.Get( n ) );
 
-                        aFmt.SetStart( static_cast<sal_uInt16>(aPrefix.getToken( n+1,
+                        aFormat.SetStart( static_cast<sal_uInt16>(aPrefix.getToken( n+1,
                                                     (sal_Unicode)1 ).toInt32() ));
                         if( !n )
-                            aFmt.SetPrefix( aPrefix.getToken( n, (sal_Unicode)1 ));
-                        aFmt.SetSuffix( aPostfix.getToken( n, (sal_Unicode)1 ));
-                        aFmt.SetIncludeUpperLevels( MAXLEVEL );
+                            aFormat.SetPrefix( aPrefix.getToken( n, (sal_Unicode)1 ));
+                        aFormat.SetSuffix( aPostfix.getToken( n, (sal_Unicode)1 ));
+                        aFormat.SetIncludeUpperLevels( MAXLEVEL );
                         if( n < aNumTypes.getLength() )
-                            aFmt.SetNumberingType((aNumTypes[ n ] - '0'));
+                            aFormat.SetNumberingType((aNumTypes[ n ] - '0'));
 
-                        aFmt.SetAbsLSpace( sal_uInt16( nSpaceSteps * n )
+                        aFormat.SetAbsLSpace( sal_uInt16( nSpaceSteps * n )
                                             + lNumIndent );
 
-                        if( !aFmt.GetCharFmt() )
-                            aFmt.SetCharFmt( pCFmt );
+                        if( !aFormat.GetCharFormat() )
+                            aFormat.SetCharFormat( pCFormat );
                         if( bRTL )
-                            aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
+                            aFormat.SetNumAdjust( SVX_ADJUST_RIGHT );
 
-                        aRule.Set( n, aFmt );
+                        aRule.Set( n, aFormat );
                     }
 
                     // Does it fit completely into the frame?
                     bool bDefStep = nFrmWidth < (nSpaceSteps * MAXLEVEL);
                     for( ; n < MAXLEVEL; ++n )
                     {
-                        SwNumFmt aFmt( aRule.Get( n ) );
-                        aFmt.SetIncludeUpperLevels( MAXLEVEL );
+                        SwNumFormat aFormat( aRule.Get( n ) );
+                        aFormat.SetIncludeUpperLevels( MAXLEVEL );
                         if( bDefStep )
-                            aFmt.SetAbsLSpace( sal_uInt16( (nLeftTxtPos +
+                            aFormat.SetAbsLSpace( sal_uInt16( (nLeftTextPos +
                                 SwNumRule::GetNumIndent(static_cast<sal_uInt8>(n-nLvl)))));
                         else
-                            aFmt.SetAbsLSpace( sal_uInt16( nSpaceSteps * n )
+                            aFormat.SetAbsLSpace( sal_uInt16( nSpaceSteps * n )
                                                 + lNumIndent );
-                        aRule.Set( n, aFmt );
+                        aRule.Set( n, aFormat );
                     }
                 }
             }
         }
-        else if( !m_aFlags.bAFmtByInput )
+        else if( !m_aFlags.bAFormatByInput )
             SetColl( static_cast<sal_uInt16>(RES_POOLCOLL_NUM_LEVEL1 + ( std::min( nLvl, cnNumBullColls ) * 4 ) ));
         else
             bChgEnum = false;
@@ -1568,34 +1568,34 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
 
         if( m_aFlags.bSetNumRule )
         {
-            if( m_aFlags.bAFmtByInput )
+            if( m_aFlags.bAFormatByInput )
             {
                 m_aDelPam.SetMark();
                 ++m_aDelPam.GetMark()->nNode;
-                m_aDelPam.GetNode(false).GetTxtNode()->SetAttrListLevel( nLvl );
+                m_aDelPam.GetNode(false).GetTextNode()->SetAttrListLevel( nLvl );
             }
 
-            m_pCurTxtNd->SetAttrListLevel(nLvl);
-            m_pCurTxtNd->SetNumLSpace( true );
+            m_pCurTextNd->SetAttrListLevel(nLvl);
+            m_pCurTextNd->SetNumLSpace( true );
 
             // start new list
             m_pDoc->SetNumRule( m_aDelPam, aRule, true );
             m_aDelPam.DeleteMark();
 
-            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
         }
         else
-            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd,
-                        bChgEnum ? nTxtStt : 0 );
+            m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd,
+                        bChgEnum ? nTextStt : 0 );
         m_aDelPam.SetMark();
 
         if ( bChgBullet )
-            nTxtStt += 2;
+            nTextStt += 2;
 
-        while( nTxtStt < rStr.getLength() && IsSpace( rStr[ nTxtStt ] ))
-            nTxtStt++;
+        while( nTextStt < rStr.getLength() && IsSpace( rStr[ nTextStt ] ))
+            nTextStt++;
 
-        m_aDelPam.GetPoint()->nContent = nTxtStt;
+        m_aDelPam.GetPoint()->nContent = nTextStt;
         DeleteSel( m_aDelPam );
 
         if( !m_aFlags.bSetNumRule )
@@ -1605,7 +1605,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
                 sChgStr = OUString( m_aFlags.cBullet ) + sChgStr;
             m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, sChgStr );
 
-            SfxItemSet aSet( m_pDoc->GetAttrPool(), aTxtNodeSetRange );
+            SfxItemSet aSet( m_pDoc->GetAttrPool(), aTextNodeSetRange );
             if( bChgBullet )
             {
                 m_aDelPam.GetPoint()->nContent = 0;
@@ -1618,7 +1618,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
                                   m_aFlags.aBulletFont.GetPitch(),
                                   m_aFlags.aBulletFont.GetCharSet(),
                                   RES_CHRATR_FONT ) );
-                m_pDoc->SetFmtItemByAutoFmt( m_aDelPam, aSet );
+                m_pDoc->SetFormatItemByAutoFormat( m_aDelPam, aSet );
                 m_aDelPam.DeleteMark();
                 nAutoCorrPos = 2;
                 aSet.ClearItem();
@@ -1626,7 +1626,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
             SvxTabStopItem aTStops( RES_PARATR_TABSTOP );
             aTStops.Insert( SvxTabStop( 0 ) );
             aSet.Put( aTStops );
-            m_pDoc->SetFmtItemByAutoFmt( m_aDelPam, aSet );
+            m_pDoc->SetFormatItemByAutoFormat( m_aDelPam, aSet );
         }
     }
 
@@ -1636,20 +1636,20 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
         return;
     }
 
-    const SwTxtNode* pNxtNd = GetNextNode();
+    const SwTextNode* pNxtNd = GetNextNode();
     while( CanJoin( pNxtNd ) &&
             nLvl == CalcLevel( *pNxtNd ) )
     {
-        SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
+        SetRedlineText( STR_AUTOFMTREDL_DEL_MORELINES );
         bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
                 IsSentenceAtEnd( *pNxtNd );
-        if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
+        if( DeleteCurNxtPara( pNxtNd->GetText() ) )
         {
             m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, OUString(' ') );
         }
         if( bBreak )
             break;
-        const SwTxtNode* pCurrNode = pNxtNd;
+        const SwTextNode* pCurrNode = pNxtNd;
         pNxtNd = GetNextNode();
         if(!pNxtNd || pCurrNode == pNxtNd)
             break;
@@ -1660,27 +1660,27 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
 
 void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
 {
-    SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT );
+    SetRedlineText( STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT );
     // Test of contraposition (n words, divided by spaces/tabs, with same indentation in 2nd line)
 
     // read all succeeding paragraphs that belong to this enumeration
     bool bBreak = true;
     sal_Int32 nSpacePos = 0;
-    const sal_Int32 nTxtPos = GetBigIndent( nSpacePos );
+    const sal_Int32 nTextPos = GetBigIndent( nSpacePos );
     if( m_bMoreLines )
         DelMoreLinesBlanks( true );
     else
-        bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
-                    ( !nTxtPos && IsBlanksInString( *m_pCurTxtNd )) ||
-                    IsSentenceAtEnd( *m_pCurTxtNd );
+        bBreak = !IsFastFullLine( *m_pCurTextNd ) ||
+                    ( !nTextPos && IsBlanksInString( *m_pCurTextNd )) ||
+                    IsSentenceAtEnd( *m_pCurTextNd );
 
-    SetColl( static_cast<sal_uInt16>( nTxtPos
+    SetColl( static_cast<sal_uInt16>( nTextPos
                 ? RES_POOLCOLL_CONFRONTATION
                 : RES_POOLCOLL_TEXT_NEGIDENT ) );
 
-    if( nTxtPos )
+    if( nTextPos )
     {
-        const OUString& rStr = m_pCurTxtNd->GetTxt();
+        const OUString& rStr = m_pCurTextNd->GetText();
         bool bInsTab = true;
 
         if ('\t' == rStr[nSpacePos+1]) // leave tab alone
@@ -1702,7 +1702,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
 
         m_aDelPam.DeleteMark();
         m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-        m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, nSpacePos );
+        m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, nSpacePos );
 
         // delete old Spaces, etc.
         if( nSpaceStt < nSpacePos )
@@ -1719,9 +1719,9 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
 
     if( !bBreak )
     {
-        SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
-        SwTxtFrmInfo aFInfo( m_pCurTxtFrm );
-        const SwTxtNode* pNxtNd = GetNextNode();
+        SetRedlineText( STR_AUTOFMTREDL_DEL_MORELINES );
+        SwTextFrmInfo aFInfo( m_pCurTextFrm );
+        const SwTextNode* pNxtNd = GetNextNode();
         while(  CanJoin( pNxtNd ) &&
                 20 < std::abs( (long)(nSpaces - aFInfo.SetFrm(
                                 GetFrm( *pNxtNd ) ).GetLineStart() ))
@@ -1730,7 +1730,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
             bBreak = !IsFastFullLine( *pNxtNd ) ||
                     IsBlanksInString( *pNxtNd ) ||
                     IsSentenceAtEnd( *pNxtNd );
-            if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
+            if( DeleteCurNxtPara( pNxtNd->GetText() ) )
             {
                 m_pDoc->getIDocumentContentOperations().InsertString( m_aDelPam, OUString(' ') );
             }
@@ -1747,16 +1747,16 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
 {
     if( m_aFlags.bWithRedlining )
     {
-        OUString sTxt(SwViewShell::GetShellRes()->GetAutoFmtNameLst()[
+        OUString sText(SwViewShell::GetShellRes()->GetAutoFormatNameLst()[
                                     STR_AUTOFMTREDL_SET_TMPL_HEADLINE ] );
-        sTxt = sTxt.replaceAll( "$(ARG1)", OUString::number( nLvl + 1 ) );
-        m_pDoc->GetDocumentRedlineManager().SetAutoFmtRedlineComment( &sTxt );
+        sText = sText.replaceAll( "$(ARG1)", OUString::number( nLvl + 1 ) );
+        m_pDoc->GetDocumentRedlineManager().SetAutoFormatRedlineComment( &sText );
     }
 
     SetColl( static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + nLvl ), true );
-    if( m_aFlags.bAFmtByInput )
+    if( m_aFlags.bAFormatByInput )
     {
-        SwTxtFmtColl& rNxtColl = m_pCurTxtNd->GetTxtColl()->GetNextTxtFmtColl();
+        SwTextFormatColl& rNxtColl = m_pCurTextNd->GetTextColl()->GetNextTextFormatColl();
 
         DelPrevPara();
 
@@ -1765,8 +1765,8 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
 
         m_aDelPam.DeleteMark();
         m_aDelPam.GetPoint()->nNode = m_aNdIdx.GetIndex() + 1;
-        m_aDelPam.GetPoint()->nContent.Assign( m_aDelPam.GetCntntNode(), 0 );
-        m_pDoc->SetTxtFmtColl( m_aDelPam, &rNxtColl );
+        m_aDelPam.GetPoint()->nContent.Assign( m_aDelPam.GetContentNode(), 0 );
+        m_pDoc->SetTextFormatColl( m_aDelPam, &rNxtColl );
     }
     else
     {
@@ -1783,7 +1783,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
     bool bReplaceQuote = ( aSvxFlags & ChgQuotes ) > 0;
     bool bReplaceSglQuote = ( aSvxFlags & ChgSglQuotes ) > 0;
 
-    if( m_aFlags.bAFmtByInput ||
+    if( m_aFlags.bAFormatByInput ||
         (!m_aFlags.bAutoCorrect && !bReplaceQuote && !bReplaceSglQuote &&
         !m_aFlags.bCptlSttSntnc && !m_aFlags.bCptlSttWrd &&
         !m_aFlags.bChgOrdinalNumber &&
@@ -1791,8 +1791,8 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
         !m_aFlags.bChgWeightUnderl && !m_aFlags.bAddNonBrkSpace) )
         return;
 
-    const OUString* pTxt = &m_pCurTxtNd->GetTxt();
-    if (nPos >= pTxt->getLength())
+    const OUString* pText = &m_pCurTextNd->GetText();
+    if (nPos >= pText->getLength())
         return;
 
     bool bGetLanguage = m_aFlags.bChgOrdinalNumber ||
@@ -1802,11 +1802,11 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
 
     m_aDelPam.DeleteMark();
     m_aDelPam.GetPoint()->nNode = m_aNdIdx;
-    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+    m_aDelPam.GetPoint()->nContent.Assign( m_pCurTextNd, 0 );
 
     SwAutoCorrDoc aACorrDoc( *m_pEditShell, m_aDelPam );
 
-    SwTxtFrmInfo aFInfo( 0 );
+    SwTextFrmInfo aFInfo( 0 );
 
     sal_Int32 nSttPos, nLastBlank = nPos;
     bool bFirst = m_aFlags.bCptlSttSntnc, bFirstSent = bFirst;
@@ -1815,22 +1815,22 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
     CharClass& rAppCC = GetAppCharClass();
 
     do {
-        while (nPos < pTxt->getLength() && IsSpace(cChar = (*pTxt)[nPos]))
+        while (nPos < pText->getLength() && IsSpace(cChar = (*pText)[nPos]))
             ++nPos;
-        if (nPos == pTxt->getLength())
+        if (nPos == pText->getLength())
             break;      // das wars
 
         if( ( ( bReplaceQuote && '\"' == cChar ) ||
               ( bReplaceSglQuote && '\'' == cChar ) ) &&
-            (!nPos || ' ' == (*pTxt)[nPos-1]))
+            (!nPos || ' ' == (*pText)[nPos-1]))
         {
 
             // beachte: Sonderfall Symbolfonts !!!
             if( !aFInfo.GetFrm() )
-                aFInfo.SetFrm( GetFrm( *m_pCurTxtNd ) );
+                aFInfo.SetFrm( GetFrm( *m_pCurTextNd ) );
             if( !aFInfo.IsBullet( nPos ))
             {
-                SetRedlineTxt( STR_AUTOFMTREDL_TYPO );
+                SetRedlineText( STR_AUTOFMTREDL_TYPO );
                 m_aDelPam.GetPoint()->nContent = nPos;
                 bool bSetHardBlank = false;
 
@@ -1849,8 +1849,8 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 if( m_aFlags.bWithRedlining )
                 {
                     m_aNdIdx = m_aDelPam.GetPoint()->nNode;
-                    m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-                    pTxt = &m_pCurTxtNd->GetTxt();
+                    m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
+                    pText = &m_pCurTextNd->GetText();
                     m_aDelPam.SetMark();
                     aFInfo.SetFrm( 0 );
                 }
@@ -1867,10 +1867,10 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
 
         bool bCallACorr = false;
         int bBreak = 0;
-        if (nPos && IsSpace((*pTxt)[nPos-1]))
+        if (nPos && IsSpace((*pText)[nPos-1]))
             nLastBlank = nPos;
-        for (nSttPos = nPos; !bBreak && nPos < pTxt->getLength(); ++nPos)
-            switch (cChar = (*pTxt)[nPos])
+        for (nSttPos = nPos; !bBreak && nPos < pText->getLength(); ++nPos)
+            switch (cChar = (*pText)[nPos])
             {
             case '\"':
             case '\'':
@@ -1878,10 +1878,10 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 {
                     // consider Symbolfonts!
                     if( !aFInfo.GetFrm() )
-                        aFInfo.SetFrm( GetFrm( *m_pCurTxtNd ) );
+                        aFInfo.SetFrm( GetFrm( *m_pCurTextNd ) );
                     if( !aFInfo.IsBullet( nPos ))
                     {
-                        SetRedlineTxt( STR_AUTOFMTREDL_TYPO );
+                        SetRedlineText( STR_AUTOFMTREDL_TYPO );
                         bool bSetHardBlank = false;
                         m_aDelPam.GetPoint()->nContent = nPos;
                         OUString sReplace( pATst->GetQuote( aACorrDoc,
@@ -1900,8 +1900,8 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                         if( m_aFlags.bWithRedlining )
                         {
                             m_aNdIdx = m_aDelPam.GetPoint()->nNode;
-                            m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-                            pTxt = &m_pCurTxtNd->GetTxt();
+                            m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
+                            pText = &m_pCurTextNd->GetText();
                             m_aDelPam.SetMark();
                             m_aDelPam.DeleteMark();
                             aFInfo.SetFrm( 0 );
@@ -1925,33 +1925,33 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 {
                     // consider Symbolfonts!
                     if( !aFInfo.GetFrm() )
-                        aFInfo.SetFrm( GetFrm( *m_pCurTxtNd ) );
+                        aFInfo.SetFrm( GetFrm( *m_pCurTextNd ) );
                     if( !aFInfo.IsBullet( nPos ))
                     {
-                        SetRedlineTxt( '*' == cChar
+                        SetRedlineText( '*' == cChar
                                             ? STR_AUTOFMTREDL_BOLD
                                             : STR_AUTOFMTREDL_UNDER );
 
-                        sal_Unicode cBlank = nSttPos ? (*pTxt)[nSttPos - 1] : 0;
+                        sal_Unicode cBlank = nSttPos ? (*pText)[nSttPos - 1] : 0;
                         m_aDelPam.GetPoint()->nContent = nPos;
 
-                        if( pATst->FnChgWeightUnderl( aACorrDoc, *pTxt,
+                        if( pATst->FnChgWeightUnderl( aACorrDoc, *pText,
                                                             nSttPos, nPos ))
                         {
                             if( m_aFlags.bWithRedlining )
                             {
                                 m_aNdIdx = m_aDelPam.GetPoint()->nNode;
-                                m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-                                pTxt = &m_pCurTxtNd->GetTxt();
+                                m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
+                                pText = &m_pCurTextNd->GetText();
                                 m_aDelPam.SetMark();
                                 m_aDelPam.DeleteMark();
                                 aFInfo.SetFrm( 0 );
                             }
-                            //#125102# in case of the mode REDLINE_SHOW_DELETE the ** are still contained in pTxt
+                            //#125102# in case of the mode REDLINE_SHOW_DELETE the ** are still contained in pText
                             if(0 == (m_pDoc->getIDocumentRedlineAccess().GetRedlineMode() & nsRedlineMode_t::REDLINE_SHOW_DELETE))
                                 nPos = m_aDelPam.GetPoint()->nContent.GetIndex() - 1;
                             // Was a character deleted before starting?
-                            if (cBlank && cBlank != (*pTxt)[nSttPos - 1])
+                            if (cBlank && cBlank != (*pText)[nSttPos - 1])
                                 --nSttPos;
                         }
                     }
@@ -1961,11 +1961,11 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 if ( m_aFlags.bAddNonBrkSpace )
                 {
                     LanguageType eLang = bGetLanguage
-                                           ? m_pCurTxtNd->GetLang( nSttPos )
+                                           ? m_pCurTextNd->GetLang( nSttPos )
                                            : LANGUAGE_SYSTEM;
 
-                    SetRedlineTxt( STR_AUTOFMTREDL_NON_BREAK_SPACE );
-                    if ( pATst->FnAddNonBrkSpace( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) )
+                    SetRedlineText( STR_AUTOFMTREDL_NON_BREAK_SPACE );
+                    if ( pATst->FnAddNonBrkSpace( aACorrDoc, *pText, nSttPos, nPos, eLang ) )
                         --nPos;
                 }
                 break;
@@ -1977,7 +1977,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                     bFirstSent = true;
                 /* fallthrough */
             default:
-                if( !( rAppCC.isLetterNumeric( *pTxt, nPos )
+                if( !( rAppCC.isLetterNumeric( *pText, nPos )
                         || '/' == cChar )) //  '/' should not be a word separator (e.g. '1/2' needs to be handled as one word for replacement)
                 {
                     --nPos;     // revert ++nPos which was decremented in for loop
@@ -1988,7 +1988,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
 
         if( nPos == nSttPos )
         {
-            if (++nPos == pTxt->getLength())
+            if (++nPos == pText->getLength())
                 bCallACorr = true;
         }
         else
@@ -1998,7 +1998,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
         {
             bCallACorr = false;
             m_aDelPam.GetPoint()->nContent = nPos;
-            SetRedlineTxt( STR_AUTOFMTREDL_USE_REPLACE );
+            SetRedlineText( STR_AUTOFMTREDL_USE_REPLACE );
             if( m_aFlags.bAutoCorrect &&
                 aACorrDoc.ChgAutoCorrWord( nSttPos, nPos, *pATst, 0 ) )
             {
@@ -2007,8 +2007,8 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 if( m_aFlags.bWithRedlining )
                 {
                     m_aNdIdx = m_aDelPam.GetPoint()->nNode;
-                    m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-                    pTxt = &m_pCurTxtNd->GetTxt();
+                    m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
+                    pText = &m_pCurTextNd->GetText();
                     m_aDelPam.SetMark();
                     m_aDelPam.DeleteMark();
                 }
@@ -2017,39 +2017,39 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
             }
 
             LanguageType eLang = bGetLanguage
-                                           ? m_pCurTxtNd->GetLang( nSttPos )
+                                           ? m_pCurTextNd->GetLang( nSttPos )
                                            : LANGUAGE_SYSTEM;
 
             if ( m_aFlags.bAddNonBrkSpace )
             {
-                SetRedlineTxt( STR_AUTOFMTREDL_NON_BREAK_SPACE );
-                pATst->FnAddNonBrkSpace( aACorrDoc, *pTxt, nSttPos, nPos, eLang );
+                SetRedlineText( STR_AUTOFMTREDL_NON_BREAK_SPACE );
+                pATst->FnAddNonBrkSpace( aACorrDoc, *pText, nSttPos, nPos, eLang );
             }
 
             if( ( m_aFlags.bChgOrdinalNumber &&
-                    SetRedlineTxt( STR_AUTOFMTREDL_ORDINAL ) &&
-                    pATst->FnChgOrdinalNumber( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) ) ||
+                    SetRedlineText( STR_AUTOFMTREDL_ORDINAL ) &&
+                    pATst->FnChgOrdinalNumber( aACorrDoc, *pText, nSttPos, nPos, eLang ) ) ||
                 ( m_aFlags.bChgToEnEmDash &&
-                    SetRedlineTxt( STR_AUTOFMTREDL_DASH ) &&
-                    pATst->FnChgToEnEmDash( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) ) ||
+                    SetRedlineText( STR_AUTOFMTREDL_DASH ) &&
+                    pATst->FnChgToEnEmDash( aACorrDoc, *pText, nSttPos, nPos, eLang ) ) ||
                 ( m_aFlags.bSetINetAttr &&
-                    (nPos == pTxt->getLength() || IsSpace((*pTxt)[nPos])) &&
-                    SetRedlineTxt( STR_AUTOFMTREDL_DETECT_URL ) &&
-                    pATst->FnSetINetAttr( aACorrDoc, *pTxt, nLastBlank, nPos, eLang ) ) )
+                    (nPos == pText->getLength() || IsSpace((*pText)[nPos])) &&
+                    SetRedlineText( STR_AUTOFMTREDL_DETECT_URL ) &&
+                    pATst->FnSetINetAttr( aACorrDoc, *pText, nLastBlank, nPos, eLang ) ) )
                     nPos = m_aDelPam.GetPoint()->nContent.GetIndex();
             else
             {
                 // two capital letters at the beginning of a word?
                 if( m_aFlags.bCptlSttWrd )
                 {
-                    SetRedlineTxt( STR_AUTOFMTREDL_CPTL_STT_WORD );
-                    pATst->FnCptlSttWrd( aACorrDoc, *pTxt, nSttPos, nPos, eLang );
+                    SetRedlineText( STR_AUTOFMTREDL_CPTL_STT_WORD );
+                    pATst->FnCptlSttWrd( aACorrDoc, *pText, nSttPos, nPos, eLang );
                 }
                 // capital letter at the beginning of a sentence?
                 if( m_aFlags.bCptlSttSntnc && bFirst )
                 {
-                    SetRedlineTxt( STR_AUTOFMTREDL_CPTL_STT_SENT );
-                    pATst->FnCptlSttSntnc( aACorrDoc, *pTxt, true, nSttPos, nPos, eLang);
+                    SetRedlineText( STR_AUTOFMTREDL_CPTL_STT_SENT );
+                    pATst->FnCptlSttSntnc( aACorrDoc, *pText, true, nSttPos, nPos, eLang);
                 }
 
                 bFirst = bFirstSent;
@@ -2058,18 +2058,18 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 if( m_aFlags.bWithRedlining )
                 {
                     m_aNdIdx = m_aDelPam.GetPoint()->nNode;
-                    m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-                    pTxt = &m_pCurTxtNd->GetTxt();
+                    m_pCurTextNd = m_aNdIdx.GetNode().GetTextNode();
+                    pText = &m_pCurTextNd->GetText();
                     m_aDelPam.SetMark();
                     m_aDelPam.DeleteMark();
                 }
             }
         }
-    } while (nPos < pTxt->getLength());
-    ClearRedlineTxt();
+    } while (nPos < pText->getLength());
+    ClearRedlineText();
 }
 
-SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
+SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags& rFlags,
                             SwNodeIndex* pSttNd, SwNodeIndex* pEndNd )
     : m_aFlags( rFlags ),
     m_aDelPam( pEdShell->GetDoc()->GetNodes().GetEndOfExtras() ),
@@ -2077,18 +2077,18 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     m_aEndNdIdx( pEdShell->GetDoc()->GetNodes().GetEndOfContent() ),
     m_pEditShell( pEdShell ),
     m_pDoc( pEdShell->GetDoc() ),
-    m_pCurTxtNd( 0 ), m_pCurTxtFrm( 0 ),
-    m_nRedlAutoFmtSeqId( 0 )
+    m_pCurTextNd( 0 ), m_pCurTextFrm( 0 ),
+    m_nRedlAutoFormatSeqId( 0 )
 {
     OSL_ENSURE( (pSttNd && pEndNd) || (!pSttNd && !pEndNd),
             "Got no area" );
 
-    if( m_aFlags.bSetNumRule && !m_aFlags.bAFmtByInput )
+    if( m_aFlags.bSetNumRule && !m_aFlags.bAFormatByInput )
         m_aFlags.bSetNumRule = false;
 
-    bool bReplaceStyles = !m_aFlags.bAFmtByInput || m_aFlags.bReplaceStyles;
+    bool bReplaceStyles = !m_aFlags.bAFormatByInput || m_aFlags.bReplaceStyles;
 
-    const SwTxtNode* pNxtNd = 0;
+    const SwTextNode* pNxtNd = 0;
     bool bNxtEmpty = false;
     bool bNxtAlpha = false;
     sal_uInt16 nNxtLevel = 0;
@@ -2102,7 +2102,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
         ++m_aEndNdIdx;
 
         // check the previous TextNode
-        pNxtNd = m_aNdIdx.GetNode().GetTxtNode();
+        pNxtNd = m_aNdIdx.GetNode().GetTextNode();
         m_bEmptyLine = !pNxtNd ||
                     IsEmptyLine( *pNxtNd ) ||
                     IsNoAlphaLine( *pNxtNd );
@@ -2115,7 +2115,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     // set value for percentage display
     m_nEndNdIdx = m_aEndNdIdx.GetIndex();
 
-    if( !m_aFlags.bAFmtByInput )
+    if( !m_aFlags.bAFormatByInput )
         ::StartProgress( STR_STATSTR_AUTOFORMAT, m_aNdIdx.GetIndex(),
                          m_nEndNdIdx = m_aEndNdIdx.GetIndex(),
                          m_pDoc->GetDocShell() );
@@ -2123,7 +2123,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     RedlineMode_t eRedlMode = m_pDoc->getIDocumentRedlineAccess().GetRedlineMode(), eOldMode = eRedlMode;
     if( m_aFlags.bWithRedlining )
     {
-        m_pDoc->SetAutoFmtRedline( true );
+        m_pDoc->SetAutoFormatRedline( true );
         eRedlMode = (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT);
     }
     else
@@ -2142,7 +2142,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     sal_uInt16 nDigitLvl = 0;
 
     // set defaults
-    SwTxtFrmInfo aFInfo( 0 );
+    SwTextFrmInfo aFInfo( 0 );
 
     // This is the automat for autoformatting
     m_eStat = READ_NEXT_PARA;
@@ -2158,9 +2158,9 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
             break;
 
         case TST_EMPTY_LINE:
-            if( IsEmptyLine( *m_pCurTxtNd ) )
+            if( IsEmptyLine( *m_pCurTextNd ) )
             {
-                if( m_aFlags.bDelEmptyNode && !HasObjects( *m_pCurTxtNd ) )
+                if( m_aFlags.bDelEmptyNode && !HasObjects( *m_pCurTextNd ) )
                 {
                     m_bEmptyLine = true;
                     sal_uLong nOldCnt = m_pDoc->GetNodes().Count();
@@ -2176,10 +2176,10 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
             break;
 
         case TST_ALPHA_LINE:
-            if( IsNoAlphaLine( *m_pCurTxtNd ))
+            if( IsNoAlphaLine( *m_pCurTextNd ))
             {
                 // recognize a table definition +---+---+
-                if( m_aFlags.bAFmtByInput && m_aFlags.bCreateTable && DoTable() )
+                if( m_aFlags.bAFormatByInput && m_aFlags.bCreateTable && DoTable() )
                 {
                     //JP 30.09.96: DoTable() builds on PopCrsr and MoveCrsr after AutoFormat!
                     pEdShell->Pop( false );
@@ -2205,7 +2205,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
 
         case GET_ALL_INFO:
             {
-                if( m_pCurTxtNd->GetNumRule() )
+                if( m_pCurTextNd->GetNumRule() )
                 {
                     // do nothing in numbering, go to next
                     m_bEmptyLine = false;
@@ -2216,14 +2216,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                     break;
                 }
 
-                aFInfo.SetFrm( m_pCurTxtFrm );
+                aFInfo.SetFrm( m_pCurTextFrm );
 
                 // so far: if there were templates assigned, keep these and go to next node
-                sal_uInt16 nPoolId = m_pCurTxtNd->GetTxtColl()->GetPoolFmtId();
-                if( IsPoolUserFmt( nPoolId )
+                sal_uInt16 nPoolId = m_pCurTextNd->GetTextColl()->GetPoolFormatId();
+                if( IsPoolUserFormat( nPoolId )
                         ? !m_aFlags.bChgUserColl
                         : ( RES_POOLCOLL_STANDARD != nPoolId &&
-                           ( !m_aFlags.bAFmtByInput ||
+                           ( !m_aFlags.bAFormatByInput ||
                             (RES_POOLCOLL_TEXT_MOVE != nPoolId &&
                              RES_POOLCOLL_TEXT != nPoolId )) ))
                 {
@@ -2232,21 +2232,21 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 }
 
                 // check for hard spaces or LRSpaces set by the template
-                if( IsPoolUserFmt( nPoolId ) ||
+                if( IsPoolUserFormat( nPoolId ) ||
                     RES_POOLCOLL_STANDARD == nPoolId )
                 {
                     short nSz;
                     SvxLRSpaceItem const * pLRSpace;
-                    if( SfxItemState::SET == m_pCurTxtNd->GetSwAttrSet().
+                    if( SfxItemState::SET == m_pCurTextNd->GetSwAttrSet().
                         GetItemState( RES_LR_SPACE, true,
                                         reinterpret_cast<const SfxPoolItem**>(&pLRSpace) ) &&
-                        ( 0 != (nSz = pLRSpace->GetTxtFirstLineOfst()) ||
-                            0 != pLRSpace->GetTxtLeft() ) )
+                        ( 0 != (nSz = pLRSpace->GetTextFirstLineOfst()) ||
+                            0 != pLRSpace->GetTextLeft() ) )
                     {
                         // exception: numbering/enumation can have an indentation
-                        if( IsEnumericChar( *m_pCurTxtNd ))
+                        if( IsEnumericChar( *m_pCurTextNd ))
                         {
-                            nLevel = CalcLevel( *m_pCurTxtNd, &nDigitLvl );
+                            nLevel = CalcLevel( *m_pCurTextNd, &nDigitLvl );
                             if( nLevel >= MAXLEVEL )
                                 nLevel = MAXLEVEL-1;
                             BuildEnum( nLevel, nDigitLvl );
@@ -2264,7 +2264,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                                 BuildIndent();
                             else if( 0 > nSz )      // negative 1st line indentation
                                 BuildNegIndent( aFInfo.GetLineStart() );
-                            else if( pLRSpace->GetTxtLeft() )   // is indentation
+                            else if( pLRSpace->GetTextLeft() )   // is indentation
                                 BuildTextIndent();
                         }
                         m_eStat = READ_NEXT_PARA;
@@ -2272,8 +2272,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                     }
                 }
 
-                nLevel = CalcLevel( *m_pCurTxtNd, &nDigitLvl );
-                m_bMoreLines = !IsOneLine( *m_pCurTxtNd );
+                nLevel = CalcLevel( *m_pCurTextNd, &nDigitLvl );
+                m_bMoreLines = !IsOneLine( *m_pCurTextNd );
                 pNxtNd = GetNextNode();
                 if( pNxtNd )
                 {
@@ -2281,7 +2281,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                     bNxtAlpha = IsNoAlphaLine( *pNxtNd );
                     nNxtLevel = CalcLevel( *pNxtNd );
 
-                    if( !m_bEmptyLine && HasBreakAttr( *m_pCurTxtNd ) )
+                    if( !m_bEmptyLine && HasBreakAttr( *m_pCurTextNd ) )
                         m_bEmptyLine = true;
                     if( !bNxtEmpty && HasBreakAttr( *pNxtNd ) )
                         bNxtEmpty = true;
@@ -2303,7 +2303,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 if( !bReplaceStyles )
                     break;
 
-                const OUString sClrStr( DelLeadingBlanks(m_pCurTxtNd->GetTxt()) );
+                const OUString sClrStr( DelLeadingBlanks(m_pCurTextNd->GetText()) );
 
                 if( sClrStr.isEmpty() )
                 {
@@ -2313,8 +2313,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 }
 
                 // check if headline
-                if( !m_bEmptyLine || !IsFirstCharCapital( *m_pCurTxtNd ) ||
-                    IsBlanksInString( *m_pCurTxtNd ) )
+                if( !m_bEmptyLine || !IsFirstCharCapital( *m_pCurTextNd ) ||
+                    IsBlanksInString( *m_pCurTextNd ) )
                     break;
 
                 m_bEmptyLine = false;
@@ -2355,7 +2355,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                         }
                         m_nLastCalcHeadLvl = nLevel;
 
-                        if( m_aFlags.bAFmtByInput )
+                        if( m_aFlags.bAFormatByInput )
                             BuildHeadLine( nLevel );
                         else
                             BuildHeadLine( m_nLastHeadLvl );
@@ -2369,7 +2369,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
         case TST_ENUMERIC:
             {
                 m_bEmptyLine = false;
-                if( IsEnumericChar( *m_pCurTxtNd ))
+                if( IsEnumericChar( *m_pCurTextNd ))
                 {
                     if( nLevel >= MAXLEVEL )
                         nLevel = MAXLEVEL-1;
@@ -2467,16 +2467,16 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 DelMoreLinesBlanks( false );
 
                 // handle hard attributes
-                if( m_pCurTxtNd->HasSwAttrSet() )
+                if( m_pCurTextNd->HasSwAttrSet() )
                 {
                     short nSz;
                     SvxLRSpaceItem const * pLRSpace;
                     if( bReplaceStyles &&
-                        SfxItemState::SET == m_pCurTxtNd->GetSwAttrSet().
+                        SfxItemState::SET == m_pCurTextNd->GetSwAttrSet().
                         GetItemState( RES_LR_SPACE, false,
                                         reinterpret_cast<const SfxPoolItem**>(&pLRSpace) ) &&
-                        ( 0 != (nSz = pLRSpace->GetTxtFirstLineOfst()) ||
-                            0 != pLRSpace->GetTxtLeft() ) )
+                        ( 0 != (nSz = pLRSpace->GetTextFirstLineOfst()) ||
+                            0 != pLRSpace->GetTextLeft() ) )
                     {
                         // then use one of our templates
                         if( 0 < nSz )           // positive 1st line indentation
@@ -2485,7 +2485,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                         {
                             BuildNegIndent( aFInfo.GetLineStart() );
                         }
-                        else if( pLRSpace->GetTxtLeft() )   // is indentation
+                        else if( pLRSpace->GetTextLeft() )   // is indentation
                             BuildTextIndent();
                         else
                             BuildText();
@@ -2501,18 +2501,18 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     }
 
     if( m_aFlags.bWithRedlining )
-        m_pDoc->SetAutoFmtRedline( false );
+        m_pDoc->SetAutoFormatRedline( false );
     m_pDoc->getIDocumentRedlineAccess().SetRedlineMode( eOldMode );
 
     // restore undo (in case it has been changed)
     m_pDoc->GetIDocumentUndoRedo().DoUndo(bUndoState);
 
     // disable display of percentage again
-    if( !m_aFlags.bAFmtByInput )
+    if( !m_aFlags.bAFormatByInput )
         ::EndProgress( m_pDoc->GetDocShell() );
 }
 
-void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* pAFlags )
+void SwEditShell::AutoFormat( const SvxSwAutoFormatFlags* pAFlags )
 {
     boost::scoped_ptr<SwWait> pWait;
 
@@ -2520,11 +2520,11 @@ void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* pAFlags )
     StartAllAction();
     StartUndo( UNDO_AUTOFORMAT );
 
-    SvxSwAutoFmtFlags aAFFlags;     // use default values or add params?
+    SvxSwAutoFormatFlags aAFFlags;     // use default values or add params?
     if( pAFlags )
     {
         aAFFlags = *pAFlags;
-        if( !aAFFlags.bAFmtByInput )
+        if( !aAFFlags.bAFormatByInput )
             pWait.reset(new SwWait( *GetDoc()->GetDocShell(), true ));
     }
 
@@ -2536,21 +2536,21 @@ void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* pAFlags )
         {
             if( rPaM.HasMark() )
             {
-                SwAutoFormat aFmt( this, aAFFlags, &(rPaM.Start()->nNode),
+                SwAutoFormat aFormat( this, aAFFlags, &(rPaM.Start()->nNode),
                                      &(rPaM.End()->nNode) );
             }
         }
     }
     else
     {
-        SwAutoFormat aFmt( this, aAFFlags );
+        SwAutoFormat aFormat( this, aAFFlags );
     }
 
     EndUndo( UNDO_AUTOFORMAT );
     EndAllAction();
 }
 
-void SwEditShell::AutoFmtBySplitNode()
+void SwEditShell::AutoFormatBySplitNode()
 {
     SET_CURR_SHELL( this );
     SwPaM* pCrsr = GetCrsr();
@@ -2561,20 +2561,20 @@ void SwEditShell::AutoFmtBySplitNode()
 
         bool bRange = false;
         pCrsr->SetMark();
-        SwIndex* pCntnt = &pCrsr->GetMark()->nContent;
-        if( pCntnt->GetIndex() )
+        SwIndex* pContent = &pCrsr->GetMark()->nContent;
+        if( pContent->GetIndex() )
         {
-            *pCntnt = 0;
+            *pContent = 0;
             bRange = true;
         }
         else
         {
             // then go one node backwards
             SwNodeIndex m_aNdIdx( pCrsr->GetMark()->nNode, -1 );
-            SwTxtNode* pTxtNd = m_aNdIdx.GetNode().GetTxtNode();
-            if (pTxtNd && !pTxtNd->GetTxt().isEmpty())
+            SwTextNode* pTextNd = m_aNdIdx.GetNode().GetTextNode();
+            if (pTextNd && !pTextNd->GetText().isEmpty())
             {
-                pCntnt->Assign( pTxtNd, 0 );
+                pContent->Assign( pTextNd, 0 );
                 pCrsr->GetMark()->nNode = m_aNdIdx;
                 bRange = true;
             }
@@ -2584,9 +2584,9 @@ void SwEditShell::AutoFmtBySplitNode()
         {
             Push();     // save cursor
 
-            SvxSwAutoFmtFlags aAFFlags = *GetAutoFmtFlags(); // use default values so far
+            SvxSwAutoFormatFlags aAFFlags = *GetAutoFormatFlags(); // use default values so far
 
-            SwAutoFormat aFmt( this, aAFFlags, &pCrsr->GetMark()->nNode,
+            SwAutoFormat aFormat( this, aAFFlags, &pCrsr->GetMark()->nNode,
                                     &pCrsr->GetPoint()->nNode );
 
             //JP 30.09.96: DoTable() builds on PopCrsr and MoveCrsr!
@@ -2601,27 +2601,27 @@ void SwEditShell::AutoFmtBySplitNode()
     }
 }
 
-SvxSwAutoFmtFlags* SwEditShell::GetAutoFmtFlags()
+SvxSwAutoFormatFlags* SwEditShell::GetAutoFormatFlags()
 {
-    if (!s_pAutoFmtFlags)
-        s_pAutoFmtFlags = new SvxSwAutoFmtFlags;
+    if (!s_pAutoFormatFlags)
+        s_pAutoFormatFlags = new SvxSwAutoFormatFlags;
 
-    return s_pAutoFmtFlags;
+    return s_pAutoFormatFlags;
 }
 
-void SwEditShell::SetAutoFmtFlags(SvxSwAutoFmtFlags * pFlags)
+void SwEditShell::SetAutoFormatFlags(SvxSwAutoFormatFlags * pFlags)
 {
-    SvxSwAutoFmtFlags* pEditFlags = GetAutoFmtFlags();
+    SvxSwAutoFormatFlags* pEditFlags = GetAutoFormatFlags();
 
     pEditFlags->bSetNumRule     = pFlags->bSetNumRule;
     pEditFlags->bChgEnumNum     = pFlags->bChgEnumNum;
     pEditFlags->bSetBorder      = pFlags->bSetBorder;
     pEditFlags->bCreateTable    = pFlags->bCreateTable;
     pEditFlags->bReplaceStyles  = pFlags->bReplaceStyles;
-    pEditFlags->bAFmtByInpDelSpacesAtSttEnd =
-                                    pFlags->bAFmtByInpDelSpacesAtSttEnd;
-    pEditFlags->bAFmtByInpDelSpacesBetweenLines =
-                                    pFlags->bAFmtByInpDelSpacesBetweenLines;
+    pEditFlags->bAFormatByInpDelSpacesAtSttEnd =
+                                    pFlags->bAFormatByInpDelSpacesAtSttEnd;
+    pEditFlags->bAFormatByInpDelSpacesBetweenLines =
+                                    pFlags->bAFormatByInpDelSpacesBetweenLines;
 
     //JP 15.12.98: copy BulletChar and Font into "normal" ones
     //             because AutoFormat can only work with the latter!
diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index 8a798195e6b0..f0312a8f26ba 100644
--- a/sw/source/core/edit/edatmisc.cxx
+++ b/sw/source/core/edit/edatmisc.cxx
@@ -58,11 +58,11 @@ void SwEditShell::GCAttr()
     {
         if ( !rPaM.HasMark() )
         {
-            SwTxtNode *const pTxtNode =
-                rPaM.GetPoint()->nNode.GetNode().GetTxtNode();
-            if (pTxtNode)
+            SwTextNode *const pTextNode =
+                rPaM.GetPoint()->nNode.GetNode().GetTextNode();
+            if (pTextNode)
             {
-                pTxtNode->GCAttr();
+                pTextNode->GCAttr();
             }
         }
         else
@@ -71,8 +71,8 @@ void SwEditShell::GCAttr()
             SwNodeIndex aIdx( rPaM.Start()->nNode );
             SwNode* pNd = &aIdx.GetNode();
             do {
-                if( pNd->IsTxtNode() )
-                    static_cast<SwTxtNode*>(pNd)->GCAttr();
+                if( pNd->IsTextNode() )
+                    static_cast<SwTextNode*>(pNd)->GCAttr();
             }
             while( 0 != ( pNd = GetDoc()->GetNodes().GoNext( &aIdx )) &&
                     aIdx <= rEnd );
@@ -81,18 +81,18 @@ void SwEditShell::GCAttr()
 }
 
 /// Set the attribute as new default attribute in the document.
-void SwEditShell::SetDefault( const SfxPoolItem& rFmtHint )
+void SwEditShell::SetDefault( const SfxPoolItem& rFormatHint )
 {
     // 7502: Action-Parenthesis
     StartAllAction();
-    GetDoc()->SetDefault( rFmtHint );
+    GetDoc()->SetDefault( rFormatHint );
     EndAllAction();
 }
 
 /// request the default attribute in this document.
-const SfxPoolItem& SwEditShell::GetDefault( sal_uInt16 nFmtHint ) const
+const SfxPoolItem& SwEditShell::GetDefault( sal_uInt16 nFormatHint ) const
 {
-    return GetDoc()->GetDefault( nFmtHint );
+    return GetDoc()->GetDefault( nFormatHint );
 }
 
 void SwEditShell::SetAttrItem( const SfxPoolItem& rHint, SetAttrMode nFlags )
@@ -102,12 +102,12 @@ void SwEditShell::SetAttrItem( const SfxPoolItem& rHint, SetAttrMode nFlags )
     SwPaM* pCrsr = GetCrsr();
     if( pCrsr->GetNext() != pCrsr )     // Ring of Cursors
     {
-        bool bIsTblMode = IsTableMode();
+        bool bIsTableMode = IsTableMode();
         GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_INSATTR, NULL);
 
         for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
         {
-            if( rPaM.HasMark() && ( bIsTblMode ||
+            if( rPaM.HasMark() && ( bIsTableMode ||
                 *rPaM.GetPoint() != *rPaM.GetMark() ))
             {
                 GetDoc()->getIDocumentContentOperations().InsertPoolItem(rPaM, rHint, nFlags );
@@ -133,12 +133,12 @@ void SwEditShell::SetAttrSet( const SfxItemSet& rSet, SetAttrMode nFlags, SwPaM*
     StartAllAction();
     if( pCrsr->GetNext() != pCrsr )     // Ring of Cursors
     {
-        bool bIsTblMode = IsTableMode();
+        bool bIsTableMode = IsTableMode();
         GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_INSATTR, NULL);
 
         for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
         {
-            if( rTmpCrsr.HasMark() && ( bIsTblMode ||
+            if( rTmpCrsr.HasMark() && ( bIsTableMode ||
                 *rTmpCrsr.GetPoint() != *rTmpCrsr.GetMark() ))
             {
                 GetDoc()->getIDocumentContentOperations().InsertItemSet(rTmpCrsr, rSet, nFlags );
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 19b1074c6b51..759cfc84b104 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -78,15 +78,15 @@ bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
         // the attributes to get are those from the numbering format.
         if (rCurrentPaM.IsInFrontOfLabel())
         {
-            SwTxtNode * pTxtNd = rCurrentPaM.GetPoint()->nNode.GetNode().GetTxtNode();
+            SwTextNode * pTextNd = rCurrentPaM.GetPoint()->nNode.GetNode().GetTextNode();
 
-            if (pTxtNd)
+            if (pTextNd)
             {
-                SwNumRule * pNumRule = pTxtNd->GetNumRule();
+                SwNumRule * pNumRule = pTextNd->GetNumRule();
 
                 if (pNumRule)
                 {
-                    int nListLevel = pTxtNd->GetActualListLevel();
+                    int nListLevel = pTextNd->GetActualListLevel();
 
                     if (nListLevel < 0)
                         nListLevel = 0;
@@ -94,13 +94,13 @@ bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
                     if (nListLevel >= MAXLEVEL)
                         nListLevel = MAXLEVEL - 1;
 
-                    const OUString & aCharFmtName =
-                        pNumRule->Get(static_cast<sal_uInt16>(nListLevel)).GetCharFmtName();
-                    SwCharFmt * pCharFmt =
-                        GetDoc()->FindCharFmtByName(aCharFmtName);
+                    const OUString & aCharFormatName =
+                        pNumRule->Get(static_cast<sal_uInt16>(nListLevel)).GetCharFormatName();
+                    SwCharFormat * pCharFormat =
+                        GetDoc()->FindCharFormatByName(aCharFormatName);
 
-                    if (pCharFmt)
-                        rSet.Put(pCharFmt->GetAttrSet());
+                    if (pCharFormat)
+                        rSet.Put(pCharFormat->GetAttrSet());
                 }
             }
 
@@ -137,16 +137,16 @@ bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
                     const sal_Int32 nStt = (n == nSttNd) ? nSttCnt : 0;
                     const sal_Int32 nEnd = (n == nEndNd)
                         ? nEndCnt
-                        : pNd->GetTxtNode()->GetTxt().getLength();
+                        : pNd->GetTextNode()->GetText().getLength();
 
-                    static_cast<SwTxtNode*>(pNd)->GetAttr( *pSet, nStt, nEnd,
+                    static_cast<SwTextNode*>(pNd)->GetAttr( *pSet, nStt, nEnd,
                                                 false, true,
                                                 bMergeIndentValuesOfNumRule );
                 }
                 break;
             case ND_GRFNODE:
             case ND_OLENODE:
-                static_cast<SwCntntNode*>(pNd)->GetAttr( *pSet );
+                static_cast<SwContentNode*>(pNd)->GetAttr( *pSet );
                 break;
 
             default:
@@ -207,10 +207,10 @@ bool SwEditShell::GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const
             // get the node
             SwNode* pNd = GetDoc()->GetNodes()[ n ];
 
-            if( pNd->IsTxtNode() )
+            if( pNd->IsTextNode() )
             {
                 // get the node (paragraph) attributes
-                static_cast<SwCntntNode*>(pNd)->GetAttr(*pSet);
+                static_cast<SwContentNode*>(pNd)->GetAttr(*pSet);
 
                 if( pSet != &rSet && aSet.Count() )
                 {
@@ -232,12 +232,12 @@ bool SwEditShell::GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const
     return true;
 }
 
-SwTxtFmtColl* SwEditShell::GetCurTxtFmtColl( ) const
+SwTextFormatColl* SwEditShell::GetCurTextFormatColl( ) const
 {
-    return GetPaMTxtFmtColl( GetCrsr() );
+    return GetPaMTextFormatColl( GetCrsr() );
 }
 
-SwTxtFmtColl* SwEditShell::GetPaMTxtFmtColl( SwPaM* pPaM ) const
+SwTextFormatColl* SwEditShell::GetPaMTextFormatColl( SwPaM* pPaM ) const
 {
     // number of nodes the function have explored so far
     sal_uInt16 numberOfLookup = 0;
@@ -265,14 +265,14 @@ SwTxtFmtColl* SwEditShell::GetPaMTxtFmtColl( SwPaM* pPaM ) const
             if (numberOfLookup >= getMaxLookup())
                 return NULL;
 
-            if( pNd->IsTxtNode() )
+            if( pNd->IsTextNode() )
             {
                 // if it's a text node get its named paragraph format
-                SwTxtFmtColl* pFmt = pNd->GetTxtNode()->GetTxtColl();
+                SwTextFormatColl* pFormat = pNd->GetTextNode()->GetTextColl();
 
                 // if the paragraph format exist stop here and return it
-                if( pFmt != NULL )
-                    return pFmt;
+                if( pFormat != NULL )
+                    return pFormat;
             }
         }
     }
@@ -300,32 +300,32 @@ std::vector<std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >> SwEditShell
         for( sal_uLong n = nSttNd; n <= nEndNd; ++n )
         {
             SwNode* pNd = GetDoc()->GetNodes()[ n ];
-            if( pNd->IsTxtNode() )
+            if( pNd->IsTextNode() )
             {
-                SwTxtNode* pTxtNd = static_cast< SwTxtNode* >( pNd );
+                SwTextNode* pTextNd = static_cast< SwTextNode* >( pNd );
                 const sal_Int32 nStt = (n == nSttNd) ? nSttCnt : 0;
                 const sal_Int32 nEnd = (n == nEndNd)
-                    ? nEndCnt : pTxtNd->GetTxt().getLength();
-                const SwScriptInfo* pScriptInfo = SwScriptInfo::GetScriptInfo( *pTxtNd );
+                    ? nEndCnt : pTextNd->GetText().getLength();
+                const SwScriptInfo* pScriptInfo = SwScriptInfo::GetScriptInfo( *pTextNd );
                 sal_uInt8 nScript = pScriptInfo ? pScriptInfo->ScriptType( nStt ) : css::i18n::ScriptType::WEAK;
                 nWhich = GetWhichOfScript( nWhich, nScript );
 
                 // item from attribute set
-                if( pTxtNd->HasSwAttrSet() )
+                if( pTextNd->HasSwAttrSet() )
                 {
                     pNewPaM = new SwPaM(*pNd, nStt, *pNd, nEnd);
-                    pItem = pTxtNd->GetSwAttrSet().GetItem( nWhich );
+                    pItem = pTextNd->GetSwAttrSet().GetItem( nWhich );
                     vItem.push_back( std::make_pair( pItem, std::unique_ptr<SwPaM>(pNewPaM) ) );
                 }
 
-                if( !pTxtNd->HasHints() )
+                if( !pTextNd->HasHints() )
                     continue;
 
                 // items with limited range
-                const size_t nSize = pTxtNd->GetpSwpHints()->Count();
+                const size_t nSize = pTextNd->GetpSwpHints()->Count();
                 for( size_t m = 0; m < nSize; m++ )
                 {
-                    const SwTxtAttr* pHt = (*pTxtNd->GetpSwpHints())[m];
+                    const SwTextAttr* pHt = (*pTextNd->GetpSwpHints())[m];
                     if( pHt->Which() == RES_TXTATR_AUTOFMT ||
                         pHt->Which() == RES_TXTATR_CHARFMT ||
                         pHt->Which() == RES_TXTATR_INETFMT )
@@ -341,7 +341,7 @@ std::vector<std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >> SwEditShell
 
                         nScript = pScriptInfo ? pScriptInfo->ScriptType( nStt ) : css::i18n::ScriptType::WEAK;
                         nWhich = GetWhichOfScript( nWhich, nScript );
-                        const SfxItemSet* pAutoSet = CharFmt::GetItemSet( pHt->GetAttr() );
+                        const SfxItemSet* pAutoSet = CharFormat::GetItemSet( pHt->GetAttr() );
                         if( pAutoSet )
                         {
                             SfxItemIter aItemIter( *pAutoSet );
@@ -366,7 +366,7 @@ std::vector<std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >> SwEditShell
                                 pItem = aItemIter.NextItem();
                             }
                             // default item
-                            if( !pItem && !pTxtNd->HasSwAttrSet() )
+                            if( !pItem && !pTextNd->HasSwAttrSet() )
                             {
                                 pNewPaM = new SwPaM(*pNd, nStt, *pNd, nEnd);
                                 pItem = pAutoSet->GetPool()->GetPoolDefaultItem( nWhich );
@@ -381,27 +381,27 @@ std::vector<std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >> SwEditShell
     return vItem;
 }
 
-bool SwEditShell::GetCurFtn( SwFmtFtn* pFillFtn )
+bool SwEditShell::GetCurFootnote( SwFormatFootnote* pFillFootnote )
 {
     // The cursor must be positioned on the current footnotes anchor:
     SwPaM* pCrsr = GetCrsr();
-    SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode();
-    if( !pTxtNd )
+    SwTextNode* pTextNd = pCrsr->GetNode().GetTextNode();
+    if( !pTextNd )
         return false;
 
-    SwTxtAttr *const pFtn = pTxtNd->GetTxtAttrForCharAt(
+    SwTextAttr *const pFootnote = pTextNd->GetTextAttrForCharAt(
         pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
-    if( pFtn && pFillFtn )
+    if( pFootnote && pFillFootnote )
     {
         // Transfer data from the attribute
-        const SwFmtFtn &rFtn = static_cast<SwTxtFtn*>(pFtn)->GetFtn();
-        pFillFtn->SetNumber( rFtn );
-        pFillFtn->SetEndNote( rFtn.IsEndNote() );
+        const SwFormatFootnote &rFootnote = static_cast<SwTextFootnote*>(pFootnote)->GetFootnote();
+        pFillFootnote->SetNumber( rFootnote );
+        pFillFootnote->SetEndNote( rFootnote.IsEndNote() );
     }
-    return 0 != pFtn;
+    return 0 != pFootnote;
 }
 
-bool SwEditShell::SetCurFtn( const SwFmtFtn& rFillFtn )
+bool SwEditShell::SetCurFootnote( const SwFormatFootnote& rFillFootnote )
 {
     bool bChgd = false;
     StartAllAction();
@@ -409,7 +409,7 @@ bool SwEditShell::SetCurFtn( const SwFmtFtn& rFillFtn )
     for(SwPaM& rCrsr : GetCrsr()->GetRingContainer())
     {
         bChgd |=
-            mpDoc->SetCurFtn( rCrsr, rFillFtn.GetNumStr(), rFillFtn.GetNumber(), rFillFtn.IsEndNote() );
+            mpDoc->SetCurFootnote( rCrsr, rFillFootnote.GetNumStr(), rFillFootnote.GetNumber(), rFillFootnote.IsEndNote() );
 
     }
 
@@ -417,49 +417,49 @@ bool SwEditShell::SetCurFtn( const SwFmtFtn& rFillFtn )
     return bChgd;
 }
 
-bool SwEditShell::HasFtns( bool bEndNotes ) const
+bool SwEditShell::HasFootnotes( bool bEndNotes ) const
 {
-    const SwFtnIdxs &rIdxs = mpDoc->GetFtnIdxs();
+    const SwFootnoteIdxs &rIdxs = mpDoc->GetFootnoteIdxs();
     for ( auto pIdx : rIdxs )
     {
-        const SwFmtFtn &rFtn = pIdx->GetFtn();
-        if ( bEndNotes == rFtn.IsEndNote() )
+        const SwFormatFootnote &rFootnote = pIdx->GetFootnote();
+        if ( bEndNotes == rFootnote.IsEndNote() )
             return true;
     }
     return false;
 }
 
 /// Give a List of all footnotes and their beginning texts
-size_t SwEditShell::GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes )
+size_t SwEditShell::GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes )
 {
     rList.Clear();
 
-    const size_t nFtnCnt = mpDoc->GetFtnIdxs().size();
-    SwTxtFtn* pTxtFtn;
-    for( size_t n = 0; n < nFtnCnt; ++n )
+    const size_t nFootnoteCnt = mpDoc->GetFootnoteIdxs().size();
+    SwTextFootnote* pTextFootnote;
+    for( size_t n = 0; n < nFootnoteCnt; ++n )
     {
-        pTxtFtn = mpDoc->GetFtnIdxs()[ n ];
-        const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-        if ( rFtn.IsEndNote() != bEndNotes )
+        pTextFootnote = mpDoc->GetFootnoteIdxs()[ n ];
+        const SwFormatFootnote& rFootnote = pTextFootnote->GetFootnote();
+        if ( rFootnote.IsEndNote() != bEndNotes )
             continue;
 
-        SwNodeIndex* pIdx = pTxtFtn->GetStartNode();
+        SwNodeIndex* pIdx = pTextFootnote->GetStartNode();
         if( pIdx )
         {
             SwNodeIndex aIdx( *pIdx, 1 );
-            SwTxtNode* pTxtNd = aIdx.GetNode().GetTxtNode();
-            if( !pTxtNd )
-                pTxtNd = static_cast<SwTxtNode*>(mpDoc->GetNodes().GoNext( &aIdx ));
+            SwTextNode* pTextNd = aIdx.GetNode().GetTextNode();
+            if( !pTextNd )
+                pTextNd = static_cast<SwTextNode*>(mpDoc->GetNodes().GoNext( &aIdx ));
 
-            if( pTxtNd )
+            if( pTextNd )
             {
-                OUString sTxt( rFtn.GetViewNumStr( *mpDoc ));
-                if( !sTxt.isEmpty() )
-                    sTxt += " ";
-                sTxt += pTxtNd->GetExpandTxt( 0, -1 );
+                OUString sText( rFootnote.GetViewNumStr( *mpDoc ));
+                if( !sText.isEmpty() )
+                    sText += " ";
+                sText += pTextNd->GetExpandText( 0, -1 );
 
-                _SeqFldLstElem* pNew = new _SeqFldLstElem( sTxt,
-                                            pTxtFtn->GetSeqRefNo() );
+                _SeqFieldLstElem* pNew = new _SeqFieldLstElem( sText,
+                                            pTextFootnote->GetSeqRefNo() );
                 while( rList.InsertSort( pNew ) )
                     pNew->sDlgEntry += " ";
             }
@@ -488,15 +488,15 @@ bool SwEditShell::IsMoveLeftMargin( bool bRight, bool bModulus ) const
         if( nSttNd > nEndNd )
             std::swap(nSttNd, nEndNd);
 
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         for( sal_uLong n = nSttNd; bRet && n <= nEndNd; ++n )
-            if( 0 != ( pCNd = GetDoc()->GetNodes()[ n ]->GetTxtNode() ))
+            if( 0 != ( pCNd = GetDoc()->GetNodes()[ n ]->GetTextNode() ))
             {
                 const SvxLRSpaceItem& rLS = static_cast<const SvxLRSpaceItem&>(
                                             pCNd->GetAttr( RES_LR_SPACE ));
                 if( bRight )
                 {
-                    long nNext = rLS.GetTxtLeft() + nDefDist;
+                    long nNext = rLS.GetTextLeft() + nDefDist;
                     if( bModulus )
                         nNext = ( nNext / nDefDist ) * nDefDist;
                     SwFrm* pFrm = pCNd->getLayoutFrm( GetLayout() );
@@ -555,7 +555,7 @@ static inline SvtScriptType lcl_SetScriptFlags( sal_uInt16 nType )
     }
 }
 
-static bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, sal_Int32 nPos,
+static bool lcl_IsNoEndTextAttrAtPos( const SwTextNode& rTNd, sal_Int32 nPos,
                             SvtScriptType &rScrpt, bool bInSelection, bool bNum )
 {
     bool bRet = false;
@@ -569,7 +569,7 @@ static bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, sal_Int32 nPos,
         if ( rTNd.IsInList() )
         {
             OSL_ENSURE( rTNd.GetNumRule(),
-                    "<lcl_IsNoEndTxtAttrAtPos(..)> - no list style found at text node. Serious defect -> please inform OD." );
+                    "<lcl_IsNoEndTextAttrAtPos(..)> - no list style found at text node. Serious defect -> please inform OD." );
             const SwNumRule* pNumRule = rTNd.GetNumRule();
             if(pNumRule)
             {
@@ -581,11 +581,11 @@ static bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, sal_Int32 nPos,
                 if (nListLevel >= MAXLEVEL)
                     nListLevel = MAXLEVEL - 1;
 
-                const SwNumFmt &rNumFmt = pNumRule->Get( static_cast<sal_uInt16>(nListLevel) );
-                if( SVX_NUM_BITMAP != rNumFmt.GetNumberingType() )
+                const SwNumFormat &rNumFormat = pNumRule->Get( static_cast<sal_uInt16>(nListLevel) );
+                if( SVX_NUM_BITMAP != rNumFormat.GetNumberingType() )
                 {
-                    if ( SVX_NUM_CHAR_SPECIAL == rNumFmt.GetNumberingType() )
-                        sExp = OUString(rNumFmt.GetBulletChar());
+                    if ( SVX_NUM_CHAR_SPECIAL == rNumFormat.GetNumberingType() )
+                        sExp = OUString(rNumFormat.GetBulletChar());
                     else
                         sExp = rTNd.GetNumString();
                 }
@@ -594,19 +594,19 @@ static bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, sal_Int32 nPos,
     }
 
     // and fields
-    if (nPos < rTNd.GetTxt().getLength() && CH_TXTATR_BREAKWORD == rTNd.GetTxt()[nPos])
+    if (nPos < rTNd.GetText().getLength() && CH_TXTATR_BREAKWORD == rTNd.GetText()[nPos])
     {
-        const SwTxtAttr* const pAttr = rTNd.GetTxtAttrForCharAt( nPos );
+        const SwTextAttr* const pAttr = rTNd.GetTextAttrForCharAt( nPos );
         if (pAttr)
         {
             bRet = true; // all other than fields can be
                          // defined as weak-script ?
             if ( RES_TXTATR_FIELD == pAttr->Which() )
             {
-                const SwField* const pFld = pAttr->GetFmtFld().GetField();
-                if (pFld)
+                const SwField* const pField = pAttr->GetFormatField().GetField();
+                if (pField)
                 {
-                    sExp += pFld->ExpandField(true);
+                    sExp += pField->ExpandField(true);
                 }
             }
         }
@@ -647,7 +647,7 @@ SvtScriptType SwEditShell::GetScriptType() const
                                     : rPaM.GetMark();
             if( pStt == pEnd || *pStt == *pEnd )
             {
-                const SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
+                const SwTextNode* pTNd = pStt->nNode.GetNode().GetTextNode();
                 if( pTNd )
                 {
                     // try to get SwScriptInfo
@@ -665,16 +665,16 @@ SvtScriptType SwEditShell::GetScriptType() const
 
                     sal_uInt16 nScript;
 
-                    if (!pTNd->GetTxt().isEmpty())
+                    if (!pTNd->GetText().isEmpty())
                     {
                         nScript = pScriptInfo ?
                                   pScriptInfo->ScriptType( nPos ) :
-                                  g_pBreakIt->GetBreakIter()->getScriptType( pTNd->GetTxt(), nPos );
+                                  g_pBreakIt->GetBreakIter()->getScriptType( pTNd->GetText(), nPos );
                     }
                     else
                         nScript = SvtLanguageOptions::GetI18NScriptTypeOfLanguage( GetAppLanguage() );
 
-                    if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nPos, nRet, false, false ))
+                    if( !lcl_IsNoEndTextAttrAtPos( *pTNd, nPos, nRet, false, false ))
                         nRet |= lcl_SetScriptFlags( nScript );
                 }
             }
@@ -683,10 +683,10 @@ SvtScriptType SwEditShell::GetScriptType() const
                 sal_uLong nEndIdx = pEnd->nNode.GetIndex();
                 SwNodeIndex aIdx( pStt->nNode );
                 for( ; aIdx.GetIndex() <= nEndIdx; ++aIdx )
-                    if( aIdx.GetNode().IsTxtNode() )
+                    if( aIdx.GetNode().IsTextNode() )
                     {
-                        const SwTxtNode* pTNd = aIdx.GetNode().GetTxtNode();
-                        const OUString& rTxt = pTNd->GetTxt();
+                        const SwTextNode* pTNd = aIdx.GetNode().GetTextNode();
+                        const OUString& rText = pTNd->GetText();
 
                         // try to get SwScriptInfo
                         const SwScriptInfo* pScriptInfo = SwScriptInfo::GetScriptInfo( *pTNd );
@@ -696,12 +696,12 @@ SvtScriptType SwEditShell::GetScriptType() const
                                                 : 0;
                         sal_Int32 nEndPos = aIdx == nEndIdx
                                                 ? pEnd->nContent.GetIndex()
-                                                : rTxt.getLength();
+                                                : rText.getLength();
 
-                        OSL_ENSURE( nEndPos <= rTxt.getLength(),
+                        OSL_ENSURE( nEndPos <= rText.getLength(),
                                 "Index outside the range - endless loop!" );
-                        if (nEndPos > rTxt.getLength())
-                            nEndPos = rTxt.getLength();
+                        if (nEndPos > rText.getLength())
+                            nEndPos = rText.getLength();
 
                         sal_uInt16 nScript;
                         while( nChg < nEndPos )
@@ -709,27 +709,27 @@ SvtScriptType SwEditShell::GetScriptType() const
                             nScript = pScriptInfo ?
                                       pScriptInfo->ScriptType( nChg ) :
                                       g_pBreakIt->GetBreakIter()->getScriptType(
-                                                                rTxt, nChg );
+                                                                rText, nChg );
 
-                            if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nChg, nRet, true,
-                                      0 == nChg && rTxt.getLength() == nEndPos))
+                            if( !lcl_IsNoEndTextAttrAtPos( *pTNd, nChg, nRet, true,
+                                      0 == nChg && rText.getLength() == nEndPos))
                                 nRet |= lcl_SetScriptFlags( nScript );
 
                             if( (SvtScriptType::LATIN | SvtScriptType::ASIAN |
                                 SvtScriptType::COMPLEX) == nRet )
                                 break;
 
-                            sal_Int32 nFldPos = nChg+1;
+                            sal_Int32 nFieldPos = nChg+1;
 
                             nChg = pScriptInfo ?
                                    pScriptInfo->NextScriptChg( nChg ) :
                                    g_pBreakIt->GetBreakIter()->endOfScript(
-                                                    rTxt, nChg, nScript );
+                                                    rText, nChg, nScript );
 
-                            nFldPos = rTxt.indexOf(
-                                            CH_TXTATR_BREAKWORD, nFldPos);
-                            if ((-1 != nFldPos) && (nFldPos < nChg))
-                                nChg = nFldPos;
+                            nFieldPos = rText.indexOf(
+                                            CH_TXTATR_BREAKWORD, nFieldPos);
+                            if ((-1 != nFieldPos) && (nFieldPos < nChg))
+                                nChg = nFieldPos;
                         }
                         if( (SvtScriptType::LATIN | SvtScriptType::ASIAN |
                                 SvtScriptType::COMPLEX) == nRet )
@@ -751,7 +751,7 @@ sal_uInt16 SwEditShell::GetCurLang() const
 {
     const SwPaM* pCrsr = GetCrsr();
     const SwPosition& rPos = *pCrsr->GetPoint();
-    const SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
+    const SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
     sal_uInt16 nLang;
     if( pTNd )
     {
@@ -771,7 +771,7 @@ sal_uInt16 SwEditShell::GetScalingOfSelectedText() const
 {
     const SwPaM* pCrsr = GetCrsr();
     const SwPosition* pStt = pCrsr->Start();
-    const SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
+    const SwTextNode* pTNd = pStt->nNode.GetNode().GetTextNode();
     OSL_ENSURE( pTNd, "no textnode available" );
 
     sal_uInt16 nScaleWidth;
@@ -783,7 +783,7 @@ sal_uInt16 SwEditShell::GetScalingOfSelectedText() const
         const sal_Int32 nStt = pStt->nContent.GetIndex();
         const sal_Int32 nEnd = pStt->nNode == pEnd->nNode
             ? pEnd->nContent.GetIndex()
-            : pTNd->GetTxt().getLength();
+            : pTNd->GetText().getLength();
         nScaleWidth = pTNd->GetScalingOfSelectedText( nStt, nEnd );
     }
     else
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 48c376f63b7b..04c68f5e0447 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -71,21 +71,21 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
             {
                 // then go to the end of the selection
                 aDelPam.GetPoint()->nNode = rEndNd;
-                aDelPam.Move( fnMoveBackward, fnGoCntnt );
+                aDelPam.Move( fnMoveBackward, fnGoContent );
             }
             // skip protected boxes
-            if( !rNd.IsCntntNode() ||
+            if( !rNd.IsContentNode() ||
                 !rNd.IsInProtectSect() )
             {
                 // delete everything
                 GetDoc()->getIDocumentContentOperations().DeleteAndJoin( aDelPam );
-                SaveTblBoxCntnt( aDelPam.GetPoint() );
+                SaveTableBoxContent( aDelPam.GetPoint() );
             }
 
             if( !pEndSelPos ) // at the end of a selection
                 break;
             aDelPam.DeleteMark();
-            aDelPam.Move( fnMoveForward, fnGoCntnt ); // next box
+            aDelPam.Move( fnMoveForward, fnGoContent ); // next box
         } while( pEndSelPos );
     }
     else
@@ -104,7 +104,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
         }
         // delete everything
         GetDoc()->getIDocumentContentOperations().DeleteAndJoin(*pPam);
-        SaveTblBoxCntnt( pPam->GetPoint() );
+        SaveTableBoxContent( pPam->GetPoint() );
     }
 
     // Selection is not needed anymore
@@ -115,7 +115,7 @@ long SwEditShell::Delete()
 {
     SET_CURR_SHELL( this );
     long nRet = 0;
-    if ( !HasReadonlySel() || CrsrInsideInputFld() )
+    if ( !HasReadonlySel() || CrsrInsideInputField() )
     {
         StartAllAction();
 
@@ -260,7 +260,7 @@ bool SwEditShell::Copy( SwEditShell* pDestShell )
         SwPaM* pCrsr = pDestShell->GetCrsr();
         pCrsr->SetMark();
         pCrsr->GetPoint()->nNode = aSttNdIdx.GetIndex()+1;
-        pCrsr->GetPoint()->nContent.Assign( pCrsr->GetCntntNode(),nSttCntIdx);
+        pCrsr->GetPoint()->nContent.Assign( pCrsr->GetContentNode(),nSttCntIdx);
         pCrsr->Exchange();
     }
     else
@@ -275,9 +275,9 @@ bool SwEditShell::Copy( SwEditShell* pDestShell )
     for(SwPaM& rCmp : pDestShell->GetCrsr()->GetRingContainer())
     {
         OSL_ENSURE( rCmp.GetPoint()->nContent.GetIdxReg()
-                    == rCmp.GetCntntNode(), "Point in wrong Node" );
+                    == rCmp.GetContentNode(), "Point in wrong Node" );
         OSL_ENSURE( rCmp.GetMark()->nContent.GetIdxReg()
-                    == rCmp.GetCntntNode(false), "Mark in wrong Node" );
+                    == rCmp.GetContentNode(false), "Mark in wrong Node" );
         bool bTst = *rCmp.GetPoint() == *rCmp.GetMark();
         (void) bTst;
     }
@@ -288,7 +288,7 @@ bool SwEditShell::Copy( SwEditShell* pDestShell )
     pDestShell->GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
     pDestShell->EndAllAction();
 
-    pDestShell->SaveTblBoxCntnt( pDestShell->GetCrsr()->GetPoint() );
+    pDestShell->SaveTableBoxContent( pDestShell->GetCrsr()->GetPoint() );
 
     return bRet;
 }
@@ -316,7 +316,7 @@ bool SwEditShell::Replace( const OUString& rNewStr, bool bRegExpRplc )
             {
                 bRet = GetDoc()->getIDocumentContentOperations().ReplaceRange( rPaM, rNewStr, bRegExpRplc )
                     || bRet;
-                SaveTblBoxCntnt( rPaM.GetPoint() );
+                SaveTableBoxContent( rPaM.GetPoint() );
             }
         }
 
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 0f1dd3366d47..b263122a5127 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -32,26 +32,26 @@
 #include <swundo.hxx>
 #include <docary.hxx>
 
-SwTxtFmtColl& SwEditShell::GetDfltTxtFmtColl() const
+SwTextFormatColl& SwEditShell::GetDfltTextFormatColl() const
 {
-    return *static_cast<SwTxtFmtColl*>( (GetDoc()->GetDfltTxtFmtColl()));
+    return *static_cast<SwTextFormatColl*>( (GetDoc()->GetDfltTextFormatColl()));
 }
 
-sal_uInt16 SwEditShell::GetTxtFmtCollCount() const
+sal_uInt16 SwEditShell::GetTextFormatCollCount() const
 {
-    return GetDoc()->GetTxtFmtColls()->size();
+    return GetDoc()->GetTextFormatColls()->size();
 }
 
-SwTxtFmtColl& SwEditShell::GetTxtFmtColl( sal_uInt16 nFmtColl) const
+SwTextFormatColl& SwEditShell::GetTextFormatColl( sal_uInt16 nFormatColl) const
 {
-    return *((*(GetDoc()->GetTxtFmtColls()))[nFmtColl]);
+    return *((*(GetDoc()->GetTextFormatColls()))[nFormatColl]);
 }
 
 // #i62675#
-void SwEditShell::SetTxtFmtColl(SwTxtFmtColl *pFmt,
+void SwEditShell::SetTextFormatColl(SwTextFormatColl *pFormat,
                                 const bool bResetListAttrs)
 {
-    SwTxtFmtColl *pLocal = pFmt? pFmt: (*GetDoc()->GetTxtFmtColls())[0];
+    SwTextFormatColl *pLocal = pFormat? pFormat: (*GetDoc()->GetTextFormatColls())[0];
     StartAllAction();
 
     SwRewriter aRewriter;
@@ -64,16 +64,16 @@ void SwEditShell::SetTxtFmtColl(SwTxtFmtColl *pFmt,
         if ( !rPaM.HasReadonlySel( GetViewOptions()->IsFormView() ) )
         {
             // Change the paragraph style to pLocal and remove all direct paragraph formatting.
-            GetDoc()->SetTxtFmtColl( rPaM, pLocal, true, bResetListAttrs );
+            GetDoc()->SetTextFormatColl( rPaM, pLocal, true, bResetListAttrs );
 
             // If there are hints on the nodes which cover the whole node, then remove those, too.
             SwPaM aPaM(*rPaM.Start(), *rPaM.End());
-            if (SwTxtNode* pEndTxtNode = aPaM.End()->nNode.GetNode().GetTxtNode())
+            if (SwTextNode* pEndTextNode = aPaM.End()->nNode.GetNode().GetTextNode())
             {
                 aPaM.Start()->nContent = 0;
-                aPaM.End()->nContent = pEndTxtNode->GetTxt().getLength();
+                aPaM.End()->nContent = pEndTextNode->GetText().getLength();
             }
-            GetDoc()->RstTxtAttrs(aPaM, /*bInclRefToxMark=*/false, /*bExactRange=*/true);
+            GetDoc()->RstTextAttrs(aPaM, /*bInclRefToxMark=*/false, /*bExactRange=*/true);
         }
 
     }
@@ -81,29 +81,29 @@ void SwEditShell::SetTxtFmtColl(SwTxtFmtColl *pFmt,
     EndAllAction();
 }
 
-SwTxtFmtColl* SwEditShell::MakeTxtFmtColl(const OUString& rFmtCollName,
-        SwTxtFmtColl* pParent)
+SwTextFormatColl* SwEditShell::MakeTextFormatColl(const OUString& rFormatCollName,
+        SwTextFormatColl* pParent)
 {
-    SwTxtFmtColl *pColl;
+    SwTextFormatColl *pColl;
     if ( pParent == 0 )
-        pParent = &GetTxtFmtColl(0);
-    if (  (pColl=GetDoc()->MakeTxtFmtColl(rFmtCollName, pParent)) == 0 )
+        pParent = &GetTextFormatColl(0);
+    if (  (pColl=GetDoc()->MakeTextFormatColl(rFormatCollName, pParent)) == 0 )
     {
-        OSL_FAIL( "MakeTxtFmtColl failed" );
+        OSL_FAIL( "MakeTextFormatColl failed" );
     }
     return pColl;
 
 }
 
-void SwEditShell::FillByEx(SwTxtFmtColl* pColl, bool bReset)
+void SwEditShell::FillByEx(SwTextFormatColl* pColl, bool bReset)
 {
     if( bReset )
     {
-        pColl->ResetAllFmtAttr();
+        pColl->ResetAllFormatAttr();
     }
 
     SwPaM * pCrsr = GetCrsr();
-    SwCntntNode * pCnt = pCrsr->GetCntntNode();
+    SwContentNode * pCnt = pCrsr->GetContentNode();
     const SfxItemSet* pSet = pCnt->GetpSwAttrSet();
     if( pSet )
     {
@@ -133,10 +133,10 @@ void SwEditShell::FillByEx(SwTxtFmtColl* pColl, bool bReset)
                 aSet.ClearItem( RES_PARATR_NUMRULE );
 
             if( aSet.Count() )
-                GetDoc()->ChgFmt(*pColl, aSet );
+                GetDoc()->ChgFormat(*pColl, aSet );
         }
         else
-            GetDoc()->ChgFmt(*pColl, *pSet );
+            GetDoc()->ChgFormat(*pColl, *pSet );
     }
 }
 
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index 1afc33ca31d2..3bc69b30c123 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -42,19 +42,19 @@
 #include <IDocumentContentOperations.hxx>
 
 /// count field types with a ResId, if 0 count all
-sal_uInt16 SwEditShell::GetFldTypeCount(sal_uInt16 nResId, bool bUsed ) const
+sal_uInt16 SwEditShell::GetFieldTypeCount(sal_uInt16 nResId, bool bUsed ) const
 {
-    const SwFldTypes* pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
+    const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
 
     if(nResId == USHRT_MAX)
     {
         if(!bUsed)
-            return static_cast<sal_uInt16>(pFldTypes->size());
+            return static_cast<sal_uInt16>(pFieldTypes->size());
 
         sal_uInt16 nUsed = 0;
-        for ( const auto pFldType : *pFldTypes )
+        for ( const auto pFieldType : *pFieldTypes )
         {
-            if(IsUsed(*pFldType))
+            if(IsUsed(*pFieldType))
                 nUsed++;
         }
         return nUsed;
@@ -62,32 +62,32 @@ sal_uInt16 SwEditShell::GetFldTypeCount(sal_uInt16 nResId, bool bUsed ) const
 
     // all types with the same ResId
     sal_uInt16 nIdx  = 0;
-    for(const auto pFldType : *pFldTypes)
+    for(const auto pFieldType : *pFieldTypes)
     {
         // same ResId -> increment index
-        if(pFldType->Which() == nResId)
+        if(pFieldType->Which() == nResId)
             nIdx++;
     }
     return nIdx;
 }
 
 /// get field types with a ResId, if 0 get all
-SwFieldType* SwEditShell::GetFldType(sal_uInt16 nFld, sal_uInt16 nResId, bool bUsed ) const
+SwFieldType* SwEditShell::GetFieldType(sal_uInt16 nField, sal_uInt16 nResId, bool bUsed ) const
 {
-    const SwFldTypes* pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
+    const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
 
-    if(nResId == USHRT_MAX && nFld < pFldTypes->size())
+    if(nResId == USHRT_MAX && nField < pFieldTypes->size())
     {
         if(!bUsed)
-            return (*pFldTypes)[nFld];
+            return (*pFieldTypes)[nField];
 
-        SwFldTypes::size_type nUsed = 0;
-        for ( const auto pFldType : *pFldTypes )
+        SwFieldTypes::size_type nUsed = 0;
+        for ( const auto pFieldType : *pFieldTypes )
         {
-            if(IsUsed(*pFldType))
+            if(IsUsed(*pFieldType))
             {
-                if(nUsed == nFld)
-                    return pFldType;
+                if(nUsed == nField)
+                    return pFieldType;
                 nUsed++;
             }
         }
@@ -95,15 +95,15 @@ SwFieldType* SwEditShell::GetFldType(sal_uInt16 nFld, sal_uInt16 nResId, bool bU
     }
 
     sal_uInt16 nIdx = 0;
-    for(const auto pFldType : *pFldTypes)
+    for(const auto pFieldType : *pFieldTypes)
     {
         // same ResId -> increment index
-        if(pFldType->Which() == nResId)
+        if(pFieldType->Which() == nResId)
         {
-            if (!bUsed || IsUsed(*pFldType))
+            if (!bUsed || IsUsed(*pFieldType))
             {
-                if(nIdx == nFld)
-                    return pFldType;
+                if(nIdx == nField)
+                    return pFieldType;
                 nIdx++;
             }
         }
@@ -112,50 +112,50 @@ SwFieldType* SwEditShell::GetFldType(sal_uInt16 nFld, sal_uInt16 nResId, bool bU
 }
 
 /// get first type with given ResId and name
-SwFieldType* SwEditShell::GetFldType(sal_uInt16 nResId, const OUString& rName) const
+SwFieldType* SwEditShell::GetFieldType(sal_uInt16 nResId, const OUString& rName) const
 {
-    return GetDoc()->getIDocumentFieldsAccess().GetFldType( nResId, rName, false );
+    return GetDoc()->getIDocumentFieldsAccess().GetFieldType( nResId, rName, false );
 }
 
 /// delete field type
-void SwEditShell::RemoveFldType(sal_uInt16 nFld, sal_uInt16 nResId)
+void SwEditShell::RemoveFieldType(sal_uInt16 nField, sal_uInt16 nResId)
 {
     if( USHRT_MAX == nResId )
     {
-        GetDoc()->getIDocumentFieldsAccess().RemoveFldType(nFld);
+        GetDoc()->getIDocumentFieldsAccess().RemoveFieldType(nField);
         return;
     }
 
-    const SwFldTypes* pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
+    const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
     sal_uInt16 nIdx = 0;
-    const SwFldTypes::size_type nSize = pFldTypes->size();
-    for( SwFldTypes::size_type i = 0; i < nSize; ++i )
+    const SwFieldTypes::size_type nSize = pFieldTypes->size();
+    for( SwFieldTypes::size_type i = 0; i < nSize; ++i )
         // Gleiche ResId -> Index erhoehen
-        if( (*pFldTypes)[i]->Which() == nResId && nIdx++ == nFld )
+        if( (*pFieldTypes)[i]->Which() == nResId && nIdx++ == nField )
         {
-            GetDoc()->getIDocumentFieldsAccess().RemoveFldType( i );
+            GetDoc()->getIDocumentFieldsAccess().RemoveFieldType( i );
             return;
         }
 }
 
 /// delete field type based on its name
-void SwEditShell::RemoveFldType(sal_uInt16 nResId, const OUString& rStr)
+void SwEditShell::RemoveFieldType(sal_uInt16 nResId, const OUString& rStr)
 {
-    const SwFldTypes* pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
-    const SwFldTypes::size_type nSize = pFldTypes->size();
+    const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
+    const SwFieldTypes::size_type nSize = pFieldTypes->size();
     const CharClass& rCC = GetAppCharClass();
 
     OUString aTmp( rCC.lowercase( rStr ));
 
-    for(SwFldTypes::size_type i = 0; i < nSize; ++i)
+    for(SwFieldTypes::size_type i = 0; i < nSize; ++i)
     {
         // same ResId -> increment index
-        SwFieldType* pFldType = (*pFldTypes)[i];
-        if( pFldType->Which() == nResId )
+        SwFieldType* pFieldType = (*pFieldTypes)[i];
+        if( pFieldType->Which() == nResId )
         {
-            if( aTmp == rCC.lowercase( pFldType->GetName() ) )
+            if( aTmp == rCC.lowercase( pFieldType->GetName() ) )
             {
-                GetDoc()->getIDocumentFieldsAccess().RemoveFldType(i);
+                GetDoc()->getIDocumentFieldsAccess().RemoveFieldType(i);
                 return;
             }
         }
@@ -187,11 +187,11 @@ void SwEditShell::FieldToText( SwFieldType* pType )
 }
 
 /// add a field at the cursor position
-void SwEditShell::Insert2(SwField& rFld, const bool bForceExpandHints)
+void SwEditShell::Insert2(SwField& rField, const bool bForceExpandHints)
 {
     SET_CURR_SHELL( this );
     StartAllAction();
-    SwFmtFld aFld( rFld );
+    SwFormatField aField( rField );
 
     const SetAttrMode nInsertFlags = (bForceExpandHints)
         ? SetAttrMode::FORCEHINTEXPAND
@@ -199,7 +199,7 @@ void SwEditShell::Insert2(SwField& rFld, const bool bForceExpandHints)
 
     for(SwPaM& rPaM : GetCrsr()->GetRingContainer()) // for each PaM
     {
-        const bool bSuccess(GetDoc()->getIDocumentContentOperations().InsertPoolItem(rPaM, aFld, nInsertFlags));
+        const bool bSuccess(GetDoc()->getIDocumentContentOperations().InsertPoolItem(rPaM, aField, nInsertFlags));
         OSL_ENSURE( bSuccess, "Doc->Insert(Field) failed");
         (void) bSuccess;
     }
@@ -208,11 +208,11 @@ void SwEditShell::Insert2(SwField& rFld, const bool bForceExpandHints)
 }
 
 /// Are the PaMs positioned on fields?
-static SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
+static SwTextField* lcl_FindInputField( SwDoc* pDoc, SwField& rField )
 {
     // Search field via its address. For input fields this needs to be done in protected fields.
-    SwTxtFld* pTFld = 0;
-    if( RES_INPUTFLD == rFld.Which() )
+    SwTextField* pTField = 0;
+    if( RES_INPUTFLD == rField.Which() )
     {
         const sal_uInt32 nMaxItems =
             pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_INPUTFIELD );
@@ -220,15 +220,15 @@ static SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
         {
             const SfxPoolItem* pItem = NULL;
             if( 0 != (pItem = pDoc->GetAttrPool().GetItem2( RES_TXTATR_INPUTFIELD, n ) )
-                && static_cast<const SwFmtFld*>(pItem)->GetField() == &rFld )
+                && static_cast<const SwFormatField*>(pItem)->GetField() == &rField )
             {
-                pTFld = const_cast<SwFmtFld*>(static_cast<const SwFmtFld*>(pItem))->GetTxtFld();
+                pTField = const_cast<SwFormatField*>(static_cast<const SwFormatField*>(pItem))->GetTextField();
                 break;
             }
         }
     }
-    else if( RES_SETEXPFLD == rFld.Which()
-        && static_cast<SwSetExpField&>(rFld).GetInputFlag() )
+    else if( RES_SETEXPFLD == rField.Which()
+        && static_cast<SwSetExpField&>(rField).GetInputFlag() )
     {
         const sal_uInt32 nMaxItems =
             pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_FIELD );
@@ -236,52 +236,52 @@ static SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
         {
             const SfxPoolItem* pItem = NULL;
             if( 0 != (pItem = pDoc->GetAttrPool().GetItem2( RES_TXTATR_FIELD, n ) )
-                && static_cast<const SwFmtFld*>(pItem)->GetField() == &rFld )
+                && static_cast<const SwFormatField*>(pItem)->GetField() == &rField )
             {
-                pTFld = const_cast<SwFmtFld*>(static_cast<const SwFmtFld*>(pItem))->GetTxtFld();
+                pTField = const_cast<SwFormatField*>(static_cast<const SwFormatField*>(pItem))->GetTextField();
                 break;
             }
         }
     }
-    return pTFld;
+    return pTField;
 }
 
-void SwEditShell::UpdateFlds( SwField &rFld )
+void SwEditShell::UpdateFields( SwField &rField )
 {
     SET_CURR_SHELL( this );
     StartAllAction();
     {
         // // If there are no selections so take the value of the current cursor position.
-        SwMsgPoolItem* pMsgHnt = 0;
-        SwRefMarkFldUpdate aRefMkHt( GetOut() );
-        sal_uInt16 nFldWhich = rFld.GetTyp()->Which();
-        if( RES_GETREFFLD == nFldWhich )
-            pMsgHnt = &aRefMkHt;
+        SwMsgPoolItem* pMsgHint = 0;
+        SwRefMarkFieldUpdate aRefMkHt( GetOut() );
+        sal_uInt16 nFieldWhich = rField.GetTyp()->Which();
+        if( RES_GETREFFLD == nFieldWhich )
+            pMsgHint = &aRefMkHt;
 
         SwPaM* pCrsr = GetCrsr();
-        SwTxtFld *pTxtFld;
-        SwFmtFld *pFmtFld;
+        SwTextField *pTextField;
+        SwFormatField *pFormatField;
 
         if ( !pCrsr->IsMultiSelection() && !pCrsr->HasMark())
         {
-            pTxtFld = GetTxtFldAtPos( pCrsr->Start(), true );
+            pTextField = GetTextFieldAtPos( pCrsr->Start(), true );
 
-            if (!pTxtFld) // #i30221#
-                pTxtFld = lcl_FindInputFld( GetDoc(), rFld);
+            if (!pTextField) // #i30221#
+                pTextField = lcl_FindInputField( GetDoc(), rField);
 
-            if (pTxtFld != 0)
-                GetDoc()->getIDocumentFieldsAccess().UpdateFld(pTxtFld, rFld, pMsgHnt, true);
+            if (pTextField != 0)
+                GetDoc()->getIDocumentFieldsAccess().UpdateField(pTextField, rField, pMsgHint, true);
         }
 
         // bOkay (instead of return because of EndAllAction) becomes false,
         // 1) if only one PaM has more than one field or
         // 2) if there are mixed field types
         bool bOkay = true;
-        bool bTblSelBreak = false;
+        bool bTableSelBreak = false;
 
-        SwMsgPoolItem aFldHint( RES_TXTATR_FIELD );  // Search-Hint
-        SwMsgPoolItem aAnnotationFldHint( RES_TXTATR_ANNOTATION );
-        SwMsgPoolItem aInputFldHint( RES_TXTATR_INPUTFIELD );
+        SwMsgPoolItem aFieldHint( RES_TXTATR_FIELD );  // Search-Hint
+        SwMsgPoolItem aAnnotationFieldHint( RES_TXTATR_ANNOTATION );
+        SwMsgPoolItem aInputFieldHint( RES_TXTATR_INPUTFIELD );
         for(SwPaM& rPaM : GetCrsr()->GetRingContainer()) // for each PaM
         {
             if( rPaM.HasMark() && bOkay )    // ... with selection
@@ -298,36 +298,36 @@ void SwEditShell::UpdateFlds( SwField &rFld )
                  * the loop terminates because Start = End.
                  */
 
-                // Search for SwTxtFld ...
+                // Search for SwTextField ...
                 while(  bOkay
                      && pCurStt->nContent != pCurEnd->nContent
-                     && ( aPam.Find( aFldHint, false, fnMoveForward, &aCurPam, true )
-                          || aPam.Find( aAnnotationFldHint, false, fnMoveForward, &aCurPam )
-                          || aPam.Find( aInputFldHint, false, fnMoveForward, &aCurPam ) ) )
+                     && ( aPam.Find( aFieldHint, false, fnMoveForward, &aCurPam, true )
+                          || aPam.Find( aAnnotationFieldHint, false, fnMoveForward, &aCurPam )
+                          || aPam.Find( aInputFieldHint, false, fnMoveForward, &aCurPam ) ) )
                 {
                     // if only one PaM has more than one field  ...
                     if( aPam.Start()->nContent != pCurStt->nContent )
                         bOkay = false;
 
-                    if( 0 != (pTxtFld = GetTxtFldAtPos( pCurStt, true )) )
+                    if( 0 != (pTextField = GetTextFieldAtPos( pCurStt, true )) )
                     {
-                        pFmtFld = const_cast<SwFmtFld*>(&pTxtFld->GetFmtFld());
-                        SwField *pCurFld = pFmtFld->GetField();
+                        pFormatField = const_cast<SwFormatField*>(&pTextField->GetFormatField());
+                        SwField *pCurField = pFormatField->GetField();
 
                         // if there are mixed field types
-                        if( pCurFld->GetTyp()->Which() !=
-                            rFld.GetTyp()->Which() )
+                        if( pCurField->GetTyp()->Which() !=
+                            rField.GetTyp()->Which() )
                             bOkay = false;
 
-                        bTblSelBreak = GetDoc()->getIDocumentFieldsAccess().UpdateFld(pTxtFld, rFld,
-                                                           pMsgHnt, false);
+                        bTableSelBreak = GetDoc()->getIDocumentFieldsAccess().UpdateField(pTextField, rField,
+                                                           pMsgHint, false);
                     }
                     // The search area is reduced by the found area:
                     ++pCurStt->nContent;
                 }
             }
 
-            if( bTblSelBreak ) // If table section and table formula are updated -> finish
+            if( bTableSelBreak ) // If table section and table formula are updated -> finish
                 break;
 
         }
@@ -364,11 +364,11 @@ void SwEditShell::ChangeDBFields( const std::vector<OUString>& rOldNames,
 }
 
 /// Update all expression fields
-void SwEditShell::UpdateExpFlds(bool bCloseDB)
+void SwEditShell::UpdateExpFields(bool bCloseDB)
 {
     SET_CURR_SHELL( this );
     StartAllAction();
-    GetDoc()->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    GetDoc()->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
     if (bCloseDB)
     {
 #if HAVE_FEATURE_DBCONNECTIVITY
@@ -388,27 +388,27 @@ SwDBManager* SwEditShell::GetDBManager() const
 }
 
 /// insert field type
-SwFieldType* SwEditShell::InsertFldType(const SwFieldType& rFldType)
+SwFieldType* SwEditShell::InsertFieldType(const SwFieldType& rFieldType)
 {
-    return GetDoc()->getIDocumentFieldsAccess().InsertFldType(rFldType);
+    return GetDoc()->getIDocumentFieldsAccess().InsertFieldType(rFieldType);
 }
 
-void SwEditShell::LockExpFlds()
+void SwEditShell::LockExpFields()
 {
-    GetDoc()->getIDocumentFieldsAccess().LockExpFlds();
+    GetDoc()->getIDocumentFieldsAccess().LockExpFields();
 }
 
-void SwEditShell::UnlockExpFlds()
+void SwEditShell::UnlockExpFields()
 {
-    GetDoc()->getIDocumentFieldsAccess().UnlockExpFlds();
+    GetDoc()->getIDocumentFieldsAccess().UnlockExpFields();
 }
 
-void SwEditShell::SetFldUpdateFlags( SwFldUpdateFlags eFlags )
+void SwEditShell::SetFieldUpdateFlags( SwFieldUpdateFlags eFlags )
 {
     getIDocumentSettingAccess()->setFieldUpdateFlags( eFlags );
 }
 
-SwFldUpdateFlags SwEditShell::GetFldUpdateFlags(bool bDocSettings) const
+SwFieldUpdateFlags SwEditShell::GetFieldUpdateFlags(bool bDocSettings) const
 {
     return getIDocumentSettingAccess()->getFieldUpdateFlags( !bDocSettings );
 }
@@ -430,25 +430,25 @@ void SwEditShell::ChangeAuthorityData(const SwAuthEntry* pNewData)
 
 bool SwEditShell::IsAnyDatabaseFieldInDoc()const
 {
-    const SwFldTypes * pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
-    for(const auto pFldType : *pFldTypes)
+    const SwFieldTypes * pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
+    for(const auto pFieldType : *pFieldTypes)
     {
-        if(IsUsed(*pFldType))
+        if(IsUsed(*pFieldType))
         {
-            switch(pFldType->Which())
+            switch(pFieldType->Which())
             {
                 case RES_DBFLD:
                 case RES_DBNEXTSETFLD:
                 case RES_DBNUMSETFLD:
                 case RES_DBSETNUMBERFLD:
                 {
-                    SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-                    SwFmtFld* pFld = aIter.First();
-                    while(pFld)
+                    SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+                    SwFormatField* pField = aIter.First();
+                    while(pField)
                     {
-                        if(pFld->IsFldInDoc())
+                        if(pField->IsFieldInDoc())
                             return true;
-                        pFld = aIter.Next();
+                        pField = aIter.Next();
                     }
                 }
                 break;
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index 52de1dea2de2..74a7ae9204ae 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -37,25 +37,25 @@ using namespace com::sun::star;
 
 bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const
 {
-    const SwFldTypes * pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
+    const SwFieldTypes * pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
     uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
     uno::Reference<sdb::XDatabaseContext> xDBContext = sdb::DatabaseContext::create(xContext);
-    for(const auto pFldType : *pFldTypes)
+    for(const auto pFieldType : *pFieldTypes)
     {
-        if(IsUsed(*pFldType))
+        if(IsUsed(*pFieldType))
         {
-            switch(pFldType->Which())
+            switch(pFieldType->Which())
             {
                 case RES_DBFLD:
                 {
-                    SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-                    SwFmtFld* pFmtFld = aIter.First();
-                    while(pFmtFld)
+                    SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+                    SwFormatField* pFormatField = aIter.First();
+                    while(pFormatField)
                     {
-                        if(pFmtFld->IsFldInDoc())
+                        if(pFormatField->IsFieldInDoc())
                         {
                             const SwDBData& rData =
-                                    static_cast<SwDBFieldType*>(pFmtFld->GetField()->GetTyp())->GetDBData();
+                                    static_cast<SwDBFieldType*>(pFormatField->GetField()->GetTyp())->GetDBData();
                             try
                             {
                                 return xDBContext->getByName(rData.sDataSource).hasValue();
@@ -66,7 +66,7 @@ bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const
                                 return false;
                             }
                         }
-                        pFmtFld = aIter.Next();
+                        pFormatField = aIter.Next();
                     }
                 }
                 break;
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index 1c94fb77e469..a8502effbda2 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -29,41 +29,41 @@
 #include "ndtxt.hxx"
 #include "hints.hxx"
 
-sal_uInt16 SwEditShell::GetCharFmtCount() const
+sal_uInt16 SwEditShell::GetCharFormatCount() const
 {
-    return GetDoc()->GetCharFmts()->size();
+    return GetDoc()->GetCharFormats()->size();
 }
 
-SwCharFmt& SwEditShell::GetCharFmt(sal_uInt16 nFmt) const
+SwCharFormat& SwEditShell::GetCharFormat(sal_uInt16 nFormat) const
 {
-    return *((*(GetDoc()->GetCharFmts()))[nFmt]);
+    return *((*(GetDoc()->GetCharFormats()))[nFormat]);
 }
 
-SwCharFmt* SwEditShell::GetCurCharFmt() const
+SwCharFormat* SwEditShell::GetCurCharFormat() const
 {
-    SwCharFmt *pFmt = 0;
+    SwCharFormat *pFormat = 0;
     SfxItemSet aSet( GetDoc()->GetAttrPool(), RES_TXTATR_CHARFMT,
                                                 RES_TXTATR_CHARFMT );
     const SfxPoolItem* pItem;
     if( GetCurAttr( aSet ) && SfxItemState::SET ==
         aSet.GetItemState( RES_TXTATR_CHARFMT, false, &pItem ) )
-        pFmt = static_cast<const SwFmtCharFmt*>(pItem)->GetCharFmt();
+        pFormat = static_cast<const SwFormatCharFormat*>(pItem)->GetCharFormat();
 
-    return pFmt;
+    return pFormat;
 }
 
-void SwEditShell::FillByEx(SwCharFmt* pCharFmt, bool bReset)
+void SwEditShell::FillByEx(SwCharFormat* pCharFormat, bool bReset)
 {
     if ( bReset )
     {
-        pCharFmt->ResetAllFmtAttr();
+        pCharFormat->ResetAllFormatAttr();
     }
 
     SwPaM* pPam = GetCrsr();
-    const SwCntntNode* pCNd = pPam->GetCntntNode();
-    if( pCNd->IsTxtNode() )
+    const SwContentNode* pCNd = pPam->GetContentNode();
+    if( pCNd->IsTextNode() )
     {
-        SwTxtNode const*const pTxtNode(pCNd->GetTxtNode());
+        SwTextNode const*const pTextNode(pCNd->GetTextNode());
         sal_Int32 nStt;
         sal_Int32 nEnd;
         if( pPam->HasMark() )
@@ -90,54 +90,54 @@ void SwEditShell::FillByEx(SwCharFmt* pCharFmt, bool bReset)
                     nStt = 0;
                 }
                 else
-                    nEnd = pTxtNode->GetTxt().getLength();
+                    nEnd = pTextNode->GetText().getLength();
             }
         }
         else
             nStt = nEnd = pPam->GetPoint()->nContent.GetIndex();
 
         SfxItemSet aSet( mpDoc->GetAttrPool(),
-                            pCharFmt->GetAttrSet().GetRanges() );
-        pTxtNode->GetAttr( aSet, nStt, nEnd );
-        pCharFmt->SetFmtAttr( aSet );
+                            pCharFormat->GetAttrSet().GetRanges() );
+        pTextNode->GetAttr( aSet, nStt, nEnd );
+        pCharFormat->SetFormatAttr( aSet );
     }
     else if( pCNd->HasSwAttrSet() )
-        pCharFmt->SetFmtAttr( *pCNd->GetpSwAttrSet() );
+        pCharFormat->SetFormatAttr( *pCNd->GetpSwAttrSet() );
 }
 
-size_t SwEditShell::GetTblFrmFmtCount(bool bUsed) const
+size_t SwEditShell::GetTableFrameFormatCount(bool bUsed) const
 {
-    return GetDoc()->GetTblFrmFmtCount(bUsed);
+    return GetDoc()->GetTableFrameFormatCount(bUsed);
 }
 
-SwFrmFmt& SwEditShell::GetTblFrmFmt(size_t nFmt, bool bUsed ) const
+SwFrameFormat& SwEditShell::GetTableFrameFormat(size_t nFormat, bool bUsed ) const
 {
-    return GetDoc()->GetTblFrmFmt(nFmt, bUsed );
+    return GetDoc()->GetTableFrameFormat(nFormat, bUsed );
 }
 
-OUString SwEditShell::GetUniqueTblName() const
+OUString SwEditShell::GetUniqueTableName() const
 {
-    return GetDoc()->GetUniqueTblName();
+    return GetDoc()->GetUniqueTableName();
 }
 
-SwCharFmt* SwEditShell::MakeCharFmt( const OUString& rName,
-                                    SwCharFmt* pDerivedFrom )
+SwCharFormat* SwEditShell::MakeCharFormat( const OUString& rName,
+                                    SwCharFormat* pDerivedFrom )
 {
     if( !pDerivedFrom )
-        pDerivedFrom = GetDoc()->GetDfltCharFmt();
+        pDerivedFrom = GetDoc()->GetDfltCharFormat();
 
-    return GetDoc()->MakeCharFmt( rName, pDerivedFrom );
+    return GetDoc()->MakeCharFormat( rName, pDerivedFrom );
 }
 
-SwTxtFmtColl* SwEditShell::GetTxtCollFromPool( sal_uInt16 nId )
+SwTextFormatColl* SwEditShell::GetTextCollFromPool( sal_uInt16 nId )
 {
-    return GetDoc()->getIDocumentStylePoolAccess().GetTxtCollFromPool( nId );
+    return GetDoc()->getIDocumentStylePoolAccess().GetTextCollFromPool( nId );
 }
 
 /// return the requested automatic format - base-class !
-SwFmt* SwEditShell::GetFmtFromPool( sal_uInt16 nId )
+SwFormat* SwEditShell::GetFormatFromPool( sal_uInt16 nId )
 {
-    return GetDoc()->getIDocumentStylePoolAccess().GetFmtFromPool( nId );
+    return GetDoc()->getIDocumentStylePoolAccess().GetFormatFromPool( nId );
 }
 
 SwPageDesc* SwEditShell::GetPageDescFromPool( sal_uInt16 nId )
@@ -150,19 +150,19 @@ bool SwEditShell::IsUsed( const SwModify& rModify ) const
     return mpDoc->IsUsed( rModify );
 }
 
-const SwFlyFrmFmt* SwEditShell::FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp ) const
+const SwFlyFrameFormat* SwEditShell::FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp ) const
 {
     return mpDoc->FindFlyByName(rName, nNdTyp);
 }
 
-SwCharFmt* SwEditShell::FindCharFmtByName( const OUString& rName ) const
+SwCharFormat* SwEditShell::FindCharFormatByName( const OUString& rName ) const
 {
-    return mpDoc->FindCharFmtByName( rName );
+    return mpDoc->FindCharFormatByName( rName );
 }
 
-SwTxtFmtColl* SwEditShell::FindTxtFmtCollByName( const OUString& rName ) const
+SwTextFormatColl* SwEditShell::FindTextFormatCollByName( const OUString& rName ) const
 {
-    return mpDoc->FindTxtFmtCollByName( rName );
+    return mpDoc->FindTextFormatCollByName( rName );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index 5666b73e3a8e..a5311bd8bce8 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -60,11 +60,11 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
 
     // then all linked areas on the topmost level
     SwDoc* pMyDoc = GetDoc();
-    const SwSectionFmts& rSectFmts = pMyDoc->GetSections();
+    const SwSectionFormats& rSectFormats = pMyDoc->GetSections();
 
-    for( auto n = rSectFmts.size(); n; )
+    for( auto n = rSectFormats.size(); n; )
     {
-        const SwSection* pSect = rSectFmts[ --n ]->GetGlobalDocSection();
+        const SwSection* pSect = rSectFormats[ --n ]->GetGlobalDocSection();
         if( pSect )
         {
             SwGlblDocContent* pNew;
@@ -95,7 +95,7 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
         // Search from StartPos until rNew.DocPos for a content node.
         // If one exists then a dummy entry is needed.
         for( ; nSttIdx < rNew.GetDocPos(); ++nSttIdx )
-            if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsCntntNode()
+            if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsContentNode()
                 || pNd->IsSectionNode() || pNd->IsTableNode() )
             {
                 SwGlblDocContent* pNew = new SwGlblDocContent( nSttIdx );
@@ -116,7 +116,7 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
     {
         sal_uLong nNdEnd = pMyDoc->GetNodes().GetEndOfContent().GetIndex();
         for( ; nSttIdx < nNdEnd; ++nSttIdx )
-            if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsCntntNode()
+            if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsContentNode()
                 || pNd->IsSectionNode() || pNd->IsTableNode() )
             {
                 SwGlblDocContent* pNew = new SwGlblDocContent( nSttIdx );
@@ -151,15 +151,15 @@ bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos,
 
     bool bEndUndo = false;
     SwDoc* pMyDoc = GetDoc();
-    SwTxtNode *const pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( pTxtNd )
-        rPos.nContent.Assign( pTxtNd, 0 );
+    SwTextNode *const pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( pTextNd )
+        rPos.nContent.Assign( pTextNd, 0 );
     else
     {
         bEndUndo = true;
         pMyDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
         --rPos.nNode;
-        pMyDoc->getIDocumentContentOperations().AppendTxtNode( rPos );
+        pMyDoc->getIDocumentContentOperations().AppendTextNode( rPos );
         pCrsr->SetMark();
     }
 
@@ -192,16 +192,16 @@ bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos,
 
     bool bEndUndo = false;
     SwDoc* pMyDoc = GetDoc();
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if (pTxtNd && pTxtNd->GetTxt().getLength() && rPos.nNode.GetIndex() + 1 !=
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if (pTextNd && pTextNd->GetText().getLength() && rPos.nNode.GetIndex() + 1 !=
         pMyDoc->GetNodes().GetEndOfContent().GetIndex() )
-        rPos.nContent.Assign( pTxtNd, 0 );
+        rPos.nContent.Assign( pTextNd, 0 );
     else
     {
         bEndUndo = true;
         pMyDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
         --rPos.nNode;
-        pMyDoc->getIDocumentContentOperations().AppendTxtNode( rPos );
+        pMyDoc->getIDocumentContentOperations().AppendTextNode( rPos );
     }
 
     InsertTableOf( rTOX );
@@ -232,7 +232,7 @@ bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos )
     rPos.nContent.Assign( 0, 0 );
 
     SwDoc* pMyDoc = GetDoc();
-    pMyDoc->getIDocumentContentOperations().AppendTxtNode( rPos );
+    pMyDoc->getIDocumentContentOperations().AppendTextNode( rPos );
     EndAllAction();
     return true;
 }
@@ -262,7 +262,7 @@ bool SwEditShell::DeleteGlobalDocContent( const SwGlblDocContents& rArr ,
         rPos.nNode = nDelIdx - 1;
         rPos.nContent.Assign( 0, 0 );
 
-        pMyDoc->getIDocumentContentOperations().AppendTxtNode( rPos );
+        pMyDoc->getIDocumentContentOperations().AppendTextNode( rPos );
         ++nDelIdx;
     }
 
@@ -291,8 +291,8 @@ bool SwEditShell::DeleteGlobalDocContent( const SwGlblDocContents& rArr ,
 
     case GLBLDOC_SECTION:
         {
-            SwSectionFmt* pSectFmt = const_cast<SwSectionFmt*>(rDelPos.GetSection()->GetFmt());
-            pMyDoc->DelSectionFmt( pSectFmt, true );
+            SwSectionFormat* pSectFormat = const_cast<SwSectionFormat*>(rDelPos.GetSection()->GetFormat());
+            pMyDoc->DelSectionFormat( pSectFormat, true );
         }
         break;
     }
@@ -355,7 +355,7 @@ bool SwEditShell::GotoGlobalDocContent( const SwGlblDocContent& rPos )
     rCrsrPos.nNode = rPos.GetDocPos();
 
     SwDoc* pMyDoc = GetDoc();
-    SwCntntNode * pCNd = rCrsrPos.nNode.GetNode().GetCntntNode();
+    SwContentNode * pCNd = rCrsrPos.nNode.GetNode().GetContentNode();
     if( !pCNd )
         pCNd = pMyDoc->GetNodes().GoNext( &rCrsrPos.nNode );
 
@@ -377,7 +377,7 @@ SwGlblDocContent::SwGlblDocContent( const SwTOXBaseSection* pTOX )
     eType = GLBLDOC_TOXBASE;
     PTR.pTOX = pTOX;
 
-    const SwSectionNode* pSectNd = pTOX->GetFmt()->GetSectionNode();
+    const SwSectionNode* pSectNd = pTOX->GetFormat()->GetSectionNode();
     nDocPos = pSectNd ? pSectNd->GetIndex() : 0;
 }
 
@@ -386,7 +386,7 @@ SwGlblDocContent::SwGlblDocContent( const SwSection* pSect )
     eType = GLBLDOC_SECTION;
     PTR.pSect = pSect;
 
-    const SwSectionNode* pSectNd = pSect->GetFmt()->GetSectionNode();
+    const SwSectionNode* pSectNd = pSect->GetFormat()->GetSectionNode();
     nDocPos = pSectNd ? pSectNd->GetIndex() : 0;
 }
 
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 56475875d8b3..3ef28d49d274 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -45,7 +45,7 @@ void SwEditShell::InsertGlossary( SwTextBlocks& rGlossary, const OUString& rStr
 
 /// convert current selection into text block and add to the text block document, incl. templates
 sal_uInt16 SwEditShell::MakeGlossary( SwTextBlocks& rBlks, const OUString& rName, const OUString& rShortName,
-                                    bool bSaveRelFile, const OUString* pOnlyTxt )
+                                    bool bSaveRelFile, const OUString* pOnlyText )
 {
     SwDoc* pGDoc = rBlks.GetDoc();
 
@@ -57,8 +57,8 @@ sal_uInt16 SwEditShell::MakeGlossary( SwTextBlocks& rBlks, const OUString& rName
     }
     rBlks.SetBaseURL( sBase );
 
-    if( pOnlyTxt )
-        return rBlks.PutText( rShortName, rName, *pOnlyTxt );
+    if( pOnlyText )
+        return rBlks.PutText( rShortName, rName, *pOnlyText );
 
     rBlks.ClearDoc();
     if( rBlks.BeginPutDoc( rShortName, rName ) )
@@ -76,7 +76,7 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
                                     const OUString& rName,
                                     const OUString& rShortName,
                                     bool bSaveRelFile,
-                                    bool bOnlyTxt )
+                                    bool bOnlyText )
 {
     StartAllAction();
 
@@ -92,28 +92,28 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
     rBlock.SetBaseURL( sBase );
     sal_uInt16 nRet = USHRT_MAX;
 
-    if( bOnlyTxt )
+    if( bOnlyText )
     {
         KillPams();
 
         SwPaM* pCrsr = GetCrsr();
 
         SwNodeIndex aStt( pMyDoc->GetNodes().GetEndOfExtras(), 1 );
-        SwCntntNode* pCntntNd = pMyDoc->GetNodes().GoNext( &aStt );
-        const SwNode* pNd = pCntntNd->FindTableNode();
+        SwContentNode* pContentNd = pMyDoc->GetNodes().GoNext( &aStt );
+        const SwNode* pNd = pContentNd->FindTableNode();
         if( !pNd )
-            pNd = pCntntNd;
+            pNd = pContentNd;
 
         pCrsr->GetPoint()->nNode = *pNd;
-        if( pNd == pCntntNd )
-            pCrsr->GetPoint()->nContent.Assign( pCntntNd, 0 );
+        if( pNd == pContentNd )
+            pCrsr->GetPoint()->nContent.Assign( pContentNd, 0 );
         pCrsr->SetMark();
 
         // then until the end of the Node array
         pCrsr->GetPoint()->nNode = pMyDoc->GetNodes().GetEndOfContent().GetIndex()-1;
-        pCntntNd = pCrsr->GetCntntNode();
-        if( pCntntNd )
-            pCrsr->GetPoint()->nContent.Assign( pCntntNd, pCntntNd->Len() );
+        pContentNd = pCrsr->GetContentNode();
+        if( pContentNd )
+            pCrsr->GetPoint()->nContent.Assign( pContentNd, pContentNd->Len() );
 
         OUString sBuf;
         if( GetSelectedText( sBuf, GETSELTXT_PARABRK_TO_ONLYCR ) && !sBuf.isEmpty() )
@@ -125,21 +125,21 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
         if( rBlock.BeginPutDoc( rShortName, rName ) )
         {
             SwNodeIndex aStt( pMyDoc->GetNodes().GetEndOfExtras(), 1 );
-            SwCntntNode* pCntntNd = pMyDoc->GetNodes().GoNext( &aStt );
-            const SwNode* pNd = pCntntNd->FindTableNode();
-            if( !pNd ) pNd = pCntntNd;
+            SwContentNode* pContentNd = pMyDoc->GetNodes().GoNext( &aStt );
+            const SwNode* pNd = pContentNd->FindTableNode();
+            if( !pNd ) pNd = pContentNd;
             SwPaM aCpyPam( *pNd );
             aCpyPam.SetMark();
 
             // then until the end of the nodes array
             aCpyPam.GetPoint()->nNode = pMyDoc->GetNodes().GetEndOfContent().GetIndex()-1;
-            pCntntNd = aCpyPam.GetCntntNode();
+            pContentNd = aCpyPam.GetContentNode();
             aCpyPam.GetPoint()->nContent.Assign(
-                   pCntntNd, (pCntntNd) ? pCntntNd->Len() : 0);
+                   pContentNd, (pContentNd) ? pContentNd->Len() : 0);
 
             aStt = pGDoc->GetNodes().GetEndOfExtras();
-            pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
-            SwPosition aInsPos( aStt, SwIndex( pCntntNd ));
+            pContentNd = pGDoc->GetNodes().GoNext( &aStt );
+            SwPosition aInsPos( aStt, SwIndex( pContentNd ));
             pMyDoc->getIDocumentContentOperations().CopyRange( aCpyPam, aInsPos, /*bCopyAll=*/false, /*bCheckPos=*/true );
 
             nRet = rBlock.PutDoc();
@@ -157,7 +157,7 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
     SwNodes& rNds = pInsDoc->GetNodes();
 
     SwNodeIndex aIdx( rNds.GetEndOfContent(), -1 );
-    SwCntntNode *const pContentNode = aIdx.GetNode().GetCntntNode();
+    SwContentNode *const pContentNode = aIdx.GetNode().GetContentNode();
     SwPosition aPos( aIdx,
         SwIndex(pContentNode, (pContentNode) ? pContentNode->Len() : 0));
 
@@ -171,7 +171,7 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
     bool bRet = false;
     SET_CURR_SHELL( this );
 
-    pInsDoc->getIDocumentFieldsAccess().LockExpFlds();
+    pInsDoc->getIDocumentFieldsAccess().LockExpFields();
 
     if( IsTableMode() )
     {
@@ -179,26 +179,26 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
         // selected boxes. The sizes are corrected on a percentage basis.
 
         // search boxes using the layout
-        SwTableNode* pTblNd;
+        SwTableNode* pTableNd;
         SwSelBoxes aBoxes;
-        GetTblSel( *this, aBoxes );
-        if( !aBoxes.empty() && 0 != (pTblNd = const_cast<SwTableNode*>(aBoxes[0]
+        GetTableSel( *this, aBoxes );
+        if( !aBoxes.empty() && 0 != (pTableNd = const_cast<SwTableNode*>(aBoxes[0]
             ->GetSttNd()->FindTableNode()) ))
         {
             // check if the table name can be copied
-            bool bCpyTblNm = aBoxes.size() == pTblNd->GetTable().GetTabSortBoxes().size();
-            if( bCpyTblNm )
+            bool bCpyTableNm = aBoxes.size() == pTableNd->GetTable().GetTabSortBoxes().size();
+            if( bCpyTableNm )
             {
-                const OUString rTblName = pTblNd->GetTable().GetFrmFmt()->GetName();
-                const SwFrmFmts& rTblFmts = *pInsDoc->GetTblFrmFmts();
-                for( auto n = rTblFmts.size(); n; )
-                    if( rTblFmts[ --n ]->GetName() == rTblName )
+                const OUString rTableName = pTableNd->GetTable().GetFrameFormat()->GetName();
+                const SwFrameFormats& rTableFormats = *pInsDoc->GetTableFrameFormats();
+                for( auto n = rTableFormats.size(); n; )
+                    if( rTableFormats[ --n ]->GetName() == rTableName )
                     {
-                        bCpyTblNm = false;
+                        bCpyTableNm = false;
                         break;
                     }
             }
-            bRet = pInsDoc->InsCopyOfTbl( aPos, aBoxes, 0, bCpyTblNm, false );
+            bRet = pInsDoc->InsCopyOfTable( aPos, aBoxes, 0, bCpyTableNm, false );
         }
         else
             bRet = false;
@@ -214,12 +214,12 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
             {
                 if( !rPaM.HasMark() )
                 {
-                    SwCntntNode *const pNd = rPaM.GetCntntNode();
+                    SwContentNode *const pNd = rPaM.GetContentNode();
                     if (0 != pNd &&
-                        ( bColSel || !pNd->GetTxtNode() ) )
+                        ( bColSel || !pNd->GetTextNode() ) )
                     {
                         rPaM.SetMark();
-                        rPaM.Move( fnMoveForward, fnGoCntnt );
+                        rPaM.Move( fnMoveForward, fnGoContent );
                         bRet = GetDoc()->getIDocumentContentOperations().CopyRange( rPaM, aPos, /*bCopyAll=*/false, /*bCheckPos=*/true )
                             || bRet;
                         rPaM.Exchange();
@@ -246,9 +246,9 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
         }
     }
 
-    pInsDoc->getIDocumentFieldsAccess().UnlockExpFlds();
-    if( !pInsDoc->getIDocumentFieldsAccess().IsExpFldsLocked() )
-        pInsDoc->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    pInsDoc->getIDocumentFieldsAccess().UnlockExpFields();
+    if( !pInsDoc->getIDocumentFieldsAccess().IsExpFieldsLocked() )
+        pInsDoc->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
 
     // set the saved Node position back to the correct Node
     if( bRet && pSttNd )
@@ -266,7 +266,7 @@ bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk )
     GetCrsr();  // creates all cursors if needed
     if( IsSelOnePara() )
     {
-        rBuf = GetSelTxt();
+        rBuf = GetSelText();
         if( GETSELTXT_PARABRK_TO_BLANK == nHndlParaBrk )
         {
             rBuf = rBuf.replaceAll(OUString(0x0a), " ");
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 74a7be25ed56..72d76a34b384 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -74,7 +74,7 @@ void SwEditShell::Insert( sal_Unicode c, bool bOnlyCurrCrsr )
         OSL_ENSURE( bSuccess, "Doc->Insert() failed." );
         (void) bSuccess;
 
-        SaveTblBoxCntnt( rPaM.GetPoint() );
+        SaveTableBoxContent( rPaM.GetPoint() );
         if( bOnlyCurrCrsr )
             break;
 
@@ -104,13 +104,13 @@ void SwEditShell::Insert2(const OUString &rStr, const bool bForceExpandHints )
                 GetDoc()->UpdateRsid( rCurrentCrsr, rStr.getLength() );
 
                 // Set paragraph rsid if beginning of paragraph
-                SwTxtNode *const pTxtNode =
-                    rCurrentCrsr.GetPoint()->nNode.GetNode().GetTxtNode();
-                if( pTxtNode && pTxtNode->Len() == 1)
-                    GetDoc()->UpdateParRsid( pTxtNode );
+                SwTextNode *const pTextNode =
+                    rCurrentCrsr.GetPoint()->nNode.GetNode().GetTextNode();
+                if( pTextNode && pTextNode->Len() == 1)
+                    GetDoc()->UpdateParRsid( pTextNode );
             }
 
-            SaveTblBoxCntnt( rCurrentCrsr.GetPoint() );
+            SaveTableBoxContent( rCurrentCrsr.GetPoint() );
 
         }
     }
@@ -123,7 +123,7 @@ void SwEditShell::Insert2(const OUString &rStr, const bool bForceExpandHints )
     if ( ! bDoNotSetBidiLevel )
     {
         SwNode& rNode = pTmpCrsr->GetPoint()->nNode.GetNode();
-        if ( rNode.IsTxtNode() )
+        if ( rNode.IsTextNode() )
         {
             SwIndex& rIdx = pTmpCrsr->GetPoint()->nContent;
             sal_Int32 nPos = rIdx.GetIndex();
@@ -131,25 +131,25 @@ void SwEditShell::Insert2(const OUString &rStr, const bool bForceExpandHints )
             if ( nPrevPos )
                 --nPrevPos;
 
-            SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( static_cast<SwTxtNode&>(rNode), true );
+            SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( static_cast<SwTextNode&>(rNode), true );
 
             sal_uInt8 nLevel = 0;
             if ( ! pSI )
             {
                 // seems to be an empty paragraph.
                 Point aPt;
-                SwCntntFrm* pFrm =
-                        static_cast<SwTxtNode&>(rNode).getLayoutFrm( GetLayout(), &aPt, pTmpCrsr->GetPoint(),
+                SwContentFrm* pFrm =
+                        static_cast<SwTextNode&>(rNode).getLayoutFrm( GetLayout(), &aPt, pTmpCrsr->GetPoint(),
                                                     false );
 
                 SwScriptInfo aScriptInfo;
-                aScriptInfo.InitScriptInfo( static_cast<SwTxtNode&>(rNode), pFrm->IsRightToLeft() );
+                aScriptInfo.InitScriptInfo( static_cast<SwTextNode&>(rNode), pFrm->IsRightToLeft() );
                 nLevel = aScriptInfo.DirType( nPrevPos );
             }
             else
             {
                 if ( COMPLETE_STRING != pSI->GetInvalidityA() )
-                    pSI->InitScriptInfo( static_cast<SwTxtNode&>(rNode) );
+                    pSI->InitScriptInfo( static_cast<SwTextNode&>(rNode) );
                 nLevel = pSI->DirType( nPrevPos );
             }
 
@@ -171,7 +171,7 @@ void SwEditShell::Overwrite(const OUString &rStr)
         {
             OSL_FAIL( "Doc->getIDocumentContentOperations().Overwrite(Str) failed." );
         }
-        SaveTblBoxCntnt( rPaM.GetPoint() );
+        SaveTableBoxContent( rPaM.GetPoint() );
     }
     EndAllAction();
 }
@@ -191,15 +191,15 @@ long SwEditShell::SplitNode( bool bAutoFormat, bool bCheckTableStart )
     GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
 
     if( bAutoFormat )
-        AutoFmtBySplitNode();
+        AutoFormatBySplitNode();
 
-    ClearTblBoxCntnt();
+    ClearTableBoxContent();
 
     EndAllAction();
     return 1L;
 }
 
-bool SwEditShell::AppendTxtNode()
+bool SwEditShell::AppendTextNode()
 {
     bool bRet = false;
     StartAllAction();
@@ -208,12 +208,12 @@ bool SwEditShell::AppendTxtNode()
     for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
     {
         GetDoc()->ClearBoxNumAttrs( rPaM.GetPoint()->nNode );
-        bRet = GetDoc()->getIDocumentContentOperations().AppendTxtNode( *rPaM.GetPoint()) || bRet;
+        bRet = GetDoc()->getIDocumentContentOperations().AppendTextNode( *rPaM.GetPoint()) || bRet;
     }
 
     GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
 
-    ClearTblBoxCntnt();
+    ClearTableBoxContent();
 
     EndAllAction();
     return bRet;
@@ -270,13 +270,13 @@ sal_uInt16 SwEditShell::GetGraphicType() const
 // GetMark is not set or points to the same graphic
 bool SwEditShell::GetGrfSize(Size& rSz) const
 {
-    SwNoTxtNode* pNoTxtNd;
+    SwNoTextNode* pNoTextNd;
     SwPaM* pCurrentCrsr = GetCrsr();
     if( ( !pCurrentCrsr->HasMark()
          || pCurrentCrsr->GetPoint()->nNode == pCurrentCrsr->GetMark()->nNode )
-         && 0 != ( pNoTxtNd = pCurrentCrsr->GetNode().GetNoTxtNode() ) )
+         && 0 != ( pNoTextNd = pCurrentCrsr->GetNode().GetNoTextNode() ) )
     {
-        rSz = pNoTxtNd->GetTwipSize();
+        rSz = pNoTextNd->GetTwipSize();
         return true;
     }
     return false;
@@ -295,11 +295,11 @@ void SwEditShell::ReRead( const OUString& rGrfName, const OUString& rFltName,
 /// Returns the name and the filter name of a graphic if the pointer is on a graphic.
 /// If a String-pointer is != 0 then return corresponding name.
 void SwEditShell::GetGrfNms( OUString* pGrfName, OUString* pFltName,
-                            const SwFlyFrmFmt* pFmt ) const
+                            const SwFlyFrameFormat* pFormat ) const
 {
     OSL_ENSURE( pGrfName || pFltName, "No parameters" );
-    if( pFmt )
-        SwDoc::GetGrfNms( *pFmt, pGrfName, pFltName );
+    if( pFormat )
+        SwDoc::GetGrfNms( *pFormat, pGrfName, pFltName );
     else
     {
         SwGrfNode *pGrfNode = _GetGrfNode();
@@ -310,33 +310,33 @@ void SwEditShell::GetGrfNms( OUString* pGrfName, OUString* pFltName,
 
 const tools::PolyPolygon *SwEditShell::GetGraphicPolygon() const
 {
-    SwNoTxtNode *pNd = GetCrsr()->GetNode().GetNoTxtNode();
+    SwNoTextNode *pNd = GetCrsr()->GetNode().GetNoTextNode();
     return pNd->HasContour();
 }
 
 void SwEditShell::SetGraphicPolygon( const tools::PolyPolygon *pPoly )
 {
-    SwNoTxtNode *pNd = GetCrsr()->GetNode().GetNoTxtNode();
+    SwNoTextNode *pNd = GetCrsr()->GetNode().GetNoTextNode();
     StartAllAction();
     pNd->SetContour( pPoly );
     SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pNd->getLayoutFrm(GetLayout())->GetUpper());
-    const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround();
-    pFly->GetFmt()->NotifyClients( &rSur, &rSur );
+    const SwFormatSurround &rSur = pFly->GetFormat()->GetSurround();
+    pFly->GetFormat()->NotifyClients( &rSur, &rSur );
     GetDoc()->getIDocumentState().SetModified();
     EndAllAction();
 }
 
 void SwEditShell::ClearAutomaticContour()
 {
-    SwNoTxtNode *pNd = GetCrsr()->GetNode().GetNoTxtNode();
-    OSL_ENSURE( pNd, "is no NoTxtNode!" );
+    SwNoTextNode *pNd = GetCrsr()->GetNode().GetNoTextNode();
+    OSL_ENSURE( pNd, "is no NoTextNode!" );
     if( pNd->HasAutomaticContour() )
     {
         StartAllAction();
         pNd->SetContour( NULL, false );
         SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pNd->getLayoutFrm(GetLayout())->GetUpper());
-        const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround();
-        pFly->GetFmt()->NotifyClients( &rSur, &rSur );
+        const SwFormatSurround &rSur = pFly->GetFormat()->GetSurround();
+        pFly->GetFormat()->NotifyClients( &rSur, &rSur );
         GetDoc()->getIDocumentState().SetModified();
         EndAllAction();
     }
@@ -371,7 +371,7 @@ bool SwEditShell::HasOLEObj( const OUString &rName ) const
         ++aIdx;
         SwNode& rNd = aIdx.GetNode();
         if( rNd.IsOLENode() &&
-            rName == static_cast<SwOLENode&>(rNd).GetChartTblName() &&
+            rName == static_cast<SwOLENode&>(rNd).GetChartTableName() &&
             static_cast<SwOLENode&>(rNd).getLayoutFrm( GetLayout() ) )
             return true;
 
@@ -384,7 +384,7 @@ void SwEditShell::SetChartName( const OUString &rName )
 {
     SwOLENode *pONd = GetCrsr()->GetNode().GetOLENode();
     OSL_ENSURE( pONd, "ChartNode not found" );
-    pONd->SetChartTblName( rName );
+    pONd->SetChartTableName( rName );
 }
 
 void SwEditShell::UpdateCharts( const OUString &rName )
@@ -393,16 +393,16 @@ void SwEditShell::UpdateCharts( const OUString &rName )
 }
 
 /// change table name
-void SwEditShell::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
+void SwEditShell::SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName )
 {
-    GetDoc()->SetTableName( rTblFmt, rNewName );
+    GetDoc()->SetTableName( rTableFormat, rNewName );
 }
 
 /// request current word
 OUString SwEditShell::GetCurWord()
 {
     const SwPaM& rPaM = *GetCrsr();
-    const SwTxtNode* pNd = rPaM.GetNode().GetTxtNode();
+    const SwTextNode* pNd = rPaM.GetNode().GetTextNode();
     OUString aString = pNd ?
                      pNd->GetCurWord(rPaM.GetPoint()->nContent.GetIndex()) :
                      OUString();
@@ -427,7 +427,7 @@ const SwDocStat& SwEditShell::GetUpdatedDocStat()
 // OPT: eddocinl.cxx
 
 /// get the reference of a given name in the Doc
-const SwFmtRefMark* SwEditShell::GetRefMark( const OUString& rName ) const
+const SwFormatRefMark* SwEditShell::GetRefMark( const OUString& rName ) const
 {
     return GetDoc()->GetRefMark( rName );
 }
@@ -438,7 +438,7 @@ sal_uInt16 SwEditShell::GetRefMarks( std::vector<OUString>* pStrings ) const
     return GetDoc()->GetRefMarks( pStrings );
 }
 
-OUString SwEditShell::GetDropTxt( const sal_Int32 nChars ) const
+OUString SwEditShell::GetDropText( const sal_Int32 nChars ) const
 {
     /*
      * pb: made changes for #i74939#
@@ -446,7 +446,7 @@ OUString SwEditShell::GetDropTxt( const sal_Int32 nChars ) const
      * always return a string even though there is a selection
      */
 
-    OUString aTxt;
+    OUString aText;
     SwPaM* pCrsr = GetCrsr();
     if ( IsMultiSelection() )
     {
@@ -473,22 +473,22 @@ OUString SwEditShell::GetDropTxt( const sal_Int32 nChars ) const
         }
     }
 
-    SwTxtNode* pTxtNd = pCrsr->GetNode( !pCrsr->HasMark() ).GetTxtNode();
-    if( pTxtNd )
+    SwTextNode* pTextNd = pCrsr->GetNode( !pCrsr->HasMark() ).GetTextNode();
+    if( pTextNd )
     {
-        sal_Int32 nDropLen = pTxtNd->GetDropLen( nChars );
+        sal_Int32 nDropLen = pTextNd->GetDropLen( nChars );
         if( nDropLen )
-            aTxt = pTxtNd->GetTxt().copy(0, nDropLen);
+            aText = pTextNd->GetText().copy(0, nDropLen);
     }
 
-    return aTxt;
+    return aText;
 }
 
-void SwEditShell::ReplaceDropTxt( const OUString &rStr, SwPaM* pPaM )
+void SwEditShell::ReplaceDropText( const OUString &rStr, SwPaM* pPaM )
 {
     SwPaM* pCrsr = pPaM ? pPaM : GetCrsr();
     if( pCrsr->GetPoint()->nNode == pCrsr->GetMark()->nNode &&
-        pCrsr->GetNode().GetTxtNode()->IsTxtNode() )
+        pCrsr->GetNode().GetTextNode()->IsTextNode() )
     {
         StartAllAction();
 
@@ -511,18 +511,18 @@ OUString SwEditShell::Calculate()
 
     for(SwPaM& rCurrentPaM : GetCrsr()->GetNext()->GetRingContainer())
     {
-        SwTxtNode* pTxtNd = rCurrentPaM.GetNode().GetTxtNode();
-        if(pTxtNd)
+        SwTextNode* pTextNd = rCurrentPaM.GetNode().GetTextNode();
+        if(pTextNd)
         {
             const SwPosition *pStart = rCurrentPaM.Start(), *pEnd = rCurrentPaM.End();
             const sal_Int32 nStt = pStart->nContent.GetIndex();
-            OUString aStr = pTxtNd->GetExpandTxt( nStt, pEnd->nContent.
+            OUString aStr = pTextNd->GetExpandText( nStt, pEnd->nContent.
                                                 GetIndex() - nStt );
 
             aStr = rCC.lowercase( aStr );
 
             sal_Unicode ch;
-            bool bValidFlds = false;
+            bool bValidFields = false;
             sal_Int32 nPos = 0;
 
             while( nPos < aStr.getLength() )
@@ -545,12 +545,12 @@ OUString SwEditShell::Calculate()
                         (::Find( sVar, aCalc.GetVarTable(),TBLSZ) ||
                          aCalc.VarLook( sVar )) )
                     {
-                        if( !bValidFlds )
+                        if( !bValidFields )
                         {
-                            GetDoc()->getIDocumentFieldsAccess().FldsToCalc( aCalc,
+                            GetDoc()->getIDocumentFieldsAccess().FieldsToCalc( aCalc,
                                                   pStart->nNode.GetIndex(),
                                                   pStart->nContent.GetIndex() );
-                            bValidFlds = true;
+                            bValidFields = true;
                         }
                         aFormel += "(" + aCalc.GetStrResult( aCalc.VarLook( sVar )->nValue ) + ")";
                     }
@@ -598,22 +598,22 @@ Graphic SwEditShell::GetIMapGraphic() const
         }
         else
         {
-            SwFlyFrm* pFlyFrm = rNd.GetCntntNode()->getLayoutFrm( GetLayout() )->FindFlyFrm();
+            SwFlyFrm* pFlyFrm = rNd.GetContentNode()->getLayoutFrm( GetLayout() )->FindFlyFrm();
             if(pFlyFrm)
-                aRet = pFlyFrm->GetFmt()->MakeGraphic();
+                aRet = pFlyFrm->GetFormat()->MakeGraphic();
         }
     }
     return aRet;
 }
 
-bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, bool bKeepSelection )
+bool SwEditShell::InsertURL( const SwFormatINetFormat& rFormat, const OUString& rStr, bool bKeepSelection )
 {
     // URL and hint text (directly or via selection) necessary
-    if( rFmt.GetValue().isEmpty() || ( rStr.isEmpty() && !HasSelection() ) )
+    if( rFormat.GetValue().isEmpty() || ( rStr.isEmpty() && !HasSelection() ) )
         return false;
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_UI_INSERT_URLTXT, NULL);
-    bool bInsTxt = true;
+    bool bInsText = true;
 
     if( !rStr.isEmpty() )
     {
@@ -621,24 +621,24 @@ bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, boo
         if( pCrsr->HasMark() && *pCrsr->GetPoint() != *pCrsr->GetMark() )
         {
             // Selection existent, multi selection?
-            bool bDelTxt = true;
+            bool bDelText = true;
             if( !pCrsr->IsMultiSelection() )
             {
                 // einfach Selection -> Text ueberpruefen
-                const OUString sTxt(comphelper::string::stripEnd(GetSelTxt(), ' '));
-                if( sTxt == rStr )
-                    bDelTxt = bInsTxt = false;
+                const OUString sText(comphelper::string::stripEnd(GetSelText(), ' '));
+                if( sText == rStr )
+                    bDelText = bInsText = false;
             }
-            else if( rFmt.GetValue() == rStr ) // Are Name and URL equal?
-                bDelTxt = bInsTxt = false;
+            else if( rFormat.GetValue() == rStr ) // Are Name and URL equal?
+                bDelText = bInsText = false;
 
-            if( bDelTxt )
+            if( bDelText )
                 Delete();
         }
-        else if( pCrsr->IsMultiSelection() && rFmt.GetValue() == rStr )
-            bInsTxt = false;
+        else if( pCrsr->IsMultiSelection() && rFormat.GetValue() == rStr )
+            bInsText = false;
 
-        if( bInsTxt )
+        if( bInsText )
         {
             Insert2( rStr );
             SetMark();
@@ -646,15 +646,15 @@ bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, boo
         }
     }
     else
-        bInsTxt = false;
+        bInsText = false;
 
-    SetAttrItem( rFmt );
-    if (bInsTxt && !IsCrsrPtAtEnd())
+    SetAttrItem( rFormat );
+    if (bInsText && !IsCrsrPtAtEnd())
         SwapPam();
     if(!bKeepSelection)
         ClearMark();
-    if( bInsTxt )
-        DontExpandFmt();
+    if( bInsText )
+        DontExpandFormat();
     GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_UI_INSERT_URLTXT, NULL );
     EndAllAction();
     return true;
@@ -664,26 +664,26 @@ void SwEditShell::GetINetAttrs( SwGetINetAttrs& rArr )
 {
     rArr.clear();
 
-    const SwTxtNode* pTxtNd;
-    const SwCharFmts* pFmts = GetDoc()->GetCharFmts();
-    for( auto n = pFmts->size(); 1 < n; )
+    const SwTextNode* pTextNd;
+    const SwCharFormats* pFormats = GetDoc()->GetCharFormats();
+    for( auto n = pFormats->size(); 1 < n; )
     {
-        SwIterator<SwTxtINetFmt,SwCharFmt> aIter(*(*pFmts)[--n]);
-        for( SwTxtINetFmt* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
+        SwIterator<SwTextINetFormat,SwCharFormat> aIter(*(*pFormats)[--n]);
+        for( SwTextINetFormat* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
         {
-            if( 0 != ( pTxtNd = pFnd->GetpTxtNode()) &&
-                pTxtNd->GetNodes().IsDocNodes() )
+            if( 0 != ( pTextNd = pFnd->GetpTextNode()) &&
+                pTextNd->GetNodes().IsDocNodes() )
             {
-                SwTxtINetFmt& rAttr = *pFnd;
-                OUString sTxt( pTxtNd->GetExpandTxt( rAttr.GetStart(),
+                SwTextINetFormat& rAttr = *pFnd;
+                OUString sText( pTextNd->GetExpandText( rAttr.GetStart(),
                                     *rAttr.GetEnd() - rAttr.GetStart() ) );
 
-                sTxt = comphelper::string::remove(sTxt, 0x0a);
-                sTxt = comphelper::string::strip(sTxt, ' ');
+                sText = comphelper::string::remove(sText, 0x0a);
+                sText = comphelper::string::strip(sText, ' ');
 
-                if( !sTxt.isEmpty() )
+                if( !sText.isEmpty() )
                 {
-                    SwGetINetAttr* pNew = new SwGetINetAttr( sTxt, rAttr );
+                    SwGetINetAttr* pNew = new SwGetINetAttr( sText, rAttr );
                     rArr.push_back( pNew );
                 }
             }
@@ -695,17 +695,17 @@ void SwEditShell::GetINetAttrs( SwGetINetAttrs& rArr )
 /// latter is needed for drag & drop)
 bool SwEditShell::DelINetAttrWithText()
 {
-    bool bRet = SelectTxtAttr( RES_TXTATR_INETFMT, false );
+    bool bRet = SelectTextAttr( RES_TXTATR_INETFMT, false );
     if( bRet )
         DeleteSel( *GetCrsr() );
     return bRet;
 }
 
 /// Set the DontExpand flag at the text character attributes
-bool SwEditShell::DontExpandFmt()
+bool SwEditShell::DontExpandFormat()
 {
     bool bRet = false;
-    if( !IsTableMode() && GetDoc()->DontExpandFmt( *GetCrsr()->GetPoint() ))
+    if( !IsTableMode() && GetDoc()->DontExpandFormat( *GetCrsr()->GetPoint() ))
     {
         bRet = true;
         CallChgLnk();
@@ -743,7 +743,7 @@ void SwEditShell::SetNumberingRestart()
         sal_uLong nEndNd = pEndPos->nNode.GetIndex();
         if( nCurrNd <= nEndNd )
         {
-            SwCntntFrm* pCntFrm;
+            SwContentFrm* pCntFrm;
             bool bGoOn = true;
             // iterate over all paragraphs
             while( bGoOn )
@@ -752,27 +752,27 @@ void SwEditShell::SetNumberingRestart()
                 switch( pNd->GetNodeType() )
                 {
                 case ND_TEXTNODE:
-                    if( 0 != ( pCntFrm = static_cast<SwTxtNode*>(pNd)->getLayoutFrm( GetLayout() )) )
+                    if( 0 != ( pCntFrm = static_cast<SwTextNode*>(pNd)->getLayoutFrm( GetLayout() )) )
                     {
                         // skip hidden frames - ignore protection!
-                        if( !static_cast<SwTxtFrm*>(pCntFrm)->IsHiddenNow() )
+                        if( !static_cast<SwTextFrm*>(pCntFrm)->IsHiddenNow() )
                         {
                             // if the node is numbered and the starting value of the numbering equals the
                             // start value of the numbering rule then set this value as hard starting value
 
                             // get the node num
                             // OD 2005-11-09
-                            SwTxtNode* pTxtNd( pNd->GetTxtNode() );
-                            SwNumRule* pNumRule( pTxtNd->GetNumRule() );
+                            SwTextNode* pTextNd( pNd->GetTextNode() );
+                            SwNumRule* pNumRule( pTextNd->GetNumRule() );
 
                             bool bIsNodeNum =
-                               ( pNumRule && pTxtNd->GetNum() &&
-                                 ( pTxtNd->HasNumber() || pTxtNd->HasBullet() ) &&
-                                 pTxtNd->IsCountedInList() &&
-                                 !pTxtNd->IsListRestart() );
+                               ( pNumRule && pTextNd->GetNum() &&
+                                 ( pTextNd->HasNumber() || pTextNd->HasBullet() ) &&
+                                 pTextNd->IsCountedInList() &&
+                                 !pTextNd->IsListRestart() );
                             if (bIsNodeNum)
                             {
-                                int nListLevel = pTxtNd->GetActualListLevel();
+                                int nListLevel = pTextNd->GetActualListLevel();
 
                                 if (nListLevel < 0)
                                     nListLevel = 0;
@@ -780,7 +780,7 @@ void SwEditShell::SetNumberingRestart()
                                 if (nListLevel >= MAXLEVEL)
                                     nListLevel = MAXLEVEL - 1;
 
-                                 bIsNodeNum = pTxtNd->GetNum()->GetNumber() ==
+                                 bIsNodeNum = pTextNd->GetNum()->GetNumber() ==
                                     pNumRule->Get( static_cast<sal_uInt16>(nListLevel) ).GetStart();
                             }
                             if (bIsNodeNum)
@@ -820,8 +820,8 @@ sal_uInt16 SwEditShell::GetLineCount( bool bActPos )
     SwPaM* pPam = GetCrsr();
     SwNodeIndex& rPtIdx = pPam->GetPoint()->nNode;
     SwNodeIndex aStart( rPtIdx );
-    SwCntntNode* pCNd;
-    SwCntntFrm *pCntFrm = 0;
+    SwContentNode* pCNd;
+    SwContentFrm *pCntFrm = 0;
     sal_uLong nTmpPos;
 
     if( !bActPos )
@@ -831,13 +831,13 @@ sal_uInt16 SwEditShell::GetLineCount( bool bActPos )
         aStart = nTmpPos + 1;
     else
     {
-        if( 0 != ( pCNd = pPam->GetCntntNode() ) &&
+        if( 0 != ( pCNd = pPam->GetContentNode() ) &&
             0 != ( pCntFrm = pCNd->getLayoutFrm( GetLayout() ) ) )
         {
             const SwStartNode *pTmp;
             if( pCntFrm->IsInFly() )                        // Fly
                 pTmp = pCNd->FindFlyStartNode();
-            else if( pCntFrm->IsInFtn() )                   // Footnote
+            else if( pCntFrm->IsInFootnote() )                   // Footnote
                 pTmp = pCNd->FindFootnoteStartNode();
             else
             {                                               // Footer/Header
@@ -860,11 +860,11 @@ sal_uInt16 SwEditShell::GetLineCount( bool bActPos )
     while( 0 != ( pCNd = GetDoc()->GetNodes().GoNextSection(
                 &aStart, true, false )) && ( !bActPos || aStart <= rPtIdx ) )
     {
-        if( 0 != ( pCntFrm = pCNd->getLayoutFrm( GetLayout() ) ) && pCntFrm->IsTxtFrm() )
+        if( 0 != ( pCntFrm = pCNd->getLayoutFrm( GetLayout() ) ) && pCntFrm->IsTextFrm() )
         {
             const sal_Int32 nActPos = bActPos && aStart == rPtIdx ?
                 pPam->GetPoint()->nContent.GetIndex() : COMPLETE_STRING;
-            nRet = nRet + static_cast<SwTxtFrm*>(pCntFrm)->GetLineCount( nActPos );
+            nRet = nRet + static_cast<SwTextFrm*>(pCntFrm)->GetLineCount( nActPos );
         }
     }
     return nRet;
@@ -886,16 +886,16 @@ long SwEditShell::MergeDoc( const SwDoc& rDoc )
     return nRet;
 }
 
-const SwFtnInfo& SwEditShell::GetFtnInfo() const
+const SwFootnoteInfo& SwEditShell::GetFootnoteInfo() const
 {
-    return GetDoc()->GetFtnInfo();
+    return GetDoc()->GetFootnoteInfo();
 }
 
-void SwEditShell::SetFtnInfo(const SwFtnInfo& rInfo)
+void SwEditShell::SetFootnoteInfo(const SwFootnoteInfo& rInfo)
 {
     StartAllAction();
     SET_CURR_SHELL( this );
-    GetDoc()->SetFtnInfo(rInfo);
+    GetDoc()->SetFootnoteInfo(rInfo);
     CallChgLnk();
     EndAllAction();
 }
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 5b1c2d993700..0371f88528d3 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -178,8 +178,8 @@ static SwHyphIter*  pHyphIter = 0;
 
 // With that we save a GetFrm() in Hyphenate.
 // Caution: There are external declaration to these pointers in txtedt.cxx!
-const SwTxtNode *pLinguNode;
-      SwTxtFrm  *pLinguFrm;
+const SwTextNode *pLinguNode;
+      SwTextFrm  *pLinguFrm;
 
 SwLinguIter::SwLinguIter()
     : pSh(0)
@@ -214,7 +214,7 @@ void SwLinguIter::_Start( SwEditShell *pShell, SwDocPositions eStart,
         bSetCurr = 0 != GetCurr();
         nCrsrCnt = pSh->GetCrsrCnt();
         if( pSh->IsTableMode() )
-            pSh->TblCrsrToCursor();
+            pSh->TableCrsrToCursor();
 
         pSh->Push();
         sal_uInt16 n;
@@ -530,7 +530,7 @@ void SwHyphIter::DelSoftHyph( SwPaM &rPam )
     const SwPosition* pStt = rPam.Start();
     const sal_Int32 nStart = pStt->nContent.GetIndex();
     const sal_Int32 nEnd   = rPam.End()->nContent.GetIndex();
-    SwTxtNode *pNode = pStt->nNode.GetNode().GetTxtNode();
+    SwTextNode *pNode = pStt->nNode.GetNode().GetTextNode();
     pNode->DelSoftHyph( nStart, nEnd );
 }
 
@@ -721,8 +721,8 @@ uno::Any SwEditShell::SpellContinue(
  *    - add nLastHyphLen onto SelectionStart
  *    - iterate over all selected areas
  *      - pDoc->Hyphenate() iterates over all Nodes of a selection
- *          - pTxtNode->Hyphenate() calls SwTxtFrm::Hyphenate of the EditShell
- *              - SwTxtFrm:Hyphenate() iterates over all rows of the Pam
+ *          - pTextNode->Hyphenate() calls SwTextFrm::Hyphenate of the EditShell
+ *              - SwTextFrm:Hyphenate() iterates over all rows of the Pam
  *                  - LineIter::Hyphenate() sets the Hyphenator and the Pam based on
  *                    the to be separated word.
  *    - Returns true if there is a hyphenation and false if the Pam is processed.
@@ -831,10 +831,10 @@ uno::Reference< XSpellAlternatives >
     SwPosition aPos( *pCrsr->GetPoint() );
      Point aPt( *pPt );
     SwCrsrMoveState eTmpState( MV_SETONLYTEXT );
-    SwTxtNode *pNode;
+    SwTextNode *pNode;
     SwWrongList *pWrong;
     if( GetLayout()->GetCrsrOfst( &aPos, aPt, &eTmpState ) &&
-        0 != (pNode = aPos.nNode.GetNode().GetTxtNode()) &&
+        0 != (pNode = aPos.nNode.GetNode().GetTextNode()) &&
         0 != (pWrong = pNode->GetWrong()) &&
         !pNode->IsInProtectSect() )
     {
@@ -842,7 +842,7 @@ uno::Reference< XSpellAlternatives >
         sal_Int32 nLen = 1;
         if( pWrong->InWrongWord(nBegin,nLen) && !pNode->IsSymbol(nBegin) )
         {
-            const OUString aText(pNode->GetTxt().copy(nBegin, nLen));
+            const OUString aText(pNode->GetText().copy(nBegin, nLen));
             OUString aWord( aText );
             aWord = comphelper::string::remove(aWord, CH_TXTATR_BREAKWORD);
             aWord = comphelper::string::remove(aWord, CH_TXTATR_INWORD);
@@ -912,13 +912,13 @@ uno::Reference< XSpellAlternatives >
                 SwRect aStartRect;
                 SwCrsrMoveState aState;
                 aState.bRealWidth = true;
-                SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
-                SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
+                SwContentNode* pContentNode = pCrsr->GetContentNode();
+                SwContentFrm *pContentFrame = pContentNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
 
-                pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
+                pContentFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
                 rContent = nWordEnd - 1;
                 SwRect aEndRect;
-                pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
+                pContentFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
                 rSelectRect = aStartRect.Union( aEndRect );
                 Pop(false);
             }
@@ -943,10 +943,10 @@ bool SwEditShell::GetGrammarCorrection(
     SwPosition aPos( *pCrsr->GetPoint() );
     Point aPt( *pPt );
     SwCrsrMoveState eTmpState( MV_SETONLYTEXT );
-    SwTxtNode *pNode;
+    SwTextNode *pNode;
     SwGrammarMarkUp *pWrong;
     if( GetLayout()->GetCrsrOfst( &aPos, aPt, &eTmpState ) &&
-        0 != (pNode = aPos.nNode.GetNode().GetTxtNode()) &&
+        0 != (pNode = aPos.nNode.GetNode().GetTextNode()) &&
         0 != (pWrong = pNode->GetGrammarCheck()) &&
         !pNode->IsInProtectSect() )
     {
@@ -954,7 +954,7 @@ bool SwEditShell::GetGrammarCorrection(
         sal_Int32 nLen = 1;
         if (pWrong->InWrongWord(nBegin, nLen))
         {
-            const OUString aText(pNode->GetTxt().copy(nBegin, nLen));
+            const OUString aText(pNode->GetText().copy(nBegin, nLen));
 
             uno::Reference< linguistic2::XProofreadingIterator >  xGCIterator( mpDoc->GetGCIterator() );
             if (xGCIterator.is())
@@ -1036,13 +1036,13 @@ bool SwEditShell::GetGrammarCorrection(
                 SwRect aStartRect;
                 SwCrsrMoveState aState;
                 aState.bRealWidth = true;
-                SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
-                SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
+                SwContentNode* pContentNode = pCrsr->GetContentNode();
+                SwContentFrm *pContentFrame = pContentNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
 
-                pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
+                pContentFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
                 rContent = nWordEnd - 1;
                 SwRect aEndRect;
-                pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
+                pContentFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
                 rSelectRect = aStartRect.Union( aEndRect );
                 Pop(false);
             }
@@ -1262,21 +1262,21 @@ static SpellContentPositions lcl_CollectDeletedRedlines(SwEditShell* pSh)
     {
         SwPaM *pCrsr = pSh->GetCrsr();
         const SwPosition* pStartPos = pCrsr->Start();
-        const SwTxtNode* pTxtNode = pCrsr->GetNode().GetTxtNode();
+        const SwTextNode* pTextNode = pCrsr->GetNode().GetTextNode();
 
-        sal_uInt16 nAct = pDoc->getIDocumentRedlineAccess().GetRedlinePos( *pTxtNode, USHRT_MAX );
+        sal_uInt16 nAct = pDoc->getIDocumentRedlineAccess().GetRedlinePos( *pTextNode, USHRT_MAX );
         const sal_Int32 nStartIndex = pStartPos->nContent.GetIndex();
-        for ( ; nAct < pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); nAct++ )
+        for ( ; nAct < pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); nAct++ )
         {
-            const SwRangeRedline* pRed = pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nAct ];
+            const SwRangeRedline* pRed = pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ nAct ];
 
-            if ( pRed->Start()->nNode > pTxtNode->GetIndex() )
+            if ( pRed->Start()->nNode > pTextNode->GetIndex() )
                 break;
 
             if( nsRedlineType_t::REDLINE_DELETE == pRed->GetType() )
             {
                 sal_Int32 nStart_, nEnd_;
-                pRed->CalcStartEnd( pTxtNode->GetIndex(), nStart_, nEnd_ );
+                pRed->CalcStartEnd( pTextNode->GetIndex(), nStart_, nEnd_ );
                 sal_Int32 nStart = nStart_;
                 sal_Int32 nEnd = nEnd_;
                 if(nStart >= nStartIndex || nEnd >= nStartIndex)
@@ -1427,7 +1427,7 @@ bool SwSpellIter::SpellSentence(svx::SpellPortions& rPortions, bool bIsGrammarCh
         pMySh->GoEndSentence();
         if( bGrammarErrorFound )
         {
-            const ModelToViewHelper aConversionMap(static_cast<SwTxtNode&>(pCrsr->GetNode()));
+            const ModelToViewHelper aConversionMap(static_cast<SwTextNode&>(pCrsr->GetNode()));
             OUString aExpandText = aConversionMap.getViewText();
             sal_Int32 nSentenceEnd =
                 aConversionMap.ConvertToViewPosition( aGrammarResult.nBehindEndOfSentencePosition );
@@ -1437,7 +1437,7 @@ bool SwSpellIter::SpellSentence(svx::SpellPortions& rPortions, bool bIsGrammarCh
             if( pCrsr->End()->nContent.GetIndex() < nSentenceEnd )
             {
                 pCrsr->End()->nContent.Assign(
-                    pCrsr->End()->nNode.GetNode().GetCntntNode(), nSentenceEnd);
+                    pCrsr->End()->nNode.GetNode().GetContentNode(), nSentenceEnd);
             }
         }
 
@@ -1622,7 +1622,7 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
             // iterate over the text to find changes in language
             // set the mark equal to the point
             *pCrsr->GetMark() = aStart;
-            SwTxtNode* pTxtNode = pCrsr->GetNode().GetTxtNode();
+            SwTextNode* pTextNode = pCrsr->GetNode().GetTextNode();
             LanguageType eStartLanguage = lcl_GetLanguage(*GetSh());
             SpellContentPosition  aNextRedline = lcl_FindNextDeletedRedline(
                         rDeletedRedlines, aStart.nContent.GetIndex() );
@@ -1631,7 +1631,7 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
                 // select until the end of the current redline
                 const sal_Int32 nEnd = aEnd.nContent.GetIndex() < aNextRedline.nRight ?
                             aEnd.nContent.GetIndex() : aNextRedline.nRight;
-                pCrsr->GetPoint()->nContent.Assign( pTxtNode, nEnd );
+                pCrsr->GetPoint()->nContent.Assign( pTextNode, nEnd );
                 CreatePortion(xAlt, pGrammarResult, false, true);
                 aStart = *pCrsr->End();
                 // search for next redline
@@ -1647,13 +1647,13 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
                 bool bField = false;
                 // read the character at the current position to check if it's a field
                 sal_Unicode const cChar =
-                    pTxtNode->GetTxt()[pCrsr->GetMark()->nContent.GetIndex()];
+                    pTextNode->GetText()[pCrsr->GetMark()->nContent.GetIndex()];
                 if( CH_TXTATR_BREAKWORD == cChar || CH_TXTATR_INWORD == cChar)
                 {
-                    const SwTxtAttr* pTxtAttr = pTxtNode->GetTxtAttrForCharAt(
+                    const SwTextAttr* pTextAttr = pTextNode->GetTextAttrForCharAt(
                         pCrsr->GetMark()->nContent.GetIndex() );
-                    const sal_uInt16 nWhich = pTxtAttr
-                        ? pTxtAttr->Which()
+                    const sal_uInt16 nWhich = pTextAttr
+                        ? pTextAttr->Which()
                         : static_cast<sal_uInt16>(RES_TXTATR_END);
                     switch (nWhich)
                     {
@@ -1708,7 +1708,7 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
                     // select until the end of the current redline
                     const sal_Int32 nEnd = aEnd.nContent.GetIndex() < aNextRedline.nRight ?
                                 aEnd.nContent.GetIndex() : aNextRedline.nRight;
-                    pCrsr->GetPoint()->nContent.Assign( pTxtNode, nEnd );
+                    pCrsr->GetPoint()->nContent.Assign( pTextNode, nEnd );
                     CreatePortion(xAlt, pGrammarResult, false, true);
                     aStart = *pCrsr->End();
                     // search for next redline
@@ -1726,7 +1726,7 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
 
 void SwEditShell::IgnoreGrammarErrorAt( SwPaM& rErrorPosition )
 {
-    SwTxtNode *pNode;
+    SwTextNode *pNode;
     SwWrongList *pWrong;
     SwNodeIndex aIdx = rErrorPosition.Start()->nNode;
     SwNodeIndex aEndIdx = rErrorPosition.Start()->nNode;
@@ -1734,7 +1734,7 @@ void SwEditShell::IgnoreGrammarErrorAt( SwPaM& rErrorPosition )
     sal_Int32 nEnd = COMPLETE_STRING;
     while( aIdx <= aEndIdx )
     {
-        pNode = aIdx.GetNode().GetTxtNode();
+        pNode = aIdx.GetNode().GetTextNode();
         if( pNode ) {
             if( aIdx == aEndIdx )
                 nEnd = rErrorPosition.End()->nContent.GetIndex();
@@ -1744,7 +1744,7 @@ void SwEditShell::IgnoreGrammarErrorAt( SwPaM& rErrorPosition )
             pWrong = pNode->GetWrong();
             if( pWrong )
                 pWrong->RemoveEntry( nStart, nEnd );
-            SwTxtFrm::repaintTextFrames( *pNode );
+            SwTextFrm::repaintTextFrames( *pNode );
         }
         ++aIdx;
         nStart = 0;
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 2cb0d45c9c66..847747b4709f 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -100,10 +100,10 @@ SwPaM& SwPamRanges::SetPam( size_type nArrPos, SwPaM& rPam )
     OSL_ASSERT( nArrPos < Count() );
     const SwPamRange& rTmp = (*this)[ nArrPos ];
     rPam.GetPoint()->nNode = rTmp.nStart;
-    rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), 0 );
+    rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), 0 );
     rPam.SetMark();
     rPam.GetPoint()->nNode = rTmp.nEnd;
-    rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), 0 );
+    rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), 0 );
     return rPam;
 }
 
@@ -150,9 +150,9 @@ bool SwEditShell::NoNum()
 bool SwEditShell::SelectionHasNumber() const
 {
     bool bResult = HasNumber();
-    const SwTxtNode * pTxtNd =
-        GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
-    if (!bResult && pTxtNd && pTxtNd->Len()==0 && !pTxtNd->GetNumRule()) {
+    const SwTextNode * pTextNd =
+        GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
+    if (!bResult && pTextNd && pTextNd->Len()==0 && !pTextNd->GetNumRule()) {
         SwPamRanges aRangeArr( *GetCrsr() );
         SwPaM aPam( *GetCrsr()->GetPoint() );
         for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n )
@@ -167,15 +167,15 @@ bool SwEditShell::SelectionHasNumber() const
                 }
                 for (sal_uInt32 nPos = nStt; nPos<=nEnd; nPos++)
                 {
-                    pTxtNd = mpDoc->GetNodes()[nPos]->GetTxtNode();
-                    if (pTxtNd && pTxtNd->Len()!=0)
+                    pTextNd = mpDoc->GetNodes()[nPos]->GetTextNode();
+                    if (pTextNd && pTextNd->Len()!=0)
                     {
-                        bResult = pTxtNd->HasNumber();
+                        bResult = pTextNd->HasNumber();
 
                         // #b6340308# special case: outline numbered, not counted paragraph
                         if ( bResult &&
-                            pTxtNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
-                            !pTxtNd->IsCountedInList() )
+                            pTextNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
+                            !pTextNd->IsCountedInList() )
                         {
                             bResult = false;
                         }
@@ -196,9 +196,9 @@ bool SwEditShell::SelectionHasNumber() const
 bool SwEditShell::SelectionHasBullet() const
 {
     bool bResult = HasBullet();
-    const SwTxtNode * pTxtNd =
-        GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
-    if (!bResult && pTxtNd && pTxtNd->Len()==0 && !pTxtNd->GetNumRule()) {
+    const SwTextNode * pTextNd =
+        GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
+    if (!bResult && pTextNd && pTextNd->Len()==0 && !pTextNd->GetNumRule()) {
         SwPamRanges aRangeArr( *GetCrsr() );
         SwPaM aPam( *GetCrsr()->GetPoint() );
         for( SwPamRanges::size_type n = 0; n < aRangeArr.Count(); ++n )
@@ -213,10 +213,10 @@ bool SwEditShell::SelectionHasBullet() const
                 }
                 for (sal_uInt32 nPos = nStt; nPos<=nEnd; nPos++)
                 {
-                    pTxtNd = mpDoc->GetNodes()[nPos]->GetTxtNode();
-                    if (pTxtNd && pTxtNd->Len()!=0)
+                    pTextNd = mpDoc->GetNodes()[nPos]->GetTextNode();
+                    if (pTextNd && pTextNd->Len()!=0)
                     {
-                        bResult = pTxtNd->HasBullet();
+                        bResult = pTextNd->HasBullet();
 
                         if (!bResult) {
                             break;
@@ -235,17 +235,17 @@ bool SwEditShell::HasNumber() const
 {
     bool bResult = false;
 
-    const SwTxtNode * pTxtNd =
-        GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
+    const SwTextNode * pTextNd =
+        GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
 
-    if (pTxtNd)
+    if (pTextNd)
     {
-        bResult = pTxtNd->HasNumber();
+        bResult = pTextNd->HasNumber();
 
         // special case: outline numbered, not counted paragraph
         if ( bResult &&
-             pTxtNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
-             !pTxtNd->IsCountedInList() )
+             pTextNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
+             !pTextNd->IsCountedInList() )
         {
             bResult = false;
         }
@@ -258,12 +258,12 @@ bool SwEditShell::HasBullet() const
 {
     bool bResult = false;
 
-    const SwTxtNode * pTxtNd =
-        GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
+    const SwTextNode * pTextNd =
+        GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
 
-    if (pTxtNd)
+    if (pTextNd)
     {
-        bResult = pTxtNd->HasBullet();
+        bResult = pTextNd->HasBullet();
     }
 
     return bResult;
@@ -344,8 +344,8 @@ void SwEditShell::ChangeIndentOfAllListLevels( const short nDiff )
     if ( pCurNumRule != NULL )
     {
         SwNumRule aRule(*pCurNumRule);
-        const SwNumFmt& aRootNumFmt(aRule.Get(0));
-        if( nDiff > 0 || aRootNumFmt.GetIndentAt() + nDiff > 0) // fdo#42708
+        const SwNumFormat& aRootNumFormat(aRule.Get(0));
+        if( nDiff > 0 || aRootNumFormat.GetIndentAt() + nDiff > 0) // fdo#42708
         {
             // #i90078#
             aRule.ChangeIndent( nDiff );
@@ -373,11 +373,11 @@ void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos)
         }
         else
         {
-            const SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
-            if ( pTxtNode != NULL
-                 && pTxtNode->GetActualListLevel() >= 0 )
+            const SwTextNode* pTextNode = rPos.nNode.GetNode().GetTextNode();
+            if ( pTextNode != NULL
+                 && pTextNode->GetActualListLevel() >= 0 )
             {
-                aRule.SetIndent( nIndent, static_cast< sal_uInt16 >( pTxtNode->GetActualListLevel() ) );
+                aRule.SetIndent( nIndent, static_cast< sal_uInt16 >( pTextNode->GetActualListLevel() ) );
             }
         }
 
@@ -413,9 +413,9 @@ int SwEditShell::GetCurrentParaOutlineLevel( ) const
     int nLevel = 0;
 
     SwPaM* pCrsr = GetCrsr();
-    const SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode();
-    if( pTxtNd )
-        nLevel = pTxtNd->GetAttrOutlineLevel();
+    const SwTextNode* pTextNd = pCrsr->GetNode().GetTextNode();
+    if( pTextNd )
+        nLevel = pTextNd->GetAttrOutlineLevel();
     return nLevel;
 }
 
@@ -465,15 +465,15 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
                         ( pNd = GetDoc()->GetNodes()[ nIdx ])->IsSectionNode() ||
                         ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsSectionNode())))
                         --nIdx;
-                    if( GetDoc()->GetNodes()[ nIdx ]->IsTxtNode() )
+                    if( GetDoc()->GetNodes()[ nIdx ]->IsTextNode() )
                         nOffset = nIdx - nStt;
                 }
             }
             else             // move down
             {
-                const SwNumRule* pOrig = aCrsr.GetNode(false).GetTxtNode()->GetNumRule();
-                if( aCrsr.GetNode().IsTxtNode() &&
-                    pOrig == aCrsr.GetNode().GetTxtNode()->GetNumRule() )
+                const SwNumRule* pOrig = aCrsr.GetNode(false).GetTextNode()->GetNumRule();
+                if( aCrsr.GetNode().IsTextNode() &&
+                    pOrig == aCrsr.GetNode().GetTextNode()->GetNumRule() )
                 {
                     sal_uLong nStt = aCrsr.GetPoint()->nNode.GetIndex(), nIdx = nStt+1;
 
@@ -483,8 +483,8 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
 
                         if (pNd->IsSectionNode() ||
                             ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsSectionNode()) ||
-                            ( pNd->IsTxtNode() && pOrig == static_cast<const SwTxtNode*>(pNd)->GetNumRule() &&
-                              static_cast<const SwTxtNode*>(pNd)->GetActualListLevel() > nUpperLevel ))
+                            ( pNd->IsTextNode() && pOrig == static_cast<const SwTextNode*>(pNd)->GetNumRule() &&
+                              static_cast<const SwTextNode*>(pNd)->GetActualListLevel() > nUpperLevel ))
                         {
                             ++nIdx;
                         }
@@ -495,7 +495,7 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
                         }
                     }
 
-                    if( nStt == nIdx || !GetDoc()->GetNodes()[ nIdx ]->IsTxtNode() )
+                    if( nStt == nIdx || !GetDoc()->GetNodes()[ nIdx ]->IsTextNode() )
                         nOffset = 1;
                     else
                         nOffset = nIdx - nStt;
@@ -558,7 +558,7 @@ bool SwEditShell::IsProtectedOutlinePara() const
 {
     bool bRet = false;
     const SwNode& rNd = GetCrsr()->Start()->nNode.GetNode();
-    if( rNd.IsTxtNode() )
+    if( rNd.IsTextNode() )
     {
         const SwOutlineNodes& rOutlNd = GetDoc()->GetNodes().GetOutLineNds();
         SwNodePtr pNd = const_cast<SwNodePtr>(&rNd);
@@ -572,7 +572,7 @@ bool SwEditShell::IsProtectedOutlinePara() const
         {
             SwNodePtr pTmpNd = rOutlNd[ nPos ];
 
-            int nTmpLvl = pTmpNd->GetTxtNode()->GetAttrOutlineLevel();
+            int nTmpLvl = pTmpNd->GetTextNode()->GetAttrOutlineLevel();
 
             OSL_ENSURE( nTmpLvl >= 0 && nTmpLvl <= MAXLEVEL,
                     "<SwEditShell::IsProtectedOutlinePara()>" );
@@ -653,10 +653,10 @@ bool SwEditShell::IsNoNum( bool bChkStart ) const
          && !HasSelection()
          && ( !bChkStart || IsSttPara() ) )
     {
-        const SwTxtNode* pTxtNd = GetCrsr()->GetNode().GetTxtNode();
-        if ( pTxtNd != NULL )
+        const SwTextNode* pTextNd = GetCrsr()->GetNode().GetTextNode();
+        if ( pTextNd != NULL )
         {
-            bResult =  !pTxtNd->IsCountedInList();
+            bResult =  !pTextNd->IsCountedInList();
         }
     }
 
@@ -669,19 +669,19 @@ sal_uInt8 SwEditShell::GetNumLevel() const
     sal_uInt8 nLevel = MAXLEVEL;
 
     SwPaM* pCrsr = GetCrsr();
-    const SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode();
+    const SwTextNode* pTextNd = pCrsr->GetNode().GetTextNode();
 
-    OSL_ENSURE( pTxtNd, "GetNumLevel() without text node" );
-    if ( pTxtNd == NULL )
+    OSL_ENSURE( pTextNd, "GetNumLevel() without text node" );
+    if ( pTextNd == NULL )
         return nLevel;
 
-    const SwNumRule* pRule = pTxtNd->GetNumRule();
+    const SwNumRule* pRule = pTextNd->GetNumRule();
     if ( pRule != NULL )
     {
-        const int nListLevelOfTxtNode( pTxtNd->GetActualListLevel() );
-        if ( nListLevelOfTxtNode >= 0 )
+        const int nListLevelOfTextNode( pTextNd->GetActualListLevel() );
+        if ( nListLevelOfTextNode >= 0 )
         {
-            nLevel = static_cast<sal_uInt8>( nListLevelOfTxtNode );
+            nLevel = static_cast<sal_uInt8>( nListLevelOfTextNode );
         }
     }
 
@@ -780,10 +780,10 @@ OUString SwEditShell::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoN
     return GetDoc()->GetUniqueNumRuleName( pChkStr, bAutoNum );
 }
 
-void SwEditShell::ChgNumRuleFmts( const SwNumRule& rRule )
+void SwEditShell::ChgNumRuleFormats( const SwNumRule& rRule )
 {
     StartAllAction();
-    GetDoc()->ChgNumRuleFmts( rRule );
+    GetDoc()->ChgNumRuleFormats( rRule );
     EndAllAction();
 }
 
@@ -817,8 +817,8 @@ void SwEditShell::SetNumRuleStart( bool bFlag, SwPaM* pPaM )
 bool SwEditShell::IsNumRuleStart( SwPaM* pPaM ) const
 {
     SwPaM* pCrsr = pPaM ? pPaM : GetCrsr( );
-    const SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode();
-    return pTxtNd && pTxtNd->IsListRestart();
+    const SwTextNode* pTextNd = pCrsr->GetNode().GetTextNode();
+    return pTextNd && pTextNd->IsListRestart();
 }
 
 void SwEditShell::SetNodeNumStart( sal_uInt16 nStt, SwPaM* pPaM )
@@ -844,13 +844,13 @@ void SwEditShell::SetNodeNumStart( sal_uInt16 nStt, SwPaM* pPaM )
 sal_uInt16 SwEditShell::GetNodeNumStart( SwPaM* pPaM ) const
 {
     SwPaM* pCrsr = pPaM ? pPaM : GetCrsr();
-    const SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode();
+    const SwTextNode* pTextNd = pCrsr->GetNode().GetTextNode();
     // correction: check, if list restart value is set at text node and
-    // use new method <SwTxtNode::GetAttrListRestartValue()>.
+    // use new method <SwTextNode::GetAttrListRestartValue()>.
     // return USHRT_MAX, if no list restart value is found.
-    if ( pTxtNd && pTxtNd->HasAttrListRestartValue() )
+    if ( pTextNd && pTextNd->HasAttrListRestartValue() )
     {
-        return static_cast<sal_uInt16>(pTxtNd->GetAttrListRestartValue());
+        return static_cast<sal_uInt16>(pTextNd->GetAttrListRestartValue());
     }
     return USHRT_MAX;
 }
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index c5bc2a46acaf..47be00cacd46 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -49,12 +49,12 @@ bool SwEditShell::IsRedlineOn() const
 
 sal_uInt16 SwEditShell::GetRedlineCount() const
 {
-    return GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl().size();
+    return GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().size();
 }
 
 const SwRangeRedline& SwEditShell::GetRedline( sal_uInt16 nPos ) const
 {
-    return *GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl()[ nPos ];
+    return *GetDoc()->getIDocumentRedlineAccess().GetRedlineTable()[ nPos ];
 }
 
 static void lcl_InvalidateAll( SwViewShell* pSh )
@@ -143,10 +143,10 @@ void SwEditShell::UpdateRedlineAttr()
  */
 sal_uInt16 SwEditShell::FindRedlineOfData( const SwRedlineData& rData ) const
 {
-    const SwRedlineTbl& rTbl = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
+    const SwRedlineTable& rTable = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
 
-    for( sal_uInt16 i = 0, nCnt = rTbl.size(); i < nCnt; ++i )
-        if( &rTbl[ i ]->GetRedlineData() == &rData )
+    for( sal_uInt16 i = 0, nCnt = rTable.size(); i < nCnt; ++i )
+        if( &rTable[ i ]->GetRedlineData() == &rData )
             return i;
     return USHRT_MAX;
 }
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index 6dadbaa05a83..f508e1e5dc0d 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -88,7 +88,7 @@ SwSection* SwEditShell::GetAnySection( bool bOutOfTab, const Point* pPt )
         SwPosition aPos( *GetCrsr()->GetPoint() );
         Point aPt( *pPt );
         GetLayout()->GetCrsrOfst( &aPos, aPt );
-        SwCntntNode *pNd = aPos.nNode.GetNode().GetCntntNode();
+        SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
         pFrm = pNd->getLayoutFrm( GetLayout(), pPt );
     }
     else
@@ -100,7 +100,7 @@ SwSection* SwEditShell::GetAnySection( bool bOutOfTab, const Point* pPt )
     {
         SwSectionFrm* pSect = pFrm->FindSctFrm();
         OSL_ENSURE( pSect, "GetAnySection: Where's my Sect?" );
-        if( pSect->IsInFtn() && pSect->GetUpper()->IsInSct() )
+        if( pSect->IsInFootnote() && pSect->GetUpper()->IsInSct() )
         {
             pSect = pSect->GetUpper()->FindSctFrm();
             OSL_ENSURE( pSect, "GetAnySection: Where's my SectFrm?" );
@@ -110,24 +110,24 @@ SwSection* SwEditShell::GetAnySection( bool bOutOfTab, const Point* pPt )
     return NULL;
 }
 
-size_t SwEditShell::GetSectionFmtCount() const
+size_t SwEditShell::GetSectionFormatCount() const
 {
     return GetDoc()->GetSections().size();
 }
 
 bool SwEditShell::IsAnySectionInDoc( bool bChkReadOnly, bool bChkHidden, bool bChkTOX ) const
 {
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
 
-    for( const SwSectionFmt* pFmt : rFmts )
+    for( const SwSectionFormat* pFormat : rFormats )
     {
         SectionType eTmpType;
-        if( pFmt->IsInNodesArr() &&
+        if( pFormat->IsInNodesArr() &&
             (bChkTOX  ||
-                ( (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+                ( (eTmpType = pFormat->GetSection()->GetType()) != TOX_CONTENT_SECTION
                   && TOX_HEADER_SECTION != eTmpType ) ) )
         {
-            const SwSection& rSect = *pFmt->GetSection();
+            const SwSection& rSect = *pFormat->GetSection();
             if( (!bChkReadOnly && !bChkHidden ) ||
                 (bChkReadOnly && rSect.IsProtectFlag() ) ||
                 (bChkHidden && rSect.IsHiddenFlag() ) )
@@ -137,21 +137,21 @@ bool SwEditShell::IsAnySectionInDoc( bool bChkReadOnly, bool bChkHidden, bool bC
     return false;
 }
 
-size_t SwEditShell::GetSectionFmtPos( const SwSectionFmt& rFmt ) const
+size_t SwEditShell::GetSectionFormatPos( const SwSectionFormat& rFormat ) const
 {
-    SwSectionFmt* pFmt = const_cast<SwSectionFmt*>(&rFmt);
-    return GetDoc()->GetSections().GetPos( pFmt );
+    SwSectionFormat* pFormat = const_cast<SwSectionFormat*>(&rFormat);
+    return GetDoc()->GetSections().GetPos( pFormat );
 }
 
-const SwSectionFmt& SwEditShell::GetSectionFmt(size_t nFmt) const
+const SwSectionFormat& SwEditShell::GetSectionFormat(size_t nFormat) const
 {
-    return *GetDoc()->GetSections()[ nFmt ];
+    return *GetDoc()->GetSections()[ nFormat ];
 }
 
-void SwEditShell::DelSectionFmt(size_t nFmt)
+void SwEditShell::DelSectionFormat(size_t nFormat)
 {
     StartAllAction();
-    GetDoc()->DelSectionFmt( GetDoc()->GetSections()[ nFmt ] );
+    GetDoc()->DelSectionFormat( GetDoc()->GetSections()[ nFormat ] );
     // Call the AttrChangeNotify on the UI page.
     CallChgLnk();
     EndAllAction();
@@ -173,10 +173,10 @@ OUString SwEditShell::GetUniqueSectionName( const OUString* pChkStr ) const
 }
 
 void SwEditShell::SetSectionAttr( const SfxItemSet& rSet,
-                                    SwSectionFmt* pSectFmt )
+                                    SwSectionFormat* pSectFormat )
 {
-    if( pSectFmt )
-        _SetSectionAttr( *pSectFmt, rSet );
+    if( pSectFormat )
+        _SetSectionAttr( *pSectFormat, rSet );
     else
     {
         // for all section in the selection
@@ -192,10 +192,10 @@ void SwEditShell::SetSectionAttr( const SfxItemSet& rSet,
             if( pSttSectNd || pEndSectNd )
             {
                 if( pSttSectNd )
-                    _SetSectionAttr( *pSttSectNd->GetSection().GetFmt(),
+                    _SetSectionAttr( *pSttSectNd->GetSection().GetFormat(),
                                     rSet );
                 if( pEndSectNd && pSttSectNd != pEndSectNd )
-                    _SetSectionAttr( *pEndSectNd->GetSection().GetFmt(),
+                    _SetSectionAttr( *pEndSectNd->GetSection().GetFormat(),
                                     rSet );
 
                 if( pSttSectNd && pEndSectNd )
@@ -215,7 +215,7 @@ void SwEditShell::SetSectionAttr( const SfxItemSet& rSet,
                             || ( aSIdx.GetNode().IsEndNode() &&
                                 0 != ( pSttSectNd = aSIdx.GetNode().
                                     StartOfSectionNode()->GetSectionNode())) )
-                            _SetSectionAttr( *pSttSectNd->GetSection().GetFmt(),
+                            _SetSectionAttr( *pSttSectNd->GetSection().GetFormat(),
                                             rSet );
                         ++aSIdx;
                     }
@@ -226,7 +226,7 @@ void SwEditShell::SetSectionAttr( const SfxItemSet& rSet,
     }
 }
 
-void SwEditShell::_SetSectionAttr( SwSectionFmt& rSectFmt,
+void SwEditShell::_SetSectionAttr( SwSectionFormat& rSectFormat,
                                     const SfxItemSet& rSet )
 {
     StartAllAction();
@@ -234,10 +234,10 @@ void SwEditShell::_SetSectionAttr( SwSectionFmt& rSectFmt,
     {
         SfxItemSet aSet(rSet);
         aSet.ClearItem(RES_CNTNT);
-        GetDoc()->SetAttr( aSet, rSectFmt );
+        GetDoc()->SetAttr( aSet, rSectFormat );
     }
     else
-        GetDoc()->SetAttr( rSet, rSectFmt );
+        GetDoc()->SetAttr( rSet, rSectFormat );
 
     // Call the AttrChangeNotify on the UI page.
     CallChgLnk();
@@ -256,10 +256,10 @@ sal_uInt16 SwEditShell::GetFullSelectedSectionCount() const
 
         const SwPosition* pStt = rPaM.Start(),
                         * pEnd = rPaM.End();
-        const SwCntntNode* pCNd;
+        const SwContentNode* pCNd;
         // check the selection, if Start at Node begin and End at Node end
         if( pStt->nContent.GetIndex() ||
-            ( 0 == ( pCNd = pEnd->nNode.GetNode().GetCntntNode() )) ||
+            ( 0 == ( pCNd = pEnd->nNode.GetNode().GetContentNode() )) ||
             pCNd->Len() != pEnd->nContent.GetIndex() )
         {
             nRet = 0;
@@ -351,7 +351,7 @@ static const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
         // - we're at or just before a start node
         // - there are only start nodes between the current and pInnermostNode
         SwNodeIndex aBegin( pCurrentPos->nNode );
-        if( rCurrentNode.IsCntntNode() &&
+        if( rCurrentNode.IsContentNode() &&
             (pCurrentPos->nContent.GetIndex() == 0))
             --aBegin;
         while( (aBegin != pInnermostNode->GetIndex()) &&
@@ -364,9 +364,9 @@ static const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
         // - there are only end nodes between the current node and
         //   pInnermostNode's end node
         SwNodeIndex aEnd( pCurrentPos->nNode );
-        if( rCurrentNode.IsCntntNode() &&
+        if( rCurrentNode.IsContentNode() &&
             ( pCurrentPos->nContent.GetIndex() ==
-              rCurrentNode.GetCntntNode()->Len() ) )
+              rCurrentNode.GetContentNode()->Len() ) )
             ++aEnd;
         while( (aEnd != pInnermostNode->EndOfSectionNode()->GetIndex()) &&
                aEnd.GetNode().IsEndNode() )
@@ -415,7 +415,7 @@ bool SwEditShell::DoSpecialInsert()
         SwPosition aInsertPos( aInsertIndex );
 
         // insert a new text node, and set the cursor
-        bRet = GetDoc()->getIDocumentContentOperations().AppendTxtNode( aInsertPos );
+        bRet = GetDoc()->getIDocumentContentOperations().AppendTextNode( aInsertPos );
         *pCursorPos = aInsertPos;
 
         // call AttrChangeNotify for the UI
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 39693a8923d6..d6c8ec33d14c 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -90,10 +90,10 @@ bool ConvertTableToText( const SwTableNode *pConstTableNode, sal_Unicode cCh )
 }
 //End for bug #i119954#
 
-const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts,
+const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTableOpts,
                                          sal_uInt16 nRows, sal_uInt16 nCols,
                                          sal_Int16 eAdj,
-                                         const SwTableAutoFmt* pTAFmt )
+                                         const SwTableAutoFormat* pTAFormat )
 {
     StartAllAction();
     SwPosition* pPos = GetCrsr()->GetPoint();
@@ -107,9 +107,9 @@ const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts
 
     // If called from a shell the adjust item is propagated
     // from pPos to the new content nodes in the table.
-    const SwTable *pTable = GetDoc()->InsertTable( rInsTblOpts, *pPos,
+    const SwTable *pTable = GetDoc()->InsertTable( rInsTableOpts, *pPos,
                                                    nRows, nCols,
-                                                   eAdj, pTAFmt,
+                                                   eAdj, pTAFormat,
                                                    0, true );
     if( bEndUndo )
         EndUndo( UNDO_END );
@@ -118,10 +118,10 @@ const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts
     return *pTable;
 }
 
-bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTblOpts,
+bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTableOpts,
                                sal_Unicode cCh,
                                sal_Int16 eAdj,
-                               const SwTableAutoFmt* pTAFmt )
+                               const SwTableAutoFormat* pTAFormat )
 {
     SwWait aWait( *GetDoc()->GetDocShell(), true );
     bool bRet = false;
@@ -129,8 +129,8 @@ bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTblOpts,
     for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
     {
         if( rPaM.HasMark() )
-            bRet |= 0 != GetDoc()->TextToTable( rInsTblOpts, rPaM, cCh,
-                                                eAdj, pTAFmt );
+            bRet |= 0 != GetDoc()->TextToTable( rInsTableOpts, rPaM, cCh,
+                                                eAdj, pTAFormat );
     }
     EndAllAction();
     return bRet;
@@ -141,26 +141,26 @@ bool SwEditShell::TableToText( sal_Unicode cCh )
     SwWait aWait( *GetDoc()->GetDocShell(), true );
     bool bRet = false;
     SwPaM* pCrsr = GetCrsr();
-    const SwTableNode* pTblNd =
-            GetDoc()->IsIdxInTbl( pCrsr->GetPoint()->nNode );
+    const SwTableNode* pTableNd =
+            GetDoc()->IsIdxInTable( pCrsr->GetPoint()->nNode );
     if( IsTableMode() )
     {
         ClearMark();
         pCrsr = GetCrsr();
     }
-    else if( !pTblNd || pCrsr->GetNext() != pCrsr )
+    else if( !pTableNd || pCrsr->GetNext() != pCrsr )
         return bRet;
 
     // TL_CHART2:
     // tell the charts about the table to be deleted and have them use their own data
-    GetDoc()->getIDocumentChartDataProviderAccess().CreateChartInternalDataProviders( &pTblNd->GetTable() );
+    GetDoc()->getIDocumentChartDataProviderAccess().CreateChartInternalDataProviders( &pTableNd->GetTable() );
 
     StartAllAction();
 
     // move current Cursor out of the listing area
-    SwNodeIndex aTabIdx( *pTblNd );
+    SwNodeIndex aTabIdx( *pTableNd );
     pCrsr->DeleteMark();
-    pCrsr->GetPoint()->nNode = *pTblNd->EndOfSectionNode();
+    pCrsr->GetPoint()->nNode = *pTableNd->EndOfSectionNode();
     pCrsr->GetPoint()->nContent.Assign( 0, 0 );
     // move sPoint and Mark out of the area!
     pCrsr->SetMark();
@@ -168,14 +168,14 @@ bool SwEditShell::TableToText( sal_Unicode cCh )
 
     //Modified for bug #i119954# Application crashed if undo/redo covert nest table to text
     StartUndo();
-    bRet = ConvertTableToText( pTblNd, cCh );
+    bRet = ConvertTableToText( pTableNd, cCh );
     EndUndo();
     //End  for bug #i119954#
     pCrsr->GetPoint()->nNode = aTabIdx;
 
-    SwCntntNode* pCNd = pCrsr->GetCntntNode();
+    SwContentNode* pCNd = pCrsr->GetContentNode();
     if( !pCNd )
-        pCrsr->Move( fnMoveForward, fnGoCntnt );
+        pCrsr->Move( fnMoveForward, fnGoContent );
     else
         pCrsr->GetPoint()->nContent.Assign( pCNd, 0 );
 
@@ -198,7 +198,7 @@ bool SwEditShell::IsTextToTableAvailable() const
             if( nStt > nEnd )   { sal_uLong n = nStt; nStt = nEnd; nEnd = n; }
 
             for( ; nStt <= nEnd; ++nStt )
-                if( !GetDoc()->GetNodes()[ nStt ]->IsTxtNode() )
+                if( !GetDoc()->GetNodes()[ nStt ]->IsTextNode() )
                 {
                     bOnlyText = false;
                     break;
@@ -212,7 +212,7 @@ bool SwEditShell::IsTextToTableAvailable() const
     return bOnlyText;
 }
 
-void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTblOpts,
+void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTableOpts,
                                   SwDDEFieldType* pDDEType,
                                   sal_uInt16 nRows, sal_uInt16 nCols,
                                   sal_Int16 eAdj )
@@ -228,15 +228,15 @@ void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTblOpts,
         GetDoc()->getIDocumentContentOperations().SplitNode( *pPos, false );
     }
 
-    const SwInsertTableOptions aInsTblOpts( rInsTblOpts.mnInsMode | tabopts::DEFAULT_BORDER,
-                                            rInsTblOpts.mnRowsToRepeat );
-    SwTable* pTbl = const_cast<SwTable*>(GetDoc()->InsertTable( aInsTblOpts, *pPos,
+    const SwInsertTableOptions aInsTableOpts( rInsTableOpts.mnInsMode | tabopts::DEFAULT_BORDER,
+                                            rInsTableOpts.mnRowsToRepeat );
+    SwTable* pTable = const_cast<SwTable*>(GetDoc()->InsertTable( aInsTableOpts, *pPos,
                                                      nRows, nCols, eAdj ));
 
-    SwTableNode* pTblNode = const_cast<SwTableNode*>(pTbl->GetTabSortBoxes()[ 0 ]->
+    SwTableNode* pTableNode = const_cast<SwTableNode*>(pTable->GetTabSortBoxes()[ 0 ]->
                                                 GetSttNd()->FindTableNode());
-    SwDDETable* pDDETbl = new SwDDETable( *pTbl, pDDEType );
-    pTblNode->SetNewTable( pDDETbl );       // setze die DDE-Tabelle
+    SwDDETable* pDDETable = new SwDDETable( *pTable, pDDEType );
+    pTableNode->SetNewTable( pDDETable );       // setze die DDE-Tabelle
 
     if( bEndUndo )
         EndUndo( UNDO_END );
@@ -247,17 +247,17 @@ void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTblOpts,
 /** update fields of a listing */
 void SwEditShell::UpdateTable()
 {
-    const SwTableNode* pTblNd = IsCrsrInTbl();
+    const SwTableNode* pTableNd = IsCrsrInTable();
 
     // Keine Arme keine Kekse
-    if( pTblNd )
+    if( pTableNd )
     {
         StartAllAction();
         if( DoesUndo() )
             StartUndo();
-        EndAllTblBoxEdit();
-        SwTableFmlUpdate aTblUpdate( &pTblNd->GetTable() );
-        GetDoc()->getIDocumentFieldsAccess().UpdateTblFlds( &aTblUpdate );
+        EndAllTableBoxEdit();
+        SwTableFormulaUpdate aTableUpdate( &pTableNd->GetTable() );
+        GetDoc()->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
         if( DoesUndo() )
             EndUndo();
         EndAllAction();
@@ -266,24 +266,24 @@ void SwEditShell::UpdateTable()
 
 // get/set Change Mode
 
-TblChgMode SwEditShell::GetTblChgMode() const
+TableChgMode SwEditShell::GetTableChgMode() const
 {
-    TblChgMode eMode;
-    const SwTableNode* pTblNd = IsCrsrInTbl();
-    if( pTblNd )
-        eMode = pTblNd->GetTable().GetTblChgMode();
+    TableChgMode eMode;
+    const SwTableNode* pTableNd = IsCrsrInTable();
+    if( pTableNd )
+        eMode = pTableNd->GetTable().GetTableChgMode();
     else
-        eMode = GetTblChgDefaultMode();
+        eMode = GetTableChgDefaultMode();
     return eMode;
 }
 
-void SwEditShell::SetTblChgMode( TblChgMode eMode )
+void SwEditShell::SetTableChgMode( TableChgMode eMode )
 {
-    const SwTableNode* pTblNd = IsCrsrInTbl();
+    const SwTableNode* pTableNd = IsCrsrInTable();
 
-    if( pTblNd )
+    if( pTableNd )
     {
-        const_cast<SwTable&>(pTblNd->GetTable()).SetTblChgMode( eMode );
+        const_cast<SwTable&>(pTableNd->GetTable()).SetTableChgMode( eMode );
         if( !GetDoc()->getIDocumentState().IsModified() )   // Bug 57028
         {
             GetDoc()->GetIDocumentUndoRedo().SetUndoNoResetModified();
@@ -292,11 +292,11 @@ void SwEditShell::SetTblChgMode( TblChgMode eMode )
     }
 }
 
-bool SwEditShell::GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const
+bool SwEditShell::GetTableBoxFormulaAttrs( SfxItemSet& rSet ) const
 {
     SwSelBoxes aBoxes;
     if( IsTableMode() )
-        ::GetTblSelCrs( *this, aBoxes );
+        ::GetTableSelCrs( *this, aBoxes );
     else
     {
         do {
@@ -315,30 +315,30 @@ bool SwEditShell::GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const
     for (size_t n = 0; n < aBoxes.size(); ++n)
     {
         const SwTableBox* pSelBox = aBoxes[ n ];
-        const SwTableBoxFmt* pTblFmt = static_cast<SwTableBoxFmt*>(pSelBox->GetFrmFmt());
+        const SwTableBoxFormat* pTableFormat = static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat());
         if( !n )
         {
             // Convert formulae into external presentation
-            const SwTable& rTbl = pSelBox->GetSttNd()->FindTableNode()->GetTable();
+            const SwTable& rTable = pSelBox->GetSttNd()->FindTableNode()->GetTable();
 
-            SwTableFmlUpdate aTblUpdate( &rTbl );
-            aTblUpdate.eFlags = TBL_BOXNAME;
-            static_cast<SwDoc*>(GetDoc())->getIDocumentFieldsAccess().UpdateTblFlds( &aTblUpdate );
+            SwTableFormulaUpdate aTableUpdate( &rTable );
+            aTableUpdate.eFlags = TBL_BOXNAME;
+            static_cast<SwDoc*>(GetDoc())->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
 
-            rSet.Put( pTblFmt->GetAttrSet() );
+            rSet.Put( pTableFormat->GetAttrSet() );
         }
         else
-            rSet.MergeValues( pTblFmt->GetAttrSet() );
+            rSet.MergeValues( pTableFormat->GetAttrSet() );
     }
     return 0 != rSet.Count();
 }
 
-void SwEditShell::SetTblBoxFormulaAttrs( const SfxItemSet& rSet )
+void SwEditShell::SetTableBoxFormulaAttrs( const SfxItemSet& rSet )
 {
     SET_CURR_SHELL( this );
     SwSelBoxes aBoxes;
     if( IsTableMode() )
-        ::GetTblSelCrs( *this, aBoxes );
+        ::GetTableSelCrs( *this, aBoxes );
     else
     {
         do {
@@ -356,13 +356,13 @@ void SwEditShell::SetTblBoxFormulaAttrs( const SfxItemSet& rSet )
 
     // When setting a formula, do not check further!
     if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMULA ))
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
 
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
     for (size_t n = 0; n < aBoxes.size(); ++n)
     {
-        GetDoc()->SetTblBoxFormulaAttrs( *aBoxes[ n ], rSet );
+        GetDoc()->SetTableBoxFormulaAttrs( *aBoxes[ n ], rSet );
     }
     GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
     EndAllAction();
@@ -386,26 +386,26 @@ bool SwEditShell::IsTableBoxTextFormat() const
     if( !pBox )
         return false;
 
-    sal_uInt32 nFmt = 0;
+    sal_uInt32 nFormat = 0;
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET == pBox->GetFrmFmt()->GetAttrSet().GetItemState(
+    if( SfxItemState::SET == pBox->GetFrameFormat()->GetAttrSet().GetItemState(
         RES_BOXATR_FORMAT, true, &pItem ))
     {
-        nFmt = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
-        return GetDoc()->GetNumberFormatter()->IsTextFormat( nFmt ) ||
-                static_cast<sal_uInt32>(css::util::NumberFormat::TEXT) == nFmt;
+        nFormat = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
+        return GetDoc()->GetNumberFormatter()->IsTextFormat( nFormat ) ||
+                static_cast<sal_uInt32>(css::util::NumberFormat::TEXT) == nFormat;
     }
 
-    sal_uLong nNd = pBox->IsValidNumTxtNd();
+    sal_uLong nNd = pBox->IsValidNumTextNd();
     if( ULONG_MAX == nNd )
         return true;
 
-    const OUString& rTxt = GetDoc()->GetNodes()[ nNd ]->GetTxtNode()->GetTxt();
-    if( rTxt.isEmpty() )
+    const OUString& rText = GetDoc()->GetNodes()[ nNd ]->GetTextNode()->GetText();
+    if( rText.isEmpty() )
         return false;
 
     double fVal;
-    return !GetDoc()->GetNumberFormatter()->IsNumberFormat( rTxt, nFmt, fVal );
+    return !GetDoc()->GetNumberFormatter()->IsNumberFormat( rText, nFormat, fVal );
 }
 
 OUString SwEditShell::GetTableBoxText() const
@@ -424,8 +424,8 @@ OUString SwEditShell::GetTableBoxText() const
         }
 
         sal_uLong nNd;
-        if( pBox && ULONG_MAX != ( nNd = pBox->IsValidNumTxtNd() ) )
-            sRet = GetDoc()->GetNodes()[ nNd ]->GetTxtNode()->GetTxt();
+        if( pBox && ULONG_MAX != ( nNd = pBox->IsValidNumTextNd() ) )
+            sRet = GetDoc()->GetNodes()[ nNd ]->GetTextNode()->GetText();
     }
     return sRet;
 }
@@ -470,22 +470,22 @@ bool SwEditShell::CanMergeTable( bool bWithPrev, bool* pChkNxtPrv ) const
 {
     bool bRet = false;
     const SwPaM *pCrsr = GetCrsr();
-    const SwTableNode* pTblNd = pCrsr->GetNode().FindTableNode();
-    if( pTblNd && !pTblNd->GetTable().ISA( SwDDETable ))
+    const SwTableNode* pTableNd = pCrsr->GetNode().FindTableNode();
+    if( pTableNd && !pTableNd->GetTable().ISA( SwDDETable ))
     {
-        bool bNew = pTblNd->GetTable().IsNewModel();
+        bool bNew = pTableNd->GetTable().IsNewModel();
         const SwNodes& rNds = GetDoc()->GetNodes();
         if( pChkNxtPrv )
         {
-            const SwTableNode* pChkNd = rNds[ pTblNd->GetIndex() - 1 ]->FindTableNode();
+            const SwTableNode* pChkNd = rNds[ pTableNd->GetIndex() - 1 ]->FindTableNode();
             if( pChkNd && !pChkNd->GetTable().ISA( SwDDETable ) &&
                 bNew == pChkNd->GetTable().IsNewModel() &&
                 // Consider table in table case
-                pChkNd->EndOfSectionIndex() == pTblNd->GetIndex() - 1 )
+                pChkNd->EndOfSectionIndex() == pTableNd->GetIndex() - 1 )
                 *pChkNxtPrv = true, bRet = true;        // using Prev is possible
             else
             {
-                pChkNd = rNds[ pTblNd->EndOfSectionIndex() + 1 ]->GetTableNode();
+                pChkNd = rNds[ pTableNd->EndOfSectionIndex() + 1 ]->GetTableNode();
                 if( pChkNd && !pChkNd->GetTable().ISA( SwDDETable ) &&
                     bNew == pChkNd->GetTable().IsNewModel() )
                     *pChkNxtPrv = false, bRet = true;   // using Next is possible
@@ -493,20 +493,20 @@ bool SwEditShell::CanMergeTable( bool bWithPrev, bool* pChkNxtPrv ) const
         }
         else
         {
-            const SwTableNode* pTmpTblNd = 0;
+            const SwTableNode* pTmpTableNd = 0;
 
             if( bWithPrev )
             {
-                pTmpTblNd = rNds[ pTblNd->GetIndex() - 1 ]->FindTableNode();
+                pTmpTableNd = rNds[ pTableNd->GetIndex() - 1 ]->FindTableNode();
                 // Consider table in table case
-                if ( pTmpTblNd && pTmpTblNd->EndOfSectionIndex() != pTblNd->GetIndex() - 1 )
-                    pTmpTblNd = 0;
+                if ( pTmpTableNd && pTmpTableNd->EndOfSectionIndex() != pTableNd->GetIndex() - 1 )
+                    pTmpTableNd = 0;
             }
             else
-                pTmpTblNd = rNds[ pTblNd->EndOfSectionIndex() + 1 ]->GetTableNode();
+                pTmpTableNd = rNds[ pTableNd->EndOfSectionIndex() + 1 ]->GetTableNode();
 
-            bRet = pTmpTblNd && !pTmpTblNd->GetTable().ISA( SwDDETable ) &&
-                   bNew == pTmpTblNd->GetTable().IsNewModel();
+            bRet = pTmpTableNd && !pTmpTableNd->GetTable().ISA( SwDDETable ) &&
+                   bNew == pTmpTableNd->GetTable().IsNewModel();
         }
     }
     return bRet;
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 879285db36ff..7babb2d3a588 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -111,7 +111,7 @@ void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly)
 
     SwSectionData aSectionData(rTOXSect);
     aSectionData.SetProtectFlag(bReadonly);
-    UpdateSection( GetSectionFmtPos( *rTOXSect.GetFmt()  ), aSectionData, 0 );
+    UpdateSection( GetSectionFormatPos( *rTOXSect.GetFormat()  ), aSectionData, 0 );
 }
 
 const SwTOXBase*    SwEditShell::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate )
@@ -161,7 +161,7 @@ bool SwEditShell::UpdateTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
     OSL_ENSURE( rTOX.ISA( SwTOXBaseSection ),  "no TOXBaseSection!" );
     SwTOXBaseSection* pTOX = const_cast<SwTOXBaseSection*>(static_cast<const SwTOXBaseSection*>(&rTOX));
     OSL_ENSURE(pTOX, "no current listing");
-    if( pTOX && 0 != pTOX->GetFmt()->GetSectionNode() )
+    if( pTOX && 0 != pTOX->GetFormat()->GetSectionNode() )
     {
         SwDoc* pMyDoc = GetDoc();
         SwDocShell* pDocSh = pMyDoc->GetDocShell();
@@ -223,13 +223,13 @@ sal_uInt16 SwEditShell::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rA
 
 sal_uInt16 SwEditShell::GetTOXCount() const
 {
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
     sal_uInt16 nRet = 0;
-    for( auto n = rFmts.size(); n; )
+    for( auto n = rFormats.size(); n; )
     {
-        const SwSection* pSect = rFmts[ --n ]->GetSection();
+        const SwSection* pSect = rFormats[ --n ]->GetSection();
         if( TOX_CONTENT_SECTION == pSect->GetType() &&
-            pSect->GetFmt()->GetSectionNode() )
+            pSect->GetFormat()->GetSectionNode() )
             ++nRet;
     }
     return nRet;
@@ -237,13 +237,13 @@ sal_uInt16 SwEditShell::GetTOXCount() const
 
 const SwTOXBase* SwEditShell::GetTOX( sal_uInt16 nPos ) const
 {
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
     sal_uInt16 nCnt {0};
-    for( const SwSectionFmt *pFmt : rFmts )
+    for( const SwSectionFormat *pFormat : rFormats )
     {
-        const SwSection* pSect = pFmt->GetSection();
+        const SwSection* pSect = pFormat->GetSection();
         if( TOX_CONTENT_SECTION == pSect->GetType() &&
-            pSect->GetFmt()->GetSectionNode() &&
+            pSect->GetFormat()->GetSectionNode() &&
             nCnt++ == nPos )
         {
             OSL_ENSURE( pSect->ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
@@ -295,7 +295,7 @@ void SwEditShell::ApplyAutoMark()
         SwTOXMark::InsertTOXMarks( aMarks, *pTOXType );
         for( SwTOXMark* pMark : aMarks )
         {
-            if(pMark->IsAutoGenerated() && pMark->GetTxtTOXMark())
+            if(pMark->IsAutoGenerated() && pMark->GetTextTOXMark())
                 // mba: test iteration; objects are deleted in iteration
                 DeleteTOXMark(pMark);
         }
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index f657c0609c4f..3a3944e01b29 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -53,15 +53,15 @@ void SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext)
         return;
     }
 
-    SwFrmFmt * pSelFmt(0);
+    SwFrameFormat * pSelFormat(0);
     SdrMarkList * pMarkList(0);
-    rContext.GetSelections(pSelFmt, pMarkList);
+    rContext.GetSelections(pSelFormat, pMarkList);
 
-    if (pSelFmt) // select frame
+    if (pSelFormat) // select frame
     {
-        if (RES_DRAWFRMFMT == pSelFmt->Which())
+        if (RES_DRAWFRMFMT == pSelFormat->Which())
         {
-            SdrObject* pSObj = pSelFmt->FindSdrObject();
+            SdrObject* pSObj = pSelFormat->FindSdrObject();
             static_cast<SwFEShell*>(this)->SelectObj(
                     pSObj->GetCurrentBoundRect().Center() );
         }
@@ -69,14 +69,14 @@ void SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext)
         {
             Point aPt;
             SwFlyFrm *const pFly =
-                static_cast<SwFlyFrmFmt*>(pSelFmt)->GetFrm(& aPt, false);
+                static_cast<SwFlyFrameFormat*>(pSelFormat)->GetFrm(& aPt, false);
             if (pFly)
             {
                 // fdo#36681: Invalidate the content and layout to refresh
                 // the picture anchoring properly
                 SwPageFrm* pPageFrm = pFly->FindPageFrmOfAnchor();
                 pPageFrm->InvalidateFlyLayout();
-                pPageFrm->InvalidateCntnt();
+                pPageFrm->InvalidateContent();
 
                 static_cast<SwFEShell*>(this)->SelectFlyFrm(*pFly, true);
             }
@@ -121,7 +121,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
         Push();
 
         // Destroy stored TableBoxPtr. A dection is only permitted for the new "Box"!
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
 
         const RedlineMode_t eOld = GetDoc()->getIDocumentRedlineAccess().GetRedlineMode();
 
@@ -146,7 +146,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
         GetDoc()->getIDocumentRedlineAccess().CompressRedlines();
 
         // automatic detection of the new "Box"
-        SaveTblBoxCntnt();
+        SaveTableBoxContent();
     }
     EndAllAction();
 
@@ -177,7 +177,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount)
         Push();
 
         // Destroy stored TableBoxPtr. A dection is only permitted for the new "Box"!
-        ClearTblBoxCntnt();
+        ClearTableBoxContent();
 
         RedlineMode_t eOld = GetDoc()->getIDocumentRedlineAccess().GetRedlineMode();
 
@@ -198,7 +198,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount)
         GetDoc()->getIDocumentRedlineAccess().CompressRedlines();
 
         // automatic detection of the new "Box"
-        SaveTblBoxCntnt();
+        SaveTableBoxContent();
     }
 
     EndAllAction();
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 8320085184ab..2303e07a3a45 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -128,7 +128,7 @@ sal_uInt16 SwEditShell::GetCntType() const
 bool SwEditShell::HasOtherCnt() const
 
 {
-    if ( !GetDoc()->GetSpzFrmFmts()->empty() )
+    if ( !GetDoc()->GetSpzFrameFormats()->empty() )
         return true;
 
     const SwNodes &rNds = GetDoc()->GetNodes();
@@ -169,10 +169,10 @@ SwMvContext::~SwMvContext()
     m_rShell.EndCrsrMove();
 }
 
-SwFrmFmt *SwEditShell::GetTableFmt() // fastest test on a table
+SwFrameFormat *SwEditShell::GetTableFormat() // fastest test on a table
 {
-    const SwTableNode* pTblNd = IsCrsrInTbl();
-    return pTblNd ? (SwFrmFmt*)pTblNd->GetTable().GetFrmFmt() : 0;
+    const SwTableNode* pTableNd = IsCrsrInTable();
+    return pTableNd ? (SwFrameFormat*)pTableNd->GetTable().GetFrameFormat() : 0;
 }
 
 // TODO: Why is this called 3x for a new document?
@@ -242,16 +242,16 @@ void SwEditShell::AutoCorrect( SvxAutoCorrect& rACorr, bool bInsert,
     StartAllAction();
 
     SwPaM* pCrsr = getShellCrsr( true );
-    SwTxtNode* pTNd = pCrsr->GetNode().GetTxtNode();
+    SwTextNode* pTNd = pCrsr->GetNode().GetTextNode();
 
     SwAutoCorrDoc aSwAutoCorrDoc( *this, *pCrsr, cChar );
     // FIXME: this _must_ be called with reference to the actual node text!
-    OUString const& rNodeText(pTNd->GetTxt());
+    OUString const& rNodeText(pTNd->GetText());
     rACorr.DoAutoCorrect( aSwAutoCorrDoc,
                     rNodeText, pCrsr->GetPoint()->nContent.GetIndex(),
                     cChar, bInsert, GetWin() );
     if( cChar )
-        SaveTblBoxCntnt( pCrsr->GetPoint() );
+        SaveTableBoxContent( pCrsr->GetPoint() );
     EndAllAction();
 }
 
@@ -267,12 +267,12 @@ bool SwEditShell::GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord )
     bool bRet;
     SwPaM* pCrsr = getShellCrsr( true );
     const sal_Int32 nPos = pCrsr->GetPoint()->nContent.GetIndex();
-    SwTxtNode* pTNd = pCrsr->GetNode().GetTxtNode();
+    SwTextNode* pTNd = pCrsr->GetNode().GetTextNode();
     if( pTNd && nPos )
     {
         SwAutoCorrDoc aSwAutoCorrDoc( *this, *pCrsr, 0 );
         bRet = rACorr.GetPrevAutoCorrWord( aSwAutoCorrDoc,
-                                            pTNd->GetTxt(), nPos, rWord );
+                                            pTNd->GetText(), nPos, rWord );
     }
     else
         bRet = false;
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 2671f08c0035..ec4f7c4ae7d2 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -240,38 +240,38 @@ sal_uInt16  SwAuthorityFieldType::GetSequencePos(sal_IntPtr nHandle)
     if(m_SequArr.empty())
     {
         SwTOXSortTabBases aSortArr;
-        SwIterator<SwFmtFld,SwFieldType> aIter( *this );
+        SwIterator<SwFormatField,SwFieldType> aIter( *this );
 
         SwTOXInternational aIntl(m_eLanguage, 0, m_sSortAlgorithm);
 
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
         {
-            const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-            if(!pTxtFld || !pTxtFld->GetpTxtNode())
+            const SwTextField* pTextField = pFormatField->GetTextField();
+            if(!pTextField || !pTextField->GetpTextNode())
             {
 #if OSL_DEBUG_LEVEL > 0
-                if(nHandle == static_cast<SwAuthorityField*>(pFmtFld->GetField())->GetHandle())
+                if(nHandle == static_cast<SwAuthorityField*>(pFormatField->GetField())->GetHandle())
                     bCurrentFieldWithoutTextNode = true;
 #endif
                 continue;
             }
-            const SwTxtNode& rFldTxtNode = pTxtFld->GetTxtNode();
-            SwPosition aFldPos(rFldTxtNode);
-            SwDoc& rDoc = *const_cast<SwDoc*>(rFldTxtNode.GetDoc());
-            SwCntntFrm *pFrm = rFldTxtNode.getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
-            const SwTxtNode* pTxtNode = 0;
+            const SwTextNode& rFieldTextNode = pTextField->GetTextNode();
+            SwPosition aFieldPos(rFieldTextNode);
+            SwDoc& rDoc = *const_cast<SwDoc*>(rFieldTextNode.GetDoc());
+            SwContentFrm *pFrm = rFieldTextNode.getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
+            const SwTextNode* pTextNode = 0;
             if(pFrm && !pFrm->IsInDocBody())
-                pTxtNode = GetBodyTxtNode( rDoc, aFldPos, *pFrm );
+                pTextNode = GetBodyTextNode( rDoc, aFieldPos, *pFrm );
             //if no text node could be found or the field is in the document
             //body the directly available text node will be used
-            if(!pTxtNode)
-                pTxtNode = &rFldTxtNode;
-            if (!pTxtNode->GetTxt().isEmpty() &&
-                pTxtNode->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() ) &&
-                pTxtNode->GetNodes().IsDocNodes() )
+            if(!pTextNode)
+                pTextNode = &rFieldTextNode;
+            if (!pTextNode->GetText().isEmpty() &&
+                pTextNode->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() ) &&
+                pTextNode->GetNodes().IsDocNodes() )
             {
-                SwTOXAuthority* pNew = new SwTOXAuthority( *pTxtNode,
-                                                            *pFmtFld, aIntl );
+                SwTOXAuthority* pNew = new SwTOXAuthority( *pTextNode,
+                                                            *pFormatField, aIntl );
 
                 for(SwTOXSortTabBases::size_type i = 0; i < aSortArr.size(); ++i)
                 {
@@ -310,9 +310,9 @@ sal_uInt16  SwAuthorityFieldType::GetSequencePos(sal_IntPtr nHandle)
         for(const auto *pBase : aSortArr)
         {
             const SwTOXSortTabBase& rBase = *pBase;
-            SwFmtFld& rFmtFld = const_cast<SwTOXAuthority&>(static_cast<const SwTOXAuthority&>(rBase)).GetFldFmt();
-            SwAuthorityField* pAFld = static_cast<SwAuthorityField*>(rFmtFld.GetField());
-            m_SequArr.push_back(pAFld->GetHandle());
+            SwFormatField& rFormatField = const_cast<SwTOXAuthority&>(static_cast<const SwTOXAuthority&>(rBase)).GetFieldFormat();
+            SwAuthorityField* pAField = static_cast<SwAuthorityField*>(rFormatField.GetField());
+            m_SequArr.push_back(pAField->GetHandle());
         }
         for (SwTOXSortTabBases::const_iterator it = aSortArr.begin(); it != aSortArr.end(); ++it)
             delete *it;
@@ -525,7 +525,7 @@ OUString SwAuthorityField::ConditionalExpand(ToxAuthorityField eField) const
 
     if( pAuthType->IsSequence() )
     {
-       if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFldsLocked())
+       if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFieldsLocked())
            m_nTempSequencePos = pAuthType->GetSequencePos( m_nHandle );
        if( m_nTempSequencePos >= 0 )
            sRet += OUString::number( m_nTempSequencePos );
@@ -549,7 +549,7 @@ OUString SwAuthorityField::ExpandCitation(ToxAuthorityField eField) const
 
     if( pAuthType->IsSequence() )
     {
-       if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFldsLocked())
+       if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFieldsLocked())
            m_nTempSequencePos = pAuthType->GetSequencePos( m_nHandle );
        if( m_nTempSequencePos >= 0 )
            sRet += OUString::number( m_nTempSequencePos );
@@ -693,10 +693,10 @@ bool    SwAuthorityField::PutValue( const Any& rAny, sal_uInt16 /*nWhichId*/ )
     return false;
 }
 
-SwFieldType* SwAuthorityField::ChgTyp( SwFieldType* pFldTyp )
+SwFieldType* SwAuthorityField::ChgTyp( SwFieldType* pFieldTyp )
 {
     SwAuthorityFieldType* pSrcTyp = static_cast<SwAuthorityFieldType*>(GetTyp()),
-                        * pDstTyp = static_cast<SwAuthorityFieldType*>(pFldTyp);
+                        * pDstTyp = static_cast<SwAuthorityFieldType*>(pFieldTyp);
     if( pSrcTyp != pDstTyp )
     {
 
@@ -705,7 +705,7 @@ SwFieldType* SwAuthorityField::ChgTyp( SwFieldType* pFldTyp )
         pSrcTyp->RemoveField( m_nHandle );
         m_nHandle = pDstTyp->GetHandle( nHdlPos );
         pDstTyp->AddField( m_nHandle );
-        SwField::ChgTyp( pFldTyp );
+        SwField::ChgTyp( pFieldTyp );
     }
     return pSrcTyp;
 }
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 4e203494f29f..1010f0032b8e 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -56,11 +56,11 @@ enum
 
 static const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox );
 static sal_Int32 lcl_GetLongBoxNum( OUString& rStr );
-static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
+static const SwTableBox* lcl_RelToBox( const SwTable& rTable,
                                        const SwTableBox* pRefBox,
                                        const OUString& sGetName);
-static OUString lcl_BoxNmToRel( const SwTable& rTbl,
-                                const SwTableNode& rTblNd,
+static OUString lcl_BoxNmToRel( const SwTable& rTable,
+                                const SwTableNode& rTableNd,
                                 const OUString& sRefBoxNm,
                                 const OUString& sGetStr,
                                 bool bExtrnlNm);
@@ -71,7 +71,7 @@ static OUString lcl_BoxNmToRel( const SwTable& rTbl,
  * formula then calculate it, if it starts with a field then get the value.
  * All other conditions return 0 (and an error?).
  */
-double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
+double SwTableBox::GetValue( SwTableCalcPara& rCalcPara ) const
 {
     double nRet = 0;
 
@@ -87,7 +87,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
     if( rCalcPara.IncStackCnt() )
         return nRet;
 
-    rCalcPara.SetLastTblBox( this );
+    rCalcPara.SetLastTableBox( this );
 
     // Does it create a recursion?
     SwTableBox* pBox = const_cast<SwTableBox*>(this);
@@ -95,96 +95,96 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
         return nRet;            // already on the stack: error
 
     // re-start with this box
-    rCalcPara.SetLastTblBox( this );
+    rCalcPara.SetLastTableBox( this );
 
     rCalcPara.pBoxStk->insert( pBox );      // add
     do {        // Middle-Check-Loop, so that we can jump from here. Used so that the box pointer
                 // will be removed from stack at the end.
-        SwDoc* pDoc = GetFrmFmt()->GetDoc();
+        SwDoc* pDoc = GetFrameFormat()->GetDoc();
 
         const SfxPoolItem* pItem;
-        if( SfxItemState::SET == GetFrmFmt()->GetItemState(
+        if( SfxItemState::SET == GetFrameFormat()->GetItemState(
                                 RES_BOXATR_FORMULA, false, &pItem ) )
         {
             rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
-            if( !static_cast<const SwTblBoxFormula*>(pItem)->IsValid() )
+            if( !static_cast<const SwTableBoxFormula*>(pItem)->IsValid() )
             {
                 // calculate
-                const SwTable* pTmp = rCalcPara.pTbl;
-                rCalcPara.pTbl = &pBox->GetSttNd()->FindTableNode()->GetTable();
-                const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->Calc( rCalcPara, nRet );
+                const SwTable* pTmp = rCalcPara.pTable;
+                rCalcPara.pTable = &pBox->GetSttNd()->FindTableNode()->GetTable();
+                const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->Calc( rCalcPara, nRet );
 
                 if( !rCalcPara.IsStackOverflow() )
                 {
-                    SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
+                    SwFrameFormat* pFormat = pBox->ClaimFrameFormat();
                     SfxItemSet aTmp( pDoc->GetAttrPool(),
                                         RES_BOXATR_BEGIN,RES_BOXATR_END-1 );
-                    aTmp.Put( SwTblBoxValue( nRet ) );
-                    if( SfxItemState::SET != pFmt->GetItemState( RES_BOXATR_FORMAT ))
-                        aTmp.Put( SwTblBoxNumFormat( 0 ));
-                    pFmt->SetFmtAttr( aTmp );
+                    aTmp.Put( SwTableBoxValue( nRet ) );
+                    if( SfxItemState::SET != pFormat->GetItemState( RES_BOXATR_FORMAT ))
+                        aTmp.Put( SwTableBoxNumFormat( 0 ));
+                    pFormat->SetFormatAttr( aTmp );
                 }
-                rCalcPara.pTbl = pTmp;
+                rCalcPara.pTable = pTmp;
             }
             else
-                nRet = GetFrmFmt()->GetTblBoxValue().GetValue();
+                nRet = GetFrameFormat()->GetTableBoxValue().GetValue();
             break;
         }
-        else if( SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+        else if( SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
                                 RES_BOXATR_VALUE, false, &pItem ) )
         {
             rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
-            nRet = static_cast<const SwTblBoxValue*>(pItem)->GetValue();
+            nRet = static_cast<const SwTableBoxValue*>(pItem)->GetValue();
             break;
         }
 
-        SwTxtNode* pTxtNd = pDoc->GetNodes()[ pSttNd->GetIndex() + 1 ]->GetTxtNode();
-        if( !pTxtNd )
+        SwTextNode* pTextNd = pDoc->GetNodes()[ pSttNd->GetIndex() + 1 ]->GetTextNode();
+        if( !pTextNd )
             break;
 
         sal_Int32 nSttPos = 0;
-        OUString sTxt = pTxtNd->GetTxt();
-        while ( nSttPos < sTxt.getLength() && ( sTxt[nSttPos]==' ' || sTxt[nSttPos]=='\t' ) )
+        OUString sText = pTextNd->GetText();
+        while ( nSttPos < sText.getLength() && ( sText[nSttPos]==' ' || sText[nSttPos]=='\t' ) )
             ++nSttPos;
 
         // if there is a calculation field at position 1, get the value of it
-        const bool bOK = nSttPos<sTxt.getLength();
-        const sal_Unicode Char = bOK ? sTxt[nSttPos] : 0;
+        const bool bOK = nSttPos<sText.getLength();
+        const sal_Unicode Char = bOK ? sText[nSttPos] : 0;
         if ( bOK && (Char==CH_TXTATR_BREAKWORD || Char==CH_TXTATR_INWORD) )
         {
-            SwTxtFld * const pTxtFld =
-                static_txtattr_cast<SwTxtFld*>(pTxtNd->GetTxtAttrForCharAt(nSttPos, RES_TXTATR_FIELD));
-            if ( pTxtFld == NULL )
+            SwTextField * const pTextField =
+                static_txtattr_cast<SwTextField*>(pTextNd->GetTextAttrForCharAt(nSttPos, RES_TXTATR_FIELD));
+            if ( pTextField == NULL )
                 break;
 
             rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
 
-            const SwField* pFld = pTxtFld->GetFmtFld().GetField();
-            switch ( pFld->GetTyp()->Which() )
+            const SwField* pField = pTextField->GetFormatField().GetField();
+            switch ( pField->GetTyp()->Which() )
             {
             case RES_SETEXPFLD:
-                nRet = static_cast<const SwSetExpField*>(pFld)->GetValue();
+                nRet = static_cast<const SwSetExpField*>(pField)->GetValue();
                 break;
             case RES_USERFLD:
-                nRet = static_cast<const SwUserField*>(pFld)->GetValue();
+                nRet = static_cast<const SwUserField*>(pField)->GetValue();
                 break;
             case RES_TABLEFLD:
                 {
-                    SwTblField* pTblFld = const_cast<SwTblField*>(static_cast<const SwTblField*>(pFld));
-                    if( !pTblFld->IsValid() )
+                    SwTableField* pTableField = const_cast<SwTableField*>(static_cast<const SwTableField*>(pField));
+                    if( !pTableField->IsValid() )
                     {
                         // use the right table!
-                        const SwTable* pTmp = rCalcPara.pTbl;
-                        rCalcPara.pTbl = &pTxtNd->FindTableNode()->GetTable();
-                        pTblFld->CalcField( rCalcPara );
-                        rCalcPara.pTbl = pTmp;
+                        const SwTable* pTmp = rCalcPara.pTable;
+                        rCalcPara.pTable = &pTextNd->FindTableNode()->GetTable();
+                        pTableField->CalcField( rCalcPara );
+                        rCalcPara.pTable = pTmp;
                     }
-                    nRet = pTblFld->GetValue();
+                    nRet = pTableField->GetValue();
                 }
                 break;
 
             case RES_DATETIMEFLD:
-                nRet = static_cast<const SwDateTimeField*>( pFld )->GetValue();
+                nRet = static_cast<const SwDateTimeField*>( pField )->GetValue();
                 break;
 
             case RES_JUMPEDITFLD:
@@ -193,18 +193,18 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
                 break;
 
             default:
-                nRet = rCalcPara.rCalc.Calculate( pFld->ExpandField(true) ).GetDouble();
+                nRet = rCalcPara.rCalc.Calculate( pField->ExpandField(true) ).GetDouble();
             }
         }
-        else if ( nSttPos < sTxt.getLength()
+        else if ( nSttPos < sText.getLength()
                   && Char == CH_TXT_ATR_INPUTFIELDSTART )
         {
-            const SwTxtInputFld * pTxtInputFld =
-                dynamic_cast< const SwTxtInputFld* >(
-                    pTxtNd->GetTxtAttrAt( nSttPos, RES_TXTATR_INPUTFIELD, SwTxtNode::DEFAULT ) );
-            if ( pTxtInputFld == NULL )
+            const SwTextInputField * pTextInputField =
+                dynamic_cast< const SwTextInputField* >(
+                    pTextNd->GetTextAttrAt( nSttPos, RES_TXTATR_INPUTFIELD, SwTextNode::DEFAULT ) );
+            if ( pTextInputField == NULL )
                 break;
-            nRet = rCalcPara.rCalc.Calculate( pTxtInputFld->GetFieldContent() ).GetDouble();
+            nRet = rCalcPara.rCalc.Calculate( pTextInputField->GetFieldContent() ).GetDouble();
         }
         else
         {
@@ -212,24 +212,24 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
             rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
 
             double aNum = 0.0;
-            sTxt = bOK ? sTxt.copy( nSttPos ) : OUString();
-            sal_uInt32 nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue();
+            sText = bOK ? sText.copy( nSttPos ) : OUString();
+            sal_uInt32 nFormatIndex = GetFrameFormat()->GetTableBoxNumFormat().GetValue();
 
-            SvNumberFormatter* pNumFmtr = pDoc->GetNumberFormatter();
+            SvNumberFormatter* pNumFormatr = pDoc->GetNumberFormatter();
 
-            if( static_cast<sal_uInt32>(css::util::NumberFormat::TEXT) == nFmtIndex )
-                nFmtIndex = 0;
+            if( static_cast<sal_uInt32>(css::util::NumberFormat::TEXT) == nFormatIndex )
+                nFormatIndex = 0;
             // JP 22.04.98: Bug 49659 - special treatment for percentages
-            else if( !sTxt.isEmpty() &&
-                    css::util::NumberFormat::PERCENT == pNumFmtr->GetType( nFmtIndex ))
+            else if( !sText.isEmpty() &&
+                    css::util::NumberFormat::PERCENT == pNumFormatr->GetType( nFormatIndex ))
             {
-                sal_uInt32 nTmpFmt = 0;
-                if( pNumFmtr->IsNumberFormat( sTxt, nTmpFmt, aNum ) &&
-                    css::util::NumberFormat::NUMBER == pNumFmtr->GetType( nTmpFmt ))
-                    sTxt += OUString('%');
+                sal_uInt32 nTmpFormat = 0;
+                if( pNumFormatr->IsNumberFormat( sText, nTmpFormat, aNum ) &&
+                    css::util::NumberFormat::NUMBER == pNumFormatr->GetType( nTmpFormat ))
+                    sText += OUString('%');
             }
 
-            if( pNumFmtr->IsNumberFormat( sTxt, nFmtIndex, aNum ))
+            if( pNumFormatr->IsNumberFormat( sText, nFormatIndex, aNum ))
                 nRet = aNum;
         }
         // ?? otherwise it is an error
@@ -250,19 +250,19 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
 
 // structure needed for calculation of tables
 
-SwTblCalcPara::SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable )
-    : pLastTblBox( 0 ), nStackCnt( 0 ), nMaxSize( cMAXSTACKSIZE ),
-    rCalc( rCalculator ), pTbl( &rTable )
+SwTableCalcPara::SwTableCalcPara( SwCalc& rCalculator, const SwTable& rTable )
+    : pLastTableBox( 0 ), nStackCnt( 0 ), nMaxSize( cMAXSTACKSIZE ),
+    rCalc( rCalculator ), pTable( &rTable )
 {
     pBoxStk = new SwTableSortBoxes;
 }
 
-SwTblCalcPara::~SwTblCalcPara()
+SwTableCalcPara::~SwTableCalcPara()
 {
     delete pBoxStk;
 }
 
-bool SwTblCalcPara::CalcWithStackOverflow()
+bool SwTableCalcPara::CalcWithStackOverflow()
 {
     // If a stack overflow was detected, redo with last box.
     sal_uInt16 nSaveMaxSize = nMaxSize;
@@ -271,7 +271,7 @@ bool SwTblCalcPara::CalcWithStackOverflow()
     sal_uInt16 nCnt = 0;
     SwTableBoxes aStackOverflows;
     do {
-        SwTableBox* pBox = const_cast<SwTableBox*>(pLastTblBox);
+        SwTableBox* pBox = const_cast<SwTableBox*>(pLastTableBox);
         nStackCnt = 0;
         rCalc.SetCalcError( CALC_NOERR );
         aStackOverflows.insert( aStackOverflows.begin() + nCnt++, pBox );
@@ -310,10 +310,10 @@ SwTableFormula::~SwTableFormula()
 {
 }
 
-void SwTableFormula::_MakeFormula( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::_MakeFormula( const SwTable& rTable, OUString& rNewStr,
                     OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
-    SwTblCalcPara* pCalcPara = static_cast<SwTblCalcPara*>(pPara);
+    SwTableCalcPara* pCalcPara = static_cast<SwTableCalcPara*>(pPara);
     if( pCalcPara->rCalc.IsCalcError() )        // stop if there is already an error set
         return;
 
@@ -326,14 +326,14 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, OUString& rNewStr,
         pEndBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->toInt64()));
 
         // Is it actually a valid pointer?
-        if( rTbl.GetTabSortBoxes().find( pEndBox ) == rTbl.GetTabSortBoxes().end() )
+        if( rTable.GetTabSortBoxes().find( pEndBox ) == rTable.GetTabSortBoxes().end() )
             pEndBox = 0;
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
     SwTableBox* pSttBox = reinterpret_cast<SwTableBox*>(
                             sal::static_int_cast<sal_IntPtr>(rFirstBox.toInt64()));
     // Is it actually a valid pointer?
-    if( rTbl.GetTabSortBoxes().find( pSttBox ) == rTbl.GetTabSortBoxes().end() )
+    if( rTable.GetTabSortBoxes().find( pSttBox ) == rTable.GetTabSortBoxes().end() )
         pSttBox = 0;
 
     rNewStr += " ";
@@ -348,14 +348,14 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, OUString& rNewStr,
         for (size_t n = 0; n < aBoxes.size() &&
                            !pCalcPara->rCalc.IsCalcError(); ++n)
         {
-            const SwTableBox* pTblBox = aBoxes[n];
-            if ( pTblBox->getRowSpan() >= 1 )
+            const SwTableBox* pTableBox = aBoxes[n];
+            if ( pTableBox->getRowSpan() >= 1 )
             {
                 if( bDelim )
                     rNewStr += OUString(cListDelim);
                 bDelim = true;
                 rNewStr += pCalcPara->rCalc.GetStrResult(
-                            pTblBox->GetValue( *pCalcPara ), false );
+                            pTableBox->GetValue( *pCalcPara ), false );
             }
         }
         rNewStr += ")";
@@ -375,20 +375,20 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, OUString& rNewStr,
     rNewStr += " ";
 }
 
-void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::RelNmsToBoxNms( const SwTable& rTable, OUString& rNewStr,
             OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
     // relative name w.r.t. box name (external presentation)
     SwNode* pNd = static_cast<SwNode*>(pPara);
     OSL_ENSURE( pNd, "Feld steht in keinem TextNode" );
-    const SwTableBox *pBox = rTbl.GetTblBox(
+    const SwTableBox *pBox = rTable.GetTableBox(
                     pNd->FindTableBoxStartNode()->GetIndex() );
 
     rNewStr += OUString(rFirstBox[0]); // get label for the box
     rFirstBox = rFirstBox.copy(1);
     if( pLastBox )
     {
-        const SwTableBox *pRelLastBox = lcl_RelToBox( rTbl, pBox, *pLastBox );
+        const SwTableBox *pRelLastBox = lcl_RelToBox( rTable, pBox, *pLastBox );
         if ( pRelLastBox )
             rNewStr += pRelLastBox->GetName();
         else
@@ -397,7 +397,7 @@ void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, OUString& rNewStr,
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
-    const SwTableBox *pRelFirstBox = lcl_RelToBox( rTbl, pBox, rFirstBox );
+    const SwTableBox *pRelFirstBox = lcl_RelToBox( rTable, pBox, rFirstBox );
 
     if (pRelFirstBox)
         rNewStr += pRelFirstBox->GetName();
@@ -408,20 +408,20 @@ void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, OUString& rNewStr,
     rNewStr += OUString(rFirstBox[ rFirstBox.getLength()-1 ]);
 }
 
-void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTable, OUString& rNewStr,
             OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
     // relative name w.r.t. box name (internal presentation)
     SwNode* pNd = static_cast<SwNode*>(pPara);
     OSL_ENSURE( pNd, "Field not placed in any Node" );
-    const SwTableBox *pBox = rTbl.GetTblBox(
+    const SwTableBox *pBox = rTable.GetTableBox(
                     pNd->FindTableBoxStartNode()->GetIndex() );
 
     rNewStr += OUString(rFirstBox[0]); // get label for the box
     rFirstBox = rFirstBox.copy(1);
     if( pLastBox )
     {
-        const SwTableBox *pRelLastBox = lcl_RelToBox( rTbl, pBox, *pLastBox );
+        const SwTableBox *pRelLastBox = lcl_RelToBox( rTable, pBox, *pLastBox );
         if ( pRelLastBox )
             rNewStr += OUString::number(reinterpret_cast<sal_PtrDiff>(pRelLastBox));
         else
@@ -430,7 +430,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
-    const SwTableBox *pRelFirstBox = lcl_RelToBox( rTbl, pBox, rFirstBox );
+    const SwTableBox *pRelFirstBox = lcl_RelToBox( rTable, pBox, rFirstBox );
     if ( pRelFirstBox )
         rNewStr += OUString::number(reinterpret_cast<sal_PtrDiff>(pRelFirstBox));
     else
@@ -440,18 +440,18 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
     rNewStr += OUString(rFirstBox[ rFirstBox.getLength()-1 ]);
 }
 
-void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::BoxNmsToRelNm( const SwTable& rTable, OUString& rNewStr,
                     OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
     // box name (external presentation) w.r.t. relative name
     SwNode* pNd = static_cast<SwNode*>(pPara);
     OSL_ENSURE( pNd, "Field not placed in any Node" );
-    const SwTableNode* pTblNd = pNd->FindTableNode();
+    const SwTableNode* pTableNd = pNd->FindTableNode();
 
     OUString sRefBoxNm;
-    if( &pTblNd->GetTable() == &rTbl )
+    if( &pTableNd->GetTable() == &rTable )
     {
-        const SwTableBox *pBox = rTbl.GetTblBox(
+        const SwTableBox *pBox = rTable.GetTableBox(
                 pNd->FindTableBoxStartNode()->GetIndex() );
         OSL_ENSURE( pBox, "Field not placed in any Table" );
         sRefBoxNm = pBox->GetName();
@@ -461,20 +461,20 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, OUString& rNewStr,
     rFirstBox = rFirstBox.copy(1);
     if( pLastBox )
     {
-        rNewStr += lcl_BoxNmToRel( rTbl, *pTblNd, sRefBoxNm, *pLastBox,
+        rNewStr += lcl_BoxNmToRel( rTable, *pTableNd, sRefBoxNm, *pLastBox,
                                 m_eNmType == EXTRNL_NAME );
         rNewStr += ":";
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
-    rNewStr += lcl_BoxNmToRel( rTbl, *pTblNd, sRefBoxNm, rFirstBox,
+    rNewStr += lcl_BoxNmToRel( rTable, *pTableNd, sRefBoxNm, rFirstBox,
                             m_eNmType == EXTRNL_NAME );
 
     // get label for the box
     rNewStr += OUString(rFirstBox[ rFirstBox.getLength()-1 ]);
 }
 
-void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::PtrToBoxNms( const SwTable& rTable, OUString& rNewStr,
                         OUString& rFirstBox, OUString* pLastBox, void* ) const
 {
     // area in these parentheses?
@@ -487,7 +487,7 @@ void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, OUString& rNewStr,
         pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->toInt64()));
 
         // Is it actually a valid pointer?
-        if( rTbl.GetTabSortBoxes().find( pBox ) != rTbl.GetTabSortBoxes().end() )
+        if( rTable.GetTabSortBoxes().find( pBox ) != rTable.GetTabSortBoxes().end() )
             rNewStr += pBox->GetName();
         else
             rNewStr += "?";
@@ -497,7 +497,7 @@ void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, OUString& rNewStr,
 
     pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.toInt64()));
     // Is it actually a valid pointer?
-    if( rTbl.GetTabSortBoxes().find( pBox ) != rTbl.GetTabSortBoxes().end() )
+    if( rTable.GetTabSortBoxes().find( pBox ) != rTable.GetTabSortBoxes().end() )
         rNewStr += pBox->GetName();
     else
         rNewStr += "?";
@@ -506,7 +506,7 @@ void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, OUString& rNewStr,
     rNewStr += OUString(rFirstBox[ rFirstBox.getLength()-1 ]);
 }
 
-void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::BoxNmsToPtr( const SwTable& rTable, OUString& rNewStr,
                         OUString& rFirstBox, OUString* pLastBox, void* ) const
 {
     // area in these parentheses?
@@ -516,30 +516,30 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, OUString& rNewStr,
     rFirstBox = rFirstBox.copy(1);
     if( pLastBox )
     {
-        pBox = rTbl.GetTblBox( *pLastBox );
+        pBox = rTable.GetTableBox( *pLastBox );
         rNewStr += OUString::number(reinterpret_cast<sal_PtrDiff>(pBox))
                 +  ":";
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
-    pBox = rTbl.GetTblBox( rFirstBox );
+    pBox = rTable.GetTableBox( rFirstBox );
     rNewStr += OUString::number(reinterpret_cast<sal_PtrDiff>(pBox))
             +  OUString(rFirstBox[ rFirstBox.getLength()-1 ]); // get label for the box
 }
 
 /// create external formula (for UI)
-void SwTableFormula::PtrToBoxNm( const SwTable* pTbl )
+void SwTableFormula::PtrToBoxNm( const SwTable* pTable )
 {
     const SwNode* pNd = 0;
     FnScanFormula fnFormula = 0;
     switch (m_eNmType)
     {
     case INTRNL_NAME:
-        if( pTbl )
+        if( pTable )
             fnFormula = &SwTableFormula::PtrToBoxNms;
         break;
     case REL_NAME:
-        if( pTbl )
+        if( pTable )
         {
             fnFormula = &SwTableFormula::RelNmsToBoxNms;
             pNd = GetNodeOfFormula();
@@ -548,23 +548,23 @@ void SwTableFormula::PtrToBoxNm( const SwTable* pTbl )
     case EXTRNL_NAME:
         return;
     }
-    m_sFormula = ScanString( fnFormula, *pTbl, (void*)pNd );
+    m_sFormula = ScanString( fnFormula, *pTable, (void*)pNd );
     m_eNmType = EXTRNL_NAME;
 }
 
 /// create internal formula (in CORE)
-void SwTableFormula::BoxNmToPtr( const SwTable* pTbl )
+void SwTableFormula::BoxNmToPtr( const SwTable* pTable )
 {
     const SwNode* pNd = 0;
     FnScanFormula fnFormula = 0;
     switch (m_eNmType)
     {
     case EXTRNL_NAME:
-        if( pTbl )
+        if( pTable )
             fnFormula = &SwTableFormula::BoxNmsToPtr;
         break;
     case REL_NAME:
-        if( pTbl )
+        if( pTable )
         {
             fnFormula = &SwTableFormula::RelBoxNmsToPtr;
             pNd = GetNodeOfFormula();
@@ -573,12 +573,12 @@ void SwTableFormula::BoxNmToPtr( const SwTable* pTbl )
     case INTRNL_NAME:
         return;
     }
-    m_sFormula = ScanString( fnFormula, *pTbl, (void*)pNd );
+    m_sFormula = ScanString( fnFormula, *pTable, (void*)pNd );
     m_eNmType = INTRNL_NAME;
 }
 
 /// create relative formula (for copy)
-void SwTableFormula::ToRelBoxNm( const SwTable* pTbl )
+void SwTableFormula::ToRelBoxNm( const SwTable* pTable )
 {
     const SwNode* pNd = 0;
     FnScanFormula fnFormula = 0;
@@ -586,7 +586,7 @@ void SwTableFormula::ToRelBoxNm( const SwTable* pTbl )
     {
     case INTRNL_NAME:
     case EXTRNL_NAME:
-        if( pTbl )
+        if( pTable )
         {
             fnFormula = &SwTableFormula::BoxNmsToRelNm;
             pNd = GetNodeOfFormula();
@@ -595,22 +595,22 @@ void SwTableFormula::ToRelBoxNm( const SwTable* pTbl )
     case REL_NAME:
         return;
     }
-    m_sFormula = ScanString( fnFormula, *pTbl, (void*)pNd );
+    m_sFormula = ScanString( fnFormula, *pTable, (void*)pNd );
     m_eNmType = REL_NAME;
 }
 
-OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTbl,
+OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTable,
                                     void* pPara ) const
 {
     OUString aStr;
-    sal_Int32 nFml = 0;
+    sal_Int32 nFormula = 0;
     sal_Int32 nEnd = 0;
 
     do {
         // If the formula is preceded by a name, use this table!
-        const SwTable* pTbl = &rTbl;
+        const SwTable* pTable = &rTable;
 
-        sal_Int32 nStt = m_sFormula.indexOf( '<', nFml );
+        sal_Int32 nStt = m_sFormula.indexOf( '<', nFormula );
         if ( nStt>=0 )
         {
             while ( nStt>=0 )
@@ -633,12 +633,12 @@ OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTb
         if (nStt<0 || nEnd<0 )
         {
             // set the rest and finish
-            aStr += m_sFormula.copy(nFml);
+            aStr += m_sFormula.copy(nFormula);
             break;
         }
 
         // write beginning
-        aStr += m_sFormula.copy(nFml, nStt - nFml);
+        aStr += m_sFormula.copy(nFormula, nStt - nFormula);
 
         if (fnFormula)
         {
@@ -652,27 +652,27 @@ OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTb
                 (nSeparator = m_sFormula.indexOf( '.', nStt ))>=0
                 && nSeparator < nEnd )
             {
-                OUString sTblNm( m_sFormula.copy( nStt, nEnd - nStt ));
+                OUString sTableNm( m_sFormula.copy( nStt, nEnd - nStt ));
 
                 // If there are dots in the name, then they appear in pairs (e.g. A1.1.1)!
-                if( (comphelper::string::getTokenCount(sTblNm, '.') - 1) & 1 )
+                if( (comphelper::string::getTokenCount(sTableNm, '.') - 1) & 1 )
                 {
-                    sTblNm = sTblNm.copy( 0, nSeparator - nStt );
+                    sTableNm = sTableNm.copy( 0, nSeparator - nStt );
 
                     // when creating a formula the table name is unwanted
                     if( fnFormula != (FnScanFormula)&SwTableFormula::_MakeFormula )
-                        aStr += sTblNm;
+                        aStr += sTableNm;
                     nStt = nSeparator;
 
-                    sTblNm = sTblNm.copy( 1 );   // delete separator
-                    if( sTblNm != rTbl.GetFrmFmt()->GetName() )
+                    sTableNm = sTableNm.copy( 1 );   // delete separator
+                    if( sTableNm != rTable.GetFrameFormat()->GetName() )
                     {
                         // then search for table
                         const SwTable* pFnd = FindTable(
-                                                *rTbl.GetFrmFmt()->GetDoc(),
-                                                sTblNm );
+                                                *rTable.GetFrameFormat()->GetDoc(),
+                                                sTableNm );
                         if( pFnd )
-                            pTbl = pFnd;
+                            pTable = pFnd;
                         // ??
                         OSL_ENSURE( pFnd, "No table found. What now?" );
                     }
@@ -686,34 +686,34 @@ OUString SwTableFormula::ScanString( FnScanFormula fnFormula, const SwTable& rTb
             {
                 // without opening parenthesis
                 OUString aFirstBox( m_sFormula.copy( nStt+1, nSeparator - nStt - 1 ));
-                (this->*fnFormula)( *pTbl, aStr, sBox, &aFirstBox, pPara );
+                (this->*fnFormula)( *pTable, aStr, sBox, &aFirstBox, pPara );
             }
             else
-                (this->*fnFormula)( *pTbl, aStr, sBox, 0, pPara );
+                (this->*fnFormula)( *pTable, aStr, sBox, 0, pPara );
         }
 
-        nFml = nEnd+1;
+        nFormula = nEnd+1;
     } while( true );
     return aStr;
 }
 
 const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const OUString& rNm )
 {
-    const SwFrmFmts& rTblFmts = *rDoc.GetTblFrmFmts();
-    const SwTable* pTmpTbl = 0, *pRet = 0;
-    for( auto nFmtCnt = rTblFmts.size(); nFmtCnt; )
+    const SwFrameFormats& rTableFormats = *rDoc.GetTableFrameFormats();
+    const SwTable* pTmpTable = 0, *pRet = 0;
+    for( auto nFormatCnt = rTableFormats.size(); nFormatCnt; )
     {
-        SwFrmFmt* pFmt = rTblFmts[ --nFmtCnt ];
+        SwFrameFormat* pFormat = rTableFormats[ --nFormatCnt ];
         // if we are called from Sw3Writer, a number is dependent on the format name
         SwTableBox* pFBox;
-        if ( rNm.equals(pFmt->GetName().getToken(0, 0x0a)) &&
-            0 != ( pTmpTbl = SwTable::FindTable( pFmt ) ) &&
-            0 != (pFBox = pTmpTbl->GetTabSortBoxes()[0] ) &&
+        if ( rNm.equals(pFormat->GetName().getToken(0, 0x0a)) &&
+            0 != ( pTmpTable = SwTable::FindTable( pFormat ) ) &&
+            0 != (pFBox = pTmpTable->GetTabSortBoxes()[0] ) &&
             pFBox->GetSttNd() &&
             pFBox->GetSttNd()->GetNodes().IsDocNodes() )
         {
             // a table in the normal NodesArr
-            pRet = pTmpTbl;
+            pRet = pTmpTable;
             break;
         }
     }
@@ -723,7 +723,7 @@ const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const OUString& rNm )
 static const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
 {
     SwNodeIndex aIdx( *rBox.GetSttNd() );
-    SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
+    SwContentNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
     OSL_ENSURE( pCNd, "Box has no TextNode" );
     Point aPt;      // get the first frame of the layout - table headline
     return pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, NULL, false );
@@ -746,7 +746,7 @@ static sal_Int32 lcl_GetLongBoxNum( OUString& rStr )
     return nRet;
 }
 
-static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
+static const SwTableBox* lcl_RelToBox( const SwTable& rTable,
                                     const SwTableBox* pRefBox,
                                     const OUString& _sGetName )
 {
@@ -762,7 +762,7 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
 
         sGetName = sGetName.copy( 1 );
 
-        const SwTableLines* pLines = &rTbl.GetTabLines();
+        const SwTableLines* pLines = &rTable.GetTabLines();
         const SwTableBoxes* pBoxes;
         const SwTableLine* pLine;
 
@@ -775,7 +775,7 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
             pLine = pBox->GetUpper();
         }
         sal_uInt16 nSttBox = pLine->GetTabBoxes().GetPos( pBox );
-        sal_uInt16 nSttLine = rTbl.GetTabLines().GetPos( pLine );
+        sal_uInt16 nSttLine = rTable.GetTabLines().GetPos( pLine );
 
         const sal_Int32 nBoxOffset = lcl_GetLongBoxNum( sGetName ) + nSttBox;
         const sal_Int32 nLineOffset = lcl_GetLongBoxNum( sGetName ) + nSttLine;
@@ -827,12 +827,12 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
     else
     {
         // otherwise it is an absolute external presentation
-        pBox = rTbl.GetTblBox( sGetName );
+        pBox = rTable.GetTableBox( sGetName );
     }
     return pBox;
 }
 
-static OUString lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
+static OUString lcl_BoxNmToRel( const SwTable& rTable, const SwTableNode& rTableNd,
                                 const OUString& _sRefBoxNm, const OUString& _sTmp, bool bExtrnlNm )
 {
     OUString sTmp = _sTmp;
@@ -841,13 +841,13 @@ static OUString lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
     {
         // convert into external presentation
         SwTableBox* pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(sTmp.toInt64()));
-        if( rTbl.GetTabSortBoxes().find( pBox ) == rTbl.GetTabSortBoxes().end() )
+        if( rTable.GetTabSortBoxes().find( pBox ) == rTable.GetTabSortBoxes().end() )
             return OUString('?');
         sTmp = pBox->GetName();
     }
 
     // If the formula is spanning over a table then keep external presentation
-    if( &rTbl == &rTblNd.GetTable() )
+    if( &rTable == &rTableNd.GetTable() )
     {
         long nBox = SwTable::_GetBoxNum( sTmp, true );
         nBox -= SwTable::_GetBoxNum( sRefBoxNm, true );
@@ -871,16 +871,16 @@ static OUString lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
     return sTmp;
 }
 
-void SwTableFormula::GetBoxesOfFormula( const SwTable& rTbl,
+void SwTableFormula::GetBoxesOfFormula( const SwTable& rTable,
                                         SwSelBoxes& rBoxes )
 {
     rBoxes.clear();
 
-    BoxNmToPtr( &rTbl );
-    ScanString( &SwTableFormula::_GetFmlBoxes, rTbl, &rBoxes );
+    BoxNmToPtr( &rTable );
+    ScanString( &SwTableFormula::_GetFormulaBoxes, rTable, &rBoxes );
 }
 
-void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, OUString& ,
+void SwTableFormula::_GetFormulaBoxes( const SwTable& rTable, OUString& ,
                     OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
     SwSelBoxes* pBoxes = static_cast<SwSelBoxes*>(pPara);
@@ -893,14 +893,14 @@ void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, OUString& ,
         pEndBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->toInt64()));
 
         // Is it actually a valid pointer?
-        if( rTbl.GetTabSortBoxes().find( pEndBox ) == rTbl.GetTabSortBoxes().end() )
+        if( rTable.GetTabSortBoxes().find( pEndBox ) == rTable.GetTabSortBoxes().end() )
             pEndBox = 0;
         rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
     }
 
     SwTableBox *pSttBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.toInt64()));
     // Is it actually a valid pointer?
-    if( !pSttBox || rTbl.GetTabSortBoxes().find( pSttBox ) == rTbl.GetTabSortBoxes().end() )
+    if( !pSttBox || rTable.GetTabSortBoxes().find( pSttBox ) == rTable.GetTabSortBoxes().end() )
         return;
 
     if ( pEndBox ) // area?
@@ -926,19 +926,19 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
     if( !pStt || !pEnd )
         return ;                        // no valid selection
 
-    GetTblSel( pStt, pEnd, rBoxes, 0 );
+    GetTableSel( pStt, pEnd, rBoxes, 0 );
 
-    const SwTable* pTbl = pStt->FindTabFrm()->GetTable();
+    const SwTable* pTable = pStt->FindTabFrm()->GetTable();
 
     // filter headline boxes
-    if( pTbl->GetRowsToRepeat() > 0 )
+    if( pTable->GetRowsToRepeat() > 0 )
     {
         do {    // middle-check loop
             const SwTableLine* pLine = rSttBox.GetUpper();
             while( pLine->GetUpper() )
                 pLine = pLine->GetUpper()->GetUpper();
 
-            if( pTbl->IsHeadline( *pLine ) )
+            if( pTable->IsHeadline( *pLine ) )
                 break;      // headline in this area!
 
             // maybe start and end are swapped
@@ -946,7 +946,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
             while ( pLine->GetUpper() )
                 pLine = pLine->GetUpper()->GetUpper();
 
-            if( pTbl->IsHeadline( *pLine ) )
+            if( pTable->IsHeadline( *pLine ) )
                 break;      // headline in this area!
 
             const SwTabFrm *pStartTable = pStt->FindTabFrm();
@@ -962,7 +962,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
                 while( pLine->GetUpper() )
                     pLine = pLine->GetUpper()->GetUpper();
 
-                if( pTbl->IsHeadline( *pLine ) )
+                if( pTable->IsHeadline( *pLine ) )
                     rBoxes.erase( rBoxes.begin() + n-- );
             }
         } while( false );
@@ -970,7 +970,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
 }
 
 /// Are all boxes valid that are referenced by the formula?
-void SwTableFormula::_HasValidBoxes( const SwTable& rTbl, OUString& ,
+void SwTableFormula::_HasValidBoxes( const SwTable& rTable, OUString& ,
                     OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
     bool* pBValid = static_cast<bool*>(pPara);
@@ -995,25 +995,25 @@ void SwTableFormula::_HasValidBoxes( const SwTable& rTbl, OUString& ,
             {
                 const SwNode* pNd = GetNodeOfFormula();
                 const SwTableBox* pBox = !pNd ? 0
-                                               : const_cast<SwTableBox *>(rTbl.GetTblBox(
+                                               : const_cast<SwTableBox *>(rTable.GetTableBox(
                                     pNd->FindTableBoxStartNode()->GetIndex() ));
                 if( pLastBox )
-                    pEndBox = const_cast<SwTableBox*>(lcl_RelToBox( rTbl, pBox, *pLastBox ));
-                pSttBox = const_cast<SwTableBox*>(lcl_RelToBox( rTbl, pBox, rFirstBox ));
+                    pEndBox = const_cast<SwTableBox*>(lcl_RelToBox( rTable, pBox, *pLastBox ));
+                pSttBox = const_cast<SwTableBox*>(lcl_RelToBox( rTable, pBox, rFirstBox ));
             }
             break;
 
         case EXTRNL_NAME:
             if( pLastBox )
-                pEndBox = const_cast<SwTableBox*>(rTbl.GetTblBox( *pLastBox ));
-            pSttBox = const_cast<SwTableBox*>(rTbl.GetTblBox( rFirstBox ));
+                pEndBox = const_cast<SwTableBox*>(rTable.GetTableBox( *pLastBox ));
+            pSttBox = const_cast<SwTableBox*>(rTable.GetTableBox( rFirstBox ));
             break;
         }
 
         // Are these valid pointers?
         if( ( pLastBox &&
-              ( !pEndBox || rTbl.GetTabSortBoxes().find( pEndBox ) == rTbl.GetTabSortBoxes().end() ) ) ||
-            ( !pSttBox || rTbl.GetTabSortBoxes().find( pSttBox ) == rTbl.GetTabSortBoxes().end() ) )
+              ( !pEndBox || rTable.GetTabSortBoxes().find( pEndBox ) == rTable.GetTabSortBoxes().end() ) ) ||
+            ( !pSttBox || rTable.GetTabSortBoxes().find( pSttBox ) == rTable.GetTabSortBoxes().end() ) )
                 *pBValid = false;
     }
 }
@@ -1028,7 +1028,7 @@ bool SwTableFormula::HasValidBoxes() const
     return bRet;
 }
 
-sal_uInt16 SwTableFormula::GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox )
+sal_uInt16 SwTableFormula::GetLnPosInTable( const SwTable& rTable, const SwTableBox* pBox )
 {
     sal_uInt16 nRet = USHRT_MAX;
     if( pBox )
@@ -1036,57 +1036,57 @@ sal_uInt16 SwTableFormula::GetLnPosInTbl( const SwTable& rTbl, const SwTableBox*
         const SwTableLine* pLn = pBox->GetUpper();
         while( pLn->GetUpper() )
             pLn = pLn->GetUpper()->GetUpper();
-        nRet = rTbl.GetTabLines().GetPos( pLn );
+        nRet = rTable.GetTabLines().GetPos( pLn );
     }
     return nRet;
 }
 
-void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
+void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTable, OUString& rNewStr,
                     OUString& rFirstBox, OUString* pLastBox, void* pPara ) const
 {
-    SwTableFmlUpdate& rTblUpd = *static_cast<SwTableFmlUpdate*>(pPara);
+    SwTableFormulaUpdate& rTableUpd = *static_cast<SwTableFormulaUpdate*>(pPara);
 
     rNewStr += OUString(rFirstBox[0]);     // get label for the box
     rFirstBox = rFirstBox.copy(1);
 
-    OUString sTblNm;
-    const SwTable* pTbl = &rTbl;
+    OUString sTableNm;
+    const SwTable* pTable = &rTable;
 
-    OUString* pTblNmBox = pLastBox ? pLastBox : &rFirstBox;
+    OUString* pTableNmBox = pLastBox ? pLastBox : &rFirstBox;
 
-    const sal_Int32 nLastBoxLen = pTblNmBox->getLength();
-    const sal_Int32 nSeparator = pTblNmBox->indexOf('.');
+    const sal_Int32 nLastBoxLen = pTableNmBox->getLength();
+    const sal_Int32 nSeparator = pTableNmBox->indexOf('.');
     if ( nSeparator>=0 &&
         // If there are dots in the name, than these appear in pairs (e.g. A1.1.1)!
-        (comphelper::string::getTokenCount(*pTblNmBox, '.') - 1) & 1 )
+        (comphelper::string::getTokenCount(*pTableNmBox, '.') - 1) & 1 )
     {
-        sTblNm = pTblNmBox->copy( 0, nSeparator );
-        *pTblNmBox = pTblNmBox->copy( nSeparator + 1); // remove dot
-        const SwTable* pFnd = FindTable( *rTbl.GetFrmFmt()->GetDoc(), sTblNm );
+        sTableNm = pTableNmBox->copy( 0, nSeparator );
+        *pTableNmBox = pTableNmBox->copy( nSeparator + 1); // remove dot
+        const SwTable* pFnd = FindTable( *rTable.GetFrameFormat()->GetDoc(), sTableNm );
         if( pFnd )
-            pTbl = pFnd;
+            pTable = pFnd;
 
-        if( TBL_MERGETBL == rTblUpd.eFlags )
+        if( TBL_MERGETBL == rTableUpd.eFlags )
         {
             if( pFnd )
             {
-                if( pFnd == rTblUpd.DATA.pDelTbl )
+                if( pFnd == rTableUpd.DATA.pDelTable )
                 {
-                    if( rTblUpd.pTbl != &rTbl ) // not the current one
-                        rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() + "."; // set new table name
-                    rTblUpd.bModified = true;
+                    if( rTableUpd.pTable != &rTable ) // not the current one
+                        rNewStr += rTableUpd.pTable->GetFrameFormat()->GetName() + "."; // set new table name
+                    rTableUpd.bModified = true;
                 }
-                else if( pFnd != rTblUpd.pTbl ||
-                    ( rTblUpd.pTbl != &rTbl && &rTbl != rTblUpd.DATA.pDelTbl))
-                    rNewStr += sTblNm + "."; // keep table name
+                else if( pFnd != rTableUpd.pTable ||
+                    ( rTableUpd.pTable != &rTable && &rTable != rTableUpd.DATA.pDelTable))
+                    rNewStr += sTableNm + "."; // keep table name
                 else
-                    rTblUpd.bModified = true;
+                    rTableUpd.bModified = true;
             }
             else
-                rNewStr += sTblNm + ".";     // keep table name
+                rNewStr += sTableNm + ".";     // keep table name
         }
     }
-    if( pTblNmBox == pLastBox )
+    if( pTableNmBox == pLastBox )
         rFirstBox = rFirstBox.copy( nLastBoxLen + 1 );
 
     SwTableBox* pSttBox = 0, *pEndBox = 0;
@@ -1101,82 +1101,82 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
     case REL_NAME:
         {
             const SwNode* pNd = GetNodeOfFormula();
-            const SwTableBox* pBox = pNd ? pTbl->GetTblBox(
+            const SwTableBox* pBox = pNd ? pTable->GetTableBox(
                             pNd->FindTableBoxStartNode()->GetIndex() ) : 0;
             if( pLastBox )
-                pEndBox = const_cast<SwTableBox*>(lcl_RelToBox( *pTbl, pBox, *pLastBox ));
-            pSttBox = const_cast<SwTableBox*>(lcl_RelToBox( *pTbl, pBox, rFirstBox ));
+                pEndBox = const_cast<SwTableBox*>(lcl_RelToBox( *pTable, pBox, *pLastBox ));
+            pSttBox = const_cast<SwTableBox*>(lcl_RelToBox( *pTable, pBox, rFirstBox ));
         }
         break;
 
     case EXTRNL_NAME:
         if( pLastBox )
-            pEndBox = const_cast<SwTableBox*>(pTbl->GetTblBox( *pLastBox ));
-        pSttBox = const_cast<SwTableBox*>(pTbl->GetTblBox( rFirstBox ));
+            pEndBox = const_cast<SwTableBox*>(pTable->GetTableBox( *pLastBox ));
+        pSttBox = const_cast<SwTableBox*>(pTable->GetTableBox( rFirstBox ));
         break;
     }
 
-    if( pLastBox && pTbl->GetTabSortBoxes().find( pEndBox ) == pTbl->GetTabSortBoxes().end() )
+    if( pLastBox && pTable->GetTabSortBoxes().find( pEndBox ) == pTable->GetTabSortBoxes().end() )
         pEndBox = 0;
-    if( pTbl->GetTabSortBoxes().find( pSttBox ) == pTbl->GetTabSortBoxes().end() )
+    if( pTable->GetTabSortBoxes().find( pSttBox ) == pTable->GetTabSortBoxes().end() )
         pSttBox = 0;
 
-    if( TBL_SPLITTBL == rTblUpd.eFlags )
+    if( TBL_SPLITTBL == rTableUpd.eFlags )
     {
         // Where are the boxes - in the old or in the new table?
-        bool bInNewTbl = false;
+        bool bInNewTable = false;
         if( pLastBox )
         {
             // It is the "first" box in this selection. It determines if the formula is placed in
             // the new or the old table.
-            sal_uInt16 nEndLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pEndBox ),
-                    nSttLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pSttBox );
+            sal_uInt16 nEndLnPos = SwTableFormula::GetLnPosInTable( *pTable, pEndBox ),
+                    nSttLnPos = SwTableFormula::GetLnPosInTable( *pTable, pSttBox );
 
             if( USHRT_MAX != nSttLnPos && USHRT_MAX != nEndLnPos &&
-                ((rTblUpd.nSplitLine <= nSttLnPos) ==
-                (rTblUpd.nSplitLine <= nEndLnPos)) )
+                ((rTableUpd.nSplitLine <= nSttLnPos) ==
+                (rTableUpd.nSplitLine <= nEndLnPos)) )
             {
                 // stay in same table
-                bInNewTbl = rTblUpd.nSplitLine <= nEndLnPos &&
-                                    pTbl == rTblUpd.pTbl;
+                bInNewTable = rTableUpd.nSplitLine <= nEndLnPos &&
+                                    pTable == rTableUpd.pTable;
             }
             else
             {
                 // this is definitely an invalid formula, also mark as modified for Undo
-                rTblUpd.bModified = true;
+                rTableUpd.bModified = true;
                 if( pEndBox )
-                    bInNewTbl = USHRT_MAX != nEndLnPos &&
-                                    rTblUpd.nSplitLine <= nEndLnPos &&
-                                    pTbl == rTblUpd.pTbl;
+                    bInNewTable = USHRT_MAX != nEndLnPos &&
+                                    rTableUpd.nSplitLine <= nEndLnPos &&
+                                    pTable == rTableUpd.pTable;
             }
         }
         else
         {
-            sal_uInt16 nSttLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pSttBox );
+            sal_uInt16 nSttLnPos = SwTableFormula::GetLnPosInTable( *pTable, pSttBox );
             // Put it in the new table?
-            bInNewTbl = USHRT_MAX != nSttLnPos &&
-                            rTblUpd.nSplitLine <= nSttLnPos &&
-                            pTbl == rTblUpd.pTbl;
+            bInNewTable = USHRT_MAX != nSttLnPos &&
+                            rTableUpd.nSplitLine <= nSttLnPos &&
+                            pTable == rTableUpd.pTable;
         }
 
         // formula goes into new table
-        if( rTblUpd.bBehindSplitLine )
+        if( rTableUpd.bBehindSplitLine )
         {
-            if( !bInNewTbl )
+            if( !bInNewTable )
             {
-                rTblUpd.bModified = true;
-                rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() + ".";
+                rTableUpd.bModified = true;
+                rNewStr += rTableUpd.pTable->GetFrameFormat()->GetName() + ".";
             }
-            else if( !sTblNm.isEmpty() )
-                rNewStr += sTblNm + ".";
+            else if( !sTableNm.isEmpty() )
+                rNewStr += sTableNm + ".";
         }
-        else if( bInNewTbl )
+        else if( bInNewTable )
         {
-            rTblUpd.bModified = true;
-            rNewStr += *rTblUpd.DATA.pNewTblNm + ".";
+            rTableUpd.bModified = true;
+            rNewStr += *rTableUpd.DATA.pNewTableNm + ".";
         }
-        else if( !sTblNm.isEmpty() )
-            rNewStr += sTblNm + ".";
+        else if( !sTableNm.isEmpty() )
+            rNewStr += sTableNm + ".";
     }
 
     if( pLastBox )
@@ -1187,16 +1187,16 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
 }
 
 /// Create external formula but remember that the formula is placed in a split/merged table
-void SwTableFormula::ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd )
+void SwTableFormula::ToSplitMergeBoxNm( SwTableFormulaUpdate& rTableUpd )
 {
-    const SwTable* pTbl;
+    const SwTable* pTable;
     const SwNode* pNd = GetNodeOfFormula();
     if( pNd && 0 != ( pNd = pNd->FindTableNode() ))
-        pTbl = &static_cast<const SwTableNode*>(pNd)->GetTable();
+        pTable = &static_cast<const SwTableNode*>(pNd)->GetTable();
     else
-        pTbl = rTblUpd.pTbl;
+        pTable = rTableUpd.pTable;
 
-    m_sFormula = ScanString( &SwTableFormula::_SplitMergeBoxNm, *pTbl, (void*)&rTblUpd );
+    m_sFormula = ScanString( &SwTableFormula::_SplitMergeBoxNm, *pTable, (void*)&rTableUpd );
     m_eNmType = INTRNL_NAME;
 }
 
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 8f6d2d9f00e8..a6e898424cc8 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -63,8 +63,8 @@ SwFieldType* SwChapterFieldType::Copy() const
 
 // chapter field
 
-SwChapterField::SwChapterField(SwChapterFieldType* pTyp, sal_uInt32 nFmt)
-    : SwField(pTyp, nFmt), nLevel( 0 )
+SwChapterField::SwChapterField(SwChapterFieldType* pTyp, sal_uInt32 nFormat)
+    : SwField(pTyp, nFormat), nLevel( 0 )
 {}
 
 OUString SwChapterField::Expand() const
@@ -99,41 +99,41 @@ SwField* SwChapterField::Copy() const
 
 // #i53420#
 void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
-                                      const SwCntntNode* pCntntNode,
+                                      const SwContentNode* pContentNode,
                                       bool bSrchNum )
 {
     OSL_ENSURE( pFrm, "In which frame am I?" );
-    SwDoc* pDoc = const_cast<SwDoc*>(pCntntNode->GetDoc());
+    SwDoc* pDoc = const_cast<SwDoc*>(pContentNode->GetDoc());
 
-    const SwTxtNode* pTxtNode = dynamic_cast<const SwTxtNode*>(pCntntNode);
-    if ( !pTxtNode || !pFrm->IsInDocBody() )
+    const SwTextNode* pTextNode = dynamic_cast<const SwTextNode*>(pContentNode);
+    if ( !pTextNode || !pFrm->IsInDocBody() )
     {
         SwPosition aDummyPos( pDoc->GetNodes().GetEndOfContent() );
-        pTxtNode = GetBodyTxtNode( *pDoc, aDummyPos, *pFrm );
+        pTextNode = GetBodyTextNode( *pDoc, aDummyPos, *pFrm );
     }
 
-    if ( pTxtNode )
+    if ( pTextNode )
     {
-        ChangeExpansion( *pTxtNode, bSrchNum );
+        ChangeExpansion( *pTextNode, bSrchNum );
     }
 }
 
-void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
+void SwChapterField::ChangeExpansion(const SwTextNode &rTextNd, bool bSrchNum)
 {
     sNumber.clear();
     sTitle.clear();
     sPost.clear();
     sPre.clear();
 
-    SwDoc* pDoc = const_cast<SwDoc*>(rTxtNd.GetDoc());
-    const SwTxtNode *pTxtNd = rTxtNd.FindOutlineNodeOfLevel( nLevel );
-    if( pTxtNd )
+    SwDoc* pDoc = const_cast<SwDoc*>(rTextNd.GetDoc());
+    const SwTextNode *pTextNd = rTextNd.FindOutlineNodeOfLevel( nLevel );
+    if( pTextNd )
     {
         if( bSrchNum )
         {
-            const SwTxtNode* pONd = pTxtNd;
+            const SwTextNode* pONd = pTextNd;
             do {
-                if( pONd && pONd->GetTxtColl() )
+                if( pONd && pONd->GetTextColl() )
                 {
                     sal_uInt8 nPrevLvl = nLevel;
 
@@ -146,13 +146,13 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
                     else if( SVX_NUM_NUMBER_NONE != pDoc->GetOutlineNumRule()
                             ->Get( nLevel ).GetNumberingType() )
                     {
-                        pTxtNd = pONd;
+                        pTextNd = pONd;
                         break;
                     }
 
                     if( !nLevel-- )
                         break;
-                    pONd = pTxtNd->FindOutlineNodeOfLevel( nLevel );
+                    pONd = pTextNd->FindOutlineNodeOfLevel( nLevel );
                 }
                 else
                     break;
@@ -161,25 +161,25 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
 
         // get the number without Pre-/Post-fixstrings
 
-        if ( pTxtNd->IsOutline() )
+        if ( pTextNd->IsOutline() )
         {
             // correction of refactoring done by cws swnumtree:
             // retrieve numbering string without prefix and suffix strings
             // as stated in the above german comment.
-            sNumber = pTxtNd->GetNumString( false );
+            sNumber = pTextNd->GetNumString( false );
 
-            SwNumRule* pRule( pTxtNd->GetNumRule() );
-            if ( pTxtNd->IsCountedInList() && pRule )
+            SwNumRule* pRule( pTextNd->GetNumRule() );
+            if ( pTextNd->IsCountedInList() && pRule )
             {
-                int nListLevel = pTxtNd->GetActualListLevel();
+                int nListLevel = pTextNd->GetActualListLevel();
                 if (nListLevel < 0)
                     nListLevel = 0;
                 if (nListLevel >= MAXLEVEL)
                     nListLevel = MAXLEVEL - 1;
 
-                const SwNumFmt& rNFmt = pRule->Get(nListLevel);
-                sPost = rNFmt.GetSuffix();
-                sPre = rNFmt.GetPrefix();
+                const SwNumFormat& rNFormat = pRule->Get(nListLevel);
+                sPost = rNFormat.GetSuffix();
+                sPre = rNFormat.GetPrefix();
             }
         }
         else
@@ -187,7 +187,7 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
             sNumber = "??";
         }
 
-        sTitle = removeControlChars(pTxtNd->GetExpandTxt(0, -1, false, false, false, false));
+        sTitle = removeControlChars(pTextNd->GetExpandText(0, -1, false, false, false, false));
 
     }
 }
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index a971af328459..fa8969e1b7e0 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -89,11 +89,11 @@ void SwDBFieldType::ReleaseRef()
 
     if (--nRefCnt <= 0)
     {
-        size_t nPos = GetDoc()->getIDocumentFieldsAccess().GetFldTypes()->GetPos(this);
+        size_t nPos = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes()->GetPos(this);
 
         if (nPos != SIZE_MAX)
         {
-            GetDoc()->getIDocumentFieldsAccess().RemoveFldType(nPos);
+            GetDoc()->getIDocumentFieldsAccess().RemoveFieldType(nPos);
             delete this;
         }
     }
@@ -138,19 +138,19 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
             if( sTmp != sColumn )
             {
                 sColumn = sTmp;
-                SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-                SwFmtFld* pFmtFld = aIter.First();
-                while(pFmtFld)
+                SwIterator<SwFormatField,SwFieldType> aIter( *this );
+                SwFormatField* pFormatField = aIter.First();
+                while(pFormatField)
                 {
                     // field in Undo?
-                    SwTxtFld *pTxtFld = pFmtFld->GetTxtFld();
-                    if(pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+                    SwTextField *pTextField = pFormatField->GetTextField();
+                    if(pTextField && pTextField->GetTextNode().GetNodes().IsDocNodes() )
                     {
-                        SwDBField* pDBField = static_cast<SwDBField*>(pFmtFld->GetField());
+                        SwDBField* pDBField = static_cast<SwDBField*>(pFormatField->GetField());
                         pDBField->ClearInitialized();
                         pDBField->InitContent();
                     }
-                    pFmtFld = aIter.Next();
+                    pFormatField = aIter.Next();
                 }
             }
         }
@@ -166,10 +166,10 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
 
 // database field
 
-SwDBField::SwDBField(SwDBFieldType* pTyp, sal_uLong nFmt)
-    :   SwValueField(pTyp, nFmt),
+SwDBField::SwDBField(SwDBFieldType* pTyp, sal_uLong nFormat)
+    :   SwValueField(pTyp, nFormat),
         nSubType(0),
-        bIsInBodyTxt(true),
+        bIsInBodyText(true),
         bValidValue(false),
         bInitialized(false)
 {
@@ -218,7 +218,7 @@ SwField* SwDBField::Copy() const
 {
     SwDBField *pTmp = new SwDBField(static_cast<SwDBFieldType*>(GetTyp()), GetFormat());
     pTmp->aContent      = aContent;
-    pTmp->bIsInBodyTxt  = bIsInBodyTxt;
+    pTmp->bIsInBodyText  = bIsInBodyText;
     pTmp->bValidValue   = bValidValue;
     pTmp->bInitialized  = bInitialized;
     pTmp->nSubType      = nSubType;
@@ -263,7 +263,7 @@ SwFieldType* SwDBField::ChgTyp( SwFieldType* pNewType )
     return pOld;
 }
 
-bool SwDBField::FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFmt,
+bool SwDBField::FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFormat,
                              double &aNumber, sal_Int32 nColumnType, SwDBField *pField )
 {
     bool bValidValue = false;
@@ -293,7 +293,7 @@ bool SwDBField::FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString
             else
                 aNumber = aVal.GetDouble();
 
-            if (nFmt && nFmt != SAL_MAX_UINT32 && !pDocFormatter->IsTextFormat(nFmt))
+            if (nFormat && nFormat != SAL_MAX_UINT32 && !pDocFormatter->IsTextFormat(nFormat))
                 bValidValue = true; // because of bug #60339 not for all strings
         }
         else
@@ -322,7 +322,7 @@ void SwDBField::Evaluate()
     if(!pMgr || !pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, true))
         return ;
 
-    sal_uInt32 nFmt = 0;
+    sal_uInt32 nFormat = 0;
 
     // search corresponding column name
     OUString aColNm( static_cast<SwDBFieldType*>(GetTyp())->GetColumnName() );
@@ -330,14 +330,14 @@ void SwDBField::Evaluate()
     SvNumberFormatter* pDocFormatter = GetDoc()->GetNumberFormatter();
     pMgr->GetMergeColumnCnt(aColNm, GetLanguage(), aContent, &nValue);
     if( !( nSubType & nsSwExtendedSubType::SUB_OWN_FMT ) )
-        SetFormat( nFmt = pMgr->GetColumnFmt( aTmpData.sDataSource, aTmpData.sCommand,
+        SetFormat( nFormat = pMgr->GetColumnFormat( aTmpData.sDataSource, aTmpData.sCommand,
                                         aColNm, pDocFormatter, GetLanguage() ));
 
     sal_Int32 nColumnType = nValue == DBL_MAX
         ? 0
         : pMgr->GetColumnType(aTmpData.sDataSource, aTmpData.sCommand, aColNm);
 
-    bValidValue = FormatValue( pDocFormatter, aContent, nFmt, nValue, nColumnType, this );
+    bValidValue = FormatValue( pDocFormatter, aContent, nFormat, nValue, nColumnType, this );
 
     if( DBL_MAX != nValue )
         aContent = static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(nValue, GetFormat(), GetLanguage());
@@ -410,18 +410,18 @@ bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         //invalidate text node
         if(GetTyp())
         {
-            SwIterator<SwFmtFld,SwFieldType> aIter( *GetTyp() );
-            SwFmtFld* pFmtFld = aIter.First();
-            while(pFmtFld)
+            SwIterator<SwFormatField,SwFieldType> aIter( *GetTyp() );
+            SwFormatField* pFormatField = aIter.First();
+            while(pFormatField)
             {
-                SwTxtFld *pTxtFld = pFmtFld->GetTxtFld();
-                if(pTxtFld && static_cast<SwDBField*>(pFmtFld->GetField()) == this )
+                SwTextField *pTextField = pFormatField->GetTextField();
+                if(pTextField && static_cast<SwDBField*>(pFormatField->GetField()) == this )
                 {
                     //notify the change
-                    pTxtFld->NotifyContentChange(*pFmtFld);
+                    pTextField->NotifyContentChange(*pFormatField);
                     break;
                 }
-                pFmtFld = aIter.Next();
+                pFormatField = aIter.Next();
             }
         }
     }
@@ -447,8 +447,8 @@ bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
 
 // base class for all further database fields
 
-SwDBNameInfField::SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt) :
-    SwField(pTyp, nFmt),
+SwDBNameInfField::SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFormat) :
+    SwField(pTyp, nFormat),
     aDBData(rDBData),
     nSubType(0)
 {
@@ -763,8 +763,8 @@ SwFieldType* SwDBNameFieldType::Copy() const
 
 // name of the connected database
 
-SwDBNameField::SwDBNameField(SwDBNameFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt)
-    : SwDBNameInfField(pTyp, rDBData, nFmt)
+SwDBNameField::SwDBNameField(SwDBNameFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFormat)
+    : SwDBNameInfField(pTyp, rDBData, nFormat)
 {}
 
 OUString SwDBNameField::Expand() const
@@ -808,8 +808,8 @@ SwFieldType* SwDBSetNumberFieldType::Copy() const
 
 SwDBSetNumberField::SwDBSetNumberField(SwDBSetNumberFieldType* pTyp,
                                        const SwDBData& rDBData,
-                                       sal_uLong nFmt)
-    : SwDBNameInfField(pTyp, rDBData, nFmt), nNumber(0)
+                                       sal_uLong nFormat)
+    : SwDBNameInfField(pTyp, rDBData, nFormat), nNumber(0)
 {}
 
 OUString SwDBSetNumberField::Expand() const
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 376f7ac2d7c4..de9d8274cb3f 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -41,11 +41,11 @@ using namespace ::com::sun::star;
 
 class SwIntrnlRefLink : public SwBaseLink
 {
-    SwDDEFieldType& rFldType;
+    SwDDEFieldType& rFieldType;
 public:
-    SwIntrnlRefLink( SwDDEFieldType& rType, SfxLinkUpdateMode nUpdateType, SotClipboardFormatId nFmt )
-        : SwBaseLink( nUpdateType, nFmt ),
-        rFldType( rType )
+    SwIntrnlRefLink( SwDDEFieldType& rType, SfxLinkUpdateMode nUpdateType, SotClipboardFormatId nFormat )
+        : SwBaseLink( nUpdateType, nFormat ),
+        rFieldType( rType )
     {}
 
     virtual void Closed() SAL_OVERRIDE;
@@ -82,9 +82,9 @@ public:
             if( bDel )
                 sStr = sStr.copy( 0, n );
 
-            rFldType.SetExpansion( sStr );
+            rFieldType.SetExpansion( sStr );
             // set Expansion first! (otherwise this flag will be deleted)
-            rFldType.SetCRLFDelFlag( bDel );
+            rFieldType.SetCRLFDelFlag( bDel );
         }
         break;
 
@@ -93,25 +93,25 @@ public:
         return SUCCESS;
     }
 
-    OSL_ENSURE( rFldType.GetDoc(), "no pDoc" );
+    OSL_ENSURE( rFieldType.GetDoc(), "no pDoc" );
 
     // no dependencies left?
-    if( rFldType.HasWriterListeners() && !rFldType.IsModifyLocked() && !ChkNoDataFlag() )
+    if( rFieldType.HasWriterListeners() && !rFieldType.IsModifyLocked() && !ChkNoDataFlag() )
     {
-        SwViewShell* pSh = rFldType.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
-        SwEditShell* pESh = rFldType.GetDoc()->GetEditShell();
+        SwViewShell* pSh = rFieldType.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
+        SwEditShell* pESh = rFieldType.GetDoc()->GetEditShell();
 
         // Search for fields. If no valid found, disconnect.
         SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL );
         bool bCallModify = false;
-        rFldType.LockModify();
+        rFieldType.LockModify();
 
-        SwIterator<SwClient,SwFieldType> aIter(rFldType);
+        SwIterator<SwClient,SwFieldType> aIter(rFieldType);
         for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
         {
             // a DDE table or a DDE field attribute in the text
-            if( !pLast->IsA( TYPE( SwFmtFld ) ) ||
-                static_cast<SwFmtFld*>(pLast)->GetTxtFld() )
+            if( !pLast->IsA( TYPE( SwFormatField ) ) ||
+                static_cast<SwFormatField*>(pLast)->GetTextField() )
             {
                 if( !bCallModify )
                 {
@@ -125,7 +125,7 @@ public:
             }
         }
 
-        rFldType.UnlockModify();
+        rFieldType.UnlockModify();
 
         if( bCallModify )
         {
@@ -144,15 +144,15 @@ public:
 
 void SwIntrnlRefLink::Closed()
 {
-    if( rFldType.GetDoc() && !rFldType.GetDoc()->IsInDtor() )
+    if( rFieldType.GetDoc() && !rFieldType.GetDoc()->IsInDtor() )
     {
         // advise goes, convert all fields into text?
-        SwViewShell* pSh = rFldType.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
-        SwEditShell* pESh = rFldType.GetDoc()->GetEditShell();
+        SwViewShell* pSh = rFieldType.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
+        SwEditShell* pESh = rFieldType.GetDoc()->GetEditShell();
         if( pESh )
         {
             pESh->StartAllAction();
-            pESh->FieldToText( &rFldType );
+            pESh->FieldToText( &rFieldType );
             pESh->EndAllAction();
         }
         else
@@ -169,20 +169,20 @@ const SwNode* SwIntrnlRefLink::GetAnchor() const
 {
     // here, any anchor of the normal NodesArray should be sufficient
     const SwNode* pNd = 0;
-    SwIterator<SwClient,SwFieldType> aIter(rFldType);
+    SwIterator<SwClient,SwFieldType> aIter(rFieldType);
     for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
     {
         // a DDE table or a DDE field attribute in the text
-        if( !pLast->IsA( TYPE( SwFmtFld ) ))
+        if( !pLast->IsA( TYPE( SwFormatField ) ))
         {
             SwDepend* pDep = static_cast<SwDepend*>(pLast);
-            SwDDETable* pDDETbl = static_cast<SwDDETable*>(pDep->GetToTell());
-            pNd = pDDETbl->GetTabSortBoxes()[0]->GetSttNd();
+            SwDDETable* pDDETable = static_cast<SwDDETable*>(pDep->GetToTell());
+            pNd = pDDETable->GetTabSortBoxes()[0]->GetSttNd();
         }
-        else if( static_cast<SwFmtFld*>(pLast)->GetTxtFld() )
-            pNd = static_cast<SwFmtFld*>(pLast)->GetTxtFld()->GetpTxtNode();
+        else if( static_cast<SwFormatField*>(pLast)->GetTextField() )
+            pNd = static_cast<SwFormatField*>(pLast)->GetTextField()->GetpTextNode();
 
-        if( pNd && &rFldType.GetDoc()->GetNodes() == &pNd->GetNodes() )
+        if( pNd && &rFieldType.GetDoc()->GetNodes() == &pNd->GetNodes() )
             break;
         pNd = 0;
     }
@@ -193,32 +193,32 @@ bool SwIntrnlRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
                                 sal_Int32 nStt, sal_Int32 nEnd ) const
 {
     // here, any anchor of the normal NodesArray should be sufficient
-    SwNodes* pNds = &rFldType.GetDoc()->GetNodes();
-    SwIterator<SwClient,SwFieldType> aIter(rFldType);
+    SwNodes* pNds = &rFieldType.GetDoc()->GetNodes();
+    SwIterator<SwClient,SwFieldType> aIter(rFieldType);
     for(SwClient* pLast = aIter.First(); pLast; pLast = aIter.Next())
     {
         // a DDE table or a DDE field attribute in the text
-        if( !pLast->IsA( TYPE( SwFmtFld ) ))
+        if( !pLast->IsA( TYPE( SwFormatField ) ))
         {
             SwDepend* pDep = static_cast<SwDepend*>(pLast);
-            SwDDETable* pDDETbl = static_cast<SwDDETable*>(pDep->GetToTell());
-            const SwTableNode* pTblNd = pDDETbl->GetTabSortBoxes()[0]->
+            SwDDETable* pDDETable = static_cast<SwDDETable*>(pDep->GetToTell());
+            const SwTableNode* pTableNd = pDDETable->GetTabSortBoxes()[0]->
                             GetSttNd()->FindTableNode();
-            if( pTblNd->GetNodes().IsDocNodes() &&
-                nSttNd < pTblNd->EndOfSectionIndex() &&
-                nEndNd > pTblNd->GetIndex() )
+            if( pTableNd->GetNodes().IsDocNodes() &&
+                nSttNd < pTableNd->EndOfSectionIndex() &&
+                nEndNd > pTableNd->GetIndex() )
                 return true;
         }
-        else if( static_cast<SwFmtFld*>(pLast)->GetTxtFld() )
+        else if( static_cast<SwFormatField*>(pLast)->GetTextField() )
         {
-            const SwTxtFld* pTFld = static_cast<SwFmtFld*>(pLast)->GetTxtFld();
-            const SwTxtNode* pNd = pTFld->GetpTxtNode();
+            const SwTextField* pTField = static_cast<SwFormatField*>(pLast)->GetTextField();
+            const SwTextNode* pNd = pTField->GetpTextNode();
             if( pNd && pNds == &pNd->GetNodes() )
             {
                 sal_uLong nNdPos = pNd->GetIndex();
                 if( nSttNd <= nNdPos && nNdPos <= nEndNd &&
-                    ( nNdPos != nSttNd || pTFld->GetStart() >= nStt ) &&
-                    ( nNdPos != nEndNd || pTFld->GetStart() < nEnd ))
+                    ( nNdPos != nSttNd || pTField->GetStart() >= nStt ) &&
+                    ( nNdPos != nEndNd || pTField->GetStart() < nEnd ))
                     return true;
             }
         }
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 268f248b1140..b4823e6a61e2 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -64,17 +64,17 @@ SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, bool bUpdate
 
 SwDDETable::~SwDDETable()
 {
-    SwDDEFieldType* pFldTyp = static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn());
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
+    SwDDEFieldType* pFieldTyp = static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn());
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
     if( !pDoc->IsInDtor() && !aLines.empty() &&
         GetTabSortBoxes()[0]->GetSttNd()->GetNodes().IsDocNodes() )
-        pFldTyp->DecRefCnt();
+        pFieldTyp->DecRefCnt();
 
     // If it is the last dependent of the "deleted field" than delete it finally
-    if( pFldTyp->IsDeleted() && pFldTyp->HasOnlyOneListener() )
+    if( pFieldTyp->IsDeleted() && pFieldTyp->HasOnlyOneListener() )
     {
-        pFldTyp->Remove( &aDepend );
-        delete pFldTyp;
+        pFieldTyp->Remove( &aDepend );
+        delete pFieldTyp;
     }
 }
 
@@ -97,7 +97,7 @@ void SwDDETable::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
 
 void SwDDETable::ChangeContent()
 {
-    OSL_ENSURE( GetFrmFmt(), "No FrameFormat" );
+    OSL_ENSURE( GetFrameFormat(), "No FrameFormat" );
 
     // Is this the correct NodesArray? (because of UNDO)
     if( aLines.empty() )
@@ -106,7 +106,7 @@ void SwDDETable::ChangeContent()
     if( !GetTabSortBoxes()[0]->GetSttNd()->GetNodes().IsDocNodes() )
         return;
 
-    // access to DDEFldType
+    // access to DDEFieldType
     SwDDEFieldType* pDDEType = static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn());
 
     OUString aExpand = comphelper::string::remove(pDDEType->GetExpansion(), '\r');
@@ -122,26 +122,26 @@ void SwDDETable::ChangeContent()
             SwTableBox* pBox = pLine->GetTabBoxes()[ i ];
             OSL_ENSURE( pBox->GetSttIdx(), "no content box" );
             SwNodeIndex aNdIdx( *pBox->GetSttNd(), 1 );
-            SwTxtNode* pTxtNode = aNdIdx.GetNode().GetTxtNode();
-            OSL_ENSURE( pTxtNode, "No Node" );
-            SwIndex aCntIdx( pTxtNode, 0 );
-            pTxtNode->EraseText( aCntIdx );
-            pTxtNode->InsertText( aLine.getToken( 0, '\t', nLineTokenPos ), aCntIdx );
-
-            SwTableBoxFmt* pBoxFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
-            pBoxFmt->LockModify();
-            pBoxFmt->ResetFmtAttr( RES_BOXATR_VALUE );
-            pBoxFmt->UnlockModify();
+            SwTextNode* pTextNode = aNdIdx.GetNode().GetTextNode();
+            OSL_ENSURE( pTextNode, "No Node" );
+            SwIndex aCntIdx( pTextNode, 0 );
+            pTextNode->EraseText( aCntIdx );
+            pTextNode->InsertText( aLine.getToken( 0, '\t', nLineTokenPos ), aCntIdx );
+
+            SwTableBoxFormat* pBoxFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
+            pBoxFormat->LockModify();
+            pBoxFormat->ResetFormatAttr( RES_BOXATR_VALUE );
+            pBoxFormat->UnlockModify();
         }
     }
 
-    const IDocumentSettingAccess* pIDSA = GetFrmFmt()->getIDocumentSettingAccess();
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
+    const IDocumentSettingAccess* pIDSA = GetFrameFormat()->getIDocumentSettingAccess();
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
     if( AUTOUPD_FIELD_AND_CHARTS == pIDSA->getFieldUpdateFlags(true) )
         pDoc->getIDocumentFieldsAccess().SetFieldsDirty( true, NULL, 0 );
 }
 
-SwDDEFieldType* SwDDETable::GetDDEFldType()
+SwDDEFieldType* SwDDETable::GetDDEFieldType()
 {
     return static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn());
 }
@@ -149,8 +149,8 @@ SwDDEFieldType* SwDDETable::GetDDEFldType()
 bool SwDDETable::NoDDETable()
 {
     // search table node
-    OSL_ENSURE( GetFrmFmt(), "No FrameFormat" );
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
+    OSL_ENSURE( GetFrameFormat(), "No FrameFormat" );
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
 
     // Is this the correct NodesArray? (because of UNDO)
     if( aLines.empty() )
@@ -160,23 +160,23 @@ bool SwDDETable::NoDDETable()
     if( !pNd->GetNodes().IsDocNodes() )
         return false;
 
-    SwTableNode* pTblNd = pNd->FindTableNode();
-    OSL_ENSURE( pTblNd, "Where is the table?");
+    SwTableNode* pTableNd = pNd->FindTableNode();
+    OSL_ENSURE( pTableNd, "Where is the table?");
 
-    SwTable* pNewTbl = new SwTable( *this );
+    SwTable* pNewTable = new SwTable( *this );
 
     // copy the table data
-    pNewTbl->GetTabSortBoxes().insert( GetTabSortBoxes() ); // move content boxes
+    pNewTable->GetTabSortBoxes().insert( GetTabSortBoxes() ); // move content boxes
     GetTabSortBoxes().clear();
 
-    pNewTbl->GetTabLines().insert( pNewTbl->GetTabLines().begin(),
+    pNewTable->GetTabLines().insert( pNewTable->GetTabLines().begin(),
                                    GetTabLines().begin(), GetTabLines().end() ); // move lines
     GetTabLines().clear();
 
     if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() )
         static_cast<SwDDEFieldType*>(aDepend.GetRegisteredIn())->DecRefCnt();
 
-    pTblNd->SetNewTable( pNewTbl );       // replace table
+    pTableNd->SetNewTable( pNewTable );       // replace table
 
     return true;
 }
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 75139a9753cc..6c7b4d5e3363 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -111,20 +111,20 @@ SwPageNumberFieldType::SwPageNumberFieldType()
 {
 }
 
-OUString SwPageNumberFieldType::Expand( sal_uInt32 nFmt, short nOff,
+OUString SwPageNumberFieldType::Expand( sal_uInt32 nFormat, short nOff,
          sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage,
          const OUString& rUserStr ) const
 {
-    sal_uInt32 nTmpFmt = (SVX_NUM_PAGEDESC == nFmt) ? (sal_uInt32)nNumberingType : nFmt;
+    sal_uInt32 nTmpFormat = (SVX_NUM_PAGEDESC == nFormat) ? (sal_uInt32)nNumberingType : nFormat;
     int const nTmp = nPageNumber + nOff;
 
-    if (0 > nTmp || SVX_NUM_NUMBER_NONE == nTmpFmt || (!bVirtuell && nTmp > nMaxPage))
+    if (0 > nTmp || SVX_NUM_NUMBER_NONE == nTmpFormat || (!bVirtuell && nTmp > nMaxPage))
         return OUString();
 
-    if( SVX_NUM_CHAR_SPECIAL == nTmpFmt )
+    if( SVX_NUM_CHAR_SPECIAL == nTmpFormat )
         return rUserStr;
 
-    return FormatNumber( nTmp, nTmpFmt );
+    return FormatNumber( nTmp, nTmpFormat );
 }
 
 SwFieldType* SwPageNumberFieldType::Copy() const
@@ -139,10 +139,10 @@ SwFieldType* SwPageNumberFieldType::Copy() const
 
 void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
                                             bool bVirt,
-                                            const sal_Int16* pNumFmt )
+                                            const sal_Int16* pNumFormat )
 {
-    if( pNumFmt )
-        nNumberingType = *pNumFmt;
+    if( pNumFormat )
+        nNumberingType = *pNumFormat;
 
     bVirtuell = false;
     if (bVirt && pDoc)
@@ -152,19 +152,19 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
         sal_uInt32 nMaxItems = rPool.GetItemCount2( RES_PAGEDESC );
         for( sal_uInt32 n = 0; n < nMaxItems; ++n )
         {
-            const SwFmtPageDesc *pDesc;
-            if( 0 != (pDesc = static_cast<const SwFmtPageDesc*>(rPool.GetItem2( RES_PAGEDESC, n )) )
+            const SwFormatPageDesc *pDesc;
+            if( 0 != (pDesc = static_cast<const SwFormatPageDesc*>(rPool.GetItem2( RES_PAGEDESC, n )) )
                 && pDesc->GetNumOffset() && pDesc->GetDefinedIn() )
             {
-                const SwCntntNode* pNd = PTR_CAST( SwCntntNode, pDesc->GetDefinedIn() );
+                const SwContentNode* pNd = PTR_CAST( SwContentNode, pDesc->GetDefinedIn() );
                 if( pNd )
                 {
-                    if ( SwIterator<SwFrm,SwCntntNode>(*pNd).First() )
+                    if ( SwIterator<SwFrm,SwContentNode>(*pNd).First() )
                         bVirtuell = true;
                 }
-                else if( pDesc->GetDefinedIn()->ISA( SwFmt ))
+                else if( pDesc->GetDefinedIn()->ISA( SwFormat ))
                 {
-                    SwAutoFmtGetDocNode aGetHt( &pDoc->GetNodes() );
+                    SwAutoFormatGetDocNode aGetHt( &pDoc->GetNodes() );
                     bVirtuell = !pDesc->GetDefinedIn()->GetInfo( aGetHt );
                     break;
                 }
@@ -174,9 +174,9 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
 }
 
 SwPageNumberField::SwPageNumberField(SwPageNumberFieldType* pTyp,
-          sal_uInt16 nSub, sal_uInt32 nFmt, short nOff,
+          sal_uInt16 nSub, sal_uInt32 nFormat, short nOff,
           sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage)
-    : SwField(pTyp, nFmt), nSubType(nSub), nOffset(nOff)
+    : SwField(pTyp, nFormat), nSubType(nSub), nOffset(nOff)
     , m_nPageNumber(nPageNumber)
     , m_nMaxPage(nMaxPage)
 {
@@ -192,26 +192,26 @@ void SwPageNumberField::ChangeExpansion(sal_uInt16 const nPageNumber,
 OUString SwPageNumberField::Expand() const
 {
     OUString sRet;
-    SwPageNumberFieldType* pFldType = static_cast<SwPageNumberFieldType*>(GetTyp());
+    SwPageNumberFieldType* pFieldType = static_cast<SwPageNumberFieldType*>(GetTyp());
 
     if( PG_NEXT == nSubType && 1 != nOffset )
     {
-        sRet = pFldType->Expand(GetFormat(), 1, m_nPageNumber, m_nMaxPage, sUserStr);
+        sRet = pFieldType->Expand(GetFormat(), 1, m_nPageNumber, m_nMaxPage, sUserStr);
         if (!sRet.isEmpty())
         {
-            sRet = pFldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
+            sRet = pFieldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
         }
     }
     else if( PG_PREV == nSubType && -1 != nOffset )
     {
-        sRet = pFldType->Expand(GetFormat(), -1, m_nPageNumber, m_nMaxPage, sUserStr);
+        sRet = pFieldType->Expand(GetFormat(), -1, m_nPageNumber, m_nMaxPage, sUserStr);
         if (!sRet.isEmpty())
         {
-            sRet = pFldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
+            sRet = pFieldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
         }
     }
     else
-        sRet = pFldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
+        sRet = pFieldType->Expand(GetFormat(), nOffset, m_nPageNumber, m_nMaxPage, sUserStr);
     return sRet;
 }
 
@@ -321,10 +321,10 @@ SwAuthorFieldType::SwAuthorFieldType()
 {
 }
 
-OUString SwAuthorFieldType::Expand(sal_uLong nFmt)
+OUString SwAuthorFieldType::Expand(sal_uLong nFormat)
 {
     SvtUserOptions&  rOpt = SW_MOD()->GetUserOptions();
-    if((nFmt & 0xff) == AF_NAME)
+    if((nFormat & 0xff) == AF_NAME)
         return rOpt.GetFullName();
 
     return rOpt.GetID();
@@ -335,8 +335,8 @@ SwFieldType* SwAuthorFieldType::Copy() const
     return new SwAuthorFieldType;
 }
 
-SwAuthorField::SwAuthorField(SwAuthorFieldType* pTyp, sal_uInt32 nFmt)
-    : SwField(pTyp, nFmt)
+SwAuthorField::SwAuthorField(SwAuthorFieldType* pTyp, sal_uInt32 nFormat)
+    : SwField(pTyp, nFormat)
 {
     aContent = SwAuthorFieldType::Expand(GetFormat());
 }
@@ -411,14 +411,14 @@ SwFileNameFieldType::SwFileNameFieldType(SwDoc *pDocument)
     pDoc = pDocument;
 }
 
-OUString SwFileNameFieldType::Expand(sal_uLong nFmt) const
+OUString SwFileNameFieldType::Expand(sal_uLong nFormat) const
 {
     OUString aRet;
     const SwDocShell* pDShell = pDoc->GetDocShell();
     if( pDShell && pDShell->HasName() )
     {
         const INetURLObject& rURLObj = pDShell->GetMedium()->GetURLObject();
-        switch( nFmt & ~FF_FIXED )
+        switch( nFormat & ~FF_FIXED )
         {
             case FF_PATH:
                 {
@@ -469,8 +469,8 @@ SwFieldType* SwFileNameFieldType::Copy() const
     return pTmp;
 }
 
-SwFileNameField::SwFileNameField(SwFileNameFieldType* pTyp, sal_uInt32 nFmt)
-    : SwField(pTyp, nFmt)
+SwFileNameField::SwFileNameField(SwFileNameFieldType* pTyp, sal_uInt32 nFormat)
+    : SwField(pTyp, nFormat)
 {
     aContent = static_cast<SwFileNameFieldType*>(GetTyp())->Expand(GetFormat());
 }
@@ -583,9 +583,9 @@ SwTemplNameFieldType::SwTemplNameFieldType(SwDoc *pDocument)
     pDoc = pDocument;
 }
 
-OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
+OUString SwTemplNameFieldType::Expand(sal_uLong nFormat) const
 {
-    OSL_ENSURE( nFmt < FF_END, "Expand: no valid Fmt!" );
+    OSL_ENSURE( nFormat < FF_END, "Expand: no valid Format!" );
 
     OUString aRet;
     SwDocShell *pDocShell(pDoc->GetDocShell());
@@ -597,11 +597,11 @@ OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
             xDPS->getDocumentProperties());
         OSL_ENSURE(xDocProps.is(), "Doc has no DocumentProperties");
 
-        if( FF_UI_NAME == nFmt )
+        if( FF_UI_NAME == nFormat )
             aRet = xDocProps->getTemplateName();
         else if( !xDocProps->getTemplateURL().isEmpty() )
         {
-            if( FF_UI_RANGE == nFmt )
+            if( FF_UI_RANGE == nFormat )
             {
                 // for getting region names!
                 SfxDocumentTemplates aFac;
@@ -613,13 +613,13 @@ OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
             else
             {
                 INetURLObject aPathName( xDocProps->getTemplateURL() );
-                if( FF_NAME == nFmt )
+                if( FF_NAME == nFormat )
                     aRet = aPathName.GetName(URL_DECODE);
-                else if( FF_NAME_NOEXT == nFmt )
+                else if( FF_NAME_NOEXT == nFormat )
                     aRet = aPathName.GetBase();
                 else
                 {
-                    if( FF_PATH == nFmt )
+                    if( FF_PATH == nFormat )
                     {
                         aPathName.removeSegment();
                         aRet = aPathName.GetFull();
@@ -639,8 +639,8 @@ SwFieldType* SwTemplNameFieldType::Copy() const
     return pTmp;
 }
 
-SwTemplNameField::SwTemplNameField(SwTemplNameFieldType* pTyp, sal_uInt32 nFmt)
-    : SwField(pTyp, nFmt)
+SwTemplNameField::SwTemplNameField(SwTemplNameFieldType* pTyp, sal_uInt32 nFormat)
+    : SwField(pTyp, nFormat)
 {}
 
 OUString SwTemplNameField::Expand() const
@@ -725,13 +725,13 @@ SwDocStatFieldType::SwDocStatFieldType(SwDoc* pDocument)
     pDoc = pDocument;
 }
 
-OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
+OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const
 {
     sal_uInt32 nVal = 0;
     const SwDocStat& rDStat = pDoc->getIDocumentStatistics().GetDocStat();
     switch( nSubType )
     {
-        case DS_TBL:  nVal = rDStat.nTbl;   break;
+        case DS_TBL:  nVal = rDStat.nTable;   break;
         case DS_GRF:  nVal = rDStat.nGrf;   break;
         case DS_OLE:  nVal = rDStat.nOLE;   break;
         case DS_PARA: nVal = rDStat.nPara;  break;
@@ -741,15 +741,15 @@ OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
             if( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() )
                 ((SwDocStat &)rDStat).nPage = pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->GetPageNum();
             nVal = rDStat.nPage;
-            if( SVX_NUM_PAGEDESC == nFmt )
-                nFmt = (sal_uInt32)nNumberingType;
+            if( SVX_NUM_PAGEDESC == nFormat )
+                nFormat = (sal_uInt32)nNumberingType;
             break;
         default:
             OSL_FAIL( "SwDocStatFieldType::Expand: unknown SubType" );
     }
 
     if( nVal <= SHRT_MAX )
-        return FormatNumber( nVal, nFmt );
+        return FormatNumber( nVal, nFormat );
 
     return OUString::number( nVal );
 }
@@ -763,10 +763,10 @@ SwFieldType* SwDocStatFieldType::Copy() const
 /**
  * @param pTyp
  * @param nSub SubType
- * @param nFmt
+ * @param nFormat
  */
-SwDocStatField::SwDocStatField(SwDocStatFieldType* pTyp, sal_uInt16 nSub, sal_uInt32 nFmt)
-    : SwField(pTyp, nFmt),
+SwDocStatField::SwDocStatField(SwDocStatFieldType* pTyp, sal_uInt16 nSub, sal_uInt32 nFormat)
+    : SwField(pTyp, nFormat),
     nSubType(nSub)
 {}
 
@@ -1004,15 +1004,15 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
 
 // document info field
 
-SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFmt) :
-    SwValueField(pTyp, nFmt), nSubType(nSub)
+SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFormat) :
+    SwValueField(pTyp, nFormat), nSubType(nSub)
 {
     aName = rName;
-    aContent = static_cast<SwDocInfoFieldType*>(GetTyp())->Expand(nSubType, nFmt, GetLanguage(), aName);
+    aContent = static_cast<SwDocInfoFieldType*>(GetTyp())->Expand(nSubType, nFormat, GetLanguage(), aName);
 }
 
-SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFmt) :
-    SwValueField(pTyp, nFmt), nSubType(nSub)
+SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFormat) :
+    SwValueField(pTyp, nFormat), nSubType(nSub)
 {
     aName = rName;
     aContent = rValue;
@@ -1140,11 +1140,11 @@ OUString SwDocInfoField::GetFieldName() const
 
 SwField* SwDocInfoField::Copy() const
 {
-    SwDocInfoField* pFld = new SwDocInfoField(static_cast<SwDocInfoFieldType*>(GetTyp()), nSubType, aName, GetFormat());
-    pFld->SetAutomaticLanguage(IsAutomaticLanguage());
-    pFld->aContent = aContent;
+    SwDocInfoField* pField = new SwDocInfoField(static_cast<SwDocInfoFieldType*>(GetTyp()), nSubType, aName, GetFormat());
+    pField->SetAutomaticLanguage(IsAutomaticLanguage());
+    pField->aContent = aContent;
 
-    return pFld;
+    return pField;
 }
 
 sal_uInt16 SwDocInfoField::GetSubType() const
@@ -1258,42 +1258,42 @@ bool SwDocInfoField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return true;
 }
 
-SwHiddenTxtFieldType::SwHiddenTxtFieldType( bool bSetHidden )
+SwHiddenTextFieldType::SwHiddenTextFieldType( bool bSetHidden )
     : SwFieldType( RES_HIDDENTXTFLD ), bHidden( bSetHidden )
 {
 }
 
-SwFieldType* SwHiddenTxtFieldType::Copy() const
+SwFieldType* SwHiddenTextFieldType::Copy() const
 {
-    return new SwHiddenTxtFieldType( bHidden );
+    return new SwHiddenTextFieldType( bHidden );
 }
 
-void SwHiddenTxtFieldType::SetHiddenFlag( bool bSetHidden )
+void SwHiddenTextFieldType::SetHiddenFlag( bool bSetHidden )
 {
     if( bHidden != bSetHidden )
     {
         bHidden = bSetHidden;
-        UpdateFlds();       // notify all HiddenTexts
+        UpdateFields();       // notify all HiddenTexts
     }
 }
 
-SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
+SwHiddenTextField::SwHiddenTextField( SwHiddenTextFieldType* pFieldType,
                                     bool    bConditional,
                                     const OUString& rCond,
                                     const OUString& rStr,
                                     bool    bHidden,
                                     sal_uInt16  nSub) :
-    SwField( pFldType ), aCond(rCond), nSubType(nSub),
+    SwField( pFieldType ), aCond(rCond), nSubType(nSub),
     bCanToggle(bConditional), bIsHidden(bHidden), bValid(false)
 {
     if(nSubType == TYP_CONDTXTFLD)
     {
         sal_Int32 nPos = 0;
-        aTRUETxt = rStr.getToken(0, '|', nPos);
+        aTRUEText = rStr.getToken(0, '|', nPos);
 
         if(nPos != -1)
         {
-            aFALSETxt = rStr.getToken(0, '|', nPos);
+            aFALSEText = rStr.getToken(0, '|', nPos);
             if(nPos != -1)
             {
                 aContent = rStr.getToken(0, '|', nPos);
@@ -1302,21 +1302,21 @@ SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
         }
     }
     else
-        aTRUETxt = rStr;
+        aTRUEText = rStr;
 }
 
-SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
+SwHiddenTextField::SwHiddenTextField( SwHiddenTextFieldType* pFieldType,
                                     const OUString& rCond,
                                     const OUString& rTrue,
                                     const OUString& rFalse,
                                     sal_uInt16 nSub)
-    : SwField( pFldType ), aTRUETxt(rTrue), aFALSETxt(rFalse), aCond(rCond), nSubType(nSub),
+    : SwField( pFieldType ), aTRUEText(rTrue), aFALSEText(rFalse), aCond(rCond), nSubType(nSub),
       bIsHidden(true), bValid(false)
 {
     bCanToggle = !aCond.isEmpty();
 }
 
-OUString SwHiddenTxtField::Expand() const
+OUString SwHiddenTextField::Expand() const
 {
     // Type: !Hidden  -> show always
     //        Hide    -> evaluate condition
@@ -1327,17 +1327,17 @@ OUString SwHiddenTxtField::Expand() const
             return aContent;
 
         if( bCanToggle && !bIsHidden )
-            return aTRUETxt;
+            return aTRUEText;
     }
-    else if( !static_cast<SwHiddenTxtFieldType*>(GetTyp())->GetHiddenFlag() ||
+    else if( !static_cast<SwHiddenTextFieldType*>(GetTyp())->GetHiddenFlag() ||
         ( bCanToggle && bIsHidden ))
-        return aTRUETxt;
+        return aTRUEText;
 
-    return aFALSETxt;
+    return aFALSEText;
 }
 
 /// get current field value and cache it
-void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
+void SwHiddenTextField::Evaluate(SwDoc* pDoc)
 {
     OSL_ENSURE(pDoc, "got no document");
 
@@ -1349,7 +1349,7 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
         SwDBManager* pMgr = pDoc->GetDBManager();
 #endif
         bValid = false;
-        OUString sTmpName = (bCanToggle && !bIsHidden) ? aTRUETxt : aFALSETxt;
+        OUString sTmpName = (bCanToggle && !bIsHidden) ? aTRUEText : aFALSEText;
 
         // Database expressions need to be different from normal text. Therefore, normal text is set
         // in quotes. If the latter exist they will be removed. If not, check if potential DB name.
@@ -1393,77 +1393,77 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
     }
 }
 
-OUString SwHiddenTxtField::GetFieldName() const
+OUString SwHiddenTextField::GetFieldName() const
 {
     OUString aStr = SwFieldType::GetTypeStr(nSubType) +
-        " " + aCond + " " + aTRUETxt;
+        " " + aCond + " " + aTRUEText;
 
     if (nSubType == TYP_CONDTXTFLD)
     {
-        aStr += " : " + aFALSETxt;
+        aStr += " : " + aFALSEText;
     }
     return aStr;
 }
 
-SwField* SwHiddenTxtField::Copy() const
+SwField* SwHiddenTextField::Copy() const
 {
-    SwHiddenTxtField* pFld =
-        new SwHiddenTxtField(static_cast<SwHiddenTxtFieldType*>(GetTyp()), aCond,
-                              aTRUETxt, aFALSETxt);
-    pFld->bIsHidden = bIsHidden;
-    pFld->bValid    = bValid;
-    pFld->aContent  = aContent;
-    pFld->SetFormat(GetFormat());
-    pFld->nSubType  = nSubType;
-    return pFld;
+    SwHiddenTextField* pField =
+        new SwHiddenTextField(static_cast<SwHiddenTextFieldType*>(GetTyp()), aCond,
+                              aTRUEText, aFALSEText);
+    pField->bIsHidden = bIsHidden;
+    pField->bValid    = bValid;
+    pField->aContent  = aContent;
+    pField->SetFormat(GetFormat());
+    pField->nSubType  = nSubType;
+    return pField;
 }
 
 /// set condition
-void SwHiddenTxtField::SetPar1(const OUString& rStr)
+void SwHiddenTextField::SetPar1(const OUString& rStr)
 {
     aCond = rStr;
     bCanToggle = !aCond.isEmpty();
 }
 
-OUString SwHiddenTxtField::GetPar1() const
+OUString SwHiddenTextField::GetPar1() const
 {
     return aCond;
 }
 
 /// set True/False text
-void SwHiddenTxtField::SetPar2(const OUString& rStr)
+void SwHiddenTextField::SetPar2(const OUString& rStr)
 {
     if (nSubType == TYP_CONDTXTFLD)
     {
         sal_Int32 nPos = rStr.indexOf('|');
         if (nPos == -1)
-            aTRUETxt = rStr;
+            aTRUEText = rStr;
         else
         {
-            aTRUETxt = rStr.copy(0, nPos);
-            aFALSETxt = rStr.copy(nPos + 1);
+            aTRUEText = rStr.copy(0, nPos);
+            aFALSEText = rStr.copy(nPos + 1);
         }
     }
     else
-        aTRUETxt = rStr;
+        aTRUEText = rStr;
 }
 
 /// get True/False text
-OUString SwHiddenTxtField::GetPar2() const
+OUString SwHiddenTextField::GetPar2() const
 {
     if(nSubType != TYP_CONDTXTFLD)
     {
-        return aTRUETxt;
+        return aTRUEText;
     }
-    return aTRUETxt + "|" + aFALSETxt;
+    return aTRUEText + "|" + aFALSEText;
 }
 
-sal_uInt16 SwHiddenTxtField::GetSubType() const
+sal_uInt16 SwHiddenTextField::GetSubType() const
 {
     return nSubType;
 }
 
-bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
+bool SwHiddenTextField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
 {
     switch( nWhichId )
     {
@@ -1471,10 +1471,10 @@ bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
         rAny <<= aCond;
         break;
     case FIELD_PROP_PAR2:
-        rAny <<= aTRUETxt;
+        rAny <<= aTRUEText;
         break;
     case FIELD_PROP_PAR3:
-        rAny <<= aFALSETxt;
+        rAny <<= aFALSEText;
         break;
     case FIELD_PROP_PAR4 :
         rAny <<= aContent;
@@ -1488,7 +1488,7 @@ bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
     return true;
 }
 
-bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
+bool SwHiddenTextField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
 {
     switch( nWhichId )
     {
@@ -1500,10 +1500,10 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         }
         break;
     case FIELD_PROP_PAR2:
-        rAny >>= aTRUETxt;
+        rAny >>= aTRUEText;
         break;
     case FIELD_PROP_PAR3:
-        rAny >>= aFALSETxt;
+        rAny >>= aFALSEText;
         break;
     case FIELD_PROP_BOOL1:
         bIsHidden = *static_cast<sal_Bool const *>(rAny.getValue());
@@ -1518,7 +1518,7 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return true;
 }
 
-OUString SwHiddenTxtField::GetColumnName(const OUString& rName)
+OUString SwHiddenTextField::GetColumnName(const OUString& rName)
 {
     sal_Int32 nPos = rName.indexOf(DB_DELIM);
     if( nPos>=0 )
@@ -1531,7 +1531,7 @@ OUString SwHiddenTxtField::GetColumnName(const OUString& rName)
     return rName;
 }
 
-OUString SwHiddenTxtField::GetDBName(const OUString& rName, SwDoc *pDoc)
+OUString SwHiddenTextField::GetDBName(const OUString& rName, SwDoc *pDoc)
 {
     sal_Int32 nPos = rName.indexOf(DB_DELIM);
     if( nPos>=0 )
@@ -1574,10 +1574,10 @@ OUString SwHiddenParaField::Expand() const
 
 SwField* SwHiddenParaField::Copy() const
 {
-    SwHiddenParaField* pFld = new SwHiddenParaField(static_cast<SwHiddenParaFieldType*>(GetTyp()), aCond);
-    pFld->bIsHidden = bIsHidden;
+    SwHiddenParaField* pField = new SwHiddenParaField(static_cast<SwHiddenParaFieldType*>(GetTyp()), aCond);
+    pField->bIsHidden = bIsHidden;
 
-    return pFld;
+    return pField;
 }
 
 bool SwHiddenParaField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
@@ -1641,12 +1641,12 @@ SwFieldType* SwPostItFieldType::Copy() const
 
 SwPostItField::SwPostItField( SwPostItFieldType* pT,
         const OUString& rAuthor,
-        const OUString& rTxt,
+        const OUString& rText,
         const OUString& rInitials,
         const OUString& rName,
         const DateTime& rDateTime )
     : SwField( pT )
-    , sTxt( rTxt )
+    , sText( rText )
     , sAuthor( rAuthor )
     , sInitials( rInitials )
     , sName( rName )
@@ -1679,7 +1679,7 @@ OUString SwPostItField::GetDescription() const
 
 SwField* SwPostItField::Copy() const
 {
-    SwPostItField* pRet = new SwPostItField( static_cast<SwPostItFieldType*>(GetTyp()), sAuthor, sTxt, sInitials, sName,
+    SwPostItField* pRet = new SwPostItField( static_cast<SwPostItFieldType*>(GetTyp()), sAuthor, sText, sInitials, sName,
                                 aDateTime);
     if (mpText)
         pRet->SetTextObject( new OutlinerParaObject(*mpText) );
@@ -1704,13 +1704,13 @@ OUString SwPostItField::GetPar1() const
 /// set the PostIt's text
 void SwPostItField::SetPar2(const OUString& rStr)
 {
-    sTxt = rStr;
+    sText = rStr;
 }
 
 /// get the PostIt's text
 OUString SwPostItField::GetPar2() const
 {
-    return sTxt;
+    return sText;
 }
 
 
@@ -1741,7 +1741,7 @@ bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
         break;
     case FIELD_PROP_PAR2:
         {
-        rAny <<= sTxt;
+        rAny <<= sText;
         break;
         }
     case FIELD_PROP_PAR3:
@@ -1764,7 +1764,7 @@ bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
             if ( mpText )
                 m_pTextObject->SetText( *mpText );
             else
-                m_pTextObject->SetString( sTxt );
+                m_pTextObject->SetString( sText );
 
             uno::Reference < text::XText > xText( m_pTextObject );
             rAny <<= xText;
@@ -1795,7 +1795,7 @@ bool SwPostItField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         rAny >>= sAuthor;
         break;
     case FIELD_PROP_PAR2:
-        rAny >>= sTxt;
+        rAny >>= sText;
         //#i100374# new string via api, delete complex text object so SwPostItNote picks up the new string
         if (mpText)
         {
@@ -1881,8 +1881,8 @@ OUString SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 )
 
 // extended user information field
 
-SwExtUserField::SwExtUserField(SwExtUserFieldType* pTyp, sal_uInt16 nSubTyp, sal_uInt32 nFmt) :
-    SwField(pTyp, nFmt), nType(nSubTyp)
+SwExtUserField::SwExtUserField(SwExtUserFieldType* pTyp, sal_uInt16 nSubTyp, sal_uInt32 nFormat) :
+    SwField(pTyp, nFormat), nType(nSubTyp)
 {
     aContent = SwExtUserFieldType::Expand(nType, GetFormat());
 }
@@ -1897,10 +1897,10 @@ OUString SwExtUserField::Expand() const
 
 SwField* SwExtUserField::Copy() const
 {
-    SwExtUserField* pFld = new SwExtUserField(static_cast<SwExtUserFieldType*>(GetTyp()), nType, GetFormat());
-    pFld->SetExpansion(aContent);
+    SwExtUserField* pField = new SwExtUserField(static_cast<SwExtUserFieldType*>(GetTyp()), nType, GetFormat());
+    pField->SetExpansion(aContent);
 
-    return pFld;
+    return pField;
 }
 
 sal_uInt16 SwExtUserField::GetSubType() const
@@ -2060,14 +2060,14 @@ void SwRefPageGetFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem*
     if( !pNew && !pOld && HasWriterListeners() )
     {
         // first collect all SetPageRefFields
-        _SetGetExpFlds aTmpLst;
+        _SetGetExpFields aTmpLst;
         if( MakeSetList( aTmpLst ) )
         {
-            SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-            for ( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+            SwIterator<SwFormatField,SwFieldType> aIter( *this );
+            for ( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
                     // update only the GetRef fields
-                    if( pFmtFld->GetTxtFld() )
-                        UpdateField( pFmtFld->GetTxtFld(), aTmpLst );
+                    if( pFormatField->GetTextField() )
+                        UpdateField( pFormatField->GetTextField(), aTmpLst );
         }
     }
 
@@ -2075,22 +2075,22 @@ void SwRefPageGetFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem*
     NotifyClients( pOld, pNew );
 }
 
-bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
+bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFields& rTmpLst )
 {
-    SwIterator<SwFmtFld,SwFieldType> aIter(*pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_REFPAGESETFLD));
-    for ( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+    SwIterator<SwFormatField,SwFieldType> aIter(*pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_REFPAGESETFLD));
+    for ( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
     {
             // update only the GetRef fields
-            const SwTxtFld* pTFld = pFmtFld->GetTxtFld();
-            if( pTFld )
+            const SwTextField* pTField = pFormatField->GetTextField();
+            if( pTField )
             {
-                const SwTxtNode& rTxtNd = pTFld->GetTxtNode();
+                const SwTextNode& rTextNd = pTField->GetTextNode();
 
                 // Always the first! (in Tab-Headline, header/footer )
                 Point aPt;
-                const SwCntntFrm* pFrm = rTxtNd.getLayoutFrm( rTxtNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+                const SwContentFrm* pFrm = rTextNd.getLayoutFrm( rTextNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
 
-                _SetGetExpFld* pNew;
+                _SetGetExpField* pNew;
 
                 if( !pFrm ||
                      pFrm->IsInDocBody() ||
@@ -2099,17 +2099,17 @@ bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
                     !pFrm->FindPageFrm() )
                 {
                     //  create index for determination of the TextNode
-                    SwNodeIndex aIdx( rTxtNd );
-                    pNew = new _SetGetExpFld( aIdx, pTFld );
+                    SwNodeIndex aIdx( rTextNd );
+                    pNew = new _SetGetExpField( aIdx, pTField );
                 }
                 else
                 {
                     //  create index for determination of the TextNode
                     SwPosition aPos( pDoc->GetNodes().GetEndOfPostIts() );
-                    bool const bResult = GetBodyTxtNode( *pDoc, aPos, *pFrm );
+                    bool const bResult = GetBodyTextNode( *pDoc, aPos, *pFrm );
                     OSL_ENSURE(bResult, "where is the Field?");
                     (void) bResult; // unused in non-debug
-                    pNew = new _SetGetExpFld( aPos.nNode, pTFld,
+                    pNew = new _SetGetExpField( aPos.nNode, pTField,
                                                 &aPos.nContent );
                 }
 
@@ -2121,129 +2121,129 @@ bool SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
     return !rTmpLst.empty();
 }
 
-void SwRefPageGetFieldType::UpdateField( SwTxtFld* pTxtFld,
-                                        _SetGetExpFlds& rSetList )
+void SwRefPageGetFieldType::UpdateField( SwTextField* pTextField,
+                                        _SetGetExpFields& rSetList )
 {
-    SwRefPageGetField* pGetFld = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pTxtFld->GetFmtFld().GetField()));
-    pGetFld->SetText( OUString() );
+    SwRefPageGetField* pGetField = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pTextField->GetFormatField().GetField()));
+    pGetField->SetText( OUString() );
 
     // then search the correct RefPageSet field
-    SwTxtNode* pTxtNode = &pTxtFld->GetTxtNode();
-    if( pTxtNode->StartOfSectionIndex() >
+    SwTextNode* pTextNode = &pTextField->GetTextNode();
+    if( pTextNode->StartOfSectionIndex() >
         pDoc->GetNodes().GetEndOfExtras().GetIndex() )
     {
-        SwNodeIndex aIdx( *pTxtNode );
-        _SetGetExpFld aEndFld( aIdx, pTxtFld );
+        SwNodeIndex aIdx( *pTextNode );
+        _SetGetExpField aEndField( aIdx, pTextField );
 
-        _SetGetExpFlds::const_iterator itLast = rSetList.lower_bound( &aEndFld );
+        _SetGetExpFields::const_iterator itLast = rSetList.lower_bound( &aEndField );
 
         if( itLast != rSetList.begin() )
         {
             --itLast;
-            const SwTxtFld* pRefTxtFld = (*itLast)->GetTxtFld();
-            const SwRefPageSetField* pSetFld =
-                        static_cast<const SwRefPageSetField*>(pRefTxtFld->GetFmtFld().GetField());
-            if( pSetFld->IsOn() )
+            const SwTextField* pRefTextField = (*itLast)->GetTextField();
+            const SwRefPageSetField* pSetField =
+                        static_cast<const SwRefPageSetField*>(pRefTextField->GetFormatField().GetField());
+            if( pSetField->IsOn() )
             {
                 // determine the correct offset
                 Point aPt;
-                const SwCntntFrm* pFrm = pTxtNode->getLayoutFrm( pTxtNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
-                const SwCntntFrm* pRefFrm = pRefTxtFld->GetTxtNode().getLayoutFrm( pRefTxtFld->GetTxtNode().GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+                const SwContentFrm* pFrm = pTextNode->getLayoutFrm( pTextNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+                const SwContentFrm* pRefFrm = pRefTextField->GetTextNode().getLayoutFrm( pRefTextField->GetTextNode().GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
                 const SwPageFrm* pPgFrm = 0;
                 const short nDiff = ( pFrm && pRefFrm )
                         ?   (pPgFrm = pFrm->FindPageFrm())->GetPhyPageNum() -
                             pRefFrm->FindPageFrm()->GetPhyPageNum() + 1
                         : 1;
 
-                sal_uInt32 nTmpFmt = SVX_NUM_PAGEDESC == pGetFld->GetFormat()
+                sal_uInt32 nTmpFormat = SVX_NUM_PAGEDESC == pGetField->GetFormat()
                         ? ( !pPgFrm
                                 ? (sal_uInt32)SVX_NUM_ARABIC
                                 : pPgFrm->GetPageDesc()->GetNumType().GetNumberingType() )
-                        : pGetFld->GetFormat();
-                const short nPageNum = std::max<short>(0, pSetFld->GetOffset() + nDiff);
-                pGetFld->SetText( FormatNumber( nPageNum, nTmpFmt ) );
+                        : pGetField->GetFormat();
+                const short nPageNum = std::max<short>(0, pSetField->GetOffset() + nDiff);
+                pGetField->SetText( FormatNumber( nPageNum, nTmpFormat ) );
             }
         }
     }
     // start formatting
-    const_cast<SwFmtFld&>(pTxtFld->GetFmtFld()).ModifyNotification( 0, 0 );
+    const_cast<SwFormatField&>(pTextField->GetFormatField()).ModifyNotification( 0, 0 );
 }
 
 // queries for relative page numbering
 
 SwRefPageGetField::SwRefPageGetField( SwRefPageGetFieldType* pTyp,
-                                    sal_uInt32 nFmt )
-    : SwField( pTyp, nFmt )
+                                    sal_uInt32 nFormat )
+    : SwField( pTyp, nFormat )
 {
 }
 
 OUString SwRefPageGetField::Expand() const
 {
-    return sTxt;
+    return sText;
 }
 
 SwField* SwRefPageGetField::Copy() const
 {
     SwRefPageGetField* pCpy = new SwRefPageGetField(
                         static_cast<SwRefPageGetFieldType*>(GetTyp()), GetFormat() );
-    pCpy->SetText( sTxt );
+    pCpy->SetText( sText );
     return pCpy;
 }
 
 void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
-                                        const SwTxtFld* pFld )
+                                        const SwTextField* pField )
 {
     // only fields in Footer, Header, FootNote, Flys
     SwRefPageGetFieldType* pGetType = static_cast<SwRefPageGetFieldType*>(GetTyp());
     SwDoc* pDoc = pGetType->GetDoc();
-    if( pFld->GetTxtNode().StartOfSectionIndex() >
+    if( pField->GetTextNode().StartOfSectionIndex() >
         pDoc->GetNodes().GetEndOfExtras().GetIndex() )
         return;
 
-    sTxt.clear();
+    sText.clear();
 
     OSL_ENSURE( !pFrm->IsInDocBody(), "Flag incorrect, frame is in DocBody" );
 
     // collect all SetPageRefFields
-    _SetGetExpFlds aTmpLst;
+    _SetGetExpFields aTmpLst;
     if( !pGetType->MakeSetList( aTmpLst ) )
         return ;
 
     //  create index for determination of the TextNode
     SwPosition aPos( SwNodeIndex( pDoc->GetNodes() ) );
-    SwTxtNode* pTxtNode = const_cast<SwTxtNode*>(GetBodyTxtNode( *pDoc, aPos, *pFrm ));
+    SwTextNode* pTextNode = const_cast<SwTextNode*>(GetBodyTextNode( *pDoc, aPos, *pFrm ));
 
     // If no layout exists, ChangeExpansion is called for header and
-    // footer lines via layout formatting without existing TxtNode.
-    if(!pTxtNode)
+    // footer lines via layout formatting without existing TextNode.
+    if(!pTextNode)
         return;
 
-    _SetGetExpFld aEndFld( aPos.nNode, pFld, &aPos.nContent );
+    _SetGetExpField aEndField( aPos.nNode, pField, &aPos.nContent );
 
-    _SetGetExpFlds::const_iterator itLast = aTmpLst.lower_bound( &aEndFld );
+    _SetGetExpFields::const_iterator itLast = aTmpLst.lower_bound( &aEndField );
 
     if( itLast == aTmpLst.begin() )
         return;        // there is no corresponding set-field in front
     --itLast;
 
-    const SwTxtFld* pRefTxtFld = (*itLast)->GetTxtFld();
-    const SwRefPageSetField* pSetFld =
-                        static_cast<const SwRefPageSetField*>(pRefTxtFld->GetFmtFld().GetField());
+    const SwTextField* pRefTextField = (*itLast)->GetTextField();
+    const SwRefPageSetField* pSetField =
+                        static_cast<const SwRefPageSetField*>(pRefTextField->GetFormatField().GetField());
     Point aPt;
-    const SwCntntFrm* pRefFrm = pRefTxtFld->GetTxtNode().getLayoutFrm( pFrm->getRootFrm(), &aPt, 0, false );
-    if( pSetFld->IsOn() && pRefFrm )
+    const SwContentFrm* pRefFrm = pRefTextField->GetTextNode().getLayoutFrm( pFrm->getRootFrm(), &aPt, 0, false );
+    if( pSetField->IsOn() && pRefFrm )
     {
         // determine the correct offset
         const SwPageFrm* pPgFrm = pFrm->FindPageFrm();
         const short nDiff = pPgFrm->GetPhyPageNum() -
                             pRefFrm->FindPageFrm()->GetPhyPageNum() + 1;
 
-        SwRefPageGetField* pGetFld = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pFld->GetFmtFld().GetField()));
-        sal_uInt32 nTmpFmt = SVX_NUM_PAGEDESC == pGetFld->GetFormat()
+        SwRefPageGetField* pGetField = const_cast<SwRefPageGetField*>(static_cast<const SwRefPageGetField*>(pField->GetFormatField().GetField()));
+        sal_uInt32 nTmpFormat = SVX_NUM_PAGEDESC == pGetField->GetFormat()
                             ? pPgFrm->GetPageDesc()->GetNumType().GetNumberingType()
-                            : pGetFld->GetFormat();
-        const short nPageNum = std::max<short>(0, pSetFld->GetOffset() + nDiff);
-        pGetFld->SetText( FormatNumber( nPageNum, nTmpFmt ) );
+                            : pGetField->GetFormat();
+        const short nPageNum = std::max<short>(0, pSetField->GetOffset() + nDiff);
+        pGetField->SetText( FormatNumber( nPageNum, nTmpFormat ) );
     }
 }
 
@@ -2255,7 +2255,7 @@ bool SwRefPageGetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
             rAny <<= (sal_Int16)GetFormat();
         break;
         case FIELD_PROP_PAR1:
-            rAny <<= sTxt;
+            rAny <<= sText;
         break;
         default:
             OSL_FAIL("illegal property");
@@ -2278,7 +2278,7 @@ bool SwRefPageGetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         }
         break;
         case FIELD_PROP_PAR1:
-            rAny >>= sTxt;
+            rAny >>= sText;
         break;
     default:
         OSL_FAIL("illegal property");
@@ -2298,44 +2298,44 @@ SwFieldType* SwJumpEditFieldType::Copy() const
     return new SwJumpEditFieldType( pDoc );
 }
 
-SwCharFmt* SwJumpEditFieldType::GetCharFmt()
+SwCharFormat* SwJumpEditFieldType::GetCharFormat()
 {
-    SwCharFmt* pFmt = pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( RES_POOLCHR_JUMPEDIT );
+    SwCharFormat* pFormat = pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( RES_POOLCHR_JUMPEDIT );
 
     // not registered yet?
     if( !aDep.GetRegisteredIn() )
-        pFmt->Add( &aDep );     // register
+        pFormat->Add( &aDep );     // register
 
-    return pFmt;
+    return pFormat;
 }
 
 SwJumpEditField::SwJumpEditField( SwJumpEditFieldType* pTyp, sal_uInt32 nForm,
-                                const OUString& rTxt, const OUString& rHelp )
-    : SwField( pTyp, nForm ), sTxt( rTxt ), sHelp( rHelp )
+                                const OUString& rText, const OUString& rHelp )
+    : SwField( pTyp, nForm ), sText( rText ), sHelp( rHelp )
 {
 }
 
 OUString SwJumpEditField::Expand() const
 {
-    return "<" + sTxt + ">";
+    return "<" + sText + ">";
 }
 
 SwField* SwJumpEditField::Copy() const
 {
     return new SwJumpEditField( static_cast<SwJumpEditFieldType*>(GetTyp()), GetFormat(),
-                                sTxt, sHelp );
+                                sText, sHelp );
 }
 
 /// get place holder text
 OUString SwJumpEditField::GetPar1() const
 {
-    return sTxt;
+    return sText;
 }
 
 /// set place holder text
 void SwJumpEditField::SetPar1(const OUString& rStr)
 {
-    sTxt = rStr;
+    sText = rStr;
 }
 
 /// get hint text
@@ -2373,7 +2373,7 @@ bool SwJumpEditField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
         rAny <<= sHelp;
         break;
     case FIELD_PROP_PAR2 :
-         rAny <<= sTxt;
+         rAny <<= sText;
          break;
     default:
         OSL_FAIL("illegal property");
@@ -2406,7 +2406,7 @@ bool SwJumpEditField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         rAny >>= sHelp;
         break;
     case FIELD_PROP_PAR2 :
-         rAny >>= sTxt;
+         rAny >>= sText;
          break;
     default:
         OSL_FAIL("illegal property");
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 602b83015676..b9007ab4e86e 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -131,50 +131,50 @@ OUString ReplacePoint( const OUString& rTmpName, bool bWithCommandType )
     return sRes;
 }
 
-SwTxtNode* GetFirstTxtNode( const SwDoc& rDoc, SwPosition& rPos,
-                            const SwCntntFrm *pCFrm, Point &rPt )
+SwTextNode* GetFirstTextNode( const SwDoc& rDoc, SwPosition& rPos,
+                            const SwContentFrm *pCFrm, Point &rPt )
 {
-    SwTxtNode* pTxtNode = 0;
+    SwTextNode* pTextNode = 0;
     if ( !pCFrm )
     {
         const SwNodes& rNodes = rDoc.GetNodes();
         rPos.nNode = *rNodes.GetEndOfContent().StartOfSectionNode();
-        SwCntntNode* pCNd;
+        SwContentNode* pCNd;
         while( 0 != (pCNd = rNodes.GoNext( &rPos.nNode ) ) &&
-                0 == ( pTxtNode = pCNd->GetTxtNode() ) )
+                0 == ( pTextNode = pCNd->GetTextNode() ) )
                         ;
-        OSL_ENSURE( pTxtNode, "Where is the 1. TextNode?" );
-        rPos.nContent.Assign( pTxtNode, 0 );
+        OSL_ENSURE( pTextNode, "Where is the 1. TextNode?" );
+        rPos.nContent.Assign( pTextNode, 0 );
     }
     else if ( !pCFrm->IsValid() )
     {
-        pTxtNode = const_cast<SwTxtNode*>(static_cast<const SwTxtNode*>(pCFrm->GetNode()));
-        rPos.nNode = *pTxtNode;
-        rPos.nContent.Assign( pTxtNode, 0 );
+        pTextNode = const_cast<SwTextNode*>(static_cast<const SwTextNode*>(pCFrm->GetNode()));
+        rPos.nNode = *pTextNode;
+        rPos.nContent.Assign( pTextNode, 0 );
     }
     else
     {
         pCFrm->GetCrsrOfst( &rPos, rPt );
-        pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+        pTextNode = rPos.nNode.GetNode().GetTextNode();
     }
-    return pTxtNode;
+    return pTextNode;
 }
 
-const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
+const SwTextNode* GetBodyTextNode( const SwDoc& rDoc, SwPosition& rPos,
                                 const SwFrm& rFrm )
 {
     const SwLayoutFrm* pLayout = rFrm.GetUpper();
-    const SwTxtNode* pTxtNode = 0;
+    const SwTextNode* pTextNode = 0;
 
     while( pLayout )
     {
         if( pLayout->IsFlyFrm() )
         {
             // get the FlyFormat
-            const SwFrmFmt* pFlyFmt = static_cast<const SwFlyFrm*>(pLayout)->GetFmt();
-            OSL_ENSURE( pFlyFmt, "Could not find FlyFormat, where is the field?" );
+            const SwFrameFormat* pFlyFormat = static_cast<const SwFlyFrm*>(pLayout)->GetFormat();
+            OSL_ENSURE( pFlyFormat, "Could not find FlyFormat, where is the field?" );
 
-            const SwFmtAnchor &rAnchor = pFlyFmt->GetAnchor();
+            const SwFormatAnchor &rAnchor = pFlyFormat->GetAnchor();
 
             if( FLY_AT_FLY == rAnchor.GetAnchorId() )
             {
@@ -186,12 +186,12 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
                      (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
                      (FLY_AS_CHAR == rAnchor.GetAnchorId()))
             {
-                OSL_ENSURE( rAnchor.GetCntntAnchor(), "no valid position" );
-                rPos = *rAnchor.GetCntntAnchor();
-                pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+                OSL_ENSURE( rAnchor.GetContentAnchor(), "no valid position" );
+                rPos = *rAnchor.GetContentAnchor();
+                pTextNode = rPos.nNode.GetNode().GetTextNode();
                 if ( FLY_AT_PARA == rAnchor.GetAnchorId() )
                 {
-                    const_cast<SwTxtNode*>(pTxtNode)->MakeStartIndex(
+                    const_cast<SwTextNode*>(pTextNode)->MakeStartIndex(
                             &rPos.nContent );
                 }
 
@@ -202,51 +202,51 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
             }
             else
             {
-                pLayout->FindPageFrm()->GetCntntPosition(
+                pLayout->FindPageFrm()->GetContentPosition(
                                                 pLayout->Frm().Pos(), rPos );
-                pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+                pTextNode = rPos.nNode.GetNode().GetTextNode();
             }
         }
-        else if( pLayout->IsFtnFrm() )
+        else if( pLayout->IsFootnoteFrm() )
         {
             // get the anchor's node
-            const SwTxtFtn* pFtn = static_cast<const SwFtnFrm*>(pLayout)->GetAttr();
-            pTxtNode = &pFtn->GetTxtNode();
-            rPos.nNode = *pTxtNode;
-            rPos.nContent = pFtn->GetStart();
+            const SwTextFootnote* pFootnote = static_cast<const SwFootnoteFrm*>(pLayout)->GetAttr();
+            pTextNode = &pFootnote->GetTextNode();
+            rPos.nNode = *pTextNode;
+            rPos.nContent = pFootnote->GetStart();
         }
         else if( pLayout->IsHeaderFrm() || pLayout->IsFooterFrm() )
         {
-            const SwCntntFrm* pCntFrm;
+            const SwContentFrm* pCntFrm;
             const SwPageFrm* pPgFrm = pLayout->FindPageFrm();
             if( pLayout->IsHeaderFrm() )
             {
                 const SwTabFrm *pTab;
-                if( 0 != ( pCntFrm = pPgFrm->FindFirstBodyCntnt()) &&
+                if( 0 != ( pCntFrm = pPgFrm->FindFirstBodyContent()) &&
                     0 != (pTab = pCntFrm->FindTabFrm()) && pTab->IsFollow() &&
                     pTab->GetTable()->GetRowsToRepeat() > 0 &&
                     pTab->IsInHeadline( *pCntFrm ) )
                 {
                     // take the next line
                     const SwLayoutFrm* pRow = pTab->GetFirstNonHeadlineRow();
-                    pCntFrm = pRow->ContainsCntnt();
+                    pCntFrm = pRow->ContainsContent();
                 }
             }
             else
-                pCntFrm = pPgFrm->FindLastBodyCntnt();
+                pCntFrm = pPgFrm->FindLastBodyContent();
 
             if( pCntFrm )
             {
-                pTxtNode = pCntFrm->GetNode()->GetTxtNode();
-                rPos.nNode = *pTxtNode;
-                const_cast<SwTxtNode*>(pTxtNode)->MakeEndIndex( &rPos.nContent );
+                pTextNode = pCntFrm->GetNode()->GetTextNode();
+                rPos.nNode = *pTextNode;
+                const_cast<SwTextNode*>(pTextNode)->MakeEndIndex( &rPos.nContent );
             }
             else
             {
                 Point aPt( pLayout->Frm().Pos() );
                 aPt.Y()++;      // get out of the header
-                pCntFrm = pPgFrm->GetCntntPos( aPt, false, true, false );
-                pTxtNode = GetFirstTxtNode( rDoc, rPos, pCntFrm, aPt );
+                pCntFrm = pPgFrm->GetContentPos( aPt, false, true, false );
+                pTextNode = GetFirstTextNode( rDoc, rPos, pCntFrm, aPt );
             }
         }
         else
@@ -256,7 +256,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
         }
         break; // found, so finish loop
     }
-    return pTxtNode;
+    return pTextNode;
 }
 
 SwGetExpFieldType::SwGetExpFieldType(SwDoc* pDc)
@@ -277,9 +277,9 @@ void SwGetExpFieldType::Modify( const SfxPoolItem*, const SfxPoolItem* pNew )
 }
 
 SwGetExpField::SwGetExpField(SwGetExpFieldType* pTyp, const OUString& rFormel,
-                            sal_uInt16 nSub, sal_uLong nFmt)
-    : SwFormulaField( pTyp, nFmt, 0.0 ),
-    bIsInBodyTxt( true ),
+                            sal_uInt16 nSub, sal_uLong nFormat)
+    : SwFormulaField( pTyp, nFormat, 0.0 ),
+    bIsInBodyText( true ),
     nSubType(nSub),
     bLateInitialization( false )
 {
@@ -311,7 +311,7 @@ SwField* SwGetExpField::Copy() const
     pTmp->SetLanguage(GetLanguage());
     pTmp->SwValueField::SetValue(GetValue());
     pTmp->sExpand       = sExpand;
-    pTmp->bIsInBodyTxt  = bIsInBodyTxt;
+    pTmp->bIsInBodyText  = bIsInBodyText;
     pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
     if( bLateInitialization )
         pTmp->SetLateInitialization();
@@ -319,52 +319,52 @@ SwField* SwGetExpField::Copy() const
     return pTmp;
 }
 
-void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
+void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTextField& rField )
 {
-    if( bIsInBodyTxt ) // only fields in Footer, Header, FootNote, Flys
+    if( bIsInBodyText ) // only fields in Footer, Header, FootNote, Flys
         return;
 
     OSL_ENSURE( !rFrm.IsInDocBody(), "Flag incorrect, frame is in DocBody" );
 
     // determine document (or is there an easier way?)
-    const SwTxtNode* pTxtNode = &rFld.GetTxtNode();
-    SwDoc& rDoc = *const_cast<SwDoc*>(pTxtNode->GetDoc());
+    const SwTextNode* pTextNode = &rField.GetTextNode();
+    SwDoc& rDoc = *const_cast<SwDoc*>(pTextNode->GetDoc());
 
     // create index for determination of the TextNode
     SwPosition aPos( SwNodeIndex( rDoc.GetNodes() ) );
-    pTxtNode = GetBodyTxtNode( rDoc, aPos, rFrm );
+    pTextNode = GetBodyTextNode( rDoc, aPos, rFrm );
 
     // If no layout exists, ChangeExpansion is called for header and
-    // footer lines via layout formatting without existing TxtNode.
-    if(!pTxtNode)
+    // footer lines via layout formatting without existing TextNode.
+    if(!pTextNode)
         return;
     // #i82544#
     if( bLateInitialization )
     {
-        SwFieldType* pSetExpFld = rDoc.getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, GetFormula(), false);
-        if( pSetExpFld )
+        SwFieldType* pSetExpField = rDoc.getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, GetFormula(), false);
+        if( pSetExpField )
         {
             bLateInitialization = false;
             if( !(GetSubType() & nsSwGetSetExpType::GSE_STRING) &&
-                static_cast< SwSetExpFieldType* >(pSetExpFld)->GetType() == nsSwGetSetExpType::GSE_STRING )
+                static_cast< SwSetExpFieldType* >(pSetExpField)->GetType() == nsSwGetSetExpType::GSE_STRING )
             SetSubType( nsSwGetSetExpType::GSE_STRING );
         }
     }
 
-    _SetGetExpFld aEndFld( aPos.nNode, &rFld, &aPos.nContent );
+    _SetGetExpField aEndField( aPos.nNode, &rField, &aPos.nContent );
     if(GetSubType() & nsSwGetSetExpType::GSE_STRING)
     {
-        SwHash** ppHashTbl;
+        SwHash** ppHashTable;
         sal_uInt16 nSize;
-        rDoc.getIDocumentFieldsAccess().FldsToExpand( ppHashTbl, nSize, aEndFld );
-        sExpand = LookString( ppHashTbl, nSize, GetFormula() );
-        ::DeleteHashTable( ppHashTbl, nSize );
+        rDoc.getIDocumentFieldsAccess().FieldsToExpand( ppHashTable, nSize, aEndField );
+        sExpand = LookString( ppHashTable, nSize, GetFormula() );
+        ::DeleteHashTable( ppHashTable, nSize );
     }
     else
     {
         // fill calculator with values
         SwCalc aCalc( rDoc );
-        rDoc.getIDocumentFieldsAccess().FldsToCalc(aCalc, aEndFld);
+        rDoc.getIDocumentFieldsAccess().FieldsToCalc(aCalc, aEndField);
 
         // calculate value
         SetValue(aCalc.Calculate(GetFormula()).GetDouble());
@@ -516,11 +516,11 @@ void SwSetExpFieldType::Modify( const SfxPoolItem*, const SfxPoolItem* )
     return;     // do not expand further
 }
 
-void SwSetExpFieldType::SetSeqFormat(sal_uLong nFmt)
+void SwSetExpFieldType::SetSeqFormat(sal_uLong nFormat)
 {
-    SwIterator<SwFmtFld,SwFieldType> aIter(*this);
-    for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
-        pFmtFld->GetField()->ChangeFormat( nFmt );
+    SwIterator<SwFormatField,SwFieldType> aIter(*this);
+    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
+        pFormatField->GetField()->ChangeFormat( nFormat );
 }
 
 sal_uLong SwSetExpFieldType::GetSeqFormat()
@@ -528,11 +528,11 @@ sal_uLong SwSetExpFieldType::GetSeqFormat()
     if( !HasWriterListeners() )
         return SVX_NUM_ARABIC;
 
-    const SwField *pFld = SwIterator<SwFmtFld,SwSetExpFieldType>(*this).First()->GetField();
-    return pFld->GetFormat();
+    const SwField *pField = SwIterator<SwFormatField,SwSetExpFieldType>(*this).First()->GetField();
+    return pField->GetFormat();
 }
 
-sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld )
+sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rField )
 {
     if( !HasWriterListeners() || !(nsSwGetSetExpType::GSE_SEQ & nType) )
         return USHRT_MAX;
@@ -540,12 +540,12 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld )
     std::vector<sal_uInt16> aArr;
 
     // check if number is already used and if a new one needs to be created
-    SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-    for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
+    SwIterator<SwFormatField,SwFieldType> aIter( *this );
+    for( SwFormatField* pF = aIter.First(); pF; pF = aIter.Next() )
     {
-        const SwTxtNode* pNd;
-        if( pF->GetField() != &rFld && pF->GetTxtFld() &&
-            0 != ( pNd = pF->GetTxtFld()->GetpTxtNode() ) &&
+        const SwTextNode* pNd;
+        if( pF->GetField() != &rField && pF->GetTextField() &&
+            0 != ( pNd = pF->GetTextField()->GetpTextNode() ) &&
             pNd->GetNodes().IsDocNodes() )
         {
             InsertSort( aArr, static_cast<SwSetExpField*>(pF->GetField())->GetSeqNumber() );
@@ -553,7 +553,7 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld )
     }
 
     // check first if number already exists
-    sal_uInt16 nNum = rFld.GetSeqNumber();
+    sal_uInt16 nNum = rField.GetSeqNumber();
     if( USHRT_MAX != nNum )
     {
         std::vector<sal_uInt16>::size_type n {0};
@@ -577,24 +577,24 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld )
                 break;
     }
 
-    rFld.SetSeqNumber( n );
+    rField.SetSeqNumber( n );
     return n;
 }
 
-size_t SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList )
+size_t SwSetExpFieldType::GetSeqFieldList( SwSeqFieldList& rList )
 {
     rList.Clear();
 
-    SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-    for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
+    SwIterator<SwFormatField,SwFieldType> aIter( *this );
+    for( SwFormatField* pF = aIter.First(); pF; pF = aIter.Next() )
     {
-        const SwTxtNode* pNd;
-        if( pF->GetTxtFld() &&
-            0 != ( pNd = pF->GetTxtFld()->GetpTxtNode() ) &&
+        const SwTextNode* pNd;
+        if( pF->GetTextField() &&
+            0 != ( pNd = pF->GetTextField()->GetpTextNode() ) &&
             pNd->GetNodes().IsDocNodes() )
         {
-            _SeqFldLstElem* pNew = new _SeqFldLstElem(
-                    pNd->GetExpandTxt( 0, -1 ),
+            _SeqFieldLstElem* pNew = new _SeqFieldLstElem(
+                    pNd->GetExpandText( 0, -1 ),
                     static_cast<SwSetExpField*>(pF->GetField())->GetSeqNumber() );
             rList.InsertSort( pNew );
         }
@@ -603,25 +603,25 @@ size_t SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList )
     return rList.Count();
 }
 
-void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd )
+void SwSetExpFieldType::SetChapter( SwSetExpField& rField, const SwNode& rNd )
 {
-    const SwTxtNode* pTxtNd = rNd.FindOutlineNodeOfLevel( nLevel );
-    if( pTxtNd )
+    const SwTextNode* pTextNd = rNd.FindOutlineNodeOfLevel( nLevel );
+    if( pTextNd )
     {
-        SwNumRule * pRule = pTxtNd->GetNumRule();
+        SwNumRule * pRule = pTextNd->GetNumRule();
 
         if (pRule)
         {
             // --> OD 2005-11-02 #i51089 - TUNING#
-            if ( pTxtNd->GetNum() )
+            if ( pTextNd->GetNum() )
             {
-                const SwNodeNum & aNum = *(pTxtNd->GetNum());
+                const SwNodeNum & aNum = *(pTextNd->GetNum());
 
                 // only get the number, without pre-/post-fixstrings
                 OUString sNumber( pRule->MakeNumString(aNum, false ));
 
                 if( !sNumber.isEmpty() )
-                    rFld.ChgExpStr( sNumber + sDelim + rFld.GetExpStr() );
+                    rField.ChgExpStr( sNumber + sDelim + rField.GetExpStr() );
             }
             else
             {
@@ -693,7 +693,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return true;
 }
 
-bool SwSeqFldList::InsertSort( _SeqFldLstElem* pNew )
+bool SwSeqFieldList::InsertSort( _SeqFieldLstElem* pNew )
 {
     OUStringBuffer aBuf(pNew->sDlgEntry);
     const sal_Int32 nLen = aBuf.getLength();
@@ -713,7 +713,7 @@ bool SwSeqFldList::InsertSort( _SeqFldLstElem* pNew )
     return bRet;
 }
 
-bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, size_t* pP ) const
+bool SwSeqFieldList::SeekEntry( const _SeqFieldLstElem& rNew, size_t* pP ) const
 {
     size_t nO = maData.size();
     size_t nU = 0;
@@ -770,15 +770,15 @@ bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, size_t* pP ) const
 }
 
 SwSetExpField::SwSetExpField(SwSetExpFieldType* pTyp, const OUString& rFormel,
-                                        sal_uLong nFmt)
-    : SwFormulaField( pTyp, nFmt, 0.0 ), nSeqNo( USHRT_MAX ),
+                                        sal_uLong nFormat)
+    : SwFormulaField( pTyp, nFormat, 0.0 ), nSeqNo( USHRT_MAX ),
     nSubType(0)
-    , mpFmtFld(0)
+    , mpFormatField(0)
 {
     SetFormula(rFormel);
     // ignore SubType
     bInput = false;
-    if( IsSequenceFld() )
+    if( IsSequenceField() )
     {
         SwValueField::SetValue(1.0);
         if( rFormel.isEmpty() )
@@ -788,9 +788,9 @@ SwSetExpField::SwSetExpField(SwSetExpFieldType* pTyp, const OUString& rFormel,
     }
 }
 
-void SwSetExpField::SetFmtFld(SwFmtFld & rFmtFld)
+void SwSetExpField::SetFormatField(SwFormatField & rFormatField)
 {
-    mpFmtFld = &rFmtFld;
+    mpFormatField = &rFormatField;
 }
 
 OUString SwSetExpField::Expand() const
@@ -809,7 +809,7 @@ OUString SwSetExpField::Expand() const
 /// @return the field name
 OUString SwSetExpField::GetFieldName() const
 {
-    SwFldTypesEnum const nStrType( (IsSequenceFld())
+    SwFieldTypesEnum const nStrType( (IsSequenceField())
                             ? TYP_SEQFLD
                             : (bInput)
                                 ? TYP_SETINPFLD
@@ -861,7 +861,7 @@ void SwSetExpField::SetValue( const double& rAny )
 {
     SwValueField::SetValue(rAny);
 
-    if( IsSequenceFld() )
+    if( IsSequenceField() )
         sExpand = FormatNumber( GetValue(), GetFormat() );
     else
         sExpand = static_cast<SwValueFieldType*>(GetTyp())->ExpandValue( rAny,
@@ -877,19 +877,19 @@ void SwGetExpField::SetValue( const double& rAny )
 
 /** Find the index of the reference text following the current field
  *
- * @param rFmt
+ * @param rFormat
  * @param rDoc
  * @param nHint search starting position after the current field (or 0 if default)
  * @return
  */
-sal_Int32 SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc, sal_Int32 nHint)
+sal_Int32 SwGetExpField::GetReferenceTextPos( const SwFormatField& rFormat, SwDoc& rDoc, sal_Int32 nHint)
 {
 
-    const SwTxtFld* pTxtFld = rFmt.GetTxtFld();
-    const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
+    const SwTextField* pTextField = rFormat.GetTextField();
+    const SwTextNode& rTextNode = pTextField->GetTextNode();
 
-    sal_Int32 nRet = nHint ? nHint : pTxtFld->GetStart() + 1;
-    OUString sNodeText = rTxtNode.GetTxt();
+    sal_Int32 nRet = nHint ? nHint : pTextField->GetStart() + 1;
+    OUString sNodeText = rTextNode.GetText();
 
     if(nRet<sNodeText.getLength())
     {
@@ -909,7 +909,7 @@ sal_Int32 SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc,
             0, 0
         };
         SwAttrSet aSet(rDoc.GetAttrPool(), nIds);
-        rTxtNode.GetAttr(aSet, nRet, nRet+1);
+        rTextNode.GetAttr(aSet, nRet, nRet+1);
 
         if( RTL_TEXTENCODING_SYMBOL != static_cast<const SvxFontItem&>(aSet.Get(
                 GetWhichOfScript( RES_CHRATR_FONT, nSrcpt )) ).GetCharSet() )
@@ -1122,14 +1122,14 @@ SwInputField::SwInputField( SwInputFieldType* pFieldType,
                             const OUString& rContent,
                             const OUString& rPrompt,
                             sal_uInt16 nSub,
-                            sal_uLong nFmt,
+                            sal_uLong nFormat,
                             bool bIsFormField )
-    : SwField( pFieldType, nFmt, LANGUAGE_SYSTEM, false )
+    : SwField( pFieldType, nFormat, LANGUAGE_SYSTEM, false )
     , aContent(rContent)
     , aPText(rPrompt)
     , nSubType(nSub)
     , mbIsFormField( bIsFormField )
-    , mpFmtFld( NULL )
+    , mpFormatField( NULL )
 {
 }
 
@@ -1137,33 +1137,33 @@ SwInputField::~SwInputField()
 {
 }
 
-void SwInputField::SetFmtFld( SwFmtFld& rFmtFld )
+void SwInputField::SetFormatField( SwFormatField& rFormatField )
 {
-    mpFmtFld = &rFmtFld;
+    mpFormatField = &rFormatField;
 }
 
 
 
 void SwInputField::LockNotifyContentChange()
 {
-    if ( GetFmtFld() != NULL )
+    if ( GetFormatField() != NULL )
     {
-        SwTxtInputFld* pTxtInputFld = dynamic_cast< SwTxtInputFld* >(GetFmtFld()->GetTxtFld());
-        if ( pTxtInputFld != NULL )
+        SwTextInputField* pTextInputField = dynamic_cast< SwTextInputField* >(GetFormatField()->GetTextField());
+        if ( pTextInputField != NULL )
         {
-            pTxtInputFld->LockNotifyContentChange();
+            pTextInputField->LockNotifyContentChange();
         }
     }
 }
 
 void SwInputField::UnlockNotifyContentChange()
 {
-    if ( GetFmtFld() != NULL )
+    if ( GetFormatField() != NULL )
     {
-        SwTxtInputFld* pTxtInputFld = dynamic_cast< SwTxtInputFld* >(GetFmtFld()->GetTxtFld());
-        if ( pTxtInputFld != NULL )
+        SwTextInputField* pTextInputField = dynamic_cast< SwTextInputField* >(GetFormatField()->GetTextField());
+        if ( pTextInputField != NULL )
         {
-            pTxtInputFld->UnlockNotifyContentChange();
+            pTextInputField->UnlockNotifyContentChange();
         }
     }
 }
@@ -1177,7 +1177,7 @@ void SwInputField::applyFieldContent( const OUString& rNewFieldContent )
     else if( (nSubType & 0x00ff) == INP_USR )
     {
         SwUserFieldType* pUserTyp = static_cast<SwUserFieldType*>(
-            static_cast<SwInputFieldType*>(GetTyp())->GetDoc()->getIDocumentFieldsAccess().GetFldType( RES_USERFLD, getContent(), false ) );
+            static_cast<SwInputFieldType*>(GetTyp())->GetDoc()->getIDocumentFieldsAccess().GetFieldType( RES_USERFLD, getContent(), false ) );
         if( pUserTyp )
         {
             pUserTyp->SetContent( rNewFieldContent );
@@ -1185,7 +1185,7 @@ void SwInputField::applyFieldContent( const OUString& rNewFieldContent )
             // trigger update of the corresponding User Fields and other related Input Fields
             {
                 LockNotifyContentChange();
-                pUserTyp->UpdateFlds();
+                pUserTyp->UpdateFields();
                 UnlockNotifyContentChange();
             }
         }
@@ -1204,7 +1204,7 @@ OUString SwInputField::GetFieldName() const
 
 SwField* SwInputField::Copy() const
 {
-    SwInputField* pFld =
+    SwInputField* pField =
         new SwInputField(
             static_cast<SwInputFieldType*>(GetTyp()),
             getContent(),
@@ -1213,11 +1213,11 @@ SwField* SwInputField::Copy() const
             GetFormat(),
             mbIsFormField );
 
-    pFld->SetHelp( aHelp );
-    pFld->SetToolTip( aToolTip );
+    pField->SetHelp( aHelp );
+    pField->SetToolTip( aToolTip );
 
-    pFld->SetAutomaticLanguage(IsAutomaticLanguage());
-    return pFld;
+    pField->SetAutomaticLanguage(IsAutomaticLanguage());
+    return pField;
 }
 
 OUString SwInputField::Expand() const
@@ -1230,7 +1230,7 @@ OUString SwInputField::Expand() const
     if( (nSubType & 0x00ff) == INP_USR )
     {
         SwUserFieldType* pUserTyp = static_cast<SwUserFieldType*>(
-            static_cast<SwInputFieldType*>(GetTyp())->GetDoc()->getIDocumentFieldsAccess().GetFldType( RES_USERFLD, getContent(), false ) );
+            static_cast<SwInputFieldType*>(GetTyp())->GetDoc()->getIDocumentFieldsAccess().GetFieldType( RES_USERFLD, getContent(), false ) );
         if( pUserTyp )
             return pUserTyp->GetContent();
     }
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 3024f9c042f3..7f02e0a23bb8 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -51,13 +51,13 @@
 using namespace ::com::sun::star;
 using namespace nsSwDocInfoSubType;
 
-static sal_uInt16 lcl_GetLanguageOfFormat( sal_uInt16 nLng, sal_uLong nFmt,
+static sal_uInt16 lcl_GetLanguageOfFormat( sal_uInt16 nLng, sal_uLong nFormat,
                                 const SvNumberFormatter& rFormatter )
 {
     if( nLng == LANGUAGE_NONE ) // Bug #60010
         nLng = LANGUAGE_SYSTEM;
     else if( nLng == ::GetAppLanguage() )
-        switch( rFormatter.GetIndexTableOffset( nFmt ))
+        switch( rFormatter.GetIndexTableOffset( nFormat ))
         {
         case NF_NUMBER_SYSTEM:
         case NF_DATE_SYSTEM_SHORT:
@@ -73,7 +73,7 @@ static sal_uInt16 lcl_GetLanguageOfFormat( sal_uInt16 nLng, sal_uLong nFmt,
 // Globals
 
 /// field names
-std::vector<OUString>* SwFieldType::s_pFldNames = nullptr;
+std::vector<OUString>* SwFieldType::s_pFieldNames = nullptr;
 
 namespace
 {
@@ -125,11 +125,11 @@ namespace
 
 OUString SwFieldType::GetTypeStr(sal_uInt16 nTypeId)
 {
-    if (!s_pFldNames)
-        _GetFldName();
+    if (!s_pFieldNames)
+        _GetFieldName();
 
-    if (nTypeId < SwFieldType::s_pFldNames->size())
-        return (*SwFieldType::s_pFldNames)[nTypeId];
+    if (nTypeId < SwFieldType::s_pFieldNames->size())
+        return (*SwFieldType::s_pFieldNames)[nTypeId];
     return OUString();
 }
 
@@ -154,26 +154,26 @@ bool SwFieldType::PutValue( const uno::Any& , sal_uInt16 )
     return false;
 }
 
-void SwFldTypes::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFieldTypes::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFldTypes"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFieldTypes"));
     sal_uInt16 nCount = size();
     for (sal_uInt16 nType = 0; nType < nCount; ++nType)
     {
         const SwFieldType *pCurType = (*this)[nType];
-        SwIterator<SwFmtFld, SwFieldType> aIter(*pCurType);
-        for (const SwFmtFld* pCurFldFmt = aIter.First(); pCurFldFmt; pCurFldFmt = aIter.Next())
+        SwIterator<SwFormatField, SwFieldType> aIter(*pCurType);
+        for (const SwFormatField* pCurFieldFormat = aIter.First(); pCurFieldFormat; pCurFieldFormat = aIter.Next())
         {
-            xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtFld"));
-            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", pCurFldFmt);
-            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("txtFld"), "%p", pCurFldFmt->GetTxtFld());
+            xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatField"));
+            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", pCurFieldFormat);
+            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("txtField"), "%p", pCurFieldFormat->GetTextField());
 
             xmlTextWriterStartElement(pWriter, BAD_CAST("swField"));
-            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("symbol"), "%s", BAD_CAST(typeid(*pCurFldFmt->GetField()).name()));
-            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", pCurFldFmt->GetField());
-            if (pCurFldFmt->GetField()->GetTyp()->Which() == RES_POSTITFLD)
+            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("symbol"), "%s", BAD_CAST(typeid(*pCurFieldFormat->GetField()).name()));
+            xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", pCurFieldFormat->GetField());
+            if (pCurFieldFormat->GetField()->GetTyp()->Which() == RES_POSTITFLD)
             {
-                const SwPostItField* pField = static_cast<const SwPostItField*>(pCurFldFmt->GetField());
+                const SwPostItField* pField = static_cast<const SwPostItField*>(pCurFieldFormat->GetField());
                 xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(pField->GetName().toUtf8().getStr()));
             }
             xmlTextWriterEndElement(pWriter);
@@ -481,7 +481,7 @@ SwValueFieldType::SwValueFieldType( const SwValueFieldType& rTyp )
 
 /// return value formatted as string
 OUString SwValueFieldType::ExpandValue( const double& rVal,
-                                        sal_uInt32 nFmt, sal_uInt16 nLng) const
+                                        sal_uInt32 nFormat, sal_uInt16 nLng) const
 {
     if (rVal >= DBL_MAX) // error string for calculator
         return SwViewShell::GetShellRes()->aCalc_Error;
@@ -491,51 +491,51 @@ OUString SwValueFieldType::ExpandValue( const double& rVal,
     Color* pCol = 0;
 
     // Bug #60010
-    sal_uInt16 nFmtLng = ::lcl_GetLanguageOfFormat( nLng, nFmt, *pFormatter );
+    sal_uInt16 nFormatLng = ::lcl_GetLanguageOfFormat( nLng, nFormat, *pFormatter );
 
-    if( nFmt < SV_COUNTRY_LANGUAGE_OFFSET && LANGUAGE_SYSTEM != nFmtLng )
+    if( nFormat < SV_COUNTRY_LANGUAGE_OFFSET && LANGUAGE_SYSTEM != nFormatLng )
     {
         short nType = css::util::NumberFormat::DEFINED;
         sal_Int32 nDummy;
 
-        const SvNumberformat* pEntry = pFormatter->GetEntry(nFmt);
+        const SvNumberformat* pEntry = pFormatter->GetEntry(nFormat);
 
         if (pEntry && nLng != pEntry->GetLanguage())
         {
-            sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nFmt,
-                                                    (LanguageType)nFmtLng);
+            sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nFormat,
+                                                    (LanguageType)nFormatLng);
 
-            if (nNewFormat == nFmt)
+            if (nNewFormat == nFormat)
             {
                 // probably user-defined format
-                OUString sFmt(pEntry->GetFormatstring());
+                OUString sFormat(pEntry->GetFormatstring());
 
-                pFormatter->PutandConvertEntry(sFmt, nDummy, nType, nFmt,
-                                        pEntry->GetLanguage(), nFmtLng );
+                pFormatter->PutandConvertEntry(sFormat, nDummy, nType, nFormat,
+                                        pEntry->GetLanguage(), nFormatLng );
             }
             else
-                nFmt = nNewFormat;
+                nFormat = nNewFormat;
         }
         OSL_ENSURE(pEntry, "unknown number format!");
     }
 
-    if( pFormatter->IsTextFormat( nFmt ) )
+    if( pFormatter->IsTextFormat( nFormat ) )
     {
-        pFormatter->GetOutputString(DoubleToString(rVal, nFmtLng), nFmt,
+        pFormatter->GetOutputString(DoubleToString(rVal, nFormatLng), nFormat,
                                     sExpand, &pCol);
     }
     else
     {
-        pFormatter->GetOutputString(rVal, nFmt, sExpand, &pCol);
+        pFormatter->GetOutputString(rVal, nFormat, sExpand, &pCol);
     }
     return sExpand;
 }
 
 OUString SwValueFieldType::DoubleToString(const double &rVal,
-                                        sal_uInt32 nFmt) const
+                                        sal_uInt32 nFormat) const
 {
     SvNumberFormatter* pFormatter = m_pDoc->GetNumberFormatter();
-    const SvNumberformat* pEntry = pFormatter->GetEntry(nFmt);
+    const SvNumberformat* pEntry = pFormatter->GetEntry(nFormat);
 
     if (!pEntry)
         return OUString();
@@ -557,16 +557,16 @@ OUString SwValueFieldType::DoubleToString( const double &rVal,
                                     pFormatter->GetDecSep(), true );
 }
 
-SwValueField::SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt,
+SwValueField::SwValueField( SwValueFieldType* pFieldType, sal_uInt32 nFormat,
                             sal_uInt16 nLng, const double fVal )
-    : SwField(pFldType, nFmt, nLng)
+    : SwField(pFieldType, nFormat, nLng)
     , m_fValue(fVal)
 {
 }
 
-SwValueField::SwValueField( const SwValueField& rFld )
-    : SwField(rFld)
-    , m_fValue(rFld.GetValue())
+SwValueField::SwValueField( const SwValueField& rField )
+    : SwField(rField)
+    , m_fValue(rField.GetValue())
 {
 }
 
@@ -590,43 +590,43 @@ SwFieldType* SwValueField::ChgTyp( SwFieldType* pNewType )
     {
         SvNumberFormatter* pFormatter = pNewDoc->GetNumberFormatter();
 
-        if( pFormatter && pFormatter->HasMergeFmtTbl() &&
+        if( pFormatter && pFormatter->HasMergeFormatTable() &&
             static_cast<SwValueFieldType *>(GetTyp())->UseFormat() )
-            SetFormat(pFormatter->GetMergeFmtIndex( GetFormat() ));
+            SetFormat(pFormatter->GetMergeFormatIndex( GetFormat() ));
     }
 
     return SwField::ChgTyp(pNewType);
 }
 
 /// get format in office language
-sal_uInt32 SwValueField::GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt)
+sal_uInt32 SwValueField::GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFormat)
 {
-    const SvNumberformat* pEntry = pFormatter->GetEntry(nFmt);
+    const SvNumberformat* pEntry = pFormatter->GetEntry(nFormat);
     sal_uInt16 nLng = SvtSysLocale().GetLanguageTag().getLanguageType();
 
     if (pEntry && nLng != pEntry->GetLanguage())
     {
-        sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nFmt,
+        sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nFormat,
                                                         (LanguageType)nLng);
 
-        if (nNewFormat == nFmt)
+        if (nNewFormat == nFormat)
         {
             // probably user-defined format
             short nType = css::util::NumberFormat::DEFINED;
             sal_Int32 nDummy;
 
-            OUString sFmt(pEntry->GetFormatstring());
+            OUString sFormat(pEntry->GetFormatstring());
 
-            sal_uInt32 nTempFormat = nFmt;
-            pFormatter->PutandConvertEntry(sFmt, nDummy, nType,
+            sal_uInt32 nTempFormat = nFormat;
+            pFormatter->PutandConvertEntry(sFormat, nDummy, nType,
                                            nTempFormat, pEntry->GetLanguage(), nLng);
-            nFmt = nTempFormat;
+            nFormat = nTempFormat;
         }
         else
-            nFmt = nNewFormat;
+            nFormat = nNewFormat;
     }
 
-    return nFmt;
+    return nFormat;
 }
 
 /// set language of the format
@@ -638,30 +638,30 @@ void SwValueField::SetLanguage( sal_uInt16 nLng )
     {
         // Bug #60010
         SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
-        sal_uInt16 nFmtLng = ::lcl_GetLanguageOfFormat( nLng, GetFormat(),
+        sal_uInt16 nFormatLng = ::lcl_GetLanguageOfFormat( nLng, GetFormat(),
                                                     *pFormatter );
 
         if( (GetFormat() >= SV_COUNTRY_LANGUAGE_OFFSET ||
-             LANGUAGE_SYSTEM != nFmtLng ) &&
+             LANGUAGE_SYSTEM != nFormatLng ) &&
             !(Which() == RES_USERFLD && (GetSubType()&nsSwExtendedSubType::SUB_CMD) ) )
         {
             const SvNumberformat* pEntry = pFormatter->GetEntry(GetFormat());
 
-            if( pEntry && nFmtLng != pEntry->GetLanguage() )
+            if( pEntry && nFormatLng != pEntry->GetLanguage() )
             {
                 sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(
-                                        GetFormat(), (LanguageType)nFmtLng );
+                                        GetFormat(), (LanguageType)nFormatLng );
 
                 if( nNewFormat == GetFormat() )
                 {
                     // probably user-defined format
                     short nType = css::util::NumberFormat::DEFINED;
                     sal_Int32 nDummy;
-                    OUString sFmt( pEntry->GetFormatstring() );
-                    pFormatter->PutandConvertEntry( sFmt, nDummy, nType,
+                    OUString sFormat( pEntry->GetFormatstring() );
+                    pFormatter->PutandConvertEntry( sFormat, nDummy, nType,
                                                     nNewFormat,
                                                     pEntry->GetLanguage(),
-                                                    nFmtLng );
+                                                    nFormatLng );
                 }
                 SetFormat( nNewFormat );
             }
@@ -682,14 +682,14 @@ void SwValueField::SetValue( const double& rVal )
     m_fValue = rVal;
 }
 
-SwFormulaField::SwFormulaField( SwValueFieldType* pFldType, sal_uInt32 nFmt, const double fVal)
-    : SwValueField(pFldType, nFmt, LANGUAGE_SYSTEM, fVal)
+SwFormulaField::SwFormulaField( SwValueFieldType* pFieldType, sal_uInt32 nFormat, const double fVal)
+    : SwValueField(pFieldType, nFormat, LANGUAGE_SYSTEM, fVal)
 {
 }
 
-SwFormulaField::SwFormulaField( const SwFormulaField& rFld )
-    : SwValueField(static_cast<SwValueFieldType *>(rFld.GetTyp()), rFld.GetFormat(),
-                    rFld.GetLanguage(), rFld.GetValue())
+SwFormulaField::SwFormulaField( const SwFormulaField& rField )
+    : SwValueField(static_cast<SwValueFieldType *>(rField.GetTyp()), rField.GetFormat(),
+                    rField.GetLanguage(), rField.GetValue())
 {
 }
 
@@ -702,9 +702,9 @@ void SwFormulaField::SetFormula(const OUString& rStr)
 {
     m_sFormula = rStr;
 
-    sal_uLong nFmt(GetFormat());
+    sal_uLong nFormat(GetFormat());
 
-    if( nFmt && SAL_MAX_UINT32 != nFmt )
+    if( nFormat && SAL_MAX_UINT32 != nFormat )
     {
         sal_Int32 nPos = 0;
         double fTmpValue;
@@ -715,19 +715,19 @@ void SwFormulaField::SetFormula(const OUString& rStr)
 
 void SwFormulaField::SetExpandedFormula( const OUString& rStr )
 {
-    sal_uInt32 nFmt(GetFormat());
+    sal_uInt32 nFormat(GetFormat());
 
-    if (nFmt && nFmt != SAL_MAX_UINT32 && static_cast<SwValueFieldType *>(GetTyp())->UseFormat())
+    if (nFormat && nFormat != SAL_MAX_UINT32 && static_cast<SwValueFieldType *>(GetTyp())->UseFormat())
     {
         double fTmpValue;
 
         SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
 
-        if (pFormatter->IsNumberFormat(rStr, nFmt, fTmpValue))
+        if (pFormatter->IsNumberFormat(rStr, nFormat, fTmpValue))
         {
             SwValueField::SetValue(fTmpValue);
 
-            m_sFormula = static_cast<SwValueFieldType *>(GetTyp())->DoubleToString(fTmpValue, nFmt);
+            m_sFormula = static_cast<SwValueFieldType *>(GetTyp())->DoubleToString(fTmpValue, nFormat);
             return;
         }
     }
@@ -736,23 +736,23 @@ void SwFormulaField::SetExpandedFormula( const OUString& rStr )
 
 OUString SwFormulaField::GetExpandedFormula() const
 {
-    sal_uInt32 nFmt(GetFormat());
+    sal_uInt32 nFormat(GetFormat());
 
-    if (nFmt && nFmt != SAL_MAX_UINT32 && static_cast<SwValueFieldType *>(GetTyp())->UseFormat())
+    if (nFormat && nFormat != SAL_MAX_UINT32 && static_cast<SwValueFieldType *>(GetTyp())->UseFormat())
     {
         OUString sFormattedValue;
         Color* pCol = 0;
 
         SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
 
-        if (pFormatter->IsTextFormat(nFmt))
+        if (pFormatter->IsTextFormat(nFormat))
         {
-            OUString sTempIn(static_cast<SwValueFieldType *>(GetTyp())->DoubleToString(GetValue(), nFmt));
-            pFormatter->GetOutputString(sTempIn, nFmt, sFormattedValue, &pCol);
+            OUString sTempIn(static_cast<SwValueFieldType *>(GetTyp())->DoubleToString(GetValue(), nFormat));
+            pFormatter->GetOutputString(sTempIn, nFormat, sFormattedValue, &pCol);
         }
         else
         {
-            pFormatter->GetOutputString(GetValue(), nFmt, sFormattedValue, &pCol);
+            pFormatter->GetOutputString(GetValue(), nFormat, sFormattedValue, &pCol);
         }
         return sFormattedValue;
     }
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index 0b23799b5b34..42d14a21e3d1 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -37,12 +37,12 @@ SwFieldType* SwDateTimeFieldType::Copy() const
     return pTmp;
 }
 
-SwDateTimeField::SwDateTimeField(SwDateTimeFieldType* pInitType, sal_uInt16 nSub, sal_uLong nFmt, sal_uInt16 nLng)
-    : SwValueField(pInitType, nFmt, nLng, 0.0),
+SwDateTimeField::SwDateTimeField(SwDateTimeFieldType* pInitType, sal_uInt16 nSub, sal_uLong nFormat, sal_uInt16 nLng)
+    : SwValueField(pInitType, nFormat, nLng, 0.0),
     nSubType(nSub),
     nOffset(0)
 {
-    if (!nFmt)
+    if (!nFormat)
     {
         SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
         if (nSubType & DATEFLD)
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 03e3a8efa7ae..13339c5753a2 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -36,40 +36,40 @@ SwInputFieldList::SwInputFieldList( SwEditShell* pShell, bool bBuildTmpLst )
     : pSh(pShell)
 {
     // create sorted list of all  input fields
-    pSrtLst = new _SetGetExpFlds();
+    pSrtLst = new _SetGetExpFields();
 
-    const SwFldTypes& rFldTypes = *pSh->GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
-    const size_t nSize = rFldTypes.size();
+    const SwFieldTypes& rFieldTypes = *pSh->GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
+    const size_t nSize = rFieldTypes.size();
 
     // iterate over all types
     for(size_t i=0; i < nSize; ++i)
     {
-        SwFieldType* pFldType = (SwFieldType*)rFldTypes[ i ];
-        const sal_uInt16 nType = pFldType->Which();
+        SwFieldType* pFieldType = (SwFieldType*)rFieldTypes[ i ];
+        const sal_uInt16 nType = pFieldType->Which();
 
         if( RES_SETEXPFLD == nType || RES_INPUTFLD == nType || RES_DROPDOWN == nType )
         {
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-            for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+            SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+            for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
             {
-                const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
+                const SwTextField* pTextField = pFormatField->GetTextField();
 
-                // only process InputFields, interactive SetExpFlds and DropDown fields
-                if( !pTxtFld || ( RES_SETEXPFLD == nType &&
-                    !static_cast<SwSetExpField*>(pFmtFld->GetField())->GetInputFlag()))
+                // only process InputFields, interactive SetExpFields and DropDown fields
+                if( !pTextField || ( RES_SETEXPFLD == nType &&
+                    !static_cast<SwSetExpField*>(pFormatField->GetField())->GetInputFlag()))
                     continue;
 
-                const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
-                if( rTxtNode.GetNodes().IsDocNodes() )
+                const SwTextNode& rTextNode = pTextField->GetTextNode();
+                if( rTextNode.GetNodes().IsDocNodes() )
                 {
                     if( bBuildTmpLst )
                     {
-                        aTmpLst.insert( pTxtFld );
+                        aTmpLst.insert( pTextField );
                     }
                     else
                     {
-                        SwNodeIndex aIdx( rTxtNode );
-                        _SetGetExpFld* pNew = new _SetGetExpFld(aIdx, pTxtFld );
+                        SwNodeIndex aIdx( rTextNode );
+                        _SetGetExpField* pNew = new _SetGetExpField(aIdx, pTextField );
                         pSrtLst->insert( pNew );
                     }
                 }
@@ -91,9 +91,9 @@ size_t SwInputFieldList::Count() const
 // get field from list in sorted order
 SwField* SwInputFieldList::GetField(size_t nId)
 {
-    const SwTxtFld* pTxtFld = (*pSrtLst)[ nId ]->GetTxtFld();
-    OSL_ENSURE( pTxtFld, "no TextFld" );
-    return const_cast<SwField*>(pTxtFld->GetFmtFld().GetField());
+    const SwTextField* pTextField = (*pSrtLst)[ nId ]->GetTextField();
+    OSL_ENSURE( pTextField, "no TextField" );
+    return const_cast<SwField*>(pTextField->GetFormatField().GetField());
 }
 
 /// save cursor
@@ -126,36 +126,36 @@ void SwInputFieldList::GotoFieldPos(size_t nId)
  */
 bool SwInputFieldList::BuildSortLst()
 {
-    const SwFldTypes& rFldTypes = *pSh->GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
-    const size_t nSize = rFldTypes.size();
+    const SwFieldTypes& rFieldTypes = *pSh->GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
+    const size_t nSize = rFieldTypes.size();
 
     // iterate over all types
     for( size_t i = 0; i < nSize; ++i )
     {
-        SwFieldType* pFldType = (SwFieldType*)rFldTypes[ i ];
-        const sal_uInt16 nType = pFldType->Which();
+        SwFieldType* pFieldType = (SwFieldType*)rFieldTypes[ i ];
+        const sal_uInt16 nType = pFieldType->Which();
 
         if( RES_SETEXPFLD == nType || RES_INPUTFLD == nType )
         {
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-            for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+            SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+            for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
             {
-                const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
+                const SwTextField* pTextField = pFormatField->GetTextField();
 
-                //  process only InputFields and interactive SetExpFlds
-                if( !pTxtFld || ( RES_SETEXPFLD == nType &&
-                    !static_cast<SwSetExpField*>(pFmtFld->GetField())->GetInputFlag()))
+                //  process only InputFields and interactive SetExpFields
+                if( !pTextField || ( RES_SETEXPFLD == nType &&
+                    !static_cast<SwSetExpField*>(pFormatField->GetField())->GetInputFlag()))
                     continue;
 
-                const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
-                if( rTxtNode.GetNodes().IsDocNodes() )
+                const SwTextNode& rTextNode = pTextField->GetTextNode();
+                if( rTextNode.GetNodes().IsDocNodes() )
                 {
                     // not in TempList, thus add to SortList
-                    std::set<const SwTxtFld*>::iterator it = aTmpLst.find( pTxtFld );
+                    std::set<const SwTextField*>::iterator it = aTmpLst.find( pTextField );
                     if( aTmpLst.end() == it )
                     {
-                        SwNodeIndex aIdx( rTxtNode );
-                        _SetGetExpFld* pNew = new _SetGetExpFld(aIdx, pTxtFld );
+                        SwNodeIndex aIdx( rTextNode );
+                        _SetGetExpField* pNew = new _SetGetExpField(aIdx, pTextField );
                         pSrtLst->insert( pNew );
                     }
                     else
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index f03ad73e7dca..371ca8c5c30a 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -41,8 +41,8 @@ SwFieldType* SwMacroFieldType::Copy() const
 }
 
 SwMacroField::SwMacroField(SwMacroFieldType* pInitType,
-                           const OUString& rLibAndName, const OUString& rTxt) :
-    SwField(pInitType), aMacro(rLibAndName), aText(rTxt), bIsScriptURL(false)
+                           const OUString& rLibAndName, const OUString& rText) :
+    SwField(pInitType), aMacro(rLibAndName), aText(rText), bIsScriptURL(false)
 {
     bIsScriptURL = isScriptURL(aMacro);
 }
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 6a8f53eea98e..618acb04509e 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -44,23 +44,23 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
     const SwPosition* pAnnotationStartPos )
 {
     SwLayoutStatus aRet = INVISIBLE;
-    SwTxtNode* pTxtNode = rAnchorPos.nNode.GetNode().GetTxtNode();
-    if ( pTxtNode == NULL )
+    SwTextNode* pTextNode = rAnchorPos.nNode.GetNode().GetTextNode();
+    if ( pTextNode == NULL )
         return aRet;
 
-    SwIterator<SwTxtFrm,SwCntntNode> aIter( *pTxtNode );
-    for( SwTxtFrm* pTxtFrm = aIter.First(); pTxtFrm != NULL; pTxtFrm = aIter.Next() )
+    SwIterator<SwTextFrm,SwContentNode> aIter( *pTextNode );
+    for( SwTextFrm* pTextFrm = aIter.First(); pTextFrm != NULL; pTextFrm = aIter.Next() )
     {
-        if( !pTxtFrm->IsFollow() )
+        if( !pTextFrm->IsFollow() )
         {
-            pTxtFrm = pTxtFrm->GetFrmAtPos( rAnchorPos );
-            SwPageFrm *pPage = pTxtFrm ? pTxtFrm->FindPageFrm() : 0;
+            pTextFrm = pTextFrm->GetFrmAtPos( rAnchorPos );
+            SwPageFrm *pPage = pTextFrm ? pTextFrm->FindPageFrm() : 0;
             if ( pPage != NULL && !pPage->IsInvalid() && !pPage->IsInvalidFly() )
             {
                 aRet = VISIBLE;
 
-                o_rInfo.mpAnchorFrm = pTxtFrm;
-                pTxtFrm->GetCharRect( o_rInfo.mPosition, rAnchorPos, 0 );
+                o_rInfo.mpAnchorFrm = pTextFrm;
+                pTextFrm->GetCharRect( o_rInfo.mPosition, rAnchorPos, 0 );
                 if ( pAnnotationStartPos != NULL )
                 {
                     o_rInfo.mnStartNodeIdx = pAnnotationStartPos->nNode.GetIndex();
@@ -78,7 +78,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
                 o_rInfo.meSidebarPosition = pPage->SidebarPosition();
                 o_rInfo.mRedlineAuthor = 0;
 
-                const IDocumentRedlineAccess* pIDRA = pTxtNode->getIDocumentRedlineAccess();
+                const IDocumentRedlineAccess* pIDRA = pTextNode->getIDocumentRedlineAccess();
                 if( IDocumentRedlineAccess::IsShowChanges( pIDRA->GetRedlineMode() ) )
                 {
                     const SwRangeRedline* pRedline = pIDRA->GetRedline( rAnchorPos, 0 );
@@ -95,7 +95,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
         }
     }
 
-    return ( (aRet==VISIBLE) && SwScriptInfo::IsInHiddenRange( *pTxtNode , rAnchorPos.nContent.GetIndex()) )
+    return ( (aRet==VISIBLE) && SwScriptInfo::IsInHiddenRange( *pTextNode , rAnchorPos.nContent.GetIndex()) )
              ? HIDDEN
              : aRet;
 }
@@ -130,17 +130,17 @@ unsigned long SwPostItHelper::getPageInfo( SwRect& rPageFrm, const SwRootFrm* pR
 
 SwPosition SwAnnotationItem::GetAnchorPosition() const
 {
-    SwTxtFld* pTxtFld = mrFmtFld.GetTxtFld();
-    SwTxtNode* pTxtNode = pTxtFld->GetpTxtNode();
+    SwTextField* pTextField = mrFormatField.GetTextField();
+    SwTextNode* pTextNode = pTextField->GetpTextNode();
 
-    SwPosition aPos( *pTxtNode );
-    aPos.nContent.Assign( pTxtNode, pTxtFld->GetStart() );
+    SwPosition aPos( *pTextNode );
+    aPos.nContent.Assign( pTextNode, pTextField->GetStart() );
     return aPos;
 }
 
 bool SwAnnotationItem::UseElement()
 {
-    return mrFmtFld.IsFldInDoc();
+    return mrFormatField.IsFieldInDoc();
 }
 
 VclPtr<sw::sidebarwindows::SwSidebarWin> SwAnnotationItem::GetSidebarWindow(
@@ -152,7 +152,7 @@ VclPtr<sw::sidebarwindows::SwSidebarWin> SwAnnotationItem::GetSidebarWindow(
     return VclPtr<sw::annotation::SwAnnotationWin>::Create( rEditWin, nBits,
                                                 aMgr, aBits,
                                                 *this,
-                                                &mrFmtFld );
+                                                &mrFormatField );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index f75eedfea755..c845ed0f2d5e 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -90,11 +90,11 @@ static void lcl_GetLayTree( const SwFrm* pFrm, std::vector<const SwFrm*>& rArr )
     }
 }
 
-bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
-                    const SwTxtNode& rBehindNd, sal_Int32 nSttPos )
+bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos,
+                    const SwTextNode& rBehindNd, sal_Int32 nSttPos )
 {
-    const SwTxtFrm *pMyFrm = static_cast<SwTxtFrm*>(rMyNd.getLayoutFrm( rMyNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false) ),
-                   *pFrm = static_cast<SwTxtFrm*>(rBehindNd.getLayoutFrm( rBehindNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false) );
+    const SwTextFrm *pMyFrm = static_cast<SwTextFrm*>(rMyNd.getLayoutFrm( rMyNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false) ),
+                   *pFrm = static_cast<SwTextFrm*>(rBehindNd.getLayoutFrm( rBehindNd.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false) );
 
     while( pFrm && !pFrm->IsInside( nSttPos ) )
         pFrm = pFrm->GetFollow();
@@ -131,39 +131,39 @@ bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
     }
 
     const SwFrm* pRefFrm = aRefArr[ nRefCnt ];
-    const SwFrm* pFldFrm = aArr[ nCnt ];
+    const SwFrm* pFieldFrm = aArr[ nCnt ];
 
     // different frames, check their Y-/X-position
     bool bRefIsLower = false;
-    if( ( FRM_COLUMN | FRM_CELL ) & pFldFrm->GetType() ||
+    if( ( FRM_COLUMN | FRM_CELL ) & pFieldFrm->GetType() ||
         ( FRM_COLUMN | FRM_CELL ) & pRefFrm->GetType() )
     {
-        if( pFldFrm->GetType() == pRefFrm->GetType() )
+        if( pFieldFrm->GetType() == pRefFrm->GetType() )
         {
             // here, the X-pos is more important
             if( bVert )
             {
                 if( bR2L )
-                    bRefIsLower = pRefFrm->Frm().Top() < pFldFrm->Frm().Top() ||
-                            ( pRefFrm->Frm().Top() == pFldFrm->Frm().Top() &&
-                              pRefFrm->Frm().Left() < pFldFrm->Frm().Left() );
+                    bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
+                            ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
+                              pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() );
                 else
-                    bRefIsLower = pRefFrm->Frm().Top() < pFldFrm->Frm().Top() ||
-                            ( pRefFrm->Frm().Top() == pFldFrm->Frm().Top() &&
-                              pRefFrm->Frm().Left() > pFldFrm->Frm().Left() );
+                    bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
+                            ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
+                              pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() );
             }
             else if( bR2L )
-                bRefIsLower = pRefFrm->Frm().Left() > pFldFrm->Frm().Left() ||
-                            ( pRefFrm->Frm().Left() == pFldFrm->Frm().Left() &&
-                              pRefFrm->Frm().Top() < pFldFrm->Frm().Top() );
+                bRefIsLower = pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() ||
+                            ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
+                              pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
             else
-                bRefIsLower = pRefFrm->Frm().Left() < pFldFrm->Frm().Left() ||
-                            ( pRefFrm->Frm().Left() == pFldFrm->Frm().Left() &&
-                              pRefFrm->Frm().Top() < pFldFrm->Frm().Top() );
+                bRefIsLower = pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() ||
+                            ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
+                              pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
             pRefFrm = 0;
         }
-        else if( ( FRM_COLUMN | FRM_CELL ) & pFldFrm->GetType() )
-            pFldFrm = aArr[ nCnt - 1 ];
+        else if( ( FRM_COLUMN | FRM_CELL ) & pFieldFrm->GetType() )
+            pFieldFrm = aArr[ nCnt - 1 ];
         else
             pRefFrm = aRefArr[ nRefCnt - 1 ];
     }
@@ -173,31 +173,31 @@ bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
         if( bVert )
         {
             if( bR2L )
-                bRefIsLower = pRefFrm->Frm().Left() < pFldFrm->Frm().Left() ||
-                            ( pRefFrm->Frm().Left() == pFldFrm->Frm().Left() &&
-                                pRefFrm->Frm().Top() < pFldFrm->Frm().Top() );
+                bRefIsLower = pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() ||
+                            ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
+                                pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
             else
-                bRefIsLower = pRefFrm->Frm().Left() > pFldFrm->Frm().Left() ||
-                            ( pRefFrm->Frm().Left() == pFldFrm->Frm().Left() &&
-                                pRefFrm->Frm().Top() < pFldFrm->Frm().Top() );
+                bRefIsLower = pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() ||
+                            ( pRefFrm->Frm().Left() == pFieldFrm->Frm().Left() &&
+                                pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() );
         }
         else if( bR2L )
-            bRefIsLower = pRefFrm->Frm().Top() < pFldFrm->Frm().Top() ||
-                        ( pRefFrm->Frm().Top() == pFldFrm->Frm().Top() &&
-                            pRefFrm->Frm().Left() > pFldFrm->Frm().Left() );
+            bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
+                        ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
+                            pRefFrm->Frm().Left() > pFieldFrm->Frm().Left() );
         else
-            bRefIsLower = pRefFrm->Frm().Top() < pFldFrm->Frm().Top() ||
-                        ( pRefFrm->Frm().Top() == pFldFrm->Frm().Top() &&
-                            pRefFrm->Frm().Left() < pFldFrm->Frm().Left() );
+            bRefIsLower = pRefFrm->Frm().Top() < pFieldFrm->Frm().Top() ||
+                        ( pRefFrm->Frm().Top() == pFieldFrm->Frm().Top() &&
+                            pRefFrm->Frm().Left() < pFieldFrm->Frm().Left() );
     }
     return bRefIsLower;
 }
 
 /// get references
-SwGetRefField::SwGetRefField( SwGetRefFieldType* pFldType,
+SwGetRefField::SwGetRefField( SwGetRefFieldType* pFieldType,
                               const OUString& rSetRef, sal_uInt16 nSubTyp,
-                              sal_uInt16 nSeqenceNo, sal_uLong nFmt )
-    : SwField( pFldType, nFmt ),
+                              sal_uInt16 nSeqenceNo, sal_uLong nFormat )
+    : SwField( pFieldType, nFormat ),
       sSetRefName( rSetRef ),
       nSubType( nSubTyp ),
       nSeqNo( nSeqenceNo )
@@ -236,7 +236,7 @@ bool SwGetRefField::IsRefToNumItemCrossRefBookmark() const
         ::sw::mark::CrossRefNumItemBookmark::IsLegalName(sSetRefName);
 }
 
-const SwTxtNode* SwGetRefField::GetReferencedTxtNode() const
+const SwTextNode* SwGetRefField::GetReferencedTextNode() const
 {
     SwGetRefFieldType *pTyp = dynamic_cast<SwGetRefFieldType*>(GetTyp());
     if (!pTyp)
@@ -246,17 +246,17 @@ const SwTxtNode* SwGetRefField::GetReferencedTxtNode() const
 }
 
 // #i85090#
-OUString SwGetRefField::GetExpandedTxtOfReferencedTxtNode() const
+OUString SwGetRefField::GetExpandedTextOfReferencedTextNode() const
 {
-    const SwTxtNode* pReferencedTxtNode( GetReferencedTxtNode() );
-    return pReferencedTxtNode
-           ? OUString(pReferencedTxtNode->GetExpandTxt( 0, -1, true, true, false, false ))
+    const SwTextNode* pReferencedTextNode( GetReferencedTextNode() );
+    return pReferencedTextNode
+           ? OUString(pReferencedTextNode->GetExpandText( 0, -1, true, true, false, false ))
            : OUString();
 }
 
 OUString SwGetRefField::Expand() const
 {
-    return sTxt;
+    return sText;
 }
 
 OUString SwGetRefField::GetFieldName() const
@@ -269,26 +269,26 @@ OUString SwGetRefField::GetFieldName() const
     return Expand();
 }
 
-// #i81002# - parameter <pFldTxtAttr> added
-void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
+// #i81002# - parameter <pFieldTextAttr> added
+void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr )
 {
-    sTxt.clear();
+    sText.clear();
 
     SwDoc* pDoc = static_cast<SwGetRefFieldType*>(GetTyp())->GetDoc();
     // finding the reference target (the number)
     sal_Int32 nNumStart = -1;
     sal_Int32 nNumEnd = -1;
-    SwTxtNode* pTxtNd = SwGetRefFieldType::FindAnchor(
+    SwTextNode* pTextNd = SwGetRefFieldType::FindAnchor(
         pDoc, sSetRefName, nSubType, nSeqNo, &nNumStart, &nNumEnd
     );
     // not found?
-    if ( !pTxtNd )
+    if ( !pTextNd )
     {
-        sTxt = SwViewShell::GetShellRes()->aGetRefFld_RefItemNotFound;
+        sText = SwViewShell::GetShellRes()->aGetRefField_RefItemNotFound;
         return ;
     }
     // where is the category name (e.g. "Illustration")?
-    const OUString aText = pTxtNd->GetTxt();
+    const OUString aText = pTextNd->GetText();
     const sal_Int32 nCatStart = aText.indexOf(sSetRefName);
     const bool bHasCat = nCatStart>=0;
     const sal_Int32 nCatEnd = bHasCat ? nCatStart + sSetRefName.getLength() : -1;
@@ -328,14 +328,14 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
                 // "Caption Text"
                 case REF_ONLYCAPTION: {
                     // next alphanumeric character after category+number
-                    if (const SwTxtAttr* const pTxtAttr =
-                        pTxtNd->GetTxtAttrForCharAt(nNumStart, RES_TXTATR_FIELD)
+                    if (const SwTextAttr* const pTextAttr =
+                        pTextNd->GetTextAttrForCharAt(nNumStart, RES_TXTATR_FIELD)
                     ) {
                         // start searching from nFrom
                         const sal_Int32 nFrom = bHasCat
                             ? std::max(nNumStart + 1, nCatEnd)
                             : nNumStart + 1;
-                        nStart = SwGetExpField::GetReferenceTextPos( pTxtAttr->GetFmtFld(), *pDoc, nFrom );
+                        nStart = SwGetExpField::GetReferenceTextPos( pTextAttr->GetFormatField(), *pDoc, nFrom );
                     } else {
                         nStart = bHasCat ? std::max(nNumEnd, nCatEnd) : nNumEnd;
                     }
@@ -371,12 +371,12 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
             case REF_FOOTNOTE:
             case REF_ENDNOTE:
                 // get number or numString
-                for( unsigned i = 0; i < pDoc->GetFtnIdxs().size(); ++i )
+                for( unsigned i = 0; i < pDoc->GetFootnoteIdxs().size(); ++i )
                 {
-                    SwTxtFtn* const pFtnIdx = pDoc->GetFtnIdxs()[i];
-                    if( nSeqNo == pFtnIdx->GetSeqRefNo() )
+                    SwTextFootnote* const pFootnoteIdx = pDoc->GetFootnoteIdxs()[i];
+                    if( nSeqNo == pFootnoteIdx->GetSeqRefNo() )
                     {
-                        sTxt = pFtnIdx->GetFtn().GetViewNumStr( *pDoc );
+                        sText = pFootnoteIdx->GetFootnote().GetViewNumStr( *pDoc );
                         break;
                     }
                 }
@@ -390,13 +390,13 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
 
             if( nStart != nEnd ) // a section?
             {
-                sTxt = pTxtNd->GetExpandTxt( nStart, nEnd - nStart );
+                sText = pTextNd->GetExpandText( nStart, nEnd - nStart );
 
                 // remove all special characters (replace them with blanks)
-                if( !sTxt.isEmpty() )
+                if( !sText.isEmpty() )
                 {
-                    sTxt = comphelper::string::remove(sTxt, 0xad);
-                    OUStringBuffer aBuf(sTxt);
+                    sText = comphelper::string::remove(sText, 0xad);
+                    OUStringBuffer aBuf(sText);
                     const sal_Int32 l = aBuf.getLength();
                     for (sal_Int32 i=0; i<l; ++i)
                     {
@@ -409,7 +409,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
                             aBuf[i]='-';
                         }
                     }
-                    sTxt = aBuf.makeStringAndClear();
+                    sText = aBuf.makeStringAndClear();
                 }
             }
         }
@@ -418,7 +418,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
     case REF_PAGE:
     case REF_PAGE_PGDESC:
         {
-            const SwTxtFrm* pFrm = static_cast<SwTxtFrm*>(pTxtNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false)),
+            const SwTextFrm* pFrm = static_cast<SwTextFrm*>(pTextNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false)),
                         *pSave = pFrm;
             while( pFrm && !pFrm->IsInside( nNumStart ) )
                 pFrm = pFrm->GetFollow();
@@ -430,9 +430,9 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
                 if( REF_PAGE_PGDESC == GetFormat() &&
                     0 != ( pPage = pFrm->FindPageFrm() ) &&
                     pPage->GetPageDesc() )
-                    sTxt = pPage->GetPageDesc()->GetNumType().GetNumStr( nPageNo );
+                    sText = pPage->GetPageDesc()->GetNumType().GetNumStr( nPageNo );
                 else
-                    sTxt = OUString::number(nPageNo);
+                    sText = OUString::number(nPageNo);
             }
         }
         break;
@@ -440,14 +440,14 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
     case REF_CHAPTER:
         {
             // a bit tricky: search any frame
-            const SwFrm* pFrm = pTxtNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+            const SwFrm* pFrm = pTextNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
             if( pFrm )
             {
-                SwChapterFieldType aFldTyp;
-                SwChapterField aFld( &aFldTyp, 0 );
-                aFld.SetLevel( MAXLEVEL - 1 );
-                aFld.ChangeExpansion( pFrm, pTxtNd, true );
-                sTxt = aFld.GetNumber();
+                SwChapterFieldType aFieldTyp;
+                SwChapterField aField( &aFieldTyp, 0 );
+                aField.SetLevel( MAXLEVEL - 1 );
+                aField.ChangeExpansion( pFrm, pTextNd, true );
+                sText = aField.GetNumber();
             }
         }
         break;
@@ -455,24 +455,24 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
     case REF_UPDOWN:
         {
             // #i81002#
-            // simplified: use parameter <pFldTxtAttr>
-            if( !pFldTxtAttr || !pFldTxtAttr->GetpTxtNode() )
+            // simplified: use parameter <pFieldTextAttr>
+            if( !pFieldTextAttr || !pFieldTextAttr->GetpTextNode() )
                 break;
 
             LanguageTag aLanguageTag( GetLanguage());
             LocaleDataWrapper aLocaleData( aLanguageTag );
 
             // first a "short" test - in case both are in the same node
-            if( pFldTxtAttr->GetpTxtNode() == pTxtNd )
+            if( pFieldTextAttr->GetpTextNode() == pTextNd )
             {
-                sTxt = nNumStart < pFldTxtAttr->GetStart()
+                sText = nNumStart < pFieldTextAttr->GetStart()
                             ? aLocaleData.getAboveWord()
                             : aLocaleData.getBelowWord();
                 break;
             }
 
-            sTxt = ::IsFrameBehind( *pFldTxtAttr->GetpTxtNode(), pFldTxtAttr->GetStart(),
-                                    *pTxtNd, nNumStart )
+            sText = ::IsFrameBehind( *pFieldTextAttr->GetpTextNode(), pFieldTextAttr->GetStart(),
+                                    *pTextNd, nNumStart )
                         ? aLocaleData.getAboveWord()
                         : aLocaleData.getBelowWord();
         }
@@ -482,9 +482,9 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
     case REF_NUMBER_NO_CONTEXT:
     case REF_NUMBER_FULL_CONTEXT:
         {
-            if ( pFldTxtAttr && pFldTxtAttr->GetpTxtNode() )
+            if ( pFieldTextAttr && pFieldTextAttr->GetpTextNode() )
             {
-                sTxt = MakeRefNumStr( pFldTxtAttr->GetTxtNode(), *pTxtNd, GetFormat() );
+                sText = MakeRefNumStr( pFieldTextAttr->GetTextNode(), *pTextNd, GetFormat() );
             }
         }
         break;
@@ -495,14 +495,14 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
 }
 
 // #i81002#
-OUString SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
-                                     const SwTxtNode& rTxtNodeOfReferencedItem,
+OUString SwGetRefField::MakeRefNumStr( const SwTextNode& rTextNodeOfField,
+                                     const SwTextNode& rTextNodeOfReferencedItem,
                                      const sal_uInt32 nRefNumFormat )
 {
-    if ( rTxtNodeOfReferencedItem.HasNumber() &&
-         rTxtNodeOfReferencedItem.IsCountedInList() )
+    if ( rTextNodeOfReferencedItem.HasNumber() &&
+         rTextNodeOfReferencedItem.IsCountedInList() )
     {
-        OSL_ENSURE( rTxtNodeOfReferencedItem.GetNum(),
+        OSL_ENSURE( rTextNodeOfReferencedItem.GetNum(),
                 "<SwGetRefField::MakeRefNumStr(..)> - referenced paragraph has number, but no <SwNodeNum> instance --> please inform OD!" );
 
         // Determine, up to which level the superior list labels have to be
@@ -513,30 +513,30 @@ OUString SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
         // field and the text node of the referenced item are in the same
         // document context.
         if ( nRefNumFormat == REF_NUMBER &&
-             rTxtNodeOfField.FindFlyStartNode()
-                            == rTxtNodeOfReferencedItem.FindFlyStartNode() &&
-             rTxtNodeOfField.FindFootnoteStartNode()
-                            == rTxtNodeOfReferencedItem.FindFootnoteStartNode() &&
-             rTxtNodeOfField.FindHeaderStartNode()
-                            == rTxtNodeOfReferencedItem.FindHeaderStartNode() &&
-             rTxtNodeOfField.FindFooterStartNode()
-                            == rTxtNodeOfReferencedItem.FindFooterStartNode() )
+             rTextNodeOfField.FindFlyStartNode()
+                            == rTextNodeOfReferencedItem.FindFlyStartNode() &&
+             rTextNodeOfField.FindFootnoteStartNode()
+                            == rTextNodeOfReferencedItem.FindFootnoteStartNode() &&
+             rTextNodeOfField.FindHeaderStartNode()
+                            == rTextNodeOfReferencedItem.FindHeaderStartNode() &&
+             rTextNodeOfField.FindFooterStartNode()
+                            == rTextNodeOfReferencedItem.FindFooterStartNode() )
         {
-            const SwNodeNum* pNodeNumForTxtNodeOfField( 0 );
-            if ( rTxtNodeOfField.HasNumber() &&
-                 rTxtNodeOfField.GetNumRule() == rTxtNodeOfReferencedItem.GetNumRule() )
+            const SwNodeNum* pNodeNumForTextNodeOfField( 0 );
+            if ( rTextNodeOfField.HasNumber() &&
+                 rTextNodeOfField.GetNumRule() == rTextNodeOfReferencedItem.GetNumRule() )
             {
-                pNodeNumForTxtNodeOfField = rTxtNodeOfField.GetNum();
+                pNodeNumForTextNodeOfField = rTextNodeOfField.GetNum();
             }
             else
             {
-                pNodeNumForTxtNodeOfField =
-                    rTxtNodeOfReferencedItem.GetNum()->GetPrecedingNodeNumOf( rTxtNodeOfField );
+                pNodeNumForTextNodeOfField =
+                    rTextNodeOfReferencedItem.GetNum()->GetPrecedingNodeNumOf( rTextNodeOfField );
             }
-            if ( pNodeNumForTxtNodeOfField )
+            if ( pNodeNumForTextNodeOfField )
             {
-                const SwNumberTree::tNumberVector rFieldNumVec = pNodeNumForTxtNodeOfField->GetNumberVector();
-                const SwNumberTree::tNumberVector rRefItemNumVec = rTxtNodeOfReferencedItem.GetNum()->GetNumberVector();
+                const SwNumberTree::tNumberVector rFieldNumVec = pNodeNumForTextNodeOfField->GetNumberVector();
+                const SwNumberTree::tNumberVector rRefItemNumVec = rTextNodeOfReferencedItem.GetNum()->GetNumberVector();
                 sal_uInt8 nLevel( 0 );
                 while ( nLevel < rFieldNumVec.size() && nLevel < rRefItemNumVec.size() )
                 {
@@ -555,13 +555,13 @@ OUString SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
 
         // Determine, if superior list labels have to be included
         const bool bInclSuperiorNumLabels(
-            ( nRestrictInclToThisLevel < rTxtNodeOfReferencedItem.GetActualListLevel() &&
+            ( nRestrictInclToThisLevel < rTextNodeOfReferencedItem.GetActualListLevel() &&
               ( nRefNumFormat == REF_NUMBER || nRefNumFormat == REF_NUMBER_FULL_CONTEXT ) ) );
 
-        OSL_ENSURE( rTxtNodeOfReferencedItem.GetNumRule(),
+        OSL_ENSURE( rTextNodeOfReferencedItem.GetNumRule(),
                 "<SwGetRefField::MakeRefNumStr(..)> - referenced numbered paragraph has no numbering rule set --> please inform OD!" );
-        return rTxtNodeOfReferencedItem.GetNumRule()->MakeRefNumString(
-                                            *(rTxtNodeOfReferencedItem.GetNum()),
+        return rTextNodeOfReferencedItem.GetNumRule()->MakeRefNumString(
+                                            *(rTextNodeOfReferencedItem.GetNum()),
                                             bInclSuperiorNumLabels,
                                             nRestrictInclToThisLevel );
     }
@@ -571,11 +571,11 @@ OUString SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
 
 SwField* SwGetRefField::Copy() const
 {
-    SwGetRefField* pFld = new SwGetRefField( static_cast<SwGetRefFieldType*>(GetTyp()),
+    SwGetRefField* pField = new SwGetRefField( static_cast<SwGetRefFieldType*>(GetTyp()),
                                                 sSetRefName, nSubType,
                                                 nSeqNo, GetFormat() );
-    pFld->sTxt = sTxt;
-    return pFld;
+    pField->sText = sText;
+    return pField;
 }
 
 /// get reference name
@@ -750,7 +750,7 @@ void SwGetRefField::ConvertProgrammaticToUIName()
         SwDoc* pDoc = static_cast<SwGetRefFieldType*>(GetTyp())->GetDoc();
         const OUString rPar1 = GetPar1();
         // don't convert when the name points to an existing field type
-        if(!pDoc->getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, rPar1, false))
+        if(!pDoc->getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, rPar1, false))
         {
             sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromProgName( rPar1, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
             sal_uInt16 nResId = USHRT_MAX;
@@ -789,66 +789,66 @@ void SwGetRefFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew
     // update to all GetReference fields
     if( !pNew && !pOld )
     {
-        SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-        for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+        SwIterator<SwFormatField,SwFieldType> aIter( *this );
+        for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
         {
             // update only the GetRef fields
             //JP 3.4.2001: Task 71231 - we need the correct language
-            SwGetRefField* pGRef = static_cast<SwGetRefField*>(pFmtFld->GetField());
-            const SwTxtFld* pTFld;
+            SwGetRefField* pGRef = static_cast<SwGetRefField*>(pFormatField->GetField());
+            const SwTextField* pTField;
             if( !pGRef->GetLanguage() &&
-                0 != ( pTFld = pFmtFld->GetTxtFld()) &&
-                pTFld->GetpTxtNode() )
+                0 != ( pTField = pFormatField->GetTextField()) &&
+                pTField->GetpTextNode() )
             {
-                pGRef->SetLanguage( pTFld->GetpTxtNode()->GetLang(
-                                                pTFld->GetStart() ) );
+                pGRef->SetLanguage( pTField->GetpTextNode()->GetLang(
+                                                pTField->GetStart() ) );
             }
 
             // #i81002#
-            pGRef->UpdateField( pFmtFld->GetTxtFld() );
+            pGRef->UpdateField( pFormatField->GetTextField() );
         }
     }
     // forward to text fields, they "expand" the text
     NotifyClients( pOld, pNew );
 }
 
-SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
+SwTextNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
                                         sal_uInt16 nSubType, sal_uInt16 nSeqNo,
                                         sal_Int32* pStt, sal_Int32* pEnd )
 {
     OSL_ENSURE( pStt, "Why did no one check the StartPos?" );
 
-    SwTxtNode* pTxtNd = 0;
+    SwTextNode* pTextNd = 0;
     switch( nSubType )
     {
     case REF_SETREFATTR:
         {
-            const SwFmtRefMark *pRef = pDoc->GetRefMark( rRefMark );
-            if( pRef && pRef->GetTxtRefMark() )
+            const SwFormatRefMark *pRef = pDoc->GetRefMark( rRefMark );
+            if( pRef && pRef->GetTextRefMark() )
             {
-                pTxtNd = const_cast<SwTxtNode*>(&pRef->GetTxtRefMark()->GetTxtNode());
-                *pStt = pRef->GetTxtRefMark()->GetStart();
+                pTextNd = const_cast<SwTextNode*>(&pRef->GetTextRefMark()->GetTextNode());
+                *pStt = pRef->GetTextRefMark()->GetStart();
                 if( pEnd )
-                    *pEnd = *pRef->GetTxtRefMark()->GetAnyEnd();
+                    *pEnd = *pRef->GetTextRefMark()->GetAnyEnd();
             }
         }
         break;
 
     case REF_SEQUENCEFLD:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetFldType( RES_SETEXPFLD, rRefMark, false );
-            if( pFldType && pFldType->HasWriterListeners() &&
-                nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(pFldType)->GetType() )
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetFieldType( RES_SETEXPFLD, rRefMark, false );
+            if( pFieldType && pFieldType->HasWriterListeners() &&
+                nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(pFieldType)->GetType() )
             {
-                SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-                for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+                SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+                for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
                 {
-                    if( pFmtFld->GetTxtFld() && nSeqNo ==
-                        static_cast<SwSetExpField*>(pFmtFld->GetField())->GetSeqNumber() )
+                    if( pFormatField->GetTextField() && nSeqNo ==
+                        static_cast<SwSetExpField*>(pFormatField->GetField())->GetSeqNumber() )
                     {
-                        SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-                        pTxtNd = pTxtFld->GetpTxtNode();
-                        *pStt = pTxtFld->GetStart();
+                        SwTextField* pTextField = pFormatField->GetTextField();
+                        pTextNd = pTextField->GetpTextNode();
+                        *pStt = pTextField->GetStart();
                         if( pEnd )
                             *pEnd = (*pStt) + 1;
                         break;
@@ -866,7 +866,7 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
                 const ::sw::mark::IMark* pBkmk = ppMark->get();
                 const SwPosition* pPos = &pBkmk->GetMarkStart();
 
-                pTxtNd = pPos->nNode.GetNode().GetTxtNode();
+                pTextNd = pPos->nNode.GetNode().GetTextNode();
                 *pStt = pPos->nContent.GetIndex();
                 if(pEnd)
                 {
@@ -876,9 +876,9 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
                         // #i81002#
                         if(dynamic_cast< ::sw::mark::CrossRefBookmark const *>(pBkmk))
                         {
-                            OSL_ENSURE( pTxtNd,
+                            OSL_ENSURE( pTextNd,
                                     "<SwGetRefFieldType::FindAnchor(..)> - node marked by cross-reference bookmark isn't a text node --> crash" );
-                            *pEnd = pTxtNd->Len();
+                            *pEnd = pTextNd->Len();
                         }
                     }
                     else if(pBkmk->GetOtherMarkPos().nNode == pBkmk->GetMarkPos().nNode)
@@ -896,15 +896,15 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
     case REF_FOOTNOTE:
     case REF_ENDNOTE:
         {
-            for( auto pFtnIdx : pDoc->GetFtnIdxs() )
-                if( nSeqNo == pFtnIdx->GetSeqRefNo() )
+            for( auto pFootnoteIdx : pDoc->GetFootnoteIdxs() )
+                if( nSeqNo == pFootnoteIdx->GetSeqRefNo() )
                 {
-                    SwNodeIndex* pIdx = pFtnIdx->GetStartNode();
+                    SwNodeIndex* pIdx = pFootnoteIdx->GetStartNode();
                     if( pIdx )
                     {
                         SwNodeIndex aIdx( *pIdx, 1 );
-                        if( 0 == ( pTxtNd = aIdx.GetNode().GetTxtNode()))
-                            pTxtNd = static_cast<SwTxtNode*>(pDoc->GetNodes().GoNext( &aIdx ));
+                        if( 0 == ( pTextNd = aIdx.GetNode().GetTextNode()))
+                            pTextNd = static_cast<SwTextNode*>(pDoc->GetNodes().GoNext( &aIdx ));
                     }
                     *pStt = 0;
                     if( pEnd )
@@ -915,7 +915,7 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
         break;
     }
 
-    return pTxtNd;
+    return pTextNd;
 }
 
 struct _RefIdsMap
@@ -936,7 +936,7 @@ private:
 public:
     _RefIdsMap( const OUString& rName ) : aName( rName ), bInit( false ) {}
 
-    void Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld, bool bField );
+    void Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rField, bool bField );
 
     OUString GetName() { return aName; }
 };
@@ -948,17 +948,17 @@ typedef boost::ptr_vector<_RefIdsMap> _RefIdsMaps;
 /// @param[in,out] rIds The list of IDs found in the document.
 void _RefIdsMap::GetFieldIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds)
 {
-    SwFieldType *const pType = rDoc.getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, aName, false);
+    SwFieldType *const pType = rDoc.getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, aName, false);
 
     if (!pType)
         return;
 
-    SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-    for (SwFmtFld const* pF = aIter.First(); pF; pF = aIter.Next())
+    SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+    for (SwFormatField const* pF = aIter.First(); pF; pF = aIter.Next())
     {
-        if (pF->GetTxtFld())
+        if (pF->GetTextField())
         {
-            SwTxtNode const*const pNd = pF->GetTxtFld()->GetpTxtNode();
+            SwTextNode const*const pNd = pF->GetTextField()->GetpTextNode();
             if (pNd && pNd->GetNodes().IsDocNodes())
             {
                 rIds.insert(static_cast<SwSetExpField const*>(pF->GetField())
@@ -973,8 +973,8 @@ void _RefIdsMap::GetFieldIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds)
 /// @param[in,out] rIds The list of IDs found in the document.
 void _RefIdsMap::GetNoteIdsFromDoc( SwDoc& rDoc, std::set<sal_uInt16> &rIds)
 {
-    for( auto n = rDoc.GetFtnIdxs().size(); n; )
-        rIds.insert( rDoc.GetFtnIdxs()[ --n ]->GetSeqRefNo() );
+    for( auto n = rDoc.GetFootnoteIdxs().size(); n; )
+        rIds.insert( rDoc.GetFootnoteIdxs()[ --n ]->GetSeqRefNo() );
 }
 
 /// Initialise the aIds and aDestIds collections from the source documents.
@@ -996,12 +996,12 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField )
             AddId( GetFirstUnusedId(aIds), *pIt );
 
         // Change the Sequence number of all SetExp fields in the source document
-        SwFieldType* pType = rDoc.getIDocumentFieldsAccess().GetFldType( RES_SETEXPFLD, aName, false );
+        SwFieldType* pType = rDoc.getIDocumentFieldsAccess().GetFieldType( RES_SETEXPFLD, aName, false );
         if( pType )
         {
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-            for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
-                if( pF->GetTxtFld() )
+            SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+            for( SwFormatField* pF = aIter.First(); pF; pF = aIter.Next() )
+                if( pF->GetTextField() )
                 {
                     SwSetExpField *const pSetExp(
                             static_cast<SwSetExpField *>(pF->GetField()));
@@ -1019,10 +1019,10 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, bool bField )
             AddId( GetFirstUnusedId(aIds), *pIt );
 
         // Change the footnotes/endnotes in the source doc to the new ID
-        for ( const auto pFtnIdx : rDoc.GetFtnIdxs() )
+        for ( const auto pFootnoteIdx : rDoc.GetFootnoteIdxs() )
         {
-            sal_uInt16 const n = pFtnIdx->GetSeqRefNo();
-            pFtnIdx->SetSeqNo(sequencedIds[n]);
+            sal_uInt16 const n = pFootnoteIdx->GetSeqRefNo();
+            pFootnoteIdx->SetSeqNo(sequencedIds[n]);
         }
     }
     bInit = true;
@@ -1056,12 +1056,12 @@ void _RefIdsMap::AddId( sal_uInt16 id, sal_uInt16 seqNum )
     sequencedIds[ seqNum ] = id;
 }
 
-void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
+void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rField,
                         bool bField )
 {
     Init( rDoc, rDestDoc, bField);
 
-    sal_uInt16 const nSeqNo = rFld.GetSeqNo();
+    sal_uInt16 const nSeqNo = rField.GetSeqNo();
 
     // check if it needs to be remapped
     // if sequencedIds doesn't contain the number, it means there is no
@@ -1070,7 +1070,7 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
     // (and if it is not the same document, there's no "correct" result anyway)
     if (sequencedIds.count(nSeqNo))
     {
-        rFld.SetSeqNo( sequencedIds[nSeqNo] );
+        rField.SetSeqNo( sequencedIds[nSeqNo] );
     }
 }
 
@@ -1089,45 +1089,45 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
         {
             // when copying _to_ clipboard, expectation is that no fields exist
             // so no re-mapping is required to avoid collisions
-            assert(!rDestDoc.getIDocumentFieldsAccess().GetSysFldType(RES_GETREFFLD)->HasWriterListeners());
+            assert(!rDestDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_GETREFFLD)->HasWriterListeners());
             return; // don't modify the fields in the source doc
         }
 
         // then there are RefFields in the DescDox - so all RefFields in the SourceDoc
         // need to be converted to have unique IDs for both documents
         _RefIdsMap aFntMap( aEmptyOUStr );
-        _RefIdsMaps aFldMap;
+        _RefIdsMaps aFieldMap;
 
-        SwIterator<SwFmtFld,SwFieldType> aIter( *this );
-        for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+        SwIterator<SwFormatField,SwFieldType> aIter( *this );
+        for( SwFormatField* pField = aIter.First(); pField; pField = aIter.Next() )
         {
-            SwGetRefField& rRefFld = *static_cast<SwGetRefField*>(pFld->GetField());
-            switch( rRefFld.GetSubType() )
+            SwGetRefField& rRefField = *static_cast<SwGetRefField*>(pField->GetField());
+            switch( rRefField.GetSubType() )
             {
             case REF_SEQUENCEFLD:
                 {
                     _RefIdsMap* pMap = 0;
-                    for( auto n = aFldMap.size(); n; )
+                    for( auto n = aFieldMap.size(); n; )
                     {
-                        if( aFldMap[ --n ].GetName()==rRefFld.GetSetRefName() )
+                        if( aFieldMap[ --n ].GetName()==rRefField.GetSetRefName() )
                         {
-                            pMap = &aFldMap[ n ];
+                            pMap = &aFieldMap[ n ];
                             break;
                         }
                     }
                     if( !pMap )
                     {
-                        pMap = new _RefIdsMap( rRefFld.GetSetRefName() );
-                        aFldMap.push_back( pMap );
+                        pMap = new _RefIdsMap( rRefField.GetSetRefName() );
+                        aFieldMap.push_back( pMap );
                     }
 
-                    pMap->Check( *pDoc, rDestDoc, rRefFld, true );
+                    pMap->Check( *pDoc, rDestDoc, rRefField, true );
                 }
                 break;
 
             case REF_FOOTNOTE:
             case REF_ENDNOTE:
-                aFntMap.Check( *pDoc, rDestDoc, rRefFld, false );
+                aFntMap.Check( *pDoc, rDestDoc, rRefField, false );
                 break;
             }
         }
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index b993fd84eabc..1aa3992539fd 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -30,38 +30,38 @@
 
 using namespace ::com::sun::star;
 
-SwTblFieldType::SwTblFieldType(SwDoc* pDocPtr)
+SwTableFieldType::SwTableFieldType(SwDoc* pDocPtr)
     : SwValueFieldType( pDocPtr, RES_TABLEFLD )
 {}
 
-SwFieldType* SwTblFieldType::Copy() const
+SwFieldType* SwTableFieldType::Copy() const
 {
-    return new SwTblFieldType(GetDoc());
+    return new SwTableFieldType(GetDoc());
 }
 
-void SwTblField::CalcField( SwTblCalcPara& rCalcPara )
+void SwTableField::CalcField( SwTableCalcPara& rCalcPara )
 {
     if( rCalcPara.rCalc.IsCalcError() ) // stop if there is already an error set
         return;
 
     // create pointers from box name
-    BoxNmToPtr( rCalcPara.pTbl );
-    OUString sFml( MakeFormula( rCalcPara ));
-    SetValue( rCalcPara.rCalc.Calculate( sFml ).GetDouble() );
+    BoxNmToPtr( rCalcPara.pTable );
+    OUString sFormula( MakeFormula( rCalcPara ));
+    SetValue( rCalcPara.rCalc.Calculate( sFormula ).GetDouble() );
     ChgValid( !rCalcPara.IsStackOverflow() ); // is the value again valid?
 }
 
-SwTblField::SwTblField( SwTblFieldType* pInitType, const OUString& rFormel,
-                        sal_uInt16 nType, sal_uLong nFmt )
-    : SwValueField( pInitType, nFmt ), SwTableFormula( rFormel ),
+SwTableField::SwTableField( SwTableFieldType* pInitType, const OUString& rFormel,
+                        sal_uInt16 nType, sal_uLong nFormat )
+    : SwValueField( pInitType, nFormat ), SwTableFormula( rFormel ),
     nSubType(nType)
 {
     sExpand = "0";
 }
 
-SwField* SwTblField::Copy() const
+SwField* SwTableField::Copy() const
 {
-    SwTblField* pTmp = new SwTblField( static_cast<SwTblFieldType*>(GetTyp()),
+    SwTableField* pTmp = new SwTableField( static_cast<SwTableFieldType*>(GetTyp()),
                                         SwTableFormula::GetFormula(), nSubType, GetFormat() );
     pTmp->sExpand     = sExpand;
     pTmp->SwValueField::SetValue(GetValue());
@@ -70,33 +70,33 @@ SwField* SwTblField::Copy() const
     return pTmp;
 }
 
-OUString SwTblField::GetFieldName() const
+OUString SwTableField::GetFieldName() const
 {
-    return GetTyp()->GetName() + " " + const_cast<SwTblField *>(this)->GetCommand();
+    return GetTyp()->GetName() + " " + const_cast<SwTableField *>(this)->GetCommand();
 }
 
 /// search TextNode containing this field
-const SwNode* SwTblField::GetNodeOfFormula() const
+const SwNode* SwTableField::GetNodeOfFormula() const
 {
     if( !GetTyp()->HasWriterListeners() )
         return 0;
 
-    SwIterator<SwFmtFld,SwFieldType> aIter( *GetTyp() );
-    for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
-            if( this == pFmtFld->GetField() )
-                return &pFmtFld->GetTxtFld()->GetTxtNode();
+    SwIterator<SwFormatField,SwFieldType> aIter( *GetTyp() );
+    for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
+            if( this == pFormatField->GetField() )
+                return &pFormatField->GetTextField()->GetTextNode();
     return 0;
 }
 
-OUString SwTblField::GetCommand()
+OUString SwTableField::GetCommand()
 {
     if (EXTRNL_NAME != GetNameType())
     {
         SwNode const*const pNd = GetNodeOfFormula();
-        SwTableNode const*const pTblNd = (pNd) ? pNd->FindTableNode() : 0;
-        if (pTblNd)
+        SwTableNode const*const pTableNd = (pNd) ? pNd->FindTableNode() : 0;
+        if (pTableNd)
         {
-            PtrToBoxNm( &pTblNd->GetTable() );
+            PtrToBoxNm( &pTableNd->GetTable() );
         }
     }
     return (EXTRNL_NAME == GetNameType())
@@ -104,11 +104,11 @@ OUString SwTblField::GetCommand()
         : OUString();
 }
 
-OUString SwTblField::Expand() const
+OUString SwTableField::Expand() const
 {
     if (nSubType & nsSwExtendedSubType::SUB_CMD)
     {
-        return const_cast<SwTblField *>(this)->GetCommand();
+        return const_cast<SwTableField *>(this)->GetCommand();
     }
 
     if(nSubType & nsSwGetSetExpType::GSE_STRING)
@@ -120,33 +120,33 @@ OUString SwTblField::Expand() const
     return sExpand;
 }
 
-sal_uInt16 SwTblField::GetSubType() const
+sal_uInt16 SwTableField::GetSubType() const
 {
     return nSubType;
 }
 
-void SwTblField::SetSubType(sal_uInt16 nType)
+void SwTableField::SetSubType(sal_uInt16 nType)
 {
     nSubType = nType;
 }
 
-void SwTblField::SetValue( const double& rVal )
+void SwTableField::SetValue( const double& rVal )
 {
     SwValueField::SetValue(rVal);
     sExpand = static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, GetFormat(), GetLanguage());
 }
 
-OUString SwTblField::GetPar2() const
+OUString SwTableField::GetPar2() const
 {
     return SwTableFormula::GetFormula();
 }
 
-void SwTblField::SetPar2(const OUString& rStr)
+void SwTableField::SetPar2(const OUString& rStr)
 {
     SetFormula( rStr );
 }
 
-bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
+bool SwTableField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
 {
     bool bRet = true;
     switch ( nWhichId )
@@ -154,7 +154,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
     case FIELD_PROP_PAR2:
         {
             sal_uInt16 nOldSubType = nSubType;
-            SwTblField* pThis = const_cast<SwTblField*>(this);
+            SwTableField* pThis = const_cast<SwTableField*>(this);
             pThis->nSubType |= nsSwExtendedSubType::SUB_CMD;
             rAny <<= Expand();
             pThis->nSubType = nOldSubType;
@@ -175,7 +175,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
     return bRet;
 }
 
-bool SwTblField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
+bool SwTableField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
 {
     bool bRet = true;
     switch ( nWhichId )
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index b8aad8a1b1f0..467d0e90fe56 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -37,8 +37,8 @@ using namespace ::com::sun::star;
 
 // Userfields
 
-SwUserField::SwUserField(SwUserFieldType* pTyp, sal_uInt16 nSub, sal_uInt32 nFmt)
-    : SwValueField(pTyp, nFmt),
+SwUserField::SwUserField(SwUserFieldType* pTyp, sal_uInt16 nSub, sal_uInt32 nFormat)
+    : SwValueField(pTyp, nFormat),
     nSubType(nSub)
 {
 }
@@ -163,12 +163,12 @@ SwUserFieldType::SwUserFieldType( SwDoc* pDocPtr, const OUString& aNam )
         EnableFormat(false);    // Do not use a Numberformatter
 }
 
-OUString SwUserFieldType::Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng)
+OUString SwUserFieldType::Expand(sal_uInt32 nFormat, sal_uInt16 nSubType, sal_uInt16 nLng)
 {
     if((nType & nsSwGetSetExpType::GSE_EXPR) && !(nSubType & nsSwExtendedSubType::SUB_CMD))
     {
         EnableFormat(true);
-        return ExpandValue(nValue, nFmt, nLng);
+        return ExpandValue(nValue, nFormat, nLng);
     }
 
     EnableFormat(false);    // Do not use a Numberformatter
@@ -203,7 +203,7 @@ void SwUserFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     if ( !IsModifyLocked() )
     {
         LockModify();
-        GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )->UpdateFlds();
+        GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_INPUTFLD )->UpdateFields();
         UnlockModify();
     }
 }
@@ -229,38 +229,38 @@ double SwUserFieldType::GetValue( SwCalc& rCalc )
     return nValue;
 }
 
-OUString SwUserFieldType::GetContent( sal_uInt32 nFmt )
+OUString SwUserFieldType::GetContent( sal_uInt32 nFormat )
 {
-    if (nFmt && nFmt != SAL_MAX_UINT32)
+    if (nFormat && nFormat != SAL_MAX_UINT32)
     {
         OUString sFormattedValue;
         Color* pCol = 0;
 
         SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
 
-        pFormatter->GetOutputString(GetValue(), nFmt, sFormattedValue, &pCol);
+        pFormatter->GetOutputString(GetValue(), nFormat, sFormattedValue, &pCol);
         return sFormattedValue;
     }
 
     return aContent;
 }
 
-void SwUserFieldType::SetContent( const OUString& rStr, sal_uInt32 nFmt )
+void SwUserFieldType::SetContent( const OUString& rStr, sal_uInt32 nFormat )
 {
     if( aContent != rStr )
     {
         aContent = rStr;
 
-        if (nFmt && nFmt != SAL_MAX_UINT32)
+        if (nFormat && nFormat != SAL_MAX_UINT32)
         {
             double fValue;
 
             SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
 
-            if (pFormatter->IsNumberFormat(rStr, nFmt, fValue))
+            if (pFormatter->IsNumberFormat(rStr, nFormat, fValue))
             {
                 SetValue(fValue);
-                aContent = DoubleToString(fValue, nFmt);
+                aContent = DoubleToString(fValue, nFormat);
             }
         }
 
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 5611070ea26e..ef1a64a1de3b 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -82,7 +82,7 @@
 using namespace ::com::sun::star;
 
 // Copy for the internal clipboard. Copies all selections to the clipboard.
-bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
+bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText )
 {
     OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument"  );
 
@@ -90,35 +90,35 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
 
     // delete content if ClpDocument contains content
     SwNodeIndex aSttIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 );
-    SwTxtNode* pTxtNd = aSttIdx.GetNode().GetTxtNode();
-    if (!pTxtNd || !pTxtNd->GetTxt().isEmpty() ||
+    SwTextNode* pTextNd = aSttIdx.GetNode().GetTextNode();
+    if (!pTextNd || !pTextNd->GetText().isEmpty() ||
         aSttIdx.GetIndex()+1 != pClpDoc->GetNodes().GetEndOfContent().GetIndex() )
     {
         pClpDoc->GetNodes().Delete( aSttIdx,
             pClpDoc->GetNodes().GetEndOfContent().GetIndex() - aSttIdx.GetIndex() );
-        pTxtNd = pClpDoc->GetNodes().MakeTxtNode( aSttIdx,
-                            pClpDoc->GetDfltTxtFmtColl() );
+        pTextNd = pClpDoc->GetNodes().MakeTextNode( aSttIdx,
+                            pClpDoc->GetDfltTextFormatColl() );
         --aSttIdx;
     }
 
     // also delete surrounding FlyFrames if any
-    for( auto pFmt : *pClpDoc->GetSpzFrmFmts() )
+    for( auto pFormat : *pClpDoc->GetSpzFrameFormats() )
     {
-        SwFlyFrmFmt* pFly = static_cast<SwFlyFrmFmt*>(pFmt);
-        pClpDoc->getIDocumentLayoutAccess().DelLayoutFmt( pFly );
+        SwFlyFrameFormat* pFly = static_cast<SwFlyFrameFormat*>(pFormat);
+        pClpDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFly );
     }
     pClpDoc->GetDocumentFieldsManager().GCFieldTypes();        // delete the FieldTypes
 
     // if a string was passed, copy it to the clipboard-
     // document. Then also the Calculator can use the internal
     // clipboard
-    if( pNewClpTxt )
+    if( pNewClpText )
     {
-        pTxtNd->InsertText( *pNewClpTxt, SwIndex( pTxtNd ) );
+        pTextNd->InsertText( *pNewClpText, SwIndex( pTextNd ) );
         return true;                // das wars.
     }
 
-    pClpDoc->getIDocumentFieldsAccess().LockExpFlds();
+    pClpDoc->getIDocumentFieldsAccess().LockExpFields();
     pClpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_DELETE_REDLINES );
     bool bRet;
 
@@ -127,8 +127,8 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
     {
         // get the FlyFormat
         SwFlyFrm* pFly = FindFlyFrm();
-        SwFrmFmt* pFlyFmt = pFly->GetFmt();
-        SwFmtAnchor aAnchor( pFlyFmt->GetAnchor() );
+        SwFrameFormat* pFlyFormat = pFly->GetFormat();
+        SwFormatAnchor aAnchor( pFlyFormat->GetAnchor() );
 
         if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
             (FLY_AT_CHAR == aAnchor.GetAnchorId()) ||
@@ -138,22 +138,22 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
             SwPosition aPos( aSttIdx );
             if ( FLY_AS_CHAR == aAnchor.GetAnchorId() )
             {
-                aPos.nContent.Assign( pTxtNd, 0 );
+                aPos.nContent.Assign( pTextNd, 0 );
             }
             aAnchor.SetAnchor( &aPos );
         }
-        pFlyFmt = pClpDoc->getIDocumentLayoutAccess().CopyLayoutFmt( *pFlyFmt, aAnchor, true, true );
+        pFlyFormat = pClpDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFlyFormat, aAnchor, true, true );
 
-       // assure the "RootFmt" is the first element in Spz-Array
+       // assure the "RootFormat" is the first element in Spz-Array
         // (if necessary Flys were copied in Flys)
-        SwFrmFmts& rSpzFrmFmts = *pClpDoc->GetSpzFrmFmts();
-        if( rSpzFrmFmts[ 0 ] != pFlyFmt )
+        SwFrameFormats& rSpzFrameFormats = *pClpDoc->GetSpzFrameFormats();
+        if( rSpzFrameFormats[ 0 ] != pFlyFormat )
         {
-            SwFrmFmts::iterator it = std::find( rSpzFrmFmts.begin(), rSpzFrmFmts.end(), pFlyFmt );
-            OSL_ENSURE( it != rSpzFrmFmts.end(), "Fly not contained in Spz-Array" );
+            SwFrameFormats::iterator it = std::find( rSpzFrameFormats.begin(), rSpzFrameFormats.end(), pFlyFormat );
+            OSL_ENSURE( it != rSpzFrameFormats.end(), "Fly not contained in Spz-Array" );
 
-            rSpzFrmFmts.erase( it );
-            rSpzFrmFmts.insert( rSpzFrmFmts.begin(), pFlyFmt );
+            rSpzFrameFormats.erase( it );
+            rSpzFrameFormats.insert( rSpzFrameFormats.begin(), pFlyFormat );
         }
 
         if ( FLY_AS_CHAR == aAnchor.GetAnchorId() )
@@ -162,21 +162,21 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
             //              clipboard, it should be found at pasting. Therefore
             //              the copied TextAttribut should be removed in the node
             //              otherwise it will be recognised as TextSelektion
-            const SwIndex& rIdx = pFlyFmt->GetAnchor().GetCntntAnchor()->nContent;
-            SwTxtFlyCnt *const pTxtFly = static_cast<SwTxtFlyCnt *>(
-                pTxtNd->GetTxtAttrForCharAt(
+            const SwIndex& rIdx = pFlyFormat->GetAnchor().GetContentAnchor()->nContent;
+            SwTextFlyCnt *const pTextFly = static_cast<SwTextFlyCnt *>(
+                pTextNd->GetTextAttrForCharAt(
                     rIdx.GetIndex(), RES_TXTATR_FLYCNT));
-            if( pTxtFly )
+            if( pTextFly )
             {
-                const_cast<SwFmtFlyCnt&>(pTxtFly->GetFlyCnt()).SetFlyFmt( 0 );
-                pTxtNd->EraseText( rIdx, 1 );
+                const_cast<SwFormatFlyCnt&>(pTextFly->GetFlyCnt()).SetFlyFormat( 0 );
+                pTextNd->EraseText( rIdx, 1 );
             }
         }
         bRet = true;
     }
     else if ( IsObjSelected() )
     {
-        SwPosition aPos( aSttIdx, SwIndex( pTxtNd, 0 ));
+        SwPosition aPos( aSttIdx, SwIndex( pTextNd, 0 ));
         const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
         for ( size_t i = 0; i < rMrkList.GetMarkCount(); ++i )
         {
@@ -185,9 +185,9 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
             if( Imp()->GetDrawView()->IsGroupEntered() ||
                 ( !pObj->GetUserCall() && pObj->GetUpGroup()) )
             {
-                SfxItemSet aSet( pClpDoc->GetAttrPool(), aFrmFmtSetRange );
+                SfxItemSet aSet( pClpDoc->GetAttrPool(), aFrameFormatSetRange );
 
-                SwFmtAnchor aAnchor( FLY_AT_PARA );
+                SwFormatAnchor aAnchor( FLY_AT_PARA );
                 aAnchor.SetAnchor( &aPos );
                 aSet.Put( aAnchor );
 
@@ -200,8 +200,8 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
             else
             {
                 SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall( pObj ));
-                SwFrmFmt *pFmt = pContact->GetFmt();
-                SwFmtAnchor aAnchor( pFmt->GetAnchor() );
+                SwFrameFormat *pFormat = pContact->GetFormat();
+                SwFormatAnchor aAnchor( pFormat->GetAnchor() );
                 if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
                     (FLY_AT_CHAR == aAnchor.GetAnchorId()) ||
                     (FLY_AT_FLY  == aAnchor.GetAnchorId()) ||
@@ -210,7 +210,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
                     aAnchor.SetAnchor( &aPos );
                 }
 
-                pClpDoc->getIDocumentLayoutAccess().CopyLayoutFmt( *pFmt, aAnchor, true, true );
+                pClpDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFormat, aAnchor, true, true );
             }
         }
         bRet = true;
@@ -219,9 +219,9 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
         bRet = _CopySelToDoc( pClpDoc, 0 );     // copy the selections
 
     pClpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)0 );
-    pClpDoc->getIDocumentFieldsAccess().UnlockExpFlds();
-    if( !pClpDoc->getIDocumentFieldsAccess().IsExpFldsLocked() )
-        pClpDoc->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    pClpDoc->getIDocumentFieldsAccess().UnlockExpFields();
+    if( !pClpDoc->getIDocumentFieldsAccess().IsExpFieldsLocked() )
+        pClpDoc->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
 
     return bRet;
 }
@@ -231,8 +231,8 @@ static const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt )
     const SwFrm *pF = pFrm;
     while ( pF && !pF->Frm().IsInside( rPt ) )
     {
-        if ( pF->IsCntntFrm() )
-            pF = static_cast<const SwCntntFrm*>(pF)->GetFollow();
+        if ( pF->IsContentFrm() )
+            pF = static_cast<const SwContentFrm*>(pF)->GetFollow();
         else
             pF = 0;
     }
@@ -243,12 +243,12 @@ static const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt )
 }
 
 static bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly,
-                const Point& rInsPt, SwFEShell& rDestShell, SwFmtAnchor& rAnchor,
+                const Point& rInsPt, SwFEShell& rDestShell, SwFormatAnchor& rAnchor,
                 Point& rNewPos, bool bCheckFlyRecur )
 {
     bool bRet = true;
     rAnchor.SetAnchor( &rPos );
-    SwCntntFrm* pTmpFrm = rNd.GetCntntNode()->getLayoutFrm( rDestShell.GetLayout(), &rInsPt, 0, false );
+    SwContentFrm* pTmpFrm = rNd.GetContentNode()->getLayoutFrm( rDestShell.GetLayout(), &rInsPt, 0, false );
     SwFlyFrm *pTmpFly = pTmpFrm->FindFlyFrm();
     if( pTmpFly && bCheckFlyRecur && pFly->IsUpperOf( *pTmpFly ) )
     {
@@ -258,7 +258,7 @@ static bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm*
     {
         if( pTmpFly )
         {
-            const SwNodeIndex& rIdx = *pTmpFly->GetFmt()->GetCntnt().GetCntntIdx();
+            const SwNodeIndex& rIdx = *pTmpFly->GetFormat()->GetContent().GetContentIdx();
             SwPosition aPos( rIdx );
             rAnchor.SetAnchor( &aPos );
             rNewPos = pTmpFly->Frm().Pos();
@@ -302,10 +302,10 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
         SdrObject *pObj = aMrkList.GetMark( i )->GetMarkedSdrObj();
 
         SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall( pObj ));
-        SwFrmFmt *pFmt = pContact->GetFmt();
-        const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+        SwFrameFormat *pFormat = pContact->GetFormat();
+        const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
 
-        bool bInsWithFmt = true;
+        bool bInsWithFormat = true;
 
         if( pDestDrwView->IsGroupEntered() )
         {
@@ -319,13 +319,13 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                                         GetDoc() == pDestDoc, false );
                 pNew->NbcMove( aSiz );
                 pDestDrwView->InsertObjectAtView( pNew, *pDestPgView );
-                bInsWithFmt = false;
+                bInsWithFormat = false;
             }
         }
 
-        if( bInsWithFmt )
+        if( bInsWithFormat )
         {
-            SwFmtAnchor aAnchor( rAnchor );
+            SwFormatAnchor aAnchor( rAnchor );
             Point aNewAnch;
 
             if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
@@ -343,7 +343,7 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                     SwCrsrMoveState aState( MV_SETONLYTEXT );
                     GetLayout()->GetCrsrOfst( &aPos, aPt, &aState );
                     const SwNode *pNd;
-                    if( (pNd = &aPos.nNode.GetNode())->IsNoTxtNode() )
+                    if( (pNd = &aPos.nNode.GetNode())->IsNoTextNode() )
                         bRet = false;
                     else
                         bRet = ::lcl_SetAnchor( aPos, *pNd, 0, rInsPt,
@@ -352,7 +352,7 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                 else
                 {
                     SwPaM *pCrsr = pDestShell->GetCrsr();
-                    if( pCrsr->GetNode().IsNoTxtNode() )
+                    if( pCrsr->GetNode().IsNoTextNode() )
                         bRet = false;
                     else
                         bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(),
@@ -375,19 +375,19 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                 if( pSrcDrwView->IsGroupEntered() ||
                     ( !pObj->GetUserCall() && pObj->GetUpGroup()) )
                 {
-                    SfxItemSet aSet( pDestDoc->GetAttrPool(),aFrmFmtSetRange);
+                    SfxItemSet aSet( pDestDoc->GetAttrPool(),aFrameFormatSetRange);
                     aSet.Put( aAnchor );
                     SdrObject* pNew = pDestDoc->CloneSdrObj( *pObj, bIsMove &&
                                                 GetDoc() == pDestDoc, true );
-                    pFmt = pDestDoc->getIDocumentContentOperations().InsertDrawObj( *pDestShell->GetCrsr(), *pNew, aSet );
+                    pFormat = pDestDoc->getIDocumentContentOperations().InsertDrawObj( *pDestShell->GetCrsr(), *pNew, aSet );
                 }
                 else
-                    pFmt = pDestDoc->getIDocumentLayoutAccess().CopyLayoutFmt( *pFmt, aAnchor, true, true );
+                    pFormat = pDestDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFormat, aAnchor, true, true );
 
                 // Can be 0, as Draws are not allowed in Headers/Footers
-                if ( pFmt )
+                if ( pFormat )
                 {
-                    SdrObject* pNew = pFmt->FindSdrObject();
+                    SdrObject* pNew = pFormat->FindSdrObject();
                     if ( FLY_AS_CHAR != aAnchor.GetAnchorId() )
                     {
                         Point aPos( rInsPt );
@@ -395,13 +395,13 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                         aPos -= rSttPt - pObj->GetSnapRect().TopLeft();
                         // OD 2004-04-05 #i26791# - change attributes instead of
                         // direct positioning
-                        pFmt->SetFmtAttr( SwFmtHoriOrient( aPos.getX(), text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
-                        pFmt->SetFmtAttr( SwFmtVertOrient( aPos.getY(), text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
+                        pFormat->SetFormatAttr( SwFormatHoriOrient( aPos.getX(), text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
+                        pFormat->SetFormatAttr( SwFormatVertOrient( aPos.getY(), text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
                         // #i47455# - notify draw frame format
                         // that position attributes are already set.
-                        if ( pFmt->ISA(SwDrawFrmFmt) )
+                        if ( pFormat->ISA(SwDrawFrameFormat) )
                         {
-                            static_cast<SwDrawFrmFmt*>(pFmt)->PosAttrSet();
+                            static_cast<SwDrawFrameFormat*>(pFormat)->PosAttrSet();
                         }
                     }
                     if( bSelectInsert )
@@ -449,7 +449,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
     SET_CURR_SHELL( pDestShell );
 
     pDestShell->StartAllAction();
-    pDestShell->GetDoc()->getIDocumentFieldsAccess().LockExpFlds();
+    pDestShell->GetDoc()->getIDocumentFieldsAccess().LockExpFields();
 
     // Shift references
     bool bCopyIsMove = mpDoc->IsCopyIsMove();
@@ -463,13 +463,13 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
     // If there are table formulas in the area, then display the table first
     // so that the table formula can calculate a new value first
     // (individual boxes in the area are retrieved via the layout)
-     SwFieldType* pTblFldTyp = pDestShell->GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_TABLEFLD );
+     SwFieldType* pTableFieldTyp = pDestShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_TABLEFLD );
 
     if( IsFrmSelected() )
     {
         SwFlyFrm* pFly = FindFlyFrm();
-        SwFrmFmt* pFlyFmt = pFly->GetFmt();
-        SwFmtAnchor aAnchor( pFlyFmt->GetAnchor() );
+        SwFrameFormat* pFlyFormat = pFly->GetFormat();
+        SwFormatAnchor aAnchor( pFlyFormat->GetAnchor() );
         bRet = true;
         Point aNewAnch;
 
@@ -488,12 +488,12 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
                 SwCrsrMoveState aState( MV_SETONLYTEXT );
                 GetLayout()->GetCrsrOfst( &aPos, aPt, &aState );
                 const SwNode *pNd;
-                if( (pNd = &aPos.nNode.GetNode())->IsNoTxtNode() )
+                if( (pNd = &aPos.nNode.GetNode())->IsNoTextNode() )
                     bRet = false;
                 else
                 {
                     // do not copy in itself
-                    const SwNodeIndex *pTmp = pFlyFmt->GetCntnt().GetCntntIdx();
+                    const SwNodeIndex *pTmp = pFlyFormat->GetContent().GetContentIdx();
                     if ( aPos.nNode > *pTmp && aPos.nNode <
                         pTmp->GetNode().EndOfSectionIndex() )
                     {
@@ -507,7 +507,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
             else
             {
                 const SwPaM *pCrsr = pDestShell->GetCrsr();
-                if( pCrsr->GetNode().IsNoTxtNode() )
+                if( pCrsr->GetNode().IsNoTextNode() )
                     bRet = false;
                 else
                     bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(), pCrsr->GetNode(),
@@ -529,27 +529,27 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
 
         if( bRet )
         {
-            SwFrmFmt *pOldFmt = pFlyFmt;
-            pFlyFmt = pDestShell->GetDoc()->getIDocumentLayoutAccess().CopyLayoutFmt( *pFlyFmt, aAnchor, true, true );
+            SwFrameFormat *pOldFormat = pFlyFormat;
+            pFlyFormat = pDestShell->GetDoc()->getIDocumentLayoutAccess().CopyLayoutFormat( *pFlyFormat, aAnchor, true, true );
 
             if ( FLY_AS_CHAR != aAnchor.GetAnchorId() )
             {
                 Point aPos( rInsPt );
                 aPos -= aNewAnch;
                 aPos -= rSttPt - pFly->Frm().Pos();
-                pFlyFmt->SetFmtAttr( SwFmtHoriOrient( aPos.getX(),text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
-                pFlyFmt->SetFmtAttr( SwFmtVertOrient( aPos.getY(),text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
+                pFlyFormat->SetFormatAttr( SwFormatHoriOrient( aPos.getX(),text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
+                pFlyFormat->SetFormatAttr( SwFormatVertOrient( aPos.getY(),text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
             }
 
             const Point aPt( pDestShell->GetCrsrDocPos() );
 
             if( bIsMove )
-                GetDoc()->getIDocumentLayoutAccess().DelLayoutFmt( pOldFmt );
+                GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat( pOldFormat );
 
             // only select if it can be shifted/copied in the same shell
             if( bSelectInsert )
             {
-                SwFlyFrm* pFlyFrm = static_cast<SwFlyFrmFmt*>(pFlyFmt)->GetFrm( &aPt, false );
+                SwFlyFrm* pFlyFrm = static_cast<SwFlyFrameFormat*>(pFlyFormat)->GetFrm( &aPt, false );
                 if( pFlyFrm )
                 {
                     //JP 12.05.98: should this be in SelectFlyFrm???
@@ -571,11 +571,11 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
         // Sizes will be corrected by percentage.
 
         // find boxes via the layout
-        const SwTableNode* pTblNd;
+        const SwTableNode* pTableNd;
         SwSelBoxes aBoxes;
-        GetTblSel( *this, aBoxes );
+        GetTableSel( *this, aBoxes );
         if( !aBoxes.empty() &&
-            0 != (pTblNd = aBoxes[0]->GetSttNd()->FindTableNode()) )
+            0 != (pTableNd = aBoxes[0]->GetSttNd()->FindTableNode()) )
         {
             SwPosition* pDstPos = 0;
             if( this == pDestShell )
@@ -585,10 +585,10 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
                 pDstPos = new SwPosition( *GetCrsr()->GetPoint() );
                 Point aPt( rInsPt );
                 GetLayout()->GetCrsrOfst( pDstPos, aPt );
-                if( !pDstPos->nNode.GetNode().IsNoTxtNode() )
+                if( !pDstPos->nNode.GetNode().IsNoTextNode() )
                     bRet = true;
             }
-            else if( !pDestShell->GetCrsr()->GetNode().IsNoTxtNode() )
+            else if( !pDestShell->GetCrsr()->GetNode().IsNoTextNode() )
             {
                 pDstPos = new SwPosition( *pDestShell->GetCrsr()->GetPoint() );
                 bRet = true;
@@ -597,11 +597,11 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
             if( bRet )
             {
                 if( GetDoc() == pDestShell->GetDoc() )
-                    ParkTblCrsr();
+                    ParkTableCrsr();
 
-                bRet = pDestShell->GetDoc()->InsCopyOfTbl( *pDstPos, aBoxes,0,
+                bRet = pDestShell->GetDoc()->InsCopyOfTable( *pDstPos, aBoxes,0,
                                         bIsMove && this == pDestShell &&
-                                        aBoxes.size() == pTblNd->GetTable().
+                                        aBoxes.size() == pTableNd->GetTable().
                                         GetTabSortBoxes().size(),
                                         this != pDestShell );
 
@@ -630,9 +630,9 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
             SwPosition aPos( *GetCrsr()->GetPoint() );
             Point aPt( rInsPt );
             GetLayout()->GetCrsrOfst( &aPos, aPt );
-            bRet = !aPos.nNode.GetNode().IsNoTxtNode();
+            bRet = !aPos.nNode.GetNode().IsNoTextNode();
         }
-        else if( pDestShell->GetCrsr()->GetNode().IsNoTxtNode() )
+        else if( pDestShell->GetCrsr()->GetNode().IsNoTextNode() )
             bRet = false;
 
         if( bRet )
@@ -643,7 +643,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
     mpDoc->SetCopyIsMove( bCopyIsMove );
 
     // have new table formules been inserted?
-    if( pTblFldTyp->HasWriterListeners() )
+    if( pTableFieldTyp->HasWriterListeners() )
     {
         // finish old actions: the table frames are created and
         // a selection can be made
@@ -654,8 +654,8 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
         for( ; nActCnt; --nActCnt )
             pDestShell->StartAllAction();
     }
-    pDestShell->GetDoc()->getIDocumentFieldsAccess().UnlockExpFlds();
-    pDestShell->GetDoc()->getIDocumentFieldsAccess().UpdateFlds(NULL, false);
+    pDestShell->GetDoc()->getIDocumentFieldsAccess().UnlockExpFields();
+    pDestShell->GetDoc()->getIDocumentFieldsAccess().UpdateFields(NULL, false);
 
     pDestShell->EndAllAction();
     return bRet;
@@ -681,12 +681,12 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
     // If there are table formulas in the area, then display the table first
     // so that the table formula can calculate a new value first
     // (individual boxes in the area are retrieved via the layout)
-    SwFieldType* pTblFldTyp = GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_TABLEFLD );
+    SwFieldType* pTableFieldTyp = GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_TABLEFLD );
 
     SwTableNode *pDestNd, *pSrcNd = aCpyPam.GetNode().GetTableNode();
     if( !pSrcNd )                               // TabellenNode ?
     {                                           // nicht ueberspringen!!
-        SwCntntNode* pCNd = aCpyPam.GetNode().GetCntntNode();
+        SwContentNode* pCNd = aCpyPam.GetNode().GetContentNode();
         if( pCNd )
             aCpyPam.GetPoint()->nContent.Assign( pCNd, 0 );
         else if( !aCpyPam.Move( fnMoveForward, fnGoNode ))
@@ -699,7 +699,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
     bool bRet = true;
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
-    GetDoc()->getIDocumentFieldsAccess().LockExpFlds();
+    GetDoc()->getIDocumentFieldsAccess().LockExpFields();
 
     // When the clipboard content has been created by a rectangular selection
     // the pasting is more sophisticated:
@@ -737,8 +737,8 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
         while( nCount )
         {
             --nCount;
-            OSL_ENSURE( aIdx.GetNode().GetCntntNode(), "Who filled the clipboard?!" );
-            if( aIdx.GetNode().GetCntntNode() ) // robust
+            OSL_ENSURE( aIdx.GetNode().GetContentNode(), "Who filled the clipboard?!" );
+            if( aIdx.GetNode().GetContentNode() ) // robust
             {
                 Insertion aInsertion( PaMPtr( new SwPaM( aIdx ) ),
                     PositionPtr( new SwPosition( aInsertPos ) ) );
@@ -769,7 +769,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                     aInsertion.first->GetPoint()->nNode = aIdx;
                 else
                     aInsertion.first->GetPoint()->nContent =
-                        aInsertion.first->GetCntntNode()->Len();
+                        aInsertion.first->GetContentNode()->Len();
                 aCopyList.push_back( aInsertion );
             }
             // If there are no text portions left but there are some more
@@ -806,19 +806,19 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                     aPaM.GetDoc()->MakeUniqueNumRules(aPaM);
                 }
             }
-            SaveTblBoxCntnt( &rInsPos );
+            SaveTableBoxContent( &rInsPos );
             ++pCurr;
         }
     }
     else
     {
-        bool bDelTbl = true;
+        bool bDelTable = true;
 
         for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
         {
 
             if( pSrcNd &&
-                0 != ( pDestNd = GetDoc()->IsIdxInTbl( rPaM.GetPoint()->nNode )) &&
+                0 != ( pDestNd = GetDoc()->IsIdxInTable( rPaM.GetPoint()->nNode )) &&
                 // are we at the beginning of the cell? (if not, we will insert a nested table)
                 // first paragraph of the cell?
                 rPaM.GetNode().GetIndex() == rPaM.GetNode().FindTableBoxStartNode()->GetIndex()+1 &&
@@ -827,7 +827,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
             {
                 SwPosition aDestPos( *rPaM.GetPoint() );
 
-                bool bParkTblCrsr = false;
+                bool bParkTableCrsr = false;
                 const SwStartNode* pSttNd =  rPaM.GetNode().FindTableBoxStartNode();
 
                 // TABLE IN TABLE: copy table in table
@@ -835,71 +835,71 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                 SwSelBoxes aBoxes;
                 if( IsTableMode() )     // table selection?
                 {
-                    GetTblSel( *this, aBoxes );
-                    ParkTblCrsr();
-                    bParkTblCrsr = true;
+                    GetTableSel( *this, aBoxes );
+                    ParkTableCrsr();
+                    bParkTableCrsr = true;
                 }
                 else if( !rPaM.HasMark() && rPaM.GetNext() == &rPaM &&
-                     ( !pSrcNd->GetTable().IsTblComplex() ||
+                     ( !pSrcNd->GetTable().IsTableComplex() ||
                        pDestNd->GetTable().IsNewModel() ) )
                 {
                     // make relative table copy
-                    SwTableBox* pBox = pDestNd->GetTable().GetTblBox(
+                    SwTableBox* pBox = pDestNd->GetTable().GetTableBox(
                                         pSttNd->GetIndex() );
                     OSL_ENSURE( pBox, "Box steht nicht in dieser Tabelle" );
                     aBoxes.insert( pBox );
                 }
 
                 SwNodeIndex aNdIdx( *pDestNd->EndOfSectionNode());
-                if( !bParkTblCrsr )
+                if( !bParkTableCrsr )
                 {
                     // exit first the complete table
                     // ???? what about only table in a frame ?????
-                    SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
+                    SwContentNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
                     SwPosition aPos( aNdIdx, SwIndex( pCNd, 0 ));
                     // #i59539: Don't remove all redline
                     SwPaM const tmpPaM(*pDestNd, *pDestNd->EndOfSectionNode());
                     ::PaMCorrAbs(tmpPaM, aPos);
                 }
 
-                bRet = GetDoc()->InsCopyOfTbl( aDestPos, aBoxes, &pSrcNd->GetTable(),
+                bRet = GetDoc()->InsCopyOfTable( aDestPos, aBoxes, &pSrcNd->GetTable(),
                                             false, false );
 
-                if( bParkTblCrsr )
+                if( bParkTableCrsr )
                     GetCrsr();
                 else
                 {
                     // return to the box
                     aNdIdx = *pSttNd;
-                    SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
+                    SwContentNode* pCNd = GetDoc()->GetNodes().GoNext( &aNdIdx );
                     SwPosition aPos( aNdIdx, SwIndex( pCNd, 0 ));
                     // #i59539: Don't remove all redline
                     SwNode & rNode(rPaM.GetPoint()->nNode.GetNode());
-                    SwCntntNode *const pCntntNode( rNode.GetCntntNode() );
+                    SwContentNode *const pContentNode( rNode.GetContentNode() );
                     SwPaM const tmpPam(rNode, 0,
-                                   rNode, (pCntntNode) ? pCntntNode->Len() : 0);
+                                   rNode, (pContentNode) ? pContentNode->Len() : 0);
                     ::PaMCorrAbs(tmpPam, aPos);
                 }
 
                 break;      // exit the "while-loop"
             }
             else if( *aCpyPam.GetPoint() == *aCpyPam.GetMark() &&
-                 pClpDoc->GetSpzFrmFmts()->size() )
+                 pClpDoc->GetSpzFrameFormats()->size() )
             {
                 // we need a DrawView
                 if( !Imp()->GetDrawView() )
                     MakeDrawView();
 
-                std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pClpDoc);
-                for ( auto pCpyFmt : *pClpDoc->GetSpzFrmFmts() )
+                std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pClpDoc);
+                for ( auto pCpyFormat : *pClpDoc->GetSpzFrameFormats() )
                 {
-                    bool bInsWithFmt = true;
+                    bool bInsWithFormat = true;
 
                     if( Imp()->GetDrawView()->IsGroupEntered() &&
-                        RES_DRAWFRMFMT == pCpyFmt->Which() &&
-                        (FLY_AS_CHAR != pCpyFmt->GetAnchor().GetAnchorId()) )
+                        RES_DRAWFRMFMT == pCpyFormat->Which() &&
+                        (FLY_AS_CHAR != pCpyFormat->GetAnchor().GetAnchorId()) )
                     {
-                        const SdrObject* pSdrObj = pCpyFmt->FindSdrObject();
+                        const SdrObject* pSdrObj = pCpyFormat->FindSdrObject();
                         if( pSdrObj )
                         {
                             SdrObject* pNew = GetDoc()->CloneSdrObj( *pSdrObj,
@@ -938,29 +938,29 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                             pNew->NbcSetAnchorPos( aGrpAnchor );
                             pNew->SetSnapRect( aSnapRect );
 
-                            bInsWithFmt = false;
+                            bInsWithFormat = false;
                         }
                     }
 
-                    if( bInsWithFmt  )
+                    if( bInsWithFormat  )
                     {
-                        SwFmtAnchor aAnchor( pCpyFmt->GetAnchor() );
+                        SwFormatAnchor aAnchor( pCpyFormat->GetAnchor() );
                         if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
                             (FLY_AT_CHAR == aAnchor.GetAnchorId()) ||
                             (FLY_AS_CHAR == aAnchor.GetAnchorId()))
                         {
                             SwPosition* pPos = rPaM.GetPoint();
                             // allow shapes (no controls) in header/footer
-                            if( RES_DRAWFRMFMT == pCpyFmt->Which() &&
+                            if( RES_DRAWFRMFMT == pCpyFormat->Which() &&
                                 GetDoc()->IsInHeaderFooter( pPos->nNode ) )
                             {
-                                const SdrObject *pCpyObj = pCpyFmt->FindSdrObject();
+                                const SdrObject *pCpyObj = pCpyFormat->FindSdrObject();
                                 if (pCpyObj && CheckControlLayer(pCpyObj))
                                     continue;
                             }
 
-                            // Ignore TextBoxes, they are already handled in sw::DocumentLayoutManager::CopyLayoutFmt().
-                            if (aTextBoxes.find(pCpyFmt) != aTextBoxes.end())
+                            // Ignore TextBoxes, they are already handled in sw::DocumentLayoutManager::CopyLayoutFormat().
+                            if (aTextBoxes.find(pCpyFormat) != aTextBoxes.end())
                                 continue;
 
                             aAnchor.SetAnchor( pPos );
@@ -976,14 +976,14 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                                         0, aPt, *this, aAnchor, aPt, false );
                         }
 
-                        SwFrmFmt * pNew = GetDoc()->getIDocumentLayoutAccess().CopyLayoutFmt( *pCpyFmt, aAnchor, true, true );
+                        SwFrameFormat * pNew = GetDoc()->getIDocumentLayoutAccess().CopyLayoutFormat( *pCpyFormat, aAnchor, true, true );
 
                         if( pNew )
                         {
                             if( RES_FLYFRMFMT == pNew->Which() )
                             {
                                 const Point aPt( GetCrsrDocPos() );
-                                SwFlyFrm* pFlyFrm = static_cast<SwFlyFrmFmt*>(pNew)->
+                                SwFlyFrm* pFlyFrm = static_cast<SwFlyFrameFormat*>(pNew)->
                                                         GetFrm( &aPt, false );
                                 if( pFlyFrm )
                                     SelectFlyFrm( *pFlyFrm, true );
@@ -1006,9 +1006,9 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                                 pDV->MarkObj( pObj, pDV->GetSdrPageView() );
                                 // #i47455# - notify draw frame format
                                 // that position attributes are already set.
-                                if ( pNew->ISA(SwDrawFrmFmt) )
+                                if ( pNew->ISA(SwDrawFrameFormat) )
                                 {
-                                    static_cast<SwDrawFrmFmt*>(pNew)->PosAttrSet();
+                                    static_cast<SwDrawFrameFormat*>(pNew)->PosAttrSet();
                                 }
                             }
                         }
@@ -1017,10 +1017,10 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
             }
             else
             {
-                if( bDelTbl && IsTableMode() )
+                if( bDelTable && IsTableMode() )
                 {
                     SwEditShell::Delete();
-                    bDelTbl = false;
+                    bDelTable = false;
                 }
 
                 SwPosition& rInsPos = *rPaM.GetPoint();
@@ -1064,15 +1064,15 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                     for (sal_uLong nIdx = aPaM.Start()->nNode.GetIndex();
                         nIdx <= nEndIdx; ++nIdx)
                     {
-                        SwTxtNode *const pTxtNode = rDestNodes[nIdx]->GetTxtNode();
-                        if ( pTxtNode )
+                        SwTextNode *const pTextNode = rDestNodes[nIdx]->GetTextNode();
+                        if ( pTextNode )
                         {
-                            GetDoc()->UpdateParRsid( pTxtNode );
+                            GetDoc()->UpdateParRsid( pTextNode );
                         }
                     }
                 }
 
-                SaveTblBoxCntnt( &rInsPos );
+                SaveTableBoxContent( &rInsPos );
                 if(bIncludingPageFrames && bStartWithTable)
                 {
                     //remove the paragraph in front of the table
@@ -1080,19 +1080,19 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
                     GetDoc()->getIDocumentContentOperations().DelFullPara(aPara);
                 }
                 //additionally copy page bound frames
-                if( bIncludingPageFrames && pClpDoc->GetSpzFrmFmts()->size() )
+                if( bIncludingPageFrames && pClpDoc->GetSpzFrameFormats()->size() )
                 {
                     // create a draw view if necessary
                     if( !Imp()->GetDrawView() )
                         MakeDrawView();
 
-                    for ( auto pCpyFmt : *pClpDoc->GetSpzFrmFmts() )
+                    for ( auto pCpyFormat : *pClpDoc->GetSpzFrameFormats() )
                     {
-                        SwFmtAnchor aAnchor( pCpyFmt->GetAnchor() );
+                        SwFormatAnchor aAnchor( pCpyFormat->GetAnchor() );
                         if ( FLY_AT_PAGE != aAnchor.GetAnchorId() )
                             continue;
                         aAnchor.SetPageNum( aAnchor.GetPageNum() + nStartPageNumber - 1 );
-                        GetDoc()->getIDocumentLayoutAccess().CopyLayoutFmt( *pCpyFmt, aAnchor, true, true );
+                        GetDoc()->getIDocumentLayoutAccess().CopyLayoutFormat( *pCpyFormat, aAnchor, true, true );
                     }
                 }
             }
@@ -1102,7 +1102,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
     GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, NULL );
 
     // have new table formulas been inserted?
-    if( pTblFldTyp->HasWriterListeners() )
+    if( pTableFieldTyp->HasWriterListeners() )
     {
         // finish old action: table-frames have been created
         // a selection can be made now
@@ -1113,8 +1113,8 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
         for( ; nActCnt; --nActCnt )
             StartAllAction();
     }
-    GetDoc()->getIDocumentFieldsAccess().UnlockExpFlds();
-    GetDoc()->getIDocumentFieldsAccess().UpdateFlds(NULL, false);
+    GetDoc()->getIDocumentFieldsAccess().UnlockExpFields();
+    GetDoc()->getIDocumentFieldsAccess().UpdateFields(NULL, false);
     EndAllAction();
 
     return bRet;
@@ -1146,9 +1146,9 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
     {
         //insert a paragraph
         StartUndo(UNDO_INSERT);
-        SwNodeIndex aTblIdx(  *pTableNode, -1 );
-        SwPosition aBefore(aTblIdx);
-        if(GetDoc()->getIDocumentContentOperations().AppendTxtNode( aBefore ))
+        SwNodeIndex aTableIdx(  *pTableNode, -1 );
+        SwPosition aBefore(aTableIdx);
+        if(GetDoc()->getIDocumentContentOperations().AppendTextNode( aBefore ))
         {
             SwPaM aTmp(aBefore);
             aCpyPam = aTmp;
@@ -1163,7 +1163,7 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
     SET_CURR_SHELL( this );
 
     StartAllAction();
-    GetDoc()->getIDocumentFieldsAccess().LockExpFlds();
+    GetDoc()->getIDocumentFieldsAccess().LockExpFields();
     SetSelection(aCpyPam);
     // copy the text of the selection
     SwEditShell::Copy(&rToFill);
@@ -1179,15 +1179,15 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
     }
     // now the page bound objects
     // additionally copy page bound frames
-    if( GetDoc()->GetSpzFrmFmts()->size() )
+    if( GetDoc()->GetSpzFrameFormats()->size() )
     {
         // create a draw view if necessary
         if( !rToFill.Imp()->GetDrawView() )
             rToFill.MakeDrawView();
 
-        for ( auto pCpyFmt : *GetDoc()->GetSpzFrmFmts() )
+        for ( auto pCpyFormat : *GetDoc()->GetSpzFrameFormats() )
         {
-            SwFmtAnchor aAnchor( pCpyFmt->GetAnchor() );
+            SwFormatAnchor aAnchor( pCpyFormat->GetAnchor() );
             if ((FLY_AT_PAGE == aAnchor.GetAnchorId()) &&
                     aAnchor.GetPageNum() >= nStartPage && aAnchor.GetPageNum() <= nEndPage)
             {
@@ -1195,18 +1195,18 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
             }
             else
                 continue;
-            rToFill.GetDoc()->getIDocumentLayoutAccess().CopyLayoutFmt( *pCpyFmt, aAnchor, true, true );
+            rToFill.GetDoc()->getIDocumentLayoutAccess().CopyLayoutFormat( *pCpyFormat, aAnchor, true, true );
         }
     }
-    GetDoc()->getIDocumentFieldsAccess().UnlockExpFlds();
-    GetDoc()->getIDocumentFieldsAccess().UpdateFlds(NULL, false);
+    GetDoc()->getIDocumentFieldsAccess().UnlockExpFields();
+    GetDoc()->getIDocumentFieldsAccess().UpdateFields(NULL, false);
     Pop(false);
     EndAllAction();
 
     return true;
 }
 
-bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) const
+bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) const
 {
     OSL_ENSURE( Imp()->HasDrawView(), "GetDrawObjGraphic without DrawView?" );
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
@@ -1223,7 +1223,7 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) co
                 if ( pGrf )
                 {
                     Graphic aGrf( *pGrf );
-                    if( SotClipboardFormatId::GDIMETAFILE == nFmt )
+                    if( SotClipboardFormatId::GDIMETAFILE == nFormat )
                     {
                         if( GRAPHIC_BITMAP != aGrf.GetType() )
                         {
@@ -1281,9 +1281,9 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) co
                 }
             }
         }
-        else if( SotClipboardFormatId::GDIMETAFILE == nFmt )
+        else if( SotClipboardFormatId::GDIMETAFILE == nFormat )
             rGrf = Imp()->GetDrawView()->GetMarkedObjMetaFile();
-        else if( SotClipboardFormatId::BITMAP == nFmt || SotClipboardFormatId::PNG == nFmt )
+        else if( SotClipboardFormatId::BITMAP == nFormat || SotClipboardFormatId::PNG == nFormat )
             rGrf = Imp()->GetDrawView()->GetMarkedObjBitmapEx();
     }
     return bConvert;
@@ -1368,14 +1368,14 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
         {
         case SW_PASTESDR_REPLACE:
             {
-                const SwFrmFmt* pFmt(0);
+                const SwFrameFormat* pFormat(0);
                 const SwFrm* pAnchor(0);
                 if( pOldObj->ISA(SwVirtFlyDrawObj) )
                 {
-                    pFmt = FindFrmFmt( pOldObj );
+                    pFormat = FindFrameFormat( pOldObj );
 
                     Point aNullPt;
-                    SwFlyFrm* pFlyFrm = static_cast<const SwFlyFrmFmt*>(pFmt)->GetFrm( &aNullPt );
+                    SwFlyFrm* pFlyFrm = static_cast<const SwFlyFrameFormat*>(pFormat)->GetFrm( &aNullPt );
                     pAnchor = pFlyFrm ? pFlyFrm->GetAnchorFrm() : NULL;
 
                     if (!pAnchor || pAnchor->FindFooterOrHeader())
@@ -1412,12 +1412,12 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
                     // store attributes, then set SdrObject
                     SfxItemSet aFrmSet( mpDoc->GetAttrPool(),
                                             RES_SURROUND, RES_ANCHOR );
-                    aFrmSet.Set( pFmt->GetAttrSet() );
+                    aFrmSet.Set( pFormat->GetAttrSet() );
 
                     Point aNullPt;
-                    if( pAnchor->IsTxtFrm() && static_cast<const SwTxtFrm*>(pAnchor)->IsFollow() )
+                    if( pAnchor->IsTextFrm() && static_cast<const SwTextFrm*>(pAnchor)->IsFollow() )
                     {
-                        const SwTxtFrm* pTmp = static_cast<const SwTxtFrm*>(pAnchor);
+                        const SwTextFrm* pTmp = static_cast<const SwTextFrm*>(pAnchor);
                         do {
                             pTmp = pTmp->FindMaster();
                             OSL_ENSURE( pTmp, "Where's my Master?" );
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index d6a24296fe7a..35d9210e26f8 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -61,12 +61,12 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
     SET_CURR_SHELL( this );
     while ( pPage )
     {
-        pFlow = pPage->FindFirstBodyCntnt();
+        pFlow = pPage->FindFirstBodyContent();
         if ( pFlow )
         {
             if ( pFlow->IsInTab() )
                 pFlow = pFlow->FindTabFrm();
-            const SwFmtPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc();
+            const SwFormatPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc();
             if( rPgDesc.GetPageDesc() )
             {
                 // wir haben ihn den Schlingel
@@ -79,24 +79,24 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
     if ( !pPage )
     {
         pPage = static_cast<SwPageFrm*>(GetLayout()->Lower());
-        pFlow = pPage->FindFirstBodyCntnt();
+        pFlow = pPage->FindFirstBodyContent();
         if ( !pFlow )
         {
             pPage   = static_cast<SwPageFrm*>(pPage->GetNext());
-            pFlow = pPage->FindFirstBodyCntnt();
+            pFlow = pPage->FindFirstBodyContent();
             OSL_ENSURE( pFlow, "Dokuemnt ohne Inhalt?!?" );
         }
     }
 
     // use pagenumber
-    SwFmtPageDesc aNew( &rDesc );
+    SwFormatPageDesc aNew( &rDesc );
     aNew.SetNumOffset( oPageNumOffset );
 
     if ( pFlow->IsInTab() )
-        GetDoc()->SetAttr( aNew, *(SwFmt*)pFlow->FindTabFrm()->GetFmt() );
+        GetDoc()->SetAttr( aNew, *(SwFormat*)pFlow->FindTabFrm()->GetFormat() );
     else
     {
-        SwPaM aPaM( *static_cast<const SwCntntFrm*>(pFlow)->GetNode() );
+        SwPaM aPaM( *static_cast<const SwContentFrm*>(pFlow)->GetNode() );
         GetDoc()->getIDocumentContentOperations().InsertPoolItem( aPaM, aNew );
     }
     EndAllActionAndCall();
@@ -178,7 +178,7 @@ size_t SwFEShell::GetCurPageDesc( const bool bCalcFrm ) const
 // Otherwise return 0 pointer
 const SwPageDesc* SwFEShell::GetSelectedPageDescs() const
 {
-    const SwCntntNode* pCNd;
+    const SwContentNode* pCNd;
     const SwFrm* pMkFrm, *pPtFrm;
     const SwPageDesc* pFnd, *pRetDesc = reinterpret_cast<SwPageDesc*>(sal_IntPtr(-1));
     const Point aNulPt;
@@ -186,14 +186,14 @@ const SwPageDesc* SwFEShell::GetSelectedPageDescs() const
     for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
     {
 
-        if( 0 != (pCNd = rPaM.GetCntntNode() ) &&
+        if( 0 != (pCNd = rPaM.GetContentNode() ) &&
             0 != ( pPtFrm = pCNd->getLayoutFrm( GetLayout(), &aNulPt, 0, false )) )
             pPtFrm = pPtFrm->FindPageFrm();
         else
             pPtFrm = 0;
 
         if( rPaM.HasMark() &&
-            0 != (pCNd = rPaM.GetCntntNode( false ) ) &&
+            0 != (pCNd = rPaM.GetContentNode( false ) ) &&
             0 != ( pMkFrm = pCNd->getLayoutFrm( GetLayout(), &aNulPt, 0, false )) )
             pMkFrm = pMkFrm->FindPageFrm();
         else
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index a7b1c1f7b756..2937f04928e4 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -75,7 +75,7 @@ using namespace ::com::sun::star;
 
 // Based on the request, changes to the specific layouts will be made, to
 // fit to the format
-static bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor,
+static bool lcl_SetNewFlyPos( const SwNode& rNode, SwFormatAnchor& rAnchor,
                         const Point& rPt )
 {
     bool bRet = false;
@@ -88,8 +88,8 @@ static bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor,
     }
     else
     {
-        const SwCntntNode *pCntNd = rNode.GetCntntNode();
-        const SwCntntFrm* pCFrm = pCntNd ? pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, 0, false ) : 0;
+        const SwContentNode *pCntNd = rNode.GetContentNode();
+        const SwContentFrm* pCFrm = pCntNd ? pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, 0, false ) : 0;
         const SwPageFrm *pPg = pCFrm ? pCFrm->FindPageFrm() : 0;
 
         rAnchor.SetPageNum( pPg ? pPg->GetPhyPageNum() : 1 );
@@ -105,7 +105,7 @@ static bool lcl_FindAnchorPos(
     SfxItemSet& rSet )
 {
     bool bRet = true;
-    SwFmtAnchor aNewAnch( static_cast<const SwFmtAnchor&>(rSet.Get( RES_ANCHOR )) );
+    SwFormatAnchor aNewAnch( static_cast<const SwFormatAnchor&>(rSet.Get( RES_ANCHOR )) );
     RndStdIds nNew = aNewAnch.GetAnchorId();
     const SwFrm *pNewAnch;
 
@@ -118,7 +118,7 @@ static bool lcl_FindAnchorPos(
     case FLY_AT_CHAR: // LAYER_IMPL
         {
             // starting from the upper-left corner of the Fly,
-            // search nearest CntntFrm
+            // search nearest ContentFrm
             const SwFrm* pFrm = rFrm.IsFlyFrm() ? static_cast<const SwFlyFrm&>(rFrm).GetAnchorFrm()
                                                 : &rFrm;
             pNewAnch = ::FindAnchor( pFrm, aTmpPnt );
@@ -128,7 +128,7 @@ static bool lcl_FindAnchorPos(
                 break;
             }
 
-            SwPosition aPos( *static_cast<const SwCntntFrm*>(pNewAnch)->GetNode() );
+            SwPosition aPos( *static_cast<const SwContentFrm*>(pNewAnch)->GetNode() );
             if ((FLY_AT_CHAR == nNew) || (FLY_AS_CHAR == nNew))
             {
                 // textnode should be found, as only in those
@@ -137,7 +137,7 @@ static bool lcl_FindAnchorPos(
                 aTmpPnt.setX(aTmpPnt.getX() - 1);                   // do not land in the fly!
                 if( !pNewAnch->GetCrsrOfst( &aPos, aTmpPnt, &aState ) )
                 {
-                    SwCntntNode* pCNd = const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(pNewAnch))->GetNode();
+                    SwContentNode* pCNd = const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pNewAnch))->GetNode();
                     if( pNewAnch->Frm().Bottom() < aTmpPnt.Y() )
                         pCNd->MakeStartIndex( &aPos.nContent );
                     else
@@ -145,9 +145,9 @@ static bool lcl_FindAnchorPos(
                 }
                 else
                 {
-                    if ( SwCrsrShell::PosInsideInputFld( aPos ) )
+                    if ( SwCrsrShell::PosInsideInputField( aPos ) )
                     {
-                        aPos.nContent = SwCrsrShell::StartOfInputFldAtPos( aPos );
+                        aPos.nContent = SwCrsrShell::StartOfInputFieldAtPos( aPos );
                     }
                 }
             }
@@ -164,13 +164,13 @@ static bool lcl_FindAnchorPos(
             aTmpPnt.setX(aTmpPnt.getX() - 1);                   // do not land in the fly!
             rDoc.getIDocumentLayoutAccess().GetCurrentLayout()->GetCrsrOfst( &aPos, aTmpPnt, &aState );
             pNewAnch = ::FindAnchor(
-                aPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( rFrm.getRootFrm(), 0, 0, false ),
+                aPos.nNode.GetNode().GetContentNode()->getLayoutFrm( rFrm.getRootFrm(), 0, 0, false ),
                 aTmpPnt )->FindFlyFrm();
 
             if( pNewAnch && &rFrm != pNewAnch && !pNewAnch->IsProtected() )
             {
-                aPos.nNode = *static_cast<const SwFlyFrm*>(pNewAnch)->GetFmt()->GetCntnt().
-                                GetCntntIdx();
+                aPos.nNode = *static_cast<const SwFlyFrm*>(pNewAnch)->GetFormat()->GetContent().
+                                GetContentIdx();
                 aNewAnch.SetAnchor( &aPos );
                 break;
             }
@@ -198,21 +198,21 @@ bool sw_ChkAndSetNewAnchor(
     const SwFlyFrm& rFly,
     SfxItemSet& rSet )
 {
-    const SwFrmFmt& rFmt = *rFly.GetFmt();
-    const SwFmtAnchor &rOldAnch = rFmt.GetAnchor();
+    const SwFrameFormat& rFormat = *rFly.GetFormat();
+    const SwFormatAnchor &rOldAnch = rFormat.GetAnchor();
     const RndStdIds nOld = rOldAnch.GetAnchorId();
 
-    RndStdIds nNew = static_cast<const SwFmtAnchor&>(rSet.Get( RES_ANCHOR )).GetAnchorId();
+    RndStdIds nNew = static_cast<const SwFormatAnchor&>(rSet.Get( RES_ANCHOR )).GetAnchorId();
 
     if( nOld == nNew )
         return false;
 
-    SwDoc* pDoc = const_cast<SwDoc*>(rFmt.GetDoc());
+    SwDoc* pDoc = const_cast<SwDoc*>(rFormat.GetDoc());
 
 #if OSL_DEBUG_LEVEL > 0
     OSL_ENSURE( !(nNew == FLY_AT_PAGE &&
         (FLY_AT_PARA==nOld || FLY_AT_CHAR==nOld || FLY_AS_CHAR==nOld ) &&
-        pDoc->IsInHeaderFooter( rOldAnch.GetCntntAnchor()->nNode )),
+        pDoc->IsInHeaderFooter( rOldAnch.GetContentAnchor()->nNode )),
             "forbidden anchor change in Head/Foot." );
 #endif
 
@@ -271,7 +271,7 @@ SwFlyFrm *SwFEShell::FindFlyFrm() const
 }
 
 // Returns non-null pointer, if the current Fly could be anchored to another one (so it is inside)
-const SwFrmFmt* SwFEShell::IsFlyInFly()
+const SwFrameFormat* SwFEShell::IsFlyInFly()
 {
     SET_CURR_SHELL( this );
 
@@ -281,13 +281,13 @@ const SwFrmFmt* SwFEShell::IsFlyInFly()
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
     if ( !rMrkList.GetMarkCount() )
     {
-        SwCntntFrm *pCntnt = GetCurrFrm( false );
-        if( !pCntnt )
+        SwContentFrm *pContent = GetCurrFrm( false );
+        if( !pContent )
             return NULL;
-        SwFlyFrm *pFly = pCntnt->FindFlyFrm();
+        SwFlyFrm *pFly = pContent->FindFlyFrm();
         if ( !pFly )
             return NULL;
-        return pFly->GetFmt();
+        return pFly->GetFormat();
     }
     else if ( rMrkList.GetMarkCount() != 1 ||
          !GetUserCall(rMrkList.GetMark( 0 )->GetMarkedSdrObj()) )
@@ -295,20 +295,20 @@ const SwFrmFmt* SwFEShell::IsFlyInFly()
 
     SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
 
-    SwFrmFmt *pFmt = FindFrmFmt( pObj );
-    if( pFmt && FLY_AT_FLY == pFmt->GetAnchor().GetAnchorId() )
+    SwFrameFormat *pFormat = FindFrameFormat( pObj );
+    if( pFormat && FLY_AT_FLY == pFormat->GetAnchor().GetAnchorId() )
     {
         const SwFrm* pFly = pObj->ISA(SwVirtFlyDrawObj) ?
             static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm()->GetAnchorFrm() :
             static_cast<SwDrawContact*>(GetUserCall(pObj))->GetAnchorFrm( pObj );
         OSL_ENSURE( pFly, "IsFlyInFly: Where's my anchor?" );
         OSL_ENSURE( pFly->IsFlyFrm(), "IsFlyInFly: Funny anchor!" );
-        return static_cast<const SwFlyFrm*>(pFly)->GetFmt();
+        return static_cast<const SwFlyFrm*>(pFly)->GetFormat();
     }
 
     Point aTmpPos = pObj->GetCurrentBoundRect().TopLeft();
 
-    SwFrm *pTxtFrm;
+    SwFrm *pTextFrm;
     {
         SwCrsrMoveState aState( MV_SETONLYTEXT );
         SwNodeIndex aSwNodeIndex( GetDoc()->GetNodes() );
@@ -317,13 +317,13 @@ const SwFrmFmt* SwFEShell::IsFlyInFly()
         aPoint.setX(aPoint.getX() - 1);                    //do not land in the fly!!
         GetLayout()->GetCrsrOfst( &aPos, aPoint, &aState );
         // determine text frame by left-top-corner of object
-        SwCntntNode *pNd = aPos.nNode.GetNode().GetCntntNode();
-        pTxtFrm = pNd ? pNd->getLayoutFrm(GetLayout(), &aTmpPos, 0, false) : NULL;
+        SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
+        pTextFrm = pNd ? pNd->getLayoutFrm(GetLayout(), &aTmpPos, 0, false) : NULL;
     }
-    const SwFrm *pTmp = pTxtFrm ? ::FindAnchor(pTxtFrm, aTmpPos) : NULL;
+    const SwFrm *pTmp = pTextFrm ? ::FindAnchor(pTextFrm, aTmpPos) : NULL;
     const SwFlyFrm *pFly = pTmp ? pTmp->FindFlyFrm() : NULL;
     if( pFly )
-        return pFly->GetFmt();
+        return pFly->GetFormat();
     return NULL;
 }
 
@@ -332,10 +332,10 @@ void SwFEShell::SetFlyPos( const Point& rAbsPos )
     SET_CURR_SHELL( this );
 
     // Determine reference point in document coordinates
-    SwCntntFrm *pCntnt = GetCurrFrm( false );
-    if( !pCntnt )
+    SwContentFrm *pContent = GetCurrFrm( false );
+    if( !pContent )
         return;
-    SwFlyFrm *pFly = pCntnt->FindFlyFrm();
+    SwFlyFrm *pFly = pContent->FindFlyFrm();
     if ( !pFly )
         return;
 
@@ -378,8 +378,8 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
     SdrObject* pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
     // #i28701#
     SwAnchoredObject* pAnchoredObj = ::GetUserCall( pObj )->GetAnchoredObj( pObj );
-    SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
-    const RndStdIds nAnchorId = rFmt.GetAnchor().GetAnchorId();
+    SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat();
+    const RndStdIds nAnchorId = rFormat.GetAnchor().GetAnchorId();
 
     if ( FLY_AS_CHAR == nAnchorId )
         return aRet;
@@ -392,10 +392,10 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
     if( bFlyFrame )
     {
         // Calculate reference point in document coordinates
-        SwCntntFrm *pCntnt = GetCurrFrm( false );
-        if( !pCntnt )
+        SwContentFrm *pContent = GetCurrFrm( false );
+        if( !pContent )
             return aRet;
-        pFly = pCntnt->FindFlyFrm();
+        pFly = pContent->FindFlyFrm();
         if ( !pFly )
             return aRet;
         const SwFrm* pOldAnch = pFly->GetAnchorFrm();
@@ -403,7 +403,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
             return aRet;
         if ( FLY_AT_PAGE != nAnchorId )
         {
-            pFooterOrHeader = pCntnt->FindFooterOrHeader();
+            pFooterOrHeader = pContent->FindFooterOrHeader();
         }
     }
     // set <pFooterOrHeader> also for drawing
@@ -411,38 +411,38 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
     // Necessary for moving 'anchor symbol' at the user interface inside header/footer.
     else if ( !::CheckControlLayer( pObj ) )
     {
-        SwCntntFrm *pCntnt = GetCurrFrm( false );
-        if( !pCntnt )
+        SwContentFrm *pContent = GetCurrFrm( false );
+        if( !pContent )
             return aRet;
-        pFooterOrHeader = pCntnt->FindFooterOrHeader();
+        pFooterOrHeader = pContent->FindFooterOrHeader();
     }
 
     // Search nearest SwFlyFrm starting from the upper-left corner
     // of the fly
-    SwCntntFrm *pTxtFrm = NULL;
+    SwContentFrm *pTextFrm = NULL;
     {
         SwCrsrMoveState aState( MV_SETONLYTEXT );
         SwPosition aPos( GetDoc()->GetNodes().GetEndOfExtras() );
         Point aTmpPnt( rAbsPos );
         GetLayout()->GetCrsrOfst( &aPos, aTmpPnt, &aState );
         if (aPos.nNode != GetDoc()->GetNodes().GetEndOfExtras().GetIndex()
-            && (nAnchorId != FLY_AT_CHAR || !PosInsideInputFld(aPos)))
+            && (nAnchorId != FLY_AT_CHAR || !PosInsideInputField(aPos)))
         {
-            SwCntntNode* pCNode = aPos.nNode.GetNode().GetCntntNode();
+            SwContentNode* pCNode = aPos.nNode.GetNode().GetContentNode();
             assert(pCNode);
-            pTxtFrm = pCNode->getLayoutFrm(GetLayout(), 0, &aPos, false);
+            pTextFrm = pCNode->getLayoutFrm(GetLayout(), 0, &aPos, false);
         }
     }
     const SwFrm *pNewAnch = NULL;
-    if( pTxtFrm != NULL )
+    if( pTextFrm != NULL )
     {
         if ( FLY_AT_PAGE == nAnchorId )
         {
-            pNewAnch = pTxtFrm->FindPageFrm();
+            pNewAnch = pTextFrm->FindPageFrm();
         }
         else
         {
-            pNewAnch = ::FindAnchor( pTxtFrm, rAbsPos );
+            pNewAnch = ::FindAnchor( pTextFrm, rAbsPos );
 
             if( FLY_AT_FLY == nAnchorId ) // LAYER_IMPL
             {
@@ -473,13 +473,13 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
 
             if ( bMoveIt || (nAnchorId == FLY_AT_CHAR) )
             {
-                SwFmtAnchor aAnch( rFmt.GetAnchor() );
+                SwFormatAnchor aAnch( rFormat.GetAnchor() );
                 switch ( nAnchorId )
                 {
                     case FLY_AT_PARA:
                     {
-                        SwPosition pos = *aAnch.GetCntntAnchor();
-                        pos.nNode = *pTxtFrm->GetNode();
+                        SwPosition pos = *aAnch.GetContentAnchor();
+                        pos.nNode = *pTextFrm->GetNode();
                         pos.nContent.Assign(0,0);
                         aAnch.SetAnchor( &pos );
                         break;
@@ -493,25 +493,25 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
 
                     case FLY_AT_FLY:
                     {
-                        SwPosition aPos( *static_cast<const SwFlyFrm*>(pNewAnch)->GetFmt()->
-                                                  GetCntnt().GetCntntIdx() );
+                        SwPosition aPos( *static_cast<const SwFlyFrm*>(pNewAnch)->GetFormat()->
+                                                  GetContent().GetContentIdx() );
                         aAnch.SetAnchor( &aPos );
                         break;
                     }
 
                     case FLY_AT_CHAR:
                         {
-                            SwPosition pos = *aAnch.GetCntntAnchor();
+                            SwPosition pos = *aAnch.GetContentAnchor();
                             Point aTmpPnt( rAbsPos );
-                            if( pTxtFrm->GetCrsrOfst( &pos, aTmpPnt, NULL ) )
+                            if( pTextFrm->GetCrsrOfst( &pos, aTmpPnt, NULL ) )
                             {
                                 SwRect aTmpRect;
-                                pTxtFrm->GetCharRect( aTmpRect, pos );
+                                pTextFrm->GetCharRect( aTmpRect, pos );
                                 aRet = aTmpRect.Pos();
                             }
                             else
                             {
-                                pos.nNode = *pTxtFrm->GetNode();
+                                pos.nNode = *pTextFrm->GetNode();
                                 pos.nContent.Assign(0,0);
                             }
                             aAnch.SetAnchor( &pos );
@@ -531,13 +531,13 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
                     // anchor attribute is change and re-create them afterwards.
                     {
                         SwHandleAnchorNodeChg* pHandleAnchorNodeChg( 0L );
-                        SwFlyFrmFmt* pFlyFrmFmt( dynamic_cast<SwFlyFrmFmt*>(&rFmt) );
-                        if ( pFlyFrmFmt )
+                        SwFlyFrameFormat* pFlyFrameFormat( dynamic_cast<SwFlyFrameFormat*>(&rFormat) );
+                        if ( pFlyFrameFormat )
                         {
                             pHandleAnchorNodeChg =
-                                new SwHandleAnchorNodeChg( *pFlyFrmFmt, aAnch );
+                                new SwHandleAnchorNodeChg( *pFlyFrameFormat, aAnch );
                         }
-                        rFmt.GetDoc()->SetAttr( aAnch, rFmt );
+                        rFormat.GetDoc()->SetAttr( aAnch, rFormat );
                         delete pHandleAnchorNodeChg;
                     }
                     // #i28701# - no call of method
@@ -568,8 +568,8 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
     return aRet;
 }
 
-const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, bool bAnchValid,
-                           SwFrmFmt *pParent )
+const SwFrameFormat *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, bool bAnchValid,
+                           SwFrameFormat *pParent )
 {
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -578,10 +578,10 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, bool bAnchValid,
     const Point aPt( GetCrsrDocPos() );
 
     SwSelBoxes aBoxes;
-    bool bMoveCntnt = true;
+    bool bMoveContent = true;
     if( IsTableMode() )
     {
-        GetTblSel( *this, aBoxes );
+        GetTableSel( *this, aBoxes );
         if( !aBoxes.empty() )
         {
             // Crsr should be removed from the removal area.
@@ -596,14 +596,14 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, bool bAnchValid,
             pCrsr = GetCrsr();
         }
         else
-            bMoveCntnt = false;
+            bMoveContent = false;
     }
     else if( !pCrsr->HasMark() && !pCrsr->IsMultiSelection() )
-        bMoveCntnt = false;
+        bMoveContent = false;
 
     const SwPosition& rPos = *pCrsr->Start();
 
-    SwFmtAnchor& rAnch = const_cast<SwFmtAnchor&>(static_cast<const SwFmtAnchor&>(rSet.Get( RES_ANCHOR )));
+    SwFormatAnchor& rAnch = const_cast<SwFormatAnchor&>(static_cast<const SwFormatAnchor&>(rSet.Get( RES_ANCHOR )));
     RndStdIds eRndId = rAnch.GetAnchorId();
     switch( eRndId )
     {
@@ -634,14 +634,14 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, bool bAnchValid,
         break;
     }
 
-    SwFlyFrmFmt *pRet;
-    if( bMoveCntnt )
+    SwFlyFrameFormat *pRet;
+    if( bMoveContent )
     {
         GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_INSLAYFMT, NULL );
-        SwFmtAnchor* pOldAnchor = 0;
+        SwFormatAnchor* pOldAnchor = 0;
         bool bHOriChgd = false, bVOriChgd = false;
-        SwFmtVertOrient aOldV;
-        SwFmtHoriOrient aOldH;
+        SwFormatVertOrient aOldV;
+        SwFormatHoriOrient aOldH;
 
         if ( FLY_AT_PAGE != eRndId )
         {
@@ -649,23 +649,23 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, bool bAnchValid,
             // everything was shifted. Then the position is valid!
             // JP 13.05.98: if necessary also convert the horizontal/vertical
             //              orientation, to prevent correction during re-anchoring
-            pOldAnchor = new SwFmtAnchor( rAnch );
-            const_cast<SfxItemSet&>(rSet).Put( SwFmtAnchor( FLY_AT_PAGE, 1 ) );
+            pOldAnchor = new SwFormatAnchor( rAnch );
+            const_cast<SfxItemSet&>(rSet).Put( SwFormatAnchor( FLY_AT_PAGE, 1 ) );
 
             const SfxPoolItem* pItem;
             if( SfxItemState::SET == rSet.GetItemState( RES_HORI_ORIENT, false, &pItem )
-                && text::HoriOrientation::NONE == static_cast<const SwFmtHoriOrient*>(pItem)->GetHoriOrient() )
+                && text::HoriOrientation::NONE == static_cast<const SwFormatHoriOrient*>(pItem)->GetHoriOrient() )
             {
                 bHOriChgd = true;
-                aOldH = *static_cast<const SwFmtHoriOrient*>(pItem);
-                const_cast<SfxItemSet&>(rSet).Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT ) );
+                aOldH = *static_cast<const SwFormatHoriOrient*>(pItem);
+                const_cast<SfxItemSet&>(rSet).Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT ) );
             }
             if( SfxItemState::SET == rSet.GetItemState( RES_VERT_ORIENT, false, &pItem )
-                && text::VertOrientation::NONE == static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() )
+                && text::VertOrientation::NONE == static_cast<const SwFormatVertOrient*>(pItem)->GetVertOrient() )
             {
                 bVOriChgd = true;
-                aOldV = *static_cast<const SwFmtVertOrient*>(pItem);
-                const_cast<SfxItemSet&>(rSet).Put( SwFmtVertOrient( 0, text::VertOrientation::TOP ) );
+                aOldV = *static_cast<const SwFormatVertOrient*>(pItem);
+                const_cast<SfxItemSet&>(rSet).Put( SwFormatVertOrient( 0, text::VertOrientation::TOP ) );
             }
         }
 
@@ -683,10 +683,10 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, bool bAnchValid,
                 pRet->DelFrms();
 
                 const SwFrm* pAnch = ::FindAnchor( GetLayout(), aPt, false );
-                SwPosition aPos( *static_cast<const SwCntntFrm*>(pAnch)->GetNode() );
+                SwPosition aPos( *static_cast<const SwContentFrm*>(pAnch)->GetNode() );
                 if ( FLY_AS_CHAR == eRndId )
                 {
-                    aPos.nContent.Assign( const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(pAnch))->GetNode(), 0 );
+                    aPos.nContent.Assign( const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pAnch))->GetNode(), 0 );
                 }
                 pOldAnchor->SetAnchor( &aPos );
 
@@ -745,9 +745,9 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName,
                         const Graphic* pGraphic,
                         const SfxItemSet* pFlyAttrSet,
                         const SfxItemSet* pGrfAttrSet,
-                        SwFrmFmt* pFrmFmt )
+                        SwFrameFormat* pFrameFormat )
 {
-    SwFlyFrmFmt* pFmt = 0;
+    SwFlyFrameFormat* pFormat = 0;
     SET_CURR_SHELL( this );
     StartAllAction();
     SwShellCrsr *pStartCursor = dynamic_cast<SwShellCrsr*>(this->GetSwCrsr());
@@ -764,19 +764,19 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName,
             if( SfxItemState::SET == pFlyAttrSet->GetItemState( RES_ANCHOR, false,
                     &pItem ) )
             {
-                SwFmtAnchor* pAnchor = const_cast<SwFmtAnchor*>(static_cast<const SwFmtAnchor*>(pItem));
+                SwFormatAnchor* pAnchor = const_cast<SwFormatAnchor*>(static_cast<const SwFormatAnchor*>(pItem));
                 switch( pAnchor->GetAnchorId())
                 {
                 case FLY_AT_PARA:
                 case FLY_AT_CHAR: // LAYER_IMPL
                 case FLY_AS_CHAR:
-                    if( !pAnchor->GetCntntAnchor() )
+                    if( !pAnchor->GetContentAnchor() )
                     {
                         pAnchor->SetAnchor( pCursor->GetPoint() );
                     }
                     break;
                 case FLY_AT_FLY:
-                    if( !pAnchor->GetCntntAnchor() )
+                    if( !pAnchor->GetContentAnchor() )
                     {
                         lcl_SetNewFlyPos( pCursor->GetNode(),
                                 *pAnchor, GetCrsrDocPos() );
@@ -794,21 +794,21 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName,
                 }
             }
         }
-        pFmt = GetDoc()->getIDocumentContentOperations().Insert(*pCursor, rGrfName,
+        pFormat = GetDoc()->getIDocumentContentOperations().Insert(*pCursor, rGrfName,
                                 rFltName, pGraphic,
                                 pFlyAttrSet,
-                                pGrfAttrSet, pFrmFmt );
-        OSL_ENSURE( pFmt, "Doc->getIDocumentContentOperations().Insert(notxt) failed." );
+                                pGrfAttrSet, pFrameFormat );
+        OSL_ENSURE( pFormat, "Doc->getIDocumentContentOperations().Insert(notxt) failed." );
 
         pCursor = dynamic_cast<SwShellCrsr*>(pCursor->GetNext());
     } while( pCursor != pStartCursor );
 
     EndAllAction();
 
-    if( pFmt )
+    if( pFormat )
     {
         const Point aPt( GetCrsrDocPos() );
-        SwFlyFrm* pFrm = pFmt->GetFrm( &aPt );
+        SwFlyFrm* pFrm = pFormat->GetFrm( &aPt );
 
         if( pFrm )
         {
@@ -816,7 +816,7 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName,
             // the picture anchoring properly
             SwPageFrm* pPageFrm = pFrm->FindPageFrmOfAnchor();
             pPageFrm->InvalidateFlyLayout();
-            pPageFrm->InvalidateCntnt();
+            pPageFrm->InvalidateContent();
 
             SelectFlyFrm( *pFrm, true );
         }
@@ -825,27 +825,27 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName,
     }
 }
 
-SwFlyFrmFmt* SwFEShell::InsertObject( const svt::EmbeddedObjectRef&  xObj,
+SwFlyFrameFormat* SwFEShell::InsertObject( const svt::EmbeddedObjectRef&  xObj,
                         const SfxItemSet* pFlyAttrSet,
                         const SfxItemSet* pGrfAttrSet,
-                        SwFrmFmt* pFrmFmt )
+                        SwFrameFormat* pFrameFormat )
 {
-    SwFlyFrmFmt* pFmt = 0;
+    SwFlyFrameFormat* pFormat = 0;
     SET_CURR_SHELL( this );
     StartAllAction();
         for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
         {
-            pFmt = GetDoc()->getIDocumentContentOperations().Insert(rPaM, xObj,
-                                    pFlyAttrSet, pGrfAttrSet, pFrmFmt );
-            OSL_ENSURE( pFmt, "Doc->getIDocumentContentOperations().Insert(notxt) failed." );
+            pFormat = GetDoc()->getIDocumentContentOperations().Insert(rPaM, xObj,
+                                    pFlyAttrSet, pGrfAttrSet, pFrameFormat );
+            OSL_ENSURE( pFormat, "Doc->getIDocumentContentOperations().Insert(notxt) failed." );
 
         }
     EndAllAction();
 
-    if( pFmt )
+    if( pFormat )
     {
         const Point aPt( GetCrsrDocPos() );
-        SwFlyFrm* pFrm = pFmt->GetFrm( &aPt );
+        SwFlyFrm* pFrm = pFormat->GetFrm( &aPt );
 
         if( pFrm )
             SelectFlyFrm( *pFrm, true );
@@ -853,7 +853,7 @@ SwFlyFrmFmt* SwFEShell::InsertObject( const svt::EmbeddedObjectRef&  xObj,
             GetLayout()->SetAssertFlyPages();
     }
 
-    return pFmt;
+    return pFormat;
 }
 
 void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
@@ -861,10 +861,10 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
 {
     SET_CURR_SHELL( this );
 
-    SfxItemSet rFlyAttrSet( GetDoc()->GetAttrPool(), aFrmFmtSetRange );
-    rFlyAttrSet.Put( SwFmtAnchor( FLY_AT_PARA ));
+    SfxItemSet rFlyAttrSet( GetDoc()->GetAttrPool(), aFrameFormatSetRange );
+    rFlyAttrSet.Put( SwFormatAnchor( FLY_AT_PARA ));
     // #i89920#
-    rFlyAttrSet.Put( SwFmtSurround( SURROUND_THROUGHT ) );
+    rFlyAttrSet.Put( SwFormatSurround( SURROUND_THROUGHT ) );
     rDrawObj.SetLayer( getIDocumentDrawModelAccess()->GetHeavenId() );
 
     // find anchor position
@@ -873,14 +873,14 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
         SwCrsrMoveState aState( MV_SETONLYTEXT );
         Point aTmpPt( rInsertPosition );
         GetLayout()->GetCrsrOfst( aPam.GetPoint(), aTmpPt, &aState );
-        const SwFrm* pFrm = aPam.GetCntntNode()->getLayoutFrm( GetLayout(), 0, 0, false );
+        const SwFrm* pFrm = aPam.GetContentNode()->getLayoutFrm( GetLayout(), 0, 0, false );
         const Point aRelPos( rInsertPosition.X() - pFrm->Frm().Left(),
                              rInsertPosition.Y() - pFrm->Frm().Top() );
         rDrawObj.SetRelativePos( aRelPos );
         ::lcl_FindAnchorPos( *GetDoc(), rInsertPosition, *pFrm, rFlyAttrSet );
     }
-    // insert drawing object into the document creating a new <SwDrawFrmFmt> instance
-    SwDrawFrmFmt* pFmt = GetDoc()->getIDocumentContentOperations().InsertDrawObj( aPam, rDrawObj, rFlyAttrSet );
+    // insert drawing object into the document creating a new <SwDrawFrameFormat> instance
+    SwDrawFrameFormat* pFormat = GetDoc()->getIDocumentContentOperations().InsertDrawObj( aPam, rDrawObj, rFlyAttrSet );
 
     // move object to visible layer
     SwContact* pContact = static_cast<SwContact*>(rDrawObj.GetUserCall());
@@ -889,7 +889,7 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
         pContact->MoveObjToVisibleLayer( &rDrawObj );
     }
 
-    if ( pFmt )
+    if ( pFormat )
     {
         // select drawing object
         Imp()->GetDrawView()->MarkObj( &rDrawObj, Imp()->GetPageView(),
@@ -901,20 +901,20 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
     }
 }
 
-void SwFEShell::GetPageObjs( std::vector<SwFrmFmt*>& rFillArr )
+void SwFEShell::GetPageObjs( std::vector<SwFrameFormat*>& rFillArr )
 {
     rFillArr.clear();
 
-    for( auto pFmt : *mpDoc->GetSpzFrmFmts() )
+    for( auto pFormat : *mpDoc->GetSpzFrameFormats() )
     {
-        if (FLY_AT_PAGE == pFmt->GetAnchor().GetAnchorId())
+        if (FLY_AT_PAGE == pFormat->GetAnchor().GetAnchorId())
         {
-            rFillArr.push_back( pFmt );
+            rFillArr.push_back( pFormat );
         }
     }
 }
 
-void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffset )
+void SwFEShell::SetPageObjsNewPage( std::vector<SwFrameFormat*>& rFillArr, int nOffset )
 {
     if( rFillArr.empty() || !nOffset )
         return;
@@ -926,13 +926,13 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse
     SwRootFrm* pTmpRootFrm = GetLayout();
     sal_uInt16 nMaxPage = pTmpRootFrm->GetPageNum();
     bool bTmpAssert = false;
-    for( auto pFmt : rFillArr )
+    for( auto pFormat : rFillArr )
     {
-        if( mpDoc->GetSpzFrmFmts()->Contains( pFmt ))
+        if( mpDoc->GetSpzFrameFormats()->Contains( pFormat ))
         {
-            // FlyFmt is still valid, therefore process
+            // FlyFormat is still valid, therefore process
 
-            SwFmtAnchor aNewAnchor( pFmt->GetAnchor() );
+            SwFormatAnchor aNewAnchor( pFormat->GetAnchor() );
             if ((FLY_AT_PAGE != aNewAnchor.GetAnchorId()) ||
                 0 >= ( nNewPage = aNewAnchor.GetPageNum() + nOffset ) )
                 // chaos::Anchor has been changed or invalid page number,
@@ -941,18 +941,18 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse
 
             if( sal_uInt16(nNewPage) > nMaxPage )
             {
-                if ( RES_DRAWFRMFMT == pFmt->Which() )
+                if ( RES_DRAWFRMFMT == pFormat->Which() )
                 {
-                    SwContact *pCon = pFmt->FindContactObj();
+                    SwContact *pCon = pFormat->FindContactObj();
                     if( pCon )
                         static_cast<SwDrawContact*>(pCon)->DisconnectFromLayout();
                 }
                 else
-                    pFmt->DelFrms();
+                    pFormat->DelFrms();
                 bTmpAssert = true;
             }
             aNewAnchor.SetPageNum( sal_uInt16(nNewPage) );
-            mpDoc->SetAttr( aNewAnchor, *pFmt );
+            mpDoc->SetAttr( aNewAnchor, *pFormat );
         }
     }
 
@@ -987,7 +987,7 @@ bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
 
     SET_CURR_SHELL( (SwViewShell*)this );
 
-    if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), true ) )
+    if( !rSet.Set( pFly->GetFormat()->GetAttrSet(), true ) )
         return false;
 
     // now examine all attributes. Remove forbidden attributes, then
@@ -995,7 +995,7 @@ bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
     const SfxPoolItem* pItem;
     if( SfxItemState::SET == rSet.GetItemState( RES_ANCHOR, false, &pItem ) )
     {
-        const SwFmtAnchor* pAnchor = static_cast<const SwFmtAnchor*>(pItem);
+        const SwFormatAnchor* pAnchor = static_cast<const SwFormatAnchor*>(pItem);
         RndStdIds eType = pAnchor->GetAnchorId();
 
         if ( FLY_AT_PAGE != eType )
@@ -1009,7 +1009,7 @@ bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
             }
         }
     }
-    rSet.SetParent( pFly->GetFmt()->GetAttrSet().GetParent() );
+    rSet.SetParent( pFly->GetFormat()->GetAttrSet().GetParent() );
     // attributes must be removed
     rSet.ClearItem( RES_FILL_ORDER );
     rSet.ClearItem( RES_CNTNT );
@@ -1040,12 +1040,12 @@ bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
 
             if( SfxItemState::SET == rSet.GetItemState( RES_ANCHOR, false ))
                 sw_ChkAndSetNewAnchor( *pFly, rSet );
-            SwFlyFrmFmt* pFlyFmt = pFly->GetFmt();
+            SwFlyFrameFormat* pFlyFormat = pFly->GetFormat();
 
-            if( GetDoc()->SetFlyFrmAttr( *pFlyFmt, rSet ))
+            if( GetDoc()->SetFlyFrmAttr( *pFlyFormat, rSet ))
             {
                 bRet = true;
-                SwFlyFrm* pFrm = pFlyFmt->GetFrm( &aPt );
+                SwFlyFrm* pFrm = pFlyFormat->GetFrm( &aPt );
                 if( pFrm )
                     SelectFlyFrm( *pFrm, true );
                 else
@@ -1072,12 +1072,12 @@ bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet )
 
     StartUndo();
     SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
-    SwFrmFmt *pFmt = FindFrmFmt( pObj );
+    SwFrameFormat *pFormat = FindFrameFormat( pObj );
     StartAllAction();
     if( SfxItemState::SET == rSet.GetItemState( RES_ANCHOR, false ))
     {
-        RndStdIds nNew = static_cast<const SwFmtAnchor&>(rSet.Get( RES_ANCHOR )).GetAnchorId();
-        if ( nNew != pFmt->GetAnchor().GetAnchorId() )
+        RndStdIds nNew = static_cast<const SwFormatAnchor&>(rSet.Get( RES_ANCHOR )).GetAnchorId();
+        if ( nNew != pFormat->GetAnchor().GetAnchorId() )
         {
             ChgAnchor( nNew );
             // #i26791# - clear anchor attribute in item set,
@@ -1086,7 +1086,7 @@ bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet )
         }
     }
 
-    if( GetDoc()->SetFlyFrmAttr( *pFmt, rSet ))
+    if( GetDoc()->SetFlyFrmAttr( *pFormat, rSet ))
     {
         bRet = true;
         Point aTmp;
@@ -1127,12 +1127,12 @@ bool SwFEShell::ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet )
                     if( !IsInvalidItem( pItem ) &&
                         RES_ANCHOR != ( nWhich = pItem->Which() ) &&
                         RES_CHAIN != nWhich && RES_CNTNT != nWhich )
-                        pFly->GetFmt()->ResetFmtAttr( nWhich );
+                        pFly->GetFormat()->ResetFormatAttr( nWhich );
                     pItem = aIter.NextItem();
                 }
             }
             else
-                pFly->GetFmt()->ResetFmtAttr( nWhich );
+                pFly->GetFormat()->ResetFormatAttr( nWhich );
 
             bRet = true;
             EndAllActionAndCall();
@@ -1143,50 +1143,50 @@ bool SwFEShell::ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet )
 }
 
 // Returns frame-format if frame, otherwise 0
-SwFrmFmt* SwFEShell::GetCurFrmFmt() const
+SwFrameFormat* SwFEShell::GetCurFrameFormat() const
 {
-    SwFrmFmt* pRet = 0;
+    SwFrameFormat* pRet = 0;
     SwLayoutFrm *pFly = FindFlyFrm();
-    if( pFly && ( pRet = static_cast<SwFrmFmt*>(pFly->GetFmt()->DerivedFrom()) ) ==
-                                            GetDoc()->GetDfltFrmFmt() )
+    if( pFly && ( pRet = static_cast<SwFrameFormat*>(pFly->GetFormat()->DerivedFrom()) ) ==
+                                            GetDoc()->GetDfltFrameFormat() )
         pRet = 0;
     return pRet;
 }
 
-void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, bool bKeepOrient, Point* pDocPos )
+void SwFEShell::SetFrameFormat( SwFrameFormat *pNewFormat, bool bKeepOrient, Point* pDocPos )
 {
     SwFlyFrm *pFly = 0;
     if(pDocPos)
     {
-        const SwFrmFmt* pFmt = GetFmtFromObj( *pDocPos );
+        const SwFrameFormat* pFormat = GetFormatFromObj( *pDocPos );
 
-        if(PTR_CAST(SwFlyFrmFmt, pFmt))
-            pFly = static_cast<const SwFlyFrmFmt*>(pFmt)->GetFrm();
+        if(PTR_CAST(SwFlyFrameFormat, pFormat))
+            pFly = static_cast<const SwFlyFrameFormat*>(pFormat)->GetFrm();
     }
     else
         pFly = FindFlyFrm();
-    OSL_ENSURE( pFly, "SetFrmFmt: no frame" );
+    OSL_ENSURE( pFly, "SetFrameFormat: no frame" );
     if( pFly )
     {
         StartAllAction();
         SET_CURR_SHELL( this );
 
-        SwFlyFrmFmt* pFlyFmt = pFly->GetFmt();
+        SwFlyFrameFormat* pFlyFormat = pFly->GetFormat();
         const Point aPt( pFly->Frm().Pos() );
 
         SfxItemSet* pSet = 0;
         const SfxPoolItem* pItem;
-        if( SfxItemState::SET == pNewFmt->GetItemState( RES_ANCHOR, false, &pItem ))
+        if( SfxItemState::SET == pNewFormat->GetItemState( RES_ANCHOR, false, &pItem ))
         {
-            pSet = new SfxItemSet( GetDoc()->GetAttrPool(), aFrmFmtSetRange );
+            pSet = new SfxItemSet( GetDoc()->GetAttrPool(), aFrameFormatSetRange );
             pSet->Put( *pItem );
             if( !sw_ChkAndSetNewAnchor( *pFly, *pSet ))
                 delete pSet, pSet = 0;
         }
 
-        if( GetDoc()->SetFrmFmtToFly( *pFlyFmt, *pNewFmt, pSet, bKeepOrient ))
+        if( GetDoc()->SetFrameFormatToFly( *pFlyFormat, *pNewFormat, pSet, bKeepOrient ))
         {
-            SwFlyFrm* pFrm = pFlyFmt->GetFrm( &aPt );
+            SwFlyFrm* pFrm = pFlyFormat->GetFrm( &aPt );
             if( pFrm )
                 SelectFlyFrm( *pFrm, true );
             else
@@ -1198,7 +1198,7 @@ void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, bool bKeepOrient, Point* pDocPos )
     }
 }
 
-const SwFrmFmt* SwFEShell::GetFlyFrmFmt() const
+const SwFrameFormat* SwFEShell::GetFlyFrameFormat() const
 {
     const SwFlyFrm* pFly = FindFlyFrm();
     if ( !pFly )
@@ -1207,11 +1207,11 @@ const SwFrmFmt* SwFEShell::GetFlyFrmFmt() const
         pFly = pCurrFrm ? pCurrFrm->FindFlyFrm() : 0;
     }
     if( pFly )
-        return pFly->GetFmt();
+        return pFly->GetFormat();
     return 0;
 }
 
-SwFrmFmt* SwFEShell::GetFlyFrmFmt()
+SwFrameFormat* SwFEShell::GetFlyFrameFormat()
 {
     SwFlyFrm* pFly = FindFlyFrm();
     if ( !pFly )
@@ -1220,14 +1220,14 @@ SwFrmFmt* SwFEShell::GetFlyFrmFmt()
         pFly = pCurrFrm ? pCurrFrm->FindFlyFrm() : 0;
     }
     if( pFly )
-        return pFly->GetFmt();
+        return pFly->GetFormat();
     return 0;
 }
 
 SwRect SwFEShell::GetFlyRect() const
 {
-    SwCntntFrm *pCntnt = GetCurrFrm( false );
-    SwFlyFrm *pFly = pCntnt ? pCntnt->FindFlyFrm() : 0;
+    SwContentFrm *pContent = GetCurrFrm( false );
+    SwFlyFrm *pFly = pContent ? pContent->FindFlyFrm() : 0;
     if ( !pFly )
     {
         SwRect aRect;
@@ -1270,15 +1270,15 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
 
     aResult = pFly->Prt().SSize();
 
-    bool bPosProt = pFly->GetFmt()->GetProtect().IsPosProtected();
-    bool bSizeProt = pFly->GetFmt()->GetProtect().IsSizeProtected();
+    bool bPosProt = pFly->GetFormat()->GetProtect().IsPosProtected();
+    bool bSizeProt = pFly->GetFormat()->GetProtect().IsSizeProtected();
 
     StartAllAction();
 
     // MA we do not allow to clip the Fly, as the OLE server can
     // request various wishes. Clipping is done via the formatting.
     // Correct display is done by scaling.
-    // Scaling is done by SwNoTxtFrm::Format by calling
+    // Scaling is done by SwNoTextFrm::Format by calling
     // SwWrtShell::CalcAndSetScale()
     if ( rRect.SSize() != pFly->Prt().SSize() && !bSizeProt )
     {
@@ -1287,16 +1287,16 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
         //JP 28.02.2001: Task 74707 - ask for fly in fly with automatic size
 
         const SwFrm* pAnchor;
-        const SwTxtNode* pTNd;
+        const SwTextNode* pTNd;
         const SwpHints* pHts;
-        const SwFmtFrmSize& rFrmSz = pFly->GetFmt()->GetFrmSize();
+        const SwFormatFrmSize& rFrmSz = pFly->GetFormat()->GetFrmSize();
         if (m_bCheckForOLEInCaption &&
             0 != rFrmSz.GetWidthPercent() &&
             0 != (pAnchor = pFly->GetAnchorFrm()) &&
-            pAnchor->IsTxtFrm() &&
+            pAnchor->IsTextFrm() &&
             !pAnchor->GetNext() && !pAnchor->GetPrev() &&
             pAnchor->GetUpper()->IsFlyFrm() &&
-            0 != ( pTNd = static_cast<const SwTxtFrm*>(pAnchor)->GetNode()->GetTxtNode()) &&
+            0 != ( pTNd = static_cast<const SwTextFrm*>(pAnchor)->GetNode()->GetTextNode()) &&
             0 != ( pHts = pTNd->GetpSwpHints() ))
         {
             // search for a sequence field:
@@ -1305,7 +1305,7 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
             {
                 const SfxPoolItem* pItem = &(*pHts)[ n ]->GetAttr();
                 if( RES_TXTATR_FIELD == pItem->Which()
-                    && TYP_SEQFLD == static_cast<const SwFmtFld*>(pItem)->GetField()->GetTypeId() )
+                    && TYP_SEQFLD == static_cast<const SwFormatField*>(pItem)->GetField()->GetTypeId() )
                 {
                     // sequence field found
                     SwFlyFrm* pChgFly = const_cast<SwFlyFrm*>(static_cast<const SwFlyFrm*>(pAnchor->GetUpper()));
@@ -1314,8 +1314,8 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
                     Size aNewSz( aSz.Width() + pChgFly->Frm().Width() -
                                    pFly->Prt().Width(), aSz.Height() );
 
-                    SwFrmFmt *pFmt = pChgFly->GetFmt();
-                    SwFmtFrmSize aFrmSz( pFmt->GetFrmSize() );
+                    SwFrameFormat *pFormat = pChgFly->GetFormat();
+                    SwFormatFrmSize aFrmSz( pFormat->GetFrmSize() );
                     aFrmSz.SetWidth( aNewSz.Width() );
                     if( ATT_MIN_SIZE != aFrmSz.GetHeightSizeType() )
                     {
@@ -1325,7 +1325,7 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
                             aFrmSz.SetHeight( aNewSz.Height() );
                     }
                     // via Doc for the Undo!
-                    pFmt->GetDoc()->SetAttr( aFrmSz, *pFmt );
+                    pFormat->GetDoc()->SetAttr( aFrmSz, *pFormat );
                     break;
                 }
             }
@@ -1340,8 +1340,8 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
         aResult = pFly->ChgSize( aSz );
 
         // if the object changes, the contour is outside the object
-        OSL_ENSURE( pFly->Lower()->IsNoTxtFrm(), "Request without NoTxt" );
-        SwNoTxtNode *pNd = static_cast<SwCntntFrm*>(pFly->Lower())->GetNode()->GetNoTxtNode();
+        OSL_ENSURE( pFly->Lower()->IsNoTextFrm(), "Request without NoText" );
+        SwNoTextNode *pNd = static_cast<SwContentFrm*>(pFly->Lower())->GetNode()->GetNoTextNode();
         OSL_ENSURE( pNd, "Request without Node" );
         pNd->SetContour( 0 );
         ClrContourCache();
@@ -1364,9 +1364,9 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
             static_cast<SwFlyAtCntFrm*>(pFly)->SetAbsPos( aPt );
         else
         {
-            const SwFrmFmt *pFmt = pFly->GetFmt();
-            const SwFmtVertOrient &rVert = pFmt->GetVertOrient();
-            const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient();
+            const SwFrameFormat *pFormat = pFly->GetFormat();
+            const SwFormatVertOrient &rVert = pFormat->GetVertOrient();
+            const SwFormatHoriOrient &rHori = pFormat->GetHoriOrient();
             const long lXDiff = aPt.getX() - pFly->Frm().Left();
             const long lYDiff = aPt.getY() - pFly->Frm().Top();
             const Point aTmp( rHori.GetPos() + lXDiff,
@@ -1375,21 +1375,21 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
         }
     }
 
-    SwFlyFrmFmt *pFlyFrmFmt = pFly->GetFmt();
-    OSL_ENSURE( pFlyFrmFmt, "fly frame format missing!" );
-    if ( pFlyFrmFmt )
-        pFlyFrmFmt->SetLastFlyFrmPrtRectPos( pFly->Prt().Pos() ); //stores the value of last Prt rect
+    SwFlyFrameFormat *pFlyFrameFormat = pFly->GetFormat();
+    OSL_ENSURE( pFlyFrameFormat, "fly frame format missing!" );
+    if ( pFlyFrameFormat )
+        pFlyFrameFormat->SetLastFlyFrmPrtRectPos( pFly->Prt().Pos() ); //stores the value of last Prt rect
 
     EndAllAction();
 
     return aResult;
 }
 
-SwFrmFmt* SwFEShell::WizzardGetFly()
+SwFrameFormat* SwFEShell::WizzardGetFly()
 {
     // do not search the Fly via the layout. Now we can delete a frame
     // without a valid layout. ( e.g. for the wizards )
-    SwFrmFmts& rSpzArr = *mpDoc->GetSpzFrmFmts();
+    SwFrameFormats& rSpzArr = *mpDoc->GetSpzFrameFormats();
     if( !rSpzArr.empty() )
     {
         SwNodeIndex& rCrsrNd = GetCrsr()->GetPoint()->nNode;
@@ -1397,9 +1397,9 @@ SwFrmFmt* SwFEShell::WizzardGetFly()
             // Cursor is in the body area!
             return 0;
 
-        for( auto pFmt : rSpzArr )
+        for( auto pFormat : rSpzArr )
         {
-            const SwNodeIndex* pIdx = pFmt->GetCntnt( false ).GetCntntIdx();
+            const SwNodeIndex* pIdx = pFormat->GetContent( false ).GetContentIdx();
             SwStartNode* pSttNd;
             if( pIdx &&
                 0 != ( pSttNd = pIdx->GetNode().GetStartNode() ) &&
@@ -1407,7 +1407,7 @@ SwFrmFmt* SwFEShell::WizzardGetFly()
                 rCrsrNd.GetIndex() < pSttNd->EndOfSectionIndex() )
             {
                 // found: return immediately
-                return pFmt;
+                return pFormat;
             }
         }
     }
@@ -1418,7 +1418,7 @@ void SwFEShell::SetFlyName( const OUString& rName )
 {
     SwLayoutFrm *pFly = FindFlyFrm();
     if( pFly )
-        GetDoc()->SetFlyName( *static_cast<SwFlyFrmFmt*>(pFly->GetFmt()), rName );
+        GetDoc()->SetFlyName( *static_cast<SwFlyFrameFormat*>(pFly->GetFormat()), rName );
     else {
         OSL_ENSURE( false, "no FlyFrame selected" );
     }
@@ -1428,7 +1428,7 @@ OUString SwFEShell::GetFlyName() const
 {
     SwLayoutFrm *pFly = FindFlyFrm();
     if( pFly )
-        return pFly->GetFmt()->GetName();
+        return pFly->GetFormat()->GetName();
 
     OSL_ENSURE( false, "no FlyFrame selected" );
     return OUString();
@@ -1438,9 +1438,9 @@ const uno::Reference < embed::XEmbeddedObject > SwFEShell::GetOleRef() const
 {
     uno::Reference < embed::XEmbeddedObject > xObj;
     SwFlyFrm * pFly = FindFlyFrm();
-    if (pFly && pFly->Lower() && pFly->Lower()->IsNoTxtFrm())
+    if (pFly && pFly->Lower() && pFly->Lower()->IsNoTextFrm())
     {
-        SwOLENode *pNd = static_cast<SwNoTxtFrm*>(pFly->Lower())->GetNode()->GetOLENode();
+        SwOLENode *pNd = static_cast<SwNoTextFrm*>(pFly->Lower())->GetNode()->GetOLENode();
         if (pNd)
             xObj = pNd->GetOLEObj().GetOleRef();
     }
@@ -1452,7 +1452,7 @@ OUString SwFEShell::GetUniqueGrfName() const
     return GetDoc()->GetUniqueGrfName();
 }
 
-const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, OUString* pURL,
+const SwFrameFormat* SwFEShell::IsURLGrfAtPos( const Point& rPt, OUString* pURL,
                                         OUString *pTargetFrameName,
                                         OUString *pDescription ) const
 {
@@ -1461,7 +1461,7 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, OUString* pURL,
 
     SdrObject* pObj;
     SdrPageView* pPV;
-    const SwFrmFmt* pRet = 0;
+    const SwFrameFormat* pRet = 0;
     SwDrawView *pDView = const_cast<SwDrawView*>(Imp()->GetDrawView());
 
     const auto nOld = pDView->GetHitTolerancePixel();
@@ -1471,14 +1471,14 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, OUString* pURL,
         pObj->ISA(SwVirtFlyDrawObj) )
     {
         SwFlyFrm *pFly = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm();
-        const SwFmtURL &rURL = pFly->GetFmt()->GetURL();
+        const SwFormatURL &rURL = pFly->GetFormat()->GetURL();
         if( !rURL.GetURL().isEmpty() || rURL.GetMap() )
         {
             bool bSetTargetFrameName = pTargetFrameName != 0;
             bool bSetDescription = pDescription != 0;
             if ( rURL.GetMap() )
             {
-                IMapObject *pObject = pFly->GetFmt()->GetIMapObject( rPt, pFly );
+                IMapObject *pObject = pFly->GetFormat()->GetIMapObject( rPt, pFly );
                 if ( pObject && !pObject->GetURL().isEmpty() )
                 {
                     if( pURL )
@@ -1493,7 +1493,7 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, OUString* pURL,
                         bSetDescription = false;
                         *pDescription = pObject->GetAltText();
                     }
-                    pRet = pFly->GetFmt();
+                    pRet = pFly->GetFormat();
                 }
             }
             else
@@ -1513,12 +1513,12 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, OUString* pURL,
                                   += "," ) += OUString::number(aPt.getY() );
                     }
                 }
-                pRet = pFly->GetFmt();
+                pRet = pFly->GetFormat();
             }
             if ( bSetTargetFrameName )
                 *pTargetFrameName = rURL.GetTargetFrameName();
             if ( bSetDescription )
-                *pDescription = pFly->GetFmt()->GetName();
+                *pDescription = pFly->GetFormat()->GetName();
         }
     }
     pDView->SetHitTolerancePixel( nOld );
@@ -1538,9 +1538,9 @@ const Graphic *SwFEShell::GetGrfAtPos( const Point &rPt,
     if( pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPV ) && pObj->ISA(SwVirtFlyDrawObj) )
     {
         SwFlyFrm *pFly = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm();
-        if ( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
+        if ( pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
         {
-            SwGrfNode *pNd = static_cast<SwCntntFrm*>(pFly->Lower())->GetNode()->GetGrfNode();
+            SwGrfNode *pNd = static_cast<SwContentFrm*>(pFly->Lower())->GetNode()->GetGrfNode();
             if ( pNd )
             {
                 if ( pNd->IsGrfLink() )
@@ -1554,7 +1554,7 @@ const Graphic *SwFEShell::GetGrfAtPos( const Point &rPt,
 
                 pNd->GetFileFilterNms( &rName, 0 );
                 if ( rName.isEmpty() )
-                    rName = pFly->GetFmt()->GetName();
+                    rName = pFly->GetFormat()->GetName();
                 return &pNd->GetGrf(true);
             }
         }
@@ -1562,9 +1562,9 @@ const Graphic *SwFEShell::GetGrfAtPos( const Point &rPt,
     return 0;
 }
 
-const SwFrmFmt* SwFEShell::GetFmtFromObj( const Point& rPt, SwRect** pRectToFill ) const
+const SwFrameFormat* SwFEShell::GetFormatFromObj( const Point& rPt, SwRect** pRectToFill ) const
 {
-    SwFrmFmt* pRet = 0;
+    SwFrameFormat* pRet = 0;
 
     if( Imp()->HasDrawView() )
     {
@@ -1581,9 +1581,9 @@ const SwFrmFmt* SwFEShell::GetFmtFromObj( const Point& rPt, SwRect** pRectToFill
         {
            // first check it:
             if ( pObj->ISA(SwVirtFlyDrawObj) )
-                pRet = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFmt();
+                pRet = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFormat();
             else if ( pObj->GetUserCall() ) //not for group objects
-                pRet = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFmt();
+                pRet = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFormat();
             if(pRet && pRectToFill)
                 **pRectToFill = pObj->GetCurrentBoundRect();
         }
@@ -1593,17 +1593,17 @@ const SwFrmFmt* SwFEShell::GetFmtFromObj( const Point& rPt, SwRect** pRectToFill
 }
 
 // returns a format too, if the point is over the text of any fly
-const SwFrmFmt* SwFEShell::GetFmtFromAnyObj( const Point& rPt ) const
+const SwFrameFormat* SwFEShell::GetFormatFromAnyObj( const Point& rPt ) const
 {
-    const SwFrmFmt* pRet = GetFmtFromObj( rPt );
+    const SwFrameFormat* pRet = GetFormatFromObj( rPt );
     if( !pRet || RES_FLYFRMFMT == pRet->Which() )
     {
         SwPosition aPos( *GetCrsr()->GetPoint() );
         Point aPt( rPt );
         GetLayout()->GetCrsrOfst( &aPos, aPt );
-        SwCntntNode *pNd = aPos.nNode.GetNode().GetCntntNode();
+        SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
         SwFrm* pFrm = pNd->getLayoutFrm( GetLayout(), &rPt, 0, false )->FindFlyFrm();
-        pRet = pFrm ? static_cast<SwLayoutFrm*>(pFrm)->GetFmt() : 0;
+        pRet = pFrm ? static_cast<SwLayoutFrm*>(pFrm)->GetFormat() : 0;
     }
     return pRet;
 }
@@ -1649,9 +1649,9 @@ ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj ) const
     else if( pInvestigatedObj->ISA(SwVirtFlyDrawObj) )
     {
         const SwFlyFrm *pFly = static_cast<const SwVirtFlyDrawObj&>(*pInvestigatedObj).GetFlyFrm();
-        if ( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
+        if ( pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
         {
-            if ( static_cast<const SwCntntFrm*>(pFly->Lower())->GetNode()->GetGrfNode() )
+            if ( static_cast<const SwContentFrm*>(pFly->Lower())->GetNode()->GetGrfNode() )
                 eType = OBJCNT_GRF;
             else
                 eType = OBJCNT_OLE;
@@ -1669,13 +1669,13 @@ ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj ) const
         }
         else
         {
-            SwFrmFmt* pFrmFmt( pDrawContact->GetFmt() );
-            if ( !pFrmFmt )
+            SwFrameFormat* pFrameFormat( pDrawContact->GetFormat() );
+            if ( !pFrameFormat )
             {
                 OSL_FAIL( "<SwFEShell::GetObjCntType(..)> - missing frame format" );
                 eType = OBJCNT_NONE;
             }
-            else if ( FLY_AS_CHAR != pFrmFmt->GetAnchor().GetAnchorId() )
+            else if ( FLY_AS_CHAR != pFrameFormat->GetAnchor().GetAnchorId() )
             {
                 eType = OBJCNT_GROUPOBJ;
             }
@@ -1749,12 +1749,12 @@ bool SwFEShell::ReplaceSdrObj( const OUString& rGrfName, const OUString& rFltNam
         ( pMrkList = &Imp()->GetDrawView()->GetMarkedObjectList())->GetMarkCount() )
     {
         SdrObject* pObj = pMrkList->GetMark( 0 )->GetMarkedSdrObj();
-        SwFrmFmt *pFmt = FindFrmFmt( pObj );
+        SwFrameFormat *pFormat = FindFrameFormat( pObj );
 
         // store attributes, then set the graphic
         SfxItemSet aFrmSet( mpDoc->GetAttrPool(),
-                            pFmt->GetAttrSet().GetRanges() );
-        aFrmSet.Set( pFmt->GetAttrSet() );
+                            pFormat->GetAttrSet().GetRanges() );
+        aFrmSet.Set( pFormat->GetAttrSet() );
 
         // set size and position?
         if( !pObj->ISA(SwVirtFlyDrawObj) )
@@ -1765,15 +1765,15 @@ bool SwFEShell::ReplaceSdrObj( const OUString& rGrfName, const OUString& rFltNam
 
             const long nWidth = rBound.Right()  - rBound.Left();
             const long nHeight= rBound.Bottom() - rBound.Top();
-            aFrmSet.Put( SwFmtFrmSize( ATT_MIN_SIZE,
+            aFrmSet.Put( SwFormatFrmSize( ATT_MIN_SIZE,
                                 std::max( nWidth,  long(MINFLY) ),
                                 std::max( nHeight, long(MINFLY) )));
 
             if( SfxItemState::SET != aFrmSet.GetItemState( RES_HORI_ORIENT ))
-                aFrmSet.Put( SwFmtHoriOrient( aRelPos.getX(), text::HoriOrientation::NONE, text::RelOrientation::FRAME ));
+                aFrmSet.Put( SwFormatHoriOrient( aRelPos.getX(), text::HoriOrientation::NONE, text::RelOrientation::FRAME ));
 
             if( SfxItemState::SET != aFrmSet.GetItemState( RES_VERT_ORIENT ))
-                aFrmSet.Put( SwFmtVertOrient( aRelPos.getY(), text::VertOrientation::NONE, text::RelOrientation::FRAME ));
+                aFrmSet.Put( SwFormatVertOrient( aRelPos.getY(), text::VertOrientation::NONE, text::RelOrientation::FRAME ));
 
         }
 
@@ -1794,25 +1794,25 @@ bool SwFEShell::ReplaceSdrObj( const OUString& rGrfName, const OUString& rFltNam
     return bRet;
 }
 
-static sal_uInt16 SwFmtGetPageNum(const SwFlyFrmFmt * pFmt)
+static sal_uInt16 SwFormatGetPageNum(const SwFlyFrameFormat * pFormat)
 {
-    OSL_ENSURE(pFmt != NULL, "invalid argument");
+    OSL_ENSURE(pFormat != NULL, "invalid argument");
 
-    SwFlyFrm * pFrm = pFmt->GetFrm();
+    SwFlyFrm * pFrm = pFormat->GetFrm();
 
     sal_uInt16 aResult;
 
     if (pFrm != NULL)
         aResult = pFrm->GetPhyPageNum();
     else
-        aResult = pFmt->GetAnchor().GetPageNum();
+        aResult = pFormat->GetAnchor().GetPageNum();
 
     return aResult;
 }
 
 #include <fmtcnct.hxx>
 
-void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
+void SwFEShell::GetConnectableFrameFormats(SwFrameFormat & rFormat,
                                       const OUString & rReference,
                                       bool bSuccessors,
                                       ::std::vector< OUString > & aPrevPageVec,
@@ -1822,12 +1822,12 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
 {
     StartAction();
 
-    SwFmtChain rChain = rFmt.GetChain();
-    SwFrmFmt * pOldChainNext = (SwFrmFmt *) rChain.GetNext();
-    SwFrmFmt * pOldChainPrev = (SwFrmFmt *) rChain.GetPrev();
+    SwFormatChain rChain = rFormat.GetChain();
+    SwFrameFormat * pOldChainNext = (SwFrameFormat *) rChain.GetNext();
+    SwFrameFormat * pOldChainPrev = (SwFrameFormat *) rChain.GetPrev();
 
     if (pOldChainNext)
-        mpDoc->Unchain(rFmt);
+        mpDoc->Unchain(rFormat);
 
     if (pOldChainPrev)
         mpDoc->Unchain(*pOldChainPrev);
@@ -1835,32 +1835,32 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
     const size_t nCnt = mpDoc->GetFlyCount(FLYCNTTYPE_FRM);
 
     /* potential successors resp. predecessors */
-    ::std::vector< const SwFrmFmt * > aTmpSpzArray;
+    ::std::vector< const SwFrameFormat * > aTmpSpzArray;
 
     mpDoc->FindFlyByName(rReference);
 
     for (size_t n = 0; n < nCnt; ++n)
     {
-        const SwFrmFmt & rFmt1 = *(mpDoc->GetFlyNum(n, FLYCNTTYPE_FRM));
+        const SwFrameFormat & rFormat1 = *(mpDoc->GetFlyNum(n, FLYCNTTYPE_FRM));
 
         /*
-           pFmt is a potential successor of rFmt if it is chainable after
-           rFmt.
+           pFormat is a potential successor of rFormat if it is chainable after
+           rFormat.
 
-           pFmt is a potential predecessor of rFmt if rFmt is chainable
-           after pFmt.
+           pFormat is a potential predecessor of rFormat if rFormat is chainable
+           after pFormat.
         */
 
         SwChainRet nChainState;
 
         if (bSuccessors)
-            nChainState = mpDoc->Chainable(rFmt, rFmt1);
+            nChainState = mpDoc->Chainable(rFormat, rFormat1);
         else
-            nChainState = mpDoc->Chainable(rFmt1, rFmt);
+            nChainState = mpDoc->Chainable(rFormat1, rFormat);
 
         if (nChainState == SwChainRet::OK)
         {
-            aTmpSpzArray.push_back(&rFmt1);
+            aTmpSpzArray.push_back(&rFormat1);
 
         }
 
@@ -1873,21 +1873,21 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
         aNextPageVec.clear();
         aRestVec.clear();
 
-        /* number of page rFmt resides on */
-        sal_uInt16 nPageNum = SwFmtGetPageNum(static_cast<SwFlyFrmFmt *>(&rFmt));
+        /* number of page rFormat resides on */
+        sal_uInt16 nPageNum = SwFormatGetPageNum(static_cast<SwFlyFrameFormat *>(&rFormat));
 
-        ::std::vector< const SwFrmFmt * >::const_iterator aIt;
+        ::std::vector< const SwFrameFormat * >::const_iterator aIt;
 
         for (aIt = aTmpSpzArray.begin(); aIt != aTmpSpzArray.end(); ++aIt)
         {
             const OUString aString = (*aIt)->GetName();
 
-            /* rFmt is not a valid successor or predecessor of
+            /* rFormat is not a valid successor or predecessor of
                itself */
-            if (aString != rReference && aString != rFmt.GetName())
+            if (aString != rReference && aString != rFormat.GetName())
             {
                 sal_uInt16 nNum1 =
-                    SwFmtGetPageNum(static_cast<const SwFlyFrmFmt *>(*aIt));
+                    SwFormatGetPageNum(static_cast<const SwFlyFrameFormat *>(*aIt));
 
                 if (nNum1 == nPageNum -1)
                     aPrevPageVec.push_back(aString);
@@ -1903,10 +1903,10 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
     }
 
     if (pOldChainNext)
-        mpDoc->Chain(rFmt, *pOldChainNext);
+        mpDoc->Chain(rFormat, *pOldChainNext);
 
     if (pOldChainPrev)
-        mpDoc->Chain(*pOldChainPrev, rFmt);
+        mpDoc->Chain(*pOldChainPrev, rFormat);
 
     EndAction();
 }
@@ -1920,10 +1920,10 @@ OUString SwFEShell::GetObjTitle() const
         if ( pMrkList->GetMarkCount() == 1 )
         {
             const SdrObject* pObj = pMrkList->GetMark( 0 )->GetMarkedSdrObj();
-            const SwFrmFmt* pFmt = FindFrmFmt( pObj );
-            if ( pFmt->Which() == RES_FLYFRMFMT )
+            const SwFrameFormat* pFormat = FindFrameFormat( pObj );
+            if ( pFormat->Which() == RES_FLYFRMFMT )
             {
-                return static_cast<const SwFlyFrmFmt*>(pFmt)->GetObjTitle();
+                return static_cast<const SwFlyFrameFormat*>(pFormat)->GetObjTitle();
             }
             return pObj->GetTitle();
         }
@@ -1940,10 +1940,10 @@ void SwFEShell::SetObjTitle( const OUString& rTitle )
         if ( pMrkList->GetMarkCount() == 1 )
         {
             SdrObject* pObj = pMrkList->GetMark( 0 )->GetMarkedSdrObj();
-            SwFrmFmt* pFmt = FindFrmFmt( pObj );
-            if ( pFmt->Which() == RES_FLYFRMFMT )
+            SwFrameFormat* pFormat = FindFrameFormat( pObj );
+            if ( pFormat->Which() == RES_FLYFRMFMT )
             {
-                GetDoc()->SetFlyFrmTitle( dynamic_cast<SwFlyFrmFmt&>(*pFmt),
+                GetDoc()->SetFlyFrmTitle( dynamic_cast<SwFlyFrameFormat&>(*pFormat),
                                           rTitle );
             }
             else
@@ -1962,10 +1962,10 @@ OUString SwFEShell::GetObjDescription() const
         if ( pMrkList->GetMarkCount() == 1 )
         {
             const SdrObject* pObj = pMrkList->GetMark( 0 )->GetMarkedSdrObj();
-            const SwFrmFmt* pFmt = FindFrmFmt( pObj );
-            if ( pFmt->Which() == RES_FLYFRMFMT )
+            const SwFrameFormat* pFormat = FindFrameFormat( pObj );
+            if ( pFormat->Which() == RES_FLYFRMFMT )
             {
-                return dynamic_cast<const SwFlyFrmFmt&>(*pFmt).GetObjDescription();
+                return dynamic_cast<const SwFlyFrameFormat&>(*pFormat).GetObjDescription();
             }
             return pObj->GetDescription();
         }
@@ -1982,10 +1982,10 @@ void SwFEShell::SetObjDescription( const OUString& rDescription )
         if ( pMrkList->GetMarkCount() == 1 )
         {
             SdrObject* pObj = pMrkList->GetMark( 0 )->GetMarkedSdrObj();
-            SwFrmFmt* pFmt = FindFrmFmt( pObj );
-            if ( pFmt->Which() == RES_FLYFRMFMT )
+            SwFrameFormat* pFormat = FindFrameFormat( pObj );
+            if ( pFormat->Which() == RES_FLYFRMFMT )
             {
-                GetDoc()->SetFlyFrmDescription(dynamic_cast<SwFlyFrmFmt&>(*pFmt),
+                GetDoc()->SetFlyFrmDescription(dynamic_cast<SwFlyFrameFormat&>(*pFormat),
                                                rDescription);
             }
             else
@@ -2010,10 +2010,10 @@ void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedO
     if (!pFly)
         pFly = FindFlyFrm( xObj );
     OSL_ENSURE( pFly , "No fly frame!" );
-    SwFrmFmt * pFrmFmt = pFly ? pFly->GetFmt() : 0;
+    SwFrameFormat * pFrameFormat = pFly ? pFly->GetFormat() : 0;
 
     // baseline to baseline alignment should only be applied to formulas anchored as char
-    if ( pFly && pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
+    if ( pFly && pFrameFormat && FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId() )
     {
         // get baseline from Math object
         uno::Any aBaseline;
@@ -2040,19 +2040,19 @@ void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedO
 
         OSL_ENSURE( nBaseline > 0, "Wrong value of Baseline while retrieving from Starmath!" );
         //nBaseline must be moved by aPrt position
-        const SwFlyFrmFmt *pFlyFrmFmt = pFly->GetFmt();
-        OSL_ENSURE( pFlyFrmFmt, "fly frame format missing!" );
-        if ( pFlyFrmFmt )
-            nBaseline += pFlyFrmFmt->GetLastFlyFrmPrtRectPos().Y();
+        const SwFlyFrameFormat *pFlyFrameFormat = pFly->GetFormat();
+        OSL_ENSURE( pFlyFrameFormat, "fly frame format missing!" );
+        if ( pFlyFrameFormat )
+            nBaseline += pFlyFrameFormat->GetLastFlyFrmPrtRectPos().Y();
 
-        const SwFmtVertOrient &rVert = pFrmFmt->GetVertOrient();
-        SwFmtVertOrient aVert( rVert );
+        const SwFormatVertOrient &rVert = pFrameFormat->GetVertOrient();
+        SwFormatVertOrient aVert( rVert );
         aVert.SetPos( -nBaseline );
         aVert.SetVertOrient( com::sun::star::text::VertOrientation::NONE );
 
-        pFrmFmt->LockModify();
-        pFrmFmt->SetFmtAttr( aVert );
-        pFrmFmt->UnlockModify();
+        pFrameFormat->LockModify();
+        pFrameFormat->SetFormatAttr( aVert );
+        pFrameFormat->UnlockModify();
         pFly->InvalidatePos();
     }
 }
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index 92938ba8f73a..cd9804ac3336 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -44,9 +44,9 @@ using namespace com::sun::star;
 SwFlyFrm *SwFEShell::FindFlyFrm( const uno::Reference < embed::XEmbeddedObject >& xObj ) const
 {
     SwFlyFrm *pFly = FindFlyFrm();
-    if ( pFly && pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
+    if ( pFly && pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
     {
-        SwOLENode *pNd = static_cast<SwNoTxtFrm*>(pFly->Lower())->GetNode()->GetOLENode();
+        SwOLENode *pNd = static_cast<SwNoTextFrm*>(pFly->Lower())->GetNode()->GetOLENode();
         if ( !pNd || pNd->GetOLEObj().GetOleRef() != xObj )
             pFly = 0;
     }
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 00eee4f83788..fe38a2244993 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -106,12 +106,12 @@ SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, SwViewShell *pSh )
 
 static void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm* pOldSelFly)
 {
-    const SwFrmFmt *pFlyFmt = pSh->SelFlyGrabCrsr();
-    if( pFlyFmt && !pSh->ActionPend() &&
-                        (!pOldSelFly || pOldSelFly->GetFmt() != pFlyFmt) )
+    const SwFrameFormat *pFlyFormat = pSh->SelFlyGrabCrsr();
+    if( pFlyFormat && !pSh->ActionPend() &&
+                        (!pOldSelFly || pOldSelFly->GetFormat() != pFlyFormat) )
     {
         // now call set macro if applicable
-        pSh->GetFlyMacroLnk().Call( (void*)pFlyFmt );
+        pSh->GetFlyMacroLnk().Call( (void*)pFlyFormat );
 extern bool g_bNoInterrupt;       // in swmodule.cxx
         // if a dialog was started inside a macro, then
         // MouseButtonUp arrives at macro and not to us. Therefore
@@ -120,7 +120,7 @@ extern bool g_bNoInterrupt;       // in swmodule.cxx
 
         g_bNoInterrupt = false;
     }
-    else if( !pFlyFmt || RES_DRAWFRMFMT == pFlyFmt->Which() )
+    else if( !pFlyFormat || RES_DRAWFRMFMT == pFlyFormat->Which() )
     {
         // --> assure consistent cursor
         pSh->KillPams();
@@ -158,7 +158,7 @@ bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj )
             {
                 const sal_uInt16 nType = GetCntType();
                 if( nType != CNT_TXT || (SW_LEAVE_FRAME & nFlag) ||
-                    ( pOldSelFly->GetFmt()->GetProtect().IsCntntProtected()
+                    ( pOldSelFly->GetFormat()->GetProtect().IsContentProtected()
                      && !IsReadOnlyAvailable() ))
                 {
                     // If a fly is deselected, which contains graphic, OLE or
@@ -175,7 +175,7 @@ bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj )
                         LockView( false );
                 }
                 if ( nType & CNT_GRF &&
-                     static_cast<SwNoTxtFrm*>(pOldSelFly->Lower())->HasAnimation() )
+                     static_cast<SwNoTextFrm*>(pOldSelFly->Lower())->HasAnimation() )
                 {
                     GetWin()->Invalidate( pOldSelFly->Frm().SVRect() );
                 }
@@ -229,15 +229,15 @@ bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj )
     }
 
     // If the fly frame is a textbox of a shape, then select the shape instead.
-    std::map<SwFrmFmt*, SwFrmFmt*> aTextBoxShapes = SwTextBoxHelper::findShapes(mpDoc);
+    std::map<SwFrameFormat*, SwFrameFormat*> aTextBoxShapes = SwTextBoxHelper::findShapes(mpDoc);
     for (size_t i = 0; i < rMrkList.GetMarkCount(); ++i)
     {
         SdrObject* pObject = rMrkList.GetMark(i)->GetMarkedSdrObj();
         SwContact* pDrawContact = static_cast<SwContact*>(GetUserCall(pObject));
-        SwFrmFmt* pFmt = pDrawContact->GetFmt();
-        if (aTextBoxShapes.find(pFmt) != aTextBoxShapes.end())
+        SwFrameFormat* pFormat = pDrawContact->GetFormat();
+        if (aTextBoxShapes.find(pFormat) != aTextBoxShapes.end())
         {
-            SdrObject* pShape = aTextBoxShapes[pFmt]->FindSdrObject();
+            SdrObject* pShape = aTextBoxShapes[pFormat]->FindSdrObject();
             pDView->UnmarkAll();
             pDView->MarkObj(pShape, Imp()->GetPageView(), bAddSelect, bEnterGroup);
             break;
@@ -251,8 +251,8 @@ bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj )
         {
             const SwFlyFrm *pTmp = GetFlyFromMarked( &rMrkList, this );
             OSL_ENSURE( pTmp, "Graphic without Fly" );
-            if ( static_cast<const SwNoTxtFrm*>(pTmp->Lower())->HasAnimation() )
-                static_cast<const SwNoTxtFrm*>(pTmp->Lower())->StopAnimation( GetOut() );
+            if ( static_cast<const SwNoTextFrm*>(pTmp->Lower())->HasAnimation() )
+                static_cast<const SwNoTextFrm*>(pTmp->Lower())->StopAnimation( GetOut() );
         }
     }
     else if ( !pOldSelFly && bHadSelection )
@@ -313,14 +313,14 @@ bool SwFEShell::MoveAnchor( SwMove nDir )
         SwFrm* pNew = pOld;
         // #i28701#
         SwAnchoredObject* pAnchoredObj = ::GetUserCall( pObj )->GetAnchoredObj( pObj );
-        SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
-        SwFmtAnchor aAnch( rFmt.GetAnchor() );
+        SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat();
+        SwFormatAnchor aAnch( rFormat.GetAnchor() );
         RndStdIds nAnchorId = aAnch.GetAnchorId();
         if ( FLY_AS_CHAR == nAnchorId )
             return false;
         if( pOld->IsVertical() )
         {
-            if( pOld->IsTxtFrm() )
+            if( pOld->IsTextFrm() )
             {
                 switch( nDir ) {
                     case SwMove::UP: nDir = SwMove::LEFT; break;
@@ -354,18 +354,18 @@ bool SwFEShell::MoveAnchor( SwMove nDir )
             }
             case FLY_AT_CHAR:
             {
-                OSL_ENSURE( pOld->IsCntntFrm(), "Wrong anchor, page expected." );
+                OSL_ENSURE( pOld->IsContentFrm(), "Wrong anchor, page expected." );
                 if( SwMove::LEFT == nDir || SwMove::RIGHT == nDir )
                 {
-                    SwPosition pos = *aAnch.GetCntntAnchor();
-                    SwTxtNode* pTxtNd = static_cast<SwTxtFrm*>(pOld)->GetTxtNode();
+                    SwPosition pos = *aAnch.GetContentAnchor();
+                    SwTextNode* pTextNd = static_cast<SwTextFrm*>(pOld)->GetTextNode();
                     const sal_Int32 nAct = pos.nContent.GetIndex();
                     if( SwMove::LEFT == nDir )
                     {
                         bRet = true;
                         if( nAct )
                         {
-                            pos.nContent.Assign( pTxtNd, nAct-1 );
+                            pos.nContent.Assign( pTextNd, nAct-1 );
                         }
                         else
                             nDir = SwMove::UP;
@@ -373,39 +373,39 @@ bool SwFEShell::MoveAnchor( SwMove nDir )
                     else
                     {
                         const sal_Int32 nMax =
-                            static_cast<SwTxtFrm*>(pOld)->GetTxtNode()->GetTxt().getLength();
+                            static_cast<SwTextFrm*>(pOld)->GetTextNode()->GetText().getLength();
                         if( nAct < nMax )
                         {
                             bRet = true;
-                            pos.nContent.Assign( pTxtNd, nAct+1 );
+                            pos.nContent.Assign( pTextNd, nAct+1 );
                         }
                         else
                             nDir = SwMove::DOWN;
                     }
-                    if( pos != *aAnch.GetCntntAnchor())
+                    if( pos != *aAnch.GetContentAnchor())
                         aAnch.SetAnchor( &pos );
                 }
             } // no break!
             case FLY_AT_PARA:
             {
-                OSL_ENSURE( pOld->IsCntntFrm(), "Wrong anchor, page expected." );
+                OSL_ENSURE( pOld->IsContentFrm(), "Wrong anchor, page expected." );
                 if( SwMove::UP == nDir )
                     pNew = pOld->FindPrev();
                 else if( SwMove::DOWN == nDir )
                     pNew = pOld->FindNext();
-                if( pNew && pNew != pOld && pNew->IsCntntFrm() )
+                if( pNew && pNew != pOld && pNew->IsContentFrm() )
                 {
-                    SwPosition pos = *aAnch.GetCntntAnchor();
-                    SwTxtNode* pTxtNd = static_cast<SwTxtFrm*>(pNew)->GetTxtNode();
-                    pos.nNode = *pTxtNd;
+                    SwPosition pos = *aAnch.GetContentAnchor();
+                    SwTextNode* pTextNd = static_cast<SwTextFrm*>(pNew)->GetTextNode();
+                    pos.nNode = *pTextNd;
                     sal_Int32 nTmp = 0;
                     if( bRet )
                     {
-                        nTmp = static_cast<SwTxtFrm*>(pNew)->GetTxtNode()->GetTxt().getLength();
+                        nTmp = static_cast<SwTextFrm*>(pNew)->GetTextNode()->GetText().getLength();
                         if( nTmp )
                             --nTmp;
                     }
-                    pos.nContent.Assign( pTxtNd, nTmp );
+                    pos.nContent.Assign( pTextNd, nTmp );
                     aAnch.SetAnchor( &pos );
                     bRet = true;
                 }
@@ -492,8 +492,8 @@ bool SwFEShell::MoveAnchor( SwMove nDir )
 
                 if( pNewFly )
                 {
-                    SwPosition aPos( *pNewFly->GetFmt()->
-                                        GetCntnt().GetCntntIdx());
+                    SwPosition aPos( *pNewFly->GetFormat()->
+                                        GetContent().GetContentIdx());
                     aAnch.SetAnchor( &aPos );
                     bRet = true;
                 }
@@ -510,13 +510,13 @@ bool SwFEShell::MoveAnchor( SwMove nDir )
             // anchor attribute is change and re-create them afterwards.
             {
                 SwHandleAnchorNodeChg* pHandleAnchorNodeChg( 0L );
-                SwFlyFrmFmt* pFlyFrmFmt( dynamic_cast<SwFlyFrmFmt*>(&rFmt) );
-                if ( pFlyFrmFmt )
+                SwFlyFrameFormat* pFlyFrameFormat( dynamic_cast<SwFlyFrameFormat*>(&rFormat) );
+                if ( pFlyFrameFormat )
                 {
                     pHandleAnchorNodeChg =
-                        new SwHandleAnchorNodeChg( *pFlyFrmFmt, aAnch );
+                        new SwHandleAnchorNodeChg( *pFlyFrameFormat, aAnch );
                 }
-                rFmt.GetDoc()->SetAttr( aAnch, rFmt );
+                rFormat.GetDoc()->SetAttr( aAnch, rFormat );
                 delete pHandleAnchorNodeChg;
             }
             // #i28701# - no call of method
@@ -734,8 +734,8 @@ void SwFEShell::BreakDrag()
     SetChainMarker();
 }
 
-// If a fly is selected, pulls the crsr in the first CntntFrm
-const SwFrmFmt* SwFEShell::SelFlyGrabCrsr()
+// If a fly is selected, pulls the crsr in the first ContentFrm
+const SwFrameFormat* SwFEShell::SelFlyGrabCrsr()
 {
     if ( Imp()->HasDrawView() )
     {
@@ -744,10 +744,10 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr()
 
         if( pFly )
         {
-            SwCntntFrm *pCFrm = pFly->ContainsCntnt();
+            SwContentFrm *pCFrm = pFly->ContainsContent();
             if ( pCFrm )
             {
-                SwCntntNode *pCNode = pCFrm->GetNode();
+                SwContentNode *pCNode = pCFrm->GetNode();
                 // --> assure, that the cursor is consistent.
                 KillPams();
                 ClearMark();
@@ -761,7 +761,7 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr()
                 rChrRect.Pos() += pFly->Frm().Pos();
                 GetCrsrDocPos() = rChrRect.Pos();
             }
-            return pFly->GetFmt();
+            return pFly->GetFormat();
         }
     }
     return 0;
@@ -786,7 +786,7 @@ static void lcl_NotifyNeighbours( const SdrMarkList *pLst )
         {
             SwFlyFrm *pFly = static_cast<SwVirtFlyDrawObj*>(pO)->GetFlyFrm();
 
-            const SwFmtHoriOrient &rHori = pFly->GetFmt()->GetHoriOrient();
+            const SwFormatHoriOrient &rHori = pFly->GetFormat()->GetHoriOrient();
             aHori = rHori.GetHoriOrient();
             if( text::HoriOrientation::NONE != aHori && text::HoriOrientation::CENTER != aHori &&
                 pFly->IsFlyAtCntFrm() )
@@ -821,19 +821,19 @@ static void lcl_NotifyNeighbours( const SdrMarkList *pLst )
             aTmpCalcPnt += pAct->Frm().Pos();
             if ( aRect.IsOver( aTmpCalcPnt ) )
             {
-                SwCntntFrm *pCnt = pAct->ContainsCntnt();
+                SwContentFrm *pCnt = pAct->ContainsContent();
                 while ( pCnt )
                 {
                     aTmpCalcPnt = pCnt->Prt();
                     aTmpCalcPnt += pCnt->Frm().Pos();
                     if ( aRect.IsOver( aTmpCalcPnt ) )
                         static_cast<SwFrm*>(pCnt)->Prepare( PREP_FLY_ATTR_CHG );
-                    pCnt = pCnt->GetNextCntntFrm();
+                    pCnt = pCnt->GetNextContentFrm();
                 }
             }
             if ( bCheckNeighbours && pAct->IsFlyAtCntFrm() )
             {
-                const SwFmtHoriOrient &rH = pAct->GetFmt()->GetHoriOrient();
+                const SwFormatHoriOrient &rH = pAct->GetFormat()->GetHoriOrient();
                 if ( rH.GetHoriOrient() == aHori &&
                      pAct->Frm().Top()    <= aRect.Bottom() &&
                      pAct->Frm().Bottom() >= aRect.Top() )
@@ -943,10 +943,10 @@ void SwFEShell::ChangeOpaque( SdrLayerID nLayerId )
                 InvalidateWindows( SwRect( pObj->GetCurrentBoundRect() ) );
                 if ( pObj->ISA(SwVirtFlyDrawObj) )
                 {
-                    SwFmt *pFmt = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm()->GetFmt();
-                    SvxOpaqueItem aOpa( pFmt->GetOpaque() );
+                    SwFormat *pFormat = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm()->GetFormat();
+                    SvxOpaqueItem aOpa( pFormat->GetOpaque() );
                     aOpa.SetValue(  nLayerId == pIDDMA->GetHellId() );
-                    pFmt->SetFmtAttr( aOpa );
+                    pFormat->SetFormatAttr( aOpa );
                 }
             }
         }
@@ -1134,8 +1134,8 @@ bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
                 if ( pObj->GetLayer() == pIDDMA->GetHellId() )
                 {
                     const SwAnchoredObject* pAnchoredObj = ::GetUserCall( pObj )->GetAnchoredObj( pObj );
-                    const SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
-                    const SwFmtSurround& rSurround = rFmt.GetSurround();
+                    const SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat();
+                    const SwFormatSurround& rSurround = rFormat.GetSurround();
                     if ( rSurround.GetSurround() == SURROUND_THROUGHT )
                     {
                         bObjInBackground = true;
@@ -1147,21 +1147,21 @@ bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
                 const SwPageFrm* pPageFrm = GetLayout()->GetPageAtPos( rPt );
                 if( pPageFrm )
                 {
-                    const SwCntntFrm* pCntntFrm( pPageFrm->ContainsCntnt() );
-                    while ( pCntntFrm )
+                    const SwContentFrm* pContentFrm( pPageFrm->ContainsContent() );
+                    while ( pContentFrm )
                     {
-                        if ( pCntntFrm->UnionFrm().IsInside( rPt ) )
+                        if ( pContentFrm->UnionFrm().IsInside( rPt ) )
                         {
-                            const SwTxtFrm* pTxtFrm =
-                                    dynamic_cast<const SwTxtFrm*>(pCntntFrm);
-                            if ( pTxtFrm )
+                            const SwTextFrm* pTextFrm =
+                                    dynamic_cast<const SwTextFrm*>(pContentFrm);
+                            if ( pTextFrm )
                             {
-                                SwPosition aPos( *(pTxtFrm->GetTxtNode()) );
+                                SwPosition aPos( *(pTextFrm->GetTextNode()) );
                                 Point aTmpPt( rPt );
-                                if (pTxtFrm->GetKeyCrsrOfst(&aPos, aTmpPt))
+                                if (pTextFrm->GetKeyCrsrOfst(&aPos, aTmpPt))
                                 {
                                     SwRect aCursorCharRect;
-                                    if (pTxtFrm->GetCharRect(aCursorCharRect,
+                                    if (pTextFrm->GetCharRect(aCursorCharRect,
                                                 aPos))
                                     {
                                         if ( aCursorCharRect.IsOver( SwRect( pObj->GetLastBoundRect() ) ) )
@@ -1178,7 +1178,7 @@ bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
                             break;
                         }
 
-                        pCntntFrm = pCntntFrm->GetNextCntntFrm();
+                        pContentFrm = pContentFrm->GetNextContentFrm();
                     }
                 }
             }
@@ -1187,7 +1187,7 @@ bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
             SwContact* pContact = static_cast<SwContact*>(pObj->GetUserCall());
             if (pContact && !pContact->ObjAnchoredAtPage() )
             {
-                const SwPosition& rPos = pContact->GetCntntAnchor();
+                const SwPosition& rPos = pContact->GetContentAnchor();
                 bool bInHdrFtr = GetDoc()->IsInHeaderFooter( rPos.nNode );
                 if ( ( IsHeaderFooterEdit() && !bInHdrFtr ) ||
                      ( !IsHeaderFooterEdit() && bInHdrFtr ) )
@@ -1344,19 +1344,19 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, sal_uInt16 /*GOTOOBJ_...*
                     switch ( eType )
                     {
                         case GOTOOBJ_FLY_FRM:
-                            if ( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
+                            if ( pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
                                 continue;
                         break;
                         case GOTOOBJ_FLY_GRF:
                             if ( pFly->Lower() &&
                                 (pFly->Lower()->IsLayoutFrm() ||
-                                !static_cast<SwCntntFrm*>(pFly->Lower())->GetNode()->GetGrfNode()))
+                                !static_cast<SwContentFrm*>(pFly->Lower())->GetNode()->GetGrfNode()))
                                 continue;
                         break;
                         case GOTOOBJ_FLY_OLE:
                             if ( pFly->Lower() &&
                                 (pFly->Lower()->IsLayoutFrm() ||
-                                !static_cast<SwCntntFrm*>(pFly->Lower())->GetNode()->GetOLENode()))
+                                !static_cast<SwContentFrm*>(pFly->Lower())->GetNode()->GetOLENode()))
                                 continue;
                         break;
                     }
@@ -1582,7 +1582,7 @@ bool SwFEShell::ImpEndCreate()
                         : 0xFFFF;
 
     // default for controls character bound, otherwise paragraph bound.
-    SwFmtAnchor aAnch;
+    SwFormatAnchor aAnch;
     const SwFrm *pAnch = 0;
     bool bCharBound = false;
     if( rSdrObj.ISA( SdrUnoObj ) )
@@ -1595,7 +1595,7 @@ bool SwFEShell::ImpEndCreate()
         // characterbinding not allowed in readonly-content
         if( !aPos.nNode.GetNode().IsProtect() )
         {
-            pAnch = aPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(), &aPoint, &aPos );
+            pAnch = aPos.nNode.GetNode().GetContentNode()->getLayoutFrm( GetLayout(), &aPoint, &aPos );
             SwRect aTmp;
             pAnch->GetCharRect( aTmp, aPos );
 
@@ -1645,7 +1645,7 @@ bool SwFEShell::ImpEndCreate()
             bAtPage = true;
         }
 
-        SwCntntNode* pCNode = aPos.nNode.GetNode().GetCntntNode();
+        SwContentNode* pCNode = aPos.nNode.GetNode().GetContentNode();
         pAnch = pCNode ? pCNode->getLayoutFrm( GetLayout(), &aPoint, 0, false ) : NULL;
         if (!pAnch)
         {
@@ -1681,7 +1681,7 @@ bool SwFEShell::ImpEndCreate()
             // Always via FindAnchor, to assure the frame will be bound
             // to the previous. With GetCrsOfst we can also reach the next. THIS IS WRONG.
             pAnch = ::FindAnchor( pPage, aPt, bBodyOnly );
-            aPos.nNode = *static_cast<const SwCntntFrm*>(pAnch)->GetNode();
+            aPos.nNode = *static_cast<const SwContentFrm*>(pAnch)->GetNode();
 
             // do not set in ReadnOnly-content
             if( aPos.nNode.GetNode().IsProtect() )
@@ -1722,9 +1722,9 @@ bool SwFEShell::ImpEndCreate()
             nXOffset = pAnch->Frm().Left()+pAnch->Frm().Width()-rBound.Right();
         else
             nXOffset = rBound.Left() - pAnch->Frm().Left();
-        if( pAnch->IsTxtFrm() && static_cast<const SwTxtFrm*>(pAnch)->IsFollow() )
+        if( pAnch->IsTextFrm() && static_cast<const SwTextFrm*>(pAnch)->IsFollow() )
         {
-            const SwTxtFrm* pTmp = static_cast<const SwTxtFrm*>(pAnch);
+            const SwTextFrm* pTmp = static_cast<const SwTextFrm*>(pAnch);
             do {
                 pTmp = pTmp->FindMaster();
                 OSL_ENSURE( pTmp, "Where's my Master?" );
@@ -1741,12 +1741,12 @@ bool SwFEShell::ImpEndCreate()
         // For OBJ_NONE a fly is inserted.
         const long nWidth = rBound.Right()  - rBound.Left();
         const long nHeight= rBound.Bottom() - rBound.Top();
-        aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE, std::max( nWidth,  long(MINFLY) ),
+        aSet.Put( SwFormatFrmSize( ATT_MIN_SIZE, std::max( nWidth,  long(MINFLY) ),
                                               std::max( nHeight, long(MINFLY) )));
 
-        SwFmtHoriOrient aHori( nXOffset, text::HoriOrientation::NONE, text::RelOrientation::FRAME );
-        SwFmtVertOrient aVert( nYOffset, text::VertOrientation::NONE, text::RelOrientation::FRAME );
-        aSet.Put( SwFmtSurround( SURROUND_PARALLEL ) );
+        SwFormatHoriOrient aHori( nXOffset, text::HoriOrientation::NONE, text::RelOrientation::FRAME );
+        SwFormatVertOrient aVert( nYOffset, text::VertOrientation::NONE, text::RelOrientation::FRAME );
+        aSet.Put( SwFormatSurround( SURROUND_PARALLEL ) );
         aSet.Put( aHori );
         aSet.Put( aVert );
 
@@ -1797,7 +1797,7 @@ bool SwFEShell::ImpEndCreate()
             aVert.SetRelationOrient( text::RelOrientation::PRINT_AREA );
             aHtmlSet.Put( aVert );
 
-            GetDoc()->SetAttr( aHtmlSet, *pFlyFrm->GetFmt() );
+            GetDoc()->SetAttr( aHtmlSet, *pFlyFrm->GetFormat() );
         }
     }
     else
@@ -1809,14 +1809,14 @@ bool SwFEShell::ImpEndCreate()
             aRelNullPt = rBound.TopLeft();
 
         aSet.Put( aAnch );
-        aSet.Put( SwFmtSurround( SURROUND_THROUGHT ) );
+        aSet.Put( SwFormatSurround( SURROUND_THROUGHT ) );
         // OD 2004-03-30 #i26791# - set horizontal position
-        SwFmtHoriOrient aHori( nXOffset, text::HoriOrientation::NONE, text::RelOrientation::FRAME );
+        SwFormatHoriOrient aHori( nXOffset, text::HoriOrientation::NONE, text::RelOrientation::FRAME );
         aSet.Put( aHori );
         // OD 2004-03-30 #i26791# - set vertical position
-        if( pAnch->IsTxtFrm() && static_cast<const SwTxtFrm*>(pAnch)->IsFollow() )
+        if( pAnch->IsTextFrm() && static_cast<const SwTextFrm*>(pAnch)->IsFollow() )
         {
-            const SwTxtFrm* pTmp = static_cast<const SwTxtFrm*>(pAnch);
+            const SwTextFrm* pTmp = static_cast<const SwTextFrm*>(pAnch);
             do {
                 pTmp = pTmp->FindMaster();
                 assert(pTmp && "Where's my Master?");
@@ -1824,32 +1824,32 @@ bool SwFEShell::ImpEndCreate()
                             pTmp->Prt().Width() : pTmp->Prt().Height();
             } while ( pTmp->IsFollow() );
         }
-        SwFmtVertOrient aVert( nYOffset, text::VertOrientation::NONE, text::RelOrientation::FRAME );
+        SwFormatVertOrient aVert( nYOffset, text::VertOrientation::NONE, text::RelOrientation::FRAME );
         aSet.Put( aVert );
-        SwDrawFrmFmt* pFmt = static_cast<SwDrawFrmFmt*>(getIDocumentLayoutAccess()->MakeLayoutFmt( RND_DRAW_OBJECT, &aSet ));
+        SwDrawFrameFormat* pFormat = static_cast<SwDrawFrameFormat*>(getIDocumentLayoutAccess()->MakeLayoutFormat( RND_DRAW_OBJECT, &aSet ));
         // #i36010# - set layout direction of the position
-        pFmt->SetPositionLayoutDir(
+        pFormat->SetPositionLayoutDir(
             text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
         // #i44344#, #i44681# - positioning attributes already set
-        pFmt->PosAttrSet();
+        pFormat->PosAttrSet();
 
-        SwDrawContact *pContact = new SwDrawContact( pFmt, &rSdrObj );
+        SwDrawContact *pContact = new SwDrawContact( pFormat, &rSdrObj );
         // #i35635#
         pContact->MoveObjToVisibleLayer( &rSdrObj );
         if( bCharBound )
         {
             OSL_ENSURE( aAnch.GetAnchorId() == FLY_AS_CHAR, "wrong AnchorType" );
-            SwTxtNode *pNd = aAnch.GetCntntAnchor()->nNode.GetNode().GetTxtNode();
-            SwFmtFlyCnt aFmt( pFmt );
-            pNd->InsertItem(aFmt,
-                            aAnch.GetCntntAnchor()->nContent.GetIndex(), 0 );
-            SwFmtVertOrient aVertical( pFmt->GetVertOrient() );
+            SwTextNode *pNd = aAnch.GetContentAnchor()->nNode.GetNode().GetTextNode();
+            SwFormatFlyCnt aFormat( pFormat );
+            pNd->InsertItem(aFormat,
+                            aAnch.GetContentAnchor()->nContent.GetIndex(), 0 );
+            SwFormatVertOrient aVertical( pFormat->GetVertOrient() );
             aVertical.SetVertOrient( text::VertOrientation::LINE_CENTER );
-            pFmt->SetFmtAttr( aVertical );
+            pFormat->SetFormatAttr( aVertical );
         }
-        if( pAnch->IsTxtFrm() && static_cast<const SwTxtFrm*>(pAnch)->IsFollow() )
+        if( pAnch->IsTextFrm() && static_cast<const SwTextFrm*>(pAnch)->IsFollow() )
         {
-            const SwTxtFrm* pTmp = static_cast<const SwTxtFrm*>(pAnch);
+            const SwTextFrm* pTmp = static_cast<const SwTextFrm*>(pAnch);
             do {
                 pTmp = pTmp->FindMaster();
                 OSL_ENSURE( pTmp, "Where's my Master?" );
@@ -2009,7 +2009,7 @@ short SwFEShell::GetAnchorId() const
                 break;
             }
             SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
-            short nId = static_cast<short>(pContact->GetFmt()->GetAnchor().GetAnchorId());
+            short nId = static_cast<short>(pContact->GetFormat()->GetAnchor().GetAnchorId());
             if ( nRet == SHRT_MAX )
                 nRet = nId;
             else if ( nRet != nId )
@@ -2117,7 +2117,7 @@ bool SwFEShell::IsGroupSelected()
                  // --> #i38505# No ungroup allowed for 3d objects
                  !pObj->Is3DObj() &&
                  FLY_AS_CHAR != static_cast<SwDrawContact*>(GetUserCall(pObj))->
-                                      GetFmt()->GetAnchor().GetAnchorId() )
+                                      GetFormat()->GetAnchor().GetAnchorId() )
             {
                 return true;
             }
@@ -2131,13 +2131,13 @@ namespace
     bool HasSuitableGroupingAnchor(const SdrObject* pObj)
     {
         bool bSuitable = true;
-        SwFrmFmt* pFrmFmt(::FindFrmFmt(const_cast<SdrObject*>(pObj)));
-        if (!pFrmFmt)
+        SwFrameFormat* pFrameFormat(::FindFrameFormat(const_cast<SdrObject*>(pObj)));
+        if (!pFrameFormat)
         {
             OSL_FAIL( "<HasSuitableGroupingAnchor> - missing frame format" );
             bSuitable = false;
         }
-        else if (FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId())
+        else if (FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId())
         {
             bSuitable = false;
         }
@@ -2280,12 +2280,12 @@ bool SwFEShell::GotoFly( const OUString& rName, FlyCntType eType, bool bSelFrm )
              /* FLYCNTTYPE_OLE */   ND_OLENODE
             };
 
-    const SwFlyFrmFmt* pFlyFmt = mpDoc->FindFlyByName( rName, aChkArr[ eType]);
-    if( pFlyFmt )
+    const SwFlyFrameFormat* pFlyFormat = mpDoc->FindFlyByName( rName, aChkArr[ eType]);
+    if( pFlyFormat )
     {
         SET_CURR_SHELL( this );
 
-        SwFlyFrm* pFrm = SwIterator<SwFlyFrm,SwFmt>( *pFlyFmt ).First();
+        SwFlyFrm* pFrm = SwIterator<SwFlyFrm,SwFormat>( *pFlyFormat ).First();
         if( pFrm )
         {
             if( bSelFrm )
@@ -2296,10 +2296,10 @@ bool SwFEShell::GotoFly( const OUString& rName, FlyCntType eType, bool bSelFrm )
             }
             else
             {
-                SwCntntFrm *pCFrm = pFrm->ContainsCntnt();
+                SwContentFrm *pCFrm = pFrm->ContainsContent();
                 if ( pCFrm )
                 {
-                    SwCntntNode *pCNode = pCFrm->GetNode();
+                    SwContentNode *pCNode = pCFrm->GetNode();
                     ClearMark();
                     SwPaM* pCrsr = GetCrsr();
 
@@ -2323,7 +2323,7 @@ size_t SwFEShell::GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes ) const
     return GetDoc()->GetFlyCount(eType, bIgnoreTextBoxes);
 }
 
-const SwFrmFmt*  SwFEShell::GetFlyNum(size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes ) const
+const SwFrameFormat*  SwFEShell::GetFlyNum(size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes ) const
 {
     return GetDoc()->GetFlyNum(nIdx, eType, bIgnoreTextBoxes);
 }
@@ -2360,12 +2360,12 @@ sal_uInt8 SwFEShell::IsSelObjProtected( sal_uInt16 eType ) const
                 if( pObj->ISA(SwVirtFlyDrawObj) )
                 {
                     SwFlyFrm *pFly = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm();
-                    if ( (FLYPROTECT_CONTENT & eType) && pFly->GetFmt()->GetProtect().IsCntntProtected() )
+                    if ( (FLYPROTECT_CONTENT & eType) && pFly->GetFormat()->GetProtect().IsContentProtected() )
                         nChk |= FLYPROTECT_CONTENT;
 
-                    if ( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
+                    if ( pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
                     {
-                        SwOLENode *pNd = static_cast<SwCntntFrm*>(pFly->Lower())->GetNode()->GetOLENode();
+                        SwOLENode *pNd = static_cast<SwContentFrm*>(pFly->Lower())->GetNode()->GetOLENode();
                         uno::Reference < embed::XEmbeddedObject > xObj( pNd ? pNd->GetOLEObj().GetOleRef() : 0 );
                         if ( xObj.is() )
                         {
@@ -2379,7 +2379,7 @@ sal_uInt8 SwFEShell::IsSelObjProtected( sal_uInt16 eType ) const
 
                             // set FLYPROTECT_POS if it is a Math object anchored 'as char' and baseline alignment is activated
                             const bool bProtectMathPos = SotExchange::IsMath( xObj->getClassID() )
-                                    && FLY_AS_CHAR == pFly->GetFmt()->GetAnchor().GetAnchorId()
+                                    && FLY_AS_CHAR == pFly->GetFormat()->GetAnchor().GetAnchorId()
                                     && mpDoc->GetDocumentSettingManager().get( DocumentSettingId::MATH_BASELINE_ALIGNMENT );
                             if ((FLYPROTECT_POS & eType) && bProtectMathPos)
                                 nChk |= FLYPROTECT_POS;
@@ -2420,9 +2420,9 @@ bool SwFEShell::GetObjAttr( SfxItemSet &rSet ) const
         if ( pContact )
         {
             if ( i )
-                rSet.MergeValues( pContact->GetFmt()->GetAttrSet() );
+                rSet.MergeValues( pContact->GetFormat()->GetAttrSet() );
             else
-                rSet.Put( pContact->GetFmt()->GetAttrSet() );
+                rSet.Put( pContact->GetFormat()->GetAttrSet() );
         }
     }
     return true;
@@ -2445,7 +2445,7 @@ bool SwFEShell::SetObjAttr( const SfxItemSet& rSet )
     {
         SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
         SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
-        GetDoc()->SetAttr( rSet, *pContact->GetFmt() );
+        GetDoc()->SetAttr( rSet, *pContact->GetFormat() );
     }
 
     EndUndo( UNDO_INSATTR );
@@ -2466,7 +2466,7 @@ bool SwFEShell::IsAlignPossible() const
             SwDrawContact *pC = static_cast<SwDrawContact*>(GetUserCall(pO));
             OSL_ENSURE( pC, "No SwDrawContact!");
             //only as character bound drawings can be aligned
-            bRet = pC && pC->GetFmt()->GetAnchor().GetAnchorId() == FLY_AS_CHAR;
+            bRet = pC && pC->GetFormat()->GetAnchor().GetAnchorId() == FLY_AS_CHAR;
         }
         if ( bRet )
             return Imp()->GetDrawView()->IsAlignPossible();
@@ -2505,10 +2505,10 @@ void SwFEShell::CheckUnboundObjects()
                     Imp()->GetDrawView()->GetCurrentObjInventor() == SdrInventor ?
                             Imp()->GetDrawView()->GetCurrentObjIdentifier() : 0xFFFF;
 
-            SwFmtAnchor aAnch;
+            SwFormatAnchor aAnch;
             {
             const SwFrm *pAnch = ::FindAnchor( pPage, aPt, true );
-            SwPosition aPos( *static_cast<const SwCntntFrm*>(pAnch)->GetNode() );
+            SwPosition aPos( *static_cast<const SwContentFrm*>(pAnch)->GetNode() );
             aAnch.SetType( FLY_AT_PARA );
             aAnch.SetAnchor( &aPos );
             const_cast<SwRect&>(GetCharRect()).Pos() = aPt;
@@ -2529,11 +2529,11 @@ void SwFEShell::CheckUnboundObjects()
                 aRelNullPt = rBound.TopLeft();
 
             aSet.Put( aAnch );
-            aSet.Put( SwFmtSurround( SURROUND_THROUGHT ) );
-            SwFrmFmt* pFmt = getIDocumentLayoutAccess()->MakeLayoutFmt( RND_DRAW_OBJECT, &aSet );
+            aSet.Put( SwFormatSurround( SURROUND_THROUGHT ) );
+            SwFrameFormat* pFormat = getIDocumentLayoutAccess()->MakeLayoutFormat( RND_DRAW_OBJECT, &aSet );
 
             SwDrawContact *pContact = new SwDrawContact(
-                                            static_cast<SwDrawFrmFmt*>(pFmt), pObj );
+                                            static_cast<SwDrawFrameFormat*>(pFormat), pObj );
 
             // #i35635#
             pContact->MoveObjToVisibleLayer( pObj );
@@ -2549,13 +2549,13 @@ void SwFEShell::SetCalcFieldValueHdl(Outliner* pOutliner)
     GetDoc()->SetCalcFieldValueHdl(pOutliner);
 }
 
-SwChainRet SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource,
+SwChainRet SwFEShell::Chainable( SwRect &rRect, const SwFrameFormat &rSource,
                             const Point &rPt ) const
 {
     rRect.Clear();
 
     // The source is not allowed to have a follow.
-    const SwFmtChain &rChain = rSource.GetChain();
+    const SwFormatChain &rChain = rSource.GetChain();
     if ( rChain.GetNext() )
         return SwChainRet::SOURCE_CHAINED;
 
@@ -2575,20 +2575,20 @@ SwChainRet SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource,
 
             // Target and source should not be equal and the list
             // should not be cyclic
-            SwFrmFmt *pFmt = pFly->GetFmt();
-            nRet = GetDoc()->Chainable(rSource, *pFmt);
+            SwFrameFormat *pFormat = pFly->GetFormat();
+            nRet = GetDoc()->Chainable(rSource, *pFormat);
         }
         pDView->SetHitTolerancePixel( nOld );
     }
     return nRet;
 }
 
-SwChainRet SwFEShell::Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest )
+SwChainRet SwFEShell::Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest )
 {
     return GetDoc()->Chain(rSource, rDest);
 }
 
-SwChainRet SwFEShell::Chain( SwFrmFmt &rSource, const Point &rPt )
+SwChainRet SwFEShell::Chain( SwFrameFormat &rSource, const Point &rPt )
 {
     SwRect aDummy;
     SwChainRet nErr = Chainable( aDummy, rSource, rPt );
@@ -2604,18 +2604,18 @@ SwChainRet SwFEShell::Chain( SwFrmFmt &rSource, const Point &rPt )
         pDView->SetHitTolerancePixel( nOld );
         SwFlyFrm *pFly = static_cast<SwVirtFlyDrawObj*>(pObj)->GetFlyFrm();
 
-        SwFlyFrmFmt *pFmt = pFly->GetFmt();
-        GetDoc()->Chain(rSource, *pFmt);
+        SwFlyFrameFormat *pFormat = pFly->GetFormat();
+        GetDoc()->Chain(rSource, *pFormat);
         EndAllAction();
         SetChainMarker();
     }
     return nErr;
 }
 
-void SwFEShell::Unchain( SwFrmFmt &rFmt )
+void SwFEShell::Unchain( SwFrameFormat &rFormat )
 {
     StartAllAction();
-    GetDoc()->Unchain(rFmt);
+    GetDoc()->Unchain(rFormat);
     EndAllAction();
 }
 
@@ -2674,7 +2674,7 @@ void SwFEShell::SetChainMarker()
     }
 }
 
-long SwFEShell::GetSectionWidth( SwFmt const & rFmt ) const
+long SwFEShell::GetSectionWidth( SwFormat const & rFormat ) const
 {
     SwFrm *pFrm = GetCurrFrm();
     // Is the cursor at this moment in a SectionFrm?
@@ -2684,14 +2684,14 @@ long SwFEShell::GetSectionWidth( SwFmt const & rFmt ) const
         do
         {
             // Is it the right one?
-            if( pSect->KnowsFormat( rFmt ) )
+            if( pSect->KnowsFormat( rFormat ) )
                 return pSect->Frm().Width();
             // for nested areas
             pSect = pSect->GetUpper()->FindSctFrm();
         }
         while( pSect );
     }
-    SwIterator<SwSectionFrm,SwFmt> aIter( rFmt );
+    SwIterator<SwSectionFrm,SwFormat> aIter( rFormat );
     for ( SwSectionFrm* pSct = aIter.First(); pSct; pSct = aIter.Next() )
     {
         if( !pSct->IsFollow() )
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index cc5a81e2a8ba..621284b319b6 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -81,7 +81,7 @@ const SwTable   *pRowCacheLastTable  = 0;
 const SwTabFrm  *pRowCacheLastTabFrm = 0;
 const SwFrm     *pRowCacheLastCellFrm = 0;
 
-class TblWait
+class TableWait
 {
     const ::std::unique_ptr<SwWait> m_pWait;
     // this seems really fishy: do some locking, if an arbitrary number of lines is exceeded
@@ -89,7 +89,7 @@ class TblWait
     static bool ShouldWait(size_t nCnt, SwFrm *pFrm, size_t nCnt2)
         { return our_kLineLimit < nCnt || our_kLineLimit < nCnt2 || (pFrm && our_kLineLimit < pFrm->ImplFindTabFrm()->GetTable()->GetTabLines().size()); }
 public:
-    TblWait(size_t nCnt, SwFrm *pFrm, SwDocShell &rDocShell, size_t nCnt2 = 0)
+    TableWait(size_t nCnt, SwFrm *pFrm, SwDocShell &rDocShell, size_t nCnt2 = 0)
         : m_pWait( ShouldWait(nCnt, pFrm, nCnt2) ? ::std::unique_ptr<SwWait>(new SwWait( rDocShell, true )) : nullptr )
     { }
 };
@@ -203,11 +203,11 @@ bool SwFEShell::InsertRow( sal_uInt16 nCnt, bool bBehind )
         SwNode* pNode = pPaM->Start()->nNode.GetNode().FindTableNode()->EndOfSectionNode();
         // pNode is the end node of the table, we want the last node before the end node of the last cell.
         pPaM->End()->nNode = pNode->GetIndex() - 2;
-        pPaM->End()->nContent.Assign(pPaM->End()->nNode.GetNode().GetCntntNode(), 0);
+        pPaM->End()->nContent.Assign(pPaM->End()->nNode.GetNode().GetContentNode(), 0);
     }
-    GetTblSel( *this, aBoxes, nsSwTblSearchType::TBLSEARCH_ROW );
+    GetTableSel( *this, aBoxes, nsSwTableSearchType::TBLSEARCH_ROW );
 
-    TblWait aWait( nCnt, pFrm, *GetDoc()->GetDocShell(), aBoxes.size() );
+    TableWait aWait( nCnt, pFrm, *GetDoc()->GetDocShell(), aBoxes.size() );
 
     bool bRet = false;
     if ( aBoxes.size() )
@@ -233,7 +233,7 @@ bool SwFEShell::InsertCol( sal_uInt16 nCnt, bool bBehind )
 
     SET_CURR_SHELL( this );
 
-    if( !CheckSplitCells( *this, nCnt + 1, nsSwTblSearchType::TBLSEARCH_COL ) )
+    if( !CheckSplitCells( *this, nCnt + 1, nsSwTableSearchType::TBLSEARCH_COL ) )
     {
         ErrorHandler::HandleError( ERR_TBLINSCOL_ERROR,
                         ERRCODE_MSG_INFO | ERRCODE_BUTTON_DEF_OK );
@@ -243,9 +243,9 @@ bool SwFEShell::InsertCol( sal_uInt16 nCnt, bool bBehind )
     StartAllAction();
     // search boxes via the layout
     SwSelBoxes aBoxes;
-    GetTblSel( *this, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
+    GetTableSel( *this, aBoxes, nsSwTableSearchType::TBLSEARCH_COL );
 
-    TblWait aWait( nCnt, pFrm, *GetDoc()->GetDocShell(), aBoxes.size() );
+    TableWait aWait( nCnt, pFrm, *GetDoc()->GetDocShell(), aBoxes.size() );
 
     bool bRet = false;
     if( !aBoxes.empty() )
@@ -292,10 +292,10 @@ bool SwFEShell::DeleteCol()
     // search boxes via the layout
     bool bRet;
     SwSelBoxes aBoxes;
-    GetTblSel( *this, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
+    GetTableSel( *this, aBoxes, nsSwTableSearchType::TBLSEARCH_COL );
     if ( !aBoxes.empty() )
     {
-        TblWait aWait( aBoxes.size(), pFrm, *GetDoc()->GetDocShell() );
+        TableWait aWait( aBoxes.size(), pFrm, *GetDoc()->GetDocShell() );
 
         // remove crsr from the deletion area.
         // Put them behind/on the table; via the
@@ -343,11 +343,11 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
     // search for boxes via the layout
     bool bRet;
     SwSelBoxes aBoxes;
-    GetTblSel( *this, aBoxes, nsSwTblSearchType::TBLSEARCH_ROW );
+    GetTableSel( *this, aBoxes, nsSwTableSearchType::TBLSEARCH_ROW );
 
     if( !aBoxes.empty() )
     {
-        TblWait aWait( aBoxes.size(), pFrm, *GetDoc()->GetDocShell() );
+        TableWait aWait( aBoxes.size(), pFrm, *GetDoc()->GetDocShell() );
 
         // Delete cursors from the deletion area.
         // Then the cursor is:
@@ -355,13 +355,13 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
         //  2. the preceding row, if there is another row before this
         //  3. otherwise below the table
         {
-            SwTableNode* pTblNd = static_cast<SwCntntFrm*>(pFrm)->GetNode()->FindTableNode();
+            SwTableNode* pTableNd = static_cast<SwContentFrm*>(pFrm)->GetNode()->FindTableNode();
 
             // search all boxes / lines
             _FndBox aFndBox( 0, 0 );
             {
                 _FndPara aPara( aBoxes, &aFndBox );
-                ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
+                ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara );
             }
 
             if( aFndBox.GetLines().empty() )
@@ -389,11 +389,11 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
                 SwTableLine* pLn = pDelBox->GetTabLines().back();
                 pDelBox = pLn->GetTabBoxes().back();
             }
-            SwTableBox* pNextBox = pDelLine->FindNextBox( pTblNd->GetTable(),
+            SwTableBox* pNextBox = pDelLine->FindNextBox( pTableNd->GetTable(),
                                                             pDelBox, true );
             while( pNextBox &&
-                    pNextBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
-                pNextBox = pNextBox->FindNextBox( pTblNd->GetTable(), pNextBox );
+                    pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() )
+                pNextBox = pNextBox->FindNextBox( pTableNd->GetTable(), pNextBox );
 
             if( !pNextBox )         // no next? then the previous
             {
@@ -401,21 +401,21 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
                 pDelBox = pDelLine->GetTabBoxes()[ 0 ];
                 while( !pDelBox->GetSttNd() )
                     pDelBox = pDelBox->GetTabLines()[0]->GetTabBoxes()[0];
-                pNextBox = pDelLine->FindPreviousBox( pTblNd->GetTable(),
+                pNextBox = pDelLine->FindPreviousBox( pTableNd->GetTable(),
                                                             pDelBox, true );
                 while( pNextBox &&
-                        pNextBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
-                    pNextBox = pNextBox->FindPreviousBox( pTblNd->GetTable(), pNextBox );
+                        pNextBox->GetFrameFormat()->GetProtect().IsContentProtected() )
+                    pNextBox = pNextBox->FindPreviousBox( pTableNd->GetTable(), pNextBox );
             }
 
             sal_uLong nIdx;
             if( pNextBox )      // put cursor here
                 nIdx = pNextBox->GetSttIdx() + 1;
             else                // otherwise below the table
-                nIdx = pTblNd->EndOfSectionIndex() + 1;
+                nIdx = pTableNd->EndOfSectionIndex() + 1;
 
             SwNodeIndex aIdx( GetDoc()->GetNodes(), nIdx );
-            SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+            SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
             if( !pCNd )
                 pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
 
@@ -448,8 +448,8 @@ sal_uInt16 SwFEShell::MergeTab()
     if( IsTableMode() )
     {
         SwShellTableCrsr* pTableCrsr = GetTableCrsr();
-        const SwTableNode* pTblNd = pTableCrsr->GetNode().FindTableNode();
-        if( pTblNd->GetTable().ISA( SwDDETable ))
+        const SwTableNode* pTableNd = pTableCrsr->GetNode().FindTableNode();
+        if( pTableNd->GetTable().ISA( SwDDETable ))
         {
             ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR,
                             ERRCODE_MSG_INFO | ERRCODE_BUTTON_DEF_OK );
@@ -459,11 +459,11 @@ sal_uInt16 SwFEShell::MergeTab()
             SET_CURR_SHELL( this );
             StartAllAction();
 
-            TblWait aWait(pTableCrsr->GetSelectedBoxesCount(), 0,
+            TableWait aWait(pTableCrsr->GetSelectedBoxesCount(), 0,
                     *GetDoc()->GetDocShell(),
-                     pTblNd->GetTable().GetTabLines().size() );
+                     pTableNd->GetTable().GetTabLines().size() );
 
-            nRet = GetDoc()->MergeTbl( *pTableCrsr );
+            nRet = GetDoc()->MergeTable( *pTableCrsr );
 
             KillPams();
 
@@ -499,13 +499,13 @@ bool SwFEShell::SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight )
     // search boxes via the layout
     bool bRet;
     SwSelBoxes aBoxes;
-    GetTblSel( *this, aBoxes );
+    GetTableSel( *this, aBoxes );
     if( !aBoxes.empty() )
     {
-        TblWait aWait( nCnt, pFrm, *GetDoc()->GetDocShell(), aBoxes.size() );
+        TableWait aWait( nCnt, pFrm, *GetDoc()->GetDocShell(), aBoxes.size() );
 
         // now delete the columns
-        bRet = GetDoc()->SplitTbl( aBoxes, bVert, nCnt, bSameHeight );
+        bRet = GetDoc()->SplitTable( aBoxes, bVert, nCnt, bSameHeight );
 
         DELETEZ( pLastCols );
         DELETEZ( pLastRows );
@@ -713,7 +713,7 @@ void SwFEShell::SetMouseTabRows( const SwTabCols &rNew, bool bCurColOnly, const
     }
 }
 
-void SwFEShell::SetRowSplit( const SwFmtRowSplit& rNew )
+void SwFEShell::SetRowSplit( const SwFormatRowSplit& rNew )
 {
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -721,12 +721,12 @@ void SwFEShell::SetRowSplit( const SwFmtRowSplit& rNew )
     EndAllActionAndCall();
 }
 
-void SwFEShell::GetRowSplit( SwFmtRowSplit*& rpSz ) const
+void SwFEShell::GetRowSplit( SwFormatRowSplit*& rpSz ) const
 {
     SwDoc::GetRowSplit( *getShellCrsr( false ), rpSz );
 }
 
-void SwFEShell::SetRowHeight( const SwFmtFrmSize &rNew )
+void SwFEShell::SetRowHeight( const SwFormatFrmSize &rNew )
 {
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -734,7 +734,7 @@ void SwFEShell::SetRowHeight( const SwFmtFrmSize &rNew )
     EndAllActionAndCall();
 }
 
-void SwFEShell::GetRowHeight( SwFmtFrmSize *& rpSz ) const
+void SwFEShell::GetRowHeight( SwFormatFrmSize *& rpSz ) const
 {
     SwDoc::GetRowHeight( *getShellCrsr( false ), rpSz );
 }
@@ -833,7 +833,7 @@ void SwFEShell::SetTabBackground( const SvxBrushItem &rNew )
 
     SET_CURR_SHELL( this );
     StartAllAction();
-    GetDoc()->SetAttr( rNew, *pFrm->ImplFindTabFrm()->GetFmt() );
+    GetDoc()->SetAttr( rNew, *pFrm->ImplFindTabFrm()->GetFormat() );
     EndAllAction(); // no call, nothing changes!
     GetDoc()->getIDocumentState().SetModified();
 }
@@ -842,7 +842,7 @@ void SwFEShell::GetTabBackground( SvxBrushItem &rToFill ) const
 {
     SwFrm *pFrm = GetCurrFrm();
     if( pFrm && pFrm->IsInTab() )
-        rToFill = pFrm->ImplFindTabFrm()->GetFmt()->makeBackgroundBrushItem();
+        rToFill = pFrm->ImplFindTabFrm()->GetFormat()->makeBackgroundBrushItem();
 }
 
 bool SwFEShell::HasWholeTabSelection() const
@@ -851,13 +851,13 @@ bool SwFEShell::HasWholeTabSelection() const
     if ( IsTableMode() )
     {
         SwSelBoxes aBoxes;
-        ::GetTblSelCrs( *this, aBoxes );
+        ::GetTableSelCrs( *this, aBoxes );
         if( !aBoxes.empty() )
         {
-            const SwTableNode *pTblNd = IsCrsrInTbl();
-            return pTblNd &&
-                aBoxes[0]->GetSttIdx() - 1 == pTblNd->EndOfSectionNode()->StartOfSectionIndex() &&
-                aBoxes.back()->GetSttNd()->EndOfSectionIndex() + 1 == pTblNd->EndOfSectionIndex();
+            const SwTableNode *pTableNd = IsCrsrInTable();
+            return pTableNd &&
+                aBoxes[0]->GetSttIdx() - 1 == pTableNd->EndOfSectionNode()->StartOfSectionIndex() &&
+                aBoxes.back()->GetSttNd()->EndOfSectionIndex() + 1 == pTableNd->EndOfSectionIndex();
         }
     }
     return false;
@@ -865,7 +865,7 @@ bool SwFEShell::HasWholeTabSelection() const
 
 bool SwFEShell::HasBoxSelection() const
 {
-    if(!IsCrsrInTbl())
+    if(!IsCrsrInTable())
         return false;
     // whole table selected?
     if( IsTableMode() )
@@ -886,7 +886,7 @@ bool SwFEShell::HasBoxSelection() const
         pNd->EndOfSectionIndex())
     {
             SwNodeIndex aIdx( *pNd->EndOfSectionNode(), -1 );
-            SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+            SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
             if( !pCNd )
             {
                 pCNd = SwNodes::GoPrevious( &aIdx );
@@ -907,7 +907,7 @@ bool SwFEShell::HasBoxSelection() const
 void SwFEShell::ProtectCells()
 {
     SvxProtectItem aProt( RES_PROTECT );
-    aProt.SetCntntProtect( true );
+    aProt.SetContentProtect( true );
 
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -931,7 +931,7 @@ void SwFEShell::UnProtectCells()
 
     SwSelBoxes aBoxes;
     if( IsTableMode() )
-        ::GetTblSelCrs( *this, aBoxes );
+        ::GetTableSelCrs( *this, aBoxes );
     else
     {
         SwFrm *pFrm = GetCurrFrm();
@@ -951,30 +951,30 @@ void SwFEShell::UnProtectCells()
     EndAllActionAndCall();
 }
 
-void SwFEShell::UnProtectTbls()
+void SwFEShell::UnProtectTables()
 {
     SET_CURR_SHELL( this );
     StartAllAction();
-    GetDoc()->UnProtectTbls( *GetCrsr() );
+    GetDoc()->UnProtectTables( *GetCrsr() );
     EndAllActionAndCall();
 }
 
-bool SwFEShell::HasTblAnyProtection( const OUString* pTblName,
-                                     bool* pFullTblProtection )
+bool SwFEShell::HasTableAnyProtection( const OUString* pTableName,
+                                     bool* pFullTableProtection )
 {
-    return GetDoc()->HasTblAnyProtection( GetCrsr()->GetPoint(), pTblName,
-                                        pFullTblProtection );
+    return GetDoc()->HasTableAnyProtection( GetCrsr()->GetPoint(), pTableName,
+                                        pFullTableProtection );
 }
 
 bool SwFEShell::CanUnProtectCells() const
 {
     bool bUnProtectAvailable = false;
-    const SwTableNode *pTblNd = IsCrsrInTbl();
-    if( pTblNd && !pTblNd->IsProtect() )
+    const SwTableNode *pTableNd = IsCrsrInTable();
+    if( pTableNd && !pTableNd->IsProtect() )
     {
         SwSelBoxes aBoxes;
         if( IsTableMode() )
-            ::GetTblSelCrs( *this, aBoxes );
+            ::GetTableSelCrs( *this, aBoxes );
         else
         {
             SwFrm *pFrm = GetCurrFrm();
@@ -1021,10 +1021,10 @@ static sal_uInt16 lcl_GetRowNumber( const SwPosition& rPos )
 {
     sal_uInt16 nRet = USHRT_MAX;
     Point aTmpPt;
-    const SwCntntNode *pNd;
-    const SwCntntFrm *pFrm;
+    const SwContentNode *pNd;
+    const SwContentFrm *pFrm;
 
-    if( 0 != ( pNd = rPos.nNode.GetNode().GetCntntNode() ))
+    if( 0 != ( pNd = rPos.nNode.GetNode().GetContentNode() ))
         pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aTmpPt, &rPos, false );
     else
         pFrm = 0;
@@ -1116,7 +1116,7 @@ void SwFEShell::AdjustCellWidth( bool bBalance )
 
     // switch on wait-cursor, as we do not know how
     // much content is affected
-    TblWait aWait(::std::numeric_limits<size_t>::max(), 0,
+    TableWait aWait(::std::numeric_limits<size_t>::max(), 0,
                   *GetDoc()->GetDocShell());
 
     GetDoc()->AdjustCellWidth( *getShellCrsr( false ), bBalance );
@@ -1132,7 +1132,7 @@ bool SwFEShell::IsAdjustCellWidthAllowed( bool bBalance ) const
         return false;
 
     SwSelBoxes aBoxes;
-    ::GetTblSelCrs( *this, aBoxes );
+    ::GetTableSelCrs( *this, aBoxes );
 
     if ( bBalance )
         return aBoxes.size() > 1;
@@ -1158,16 +1158,16 @@ bool SwFEShell::IsAdjustCellWidthAllowed( bool bBalance ) const
         if ( pBox->GetSttNd() )
         {
             SwNodeIndex aIdx( *pBox->GetSttNd(), 1 );
-            SwTxtNode* pCNd = aIdx.GetNode().GetTxtNode();
+            SwTextNode* pCNd = aIdx.GetNode().GetTextNode();
             if( !pCNd )
-                pCNd = static_cast<SwTxtNode*>(GetDoc()->GetNodes().GoNext( &aIdx ));
+                pCNd = static_cast<SwTextNode*>(GetDoc()->GetNodes().GoNext( &aIdx ));
 
             while ( pCNd )
             {
-                if (!pCNd->GetTxt().isEmpty())
+                if (!pCNd->GetText().isEmpty())
                     return true;
                 ++aIdx;
-                pCNd = aIdx.GetNode().GetTxtNode();
+                pCNd = aIdx.GetNode().GetTextNode();
             }
         }
     }
@@ -1175,10 +1175,10 @@ bool SwFEShell::IsAdjustCellWidthAllowed( bool bBalance ) const
 }
 
     // AutoFormat for the table/table selection
-bool SwFEShell::SetTableAutoFmt( const SwTableAutoFmt& rNew )
+bool SwFEShell::SetTableAutoFormat( const SwTableAutoFormat& rNew )
 {
-    SwTableNode *pTblNd = const_cast<SwTableNode*>(IsCrsrInTbl());
-    if( !pTblNd || pTblNd->GetTable().IsTblComplex() )
+    SwTableNode *pTableNd = const_cast<SwTableNode*>(IsCrsrInTable());
+    if( !pTableNd || pTableNd->GetTable().IsTableComplex() )
         return false;
 
     SwSelBoxes aBoxes;
@@ -1188,10 +1188,10 @@ bool SwFEShell::SetTableAutoFmt( const SwTableAutoFmt& rNew )
 
     // whole table or only current selection
     if( IsTableMode() )
-        ::GetTblSelCrs( *this, aBoxes );
+        ::GetTableSelCrs( *this, aBoxes );
     else
     {
-        const SwTableSortBoxes& rTBoxes = pTblNd->GetTable().GetTabSortBoxes();
+        const SwTableSortBoxes& rTBoxes = pTableNd->GetTable().GetTabSortBoxes();
         for (size_t n = 0; n < rTBoxes.size(); ++n)
         {
             SwTableBox* pBox = rTBoxes[ n ];
@@ -1204,7 +1204,7 @@ bool SwFEShell::SetTableAutoFmt( const SwTableAutoFmt& rNew )
     {
         SET_CURR_SHELL( this );
         StartAllAction();
-        bRet = GetDoc()->SetTableAutoFmt( aBoxes, rNew );
+        bRet = GetDoc()->SetTableAutoFormat( aBoxes, rNew );
         DELETEZ( pLastCols );
         DELETEZ( pLastRows );
         EndAllActionAndCall();
@@ -1214,10 +1214,10 @@ bool SwFEShell::SetTableAutoFmt( const SwTableAutoFmt& rNew )
     return bRet;
 }
 
-bool SwFEShell::GetTableAutoFmt( SwTableAutoFmt& rGet )
+bool SwFEShell::GetTableAutoFormat( SwTableAutoFormat& rGet )
 {
-    const SwTableNode *pTblNd = IsCrsrInTbl();
-    if( !pTblNd || pTblNd->GetTable().IsTblComplex() )
+    const SwTableNode *pTableNd = IsCrsrInTable();
+    if( !pTableNd || pTableNd->GetTable().IsTableComplex() )
         return false;
 
     SwSelBoxes aBoxes;
@@ -1227,10 +1227,10 @@ bool SwFEShell::GetTableAutoFmt( SwTableAutoFmt& rGet )
 
     // whole table or only current selection
     if( IsTableMode() )
-        ::GetTblSelCrs( *this, aBoxes );
+        ::GetTableSelCrs( *this, aBoxes );
     else
     {
-        const SwTableSortBoxes& rTBoxes = pTblNd->GetTable().GetTabSortBoxes();
+        const SwTableSortBoxes& rTBoxes = pTableNd->GetTable().GetTabSortBoxes();
         for (size_t n = 0; n < rTBoxes.size(); ++n)
         {
             SwTableBox* pBox = rTBoxes[ n ];
@@ -1238,10 +1238,10 @@ bool SwFEShell::GetTableAutoFmt( SwTableAutoFmt& rGet )
         }
     }
 
-    return GetDoc()->GetTableAutoFmt( aBoxes, rGet );
+    return GetDoc()->GetTableAutoFormat( aBoxes, rGet );
 }
 
-bool SwFEShell::DeleteTblSel()
+bool SwFEShell::DeleteTableSel()
 {
     // check if SPoint/Mark of current cursor are in a table
     SwFrm *pFrm = GetCurrFrm();
@@ -1261,10 +1261,10 @@ bool SwFEShell::DeleteTblSel()
     // search boxes via the layout
     bool bRet;
     SwSelBoxes aBoxes;
-    GetTblSelCrs( *this, aBoxes );
+    GetTableSelCrs( *this, aBoxes );
     if( !aBoxes.empty() )
     {
-        TblWait aWait( aBoxes.size(), pFrm, *GetDoc()->GetDocShell() );
+        TableWait aWait( aBoxes.size(), pFrm, *GetDoc()->GetDocShell() );
 
         // cursor should be removed from deletion area.
         // Put them behind/on the table; via the document
@@ -1295,7 +1295,7 @@ size_t SwFEShell::GetCurTabColNum() const
     // check if SPoint/Mark of current cursor are in a table
     if( pFrm && pFrm->IsInTab() )
     {
-        do {            // JP 26.09.95: why compare with CntntFrame
+        do {            // JP 26.09.95: why compare with ContentFrame
                         //              and not with CellFrame ????
             pFrm = pFrm->GetUpper();
         } while ( !pFrm->IsCellFrm() );
@@ -1381,7 +1381,7 @@ static const SwCellFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt,
     bool bCloseToRow = false;
     bool bCloseToCol = false;
 
-    const SwFrm *pFrm = pLay->ContainsCntnt();
+    const SwFrm *pFrm = pLay->ContainsContent();
     const SwFrm* pRet = 0;
 
     if ( pFrm )
@@ -1583,7 +1583,7 @@ const SwFrm* SwFEShell::GetBox( const Point &rPt, bool* pbRow, bool* pbCol ) con
     const SwCellFrm *pFrm = 0;
     if ( pPage )
     {
-        // We cannot search the box by GetCrsrOfst or GetCntntPos.
+        // We cannot search the box by GetCrsrOfst or GetContentPos.
         // This would lead to a performance collapse for documents
         // with a lot of paragraphs/tables on one page
         //(BrowseMode!)
@@ -1737,7 +1737,7 @@ static Point lcl_ProjectOntoClosestTableFrm( const SwTabFrm& rTab, const Point&
 }
 
 // #i32329# Enhanced table selection
-bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag )
+bool SwFEShell::SelTableRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag )
 {
     bool bRet = false;
     Point aEndPt;
@@ -1766,16 +1766,16 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag
 
         if ( pFrm )
         {
-            const SwCntntFrm* pCntnt = ::GetCellCntnt( *pFrm );
+            const SwContentFrm* pContent = ::GetCellContent( *pFrm );
 
-            if ( pCntnt && pCntnt->IsTxtFrm() )
+            if ( pContent && pContent->IsTextFrm() )
             {
-                ppPos[i] = new SwPosition( *pCntnt->GetNode() );
-                ppPos[i]->nContent.Assign( const_cast<SwCntntNode*>(pCntnt->GetNode()), 0 );
+                ppPos[i] = new SwPosition( *pContent->GetNode() );
+                ppPos[i]->nContent.Assign( const_cast<SwContentNode*>(pContent->GetNode()), 0 );
 
                 // paPt[i] will not be used any longer, now we use it to store
                 // a position inside the content frame
-                paPt[i] = pCntnt->Frm().Center();
+                paPt[i] = pContent->Frm().Center();
             }
         }
 
@@ -1831,17 +1831,17 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag
 
             if ( bNewSelection )
             {
-                // #i35543# SelTblRowCol should remove any existing
+                // #i35543# SelTableRowCol should remove any existing
                 // table cursor:
                 if ( IsTableMode() )
-                    TblCrsrToCursor();
+                    TableCrsrToCursor();
 
                 if ( pbRow[0] && pbCol[0] )
-                    bRet = SwCrsrShell::SelTbl();
+                    bRet = SwCrsrShell::SelTable();
                 else if ( pbRow[0] )
-                    bRet = SwCrsrShell::_SelTblRowOrCol( true, true );
+                    bRet = SwCrsrShell::_SelTableRowOrCol( true, true );
                 else if ( pbCol[0] )
-                    bRet = SwCrsrShell::_SelTblRowOrCol( false, true );
+                    bRet = SwCrsrShell::_SelTableRowOrCol( false, true );
             }
             else
                 bRet = true;
@@ -1933,15 +1933,15 @@ SwTab SwFEShell::WhichMouseTabCol( const Point &rPt ) const
 }
 
 // -> #i23726#
-SwTxtNode * SwFEShell::GetNumRuleNodeAtPos( const Point &rPt)
+SwTextNode * SwFEShell::GetNumRuleNodeAtPos( const Point &rPt)
 {
-    SwTxtNode * pResult = NULL;
+    SwTextNode * pResult = NULL;
 
-    SwContentAtPos aCntntAtPos
+    SwContentAtPos aContentAtPos
         (SwContentAtPos::SW_NUMLABEL);
 
-    if( GetContentAtPos(rPt, aCntntAtPos) && aCntntAtPos.aFnd.pNode)
-        pResult = aCntntAtPos.aFnd.pNode->GetTxtNode();
+    if( GetContentAtPos(rPt, aContentAtPos) && aContentAtPos.aFnd.pNode)
+        pResult = aContentAtPos.aFnd.pNode->GetTextNode();
 
     return pResult;
 }
@@ -1950,12 +1950,12 @@ bool SwFEShell::IsNumLabel( const Point &rPt, int nMaxOffset )
 {
     bool bResult = false;
 
-    SwContentAtPos aCntntAtPos
+    SwContentAtPos aContentAtPos
         (SwContentAtPos::SW_NUMLABEL);
 
-    if( GetContentAtPos(rPt, aCntntAtPos))
+    if( GetContentAtPos(rPt, aContentAtPos))
     {
-        if ((nMaxOffset >= 0 && aCntntAtPos.nDist <= nMaxOffset) ||
+        if ((nMaxOffset >= 0 && aContentAtPos.nDist <= nMaxOffset) ||
             (nMaxOffset < 0))
             bResult = true;
     }
@@ -1965,13 +1965,13 @@ bool SwFEShell::IsNumLabel( const Point &rPt, int nMaxOffset )
 // <- #i23726#
 
 // #i42921#
-bool SwFEShell::IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
+bool SwFEShell::IsVerticalModeAtNdAndPos( const SwTextNode& _rTextNode,
                                           const Point& _rDocPos )
 {
     bool bRet( false );
 
     const short nTextDir =
-        _rTxtNode.GetTextDirection( SwPosition(_rTxtNode), &_rDocPos );
+        _rTextNode.GetTextDirection( SwPosition(_rTextNode), &_rDocPos );
     switch ( nTextDir )
     {
         case -1:
@@ -2054,14 +2054,14 @@ void ClearFEShellTabCols()
     DELETEZ( pLastRows );
 }
 
-void SwFEShell::GetTblAttr( SfxItemSet &rSet ) const
+void SwFEShell::GetTableAttr( SfxItemSet &rSet ) const
 {
     SwFrm *pFrm = GetCurrFrm();
     if( pFrm && pFrm->IsInTab() )
-        rSet.Put( pFrm->ImplFindTabFrm()->GetFmt()->GetAttrSet() );
+        rSet.Put( pFrm->ImplFindTabFrm()->GetFormat()->GetAttrSet() );
 }
 
-void SwFEShell::SetTblAttr( const SfxItemSet &rNew )
+void SwFEShell::SetTableAttr( const SfxItemSet &rNew )
 {
     SwFrm *pFrm = GetCurrFrm();
     if( pFrm && pFrm->IsInTab() )
@@ -2070,7 +2070,7 @@ void SwFEShell::SetTblAttr( const SfxItemSet &rNew )
         StartAllAction();
         SwTabFrm *pTab = pFrm->FindTabFrm();
         pTab->GetTable()->SetHTMLTableLayout( 0 );
-        GetDoc()->SetAttr( rNew, *pTab->GetFmt() );
+        GetDoc()->SetAttr( rNew, *pTab->GetFormat() );
         GetDoc()->getIDocumentState().SetModified();
         EndAllActionAndCall();
     }
@@ -2092,7 +2092,7 @@ static bool lcl_GoTableRow( SwCrsrShell* pShell, bool bUp )
     // move cursor to start node of table box
     pPam->GetPoint()->nNode = pTableBox->GetIndex();
     pPam->GetPoint()->nContent.Assign( NULL, 0 );
-    GoInCntnt( *pPam, fnMoveForward );
+    GoInContent( *pPam, fnMoveForward );
 
     // go to beginning end of table box
     SwPosSection fnPosSect = bUp ? fnSectionStart : fnSectionEnd;
@@ -2109,7 +2109,7 @@ bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff )
     if( !pFrm || !pFrm->IsInTab() )
         return false;
 
-    if( nsTblChgWidthHeightType::WH_FLAG_INSDEL & eType &&
+    if( nsTableChgWidthHeightType::WH_FLAG_INSDEL & eType &&
         pFrm->ImplFindTabFrm()->GetTable()->ISA( SwDDETable ))
     {
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR,
@@ -2128,40 +2128,40 @@ bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff )
 
     // if the table is in relative values (USHRT_MAX)
     // then it should be recalculated to absolute values now
-    const SwFmtFrmSize& rTblFrmSz = pTab->GetFmt()->GetFrmSize();
+    const SwFormatFrmSize& rTableFrmSz = pTab->GetFormat()->GetFrmSize();
     SWRECTFN( pTab )
     long nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)();
-    if( TBLVAR_CHGABS == pTab->GetTable()->GetTblChgMode() &&
-        ( eType & nsTblChgWidthHeightType::WH_COL_LEFT || eType & nsTblChgWidthHeightType::WH_COL_RIGHT ) &&
-        text::HoriOrientation::NONE == pTab->GetFmt()->GetHoriOrient().GetHoriOrient() &&
-        nPrtWidth != rTblFrmSz.GetWidth() )
+    if( TBLVAR_CHGABS == pTab->GetTable()->GetTableChgMode() &&
+        ( eType & nsTableChgWidthHeightType::WH_COL_LEFT || eType & nsTableChgWidthHeightType::WH_COL_RIGHT ) &&
+        text::HoriOrientation::NONE == pTab->GetFormat()->GetHoriOrient().GetHoriOrient() &&
+        nPrtWidth != rTableFrmSz.GetWidth() )
     {
-        SwFmtFrmSize aSz( rTblFrmSz );
+        SwFormatFrmSize aSz( rTableFrmSz );
         aSz.SetWidth( pTab->Prt().Width() );
-        pTab->GetFmt()->SetFmtAttr( aSz );
+        pTab->GetFormat()->SetFormatAttr( aSz );
     }
 
-    if( (eType & (nsTblChgWidthHeightType::WH_FLAG_BIGGER | nsTblChgWidthHeightType::WH_FLAG_INSDEL)) ==
-        (nsTblChgWidthHeightType::WH_FLAG_BIGGER | nsTblChgWidthHeightType::WH_FLAG_INSDEL) )
+    if( (eType & (nsTableChgWidthHeightType::WH_FLAG_BIGGER | nsTableChgWidthHeightType::WH_FLAG_INSDEL)) ==
+        (nsTableChgWidthHeightType::WH_FLAG_BIGGER | nsTableChgWidthHeightType::WH_FLAG_INSDEL) )
     {
         nDiff = sal_uInt16((pFrm->Frm().*fnRect->fnGetWidth)());
 
         // we must move the cursor outside the current cell before
         // deleting the cells.
-        TblChgWidthHeightType eTmp =
-            static_cast<TblChgWidthHeightType>( eType & 0xfff );
+        TableChgWidthHeightType eTmp =
+            static_cast<TableChgWidthHeightType>( eType & 0xfff );
         switch( eTmp )
         {
-        case nsTblChgWidthHeightType::WH_ROW_TOP:
+        case nsTableChgWidthHeightType::WH_ROW_TOP:
             lcl_GoTableRow( this, true );
             break;
-        case nsTblChgWidthHeightType::WH_ROW_BOTTOM:
+        case nsTableChgWidthHeightType::WH_ROW_BOTTOM:
             lcl_GoTableRow( this, false );
             break;
-        case nsTblChgWidthHeightType::WH_COL_LEFT:
+        case nsTableChgWidthHeightType::WH_COL_LEFT:
             GoPrevCell();
             break;
-        case nsTblChgWidthHeightType::WH_COL_RIGHT:
+        case nsTableChgWidthHeightType::WH_COL_RIGHT:
             GoNextCell();
             break;
         default:
@@ -2170,7 +2170,7 @@ bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff )
     }
 
     SwTwips nLogDiff = nDiff;
-    nLogDiff *= pTab->GetFmt()->GetFrmSize().GetWidth();
+    nLogDiff *= pTab->GetFormat()->GetFrmSize().GetWidth();
     nLogDiff /= nPrtWidth;
 
     /** The cells are destroyed in here */
@@ -2181,27 +2181,27 @@ bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff )
     delete pLastCols, pLastCols = 0;
     EndAllActionAndCall();
 
-    if( bRet && (eType & (nsTblChgWidthHeightType::WH_FLAG_BIGGER | nsTblChgWidthHeightType::WH_FLAG_INSDEL)) == nsTblChgWidthHeightType::WH_FLAG_INSDEL )
+    if( bRet && (eType & (nsTableChgWidthHeightType::WH_FLAG_BIGGER | nsTableChgWidthHeightType::WH_FLAG_INSDEL)) == nsTableChgWidthHeightType::WH_FLAG_INSDEL )
     {
-        switch(eType & ~(nsTblChgWidthHeightType::WH_FLAG_BIGGER | nsTblChgWidthHeightType::WH_FLAG_INSDEL))
+        switch(eType & ~(nsTableChgWidthHeightType::WH_FLAG_BIGGER | nsTableChgWidthHeightType::WH_FLAG_INSDEL))
         {
-        case nsTblChgWidthHeightType::WH_CELL_LEFT:
-        case nsTblChgWidthHeightType::WH_COL_LEFT:
+        case nsTableChgWidthHeightType::WH_CELL_LEFT:
+        case nsTableChgWidthHeightType::WH_COL_LEFT:
                 GoPrevCell();
                 break;
 
-        case nsTblChgWidthHeightType::WH_CELL_RIGHT:
-        case nsTblChgWidthHeightType::WH_COL_RIGHT:
+        case nsTableChgWidthHeightType::WH_CELL_RIGHT:
+        case nsTableChgWidthHeightType::WH_COL_RIGHT:
                 GoNextCell();
                 break;
 
-        case nsTblChgWidthHeightType::WH_CELL_TOP:
-        case nsTblChgWidthHeightType::WH_ROW_TOP:
+        case nsTableChgWidthHeightType::WH_CELL_TOP:
+        case nsTableChgWidthHeightType::WH_ROW_TOP:
                 lcl_GoTableRow( this, true );
                 break;
 
-        case nsTblChgWidthHeightType::WH_CELL_BOTTOM:
-        case nsTblChgWidthHeightType::WH_ROW_BOTTOM:
+        case nsTableChgWidthHeightType::WH_CELL_BOTTOM:
+        case nsTableChgWidthHeightType::WH_ROW_BOTTOM:
                 lcl_GoTableRow( this, false );
                 break;
         }
@@ -2210,12 +2210,12 @@ bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff )
     return bRet;
 }
 
-static bool lcl_IsFormulaSelBoxes( const SwTable& rTbl, const SwTblBoxFormula& rFml,
+static bool lcl_IsFormulaSelBoxes( const SwTable& rTable, const SwTableBoxFormula& rFormula,
                             SwCellFrms& rCells )
 {
-    SwTblBoxFormula aTmp( rFml );
+    SwTableBoxFormula aTmp( rFormula );
     SwSelBoxes aBoxes;
-    aTmp.GetBoxesOfFormula(rTbl, aBoxes);
+    aTmp.GetBoxesOfFormula(rTable, aBoxes);
     for (size_t nSelBoxes = aBoxes.size(); nSelBoxes; )
     {
         SwTableBox* pBox = aBoxes[ --nSelBoxes ];
@@ -2232,7 +2232,7 @@ static bool lcl_IsFormulaSelBoxes( const SwTable& rTbl, const SwTblBoxFormula& r
 }
 
     // ask formula for auto-sum
-bool SwFEShell::GetAutoSum( OUString& rFml ) const
+bool SwFEShell::GetAutoSum( OUString& rFormula ) const
 {
     SwFrm *pFrm = GetCurrFrm();
     SwTabFrm *pTab = pFrm ? pFrm->ImplFindTabFrm() : 0;
@@ -2259,7 +2259,7 @@ bool SwFEShell::GetAutoSum( OUString& rFml ) const
                 // formula only if box is contained
                 if( RES_BOXATR_FORMULA == nBoxW &&
                     !::lcl_IsFormulaSelBoxes( *pTab->GetTable(), pCFrm->
-                    GetTabBox()->GetFrmFmt()->GetTblBoxFormula(), aCells))
+                    GetTabBox()->GetFrameFormat()->GetTableBoxFormula(), aCells))
                 {
                     nW = RES_BOXATR_VALUE;
                     // restore previous spaces!
@@ -2277,7 +2277,7 @@ bool SwFEShell::GetAutoSum( OUString& rFml ) const
                 // search for values, Value/Formula/Text found -> include
                 if( RES_BOXATR_FORMULA == nBoxW &&
                     ::lcl_IsFormulaSelBoxes( *pTab->GetTable(), pCFrm->
-                        GetTabBox()->GetFrmFmt()->GetTblBoxFormula(), aCells ))
+                        GetTabBox()->GetFrameFormat()->GetTableBoxFormula(), aCells ))
                     break;
                 else if( USHRT_MAX != nBoxW )
                     sFields = OUStringLiteral1<cListDelim>() + sFields;
@@ -2291,7 +2291,7 @@ bool SwFEShell::GetAutoSum( OUString& rFml ) const
                 if( RES_BOXATR_FORMULA == nBoxW )
                 {
                     if( !::lcl_IsFormulaSelBoxes( *pTab->GetTable(), pCFrm->
-                        GetTabBox()->GetFrmFmt()->GetTblBoxFormula(), aCells ))
+                        GetTabBox()->GetFrameFormat()->GetTableBoxFormula(), aCells ))
                     {
                         // redo only for values!
 
@@ -2321,10 +2321,10 @@ bool SwFEShell::GetAutoSum( OUString& rFml ) const
         }
     }
 
-    rFml = OUString::createFromAscii( sCalc_Sum );
+    rFormula = OUString::createFromAscii( sCalc_Sum );
     if (!sFields.isEmpty())
     {
-        rFml += "(" + sFields + ")";
+        rFormula += "(" + sFields + ")";
     }
 
     return true;
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index eb1132383b19..78d406b4cb87 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -67,11 +67,11 @@ void SwFEShell::EndAllActionAndCall()
     }
 }
 
-// Determine the Cntnt's nearest to the point
-Point SwFEShell::GetCntntPos( const Point& rPoint, bool bNext ) const
+// Determine the Content's nearest to the point
+Point SwFEShell::GetContentPos( const Point& rPoint, bool bNext ) const
 {
     SET_CURR_SHELL( (SwViewShell*)this );
-    return GetLayout()->GetNextPrevCntntPos( rPoint, bNext );
+    return GetLayout()->GetNextPrevContentPos( rPoint, bNext );
 }
 
 const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
@@ -89,7 +89,7 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
             SwPosition aPos( *GetCrsr()->GetPoint() );
             Point aPt( *pPt );
             GetLayout()->GetCrsrOfst( &aPos, aPt );
-            SwCntntNode *pNd = aPos.nNode.GetNode().GetCntntNode();
+            SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
             pFrm = pNd->getLayoutFrm( GetLayout(), pPt );
         }
         else
@@ -217,7 +217,7 @@ FrmTypeFlags SwFEShell::GetFrmType( const Point *pPt, bool bStopAtFly ) const
         SwPosition aPos( *GetCrsr()->GetPoint() );
         Point aPt( *pPt );
         GetLayout()->GetCrsrOfst( &aPos, aPt );
-        SwCntntNode *pNd = aPos.nNode.GetNode().GetCntntNode();
+        SwContentNode *pNd = aPos.nNode.GetNode().GetContentNode();
         pFrm = pNd->getLayoutFrm( GetLayout(), pPt );
     }
     else
@@ -239,7 +239,7 @@ FrmTypeFlags SwFEShell::GetFrmType( const Point *pPt, bool bStopAtFly ) const
                                     nReturn |= FrmTypeFlags::COLUMN;
                                 break;
             case FRM_PAGE:      nReturn |= FrmTypeFlags::PAGE;
-                                if( static_cast<const SwPageFrm*>(pFrm)->IsFtnPage() )
+                                if( static_cast<const SwPageFrm*>(pFrm)->IsFootnotePage() )
                                     nReturn |= FrmTypeFlags::FTNPAGE;
                                 break;
             case FRM_HEADER:    nReturn |= FrmTypeFlags::HEADER;      break;
@@ -318,15 +318,15 @@ sal_uInt16 SwFEShell::GetVirtPageNum( const bool bCalcFrm )
 static void lcl_SetAPageOffset( sal_uInt16 nOffset, SwPageFrm* pPage, SwFEShell* pThis )
 {
     pThis->StartAllAction();
-    OSL_ENSURE( pPage->FindFirstBodyCntnt(),
-            "SwFEShell _SetAPageOffset() without CntntFrm" );
+    OSL_ENSURE( pPage->FindFirstBodyContent(),
+            "SwFEShell _SetAPageOffset() without ContentFrm" );
 
-    SwFmtPageDesc aDesc( pPage->GetPageDesc() );
+    SwFormatPageDesc aDesc( pPage->GetPageDesc() );
     aDesc.SetNumOffset( nOffset );
 
     SwFrm *pFrm = pThis->GetCurrFrm( false );
     if ( pFrm->IsInTab() )
-        pThis->GetDoc()->SetAttr( aDesc, *pFrm->FindTabFrm()->GetFmt() );
+        pThis->GetDoc()->SetAttr( aDesc, *pFrm->FindTabFrm()->GetFormat() );
     else
     {
         pThis->GetDoc()->getIDocumentContentOperations().InsertPoolItem( *pThis->GetCrsr(), aDesc );
@@ -348,12 +348,12 @@ void SwFEShell::SetPageOffset( sal_uInt16 nOffset )
     const SwRootFrm* pDocLayout = GetLayout();
     while ( pPage )
     {
-        const SwFrm *pFlow = pPage->FindFirstBodyCntnt();
+        const SwFrm *pFlow = pPage->FindFirstBodyContent();
         if ( pFlow )
         {
             if ( pFlow->IsInTab() )
                 pFlow = pFlow->FindTabFrm();
-            const SwFmtPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc();
+            const SwFormatPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc();
             if ( rPgDesc.GetNumOffset() )
             {
                 pDocLayout->SetVirtPageNum( true );
@@ -370,7 +370,7 @@ sal_uInt16 SwFEShell::GetPageOffset() const
     const SwPageFrm *pPage = GetCurrFrm()->FindPageFrm();
     while ( pPage )
     {
-        const SwFrm *pFlow = pPage->FindFirstBodyCntnt();
+        const SwFrm *pFlow = pPage->FindFirstBodyContent();
         if ( pFlow )
         {
             if ( pFlow->IsInTab() )
@@ -384,20 +384,20 @@ sal_uInt16 SwFEShell::GetPageOffset() const
     return 0;
 }
 
-void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator,
+void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rText, const OUString& rSeparator,
                              const OUString& rNumberSeparator,
                              const bool bBefore, const sal_uInt16 nId,
                              const OUString& rCharacterStyle,
                              const bool bCpyBrd )
 {
     // get node index of cursor position, SwDoc can do everything else itself
-    SwCntntFrm *pCnt = LTYPE_DRAW==eType ? 0 : GetCurrFrm( false );
+    SwContentFrm *pCnt = LTYPE_DRAW==eType ? 0 : GetCurrFrm( false );
     if( LTYPE_DRAW==eType || pCnt )
     {
         StartAllAction();
 
         sal_uLong nIdx = 0;
-        SwFlyFrmFmt* pFlyFmt = 0;
+        SwFlyFrameFormat* pFlyFormat = 0;
         switch( eType )
         {
         case LTYPE_OBJECT:
@@ -406,15 +406,15 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rTxt, cons
             {
                 // pass down index to the startnode for flys
                 nIdx = pCnt->FindFlyFrm()->
-                            GetFmt()->GetCntnt().GetCntntIdx()->GetIndex();
+                            GetFormat()->GetContent().GetContentIdx()->GetIndex();
             }
             break;
         case LTYPE_TABLE:
             if( pCnt->IsInTab() )
             {
-                // pass down index to the TblNode for tables
-                const SwTable& rTbl = *pCnt->FindTabFrm()->GetTable();
-                nIdx = rTbl.GetTabSortBoxes()[ 0 ]
+                // pass down index to the TableNode for tables
+                const SwTable& rTable = *pCnt->FindTabFrm()->GetTable();
+                nIdx = rTable.GetTabSortBoxes()[ 0 ]
                             ->GetSttNd()->FindTableNode()->GetIndex();
             }
             break;
@@ -443,10 +443,10 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rTxt, cons
                     if ( !pDrawObj->ISA(SwVirtFlyDrawObj) &&
                          !pDrawObj->ISA(SwFlyDrawObj) )
                     {
-                        SwFlyFrmFmt *pFmt =
-                            GetDoc()->InsertDrawLabel( rTxt, rSeparator, rNumberSeparator, nId, rCharacterStyle, *pDrawObj );
-                        if( !pFlyFmt )
-                            pFlyFmt = pFmt;
+                        SwFlyFrameFormat *pFormat =
+                            GetDoc()->InsertDrawLabel( rText, rSeparator, rNumberSeparator, nId, rCharacterStyle, *pDrawObj );
+                        if( !pFlyFormat )
+                            pFlyFormat = pFormat;
                     }
 
                     aDrawObjs.pop_back();
@@ -460,12 +460,12 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rTxt, cons
         }
 
         if( nIdx )
-            pFlyFmt = GetDoc()->InsertLabel( eType, rTxt, rSeparator, rNumberSeparator, bBefore, nId,
+            pFlyFormat = GetDoc()->InsertLabel( eType, rText, rSeparator, rNumberSeparator, bBefore, nId,
                                              nIdx, rCharacterStyle, bCpyBrd );
 
         SwFlyFrm* pFrm;
         const Point aPt( GetCrsrDocPos() );
-        if( pFlyFmt && 0 != ( pFrm = pFlyFmt->GetFrm( &aPt )))
+        if( pFlyFormat && 0 != ( pFrm = pFlyFormat->GetFrm( &aPt )))
             SelectFlyFrm( *pFrm, true );
 
         EndAllActionAndCall();
@@ -489,7 +489,7 @@ bool SwFEShell::Sort(const SwSortOptions& rOpt)
 
         // search boxes via the layout
         SwSelBoxes  aBoxes;
-        GetTblSel(*this, aBoxes);
+        GetTableSel(*this, aBoxes);
 
         // The Crsr should be removed from the deletion area.
         // Always put them behind/on the table; via the
@@ -502,7 +502,7 @@ bool SwFEShell::Sort(const SwSortOptions& rOpt)
         }
 
         // call sorting on document
-        bRet = mpDoc->SortTbl(aBoxes, rOpt);
+        bRet = mpDoc->SortTable(aBoxes, rOpt);
     }
     else
     {
@@ -524,7 +524,7 @@ bool SwFEShell::Sort(const SwSortOptions& rOpt)
             // put selection again
             pPam->DeleteMark();
             pPam->GetPoint()->nNode.Assign( aPrevIdx.GetNode(), +1 );
-            SwCntntNode* pCNd = pPam->GetCntntNode();
+            SwContentNode* pCNd = pPam->GetContentNode();
             sal_Int32 nLen = pCNd->Len();
             if( nLen > nCntStt )
                 nLen = nCntStt;
@@ -532,7 +532,7 @@ bool SwFEShell::Sort(const SwSortOptions& rOpt)
             pPam->SetMark();
 
             pPam->GetPoint()->nNode += nOffset;
-            pCNd = pPam->GetCntntNode();
+            pCNd = pPam->GetContentNode();
             pPam->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
         }
     }
@@ -564,7 +564,7 @@ sal_uInt16 SwFEShell::_GetCurColNum( const SwFrm *pFrm,
                 {
                     if( ( FRM_PAGE | FRM_FLY | FRM_SECTION ) & pFrm->GetType() )
                     {
-                        pPara->pFrmFmt = static_cast<const SwLayoutFrm*>(pFrm)->GetFmt();
+                        pPara->pFrameFormat = static_cast<const SwLayoutFrm*>(pFrm)->GetFormat();
                         pPara->pPrtRect = &pFrm->Prt();
                         pPara->pFrmRect = &pFrm->Frm();
                         break;
@@ -573,7 +573,7 @@ sal_uInt16 SwFEShell::_GetCurColNum( const SwFrm *pFrm,
                 }
                 if( !pFrm )
                 {
-                    pPara->pFrmFmt = 0;
+                    pPara->pFrameFormat = 0;
                     pPara->pPrtRect = 0;
                     pPara->pFrmRect = 0;
                 }
@@ -632,12 +632,12 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
                                const RndStdIds _nAnchorId,
                                const sal_Int16 _eHoriRelOrient,
                                const sal_Int16 _eVertRelOrient,
-                               const SwPosition* _pToCharCntntPos,
+                               const SwPosition* _pToCharContentPos,
                                const bool _bFollowTextFlow,
                                bool _bMirror,
                                Point* _opRef,
                                Size* _opPercent,
-                               const SwFmtFrmSize* pFmtFrmSize) const
+                               const SwFormatFrmSize* pFormatFrmSize) const
 {
     const SwFrm* pFrm;
     const SwFlyFrm* pFly;
@@ -656,8 +656,8 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
     bool bWrapThrough = false;
     if ( pFly )
     {
-        SwFlyFrmFmt* pFmt = const_cast<SwFlyFrmFmt*>(pFly->GetFmt());
-        const SwFmtSurround& rSurround = pFmt->GetSurround();
+        SwFlyFrameFormat* pFormat = const_cast<SwFlyFrameFormat*>(pFly->GetFormat());
+        const SwFormatSurround& rSurround = pFormat->GetSurround();
         bWrapThrough = rSurround.GetSurround() == SURROUND_THROUGHT;
     }
 
@@ -800,12 +800,12 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
         if ( _opPercent )
         {
             // If the size is relative from page, then full size should be counted from the page frame.
-            if (pFmtFrmSize && pFmtFrmSize->GetWidthPercentRelation() == text::RelOrientation::PAGE_FRAME)
+            if (pFormatFrmSize && pFormatFrmSize->GetWidthPercentRelation() == text::RelOrientation::PAGE_FRAME)
                 _opPercent->setWidth(pPage->Frm().Width());
             else
                 _opPercent->setWidth(pUpper->Prt().Width());
 
-            if (pFmtFrmSize && pFmtFrmSize->GetHeightPercentRelation() == text::RelOrientation::PAGE_FRAME)
+            if (pFormatFrmSize && pFormatFrmSize->GetHeightPercentRelation() == text::RelOrientation::PAGE_FRAME)
                 // If the size is relative from page, then full size should be counted from the page frame.
                 _opPercent->setHeight(pPage->Frm().Height());
             else
@@ -907,8 +907,8 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
             // <pFrm>, which is the anchor frame or the proposed anchor frame,
             // doesn't have to be a text frame (e.g. edit a to-page anchored
             // fly frame). Thus, assure this.
-            const SwTxtFrm* pTxtFrm( dynamic_cast<const SwTxtFrm*>(pFrm) );
-            if ( pTxtFrm &&
+            const SwTextFrm* pTextFrm( dynamic_cast<const SwTextFrm*>(pFrm) );
+            if ( pTextFrm &&
                  (_nAnchorId == FLY_AT_CHAR) &&
                  ( _eVertRelOrient == text::RelOrientation::CHAR ||
                    _eVertRelOrient == text::RelOrientation::TEXT_LINE ) )
@@ -917,29 +917,29 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
                 if ( _eVertRelOrient == text::RelOrientation::CHAR )
                 {
                     SwRect aChRect;
-                    if ( _pToCharCntntPos )
+                    if ( _pToCharContentPos )
                     {
-                        pTxtFrm->GetAutoPos( aChRect, *_pToCharCntntPos );
+                        pTextFrm->GetAutoPos( aChRect, *_pToCharContentPos );
                     }
                     else
                     {
                         // No content position provided. Thus, use a default one.
-                        SwPosition aDefaultCntntPos( *(pTxtFrm->GetTxtNode()) );
-                        pTxtFrm->GetAutoPos( aChRect, aDefaultCntntPos );
+                        SwPosition aDefaultContentPos( *(pTextFrm->GetTextNode()) );
+                        pTextFrm->GetAutoPos( aChRect, aDefaultContentPos );
                     }
                     nTop = (aChRect.*fnRect->fnGetBottom)();
                 }
                 else
                 {
-                    if ( _pToCharCntntPos )
+                    if ( _pToCharContentPos )
                     {
-                        pTxtFrm->GetTopOfLine( nTop, *_pToCharCntntPos );
+                        pTextFrm->GetTopOfLine( nTop, *_pToCharContentPos );
                     }
                     else
                     {
                         // No content position provided. Thus, use a default one.
-                        SwPosition aDefaultCntntPos( *(pTxtFrm->GetTxtNode()) );
-                        pTxtFrm->GetTopOfLine( nTop, aDefaultCntntPos );
+                        SwPosition aDefaultContentPos( *(pTextFrm->GetTextNode()) );
+                        pTextFrm->GetTopOfLine( nTop, aDefaultContentPos );
                     }
                 }
                 if ( bVert || bVertL2R )
@@ -955,21 +955,21 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
             // #i26945# - adjust horizontal 'virtual' anchor
             // position (<aPos.X()> respectively <aPos.Y()>), if object is
             // anchored to character and horizontal aligned at character.
-            if ( pTxtFrm &&
+            if ( pTextFrm &&
                  (_nAnchorId == FLY_AT_CHAR) &&
                  _eHoriRelOrient == text::RelOrientation::CHAR )
             {
                 SwTwips nLeft = 0L;
                 SwRect aChRect;
-                if ( _pToCharCntntPos )
+                if ( _pToCharContentPos )
                 {
-                    pTxtFrm->GetAutoPos( aChRect, *_pToCharCntntPos );
+                    pTextFrm->GetAutoPos( aChRect, *_pToCharContentPos );
                 }
                 else
                 {
                     // No content position provided. Thus, use a default one.
-                    SwPosition aDefaultCntntPos( *(pTxtFrm->GetTxtNode()) );
-                    pTxtFrm->GetAutoPos( aChRect, aDefaultCntntPos );
+                    SwPosition aDefaultContentPos( *(pTextFrm->GetTextNode()) );
+                    pTextFrm->GetAutoPos( aChRect, aDefaultContentPos );
                 }
                 nLeft = (aChRect.*fnRect->fnGetLeft)();
                 if ( bVert || bVertL2R )
@@ -1022,8 +1022,8 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
             }
         }
 
-        const SwTwips nBaseOfstForFly = ( pFrm->IsTxtFrm() && pFly ) ?
-                                        static_cast<const SwTxtFrm*>(pFrm)->GetBaseOfstForFly( !bWrapThrough ) :
+        const SwTwips nBaseOfstForFly = ( pFrm->IsTextFrm() && pFly ) ?
+                                        static_cast<const SwTextFrm*>(pFrm)->GetBaseOfstForFly( !bWrapThrough ) :
                                          0;
         if( bVert || bVertL2R )
         {
@@ -1185,7 +1185,7 @@ Size SwFEShell::GetGraphicDefaultSize() const
         }
 
         SwRect aBound;
-        CalcBoundRect( aBound, pFly->GetFmt()->GetAnchor().GetAnchorId());
+        CalcBoundRect( aBound, pFly->GetFormat()->GetAnchor().GetAnchorId());
         if ( pFly->GetAnchorFrm()->IsVertical() )
             aRet.Width() = aBound.Width();
         else
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index d5e742ad548b..17f98776c158 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -117,82 +117,82 @@ static const SwLayoutFrm *lcl_FindNextCellFrm( const SwLayoutFrm *pLay )
     return pTmp;
 }
 
-void GetTblSelCrs( const SwCrsrShell &rShell, SwSelBoxes& rBoxes )
+void GetTableSelCrs( const SwCrsrShell &rShell, SwSelBoxes& rBoxes )
 {
     rBoxes.clear();
-    if( rShell.IsTableMode() && const_cast<SwCrsrShell&>(rShell).UpdateTblSelBoxes())
+    if( rShell.IsTableMode() && const_cast<SwCrsrShell&>(rShell).UpdateTableSelBoxes())
     {
         rBoxes.insert(rShell.GetTableCrsr()->GetSelectedBoxes());
     }
 }
 
-void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes )
+void GetTableSelCrs( const SwTableCursor& rTableCrsr, SwSelBoxes& rBoxes )
 {
     rBoxes.clear();
 
-    if (rTblCrsr.IsChgd() || !rTblCrsr.GetSelectedBoxesCount())
+    if (rTableCrsr.IsChgd() || !rTableCrsr.GetSelectedBoxesCount())
     {
-        SwTableCursor* pTCrsr = const_cast<SwTableCursor*>(&rTblCrsr);
-        pTCrsr->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout()->MakeTblCrsrs( *pTCrsr );
+        SwTableCursor* pTCrsr = const_cast<SwTableCursor*>(&rTableCrsr);
+        pTCrsr->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout()->MakeTableCrsrs( *pTCrsr );
     }
 
-    if (rTblCrsr.GetSelectedBoxesCount())
+    if (rTableCrsr.GetSelectedBoxesCount())
     {
-        rBoxes.insert(rTblCrsr.GetSelectedBoxes());
+        rBoxes.insert(rTableCrsr.GetSelectedBoxes());
     }
 }
 
-void GetTblSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
-                const SwTblSearchType eSearchType )
+void GetTableSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
+                const SwTableSearchType eSearchType )
 {
     // get start and end cell
     if ( !rShell.IsTableMode() )
         rShell.GetCrsr();
 
-    GetTblSel( *rShell.getShellCrsr(false), rBoxes, eSearchType );
+    GetTableSel( *rShell.getShellCrsr(false), rBoxes, eSearchType );
 }
 
-void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
-                const SwTblSearchType eSearchType )
+void GetTableSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
+                const SwTableSearchType eSearchType )
 {
     // get start and end cell
-    OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( false ),
+    OSL_ENSURE( rCrsr.GetContentNode() && rCrsr.GetContentNode( false ),
             "Tabselection not on Cnt." );
 
     // Row-selection:
     // Check for complex tables. If Yes, search selected boxes via
     // the layout. Otherwise via the table structure (for macros !!)
-    const SwCntntNode* pContentNd = rCrsr.GetNode().GetCntntNode();
-    const SwTableNode* pTblNd = pContentNd ? pContentNd->FindTableNode() : 0;
-    if( pTblNd && pTblNd->GetTable().IsNewModel() )
+    const SwContentNode* pContentNd = rCrsr.GetNode().GetContentNode();
+    const SwTableNode* pTableNd = pContentNd ? pContentNd->FindTableNode() : 0;
+    if( pTableNd && pTableNd->GetTable().IsNewModel() )
     {
         SwTable::SearchType eSearch;
-        switch( nsSwTblSearchType::TBLSEARCH_COL & eSearchType )
+        switch( nsSwTableSearchType::TBLSEARCH_COL & eSearchType )
         {
-            case nsSwTblSearchType::TBLSEARCH_ROW: eSearch = SwTable::SEARCH_ROW; break;
-            case nsSwTblSearchType::TBLSEARCH_COL: eSearch = SwTable::SEARCH_COL; break;
+            case nsSwTableSearchType::TBLSEARCH_ROW: eSearch = SwTable::SEARCH_ROW; break;
+            case nsSwTableSearchType::TBLSEARCH_COL: eSearch = SwTable::SEARCH_COL; break;
             default: eSearch = SwTable::SEARCH_NONE; break;
         }
-        const bool bChkP = 0 != ( nsSwTblSearchType::TBLSEARCH_PROTECT & eSearchType );
-        pTblNd->GetTable().CreateSelection( rCrsr, rBoxes, eSearch, bChkP );
+        const bool bChkP = 0 != ( nsSwTableSearchType::TBLSEARCH_PROTECT & eSearchType );
+        pTableNd->GetTable().CreateSelection( rCrsr, rBoxes, eSearch, bChkP );
         return;
     }
-    if( nsSwTblSearchType::TBLSEARCH_ROW == ((~nsSwTblSearchType::TBLSEARCH_PROTECT ) & eSearchType ) &&
-        pTblNd && !pTblNd->GetTable().IsTblComplex() )
+    if( nsSwTableSearchType::TBLSEARCH_ROW == ((~nsSwTableSearchType::TBLSEARCH_PROTECT ) & eSearchType ) &&
+        pTableNd && !pTableNd->GetTable().IsTableComplex() )
     {
-        const SwTable& rTbl = pTblNd->GetTable();
-        const SwTableLines& rLines = rTbl.GetTabLines();
+        const SwTable& rTable = pTableNd->GetTable();
+        const SwTableLines& rLines = rTable.GetTabLines();
 
         const SwNode& rMarkNode = rCrsr.GetNode( false );
         const sal_uLong nMarkSectionStart = rMarkNode.StartOfSectionIndex();
-        const SwTableBox* pMarkBox = rTbl.GetTblBox( nMarkSectionStart );
+        const SwTableBox* pMarkBox = rTable.GetTableBox( nMarkSectionStart );
 
         OSL_ENSURE( pMarkBox, "Point in table, mark outside?" );
 
         const SwTableLine* pLine = pMarkBox ? pMarkBox->GetUpper() : 0;
         sal_uInt16 nSttPos = rLines.GetPos( pLine );
         OSL_ENSURE( USHRT_MAX != nSttPos, "Where is my row in the table?" );
-        pLine = rTbl.GetTblBox( rCrsr.GetNode( true ).StartOfSectionIndex() )->GetUpper();
+        pLine = rTable.GetTableBox( rCrsr.GetNode( true ).StartOfSectionIndex() )->GetUpper();
         sal_uInt16 nEndPos = rLines.GetPos( pLine );
         OSL_ENSURE( USHRT_MAX != nEndPos, "Where is my row in the table?" );
         // pb: #i20193# if tableintable then nSttPos == nEndPos == USHRT_MAX
@@ -203,7 +203,7 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
                 sal_uInt16 nTmp = nSttPos; nSttPos = nEndPos; nEndPos = nTmp;
             }
 
-            int bChkProtected = nsSwTblSearchType::TBLSEARCH_PROTECT & eSearchType;
+            int bChkProtected = nsSwTableSearchType::TBLSEARCH_PROTECT & eSearchType;
             for( ; nSttPos <= nEndPos; ++nSttPos )
             {
                 pLine = rLines[ nSttPos ];
@@ -212,7 +212,7 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
                     SwTableBox* pBox = pLine->GetTabBoxes()[ --n ];
                     // check for cell protection??
                     if( !bChkProtected ||
-                        !pBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
+                        !pBox->GetFrameFormat()->GetProtect().IsContentProtected() )
                         rBoxes.insert( pBox );
                 }
             }
@@ -227,35 +227,35 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
             aPtPos = pShCrsr->GetPtPos();
             aMkPos = pShCrsr->GetMkPos();
         }
-        const SwCntntNode *pCntNd = rCrsr.GetCntntNode();
+        const SwContentNode *pCntNd = rCrsr.GetContentNode();
         const SwLayoutFrm *pStart = pCntNd ?
             pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPtPos )->GetUpper() : 0;
-        pCntNd = rCrsr.GetCntntNode(false);
+        pCntNd = rCrsr.GetContentNode(false);
         const SwLayoutFrm *pEnd = pCntNd ?
             pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aMkPos )->GetUpper() : 0;
         if( pStart && pEnd )
-            GetTblSel( pStart, pEnd, rBoxes, 0, eSearchType );
+            GetTableSel( pStart, pEnd, rBoxes, 0, eSearchType );
     }
 }
 
-void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
+void GetTableSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
                 SwSelBoxes& rBoxes, SwCellFrms* pCells,
-                const SwTblSearchType eSearchType )
+                const SwTableSearchType eSearchType )
 {
     const SwTabFrm* pStartTab = pStart->FindTabFrm();
     if ( !pStartTab )
     {
-        OSL_FAIL( "GetTblSel without start table" );
+        OSL_FAIL( "GetTableSel without start table" );
         return;
     }
 
-    int bChkProtected = nsSwTblSearchType::TBLSEARCH_PROTECT & eSearchType;
+    int bChkProtected = nsSwTableSearchType::TBLSEARCH_PROTECT & eSearchType;
 
     // #i55421# Reduced value 10
     int nLoopMax = 10;
 
     do {
-        bool bTblIsValid = true;
+        bool bTableIsValid = true;
 
         // First, compute tables and rectangles
         SwSelUnions aUnions;
@@ -271,13 +271,13 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
         const SwCellFrm* pCurrentBottomRightFrm  = 0;
 
         // Now find boxes for each entry and emit
-        for (size_t i = 0; i < aUnions.size() && bTblIsValid; ++i)
+        for (size_t i = 0; i < aUnions.size() && bTableIsValid; ++i)
         {
             SwSelUnion *pUnion = &aUnions[i];
             const SwTabFrm *pTable = pUnion->GetTable();
             if( !pTable->IsValid() && nLoopMax )
             {
-                bTblIsValid = false;
+                bTableIsValid = false;
                 break;
             }
 
@@ -286,11 +286,11 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
                                       pTable->GetFirstNonHeadlineRow() :
                                       static_cast<const SwLayoutFrm*>(pTable->Lower());
 
-            while( pRow && bTblIsValid )
+            while( pRow && bTableIsValid )
             {
                 if( !pRow->IsValid() && nLoopMax )
                 {
-                    bTblIsValid = false;
+                    bTableIsValid = false;
                     break;
                 }
 
@@ -298,22 +298,22 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
                 {
                     const SwLayoutFrm *pCell = pRow->FirstCell();
 
-                    while( bTblIsValid && pCell && pRow->IsAnLower( pCell ) )
+                    while( bTableIsValid && pCell && pRow->IsAnLower( pCell ) )
                     {
                         if( !pCell->IsValid() && nLoopMax )
                         {
-                            bTblIsValid = false;
+                            bTableIsValid = false;
                             break;
                         }
 
                         OSL_ENSURE( pCell->IsCellFrm(), "Frame ohne Celle" );
-                        if( ::IsFrmInTblSel( pUnion->GetUnion(), pCell ) )
+                        if( ::IsFrmInTableSel( pUnion->GetUnion(), pCell ) )
                         {
                             SwTableBox* pBox = const_cast<SwTableBox*>(
                                 static_cast<const SwCellFrm*>(pCell)->GetTabBox());
                             // check for cell protection??
                             if( !bChkProtected ||
-                                !pBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
+                                !pBox->GetFrameFormat()->GetProtect().IsContentProtected() )
                                 rBoxes.insert( pBox );
 
                             if ( pCells )
@@ -380,7 +380,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
             pCells->push_back( const_cast< SwCellFrm* >(pCurrentBottomRightFrm) );
         }
 
-        if( bTblIsValid )
+        if( bTableIsValid )
             break;
 
         SwDeletionChecker aDelCheck( pStart );
@@ -402,7 +402,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
         // been deleted due to the formatting of the table:
         if ( aDelCheck.HasBeenDeleted() )
         {
-            OSL_FAIL( "Current box has been deleted during GetTblSel()" );
+            OSL_FAIL( "Current box has been deleted during GetTableSel()" );
             break;
         }
 
@@ -421,7 +421,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
 
     Point aNullPos;
     SwNodeIndex aIdx( rSttNd );
-    const SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+    const SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
     if( !pCNd )
         pCNd = aIdx.GetNodes().GoNextSection( &aIdx, false, false );
 
@@ -438,7 +438,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
     OSL_ENSURE( pStart, "without frame nothing works" );
 
     aIdx = rEndNd;
-    pCNd = aIdx.GetNode().GetCntntNode();
+    pCNd = aIdx.GetNode().GetContentNode();
     if( !pCNd )
         pCNd = aIdx.GetNodes().GoNextSection( &aIdx, false, false );
 
@@ -457,19 +457,19 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
     sal_uInt16 i = 0;
 
     do {
-        bool bTblIsValid = true;
+        bool bTableIsValid = true;
         bValidChartSel = true;
 
         sal_uInt16 nRowCells = USHRT_MAX;
 
         // First, compute tables and rectangles
         SwSelUnions aUnions;
-        ::MakeSelUnions( aUnions, pStart, pEnd, nsSwTblSearchType::TBLSEARCH_NO_UNION_CORRECT );
+        ::MakeSelUnions( aUnions, pStart, pEnd, nsSwTableSearchType::TBLSEARCH_NO_UNION_CORRECT );
 
         // find boxes for each entry and emit
         for( auto & rSelUnion : aUnions )
         {
-            if (!bTblIsValid || !bValidChartSel)
+            if (!bTableIsValid || !bValidChartSel)
                 break;
 
             SwSelUnion *pUnion = &rSelUnion;
@@ -480,7 +480,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
 
             if( !pTable->IsValid() && nLoopMax  )
             {
-                bTblIsValid = false;
+                bTableIsValid = false;
                 break;
             }
 
@@ -491,11 +491,11 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
                                       pTable->GetFirstNonHeadlineRow() :
                                       static_cast<const SwLayoutFrm*>(pTable->Lower());
 
-            while( pRow && bTblIsValid && bValidChartSel )
+            while( pRow && bTableIsValid && bValidChartSel )
             {
                 if( !pRow->IsValid() && nLoopMax )
                 {
-                    bTblIsValid = false;
+                    bTableIsValid = false;
                     break;
                 }
 
@@ -503,12 +503,12 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
                 {
                     const SwLayoutFrm *pCell = pRow->FirstCell();
 
-                    while( bValidChartSel && bTblIsValid && pCell &&
+                    while( bValidChartSel && bTableIsValid && pCell &&
                             pRow->IsAnLower( pCell ) )
                     {
                         if( !pCell->IsValid() && nLoopMax  )
                         {
-                            bTblIsValid = false;
+                            bTableIsValid = false;
                             break;
                         }
 
@@ -624,7 +624,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
             }
         }
 
-        if( bTblIsValid )
+        if( bTableIsValid )
             break;
 
         // otherwise quickly "calculate" table layout and start over
@@ -647,7 +647,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
     return bValidChartSel;
 }
 
-bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell )
+bool IsFrmInTableSel( const SwRect& rUnion, const SwFrm* pCell )
 {
     OSL_ENSURE( pCell->IsCellFrm(), "Frame without Gazelle" );
 
@@ -674,11 +674,11 @@ bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
 {
     SwShellCrsr* pCrsr = rShell.m_pCurCrsr;
     if ( rShell.IsTableMode() )
-        pCrsr = rShell.m_pTblCrsr;
+        pCrsr = rShell.m_pTableCrsr;
 
-    const SwLayoutFrm *pStart = pCrsr->GetCntntNode()->getLayoutFrm( rShell.GetLayout(),
+    const SwLayoutFrm *pStart = pCrsr->GetContentNode()->getLayoutFrm( rShell.GetLayout(),
                       &pCrsr->GetPtPos() )->GetUpper(),
-                      *pEnd   = pCrsr->GetCntntNode(false)->getLayoutFrm( rShell.GetLayout(),
+                      *pEnd   = pCrsr->GetContentNode(false)->getLayoutFrm( rShell.GetLayout(),
                       &pCrsr->GetMkPos() )->GetUpper();
 
     const SwLayoutFrm* pSttCell = pStart;
@@ -689,7 +689,7 @@ bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
     SwSelUnions aUnions;
 
     // by default, first test above and then to the left
-    ::MakeSelUnions( aUnions, pStart, pEnd, nsSwTblSearchType::TBLSEARCH_COL );
+    ::MakeSelUnions( aUnions, pStart, pEnd, nsSwTableSearchType::TBLSEARCH_COL );
 
     bool bTstRow = true, bFound = false;
     sal_uInt16 i;
@@ -730,7 +730,7 @@ bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
                     }
 
                     OSL_ENSURE( pCell->IsCellFrm(), "Frame without cell" );
-                    if( ::IsFrmInTblSel( pUnion->GetUnion(), pCell ) )
+                    if( ::IsFrmInTableSel( pUnion->GetUnion(), pCell ) )
                         pUpperCell = static_cast<const SwCellFrm*>(pCell);
 
                     if( pCell->GetNext() )
@@ -762,7 +762,7 @@ bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
 
         rBoxes.clear();
         aUnions.clear();
-        ::MakeSelUnions( aUnions, pStart, pEnd, nsSwTblSearchType::TBLSEARCH_ROW );
+        ::MakeSelUnions( aUnions, pStart, pEnd, nsSwTableSearchType::TBLSEARCH_ROW );
 
         for( i = 0; i < aUnions.size(); ++i )
         {
@@ -798,7 +798,7 @@ bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
                         }
 
                         OSL_ENSURE( pCell->IsCellFrm(), "Frame without cell" );
-                        if( ::IsFrmInTblSel( pUnion->GetUnion(), pCell ) )
+                        if( ::IsFrmInTableSel( pUnion->GetUnion(), pCell ) )
                         {
                             SwCellFrm* pC = const_cast<SwCellFrm*>(static_cast<const SwCellFrm*>(pCell));
                             rBoxes.push_back( pC );
@@ -832,7 +832,7 @@ bool HasProtectedCells( const SwSelBoxes& rBoxes )
     bool bRet = false;
     for (size_t n = 0; n < rBoxes.size(); ++n)
     {
-        if( rBoxes[ n ]->GetFrmFmt()->GetProtect().IsCntntProtected() )
+        if( rBoxes[ n ]->GetFrameFormat()->GetProtect().IsContentProtected() )
         {
             bRet = true;
             break;
@@ -845,47 +845,47 @@ _CmpLPt::_CmpLPt( const Point& rPt, const SwTableBox* pBox, bool bVertical )
     : aPos( rPt ), pSelBox( pBox ), bVert( bVertical )
 {}
 
-static void lcl_InsTblBox( SwTableNode* pTblNd, SwDoc* pDoc, SwTableBox* pBox,
+static void lcl_InsTableBox( SwTableNode* pTableNd, SwDoc* pDoc, SwTableBox* pBox,
                         sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 )
 {
     OSL_ENSURE( pBox->GetSttNd(), "Box without Start-Node" );
-    SwCntntNode* pCNd = pDoc->GetNodes()[ pBox->GetSttIdx() + 1 ]
-                                ->GetCntntNode();
-    if( pCNd && pCNd->IsTxtNode() )
-        pDoc->GetNodes().InsBoxen( pTblNd, pBox->GetUpper(),
-                static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt()),
-                static_cast<SwTxtNode*>(pCNd)->GetTxtColl(),
+    SwContentNode* pCNd = pDoc->GetNodes()[ pBox->GetSttIdx() + 1 ]
+                                ->GetContentNode();
+    if( pCNd && pCNd->IsTextNode() )
+        pDoc->GetNodes().InsBoxen( pTableNd, pBox->GetUpper(),
+                static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat()),
+                static_cast<SwTextNode*>(pCNd)->GetTextColl(),
                 pCNd->GetpSwAttrSet(),
                 nInsPos, nCnt );
     else
-        pDoc->GetNodes().InsBoxen( pTblNd, pBox->GetUpper(),
-                static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt()),
-                pDoc->GetDfltTxtFmtColl(), 0,
+        pDoc->GetNodes().InsBoxen( pTableNd, pBox->GetUpper(),
+                static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat()),
+                pDoc->GetDfltTextFormatColl(), 0,
                 nInsPos, nCnt );
 }
 
 bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam )
 {
     rPam.GetPoint()->nNode = *rBox.GetSttNd()->EndOfSectionNode();
-    rPam.Move( fnMoveBackward, fnGoCntnt );
+    rPam.Move( fnMoveBackward, fnGoContent );
     rPam.SetMark();
     rPam.GetPoint()->nNode = *rBox.GetSttNd();
-    rPam.Move( fnMoveForward, fnGoCntnt );
+    rPam.Move( fnMoveForward, fnGoContent );
     bool bRet = *rPam.GetMark() == *rPam.GetPoint()
         && ( rBox.GetSttNd()->GetIndex() + 1 == rPam.GetPoint()->nNode.GetIndex() );
 
     if( bRet )
     {
         // now check for paragraph bound flyes
-        const SwFrmFmts& rFmts = *rPam.GetDoc()->GetSpzFrmFmts();
+        const SwFrameFormats& rFormats = *rPam.GetDoc()->GetSpzFrameFormats();
         sal_uLong nSttIdx = rPam.GetPoint()->nNode.GetIndex(),
               nEndIdx = rBox.GetSttNd()->EndOfSectionIndex(),
               nIdx;
 
-        for( auto pFmt : rFmts )
+        for( auto pFormat : rFormats )
         {
-            const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-            const SwPosition* pAPos = rAnchor.GetCntntAnchor();
+            const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
+            const SwPosition* pAPos = rAnchor.GetContentAnchor();
             if (pAPos &&
                 ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
                  (FLY_AT_CHAR == rAnchor.GetAnchorId())) &&
@@ -901,11 +901,11 @@ bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam )
 }
 
 void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
-                SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo )
+                SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo )
 {
     rBoxes.clear();
 
-    OSL_ENSURE( rPam.GetCntntNode() && rPam.GetCntntNode( false ),
+    OSL_ENSURE( rPam.GetContentNode() && rPam.GetContentNode( false ),
             "Tabselection not on Cnt." );
 
 //JP 24.09.96:  Merge with repeating TableHeadLines does not work properly.
@@ -913,10 +913,10 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
 //              headline is contained.
     Point aPt( 0, 0 );
 
-    const SwCntntNode* pCntNd = rPam.GetCntntNode();
+    const SwContentNode* pCntNd = rPam.GetContentNode();
     const SwLayoutFrm *pStart = pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(),
                                                         &aPt )->GetUpper();
-    pCntNd = rPam.GetCntntNode(false);
+    pCntNd = rPam.GetContentNode(false);
     const SwLayoutFrm *pEnd = pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(),
                                                         &aPt )->GetUpper();
 
@@ -927,8 +927,8 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
         return;
 
     const SwTable *pTable = aUnions.front().GetTable()->GetTable();
-    SwDoc* pDoc = const_cast<SwDoc*>(pStart->GetFmt()->GetDoc());
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(pTable->GetTabSortBoxes()[ 0 ]->
+    SwDoc* pDoc = const_cast<SwDoc*>(pStart->GetFormat()->GetDoc());
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(pTable->GetTabSortBoxes()[ 0 ]->
                                         GetSttNd()->FindTableNode());
 
     _MergePos aPosArr;      // Sort-Array with the frame positions
@@ -971,16 +971,16 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                             {
                                 sal_uInt16 nInsPos = pBox->GetUpper()->
                                                     GetTabBoxes().GetPos( pBox )+1;
-                                lcl_InsTblBox( pTblNd, pDoc, pBox, nInsPos );
-                                pBox->ClaimFrmFmt();
-                                SwFmtFrmSize aNew(
-                                        pBox->GetFrmFmt()->GetFrmSize() );
+                                lcl_InsTableBox( pTableNd, pDoc, pBox, nInsPos );
+                                pBox->ClaimFrameFormat();
+                                SwFormatFrmSize aNew(
+                                        pBox->GetFrameFormat()->GetFrmSize() );
                                 nWidth = rUnion.Right() - pCell->Frm().Left();
                                 nWidth = nWidth * aNew.GetWidth() /
                                          pCell->Frm().Width();
                                 long nTmpWidth = aNew.GetWidth() - nWidth;
                                 aNew.SetWidth( nWidth );
-                                pBox->GetFrmFmt()->SetFmtAttr( aNew );
+                                pBox->GetFrameFormat()->SetFormatAttr( aNew );
                                 // this box is selected
                                 pLastBox = pBox;
                                 rBoxes.insert( pBox );
@@ -990,8 +990,8 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
 
                                 pBox = pBox->GetUpper()->GetTabBoxes()[ nInsPos ];
                                 aNew.SetWidth( nTmpWidth );
-                                pBox->ClaimFrmFmt();
-                                pBox->GetFrmFmt()->SetFmtAttr( aNew );
+                                pBox->ClaimFrameFormat();
+                                pBox->GetFrameFormat()->SetFormatAttr( aNew );
 
                                 if( pUndo )
                                     pUndo->AddNewBox( pBox->GetSttIdx() );
@@ -1012,10 +1012,10 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                         {
                             sal_uInt16 nInsPos = pBox->GetUpper()->GetTabBoxes().GetPos(
                                             pBox )+1;
-                            lcl_InsTblBox( pTblNd, pDoc, pBox, nInsPos, 2 );
-                            pBox->ClaimFrmFmt();
-                            SwFmtFrmSize aNew(
-                                        pBox->GetFrmFmt()->GetFrmSize() );
+                            lcl_InsTableBox( pTableNd, pDoc, pBox, nInsPos, 2 );
+                            pBox->ClaimFrameFormat();
+                            SwFormatFrmSize aNew(
+                                        pBox->GetFrameFormat()->GetFrmSize() );
                             long nLeft = rUnion.Left() - pCell->Frm().Left();
                             nLeft = nLeft * aNew.GetWidth() /
                                     pCell->Frm().Width();
@@ -1025,23 +1025,23 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                             nWidth = aNew.GetWidth() - nLeft - nRight;
 
                             aNew.SetWidth( nLeft );
-                            pBox->GetFrmFmt()->SetFmtAttr( aNew );
+                            pBox->GetFrameFormat()->SetFormatAttr( aNew );
 
                             {
                             const SfxPoolItem* pItem;
-                            if( SfxItemState::SET == pBox->GetFrmFmt()->GetAttrSet()
+                            if( SfxItemState::SET == pBox->GetFrameFormat()->GetAttrSet()
                                         .GetItemState( RES_BOX, false, &pItem ))
                             {
                                 SvxBoxItem aBox( *static_cast<const SvxBoxItem*>(pItem) );
                                 aBox.SetLine( 0, SvxBoxItemLine::RIGHT );
-                                pBox->GetFrmFmt()->SetFmtAttr( aBox );
+                                pBox->GetFrameFormat()->SetFormatAttr( aBox );
                             }
                             }
 
                             pBox = pBox->GetUpper()->GetTabBoxes()[ nInsPos ];
                             aNew.SetWidth( nWidth );
-                            pBox->ClaimFrmFmt();
-                            pBox->GetFrmFmt()->SetFmtAttr( aNew );
+                            pBox->ClaimFrameFormat();
+                            pBox->GetFrameFormat()->SetFormatAttr( aNew );
 
                             if( pUndo )
                                 pUndo->AddNewBox( pBox->GetSttIdx() );
@@ -1055,8 +1055,8 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
 
                             pBox = pBox->GetUpper()->GetTabBoxes()[ nInsPos+1 ];
                             aNew.SetWidth( nRight );
-                            pBox->ClaimFrmFmt();
-                            pBox->GetFrmFmt()->SetFmtAttr( aNew );
+                            pBox->ClaimFrameFormat();
+                            pBox->GetFrameFormat()->SetFormatAttr( aNew );
 
                             if( pUndo )
                                 pUndo->AddNewBox( pBox->GetSttIdx() );
@@ -1069,9 +1069,9 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                             // then we should insert a new box and adjust the widths
                             sal_uInt16 nInsPos = pBox->GetUpper()->GetTabBoxes().GetPos(
                                             pBox )+1;
-                            lcl_InsTblBox( pTblNd, pDoc, pBox, nInsPos, 1 );
+                            lcl_InsTableBox( pTableNd, pDoc, pBox, nInsPos, 1 );
 
-                            SwFmtFrmSize aNew(pBox->GetFrmFmt()->GetFrmSize() );
+                            SwFormatFrmSize aNew(pBox->GetFrameFormat()->GetFrmSize() );
                             long nLeft = rUnion.Left() - pCell->Frm().Left(),
                                 nRight = pCell->Frm().Right() - rUnion.Left();
 
@@ -1081,13 +1081,13 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                                     pCell->Frm().Width();
 
                             aNew.SetWidth( nLeft );
-                            pBox->ClaimFrmFmt()->SetFmtAttr( aNew );
+                            pBox->ClaimFrameFormat()->SetFormatAttr( aNew );
 
                                 // this box is selected
                             pBox = pBox->GetUpper()->GetTabBoxes()[ nInsPos ];
                             aNew.SetWidth( nRight );
-                            pBox->ClaimFrmFmt();
-                            pBox->GetFrmFmt()->SetFmtAttr( aNew );
+                            pBox->ClaimFrameFormat();
+                            pBox->GetFrameFormat()->SetFormatAttr( aNew );
 
                             pLastBox = pBox;
                             rBoxes.insert( pBox );
@@ -1134,7 +1134,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
         SwPaM aPam( pDoc->GetNodes() );
 
 #if defined( DEL_ONLY_EMPTY_LINES )
-        nWidth = pFirstBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        nWidth = pFirstBox->GetFrameFormat()->GetFrmSize().GetWidth();
         bool bEmptyLine = sal_True;
         sal_uInt16 n, nSttPos = 0;
 
@@ -1146,7 +1146,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                 if( bEmptyLine && !IsEmptyBox( *rPt.pSelBox, aPam ))
                     bEmptyLine = sal_False;
                 if( bCalcWidth )
-                    nWidth += rPt.pSelBox->GetFrmFmt()->GetFrmSize().GetWidth();
+                    nWidth += rPt.pSelBox->GetFrameFormat()->GetFrmSize().GetWidth();
             }
             else
             {
@@ -1179,7 +1179,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
         }
 #elif defined( DEL_EMPTY_BOXES_AT_START_AND_END )
 
-        nWidth = pFirstBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        nWidth = pFirstBox->GetFrameFormat()->GetFrmSize().GetWidth();
         sal_uInt16 n, nSttPos = 0, nSEndPos = 0, nESttPos = 0;
 
         for( n = 0; n < aPosArr.Count(); ++n )
@@ -1197,7 +1197,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                     nESttPos = n+1;
 
                 if( bCalcWidth )
-                    nWidth += rPt.pSelBox->GetFrmFmt()->GetFrmSize().GetWidth();
+                    nWidth += rPt.pSelBox->GetFrameFormat()->GetFrmSize().GetWidth();
             }
             else
             {
@@ -1281,7 +1281,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
             if( bCalcWidth )
             {
                 if( nY == ( bVert ? rPt.X() : rPt.Y() ) ) // same Y level?
-                    nWidth += rPt.pSelBox->GetFrmFmt()->GetFrmSize().GetWidth();
+                    nWidth += rPt.pSelBox->GetFrameFormat()->GetFrmSize().GetWidth();
                 else
                     bCalcWidth = false;     // one line ready
             }
@@ -1304,23 +1304,23 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
         SwTableLine* pInsLine = pTmpBox->GetUpper();
         sal_uInt16 nInsPos = pInsLine->GetTabBoxes().GetPos( pTmpBox );
 
-        lcl_InsTblBox( pTblNd, pDoc, pTmpBox, nInsPos );
+        lcl_InsTableBox( pTableNd, pDoc, pTmpBox, nInsPos );
         (*ppMergeBox) = pInsLine->GetTabBoxes()[ nInsPos ];
         pInsLine->GetTabBoxes().erase( pInsLine->GetTabBoxes().begin() + nInsPos );  // remove again
         (*ppMergeBox)->SetUpper( 0 );
-        (*ppMergeBox)->ClaimFrmFmt();
+        (*ppMergeBox)->ClaimFrameFormat();
 
         // define the border: the upper/left side of the first box,
         // the lower/right side of the last box:
         if( pLastBox && pFirstBox )
         {
-            SvxBoxItem aBox( pFirstBox->GetFrmFmt()->GetBox() );
-            const SvxBoxItem& rBox = pLastBox->GetFrmFmt()->GetBox();
+            SvxBoxItem aBox( pFirstBox->GetFrameFormat()->GetBox() );
+            const SvxBoxItem& rBox = pLastBox->GetFrameFormat()->GetBox();
             aBox.SetLine( rBox.GetRight(), SvxBoxItemLine::RIGHT );
             aBox.SetLine( rBox.GetBottom(), SvxBoxItemLine::BOTTOM );
             if( aBox.GetLeft() || aBox.GetTop() ||
                 aBox.GetRight() || aBox.GetBottom() )
-                (*ppMergeBox)->GetFrmFmt()->SetFmtAttr( aBox );
+                (*ppMergeBox)->GetFrameFormat()->SetFormatAttr( aBox );
         }
     }
 
@@ -1336,7 +1336,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
         {
             aPam.GetPoint()->nNode.Assign( *rPt.pSelBox->GetSttNd()->
                                             EndOfSectionNode(), -1 );
-            SwCntntNode* pCNd = aPam.GetCntntNode();
+            SwContentNode* pCNd = aPam.GetContentNode();
             aPam.GetPoint()->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
 
             SwNodeIndex aSttNdIdx( *rPt.pSelBox->GetSttNd(), 1 );
@@ -1347,7 +1347,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
             {
                 pDoc->GetIDocumentUndoRedo().DoUndo(false);
             }
-            pDoc->getIDocumentContentOperations().AppendTxtNode( *aPam.GetPoint() );
+            pDoc->getIDocumentContentOperations().AppendTextNode( *aPam.GetPoint() );
             if( pUndo )
             {
                 pDoc->GetIDocumentUndoRedo().DoUndo(bUndo);
@@ -1355,7 +1355,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
             SwNodeRange aRg( aSttNdIdx, aPam.GetPoint()->nNode );
             ++rInsPosNd;
             if( pUndo )
-                pUndo->MoveBoxCntnt( pDoc, aRg, rInsPosNd );
+                pUndo->MoveBoxContent( pDoc, aRg, rInsPosNd );
             else
             {
                 pDoc->getIDocumentContentOperations().MoveNodeRange( aRg, rInsPosNd,
@@ -1369,9 +1369,9 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
             // skip the first TextNode
             rInsPosNd.Assign( pDoc->GetNodes(),
                             rInsPosNd.GetNode().EndOfSectionIndex() - 2 );
-            SwTxtNode* pTxtNd = rInsPosNd.GetNode().GetTxtNode();
-            if( pTxtNd )
-                aInsPos.nContent.Assign(pTxtNd, pTxtNd->GetTxt().getLength());
+            SwTextNode* pTextNd = rInsPosNd.GetNode().GetTextNode();
+            if( pTextNd )
+                aInsPos.nContent.Assign(pTextNd, pTextNd->GetText().getLength());
         }
 
         // the MergeBox should contain the complete text
@@ -1384,7 +1384,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
     }
 
     // set width of the box
-    (*ppMergeBox)->GetFrmFmt()->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
+    (*ppMergeBox)->GetFrameFormat()->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
     if( pUndo )
         pUndo->AddNewBox( (*ppMergeBox)->GetSttIdx() );
 }
@@ -1417,7 +1417,7 @@ static bool lcl_CheckCol( _FndBox const& rFndBox, bool* pPara )
         }
     }
     // is box protected ??
-    else if (rFndBox.GetBox()->GetFrmFmt()->GetProtect().IsCntntProtected())
+    else if (rFndBox.GetBox()->GetFrameFormat()->GetProtect().IsContentProtected())
         *pPara = false;
     return *pPara;
 }
@@ -1430,13 +1430,13 @@ sal_uInt16 CheckMergeSel( const SwPaM& rPam )
 //              headline is contained.
 
     Point aPt;
-    const SwCntntNode* pCntNd = rPam.GetCntntNode();
+    const SwContentNode* pCntNd = rPam.GetContentNode();
     const SwLayoutFrm *pStart = pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(),
                                                         &aPt )->GetUpper();
-    pCntNd = rPam.GetCntntNode(false);
+    pCntNd = rPam.GetContentNode(false);
     const SwLayoutFrm *pEnd = pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(),
                                                     &aPt )->GetUpper();
-    GetTblSel( pStart, pEnd, aBoxes, 0 );
+    GetTableSel( pStart, pEnd, aBoxes, 0 );
     return CheckMergeSel( aBoxes );
 }
 
@@ -1449,8 +1449,8 @@ sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes )
 
         _FndBox aFndBox( 0, 0 );
         _FndPara aPara( rBoxes, &aFndBox );
-        const SwTableNode* pTblNd = aPara.rBoxes[0]->GetSttNd()->FindTableNode();
-        ForEach_FndLineCopyCol( (SwTableLines&)pTblNd->GetTable().GetTabLines(), &aPara );
+        const SwTableNode* pTableNd = aPara.rBoxes[0]->GetSttNd()->FindTableNode();
+        ForEach_FndLineCopyCol( (SwTableLines&)pTableNd->GetTable().GetTabLines(), &aPara );
         if( !aFndBox.GetLines().empty() )
         {
             bool bMergeSelOk = true;
@@ -1506,7 +1506,7 @@ static SwTwips lcl_CalcWish( const SwLayoutFrm *pCell, long nWish,
         while ( pTmp->GetPrev() )
         {
             pTmp = static_cast<const SwLayoutFrm*>(pTmp->GetPrev());
-            long nTmp = pTmp->GetFmt()->GetFrmSize().GetWidth();
+            long nTmp = pTmp->GetFormat()->GetFrmSize().GetWidth();
             nRet += ( bRTL ? ( -1 ) : 1 ) * nTmp * nAct / nWish;
         }
         pTmp = pTmp->GetUpper()->GetUpper();
@@ -1579,9 +1579,9 @@ static void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart,
         return;
 
     // Beginning and end should not be in protected cells
-    while ( rpStart->GetFmt()->GetProtect().IsCntntProtected() )
+    while ( rpStart->GetFormat()->GetProtect().IsContentProtected() )
         rpStart = static_cast<const SwLayoutFrm*>(rpStart->GetNext());
-    while ( rpEnd->GetFmt()->GetProtect().IsCntntProtected() )
+    while ( rpEnd->GetFormat()->GetProtect().IsContentProtected() )
         rpEnd = static_cast<const SwLayoutFrm*>(rpEnd->GetPrev());
 }
 
@@ -1600,7 +1600,7 @@ static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
     SWRECTFN( pTab )
 
     bool bRTL = pTab->IsRightToLeft();
-    const long nTmpWish = pOrg->GetFmt()->GetFrmSize().GetWidth();
+    const long nTmpWish = pOrg->GetFormat()->GetFrmSize().GetWidth();
     const long nWish = ( nTmpWish > 0 ) ? nTmpWish : 1;
 
     while ( pTab->IsFollow() )
@@ -1622,7 +1622,7 @@ static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
     {
         const SwTwips nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)();
         nSX = ::lcl_CalcWish( rpStart, nWish, nPrtWidth ) + (pTab->*fnRect->fnGetPrtLeft)();
-        nSX2 = nSX + (rpStart->GetFmt()->GetFrmSize().GetWidth() * nPrtWidth / nWish);
+        nSX2 = nSX + (rpStart->GetFormat()->GetFrmSize().GetWidth() * nPrtWidth / nWish);
     }
 
     const SwLayoutFrm *pTmp = pTab->FirstCell();
@@ -1672,11 +1672,11 @@ static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
         nEX = ::lcl_CalcWish( rpEnd, nWish, nPrtWidth ) + (pTab->*fnRect->fnGetPrtLeft)();
     }
 
-    const SwCntntFrm* pLastCntnt = pTab->FindLastCntnt();
-    rpEnd = pLastCntnt ? pLastCntnt->GetUpper() : 0;
+    const SwContentFrm* pLastContent = pTab->FindLastContent();
+    rpEnd = pLastContent ? pLastContent->GetUpper() : 0;
     // --> Made code robust. If pTab does not have a lower,
     // we would crash here.
-    if ( !pLastCntnt ) return;
+    if ( !pLastContent ) return;
 
     while( !rpEnd->IsCellFrm() )
         rpEnd = rpEnd->GetUpper();
@@ -1695,7 +1695,7 @@ static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
 
     // Beginning and end should not be in protected cells.
     // If necessary we should search backwards again
-    while ( rpStart->GetFmt()->GetProtect().IsCntntProtected() )
+    while ( rpStart->GetFormat()->GetProtect().IsContentProtected() )
     {
         const SwLayoutFrm *pTmpLeaf = rpStart;
         pTmpLeaf = pTmpLeaf->GetNextLayoutLeaf();
@@ -1717,7 +1717,7 @@ static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
         else
             rpStart = pTmpLeaf;
     }
-    while ( rpEnd->GetFmt()->GetProtect().IsCntntProtected() )
+    while ( rpEnd->GetFormat()->GetProtect().IsContentProtected() )
     {
         const SwLayoutFrm *pTmpLeaf = rpEnd;
         pTmpLeaf = pTmpLeaf->GetPrevLayoutLeaf();
@@ -1730,7 +1730,7 @@ static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
         {
             pTmpTab = static_cast<const SwTabFrm*>(pTmpTab->FindPrev());
             OSL_ENSURE( pTmpTab->IsTabFrm(), "Predecessor of Follow not Master.");
-            rpEnd = pTmpTab->FindLastCntnt()->GetUpper();
+            rpEnd = pTmpTab->FindLastContent()->GetUpper();
             while( !rpEnd->IsCellFrm() )
                 rpEnd = rpEnd->GetUpper();
             while ( (rpEnd->Frm().*fnRect->fnGetLeft)() > nEX )
@@ -1742,7 +1742,7 @@ static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
 }
 
 void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
-                    const SwLayoutFrm *pEnd, const SwTblSearchType eSearchType )
+                    const SwLayoutFrm *pEnd, const SwTableSearchType eSearchType )
 {
     while ( pStart && !pStart->IsCellFrm() )
         pStart = pStart->GetUpper();
@@ -1794,10 +1794,10 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
 
     // Beginning and end now nicely sorted, if required we
     // should move them
-    if( nsSwTblSearchType::TBLSEARCH_ROW == ((~nsSwTblSearchType::TBLSEARCH_PROTECT ) & eSearchType ) )
-        ::lcl_FindStartEndRow( pStart, pEnd, nsSwTblSearchType::TBLSEARCH_PROTECT & eSearchType );
-    else if( nsSwTblSearchType::TBLSEARCH_COL == ((~nsSwTblSearchType::TBLSEARCH_PROTECT ) & eSearchType ) )
-        ::lcl_FindStartEndCol( pStart, pEnd, nsSwTblSearchType::TBLSEARCH_PROTECT & eSearchType );
+    if( nsSwTableSearchType::TBLSEARCH_ROW == ((~nsSwTableSearchType::TBLSEARCH_PROTECT ) & eSearchType ) )
+        ::lcl_FindStartEndRow( pStart, pEnd, nsSwTableSearchType::TBLSEARCH_PROTECT & eSearchType );
+    else if( nsSwTableSearchType::TBLSEARCH_COL == ((~nsSwTableSearchType::TBLSEARCH_PROTECT ) & eSearchType ) )
+        ::lcl_FindStartEndCol( pStart, pEnd, nsSwTableSearchType::TBLSEARCH_PROTECT & eSearchType );
 
     if ( !pEnd || !pStart ) return; // Made code robust.
 
@@ -1805,9 +1805,9 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
     pTable = pStart->FindTabFrm();
     pEndTable = pEnd->FindTabFrm();
 
-    const long nStSz = pStart->GetFmt()->GetFrmSize().GetWidth();
-    const long nEdSz = pEnd->GetFmt()->GetFrmSize().GetWidth();
-    const long nWish = std::max( 1L, pTable->GetFmt()->GetFrmSize().GetWidth() );
+    const long nStSz = pStart->GetFormat()->GetFrmSize().GetWidth();
+    const long nEdSz = pEnd->GetFormat()->GetFrmSize().GetWidth();
+    const long nWish = std::max( 1L, pTable->GetFormat()->GetFrmSize().GetWidth() );
     while ( pTable )
     {
         SWRECTFN( pTable )
@@ -1859,7 +1859,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
         SwRect aUnion( aSt, Size( aDiff.X(), aDiff.Y() ) );
         aUnion.Justify();
 
-        if( !(nsSwTblSearchType::TBLSEARCH_NO_UNION_CORRECT & eSearchType ))
+        if( !(nsSwTableSearchType::TBLSEARCH_NO_UNION_CORRECT & eSearchType ))
         {
             // Unfortunately the union contains rounding errors now, therefore
             // erroneous results could occur during split/merge.
@@ -1894,7 +1894,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
                                         pRow->FirstCell() :
                                         0;
 
-            while ( pFirst && !::IsFrmInTblSel( aUnion, pFirst ) )
+            while ( pFirst && !::IsFrmInTableSel( aUnion, pFirst ) )
             {
                 if ( pFirst->GetNext() )
                 {
@@ -1906,11 +1906,11 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
                     pFirst = ::lcl_FindNextCellFrm( pFirst );
             }
             const SwLayoutFrm* pLast = 0;
-            const SwFrm* pLastCntnt = pTable->FindLastCntnt();
-            if ( pLastCntnt )
-                pLast = ::lcl_FindCellFrm( pLastCntnt->GetUpper() );
+            const SwFrm* pLastContent = pTable->FindLastContent();
+            if ( pLastContent )
+                pLast = ::lcl_FindCellFrm( pLastContent->GetUpper() );
 
-            while ( pLast && !::IsFrmInTblSel( aUnion, pLast ) )
+            while ( pLast && !::IsFrmInTableSel( aUnion, pLast ) )
                 pLast = ::lcl_FindCellFrm( pLast->GetPrevLayoutLeaf() );
 
             if ( pFirst && pLast ) //Robust
@@ -1935,7 +1935,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
 }
 
 bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv,
-                        const SwTblSearchType eSearchType )
+                        const SwTableSearchType eSearchType )
 {
     if( !rShell.IsTableMode() )
         rShell.GetCrsr();
@@ -1944,7 +1944,7 @@ bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv,
 }
 
 bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
-                        const SwTblSearchType eSearchType )
+                        const SwTableSearchType eSearchType )
 {
     if( 1 >= nDiv )
         return false;
@@ -1960,10 +1960,10 @@ bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
         aMkPos = pShCrsr->GetMkPos();
     }
 
-    const SwCntntNode* pCntNd = rCrsr.GetCntntNode();
+    const SwContentNode* pCntNd = rCrsr.GetContentNode();
     const SwLayoutFrm *pStart = pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(),
                                                         &aPtPos )->GetUpper();
-    pCntNd = rCrsr.GetCntntNode(false);
+    pCntNd = rCrsr.GetContentNode(false);
     const SwLayoutFrm *pEnd = pCntNd->getLayoutFrm( pCntNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(),
                                 &aMkPos )->GetUpper();
 
@@ -1993,7 +1993,7 @@ bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
                 while ( pCell && pRow->IsAnLower( pCell ) )
                 {
                     OSL_ENSURE( pCell->IsCellFrm(), "Frame without cell" );
-                    if( ::IsFrmInTblSel( rSelUnion.GetUnion(), pCell ) )
+                    if( ::IsFrmInTableSel( rSelUnion.GetUnion(), pCell ) )
                     {
                         if( (pCell->Frm().*fnRect->fnGetWidth)() < nMinValue )
                             return false;
@@ -2178,8 +2178,8 @@ void _FndBox::DelFrms( SwTable &rTable, bool bAccTableDispose )
 
     for ( sal_uInt16 i = nStPos; i <= nEndPos; ++i)
     {
-        SwFrmFmt *pFmt = rTable.GetTabLines()[i]->GetFrmFmt();
-        SwIterator<SwRowFrm,SwFmt> aIter( *pFmt );
+        SwFrameFormat *pFormat = rTable.GetTabLines()[i]->GetFrameFormat();
+        SwIterator<SwRowFrm,SwFormat> aIter( *pFormat );
         for ( SwRowFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
         {
                 if ( pFrm->GetTabLine() == rTable.GetTabLines()[i] )
@@ -2275,12 +2275,12 @@ void _FndBox::DelFrms( SwTable &rTable, bool bAccTableDispose )
     }
 }
 
-static bool lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk )
+static bool lcl_IsLineOfTableFrm( const SwTabFrm& rTable, const SwFrm& rChk )
 {
-    const SwTabFrm* pTblFrm = rChk.FindTabFrm();
-    if( pTblFrm->IsFollow() )
-        pTblFrm = pTblFrm->FindMaster( true );
-    return &rTable == pTblFrm;
+    const SwTabFrm* pTableFrm = rChk.FindTabFrm();
+    if( pTableFrm->IsFollow() )
+        pTableFrm = pTableFrm->FindMaster( true );
+    return &rTable == pTableFrm;
 }
 
 static void lcl_UpdateRepeatedHeadlines( SwTabFrm& rTabFrm, bool bCalcLowers )
@@ -2333,7 +2333,7 @@ void _FndBox::MakeFrms( SwTable &rTable )
         --nEndPos;
     }
     // now big insert operation for all tables.
-    SwIterator<SwTabFrm,SwFmt> aTabIter( *rTable.GetFrmFmt() );
+    SwIterator<SwTabFrm,SwFormat> aTabIter( *rTable.GetFrameFormat() );
     for ( SwTabFrm *pTable = aTabIter.First(); pTable; pTable = aTabIter.Next() )
     {
         if ( !pTable->IsFollow() )
@@ -2346,11 +2346,11 @@ void _FndBox::MakeFrms( SwTable &rTable )
             {
                 SwTableLine *pLine = pLineBehind ? pLineBehind :
                                                     rTable.GetTabLines()[static_cast<sal_uInt16>(i)];
-                SwIterator<SwRowFrm,SwFmt> aIter( *pLine->GetFrmFmt() );
+                SwIterator<SwRowFrm,SwFormat> aIter( *pLine->GetFrameFormat() );
                 pSibling = aIter.First();
                 while ( pSibling && (
                             pSibling->GetTabLine() != pLine ||
-                            !lcl_IsLineOfTblFrm( *pTable, *pSibling ) ||
+                            !lcl_IsLineOfTableFrm( *pTable, *pSibling ) ||
                             pSibling->IsRepeatedHeadline() ||
                             // #i53647# If !pLineBehind,
                             // IsInSplitTableRow() should be checked.
@@ -2405,7 +2405,7 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
          (nBfPos != USHRT_MAX ? nBfPos + 1 : 0)) / (nNumber + 1);
 
     // search the Master-TabFrm
-    SwIterator<SwTabFrm,SwFmt> aTabIter( *rTable.GetFrmFmt() );
+    SwIterator<SwTabFrm,SwFormat> aTabIter( *rTable.GetFrameFormat() );
     SwTabFrm *pTable;
     for ( pTable = aTabIter.First(); pTable; pTable = aTabIter.Next() )
     {
@@ -2417,13 +2417,13 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
             {
                 if ( pLineBehind )
                 {
-                    SwIterator<SwRowFrm,SwFmt> aIter( *pLineBehind->GetFrmFmt() );
+                    SwIterator<SwRowFrm,SwFormat> aIter( *pLineBehind->GetFrameFormat() );
                     pSibling = aIter.First();
                     while ( pSibling && (
                                 // only consider row frames associated with pLineBehind:
                                 pSibling->GetTabLine() != pLineBehind ||
                                 // only consider row frames that are in pTables Master-Follow chain:
-                                !lcl_IsLineOfTblFrm( *pTable, *pSibling ) ||
+                                !lcl_IsLineOfTableFrm( *pTable, *pSibling ) ||
                                 // only consider row frames that are not repeated headlines:
                                 pSibling->IsRepeatedHeadline() ||
                                 // only consider row frames that are not follow flow rows
@@ -2460,14 +2460,14 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
                 {
                     SwTableLine* pLine = pLineBefore ? pLineBefore : rTable.GetTabLines()[i];
 
-                    SwIterator<SwRowFrm,SwFmt> aIter( *pLine->GetFrmFmt() );
+                    SwIterator<SwRowFrm,SwFormat> aIter( *pLine->GetFrameFormat() );
                     pSibling = aIter.First();
 
                     while ( pSibling && (
                             // only consider row frames associated with pLineBefore:
                             pSibling->GetTabLine() != pLine ||
                             // only consider row frames that are in pTables Master-Follow chain:
-                            !lcl_IsLineOfTblFrm( *pTable, *pSibling ) ||
+                            !lcl_IsLineOfTableFrm( *pTable, *pSibling ) ||
                             // only consider row frames that are not repeated headlines:
                             pSibling->IsRepeatedHeadline() ||
                             // 1. case: pLineBefore == 0:
@@ -2558,7 +2558,7 @@ bool _FndBox::AreLinesToRestore( const SwTable &rTable ) const
     if ( rTable.GetRowsToRepeat() > 0 )
     {
         // oops: should the repeated headline have been deleted??
-        SwIterator<SwTabFrm,SwFmt> aIter( *rTable.GetFrmFmt() );
+        SwIterator<SwTabFrm,SwFormat> aIter( *rTable.GetFrameFormat() );
         for( SwTabFrm* pTable = aIter.First(); pTable; pTable = aIter.Next() )
         {
             if( pTable->IsFollow() )
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index b3b3d13f731e..5c2867e5a6a2 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -64,9 +64,9 @@ SwGrfNode::SwGrfNode(
         const SwNodeIndex & rWhere,
         const OUString& rGrfName, const OUString& rFltName,
         const Graphic* pGraphic,
-        SwGrfFmtColl *pGrfColl,
+        SwGrfFormatColl *pGrfColl,
         SwAttrSet* pAutoAttr ) :
-    SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
+    SwNoTextNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
     maGrfObj(),
     mpReplacementGraphic(0),
     // #i73788#
@@ -83,8 +83,8 @@ SwGrfNode::SwGrfNode(
 
 SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
                           const GraphicObject& rGrfObj,
-                      SwGrfFmtColl *pGrfColl, SwAttrSet* pAutoAttr ) :
-    SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
+                      SwGrfFormatColl *pGrfColl, SwAttrSet* pAutoAttr ) :
+    SwNoTextNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
     maGrfObj(rGrfObj),
     mpReplacementGraphic(0),
     // #i73788#
@@ -105,9 +105,9 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
  */
 SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
                       const OUString& rGrfName, const OUString& rFltName,
-                      SwGrfFmtColl *pGrfColl,
+                      SwGrfFormatColl *pGrfColl,
                       SwAttrSet* pAutoAttr ) :
-    SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
+    SwNoTextNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
     maGrfObj(),
     mpReplacementGraphic(0),
     // #i73788#
@@ -324,12 +324,12 @@ SwGrfNode::~SwGrfNode()
 /// allow reaction on change of content of GraphicObject
 void SwGrfNode::onGraphicChanged()
 {
-    // try to access SwFlyFrmFmt; since title/desc/name are set there, there is no
+    // try to access SwFlyFrameFormat; since title/desc/name are set there, there is no
     // use to continue if it is not yet set. If not yet set, call onGraphicChanged()
     // when it is set.
-    SwFlyFrmFmt* pFlyFmt = dynamic_cast< SwFlyFrmFmt* >(GetFlyFmt());
+    SwFlyFrameFormat* pFlyFormat = dynamic_cast< SwFlyFrameFormat* >(GetFlyFormat());
 
-    if(pFlyFmt)
+    if(pFlyFormat)
     {
         OUString aName;
         OUString aTitle;
@@ -407,7 +407,7 @@ const GraphicObject* SwGrfNode::GetReplacementGrfObj() const
     return mpReplacementGraphic;
 }
 
-SwCntntNode *SwGrfNode::SplitCntntNode( const SwPosition & )
+SwContentNode *SwGrfNode::SplitContentNode( const SwPosition & )
 {
     return this;
 }
@@ -416,7 +416,7 @@ SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere,
                                 const OUString& rGrfName,
                                 const OUString& rFltName,
                                 const Graphic* pGraphic,
-                                SwGrfFmtColl* pGrfColl,
+                                SwGrfFormatColl* pGrfColl,
                                 SwAttrSet* pAutoAttr,
                                 bool bDelayed )
 {
@@ -434,7 +434,7 @@ SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere,
 
 SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere,
                                 const GraphicObject& rGrfObj,
-                                SwGrfFmtColl* pGrfColl,
+                                SwGrfFormatColl* pGrfColl,
                                 SwAttrSet* pAutoAttr )
 {
     OSL_ENSURE( pGrfColl, "MakeGrfNode: Formatpointer ist 0." );
@@ -798,12 +798,12 @@ void SwGrfNode::ScaleImageMap()
         return;
 
     // re-scale Image-Map
-    SwFrmFmt* pFmt = GetFlyFmt();
+    SwFrameFormat* pFormat = GetFlyFormat();
 
-    if( !pFmt )
+    if( !pFormat )
         return;
 
-    SwFmtURL aURL( pFmt->GetURL() );
+    SwFormatURL aURL( pFormat->GetURL() );
     if ( !aURL.GetMap() )
         return;
 
@@ -811,8 +811,8 @@ void SwGrfNode::ScaleImageMap()
     Fraction aScaleX( 1, 1 );
     Fraction aScaleY( 1, 1 );
 
-    const SwFmtFrmSize& rFrmSize = pFmt->GetFrmSize();
-    const SvxBoxItem& rBox = pFmt->GetBox();
+    const SwFormatFrmSize& rFrmSize = pFormat->GetFrmSize();
+    const SvxBoxItem& rBox = pFormat->GetBox();
 
     if( !rFrmSize.GetWidthPercent() )
     {
@@ -848,7 +848,7 @@ void SwGrfNode::ScaleImageMap()
     if( bScale )
     {
         aURL.GetMap()->Scale( aScaleX, aScaleY );
-        pFmt->SetFmtAttr( aURL );
+        pFormat->SetFormatAttr( aURL );
     }
 }
 
@@ -926,10 +926,10 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf(
     return pStrm;
 }
 
-SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
+SwContentNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
 {
     // copy formats into the other document
-    SwGrfFmtColl* pColl = pDoc->CopyGrfColl( *GetGrfColl() );
+    SwGrfFormatColl* pColl = pDoc->CopyGrfColl( *GetGrfColl() );
 
     Graphic aTmpGrf = GetGrf();
 
diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx b/sw/source/core/inc/DocumentContentOperationsManager.hxx
index d9122780fad9..24974d119c09 100644
--- a/sw/source/core/inc/DocumentContentOperationsManager.hxx
+++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx
@@ -25,8 +25,8 @@
 #include <ndarr.hxx> //Only for lcl_RstTxtAttr
 
 class SwDoc;
-class SwNoTxtNode;
-class SwFmtColl;
+class SwNoTextNode;
+class SwFormatColl;
 class SwHistory;
 
 namespace sw
@@ -65,25 +65,25 @@ public:
 
     void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&) SAL_OVERRIDE;
 
-    SwFlyFrmFmt* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic,
-                        const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE;
+    SwFlyFrameFormat* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic,
+                        const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE;
 
-    SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
-        const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE;
+    SwFlyFrameFormat* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
+        const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE;
 
     void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj) SAL_OVERRIDE;
 
-    SwDrawFrmFmt* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) SAL_OVERRIDE;
+    SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) SAL_OVERRIDE;
 
-    SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
-        const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE;
+    SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
+        const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE;
 
-    SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
-                           const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE;
+    SwFlyFrameFormat* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
+                           const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE;
 
     bool SplitNode(const SwPosition &rPos, bool bChkTableStart) SAL_OVERRIDE;
 
-    bool AppendTxtNode(SwPosition& rPos) SAL_OVERRIDE;
+    bool AppendTextNode(SwPosition& rPos) SAL_OVERRIDE;
 
     bool ReplaceRange(SwPaM& rPam, const OUString& rNewStr,
                               const bool bRegExReplace) SAL_OVERRIDE;
@@ -114,11 +114,11 @@ public:
                             const bool bCopyFlyAtFly = false,
                             const bool bMergedFirstNode = false ) const;
 
-    /// Parameters for _Rst and lcl_SetTxtFmtColl
+    /// Parameters for _Rst and lcl_SetTextFormatColl
     //originallyfrom docfmt.cxx
-    struct ParaRstFmt
+    struct ParaRstFormat
     {
-        SwFmtColl* pFmtColl;
+        SwFormatColl* pFormatColl;
         SwHistory* pHistory;
         const SwPosition *pSttNd, *pEndNd;
         const SfxItemSet* pDelSet;
@@ -130,9 +130,9 @@ public:
         /// From the attributes included in the range, delete only the ones which have exactly same range. Don't delete the ones which are simply included in the range.
         bool bExactRange;
 
-        ParaRstFmt(const SwPosition* pStt, const SwPosition* pEnd,
+        ParaRstFormat(const SwPosition* pStt, const SwPosition* pEnd,
                    SwHistory* pHst, sal_uInt16 nWhch = 0, const SfxItemSet* pSet = 0)
-            : pFmtColl(0)
+            : pFormatColl(0)
             , pHistory(pHst)
             , pSttNd(pStt)
             , pEndNd(pEnd)
@@ -146,7 +146,7 @@ public:
         {
         }
     };
-    static bool lcl_RstTxtAttr( const SwNodePtr& rpNd, void* pArgs ); //originally from docfmt.cxx
+    static bool lcl_RstTextAttr( const SwNodePtr& rpNd, void* pArgs ); //originally from docfmt.cxx
 
 
     virtual ~DocumentContentOperationsManager();
@@ -159,10 +159,10 @@ private:
     bool DeleteRangeImpl(SwPaM&, const bool unused = false);
     bool DeleteRangeImplImpl(SwPaM &);
     bool ReplaceRangeImpl(SwPaM&, OUString const&, const bool);
-    SwFlyFrmFmt* _InsNoTxtNode( const SwPosition&rPos, SwNoTxtNode*,
+    SwFlyFrameFormat* _InsNoTextNode( const SwPosition&rPos, SwNoTextNode*,
                                 const SfxItemSet* pFlyAttrSet,
                                 const SfxItemSet* pGrfAttrSet,
-                                SwFrmFmt* = 0 );
+                                SwFrameFormat* = 0 );
     /* Copy a range within the same or to another document.
      Position may not lie within range! */
     bool CopyImpl( SwPaM&, SwPosition&, const bool MakeNewFrms /*= true */,
diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx b/sw/source/core/inc/DocumentFieldsManager.hxx
index 010481d7e16a..2e827fba9276 100644
--- a/sw/source/core/inc/DocumentFieldsManager.hxx
+++ b/sw/source/core/inc/DocumentFieldsManager.hxx
@@ -36,32 +36,32 @@ public:
 
     DocumentFieldsManager( SwDoc& i_rSwdoc );
 
-    virtual const SwFldTypes *GetFldTypes() const SAL_OVERRIDE;
-    virtual SwFieldType *InsertFldType(const SwFieldType &) SAL_OVERRIDE;
-    virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const SAL_OVERRIDE;
-    virtual SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const SAL_OVERRIDE;
-    virtual void RemoveFldType(size_t nFld) SAL_OVERRIDE;
-    virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB) SAL_OVERRIDE;
-    virtual void InsDeletedFldType(SwFieldType &) SAL_OVERRIDE;
+    virtual const SwFieldTypes *GetFieldTypes() const SAL_OVERRIDE;
+    virtual SwFieldType *InsertFieldType(const SwFieldType &) SAL_OVERRIDE;
+    virtual SwFieldType *GetSysFieldType( const sal_uInt16 eWhich ) const SAL_OVERRIDE;
+    virtual SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const SAL_OVERRIDE;
+    virtual void RemoveFieldType(size_t nField) SAL_OVERRIDE;
+    virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) SAL_OVERRIDE;
+    virtual void InsDeletedFieldType(SwFieldType &) SAL_OVERRIDE;
     virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) SAL_OVERRIDE;
-    virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) SAL_OVERRIDE;
-    virtual void UpdateRefFlds(SfxPoolItem* pHt) SAL_OVERRIDE;
-    virtual void UpdateTblFlds(SfxPoolItem* pHt) SAL_OVERRIDE;
-    virtual void UpdateExpFlds(SwTxtFld* pFld, bool bUpdateRefFlds) SAL_OVERRIDE;
-    virtual void UpdateUsrFlds() SAL_OVERRIDE;
-    virtual void UpdatePageFlds(SfxPoolItem*) SAL_OVERRIDE;
-    virtual void LockExpFlds() SAL_OVERRIDE;
-    virtual void UnlockExpFlds() SAL_OVERRIDE;
-    virtual bool IsExpFldsLocked() const SAL_OVERRIDE;
-    virtual SwDocUpdtFld& GetUpdtFlds() const SAL_OVERRIDE;
+    virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) SAL_OVERRIDE;
+    virtual void UpdateRefFields(SfxPoolItem* pHt) SAL_OVERRIDE;
+    virtual void UpdateTableFields(SfxPoolItem* pHt) SAL_OVERRIDE;
+    virtual void UpdateExpFields(SwTextField* pField, bool bUpdateRefFields) SAL_OVERRIDE;
+    virtual void UpdateUsrFields() SAL_OVERRIDE;
+    virtual void UpdatePageFields(SfxPoolItem*) SAL_OVERRIDE;
+    virtual void LockExpFields() SAL_OVERRIDE;
+    virtual void UnlockExpFields() SAL_OVERRIDE;
+    virtual bool IsExpFieldsLocked() const SAL_OVERRIDE;
+    virtual SwDocUpdateField& GetUpdateFields() const SAL_OVERRIDE;
     virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) SAL_OVERRIDE;
     virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) SAL_OVERRIDE;
-    virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) SAL_OVERRIDE;
-    virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld) SAL_OVERRIDE;
-    virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld) SAL_OVERRIDE;
-    virtual bool IsNewFldLst() const SAL_OVERRIDE;
-    virtual void SetNewFldLst( bool bFlag) SAL_OVERRIDE;
-    virtual void InsDelFldInFldLst(bool bIns, const SwTxtFld& rFld) SAL_OVERRIDE;
+    virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) SAL_OVERRIDE;
+    virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) SAL_OVERRIDE;
+    virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) SAL_OVERRIDE;
+    virtual bool IsNewFieldLst() const SAL_OVERRIDE;
+    virtual void SetNewFieldLst( bool bFlag) SAL_OVERRIDE;
+    virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) SAL_OVERRIDE;
 
     //Non Interface methods
 
@@ -75,7 +75,7 @@ public:
        @param rPos position to search at
        @return pointer to field at the given position or NULL in case no field is found
     */
-    static SwTxtFld* GetTxtFldAtPos(const SwPosition& rPos);
+    static SwTextField* GetTextFieldAtPos(const SwPosition& rPos);
 
     bool containsUpdatableFields();
 
@@ -86,7 +86,7 @@ public:
 
     void ClearFieldTypes();
 
-    void UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc );
+    void UpdateDBNumFields( SwDBNameInfField& rDBField, SwCalc& rCalc );
 
     virtual ~DocumentFieldsManager();
 
@@ -94,10 +94,10 @@ private:
 
     SwDoc& m_rDoc;
 
-    bool mbNewFldLst; //< TRUE: Rebuild field-list.
-    SwDocUpdtFld    *mpUpdtFlds; //< Struct for updating fields
-    SwFldTypes      *mpFldTypes;
-    sal_Int8    mnLockExpFld;  //< If != 0 UpdateExpFlds() has no effect!
+    bool mbNewFieldLst; //< TRUE: Rebuild field-list.
+    SwDocUpdateField    *mpUpdateFields; //< Struct for updating fields
+    SwFieldTypes      *mpFieldTypes;
+    sal_Int8    mnLockExpField;  //< If != 0 UpdateExpFields() has no effect!
 };
 
 }
diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx b/sw/source/core/inc/DocumentLayoutManager.hxx
index ddc8ef30e4bd..abcd8eccec76 100644
--- a/sw/source/core/inc/DocumentLayoutManager.hxx
+++ b/sw/source/core/inc/DocumentLayoutManager.hxx
@@ -49,9 +49,9 @@ public:
     virtual SwLayouter* GetLayouter() SAL_OVERRIDE;
     virtual void SetLayouter( SwLayouter* pNew ) SAL_OVERRIDE;
 
-    virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet ) SAL_OVERRIDE;
-    virtual void DelLayoutFmt( SwFrmFmt *pFmt ) SAL_OVERRIDE;
-    virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, bool bSetTxtFlyAtt, bool bMakeFrms ) SAL_OVERRIDE;
+    virtual SwFrameFormat* MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet ) SAL_OVERRIDE;
+    virtual void DelLayoutFormat( SwFrameFormat *pFormat ) SAL_OVERRIDE;
+    virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor, bool bSetTextFlyAtt, bool bMakeFrms ) SAL_OVERRIDE;
 
     //Non Interface methods
     void ClearSwLayouterEntries();
diff --git a/sw/source/core/inc/DocumentOutlineNodesManager.hxx b/sw/source/core/inc/DocumentOutlineNodesManager.hxx
index c16a15732c0b..ccd88fac2946 100644
--- a/sw/source/core/inc/DocumentOutlineNodesManager.hxx
+++ b/sw/source/core/inc/DocumentOutlineNodesManager.hxx
@@ -35,7 +35,7 @@ public:
 
     DocumentOutlineNodesManager( SwDoc& i_rSwdoc );
 
-    //typedef ::std::vector< const SwTxtNode* > tSortedOutlineNodeList;
+    //typedef ::std::vector< const SwTextNode* > tSortedOutlineNodeList;
 
     sal_Int32 getOutlineNodesCount() const SAL_OVERRIDE;
 
@@ -43,8 +43,8 @@ public:
     OUString getOutlineText( const sal_Int32 nIdx,
                                   const bool bWithNumber = true,
                                   const bool bWithSpacesForLevel = false,
-                                  const bool bWithFtn = true ) const SAL_OVERRIDE;
-    SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const SAL_OVERRIDE;
+                                  const bool bWithFootnote = true ) const SAL_OVERRIDE;
+    SwTextNode* getOutlineNode( const sal_Int32 nIdx ) const SAL_OVERRIDE;
     void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const SAL_OVERRIDE;
 
     virtual ~DocumentOutlineNodesManager();
diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx
index 9c405ea2475e..1fe968af74b6 100644
--- a/sw/source/core/inc/DocumentRedlineManager.hxx
+++ b/sw/source/core/inc/DocumentRedlineManager.hxx
@@ -44,11 +44,11 @@ public:
 
     virtual bool IsIgnoreRedline() const SAL_OVERRIDE;
 
-    virtual const SwRedlineTbl& GetRedlineTbl() const SAL_OVERRIDE;
-    virtual SwRedlineTbl& GetRedlineTbl() SAL_OVERRIDE;
-    virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const SAL_OVERRIDE;
-    virtual SwExtraRedlineTbl& GetExtraRedlineTbl() SAL_OVERRIDE;
-    virtual bool HasExtraRedlineTbl() const SAL_OVERRIDE;
+    virtual const SwRedlineTable& GetRedlineTable() const SAL_OVERRIDE;
+    virtual SwRedlineTable& GetRedlineTable() SAL_OVERRIDE;
+    virtual const SwExtraRedlineTable& GetExtraRedlineTable() const SAL_OVERRIDE;
+    virtual SwExtraRedlineTable& GetExtraRedlineTable() SAL_OVERRIDE;
+    virtual bool HasExtraRedlineTable() const SAL_OVERRIDE;
 
     virtual bool IsInRedlines(const SwNode& rNode) const SAL_OVERRIDE;
 
@@ -116,7 +116,7 @@ public:
     /** Set comment-text for Redline. It then comes in via AppendRedLine.
      Used by AutoFormat. 0-pointer resets mode.
      Sequence number is for conjoining of Redlines by the UI. */
-    void SetAutoFmtRedlineComment( const OUString* pTxt, sal_uInt16 nSeqNo = 0 );
+    void SetAutoFormatRedlineComment( const OUString* pText, sal_uInt16 nSeqNo = 0 );
 
     void checkRedlining(RedlineMode_t& _rReadlineMode);
 
@@ -127,13 +127,13 @@ private:
     SwDoc& m_rDoc;
 
     RedlineMode_t meRedlineMode;     //< Current Redline Mode.
-    SwRedlineTbl        *mpRedlineTbl;           //< List of all Ranged Redlines.
-    SwExtraRedlineTbl   *mpExtraRedlineTbl;      //< List of all Extra Redlines.
-    OUString            *mpAutoFmtRedlnComment;  //< Comment for Redlines inserted via AutoFormat.
+    SwRedlineTable        *mpRedlineTable;           //< List of all Ranged Redlines.
+    SwExtraRedlineTable   *mpExtraRedlineTable;      //< List of all Extra Redlines.
+    OUString            *mpAutoFormatRedlnComment;  //< Comment for Redlines inserted via AutoFormat.
     bool mbIsRedlineMove;    //< true: Redlines are moved into to / out of the section.
     bool mbReadlineChecked;    //< true: if the query was already shown
-    sal_uInt16 mnAutoFmtRedlnCommentNo;  /**< SeqNo for conjoining of AutoFmt-Redlines.
-                                         by the UI. Managed by SwAutoFmt! */
+    sal_uInt16 mnAutoFormatRedlnCommentNo;  /**< SeqNo for conjoining of AutoFormat-Redlines.
+                                         by the UI. Managed by SwAutoFormat! */
     ::com::sun::star::uno::Sequence <sal_Int8 > maRedlinePasswd;
 };
 
diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx
index 853ad75167bb..9ff978c40b04 100644
--- a/sw/source/core/inc/DocumentSettingManager.hxx
+++ b/sw/source/core/inc/DocumentSettingManager.hxx
@@ -31,7 +31,7 @@ class DocumentSettingManager :
 
     sal_uInt16  mnLinkUpdMode;       //< UpdateMode for links.
 
-    SwFldUpdateFlags    meFldUpdMode;//< Automatically Update Mode for fields/charts.
+    SwFieldUpdateFlags    meFieldUpdMode;//< Automatically Update Mode for fields/charts.
     SwCharCompressType meChrCmprType;//< for ASIAN: compress punctuation/kana
 
     sal_uInt32  mn32DummyCompatibilityOptions1;
@@ -167,8 +167,8 @@ public:
     virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const SAL_OVERRIDE;
     virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE;
     virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ) SAL_OVERRIDE;
-    virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE;
-    virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags eMode ) SAL_OVERRIDE;
+    virtual SwFieldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE;
+    virtual void setFieldUpdateFlags( /*[in]*/ SwFieldUpdateFlags eMode ) SAL_OVERRIDE;
     virtual SwCharCompressType getCharacterCompressionType() const SAL_OVERRIDE;
     virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ) SAL_OVERRIDE;
 
diff --git a/sw/source/core/inc/DocumentStateManager.hxx b/sw/source/core/inc/DocumentStateManager.hxx
index 70f3a7332639..1d67a36d2949 100644
--- a/sw/source/core/inc/DocumentStateManager.hxx
+++ b/sw/source/core/inc/DocumentStateManager.hxx
@@ -40,12 +40,12 @@ public:
     bool IsModified() const SAL_OVERRIDE;
     bool IsInCallModified() const SAL_OVERRIDE;
     bool IsLoaded() const SAL_OVERRIDE;
-    bool IsUpdateExpFld() const SAL_OVERRIDE;
+    bool IsUpdateExpField() const SAL_OVERRIDE;
     bool IsNewDoc() const SAL_OVERRIDE;
     bool IsPageNums() const SAL_OVERRIDE;
     void SetPageNums(bool b) SAL_OVERRIDE;
     void SetNewDoc(bool b) SAL_OVERRIDE;
-    void SetUpdateExpFldStat(bool b) SAL_OVERRIDE;
+    void SetUpdateExpFieldStat(bool b) SAL_OVERRIDE;
     void SetLoaded(bool b) SAL_OVERRIDE;
 
 private:
@@ -53,7 +53,7 @@ private:
 
     bool mbModified      ;    //< TRUE: document has changed.
     bool mbLoaded        ;    //< TRUE: Doc loaded.
-    bool mbUpdateExpFld  ;    //< TRUE: Update expression fields.
+    bool mbUpdateExpField  ;    //< TRUE: Update expression fields.
     bool mbNewDoc        ;    //< TRUE: new Doc.
     bool mbPageNums      ;    //< TRUE: There are virtual page numbers.
     bool mbInCallModified;    //< TRUE: in Set/Reset-Modified link.
diff --git a/sw/source/core/inc/DocumentStylePoolManager.hxx b/sw/source/core/inc/DocumentStylePoolManager.hxx
index a18506b24f4d..f32c5955c3b1 100644
--- a/sw/source/core/inc/DocumentStylePoolManager.hxx
+++ b/sw/source/core/inc/DocumentStylePoolManager.hxx
@@ -35,14 +35,14 @@ public:
 
     DocumentStylePoolManager( SwDoc& i_rSwdoc );
 
-    virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) SAL_OVERRIDE;
-    virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
-    virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
-    virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
+    virtual SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) SAL_OVERRIDE;
+    virtual SwFormat* GetFormatFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
+    virtual SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
+    virtual SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
     virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) SAL_OVERRIDE;
     virtual SwNumRule* GetNumRuleFromPool( sal_uInt16 nId ) SAL_OVERRIDE;
-    virtual bool IsPoolTxtCollUsed( sal_uInt16 nId ) const SAL_OVERRIDE;
-    virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const SAL_OVERRIDE;
+    virtual bool IsPoolTextCollUsed( sal_uInt16 nId ) const SAL_OVERRIDE;
+    virtual bool IsPoolFormatUsed( sal_uInt16 nId ) const SAL_OVERRIDE;
     virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const SAL_OVERRIDE;
 
     virtual ~DocumentStylePoolManager();
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index dbc7e39f7541..50186fddaa53 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -44,7 +44,7 @@ namespace sw {
                 const OUString& rName,
                 const OUString& rType) SAL_OVERRIDE;
 
-            virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE;
+            virtual ::sw::mark::IMark* getMarkForTextNode(const SwTextNode& rTextNode, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE;
 
             virtual sw::mark::IMark* makeAnnotationMark(
                 const SwPaM& rPaM,
diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx
index 7795a6c8131f..20cdc585b25e 100644
--- a/sw/source/core/inc/SwPortionHandler.hxx
+++ b/sw/source/core/inc/SwPortionHandler.hxx
@@ -34,10 +34,10 @@ class SwFont;
  * once at the end of every on-screen line.
  *
  * All parameters relate to the 'model string', which is the text string
- * held by the corresponding SwTxtNode.
+ * held by the corresponding SwTextNode.
  *
  * The SwPortionHandler can be used with the
- * SwTxtFrm::VisitPortions(...) method.
+ * SwTextFrm::VisitPortions(...) method.
  */
 class SwPortionHandler
 {
@@ -79,7 +79,7 @@ public:
      */
     virtual void LineBreak(sal_Int32 nWidth) = 0;
 
-    /** skip characters. The SwTxtFrame may only display partially
+    /** skip characters. The SwTextFrame may only display partially
      * display a certain paragraph (e.g. when the paragraph is split
      * across multiple pages). In this case, the Skip() method must be
      * called to inform the portion handler to ignore a certain run of
diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx
index cb20d7fa3003..48881f766d1c 100644
--- a/sw/source/core/inc/SwUndoFmt.hxx
+++ b/sw/source/core/inc/SwUndoFmt.hxx
@@ -25,188 +25,188 @@
 #include <numrule.hxx>
 
 class SwDoc;
-class SwTxtFmtColl;
-class SwConditionTxtFmtColl;
+class SwTextFormatColl;
+class SwConditionTextFormatColl;
 class SwRewriter;
 class SfxItemSet;
 
-class SwUndoFmtCreate : public SwUndo
+class SwUndoFormatCreate : public SwUndo
 {
 protected:
-    SwFmt * pNew;
+    SwFormat * pNew;
     OUString sDerivedFrom;
     SwDoc * pDoc;
     mutable OUString sNewName;
     SfxItemSet * pNewSet;
-    sal_uInt16 nId;     // FmtId related
+    sal_uInt16 nId;     // FormatId related
     bool bAuto;
 
 public:
-    SwUndoFmtCreate(SwUndoId nUndoId, SwFmt * pNew, SwFmt * pDerivedFrom,
+    SwUndoFormatCreate(SwUndoId nUndoId, SwFormat * pNew, SwFormat * pDerivedFrom,
                     SwDoc * pDoc);
-    virtual ~SwUndoFmtCreate();
+    virtual ~SwUndoFormatCreate();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
     virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
 
-    virtual SwFmt * Create(SwFmt * pDerivedFrom) = 0;
+    virtual SwFormat * Create(SwFormat * pDerivedFrom) = 0;
     virtual void Delete() = 0;
-    virtual SwFmt * Find(const OUString & rName) const = 0;
+    virtual SwFormat * Find(const OUString & rName) const = 0;
 };
 
-class SwUndoFmtDelete : public SwUndo
+class SwUndoFormatDelete : public SwUndo
 {
 protected:
     OUString sDerivedFrom;
     SwDoc * pDoc;
     OUString sOldName;
     SfxItemSet aOldSet;
-    sal_uInt16 nId;     // FmtId related
+    sal_uInt16 nId;     // FormatId related
     bool bAuto;
 
 public:
-    SwUndoFmtDelete(SwUndoId nUndoId, SwFmt * pOld, SwDoc * pDoc);
-    virtual ~SwUndoFmtDelete();
+    SwUndoFormatDelete(SwUndoId nUndoId, SwFormat * pOld, SwDoc * pDoc);
+    virtual ~SwUndoFormatDelete();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
     virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
 
-    virtual SwFmt * Create(SwFmt * pDerivedFrom) = 0;
-    virtual void Delete(SwFmt * pFmt) = 0;
-    virtual SwFmt * Find(const OUString & rName) const = 0;
+    virtual SwFormat * Create(SwFormat * pDerivedFrom) = 0;
+    virtual void Delete(SwFormat * pFormat) = 0;
+    virtual SwFormat * Find(const OUString & rName) const = 0;
 };
 
-class SwUndoRenameFmt : public SwUndo
+class SwUndoRenameFormat : public SwUndo
 {
 protected:
     OUString sOldName, sNewName;
     SwDoc * pDoc;
 
 public:
-    SwUndoRenameFmt(SwUndoId nUndoId, const OUString & sOldName,
+    SwUndoRenameFormat(SwUndoId nUndoId, const OUString & sOldName,
                     const OUString & sNewName,
                     SwDoc * pDoc);
-    virtual ~SwUndoRenameFmt();
+    virtual ~SwUndoRenameFormat();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
     SwRewriter GetRewriter() const SAL_OVERRIDE;
 
-    virtual SwFmt * Find(const OUString & rName) const = 0;
+    virtual SwFormat * Find(const OUString & rName) const = 0;
 };
 
-class SwUndoTxtFmtCollCreate : public SwUndoFmtCreate
+class SwUndoTextFormatCollCreate : public SwUndoFormatCreate
 {
 public:
-    SwUndoTxtFmtCollCreate(SwTxtFmtColl * pNew, SwTxtFmtColl * pDerivedFrom,
+    SwUndoTextFormatCollCreate(SwTextFormatColl * pNew, SwTextFormatColl * pDerivedFrom,
                            SwDoc * pDoc);
 
-    virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+    virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE;
     virtual void Delete() SAL_OVERRIDE;
-    virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
+    virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE;
 };
 
-class SwUndoTxtFmtCollDelete : public SwUndoFmtDelete
+class SwUndoTextFormatCollDelete : public SwUndoFormatDelete
 {
 public:
-    SwUndoTxtFmtCollDelete(SwTxtFmtColl * pOld, SwDoc * pDoc);
+    SwUndoTextFormatCollDelete(SwTextFormatColl * pOld, SwDoc * pDoc);
 
-    virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
-    virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE;
-    virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
+    virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE;
+    virtual void Delete(SwFormat * pFormat) SAL_OVERRIDE;
+    virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE;
 };
 
-class SwUndoCondTxtFmtCollCreate : public SwUndoTxtFmtCollCreate
+class SwUndoCondTextFormatCollCreate : public SwUndoTextFormatCollCreate
 {
 public:
-    SwUndoCondTxtFmtCollCreate(SwConditionTxtFmtColl * pNew, SwTxtFmtColl * pDerivedFrom, SwDoc * pDoc);
-    virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+    SwUndoCondTextFormatCollCreate(SwConditionTextFormatColl * pNew, SwTextFormatColl * pDerivedFrom, SwDoc * pDoc);
+    virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE;
 };
 
-class SwUndoCondTxtFmtCollDelete : public SwUndoTxtFmtCollDelete
+class SwUndoCondTextFormatCollDelete : public SwUndoTextFormatCollDelete
 {
 public:
-    SwUndoCondTxtFmtCollDelete(SwTxtFmtColl * pOld, SwDoc * pDoc);
-    virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+    SwUndoCondTextFormatCollDelete(SwTextFormatColl * pOld, SwDoc * pDoc);
+    virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE;
 };
 
-class SwUndoRenameFmtColl : public SwUndoRenameFmt
+class SwUndoRenameFormatColl : public SwUndoRenameFormat
 {
 public:
-    SwUndoRenameFmtColl(const OUString & sOldName,
+    SwUndoRenameFormatColl(const OUString & sOldName,
                         const OUString & sNewName,
                         SwDoc * pDoc);
 
-    virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
+    virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE;
 };
 
-class SwUndoCharFmtCreate : public SwUndoFmtCreate
+class SwUndoCharFormatCreate : public SwUndoFormatCreate
 {
 public:
-    SwUndoCharFmtCreate(SwCharFmt * pNew, SwCharFmt * pDerivedFrom,
+    SwUndoCharFormatCreate(SwCharFormat * pNew, SwCharFormat * pDerivedFrom,
                            SwDoc * pDoc);
 
-    virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+    virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE;
     virtual void Delete() SAL_OVERRIDE;
-    virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
+    virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE;
 };
 
-class SwUndoCharFmtDelete : public SwUndoFmtDelete
+class SwUndoCharFormatDelete : public SwUndoFormatDelete
 {
 public:
-    SwUndoCharFmtDelete(SwCharFmt * pOld, SwDoc * pDoc);
+    SwUndoCharFormatDelete(SwCharFormat * pOld, SwDoc * pDoc);
 
-    virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
-    virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE;
-    virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
+    virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE;
+    virtual void Delete(SwFormat * pFormat) SAL_OVERRIDE;
+    virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE;
 };
 
-class SwUndoRenameCharFmt : public SwUndoRenameFmt
+class SwUndoRenameCharFormat : public SwUndoRenameFormat
 {
 public:
-    SwUndoRenameCharFmt(const OUString & sOldName,
+    SwUndoRenameCharFormat(const OUString & sOldName,
                         const OUString & sNewName,
                         SwDoc * pDoc);
 
-    virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
+    virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE;
 };
 
-class SwUndoFrmFmtCreate : public SwUndoFmtCreate
+class SwUndoFrameFormatCreate : public SwUndoFormatCreate
 {
     bool bAuto;
 
 public:
-    SwUndoFrmFmtCreate(SwFrmFmt * pNew, SwFrmFmt * pDerivedFrom,
+    SwUndoFrameFormatCreate(SwFrameFormat * pNew, SwFrameFormat * pDerivedFrom,
                        SwDoc * pDoc);
 
-    virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
+    virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE;
     virtual void Delete() SAL_OVERRIDE;
-    virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
+    virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE;
 };
 
-class SwUndoFrmFmtDelete : public SwUndoFmtDelete
+class SwUndoFrameFormatDelete : public SwUndoFormatDelete
 {
 public:
-    SwUndoFrmFmtDelete(SwFrmFmt * pOld, SwDoc * pDoc);
+    SwUndoFrameFormatDelete(SwFrameFormat * pOld, SwDoc * pDoc);
 
-    virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE;
-    virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE;
-    virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
+    virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE;
+    virtual void Delete(SwFormat * pFormat) SAL_OVERRIDE;
+    virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE;
 };
 
-class SwUndoRenameFrmFmt : public SwUndoRenameFmt
+class SwUndoRenameFrameFormat : public SwUndoRenameFormat
 {
 public:
-    SwUndoRenameFrmFmt(const OUString & sOldName,
+    SwUndoRenameFrameFormat(const OUString & sOldName,
                        const OUString & sNewName,
                        SwDoc * pDoc);
 
-    virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE;
+    virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE;
 };
 
 class SwUndoNumruleCreate : public SwUndo
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index d2c8abc5d0bb..070335b41f15 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -52,8 +52,8 @@ public:
     short               nCurBlk;
     SwXMLTextBlocks( const OUString& rFile );
     SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFile );
-    void   AddName( const OUString&, const OUString&, const OUString&, bool bOnlyTxt = false );
-    virtual void   AddName( const OUString&, const OUString&, bool bOnlyTxt = false ) SAL_OVERRIDE;
+    void   AddName( const OUString&, const OUString&, const OUString&, bool bOnlyText = false );
+    virtual void   AddName( const OUString&, const OUString&, bool bOnlyText = false ) SAL_OVERRIDE;
     static OUString GeneratePackageName ( const OUString& rShort );
     virtual ~SwXMLTextBlocks();
     virtual sal_uLong Delete( sal_uInt16 ) SAL_OVERRIDE;
@@ -80,7 +80,7 @@ public:
     bool IsOnlyTextBlock( sal_uInt16 nIdx ) const;
     void SetIsTextOnly( const OUString& rShort, bool bNewValue );
 
-    virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTbl,
+    virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTable,
                                  bool bFileAlreadyOpen = false ) SAL_OVERRIDE;
     virtual sal_uLong SetMacroTable( sal_uInt16 nIdx,
                                  const SvxMacroTableDtor& rMacroTable,
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index ec923ac2ae9c..a6ed6feed14c 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -29,8 +29,8 @@
 #include <set>
 
 class SvxTabStopItem;
-class SwFmt;
-class SwFtnInfo;
+class SwFormat;
+class SwFootnoteInfo;
 class SwEndNoteInfo;
 
 class SwUndoAttr : public SwUndo, private SwUndRng
@@ -54,7 +54,7 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
 
-    void SaveRedlineData( const SwPaM& rPam, bool bInsCntnt );
+    void SaveRedlineData( const SwPaM& rPam, bool bInsContent );
 
     SwHistory& GetHistory() { return *m_pHistory; }
 };
@@ -66,8 +66,8 @@ class SwUndoResetAttr : public SwUndo, private SwUndRng
     const sal_uInt16 m_nFormatId;             // Format-Id for Redo
 
 public:
-    SwUndoResetAttr( const SwPaM&, sal_uInt16 nFmtId );
-    SwUndoResetAttr( const SwPosition&, sal_uInt16 nFmtId );
+    SwUndoResetAttr( const SwPaM&, sal_uInt16 nFormatId );
+    SwUndoResetAttr( const SwPosition&, sal_uInt16 nFormatId );
 
     virtual ~SwUndoResetAttr();
 
@@ -80,16 +80,16 @@ public:
     SwHistory& GetHistory() { return *m_pHistory; }
 };
 
-class SwUndoFmtAttr : public SwUndo
+class SwUndoFormatAttr : public SwUndo
 {
     friend class SwUndoDefaultAttr;
-    SwFmt * m_pFmt;
+    SwFormat * m_pFormat;
     ::std::unique_ptr<SfxItemSet> m_pOldSet;    // old attributes
     sal_uLong m_nNodeIndex;
-    const sal_uInt16 m_nFmtWhich;
+    const sal_uInt16 m_nFormatWhich;
     const bool m_bSaveDrawPt;
 
-    bool IsFmtInDoc( SwDoc* );   //is the attribute format still in the Doc?
+    bool IsFormatInDoc( SwDoc* );   //is the attribute format still in the Doc?
     void SaveFlyAnchor( bool bSaveDrawPt = false );
     // #i35443# - Add return value, type <bool>.
     // Return value indicates, if anchor attribute is restored.
@@ -106,14 +106,14 @@ class SwUndoFmtAttr : public SwUndo
 public:
     // register at the Format and save old attributes
     // --> OD 2008-02-27 #refactorlists# - removed <rNewSet>
-    SwUndoFmtAttr( const SfxItemSet& rOldSet,
-                   SwFmt& rFmt,
+    SwUndoFormatAttr( const SfxItemSet& rOldSet,
+                   SwFormat& rFormat,
                    bool bSaveDrawPt = true );
-    SwUndoFmtAttr( const SfxPoolItem& rItem,
-                   SwFmt& rFmt,
+    SwUndoFormatAttr( const SfxPoolItem& rItem,
+                   SwFormat& rFormat,
                    bool bSaveDrawPt = true );
 
-    virtual ~SwUndoFmtAttr();
+    virtual ~SwUndoFormatAttr();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -122,36 +122,36 @@ public:
     virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
 
     void PutAttr( const SfxPoolItem& rItem );
-    SwFmt* GetFmt( SwDoc& rDoc );   // checks if it is still in the Doc!
+    SwFormat* GetFormat( SwDoc& rDoc );   // checks if it is still in the Doc!
 };
 
 // --> OD 2008-02-12 #newlistlevelattrs#
-class SwUndoFmtResetAttr : public SwUndo
+class SwUndoFormatResetAttr : public SwUndo
 {
     public:
-        SwUndoFmtResetAttr( SwFmt& rChangedFormat,
+        SwUndoFormatResetAttr( SwFormat& rChangedFormat,
                             const sal_uInt16 nWhichId );
-        virtual ~SwUndoFmtResetAttr();
+        virtual ~SwUndoFormatResetAttr();
 
         virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
         virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
     private:
         // format at which a certain attribute is reset.
-        SwFmt * const m_pChangedFormat;
+        SwFormat * const m_pChangedFormat;
         // which ID of the reset attribute
         const sal_uInt16 m_nWhichId;
         // old attribute which has been reset - needed for undo.
         ::std::unique_ptr<SfxPoolItem> m_pOldItem;
 };
 
-class SwUndoDontExpandFmt : public SwUndo
+class SwUndoDontExpandFormat : public SwUndo
 {
     const sal_uLong m_nNodeIndex;
     const sal_Int32 m_nContentIndex;
 
 public:
-    SwUndoDontExpandFmt( const SwPosition& rPos );
+    SwUndoDontExpandFormat( const SwPosition& rPos );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -159,19 +159,19 @@ public:
 };
 
 // helper class to receive changed attribute sets
-class SwUndoFmtAttrHelper : public SwClient
+class SwUndoFormatAttrHelper : public SwClient
 {
-    ::std::unique_ptr<SwUndoFmtAttr> m_pUndo;
+    ::std::unique_ptr<SwUndoFormatAttr> m_pUndo;
     const bool m_bSaveDrawPt;
 
 public:
-    SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSaveDrawPt = true );
+    SwUndoFormatAttrHelper( SwFormat& rFormat, bool bSaveDrawPt = true );
 
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
 
-    SwUndoFmtAttr* GetUndo() const  { return m_pUndo.get(); }
+    SwUndoFormatAttr* GetUndo() const  { return m_pUndo.get(); }
     // release the undo object (so it is not deleted here), and return it
-    SwUndoFmtAttr* ReleaseUndo()    { return m_pUndo.release(); }
+    SwUndoFormatAttr* ReleaseUndo()    { return m_pUndo.release(); }
 };
 
 class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
@@ -215,7 +215,7 @@ class SwUndoChangeFootNote : public SwUndo, private SwUndRng
     const bool m_bEndNote;
 
 public:
-    SwUndoChangeFootNote( const SwPaM& rRange, const OUString& rTxt,
+    SwUndoChangeFootNote( const SwPaM& rRange, const OUString& rText,
                           sal_uInt16 nNum, bool bIsEndNote );
     virtual ~SwUndoChangeFootNote();
 
@@ -228,10 +228,10 @@ public:
 
 class SwUndoFootNoteInfo : public SwUndo
 {
-    ::std::unique_ptr<SwFtnInfo> m_pFootNoteInfo;
+    ::std::unique_ptr<SwFootnoteInfo> m_pFootNoteInfo;
 
 public:
-    SwUndoFootNoteInfo( const SwFtnInfo &rInfo );
+    SwUndoFootNoteInfo( const SwFootnoteInfo &rInfo );
 
     virtual ~SwUndoFootNoteInfo();
 
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index eff8a943ede1..5863bc32ba76 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -26,11 +26,11 @@
 #include <redline.hxx>
 
 class SfxItemSet;
-class SwFmtColl;
-class SwFmtAnchor;
+class SwFormatColl;
+class SwFormatAnchor;
 class SdrMarkList;
 class SwUndoDelete;
-class SwFmt;
+class SwFormat;
 
 namespace sw {
     class UndoManager;
@@ -84,7 +84,7 @@ public:
     UndoRedoContext(SwDoc & rDoc, IShellCursorSupplier & rCursorSupplier)
         : m_rDoc(rDoc)
         , m_rCursorSupplier(rCursorSupplier)
-        , m_pSelFmt(0)
+        , m_pSelFormat(0)
         , m_pMarkList(0)
     { }
 
@@ -92,21 +92,21 @@ public:
 
     IShellCursorSupplier & GetCursorSupplier() { return m_rCursorSupplier; }
 
-    void SetSelections(SwFrmFmt *const pSelFmt, SdrMarkList *const pMarkList)
+    void SetSelections(SwFrameFormat *const pSelFormat, SdrMarkList *const pMarkList)
     {
-        m_pSelFmt = pSelFmt;
+        m_pSelFormat = pSelFormat;
         m_pMarkList = pMarkList;
     }
-    void GetSelections(SwFrmFmt *& o_rpSelFmt, SdrMarkList *& o_rpMarkList)
+    void GetSelections(SwFrameFormat *& o_rpSelFormat, SdrMarkList *& o_rpMarkList)
     {
-        o_rpSelFmt = m_pSelFmt;
+        o_rpSelFormat = m_pSelFormat;
         o_rpMarkList = m_pMarkList;
     }
 
 private:
     SwDoc & m_rDoc;
     IShellCursorSupplier & m_rCursorSupplier;
-    SwFrmFmt * m_pSelFmt;
+    SwFrameFormat * m_pSelFormat;
     SdrMarkList * m_pMarkList;
 };
 
@@ -138,11 +138,11 @@ private:
 
 } // namespace sw
 
-class SwUndoFmtColl : public SwUndo, private SwUndRng
+class SwUndoFormatColl : public SwUndo, private SwUndRng
 {
-    OUString aFmtName;
+    OUString aFormatName;
     SwHistory* pHistory;
-    SwFmtColl* pFmtColl;
+    SwFormatColl* pFormatColl;
     // for correct <ReDo(..)> and <Repeat(..)>
     // boolean, which indicates that the attributes are reseted at the nodes
     // before the format has been applied.
@@ -151,13 +151,13 @@ class SwUndoFmtColl : public SwUndo, private SwUndRng
     // the nodes before the format has been applied.
     const bool mbResetListAttrs;
 
-    void DoSetFmtColl(SwDoc & rDoc, SwPaM & rPaM);
+    void DoSetFormatColl(SwDoc & rDoc, SwPaM & rPaM);
 
 public:
-    SwUndoFmtColl( const SwPaM&, SwFmtColl*,
+    SwUndoFormatColl( const SwPaM&, SwFormatColl*,
                    const bool bReset,
                    const bool bResetListAttrs );
-    virtual ~SwUndoFmtColl();
+    virtual ~SwUndoFormatColl();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -182,30 +182,30 @@ public:
 
 };
 
-class SwUndoSetFlyFmt : public SwUndo, public SwClient
+class SwUndoSetFlyFormat : public SwUndo, public SwClient
 {
-    SwFrmFmt* pFrmFmt;                  // saved FlyFormat
-    SwFrmFmt* pOldFmt;
-    SwFrmFmt* pNewFmt;
+    SwFrameFormat* pFrameFormat;                  // saved FlyFormat
+    SwFrameFormat* pOldFormat;
+    SwFrameFormat* pNewFormat;
     SfxItemSet* pItemSet;               // the re-/ set attributes
     sal_uLong nOldNode, nNewNode;
-    sal_Int32 nOldCntnt, nNewCntnt;
+    sal_Int32 nOldContent, nNewContent;
     sal_uInt16 nOldAnchorTyp, nNewAnchorTyp;
     bool bAnchorChgd;
 
     void PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem );
     void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
-    void GetAnchor( SwFmtAnchor& rAnhor, sal_uLong nNode, sal_Int32 nCntnt );
+    void GetAnchor( SwFormatAnchor& rAnhor, sal_uLong nNode, sal_Int32 nContent );
 
 public:
-    SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt );
-    virtual ~SwUndoSetFlyFmt();
+    SwUndoSetFlyFormat( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFrameFormat );
+    virtual ~SwUndoSetFlyFormat();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
     virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
-    void DeRegisterFromFormat( SwFmt& );
+    void DeRegisterFromFormat( SwFormat& );
 };
 
 class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx
index 965bfe8d8897..7316cc9d7b85 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -25,7 +25,7 @@
 #include <tools/mempool.hxx>
 
 class SwRedlineSaveDatas;
-class SwTxtNode;
+class SwTextNode;
 
 namespace sfx2 {
     class MetadatableUndo;
@@ -34,7 +34,7 @@ namespace sfx2 {
 class SwUndoDelete
     : public SwUndo
     , private SwUndRng
-    , private SwUndoSaveCntnt
+    , private SwUndoSaveContent
 {
     SwNodeIndex* pMvStt;            // Position of Nodes in UndoNodes-Array
     OUString *pSttStr, *pEndStr;
@@ -54,20 +54,20 @@ class SwUndoDelete
     bool bGroup : 1;         // TRUE: is already Grouped; see CanGrouping()
     bool bBackSp : 1;        // TRUE: if Grouped and preceding content deleted
     bool bJoinNext: 1;       // TRUE: if range is selected forwards
-    bool bTblDelLastNd : 1;  // TRUE: TextNode following Table inserted/deleted
+    bool bTableDelLastNd : 1;  // TRUE: TextNode following Table inserted/deleted
     bool bDelFullPara : 1;   // TRUE: entire Nodes were deleted
     bool bResetPgDesc : 1;   // TRUE: reset PgDsc on following node
     bool bResetPgBrk : 1;    // TRUE: reset PgBreak on following node
-    bool bFromTableCopy : 1; // TRUE: called by SwUndoTblCpyTbl
+    bool bFromTableCopy : 1; // TRUE: called by SwUndoTableCpyTable
 
-    bool SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
-                    SwTxtNode* pSttTxtNd, SwTxtNode* pEndTxtNd );
+    bool SaveContent( const SwPosition* pStt, const SwPosition* pEnd,
+                    SwTextNode* pSttTextNd, SwTextNode* pEndTextNd );
 
 public:
     SwUndoDelete(
         SwPaM&,
         bool bFullPara = false,
-        bool bCalledByTblCpy = false );
+        bool bCalledByTableCpy = false );
     virtual ~SwUndoDelete();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -88,7 +88,7 @@ public:
 
     bool CanGrouping( SwDoc*, const SwPaM& );
 
-    void SetTblDelLastNd()      { bTblDelLastNd = true; }
+    void SetTableDelLastNd()      { bTableDelLastNd = true; }
 
     // for PageDesc/PageBreak Attributes of a table
     void SetPgBrkFlags( bool bPageBreak, bool bPageDesc )
@@ -96,7 +96,7 @@ public:
 
     void SetTableName(const OUString & rName);
 
-    // SwUndoTblCpyTbl needs this information:
+    // SwUndoTableCpyTable needs this information:
     bool IsDelFullPara() const { return bDelFullPara; }
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index fcf5c11128e2..f1b8fa59d6f8 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -29,7 +29,7 @@ class SdrMarkList;
 class SdrObject;
 class SdrObjGroup;
 class SdrUndoAction;
-class SwDrawFrmFmt;
+class SwDrawFrameFormat;
 
 // Undo for Draw Objects
 class SwSdrUndo : public SwUndo
@@ -52,7 +52,7 @@ class SwUndoDrawGroup : public SwUndo
 {
     SwUndoGroupObjImpl* pObjArr;
     sal_uInt16 nSize;
-    bool bDelFmt;
+    bool bDelFormat;
 
 public:
     SwUndoDrawGroup( sal_uInt16 nCnt );
@@ -62,13 +62,13 @@ public:
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
-    void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, SdrObject* );
-    void SetGroupFmt( SwDrawFrmFmt* );
+    void AddObj( sal_uInt16 nPos, SwDrawFrameFormat*, SdrObject* );
+    void SetGroupFormat( SwDrawFrameFormat* );
 };
 
 // Action "ungroup drawing object" is now splitted into three parts - see
 // method <SwDoc::UnGroupSelection(..)>:
-// - creation for <SwDrawFrmFmt> instances for the group members of the
+// - creation for <SwDrawFrameFormat> instances for the group members of the
 //   selected group objects
 // - intrinsic ungroup of the selected group objects
 // - creation of <SwDrawContact> instances for the former group members and
@@ -81,7 +81,7 @@ class SwUndoDrawUnGroup : public SwUndo
 {
     SwUndoGroupObjImpl* pObjArr;
     sal_uInt16 nSize;
-    bool bDelFmt;
+    bool bDelFormat;
 
 public:
     SwUndoDrawUnGroup( SdrObjGroup* );
@@ -91,13 +91,13 @@ public:
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
-    void AddObj( sal_uInt16 nPos, SwDrawFrmFmt* );
+    void AddObj( sal_uInt16 nPos, SwDrawFrameFormat* );
 };
 
 class SwUndoDrawUnGroupConnectToLayout : public SwUndo
 {
 private:
-    std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > > aDrawFmtsAndObjs;
+    std::vector< std::pair< SwDrawFrameFormat*, SdrObject* > > aDrawFormatsAndObjs;
 
 public:
     SwUndoDrawUnGroupConnectToLayout();
@@ -107,7 +107,7 @@ public:
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
-    void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
+    void AddFormatAndObj( SwDrawFrameFormat* pDrawFrameFormat,
                        SdrObject* pDrawObject );
 };
 
@@ -116,7 +116,7 @@ class SwUndoDrawDelete : public SwUndo
     SwUndoGroupObjImpl* pObjArr;
     SdrMarkList* pMarkLst;  // MarkList for all selected SdrObjects
     sal_uInt16 nSize;
-    bool bDelFmt;
+    bool bDelFormat;
 
 public:
     SwUndoDrawDelete( sal_uInt16 nCnt );
@@ -126,7 +126,7 @@ public:
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
-    void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, const SdrMark& );
+    void AddObj( sal_uInt16 nPos, SwDrawFrameFormat*, const SdrMark& );
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDODRAW_HXX
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 3c6eb85fb547..8ef9263f8d41 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -29,17 +29,17 @@
 class Graphic;
 class SwGrfNode;
 class SwUndoDelete;
-class SwUndoFmtAttr;
+class SwUndoFormatAttr;
 namespace sw { class DocumentContentOperationsManager; }
 
-class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
+class SwUndoInsert: public SwUndo, private SwUndoSaveContent
 {
     /// start of Content in UndoNodes for Redo
     ::boost::scoped_ptr<SwNodeIndex> m_pUndoNodeIndex;
-    OUString *pTxt, *pUndoTxt;
+    OUString *pText, *pUndoText;
     SwRedlineData* pRedlData;
     sal_uLong nNode;
-    sal_Int32 nCntnt, nLen;
+    sal_Int32 nContent, nLen;
     bool bIsWordDelim : 1;
     bool bIsAppend : 1;
     bool m_bWithRsid : 1;
@@ -53,10 +53,10 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
     SwDoc * pDoc;
 
     void Init(const SwNodeIndex & rNode);
-    OUString * GetTxtFromDoc() const;
+    OUString * GetTextFromDoc() const;
 
 public:
-    SwUndoInsert( const SwNodeIndex& rNode, sal_Int32 nCntnt, sal_Int32 nLen,
+    SwUndoInsert( const SwNodeIndex& rNode, sal_Int32 nContent, sal_Int32 nLen,
                   const SwInsertFlags nInsertFlags,
                   bool bWDelim = true );
     SwUndoInsert( const SwNodeIndex& rNode );
@@ -152,12 +152,12 @@ class SwUndoInsertLabel : public SwUndo
 {
     union {
         struct {
-            // for NoTxtFrms
-            SwUndoInsLayFmt* pUndoFly;
-            SwUndoFmtAttr* pUndoAttr;
+            // for NoTextFrms
+            SwUndoInsLayFormat* pUndoFly;
+            SwUndoFormatAttr* pUndoAttr;
         } OBJECT;
         struct {
-            // for tables or TxtFrms
+            // for tables or TextFrms
             SwUndoDelete* pUndoInsNd;
             sal_uLong nNode;
         } NODE;
@@ -169,7 +169,7 @@ class SwUndoInsertLabel : public SwUndo
     OUString sNumberSeparator;
     OUString sCharacterStyle;
     // #i26791# - re-store of drawing object position no longer needed
-    sal_uInt16 nFldId;
+    sal_uInt16 nFieldId;
     SwLabelType eType;
     sal_uInt8 nLayerId;              // for character objects
     bool bBefore        :1;
@@ -208,7 +208,7 @@ public:
         { if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; }
 
     void SetUndoKeep()  { bUndoKeep = true; }
-    void SetFlys( SwFrmFmt& rOldFly, SfxItemSet& rChgSet, SwFrmFmt& rNewFly );
+    void SetFlys( SwFrameFormat& rOldFly, SfxItemSet& rChgSet, SwFrameFormat& rNewFly );
     void SetDrawObj( sal_uInt8 nLayerId );
 };
 
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index ee711373eaf2..7e3164a76768 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -78,7 +78,7 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
 
-    void AddNode( const SwTxtNode& rNd, bool bResetLRSpace );
+    void AddNode( const SwTextNode& rNd, bool bResetLRSpace );
     SwHistory* GetHistory() { return pHistory; }
 };
 
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index 473224d4ca57..dabc8e1f452f 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -25,18 +25,18 @@
 #include <undobj.hxx>
 
 class SwRedlineSaveDatas;
-class SwTxtNode;
+class SwTextNode;
 
 namespace utl {
     class TransliterationWrapper;
 }
 
-class SwUndoOverwrite: public SwUndo, private SwUndoSaveCntnt
+class SwUndoOverwrite: public SwUndo, private SwUndoSaveContent
 {
     OUString aDelStr, aInsStr;
     SwRedlineSaveDatas* pRedlSaveData;
     sal_uLong nSttNode;
-    sal_Int32 nSttCntnt;
+    sal_Int32 nSttContent;
     bool bInsChar : 1;  // no Overwrite, but Insert
     bool bGroup : 1;    // TRUE: is already grouped; evaluated in CanGrouping()
 
@@ -83,7 +83,7 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
 
-    void AddChanges( SwTxtNode& rTNd, sal_Int32 nStart, sal_Int32 nLen,
+    void AddChanges( SwTextNode& rTNd, sal_Int32 nStart, sal_Int32 nLen,
                      ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets );
     bool HasData() const { return aChanges.size() > 0; }
 };
diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx
index b67e066065d3..72684ff50420 100644
--- a/sw/source/core/inc/UndoRedline.hxx
+++ b/sw/source/core/inc/UndoRedline.hxx
@@ -64,16 +64,16 @@ public:
 
     bool CanGrouping( const SwUndoRedlineDelete& rPrev );
 
-    // SwUndoTblCpyTbl needs this information:
+    // SwUndoTableCpyTable needs this information:
     long NodeDiff() const { return nSttNode - nEndNode; }
-    sal_Int32 ContentStart() const { return nSttCntnt; }
+    sal_Int32 ContentStart() const { return nSttContent; }
 };
 
 class SwUndoRedlineSort : public SwUndoRedline
 {
     SwSortOptions* pOpt;
     sal_uLong nSaveEndNode, nOffset;
-    sal_Int32 nSaveEndCntnt;
+    sal_Int32 nSaveEndContent;
 
     virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE;
     virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE;
diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx
index 8ba75624f5d7..16f1f1131c76 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -25,9 +25,9 @@
 #include <swdllapi.h>
 
 class SfxItemSet;
-class SwTxtNode;
+class SwTextNode;
 class SwSectionData;
-class SwSectionFmt;
+class SwSectionFormat;
 class SwTOXBase;
 
 class SwUndoInsSection : public SwUndo, private SwUndRng
@@ -42,7 +42,7 @@ private:
     sal_uLong m_nSectionNodePos;
     bool m_bSplitAtStart : 1;
     bool m_bSplitAtEnd : 1;
-    bool m_bUpdateFtn : 1;
+    bool m_bUpdateFootnote : 1;
 
     void Join( SwDoc& rDoc, sal_uLong nNode );
 
@@ -57,13 +57,13 @@ public:
     virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
 
     void SetSectNdPos(sal_uLong const nPos)     { m_nSectionNodePos = nPos; }
-    void SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart);
-    void SetUpdtFtnFlag(bool const bFlag)   { m_bUpdateFtn = bFlag; }
+    void SaveSplitNode(SwTextNode *const pTextNd, bool const bAtStart);
+    void SetUpdateFootnoteFlag(bool const bFlag)   { m_bUpdateFootnote = bFlag; }
 };
 
-SwUndo * MakeUndoDelSection(SwSectionFmt const&);
+SwUndo * MakeUndoDelSection(SwSectionFormat const&);
 
-SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const);
+SwUndo * MakeUndoUpdateSection(SwSectionFormat const&, bool const);
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOSECTION_HXX
 
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index f1be7738bbe6..56bb95d69fcf 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -26,7 +26,7 @@
 
 struct SwSortOptions;
 class SwTableNode;
-class SwUndoAttrTbl;
+class SwUndoAttrTable;
 
 struct SwSortUndoElement
 {
@@ -61,9 +61,9 @@ class SwUndoSort : public SwUndo, private SwUndRng
 {
     SwSortOptions*  pSortOpt;
     SwSortList      aSortList;
-    SwUndoAttrTbl*  pUndoTblAttr;
+    SwUndoAttrTable*  pUndoTableAttr;
     SwRedlineData*  pRedlData;
-    sal_uLong           nTblNd;
+    sal_uLong           nTableNd;
 
 public:
     SwUndoSort( const SwPaM&, const SwSortOptions& );
diff --git a/sw/source/core/inc/UndoSplitMove.hxx b/sw/source/core/inc/UndoSplitMove.hxx
index 9030f70838b5..dbe69d0fef5d 100644
--- a/sw/source/core/inc/UndoSplitMove.hxx
+++ b/sw/source/core/inc/UndoSplitMove.hxx
@@ -27,13 +27,13 @@ class SwUndoSplitNode: public SwUndo
     SwHistory* pHistory;
     SwRedlineData* pRedlData;
     sal_uLong nNode;
-    sal_Int32 nCntnt;
-    bool bTblFlag : 1;
-    bool bChkTblStt : 1;
+    sal_Int32 nContent;
+    bool bTableFlag : 1;
+    bool bChkTableStt : 1;
     sal_uInt32 nParRsid;
 
 public:
-    SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, bool bChkTbl );
+    SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, bool bChkTable );
 
     virtual ~SwUndoSplitNode();
 
@@ -41,18 +41,18 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
 
-    void SetTblFlag()       { bTblFlag = true; }
+    void SetTableFlag()       { bTableFlag = true; }
 };
 
-class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt
+class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveContent
 {
     // nDest.. - destination range of move (after move!)
     // nIns..  - source Position of move (after move!)
     // nMv..   - destination position of move (before move!); for REDO
     sal_uLong nDestSttNode, nDestEndNode, nInsPosNode, nMvDestNode;
-    sal_Int32 nDestSttCntnt, nDestEndCntnt, nInsPosCntnt, nMvDestCntnt;
+    sal_Int32 nDestSttContent, nDestEndContent, nInsPosContent, nMvDestContent;
 
-    sal_uInt16 nFtnStt; // StartPos of Footnotes in History
+    sal_uInt16 nFootnoteStt; // StartPos of Footnotes in History
 
     bool bJoinNext : 1,
          bJoinPrev : 1,
@@ -60,7 +60,7 @@ class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt
 
     bool bMoveRedlines; // use DOC_MOVEREDLINES when calling SwDoc::Move
 
-    void DelFtn( const SwPaM& );
+    void DelFootnote( const SwPaM& );
 
 public:
     SwUndoMove( const SwPaM&, const SwPosition& );
@@ -77,7 +77,7 @@ public:
     bool IsMoveRange() const        { return bMoveRange; }
     sal_uLong GetEndNode() const        { return nEndNode; }
     sal_uLong GetDestSttNode() const    { return nDestSttNode; }
-    sal_Int32 GetDestSttCntnt() const  { return nDestSttCntnt; }
+    sal_Int32 GetDestSttContent() const  { return nDestSttContent; }
 
     void SetMoveRedlines( bool b )       { bMoveRedlines = b; }
 };
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 31a3502457a3..8a75054c3c4e 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -37,33 +37,33 @@ class SwUndoSaveSections;
 class SwUndoMoves;
 class SwUndoDelete;
 class SwSelBoxes;
-class SwTblToTxtSaves;
+class SwTableToTextSaves;
 class SwTable;
 class SwTableBox;
 class SwStartNode;
 class SwTableNode;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
 class SwTableSortBoxes;
 
-class SwUndoInsTbl : public SwUndo
+class SwUndoInsTable : public SwUndo
 {
-    OUString sTblNm;
-    SwInsertTableOptions aInsTblOpts;
-    SwDDEFieldType* pDDEFldType;
+    OUString sTableNm;
+    SwInsertTableOptions aInsTableOpts;
+    SwDDEFieldType* pDDEFieldType;
     std::vector<sal_uInt16> *pColWidth;
     SwRedlineData*  pRedlData;
-    SwTableAutoFmt* pAutoFmt;
+    SwTableAutoFormat* pAutoFormat;
     sal_uLong nSttNode;
     sal_uInt16 nRows, nCols;
     sal_uInt16 nAdjust;
 
 public:
-    SwUndoInsTbl( const SwPosition&, sal_uInt16 nCols, sal_uInt16 nRows,
-                    sal_uInt16 eAdjust, const SwInsertTableOptions& rInsTblOpts,
-                    const SwTableAutoFmt* pTAFmt, const std::vector<sal_uInt16> *pColArr,
+    SwUndoInsTable( const SwPosition&, sal_uInt16 nCols, sal_uInt16 nRows,
+                    sal_uInt16 eAdjust, const SwInsertTableOptions& rInsTableOpts,
+                    const SwTableAutoFormat* pTAFormat, const std::vector<sal_uInt16> *pColArr,
                   const OUString & rName);
 
-    virtual ~SwUndoInsTbl();
+    virtual ~SwUndoInsTable();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -72,23 +72,23 @@ public:
     virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
 };
 
-class SwUndoTxtToTbl : public SwUndo, public SwUndRng
+class SwUndoTextToTable : public SwUndo, public SwUndRng
 {
-    OUString sTblNm;
-    SwInsertTableOptions aInsTblOpts;
+    OUString sTableNm;
+    SwInsertTableOptions aInsTableOpts;
     std::vector<sal_uLong>* pDelBoxes;
-    SwTableAutoFmt* pAutoFmt;
+    SwTableAutoFormat* pAutoFormat;
     SwHistory* pHistory;
     sal_Unicode cTrenner;
     sal_uInt16 nAdjust;
     bool bSplitEnd : 1;
 
 public:
-    SwUndoTxtToTbl( const SwPaM&, const SwInsertTableOptions&, sal_Unicode,
+    SwUndoTextToTable( const SwPaM&, const SwInsertTableOptions&, sal_Unicode,
                     sal_uInt16,
-                    const SwTableAutoFmt* pAFmt );
+                    const SwTableAutoFormat* pAFormat );
 
-    virtual ~SwUndoTxtToTbl();
+    virtual ~SwUndoTextToTable();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -98,22 +98,22 @@ public:
     void AddFillBox( const SwTableBox& rBox );
 };
 
-class SwUndoTblToTxt : public SwUndo
+class SwUndoTableToText : public SwUndo
 {
-    OUString sTblNm;
-    SwDDEFieldType* pDDEFldType;
-    _SaveTable* pTblSave;
-    SwTblToTxtSaves* pBoxSaves;
+    OUString sTableNm;
+    SwDDEFieldType* pDDEFieldType;
+    _SaveTable* pTableSave;
+    SwTableToTextSaves* pBoxSaves;
     SwHistory* pHistory;
     sal_uLong nSttNd, nEndNd;
     sal_Unicode cTrenner;
     sal_uInt16 nHdlnRpt;
-    bool bCheckNumFmt : 1;
+    bool bCheckNumFormat : 1;
 
 public:
-    SwUndoTblToTxt( const SwTable& rTbl, sal_Unicode cCh );
+    SwUndoTableToText( const SwTable& rTable, sal_Unicode cCh );
 
-    virtual ~SwUndoTblToTxt();
+    virtual ~SwUndoTableToText();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -121,50 +121,50 @@ public:
 
     void SetRange( const SwNodeRange& );
     void AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong nEndIdx,
-                    sal_Int32 nCntntIdx = SAL_MAX_INT32);
+                    sal_Int32 nContentIdx = SAL_MAX_INT32);
 };
 
-class SwUndoAttrTbl : public SwUndo
+class SwUndoAttrTable : public SwUndo
 {
     sal_uLong nSttNode;
-    _SaveTable* pSaveTbl;
+    _SaveTable* pSaveTable;
     bool bClearTabCol : 1;
 
 public:
-    SwUndoAttrTbl( const SwTableNode& rTblNd, bool bClearTabCols = false );
+    SwUndoAttrTable( const SwTableNode& rTableNd, bool bClearTabCols = false );
 
-    virtual ~SwUndoAttrTbl();
+    virtual ~SwUndoAttrTable();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 };
 
-class SwUndoTblNumFmt;
+class SwUndoTableNumFormat;
 
-class SwUndoTblAutoFmt : public SwUndo
+class SwUndoTableAutoFormat : public SwUndo
 {
     sal_uLong nSttNode;
-    _SaveTable* pSaveTbl;
-    std::vector< std::shared_ptr<SwUndoTblNumFmt> > m_Undos;
-    bool bSaveCntntAttr;
+    _SaveTable* pSaveTable;
+    std::vector< std::shared_ptr<SwUndoTableNumFormat> > m_Undos;
+    bool bSaveContentAttr;
     sal_uInt16 m_nRepeatHeading;
 
     void UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext);
 
 public:
-    SwUndoTblAutoFmt( const SwTableNode& rTblNd, const SwTableAutoFmt& );
+    SwUndoTableAutoFormat( const SwTableNode& rTableNd, const SwTableAutoFormat& );
 
-    virtual ~SwUndoTblAutoFmt();
+    virtual ~SwUndoTableAutoFormat();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
-    void SaveBoxCntnt( const SwTableBox& rBox );
+    void SaveBoxContent( const SwTableBox& rBox );
 };
 
-class SwUndoTblNdsChg : public SwUndo, private boost::noncopyable
+class SwUndoTableNdsChg : public SwUndo, private boost::noncopyable
 {
-    _SaveTable* pSaveTbl;
+    _SaveTable* pSaveTable;
     std::set<sal_uLong> m_Boxes;
     struct _BoxMove
     {
@@ -182,23 +182,23 @@ class SwUndoTblNdsChg : public SwUndo, private boost::noncopyable
     bool bSameHeight;                   // only used for SplitRow
 
 public:
-    SwUndoTblNdsChg( SwUndoId UndoId,
+    SwUndoTableNdsChg( SwUndoId UndoId,
                     const SwSelBoxes& rBoxes,
-                    const SwTableNode& rTblNd,
+                    const SwTableNode& rTableNd,
                     long nMn, long nMx,
                     sal_uInt16 nCnt, bool bFlg, bool bSameHeight );
 
     // for SetColWidth
-    SwUndoTblNdsChg( SwUndoId UndoId, const SwSelBoxes& rBoxes,
-                    const SwTableNode& rTblNd );
+    SwUndoTableNdsChg( SwUndoId UndoId, const SwSelBoxes& rBoxes,
+                    const SwTableNode& rTableNd );
 
-    virtual ~SwUndoTblNdsChg();
+    virtual ~SwUndoTableNdsChg();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
-    void SaveNewBoxes( const SwTableNode& rTblNd, const SwTableSortBoxes& rOld );
-    void SaveNewBoxes( const SwTableNode& rTblNd, const SwTableSortBoxes& rOld,
+    void SaveNewBoxes( const SwTableNode& rTableNd, const SwTableSortBoxes& rOld );
+    void SaveNewBoxes( const SwTableNode& rTableNd, const SwTableSortBoxes& rOld,
                        const SwSelBoxes& rBoxes, const std::vector<sal_uLong> &rNodeCnts );
     void SaveSection( SwStartNode* pSttNd );
     void ReNewBoxes( const SwSelBoxes& rBoxes );
@@ -214,24 +214,24 @@ public:
     }
 };
 
-class SwUndoTblMerge : public SwUndo, private SwUndRng
+class SwUndoTableMerge : public SwUndo, private SwUndRng
 {
-    sal_uLong nTblNode;
-    _SaveTable* pSaveTbl;
+    sal_uLong nTableNode;
+    _SaveTable* pSaveTable;
     std::set<sal_uLong> m_Boxes;
     std::vector<sal_uLong> aNewSttNds;
     SwUndoMoves* pMoves;
     SwHistory* pHistory;
 
 public:
-    SwUndoTblMerge( const SwPaM& rTblSel );
+    SwUndoTableMerge( const SwPaM& rTableSel );
 
-    virtual ~SwUndoTblMerge();
+    virtual ~SwUndoTableMerge();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
-    void MoveBoxCntnt( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos );
+    void MoveBoxContent( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos );
 
     void SetSelBoxes( const SwSelBoxes& rBoxes );
 
@@ -241,40 +241,40 @@ public:
     void SaveCollection( const SwTableBox& rBox );
 };
 
-class SwUndoTblNumFmt : public SwUndo
+class SwUndoTableNumFormat : public SwUndo
 {
     SfxItemSet *pBoxSet;
     SwHistory* pHistory;
-    OUString aStr, aNewFml;
+    OUString aStr, aNewFormula;
 
-    sal_uLong nFmtIdx, nNewFmtIdx;
+    sal_uLong nFormatIdx, nNewFormatIdx;
     double fNum, fNewNum;
     sal_uLong nNode;
     sal_uLong nNdPos;
 
-    bool bNewFmt : 1;
-    bool bNewFml : 1;
+    bool bNewFormat : 1;
+    bool bNewFormula : 1;
     bool bNewValue : 1;
 
 public:
-    SwUndoTblNumFmt( const SwTableBox& rBox, const SfxItemSet* pNewSet = 0 );
+    SwUndoTableNumFormat( const SwTableBox& rBox, const SfxItemSet* pNewSet = 0 );
 
-    virtual ~SwUndoTblNumFmt();
+    virtual ~SwUndoTableNumFormat();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
-    void SetNumFmt( sal_uLong nNewNumFmtIdx, const double& rNewNumber )
-            { nFmtIdx = nNewNumFmtIdx; fNum = rNewNumber; }
+    void SetNumFormat( sal_uLong nNewNumFormatIdx, const double& rNewNumber )
+            { nFormatIdx = nNewNumFormatIdx; fNum = rNewNumber; }
     void SetBox( const SwTableBox& rBox );
 };
 
-class _UndoTblCpyTbl_Entries;
+class _UndoTableCpyTable_Entries;
 
-class SwUndoTblCpyTbl : public SwUndo
+class SwUndoTableCpyTable : public SwUndo
 {
-    _UndoTblCpyTbl_Entries* pArr;
-    SwUndoTblNdsChg* pInsRowUndo;
+    _UndoTableCpyTable_Entries* pArr;
+    SwUndoTableNdsChg* pInsRowUndo;
 
     //b6341295: When redlining is active, PrepareRedline has to create the
     //redlining attributes for the new and the old table cell content
@@ -282,75 +282,75 @@ class SwUndoTblCpyTbl : public SwUndo
                 const SwPosition& rPos, bool& rJoin, bool bRedo );
 
 public:
-    SwUndoTblCpyTbl();
+    SwUndoTableCpyTable();
 
-    virtual ~SwUndoTblCpyTbl();
+    virtual ~SwUndoTableCpyTable();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
-    void AddBoxBefore( const SwTableBox& rBox, bool bDelCntnt );
+    void AddBoxBefore( const SwTableBox& rBox, bool bDelContent );
     void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx,
-                bool bDelCntnt );
+                bool bDelContent );
 
     bool IsEmpty() const;
-    bool InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes, sal_uInt16 nCnt );
+    bool InsertRow( SwTable& rTable, const SwSelBoxes& rBoxes, sal_uInt16 nCnt );
 };
 
-class SwUndoCpyTbl : public SwUndo
+class SwUndoCpyTable : public SwUndo
 {
     SwUndoDelete* pDel;
-    sal_uLong nTblNode;
+    sal_uLong nTableNode;
 
 public:
-    SwUndoCpyTbl();
+    SwUndoCpyTable();
 
-    virtual ~SwUndoCpyTbl();
+    virtual ~SwUndoCpyTable();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
-    void SetTableSttIdx( sal_uLong nIdx )           { nTblNode = nIdx; }
+    void SetTableSttIdx( sal_uLong nIdx )           { nTableNode = nIdx; }
 };
 
-class SwUndoSplitTbl : public SwUndo
+class SwUndoSplitTable : public SwUndo
 {
-    sal_uLong nTblNode, nOffset;
+    sal_uLong nTableNode, nOffset;
     SwSaveRowSpan* mpSaveRowSpan; // stores row span values at the splitting row
-    _SaveTable* pSavTbl;
+    _SaveTable* pSavTable;
     SwHistory* pHistory;
-    sal_uInt16 nMode, nFmlEnd;
+    sal_uInt16 nMode, nFormulaEnd;
     bool bCalcNewSize;
 
 public:
-    SwUndoSplitTbl( const SwTableNode& rTblNd, SwSaveRowSpan* pRowSp,
+    SwUndoSplitTable( const SwTableNode& rTableNd, SwSaveRowSpan* pRowSp,
             sal_uInt16 nMode, bool bCalcNewSize );
 
-    virtual ~SwUndoSplitTbl();
+    virtual ~SwUndoSplitTable();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
 
-    void SetTblNodeOffset( sal_uLong nIdx )     { nOffset = nIdx - nTblNode; }
+    void SetTableNodeOffset( sal_uLong nIdx )     { nOffset = nIdx - nTableNode; }
     SwHistory* GetHistory()                 { return pHistory; }
     void SaveFormula( SwHistory& rHistory );
 };
 
-class SwUndoMergeTbl : public SwUndo
+class SwUndoMergeTable : public SwUndo
 {
     OUString aName;
-    sal_uLong nTblNode;
-    _SaveTable* pSavTbl, *pSavHdl;
+    sal_uLong nTableNode;
+    _SaveTable* pSavTable, *pSavHdl;
     SwHistory* pHistory;
     sal_uInt16 nMode;
     bool bWithPrev;
 
 public:
-    SwUndoMergeTbl( const SwTableNode& rTblNd, const SwTableNode& rDelTblNd,
+    SwUndoMergeTable( const SwTableNode& rTableNd, const SwTableNode& rDelTableNd,
                     bool bWithPrev, sal_uInt16 nMode );
 
-    virtual ~SwUndoMergeTbl();
+    virtual ~SwUndoMergeTable();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -359,14 +359,14 @@ public:
     void SaveFormula( SwHistory& rHistory );
 };
 
-class SwUndoTblHeadline : public SwUndo
+class SwUndoTableHeadline : public SwUndo
 {
-    sal_uLong nTblNd;
+    sal_uLong nTableNd;
     sal_uInt16 nOldHeadline;
     sal_uInt16 nNewHeadline;
 
 public:
-    SwUndoTblHeadline( const SwTable&, sal_uInt16 nOldHdl,  sal_uInt16 nNewHdl );
+    SwUndoTableHeadline( const SwTable&, sal_uInt16 nOldHdl,  sal_uInt16 nNewHdl );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index 47870f03196b..1f6001822e7f 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -58,9 +58,9 @@ public:
     virtual ~SwAutoCorrDoc();
 
     virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE;
-    virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE;
-    virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE;
-    virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ) SAL_OVERRIDE;
+    virtual bool Insert( sal_Int32 nPos, const OUString& rText ) SAL_OVERRIDE;
+    virtual bool Replace( sal_Int32 nPos, const OUString& rText ) SAL_OVERRIDE;
+    virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rText ) SAL_OVERRIDE;
 
     virtual bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId,
                             SfxPoolItem& ) SAL_OVERRIDE;
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index d10b3bca9125..ec9617aa769a 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -27,11 +27,11 @@ class SdrObject;
 class SwFrm;
 class SwFlyFrm;
 class SwContact;
-class SwFrmFmt;
+class SwFrameFormat;
 class SwRect;
 class SvxLRSpaceItem;
 class SvxULSpaceItem;
-class SwFmtHoriOrient;
+class SwFormatHoriOrient;
 class SwAnchoredObject;
 
 namespace objectpositioning
@@ -53,7 +53,7 @@ namespace objectpositioning
         // contact object
         SwContact* mpContact;
         // frame format
-        const SwFrmFmt* mpFrmFmt;
+        const SwFrameFormat* mpFrameFormat;
         // #i62875#
         bool mbFollowTextFlow;
         // #i62875#
@@ -63,7 +63,7 @@ namespace objectpositioning
         /** determine information about object
 
             member <mbIsObjFly>, <mpAnchoredObj>, <mpAnchorFrm>, <mpContact>
-            and <mpFrmFmt> are set
+            and <mpFrameFormat> are set
         */
         void _GetInfoAboutObj();
 
@@ -104,9 +104,9 @@ namespace objectpositioning
         {
             return *mpContact;
         }
-        inline const SwFrmFmt& GetFrmFmt() const
+        inline const SwFrameFormat& GetFrameFormat() const
         {
-            return *mpFrmFmt;
+            return *mpFrameFormat;
         }
         // #i62875#
         inline bool DoesObjFollowsTextFlow() const
@@ -240,7 +240,7 @@ namespace objectpositioning
         */
         SwTwips _CalcRelPosX( const SwFrm& _rHoriOrientFrm,
                               const SwEnvironmentOfAnchoredObject& _rEnvOfObj,
-                              const SwFmtHoriOrient& _rHoriOrient,
+                              const SwFormatHoriOrient& _rHoriOrient,
                               const SvxLRSpaceItem& _rLRSpacing,
                               const SvxULSpaceItem& _rULSpacing,
                               const bool _bObjWrapThrough,
diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx
index 948ced6b19a8..8dc5508ba55d 100644
--- a/sw/source/core/inc/annotationmark.hxx
+++ b/sw/source/core/inc/annotationmark.hxx
@@ -23,7 +23,7 @@
 #include <bookmrk.hxx>
 #include <rtl/ustring.hxx>
 
-class SwFmtFld;
+class SwFormatField;
 
 namespace sw { namespace mark
 {
@@ -38,7 +38,7 @@ namespace sw { namespace mark
 
         virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE;
 
-        const SwFmtFld* GetAnnotationFmtFld() const;
+        const SwFormatField* GetAnnotationFormatField() const;
     };
 }}
 #endif
diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx
index 0e6abccaf553..fee7518d58cb 100644
--- a/sw/source/core/inc/ascharanchoredobjectposition.hxx
+++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx
@@ -25,8 +25,8 @@
 #include <swtypes.hxx>
 #include <swrect.hxx>
 
-class SwTxtFrm;
-class SwFmtVertOrient;
+class SwTextFrm;
+class SwFormatVertOrient;
 
 namespace objectpositioning
 {
@@ -70,7 +70,7 @@ namespace objectpositioning
         sal_uInt8   mnLineAlignment;
 
         // method to cast <SwAnchoredObjectPosition::GetAnchorFrm()>
-        const SwTxtFrm& GetAnchorTxtFrm() const;
+        const SwTextFrm& GetAnchorTextFrm() const;
 
         /** determine the relative position to base line for object position
 
@@ -84,7 +84,7 @@ namespace objectpositioning
             @return relative position to the base line
         */
         SwTwips _GetRelPosToBase( const SwTwips          _nObjBoundHeight,
-                                  const SwFmtVertOrient& _rVert );
+                                  const SwFormatVertOrient& _rVert );
 
     public:
         /** construtor; provided object to be positioned and needed data
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index 95316316ba1f..2c3a74e05099 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -22,7 +22,7 @@
 
 class SwLinePortion;
 class SwRootFrm;
-class SwTxtFrm;
+class SwTextFrm;
 
 #include <vcl/timer.hxx>
 #include <tools/gen.hxx>
@@ -76,7 +76,7 @@ public:
     DECL_LINK_TYPED( Blinker, Timer *, void );
 
     void Insert( const Point& rPoint, const SwLinePortion* pPor,
-                 const SwTxtFrm *pTxtFrm, sal_uInt16 nDir );
+                 const SwTextFrm *pTextFrm, sal_uInt16 nDir );
     void Replace( const SwLinePortion* pOld, const SwLinePortion* pNew );
     void Delete( const SwLinePortion* pPor );
     void FrmDelete( const SwRootFrm* pRoot );
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index da73d4f1dce1..5e3e0bee51e4 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -30,7 +30,7 @@ protected:
     virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
 
 public:
-    SwBodyFrm( SwFrmFmt*, SwFrm* );
+    SwBodyFrm( SwFrameFormat*, SwFrm* );
 
     virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
 
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index ed32b8b13ac9..94a597a233ae 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -26,15 +26,15 @@
 #include "node.hxx"
 
 class SwLayoutFrm;
-class SwCntntNode;
+class SwContentNode;
 class SwBorderAttrs;
 class SwAttrSetChg;
-class SwTxtFrm;
+class SwTextFrm;
 
 // implemented in cntfrm.cxx, used in cntfrm.cxx and crsrsh.cxx
-extern bool GetFrmInPage( const SwCntntFrm*, SwWhichPage, SwPosPage, SwPaM* );
+extern bool GetFrmInPage( const SwContentFrm*, SwWhichPage, SwPosPage, SwPaM* );
 
-class SwCntntFrm: public SwFrm, public SwFlowFrm
+class SwContentFrm: public SwFrm, public SwFlowFrm
 {
     friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt );    // calls MakePrtArea
 
@@ -52,7 +52,7 @@ class SwCntntFrm: public SwFrm, public SwFlowFrm
 
     virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ) SAL_OVERRIDE;
 
-    const SwCntntFrm* ImplGetNextCntntFrm( bool bFwd ) const;
+    const SwContentFrm* ImplGetNextContentFrm( bool bFwd ) const;
 
 protected:
     bool MakePrtArea( const SwBorderAttrs & );
@@ -61,10 +61,10 @@ protected:
     virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
     virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
 
-    SwCntntFrm( SwCntntNode * const, SwFrm* );
+    SwContentFrm( SwContentNode * const, SwFrm* );
 
     virtual void DestroyImpl() SAL_OVERRIDE;
-    virtual ~SwCntntFrm();
+    virtual ~SwContentFrm();
 
 public:
     TYPEINFO_OVERRIDE(); // already in base class
@@ -72,15 +72,15 @@ public:
     virtual void Cut() SAL_OVERRIDE;
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
 
-    inline const SwCntntNode *GetNode() const;
-    inline       SwCntntNode *GetNode();
+    inline const SwContentNode *GetNode() const;
+    inline       SwContentNode *GetNode();
     sal_uInt16 GetSectionLevel();
 
-    inline const SwCntntFrm *GetFollow() const;
-    inline       SwCntntFrm *GetFollow();
-    inline const SwCntntFrm *GetPrecede() const;
-    inline       SwCntntFrm *GetPrecede();
-    SwTxtFrm* FindMaster() const;
+    inline const SwContentFrm *GetFollow() const;
+    inline       SwContentFrm *GetFollow();
+    inline const SwContentFrm *GetPrecede() const;
+    inline       SwContentFrm *GetPrecede();
+    SwTextFrm* FindMaster() const;
 
     // layout dependent cursor travelling
     virtual bool LeftMargin( SwPaM * ) const;
@@ -101,55 +101,55 @@ public:
     // bTst indicates that we are currently doing a test formatting
     virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst );
 
-    bool MoveFtnCntFwd( bool, SwFtnBossFrm* ); // called by MoveFwd if content
+    bool MoveFootnoteCntFwd( bool, SwFootnoteBossFrm* ); // called by MoveFwd if content
 
-    inline  SwCntntFrm* GetNextCntntFrm() const;
-    inline  SwCntntFrm* GetPrevCntntFrm() const;
+    inline  SwContentFrm* GetNextContentFrm() const;
+    inline  SwContentFrm* GetPrevContentFrm() const;
     static bool CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, long nBottom, bool bSkipRowSpanCells );
-    void RegisterToNode( SwCntntNode& );
+    void RegisterToNode( SwContentNode& );
 };
 
-inline SwCntntFrm* SwCntntFrm::GetNextCntntFrm() const
+inline SwContentFrm* SwContentFrm::GetNextContentFrm() const
 {
-    if ( GetNext() && GetNext()->IsCntntFrm() )
-        return const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(GetNext()));
+    if ( GetNext() && GetNext()->IsContentFrm() )
+        return const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(GetNext()));
     else
-        return const_cast<SwCntntFrm*>(ImplGetNextCntntFrm( true ));
+        return const_cast<SwContentFrm*>(ImplGetNextContentFrm( true ));
 }
 
-inline SwCntntFrm* SwCntntFrm::GetPrevCntntFrm() const
+inline SwContentFrm* SwContentFrm::GetPrevContentFrm() const
 {
-    if ( GetPrev() && GetPrev()->IsCntntFrm() )
-        return const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(GetPrev()));
+    if ( GetPrev() && GetPrev()->IsContentFrm() )
+        return const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(GetPrev()));
     else
-        return const_cast<SwCntntFrm*>(ImplGetNextCntntFrm( false ));
+        return const_cast<SwContentFrm*>(ImplGetNextContentFrm( false ));
 }
 
-inline SwCntntNode *SwCntntFrm::GetNode()
+inline SwContentNode *SwContentFrm::GetNode()
 {
-    return static_cast< SwCntntNode* >( GetDep() );
+    return static_cast< SwContentNode* >( GetDep() );
 }
-inline const SwCntntNode *SwCntntFrm::GetNode() const
+inline const SwContentNode *SwContentFrm::GetNode() const
 {
-    return static_cast< const SwCntntNode* >( GetDep() );
+    return static_cast< const SwContentNode* >( GetDep() );
 }
 
-inline const SwCntntFrm *SwCntntFrm::GetFollow() const
+inline const SwContentFrm *SwContentFrm::GetFollow() const
 {
-    return static_cast<const SwCntntFrm*>(SwFlowFrm::GetFollow());
+    return static_cast<const SwContentFrm*>(SwFlowFrm::GetFollow());
 }
-inline SwCntntFrm *SwCntntFrm::GetFollow()
+inline SwContentFrm *SwContentFrm::GetFollow()
 {
-    return static_cast<SwCntntFrm*>(SwFlowFrm::GetFollow());
+    return static_cast<SwContentFrm*>(SwFlowFrm::GetFollow());
 }
 
-inline const SwCntntFrm *SwCntntFrm::GetPrecede() const
+inline const SwContentFrm *SwContentFrm::GetPrecede() const
 {
-    return static_cast<const SwCntntFrm*>(SwFlowFrm::GetPrecede());
+    return static_cast<const SwContentFrm*>(SwFlowFrm::GetPrecede());
 }
-inline SwCntntFrm *SwCntntFrm::GetPrecede()
+inline SwContentFrm *SwContentFrm::GetPrecede()
 {
-    return static_cast<SwCntntFrm*>(SwFlowFrm::GetPrecede());
+    return static_cast<SwContentFrm*>(SwFlowFrm::GetPrecede());
 }
 
 #endif
diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx
index 33036ba16a9e..1a22e394e16c 100644
--- a/sw/source/core/inc/colfrm.hxx
+++ b/sw/source/core/inc/colfrm.hxx
@@ -23,14 +23,14 @@
 #include <tools/mempool.hxx>
 #include "ftnboss.hxx"
 
-class SwColumnFrm: public SwFtnBossFrm
+class SwColumnFrm: public SwFootnoteBossFrm
 {
 private:
     virtual void DestroyImpl() SAL_OVERRIDE;
     virtual ~SwColumnFrm();
 
 public:
-    SwColumnFrm( SwFrmFmt*, SwFrm* );
+    SwColumnFrm( SwFrameFormat*, SwFrm* );
 
     virtual void PaintBreak() const SAL_OVERRIDE;
     virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index b1695955eb39..5a2c0d635ec0 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -24,7 +24,7 @@
 #include <svx/svdovirt.hxx>
 
 class SwFlyFrm;
-class SwFrmFmt;
+class SwFrameFormat;
 class SdrObjMacroHitRec;
 
 const sal_uInt32 SWGInventor =  sal_uInt32('S')*0x00000001 +
@@ -108,8 +108,8 @@ public:
     virtual       void       Crop(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
     virtual       void       addCropHandles(SdrHdlList& rTarget) const SAL_OVERRIDE;
 
-    const SwFrmFmt *GetFmt() const;
-          SwFrmFmt *GetFmt();
+    const SwFrameFormat *GetFormat() const;
+          SwFrameFormat *GetFormat();
 
     // methods to get pointers for the Fly
           SwFlyFrm* GetFlyFrm()         { return pFlyFrm; }
diff --git a/sw/source/core/inc/docedt.hxx b/sw/source/core/inc/docedt.hxx
index 53ebea10c54c..6d88abb37cbd 100644
--- a/sw/source/core/inc/docedt.hxx
+++ b/sw/source/core/inc/docedt.hxx
@@ -22,7 +22,7 @@
 
 bool sw_JoinText( SwPaM& rPam, bool bJoinPrev );
 
-void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev );
+void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinText, bool& rJoinPrev );
 
 #endif
 
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 1ac37eabae4e..b0bd4c3d0396 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -25,92 +25,92 @@
 #include <IDocumentTimerAccess.hxx>
 #include <o3tl/sorted_vector.hxx>
 
-class SwTxtFld;
+class SwTextField;
 class SwIndex;
 class SwNodeIndex;
-class SwCntntFrm;
+class SwContentFrm;
 class SwSectionNode;
 class SwSection;
-class SwTxtTOXMark;
+class SwTextTOXMark;
 class SwTableBox;
-class SwTxtINetFmt;
-class SwFlyFrmFmt;
+class SwTextINetFormat;
+class SwFlyFrameFormat;
 class SwDoc;
 class SwNode;
 struct SwPosition;
 
 // Update expression fields
-class _SetGetExpFld
+class _SetGetExpField
 {
     sal_uLong nNode;
-    sal_Int32 nCntnt;
+    sal_Int32 nContent;
     union {
-        const SwTxtFld* pTxtFld;
+        const SwTextField* pTextField;
         const SwSection* pSection;
         const SwPosition* pPos;
-        const SwTxtTOXMark* pTxtTOX;
+        const SwTextTOXMark* pTextTOX;
         const SwTableBox* pTBox;
-        const SwTxtINetFmt* pTxtINet;
-        const SwFlyFrmFmt* pFlyFmt;
+        const SwTextINetFormat* pTextINet;
+        const SwFlyFrameFormat* pFlyFormat;
     } CNTNT;
-    enum _SetGetExpFldType
+    enum _SetGetExpFieldType
         {
             TEXTFIELD, TEXTTOXMARK, SECTIONNODE, CRSRPOS, TABLEBOX,
             TEXTINET, FLYFRAME
-        } eSetGetExpFldType;
+        } eSetGetExpFieldType;
 
 public:
-    _SetGetExpFld( const SwNodeIndex& rNdIdx, const SwTxtFld* pFld = 0,
+    _SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextField* pField = 0,
                     const SwIndex* pIdx = 0 );
 
-    _SetGetExpFld( const SwNodeIndex& rNdIdx, const SwTxtINetFmt& rINet,
+    _SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextINetFormat& rINet,
                     const SwIndex* pIdx = 0 );
 
-    _SetGetExpFld( const SwSectionNode& rSectNode,
+    _SetGetExpField( const SwSectionNode& rSectNode,
                     const SwPosition* pPos = 0  );
 
-    _SetGetExpFld( const SwTableBox& rTableBox,
+    _SetGetExpField( const SwTableBox& rTableBox,
                     const SwPosition* pPos = 0  );
 
-    _SetGetExpFld( const SwNodeIndex& rNdIdx, const SwTxtTOXMark& rTOX,
+    _SetGetExpField( const SwNodeIndex& rNdIdx, const SwTextTOXMark& rTOX,
                     const SwIndex* pIdx );
 
-    _SetGetExpFld( const SwPosition& rPos );
+    _SetGetExpField( const SwPosition& rPos );
 
-    _SetGetExpFld( const SwFlyFrmFmt& rFlyFmt, const SwPosition* pPos = 0 );
+    _SetGetExpField( const SwFlyFrameFormat& rFlyFormat, const SwPosition* pPos = 0 );
 
-    bool operator==( const _SetGetExpFld& rFld ) const;
-    bool operator<( const _SetGetExpFld& rFld ) const;
+    bool operator==( const _SetGetExpField& rField ) const;
+    bool operator<( const _SetGetExpField& rField ) const;
 
-    const SwTxtFld* GetTxtFld() const
-        { return TEXTFIELD == eSetGetExpFldType ? CNTNT.pTxtFld : 0; }
-    const SwTxtTOXMark* GetTOX() const
-        { return TEXTTOXMARK == eSetGetExpFldType ? CNTNT.pTxtTOX : 0; }
+    const SwTextField* GetTextField() const
+        { return TEXTFIELD == eSetGetExpFieldType ? CNTNT.pTextField : 0; }
+    const SwTextTOXMark* GetTOX() const
+        { return TEXTTOXMARK == eSetGetExpFieldType ? CNTNT.pTextTOX : 0; }
     const SwSection* GetSection() const
-        { return SECTIONNODE == eSetGetExpFldType ? CNTNT.pSection : 0; }
+        { return SECTIONNODE == eSetGetExpFieldType ? CNTNT.pSection : 0; }
     const SwTableBox* GetTableBox() const
-        { return TABLEBOX == eSetGetExpFldType ? CNTNT.pTBox : 0; }
-    const SwTxtINetFmt* GetINetFmt() const
-        { return TEXTINET == eSetGetExpFldType ? CNTNT.pTxtINet : 0; }
-    const SwFlyFrmFmt* GetFlyFmt() const
-        { return FLYFRAME == eSetGetExpFldType ? CNTNT.pFlyFmt : 0; }
+        { return TABLEBOX == eSetGetExpFieldType ? CNTNT.pTBox : 0; }
+    const SwTextINetFormat* GetINetFormat() const
+        { return TEXTINET == eSetGetExpFieldType ? CNTNT.pTextINet : 0; }
+    const SwFlyFrameFormat* GetFlyFormat() const
+        { return FLYFRAME == eSetGetExpFieldType ? CNTNT.pFlyFormat : 0; }
 
     sal_uLong GetNode() const { return nNode; }
-    sal_Int32 GetCntnt() const { return nCntnt; }
-    const void* GetPointer() const { return CNTNT.pTxtFld; }
+    sal_Int32 GetContent() const { return nContent; }
+    const void* GetPointer() const { return CNTNT.pTextField; }
 
     void GetPosOfContent( SwPosition& rPos ) const;
 
-    const SwNode* GetNodeFromCntnt() const;
-    sal_Int32 GetCntPosFromCntnt() const;
+    const SwNode* GetNodeFromContent() const;
+    sal_Int32 GetCntPosFromContent() const;
 
-    void SetBodyPos( const SwCntntFrm& rFrm );
+    void SetBodyPos( const SwContentFrm& rFrm );
 };
 
-class _SetGetExpFlds : public o3tl::sorted_vector<_SetGetExpFld*, o3tl::less_ptr_to<_SetGetExpFld> >
+class _SetGetExpFields : public o3tl::sorted_vector<_SetGetExpField*, o3tl::less_ptr_to<_SetGetExpField> >
 {
 public:
-    ~_SetGetExpFlds() { DeleteAndDestroyAll(); }
+    ~_SetGetExpFields() { DeleteAndDestroyAll(); }
 };
 
 // struct for saving strings from the SetExp's string fields
@@ -120,59 +120,59 @@ struct _HashStr : public SwHash
     _HashStr( const OUString& rName, const OUString& rText, _HashStr* = 0 );
 };
 
-struct SwCalcFldType : public SwHash
+struct SwCalcFieldType : public SwHash
 {
-    const SwFieldType* pFldType;
+    const SwFieldType* pFieldType;
 
-    SwCalcFldType( const OUString& rStr, const SwFieldType* pFldTyp )
-        : SwHash( rStr ), pFldType( pFldTyp )
+    SwCalcFieldType( const OUString& rStr, const SwFieldType* pFieldTyp )
+        : SwHash( rStr ), pFieldType( pFieldTyp )
     {}
 };
 
 // search for the string that was saved under rName in the hash table
-OUString LookString( SwHash** ppTbl, sal_uInt16 nSize, const OUString& rName,
+OUString LookString( SwHash** ppTable, sal_uInt16 nSize, const OUString& rName,
                      sal_uInt16* pPos = 0 );
 
 const int GETFLD_ALL        = 3;        // combine flags via OR
 const int GETFLD_CALC       = 1;
 const int GETFLD_EXPAND     = 2;
 
-class SwDocUpdtFld
+class SwDocUpdateField
 {
-    _SetGetExpFlds* pFldSortLst;    // current field list for calculation
-    SwCalcFldType*  aFldTypeTable[ TBLSZ ];
+    _SetGetExpFields* pFieldSortLst;    // current field list for calculation
+    SwCalcFieldType*  aFieldTypeTable[ TBLSZ ];
 
     sal_uLong nNodes;               // if the node count is different
-    sal_uInt8 nFldLstGetMode;
+    sal_uInt8 nFieldLstGetMode;
     SwDoc* pDocument;
 
-    bool bInUpdateFlds : 1;     // currently there is an UpdateFlds
-    bool bFldsDirty : 1;        // some fields are invalid
+    bool bInUpdateFields : 1;     // currently there is an UpdateFields
+    bool bFieldsDirty : 1;        // some fields are invalid
 
-    void _MakeFldList( SwDoc& pDoc, int eGetMode );
-    void GetBodyNode( const SwTxtFld& , sal_uInt16 nFldWhich );
+    void _MakeFieldList( SwDoc& pDoc, int eGetMode );
+    void GetBodyNode( const SwTextField& , sal_uInt16 nFieldWhich );
     void GetBodyNode( const SwSectionNode&);
 
 public:
-    SwDocUpdtFld(SwDoc* pDocument);
-    ~SwDocUpdtFld();
+    SwDocUpdateField(SwDoc* pDocument);
+    ~SwDocUpdateField();
 
-    const _SetGetExpFlds* GetSortLst() const { return pFldSortLst; }
+    const _SetGetExpFields* GetSortLst() const { return pFieldSortLst; }
 
-    void MakeFldList( SwDoc& rDoc, bool bAll, int eGetMode );
+    void MakeFieldList( SwDoc& rDoc, bool bAll, int eGetMode );
 
-    void InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld );
+    void InsDelFieldInFieldLst( bool bIns, const SwTextField& rField );
 
-    void InsertFldType( const SwFieldType& rType );
-    void RemoveFldType( const SwFieldType& rType );
+    void InsertFieldType( const SwFieldType& rType );
+    void RemoveFieldType( const SwFieldType& rType );
 
-    bool IsInUpdateFlds() const         { return bInUpdateFlds; }
-    void SetInUpdateFlds( bool b )      { bInUpdateFlds = b; }
+    bool IsInUpdateFields() const         { return bInUpdateFields; }
+    void SetInUpdateFields( bool b )      { bInUpdateFields = b; }
 
-    bool IsFieldsDirty() const          { return bFldsDirty; }
+    bool IsFieldsDirty() const          { return bFieldsDirty; }
     void SetFieldsDirty( bool b )
     {
-        bFldsDirty = b;
+        bFieldsDirty = b;
 
         if (b)
         {
@@ -180,7 +180,7 @@ public:
         }
     }
 
-    SwHash* const * GetFldTypeTable() const { return reinterpret_cast<SwHash* const *>(aFldTypeTable); }
+    SwHash* const * GetFieldTypeTable() const { return reinterpret_cast<SwHash* const *>(aFieldTypeTable); }
 };
 
 #endif
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index b4e4ef338735..1dc937f72c90 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -91,13 +91,13 @@ private:
 };
 
 // sort text
-struct SwSortTxtElement : public SwSortElement
+struct SwSortTextElement : public SwSortElement
 {
     sal_uLong   nOrg;
     SwNodeIndex aPos;
 
-    SwSortTxtElement( const SwNodeIndex& rPos );
-    virtual ~SwSortTxtElement();
+    SwSortTextElement( const SwNodeIndex& rPos );
+    virtual ~SwSortTextElement();
 
     virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE;
 };
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 158299734db3..e73764432ec0 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -26,8 +26,8 @@
 
 class  SwTOXInternational;
 class  SwPageDesc;
-class  SwTxtNode;
-class  SwTxtFmtColl;
+class  SwTextNode;
+class  SwTextFormatColl;
 struct SwPosition;
 struct SwTOXSortTabBase;
 
@@ -38,13 +38,13 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
     SwTOXSortTabBases aSortArr;
 
     void UpdateMarks( const SwTOXInternational& rIntl,
-                      const SwTxtNode* pOwnChapterNode );
-    void UpdateOutline( const SwTxtNode* pOwnChapterNode );
-    void UpdateTemplate( const SwTxtNode* pOwnChapterNode );
-    void UpdateCntnt( SwTOXElement eType,
-                      const SwTxtNode* pOwnChapterNode );
-    void UpdateTable( const SwTxtNode* pOwnChapterNode );
-    void UpdateSequence( const SwTxtNode* pOwnChapterNode );
+                      const SwTextNode* pOwnChapterNode );
+    void UpdateOutline( const SwTextNode* pOwnChapterNode );
+    void UpdateTemplate( const SwTextNode* pOwnChapterNode );
+    void UpdateContent( SwTOXElement eType,
+                      const SwTextNode* pOwnChapterNode );
+    void UpdateTable( const SwTextNode* pOwnChapterNode );
+    void UpdateSequence( const SwTextNode* pOwnChapterNode );
     void UpdateAuthorities( const SwTOXInternational& rIntl );
     void UpdateAll();
 
@@ -61,7 +61,7 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
                        const SwPageDesc*  _pDefaultPageDesc );
 
     // replace page num placeholder with actual page number
-    void _UpdatePageNum( SwTxtNode* pNd,
+    void _UpdatePageNum( SwTextNode* pNd,
                          const std::vector<sal_uInt16>& rNums,
                          const std::vector<SwPageDesc*>& rDescs,
                          const std::vector<sal_uInt16>* pMainEntryNums,
@@ -73,10 +73,10 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
                        const Range& rRange );
 
     // return text collection via name/ from format pool
-    SwTxtFmtColl* GetTxtFmtColl( sal_uInt16 nLevel );
+    SwTextFormatColl* GetTextFormatColl( sal_uInt16 nLevel );
 
 public:
-    SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt);
+    SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFormat & rFormat);
     virtual ~SwTOXBaseSection();
 
     // <_bNewTOX> : distinguish between the creation of a new table-of-content
@@ -97,7 +97,7 @@ struct SwDefTOXBase_Impl
     SwTOXBase* pContBase;
     SwTOXBase* pIdxBase;
     SwTOXBase* pUserBase;
-    SwTOXBase* pTblBase;
+    SwTOXBase* pTableBase;
     SwTOXBase* pObjBase;
     SwTOXBase* pIllBase;
     SwTOXBase* pAuthBase;
@@ -107,7 +107,7 @@ struct SwDefTOXBase_Impl
     pContBase(0),
     pIdxBase(0),
     pUserBase(0),
-    pTblBase(0),
+    pTableBase(0),
     pObjBase(0),
     pIllBase(0),
     pAuthBase(0),
@@ -119,7 +119,7 @@ struct SwDefTOXBase_Impl
         delete pContBase;
         delete pIdxBase;
         delete pUserBase;
-        delete pTblBase;
+        delete pTableBase;
         delete pObjBase;
         delete pIllBase;
         delete pAuthBase;
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 7b7c57b17caf..83bf4d661d4e 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -25,7 +25,7 @@
 #include <vcl/vclptr.hxx>
 #include <vcl/outdev.hxx>
 
-class SwTxtFrm;
+class SwTextFrm;
 class SwViewShell;
 class SwScriptInfo;
 class Point;
@@ -42,7 +42,7 @@ class SwUnderlineFont;
 // encapsulates information for drawing text
 class SwDrawTextInfo
 {
-    const SwTxtFrm* pFrm;
+    const SwTextFrm* pFrm;
     VclPtr<OutputDevice> pOut;
     SwViewShell const * pSh;
     const SwScriptInfo* pScriptInfo;
@@ -162,12 +162,12 @@ public:
 #endif
     }
 
-    const SwTxtFrm* GetFrm() const
+    const SwTextFrm* GetFrm() const
     {
         return pFrm;
     }
 
-    void SetFrm( const SwTxtFrm* pNewFrm )
+    void SetFrm( const SwTextFrm* pNewFrm )
     {
         pFrm = pNewFrm;
     }
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 4d2791095f87..6421a9efc6bd 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -28,11 +28,11 @@ class SwBorderAttrs;
 class SwDoc;
 class SwNodeIndex;
 // #i44049#
-class SwObjectFormatterTxtFrm;
+class SwObjectFormatterTextFrm;
 
 /** Base class that provides the general functionalities for frames that are
     allowed at page breaks (flow) and shall continue on the next page (can be
-    split), e.g. paragraphs (CntntFrm) or tables (TabFrm).
+    split), e.g. paragraphs (ContentFrm) or tables (TabFrm).
 
     Some parts of these functionalities are implemented in FlowFrm while the
     specific ones are done in the corresponding Frm classes. The FlowFrm has to
@@ -43,7 +43,7 @@ class SwObjectFormatterTxtFrm;
     FlowFrm that is virtually inherited from SwFrm and that works with its own
     member data. Further classes would need to inherit from FlowFrm and (via
     multiple base classes since the class tree splits exactly at the branch
-    from SwFrm to SwCntntFrm and SwLayoutFrm) also virtually from SwFrm as
+    from SwFrm to SwContentFrm and SwLayoutFrm) also virtually from SwFrm as
     well. Unfortunately, this leads - besides problems with compilers and
     debugging programs - to high additional costs, that we IMHO are not able to
     afford nowadays.
@@ -61,10 +61,10 @@ class SwFlowFrm
     friend inline void TableSplitRecalcLock( SwFlowFrm * );
     friend inline void TableSplitRecalcUnlock( SwFlowFrm * );
     // #i44049#
-    friend class SwObjectFormatterTxtFrm;
+    friend class SwObjectFormatterTextFrm;
     friend class FlowFrmJoinLockGuard;
 
-    // TblSel is allowed to reset the follow-bit
+    // TableSel is allowed to reset the follow-bit
     friend inline void UnsetFollow( SwFlowFrm *pFlow );
 
     friend void MakeFrms( SwDoc *, const SwNodeIndex &, const SwNodeIndex & );
@@ -121,8 +121,8 @@ protected:
 
     // checks if forward flow makes sense to prevent infinite moves
     inline bool IsFwdMoveAllowed();
-    // #i44049# - method <CalcCntnt(..)> has to check this property.
-    friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow );
+    // #i44049# - method <CalcContent(..)> has to check this property.
+    friend void CalcContent( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow );
     bool IsKeepFwdMoveAllowed();    // like above, forward flow for Keep.
 
     /** method to determine overlapping of an object that requests floating
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 27ccaa423727..df2edc411cad 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -25,15 +25,15 @@
 #include "frmfmt.hxx"
 
 class SwPageFrm;
-class SwFmtFrmSize;
+class SwFormatFrmSize;
 struct SwCrsrMoveState;
 class SwBorderAttrs;
 class SwVirtFlyDrawObj;
-class SwFrmFmts;
+class SwFrameFormats;
 class SwAttrSetChg;
 namespace tools { class PolyPolygon; }
 class SwFlyDrawContact;
-class SwFmt;
+class SwFormat;
 
 #include <anchoredobject.hxx>
 
@@ -44,7 +44,7 @@ class SwFmt;
 
     implemented in layout/flycnt.cxx
  */
-const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
+const SwContentFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
                               const bool bBody = false );
 
 /** calculate rectangle in that the object can be moved or rather be resized */
@@ -57,7 +57,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove = true );
 class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject
 {
     // is allowed to lock, implemented in frmtool.cxx
-    friend void AppendObjs   ( const SwFrmFmts *, sal_uLong, SwFrm *, SwPageFrm *, SwDoc* );
+    friend void AppendObjs   ( const SwFrameFormats *, sal_uLong, SwFrm *, SwPageFrm *, SwDoc* );
     friend void Notify( SwFlyFrm *, SwPageFrm *pOld, const SwRect &rOld,
                         const SwRect* pOldPrt );
 
@@ -77,7 +77,7 @@ protected:
     SwFlyFrm *pPrevLink, *pNextLink;
 
 private:
-    // It must be possible to block Cntnt-bound flys so that they will be not
+    // It must be possible to block Content-bound flys so that they will be not
     // formatted; in this case MakeAll() returns immediately. This is necessary
     // for page changes during formattting. In addition, it is needed during
     // the constructor call of the root object since otherwise the anchor will
@@ -116,7 +116,7 @@ protected:
     // is moved to an invisible layer.
     bool bLockDeleteContent :1;
 
-    friend class SwNoTxtFrm; // is allowed to call NotifyBackground
+    friend class SwNoTextFrm; // is allowed to call NotifyBackground
 
     Point m_aContentPos;        // content area's position relatively to Frm
     bool m_bValidContentPos;
@@ -131,10 +131,10 @@ protected:
     void SetMinHeight()  { bMinHeight = true; }
     void ResetMinHeight(){ bMinHeight = false; }
 
-    Size CalcRel( const SwFmtFrmSize &rSz ) const;
+    Size CalcRel( const SwFormatFrmSize &rSz ) const;
     SwTwips CalcAutoWidth() const;
 
-    SwFlyFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
+    SwFlyFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
 
     virtual void DestroyImpl() SAL_OVERRIDE;
     virtual ~SwFlyFrm();
@@ -178,7 +178,7 @@ public:
     SwTwips _Grow  ( SwTwips, bool bTst );
     void    _Invalidate( SwPageFrm *pPage = 0 );
 
-    bool FrmSizeChg( const SwFmtFrmSize & );
+    bool FrmSizeChg( const SwFormatFrmSize & );
 
     SwFlyFrm *GetPrevLink() const { return pPrevLink; }
     SwFlyFrm *GetNextLink() const { return pNextLink; }
@@ -186,7 +186,7 @@ public:
     static void ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow );
     static void UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow );
 
-    SwFlyFrm *FindChainNeighbour( SwFrmFmt &rFmt, SwFrm *pAnch = 0 );
+    SwFlyFrm *FindChainNeighbour( SwFrameFormat &rFormat, SwFrm *pAnch = 0 );
 
     // #i26791#
     const SwVirtFlyDrawObj* GetVirtDrawObj() const;
@@ -255,8 +255,8 @@ public:
     virtual void MakeObjPos() SAL_OVERRIDE;
     virtual void InvalidateObjPos() SAL_OVERRIDE;
 
-    virtual SwFrmFmt& GetFrmFmt() SAL_OVERRIDE;
-    virtual const SwFrmFmt& GetFrmFmt() const SAL_OVERRIDE;
+    virtual SwFrameFormat& GetFrameFormat() SAL_OVERRIDE;
+    virtual const SwFrameFormat& GetFrameFormat() const SAL_OVERRIDE;
 
     virtual const SwRect GetObjRect() const SAL_OVERRIDE;
 
@@ -268,13 +268,13 @@ public:
         format isn't possible, if Writer fly frame is locked resp. col-locked.
     */
     virtual bool IsFormatPossible() const SAL_OVERRIDE;
-    static void GetAnchoredObjects( std::list<SwAnchoredObject*>&, const SwFmt& rFmt );
+    static void GetAnchoredObjects( std::list<SwAnchoredObject*>&, const SwFormat& rFormat );
 
-    // overwriting "SwFrmFmt *SwLayoutFrm::GetFmt" to provide the correct derived return type.
+    // overwriting "SwFrameFormat *SwLayoutFrm::GetFormat" to provide the correct derived return type.
     // (This is in order to skip on the otherwise necessary casting of the result to
-    // 'SwFlyFrmFmt *' after calls to this function. The casting is now done in this function.)
-    virtual const SwFlyFrmFmt *GetFmt() const SAL_OVERRIDE;
-    virtual       SwFlyFrmFmt *GetFmt() SAL_OVERRIDE;
+    // 'SwFlyFrameFormat *' after calls to this function. The casting is now done in this function.)
+    virtual const SwFlyFrameFormat *GetFormat() const SAL_OVERRIDE;
+    virtual       SwFlyFrameFormat *GetFormat() SAL_OVERRIDE;
 
     virtual void dumpAsXml( xmlTextWriterPtr writer ) const SAL_OVERRIDE { SwLayoutFrm::dumpAsXml( writer ); };
 
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 5a49cfb411c2..73dda04b1029 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -27,7 +27,7 @@
 class SwFlyAtCntFrm;
 
 // Base class for those Flys that can "move freely" or better that are not
-// bound in Cntnt.
+// bound in Content.
 class SwFlyFreeFrm : public SwFlyFrm
 {
     SwPageFrm *pPage;   // page where the Fly is registered
@@ -42,7 +42,7 @@ class SwFlyFreeFrm : public SwFlyFrm
 
     SwRect maUnclippedFrm;
 
-    void CheckClip( const SwFmtFrmSize &rSz );  //'Emergency' Clipping.
+    void CheckClip( const SwFormatFrmSize &rSz );  //'Emergency' Clipping.
 
     /** determines, if direct environment of fly frame has 'auto' size
 
@@ -62,7 +62,7 @@ protected:
     friend class SwFlyNotify;
     virtual void NotifyBackground( SwPageFrm *pPage,
                                    const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE;
-    SwFlyFreeFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
+    SwFlyFreeFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
 
     virtual void DestroyImpl() SAL_OVERRIDE;
     virtual ~SwFlyFreeFrm();
@@ -121,20 +121,20 @@ public:
     virtual bool IsFormatPossible() const SAL_OVERRIDE;
 };
 
-// Flys that are bound to LayoutFrms and not to Cntnt
+// Flys that are bound to LayoutFrms and not to Content
 class SwFlyLayFrm : public SwFlyFreeFrm
 {
 public:
     // #i28701#
     TYPEINFO_OVERRIDE();
 
-    SwFlyLayFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
+    SwFlyLayFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
 
 protected:
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
 };
 
-// Flys that are bound to Cntnt but not in Cntnt
+// Flys that are bound to Content but not in Content
 class SwFlyAtCntFrm : public SwFlyFreeFrm
 {
 protected:
@@ -155,7 +155,7 @@ public:
     // #i28701#
     TYPEINFO_OVERRIDE();
 
-    SwFlyAtCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
+    SwFlyAtCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
 
     void SetAbsPos( const Point &rNew );
 
@@ -172,13 +172,13 @@ public:
     virtual bool IsFormatPossible() const SAL_OVERRIDE;
 };
 
-// Flys that are bound to a character in Cntnt
+// Flys that are bound to a character in Content
 class SwFlyInCntFrm : public SwFlyFrm
 {
     Point aRef;  // relative to this point AbsPos is being calculated
 
     bool bInvalidLayout :1;
-    bool bInvalidCntnt  :1;
+    bool bInvalidContent  :1;
 
     virtual void DestroyImpl() SAL_OVERRIDE;
     virtual ~SwFlyInCntFrm();
@@ -193,7 +193,7 @@ public:
     // #i28701#
     TYPEINFO_OVERRIDE();
 
-    SwFlyInCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
+    SwFlyInCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
 
     virtual void  Format(  const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
 
@@ -203,12 +203,12 @@ public:
     const Point GetRelPos() const;
 
     inline void InvalidateLayout() const;
-    inline void InvalidateCntnt() const;
+    inline void InvalidateContent() const;
     inline void ValidateLayout() const;
-    inline void ValidateCntnt() const;
-    bool IsInvalid() const { return (bInvalidLayout || bInvalidCntnt); }
+    inline void ValidateContent() const;
+    bool IsInvalid() const { return (bInvalidLayout || bInvalidContent); }
     bool IsInvalidLayout() const { return bInvalidLayout; }
-    bool IsInvalidCntnt() const { return bInvalidCntnt; }
+    bool IsInvalidContent() const { return bInvalidContent; }
 
     // (26.11.93, see tabfrm.hxx, but might also be valid for others)
     // For creation of a Fly after a FlyCnt was created _and_ inserted.
@@ -232,18 +232,18 @@ inline void SwFlyInCntFrm::InvalidateLayout() const
 {
     const_cast<SwFlyInCntFrm*>(this)->bInvalidLayout = true;
 }
-inline void SwFlyInCntFrm::InvalidateCntnt() const
+inline void SwFlyInCntFrm::InvalidateContent() const
 {
-    const_cast<SwFlyInCntFrm*>(this)->bInvalidCntnt = true;
+    const_cast<SwFlyInCntFrm*>(this)->bInvalidContent = true;
 }
 
 inline void SwFlyInCntFrm::ValidateLayout() const
 {
     const_cast<SwFlyInCntFrm*>(this)->bInvalidLayout = false;
 }
-inline void SwFlyInCntFrm::ValidateCntnt() const
+inline void SwFlyInCntFrm::ValidateContent() const
 {
-    const_cast<SwFlyInCntFrm*>(this)->bInvalidCntnt = false;
+    const_cast<SwFlyInCntFrm*>(this)->bInvalidContent = false;
 }
 
 #endif
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 165a94e4ed21..0a23c88acc24 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -37,12 +37,12 @@ class SwRootFrm;
 class SwPageFrm;
 class SwFlyFrm;
 class SwSectionFrm;
-class SwFtnFrm;
-class SwFtnBossFrm;
+class SwFootnoteFrm;
+class SwFootnoteBossFrm;
 class SwTabFrm;
 class SwRowFrm;
 class SwFlowFrm;
-class SwCntntFrm;
+class SwContentFrm;
 class SfxPoolItem;
 class SwAttrSet;
 class SwViewShell;
@@ -55,7 +55,7 @@ class XFillGradientItem;
 class SwSelectionList;
 struct SwPosition;
 struct SwCrsrMoveState;
-class SwFmt;
+class SwFormat;
 class SwPrintData;
 class SwSortedObjs;
 class SwAnchoredObject;
@@ -221,18 +221,18 @@ class SwFrm: public SwClient, public SfxBroadcaster
     friend class SwLooping;
 
     // voids lower during creation of a column
-    friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart );
-    friend void   RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow );
+    friend SwFrm *SaveContent( SwLayoutFrm *, SwFrm* pStart );
+    friend void   RestoreContent( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow );
 
 #ifdef DBG_UTIL
     // remove empty SwSectionFrms from a chain
     friend SwFrm* SwClearDummies( SwFrm* pFrm );
 #endif
 
-    // for validating a mistakenly invalidated one in SwCntntFrm::MakeAll
+    // for validating a mistakenly invalidated one in SwContentFrm::MakeAll
     friend void ValidateSz( SwFrm *pFrm );
-    // implemented in text/txtftn.cxx, prevents Ftn oscillation
-    friend void ValidateTxt( SwFrm *pFrm );
+    // implemented in text/txtftn.cxx, prevents Footnote oscillation
+    friend void ValidateText( SwFrm *pFrm );
 
     friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt );
 
@@ -269,20 +269,20 @@ class SwFrm: public SwClient, public SfxBroadcaster
         - Each group of linked fly frames
         - All footnotes
         - All document body frames
-        #i27138# - adding parameter <_bInSameFtn>
+        #i27138# - adding parameter <_bInSameFootnote>
         Its default value is <false>. If its value is <true>, the environment
         'All footnotes' is no longer treated. Instead each footnote is treated
         as an own environment.
 
-        @param _bInSameFtn
+        @param _bInSameFootnote
         input parameter - boolean indicating, that the found next content
         frame has to be in the same footnote frame. This parameter is only
         relevant for flow frames in footnotes.
 
-        @return SwCntntFrm*
+        @return SwContentFrm*
         pointer to the found next content frame. It's NULL, if none exists.
     */
-    SwCntntFrm* _FindNextCnt( const bool _bInSameFtn = false );
+    SwContentFrm* _FindNextCnt( const bool _bInSameFootnote = false );
 
     /** method to determine previous content frame in the same environment
         for a flow frame (content frame, table frame, section frame)
@@ -298,20 +298,20 @@ class SwFrm: public SwClient, public SfxBroadcaster
         - Each group of linked fly frames
         - All footnotes
         - All document body frames
-        #i27138# - adding parameter <_bInSameFtn>
+        #i27138# - adding parameter <_bInSameFootnote>
         Its default value is <false>. If its value is <true>, the environment
         'All footnotes' is no longer treated. Instead each footnote is treated
         as an own environment.
 
-        @param _bInSameFtn
+        @param _bInSameFootnote
         input parameter - boolean indicating, that the found previous content
         frame has to be in the same footnote frame. This parameter is only
         relevant for flow frames in footnotes.
 
-        @return SwCntntFrm*
+        @return SwContentFrm*
         pointer to the found previous content frame. It's NULL, if none exists.
     */
-    SwCntntFrm* _FindPrevCnt( const bool _bInSameFtn = false );
+    SwContentFrm* _FindPrevCnt( const bool _bInSameFootnote = false );
 
     void _UpdateAttrFrm( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 & );
     SwFrm* _GetIndNext();
@@ -344,7 +344,7 @@ protected:
     bool mbValidLineNum  : 1;
     bool mbFixSize       : 1;
     // if true, frame will be painted completely even content was changed
-    // only partially. For CntntFrms a border (from Action) will exclusively
+    // only partially. For ContentFrms a border (from Action) will exclusively
     // painted if <mbCompletePaint> is true.
     bool mbCompletePaint : 1;
     bool mbRetouche      : 1; // frame is responsible for retouching
@@ -353,7 +353,7 @@ protected:
     bool mbInfBody       : 1;  // Frm is in document body
     bool mbInfTab        : 1;  // Frm is in a table
     bool mbInfFly        : 1;  // Frm is in a Fly
-    bool mbInfFtn        : 1;  // Frm is in a footnote
+    bool mbInfFootnote        : 1;  // Frm is in a footnote
     bool mbInfSct        : 1;  // Frm is in a section
     bool mbColLocked     : 1;  // lock Grow/Shrink for column-wise section
                                   // or fly frames, will be set in Format
@@ -369,14 +369,14 @@ protected:
     // Only used by SwRootFrm Ctor to get 'this' into mpRoot...
     void setRootFrm( SwRootFrm* pRoot ) { mpRoot = pRoot; }
 
-    SwPageFrm *InsertPage( SwPageFrm *pSibling, bool bFtn );
+    SwPageFrm *InsertPage( SwPageFrm *pSibling, bool bFootnote );
     void PrepareMake();
     void OptPrepareMake();
     void MakePos();
     // Format next frame of table frame to assure keeping attributes.
     // In case of nested tables method <SwFrm::MakeAll()> is called to
     // avoid formatting of superior table frame.
-    friend SwFrm* sw_FormatNextCntntForKeep( SwTabFrm* pTabFrm );
+    friend SwFrm* sw_FormatNextContentForKeep( SwTabFrm* pTabFrm );
 
     virtual void MakeAll() = 0;
     // adjust frames of a page
@@ -454,13 +454,13 @@ public:
     // Does special treatment for _Get[Next|Prev]Leaf() (for tables).
     SwLayoutFrm *GetLeaf( MakePageType eMakePage, bool bFwd );
     SwLayoutFrm *GetNextLeaf   ( MakePageType eMakePage );
-    SwLayoutFrm *GetNextFtnLeaf( MakePageType eMakePage );
+    SwLayoutFrm *GetNextFootnoteLeaf( MakePageType eMakePage );
     SwLayoutFrm *GetNextSctLeaf( MakePageType eMakePage );
     SwLayoutFrm *GetNextCellLeaf( MakePageType eMakePage );
-    SwLayoutFrm *GetPrevLeaf   ( MakePageType eMakeFtn = MAKEPAGE_FTN );
-    SwLayoutFrm *GetPrevFtnLeaf( MakePageType eMakeFtn = MAKEPAGE_FTN );
-    SwLayoutFrm *GetPrevSctLeaf( MakePageType eMakeFtn = MAKEPAGE_FTN );
-    SwLayoutFrm *GetPrevCellLeaf( MakePageType eMakeFtn = MAKEPAGE_FTN );
+    SwLayoutFrm *GetPrevLeaf   ( MakePageType eMakeFootnote = MAKEPAGE_FTN );
+    SwLayoutFrm *GetPrevFootnoteLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN );
+    SwLayoutFrm *GetPrevSctLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN );
+    SwLayoutFrm *GetPrevCellLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN );
     const SwLayoutFrm *GetLeaf ( MakePageType eMakePage, bool bFwd,
                                  const SwFrm *pAnch ) const;
 
@@ -482,12 +482,12 @@ public:
     virtual void PaintBorder( const SwRect&, const SwPageFrm *pPage,
                               const SwBorderAttrs & ) const;
     void PaintBaBo( const SwRect&, const SwPageFrm *pPage = 0,
-                    const bool bLowerBorder = false, const bool bOnlyTxtBackground = false ) const;
+                    const bool bLowerBorder = false, const bool bOnlyTextBackground = false ) const;
     void PaintBackground( const SwRect&, const SwPageFrm *pPage,
                           const SwBorderAttrs &,
                           const bool bLowerMode = false,
                           const bool bLowerBorder = false,
-                          const bool bOnlyTxtBackground = false ) const;
+                          const bool bOnlyTextBackground = false ) const;
     void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*,
                           const Color *pColor, const editeng::SvxBorderStyle =
                 ::com::sun::star::table::BorderLineStyle::SOLID ) const;
@@ -517,7 +517,7 @@ public:
     void SetInfFlags();
     inline void InvalidateInfFlags() { mbInfInvalid = true; }
     inline bool IsInDocBody() const;    // use InfoFlags, determine flags
-    inline bool IsInFtn() const;        // if necessary
+    inline bool IsInFootnote() const;        // if necessary
     inline bool IsInTab() const;
     inline bool IsInFly() const;
     inline bool IsInSct() const;
@@ -569,9 +569,9 @@ public:
     */
     bool IsMoveable( const SwLayoutFrm* _pLayoutFrm = 0L ) const;
 
-    // Is it permitted for the (Txt)Frm to add a footnote in the current
+    // Is it permitted for the (Text)Frm to add a footnote in the current
     // environment (not e.g. for repeating table headlines)
-    bool IsFtnAllowed() const;
+    bool IsFootnoteAllowed() const;
 
     virtual void  Format( const SwBorderAttrs *pAttrs = 0 );
 
@@ -595,9 +595,9 @@ public:
     SwPageFrm           *FindPageFrm();
     SwFrm               *FindColFrm();
     SwRowFrm            *FindRowFrm();
-    SwFtnBossFrm        *FindFtnBossFrm( bool bFootnotes = false );
+    SwFootnoteBossFrm        *FindFootnoteBossFrm( bool bFootnotes = false );
     SwTabFrm            *ImplFindTabFrm();
-    SwFtnFrm            *ImplFindFtnFrm();
+    SwFootnoteFrm            *ImplFindFootnoteFrm();
     SwFlyFrm            *ImplFindFlyFrm();
     SwSectionFrm        *ImplFindSctFrm();
     SwFrm               *FindFooterOrHeader();
@@ -607,30 +607,30 @@ public:
     const SwLayoutFrm   *GetUpper() const { return mpUpper; }
     const SwRootFrm     *getRootFrm()   const { return mpRoot; }
     inline SwTabFrm     *FindTabFrm();
-    inline SwFtnFrm     *FindFtnFrm();
+    inline SwFootnoteFrm     *FindFootnoteFrm();
     inline SwFlyFrm     *FindFlyFrm();
     inline SwSectionFrm *FindSctFrm();
     inline SwFrm        *FindNext();
-    // #i27138# - add parameter <_bInSameFtn>
-    SwCntntFrm* FindNextCnt( const bool _bInSameFtn = false );
+    // #i27138# - add parameter <_bInSameFootnote>
+    SwContentFrm* FindNextCnt( const bool _bInSameFootnote = false );
     inline SwFrm        *FindPrev();
     inline const SwPageFrm *FindPageFrm() const;
-    inline const SwFtnBossFrm *FindFtnBossFrm( bool bFtn = false ) const;
+    inline const SwFootnoteBossFrm *FindFootnoteBossFrm( bool bFootnote = false ) const;
     inline const SwFrm     *FindColFrm() const;
     inline const SwFrm     *FindFooterOrHeader() const;
     inline const SwTabFrm  *FindTabFrm() const;
-    inline const SwFtnFrm  *FindFtnFrm() const;
+    inline const SwFootnoteFrm  *FindFootnoteFrm() const;
     inline const SwFlyFrm  *FindFlyFrm() const;
     inline const SwSectionFrm *FindSctFrm() const;
     inline const SwFrm     *FindNext() const;
-    // #i27138# - add parameter <_bInSameFtn>
-    const SwCntntFrm* FindNextCnt( const bool _bInSameFtn = false ) const;
+    // #i27138# - add parameter <_bInSameFootnote>
+    const SwContentFrm* FindNextCnt( const bool _bInSameFootnote = false ) const;
     inline const SwFrm     *FindPrev() const;
            const SwFrm     *GetLower()  const;
 
-    SwCntntFrm* FindPrevCnt( const bool _bInSameFtn = false );
+    SwContentFrm* FindPrevCnt( const bool _bInSameFootnote = false );
 
-    const SwCntntFrm* FindPrevCnt( const bool _bInSameFtn = false ) const;
+    const SwContentFrm* FindPrevCnt( const bool _bInSameFootnote = false ) const;
 
     // #i79774#
     SwFrm* _GetIndPrev() const;
@@ -748,8 +748,8 @@ public:
     void ImplInvalidatePos();
     void ImplInvalidateLineNum();
 
-    inline void InvalidateNextPos( bool bNoFtn = false );
-    void ImplInvalidateNextPos( bool bNoFtn = false );
+    inline void InvalidateNextPos( bool bNoFootnote = false );
+    void ImplInvalidateNextPos( bool bNoFootnote = false );
 
     /** method to invalidate printing area of next frame
         #i11859#
@@ -778,11 +778,11 @@ public:
     inline bool IsRootFrm() const;
     inline bool IsPageFrm() const;
     inline bool IsColumnFrm() const;
-    inline bool IsFtnBossFrm() const;  // footnote bosses might be PageFrms or ColumnFrms
+    inline bool IsFootnoteBossFrm() const;  // footnote bosses might be PageFrms or ColumnFrms
     inline bool IsHeaderFrm() const;
     inline bool IsFooterFrm() const;
-    inline bool IsFtnContFrm() const;
-    inline bool IsFtnFrm() const;
+    inline bool IsFootnoteContFrm() const;
+    inline bool IsFootnoteFrm() const;
     inline bool IsBodyFrm() const;
     inline bool IsColBodyFrm() const;  // implemented in layfrm.hxx, BodyFrm above ColumnFrm
     inline bool IsPageBodyFrm() const; // implemented in layfrm.hxx, BodyFrm above PageFrm
@@ -791,9 +791,9 @@ public:
     inline bool IsTabFrm() const;
     inline bool IsRowFrm() const;
     inline bool IsCellFrm() const;
-    inline bool IsCntntFrm() const;
-    inline bool IsTxtFrm() const;
-    inline bool IsNoTxtFrm() const;
+    inline bool IsContentFrm() const;
+    inline bool IsTextFrm() const;
+    inline bool IsNoTextFrm() const;
     // Frms where its PrtArea depends on their neighbors and that are
     // positioned in the content flow
     inline bool IsFlowFrm() const;
@@ -856,8 +856,8 @@ public:
     bool IsInCoveredCell() const;
 
     // #i81146# new loop control
-    bool KnowsFormat( const SwFmt& rFmt ) const;
-    void RegisterToFormat( SwFmt& rFmt );
+    bool KnowsFormat( const SwFormat& rFormat ) const;
+    void RegisterToFormat( SwFormat& rFormat );
     void ValidateThisAndAllLowers( const sal_uInt16 nStage );
 
     void ForbidDelete()      { mbForbidDelete = true; }
@@ -882,11 +882,11 @@ inline bool SwFrm::IsInDocBody() const
         const_cast<SwFrm*>(this)->SetInfFlags();
     return mbInfBody;
 }
-inline bool SwFrm::IsInFtn() const
+inline bool SwFrm::IsInFootnote() const
 {
     if ( mbInfInvalid )
         const_cast<SwFrm*>(this)->SetInfFlags();
-    return mbInfFtn;
+    return mbInfFootnote;
 }
 inline bool SwFrm::IsInTab() const
 {
@@ -990,12 +990,12 @@ inline void SwFrm::InvalidateAll()
         _ActionOnInvalidation( INVALID_ALL );
     }
 }
-inline void SwFrm::InvalidateNextPos( bool bNoFtn )
+inline void SwFrm::InvalidateNextPos( bool bNoFootnote )
 {
     if ( mpNext && !mpNext->IsSctFrm() )
         mpNext->InvalidatePos();
     else
-        ImplInvalidateNextPos( bNoFtn );
+        ImplInvalidateNextPos( bNoFootnote );
 }
 
 inline void SwFrm::Calc() const
@@ -1024,13 +1024,13 @@ inline SwTabFrm *SwFrm::FindTabFrm()
 {
     return IsInTab() ? ImplFindTabFrm() : 0;
 }
-inline const SwFtnBossFrm *SwFrm::FindFtnBossFrm( bool bFtn ) const
+inline const SwFootnoteBossFrm *SwFrm::FindFootnoteBossFrm( bool bFootnote ) const
 {
-    return const_cast<SwFrm*>(this)->FindFtnBossFrm( bFtn );
+    return const_cast<SwFrm*>(this)->FindFootnoteBossFrm( bFootnote );
 }
-inline SwFtnFrm *SwFrm::FindFtnFrm()
+inline SwFootnoteFrm *SwFrm::FindFootnoteFrm()
 {
-    return IsInFtn() ? ImplFindFtnFrm() : 0;
+    return IsInFootnote() ? ImplFindFootnoteFrm() : 0;
 }
 inline SwFlyFrm *SwFrm::FindFlyFrm()
 {
@@ -1045,9 +1045,9 @@ inline const SwTabFrm *SwFrm::FindTabFrm() const
 {
     return IsInTab() ? const_cast<SwFrm*>(this)->ImplFindTabFrm() : 0;
 }
-inline const SwFtnFrm *SwFrm::FindFtnFrm() const
+inline const SwFootnoteFrm *SwFrm::FindFootnoteFrm() const
 {
-    return IsInFtn() ? const_cast<SwFrm*>(this)->ImplFindFtnFrm() : 0;
+    return IsInFootnote() ? const_cast<SwFrm*>(this)->ImplFindFootnoteFrm() : 0;
 }
 inline const SwFlyFrm *SwFrm::FindFlyFrm() const
 {
@@ -1102,7 +1102,7 @@ inline bool SwFrm::IsColumnFrm() const
 {
     return mnFrmType == FRM_COLUMN;
 }
-inline bool SwFrm::IsFtnBossFrm() const
+inline bool SwFrm::IsFootnoteBossFrm() const
 {
     return (GetType() & FRM_FTNBOSS) != 0;
 }
@@ -1114,11 +1114,11 @@ inline bool SwFrm::IsFooterFrm() const
 {
     return mnFrmType == FRM_FOOTER;
 }
-inline bool SwFrm::IsFtnContFrm() const
+inline bool SwFrm::IsFootnoteContFrm() const
 {
     return mnFrmType == FRM_FTNCONT;
 }
-inline bool SwFrm::IsFtnFrm() const
+inline bool SwFrm::IsFootnoteFrm() const
 {
     return mnFrmType == FRM_FTN;
 }
@@ -1146,15 +1146,15 @@ inline bool SwFrm::IsCellFrm() const
 {
     return mnFrmType == FRM_CELL;
 }
-inline bool SwFrm::IsCntntFrm() const
+inline bool SwFrm::IsContentFrm() const
 {
     return (GetType() & FRM_CNTNT) != 0;
 }
-inline bool SwFrm::IsTxtFrm() const
+inline bool SwFrm::IsTextFrm() const
 {
     return mnFrmType == FRM_TXT;
 }
-inline bool SwFrm::IsNoTxtFrm() const
+inline bool SwFrm::IsNoTextFrm() const
 {
     return mnFrmType == FRM_NOTXT;
 }
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index 15aa7e908d93..13930343eb13 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -22,19 +22,19 @@
 
 #include "swtypes.hxx"
 
-class SwTxtFrm;
+class SwTextFrm;
 class SwPaM;
-class SwTxtCursor;
+class SwTextCursor;
 
-class SwTxtFrmInfo
+class SwTextFrmInfo
 {
-    const SwTxtFrm *pFrm;
+    const SwTextFrm *pFrm;
 
     // Where does the text (w/o whitespaces) start (document is global!)?
-    static SwTwips GetLineStart( const SwTxtCursor &rLine );
+    static SwTwips GetLineStart( const SwTextCursor &rLine );
 
 public:
-    inline SwTxtFrmInfo( const SwTxtFrm *pTxtFrm ) : pFrm(pTxtFrm) { }
+    inline SwTextFrmInfo( const SwTextFrm *pTextFrm ) : pFrm(pTextFrm) { }
 
     // Does the paragraph fit into a single line?
     bool IsOneLine() const;
@@ -52,18 +52,18 @@ public:
     void GetSpaces( SwPaM &rPam, bool bWithLineBreak ) const;
 
     // Is a bullet point/symbol/etc. at the first text position?
-    bool IsBullet( sal_Int32 nTxtPos ) const;
+    bool IsBullet( sal_Int32 nTextPos ) const;
 
     // determine intentation for first line
     SwTwips GetFirstIndent() const;
 
-    const SwTxtFrm* GetFrm() const { return pFrm; }
-    SwTxtFrmInfo& SetFrm( const SwTxtFrm* pNew )
+    const SwTextFrm* GetFrm() const { return pFrm; }
+    SwTextFrmInfo& SetFrm( const SwTextFrm* pNew )
         { pFrm = pNew; return *this; }
 
     // Is it a comparison? Returns position in frame.
     sal_Int32 GetBigIndent( sal_Int32& rFndPos,
-                        const SwTxtFrm *pNextFrm = 0 ) const;
+                        const SwTextFrm *pNextFrm = 0 ) const;
 };
 
 #endif
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index f621acf6b524..cc86fdc6ebbc 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -30,7 +30,7 @@
 
 class SwPageFrm;
 class SwFlyFrm;
-class SwCntntFrm;
+class SwContentFrm;
 class SwRootFrm;
 class SwDoc;
 class SwAttrSet;
@@ -44,7 +44,7 @@ class OutputDevice;
 class GraphicObject;
 class GraphicAttr;
 class SwPageDesc;
-class SwFrmFmts;
+class SwFrameFormats;
 class SwRegionRects;
 
 #define FAR_AWAY LONG_MAX - 20000  // initial position of a Fly
@@ -53,7 +53,7 @@ class SwRegionRects;
 #define GRFNUM_YES 1
 #define GRFNUM_REPLACE 2
 
-void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex,
+void AppendObjs( const SwFrameFormats *pTable, sal_uLong nIndex,
                        SwFrm *pFrm, SwPageFrm *pPage, SwDoc* doc );
 
 // draw background with brush or graphics
@@ -102,10 +102,10 @@ void PaintCharacterBorder(
 // Implementation in feshview.cxx
 SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, SwViewShell *pSh );
 
-SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart = NULL );
-void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow );
+SwFrm *SaveContent( SwLayoutFrm *pLay, SwFrm *pStart = NULL );
+void RestoreContent( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow );
 
-// Get CntntNodes, create CntntFrms, and add them to LayFrm.
+// Get ContentNodes, create ContentFrms, and add them to LayFrm.
 void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, sal_uLong nIndex,
                  bool bPages = false, sal_uLong nEndIndex = 0,
                  SwFrm *pPrv = 0 );
@@ -125,7 +125,7 @@ long CalcRowRstHeight( SwLayoutFrm *pRow );
 long CalcHeightWithFlys( const SwFrm *pFrm );
 
 SwPageFrm *InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
-                          bool bOdd, bool bFirst, bool bInsertEmpty, bool bFtn,
+                          bool bOdd, bool bFirst, bool bInsertEmpty, bool bFootnote,
                           SwFrm *pSibling );
 
 // connect Flys with page
@@ -152,7 +152,7 @@ bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
 
 const SwFrm * FindPage( const SwRect &rRect, const SwFrm *pPage );
 
-// used by SwCntntNode::GetFrm and SwFlyFrm::GetFrm
+// used by SwContentNode::GetFrm and SwFlyFrm::GetFrm
 SwFrm* GetFrmOfModify( const SwRootFrm* pLayout,
                        SwModify const&,
                        sal_uInt16 const nFrmType,
@@ -163,8 +163,8 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout,
 // Should extra data (redline stroke, line numbers) be painted?
 bool IsExtraData( const SwDoc *pDoc );
 
-// #i11760# - method declaration <CalcCntnt(..)>
-void CalcCntnt( SwLayoutFrm *pLay,
+// #i11760# - method declaration <CalcContent(..)>
+void CalcContent( SwLayoutFrm *pLay,
                 bool bNoColl = false,
                 bool bNoCalcFollow = false );
 
@@ -225,7 +225,7 @@ public:
     SwPageFrm *GetOldPage() const { return pOldPage; }
 };
 
-class SwCntntNotify : public SwFrmNotify
+class SwContentNotify : public SwFrmNotify
 {
 private:
     // #i11859#
@@ -236,11 +236,11 @@ private:
     bool        mbInvalidatePrevPrtArea;
     bool        mbBordersJoinedWithPrev;
 
-    SwCntntFrm *GetCnt();
+    SwContentFrm *GetCnt();
 
 public:
-    SwCntntNotify( SwCntntFrm *pCntFrm );
-    ~SwCntntNotify();
+    SwContentNotify( SwContentFrm *pCntFrm );
+    ~SwContentNotify();
 
     // #i25029#
     void SetInvalidatePrevPrtArea()
@@ -545,7 +545,7 @@ void GetSpacingValuesOfFrm( const SwFrm& rFrm,
         pointer to the found content frame or 0
 */
 
-const SwCntntFrm* GetCellCntnt( const SwLayoutFrm& rCell_ );
+const SwContentFrm* GetCellContent( const SwLayoutFrm& rCell_ );
 
 /** helper class to check if a frame has been deleted during an operation
  *  WARNING! This should only be used as a last and desperate means to make the
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index c8edcc2424b9..b5dcd15cbad6 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -22,21 +22,21 @@
 
 #include "layfrm.hxx"
 
-class SwFtnBossFrm;
-class SwFtnContFrm;
-class SwFtnFrm;
-class SwTxtFtn;
+class SwFootnoteBossFrm;
+class SwFootnoteContFrm;
+class SwFootnoteFrm;
+class SwTextFootnote;
 
 // Set max. footnote area.
 // Restoration of the old value in DTor. Implementation in ftnfrm.cxx
-class SwSaveFtnHeight
+class SwSaveFootnoteHeight
 {
-    SwFtnBossFrm *pBoss;
+    SwFootnoteBossFrm *pBoss;
     const SwTwips nOldHeight;
     SwTwips nNewHeight;
 public:
-    SwSaveFtnHeight( SwFtnBossFrm *pBs, const SwTwips nDeadLine );
-    ~SwSaveFtnHeight();
+    SwSaveFootnoteHeight( SwFootnoteBossFrm *pBs, const SwTwips nDeadLine );
+    ~SwSaveFootnoteHeight();
 };
 
 #define NA_ONLY_ADJUST 0
@@ -44,93 +44,93 @@ public:
 #define NA_GROW_ADJUST 2
 #define NA_ADJUST_GROW 3
 
-typedef std::vector<SwFtnFrm*> SwFtnFrms;
+typedef std::vector<SwFootnoteFrm*> SwFootnoteFrms;
 
-class SwFtnBossFrm: public SwLayoutFrm
+class SwFootnoteBossFrm: public SwLayoutFrm
 {
     // for private footnote operations
     friend class SwFrm;
-    friend class SwSaveFtnHeight;
-    friend class SwPageFrm; // for setting of MaxFtnHeight
+    friend class SwSaveFootnoteHeight;
+    friend class SwPageFrm; // for setting of MaxFootnoteHeight
 
     // max. height of the footnote container on this page
-    SwTwips nMaxFtnHeight;
+    SwTwips nMaxFootnoteHeight;
 
-    SwFtnContFrm *MakeFtnCont();
-    SwFtnFrm     *FindFirstFtn();
+    SwFootnoteContFrm *MakeFootnoteCont();
+    SwFootnoteFrm     *FindFirstFootnote();
     sal_uInt8 _NeighbourhoodAdjustment( const SwFrm* pFrm ) const;
 
 protected:
-    void          InsertFtn( SwFtnFrm * );
-    static void   ResetFtn( const SwFtnFrm *pAssumed );
+    void          InsertFootnote( SwFootnoteFrm * );
+    static void   ResetFootnote( const SwFootnoteFrm *pAssumed );
 
 public:
-    inline SwFtnBossFrm( SwFrmFmt* pFmt, SwFrm* pSib )
-        : SwLayoutFrm( pFmt, pSib )
-        , nMaxFtnHeight(0)
+    inline SwFootnoteBossFrm( SwFrameFormat* pFormat, SwFrm* pSib )
+        : SwLayoutFrm( pFormat, pSib )
+        , nMaxFootnoteHeight(0)
         {}
 
                  SwLayoutFrm *FindBodyCont();
     inline const SwLayoutFrm *FindBodyCont() const;
-    inline void SetMaxFtnHeight( const SwTwips nNewMax ) { nMaxFtnHeight = nNewMax; }
+    inline void SetMaxFootnoteHeight( const SwTwips nNewMax ) { nMaxFootnoteHeight = nNewMax; }
 
     // footnote interface
-    void AppendFtn( SwCntntFrm *, SwTxtFtn * );
-    void RemoveFtn( const SwCntntFrm *, const SwTxtFtn *, bool bPrep = true );
-    static       SwFtnFrm     *FindFtn( const SwCntntFrm *, const SwTxtFtn * );
-                 SwFtnContFrm *FindFtnCont();
-    inline const SwFtnContFrm *FindFtnCont() const;
-           const SwFtnFrm     *FindFirstFtn( SwCntntFrm* ) const;
-                 SwFtnContFrm *FindNearestFtnCont( bool bDontLeave = false );
-
-    static void ChangeFtnRef( const SwCntntFrm *pOld, const SwTxtFtn *,
-                       SwCntntFrm *pNew );
-    void RearrangeFtns( const SwTwips nDeadLine, const bool bLock = false,
-                        const SwTxtFtn *pAttr = 0 );
+    void AppendFootnote( SwContentFrm *, SwTextFootnote * );
+    void RemoveFootnote( const SwContentFrm *, const SwTextFootnote *, bool bPrep = true );
+    static       SwFootnoteFrm     *FindFootnote( const SwContentFrm *, const SwTextFootnote * );
+                 SwFootnoteContFrm *FindFootnoteCont();
+    inline const SwFootnoteContFrm *FindFootnoteCont() const;
+           const SwFootnoteFrm     *FindFirstFootnote( SwContentFrm* ) const;
+                 SwFootnoteContFrm *FindNearestFootnoteCont( bool bDontLeave = false );
+
+    static void ChangeFootnoteRef( const SwContentFrm *pOld, const SwTextFootnote *,
+                       SwContentFrm *pNew );
+    void RearrangeFootnotes( const SwTwips nDeadLine, const bool bLock = false,
+                        const SwTextFootnote *pAttr = 0 );
 
     // Set DeadLine (in document coordinates) so that the text formatter can
     // temporarily limit footnote height.
-    void    SetFtnDeadLine( const SwTwips nDeadLine );
-    SwTwips GetMaxFtnHeight() const { return nMaxFtnHeight; }
+    void    SetFootnoteDeadLine( const SwTwips nDeadLine );
+    SwTwips GetMaxFootnoteHeight() const { return nMaxFootnoteHeight; }
 
     // returns value for remaining space until the body reaches minimal height
     SwTwips GetVarSpace() const;
 
     // methods needed for layouting
-    // The parameters <_bCollectOnlyPreviousFtns> and <_pRefFtnBossFrm> control
+    // The parameters <_bCollectOnlyPreviousFootnotes> and <_pRefFootnoteBossFrm> control
     // if only footnotes that are positioned before the given reference
     // footnote boss-frame have to be collected.
-    // Note: if parameter <_bCollectOnlyPreviousFtns> is true, then parameter
-    // <_pRefFtnBossFrm> has to be referenced by an object.
-    static void _CollectFtns( const SwCntntFrm*   _pRef,
-                              SwFtnFrm*           _pFtn,
-                              SwFtnFrms&          _rFtnArr,
-                              const bool      _bCollectOnlyPreviousFtns = false,
-                              const SwFtnBossFrm* _pRefFtnBossFrm = NULL);
-    // The parameter <_bCollectOnlyPreviousFtns> controls if only footnotes
+    // Note: if parameter <_bCollectOnlyPreviousFootnotes> is true, then parameter
+    // <_pRefFootnoteBossFrm> has to be referenced by an object.
+    static void _CollectFootnotes( const SwContentFrm*   _pRef,
+                              SwFootnoteFrm*           _pFootnote,
+                              SwFootnoteFrms&          _rFootnoteArr,
+                              const bool      _bCollectOnlyPreviousFootnotes = false,
+                              const SwFootnoteBossFrm* _pRefFootnoteBossFrm = NULL);
+    // The parameter <_bCollectOnlyPreviousFootnotes> controls if only footnotes
     // that are positioned before the footnote boss-frame <this> have to be
     // collected.
-    void    CollectFtns( const SwCntntFrm* _pRef,
-                         SwFtnBossFrm*     _pOld,
-                         SwFtnFrms&        _rFtnArr,
-                         const bool    _bCollectOnlyPreviousFtns = false );
-    void    _MoveFtns( SwFtnFrms &rFtnArr, bool bCalc = false );
-    void    MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
-                      SwTxtFtn *pAttr );
+    void    CollectFootnotes( const SwContentFrm* _pRef,
+                         SwFootnoteBossFrm*     _pOld,
+                         SwFootnoteFrms&        _rFootnoteArr,
+                         const bool    _bCollectOnlyPreviousFootnotes = false );
+    void    _MoveFootnotes( SwFootnoteFrms &rFootnoteArr, bool bCalc = false );
+    void    MoveFootnotes( const SwContentFrm *pSrc, SwContentFrm *pDest,
+                      SwTextFootnote *pAttr );
 
     // should AdjustNeighbourhood be called (or Grow/Shrink)?
     sal_uInt8 NeighbourhoodAdjustment( const SwFrm* pFrm ) const
         { return IsPageFrm() ? NA_ONLY_ADJUST : _NeighbourhoodAdjustment( pFrm ); }
 };
 
-inline const SwLayoutFrm *SwFtnBossFrm::FindBodyCont() const
+inline const SwLayoutFrm *SwFootnoteBossFrm::FindBodyCont() const
 {
-    return const_cast<SwFtnBossFrm*>(this)->FindBodyCont();
+    return const_cast<SwFootnoteBossFrm*>(this)->FindBodyCont();
 }
 
-inline const SwFtnContFrm *SwFtnBossFrm::FindFtnCont() const
+inline const SwFootnoteContFrm *SwFootnoteBossFrm::FindFootnoteCont() const
 {
-    return const_cast<SwFtnBossFrm*>(this)->FindFtnCont();
+    return const_cast<SwFootnoteBossFrm*>(this)->FindFootnoteCont();
 }
 
 #endif
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index f50ffdc6fdb8..e9b2d3cb23f0 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -22,23 +22,23 @@
 
 #include "layfrm.hxx"
 
-class SwCntntFrm;
-class SwTxtFtn;
+class SwContentFrm;
+class SwTextFootnote;
 class SwBorderAttrs;
-class SwFtnFrm;
+class SwFootnoteFrm;
 
-void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes );
+void sw_RemoveFootnotes( SwFootnoteBossFrm* pBoss, bool bPageOnly, bool bEndNotes );
 
 // There exists a special section on a page for footnotes. It's called
-// SwFtnContFrm. Each footnote is separated by a SwFtnFrm which contains
-// the paragraphs of a footnote. SwFtnFrm can be splitted and will then
+// SwFootnoteContFrm. Each footnote is separated by a SwFootnoteFrm which contains
+// the paragraphs of a footnote. SwFootnoteFrm can be splitted and will then
 // continue on another page.
-class SwFtnContFrm: public SwLayoutFrm
+class SwFootnoteContFrm: public SwLayoutFrm
 {
 public:
-    SwFtnContFrm( SwFrmFmt*, SwFrm* );
+    SwFootnoteContFrm( SwFrameFormat*, SwFrm* );
 
-    const SwFtnFrm* FindFootNote() const;
+    const SwFootnoteFrm* FindFootNote() const;
 
     virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
     virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
@@ -49,16 +49,16 @@ public:
             void    PaintLine( const SwRect &, const SwPageFrm * ) const;
 };
 
-class SwFtnFrm: public SwLayoutFrm
+class SwFootnoteFrm: public SwLayoutFrm
 {
-    // Pointer to FtnFrm in which the footnote will be continued:
+    // Pointer to FootnoteFrm in which the footnote will be continued:
     //  - 0     no following existent
     //  - this  for the last one
-    //  - otherwise the following FtnFrm
-    SwFtnFrm     *pFollow;
-    SwFtnFrm     *pMaster;      // FtnFrm from which I am the following
-    SwCntntFrm   *pRef;         // in this CntntFrm is the footnote reference
-    SwTxtFtn     *pAttr;        // footnote attribute (for recognition)
+    //  - otherwise the following FootnoteFrm
+    SwFootnoteFrm     *pFollow;
+    SwFootnoteFrm     *pMaster;      // FootnoteFrm from which I am the following
+    SwContentFrm   *pRef;         // in this ContentFrm is the footnote reference
+    SwTextFootnote     *pAttr;        // footnote attribute (for recognition)
 
     // if true paragraphs in this footnote are NOT permitted to flow backwards
     bool bBackMoveLocked : 1;
@@ -71,45 +71,45 @@ protected:
 #endif
 
 public:
-    SwFtnFrm( SwFrmFmt*, SwFrm*, SwCntntFrm*, SwTxtFtn* );
+    SwFootnoteFrm( SwFrameFormat*, SwFrm*, SwContentFrm*, SwTextFootnote* );
 
     virtual void Cut() SAL_OVERRIDE;
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
 
     virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
 
-    bool operator<( const SwTxtFtn* pTxtFtn ) const;
+    bool operator<( const SwTextFootnote* pTextFootnote ) const;
 
 #ifdef DBG_UTIL
-    const SwCntntFrm *GetRef() const;
-         SwCntntFrm  *GetRef();
+    const SwContentFrm *GetRef() const;
+         SwContentFrm  *GetRef();
 #else
-    const SwCntntFrm *GetRef() const    { return pRef; }
-         SwCntntFrm  *GetRef()          { return pRef; }
+    const SwContentFrm *GetRef() const    { return pRef; }
+         SwContentFrm  *GetRef()          { return pRef; }
 #endif
-    const SwCntntFrm *GetRefFromAttr()  const;
-          SwCntntFrm *GetRefFromAttr();
+    const SwContentFrm *GetRefFromAttr()  const;
+          SwContentFrm *GetRefFromAttr();
 
-    const SwFtnFrm *GetFollow() const   { return pFollow; }
-          SwFtnFrm *GetFollow()         { return pFollow; }
+    const SwFootnoteFrm *GetFollow() const   { return pFollow; }
+          SwFootnoteFrm *GetFollow()         { return pFollow; }
 
-    const SwFtnFrm *GetMaster() const   { return pMaster; }
-          SwFtnFrm *GetMaster()         { return pMaster; }
+    const SwFootnoteFrm *GetMaster() const   { return pMaster; }
+          SwFootnoteFrm *GetMaster()         { return pMaster; }
 
-    const SwTxtFtn   *GetAttr() const   { return pAttr; }
-          SwTxtFtn   *GetAttr()         { return pAttr; }
+    const SwTextFootnote   *GetAttr() const   { return pAttr; }
+          SwTextFootnote   *GetAttr()         { return pAttr; }
 
-    void SetFollow( SwFtnFrm *pNew ) { pFollow = pNew; }
-    void SetMaster( SwFtnFrm *pNew ) { pMaster = pNew; }
-    void SetRef   ( SwCntntFrm *pNew ) { pRef = pNew; }
+    void SetFollow( SwFootnoteFrm *pNew ) { pFollow = pNew; }
+    void SetMaster( SwFootnoteFrm *pNew ) { pMaster = pNew; }
+    void SetRef   ( SwContentFrm *pNew ) { pRef = pNew; }
 
-    void InvalidateNxtFtnCnts( SwPageFrm* pPage );
+    void InvalidateNxtFootnoteCnts( SwPageFrm* pPage );
 
     void LockBackMove()     { bBackMoveLocked = true; }
     void UnlockBackMove()   { bBackMoveLocked = false;}
     bool IsBackMoveLocked() { return bBackMoveLocked; }
 
-    // prevents that the last content deletes the SwFtnFrm as well (Cut())
+    // prevents that the last content deletes the SwFootnoteFrm as well (Cut())
     inline void ColLock()       { mbColLocked = true; }
     inline void ColUnlock()     { mbColLocked = false; }
 
@@ -131,10 +131,10 @@ public:
 
         OD 2005-12-02 #i27138#
 
-        @return SwCntntFrm*
+        @return SwContentFrm*
         pointer to found last content frame. NULL, if none is found.
     */
-    SwCntntFrm* FindLastCntnt();
+    SwContentFrm* FindLastContent();
 };
 
 #endif
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index e9e30969ccd8..093c4666588e 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -31,7 +31,7 @@ protected:
     inline bool GetEatSpacing() const; // in hffrm.cxx
 
 public:
-    SwHeadFootFrm(SwFrmFmt * pFrm, SwFrm*, sal_uInt16 aType);
+    SwHeadFootFrm(SwFrameFormat * pFrm, SwFrm*, sal_uInt16 aType);
     virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
     virtual SwTwips GrowFrm( SwTwips,
                              bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
@@ -44,7 +44,7 @@ public:
 class SwHeaderFrm: public SwHeadFootFrm
 {
 public:
-    SwHeaderFrm( SwFrmFmt* pFrm, SwFrm* pSib ) : SwHeadFootFrm(pFrm, pSib, FRM_HEADER) {};
+    SwHeaderFrm( SwFrameFormat* pFrm, SwFrm* pSib ) : SwHeadFootFrm(pFrm, pSib, FRM_HEADER) {};
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwHeaderFrm)
 };
@@ -53,7 +53,7 @@ public:
 class SwFooterFrm: public SwHeadFootFrm
 {
 public:
-    SwFooterFrm( SwFrmFmt* pFrm, SwFrm* pSib ) : SwHeadFootFrm(pFrm, pSib, FRM_FOOTER) {};
+    SwFooterFrm( SwFrameFormat* pFrm, SwFrm* pSib ) : SwHeadFootFrm(pFrm, pSib, FRM_FOOTER) {};
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwFooterFrm)
 };
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index a08fec3dbdd4..697762729625 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -30,10 +30,10 @@ class SwRootFrm;
 class SwLayoutFrm;
 class SwPageFrm;
 class SwFlyFrm;
-class SwCntntFrm;
+class SwContentFrm;
 class SwTabFrm;
 class SwViewShellImp;
-class SwCntntNode;
+class SwContentNode;
 class SwWait;
 
 /**
@@ -56,7 +56,7 @@ class SwLayAction
     // For the sake of optimization, so that the tables stick a bit better to
     // the Crsr when hitting return/backspace in front of one.
     // The first TabFrm that paints itself (per page) adds itself to the pointer.
-    // The CntntFrms beneath the page do not need to deregister at the Shell for
+    // The ContentFrms beneath the page do not need to deregister at the Shell for
     // painting.
     const SwTabFrm *pOptTab;
 
@@ -84,31 +84,31 @@ class SwLayAction
     bool bIdle;          // True if the LayAction was triggered by the Idler
     bool bReschedule;    // Call Reschedule depending on Progress?
     bool bCheckPages;    // Run CheckPageDescs() or delay it
-    bool bUpdateExpFlds; // Is set if, after Formatting, we need to do another round for ExpFld
+    bool bUpdateExpFields; // Is set if, after Formatting, we need to do another round for ExpField
     bool bBrowseActionStop; // Terminate Action early (as per bInput) and leave the rest to the Idler
     bool bWaitAllowed;      // Waitcursor allowed?
     bool bPaintExtraData;   // Painting line numbers (or similar) enabled?
     bool bActionInProgress; // Is set in Action() at the beginning and deleted at the end
 
     // OD 14.04.2003 #106346# - new flag for content formatting on interrupt.
-    bool    mbFormatCntntOnInterrupt;
+    bool    mbFormatContentOnInterrupt;
 
-    void PaintCntnt( const SwCntntFrm *, const SwPageFrm *,
+    void PaintContent( const SwContentFrm *, const SwPageFrm *,
                      const SwRect &rOldRect, long nOldBottom );
-    bool PaintWithoutFlys( const SwRect &, const SwCntntFrm *,
+    bool PaintWithoutFlys( const SwRect &, const SwContentFrm *,
                            const SwPageFrm * );
-    inline bool _PaintCntnt( const SwCntntFrm *, const SwPageFrm *,
+    inline bool _PaintContent( const SwContentFrm *, const SwPageFrm *,
                              const SwRect & );
 
     bool FormatLayout( SwLayoutFrm *, bool bAddRect = true );
     bool FormatLayoutTab( SwTabFrm *, bool bAddRect = true );
-    bool FormatCntnt( const SwPageFrm* pPage );
-    void _FormatCntnt( const SwCntntFrm* pCntnt,
+    bool FormatContent( const SwPageFrm* pPage );
+    void _FormatContent( const SwContentFrm* pContent,
                        const SwPageFrm* pPage );
     bool IsShortCut( SwPageFrm *& );
 
     bool TurboAction();
-    bool _TurboAction( const SwCntntFrm * );
+    bool _TurboAction( const SwContentFrm * );
     void InternalAction();
 
     static SwPageFrm *CheckFirstVisPage( SwPageFrm *pPage );
@@ -149,7 +149,7 @@ public:
     void SetWaitAllowed ( bool bNew )   { bWaitAllowed = bNew; }
 
     void SetAgain()         { bAgain = true; }
-    void SetUpdateExpFlds() {bUpdateExpFlds = true; }
+    void SetUpdateExpFields() {bUpdateExpFields = true; }
 
     inline void SetCheckPageNum( sal_uInt16 nNew );
     inline void SetCheckPageNumDirect( sal_uInt16 nNew ) { nCheckPageNum = nNew; }
@@ -159,7 +159,7 @@ public:
 
     bool IsAgain()      const { return bAgain; }
     bool IsComplete()   const { return bComplete; }
-    bool IsExpFlds()    const { return bUpdateExpFlds; }
+    bool IsExpFields()    const { return bUpdateExpFields; }
     bool IsCalcLayout() const { return bCalcLayout;  }
     bool IsCheckPages() const { return bCheckPages;  }
     bool IsBrowseActionStop() const { return bBrowseActionStop; }
@@ -174,7 +174,7 @@ public:
     // delete 2nd parameter, because its not used;
     bool FormatLayoutFly( SwFlyFrm * );
     // #i28701# - method is now public
-    bool _FormatFlyCntnt( const SwFlyFrm * );
+    bool _FormatFlyContent( const SwFlyFrm * );
 
 };
 
@@ -183,8 +183,8 @@ class SwLayIdle
 
     SwRootFrm *pRoot;
     SwViewShellImp  *pImp;           // The Idler registers and deregisters here
-    SwCntntNode *pCntntNode;    // The current cursor position is saved here
-    sal_Int32  nTxtPos;
+    SwContentNode *pContentNode;    // The current cursor position is saved here
+    sal_Int32  nTextPos;
     bool        bPageValid;     // Were we able to evaluate everything on the whole page?
     bool        bAllValid;      // Were we able to evaluate everything?
 
@@ -197,7 +197,7 @@ class SwLayIdle
 #endif
 
     enum IdleJobType{ ONLINE_SPELLING, AUTOCOMPLETE_WORDS, WORD_COUNT, SMART_TAGS };
-    bool _DoIdleJob( const SwCntntFrm*, IdleJobType );
+    bool _DoIdleJob( const SwContentFrm*, IdleJobType );
     bool DoIdleJob( IdleJobType, bool bVisAreaOnly );
 
 public:
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 599925f189f8..e61fbf718a69 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -22,13 +22,13 @@
 #include "frame.hxx"
 
 class SwAnchoredObject;
-class SwCntntFrm;
+class SwContentFrm;
 class SwFlowFrm;
-class SwFmtCol;
+class SwFormatCol;
 struct SwCrsrMoveState;
-class SwFrmFmt;
+class SwFrameFormat;
 class SwBorderAttrs;
-class SwFmtFrmSize;
+class SwFormatFrmSize;
 class SwCellFrm;
 
 class SwLayoutFrm: public SwFrm
@@ -38,8 +38,8 @@ class SwLayoutFrm: public SwFrm
     friend class SwFrm;
 
     // Releases the Lower while restructuring columns
-    friend SwFrm* SaveCntnt( SwLayoutFrm *, SwFrm * );
-    friend void   RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow );
+    friend SwFrm* SaveContent( SwLayoutFrm *, SwFrm * );
+    friend void   RestoreContent( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow );
 
 #ifdef DBG_UTIL
     //removes empty SwSectionFrms from a chain
@@ -62,7 +62,7 @@ protected:
     virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
     virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
 
-    long CalcRel( const SwFmtFrmSize &rSz, bool bWidth ) const;
+    long CalcRel( const SwFormatFrmSize &rSz, bool bWidth ) const;
 
 public:
     // --> #i28701#
@@ -75,13 +75,13 @@ public:
     /// Change size of lowers proportionally
     void ChgLowersProp( const Size& rOldSize );
 
-    void AdjustColumns( const SwFmtCol *pCol, bool bAdjustAttributes );
+    void AdjustColumns( const SwFormatCol *pCol, bool bAdjustAttributes );
 
-    void ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
-        const bool bChgFtn = false );
+    void ChgColumns( const SwFormatCol &rOld, const SwFormatCol &rNew,
+        const bool bChgFootnote = false );
 
     /// Paints the column separation line for the inner columns
-    void PaintColLines( const SwRect &, const SwFmtCol &,
+    void PaintColLines( const SwRect &, const SwFormatCol &,
                         const SwPageFrm * ) const;
 
     virtual bool    FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE;
@@ -93,49 +93,49 @@ public:
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
 
     /**
-     * Finds the closest Cntnt for the SPoint
+     * Finds the closest Content for the SPoint
      * Is used for Pages, Flys and Cells if GetCrsrOfst failed
      */
-    const SwCntntFrm* GetCntntPos( Point &rPoint, const bool bDontLeave,
+    const SwContentFrm* GetContentPos( Point &rPoint, const bool bDontLeave,
                                    const bool bBodyOnly = false,
                                    const bool bCalc = false,
                                    const SwCrsrMoveState *pCMS = 0,
                                    const bool bDefaultExpand = true ) const;
 
-    SwLayoutFrm( SwFrmFmt*, SwFrm* );
+    SwLayoutFrm( SwFrameFormat*, SwFrm* );
 
     virtual void Paint( SwRect const&,
                         SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
     const SwFrm *Lower() const { return m_pLower; }
           SwFrm *Lower()       { return m_pLower; }
-    const SwCntntFrm *ContainsCntnt() const;
-    inline SwCntntFrm *ContainsCntnt();
+    const SwContentFrm *ContainsContent() const;
+    inline SwContentFrm *ContainsContent();
     const SwCellFrm *FirstCell() const;
     inline SwCellFrm *FirstCell();
 
     /**
      * Method <ContainsAny()> doesn't investigate content of footnotes by default.
      * But under certain circumstances this investigation is intended.
-     * Thus, introduce new optional parameter <_bInvestigateFtnForSections>.
+     * Thus, introduce new optional parameter <_bInvestigateFootnoteForSections>.
      * It's default is <false>, still indicating that content of footnotes isn't
      * investigated for sections.
      */
-    const SwFrm *ContainsAny( const bool _bInvestigateFtnForSections = false ) const;
-    inline SwFrm *ContainsAny( const bool _bInvestigateFtnForSections = false );
+    const SwFrm *ContainsAny( const bool _bInvestigateFootnoteForSections = false ) const;
+    inline SwFrm *ContainsAny( const bool _bInvestigateFootnoteForSections = false );
     bool IsAnLower( const SwFrm * ) const;
 
-    virtual const SwFrmFmt *GetFmt() const;
-    virtual       SwFrmFmt *GetFmt();
-    void        SetFrmFmt( SwFrmFmt* );
+    virtual const SwFrameFormat *GetFormat() const;
+    virtual       SwFrameFormat *GetFormat();
+    void        SetFrameFormat( SwFrameFormat* );
 
     /**
-     * Moving the Ftns of all Lowers - starting from StartCntnt
+     * Moving the Footnotes of all Lowers - starting from StartContent
      *
-     * @returns true if at least one Ftn was moved
-     * Calls the page number update if bFtnNums is set
+     * @returns true if at least one Footnote was moved
+     * Calls the page number update if bFootnoteNums is set
      */
-    bool MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
-                        SwFtnBossFrm *pNewBoss, const bool bFtnNums );
+    bool MoveLowerFootnotes( SwContentFrm *pStart, SwFootnoteBossFrm *pOldBoss,
+                        SwFootnoteBossFrm *pNewBoss, const bool bFootnoteNums );
 
     // --> #i28701# - change purpose of method and its name
     // --> #i44016# - add parameter <_bUnlockPosOfObjs> to
@@ -196,9 +196,9 @@ public:
  * In order to save us from duplicating implementations, we cast here
  * a little.
  */
-inline SwCntntFrm* SwLayoutFrm::ContainsCntnt()
+inline SwContentFrm* SwLayoutFrm::ContainsContent()
 {
-    return const_cast<SwCntntFrm*>(static_cast<const SwLayoutFrm*>(this)->ContainsCntnt());
+    return const_cast<SwContentFrm*>(static_cast<const SwLayoutFrm*>(this)->ContainsContent());
 }
 
 inline SwCellFrm* SwLayoutFrm::FirstCell()
@@ -206,9 +206,9 @@ inline SwCellFrm* SwLayoutFrm::FirstCell()
     return const_cast<SwCellFrm*>(static_cast<const SwLayoutFrm*>(this)->FirstCell());
 }
 
-inline SwFrm* SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections )
+inline SwFrm* SwLayoutFrm::ContainsAny( const bool _bInvestigateFootnoteForSections )
 {
-    return const_cast<SwFrm*>(static_cast<const SwLayoutFrm*>(this)->ContainsAny( _bInvestigateFtnForSections ));
+    return const_cast<SwFrm*>(static_cast<const SwLayoutFrm*>(this)->ContainsAny( _bInvestigateFootnoteForSections ));
 }
 
 /**
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 54def9bac371..8fd42289273b 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -25,12 +25,12 @@
 class SwEndnoter;
 class SwDoc;
 class SwSectionFrm;
-class SwFtnFrm;
+class SwFootnoteFrm;
 class SwPageFrm;
 class SwLooping;
 
 class SwMovedFwdFrmsByObjPos;
-class SwTxtFrm;
+class SwTextFrm;
 class SwRowFrm;
 class SwObjsMarkedAsTmpConsiderWrapInfluence;
 class SwAnchoredObject;
@@ -96,28 +96,28 @@ public:
     SwLayouter();
     ~SwLayouter();
     void InsertEndnotes( SwSectionFrm* pSect );
-    void CollectEndnote( SwFtnFrm* pFtn );
+    void CollectEndnote( SwFootnoteFrm* pFootnote );
     bool HasEndnotes() const;
 
     void LoopControl( SwPageFrm* pPage, sal_uInt8 nLoop );
     void EndLoopControl();
-    void LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm );
+    void LoopingLouieLight( const SwDoc& rDoc, const SwTextFrm& rFrm );
 
     static void CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect );
-    static bool Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn );
+    static bool Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFootnoteFrm* pFootnote );
     static bool StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage );
 
     // --> #i28701#
     static void ClearMovedFwdFrms( const SwDoc& _rDoc );
     static void InsertMovedFwdFrm( const SwDoc& _rDoc,
-                                   const SwTxtFrm& _rMovedFwdFrmByObjPos,
+                                   const SwTextFrm& _rMovedFwdFrmByObjPos,
                                    const sal_uInt32 _nToPageNum );
     static bool FrmMovedFwdByObjPos( const SwDoc& _rDoc,
-                                     const SwTxtFrm& _rTxtFrm,
+                                     const SwTextFrm& _rTextFrm,
                                      sal_uInt32& _ornToPageNum );
     // --> #i40155# - ummark given frame as to be moved forward.
     static void RemoveMovedFwdFrm( const SwDoc& _rDoc,
-                                   const SwTxtFrm& _rTxtFrm );
+                                   const SwTextFrm& _rTextFrm );
     // --> #i26945#
     static bool DoesRowContainMovedFwdFrm( const SwDoc& _rDoc,
                                            const SwRowFrm& _rRowFrm );
@@ -134,7 +134,7 @@ public:
     static void ClearMoveBwdLayoutInfo( const SwDoc& p_rDoc );
 };
 
-extern void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm& rTxtFrm );
+extern void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTextFrm& rTextFrm );
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
 
diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
index c1d83d9f9e20..86b5afe70ced 100644
--- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
+++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
@@ -22,13 +22,13 @@
 #include <map>
 #include <sal/types.h>
 
-class SwTxtNode;
-class SwTxtFrm;
+class SwTextNode;
+class SwTextFrm;
 // --> #i26945#
 class SwRowFrm;
 
-typedef std::map< const SwTxtNode*, const sal_uInt32 > NodeMap;
-typedef std::map< const SwTxtNode*, const sal_uInt32 >::const_iterator NodeMapIter;
+typedef std::map< const SwTextNode*, const sal_uInt32 > NodeMap;
+typedef std::map< const SwTextNode*, const sal_uInt32 >::const_iterator NodeMapIter;
 typedef NodeMap::value_type NodeMapEntry;
 
 class SwMovedFwdFrmsByObjPos
@@ -40,13 +40,13 @@ class SwMovedFwdFrmsByObjPos
         SwMovedFwdFrmsByObjPos();
         ~SwMovedFwdFrmsByObjPos();
 
-        void Insert( const SwTxtFrm& _rMovedFwdFrmByObjPos,
+        void Insert( const SwTextFrm& _rMovedFwdFrmByObjPos,
                      const sal_uInt32 _nToPageNum );
 
         // --> #i40155#
-        void Remove( const SwTxtFrm& _rTxtFrm );
+        void Remove( const SwTextFrm& _rTextFrm );
 
-        bool FrmMovedFwdByObjPos( const SwTxtFrm& _rTxtFrm,
+        bool FrmMovedFwdByObjPos( const SwTextFrm& _rTextFrm,
                                   sal_uInt32& _ornToPageNum ) const;
 
         // --> #i26945#
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 412f2902852d..09d09ec1f737 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -30,8 +30,8 @@ namespace sfx2 {
 
 class SvNumberFormatter;
 class SwDoc;
-class SwFmtAnchor;
-class SwFrmFmt;
+class SwFormatAnchor;
+class SwFrameFormat;
 class SwIndex;
 class SwNodeIndex;
 class SwNodeRange;
@@ -66,22 +66,22 @@ namespace sw { namespace mark
             IDocumentMarkAccess::MarkType m_eOrigBkmType;
             sal_uLong m_nNode1;
             sal_uLong m_nNode2;
-            sal_Int32 m_nCntnt1;
-            sal_Int32 m_nCntnt2;
+            sal_Int32 m_nContent1;
+            sal_Int32 m_nContent2;
             std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndo;
     };
 
-    /// Takes care of storing relevant attributes of an SwTxtNode before split, then restore them on the new node.
-    class CntntIdxStore
+    /// Takes care of storing relevant attributes of an SwTextNode before split, then restore them on the new node.
+    class ContentIdxStore
     {
         public:
             virtual void Clear() =0;
             virtual bool Empty() =0;
-            virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit=false) =0;
+            virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit=false) =0;
             virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nOffset=0, bool bAuto = false) =0;
             virtual void Restore(SwNode& rNd, sal_Int32 nLen, sal_Int32 nCorrLen) =0;
-            virtual ~CntntIdxStore() {};
-            static std::shared_ptr<CntntIdxStore> Create();
+            virtual ~ContentIdxStore() {};
+            static std::shared_ptr<ContentIdxStore> Create();
     };
 }}
 
@@ -96,11 +96,11 @@ void _DelBookmarks(const SwNodeIndex& rStt,
 struct _SaveFly
 {
     sal_uLong nNdDiff;      /// relative node difference
-    SwFrmFmt* pFrmFmt;      /// the fly's frame format
+    SwFrameFormat* pFrameFormat;      /// the fly's frame format
     bool bInsertPosition;   /// if true, anchor _at_ insert position
 
-    _SaveFly( sal_uLong nNodeDiff, SwFrmFmt* pFmt, bool bInsert )
-        : nNdDiff( nNodeDiff ), pFrmFmt( pFmt ), bInsertPosition( bInsert )
+    _SaveFly( sal_uLong nNodeDiff, SwFrameFormat* pFormat, bool bInsert )
+        : nNdDiff( nNodeDiff ), pFrameFormat( pFormat ), bInsertPosition( bInsert )
     { }
 };
 
@@ -121,7 +121,7 @@ class SwDataChanged
     const SwPosition* pPos;
     SwDoc* pDoc;
     sal_uLong nNode;
-    sal_Int32 nCntnt;
+    sal_Int32 nContent;
 
 public:
     SwDataChanged( const SwPaM& rPam );
@@ -129,7 +129,7 @@ public:
     ~SwDataChanged();
 
     sal_uLong GetNode() const           { return nNode; }
-    sal_Int32 GetCntnt() const { return nCntnt; }
+    sal_Int32 GetContent() const { return nContent; }
 };
 
 /**
@@ -151,16 +151,16 @@ void PaMCorrRel( const SwNodeIndex &rOldNode,
  */
 class _ZSortFly
 {
-    const SwFrmFmt* pFmt;
-    const SwFmtAnchor* pAnchor;
+    const SwFrameFormat* pFormat;
+    const SwFormatAnchor* pAnchor;
     sal_uInt32 nOrdNum;
 
 public:
-    _ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAnchor,
+    _ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAnchor,
                 sal_uInt32 nArrOrdNum );
     _ZSortFly& operator=( const _ZSortFly& rCpy )
     {
-        pFmt = rCpy.pFmt, pAnchor = rCpy.pAnchor, nOrdNum = rCpy.nOrdNum;
+        pFormat = rCpy.pFormat, pAnchor = rCpy.pAnchor, nOrdNum = rCpy.nOrdNum;
         return *this;
     }
 
@@ -168,27 +168,27 @@ public:
     bool operator<( const _ZSortFly& rCmp ) const
         { return nOrdNum < rCmp.nOrdNum; }
 
-    const SwFrmFmt* GetFmt() const              { return pFmt; }
-    const SwFmtAnchor* GetAnchor() const        { return pAnchor; }
+    const SwFrameFormat* GetFormat() const              { return pFormat; }
+    const SwFormatAnchor* GetAnchor() const        { return pAnchor; }
 };
 
-class SwTblNumFmtMerge
+class SwTableNumFormatMerge
 {
-    SvNumberFormatter* pNFmt;
+    SvNumberFormatter* pNFormat;
 public:
-    SwTblNumFmtMerge( const SwDoc& rSrc, SwDoc& rDest );
-    ~SwTblNumFmtMerge();
+    SwTableNumFormatMerge( const SwDoc& rSrc, SwDoc& rDest );
+    ~SwTableNumFormatMerge();
 };
 
 class _SaveRedlEndPosForRestore
 {
     std::vector<SwPosition*>* pSavArr;
     SwNodeIndex* pSavIdx;
-    sal_Int32 nSavCntnt;
+    sal_Int32 nSavContent;
 
     void _Restore();
 public:
-    _SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nCntnt );
+    _SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nContent );
     ~_SaveRedlEndPosForRestore();
     void Restore() { if( pSavArr ) _Restore(); }
 };
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index 04a670897aaa..12a91dd8f917 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -21,12 +21,12 @@
 
 #include <cntfrm.hxx>
 
-class SwNoTxtNode;
+class SwNoTextNode;
 class OutputDevice;
 class SwBorderAttrs;
 struct SwCrsrMoveState;
 
-class SwNoTxtFrm: public SwCntntFrm
+class SwNoTextFrm: public SwContentFrm
 {
     friend void _FrmFinit();
 
@@ -38,13 +38,13 @@ class SwNoTxtFrm: public SwCntntFrm
     void PaintPicture( vcl::RenderContext*, const SwRect& ) const;
 
     virtual void DestroyImpl() SAL_OVERRIDE;
-    virtual ~SwNoTxtFrm();
+    virtual ~SwNoTextFrm();
 
 protected:
     virtual void MakeAll() SAL_OVERRIDE;
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
 public:
-    SwNoTxtFrm( SwNoTxtNode * const, SwFrm* );
+    SwNoTextFrm( SwNoTextNode * const, SwFrm* );
 
     virtual void Paint( SwRect const&,
                         SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx
index f6967599f2c4..8580719d1ca4 100644
--- a/sw/source/core/inc/objectformatter.hxx
+++ b/sw/source/core/inc/objectformatter.hxx
@@ -23,7 +23,7 @@
 
 class SwFrm;
 // #i26945#
-class SwTxtFrm;
+class SwTextFrm;
 class SwLayoutFrm;
 class SwPageFrm;
 class SwAnchoredObject;
@@ -73,7 +73,7 @@ class SwObjectFormatter
 
             #i28701#
         */
-        void _FormatObjCntnt( SwAnchoredObject& _rAnchoredObj );
+        void _FormatObjContent( SwAnchoredObject& _rAnchoredObj );
 
     protected:
         SwObjectFormatter( const SwPageFrm& _rPageFrm,
@@ -129,10 +129,10 @@ class SwObjectFormatter
             Thus, the objects, whose anchor character is inside the follow text
             frame can be formatted.
 
-            @param _pMasterTxtFrm
+            @param _pMasterTextFrm
             input parameter - pointer to 'master' text frame. default value: NULL
         */
-        bool _FormatObjsAtFrm( SwTxtFrm* _pMasterTxtFrm = 0L );
+        bool _FormatObjsAtFrm( SwTextFrm* _pMasterTextFrm = 0L );
 
         /** accessor to collected anchored object
 
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 1f19ce7f6e44..1023beea9ac4 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -26,9 +26,9 @@
 #include <SidebarWindowsTypes.hxx>
 
 class SwFlyFrm;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
 class SwPageDesc;
-class SwCntntFrm;
+class SwContentFrm;
 struct SwPosition;
 struct SwCrsrMoveState;
 class SwAttrSetChg;
@@ -44,7 +44,7 @@ enum SwPageChg
 };
 
 /// A page of the document layout.
-class SwPageFrm: public SwFtnBossFrm
+class SwPageFrm: public SwFootnoteBossFrm
 {
     friend class SwFrm;
 
@@ -54,12 +54,12 @@ class SwPageFrm: public SwFtnBossFrm
 
     sal_uInt16  nPhyPageNum; // Physical page number
 
-    bool bInvalidCntnt        :1;
+    bool bInvalidContent        :1;
     bool bInvalidLayout       :1;
-    bool bInvalidFlyCntnt     :1;
+    bool bInvalidFlyContent     :1;
     bool bInvalidFlyLayout    :1;
     bool bInvalidFlyInCnt     :1;
-    bool bFtnPage             :1; // This Page is for document end footnotes
+    bool bFootnotePage             :1; // This Page is for document end footnotes
     bool bEmptyPage           :1; // This Page is an explicitly empty page
     bool bEndNotePage         :1; // 'Footnote page' for end notes
     bool bInvalidSpelling     :1; // We need online spelling
@@ -74,7 +74,7 @@ class SwPageFrm: public SwFtnBossFrm
                       SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
 
     /// Adapt the max. footnote height in each single column
-    void SetColMaxFtnHeight();
+    void SetColMaxFootnoteHeight();
 
     /** determine rectangle for horizontal page shadow
 
@@ -112,7 +112,7 @@ protected:
 public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwPageFrm)
 
-    SwPageFrm( SwFrmFmt*, SwFrm*, SwPageDesc* );
+    SwPageFrm( SwFrameFormat*, SwFrm*, SwPageDesc* );
 
     /// Make this public, so that the SwViewShell can access it when switching from browse mode
     /// Add/remove header/footer
@@ -129,28 +129,28 @@ public:
     void RemoveFlyFromPage( SwFlyFrm *pToRemove );
     void MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest ); // Optimized Remove/Append
 
-    void  SetPageDesc( SwPageDesc *, SwFrmFmt * );
+    void  SetPageDesc( SwPageDesc *, SwFrameFormat * );
           SwPageDesc *GetPageDesc() { return pDesc; }
     const SwPageDesc *GetPageDesc() const { return pDesc; }
           SwPageDesc *FindPageDesc();
 
-                 SwCntntFrm  *FindLastBodyCntnt();
-    inline       SwCntntFrm  *FindFirstBodyCntnt();
-    inline const SwCntntFrm  *FindFirstBodyCntnt() const;
-    inline const SwCntntFrm  *FindLastBodyCntnt() const;
+                 SwContentFrm  *FindLastBodyContent();
+    inline       SwContentFrm  *FindFirstBodyContent();
+    inline const SwContentFrm  *FindFirstBodyContent() const;
+    inline const SwContentFrm  *FindLastBodyContent() const;
 
     SwRect GetBoundRect() const;
 
-    // Specialized GetCntntPos() for Field in Frames
-    void GetCntntPosition( const Point &rPt, SwPosition &rPos ) const;
+    // Specialized GetContentPos() for Field in Frames
+    void GetContentPosition( const Point &rPt, SwPosition &rPos ) const;
 
     bool IsEmptyPage() const { return bEmptyPage; } // Explicitly empty page
 
-    void    UpdateFtnNum();
+    void    UpdateFootnoteNum();
 
     /// Always call after Paste
     /// Creates the page-bound frames and formats the generic content
-    void PreparePage( bool bFtn );
+    void PreparePage( bool bFootnote );
 
     // Sends a Prepare() to all ContentFrames caused by a changed register template
     void PrepareRegisterChg();
@@ -158,10 +158,10 @@ public:
     // Appends a fly frame - the given one or a new one - at the page frame.
     // Needed for <Modify> and <MakeFrms>
     // - return value not needed any more
-    // - second parameter is of type <SwFlyFrmFmt*>
+    // - second parameter is of type <SwFlyFrameFormat*>
     // - third parameter only needed for assertion, but calling method assures
     //   this assertion. Thus, delete it.
-    void PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt );
+    void PlaceFly( SwFlyFrm* pFly, SwFlyFrameFormat* pFormat );
 
     virtual bool GetCrsrOfst( SwPosition *, Point&,
                               SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE;
@@ -186,9 +186,9 @@ public:
     void RefreshSubsidiary( const SwRect& ) const;
 
     /// Foot note interface
-    bool IsFtnPage() const                          { return bFtnPage; }
+    bool IsFootnotePage() const                          { return bFootnotePage; }
     bool IsEndNotePage() const                      { return bEndNotePage; }
-    void SetFtnPage( bool b )                       { bFtnPage = b; }
+    void SetFootnotePage( bool b )                       { bFootnotePage = b; }
     void SetEndNotePage( bool b )                   { bEndNotePage = b; }
 
     inline  sal_uInt16 GetPhyPageNum() const        { return nPhyPageNum;}
@@ -197,21 +197,21 @@ public:
     inline  void IncrPhyPageNum()               { ++nPhyPageNum;     }
 
     /// Validate, invalidate and query the Page status
-    /// Layout/Cntnt and Fly/non-Fly respectively are inspected separately
+    /// Layout/Content and Fly/non-Fly respectively are inspected separately
     inline void InvalidateFlyLayout() const;
-    inline void InvalidateFlyCntnt() const;
+    inline void InvalidateFlyContent() const;
     inline void InvalidateFlyInCnt() const;
     inline void InvalidateLayout() const;
-    inline void InvalidateCntnt() const;
+    inline void InvalidateContent() const;
     inline void InvalidateSpelling() const;
     inline void InvalidateSmartTags() const;
     inline void InvalidateAutoCompleteWords() const;
     inline void InvalidateWordCount() const;
     inline void ValidateFlyLayout() const;
-    inline void ValidateFlyCntnt() const;
+    inline void ValidateFlyContent() const;
     inline void ValidateFlyInCnt() const;
     inline void ValidateLayout() const;
-    inline void ValidateCntnt() const;
+    inline void ValidateContent() const;
     inline void ValidateSpelling()  const;
     inline void ValidateSmartTags() const;
     inline void ValidateAutoCompleteWords() const;
@@ -221,10 +221,10 @@ public:
     bool IsRightShadowNeeded() const;
     bool IsLeftShadowNeeded() const;
     bool IsInvalidFlyLayout() const { return bInvalidFlyLayout; }
-    bool IsInvalidFlyCntnt() const { return bInvalidFlyCntnt; }
+    bool IsInvalidFlyContent() const { return bInvalidFlyContent; }
     bool IsInvalidFlyInCnt() const { return bInvalidFlyInCnt; }
     bool IsInvalidLayout() const { return bInvalidLayout; }
-    bool IsInvalidCntnt() const { return (bInvalidCntnt || bInvalidFlyInCnt); }
+    bool IsInvalidContent() const { return (bInvalidContent || bInvalidFlyInCnt); }
     bool IsInvalidSpelling() const { return bInvalidSpelling; }
     bool IsInvalidSmartTags() const { return bInvalidSmartTags; }
     bool IsInvalidAutoCompleteWords() const { return bInvalidAutoCmplWrds; }
@@ -335,27 +335,27 @@ public:
     static SwTwips GetSidebarBorderWidth( const SwViewShell* );
 };
 
-inline SwCntntFrm *SwPageFrm::FindFirstBodyCntnt()
+inline SwContentFrm *SwPageFrm::FindFirstBodyContent()
 {
     SwLayoutFrm *pBody = FindBodyCont();
-    return pBody ? pBody->ContainsCntnt() : 0;
+    return pBody ? pBody->ContainsContent() : 0;
 }
-inline const SwCntntFrm *SwPageFrm::FindFirstBodyCntnt() const
+inline const SwContentFrm *SwPageFrm::FindFirstBodyContent() const
 {
     const SwLayoutFrm *pBody = FindBodyCont();
-    return pBody ? pBody->ContainsCntnt() : 0;
+    return pBody ? pBody->ContainsContent() : 0;
 }
-inline const SwCntntFrm *SwPageFrm::FindLastBodyCntnt() const
+inline const SwContentFrm *SwPageFrm::FindLastBodyContent() const
 {
-    return const_cast<SwPageFrm*>(this)->FindLastBodyCntnt();
+    return const_cast<SwPageFrm*>(this)->FindLastBodyContent();
 }
 inline void SwPageFrm::InvalidateFlyLayout() const
 {
     const_cast<SwPageFrm*>(this)->bInvalidFlyLayout = true;
 }
-inline void SwPageFrm::InvalidateFlyCntnt() const
+inline void SwPageFrm::InvalidateFlyContent() const
 {
-    const_cast<SwPageFrm*>(this)->bInvalidFlyCntnt = true;
+    const_cast<SwPageFrm*>(this)->bInvalidFlyContent = true;
 }
 inline void SwPageFrm::InvalidateFlyInCnt() const
 {
@@ -365,9 +365,9 @@ inline void SwPageFrm::InvalidateLayout() const
 {
     const_cast<SwPageFrm*>(this)->bInvalidLayout = true;
 }
-inline void SwPageFrm::InvalidateCntnt() const
+inline void SwPageFrm::InvalidateContent() const
 {
-    const_cast<SwPageFrm*>(this)->bInvalidCntnt = true;
+    const_cast<SwPageFrm*>(this)->bInvalidContent = true;
 }
 inline void SwPageFrm::InvalidateSpelling() const
 {
@@ -390,9 +390,9 @@ inline void SwPageFrm::ValidateFlyLayout() const
 {
     const_cast<SwPageFrm*>(this)->bInvalidFlyLayout = false;
 }
-inline void SwPageFrm::ValidateFlyCntnt() const
+inline void SwPageFrm::ValidateFlyContent() const
 {
-    const_cast<SwPageFrm*>(this)->bInvalidFlyCntnt = false;
+    const_cast<SwPageFrm*>(this)->bInvalidFlyContent = false;
 }
 inline void SwPageFrm::ValidateFlyInCnt() const
 {
@@ -402,9 +402,9 @@ inline void SwPageFrm::ValidateLayout() const
 {
     const_cast<SwPageFrm*>(this)->bInvalidLayout = false;
 }
-inline void SwPageFrm::ValidateCntnt() const
+inline void SwPageFrm::ValidateContent() const
 {
-    const_cast<SwPageFrm*>(this)->bInvalidCntnt = false;
+    const_cast<SwPageFrm*>(this)->bInvalidContent = false;
 }
 inline void SwPageFrm::ValidateSpelling() const
 {
@@ -426,11 +426,11 @@ inline void SwPageFrm::ValidateWordCount() const
 
 inline bool SwPageFrm::IsInvalid() const
 {
-    return (bInvalidCntnt || bInvalidLayout || bInvalidFlyInCnt);
+    return (bInvalidContent || bInvalidLayout || bInvalidFlyInCnt);
 }
 inline bool SwPageFrm::IsInvalidFly() const
 {
-    return bInvalidFlyLayout || bInvalidFlyCntnt;
+    return bInvalidFlyLayout || bInvalidFlyContent;
 }
 
 
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 68f0ddf9be3f..784b4284281c 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -26,7 +26,7 @@
 class SwpHints;
 struct SwPosition;
 class SwPaM;
-class SwTxtAttr;
+class SwTextAttr;
 
 // Funktions-Deklarationen fuer die Move/Find-Methoden vom SwPaM
 
@@ -37,17 +37,17 @@ void GoEndSection( SwPosition*);
 bool GoInDoc( SwPaM&, SwMoveFn);
 bool GoInSection( SwPaM&, SwMoveFn);
 bool GoInNode( SwPaM&, SwMoveFn);
-bool GoInCntnt( SwPaM&, SwMoveFn);
-bool GoInCntntCells( SwPaM&, SwMoveFn);
-bool GoInCntntSkipHidden( SwPaM&, SwMoveFn);
-bool GoInCntntCellsSkipHidden( SwPaM&, SwMoveFn);
-const SwTxtAttr* GetFrwrdTxtHint( const SwpHints&, sal_uInt16&, sal_Int32 );
-const SwTxtAttr* GetBkwrdTxtHint( const SwpHints&, sal_uInt16&, sal_Int32 );
+bool GoInContent( SwPaM&, SwMoveFn);
+bool GoInContentCells( SwPaM&, SwMoveFn);
+bool GoInContentSkipHidden( SwPaM&, SwMoveFn);
+bool GoInContentCellsSkipHidden( SwPaM&, SwMoveFn);
+const SwTextAttr* GetFrwrdTextHint( const SwpHints&, sal_uInt16&, sal_Int32 );
+const SwTextAttr* GetBkwrdTextHint( const SwpHints&, sal_uInt16&, sal_Int32 );
 
 bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode );
 bool GoPrevious(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode );
-SW_DLLPUBLIC SwCntntNode* GoNextNds( SwNodeIndex * pIdx, bool );
-SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, bool );
+SW_DLLPUBLIC SwContentNode* GoNextNds( SwNodeIndex * pIdx, bool );
+SwContentNode* GoPreviousNds( SwNodeIndex * pIdx, bool );
 
 // Funktionsdefinitionen fuer die SwCrsrShell
 bool GoPrevPara( SwPaM&, SwPosPara);
@@ -59,12 +59,12 @@ bool GoNextSection( SwPaM&, SwPosSection);
 
 // Typedefiniton fuer Funktionen
 typedef bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 );
-typedef SwCntntNode* (*GoNds)( SwNodeIndex*, bool );
+typedef SwContentNode* (*GoNds)( SwNodeIndex*, bool );
 typedef void (*GoDoc)( SwPosition* );
 typedef void (*GoSection)( SwPosition* );
 typedef bool (SwPosition:: *CmpOp)( const SwPosition& ) const;
-typedef const SwTxtAttr* (*GetHint)( const SwpHints&, sal_uInt16&, sal_Int32 );
-typedef bool (utl::TextSearch:: *SearchTxt)( const OUString&, sal_Int32*,
+typedef const SwTextAttr* (*GetHint)( const SwpHints&, sal_uInt16&, sal_Int32 );
+typedef bool (utl::TextSearch:: *SearchText)( const OUString&, sal_Int32*,
                     sal_Int32*, ::com::sun::star::util::SearchResult* );
 typedef void (*MvSection)( SwNodeIndex * );
 
@@ -76,12 +76,12 @@ struct SwMoveFnCollection
     GoSection fnSections;
     CmpOp     fnCmpOp;
     GetHint   fnGetHint;
-    SearchTxt fnSearch;
+    SearchText fnSearch;
     MvSection fnSection;
 };
 
 // Funktionsdefinitionen fuers Suchen
-SwCntntNode* GetNode( SwPaM&, bool&, SwMoveFn, bool bInReadOnly = false );
+SwContentNode* GetNode( SwPaM&, bool&, SwMoveFn, bool bInReadOnly = false );
 
 #endif
 
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index c26665e9c136..6d4ca2f1f6b6 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -31,24 +31,24 @@ namespace sfx2 {
 }
 
 class SwDoc;
-class SwFmtColl;
+class SwFormatColl;
 class SwHistoryHint;
-class SwTxtAttr;
+class SwTextAttr;
 class SfxPoolItem;
 class SwUndoSaveSection;
-class SwTxtFtn;
-class SwUndoDelLayFmt;
-class SwFlyFrmFmt;
-class SwFmtFld;
-class SwTxtFld;
+class SwTextFootnote;
+class SwUndoDelLayFormat;
+class SwFlyFrameFormat;
+class SwFormatField;
+class SwTextField;
 class SwFieldType;
-class SwTxtTOXMark;
-class SwTxtRefMark;
-class SwFrmFmt;
+class SwTextTOXMark;
+class SwTextRefMark;
+class SwFrameFormat;
 class SwpHints;
-class SwFmtChain;
+class SwFormatChain;
 class SwNode;
-class SwCharFmt;
+class SwCharFormat;
 
 #include <tox.hxx>
 
@@ -89,31 +89,31 @@ public:
     virtual OUString GetDescription() const;
 };
 
-class SwHistorySetFmt : public SwHistoryHint
+class SwHistorySetFormat : public SwHistoryHint
 {
     ::std::unique_ptr<SfxPoolItem> m_pAttr;
     const sal_uLong m_nNodeIndex;
 
 public:
-    SwHistorySetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNode );
-    virtual ~SwHistorySetFmt();
+    SwHistorySetFormat( const SfxPoolItem* pFormatHt, sal_uLong nNode );
+    virtual ~SwHistorySetFormat();
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
     virtual OUString GetDescription() const SAL_OVERRIDE;
 
 };
 
-class SwHistoryResetFmt : public SwHistoryHint
+class SwHistoryResetFormat : public SwHistoryHint
 {
     const sal_uLong m_nNodeIndex;
     const sal_uInt16 m_nWhich;
 
 public:
-    SwHistoryResetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNodeIdx );
+    SwHistoryResetFormat( const SfxPoolItem* pFormatHt, sal_uLong nNodeIdx );
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
 
 };
 
-class SwHistorySetTxt : public SwHistoryHint
+class SwHistorySetText : public SwHistoryHint
 {
     ::std::unique_ptr<SfxPoolItem> m_pAttr;
     const sal_uLong m_nNodeIndex;
@@ -123,26 +123,26 @@ class SwHistorySetTxt : public SwHistoryHint
     bool m_bFormatIgnoreEnd   : 1;
 
 public:
-    SwHistorySetTxt( SwTxtAttr* pTxtHt, sal_uLong nNode );
-    virtual ~SwHistorySetTxt();
+    SwHistorySetText( SwTextAttr* pTextHt, sal_uLong nNode );
+    virtual ~SwHistorySetText();
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
 
 };
 
-class SwHistorySetTxtFld : public SwHistoryHint
+class SwHistorySetTextField : public SwHistoryHint
 {
     //!! beware of the order for the declation of the auto_ptrs.
     //!! If they get destroyed in the wrong order sw may crash (namely mail-merge as well)
-    ::std::unique_ptr<SwFieldType> m_pFldType;
-    const ::std::unique_ptr<SwFmtFld> m_pFld;
+    ::std::unique_ptr<SwFieldType> m_pFieldType;
+    const ::std::unique_ptr<SwFormatField> m_pField;
 
     sal_uLong m_nNodeIndex;
     sal_Int32 m_nPos;
-    sal_uInt16 m_nFldWhich;
+    sal_uInt16 m_nFieldWhich;
 
 public:
-    SwHistorySetTxtFld( SwTxtFld* pTxtFld, sal_uLong nNode );
-    virtual ~SwHistorySetTxtFld();
+    SwHistorySetTextField( SwTextField* pTextField, sal_uLong nNode );
+    virtual ~SwHistorySetTextField();
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
 
     virtual OUString GetDescription() const SAL_OVERRIDE;
@@ -157,7 +157,7 @@ class SwHistorySetRefMark : public SwHistoryHint
     const sal_Int32 m_nEnd;
 
 public:
-    SwHistorySetRefMark( SwTxtRefMark* pTxtHt, sal_uLong nNode );
+    SwHistorySetRefMark( SwTextRefMark* pTextHt, sal_uLong nNode );
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
 
 };
@@ -172,13 +172,13 @@ class SwHistorySetTOXMark : public SwHistoryHint
     const sal_Int32 m_nEnd;
 
 public:
-    SwHistorySetTOXMark( SwTxtTOXMark* pTxtHt, sal_uLong nNode );
+    SwHistorySetTOXMark( SwTextTOXMark* pTextHt, sal_uLong nNode );
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
     bool IsEqual( const SwTOXMark& rCmp ) const;
 
 };
 
-class SwHistoryResetTxt : public SwHistoryHint
+class SwHistoryResetText : public SwHistoryHint
 {
     const sal_uLong m_nNodeIndex;
     const sal_Int32 m_nStart;
@@ -186,13 +186,13 @@ class SwHistoryResetTxt : public SwHistoryHint
     const sal_uInt16 m_nAttr;
 
 public:
-    SwHistoryResetTxt( sal_uInt16 nWhich, sal_Int32 nStt, sal_Int32 nEnd,
+    SwHistoryResetText( sal_uInt16 nWhich, sal_Int32 nStt, sal_Int32 nEnd,
                        sal_uLong nNode );
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
 
     sal_uInt16 GetWhich() const         { return m_nAttr; }
     sal_uLong GetNode() const           { return m_nNodeIndex; }
-    sal_Int32 GetCntnt() const     { return m_nStart; }
+    sal_Int32 GetContent() const     { return m_nStart; }
 
 };
 
@@ -205,8 +205,8 @@ class SwHistorySetFootnote : public SwHistoryHint
     const bool m_bEndNote;
 
 public:
-    SwHistorySetFootnote( SwTxtFtn* pTxtFtn, sal_uLong nNode );
-    SwHistorySetFootnote( const SwTxtFtn& );
+    SwHistorySetFootnote( SwTextFootnote* pTextFootnote, sal_uLong nNode );
+    SwHistorySetFootnote( const SwTextFootnote& );
     virtual ~SwHistorySetFootnote();
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
 
@@ -214,27 +214,27 @@ public:
 
 };
 
-class SwHistoryChangeFmtColl : public SwHistoryHint
+class SwHistoryChangeFormatColl : public SwHistoryHint
 {
-    SwFmtColl * const m_pColl;
+    SwFormatColl * const m_pColl;
     const sal_uLong m_nNodeIndex;
     const sal_uInt8 m_nNodeType;
 
 public:
-    SwHistoryChangeFmtColl( SwFmtColl* pColl, sal_uLong nNode, sal_uInt8 nNodeWhich );
+    SwHistoryChangeFormatColl( SwFormatColl* pColl, sal_uLong nNode, sal_uInt8 nNodeWhich );
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
 
 };
 
-class SwHistoryTxtFlyCnt : public SwHistoryHint
+class SwHistoryTextFlyCnt : public SwHistoryHint
 {
-    ::std::unique_ptr<SwUndoDelLayFmt> m_pUndo;
+    ::std::unique_ptr<SwUndoDelLayFormat> m_pUndo;
 
 public:
-    SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt );
-    virtual ~SwHistoryTxtFlyCnt();
+    SwHistoryTextFlyCnt( SwFrameFormat* const pFlyFormat );
+    virtual ~SwHistoryTextFlyCnt();
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
-    SwUndoDelLayFmt* GetUDelLFmt() { return m_pUndo.get(); }
+    SwUndoDelLayFormat* GetUDelLFormat() { return m_pUndo.get(); }
 
 };
 
@@ -254,8 +254,8 @@ class SwHistoryBookmark : public SwHistoryHint
         vcl::KeyCode m_aKeycode;
         const sal_uLong m_nNode;
         const sal_uLong m_nOtherNode;
-        const sal_Int32 m_nCntnt;
-        const sal_Int32 m_nOtherCntnt;
+        const sal_Int32 m_nContent;
+        const sal_Int32 m_nOtherContent;
         const bool m_bSavePos;
         const bool m_bSaveOtherPos;
         const bool m_bHadOtherPos;
@@ -291,39 +291,39 @@ public:
 
     const std::vector<sal_uInt16>& GetArr() const { return m_Array; }
     sal_uLong GetNode() const               { return m_nNodeIndex; }
-    sal_Int32 GetCntnt() const         { return m_nStart; }
+    sal_Int32 GetContent() const         { return m_nStart; }
 
 };
 
 class SwHistoryChangeFlyAnchor : public SwHistoryHint
 {
-    SwFrmFmt & m_rFmt;
+    SwFrameFormat & m_rFormat;
     const sal_uLong m_nOldNodeIndex;
     const sal_Int32 m_nOldContentIndex;
 
 public:
-    SwHistoryChangeFlyAnchor( SwFrmFmt& rFmt );
+    SwHistoryChangeFlyAnchor( SwFrameFormat& rFormat );
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
 };
 
 class SwHistoryChangeFlyChain : public SwHistoryHint
 {
-    SwFlyFrmFmt * const m_pPrevFmt;
-    SwFlyFrmFmt * const m_pNextFmt;
-    SwFlyFrmFmt * const m_pFlyFmt;
+    SwFlyFrameFormat * const m_pPrevFormat;
+    SwFlyFrameFormat * const m_pNextFormat;
+    SwFlyFrameFormat * const m_pFlyFormat;
 
 public:
-    SwHistoryChangeFlyChain( SwFlyFrmFmt& rFmt, const SwFmtChain& rAttr );
+    SwHistoryChangeFlyChain( SwFlyFrameFormat& rFormat, const SwFormatChain& rAttr );
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
 };
 
-class SwHistoryChangeCharFmt : public SwHistoryHint
+class SwHistoryChangeCharFormat : public SwHistoryHint
 {
     const SfxItemSet m_OldSet;
-    const OUString m_Fmt;
+    const OUString m_Format;
 
 public:
-    SwHistoryChangeCharFmt( const SfxItemSet& rSet, const OUString & sFmt);
+    SwHistoryChangeCharFormat( const SfxItemSet& rSet, const OUString & sFormat);
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE;
 
 };
@@ -350,13 +350,13 @@ public:
 
     void Add( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue,
               sal_uLong nNodeIdx );
-    void Add( SwTxtAttr* pTxtHt, sal_uLong nNodeIdx, bool bNewAttr = true );
-    void Add( SwFmtColl*, sal_uLong nNodeIdx, sal_uInt8 nWhichNd );
+    void Add( SwTextAttr* pTextHt, sal_uLong nNodeIdx, bool bNewAttr = true );
+    void Add( SwFormatColl*, sal_uLong nNodeIdx, sal_uInt8 nWhichNd );
     void Add( const ::sw::mark::IMark&, bool bSavePos, bool bSaveOtherPos );
-    void Add( SwFrmFmt& rFmt );
-    void Add( SwFlyFrmFmt&, sal_uInt16& rSetPos );
-    void Add( const SwTxtFtn& );
-    void Add( const SfxItemSet & rSet, const SwCharFmt & rCharFmt);
+    void Add( SwFrameFormat& rFormat );
+    void Add( SwFlyFrameFormat&, sal_uInt16& rSetPos );
+    void Add( const SwTextFootnote& );
+    void Add( const SfxItemSet & rSet, const SwCharFormat & rCharFormat);
 
     sal_uInt16 Count() const { return m_SwpHstry.size(); }
     sal_uInt16 GetTmpEnd() const { return m_SwpHstry.size() - m_nEndDiff; }
@@ -385,7 +385,7 @@ public:
         const sal_Int32 nEnd,
         const bool bCopyFields );
 
-    void CopyFmtAttr( const SfxItemSet& rSet, sal_uLong nNodeIdx );
+    void CopyFormatAttr( const SfxItemSet& rSet, sal_uLong nNodeIdx );
 };
 
 class SwRegHistory : public SwClient
@@ -410,7 +410,7 @@ public:
         sal_Int32 const nStart, sal_Int32 const nEnd,
         SetAttrMode const nFlags );
 
-    void AddHint( SwTxtAttr* pHt, const bool bNew = false );
+    void AddHint( SwTextAttr* pHt, const bool bNew = false );
 
     void RegisterInModify( SwModify* pRegIn, const SwNode& rNd );
     void ChangeNodeIndex( sal_uLong nNew ) { m_nNodeIndex = nNew; }
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index cbb5c1f8896e..44952adfe692 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -24,10 +24,10 @@
 #include <doc.hxx>
 #include <IDocumentTimerAccess.hxx>
 
-class SwCntntFrm;
+class SwContentFrm;
 class SwViewShell;
 class SdrPage;
-class SwFrmFmt;
+class SwFrameFormat;
 class SwPaM;
 class SwCursor;
 class SwShellCrsr;
@@ -96,8 +96,8 @@ class SwRootFrm: public SwLayoutFrm
      */
     long    mnBrowseWidth;
 
-    /// If we only have to format one CntntFrm, its in mpTurbo
-    const SwCntntFrm *mpTurbo;
+    /// If we only have to format one ContentFrm, its in mpTurbo
+    const SwContentFrm *mpTurbo;
 
     /// We should not need to always struggle to find the last page, so store it here
     SwPageFrm *mpLastPage;
@@ -160,7 +160,7 @@ public:
     void AllCheckPageDescs() const;
     void AllInvalidateAutoCompleteWords() const;
     void AllAddPaintRect() const;
-    void AllRemoveFtns() ;
+    void AllRemoveFootnotes() ;
     void AllInvalidateSmartTagsOrSpelling(bool bSmartTags) const;
 
     /// Output virtual Device (e.g. for animations)
@@ -169,8 +169,8 @@ public:
     /// Save Clipping if exactly the ClipRect is outputted
     static bool HasSameRect( const SwRect& rRect );
 
-    SwRootFrm( SwFrmFmt*, SwViewShell* );
-    void Init(SwFrmFmt*);
+    SwRootFrm( SwFrameFormat*, SwViewShell* );
+    void Init(SwFrameFormat*);
 
     SwViewShell *GetCurrShell() const { return mpCurrShell; }
     void DeRegisterShell( SwViewShell *pSh );
@@ -210,7 +210,7 @@ public:
 
     virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE;
 
-    Point  GetNextPrevCntntPos( const Point &rPoint, bool bNext ) const;
+    Point  GetNextPrevContentPos( const Point &rPoint, bool bNext ) const;
 
     virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE;
 
@@ -253,8 +253,8 @@ public:
      */
     static void AssertPageFlys( SwPageFrm * );
 
-    /// Invalidate all Cntnt, Size or PrtArea
-    void InvalidateAllCntnt( sal_uInt8 nInvalidate = INV_SIZE );
+    /// Invalidate all Content, Size or PrtArea
+    void InvalidateAllContent( sal_uInt8 nInvalidate = INV_SIZE );
 
     /**
      * Invalidate/re-calculate the position of all floating
@@ -299,22 +299,22 @@ public:
      * @returns false: There was no result because of an invalid layout
      * @returns true: Everything worked fine.
      */
-    bool MakeTblCrsrs( SwTableCursor& );
+    bool MakeTableCrsrs( SwTableCursor& );
 
     void DisallowTurbo()  const { const_cast<SwRootFrm*>(this)->mbTurboAllowed = false; }
     void ResetTurboFlag() const { const_cast<SwRootFrm*>(this)->mbTurboAllowed = true; }
     bool IsTurboAllowed() const { return mbTurboAllowed; }
-    void SetTurbo( const SwCntntFrm *pCntnt ) { mpTurbo = pCntnt; }
+    void SetTurbo( const SwContentFrm *pContent ) { mpTurbo = pContent; }
     void ResetTurbo() { mpTurbo = 0; }
-    const SwCntntFrm *GetTurbo() { return mpTurbo; }
+    const SwContentFrm *GetTurbo() { return mpTurbo; }
 
     /// Update the footernumbers of all Pages
-    void UpdateFtnNums(); // Only for page by page numnbering!
+    void UpdateFootnoteNums(); // Only for page by page numnbering!
 
     /// Remove all footnotes (but no references)
-    void RemoveFtns( SwPageFrm *pPage = 0, bool bPageOnly = false,
+    void RemoveFootnotes( SwPageFrm *pPage = 0, bool bPageOnly = false,
                      bool bEndNotes = false );
-    void CheckFtnPageDescs( bool bEndNote );
+    void CheckFootnotePageDescs( bool bEndNote );
 
     const SwPageFrm *GetLastPage() const { return mpLastPage; }
           SwPageFrm *GetLastPage()       { return mpLastPage; }
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 2fa1bc5cde26..5ad950fd4d8b 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 
-class SwTxtNode;
+class SwTextNode;
 class Point;
 class MultiSelection;
 typedef std::list< sal_Int32 > PositionList;
@@ -79,7 +79,7 @@ private:
     sal_Int32 nInvalidityPos;
     sal_uInt8 nDefaultDir;
 
-    void UpdateBidiInfo( const OUString& rTxt );
+    void UpdateBidiInfo( const OUString& rText );
 
     bool IsKashidaValid(sal_Int32 nKashPos) const;
     void MarkKashidaInvalid(sal_Int32 nKashPos);
@@ -96,8 +96,8 @@ public:
     ~SwScriptInfo();
 
     // determines script changes
-    void InitScriptInfo( const SwTxtNode& rNode, bool bRTL );
-    void InitScriptInfo( const SwTxtNode& rNode );
+    void InitScriptInfo( const SwTextNode& rNode, bool bRTL );
+    void InitScriptInfo( const SwTextNode& rNode );
 
     // set/get position from which data is invalid
     void SetInvalidityA(const sal_Int32 nPos)
@@ -172,9 +172,9 @@ public:
         OSL_ENSURE( nCnt < aHiddenChg.size(),"No HiddenChg today!");
         return aHiddenChg[ nCnt ];
     }
-    static void CalcHiddenRanges(const SwTxtNode& rNode, MultiSelection& rHiddenMulti);
-    static void selectHiddenTextProperty(const SwTxtNode& rNode, MultiSelection &rHiddenMulti);
-    static void selectRedLineDeleted(const SwTxtNode& rNode, MultiSelection &rHiddenMulti, bool bSelect=true);
+    static void CalcHiddenRanges(const SwTextNode& rNode, MultiSelection& rHiddenMulti);
+    static void selectHiddenTextProperty(const SwTextNode& rNode, MultiSelection &rHiddenMulti);
+    static void selectRedLineDeleted(const SwTextNode& rNode, MultiSelection &rHiddenMulti, bool bSelect=true);
 
     // "high" level operations, nPos refers to string position
     sal_Int32 NextScriptChg( const sal_Int32 nPos ) const;
@@ -194,7 +194,7 @@ public:
 
     @descr  Determines if a given position is inside a hidden text range. The
             static version tries to obtain a valid SwScriptInfo object
-            via the SwTxtNode, otherwise it calculates the values from scratch.
+            via the SwTextNode, otherwise it calculates the values from scratch.
             The non-static version uses the internally cached informatio
             for the calculation.
 
@@ -214,13 +214,13 @@ public:
             returns true if there are any hidden characters in this paragraph.
 
 */
-    static bool GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPos,
+    static bool GetBoundsOfHiddenRange( const SwTextNode& rNode, sal_Int32 nPos,
                                         sal_Int32& rnStartPos, sal_Int32& rnEndPos,
                                         PositionList* pList = 0 );
     bool GetBoundsOfHiddenRange(  sal_Int32 nPos, sal_Int32& rnStartPos,
                                   sal_Int32& rnEndPos, PositionList* pList = 0 ) const;
 
-    static bool IsInHiddenRange( const SwTxtNode& rNode, sal_Int32 nPos );
+    static bool IsInHiddenRange( const SwTextNode& rNode, sal_Int32 nPos );
 
 /** Hidden text attribute handling
 
@@ -237,18 +237,18 @@ public:
                 If set, the hidden ranges will be deleted from the text node.
  */
     static sal_Int32 MaskHiddenRanges(
-            const SwTxtNode& rNode, OUStringBuffer& rText,
+            const SwTextNode& rNode, OUStringBuffer& rText,
                                     const sal_Int32 nStt, const sal_Int32 nEnd,
                                     const sal_Unicode cChar );
 
 /** Hidden text attribute handling
 
-    @descr  Takes a SwTxtNode and deletes the hidden ranges from the node.
+    @descr  Takes a SwTextNode and deletes the hidden ranges from the node.
 
     @param  rNode
                 The text node.
  */
-    static void DeleteHiddenRanges( SwTxtNode& rNode );
+    static void DeleteHiddenRanges( SwTextNode& rNode );
 
     // HIDDEN TEXT STUFF END
 
@@ -320,19 +320,19 @@ public:
 /** Checks if text is Arabic text.
 
      @descr  Checks if text is Arabic text.
-     @param  rTxt
+     @param  rText
                  The text to check
      @param  nStt
                  Start index of the text
      @return Returns if the language is an Arabic language
  */
-    static bool IsArabicText( const OUString& rTxt, sal_Int32 nStt, sal_Int32 nLen );
+    static bool IsArabicText( const OUString& rText, sal_Int32 nStt, sal_Int32 nLen );
 
 /** Performs a thai justification on the kerning array
 
     @descr  Add some extra space for thai justification to the
             positions in the kerning array.
-    @param  rTxt
+    @param  rText
                 The String
     @param  pKernArray
                 The printers kerning array. Optional.
@@ -346,15 +346,15 @@ public:
                 The value which has to be added to the cells.
     @return The number of extra spaces in the given range
 */
-    static sal_Int32 ThaiJustify( const OUString& rTxt, long* pKernArray,
+    static sal_Int32 ThaiJustify( const OUString& rText, long* pKernArray,
                                   long* pScrArray, sal_Int32 nIdx,
                                   sal_Int32 nLen, sal_Int32 nNumberOfBlanks = 0,
                                   long nSpaceAdd = 0 );
 
-    static SwScriptInfo* GetScriptInfo( const SwTxtNode& rNode,
+    static SwScriptInfo* GetScriptInfo( const SwTextNode& rNode,
                                         bool bAllowInvalid = false );
 
-    static sal_uInt8 WhichFont(sal_Int32 nIdx, const OUString* pTxt, const SwScriptInfo* pSI);
+    static sal_uInt8 WhichFont(sal_Int32 nIdx, const OUString* pText, const SwScriptInfo* pSI);
 };
 
 #endif
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 408d4d9b9aba..df36cf8929e0 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -25,9 +25,9 @@
 #include <set>
 
 class SwSection;
-class SwSectionFmt;
+class SwSectionFormat;
 class SwAttrSetChg;
-class SwFtnContFrm;
+class SwFootnoteContFrm;
 class SwLayouter;
 
 #define FINDMODE_ENDNOTE 1
@@ -37,21 +37,21 @@ class SwLayouter;
 class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm
 {
     SwSection* pSection;
-    bool bFtnAtEnd; // footnotes at the end of section
+    bool bFootnoteAtEnd; // footnotes at the end of section
     bool bEndnAtEnd; // endnotes at the end of section
-    bool bCntntLock; // content locked
-    bool bOwnFtnNum; // special numbering of footnotes
-    bool bFtnLock; // ftn, don't leave this section bwd
+    bool bContentLock; // content locked
+    bool bOwnFootnoteNum; // special numbering of footnotes
+    bool bFootnoteLock; // ftn, don't leave this section bwd
 
     void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
                       SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
     void _Cut( bool bRemove );
-    // Is there a FtnContainer?
-    // An empty sectionfrm without FtnCont is superfluous
-    bool IsSuperfluous() const { return !ContainsAny() && !ContainsFtnCont(); }
-    void CalcFtnAtEndFlag();
+    // Is there a FootnoteContainer?
+    // An empty sectionfrm without FootnoteCont is superfluous
+    bool IsSuperfluous() const { return !ContainsAny() && !ContainsFootnoteCont(); }
+    void CalcFootnoteAtEndFlag();
     void CalcEndAtEndFlag();
-    const SwSectionFmt* _GetEndSectFmt() const;
+    const SwSectionFormat* _GetEndSectFormat() const;
     bool IsEndnoteAtMyEnd() const;
 
     virtual void DestroyImpl() SAL_OVERRIDE;
@@ -80,16 +80,16 @@ public:
     inline       SwSectionFrm *GetFollow();
     SwSectionFrm* FindMaster() const;
 
-                 SwCntntFrm *FindLastCntnt( sal_uInt8 nMode = 0 );
-    inline const SwCntntFrm *FindLastCntnt( sal_uInt8 nMode = 0 ) const;
+                 SwContentFrm *FindLastContent( sal_uInt8 nMode = 0 );
+    inline const SwContentFrm *FindLastContent( sal_uInt8 nMode = 0 ) const;
     inline SwSection* GetSection() { return pSection; }
     inline const SwSection* GetSection() const { return pSection; }
     inline void ColLock()       { mbColLocked = true; }
     inline void ColUnlock()     { mbColLocked = false; }
 
-    void CalcFtnCntnt();
+    void CalcFootnoteContent();
     void SimpleFormat();
-    bool IsDescendantFrom( const SwSectionFmt* pSect ) const;
+    bool IsDescendantFrom( const SwSectionFormat* pSect ) const;
     bool HasToBreak( const SwFrm* pFrm ) const;
     void MergeNext( SwSectionFrm* pNxt );
 
@@ -100,8 +100,8 @@ public:
     bool SplitSect( SwFrm* pFrm, bool bApres );
     void DelEmpty( bool bRemove ); // Like Cut(), except for that Follow chaining is maintained
     bool IsToIgnore() const        // No size, no content; need to be ignored
-    { return !Frm().Height() && !ContainsCntnt(); }
-    SwFtnContFrm* ContainsFtnCont( const SwFtnContFrm* pCont = NULL ) const;
+    { return !Frm().Height() && !ContainsContent(); }
+    SwFootnoteContFrm* ContainsFootnoteCont( const SwFootnoteContFrm* pCont = NULL ) const;
     bool Growable() const;
     SwTwips _Shrink( SwTwips, bool bTst );
     SwTwips _Grow  ( SwTwips, bool bTst );
@@ -131,29 +131,29 @@ public:
     /// Adapt size to surroundings
     void _CheckClipping( bool bGrow, bool bMaximize );
 
-    void InvalidateFtnPos();
+    void InvalidateFootnotePos();
     void CollectEndnotes( SwLayouter* pLayouter );
-    const SwSectionFmt* GetEndSectFmt() const
-        { if( IsEndnAtEnd() ) return _GetEndSectFmt(); return NULL; }
+    const SwSectionFormat* GetEndSectFormat() const
+        { if( IsEndnAtEnd() ) return _GetEndSectFormat(); return NULL; }
 
-    static void MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave );
+    static void MoveContentAndDelete( SwSectionFrm* pDel, bool bSave );
 
     bool IsBalancedSection() const;
 
     virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE;
 
-    bool IsFtnAtEnd() const { return bFtnAtEnd; }
+    bool IsFootnoteAtEnd() const { return bFootnoteAtEnd; }
     bool IsEndnAtEnd() const { return bEndnAtEnd;   }
-    bool IsAnyNoteAtEnd() const { return bFtnAtEnd || bEndnAtEnd; }
-    bool AreNotesAtEnd() const { return bFtnAtEnd && bEndnAtEnd; }
+    bool IsAnyNoteAtEnd() const { return bFootnoteAtEnd || bEndnAtEnd; }
+    bool AreNotesAtEnd() const { return bFootnoteAtEnd && bEndnAtEnd; }
 
-    void SetCntntLock( bool bNew ) { bCntntLock = bNew; }
-    bool IsCntntLocked() const { return bCntntLock; }
+    void SetContentLock( bool bNew ) { bContentLock = bNew; }
+    bool IsContentLocked() const { return bContentLock; }
 
-    bool IsOwnFtnNum() const { return bOwnFtnNum; }
+    bool IsOwnFootnoteNum() const { return bOwnFootnoteNum; }
 
-    void SetFtnLock( bool bNew ) { bFtnLock = bNew; }
-    bool IsFtnLock() const { return bFtnLock; }
+    void SetFootnoteLock( bool bNew ) { bFootnoteLock = bNew; }
+    bool IsFootnoteLock() const { return bFootnoteLock; }
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwSectionFrm)
 };
@@ -168,9 +168,9 @@ inline SwSectionFrm *SwSectionFrm::GetFollow()
 {
     return static_cast<SwSectionFrm*>(SwFlowFrm::GetFollow());
 }
-inline const SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode ) const
+inline const SwContentFrm *SwSectionFrm::FindLastContent( sal_uInt8 nMode ) const
 {
-    return const_cast<SwSectionFrm*>(this)->FindLastCntnt( nMode );
+    return const_cast<SwSectionFrm*>(this)->FindLastContent( nMode );
 }
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 3a7280a5fd3f..6c186abae8a8 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -36,8 +36,8 @@ public:
     OUString aShort;               /// Shortname
     OUString aLong;                /// Longname
     OUString aPackageName;         /// Package name
-    bool bIsOnlyTxtFlagInit : 1;   /// Is the Flag valid?
-    bool bIsOnlyTxt : 1;           /// Unformatted text
+    bool bIsOnlyTextFlagInit : 1;   /// Is the Flag valid?
+    bool bIsOnlyText : 1;           /// Unformatted text
     bool bInPutMuchBlocks : 1;     /// Put serveral block entries
 
     SwBlockName( const OUString& rShort, const OUString& rLong );
@@ -81,7 +81,7 @@ protected:
 
     virtual void   ClearDoc();          // Delete Doc content
     SwPaM* MakePaM();                   // Span PaM over Doc
-    virtual void   AddName( const OUString&, const OUString&, bool bOnlyTxt = false );
+    virtual void   AddName( const OUString&, const OUString&, bool bOnlyText = false );
     bool   IsFileChanged() const;
     void   Touch();
 
@@ -118,10 +118,10 @@ public:
 
     virtual bool IsOnlyTextBlock( const OUString& rShort ) const;
 
-    virtual sal_uLong GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl,
+    virtual sal_uLong GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTable,
                                  bool bFileAlreadyOpen = false );
     virtual sal_uLong SetMacroTable( sal_uInt16 nIdx,
-                                 const SvxMacroTableDtor& rMacroTbl,
+                                 const SvxMacroTableDtor& rMacroTable,
                                  bool bFileAlreadyOpen = false );
     virtual bool PutMuchEntries( bool bOn );
 };
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 266c5c5ffd37..97da4572235e 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -33,7 +33,7 @@ class SfxItemSet;
 class SwAttrSet;
 class SwDoCapitals;     // DoCapitals
 class SwDrawTextInfo;   // _DrawText
-class SwScriptInfo;     // _GetTxtSize
+class SwScriptInfo;     // _GetTextSize
 class SwViewShell;
 class IDocumentSettingAccess;
 typedef struct _xmlTextWriter *xmlTextWriterPtr;
@@ -76,7 +76,7 @@ class SwSubFont : public SvxFont
     bool IsSymbol( SwViewShell *pSh );
     sal_uInt16 GetAscent( SwViewShell *pSh, const OutputDevice& rOut );
     sal_uInt16 GetHeight( SwViewShell *pSh, const OutputDevice& rOut );
-    Size _GetTxtSize( SwDrawTextInfo& rInf );
+    Size _GetTextSize( SwDrawTextInfo& rInf );
     Size GetCapitalSize( SwDrawTextInfo& rInf );
     void _DrawText( SwDrawTextInfo &rInf, const bool bGrey );
     void DrawCapital( SwDrawTextInfo &rInf );
@@ -161,7 +161,7 @@ class SwFont
     sal_uInt8   nActual;        // actual font (Latin, CJK or CTL)
 
     // switch for the font-extensions
-    bool bNoHyph        :1;  // SwTxtNoHyphenHere: no separator
+    bool bNoHyph        :1;  // SwTextNoHyphenHere: no separator
     bool bBlink         :1;  // blinking font
     bool bPaintBlank    :1;  // blanks not with DrawRect
     bool bFntChg        :1;
@@ -277,7 +277,7 @@ public:
     inline void SetPaintWrong( const bool bNew );
     inline bool IsPaintWrong() const { return bPaintWrong; }
 
-    // setting of the base class font for SwTxtCharFmt
+    // setting of the base class font for SwTextCharFormat
     void SetDiffFnt( const SfxItemSet* pSet,
                      const IDocumentSettingAccess* pIDocumentSettingAccess );
 
@@ -343,7 +343,7 @@ public:
         { return aSub[nActual].GetCapitalSize( rInf ); }
 
     sal_Int32 GetCapitalBreak( SwViewShell const* pSh,  const OutputDevice* pOut,
-        const SwScriptInfo* pScript, const OUString& rTxt,
+        const SwScriptInfo* pScript, const OUString& rText,
         long nTextWidth, const sal_Int32 nIdx,
         const sal_Int32 nLen );
 
@@ -359,10 +359,10 @@ public:
     void DoOnCapitals( SwDoCapitals &rDo )
         { aSub[nActual].DoOnCapitals( rDo ); }
 
-    Size _GetTxtSize( SwDrawTextInfo& rInf )
-        { rInf.SetFont( this ); return aSub[nActual]._GetTxtSize( rInf ); }
+    Size _GetTextSize( SwDrawTextInfo& rInf )
+        { rInf.SetFont( this ); return aSub[nActual]._GetTextSize( rInf ); }
 
-    sal_Int32 GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth );
+    sal_Int32 GetTextBreak( SwDrawTextInfo& rInf, long nTextWidth );
 
     sal_Int32 _GetCrsrOfst( SwDrawTextInfo& rInf )
         { return aSub[nActual]._GetCrsrOfst( rInf ); }
diff --git a/sw/source/core/inc/swselectionlist.hxx b/sw/source/core/inc/swselectionlist.hxx
index aa920d78d0e5..01bbfef5575a 100644
--- a/sw/source/core/inc/swselectionlist.hxx
+++ b/sw/source/core/inc/swselectionlist.hxx
@@ -45,7 +45,7 @@ public:
     /** Ctor to create an empty list for a given context
 
         @param pInitCxt
-        The frame (normally a SwTxtFrm) where the block cursor selection starts,
+        The frame (normally a SwTextFrm) where the block cursor selection starts,
         it will be used to get the allowed context for the text selections.
     */
     explicit SwSelectionList( const SwFrm* pInitCxt );
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 593f1148f029..3b418cf7f18b 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -30,7 +30,7 @@ class SwAttrSetChg;
 /// SwTabFrm is one table in the document layout, containing rows (which contain cells).
 class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
 {
-    friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow );
+    friend void CalcContent( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow );
 
     // does the special treatment for _Get[Next|Prev]Leaf()
     using SwFrm::GetLeaf;
@@ -47,11 +47,11 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
     bool m_bLockBackMove    :1; /// The Master took care of the BackMove test
     bool m_bResizeHTMLTable :1; /// Call the Resize of the HTMLTableLayout in the MakeAll
                                 /// This is an optimization, so that we don't have to call
-                                /// it in CntntFrm::Grow; there it might be called for
+                                /// it in ContentFrm::Grow; there it might be called for
                                 /// _every_ Cell
 
     bool m_bONECalcLowers   :1; /// Primarily for the StarONE SS
-                                /// The Cntnts are formatted via Calc() on MakeAll in any
+                                /// The Contents are formatted via Calc() on MakeAll in any
                                 /// case. There are no further invalidations and that path can
                                 /// hardly give any guarantees
 
@@ -125,7 +125,7 @@ public:
     inline       SwTabFrm *GetFollow();
     SwTabFrm* FindMaster( bool bFirstMaster = false ) const;
 
-    virtual bool GetInfo( SfxPoolItem &rHnt ) const SAL_OVERRIDE;
+    virtual bool GetInfo( SfxPoolItem &rHint ) const SAL_OVERRIDE;
     virtual void Paint( SwRect const&,
                         SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
     virtual void CheckDirection( bool bVert ) SAL_OVERRIDE;
@@ -136,8 +136,8 @@ public:
     virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR,
                           const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE;
 
-                 SwCntntFrm *FindLastCntnt();
-    inline const SwCntntFrm *FindLastCntnt() const;
+                 SwContentFrm *FindLastContent();
+    inline const SwContentFrm *FindLastContent() const;
 
     const SwTable *GetTable() const { return m_pTable; }
           SwTable *GetTable()       { return m_pTable; }
@@ -224,9 +224,9 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrm)
 };
 
-inline const SwCntntFrm *SwTabFrm::FindLastCntnt() const
+inline const SwContentFrm *SwTabFrm::FindLastContent() const
 {
-    return const_cast<SwTabFrm*>(this)->FindLastCntnt();
+    return const_cast<SwTabFrm*>(this)->FindLastContent();
 }
 
 inline const SwTabFrm *SwTabFrm::GetFollow() const
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 158e7d79bb1f..e23a41eebb93 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -30,12 +30,12 @@ class SwDoc;
 class SwTableNode;
 class SwTableLine;
 class SwTableBox;
-class SwTableBoxFmt;
+class SwTableBoxFormat;
 class SwHistory;
-class SwCntntNode;
+class SwContentNode;
 class SfxPoolItem;
-class SwShareBoxFmts;
-class SwFmtFrmSize;
+class SwShareBoxFormats;
+class SwFormatFrmSize;
 struct _CpyPara;
 struct _InsULPara;
 
@@ -45,13 +45,13 @@ void sw_LineSetHeadCondColl( const SwTableLine* pLine );
 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize );
 #endif
 
-void _InsTblBox( SwDoc* pDoc, SwTableNode* pTblNd,
-                SwTableLine* pLine, SwTableBoxFmt* pBoxFrmFmt,
+void _InsTableBox( SwDoc* pDoc, SwTableNode* pTableNd,
+                SwTableLine* pLine, SwTableBoxFormat* pBoxFrameFormat,
                 SwTableBox* pBox, sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 );
 
-SW_DLLPUBLIC void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo = 0,
+SW_DLLPUBLIC void _DeleteBox( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo = 0,
                 bool bCalcNewSize = true, const bool bCorrBorder = true,
-                SwShareBoxFmts* pShareFmts = 0 );
+                SwShareBoxFormats* pShareFormats = 0 );
 
 /**
  * Class for SplitTable
@@ -60,7 +60,7 @@ SW_DLLPUBLIC void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo = 0
  *
  * @see implementation in im ndtbl.cxx
  */
-class SwCollectTblLineBoxes
+class SwCollectTableLineBoxes
 {
     std::vector<sal_uInt16> aPosArr;
     std::vector<SwTableBox*> m_Boxes;
@@ -70,7 +70,7 @@ class SwCollectTblLineBoxes
     bool bGetValues : 1;
 
 public:
-    SwCollectTblLineBoxes( bool bTop, sal_uInt16 nMd = 0, SwHistory* pHist=0 )
+    SwCollectTableLineBoxes( bool bTop, sal_uInt16 nMd = 0, SwHistory* pHist=0 )
         :
         pHst( pHist ), nMode( nMd ), nWidth( 0 ),
         bGetFromTop( bTop ), bGetValues( true )
@@ -79,7 +79,7 @@ public:
 
     void AddBox( const SwTableBox& rBox );
     const SwTableBox* GetBoxOfPos( const SwTableBox& rBox );
-    void AddToUndoHistory( const SwCntntNode& rNd );
+    void AddToUndoHistory( const SwContentNode& rNd );
 
     size_t Count() const                { return m_Boxes.size(); }
     const SwTableBox& GetBox( std::size_t nPos, sal_uInt16* pWidth = 0 ) const
@@ -100,10 +100,10 @@ public:
     bool Resize( sal_uInt16 nOffset, sal_uInt16 nWidth );
 };
 
-void sw_Box_CollectBox( const SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara );
+void sw_Box_CollectBox( const SwTableBox* pBox, SwCollectTableLineBoxes* pSplPara );
 bool sw_Line_CollectBox( const SwTableLine*& rpLine, void* pPara );
 
-void sw_BoxSetSplitBoxFmts( SwTableBox* pBox, SwCollectTblLineBoxes* pSplPara );
+void sw_BoxSetSplitBoxFormats( SwTableBox* pBox, SwCollectTableLineBoxes* pSplPara );
 
 /**
  * This structure is needed by Undo to restore row span attributes
@@ -119,14 +119,14 @@ struct SwSaveRowSpan
 struct _SwGCLineBorder
 {
     const SwTableLines* pLines;
-    SwShareBoxFmts* pShareFmts;
+    SwShareBoxFormats* pShareFormats;
     sal_uInt16 nLinePos;
 
     _SwGCLineBorder( const SwTable& rTable )
-        : pLines( &rTable.GetTabLines() ), pShareFmts(0), nLinePos( 0 )  {}
+        : pLines( &rTable.GetTabLines() ), pShareFormats(0), nLinePos( 0 )  {}
 
     _SwGCLineBorder( const SwTableBox& rBox )
-        : pLines( &rBox.GetTabLines() ), pShareFmts(0), nLinePos( 0 )  {}
+        : pLines( &rBox.GetTabLines() ), pShareFormats(0), nLinePos( 0 )  {}
     bool IsLastLine() const { return nLinePos + 1 >= (sal_uInt16)pLines->size(); }
 };
 
@@ -144,55 +144,55 @@ public:
      * Check whether the left Border is the same as the set one
      * @returns false if no Border was set
      */
-    bool CheckLeftBorderOfFormat( const SwFrmFmt& rFmt );
+    bool CheckLeftBorderOfFormat( const SwFrameFormat& rFormat );
 
     bool IsAnyBorderFound() const { return bAnyBorderFnd; }
 };
 
 void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara );
 
-class SwShareBoxFmt
+class SwShareBoxFormat
 {
-    const SwFrmFmt* pOldFmt;
-    std::vector<SwFrmFmt*> aNewFmts;
+    const SwFrameFormat* pOldFormat;
+    std::vector<SwFrameFormat*> aNewFormats;
 
 public:
-    SwShareBoxFmt( const SwFrmFmt& rFmt )
-        : pOldFmt( &rFmt )
+    SwShareBoxFormat( const SwFrameFormat& rFormat )
+        : pOldFormat( &rFormat )
     {}
 
-    const SwFrmFmt& GetOldFormat() const { return *pOldFmt; }
+    const SwFrameFormat& GetOldFormat() const { return *pOldFormat; }
 
-    SwFrmFmt* GetFormat( long nWidth ) const;
-    SwFrmFmt* GetFormat( const SfxPoolItem& rItem ) const;
-    void AddFormat( SwFrmFmt& rFmt );
+    SwFrameFormat* GetFormat( long nWidth ) const;
+    SwFrameFormat* GetFormat( const SfxPoolItem& rItem ) const;
+    void AddFormat( SwFrameFormat& rFormat );
     /// @returns true, if we can delete
-    bool RemoveFormat( const SwFrmFmt& rFmt );
+    bool RemoveFormat( const SwFrameFormat& rFormat );
 };
 
-typedef boost::ptr_vector<SwShareBoxFmt> _SwShareBoxFmts;
+typedef boost::ptr_vector<SwShareBoxFormat> _SwShareBoxFormats;
 
-class SwShareBoxFmts
+class SwShareBoxFormats
 {
-    _SwShareBoxFmts aShareArr;
-    bool Seek_Entry( const SwFrmFmt& rFmt, sal_uInt16* pPos ) const;
+    _SwShareBoxFormats aShareArr;
+    bool Seek_Entry( const SwFrameFormat& rFormat, sal_uInt16* pPos ) const;
 
-    void ChangeFrmFmt( SwTableBox* pBox, SwTableLine* pLn, SwFrmFmt& rFmt );
+    void ChangeFrameFormat( SwTableBox* pBox, SwTableLine* pLn, SwFrameFormat& rFormat );
 
 public:
-    SwShareBoxFmts() {}
-    ~SwShareBoxFmts();
+    SwShareBoxFormats() {}
+    ~SwShareBoxFormats();
 
-    SwFrmFmt* GetFormat( const SwFrmFmt& rFmt, long nWidth ) const;
-    SwFrmFmt* GetFormat( const SwFrmFmt& rFmt, const SfxPoolItem& ) const;
+    SwFrameFormat* GetFormat( const SwFrameFormat& rFormat, long nWidth ) const;
+    SwFrameFormat* GetFormat( const SwFrameFormat& rFormat, const SfxPoolItem& ) const;
 
-    void AddFormat( const SwFrmFmt& rOld, SwFrmFmt& rNew );
+    void AddFormat( const SwFrameFormat& rOld, SwFrameFormat& rNew );
 
-    void SetSize( SwTableBox& rBox, const SwFmtFrmSize& rSz );
+    void SetSize( SwTableBox& rBox, const SwFormatFrmSize& rSz );
     void SetAttr( SwTableBox& rBox, const SfxPoolItem& rItem );
     void SetAttr( SwTableLine& rLine, const SfxPoolItem& rItem );
 
-    void RemoveFormat( const SwFrmFmt& rFmt );
+    void RemoveFormat( const SwFrameFormat& rFormat );
 };
 
 #endif
diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
index 66e5d5d24aa5..077d5fbd14c9 100644
--- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
@@ -21,13 +21,13 @@
 #include <anchoredobjectposition.hxx>
 
 class SwFrm;
-class SwTxtFrm;
+class SwTextFrm;
 class SwLayoutFrm;
 class SwRect;
 
 namespace objectpositioning
 {
-    class SwToCntntAnchoredObjectPosition : public SwAnchoredObjectPosition
+    class SwToContentAnchoredObjectPosition : public SwAnchoredObjectPosition
     {
         private:
             // calculated data for object position
@@ -51,7 +51,7 @@ namespace objectpositioning
 
             // method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> to
             // the needed type
-            SwTxtFrm&       GetAnchorTxtFrm() const;
+            SwTextFrm&       GetAnchorTextFrm() const;
 
             /** determine frame for horizontal position
 
@@ -71,8 +71,8 @@ namespace objectpositioning
             const SwFrm& _GetHoriVirtualAnchor( const SwLayoutFrm& _pProposedFrm ) const;
 
         public:
-            SwToCntntAnchoredObjectPosition( SdrObject& _rDrawObj );
-            virtual ~SwToCntntAnchoredObjectPosition();
+            SwToContentAnchoredObjectPosition( SdrObject& _rDrawObj );
+            virtual ~SwToContentAnchoredObjectPosition();
 
             /** calculate position of object
             */
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 8822a219f76e..619229fea4ff 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -25,11 +25,11 @@
 #include <com/sun/star/lang/Locale.hpp>
 
 class CharClass;
-class SwCntntNode;
-class SwTxtNode;
-class SwTxtTOXMark;
+class SwContentNode;
+class SwTextNode;
+class SwTextTOXMark;
 class SwIndex;
-class SwFmtFld;
+class SwFormatField;
 class IndexEntrySupplierWrapper;
 
 enum TOXSortType
@@ -44,11 +44,11 @@ enum TOXSortType
 
 struct SwTOXSource
 {
-    const SwCntntNode* pNd;
+    const SwContentNode* pNd;
     sal_Int32 nPos;
     bool bMainEntry;
 
-    SwTOXSource( const SwCntntNode* pNode, sal_Int32 n, bool bMain )
+    SwTOXSource( const SwContentNode* pNode, sal_Int32 n, bool bMain )
         : pNd(pNode), nPos(n), bMainEntry(bMain)
     {
     }
@@ -122,8 +122,8 @@ struct SwTOXSortTabBase
 {
     SwTOXSources aTOXSources;
     ::com::sun::star::lang::Locale aLocale;
-    const SwTxtNode* pTOXNd;
-    const SwTxtTOXMark* pTxtMark;
+    const SwTextNode* pTOXNd;
+    const SwTextTOXMark* pTextMark;
     const SwTOXInternational* pTOXIntl;
     sal_uLong nPos;
     sal_Int32 nCntPos;
@@ -131,8 +131,8 @@ struct SwTOXSortTabBase
     static sal_uInt16 nOpt;
 
     SwTOXSortTabBase( TOXSortType nType,
-                      const SwCntntNode* pTOXSrc,
-                      const SwTxtTOXMark* pTxtMark,
+                      const SwContentNode* pTOXSrc,
+                      const SwTextTOXMark* pTextMark,
                       const SwTOXInternational* pIntl,
                       const ::com::sun::star::lang::Locale* pLocale = NULL );
     virtual ~SwTOXSortTabBase() {}
@@ -140,31 +140,31 @@ struct SwTOXSortTabBase
     sal_uInt16  GetType() const         { return nType; }
     static sal_uInt16  GetOptions()     { return nOpt; }
 
-    virtual void    FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0) const;
+    virtual void    FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0) const;
     virtual sal_uInt16  GetLevel()  const = 0;
     virtual bool    operator==( const SwTOXSortTabBase& );
     virtual bool    operator<( const SwTOXSortTabBase& );
 
     virtual OUString  GetURL() const;
 
-    inline TextAndReading GetTxt() const;
+    inline TextAndReading GetText() const;
     inline const ::com::sun::star::lang::Locale& GetLocale() const;
 
 private:
-    mutable bool bValidTxt;
+    mutable bool bValidText;
     mutable TextAndReading m_aSort;
 
     virtual TextAndReading GetText_Impl() const = 0;
 };
 
-inline TextAndReading SwTOXSortTabBase::GetTxt() const
+inline TextAndReading SwTOXSortTabBase::GetText() const
 {
-    if( !bValidTxt )
+    if( !bValidText )
     {
         // 'this' is 'SwTOXSortTabBase const*', so the virtual
         // mechanism will call the derived class' GetText_Impl
         m_aSort = GetText_Impl();
-        bValidTxt = true;
+        bValidText = true;
     }
     return m_aSort;
 }
@@ -179,12 +179,12 @@ inline const ::com::sun::star::lang::Locale& SwTOXSortTabBase::GetLocale() const
  */
 struct SwTOXIndex : public SwTOXSortTabBase
 {
-    SwTOXIndex( const SwTxtNode&, const SwTxtTOXMark*, sal_uInt16 nOptions, sal_uInt8 nKeyLevel,
+    SwTOXIndex( const SwTextNode&, const SwTextTOXMark*, sal_uInt16 nOptions, sal_uInt8 nKeyLevel,
                 const SwTOXInternational& rIntl,
                 const ::com::sun::star::lang::Locale& rLocale );
     virtual ~SwTOXIndex() {}
 
-    virtual void    FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
+    virtual void    FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
     virtual sal_uInt16  GetLevel() const SAL_OVERRIDE;
     virtual bool    operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE;
     virtual bool    operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE;
@@ -218,11 +218,11 @@ private:
  */
 struct SwTOXContent : public SwTOXSortTabBase
 {
-    SwTOXContent( const SwTxtNode&, const SwTxtTOXMark*,
+    SwTOXContent( const SwTextNode&, const SwTextTOXMark*,
                 const SwTOXInternational& rIntl );
     virtual ~SwTOXContent() {}
 
-    virtual void    FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
+    virtual void    FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
     virtual sal_uInt16  GetLevel() const SAL_OVERRIDE;
 private:
     virtual TextAndReading GetText_Impl() const SAL_OVERRIDE;
@@ -231,13 +231,13 @@ private:
 
 struct SwTOXPara : public SwTOXSortTabBase
 {
-    SwTOXPara( const SwCntntNode&, SwTOXElement, sal_uInt16 nLevel = FORM_ALPHA_DELIMITTER, const OUString& sSeqName = OUString() );
+    SwTOXPara( const SwContentNode&, SwTOXElement, sal_uInt16 nLevel = FORM_ALPHA_DELIMITTER, const OUString& sSeqName = OUString() );
     virtual ~SwTOXPara() {}
 
     void    SetStartIndex(sal_Int32 nSet)    { nStartIndex = nSet; }
     void    SetEndIndex(sal_Int32 nSet)      { nEndIndex = nSet; }
 
-    virtual void    FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
+    virtual void    FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
     virtual sal_uInt16  GetLevel() const SAL_OVERRIDE;
 
     virtual OUString  GetURL() const SAL_OVERRIDE;
@@ -253,7 +253,7 @@ private:
 
 struct SwTOXTable : public SwTOXSortTabBase
 {
-    SwTOXTable( const SwCntntNode& rNd );
+    SwTOXTable( const SwContentNode& rNd );
     virtual ~SwTOXTable() {}
 
     void    SetLevel(sal_uInt16 nSet){nLevel = nSet;}
@@ -270,15 +270,15 @@ private:
 struct SwTOXAuthority : public SwTOXSortTabBase
 {
 private:
-    SwFmtFld& m_rField;
-    virtual void    FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
+    SwFormatField& m_rField;
+    virtual void    FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE;
     virtual TextAndReading GetText_Impl() const SAL_OVERRIDE;
 
 public:
-    SwTOXAuthority( const SwCntntNode& rNd, SwFmtFld& rField, const SwTOXInternational& rIntl );
+    SwTOXAuthority( const SwContentNode& rNd, SwFormatField& rField, const SwTOXInternational& rIntl );
     virtual ~SwTOXAuthority() {}
 
-    SwFmtFld& GetFldFmt() {return m_rField;}
+    SwFormatField& GetFieldFormat() {return m_rField;}
 
     virtual bool    operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE;
     virtual bool    operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE;
diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index 4fe14f436b90..bdb26e4bb778 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -25,15 +25,15 @@
 #include <vector>
 
 class OutputDevice;
-class SwCntntFrm;
+class SwContentFrm;
 class SwPageFrm;
-class SwTxtFly;
+class SwTextFly;
 class SdrObject;
-class SwTxtPaintInfo;
-class SwFmt;
+class SwTextPaintInfo;
+class SwFormat;
 class TextRanger;
 class SwAnchoredObject;
-class SwTxtFrm;
+class SwTextFrm;
 class SwDrawTextInfo;
 class SwContourCache;
 
@@ -59,8 +59,8 @@ class SwContourCache
     TextRanger *pTextRanger[ POLY_CNT ];
     long nPntCnt;
     sal_uInt16 nObjCnt;
-    const SwRect ContourRect( const SwFmt* pFmt, const SdrObject* pObj,
-        const SwTxtFrm* pFrm, const SwRect &rLine, const long nXPos,
+    const SwRect ContourRect( const SwFormat* pFormat, const SdrObject* pObj,
+        const SwTextFrm* pFrm, const SwRect &rLine, const long nXPos,
         const bool bRight );
 
 public:
@@ -79,7 +79,7 @@ public:
      */
     static const SwRect CalcBoundRect( const SwAnchoredObject* pAnchoredObj,
                                        const SwRect &rLine,
-                                       const SwTxtFrm* pFrm,
+                                       const SwTextFrm* pFrm,
                                        const long nXPos,
                                        const bool bRight );
 };
@@ -87,11 +87,11 @@ public:
 /**
    The purpose of this class is to be the universal interface between
    formatting/text output and the possibly overlapping free-flying frames.
-   During formatting the formatter gets the information from SwTxtFly, whether
+   During formatting the formatter gets the information from SwTextFly, whether
    a certain area is present by the attributes of an overlapping frame.
    Such areas are represented by dummy portions.
 
-   The whole text output and touch-up is, again, forwarded to a SwTxtFly.
+   The whole text output and touch-up is, again, forwarded to a SwTextFly.
    This one decides, whether parts of the text need to be clipped and splits
    the areas for e.g. a DrawRect.
 
@@ -116,12 +116,12 @@ public:
    Every frame can push away text, with the restriction that it only has influence
    until the next frame.
  */
-class SwTxtFly
+class SwTextFly
 {
     const SwPageFrm             * pPage;
     const SwAnchoredObject      * mpCurrAnchoredObj;
-    const SwTxtFrm              * pCurrFrm;
-    const SwCntntFrm            * pMaster;
+    const SwTextFrm              * pCurrFrm;
+    const SwContentFrm            * pMaster;
     SwAnchoredObjList           * mpAnchoredObjList;
 
     long nMinBottom;
@@ -196,21 +196,21 @@ class SwTxtFly
     SwAnchoredObjList::size_type GetPos( const SwAnchoredObject* pAnchoredObj ) const;
 
     bool GetTop( const SwAnchoredObject* _pAnchoredObj,
-                 const bool bInFtn,
+                 const bool bInFootnote,
                  const bool bInFooterOrHeader );
 
     SwTwips CalcMinBottom() const;
 
-    const SwCntntFrm* _GetMaster();
+    const SwContentFrm* _GetMaster();
 
 public:
 
-    SwTxtFly();
-    SwTxtFly( const SwTxtFrm *pFrm );
-    SwTxtFly( const SwTxtFly& rTxtFly );
-    ~SwTxtFly();
+    SwTextFly();
+    SwTextFly( const SwTextFrm *pFrm );
+    SwTextFly( const SwTextFly& rTextFly );
+    ~SwTextFly();
 
-    void CtorInitTxtFly( const SwTxtFrm *pFrm );
+    void CtorInitTextFly( const SwTextFrm *pFrm );
 
     void SetTopRule();
 
@@ -227,7 +227,7 @@ public:
     bool Relax();
 
     SwTwips GetMinBottom() const;
-    const SwCntntFrm* GetMaster() const;
+    const SwContentFrm* GetMaster() const;
 
     // This temporary variable needs to be manipulated in const methods
     long GetNextTop() const;
@@ -266,10 +266,10 @@ public:
         won't be scribbled
      */
     void DrawFlyRect( OutputDevice* pOut, const SwRect &rRect,
-                      const SwTxtPaintInfo &rInf, bool bNoGraphic = false );
+                      const SwTextPaintInfo &rInf, bool bNoGraphic = false );
 
     /**
-        Used to switch off the SwTxtFly when there is no overlapping object (Relax).
+        Used to switch off the SwTextFly when there is no overlapping object (Relax).
 
         \param[in] the line area
         \return whether the line will be overlapped by a frame
@@ -299,24 +299,24 @@ public:
     void SetIgnoreObjsInHeaderFooter( const bool bNew );
 };
 
-inline SwAnchoredObjList* SwTxtFly::GetAnchoredObjList() const
+inline SwAnchoredObjList* SwTextFly::GetAnchoredObjList() const
 {
     return mpAnchoredObjList
            ? mpAnchoredObjList
-           : const_cast<SwTxtFly*>(this)->InitAnchoredObjList();
+           : const_cast<SwTextFly*>(this)->InitAnchoredObjList();
 }
 
-inline void SwTxtFly::SetTopRule()
+inline void SwTextFly::SetTopRule()
 {
     bTopRule = false;
 }
 
-inline bool SwTxtFly::IsOn() const
+inline bool SwTextFly::IsOn() const
 {
     return bOn;
 }
 
-inline bool SwTxtFly::Relax( const SwRect &rRect )
+inline bool SwTextFly::Relax( const SwRect &rRect )
 {
     if (bOn)
     {
@@ -325,7 +325,7 @@ inline bool SwTxtFly::Relax( const SwRect &rRect )
     return bOn;
 }
 
-inline bool SwTxtFly::Relax()
+inline bool SwTextFly::Relax()
 {
     if (bOn)
     {
@@ -334,42 +334,42 @@ inline bool SwTxtFly::Relax()
     return bOn;
 }
 
-inline SwTwips SwTxtFly::GetMinBottom() const
+inline SwTwips SwTextFly::GetMinBottom() const
 {
     return mpAnchoredObjList ? nMinBottom : CalcMinBottom();
 }
 
-inline const SwCntntFrm* SwTxtFly::GetMaster() const
+inline const SwContentFrm* SwTextFly::GetMaster() const
 {
-    return pMaster ? pMaster : const_cast<SwTxtFly*>(this)->_GetMaster();
+    return pMaster ? pMaster : const_cast<SwTextFly*>(this)->_GetMaster();
 }
 
-inline long SwTxtFly::GetNextTop() const
+inline long SwTextFly::GetNextTop() const
 {
     return nNextTop;
 }
 
-inline void SwTxtFly::SetNextTop( long nNew ) const
+inline void SwTextFly::SetNextTop( long nNew ) const
 {
-    const_cast<SwTxtFly*>(this)->nNextTop = nNew;
+    const_cast<SwTextFly*>(this)->nNextTop = nNew;
 }
 
-inline SwRect SwTxtFly::GetFrm( const SwRect &rRect, bool bTop ) const
+inline SwRect SwTextFly::GetFrm( const SwRect &rRect, bool bTop ) const
 {
     return bOn ? _GetFrm( rRect, bTop ) : SwRect();
 }
 
-inline void SwTxtFly::SetIgnoreCurrentFrame( bool bNew )
+inline void SwTextFly::SetIgnoreCurrentFrame( bool bNew )
 {
     mbIgnoreCurrentFrame = bNew;
 }
 
-inline void SwTxtFly::SetIgnoreContour( bool bNew )
+inline void SwTextFly::SetIgnoreContour( bool bNew )
 {
     mbIgnoreContour = bNew;
 }
 
-inline void SwTxtFly::SetIgnoreObjsInHeaderFooter( const bool bNew )
+inline void SwTextFly::SetIgnoreObjsInHeaderFooter( const bool bNew )
 {
     mbIgnoreObjsInHeaderFooter = bNew;
 }
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 784db5f8e510..2d1418c49966 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -25,17 +25,17 @@
 #include "ndtxt.hxx"
 
 class SwCharRange;
-class SwTxtNode;
-class SwTxtFormatter;
-class SwTxtFormatInfo;
+class SwTextNode;
+class SwTextFormatter;
+class SwTextFormatInfo;
 class SwParaPortion;
 class WidowsAndOrphans;
 class SwBodyFrm;
-class SwTxtFtn;
+class SwTextFootnote;
 class SwInterHyphInfo;      // Hyphenate()
 class SwCache;
 class SwBorderAttrs;
-class SwFrmFmt;
+class SwFrameFormat;
 class OutputDevice;
 class SwTestFormat;
 struct SwCrsrMoveState;
@@ -48,15 +48,15 @@ class SwWrongList;
 #define NON_PRINTING_CHARACTER_COLOR RGB_COLORDATA(0x26, 0x8b, 0xd2)
 
 /// Represents the visualization of a paragraph.
-class SwTxtFrm: public SwCntntFrm
+class SwTextFrm: public SwContentFrm
 {
-    friend class SwTxtIter;
+    friend class SwTextIter;
     friend class SwTestFormat;
     friend class WidowsAndOrphans;
-    friend class TxtFrmLockGuard; // May Lock()/Unlock()
-    friend bool sw_ChangeOffset( SwTxtFrm* pFrm, sal_Int32 nNew );
+    friend class TextFrmLockGuard; // May Lock()/Unlock()
+    friend bool sw_ChangeOffset( SwTextFrm* pFrm, sal_Int32 nNew );
 
-    static SwCache *pTxtCache;  // Pointer to the Line Cache
+    static SwCache *pTextCache;  // Pointer to the Line Cache
     static long nMinPrtLine;    // This Line must not be underrun when printing
                                 // Hack for table cells stretching multiple pages
 
@@ -64,11 +64,11 @@ class SwTxtFrm: public SwCntntFrm
     sal_uLong  nThisLines       :8; // Count of Lines of the Frame
 
     // The x position for flys anchored at this paragraph.
-    // These values are calculated in SwTxtFrm::CalcBaseOfstForFly()
+    // These values are calculated in SwTextFrm::CalcBaseOfstForFly()
     SwTwips mnFlyAnchorOfst;
     // The x position for wrap-through flys anchored at this paragraph.
     SwTwips mnFlyAnchorOfstNoWrap;
-    SwTwips mnFtnLine;
+    SwTwips mnFootnoteLine;
     // OD 2004-03-17 #i11860# - re-factoring of #i11859#
     // member for height of last line (value needed for proportional line spacing)
     SwTwips mnHeightOfLastLine;
@@ -78,14 +78,14 @@ class SwTxtFrm: public SwCntntFrm
     // It is NOT used for the determination of printing area.
     SwTwips mnAdditionalFirstLineOffset;
 
-    sal_Int32 nOfst; // Is the offset in the Cntnt (character count)
+    sal_Int32 nOfst; // Is the offset in the Content (character count)
 
     sal_uInt16 nCacheIdx; // Index into the cache, USHRT_MAX if there's definitely no fitting object in the cache
 
     // Separates the Master and creates a Follow or adjusts the data in the Follow
-    void _AdjustFollow( SwTxtFormatter &rLine, const sal_Int32 nOffset,
+    void _AdjustFollow( SwTextFormatter &rLine, const sal_Int32 nOffset,
                                const sal_Int32 nStrEnd, const sal_uInt8 nMode );
-    inline void AdjustFollow( SwTxtFormatter &rLine, const sal_Int32 nOffset,
+    inline void AdjustFollow( SwTextFormatter &rLine, const sal_Int32 nOffset,
                               const sal_Int32 nStrEnd, const sal_uInt8 nMode );
 
     // Iterates all Lines and sets the line spacing using the attribute
@@ -101,16 +101,16 @@ class SwTxtFrm: public SwCntntFrm
     inline void InvalidateRange( const SwCharRange &, const long = 0);
 
     // WidowsAndOrphans, AdjustFrm, AdjustFollow
-    void FormatAdjust( SwTxtFormatter &rLine, WidowsAndOrphans &rFrmBreak,
+    void FormatAdjust( SwTextFormatter &rLine, WidowsAndOrphans &rFrmBreak,
                        const sal_Int32 nStrLen, const bool bDummy );
 
     bool bLocked        : 1;        // In the Format?
     bool bWidow         : 1;        // Are we a Widow?
     bool bJustWidow     : 1;        // Did we just request to be a Widow?
     bool bEmpty         : 1;        // Are we an empty paragraph?
-    bool bInFtnConnect  : 1;        // Is in Connect at the moment
-    bool bFtn           : 1;        // Has at least one footnote
-    bool bRepaint       : 1;        // TxtFrm: Repaint is ready to be fetched
+    bool bInFootnoteConnect  : 1;        // Is in Connect at the moment
+    bool bFootnote           : 1;        // Has at least one footnote
+    bool bRepaint       : 1;        // TextFrm: Repaint is ready to be fetched
     bool bBlinkPor      : 1;        // Contains Blink Portions
     bool bFieldFollow   : 1;        // Start with Field rest of the Master
     bool bHasAnimation  : 1;        // Contains animated SwGrfNumPortion
@@ -138,29 +138,29 @@ class SwTxtFrm: public SwCntntFrm
     void FillCrsrPos( SwFillData &rFill ) const;
 
     // Format exactly one Line
-    bool FormatLine( SwTxtFormatter &rLine, const bool bPrev );
+    bool FormatLine( SwTextFormatter &rLine, const bool bPrev );
 
     // In order to safe stack space, we split this method:
     // _Format calls _Format with parameters
     void _Format( SwParaPortion *pPara );
-    void _Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
+    void _Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf,
                   const bool bAdjust = false );
-    void FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf );
+    void FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf );
 
     // Formats the Follow and ensures disposing on orphans
-    bool CalcFollow(  const sal_Int32 nTxtOfst );
+    bool CalcFollow(  const sal_Int32 nTextOfst );
 
     // Corrects the position from which we need to format
-    static sal_Int32 FindBrk(const OUString &rTxt, const sal_Int32 nStart,
+    static sal_Int32 FindBrk(const OUString &rText, const sal_Int32 nStart,
                                        const sal_Int32 nEnd);
 
     // inline branch
-    SwTwips _GetFtnFrmHeight() const;
+    SwTwips _GetFootnoteFrmHeight() const;
 
     // Outsourced to CalcPreps
-    bool CalcPrepFtnAdjust();
+    bool CalcPrepFootnoteAdjust();
 
-    // For Ftn and WidOrp: Forced validation
+    // For Footnote and WidOrp: Forced validation
     void ValidateFrm();
     void ValidateBodyFrm();
 
@@ -168,7 +168,7 @@ class SwTxtFrm: public SwCntntFrm
 
     void SetPara( SwParaPortion *pNew, bool bDelete = true );
 
-    bool _IsFtnNumFrm() const;
+    bool _IsFootnoteNumFrm() const;
 
     // Refresh formatting information
     bool FormatQuick( bool bForceQuickFormat );
@@ -199,14 +199,14 @@ class SwTxtFrm: public SwCntntFrm
     void _CalcHeightOfLastLine( const bool _bUseFont = false );
 
     // ST2
-    SwWrongList* _SmartTagScan ( const OUString& aTxtToScan, SwWrongList *pSmartTagList,
+    SwWrongList* _SmartTagScan ( const OUString& aTextToScan, SwWrongList *pSmartTagList,
                                  sal_Int32 nBegin,sal_Int32 nEnd,
                                  sal_Int32 nInsertPos, sal_Int32 nActPos,
                                  sal_Int32 &nChgStart, sal_Int32 &nChgEnd,
                                  sal_Int32 &nInvStart, sal_Int32 &nInvEnd);
 
     virtual void DestroyImpl() SAL_OVERRIDE;
-    virtual ~SwTxtFrm();
+    virtual ~SwTextFrm();
 
 protected:
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
@@ -222,13 +222,13 @@ public:
     void Init();
 
     /// Is called by FormatSpelling()
-    SwRect _AutoSpell( const SwCntntNode*, sal_Int32 );
+    SwRect _AutoSpell( const SwContentNode*, sal_Int32 );
 
     /// Is called by FormatSpelling()
-    SwRect SmartTagScan( SwCntntNode* , sal_Int32 );
+    SwRect SmartTagScan( SwContentNode* , sal_Int32 );
 
     /// Is called by CollectAutoCmplWords()
-    void CollectAutoCmplWrds( SwCntntNode* , sal_Int32 );
+    void CollectAutoCmplWrds( SwContentNode* , sal_Int32 );
 
     /**
      * Returns the screen position of rPos. The values are relative to the upper
@@ -316,30 +316,30 @@ public:
                             bool& bRight, bool bInsertCrsr );
 
     /// Methods to manage the FollowFrame
-    SwCntntFrm *SplitFrm( const sal_Int32 nTxtPos );
-    SwCntntFrm *JoinFrm();
+    SwContentFrm *SplitFrm( const sal_Int32 nTextPos );
+    SwContentFrm *JoinFrm();
     inline sal_Int32  GetOfst() const { return nOfst; }
            void        _SetOfst( const sal_Int32 nNewOfst );
     inline void        SetOfst ( const sal_Int32 nNewOfst );
     inline void        ManipOfst ( const sal_Int32 nNewOfst ){ nOfst = nNewOfst; }
-           SwTxtFrm   *GetFrmAtPos ( const SwPosition &rPos);
-    inline const SwTxtFrm *GetFrmAtPos ( const SwPosition &rPos) const;
-    SwTxtFrm&   GetFrmAtOfst( const sal_Int32 nOfst );
+           SwTextFrm   *GetFrmAtPos ( const SwPosition &rPos);
+    inline const SwTextFrm *GetFrmAtPos ( const SwPosition &rPos) const;
+    SwTextFrm&   GetFrmAtOfst( const sal_Int32 nOfst );
     /// If there's a Follow and we don't contain text ourselves
     inline bool IsEmptyMaster() const
         { return GetFollow() && !GetFollow()->GetOfst(); }
 
     /// Returns the text portion we want to edit (for inline see underneath)
-    const OUString& GetTxt() const;
-    inline SwTxtNode *GetTxtNode()
-        { return static_cast< SwTxtNode* >( SwCntntFrm::GetNode()); }
-    inline const SwTxtNode *GetTxtNode() const
-        { return static_cast< const SwTxtNode* >( SwCntntFrm::GetNode()); }
+    const OUString& GetText() const;
+    inline SwTextNode *GetTextNode()
+        { return static_cast< SwTextNode* >( SwContentFrm::GetNode()); }
+    inline const SwTextNode *GetTextNode() const
+        { return static_cast< const SwTextNode* >( SwContentFrm::GetNode()); }
 
-    SwTxtFrm(SwTxtNode * const, SwFrm* );
+    SwTextFrm(SwTextNode * const, SwFrm* );
 
     /**
-     * SwCntntFrm: the shortcut for the Frames
+     * SwContentFrm: the shortcut for the Frames
      * If the void* casts wrongly, it's its own fault!
      * The void* must be checked for 0 in any case!
      */
@@ -381,7 +381,7 @@ public:
 
     // RTTI
     TYPEINFO_OVERRIDE();
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTxtFrm)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTextFrm)
 
     // Locking
     inline bool IsLocked()      const { return bLocked;     }
@@ -389,8 +389,8 @@ public:
     inline bool IsWidow()       const { return bWidow;      }
     inline bool IsJustWidow()   const { return bJustWidow;  }
     inline bool IsEmpty()       const { return bEmpty;      }
-    inline bool HasFtn()        const { return bFtn;        }
-    inline bool IsInFtnConnect()const { return bInFtnConnect;}
+    inline bool HasFootnote()        const { return bFootnote;        }
+    inline bool IsInFootnoteConnect()const { return bInFootnoteConnect;}
     inline bool IsFieldFollow() const { return bFieldFollow;}
 
     inline void SetRepaint() const;
@@ -400,16 +400,16 @@ public:
     inline void ResetBlinkPor() const;
     inline bool HasBlinkPor() const { return bBlinkPor; }
     inline void SetAnimation() const
-        { const_cast<SwTxtFrm*>(this)->bHasAnimation = true; }
+        { const_cast<SwTextFrm*>(this)->bHasAnimation = true; }
     inline bool HasAnimation() const { return bHasAnimation; }
 
     inline bool IsSwapped() const { return bIsSwapped; }
 
     /// Does the Frm have a local footnote (in this Frm or Follow)?
 #ifdef DBG_UTIL
-    void CalcFtnFlag( sal_Int32 nStop = COMPLETE_STRING ); //For testing SplitFrm
+    void CalcFootnoteFlag( sal_Int32 nStop = COMPLETE_STRING ); //For testing SplitFrm
 #else
-    void CalcFtnFlag();
+    void CalcFootnoteFlag();
 #endif
 
     /// Hidden
@@ -424,20 +424,20 @@ public:
      */
     void HideAndShowObjects();
 
-    /// Ftn
-    void RemoveFtn( const sal_Int32 nStart = 0,
+    /// Footnote
+    void RemoveFootnote( const sal_Int32 nStart = 0,
                     const sal_Int32 nLen = COMPLETE_STRING );
-    inline SwTwips GetFtnFrmHeight() const;
-    SwTxtFrm *FindFtnRef( const SwTxtFtn *pFtn );
-    inline const SwTxtFrm *FindFtnRef( const SwTxtFtn *pFtn ) const
-    { return const_cast<SwTxtFrm *>(this)->FindFtnRef( pFtn ); }
-    void ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine );
+    inline SwTwips GetFootnoteFrmHeight() const;
+    SwTextFrm *FindFootnoteRef( const SwTextFootnote *pFootnote );
+    inline const SwTextFrm *FindFootnoteRef( const SwTextFootnote *pFootnote ) const
+    { return const_cast<SwTextFrm *>(this)->FindFootnoteRef( pFootnote ); }
+    void ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDeadLine );
 
     /**
-     * If we're a Ftn that grows towards its reference ...
-     * public, because it's needed by SwCntntFrm::MakeAll
+     * If we're a Footnote that grows towards its reference ...
+     * public, because it's needed by SwContentFrm::MakeAll
      */
-    SwTwips GetFtnLine( const SwTxtFtn *pFtn ) const;
+    SwTwips GetFootnoteLine( const SwTextFootnote *pFootnote ) const;
 
     /**
      * Returns the left and the right margin document coordinates
@@ -455,11 +455,11 @@ public:
     /// Returns the remaining height
     inline SwTwips GetRstHeight() const;
 
-    inline       SwTxtFrm *GetFollow();
-    inline const SwTxtFrm *GetFollow() const;
+    inline       SwTextFrm *GetFollow();
+    inline const SwTextFrm *GetFollow() const;
 
     /// Find the page number of ErgoSum and QuoVadis
-    SwTxtFrm *FindQuoVadisFrm();
+    SwTextFrm *FindQuoVadisFrm();
 
     /**
      * Makes up for formatting if the Idle Handler has struck
@@ -469,10 +469,10 @@ public:
      * has to be avoided during painting. Therefore we need to pass the
      * information that we are currently in the paint process.
      */
-    SwTxtFrm* GetFormatted( bool bForceQuickFormat = false );
+    SwTextFrm* GetFormatted( bool bForceQuickFormat = false );
 
     /// Will be moved soon
-    inline void SetFtn( const bool bNew ) { bFtn = bNew; }
+    inline void SetFootnote( const bool bNew ) { bFootnote = bNew; }
 
     /// Respect the Follows
     inline bool IsInside( const sal_Int32 nPos ) const;
@@ -483,8 +483,8 @@ public:
     inline bool GetDropRect( SwRect &rRect ) const
     { return HasPara() && _GetDropRect( rRect ); }
 
-    static SwCache *GetTxtCache() { return pTxtCache; }
-    static void     SetTxtCache( SwCache *pNew ) { pTxtCache = pNew; }
+    static SwCache *GetTextCache() { return pTextCache; }
+    static void     SetTextCache( SwCache *pNew ) { pTextCache = pNew; }
 
     static long GetMinPrtLine() { return nMinPrtLine; }
     static void SetMinPrtLine( long nNew ) { nMinPrtLine = nNew; }
@@ -495,9 +495,9 @@ public:
     /// Removes the Line information from the Cache
     void ClearPara();
 
-    /// Am I a FtnFrm, with a number at the start of the paragraph?
-    inline bool IsFtnNumFrm() const
-    { return IsInFtn() && !GetIndPrev() && _IsFtnNumFrm(); }
+    /// Am I a FootnoteFrm, with a number at the start of the paragraph?
+    inline bool IsFootnoteNumFrm() const
+    { return IsInFootnote() && !GetIndPrev() && _IsFootnoteNumFrm(); }
 
     /**
      * Simulates a formatting as if there were not right margin or Flys or other
@@ -529,10 +529,10 @@ public:
     sal_uInt16 FirstLineHeight() const;
 
     /// Rewires FlyInCntFrm, if nEnd > Index >= nStart
-    void MoveFlyInCnt( SwTxtFrm *pNew, sal_Int32 nStart, sal_Int32 nEnd );
+    void MoveFlyInCnt( SwTextFrm *pNew, sal_Int32 nStart, sal_Int32 nEnd );
 
     /// Calculates the position of FlyInCntFrms
-    sal_Int32 CalcFlyPos( SwFrmFmt* pSearch );
+    sal_Int32 CalcFlyPos( SwFrameFormat* pSearch );
 
     /// Determines the start position and step size of the register
     bool FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff );
@@ -644,28 +644,28 @@ public:
         return mnHeightOfLastLine;
     }
 
-    static void repaintTextFrames( const SwTxtNode& rNode );
+    static void repaintTextFrames( const SwTextNode& rNode );
 
     virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE;
 };
 
-//use this to protect a SwTxtFrm for a given scope from getting merged with
+//use this to protect a SwTextFrm for a given scope from getting merged with
 //its neighbour and thus deleted
-class TxtFrmLockGuard
+class TextFrmLockGuard
 {
 private:
-    SwTxtFrm *m_pTxtFrm;
+    SwTextFrm *m_pTextFrm;
     bool m_bOldLocked;
 public:
     //Lock pFrm for the lifetime of the Cut/Paste call, etc. to avoid
-    //SwTxtFrm::_AdjustFollow removing the pFrm we're trying to Make
-    TxtFrmLockGuard(SwFrm* pFrm)
+    //SwTextFrm::_AdjustFollow removing the pFrm we're trying to Make
+    TextFrmLockGuard(SwFrm* pFrm)
     {
-        m_pTxtFrm = pFrm->IsTxtFrm() ? static_cast<SwTxtFrm*>(pFrm) : 0;
-        if (m_pTxtFrm)
+        m_pTextFrm = pFrm->IsTextFrm() ? static_cast<SwTextFrm*>(pFrm) : 0;
+        if (m_pTextFrm)
         {
-            m_bOldLocked = m_pTxtFrm->IsLocked();
-            m_pTxtFrm->Lock();
+            m_bOldLocked = m_pTextFrm->IsLocked();
+            m_pTextFrm->Lock();
         }
         else
         {
@@ -673,25 +673,25 @@ public:
         }
     }
 
-    ~TxtFrmLockGuard()
+    ~TextFrmLockGuard()
     {
-        if (m_pTxtFrm && !m_bOldLocked)
-            m_pTxtFrm->Unlock();
+        if (m_pTextFrm && !m_bOldLocked)
+            m_pTextFrm->Unlock();
     }
 };
 
-inline const SwParaPortion *SwTxtFrm::GetPara() const
+inline const SwParaPortion *SwTextFrm::GetPara() const
 {
-    return const_cast<SwTxtFrm*>(this)->GetPara();
+    return const_cast<SwTextFrm*>(this)->GetPara();
 }
 
-inline bool SwTxtFrm::HasPara() const
+inline bool SwTextFrm::HasPara() const
 {
     return nCacheIdx!=USHRT_MAX && _HasPara();
 }
 
 /// 9104: Frm().Height() - Prt().Height(), see widorp.cxx and 7455, 6114, 7908
-inline SwTwips SwTxtFrm::GetRstHeight() const
+inline SwTwips SwTextFrm::GetRstHeight() const
 {
     return !GetUpper() ? 0 : static_cast<const SwFrm*>(GetUpper())->Frm().Top()
                            + static_cast<const SwFrm*>(GetUpper())->Prt().Top()
@@ -699,84 +699,84 @@ inline SwTwips SwTxtFrm::GetRstHeight() const
                            - Frm().Top() - (Frm().Height() - Prt().Height());
 }
 
-inline SwTwips SwTxtFrm::GetLeftMargin() const
+inline SwTwips SwTextFrm::GetLeftMargin() const
 {
     return Frm().Left() + Prt().Left();
 }
-inline SwTwips SwTxtFrm::GetRightMargin() const
+inline SwTwips SwTextFrm::GetRightMargin() const
 {
     return Frm().Left() + Prt().Left() + Prt().Width();
 }
-inline SwTwips SwTxtFrm::GrowTst( const SwTwips nGrow )
+inline SwTwips SwTextFrm::GrowTst( const SwTwips nGrow )
 {
     return Grow( nGrow, true );
 }
 
-inline bool SwTxtFrm::IsInside( const sal_Int32 nPos ) const
+inline bool SwTextFrm::IsInside( const sal_Int32 nPos ) const
 {
     bool bRet = true;
     if( nPos < GetOfst() )
         bRet = false;
     else
     {
-        const SwTxtFrm *pFoll = GetFollow();
+        const SwTextFrm *pFoll = GetFollow();
         if( pFoll && nPos >= pFoll->GetOfst() )
             bRet = false;
     }
     return bRet;
 }
 
-inline SwTwips SwTxtFrm::GetFtnFrmHeight() const
+inline SwTwips SwTextFrm::GetFootnoteFrmHeight() const
 {
-    if(  !IsFollow() && IsInFtn() && HasPara() )
-        return _GetFtnFrmHeight();
+    if(  !IsFollow() && IsInFootnote() && HasPara() )
+        return _GetFootnoteFrmHeight();
     else
         return 0;
 }
 
-inline const SwTxtFrm *SwTxtFrm::GetFollow() const
+inline const SwTextFrm *SwTextFrm::GetFollow() const
 {
-    return static_cast<const SwTxtFrm*>(SwCntntFrm::GetFollow());
+    return static_cast<const SwTextFrm*>(SwContentFrm::GetFollow());
 }
-inline SwTxtFrm *SwTxtFrm::GetFollow()
+inline SwTextFrm *SwTextFrm::GetFollow()
 {
-    return static_cast<SwTxtFrm*>(SwCntntFrm::GetFollow());
+    return static_cast<SwTextFrm*>(SwContentFrm::GetFollow());
 }
 
-inline const SwTxtFrm *SwTxtFrm::GetFrmAtPos( const SwPosition &rPos) const
+inline const SwTextFrm *SwTextFrm::GetFrmAtPos( const SwPosition &rPos) const
 {
-    return const_cast<SwTxtFrm*>(this)->GetFrmAtPos( rPos );
+    return const_cast<SwTextFrm*>(this)->GetFrmAtPos( rPos );
 }
 
-inline void SwTxtFrm::AdjustFollow( SwTxtFormatter &rLine,
+inline void SwTextFrm::AdjustFollow( SwTextFormatter &rLine,
     const sal_Int32 nOffset, const sal_Int32 nStrEnd, const sal_uInt8 nMode )
 {
     if ( HasFollow() )
         _AdjustFollow( rLine, nOffset, nStrEnd, nMode );
 }
 
-inline void SwTxtFrm::SetOfst( const sal_Int32 nNewOfst )
+inline void SwTextFrm::SetOfst( const sal_Int32 nNewOfst )
 {
     if ( nOfst != nNewOfst )
         _SetOfst( nNewOfst );
 }
 
-inline void SwTxtFrm::SetRepaint() const
+inline void SwTextFrm::SetRepaint() const
 {
-    const_cast<SwTxtFrm*>(this)->bRepaint = true;
+    const_cast<SwTextFrm*>(this)->bRepaint = true;
 }
-inline void SwTxtFrm::ResetRepaint() const
+inline void SwTextFrm::ResetRepaint() const
 {
-    const_cast<SwTxtFrm*>(this)->bRepaint = false;
+    const_cast<SwTextFrm*>(this)->bRepaint = false;
 }
 
-inline void SwTxtFrm::SetBlinkPor() const
+inline void SwTextFrm::SetBlinkPor() const
 {
-    const_cast<SwTxtFrm*>(this)->bBlinkPor = true;
+    const_cast<SwTextFrm*>(this)->bBlinkPor = true;
 }
-inline void SwTxtFrm::ResetBlinkPor() const
+inline void SwTextFrm::ResetBlinkPor() const
 {
-    const_cast<SwTxtFrm*>(this)->bBlinkPor = false;
+    const_cast<SwTextFrm*>(this)->bBlinkPor = false;
 }
 
 #define SWAP_IF_SWAPPED( pFrm )\
@@ -784,7 +784,7 @@ inline void SwTxtFrm::ResetBlinkPor() const
     if ( pFrm->IsVertical() && pFrm->IsSwapped() )\
     {                                 \
         bUndoSwap = true;         \
-        const_cast<SwTxtFrm*>(pFrm)->SwapWidthAndHeight();         \
+        const_cast<SwTextFrm*>(pFrm)->SwapWidthAndHeight();         \
     }
 
 #define SWAP_IF_NOT_SWAPPED( pFrm )\
@@ -792,12 +792,12 @@ inline void SwTxtFrm::ResetBlinkPor() const
     if ( pFrm->IsVertical() && ! pFrm->IsSwapped() )\
     {                                   \
         bUndoSwap = true;           \
-        const_cast<SwTxtFrm*>(pFrm)->SwapWidthAndHeight();         \
+        const_cast<SwTextFrm*>(pFrm)->SwapWidthAndHeight();         \
     }
 
 #define UNDO_SWAP( pFrm )\
     if ( bUndoSwap )\
-        const_cast<SwTxtFrm*>(pFrm)->SwapWidthAndHeight();
+        const_cast<SwTextFrm*>(pFrm)->SwapWidthAndHeight();
 
 /**
  * Helper class which can be used instead of the macros if a function
@@ -805,10 +805,10 @@ inline void SwTxtFrm::ResetBlinkPor() const
  */
 class SwFrmSwapper
 {
-    const SwTxtFrm* pFrm;
+    const SwTextFrm* pFrm;
     bool bUndo;
 public:
-    SwFrmSwapper( const SwTxtFrm* pFrm, bool bSwapIfNotSwapped );
+    SwFrmSwapper( const SwTextFrm* pFrm, bool bSwapIfNotSwapped );
     ~SwFrmSwapper();
 };
 
diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx
index 93611f173f35..66440e8696eb 100644
--- a/sw/source/core/inc/undoflystrattr.hxx
+++ b/sw/source/core/inc/undoflystrattr.hxx
@@ -22,12 +22,12 @@
 #include <undobj.hxx>
 #include <swundo.hxx>
 
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
 
 class SwUndoFlyStrAttr : public SwUndo
 {
     public:
-        SwUndoFlyStrAttr( SwFlyFrmFmt& rFlyFrmFmt,
+        SwUndoFlyStrAttr( SwFlyFrameFormat& rFlyFrameFormat,
                           const SwUndoId eUndoId,
                           const OUString& sOldStr,
                           const OUString& sNewStr );
@@ -39,7 +39,7 @@ class SwUndoFlyStrAttr : public SwUndo
         virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
 
     private:
-        SwFlyFrmFmt& mrFlyFrmFmt;
+        SwFlyFrameFormat& mrFlyFrameFormat;
         const OUString msOldStr;
         const OUString msNewStr;
 };
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index cc0ff3364d4f..26fb808c7ebf 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -29,7 +29,7 @@ class SwXTextFrame;
 class SwXTextGraphicObject;
 class SwXTextEmbeddedObject;
 class SwXFrameStyle;
-class SwFmtINetFmt;
+class SwFormatINetFormat;
 
 class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor
 {
@@ -44,8 +44,8 @@ public:
 
      SwHyperlinkEventDescriptor();
 
-    void copyMacrosFromINetFmt(const SwFmtINetFmt& aFmt);
-    void copyMacrosIntoINetFmt(SwFmtINetFmt& aFmt);
+    void copyMacrosFromINetFormat(const SwFormatINetFormat& aFormat);
+    void copyMacrosIntoINetFormat(SwFormatINetFormat& aFormat);
 
     void copyMacrosFromNameReplace(
         ::com::sun::star::uno::Reference<
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 3b30ee143793..b2aa572d9cdb 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -32,7 +32,7 @@
 
 class SwFieldType;
 class SwDoc;
-class SwFmtFld;
+class SwFormatField;
 class SwField;
 class SwSetExpField;
 class SwTextAPIObject;
@@ -67,9 +67,9 @@ public:
                 sal_uInt16 nResId = 0xFFFF);
 
     static OUString GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc);
-    static OUString LocalizeFormula(const SwSetExpField& rFld, const OUString& rFormula, bool bQuery);
+    static OUString LocalizeFormula(const SwSetExpField& rField, const OUString& rFormula, bool bQuery);
 
-    SwFieldType* GetFldType(bool bDontCreate = false) const;
+    SwFieldType* GetFieldType(bool bDontCreate = false) const;
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
@@ -167,7 +167,7 @@ private:
 
     virtual ~SwXTextField();
 
-    SwXTextField(SwFmtFld& rFmt, SwDoc & rDoc);
+    SwXTextField(SwFormatField& rFormat, SwDoc & rDoc);
 
     /// descriptor
     SwXTextField(sal_uInt16 nServiceId, SwDoc* pDoc=0);
@@ -177,7 +177,7 @@ public:
 
     /// @return an SwXTextField, either an already existing one or a new one
     static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField>
-        CreateXTextField(SwDoc * pDoc, SwFmtFld const* pFmt,
+        CreateXTextField(SwDoc * pDoc, SwFormatField const* pFormat,
                 sal_uInt16 nServiceId = 0xFFFF);
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 247243939425..71182ecb4685 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace text {
     class XTextRange;
 } } } }
 
-class SwTxtNode;
+class SwTextNode;
 class SwDoc;
 
 typedef ::cppu::ImplInheritanceHelper
@@ -54,7 +54,7 @@ class SwXFlatParagraph
     :   public SwXFlatParagraph_Base
 {
 public:
-    SwXFlatParagraph( SwTxtNode& rTxtNode, const OUString& aExpandText, const ModelToViewHelper& rConversionMap );
+    SwXFlatParagraph( SwTextNode& rTextNode, const OUString& aExpandText, const ModelToViewHelper& rConversionMap );
     virtual ~SwXFlatParagraph();
 
     // XPropertySet
@@ -124,7 +124,7 @@ public:
     virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
     virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    using SwXTextMarkup::GetTxtNode;
+    using SwXTextMarkup::GetTextNode;
 
     static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index fdf9cf9f90cf..67eae2330250 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -33,7 +33,7 @@
 
 class SwDoc;
 class SwModify;
-class SwFmtFtn;
+class SwFormatFootnote;
 
 typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::lang::XUnoTunnel
@@ -66,13 +66,13 @@ protected:
 
     virtual ~SwXFootnote();
 
-    SwXFootnote(SwDoc & rDoc, SwFmtFtn & rFmt);
+    SwXFootnote(SwDoc & rDoc, SwFormatFootnote & rFormat);
     SwXFootnote(const bool bEndnote);
 
 public:
 
     static css::uno::Reference<css::text::XFootnote>
-        CreateXFootnote(SwDoc & rDoc, SwFmtFtn * pFootnoteFmt,
+        CreateXFootnote(SwDoc & rDoc, SwFormatFootnote * pFootnoteFormat,
                 bool isEndnote = false);
 
     // XInterface
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index e292b3bb0e0e..46523e26484a 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -42,7 +42,7 @@ typedef ::std::deque<
     TextRangeList_t;
 
 class SwPaM;
-class SwTxtNode;
+class SwTextNode;
 
 namespace sw {
     class Meta;
@@ -104,7 +104,7 @@ public:
 
     /// init params with position of the attribute content (w/out CH_TXTATR)
     bool SetContentRange(
-            SwTxtNode *& rpNode, sal_Int32 & rStart, sal_Int32 & rEnd) const;
+            SwTextNode *& rpNode, sal_Int32 & rStart, sal_Int32 & rEnd) const;
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
         GetParentText() const;
 
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index bdbf12507e14..e4f001de58bf 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -35,7 +35,7 @@
 class SwDepend;
 class SwNodeIndex;
 class SwPaM;
-class SwFrmFmt;
+class SwFrameFormat;
 
 struct FrameDependSortListEntry
 {
@@ -85,7 +85,7 @@ private:
 public:
 
     SwXParaFrameEnumeration(const SwPaM& rPaM,
-        const enum ParaFrameMode eParaFrameMode, SwFrmFmt *const pFmt = 0);
+        const enum ParaFrameMode eParaFrameMode, SwFrameFormat *const pFormat = 0);
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 9a82ca09c6bd..4c35e0031d24 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -43,10 +43,10 @@
 #include <calbck.hxx>
 #include <unobaseclass.hxx>
 
-class SwFmtFld;
-class SwFrmFmt;
+class SwFormatField;
+class SwFrameFormat;
 class SwRangeRedline;
-class SwTxtRuby;
+class SwTextRuby;
 
 typedef ::std::deque<
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > >
@@ -116,12 +116,12 @@ private:
     ::std::unique_ptr< ::com::sun::star::uno::Any > m_pRubyIsAbove;
 
     const SwDepend              m_FrameDepend;
-    SwFrmFmt *                  m_pFrameFmt;
+    SwFrameFormat *                  m_pFrameFormat;
     const SwTextPortionType     m_ePortionType;
 
     bool                        m_bIsCollapsed;
 
-    SwFmtFld * GetFldFmt(bool bInit = false);
+    SwFormatField * GetFieldFormat(bool bInit = false);
 
     void init(const SwUnoCrsr* pPortionCursor);
 
@@ -153,11 +153,11 @@ protected:
 
 public:
     SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwTextPortionType   eType   );
-    SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwFrmFmt& rFmt );
+    SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwFrameFormat& rFormat );
 
     // for Ruby
     SwXTextPortion(const SwUnoCrsr* pPortionCrsr,
-        SwTxtRuby const& rAttr,
+        SwTextRuby const& rAttr,
         ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
             const& xParent,
         bool bIsEnd );
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index 6874d939de0d..29641aa16384 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -32,7 +32,7 @@
 
 class SwDoc;
 class SwModify;
-class SwFmtRefMark;
+class SwFormatRefMark;
 
 typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::lang::XUnoTunnel
@@ -53,12 +53,12 @@ private:
 
     virtual ~SwXReferenceMark();
 
-    SwXReferenceMark(SwDoc *const pDoc, SwFmtRefMark *const pMark);
+    SwXReferenceMark(SwDoc *const pDoc, SwFormatRefMark *const pMark);
 
 public:
 
     static css::uno::Reference<css::text::XTextContent>
-        CreateXReferenceMark(SwDoc & rDoc, SwFmtRefMark * pMarkFmt);
+        CreateXReferenceMark(SwDoc & rDoc, SwFormatRefMark * pMarkFormat);
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx
index 651151ef76d1..bfca3adfa9bc 100644
--- a/sw/source/core/inc/unosection.hxx
+++ b/sw/source/core/inc/unosection.hxx
@@ -35,7 +35,7 @@
 
 #include <unobaseclass.hxx>
 
-class SwSectionFmt;
+class SwSectionFormat;
 
 struct SwTextSectionProperties_Impl;
 
@@ -59,17 +59,17 @@ private:
     class Impl;
     ::sw::UnoImplPtr<Impl> m_pImpl;
 
-    SwXTextSection(SwSectionFmt *const pFmt, const bool bIndexHeader = false);
+    SwXTextSection(SwSectionFormat *const pFormat, const bool bIndexHeader = false);
 
     virtual ~SwXTextSection();
 
 public:
 
-    SwSectionFmt*   GetFmt() const;
+    SwSectionFormat*   GetFormat() const;
 
     static ::com::sun::star::uno::Reference<
             ::com::sun::star::text::XTextSection >
-        CreateXTextSection(SwSectionFmt *const pFmt = 0,
+        CreateXTextSection(SwSectionFormat *const pFormat = 0,
                 const bool bIndexHeader = false);
 
     // MetadatableMixin
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index e7d8a0ea19e3..652e1f535123 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace text {
     class XTextRange;
 } } } }
 
-class SwTxtNode;
+class SwTextNode;
 class ModelToViewHelper;
 class SfxPoolItem;
 
@@ -50,7 +50,7 @@ class SwXTextMarkup
         >
 {
 public:
-    SwXTextMarkup(SwTxtNode *const rTxtNode,
+    SwXTextMarkup(SwTextNode *const rTextNode,
             const ModelToViewHelper& rConversionMap);
     virtual ~SwXTextMarkup();
 
@@ -74,8 +74,8 @@ private:
     ::sw::UnoImplPtr<Impl> m_pImpl;
 
 protected:
-    SwTxtNode* GetTxtNode();
-    void ClearTxtNode();
+    SwTextNode* GetTextNode();
+    void ClearTextNode();
     const ModelToViewHelper& GetConversionMap();
 };
 
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 923eee01a7f2..2028eadc4f87 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -44,7 +44,7 @@ class Fraction;
 class SwPrintData;
 class SwPagePreviewLayout;
 struct PreviewPage;
-class SwTxtFrm;
+class SwTextFrm;
 // --> OD #i76669#
 namespace sdr { namespace contact {
         class ViewObjectContactRedirector;
@@ -106,18 +106,18 @@ private:
         implementation for wrapper method
         <SwViewShell::InvalidateAccessibleParaFlowRelation(..)>
 
-        @param _pFromTxtFrm
+        @param _pFromTextFrm
         input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM
         has to be invalidated.
         If NULL, no CONTENT_FLOWS_FROM relation has to be invalidated
 
-        @param _pToTxtFrm
+        @param _pToTextFrm
         input parameter - paragraph frame, for which the relation CONTENT_FLOWS_TO
         has to be invalidated.
         If NULL, no CONTENT_FLOWS_TO relation has to be invalidated
     */
-    void _InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
-                                                const SwTxtFrm* _pToTxtFrm );
+    void _InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
+                                                const SwTextFrm* _pToTextFrm );
 
     /** invalidate text selection for paragraphs
 
@@ -133,7 +133,7 @@ private:
         implementation for wrapper method
         <SwViewShell::InvalidateAccessibleParaAttrs(..)>
     */
-    void _InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm );
+    void _InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm );
 
 public:
     SwViewShellImp( SwViewShell * );
@@ -208,7 +208,7 @@ public:
      *
      * There we also set the Flag for ExpressionFields
      */
-    bool IsUpdateExpFlds();
+    bool IsUpdateExpFields();
 
     void    SetRestoreActions(sal_uInt16 nSet){nRestoreActions = nSet;}
     sal_uInt16  GetRestoreActions() const{return nRestoreActions;}
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 1a4e43b5debf..1de341212b8d 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -84,7 +84,7 @@ SwPosNotify::~SwPosNotify()
         // --> #i43255# - refine condition to avoid unneeded
         // invalidations: anchored object had to be on the page of its anchor
         // text frame.
-        if ( mpAnchoredDrawObj->GetAnchorFrm()->IsTxtFrm() &&
+        if ( mpAnchoredDrawObj->GetAnchorFrm()->IsTextFrm() &&
              mpOldPageFrm == mpAnchoredDrawObj->GetAnchorFrm()->FindPageFrm() )
         {
             mpAnchoredDrawObj->AnchorFrm()->Prepare( PREP_FLY_LEAVE );
@@ -214,13 +214,13 @@ SwAnchoredDrawObject::~SwAnchoredDrawObject()
 // --> #i62875#
 void SwAnchoredDrawObject::UpdateLayoutDir()
 {
-    SwFrmFmt::tLayoutDir nOldLayoutDir( GetFrmFmt().GetLayoutDir() );
+    SwFrameFormat::tLayoutDir nOldLayoutDir( GetFrameFormat().GetLayoutDir() );
 
     SwAnchoredObject::UpdateLayoutDir();
 
     if ( !NotYetPositioned() &&
-         GetFrmFmt().GetLayoutDir() != nOldLayoutDir &&
-         GetFrmFmt().GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
+         GetFrameFormat().GetLayoutDir() != nOldLayoutDir &&
+         GetFrameFormat().GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
          !IsOutsidePage() )
     {
         mbCaptureAfterLayoutDirChange = true;
@@ -271,7 +271,7 @@ void SwAnchoredDrawObject::MakeObjPos()
     // positioned, convert its positioning attributes, if its positioning
     // attributes are given in horizontal left-to-right layout.
     // --> #i36010# - Note: horizontal left-to-right layout is made
-    // the default layout direction for <SwDrawFrmFmt> instances. Thus, it has
+    // the default layout direction for <SwDrawFrameFormat> instances. Thus, it has
     // to be adjusted manually, if no adjustment of the positioning attributes
     // have to be performed here.
     // --> #i35635# - additionally move drawing object to the visible layer.
@@ -284,7 +284,7 @@ void SwAnchoredDrawObject::MakeObjPos()
         // #i44334#, #i44681# - check, if positioning
         // attributes already have been set.
         if ( !GetDrawObj()->ISA(SwDrawVirtObj) &&
-             !static_cast<SwDrawFrmFmt&>(GetFrmFmt()).IsPosAttrSet() )
+             !static_cast<SwDrawFrameFormat&>(GetFrameFormat()).IsPosAttrSet() )
         {
             _SetPositioningAttr();
         }
@@ -389,7 +389,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()
     // position. E.g., for at-character anchored object this can be the follow
     // frame of the anchor frame, which contains the anchor character.
     const bool bFormatAnchor =
-            !static_cast<const SwTxtFrm*>( GetAnchorFrmContainingAnchPos() )->IsAnyJoinLocked() &&
+            !static_cast<const SwTextFrm*>( GetAnchorFrmContainingAnchPos() )->IsAnyJoinLocked() &&
             !ConsiderObjWrapInfluenceOnObjPos() &&
             !ConsiderObjWrapInfluenceOfOtherObjs();
 
@@ -415,7 +415,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()
             SwPosNotify aPosNotify( this );
 
             // determine and set position
-            objectpositioning::SwToCntntAnchoredObjectPosition
+            objectpositioning::SwToContentAnchoredObjectPosition
                     aObjPositioning( *DrawObj() );
             aObjPositioning.CalcPosition();
 
@@ -522,13 +522,13 @@ void SwAnchoredDrawObject::_SetDrawObjAnchor()
 */
 void SwAnchoredDrawObject::_InvalidatePage( SwPageFrm* _pPageFrm )
 {
-    if ( _pPageFrm && !_pPageFrm->GetFmt()->GetDoc()->IsInDtor() )
+    if ( _pPageFrm && !_pPageFrm->GetFormat()->GetDoc()->IsInDtor() )
     {
         if ( _pPageFrm->GetUpper() )
         {
             // --> #i35007# - correct invalidation for as-character
             // anchored objects.
-            if ( GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR )
+            if ( GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR )
             {
                 _pPageFrm->InvalidateFlyInCnt();
             }
@@ -541,7 +541,7 @@ void SwAnchoredDrawObject::_InvalidatePage( SwPageFrm* _pPageFrm )
             pRootFrm->DisallowTurbo();
             if ( pRootFrm->GetTurbo() )
             {
-                const SwCntntFrm* pTmpFrm = pRootFrm->GetTurbo();
+                const SwContentFrm* pTmpFrm = pRootFrm->GetTurbo();
                 pRootFrm->ResetTurbo();
                 pTmpFrm->InvalidatePage();
             }
@@ -567,14 +567,14 @@ void SwAnchoredDrawObject::InvalidateObjPos()
             // anchored object, because its positioned by the format of its anchor frame.
             // --> #i44559# - assure, that text hint is already
             // existing in the text frame
-            if ( GetAnchorFrm()->ISA(SwTxtFrm) &&
-                 (GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
+            if ( GetAnchorFrm()->ISA(SwTextFrm) &&
+                 (GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
             {
-                SwTxtFrm* pAnchorTxtFrm( static_cast<SwTxtFrm*>(AnchorFrm()) );
-                if ( pAnchorTxtFrm->GetTxtNode()->GetpSwpHints() &&
-                     pAnchorTxtFrm->CalcFlyPos( &GetFrmFmt() ) != COMPLETE_STRING )
+                SwTextFrm* pAnchorTextFrm( static_cast<SwTextFrm*>(AnchorFrm()) );
+                if ( pAnchorTextFrm->GetTextNode()->GetpSwpHints() &&
+                     pAnchorTextFrm->CalcFlyPos( &GetFrameFormat() ) != COMPLETE_STRING )
                 {
-                    AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, &GetFrmFmt() );
+                    AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, &GetFrameFormat() );
                 }
             }
 
@@ -603,17 +603,17 @@ void SwAnchoredDrawObject::InvalidateObjPos()
     }
 }
 
-SwFrmFmt& SwAnchoredDrawObject::GetFrmFmt()
+SwFrameFormat& SwAnchoredDrawObject::GetFrameFormat()
 {
-    OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt(),
-            "<SwAnchoredDrawObject::GetFrmFmt()> - missing frame format -> crash." );
-    return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt());
+    OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat(),
+            "<SwAnchoredDrawObject::GetFrameFormat()> - missing frame format -> crash." );
+    return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat());
 }
-const SwFrmFmt& SwAnchoredDrawObject::GetFrmFmt() const
+const SwFrameFormat& SwAnchoredDrawObject::GetFrameFormat() const
 {
-    OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt(),
-            "<SwAnchoredDrawObject::GetFrmFmt()> - missing frame format -> crash." );
-    return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt());
+    OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat(),
+            "<SwAnchoredDrawObject::GetFrameFormat()> - missing frame format -> crash." );
+    return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat());
 }
 
 const SwRect SwAnchoredDrawObject::GetObjRect() const
@@ -658,7 +658,7 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
 
         if ( nTargetWidth != aCurrObjRect.GetWidth( ) || nTargetHeight != aCurrObjRect.GetHeight( ) )
         {
-            SwDoc* pDoc = const_cast<SwDoc*>(GetPageFrm()->GetFmt()->GetDoc());
+            SwDoc* pDoc = const_cast<SwDoc*>(GetPageFrm()->GetFormat()->GetDoc());
             bool bModified = pDoc->getIDocumentState().IsModified();
             const_cast< SdrObject* >( GetDrawObj() )->Resize( aCurrObjRect.TopLeft(),
                     Fraction( nTargetWidth, aCurrObjRect.GetWidth() ),
@@ -716,8 +716,8 @@ void SwAnchoredDrawObject::AdjustPositioningAttr( const SwFrm* _pNewAnchorFrm,
         nVertRelPos = aObjRect.Top() - aAnchorPos.Y();
     }
 
-    GetFrmFmt().SetFmtAttr( SwFmtHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
-    GetFrmFmt().SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
+    GetFrameFormat().SetFormatAttr( SwFormatHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
+    GetFrameFormat().SetFormatAttr( SwFormatVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
 }
 
 // --> #i34748# - change return type.
@@ -764,23 +764,23 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
         SwTwips nVertPos = aObjRect.Top();
         // #i44334#, #i44681#
         // perform conversion only if position is in horizontal-left-to-right-layout.
-        if ( GetFrmFmt().GetPositionLayoutDir() ==
+        if ( GetFrameFormat().GetPositionLayoutDir() ==
                 text::PositionLayoutDir::PositionInHoriL2R )
         {
-            SwFrmFmt::tLayoutDir eLayoutDir = GetFrmFmt().GetLayoutDir();
+            SwFrameFormat::tLayoutDir eLayoutDir = GetFrameFormat().GetLayoutDir();
             switch ( eLayoutDir )
             {
-                case SwFrmFmt::HORI_L2R:
+                case SwFrameFormat::HORI_L2R:
                 {
                     // nothing to do
                 }
                 break;
-                case SwFrmFmt::HORI_R2L:
+                case SwFrameFormat::HORI_R2L:
                 {
                     nHoriPos = -aObjRect.Left() - aObjRect.Width();
                 }
                 break;
-                case SwFrmFmt::VERT_R2L:
+                case SwFrameFormat::VERT_R2L:
                 {
                     nHoriPos = aObjRect.Top();
                     nVertPos = -aObjRect.Left() - aObjRect.Width();
@@ -796,28 +796,28 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
         // --> #i71182#
         // only change position - do not lose other attributes
 
-        SwFmtHoriOrient aHori( GetFrmFmt().GetHoriOrient() );
+        SwFormatHoriOrient aHori( GetFrameFormat().GetHoriOrient() );
         if (nHoriPos != aHori.GetPos()) {
             aHori.SetPos( nHoriPos );
             InvalidateObjRectWithSpaces();
-            GetFrmFmt().SetFmtAttr( aHori );
+            GetFrameFormat().SetFormatAttr( aHori );
         }
 
-        SwFmtVertOrient aVert( GetFrmFmt().GetVertOrient() );
+        SwFormatVertOrient aVert( GetFrameFormat().GetVertOrient() );
         if (nVertPos != aVert.GetPos()) {
             aVert.SetPos( nVertPos );
             InvalidateObjRectWithSpaces();
-            GetFrmFmt().SetFmtAttr( aVert );
+            GetFrameFormat().SetFormatAttr( aVert );
         }
 
         // --> #i36010# - set layout direction of the position
-        GetFrmFmt().SetPositionLayoutDir(
+        GetFrameFormat().SetPositionLayoutDir(
             text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
     }
     // --> #i65798# - also for as-character anchored objects
     // --> #i45952# - indicate that position
     // attributes are set now.
-    static_cast<SwDrawFrmFmt&>(GetFrmFmt()).PosAttrSet();
+    static_cast<SwDrawFrameFormat&>(GetFrameFormat()).PosAttrSet();
 }
 
 void SwAnchoredDrawObject::NotifyBackground( SwPageFrm* _pPageFrm,
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index de786af98d26..e446d24c3ea8 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -220,11 +220,11 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine(
                                         const bool _bCheckForParaPorInf )
 {
     if ( GetAnchorFrm() &&
-         GetAnchorFrm()->IsTxtFrm() )
+         GetAnchorFrm()->IsTextFrm() )
     {
-        const SwFmtAnchor& rAnch = GetFrmFmt().GetAnchor();
+        const SwFormatAnchor& rAnch = GetFrameFormat().GetAnchor();
         if ( (rAnch.GetAnchorId() == FLY_AT_CHAR) &&
-             rAnch.GetCntntAnchor() )
+             rAnch.GetContentAnchor() )
         {
             // --> if requested, assure that anchor frame,
             // which contains the anchor character, has a paragraph portion information.
@@ -233,7 +233,7 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine(
             // Thus, a format of this frame is avoided to determine the
             // paragraph portion information.
             // --> #i26945# - use new method <FindAnchorCharFrm()>
-            const SwTxtFrm& aAnchorCharFrm = *(FindAnchorCharFrm());
+            const SwTextFrm& aAnchorCharFrm = *(FindAnchorCharFrm());
             if ( !_bCheckForParaPorInf || aAnchorCharFrm.HasPara() )
             {
                 _CheckCharRect( rAnch, aAnchorCharFrm );
@@ -253,12 +253,12 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine(
 
     improvement - add second parameter <_rAnchorCharFrm>
 */
-void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch,
-                                       const SwTxtFrm& _rAnchorCharFrm )
+void SwAnchoredObject::_CheckCharRect( const SwFormatAnchor& _rAnch,
+                                       const SwTextFrm& _rAnchorCharFrm )
 {
     // determine rectangle of anchor character. If not exist, abort operation
     SwRect aCharRect;
-    if ( !_rAnchorCharFrm.GetAutoPos( aCharRect, *_rAnch.GetCntntAnchor() ) )
+    if ( !_rAnchorCharFrm.GetAutoPos( aCharRect, *_rAnch.GetContentAnchor() ) )
     {
         return;
     }
@@ -269,8 +269,8 @@ void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch,
         {
             SWRECTFN( (&_rAnchorCharFrm) );
             // determine positioning and alignment
-            SwFmtVertOrient aVert( GetFrmFmt().GetVertOrient() );
-            SwFmtHoriOrient aHori( GetFrmFmt().GetHoriOrient() );
+            SwFormatVertOrient aVert( GetFrameFormat().GetVertOrient() );
+            SwFormatHoriOrient aHori( GetFrameFormat().GetHoriOrient() );
             // check for anchor character rectangle changes for certain
             // positionings and alignments
             // add condition to invalidate position,
@@ -317,16 +317,16 @@ void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch,
 
     improvement - add second parameter <_rAnchorCharFrm>
 */
-void SwAnchoredObject::_CheckTopOfLine( const SwFmtAnchor& _rAnch,
-                                        const SwTxtFrm& _rAnchorCharFrm )
+void SwAnchoredObject::_CheckTopOfLine( const SwFormatAnchor& _rAnch,
+                                        const SwTextFrm& _rAnchorCharFrm )
 {
     SwTwips nTopOfLine = 0L;
-    if ( _rAnchorCharFrm.GetTopOfLine( nTopOfLine, *_rAnch.GetCntntAnchor() ) )
+    if ( _rAnchorCharFrm.GetTopOfLine( nTopOfLine, *_rAnch.GetContentAnchor() ) )
     {
         if ( nTopOfLine != mnLastTopOfLine )
         {
             // check alignment for invalidation of position
-            if ( GetFrmFmt().GetVertOrient().GetRelationOrient() == text::RelOrientation::TEXT_LINE )
+            if ( GetFrameFormat().GetVertOrient().GetRelationOrient() == text::RelOrientation::TEXT_LINE )
             {
                 // #i26945#, #i35911# - unlock position of
                 // anchored object, if it isn't registered at the page,
@@ -370,7 +370,7 @@ void SwAnchoredObject::ObjectAttachedToAnchorFrame()
 */
 void SwAnchoredObject::UpdateLayoutDir()
 {
-    SwFrmFmt::tLayoutDir nLayoutDir = SwFrmFmt::HORI_L2R;
+    SwFrameFormat::tLayoutDir nLayoutDir = SwFrameFormat::HORI_L2R;
     const SwFrm* pAnchorFrm = GetAnchorFrm();
     if ( pAnchorFrm )
     {
@@ -378,14 +378,14 @@ void SwAnchoredObject::UpdateLayoutDir()
         const bool bR2L = pAnchorFrm->IsRightToLeft();
         if ( bVert )
         {
-            nLayoutDir = SwFrmFmt::VERT_R2L;
+            nLayoutDir = SwFrameFormat::VERT_R2L;
         }
         else if ( bR2L )
         {
-            nLayoutDir = SwFrmFmt::HORI_R2L;
+            nLayoutDir = SwFrameFormat::HORI_R2L;
         }
     }
-    GetFrmFmt().SetLayoutDir( nLayoutDir );
+    GetFrameFormat().SetLayoutDir( nLayoutDir );
 }
 
 /** method to perform necessary invalidations for the positioning of
@@ -424,7 +424,7 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos() const
 {
     bool bRet( false );
 
-    const SwFrmFmt& rObjFmt = GetFrmFmt();
+    const SwFrameFormat& rObjFormat = GetFrameFormat();
 
     // --> #i3317# - add condition <IsTmpConsiderWrapInfluence()>
     // --> #i55204#
@@ -435,12 +435,12 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos() const
     {
         bRet = true;
     }
-    else if ( rObjFmt.getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
+    else if ( rObjFormat.getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
     {
-        const SwFmtAnchor& rAnchor = rObjFmt.GetAnchor();
+        const SwFormatAnchor& rAnchor = rObjFormat.GetAnchor();
         if ( ((rAnchor.GetAnchorId() == FLY_AT_CHAR) ||
               (rAnchor.GetAnchorId() == FLY_AT_PARA)) &&
-             rObjFmt.GetSurround().GetSurround() != SURROUND_THROUGHT )
+             rObjFormat.GetSurround().GetSurround() != SURROUND_THROUGHT )
         {
             // --> #i34520# - text also wraps around anchored
             // objects in the layer Hell - see the text formatting.
@@ -539,9 +539,9 @@ bool SwAnchoredObject::HasClearedEnvironment() const
     OSL_ENSURE( GetVertPosOrientFrm(),
             "<SwAnchoredObject::HasClearedEnvironment()> - layout frame missing, at which the vertical position is oriented at." );
     if ( GetVertPosOrientFrm() &&
-         GetAnchorFrm()->IsTxtFrm() &&
-         !static_cast<const SwTxtFrm*>(GetAnchorFrm())->IsFollow() &&
-         static_cast<const SwTxtFrm*>(GetAnchorFrm())->FindPageFrm()->GetPhyPageNum() >=
+         GetAnchorFrm()->IsTextFrm() &&
+         !static_cast<const SwTextFrm*>(GetAnchorFrm())->IsFollow() &&
+         static_cast<const SwTextFrm*>(GetAnchorFrm())->FindPageFrm()->GetPhyPageNum() >=
                 GetPageFrm()->GetPhyPageNum() )
     {
         const SwFrm* pTmpFrm = GetVertPosOrientFrm()->Lower();
@@ -553,12 +553,12 @@ bool SwAnchoredObject::HasClearedEnvironment() const
         {
             bHasClearedEnvironment = true;
         }
-        else if ( pTmpFrm->IsTxtFrm() && !pTmpFrm->GetNext() )
+        else if ( pTmpFrm->IsTextFrm() && !pTmpFrm->GetNext() )
         {
-            const SwTxtFrm* pTmpTxtFrm = static_cast<const SwTxtFrm*>(pTmpFrm);
-            if ( pTmpTxtFrm->IsUndersized() ||
-                 ( pTmpTxtFrm->GetFollow() &&
-                   pTmpTxtFrm->GetFollow()->GetOfst() == 0 ) )
+            const SwTextFrm* pTmpTextFrm = static_cast<const SwTextFrm*>(pTmpFrm);
+            if ( pTmpTextFrm->IsUndersized() ||
+                 ( pTmpTextFrm->GetFollow() &&
+                   pTmpTextFrm->GetFollow()->GetOfst() == 0 ) )
             {
                 bHasClearedEnvironment = true;
             }
@@ -584,9 +584,9 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const
     if ( !mbObjRectWithSpacesValid )
     {
         maObjRectWithSpaces = GetObjBoundRect();
-        const SwFrmFmt& rFmt = GetFrmFmt();
-        const SvxULSpaceItem& rUL = rFmt.GetULSpace();
-        const SvxLRSpaceItem& rLR = rFmt.GetLRSpace();
+        const SwFrameFormat& rFormat = GetFrameFormat();
+        const SvxULSpaceItem& rUL = rFormat.GetULSpace();
+        const SvxLRSpaceItem& rLR = rFormat.GetLRSpace();
         {
             maObjRectWithSpaces.Top ( std::max( maObjRectWithSpaces.Top() - long(rUL.GetUpper()), 0L ));
             maObjRectWithSpaces.Left( std::max( maObjRectWithSpaces.Left()- long(rLR.GetLeft()),  0L ));
@@ -632,7 +632,7 @@ void SwAnchoredObject::UpdateObjInSortedList()
 {
     if ( GetAnchorFrm() )
     {
-        if ( GetFrmFmt().getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
+        if ( GetFrameFormat().getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
         {
             // invalidate position of all anchored objects at anchor frame
             if ( GetAnchorFrm()->GetDrawObjs() )
@@ -667,7 +667,7 @@ void SwAnchoredObject::UpdateObjInSortedList()
         AnchorFrm()->GetDrawObjs()->Update( *this );
         // update its position in the sorted object list of its page frame
         // note: as-character anchored object aren't registered at a page frame
-        if ( GetFrmFmt().GetAnchor().GetAnchorId() != FLY_AS_CHAR )
+        if ( GetFrameFormat().GetAnchor().GetAnchorId() != FLY_AS_CHAR )
         {
             GetPageFrm()->GetSortedObjs()->Update( *this );
         }
@@ -714,23 +714,23 @@ SwPageFrm* SwAnchoredObject::FindPageFrmOfAnchor()
 
     #i26945#
 
-    @return SwTxtFrm*
+    @return SwTextFrm*
     text frame containing the anchor character. It's NULL, if the object
     isn't anchored at-character resp. as-character.
 */
-SwTxtFrm* SwAnchoredObject::FindAnchorCharFrm()
+SwTextFrm* SwAnchoredObject::FindAnchorCharFrm()
 {
-    SwTxtFrm* pAnchorCharFrm( 0L );
+    SwTextFrm* pAnchorCharFrm( 0L );
 
     // --> #i44339# - check, if anchor frame exists.
     if ( mpAnchorFrm )
     {
-        const SwFmtAnchor& rAnch = GetFrmFmt().GetAnchor();
+        const SwFormatAnchor& rAnch = GetFrameFormat().GetAnchor();
         if ((rAnch.GetAnchorId() == FLY_AT_CHAR) ||
             (rAnch.GetAnchorId() == FLY_AS_CHAR))
         {
-            pAnchorCharFrm = &(static_cast<SwTxtFrm*>(AnchorFrm())->
-                        GetFrmAtOfst( rAnch.GetCntntAnchor()->nContent.GetIndex() ));
+            pAnchorCharFrm = &(static_cast<SwTextFrm*>(AnchorFrm())->
+                        GetFrmAtOfst( rAnch.GetContentAnchor()->nContent.GetIndex() ));
         }
     }
 
@@ -745,7 +745,7 @@ SwTxtFrm* SwAnchoredObject::FindAnchorCharFrm()
 */
 bool SwAnchoredObject::IsFormatPossible() const
 {
-    return GetFrmFmt().GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetDrawObj()->GetLayer() );
+    return GetFrameFormat().GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetDrawObj()->GetLayer() );
 }
 
 // --> #i3317#
@@ -755,7 +755,7 @@ void SwAnchoredObject::SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrap
     // --> #i35911#
     if ( mbTmpConsiderWrapInfluence )
     {
-        SwLayouter::InsertObjForTmpConsiderWrapInfluence( *(GetFrmFmt().GetDoc()),
+        SwLayouter::InsertObjForTmpConsiderWrapInfluence( *(GetFrameFormat().GetDoc()),
                                                           *this );
     }
 }
@@ -790,7 +790,7 @@ bool SwAnchoredObject::OverlapsPrevColumn() const
 {
     bool bOverlapsPrevColumn( false );
 
-    if ( mpAnchorFrm && mpAnchorFrm->IsTxtFrm() )
+    if ( mpAnchorFrm && mpAnchorFrm->IsTextFrm() )
     {
         const SwFrm* pColFrm = mpAnchorFrm->FindColFrm();
         if ( pColFrm && pColFrm->GetPrev() )
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 2a885f54c28a..d0005711da16 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -87,12 +87,12 @@
 
 using namespace ::com::sun::star;
 
-TYPEINIT1(SwFmtVertOrient, SfxPoolItem);
-TYPEINIT1(SwFmtHoriOrient, SfxPoolItem);
-TYPEINIT2(SwFmtHeader,  SfxPoolItem, SwClient );
-TYPEINIT2(SwFmtFooter,  SfxPoolItem, SwClient );
-TYPEINIT2(SwFmtPageDesc,  SfxPoolItem, SwClient );
-TYPEINIT1_AUTOFACTORY(SwFmtLineNumber, SfxPoolItem);
+TYPEINIT1(SwFormatVertOrient, SfxPoolItem);
+TYPEINIT1(SwFormatHoriOrient, SfxPoolItem);
+TYPEINIT2(SwFormatHeader,  SfxPoolItem, SwClient );
+TYPEINIT2(SwFormatFooter,  SfxPoolItem, SwClient );
+TYPEINIT2(SwFormatPageDesc,  SfxPoolItem, SwClient );
+TYPEINIT1_AUTOFACTORY(SwFormatLineNumber, SfxPoolItem);
 
 static sal_Int16 lcl_IntToRelation(const uno::Any& rVal)
 {
@@ -102,15 +102,15 @@ static sal_Int16 lcl_IntToRelation(const uno::Any& rVal)
     return nVal;
 }
 
-void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
+void DelHFFormat( SwClient *pToRemove, SwFrameFormat *pFormat )
 {
     //If the client is the last one who uses this format, then we have to delete
     //it - before this is done, we may need to delete the content-section.
-    SwDoc* pDoc = pFmt->GetDoc();
-    pFmt->Remove( pToRemove );
+    SwDoc* pDoc = pFormat->GetDoc();
+    pFormat->Remove( pToRemove );
     if( pDoc->IsInDtor() )
     {
-        delete pFmt;
+        delete pFormat;
         return;
     }
 
@@ -119,7 +119,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
     {
         // nested scope because DTOR of SwClientIter resets the flag bTreeChg.
         // It's suboptimal if the format is deleted beforehand.
-        SwIterator<SwClient,SwFrmFmt> aIter(*pFmt);
+        SwIterator<SwClient,SwFrameFormat> aIter(*pFormat);
         for(SwClient* pLast = aIter.First(); bDel && pLast; pLast = aIter.Next())
             if(!pLast->IsA(TYPE(SwFrm)) || !SwXHeadFootText::IsXHeadFootText(pLast))
                 bDel = false;
@@ -129,8 +129,8 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
     {
         // If there is a Crsr registered in one of the nodes, we need to call the
         // ParkCrsr in an (arbitrary) shell.
-        SwFmtCntnt& rCnt = (SwFmtCntnt&)pFmt->GetCntnt();
-        if ( rCnt.GetCntntIdx() )
+        SwFormatContent& rCnt = (SwFormatContent&)pFormat->GetContent();
+        if ( rCnt.GetContentIdx() )
         {
             SwNode *pNode = 0;
             {
@@ -138,17 +138,17 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
                 // Begin with start node of page header/footer to assure that
                 // complete content is checked for cursors and the complete content
                 // is deleted on below made method call <pDoc->getIDocumentContentOperations().DeleteSection(pNode)>
-                SwNodeIndex aIdx( *rCnt.GetCntntIdx(), 0 );
+                SwNodeIndex aIdx( *rCnt.GetContentIdx(), 0 );
                 // If there is a Crsr registered in one of the nodes, we need to call the
                 // ParkCrsr in an (arbitrary) shell.
                 pNode = & aIdx.GetNode();
                 sal_uInt32 nEnd = pNode->EndOfSectionIndex();
                 while ( aIdx < nEnd )
                 {
-                    if ( pNode->IsCntntNode() &&
-                         static_cast<SwCntntNode*>(pNode)->HasWriterListeners() )
+                    if ( pNode->IsContentNode() &&
+                         static_cast<SwContentNode*>(pNode)->HasWriterListeners() )
                     {
-                        SwCrsrShell *pShell = SwIterator<SwCrsrShell,SwCntntNode>( *static_cast<SwCntntNode*>(pNode) ).First();
+                        SwCrsrShell *pShell = SwIterator<SwCrsrShell,SwContentNode>( *static_cast<SwContentNode*>(pNode) ).First();
                         if( pShell )
                         {
                             pShell->ParkCrsr( aIdx );
@@ -159,7 +159,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
                     pNode = & aIdx.GetNode();
                 }
             }
-            rCnt.SetNewCntntIdx( (const SwNodeIndex*)0 );
+            rCnt.SetNewContentIdx( (const SwNodeIndex*)0 );
 
             // When deleting a header/footer-format, we ALWAYS need to disable
             // the undo function (Bug 31069)
@@ -168,12 +168,12 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
             OSL_ENSURE( pNode, "A big problem." );
             pDoc->getIDocumentContentOperations().DeleteSection( pNode );
         }
-        delete pFmt;
+        delete pFormat;
     }
 }
 
 // Partially implemented inline in hxx
-SwFmtFrmSize::SwFmtFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight )
+SwFormatFrmSize::SwFormatFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight )
     : SfxPoolItem( RES_FRM_SIZE ),
     m_aSize( nWidth, nHeight ),
     m_eFrmHeightType( eSize ),
@@ -182,7 +182,7 @@ SwFmtFrmSize::SwFmtFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight )
     m_nWidthPercent = m_eWidthPercentRelation = m_nHeightPercent = m_eHeightPercentRelation = 0;
 }
 
-SwFmtFrmSize& SwFmtFrmSize::operator=( const SwFmtFrmSize& rCpy )
+SwFormatFrmSize& SwFormatFrmSize::operator=( const SwFormatFrmSize& rCpy )
 {
     m_aSize = rCpy.GetSize();
     m_eFrmHeightType = rCpy.GetHeightSizeType();
@@ -194,24 +194,24 @@ SwFmtFrmSize& SwFmtFrmSize::operator=( const SwFmtFrmSize& rCpy )
     return *this;
 }
 
-bool SwFmtFrmSize::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatFrmSize::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return( m_eFrmHeightType  == static_cast<const SwFmtFrmSize&>(rAttr).m_eFrmHeightType &&
-            m_eFrmWidthType  == static_cast<const SwFmtFrmSize&>(rAttr).m_eFrmWidthType &&
-            m_aSize           == static_cast<const SwFmtFrmSize&>(rAttr).GetSize()&&
-            m_nWidthPercent   == static_cast<const SwFmtFrmSize&>(rAttr).GetWidthPercent() &&
-            m_eWidthPercentRelation == static_cast<const SwFmtFrmSize&>(rAttr).GetWidthPercentRelation() &&
-            m_nHeightPercent  == static_cast<const SwFmtFrmSize&>(rAttr).GetHeightPercent() &&
-            m_eHeightPercentRelation == static_cast<const SwFmtFrmSize&>(rAttr).GetHeightPercentRelation() );
+    return( m_eFrmHeightType  == static_cast<const SwFormatFrmSize&>(rAttr).m_eFrmHeightType &&
+            m_eFrmWidthType  == static_cast<const SwFormatFrmSize&>(rAttr).m_eFrmWidthType &&
+            m_aSize           == static_cast<const SwFormatFrmSize&>(rAttr).GetSize()&&
+            m_nWidthPercent   == static_cast<const SwFormatFrmSize&>(rAttr).GetWidthPercent() &&
+            m_eWidthPercentRelation == static_cast<const SwFormatFrmSize&>(rAttr).GetWidthPercentRelation() &&
+            m_nHeightPercent  == static_cast<const SwFormatFrmSize&>(rAttr).GetHeightPercent() &&
+            m_eHeightPercentRelation == static_cast<const SwFormatFrmSize&>(rAttr).GetHeightPercentRelation() );
 }
 
-SfxPoolItem*  SwFmtFrmSize::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatFrmSize::Clone( SfxItemPool* ) const
 {
-    return new SwFmtFrmSize( *this );
+    return new SwFormatFrmSize( *this );
 }
 
-bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -266,7 +266,7 @@ bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return true;
 }
 
-bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -409,9 +409,9 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-void SwFmtFrmSize::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatFrmSize::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtFrmSize"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatFrmSize"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
 
     std::stringstream aSize;
@@ -429,159 +429,159 @@ void SwFmtFrmSize::dumpAsXml(xmlTextWriterPtr pWriter) const
 }
 
 // Partially implemented inline in hxx
-SwFmtFillOrder::SwFmtFillOrder( SwFillOrder nFO )
+SwFormatFillOrder::SwFormatFillOrder( SwFillOrder nFO )
     : SfxEnumItem( RES_FILL_ORDER, sal_uInt16(nFO) )
 {}
-SfxPoolItem*  SwFmtFillOrder::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatFillOrder::Clone( SfxItemPool* ) const
 {
-    return new SwFmtFillOrder( GetFillOrder() );
+    return new SwFormatFillOrder( GetFillOrder() );
 }
 
-sal_uInt16  SwFmtFillOrder::GetValueCount() const
+sal_uInt16  SwFormatFillOrder::GetValueCount() const
 {
     return SW_FILL_ORDER_END - SW_FILL_ORDER_BEGIN;
 }
 
 // Partially implemented inline in hxx
-SwFmtHeader::SwFmtHeader( SwFrmFmt *pHeaderFmt )
+SwFormatHeader::SwFormatHeader( SwFrameFormat *pHeaderFormat )
     : SfxPoolItem( RES_HEADER ),
-    SwClient( pHeaderFmt ),
-    bActive( pHeaderFmt )
+    SwClient( pHeaderFormat ),
+    bActive( pHeaderFormat )
 {
 }
 
-SwFmtHeader::SwFmtHeader( const SwFmtHeader &rCpy )
+SwFormatHeader::SwFormatHeader( const SwFormatHeader &rCpy )
     : SfxPoolItem( RES_HEADER ),
     SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ),
     bActive( rCpy.IsActive() )
 {
 }
 
-SwFmtHeader::SwFmtHeader( bool bOn )
+SwFormatHeader::SwFormatHeader( bool bOn )
     : SfxPoolItem( RES_HEADER ),
     SwClient( 0 ),
     bActive( bOn )
 {
 }
 
- SwFmtHeader::~SwFmtHeader()
+ SwFormatHeader::~SwFormatHeader()
 {
-    if ( GetHeaderFmt() )
-        DelHFFormat( this, GetHeaderFmt() );
+    if ( GetHeaderFormat() )
+        DelHFFormat( this, GetHeaderFormat() );
 }
 
-bool SwFmtHeader::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatHeader::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return ( GetRegisteredIn() == static_cast<const SwFmtHeader&>(rAttr).GetRegisteredIn() &&
-             bActive == static_cast<const SwFmtHeader&>(rAttr).IsActive() );
+    return ( GetRegisteredIn() == static_cast<const SwFormatHeader&>(rAttr).GetRegisteredIn() &&
+             bActive == static_cast<const SwFormatHeader&>(rAttr).IsActive() );
 }
 
-SfxPoolItem*  SwFmtHeader::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatHeader::Clone( SfxItemPool* ) const
 {
-    return new SwFmtHeader( *this );
+    return new SwFormatHeader( *this );
 }
 
-void SwFmtHeader::RegisterToFormat( SwFmt& rFmt )
+void SwFormatHeader::RegisterToFormat( SwFormat& rFormat )
 {
-    rFmt.Add(this);
+    rFormat.Add(this);
 }
 
 // Partially implemented inline in hxx
-SwFmtFooter::SwFmtFooter( SwFrmFmt *pFooterFmt )
+SwFormatFooter::SwFormatFooter( SwFrameFormat *pFooterFormat )
     : SfxPoolItem( RES_FOOTER ),
-    SwClient( pFooterFmt ),
-    bActive( pFooterFmt )
+    SwClient( pFooterFormat ),
+    bActive( pFooterFormat )
 {
 }
 
-SwFmtFooter::SwFmtFooter( const SwFmtFooter &rCpy )
+SwFormatFooter::SwFormatFooter( const SwFormatFooter &rCpy )
     : SfxPoolItem( RES_FOOTER ),
     SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ),
     bActive( rCpy.IsActive() )
 {
 }
 
-SwFmtFooter::SwFmtFooter( bool bOn )
+SwFormatFooter::SwFormatFooter( bool bOn )
     : SfxPoolItem( RES_FOOTER ),
     SwClient( 0 ),
     bActive( bOn )
 {
 }
 
- SwFmtFooter::~SwFmtFooter()
+ SwFormatFooter::~SwFormatFooter()
 {
-    if ( GetFooterFmt() )
-        DelHFFormat( this, GetFooterFmt() );
+    if ( GetFooterFormat() )
+        DelHFFormat( this, GetFooterFormat() );
 }
 
-void SwFmtFooter::RegisterToFormat( SwFmt& rFmt )
+void SwFormatFooter::RegisterToFormat( SwFormat& rFormat )
 {
-    rFmt.Add(this);
+    rFormat.Add(this);
 }
 
-bool SwFmtFooter::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatFooter::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return ( GetRegisteredIn() == static_cast<const SwFmtFooter&>(rAttr).GetRegisteredIn() &&
-             bActive == static_cast<const SwFmtFooter&>(rAttr).IsActive() );
+    return ( GetRegisteredIn() == static_cast<const SwFormatFooter&>(rAttr).GetRegisteredIn() &&
+             bActive == static_cast<const SwFormatFooter&>(rAttr).IsActive() );
 }
 
-SfxPoolItem*  SwFmtFooter::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatFooter::Clone( SfxItemPool* ) const
 {
-    return new SwFmtFooter( *this );
+    return new SwFormatFooter( *this );
 }
 
 // Partially implemented inline in hxx
-SwFmtCntnt::SwFmtCntnt( const SwFmtCntnt &rCpy )
+SwFormatContent::SwFormatContent( const SwFormatContent &rCpy )
     : SfxPoolItem( RES_CNTNT )
 {
-    pStartNode = rCpy.GetCntntIdx() ?
-                    new SwNodeIndex( *rCpy.GetCntntIdx() ) : 0;
+    pStartNode = rCpy.GetContentIdx() ?
+                    new SwNodeIndex( *rCpy.GetContentIdx() ) : 0;
 }
 
-SwFmtCntnt::SwFmtCntnt( const SwStartNode *pStartNd )
+SwFormatContent::SwFormatContent( const SwStartNode *pStartNd )
     : SfxPoolItem( RES_CNTNT )
 {
     pStartNode = pStartNd ? new SwNodeIndex( *pStartNd ) : 0;
 }
 
- SwFmtCntnt::~SwFmtCntnt()
+ SwFormatContent::~SwFormatContent()
 {
     delete pStartNode;
 }
 
-void SwFmtCntnt::SetNewCntntIdx( const SwNodeIndex *pIdx )
+void SwFormatContent::SetNewContentIdx( const SwNodeIndex *pIdx )
 {
     delete pStartNode;
     pStartNode = pIdx ? new SwNodeIndex( *pIdx ) : 0;
 }
 
-bool SwFmtCntnt::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatContent::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    if( (bool)pStartNode != (bool)static_cast<const SwFmtCntnt&>(rAttr).pStartNode )
+    if( (bool)pStartNode != (bool)static_cast<const SwFormatContent&>(rAttr).pStartNode )
         return false;
     if( pStartNode )
-        return ( *pStartNode == *static_cast<const SwFmtCntnt&>(rAttr).GetCntntIdx() );
+        return ( *pStartNode == *static_cast<const SwFormatContent&>(rAttr).GetContentIdx() );
     return true;
 }
 
-SfxPoolItem*  SwFmtCntnt::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatContent::Clone( SfxItemPool* ) const
 {
-    return new SwFmtCntnt( *this );
+    return new SwFormatContent( *this );
 }
 
-void SwFmtCntnt::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatContent::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtCntnt"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatContent"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("startNode"), BAD_CAST(OString::number(pStartNode->GetNode().GetIndex()).getStr()));
     xmlTextWriterEndElement(pWriter);
 }
 
 // Partially implemented inline in hxx
-SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy )
+SwFormatPageDesc::SwFormatPageDesc( const SwFormatPageDesc &rCpy )
     : SfxPoolItem( RES_PAGEDESC ),
     SwClient( const_cast<SwPageDesc*>(rCpy.GetPageDesc()) ),
     oNumOffset( rCpy.oNumOffset ),
@@ -590,7 +590,7 @@ SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy )
 {
 }
 
-SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc )
+SwFormatPageDesc::SwFormatPageDesc( const SwPageDesc *pDesc )
     : SfxPoolItem( RES_PAGEDESC ),
     SwClient( const_cast<SwPageDesc*>(pDesc) ),
     nDescNameIdx( 0xFFFF ), // IDX_NO_VALUE
@@ -598,7 +598,7 @@ SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc )
 {
 }
 
-SwFmtPageDesc &SwFmtPageDesc::operator=(const SwFmtPageDesc &rCpy)
+SwFormatPageDesc &SwFormatPageDesc::operator=(const SwFormatPageDesc &rCpy)
 {
     if (rCpy.GetPageDesc())
         RegisterToPageDesc(*const_cast<SwPageDesc*>(rCpy.GetPageDesc()));
@@ -609,42 +609,42 @@ SwFmtPageDesc &SwFmtPageDesc::operator=(const SwFmtPageDesc &rCpy)
     return *this;
 }
 
- SwFmtPageDesc::~SwFmtPageDesc() {}
+ SwFormatPageDesc::~SwFormatPageDesc() {}
 
-bool SwFmtPageDesc::KnowsPageDesc() const
+bool SwFormatPageDesc::KnowsPageDesc() const
 {
     return (GetRegisteredIn() != 0);
 }
 
-bool SwFmtPageDesc::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatPageDesc::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return  ( pDefinedIn == static_cast<const SwFmtPageDesc&>(rAttr).pDefinedIn ) &&
-            ( oNumOffset == static_cast<const SwFmtPageDesc&>(rAttr).oNumOffset ) &&
-            ( GetPageDesc() == static_cast<const SwFmtPageDesc&>(rAttr).GetPageDesc() );
+    return  ( pDefinedIn == static_cast<const SwFormatPageDesc&>(rAttr).pDefinedIn ) &&
+            ( oNumOffset == static_cast<const SwFormatPageDesc&>(rAttr).oNumOffset ) &&
+            ( GetPageDesc() == static_cast<const SwFormatPageDesc&>(rAttr).GetPageDesc() );
 }
 
-SfxPoolItem*  SwFmtPageDesc::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatPageDesc::Clone( SfxItemPool* ) const
 {
-    return new SwFmtPageDesc( *this );
+    return new SwFormatPageDesc( *this );
 }
 
-void SwFmtPageDesc::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
+void SwFormatPageDesc::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
 {
     SwClient::SwClientNotify(rModify, rHint);
     const SwPageDescHint* pHint = dynamic_cast<const SwPageDescHint*>(&rHint);
     if ( pHint )
     {
         // mba: shouldn't that be broadcasted also?
-        SwFmtPageDesc aDfltDesc( pHint->GetPageDesc() );
+        SwFormatPageDesc aDfltDesc( pHint->GetPageDesc() );
         SwPageDesc* pDesc = pHint->GetPageDesc();
         const SwModify* pMod = GetDefinedIn();
         if ( pMod )
         {
-            if( pMod->ISA( SwCntntNode ) )
-                const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pMod))->SetAttr( aDfltDesc );
-            else if( pMod->ISA( SwFmt ))
-                const_cast<SwFmt*>(static_cast<const SwFmt*>(pMod))->SetFmtAttr( aDfltDesc );
+            if( pMod->ISA( SwContentNode ) )
+                const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pMod))->SetAttr( aDfltDesc );
+            else if( pMod->ISA( SwFormat ))
+                const_cast<SwFormat*>(static_cast<const SwFormat*>(pMod))->SetFormatAttr( aDfltDesc );
             else
             {
                 OSL_FAIL( "What kind of SwModify is this?" );
@@ -657,12 +657,12 @@ void SwFmtPageDesc::SwClientNotify( const SwModify& rModify, const SfxHint& rHin
     }
 }
 
-void SwFmtPageDesc::RegisterToPageDesc( SwPageDesc& rDesc )
+void SwFormatPageDesc::RegisterToPageDesc( SwPageDesc& rDesc )
 {
     rDesc.Add( this );
 }
 
-void SwFmtPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwFormatPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     if( !pDefinedIn )
         return;
@@ -673,18 +673,18 @@ void SwFmtPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         case RES_OBJECTDYING:
                 //The Pagedesc where I'm registered dies, therefore I unregister
                 //from that format. During this I get deleted!
-            if( IS_TYPE( SwFmt, pDefinedIn ))
+            if( IS_TYPE( SwFormat, pDefinedIn ))
             {
                 bool const bResult =
-                    static_cast<SwFmt*>(pDefinedIn)->ResetFmtAttr(RES_PAGEDESC);
-                OSL_ENSURE( bResult, "FmtPageDesc not deleted" );
+                    static_cast<SwFormat*>(pDefinedIn)->ResetFormatAttr(RES_PAGEDESC);
+                OSL_ENSURE( bResult, "FormatPageDesc not deleted" );
                 (void) bResult; // unused in non-debug
             }
-            else if( IS_TYPE( SwCntntNode, pDefinedIn ))
+            else if( IS_TYPE( SwContentNode, pDefinedIn ))
             {
-                bool const bResult = static_cast<SwCntntNode*>(pDefinedIn)
+                bool const bResult = static_cast<SwContentNode*>(pDefinedIn)
                         ->ResetAttr(RES_PAGEDESC);
-                OSL_ENSURE( bResult, "FmtPageDesc not deleted" );
+                OSL_ENSURE( bResult, "FormatPageDesc not deleted" );
                 (void) bResult; // unused in non-debug
             }
             break;
@@ -694,7 +694,7 @@ void SwFmtPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     }
 }
 
-bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -735,7 +735,7 @@ bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -768,9 +768,9 @@ bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-void SwFmtPageDesc::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatPageDesc::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtPageDesc"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatPageDesc"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     if (oNumOffset)
         xmlTextWriterWriteAttribute(pWriter, BAD_CAST("oNumOffset"), BAD_CAST(OString::number(*oNumOffset).getStr()));
@@ -782,7 +782,7 @@ void SwFmtPageDesc::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-//  class SwFmtCol
+//  class SwFormatCol
 //  Partially implemented inline in hxx
 
 SwColumn::SwColumn() :
@@ -814,7 +814,7 @@ void SwColumn::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-SwFmtCol::SwFmtCol( const SwFmtCol& rCpy )
+SwFormatCol::SwFormatCol( const SwFormatCol& rCpy )
     : SfxPoolItem( RES_COL ),
     m_eLineStyle( rCpy.m_eLineStyle ),
     m_nLineWidth( rCpy.m_nLineWidth),
@@ -833,9 +833,9 @@ SwFmtCol::SwFmtCol( const SwFmtCol& rCpy )
     }
 }
 
-SwFmtCol::~SwFmtCol() {}
+SwFormatCol::~SwFormatCol() {}
 
-SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy )
+SwFormatCol& SwFormatCol::operator=( const SwFormatCol& rCpy )
 {
     m_eLineStyle  = rCpy.m_eLineStyle;
     m_nLineWidth  = rCpy.m_nLineWidth;
@@ -856,7 +856,7 @@ SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy )
     return *this;
 }
 
-SwFmtCol::SwFmtCol()
+SwFormatCol::SwFormatCol()
     : SfxPoolItem( RES_COL )
     , m_eLineStyle( table::BorderLineStyle::NONE)
     ,
@@ -869,10 +869,10 @@ SwFmtCol::SwFmtCol()
 {
 }
 
-bool SwFmtCol::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatCol::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    const SwFmtCol &rCmp = static_cast<const SwFmtCol&>(rAttr);
+    const SwFormatCol &rCmp = static_cast<const SwFormatCol&>(rAttr);
     if( !(m_eLineStyle        == rCmp.m_eLineStyle  &&
           m_nLineWidth        == rCmp.m_nLineWidth  &&
           m_aLineColor        == rCmp.m_aLineColor  &&
@@ -892,12 +892,12 @@ bool SwFmtCol::operator==( const SfxPoolItem& rAttr ) const
     return true;
 }
 
-SfxPoolItem*  SwFmtCol::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatCol::Clone( SfxItemPool* ) const
 {
-    return new SwFmtCol( *this );
+    return new SwFormatCol( *this );
 }
 
-sal_uInt16 SwFmtCol::GetGutterWidth( bool bMin ) const
+sal_uInt16 SwFormatCol::GetGutterWidth( bool bMin ) const
 {
     sal_uInt16 nRet = 0;
     if ( m_aColumns.size() == 2 )
@@ -928,7 +928,7 @@ sal_uInt16 SwFmtCol::GetGutterWidth( bool bMin ) const
     return nRet;
 }
 
-void SwFmtCol::SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct )
+void SwFormatCol::SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct )
 {
     if ( m_bOrtho )
         Calc( nNew, nAct );
@@ -948,7 +948,7 @@ void SwFmtCol::SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct )
     }
 }
 
-void SwFmtCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nAct )
+void SwFormatCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nAct )
 {
     // Deleting seems to be a bit radical on the first sight; but otherwise we
     // have to initialize all values of the remaining SwCloumns.
@@ -965,14 +965,14 @@ void SwFmtCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nA
         Calc( nGutterWidth, nAct );
 }
 
-void SwFmtCol::SetOrtho( bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct )
+void SwFormatCol::SetOrtho( bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct )
 {
     m_bOrtho = bNew;
     if ( bNew && !m_aColumns.empty() )
         Calc( nGutterWidth, nAct );
 }
 
-sal_uInt16 SwFmtCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
+sal_uInt16 SwFormatCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
 {
     assert(nCol < m_aColumns.size());
     if ( m_nWidth != nAct )
@@ -986,7 +986,7 @@ sal_uInt16 SwFmtCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
         return m_aColumns[nCol].GetWishWidth();
 }
 
-sal_uInt16 SwFmtCol::CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
+sal_uInt16 SwFormatCol::CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
 {
     assert(nCol < m_aColumns.size());
     sal_uInt16 nRet = CalcColWidth( nCol, nAct );
@@ -996,7 +996,7 @@ sal_uInt16 SwFmtCol::CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
     return nRet;
 }
 
-void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct )
+void SwFormatCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct )
 {
     if(!GetNumCols())
         return;
@@ -1049,7 +1049,7 @@ void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct )
     }
 }
 
-bool SwFmtCol::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatCol::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -1065,7 +1065,7 @@ bool SwFmtCol::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return true;
 }
 
-bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -1140,9 +1140,9 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-void SwFmtCol::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatCol::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtCol"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatCol"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eLineStyle"), BAD_CAST(OString::number(m_eLineStyle).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nLineWidth"), BAD_CAST(OString::number(m_nLineWidth).getStr()));
@@ -1162,13 +1162,13 @@ void SwFmtCol::dumpAsXml(xmlTextWriterPtr pWriter) const
 }
 
 // Partially implemented inline in hxx
-SwFmtSurround::SwFmtSurround( SwSurround eFly ) :
+SwFormatSurround::SwFormatSurround( SwSurround eFly ) :
     SfxEnumItem( RES_SURROUND, sal_uInt16( eFly ) )
 {
     bAnchorOnly = bContour = bOutside = false;
 }
 
-SwFmtSurround::SwFmtSurround( const SwFmtSurround &rCpy ) :
+SwFormatSurround::SwFormatSurround( const SwFormatSurround &rCpy ) :
     SfxEnumItem( RES_SURROUND, rCpy.GetValue() )
 {
     bAnchorOnly = rCpy.bAnchorOnly;
@@ -1176,21 +1176,21 @@ SwFmtSurround::SwFmtSurround( const SwFmtSurround &rCpy ) :
     bOutside = rCpy.bOutside;
 }
 
-bool SwFmtSurround::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatSurround::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return ( GetValue() == static_cast<const SwFmtSurround&>(rAttr).GetValue() &&
-             bAnchorOnly== static_cast<const SwFmtSurround&>(rAttr).bAnchorOnly &&
-             bContour== static_cast<const SwFmtSurround&>(rAttr).bContour &&
-             bOutside== static_cast<const SwFmtSurround&>(rAttr).bOutside );
+    return ( GetValue() == static_cast<const SwFormatSurround&>(rAttr).GetValue() &&
+             bAnchorOnly== static_cast<const SwFormatSurround&>(rAttr).bAnchorOnly &&
+             bContour== static_cast<const SwFormatSurround&>(rAttr).bContour &&
+             bOutside== static_cast<const SwFormatSurround&>(rAttr).bOutside );
 }
 
-SfxPoolItem*  SwFmtSurround::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatSurround::Clone( SfxItemPool* ) const
 {
-    return new SwFmtSurround( *this );
+    return new SwFormatSurround( *this );
 }
 
-sal_uInt16  SwFmtSurround::GetValueCount() const
+sal_uInt16  SwFormatSurround::GetValueCount() const
 {
     return SURROUND_END - SURROUND_BEGIN;
 }
@@ -1225,7 +1225,7 @@ namespace
     }
 }
 
-bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -1251,7 +1251,7 @@ bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -1286,9 +1286,9 @@ bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-void SwFmtSurround::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatSurround::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtSurround"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatSurround"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number(GetValue()).getStr()));
 
@@ -1303,7 +1303,7 @@ void SwFmtSurround::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-SvStream& SwFmtVertOrient::Store(SvStream &rStream, sal_uInt16 /*version*/) const
+SvStream& SwFormatVertOrient::Store(SvStream &rStream, sal_uInt16 /*version*/) const
 {
 #if SAL_TYPES_SIZEOFLONG == 8
     rStream.WriteInt64(m_nYPos);
@@ -1314,7 +1314,7 @@ SvStream& SwFmtVertOrient::Store(SvStream &rStream, sal_uInt16 /*version*/) cons
     return rStream;
 }
 
-SfxPoolItem* SwFmtVertOrient::Create(SvStream &rStream, sal_uInt16 /*itemVersion*/) const
+SfxPoolItem* SwFormatVertOrient::Create(SvStream &rStream, sal_uInt16 /*itemVersion*/) const
 {
     SwTwips yPos(0);
     sal_Int16 orient(0);
@@ -1330,11 +1330,11 @@ SfxPoolItem* SwFmtVertOrient::Create(SvStream &rStream, sal_uInt16 /*itemVersion
 #endif
     rStream.ReadInt16( orient ).ReadInt16( relation );
 
-    return new SwFmtVertOrient(yPos, orient, relation);
+    return new SwFormatVertOrient(yPos, orient, relation);
 }
 
 // Partially implemented inline in hxx
-SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert,
+SwFormatVertOrient::SwFormatVertOrient( SwTwips nY, sal_Int16 eVert,
                                   sal_Int16 eRel )
     : SfxPoolItem( RES_VERT_ORIENT ),
     m_nYPos( nY ),
@@ -1342,20 +1342,20 @@ SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert,
     m_eRelation( eRel )
 {}
 
-bool SwFmtVertOrient::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatVertOrient::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return ( m_nYPos     == static_cast<const SwFmtVertOrient&>(rAttr).m_nYPos &&
-             m_eOrient   == static_cast<const SwFmtVertOrient&>(rAttr).m_eOrient &&
-             m_eRelation == static_cast<const SwFmtVertOrient&>(rAttr).m_eRelation );
+    return ( m_nYPos     == static_cast<const SwFormatVertOrient&>(rAttr).m_nYPos &&
+             m_eOrient   == static_cast<const SwFormatVertOrient&>(rAttr).m_eOrient &&
+             m_eRelation == static_cast<const SwFormatVertOrient&>(rAttr).m_eRelation );
 }
 
-SfxPoolItem*  SwFmtVertOrient::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatVertOrient::Clone( SfxItemPool* ) const
 {
-    return new SwFmtVertOrient( m_nYPos, m_eOrient, m_eRelation );
+    return new SwFormatVertOrient( m_nYPos, m_eOrient, m_eRelation );
 }
 
-bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -1380,7 +1380,7 @@ bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1415,9 +1415,9 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-void SwFmtVertOrient::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatVertOrient::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtVertOrient"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatVertOrient"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nYPos"), BAD_CAST(OString::number(m_nYPos).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eOrient"), BAD_CAST(OString::number(m_eOrient).getStr()));
@@ -1426,7 +1426,7 @@ void SwFmtVertOrient::dumpAsXml(xmlTextWriterPtr pWriter) const
 }
 
 // Partially implemented inline in hxx
-SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori,
+SwFormatHoriOrient::SwFormatHoriOrient( SwTwips nX, sal_Int16 eHori,
                               sal_Int16 eRel, bool bPos )
     : SfxPoolItem( RES_HORI_ORIENT ),
     m_nXPos( nX ),
@@ -1435,21 +1435,21 @@ SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori,
     m_bPosToggle( bPos )
 {}
 
-bool SwFmtHoriOrient::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatHoriOrient::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return ( m_nXPos == static_cast<const SwFmtHoriOrient&>(rAttr).m_nXPos &&
-             m_eOrient == static_cast<const SwFmtHoriOrient&>(rAttr).m_eOrient &&
-             m_eRelation == static_cast<const SwFmtHoriOrient&>(rAttr).m_eRelation &&
-             m_bPosToggle == static_cast<const SwFmtHoriOrient&>(rAttr).m_bPosToggle );
+    return ( m_nXPos == static_cast<const SwFormatHoriOrient&>(rAttr).m_nXPos &&
+             m_eOrient == static_cast<const SwFormatHoriOrient&>(rAttr).m_eOrient &&
+             m_eRelation == static_cast<const SwFormatHoriOrient&>(rAttr).m_eRelation &&
+             m_bPosToggle == static_cast<const SwFormatHoriOrient&>(rAttr).m_bPosToggle );
 }
 
-SfxPoolItem*  SwFmtHoriOrient::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatHoriOrient::Clone( SfxItemPool* ) const
 {
-    return new SwFmtHoriOrient( m_nXPos, m_eOrient, m_eRelation, m_bPosToggle );
+    return new SwFormatHoriOrient( m_nXPos, m_eOrient, m_eRelation, m_bPosToggle );
 }
 
-bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -1477,7 +1477,7 @@ bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1516,9 +1516,9 @@ bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-void SwFmtHoriOrient::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatHoriOrient::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtHoriOrient"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatHoriOrient"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nXPos"), BAD_CAST(OString::number(m_nXPos).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eOrient"), BAD_CAST(OString::number(m_eOrient).getStr()));
@@ -1528,7 +1528,7 @@ void SwFmtHoriOrient::dumpAsXml(xmlTextWriterPtr pWriter) const
 }
 
 // Partially implemented inline in hxx
-SwFmtAnchor::SwFmtAnchor( RndStdIds nRnd, sal_uInt16 nPage )
+SwFormatAnchor::SwFormatAnchor( RndStdIds nRnd, sal_uInt16 nPage )
     : SfxPoolItem( RES_ANCHOR ),
     nAnchorId( nRnd ),
     nPageNum( nPage ),
@@ -1536,10 +1536,10 @@ SwFmtAnchor::SwFmtAnchor( RndStdIds nRnd, sal_uInt16 nPage )
     mnOrder( ++mnOrderCounter )
 {}
 
-SwFmtAnchor::SwFmtAnchor( const SwFmtAnchor &rCpy )
+SwFormatAnchor::SwFormatAnchor( const SwFormatAnchor &rCpy )
     : SfxPoolItem( RES_ANCHOR )
-    , m_pCntntAnchor( (rCpy.GetCntntAnchor())
-            ?  new SwPosition( *rCpy.GetCntntAnchor() ) : 0 )
+    , m_pContentAnchor( (rCpy.GetContentAnchor())
+            ?  new SwPosition( *rCpy.GetContentAnchor() ) : 0 )
     , nAnchorId( rCpy.GetAnchorId() )
     , nPageNum( rCpy.GetPageNum() )
     // OD 2004-05-05 #i28701# - get always new increased order number
@@ -1547,11 +1547,11 @@ SwFmtAnchor::SwFmtAnchor( const SwFmtAnchor &rCpy )
 {
 }
 
-SwFmtAnchor::~SwFmtAnchor()
+SwFormatAnchor::~SwFormatAnchor()
 {
 }
 
-void SwFmtAnchor::SetAnchor( const SwPosition *pPos )
+void SwFormatAnchor::SetAnchor( const SwPosition *pPos )
 {
     // anchor only to paragraphs, or start nodes in case of FLY_AT_FLY
     // also allow table node, this is used when a table is selected and is converted to a frame by the UI
@@ -1559,54 +1559,54 @@ void SwFmtAnchor::SetAnchor( const SwPosition *pPos )
             || ((FLY_AT_FLY == nAnchorId) &&
                     dynamic_cast<SwStartNode*>(&pPos->nNode.GetNode()))
             || (FLY_AT_PARA == nAnchorId && dynamic_cast<SwTableNode*>(&pPos->nNode.GetNode()))
-            || dynamic_cast<SwTxtNode*>(&pPos->nNode.GetNode()));
-    m_pCntntAnchor .reset( (pPos) ? new SwPosition( *pPos ) : 0 );
+            || dynamic_cast<SwTextNode*>(&pPos->nNode.GetNode()));
+    m_pContentAnchor .reset( (pPos) ? new SwPosition( *pPos ) : 0 );
     // Flys anchored AT paragraph should not point into the paragraph content
-    if (m_pCntntAnchor &&
+    if (m_pContentAnchor &&
         ((FLY_AT_PARA == nAnchorId) || (FLY_AT_FLY == nAnchorId)))
     {
-        m_pCntntAnchor->nContent.Assign( 0, 0 );
+        m_pContentAnchor->nContent.Assign( 0, 0 );
     }
 }
 
-SwFmtAnchor& SwFmtAnchor::operator=(const SwFmtAnchor& rAnchor)
+SwFormatAnchor& SwFormatAnchor::operator=(const SwFormatAnchor& rAnchor)
 {
     nAnchorId  = rAnchor.GetAnchorId();
     nPageNum   = rAnchor.GetPageNum();
     // OD 2004-05-05 #i28701# - get always new increased order number
     mnOrder = ++mnOrderCounter;
 
-    m_pCntntAnchor.reset( (rAnchor.GetCntntAnchor())
-        ? new SwPosition(*(rAnchor.GetCntntAnchor()))
+    m_pContentAnchor.reset( (rAnchor.GetContentAnchor())
+        ? new SwPosition(*(rAnchor.GetContentAnchor()))
         : 0 );
     return *this;
 }
 
-bool SwFmtAnchor::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatAnchor::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    SwFmtAnchor const& rFmtAnchor(static_cast<SwFmtAnchor const&>(rAttr));
+    SwFormatAnchor const& rFormatAnchor(static_cast<SwFormatAnchor const&>(rAttr));
     // OD 2004-05-05 #i28701# - Note: <mnOrder> hasn't to be considered.
-    return ( nAnchorId == rFmtAnchor.GetAnchorId() &&
-             nPageNum == rFmtAnchor.GetPageNum()   &&
+    return ( nAnchorId == rFormatAnchor.GetAnchorId() &&
+             nPageNum == rFormatAnchor.GetPageNum()   &&
                 // compare anchor: either both do not point into a textnode or
-                // both do (valid m_pCntntAnchor) and the positions are equal
-             ((m_pCntntAnchor.get() == rFmtAnchor.m_pCntntAnchor.get()) ||
-              (m_pCntntAnchor && rFmtAnchor.GetCntntAnchor() &&
-               (*m_pCntntAnchor == *rFmtAnchor.GetCntntAnchor()))));
+                // both do (valid m_pContentAnchor) and the positions are equal
+             ((m_pContentAnchor.get() == rFormatAnchor.m_pContentAnchor.get()) ||
+              (m_pContentAnchor && rFormatAnchor.GetContentAnchor() &&
+               (*m_pContentAnchor == *rFormatAnchor.GetContentAnchor()))));
 }
 
-SfxPoolItem*  SwFmtAnchor::Clone( SfxItemPool* ) const
+SfxPoolItem*  SwFormatAnchor::Clone( SfxItemPool* ) const
 {
-    return new SwFmtAnchor( *this );
+    return new SwFormatAnchor( *this );
 }
 
 // OD 2004-05-05 #i28701#
-sal_uInt32 SwFmtAnchor::mnOrderCounter = 0;
+sal_uInt32 SwFormatAnchor::mnOrderCounter = 0;
 
 // OD 2004-05-05 #i28701#
 
-bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -1641,13 +1641,13 @@ bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
         break;
         case MID_ANCHOR_ANCHORFRAME:
         {
-            if (m_pCntntAnchor && FLY_AT_FLY == nAnchorId)
+            if (m_pContentAnchor && FLY_AT_FLY == nAnchorId)
             {
-                SwFrmFmt* pFmt = m_pCntntAnchor->nNode.GetNode().GetFlyFmt();
-                if(pFmt)
+                SwFrameFormat* pFormat = m_pContentAnchor->nNode.GetNode().GetFlyFormat();
+                if(pFormat)
                 {
                     uno::Reference<text::XTextFrame> const xRet(
-                        SwXTextFrame::CreateXTextFrame(*pFmt->GetDoc(), pFmt));
+                        SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), pFormat));
                     rVal <<= xRet;
                 }
             }
@@ -1660,7 +1660,7 @@ bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -1682,7 +1682,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                         // If the anchor type is page and a valid page number
                         // has been set, the content position isn't required
                         // any longer.
-                        m_pCntntAnchor.reset();
+                        m_pContentAnchor.reset();
                     }
                     break;
                 case  text::TextContentAnchorType_AT_FRAME:
@@ -1712,7 +1712,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                     // confuse the layout (frmtool.cxx). However, if the
                     // anchor type is not page, any content position will
                     // be kept.
-                    m_pCntntAnchor.reset();
+                    m_pContentAnchor.reset();
                 }
             }
             else
@@ -1728,19 +1728,19 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-void SwFmtAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtAnchor"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatAnchor"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
 
-    if (m_pCntntAnchor)
+    if (m_pContentAnchor)
     {
-        std::stringstream aCntntAnchor;
-        aCntntAnchor << *m_pCntntAnchor;
-        xmlTextWriterWriteAttribute(pWriter, BAD_CAST("pCntntAnchor"), BAD_CAST(aCntntAnchor.str().c_str()));
+        std::stringstream aContentAnchor;
+        aContentAnchor << *m_pContentAnchor;
+        xmlTextWriterWriteAttribute(pWriter, BAD_CAST("pContentAnchor"), BAD_CAST(aContentAnchor.str().c_str()));
     }
     else
-        xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("pCntntAnchor"), "%p", m_pCntntAnchor.get());
+        xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("pContentAnchor"), "%p", m_pContentAnchor.get());
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nAnchorType"), BAD_CAST(OString::number(nAnchorId).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nPageNum"), BAD_CAST(OString::number(nPageNum).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nOrder"), BAD_CAST(OString::number(mnOrder).getStr()));
@@ -1753,14 +1753,14 @@ void SwFmtAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const
 }
 
 // Partially implemented inline in hxx
-SwFmtURL::SwFmtURL() :
+SwFormatURL::SwFormatURL() :
     SfxPoolItem( RES_URL ),
     pMap( 0 ),
     bIsServerMap( false )
 {
 }
 
-SwFmtURL::SwFmtURL( const SwFmtURL &rURL) :
+SwFormatURL::SwFormatURL( const SwFormatURL &rURL) :
     SfxPoolItem( RES_URL ),
     sTargetFrameName( rURL.GetTargetFrameName() ),
     sURL( rURL.GetURL() ),
@@ -1770,15 +1770,15 @@ SwFmtURL::SwFmtURL( const SwFmtURL &rURL) :
     pMap = rURL.GetMap() ? new ImageMap( *rURL.GetMap() ) : 0;
 }
 
-SwFmtURL::~SwFmtURL()
+SwFormatURL::~SwFormatURL()
 {
     delete pMap;
 }
 
-bool SwFmtURL::operator==( const SfxPoolItem &rAttr ) const
+bool SwFormatURL::operator==( const SfxPoolItem &rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    const SwFmtURL &rCmp = static_cast<const SwFmtURL&>(rAttr);
+    const SwFormatURL &rCmp = static_cast<const SwFormatURL&>(rAttr);
     bool bRet = bIsServerMap     == rCmp.IsServerMap() &&
                 sURL             == rCmp.GetURL() &&
                 sTargetFrameName == rCmp.GetTargetFrameName() &&
@@ -1793,24 +1793,24 @@ bool SwFmtURL::operator==( const SfxPoolItem &rAttr ) const
     return bRet;
 }
 
-SfxPoolItem* SwFmtURL::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatURL::Clone( SfxItemPool* ) const
 {
-    return new SwFmtURL( *this );
+    return new SwFormatURL( *this );
 }
 
-void SwFmtURL::SetURL(const OUString &rURL, bool bServerMap)
+void SwFormatURL::SetURL(const OUString &rURL, bool bServerMap)
 {
     sURL = rURL;
     bIsServerMap = bServerMap;
 }
 
-void SwFmtURL::SetMap( const ImageMap *pM )
+void SwFormatURL::SetMap( const ImageMap *pM )
 {
     delete pMap;
     pMap = pM ? new ImageMap( *pM ) : 0;
 }
 
-bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -1852,7 +1852,7 @@ bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -1905,63 +1905,63 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatEditInReadonly::Clone( SfxItemPool* ) const
 {
-    return new SwFmtEditInReadonly( Which(), GetValue() );
+    return new SwFormatEditInReadonly( Which(), GetValue() );
 }
 
-SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatLayoutSplit::Clone( SfxItemPool* ) const
 {
-    return new SwFmtLayoutSplit( GetValue() );
+    return new SwFormatLayoutSplit( GetValue() );
 }
 
-SfxPoolItem* SwFmtRowSplit::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatRowSplit::Clone( SfxItemPool* ) const
 {
-    return new SwFmtRowSplit( GetValue() );
+    return new SwFormatRowSplit( GetValue() );
 }
 
-SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatNoBalancedColumns::Clone( SfxItemPool* ) const
 {
-    return new SwFmtNoBalancedColumns( GetValue() );
+    return new SwFormatNoBalancedColumns( GetValue() );
 }
 
-void SwFmtNoBalancedColumns::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatNoBalancedColumns::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtNoBalancedColumns"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatNoBalancedColumns"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::boolean(GetValue()).getStr()));
     xmlTextWriterEndElement(pWriter);
 }
 
-// class SwFmtFtnEndAtTxtEnd
+// class SwFormatFootnoteEndAtTextEnd
 
-sal_uInt16 SwFmtFtnEndAtTxtEnd::GetValueCount() const
+sal_uInt16 SwFormatFootnoteEndAtTextEnd::GetValueCount() const
 {
     return sal_uInt16( FTNEND_ATTXTEND_END );
 }
 
-SwFmtFtnEndAtTxtEnd& SwFmtFtnEndAtTxtEnd::operator=(
-                        const SwFmtFtnEndAtTxtEnd& rAttr )
+SwFormatFootnoteEndAtTextEnd& SwFormatFootnoteEndAtTextEnd::operator=(
+                        const SwFormatFootnoteEndAtTextEnd& rAttr )
 {
     SfxEnumItem::SetValue( rAttr.GetValue() );
-    aFmt = rAttr.aFmt;
+    aFormat = rAttr.aFormat;
     nOffset = rAttr.nOffset;
     sPrefix = rAttr.sPrefix;
     sSuffix = rAttr.sSuffix;
     return *this;
 }
 
-bool SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const
+bool SwFormatFootnoteEndAtTextEnd::operator==( const SfxPoolItem& rItem ) const
 {
-    const SwFmtFtnEndAtTxtEnd& rAttr = static_cast<const SwFmtFtnEndAtTxtEnd&>(rItem);
+    const SwFormatFootnoteEndAtTextEnd& rAttr = static_cast<const SwFormatFootnoteEndAtTextEnd&>(rItem);
     return SfxEnumItem::operator==( rAttr ) &&
-            aFmt.GetNumberingType() == rAttr.aFmt.GetNumberingType() &&
+            aFormat.GetNumberingType() == rAttr.aFormat.GetNumberingType() &&
             nOffset == rAttr.nOffset &&
             sPrefix == rAttr.sPrefix &&
             sSuffix == rAttr.sSuffix;
 }
 
-bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatFootnoteEndAtTextEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -1976,7 +1976,7 @@ bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons
         case MID_OWN_NUM     :
             rVal <<= GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT;
         break;
-        case MID_NUM_TYPE    : rVal <<= aFmt.GetNumberingType(); break;
+        case MID_NUM_TYPE    : rVal <<= aFormat.GetNumberingType(); break;
         case MID_PREFIX      : rVal <<= OUString(sPrefix); break;
         case MID_SUFFIX      : rVal <<= OUString(sSuffix); break;
         default: return false;
@@ -1984,7 +1984,7 @@ bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons
     return true;
 }
 
-bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     bool bRet = true;
     nMemberId &= ~CONVERT_TWIPS;
@@ -2035,7 +2035,7 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                 (nVal <= SVX_NUM_ARABIC ||
                     SVX_NUM_CHARS_UPPER_LETTER_N == nVal ||
                         SVX_NUM_CHARS_LOWER_LETTER_N == nVal ))
-                aFmt.SetNumberingType(nVal);
+                aFormat.SetNumberingType(nVal);
             else
                 bRet = false;
         }
@@ -2057,66 +2057,66 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-// class SwFmtFtnAtTxtEnd
+// class SwFormatFootnoteAtTextEnd
 
-SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatFootnoteAtTextEnd::Clone( SfxItemPool* ) const
 {
-    SwFmtFtnAtTxtEnd* pNew = new SwFmtFtnAtTxtEnd;
+    SwFormatFootnoteAtTextEnd* pNew = new SwFormatFootnoteAtTextEnd;
     *pNew = *this;
     return pNew;
 }
 
-// class SwFmtEndAtTxtEnd
+// class SwFormatEndAtTextEnd
 
-SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatEndAtTextEnd::Clone( SfxItemPool* ) const
 {
-    SwFmtEndAtTxtEnd* pNew = new SwFmtEndAtTxtEnd;
+    SwFormatEndAtTextEnd* pNew = new SwFormatEndAtTextEnd;
     *pNew = *this;
     return pNew;
 }
 
-//class SwFmtChain
+//class SwFormatChain
 
-bool SwFmtChain::operator==( const SfxPoolItem &rAttr ) const
+bool SwFormatChain::operator==( const SfxPoolItem &rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
 
-    return GetPrev() == static_cast<const SwFmtChain&>(rAttr).GetPrev() &&
-           GetNext() == static_cast<const SwFmtChain&>(rAttr).GetNext();
+    return GetPrev() == static_cast<const SwFormatChain&>(rAttr).GetPrev() &&
+           GetNext() == static_cast<const SwFormatChain&>(rAttr).GetNext();
 }
 
-SwFmtChain::SwFmtChain( const SwFmtChain &rCpy ) :
+SwFormatChain::SwFormatChain( const SwFormatChain &rCpy ) :
     SfxPoolItem( RES_CHAIN )
 {
     SetPrev( rCpy.GetPrev() );
     SetNext( rCpy.GetNext() );
 }
 
-SfxPoolItem* SwFmtChain::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatChain::Clone( SfxItemPool* ) const
 {
-    SwFmtChain *pRet = new SwFmtChain;
+    SwFormatChain *pRet = new SwFormatChain;
     pRet->SetPrev( GetPrev() );
     pRet->SetNext( GetNext() );
     return pRet;
 }
 
-void SwFmtChain::SetPrev( SwFlyFrmFmt *pFmt )
+void SwFormatChain::SetPrev( SwFlyFrameFormat *pFormat )
 {
-    if ( pFmt )
-        pFmt->Add( &aPrev );
+    if ( pFormat )
+        pFormat->Add( &aPrev );
     else if ( aPrev.GetRegisteredIn() )
         static_cast<SwModify*>(aPrev.GetRegisteredIn())->Remove( &aPrev );
 }
 
-void SwFmtChain::SetNext( SwFlyFrmFmt *pFmt )
+void SwFormatChain::SetNext( SwFlyFrameFormat *pFormat )
 {
-    if ( pFmt )
-        pFmt->Add( &aNext );
+    if ( pFormat )
+        pFormat->Add( &aNext );
     else if ( aNext.GetRegisteredIn() )
         static_cast<SwModify*>(aNext.GetRegisteredIn())->Remove( &aNext );
 }
 
-bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -2140,31 +2140,31 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-SwFmtLineNumber::SwFmtLineNumber() :
+SwFormatLineNumber::SwFormatLineNumber() :
     SfxPoolItem( RES_LINENUMBER )
 {
     nStartValue = 0;
     bCountLines = true;
 }
 
-SwFmtLineNumber::~SwFmtLineNumber()
+SwFormatLineNumber::~SwFormatLineNumber()
 {
 }
 
-bool SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const
+bool SwFormatLineNumber::operator==( const SfxPoolItem &rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
 
-    return nStartValue  == static_cast<const SwFmtLineNumber&>(rAttr).GetStartValue() &&
-           bCountLines  == static_cast<const SwFmtLineNumber&>(rAttr).IsCount();
+    return nStartValue  == static_cast<const SwFormatLineNumber&>(rAttr).GetStartValue() &&
+           bCountLines  == static_cast<const SwFormatLineNumber&>(rAttr).IsCount();
 }
 
-SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatLineNumber::Clone( SfxItemPool* ) const
 {
-    return new SwFmtLineNumber( *this );
+    return new SwFormatLineNumber( *this );
 }
 
-bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -2184,7 +2184,7 @@ bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     // here we convert always!
     nMemberId &= ~CONVERT_TWIPS;
@@ -2502,54 +2502,54 @@ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const
 }
 
 // Partially implemented inline in hxx
-TYPEINIT1( SwFrmFmt, SwFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrmFmt )
+TYPEINIT1( SwFrameFormat, SwFormat );
+IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrameFormat )
 
-SwFrmFmt::SwFrmFmt(
+SwFrameFormat::SwFrameFormat(
     SwAttrPool& rPool,
-    const sal_Char* pFmtNm,
-    SwFrmFmt *pDrvdFrm,
-    sal_uInt16 nFmtWhich,
+    const sal_Char* pFormatNm,
+    SwFrameFormat *pDrvdFrm,
+    sal_uInt16 nFormatWhich,
     const sal_uInt16* pWhichRange)
-:   SwFmt(rPool, pFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), pDrvdFrm, nFmtWhich),
+:   SwFormat(rPool, pFormatNm, (pWhichRange ? pWhichRange : aFrameFormatSetRange), pDrvdFrm, nFormatWhich),
     m_wXObject(),
     maFillAttributes()
 {
 }
 
-SwFrmFmt::SwFrmFmt(
+SwFrameFormat::SwFrameFormat(
     SwAttrPool& rPool,
-    const OUString &rFmtNm,
-    SwFrmFmt *pDrvdFrm,
-    sal_uInt16 nFmtWhich,
+    const OUString &rFormatNm,
+    SwFrameFormat *pDrvdFrm,
+    sal_uInt16 nFormatWhich,
     const sal_uInt16* pWhichRange)
-:   SwFmt(rPool, rFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), pDrvdFrm, nFmtWhich),
+:   SwFormat(rPool, rFormatNm, (pWhichRange ? pWhichRange : aFrameFormatSetRange), pDrvdFrm, nFormatWhich),
     m_wXObject(),
     maFillAttributes()
 {
 }
 
-SwFrmFmt::~SwFrmFmt()
+SwFrameFormat::~SwFrameFormat()
 {
     if( !GetDoc()->IsInDtor())
     {
-        const SwFmtAnchor& rAnchor = GetAnchor();
-        if (rAnchor.GetCntntAnchor() != nullptr)
+        const SwFormatAnchor& rAnchor = GetAnchor();
+        if (rAnchor.GetContentAnchor() != nullptr)
         {
-            rAnchor.GetCntntAnchor()->nNode.GetNode().RemoveAnchoredFly(this);
+            rAnchor.GetContentAnchor()->nNode.GetNode().RemoveAnchoredFly(this);
         }
     }
 }
 
-bool SwFrmFmt::supportsFullDrawingLayerFillAttributeSet() const
+bool SwFrameFormat::supportsFullDrawingLayerFillAttributeSet() const
 {
     return true;
 }
 
-void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwFrameFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
-    SwFmtHeader const *pH = 0;
-    SwFmtFooter const *pF = 0;
+    SwFormatHeader const *pH = 0;
+    SwFormatFooter const *pF = 0;
 
     const sal_uInt16 nWhich = pNew ? pNew->Which() : 0;
 
@@ -2586,23 +2586,23 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         }
     }
     else if( RES_HEADER == nWhich )
-        pH = static_cast<const SwFmtHeader*>(pNew);
+        pH = static_cast<const SwFormatHeader*>(pNew);
     else if( RES_FOOTER == nWhich )
-        pF = static_cast<const SwFmtFooter*>(pNew);
+        pF = static_cast<const SwFormatFooter*>(pNew);
 
-    if( pH && pH->IsActive() && !pH->GetHeaderFmt() )
+    if( pH && pH->IsActive() && !pH->GetHeaderFormat() )
     {   //If he doesn't have one, I'll add one
-        SwFrmFmt *pFmt = GetDoc()->getIDocumentLayoutAccess().MakeLayoutFmt( RND_STD_HEADER, 0 );
-        const_cast<SwFmtHeader *>(pH)->RegisterToFormat( *pFmt );
+        SwFrameFormat *pFormat = GetDoc()->getIDocumentLayoutAccess().MakeLayoutFormat( RND_STD_HEADER, 0 );
+        const_cast<SwFormatHeader *>(pH)->RegisterToFormat( *pFormat );
     }
 
-    if( pF && pF->IsActive() && !pF->GetFooterFmt() )
+    if( pF && pF->IsActive() && !pF->GetFooterFormat() )
     {   //If he doesn't have one, I'll add one
-        SwFrmFmt *pFmt = GetDoc()->getIDocumentLayoutAccess().MakeLayoutFmt( RND_STD_FOOTER, 0 );
-        const_cast<SwFmtFooter *>(pF)->RegisterToFormat( *pFmt );
+        SwFrameFormat *pFormat = GetDoc()->getIDocumentLayoutAccess().MakeLayoutFormat( RND_STD_FOOTER, 0 );
+        const_cast<SwFormatFooter *>(pF)->RegisterToFormat( *pFormat );
     }
 
-    SwFmt::Modify( pOld, pNew );
+    SwFormat::Modify( pOld, pNew );
 
     if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
     {   // invalidate cached uno object
@@ -2616,19 +2616,19 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         const SfxPoolItem* tmp = NULL;
         static_cast< const SwAttrSetChg* >(pNew)->GetChgSet()->GetItemState( RES_ANCHOR, false, &tmp );
         if( tmp )
-            newAnchorPosition = static_cast< const SwFmtAnchor* >( tmp )->GetCntntAnchor();
+            newAnchorPosition = static_cast< const SwFormatAnchor* >( tmp )->GetContentAnchor();
     }
     if( pNew && pNew->Which() == RES_ANCHOR )
-        newAnchorPosition = static_cast< const SwFmtAnchor* >( pNew )->GetCntntAnchor();
+        newAnchorPosition = static_cast< const SwFormatAnchor* >( pNew )->GetContentAnchor();
     if( pOld && pOld->Which() == RES_ATTRSET_CHG )
     {
         const SfxPoolItem* tmp = NULL;
         static_cast< const SwAttrSetChg* >(pOld)->GetChgSet()->GetItemState( RES_ANCHOR, false, &tmp );
         if( tmp )
-            oldAnchorPosition = static_cast< const SwFmtAnchor* >( tmp )->GetCntntAnchor();
+            oldAnchorPosition = static_cast< const SwFormatAnchor* >( tmp )->GetContentAnchor();
     }
     if( pOld && pOld->Which() == RES_ANCHOR )
-        oldAnchorPosition = static_cast< const SwFmtAnchor* >( pOld )->GetCntntAnchor();
+        oldAnchorPosition = static_cast< const SwFormatAnchor* >( pOld )->GetContentAnchor();
     if( oldAnchorPosition != NULL && ( newAnchorPosition == NULL || oldAnchorPosition->nNode.GetIndex() != newAnchorPosition->nNode.GetIndex()))
     {
         oldAnchorPosition->nNode.GetNode().RemoveAnchoredFly(this);
@@ -2639,15 +2639,15 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     }
 }
 
-void SwFrmFmt::RegisterToFormat( SwFmt& rFmt )
+void SwFrameFormat::RegisterToFormat( SwFormat& rFormat )
 {
-    rFmt.Add( this );
+    rFormat.Add( this );
 }
 
 /// Delete all Frms that are registered in aDepend.
-void SwFrmFmt::DelFrms()
+void SwFrameFormat::DelFrms()
 {
-    SwIterator<SwFrm,SwFmt> aIter( *this );
+    SwIterator<SwFrm,SwFormat> aIter( *this );
     SwFrm * pLast = aIter.First();
     if( pLast )
         do {
@@ -2656,20 +2656,20 @@ void SwFrmFmt::DelFrms()
         } while( 0 != ( pLast = aIter.Next() ));
 }
 
-void SwFrmFmt::MakeFrms()
+void SwFrameFormat::MakeFrms()
 {
     OSL_ENSURE( false, "Sorry not implemented." );
 }
 
-SwRect SwFrmFmt::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
+SwRect SwFrameFormat::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
                                  const bool bCalcFrm ) const
 {
     SwRect aRet;
     SwFrm *pFrm = 0;
-    if( ISA( SwSectionFmt ) )
+    if( ISA( SwSectionFormat ) )
     {
         // get the Frame using Node2Layout
-        const SwSectionNode* pSectNd = static_cast<const SwSectionFmt*>(this)->GetSectionNode();
+        const SwSectionNode* pSectNd = static_cast<const SwSectionFormat*>(this)->GetSectionNode();
         if( pSectNd )
         {
             SwNode2Layout aTmp( *pSectNd, pSectNd->GetIndex() - 1 );
@@ -2710,12 +2710,12 @@ SwRect SwFrmFmt::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
     return aRet;
 }
 
-SwContact* SwFrmFmt::FindContactObj()
+SwContact* SwFrameFormat::FindContactObj()
 {
-    return SwIterator<SwContact,SwFmt>( *this ).First();
+    return SwIterator<SwContact,SwFormat>( *this ).First();
 }
 
-SdrObject* SwFrmFmt::FindSdrObject()
+SdrObject* SwFrameFormat::FindSdrObject()
 {
     // #i30669# - use method <FindContactObj()> instead of
     // duplicated code.
@@ -2723,7 +2723,7 @@ SdrObject* SwFrmFmt::FindSdrObject()
     return pFoundContact ? pFoundContact->GetMaster() : 0;
 }
 
-SdrObject* SwFrmFmt::FindRealSdrObject()
+SdrObject* SwFrameFormat::FindRealSdrObject()
 {
     if( RES_FLYFRMFMT == Which() )
     {
@@ -2735,51 +2735,51 @@ SdrObject* SwFrmFmt::FindRealSdrObject()
     return FindSdrObject();
 }
 
-bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
+bool SwFrameFormat::IsLowerOf( const SwFrameFormat& rFormat ) const
 {
     //Also linking from inside to outside or from outside to inside is not
     //allowed.
-    SwFlyFrm *pSFly = SwIterator<SwFlyFrm,SwFmt>(*this).First();
+    SwFlyFrm *pSFly = SwIterator<SwFlyFrm,SwFormat>(*this).First();
     if( pSFly )
     {
-        SwFlyFrm *pAskFly = SwIterator<SwFlyFrm,SwFmt>(rFmt).First();
+        SwFlyFrm *pAskFly = SwIterator<SwFlyFrm,SwFormat>(rFormat).First();
         if( pAskFly )
             return pSFly->IsLowerOf( pAskFly );
     }
 
     // let's try it using the node positions
-    const SwFmtAnchor* pAnchor = &rFmt.GetAnchor();
-    if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) && pAnchor->GetCntntAnchor())
+    const SwFormatAnchor* pAnchor = &rFormat.GetAnchor();
+    if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) && pAnchor->GetContentAnchor())
     {
-        const SwFrmFmts& rFmts = *GetDoc()->GetSpzFrmFmts();
-        const SwNode* pFlyNd = pAnchor->GetCntntAnchor()->nNode.GetNode().
+        const SwFrameFormats& rFormats = *GetDoc()->GetSpzFrameFormats();
+        const SwNode* pFlyNd = pAnchor->GetContentAnchor()->nNode.GetNode().
                                 FindFlyStartNode();
         while( pFlyNd )
         {
             // then we walk up using the anchor
             size_t n;
-            for( n = 0; n < rFmts.size(); ++n )
+            for( n = 0; n < rFormats.size(); ++n )
             {
-                const SwFrmFmt* pFmt = rFmts[ n ];
-                const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+                const SwFrameFormat* pFormat = rFormats[ n ];
+                const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
                 if( pIdx && pFlyNd == &pIdx->GetNode() )
                 {
-                    if( pFmt == this )
+                    if( pFormat == this )
                         return true;
 
-                    pAnchor = &pFmt->GetAnchor();
+                    pAnchor = &pFormat->GetAnchor();
                     if ((FLY_AT_PAGE == pAnchor->GetAnchorId()) ||
-                        !pAnchor->GetCntntAnchor() )
+                        !pAnchor->GetContentAnchor() )
                     {
                         return false;
                     }
 
-                    pFlyNd = pAnchor->GetCntntAnchor()->nNode.GetNode().
+                    pFlyNd = pAnchor->GetContentAnchor()->nNode.GetNode().
                                 FindFlyStartNode();
                     break;
                 }
             }
-            if( n >= rFmts.size() )
+            if( n >= rFormats.size() )
             {
                 OSL_ENSURE( false, "Fly section but no format found" );
                 return false;
@@ -2790,34 +2790,34 @@ bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
 }
 
 // #i31698#
-SwFrmFmt::tLayoutDir SwFrmFmt::GetLayoutDir() const
+SwFrameFormat::tLayoutDir SwFrameFormat::GetLayoutDir() const
 {
-    return SwFrmFmt::HORI_L2R;
+    return SwFrameFormat::HORI_L2R;
 }
 
-void SwFrmFmt::SetLayoutDir( const SwFrmFmt::tLayoutDir )
+void SwFrameFormat::SetLayoutDir( const SwFrameFormat::tLayoutDir )
 {
     // empty body, because default implementation does nothing
 }
 
 // #i28749#
-sal_Int16 SwFrmFmt::GetPositionLayoutDir() const
+sal_Int16 SwFrameFormat::GetPositionLayoutDir() const
 {
     return text::PositionLayoutDir::PositionInLayoutDirOfAnchor;
 }
-void SwFrmFmt::SetPositionLayoutDir( const sal_Int16 )
+void SwFrameFormat::SetPositionLayoutDir( const sal_Int16 )
 {
     // empty body, because default implementation does nothing
 }
 
-OUString SwFrmFmt::GetDescription() const
+OUString SwFrameFormat::GetDescription() const
 {
     return SW_RES(STR_FRAME);
 }
 
-void SwFrmFmt::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFrameFormat::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFrmFmt"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFrameFormat"));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetName().toUtf8().getStr()));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("whichId"), "%d", Which());
@@ -2840,23 +2840,23 @@ void SwFrmFmt::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-void SwFrmFmts::dumpAsXml(xmlTextWriterPtr pWriter, const char* pName) const
+void SwFrameFormats::dumpAsXml(xmlTextWriterPtr pWriter, const char* pName) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST(pName));
     for (size_t i = 0; i < size(); ++i)
-        GetFmt(i)->dumpAsXml(pWriter);
+        GetFormat(i)->dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
-//  class SwFlyFrmFmt
+//  class SwFlyFrameFormat
 //  Partially implemented inline in hxx
 
-TYPEINIT1( SwFlyFrmFmt, SwFrmFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt )
+TYPEINIT1( SwFlyFrameFormat, SwFrameFormat );
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrameFormat )
 
-SwFlyFrmFmt::~SwFlyFrmFmt()
+SwFlyFrameFormat::~SwFlyFrameFormat()
 {
-    SwIterator<SwFlyFrm,SwFmt> aIter( *this );
+    SwIterator<SwFlyFrm,SwFormat> aIter( *this );
     SwFlyFrm * pLast = aIter.First();
     if( pLast )
         do
@@ -2864,7 +2864,7 @@ SwFlyFrmFmt::~SwFlyFrmFmt()
             SwFrm::DestroyFrm(pLast);
         } while( 0 != ( pLast = aIter.Next() ));
 
-    SwIterator<SwFlyDrawContact,SwFmt> a2ndIter( *this );
+    SwIterator<SwFlyDrawContact,SwFormat> a2ndIter( *this );
     SwFlyDrawContact* pC = a2ndIter.First();
     if( pC )
         do {
@@ -2875,7 +2875,7 @@ SwFlyFrmFmt::~SwFlyFrmFmt()
 
 /// Creates the Frms if the format describes a paragraph-bound frame.
 /// MA: 1994-02-14: creates the Frms also for frames anchored at page.
-void SwFlyFrmFmt::MakeFrms()
+void SwFlyFrameFormat::MakeFrms()
 {
     // is there a layout?
     if( !GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
@@ -2883,36 +2883,36 @@ void SwFlyFrmFmt::MakeFrms()
 
     SwModify *pModify = 0;
     // OD 24.07.2003 #111032# - create local copy of anchor attribute for possible changes.
-    SwFmtAnchor aAnchorAttr( GetAnchor() );
+    SwFormatAnchor aAnchorAttr( GetAnchor() );
     switch( aAnchorAttr.GetAnchorId() )
     {
     case FLY_AS_CHAR:
     case FLY_AT_PARA:
     case FLY_AT_CHAR:
-        if( aAnchorAttr.GetCntntAnchor() )
+        if( aAnchorAttr.GetContentAnchor() )
         {
-            pModify = aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
+            pModify = aAnchorAttr.GetContentAnchor()->nNode.GetNode().GetContentNode();
         }
         break;
 
     case FLY_AT_FLY:
-        if( aAnchorAttr.GetCntntAnchor() )
+        if( aAnchorAttr.GetContentAnchor() )
         {
             //First search in the content because this is O(1)
             //This can go wrong for linked frames because in this case it's
             //possible, that no Frame exists for this content.
             //In such a situation we also need to search from StartNode to
             //FrameFormat.
-            SwNodeIndex aIdx( aAnchorAttr.GetCntntAnchor()->nNode );
-            SwCntntNode *pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
+            SwNodeIndex aIdx( aAnchorAttr.GetContentAnchor()->nNode );
+            SwContentNode *pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
             // #i105535#
             if ( pCNd == 0 )
             {
-                pCNd = aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
+                pCNd = aAnchorAttr.GetContentAnchor()->nNode.GetNode().GetContentNode();
             }
             if ( pCNd )
             {
-                if( SwIterator<SwFrm,SwCntntNode>( *pCNd ).First() )
+                if( SwIterator<SwFrm,SwContentNode>( *pCNd ).First() )
                 {
                     pModify = pCNd;
                 }
@@ -2920,15 +2920,15 @@ void SwFlyFrmFmt::MakeFrms()
             // #i105535#
             if ( pModify == 0 )
             {
-                const SwNodeIndex &rIdx = aAnchorAttr.GetCntntAnchor()->nNode;
-                SwFrmFmts& rFmts = *GetDoc()->GetSpzFrmFmts();
-                for( size_t i = 0; i < rFmts.size(); ++i )
+                const SwNodeIndex &rIdx = aAnchorAttr.GetContentAnchor()->nNode;
+                SwFrameFormats& rFormats = *GetDoc()->GetSpzFrameFormats();
+                for( size_t i = 0; i < rFormats.size(); ++i )
                 {
-                    SwFrmFmt* pFlyFmt = rFmts[i];
-                    if( pFlyFmt->GetCntnt().GetCntntIdx() &&
-                        rIdx == *pFlyFmt->GetCntnt().GetCntntIdx() )
+                    SwFrameFormat* pFlyFormat = rFormats[i];
+                    if( pFlyFormat->GetContent().GetContentIdx() &&
+                        rIdx == *pFlyFormat->GetContent().GetContentIdx() )
                     {
-                        pModify = pFlyFmt;
+                        pModify = pFlyFormat;
                         break;
                     }
                 }
@@ -2940,10 +2940,10 @@ void SwFlyFrmFmt::MakeFrms()
         {
             sal_uInt16 nPgNum = aAnchorAttr.GetPageNum();
             SwPageFrm *pPage = static_cast<SwPageFrm*>(GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout()->Lower());
-            if( nPgNum == 0 && aAnchorAttr.GetCntntAnchor() )
+            if( nPgNum == 0 && aAnchorAttr.GetContentAnchor() )
             {
-                SwCntntNode *pCNd = aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
-                SwIterator<SwFrm,SwCntntNode> aIter( *pCNd );
+                SwContentNode *pCNd = aAnchorAttr.GetContentAnchor()->nNode.GetNode().GetContentNode();
+                SwIterator<SwFrm,SwContentNode> aIter( *pCNd );
                 for ( SwFrm* pFrm = aIter.First(); pFrm != NULL; pFrm = aIter.Next() )
                 {
                     pPage = pFrm->FindPageFrm();
@@ -2952,7 +2952,7 @@ void SwFlyFrmFmt::MakeFrms()
                         nPgNum = pPage->GetPhyPageNum();
                         aAnchorAttr.SetPageNum( nPgNum );
                         aAnchorAttr.SetAnchor( 0 );
-                        SetFmtAttr( aAnchorAttr );
+                        SetFormatAttr( aAnchorAttr );
                         break;
                     }
                 }
@@ -2978,8 +2978,8 @@ void SwFlyFrmFmt::MakeFrms()
         SwIterator<SwFrm,SwModify> aIter( *pModify );
         for( SwFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
         {
-            bool bAdd = !pFrm->IsCntntFrm() ||
-                            !static_cast<SwCntntFrm*>(pFrm)->IsFollow();
+            bool bAdd = !pFrm->IsContentFrm() ||
+                            !static_cast<SwContentFrm*>(pFrm)->IsFollow();
 
             if ( FLY_AT_FLY == aAnchorAttr.GetAnchorId() && !pFrm->IsFlyFrm() )
             {
@@ -2991,7 +2991,7 @@ void SwFlyFrmFmt::MakeFrms()
                 else
                 {
                     aAnchorAttr.SetType( FLY_AT_PARA );
-                    SetFmtAttr( aAnchorAttr );
+                    SetFormatAttr( aAnchorAttr );
                     MakeFrms();
                     return;
                 }
@@ -3007,7 +3007,7 @@ void SwFlyFrmFmt::MakeFrms()
                     // <SwSortedObjs> entries.
                     SwAnchoredObject* pObj = rObjs[i];
                     if( pObj->ISA(SwFlyFrm) &&
-                        (&pObj->GetFrmFmt()) == this )
+                        (&pObj->GetFrameFormat()) == this )
                     {
                         bAdd = false;
                         break;
@@ -3037,8 +3037,8 @@ void SwFlyFrmFmt::MakeFrms()
                     break;
                 }
                 pFrm->AppendFly( pFly );
-                pFly->GetFmt()->SetObjTitle(GetObjTitle());
-                pFly->GetFmt()->SetObjDescription(GetObjDescription());
+                pFly->GetFormat()->SetObjTitle(GetObjTitle());
+                pFly->GetFormat()->SetObjDescription(GetObjDescription());
                 SwPageFrm *pPage = pFly->FindPageFrm();
                 if( pPage )
                     ::RegistFlys( pPage, pFly );
@@ -3047,13 +3047,13 @@ void SwFlyFrmFmt::MakeFrms()
     }
 }
 
-SwFlyFrm* SwFlyFrmFmt::GetFrm( const Point* pPoint, const bool bCalcFrm ) const
+SwFlyFrm* SwFlyFrameFormat::GetFrm( const Point* pPoint, const bool bCalcFrm ) const
 {
     return static_cast<SwFlyFrm*>(::GetFrmOfModify( 0, *(SwModify*)this, FRM_FLY,
                                             pPoint, 0, bCalcFrm ));
 }
 
-SwAnchoredObject* SwFlyFrmFmt::GetAnchoredObj( const Point* pPoint, const bool bCalcFrm ) const
+SwAnchoredObject* SwFlyFrameFormat::GetAnchoredObj( const Point* pPoint, const bool bCalcFrm ) const
 {
     SwFlyFrm* pFlyFrm( GetFrm( pPoint, bCalcFrm ) );
     if ( pFlyFrm )
@@ -3066,30 +3066,30 @@ SwAnchoredObject* SwFlyFrmFmt::GetAnchoredObj( const Point* pPoint, const bool b
     }
 }
 
-bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const
+bool SwFlyFrameFormat::GetInfo( SfxPoolItem& rInfo ) const
 {
     bool bRet = true;
     switch( rInfo.Which() )
     {
     case RES_CONTENT_VISIBLE:
         {
-            static_cast<SwPtrMsgPoolItem&>(rInfo).pObject = SwIterator<SwFrm,SwFmt>( *this ).First();
+            static_cast<SwPtrMsgPoolItem&>(rInfo).pObject = SwIterator<SwFrm,SwFormat>( *this ).First();
         }
         bRet = false;
         break;
 
     default:
-        bRet = SwFrmFmt::GetInfo( rInfo );
+        bRet = SwFrameFormat::GetInfo( rInfo );
         break;
     }
     return bRet;
 }
 
 // #i73249#
-void SwFlyFrmFmt::SetObjTitle( const OUString& rTitle, bool bBroadcast )
+void SwFlyFrameFormat::SetObjTitle( const OUString& rTitle, bool bBroadcast )
 {
     SdrObject* pMasterObject = FindSdrObject();
-    OSL_ENSURE( pMasterObject, "<SwFlyFrmFmt::SetObjTitle(..)> - missing <SdrObject> instance" );
+    OSL_ENSURE( pMasterObject, "<SwFlyFrameFormat::SetObjTitle(..)> - missing <SdrObject> instance" );
     msTitle = rTitle;
     if ( !pMasterObject )
     {
@@ -3109,10 +3109,10 @@ void SwFlyFrmFmt::SetObjTitle( const OUString& rTitle, bool bBroadcast )
     }
 }
 
-OUString SwFlyFrmFmt::GetObjTitle() const
+OUString SwFlyFrameFormat::GetObjTitle() const
 {
     const SdrObject* pMasterObject = FindSdrObject();
-    OSL_ENSURE( pMasterObject, "<SwFlyFrmFmt::GetObjTitle(..)> - missing <SdrObject> instance" );
+    OSL_ENSURE( pMasterObject, "<SwFlyFrameFormat::GetObjTitle(..)> - missing <SdrObject> instance" );
     if ( !pMasterObject )
     {
         return msTitle;
@@ -3123,10 +3123,10 @@ OUString SwFlyFrmFmt::GetObjTitle() const
         return msTitle;
 }
 
-void SwFlyFrmFmt::SetObjDescription( const OUString& rDescription, bool bBroadcast )
+void SwFlyFrameFormat::SetObjDescription( const OUString& rDescription, bool bBroadcast )
 {
     SdrObject* pMasterObject = FindSdrObject();
-    OSL_ENSURE( pMasterObject, "<SwFlyFrmFmt::SetDescription(..)> - missing <SdrObject> instance" );
+    OSL_ENSURE( pMasterObject, "<SwFlyFrameFormat::SetDescription(..)> - missing <SdrObject> instance" );
     msDesc = rDescription;
     if ( !pMasterObject )
     {
@@ -3146,10 +3146,10 @@ void SwFlyFrmFmt::SetObjDescription( const OUString& rDescription, bool bBroadca
     }
 }
 
-OUString SwFlyFrmFmt::GetObjDescription() const
+OUString SwFlyFrameFormat::GetObjDescription() const
 {
     const SdrObject* pMasterObject = FindSdrObject();
-    OSL_ENSURE( pMasterObject, "<SwFlyFrmFmt::GetDescription(..)> - missing <SdrObject> instance" );
+    OSL_ENSURE( pMasterObject, "<SwFlyFrameFormat::GetDescription(..)> - missing <SdrObject> instance" );
     if ( !pMasterObject )
     {
         return msDesc;
@@ -3160,7 +3160,7 @@ OUString SwFlyFrmFmt::GetObjDescription() const
         return msDesc;
 }
 
-/** SwFlyFrmFmt::IsBackgroundTransparent - for #99657#
+/** SwFlyFrameFormat::IsBackgroundTransparent - for #99657#
 
     OD 22.08.2002 - overriding virtual method and its default implementation,
     because format of fly frame provides transparent backgrounds.
@@ -3169,7 +3169,7 @@ OUString SwFlyFrmFmt::GetObjDescription() const
     @return true, if background color is transparent, but not "no fill"
     or the transparency of a existing background graphic is set.
 */
-bool SwFlyFrmFmt::IsBackgroundTransparent() const
+bool SwFlyFrameFormat::IsBackgroundTransparent() const
 {
     //UUUU
     if (supportsFullDrawingLayerFillAttributeSet() && getSdrAllFillAttributesHelper())
@@ -3202,7 +3202,7 @@ bool SwFlyFrmFmt::IsBackgroundTransparent() const
     return false;
 }
 
-/** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898#
+/** SwFlyFrameFormat::IsBackgroundBrushInherited - for #103898#
 
     OD 08.10.2002 - method to determine, if the brush for drawing the
     background is "inherited" from its parent/grandparent.
@@ -3212,7 +3212,7 @@ bool SwFlyFrmFmt::IsBackgroundTransparent() const
 
     @return true, if background brush is "inherited" from parent/grandparent
 */
-bool SwFlyFrmFmt::IsBackgroundBrushInherited() const
+bool SwFlyFrameFormat::IsBackgroundBrushInherited() const
 {
     //UUUU
     if (supportsFullDrawingLayerFillAttributeSet() && getSdrAllFillAttributesHelper())
@@ -3233,35 +3233,35 @@ bool SwFlyFrmFmt::IsBackgroundBrushInherited() const
 }
 
 // #125892#
-SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrmFmt& _rFlyFrmFmt,
-                                              const SwFmtAnchor& _rNewAnchorFmt,
+SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat,
+                                              const SwFormatAnchor& _rNewAnchorFormat,
                                               SwFlyFrm* _pKeepThisFlyFrm )
-    : mrFlyFrmFmt( _rFlyFrmFmt ),
+    : mrFlyFrameFormat( _rFlyFrameFormat ),
       mbAnchorNodeChanged( false )
 {
-    const RndStdIds nNewAnchorType( _rNewAnchorFmt.GetAnchorId() );
+    const RndStdIds nNewAnchorType( _rNewAnchorFormat.GetAnchorId() );
     if ( ((nNewAnchorType == FLY_AT_PARA) ||
           (nNewAnchorType == FLY_AT_CHAR)) &&
-         _rNewAnchorFmt.GetCntntAnchor() &&
-         _rNewAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetCntntNode() )
+         _rNewAnchorFormat.GetContentAnchor() &&
+         _rNewAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode() )
     {
-        const SwFmtAnchor& aOldAnchorFmt( _rFlyFrmFmt.GetAnchor() );
-        if ( aOldAnchorFmt.GetAnchorId() == nNewAnchorType &&
-             aOldAnchorFmt.GetCntntAnchor() &&
-             aOldAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetCntntNode() &&
-             aOldAnchorFmt.GetCntntAnchor()->nNode !=
-                                    _rNewAnchorFmt.GetCntntAnchor()->nNode )
+        const SwFormatAnchor& aOldAnchorFormat( _rFlyFrameFormat.GetAnchor() );
+        if ( aOldAnchorFormat.GetAnchorId() == nNewAnchorType &&
+             aOldAnchorFormat.GetContentAnchor() &&
+             aOldAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode() &&
+             aOldAnchorFormat.GetContentAnchor()->nNode !=
+                                    _rNewAnchorFormat.GetContentAnchor()->nNode )
         {
             // determine 'old' number of anchor frames
             sal_uInt32 nOldNumOfAnchFrm( 0L );
-            SwIterator<SwFrm,SwCntntNode> aOldIter( *(aOldAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetCntntNode()) );
+            SwIterator<SwFrm,SwContentNode> aOldIter( *(aOldAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode()) );
             for( SwFrm* pOld = aOldIter.First(); pOld; pOld = aOldIter.Next() )
             {
                 ++nOldNumOfAnchFrm;
             }
             // determine 'new' number of anchor frames
             sal_uInt32 nNewNumOfAnchFrm( 0L );
-            SwIterator<SwFrm,SwCntntNode> aNewIter( *(_rNewAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetCntntNode()) );
+            SwIterator<SwFrm,SwContentNode> aNewIter( *(_rNewAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode()) );
             for( SwFrm* pNew = aNewIter.First(); pNew; pNew = aNewIter.Next() )
             {
                 ++nNewNumOfAnchFrm;
@@ -3269,7 +3269,7 @@ SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrmFmt& _rFlyFrmFmt,
             if ( nOldNumOfAnchFrm != nNewNumOfAnchFrm )
             {
                 // delete existing fly frames except <_pKeepThisFlyFrm>
-                SwIterator<SwFrm,SwFmt> aIter( mrFlyFrmFmt );
+                SwIterator<SwFrm,SwFormat> aIter( mrFlyFrameFormat );
                 SwFrm* pFrm = aIter.First();
                 if ( pFrm )
                 {
@@ -3292,30 +3292,30 @@ SwHandleAnchorNodeChg::~SwHandleAnchorNodeChg()
 {
     if ( mbAnchorNodeChanged )
     {
-        mrFlyFrmFmt.MakeFrms();
+        mrFlyFrameFormat.MakeFrms();
     }
 }
 
-//  class SwDrawFrmFmt
+//  class SwDrawFrameFormat
 //  Partially implemented inline in hxx
 
-TYPEINIT1( SwDrawFrmFmt, SwFrmFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt )
+TYPEINIT1( SwDrawFrameFormat, SwFrameFormat );
+IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrameFormat )
 
-SwDrawFrmFmt::~SwDrawFrmFmt()
+SwDrawFrameFormat::~SwDrawFrameFormat()
 {
     SwContact *pContact = FindContactObj();
     delete pContact;
 }
 
-void SwDrawFrmFmt::MakeFrms()
+void SwDrawFrameFormat::MakeFrms()
 {
     SwDrawContact *pContact = static_cast<SwDrawContact*>(FindContactObj());
     if ( pContact )
          pContact->ConnectToLayout();
 }
 
-void SwDrawFrmFmt::DelFrms()
+void SwDrawFrameFormat::DelFrms()
 {
     SwDrawContact *pContact = static_cast<SwDrawContact *>(FindContactObj());
     if ( pContact ) //for the reader and other unpredictable things.
@@ -3323,22 +3323,22 @@ void SwDrawFrmFmt::DelFrms()
 }
 
 // #i31698#
-SwFrmFmt::tLayoutDir SwDrawFrmFmt::GetLayoutDir() const
+SwFrameFormat::tLayoutDir SwDrawFrameFormat::GetLayoutDir() const
 {
     return meLayoutDir;
 }
 
-void SwDrawFrmFmt::SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir )
+void SwDrawFrameFormat::SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir )
 {
     meLayoutDir = _eLayoutDir;
 }
 
 // #i28749#
-sal_Int16 SwDrawFrmFmt::GetPositionLayoutDir() const
+sal_Int16 SwDrawFrameFormat::GetPositionLayoutDir() const
 {
     return mnPositionLayoutDir;
 }
-void SwDrawFrmFmt::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir )
+void SwDrawFrameFormat::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir )
 {
     switch ( _nPositionLayoutDir )
     {
@@ -3350,12 +3350,12 @@ void SwDrawFrmFmt::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir )
         break;
         default:
         {
-            OSL_FAIL( "<SwDrawFrmFmt::SetPositionLayoutDir(..)> - invalid attribute value." );
+            OSL_FAIL( "<SwDrawFrameFormat::SetPositionLayoutDir(..)> - invalid attribute value." );
         }
     }
 }
 
-OUString SwDrawFrmFmt::GetDescription() const
+OUString SwDrawFrameFormat::GetDescription() const
 {
     OUString aResult;
     const SdrObject * pSdrObj = FindSdrObject();
@@ -3381,35 +3381,35 @@ OUString SwDrawFrmFmt::GetDescription() const
     return aResult;
 }
 
-IMapObject* SwFrmFmt::GetIMapObject( const Point& rPoint,
+IMapObject* SwFrameFormat::GetIMapObject( const Point& rPoint,
                                         const SwFlyFrm *pFly ) const
 {
-    const SwFmtURL &rURL = GetURL();
+    const SwFormatURL &rURL = GetURL();
     if( !rURL.GetMap() )
         return 0;
 
     if( !pFly )
     {
-        pFly = SwIterator<SwFlyFrm,SwFmt>( *this ).First();
+        pFly = SwIterator<SwFlyFrm,SwFormat>( *this ).First();
         if( !pFly )
             return 0;
     }
 
     //Original size for OLE and graphic is TwipSize, otherwise the size of
-    //FrmFmt of the Fly.
+    //FrameFormat of the Fly.
     const SwFrm *pRef;
-    const SwNoTxtNode *pNd = 0;
+    const SwNoTextNode *pNd = 0;
     Size aOrigSz;
-    if( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
+    if( pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
     {
         pRef = pFly->Lower();
-        pNd = static_cast<const SwCntntFrm*>(pRef)->GetNode()->GetNoTxtNode();
+        pNd = static_cast<const SwContentFrm*>(pRef)->GetNode()->GetNoTextNode();
         aOrigSz = pNd->GetTwipSize();
     }
     else
     {
         pRef = pFly;
-        aOrigSz = pFly->GetFmt()->GetFrmSize().GetSize();
+        aOrigSz = pFly->GetFormat()->GetFrmSize().GetSize();
     }
 
     if( aOrigSz.Width() != 0 && aOrigSz.Height() != 0 )
@@ -3444,14 +3444,14 @@ IMapObject* SwFrmFmt::GetIMapObject( const Point& rPoint,
 }
 
 //UUUU
-drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrmFmt::getSdrAllFillAttributesHelper() const
+drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrameFormat::getSdrAllFillAttributesHelper() const
 {
     if (supportsFullDrawingLayerFillAttributeSet())
     {
         // create FillAttributes on demand
         if(!maFillAttributes.get())
         {
-            const_cast< SwFrmFmt* >(this)->maFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(GetAttrSet()));
+            const_cast< SwFrameFormat* >(this)->maFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(GetAttrSet()));
         }
     }
     else
@@ -3463,12 +3463,12 @@ drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrmFmt::getSdrAllFillAt
     return maFillAttributes;
 }
 
-bool IsFlyFrmFmtInHeader(const SwFrmFmt& rFmt)
+bool IsFlyFrameFormatInHeader(const SwFrameFormat& rFormat)
 {
-    const SwFlyFrmFmt* pFlyFrmFmt = dynamic_cast<const SwFlyFrmFmt*>(&rFmt);
-    if (!pFlyFrmFmt)
+    const SwFlyFrameFormat* pFlyFrameFormat = dynamic_cast<const SwFlyFrameFormat*>(&rFormat);
+    if (!pFlyFrameFormat)
         return false;
-    SwFlyFrm* pFlyFrm = const_cast<SwFlyFrm*>(pFlyFrmFmt->GetFrm());
+    SwFlyFrm* pFlyFrm = const_cast<SwFlyFrm*>(pFlyFrameFormat->GetFrm());
     if (!pFlyFrm) // fdo#54648: "hidden" drawing object has no layout frame
     {
         return false;
@@ -3498,33 +3498,33 @@ void CheckAnchoredFlyConsistency(SwDoc const& rDoc)
     for (sal_uLong i = 0; i != count; ++i)
     {
         SwNode const*const pNode(rNodes[i]);
-        std::vector<SwFrmFmt*> const*const pFlys(pNode->GetAnchoredFlys());
+        std::vector<SwFrameFormat*> const*const pFlys(pNode->GetAnchoredFlys());
         if (pFlys)
         {
             for (auto it = pFlys->begin(); it != pFlys->end(); ++it)
             {
-                SwFmtAnchor const& rAnchor((**it).GetAnchor(false));
-                assert(&rAnchor.GetCntntAnchor()->nNode.GetNode() == pNode);
+                SwFormatAnchor const& rAnchor((**it).GetAnchor(false));
+                assert(&rAnchor.GetContentAnchor()->nNode.GetNode() == pNode);
             }
         }
     }
-    SwFrmFmts const*const pSpzFrmFmts(rDoc.GetSpzFrmFmts());
-    if (pSpzFrmFmts)
+    SwFrameFormats const*const pSpzFrameFormats(rDoc.GetSpzFrameFormats());
+    if (pSpzFrameFormats)
     {
-        for (auto it = pSpzFrmFmts->begin(); it != pSpzFrmFmts->end(); ++it)
+        for (auto it = pSpzFrameFormats->begin(); it != pSpzFrameFormats->end(); ++it)
         {
-            SwFmtAnchor const& rAnchor((**it).GetAnchor(false));
+            SwFormatAnchor const& rAnchor((**it).GetAnchor(false));
             if (FLY_AT_PAGE == rAnchor.GetAnchorId())
             {
-                assert(!rAnchor.GetCntntAnchor()
+                assert(!rAnchor.GetContentAnchor()
                     // for invalid documents that lack text:anchor-page-number
                     // it may have an anchor before MakeFrms() is called
-                    || (!SwIterator<SwFrm, SwFrmFmt>(**it).First()));
+                    || (!SwIterator<SwFrm, SwFrameFormat>(**it).First()));
             }
             else
             {
-                SwNode & rNode(rAnchor.GetCntntAnchor()->nNode.GetNode());
-                std::vector<SwFrmFmt*> const*const pFlys(rNode.GetAnchoredFlys());
+                SwNode & rNode(rAnchor.GetContentAnchor()->nNode.GetNode());
+                std::vector<SwFrameFormat*> const*const pFlys(rNode.GetAnchoredFlys());
                 assert(std::find(pFlys->begin(), pFlys->end(), *it) != pFlys->end());
                 switch (rAnchor.GetAnchorId())
                 {
@@ -3532,11 +3532,11 @@ void CheckAnchoredFlyConsistency(SwDoc const& rDoc)
                         assert(rNode.IsStartNode());
                     break;
                     case FLY_AT_PARA:
-                        assert(rNode.IsTxtNode() || rNode.IsTableNode());
+                        assert(rNode.IsTextNode() || rNode.IsTableNode());
                     break;
                     case FLY_AS_CHAR:
                     case FLY_AT_CHAR:
-                        assert(rNode.IsTxtNode());
+                        assert(rNode.IsTextNode());
                     break;
                     default:
                         assert(false);
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 8e101e79b9e9..ec2da7d8f385 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -47,7 +47,7 @@
 // Move methods
 
 /// Return value tells whether the Frm should be moved.
-bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & )
+bool SwContentFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & )
 {
     if ( (SwFlowFrm::IsMoveBwdJump() || !IsPrevObjMove()))
     {
@@ -64,7 +64,7 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & )
         // and we have to move the Frm just to see what happens - if there's
         // some space available to do it, that is.
 
-        // The FixSize of the containers of Cntnts is always the width.
+        // The FixSize of the containers of Contents is always the width.
 
         // If we moved more than one sheet back (for example jumping over empty
         // pages), we have to move either way. Otherwise, if the Frm doesn't fit
@@ -76,14 +76,14 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & )
         if ( SwFlowFrm::IsMoveBwdJump() )
             return true;
 
-        if( IsInFtn() && IsInSct() )
+        if( IsInFootnote() && IsInSct() )
         {
-            SwFtnFrm* pFtn = FindFtnFrm();
-            SwSectionFrm* pMySect = pFtn->FindSctFrm();
-            if( pMySect && pMySect->IsFtnLock() )
+            SwFootnoteFrm* pFootnote = FindFootnoteFrm();
+            SwSectionFrm* pMySect = pFootnote->FindSctFrm();
+            if( pMySect && pMySect->IsFootnoteLock() )
             {
                 SwSectionFrm *pSect = pNewUpper->FindSctFrm();
-                while( pSect && pSect->IsInFtn() )
+                while( pSect && pSect->IsInFootnote() )
                     pSect = pSect->GetUpper()->FindSctFrm();
                 OSL_ENSURE( pSect, "Escaping footnote" );
                 if( pSect != pMySect )
@@ -102,7 +102,7 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & )
         // if <nMoveAnyway> equals 3 and no space is left in new upper.
         nMoveAnyway |= BwdMoveNecessary( pOldPage, Frm() );
         {
-            const IDocumentSettingAccess* pIDSA = pNewPage->GetFmt()->getIDocumentSettingAccess();
+            const IDocumentSettingAccess* pIDSA = pNewPage->GetFormat()->getIDocumentSettingAccess();
             SwTwips nSpace = 0;
             SwRect aRect( pNewUpper->Prt() );
             aRect.Pos() += pNewUpper->Frm().Pos();
@@ -122,7 +122,7 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & )
                         // if last frame is a section, take its last content
                         if ( pPrevFrm->IsSctFrm() )
                         {
-                            pLastFrm = static_cast<const SwSectionFrm*>(pPrevFrm)->FindLastCntnt();
+                            pLastFrm = static_cast<const SwSectionFrm*>(pPrevFrm)->FindLastContent();
                             if ( pLastFrm &&
                                  pLastFrm->FindTabFrm() != pPrevFrm->FindTabFrm() )
                             {
@@ -148,7 +148,7 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & )
             //determine space left in new upper frame
             nSpace = (aRect.*fnRectX->fnGetHeight)();
             const SwViewShell *pSh = pNewUpper->getRootFrm()->GetCurrShell();
-            if ( IsInFtn() ||
+            if ( IsInFootnote() ||
                  (pSh && pSh->GetViewOptions()->getBrowseMode()) ||
                  pNewUpper->IsCellFrm() ||
                  ( pNewUpper->IsInSct() && ( pNewUpper->IsSctFrm() ||
@@ -249,11 +249,11 @@ void SwFrm::PrepareMake()
         if ( !GetUpper() )
             return;
 
-        const bool bCnt = IsCntntFrm();
+        const bool bCnt = IsContentFrm();
         const bool bTab = IsTabFrm();
         bool bNoSect = IsInSct();
         bool bOldTabLock = false, bFoll = false;
-        SwFlowFrm* pThis = bCnt ? static_cast<SwCntntFrm*>(this) : NULL;
+        SwFlowFrm* pThis = bCnt ? static_cast<SwContentFrm*>(this) : NULL;
 
         if ( bTab )
         {
@@ -271,7 +271,7 @@ void SwFrm::PrepareMake()
         else if ( bCnt && (bFoll = pThis->IsFollow()) && GetPrev() )
         {
             //Do not follow the chain when we need only one instance
-            const SwTxtFrm* pMaster = static_cast<SwCntntFrm*>(this)->FindMaster();
+            const SwTextFrm* pMaster = static_cast<SwContentFrm*>(this)->FindMaster();
             if ( pMaster && pMaster->IsLocked() )
             {
                 MakeAll();
@@ -307,7 +307,7 @@ void SwFrm::PrepareMake()
                     if( IsSctFrm() && !static_cast<SwSectionFrm*>(this)->GetSection() )
                         break;
                 }
-                // With CntntFrms, the chain may be broken while walking through
+                // With ContentFrms, the chain may be broken while walking through
                 // it. Therefore we have to figure out the follower in a bit more
                 // complicated way. However, I'll HAVE to get back to myself
                 // sometime again.
@@ -374,12 +374,12 @@ void SwFrm::PrepareCrsr()
         if ( !GetUpper() )
             return;
 
-        const bool bCnt = IsCntntFrm();
+        const bool bCnt = IsContentFrm();
         const bool bTab = IsTabFrm();
         bool bNoSect = IsInSct();
 
         bool bOldTabLock = false, bFoll;
-        SwFlowFrm* pThis = bCnt ? static_cast<SwCntntFrm*>(this) : NULL;
+        SwFlowFrm* pThis = bCnt ? static_cast<SwContentFrm*>(this) : NULL;
 
         if ( bTab )
         {
@@ -413,7 +413,7 @@ void SwFrm::PrepareCrsr()
 
                 pFrm->MakeAll();
             }
-            // With CntntFrms, the chain may be broken while walking through
+            // With ContentFrms, the chain may be broken while walking through
             // it. Therefore we have to figure out the follower in a bit more
             // complicated way. However, I'll HAVE to get back to myself
             // sometime again.
@@ -458,7 +458,7 @@ static SwFrm* lcl_NotHiddenPrev( SwFrm* pFrm )
     do
     {
         pRet = lcl_Prev( pRet );
-    } while ( pRet && pRet->IsTxtFrm() && static_cast<SwTxtFrm*>(pRet)->IsHiddenNow() );
+    } while ( pRet && pRet->IsTextFrm() && static_cast<SwTextFrm*>(pRet)->IsHiddenNow() );
     return pRet;
 }
 
@@ -470,8 +470,8 @@ void SwFrm::MakePos()
         bool bUseUpper = false;
         SwFrm* pPrv = lcl_Prev( this );
         if ( pPrv &&
-             ( !pPrv->IsCntntFrm() ||
-               ( static_cast<SwCntntFrm*>(pPrv)->GetFollow() != this ) )
+             ( !pPrv->IsContentFrm() ||
+               ( static_cast<SwContentFrm*>(pPrv)->GetFollow() != this ) )
            )
         {
             if ( !StackHack::IsLocked() &&
@@ -623,7 +623,7 @@ static void lcl_CheckObjects( SwSortedObjs* pSortedObjs, SwFrm* pFrm, long& rBot
                 ( pFrm->IsPageFrm() ? pFly->IsFlyLayFrm() :
                   ( pFly->IsFlyAtCntFrm() &&
                     ( pFrm->IsBodyFrm() ? pFly->GetAnchorFrm()->IsInDocBody() :
-                                          pFly->GetAnchorFrm()->IsInFtn() ) ) ) )
+                                          pFly->GetAnchorFrm()->IsInFootnote() ) ) ) )
             {
                 nTmp = pFly->Frm().Bottom();
             }
@@ -703,9 +703,9 @@ void SwPageFrm::MakeAll()
                                              static_cast<SwLayoutFrm*>(pFrm)->IsAnLower( pCnt )))
                             {
                                 nTmp += pCnt->Frm().Height();
-                                if( pCnt->IsTxtFrm() &&
-                                    static_cast<SwTxtFrm*>(pCnt)->IsUndersized() )
-                                    nTmp += static_cast<SwTxtFrm*>(pCnt)->GetParHeight()
+                                if( pCnt->IsTextFrm() &&
+                                    static_cast<SwTextFrm*>(pCnt)->IsUndersized() )
+                                    nTmp += static_cast<SwTextFrm*>(pCnt)->GetParHeight()
                                             - pCnt->Prt().Height();
                                 else if( pCnt->IsSctFrm() &&
                                          static_cast<SwSectionFrm*>(pCnt)->IsUndersized() )
@@ -732,7 +732,7 @@ void SwPageFrm::MakeAll()
                                 nTmp = std::min( nTmp, pFrm->Frm().Height() );
                             nBot += nTmp;
                             // Here we check whether paragraph anchored objects
-                            // protrude outside the Body/FtnCont.
+                            // protrude outside the Body/FootnoteCont.
                             if( pSortedObjs && !pFrm->IsHeaderFrm() &&
                                 !pFrm->IsFooterFrm() )
                                 lcl_CheckObjects( pSortedObjs, pFrm, nBot );
@@ -813,7 +813,7 @@ void SwLayoutFrm::MakeAll()
                     mbValidPrtArea = false;
 
                     SwTwips nPrtWidth = (GetUpper()->Prt().*fnRect->fnGetWidth)();
-                    if( bVert && ( IsBodyFrm() || IsFtnContFrm() ) )
+                    if( bVert && ( IsBodyFrm() || IsFootnoteContFrm() ) )
                     {
                         SwFrm* pNxt = GetPrev();
                         while( pNxt && !pNxt->IsHeaderFrm() )
@@ -856,10 +856,10 @@ void SwLayoutFrm::MakeAll()
     delete pAccess;
 }
 
-bool SwTxtNode::IsCollapse() const
+bool SwTextNode::IsCollapse() const
 {
     if (GetDoc()->GetDocumentSettingManager().get( DocumentSettingId::COLLAPSE_EMPTY_CELL_PARA )
-        &&  GetTxt().isEmpty())
+        &&  GetText().isEmpty())
     {
         sal_uLong nIdx=GetIndex();
         const SwEndNode *pNdBefore=GetNodes()[nIdx-1]->GetEndNode();
@@ -879,15 +879,15 @@ bool SwTxtNode::IsCollapse() const
 
 bool SwFrm::IsCollapse() const
 {
-    if (!IsTxtFrm())
+    if (!IsTextFrm())
         return false;
 
-    const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>(this);
-    const SwTxtNode *pTxtNode = pTxtFrm->GetTxtNode();
-    return pTxtNode && pTxtNode->IsCollapse();
+    const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>(this);
+    const SwTextNode *pTextNode = pTextFrm->GetTextNode();
+    return pTextNode && pTextNode->IsCollapse();
 }
 
-bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
+bool SwContentFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
 {
     bool bSizeChgd = false;
 
@@ -896,15 +896,15 @@ bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
         mbValidPrtArea = true;
 
         SWRECTFN( this )
-        const bool bTxtFrm = IsTxtFrm();
+        const bool bTextFrm = IsTextFrm();
         SwTwips nUpper = 0;
-        if ( bTxtFrm && static_cast<SwTxtFrm*>(this)->IsHiddenNow() )
+        if ( bTextFrm && static_cast<SwTextFrm*>(this)->IsHiddenNow() )
         {
-            if ( static_cast<SwTxtFrm*>(this)->HasFollow() )
-                static_cast<SwTxtFrm*>(this)->JoinFrm();
+            if ( static_cast<SwTextFrm*>(this)->HasFollow() )
+                static_cast<SwTextFrm*>(this)->JoinFrm();
 
             if( (Prt().*fnRect->fnGetHeight)() )
-                static_cast<SwTxtFrm*>(this)->HideHidden();
+                static_cast<SwTextFrm*>(this)->HideHidden();
             Prt().Pos().setX(0);
             Prt().Pos().setY(0);
             (Prt().*fnRect->fnSetWidth)( (Frm().*fnRect->fnGetWidth)() );
@@ -913,7 +913,7 @@ bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
         }
         else
         {
-            // Simplification: CntntFrms are always variable in height!
+            // Simplification: ContentFrms are always variable in height!
 
             // At the FixSize, the surrounding Frame enforces the size;
             // the borders are simply subtracted.
@@ -937,18 +937,18 @@ bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
                     // #i28701# - consider changed type of
                     // <SwSortedObjs> entries
                     SwAnchoredObject* pObj = (*GetDrawObjs())[i];
-                    const SwFrmFmt& rFmt = pObj->GetFrmFmt();
+                    const SwFrameFormat& rFormat = pObj->GetFrameFormat();
                     const bool bFly = pObj->ISA(SwFlyFrm);
                     if ((bFly && (FAR_AWAY == pObj->GetObjRect().Width()))
-                        || rFmt.GetFrmSize().GetWidthPercent())
+                        || rFormat.GetFrmSize().GetWidthPercent())
                     {
                         continue;
                     }
 
-                    if ( FLY_AS_CHAR == rFmt.GetAnchor().GetAnchorId() )
+                    if ( FLY_AS_CHAR == rFormat.GetAnchor().GetAnchorId() )
                     {
                         nMinWidth = std::max( nMinWidth,
-                                         bFly ? rFmt.GetFrmSize().GetWidth()
+                                         bFly ? rFormat.GetFrmSize().GetWidth()
                                               : pObj->GetObjRect().Width() );
                     }
                 }
@@ -1026,10 +1026,10 @@ inline void ValidateSz( SwFrm *pFrm )
     }
 }
 
-void SwCntntFrm::MakeAll()
+void SwContentFrm::MakeAll()
 {
     OSL_ENSURE( GetUpper(), "no Upper?" );
-    OSL_ENSURE( IsTxtFrm(), "MakeAll(), NoTxt" );
+    OSL_ENSURE( IsTextFrm(), "MakeAll(), NoText" );
 
     if ( !IsFollow() && StackHack::IsLocked() )
         return;
@@ -1037,13 +1037,13 @@ void SwCntntFrm::MakeAll()
     if ( IsJoinLocked() )
         return;
 
-    OSL_ENSURE( !static_cast<SwTxtFrm*>(this)->IsSwapped(), "Calculation of a swapped frame" );
+    OSL_ENSURE( !static_cast<SwTextFrm*>(this)->IsSwapped(), "Calculation of a swapped frame" );
 
     StackHack aHack;
 
-    if ( static_cast<SwTxtFrm*>(this)->IsLocked() )
+    if ( static_cast<SwTextFrm*>(this)->IsLocked() )
     {
-        OSL_FAIL( "Format for locked TxtFrm." );
+        OSL_FAIL( "Format for locked TextFrm." );
         return;
     }
 
@@ -1071,7 +1071,7 @@ void SwCntntFrm::MakeAll()
 #endif
 
     // takes care of the notification in the dtor
-    SwCntntNotify *pNotify = new SwCntntNotify( this );
+    SwContentNotify *pNotify = new SwContentNotify( this );
 
     // as long as bMakePage is true, a new page can be created (exactly once)
     bool bMakePage = true;
@@ -1081,7 +1081,7 @@ void SwCntntFrm::MakeAll()
     // it has been moved forward once)
     bool bMovedFwd  = false;
     sal_Bool    bFormatted  = sal_False;    // For the widow/orphan rules, we encourage the
-                                            // last CntntFrm of a chain to format. This only
+                                            // last ContentFrm of a chain to format. This only
                                             // needs to happen once. Every time the Frm is
                                             // moved, the flag will have to be reset.
     bool bMustFit = false;                  // Once the emergency brake is pulled,
@@ -1094,7 +1094,7 @@ void SwCntntFrm::MakeAll()
     bool bMoveable;
     const bool bFly = IsInFly();
     const bool bTab = IsInTab();
-    const bool bFtn = IsInFtn();
+    const bool bFootnote = IsInFootnote();
     const bool bSct = IsInSct();
     Point aOldFrmPos;               // This is so we can compare with the last pos
     Point aOldPrtPos;               // and determine whether it makes sense to Prepare
@@ -1110,18 +1110,18 @@ void SwCntntFrm::MakeAll()
 
     const bool bKeep = IsKeep( rAttrs.GetAttrSet() );
 
-    SwSaveFtnHeight *pSaveFtn = 0;
-    if ( bFtn )
+    SwSaveFootnoteHeight *pSaveFootnote = 0;
+    if ( bFootnote )
     {
-        SwFtnFrm *pFtn = FindFtnFrm();
-        SwSectionFrm* pSct = pFtn->FindSctFrm();
-        if ( !static_cast<SwTxtFrm*>(pFtn->GetRef())->IsLocked() )
+        SwFootnoteFrm *pFootnote = FindFootnoteFrm();
+        SwSectionFrm* pSct = pFootnote->FindSctFrm();
+        if ( !static_cast<SwTextFrm*>(pFootnote->GetRef())->IsLocked() )
         {
-            SwFtnBossFrm* pBoss = pFtn->GetRef()->FindFtnBossFrm(
-                                    pFtn->GetAttr()->GetFtn().IsEndNote() );
+            SwFootnoteBossFrm* pBoss = pFootnote->GetRef()->FindFootnoteBossFrm(
+                                    pFootnote->GetAttr()->GetFootnote().IsEndNote() );
             if( !pSct || pSct->IsColLocked() || !pSct->Growable() )
-                pSaveFtn = new SwSaveFtnHeight( pBoss,
-                    static_cast<SwTxtFrm*>(pFtn->GetRef())->GetFtnLine( pFtn->GetAttr() ) );
+                pSaveFootnote = new SwSaveFootnoteHeight( pBoss,
+                    static_cast<SwTextFrm*>(pFootnote->GetRef())->GetFootnoteLine( pFootnote->GetAttr() ) );
         }
     }
 
@@ -1129,17 +1129,17 @@ void SwCntntFrm::MakeAll()
          HasFollow() &&
          &GetFollow()->GetFrm() == GetNext() )
     {
-        dynamic_cast<SwTxtFrm&>(*this).JoinFrm();
+        dynamic_cast<SwTextFrm&>(*this).JoinFrm();
     }
 
     // #i28701# - move master forward, if it has to move,
     // because of its object positioning.
-    if ( !static_cast<SwTxtFrm*>(this)->IsFollow() )
+    if ( !static_cast<SwTextFrm*>(this)->IsFollow() )
     {
         sal_uInt32 nToPageNum = 0L;
         const bool bMoveFwdByObjPos = SwLayouter::FrmMovedFwdByObjPos(
                                                     *(GetAttrSet()->GetDoc()),
-                                                    *(static_cast<SwTxtFrm*>(this)),
+                                                    *(static_cast<SwTextFrm*>(this)),
                                                     nToPageNum );
         // #i58182#
         // Also move a paragraph forward, which is the first one inside a table cell.
@@ -1158,7 +1158,7 @@ void SwCntntFrm::MakeAll()
 
     // If a Follow sits next to it's Master and doesn't fit, we know it can
     // be moved right now.
-    if ( lcl_Prev( this ) && static_cast<SwTxtFrm*>(this)->IsFollow() && IsMoveable() )
+    if ( lcl_Prev( this ) && static_cast<SwTextFrm*>(this)->IsFollow() && IsMoveable() )
     {
         bMovedFwd = true;
         // OD 2004-03-02 #106629# - If follow frame is in table, it's master
@@ -1174,18 +1174,18 @@ void SwCntntFrm::MakeAll()
     // OD 08.11.2002 #104840# - check footnote content for forward move.
     // If a content of a footnote is on a prior page/column as its invalid
     // reference, it can be moved forward.
-    if ( bFtn && !mbValidPos )
+    if ( bFootnote && !mbValidPos )
     {
-        SwFtnFrm* pFtn = FindFtnFrm();
-        SwCntntFrm* pRefCnt = pFtn ? pFtn->GetRef() : 0;
+        SwFootnoteFrm* pFootnote = FindFootnoteFrm();
+        SwContentFrm* pRefCnt = pFootnote ? pFootnote->GetRef() : 0;
         if ( pRefCnt && !pRefCnt->IsValid() )
         {
-            SwFtnBossFrm* pFtnBossOfFtn = pFtn->FindFtnBossFrm();
-            SwFtnBossFrm* pFtnBossOfRef = pRefCnt->FindFtnBossFrm();
+            SwFootnoteBossFrm* pFootnoteBossOfFootnote = pFootnote->FindFootnoteBossFrm();
+            SwFootnoteBossFrm* pFootnoteBossOfRef = pRefCnt->FindFootnoteBossFrm();
             //<loop of movefwd until condition held or no move>
-            if ( pFtnBossOfFtn && pFtnBossOfRef &&
-                 pFtnBossOfFtn != pFtnBossOfRef &&
-                 pFtnBossOfFtn->IsBefore( pFtnBossOfRef ) )
+            if ( pFootnoteBossOfFootnote && pFootnoteBossOfRef &&
+                 pFootnoteBossOfFootnote != pFootnoteBossOfRef &&
+                 pFootnoteBossOfFootnote->IsBefore( pFootnoteBossOfRef ) )
             {
                 bMovedFwd = true;
                 MoveFwd( bMakePage, false );
@@ -1255,7 +1255,7 @@ void SwCntntFrm::MakeAll()
 
             // When a lower of a vertically aligned fly frame changes its size we need to recalculate content pos.
             if( GetUpper() && GetUpper()->IsFlyFrm() &&
-                GetUpper()->GetFmt()->GetTextVertAdjust().GetValue() != SDRTEXTVERTADJUST_TOP )
+                GetUpper()->GetFormat()->GetTextVertAdjust().GetValue() != SDRTEXTVERTADJUST_TOP )
             {
                 static_cast<SwFlyFrm*>(GetUpper())->InvalidateContentPos();
                 GetUpper()->SetCompletePaint();
@@ -1272,7 +1272,7 @@ void SwCntntFrm::MakeAll()
             // #i34730# - check, if frame height has changed.
             // If yes, send a PREP_ADJUST_FRM and invalidate the size flag to
             // force a format. The format will check in its method
-            // <SwTxtFrm::CalcPreps()>, if the already formatted lines still
+            // <SwTextFrm::CalcPreps()>, if the already formatted lines still
             // fit and if not, performs necessary actions.
             // #i40150# - no check, if frame is undersized.
             if ( mbValidSize && !IsUndersized() &&
@@ -1285,7 +1285,7 @@ void SwCntntFrm::MakeAll()
                 const SwTwips nHDiff = nOldH - (Frm().*fnRect->fnGetHeight)();
                 const bool bNoPrepAdjustFrm =
                     nHDiff > 0 && IsInTab() && GetFollow() &&
-                    ( 1 == static_cast<SwTxtFrm*>(GetFollow())->GetLineCount( COMPLETE_STRING ) || (static_cast<SwTxtFrm*>(GetFollow())->Frm().*fnRect->fnGetWidth)() < 0 ) &&
+                    ( 1 == static_cast<SwTextFrm*>(GetFollow())->GetLineCount( COMPLETE_STRING ) || (static_cast<SwTextFrm*>(GetFollow())->Frm().*fnRect->fnGetWidth)() < 0 ) &&
                     GetFollow()->CalcAddLowerSpaceAsLastInTableCell() == nHDiff;
                 if ( !bNoPrepAdjustFrm )
                 {
@@ -1295,7 +1295,7 @@ void SwCntntFrm::MakeAll()
             }
         }
 
-        // To make the widow and orphan rules work, we need to notify the CntntFrm.
+        // To make the widow and orphan rules work, we need to notify the ContentFrm.
         // Criteria:
         // - It needs to be movable (otherwise, splitting doesn't make sense)
         // - It needs to overlap with the lower edge of the PrtArea of the Upper
@@ -1339,7 +1339,7 @@ void SwCntntFrm::MakeAll()
 #if OSL_DEBUG_LEVEL > 0
             else
             {
-                OSL_FAIL( "debug assertion: <SwCntntFrm::MakeAll()> - format of text frame suppressed by fix b6448963" );
+                OSL_FAIL( "debug assertion: <SwContentFrm::MakeAll()> - format of text frame suppressed by fix b6448963" );
             }
 #endif
         }
@@ -1352,7 +1352,7 @@ void SwCntntFrm::MakeAll()
         if ( !lcl_Prev( this ) &&
              !bMovedFwd &&
              ( bMoveable || ( bFly && !bTab ) ) &&
-             ( !bFtn || !GetUpper()->FindFtnFrm()->GetPrev() )
+             ( !bFootnote || !GetUpper()->FindFootnoteFrm()->GetPrev() )
              && MoveBwd( bDummy ) )
         {
             SWREFRESHFN( this )
@@ -1422,7 +1422,7 @@ void SwCntntFrm::MakeAll()
             }
         }
 
-        // In footnotes, the TxtFrm may validate itself, which can lead to the
+        // In footnotes, the TextFrm may validate itself, which can lead to the
         // situation that it's position is wrong despite being "valid".
         if ( mbValidPos )
         {
@@ -1433,7 +1433,7 @@ void SwCntntFrm::MakeAll()
             // has anchored objects.
             // Thus, the anchored objects get the possibility to format itself
             // and this probably solve the layout loop.
-            if ( bFtn &&
+            if ( bFootnote &&
                  nFormatCount <= STOP_FLY_FORMAT &&
                  !GetDrawObjs() )
             {
@@ -1496,7 +1496,7 @@ void SwCntntFrm::MakeAll()
                     const bool bMoveFwdInvalid = 0 != GetIndNext();
                     const bool bNxtNew =
                         ( 0 == (pNxt->Prt().*fnRect->fnGetHeight)() ) &&
-                        (!pNxt->IsTxtFrm() ||!static_cast<SwTxtFrm*>(pNxt)->IsHiddenNow());
+                        (!pNxt->IsTextFrm() ||!static_cast<SwTextFrm*>(pNxt)->IsHiddenNow());
 
                     pNxt->Calc();
 
@@ -1539,13 +1539,13 @@ void SwCntntFrm::MakeAll()
         // as well.
 
         // If I'm unable to split (WouldFit()) and can't be fitted, I'm going
-        // to tell my TxtFrm part that, if possible, we still need to split despite
+        // to tell my TextFrm part that, if possible, we still need to split despite
         // the "don't split" attribute.
         bool bMoveOrFit = false;
         bool bDontMoveMe = !GetIndPrev();
         if( bDontMoveMe && IsInSct() )
         {
-            SwFtnBossFrm* pBoss = FindFtnBossFrm();
+            SwFootnoteBossFrm* pBoss = FindFootnoteBossFrm();
             bDontMoveMe = !pBoss->IsInSct() ||
                           ( !pBoss->Lower()->GetNext() && !pBoss->GetPrev() );
         }
@@ -1580,7 +1580,7 @@ void SwCntntFrm::MakeAll()
                  * Exception: If we sit in FormatWidthCols, we must not ignore
                  * the attributes.
                  */
-                else if ( !bFtn && bMoveable &&
+                else if ( !bFootnote && bMoveable &&
                       ( !bFly || !FindFlyFrm()->IsColLocked() ) &&
                       ( !bSct || !FindSctFrm()->IsColLocked() ) )
                     bMoveOrFit = true;
@@ -1588,13 +1588,13 @@ void SwCntntFrm::MakeAll()
 #if OSL_DEBUG_LEVEL > 0
             else
             {
-                OSL_FAIL( "+TxtFrm didn't respect WouldFit promise." );
+                OSL_FAIL( "+TextFrm didn't respect WouldFit promise." );
             }
 #endif
         }
 
         // Let's see if I can find some space somewhere...
-        // footnotes in the neighbourhood are moved into _MoveFtnCntFwd
+        // footnotes in the neighbourhood are moved into _MoveFootnoteCntFwd
         SwFrm *pPre = GetIndPrev();
         SwFrm *pOldUp = GetUpper();
 
@@ -1647,7 +1647,7 @@ void SwCntntFrm::MakeAll()
             }
 
 #if OSL_DEBUG_LEVEL > 0
-            OSL_FAIL( "LoopControl in SwCntntFrm::MakeAll" );
+            OSL_FAIL( "LoopControl in SwContentFrm::MakeAll" );
 #endif
         }
         if ( bMovedBwd && GetUpper() )
@@ -1665,7 +1665,7 @@ void SwCntntFrm::MakeAll()
                             (
 
                                 // #118572#
-                                ( bFtn && !FindFtnFrm()->GetRef()->IsInSct() ) ||
+                                ( bFootnote && !FindFootnoteFrm()->GetRef()->IsInSct() ) ||
 
                                 // #i33887#
                                 ( IsInSct() && bKeep )
@@ -1673,9 +1673,9 @@ void SwCntntFrm::MakeAll()
                                 // ... add your conditions here ...
 
                             ),
-                         static_cast<SwTxtFrm&>(*this) );
+                         static_cast<SwTextFrm&>(*this) );
 
-    delete pSaveFtn;
+    delete pSaveFootnote;
 
     UnlockJoin();
     if (!bDeleteForbidden)
@@ -1703,9 +1703,9 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
 
     // fix(29272): Don't call MakeAll - there, pFrm might be invalidated again, and
     // we recursively end up in here again.
-    if ( pNxt->IsCntntFrm() )
+    if ( pNxt->IsContentFrm() )
     {
-        SwCntntNotify aNotify( static_cast<SwCntntFrm*>(pNxt) );
+        SwContentNotify aNotify( static_cast<SwContentFrm*>(pNxt) );
         SwBorderAttrAccess aAccess( SwFrm::GetCache(), pNxt );
         const SwBorderAttrs &rAttrs = *aAccess.Get();
         if ( !pNxt->GetValidSizeFlag() )
@@ -1715,7 +1715,7 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
             else
                 pNxt->Frm().Width( pNxt->GetUpper()->Prt().Width() );
         }
-        static_cast<SwCntntFrm*>(pNxt)->MakePrtArea( rAttrs );
+        static_cast<SwContentFrm*>(pNxt)->MakePrtArea( rAttrs );
         pNxt->Format( &rAttrs );
     }
     else
@@ -1738,24 +1738,24 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
     pFrm->mbValidPrtArea  = bOldPrt;
 }
 
-/// This routine checks whether there are no other FtnBosses
-/// between the pFrm's FtnBoss and the pNxt's FtnBoss.
-static bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt )
+/// This routine checks whether there are no other FootnoteBosses
+/// between the pFrm's FootnoteBoss and the pNxt's FootnoteBoss.
+static bool lcl_IsNextFootnoteBoss( const SwFrm *pFrm, const SwFrm* pNxt )
 {
-    assert(pFrm && pNxt && "lcl_IsNextFtnBoss: No Frames?");
-    pFrm = pFrm->FindFtnBossFrm();
-    pNxt = pNxt->FindFtnBossFrm();
+    assert(pFrm && pNxt && "lcl_IsNextFootnoteBoss: No Frames?");
+    pFrm = pFrm->FindFootnoteBossFrm();
+    pNxt = pNxt->FindFootnoteBossFrm();
     // If pFrm is a last column, we use the page instead.
     while( pFrm && pFrm->IsColumnFrm() && !pFrm->GetNext() )
-        pFrm = pFrm->GetUpper()->FindFtnBossFrm();
+        pFrm = pFrm->GetUpper()->FindFootnoteBossFrm();
     // If pNxt is a first column, we use the page instead.
     while( pNxt && pNxt->IsColumnFrm() && !pNxt->GetPrev() )
-        pNxt = pNxt->GetUpper()->FindFtnBossFrm();
+        pNxt = pNxt->GetUpper()->FindFootnoteBossFrm();
     // So.. now pFrm and pNxt are either two adjacent pages or columns.
     return pFrm && pNxt && pFrm->GetNext() == pNxt;
 }
 
-bool SwCntntFrm::_WouldFit( SwTwips nSpace,
+bool SwContentFrm::_WouldFit( SwTwips nSpace,
                             SwLayoutFrm *pNewUpper,
                             bool bTstMove,
                             const bool bObjsInNewUpper )
@@ -1763,20 +1763,20 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace,
     // To have the footnote select it's place carefully, it needs
     // to be moved in any case if there is at least one page/column
     // between the footnote and the new Upper.
-    SwFtnFrm* pFtnFrm = 0;
-    if ( IsInFtn() )
+    SwFootnoteFrm* pFootnoteFrm = 0;
+    if ( IsInFootnote() )
     {
-        if( !lcl_IsNextFtnBoss( pNewUpper, this ) )
+        if( !lcl_IsNextFootnoteBoss( pNewUpper, this ) )
             return true;
-        pFtnFrm = FindFtnFrm();
+        pFootnoteFrm = FindFootnoteFrm();
     }
 
     bool bRet;
     bool bSplit = !pNewUpper->Lower();
-    SwCntntFrm *pFrm = this;
+    SwContentFrm *pFrm = this;
     const SwFrm *pTmpPrev = pNewUpper->Lower();
-    if( pTmpPrev && pTmpPrev->IsFtnFrm() )
-        pTmpPrev = static_cast<const SwFtnFrm*>(pTmpPrev)->Lower();
+    if( pTmpPrev && pTmpPrev->IsFootnoteFrm() )
+        pTmpPrev = static_cast<const SwFootnoteFrm*>(pTmpPrev)->Lower();
     while ( pTmpPrev && pTmpPrev->GetNext() )
         pTmpPrev = pTmpPrev->GetNext();
     do
@@ -1787,36 +1787,36 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace,
         bool bOldSplit = bSplit;
 
         if ( bTstMove || IsInFly() || ( IsInSct() &&
-             ( pFrm->GetUpper()->IsColBodyFrm() || ( pFtnFrm &&
-               pFtnFrm->GetUpper()->GetUpper()->IsColumnFrm() ) ) ) )
+             ( pFrm->GetUpper()->IsColBodyFrm() || ( pFootnoteFrm &&
+               pFootnoteFrm->GetUpper()->GetUpper()->IsColumnFrm() ) ) ) )
         {
             // This is going to get a bit insidious now. If you're faint of heart,
-            // you'd better look away here. If a Fly contains columns, then the Cntnts
+            // you'd better look away here. If a Fly contains columns, then the Contents
             // are movable, except ones in the last column (see SwFrm::IsMoveable()).
             // Of course they're allowed to float back. WouldFit() only returns a usable
             // value if the Frm is movable. To fool WouldFit() into believing there's
             // a movable Frm, I'm just going to hang it somewhere else for the time.
             // The same procedure applies for column sections to make SwSectionFrm::Growable()
             // return the proper value.
-            // Within footnotes, we may even need to put the SwFtnFrm somewhere else, if
-            // there's no SwFtnFrm there.
-            SwFrm* pTmpFrm = pFrm->IsInFtn() && !pNewUpper->FindFtnFrm() ?
-                             (SwFrm*)pFrm->FindFtnFrm() : pFrm;
+            // Within footnotes, we may even need to put the SwFootnoteFrm somewhere else, if
+            // there's no SwFootnoteFrm there.
+            SwFrm* pTmpFrm = pFrm->IsInFootnote() && !pNewUpper->FindFootnoteFrm() ?
+                             (SwFrm*)pFrm->FindFootnoteFrm() : pFrm;
             SwLayoutFrm *pUp = pTmpFrm->GetUpper();
             SwFrm *pOldNext = pTmpFrm->GetNext();
             pTmpFrm->RemoveFromLayout();
             pTmpFrm->InsertBefore( pNewUpper, 0 );
-            if ( pFrm->IsTxtFrm() &&
+            if ( pFrm->IsTextFrm() &&
                  ( bTstMove ||
-                   static_cast<SwTxtFrm*>(pFrm)->HasFollow() ||
-                   ( !static_cast<SwTxtFrm*>(pFrm)->HasPara() &&
-                     !static_cast<SwTxtFrm*>(pFrm)->IsEmpty()
+                   static_cast<SwTextFrm*>(pFrm)->HasFollow() ||
+                   ( !static_cast<SwTextFrm*>(pFrm)->HasPara() &&
+                     !static_cast<SwTextFrm*>(pFrm)->IsEmpty()
                    )
                  )
                )
             {
                 bTstMove = true;
-                bRet = static_cast<SwTxtFrm*>(pFrm)->TestFormat( pTmpPrev, nSpace, bSplit );
+                bRet = static_cast<SwTextFrm*>(pFrm)->TestFormat( pTmpPrev, nSpace, bSplit );
             }
             else
                 bRet = pFrm->WouldFit( nSpace, bSplit, false );
@@ -1849,15 +1849,15 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace,
                 if ( pFrm->IsInSct() && pFrm->GetUpper()->IsColBodyFrm() )
                 {
                     const SwSectionFrm* pSct = pFrm->FindSctFrm();
-                    bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue();
+                    bCommonBorder = pSct->GetFormat()->GetBalancedColumns().GetValue();
                 }
 
                 // #i46181#
                 nSecondCheck = ( 1 == nSecondCheck &&
                                  pFrm == this &&
-                                 IsTxtFrm() &&
+                                 IsTextFrm() &&
                                  bCommonBorder &&
-                                 !static_cast<const SwTxtFrm*>(this)->IsEmpty() ) ?
+                                 !static_cast<const SwTextFrm*>(this)->IsEmpty() ) ?
                                  nUpper :
                                  0;
 
@@ -1888,7 +1888,7 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace,
                 {
                     // The following code is intended to solve a (rare) problem
                     // causing some frames not to move backward:
-                    // SwTxtFrm::WouldFit() claims that the whole paragraph
+                    // SwTextFrm::WouldFit() claims that the whole paragraph
                     // fits into the given space and subtracts the height of
                     // all lines from nSpace. nSpace - nUpper is not a valid
                     // indicator if the frame should be allowed to move backward.
@@ -1907,7 +1907,7 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace,
 
         // OD 2004-03-01 #106629# - also consider lower spacing in table cells
         if ( bRet && IsInTab() &&
-             pNewUpper->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) )
+             pNewUpper->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) )
         {
             nSpace -= rAttrs.GetULSpace().GetLower();
             if ( nSpace < 0 )
@@ -1920,23 +1920,23 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace,
         {
             if( bTstMove )
             {
-                while( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->HasFollow() )
+                while( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->HasFollow() )
                 {
-                    pFrm = static_cast<SwTxtFrm*>(pFrm)->GetFollow();
+                    pFrm = static_cast<SwTextFrm*>(pFrm)->GetFollow();
                 }
                 // OD 11.04.2003 #108824# - If last follow frame of <this> text
                 // frame isn't valid, a formatting of the next content frame
                 // doesn't makes sense. Thus, return true.
                 if ( IsAnFollow( pFrm ) && !pFrm->IsValid() )
                 {
-                    OSL_FAIL( "Only a warning for task 108824:/n<SwCntntFrm::_WouldFit(..) - follow not valid!" );
+                    OSL_FAIL( "Only a warning for task 108824:/n<SwContentFrm::_WouldFit(..) - follow not valid!" );
                     return true;
                 }
             }
             SwFrm *pNxt;
-            if( 0 != (pNxt = pFrm->FindNext()) && pNxt->IsCntntFrm() &&
-                ( !pFtnFrm || ( pNxt->IsInFtn() &&
-                  pNxt->FindFtnFrm()->GetAttr() == pFtnFrm->GetAttr() ) ) )
+            if( 0 != (pNxt = pFrm->FindNext()) && pNxt->IsContentFrm() &&
+                ( !pFootnoteFrm || ( pNxt->IsInFootnote() &&
+                  pNxt->FindFootnoteFrm()->GetAttr() == pFootnoteFrm->GetAttr() ) ) )
             {
                 // TestFormat(?) does not like paragraph- or character anchored objects.
 
@@ -1958,12 +1958,12 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace,
                     pTmpPrev = 0;
                 else
                 {
-                    if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow() )
+                    if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsHiddenNow() )
                         pTmpPrev = lcl_NotHiddenPrev( pFrm );
                     else
                         pTmpPrev = pFrm;
                 }
-                pFrm = static_cast<SwCntntFrm*>(pNxt);
+                pFrm = static_cast<SwContentFrm*>(pNxt);
             }
             else
                 pFrm = 0;
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 23ef755e299a..89d169aec197 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -32,28 +32,28 @@
 #include <IDocumentState.hxx>
 #include <IDocumentLayoutAccess.hxx>
 
-SwColumnFrm::SwColumnFrm( SwFrmFmt *pFmt, SwFrm* pSib ):
-    SwFtnBossFrm( pFmt, pSib )
+SwColumnFrm::SwColumnFrm( SwFrameFormat *pFormat, SwFrm* pSib ):
+    SwFootnoteBossFrm( pFormat, pSib )
 {
     mnFrmType = FRM_COLUMN;
-    SwBodyFrm* pColBody = new SwBodyFrm( pFmt->GetDoc()->GetDfltFrmFmt(), pSib );
+    SwBodyFrm* pColBody = new SwBodyFrm( pFormat->GetDoc()->GetDfltFrameFormat(), pSib );
     pColBody->InsertBehind( this, 0 ); // ColumnFrms now with BodyFrm
-    SetMaxFtnHeight( LONG_MAX );
+    SetMaxFootnoteHeight( LONG_MAX );
 }
 
 void SwColumnFrm::DestroyImpl()
 {
-    SwFrmFmt *pFmt = GetFmt();
+    SwFrameFormat *pFormat = GetFormat();
     SwDoc *pDoc;
-    if ( !(pDoc = pFmt->GetDoc())->IsInDtor() && pFmt->HasOnlyOneListener() )
+    if ( !(pDoc = pFormat->GetDoc())->IsInDtor() && pFormat->HasOnlyOneListener() )
     {
         //I'm the only one, delete the format.
         //Get default format before, so the base class can cope with it.
-        pDoc->GetDfltFrmFmt()->Add( this );
-        pDoc->DelFrmFmt( pFmt );
+        pDoc->GetDfltFrameFormat()->Add( this );
+        pDoc->DelFrameFormat( pFormat );
     }
 
-    SwFtnBossFrm::DestroyImpl();
+    SwFootnoteBossFrm::DestroyImpl();
 }
 
 SwColumnFrm::~SwColumnFrm()
@@ -66,7 +66,7 @@ static void lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt )
             "no columns to remove." );
 
     SwColumnFrm *pColumn = static_cast<SwColumnFrm*>(pCont->Lower());
-    sw_RemoveFtns( pColumn, true, true );
+    sw_RemoveFootnotes( pColumn, true, true );
     while ( pColumn->GetNext() )
     {
         OSL_ENSURE( pColumn->GetNext()->IsColumnFrm(),
@@ -101,7 +101,7 @@ static SwLayoutFrm * lcl_FindColumns( SwLayoutFrm *pLay, sal_uInt16 nCount )
 
 static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
 {
-    SwDoc *pDoc = pCont->GetFmt()->GetDoc();
+    SwDoc *pDoc = pCont->GetFormat()->GetDoc();
     const bool bMod = pDoc->getIDocumentState().IsModified();
 
     //Formats should be shared whenever possible. If a neighbour already has
@@ -112,7 +112,7 @@ static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
     if ( pCont->IsBodyFrm() )
         pAttrOwner = pCont->FindPageFrm();
     SwLayoutFrm *pNeighbourCol = 0;
-    SwIterator<SwLayoutFrm,SwFmt> aIter( *pAttrOwner->GetFmt() );
+    SwIterator<SwLayoutFrm,SwFormat> aIter( *pAttrOwner->GetFormat() );
     SwLayoutFrm *pNeighbour = aIter.First();
 
     sal_uInt16 nAdd = 0;
@@ -131,7 +131,7 @@ static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
 
     bool bRet;
     SwTwips nMax = pCont->IsPageBodyFrm() ?
-                   pCont->FindPageFrm()->GetMaxFtnHeight() : LONG_MAX;
+                   pCont->FindPageFrm()->GetMaxFootnoteHeight() : LONG_MAX;
     if ( pNeighbourCol )
     {
         bRet = false;
@@ -143,8 +143,8 @@ static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
         }
         for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
-            SwColumnFrm *pTmpCol = new SwColumnFrm( pNeighbourCol->GetFmt(), pCont );
-            pTmpCol->SetMaxFtnHeight( nMax );
+            SwColumnFrm *pTmpCol = new SwColumnFrm( pNeighbourCol->GetFormat(), pCont );
+            pTmpCol->SetMaxFootnoteHeight( nMax );
             pTmpCol->InsertBefore( pCont, NULL );
             pNeighbourCol = static_cast<SwLayoutFrm*>(pNeighbourCol->GetNext());
         }
@@ -154,9 +154,9 @@ static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
         bRet = true;
         for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
-            SwFrmFmt *pFmt = pDoc->MakeFrmFmt( aEmptyOUStr, pDoc->GetDfltFrmFmt());
-            SwColumnFrm *pTmp = new SwColumnFrm( pFmt, pCont );
-            pTmp->SetMaxFtnHeight( nMax );
+            SwFrameFormat *pFormat = pDoc->MakeFrameFormat( aEmptyOUStr, pDoc->GetDfltFrameFormat());
+            SwColumnFrm *pTmp = new SwColumnFrm( pFormat, pCont );
+            pTmp->SetMaxFootnoteHeight( nMax );
             pTmp->Paste( pCont );
         }
     }
@@ -174,16 +174,16 @@ static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
  *
  * @param rOld
  * @param rNew
- * @param bChgFtn if true, the columnframe will be inserted or removed, if necessary.
+ * @param bChgFootnote if true, the columnframe will be inserted or removed, if necessary.
  */
-void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
-    const bool bChgFtn )
+void SwLayoutFrm::ChgColumns( const SwFormatCol &rOld, const SwFormatCol &rNew,
+    const bool bChgFootnote )
 {
-    if ( rOld.GetNumCols() <= 1 && rNew.GetNumCols() <= 1 && !bChgFtn )
+    if ( rOld.GetNumCols() <= 1 && rNew.GetNumCols() <= 1 && !bChgFootnote )
         return;
     // #i97379#
     // If current lower is a no text frame, then columns are not allowed
-    if ( Lower() && Lower()->IsNoTxtFrm() &&
+    if ( Lower() && Lower()->IsNoTextFrm() &&
          rNew.GetNumCols() > 1 )
     {
         return;
@@ -210,34 +210,34 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
 
     //The content is saved and restored if the column count is different.
     SwFrm *pSave = 0;
-    if( nOldNum != nNewNum || bChgFtn )
+    if( nOldNum != nNewNum || bChgFootnote )
     {
-        SwDoc *pDoc = GetFmt()->GetDoc();
-        OSL_ENSURE( pDoc, "FrmFmt doesn't return a document." );
-        // SaveCntnt would also suck up the content of the footnote container
+        SwDoc *pDoc = GetFormat()->GetDoc();
+        OSL_ENSURE( pDoc, "FrameFormat doesn't return a document." );
+        // SaveContent would also suck up the content of the footnote container
         // and store it within the normal text flow.
         if( IsPageBodyFrm() )
-            pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->RemoveFtns( static_cast<SwPageFrm*>(GetUpper()), true, false );
-        pSave = ::SaveCntnt( this );
+            pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->RemoveFootnotes( static_cast<SwPageFrm*>(GetUpper()), true, false );
+        pSave = ::SaveContent( this );
 
         //If columns exist, they get deleted if a column count of 0 or 1 is requested.
         if ( nNewNum == 1 && !bAtEnd )
         {
             ::lcl_RemoveColumns( this, nOldNum );
             if ( IsBodyFrm() )
-                SetFrmFmt( pDoc->GetDfltFrmFmt() );
+                SetFrameFormat( pDoc->GetDfltFrameFormat() );
             else
-                GetFmt()->SetFmtAttr( SwFmtFillOrder() );
+                GetFormat()->SetFormatAttr( SwFormatFillOrder() );
             if ( pSave )
-                ::RestoreCntnt( pSave, this, 0, true );
+                ::RestoreContent( pSave, this, 0, true );
             return;
         }
         if ( nOldNum == 1 )
         {
             if ( IsBodyFrm() )
-                SetFrmFmt( pDoc->GetColumnContFmt() );
+                SetFrameFormat( pDoc->GetColumnContFormat() );
             else
-                GetFmt()->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) );
+                GetFormat()->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ) );
             if( !Lower() || !Lower()->IsColumnFrm() )
                 --nOldNum;
         }
@@ -282,11 +282,11 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
                 static_cast<SwLayoutFrm*>(Lower())->Lower() &&
                 static_cast<SwLayoutFrm*>(Lower())->Lower()->IsLayoutFrm(),
                 "no column body." );   // ColumnFrms contain BodyFrms
-        ::RestoreCntnt( pSave, static_cast<SwLayoutFrm*>(static_cast<SwLayoutFrm*>(Lower())->Lower()), 0, true );
+        ::RestoreContent( pSave, static_cast<SwLayoutFrm*>(static_cast<SwLayoutFrm*>(Lower())->Lower()), 0, true );
     }
 }
 
-void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, bool bAdjustAttributes )
+void SwLayoutFrm::AdjustColumns( const SwFormatCol *pAttr, bool bAdjustAttributes )
 {
     if( !Lower()->GetNext() )
     {
@@ -302,7 +302,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, bool bAdjustAttributes )
     //column widths in any case. Otherwise we check if a configuration is needed.
     if ( !pAttr )
     {
-        pAttr = &GetFmt()->GetCol();
+        pAttr = &GetFormat()->GetCol();
         if ( !bAdjustAttributes )
         {
             long nAvail = (Prt().*fnRect->fnGetWidth)();
@@ -393,8 +393,8 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, bool bAdjustAttributes )
                 aUL.SetUpper( pC->GetUpper());
                 aUL.SetLower( pC->GetLower());
 
-                static_cast<SwLayoutFrm*>(pCol)->GetFmt()->SetFmtAttr( aLR );
-                static_cast<SwLayoutFrm*>(pCol)->GetFmt()->SetFmtAttr( aUL );
+                static_cast<SwLayoutFrm*>(pCol)->GetFormat()->SetFormatAttr( aLR );
+                static_cast<SwLayoutFrm*>(pCol)->GetFormat()->SetFormatAttr( aUL );
             }
 
             nGutter += aLR.GetLeft() + aLR.GetRight();
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 73da3a1c8fd9..c49e13b02b39 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -76,7 +76,7 @@
  *      In the [frmtype] section, the frame types which should be logged are
  *      listed; default is USHRT_MAX which means that all types are logged.
  *      It's possible to remove types from the list using '!' in front of a
- *      value. The value !0xC000 would for example exclude SwCntntFrms from
+ *      value. The value !0xC000 would for example exclude SwContentFrms from
  *      logging.
  *      In the [record] section the functions group which should be logged are
  *      listed; default is 0 which means that none are logged. It's also
@@ -113,8 +113,8 @@ static sal_uLong lcl_GetFrameId( const SwFrm* pFrm )
     if( bFrameId )
         return pFrm->GetFrmId();
 #endif
-    if( pFrm && pFrm->IsTxtFrm() )
-        return static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode()->GetIndex();
+    if( pFrm && pFrm->IsTextFrm() )
+        return static_cast<const SwTextFrm*>(pFrm)->GetTextNode()->GetIndex();
     return 0;
 }
 
@@ -224,7 +224,7 @@ void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct,
 }
 
 // The following function gets called when pulling in the writer DLL through
-// TxtInit(..) and gives the possibility to release functions
+// TextInit(..) and gives the possibility to release functions
 // and/or FrmIds to the debugger
 
 void SwProtocol::Init()
@@ -449,8 +449,8 @@ static void lcl_Flags(OStringBuffer& rOut, const SwFrm* pFrm)
 /// output the type of the frame as plain text.
 static void lcl_FrameType( OStringBuffer& rOut, const SwFrm* pFrm )
 {
-    if( pFrm->IsTxtFrm() )
-        rOut.append("Txt ");
+    if( pFrm->IsTextFrm() )
+        rOut.append("Text ");
     else if( pFrm->IsLayoutFrm() )
     {
         if( pFrm->IsPageFrm() )
@@ -477,17 +477,17 @@ static void lcl_FrameType( OStringBuffer& rOut, const SwFrm* pFrm )
             rOut.append("Header ");
         else if( pFrm->IsFooterFrm() )
             rOut.append("Footer ");
-        else if( pFrm->IsFtnFrm() )
-            rOut.append("Ftn ");
-        else if( pFrm->IsFtnContFrm() )
-            rOut.append("FtnCont ");
+        else if( pFrm->IsFootnoteFrm() )
+            rOut.append("Footnote ");
+        else if( pFrm->IsFootnoteContFrm() )
+            rOut.append("FootnoteCont ");
         else if( pFrm->IsFlyFrm() )
             rOut.append("Fly ");
         else
             rOut.append("Layout ");
     }
-    else if( pFrm->IsNoTxtFrm() )
-        rOut.append("NoTxt ");
+    else if( pFrm->IsNoTextFrm() )
+        rOut.append("NoText ");
     else
         rOut.append("Not impl. ");
 }
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index 9060836952c7..60d73c5c58ed 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -99,7 +99,7 @@ namespace sw
             pXDoc->GetDocShell()->GetWrtShell()->StartAction();
             Rectangle aRect( 0, 0, 26000, 21000 );
             pXDoc->GetDocShell()->SetVisArea( aRect );
-            pLayout->InvalidateAllCntnt( );
+            pLayout->InvalidateAllContent( );
             pXDoc->GetDocShell()->GetWrtShell()->EndAction();
 
             // Dump the layout XML into the XOutputStream
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index afd6b1293233..18189ba9ad95 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -32,8 +32,8 @@
 #include <txtfrm.hxx>
 #include <calbck.hxx>
 
-/// Searches the first CntntFrm in BodyText below the page.
-SwLayoutFrm *SwFtnBossFrm::FindBodyCont()
+/// Searches the first ContentFrm in BodyText below the page.
+SwLayoutFrm *SwFootnoteBossFrm::FindBodyCont()
 {
     SwFrm *pLay = Lower();
     while ( pLay && !pLay->IsBodyFrm() )
@@ -41,11 +41,11 @@ SwLayoutFrm *SwFtnBossFrm::FindBodyCont()
     return static_cast<SwLayoutFrm*>(pLay);
 }
 
-/// Searches the last CntntFrm in BodyText below the page.
-SwCntntFrm *SwPageFrm::FindLastBodyCntnt()
+/// Searches the last ContentFrm in BodyText below the page.
+SwContentFrm *SwPageFrm::FindLastBodyContent()
 {
-    SwCntntFrm *pRet = FindFirstBodyCntnt();
-    SwCntntFrm *pNxt = pRet;
+    SwContentFrm *pRet = FindFirstBodyContent();
+    SwContentFrm *pNxt = pRet;
     while ( pNxt && pNxt->IsInDocBody() && IsAnLower( pNxt ) )
     {   pRet = pNxt;
         pNxt = pNxt->FindNextCnt();
@@ -54,15 +54,15 @@ SwCntntFrm *SwPageFrm::FindLastBodyCntnt()
 }
 
 /**
- * Checks if the frame contains one or more CntntFrm's anywhere in his
- * subsidiary structure; if so the first found CntntFrm is returned.
+ * Checks if the frame contains one or more ContentFrm's anywhere in his
+ * subsidiary structure; if so the first found ContentFrm is returned.
  */
-const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const
+const SwContentFrm *SwLayoutFrm::ContainsContent() const
 {
     //Search downwards the layout leaf and if there is no content, jump to the
     //next leaf until content is found or we leave "this".
-    //Sections: Cntnt next to sections would not be found this way (empty
-    //sections directly next to CntntFrm) therefore we need to recursively
+    //Sections: Content next to sections would not be found this way (empty
+    //sections directly next to ContentFrm) therefore we need to recursively
     //search for them even if it's more complex.
 
     const SwLayoutFrm *pLayLeaf = this;
@@ -74,7 +74,7 @@ const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const
 
         if( pLayLeaf->IsSctFrm() && pLayLeaf != this )
         {
-            const SwCntntFrm *pCnt = pLayLeaf->ContainsCntnt();
+            const SwContentFrm *pCnt = pLayLeaf->ContainsContent();
             if( pCnt )
                 return pCnt;
             if( pLayLeaf->GetNext() )
@@ -85,11 +85,11 @@ const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const
                     continue;
                 }
                 else
-                    return static_cast<const SwCntntFrm*>(pLayLeaf->GetNext());
+                    return static_cast<const SwContentFrm*>(pLayLeaf->GetNext());
             }
         }
         else if ( pLayLeaf->Lower() )
-            return static_cast<const SwCntntFrm*>(pLayLeaf->Lower());
+            return static_cast<const SwContentFrm*>(pLayLeaf->Lower());
 
         pLayLeaf = pLayLeaf->GetNextLayoutLeaf();
         if( !IsAnLower( pLayLeaf) )
@@ -100,7 +100,7 @@ const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const
 
 /**
  * Calls ContainsAny first to reach the innermost cell. From there we walk back
- * up to the first SwCellFrm. Since we use SectionFrms, ContainsCntnt()->GetUpper()
+ * up to the first SwCellFrm. Since we use SectionFrms, ContainsContent()->GetUpper()
  * is not enough anymore.
  */
 const SwCellFrm *SwLayoutFrm::FirstCell() const
@@ -111,12 +111,12 @@ const SwCellFrm *SwLayoutFrm::FirstCell() const
     return static_cast<const SwCellFrm*>(pCnt);
 }
 
-/** return CntntFrms, sections, and tables.
+/** return ContentFrms, sections, and tables.
  *
- * @param _bInvestigateFtnForSections controls investigation of content of footnotes for sections.
- * @see ContainsCntnt
+ * @param _bInvestigateFootnoteForSections controls investigation of content of footnotes for sections.
+ * @see ContainsContent
  */
-const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections ) const
+const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFootnoteForSections ) const
 {
     //Search downwards the layout leaf and if there is no content, jump to the
     //next leaf until content is found, we leave "this" or until we found
@@ -124,7 +124,7 @@ const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections )
 
     const SwLayoutFrm *pLayLeaf = this;
     // #130797#
-    const bool bNoFtn = IsSctFrm() && !_bInvestigateFtnForSections;
+    const bool bNoFootnote = IsSctFrm() && !_bInvestigateFootnoteForSections;
     do
     {
         while ( ( (!pLayLeaf->IsSctFrm() && !pLayLeaf->IsTabFrm())
@@ -136,19 +136,19 @@ const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections )
             && pLayLeaf != this )
         {
             // Now we also return "deleted" SectionFrms so they can be
-            // maintained on SaveCntnt and RestoreCntnt
+            // maintained on SaveContent and RestoreContent
             return pLayLeaf;
         }
         else if ( pLayLeaf->Lower() )
-            return static_cast<const SwCntntFrm*>(pLayLeaf->Lower());
+            return static_cast<const SwContentFrm*>(pLayLeaf->Lower());
 
         pLayLeaf = pLayLeaf->GetNextLayoutLeaf();
-        if( bNoFtn && pLayLeaf && pLayLeaf->IsInFtn() )
+        if( bNoFootnote && pLayLeaf && pLayLeaf->IsInFootnote() )
         {
             do
             {
                 pLayLeaf = pLayLeaf->GetNextLayoutLeaf();
-            } while( pLayLeaf && pLayLeaf->IsInFtn() );
+            } while( pLayLeaf && pLayLeaf->IsInFootnote() );
         }
         if( !IsAnLower( pLayLeaf) )
             return 0;
@@ -166,36 +166,36 @@ SwFrm* SwFrm::GetLower()
     return IsLayoutFrm() ? static_cast<SwLayoutFrm*>(this)->Lower() : 0;
 }
 
-SwCntntFrm* SwFrm::FindPrevCnt( const bool _bInSameFtn )
+SwContentFrm* SwFrm::FindPrevCnt( const bool _bInSameFootnote )
 {
-    if ( GetPrev() && GetPrev()->IsCntntFrm() )
-        return static_cast<SwCntntFrm*>(GetPrev());
+    if ( GetPrev() && GetPrev()->IsContentFrm() )
+        return static_cast<SwContentFrm*>(GetPrev());
     else
-        return _FindPrevCnt( _bInSameFtn );
+        return _FindPrevCnt( _bInSameFootnote );
 }
 
-const SwCntntFrm* SwFrm::FindPrevCnt( const bool _bInSameFtn ) const
+const SwContentFrm* SwFrm::FindPrevCnt( const bool _bInSameFootnote ) const
 {
-    if ( GetPrev() && GetPrev()->IsCntntFrm() )
-        return static_cast<const SwCntntFrm*>(GetPrev());
+    if ( GetPrev() && GetPrev()->IsContentFrm() )
+        return static_cast<const SwContentFrm*>(GetPrev());
     else
-        return const_cast<SwFrm*>(this)->_FindPrevCnt( _bInSameFtn );
+        return const_cast<SwFrm*>(this)->_FindPrevCnt( _bInSameFootnote );
 }
 
-SwCntntFrm *SwFrm::FindNextCnt( const bool _bInSameFtn )
+SwContentFrm *SwFrm::FindNextCnt( const bool _bInSameFootnote )
 {
-    if ( mpNext && mpNext->IsCntntFrm() )
-        return static_cast<SwCntntFrm*>(mpNext);
+    if ( mpNext && mpNext->IsContentFrm() )
+        return static_cast<SwContentFrm*>(mpNext);
     else
-        return _FindNextCnt( _bInSameFtn );
+        return _FindNextCnt( _bInSameFootnote );
 }
 
-const SwCntntFrm *SwFrm::FindNextCnt( const bool _bInSameFtn ) const
+const SwContentFrm *SwFrm::FindNextCnt( const bool _bInSameFootnote ) const
 {
-    if ( mpNext && mpNext->IsCntntFrm() )
-        return static_cast<SwCntntFrm*>(mpNext);
+    if ( mpNext && mpNext->IsContentFrm() )
+        return static_cast<SwContentFrm*>(mpNext);
     else
-        return const_cast<SwFrm*>(this)->_FindNextCnt( _bInSameFtn );
+        return const_cast<SwFrm*>(this)->_FindNextCnt( _bInSameFootnote );
 }
 
 bool SwLayoutFrm::IsAnLower( const SwFrm *pAssumed ) const
@@ -355,11 +355,11 @@ const SwLayoutFrm *SwFrm::ImplGetNextLayoutLeaf( bool bFwd ) const
  *
  * @warning fixes here may also need to be applied to the @{lcl_NextFrm} method above
  */
-const SwCntntFrm* SwCntntFrm::ImplGetNextCntntFrm( bool bFwd ) const
+const SwContentFrm* SwContentFrm::ImplGetNextContentFrm( bool bFwd ) const
 {
     const SwFrm *pFrm = this;
     // #100926#
-    const SwCntntFrm *pCntntFrm = 0;
+    const SwContentFrm *pContentFrm = 0;
     bool bGoingUp = false;
     do {
         const SwFrm *p = 0;
@@ -389,9 +389,9 @@ const SwCntntFrm* SwCntntFrm::ImplGetNextCntntFrm( bool bFwd ) const
         }
 
         pFrm = p;
-    } while ( 0 == (pCntntFrm = (pFrm->IsCntntFrm() ? static_cast<const SwCntntFrm*>(pFrm) : 0) ));
+    } while ( 0 == (pContentFrm = (pFrm->IsContentFrm() ? static_cast<const SwContentFrm*>(pFrm) : 0) ));
 
-    return pCntntFrm;
+    return pContentFrm;
 }
 
 SwPageFrm* SwFrm::FindPageFrm()
@@ -415,14 +415,14 @@ SwPageFrm* SwFrm::FindPageFrm()
     return static_cast<SwPageFrm*>(pRet);
 }
 
-SwFtnBossFrm* SwFrm::FindFtnBossFrm( bool bFootnotes )
+SwFootnoteBossFrm* SwFrm::FindFootnoteBossFrm( bool bFootnotes )
 {
     SwFrm *pRet = this;
     // Footnote bosses can't exist inside a table; also sections with columns
     // don't contain footnote texts there
     if( pRet->IsInTab() )
         pRet = pRet->FindTabFrm();
-    while ( pRet && !pRet->IsFtnBossFrm() )
+    while ( pRet && !pRet->IsFootnoteBossFrm() )
     {
         if ( pRet->GetUpper() )
             pRet = pRet->GetUpper();
@@ -441,11 +441,11 @@ SwFtnBossFrm* SwFrm::FindFtnBossFrm( bool bFootnotes )
         !pRet->GetNext() && !pRet->GetPrev() )
     {
         SwSectionFrm* pSct = pRet->FindSctFrm();
-        OSL_ENSURE( pSct, "FindFtnBossFrm: Single column outside section?" );
-        if( !pSct->IsFtnAtEnd() )
-            return pSct->FindFtnBossFrm( true );
+        OSL_ENSURE( pSct, "FindFootnoteBossFrm: Single column outside section?" );
+        if( !pSct->IsFootnoteAtEnd() )
+            return pSct->FindFootnoteBossFrm( true );
     }
-    return static_cast<SwFtnBossFrm*>(pRet);
+    return static_cast<SwFootnoteBossFrm*>(pRet);
 }
 
 SwTabFrm* SwFrm::ImplFindTabFrm()
@@ -472,16 +472,16 @@ SwSectionFrm* SwFrm::ImplFindSctFrm()
     return static_cast<SwSectionFrm*>(pRet);
 }
 
-SwFtnFrm *SwFrm::ImplFindFtnFrm()
+SwFootnoteFrm *SwFrm::ImplFindFootnoteFrm()
 {
     SwFrm *pRet = this;
-    while ( !pRet->IsFtnFrm() )
+    while ( !pRet->IsFootnoteFrm() )
     {
         pRet = pRet->GetUpper();
         if ( !pRet )
             return 0;
     }
-    return static_cast<SwFtnFrm*>(pRet);
+    return static_cast<SwFootnoteFrm*>(pRet);
 }
 
 SwFlyFrm *SwFrm::ImplFindFlyFrm()
@@ -532,10 +532,10 @@ SwFrm* SwFrm::FindFooterOrHeader()
     return pRet;
 }
 
-const SwFtnFrm* SwFtnContFrm::FindFootNote() const
+const SwFootnoteFrm* SwFootnoteContFrm::FindFootNote() const
 {
-    const SwFtnFrm* pRet = static_cast<const SwFtnFrm*>(Lower());
-    if( pRet && !pRet->GetAttr()->GetFtn().IsEndNote() )
+    const SwFootnoteFrm* pRet = static_cast<const SwFootnoteFrm*>(Lower());
+    if( pRet && !pRet->GetAttr()->GetFootnote().IsEndNote() )
         return pRet;
     return NULL;
 }
@@ -584,54 +584,54 @@ const SwPageFrm* SwRootFrm::GetPageAtPos( const Point& rPt, const Size* pSize, b
 
 const SwAttrSet* SwFrm::GetAttrSet() const
 {
-    if ( IsCntntFrm() )
-        return &static_cast<const SwCntntFrm*>(this)->GetNode()->GetSwAttrSet();
+    if ( IsContentFrm() )
+        return &static_cast<const SwContentFrm*>(this)->GetNode()->GetSwAttrSet();
     else
-        return &static_cast<const SwLayoutFrm*>(this)->GetFmt()->GetAttrSet();
+        return &static_cast<const SwLayoutFrm*>(this)->GetFormat()->GetAttrSet();
 }
 
 //UUUU
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrm::getSdrAllFillAttributesHelper() const
 {
-    if(IsCntntFrm())
+    if(IsContentFrm())
     {
-        return static_cast< const SwCntntFrm* >(this)->GetNode()->getSdrAllFillAttributesHelper();
+        return static_cast< const SwContentFrm* >(this)->GetNode()->getSdrAllFillAttributesHelper();
     }
     else
     {
-        return static_cast< const SwLayoutFrm* >(this)->GetFmt()->getSdrAllFillAttributesHelper();
+        return static_cast< const SwLayoutFrm* >(this)->GetFormat()->getSdrAllFillAttributesHelper();
     }
 }
 
 bool SwFrm::supportsFullDrawingLayerFillAttributeSet() const
 {
-    if (IsCntntFrm())
+    if (IsContentFrm())
     {
         return true;
     }
     else
     {
-        return static_cast< const SwLayoutFrm* >(this)->GetFmt()->supportsFullDrawingLayerFillAttributeSet();
+        return static_cast< const SwLayoutFrm* >(this)->GetFormat()->supportsFullDrawingLayerFillAttributeSet();
     }
 }
 
 /*
  *  SwFrm::_FindNext(), _FindPrev(), InvalidateNextPos()
- *         _FindNextCnt() visits tables and sections and only returns SwCntntFrms.
+ *         _FindNextCnt() visits tables and sections and only returns SwContentFrms.
  *
  *  Description         Invalidates the position of the next frame.
- *      This is the direct successor or in case of CntntFrms the next
- *      CntntFrm which sits in the same flow as I do:
+ *      This is the direct successor or in case of ContentFrms the next
+ *      ContentFrm which sits in the same flow as I do:
  *      - body,
  *      - footnote,
  *      - in headers/footers the notification only needs to be forwarded
  *        inside the section
  *      - same for Flys
- *      - Cntnts in tabs remain only inside their cell
- *      - in principle tables behave exactly like the Cntnts
+ *      - Contents in tabs remain only inside their cell
+ *      - in principle tables behave exactly like the Contents
  *      - sections also
  */
-// This helper function is an equivalent to the ImplGetNextCntntFrm() method,
+// This helper function is an equivalent to the ImplGetNextContentFrm() method,
 // besides ContentFrames this function also returns TabFrms and SectionFrms.
 static SwFrm* lcl_NextFrm( SwFrm* pFrm )
 {
@@ -657,7 +657,7 @@ static SwFrm* lcl_NextFrm( SwFrm* pFrm )
         }
         bGoingUp = !(bGoingFwd || bGoingDown);
         pFrm = p;
-    } while ( 0 == (pRet = ( ( pFrm->IsCntntFrm() || ( !bGoingUp &&
+    } while ( 0 == (pRet = ( ( pFrm->IsContentFrm() || ( !bGoingUp &&
             ( pFrm->IsTabFrm() || pFrm->IsSctFrm() ) ) )? pFrm : 0 ) ) );
     return pRet;
 }
@@ -669,31 +669,31 @@ SwFrm *SwFrm::_FindNext()
 
     if ( IsTabFrm() )
     {
-        //The last Cntnt of the table gets picked up and his follower is
+        //The last Content of the table gets picked up and his follower is
         //returned. To be able to deactivate the special case for tables
         //(see below) bIgnoreTab will be set.
         if ( static_cast<SwTabFrm*>(this)->GetFollow() )
             return static_cast<SwTabFrm*>(this)->GetFollow();
 
-        pThis = static_cast<SwTabFrm*>(this)->FindLastCntnt();
+        pThis = static_cast<SwTabFrm*>(this)->FindLastContent();
         if ( !pThis )
             pThis = this;
         bIgnoreTab = true;
     }
     else if ( IsSctFrm() )
     {
-        //The last Cntnt of the section gets picked and his follower is returned.
+        //The last Content of the section gets picked and his follower is returned.
         if ( static_cast<SwSectionFrm*>(this)->GetFollow() )
             return static_cast<SwSectionFrm*>(this)->GetFollow();
 
-        pThis = static_cast<SwSectionFrm*>(this)->FindLastCntnt();
+        pThis = static_cast<SwSectionFrm*>(this)->FindLastContent();
         if ( !pThis )
             pThis = this;
     }
-    else if ( IsCntntFrm() )
+    else if ( IsContentFrm() )
     {
-        if( static_cast<SwCntntFrm*>(this)->GetFollow() )
-            return static_cast<SwCntntFrm*>(this)->GetFollow();
+        if( static_cast<SwContentFrm*>(this)->GetFollow() )
+            return static_cast<SwContentFrm*>(this)->GetFollow();
     }
     else if ( IsRowFrm() )
     {
@@ -706,16 +706,16 @@ SwFrm *SwFrm::_FindNext()
         return NULL;
 
     SwFrm* pRet = NULL;
-    const bool bFtn  = pThis->IsInFtn();
+    const bool bFootnote  = pThis->IsInFootnote();
     if ( !bIgnoreTab && pThis->IsInTab() )
     {
         SwLayoutFrm *pUp = pThis->GetUpper();
         while (pUp && !pUp->IsCellFrm())
             pUp = pUp->GetUpper();
-        SAL_WARN_IF(!pUp, "sw.core", "Cntnt in table but not in cell.");
+        SAL_WARN_IF(!pUp, "sw.core", "Content in table but not in cell.");
         SwFrm* pNxt = pUp ? static_cast<SwCellFrm*>(pUp)->GetFollowCell() : NULL;
         if ( pNxt )
-            pNxt = static_cast<SwCellFrm*>(pNxt)->ContainsCntnt();
+            pNxt = static_cast<SwCellFrm*>(pNxt)->ContainsContent();
         if ( !pNxt )
         {
             pNxt = lcl_NextFrm( pThis );
@@ -731,7 +731,7 @@ SwFrm *SwFrm::_FindNext()
         SwFrm *pNxtCnt = lcl_NextFrm( pThis );
         if ( pNxtCnt )
         {
-            if ( bBody || bFtn )
+            if ( bBody || bFootnote )
             {
                 while ( pNxtCnt )
                 {
@@ -743,9 +743,9 @@ SwFrm *SwFrm::_FindNext()
                                    !pNxtCnt->FindSctFrm()->IsEndnAtEnd()
                                  );
                     if ( ( bBody && pNxtCnt->IsInDocBody() ) ||
-                         ( pNxtCnt->IsInFtn() &&
-                           ( bFtn ||
-                             ( bEndn && pNxtCnt->FindFtnFrm()->GetAttr()->GetFtn().IsEndNote() )
+                         ( pNxtCnt->IsInFootnote() &&
+                           ( bFootnote ||
+                             ( bEndn && pNxtCnt->FindFootnoteFrm()->GetAttr()->GetFootnote().IsEndNote() )
                            )
                          )
                        )
@@ -786,14 +786,14 @@ SwFrm *SwFrm::_FindNext()
         //Footnotes in frames with columns must not return the section which
         //contains the footnote
         if( !pSct->IsAnLower( this ) &&
-            (!bFtn || pSct->IsInFtn() ) )
+            (!bFootnote || pSct->IsInFootnote() ) )
             return pSct;
     }
     return pRet;
 }
 
-// #i27138# - add parameter <_bInSameFtn>
-SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
+// #i27138# - add parameter <_bInSameFootnote>
+SwContentFrm *SwFrm::_FindNextCnt( const bool _bInSameFootnote )
 {
     SwFrm *pThis = this;
 
@@ -801,11 +801,11 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
     {
         if ( static_cast<SwTabFrm*>(this)->GetFollow() )
         {
-            pThis = static_cast<SwTabFrm*>(this)->GetFollow()->ContainsCntnt();
+            pThis = static_cast<SwTabFrm*>(this)->GetFollow()->ContainsContent();
             if( pThis )
-                return static_cast<SwCntntFrm*>(pThis);
+                return static_cast<SwContentFrm*>(pThis);
         }
-        pThis = static_cast<SwTabFrm*>(this)->FindLastCntnt();
+        pThis = static_cast<SwTabFrm*>(this)->FindLastContent();
         if ( !pThis )
             return 0;
     }
@@ -813,60 +813,60 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
     {
         if ( static_cast<SwSectionFrm*>(this)->GetFollow() )
         {
-            pThis = static_cast<SwSectionFrm*>(this)->GetFollow()->ContainsCntnt();
+            pThis = static_cast<SwSectionFrm*>(this)->GetFollow()->ContainsContent();
             if( pThis )
-                return static_cast<SwCntntFrm*>(pThis);
+                return static_cast<SwContentFrm*>(pThis);
         }
-        pThis = static_cast<SwSectionFrm*>(this)->FindLastCntnt();
+        pThis = static_cast<SwSectionFrm*>(this)->FindLastContent();
         if ( !pThis )
             return 0;
     }
-    else if ( IsCntntFrm() && static_cast<SwCntntFrm*>(this)->GetFollow() )
-        return static_cast<SwCntntFrm*>(this)->GetFollow();
+    else if ( IsContentFrm() && static_cast<SwContentFrm*>(this)->GetFollow() )
+        return static_cast<SwContentFrm*>(this)->GetFollow();
 
-    if ( pThis->IsCntntFrm() )
+    if ( pThis->IsContentFrm() )
     {
         const bool bBody = pThis->IsInDocBody();
-        const bool bFtn  = pThis->IsInFtn();
-        SwCntntFrm *pNxtCnt = static_cast<SwCntntFrm*>(pThis)->GetNextCntntFrm();
+        const bool bFootnote  = pThis->IsInFootnote();
+        SwContentFrm *pNxtCnt = static_cast<SwContentFrm*>(pThis)->GetNextContentFrm();
         if ( pNxtCnt )
         {
             // #i27138#
-            if ( bBody || ( bFtn && !_bInSameFtn ) )
+            if ( bBody || ( bFootnote && !_bInSameFootnote ) )
             {
                 // handling for environments 'footnotes' and 'document body frames':
                 while ( pNxtCnt )
                 {
                     if ( (bBody && pNxtCnt->IsInDocBody()) ||
-                         (bFtn  && pNxtCnt->IsInFtn()) )
+                         (bFootnote  && pNxtCnt->IsInFootnote()) )
                         return pNxtCnt;
-                    pNxtCnt = pNxtCnt->GetNextCntntFrm();
+                    pNxtCnt = pNxtCnt->GetNextContentFrm();
                 }
             }
             // #i27138#
-            else if ( bFtn && _bInSameFtn )
+            else if ( bFootnote && _bInSameFootnote )
             {
                 // handling for environments 'each footnote':
                 // Assure that found next content frame belongs to the same footnotes
-                const SwFtnFrm* pFtnFrmOfNext( pNxtCnt->FindFtnFrm() );
-                const SwFtnFrm* pFtnFrmOfCurr( pThis->FindFtnFrm() );
-                OSL_ENSURE( pFtnFrmOfCurr,
+                const SwFootnoteFrm* pFootnoteFrmOfNext( pNxtCnt->FindFootnoteFrm() );
+                const SwFootnoteFrm* pFootnoteFrmOfCurr( pThis->FindFootnoteFrm() );
+                OSL_ENSURE( pFootnoteFrmOfCurr,
                         "<SwFrm::_FindNextCnt() - unknown layout situation: current frame has to have an upper footnote frame." );
-                if ( pFtnFrmOfNext == pFtnFrmOfCurr )
+                if ( pFootnoteFrmOfNext == pFootnoteFrmOfCurr )
                 {
                     return pNxtCnt;
                 }
-                else if ( pFtnFrmOfCurr->GetFollow() )
+                else if ( pFootnoteFrmOfCurr->GetFollow() )
                 {
                     // next content frame has to be the first content frame
                     // in the follow footnote, which contains a content frame.
-                    SwFtnFrm* pFollowFtnFrmOfCurr(
-                                        const_cast<SwFtnFrm*>(pFtnFrmOfCurr) );
+                    SwFootnoteFrm* pFollowFootnoteFrmOfCurr(
+                                        const_cast<SwFootnoteFrm*>(pFootnoteFrmOfCurr) );
                     pNxtCnt = 0L;
                     do {
-                        pFollowFtnFrmOfCurr = pFollowFtnFrmOfCurr->GetFollow();
-                        pNxtCnt = pFollowFtnFrmOfCurr->ContainsCntnt();
-                    } while ( !pNxtCnt && pFollowFtnFrmOfCurr->GetFollow() );
+                        pFollowFootnoteFrmOfCurr = pFollowFootnoteFrmOfCurr->GetFollow();
+                        pNxtCnt = pFollowFootnoteFrmOfCurr->ContainsContent();
+                    } while ( !pNxtCnt && pFollowFootnoteFrmOfCurr->GetFollow() );
                     return pNxtCnt;
                 }
                 else
@@ -904,7 +904,7 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
 
     OD 2005-11-30 #i27138#
 */
-SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn )
+SwContentFrm* SwFrm::_FindPrevCnt( const bool _bInSameFootnote )
 {
     if ( !IsFlowFrm() )
     {
@@ -912,18 +912,18 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn )
         return 0L;
     }
 
-    SwCntntFrm* pPrevCntntFrm( 0L );
+    SwContentFrm* pPrevContentFrm( 0L );
 
-    // Because method <SwCntntFrm::GetPrevCntntFrm()> is used to travel
+    // Because method <SwContentFrm::GetPrevContentFrm()> is used to travel
     // through the layout, a content frame, at which the travel starts, is needed.
-    SwCntntFrm* pCurrCntntFrm = dynamic_cast<SwCntntFrm*>(this);
+    SwContentFrm* pCurrContentFrm = dynamic_cast<SwContentFrm*>(this);
 
     // perform shortcut, if current frame is a follow, and
-    // determine <pCurrCntntFrm>, if current frame is a table or section frame
-    if ( pCurrCntntFrm && pCurrCntntFrm->IsFollow() )
+    // determine <pCurrContentFrm>, if current frame is a table or section frame
+    if ( pCurrContentFrm && pCurrContentFrm->IsFollow() )
     {
         // previous content frame is its master content frame
-        pPrevCntntFrm = pCurrCntntFrm->FindMaster();
+        pPrevContentFrm = pCurrContentFrm->FindMaster();
     }
     else if ( IsTabFrm() )
     {
@@ -931,13 +931,13 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn )
         if ( pTabFrm->IsFollow() )
         {
             // previous content frame is the last content of its master table frame
-            pPrevCntntFrm = pTabFrm->FindMaster()->FindLastCntnt();
+            pPrevContentFrm = pTabFrm->FindMaster()->FindLastContent();
         }
         else
         {
             // start content frame for the search is the first content frame of
             // the table frame.
-            pCurrCntntFrm = pTabFrm->ContainsCntnt();
+            pCurrContentFrm = pTabFrm->ContainsContent();
         }
     }
     else if ( IsSctFrm() )
@@ -946,74 +946,74 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn )
         if ( pSectFrm->IsFollow() )
         {
             // previous content frame is the last content of its master section frame
-            pPrevCntntFrm = pSectFrm->FindMaster()->FindLastCntnt();
+            pPrevContentFrm = pSectFrm->FindMaster()->FindLastContent();
         }
         else
         {
             // start content frame for the search is the first content frame of
             // the section frame.
-            pCurrCntntFrm = pSectFrm->ContainsCntnt();
+            pCurrContentFrm = pSectFrm->ContainsContent();
         }
     }
 
     // search for next content frame, depending on the environment, in which
     // the current frame is in.
-    if ( !pPrevCntntFrm && pCurrCntntFrm )
+    if ( !pPrevContentFrm && pCurrContentFrm )
     {
-        pPrevCntntFrm = pCurrCntntFrm->GetPrevCntntFrm();
-        if ( pPrevCntntFrm )
+        pPrevContentFrm = pCurrContentFrm->GetPrevContentFrm();
+        if ( pPrevContentFrm )
         {
-            if ( pCurrCntntFrm->IsInFly() )
+            if ( pCurrContentFrm->IsInFly() )
             {
                 // handling for environments 'unlinked fly frame' and
                 // 'group of linked fly frames':
-                // Nothing to do, <pPrevCntntFrm> is the one
+                // Nothing to do, <pPrevContentFrm> is the one
             }
             else
             {
-                const bool bInDocBody = pCurrCntntFrm->IsInDocBody();
-                const bool bInFtn  = pCurrCntntFrm->IsInFtn();
-                if ( bInDocBody || ( bInFtn && !_bInSameFtn ) )
+                const bool bInDocBody = pCurrContentFrm->IsInDocBody();
+                const bool bInFootnote  = pCurrContentFrm->IsInFootnote();
+                if ( bInDocBody || ( bInFootnote && !_bInSameFootnote ) )
                 {
                     // handling for environments 'footnotes' and 'document body frames':
                     // Assure that found previous frame is also in one of these
                     // environments. Otherwise, travel further
-                    while ( pPrevCntntFrm )
+                    while ( pPrevContentFrm )
                     {
-                        if ( ( bInDocBody && pPrevCntntFrm->IsInDocBody() ) ||
-                             ( bInFtn && pPrevCntntFrm->IsInFtn() ) )
+                        if ( ( bInDocBody && pPrevContentFrm->IsInDocBody() ) ||
+                             ( bInFootnote && pPrevContentFrm->IsInFootnote() ) )
                         {
                             break;
                         }
-                        pPrevCntntFrm = pPrevCntntFrm->GetPrevCntntFrm();
+                        pPrevContentFrm = pPrevContentFrm->GetPrevContentFrm();
                     }
                 }
-                else if ( bInFtn && _bInSameFtn )
+                else if ( bInFootnote && _bInSameFootnote )
                 {
                     // handling for environments 'each footnote':
                     // Assure that found next content frame belongs to the same footnotes
-                    const SwFtnFrm* pFtnFrmOfPrev( pPrevCntntFrm->FindFtnFrm() );
-                    const SwFtnFrm* pFtnFrmOfCurr( pCurrCntntFrm->FindFtnFrm() );
-                    if ( pFtnFrmOfPrev != pFtnFrmOfCurr )
+                    const SwFootnoteFrm* pFootnoteFrmOfPrev( pPrevContentFrm->FindFootnoteFrm() );
+                    const SwFootnoteFrm* pFootnoteFrmOfCurr( pCurrContentFrm->FindFootnoteFrm() );
+                    if ( pFootnoteFrmOfPrev != pFootnoteFrmOfCurr )
                     {
-                        if ( pFtnFrmOfCurr->GetMaster() )
+                        if ( pFootnoteFrmOfCurr->GetMaster() )
                         {
-                            SwFtnFrm* pMasterFtnFrmOfCurr(
-                                        const_cast<SwFtnFrm*>(pFtnFrmOfCurr) );
-                            pPrevCntntFrm = 0L;
+                            SwFootnoteFrm* pMasterFootnoteFrmOfCurr(
+                                        const_cast<SwFootnoteFrm*>(pFootnoteFrmOfCurr) );
+                            pPrevContentFrm = 0L;
                             // #146872#
                             // correct wrong loop-condition
                             do {
-                                pMasterFtnFrmOfCurr = pMasterFtnFrmOfCurr->GetMaster();
-                                pPrevCntntFrm = pMasterFtnFrmOfCurr->FindLastCntnt();
-                            } while ( !pPrevCntntFrm &&
-                                      pMasterFtnFrmOfCurr->GetMaster() );
+                                pMasterFootnoteFrmOfCurr = pMasterFootnoteFrmOfCurr->GetMaster();
+                                pPrevContentFrm = pMasterFootnoteFrmOfCurr->FindLastContent();
+                            } while ( !pPrevContentFrm &&
+                                      pMasterFootnoteFrmOfCurr->GetMaster() );
                         }
                         else
                         {
                             // current content frame is the first content in the
                             // footnote - no previous content exists.
-                            pPrevCntntFrm = 0L;
+                            pPrevContentFrm = 0L;
                         }
                     }
                 }
@@ -1021,27 +1021,27 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn )
                 {
                     // handling for environments 'page header' and 'page footer':
                     // Assure that found previous frame is also in the same
-                    // page header respectively page footer as <pCurrCntntFrm>
-                    // Note: At this point its clear, that <pCurrCntntFrm> has
+                    // page header respectively page footer as <pCurrContentFrm>
+                    // Note: At this point its clear, that <pCurrContentFrm> has
                     //       to be inside a page header or page footer and that
-                    //       neither <pCurrCntntFrm> nor <pPrevCntntFrm> are
+                    //       neither <pCurrContentFrm> nor <pPrevContentFrm> are
                     //       inside a fly frame.
                     //       Thus, method <FindFooterOrHeader()> can be used.
-                    OSL_ENSURE( pCurrCntntFrm->FindFooterOrHeader(),
+                    OSL_ENSURE( pCurrContentFrm->FindFooterOrHeader(),
                             "<SwFrm::_FindPrevCnt()> - unknown layout situation: current frame should be in page header or page footer" );
-                    OSL_ENSURE( !pPrevCntntFrm->IsInFly(),
+                    OSL_ENSURE( !pPrevContentFrm->IsInFly(),
                             "<SwFrm::_FindPrevCnt()> - unknown layout situation: found previous frame should *not* be inside a fly frame." );
-                    if ( pPrevCntntFrm->FindFooterOrHeader() !=
-                                            pCurrCntntFrm->FindFooterOrHeader() )
+                    if ( pPrevContentFrm->FindFooterOrHeader() !=
+                                            pCurrContentFrm->FindFooterOrHeader() )
                     {
-                        pPrevCntntFrm = 0L;
+                        pPrevContentFrm = 0L;
                     }
                 }
             }
         }
     }
 
-    return pPrevCntntFrm;
+    return pPrevContentFrm;
 }
 
 SwFrm *SwFrm::_FindPrev()
@@ -1051,19 +1051,19 @@ SwFrm *SwFrm::_FindPrev()
 
     if ( IsTabFrm() )
     {
-        //The first Cntnt of the table gets picked up and his predecessor is
+        //The first Content of the table gets picked up and his predecessor is
         //returned. To be able to deactivate the special case for tables
         //(see below) bIgnoreTab will be set.
         if ( static_cast<SwTabFrm*>(this)->IsFollow() )
             return static_cast<SwTabFrm*>(this)->FindMaster();
         else
-            pThis = static_cast<SwTabFrm*>(this)->ContainsCntnt();
+            pThis = static_cast<SwTabFrm*>(this)->ContainsContent();
         bIgnoreTab = true;
     }
 
-    if ( pThis && pThis->IsCntntFrm() )
+    if ( pThis && pThis->IsContentFrm() )
     {
-        SwCntntFrm *pPrvCnt = static_cast<SwCntntFrm*>(pThis)->GetPrevCntntFrm();
+        SwContentFrm *pPrvCnt = static_cast<SwContentFrm*>(pThis)->GetPrevContentFrm();
         if( !pPrvCnt )
             return 0;
         if ( !bIgnoreTab && pThis->IsInTab() )
@@ -1071,7 +1071,7 @@ SwFrm *SwFrm::_FindPrev()
             SwLayoutFrm *pUp = pThis->GetUpper();
             while (pUp && !pUp->IsCellFrm())
                 pUp = pUp->GetUpper();
-            SAL_WARN_IF(!pUp, "sw.core", "Cntnt in table but not in cell.");
+            SAL_WARN_IF(!pUp, "sw.core", "Content in table but not in cell.");
             if (pUp && pUp->IsAnLower(pPrvCnt))
                 return pPrvCnt;
         }
@@ -1079,19 +1079,19 @@ SwFrm *SwFrm::_FindPrev()
         {
             SwFrm* pRet;
             const bool bBody = pThis->IsInDocBody();
-            const bool bFtn  = !bBody && pThis->IsInFtn();
-            if ( bBody || bFtn )
+            const bool bFootnote  = !bBody && pThis->IsInFootnote();
+            if ( bBody || bFootnote )
             {
                 while ( pPrvCnt )
                 {
                     if ( (bBody && pPrvCnt->IsInDocBody()) ||
-                            (bFtn   && pPrvCnt->IsInFtn()) )
+                            (bFootnote   && pPrvCnt->IsInFootnote()) )
                     {
                         pRet = pPrvCnt->IsInTab() ? pPrvCnt->FindTabFrm()
                                                   : (SwFrm*)pPrvCnt;
                         return pRet;
                     }
-                    pPrvCnt = pPrvCnt->GetPrevCntntFrm();
+                    pPrvCnt = pPrvCnt->GetPrevContentFrm();
                 }
             }
             else if ( pThis->IsInFly() )
@@ -1121,7 +1121,7 @@ SwFrm *SwFrm::_FindPrev()
     return 0;
 }
 
-void SwFrm::ImplInvalidateNextPos( bool bNoFtn )
+void SwFrm::ImplInvalidateNextPos( bool bNoFootnote )
 {
     SwFrm *pFrm;
     if ( 0 != (pFrm = _FindNext()) )
@@ -1135,8 +1135,8 @@ void SwFrm::ImplInvalidateNextPos( bool bNoFtn )
                     SwFrm* pTmp = static_cast<SwSectionFrm*>(pFrm)->ContainsAny();
                     if( pTmp )
                         pTmp->InvalidatePos();
-                    else if( !bNoFtn )
-                        static_cast<SwSectionFrm*>(pFrm)->InvalidateFtnPos();
+                    else if( !bNoFootnote )
+                        static_cast<SwSectionFrm*>(pFrm)->InvalidateFootnotePos();
                     if( !IsInSct() || FindSctFrm()->GetFollow() != pFrm )
                         pFrm->InvalidatePos();
                     return;
@@ -1168,7 +1168,7 @@ void SwFrm::ImplInvalidateNextPos( bool bNoFtn )
 
     OD 09.01.2004 #i11859#
 
-    FME 2004-04-19 #i27145# Moved function from SwTxtFrm to SwFrm
+    FME 2004-04-19 #i27145# Moved function from SwTextFrm to SwFrm
 */
 void SwFrm::InvalidateNextPrtArea()
 {
@@ -1179,8 +1179,8 @@ void SwFrm::InvalidateNextPrtArea()
         while ( pNextFrm &&
                 ( ( pNextFrm->IsSctFrm() &&
                     !static_cast<SwSectionFrm*>(pNextFrm)->GetSection() ) ||
-                  ( pNextFrm->IsTxtFrm() &&
-                    static_cast<SwTxtFrm*>(pNextFrm)->IsHiddenNow() ) ) )
+                  ( pNextFrm->IsTextFrm() &&
+                    static_cast<SwTextFrm*>(pNextFrm)->IsHiddenNow() ) ) )
         {
             pNextFrm = pNextFrm->FindNext();
         }
@@ -1201,11 +1201,11 @@ void SwFrm::InvalidateNextPrtArea()
             }
 
             // Invalidate printing area of first content in found section.
-            SwFrm* pFstCntntOfSctFrm =
+            SwFrm* pFstContentOfSctFrm =
                     static_cast<SwSectionFrm*>(pNextFrm)->ContainsAny();
-            if ( pFstCntntOfSctFrm )
+            if ( pFstContentOfSctFrm )
             {
-                pFstCntntOfSctFrm->InvalidatePrt();
+                pFstContentOfSctFrm->InvalidatePrt();
             }
         }
         else
@@ -1258,10 +1258,10 @@ bool SwFrm::IsMoveable( const SwLayoutFrm* _pLayoutFrm ) const
         }
         else if ( _pLayoutFrm->IsInFly() ||
                   _pLayoutFrm->IsInDocBody() ||
-                  _pLayoutFrm->IsInFtn() )
+                  _pLayoutFrm->IsInFootnote() )
         {
             if ( _pLayoutFrm->IsInTab() && !IsTabFrm() &&
-                 ( !IsCntntFrm() || !const_cast<SwFrm*>(this)->GetNextCellLeaf( MAKEPAGE_NONE ) ) )
+                 ( !IsContentFrm() || !const_cast<SwFrm*>(this)->GetNextCellLeaf( MAKEPAGE_NONE ) ) )
             {
                 bRetVal = false;
             }
@@ -1308,15 +1308,15 @@ void SwFrm::SetInfFlags()
     if ( !IsFlyFrm() && !GetUpper() ) //not yet pasted, no information available
         return;
 
-    mbInfInvalid = mbInfBody = mbInfTab = mbInfFly = mbInfFtn = mbInfSct = false;
+    mbInfInvalid = mbInfBody = mbInfTab = mbInfFly = mbInfFootnote = mbInfSct = false;
 
     SwFrm *pFrm = this;
-    if( IsFtnContFrm() )
-        mbInfFtn = true;
+    if( IsFootnoteContFrm() )
+        mbInfFootnote = true;
     do
     {
         // mbInfBody is only set in the page body, but not in the column body
-        if ( pFrm->IsBodyFrm() && !mbInfFtn && pFrm->GetUpper()
+        if ( pFrm->IsBodyFrm() && !mbInfFootnote && pFrm->GetUpper()
              && pFrm->GetUpper()->IsPageFrm() )
             mbInfBody = true;
         else if ( pFrm->IsTabFrm() || pFrm->IsCellFrm() )
@@ -1327,8 +1327,8 @@ void SwFrm::SetInfFlags()
             mbInfFly = true;
         else if ( pFrm->IsSctFrm() )
             mbInfSct = true;
-        else if ( pFrm->IsFtnFrm() )
-            mbInfFtn = true;
+        else if ( pFrm->IsFootnoteFrm() )
+            mbInfFootnote = true;
 
         pFrm = pFrm->GetUpper();
 
@@ -1600,7 +1600,7 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren
                                        GetTabBox()->FindStartOfRowSpan( *pTable, nMax ) :
                                        GetTabBox()->FindEndOfRowSpan( *pTable, nMax );
 
-        SwIterator<SwCellFrm,SwFmt> aIter( *rMasterBox.GetFrmFmt() );
+        SwIterator<SwCellFrm,SwFormat> aIter( *rMasterBox.GetFrameFormat() );
 
         for ( SwCellFrm* pMasterCell = aIter.First(); pMasterCell; pMasterCell = aIter.Next() )
         {
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 4af6708d16dc..41cac22cbd5f 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -117,7 +117,7 @@ bool SwFlowFrm::IsKeepFwdMoveAllowed()
     // the 'keep' attribute set, and the first of the chain's
     // IsFwdMoveAllowed returns false, then we're not allowed to move.
     SwFrm *pFrm = &m_rThis;
-    if ( !pFrm->IsInFtn() )
+    if ( !pFrm->IsInFootnote() )
         do
         {   if ( pFrm->GetAttrSet()->GetKeep().GetValue() )
                 pFrm = pFrm->GetIndPrev();
@@ -139,7 +139,7 @@ void SwFlowFrm::CheckKeep()
     SwFrm *pPre = m_rThis.GetIndPrev();
     if( pPre->IsSctFrm() )
     {
-        SwFrm *pLast = static_cast<SwSectionFrm*>(pPre)->FindLastCntnt();
+        SwFrm *pLast = static_cast<SwSectionFrm*>(pPre)->FindLastContent();
         if( pLast && pLast->FindSctFrm() == pPre )
             pPre = pLast;
         else
@@ -152,7 +152,7 @@ void SwFlowFrm::CheckKeep()
     {
         if( pTmp->IsSctFrm() )
         {
-            SwFrm *pLast = static_cast<SwSectionFrm*>(pTmp)->FindLastCntnt();
+            SwFrm *pLast = static_cast<SwSectionFrm*>(pTmp)->FindLastContent();
             if( pLast && pLast->FindSctFrm() == pTmp )
                 pTmp = pLast;
             else
@@ -173,7 +173,7 @@ bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep
     //    if there are any break after attributes set at rAttrs
     //    or break before attributes set for the next content (or next table)
     bool bKeep = bCheckIfLastRowShouldKeep ||
-                 (  !m_rThis.IsInFtn() &&
+                 (  !m_rThis.IsInFootnote() &&
                     ( !m_rThis.IsInTab() || m_rThis.IsTabFrm() ) &&
                     rAttrs.GetKeep().GetValue() );
 
@@ -228,7 +228,7 @@ bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep
                     {
                         SwTabFrm* pTab = pNxt->FindTabFrm();
                         if ( ! m_rThis.IsInTab() || m_rThis.FindTabFrm() != pTab )
-                            pSet = &pTab->GetFmt()->GetAttrSet();
+                            pSet = &pTab->GetFormat()->GetAttrSet();
                     }
 
                     if ( ! pSet )
@@ -295,10 +295,10 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRe
             // #i28701# - consider changed type of
             // <SwSortedObjs> entries.
             SwAnchoredObject* pObj = rObjs[i];
-            const SwFrmFmt& rFmt = pObj->GetFrmFmt();
+            const SwFrameFormat& rFormat = pObj->GetFrameFormat();
             const SwRect aRect( pObj->GetObjRect() );
             if ( aRect.IsOver( rRect ) &&
-                 rFmt.GetSurround().GetSurround() != SURROUND_THROUGHT )
+                 rFormat.GetSurround().GetSurround() != SURROUND_THROUGHT )
             {
                 if( m_rThis.IsLayoutFrm() && //Fly Lower of This?
                     Is_Lower_Of( &m_rThis, pObj->GetDrawObj() ) )
@@ -321,23 +321,23 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRe
                 // flow, because then I wouldn't evade it.
                 if ( ::IsFrmInSameKontext( pAnchor, &m_rThis ) )
                 {
-                    if ( rFmt.GetAnchor().GetAnchorId() == FLY_AT_PARA )
+                    if ( rFormat.GetAnchor().GetAnchorId() == FLY_AT_PARA )
                     {
                         // The index of the other one can be retrieved using the anchor attribute.
-                        sal_uLong nTmpIndex = rFmt.GetAnchor().GetCntntAnchor()->nNode.GetIndex();
+                        sal_uLong nTmpIndex = rFormat.GetAnchor().GetContentAnchor()->nNode.GetIndex();
                         // Now we're going to check whether the current paragraph before
                         // the anchor of the displacing object sits in the text. If this
                         // is the case, we don't try to evade it.
-                        // The index is being determined via SwFmtAnchor, because it's
+                        // The index is being determined via SwFormatAnchor, because it's
                         // getting quite expensive otherwise.
                         if( ULONG_MAX == nIndex )
                         {
                             const SwNode *pNode;
-                            if ( m_rThis.IsCntntFrm() )
-                                pNode = static_cast<SwCntntFrm&>(m_rThis).GetNode();
+                            if ( m_rThis.IsContentFrm() )
+                                pNode = static_cast<SwContentFrm&>(m_rThis).GetNode();
                             else if( m_rThis.IsSctFrm() )
-                                pNode = static_cast<SwSectionFmt*>(static_cast<SwSectionFrm&>(m_rThis).
-                                        GetFmt())->GetSectionNode();
+                                pNode = static_cast<SwSectionFormat*>(static_cast<SwSectionFrm&>(m_rThis).
+                                        GetFormat())->GetSectionNode();
                             else
                             {
                                 OSL_ENSURE( m_rThis.IsTabFrm(), "new FowFrm?" );
@@ -369,12 +369,12 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart )
     // as appropriate.
 
     SwLayoutFrm *pLay = pStart->GetUpper();
-    if ( pLay->IsInFtn() )
-        pLay = pLay->FindFtnFrm();
+    if ( pLay->IsInFootnote() )
+        pLay = pLay->FindFootnoteFrm();
 
     // #i58846#
     // <pPrepare( PREP_QUOVADIS )> only for frames in footnotes
-    if( pStart->IsInFtn() )
+    if( pStart->IsInFootnote() )
     {
         SwFrm* pTmp = pStart->GetIndPrev();
         if( pTmp )
@@ -391,35 +391,35 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart )
         pStart->mpPrev = 0;
     }
 
-    if ( pLay->IsFtnFrm() )
+    if ( pLay->IsFootnoteFrm() )
     {
         if ( !pLay->Lower() && !pLay->IsColLocked() &&
-             !static_cast<SwFtnFrm*>(pLay)->IsBackMoveLocked() )
+             !static_cast<SwFootnoteFrm*>(pLay)->IsBackMoveLocked() )
         {
             pLay->Cut();
             SwFrm::DestroyFrm(pLay);
         }
         else
         {
-            bool bUnlock = !static_cast<SwFtnFrm*>(pLay)->IsBackMoveLocked();
-            static_cast<SwFtnFrm*>(pLay)->LockBackMove();
+            bool bUnlock = !static_cast<SwFootnoteFrm*>(pLay)->IsBackMoveLocked();
+            static_cast<SwFootnoteFrm*>(pLay)->LockBackMove();
             pLay->InvalidateSize();
             pLay->Calc();
-            SwCntntFrm *pCnt = pLay->ContainsCntnt();
+            SwContentFrm *pCnt = pLay->ContainsContent();
             while ( pCnt && pLay->IsAnLower( pCnt ) )
             {
                 // It's possible for the CntFrm to be locked, and we don't want
                 // to end up in an endless page migration, so we're not even
                 // going to call Calc!
-                OSL_ENSURE( pCnt->IsTxtFrm(), "The Graphic has landed." );
-                if ( static_cast<SwTxtFrm*>(pCnt)->IsLocked() ||
-                     static_cast<SwTxtFrm*>(pCnt)->GetFollow() == pStart )
+                OSL_ENSURE( pCnt->IsTextFrm(), "The Graphic has landed." );
+                if ( static_cast<SwTextFrm*>(pCnt)->IsLocked() ||
+                     static_cast<SwTextFrm*>(pCnt)->GetFollow() == pStart )
                     break;
                 pCnt->Calc();
-                pCnt = pCnt->GetNextCntntFrm();
+                pCnt = pCnt->GetNextContentFrm();
             }
             if( bUnlock )
-                static_cast<SwFtnFrm*>(pLay)->UnlockBackMove();
+                static_cast<SwFootnoteFrm*>(pLay)->UnlockBackMove();
         }
         pLay = 0;
     }
@@ -497,12 +497,12 @@ bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
         pFloat->_InvalidateAll();
         pFloat->CheckDirChange();
 
-        // I'm a friend of the TxtFrm and thus am allowed to do many things.
+        // I'm a friend of the TextFrm and thus am allowed to do many things.
         // The CacheIdx idea seems to be a bit risky!
-        if ( pFloat->IsTxtFrm() )
+        if ( pFloat->IsTextFrm() )
         {
-            if ( static_cast<SwTxtFrm*>(pFloat)->GetCacheIdx() != USHRT_MAX )
-                static_cast<SwTxtFrm*>(pFloat)->Init();    // I'm his friend.
+            if ( static_cast<SwTextFrm*>(pFloat)->GetCacheIdx() != USHRT_MAX )
+                static_cast<SwTextFrm*>(pFloat)->Init();    // I'm his friend.
         }
         else
             bRet = true;
@@ -521,7 +521,7 @@ bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
     {
         pLst->mpNext = pSibling;
         pSibling->mpPrev = pLst;
-        if( pSibling->IsInFtn() )
+        if( pSibling->IsInFootnote() )
         {
             if( pSibling->IsSctFrm() )
                 pSibling = static_cast<SwSectionFrm*>(pSibling)->ContainsAny();
@@ -536,8 +536,8 @@ bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
         pParent->Grow( nGrowVal );
     }
 
-    if ( pParent->IsFtnFrm() )
-        static_cast<SwFtnFrm*>(pParent)->InvalidateNxtFtnCnts( pParent->FindPageFrm() );
+    if ( pParent->IsFootnoteFrm() )
+        static_cast<SwFootnoteFrm*>(pParent)->InvalidateNxtFootnoteCnts( pParent->FindPageFrm() );
     return bRet;
 }
 
@@ -593,7 +593,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
     // #130797# - correct fix #126020#
     if ( pOldParent && !pOldParent->Lower() &&
          ( pOldParent->IsInSct() &&
-           !(pSct = pOldParent->FindSctFrm())->ContainsCntnt() &&
+           !(pSct = pOldParent->FindSctFrm())->ContainsContent() &&
            !pSct->ContainsAny( true ) ) )
     {
             pSct->DelEmpty( false );
@@ -606,11 +606,11 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
     else if( m_rThis.GetUpper()->IsSctFrm() )
     {
         SwSectionFrm* pTmpSct = static_cast<SwSectionFrm*>(m_rThis.GetUpper());
-        bool bOld = pTmpSct->IsCntntLocked();
-        pTmpSct->SetCntntLock( true );
+        bool bOld = pTmpSct->IsContentLocked();
+        pTmpSct->SetContentLock( true );
         pTmpSct->Calc();
         if( !bOld )
-            pTmpSct->SetCntntLock( false );
+            pTmpSct->SetContentLock( false );
     }
     SwPageFrm *pPage = m_rThis.FindPageFrm();
 
@@ -619,12 +619,12 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
         m_rThis.InvalidatePage( pPage );
         if ( m_rThis.IsLayoutFrm() )
         {
-            SwCntntFrm *pCnt = static_cast<SwLayoutFrm*>(&m_rThis)->ContainsCntnt();
+            SwContentFrm *pCnt = static_cast<SwLayoutFrm*>(&m_rThis)->ContainsContent();
             if ( pCnt )
                 pCnt->InvalidatePage( pPage );
         }
         else if ( pSh && pSh->GetDoc()->GetLineNumberInfo().IsRestartEachPage()
-                  && pPage->FindFirstBodyCntnt() == &m_rThis )
+                  && pPage->FindFirstBodyContent() == &m_rThis )
         {
             m_rThis._InvalidateLineNum();
         }
@@ -644,16 +644,16 @@ bool SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const
     return false;
 }
 
-SwTxtFrm* SwCntntFrm::FindMaster() const
+SwTextFrm* SwContentFrm::FindMaster() const
 {
-    OSL_ENSURE( IsFollow(), "SwCntntFrm::FindMaster(): !IsFollow" );
+    OSL_ENSURE( IsFollow(), "SwContentFrm::FindMaster(): !IsFollow" );
 
-    const SwCntntFrm* pPrec = GetPrecede();
+    const SwContentFrm* pPrec = GetPrecede();
 
     if ( pPrec && pPrec->HasFollow() && pPrec->GetFollow() == this )
     {
-        OSL_ENSURE( pPrec->IsTxtFrm(), "NoTxtFrm with follow found" );
-        return const_cast<SwTxtFrm*>(static_cast< const SwTxtFrm* >(pPrec));
+        OSL_ENSURE( pPrec->IsTextFrm(), "NoTextFrm with follow found" );
+        return const_cast<SwTextFrm*>(static_cast< const SwTextFrm* >(pPrec));
     }
 
     OSL_FAIL( "Follow ist lost in Space." );
@@ -664,7 +664,7 @@ SwSectionFrm* SwSectionFrm::FindMaster() const
 {
     OSL_ENSURE( IsFollow(), "SwSectionFrm::FindMaster(): !IsFollow" );
 
-    SwIterator<SwSectionFrm,SwFmt> aIter( *pSection->GetFmt() );
+    SwIterator<SwSectionFrm,SwFormat> aIter( *pSection->GetFormat() );
     SwSectionFrm* pSect = aIter.First();
     while ( pSect )
     {
@@ -681,7 +681,7 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
 {
     OSL_ENSURE( IsFollow(), "SwTabFrm::FindMaster(): !IsFollow" );
 
-    SwIterator<SwTabFrm,SwFmt> aIter( *GetTable()->GetFrmFmt() );
+    SwIterator<SwTabFrm,SwFormat> aIter( *GetTable()->GetFrameFormat() );
     SwTabFrm* pTab = aIter.First();
     while ( pTab )
     {
@@ -717,13 +717,13 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
 
 /**
  * Returns the next/previous Layout leaf that's NOT below this (or even is this itself).
- * Also, that leaf must be in the same text flow as the pAnch origin frame (Body, Ftn)
+ * Also, that leaf must be in the same text flow as the pAnch origin frame (Body, Footnote)
  */
 const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, bool bFwd,
                                    const SwFrm *pAnch ) const
 {
     // No flow, no joy...
-    if ( !(IsInDocBody() || IsInFtn() || IsInFly()) )
+    if ( !(IsInDocBody() || IsInFootnote() || IsInFly()) )
         return 0;
 
     const SwFrm *pLeaf = this;
@@ -736,7 +736,7 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, bool bFwd,
             (!IsLayoutFrm() || !static_cast<const SwLayoutFrm*>(this)->IsAnLower( pLeaf )))
         {
             if ( pAnch->IsInDocBody() == pLeaf->IsInDocBody() &&
-                 pAnch->IsInFtn()     == pLeaf->IsInFtn() )
+                 pAnch->IsInFootnote()     == pLeaf->IsInFootnote() )
             {
                 bFound = true;
             }
@@ -748,8 +748,8 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, bool bFwd,
 
 SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, bool bFwd )
 {
-    if ( IsInFtn() )
-        return bFwd ? GetNextFtnLeaf( eMakePage ) : GetPrevFtnLeaf( eMakePage );
+    if ( IsInFootnote() )
+        return bFwd ? GetNextFootnoteLeaf( eMakePage ) : GetPrevFootnoteLeaf( eMakePage );
 
     // #i53323#
     // A frame could be inside a table AND inside a section.
@@ -799,7 +799,7 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
     // is wrong, I can happily exchange it.
     // If the page however thinks that it's pagedesc is correct,
     // this doesn't mean it's useful to me:
-    // If the first BodyCntnt asks for a PageDesc or a PageBreak,
+    // If the first BodyContent asks for a PageDesc or a PageBreak,
     // I'll have to insert a new page - except the desired page is
     // the correct one.
     // If I inserted a new page, the problems only get started:
@@ -810,7 +810,7 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
     // Way out of the situation: Try to preliminarily insert a
     // new page once (empty pages are already inserted by InsertPage()
     // if required)
-    const SwFmtPageDesc &rFmtDesc = GetAttrSet()->GetPageDesc();
+    const SwFormatPageDesc &rFormatDesc = GetAttrSet()->GetPageDesc();
 
     //My Pagedesc doesn't count if I'm a follow!
     SwPageDesc *pDesc = 0;
@@ -818,19 +818,19 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
     SwFlowFrm *pFlow = SwFlowFrm::CastFlowFrm( this );
     if ( !pFlow || !pFlow->IsFollow() )
     {
-        pDesc = const_cast<SwPageDesc*>(rFmtDesc.GetPageDesc());
+        pDesc = const_cast<SwPageDesc*>(rFormatDesc.GetPageDesc());
         if( pDesc )
         {
-            if( !pDesc->GetRightFmt() )
+            if( !pDesc->GetRightFormat() )
                 nTmp = 2;
-            else if( !pDesc->GetLeftFmt() )
+            else if( !pDesc->GetLeftFormat() )
                 nTmp = 1;
-            else if( rFmtDesc.GetNumOffset() )
-                nTmp = rFmtDesc.GetNumOffset().get();
+            else if( rFormatDesc.GetNumOffset() )
+                nTmp = rFormatDesc.GetNumOffset().get();
         }
     }
 
-    // Does the Cntnt bring a Pagedesc or do we need the
+    // Does the Content bring a Pagedesc or do we need the
     // virtual page number of the new layout leaf?
     // PageDesc isn't allowed with Follows
     const bool bOdd = nTmp ? (nTmp % 2) !=0 : pNew->OnRightPage();
@@ -839,7 +839,7 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
 
     bool bFirst = pNew->OnFirstPage();
 
-    const SwFlowFrm *pNewFlow = pNew->FindFirstBodyCntnt();
+    const SwFlowFrm *pNewFlow = pNew->FindFirstBodyContent();
     // Did we find ourselves?
     if( pNewFlow == pFlow )
         pNewFlow = NULL;
@@ -849,15 +849,15 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
             ? pNewFlow->GetFrm().GetAttrSet()->GetPageDesc().GetPageDesc() : 0;
 
     return (pNew->GetPageDesc() != pDesc)   //  own desc ?
-        || (pNew->GetFmt() !=
-              (bOdd ? pDesc->GetRightFmt(bFirst) : pDesc->GetLeftFmt(bFirst)))
+        || (pNew->GetFormat() !=
+              (bOdd ? pDesc->GetRightFormat(bFirst) : pDesc->GetLeftFormat(bFirst)))
         || (pNewDesc && pNewDesc == pDesc);
 }
 
 /// Returns the next layout leaf in which we can move the frame.
 SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
 {
-    OSL_ENSURE( !IsInFtn(), "GetNextLeaf(), don't call me for Ftn." );
+    OSL_ENSURE( !IsInFootnote(), "GetNextLeaf(), don't call me for Footnote." );
     OSL_ENSURE( !IsInSct(), "GetNextLeaf(), don't call me for Sections." );
 
     const bool bBody = IsInDocBody();  // If I'm coming from the DocBody,
@@ -873,7 +873,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
     SwLayoutFrm *pLayLeaf = 0;
     if ( IsTabFrm() )
     {
-        SwCntntFrm* pTmp = static_cast<SwTabFrm*>(this)->FindLastCntnt();
+        SwContentFrm* pTmp = static_cast<SwTabFrm*>(this)->FindLastContent();
         if ( pTmp )
             pLayLeaf = pTmp->GetUpper();
     }
@@ -893,7 +893,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
             // me as well.
             // It only needs to be of the same kind like my starting point
             // (DocBody or Footnote respectively)
-            if ( pLayLeaf->FindPageFrm()->IsFtnPage() )
+            if ( pLayLeaf->FindPageFrm()->IsFootnotePage() )
             {   // If I ended up at the end note pages, we're done.
                 pLayLeaf = 0;
                 continue;
@@ -926,17 +926,17 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
             {
                 if( WrongPageDesc( pNew ) )
                 {
-                    SwFtnContFrm *pCont = pNew->FindFtnCont();
+                    SwFootnoteContFrm *pCont = pNew->FindFootnoteCont();
                     if( pCont )
                     {
                         // If the reference of the first footnote of this page
                         // lies before the page, we'd rather not insert a new page.
                         // (Bug #55620#)
-                        SwFtnFrm *pFtn = static_cast<SwFtnFrm*>(pCont->Lower());
-                        if( pFtn && pFtn->GetRef() )
+                        SwFootnoteFrm *pFootnote = static_cast<SwFootnoteFrm*>(pCont->Lower());
+                        if( pFootnote && pFootnote->GetRef() )
                         {
                             const sal_uInt16 nRefNum = pNew->GetPhyPageNum();
-                            if( pFtn->GetRef()->GetPhyPageNum() < nRefNum )
+                            if( pFootnote->GetRef()->GetPhyPageNum() < nRefNum )
                                 break;
                         }
                     }
@@ -989,7 +989,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
 /// Returns the previous layout leaf where we can move the frame.
 SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
 {
-    OSL_ENSURE( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." );
+    OSL_ENSURE( !IsInFootnote(), "GetPrevLeaf(), don't call me for Footnote." );
 
     const bool bBody = IsInDocBody();  // If I'm coming from the DocBody,
                                            // I want to end up in the body.
@@ -1013,7 +1013,7 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
                 SwFlowFrm::SetMoveBwdJump( true );
         }
         else if ( bFly )
-            break;  //Cntnts in Flys should accept any layout leaf.
+            break;  //Contents in Flys should accept any layout leaf.
         else
             pLayLeaf = pLayLeaf->GetPrevLayoutLeaf();
     }
@@ -1060,9 +1060,9 @@ bool SwFlowFrm::IsPrevObjMove() const
             // OD 2004-01-20 #110582# - do not consider hidden objects
             // #i26945# - do not consider object, which
             // doesn't follow the text flow.
-            if ( pObj->GetFrmFmt().GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId(
+            if ( pObj->GetFrameFormat().GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId(
                                             pObj->GetDrawObj()->GetLayer() ) &&
-                 pObj->GetFrmFmt().GetFollowTextFlow().GetValue() )
+                 pObj->GetFrameFormat().GetFollowTextFlow().GetValue() )
             {
                 const SwLayoutFrm* pVertPosOrientFrm = pObj->GetVertPosOrientFrm();
                 if ( pVertPosOrientFrm &&
@@ -1084,12 +1084,12 @@ bool SwFlowFrm::IsPrevObjMove() const
 |*      If bAct is set to true, this function returns true if
 |*      there's a PageBreak.
 |*      Of course, we don't evaluate the hard page break for follows.
-|*      The page break is in it's own FrmFmt (BEFORE) or in the FrmFmt of the
+|*      The page break is in it's own FrameFormat (BEFORE) or in the FrameFormat of the
 |*      predecessor (AFTER). If there's no predecessor on the page, we don't
 |*      need to think further.
 |*      Also, a page break (or the need for one) is also present if
-|*      the FrmFmt contains a PageDesc.
-|*      The implementation works only on CntntFrms! - the definition
+|*      the FrameFormat contains a PageDesc.
+|*      The implementation works only on ContentFrms! - the definition
 |*      of the predecessor is not clear for LayoutFrms.
 |*/
 bool SwFlowFrm::IsPageBreak( bool bAct ) const
@@ -1105,7 +1105,7 @@ bool SwFlowFrm::IsPageBreak( bool bAct ) const
         // Determine predecessor
         const SwFrm *pPrev = m_rThis.FindPrev();
         while ( pPrev && ( !pPrev->IsInDocBody() ||
-                ( pPrev->IsTxtFrm() && static_cast<const SwTxtFrm*>(pPrev)->IsHiddenNow() ) ) )
+                ( pPrev->IsTextFrm() && static_cast<const SwTextFrm*>(pPrev)->IsHiddenNow() ) ) )
             pPrev = pPrev->FindPrev();
 
         if ( pPrev )
@@ -1143,10 +1143,10 @@ bool SwFlowFrm::IsPageBreak( bool bAct ) const
 |*      If bAct is set to true, we return true if there's a ColBreak.
 |*      Of course, we don't evaluate the hard column break for follows.
 |*
-|*      The column break is in it's own FrmFmt (BEFORE) or in the FrmFmt of the
+|*      The column break is in it's own FrameFormat (BEFORE) or in the FrameFormat of the
 |*      predecessor (AFTER). If there's no predecessor in the column, we don't
 |*      need to think further.
-|*      The implementation works only on CntntFrms! - the definition
+|*      The implementation works only on ContentFrms! - the definition
 |*      of the predecessor is not clear for LayoutFrms.
 |*/
 bool SwFlowFrm::IsColBreak( bool bAct ) const
@@ -1159,7 +1159,7 @@ bool SwFlowFrm::IsColBreak( bool bAct ) const
             // Determine predecessor
             const SwFrm *pPrev = m_rThis.FindPrev();
             while( pPrev && ( ( !pPrev->IsInDocBody() && !m_rThis.IsInFly() ) ||
-                   ( pPrev->IsTxtFrm() && static_cast<const SwTxtFrm*>(pPrev)->IsHiddenNow() ) ) )
+                   ( pPrev->IsTextFrm() && static_cast<const SwTextFrm*>(pPrev)->IsHiddenNow() ) ) )
                     pPrev = pPrev->FindPrev();
 
             if ( pPrev )
@@ -1199,7 +1199,7 @@ bool SwFlowFrm::HasParaSpaceAtPages( bool bSct ) const
         {
             if( pTmp->IsCellFrm() || pTmp->IsFlyFrm() ||
                 pTmp->IsFooterFrm() || pTmp->IsHeaderFrm() ||
-                ( pTmp->IsFtnFrm() && !static_cast<const SwFtnFrm*>(pTmp)->GetMaster() ) )
+                ( pTmp->IsFootnoteFrm() && !static_cast<const SwFootnoteFrm*>(pTmp)->GetMaster() ) )
                 return true;
             if( pTmp->IsPageFrm() )
                 return !( pTmp->GetPrev() && !IsPageBreak(true) );
@@ -1240,8 +1240,8 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre
 
     // Skip hidden paragraphs and empty sections
     while ( pPrevFrm &&
-            ( ( pPrevFrm->IsTxtFrm() &&
-                static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() ) ||
+            ( ( pPrevFrm->IsTextFrm() &&
+                static_cast<const SwTextFrm*>(pPrevFrm)->IsHiddenNow() ) ||
               ( pPrevFrm->IsSctFrm() &&
                 !static_cast<const SwSectionFrm*>(pPrevFrm)->GetSection() ) ) )
     {
@@ -1251,20 +1251,20 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre
     // Special case: no direct previous frame is found but frame is in footnote
     // Search for a previous frame in previous footnote,
     // if frame isn't in a section, which is also in the footnote
-    if ( !pPrevFrm && m_rThis.IsInFtn() &&
+    if ( !pPrevFrm && m_rThis.IsInFootnote() &&
          ( m_rThis.IsSctFrm() ||
-           !m_rThis.IsInSct() || !m_rThis.FindSctFrm()->IsInFtn() ) )
+           !m_rThis.IsInSct() || !m_rThis.FindSctFrm()->IsInFootnote() ) )
     {
-        const SwFtnFrm* pPrevFtnFrm =
-                static_cast<const SwFtnFrm*>(m_rThis.FindFtnFrm()->GetPrev());
-        if ( pPrevFtnFrm )
+        const SwFootnoteFrm* pPrevFootnoteFrm =
+                static_cast<const SwFootnoteFrm*>(m_rThis.FindFootnoteFrm()->GetPrev());
+        if ( pPrevFootnoteFrm )
         {
-            pPrevFrm = pPrevFtnFrm->GetLastLower();
+            pPrevFrm = pPrevFootnoteFrm->GetLastLower();
 
             // Skip hidden paragraphs and empty sections
             while ( pPrevFrm &&
-                    ( ( pPrevFrm->IsTxtFrm() &&
-                        static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() ) ||
+                    ( ( pPrevFrm->IsTextFrm() &&
+                        static_cast<const SwTextFrm*>(pPrevFrm)->IsHiddenNow() ) ||
                       ( pPrevFrm->IsSctFrm() &&
                         !static_cast<const SwSectionFrm*>(pPrevFrm)->GetSection() ) ) )
             {
@@ -1278,7 +1278,7 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre
     {
         const SwSectionFrm* pPrevSectFrm =
                                     static_cast<const SwSectionFrm*>(pPrevFrm);
-        pPrevFrm = pPrevSectFrm->FindLastCntnt();
+        pPrevFrm = pPrevSectFrm->FindLastContent();
         // If the last content is in a table _inside_ the section,
         // take the table herself.
         // OD 2004-02-18 #106629# - correction:
@@ -1294,8 +1294,8 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre
         }
         // OD 2004-02-18 #106629# correction: skip hidden text frames
         while ( pPrevFrm &&
-                pPrevFrm->IsTxtFrm() &&
-                static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() )
+                pPrevFrm->IsTextFrm() &&
+                static_cast<const SwTextFrm*>(pPrevFrm)->IsHiddenNow() )
         {
             pPrevFrm = pPrevFrm->GetPrev();
         }
@@ -1307,19 +1307,19 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre
 /// Compare styles attached to these text frames.
 static bool lcl_IdenticalStyles(const SwFrm* pPrevFrm, const SwFrm* pFrm)
 {
-    SwTxtFmtColl *pPrevFmtColl = 0;
-    if (pPrevFrm && pPrevFrm->IsTxtFrm())
+    SwTextFormatColl *pPrevFormatColl = 0;
+    if (pPrevFrm && pPrevFrm->IsTextFrm())
     {
-        const SwTxtFrm *pTxtFrm = static_cast< const SwTxtFrm * >( pPrevFrm );
-        pPrevFmtColl = dynamic_cast<SwTxtFmtColl*>(pTxtFrm->GetTxtNode()->GetFmtColl());
+        const SwTextFrm *pTextFrm = static_cast< const SwTextFrm * >( pPrevFrm );
+        pPrevFormatColl = dynamic_cast<SwTextFormatColl*>(pTextFrm->GetTextNode()->GetFormatColl());
     }
 
     bool bIdenticalStyles = false;
-    if (pFrm && pFrm->IsTxtFrm())
+    if (pFrm && pFrm->IsTextFrm())
     {
-        const SwTxtFrm *pTxtFrm = static_cast< const SwTxtFrm * >( pFrm );
-        SwTxtFmtColl *pFmtColl = dynamic_cast<SwTxtFmtColl*>(pTxtFrm->GetTxtNode()->GetFmtColl());
-        bIdenticalStyles = pPrevFmtColl == pFmtColl;
+        const SwTextFrm *pTextFrm = static_cast< const SwTextFrm * >( pFrm );
+        SwTextFormatColl *pFormatColl = dynamic_cast<SwTextFormatColl*>(pTextFrm->GetTextNode()->GetFormatColl());
+        bIdenticalStyles = pPrevFormatColl == pFormatColl;
     }
     return bIdenticalStyles;
 }
@@ -1370,7 +1370,7 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
     SwTwips nUpper = 0;
     // OD 06.01.2004 #i11859#
     {
-        const IDocumentSettingAccess* pIDSA = m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess();
+        const IDocumentSettingAccess* pIDSA = m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess();
         const bool bUseFormerLineSpacing = pIDSA->get(DocumentSettingId::OLD_LINE_SPACING);
         if( pPrevFrm )
         {
@@ -1392,9 +1392,9 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
                 if ( bUseFormerLineSpacing )
                 {
                     // former consideration
-                    if ( pOwn->IsTxtFrm() )
+                    if ( pOwn->IsTextFrm() )
                     {
-                        nAdd = std::max( nAdd, static_cast<SwTxtFrm*>(pOwn)->GetLineSpace() );
+                        nAdd = std::max( nAdd, static_cast<SwTextFrm*>(pOwn)->GetLineSpace() );
                     }
                     nUpper += nAdd;
                 }
@@ -1405,7 +1405,7 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
                     //      text frame is considered for the upper spacing and
                     //      the line spacing values are add up instead of
                     //      building its maximum.
-                    if ( pOwn->IsTxtFrm() )
+                    if ( pOwn->IsTextFrm() )
                     {
                         // #i102458#
                         // Correction:
@@ -1416,11 +1416,11 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
                         // spacing is built.
                         if ( bPrevLineSpacingPorportional )
                         {
-                            nAdd += static_cast<SwTxtFrm*>(pOwn)->GetLineSpace( true );
+                            nAdd += static_cast<SwTextFrm*>(pOwn)->GetLineSpace( true );
                         }
                         else
                         {
-                            nAdd = std::max( nAdd, static_cast<SwTxtFrm*>(pOwn)->GetLineSpace( true ) );
+                            nAdd = std::max( nAdd, static_cast<SwTextFrm*>(pOwn)->GetLineSpace( true ) );
                         }
                     }
                     nUpper += nAdd;
@@ -1435,8 +1435,8 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
                 if ( bUseFormerLineSpacing )
                 {
                     // former consideration
-                    if ( pOwn->IsTxtFrm() )
-                        nUpper = std::max( nUpper, static_cast<SwTxtFrm*>(pOwn)->GetLineSpace() );
+                    if ( pOwn->IsTextFrm() )
+                        nUpper = std::max( nUpper, static_cast<SwTextFrm*>(pOwn)->GetLineSpace() );
                     if ( nPrevLineSpacing != 0 )
                     {
                         nUpper = std::max( nUpper, nPrevLineSpacing );
@@ -1451,7 +1451,7 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
                     //      the paragraph spacing instead of building the
                     //      maximum of the line spacings and the paragraph spacing.
                     SwTwips nAdd = nPrevLineSpacing;
-                    if ( pOwn->IsTxtFrm() )
+                    if ( pOwn->IsTextFrm() )
                     {
                         // #i102458#
                         // Correction:
@@ -1462,11 +1462,11 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
                         // spacing is built.
                         if ( bPrevLineSpacingPorportional )
                         {
-                            nAdd += static_cast<SwTxtFrm*>(pOwn)->GetLineSpace( true );
+                            nAdd += static_cast<SwTextFrm*>(pOwn)->GetLineSpace( true );
                         }
                         else
                         {
-                            nAdd = std::max( nAdd, static_cast<SwTxtFrm*>(pOwn)->GetLineSpace( true ) );
+                            nAdd = std::max( nAdd, static_cast<SwTextFrm*>(pOwn)->GetLineSpace( true ) );
                         }
                     }
                     nUpper += nAdd;
@@ -1482,14 +1482,14 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
 
     // OD 2004-02-26 #i25029# - pass previous frame <pPrevFrm>
     // to method <GetTopLine(..)>, if parameter <pPr> is set.
-    // Note: parameter <pPr> is set, if method is called from <SwTxtFrm::WouldFit(..)>
+    // Note: parameter <pPr> is set, if method is called from <SwTextFrm::WouldFit(..)>
     nUpper += pAttrs->GetTopLine( m_rThis, (pPr ? pPrevFrm : 0L) );
 
     // OD 2004-03-12 #i11860# - consider value of new parameter <_bConsiderGrid>
     // and use new method <GetUpperSpaceAmountConsideredForPageGrid(..)>
 
     //consider grid in square page mode
-    if ( _bConsiderGrid && m_rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode() )
+    if ( _bConsiderGrid && m_rThis.GetUpper()->GetFormat()->GetDoc()->IsSquaredPageMode() )
     {
         nUpper += _GetUpperSpaceAmountConsideredForPageGrid( nUpper );
     }
@@ -1580,7 +1580,7 @@ SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPrevFrm() const
         GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing, bDummy );
         if ( nPrevLowerSpace > 0 || nPrevLineSpacing > 0 )
         {
-            const IDocumentSettingAccess* pIDSA = m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess();
+            const IDocumentSettingAccess* pIDSA = m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess();
             if (  pIDSA->get(DocumentSettingId::PARA_SPACE_MAX) ||
                  !pIDSA->get(DocumentSettingId::OLD_LINE_SPACING) )
             {
@@ -1606,11 +1606,11 @@ SwTwips SwFlowFrm::GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() const
 {
     SwTwips nUpperSpaceAmountConsideredForPrevFrmAndPageGrid = 0;
 
-    if ( !m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::USE_FORMER_OBJECT_POS) )
+    if ( !m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::USE_FORMER_OBJECT_POS) )
     {
         nUpperSpaceAmountConsideredForPrevFrmAndPageGrid =
             _GetUpperSpaceAmountConsideredForPrevFrm() +
-            ( m_rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode()
+            ( m_rThis.GetUpper()->GetFormat()->GetDoc()->IsSquaredPageMode()
               ? _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0, 0, false ) )
               : 0 );
     }
@@ -1637,7 +1637,7 @@ SwTwips SwFlowFrm::CalcLowerSpace( const SwBorderAttrs* _pAttrs ) const
     if ( m_rThis.IsInSct() && m_rThis.GetUpper()->IsColBodyFrm() )
     {
         const SwSectionFrm* pSectFrm = m_rThis.FindSctFrm();
-        bCommonBorder = pSectFrm->GetFmt()->GetBalancedColumns().GetValue();
+        bCommonBorder = pSectFrm->GetFormat()->GetBalancedColumns().GetValue();
     }
     nLowerSpace = bCommonBorder ?
                   _pAttrs->GetBottomLine( m_rThis ) :
@@ -1669,13 +1669,13 @@ SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell(
 {
     SwTwips nAdditionalLowerSpace = 0;
 
-    if ( m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) )
+    if ( m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) )
     {
         const SwFrm* pFrm = &m_rThis;
         if ( pFrm->IsSctFrm() )
         {
             const SwSectionFrm* pSectFrm = static_cast<const SwSectionFrm*>(pFrm);
-            pFrm = pSectFrm->FindLastCntnt();
+            pFrm = pSectFrm->FindLastContent();
             if ( pFrm && pFrm->IsInTab() )
             {
                 const SwTabFrm* pTableFrm = pFrm->FindTabFrm();
@@ -1708,7 +1708,7 @@ bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, bool bKeep, bool )
     const SwFrm* pNxt = m_rThis.GetIndNext();
 
     if ( bKeep && //!bMovedBwd &&
-         ( !pNxt || ( pNxt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pNxt)->IsEmptyMaster() ) ) &&
+         ( !pNxt || ( pNxt->IsTextFrm() && static_cast<const SwTextFrm*>(pNxt)->IsEmptyMaster() ) ) &&
          ( 0 != (pNxt = m_rThis.FindNext()) ) && IsKeepFwdMoveAllowed() )
     {
         if( pNxt->IsSctFrm() )
@@ -1790,16 +1790,16 @@ bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, bool bKeep, bool )
 /// Return value tells us whether the Frm has changed the page.
 bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
 {
-//!!!!MoveFtnCntFwd might need to be updated as well.
-    SwFtnBossFrm *pOldBoss = m_rThis.FindFtnBossFrm();
-    if (m_rThis.IsInFtn())
+//!!!!MoveFootnoteCntFwd might need to be updated as well.
+    SwFootnoteBossFrm *pOldBoss = m_rThis.FindFootnoteBossFrm();
+    if (m_rThis.IsInFootnote())
     {
-        if (!m_rThis.IsCntntFrm())
+        if (!m_rThis.IsContentFrm())
         {
             SAL_WARN("sw.core", "Tables in footnotes are not truly supported");
             return false;
         }
-        return static_cast<SwCntntFrm&>(m_rThis).MoveFtnCntFwd( bMakePage, pOldBoss );
+        return static_cast<SwContentFrm&>(m_rThis).MoveFootnoteCntFwd( bMakePage, pOldBoss );
     }
 
     if( !IsFwdMoveAllowed() && !bMoveAlways )
@@ -1807,7 +1807,7 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
         bool bNoFwd = true;
         if( m_rThis.IsInSct() )
         {
-            SwFtnBossFrm* pBoss = m_rThis.FindFtnBossFrm();
+            SwFootnoteBossFrm* pBoss = m_rThis.FindFootnoteBossFrm();
             bNoFwd = !pBoss->IsInSct() || ( !pBoss->Lower()->GetNext() &&
                      !pBoss->GetPrev() );
         }
@@ -1844,7 +1844,7 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
         PROTOCOL_ENTER( &m_rThis, PROT_MOVE_FWD, 0, 0 );
         SwPageFrm *pOldPage = pOldBoss->FindPageFrm();
         // We move ourself and all the direct successors before the
-        // first CntntFrm below the new Upper.
+        // first ContentFrm below the new Upper.
 
         // If our NewUpper lies in a SectionFrm, we need to make sure
         // that it won't destroy itself in Calc.
@@ -1867,14 +1867,14 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
         else if ( !pNewUpper->IsCellFrm() || static_cast<SwLayoutFrm*>(pNewUpper)->Lower() )
             pNewUpper->Calc();
 
-        SwFtnBossFrm *pNewBoss = pNewUpper->FindFtnBossFrm();
+        SwFootnoteBossFrm *pNewBoss = pNewUpper->FindFootnoteBossFrm();
         bool bBossChg = pNewBoss != pOldBoss;
-        pNewBoss = pNewBoss->FindFtnBossFrm( true );
-        pOldBoss = pOldBoss->FindFtnBossFrm( true );
+        pNewBoss = pNewBoss->FindFootnoteBossFrm( true );
+        pOldBoss = pOldBoss->FindFootnoteBossFrm( true );
         SwPageFrm* pNewPage = pOldPage;
 
         // First, we move the footnotes.
-        bool bFtnMoved = false;
+        bool bFootnoteMoved = false;
 
         // #i26831#
         // If pSect has just been created, the printing area of pSect has
@@ -1893,16 +1893,16 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
             // Set deadline, so the footnotes don't think up
             // silly things...
             SWRECTFN( pOldBoss )
-            SwSaveFtnHeight aHeight( pOldBoss,
+            SwSaveFootnoteHeight aHeight( pOldBoss,
                 (pOldBoss->Frm().*fnRect->fnGetBottom)() );
-            SwCntntFrm* pStart = m_rThis.IsCntntFrm() ?
-                static_cast<SwCntntFrm*>(&m_rThis) : static_cast<SwLayoutFrm&>(m_rThis).ContainsCntnt();
+            SwContentFrm* pStart = m_rThis.IsContentFrm() ?
+                static_cast<SwContentFrm*>(&m_rThis) : static_cast<SwLayoutFrm&>(m_rThis).ContainsContent();
             OSL_ENSURE( pStart || ( m_rThis.IsTabFrm() && !static_cast<SwTabFrm&>(m_rThis).Lower() ),
                     "MoveFwd: Missing Content" );
-            SwLayoutFrm* pBody = pStart ? ( pStart->IsTxtFrm() ?
-                const_cast<SwBodyFrm *>(static_cast<SwTxtFrm*>(pStart)->FindBodyFrm()) : 0 ) : 0;
+            SwLayoutFrm* pBody = pStart ? ( pStart->IsTextFrm() ?
+                const_cast<SwBodyFrm *>(static_cast<SwTextFrm*>(pStart)->FindBodyFrm()) : 0 ) : 0;
             if( pBody )
-                bFtnMoved = pBody->MoveLowerFtns( pStart, pOldBoss, pNewBoss,
+                bFootnoteMoved = pBody->MoveLowerFootnotes( pStart, pOldBoss, pNewBoss,
                                                   false);
         }
         // It's possible when dealing with SectionFrms that we have been moved
@@ -1941,10 +1941,10 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
                 pSect->SimpleFormat();
             }
 
-            if ( bFtnMoved && !bSamePage )
+            if ( bFootnoteMoved && !bSamePage )
             {
-                pOldPage->UpdateFtnNum();
-                pNewPage->UpdateFtnNum();
+                pOldPage->UpdateFootnoteNum();
+                pNewPage->UpdateFootnoteNum();
             }
 
             if( bBossChg )
@@ -1953,8 +1953,8 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
                 if( !bSamePage )
                 {
                     SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
-                    if ( pSh && !pSh->Imp()->IsUpdateExpFlds() )
-                        pSh->GetDoc()->getIDocumentFieldsAccess().SetNewFldLst(true);  // Will be done by CalcLayout() later on!
+                    if ( pSh && !pSh->Imp()->IsUpdateExpFields() )
+                        pSh->GetDoc()->getIDocumentFieldsAccess().SetNewFieldLst(true);  // Will be done by CalcLayout() later on!
 
                     pNewPage->InvalidateSpelling();
                     pNewPage->InvalidateSmartTags();
@@ -1990,13 +1990,13 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
 {
     SwFlowFrm::SetMoveBwdJump( false );
 
-    SwFtnFrm* pFtn = m_rThis.FindFtnFrm();
-    if ( pFtn && pFtn->IsBackMoveLocked() )
+    SwFootnoteFrm* pFootnote = m_rThis.FindFootnoteFrm();
+    if ( pFootnote && pFootnote->IsBackMoveLocked() )
         return false;
 
     // #115759# - text frames, which are directly inside
     // tables aren't allowed to move backward.
-    if ( m_rThis.IsTxtFrm() && m_rThis.IsInTab() )
+    if ( m_rThis.IsTextFrm() && m_rThis.IsInTab() )
     {
         const SwLayoutFrm* pUpperFrm = m_rThis.GetUpper();
         while ( pUpperFrm )
@@ -2013,35 +2013,35 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
         }
     }
 
-    SwFtnBossFrm * pOldBoss = m_rThis.FindFtnBossFrm();
+    SwFootnoteBossFrm * pOldBoss = m_rThis.FindFootnoteBossFrm();
     SwPageFrm * const pOldPage = pOldBoss->FindPageFrm();
     SwLayoutFrm *pNewUpper = 0;
     bool bCheckPageDescs = false;
     bool bCheckPageDescOfNextPage = false;
 
-    if ( pFtn )
+    if ( pFootnote )
     {
         // If the footnote already sits on the same page/column as the reference,
         // we can't flow back. The breaks don't need to be checked for footnotes.
 
-        // #i37084# FindLastCntnt does not necessarily
+        // #i37084# FindLastContent does not necessarily
         // have to have a result != 0
         SwFrm* pRef = 0;
-        const bool bEndnote = pFtn->GetAttr()->GetFtn().IsEndNote();
-        if( bEndnote && pFtn->IsInSct() )
+        const bool bEndnote = pFootnote->GetAttr()->GetFootnote().IsEndNote();
+        if( bEndnote && pFootnote->IsInSct() )
         {
-            SwSectionFrm* pSect = pFtn->FindSctFrm();
+            SwSectionFrm* pSect = pFootnote->FindSctFrm();
             if( pSect->IsEndnAtEnd() )
-                pRef = pSect->FindLastCntnt( FINDMODE_LASTCNT );
+                pRef = pSect->FindLastContent( FINDMODE_LASTCNT );
         }
         if( !pRef )
-            pRef = pFtn->GetRef();
+            pRef = pFootnote->GetRef();
 
         OSL_ENSURE( pRef, "MoveBwd: Endnote for an empty section?" );
 
         if( !bEndnote )
-            pOldBoss = pOldBoss->FindFtnBossFrm( true );
-        SwFtnBossFrm *pRefBoss = pRef->FindFtnBossFrm( !bEndnote );
+            pOldBoss = pOldBoss->FindFootnoteBossFrm( true );
+        SwFootnoteBossFrm *pRefBoss = pRef->FindFootnoteBossFrm( !bEndnote );
         if ( pOldBoss != pRefBoss &&
              // OD 08.11.2002 #104840# - use <SwLayoutFrm::IsBefore(..)>
              ( !bEndnote ||
@@ -2101,7 +2101,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                              pNewNextUpper != m_rThis.GetUpper() &&
                              pNewNextUpper->GetType() == pNewUpper->GetType() &&
                              pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() &&
-                             pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() &&
+                             pNewNextUpper->IsInFootnote() == pNewUpper->IsInFootnote() &&
                              pNewNextUpper->IsInTab() == pNewUpper->IsInTab() &&
                              pNewNextUpper->IsInSct() == pNewUpper->IsInSct() &&
                              !m_rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
@@ -2118,14 +2118,14 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
     }
     else if ( IsColBreak( true ) )
     {
-        // If the previous column doesn't contain a CntntFrm, flowing back
+        // If the previous column doesn't contain a ContentFrm, flowing back
         // makes sense despite the ColumnBreak, as otherwise we'd get
         // an empty column.
         if( m_rThis.IsInSct() )
         {
             pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, false );
             if( pNewUpper && !SwFlowFrm::IsMoveBwdJump() &&
-                ( pNewUpper->ContainsCntnt() ||
+                ( pNewUpper->ContainsContent() ||
                   ( ( !pNewUpper->IsColBodyFrm() ||
                       !pNewUpper->GetUpper()->GetPrev() ) &&
                     !pNewUpper->FindSctFrm()->GetPrev() ) ) )
@@ -2151,7 +2151,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                 if ( pNewNextUpper &&
                      pNewNextUpper->GetType() == pNewUpper->GetType() &&
                      pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() &&
-                     pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() &&
+                     pNewNextUpper->IsInFootnote() == pNewUpper->IsInFootnote() &&
                      pNewNextUpper->IsInTab() == pNewUpper->IsInTab() &&
                      pNewNextUpper->IsInSct() == pNewUpper->IsInSct() &&
                      !m_rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
@@ -2180,7 +2180,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                     SwLayoutFrm* pColBody = pCol->IsColumnFrm() ?
                         const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(pCol)->Lower())) :
                         const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(pCol));
-                    if ( pColBody->ContainsCntnt() )
+                    if ( pColBody->ContainsContent() )
                     {
                         bGoOn = false; // We have content here! we accept this
                         // only if GetLeaf() has set the MoveBwdJump.
@@ -2206,7 +2206,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                                  pNewNextUpper != m_rThis.GetUpper() &&
                                  pNewNextUpper->GetType() == pNewUpper->GetType() &&
                                  pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() &&
-                                 pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() &&
+                                 pNewNextUpper->IsInFootnote() == pNewUpper->IsInFootnote() &&
                                  pNewNextUpper->IsInTab() == pNewUpper->IsInTab() &&
                                  pNewNextUpper->IsInSct() == pNewUpper->IsInSct() &&
                                  !m_rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
@@ -2240,12 +2240,12 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
     // - allow move backward as long as the anchored object is only temporarily
     //   positions considering its wrapping style.
     if ( pNewUpper &&
-         m_rThis.IsTxtFrm() && !IsFollow() )
+         m_rThis.IsTextFrm() && !IsFollow() )
     {
         sal_uInt32 nToPageNum( 0L );
         const bool bMoveFwdByObjPos = SwLayouter::FrmMovedFwdByObjPos(
-                                                *(pOldPage->GetFmt()->GetDoc()),
-                                                static_cast<SwTxtFrm&>(m_rThis),
+                                                *(pOldPage->GetFormat()->GetDoc()),
+                                                static_cast<SwTextFrm&>(m_rThis),
                                                 nToPageNum );
         if ( bMoveFwdByObjPos &&
              pNewUpper->FindPageFrm()->GetPhyPageNum() < nToPageNum )
@@ -2315,7 +2315,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
     {
         if( !pNewUpper->Lower() )
         {
-            if( pNewUpper->IsFtnContFrm() )
+            if( pNewUpper->IsFootnoteContFrm() )
             {
                 pNewUpper->Cut();
                 SwFrm::DestroyFrm(pNewUpper);
@@ -2326,7 +2326,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                 // #126020# - adjust check for empty section
                 // #130797# - correct fix #126020#
                 if ( pSectFrm && !pSectFrm->IsColLocked() &&
-                     !pSectFrm->ContainsCntnt() && !pSectFrm->ContainsAny( true ) )
+                     !pSectFrm->ContainsContent() && !pSectFrm->ContainsAny( true ) )
                 {
                     pSectFrm->DelEmpty( true );
                     SwFrm::DestroyFrm(pSectFrm);
@@ -2362,7 +2362,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                 }
                 pIndNext = pIndNext->GetIndNext();
             }
-            OSL_ENSURE( !pIndNext || pIndNext->ISA(SwTxtFrm),
+            OSL_ENSURE( !pIndNext || pIndNext->ISA(SwTextFrm),
                     "<SwFlowFrm::MovedBwd(..)> - incorrect next found." );
             if ( pIndNext && pIndNext->IsFlowFrm() &&
                  SwFlowFrm::CastFlowFrm(pIndNext)->IsJoinLocked() )
@@ -2377,7 +2377,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
     // backward under the same layout condition.
     if ( pNewUpper && !IsFollow() &&
          pNewUpper != m_rThis.GetUpper() &&
-         SwLayouter::MoveBwdSuppressed( *(pOldPage->GetFmt()->GetDoc()),
+         SwLayouter::MoveBwdSuppressed( *(pOldPage->GetFormat()->GetDoc()),
                                         *this, *pNewUpper ) )
     {
         SwLayoutFrm* pNextNewUpper = pNewUpper->GetLeaf(
@@ -2401,11 +2401,11 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
     if ( pNewUpper )
     {
         PROTOCOL_ENTER( &m_rThis, PROT_MOVE_BWD, 0, 0 );
-        if ( pNewUpper->IsFtnContFrm() )
+        if ( pNewUpper->IsFootnoteContFrm() )
         {
             // I may have gotten a Container
-            SwFtnFrm *pOld = m_rThis.FindFtnFrm();
-            SwFtnFrm *pNew = new SwFtnFrm( pOld->GetFmt(), pOld,
+            SwFootnoteFrm *pOld = m_rThis.FindFootnoteFrm();
+            SwFootnoteFrm *pNew = new SwFootnoteFrm( pOld->GetFormat(), pOld,
                                            pOld->GetRef(), pOld->GetAttr() );
             if ( pOld->GetMaster() )
             {
@@ -2417,12 +2417,12 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
             pNew->Paste( pNewUpper );
             pNewUpper = pNew;
         }
-        if( pNewUpper->IsFtnFrm() && m_rThis.IsInSct() )
+        if( pNewUpper->IsFootnoteFrm() && m_rThis.IsInSct() )
         {
             SwSectionFrm* pSct = m_rThis.FindSctFrm();
             // If we're in a section of a footnote, we may need to create
             // a SwSectionFrm in the new upper
-            if( pSct->IsInFtn() )
+            if( pSct->IsInFootnote() )
             {
                 SwFrm* pTmp = pNewUpper->Lower();
                 if( pTmp )
@@ -2447,7 +2447,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
         }
         bool bUnlock = false;
         bool bFollow = false;
-        // Lock section. Otherwise, it could get destroyed if the only Cntnt
+        // Lock section. Otherwise, it could get destroyed if the only Content
         // moves e.g. from the second into the first column.
         SwSectionFrm* pSect = pNewUpper->FindSctFrm();
         if( pSect )
@@ -2484,8 +2484,8 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
         {
             m_rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, false );
             SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
-            if ( pSh && !pSh->Imp()->IsUpdateExpFlds() )
-                pSh->GetDoc()->getIDocumentFieldsAccess().SetNewFldLst(true);  // Will be done by CalcLayout() later on
+            if ( pSh && !pSh->Imp()->IsUpdateExpFields() )
+                pSh->GetDoc()->getIDocumentFieldsAccess().SetNewFieldLst(true);  // Will be done by CalcLayout() later on
 
             pNewPage->InvalidateSpelling();
             pNewPage->InvalidateSmartTags();
@@ -2516,8 +2516,8 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
 
 SwFlowFrm *SwFlowFrm::CastFlowFrm( SwFrm *pFrm )
 {
-    if ( pFrm->IsCntntFrm() )
-        return static_cast<SwCntntFrm*>(pFrm);
+    if ( pFrm->IsContentFrm() )
+        return static_cast<SwContentFrm*>(pFrm);
     if ( pFrm->IsTabFrm() )
         return static_cast<SwTabFrm*>(pFrm);
     if ( pFrm->IsSctFrm() )
@@ -2527,8 +2527,8 @@ SwFlowFrm *SwFlowFrm::CastFlowFrm( SwFrm *pFrm )
 
 const SwFlowFrm *SwFlowFrm::CastFlowFrm( const SwFrm *pFrm )
 {
-    if ( pFrm->IsCntntFrm() )
-        return static_cast<const SwCntntFrm*>(pFrm);
+    if ( pFrm->IsContentFrm() )
+        return static_cast<const SwContentFrm*>(pFrm);
     if ( pFrm->IsTabFrm() )
         return static_cast<const SwTabFrm*>(pFrm);
     if ( pFrm->IsSctFrm() )
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index c183d747d351..4d7c3d81ecb6 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -68,8 +68,8 @@ using namespace ::com::sun::star;
 
 TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject);
 
-SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
-    SwLayoutFrm( pFmt, pSib ),
+SwFlyFrm::SwFlyFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
+    SwLayoutFrm( pFormat, pSib ),
     SwAnchoredObject(), // #i26791#
     pPrevLink( 0 ),
     pNextLink( 0 ),
@@ -88,9 +88,9 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
     bHeightClipped = bWidthClipped = bFormatHeightOnly = false;
 
     // Size setting: Fixed size is always the width
-    const SwFmtFrmSize &rFrmSize = pFmt->GetFrmSize();
+    const SwFormatFrmSize &rFrmSize = pFormat->GetFrmSize();
     const sal_uInt16 nDir =
-        static_cast<const SvxFrameDirectionItem&>(pFmt->GetFmtAttr( RES_FRAMEDIR )).GetValue();
+        static_cast<const SvxFrameDirectionItem&>(pFormat->GetFormatAttr( RES_FRAMEDIR )).GetValue();
     if( FRMDIR_ENVIRONMENT == nDir )
     {
         mbDerivedVert = true;
@@ -163,7 +163,7 @@ void SwFlyFrm::Chain( SwFrm* _pAnch )
     // Connect to chain neighboors.
     // No problem, if a neighboor doesn't exist - the construction of the
     // neighboor will make the connection
-    const SwFmtChain& rChain = GetFmt()->GetChain();
+    const SwFormatChain& rChain = GetFormat()->GetChain();
     if ( rChain.GetPrev() || rChain.GetNext() )
     {
         if ( rChain.GetNext() )
@@ -193,15 +193,15 @@ void SwFlyFrm::InsertCnt()
 {
     if ( !GetPrevLink() )
     {
-        const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt();
-        OSL_ENSURE( rCntnt.GetCntntIdx(), ":-( no content prepared." );
-        sal_uLong nIndex = rCntnt.GetCntntIdx()->GetIndex();
+        const SwFormatContent& rContent = GetFormat()->GetContent();
+        OSL_ENSURE( rContent.GetContentIdx(), ":-( no content prepared." );
+        sal_uLong nIndex = rContent.GetContentIdx()->GetIndex();
         // Lower() means SwColumnFrm; the Content then needs to be inserted into the (Column)BodyFrm
         ::_InsertCnt( Lower() ? static_cast<SwLayoutFrm*>(static_cast<SwLayoutFrm*>(Lower())->Lower()) : (SwLayoutFrm*)this,
-                      GetFmt()->GetDoc(), nIndex );
+                      GetFormat()->GetDoc(), nIndex );
 
-        // NoTxt always have a fixed height.
-        if ( Lower() && Lower()->IsNoTxtFrm() )
+        // NoText always have a fixed height.
+        if ( Lower() && Lower()->IsNoTextFrm() )
         {
             mbFixSize = true;
             bMinHeight = false;
@@ -214,22 +214,22 @@ void SwFlyFrm::InsertColumns()
     // #i97379#
     // Check, if column are allowed.
     // Columns are not allowed for fly frames, which represent graphics or embedded objects.
-    const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt();
-    OSL_ENSURE( rCntnt.GetCntntIdx(), "<SwFlyFrm::InsertColumns()> - no content prepared." );
-    SwNodeIndex aFirstCntnt( *(rCntnt.GetCntntIdx()), 1 );
-    if ( aFirstCntnt.GetNode().IsNoTxtNode() )
+    const SwFormatContent& rContent = GetFormat()->GetContent();
+    OSL_ENSURE( rContent.GetContentIdx(), "<SwFlyFrm::InsertColumns()> - no content prepared." );
+    SwNodeIndex aFirstContent( *(rContent.GetContentIdx()), 1 );
+    if ( aFirstContent.GetNode().IsNoTextNode() )
     {
         return;
     }
 
-    const SwFmtCol &rCol = GetFmt()->GetCol();
+    const SwFormatCol &rCol = GetFormat()->GetCol();
     if ( rCol.GetNumCols() > 1 )
     {
         // Start off PrtArea to be as large as Frm, so that we can put in the columns
         // properly. It'll adjust later on.
         Prt().Width( Frm().Width() );
         Prt().Height( Frm().Height() );
-        const SwFmtCol aOld; // ChgColumns() also needs an old value passed
+        const SwFormatCol aOld; // ChgColumns() also needs an old value passed
         ChgColumns( aOld, rCol );
     }
 }
@@ -240,7 +240,7 @@ void SwFlyFrm::DestroyImpl()
     // For frames bound as char or frames that don't have an anchor we have
     // to do that ourselves. For any other frame the call RemoveFly at the
     // anchor will do that.
-    if( IsAccessibleFrm() && GetFmt() && (IsFlyInCntFrm() || !GetAnchorFrm()) )
+    if( IsAccessibleFrm() && GetFormat() && (IsFlyInCntFrm() || !GetAnchorFrm()) )
     {
         SwRootFrm *pRootFrm = getRootFrm();
         if( pRootFrm && pRootFrm->IsAnyShellAccessible() )
@@ -255,7 +255,7 @@ void SwFlyFrm::DestroyImpl()
         }
     }
 
-    if( GetFmt() && !GetFmt()->GetDoc()->IsInDtor() )
+    if( GetFormat() && !GetFormat()->GetDoc()->IsInDtor() )
     {
         // OD 2004-01-19 #110582#
         Unchain();
@@ -278,7 +278,7 @@ SwFlyFrm::~SwFlyFrm()
 
 const IDocumentDrawModelAccess* SwFlyFrm::getIDocumentDrawModelAccess()
 {
-    return GetFmt()->getIDocumentDrawModelAccess();
+    return GetFormat()->getIDocumentDrawModelAccess();
 }
 
 // OD 2004-01-19 #110582#
@@ -342,7 +342,7 @@ sal_uInt32 SwFlyFrm::_GetOrdNumForNewRef( const SwFlyDrawContact* pContact )
     sal_uInt32 nOrdNum( 0L );
 
     // search for another Writer fly frame registered at same frame format
-    SwIterator<SwFlyFrm,SwFmt> aIter( *pContact->GetFmt() );
+    SwIterator<SwFlyFrm,SwFormat> aIter( *pContact->GetFormat() );
     const SwFlyFrm* pFlyFrm( 0L );
     for ( pFlyFrm = aIter.First(); pFlyFrm; pFlyFrm = aIter.Next() )
     {
@@ -389,7 +389,7 @@ SwVirtFlyDrawObj* SwFlyFrm::CreateNewRef( SwFlyDrawContact *pContact )
     // into drawing page with correct order number
     else
     {
-        pContact->GetFmt()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 )->
+        pContact->GetFormat()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 )->
                         InsertObject( pDrawObj, _GetOrdNumForNewRef( pContact ) );
     }
     // #i38889# - assure, that new <SwVirtFlyDrawObj> instance
@@ -403,12 +403,12 @@ void SwFlyFrm::InitDrawObj( bool bNotify )
     // Find ContactObject from the Format. If there's already one, we just
     // need to create a new Ref, else we create the Contact now.
 
-    IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess();
-    SwFlyDrawContact *pContact = SwIterator<SwFlyDrawContact,SwFmt>( *GetFmt() ).First();
+    IDocumentDrawModelAccess* pIDDMA = GetFormat()->getIDocumentDrawModelAccess();
+    SwFlyDrawContact *pContact = SwIterator<SwFlyDrawContact,SwFormat>( *GetFormat() ).First();
     if ( !pContact )
     {
         // #i52858# - method name changed
-        pContact = new SwFlyDrawContact( GetFmt(),
+        pContact = new SwFlyDrawContact( GetFormat(),
                                           pIDDMA->GetOrCreateDrawModel() );
     }
     OSL_ENSURE( pContact, "InitDrawObj failed" );
@@ -420,7 +420,7 @@ void SwFlyFrm::InitDrawObj( bool bNotify )
     SdrLayerID nHeavenId = pIDDMA->GetHeavenId();
     SdrLayerID nHellId = pIDDMA->GetHellId();
     // OD 2004-03-22 #i26791#
-    GetVirtDrawObj()->SetLayer( GetFmt()->GetOpaque().GetValue()
+    GetVirtDrawObj()->SetLayer( GetFormat()->GetOpaque().GetValue()
                                 ? nHeavenId
                                 : nHellId );
     if ( bNotify )
@@ -433,7 +433,7 @@ void SwFlyFrm::FinitDrawObj()
         return;
 
     // Deregister from SdrPageViews if the Objects is still selected there.
-    if ( !GetFmt()->GetDoc()->IsInDtor() )
+    if ( !GetFormat()->GetDoc()->IsInDtor() )
     {
         SwViewShell *p1St = getRootFrm()->GetCurrShell();
         if ( p1St )
@@ -451,10 +451,10 @@ void SwFlyFrm::FinitDrawObj()
     // If the last VirtObject is destroyed, the DrawObject and the DrawContact
     // also need to be destroyed.
     SwFlyDrawContact *pMyContact = 0;
-    if ( GetFmt() )
+    if ( GetFormat() )
     {
         bool bContinue = true;
-        SwIterator<SwFrm,SwFmt> aFrmIter( *GetFmt() );
+        SwIterator<SwFrm,SwFormat> aFrmIter( *GetFormat() );
         for ( SwFrm* pFrm = aFrmIter.First(); pFrm; pFrm = aFrmIter.Next() )
             if ( pFrm != this )
             {
@@ -465,7 +465,7 @@ void SwFlyFrm::FinitDrawObj()
 
         if ( bContinue )
             // no Frm left, find Contact object to destroy
-            pMyContact = SwIterator<SwFlyDrawContact,SwFmt>( *GetFmt() ).First();
+            pMyContact = SwIterator<SwFlyDrawContact,SwFormat>( *GetFormat() ).First();
     }
 
     // OD, OS 2004-03-31 #116203# - clear user call of Writer fly frame 'master'
@@ -489,7 +489,7 @@ void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
     pMaster->pNextLink = pFollow;
     pFollow->pPrevLink = pMaster;
 
-    if ( pMaster->ContainsCntnt() )
+    if ( pMaster->ContainsContent() )
     {
         // To get a text flow we need to invalidate
         SwFrm *pInva = pMaster->FindLastLower();
@@ -508,11 +508,11 @@ void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
         }
     }
 
-    if ( pFollow->ContainsCntnt() )
+    if ( pFollow->ContainsContent() )
     {
         // There's only the content from the Masters left; the content from the Follow
-        // does not have any Frames left (should always be exactly one empty TxtNode).
-        SwFrm *pFrm = pFollow->ContainsCntnt();
+        // does not have any Frames left (should always be exactly one empty TextNode).
+        SwFrm *pFrm = pFollow->ContainsContent();
         OSL_ENSURE( !pFrm->IsTabFrm() && !pFrm->FindNext(), "follow in chain contains content" );
         pFrm->Cut();
         SwFrm::DestroyFrm(pFrm);
@@ -533,7 +533,7 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
     pMaster->pNextLink = 0;
     pFollow->pPrevLink = 0;
 
-    if ( pFollow->ContainsCntnt() )
+    if ( pFollow->ContainsContent() )
     {
         // The Master sucks up the content of the Follow
         SwLayoutFrm *pUpper = pMaster;
@@ -546,9 +546,9 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
         SwFlyFrm *pFoll = pFollow;
         while ( pFoll )
         {
-            SwFrm *pTmp = ::SaveCntnt( pFoll );
+            SwFrm *pTmp = ::SaveContent( pFoll );
             if ( pTmp )
-                ::RestoreCntnt( pTmp, pUpper, pMaster->FindLastLower(), true );
+                ::RestoreContent( pTmp, pUpper, pMaster->FindLastLower(), true );
             pFoll->SetCompletePaint();
             pFoll->InvalidateSize();
             pFoll = pFoll->GetNextLink();
@@ -556,13 +556,13 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
     }
 
     // The Follow needs his own content to be served
-    const SwFmtCntnt &rCntnt = pFollow->GetFmt()->GetCntnt();
-    OSL_ENSURE( rCntnt.GetCntntIdx(), ":-( No content prepared." );
-    sal_uLong nIndex = rCntnt.GetCntntIdx()->GetIndex();
+    const SwFormatContent &rContent = pFollow->GetFormat()->GetContent();
+    OSL_ENSURE( rContent.GetContentIdx(), ":-( No content prepared." );
+    sal_uLong nIndex = rContent.GetContentIdx()->GetIndex();
     // Lower() means SwColumnFrm: this one contains another SwBodyFrm
     ::_InsertCnt( pFollow->Lower() ? const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(pFollow->Lower())->Lower()))
                                    : static_cast<SwLayoutFrm*>(pFollow),
-                  pFollow->GetFmt()->GetDoc(), ++nIndex );
+                  pFollow->GetFormat()->GetDoc(), ++nIndex );
 
     // invalidate accessible relation set (accessibility wrapper)
     SwViewShell* pSh = pMaster->getRootFrm()->GetCurrShell();
@@ -574,7 +574,7 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
     }
 }
 
-SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, SwFrm *pAnch )
+SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrameFormat &rChain, SwFrm *pAnch )
 {
     // We look for the Fly that's in the same Area.
     // Areas can for now only be Head/Footer or Flys.
@@ -594,7 +594,7 @@ SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, SwFrm *pAnch )
             pLay = pLay->GetUpper();
     }
 
-    SwIterator<SwFlyFrm,SwFmt> aIter( rChain );
+    SwIterator<SwFlyFrm,SwFormat> aIter( rChain );
     SwFlyFrm *pFly = aIter.First();
     if ( pLay )
     {
@@ -633,7 +633,7 @@ SwFrm *SwFlyFrm::FindLastLower()
     return pRet;
 }
 
-bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize )
+bool SwFlyFrm::FrmSizeChg( const SwFormatFrmSize &rFrmSize )
 {
     bool bRet = false;
     SwTwips nDiffHeight = Frm().Height();
@@ -673,7 +673,7 @@ bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize )
             mbValidPos = false;
             bRet = true;
         }
-        else if ( Lower()->IsNoTxtFrm() )
+        else if ( Lower()->IsNoTextFrm() )
         {
             mbFixSize = true;
             bMinHeight = false;
@@ -729,7 +729,7 @@ void SwFlyFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
             SetNotifyBack();
         if ( nInvFlags & 0x10 )
             SetCompletePaint();
-        if ( ( nInvFlags & 0x40 ) && Lower() && Lower()->IsNoTxtFrm() )
+        if ( ( nInvFlags & 0x40 ) && Lower() && Lower()->IsNoTextFrm() )
             ClrContourCache( GetVirtDrawObj() );
         SwRootFrm *pRoot;
         if ( nInvFlags & 0x20 && 0 != (pRoot = getRootFrm()) )
@@ -782,14 +782,14 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
 
             // By changing the flow of frame-bound Frames, a vertical alignment
             // can be activated/deactivated => MakeFlyPos
-            if( FLY_AT_FLY == GetFmt()->GetAnchor().GetAnchorId() )
+            if( FLY_AT_FLY == GetFormat()->GetAnchor().GetAnchorId() )
                 rInvFlags |= 0x09;
 
             // Delete contour in the Node if necessary
-            if ( Lower() && Lower()->IsNoTxtFrm() &&
-                 !GetFmt()->GetSurround().IsContour() )
+            if ( Lower() && Lower()->IsNoTextFrm() &&
+                 !GetFormat()->GetSurround().IsContour() )
             {
-                SwNoTxtNode *pNd = static_cast<SwNoTxtNode*>(static_cast<SwCntntFrm*>(Lower())->GetNode());
+                SwNoTextNode *pNd = static_cast<SwNoTextNode*>(static_cast<SwContentFrm*>(Lower())->GetNode());
                 if ( pNd->HasContour() )
                     pNd->SetContour( 0 );
             }
@@ -816,8 +816,8 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
         case RES_COL:
             if (pOld && pNew)
             {
-                ChgColumns( *static_cast<const SwFmtCol*>(pOld), *static_cast<const SwFmtCol*>(pNew) );
-                const SwFmtFrmSize &rNew = GetFmt()->GetFrmSize();
+                ChgColumns( *static_cast<const SwFormatCol*>(pOld), *static_cast<const SwFormatCol*>(pNew) );
+                const SwFormatFrmSize &rNew = GetFormat()->GetFrmSize();
                 if ( FrmSizeChg( rNew ) )
                     NotifyDrawObj();
                 rInvFlags |= 0x1A;
@@ -827,7 +827,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
         case RES_FRM_SIZE:
         case RES_FMT_CHG:
         {
-            const SwFmtFrmSize &rNew = GetFmt()->GetFrmSize();
+            const SwFormatFrmSize &rNew = GetFormat()->GetFrmSize();
             if ( FrmSizeChg( rNew ) )
                 NotifyDrawObj();
             rInvFlags |= 0x7F;
@@ -835,10 +835,10 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             {
                 SwRect aNew( GetObjRectWithSpaces() );
                 SwRect aOld( maFrm );
-                const SvxULSpaceItem &rUL = static_cast<const SwFmtChg*>(pOld)->pChangedFmt->GetULSpace();
+                const SvxULSpaceItem &rUL = static_cast<const SwFormatChg*>(pOld)->pChangedFormat->GetULSpace();
                 aOld.Top( std::max( aOld.Top() - long(rUL.GetUpper()), 0L ) );
                 aOld.SSize().Height()+= rUL.GetLower();
-                const SvxLRSpaceItem &rLR = static_cast<const SwFmtChg*>(pOld)->pChangedFmt->GetLRSpace();
+                const SvxLRSpaceItem &rLR = static_cast<const SwFormatChg*>(pOld)->pChangedFormat->GetLRSpace();
                 aOld.Left  ( std::max( aOld.Left() - long(rLR.GetLeft()), 0L ) );
                 aOld.SSize().Width() += rLR.GetRight();
                 aNew.Union( aOld );
@@ -848,7 +848,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                 // When assigning a template we cannot rely on the old column
                 // attribute. As there need to be at least enough for ChgColumns,
                 // we need to create a temporary attribute.
-                SwFmtCol aCol;
+                SwFormatCol aCol;
                 if ( Lower() && Lower()->IsColumnFrm() )
                 {
                     sal_uInt16 nCol = 0;
@@ -859,23 +859,23 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                     } while ( pTmp );
                     aCol.Init( nCol, 0, 1000 );
                 }
-                ChgColumns( aCol, GetFmt()->GetCol() );
+                ChgColumns( aCol, GetFormat()->GetCol() );
             }
 
-            SwFmtURL aURL( GetFmt()->GetURL() );
+            SwFormatURL aURL( GetFormat()->GetURL() );
 
-            SwFmtFrmSize *pNewFmtFrmSize = NULL;
-            SwFmtChg *pOldFmtChg = NULL;
+            SwFormatFrmSize *pNewFormatFrmSize = NULL;
+            SwFormatChg *pOldFormatChg = NULL;
             if (nWhich == RES_FRM_SIZE)
-                pNewFmtFrmSize = const_cast<SwFmtFrmSize*>(static_cast<const SwFmtFrmSize*>(pNew));
+                pNewFormatFrmSize = const_cast<SwFormatFrmSize*>(static_cast<const SwFormatFrmSize*>(pNew));
             else
-                pOldFmtChg = const_cast<SwFmtChg*>(static_cast<const SwFmtChg*>(pOld));
+                pOldFormatChg = const_cast<SwFormatChg*>(static_cast<const SwFormatChg*>(pOld));
 
-            if (aURL.GetMap() && (pNewFmtFrmSize || pOldFmtChg))
+            if (aURL.GetMap() && (pNewFormatFrmSize || pOldFormatChg))
             {
-                const SwFmtFrmSize &rOld = pNewFmtFrmSize ?
-                                *pNewFmtFrmSize :
-                                pOldFmtChg->pChangedFmt->GetFrmSize();
+                const SwFormatFrmSize &rOld = pNewFormatFrmSize ?
+                                *pNewFormatFrmSize :
+                                pOldFormatChg->pChangedFormat->GetFrmSize();
                 //#35091# Can be "times zero", when loading the template
                 if ( rOld.GetWidth() && rOld.GetHeight() )
                 {
@@ -883,20 +883,20 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                     Fraction aScaleX( rOld.GetWidth(), rNew.GetWidth() );
                     Fraction aScaleY( rOld.GetHeight(), rOld.GetHeight() );
                     aURL.GetMap()->Scale( aScaleX, aScaleY );
-                    SwFrmFmt *pFmt = GetFmt();
-                    pFmt->LockModify();
-                    pFmt->SetFmtAttr( aURL );
-                    pFmt->UnlockModify();
+                    SwFrameFormat *pFormat = GetFormat();
+                    pFormat->LockModify();
+                    pFormat->SetFormatAttr( aURL );
+                    pFormat->UnlockModify();
                 }
             }
-            const SvxProtectItem &rP = GetFmt()->GetProtect();
+            const SvxProtectItem &rP = GetFormat()->GetProtect();
             GetVirtDrawObj()->SetMoveProtect( rP.IsPosProtected()    );
             GetVirtDrawObj()->SetResizeProtect( rP.IsSizeProtected() );
 
             if ( pSh )
                 pSh->InvalidateWindows( Frm() );
-            const IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess();
-            const sal_uInt8 nId = GetFmt()->GetOpaque().GetValue() ?
+            const IDocumentDrawModelAccess* pIDDMA = GetFormat()->getIDocumentDrawModelAccess();
+            const sal_uInt8 nId = GetFormat()->GetOpaque().GetValue() ?
                              pIDDMA->GetHeavenId() :
                              pIDDMA->GetHellId();
             GetVirtDrawObj()->SetLayer( nId );
@@ -904,17 +904,17 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             if ( Lower() )
             {
                 // Delete contour in the Node if necessary
-                if( Lower()->IsNoTxtFrm() &&
-                     !GetFmt()->GetSurround().IsContour() )
+                if( Lower()->IsNoTextFrm() &&
+                     !GetFormat()->GetSurround().IsContour() )
                 {
-                    SwNoTxtNode *pNd = static_cast<SwNoTxtNode*>(static_cast<SwCntntFrm*>(Lower())->GetNode());
+                    SwNoTextNode *pNd = static_cast<SwNoTextNode*>(static_cast<SwContentFrm*>(Lower())->GetNode());
                     if ( pNd->HasContour() )
                         pNd->SetContour( 0 );
                 }
                 else if( !Lower()->IsColumnFrm() )
                 {
                     SwFrm* pFrm = GetLastLower();
-                    if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsUndersized() )
+                    if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsUndersized() )
                         pFrm->Prepare( PREP_ADJUST_FRM );
                 }
             }
@@ -976,7 +976,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                 if ( pSh )
                     pSh->InvalidateWindows( Frm() );
 
-                const IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess();
+                const IDocumentDrawModelAccess* pIDDMA = GetFormat()->getIDocumentDrawModelAccess();
                 const sal_uInt8 nId = static_cast<const SvxOpaqueItem*>(pNew)->GetValue() ?
                                     pIDDMA->GetHeavenId() :
                                     pIDDMA->GetHellId();
@@ -999,21 +999,21 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
         case RES_URL:
             // The interface changes the frame size when interacting with text frames,
             // the Map, however, needs to be relative to FrmSize().
-            if ( (!Lower() || !Lower()->IsNoTxtFrm()) && pNew && pOld &&
-                 static_cast<const SwFmtURL*>(pNew)->GetMap() && static_cast<const SwFmtURL*>(pOld)->GetMap() )
+            if ( (!Lower() || !Lower()->IsNoTextFrm()) && pNew && pOld &&
+                 static_cast<const SwFormatURL*>(pNew)->GetMap() && static_cast<const SwFormatURL*>(pOld)->GetMap() )
             {
-                const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize();
+                const SwFormatFrmSize &rSz = GetFormat()->GetFrmSize();
                 if ( rSz.GetHeight() != Frm().Height() ||
                      rSz.GetWidth()  != Frm().Width() )
                 {
-                    SwFmtURL aURL( GetFmt()->GetURL() );
+                    SwFormatURL aURL( GetFormat()->GetURL() );
                     Fraction aScaleX( Frm().Width(),  rSz.GetWidth() );
                     Fraction aScaleY( Frm().Height(), rSz.GetHeight() );
                     aURL.GetMap()->Scale( aScaleX, aScaleY );
-                    SwFrmFmt *pFmt = GetFmt();
-                    pFmt->LockModify();
-                    pFmt->SetFmtAttr( aURL );
-                    pFmt->UnlockModify();
+                    SwFrameFormat *pFormat = GetFormat();
+                    pFormat->LockModify();
+                    pFormat->SetFormatAttr( aURL );
+                    pFormat->UnlockModify();
                 }
             }
             // No invalidation necessary
@@ -1022,7 +1022,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
         case RES_CHAIN:
             if (pNew)
             {
-                const SwFmtChain *pChain = static_cast<const SwFmtChain*>(pNew);
+                const SwFormatChain *pChain = static_cast<const SwFormatChain*>(pNew);
                 if ( pChain->GetNext() )
                 {
                     SwFlyFrm *pFollow = FindChainNeighbour( *pChain->GetNext() );
@@ -1122,20 +1122,20 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
 {
     if ( GetCurrRelPos() != rNewPos )
     {
-        SwFrmFmt *pFmt = GetFmt();
+        SwFrameFormat *pFormat = GetFormat();
         const bool bVert = GetAnchorFrm()->IsVertical();
         const SwTwips nNewY = bVert ? rNewPos.X() : rNewPos.Y();
         SwTwips nTmpY = nNewY == LONG_MAX ? 0 : nNewY;
         if( bVert )
             nTmpY = -nTmpY;
-        SfxItemSet aSet( pFmt->GetDoc()->GetAttrPool(),
+        SfxItemSet aSet( pFormat->GetDoc()->GetAttrPool(),
                          RES_VERT_ORIENT, RES_HORI_ORIENT);
 
-        SwFmtVertOrient aVert( pFmt->GetVertOrient() );
-        const SwTxtFrm *pAutoFrm = NULL;
+        SwFormatVertOrient aVert( pFormat->GetVertOrient() );
+        const SwTextFrm *pAutoFrm = NULL;
         // #i34948# - handle also at-page and at-fly anchored
         // Writer fly frames
-        const RndStdIds eAnchorType = GetFrmFmt().GetAnchor().GetAnchorId();
+        const RndStdIds eAnchorType = GetFrameFormat().GetAnchor().GetAnchorId();
         if ( eAnchorType == FLY_AT_PAGE )
         {
             aVert.SetVertOrient( text::VertOrientation::NONE );
@@ -1154,9 +1154,9 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
                 {
                     aVert.SetVertOrient( text::VertOrientation::NONE );
                     sal_Int32 nOfs =
-                        pFmt->GetAnchor().GetCntntAnchor()->nContent.GetIndex();
-                    OSL_ENSURE( GetAnchorFrm()->IsTxtFrm(), "TxtFrm expected" );
-                    pAutoFrm = static_cast<const SwTxtFrm*>(GetAnchorFrm());
+                        pFormat->GetAnchor().GetContentAnchor()->nContent.GetIndex();
+                    OSL_ENSURE( GetAnchorFrm()->IsTextFrm(), "TextFrm expected" );
+                    pAutoFrm = static_cast<const SwTextFrm*>(GetAnchorFrm());
                     while( pAutoFrm->GetFollow() &&
                            pAutoFrm->GetFollow()->GetOfst() <= nOfs )
                     {
@@ -1185,7 +1185,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
         {
             const SwTwips nNewX = bVert ? rNewPos.Y() : rNewPos.X();
             SwTwips nTmpX = nNewX == LONG_MAX ? 0 : nNewX;
-            SwFmtHoriOrient aHori( pFmt->GetHoriOrient() );
+            SwFormatHoriOrient aHori( pFormat->GetHoriOrient() );
             // #i34948# - handle also at-page and at-fly anchored
             // Writer fly frames
             if ( eAnchorType == FLY_AT_PAGE )
@@ -1209,10 +1209,10 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
                     {
                         if( !pAutoFrm )
                         {
-                            sal_Int32 nOfs = pFmt->GetAnchor().GetCntntAnchor()
+                            sal_Int32 nOfs = pFormat->GetAnchor().GetContentAnchor()
                                           ->nContent.GetIndex();
-                            OSL_ENSURE( GetAnchorFrm()->IsTxtFrm(), "TxtFrm expected");
-                            pAutoFrm = static_cast<const SwTxtFrm*>(GetAnchorFrm());
+                            OSL_ENSURE( GetAnchorFrm()->IsTextFrm(), "TextFrm expected");
+                            pAutoFrm = static_cast<const SwTextFrm*>(GetAnchorFrm());
                             while( pAutoFrm->GetFollow() &&
                                    pAutoFrm->GetFollow()->GetOfst() <= nOfs )
                                 pAutoFrm = pAutoFrm->GetFollow();
@@ -1228,7 +1228,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
             aSet.Put( aHori );
         }
         SetCurrRelPos( rNewPos );
-        pFmt->GetDoc()->SetAttr( aSet, *pFmt );
+        pFormat->GetDoc()->SetAttr( aSet, *pFormat );
     }
 }
 
@@ -1261,7 +1261,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
 
         const SwTwips nUL = pAttrs->CalcTopLine()  + pAttrs->CalcBottomLine();
         const SwTwips nLR = pAttrs->CalcLeftLine() + pAttrs->CalcRightLine();
-        const SwFmtFrmSize &rFrmSz = GetFmt()->GetFrmSize();
+        const SwFormatFrmSize &rFrmSz = GetFormat()->GetFrmSize();
         Size aRelSize( CalcRel( rFrmSz ) );
 
         OSL_ENSURE( pAttrs->GetSize().Height() != 0 || rFrmSz.GetHeightPercent(), "FrameAttr height is 0." );
@@ -1297,11 +1297,11 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
             }
             mbValidSize = true;
 
-            std::map<SwFrmFmt*, SwFrmFmt*> aShapes = SwTextBoxHelper::findShapes(GetFmt()->GetDoc());
-            if (aShapes.find(GetFmt()) != aShapes.end())
+            std::map<SwFrameFormat*, SwFrameFormat*> aShapes = SwTextBoxHelper::findShapes(GetFormat()->GetDoc());
+            if (aShapes.find(GetFormat()) != aShapes.end())
             {
                 // This fly is a textbox of a draw shape.
-                SdrObject* pShape = aShapes[GetFmt()]->FindSdrObject();
+                SdrObject* pShape = aShapes[GetFormat()]->FindSdrObject();
                 if (SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pShape))
                 {
                     // The shape is a customshape: then inform it about the calculated fly size.
@@ -1372,10 +1372,10 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
 // OD 11.04.2003 #108824# - new parameter <bNoCalcFollow> was used by method
 //                          <FormatWidthCols(..)> to avoid follow formatting
 //                          for text frames. But, unformatted follows causes
-//                          problems in method <SwCntntFrm::_WouldFit(..)>,
+//                          problems in method <SwContentFrm::_WouldFit(..)>,
 //                          which assumes that the follows are formatted.
 //                          Thus, <bNoCalcFollow> no longer used by <FormatWidthCols(..)>.
-void CalcCntnt( SwLayoutFrm *pLay,
+void CalcContent( SwLayoutFrm *pLay,
                 bool bNoColl,
                 bool bNoCalcFollow )
 {
@@ -1387,9 +1387,9 @@ void CalcCntnt( SwLayoutFrm *pLay,
         if( pSect->IsEndnAtEnd() && !bNoColl )
         {
             bCollect = true;
-            SwLayouter::CollectEndnotes( pLay->GetFmt()->GetDoc(), pSect );
+            SwLayouter::CollectEndnotes( pLay->GetFormat()->GetDoc(), pSect );
         }
-        pSect->CalcFtnCntnt();
+        pSect->CalcFootnoteContent();
     }
     else
         pSect = NULL;
@@ -1405,13 +1405,13 @@ void CalcCntnt( SwLayoutFrm *pLay,
                 if( pSect->IsEndnAtEnd() )
                 {
                     if( bCollect )
-                        pLay->GetFmt()->GetDoc()->getIDocumentLayoutAccess().GetLayouter()->
+                        pLay->GetFormat()->GetDoc()->getIDocumentLayoutAccess().GetLayouter()->
                             InsertEndnotes( pSect );
-                    bool bLock = pSect->IsFtnLock();
-                    pSect->SetFtnLock( true );
-                    pSect->CalcFtnCntnt();
-                    pSect->CalcFtnCntnt();
-                    pSect->SetFtnLock( bLock );
+                    bool bLock = pSect->IsFootnoteLock();
+                    pSect->SetFootnoteLock( true );
+                    pSect->CalcFootnoteContent();
+                    pSect->CalcFootnoteContent();
+                    pSect->SetFootnoteLock( bLock );
                 }
                 return;
             }
@@ -1459,15 +1459,15 @@ void CalcCntnt( SwLayoutFrm *pLay,
             }
 
             // OD 14.03.2003 #i11760# - forbid format of follow, if requested.
-            if ( bNoCalcFollow && pFrm->IsTxtFrm() )
-                static_cast<SwTxtFrm*>(pFrm)->ForbidFollowFormat();
+            if ( bNoCalcFollow && pFrm->IsTextFrm() )
+                static_cast<SwTextFrm*>(pFrm)->ForbidFollowFormat();
 
             pFrm->Calc();
 
             // OD 14.03.2003 #i11760# - reset control flag for follow format.
-            if ( pFrm->IsTxtFrm() )
+            if ( pFrm->IsTextFrm() )
             {
-                static_cast<SwTxtFrm*>(pFrm)->AllowFollowFormat();
+                static_cast<SwTextFrm*>(pFrm)->AllowFollowFormat();
             }
 
             // #111937# The keep-attribute can cause the position
@@ -1531,15 +1531,15 @@ void CalcCntnt( SwLayoutFrm *pLay,
                             bAgain = true;
                             if ( pAgainObj2 == pAnchoredObj )
                             {
-                                OSL_FAIL( "::CalcCntnt(..) - loop detected, perform attribute changes to avoid the loop" );
+                                OSL_FAIL( "::CalcContent(..) - loop detected, perform attribute changes to avoid the loop" );
                                 // Prevent oscillation
-                                SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
-                                SwFmtSurround aAttr( rFmt.GetSurround() );
+                                SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat();
+                                SwFormatSurround aAttr( rFormat.GetSurround() );
                                 if( SURROUND_THROUGHT != aAttr.GetSurround() )
                                 {
                                     // When on auto position, we can only set it to
                                     // flow through
-                                    if ((rFmt.GetAnchor().GetAnchorId() ==
+                                    if ((rFormat.GetAnchor().GetAnchorId() ==
                                             FLY_AT_CHAR) &&
                                         (SURROUND_PARALLEL ==
                                             aAttr.GetSurround()))
@@ -1550,9 +1550,9 @@ void CalcCntnt( SwLayoutFrm *pLay,
                                     {
                                         aAttr.SetSurround( SURROUND_PARALLEL );
                                     }
-                                    rFmt.LockModify();
-                                    rFmt.SetFmtAttr( aAttr );
-                                    rFmt.UnlockModify();
+                                    rFormat.LockModify();
+                                    rFormat.SetFormatAttr( aAttr );
+                                    rFormat.UnlockModify();
                                 }
                             }
                             else
@@ -1587,14 +1587,14 @@ void CalcCntnt( SwLayoutFrm *pLay,
 
                 // OD 2004-05-17 #i28701# - format anchor frame after its objects
                 // are formatted, if the wrapping style influence has to be considered.
-                if ( pLay->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
+                if ( pLay->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
                 {
                     pFrm->Calc();
                 }
 
                 if ( bAgain )
                 {
-                    pFrm = pLay->ContainsCntnt();
+                    pFrm = pLay->ContainsContent();
                     if ( pFrm && pFrm->IsInTab() )
                         pFrm = pFrm->FindTabFrm();
                     if( pFrm && pFrm->IsInSct() )
@@ -1615,7 +1615,7 @@ void CalcCntnt( SwLayoutFrm *pLay,
                     if ( nLoopControlRuns < nLoopControlMax )
                         continue;
 
-                    OSL_FAIL( "LoopControl in CalcCntnt" );
+                    OSL_FAIL( "LoopControl in CalcContent" );
                 }
             }
             if ( pFrm->IsTabFrm() )
@@ -1642,7 +1642,7 @@ void CalcCntnt( SwLayoutFrm *pLay,
                 }
             }
           // Stay in the pLay
-          // Except for SectionFrms with Follow: the first CntntFrm of the Follow
+          // Except for SectionFrms with Follow: the first ContentFrm of the Follow
           // will be formatted, so that it get's a chance to load in the pLay.
           // As long as these Frames are loading in pLay, we continue
         } while ( pFrm &&
@@ -1659,16 +1659,16 @@ void CalcCntnt( SwLayoutFrm *pLay,
         {
             if( bCollect )
             {
-                pLay->GetFmt()->GetDoc()->getIDocumentLayoutAccess().GetLayouter()->InsertEndnotes(pSect);
-                pSect->CalcFtnCntnt();
+                pLay->GetFormat()->GetDoc()->getIDocumentLayoutAccess().GetLayouter()->InsertEndnotes(pSect);
+                pSect->CalcFootnoteContent();
             }
             if( pSect->HasFollow() )
             {
                 SwSectionFrm* pNxt = pSect->GetFollow();
-                while( pNxt && !pNxt->ContainsCntnt() )
+                while( pNxt && !pNxt->ContainsContent() )
                     pNxt = pNxt->GetFollow();
                 if( pNxt )
-                    pNxt->CalcFtnCntnt();
+                    pNxt->CalcFootnoteContent();
             }
             if( bCollect )
             {
@@ -1730,7 +1730,7 @@ void SwFlyFrm::MakeContentPos( const SwBorderAttrs &rAttrs )
         m_bValidContentPos = true;
 
         const SwTwips nUL = rAttrs.CalcTopLine()  + rAttrs.CalcBottomLine();
-        Size aRelSize( CalcRel( GetFmt()->GetFrmSize() ) );
+        Size aRelSize( CalcRel( GetFormat()->GetFrmSize() ) );
 
         SWRECTFN( this )
         long nMinHeight = 0;
@@ -1739,7 +1739,7 @@ void SwFlyFrm::MakeContentPos( const SwBorderAttrs &rAttrs )
 
         Point aNewContentPos;
         aNewContentPos = Prt().Pos();
-        const SdrTextVertAdjust nAdjust = GetFmt()->GetTextVertAdjust().GetValue();
+        const SdrTextVertAdjust nAdjust = GetFormat()->GetTextVertAdjust().GetValue();
 
         if( nAdjust != SDRTEXTVERTADJUST_TOP )
         {
@@ -1830,10 +1830,10 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, bool bTst )
                 mbValidPos = true;
                 // #i55416#
                 // Suppress format of width for autowidth frame, because the
-                // format of the width would call <SwTxtFrm::CalcFitToContent()>
+                // format of the width would call <SwTextFrm::CalcFitToContent()>
                 // for the lower frame, which initiated this grow.
                 const bool bOldFormatHeightOnly = bFormatHeightOnly;
-                const SwFmtFrmSize& rFrmSz = GetFmt()->GetFrmSize();
+                const SwFormatFrmSize& rFrmSz = GetFormat()->GetFrmSize();
                 if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE )
                 {
                     bFormatHeightOnly = true;
@@ -1875,10 +1875,10 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, bool bTst )
         SwTwips nVal = nDist;
         if ( IsMinHeight() )
         {
-            const SwFmtFrmSize& rFmtSize = GetFmt()->GetFrmSize();
-            SwTwips nFmtHeight = bVert ? rFmtSize.GetWidth() : rFmtSize.GetHeight();
+            const SwFormatFrmSize& rFormatSize = GetFormat()->GetFrmSize();
+            SwTwips nFormatHeight = bVert ? rFormatSize.GetWidth() : rFormatSize.GetHeight();
 
-            nVal = std::min( nDist, nHeight - nFmtHeight );
+            nVal = std::min( nDist, nHeight - nFormatHeight );
         }
 
         if ( nVal <= 0L )
@@ -1925,10 +1925,10 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, bool bTst )
                 mbValidPos = true;
                 // #i55416#
                 // Suppress format of width for autowidth frame, because the
-                // format of the width would call <SwTxtFrm::CalcFitToContent()>
+                // format of the width would call <SwTextFrm::CalcFitToContent()>
                 // for the lower frame, which initiated this shrink.
                 const bool bOldFormatHeightOnly = bFormatHeightOnly;
-                const SwFmtFrmSize& rFrmSz = GetFmt()->GetFrmSize();
+                const SwFormatFrmSize& rFrmSz = GetFormat()->GetFrmSize();
                 if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE )
                 {
                     bFormatHeightOnly = true;
@@ -1972,8 +1972,8 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize )
     Size aAdjustedNewSize( aNewSize );
     {
         if ( dynamic_cast<SwFlyAtCntFrm*>(this) &&
-             Lower() && dynamic_cast<SwNoTxtFrm*>(Lower()) &&
-             static_cast<SwNoTxtFrm*>(Lower())->GetNode()->GetOLENode() )
+             Lower() && dynamic_cast<SwNoTextFrm*>(Lower()) &&
+             static_cast<SwNoTextFrm*>(Lower())->GetNode()->GetOLENode() )
         {
             SwRect aClipRect;
             ::CalcClipRect( GetVirtDrawObj(), aClipRect, false );
@@ -1989,12 +1989,12 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize )
     }
     if ( aAdjustedNewSize != Frm().SSize() )
     {
-        SwFrmFmt *pFmt = GetFmt();
-        SwFmtFrmSize aSz( pFmt->GetFrmSize() );
+        SwFrameFormat *pFormat = GetFormat();
+        SwFormatFrmSize aSz( pFormat->GetFrmSize() );
         aSz.SetWidth( aAdjustedNewSize.Width() );
         aSz.SetHeight( aAdjustedNewSize.Height() );
         // go via the Doc for UNDO
-        pFmt->GetDoc()->SetAttr( aSz, *pFmt );
+        pFormat->GetDoc()->SetAttr( aSz, *pFormat );
         return aSz.GetSize();
     }
     else
@@ -2049,7 +2049,7 @@ void SwFrm::RemoveFly( SwFlyFrm *pToRemove )
     else
     {
         if ( pToRemove->IsAccessibleFrm() &&
-             pToRemove->GetFmt() &&
+             pToRemove->GetFormat() &&
              !pToRemove->IsFlyInCntFrm() )
         {
             SwRootFrm *pRootFrm = getRootFrm();
@@ -2190,7 +2190,7 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly,
         {
             SwAnchoredObject* pAnchoredObj = (*GetDrawObjs())[i];
             if ( _bNoInvaOfAsCharAnchoredObjs &&
-                 (pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId()
+                 (pAnchoredObj->GetFrameFormat().GetAnchor().GetAnchorId()
                     == FLY_AS_CHAR) )
             {
                 continue;
@@ -2201,7 +2201,7 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly,
             if ( pAnchoredObj->GetPageFrm() &&
                  pAnchoredObj->GetPageFrm() != pPageFrm )
             {
-                SwTxtFrm* pAnchorCharFrm = pAnchoredObj->FindAnchorCharFrm();
+                SwTextFrm* pAnchorCharFrm = pAnchoredObj->FindAnchorCharFrm();
                 if ( pAnchorCharFrm &&
                      pAnchoredObj->GetPageFrm() == pAnchorCharFrm->FindPageFrm() )
                 {
@@ -2324,11 +2324,11 @@ void SwFlyFrm::NotifyDrawObj()
     pObj->SetRectsDirty();
     pObj->SetChanged();
     pObj->BroadcastObjectChange();
-    if ( GetFmt()->GetSurround().IsContour() )
+    if ( GetFormat()->GetSurround().IsContour() )
         ClrContourCache( pObj );
 }
 
-Size SwFlyFrm::CalcRel( const SwFmtFrmSize &rSz ) const
+Size SwFlyFrm::CalcRel( const SwFormatFrmSize &rSz ) const
 {
     Size aRet( rSz.GetSize() );
 
@@ -2412,19 +2412,19 @@ static SwTwips lcl_CalcAutoWidth( const SwLayoutFrm& rFrm )
         {
             nMin = lcl_CalcAutoWidth( *static_cast<const SwSectionFrm*>(pFrm) );
         }
-        if ( pFrm->IsTxtFrm() )
+        if ( pFrm->IsTextFrm() )
         {
-            nMin = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pFrm))->CalcFitToContent();
+            nMin = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pFrm))->CalcFitToContent();
             const SvxLRSpaceItem &rSpace =
-                static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode()->GetSwAttrSet().GetLRSpace();
-            if (!static_cast<const SwTxtFrm*>(pFrm)->IsLocked())
-                nMin += rSpace.GetRight() + rSpace.GetTxtLeft() + rSpace.GetTxtFirstLineOfst();
+                static_cast<const SwTextFrm*>(pFrm)->GetTextNode()->GetSwAttrSet().GetLRSpace();
+            if (!static_cast<const SwTextFrm*>(pFrm)->IsLocked())
+                nMin += rSpace.GetRight() + rSpace.GetTextLeft() + rSpace.GetTextFirstLineOfst();
         }
         else if ( pFrm->IsTabFrm() )
         {
-            const SwFmtFrmSize& rTblFmtSz = static_cast<const SwTabFrm*>(pFrm)->GetTable()->GetFrmFmt()->GetFrmSize();
-            if ( USHRT_MAX == rTblFmtSz.GetSize().Width() ||
-                 text::HoriOrientation::NONE == static_cast<const SwTabFrm*>(pFrm)->GetFmt()->GetHoriOrient().GetHoriOrient() )
+            const SwFormatFrmSize& rTableFormatSz = static_cast<const SwTabFrm*>(pFrm)->GetTable()->GetFrameFormat()->GetFrmSize();
+            if ( USHRT_MAX == rTableFormatSz.GetSize().Width() ||
+                 text::HoriOrientation::NONE == static_cast<const SwTabFrm*>(pFrm)->GetFormat()->GetHoriOrient().GetHoriOrient() )
             {
                 const SwPageFrm* pPage = rFrm.FindPageFrm();
                 // auto width table
@@ -2434,7 +2434,7 @@ static SwTwips lcl_CalcAutoWidth( const SwLayoutFrm& rFrm )
             }
             else
             {
-                nMin = rTblFmtSz.GetSize().Width();
+                nMin = rTableFormatSz.GetSize().Width();
             }
         }
 
@@ -2452,18 +2452,18 @@ SwTwips SwFlyFrm::CalcAutoWidth() const
     return lcl_CalcAutoWidth( *this );
 }
 
-/// OD 16.04.2003 #i13147# - If called for paint and the <SwNoTxtFrm> contains
+/// OD 16.04.2003 #i13147# - If called for paint and the <SwNoTextFrm> contains
 /// a graphic, load of intrinsic graphic has to be avoided.
 bool SwFlyFrm::GetContour( tools::PolyPolygon&   rContour,
                            const bool _bForPaint ) const
 {
     bool bRet = false;
-    if( GetFmt()->GetSurround().IsContour() && Lower() &&
-        Lower()->IsNoTxtFrm() )
+    if( GetFormat()->GetSurround().IsContour() && Lower() &&
+        Lower()->IsNoTextFrm() )
     {
-        SwNoTxtNode *pNd = const_cast<SwNoTxtNode*>(static_cast<const SwNoTxtNode*>(static_cast<const SwCntntFrm*>(Lower())->GetNode()));
+        SwNoTextNode *pNd = const_cast<SwNoTextNode*>(static_cast<const SwNoTextNode*>(static_cast<const SwContentFrm*>(Lower())->GetNode()));
         // OD 16.04.2003 #i13147# - determine <GraphicObject> instead of <Graphic>
-        // in order to avoid load of graphic, if <SwNoTxtNode> contains a graphic
+        // in order to avoid load of graphic, if <SwNoTextNode> contains a graphic
         // node and method is called for paint.
         const GraphicObject* pGrfObj = NULL;
         bool bGrfObjCreated = false;
@@ -2477,7 +2477,7 @@ bool SwFlyFrm::GetContour( tools::PolyPolygon&   rContour,
             pGrfObj = new GraphicObject( pNd->GetGraphic() );
             bGrfObjCreated = true;
         }
-        OSL_ENSURE( pGrfObj, "SwFlyFrm::GetContour() - No Graphic/GraphicObject found at <SwNoTxtNode>." );
+        OSL_ENSURE( pGrfObj, "SwFlyFrm::GetContour() - No Graphic/GraphicObject found at <SwNoTextNode>." );
         if ( pGrfObj && pGrfObj->GetType() != GRAPHIC_NONE )
         {
             if( !pNd->HasContour() )
@@ -2486,7 +2486,7 @@ bool SwFlyFrm::GetContour( tools::PolyPolygon&   rContour,
                 // during paint. Thus, return (value of <bRet> should be <false>).
                 if ( pGrfNd && _bForPaint )
                 {
-                    OSL_FAIL( "SwFlyFrm::GetContour() - No Contour found at <SwNoTxtNode> during paint." );
+                    OSL_FAIL( "SwFlyFrm::GetContour() - No Contour found at <SwNoTextNode> during paint." );
                     return bRet;
                 }
                 pNd->CreateContour();
@@ -2497,7 +2497,7 @@ bool SwFlyFrm::GetContour( tools::PolyPolygon&   rContour,
             SwRect aClip;
             SwRect aOrig;
             Lower()->Calc();
-            static_cast<const SwNoTxtFrm*>(Lower())->GetGrfArea( aClip, &aOrig, false );
+            static_cast<const SwNoTextFrm*>(Lower())->GetGrfArea( aClip, &aOrig, false );
             // OD 16.04.2003 #i13147# - copy method code <SvxContourDlg::ScaleContour(..)>
             // in order to avoid that graphic has to be loaded for contour scale.
             //SvxContourDlg::ScaleContour( rContour, aGrf, MAP_TWIP, aOrig.SSize() );
@@ -2574,17 +2574,17 @@ void SwFlyFrm::InvalidateObjPos()
     InvalidateObjRectWithSpaces();
 }
 
-SwFrmFmt& SwFlyFrm::GetFrmFmt()
+SwFrameFormat& SwFlyFrm::GetFrameFormat()
 {
-    OSL_ENSURE( GetFmt(),
-            "<SwFlyFrm::GetFrmFmt()> - missing frame format -> crash." );
-    return *GetFmt();
+    OSL_ENSURE( GetFormat(),
+            "<SwFlyFrm::GetFrameFormat()> - missing frame format -> crash." );
+    return *GetFormat();
 }
-const SwFrmFmt& SwFlyFrm::GetFrmFmt() const
+const SwFrameFormat& SwFlyFrm::GetFrameFormat() const
 {
-    OSL_ENSURE( GetFmt(),
-            "<SwFlyFrm::GetFrmFmt()> - missing frame format -> crash." );
-    return *GetFmt();
+    OSL_ENSURE( GetFormat(),
+            "<SwFlyFrm::GetFrameFormat()> - missing frame format -> crash." );
+    return *GetFormat();
 }
 
 const SwRect SwFlyFrm::GetObjRect() const
@@ -2637,21 +2637,21 @@ bool SwFlyFrm::IsFormatPossible() const
            !IsLocked() && !IsColLocked();
 }
 
-void SwFlyFrm::GetAnchoredObjects( std::list<SwAnchoredObject*>& aList, const SwFmt& rFmt )
+void SwFlyFrm::GetAnchoredObjects( std::list<SwAnchoredObject*>& aList, const SwFormat& rFormat )
 {
-    SwIterator<SwFlyFrm,SwFmt> aIter( rFmt );
+    SwIterator<SwFlyFrm,SwFormat> aIter( rFormat );
     for( SwFlyFrm* pFlyFrm = aIter.First(); pFlyFrm; pFlyFrm = aIter.Next() )
         aList.push_back( pFlyFrm );
 }
 
-const SwFlyFrmFmt * SwFlyFrm::GetFmt() const
+const SwFlyFrameFormat * SwFlyFrm::GetFormat() const
 {
-    return static_cast< const SwFlyFrmFmt * >( GetDep() );
+    return static_cast< const SwFlyFrameFormat * >( GetDep() );
 }
 
-SwFlyFrmFmt * SwFlyFrm::GetFmt()
+SwFlyFrameFormat * SwFlyFrm::GetFormat()
 {
-    return static_cast< SwFlyFrmFmt * >( GetDep() );
+    return static_cast< SwFlyFrameFormat * >( GetDep() );
 }
 
 void SwFlyFrm::Calc() const
@@ -2679,9 +2679,9 @@ SwTwips SwFlyFrm::CalcContentHeight(const SwBorderAttrs *pAttrs, const SwTwips n
             while ( pFrm )
             {
                 nHeight += (pFrm->Frm().*fnRect->fnGetHeight)();
-                if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsUndersized() )
-                // This TxtFrm would like to be a bit larger
-                    nHeight += static_cast<SwTxtFrm*>(pFrm)->GetParHeight()
+                if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsUndersized() )
+                // This TextFrm would like to be a bit larger
+                    nHeight += static_cast<SwTextFrm*>(pFrm)->GetParHeight()
                             - (pFrm->Prt().*fnRect->fnGetHeight)();
                 else if( pFrm->IsSctFrm() && static_cast<SwSectionFrm*>(pFrm)->IsUndersized() )
                     nHeight += static_cast<SwSectionFrm*>(pFrm)->Undersize();
@@ -2704,7 +2704,7 @@ SwTwips SwFlyFrm::CalcContentHeight(const SwBorderAttrs *pAttrs, const SwTwips n
                     // only Writer fly frames, which follow the text flow.
                     if ( pFly->IsFlyLayFrm() &&
                         pFly->Frm().Top() != FAR_AWAY &&
-                        pFly->GetFmt()->GetFollowTextFlow().GetValue() )
+                        pFly->GetFormat()->GetFollowTextFlow().GetValue() )
                     {
                         SwTwips nDist = -(pFly->Frm().*fnRect->
                             fnBottomDist)( nTop );
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 20ac174c1a3d..fde2e2d91843 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
 namespace
 {
 
-static inline SwTwips lcl_GetTopForObjPos(const SwCntntFrm* pCnt, const bool bVert, const bool bVertL2R)
+static inline SwTwips lcl_GetTopForObjPos(const SwContentFrm* pCnt, const bool bVert, const bool bVertL2R)
 {
     if ( bVert )
     {
@@ -66,11 +66,11 @@ static inline SwTwips lcl_GetTopForObjPos(const SwCntntFrm* pCnt, const bool bVe
 
 }
 
-SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
-    SwFlyFreeFrm( pFmt, pSib, pAnch )
+SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
+    SwFlyFreeFrm( pFormat, pSib, pAnch )
 {
     bAtCnt = true;
-    bAutoPosition = (FLY_AT_CHAR == pFmt->GetAnchor().GetAnchorId());
+    bAutoPosition = (FLY_AT_CHAR == pFormat->GetAnchor().GetAnchorId());
 }
 
 // #i28701#
@@ -79,7 +79,7 @@ TYPEINIT1(SwFlyAtCntFrm,SwFlyFreeFrm);
 void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
     const sal_uInt16 nWhich = pNew ? pNew->Which() : 0;
-    const SwFmtAnchor *pAnch = 0;
+    const SwFormatAnchor *pAnch = 0;
 
     if( RES_ATTRSET_CHG == nWhich && SfxItemState::SET ==
         static_cast<const SwAttrSetChg*>(pNew)->GetChgSet()->GetItemState( RES_ANCHOR, false,
@@ -91,27 +91,27 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
         //Change anchor, I move myself to a new place.
         //The anchor type must not change, this is only possible using
         //SwFEShell.
-        pAnch = static_cast<const SwFmtAnchor*>(pNew);
+        pAnch = static_cast<const SwFormatAnchor*>(pNew);
     }
 
     if( pAnch )
     {
-        OSL_ENSURE( pAnch->GetAnchorId() == GetFmt()->GetAnchor().GetAnchorId(),
+        OSL_ENSURE( pAnch->GetAnchorId() == GetFormat()->GetAnchor().GetAnchorId(),
                 "Illegal change of anchor type. " );
 
         //Unregister, get hold of a new anchor and attach it
         SwRect aOld( GetObjRectWithSpaces() );
         SwPageFrm *pOldPage = FindPageFrm();
         const SwFrm *pOldAnchor = GetAnchorFrm();
-        SwCntntFrm *pCntnt = const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(GetAnchorFrm()));
+        SwContentFrm *pContent = const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(GetAnchorFrm()));
         AnchorFrm()->RemoveFly( this );
 
-        const bool bBodyFtn = (pCntnt->IsInDocBody() || pCntnt->IsInFtn());
+        const bool bBodyFootnote = (pContent->IsInDocBody() || pContent->IsInFootnote());
 
         // Search the new anchor using the NodeIdx; the relation between old
         // and new NodeIdx determines the search direction
-        const SwNodeIndex aNewIdx( pAnch->GetCntntAnchor()->nNode );
-        SwNodeIndex aOldIdx( *pCntnt->GetNode() );
+        const SwNodeIndex aNewIdx( pAnch->GetContentAnchor()->nNode );
+        SwNodeIndex aOldIdx( *pContent->GetNode() );
 
         //fix: depending on which index was smaller, searching in the do-while
         //loop previously was done forward or backwards respectively. This however
@@ -122,35 +122,35 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
         const bool bNext = aOldIdx < aNewIdx;
         // consider the case that at found anchor frame candidate already a
         // fly frame of the given fly format is registered.
-        // consider, that <pCntnt> is the already
+        // consider, that <pContent> is the already
         // the new anchor frame.
         bool bFound( aOldIdx == aNewIdx );
-        while ( pCntnt && !bFound )
+        while ( pContent && !bFound )
         {
             do
             {
                 if ( bNext )
-                    pCntnt = pCntnt->GetNextCntntFrm();
+                    pContent = pContent->GetNextContentFrm();
                 else
-                    pCntnt = pCntnt->GetPrevCntntFrm();
-            } while ( pCntnt &&
-                      !( bBodyFtn == ( pCntnt->IsInDocBody() ||
-                                       pCntnt->IsInFtn() ) ) );
-            if ( pCntnt )
-                aOldIdx = *pCntnt->GetNode();
+                    pContent = pContent->GetPrevContentFrm();
+            } while ( pContent &&
+                      !( bBodyFootnote == ( pContent->IsInDocBody() ||
+                                       pContent->IsInFootnote() ) ) );
+            if ( pContent )
+                aOldIdx = *pContent->GetNode();
 
             // check, if at found anchor frame candidate already a fly frame
             // of the given fly frame format is registered.
             bFound = aOldIdx == aNewIdx;
-            if (bFound && pCntnt && pCntnt->GetDrawObjs())
+            if (bFound && pContent && pContent->GetDrawObjs())
             {
-                SwFrmFmt* pMyFlyFrmFmt( &GetFrmFmt() );
-                SwSortedObjs &rObjs = *pCntnt->GetDrawObjs();
+                SwFrameFormat* pMyFlyFrameFormat( &GetFrameFormat() );
+                SwSortedObjs &rObjs = *pContent->GetDrawObjs();
                 for( size_t i = 0; i < rObjs.size(); ++i)
                 {
                     SwFlyFrm* pFlyFrm = dynamic_cast<SwFlyFrm*>(rObjs[i]);
                     if ( pFlyFrm &&
-                         &(pFlyFrm->GetFrmFmt()) == pMyFlyFrmFmt )
+                         &(pFlyFrm->GetFrameFormat()) == pMyFlyFrameFormat )
                     {
                         bFound = false;
                         break;
@@ -158,21 +158,21 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
                 }
             }
         }
-        if ( !pCntnt )
+        if ( !pContent )
         {
-            SwCntntNode *pNode = aNewIdx.GetNode().GetCntntNode();
-            pCntnt = pNode->getLayoutFrm( getRootFrm(), &pOldAnchor->Frm().Pos(), 0, false );
-            OSL_ENSURE( pCntnt, "Neuen Anker nicht gefunden" );
+            SwContentNode *pNode = aNewIdx.GetNode().GetContentNode();
+            pContent = pNode->getLayoutFrm( getRootFrm(), &pOldAnchor->Frm().Pos(), 0, false );
+            OSL_ENSURE( pContent, "Neuen Anker nicht gefunden" );
         }
         //Flys are never attached to a follow, but always on the master which
         //we are going to search now.
-        SwCntntFrm* pFlow = pCntnt;
+        SwContentFrm* pFlow = pContent;
         while ( pFlow->IsFollow() )
             pFlow = pFlow->FindMaster();
-        pCntnt = pFlow;
+        pContent = pFlow;
 
         //and *puff* it's attached...
-        pCntnt->AppendFly( this );
+        pContent->AppendFly( this );
         if ( pOldPage && pOldPage != FindPageFrm() )
             NotifyBackground( pOldPage, aOld, PREP_FLY_LEAVE );
 
@@ -310,7 +310,7 @@ bool SwOszControl::ChkOsz()
 |*      the anchor reacts to changes of the fly. To this reaction the fly must
 |*      certaily react too. Sadly this can lead to oscillations; for example the
 |*      fly wants to go down therefore the content can go up - this leads to a
-|*      smaller TxtFrm thus the fly needs to go up again whereby the text will
+|*      smaller TextFrm thus the fly needs to go up again whereby the text will
 |*      get pushed down...
 |*      To avoid such oscillations, a small position stack is built. If the fly
 |*      reaches a position which it already had once, the action is stopped.
@@ -323,7 +323,7 @@ bool SwOszControl::ChkOsz()
 |*/
 void SwFlyAtCntFrm::MakeAll()
 {
-    if ( !GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) )
+    if ( !GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) )
     {
         return;
     }
@@ -343,19 +343,19 @@ void SwFlyAtCntFrm::MakeAll()
         {
             bSetCompletePaintOnInvalidate = true;
             {
-                SwFlyFrmFmt *pFmt = GetFmt();
-                const SwFmtFrmSize &rFrmSz = GetFmt()->GetFrmSize();
+                SwFlyFrameFormat *pFormat = GetFormat();
+                const SwFormatFrmSize &rFrmSz = GetFormat()->GetFrmSize();
                 if( rFrmSz.GetHeightPercent() != 0xFF &&
                     rFrmSz.GetHeightPercent() >= 100 )
                 {
-                    pFmt->LockModify();
-                    SwFmtSurround aMain( pFmt->GetSurround() );
+                    pFormat->LockModify();
+                    SwFormatSurround aMain( pFormat->GetSurround() );
                     if ( aMain.GetSurround() == SURROUND_NONE )
                     {
                         aMain.SetSurround( SURROUND_THROUGHT );
-                        pFmt->SetFmtAttr( aMain );
+                        pFormat->SetFormatAttr( aMain );
                     }
-                    pFmt->UnlockModify();
+                    pFormat->UnlockModify();
                 }
             }
 
@@ -366,7 +366,7 @@ void SwFlyAtCntFrm::MakeAll()
             // contains the anchor position. E.g., for at-character anchored
             // object this can be the follow frame of the anchor frame.
             const bool bFormatAnchor =
-                    !static_cast<const SwTxtFrm*>( GetAnchorFrmContainingAnchPos() )->IsAnyJoinLocked() &&
+                    !static_cast<const SwTextFrm*>( GetAnchorFrmContainingAnchPos() )->IsAnyJoinLocked() &&
                     !ConsiderObjWrapInfluenceOnObjPos() &&
                     !ConsiderObjWrapInfluenceOfOtherObjs();
 
@@ -404,10 +404,10 @@ void SwFlyAtCntFrm::MakeAll()
                 // wrapping style influence is considered on object positioning
                 if ( bFormatAnchor )
                 {
-                    SwTxtFrm& rAnchPosAnchorFrm =
-                            dynamic_cast<SwTxtFrm&>(*GetAnchorFrmContainingAnchPos());
+                    SwTextFrm& rAnchPosAnchorFrm =
+                            dynamic_cast<SwTextFrm&>(*GetAnchorFrmContainingAnchPos());
                     // #i58182# - For the usage of new method
-                    // <SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..)>
+                    // <SwObjectFormatterTextFrm::CheckMovedFwdCondition(..)>
                     // to check move forward of anchor frame due to the object
                     // positioning it's needed to know, if the object is anchored
                     // at the master frame before the anchor frame is formatted.
@@ -417,35 +417,35 @@ void SwFlyAtCntFrm::MakeAll()
                     // perform complete format of anchor text frame and its
                     // previous frames, which have become invalid due to the
                     // fly frame format.
-                    SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( rAnchPosAnchorFrm );
+                    SwObjectFormatterTextFrm::FormatAnchorFrmAndItsPrevs( rAnchPosAnchorFrm );
                     // #i35911#
                     // #i40444#
                     // #i58182# - usage of new method
-                    // <SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..)>
+                    // <SwObjectFormatterTextFrm::CheckMovedFwdCondition(..)>
                     sal_uInt32 nToPageNum( 0L );
                     bool bDummy( false );
-                    if ( SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
+                    if ( SwObjectFormatterTextFrm::CheckMovedFwdCondition(
                                         *this, GetPageFrm()->GetPhyPageNum(),
                                         bAnchoredAtMaster, nToPageNum, bDummy ) )
                     {
                         bConsiderWrapInfluenceDueToMovedFwdAnchor = true;
                         // mark anchor text frame
                         // directly, that it is moved forward by object positioning.
-                        SwTxtFrm* pAnchorTxtFrm( static_cast<SwTxtFrm*>(AnchorFrm()) );
+                        SwTextFrm* pAnchorTextFrm( static_cast<SwTextFrm*>(AnchorFrm()) );
                         bool bInsert( true );
                         sal_uInt32 nAnchorFrmToPageNum( 0L );
-                        const SwDoc& rDoc = *(GetFrmFmt().GetDoc());
+                        const SwDoc& rDoc = *(GetFrameFormat().GetDoc());
                         if ( SwLayouter::FrmMovedFwdByObjPos(
-                                                rDoc, *pAnchorTxtFrm, nAnchorFrmToPageNum ) )
+                                                rDoc, *pAnchorTextFrm, nAnchorFrmToPageNum ) )
                         {
                             if ( nAnchorFrmToPageNum < nToPageNum )
-                                SwLayouter::RemoveMovedFwdFrm( rDoc, *pAnchorTxtFrm );
+                                SwLayouter::RemoveMovedFwdFrm( rDoc, *pAnchorTextFrm );
                             else
                                 bInsert = false;
                         }
                         if ( bInsert )
                         {
-                            SwLayouter::InsertMovedFwdFrm( rDoc, *pAnchorTxtFrm,
+                            SwLayouter::InsertMovedFwdFrm( rDoc, *pAnchorTextFrm,
                                                            nToPageNum );
                         }
                     }
@@ -462,18 +462,18 @@ void SwFlyAtCntFrm::MakeAll()
                          HasFixSize() && IsClipped() &&
                          GetAnchorFrm()->GetUpper()->IsCellFrm() )
                     {
-                        SwFrmFmt* pFmt = GetFmt();
-                        const SwFmtFrmSize& rFrmSz = pFmt->GetFrmSize();
+                        SwFrameFormat* pFormat = GetFormat();
+                        const SwFormatFrmSize& rFrmSz = pFormat->GetFrmSize();
                         if ( rFrmSz.GetWidthPercent() &&
                              rFrmSz.GetHeightPercent() == 0xFF )
                         {
-                            SwFmtSurround aSurround( pFmt->GetSurround() );
+                            SwFormatSurround aSurround( pFormat->GetSurround() );
                             if ( aSurround.GetSurround() == SURROUND_NONE )
                             {
-                                pFmt->LockModify();
+                                pFormat->LockModify();
                                 aSurround.SetSurround( SURROUND_THROUGHT );
-                                pFmt->SetFmtAttr( aSurround );
-                                pFmt->UnlockModify();
+                                pFormat->SetFormatAttr( aSurround );
+                                pFormat->UnlockModify();
                                 bOsz = false;
                                 OSL_FAIL( "<SwFlyAtCntFrm::MakeAll()> - special loop prevention for dedicated document of b6403541 applied" );
                             }
@@ -494,7 +494,7 @@ void SwFlyAtCntFrm::MakeAll()
                       !bConsiderWrapInfluenceDueToOverlapPrevCol &&
                       // #i40444#
                       !bConsiderWrapInfluenceDueToMovedFwdAnchor &&
-                      GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) );
+                      GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) );
 
             // #i3317# - instead of attribute change apply
             // temporarly the 'straightforward positioning process'.
@@ -559,10 +559,10 @@ public:
 
 static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
                                          const Point &rPt,
-                                         const SwCntntFrm *pCnt )
+                                         const SwContentFrm *pCnt )
 {
     rRet.nSub = 0;
-    //If the point stays inside the Cnt everything is clear already; the Cntnt
+    //If the point stays inside the Cnt everything is clear already; the Content
     //automatically has a distance of 0.
     if ( pCnt->Frm().IsInside( rPt ) )
     {
@@ -726,7 +726,7 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
                       ( pLay->IsInSct() &&
                       pLay->FindSctFrm()->GetUpper()->Frm().Top() <= rPt.Y())) )
             {
-                if ( pLay->IsFtnContFrm() )
+                if ( pLay->IsFootnoteContFrm() )
                 {
                     if ( !static_cast<const SwLayoutFrm*>(pLay)->Lower() )
                     {
@@ -837,7 +837,7 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
                     else
                         rRet.nMain += nDiff;
                 }
-                if ( pLay->IsFtnContFrm() && !static_cast<const SwLayoutFrm*>(pLay)->Lower() )
+                if ( pLay->IsFootnoteContFrm() && !static_cast<const SwLayoutFrm*>(pLay)->Lower() )
                 {
                     SwFrm *pDel = const_cast<SwFrm*>(pLay);
                     pDel->Cut();
@@ -854,25 +854,25 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
 }
 
 static sal_uInt64 lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
-                          const SwCntntFrm *& rpCnt,
-                          const bool bBody, const bool bFtn )
+                          const SwContentFrm *& rpCnt,
+                          const bool bBody, const bool bFootnote )
 {
     // Searches below pLay the nearest Cnt to the point. The reference point of
-    //the Cntnts is always the left upper corner.
+    //the Contents is always the left upper corner.
     //The Cnt should preferably be above the point.
 
     rpCnt = 0;
     sal_uInt64 nDistance = SAL_MAX_UINT64;
     sal_uInt64 nNearest  = SAL_MAX_UINT64;
-    const SwCntntFrm *pCnt = pLay ? pLay->ContainsCntnt() : NULL;
+    const SwContentFrm *pCnt = pLay ? pLay->ContainsContent() : NULL;
 
-    while ( pCnt && (bBody != pCnt->IsInDocBody() || bFtn != pCnt->IsInFtn()))
+    while ( pCnt && (bBody != pCnt->IsInDocBody() || bFootnote != pCnt->IsInFootnote()))
     {
-        pCnt = pCnt->GetNextCntntFrm();
+        pCnt = pCnt->GetNextContentFrm();
         if ( !pLay->IsAnLower( pCnt ) )
             pCnt = 0;
     }
-    const SwCntntFrm *pNearest = pCnt;
+    const SwContentFrm *pNearest = pCnt;
     if ( pCnt )
     {
         do
@@ -899,10 +899,10 @@ static sal_uInt64 lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
                 nNearest = nDiff;
                 pNearest = pCnt;
             }
-            pCnt = pCnt->GetNextCntntFrm();
+            pCnt = pCnt->GetNextContentFrm();
             while ( pCnt &&
-                    (bBody != pCnt->IsInDocBody() || bFtn != pCnt->IsInFtn()))
-                pCnt = pCnt->GetNextCntntFrm();
+                    (bBody != pCnt->IsInDocBody() || bFootnote != pCnt->IsInFootnote()))
+                pCnt = pCnt->GetNextContentFrm();
 
         }  while ( pCnt && pLay->IsAnLower( pCnt ) );
     }
@@ -913,29 +913,29 @@ static sal_uInt64 lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
     return nDistance;
 }
 
-static const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt,
-                                  const bool bBody, const bool bFtn )
+static const SwContentFrm * lcl_FindCnt( const Point &rPt, const SwContentFrm *pCnt,
+                                  const bool bBody, const bool bFootnote )
 {
-    //Starting from pCnt searches the CntntFrm whose left upper corner is the
+    //Starting from pCnt searches the ContentFrm whose left upper corner is the
     //nearest to the point.
-    //Always returns a CntntFrm.
+    //Always returns a ContentFrm.
 
-    //First the nearest Cntnt inside the page which contains the Cntnt is
+    //First the nearest Content inside the page which contains the Content is
     //searched. Starting from this page the pages in both directions need to
-    //be considered. If possible a Cntnt is returned whose Y-position is
+    //be considered. If possible a Content is returned whose Y-position is
     //above the point.
-    const SwCntntFrm  *pRet, *pNew;
+    const SwContentFrm  *pRet, *pNew;
     const SwLayoutFrm *pLay = pCnt->FindPageFrm();
     sal_uInt64 nDist; // not sure if a sal_Int32 would be enough?
 
-    nDist = ::lcl_FindCntDiff( rPt, pLay, pNew, bBody, bFtn );
+    nDist = ::lcl_FindCntDiff( rPt, pLay, pNew, bBody, bFootnote );
     if ( pNew )
         pRet = pNew;
     else
     {   pRet  = pCnt;
         nDist = SAL_MAX_UINT64;
     }
-    const SwCntntFrm *pNearest = pRet;
+    const SwContentFrm *pNearest = pRet;
     sal_uInt64 nNearest = nDist;
 
     if ( pLay )
@@ -945,7 +945,7 @@ static const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt,
         for ( int i = 0; pPge->GetPrev() && (i < 3); ++i )
         {
             pPge = static_cast<const SwLayoutFrm*>(pPge->GetPrev());
-            const sal_uInt64 nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFtn );
+            const sal_uInt64 nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFootnote );
             if ( nNew < nDist )
             {
                 if ( pNew->Frm().Top() <= rPt.Y() )
@@ -970,7 +970,7 @@ static const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt,
         for ( int j = 0; pPge->GetNext() && (j < 3); ++j )
         {
             pPge = static_cast<const SwLayoutFrm*>(pPge->GetNext());
-            const sal_uInt64 nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFtn );
+            const sal_uInt64 nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFootnote );
             if ( nNew < nDist )
             {
                 if ( pNew->Frm().Top() <= rPt.Y() )
@@ -1016,15 +1016,15 @@ static void lcl_PointToPrt( Point &rPoint, const SwFrm *pFrm )
  *  This is used to show anchors as well as changing anchors
  *  when dragging paragraph bound objects.
  */
-const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
+const SwContentFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
                               const bool bBodyOnly )
 {
     //Search the nearest Cnt around the given document position in the text
     //flow. The given anchor is the starting Frm.
-    const SwCntntFrm* pCnt;
-    if ( pOldAnch->IsCntntFrm() )
+    const SwContentFrm* pCnt;
+    if ( pOldAnch->IsContentFrm() )
     {
-        pCnt = static_cast<const SwCntntFrm*>(pOldAnch);
+        pCnt = static_cast<const SwContentFrm*>(pOldAnch);
     }
     else
     {
@@ -1035,13 +1035,13 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
             SwRect aTmpRect( aTmp, Size(0,0) );
             pTmpLay = static_cast<const SwLayoutFrm*>(::FindPage( aTmpRect, pTmpLay->Lower() ));
         }
-        pCnt = pTmpLay->GetCntntPos( aTmp, false, bBodyOnly );
+        pCnt = pTmpLay->GetContentPos( aTmp, false, bBodyOnly );
     }
 
     //Take care to use meaningful ranges during search. This means to not enter
     //or leave header/footer in this case.
     const bool bBody = pCnt->IsInDocBody() || bBodyOnly;
-    const bool bFtn  = !bBodyOnly && pCnt->IsInFtn();
+    const bool bFootnote  = !bBodyOnly && pCnt->IsInFootnote();
 
     Point aNew( rNew );
     if ( bBody )
@@ -1061,8 +1061,8 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
         // Maybe the selected anchor is on the same page as the current anchor.
         // With this we won't run into problems with the columns.
         Point aTmp( aNew );
-        const SwCntntFrm *pTmp = pCnt->FindPageFrm()->
-                                        GetCntntPos( aTmp, false, true, false );
+        const SwContentFrm *pTmp = pCnt->FindPageFrm()->
+                                        GetContentPos( aTmp, false, true, false );
         if ( pTmp && pTmp->Frm().IsInside( aNew ) )
             return pTmp;
     }
@@ -1071,8 +1071,8 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
     //the nearest one respectively.
     //Not the direct distance is relevant but the distance which needs to be
     //traveled through the text flow.
-    const SwCntntFrm *pUpLst;
-    const SwCntntFrm *pUpFrm = pCnt;
+    const SwContentFrm *pUpLst;
+    const SwContentFrm *pUpFrm = pCnt;
     SwDistance nUp, nUpLst;
     ::lcl_CalcDownDist( nUp, aNew, pUpFrm );
     SwDistance nDown = nUp;
@@ -1080,10 +1080,10 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
     do
     {
         pUpLst = pUpFrm; nUpLst = nUp;
-        pUpFrm = pUpLst->GetPrevCntntFrm();
+        pUpFrm = pUpLst->GetPrevContentFrm();
         while ( pUpFrm &&
-                (bBody != pUpFrm->IsInDocBody() || bFtn != pUpFrm->IsInFtn()))
-            pUpFrm = pUpFrm->GetPrevCntntFrm();
+                (bBody != pUpFrm->IsInDocBody() || bFootnote != pUpFrm->IsInFootnote()))
+            pUpFrm = pUpFrm->GetPrevContentFrm();
         if ( pUpFrm )
         {
             ::lcl_CalcDownDist( nUp, aNew, pUpFrm );
@@ -1094,7 +1094,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
                 while ( pUpFrm && ((nUpLst < nUp && pUpFrm->IsInTab()) ||
                         bBody != pUpFrm->IsInDocBody()) )
                 {
-                    pUpFrm = pUpFrm->GetPrevCntntFrm();
+                    pUpFrm = pUpFrm->GetPrevContentFrm();
                     if ( pUpFrm )
                         ::lcl_CalcDownDist( nUp, aNew, pUpFrm );
                 }
@@ -1113,18 +1113,18 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
         }
     } while ( pUpFrm && ( ( bNegAllowed && nUp.nMain < 0 ) || ( nUp <= nUpLst ) ) );
 
-    const SwCntntFrm *pDownLst;
-    const SwCntntFrm *pDownFrm = pCnt;
+    const SwContentFrm *pDownLst;
+    const SwContentFrm *pDownFrm = pCnt;
     SwDistance nDownLst;
     if ( nDown.nMain < 0 )
         nDown.nMain = LONG_MAX;
     do
     {
         pDownLst = pDownFrm; nDownLst = nDown;
-        pDownFrm = pDownLst->GetNextCntntFrm();
+        pDownFrm = pDownLst->GetNextContentFrm();
         while ( pDownFrm &&
-                (bBody != pDownFrm->IsInDocBody() || bFtn != pDownFrm->IsInFtn()))
-            pDownFrm = pDownFrm->GetNextCntntFrm();
+                (bBody != pDownFrm->IsInDocBody() || bFootnote != pDownFrm->IsInFootnote()))
+            pDownFrm = pDownFrm->GetNextContentFrm();
         if ( pDownFrm )
         {
             ::lcl_CalcDownDist( nDown, aNew, pDownFrm );
@@ -1136,7 +1136,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
             {
                 while ( pDownFrm && ( ( nDown.nMain != LONG_MAX && pDownFrm->IsInTab()) || bBody != pDownFrm->IsInDocBody() ) )
                 {
-                    pDownFrm = pDownFrm->GetNextCntntFrm();
+                    pDownFrm = pDownFrm->GetNextContentFrm();
                     if ( pDownFrm )
                         ::lcl_CalcDownDist( nDown, aNew, pDownFrm );
                     if ( nDown.nMain < 0 )
@@ -1150,7 +1150,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
     } while ( pDownFrm && nDown <= nDownLst &&
               nDown.nMain != LONG_MAX && nDownLst.nMain != LONG_MAX );
 
-    //If we couldn't find one in both directions, we'll search the Cntnt whose
+    //If we couldn't find one in both directions, we'll search the Content whose
     //left upper corner is the nearest to the point. Such a situation may
     //happen, if the point doesn't lay in the text flow but in any margin.
     if ( nDownLst.nMain == LONG_MAX && nUpLst.nMain == LONG_MAX )
@@ -1161,7 +1161,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
         if ( pCnt->IsInFly() )
             return pCnt;
 
-        return ::lcl_FindCnt( aNew, pCnt, bBody, bFtn );
+        return ::lcl_FindCnt( aNew, pCnt, bBody, bFootnote );
     }
     else
         return nDownLst < nUpLst ? pDownLst : pUpLst;
@@ -1175,9 +1175,9 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
 
     if( ( GetAnchorFrm()->IsVertical() && !GetAnchorFrm()->IsVertLR() ) || GetAnchorFrm()->IsRightToLeft() )
         aNew.setX(aNew.getX() + Frm().Width());
-    SwCntntFrm *pCnt = const_cast<SwCntntFrm*>(::FindAnchor( GetAnchorFrm(), aNew ));
+    SwContentFrm *pCnt = const_cast<SwContentFrm*>(::FindAnchor( GetAnchorFrm(), aNew ));
     if( pCnt->IsProtected() )
-        pCnt = const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(GetAnchorFrm()));
+        pCnt = const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(GetAnchorFrm()));
 
     SwPageFrm *pTmpPage = 0;
     const bool bVert = pCnt->IsVertical();
@@ -1236,12 +1236,12 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
     {
         // Flys are never attached to the follow but always to the master,
         // which we're going to search now.
-        const SwCntntFrm *pOriginal = pCnt;
-        const SwCntntFrm *pFollow = pCnt;
+        const SwContentFrm *pOriginal = pCnt;
+        const SwContentFrm *pFollow = pCnt;
         while ( pCnt->IsFollow() )
         {
             do
-            {   pCnt = pCnt->GetPrevCntntFrm();
+            {   pCnt = pCnt->GetPrevContentFrm();
             } while ( pCnt->GetFollow() != pFollow );
             pFollow = pCnt;
         }
@@ -1284,7 +1284,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
         }
     }
 
-    SwFlyFrmFmt *pFmt = GetFmt();
+    SwFlyFrameFormat *pFormat = GetFormat();
 
     if( bVert )
     {
@@ -1310,34 +1310,34 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
                 nX = rNew.X() - pFrm->Frm().Left();
         }
     }
-    GetFmt()->GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
+    GetFormat()->GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
 
-    if( pCnt != GetAnchorFrm() || ( IsAutoPos() && pCnt->IsTxtFrm() &&
-                                  GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::HTML_MODE)) )
+    if( pCnt != GetAnchorFrm() || ( IsAutoPos() && pCnt->IsTextFrm() &&
+                                  GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::HTML_MODE)) )
     {
         //Set the anchor attribute according to the new Cnt.
-        SwFmtAnchor aAnch( pFmt->GetAnchor() );
-        SwPosition pos = *aAnch.GetCntntAnchor();
-        if( IsAutoPos() && pCnt->IsTxtFrm() )
+        SwFormatAnchor aAnch( pFormat->GetAnchor() );
+        SwPosition pos = *aAnch.GetContentAnchor();
+        if( IsAutoPos() && pCnt->IsTextFrm() )
         {
             SwCrsrMoveState eTmpState( MV_SETONLYTEXT );
             Point aPt( rNew );
             if( pCnt->GetCrsrOfst( &pos, aPt, &eTmpState )
                 && pos.nNode == *pCnt->GetNode() )
             {
-                if ( pCnt->GetNode()->GetTxtNode() != NULL )
+                if ( pCnt->GetNode()->GetTextNode() != NULL )
                 {
-                    const SwTxtAttr* pTxtInputFld =
-                        pCnt->GetNode()->GetTxtNode()->GetTxtAttrAt( pos.nContent.GetIndex(), RES_TXTATR_INPUTFIELD, SwTxtNode::PARENT );
-                    if ( pTxtInputFld != NULL )
+                    const SwTextAttr* pTextInputField =
+                        pCnt->GetNode()->GetTextNode()->GetTextAttrAt( pos.nContent.GetIndex(), RES_TXTATR_INPUTFIELD, SwTextNode::PARENT );
+                    if ( pTextInputField != NULL )
                     {
-                        pos.nContent = pTxtInputFld->GetStart();
+                        pos.nContent = pTextInputField->GetStart();
                     }
                 }
                 ResetLastCharRectHeight();
-                if( text::RelOrientation::CHAR == pFmt->GetVertOrient().GetRelationOrient() )
+                if( text::RelOrientation::CHAR == pFormat->GetVertOrient().GetRelationOrient() )
                     nY = LONG_MAX;
-                if( text::RelOrientation::CHAR == pFmt->GetHoriOrient().GetRelationOrient() )
+                if( text::RelOrientation::CHAR == pFormat->GetHoriOrient().GetRelationOrient() )
                     nX = LONG_MAX;
             }
             else
@@ -1358,8 +1358,8 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
         // re-created. Thus, delete all fly frames except the <this> before the
         // anchor attribute is change and re-create them afterwards.
         {
-            SwHandleAnchorNodeChg aHandleAnchorNodeChg( *pFmt, aAnch, this );
-            pFmt->GetDoc()->SetAttr( aAnch, *pFmt );
+            SwHandleAnchorNodeChg aHandleAnchorNodeChg( *pFormat, aAnch, this );
+            pFormat->GetDoc()->SetAttr( aAnch, *pFormat );
         }
     }
     else if ( pTmpPage && pTmpPage != GetPageFrm() )
@@ -1369,7 +1369,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
 
     ChgRelPos( aRelPos );
 
-    GetFmt()->GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
+    GetFormat()->GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
 
     if ( pOldPage != FindPageFrm() )
         ::Notify_Background( GetVirtDrawObj(), pOldPage, aOld, PREP_FLY_LEAVE, false );
@@ -1421,7 +1421,7 @@ void SwFlyAtCntFrm::MakeObjPos()
     }
 
     // use new class to position object
-    objectpositioning::SwToCntntAnchoredObjectPosition
+    objectpositioning::SwToContentAnchoredObjectPosition
             aObjPositioning( *GetVirtDrawObj() );
     aObjPositioning.CalcPosition();
 
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 7758b7af8117..dde26732eff6 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -27,11 +27,11 @@
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
 
-SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
-    SwFlyFrm( pFmt, pSib, pAnch )
+SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
+    SwFlyFrm( pFormat, pSib, pAnch )
 {
-    bInCnt = bInvalidLayout = bInvalidCntnt = true;
-    SwTwips nRel = pFmt->GetVertOrient().GetPos();
+    bInCnt = bInvalidLayout = bInvalidContent = true;
+    SwTwips nRel = pFormat->GetVertOrient().GetPos();
     // OD 2004-05-27 #i26791# - member <aRelPos> moved to <SwAnchoredObject>
     Point aRelPos;
     if( pAnch && pAnch->IsVertical() )
@@ -43,7 +43,7 @@ SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
 
 void SwFlyInCntFrm::DestroyImpl()
 {
-    if ( !GetFmt()->GetDoc()->IsInDtor() && GetAnchorFrm() )
+    if ( !GetFormat()->GetDoc()->IsInDtor() && GetAnchorFrm() )
     {
         SwRect aTmp( GetObjRectWithSpaces() );
         SwFlyInCntFrm::NotifyBackground( FindPageFrm(), aTmp, PREP_FLY_LEAVE );
@@ -124,7 +124,7 @@ void SwFlyInCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
     }
 
     if ( bCallPrepare && GetAnchorFrm() )
-        AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, GetFmt() );
+        AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, GetFormat() );
 }
 
 /// Here the content gets formatted initially.
@@ -133,10 +133,10 @@ void SwFlyInCntFrm::Format( const SwBorderAttrs *pAttrs )
     if ( !Frm().Height() )
     {
         Lock(); //don't format the anchor on the crook.
-        SwCntntFrm *pCntnt = ContainsCntnt();
-        while ( pCntnt )
-        {   pCntnt->Calc();
-            pCntnt = pCntnt->GetNextCntntFrm();
+        SwContentFrm *pContent = ContainsContent();
+        while ( pContent )
+        {   pContent->Calc();
+            pContent = pContent->GetNextContentFrm();
         }
         Unlock();
     }
@@ -153,8 +153,8 @@ void SwFlyInCntFrm::MakeObjPos()
     if ( !mbValidPos )
     {
         mbValidPos = true;
-        SwFlyFrmFmt *pFmt = GetFmt();
-        const SwFmtVertOrient &rVert = pFmt->GetVertOrient();
+        SwFlyFrameFormat *pFormat = GetFormat();
+        const SwFormatVertOrient &rVert = pFormat->GetVertOrient();
         //Update the current values in the format if needed, during this we of
         //course must not send any Modify.
         const bool bVert = GetAnchorFrm()->IsVertical();
@@ -165,11 +165,11 @@ void SwFlyInCntFrm::MakeObjPos()
             nAct = -nAct;
         if( nAct != nOld )
         {
-            SwFmtVertOrient aVert( rVert );
+            SwFormatVertOrient aVert( rVert );
             aVert.SetPos( nAct );
-            pFmt->LockModify();
-            pFmt->SetFmtAttr( aVert );
-            pFmt->UnlockModify();
+            pFormat->LockModify();
+            pFormat->SetFormatAttr( aVert );
+            pFormat->UnlockModify();
         }
     }
 }
@@ -178,7 +178,7 @@ void SwFlyInCntFrm::MakeObjPos()
 void SwFlyInCntFrm::_ActionOnInvalidation( const InvalidationType _nInvalid )
 {
     if ( INVALID_POS == _nInvalid || INVALID_ALL == _nInvalid )
-        AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, &GetFrmFmt() );
+        AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, &GetFrameFormat() );
 }
 
 void SwFlyInCntFrm::NotifyBackground( SwPageFrm *, const SwRect& rRect,
@@ -207,7 +207,7 @@ void SwFlyInCntFrm::RegistFlys()
 void SwFlyInCntFrm::MakeAll()
 {
     // OD 2004-01-19 #110582#
-    if ( !GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) )
+    if ( !GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) )
     {
         return;
     }
@@ -253,7 +253,7 @@ void SwFlyInCntFrm::MakeAll()
         // re-activate clipping of as-character anchored Writer fly frames
         // depending on compatibility option <ClipAsCharacterAnchoredWriterFlyFrames>
         if ( mbValidPos && mbValidSize &&
-             GetFmt()->getIDocumentSettingAccess()->get( DocumentSettingId::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME ) )
+             GetFormat()->getIDocumentSettingAccess()->get( DocumentSettingId::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME ) )
         {
             SwFrm* pFrm = AnchorFrm();
             if ( Frm().Left() == (pFrm->Frm().Left()+pFrm->Prt().Left()) &&
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 8e5dce7d6bdd..dd4866f44993 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -43,8 +43,8 @@
 
 using namespace ::com::sun::star;
 
-SwFlyFreeFrm::SwFlyFreeFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
-    SwFlyFrm( pFmt, pSib, pAnch ),
+SwFlyFreeFrm::SwFlyFreeFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
+    SwFlyFrm( pFormat, pSib, pAnch ),
     pPage( 0 ),
     // #i34753#
     mbNoMakePos( false ),
@@ -59,7 +59,7 @@ void SwFlyFreeFrm::DestroyImpl()
     // #i28701# - use new method <GetPageFrm()>
     if( GetPageFrm() )
     {
-        if( GetFmt()->GetDoc()->IsInDtor() )
+        if( GetFormat()->GetDoc()->IsInDtor() )
         {
             // #i29879# - remove also to-frame anchored Writer
             // fly frame from page.
@@ -88,11 +88,11 @@ SwFlyFreeFrm::~SwFlyFreeFrm()
 
 // #i28701#
 TYPEINIT1(SwFlyFreeFrm,SwFlyFrm);
-/** Notifies the background (all CntntFrms that currently are overlapping).
+/** Notifies the background (all ContentFrms that currently are overlapping).
  *
  * Additionally, the window is also directly invalidated (especially where
- * there are no overlapping CntntFrms).
- * This also takes CntntFrms within other Flys into account.
+ * there are no overlapping ContentFrms).
+ * This also takes ContentFrms within other Flys into account.
  */
 void SwFlyFreeFrm::NotifyBackground( SwPageFrm *pPageFrm,
                                      const SwRect& rRect, PrepareHint eHint )
@@ -102,7 +102,7 @@ void SwFlyFreeFrm::NotifyBackground( SwPageFrm *pPageFrm,
 
 void SwFlyFreeFrm::MakeAll()
 {
-    if ( !GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) )
+    if ( !GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) )
     {
         return;
     }
@@ -136,7 +136,7 @@ void SwFlyFreeFrm::MakeAll()
         if ( !IsNoMoveOnCheckClip() &&
              !( PositionLocked() &&
                 GetAnchorFrm()->IsInFly() &&
-                GetFrmFmt().GetFollowTextFlow().GetValue() ) )
+                GetFrameFormat().GetFollowTextFlow().GetValue() ) )
         {
             mbValidPos = false;
         }
@@ -149,7 +149,7 @@ void SwFlyFreeFrm::MakeAll()
     while ( !mbValidPos || !mbValidSize || !mbValidPrtArea || bFormatHeightOnly || !m_bValidContentPos )
     {
         SWRECTFN( this )
-        const SwFmtFrmSize *pSz;
+        const SwFormatFrmSize *pSz;
         {   // Additional scope, so aAccess will be destroyed before the check!
 
             SwBorderAttrAccess aAccess( SwFrm::GetCache(), this );
@@ -258,7 +258,7 @@ bool SwFlyFreeFrm::HasEnvironmentAutoSize() const
     return bRetVal;
 }
 
-void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
+void SwFlyFreeFrm::CheckClip( const SwFormatFrmSize &rSz )
 {
     // It's probably time now to take appropriate measures, if the Fly
     // doesn't fit into its surrounding.
@@ -307,7 +307,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
             Frm().Pos().X() = std::max( aClip.Left(), nClipRig - Frm().Width() );
             if ( Frm().Left() != nOld )
             {
-                const SwFmtHoriOrient &rH = GetFmt()->GetHoriOrient();
+                const SwFormatHoriOrient &rH = GetFormat()->GetHoriOrient();
                 // Left-aligned ones may not be moved to the left when they
                 // are avoiding another one.
                 if( rH.GetHoriOrient() == text::HoriOrientation::LEFT )
@@ -359,8 +359,8 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
             // (3) fly frames with 'auto' size
             // Note: section frames seems to be not critical - didn't found
             //       any critical layout situation so far.
-            if ( Lower() && Lower()->IsNoTxtFrm() &&
-                 ( static_cast<SwCntntFrm*>(Lower())->GetNode()->GetOLENode() ||
+            if ( Lower() && Lower()->IsNoTextFrm() &&
+                 ( static_cast<SwContentFrm*>(Lower())->GetNode()->GetOLENode() ||
                    !HasEnvironmentAutoSize() ) )
             {
                 // If width and height got adjusted, then the bigger
@@ -400,16 +400,16 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
                 // attributes permanentely. Maybe one day somebody dares to remove
                 // this code.
                 if ( aFrmRect.HasArea() &&
-                     static_cast<SwCntntFrm*>(Lower())->GetNode()->GetOLENode() &&
+                     static_cast<SwContentFrm*>(Lower())->GetNode()->GetOLENode() &&
                      ( bWidthClipped || bHeightClipped ) )
                 {
-                    SwFlyFrmFmt *pFmt = GetFmt();
-                    pFmt->LockModify();
-                    SwFmtFrmSize aFrmSize( rSz );
+                    SwFlyFrameFormat *pFormat = GetFormat();
+                    pFormat->LockModify();
+                    SwFormatFrmSize aFrmSize( rSz );
                     aFrmSize.SetWidth( aFrmRect.Width() );
                     aFrmSize.SetHeight( aFrmRect.Height() );
-                    pFmt->SetFmtAttr( aFrmSize );
-                    pFmt->UnlockModify();
+                    pFormat->SetFormatAttr( aFrmSize );
+                    pFormat->UnlockModify();
                 }
             }
 
@@ -435,7 +435,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
                     static_cast<SwLayoutFrm*>(pLow)->Lower()->Calc();
                     pLow = pLow->GetNext();
                 } while ( pLow );
-                ::CalcCntnt( this );
+                ::CalcContent( this );
                 ColUnlock();
                 if ( !mbValidSize && !bWidthClipped )
                     bFormatHeightOnly = mbValidSize = true;
@@ -463,8 +463,8 @@ bool SwFlyFreeFrm::IsFormatPossible() const
              ( GetAnchorFrm() && GetAnchorFrm()->IsInFly() ) );
 }
 
-SwFlyLayFrm::SwFlyLayFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
-    SwFlyFreeFrm( pFmt, pSib, pAnch )
+SwFlyLayFrm::SwFlyLayFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
+    SwFlyFreeFrm( pFormat, pSib, pAnch )
 {
     bLayout = true;
 }
@@ -476,7 +476,7 @@ void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
     const sal_uInt16 nWhich = pNew ? pNew->Which() : 0;
 
-    const SwFmtAnchor *pAnch = 0;
+    const SwFormatAnchor *pAnch = 0;
     if( RES_ATTRSET_CHG == nWhich && SfxItemState::SET ==
         static_cast<const SwAttrSetChg*>(pNew)->GetChgSet()->GetItemState( RES_ANCHOR, false,
             reinterpret_cast<const SfxPoolItem**>(&pAnch) ))
@@ -487,13 +487,13 @@ void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
         // Change of anchor. I'm attaching myself to the new place.
         // It's not allowed to change the anchor type. This is only
         // possible via SwFEShell.
-        pAnch = static_cast<const SwFmtAnchor*>(pNew);
+        pAnch = static_cast<const SwFormatAnchor*>(pNew);
     }
 
     if( pAnch )
     {
         OSL_ENSURE( pAnch->GetAnchorId() ==
-                GetFmt()->GetAnchor().GetAnchorId(),
+                GetFormat()->GetAnchor().GetAnchorId(),
                 "8-) Invalid change of anchor type." );
 
         // Unregister, get hold of the page, attach to the corresponding LayoutFrm.
@@ -524,12 +524,12 @@ void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
         }
         else
         {
-            SwNodeIndex aIdx( pAnch->GetCntntAnchor()->nNode );
-            SwCntntFrm *pCntnt = GetFmt()->GetDoc()->GetNodes().GoNext( &aIdx )->
-                         GetCntntNode()->getLayoutFrm( getRootFrm(), 0, 0, false );
-            if( pCntnt )
+            SwNodeIndex aIdx( pAnch->GetContentAnchor()->nNode );
+            SwContentFrm *pContent = GetFormat()->GetDoc()->GetNodes().GoNext( &aIdx )->
+                         GetContentNode()->getLayoutFrm( getRootFrm(), 0, 0, false );
+            if( pContent )
             {
-                SwFlyFrm *pTmp = pCntnt->FindFlyFrm();
+                SwFlyFrm *pTmp = pContent->FindFlyFrm();
                 if( pTmp )
                     pTmp->AppendFly( this );
             }
@@ -576,12 +576,12 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
             pFly->GetVirtDrawObj()->SetOrdNum( nNewNum );
     }
 
-    // Don't look further at Flys that sit inside the Cntnt.
+    // Don't look further at Flys that sit inside the Content.
     if ( pNew->IsFlyInCntFrm() )
         InvalidateFlyInCnt();
     else
     {
-        InvalidateFlyCntnt();
+        InvalidateFlyContent();
 
         if ( !pSortedObjs )
             pSortedObjs = new SwSortedObjs();
@@ -654,7 +654,7 @@ void SwPageFrm::RemoveFlyFromPage( SwFlyFrm *pToRemove )
         static_cast<SwRootFrm*>(GetUpper())->InvalidateBrowseWidth();
     }
 
-    // Don't look further at Flys that sit inside the Cntnt.
+    // Don't look further at Flys that sit inside the Content.
     if ( pToRemove->IsFlyInCntFrm() )
         return;
 
@@ -744,7 +744,7 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest )
     pToMove->SetPageFrm( pDest );
     pToMove->InvalidatePage( pDest );
     pToMove->SetNotifyBack();
-    pDest->InvalidateFlyCntnt();
+    pDest->InvalidateFlyContent();
     // #i28701#
     pToMove->UnlockPosition();
 
@@ -814,7 +814,7 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj )
             pFlyFrm->GetVirtDrawObj()->SetOrdNum( nNewNum );
     }
 
-    if ( FLY_AS_CHAR == _rNewObj.GetFrmFmt().GetAnchor().GetAnchorId() )
+    if ( FLY_AS_CHAR == _rNewObj.GetFrameFormat().GetAnchor().GetAnchorId() )
     {
         return;
     }
@@ -855,7 +855,7 @@ void SwPageFrm::RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj )
         if ( GetUpper() )
         {
             if (FLY_AS_CHAR !=
-                    _rToRemoveObj.GetFrmFmt().GetAnchor().GetAnchorId())
+                    _rToRemoveObj.GetFrameFormat().GetAnchor().GetAnchorId())
             {
                 static_cast<SwRootFrm*>(GetUpper())->SetSuperfluous();
                 InvalidatePage();
@@ -867,7 +867,7 @@ void SwPageFrm::RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj )
 }
 
 // #i50432# - adjust method description and synopsis.
-void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt )
+void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrameFormat* pFormat )
 {
     // #i50432# - consider the case that page is an empty page:
     // In this case append the fly frame at the next page
@@ -875,7 +875,7 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt )
             "<SwPageFrm::PlaceFly(..)> - empty page with no next page! -> fly frame appended at empty page" );
     if ( IsEmptyPage() && GetNext() )
     {
-        static_cast<SwPageFrm*>(GetNext())->PlaceFly( pFly, pFmt );
+        static_cast<SwPageFrm*>(GetNext())->PlaceFly( pFly, pFormat );
     }
     else
     {
@@ -885,8 +885,8 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt )
             AppendFly( pFly );
         else
         {
-            OSL_ENSURE( pFmt, ":-( No Format given for Fly." );
-            pFly = new SwFlyLayFrm( pFmt, this, this );
+            OSL_ENSURE( pFormat, ":-( No Format given for Fly." );
+            pFly = new SwFlyLayFrm( pFormat, this, this );
             AppendFly( pFly );
             ::RegistFlys( this, pFly );
         }
@@ -909,11 +909,11 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove )
     if ( pSdrObj->ISA(SwVirtFlyDrawObj) )
     {
         const SwFlyFrm* pFly = static_cast<const SwVirtFlyDrawObj*>(pSdrObj)->GetFlyFrm();
-        const bool bFollowTextFlow = pFly->GetFmt()->GetFollowTextFlow().GetValue();
+        const bool bFollowTextFlow = pFly->GetFormat()->GetFollowTextFlow().GetValue();
         // #i28701#
         const bool bConsiderWrapOnObjPos =
-                                pFly->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION);
-        const SwFmtVertOrient &rV = pFly->GetFmt()->GetVertOrient();
+                                pFly->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION);
+        const SwFormatVertOrient &rV = pFly->GetFormat()->GetVertOrient();
         if( pFly->IsFlyLayFrm() )
         {
             const SwFrm* pClip;
@@ -939,7 +939,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove )
                 (rRect.*fnRect->fnSetBottom)( (pClip->*fnRect->fnGetPrtBottom)() );
             }
             // horizontal clipping: Top and Bottom, also to PrtArea if necessary
-            const SwFmtHoriOrient &rH = pFly->GetFmt()->GetHoriOrient();
+            const SwFormatHoriOrient &rH = pFly->GetFormat()->GetHoriOrient();
             if( rH.GetHoriOrient() != text::HoriOrientation::NONE &&
                 rH.GetRelationOrient() == text::RelOrientation::PRINT_AREA )
             {
@@ -1081,9 +1081,9 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove )
                                 }
                                 pUp = pTmpFly;
                             }
-                            else if( pUp->IsInFtn() )
+                            else if( pUp->IsInFootnote() )
                             {
-                                const SwFtnFrm *pTmp = pUp->FindFtnFrm();
+                                const SwFootnoteFrm *pTmp = pUp->FindFootnoteFrm();
                                 while( pTmp->GetFollow() )
                                 {
                                     pTmp = pTmp->GetFollow();
@@ -1147,8 +1147,8 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove )
             }
             long nHeight = (9*(rRect.*fnRect->fnGetHeight)())/10;
             long nTop;
-            const SwFmt *pFmt = static_cast<SwContact*>(GetUserCall(pSdrObj))->GetFmt();
-            const SvxULSpaceItem &rUL = pFmt->GetULSpace();
+            const SwFormat *pFormat = static_cast<SwContact*>(GetUserCall(pSdrObj))->GetFormat();
+            const SvxULSpaceItem &rUL = pFormat->GetULSpace();
             if( bMove )
             {
                 nTop = bVert ? static_cast<const SwFlyInCntFrm*>(pFly)->GetRefPoint().X() :
@@ -1173,8 +1173,8 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove )
     else
     {
         const SwDrawContact *pC = static_cast<const SwDrawContact*>(GetUserCall(pSdrObj));
-        const SwFrmFmt  *pFmt = pC->GetFmt();
-        const SwFmtAnchor &rAnch = pFmt->GetAnchor();
+        const SwFrameFormat  *pFormat = pC->GetFormat();
+        const SwFormatAnchor &rAnch = pFormat->GetAnchor();
         if ( FLY_AS_CHAR == rAnch.GetAnchorId() )
         {
             const SwFrm* pAnchorFrm = pC->GetAnchorFrm( pSdrObj );
@@ -1190,7 +1190,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove )
             SWRECTFN( pAnchorFrm )
             long nHeight = (9*(rRect.*fnRect->fnGetHeight)())/10;
             long nTop;
-            const SvxULSpaceItem &rUL = pFmt->GetULSpace();
+            const SvxULSpaceItem &rUL = pFormat->GetULSpace();
             SwRect aSnapRect( pSdrObj->GetSnapRect() );
             long nTmpH = 0;
             if( bMove )
diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx
index 60c44bf1528e..e1f73d0eaaf8 100644
--- a/sw/source/core/layout/flypos.cxx
+++ b/sw/source/core/layout/flypos.cxx
@@ -36,32 +36,32 @@ bool SwPosFlyFrmCmp::operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr&
     return rA->GetNdIndex() < rB->GetNdIndex();
 }
 
-SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt,
+SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrameFormat* pFormat,
                             sal_uInt16 nArrPos )
-    : pFrmFmt( pFmt ), pNdIdx( const_cast<SwNodeIndex*>(&rIdx) )
+    : pFrameFormat( pFormat ), pNdIdx( const_cast<SwNodeIndex*>(&rIdx) )
 {
     bool bFnd = false;
-    const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+    const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
     if (FLY_AT_PAGE == rAnchor.GetAnchorId())
     {
         pNdIdx = new SwNodeIndex( rIdx );
     }
-    else if( pFmt->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
+    else if( pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
     {
-        if( RES_FLYFRMFMT == pFmt->Which() )
+        if( RES_FLYFRMFMT == pFormat->Which() )
         {
             // Let's see if we have an SdrObject for this
-            SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFmt>(*pFmt).First();
+            SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFormat>(*pFormat).First();
             if( pFly )
             {
                 nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum();
                 bFnd = true;
             }
         }
-        else if( RES_DRAWFRMFMT == pFmt->Which() )
+        else if( RES_DRAWFRMFMT == pFormat->Which() )
         {
             // Let's see if we have an SdrObject for this
-            SwDrawContact* pContact = SwIterator<SwDrawContact,SwFmt>(*pFmt).First();
+            SwDrawContact* pContact = SwIterator<SwDrawContact,SwFormat>(*pFormat).First();
             if( pContact )
             {
                 nOrdNum = pContact->GetMaster()->GetOrdNum();
@@ -72,14 +72,14 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt,
 
     if( !bFnd )
     {
-        nOrdNum = pFmt->GetDoc()->GetSpzFrmFmts()->size();
+        nOrdNum = pFormat->GetDoc()->GetSpzFrameFormats()->size();
         nOrdNum += nArrPos;
     }
 }
 
 SwPosFlyFrm::~SwPosFlyFrm()
 {
-    const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
+    const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
     if (FLY_AT_PAGE == rAnchor.GetAnchorId())
     {
         delete pNdIdx;
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 39fdfae1416b..3855f33ed544 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -87,10 +87,10 @@ SwFrmNotify::SwFrmNotify( SwFrm *pF ) :
     bValidSize( pF->GetValidSizeFlag() ),
     mbFrmDeleted( false )     // #i49383#
 {
-    if ( pF->IsTxtFrm() )
+    if ( pF->IsTextFrm() )
     {
-        mnFlyAnchorOfst = static_cast<SwTxtFrm*>(pF)->GetBaseOfstForFly( true );
-        mnFlyAnchorOfstNoWrap = static_cast<SwTxtFrm*>(pF)->GetBaseOfstForFly( false );
+        mnFlyAnchorOfst = static_cast<SwTextFrm*>(pF)->GetBaseOfstForFly( true );
+        mnFlyAnchorOfstNoWrap = static_cast<SwTextFrm*>(pF)->GetBaseOfstForFly( false );
     }
     else
     {
@@ -98,7 +98,7 @@ SwFrmNotify::SwFrmNotify( SwFrm *pF ) :
         mnFlyAnchorOfstNoWrap = 0;
     }
 
-    bHadFollow = pF->IsCntntFrm() && static_cast<SwCntntFrm*>(pF)->GetFollow();
+    bHadFollow = pF->IsContentFrm() && static_cast<SwContentFrm*>(pF)->GetFollow();
 }
 
 SwFrmNotify::~SwFrmNotify()
@@ -115,11 +115,11 @@ SwFrmNotify::~SwFrmNotify()
             (aFrm.*fnRect->fnGetWidth)() != (pFrm->Frm().*fnRect->fnGetWidth)();
     const bool bChgHeight =
             (aFrm.*fnRect->fnGetHeight)()!=(pFrm->Frm().*fnRect->fnGetHeight)();
-    const bool bChgFlyBasePos = pFrm->IsTxtFrm() &&
-       ( ( mnFlyAnchorOfst != static_cast<SwTxtFrm*>(pFrm)->GetBaseOfstForFly( true ) ) ||
-         ( mnFlyAnchorOfstNoWrap != static_cast<SwTxtFrm*>(pFrm)->GetBaseOfstForFly( false ) ) );
+    const bool bChgFlyBasePos = pFrm->IsTextFrm() &&
+       ( ( mnFlyAnchorOfst != static_cast<SwTextFrm*>(pFrm)->GetBaseOfstForFly( true ) ) ||
+         ( mnFlyAnchorOfstNoWrap != static_cast<SwTextFrm*>(pFrm)->GetBaseOfstForFly( false ) ) );
 
-    if ( pFrm->IsFlowFrm() && !pFrm->IsInFtn() )
+    if ( pFrm->IsFlowFrm() && !pFrm->IsInFootnote() )
     {
         SwFlowFrm *pFlow = SwFlowFrm::CastFlowFrm( pFrm );
 
@@ -139,7 +139,7 @@ SwFrmNotify::~SwFrmNotify()
                         if ( !bInvalidPrePos && pPre->IsTabFrm() )
                         {
                             SwTabFrm* pPreTab = static_cast<SwTabFrm*>(pPre);
-                            if ( pPreTab->GetFmt()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP) )
+                            if ( pPreTab->GetFormat()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP) )
                             {
                                 SwRowFrm* pLastRow = static_cast<SwRowFrm*>(pPreTab->GetLastLower());
                                 if ( pLastRow && pLastRow->ShouldRowKeepWithNext() )
@@ -188,7 +188,7 @@ SwFrmNotify::~SwFrmNotify()
 
             // A fresh follow frame does not have to be invalidated, because
             // it is already formatted:
-            if ( bHadFollow || !pFrm->IsCntntFrm() || !static_cast<SwCntntFrm*>(pFrm)->GetFollow() )
+            if ( bHadFollow || !pFrm->IsContentFrm() || !static_cast<SwContentFrm*>(pFrm)->GetFollow() )
             {
                 if ( !pFrm->IsTabFrm() || !static_cast<SwTabFrm*>(pFrm)->GetFollow() )
                     pFrm->InvalidateNextPos();
@@ -307,8 +307,8 @@ SwFrmNotify::~SwFrmNotify()
                     // its positioning and alignment
                     else
                     {
-                        const SwFmtVertOrient& rVert =
-                                        pContact->GetFmt()->GetVertOrient();
+                        const SwFormatVertOrient& rVert =
+                                        pContact->GetFormat()->GetVertOrient();
                         if ( ( rVert.GetVertOrient() == text::VertOrientation::CENTER ||
                                rVert.GetVertOrient() == text::VertOrientation::BOTTOM ||
                                rVert.GetRelationOrient() == text::RelOrientation::PRINT_AREA ) &&
@@ -318,8 +318,8 @@ SwFrmNotify::~SwFrmNotify()
                         }
                         if ( !bNotify )
                         {
-                            const SwFmtHoriOrient& rHori =
-                                        pContact->GetFmt()->GetHoriOrient();
+                            const SwFormatHoriOrient& rHori =
+                                        pContact->GetFormat()->GetHoriOrient();
                             if ( ( rHori.GetHoriOrient() != text::HoriOrientation::NONE ||
                                    rHori.GetRelationOrient()== text::RelOrientation::PRINT_AREA ||
                                    rHori.GetRelationOrient()== text::RelOrientation::FRAME ) &&
@@ -365,13 +365,13 @@ SwFrmNotify::~SwFrmNotify()
                     }
                     else
                     {
-                        OSL_FAIL( "<SwCntntNotify::~SwCntntNotify()> - unknown anchored object type. Please inform OD." );
+                        OSL_FAIL( "<SwContentNotify::~SwContentNotify()> - unknown anchored object type. Please inform OD." );
                     }
                 }
             }
         }
     }
-    else if( pFrm->IsTxtFrm() && bValidSize != pFrm->GetValidSizeFlag() )
+    else if( pFrm->IsTextFrm() && bValidSize != pFrm->GetValidSizeFlag() )
     {
         SwRootFrm *pRootFrm = pFrm->getRootFrm();
         if( pRootFrm && pRootFrm->IsAnyShellAccessible() &&
@@ -392,7 +392,7 @@ SwFrmNotify::~SwFrmNotify()
         // width doesn't make sense for such Writer fly frames.
         if ( pFly->Lower() && !pFly->Lower()->IsColumnFrm() )
         {
-            const SwFmtFrmSize &rFrmSz = pFly->GetFmt()->GetFrmSize();
+            const SwFormatFrmSize &rFrmSz = pFly->GetFormat()->GetFrmSize();
 
             // This could be optimized. Basically the fly frame only has to
             // be invalidated, if the first line of pFrm (if pFrm is a content
@@ -436,9 +436,9 @@ static void lcl_InvalidatePosOfLowers( SwLayoutFrm& _rLayoutFrm )
     while ( pLowerFrm )
     {
         pLowerFrm->InvalidatePos();
-        if ( pLowerFrm->IsTxtFrm() )
+        if ( pLowerFrm->IsTextFrm() )
         {
-            static_cast<SwTxtFrm*>(pLowerFrm)->Prepare( PREP_POS_CHGD );
+            static_cast<SwTextFrm*>(pLowerFrm)->Prepare( PREP_POS_CHGD );
         }
         else if ( pLowerFrm->IsTabFrm() )
         {
@@ -606,9 +606,9 @@ SwLayNotify::~SwLayNotify()
         }
         // #i49383# - check for footnote frame, if unlock
         // of position of lower objects is allowed.
-        else if ( bUnlockPosOfObjs && pLay->IsFtnFrm() )
+        else if ( bUnlockPosOfObjs && pLay->IsFootnoteFrm() )
         {
-            bUnlockPosOfObjs = static_cast<SwFtnFrm*>(pLay)->IsUnlockPosOfLowerObjs();
+            bUnlockPosOfObjs = static_cast<SwFootnoteFrm*>(pLay)->IsUnlockPosOfLowerObjs();
         }
         // #i51303# - no unlock of object positions for sections
         else if ( bUnlockPosOfObjs && pLay->IsSctFrm() )
@@ -617,7 +617,7 @@ SwLayNotify::~SwLayNotify()
         }
         pLay->NotifyLowerObjs( bUnlockPosOfObjs );
     }
-    if ( bPos && pLay->IsFtnFrm() && pLay->Lower() )
+    if ( bPos && pLay->IsFootnoteFrm() && pLay->Lower() )
     {
         // OD 2004-05-11 #i28701#
         ::lcl_InvalidatePosOfLowers( *pLay );
@@ -656,7 +656,7 @@ SwFlyNotify::~SwFlyNotify()
             ::Notify( pFly, pOldPage, aFrmAndSpace, &aPrt );
             // #i35640# - additional notify anchor text frame,
             // if Writer fly frame has changed its page
-            if ( pFly->GetAnchorFrm()->IsTxtFrm() &&
+            if ( pFly->GetAnchorFrm()->IsTextFrm() &&
                  pFly->GetPageFrm() != pOldPage )
             {
                 pFly->AnchorFrm()->Prepare( PREP_FLY_LEAVE );
@@ -694,7 +694,7 @@ SwFlyNotify::~SwFlyNotify()
 
         // #i26945# - notify anchor.
         // Needed for negative positioned Writer fly frames
-        if ( pFly->GetAnchorFrm()->IsTxtFrm() )
+        if ( pFly->GetAnchorFrm()->IsTextFrm() )
         {
             pFly->AnchorFrm()->Prepare( PREP_FLY_LEAVE );
         }
@@ -738,13 +738,13 @@ SwFlyNotify::~SwFlyNotify()
     }
 }
 
-SwCntntFrm *SwCntntNotify::GetCnt()
+SwContentFrm *SwContentNotify::GetCnt()
 {
-    return static_cast<SwCntntFrm*>(pFrm);
+    return static_cast<SwContentFrm*>(pFrm);
 }
 
-SwCntntNotify::SwCntntNotify( SwCntntFrm *pCntntFrm ) :
-    SwFrmNotify( pCntntFrm ),
+SwContentNotify::SwContentNotify( SwContentFrm *pContentFrm ) :
+    SwFrmNotify( pContentFrm ),
     // OD 08.01.2004 #i11859#
     mbChkHeightOfLastLine( false ),
     mnHeightOfLastLine( 0L ),
@@ -753,23 +753,23 @@ SwCntntNotify::SwCntntNotify( SwCntntFrm *pCntntFrm ) :
     mbBordersJoinedWithPrev( false )
 {
     // OD 08.01.2004 #i11859#
-    if ( pCntntFrm->IsTxtFrm() )
+    if ( pContentFrm->IsTextFrm() )
     {
-        SwTxtFrm* pTxtFrm = static_cast<SwTxtFrm*>(pCntntFrm);
-        if ( !pTxtFrm->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::OLD_LINE_SPACING) )
+        SwTextFrm* pTextFrm = static_cast<SwTextFrm*>(pContentFrm);
+        if ( !pTextFrm->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::OLD_LINE_SPACING) )
         {
-            const SwAttrSet* pSet = pTxtFrm->GetAttrSet();
+            const SwAttrSet* pSet = pTextFrm->GetAttrSet();
             const SvxLineSpacingItem &rSpace = pSet->GetLineSpacing();
             if ( rSpace.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
             {
                 mbChkHeightOfLastLine = true;
-                mnHeightOfLastLine = pTxtFrm->GetHeightOfLastLine();
+                mnHeightOfLastLine = pTextFrm->GetHeightOfLastLine();
             }
         }
     }
 }
 
-SwCntntNotify::~SwCntntNotify()
+SwContentNotify::~SwContentNotify()
 {
     // #i49383#
     if ( mbFrmDeleted )
@@ -777,7 +777,7 @@ SwCntntNotify::~SwCntntNotify()
         return;
     }
 
-    SwCntntFrm *pCnt = GetCnt();
+    SwContentFrm *pCnt = GetCnt();
     if ( bSetCompletePaintOnInvalidate )
         pCnt->SetCompletePaint();
 
@@ -789,13 +789,13 @@ SwCntntNotify::~SwCntntNotify()
         while( !pCell->IsCellFrm() && pCell->GetUpper() )
             pCell = pCell->GetUpper();
         OSL_ENSURE( pCell->IsCellFrm(), "Where's my cell?" );
-        if ( text::VertOrientation::NONE != pCell->GetFmt()->GetVertOrient().GetVertOrient() )
+        if ( text::VertOrientation::NONE != pCell->GetFormat()->GetVertOrient().GetVertOrient() )
             pCell->InvalidatePrt(); //for the vertical align.
     }
 
     // OD 2004-02-26 #i25029#
     if ( mbInvalidatePrevPrtArea && mbBordersJoinedWithPrev &&
-         pCnt->IsTxtFrm() &&
+         pCnt->IsTextFrm() &&
          !pCnt->IsFollow() && !pCnt->GetIndPrev() )
     {
         // determine previous frame
@@ -805,8 +805,8 @@ SwCntntNotify::~SwCntntNotify()
             while ( pPrevFrm &&
                     ( ( pPrevFrm->IsSctFrm() &&
                         !static_cast<SwSectionFrm*>(pPrevFrm)->GetSection() ) ||
-                      ( pPrevFrm->IsTxtFrm() &&
-                        static_cast<SwTxtFrm*>(pPrevFrm)->IsHiddenNow() ) ) )
+                      ( pPrevFrm->IsTextFrm() &&
+                        static_cast<SwTextFrm*>(pPrevFrm)->IsHiddenNow() ) ) )
             {
                 pPrevFrm = pPrevFrm->FindPrev();
             }
@@ -825,11 +825,11 @@ SwCntntNotify::~SwCntntNotify()
                     //       <pCnt> had joined its borders/shadow with the
                     //       last content of the found section.
                     // Invalidate printing area of last content in found section.
-                    SwFrm* pLstCntntOfSctFrm =
-                            static_cast<SwSectionFrm*>(pPrevFrm)->FindLastCntnt();
-                    if ( pLstCntntOfSctFrm )
+                    SwFrm* pLstContentOfSctFrm =
+                            static_cast<SwSectionFrm*>(pPrevFrm)->FindLastContent();
+                    if ( pLstContentOfSctFrm )
                     {
-                        pLstCntntOfSctFrm->InvalidatePrt();
+                        pLstContentOfSctFrm->InvalidatePrt();
                     }
                 }
             }
@@ -842,7 +842,7 @@ SwCntntNotify::~SwCntntNotify()
 
     const bool bFirst = (aFrm.*fnRect->fnGetWidth)() == 0;
 
-    if ( pCnt->IsNoTxtFrm() )
+    if ( pCnt->IsNoTextFrm() )
     {
         //Active PlugIn's or OLE-Objects should know something of the change
         //thereby they move their window appropriate.
@@ -854,7 +854,7 @@ SwCntntNotify::~SwCntntNotify()
                  (pNd->GetOLEObj().IsOleRef() ||
                   pNd->IsOLESizeInvalid()) )
             {
-                const bool bNoTxtFrmPrtAreaChanged =
+                const bool bNoTextFrmPrtAreaChanged =
                         ( aPrt.SSize().Width() != 0 &&
                           aPrt.SSize().Height() != 0 ) &&
                         aPrt.SSize() != pCnt->Prt().SSize();
@@ -870,7 +870,7 @@ SwCntntNotify::~SwCntntNotify()
                         // I think this should mean "do not call CalcAndSetScale"
                         // if the frame is formatted for the first time.
                         // Unfortunately this is not valid anymore since the
-                        // SwNoTxtFrm already gets a width during CalcLowerPreps.
+                        // SwNoTextFrm already gets a width during CalcLowerPreps.
                         // Nevertheless, the indention of !bFirst seemed to be
                         // to assure that the OLE objects have already been notified
                         // if necessary before calling CalcAndSetScale.
@@ -878,14 +878,14 @@ SwCntntNotify::~SwCntntNotify()
                         // one additional problem specific to the word import:
                         // The layout is calculated _before_ calling PrtOLENotify,
                         // and the OLE objects are not invalidated during import.
-                        // Therefore I added the condition !IsUpdateExpFld,
+                        // Therefore I added the condition !IsUpdateExpField,
                         // have a look at the occurrence of CalcLayout in
                         // uiview/view.cxx.
                         if ( !pNd->IsOLESizeInvalid() &&
-                             !pSh->GetDoc()->getIDocumentState().IsUpdateExpFld() )
+                             !pSh->GetDoc()->getIDocumentState().IsUpdateExpField() )
                             pFESh->CalcAndSetScale( xObj,
                                                     &pFly->Prt(), &pFly->Frm(),
-                                                    bNoTxtFrmPrtAreaChanged );
+                                                    bNoTextFrmPrtAreaChanged );
                     }
                 }
 
@@ -896,9 +896,9 @@ SwCntntNotify::~SwCntntNotify()
                 }
             }
             //dito animated graphics
-            if ( Frm().HasArea() && static_cast<SwNoTxtFrm*>(pCnt)->HasAnimation() )
+            if ( Frm().HasArea() && static_cast<SwNoTextFrm*>(pCnt)->HasAnimation() )
             {
-                static_cast<SwNoTxtFrm*>(pCnt)->StopAnimation();
+                static_cast<SwNoTextFrm*>(pCnt)->StopAnimation();
                 pSh->InvalidateWindows( Frm() );
             }
         }
@@ -909,7 +909,7 @@ SwCntntNotify::~SwCntntNotify()
         pCnt->SetRetouche();    //fix(13870)
 
         SwDoc *pDoc = pCnt->GetNode()->GetDoc();
-        if ( !pDoc->GetSpzFrmFmts()->empty() &&
+        if ( !pDoc->GetSpzFrameFormats()->empty() &&
              pDoc->DoesContainAtPageObjWithContentAnchor() && !pDoc->getIDocumentState().IsNewDoc() )
         {
             // If certain import filters for foreign file format import
@@ -922,14 +922,14 @@ SwCntntNotify::~SwCntntNotify()
 
             const SwPageFrm *pPage = 0;
             SwNodeIndex *pIdx  = 0;
-            SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts();
+            SwFrameFormats *pTable = pDoc->GetSpzFrameFormats();
 
-            for ( size_t i = 0; i < pTbl->size(); ++i )
+            for ( size_t i = 0; i < pTable->size(); ++i )
             {
-                SwFrmFmt *pFmt = (*pTbl)[i];
-                const SwFmtAnchor &rAnch = pFmt->GetAnchor();
+                SwFrameFormat *pFormat = (*pTable)[i];
+                const SwFormatAnchor &rAnch = pFormat->GetAnchor();
                 if ( FLY_AT_PAGE != rAnch.GetAnchorId() ||
-                     rAnch.GetCntntAnchor() == 0 )
+                     rAnch.GetContentAnchor() == 0 )
                 {
                     continue;
                 }
@@ -938,20 +938,20 @@ SwCntntNotify::~SwCntntNotify()
                 {
                     pIdx = new SwNodeIndex( *pCnt->GetNode() );
                 }
-                if ( rAnch.GetCntntAnchor()->nNode == *pIdx )
+                if ( rAnch.GetContentAnchor()->nNode == *pIdx )
                 {
-                    OSL_FAIL( "<SwCntntNotify::~SwCntntNotify()> - to page anchored object with content position. Please inform OD." );
+                    OSL_FAIL( "<SwContentNotify::~SwContentNotify()> - to page anchored object with content position. Please inform OD." );
                     if ( !pPage )
                     {
                         pPage = pCnt->FindPageFrm();
                     }
-                    SwFmtAnchor aAnch( rAnch );
+                    SwFormatAnchor aAnch( rAnch );
                     aAnch.SetAnchor( 0 );
                     aAnch.SetPageNum( pPage->GetPhyPageNum() );
-                    pFmt->SetFmtAttr( aAnch );
-                    if ( RES_DRAWFRMFMT != pFmt->Which() )
+                    pFormat->SetFormatAttr( aAnch );
+                    if ( RES_DRAWFRMFMT != pFormat->Which() )
                     {
-                        pFmt->MakeFrms();
+                        pFormat->MakeFrms();
                     }
                 }
             }
@@ -961,28 +961,28 @@ SwCntntNotify::~SwCntntNotify()
 
     // OD 12.01.2004 #i11859# - invalidate printing area of following frame,
     //  if height of last line has changed.
-    if ( pCnt->IsTxtFrm() && mbChkHeightOfLastLine )
+    if ( pCnt->IsTextFrm() && mbChkHeightOfLastLine )
     {
-        if ( mnHeightOfLastLine != static_cast<SwTxtFrm*>(pCnt)->GetHeightOfLastLine() )
+        if ( mnHeightOfLastLine != static_cast<SwTextFrm*>(pCnt)->GetHeightOfLastLine() )
         {
             pCnt->InvalidateNextPrtArea();
         }
     }
 
     // #i44049#
-    if ( pCnt->IsTxtFrm() && POS_DIFF( aFrm, pCnt->Frm() ) )
+    if ( pCnt->IsTextFrm() && POS_DIFF( aFrm, pCnt->Frm() ) )
     {
         pCnt->InvalidateObjs( true );
     }
 
     // #i43255# - move code to invalidate at-character
     // anchored objects due to a change of its anchor character from
-    // method <SwTxtFrm::Format(..)>.
-    if ( pCnt->IsTxtFrm() )
+    // method <SwTextFrm::Format(..)>.
+    if ( pCnt->IsTextFrm() )
     {
-        SwTxtFrm* pMasterFrm = pCnt->IsFollow()
-                               ? static_cast<SwTxtFrm*>(pCnt)->FindMaster()
-                               : static_cast<SwTxtFrm*>(pCnt);
+        SwTextFrm* pMasterFrm = pCnt->IsFollow()
+                               ? static_cast<SwTextFrm*>(pCnt)->FindMaster()
+                               : static_cast<SwTextFrm*>(pCnt);
         if ( pMasterFrm && !pMasterFrm->IsFlyLock() &&
              pMasterFrm->GetDrawObjs() )
         {
@@ -990,7 +990,7 @@ SwCntntNotify::~SwCntntNotify()
             for ( size_t i = 0; i < pObjs->size(); ++i )
             {
                 SwAnchoredObject* pAnchoredObj = (*pObjs)[i];
-                if ( pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId()
+                if ( pAnchoredObj->GetFrameFormat().GetAnchor().GetAnchorId()
                         == FLY_AT_CHAR )
                 {
                     pAnchoredObj->CheckCharRectAndTopOfLine( !pMasterFrm->IsEmpty() );
@@ -1000,65 +1000,65 @@ SwCntntNotify::~SwCntntNotify()
     }
 }
 
-void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex,
+void AppendObjs( const SwFrameFormats *pTable, sal_uLong nIndex,
                         SwFrm *pFrm, SwPageFrm *pPage, SwDoc* doc )
 {
-    (void) pTbl;
+    (void) pTable;
 #if OSL_DEBUG_LEVEL > 0
-    std::list<SwFrmFmt*> checkFmts;
-    for ( size_t i = 0; i < pTbl->size(); ++i )
+    std::list<SwFrameFormat*> checkFormats;
+    for ( size_t i = 0; i < pTable->size(); ++i )
     {
-        SwFrmFmt *pFmt = (*pTbl)[i];
-        const SwFmtAnchor &rAnch = pFmt->GetAnchor();
-        if ( rAnch.GetCntntAnchor() &&
-             (rAnch.GetCntntAnchor()->nNode.GetIndex() == nIndex) )
+        SwFrameFormat *pFormat = (*pTable)[i];
+        const SwFormatAnchor &rAnch = pFormat->GetAnchor();
+        if ( rAnch.GetContentAnchor() &&
+             (rAnch.GetContentAnchor()->nNode.GetIndex() == nIndex) )
         {
-            checkFmts.push_back( pFmt );
+            checkFormats.push_back( pFormat );
         }
     }
 #else
-    (void)pTbl;
+    (void)pTable;
 #endif
     SwNode const& rNode(*doc->GetNodes()[nIndex]);
-    std::vector<SwFrmFmt*> const*const pFlys(rNode.GetAnchoredFlys());
+    std::vector<SwFrameFormat*> const*const pFlys(rNode.GetAnchoredFlys());
     for (size_t it = 0; pFlys && it != pFlys->size(); )
     {
-        SwFrmFmt *const pFmt = (*pFlys)[it];
-        const SwFmtAnchor &rAnch = pFmt->GetAnchor();
-        if ( rAnch.GetCntntAnchor() &&
-             (rAnch.GetCntntAnchor()->nNode.GetIndex() == nIndex) )
+        SwFrameFormat *const pFormat = (*pFlys)[it];
+        const SwFormatAnchor &rAnch = pFormat->GetAnchor();
+        if ( rAnch.GetContentAnchor() &&
+             (rAnch.GetContentAnchor()->nNode.GetIndex() == nIndex) )
         {
 #if OSL_DEBUG_LEVEL > 0
-            std::list<SwFrmFmt*>::iterator checkPos = std::find( checkFmts.begin(), checkFmts.end(), pFmt );
-            assert( checkPos != checkFmts.end());
-            checkFmts.erase( checkPos );
+            std::list<SwFrameFormat*>::iterator checkPos = std::find( checkFormats.begin(), checkFormats.end(), pFormat );
+            assert( checkPos != checkFormats.end());
+            checkFormats.erase( checkPos );
 #endif
             const bool bFlyAtFly = rAnch.GetAnchorId() == FLY_AT_FLY; // LAYER_IMPL
             //Is a frame or a SdrObject described?
-            const bool bSdrObj = RES_DRAWFRMFMT == pFmt->Which();
+            const bool bSdrObj = RES_DRAWFRMFMT == pFormat->Which();
             // OD 23.06.2003 #108784# - append also drawing objects anchored
             // as character.
-            const bool bDrawObjInCntnt = bSdrObj &&
+            const bool bDrawObjInContent = bSdrObj &&
                                          (rAnch.GetAnchorId() == FLY_AS_CHAR);
 
             if( bFlyAtFly ||
                 (rAnch.GetAnchorId() == FLY_AT_PARA) ||
                 (rAnch.GetAnchorId() == FLY_AT_CHAR) ||
-                bDrawObjInCntnt )
+                bDrawObjInContent )
             {
                 SdrObject* pSdrObj = 0;
-                if ( bSdrObj && 0 == (pSdrObj = pFmt->FindSdrObject()) )
+                if ( bSdrObj && 0 == (pSdrObj = pFormat->FindSdrObject()) )
                 {
                     OSL_ENSURE( !bSdrObj, "DrawObject not found." );
                     ++it;
-                    pFmt->GetDoc()->DelFrmFmt( pFmt );
+                    pFormat->GetDoc()->DelFrameFormat( pFormat );
                     continue;
                 }
                 if ( pSdrObj )
                 {
                     if ( !pSdrObj->GetPage() )
                     {
-                        pFmt->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
+                        pFormat->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
                                 InsertObject(pSdrObj, pSdrObj->GetOrdNumDirect());
                     }
 
@@ -1085,9 +1085,9 @@ void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex,
                 {
                     SwFlyFrm *pFly;
                     if( bFlyAtFly )
-                        pFly = new SwFlyLayFrm( static_cast<SwFlyFrmFmt*>(pFmt), pFrm, pFrm );
+                        pFly = new SwFlyLayFrm( static_cast<SwFlyFrameFormat*>(pFormat), pFrm, pFrm );
                     else
-                        pFly = new SwFlyAtCntFrm( static_cast<SwFlyFrmFmt*>(pFmt), pFrm, pFrm );
+                        pFly = new SwFlyAtCntFrm( static_cast<SwFlyFrameFormat*>(pFormat), pFrm, pFrm );
                     pFly->Lock();
                     pFrm->AppendFly( pFly );
                     pFly->Unlock();
@@ -1099,15 +1099,15 @@ void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex,
         ++it;
     }
 #if OSL_DEBUG_LEVEL > 0
-    assert( checkFmts.empty());
+    assert( checkFormats.empty());
 #endif
 }
 
-static bool lcl_ObjConnected( const SwFrmFmt *pFmt, const SwFrm* pSib )
+static bool lcl_ObjConnected( const SwFrameFormat *pFormat, const SwFrm* pSib )
 {
-    if ( RES_FLYFRMFMT == pFmt->Which() )
+    if ( RES_FLYFRMFMT == pFormat->Which() )
     {
-        SwIterator<SwFlyFrm,SwFmt> aIter( *pFmt );
+        SwIterator<SwFlyFrm,SwFormat> aIter( *pFormat );
         const SwRootFrm* pRoot = pSib ? pSib->getRootFrm() : 0;
         const SwFlyFrm* pTmpFrm;
         for( pTmpFrm = aIter.First(); pTmpFrm; pTmpFrm = aIter.Next() )
@@ -1118,56 +1118,56 @@ static bool lcl_ObjConnected( const SwFrmFmt *pFmt, const SwFrm* pSib )
     }
     else
     {
-        SwDrawContact *pContact = SwIterator<SwDrawContact,SwFmt>(*pFmt).First();
+        SwDrawContact *pContact = SwIterator<SwDrawContact,SwFormat>(*pFormat).First();
         if ( pContact )
             return pContact->GetAnchorFrm() != 0;
     }
     return false;
 }
 
-/** helper method to determine, if a <SwFrmFmt>, which has an object connected,
+/** helper method to determine, if a <SwFrameFormat>, which has an object connected,
     is located in header or footer.
 
     OD 23.06.2003 #108784#
 */
-static bool lcl_InHeaderOrFooter( const SwFrmFmt& _rFmt )
+static bool lcl_InHeaderOrFooter( const SwFrameFormat& _rFormat )
 {
     bool bRetVal = false;
 
-    const SwFmtAnchor& rAnch = _rFmt.GetAnchor();
+    const SwFormatAnchor& rAnch = _rFormat.GetAnchor();
 
     if (rAnch.GetAnchorId() != FLY_AT_PAGE)
     {
-        bRetVal = _rFmt.GetDoc()->IsInHeaderFooter( rAnch.GetCntntAnchor()->nNode );
+        bRetVal = _rFormat.GetDoc()->IsInHeaderFooter( rAnch.GetContentAnchor()->nNode );
     }
 
     return bRetVal;
 }
 
-void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib )
+void AppendAllObjs( const SwFrameFormats *pTable, const SwFrm* pSib )
 {
-    //Connecting of all Objects, which are described in the SpzTbl with the
+    //Connecting of all Objects, which are described in the SpzTable with the
     //layout.
     //If nothing happens anymore we can stop. Then formats can still remain,
     //because we neither use character bound frames nor objects which
     //are anchored to character bounds.
 
-    // Optimization: This code used to make a copy of pTbl and erase() handled items, but using
+    // Optimization: This code used to make a copy of pTable and erase() handled items, but using
     // vector::erase() is a bad idea for performance (especially with large mailmerge documents
     // it results in extensive repeated copying). Use another vector for marking whether the item
     // has been handled and operate on the original data without altering them.
-    std::vector< bool > handled( pTbl->size(), false );
+    std::vector< bool > handled( pTable->size(), false );
     size_t handledCount = 0;
 
-    while ( handledCount < pTbl->size())
+    while ( handledCount < pTable->size())
     {
         bool changed = false;
-        for ( int i = 0; i < int(pTbl->size()); ++i )
+        for ( int i = 0; i < int(pTable->size()); ++i )
         {
             if( handled[ i ] )
                 continue;
-            SwFrmFmt *pFmt = (*pTbl)[ i ];
-            const SwFmtAnchor &rAnch = pFmt->GetAnchor();
+            SwFrameFormat *pFormat = (*pTable)[ i ];
+            const SwFormatAnchor &rAnch = pFormat->GetAnchor();
             bool bRemove = false;
             if ((rAnch.GetAnchorId() == FLY_AT_PAGE) ||
                 (rAnch.GetAnchorId() == FLY_AS_CHAR))
@@ -1178,8 +1178,8 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib )
             }
             else
             {
-                bRemove = ::lcl_ObjConnected( pFmt, pSib );
-                if  ( !bRemove || ::lcl_InHeaderOrFooter( *pFmt ) )
+                bRemove = ::lcl_ObjConnected( pFormat, pSib );
+                if  ( !bRemove || ::lcl_InHeaderOrFooter( *pFormat ) )
                 {
                     // OD 23.06.2003 #108784# - correction: for objects in header
                     // or footer create frames, in spite of the fact that an connected
@@ -1187,8 +1187,8 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib )
                     //Call for Flys and DrawObjs only a MakeFrms if nor
                     //no dependent exists, otherwise, or if the MakeDrms creates no
                     //dependents, remove.
-                    pFmt->MakeFrms();
-                    bRemove = ::lcl_ObjConnected( pFmt, pSib );
+                    pFormat->MakeFrms();
+                    bRemove = ::lcl_ObjConnected( pFormat, pSib );
                 }
             }
             if ( bRemove )
@@ -1247,7 +1247,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
     const bool bStartPercent = bPages && !nEndIndex;
 
     SwPageFrm *pPage = pLay->FindPageFrm();
-    const SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts();
+    const SwFrameFormats *pTable = pDoc->GetSpzFrameFormats();
     SwFrm       *pFrm = 0;
     bool   bBreakAfter   = false;
 
@@ -1286,7 +1286,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
         // The same applies for areas in tables, if inside the table will be
         // something inserted, it's only allowed to break up areas, which
         // lies in the inside also.
-        if( ( !pLay->IsInFtn() || pSct->IsInFtn() ) &&
+        if( ( !pLay->IsInFootnote() || pSct->IsInFootnote() ) &&
             ( !pLay->IsInTab() || pSct->IsInTab() ) )
         {
             pActualSection = new SwActualSection( 0, pSct, 0 );
@@ -1304,9 +1304,9 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
     while( true )
     {
         SwNode *pNd = pDoc->GetNodes()[nIndex];
-        if ( pNd->IsCntntNode() )
+        if ( pNd->IsContentNode() )
         {
-            SwCntntNode* pNode = static_cast<SwCntntNode*>(pNd);
+            SwContentNode* pNode = static_cast<SwContentNode*>(pNd);
             pFrm = pNode->MakeFrm(pLay);
             if( pPageMaker )
                 pPageMaker->CheckInsert( nIndex );
@@ -1317,7 +1317,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
             // CONTENT_FLOWS_FROM/_TO relation.
             // Relation CONTENT_FLOWS_FROM for next paragraph will change
             // and relation CONTENT_FLOWS_TO for previous paragraph will change.
-            if ( pFrm->IsTxtFrm() )
+            if ( pFrm->IsTextFrm() )
             {
                 SwViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() );
                 // no notification, if <SwViewShell> is in construction
@@ -1326,8 +1326,8 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
                      pViewShell->GetLayout()->IsAnyShellAccessible() )
                 {
                     pViewShell->InvalidateAccessibleParaFlowRelation(
-                        dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )),
-                        dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) );
+                        dynamic_cast<SwTextFrm*>(pFrm->FindNextCnt( true )),
+                        dynamic_cast<SwTextFrm*>(pFrm->FindPrevCnt( true )) );
                     // #i68958#
                     // The information flags of the text frame are validated
                     // in methods <FindNextCnt(..)> and <FindPrevCnt(..)>.
@@ -1342,22 +1342,22 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
             lcl_SetPos( *pFrm, *pLay );
             pPrv = pFrm;
 
-            if ( !pTbl->empty() && bObjsDirect && !bDontCreateObjects )
-                AppendObjs( pTbl, nIndex, pFrm, pPage, pDoc );
+            if ( !pTable->empty() && bObjsDirect && !bDontCreateObjects )
+                AppendObjs( pTable, nIndex, pFrm, pPage, pDoc );
         }
         else if ( pNd->IsTableNode() )
         {   //Should we have encountered a table?
-            SwTableNode *pTblNode = static_cast<SwTableNode*>(pNd);
+            SwTableNode *pTableNode = static_cast<SwTableNode*>(pNd);
 
             // #108116# loading may produce table structures that GCLines
             // needs to clean up. To keep table formulas correct, change
             // all table formulas to internal (BOXPTR) representation.
-            SwTableFmlUpdate aMsgHnt( &pTblNode->GetTable() );
-            aMsgHnt.eFlags = TBL_BOXPTR;
-            pDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
-            pTblNode->GetTable().GCLines();
+            SwTableFormulaUpdate aMsgHint( &pTableNode->GetTable() );
+            aMsgHint.eFlags = TBL_BOXPTR;
+            pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
+            pTableNode->GetTable().GCLines();
 
-            pFrm = pTblNode->MakeFrm( pLay );
+            pFrm = pTableNode->MakeFrm( pLay );
 
             if( pPageMaker )
                 pPageMaker->CheckInsert( nIndex );
@@ -1376,11 +1376,11 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
                      pViewShell->GetLayout()->IsAnyShellAccessible() )
                 {
                     pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pFrm->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pFrm->FindPrevCnt( true )) );
                 }
             }
-            if ( bObjsDirect && !pTbl->empty() )
+            if ( bObjsDirect && !pTable->empty() )
                 static_cast<SwTabFrm*>(pFrm)->RegistFlys();
             // OD 12.08.2003 #i17969# - consider horizontal/vertical layout
             // for setting position at newly inserted frame
@@ -1388,7 +1388,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
 
             pPrv = pFrm;
             //Set the index to the endnode of the table section.
-            nIndex = pTblNode->EndOfSectionIndex();
+            nIndex = pTableNode->EndOfSectionIndex();
 
             SwTabFrm* pTmpFrm = static_cast<SwTabFrm*>(pFrm);
             while ( pTmpFrm )
@@ -1427,15 +1427,15 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
                     static_cast<SwSectionFrm*>(pFrm)->Init();
 
                     // #i33963#
-                    // Do not trust the IsInFtn flag. If we are currently
+                    // Do not trust the IsInFootnote flag. If we are currently
                     // building up a table, the upper of pPrv may be a cell
                     // frame, but the cell frame does not have an upper yet.
-                    if( pPrv && 0 != pPrv->ImplFindFtnFrm() )
+                    if( pPrv && 0 != pPrv->ImplFindFootnoteFrm() )
                     {
                         if( pPrv->IsSctFrm() )
-                            pPrv = static_cast<SwSectionFrm*>(pPrv)->ContainsCntnt();
-                        if( pPrv && pPrv->IsTxtFrm() )
-                            static_cast<SwTxtFrm*>(pPrv)->Prepare( PREP_QUOVADIS, 0, false );
+                            pPrv = static_cast<SwSectionFrm*>(pPrv)->ContainsContent();
+                        if( pPrv && pPrv->IsTextFrm() )
+                            static_cast<SwTextFrm*>(pPrv)->Prepare( PREP_QUOVADIS, 0, false );
                     }
                 }
                 // #i27138#
@@ -1451,8 +1451,8 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
                          pViewShell->GetLayout()->IsAnyShellAccessible() )
                     {
                         pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )),
-                            dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) );
+                            dynamic_cast<SwTextFrm*>(pFrm->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pFrm->FindPrevCnt( true )) );
                     }
                 }
                 pFrm->CheckDirChange();
@@ -1472,11 +1472,11 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
                     // FME 10.11.2003 #112243#
                     // Invalidate fly content flag:
                     if ( pFrm->IsInFly() )
-                        pPage->InvalidateFlyCntnt();
+                        pPage->InvalidateFlyContent();
 
                     // OD 14.11.2002 #104684# - invalidate page content in order to
                     // force format and paint of section content.
-                    pPage->InvalidateCntnt();
+                    pPage->InvalidateContent();
                 }
 
                 pLay = static_cast<SwLayoutFrm*>(pFrm);
@@ -1500,7 +1500,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
             {
                 //Could be, that the last SectionFrm remains empty.
                 //Then now is the time to remove them.
-                if ( !pLay->ContainsCntnt() )
+                if ( !pLay->ContainsContent() )
                 {
                     SwFrm *pTmpFrm = pLay;
                     pLay = pTmpFrm->GetUpper();
@@ -1536,7 +1536,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
 
                 // We don't want to leave empty parts back.
                 if( ! pOuterSectionFrm->IsColLocked() &&
-                    ! pOuterSectionFrm->ContainsCntnt() )
+                    ! pOuterSectionFrm->ContainsContent() )
                 {
                     pOuterSectionFrm->DelEmpty( true );
                     SwFrm::DestroyFrm(pOuterSectionFrm);
@@ -1559,15 +1559,15 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
         else if( pNd->IsStartNode() &&
                  SwFlyStartNode == static_cast<SwStartNode*>(pNd)->GetStartNodeType() )
         {
-            if ( !pTbl->empty() && bObjsDirect && !bDontCreateObjects )
+            if ( !pTable->empty() && bObjsDirect && !bDontCreateObjects )
             {
                 SwFlyFrm* pFly = pLay->FindFlyFrm();
                 if( pFly )
-                    AppendObjs( pTbl, nIndex, pFly, pPage, pDoc );
+                    AppendObjs( pTable, nIndex, pFly, pPage, pDoc );
             }
         }
         else
-            // Neither Cntnt nor table nor section,
+            // Neither Content nor table nor section,
             // so we have to be ready.
             break;
 
@@ -1581,7 +1581,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
     if ( pActualSection )
     {
         // Might happen that an empty (Follow-)Section is left over.
-        if ( !(pLay = pActualSection->GetSectionFrm())->ContainsCntnt() )
+        if ( !(pLay = pActualSection->GetSectionFrm())->ContainsContent() )
         {
             pLay->RemoveFromLayout();
             SwFrm::DestroyFrm(pLay);
@@ -1592,7 +1592,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
     if ( bPages ) // let the Flys connect to each other
     {
         if ( !bDontCreateObjects )
-            AppendAllObjs( pTbl, pLayout );
+            AppendAllObjs( pTable, pLayout );
         bObjsDirect = true;
     }
 
@@ -1631,20 +1631,20 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
         while( 0 != (pFrm = aNode2Layout.NextFrm()) )
         {
             SwLayoutFrm *pUpper = pFrm->GetUpper();
-            SwFtnFrm* pFtnFrm = pUpper->FindFtnFrm();
-            bool bOldLock, bOldFtn;
-            if( pFtnFrm )
+            SwFootnoteFrm* pFootnoteFrm = pUpper->FindFootnoteFrm();
+            bool bOldLock, bOldFootnote;
+            if( pFootnoteFrm )
             {
-                bOldFtn = pFtnFrm->IsColLocked();
-                pFtnFrm->ColLock();
+                bOldFootnote = pFootnoteFrm->IsColLocked();
+                pFootnoteFrm->ColLock();
             }
             else
-                bOldFtn = true;
+                bOldFootnote = true;
             SwSectionFrm* pSct = pUpper->FindSctFrm();
             // Inside of footnotes only those areas are interesting that are inside of them. But
             // not the ones (e.g. column areas) in which are the footnote containers positioned.
             // #109767# Table frame is in section, insert section in cell frame.
-            if( pSct && ((pFtnFrm && !pSct->IsInFtn()) || pUpper->IsCellFrm()) )
+            if( pSct && ((pFootnoteFrm && !pSct->IsInFootnote()) || pUpper->IsCellFrm()) )
                 pSct = NULL;
             if( pSct )
             {   // to prevent pTmp->MoveFwd from destroying the SectionFrm
@@ -1704,8 +1704,8 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
 
                     if( pMove )
                     {
-                        if ( pMove->IsCntntFrm() )
-                            pTmp = static_cast<SwCntntFrm*>(pMove);
+                        if ( pMove->IsContentFrm() )
+                            pTmp = static_cast<SwContentFrm*>(pMove);
                         else if ( pMove->IsTabFrm() )
                             pTmp = static_cast<SwTabFrm*>(pMove);
                         else if ( pMove->IsSctFrm() )
@@ -1780,9 +1780,9 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
                 // depend on value of <bAllowMove>
                 if( !bDontCreateObjects )
                 {
-                    const SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts();
-                    if( !pTbl->empty() )
-                        AppendAllObjs( pTbl, pUpper );
+                    const SwFrameFormats *pTable = pDoc->GetSpzFrameFormats();
+                    if( !pTable->empty() )
+                        AppendAllObjs( pTable, pUpper );
                 }
 
                 // If nothing was added (e.g. a hidden section), the split must be reversed.
@@ -1797,14 +1797,14 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
 
             SwPageFrm *pPage = pUpper->FindPageFrm();
             SwFrm::CheckPageDescs( pPage, false );
-            if( !bOldFtn )
-                pFtnFrm->ColUnlock();
+            if( !bOldFootnote )
+                pFootnoteFrm->ColUnlock();
             if( !bOldLock )
             {
                 pSct->ColUnlock();
                 // pSct might be empty (e.g. when inserting linked section containing further
                 // sections) and can be destroyed in such cases.
-                if( !pSct->ContainsCntnt() )
+                if( !pSct->ContainsContent() )
                 {
                     pSct->DelEmpty( true );
                     pUpper->getRootFrm()->RemoveFromList( pSct );
@@ -1819,9 +1819,9 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
 
 SwBorderAttrs::SwBorderAttrs(const SwModify *pMod, const SwFrm *pConstructor)
     : SwCacheObj(pMod)
-    , rAttrSet(pConstructor->IsCntntFrm()
-                    ? static_cast<const SwCntntFrm*>(pConstructor)->GetNode()->GetSwAttrSet()
-                    : static_cast<const SwLayoutFrm*>(pConstructor)->GetFmt()->GetAttrSet())
+    , rAttrSet(pConstructor->IsContentFrm()
+                    ? static_cast<const SwContentFrm*>(pConstructor)->GetNode()->GetSwAttrSet()
+                    : static_cast<const SwLayoutFrm*>(pConstructor)->GetFormat()->GetAttrSet())
     , rUL(rAttrSet.GetULSpace())
     // #i96772#
     // LRSpaceItem is copied due to the possibility that it is adjusted - see below
@@ -1842,12 +1842,12 @@ SwBorderAttrs::SwBorderAttrs(const SwModify *pMod, const SwFrm *pConstructor)
     , nGetBottomLine(0)
 {
     // #i96772#
-    const SwTxtFrm* pTxtFrm = dynamic_cast<const SwTxtFrm*>(pConstructor);
-    if ( pTxtFrm )
+    const SwTextFrm* pTextFrm = dynamic_cast<const SwTextFrm*>(pConstructor);
+    if ( pTextFrm )
     {
-        pTxtFrm->GetTxtNode()->ClearLRSpaceItemDueToListLevelIndents( rLR );
+        pTextFrm->GetTextNode()->ClearLRSpaceItemDueToListLevelIndents( rLR );
     }
-    else if ( pConstructor->IsNoTxtFrm() )
+    else if ( pConstructor->IsNoTextFrm() )
     {
         rLR = SvxLRSpaceItem ( RES_LR_SPACE );
     }
@@ -1893,7 +1893,7 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const
 {
     long nRight=0;
 
-    if (!pCaller->IsTxtFrm() || !static_cast<const SwTxtFrm*>(pCaller)->GetTxtNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::INVERT_BORDER_SPACING)) {
+    if (!pCaller->IsTextFrm() || !static_cast<const SwTextFrm*>(pCaller)->GetTextNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::INVERT_BORDER_SPACING)) {
     // OD 23.01.2003 #106895# - for cell frame in R2L text direction the left
     // and right border are painted on the right respectively left.
     if ( pCaller->IsCellFrm() && pCaller->IsRightToLeft() )
@@ -1903,26 +1903,26 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const
 
     }
     // for paragraphs, "left" is "before text" and "right" is "after text"
-    if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() )
+    if ( pCaller->IsTextFrm() && pCaller->IsRightToLeft() )
         nRight += rLR.GetLeft();
     else
         nRight += rLR.GetRight();
 
     // correction: retrieve left margin for numbering in R2L-layout
-    if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() )
+    if ( pCaller->IsTextFrm() && pCaller->IsRightToLeft() )
     {
-        nRight += static_cast<const SwTxtFrm*>(pCaller)->GetTxtNode()->GetLeftMarginWithNum();
+        nRight += static_cast<const SwTextFrm*>(pCaller)->GetTextNode()->GetLeftMarginWithNum();
     }
 
     return nRight;
 }
 
 /// Tries to detect if this paragraph has a floating table attached.
-static bool lcl_hasTabFrm(const SwTxtFrm* pTxtFrm)
+static bool lcl_hasTabFrm(const SwTextFrm* pTextFrm)
 {
-    if (pTxtFrm->GetDrawObjs())
+    if (pTextFrm->GetDrawObjs())
     {
-        const SwSortedObjs* pSortedObjs = pTxtFrm->GetDrawObjs();
+        const SwSortedObjs* pSortedObjs = pTextFrm->GetDrawObjs();
         if (pSortedObjs->size() > 0)
         {
             SwAnchoredObject* pObject = (*pSortedObjs)[0];
@@ -1941,7 +1941,7 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const
 {
     long nLeft=0;
 
-    if (!pCaller->IsTxtFrm() || !static_cast<const SwTxtFrm*>(pCaller)->GetTxtNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::INVERT_BORDER_SPACING)) {
+    if (!pCaller->IsTextFrm() || !static_cast<const SwTextFrm*>(pCaller)->GetTextNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::INVERT_BORDER_SPACING)) {
     // OD 23.01.2003 #106895# - for cell frame in R2L text direction the left
     // and right border are painted on the right respectively left.
     if ( pCaller->IsCellFrm() && pCaller->IsRightToLeft() )
@@ -1951,21 +1951,21 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const
     }
 
     // for paragraphs, "left" is "before text" and "right" is "after text"
-    if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() )
+    if ( pCaller->IsTextFrm() && pCaller->IsRightToLeft() )
         nLeft += rLR.GetRight();
     else
     {
         bool bIgnoreMargin = false;
-        if (pCaller->IsTxtFrm())
+        if (pCaller->IsTextFrm())
         {
-            const SwTxtFrm* pTxtFrm = static_cast<const SwTxtFrm*>(pCaller);
-            if (pTxtFrm->GetTxtNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::FLOATTABLE_NOMARGINS))
+            const SwTextFrm* pTextFrm = static_cast<const SwTextFrm*>(pCaller);
+            if (pTextFrm->GetTextNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::FLOATTABLE_NOMARGINS))
             {
                 // If this is explicitly requested, ignore the margins next to the floating table.
-                if (lcl_hasTabFrm(pTxtFrm))
+                if (lcl_hasTabFrm(pTextFrm))
                     bIgnoreMargin = true;
                 // TODO here we only handle the first two paragraphs, would be nice to generalize this.
-                else if (pTxtFrm->FindPrev() && pTxtFrm->FindPrev()->IsTxtFrm() && lcl_hasTabFrm(static_cast<const SwTxtFrm*>(pTxtFrm->FindPrev())))
+                else if (pTextFrm->FindPrev() && pTextFrm->FindPrev()->IsTextFrm() && lcl_hasTabFrm(static_cast<const SwTextFrm*>(pTextFrm->FindPrev())))
                     bIgnoreMargin = true;
             }
         }
@@ -1974,9 +1974,9 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const
     }
 
     // correction: do not retrieve left margin for numbering in R2L-layout
-    if ( pCaller->IsTxtFrm() && !pCaller->IsRightToLeft() )
+    if ( pCaller->IsTextFrm() && !pCaller->IsRightToLeft() )
     {
-        nLeft += static_cast<const SwTxtFrm*>(pCaller)->GetTxtNode()->GetLeftMarginWithNum();
+        nLeft += static_cast<const SwTextFrm*>(pCaller)->GetTextNode()->GetLeftMarginWithNum();
     }
 
     return nLeft;
@@ -2088,7 +2088,7 @@ void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrm& _rFrm,
     // set default
     bJoinedWithPrev = false;
 
-    if ( _rFrm.IsTxtFrm() )
+    if ( _rFrm.IsTextFrm() )
     {
         // text frame can potentially join with previous text frame, if
         // corresponding attribute set is set at previous text frame.
@@ -2096,12 +2096,12 @@ void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrm& _rFrm,
         // one as previous frame.
         const SwFrm* pPrevFrm = _pPrevFrm ? _pPrevFrm : _rFrm.GetPrev();
         // OD 2004-02-13 #i25029# - skip hidden text frames.
-        while ( pPrevFrm && pPrevFrm->IsTxtFrm() &&
-                static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() )
+        while ( pPrevFrm && pPrevFrm->IsTextFrm() &&
+                static_cast<const SwTextFrm*>(pPrevFrm)->IsHiddenNow() )
         {
             pPrevFrm = pPrevFrm->GetPrev();
         }
-        if ( pPrevFrm && pPrevFrm->IsTxtFrm() &&
+        if ( pPrevFrm && pPrevFrm->IsTextFrm() &&
              pPrevFrm->GetAttrSet()->GetParaConnectBorder().GetValue()
            )
         {
@@ -2122,18 +2122,18 @@ void SwBorderAttrs::_CalcJoinedWithNext( const SwFrm& _rFrm )
     // set default
     bJoinedWithNext = false;
 
-    if ( _rFrm.IsTxtFrm() )
+    if ( _rFrm.IsTextFrm() )
     {
         // text frame can potentially join with next text frame, if
         // corresponding attribute set is set at current text frame.
         // OD 2004-02-13 #i25029# - get next frame, but skip hidden text frames.
         const SwFrm* pNextFrm = _rFrm.GetNext();
-        while ( pNextFrm && pNextFrm->IsTxtFrm() &&
-                static_cast<const SwTxtFrm*>(pNextFrm)->IsHiddenNow() )
+        while ( pNextFrm && pNextFrm->IsTextFrm() &&
+                static_cast<const SwTextFrm*>(pNextFrm)->IsHiddenNow() )
         {
             pNextFrm = pNextFrm->GetNext();
         }
-        if ( pNextFrm && pNextFrm->IsTxtFrm() &&
+        if ( pNextFrm && pNextFrm->IsTextFrm() &&
              _rFrm.GetAttrSet()->GetParaConnectBorder().GetValue()
            )
         {
@@ -2206,12 +2206,12 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm& _rFrm )
 
 SwBorderAttrAccess::SwBorderAttrAccess( SwCache &rCach, const SwFrm *pFrm ) :
     SwCacheAccess( rCach,
-                   (pFrm->IsCntntFrm() ?
-                      (void*)static_cast<const SwCntntFrm*>(pFrm)->GetNode() :
-                      (void*)static_cast<const SwLayoutFrm*>(pFrm)->GetFmt()),
-                   (pFrm->IsCntntFrm() ?
-                      ((SwModify*)static_cast<const SwCntntFrm*>(pFrm)->GetNode())->IsInCache() :
-                      ((SwModify*)static_cast<const SwLayoutFrm*>(pFrm)->GetFmt())->IsInCache()) ),
+                   (pFrm->IsContentFrm() ?
+                      (void*)static_cast<const SwContentFrm*>(pFrm)->GetNode() :
+                      (void*)static_cast<const SwLayoutFrm*>(pFrm)->GetFormat()),
+                   (pFrm->IsContentFrm() ?
+                      ((SwModify*)static_cast<const SwContentFrm*>(pFrm)->GetNode())->IsInCache() :
+                      ((SwModify*)static_cast<const SwLayoutFrm*>(pFrm)->GetFormat())->IsInCache()) ),
     pConstructor( pFrm )
 {
 }
@@ -2349,7 +2349,7 @@ const SdrObject *SwOrderIter::Prev()
 //   Do not look at each neighbor one by one to set all pointers correctly.
 //   It is sufficient to detach a part of a chain and check if another chain needs to be added
 //   when attaching it again. Only the pointers necessary for the chain connection need to be
-//   adjusted. The correction happens in RestoreCntnt(). In between all access is restricted.
+//   adjusted. The correction happens in RestoreContent(). In between all access is restricted.
 //   During this action, the Flys are detached from the page.
 
 // #115759# - 'remove' also drawing object from page and
@@ -2379,12 +2379,12 @@ static void lcl_RemoveObjsFromPage( SwFrm* _pFrm )
                 ::lcl_RemoveObjsFromPage( pFlyFrm );
             }
 
-            SwCntntFrm* pCnt = pFlyFrm->ContainsCntnt();
+            SwContentFrm* pCnt = pFlyFrm->ContainsContent();
             while ( pCnt )
             {
                 if ( pCnt->GetDrawObjs() )
                     ::lcl_RemoveObjsFromPage( pCnt );
-                pCnt = pCnt->GetNextCntntFrm();
+                pCnt = pCnt->GetNextContentFrm();
             }
             if ( pFlyFrm->IsFlyFreeFrm() )
             {
@@ -2395,7 +2395,7 @@ static void lcl_RemoveObjsFromPage( SwFrm* _pFrm )
         // #115759# - remove also drawing objects from page
         else if ( pObj->ISA(SwAnchoredDrawObject) )
         {
-            if (pObj->GetFrmFmt().GetAnchor().GetAnchorId() != FLY_AS_CHAR)
+            if (pObj->GetFrameFormat().GetAnchor().GetAnchorId() != FLY_AS_CHAR)
             {
                 pObj->GetPageFrm()->RemoveDrawObjFromPage(
                                 *(static_cast<SwAnchoredDrawObject*>(pObj)) );
@@ -2404,20 +2404,20 @@ static void lcl_RemoveObjsFromPage( SwFrm* _pFrm )
     }
 }
 
-SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
+SwFrm *SaveContent( SwLayoutFrm *pLay, SwFrm *pStart )
 {
     if( pLay->IsSctFrm() && pLay->Lower() && pLay->Lower()->IsColumnFrm() )
-        sw_RemoveFtns( static_cast<SwColumnFrm*>(pLay->Lower()), true, true );
+        sw_RemoveFootnotes( static_cast<SwColumnFrm*>(pLay->Lower()), true, true );
 
     SwFrm *pSav;
     if ( 0 == (pSav = pLay->ContainsAny()) )
         return 0;
 
-    if( pSav->IsInFtn() && !pLay->IsInFtn() )
+    if( pSav->IsInFootnote() && !pLay->IsInFootnote() )
     {
         do
             pSav = pSav->FindNext();
-        while( pSav && pSav->IsInFtn() );
+        while( pSav && pSav->IsInFootnote() );
         if( !pSav || !pLay->IsAnLower( pSav ) )
             return NULL;
     }
@@ -2453,20 +2453,20 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
         {
             if( bGo )
             {
-                if ( pFloat->IsCntntFrm() )
+                if ( pFloat->IsContentFrm() )
                 {
                     if ( pFloat->GetDrawObjs() )
-                        ::lcl_RemoveObjsFromPage( static_cast<SwCntntFrm*>(pFloat) );
+                        ::lcl_RemoveObjsFromPage( static_cast<SwContentFrm*>(pFloat) );
                 }
                 else if ( pFloat->IsTabFrm() || pFloat->IsSctFrm() )
                 {
-                    SwCntntFrm *pCnt = static_cast<SwLayoutFrm*>(pFloat)->ContainsCntnt();
+                    SwContentFrm *pCnt = static_cast<SwLayoutFrm*>(pFloat)->ContainsContent();
                     if( pCnt )
                     {
                         do
                         {   if ( pCnt->GetDrawObjs() )
                                 ::lcl_RemoveObjsFromPage( pCnt );
-                            pCnt = pCnt->GetNextCntntFrm();
+                            pCnt = pCnt->GetNextContentFrm();
                         } while ( pCnt && static_cast<SwLayoutFrm*>(pFloat)->IsAnLower( pCnt ) );
                     }
                 }
@@ -2496,8 +2496,8 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
         if( bGo )
             pFloat->mpUpper = NULL;
 
-        if( !pLay->IsInFtn() )
-            while( pTmp && pTmp->IsInFtn() )
+        if( !pLay->IsInFootnote() )
+            while( pTmp && pTmp->IsInFootnote() )
                 pTmp = pTmp->FindNext();
 
         if ( !pLay->IsAnLower( pTmp ) )
@@ -2548,18 +2548,18 @@ static void lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage )
                 ::lcl_AddObjsToPage( pFlyFrm, _pPage );
             }
 
-            SwCntntFrm *pCnt = pFlyFrm->ContainsCntnt();
+            SwContentFrm *pCnt = pFlyFrm->ContainsContent();
             while ( pCnt )
             {
                 if ( pCnt->GetDrawObjs() )
                     ::lcl_AddObjsToPage( pCnt, _pPage );
-                pCnt = pCnt->GetNextCntntFrm();
+                pCnt = pCnt->GetNextContentFrm();
             }
         }
         // #115759# - remove also drawing objects from page
         else if ( pObj->ISA(SwAnchoredDrawObject) )
         {
-            if (pObj->GetFrmFmt().GetAnchor().GetAnchorId() != FLY_AS_CHAR)
+            if (pObj->GetFrameFormat().GetAnchor().GetAnchorId() != FLY_AS_CHAR)
             {
                 pObj->InvalidateObjPos();
                 _pPage->AppendDrawObjToPage(
@@ -2569,14 +2569,14 @@ static void lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage )
     }
 }
 
-void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow )
+void RestoreContent( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow )
 {
-    OSL_ENSURE( pSav && pParent, "no Save or Parent provided for RestoreCntnt." );
+    OSL_ENSURE( pSav && pParent, "no Save or Parent provided for RestoreContent." );
     SWRECTFN( pParent )
 
     // If there are already FlowFrms below the new parent, so add the chain (starting with pSav)
     // after the last one. The parts are inserted and invalidated if needed.
-    // On the way, the Flys of the CntntFrms are registered at the page.
+    // On the way, the Flys of the ContentFrms are registered at the page.
 
     SwPageFrm *pPage = pParent->FindPageFrm();
 
@@ -2601,11 +2601,11 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
         pParent->m_pLower = pSav;
         pSav->mpUpper = pParent; // set here already, so that it is explicit when invalidating
 
-        if ( pSav->IsCntntFrm() )
-            static_cast<SwCntntFrm*>(pSav)->InvalidatePage( pPage );
+        if ( pSav->IsContentFrm() )
+            static_cast<SwContentFrm*>(pSav)->InvalidatePage( pPage );
         else
         {   // pSav might be an empty SectFrm
-            SwCntntFrm* pCnt = pParent->ContainsCntnt();
+            SwContentFrm* pCnt = pParent->ContainsContent();
             if( pCnt )
                 pCnt->InvalidatePage( pPage );
         }
@@ -2619,27 +2619,27 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
         nGrowVal += (pSav->Frm().*fnRect->fnGetHeight)();
         pSav->_InvalidateAll();
 
-        // register Flys, if TxtFrms than also invalidate appropriately
-        if ( pSav->IsCntntFrm() )
+        // register Flys, if TextFrms than also invalidate appropriately
+        if ( pSav->IsContentFrm() )
         {
-            if ( pSav->IsTxtFrm() &&
-                 static_cast<SwTxtFrm*>(pSav)->GetCacheIdx() != USHRT_MAX )
-                static_cast<SwTxtFrm*>(pSav)->Init();  // I am its friend
+            if ( pSav->IsTextFrm() &&
+                 static_cast<SwTextFrm*>(pSav)->GetCacheIdx() != USHRT_MAX )
+                static_cast<SwTextFrm*>(pSav)->Init();  // I am its friend
 
             if ( pPage && pSav->GetDrawObjs() )
-                ::lcl_AddObjsToPage( static_cast<SwCntntFrm*>(pSav), pPage );
+                ::lcl_AddObjsToPage( static_cast<SwContentFrm*>(pSav), pPage );
         }
         else
-        {   SwCntntFrm *pBlub = static_cast<SwLayoutFrm*>(pSav)->ContainsCntnt();
+        {   SwContentFrm *pBlub = static_cast<SwLayoutFrm*>(pSav)->ContainsContent();
             if( pBlub )
             {
                 do
                 {   if ( pPage && pBlub->GetDrawObjs() )
                         ::lcl_AddObjsToPage( pBlub, pPage );
-                    if( pBlub->IsTxtFrm() && static_cast<SwTxtFrm*>(pBlub)->HasFtn() &&
-                         static_cast<SwTxtFrm*>(pBlub)->GetCacheIdx() != USHRT_MAX )
-                        static_cast<SwTxtFrm*>(pBlub)->Init(); // I am its friend
-                    pBlub = pBlub->GetNextCntntFrm();
+                    if( pBlub->IsTextFrm() && static_cast<SwTextFrm*>(pBlub)->HasFootnote() &&
+                         static_cast<SwTextFrm*>(pBlub)->GetCacheIdx() != USHRT_MAX )
+                        static_cast<SwTextFrm*>(pBlub)->Init(); // I am its friend
+                    pBlub = pBlub->GetNextContentFrm();
                 } while ( pBlub && static_cast<SwLayoutFrm*>(pSav)->IsAnLower( pBlub ));
             }
         }
@@ -2659,11 +2659,11 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
 }
 
 SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
-                          bool bOdd, bool bFirst, bool bInsertEmpty, bool bFtn,
+                          bool bOdd, bool bFirst, bool bInsertEmpty, bool bFootnote,
                           SwFrm *pSibling )
 {
     SwPageFrm *pRet;
-    SwDoc *pDoc = static_cast<SwLayoutFrm*>(pUpper)->GetFmt()->GetDoc();
+    SwDoc *pDoc = static_cast<SwLayoutFrm*>(pUpper)->GetFormat()->GetDoc();
     if (bFirst)
     {
         if (rDesc.IsFirstShared())
@@ -2672,38 +2672,38 @@ SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
             // FIXME: is this still needed?
             if (bOdd)
             {
-                rDesc.GetFirstMaster().SetFmtAttr( rDesc.GetMaster().GetHeader() );
-                rDesc.GetFirstMaster().SetFmtAttr( rDesc.GetMaster().GetFooter() );
+                rDesc.GetFirstMaster().SetFormatAttr( rDesc.GetMaster().GetHeader() );
+                rDesc.GetFirstMaster().SetFormatAttr( rDesc.GetMaster().GetFooter() );
                 // fdo#60250 copy margins for mirrored pages
-                rDesc.GetFirstMaster().SetFmtAttr( rDesc.GetMaster().GetLRSpace() );
+                rDesc.GetFirstMaster().SetFormatAttr( rDesc.GetMaster().GetLRSpace() );
             }
             else
             {
-                rDesc.GetFirstLeft().SetFmtAttr( rDesc.GetLeft().GetHeader() );
-                rDesc.GetFirstLeft().SetFmtAttr( rDesc.GetLeft().GetFooter() );
-                rDesc.GetFirstLeft().SetFmtAttr( rDesc.GetLeft().GetLRSpace() );
+                rDesc.GetFirstLeft().SetFormatAttr( rDesc.GetLeft().GetHeader() );
+                rDesc.GetFirstLeft().SetFormatAttr( rDesc.GetLeft().GetFooter() );
+                rDesc.GetFirstLeft().SetFormatAttr( rDesc.GetLeft().GetLRSpace() );
             }
         }
     }
-    SwFrmFmt *pFmt(bOdd ? rDesc.GetRightFmt(bFirst) : rDesc.GetLeftFmt(bFirst));
-    // If there is no FrmFmt for this page, add an empty page
-    if ( !pFmt )
+    SwFrameFormat *pFormat(bOdd ? rDesc.GetRightFormat(bFirst) : rDesc.GetLeftFormat(bFirst));
+    // If there is no FrameFormat for this page, add an empty page
+    if ( !pFormat )
     {
-        pFmt = bOdd ? rDesc.GetLeftFmt() : rDesc.GetRightFmt();
-        OSL_ENSURE( pFmt, "Descriptor without any format?!" );
+        pFormat = bOdd ? rDesc.GetLeftFormat() : rDesc.GetRightFormat();
+        OSL_ENSURE( pFormat, "Descriptor without any format?!" );
         bInsertEmpty = !bInsertEmpty;
     }
     if( bInsertEmpty )
     {
         SwPageDesc *pTmpDesc = pSibling && pSibling->GetPrev() ?
                 static_cast<SwPageFrm*>(pSibling->GetPrev())->GetPageDesc() : &rDesc;
-        pRet = new SwPageFrm( pDoc->GetEmptyPageFmt(), pUpper, pTmpDesc );
+        pRet = new SwPageFrm( pDoc->GetEmptyPageFormat(), pUpper, pTmpDesc );
         pRet->Paste( pUpper, pSibling );
-        pRet->PreparePage( bFtn );
+        pRet->PreparePage( bFootnote );
     }
-    pRet = new SwPageFrm( pFmt, pUpper, &rDesc );
+    pRet = new SwPageFrm( pFormat, pUpper, &rDesc );
     pRet->Paste( pUpper, pSibling );
-    pRet->PreparePage( bFtn );
+    pRet->PreparePage( bFootnote );
     if ( pRet->GetNext() )
         SwRootFrm::AssertPageFlys( pRet );
     return pRet;
@@ -2781,7 +2781,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld,
     if ( rOld.Pos() != aFrm.Pos() )
     {   // changed position, invalidate old and new area
         if ( rOld.HasArea() &&
-             rOld.Left()+pFly->GetFmt()->GetLRSpace().GetLeft() < FAR_AWAY )
+             rOld.Left()+pFly->GetFormat()->GetLRSpace().GetLeft() < FAR_AWAY )
         {
             pFly->NotifyBackground( pOld, rOld, PREP_FLY_LEAVE );
         }
@@ -2841,7 +2841,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld,
         }
     }
     else if ( pOldPrt && *pOldPrt != pFly->Prt() &&
-              pFly->GetFmt()->GetSurround().IsContour() )
+              pFly->GetFormat()->GetSurround().IsContour() )
     {
         // #i24097#
         pFly->NotifyBackground( pFly->FindPageFrm(), aFrm, PREP_FLY_ARRIVE );
@@ -2860,7 +2860,7 @@ static void lcl_CheckFlowBack( SwFrm* pFrm, const SwRect &rRect )
         }
         else if( !pFrm->GetNext() && nBottom > pFrm->Frm().Bottom() )
         {
-            if( pFrm->IsCntntFrm() && static_cast<SwCntntFrm*>(pFrm)->HasFollow() )
+            if( pFrm->IsContentFrm() && static_cast<SwContentFrm*>(pFrm)->HasFollow() )
                 pFrm->InvalidateSize();
             else
                 pFrm->InvalidateNextPos();
@@ -2869,10 +2869,10 @@ static void lcl_CheckFlowBack( SwFrm* pFrm, const SwRect &rRect )
     }
 }
 
-static void lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt,
+static void lcl_NotifyContent( const SdrObject *pThis, SwContentFrm *pCnt,
     const SwRect &rRect, const PrepareHint eHint )
 {
-    if ( pCnt->IsTxtFrm() )
+    if ( pCnt->IsTextFrm() )
     {
         SwRect aCntPrt( pCnt->Prt() );
         aCntPrt.Pos() += pCnt->Frm().Pos();
@@ -2898,11 +2898,11 @@ static void lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt,
                     SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pObj);
                     if ( pFly->IsFlyInCntFrm() )
                     {
-                        SwCntntFrm *pCntnt = pFly->ContainsCntnt();
-                        while ( pCntnt )
+                        SwContentFrm *pContent = pFly->ContainsContent();
+                        while ( pContent )
                         {
-                            ::lcl_NotifyCntnt( pThis, pCntnt, rRect, eHint );
-                            pCntnt = pCntnt->GetNextCntntFrm();
+                            ::lcl_NotifyContent( pThis, pContent, rRect, eHint );
+                            pContent = pContent->GetNextContentFrm();
                         }
                     }
                 }
@@ -2939,7 +2939,7 @@ void Notify_Background( const SdrObject* pObj,
         pArea = pAnchor->FindFlyFrm();
     else
         pArea = pPage;
-    SwCntntFrm *pCnt = 0;
+    SwContentFrm *pCnt = 0;
     if ( pArea )
     {
         if( PREP_FLY_ARRIVE != eHint )
@@ -2957,14 +2957,14 @@ void Notify_Background( const SdrObject* pObj,
         // #i3317# - The complete area has always been
         // processed.
         {
-            pCnt = pArea->ContainsCntnt();
+            pCnt = pArea->ContainsContent();
         }
     }
     SwFrm *pLastTab = 0;
 
     while ( pCnt && pArea && pArea->IsAnLower( pCnt ) )
     {
-        ::lcl_NotifyCntnt( pObj, pCnt, rRect, eHint );
+        ::lcl_NotifyContent( pObj, pCnt, rRect, eHint );
         if ( pCnt->IsInTab() )
         {
             SwLayoutFrm* pCell = pCnt->GetUpper();
@@ -2975,7 +2975,7 @@ void Notify_Background( const SdrObject* pObj,
                  ( pCell->Frm().IsOver( pObj->GetLastBoundRect() ) ||
                    pCell->Frm().IsOver( rRect ) ) )
             {
-                const SwFmtVertOrient &rOri = pCell->GetFmt()->GetVertOrient();
+                const SwFormatVertOrient &rOri = pCell->GetFormat()->GetVertOrient();
                 if ( text::VertOrientation::NONE != rOri.GetVertOrient() )
                     pCell->InvalidatePrt();
             }
@@ -2994,7 +2994,7 @@ void Notify_Background( const SdrObject* pObj,
                 }
             }
         }
-        pCnt = pCnt->GetNextCntntFrm();
+        pCnt = pCnt->GetNextContentFrm();
     }
     // #128702# - make code robust
     if ( pPage && pPage->GetSortedObjs() )
@@ -3016,11 +3016,11 @@ void Notify_Background( const SdrObject* pObj,
                         (!pFly->IsLowerOf( pFlyFrm ) &&
                         pFly->GetVirtDrawObj()->GetOrdNumDirect() < pObj->GetOrdNumDirect()))
                 {
-                    pCnt = pFly->ContainsCntnt();
+                    pCnt = pFly->ContainsContent();
                     while ( pCnt )
                     {
-                        ::lcl_NotifyCntnt( pObj, pCnt, rRect, eHint );
-                        pCnt = pCnt->GetNextCntntFrm();
+                        ::lcl_NotifyContent( pObj, pCnt, rRect, eHint );
+                        pCnt = pCnt->GetNextContentFrm();
                     }
                 }
                 if( pFly->IsFlyLayFrm() )
@@ -3042,7 +3042,7 @@ void Notify_Background( const SdrObject* pObj,
                         pFly->GetVirtDrawObj()->GetOrdNumDirect() &&
                         pFlyFrm && !pFly->IsLowerOf( pFlyFrm ) )
                 {
-                    const SwFmtHoriOrient &rH = pFly->GetFmt()->GetHoriOrient();
+                    const SwFormatHoriOrient &rH = pFly->GetFormat()->GetHoriOrient();
                     if ( text::HoriOrientation::NONE != rH.GetHoriOrient()  &&
                             text::HoriOrientation::CENTER != rH.GetHoriOrient()  &&
                             ( !pFly->IsAutoPos() || text::RelOrientation::CHAR != rH.GetRelationOrient() ) &&
@@ -3069,14 +3069,14 @@ void Notify_Background( const SdrObject* pObj,
 /// is a chained border or a footnote, the "virtual" Upper might be returne.
 const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos )
 {
-    if( pFrm->IsTxtFrm() )
+    if( pFrm->IsTextFrm() )
     {
         pFrm = pFrm->GetUpper();
         if( !pFrm->Frm().IsInside( rPos ) )
         {
-            if( pFrm->IsFtnFrm() )
+            if( pFrm->IsFootnoteFrm() )
             {
-                const SwFtnFrm* pTmp = static_cast<const SwFtnFrm*>(pFrm)->GetFollow();
+                const SwFootnoteFrm* pTmp = static_cast<const SwFootnoteFrm*>(pFrm)->GetFollow();
                 while( pTmp )
                 {
                     if( pTmp->Frm().IsInside( rPos ) )
@@ -3174,15 +3174,15 @@ bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm )
 
 static SwTwips lcl_CalcCellRstHeight( SwLayoutFrm *pCell )
 {
-    if ( pCell->Lower()->IsCntntFrm() || pCell->Lower()->IsSctFrm() )
+    if ( pCell->Lower()->IsContentFrm() || pCell->Lower()->IsSctFrm() )
     {
         SwFrm *pLow = pCell->Lower();
         long nHeight = 0, nFlyAdd = 0;
         do
         {
             long nLow = pLow->Frm().Height();
-            if( pLow->IsTxtFrm() && static_cast<SwTxtFrm*>(pLow)->IsUndersized() )
-                nLow += static_cast<SwTxtFrm*>(pLow)->GetParHeight()-pLow->Prt().Height();
+            if( pLow->IsTextFrm() && static_cast<SwTextFrm*>(pLow)->IsUndersized() )
+                nLow += static_cast<SwTextFrm*>(pLow)->GetParHeight()-pLow->Prt().Height();
             else if( pLow->IsSctFrm() && static_cast<SwSectionFrm*>(pLow)->IsUndersized() )
                 nLow += static_cast<SwSectionFrm*>(pLow)->Undersize();
             nFlyAdd = std::max( 0L, nFlyAdd - nLow );
@@ -3366,8 +3366,8 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, sal_uInt1
         }
     } while( bClientIterChanged );
 
-    if( pPos && pMinFrm && pMinFrm->IsTxtFrm() )
-        return static_cast<SwTxtFrm*>(pMinFrm)->GetFrmAtPos( *pPos );
+    if( pPos && pMinFrm && pMinFrm->IsTextFrm() )
+        return static_cast<SwTextFrm*>(pMinFrm)->GetFrmAtPos( *pPos );
 
     return pMinFrm;
 }
@@ -3378,7 +3378,7 @@ bool IsExtraData( const SwDoc *pDoc )
     return rInf.IsPaintLineNumbers() ||
            rInf.IsCountInFlys() ||
            ((sal_Int16)SW_MOD()->GetRedlineMarkPos() != text::HoriOrientation::NONE &&
-            !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty());
+            !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty());
 }
 
 // OD 22.09.2003 #110978#
@@ -3432,12 +3432,12 @@ void GetSpacingValuesOfFrm( const SwFrm& rFrm,
 
         onLineSpacing = 0;
         obIsLineSpacingProportional = false;
-        if ( rFrm.IsTxtFrm() )
+        if ( rFrm.IsTextFrm() )
         {
-            onLineSpacing = static_cast<const SwTxtFrm&>(rFrm).GetLineSpace();
+            onLineSpacing = static_cast<const SwTextFrm&>(rFrm).GetLineSpace();
             obIsLineSpacingProportional =
                 onLineSpacing != 0 &&
-                static_cast<const SwTxtFrm&>(rFrm).GetLineSpace( true ) == 0;
+                static_cast<const SwTextFrm&>(rFrm).GetLineSpace( true ) == 0;
         }
 
         OSL_ENSURE( onLowerSpacing >= 0 && onLineSpacing >= 0,
@@ -3446,26 +3446,26 @@ void GetSpacingValuesOfFrm( const SwFrm& rFrm,
 }
 
 /// get the content of the table cell, skipping content from nested tables
-const SwCntntFrm* GetCellCntnt( const SwLayoutFrm& rCell )
+const SwContentFrm* GetCellContent( const SwLayoutFrm& rCell )
 {
-    const SwCntntFrm* pCntnt = rCell.ContainsCntnt();
+    const SwContentFrm* pContent = rCell.ContainsContent();
     const SwTabFrm* pTab = rCell.FindTabFrm();
 
-    while ( pCntnt && rCell.IsAnLower( pCntnt ) )
+    while ( pContent && rCell.IsAnLower( pContent ) )
     {
-        const SwTabFrm* pTmpTab = pCntnt->FindTabFrm();
+        const SwTabFrm* pTmpTab = pContent->FindTabFrm();
         if ( pTmpTab != pTab )
         {
-            pCntnt = pTmpTab->FindLastCntnt();
-            if ( pCntnt )
+            pContent = pTmpTab->FindLastContent();
+            if ( pContent )
 
-                pCntnt = pCntnt->FindNextCnt();
+                pContent = pContent->FindNextCnt();
 
         }
         else
             break;
     }
-    return pCntnt;
+    return pContent;
 }
 
 /// Can be used to check if a frame has been deleted
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 23f683ae53bf..4836695768c2 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -36,50 +36,50 @@
 
 #define ENDNOTE 0x80000000
 
-/// Search the position of an attribute in the FtnArray at the document,
+/// Search the position of an attribute in the FootnoteArray at the document,
 /// because all footnotes are located there, ordered by their index.
-static sal_uLong lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr )
+static sal_uLong lcl_FindFootnotePos( const SwDoc *pDoc, const SwTextFootnote *pAttr )
 {
-    const SwFtnIdxs &rFtnIdxs = pDoc->GetFtnIdxs();
+    const SwFootnoteIdxs &rFootnoteIdxs = pDoc->GetFootnoteIdxs();
 
-    SwTxtFtn* pBla = const_cast<SwTxtFtn*>(pAttr);
-    SwFtnIdxs::const_iterator it = rFtnIdxs.find( pBla );
-    if ( it != rFtnIdxs.end() )
+    SwTextFootnote* pBla = const_cast<SwTextFootnote*>(pAttr);
+    SwFootnoteIdxs::const_iterator it = rFootnoteIdxs.find( pBla );
+    if ( it != rFootnoteIdxs.end() )
     {
-        sal_uLong nRet = it - rFtnIdxs.begin();
-        if( pAttr->GetFtn().IsEndNote() )
+        sal_uLong nRet = it - rFootnoteIdxs.begin();
+        if( pAttr->GetFootnote().IsEndNote() )
             return nRet + ENDNOTE;
         return nRet;
     }
-    OSL_ENSURE( !pDoc, "FtnPos not found." );
+    OSL_ENSURE( !pDoc, "FootnotePos not found." );
     return 0;
 }
 
-bool SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const
+bool SwFootnoteFrm::operator<( const SwTextFootnote* pTextFootnote ) const
 {
-    const SwDoc* pDoc = GetFmt()->GetDoc();
-    OSL_ENSURE( pDoc, "SwFtnFrm: Missing doc!" );
-    return lcl_FindFtnPos( pDoc, GetAttr() ) <
-           lcl_FindFtnPos( pDoc, pTxtFtn );
+    const SwDoc* pDoc = GetFormat()->GetDoc();
+    OSL_ENSURE( pDoc, "SwFootnoteFrm: Missing doc!" );
+    return lcl_FindFootnotePos( pDoc, GetAttr() ) <
+           lcl_FindFootnotePos( pDoc, pTextFootnote );
 }
 
 /*
 |*
-|*  bool lcl_NextFtnBoss( SwFtnBossFrm* pBoss, SwPageFrm* pPage)
-|*  sets pBoss on the next SwFtnBossFrm, which can either be a column
+|*  bool lcl_NextFootnoteBoss( SwFootnoteBossFrm* pBoss, SwPageFrm* pPage)
+|*  sets pBoss on the next SwFootnoteBossFrm, which can either be a column
 |*  or a page (without columns). If the page changes meanwhile,
 |*  pPage contains the new page and this function returns true.
 |*
 |*/
 
-static bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage,
+static bool lcl_NextFootnoteBoss( SwFootnoteBossFrm* &rpBoss, SwPageFrm* &rpPage,
     bool bDontLeave )
 {
     if( rpBoss->IsColumnFrm() )
     {
         if( rpBoss->GetNext() )
         {
-            rpBoss = static_cast<SwFtnBossFrm*>(rpBoss->GetNext()); //next column
+            rpBoss = static_cast<SwFootnoteBossFrm*>(rpBoss->GetNext()); //next column
             return false;
         }
         if( rpBoss->IsInSct() )
@@ -108,7 +108,7 @@ static bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage,
     {
         SwLayoutFrm* pBody = rpPage->FindBodyCont();
         if( pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm() )
-            rpBoss = static_cast<SwFtnBossFrm*>(pBody->Lower()); // first column
+            rpBoss = static_cast<SwFootnoteBossFrm*>(pBody->Lower()); // first column
     }
     return true;
 }
@@ -142,26 +142,26 @@ static sal_uInt16 lcl_ColumnNum( const SwFrm* pBoss )
     return nRet;
 }
 
-SwFtnContFrm::SwFtnContFrm( SwFrmFmt *pFmt, SwFrm* pSib ):
-    SwLayoutFrm( pFmt, pSib )
+SwFootnoteContFrm::SwFootnoteContFrm( SwFrameFormat *pFormat, SwFrm* pSib ):
+    SwLayoutFrm( pFormat, pSib )
 {
     mnFrmType = FRM_FTNCONT;
 }
 
 
 // lcl_Undersize(..) walks over a SwFrm and its contents
-// and returns the sum of all requested TxtFrm magnifications.
+// and returns the sum of all requested TextFrm magnifications.
 
 static long lcl_Undersize( const SwFrm* pFrm )
 {
     long nRet = 0;
     SWRECTFN( pFrm )
-    if( pFrm->IsTxtFrm() )
+    if( pFrm->IsTextFrm() )
     {
-        if( static_cast<const SwTxtFrm*>(pFrm)->IsUndersized() )
+        if( static_cast<const SwTextFrm*>(pFrm)->IsUndersized() )
         {
-            // Does this TxtFrm would like to be a little bit bigger?
-            nRet = static_cast<const SwTxtFrm*>(pFrm)->GetParHeight() -
+            // Does this TextFrm would like to be a little bit bigger?
+            nRet = static_cast<const SwTextFrm*>(pFrm)->GetParHeight() -
                     (pFrm->Prt().*fnRect->fnGetHeight)();
             if( nRet < 0 )
                 nRet = 0;
@@ -180,11 +180,11 @@ static long lcl_Undersize( const SwFrm* pFrm )
 }
 
 /// "format" the frame (Fixsize is not set here).
-void SwFtnContFrm::Format( const SwBorderAttrs * )
+void SwFootnoteContFrm::Format( const SwBorderAttrs * )
 {
     // calculate total border, only one distance to the top
     const SwPageFrm* pPage = FindPageFrm();
-    const SwPageFtnInfo &rInf = pPage->GetPageDesc()->GetFtnInfo();
+    const SwPageFootnoteInfo &rInf = pPage->GetPageDesc()->GetFootnoteInfo();
     const SwTwips nBorder = rInf.GetTopDist() + rInf.GetBottomDist() +
                             rInf.GetLineWidth();
     SWRECTFN( this )
@@ -194,13 +194,13 @@ void SwFtnContFrm::Format( const SwBorderAttrs * )
         (Prt().*fnRect->fnSetTop)( nBorder );
         (Prt().*fnRect->fnSetWidth)( (Frm().*fnRect->fnGetWidth)() );
         (Prt().*fnRect->fnSetHeight)((Frm().*fnRect->fnGetHeight)() - nBorder );
-        if( (Prt().*fnRect->fnGetHeight)() < 0 && !pPage->IsFtnPage() )
+        if( (Prt().*fnRect->fnGetHeight)() < 0 && !pPage->IsFootnotePage() )
             mbValidSize = false;
     }
 
     if ( !mbValidSize )
     {
-        bool bGrow = pPage->IsFtnPage();
+        bool bGrow = pPage->IsFootnotePage();
         if( bGrow )
         {
             const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0;
@@ -215,7 +215,7 @@ void SwFtnContFrm::Format( const SwBorderAttrs * )
             SwTwips nRemaining = 0;
             SwFrm *pFrm = m_pLower;
             while ( pFrm )
-            {   // lcl_Undersize(..) respects (recursively) TxtFrms, which
+            {   // lcl_Undersize(..) respects (recursively) TextFrms, which
                 // would like to be bigger. They are created especially in
                 // columnized borders, if these do not have their maximum
                 // size yet.
@@ -260,19 +260,19 @@ void SwFtnContFrm::Format( const SwBorderAttrs * )
     }
 }
 
-SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, bool bTst, bool )
+SwTwips SwFootnoteContFrm::GrowFrm( SwTwips nDist, bool bTst, bool )
 {
-    // No check if FixSize since FtnContainer are variable up to their max. height.
+    // No check if FixSize since FootnoteContainer are variable up to their max. height.
     // If the max. height is LONG_MAX, take as much space as needed.
     // If the page is a special footnote page, take also as much as possible.
-    assert(GetUpper() && GetUpper()->IsFtnBossFrm());
+    assert(GetUpper() && GetUpper()->IsFootnoteBossFrm());
 
     SWRECTFN( this )
     if( (Frm().*fnRect->fnGetHeight)() > 0 &&
          nDist > ( LONG_MAX - (Frm().*fnRect->fnGetHeight)() ) )
         nDist = LONG_MAX - (Frm().*fnRect->fnGetHeight)();
 
-    SwFtnBossFrm *pBoss = static_cast<SwFtnBossFrm*>(GetUpper());
+    SwFootnoteBossFrm *pBoss = static_cast<SwFootnoteBossFrm*>(GetUpper());
     if( IsInSct() )
     {
         SwSectionFrm* pSect = FindSctFrm();
@@ -289,16 +289,16 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, bool bTst, bool )
     const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0;
     const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
     SwPageFrm *pPage = pBoss->FindPageFrm();
-    if ( bBrowseMode || !pPage->IsFtnPage() )
+    if ( bBrowseMode || !pPage->IsFootnotePage() )
     {
-        if ( pBoss->GetMaxFtnHeight() != LONG_MAX )
+        if ( pBoss->GetMaxFootnoteHeight() != LONG_MAX )
         {
-            nDist = std::min( nDist, pBoss->GetMaxFtnHeight()
+            nDist = std::min( nDist, pBoss->GetMaxFootnoteHeight()
                          - (Frm().*fnRect->fnGetHeight)() );
             if ( nDist <= 0 )
                 return 0L;
         }
-        // FtnBoss also influences the max value
+        // FootnoteBoss also influences the max value
         if( !IsInSct() )
         {
             const SwTwips nMax = pBoss->GetVarSpace();
@@ -343,12 +343,12 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, bool bTst, bool )
         {
             if( NA_GROW_ADJUST == nAdjust )
             {
-                SwFrm* pFtn = Lower();
-                if( pFtn )
+                SwFrm* pFootnote = Lower();
+                if( pFootnote )
                 {
-                    while( pFtn->GetNext() )
-                        pFtn = pFtn->GetNext();
-                    if( static_cast<SwFtnFrm*>(pFtn)->GetAttr()->GetFtn().IsEndNote() )
+                    while( pFootnote->GetNext() )
+                        pFootnote = pFootnote->GetNext();
+                    if( static_cast<SwFootnoteFrm*>(pFootnote)->GetAttr()->GetFootnote().IsEndNote() )
                     {
                         nReal = AdjustNeighbourhood( nGrow, bTst );
                         nAdjust = NA_GROW_SHRINK; // no more AdjustNeighbourhood
@@ -387,13 +387,13 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, bool bTst, bool )
     return nReal;
 }
 
-SwTwips SwFtnContFrm::ShrinkFrm( SwTwips nDiff, bool bTst, bool bInfo )
+SwTwips SwFootnoteContFrm::ShrinkFrm( SwTwips nDiff, bool bTst, bool bInfo )
 {
     SwPageFrm *pPage = FindPageFrm();
     bool bShrink = false;
     if ( pPage )
     {
-        if( !pPage->IsFtnPage() )
+        if( !pPage->IsFootnotePage() )
             bShrink = true;
         else
         {
@@ -417,8 +417,8 @@ SwTwips SwFtnContFrm::ShrinkFrm( SwTwips nDiff, bool bTst, bool bInfo )
     return 0;
 }
 
-SwFtnFrm::SwFtnFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwCntntFrm *pCnt, SwTxtFtn *pAt ):
-    SwLayoutFrm( pFmt, pSib ),
+SwFootnoteFrm::SwFootnoteFrm( SwFrameFormat *pFormat, SwFrm* pSib, SwContentFrm *pCnt, SwTextFootnote *pAt ):
+    SwLayoutFrm( pFormat, pSib ),
     pFollow( 0 ),
     pMaster( 0 ),
     pRef( pCnt ),
@@ -430,7 +430,7 @@ SwFtnFrm::SwFtnFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwCntntFrm *pCnt, SwTxtFtn *pAt
     mnFrmType = FRM_FTN;
 }
 
-void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage )
+void SwFootnoteFrm::InvalidateNxtFootnoteCnts( SwPageFrm *pPage )
 {
     if ( GetNext() )
     {
@@ -455,11 +455,11 @@ void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage )
 }
 
 #ifdef DBG_UTIL
-SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
+SwTwips SwFootnoteFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     static sal_uInt16 nNum = USHRT_MAX;
-    SwTxtFtn* pTxtFtn = GetAttr();
-    if ( pTxtFtn->GetFtn().GetNumber() == nNum )
+    SwTextFootnote* pTextFootnote = GetAttr();
+    if ( pTextFootnote->GetFootnote().GetNumber() == nNum )
     {
         int bla = 5;
         (void)bla;
@@ -468,13 +468,13 @@ SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
     return SwLayoutFrm::GrowFrm( nDist, bTst, bInfo );
 }
 
-SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
+SwTwips SwFootnoteFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     static sal_uInt16 nNum = USHRT_MAX;
     if( nNum != USHRT_MAX )
     {
-        SwTxtFtn* pTxtFtn = GetAttr();
-        if( pTxtFtn->GetFtn().GetNumber() == nNum )
+        SwTextFootnote* pTextFootnote = GetAttr();
+        if( pTextFootnote->GetFootnote().GetNumber() == nNum )
         {
             int bla = 5;
             (void)bla;
@@ -484,7 +484,7 @@ SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
 }
 #endif
 
-void SwFtnFrm::Cut()
+void SwFootnoteFrm::Cut()
 {
     if ( GetNext() )
         GetNext()->InvalidatePos();
@@ -495,13 +495,13 @@ void SwFtnFrm::Cut()
     SwLayoutFrm *pUp = GetUpper();
 
     // correct chaining
-    SwFtnFrm *pFtn = this;
-    if ( pFtn->GetFollow() )
-        pFtn->GetFollow()->SetMaster( pFtn->GetMaster() );
-    if ( pFtn->GetMaster() )
-        pFtn->GetMaster()->SetFollow( pFtn->GetFollow() );
-    pFtn->SetFollow( 0 );
-    pFtn->SetMaster( 0 );
+    SwFootnoteFrm *pFootnote = this;
+    if ( pFootnote->GetFollow() )
+        pFootnote->GetFollow()->SetMaster( pFootnote->GetMaster() );
+    if ( pFootnote->GetMaster() )
+        pFootnote->GetMaster()->SetFollow( pFootnote->GetFollow() );
+    pFootnote->SetFollow( 0 );
+    pFootnote->SetMaster( 0 );
 
     // cut all connections
     RemoveFromLayout();
@@ -515,7 +515,7 @@ void SwFtnFrm::Cut()
             if ( pPage )
             {
                 SwLayoutFrm *pBody = pPage->FindBodyCont();
-                if( pBody && !pBody->ContainsCntnt() )
+                if( pBody && !pBody->ContainsContent() )
                     pPage->getRootFrm()->SetSuperfluous();
             }
             SwSectionFrm* pSect = pUp->FindSctFrm();
@@ -535,10 +535,10 @@ void SwFtnFrm::Cut()
     }
 }
 
-void SwFtnFrm::Paste(  SwFrm* pParent, SwFrm* pSibling )
+void SwFootnoteFrm::Paste(  SwFrm* pParent, SwFrm* pSibling )
 {
     OSL_ENSURE( pParent, "no parent in Paste." );
-    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is CntntFrm." );
+    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is ContentFrm." );
     OSL_ENSURE( pParent != this, "I am my own parent." );
     OSL_ENSURE( pSibling != this, "I am my own sibling." );
     OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(),
@@ -578,31 +578,31 @@ void SwFtnFrm::Paste(  SwFrm* pParent, SwFrm* pSibling )
         SwFrm::DestroyFrm(pDel);
     }
 #if OSL_DEBUG_LEVEL > 0
-    SwDoc *pDoc = GetFmt()->GetDoc();
+    SwDoc *pDoc = GetFormat()->GetDoc();
     if ( GetPrev() )
     {
-        OSL_ENSURE( lcl_FindFtnPos( pDoc, static_cast<SwFtnFrm*>(GetPrev())->GetAttr() ) <=
-                lcl_FindFtnPos( pDoc, GetAttr() ), "Prev is not FtnPrev" );
+        OSL_ENSURE( lcl_FindFootnotePos( pDoc, static_cast<SwFootnoteFrm*>(GetPrev())->GetAttr() ) <=
+                lcl_FindFootnotePos( pDoc, GetAttr() ), "Prev is not FootnotePrev" );
     }
     if ( GetNext() )
     {
-        OSL_ENSURE( lcl_FindFtnPos( pDoc, GetAttr() ) <=
-                lcl_FindFtnPos( pDoc, static_cast<SwFtnFrm*>(GetNext())->GetAttr() ),
-                "Next is not FtnNext" );
+        OSL_ENSURE( lcl_FindFootnotePos( pDoc, GetAttr() ) <=
+                lcl_FindFootnotePos( pDoc, static_cast<SwFootnoteFrm*>(GetNext())->GetAttr() ),
+                "Next is not FootnoteNext" );
     }
 #endif
-    InvalidateNxtFtnCnts( pPage );
+    InvalidateNxtFootnoteCnts( pPage );
 }
 
 /// Return the next layout leaf in that the frame can be moved.
 /// New pages will only be created if specified by the parameter.
-SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage )
+SwLayoutFrm *SwFrm::GetNextFootnoteLeaf( MakePageType eMakePage )
 {
-    SwFtnBossFrm *pOldBoss = FindFtnBossFrm();
+    SwFootnoteBossFrm *pOldBoss = FindFootnoteBossFrm();
     SwPageFrm* pOldPage = pOldBoss->FindPageFrm();
     SwPageFrm* pPage;
-    SwFtnBossFrm *pBoss = pOldBoss->IsColumnFrm() ?
-        static_cast<SwFtnBossFrm*>(pOldBoss->GetNext()) : 0; // next column, if existing
+    SwFootnoteBossFrm *pBoss = pOldBoss->IsColumnFrm() ?
+        static_cast<SwFootnoteBossFrm*>(pOldBoss->GetNext()) : 0; // next column, if existing
     if( pBoss )
         pPage = NULL;
     else
@@ -612,8 +612,8 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage )
             SwLayoutFrm* pNxt = pOldBoss->GetNextSctLeaf( eMakePage );
             if( pNxt )
             {
-                OSL_ENSURE( pNxt->IsColBodyFrm(), "GetNextFtnLeaf: Funny Leaf" );
-                pBoss = static_cast<SwFtnBossFrm*>(pNxt->GetUpper());
+                OSL_ENSURE( pNxt->IsColBodyFrm(), "GetNextFootnoteLeaf: Funny Leaf" );
+                pBoss = static_cast<SwFootnoteBossFrm*>(pNxt->GetUpper());
                 pPage = pBoss->FindPageFrm();
             }
             else
@@ -635,20 +635,20 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage )
     // pBoss == NULL => pPage == NULL, so there are no following pages
 
     // If the footnote has already a Follow we do not need to search.
-    // However, if there are unwanted empty columns/pages between Ftn and Follow,
+    // However, if there are unwanted empty columns/pages between Footnote and Follow,
     // create another Follow on the next best column/page and the rest will sort itself out.
-    SwFtnFrm *pFtn = FindFtnFrm();
-    if ( pFtn && pFtn->GetFollow() )
+    SwFootnoteFrm *pFootnote = FindFootnoteFrm();
+    if ( pFootnote && pFootnote->GetFollow() )
     {
-        SwFtnBossFrm* pTmpBoss = pFtn->GetFollow()->FindFtnBossFrm();
+        SwFootnoteBossFrm* pTmpBoss = pFootnote->GetFollow()->FindFootnoteBossFrm();
         // Following cases will be handled:
-        // 1. both "FtnBoss"es are neighboring columns/pages
+        // 1. both "FootnoteBoss"es are neighboring columns/pages
         // 2. the new one is the first column of a neighboring page
         // 3. the new one is the first column in a section of the next page
         while( pTmpBoss != pBoss && pTmpBoss && !pTmpBoss->GetPrev() )
-            pTmpBoss = pTmpBoss->GetUpper()->FindFtnBossFrm();
+            pTmpBoss = pTmpBoss->GetUpper()->FindFootnoteBossFrm();
         if( pTmpBoss == pBoss )
-            return pFtn->GetFollow();
+            return pFootnote->GetFollow();
     }
 
     // If no pBoss could be found or it is a "wrong" page, we need a new page.
@@ -656,7 +656,7 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage )
     {
         if ( eMakePage == MAKEPAGE_APPEND || eMakePage == MAKEPAGE_INSERT )
         {
-            pBoss = InsertPage( pOldPage, pOldPage->IsFtnPage() );
+            pBoss = InsertPage( pOldPage, pOldPage->IsFootnotePage() );
             static_cast<SwPageFrm*>(pBoss)->SetEndNotePage( pOldPage->IsEndNotePage() );
         }
         else
@@ -667,25 +667,25 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage )
         // If this page has columns, then go to the first one
         SwLayoutFrm* pLay = pBoss->FindBodyCont();
         if( pLay && pLay->Lower() && pLay->Lower()->IsColumnFrm() )
-            pBoss = static_cast<SwFtnBossFrm*>(pLay->Lower());
+            pBoss = static_cast<SwFootnoteBossFrm*>(pLay->Lower());
     }
     // found column/page - add myself
-    SwFtnContFrm *pCont = pBoss->FindFtnCont();
-    if ( !pCont && pBoss->GetMaxFtnHeight() &&
+    SwFootnoteContFrm *pCont = pBoss->FindFootnoteCont();
+    if ( !pCont && pBoss->GetMaxFootnoteHeight() &&
          ( eMakePage == MAKEPAGE_APPEND || eMakePage == MAKEPAGE_INSERT ) )
-        pCont = pBoss->MakeFtnCont();
+        pCont = pBoss->MakeFootnoteCont();
     return pCont;
 }
 
 /// Get the preceding layout leaf in that the frame can be moved.
-SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
+SwLayoutFrm *SwFrm::GetPrevFootnoteLeaf( MakePageType eMakeFootnote )
 {
     // The predecessor of a footnote is (if possible)
     // the master of the chain of the footnote.
-    SwFtnFrm *pFtn = FindFtnFrm();
-    SwLayoutFrm *pRet = pFtn->GetMaster();
+    SwFootnoteFrm *pFootnote = FindFootnoteFrm();
+    SwLayoutFrm *pRet = pFootnote->GetMaster();
 
-    SwFtnBossFrm* pOldBoss = FindFtnBossFrm();
+    SwFootnoteBossFrm* pOldBoss = FindFootnoteBossFrm();
     SwPageFrm *pOldPage = pOldBoss->FindPageFrm();
 
     if ( !pOldBoss->GetPrev() && !pOldPage->GetPrev() )
@@ -693,38 +693,38 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
 
     if ( !pRet )
     {
-        bool bEndn = pFtn->GetAttr()->GetFtn().IsEndNote();
+        bool bEndn = pFootnote->GetAttr()->GetFootnote().IsEndNote();
         SwFrm* pTmpRef = NULL;
-        if( bEndn && pFtn->IsInSct() )
+        if( bEndn && pFootnote->IsInSct() )
         {
-            SwSectionFrm* pSect = pFtn->FindSctFrm();
+            SwSectionFrm* pSect = pFootnote->FindSctFrm();
             if( pSect->IsEndnAtEnd() )
-                pTmpRef = pSect->FindLastCntnt( FINDMODE_LASTCNT );
+                pTmpRef = pSect->FindLastContent( FINDMODE_LASTCNT );
         }
         if( !pTmpRef )
-            pTmpRef = pFtn->GetRef();
-        SwFtnBossFrm* pStop = pTmpRef->FindFtnBossFrm( !bEndn );
+            pTmpRef = pFootnote->GetRef();
+        SwFootnoteBossFrm* pStop = pTmpRef->FindFootnoteBossFrm( !bEndn );
 
         const sal_uInt16 nNum = pStop->GetPhyPageNum();
 
         // Do not leave the corresponding page if the footnote should
         // be shown at the document ending or the footnote is an endnote.
         const bool bEndNote = pOldPage->IsEndNotePage();
-        const bool bFtnEndDoc = pOldPage->IsFtnPage();
-        SwFtnBossFrm* pNxtBoss = pOldBoss;
+        const bool bFootnoteEndDoc = pOldPage->IsFootnotePage();
+        SwFootnoteBossFrm* pNxtBoss = pOldBoss;
         SwSectionFrm *pSect = pNxtBoss->GetUpper()->IsSctFrm() ?
                               static_cast<SwSectionFrm*>(pNxtBoss->GetUpper()) : 0;
 
         do
         {
             if( pNxtBoss->IsColumnFrm() && pNxtBoss->GetPrev() )
-                pNxtBoss = static_cast<SwFtnBossFrm*>(pNxtBoss->GetPrev());  // one column backwards
+                pNxtBoss = static_cast<SwFootnoteBossFrm*>(pNxtBoss->GetPrev());  // one column backwards
             else // one page backwards
             {
                 SwLayoutFrm* pBody = 0;
                 if( pSect )
                 {
-                    if( pSect->IsFtnLock() )
+                    if( pSect->IsFootnoteLock() )
                     {
                         if( pNxtBoss == pOldBoss )
                             return 0;
@@ -736,8 +736,8 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
                         if( !pSect || !pSect->Lower() )
                             return 0;
                         OSL_ENSURE( pSect->Lower()->IsColumnFrm(),
-                                "GetPrevFtnLeaf: Where's the column?" );
-                        pNxtBoss = static_cast<SwFtnBossFrm*>(pSect->Lower());
+                                "GetPrevFootnoteLeaf: Where's the column?" );
+                        pNxtBoss = static_cast<SwFootnoteBossFrm*>(pSect->Lower());
                         pBody = pSect;
                     }
                 }
@@ -745,7 +745,7 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
                 {
                     SwPageFrm* pPage = static_cast<SwPageFrm*>(pNxtBoss->FindPageFrm()->GetPrev());
                     if( !pPage || pPage->GetPhyPageNum() < nNum ||
-                        bEndNote != pPage->IsEndNotePage() || bFtnEndDoc != pPage->IsFtnPage() )
+                        bEndNote != pPage->IsEndNotePage() || bFootnoteEndDoc != pPage->IsFootnotePage() )
                         return NULL; // no further pages found
                     pNxtBoss = pPage;
                     pBody = pPage->FindBodyCont();
@@ -755,11 +755,11 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
                 {
                     if ( pBody->Lower() && pBody->Lower()->IsColumnFrm() )
                     {
-                        pNxtBoss = static_cast<SwFtnBossFrm*>(pBody->GetLastLower());
+                        pNxtBoss = static_cast<SwFootnoteBossFrm*>(pBody->GetLastLower());
                     }
                 }
             }
-            SwFtnContFrm *pCont = pNxtBoss->FindFtnCont();
+            SwFootnoteContFrm *pCont = pNxtBoss->FindFootnoteCont();
             if ( pCont )
             {
                 pRet = pCont;
@@ -769,15 +769,15 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
             {
                 // Reached the column/page of the reference.
                 // Try to add a container and paste our content.
-                if ( eMakeFtn == MAKEPAGE_FTN && pNxtBoss->GetMaxFtnHeight() )
-                    pRet = pNxtBoss->MakeFtnCont();
+                if ( eMakeFootnote == MAKEPAGE_FTN && pNxtBoss->GetMaxFootnoteHeight() )
+                    pRet = pNxtBoss->MakeFootnoteCont();
                 break;
             }
         } while( !pRet );
     }
     if ( pRet )
     {
-        const SwFtnBossFrm* pNewBoss = pRet->FindFtnBossFrm();
+        const SwFootnoteBossFrm* pNewBoss = pRet->FindFootnoteBossFrm();
         bool bJump = false;
         if( pOldBoss->IsColumnFrm() && pOldBoss->GetPrev() ) // a previous column exists
             bJump = pOldBoss->GetPrev() != (SwFrm*)pNewBoss; // did we chose it?
@@ -798,7 +798,7 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
     return pRet;
 }
 
-bool SwFrm::IsFtnAllowed() const
+bool SwFrm::IsFootnoteAllowed() const
 {
     if ( !IsInDocBody() )
         return false;
@@ -813,52 +813,52 @@ bool SwFrm::IsFtnAllowed() const
     return true;
 }
 
-void SwRootFrm::UpdateFtnNums()
+void SwRootFrm::UpdateFootnoteNums()
 {
     // page numbering only if set at the document
-    if ( GetFmt()->GetDoc()->GetFtnInfo().eNum == FTNNUM_PAGE )
+    if ( GetFormat()->GetDoc()->GetFootnoteInfo().eNum == FTNNUM_PAGE )
     {
         SwPageFrm *pPage = static_cast<SwPageFrm*>(Lower());
-        while ( pPage && !pPage->IsFtnPage() )
+        while ( pPage && !pPage->IsFootnotePage() )
         {
-            pPage->UpdateFtnNum();
+            pPage->UpdateFootnoteNum();
             pPage = static_cast<SwPageFrm*>(pPage->GetNext());
         }
     }
 }
 
 /// remove all footnotes (not the references) and all footnote pages
-void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes )
+void sw_RemoveFootnotes( SwFootnoteBossFrm* pBoss, bool bPageOnly, bool bEndNotes )
 {
     do
     {
-        SwFtnContFrm *pCont = pBoss->FindFtnCont();
+        SwFootnoteContFrm *pCont = pBoss->FindFootnoteCont();
         if ( pCont )
         {
-            SwFtnFrm *pFtn = static_cast<SwFtnFrm*>(pCont->Lower());
-            OSL_ENSURE( pFtn, "Footnote content without footnote." );
+            SwFootnoteFrm *pFootnote = static_cast<SwFootnoteFrm*>(pCont->Lower());
+            OSL_ENSURE( pFootnote, "Footnote content without footnote." );
             if ( bPageOnly )
-                while ( pFtn->GetMaster() )
-                    pFtn = pFtn->GetMaster();
+                while ( pFootnote->GetMaster() )
+                    pFootnote = pFootnote->GetMaster();
             do
             {
-                SwFtnFrm *pNxt = static_cast<SwFtnFrm*>(pFtn->GetNext());
-                if ( !pFtn->GetAttr()->GetFtn().IsEndNote() ||
+                SwFootnoteFrm *pNxt = static_cast<SwFootnoteFrm*>(pFootnote->GetNext());
+                if ( !pFootnote->GetAttr()->GetFootnote().IsEndNote() ||
                         bEndNotes )
                 {
-                    pFtn->GetRef()->Prepare( PREP_FTN, (void*)pFtn->GetAttr() );
+                    pFootnote->GetRef()->Prepare( PREP_FTN, (void*)pFootnote->GetAttr() );
                     if ( bPageOnly && !pNxt )
-                        pNxt = pFtn->GetFollow();
-                    pFtn->Cut();
-                    SwFrm::DestroyFrm(pFtn);
+                        pNxt = pFootnote->GetFollow();
+                    pFootnote->Cut();
+                    SwFrm::DestroyFrm(pFootnote);
                 }
-                pFtn = pNxt;
+                pFootnote = pNxt;
 
-            } while ( pFtn );
+            } while ( pFootnote );
         }
         if( !pBoss->IsInSct() )
         {
-            // A sectionframe with the Ftn/EndnAtEnd-flags may contain
+            // A sectionframe with the Footnote/EndnAtEnd-flags may contain
             // foot/endnotes. If the last lower frame of the bodyframe is
             // a multicolumned sectionframe, it may contain footnotes, too.
             SwLayoutFrm* pBody = pBoss->FindBodyCont();
@@ -871,7 +871,7 @@ void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes )
                         static_cast<SwSectionFrm*>(pLow)->IsAnyNoteAtEnd() ) &&
                         static_cast<SwSectionFrm*>(pLow)->Lower() &&
                         static_cast<SwSectionFrm*>(pLow)->Lower()->IsColumnFrm() )
-                        sw_RemoveFtns( static_cast<SwColumnFrm*>(static_cast<SwSectionFrm*>(pLow)->Lower()),
+                        sw_RemoveFootnotes( static_cast<SwColumnFrm*>(static_cast<SwSectionFrm*>(pLow)->Lower()),
                             bPageOnly, bEndNotes );
                     pLow = pLow->GetNext();
                 }
@@ -882,23 +882,23 @@ void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes )
     } while( pBoss );
 }
 
-void SwRootFrm::RemoveFtns( SwPageFrm *pPage, bool bPageOnly, bool bEndNotes )
+void SwRootFrm::RemoveFootnotes( SwPageFrm *pPage, bool bPageOnly, bool bEndNotes )
 {
     if ( !pPage )
         pPage = static_cast<SwPageFrm*>(Lower());
 
     do
     {   // On columned pages we have to clean up in all columns
-        SwFtnBossFrm* pBoss;
+        SwFootnoteBossFrm* pBoss;
         SwLayoutFrm* pBody = pPage->FindBodyCont();
         if( pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm() )
-            pBoss = static_cast<SwFtnBossFrm*>(pBody->Lower()); // the first column
+            pBoss = static_cast<SwFootnoteBossFrm*>(pBody->Lower()); // the first column
         else
             pBoss = pPage; // no columns
-        sw_RemoveFtns( pBoss, bPageOnly, bEndNotes );
+        sw_RemoveFootnotes( pBoss, bPageOnly, bEndNotes );
         if ( !bPageOnly )
         {
-            if ( pPage->IsFtnPage() &&
+            if ( pPage->IsFootnotePage() &&
                  (!pPage->IsEndNotePage() || bEndNotes) )
             {
                 SwFrm *pDel = pPage;
@@ -916,10 +916,10 @@ void SwRootFrm::RemoveFtns( SwPageFrm *pPage, bool bPageOnly, bool bEndNotes )
 }
 
 /// Change the page template of the footnote pages
-void SwRootFrm::CheckFtnPageDescs( bool bEndNote )
+void SwRootFrm::CheckFootnotePageDescs( bool bEndNote )
 {
     SwPageFrm *pPage = static_cast<SwPageFrm*>(Lower());
-    while ( pPage && !pPage->IsFtnPage() )
+    while ( pPage && !pPage->IsFootnotePage() )
         pPage = static_cast<SwPageFrm*>(pPage->GetNext());
     while ( pPage && pPage->IsEndNotePage() != bEndNote )
         pPage = static_cast<SwPageFrm*>(pPage->GetNext());
@@ -932,86 +932,86 @@ void SwRootFrm::CheckFtnPageDescs( bool bEndNote )
  *
  * A footnote container is always placed directly behind the body text.
  *
- * The frame format (FrmFmt) is always the default frame format.
+ * The frame format (FrameFormat) is always the default frame format.
  *
  * @return footnote container frame
  */
-SwFtnContFrm *SwFtnBossFrm::MakeFtnCont()
+SwFootnoteContFrm *SwFootnoteBossFrm::MakeFootnoteCont()
 {
-    SAL_WARN_IF(FindFtnCont(), "sw.core", "footnote container exists already");
+    SAL_WARN_IF(FindFootnoteCont(), "sw.core", "footnote container exists already");
 
-    SwFtnContFrm *pNew = new SwFtnContFrm( GetFmt()->GetDoc()->GetDfltFrmFmt(), this );
+    SwFootnoteContFrm *pNew = new SwFootnoteContFrm( GetFormat()->GetDoc()->GetDfltFrameFormat(), this );
     SwLayoutFrm *pLay = FindBodyCont();
     pNew->Paste( this, pLay->GetNext() );
     return pNew;
 }
 
-SwFtnContFrm *SwFtnBossFrm::FindFtnCont()
+SwFootnoteContFrm *SwFootnoteBossFrm::FindFootnoteCont()
 {
     SwFrm *pFrm = Lower();
-    while( pFrm && !pFrm->IsFtnContFrm() )
+    while( pFrm && !pFrm->IsFootnoteContFrm() )
         pFrm = pFrm->GetNext();
 
 #if OSL_DEBUG_LEVEL > 0
     if ( pFrm )
     {
-        SwFrm *pFtn = pFrm->GetLower();
-        OSL_ENSURE( pFtn, "Content without footnote." );
-        while ( pFtn )
+        SwFrm *pFootnote = pFrm->GetLower();
+        OSL_ENSURE( pFootnote, "Content without footnote." );
+        while ( pFootnote )
         {
-            OSL_ENSURE( pFtn->IsFtnFrm(), "Neighbor of footnote is not a footnote." );
-            pFtn = pFtn->GetNext();
+            OSL_ENSURE( pFootnote->IsFootnoteFrm(), "Neighbor of footnote is not a footnote." );
+            pFootnote = pFootnote->GetNext();
         }
     }
 #endif
 
-    return static_cast<SwFtnContFrm*>(pFrm);
+    return static_cast<SwFootnoteContFrm*>(pFrm);
 }
 
 /// Search the next available footnote container.
-SwFtnContFrm *SwFtnBossFrm::FindNearestFtnCont( bool bDontLeave )
+SwFootnoteContFrm *SwFootnoteBossFrm::FindNearestFootnoteCont( bool bDontLeave )
 {
-    SwFtnContFrm *pCont = 0;
-    if ( !GetFmt()->GetDoc()->GetFtnIdxs().empty() )
+    SwFootnoteContFrm *pCont = 0;
+    if ( !GetFormat()->GetDoc()->GetFootnoteIdxs().empty() )
     {
-        pCont = FindFtnCont();
+        pCont = FindFootnoteCont();
         if ( !pCont )
         {
             SwPageFrm *pPage = FindPageFrm();
-            SwFtnBossFrm* pBoss = this;
+            SwFootnoteBossFrm* pBoss = this;
             bool bEndNote = pPage->IsEndNotePage();
             do
             {
-                bool bChgPage = lcl_NextFtnBoss( pBoss, pPage, bDontLeave );
+                bool bChgPage = lcl_NextFootnoteBoss( pBoss, pPage, bDontLeave );
                 // Found another boss? When changing pages, also the endnote flag must match.
                 if( pBoss && ( !bChgPage || pPage->IsEndNotePage() == bEndNote ) )
-                    pCont = pBoss->FindFtnCont();
+                    pCont = pBoss->FindFootnoteCont();
             } while ( !pCont && pPage );
         }
     }
     return pCont;
 }
 
-SwFtnFrm *SwFtnBossFrm::FindFirstFtn()
+SwFootnoteFrm *SwFootnoteBossFrm::FindFirstFootnote()
 {
     // search for the nearest footnote container
-    SwFtnContFrm *pCont = FindNearestFtnCont();
+    SwFootnoteContFrm *pCont = FindNearestFootnoteCont();
     if ( !pCont )
         return 0;
 
     // Starting from the first footnote, search the first
     // footnote that is referenced by the current column/page
 
-    SwFtnFrm *pRet = static_cast<SwFtnFrm*>(pCont->Lower());
+    SwFootnoteFrm *pRet = static_cast<SwFootnoteFrm*>(pCont->Lower());
     const sal_uInt16 nRefNum = FindPageFrm()->GetPhyPageNum();
     const sal_uInt16 nRefCol = lcl_ColumnNum( this );
     sal_uInt16 nPgNum, nColNum; // page number, column number
-    SwFtnBossFrm* pBoss;
+    SwFootnoteBossFrm* pBoss;
     SwPageFrm* pPage;
     if( pRet )
     {
-        pBoss = pRet->GetRef()->FindFtnBossFrm();
-        OSL_ENSURE( pBoss, "FindFirstFtn: No boss found" );
+        pBoss = pRet->GetRef()->FindFootnoteBossFrm();
+        OSL_ENSURE( pBoss, "FindFirstFootnote: No boss found" );
         if( !pBoss )
             return NULL; // ?There must be a bug, but no GPF
         pPage = pBoss->FindPageFrm();
@@ -1036,20 +1036,20 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn()
         while ( pRet->GetFollow() )
             pRet = pRet->GetFollow();
 
-        SwFtnFrm *pNxt = static_cast<SwFtnFrm*>(pRet->GetNext());
+        SwFootnoteFrm *pNxt = static_cast<SwFootnoteFrm*>(pRet->GetNext());
         if ( !pNxt )
         {
-            pBoss = pRet->FindFtnBossFrm();
+            pBoss = pRet->FindFootnoteBossFrm();
             pPage = pBoss->FindPageFrm();
-            lcl_NextFtnBoss( pBoss, pPage, false ); // next FtnBoss
-            pCont = pBoss ? pBoss->FindNearestFtnCont() : 0;
+            lcl_NextFootnoteBoss( pBoss, pPage, false ); // next FootnoteBoss
+            pCont = pBoss ? pBoss->FindNearestFootnoteCont() : 0;
             if ( pCont )
-                pNxt = static_cast<SwFtnFrm*>(pCont->Lower());
+                pNxt = static_cast<SwFootnoteFrm*>(pCont->Lower());
         }
         if ( pNxt )
         {
             pRet = pNxt;
-            pBoss = pRet->GetRef()->FindFtnBossFrm();
+            pBoss = pRet->GetRef()->FindFootnoteBossFrm();
             pPage = pBoss->FindPageFrm();
             nPgNum = pPage->GetPhyPageNum();
             if ( nPgNum == nRefNum )
@@ -1070,9 +1070,9 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn()
 }
 
 /// Get the first footnote of a given content
-const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const
+const SwFootnoteFrm *SwFootnoteBossFrm::FindFirstFootnote( SwContentFrm *pCnt ) const
 {
-    const SwFtnFrm *pRet = const_cast<SwFtnBossFrm*>(this)->FindFirstFtn();
+    const SwFootnoteFrm *pRet = const_cast<SwFootnoteBossFrm*>(this)->FindFirstFootnote();
     if ( pRet )
     {
         const sal_uInt16 nColNum = lcl_ColumnNum( this );
@@ -1083,17 +1083,17 @@ const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const
                 pRet = pRet->GetFollow();
 
             if ( pRet->GetNext() )
-                pRet = static_cast<const SwFtnFrm*>(pRet->GetNext());
+                pRet = static_cast<const SwFootnoteFrm*>(pRet->GetNext());
             else
-            {   SwFtnBossFrm *pBoss = const_cast<SwFtnBossFrm*>(pRet->FindFtnBossFrm());
+            {   SwFootnoteBossFrm *pBoss = const_cast<SwFootnoteBossFrm*>(pRet->FindFootnoteBossFrm());
                 SwPageFrm *pPage = pBoss->FindPageFrm();
-                lcl_NextFtnBoss( pBoss, pPage, false ); // next FtnBoss
-                SwFtnContFrm *pCont = pBoss ? pBoss->FindNearestFtnCont() : 0;
-                pRet = pCont ? static_cast<SwFtnFrm*>(pCont->Lower()) : 0;
+                lcl_NextFootnoteBoss( pBoss, pPage, false ); // next FootnoteBoss
+                SwFootnoteContFrm *pCont = pBoss ? pBoss->FindNearestFootnoteCont() : 0;
+                pRet = pCont ? static_cast<SwFootnoteFrm*>(pCont->Lower()) : 0;
             }
             if ( pRet )
             {
-                const SwFtnBossFrm* pBoss = pRet->GetRef()->FindFtnBossFrm();
+                const SwFootnoteBossFrm* pBoss = pRet->GetRef()->FindFootnoteBossFrm();
                 if( pBoss->GetPhyPageNum() != nPageNum ||
                     nColNum != lcl_ColumnNum( pBoss ) )
                 pRet = 0;
@@ -1103,38 +1103,38 @@ const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const
     return pRet;
 }
 
-void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck )
+void SwFootnoteBossFrm::ResetFootnote( const SwFootnoteFrm *pCheck )
 {
     // Destroy the incarnations of footnotes to an attribute, if they don't
     // belong to pAssumed
     OSL_ENSURE( !pCheck->GetMaster(), "given master is not a Master." );
 
     SwNodeIndex aIdx( *pCheck->GetAttr()->GetStartNode(), 1 );
-    SwCntntNode *pNd = aIdx.GetNode().GetCntntNode();
+    SwContentNode *pNd = aIdx.GetNode().GetContentNode();
     if ( !pNd )
-        pNd = pCheck->GetFmt()->GetDoc()->
+        pNd = pCheck->GetFormat()->GetDoc()->
               GetNodes().GoNextSection( &aIdx, true, false );
-    SwIterator<SwFrm,SwCntntNode> aIter( *pNd );
+    SwIterator<SwFrm,SwContentNode> aIter( *pNd );
     SwFrm* pFrm = aIter.First();
     while( pFrm )
     {
             if( pFrm->getRootFrm() == pCheck->getRootFrm() )
             {
             SwFrm *pTmp = pFrm->GetUpper();
-            while ( pTmp && !pTmp->IsFtnFrm() )
+            while ( pTmp && !pTmp->IsFootnoteFrm() )
                 pTmp = pTmp->GetUpper();
 
-            SwFtnFrm *pFtn = static_cast<SwFtnFrm*>(pTmp);
-            while ( pFtn && pFtn->GetMaster() )
-                pFtn = pFtn->GetMaster();
-            if ( pFtn != pCheck )
+            SwFootnoteFrm *pFootnote = static_cast<SwFootnoteFrm*>(pTmp);
+            while ( pFootnote && pFootnote->GetMaster() )
+                pFootnote = pFootnote->GetMaster();
+            if ( pFootnote != pCheck )
             {
-                while ( pFtn )
+                while ( pFootnote )
                 {
-                    SwFtnFrm *pNxt = pFtn->GetFollow();
-                    pFtn->Cut();
-                    SwFrm::DestroyFrm(pFtn);
-                    pFtn = pNxt;
+                    SwFootnoteFrm *pNxt = pFootnote->GetFollow();
+                    pFootnote->Cut();
+                    SwFrm::DestroyFrm(pFootnote);
+                    pFootnote = pNxt;
                 }
             }
         }
@@ -1143,7 +1143,7 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck )
     }
 }
 
-void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
+void SwFootnoteBossFrm::InsertFootnote( SwFootnoteFrm* pNew )
 {
     // Place the footnote in front of the footnote whose attribute
     // is in front of the new one (get position via the Doc).
@@ -1151,8 +1151,8 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
     // If there is a container but no footnote for this footnote-boss yet, place
     // the footnote behind the last footnote of the closest previous column/page.
 
-    ResetFtn( pNew );
-    SwFtnFrm *pSibling = FindFirstFtn();
+    ResetFootnote( pNew );
+    SwFootnoteFrm *pSibling = FindFirstFootnote();
     bool bDontLeave = false;
 
     // Ok, a sibling has been found, but is the sibling in an acceptable
@@ -1160,17 +1160,17 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
     if( IsInSct() )
     {
         SwSectionFrm* pMySect = ImplFindSctFrm();
-        bool bEndnt = pNew->GetAttr()->GetFtn().IsEndNote();
+        bool bEndnt = pNew->GetAttr()->GetFootnote().IsEndNote();
         if( bEndnt )
         {
-            const SwSectionFmt* pEndFmt = pMySect->GetEndSectFmt();
-            bDontLeave = 0 != pEndFmt;
+            const SwSectionFormat* pEndFormat = pMySect->GetEndSectFormat();
+            bDontLeave = 0 != pEndFormat;
             if( pSibling )
             {
-                if( pEndFmt )
+                if( pEndFormat )
                 {
                     if( !pSibling->IsInSct() ||
-                        !pSibling->ImplFindSctFrm()->IsDescendantFrom( pEndFmt ) )
+                        !pSibling->ImplFindSctFrm()->IsDescendantFrom( pEndFormat ) )
                         pSibling = NULL;
                 }
                 else if( pSibling->IsInSct() )
@@ -1179,10 +1179,10 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
         }
         else
         {
-            bDontLeave = pMySect->IsFtnAtEnd();
+            bDontLeave = pMySect->IsFootnoteAtEnd();
             if( pSibling )
             {
-                if( pMySect->IsFtnAtEnd() )
+                if( pMySect->IsFootnoteAtEnd() )
                 {
                     if( !pSibling->IsInSct() ||
                         !pMySect->IsAnFollow( pSibling->ImplFindSctFrm() ) )
@@ -1199,34 +1199,34 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
         pSibling = NULL;
 
     // use the Doc to find out the position
-    SwDoc *pDoc = GetFmt()->GetDoc();
-    const sal_uLong nStPos = ::lcl_FindFtnPos( pDoc, pNew->GetAttr() );
+    SwDoc *pDoc = GetFormat()->GetDoc();
+    const sal_uLong nStPos = ::lcl_FindFootnotePos( pDoc, pNew->GetAttr() );
 
     sal_uLong nCmpPos = 0;
     sal_uLong nLastPos = 0;
-    SwFtnContFrm *pParent = 0;
+    SwFootnoteContFrm *pParent = 0;
     if( pSibling )
     {
-        nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
+        nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() );
         if( nCmpPos > nStPos )
             pSibling = NULL;
     }
 
     if ( !pSibling )
-    {   pParent = FindFtnCont();
+    {   pParent = FindFootnoteCont();
         if ( !pParent )
         {
             // There is no footnote container yet. Before creating one, keep in mind that
             // there might exist another following footnote that must be placed before the
             // new inserted one e.g. because it was divided over multiple pages etc.
-            pParent = FindNearestFtnCont( bDontLeave );
+            pParent = FindNearestFootnoteCont( bDontLeave );
             if ( pParent )
             {
-                SwFtnFrm *pFtn = static_cast<SwFtnFrm*>(pParent->Lower());
-                if ( pFtn )
+                SwFootnoteFrm *pFootnote = static_cast<SwFootnoteFrm*>(pParent->Lower());
+                if ( pFootnote )
                 {
 
-                    nCmpPos = ::lcl_FindFtnPos( pDoc, pFtn->GetAttr() );
+                    nCmpPos = ::lcl_FindFootnotePos( pDoc, pFootnote->GetAttr() );
                     if ( nCmpPos > nStPos )
                         pParent = 0;
                 }
@@ -1236,20 +1236,20 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
         }
         if ( !pParent )
             // here, we are sure that we can create a footnote container
-            pParent = MakeFtnCont();
+            pParent = MakeFootnoteCont();
         else
         {
             // Based on the first footnote below the Parent, search for the first footnote whose
             // index is after the index of the newly inserted, to place the new one correctly
-            pSibling = static_cast<SwFtnFrm*>(pParent->Lower());
+            pSibling = static_cast<SwFootnoteFrm*>(pParent->Lower());
             if ( !pSibling )
             { OSL_ENSURE( false, "Could not find space for footnote.");
                 return;
             }
-            nCmpPos  = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
+            nCmpPos  = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() );
 
-            SwFtnBossFrm *pNxtB; // remember the last one to not
-            SwFtnFrm  *pLastSib = 0;    // go too far.
+            SwFootnoteBossFrm *pNxtB; // remember the last one to not
+            SwFootnoteFrm  *pLastSib = 0;    // go too far.
 
             while ( pSibling && nCmpPos <= nStPos )
             {
@@ -1261,30 +1261,30 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
 
                 if ( pSibling->GetNext() )
                 {
-                    pSibling = static_cast<SwFtnFrm*>(pSibling->GetNext());
+                    pSibling = static_cast<SwFootnoteFrm*>(pSibling->GetNext());
                     OSL_ENSURE( !pSibling->GetMaster() || ( ENDNOTE > nStPos &&
-                            pSibling->GetAttr()->GetFtn().IsEndNote() ),
-                            "InsertFtn: Master expected I" );
+                            pSibling->GetAttr()->GetFootnote().IsEndNote() ),
+                            "InsertFootnote: Master expected I" );
                 }
                 else
                 {
-                    pNxtB = pSibling->FindFtnBossFrm();
+                    pNxtB = pSibling->FindFootnoteBossFrm();
                     SwPageFrm *pSibPage = pNxtB->FindPageFrm();
                     bool bEndNote = pSibPage->IsEndNotePage();
-                    bool bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave );
+                    bool bChgPage = lcl_NextFootnoteBoss( pNxtB, pSibPage, bDontLeave );
                     // When changing pages, also the endnote flag must match.
-                    SwFtnContFrm *pCont = pNxtB && ( !bChgPage ||
+                    SwFootnoteContFrm *pCont = pNxtB && ( !bChgPage ||
                         pSibPage->IsEndNotePage() == bEndNote )
-                        ? pNxtB->FindNearestFtnCont( bDontLeave ) : 0;
+                        ? pNxtB->FindNearestFootnoteCont( bDontLeave ) : 0;
                     if( pCont )
-                        pSibling = static_cast<SwFtnFrm*>(pCont->Lower());
-                    else // no further FtnContainer, insert after pSibling
+                        pSibling = static_cast<SwFootnoteFrm*>(pCont->Lower());
+                    else // no further FootnoteContainer, insert after pSibling
                         break;
                 }
                 if ( pSibling )
                 {
-                    nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
-                    OSL_ENSURE( nCmpPos > nLastPos, "InsertFtn: Order of FtnFrm's buggy" );
+                    nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() );
+                    OSL_ENSURE( nCmpPos > nLastPos, "InsertFootnote: Order of FootnoteFrm's buggy" );
                 }
             }
             // pLastSib is the last footnote before the new one and
@@ -1303,7 +1303,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
                 pSibling = pLastSib;
                 while( pSibling->GetFollow() )
                     pSibling = pSibling->GetFollow();
-                OSL_ENSURE( !pSibling->GetNext(), "InsertFtn: Who's that guy?" );
+                OSL_ENSURE( !pSibling->GetNext(), "InsertFootnote: Who's that guy?" );
             }
         }
     }
@@ -1311,12 +1311,12 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
     {
         // First footnote of the column/page found. Now search from there for the first one on the
         // same column/page whose index is after the given one. The last one found is the predecessor.
-        SwFtnBossFrm* pBoss = pNew->GetRef()->FindFtnBossFrm(
-            !pNew->GetAttr()->GetFtn().IsEndNote() );
+        SwFootnoteBossFrm* pBoss = pNew->GetRef()->FindFootnoteBossFrm(
+            !pNew->GetAttr()->GetFootnote().IsEndNote() );
         sal_uInt16 nRefNum = pBoss->GetPhyPageNum();    // page number of the new footnote
         sal_uInt16 nRefCol = lcl_ColumnNum( pBoss );    // column number of the new footnote
         bool bEnd = false;
-        SwFtnFrm *pLastSib = 0;
+        SwFootnoteFrm *pLastSib = 0;
         while ( pSibling && !bEnd && (nCmpPos <= nStPos) )
         {
             pLastSib = pSibling;
@@ -1325,11 +1325,11 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
             while ( pSibling->GetFollow() )
                 pSibling = pSibling->GetFollow();
 
-            SwFtnFrm *pFoll = static_cast<SwFtnFrm*>(pSibling->GetNext());
+            SwFootnoteFrm *pFoll = static_cast<SwFootnoteFrm*>(pSibling->GetNext());
             if ( pFoll )
             {
-                pBoss = pSibling->GetRef()->FindFtnBossFrm( !pSibling->
-                                            GetAttr()->GetFtn().IsEndNote() );
+                pBoss = pSibling->GetRef()->FindFootnoteBossFrm( !pSibling->
+                                            GetAttr()->GetFootnote().IsEndNote() );
                 sal_uInt16 nTmpRef;
                 if( nStPos >= ENDNOTE ||
                     (nTmpRef = pBoss->GetPhyPageNum()) < nRefNum ||
@@ -1340,21 +1340,21 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
             }
             else
             {
-                SwFtnBossFrm* pNxtB = pSibling->FindFtnBossFrm();
+                SwFootnoteBossFrm* pNxtB = pSibling->FindFootnoteBossFrm();
                 SwPageFrm *pSibPage = pNxtB->FindPageFrm();
                 bool bEndNote = pSibPage->IsEndNotePage();
-                bool bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave );
+                bool bChgPage = lcl_NextFootnoteBoss( pNxtB, pSibPage, bDontLeave );
                 // When changing pages, also the endnote flag must match.
-                SwFtnContFrm *pCont = pNxtB && ( !bChgPage ||
+                SwFootnoteContFrm *pCont = pNxtB && ( !bChgPage ||
                     pSibPage->IsEndNotePage() == bEndNote )
-                    ? pNxtB->FindNearestFtnCont( bDontLeave ) : 0;
+                    ? pNxtB->FindNearestFootnoteCont( bDontLeave ) : 0;
                 if ( pCont )
-                    pSibling = static_cast<SwFtnFrm*>(pCont->Lower());
+                    pSibling = static_cast<SwFootnoteFrm*>(pCont->Lower());
                 else
                     bEnd = true;
             }
             if ( !bEnd && pSibling )
-                nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
+                nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() );
             if ( pSibling && pLastSib && (pSibling != pLastSib) )
             {
                 // too far?
@@ -1368,13 +1368,13 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
     }
     if ( pSibling )
     {
-        nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
+        nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() );
         if ( nCmpPos < nStPos )
         {
             while ( pSibling->GetFollow() )
                 pSibling = pSibling->GetFollow();
-            pParent = static_cast<SwFtnContFrm*>(pSibling->GetUpper());
-            pSibling = static_cast<SwFtnFrm*>(pSibling->GetNext());
+            pParent = static_cast<SwFootnoteContFrm*>(pSibling->GetUpper());
+            pSibling = static_cast<SwFootnoteFrm*>(pSibling->GetNext());
         }
         else
         {
@@ -1382,23 +1382,23 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
             {
                 if( ENDNOTE > nCmpPos || nStPos >= ENDNOTE )
                 {
-                    OSL_FAIL( "InsertFtn: Master expected II" );
+                    OSL_FAIL( "InsertFootnote: Master expected II" );
                     do
                         pSibling = pSibling->GetMaster();
                     while ( pSibling->GetMaster() );
                 }
             }
-            pParent = static_cast<SwFtnContFrm*>(pSibling->GetUpper());
+            pParent = static_cast<SwFootnoteContFrm*>(pSibling->GetUpper());
         }
     }
     OSL_ENSURE( pParent, "paste in space?" );
     pNew->Paste( pParent, pSibling );
 }
 
-void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
+void SwFootnoteBossFrm::AppendFootnote( SwContentFrm *pRef, SwTextFootnote *pAttr )
 {
     // If the footnote already exists, do nothing.
-    if ( FindFtn( pRef, pAttr ) )
+    if ( FindFootnote( pRef, pAttr ) )
         return;
 
     // If footnotes are inserted at the end of the document,
@@ -1406,23 +1406,23 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
     // If there is none yet, we need to create one.
     // If it is an Endnote, we need to search for or create an
     // Endnote page.
-    SwDoc *pDoc = GetFmt()->GetDoc();
-    SwFtnBossFrm *pBoss = this;
+    SwDoc *pDoc = GetFormat()->GetDoc();
+    SwFootnoteBossFrm *pBoss = this;
     SwPageFrm *pPage = FindPageFrm();
     SwPageFrm *pMyPage = pPage;
     bool bChgPage = false;
     bool bEnd = false;
-    if ( pAttr->GetFtn().IsEndNote() )
+    if ( pAttr->GetFootnote().IsEndNote() )
     {
         bEnd = true;
         if( GetUpper()->IsSctFrm() &&
             static_cast<SwSectionFrm*>(GetUpper())->IsEndnAtEnd() )
         {
             SwFrm* pLast =
-                static_cast<SwSectionFrm*>(GetUpper())->FindLastCntnt( FINDMODE_ENDNOTE );
+                static_cast<SwSectionFrm*>(GetUpper())->FindLastContent( FINDMODE_ENDNOTE );
             if( pLast )
             {
-                pBoss = pLast->FindFtnBossFrm();
+                pBoss = pLast->FindFootnoteBossFrm();
                 pPage = pBoss->FindPageFrm();
             }
         }
@@ -1447,15 +1447,15 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
                 // To ensure to be finished in finite time even if hundreds
                 // of footnotes exist
                 SwPageFrm *pNxt = static_cast<SwPageFrm*>(pPage->GetNext());
-                const sal_uLong nStPos = ::lcl_FindFtnPos( pDoc, pAttr );
+                const sal_uLong nStPos = ::lcl_FindFootnotePos( pDoc, pAttr );
                 while ( pNxt && pNxt->IsEndNotePage() )
                 {
-                    SwFtnContFrm *pCont = pNxt->FindFtnCont();
+                    SwFootnoteContFrm *pCont = pNxt->FindFootnoteCont();
                     if ( pCont && pCont->Lower() )
                     {
-                        OSL_ENSURE( pCont->Lower()->IsFtnFrm(), "no footnote in the container" );
-                        if ( nStPos > ::lcl_FindFtnPos( pDoc,
-                                        static_cast<SwFtnFrm*>(pCont->Lower())->GetAttr()))
+                        OSL_ENSURE( pCont->Lower()->IsFootnoteFrm(), "no footnote in the container" );
+                        if ( nStPos > ::lcl_FindFootnotePos( pDoc,
+                                        static_cast<SwFootnoteFrm*>(pCont->Lower())->GetAttr()))
                         {
                             pPage = pNxt;
                             pNxt = static_cast<SwPageFrm*>(pPage->GetNext());
@@ -1467,19 +1467,19 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
             }
         }
     }
-    else if( FTNPOS_CHAPTER == pDoc->GetFtnInfo().ePos && ( !GetUpper()->
-             IsSctFrm() || !static_cast<SwSectionFrm*>(GetUpper())->IsFtnAtEnd() ) )
+    else if( FTNPOS_CHAPTER == pDoc->GetFootnoteInfo().ePos && ( !GetUpper()->
+             IsSctFrm() || !static_cast<SwSectionFrm*>(GetUpper())->IsFootnoteAtEnd() ) )
     {
-        while ( pPage->GetNext() && !pPage->IsFtnPage() &&
+        while ( pPage->GetNext() && !pPage->IsFootnotePage() &&
                 !static_cast<SwPageFrm*>(pPage->GetNext())->IsEndNotePage() )
         {
             pPage = static_cast<SwPageFrm*>(pPage->GetNext());
             bChgPage = true;
         }
 
-        if ( !pPage->IsFtnPage() )
+        if ( !pPage->IsFootnotePage() )
         {
-            SwPageDesc *pDesc = pDoc->GetFtnInfo().GetPageDesc( *pDoc );
+            SwPageDesc *pDesc = pDoc->GetFootnoteInfo().GetPageDesc( *pDoc );
             pPage = ::InsertNewPage( *pDesc, pPage->GetUpper(),
                 !pPage->OnRightPage(), false, false, true, pPage->GetNext() );
             bChgPage = true;
@@ -1490,15 +1490,15 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
             // to ensure that we will finish in finite time even if
             // hundreds of footnotes exist.
             SwPageFrm *pNxt = static_cast<SwPageFrm*>(pPage->GetNext());
-            const sal_uLong nStPos = ::lcl_FindFtnPos( pDoc, pAttr );
-            while ( pNxt && pNxt->IsFtnPage() && !pNxt->IsEndNotePage() )
+            const sal_uLong nStPos = ::lcl_FindFootnotePos( pDoc, pAttr );
+            while ( pNxt && pNxt->IsFootnotePage() && !pNxt->IsEndNotePage() )
             {
-                SwFtnContFrm *pCont = pNxt->FindFtnCont();
+                SwFootnoteContFrm *pCont = pNxt->FindFootnoteCont();
                 if ( pCont && pCont->Lower() )
                 {
-                    OSL_ENSURE( pCont->Lower()->IsFtnFrm(), "no footnote in the container" );
-                    if ( nStPos > ::lcl_FindFtnPos( pDoc,
-                                        static_cast<SwFtnFrm*>(pCont->Lower())->GetAttr()))
+                    OSL_ENSURE( pCont->Lower()->IsFootnoteFrm(), "no footnote in the container" );
+                    if ( nStPos > ::lcl_FindFootnotePos( pDoc,
+                                        static_cast<SwFootnoteFrm*>(pCont->Lower())->GetAttr()))
                     {
                         pPage = pNxt;
                         pNxt = static_cast<SwPageFrm*>(pPage->GetNext());
@@ -1519,25 +1519,25 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
 
     // If there is already a footnote content on the column/page,
     // another one cannot be created in a column area.
-    if( pBoss->IsInSct() && pBoss->IsColumnFrm() && !pPage->IsFtnPage() )
+    if( pBoss->IsInSct() && pBoss->IsColumnFrm() && !pPage->IsFootnotePage() )
     {
         SwSectionFrm* pSct = pBoss->FindSctFrm();
-        if( bEnd ? !pSct->IsEndnAtEnd() : !pSct->IsFtnAtEnd() )
+        if( bEnd ? !pSct->IsEndnAtEnd() : !pSct->IsFootnoteAtEnd() )
         {
-            SwFtnContFrm* pFtnCont = pSct->FindFtnBossFrm(!bEnd)->FindFtnCont();
-            if( pFtnCont )
+            SwFootnoteContFrm* pFootnoteCont = pSct->FindFootnoteBossFrm(!bEnd)->FindFootnoteCont();
+            if( pFootnoteCont )
             {
-                SwFtnFrm* pTmp = static_cast<SwFtnFrm*>(pFtnCont->Lower());
+                SwFootnoteFrm* pTmp = static_cast<SwFootnoteFrm*>(pFootnoteCont->Lower());
                 if( bEnd )
-                    while( pTmp && !pTmp->GetAttr()->GetFtn().IsEndNote() )
-                        pTmp = static_cast<SwFtnFrm*>(pTmp->GetNext());
+                    while( pTmp && !pTmp->GetAttr()->GetFootnote().IsEndNote() )
+                        pTmp = static_cast<SwFootnoteFrm*>(pTmp->GetNext());
                 if( pTmp && *pTmp < pAttr )
                     return;
             }
         }
     }
 
-    SwFtnFrm *pNew = new SwFtnFrm( pDoc->GetDfltFrmFmt(), this, pRef, pAttr );
+    SwFootnoteFrm *pNew = new SwFootnoteFrm( pDoc->GetDfltFrameFormat(), this, pRef, pAttr );
     {
         SwNodeIndex aIdx( *pAttr->GetStartNode(), 1 );
         ::_InsertCnt( pNew, pDoc, aIdx.GetIndex() );
@@ -1547,49 +1547,49 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
     if( bChgPage )
     {
         SwLayoutFrm* pBody = pPage->FindBodyCont();
-        OSL_ENSURE( pBody, "AppendFtn: NoPageBody?" );
+        OSL_ENSURE( pBody, "AppendFootnote: NoPageBody?" );
         if( pBody->Lower() && pBody->Lower()->IsColumnFrm() )
-            pBoss = static_cast<SwFtnBossFrm*>(pBody->Lower());
+            pBoss = static_cast<SwFootnoteBossFrm*>(pBody->Lower());
         else
             pBoss = pPage; // page if no columns exist
     }
-    pBoss->InsertFtn( pNew );
+    pBoss->InsertFootnote( pNew );
     if ( pNew->GetUpper() ) // inserted or not?
     {
         ::RegistFlys( pNew->FindPageFrm(), pNew );
         SwSectionFrm* pSect = FindSctFrm();
-        // The content of a FtnContainer in a (column) section only need to be calculated
+        // The content of a FootnoteContainer in a (column) section only need to be calculated
         // if the section stretches already to the bottom edge of the Upper.
         if( pSect && !pSect->IsJoinLocked() && ( bEnd ? !pSect->IsEndnAtEnd() :
-            !pSect->IsFtnAtEnd() ) && pSect->Growable() )
+            !pSect->IsFootnoteAtEnd() ) && pSect->Growable() )
             pSect->InvalidateSize();
         else
         {
             // #i49383# - disable unlock of position of
             // lower objects during format of footnote content.
-            const bool bOldFtnFrmLocked( pNew->IsColLocked() );
+            const bool bOldFootnoteFrmLocked( pNew->IsColLocked() );
             pNew->ColLock();
             pNew->KeepLockPosOfLowerObjs();
             // #i57914# - adjust fix #i49383#
-            SwCntntFrm *pCnt = pNew->ContainsCntnt();
-            while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr )
+            SwContentFrm *pCnt = pNew->ContainsContent();
+            while ( pCnt && pCnt->FindFootnoteFrm()->GetAttr() == pAttr )
             {
                 pCnt->Calc();
                 // #i49383# - format anchored objects
-                if ( pCnt->IsTxtFrm() && pCnt->IsValid() )
+                if ( pCnt->IsTextFrm() && pCnt->IsValid() )
                 {
                     if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt,
                                                               *(pCnt->FindPageFrm()) ) )
                     {
                         // restart format with first content
-                        pCnt = pNew->ContainsCntnt();
+                        pCnt = pNew->ContainsContent();
                         continue;
                     }
                 }
                 pCnt = pCnt->FindNextCnt();
             }
             // #i49383#
-            if ( !bOldFtnFrmLocked )
+            if ( !bOldFootnoteFrmLocked )
             {
                 pNew->ColUnlock();
             }
@@ -1598,52 +1598,52 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
             pNew->UnlockPosOfLowerObjs();
             pNew->Calc();
             // #i57914# - adjust fix #i49383#
-            if ( !bOldFtnFrmLocked && !pNew->GetLower() &&
+            if ( !bOldFootnoteFrmLocked && !pNew->GetLower() &&
                  !pNew->IsColLocked() && !pNew->IsBackMoveLocked() )
             {
                 pNew->Cut();
                 SwFrm::DestroyFrm(pNew);
             }
         }
-        pMyPage->UpdateFtnNum();
+        pMyPage->UpdateFootnoteNum();
     }
     else
         SwFrm::DestroyFrm(pNew);
 }
 
-SwFtnFrm *SwFtnBossFrm::FindFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr )
+SwFootnoteFrm *SwFootnoteBossFrm::FindFootnote( const SwContentFrm *pRef, const SwTextFootnote *pAttr )
 {
     // the easiest and savest way goes via the attribute
-    OSL_ENSURE( pAttr->GetStartNode(), "FtnAtr without StartNode." );
+    OSL_ENSURE( pAttr->GetStartNode(), "FootnoteAtr without StartNode." );
     SwNodeIndex aIdx( *pAttr->GetStartNode(), 1 );
-    SwCntntNode *pNd = aIdx.GetNode().GetCntntNode();
+    SwContentNode *pNd = aIdx.GetNode().GetContentNode();
     if ( !pNd )
         pNd = pRef->GetAttrSet()->GetDoc()->
               GetNodes().GoNextSection( &aIdx, true, false );
     if ( !pNd )
         return 0;
-    SwIterator<SwFrm,SwCntntNode> aIter( *pNd );
+    SwIterator<SwFrm,SwContentNode> aIter( *pNd );
     SwFrm* pFrm = aIter.First();
     if( pFrm )
         do
         {
                 pFrm = pFrm->GetUpper();
                 // #i28500#, #i27243# Due to the endnode collector, there are
-                // SwFtnFrms, which are not in the layout. Therefore the
-                // bInfFtn flags are not set correctly, and a cell of FindFtnFrm
-                // would return 0. Therefore we better call ImplFindFtnFrm().
-                SwFtnFrm *pFtn = pFrm->ImplFindFtnFrm();
-                if ( pFtn && pFtn->GetRef() == pRef )
+                // SwFootnoteFrms, which are not in the layout. Therefore the
+                // bInfFootnote flags are not set correctly, and a cell of FindFootnoteFrm
+                // would return 0. Therefore we better call ImplFindFootnoteFrm().
+                SwFootnoteFrm *pFootnote = pFrm->ImplFindFootnoteFrm();
+                if ( pFootnote && pFootnote->GetRef() == pRef )
                 {
                     // The following condition becomes true, if the whole
                     // footnotecontent is a section. While no frames exist,
                     // the HiddenFlag of the section is set, this causes
                     // the GoNextSection-function leaves the footnote.
-                    if( pFtn->GetAttr() != pAttr )
+                    if( pFootnote->GetAttr() != pAttr )
                         return 0;
-                    while ( pFtn && pFtn->GetMaster() )
-                        pFtn = pFtn->GetMaster();
-                    return pFtn;
+                    while ( pFootnote && pFootnote->GetMaster() )
+                        pFootnote = pFootnote->GetMaster();
+                    return pFootnote;
                 }
 
         } while ( 0 != (pFrm = aIter.Next()) );
@@ -1651,64 +1651,64 @@ SwFtnFrm *SwFtnBossFrm::FindFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr )
     return 0;
 }
 
-void SwFtnBossFrm::RemoveFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr,
+void SwFootnoteBossFrm::RemoveFootnote( const SwContentFrm *pRef, const SwTextFootnote *pAttr,
                               bool bPrep )
 {
-    SwFtnFrm *pFtn = FindFtn( pRef, pAttr );
-    if( pFtn )
+    SwFootnoteFrm *pFootnote = FindFootnote( pRef, pAttr );
+    if( pFootnote )
     {
         do
         {
-            SwFtnFrm *pFoll = pFtn->GetFollow();
-            pFtn->Cut();
-            SwFrm::DestroyFrm(pFtn);
-            pFtn = pFoll;
-        } while ( pFtn );
+            SwFootnoteFrm *pFoll = pFootnote->GetFollow();
+            pFootnote->Cut();
+            SwFrm::DestroyFrm(pFootnote);
+            pFootnote = pFoll;
+        } while ( pFootnote );
         if( bPrep && pRef->IsFollow() )
         {
-            OSL_ENSURE( pRef->IsTxtFrm(), "NoTxtFrm has Footnote?" );
-            SwTxtFrm* pMaster = pRef->FindMaster();
+            OSL_ENSURE( pRef->IsTextFrm(), "NoTextFrm has Footnote?" );
+            SwTextFrm* pMaster = pRef->FindMaster();
             if( !pMaster->IsLocked() )
                 pMaster->Prepare( PREP_FTN_GONE );
         }
     }
-    FindPageFrm()->UpdateFtnNum();
+    FindPageFrm()->UpdateFootnoteNum();
 }
 
-void SwFtnBossFrm::ChangeFtnRef( const SwCntntFrm *pOld, const SwTxtFtn *pAttr,
-                                 SwCntntFrm *pNew )
+void SwFootnoteBossFrm::ChangeFootnoteRef( const SwContentFrm *pOld, const SwTextFootnote *pAttr,
+                                 SwContentFrm *pNew )
 {
-    SwFtnFrm *pFtn = FindFtn( pOld, pAttr );
-    while ( pFtn )
+    SwFootnoteFrm *pFootnote = FindFootnote( pOld, pAttr );
+    while ( pFootnote )
     {
-        pFtn->SetRef( pNew );
-        pFtn = pFtn->GetFollow();
+        pFootnote->SetRef( pNew );
+        pFootnote = pFootnote->GetFollow();
     }
 }
 
-/// OD 03.04.2003 #108446# - add parameter <_bCollectOnlyPreviousFtns> in
+/// OD 03.04.2003 #108446# - add parameter <_bCollectOnlyPreviousFootnotes> in
 /// order to control, if only footnotes, which are positioned before the
 /// footnote boss frame <this> have to be collected.
-void SwFtnBossFrm::CollectFtns( const SwCntntFrm* _pRef,
-                                SwFtnBossFrm*     _pOld,
-                                SwFtnFrms&        _rFtnArr,
-                                const bool    _bCollectOnlyPreviousFtns )
+void SwFootnoteBossFrm::CollectFootnotes( const SwContentFrm* _pRef,
+                                SwFootnoteBossFrm*     _pOld,
+                                SwFootnoteFrms&        _rFootnoteArr,
+                                const bool    _bCollectOnlyPreviousFootnotes )
 {
-    SwFtnFrm *pFtn = _pOld->FindFirstFtn();
-    while( !pFtn )
+    SwFootnoteFrm *pFootnote = _pOld->FindFirstFootnote();
+    while( !pFootnote )
     {
         if( _pOld->IsColumnFrm() )
         {
             // visit columns
-            while ( !pFtn && _pOld->GetPrev() )
+            while ( !pFootnote && _pOld->GetPrev() )
             {
                 // Still no problem if no footnote was found yet. The loop is needed to pick up
                 // following rows in tables. In all other cases it might correct bad contexts.
-                _pOld = static_cast<SwFtnBossFrm*>(_pOld->GetPrev());
-                pFtn = _pOld->FindFirstFtn();
+                _pOld = static_cast<SwFootnoteBossFrm*>(_pOld->GetPrev());
+                pFootnote = _pOld->FindFirstFootnote();
             }
         }
-        if( !pFtn )
+        if( !pFootnote )
         {
             // previous page
             SwPageFrm* pPg;
@@ -1726,45 +1726,45 @@ void SwFtnBossFrm::CollectFtns( const SwCntntFrm* _pRef,
             if( pBody->Lower() && pBody->Lower()->IsColumnFrm() )
             {
                 // multiple columns on one page => search last column
-                _pOld = static_cast<SwFtnBossFrm*>(pBody->GetLastLower());
+                _pOld = static_cast<SwFootnoteBossFrm*>(pBody->GetLastLower());
             }
             else
                 _pOld = pPg; // single column page
-            pFtn = _pOld->FindFirstFtn();
+            pFootnote = _pOld->FindFirstFootnote();
         }
     }
-    // OD 03.04.2003 #108446# - consider new parameter <_bCollectOnlyPreviousFtns>
-    SwFtnBossFrm* pRefBossFrm = NULL;
-    if ( _bCollectOnlyPreviousFtns )
+    // OD 03.04.2003 #108446# - consider new parameter <_bCollectOnlyPreviousFootnotes>
+    SwFootnoteBossFrm* pRefBossFrm = NULL;
+    if ( _bCollectOnlyPreviousFootnotes )
     {
         pRefBossFrm = this;
     }
-    _CollectFtns( _pRef, pFtn, _rFtnArr, _bCollectOnlyPreviousFtns, pRefBossFrm );
+    _CollectFootnotes( _pRef, pFootnote, _rFootnoteArr, _bCollectOnlyPreviousFootnotes, pRefBossFrm );
 }
 
-inline void FtnInArr( SwFtnFrms& rFtnArr, SwFtnFrm* pFtn )
+inline void FootnoteInArr( SwFootnoteFrms& rFootnoteArr, SwFootnoteFrm* pFootnote )
 {
-    if ( rFtnArr.end() == std::find( rFtnArr.begin(), rFtnArr.end(), pFtn ) )
-        rFtnArr.push_back( pFtn );
+    if ( rFootnoteArr.end() == std::find( rFootnoteArr.begin(), rFootnoteArr.end(), pFootnote ) )
+        rFootnoteArr.push_back( pFootnote );
 }
 
-/// OD 03.04.2003 #108446# - add parameters <_bCollectOnlyPreviousFtns> and
-/// <_pRefFtnBossFrm> in order to control, if only footnotes, which are positioned
+/// OD 03.04.2003 #108446# - add parameters <_bCollectOnlyPreviousFootnotes> and
+/// <_pRefFootnoteBossFrm> in order to control, if only footnotes, which are positioned
 /// before the given reference footnote boss frame have to be collected.
-/// Note: if parameter <_bCollectOnlyPreviousFtns> is true, then parameter
-/// <_pRefFtnBossFrm> have to be referenced to an object.
+/// Note: if parameter <_bCollectOnlyPreviousFootnotes> is true, then parameter
+/// <_pRefFootnoteBossFrm> have to be referenced to an object.
 /// Adjust parameter names.
-void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
-                                 SwFtnFrm*           _pFtn,
-                                 SwFtnFrms&          _rFtnArr,
-                                 bool                _bCollectOnlyPreviousFtns,
-                                 const SwFtnBossFrm* _pRefFtnBossFrm)
+void SwFootnoteBossFrm::_CollectFootnotes( const SwContentFrm*   _pRef,
+                                 SwFootnoteFrm*           _pFootnote,
+                                 SwFootnoteFrms&          _rFootnoteArr,
+                                 bool                _bCollectOnlyPreviousFootnotes,
+                                 const SwFootnoteBossFrm* _pRefFootnoteBossFrm)
 {
     // OD 03.04.2003 #108446# - assert, that no reference footnote boss frame
     // is set, in spite of the order, that only previous footnotes has to be
     // collected.
-    OSL_ENSURE( !_bCollectOnlyPreviousFtns || _pRefFtnBossFrm,
-            "<SwFtnBossFrm::_CollectFtns(..)> - No reference footnote boss frame for collecting only previous footnotes set.\nCrash will be caused!" );
+    OSL_ENSURE( !_bCollectOnlyPreviousFootnotes || _pRefFootnoteBossFrm,
+            "<SwFootnoteBossFrm::_CollectFootnotes(..)> - No reference footnote boss frame for collecting only previous footnotes set.\nCrash will be caused!" );
 
     // Collect all footnotes referenced by pRef (attribute by attribute), combine them
     // (the content might be divided over multiple pages) and cut them.
@@ -1772,12 +1772,12 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
     // For robustness, we do not log the corresponding footnotes here. If a footnote
     // is touched twice, there might be a crash. This allows this function here to
     // also handle corrupt layouts in some degrees (without loops or even crashes).
-    SwFtnFrms aNotFtnArr;
+    SwFootnoteFrms aNotFootnoteArr;
 
     // here we have a footnote placed in front of the first one of the reference
-    OSL_ENSURE( !_pFtn->GetMaster() || _pFtn->GetRef() != _pRef, "move FollowFtn?" );
-    while ( _pFtn->GetMaster() )
-        _pFtn = _pFtn->GetMaster();
+    OSL_ENSURE( !_pFootnote->GetMaster() || _pFootnote->GetRef() != _pRef, "move FollowFootnote?" );
+    while ( _pFootnote->GetMaster() )
+        _pFootnote = _pFootnote->GetMaster();
 
     bool bFound = false;
 
@@ -1785,72 +1785,72 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
     {
         // Search for the next footnote in this column/page so that
         // we do not start from zero again after cutting one footnote.
-        SwFtnFrm *pNxtFtn = _pFtn;
-        while ( pNxtFtn->GetFollow() )
-            pNxtFtn = pNxtFtn->GetFollow();
-        pNxtFtn = static_cast<SwFtnFrm*>(pNxtFtn->GetNext());
+        SwFootnoteFrm *pNxtFootnote = _pFootnote;
+        while ( pNxtFootnote->GetFollow() )
+            pNxtFootnote = pNxtFootnote->GetFollow();
+        pNxtFootnote = static_cast<SwFootnoteFrm*>(pNxtFootnote->GetNext());
 
-        if ( !pNxtFtn )
+        if ( !pNxtFootnote )
         {
-            SwFtnBossFrm* pBoss = _pFtn->FindFtnBossFrm();
+            SwFootnoteBossFrm* pBoss = _pFootnote->FindFootnoteBossFrm();
             SwPageFrm* pPage = pBoss->FindPageFrm();
             do
             {
-                lcl_NextFtnBoss( pBoss, pPage, false );
+                lcl_NextFootnoteBoss( pBoss, pPage, false );
                 if( pBoss )
                 {
-                    SwLayoutFrm* pCont = pBoss->FindFtnCont();
+                    SwLayoutFrm* pCont = pBoss->FindFootnoteCont();
                     if( pCont )
                     {
-                        pNxtFtn = static_cast<SwFtnFrm*>(pCont->Lower());
-                        if( pNxtFtn )
+                        pNxtFootnote = static_cast<SwFootnoteFrm*>(pCont->Lower());
+                        if( pNxtFootnote )
                         {
-                            while( pNxtFtn->GetMaster() )
-                                pNxtFtn = pNxtFtn->GetMaster();
-                            if( pNxtFtn == _pFtn )
-                                pNxtFtn = NULL;
+                            while( pNxtFootnote->GetMaster() )
+                                pNxtFootnote = pNxtFootnote->GetMaster();
+                            if( pNxtFootnote == _pFootnote )
+                                pNxtFootnote = NULL;
                         }
                     }
                 }
-            } while( !pNxtFtn && pBoss );
+            } while( !pNxtFootnote && pBoss );
         }
-        else if( !pNxtFtn->GetAttr()->GetFtn().IsEndNote() )
-        { OSL_ENSURE( !pNxtFtn->GetMaster(), "_CollectFtn: Master expected" );
-            while ( pNxtFtn->GetMaster() )
-                pNxtFtn = pNxtFtn->GetMaster();
+        else if( !pNxtFootnote->GetAttr()->GetFootnote().IsEndNote() )
+        { OSL_ENSURE( !pNxtFootnote->GetMaster(), "_CollectFootnote: Master expected" );
+            while ( pNxtFootnote->GetMaster() )
+                pNxtFootnote = pNxtFootnote->GetMaster();
         }
-        if ( pNxtFtn == _pFtn )
+        if ( pNxtFootnote == _pFootnote )
         {
-            OSL_FAIL(   "_CollectFtn: Vicious circle" );
-            pNxtFtn = 0;
+            OSL_FAIL(   "_CollectFootnote: Vicious circle" );
+            pNxtFootnote = 0;
         }
 
         // OD 03.04.2003 #108446# - determine, if found footnote has to be collected.
-        bool bCollectFoundFtn = false;
-        if ( _pFtn->GetRef() == _pRef && !_pFtn->GetAttr()->GetFtn().IsEndNote() )
+        bool bCollectFoundFootnote = false;
+        if ( _pFootnote->GetRef() == _pRef && !_pFootnote->GetAttr()->GetFootnote().IsEndNote() )
         {
-            if ( _bCollectOnlyPreviousFtns )
+            if ( _bCollectOnlyPreviousFootnotes )
             {
-                SwFtnBossFrm* pBossOfFoundFtn = _pFtn->FindFtnBossFrm( true );
-                OSL_ENSURE( pBossOfFoundFtn,
-                        "<SwFtnBossFrm::_CollectFtns(..)> - footnote boss frame of found footnote frame missing.\nWrong layout!" );
-                if ( !pBossOfFoundFtn ||    // don't crash, if no footnote boss is found.
-                     pBossOfFoundFtn->IsBefore( _pRefFtnBossFrm )
+                SwFootnoteBossFrm* pBossOfFoundFootnote = _pFootnote->FindFootnoteBossFrm( true );
+                OSL_ENSURE( pBossOfFoundFootnote,
+                        "<SwFootnoteBossFrm::_CollectFootnotes(..)> - footnote boss frame of found footnote frame missing.\nWrong layout!" );
+                if ( !pBossOfFoundFootnote ||    // don't crash, if no footnote boss is found.
+                     pBossOfFoundFootnote->IsBefore( _pRefFootnoteBossFrm )
                    )
                 {
-                    bCollectFoundFtn = true;
+                    bCollectFoundFootnote = true;
                 }
             }
             else
             {
-                bCollectFoundFtn = true;
+                bCollectFoundFootnote = true;
             }
         }
 
-        if ( bCollectFoundFtn )
+        if ( bCollectFoundFootnote )
         {
-            OSL_ENSURE( !_pFtn->GetMaster(), "move FollowFtn?" );
-            SwFtnFrm *pNxt = _pFtn->GetFollow();
+            OSL_ENSURE( !_pFootnote->GetMaster(), "move FollowFootnote?" );
+            SwFootnoteFrm *pNxt = _pFootnote->GetFollow();
             while ( pNxt )
             {
                 SwFrm *pCnt = pNxt->ContainsAny();
@@ -1860,7 +1860,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
                     do
                     {   SwFrm *pNxtCnt = pCnt->GetNext();
                         pCnt->Cut();
-                        pCnt->Paste( _pFtn );
+                        pCnt->Paste( _pFootnote );
                         pCnt = pNxtCnt;
                     } while ( pCnt );
                 }
@@ -1870,29 +1870,29 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
                     pNxt->Cut();
                     SwFrm::DestroyFrm(pNxt);
                 }
-                pNxt = _pFtn->GetFollow();
+                pNxt = _pFootnote->GetFollow();
             }
-            _pFtn->Cut();
-            FtnInArr( _rFtnArr, _pFtn );
+            _pFootnote->Cut();
+            FootnoteInArr( _rFootnoteArr, _pFootnote );
             bFound = true;
         }
         else
         {
-            FtnInArr( aNotFtnArr, _pFtn );
+            FootnoteInArr( aNotFootnoteArr, _pFootnote );
             if( bFound )
                 break;
         }
-        if ( pNxtFtn &&
-             _rFtnArr.end() == std::find( _rFtnArr.begin(), _rFtnArr.end(), pNxtFtn ) &&
-             aNotFtnArr.end() == std::find( aNotFtnArr.begin(), aNotFtnArr.end(), pNxtFtn ) )
-            _pFtn = pNxtFtn;
+        if ( pNxtFootnote &&
+             _rFootnoteArr.end() == std::find( _rFootnoteArr.begin(), _rFootnoteArr.end(), pNxtFootnote ) &&
+             aNotFootnoteArr.end() == std::find( aNotFootnoteArr.begin(), aNotFootnoteArr.end(), pNxtFootnote ) )
+            _pFootnote = pNxtFootnote;
         else
             break;
     }
-    while ( _pFtn );
+    while ( _pFootnote );
 }
 
-void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc )
+void SwFootnoteBossFrm::_MoveFootnotes( SwFootnoteFrms &rFootnoteArr, bool bCalc )
 {
     // All footnotes referenced by pRef need to be moved
     // to a new position (based on the new column/page)
@@ -1902,12 +1902,12 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc )
 
     // #i21478# - keep last inserted footnote in order to
     // format the content of the following one.
-    SwFtnFrm* pLastInsertedFtn = 0L;
-    for ( size_t i = 0; i < rFtnArr.size(); ++i )
+    SwFootnoteFrm* pLastInsertedFootnote = 0L;
+    for ( size_t i = 0; i < rFootnoteArr.size(); ++i )
     {
-        SwFtnFrm *pFtn = rFtnArr[i];
+        SwFootnoteFrm *pFootnote = rFootnoteArr[i];
 
-        SwFtnBossFrm* pRefBoss = pFtn->GetRef()->FindFtnBossFrm( true );
+        SwFootnoteBossFrm* pRefBoss = pFootnote->GetRef()->FindFootnoteBossFrm( true );
         if( pRefBoss != this )
         {
             const sal_uInt16 nRefNum = pRefBoss->FindPageFrm()->GetPhyPageNum();
@@ -1915,14 +1915,14 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc )
             if( nRefNum < nMyNum || ( nRefNum == nMyNum && nRefCol <= nMyCol ) )
                 pRefBoss = this;
         }
-        pRefBoss->InsertFtn( pFtn );
+        pRefBoss->InsertFootnote( pFootnote );
 
-        if ( pFtn->GetUpper() ) // robust, e.g. with duplicates
+        if ( pFootnote->GetUpper() ) // robust, e.g. with duplicates
         {
             // First condense the content so that footnote frames that do not fit on the page
             // do not do too much harm (Loop 66312). So, the footnote content first grows as
             // soon as the content gets formatted and it is sure that it fits on the page.
-            SwFrm *pCnt = pFtn->ContainsAny();
+            SwFrm *pCnt = pFootnote->ContainsAny();
             while( pCnt )
             {
                 if( pCnt->IsLayoutFrm() )
@@ -1942,35 +1942,35 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc )
                 (pCnt->Prt().*fnRect->fnSetHeight)(0);
                 pCnt = pCnt->GetNext();
             }
-            (pFtn->Frm().*fnRect->fnSetHeight)(0);
-            (pFtn->Prt().*fnRect->fnSetHeight)(0);
-            pFtn->Calc();
-            pFtn->GetUpper()->Calc();
+            (pFootnote->Frm().*fnRect->fnSetHeight)(0);
+            (pFootnote->Prt().*fnRect->fnSetHeight)(0);
+            pFootnote->Calc();
+            pFootnote->GetUpper()->Calc();
 
             if( bCalc )
             {
-                SwTxtFtn *pAttr = pFtn->GetAttr();
-                pCnt = pFtn->ContainsAny();
-                bool bUnlock = !pFtn->IsBackMoveLocked();
-                pFtn->LockBackMove();
+                SwTextFootnote *pAttr = pFootnote->GetAttr();
+                pCnt = pFootnote->ContainsAny();
+                bool bUnlock = !pFootnote->IsBackMoveLocked();
+                pFootnote->LockBackMove();
 
                 // #i49383# - disable unlock of position of
                 // lower objects during format of footnote content.
-                pFtn->KeepLockPosOfLowerObjs();
+                pFootnote->KeepLockPosOfLowerObjs();
                 // #i57914# - adjust fix #i49383#
 
-                while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr )
+                while ( pCnt && pCnt->FindFootnoteFrm()->GetAttr() == pAttr )
                 {
                     pCnt->_InvalidatePos();
                     pCnt->Calc();
                     // #i49383# - format anchored objects
-                    if ( pCnt->IsTxtFrm() && pCnt->IsValid() )
+                    if ( pCnt->IsTextFrm() && pCnt->IsValid() )
                     {
                         if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt,
                                                                   *(pCnt->FindPageFrm()) ) )
                         {
                             // restart format with first content
-                            pCnt = pFtn->ContainsAny();
+                            pCnt = pFootnote->ContainsAny();
                             continue;
                         }
                     }
@@ -1988,69 +1988,69 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc )
                 }
                 if( bUnlock )
                 {
-                    pFtn->UnlockBackMove();
-                    if( !pFtn->ContainsAny() && !pFtn->IsColLocked() )
+                    pFootnote->UnlockBackMove();
+                    if( !pFootnote->ContainsAny() && !pFootnote->IsColLocked() )
                     {
-                        pFtn->Cut();
-                        SwFrm::DestroyFrm(pFtn);
+                        pFootnote->Cut();
+                        SwFrm::DestroyFrm(pFootnote);
                         // #i21478#
-                        pFtn = 0L;
+                        pFootnote = 0L;
                     }
                 }
                 // #i49383#
-                if ( pFtn )
+                if ( pFootnote )
                 {
                     // #i57914# - adjust fix #i49383#
                     // enable lock of lower object position before format of footnote frame.
-                    pFtn->UnlockPosOfLowerObjs();
-                    pFtn->Calc();
+                    pFootnote->UnlockPosOfLowerObjs();
+                    pFootnote->Calc();
                 }
             }
         }
         else
-        { OSL_ENSURE( !pFtn->GetMaster() && !pFtn->GetFollow(),
-                    "DelFtn and Master/Follow?" );
-            SwFrm::DestroyFrm(pFtn);
+        { OSL_ENSURE( !pFootnote->GetMaster() && !pFootnote->GetFollow(),
+                    "DelFootnote and Master/Follow?" );
+            SwFrm::DestroyFrm(pFootnote);
             // #i21478#
-            pFtn = 0L;
+            pFootnote = 0L;
         }
 
         // #i21478#
-        if ( pFtn )
+        if ( pFootnote )
         {
-            pLastInsertedFtn = pFtn;
+            pLastInsertedFootnote = pFootnote;
         }
     }
 
     // #i21478# - format content of footnote following
     // the new inserted ones.
-    if ( bCalc && pLastInsertedFtn )
+    if ( bCalc && pLastInsertedFootnote )
     {
-        if ( pLastInsertedFtn->GetNext() )
+        if ( pLastInsertedFootnote->GetNext() )
         {
-            SwFtnFrm* pNextFtn = static_cast<SwFtnFrm*>(pLastInsertedFtn->GetNext());
-            SwTxtFtn* pAttr = pNextFtn->GetAttr();
-            SwFrm* pCnt = pNextFtn->ContainsAny();
+            SwFootnoteFrm* pNextFootnote = static_cast<SwFootnoteFrm*>(pLastInsertedFootnote->GetNext());
+            SwTextFootnote* pAttr = pNextFootnote->GetAttr();
+            SwFrm* pCnt = pNextFootnote->ContainsAny();
 
-            bool bUnlock = !pNextFtn->IsBackMoveLocked();
-            pNextFtn->LockBackMove();
+            bool bUnlock = !pNextFootnote->IsBackMoveLocked();
+            pNextFootnote->LockBackMove();
             // #i49383# - disable unlock of position of
             // lower objects during format of footnote content.
-            pNextFtn->KeepLockPosOfLowerObjs();
+            pNextFootnote->KeepLockPosOfLowerObjs();
             // #i57914# - adjust fix #i49383#
 
-            while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr )
+            while ( pCnt && pCnt->FindFootnoteFrm()->GetAttr() == pAttr )
             {
                 pCnt->_InvalidatePos();
                 pCnt->Calc();
                 // #i49383# - format anchored objects
-                if ( pCnt->IsTxtFrm() && pCnt->IsValid() )
+                if ( pCnt->IsTextFrm() && pCnt->IsValid() )
                 {
                     if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt,
                                                               *(pCnt->FindPageFrm()) ) )
                     {
                         // restart format with first content
-                        pCnt = pNextFtn->ContainsAny();
+                        pCnt = pNextFootnote->ContainsAny();
                         continue;
                     }
                 }
@@ -2068,136 +2068,136 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc )
             }
             if( bUnlock )
             {
-                pNextFtn->UnlockBackMove();
+                pNextFootnote->UnlockBackMove();
             }
             // #i49383#
             // #i57914# - adjust fix #i49383#
             // enable lock of lower object position before format of footnote frame.
-            pNextFtn->UnlockPosOfLowerObjs();
-            pNextFtn->Calc();
+            pNextFootnote->UnlockPosOfLowerObjs();
+            pNextFootnote->Calc();
         }
     }
 }
 
-void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
-                             SwTxtFtn *pAttr )
+void SwFootnoteBossFrm::MoveFootnotes( const SwContentFrm *pSrc, SwContentFrm *pDest,
+                             SwTextFootnote *pAttr )
 {
-    if( ( GetFmt()->GetDoc()->GetFtnInfo().ePos == FTNPOS_CHAPTER &&
-        (!GetUpper()->IsSctFrm() || !static_cast<SwSectionFrm*>(GetUpper())->IsFtnAtEnd()))
-        || pAttr->GetFtn().IsEndNote() )
+    if( ( GetFormat()->GetDoc()->GetFootnoteInfo().ePos == FTNPOS_CHAPTER &&
+        (!GetUpper()->IsSctFrm() || !static_cast<SwSectionFrm*>(GetUpper())->IsFootnoteAtEnd()))
+        || pAttr->GetFootnote().IsEndNote() )
         return;
 
-    OSL_ENSURE( this == pSrc->FindFtnBossFrm( true ),
-            "SwPageFrm::MoveFtns: source frame isn't on that FtnBoss" );
+    OSL_ENSURE( this == pSrc->FindFootnoteBossFrm( true ),
+            "SwPageFrm::MoveFootnotes: source frame isn't on that FootnoteBoss" );
 
-    SwFtnFrm *pFtn = FindFirstFtn();
-    if( pFtn )
+    SwFootnoteFrm *pFootnote = FindFirstFootnote();
+    if( pFootnote )
     {
-        ChangeFtnRef( pSrc, pAttr, pDest );
-        SwFtnBossFrm *pDestBoss = pDest->FindFtnBossFrm( true );
-        OSL_ENSURE( pDestBoss, "+SwPageFrm::MoveFtns: no destination boss" );
+        ChangeFootnoteRef( pSrc, pAttr, pDest );
+        SwFootnoteBossFrm *pDestBoss = pDest->FindFootnoteBossFrm( true );
+        OSL_ENSURE( pDestBoss, "+SwPageFrm::MoveFootnotes: no destination boss" );
         if( pDestBoss )     // robust
         {
-            SwFtnFrms aFtnArr;
-            SwFtnBossFrm::_CollectFtns( pDest, pFtn, aFtnArr );
-            if ( !aFtnArr.empty() )
+            SwFootnoteFrms aFootnoteArr;
+            SwFootnoteBossFrm::_CollectFootnotes( pDest, pFootnote, aFootnoteArr );
+            if ( !aFootnoteArr.empty() )
             {
-                pDestBoss->_MoveFtns( aFtnArr, true );
+                pDestBoss->_MoveFootnotes( aFootnoteArr, true );
                 SwPageFrm* pSrcPage = FindPageFrm();
                 SwPageFrm* pDestPage = pDestBoss->FindPageFrm();
-                // update FtnNum only at page change
+                // update FootnoteNum only at page change
                 if( pSrcPage != pDestPage )
                 {
                     if( pSrcPage->GetPhyPageNum() > pDestPage->GetPhyPageNum() )
-                        pSrcPage->UpdateFtnNum();
-                    pDestPage->UpdateFtnNum();
+                        pSrcPage->UpdateFootnoteNum();
+                    pDestPage->UpdateFootnoteNum();
                 }
             }
         }
     }
 }
 
-void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const bool bLock,
-                                  const SwTxtFtn *pAttr )
+void SwFootnoteBossFrm::RearrangeFootnotes( const SwTwips nDeadLine, const bool bLock,
+                                  const SwTextFootnote *pAttr )
 {
     // Format all footnotes of a column/page so that they might change the column/page.
 
-    SwSaveFtnHeight aSave( this, nDeadLine );
-    SwFtnFrm *pFtn = FindFirstFtn();
-    if( pFtn && pFtn->GetPrev() && bLock )
+    SwSaveFootnoteHeight aSave( this, nDeadLine );
+    SwFootnoteFrm *pFootnote = FindFirstFootnote();
+    if( pFootnote && pFootnote->GetPrev() && bLock )
     {
-        SwFtnFrm* pFirst = static_cast<SwFtnFrm*>(pFtn->GetUpper()->Lower());
-        SwFrm* pCntnt = pFirst->ContainsAny();
-        if( pCntnt )
+        SwFootnoteFrm* pFirst = static_cast<SwFootnoteFrm*>(pFootnote->GetUpper()->Lower());
+        SwFrm* pContent = pFirst->ContainsAny();
+        if( pContent )
         {
             bool bUnlock = !pFirst->IsBackMoveLocked();
             pFirst->LockBackMove();
             pFirst->Calc();
-            pCntnt->Calc();
+            pContent->Calc();
             // #i49383# - format anchored objects
-            if ( pCntnt->IsTxtFrm() && pCntnt->IsValid() )
+            if ( pContent->IsTextFrm() && pContent->IsValid() )
             {
-                SwObjectFormatter::FormatObjsAtFrm( *pCntnt,
-                                                    *(pCntnt->FindPageFrm()) );
+                SwObjectFormatter::FormatObjsAtFrm( *pContent,
+                                                    *(pContent->FindPageFrm()) );
             }
             if( bUnlock )
                 pFirst->UnlockBackMove();
         }
-        pFtn = FindFirstFtn();
+        pFootnote = FindFirstFootnote();
     }
-    SwDoc *pDoc = GetFmt()->GetDoc();
-    const sal_uLong nFtnPos = pAttr ? ::lcl_FindFtnPos( pDoc, pAttr ) : 0;
-    SwFrm *pCnt = pFtn ? pFtn->ContainsAny() : 0;
+    SwDoc *pDoc = GetFormat()->GetDoc();
+    const sal_uLong nFootnotePos = pAttr ? ::lcl_FindFootnotePos( pDoc, pAttr ) : 0;
+    SwFrm *pCnt = pFootnote ? pFootnote->ContainsAny() : 0;
     if ( pCnt )
     {
         bool bMore = true;
         bool bStart = pAttr == 0; // If no attribute is given, process all
         // #i49383# - disable unlock of position of
         // lower objects during format of footnote and footnote content.
-        SwFtnFrm* pLastFtnFrm( 0L );
+        SwFootnoteFrm* pLastFootnoteFrm( 0L );
         // footnote frame needs to be locked, if <bLock> isn't set.
-        bool bUnlockLastFtnFrm( false );
+        bool bUnlockLastFootnoteFrm( false );
         do
         {
             if( !bStart )
-                bStart = ::lcl_FindFtnPos( pDoc, pCnt->FindFtnFrm()->GetAttr() )
-                         == nFtnPos;
+                bStart = ::lcl_FindFootnotePos( pDoc, pCnt->FindFootnoteFrm()->GetAttr() )
+                         == nFootnotePos;
             if( bStart )
             {
                 pCnt->_InvalidatePos();
                 pCnt->_InvalidateSize();
                 pCnt->Prepare( PREP_ADJUST_FRM );
-                SwFtnFrm* pFtnFrm = pCnt->FindFtnFrm();
+                SwFootnoteFrm* pFootnoteFrm = pCnt->FindFootnoteFrm();
                 // #i49383#
-                if ( pFtnFrm != pLastFtnFrm )
+                if ( pFootnoteFrm != pLastFootnoteFrm )
                 {
-                    if ( pLastFtnFrm )
+                    if ( pLastFootnoteFrm )
                     {
-                        if ( !bLock && bUnlockLastFtnFrm )
+                        if ( !bLock && bUnlockLastFootnoteFrm )
                         {
-                            pLastFtnFrm->ColUnlock();
+                            pLastFootnoteFrm->ColUnlock();
                         }
                         // #i57914# - adjust fix #i49383#
                         // enable lock of lower object position before format of footnote frame.
-                        pLastFtnFrm->UnlockPosOfLowerObjs();
-                        pLastFtnFrm->Calc();
-                        if ( !bLock && bUnlockLastFtnFrm &&
-                             !pLastFtnFrm->GetLower() &&
-                             !pLastFtnFrm->IsColLocked() &&
-                             !pLastFtnFrm->IsBackMoveLocked() )
+                        pLastFootnoteFrm->UnlockPosOfLowerObjs();
+                        pLastFootnoteFrm->Calc();
+                        if ( !bLock && bUnlockLastFootnoteFrm &&
+                             !pLastFootnoteFrm->GetLower() &&
+                             !pLastFootnoteFrm->IsColLocked() &&
+                             !pLastFootnoteFrm->IsBackMoveLocked() )
                         {
-                            pLastFtnFrm->Cut();
-                            SwFrm::DestroyFrm(pLastFtnFrm);
-                            pLastFtnFrm = 0L;
+                            pLastFootnoteFrm->Cut();
+                            SwFrm::DestroyFrm(pLastFootnoteFrm);
+                            pLastFootnoteFrm = 0L;
                         }
                     }
                     if ( !bLock )
                     {
-                        bUnlockLastFtnFrm = !pFtnFrm->IsColLocked();
-                        pFtnFrm->ColLock();
+                        bUnlockLastFootnoteFrm = !pFootnoteFrm->IsColLocked();
+                        pFootnoteFrm->ColLock();
                     }
-                    pFtnFrm->KeepLockPosOfLowerObjs();
-                    pLastFtnFrm = pFtnFrm;
+                    pFootnoteFrm->KeepLockPosOfLowerObjs();
+                    pLastFootnoteFrm = pFootnoteFrm;
                 }
                 // OD 30.10.2002 #97265# - invalidate position of footnote
                 // frame, if it's below its footnote container, in order to
@@ -2205,56 +2205,56 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const bool bLock,
                 // footnote frames.
                 {
                     SWRECTFN( this );
-                    SwFrm* aFtnContFrm = pFtnFrm->GetUpper();
-                    if ( (pFtnFrm->Frm().*fnRect->fnTopDist)((aFtnContFrm->*fnRect->fnGetPrtBottom)()) > 0 )
+                    SwFrm* aFootnoteContFrm = pFootnoteFrm->GetUpper();
+                    if ( (pFootnoteFrm->Frm().*fnRect->fnTopDist)((aFootnoteContFrm->*fnRect->fnGetPrtBottom)()) > 0 )
                     {
-                        pFtnFrm->_InvalidatePos();
+                        pFootnoteFrm->_InvalidatePos();
                     }
                 }
                 if ( bLock )
                 {
-                    bool bUnlock = !pFtnFrm->IsBackMoveLocked();
-                    pFtnFrm->LockBackMove();
-                    pFtnFrm->Calc();
+                    bool bUnlock = !pFootnoteFrm->IsBackMoveLocked();
+                    pFootnoteFrm->LockBackMove();
+                    pFootnoteFrm->Calc();
                     pCnt->Calc();
                     // #i49383# - format anchored objects
-                    if ( pCnt->IsTxtFrm() && pCnt->IsValid() )
+                    if ( pCnt->IsTextFrm() && pCnt->IsValid() )
                     {
                         if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt,
                                                                   *(pCnt->FindPageFrm()) ) )
                         {
                             // restart format with first content
-                            pCnt = pFtn->ContainsAny();
+                            pCnt = pFootnote->ContainsAny();
                             continue;
                         }
                     }
                     if( bUnlock )
                     {
-                        pFtnFrm->UnlockBackMove();
-                        if( !pFtnFrm->Lower() &&
-                            !pFtnFrm->IsColLocked() )
+                        pFootnoteFrm->UnlockBackMove();
+                        if( !pFootnoteFrm->Lower() &&
+                            !pFootnoteFrm->IsColLocked() )
                         {
                             // #i49383#
-                            OSL_ENSURE( pLastFtnFrm == pFtnFrm,
-                                    "<SwFtnBossFrm::RearrangeFtns(..)> - <pLastFtnFrm> != <pFtnFrm>" );
-                            pLastFtnFrm = 0L;
-                            pFtnFrm->Cut();
-                            SwFrm::DestroyFrm(pFtnFrm);
+                            OSL_ENSURE( pLastFootnoteFrm == pFootnoteFrm,
+                                    "<SwFootnoteBossFrm::RearrangeFootnotes(..)> - <pLastFootnoteFrm> != <pFootnoteFrm>" );
+                            pLastFootnoteFrm = 0L;
+                            pFootnoteFrm->Cut();
+                            SwFrm::DestroyFrm(pFootnoteFrm);
                         }
                     }
                 }
                 else
                 {
-                    pFtnFrm->Calc();
+                    pFootnoteFrm->Calc();
                     pCnt->Calc();
                     // #i49383# - format anchored objects
-                    if ( pCnt->IsTxtFrm() && pCnt->IsValid() )
+                    if ( pCnt->IsTextFrm() && pCnt->IsValid() )
                     {
                         if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt,
                                                                   *(pCnt->FindPageFrm()) ) )
                         {
                             // restart format with first content
-                            pCnt = pFtn->ContainsAny();
+                            pCnt = pFootnote->ContainsAny();
                             continue;
                         }
                     }
@@ -2278,9 +2278,9 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const bool bLock,
                 pCnt = pCnt->FindNext();
                 if ( pCnt )
                 {
-                    SwFtnFrm* pFtnFrm = pCnt->FindFtnFrm();
-                    if( pFtnFrm->GetRef()->FindFtnBossFrm(
-                        pFtnFrm->GetAttr()->GetFtn().IsEndNote() ) != this )
+                    SwFootnoteFrm* pFootnoteFrm = pCnt->FindFootnoteFrm();
+                    if( pFootnoteFrm->GetRef()->FindFootnoteBossFrm(
+                        pFootnoteFrm->GetAttr()->GetFootnote().IsEndNote() ) != this )
                         bMore = false;
                 }
                 else
@@ -2288,133 +2288,133 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const bool bLock,
             }
             if( pDel )
             {
-                bool bUnlockLastFtnFrmGuard = pLastFtnFrm && !pLastFtnFrm->IsColLocked();
-                if (bUnlockLastFtnFrmGuard)
-                    pLastFtnFrm->ColLock();
+                bool bUnlockLastFootnoteFrmGuard = pLastFootnoteFrm && !pLastFootnoteFrm->IsColLocked();
+                if (bUnlockLastFootnoteFrmGuard)
+                    pLastFootnoteFrm->ColLock();
                 pDel->Cut();
-                if (bUnlockLastFtnFrmGuard)
-                    pLastFtnFrm->ColUnlock();
+                if (bUnlockLastFootnoteFrmGuard)
+                    pLastFootnoteFrm->ColUnlock();
                 SwFrm::DestroyFrm(pDel);
             }
             if ( bMore )
             {
                 // Go not further than to the provided footnote (if given)
                 if ( pAttr &&
-                     (::lcl_FindFtnPos( pDoc,
-                                    pCnt->FindFtnFrm()->GetAttr()) > nFtnPos ) )
+                     (::lcl_FindFootnotePos( pDoc,
+                                    pCnt->FindFootnoteFrm()->GetAttr()) > nFootnotePos ) )
                     bMore = false;
             }
         } while ( bMore );
         // #i49383#
-        if ( pLastFtnFrm )
+        if ( pLastFootnoteFrm )
         {
-            if ( !bLock && bUnlockLastFtnFrm )
+            if ( !bLock && bUnlockLastFootnoteFrm )
             {
-                pLastFtnFrm->ColUnlock();
+                pLastFootnoteFrm->ColUnlock();
             }
             // #i57914# - adjust fix #i49383#
             // enable lock of lower object position before format of footnote frame.
-            pLastFtnFrm->UnlockPosOfLowerObjs();
-            pLastFtnFrm->Calc();
-            if ( !bLock && bUnlockLastFtnFrm &&
-                 !pLastFtnFrm->GetLower() &&
-                 !pLastFtnFrm->IsColLocked() &&
-                 !pLastFtnFrm->IsBackMoveLocked() )
-            {
-                pLastFtnFrm->Cut();
-                SwFrm::DestroyFrm(pLastFtnFrm);
+            pLastFootnoteFrm->UnlockPosOfLowerObjs();
+            pLastFootnoteFrm->Calc();
+            if ( !bLock && bUnlockLastFootnoteFrm &&
+                 !pLastFootnoteFrm->GetLower() &&
+                 !pLastFootnoteFrm->IsColLocked() &&
+                 !pLastFootnoteFrm->IsBackMoveLocked() )
+            {
+                pLastFootnoteFrm->Cut();
+                SwFrm::DestroyFrm(pLastFootnoteFrm);
             }
         }
     }
 }
 
-void SwPageFrm::UpdateFtnNum()
+void SwPageFrm::UpdateFootnoteNum()
 {
     // page numbering only if set at the document
-    if ( GetFmt()->GetDoc()->GetFtnInfo().eNum != FTNNUM_PAGE )
+    if ( GetFormat()->GetDoc()->GetFootnoteInfo().eNum != FTNNUM_PAGE )
         return;
 
     SwLayoutFrm* pBody = FindBodyCont();
     if( !pBody || !pBody->Lower() )
         return;
 
-    SwCntntFrm* pCntnt = pBody->ContainsCntnt();
+    SwContentFrm* pContent = pBody->ContainsContent();
     sal_uInt16 nNum = 0;
 
-    while( pCntnt && pCntnt->FindPageFrm() == this )
+    while( pContent && pContent->FindPageFrm() == this )
     {
-        if( static_cast<SwTxtFrm*>(pCntnt)->HasFtn() )
+        if( static_cast<SwTextFrm*>(pContent)->HasFootnote() )
         {
-            SwFtnBossFrm* pBoss = pCntnt->FindFtnBossFrm( true );
+            SwFootnoteBossFrm* pBoss = pContent->FindFootnoteBossFrm( true );
             if( pBoss->GetUpper()->IsSctFrm() &&
-                static_cast<SwSectionFrm*>(pBoss->GetUpper())->IsOwnFtnNum() )
-                pCntnt = static_cast<SwSectionFrm*>(pBoss->GetUpper())->FindLastCntnt();
+                static_cast<SwSectionFrm*>(pBoss->GetUpper())->IsOwnFootnoteNum() )
+                pContent = static_cast<SwSectionFrm*>(pBoss->GetUpper())->FindLastContent();
             else
             {
-                SwFtnFrm* pFtn = const_cast<SwFtnFrm*>(pBoss->FindFirstFtn( pCntnt ));
-                while( pFtn )
+                SwFootnoteFrm* pFootnote = const_cast<SwFootnoteFrm*>(pBoss->FindFirstFootnote( pContent ));
+                while( pFootnote )
                 {
-                    SwTxtFtn* pTxtFtn = pFtn->GetAttr();
-                    if( !pTxtFtn->GetFtn().IsEndNote() &&
-                         pTxtFtn->GetFtn().GetNumStr().isEmpty() &&
-                         !pFtn->GetMaster() &&
-                         (pTxtFtn->GetFtn().GetNumber() != ++nNum) )
+                    SwTextFootnote* pTextFootnote = pFootnote->GetAttr();
+                    if( !pTextFootnote->GetFootnote().IsEndNote() &&
+                         pTextFootnote->GetFootnote().GetNumStr().isEmpty() &&
+                         !pFootnote->GetMaster() &&
+                         (pTextFootnote->GetFootnote().GetNumber() != ++nNum) )
                     {
-                        pTxtFtn->SetNumber( nNum, OUString() );
+                        pTextFootnote->SetNumber( nNum, OUString() );
                     }
-                    if ( pFtn->GetNext() )
-                        pFtn = static_cast<SwFtnFrm*>(pFtn->GetNext());
+                    if ( pFootnote->GetNext() )
+                        pFootnote = static_cast<SwFootnoteFrm*>(pFootnote->GetNext());
                     else
                     {
-                        SwFtnBossFrm* pTmpBoss = pFtn->FindFtnBossFrm( true );
+                        SwFootnoteBossFrm* pTmpBoss = pFootnote->FindFootnoteBossFrm( true );
                         if( pTmpBoss )
                         {
                             SwPageFrm* pPage = pTmpBoss->FindPageFrm();
-                            pFtn = NULL;
-                            lcl_NextFtnBoss( pTmpBoss, pPage, false );
-                            SwFtnContFrm *pCont = pTmpBoss ? pTmpBoss->FindNearestFtnCont() : NULL;
+                            pFootnote = NULL;
+                            lcl_NextFootnoteBoss( pTmpBoss, pPage, false );
+                            SwFootnoteContFrm *pCont = pTmpBoss ? pTmpBoss->FindNearestFootnoteCont() : NULL;
                             if ( pCont )
-                                pFtn = static_cast<SwFtnFrm*>(pCont->Lower());
+                                pFootnote = static_cast<SwFootnoteFrm*>(pCont->Lower());
                         }
                     }
-                    if( pFtn && pFtn->GetRef() != pCntnt )
-                        pFtn = NULL;
+                    if( pFootnote && pFootnote->GetRef() != pContent )
+                        pFootnote = NULL;
                 }
             }
         }
-        pCntnt = pCntnt->FindNextCnt();
+        pContent = pContent->FindNextCnt();
     }
 }
 
-void SwFtnBossFrm::SetFtnDeadLine( const SwTwips nDeadLine )
+void SwFootnoteBossFrm::SetFootnoteDeadLine( const SwTwips nDeadLine )
 {
     SwFrm *pBody = FindBodyCont();
     pBody->Calc();
 
-    SwFrm *pCont = FindFtnCont();
-    const SwTwips nMax = nMaxFtnHeight;// current should exceed MaxHeight
+    SwFrm *pCont = FindFootnoteCont();
+    const SwTwips nMax = nMaxFootnoteHeight;// current should exceed MaxHeight
     SWRECTFN( this )
     if ( pCont )
     {
         pCont->Calc();
-        nMaxFtnHeight = -(pCont->Frm().*fnRect->fnBottomDist)( nDeadLine );
+        nMaxFootnoteHeight = -(pCont->Frm().*fnRect->fnBottomDist)( nDeadLine );
     }
     else
-        nMaxFtnHeight = -(pBody->Frm().*fnRect->fnBottomDist)( nDeadLine );
+        nMaxFootnoteHeight = -(pBody->Frm().*fnRect->fnBottomDist)( nDeadLine );
 
     const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0;
     if( pSh && pSh->GetViewOptions()->getBrowseMode() )
-        nMaxFtnHeight += pBody->Grow( LONG_MAX, true );
+        nMaxFootnoteHeight += pBody->Grow( LONG_MAX, true );
     if ( IsInSct() )
-        nMaxFtnHeight += FindSctFrm()->Grow( LONG_MAX, true );
+        nMaxFootnoteHeight += FindSctFrm()->Grow( LONG_MAX, true );
 
-    if ( nMaxFtnHeight < 0 )
-        nMaxFtnHeight = 0;
-    if ( nMax != LONG_MAX && nMaxFtnHeight > nMax )
-        nMaxFtnHeight = nMax;
+    if ( nMaxFootnoteHeight < 0 )
+        nMaxFootnoteHeight = 0;
+    if ( nMax != LONG_MAX && nMaxFootnoteHeight > nMax )
+        nMaxFootnoteHeight = nMax;
 }
 
-SwTwips SwFtnBossFrm::GetVarSpace() const
+SwTwips SwFootnoteBossFrm::GetVarSpace() const
 {
     // To not fall below 20% of the page height
     // (in contrast to MSOffice where footnotes can fill a whole column/page)
@@ -2438,15 +2438,15 @@ SwTwips SwFtnBossFrm::GetVarSpace() const
             if( pSect->IsEndnAtEnd() ) // endnotes allowed?
             {
                 OSL_ENSURE( !Lower() || !Lower()->GetNext() || Lower()->GetNext()->
-                        IsFtnContFrm(), "FtnContainer expected" );
-                const SwFtnContFrm* pCont = Lower() ?
-                    static_cast<const SwFtnContFrm*>(Lower()->GetNext()) : 0;
+                        IsFootnoteContFrm(), "FootnoteContainer expected" );
+                const SwFootnoteContFrm* pCont = Lower() ?
+                    static_cast<const SwFootnoteContFrm*>(Lower()->GetNext()) : 0;
                 if( pCont )
                 {
-                    const SwFtnFrm* pFtn = static_cast<const SwFtnFrm*>(pCont->Lower());
-                    while( pFtn)
+                    const SwFootnoteFrm* pFootnote = static_cast<const SwFootnoteFrm*>(pCont->Lower());
+                    while( pFootnote)
                     {
-                        if( pFtn->GetAttr()->GetFtn().IsEndNote() )
+                        if( pFootnote->GetAttr()->GetFootnote().IsEndNote() )
                         { // endnote found
                             const SwFrm* pFrm = static_cast<const SwLayoutFrm*>(Lower())->Lower();
                             if( pFrm )
@@ -2459,7 +2459,7 @@ SwTwips SwFtnBossFrm::GetVarSpace() const
                             }
                             break;
                         }
-                        pFtn = static_cast<const SwFtnFrm*>(pFtn->GetNext());
+                        pFootnote = static_cast<const SwFootnoteFrm*>(pFootnote->GetNext());
                     }
                 }
             }
@@ -2495,7 +2495,7 @@ SwTwips SwFtnBossFrm::GetVarSpace() const
  * @see Grow()
  * @see Shrink()
  */
-sal_uInt8 SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const
+sal_uInt8 SwFootnoteBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const
 {
     sal_uInt8 nRet = NA_ONLY_ADJUST;
     if( GetUpper() && !GetUpper()->IsPageBodyFrm() )
@@ -2507,7 +2507,7 @@ sal_uInt8 SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const
         {
             OSL_ENSURE( GetUpper()->IsSctFrm(), "NeighbourhoodAdjustment: Unexpected Upper" );
             if( !GetNext() && !GetPrev() )
-                nRet = NA_GROW_ADJUST; // section with a single column (FtnAtEnd)
+                nRet = NA_GROW_ADJUST; // section with a single column (FootnoteAtEnd)
             else
             {
                 const SwFrm* pTmp = Lower();
@@ -2516,7 +2516,7 @@ sal_uInt8 SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const
                     nRet = NA_GROW_SHRINK;
                 else if( !GetUpper()->IsColLocked() )
                     nRet = NA_ADJUST_GROW;
-                OSL_ENSURE( !pTmp->GetNext() || pTmp->GetNext()->IsFtnContFrm(),
+                OSL_ENSURE( !pTmp->GetNext() || pTmp->GetNext()->IsFootnoteContFrm(),
                         "NeighbourhoodAdjustment: Who's that guy?" );
             }
         }
@@ -2524,7 +2524,7 @@ sal_uInt8 SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const
     return nRet;
 }
 
-void SwPageFrm::SetColMaxFtnHeight()
+void SwPageFrm::SetColMaxFootnoteHeight()
 {
     SwLayoutFrm *pBody = FindBodyCont();
     if( pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm() )
@@ -2532,50 +2532,50 @@ void SwPageFrm::SetColMaxFtnHeight()
         SwColumnFrm* pCol = static_cast<SwColumnFrm*>(pBody->Lower());
         do
         {
-            pCol->SetMaxFtnHeight( GetMaxFtnHeight() );
+            pCol->SetMaxFootnoteHeight( GetMaxFootnoteHeight() );
             pCol = static_cast<SwColumnFrm*>(pCol->GetNext());
         } while ( pCol );
     }
 }
 
-bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
-                                 SwFtnBossFrm *pNewBoss, const bool bFtnNums )
+bool SwLayoutFrm::MoveLowerFootnotes( SwContentFrm *pStart, SwFootnoteBossFrm *pOldBoss,
+                                 SwFootnoteBossFrm *pNewBoss, const bool bFootnoteNums )
 {
-    SwDoc *pDoc = GetFmt()->GetDoc();
-    if ( pDoc->GetFtnIdxs().empty() )
+    SwDoc *pDoc = GetFormat()->GetDoc();
+    if ( pDoc->GetFootnoteIdxs().empty() )
         return false;
-    if( pDoc->GetFtnInfo().ePos == FTNPOS_CHAPTER &&
-        ( !IsInSct() || !FindSctFrm()->IsFtnAtEnd() ) )
+    if( pDoc->GetFootnoteInfo().ePos == FTNPOS_CHAPTER &&
+        ( !IsInSct() || !FindSctFrm()->IsFootnoteAtEnd() ) )
         return true;
 
     if ( !pNewBoss )
-        pNewBoss = FindFtnBossFrm( true );
+        pNewBoss = FindFootnoteBossFrm( true );
     if ( pNewBoss == pOldBoss )
         return false;
 
     bool bMoved = false;
     if( !pStart )
-        pStart = ContainsCntnt();
+        pStart = ContainsContent();
 
-    SwFtnFrms aFtnArr;
+    SwFootnoteFrms aFootnoteArr;
 
     while ( IsAnLower( pStart ) )
     {
-        if ( static_cast<SwTxtFrm*>(pStart)->HasFtn() )
+        if ( static_cast<SwTextFrm*>(pStart)->HasFootnote() )
         {
             // OD 03.04.2003 #108446# - To avoid unnecessary moves of footnotes
-            // use new parameter <_bCollectOnlyPreviousFtn> (4th parameter of
-            // method <SwFtnBossFrm::CollectFtn(..)>) to control, that only
+            // use new parameter <_bCollectOnlyPreviousFootnote> (4th parameter of
+            // method <SwFootnoteBossFrm::CollectFootnote(..)>) to control, that only
             // footnotes have to be collected, that are positioned before the
             // new dedicated footnote boss frame.
-            pNewBoss->CollectFtns( pStart, pOldBoss, aFtnArr, true );
+            pNewBoss->CollectFootnotes( pStart, pOldBoss, aFootnoteArr, true );
         }
-        pStart = pStart->GetNextCntntFrm();
+        pStart = pStart->GetNextContentFrm();
     }
 
     OSL_ENSURE( pOldBoss->IsInSct() == pNewBoss->IsInSct(),
-            "MoveLowerFtns: Section confusion" );
-    SwFtnFrms *pFtnArr;
+            "MoveLowerFootnotes: Section confusion" );
+    SwFootnoteFrms *pFootnoteArr;
     SwLayoutFrm* pNewChief = 0;
     SwLayoutFrm* pOldChief = 0;
 
@@ -2589,61 +2589,61 @@ bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
 
     if (bFoundCandidate)
     {
-        pFtnArr = new SwFtnFrms;
-        pOldChief = pOldBoss->FindFtnBossFrm( true );
-        pNewChief = pNewBoss->FindFtnBossFrm( true );
+        pFootnoteArr = new SwFootnoteFrms;
+        pOldChief = pOldBoss->FindFootnoteBossFrm( true );
+        pNewChief = pNewBoss->FindFootnoteBossFrm( true );
         while( pOldChief->IsAnLower( pStart ) )
         {
-            if ( static_cast<SwTxtFrm*>(pStart)->HasFtn() )
-                static_cast<SwFtnBossFrm*>(pNewChief)->CollectFtns( pStart,
-                                        pOldBoss, *pFtnArr );
-            pStart = pStart->GetNextCntntFrm();
+            if ( static_cast<SwTextFrm*>(pStart)->HasFootnote() )
+                static_cast<SwFootnoteBossFrm*>(pNewChief)->CollectFootnotes( pStart,
+                                        pOldBoss, *pFootnoteArr );
+            pStart = pStart->GetNextContentFrm();
         }
-        if( pFtnArr->empty() )
+        if( pFootnoteArr->empty() )
         {
-            delete pFtnArr;
-            pFtnArr = NULL;
+            delete pFootnoteArr;
+            pFootnoteArr = NULL;
         }
     }
     else
-        pFtnArr = NULL;
+        pFootnoteArr = NULL;
 
-    if ( !aFtnArr.empty() || pFtnArr )
+    if ( !aFootnoteArr.empty() || pFootnoteArr )
     {
-        if( !aFtnArr.empty() )
-            pNewBoss->_MoveFtns( aFtnArr, true );
-        if( pFtnArr )
+        if( !aFootnoteArr.empty() )
+            pNewBoss->_MoveFootnotes( aFootnoteArr, true );
+        if( pFootnoteArr )
         {
-            static_cast<SwFtnBossFrm*>(pNewChief)->_MoveFtns( *pFtnArr, true );
-            delete pFtnArr;
+            static_cast<SwFootnoteBossFrm*>(pNewChief)->_MoveFootnotes( *pFootnoteArr, true );
+            delete pFootnoteArr;
         }
         bMoved = true;
 
-        // update FtnNum only at page change
-        if ( bFtnNums )
+        // update FootnoteNum only at page change
+        if ( bFootnoteNums )
         {
             SwPageFrm* pOldPage = pOldBoss->FindPageFrm();
             SwPageFrm* pNewPage =pNewBoss->FindPageFrm();
             if( pOldPage != pNewPage )
             {
-                pOldPage->UpdateFtnNum();
-                pNewPage->UpdateFtnNum();
+                pOldPage->UpdateFootnoteNum();
+                pNewPage->UpdateFootnoteNum();
             }
         }
     }
     return bMoved;
 }
 
-bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss )
+bool SwContentFrm::MoveFootnoteCntFwd( bool bMakePage, SwFootnoteBossFrm *pOldBoss )
 {
-    OSL_ENSURE( IsInFtn(), "no footnote." );
-    SwLayoutFrm *pFtn = FindFtnFrm();
+    OSL_ENSURE( IsInFootnote(), "no footnote." );
+    SwLayoutFrm *pFootnote = FindFootnoteFrm();
 
     // The first paragraph in the first footnote in the first column in the
     // sectionfrm at the top of the page has not to move forward, if the
     // columnbody is empty.
     if( pOldBoss->IsInSct() && !pOldBoss->GetIndPrev() && !GetIndPrev() &&
-        !pFtn->GetPrev() )
+        !pFootnote->GetPrev() )
     {
         SwLayoutFrm* pBody = pOldBoss->FindBodyCont();
         if( !pBody || !pBody->Lower() )
@@ -2651,7 +2651,7 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss )
     }
 
     //fix(9538): if the footnote has neighbors behind itself, remove them temporarily
-    SwLayoutFrm *pNxt = static_cast<SwLayoutFrm*>(pFtn->GetNext());
+    SwLayoutFrm *pNxt = static_cast<SwLayoutFrm*>(pFootnote->GetNext());
     SwLayoutFrm *pLst = 0;
     while ( pNxt )
     {
@@ -2661,10 +2661,10 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss )
             pNxt = 0;
         else
         {   pLst = pNxt;
-            SwCntntFrm *pCnt = pNxt->ContainsCntnt();
+            SwContentFrm *pCnt = pNxt->ContainsContent();
             if( pCnt )
-                pCnt->MoveFtnCntFwd( true, pOldBoss );
-            pNxt = static_cast<SwLayoutFrm*>(pFtn->GetNext());
+                pCnt->MoveFootnoteCntFwd( true, pOldBoss );
+            pNxt = static_cast<SwLayoutFrm*>(pFootnote->GetNext());
         }
     }
 
@@ -2675,7 +2675,7 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss )
     if ( pNewUpper )
     {
         bool bSameBoss = true;
-        SwFtnBossFrm * const pNewBoss = pNewUpper->FindFtnBossFrm();
+        SwFootnoteBossFrm * const pNewBoss = pNewUpper->FindFootnoteBossFrm();
         // Are we changing the column/page?
         if ( !( bSameBoss = (pNewBoss == pOldBoss) ) )
         {
@@ -2689,49 +2689,49 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss )
         // If it is a container or the reference differs, create a new footnote and add
         // it into the container.
         // Create also a SectionFrame if currently in a area inside a footnote.
-        SwFtnFrm* pTmpFtn = pNewUpper->IsFtnFrm() ? static_cast<SwFtnFrm*>(pNewUpper) : 0;
-        if( !pTmpFtn )
+        SwFootnoteFrm* pTmpFootnote = pNewUpper->IsFootnoteFrm() ? static_cast<SwFootnoteFrm*>(pNewUpper) : 0;
+        if( !pTmpFootnote )
         {
-            OSL_ENSURE( pNewUpper->IsFtnContFrm(), "New Upper not a FtnCont.");
-            SwFtnContFrm *pCont = static_cast<SwFtnContFrm*>(pNewUpper);
+            OSL_ENSURE( pNewUpper->IsFootnoteContFrm(), "New Upper not a FootnoteCont.");
+            SwFootnoteContFrm *pCont = static_cast<SwFootnoteContFrm*>(pNewUpper);
 
             // create footnote
-            SwFtnFrm *pOld = FindFtnFrm();
-            pTmpFtn = new SwFtnFrm( pOld->GetFmt()->GetDoc()->GetDfltFrmFmt(),
+            SwFootnoteFrm *pOld = FindFootnoteFrm();
+            pTmpFootnote = new SwFootnoteFrm( pOld->GetFormat()->GetDoc()->GetDfltFrameFormat(),
                                     pOld, pOld->GetRef(), pOld->GetAttr() );
             // chaining of footnotes
             if ( pOld->GetFollow() )
             {
-                pTmpFtn->SetFollow( pOld->GetFollow() );
-                pOld->GetFollow()->SetMaster( pTmpFtn );
+                pTmpFootnote->SetFollow( pOld->GetFollow() );
+                pOld->GetFollow()->SetMaster( pTmpFootnote );
             }
-            pOld->SetFollow( pTmpFtn );
-            pTmpFtn->SetMaster( pOld );
+            pOld->SetFollow( pTmpFootnote );
+            pTmpFootnote->SetMaster( pOld );
             SwFrm* pNx = pCont->Lower();
-            if( pNx && pTmpFtn->GetAttr()->GetFtn().IsEndNote() )
-                while(pNx && !static_cast<SwFtnFrm*>(pNx)->GetAttr()->GetFtn().IsEndNote())
+            if( pNx && pTmpFootnote->GetAttr()->GetFootnote().IsEndNote() )
+                while(pNx && !static_cast<SwFootnoteFrm*>(pNx)->GetAttr()->GetFootnote().IsEndNote())
                     pNx = pNx->GetNext();
-            pTmpFtn->Paste( pCont, pNx );
-            pTmpFtn->Calc();
+            pTmpFootnote->Paste( pCont, pNx );
+            pTmpFootnote->Calc();
         }
-        OSL_ENSURE( pTmpFtn->GetAttr() == FindFtnFrm()->GetAttr(), "Wrong Footnote!" );
+        OSL_ENSURE( pTmpFootnote->GetAttr() == FindFootnoteFrm()->GetAttr(), "Wrong Footnote!" );
         // areas inside of footnotes get a special treatment
-        SwLayoutFrm *pNewUp = pTmpFtn;
+        SwLayoutFrm *pNewUp = pTmpFootnote;
         if( IsInSct() )
         {
             SwSectionFrm* pSect = FindSctFrm();
             // area inside of a footnote (or only footnote in an area)?
-            if( pSect->IsInFtn() )
+            if( pSect->IsInFootnote() )
             {
-                if( pTmpFtn->Lower() && pTmpFtn->Lower()->IsSctFrm() &&
-                    pSect->GetFollow() == static_cast<SwSectionFrm*>(pTmpFtn->Lower()) )
-                    pNewUp = static_cast<SwSectionFrm*>(pTmpFtn->Lower());
+                if( pTmpFootnote->Lower() && pTmpFootnote->Lower()->IsSctFrm() &&
+                    pSect->GetFollow() == static_cast<SwSectionFrm*>(pTmpFootnote->Lower()) )
+                    pNewUp = static_cast<SwSectionFrm*>(pTmpFootnote->Lower());
                 else
                 {
                     pNewUp = new SwSectionFrm( *pSect, false );
-                    pNewUp->InsertBefore( pTmpFtn, pTmpFtn->Lower() );
+                    pNewUp->InsertBefore( pTmpFootnote, pTmpFootnote->Lower() );
                     static_cast<SwSectionFrm*>(pNewUp)->Init();
-                    pNewUp->Frm().Pos() = pTmpFtn->Frm().Pos();
+                    pNewUp->Frm().Pos() = pTmpFootnote->Frm().Pos();
                     pNewUp->Frm().Pos().Y() += 1; // for notifications
 
                     // If the section frame has a successor then the latter needs
@@ -2740,8 +2740,8 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss )
                     if( pTmp )
                     {
                         SwFlowFrm* pTmpNxt;
-                        if( pTmp->IsCntntFrm() )
-                            pTmpNxt = static_cast<SwCntntFrm*>(pTmp);
+                        if( pTmp->IsContentFrm() )
+                            pTmpNxt = static_cast<SwContentFrm*>(pTmp);
                         else if( pTmp->IsSctFrm() )
                             pTmpNxt = static_cast<SwSectionFrm*>(pTmp);
                         else
@@ -2749,7 +2749,7 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss )
                             OSL_ENSURE( pTmp->IsTabFrm(), "GetNextSctLeaf: Wrong Type" );
                             pTmpNxt = static_cast<SwTabFrm*>(pTmp);
                         }
-                        pTmpNxt->MoveSubTree( pTmpFtn, pNewUp->GetNext() );
+                        pTmpNxt->MoveSubTree( pTmpFootnote, pNewUp->GetNext() );
                     }
                 }
             }
@@ -2763,19 +2763,19 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss )
     return bSamePage;
 }
 
-SwSaveFtnHeight::SwSaveFtnHeight( SwFtnBossFrm *pBs, const SwTwips nDeadLine ) :
+SwSaveFootnoteHeight::SwSaveFootnoteHeight( SwFootnoteBossFrm *pBs, const SwTwips nDeadLine ) :
     pBoss( pBs ),
-    nOldHeight( pBs->GetMaxFtnHeight() )
+    nOldHeight( pBs->GetMaxFootnoteHeight() )
 {
-    pBoss->SetFtnDeadLine( nDeadLine );
-    nNewHeight = pBoss->GetMaxFtnHeight();
+    pBoss->SetFootnoteDeadLine( nDeadLine );
+    nNewHeight = pBoss->GetMaxFootnoteHeight();
 }
 
-SwSaveFtnHeight::~SwSaveFtnHeight()
+SwSaveFootnoteHeight::~SwSaveFootnoteHeight()
 {
     // If somebody tweaked the deadline meanwhile, we let it happen
-    if ( nNewHeight == pBoss->GetMaxFtnHeight() )
-        pBoss->nMaxFtnHeight = nOldHeight;
+    if ( nNewHeight == pBoss->GetMaxFootnoteHeight() )
+        pBoss->nMaxFootnoteHeight = nOldHeight;
 }
 
 #ifdef DBG_UTIL
@@ -2787,18 +2787,18 @@ SwSaveFtnHeight::~SwSaveFtnHeight()
 // but the GetRef() is called first, so we have to ignore a master/follow
 // mismatch.
 
-const SwCntntFrm* SwFtnFrm::GetRef() const
+const SwContentFrm* SwFootnoteFrm::GetRef() const
 {
-    const SwCntntFrm* pRefAttr = GetRefFromAttr();
+    const SwContentFrm* pRefAttr = GetRefFromAttr();
     SAL_WARN_IF( pRef != pRefAttr && !pRef->IsAnFollow( pRefAttr )
             && !pRefAttr->IsAnFollow( pRef ),
             "sw", "access to deleted Frame? pRef != pAttr->GetRef()" );
     return pRef;
 }
 
-SwCntntFrm* SwFtnFrm::GetRef()
+SwContentFrm* SwFootnoteFrm::GetRef()
 {
-    const SwCntntFrm* pRefAttr = GetRefFromAttr();
+    const SwContentFrm* pRefAttr = GetRefFromAttr();
     SAL_WARN_IF( pRef != pRefAttr && !pRef->IsAnFollow( pRefAttr )
             && !pRefAttr->IsAnFollow( pRef ),
             "sw", "access to deleted Frame? pRef != pAttr->GetRef()" );
@@ -2806,18 +2806,18 @@ SwCntntFrm* SwFtnFrm::GetRef()
 }
 #endif
 
-const SwCntntFrm* SwFtnFrm::GetRefFromAttr()  const
+const SwContentFrm* SwFootnoteFrm::GetRefFromAttr()  const
 {
-    SwFtnFrm* pThis = const_cast<SwFtnFrm*>(this);
+    SwFootnoteFrm* pThis = const_cast<SwFootnoteFrm*>(this);
     return pThis->GetRefFromAttr();
 }
 
-SwCntntFrm* SwFtnFrm::GetRefFromAttr()
+SwContentFrm* SwFootnoteFrm::GetRefFromAttr()
 {
     assert(pAttr && "invalid Attribute");
-    SwTxtNode& rTNd = (SwTxtNode&)pAttr->GetTxtNode();
+    SwTextNode& rTNd = (SwTextNode&)pAttr->GetTextNode();
     SwPosition aPos( rTNd, SwIndex( &rTNd, pAttr->GetStart() ));
-    SwCntntFrm* pCFrm = rTNd.getLayoutFrm( getRootFrm(), 0, &aPos, false );
+    SwContentFrm* pCFrm = rTNd.getLayoutFrm( getRootFrm(), 0, &aPos, false );
     return pCFrm;
 }
 
@@ -2825,44 +2825,44 @@ SwCntntFrm* SwFtnFrm::GetRefFromAttr()
 
     OD 2005-12-02 #i27138#
 */
-SwCntntFrm* SwFtnFrm::FindLastCntnt()
+SwContentFrm* SwFootnoteFrm::FindLastContent()
 {
-    SwCntntFrm* pLastCntntFrm( 0L );
+    SwContentFrm* pLastContentFrm( 0L );
 
     // find last lower, which is a content frame or contains content.
     // hidden text frames, empty sections and empty tables have to be skipped.
-    SwFrm* pLastLowerOfFtn( GetLower() );
-    SwFrm* pTmpLastLower( pLastLowerOfFtn );
+    SwFrm* pLastLowerOfFootnote( GetLower() );
+    SwFrm* pTmpLastLower( pLastLowerOfFootnote );
     while ( pTmpLastLower && pTmpLastLower->GetNext() )
     {
         pTmpLastLower = pTmpLastLower->GetNext();
-        if ( ( pTmpLastLower->IsTxtFrm() &&
-               !static_cast<SwTxtFrm*>(pTmpLastLower)->IsHiddenNow() ) ||
+        if ( ( pTmpLastLower->IsTextFrm() &&
+               !static_cast<SwTextFrm*>(pTmpLastLower)->IsHiddenNow() ) ||
              ( pTmpLastLower->IsSctFrm() &&
                static_cast<SwSectionFrm*>(pTmpLastLower)->GetSection() &&
-               static_cast<SwSectionFrm*>(pTmpLastLower)->ContainsCntnt() ) ||
+               static_cast<SwSectionFrm*>(pTmpLastLower)->ContainsContent() ) ||
              ( pTmpLastLower->IsTabFrm() &&
-               static_cast<SwTabFrm*>(pTmpLastLower)->ContainsCntnt() ) )
+               static_cast<SwTabFrm*>(pTmpLastLower)->ContainsContent() ) )
         {
-            pLastLowerOfFtn = pTmpLastLower;
+            pLastLowerOfFootnote = pTmpLastLower;
         }
     }
 
     // determine last content frame depending on type of found last lower.
-    if ( pLastLowerOfFtn && pLastLowerOfFtn->IsTabFrm() )
+    if ( pLastLowerOfFootnote && pLastLowerOfFootnote->IsTabFrm() )
     {
-        pLastCntntFrm = static_cast<SwTabFrm*>(pLastLowerOfFtn)->FindLastCntnt();
+        pLastContentFrm = static_cast<SwTabFrm*>(pLastLowerOfFootnote)->FindLastContent();
     }
-    else if ( pLastLowerOfFtn && pLastLowerOfFtn->IsSctFrm() )
+    else if ( pLastLowerOfFootnote && pLastLowerOfFootnote->IsSctFrm() )
     {
-        pLastCntntFrm = static_cast<SwSectionFrm*>(pLastLowerOfFtn)->FindLastCntnt();
+        pLastContentFrm = static_cast<SwSectionFrm*>(pLastLowerOfFootnote)->FindLastContent();
     }
     else
     {
-        pLastCntntFrm = dynamic_cast<SwCntntFrm*>(pLastLowerOfFtn);
+        pLastContentFrm = dynamic_cast<SwContentFrm*>(pLastLowerOfFootnote);
     }
 
-    return pLastCntntFrm;
+    return pLastContentFrm;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 7d4dcb5a63e2..18b29faf9a4f 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -36,7 +36,7 @@ extern bool bObjsDirect;    //frmtool.cxx
 
 static SwTwips lcl_GetFrmMinHeight(const SwLayoutFrm & rFrm)
 {
-    const SwFmtFrmSize &rSz = rFrm.GetFmt()->GetFrmSize();
+    const SwFormatFrmSize &rSz = rFrm.GetFormat()->GetFrmSize();
     SwTwips nMinHeight;
 
     switch (rSz.GetHeightSizeType())
@@ -64,11 +64,11 @@ static SwTwips lcl_CalcContentHeight(SwLayoutFrm & frm)
 
         nTmp = pFrm->Frm().Height();
         nRemaining += nTmp;
-        if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsUndersized() )
+        if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsUndersized() )
         {
-            nTmp = static_cast<SwTxtFrm*>(pFrm)->GetParHeight()
+            nTmp = static_cast<SwTextFrm*>(pFrm)->GetParHeight()
                 - pFrm->Prt().Height();
-            // This TxtFrm would like to be a bit bigger
+            // This TextFrm would like to be a bit bigger
             nRemaining += nTmp;
         }
         else if( pFrm->IsSctFrm() && static_cast<SwSectionFrm*>(pFrm)->IsUndersized() )
@@ -93,21 +93,21 @@ static void lcl_LayoutFrmEnsureMinHeight(SwLayoutFrm & rFrm,
     }
 }
 
-SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, SwFrm* pSib, sal_uInt16 nTypeIn)
-    : SwLayoutFrm( pFmt, pSib )
+SwHeadFootFrm::SwHeadFootFrm( SwFrameFormat * pFormat, SwFrm* pSib, sal_uInt16 nTypeIn)
+    : SwLayoutFrm( pFormat, pSib )
 {
     mnFrmType = nTypeIn;
     SetDerivedVert( false );
 
-    const SwFmtCntnt &rCnt = pFmt->GetCntnt();
+    const SwFormatContent &rCnt = pFormat->GetContent();
 
-    OSL_ENSURE( rCnt.GetCntntIdx(), "No content for Header." );
+    OSL_ENSURE( rCnt.GetContentIdx(), "No content for Header." );
 
     // Have the objects created right now for header and footer
     bool bOld = bObjsDirect;
     bObjsDirect = true;
-    sal_uLong nIndex = rCnt.GetCntntIdx()->GetIndex();
-    ::_InsertCnt( this, pFmt->GetDoc(), ++nIndex );
+    sal_uLong nIndex = rCnt.GetContentIdx()->GetIndex();
+    ::_InsertCnt( this, pFormat->GetDoc(), ++nIndex );
     bObjsDirect = bOld;
 }
 
@@ -254,11 +254,11 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
                     // #i46941# - frame has to be valid.
                     // Note: frame could be invalid after calling its format,
                     //       if it's locked
-                    OSL_ENSURE( StackHack::IsLocked() || !pFrm->IsTxtFrm() ||
+                    OSL_ENSURE( StackHack::IsLocked() || !pFrm->IsTextFrm() ||
                             pFrm->IsValid() ||
-                            static_cast<SwTxtFrm*>(pFrm)->IsJoinLocked(),
+                            static_cast<SwTextFrm*>(pFrm)->IsJoinLocked(),
                             "<SwHeadFootFrm::FormatSize(..)> - text frame invalid and not locked." );
-                    if ( pFrm->IsTxtFrm() && pFrm->IsValid() )
+                    if ( pFrm->IsTextFrm() && pFrm->IsValid() )
                     {
                         if ( !SwObjectFormatter::FormatObjsAtFrm( *pFrm,
                                                                   *(pFrm->FindPageFrm()) ) )
@@ -277,10 +277,10 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
                 {
                     nRemaining += pFrm->Frm().Height();
 
-                    if( pFrm->IsTxtFrm() &&
-                        static_cast<SwTxtFrm*>(pFrm)->IsUndersized() )
-                        // This TxtFrm would like to be a bit bigger
-                        nRemaining += static_cast<SwTxtFrm*>(pFrm)->GetParHeight()
+                    if( pFrm->IsTextFrm() &&
+                        static_cast<SwTextFrm*>(pFrm)->IsUndersized() )
+                        // This TextFrm would like to be a bit bigger
+                        nRemaining += static_cast<SwTextFrm*>(pFrm)->GetParHeight()
                             - pFrm->Prt().Height();
                     else if( pFrm->IsSctFrm() &&
                              static_cast<SwSectionFrm*>(pFrm)->IsUndersized() )
@@ -323,9 +323,9 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
 
                             while ( pFrm )
                             {
-                                if( pFrm->IsTxtFrm())
+                                if( pFrm->IsTextFrm())
                                 {
-                                    SwTxtFrm * pTmpFrm = static_cast<SwTxtFrm*>(pFrm);
+                                    SwTextFrm * pTmpFrm = static_cast<SwTextFrm*>(pFrm);
                                     if (pTmpFrm->IsUndersized() )
                                     {
                                         pTmpFrm->InvalidateSize();
@@ -632,10 +632,10 @@ SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
 
 bool SwHeadFootFrm::GetEatSpacing() const
 {
-    const SwFrmFmt * pFmt = GetFmt();
-    OSL_ENSURE(pFmt, "SwHeadFootFrm: no format?");
+    const SwFrameFormat * pFormat = GetFormat();
+    OSL_ENSURE(pFormat, "SwHeadFootFrm: no format?");
 
-    if (pFmt->GetHeaderAndFooterEatSpacing().GetValue())
+    if (pFormat->GetHeaderAndFooterEatSpacing().GetValue())
         return true;
 
     return false;
@@ -670,16 +670,16 @@ void SwPageFrm::PrepareHeader()
     if ( !pLay )
         return;
 
-    const SwFmtHeader &rH = static_cast<SwFrmFmt*>(GetRegisteredIn())->GetHeader();
+    const SwFormatHeader &rH = static_cast<SwFrameFormat*>(GetRegisteredIn())->GetHeader();
 
     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
     const bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
 
     if ( bOn && rH.IsActive() )
     {   //Implant header, but remove first, if already present
-        OSL_ENSURE( rH.GetHeaderFmt(), "FrmFmt for Header not found." );
+        OSL_ENSURE( rH.GetHeaderFormat(), "FrameFormat for Header not found." );
 
-        if ( pLay->GetFmt() == rH.GetHeaderFmt() )
+        if ( pLay->GetFormat() == rH.GetHeaderFormat() )
             return; // Header is already the correct one.
 
         if ( pLay->IsHeaderFrm() )
@@ -690,7 +690,7 @@ void SwPageFrm::PrepareHeader()
             SwFrm::DestroyFrm(pDel);
         }
         OSL_ENSURE( pLay, "Where to with the Header?" );
-        SwHeaderFrm *pH = new SwHeaderFrm( const_cast<SwFrmFmt*>(rH.GetHeaderFmt()), this );
+        SwHeaderFrm *pH = new SwHeaderFrm( const_cast<SwFrameFormat*>(rH.GetHeaderFormat()), this );
         pH->Paste( this, pLay );
         if ( GetUpper() )
             ::RegistFlys( this, pH );
@@ -710,7 +710,7 @@ void SwPageFrm::PrepareFooter()
     if ( !pLay )
         return;
 
-    const SwFmtFooter &rF = static_cast<SwFrmFmt*>(GetRegisteredIn())->GetFooter();
+    const SwFormatFooter &rF = static_cast<SwFrameFormat*>(GetRegisteredIn())->GetFooter();
     while ( pLay->GetNext() )
         pLay = static_cast<SwLayoutFrm*>(pLay->GetNext());
 
@@ -719,9 +719,9 @@ void SwPageFrm::PrepareFooter()
 
     if ( bOn && rF.IsActive() )
     {   //Implant footer, but remove first, if already present
-        OSL_ENSURE( rF.GetFooterFmt(), "FrmFmt for Footer not found." );
+        OSL_ENSURE( rF.GetFooterFormat(), "FrameFormat for Footer not found." );
 
-        if ( pLay->GetFmt() == rF.GetFooterFmt() )
+        if ( pLay->GetFormat() == rF.GetFooterFormat() )
             return;  // Footer is already the correct one.
 
         if ( pLay->IsFooterFrm() )
@@ -730,7 +730,7 @@ void SwPageFrm::PrepareFooter()
             pLay->Cut();
             SwFrm::DestroyFrm(pLay);
         }
-        SwFooterFrm *pF = new SwFooterFrm( const_cast<SwFrmFmt*>(rF.GetFooterFmt()), this );
+        SwFooterFrm *pF = new SwFooterFrm( const_cast<SwFrameFormat*>(rF.GetFooterFormat()), this );
         pF->Paste( this );
         if ( GetUpper() )
             ::RegistFlys( this, pF );
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index e8010ae3aec9..26f43eec8936 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -105,7 +105,7 @@ void SwLayAction::CheckWaitCrsr()
     if ( !IsWait() && IsWaitAllowed() && IsPaint() &&
          ((std::clock() - GetStartTicks()) * 1000 / CLOCKS_PER_SEC >= CLOCKS_PER_SEC/2) )
     {
-        pWait = new SwWait( *pRoot->GetFmt()->GetDoc()->GetDocShell(), true );
+        pWait = new SwWait( *pRoot->GetFormat()->GetDoc()->GetDocShell(), true );
     }
 }
 
@@ -127,7 +127,7 @@ void SwLayAction::SetStatBar( bool bNew )
         nEndPage = USHRT_MAX;
 }
 
-bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt,
+bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwContentFrm *pCnt,
                                     const SwPageFrm *pPage )
 {
     SwRegionRects aTmp( rRect );
@@ -141,7 +141,7 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt,
             continue;
 
         // OD 2004-01-15 #110582# - do not consider invisible objects
-        const IDocumentDrawModelAccess* pIDDMA = pPage->GetFmt()->getIDocumentDrawModelAccess();
+        const IDocumentDrawModelAccess* pIDDMA = pPage->GetFormat()->getIDocumentDrawModelAccess();
         if ( !pIDDMA->IsVisibleLayerId( pO->GetLayer() ) )
         {
             continue;
@@ -170,7 +170,7 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt,
             else
             {
                 const bool bLowerOfSelf = pFly->IsLowerOf( pSelfFly );
-                if ( !bLowerOfSelf && !pFly->GetFmt()->GetOpaque().GetValue() )
+                if ( !bLowerOfSelf && !pFly->GetFormat()->GetOpaque().GetValue() )
                     // Things from other layers are only interesting to us if
                     // they're not transparent or lie inwards
                     continue;
@@ -182,9 +182,9 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt,
         //     For checking, if fly frame contains transparent graphic or
         //     has surrounded contour, assure that fly frame has a lower
         if ( pFly->Lower() &&
-             pFly->Lower()->IsNoTxtFrm() &&
-             ( static_cast<SwNoTxtFrm*>(pFly->Lower())->IsTransparent() ||
-               pFly->GetFmt()->GetSurround().IsContour() )
+             pFly->Lower()->IsNoTextFrm() &&
+             ( static_cast<SwNoTextFrm*>(pFly->Lower())->IsTransparent() ||
+               pFly->GetFormat()->GetSurround().IsContour() )
            )
         {
             continue;
@@ -207,14 +207,14 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt,
     return bRetPaint;
 }
 
-inline bool SwLayAction::_PaintCntnt( const SwCntntFrm *pCntnt,
+inline bool SwLayAction::_PaintContent( const SwContentFrm *pContent,
                                       const SwPageFrm *pPage,
                                       const SwRect &rRect )
 {
     if ( rRect.HasArea() )
     {
         if ( pPage->GetSortedObjs() )
-            return PaintWithoutFlys( rRect, pCntnt, pPage );
+            return PaintWithoutFlys( rRect, pContent, pPage );
         else
             return pImp->GetShell()->AddPaintRect( rRect );
     }
@@ -222,20 +222,20 @@ inline bool SwLayAction::_PaintCntnt( const SwCntntFrm *pCntnt,
 }
 
 /**
- * Depending of the type, the Cntnt is output according to it's changes, or the area
+ * Depending of the type, the Content is output according to it's changes, or the area
  * to be outputted is registered with the region, respectively.
  */
-void SwLayAction::PaintCntnt( const SwCntntFrm *pCnt,
+void SwLayAction::PaintContent( const SwContentFrm *pCnt,
                               const SwPageFrm *pPage,
                               const SwRect &rOldRect,
                               long nOldBottom )
 {
     SWRECTFN( pCnt )
 
-    if ( pCnt->IsCompletePaint() || !pCnt->IsTxtFrm() )
+    if ( pCnt->IsCompletePaint() || !pCnt->IsTextFrm() )
     {
         SwRect aPaint( pCnt->PaintArea() );
-        if ( !_PaintCntnt( pCnt, pPage, aPaint ) )
+        if ( !_PaintContent( pCnt, pPage, aPaint ) )
             pCnt->ResetCompletePaint();
     }
     else
@@ -252,11 +252,11 @@ void SwLayAction::PaintCntnt( const SwCntntFrm *pCnt,
             if( nOldHeight > nNewHeight )
                 nOldBottom = (pCnt->*fnRect->fnGetPrtBottom)();
             (aDrawRect.*fnRect->fnSetTop)( nOldBottom );
-            _PaintCntnt( pCnt, pPage, aDrawRect );
+            _PaintContent( pCnt, pPage, aDrawRect );
         }
         // paint content area
-        SwRect aPaintRect = static_cast<SwTxtFrm*>(const_cast<SwCntntFrm*>(pCnt))->Paint();
-        _PaintCntnt( pCnt, pPage, aPaintRect );
+        SwRect aPaintRect = static_cast<SwTextFrm*>(const_cast<SwContentFrm*>(pCnt))->Paint();
+        _PaintContent( pCnt, pPage, aPaintRect );
     }
 
     if ( pCnt->IsRetouche() && !pCnt->GetNext() )
@@ -270,7 +270,7 @@ void SwLayAction::PaintCntnt( const SwCntntFrm *pCnt,
         }
         SwRect aRect( pTmp->GetUpper()->PaintArea() );
         (aRect.*fnRect->fnSetTop)( (pTmp->*fnRect->fnGetPrtBottom)() );
-        if ( !_PaintCntnt( pCnt, pPage, aRect ) )
+        if ( !_PaintContent( pCnt, pPage, aRect ) )
             pCnt->ResetRetouche();
     }
 }
@@ -289,9 +289,9 @@ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewShellImp *pI ) :
     bPaintExtraData = ::IsExtraData( pImp->GetShell()->GetDoc() );
     bPaint = bComplete = bWaitAllowed = bCheckPages = true;
     bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule =
-    bUpdateExpFlds = bBrowseActionStop = bActionInProgress = false;
-    // OD 14.04.2003 #106346# - init new flag <mbFormatCntntOnInterrupt>.
-    mbFormatCntntOnInterrupt = false;
+    bUpdateExpFields = bBrowseActionStop = bActionInProgress = false;
+    // OD 14.04.2003 #106346# - init new flag <mbFormatContentOnInterrupt>.
+    mbFormatContentOnInterrupt = false;
 
     assert(!pImp->pLayAct); // there can be only one SwLayAction
     pImp->pLayAct = this;   // register there
@@ -311,7 +311,7 @@ void SwLayAction::Reset()
     nEndPage = nPreInvaPage = nCheckPageNum = USHRT_MAX;
     bPaint = bComplete = bWaitAllowed = bCheckPages = true;
     bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule =
-    bUpdateExpFlds = bBrowseActionStop = false;
+    bUpdateExpFields = bBrowseActionStop = false;
 }
 
 bool SwLayAction::RemoveEmptyBrowserPages()
@@ -326,7 +326,7 @@ bool SwLayAction::RemoveEmptyBrowserPages()
         do
         {
             if ( (pPage->GetSortedObjs() && pPage->GetSortedObjs()->size()) ||
-                 pPage->ContainsCntnt() )
+                 pPage->ContainsContent() )
                 pPage = static_cast<SwPageFrm*>(pPage->GetNext());
             else
             {
@@ -389,25 +389,25 @@ void SwLayAction::Action()
 
 SwPageFrm* SwLayAction::CheckFirstVisPage( SwPageFrm *pPage )
 {
-    SwCntntFrm *pCnt = pPage->FindFirstBodyCntnt();
-    SwCntntFrm *pChk = pCnt;
+    SwContentFrm *pCnt = pPage->FindFirstBodyContent();
+    SwContentFrm *pChk = pCnt;
     bool bPageChgd = false;
     while ( pCnt && pCnt->IsFollow() )
-        pCnt = static_cast<SwCntntFrm*>(pCnt)->FindMaster();
+        pCnt = static_cast<SwContentFrm*>(pCnt)->FindMaster();
     if ( pCnt && pChk != pCnt )
     {   bPageChgd = true;
         pPage = pCnt->FindPageFrm();
     }
 
-    if ( !pPage->GetFmt()->GetDoc()->GetFtnIdxs().empty() )
+    if ( !pPage->GetFormat()->GetDoc()->GetFootnoteIdxs().empty() )
     {
-        SwFtnContFrm *pCont = pPage->FindFtnCont();
+        SwFootnoteContFrm *pCont = pPage->FindFootnoteCont();
         if ( pCont )
         {
-            pCnt = pCont->ContainsCntnt();
+            pCnt = pCont->ContainsContent();
             pChk = pCnt;
             while ( pCnt && pCnt->IsFollow() )
-                pCnt = static_cast<SwCntntFrm*>(pCnt->FindPrev());
+                pCnt = static_cast<SwContentFrm*>(pCnt->FindPrev());
             if ( pCnt && pCnt != pChk )
             {
                 if ( bPageChgd )
@@ -458,8 +458,8 @@ void SwLayAction::InternalAction()
     if ( !pPage )
         pPage = static_cast<SwPageFrm*>(pRoot->Lower());
 
-    // If there's a first-flow-Cntnt in the first visible page that's also a Follow,
-    // we switch the page back to the original master of that Cntnt.
+    // If there's a first-flow-Content in the first visible page that's also a Follow,
+    // we switch the page back to the original master of that Content.
     if ( !IsComplete() )
         pPage = CheckFirstVisPage( pPage );
     sal_uInt16 nFirstPageNum = pPage->GetPhyPageNum();
@@ -467,8 +467,8 @@ void SwLayAction::InternalAction()
     while ( pPage && !pPage->IsInvalid() && !pPage->IsInvalidFly() )
         pPage = static_cast<SwPageFrm*>(pPage->GetNext());
 
-    IDocumentLayoutAccess *pLayoutAccess = pRoot->GetFmt()->getIDocumentLayoutAccess();
-    bool bNoLoop = pPage && SwLayouter::StartLoopControl( pRoot->GetFmt()->GetDoc(), pPage );
+    IDocumentLayoutAccess *pLayoutAccess = pRoot->GetFormat()->getIDocumentLayoutAccess();
+    bool bNoLoop = pPage && SwLayouter::StartLoopControl( pRoot->GetFormat()->GetDoc(), pPage );
     sal_uInt16 nPercentPageNum = 0;
     while ( (pPage && !IsInterrupt()) || nCheckPageNum != USHRT_MAX )
     {
@@ -548,7 +548,7 @@ void SwLayAction::InternalAction()
                 {
                     // If there are no (more) Flys, the flags are superfluous.
                     pPage->ValidateFlyLayout();
-                    pPage->ValidateFlyCntnt();
+                    pPage->ValidateFlyContent();
                 }
                 // #i28701# - change condition
                 while ( !IsInterrupt() && !IsNextCycle() &&
@@ -577,22 +577,22 @@ void SwLayAction::InternalAction()
                     }
                     // #i28701# - change condition
                     if ( !IsNextCycle() &&
-                         ( pPage->IsInvalidCntnt() ||
+                         ( pPage->IsInvalidContent() ||
                            (IS_FLYS && IS_INVAFLY) ) )
                     {
                         pPage->ValidateFlyInCnt();
-                        pPage->ValidateCntnt();
+                        pPage->ValidateContent();
                         // #i28701#
                         pPage->ValidateFlyLayout();
-                        pPage->ValidateFlyCntnt();
-                        if ( !FormatCntnt( pPage ) )
+                        pPage->ValidateFlyContent();
+                        if ( !FormatContent( pPage ) )
                         {
                             XCHECKPAGE;
-                            pPage->InvalidateCntnt();
+                            pPage->InvalidateContent();
                             pPage->InvalidateFlyInCnt();
                             // #i28701#
                             pPage->InvalidateFlyLayout();
-                            pPage->InvalidateFlyCntnt();
+                            pPage->InvalidateFlyContent();
                             if ( IsBrowseActionStop() )
                                 bInput = true;
                         }
@@ -610,7 +610,7 @@ void SwLayAction::InternalAction()
             {
                 // If there are no (more) Flys, the flags are superfluous.
                 pPage->ValidateFlyLayout();
-                pPage->ValidateFlyCntnt();
+                pPage->ValidateFlyContent();
             }
             if ( !IsInterrupt() )
             {
@@ -708,7 +708,7 @@ void SwLayAction::InternalAction()
             pPg = pPg ? static_cast<SwPageFrm*>(pPg->GetPrev()) : pPage;
 
         // set flag for interrupt content formatting
-        mbFormatCntntOnInterrupt = IsInput();
+        mbFormatContentOnInterrupt = IsInput();
         long nBottom = rVis.Bottom();
         // #i42586# - format current page, if idle action is active
         // This is an optimization for the case that the interrupt is created by
@@ -728,10 +728,10 @@ void SwLayAction::InternalAction()
             // #i28701# - conditions are incorrect (macros IS_FLYS and IS_INVAFLY only
             //            works for <pPage>) and are too strict.
             // #i50432# - adjust interrupt formatting to normal page formatting - see above.
-            while ( ( mbFormatCntntOnInterrupt &&
+            while ( ( mbFormatContentOnInterrupt &&
                       ( pPg->IsInvalid() ||
                         ( pPg->GetSortedObjs() && pPg->IsInvalidFly() ) ) ) ||
-                    ( !mbFormatCntntOnInterrupt && pPg->IsInvalidLayout() ) )
+                    ( !mbFormatContentOnInterrupt && pPg->IsInvalidLayout() ) )
             {
                 XCHECKPAGE;
                 // #i50432# - format also at-page anchored objects
@@ -739,7 +739,7 @@ void SwLayAction::InternalAction()
                 if ( !pPg->GetSortedObjs() )
                 {
                     pPg->ValidateFlyLayout();
-                    pPg->ValidateFlyCntnt();
+                    pPg->ValidateFlyContent();
                 }
 
                 // #i81146# new loop control
@@ -760,15 +760,15 @@ void SwLayAction::InternalAction()
                 }
 
                 // #i50432#
-                if ( mbFormatCntntOnInterrupt &&
-                     ( pPg->IsInvalidCntnt() ||
+                if ( mbFormatContentOnInterrupt &&
+                     ( pPg->IsInvalidContent() ||
                        ( pPg->GetSortedObjs() && pPg->IsInvalidFly() ) ) )
                 {
                     pPg->ValidateFlyInCnt();
-                    pPg->ValidateCntnt();
+                    pPg->ValidateContent();
                     // #i26945#
                     pPg->ValidateFlyLayout();
-                    pPg->ValidateFlyCntnt();
+                    pPg->ValidateFlyContent();
 
                     if ( ++nLoopControlRuns_2 > nLoopControlMax )
                     {
@@ -776,14 +776,14 @@ void SwLayAction::InternalAction()
                         break;
                     }
 
-                    if ( !FormatCntnt( pPg ) )
+                    if ( !FormatContent( pPg ) )
                     {
                         XCHECKPAGE;
-                        pPg->InvalidateCntnt();
+                        pPg->InvalidateContent();
                         pPg->InvalidateFlyInCnt();
                         // #i26945#
                         pPg->InvalidateFlyLayout();
-                        pPg->InvalidateFlyCntnt();
+                        pPg->InvalidateFlyContent();
                     }
                     // #i46807# - we are statisfied, if the content is formatted once complete.
                     else
@@ -797,14 +797,14 @@ void SwLayAction::InternalAction()
             pPg = static_cast<SwPageFrm*>(pPg->GetNext());
         }
         // reset flag for special interrupt content formatting.
-        mbFormatCntntOnInterrupt = false;
+        mbFormatContentOnInterrupt = false;
     }
     pOptTab = 0;
     if( bNoLoop )
         pLayoutAccess->GetLayouter()->EndLoopControl();
 }
 
-bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
+bool SwLayAction::_TurboAction( const SwContentFrm *pCnt )
 {
 
     const SwPageFrm *pPage = 0;
@@ -817,13 +817,13 @@ bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
             pCnt->SetRetouche();
 
         pPage = pCnt->FindPageFrm();
-        PaintCntnt( pCnt, pPage, aOldRect, nOldBottom );
+        PaintContent( pCnt, pPage, aOldRect, nOldBottom );
 
-        if ( !pCnt->GetValidLineNumFlag() && pCnt->IsTxtFrm() )
+        if ( !pCnt->GetValidLineNumFlag() && pCnt->IsTextFrm() )
         {
-            const sal_uLong nAllLines = static_cast<const SwTxtFrm*>(pCnt)->GetAllLines();
-            const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCnt))->RecalcAllLines();
-            if ( nAllLines != static_cast<const SwTxtFrm*>(pCnt)->GetAllLines() )
+            const sal_uLong nAllLines = static_cast<const SwTextFrm*>(pCnt)->GetAllLines();
+            const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pCnt))->RecalcAllLines();
+            if ( nAllLines != static_cast<const SwTextFrm*>(pCnt)->GetAllLines() )
             {
                 if ( IsPaintExtraData() )
                     pImp->GetShell()->AddPaintRect( pCnt->Frm() );
@@ -831,10 +831,10 @@ bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
                 // and we don't stop processing here. To perform this inside RecalcAllLines
                 // would be expensive, because we would have to notify the page even
                 // in unnecessary cases (normal actions).
-                const SwCntntFrm *pNxt = pCnt->GetNextCntntFrm();
+                const SwContentFrm *pNxt = pCnt->GetNextContentFrm();
                 while ( pNxt &&
                         (pNxt->IsInTab() || pNxt->IsInDocBody() != pCnt->IsInDocBody()) )
-                    pNxt = pNxt->GetNextCntntFrm();
+                    pNxt = pNxt->GetNextContentFrm();
                 if ( pNxt )
                     pNxt->InvalidatePage();
             }
@@ -848,14 +848,14 @@ bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
         pPage = pCnt->FindPageFrm();
 
     // OD 2004-05-10 #i28701# - format floating screen objects at content frame.
-    if ( pCnt->IsTxtFrm() &&
-         !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwCntntFrm*>(pCnt)),
+    if ( pCnt->IsTextFrm() &&
+         !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwContentFrm*>(pCnt)),
                                               *pPage, this ) )
     {
         return false;
     }
 
-    if ( pPage->IsInvalidCntnt() )
+    if ( pPage->IsInvalidContent() )
         return false;
     return true;
 }
@@ -912,11 +912,11 @@ static const SwFrm *lcl_FindFirstInvaLay( const SwFrm *pFrm, long nBottom )
     return 0;
 }
 
-static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBottom,
-                                     const SwCntntFrm *pFirst )
+static const SwFrm *lcl_FindFirstInvaContent( const SwLayoutFrm *pLay, long nBottom,
+                                     const SwContentFrm *pFirst )
 {
-    const SwCntntFrm *pCnt = pFirst ? pFirst->GetNextCntntFrm() :
-                                      pLay->ContainsCntnt();
+    const SwContentFrm *pCnt = pFirst ? pFirst->GetNextContentFrm() :
+                                      pLay->ContainsContent();
     while ( pCnt )
     {
         if ( !pCnt->IsValid() || pCnt->IsCompletePaint() )
@@ -942,7 +942,7 @@ static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBotto
                             if ( pFly->Frm().Top() <= nBottom )
                                 return pFly;
                         }
-                        const SwFrm *pFrm = lcl_FindFirstInvaCntnt( pFly, nBottom, 0 );
+                        const SwFrm *pFrm = lcl_FindFirstInvaContent( pFly, nBottom, 0 );
                         if ( pFrm && pFrm->Frm().Bottom() <= nBottom )
                             return pFrm;
                     }
@@ -951,7 +951,7 @@ static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBotto
         }
         if ( pCnt->Frm().Top() > nBottom && !pCnt->IsInTab() )
             return 0;
-        pCnt = pCnt->GetNextCntntFrm();
+        pCnt = pCnt->GetNextContentFrm();
         if ( !pLay->IsAnLower( pCnt ) )
             break;
     }
@@ -976,7 +976,7 @@ static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage,
                     return pFly;
 
                 const SwFrm* pTmp;
-                if ( 0 != (pTmp = lcl_FindFirstInvaCntnt( pFly, _nBottom, 0 )) &&
+                if ( 0 != (pTmp = lcl_FindFirstInvaContent( pFly, _nBottom, 0 )) &&
                      pTmp->Frm().Top() <= _nBottom )
                     return pFly;
             }
@@ -1037,11 +1037,11 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
     {
         bRet = true;
 
-        // This is going to be a bit nasty: The first CntntFrm of this
+        // This is going to be a bit nasty: The first ContentFrm of this
         // page in the Body text needs formatting; if it changes the page during
         // that process, I need to start over a page further back, because we
         // have been processing a PageBreak.
-        // Even more uncomfortable: The next CntntFrm must be formatted,
+        // Even more uncomfortable: The next ContentFrm must be formatted,
         // because it's possible for empty pages to exist temporarily (for example
         // a paragraph across multiple pages gets deleted or reduced in size).
 
@@ -1049,33 +1049,33 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
         // isn't visible anymore.
 
         const SwPageFrm *p2ndPage = prPage;
-        const SwCntntFrm *pCntnt;
+        const SwContentFrm *pContent;
         const SwLayoutFrm* pBody = p2ndPage->FindBodyCont();
-        if( p2ndPage->IsFtnPage() && pBody )
+        if( p2ndPage->IsFootnotePage() && pBody )
             pBody = static_cast<const SwLayoutFrm*>(pBody->GetNext());
-        pCntnt = pBody ? pBody->ContainsCntnt() : 0;
-        while ( p2ndPage && !pCntnt )
+        pContent = pBody ? pBody->ContainsContent() : 0;
+        while ( p2ndPage && !pContent )
         {
             p2ndPage = static_cast<const SwPageFrm*>(p2ndPage->GetNext());
             if( p2ndPage )
             {
                 pBody = p2ndPage->FindBodyCont();
-                if( p2ndPage->IsFtnPage() && pBody )
+                if( p2ndPage->IsFootnotePage() && pBody )
                     pBody = static_cast<const SwLayoutFrm*>(pBody->GetNext());
-                pCntnt = pBody ? pBody->ContainsCntnt() : 0;
+                pContent = pBody ? pBody->ContainsContent() : 0;
             }
         }
-        if ( pCntnt )
+        if ( pContent )
         {
             bool bTstCnt = true;
             if ( bBrowse )
             {
                 // Is the Cnt before already invisible?
-                const SwFrm *pLst = pCntnt;
+                const SwFrm *pLst = pContent;
                 if ( pLst->IsInTab() )
-                    pLst = pCntnt->FindTabFrm();
+                    pLst = pContent->FindTabFrm();
                 if ( pLst->IsInSct() )
-                    pLst = pCntnt->FindSctFrm();
+                    pLst = pContent->FindSctFrm();
                 pLst = pLst->FindPrev();
                 if ( pLst &&
                      (pLst->Frm().Top() >= rVis.Bottom() ||
@@ -1092,9 +1092,9 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                 // frame calculation is performed
                 bool bPageChg = false;
 
-                if ( pCntnt->IsInSct() )
+                if ( pContent->IsInSct() )
                 {
-                    const SwSectionFrm *pSct = ((SwFrm*)pCntnt)->ImplFindSctFrm();
+                    const SwSectionFrm *pSct = ((SwFrm*)pContent)->ImplFindSctFrm();
                     if ( !pSct->IsValid() )
                     {
                         pSct->Calc();
@@ -1102,25 +1102,25 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                         if ( IsAgain() )
                             return false;
                         // #i27756#
-                        bPageChg = pCntnt->FindPageFrm() != p2ndPage &&
+                        bPageChg = pContent->FindPageFrm() != p2ndPage &&
                                    prPage->GetPrev();
                     }
                 }
 
-                if ( !bPageChg && !pCntnt->IsValid() )
+                if ( !bPageChg && !pContent->IsValid() )
                 {
-                    pCntnt->Calc();
-                    pCntnt->SetCompletePaint();
+                    pContent->Calc();
+                    pContent->SetCompletePaint();
                     if ( IsAgain() )
                         return false;
                     // #i27756#
-                    bPageChg = pCntnt->FindPageFrm() != p2ndPage &&
+                    bPageChg = pContent->FindPageFrm() != p2ndPage &&
                                prPage->GetPrev();
                 }
 
-                if ( !bPageChg && pCntnt->IsInTab() )
+                if ( !bPageChg && pContent->IsInTab() )
                 {
-                    const SwTabFrm *pTab = ((SwFrm*)pCntnt)->ImplFindTabFrm();
+                    const SwTabFrm *pTab = ((SwFrm*)pContent)->ImplFindTabFrm();
                     if ( !pTab->IsValid() )
                     {
                         pTab->Calc();
@@ -1128,14 +1128,14 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                         if ( IsAgain() )
                             return false;
                         // #i27756#
-                        bPageChg = pCntnt->FindPageFrm() != p2ndPage &&
+                        bPageChg = pContent->FindPageFrm() != p2ndPage &&
                                    prPage->GetPrev();
                     }
                 }
 
-                if ( !bPageChg && pCntnt->IsInSct() )
+                if ( !bPageChg && pContent->IsInSct() )
                 {
-                    const SwSectionFrm *pSct = ((SwFrm*)pCntnt)->ImplFindSctFrm();
+                    const SwSectionFrm *pSct = ((SwFrm*)pContent)->ImplFindSctFrm();
                     if ( !pSct->IsValid() )
                     {
                         pSct->Calc();
@@ -1143,7 +1143,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                         if ( IsAgain() )
                             return false;
                         // #i27756#
-                        bPageChg = pCntnt->FindPageFrm() != p2ndPage &&
+                        bPageChg = pContent->FindPageFrm() != p2ndPage &&
                                    prPage->GetPrev();
                     }
                 }
@@ -1152,7 +1152,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                 if ( bPageChg )
                 {
                     bRet = false;
-                    const SwPageFrm* pTmp = pCntnt->FindPageFrm();
+                    const SwPageFrm* pTmp = pContent->FindPageFrm();
                     if ( pTmp->GetPhyPageNum() < prPage->GetPhyPageNum() &&
                          pTmp->IsInvalid() )
                     {
@@ -1164,7 +1164,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                     }
                 }
                 // #121980# - no shortcut, if at previous page
-                // an anchored object is registered, whose anchor is <pCntnt>.
+                // an anchored object is registered, whose anchor is <pContent>.
                 else if ( prPage->GetPrev() )
                 {
                     SwSortedObjs* pObjs =
@@ -1174,7 +1174,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                         for ( size_t i = 0; i < pObjs->size(); ++i )
                         {
                             SwAnchoredObject* pObj = (*pObjs)[i];
-                            if ( pObj->GetAnchorFrmContainingAnchPos() == pCntnt )
+                            if ( pObj->GetAnchorFrmContainingAnchPos() == pContent )
                             {
                                 bRet = false;
                                 break;
@@ -1191,7 +1191,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
         const long nBottom = rVis.Bottom();
         const SwAnchoredObject* pObj( 0L );
         if ( prPage->GetSortedObjs() &&
-             (prPage->IsInvalidFlyLayout() || prPage->IsInvalidFlyCntnt()) &&
+             (prPage->IsInvalidFlyLayout() || prPage->IsInvalidFlyContent()) &&
              0 != (pObj = lcl_FindFirstInvaObj( prPage, nBottom )) &&
              pObj->GetObjRect().Top() <= nBottom )
         {
@@ -1204,8 +1204,8 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
         {
             return false;
         }
-        if ( (prPage->IsInvalidCntnt() || prPage->IsInvalidFlyInCnt()) &&
-             0 != (pFrm = lcl_FindFirstInvaCntnt( prPage, nBottom, 0 )) &&
+        if ( (prPage->IsInvalidContent() || prPage->IsInvalidFlyInCnt()) &&
+             0 != (pFrm = lcl_FindFirstInvaContent( prPage, nBottom, 0 )) &&
              pFrm->Frm().Top() <= nBottom )
         {
             return false;
@@ -1257,7 +1257,7 @@ bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, bool bAddRect )
             const SwViewShell *pSh = pLay->getRootFrm()->GetCurrShell();
             // Limitations because of headers / footers
             if( pSh && pSh->GetViewOptions()->getBrowseMode() &&
-                !( pLay->IsCompletePaint() && pLay->FindPageFrm()->FindFtnCont() ) )
+                !( pLay->IsCompletePaint() && pLay->FindPageFrm()->FindFootnoteCont() ) )
                 bNoPaint = true;
         }
 
@@ -1390,7 +1390,7 @@ bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, bool bAddRect )
 
     // Now, deal with the lowers that are LayoutFrms
 
-    if ( pLay->IsFtnFrm() ) // no LayFrms as Lower
+    if ( pLay->IsFootnoteFrm() ) // no LayFrms as Lower
         return bChanged;
 
     SwFrm *pLow = pLay->Lower();
@@ -1486,7 +1486,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
     if ( IsAgain() || !pTab->Lower() )
         return false;
 
-    IDocumentTimerAccess *pTimerAccess = pRoot->GetFmt()->getIDocumentTimerAccess();
+    IDocumentTimerAccess *pTimerAccess = pRoot->GetFormat()->getIDocumentTimerAccess();
     pTimerAccess->BlockIdling();
 
     bool bChanged = false;
@@ -1628,30 +1628,30 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
     return bChanged;
 }
 
-bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
+bool SwLayAction::FormatContent( const SwPageFrm *pPage )
 {
-    const SwCntntFrm *pCntnt = pPage->ContainsCntnt();
+    const SwContentFrm *pContent = pPage->ContainsContent();
     const SwViewShell *pSh = pRoot->GetCurrShell();
     const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode();
 
-    while ( pCntnt && pPage->IsAnLower( pCntnt ) )
+    while ( pContent && pPage->IsAnLower( pContent ) )
     {
-        // If the Cntnt didn't change, we can use a few shortcuts.
-        const bool bFull = !pCntnt->IsValid() || pCntnt->IsCompletePaint() ||
-                           pCntnt->IsRetouche() || pCntnt->GetDrawObjs();
+        // If the Content didn't change, we can use a few shortcuts.
+        const bool bFull = !pContent->IsValid() || pContent->IsCompletePaint() ||
+                           pContent->IsRetouche() || pContent->GetDrawObjs();
         if ( bFull )
         {
             // We do this so we don't have to search later on.
-            const bool bNxtCnt = IsCalcLayout() && !pCntnt->GetFollow();
-            const SwCntntFrm *pCntntNext = bNxtCnt ? pCntnt->GetNextCntntFrm() : 0;
-            const SwCntntFrm *pCntntPrev = pCntnt->GetPrev() ? pCntnt->GetPrevCntntFrm() : 0;
+            const bool bNxtCnt = IsCalcLayout() && !pContent->GetFollow();
+            const SwContentFrm *pContentNext = bNxtCnt ? pContent->GetNextContentFrm() : 0;
+            const SwContentFrm *pContentPrev = pContent->GetPrev() ? pContent->GetPrevContentFrm() : 0;
 
-            const SwLayoutFrm*pOldUpper  = pCntnt->GetUpper();
-            const SwTabFrm *pTab = pCntnt->FindTabFrm();
-            const bool bInValid = !pCntnt->IsValid() || pCntnt->IsCompletePaint();
+            const SwLayoutFrm*pOldUpper  = pContent->GetUpper();
+            const SwTabFrm *pTab = pContent->FindTabFrm();
+            const bool bInValid = !pContent->IsValid() || pContent->IsCompletePaint();
             const bool bOldPaint = IsPaint();
             bPaint = bOldPaint && !(pTab && pTab == pOptTab);
-            _FormatCntnt( pCntnt, pPage );
+            _FormatContent( pContent, pPage );
             // #i26945# - reset <bPaint> before format objects
             bPaint = bOldPaint;
 
@@ -1662,21 +1662,21 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
             // #i23129#, #i36347# - pass correct page frame
             // to the object formatter.
             if ( !IsAgain() &&
-                 ( !IsInterrupt() || mbFormatCntntOnInterrupt ) &&
-                 pCntnt->IsTxtFrm() &&
-                 !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwCntntFrm*>(pCntnt)),
-                                                      *(pCntnt->FindPageFrm()), this ) )
+                 ( !IsInterrupt() || mbFormatContentOnInterrupt ) &&
+                 pContent->IsTextFrm() &&
+                 !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwContentFrm*>(pContent)),
+                                                      *(pContent->FindPageFrm()), this ) )
             {
                 return false;
             }
 
-            if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() )
+            if ( !pContent->GetValidLineNumFlag() && pContent->IsTextFrm() )
             {
-                const sal_uLong nAllLines = static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines();
-                const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCntnt))->RecalcAllLines();
+                const sal_uLong nAllLines = static_cast<const SwTextFrm*>(pContent)->GetAllLines();
+                const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pContent))->RecalcAllLines();
                 if ( IsPaintExtraData() && IsPaint() &&
-                     nAllLines != static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines() )
-                    pImp->GetShell()->AddPaintRect( pCntnt->Frm() );
+                     nAllLines != static_cast<const SwTextFrm*>(pContent)->GetAllLines() )
+                    pImp->GetShell()->AddPaintRect( pContent->Frm() );
             }
 
             if ( IsAgain() )
@@ -1691,16 +1691,16 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
             {
                 CheckIdleEnd();
                 // OD 14.04.2003 #106346# - consider interrupt formatting.
-                if ( ( IsInterrupt() && !mbFormatCntntOnInterrupt ) ||
+                if ( ( IsInterrupt() && !mbFormatContentOnInterrupt ) ||
                      ( !bBrowse && pPage->IsInvalidLayout() ) ||
                      // OD 07.05.2003 #109435# - consider interrupt formatting
-                     ( IS_FLYS && IS_INVAFLY && !mbFormatCntntOnInterrupt )
+                     ( IS_FLYS && IS_INVAFLY && !mbFormatContentOnInterrupt )
                    )
                     return false;
             }
-            if ( pOldUpper != pCntnt->GetUpper() )
+            if ( pOldUpper != pContent->GetUpper() )
             {
-                const sal_uInt16 nCurNum = pCntnt->FindPageFrm()->GetPhyPageNum();
+                const sal_uInt16 nCurNum = pContent->FindPageFrm()->GetPhyPageNum();
                 if (  nCurNum < pPage->GetPhyPageNum() )
                     nPreInvaPage = nCurNum;
 
@@ -1710,7 +1710,7 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
                 {
                     SetNextCycle( true );
                     // OD 07.05.2003 #109435# - consider interrupt formatting
-                    if ( !mbFormatCntntOnInterrupt )
+                    if ( !mbFormatContentOnInterrupt )
                     {
                         return false;
                     }
@@ -1720,26 +1720,26 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
             // the predecessor.
             // This way, we catch predecessors which are now responsible for
             // retouching, but the footers will be touched also.
-            bool bSetCntnt = true;
-            if ( pCntntPrev )
+            bool bSetContent = true;
+            if ( pContentPrev )
             {
-                if ( !pCntntPrev->IsValid() && pPage->IsAnLower( pCntntPrev ) )
-                    pPage->InvalidateCntnt();
-                if ( pOldUpper != pCntnt->GetUpper() &&
-                     pPage->GetPhyPageNum() < pCntnt->FindPageFrm()->GetPhyPageNum() )
+                if ( !pContentPrev->IsValid() && pPage->IsAnLower( pContentPrev ) )
+                    pPage->InvalidateContent();
+                if ( pOldUpper != pContent->GetUpper() &&
+                     pPage->GetPhyPageNum() < pContent->FindPageFrm()->GetPhyPageNum() )
                 {
-                    pCntnt = pCntntPrev;
-                    bSetCntnt = false;
+                    pContent = pContentPrev;
+                    bSetContent = false;
                 }
             }
-            if ( bSetCntnt )
+            if ( bSetContent )
             {
                 if ( bBrowse && !IsIdle() && !IsCalcLayout() && !IsComplete() &&
-                     pCntnt->Frm().Top() > pImp->GetShell()->VisArea().Bottom())
+                     pContent->Frm().Top() > pImp->GetShell()->VisArea().Bottom())
                 {
                     const long nBottom = pImp->GetShell()->VisArea().Bottom();
-                    const SwFrm *pTmp = lcl_FindFirstInvaCntnt( pPage,
-                                                            nBottom, pCntnt );
+                    const SwFrm *pTmp = lcl_FindFirstInvaContent( pPage,
+                                                            nBottom, pContent );
                     if ( !pTmp )
                     {
                         if ( (!(IS_FLYS && IS_INVAFLY) ||
@@ -1748,45 +1748,45 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
                                !lcl_FindFirstInvaLay( pPage, nBottom )))
                             SetBrowseActionStop( true );
                         // OD 14.04.2003 #106346# - consider interrupt formatting.
-                        if ( !mbFormatCntntOnInterrupt )
+                        if ( !mbFormatContentOnInterrupt )
                         {
                             return false;
                         }
                     }
                 }
-                pCntnt = bNxtCnt ? pCntntNext : pCntnt->GetNextCntntFrm();
+                pContent = bNxtCnt ? pContentNext : pContent->GetNextContentFrm();
             }
 
             RESCHEDULE;
         }
         else
         {
-            if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() )
+            if ( !pContent->GetValidLineNumFlag() && pContent->IsTextFrm() )
             {
-                const sal_uLong nAllLines = static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines();
-                const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCntnt))->RecalcAllLines();
+                const sal_uLong nAllLines = static_cast<const SwTextFrm*>(pContent)->GetAllLines();
+                const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pContent))->RecalcAllLines();
                 if ( IsPaintExtraData() && IsPaint() &&
-                     nAllLines != static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines() )
-                    pImp->GetShell()->AddPaintRect( pCntnt->Frm() );
+                     nAllLines != static_cast<const SwTextFrm*>(pContent)->GetAllLines() )
+                    pImp->GetShell()->AddPaintRect( pContent->Frm() );
             }
 
             // Do this if the Frm has been formatted before.
-            if ( pCntnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCntnt)->HasRepaint() &&
+            if ( pContent->IsTextFrm() && static_cast<const SwTextFrm*>(pContent)->HasRepaint() &&
                   IsPaint() )
-                PaintCntnt( pCntnt, pPage, pCntnt->Frm(), pCntnt->Frm().Bottom());
+                PaintContent( pContent, pPage, pContent->Frm(), pContent->Frm().Bottom());
             if ( IsIdle() )
             {
                 CheckIdleEnd();
                 // OD 14.04.2003 #106346# - consider interrupt formatting.
-                if ( IsInterrupt() && !mbFormatCntntOnInterrupt )
+                if ( IsInterrupt() && !mbFormatContentOnInterrupt )
                     return false;
             }
             if ( bBrowse && !IsIdle() && !IsCalcLayout() && !IsComplete() &&
-                 pCntnt->Frm().Top() > pImp->GetShell()->VisArea().Bottom())
+                 pContent->Frm().Top() > pImp->GetShell()->VisArea().Bottom())
             {
                 const long nBottom = pImp->GetShell()->VisArea().Bottom();
-                const SwFrm *pTmp = lcl_FindFirstInvaCntnt( pPage,
-                                                    nBottom, pCntnt );
+                const SwFrm *pTmp = lcl_FindFirstInvaContent( pPage,
+                                                    nBottom, pContent );
                 if ( !pTmp )
                 {
                     if ( (!(IS_FLYS && IS_INVAFLY) ||
@@ -1795,82 +1795,82 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
                             !lcl_FindFirstInvaLay( pPage, nBottom )))
                         SetBrowseActionStop( true );
                     // OD 14.04.2003 #106346# - consider interrupt formatting.
-                    if ( !mbFormatCntntOnInterrupt )
+                    if ( !mbFormatContentOnInterrupt )
                     {
                         return false;
                     }
                 }
             }
-            pCntnt = pCntnt->GetNextCntntFrm();
+            pContent = pContent->GetNextContentFrm();
         }
     }
     CheckWaitCrsr();
     // OD 14.04.2003 #106346# - consider interrupt formatting.
-    return !IsInterrupt() || mbFormatCntntOnInterrupt;
+    return !IsInterrupt() || mbFormatContentOnInterrupt;
 }
 
-void SwLayAction::_FormatCntnt( const SwCntntFrm *pCntnt,
+void SwLayAction::_FormatContent( const SwContentFrm *pContent,
                                 const SwPageFrm  *pPage )
 {
-    // We probably only ended up here because the Cntnt holds DrawObjects.
-    const bool bDrawObjsOnly = pCntnt->IsValid() && !pCntnt->IsCompletePaint() &&
-                         !pCntnt->IsRetouche();
-    SWRECTFN( pCntnt )
+    // We probably only ended up here because the Content holds DrawObjects.
+    const bool bDrawObjsOnly = pContent->IsValid() && !pContent->IsCompletePaint() &&
+                         !pContent->IsRetouche();
+    SWRECTFN( pContent )
     if ( !bDrawObjsOnly && IsPaint() )
     {
-        const SwRect aOldRect( pCntnt->UnionFrm() );
-        const long nOldBottom = (pCntnt->*fnRect->fnGetPrtBottom)();
-        pCntnt->OptCalc();
+        const SwRect aOldRect( pContent->UnionFrm() );
+        const long nOldBottom = (pContent->*fnRect->fnGetPrtBottom)();
+        pContent->OptCalc();
         if( IsAgain() )
             return;
-        if( (*fnRect->fnYDiff)( (pCntnt->Frm().*fnRect->fnGetBottom)(),
+        if( (*fnRect->fnYDiff)( (pContent->Frm().*fnRect->fnGetBottom)(),
                                 (aOldRect.*fnRect->fnGetBottom)() ) < 0 )
         {
-            pCntnt->SetRetouche();
+            pContent->SetRetouche();
         }
-        PaintCntnt( pCntnt, pCntnt->FindPageFrm(), aOldRect, nOldBottom);
+        PaintContent( pContent, pContent->FindPageFrm(), aOldRect, nOldBottom);
     }
     else
     {
-        if ( IsPaint() && pCntnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCntnt)->HasRepaint() )
-            PaintCntnt( pCntnt, pPage, pCntnt->Frm(),
-                        (pCntnt->Frm().*fnRect->fnGetBottom)() );
-        pCntnt->OptCalc();
+        if ( IsPaint() && pContent->IsTextFrm() && static_cast<const SwTextFrm*>(pContent)->HasRepaint() )
+            PaintContent( pContent, pPage, pContent->Frm(),
+                        (pContent->Frm().*fnRect->fnGetBottom)() );
+        pContent->OptCalc();
     }
 }
 
-/// Returns true if all Cntnts of the Fly have been processed completely.
+/// Returns true if all Contents of the Fly have been processed completely.
 /// Returns false if processing has been interrupted prematurely.
-bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly )
+bool SwLayAction::_FormatFlyContent( const SwFlyFrm *pFly )
 {
-    const SwCntntFrm *pCntnt = pFly->ContainsCntnt();
+    const SwContentFrm *pContent = pFly->ContainsContent();
 
-    while ( pCntnt )
+    while ( pContent )
     {
         // OD 2004-05-10 #i28701#
-        _FormatCntnt( pCntnt, pCntnt->FindPageFrm() );
+        _FormatContent( pContent, pContent->FindPageFrm() );
 
         // #i28701# - format floating screen objects
         // at content text frame
         // #i23129#, #i36347# - pass correct page frame
         // to the object formatter.
-        if ( pCntnt->IsTxtFrm() &&
+        if ( pContent->IsTextFrm() &&
              !SwObjectFormatter::FormatObjsAtFrm(
-                                            *(const_cast<SwCntntFrm*>(pCntnt)),
-                                            *(pCntnt->FindPageFrm()), this ) )
+                                            *(const_cast<SwContentFrm*>(pContent)),
+                                            *(pContent->FindPageFrm()), this ) )
         {
             // restart format with first content
-            pCntnt = pFly->ContainsCntnt();
+            pContent = pFly->ContainsContent();
             continue;
         }
 
-        if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() )
+        if ( !pContent->GetValidLineNumFlag() && pContent->IsTextFrm() )
         {
-            const sal_uLong nAllLines = static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines();
-            const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCntnt))->RecalcAllLines();
+            const sal_uLong nAllLines = static_cast<const SwTextFrm*>(pContent)->GetAllLines();
+            const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pContent))->RecalcAllLines();
             if ( IsPaintExtraData() && IsPaint() &&
-                 nAllLines != static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines() )
-                pImp->GetShell()->AddPaintRect( pCntnt->Frm() );
+                 nAllLines != static_cast<const SwTextFrm*>(pContent)->GetAllLines() )
+                pImp->GetShell()->AddPaintRect( pContent->Frm() );
         }
 
         if ( IsAgain() )
@@ -1881,51 +1881,51 @@ bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly )
         {
             CheckIdleEnd();
             // OD 14.04.2003 #106346# - consider interrupt formatting.
-            if ( IsInterrupt() && !mbFormatCntntOnInterrupt )
+            if ( IsInterrupt() && !mbFormatContentOnInterrupt )
                 return false;
         }
-        pCntnt = pCntnt->GetNextCntntFrm();
+        pContent = pContent->GetNextContentFrm();
     }
     CheckWaitCrsr();
     // OD 14.04.2003 #106346# - consider interrupt formatting.
-    return !(IsInterrupt() && !mbFormatCntntOnInterrupt);
+    return !(IsInterrupt() && !mbFormatContentOnInterrupt);
 }
 
-bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
+bool SwLayIdle::_DoIdleJob( const SwContentFrm *pCnt, IdleJobType eJob )
 {
-    OSL_ENSURE( pCnt->IsTxtFrm(), "NoTxt neighbour of Txt" );
+    OSL_ENSURE( pCnt->IsTextFrm(), "NoText neighbour of Text" );
     // robust against misuse by e.g. #i52542#
-    if( !pCnt->IsTxtFrm() )
+    if( !pCnt->IsTextFrm() )
         return false;
 
-    const SwTxtNode* pTxtNode = pCnt->GetNode()->GetTxtNode();
+    const SwTextNode* pTextNode = pCnt->GetNode()->GetTextNode();
 
     bool bProcess = false;
     switch ( eJob )
     {
         case ONLINE_SPELLING :
-            bProcess = pTxtNode->IsWrongDirty(); break;
+            bProcess = pTextNode->IsWrongDirty(); break;
         case AUTOCOMPLETE_WORDS :
-            bProcess = pTxtNode->IsAutoCompleteWordDirty(); break;
+            bProcess = pTextNode->IsAutoCompleteWordDirty(); break;
         case WORD_COUNT :
-            bProcess = pTxtNode->IsWordCountDirty(); break;
+            bProcess = pTextNode->IsWordCountDirty(); break;
         case SMART_TAGS :
-            bProcess = pTxtNode->IsSmartTagDirty(); break;
+            bProcess = pTextNode->IsSmartTagDirty(); break;
     }
 
     if( bProcess )
     {
         SwViewShell *pSh = pImp->GetShell();
-        if( COMPLETE_STRING == nTxtPos )
+        if( COMPLETE_STRING == nTextPos )
         {
-            --nTxtPos;
+            --nTextPos;
             if( pSh->ISA(SwCrsrShell) && !static_cast<SwCrsrShell*>(pSh)->IsTableMode() )
             {
                 SwPaM *pCrsr = static_cast<SwCrsrShell*>(pSh)->GetCrsr();
                 if( !pCrsr->HasMark() && !pCrsr->IsMultiSelection() )
                 {
-                    pCntntNode = pCrsr->GetCntntNode();
-                    nTxtPos =  pCrsr->GetPoint()->nContent.GetIndex();
+                    pContentNode = pCrsr->GetContentNode();
+                    nTextPos =  pCrsr->GetPoint()->nContent.GetIndex();
                 }
             }
         }
@@ -1934,8 +1934,8 @@ bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
         {
             case ONLINE_SPELLING :
             {
-                SwRect aRepaint( const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCnt))->_AutoSpell( pCntntNode, nTxtPos ) );
-                bPageValid = bPageValid && !pTxtNode->IsWrongDirty();
+                SwRect aRepaint( const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pCnt))->_AutoSpell( pContentNode, nTextPos ) );
+                bPageValid = bPageValid && !pTextNode->IsWrongDirty();
                 if( !bPageValid )
                     bAllValid = false;
                 if ( aRepaint.HasArea() )
@@ -1945,15 +1945,15 @@ bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
                 break;
             }
             case AUTOCOMPLETE_WORDS :
-                const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCnt))->CollectAutoCmplWrds( pCntntNode, nTxtPos );
+                const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pCnt))->CollectAutoCmplWrds( pContentNode, nTextPos );
                 if ( Application::AnyInput( VCL_INPUT_ANY ) )
                     return true;
                 break;
             case WORD_COUNT :
             {
-                const sal_Int32 nEnd = pTxtNode->GetTxt().getLength();
+                const sal_Int32 nEnd = pTextNode->GetText().getLength();
                 SwDocStat aStat;
-                pTxtNode->CountWords( aStat, 0, nEnd );
+                pTextNode->CountWords( aStat, 0, nEnd );
                 if ( Application::AnyInput( VCL_INPUT_ANY ) )
                     return true;
                 break;
@@ -1961,8 +1961,8 @@ bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
             case SMART_TAGS :
             {
                 try {
-                    const SwRect aRepaint( const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCnt))->SmartTagScan( pCntntNode, nTxtPos ) );
-                    bPageValid = bPageValid && !pTxtNode->IsSmartTagDirty();
+                    const SwRect aRepaint( const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pCnt))->SmartTagScan( pContentNode, nTextPos ) );
+                    bPageValid = bPageValid && !pTextNode->IsSmartTagDirty();
                     if( !bPageValid )
                         bAllValid = false;
                     if ( aRepaint.HasArea() )
@@ -1990,15 +1990,15 @@ bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
                 SwFlyFrm* pFly = static_cast<SwFlyFrm*>(pObj);
                 if ( pFly->IsFlyInCntFrm() )
                 {
-                    const SwCntntFrm *pC = pFly->ContainsCntnt();
+                    const SwContentFrm *pC = pFly->ContainsContent();
                     while( pC )
                     {
-                        if ( pC->IsTxtFrm() )
+                        if ( pC->IsTextFrm() )
                         {
                             if ( _DoIdleJob( pC, eJob ) )
                                 return true;
                         }
-                        pC = pC->GetNextCntntFrm();
+                        pC = pC->GetNextContentFrm();
                     }
                 }
             }
@@ -2045,18 +2045,18 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly )
     else
         pPage = static_cast<SwPageFrm*>(pRoot->Lower());
 
-    pCntntNode = NULL;
-    nTxtPos = COMPLETE_STRING;
+    pContentNode = NULL;
+    nTextPos = COMPLETE_STRING;
 
     while ( pPage )
     {
         bPageValid = true;
-        const SwCntntFrm *pCnt = pPage->ContainsCntnt();
+        const SwContentFrm *pCnt = pPage->ContainsContent();
         while( pCnt && pPage->IsAnLower( pCnt ) )
         {
             if ( _DoIdleJob( pCnt, eJob ) )
                 return true;
-            pCnt = pCnt->GetNextCntntFrm();
+            pCnt = pCnt->GetNextContentFrm();
         }
         if ( pPage->GetSortedObjs() )
         {
@@ -2067,15 +2067,15 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly )
                 if ( pObj->ISA(SwFlyFrm) )
                 {
                     const SwFlyFrm *pFly = static_cast<const SwFlyFrm*>(pObj);
-                    const SwCntntFrm *pC = pFly->ContainsCntnt();
+                    const SwContentFrm *pC = pFly->ContainsContent();
                     while( pC )
                     {
-                        if ( pC->IsTxtFrm() )
+                        if ( pC->IsTextFrm() )
                         {
                             if ( _DoIdleJob( pC, eJob ) )
                                 return true;
                         }
-                        pC = pC->GetNextCntntFrm();
+                        pC = pC->GetNextContentFrm();
                     }
                 }
             }
@@ -2282,8 +2282,8 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewShellImp *pI ) :
         SwPageFrm *pPg = static_cast<SwPageFrm*>(pRoot->Lower());
         do
         {
-            bInValid = pPg->IsInvalidCntnt()    || pPg->IsInvalidLayout() ||
-                       pPg->IsInvalidFlyCntnt() || pPg->IsInvalidFlyLayout() ||
+            bInValid = pPg->IsInvalidContent()    || pPg->IsInvalidLayout() ||
+                       pPg->IsInvalidFlyContent() || pPg->IsInvalidFlyLayout() ||
                        pPg->IsInvalidFlyInCnt() ||
                        (bSpell && pPg->IsInvalidSpelling()) ||
                        (bACmplWrd && pPg->IsInvalidAutoCompleteWords()) ||
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index c91f22c81872..fed24be3feef 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -182,20 +182,20 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
 
                 if( pTmp ) // any content
                 {
-                    if( pTmp->IsTxtFrm() )
+                    if( pTmp->IsTextFrm() )
                     {
-                        sal_uLong nNdIdx = static_cast<SwTxtFrm*>(pTmp)->GetNode()->GetIndex();
+                        sal_uLong nNdIdx = static_cast<SwTextFrm*>(pTmp)->GetNode()->GetIndex();
                         if( nNdIdx > nStartOfContent )
                         {
                             /*  Open Paragraph Record */
                             aIo.OpenRec( SW_LAYCACHE_IO_REC_PARA );
-                            bool bFollow = static_cast<SwTxtFrm*>(pTmp)->IsFollow();
+                            bool bFollow = static_cast<SwTextFrm*>(pTmp)->IsFollow();
                             aIo.OpenFlagRec( bFollow ? 0x01 : 0x00,
                                             bFollow ? 8 : 4 );
                             nNdIdx -= nStartOfContent;
                             aIo.GetStream().WriteUInt32( nNdIdx );
                             if( bFollow )
-                                aIo.GetStream().WriteUInt32( static_cast<SwTxtFrm*>(pTmp)->GetOfst() );
+                                aIo.GetStream().WriteUInt32( static_cast<SwTextFrm*>(pTmp)->GetOfst() );
                             aIo.CloseFlagRec();
                             /*  Close Paragraph Record */
                             aIo.CloseRec( SW_LAYCACHE_IO_REC_PARA );
@@ -340,17 +340,17 @@ bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
                 pTmp = static_cast<const SwSectionFrm*>(pTmp)->ContainsAny();
             if( pTmp )
             {
-                if( pTmp->IsTxtFrm() )
+                if( pTmp->IsTextFrm() )
                 {
-                    sal_uLong nNdIdx = static_cast<const SwTxtFrm*>(pTmp)->GetNode()->GetIndex();
+                    sal_uLong nNdIdx = static_cast<const SwTextFrm*>(pTmp)->GetNode()->GetIndex();
                     if( nNdIdx > nStartOfContent )
                     {
-                        bool bFollow = static_cast<const SwTxtFrm*>(pTmp)->IsFollow();
+                        bool bFollow = static_cast<const SwTextFrm*>(pTmp)->IsFollow();
                         nNdIdx -= nStartOfContent;
                         if( pImpl->GetBreakIndex( nIndex ) != nNdIdx ||
                             SW_LAYCACHE_IO_REC_PARA !=
                             pImpl->GetBreakType( nIndex ) ||
-                            ( bFollow ? static_cast<const SwTxtFrm*>(pTmp)->GetOfst()
+                            ( bFollow ? static_cast<const SwTextFrm*>(pTmp)->GetOfst()
                               : COMPLETE_STRING ) != pImpl->GetBreakOfst( nIndex ) )
                         {
                             return false;
@@ -452,7 +452,7 @@ SwActualSection::SwActualSection( SwActualSection *pUp,
 {
     if ( !pSectNode )
     {
-        const SwNodeIndex *pIndex = pSect->GetFmt()->GetCntnt().GetCntntIdx();
+        const SwNodeIndex *pIndex = pSect->GetFormat()->GetContent().GetContentIdx();
         pSectNode = pIndex->GetNode().FindSectionNode();
     }
 }
@@ -538,7 +538,7 @@ sal_uLong SwLayHelper::CalcPageCount()
             sal_uLong nTmp = pDoc->GetNodes().GetEndOfContent().GetIndex() -
                         pDoc->GetNodes().GetEndOfExtras().GetIndex();
             //Tables have a little overhead..
-            nTmp -= pDoc->GetTblFrmFmts()->size() * 25;
+            nTmp -= pDoc->GetTableFrameFormats()->size() * 25;
             //Fly frames, too ..
             nTmp -= (pDoc->GetNodes().GetEndOfAutotext().GetIndex() -
                        pDoc->GetNodes().GetEndOfInserts().GetIndex()) / 3 * 5;
@@ -582,8 +582,8 @@ bool SwLayHelper::CheckInsertPage()
 {
     bool bEnd = 0 == rpPage->GetNext();
     const SwAttrSet* pAttr = rpFrm->GetAttrSet();
-    const SvxFmtBreakItem& rBrk = pAttr->GetBreak();
-    const SwFmtPageDesc& rDesc = pAttr->GetPageDesc();
+    const SvxFormatBreakItem& rBrk = pAttr->GetBreak();
+    const SwFormatPageDesc& rDesc = pAttr->GetPageDesc();
     // #118195# Do not evaluate page description if frame
     // is a follow frame!
     const SwPageDesc* pDesc = rpFrm->IsFlowFrm() &&
@@ -605,7 +605,7 @@ bool SwLayHelper::CheckInsertPage()
         {
             pDesc = rpPage->GetPageDesc()->GetFollow();
 
-            SwFmtPageDesc aFollowDesc( pDesc );
+            SwFormatPageDesc aFollowDesc( pDesc );
             oPgNum = aFollowDesc.GetNumOffset();
             if ( oPgNum )
                 static_cast<SwRootFrm*>(rpPage->GetUpper())->SetVirtPageNum(true);
@@ -758,9 +758,9 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
                 {
                     bool bSplit = false;
                     sal_uInt16 nRepeat( 0 );
-                    if( !bLongTab && rpFrm->IsTxtFrm() &&
+                    if( !bLongTab && rpFrm->IsTextFrm() &&
                         SW_LAYCACHE_IO_REC_PARA == nType &&
-                        nOfst < static_cast<SwTxtFrm*>(rpFrm)->GetTxtNode()->GetTxt().getLength())
+                        nOfst < static_cast<SwTextFrm*>(rpFrm)->GetTextNode()->GetText().getLength())
                         bSplit = true;
                     else if( rpFrm->IsTabFrm() && nRowCount < nOfst &&
                              ( bLongTab || SW_LAYCACHE_IO_REC_TABLE == nType ) )
@@ -827,12 +827,12 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
                         }
                         else
                         {
-                            SwTxtFrm *const pNew = static_cast<SwTxtFrm*>(
-                                static_cast<SwTxtFrm*>(rpFrm)
-                                    ->GetTxtNode()->MakeFrm(rpFrm));
+                            SwTextFrm *const pNew = static_cast<SwTextFrm*>(
+                                static_cast<SwTextFrm*>(rpFrm)
+                                    ->GetTextNode()->MakeFrm(rpFrm));
                             pNew->ManipOfst( nOfst );
-                            pNew->SetFollow( static_cast<SwTxtFrm*>(rpFrm)->GetFollow() );
-                            static_cast<SwTxtFrm*>(rpFrm)->SetFollow( pNew );
+                            pNew->SetFollow( static_cast<SwTextFrm*>(rpFrm)->GetFollow() );
+                            static_cast<SwTextFrm*>(rpFrm)->SetFollow( pNew );
                             rpFrm = pNew;
                         }
                     }
@@ -843,7 +843,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
             if( CheckInsertPage() )
             {
                 _CheckFlyCache( pLastPage );
-                if( rpPrv && rpPrv->IsTxtFrm() && !rpPrv->GetValidSizeFlag() )
+                if( rpPrv && rpPrv->IsTextFrm() && !rpPrv->GetValidSizeFlag() )
                     rpPrv->Frm().Height( rpPrv->GetUpper()->Prt().Height() );
 
                 bRet = true;
@@ -856,7 +856,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
                     //directly put it somewhere else
                     SwSectionFrm *pSct;
                     bool bInit = false;
-                    if ( !rpActualSection->GetSectionFrm()->ContainsCntnt())
+                    if ( !rpActualSection->GetSectionFrm()->ContainsContent())
                     {
                         pSct = rpActualSection->GetSectionFrm();
                         pSct->RemoveFromLayout();
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index ec265342f896..54f95feba332 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -47,13 +47,13 @@ class SwEndnoter
 {
     SwLayouter* pMaster;
     SwSectionFrm* pSect;
-    SwFtnFrms*    pEndArr;
+    SwFootnoteFrms*    pEndArr;
 public:
     SwEndnoter( SwLayouter* pLay )
         : pMaster( pLay ), pSect( NULL ), pEndArr( NULL ) {}
     ~SwEndnoter() { delete pEndArr; }
     void CollectEndnotes( SwSectionFrm* pSct );
-    void CollectEndnote( SwFtnFrm* pFtn );
+    void CollectEndnote( SwFootnoteFrm* pFootnote );
     const SwSectionFrm* GetSect() const { return pSect; }
     void InsertEndnotes();
     bool HasEndnotes() const { return pEndArr && !pEndArr->empty(); }
@@ -69,15 +69,15 @@ void SwEndnoter::CollectEndnotes( SwSectionFrm* pSct )
     pSect->CollectEndnotes( pMaster );
 }
 
-void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn )
+void SwEndnoter::CollectEndnote( SwFootnoteFrm* pFootnote )
 {
-    if( pEndArr && pEndArr->end() != std::find( pEndArr->begin(), pEndArr->end(), pFtn ) )
+    if( pEndArr && pEndArr->end() != std::find( pEndArr->begin(), pEndArr->end(), pFootnote ) )
         return;
 
-    if( pFtn->GetUpper() )
+    if( pFootnote->GetUpper() )
     {
-        // pFtn is the master, he incorporates its follows
-        SwFtnFrm *pNxt = pFtn->GetFollow();
+        // pFootnote is the master, he incorporates its follows
+        SwFootnoteFrm *pNxt = pFootnote->GetFollow();
         while ( pNxt )
         {
             SwFrm *pCnt = pNxt->ContainsAny();
@@ -86,7 +86,7 @@ void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn )
                 do
                 {   SwFrm *pNxtCnt = pCnt->GetNext();
                     pCnt->Cut();
-                    pCnt->Paste( pFtn );
+                    pCnt->Paste( pFootnote );
                     pCnt = pNxtCnt;
                 } while ( pCnt );
             }
@@ -96,27 +96,27 @@ void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn )
                 pNxt->Cut();
                 SwFrm::DestroyFrm(pNxt);
             }
-            pNxt = pFtn->GetFollow();
+            pNxt = pFootnote->GetFollow();
         }
-        if( pFtn->GetMaster() )
+        if( pFootnote->GetMaster() )
             return;
-        pFtn->Cut();
+        pFootnote->Cut();
     }
     else if( pEndArr )
     {
         for ( size_t i = 0; i < pEndArr->size(); ++i )
         {
-            SwFtnFrm *pEndFtn = (*pEndArr)[i];
-            if( pEndFtn->GetAttr() == pFtn->GetAttr() )
+            SwFootnoteFrm *pEndFootnote = (*pEndArr)[i];
+            if( pEndFootnote->GetAttr() == pFootnote->GetAttr() )
             {
-                SwFrm::DestroyFrm(pFtn);
+                SwFrm::DestroyFrm(pFootnote);
                 return;
             }
         }
     }
     if( !pEndArr )
-        pEndArr = new SwFtnFrms;  // deleted from the SwLayouter
-    pEndArr->push_back( pFtn );
+        pEndArr = new SwFootnoteFrms;  // deleted from the SwLayouter
+    pEndArr->push_back( pFootnote );
 }
 
 void SwEndnoter::InsertEndnotes()
@@ -128,12 +128,12 @@ void SwEndnoter::InsertEndnotes()
         pSect = NULL;
         return;
     }
-    OSL_ENSURE( pSect->Lower() && pSect->Lower()->IsFtnBossFrm(),
+    OSL_ENSURE( pSect->Lower() && pSect->Lower()->IsFootnoteBossFrm(),
             "InsertEndnotes: Where's my column?" );
-    SwFrm* pRef = pSect->FindLastCntnt( FINDMODE_MYLAST );
-    SwFtnBossFrm *pBoss = pRef ? pRef->FindFtnBossFrm()
-                               : static_cast<SwFtnBossFrm*>(pSect->Lower());
-    pBoss->_MoveFtns( *pEndArr );
+    SwFrm* pRef = pSect->FindLastContent( FINDMODE_MYLAST );
+    SwFootnoteBossFrm *pBoss = pRef ? pRef->FindFootnoteBossFrm()
+                               : static_cast<SwFootnoteBossFrm*>(pSect->Lower());
+    pBoss->_MoveFootnotes( *pEndArr );
     delete pEndArr;
     pEndArr = NULL;
     pSect = NULL;
@@ -236,9 +236,9 @@ bool SwLayouter::HasEndnotes() const
     return mpEndnoter->HasEndnotes();
 }
 
-void SwLayouter::CollectEndnote( SwFtnFrm* pFtn )
+void SwLayouter::CollectEndnote( SwFootnoteFrm* pFootnote )
 {
-    mpEndnoter->CollectEndnote( pFtn );
+    mpEndnoter->CollectEndnote( pFootnote );
 }
 
 void SwLayouter::InsertEndnotes( SwSectionFrm* pSect )
@@ -254,7 +254,7 @@ void SwLayouter::LoopControl( SwPageFrm* pPage, sal_uInt8 )
     mpLooping->Control( pPage );
 }
 
-void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm )
+void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTextFrm& rFrm )
 {
     if ( mpLooping && mpLooping->IsLoopingLouieLight() )
     {
@@ -287,7 +287,7 @@ void SwLayouter::CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect )
     pDoc->getIDocumentLayoutAccess().GetLayouter()->_CollectEndnotes( pSect );
 }
 
-bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn )
+bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFootnoteFrm* pFootnote )
 {
     if( !pDoc->getIDocumentLayoutAccess().GetLayouter() )
         return false;
@@ -296,8 +296,8 @@ bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn )
         ( pLayouter->mpEndnoter->GetSect()->IsAnFollow( pSect ) ||
           pSect->IsAnFollow( pLayouter->mpEndnoter->GetSect() ) ) )
     {
-        if( pFtn )
-            pLayouter->CollectEndnote( pFtn );
+        if( pFootnote )
+            pLayouter->CollectEndnote( pFootnote );
         return true;
     }
     return false;
@@ -325,7 +325,7 @@ void SwLayouter::ClearMovedFwdFrms( const SwDoc& _rDoc )
 }
 
 void SwLayouter::InsertMovedFwdFrm( const SwDoc& _rDoc,
-                                    const SwTxtFrm& _rMovedFwdFrmByObjPos,
+                                    const SwTextFrm& _rMovedFwdFrmByObjPos,
                                     const sal_uInt32 _nToPageNum )
 {
     if ( !_rDoc.getIDocumentLayoutAccess().GetLayouter() )
@@ -345,17 +345,17 @@ void SwLayouter::InsertMovedFwdFrm( const SwDoc& _rDoc,
 
 // #i40155#
 void SwLayouter::RemoveMovedFwdFrm( const SwDoc& _rDoc,
-                                    const SwTxtFrm& _rTxtFrm )
+                                    const SwTextFrm& _rTextFrm )
 {
     sal_uInt32 nDummy;
-    if ( SwLayouter::FrmMovedFwdByObjPos( _rDoc, _rTxtFrm, nDummy ) )
+    if ( SwLayouter::FrmMovedFwdByObjPos( _rDoc, _rTextFrm, nDummy ) )
     {
-        _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpMovedFwdFrms->Remove( _rTxtFrm );
+        _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpMovedFwdFrms->Remove( _rTextFrm );
     }
 }
 
 bool SwLayouter::FrmMovedFwdByObjPos( const SwDoc& _rDoc,
-                                      const SwTxtFrm& _rTxtFrm,
+                                      const SwTextFrm& _rTextFrm,
                                       sal_uInt32& _ornToPageNum )
 {
     if ( !_rDoc.getIDocumentLayoutAccess().GetLayouter() )
@@ -371,7 +371,7 @@ bool SwLayouter::FrmMovedFwdByObjPos( const SwDoc& _rDoc,
     else
     {
         return _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpMovedFwdFrms->
-                                FrmMovedFwdByObjPos( _rTxtFrm, _ornToPageNum );
+                                FrmMovedFwdByObjPos( _rTextFrm, _ornToPageNum );
     }
 }
 
@@ -421,14 +421,14 @@ void SwLayouter::InsertObjForTmpConsiderWrapInfluence(
     _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpObjsTmpConsiderWrapInfl->Insert( _rAnchoredObj );
 }
 
-void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm& rTxtFrm )
+void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTextFrm& rTextFrm )
 {
     if ( bCondition )
     {
-        const SwDoc& rDoc = *rTxtFrm.GetAttrSet()->GetDoc();
+        const SwDoc& rDoc = *rTextFrm.GetAttrSet()->GetDoc();
         if ( rDoc.getIDocumentLayoutAccess().GetLayouter() )
         {
-            const_cast<SwDoc&>(rDoc).getIDocumentLayoutAccess().GetLayouter()->LoopingLouieLight( rDoc, rTxtFrm );
+            const_cast<SwDoc&>(rDoc).getIDocumentLayoutAccess().GetLayouter()->LoopingLouieLight( rDoc, rTextFrm );
         }
     }
 }
diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
index 60774d71f2b3..233c37906f64 100644
--- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
+++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
@@ -32,26 +32,26 @@ SwMovedFwdFrmsByObjPos::~SwMovedFwdFrmsByObjPos()
     Clear();
 }
 
-void SwMovedFwdFrmsByObjPos::Insert( const SwTxtFrm& _rMovedFwdFrmByObjPos,
+void SwMovedFwdFrmsByObjPos::Insert( const SwTextFrm& _rMovedFwdFrmByObjPos,
                                      const sal_uInt32 _nToPageNum )
 {
     if ( maMovedFwdFrms.end() ==
-         maMovedFwdFrms.find( _rMovedFwdFrmByObjPos.GetTxtNode() ) )
+         maMovedFwdFrms.find( _rMovedFwdFrmByObjPos.GetTextNode() ) )
     {
-        const NodeMapEntry aEntry( _rMovedFwdFrmByObjPos.GetTxtNode(), _nToPageNum );
+        const NodeMapEntry aEntry( _rMovedFwdFrmByObjPos.GetTextNode(), _nToPageNum );
         maMovedFwdFrms.insert( aEntry );
     }
 }
 
-void SwMovedFwdFrmsByObjPos::Remove( const SwTxtFrm& _rTxtFrm )
+void SwMovedFwdFrmsByObjPos::Remove( const SwTextFrm& _rTextFrm )
 {
-    maMovedFwdFrms.erase( _rTxtFrm.GetTxtNode() );
+    maMovedFwdFrms.erase( _rTextFrm.GetTextNode() );
 }
 
-bool SwMovedFwdFrmsByObjPos::FrmMovedFwdByObjPos( const SwTxtFrm& _rTxtFrm,
+bool SwMovedFwdFrmsByObjPos::FrmMovedFwdByObjPos( const SwTextFrm& _rTextFrm,
                                                   sal_uInt32& _ornToPageNum ) const
 {
-    NodeMapIter aIter = maMovedFwdFrms.find( _rTxtFrm.GetTxtNode() );
+    NodeMapIter aIter = maMovedFwdFrms.find( _rTextFrm.GetTextNode() );
     if ( maMovedFwdFrms.end() != aIter )
     {
         _ornToPageNum = (*aIter).second;
@@ -74,12 +74,12 @@ bool SwMovedFwdFrmsByObjPos::DoesRowContainMovedFwdFrm( const SwRowFrm& _rRowFrm
         const NodeMapEntry& rEntry = *(aIter);
         if ( rEntry.second >= nPageNumOfRow )
         {
-            SwIterator<SwTxtFrm,SwTxtNode> aFrmIter( *rEntry.first );
-            for( SwTxtFrm* pTxtFrm = aFrmIter.First(); pTxtFrm; pTxtFrm = (SwTxtFrm*)aFrmIter.Next() )
+            SwIterator<SwTextFrm,SwTextNode> aFrmIter( *rEntry.first );
+            for( SwTextFrm* pTextFrm = aFrmIter.First(); pTextFrm; pTextFrm = (SwTextFrm*)aFrmIter.Next() )
             {
                 // #115759# - assure that found text frame
                 // is the first one.
-                if ( _rRowFrm.IsAnLower( pTxtFrm ) && !pTxtFrm->GetIndPrev() )
+                if ( _rRowFrm.IsAnLower( pTextFrm ) && !pTextFrm->GetIndPrev() )
                 {
                     bDoesRowContainMovedFwdFrm = true;
                     break;
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index c0be33a222ae..e71ea11ee688 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -341,7 +341,7 @@ SwRectFn fnRectVL2R = &aVerticalRightToLeft;
 sal_uInt32 SwFrm::mnLastFrmId=0;
 
 TYPEINIT1(SwFrm,SwClient);      //rtti for SwFrm
-TYPEINIT1(SwCntntFrm,SwFrm);    //rtti for SwCntntFrm
+TYPEINIT1(SwContentFrm,SwFrm);    //rtti for SwContentFrm
 
 void _FrmInit()
 {
@@ -446,13 +446,13 @@ void InitCurrShells( SwRootFrm *pRoot )
 }
 
 /*
-|*      The RootFrm requests an own FrmFmt from the document, which it is
-|*      going to delete again in the dtor. The own FrmFmt is derived from
-|*      the passed FrmFmt.
+|*      The RootFrm requests an own FrameFormat from the document, which it is
+|*      going to delete again in the dtor. The own FrameFormat is derived from
+|*      the passed FrameFormat.
 |*/
-SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, SwViewShell * pSh ) :
-    SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt(
-        OUString("Root"), pFmt ), 0 ),
+SwRootFrm::SwRootFrm( SwFrameFormat *pFormat, SwViewShell * pSh ) :
+    SwLayoutFrm( pFormat->GetDoc()->MakeFrameFormat(
+        OUString("Root"), pFormat ), 0 ),
     maPagesArea(),
     mnViewWidth( -1 ),
     mnColumns( 0 ),
@@ -483,20 +483,20 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, SwViewShell * pSh ) :
     setRootFrm( this );
 }
 
-void SwRootFrm::Init( SwFrmFmt* pFmt )
+void SwRootFrm::Init( SwFrameFormat* pFormat )
 {
     InitCurrShells( this );
 
-    IDocumentTimerAccess *pTimerAccess = pFmt->getIDocumentTimerAccess();
-    IDocumentLayoutAccess *pLayoutAccess = pFmt->getIDocumentLayoutAccess();
-    IDocumentFieldsAccess *pFieldsAccess = pFmt->getIDocumentFieldsAccess();
-    const IDocumentSettingAccess *pSettingAccess = pFmt->getIDocumentSettingAccess();
+    IDocumentTimerAccess *pTimerAccess = pFormat->getIDocumentTimerAccess();
+    IDocumentLayoutAccess *pLayoutAccess = pFormat->getIDocumentLayoutAccess();
+    IDocumentFieldsAccess *pFieldsAccess = pFormat->getIDocumentFieldsAccess();
+    const IDocumentSettingAccess *pSettingAccess = pFormat->getIDocumentSettingAccess();
     pTimerAccess->StopIdling();
     // For creating the Flys by MakeFrms()
     pLayoutAccess->SetCurrentViewShell( this->GetCurrShell() );
     mbCallbackActionEnabled = false; // needs to be set to true before leaving!
 
-    SwDrawModel* pMd = pFmt->getIDocumentDrawModelAccess()->GetDrawModel();
+    SwDrawModel* pMd = pFormat->getIDocumentDrawModelAccess()->GetDrawModel();
     if ( pMd )
     {
         // Disable "multiple layout"
@@ -505,23 +505,23 @@ void SwRootFrm::Init( SwFrmFmt* pFmt )
         mpDrawPage->SetSize( Frm().SSize() );
     }
 
-    // Initialize the layout: create pages, link content with Cntnt etc.
+    // Initialize the layout: create pages, link content with Content etc.
     // First, initialize some stuff, then get hold of the first
     // node (which will be needed for the PageDesc).
 
-    SwDoc* pDoc = pFmt->GetDoc();
+    SwDoc* pDoc = pFormat->GetDoc();
     SwNodeIndex aIndex( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
-    SwCntntNode *pNode = pDoc->GetNodes().GoNextSection( &aIndex, true, false );
+    SwContentNode *pNode = pDoc->GetNodes().GoNextSection( &aIndex, true, false );
     // #123067# pNode = 0 can really happen
-    SwTableNode *pTblNd= pNode ? pNode->FindTableNode() : 0;
+    SwTableNode *pTableNd= pNode ? pNode->FindTableNode() : 0;
 
-    // Get hold of PageDesc (either via FrmFmt of the first node or the initial one).
+    // Get hold of PageDesc (either via FrameFormat of the first node or the initial one).
     SwPageDesc *pDesc = 0;
     ::boost::optional<sal_uInt16> oPgNum;
 
-    if ( pTblNd )
+    if ( pTableNd )
     {
-        const SwFmtPageDesc &rDesc = pTblNd->GetTable().GetFrmFmt()->GetPageDesc();
+        const SwFormatPageDesc &rDesc = pTableNd->GetTable().GetFrameFormat()->GetPageDesc();
         pDesc = const_cast<SwPageDesc*>(rDesc.GetPageDesc());
         //#19104# respect the page number offset!!
         oPgNum = rDesc.GetNumOffset();
@@ -530,7 +530,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt )
     }
     else if ( pNode )
     {
-        const SwFmtPageDesc &rDesc = pNode->GetSwAttrSet().GetPageDesc();
+        const SwFormatPageDesc &rDesc = pNode->GetSwAttrSet().GetPageDesc();
         pDesc = const_cast<SwPageDesc*>(rDesc.GetPageDesc());
         //#19104# respect the page number offset!!
         oPgNum = rDesc.GetNumOffset();
@@ -557,12 +557,12 @@ void SwRootFrm::Init( SwFrmFmt* pFmt )
     //Remove masters that haven't been replaced yet from the list.
     RemoveMasterObjs( mpDrawPage );
     if( pSettingAccess->get(DocumentSettingId::GLOBAL_DOCUMENT) )
-        pFieldsAccess->UpdateRefFlds( NULL );
+        pFieldsAccess->UpdateRefFields( NULL );
     //b6433357: Update page fields after loading
-    if ( !mpCurrShell || !mpCurrShell->Imp()->IsUpdateExpFlds() )
+    if ( !mpCurrShell || !mpCurrShell->Imp()->IsUpdateExpFields() )
     {
-        SwDocPosUpdate aMsgHnt( pPage->Frm().Top() );
-        pFieldsAccess->UpdatePageFlds( &aMsgHnt );
+        SwDocPosUpdate aMsgHint( pPage->Frm().Top() );
+        pFieldsAccess->UpdatePageFields( &aMsgHint );
     }
 
     pTimerAccess->StartIdling();
@@ -582,19 +582,19 @@ void SwRootFrm::DestroyImpl()
     // document/layout split SwDoc and SwRootFrm were essentially one object
     // and magically/uncleanly worked around their common destruction by call
     // to SwDoc::IsInDtor() -- even from the layout. As of now destuction of
-    // the layout proceeds forward through the frames. Since SwTxtFtn::DelFrms
+    // the layout proceeds forward through the frames. Since SwTextFootnote::DelFrms
     // also searches backwards to find the master of footnotes, they must be
     // considered to be owned by the SwRootFrm and also be destroyed here,
     // before tearing down the (now footnote free) rest of the layout.
-    RemoveFtns(0, false, true);
+    RemoveFootnotes(0, false, true);
 
     if(pBlink)
         pBlink->FrmDelete( this );
-    SwFrmFmt *pRegisteredInNonConst = static_cast<SwFrmFmt*>(GetRegisteredInNonConst());
+    SwFrameFormat *pRegisteredInNonConst = static_cast<SwFrameFormat*>(GetRegisteredInNonConst());
     if ( pRegisteredInNonConst )
     {
         SwDoc *pDoc = pRegisteredInNonConst->GetDoc();
-        pDoc->DelFrmFmt( pRegisteredInNonConst );
+        pDoc->DelFrameFormat( pRegisteredInNonConst );
         pDoc->GetDocumentLayoutManager().ClearSwLayouterEntries();
     }
     delete mpDestroy;
@@ -649,9 +649,9 @@ void SwRootFrm::AllAddPaintRect() const
     GetCurrShell()->AddPaintRect( this->Frm() );
 }
 
-void SwRootFrm::AllRemoveFtns()
+void SwRootFrm::AllRemoveFootnotes()
 {
-    RemoveFtns();
+    RemoveFootnotes();
 }
 
 void SwRootFrm::AllInvalidateSmartTagsOrSpelling(bool bSmartTags) const
diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx
index 55861f365304..24afe55f9adb 100644
--- a/sw/source/core/layout/objectformatter.cxx
+++ b/sw/source/core/layout/objectformatter.cxx
@@ -76,7 +76,7 @@ class SwPageNumAndTypeOfAnchors
                 pNewEntry->mnPageNumOfAnchor = 0;
             }
             // --> #i26945# - collect type of anchor
-            SwTxtFrm* pAnchorCharFrm = _rAnchoredObj.FindAnchorCharFrm();
+            SwTextFrm* pAnchorCharFrm = _rAnchoredObj.FindAnchorCharFrm();
             if ( pAnchorCharFrm )
             {
                 pNewEntry->mbAnchoredAtMaster = !pAnchorCharFrm->IsFollow();
@@ -136,7 +136,7 @@ SwObjectFormatter::SwObjectFormatter( const SwPageFrm& _rPageFrm,
                                       const bool _bCollectPgNumOfAnchors )
     : mrPageFrm( _rPageFrm ),
       mbFormatOnlyAsCharAnchored( false ),
-      mbConsiderWrapOnObjPos( _rPageFrm.GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ),
+      mbConsiderWrapOnObjPos( _rPageFrm.GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ),
       mpLayAction( _pLayAction ),
       // --> #i26945#
       mpPgNumAndTypeOfAnchors( _bCollectPgNumOfAnchors ? new SwPageNumAndTypeOfAnchors() : 0L )
@@ -154,10 +154,10 @@ SwObjectFormatter* SwObjectFormatter::CreateObjFormatter(
                                                       SwLayAction* _pLayAction )
 {
     SwObjectFormatter* pObjFormatter = 0L;
-    if ( _rAnchorFrm.IsTxtFrm() )
+    if ( _rAnchorFrm.IsTextFrm() )
     {
-        pObjFormatter = SwObjectFormatterTxtFrm::CreateObjFormatter(
-                                            static_cast<SwTxtFrm&>(_rAnchorFrm),
+        pObjFormatter = SwObjectFormatterTextFrm::CreateObjFormatter(
+                                            static_cast<SwTextFrm&>(_rAnchorFrm),
                                             _rPageFrm, _pLayAction );
     }
     else if ( _rAnchorFrm.IsLayoutFrm() )
@@ -257,7 +257,7 @@ void SwObjectFormatter::_FormatLayout( SwLayoutFrm& _rLayoutFrm )
 
     #i28701#
 */
-void SwObjectFormatter::_FormatObjCntnt( SwAnchoredObject& _rAnchoredObj )
+void SwObjectFormatter::_FormatObjContent( SwAnchoredObject& _rAnchoredObj )
 {
     if ( !_rAnchoredObj.ISA(SwFlyFrm) )
     {
@@ -266,28 +266,28 @@ void SwObjectFormatter::_FormatObjCntnt( SwAnchoredObject& _rAnchoredObj )
     }
 
     SwFlyFrm& rFlyFrm = static_cast<SwFlyFrm&>(_rAnchoredObj);
-    SwCntntFrm* pCntnt = rFlyFrm.ContainsCntnt();
+    SwContentFrm* pContent = rFlyFrm.ContainsContent();
 
-    while ( pCntnt )
+    while ( pContent )
     {
         // format content
-        pCntnt->OptCalc();
+        pContent->OptCalc();
 
         // format floating screen objects at content text frame
         // #i23129#, #i36347# - pass correct page frame to
         // the object formatter
-        if ( pCntnt->IsTxtFrm() &&
-             !SwObjectFormatter::FormatObjsAtFrm( *pCntnt,
-                                                  *(pCntnt->FindPageFrm()),
+        if ( pContent->IsTextFrm() &&
+             !SwObjectFormatter::FormatObjsAtFrm( *pContent,
+                                                  *(pContent->FindPageFrm()),
                                                   GetLayAction() ) )
         {
             // restart format with first content
-            pCntnt = rFlyFrm.ContainsCntnt();
+            pContent = rFlyFrm.ContainsContent();
             continue;
         }
 
         // continue with next content
-        pCntnt = pCntnt->GetNextCntntFrm();
+        pContent = pContent->GetNextContentFrm();
     }
 }
 
@@ -300,7 +300,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj )
     // check, if only as-character anchored object have to be formatted, and
     // check the anchor type
     if ( FormatOnlyAsCharAnchored() &&
-         !(_rAnchoredObj.GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
+         !(_rAnchoredObj.GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
     {
         return;
     }
@@ -352,7 +352,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj )
                                                 mpLayAction );
             if ( mpLayAction )
             {
-                mpLayAction->_FormatFlyCntnt( &rFlyFrm );
+                mpLayAction->_FormatFlyContent( &rFlyFrm );
                 // --> consider, if the layout action
                 // has to be restarted due to a delete of a page frame.
                 if ( mpLayAction->IsAgain() )
@@ -362,7 +362,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj )
             }
             else
             {
-                _FormatObjCntnt( rFlyFrm );
+                _FormatObjContent( rFlyFrm );
             }
 
             if ( ++nLoopControlRuns >= nLoopControlMax )
@@ -393,15 +393,15 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj )
     Thus, the objects, whose anchor character is inside the follow text
     frame can be formatted.
 */
-bool SwObjectFormatter::_FormatObjsAtFrm( SwTxtFrm* _pMasterTxtFrm )
+bool SwObjectFormatter::_FormatObjsAtFrm( SwTextFrm* _pMasterTextFrm )
 {
     // --> #i26945#
     SwFrm* pAnchorFrm( 0L );
-    if ( GetAnchorFrm().IsTxtFrm() &&
-         static_cast<SwTxtFrm&>(GetAnchorFrm()).IsFollow() &&
-         _pMasterTxtFrm )
+    if ( GetAnchorFrm().IsTextFrm() &&
+         static_cast<SwTextFrm&>(GetAnchorFrm()).IsFollow() &&
+         _pMasterTextFrm )
     {
-        pAnchorFrm = _pMasterTxtFrm;
+        pAnchorFrm = _pMasterTextFrm;
     }
     else
     {
@@ -428,12 +428,12 @@ bool SwObjectFormatter::_FormatObjsAtFrm( SwTxtFrm* _pMasterTxtFrm )
         // If the anchor follow text frame is in the same body as its 'master'
         // text frame, do not format the anchored object.
         // E.g., this situation can occur during the table row splitting algorithm.
-        SwTxtFrm* pAnchorCharFrm = pAnchoredObj->FindAnchorCharFrm();
+        SwTextFrm* pAnchorCharFrm = pAnchoredObj->FindAnchorCharFrm();
         const bool bAnchoredAtFollowInSameBodyAsMaster =
                 pAnchorCharFrm && pAnchorCharFrm->IsFollow() &&
                 pAnchorCharFrm != pAnchoredObj->GetAnchorFrm() &&
                 pAnchorCharFrm->FindBodyFrm() ==
-                    static_cast<SwTxtFrm*>(pAnchoredObj->AnchorFrm())->FindBodyFrm();
+                    static_cast<SwTextFrm*>(pAnchoredObj->AnchorFrm())->FindBodyFrm();
         if ( bAnchoredAtFollowInSameBodyAsMaster )
         {
             continue;
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index 4b4a994fb03b..dc6eee0863c4 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -35,52 +35,52 @@ using namespace ::com::sun::star;
 class SwForbidFollowFormat
 {
 private:
-    SwTxtFrm& mrTxtFrm;
+    SwTextFrm& mrTextFrm;
     const bool bOldFollowFormatAllowed;
 
 public:
-    SwForbidFollowFormat( SwTxtFrm& _rTxtFrm )
-        : mrTxtFrm( _rTxtFrm ),
-          bOldFollowFormatAllowed( _rTxtFrm.FollowFormatAllowed() )
+    SwForbidFollowFormat( SwTextFrm& _rTextFrm )
+        : mrTextFrm( _rTextFrm ),
+          bOldFollowFormatAllowed( _rTextFrm.FollowFormatAllowed() )
     {
-        mrTxtFrm.ForbidFollowFormat();
+        mrTextFrm.ForbidFollowFormat();
     }
 
     ~SwForbidFollowFormat()
     {
         if ( bOldFollowFormatAllowed )
         {
-            mrTxtFrm.AllowFollowFormat();
+            mrTextFrm.AllowFollowFormat();
         }
     }
 };
 
-SwObjectFormatterTxtFrm::SwObjectFormatterTxtFrm( SwTxtFrm& _rAnchorTxtFrm,
+SwObjectFormatterTextFrm::SwObjectFormatterTextFrm( SwTextFrm& _rAnchorTextFrm,
                                                   const SwPageFrm& _rPageFrm,
-                                                  SwTxtFrm* _pMasterAnchorTxtFrm,
+                                                  SwTextFrm* _pMasterAnchorTextFrm,
                                                   SwLayAction* _pLayAction )
     : SwObjectFormatter( _rPageFrm, _pLayAction, true ),
-      mrAnchorTxtFrm( _rAnchorTxtFrm ),
-      mpMasterAnchorTxtFrm( _pMasterAnchorTxtFrm )
+      mrAnchorTextFrm( _rAnchorTextFrm ),
+      mpMasterAnchorTextFrm( _pMasterAnchorTextFrm )
 {
 }
 
-SwObjectFormatterTxtFrm::~SwObjectFormatterTxtFrm()
+SwObjectFormatterTextFrm::~SwObjectFormatterTextFrm()
 {
 }
 
-SwObjectFormatterTxtFrm* SwObjectFormatterTxtFrm::CreateObjFormatter(
-                                                SwTxtFrm& _rAnchorTxtFrm,
+SwObjectFormatterTextFrm* SwObjectFormatterTextFrm::CreateObjFormatter(
+                                                SwTextFrm& _rAnchorTextFrm,
                                                 const SwPageFrm& _rPageFrm,
                                                 SwLayAction* _pLayAction )
 {
-    SwObjectFormatterTxtFrm* pObjFormatter = 0L;
+    SwObjectFormatterTextFrm* pObjFormatter = 0L;
 
-    // determine 'master' of <_rAnchorTxtFrm>, if anchor frame is a follow text frame.
-    SwTxtFrm* pMasterOfAnchorFrm = 0L;
-    if ( _rAnchorTxtFrm.IsFollow() )
+    // determine 'master' of <_rAnchorTextFrm>, if anchor frame is a follow text frame.
+    SwTextFrm* pMasterOfAnchorFrm = 0L;
+    if ( _rAnchorTextFrm.IsFollow() )
     {
-        pMasterOfAnchorFrm = _rAnchorTxtFrm.FindMaster();
+        pMasterOfAnchorFrm = _rAnchorTextFrm.FindMaster();
         while ( pMasterOfAnchorFrm && pMasterOfAnchorFrm->IsFollow() )
         {
             pMasterOfAnchorFrm = pMasterOfAnchorFrm->FindMaster();
@@ -89,30 +89,30 @@ SwObjectFormatterTxtFrm* SwObjectFormatterTxtFrm::CreateObjFormatter(
 
     // create object formatter, if floating screen objects are registered
     // at anchor frame (or at 'master' anchor frame)
-    if ( _rAnchorTxtFrm.GetDrawObjs() ||
+    if ( _rAnchorTextFrm.GetDrawObjs() ||
          ( pMasterOfAnchorFrm && pMasterOfAnchorFrm->GetDrawObjs() ) )
     {
         pObjFormatter =
-            new SwObjectFormatterTxtFrm( _rAnchorTxtFrm, _rPageFrm,
+            new SwObjectFormatterTextFrm( _rAnchorTextFrm, _rPageFrm,
                                          pMasterOfAnchorFrm, _pLayAction );
     }
 
     return pObjFormatter;
 }
 
-SwFrm& SwObjectFormatterTxtFrm::GetAnchorFrm()
+SwFrm& SwObjectFormatterTextFrm::GetAnchorFrm()
 {
-    return mrAnchorTxtFrm;
+    return mrAnchorTextFrm;
 }
 
 // #i40147# - add parameter <_bCheckForMovedFwd>.
-bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
+bool SwObjectFormatterTextFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                                            const bool _bCheckForMovedFwd )
 {
     // check, if only as-character anchored object have to be formatted, and
     // check the anchor type
     if ( FormatOnlyAsCharAnchored() &&
-         !(_rAnchoredObj.GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
+         !(_rAnchoredObj.GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
     {
         return true;
     }
@@ -148,7 +148,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                 _rAnchoredObj.RestartLayoutProcess() &&
                 !( _rAnchoredObj.PositionLocked() &&
                    _rAnchoredObj.GetAnchorFrm()->IsInFly() &&
-                   _rAnchoredObj.GetFrmFmt().GetFollowTextFlow().GetValue() );
+                   _rAnchoredObj.GetFrameFormat().GetFollowTextFlow().GetValue() );
         if ( bRestart )
         {
             bSuccess = false;
@@ -164,11 +164,11 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
         // whose the check of a moved forward anchor frame is requested.
         // revise decision made for i3317:
         // anchored objects, whose wrapping style influence is temporarly considered,
-        // have to be considered in method <SwObjectFormatterTxtFrm::DoFormatObjs()>
+        // have to be considered in method <SwObjectFormatterTextFrm::DoFormatObjs()>
         if ( bSuccess &&
              _rAnchoredObj.ConsiderObjWrapInfluenceOnObjPos() &&
              ( _bCheckForMovedFwd ||
-               _rAnchoredObj.GetFrmFmt().GetWrapInfluenceOnObjPos().
+               _rAnchoredObj.GetFrameFormat().GetWrapInfluenceOnObjPos().
                     // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
                     GetWrapInfluenceOnObjPos( true ) ==
                         // #i35017# - constant name has changed
@@ -177,7 +177,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
             // #i26945# - check conditions for move forward of
             // anchor text frame
             // determine, if anchor text frame has previous frame
-            const bool bDoesAnchorHadPrev = ( mrAnchorTxtFrm.GetIndPrev() != 0 );
+            const bool bDoesAnchorHadPrev = ( mrAnchorTextFrm.GetIndPrev() != 0 );
 
             // #i40141# - use new method - it also formats the
             // section the anchor frame is in.
@@ -189,49 +189,49 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                 _rAnchoredObj.SetClearedEnvironment( true );
                 // #i44049# - consider, that anchor frame
                 // could already been marked to move forward.
-                SwPageFrm* pAnchorPageFrm( mrAnchorTxtFrm.FindPageFrm() );
+                SwPageFrm* pAnchorPageFrm( mrAnchorTextFrm.FindPageFrm() );
                 if ( pAnchorPageFrm != _rAnchoredObj.GetPageFrm() )
                 {
                     bool bInsert( true );
                     sal_uInt32 nToPageNum( 0L );
-                    const SwDoc& rDoc = *(GetPageFrm().GetFmt()->GetDoc());
+                    const SwDoc& rDoc = *(GetPageFrm().GetFormat()->GetDoc());
                     if ( SwLayouter::FrmMovedFwdByObjPos(
-                                            rDoc, mrAnchorTxtFrm, nToPageNum ) )
+                                            rDoc, mrAnchorTextFrm, nToPageNum ) )
                     {
                         if ( nToPageNum < pAnchorPageFrm->GetPhyPageNum() )
-                            SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTxtFrm );
+                            SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTextFrm );
                         else
                             bInsert = false;
                     }
                     if ( bInsert )
                     {
-                        SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTxtFrm,
+                        SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTextFrm,
                                                        pAnchorPageFrm->GetPhyPageNum() );
-                        mrAnchorTxtFrm.InvalidatePos();
+                        mrAnchorTextFrm.InvalidatePos();
                         bSuccess = false;
                         _InvalidatePrevObjs( _rAnchoredObj );
                         _InvalidateFollowObjs( _rAnchoredObj, true );
                     }
                     else
                     {
-                        OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not marked to move forward" );
+                        OSL_FAIL( "<SwObjectFormatterTextFrm::DoFormatObj(..)> - anchor frame not marked to move forward" );
                     }
                 }
             }
-            else if ( !mrAnchorTxtFrm.IsFollow() && bDoesAnchorHadPrev )
+            else if ( !mrAnchorTextFrm.IsFollow() && bDoesAnchorHadPrev )
             {
                 // index of anchored object in collection of page numbers and
                 // anchor types
                 sal_uInt32 nIdx( CountOfCollected() );
                 OSL_ENSURE( nIdx > 0,
-                        "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchored object not collected!?" );
+                        "<SwObjectFormatterTextFrm::DoFormatObj(..)> - anchored object not collected!?" );
                 --nIdx;
 
                 sal_uInt32 nToPageNum( 0L );
                 // #i43913#
                 bool bDummy( false );
                 // #i58182# - consider new method signature
-                if ( SwObjectFormatterTxtFrm::CheckMovedFwdCondition( *GetCollectedObj( nIdx ),
+                if ( SwObjectFormatterTextFrm::CheckMovedFwdCondition( *GetCollectedObj( nIdx ),
                                               GetPgNumOfCollected( nIdx ),
                                               IsCollectedAnchoredAtMaster( nIdx ),
                                               nToPageNum, bDummy ) )
@@ -240,12 +240,12 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                     // could already been marked to move forward.
                     bool bInsert( true );
                     sal_uInt32 nMovedFwdToPageNum( 0L );
-                    const SwDoc& rDoc = *(GetPageFrm().GetFmt()->GetDoc());
+                    const SwDoc& rDoc = *(GetPageFrm().GetFormat()->GetDoc());
                     if ( SwLayouter::FrmMovedFwdByObjPos(
-                                            rDoc, mrAnchorTxtFrm, nMovedFwdToPageNum ) )
+                                            rDoc, mrAnchorTextFrm, nMovedFwdToPageNum ) )
                     {
                         if ( nMovedFwdToPageNum < nToPageNum )
-                            SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTxtFrm );
+                            SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTextFrm );
                         else
                             bInsert = false;
                     }
@@ -253,9 +253,9 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                     {
                         // Indicate that anchor text frame has to move forward and
                         // invalidate its position to force a re-format.
-                        SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTxtFrm,
+                        SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTextFrm,
                                                        nToPageNum );
-                        mrAnchorTxtFrm.InvalidatePos();
+                        mrAnchorTextFrm.InvalidatePos();
 
                         // Indicate restart of the layout process
                         bSuccess = false;
@@ -270,19 +270,19 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                     }
                     else
                     {
-                        OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not marked to move forward" );
+                        OSL_FAIL( "<SwObjectFormatterTextFrm::DoFormatObj(..)> - anchor frame not marked to move forward" );
                     }
                 }
             }
             // i40155# - mark anchor frame not to wrap around
             // objects under the condition, that its follow contains all its text.
-            else if ( !mrAnchorTxtFrm.IsFollow() &&
-                      mrAnchorTxtFrm.GetFollow() &&
-                      mrAnchorTxtFrm.GetFollow()->GetOfst() == 0 )
+            else if ( !mrAnchorTextFrm.IsFollow() &&
+                      mrAnchorTextFrm.GetFollow() &&
+                      mrAnchorTextFrm.GetFollow()->GetOfst() == 0 )
             {
                 SwLayouter::RemoveMovedFwdFrm(
-                                *(mrAnchorTxtFrm.FindPageFrm()->GetFmt()->GetDoc()),
-                                mrAnchorTxtFrm );
+                                *(mrAnchorTextFrm.FindPageFrm()->GetFormat()->GetDoc()),
+                                mrAnchorTextFrm );
             }
         }
     }
@@ -290,12 +290,12 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
     return bSuccess;
 }
 
-bool SwObjectFormatterTxtFrm::DoFormatObjs()
+bool SwObjectFormatterTextFrm::DoFormatObjs()
 {
-    if ( !mrAnchorTxtFrm.IsValid() )
+    if ( !mrAnchorTextFrm.IsValid() )
     {
         if ( GetLayAction() &&
-             mrAnchorTxtFrm.FindPageFrm() != &GetPageFrm() )
+             mrAnchorTextFrm.FindPageFrm() != &GetPageFrm() )
         {
             // notify layout action, thus is can restart the layout process on
             // a previous page.
@@ -304,7 +304,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
         else
         {
             // the anchor text frame has to be valid, thus assert.
-            OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObjs()> called for invalidate anchor text frame." );
+            OSL_FAIL( "<SwObjectFormatterTextFrm::DoFormatObjs()> called for invalidate anchor text frame." );
         }
 
         return false;
@@ -312,16 +312,16 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
 
     bool bSuccess( true );
 
-    if ( mrAnchorTxtFrm.IsFollow() )
+    if ( mrAnchorTextFrm.IsFollow() )
     {
         // Only floating screen objects anchored as-character are directly
         // registered at a follow text frame. The other floating screen objects
         // are registered at the 'master' anchor text frame.
         // Thus, format the other floating screen objects through the 'master'
         // anchor text frame
-        OSL_ENSURE( mpMasterAnchorTxtFrm,
-                "SwObjectFormatterTxtFrm::DoFormatObjs() - missing 'master' anchor text frame" );
-        bSuccess = _FormatObjsAtFrm( mpMasterAnchorTxtFrm );
+        OSL_ENSURE( mpMasterAnchorTextFrm,
+                "SwObjectFormatterTextFrm::DoFormatObjs() - missing 'master' anchor text frame" );
+        bSuccess = _FormatObjsAtFrm( mpMasterAnchorTextFrm );
 
         if ( bSuccess )
         {
@@ -339,10 +339,10 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
     // considered.
     if ( bSuccess &&
          ( ConsiderWrapOnObjPos() ||
-           ( !mrAnchorTxtFrm.IsFollow() &&
+           ( !mrAnchorTextFrm.IsFollow() &&
              _AtLeastOneObjIsTmpConsiderWrapInfluence() ) ) )
     {
-        const bool bDoesAnchorHadPrev = ( mrAnchorTxtFrm.GetIndPrev() != 0 );
+        const bool bDoesAnchorHadPrev = ( mrAnchorTextFrm.GetIndPrev() != 0 );
 
         // Format anchor text frame after its objects are formatted.
         // Note: The format of the anchor frame also formats the invalid
@@ -357,7 +357,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
         // #i43913#
         bool bInFollow( false );
         SwAnchoredObject* pObj = 0L;
-        if ( !mrAnchorTxtFrm.IsFollow() )
+        if ( !mrAnchorTextFrm.IsFollow() )
         {
             pObj = _GetFirstObjWithMovedFwdAnchor(
                     // #i35017# - constant name has changed
@@ -370,7 +370,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
             pObj->SetClearedEnvironment( true );
             // #i44049# - consider, that anchor frame
             // could already been marked to move forward.
-            SwPageFrm* pAnchorPageFrm( mrAnchorTxtFrm.FindPageFrm() );
+            SwPageFrm* pAnchorPageFrm( mrAnchorTextFrm.FindPageFrm() );
             // #i43913# - consider, that anchor frame
             // is a follow or is in a follow row, which will move forward.
             if ( pAnchorPageFrm != pObj->GetPageFrm() ||
@@ -378,27 +378,27 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
             {
                 bool bInsert( true );
                 sal_uInt32 nTmpToPageNum( 0L );
-                const SwDoc& rDoc = *(GetPageFrm().GetFmt()->GetDoc());
+                const SwDoc& rDoc = *(GetPageFrm().GetFormat()->GetDoc());
                 if ( SwLayouter::FrmMovedFwdByObjPos(
-                                        rDoc, mrAnchorTxtFrm, nTmpToPageNum ) )
+                                        rDoc, mrAnchorTextFrm, nTmpToPageNum ) )
                 {
                     if ( nTmpToPageNum < pAnchorPageFrm->GetPhyPageNum() )
-                        SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTxtFrm );
+                        SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTextFrm );
                     else
                         bInsert = false;
                 }
                 if ( bInsert )
                 {
-                    SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTxtFrm,
+                    SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTextFrm,
                                                    pAnchorPageFrm->GetPhyPageNum() );
-                    mrAnchorTxtFrm.InvalidatePos();
+                    mrAnchorTextFrm.InvalidatePos();
                     bSuccess = false;
                     _InvalidatePrevObjs( *pObj );
                     _InvalidateFollowObjs( *pObj, true );
                 }
                 else
                 {
-                    OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" );
+                    OSL_FAIL( "<SwObjectFormatterTextFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" );
                 }
             }
         }
@@ -410,12 +410,12 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
             // could already been marked to move forward.
             bool bInsert( true );
             sal_uInt32 nMovedFwdToPageNum( 0L );
-            const SwDoc& rDoc = *(GetPageFrm().GetFmt()->GetDoc());
+            const SwDoc& rDoc = *(GetPageFrm().GetFormat()->GetDoc());
             if ( SwLayouter::FrmMovedFwdByObjPos(
-                                    rDoc, mrAnchorTxtFrm, nMovedFwdToPageNum ) )
+                                    rDoc, mrAnchorTextFrm, nMovedFwdToPageNum ) )
             {
                 if ( nMovedFwdToPageNum < nToPageNum )
-                    SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTxtFrm );
+                    SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTextFrm );
                 else
                     bInsert = false;
             }
@@ -423,8 +423,8 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
             {
                 // Indicate that anchor text frame has to move forward and
                 // invalidate its position to force a re-format.
-                SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTxtFrm, nToPageNum );
-                mrAnchorTxtFrm.InvalidatePos();
+                SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTextFrm, nToPageNum );
+                mrAnchorTextFrm.InvalidatePos();
 
                 // Indicate restart of the layout process
                 bSuccess = false;
@@ -439,30 +439,30 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
             }
             else
             {
-                OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" );
+                OSL_FAIL( "<SwObjectFormatterTextFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" );
             }
         }
         // #i40155# - mark anchor frame not to wrap around
         // objects under the condition, that its follow contains all its text.
-        else if ( !mrAnchorTxtFrm.IsFollow() &&
-                  mrAnchorTxtFrm.GetFollow() &&
-                  mrAnchorTxtFrm.GetFollow()->GetOfst() == 0 )
+        else if ( !mrAnchorTextFrm.IsFollow() &&
+                  mrAnchorTextFrm.GetFollow() &&
+                  mrAnchorTextFrm.GetFollow()->GetOfst() == 0 )
         {
             SwLayouter::RemoveMovedFwdFrm(
-                            *(mrAnchorTxtFrm.FindPageFrm()->GetFmt()->GetDoc()),
-                            mrAnchorTxtFrm );
+                            *(mrAnchorTextFrm.FindPageFrm()->GetFormat()->GetDoc()),
+                            mrAnchorTextFrm );
         }
     }
 
     return bSuccess;
 }
 
-void SwObjectFormatterTxtFrm::_InvalidatePrevObjs( SwAnchoredObject& _rAnchoredObj )
+void SwObjectFormatterTextFrm::_InvalidatePrevObjs( SwAnchoredObject& _rAnchoredObj )
 {
     // invalidate all previous objects, whose wrapping influence on the object
     // positioning is <NONE_CONCURRENT_POSIITIONED>.
     // Note: list of objects at anchor frame is sorted by this property.
-    if ( _rAnchoredObj.GetFrmFmt().GetWrapInfluenceOnObjPos().
+    if ( _rAnchoredObj.GetFrameFormat().GetWrapInfluenceOnObjPos().
                 // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
                 GetWrapInfluenceOnObjPos( true ) ==
                             // #i35017# - constant name has changed
@@ -477,7 +477,7 @@ void SwObjectFormatterTxtFrm::_InvalidatePrevObjs( SwAnchoredObject& _rAnchoredO
             {
                 --i;
                 SwAnchoredObject* pAnchoredObj = (*pObjs)[i];
-                if ( pAnchoredObj->GetFrmFmt().GetWrapInfluenceOnObjPos().
+                if ( pAnchoredObj->GetFrameFormat().GetWrapInfluenceOnObjPos().
                         // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
                         GetWrapInfluenceOnObjPos( true ) ==
                             // #i35017# - constant name has changed
@@ -490,7 +490,7 @@ void SwObjectFormatterTxtFrm::_InvalidatePrevObjs( SwAnchoredObject& _rAnchoredO
     }
 }
 
-void SwObjectFormatterTxtFrm::_InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj,
+void SwObjectFormatterTextFrm::_InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj,
                                                      const bool _bInclObj )
 {
     if ( _bInclObj )
@@ -510,7 +510,7 @@ void SwObjectFormatterTxtFrm::_InvalidateFollowObjs( SwAnchoredObject& _rAnchore
     }
 }
 
-SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(
+SwAnchoredObject* SwObjectFormatterTextFrm::_GetFirstObjWithMovedFwdAnchor(
                                     const sal_Int16 _nWrapInfluenceOnPosition,
                                     sal_uInt32& _noToPageNum,
                                     bool& _boInFollow )
@@ -518,7 +518,7 @@ SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(
     // #i35017# - constant names have changed
     OSL_ENSURE( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
             _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_CONCURRENT,
-            "<SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(..)> - invalid value for parameter <_nWrapInfluenceOnPosition>" );
+            "<SwObjectFormatterTextFrm::_GetFirstObjWithMovedFwdAnchor(..)> - invalid value for parameter <_nWrapInfluenceOnPosition>" );
 
     SwAnchoredObject* pRetAnchoredObj = 0L;
 
@@ -527,14 +527,14 @@ SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(
     {
         SwAnchoredObject* pAnchoredObj = GetCollectedObj(i);
         if ( pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos() &&
-             pAnchoredObj->GetFrmFmt().GetWrapInfluenceOnObjPos().
+             pAnchoredObj->GetFrameFormat().GetWrapInfluenceOnObjPos().
                     // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
                     GetWrapInfluenceOnObjPos( true ) == _nWrapInfluenceOnPosition )
         {
             // #i26945# - use new method <_CheckMovedFwdCondition(..)>
             // #i43913#
             // #i58182# - consider new method signature
-            if ( SwObjectFormatterTxtFrm::CheckMovedFwdCondition( *GetCollectedObj( i ),
+            if ( SwObjectFormatterTextFrm::CheckMovedFwdCondition( *GetCollectedObj( i ),
                                           GetPgNumOfCollected( i ),
                                           IsCollectedAnchoredAtMaster( i ),
                                           _noToPageNum, _boInFollow ) )
@@ -550,7 +550,7 @@ SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(
 
 // #i58182#
 // - replace private method by corresponding static public method
-bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
+bool SwObjectFormatterTextFrm::CheckMovedFwdCondition(
                                             SwAnchoredObject& _rAnchoredObj,
                                             const sal_uInt32 _nFromPageNum,
                                             const bool _bAnchoredAtMasterBeforeFormatAnchor,
@@ -591,21 +591,21 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
     // which will be on the next page.
     if ( !bAnchorIsMovedForward &&
          _bAnchoredAtMasterBeforeFormatAnchor &&
-        ((_rAnchoredObj.GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AT_CHAR) ||
-         (_rAnchoredObj.GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AT_PARA)))
+        ((_rAnchoredObj.GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AT_CHAR) ||
+         (_rAnchoredObj.GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AT_PARA)))
     {
         SwFrm* pAnchorFrm = _rAnchoredObj.GetAnchorFrmContainingAnchPos();
-        OSL_ENSURE( pAnchorFrm->IsTxtFrm(),
-                "<SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..) - wrong type of anchor frame>" );
-        SwTxtFrm* pAnchorTxtFrm = static_cast<SwTxtFrm*>(pAnchorFrm);
+        OSL_ENSURE( pAnchorFrm->IsTextFrm(),
+                "<SwObjectFormatterTextFrm::CheckMovedFwdCondition(..) - wrong type of anchor frame>" );
+        SwTextFrm* pAnchorTextFrm = static_cast<SwTextFrm*>(pAnchorFrm);
         bool bCheck( false );
-        if ( pAnchorTxtFrm->IsFollow() )
+        if ( pAnchorTextFrm->IsFollow() )
         {
             bCheck = true;
         }
-        else if( pAnchorTxtFrm->IsInTab() )
+        else if( pAnchorTextFrm->IsInTab() )
         {
-            const SwRowFrm* pMasterRow = pAnchorTxtFrm->IsInFollowFlowRow();
+            const SwRowFrm* pMasterRow = pAnchorTextFrm->IsInFollowFlowRow();
             if ( pMasterRow &&
                  pMasterRow->FindPageFrm() == pPageFrmOfAnchor )
             {
@@ -616,7 +616,7 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
         {
             // check, if found text frame will be on the next page
             // by checking, if it's in a column, which has no next.
-            SwFrm* pColFrm = pAnchorTxtFrm->FindColFrm();
+            SwFrm* pColFrm = pAnchorTextFrm->FindColFrm();
             while ( pColFrm && !pColFrm->GetNext() )
             {
                 pColFrm = pColFrm->FindColFrm();
@@ -635,9 +635,9 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
 }
 
 // #i40140# - helper method to format layout frames used by
-// method <SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()>
+// method <SwObjectFormatterTextFrm::_FormatAnchorFrmForCheckMoveFwd()>
 // #i44049# - format till a certain lower frame, if provided.
-static void lcl_FormatCntntOfLayoutFrm( SwLayoutFrm* pLayFrm,
+static void lcl_FormatContentOfLayoutFrm( SwLayoutFrm* pLayFrm,
                                  SwFrm* pLastLowerFrm = 0L )
 {
     SwFrm* pLowerFrm = pLayFrm->GetLower();
@@ -649,7 +649,7 @@ static void lcl_FormatCntntOfLayoutFrm( SwLayoutFrm* pLayFrm,
             break;
         }
         if ( pLowerFrm->IsLayoutFrm() )
-            lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pLowerFrm),
+            lcl_FormatContentOfLayoutFrm( static_cast<SwLayoutFrm*>(pLowerFrm),
                                         pLastLowerFrm );
         else
             pLowerFrm->Calc();
@@ -666,18 +666,18 @@ static void lcl_FormatCntntOfLayoutFrm( SwLayoutFrm* pLayFrm,
     to format the frames, which have become invalid due to the anchored
     object formatting in the iterative object positioning algorithm
 */
-void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtFrm )
+void SwObjectFormatterTextFrm::FormatAnchorFrmAndItsPrevs( SwTextFrm& _rAnchorTextFrm )
 {
     // #i47014# - no format of section and previous columns
     // for follow text frames.
-    if ( !_rAnchorTxtFrm.IsFollow() )
+    if ( !_rAnchorTextFrm.IsFollow() )
     {
         // if anchor frame is directly inside a section, format this section and
         // its previous frames.
         // Note: It's a very simple format without formatting objects.
-        if ( _rAnchorTxtFrm.IsInSct() )
+        if ( _rAnchorTextFrm.IsInSct() )
         {
-            SwFrm* pSectFrm = _rAnchorTxtFrm.GetUpper();
+            SwFrm* pSectFrm = _rAnchorTextFrm.GetUpper();
             while ( pSectFrm )
             {
                 if ( pSectFrm->IsSctFrm() || pSectFrm->IsCellFrm() )
@@ -689,7 +689,7 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF
             if ( pSectFrm && pSectFrm->IsSctFrm() )
             {
                 // #i44049#
-                _rAnchorTxtFrm.LockJoin();
+                _rAnchorTextFrm.LockJoin();
                 SwFrm* pFrm = pSectFrm->GetUpper()->GetLower();
                 // #i49605# - section frame could move forward
                 // by the format of its previous frame.
@@ -697,27 +697,27 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF
                 while ( pFrm && pFrm != pSectFrm )
                 {
                     if ( pFrm->IsLayoutFrm() )
-                        lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pFrm) );
+                        lcl_FormatContentOfLayoutFrm( static_cast<SwLayoutFrm*>(pFrm) );
                     else
                         pFrm->Calc();
 
                     pFrm = pFrm->GetNext();
                 }
-                lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pSectFrm),
-                                            &_rAnchorTxtFrm );
+                lcl_FormatContentOfLayoutFrm( static_cast<SwLayoutFrm*>(pSectFrm),
+                                            &_rAnchorTextFrm );
                 // #i44049#
-                _rAnchorTxtFrm.UnlockJoin();
+                _rAnchorTextFrm.UnlockJoin();
             }
         }
 
         // #i40140# - if anchor frame is inside a column,
         // format the content of the previous columns.
         // Note: It's a very simple format without formatting objects.
-        SwFrm* pColFrmOfAnchor = _rAnchorTxtFrm.FindColFrm();
+        SwFrm* pColFrmOfAnchor = _rAnchorTextFrm.FindColFrm();
         if ( pColFrmOfAnchor )
         {
             // #i44049#
-            _rAnchorTxtFrm.LockJoin();
+            _rAnchorTextFrm.LockJoin();
             SwFrm* pColFrm = pColFrmOfAnchor->GetUpper()->GetLower();
             while ( pColFrm != pColFrmOfAnchor )
             {
@@ -725,7 +725,7 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF
                 while ( pFrm )
                 {
                     if ( pFrm->IsLayoutFrm() )
-                        lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pFrm) );
+                        lcl_FormatContentOfLayoutFrm( static_cast<SwLayoutFrm*>(pFrm) );
                     else
                         pFrm->Calc();
 
@@ -735,21 +735,21 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF
                 pColFrm = pColFrm->GetNext();
             }
             // #i44049#
-            _rAnchorTxtFrm.UnlockJoin();
+            _rAnchorTextFrm.UnlockJoin();
         }
     }
 
     // format anchor frame - format of its follow not needed
     // #i43255# - forbid follow format, only if anchor text
     // frame is in table
-    if ( _rAnchorTxtFrm.IsInTab() )
+    if ( _rAnchorTextFrm.IsInTab() )
     {
-        SwForbidFollowFormat aForbidFollowFormat( _rAnchorTxtFrm );
-        _rAnchorTxtFrm.Calc();
+        SwForbidFollowFormat aForbidFollowFormat( _rAnchorTextFrm );
+        _rAnchorTextFrm.Calc();
     }
     else
     {
-        _rAnchorTxtFrm.Calc();
+        _rAnchorTextFrm.Calc();
     }
 }
 
@@ -757,15 +757,15 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF
 
     #i40141#
 */
-void SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()
+void SwObjectFormatterTextFrm::_FormatAnchorFrmForCheckMoveFwd()
 {
-    SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( mrAnchorTxtFrm );
+    SwObjectFormatterTextFrm::FormatAnchorFrmAndItsPrevs( mrAnchorTextFrm );
 }
 
 /** method to determine if at least one anchored object has state
     <temporarly consider wrapping style influence> set.
 */
-bool SwObjectFormatterTxtFrm::_AtLeastOneObjIsTmpConsiderWrapInfluence()
+bool SwObjectFormatterTextFrm::_AtLeastOneObjIsTmpConsiderWrapInfluence()
 {
     bool bRet( false );
 
diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx
index b29fcadb4b95..4caa869bce3b 100644
--- a/sw/source/core/layout/objectformattertxtfrm.hxx
+++ b/sw/source/core/layout/objectformattertxtfrm.hxx
@@ -22,23 +22,23 @@
 #include <objectformatter.hxx>
 #include <sal/types.h>
 
-class SwTxtFrm;
+class SwTextFrm;
 
 // #i28701#
 // Format floating screen objects, which are anchored at a given anchor text frame
 // and registered at the given page frame.
-class SwObjectFormatterTxtFrm : public SwObjectFormatter
+class SwObjectFormatterTextFrm : public SwObjectFormatter
 {
     private:
         // anchor text frame
-        SwTxtFrm& mrAnchorTxtFrm;
+        SwTextFrm& mrAnchorTextFrm;
 
         // 'master' anchor text frame
-        SwTxtFrm* mpMasterAnchorTxtFrm;
+        SwTextFrm* mpMasterAnchorTextFrm;
 
-        SwObjectFormatterTxtFrm( SwTxtFrm& _rAnchorTxtFrm,
+        SwObjectFormatterTextFrm( SwTextFrm& _rAnchorTextFrm,
                                  const SwPageFrm& _rPageFrm,
-                                 SwTxtFrm* _pMasterAnchorTxtFrm,
+                                 SwTextFrm* _pMasterAnchorTextFrm,
                                  SwLayAction* _pLayAction );
 
         /** method to invalidate objects, anchored previous to given object at
@@ -119,18 +119,18 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
         virtual SwFrm& GetAnchorFrm() SAL_OVERRIDE;
 
     public:
-        virtual ~SwObjectFormatterTxtFrm();
+        virtual ~SwObjectFormatterTextFrm();
 
         // #i40147# - add parameter <_bCheckForMovedFwd>.
         virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                                   const bool _bCheckForMovedFwd = false ) SAL_OVERRIDE;
         virtual bool DoFormatObjs() SAL_OVERRIDE;
 
-        /** method to create an instance of <SwObjectFormatterTxtFrm> is
+        /** method to create an instance of <SwObjectFormatterTextFrm> is
             necessary.
         */
-        static SwObjectFormatterTxtFrm* CreateObjFormatter(
-                                                SwTxtFrm& _rAnchorTxtFrm,
+        static SwObjectFormatterTextFrm* CreateObjFormatter(
+                                                SwTextFrm& _rAnchorTextFrm,
                                                 const SwPageFrm& _rPageFrm,
                                                 SwLayAction* _pLayAction );
 
@@ -142,11 +142,11 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
             to format the frames, which have become invalid due to the anchored
             object formatting in the iterative object positioning algorithm
 
-            @param _rAnchorTxtFrm
+            @param _rAnchorTextFrm
             input parameter - reference to anchor text frame, which has to be
             formatted including its previous frames of the page.
         */
-        static void FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtFrm );
+        static void FormatAnchorFrmAndItsPrevs( SwTextFrm& _rAnchorTextFrm );
 
         /** method to check the conditions, if 'anchor is moved forward'
 
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 85bbbf2eb700..4dd76a03e7bf 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -59,8 +59,8 @@
 
 using namespace ::com::sun::star;
 
-SwBodyFrm::SwBodyFrm( SwFrmFmt *pFmt, SwFrm* pSib ):
-    SwLayoutFrm( pFmt, pSib )
+SwBodyFrm::SwBodyFrm( SwFrameFormat *pFormat, SwFrm* pSib ):
+    SwLayoutFrm( pFormat, pSib )
 {
     mnFrmType = FRM_BODY;
 }
@@ -113,7 +113,7 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
             if( GRID_LINES_CHARS == pGrid->GetGridType() )
             {
                 //for textgrid refactor
-                SwDoc *pDoc = GetFmt()->GetDoc();
+                SwDoc *pDoc = GetFormat()->GetDoc();
                 nBorder = nSize % (GetGridWidth(*pGrid, *pDoc));
                 nSize -= nBorder;
                 nBorder /= 2;
@@ -135,8 +135,8 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
             nBorder /= 2;
 
             // #i21774# Footnotes and centering the grid does not work together:
-            const bool bAdjust = static_cast<SwPageFrm*>(GetUpper())->GetFmt()->GetDoc()->
-                                        GetFtnIdxs().empty();
+            const bool bAdjust = static_cast<SwPageFrm*>(GetUpper())->GetFormat()->GetDoc()->
+                                        GetFootnoteIdxs().empty();
 
             (Prt().*fnRect->fnSetPosY)( bAdjust ? nBorder : 0 );
             (Prt().*fnRect->fnSetHeight)( nSize );
@@ -152,8 +152,8 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
     mbValidSize = mbValidPrtArea = true;
 }
 
-SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) :
-    SwFtnBossFrm( pFmt, pSib ),
+SwPageFrm::SwPageFrm( SwFrameFormat *pFormat, SwFrm* pSib, SwPageDesc *pPgDsc ) :
+    SwFootnoteBossFrm( pFormat, pSib ),
     pSortedObjs( 0 ),
     pDesc( pPgDsc ),
     nPhyPageNum( 0 )
@@ -169,11 +169,11 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) :
     }
     else
         bHasGrid = false;
-    SetMaxFtnHeight( pPgDsc->GetFtnInfo().GetHeight() ?
-                     pPgDsc->GetFtnInfo().GetHeight() : LONG_MAX ),
+    SetMaxFootnoteHeight( pPgDsc->GetFootnoteInfo().GetHeight() ?
+                     pPgDsc->GetFootnoteInfo().GetHeight() : LONG_MAX ),
     mnFrmType = FRM_PAGE;
-    bInvalidLayout = bInvalidCntnt = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = true;
-    bInvalidFlyLayout = bInvalidFlyCntnt = bInvalidFlyInCnt = bFtnPage = bEndNotePage = false;
+    bInvalidLayout = bInvalidContent = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = true;
+    bInvalidFlyLayout = bInvalidFlyContent = bInvalidFlyInCnt = bFootnotePage = bEndNotePage = false;
 
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
     const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
@@ -186,15 +186,15 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) :
         Frm().Width ( nWidth );
     }
     else
-        Frm().SSize( pFmt->GetFrmSize().GetSize() );
+        Frm().SSize( pFormat->GetFrmSize().GetSize() );
 
     // create and insert body area if it is not a blank page
-    SwDoc *pDoc = pFmt->GetDoc();
-    if ( !(bEmptyPage = (pFmt == pDoc->GetEmptyPageFmt())) )
+    SwDoc *pDoc = pFormat->GetDoc();
+    if ( !(bEmptyPage = (pFormat == pDoc->GetEmptyPageFormat())) )
     {
         bEmptyPage = false;
         Calc();                     // so that the PrtArea is correct
-        SwBodyFrm *pBodyFrm = new SwBodyFrm( pDoc->GetDfltFrmFmt(), this );
+        SwBodyFrm *pBodyFrm = new SwBodyFrm( pDoc->GetDfltFrameFormat(), this );
         pBodyFrm->ChgSize( Prt().SSize() );
         pBodyFrm->Paste( this );
         pBodyFrm->Calc();           // so that the columns can be inserted correctly
@@ -204,15 +204,15 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) :
             _InvalidateSize();
 
         // insert header/footer,, but only if active.
-        if ( pFmt->GetHeader().IsActive() )
+        if ( pFormat->GetHeader().IsActive() )
             PrepareHeader();
-        if ( pFmt->GetFooter().IsActive() )
+        if ( pFormat->GetFooter().IsActive() )
             PrepareFooter();
 
-        const SwFmtCol &rCol = pFmt->GetCol();
+        const SwFormatCol &rCol = pFormat->GetCol();
         if ( rCol.GetNumCols() > 1 )
         {
-            const SwFmtCol aOld; //ChgColumns() needs an old value
+            const SwFormatCol aOld; //ChgColumns() needs an old value
             pBodyFrm->ChgColumns( aOld, rCol );
         }
     }
@@ -246,7 +246,7 @@ void SwPageFrm::DestroyImpl()
     if ( !IsEmptyPage() ) //#59184# unnessesary for empty pages
     {
         // prevent access to destroyed pages
-        SwDoc *pDoc = GetFmt() ? GetFmt()->GetDoc() : NULL;
+        SwDoc *pDoc = GetFormat() ? GetFormat()->GetDoc() : NULL;
         if( pDoc && !pDoc->IsInDtor() )
         {
             if ( pSh )
@@ -265,7 +265,7 @@ void SwPageFrm::DestroyImpl()
         }
     }
 
-    SwFtnBossFrm::DestroyImpl();
+    SwFootnoteBossFrm::DestroyImpl();
 }
 
 SwPageFrm::~SwPageFrm()
@@ -284,11 +284,11 @@ void SwPageFrm::CheckGrid( bool bInvalidate )
         if( pBody )
         {
             pBody->InvalidatePrt();
-            SwCntntFrm* pFrm = pBody->ContainsCntnt();
+            SwContentFrm* pFrm = pBody->ContainsContent();
             while( pBody->IsAnLower( pFrm ) )
             {
-                static_cast<SwTxtFrm*>(pFrm)->Prepare( PREP_CLEAR );
-                pFrm = pFrm->GetNextCntntFrm();
+                static_cast<SwTextFrm*>(pFrm)->Prepare( PREP_CLEAR );
+                pFrm = pFrm->GetNextContentFrm();
             }
         }
         SetCompletePaint();
@@ -298,7 +298,7 @@ void SwPageFrm::CheckGrid( bool bInvalidate )
 void SwPageFrm::CheckDirection( bool bVert )
 {
     sal_uInt16 nDir =
-            static_cast<const SvxFrameDirectionItem&>(GetFmt()->GetFmtAttr( RES_FRAMEDIR )).GetValue();
+            static_cast<const SvxFrameDirectionItem&>(GetFormat()->GetFormatAttr( RES_FRAMEDIR )).GetValue();
     if( bVert )
     {
         if( FRMDIR_HORI_LEFT_TOP == nDir || FRMDIR_HORI_RIGHT_TOP == nDir )
@@ -355,35 +355,35 @@ static void lcl_FormatLay( SwLayoutFrm *pLay )
 }
 
 /// Create Flys or register draw objects
-static void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage )
+static void lcl_MakeObjs( const SwFrameFormats &rTable, SwPageFrm *pPage )
 {
     // formats are in the special table of the document
 
-    for ( size_t i = 0; i < rTbl.size(); ++i )
+    for ( size_t i = 0; i < rTable.size(); ++i )
     {
-        SwFrmFmt *pFmt = rTbl[i];
-        const SwFmtAnchor &rAnch = pFmt->GetAnchor();
+        SwFrameFormat *pFormat = rTable[i];
+        const SwFormatAnchor &rAnch = pFormat->GetAnchor();
         if ( rAnch.GetPageNum() == pPage->GetPhyPageNum() )
         {
-            if( rAnch.GetCntntAnchor() )
+            if( rAnch.GetContentAnchor() )
             {
                 if (FLY_AT_PAGE == rAnch.GetAnchorId())
                 {
-                    SwFmtAnchor aAnch( rAnch );
+                    SwFormatAnchor aAnch( rAnch );
                     aAnch.SetAnchor( 0 );
-                    pFmt->SetFmtAttr( aAnch );
+                    pFormat->SetFormatAttr( aAnch );
                 }
                 else
                     continue;
             }
 
             // is it a border or a SdrObject?
-            bool bSdrObj = RES_DRAWFRMFMT == pFmt->Which();
+            bool bSdrObj = RES_DRAWFRMFMT == pFormat->Which();
             SdrObject *pSdrObj = 0;
-            if ( bSdrObj  && 0 == (pSdrObj = pFmt->FindSdrObject()) )
+            if ( bSdrObj  && 0 == (pSdrObj = pFormat->FindSdrObject()) )
             {
                 OSL_FAIL( "DrawObject not found." );
-                pFmt->GetDoc()->DelFrmFmt( pFmt );
+                pFormat->GetDoc()->DelFrameFormat( pFormat );
                 --i;
                 continue;
             }
@@ -417,7 +417,7 @@ static void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage )
             }
             else
             {
-                SwIterator<SwFlyFrm,SwFmt> aIter( *pFmt );
+                SwIterator<SwFlyFrm,SwFormat> aIter( *pFormat );
                 SwFlyFrm *pFly = aIter.First();
                 if ( pFly)
                 {
@@ -425,7 +425,7 @@ static void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage )
                         pFly->AnchorFrm()->RemoveFly( pFly );
                 }
                 else
-                    pFly = new SwFlyLayFrm( static_cast<SwFlyFrmFmt*>(pFmt), pPg, pPg );
+                    pFly = new SwFlyLayFrm( static_cast<SwFlyFrameFormat*>(pFormat), pPg, pPg );
                 pPg->AppendFly( pFly );
                 ::RegistFlys( pPg, pFly );
             }
@@ -433,9 +433,9 @@ static void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage )
     }
 }
 
-void SwPageFrm::PreparePage( bool bFtn )
+void SwPageFrm::PreparePage( bool bFootnote )
 {
-    SetFtnPage( bFtn );
+    SetFootnotePage( bFootnote );
 
     // #i82258#
     // Due to made change on OOo 2.0 code line, method <::lcl_FormatLay(..)> has
@@ -455,13 +455,13 @@ void SwPageFrm::PreparePage( bool bFtn )
     // There might be Flys or draw objects that want to be placed on
     // empty pages, however, the empty pages ignore that and the following
     // pages take care of them.
-    if ( !bFtn && !IsEmptyPage() )
+    if ( !bFootnote && !IsEmptyPage() )
     {
-        SwDoc *pDoc = GetFmt()->GetDoc();
+        SwDoc *pDoc = GetFormat()->GetDoc();
 
         if ( GetPrev() && static_cast<SwPageFrm*>(GetPrev())->IsEmptyPage() )
-            lcl_MakeObjs( *pDoc->GetSpzFrmFmts(), static_cast<SwPageFrm*>(GetPrev()) );
-        lcl_MakeObjs( *pDoc->GetSpzFrmFmts(), this );
+            lcl_MakeObjs( *pDoc->GetSpzFrameFormats(), static_cast<SwPageFrm*>(GetPrev()) );
+        lcl_MakeObjs( *pDoc->GetSpzFrameFormats(), this );
 
         // format footer/ header
         SwLayoutFrm *pLow = static_cast<SwLayoutFrm*>(Lower());
@@ -469,11 +469,11 @@ void SwPageFrm::PreparePage( bool bFtn )
         {
             if ( pLow->GetType() & (FRM_HEADER|FRM_FOOTER) )
             {
-                SwCntntFrm *pCntnt = pLow->ContainsCntnt();
-                while ( pCntnt && pLow->IsAnLower( pCntnt ) )
+                SwContentFrm *pContent = pLow->ContainsContent();
+                while ( pContent && pLow->IsAnLower( pContent ) )
                 {
-                    pCntnt->OptCalc();  // not the predecessors
-                    pCntnt = pCntnt->GetNextCntntFrm();
+                    pContent->OptCalc();  // not the predecessors
+                    pContent = pContent->GetNextContentFrm();
                 }
             }
             pLow = static_cast<SwLayoutFrm*>(pLow->GetNext());
@@ -535,12 +535,12 @@ void SwPageFrm::SwClientNotify(const SwModify& rModify, const SfxHint& rHint)
     {
         // currently the savest way:
         static_cast<SwRootFrm*>(GetUpper())->SetSuperfluous();
-        SetMaxFtnHeight(pDesc->GetFtnInfo().GetHeight());
-        if(!GetMaxFtnHeight())
-            SetMaxFtnHeight(LONG_MAX);
-        SetColMaxFtnHeight();
+        SetMaxFootnoteHeight(pDesc->GetFootnoteInfo().GetHeight());
+        if(!GetMaxFootnoteHeight())
+            SetMaxFootnoteHeight(LONG_MAX);
+        SetColMaxFootnoteHeight();
         // here, the page might be destroyed:
-        static_cast<SwRootFrm*>(GetUpper())->RemoveFtns(0, false, true);
+        static_cast<SwRootFrm*>(GetUpper())->RemoveFootnotes(0, false, true);
     }
     else
         SwClient::SwClientNotify(rModify, rHint);
@@ -559,11 +559,11 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             // If the frame format is changed, several things might also change:
             // 1. columns:
             assert(pOld && pNew); //FMT_CHG Missing Format
-            const SwFmt *const pOldFmt = static_cast<const SwFmtChg*>(pOld)->pChangedFmt;
-            const SwFmt *const pNewFmt = static_cast<const SwFmtChg*>(pNew)->pChangedFmt;
-            assert(pOldFmt && pNewFmt); //FMT_CHG Missing Format
-            const SwFmtCol &rOldCol = pOldFmt->GetCol();
-            const SwFmtCol &rNewCol = pNewFmt->GetCol();
+            const SwFormat *const pOldFormat = static_cast<const SwFormatChg*>(pOld)->pChangedFormat;
+            const SwFormat *const pNewFormat = static_cast<const SwFormatChg*>(pNew)->pChangedFormat;
+            assert(pOldFormat && pNewFormat); //FMT_CHG Missing Format
+            const SwFormatCol &rOldCol = pOldFormat->GetCol();
+            const SwFormatCol &rNewCol = pNewFormat->GetCol();
             if( rOldCol != rNewCol )
             {
                 SwLayoutFrm *pB = FindBodyCont();
@@ -573,13 +573,13 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             }
 
             // 2. header and footer:
-            const SwFmtHeader &rOldH = pOldFmt->GetHeader();
-            const SwFmtHeader &rNewH = pNewFmt->GetHeader();
+            const SwFormatHeader &rOldH = pOldFormat->GetHeader();
+            const SwFormatHeader &rNewH = pNewFormat->GetHeader();
             if( rOldH != rNewH )
                 rInvFlags |= 0x08;
 
-            const SwFmtFooter &rOldF = pOldFmt->GetFooter();
-            const SwFmtFooter &rNewF = pNewFmt->GetFooter();
+            const SwFormatFooter &rOldF = pOldFormat->GetFooter();
+            const SwFormatFooter &rNewF = pNewFormat->GetFooter();
             if( rOldF != rNewF )
                 rInvFlags |= 0x10;
             CheckDirChange();
@@ -605,9 +605,9 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             }
             else if (pNew)
             {
-                const SwFmtFrmSize &rSz = nWhich == RES_FMT_CHG ?
-                        static_cast<const SwFmtChg*>(pNew)->pChangedFmt->GetFrmSize() :
-                        static_cast<const SwFmtFrmSize&>(*pNew);
+                const SwFormatFrmSize &rSz = nWhich == RES_FMT_CHG ?
+                        static_cast<const SwFormatChg*>(pNew)->pChangedFormat->GetFrmSize() :
+                        static_cast<const SwFormatFrmSize&>(*pNew);
 
                 Frm().Height( std::max( rSz.GetHeight(), long(MINLAY) ) );
                 Frm().Width ( std::max( rSz.GetWidth(),  long(MINLAY) ) );
@@ -638,7 +638,7 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             {
                 SwLayoutFrm *pB = FindBodyCont();
                 assert(pB); //page without body
-                pB->ChgColumns( *static_cast<const SwFmtCol*>(pOld), *static_cast<const SwFmtCol*>(pNew) );
+                pB->ChgColumns( *static_cast<const SwFormatCol*>(pOld), *static_cast<const SwFormatCol*>(pNew) );
                 rInvFlags |= 0x22;
             }
         break;
@@ -685,16 +685,16 @@ bool SwPageFrm::GetInfo( SfxPoolItem & rInfo ) const
     return true; // continue searching
 }
 
-void  SwPageFrm::SetPageDesc( SwPageDesc *pNew, SwFrmFmt *pFmt )
+void  SwPageFrm::SetPageDesc( SwPageDesc *pNew, SwFrameFormat *pFormat )
 {
     pDesc = pNew;
-    if ( pFmt )
-        SetFrmFmt( pFmt );
+    if ( pFormat )
+        SetFrameFormat( pFormat );
 }
 
 /* determine the right PageDesc:
  *  0.  from the document for footnote and endnote pages
- *  1.  from the first BodyCntnt below a page
+ *  1.  from the first BodyContent below a page
  *  2.  from PageDesc of the predecessor page
  *  3.  from PageDesc of the previous page if blank page
  *  3.1 from PageDesc of the next page if no predecessor exists
@@ -704,13 +704,13 @@ void  SwPageFrm::SetPageDesc( SwPageDesc *pNew, SwFrmFmt *pFmt )
 SwPageDesc *SwPageFrm::FindPageDesc()
 {
     // 0.
-    if ( IsFtnPage() )
+    if ( IsFootnotePage() )
     {
-        SwDoc *pDoc = GetFmt()->GetDoc();
+        SwDoc *pDoc = GetFormat()->GetDoc();
         if ( IsEndNotePage() )
             return pDoc->GetEndNoteInfo().GetPageDesc( *pDoc );
         else
-            return pDoc->GetFtnInfo().GetPageDesc( *pDoc );
+            return pDoc->GetFootnoteInfo().GetPageDesc( *pDoc );
     }
 
     SwPageDesc *pRet = 0;
@@ -719,9 +719,9 @@ SwPageDesc *SwPageFrm::FindPageDesc()
     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
     if( pSh && pSh->GetViewOptions()->getBrowseMode() )
     {
-        SwCntntFrm *pFrm = GetUpper()->ContainsCntnt();
+        SwContentFrm *pFrm = GetUpper()->ContainsContent();
         while (pFrm && !pFrm->IsInDocBody())
-            pFrm = pFrm->GetNextCntntFrm();
+            pFrm = pFrm->GetNextContentFrm();
         if (pFrm)
         {
             SwFrm *pFlow = pFrm;
@@ -730,11 +730,11 @@ SwPageDesc *SwPageFrm::FindPageDesc()
             pRet = const_cast<SwPageDesc*>(pFlow->GetAttrSet()->GetPageDesc().GetPageDesc());
         }
         if ( !pRet )
-            pRet = &GetFmt()->GetDoc()->GetPageDesc( 0 );
+            pRet = &GetFormat()->GetDoc()->GetPageDesc( 0 );
         return pRet;
     }
 
-    SwFrm *pFlow = FindFirstBodyCntnt();
+    SwFrm *pFlow = FindFirstBodyContent();
     if ( pFlow && pFlow->IsInTab() )
         pFlow = pFlow->FindTabFrm();
 
@@ -761,7 +761,7 @@ SwPageDesc *SwPageFrm::FindPageDesc()
 
     //4.
     if ( !pRet )
-        pRet = &GetFmt()->GetDoc()->GetPageDesc( 0 );
+        pRet = &GetFormat()->GetDoc()->GetPageDesc( 0 );
 
     OSL_ENSURE( pRet, "could not find page descriptor." );
     return pRet;
@@ -898,7 +898,7 @@ void SwPageFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
     getRootFrm()->CheckViewLayout( 0, 0 );
 }
 
-static void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm )
+static void lcl_PrepFlyInCntRegister( SwContentFrm *pFrm )
 {
     pFrm->Prepare( PREP_REGISTER );
     if( pFrm->GetDrawObjs() )
@@ -910,11 +910,11 @@ static void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm )
             if ( pAnchoredObj->ISA(SwFlyInCntFrm) )
             {
                 SwFlyFrm* pFly = static_cast<SwFlyInCntFrm*>(pAnchoredObj);
-                SwCntntFrm *pCnt = pFly->ContainsCntnt();
+                SwContentFrm *pCnt = pFly->ContainsContent();
                 while ( pCnt )
                 {
                     lcl_PrepFlyInCntRegister( pCnt );
-                    pCnt = pCnt->GetNextCntntFrm();
+                    pCnt = pCnt->GetNextContentFrm();
                 }
             }
         }
@@ -923,11 +923,11 @@ static void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm )
 
 void SwPageFrm::PrepareRegisterChg()
 {
-    SwCntntFrm *pFrm = FindFirstBodyCntnt();
+    SwContentFrm *pFrm = FindFirstBodyContent();
     while( pFrm )
     {
         lcl_PrepFlyInCntRegister( pFrm );
-        pFrm = pFrm->GetNextCntntFrm();
+        pFrm = pFrm->GetNextContentFrm();
         if( !IsAnLower( pFrm ) )
             break;
     }
@@ -940,11 +940,11 @@ void SwPageFrm::PrepareRegisterChg()
             if ( pAnchoredObj->ISA(SwFlyFrm) )
             {
                 SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pAnchoredObj);
-                pFrm = pFly->ContainsCntnt();
+                pFrm = pFly->ContainsContent();
                 while ( pFrm )
                 {
                     ::lcl_PrepFlyInCntRegister( pFrm );
-                    pFrm = pFrm->GetNextCntntFrm();
+                    pFrm = pFrm->GetNextContentFrm();
                 }
             }
         }
@@ -978,27 +978,27 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p
     SwTwips nDocPos  = LONG_MAX;
 
     SwRootFrm *pRoot = static_cast<SwRootFrm*>(pStart->GetUpper());
-    SwDoc* pDoc      = pStart->GetFmt()->GetDoc();
-    const bool bFtns = !pDoc->GetFtnIdxs().empty();
+    SwDoc* pDoc      = pStart->GetFormat()->GetDoc();
+    const bool bFootnotes = !pDoc->GetFootnoteIdxs().empty();
 
     SwPageFrm *pPage = pStart;
     if( pPage->GetPrev() && static_cast<SwPageFrm*>(pPage->GetPrev())->IsEmptyPage() )
         pPage = static_cast<SwPageFrm*>(pPage->GetPrev());
     while ( pPage )
     {
-        // obtain PageDesc and FrmFmt
+        // obtain PageDesc and FrameFormat
         SwPageDesc *pDesc = pPage->FindPageDesc();
         bool bCheckEmpty = pPage->IsEmptyPage();
         bool bActOdd = pPage->OnRightPage();
         bool bOdd = pPage->WannaRightPage();
         bool bFirst = pPage->OnFirstPage();
-        SwFrmFmt *pFmtWish = (bOdd)
-            ? pDesc->GetRightFmt(bFirst) : pDesc->GetLeftFmt(bFirst);
+        SwFrameFormat *pFormatWish = (bOdd)
+            ? pDesc->GetRightFormat(bFirst) : pDesc->GetLeftFormat(bFirst);
 
         if ( bActOdd != bOdd ||
              pDesc != pPage->GetPageDesc() ||        // wrong Desc
-             ( pFmtWish != pPage->GetFmt()  &&       // wrong format and
-               ( !pPage->IsEmptyPage() || pFmtWish ) // not blank /empty
+             ( pFormatWish != pPage->GetFormat()  &&       // wrong format and
+               ( !pPage->IsEmptyPage() || pFormatWish ) // not blank /empty
              )
            )
         {
@@ -1020,7 +1020,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p
             //  5. Normal page should have different format -> change
             //  6. No "wish" format provided -> take the "other" format (left/right) of the PageDesc
 
-            if ( pPage->IsEmptyPage() && ( pFmtWish ||          //1.
+            if ( pPage->IsEmptyPage() && ( pFormatWish ||          //1.
                  ( !bOdd && !pPage->GetPrev() ) ) )
             {
                 SwPageFrm *pTmp = static_cast<SwPageFrm*>(pPage->GetNext());
@@ -1036,7 +1036,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p
                     *ppPrev = pTmp;
                 continue;
             }
-            else if ( pPage->IsEmptyPage() && !pFmtWish &&  //2.
+            else if ( pPage->IsEmptyPage() && !pFormatWish &&  //2.
                       pDesc != pPage->GetPageDesc() )
             {
                 pPage->SetPageDesc( pDesc, 0 );
@@ -1051,7 +1051,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p
             {
                 if ( pPage->GetPrev() )
                     pDesc = static_cast<SwPageFrm*>(pPage->GetPrev())->GetPageDesc();
-                SwPageFrm *pTmp = new SwPageFrm( pDoc->GetEmptyPageFmt(),pRoot,pDesc);
+                SwPageFrm *pTmp = new SwPageFrm( pDoc->GetEmptyPageFormat(),pRoot,pDesc);
                 pTmp->Paste( pRoot, pPage );
                 pTmp->PreparePage( false );
                 pPage = pTmp;
@@ -1059,29 +1059,29 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p
             else if ( pPage->GetPageDesc() != pDesc )           //4.
             {
                 SwPageDesc *pOld = pPage->GetPageDesc();
-                pPage->SetPageDesc( pDesc, pFmtWish );
-                if ( bFtns )
+                pPage->SetPageDesc( pDesc, pFormatWish );
+                if ( bFootnotes )
                 {
-                    // If specific values of the FtnInfo are changed, something has to happen.
+                    // If specific values of the FootnoteInfo are changed, something has to happen.
                     // We try to limit the damage...
-                    // If the page has no FtnCont it might be problematic.
+                    // If the page has no FootnoteCont it might be problematic.
                     // Let's hope that invalidation is enough.
-                    SwFtnContFrm *pCont = pPage->FindFtnCont();
-                    if ( pCont && !(pOld->GetFtnInfo() == pDesc->GetFtnInfo()) )
+                    SwFootnoteContFrm *pCont = pPage->FindFootnoteCont();
+                    if ( pCont && !(pOld->GetFootnoteInfo() == pDesc->GetFootnoteInfo()) )
                         pCont->_InvalidateAll();
                 }
             }
-            else if ( pFmtWish && pPage->GetFmt() != pFmtWish )         //5.
+            else if ( pFormatWish && pPage->GetFormat() != pFormatWish )         //5.
             {
-                pPage->SetFrmFmt( pFmtWish );
+                pPage->SetFrameFormat( pFormatWish );
             }
-            else if ( !pFmtWish )                                       //6.
+            else if ( !pFormatWish )                                       //6.
             {
                 // get format with inverted logic
-                if (!pFmtWish)
-                    pFmtWish = bOdd ? pDesc->GetLeftFmt() : pDesc->GetRightFmt();
-                if ( pPage->GetFmt() != pFmtWish )
-                    pPage->SetFrmFmt( pFmtWish );
+                if (!pFormatWish)
+                    pFormatWish = bOdd ? pDesc->GetLeftFormat() : pDesc->GetRightFormat();
+                if ( pPage->GetFormat() != pFormatWish )
+                    pPage->SetFrameFormat( pFormatWish );
             }
 #if OSL_DEBUG_LEVEL > 0
             else
@@ -1098,7 +1098,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p
             SwPageFrm *pPg = static_cast<SwPageFrm*>(pPage->GetNext());
             if( !pPg || pPage->OnRightPage() == pPg->WannaRightPage() )
             {
-                // The following page can find a FrmFmt or has no successor -> empty page not needed
+                // The following page can find a FrameFormat or has no successor -> empty page not needed
                 SwPageFrm *pTmp = static_cast<SwPageFrm*>(pPage->GetNext());
                 pPage->Cut();
                 bool bUpdatePrev = false;
@@ -1119,10 +1119,10 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p
     pRoot->SetAssertFlyPages();
     SwRootFrm::AssertPageFlys( pStart );
 
-    if ( bNotifyFields && (!pImp || !pImp->IsUpdateExpFlds()) )
+    if ( bNotifyFields && (!pImp || !pImp->IsUpdateExpFields()) )
     {
-        SwDocPosUpdate aMsgHnt( nDocPos );
-        pDoc->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt );
+        SwDocPosUpdate aMsgHint( nDocPos );
+        pDoc->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint );
     }
 
 #if OSL_DEBUG_LEVEL > 0
@@ -1148,7 +1148,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p
 #endif
 }
 
-SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn )
+SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFootnote )
 {
     SwRootFrm *pRoot = static_cast<SwRootFrm*>(pPrevPage->GetUpper());
     SwPageFrm *pSibling = static_cast<SwPageFrm*>(pPrevPage->GetNext());
@@ -1159,10 +1159,10 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn )
     bool bWishedOdd = bNextOdd;
 
     // Which PageDesc is relevant?
-    // For CntntFrm take the one from format if provided,
+    // For ContentFrm take the one from format if provided,
     // otherwise from the Follow of the PrevPage
     if ( IsFlowFrm() && !SwFlowFrm::CastFlowFrm( this )->IsFollow() )
-    {   SwFmtPageDesc &rDesc = (SwFmtPageDesc&)GetAttrSet()->GetPageDesc();
+    {   SwFormatPageDesc &rDesc = (SwFormatPageDesc&)GetAttrSet()->GetPageDesc();
         pDesc = rDesc.GetPageDesc();
         if ( rDesc.GetNumOffset() )
         {
@@ -1176,49 +1176,49 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn )
         pDesc = pPrevPage->GetPageDesc()->GetFollow();
 
     assert(pDesc && "Missing PageDesc");
-    if( !(bWishedOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt()) )
+    if( !(bWishedOdd ? pDesc->GetRightFormat() : pDesc->GetLeftFormat()) )
         bWishedOdd = !bWishedOdd;
     bool const bWishedFirst = pDesc != pPrevPage->GetPageDesc();
 
-    SwDoc *pDoc = pPrevPage->GetFmt()->GetDoc();
+    SwDoc *pDoc = pPrevPage->GetFormat()->GetDoc();
     bool bCheckPages = false;
-    // If there is no FrmFmt for this page, create an empty page.
+    // If there is no FrameFormat for this page, create an empty page.
     if( bWishedOdd != bNextOdd )
     {
-        SwFrmFmt *const pEmptyFmt = pDoc->GetEmptyPageFmt();
+        SwFrameFormat *const pEmptyFormat = pDoc->GetEmptyPageFormat();
         SwPageDesc *pTmpDesc = pPrevPage->GetPageDesc();
-        SwPageFrm *pPage = new SwPageFrm(pEmptyFmt, pRoot, pTmpDesc);
+        SwPageFrm *pPage = new SwPageFrm(pEmptyFormat, pRoot, pTmpDesc);
         pPage->Paste( pRoot, pSibling );
-        pPage->PreparePage( bFtn );
+        pPage->PreparePage( bFootnote );
         // If the sibling has no body text, destroy it as long as it is no footnote page.
-        if ( pSibling && !pSibling->IsFtnPage() &&
-             !pSibling->FindFirstBodyCntnt() )
+        if ( pSibling && !pSibling->IsFootnotePage() &&
+             !pSibling->FindFirstBodyContent() )
         {
             SwPageFrm *pDel = pSibling;
             pSibling = static_cast<SwPageFrm*>(pSibling->GetNext());
-            if ( !pDoc->GetFtnIdxs().empty() )
-                pRoot->RemoveFtns( pDel, true );
+            if ( !pDoc->GetFootnoteIdxs().empty() )
+                pRoot->RemoveFootnotes( pDel, true );
             pDel->Cut();
             SwFrm::DestroyFrm(pDel);
         }
         else
             bCheckPages = true;
     }
-    SwFrmFmt *const pFmt( (bWishedOdd)
-            ? pDesc->GetRightFmt(bWishedFirst)
-            : pDesc->GetLeftFmt(bWishedFirst) );
-    assert(pFmt);
-    SwPageFrm *pPage = new SwPageFrm( pFmt, pRoot, pDesc );
+    SwFrameFormat *const pFormat( (bWishedOdd)
+            ? pDesc->GetRightFormat(bWishedFirst)
+            : pDesc->GetLeftFormat(bWishedFirst) );
+    assert(pFormat);
+    SwPageFrm *pPage = new SwPageFrm( pFormat, pRoot, pDesc );
     pPage->Paste( pRoot, pSibling );
-    pPage->PreparePage( bFtn );
+    pPage->PreparePage( bFootnote );
     // If the sibling has no body text, destroy it as long as it is no footnote page.
-    if ( pSibling && !pSibling->IsFtnPage() &&
-         !pSibling->FindFirstBodyCntnt() )
+    if ( pSibling && !pSibling->IsFootnotePage() &&
+         !pSibling->FindFirstBodyContent() )
     {
         SwPageFrm *pDel = pSibling;
         pSibling = static_cast<SwPageFrm*>(pSibling->GetNext());
-        if ( !pDoc->GetFtnIdxs().empty() )
-            pRoot->RemoveFtns( pDel, true );
+        if ( !pDoc->GetFootnoteIdxs().empty() )
+            pRoot->RemoveFootnotes( pDel, true );
         pDel->Cut();
         SwFrm::DestroyFrm(pDel);
     }
@@ -1248,10 +1248,10 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn )
     // For the update of page numbering fields, nDocPos provides
     // the page position from where invalidation should start.
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
-    if ( !pSh || !pSh->Imp()->IsUpdateExpFlds() )
+    if ( !pSh || !pSh->Imp()->IsUpdateExpFields() )
     {
-        SwDocPosUpdate aMsgHnt( pPrevPage->Frm().Top() );
-        pDoc->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt );
+        SwDocPosUpdate aMsgHint( pPrevPage->Frm().Top() );
+        pDoc->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint );
     }
     return pPage;
 }
@@ -1295,7 +1295,7 @@ SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool )
 /// remove pages that are not needed at all
 void SwRootFrm::RemoveSuperfluous()
 {
-    // A page is empty if the body text area has no CntntFrm, but not if there
+    // A page is empty if the body text area has no ContentFrm, but not if there
     // is at least one Fly or one footnote attached to the page. Two runs are
     // needed: one for endnote pages and one for the pages of the body text.
 
@@ -1323,7 +1323,7 @@ void SwRootFrm::RemoveSuperfluous()
                 // #i28701#
                 SwAnchoredObject* pAnchoredObj = rObjs[i];
                 // OD 2004-01-19 #110582# - do not consider hidden objects
-                if ( pPage->GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId(
+                if ( pPage->GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId(
                                     pAnchoredObj->GetDrawObj()->GetLayer() ) &&
                      !pAnchoredObj->GetAnchorFrm()->FindFooterOrHeader() )
                 {
@@ -1337,20 +1337,20 @@ void SwRootFrm::RemoveSuperfluous()
         // exists.
         const SwLayoutFrm* pBody = 0;
         if ( bExistEssentialObjs ||
-             pPage->FindFtnCont() ||
+             pPage->FindFootnoteCont() ||
              ( 0 != ( pBody = pPage->FindBodyCont() ) &&
-                ( pBody->ContainsCntnt() ||
+                ( pBody->ContainsContent() ||
                     // #i47580#
                     // Do not delete page if there's an empty tabframe
                     // left. I think it might be correct to use ContainsAny()
-                    // instead of ContainsCntnt() to cover the empty-table-case,
+                    // instead of ContainsContent() to cover the empty-table-case,
                     // but I'm not fully sure, since ContainsAny() also returns
                     // SectionFrames. Therefore I prefer to do it the safe way:
                   ( pBody->Lower() && pBody->Lower()->IsTabFrm() ) ) ) )
         {
-            if ( pPage->IsFtnPage() )
+            if ( pPage->IsFootnotePage() )
             {
-                while ( pPage->IsFtnPage() )
+                while ( pPage->IsFootnotePage() )
                 {
                     pPage = static_cast<SwPageFrm*>(pPage->GetPrev());
                     OSL_ENSURE( pPage, "only endnote pages remain." );
@@ -1365,8 +1365,8 @@ void SwRootFrm::RemoveSuperfluous()
         {
             SwPageFrm *pEmpty = pPage;
             pPage = static_cast<SwPageFrm*>(pPage->GetPrev());
-            if ( !GetFmt()->GetDoc()->GetFtnIdxs().empty() )
-                RemoveFtns( pEmpty, true );
+            if ( !GetFormat()->GetDoc()->GetFootnoteIdxs().empty() )
+                RemoveFootnotes( pEmpty, true );
             pEmpty->Cut();
             SwFrm::DestroyFrm(pEmpty);
             nDocPos = pPage ? pPage->Frm().Top() : 0;
@@ -1375,10 +1375,10 @@ void SwRootFrm::RemoveSuperfluous()
 
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
     if ( nDocPos != LONG_MAX &&
-         (!pSh || !pSh->Imp()->IsUpdateExpFlds()) )
+         (!pSh || !pSh->Imp()->IsUpdateExpFields()) )
     {
-        SwDocPosUpdate aMsgHnt( nDocPos );
-        GetFmt()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt );
+        SwDocPosUpdate aMsgHint( nDocPos );
+        GetFormat()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint );
     }
 }
 
@@ -1389,22 +1389,22 @@ void SwRootFrm::AssertFlyPages()
         return;
     mbAssertFlyPages = false;
 
-    SwDoc *pDoc = GetFmt()->GetDoc();
-    const SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts();
+    SwDoc *pDoc = GetFormat()->GetDoc();
+    const SwFrameFormats *pTable = pDoc->GetSpzFrameFormats();
 
     // what page targets the "last" Fly?
     sal_uInt16 nMaxPg = 0;
 
-    for ( size_t i = 0; i < pTbl->size(); ++i )
+    for ( size_t i = 0; i < pTable->size(); ++i )
     {
-        const SwFmtAnchor &rAnch = (*pTbl)[i]->GetAnchor();
-        if ( !rAnch.GetCntntAnchor() && nMaxPg < rAnch.GetPageNum() )
+        const SwFormatAnchor &rAnch = (*pTable)[i]->GetAnchor();
+        if ( !rAnch.GetContentAnchor() && nMaxPg < rAnch.GetPageNum() )
             nMaxPg = rAnch.GetPageNum();
     }
     // How many pages exist at the moment?
     SwPageFrm *pPage = static_cast<SwPageFrm*>(Lower());
     while ( pPage && pPage->GetNext() &&
-            !static_cast<SwPageFrm*>(pPage->GetNext())->IsFtnPage() )
+            !static_cast<SwPageFrm*>(pPage->GetNext())->IsFootnotePage() )
     {
         pPage = static_cast<SwPageFrm*>(pPage->GetNext());
     }
@@ -1417,37 +1417,37 @@ void SwRootFrm::AssertFlyPages()
         SwFrm *pSibling = pPage->GetNext();
         for ( sal_uInt16 i = pPage->GetPhyPageNum(); i < nMaxPg; ++i  )
         {
-            if ( !(bOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt()) )
+            if ( !(bOdd ? pDesc->GetRightFormat() : pDesc->GetLeftFormat()) )
             {
                 // Insert empty page (but Flys will be stored in the next page)
-                pPage = new SwPageFrm( pDoc->GetEmptyPageFmt(), this, pDesc );
+                pPage = new SwPageFrm( pDoc->GetEmptyPageFormat(), this, pDesc );
                 pPage->Paste( this, pSibling );
                 pPage->PreparePage( false );
                 bOdd = !bOdd;
                 ++i;
             }
             pPage = new
-                    SwPageFrm( (bOdd ? pDesc->GetRightFmt() :
-                                       pDesc->GetLeftFmt()), this, pDesc );
+                    SwPageFrm( (bOdd ? pDesc->GetRightFormat() :
+                                       pDesc->GetLeftFormat()), this, pDesc );
             pPage->Paste( this, pSibling );
             pPage->PreparePage( false );
             bOdd = !bOdd;
             pDesc = pDesc->GetFollow();
         }
         // If the endnote pages are now corrupt, destroy them.
-        if ( !pDoc->GetFtnIdxs().empty() )
+        if ( !pDoc->GetFootnoteIdxs().empty() )
         {
             pPage = static_cast<SwPageFrm*>(Lower());
-            while ( pPage && !pPage->IsFtnPage() )
+            while ( pPage && !pPage->IsFootnotePage() )
                 pPage = static_cast<SwPageFrm*>(pPage->GetNext());
 
             if ( pPage )
             {
                 SwPageDesc *pTmpDesc = pPage->FindPageDesc();
                 bOdd = pPage->OnRightPage();
-                if ( pPage->GetFmt() !=
-                     (bOdd ? pTmpDesc->GetRightFmt() : pTmpDesc->GetLeftFmt()) )
-                    RemoveFtns( pPage, false, true );
+                if ( pPage->GetFormat() !=
+                     (bOdd ? pTmpDesc->GetRightFormat() : pTmpDesc->GetLeftFormat()) )
+                    RemoveFootnotes( pPage, false, true );
             }
         }
     }
@@ -1464,8 +1464,8 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage )
             while ( pPage->GetSortedObjs() && i< pPage->GetSortedObjs()->size() )
             {
                 // #i28701#
-                SwFrmFmt& rFmt = (*pPage->GetSortedObjs())[i]->GetFrmFmt();
-                const SwFmtAnchor &rAnch = rFmt.GetAnchor();
+                SwFrameFormat& rFormat = (*pPage->GetSortedObjs())[i]->GetFrameFormat();
+                const SwFormatAnchor &rAnch = rFormat.GetAnchor();
                 const sal_uInt16 nPg = rAnch.GetPageNum();
                 if ((rAnch.GetAnchorId() == FLY_AT_PAGE) &&
                      nPg != pPage->GetPhyPageNum() )
@@ -1477,12 +1477,12 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage )
                         // It can move by itself. Just send a modify to its anchor attribute.
 #if OSL_DEBUG_LEVEL > 1
                         const size_t nCnt = pPage->GetSortedObjs()->size();
-                        rFmt.NotifyClients( 0, (SwFmtAnchor*)&rAnch );
+                        rFormat.NotifyClients( 0, (SwFormatAnchor*)&rAnch );
                         OSL_ENSURE( !pPage->GetSortedObjs() ||
                                 nCnt != pPage->GetSortedObjs()->size(),
                                 "Object couldn't be reattached!" );
 #else
-                        rFmt.NotifyClients( 0, &rAnch );
+                        rFormat.NotifyClients( 0, &rAnch );
 #endif
                         // Do not increment index, in this case
                         continue;
@@ -1543,9 +1543,9 @@ void SwRootFrm::ImplCalcBrowseWidth()
     // Frames and paint objects inside other objects (frames, tables) do not count.
     // Borders and columns are not taken into account.
 
-    SwFrm *pFrm = ContainsCntnt();
+    SwFrm *pFrm = ContainsContent();
     while ( pFrm && !pFrm->IsInDocBody() )
-        pFrm = static_cast<SwCntntFrm*>(pFrm)->GetNextCntntFrm();
+        pFrm = static_cast<SwContentFrm*>(pFrm)->GetNextContentFrm();
     if ( !pFrm )
         return;
 
@@ -1561,11 +1561,11 @@ void SwRootFrm::ImplCalcBrowseWidth()
             pFrm = pFrm->FindTabFrm();
 
         if ( pFrm->IsTabFrm() &&
-             !static_cast<SwLayoutFrm*>(pFrm)->GetFmt()->GetFrmSize().GetWidthPercent() )
+             !static_cast<SwLayoutFrm*>(pFrm)->GetFormat()->GetFrmSize().GetWidthPercent() )
         {
             SwBorderAttrAccess aAccess( SwFrm::GetCache(), pFrm );
             const SwBorderAttrs &rAttrs = *aAccess.Get();
-            const SwFmtHoriOrient &rHori = rAttrs.GetAttrSet().GetHoriOrient();
+            const SwFormatHoriOrient &rHori = rAttrs.GetAttrSet().GetHoriOrient();
             long nWidth = rAttrs.GetSize().Width();
             if ( nWidth < USHRT_MAX-2000 && //-2k, because USHRT_MAX gets missing while trying to resize!
                  text::HoriOrientation::FULL != rHori.GetHoriOrient() )
@@ -1597,19 +1597,19 @@ void SwRootFrm::ImplCalcBrowseWidth()
             {
                 // #i28701#
                 SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i];
-                const SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
+                const SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat();
                 const bool bFly = pAnchoredObj->ISA(SwFlyFrm);
                 if ((bFly && (FAR_AWAY == pAnchoredObj->GetObjRect().Width()))
-                    || rFmt.GetFrmSize().GetWidthPercent())
+                    || rFormat.GetFrmSize().GetWidthPercent())
                 {
                     continue;
                 }
 
                 long nWidth = 0;
-                switch ( rFmt.GetAnchor().GetAnchorId() )
+                switch ( rFormat.GetAnchor().GetAnchorId() )
                 {
                     case FLY_AS_CHAR:
-                        nWidth = bFly ? rFmt.GetFrmSize().GetWidth() :
+                        nWidth = bFly ? rFormat.GetFrmSize().GetWidth() :
                                         pAnchoredObj->GetObjRect().Width();
                         break;
                     case FLY_AT_PARA:
@@ -1621,8 +1621,8 @@ void SwRootFrm::ImplCalcBrowseWidth()
                             // at position FAR_AWAY.
                             if ( bFly )
                             {
-                                nWidth = rFmt.GetFrmSize().GetWidth();
-                                const SwFmtHoriOrient &rHori = rFmt.GetHoriOrient();
+                                nWidth = rFormat.GetFrmSize().GetWidth();
+                                const SwFormatHoriOrient &rHori = rFormat.GetHoriOrient();
                                 switch ( rHori.GetHoriOrient() )
                                 {
                                     case text::HoriOrientation::NONE:
@@ -1753,8 +1753,8 @@ static void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset )
     {
         SwAnchoredObject* pAnchoredObj = (*pSortedObj)[i];
 
-        const SwFrmFmt& rObjFmt = pAnchoredObj->GetFrmFmt();
-        const SwFmtAnchor& rAnchor = rObjFmt.GetAnchor();
+        const SwFrameFormat& rObjFormat = pAnchoredObj->GetFrameFormat();
+        const SwFormatAnchor& rAnchor = rObjFormat.GetAnchor();
 
         // all except from the as character anchored objects are moved
         // when processing the page frame:
@@ -1772,14 +1772,14 @@ static void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset )
             // --> let the active embedded object be moved
             if ( pFlyFrm->Lower() )
             {
-                if ( pFlyFrm->Lower()->IsNoTxtFrm() )
+                if ( pFlyFrm->Lower()->IsNoTextFrm() )
                 {
-                    SwCntntFrm* pCntntFrm = static_cast<SwCntntFrm*>(pFlyFrm->Lower());
+                    SwContentFrm* pContentFrm = static_cast<SwContentFrm*>(pFlyFrm->Lower());
                     SwRootFrm* pRoot = pFlyFrm->Lower()->getRootFrm();
                     SwViewShell *pSh = pRoot ? pRoot->GetCurrShell() : 0;
                     if ( pSh )
                     {
-                        SwOLENode* pNode = pCntntFrm->GetNode()->GetOLENode();
+                        SwOLENode* pNode = pContentFrm->GetNode()->GetOLENode();
                         if ( pNode )
                         {
                             svt::EmbeddedObjectRef& xObj = pNode->GetOLEObj().GetObject();
@@ -1812,7 +1812,7 @@ static void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset )
             pAnchoredDrawObj->SetLastObjRect( pAnchoredDrawObj->GetObjRect().SVRect() );
 
             // clear contour cache
-            if ( pAnchoredDrawObj->GetFrmFmt().GetSurround().IsContour() )
+            if ( pAnchoredDrawObj->GetFrameFormat().GetSurround().IsContour() )
                 ClrContourCache( pAnchoredDrawObj->GetDrawObj() );
         }
         // #i92511#
@@ -1893,7 +1893,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
         mbSidebarChanged = false;
     }
 
-    if( GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE ) )
+    if( GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE ) )
     {
         mnColumns = 1;
         mbBookMode = false;
@@ -2241,7 +2241,7 @@ bool SwPageFrm::IsOverHeaderFooterArea( const Point& rPt, FrameControlType &rCon
             nUpperLimit = pFrm->Frm().Top();
             nLowerLimit = pFrm->Frm().Bottom();
         }
-        else if ( pFrm->IsFtnContFrm() )
+        else if ( pFrm->IsFootnoteContFrm() )
             nLowerLimit = pFrm->Frm().Bottom();
 
         pFrm = pFrm->GetNext();
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index 01a4a5a0d2d5..6ce689ca05ca 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -38,13 +38,13 @@
 
 using namespace ::com::sun::star;
 
-SwPageDesc::SwPageDesc(const OUString& rName, SwFrmFmt *pFmt, SwDoc *const pDoc)
+SwPageDesc::SwPageDesc(const OUString& rName, SwFrameFormat *pFormat, SwDoc *const pDoc)
     : SwModify(nullptr)
     , m_StyleName( rName )
-    , m_Master( pDoc->GetAttrPool(), rName, pFmt )
-    , m_Left( pDoc->GetAttrPool(), rName, pFmt )
-    , m_FirstMaster( pDoc->GetAttrPool(), rName, pFmt )
-    , m_FirstLeft( pDoc->GetAttrPool(), rName, pFmt )
+    , m_Master( pDoc->GetAttrPool(), rName, pFormat )
+    , m_Left( pDoc->GetAttrPool(), rName, pFormat )
+    , m_FirstMaster( pDoc->GetAttrPool(), rName, pFormat )
+    , m_FirstLeft( pDoc->GetAttrPool(), rName, pFormat )
     , m_Depend( this, 0 )
     , m_pFollow( this )
     , m_nRegHeight( 0 )
@@ -70,7 +70,7 @@ SwPageDesc::SwPageDesc( const SwPageDesc &rCpy )
     , m_eUse( rCpy.ReadUseOn() )
     , m_IsLandscape( rCpy.GetLandscape() )
     , m_IsHidden( rCpy.IsHidden() )
-    , m_IsFtnInfo( rCpy.GetFtnInfo() )
+    , m_IsFootnoteInfo( rCpy.GetFootnoteInfo() )
 {
 }
 
@@ -120,16 +120,16 @@ void SwPageDesc::Mirror()
     aSet.Put( m_Master.GetShadow() );
     aSet.Put( m_Master.GetCol() );
     aSet.Put( m_Master.GetFrmDir() );    // #112217#
-    m_Left.SetFmtAttr( aSet );
+    m_Left.SetFormatAttr( aSet );
 }
 
 void SwPageDesc::ResetAllAttr( bool bLeft )
 {
-    SwFrmFmt& rFmt = bLeft ? GetLeft() : GetMaster();
+    SwFrameFormat& rFormat = bLeft ? GetLeft() : GetMaster();
 
     // #i73790# - method renamed
-    rFmt.ResetAllFmtAttr();
-    rFmt.SetFmtAttr( SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR) );
+    rFormat.ResetAllFormatAttr();
+    rFormat.SetFormatAttr( SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR) );
 }
 
 // gets information from Modify
@@ -145,24 +145,24 @@ bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const
 }
 
 /// set the style for the grid alignment
-void SwPageDesc::SetRegisterFmtColl( const SwTxtFmtColl* pFmt )
+void SwPageDesc::SetRegisterFormatColl( const SwTextFormatColl* pFormat )
 {
-    if( pFmt != GetRegisterFmtColl() )
+    if( pFormat != GetRegisterFormatColl() )
     {
-        if( pFmt )
-            const_cast<SwTxtFmtColl*>(pFmt)->Add(&m_Depend);
+        if( pFormat )
+            const_cast<SwTextFormatColl*>(pFormat)->Add(&m_Depend);
         else
-            const_cast<SwTxtFmtColl*>(GetRegisterFmtColl())->Remove(&m_Depend);
+            const_cast<SwTextFormatColl*>(GetRegisterFormatColl())->Remove(&m_Depend);
 
         RegisterChange();
     }
 }
 
 /// retrieve the style for the grid alignment
-const SwTxtFmtColl* SwPageDesc::GetRegisterFmtColl() const
+const SwTextFormatColl* SwPageDesc::GetRegisterFormatColl() const
 {
     const SwModify* pReg = m_Depend.GetRegisteredIn();
-    return static_cast<const SwTxtFmtColl*>(pReg);
+    return static_cast<const SwTextFormatColl*>(pReg);
 }
 
 /// notifie all affected page frames
@@ -184,7 +184,7 @@ void SwPageDesc::RegisterChange()
 
     m_nRegHeight = 0;
     {
-        SwIterator<SwFrm,SwFmt> aIter( GetMaster() );
+        SwIterator<SwFrm,SwFormat> aIter( GetMaster() );
         for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
         {
             if( pLast->IsPageFrm() )
@@ -192,7 +192,7 @@ void SwPageDesc::RegisterChange()
         }
     }
     {
-        SwIterator<SwFrm,SwFmt> aIter( GetLeft() );
+        SwIterator<SwFrm,SwFormat> aIter( GetLeft() );
         for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
         {
             if( pLast->IsPageFrm() )
@@ -200,7 +200,7 @@ void SwPageDesc::RegisterChange()
         }
     }
     {
-        SwIterator<SwFrm,SwFmt> aIter( GetFirstMaster() );
+        SwIterator<SwFrm,SwFormat> aIter( GetFirstMaster() );
         for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
         {
             if( pLast->IsPageFrm() )
@@ -208,7 +208,7 @@ void SwPageDesc::RegisterChange()
         }
     }
     {
-        SwIterator<SwFrm,SwFmt> aIter( GetFirstLeft() );
+        SwIterator<SwFrm,SwFormat> aIter( GetFirstLeft() );
         for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
         {
             if( pLast->IsPageFrm() )
@@ -235,13 +235,13 @@ static const SwFrm* lcl_GetFrmOfNode( const SwNode& rNd )
     const SwModify* pMod;
     sal_uInt16 nFrmType = FRM_CNTNT;
 
-    if( rNd.IsCntntNode() )
+    if( rNd.IsContentNode() )
     {
-        pMod = &static_cast<const SwCntntNode&>(rNd);
+        pMod = &static_cast<const SwContentNode&>(rNd);
     }
     else if( rNd.IsTableNode() )
     {
-        pMod = static_cast<const SwTableNode&>(rNd).GetTable().GetFrmFmt();
+        pMod = static_cast<const SwTableNode&>(rNd).GetTable().GetFrameFormat();
         nFrmType = FRM_TAB;
     }
     else
@@ -261,11 +261,11 @@ const SwPageDesc* SwPageDesc::GetPageDescOfNode(const SwNode& rNd)
     return pRet;
 }
 
-const SwFrmFmt* SwPageDesc::GetPageFmtOfNode( const SwNode& rNd,
+const SwFrameFormat* SwPageDesc::GetPageFormatOfNode( const SwNode& rNd,
                                               bool bCheckForThisPgDc ) const
 {
     // which PageDescFormat is valid for this node?
-    const SwFrmFmt* pRet;
+    const SwFrameFormat* pRet;
     const SwFrm* pChkFrm = lcl_GetFrmOfNode( rNd );
 
     if( pChkFrm && 0 != ( pChkFrm = pChkFrm->FindPageFrm() ))
@@ -302,14 +302,14 @@ bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const
     return bRet;
 }
 
-SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst)
+SwFrameFormat *SwPageDesc::GetLeftFormat(bool const bFirst)
 {
     return (nsUseOnPage::PD_LEFT & m_eUse)
             ? ((bFirst) ? &m_FirstLeft : &m_Left)
             : 0;
 }
 
-SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst)
+SwFrameFormat *SwPageDesc::GetRightFormat(bool const bFirst)
 {
     return (nsUseOnPage::PD_RIGHT & m_eUse)
             ? ((bFirst) ? &m_FirstMaster : &m_Master)
@@ -354,7 +354,7 @@ SwPageDesc* SwPageDesc::GetByName(SwDoc& rDoc, const OUString& rName)
     return 0;
 }
 
-SwPageFtnInfo::SwPageFtnInfo()
+SwPageFootnoteInfo::SwPageFootnoteInfo()
     : m_nMaxHeight( 0 )
     , m_nLineWidth(10)
     , m_eLineStyle( table::BorderLineStyle::SOLID )
@@ -367,7 +367,7 @@ SwPageFtnInfo::SwPageFtnInfo()
            FTNADJ_LEFT;
 }
 
-SwPageFtnInfo::SwPageFtnInfo( const SwPageFtnInfo &rCpy )
+SwPageFootnoteInfo::SwPageFootnoteInfo( const SwPageFootnoteInfo &rCpy )
     : m_nMaxHeight(rCpy.GetHeight())
     , m_nLineWidth(rCpy.m_nLineWidth)
     , m_eLineStyle(rCpy.m_eLineStyle)
@@ -379,7 +379,7 @@ SwPageFtnInfo::SwPageFtnInfo( const SwPageFtnInfo &rCpy )
 {
 }
 
-SwPageFtnInfo &SwPageFtnInfo::operator=( const SwPageFtnInfo& rCpy )
+SwPageFootnoteInfo &SwPageFootnoteInfo::operator=( const SwPageFootnoteInfo& rCpy )
 {
     m_nMaxHeight  = rCpy.GetHeight();
     m_nLineWidth  = rCpy.m_nLineWidth;
@@ -392,7 +392,7 @@ SwPageFtnInfo &SwPageFtnInfo::operator=( const SwPageFtnInfo& rCpy )
     return *this;
 }
 
-bool SwPageFtnInfo::operator==( const SwPageFtnInfo& rCmp ) const
+bool SwPageFootnoteInfo::operator==( const SwPageFootnoteInfo& rCmp ) const
 {
     return m_nMaxHeight == rCmp.GetHeight()
         && m_nLineWidth == rCmp.m_nLineWidth
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 89eb1a326c28..6b9ab9c5cd02 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1547,7 +1547,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
         const SdrObject* pSdrObj = pAnchoredObj->GetDrawObj();
 
         // Do not consider invisible objects
-        if (!pPage->GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId(pSdrObj->GetLayer()))
+        if (!pPage->GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId(pSdrObj->GetLayer()))
             continue;
 
         if (!pAnchoredObj->ISA(SwFlyFrm))
@@ -1558,7 +1558,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
         if (pSelfFly == pFly || gProp.pSRetoucheFly == pFly || !rRect.IsOver(pFly->Frm()))
             continue;
 
-        if (!pFly->GetFmt()->GetPrint().GetValue() &&
+        if (!pFly->GetFormat()->GetPrint().GetValue() &&
                 (OUTDEV_PRINTER == gProp.pSGlobalShell->GetOut()->GetOutDevType() ||
                 gProp.pSGlobalShell->IsPreview()))
             continue;
@@ -1599,7 +1599,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
             }
             else
             {
-                if (!bLowerOfSelf && !pFly->GetFmt()->GetOpaque().GetValue())
+                if (!bLowerOfSelf && !pFly->GetFormat()->GetOpaque().GetValue())
                     //From other layers we are only interested in non
                     //transparent ones or those that are internal
                     continue;
@@ -1617,7 +1617,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
             }
             else
             {
-                if (!pFly->IsLowerOf( gProp.pSRetoucheFly ) && !pFly->GetFmt()->GetOpaque().GetValue())
+                if (!pFly->IsLowerOf( gProp.pSRetoucheFly ) && !pFly->GetFormat()->GetOpaque().GetValue())
                     //From other layers we are only interested in non
                     //transparent ones or those that are internal
                     continue;
@@ -1627,16 +1627,16 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
 
         //If the content of the Fly is transparent, we subtract it only if it's
         //contained in the hell layer.
-        const IDocumentDrawModelAccess* pIDDMA = pFly->GetFmt()->getIDocumentDrawModelAccess();
+        const IDocumentDrawModelAccess* pIDDMA = pFly->GetFormat()->getIDocumentDrawModelAccess();
         bool bHell = pSdrObj->GetLayer() == pIDDMA->GetHellId();
         if ( (bStopOnHell && bHell) ||
              /// Change internal order of condition
-             ///    first check "!bHell", then "..->Lower()" and "..->IsNoTxtFrm()"
+             ///    first check "!bHell", then "..->Lower()" and "..->IsNoTextFrm()"
              ///    have not to be performed, if frame is in "Hell"
-             ( !bHell && pFly->Lower() && pFly->Lower()->IsNoTxtFrm() &&
-               (static_cast<SwNoTxtFrm const*>(pFly->Lower())->IsTransparent() ||
-                static_cast<SwNoTxtFrm const*>(pFly->Lower())->HasAnimation() ||
-                 pFly->GetFmt()->GetSurround().IsContour()
+             ( !bHell && pFly->Lower() && pFly->Lower()->IsNoTextFrm() &&
+               (static_cast<SwNoTextFrm const*>(pFly->Lower())->IsTransparent() ||
+                static_cast<SwNoTextFrm const*>(pFly->Lower())->HasAnimation() ||
+                 pFly->GetFormat()->GetSurround().IsContour()
                )
              )
            )
@@ -1659,7 +1659,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
             //     parent fly frame.
             if (pFrm->IsFlyFrm() &&
                 (pFly->GetAnchorFrm()->FindFlyFrm() == pFrm) &&
-                static_cast<const SwFlyFrmFmt*>(pFly->GetFmt())->IsBackgroundBrushInherited()
+                static_cast<const SwFlyFrameFormat*>(pFly->GetFormat())->IsBackgroundBrushInherited()
                )
             {
                 SwRect aRect;
@@ -3245,7 +3245,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
     SwRect aRect( rRect );
     aRect.Intersection( pSh->VisArea() );
 
-    const bool bExtraData = ::IsExtraData( GetFmt()->GetDoc() );
+    const bool bExtraData = ::IsExtraData( GetFormat()->GetDoc() );
 
     gProp.pSLines = new SwLineRects;   //Container for borders.
 
@@ -3378,7 +3378,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
                 }
 
                 if ( pSh->GetDoc()->GetDocumentSettingManager().get( DocumentSettingId::BACKGROUND_PARA_OVER_DRAWINGS ) )
-                    pPage->PaintBaBo( aPaintRect, pPage, true, /*bOnlyTxtBackground=*/true );
+                    pPage->PaintBaBo( aPaintRect, pPage, true, /*bOnlyTextBackground=*/true );
 
                 if( pSh->GetWin() )
                 {
@@ -3527,14 +3527,14 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
     const_cast<SwRootFrm*>(this)->SetCallbackActionEnabled( bOldAction );
 }
 
-static void lcl_EmergencyFormatFtnCont( SwFtnContFrm *pCont )
+static void lcl_EmergencyFormatFootnoteCont( SwFootnoteContFrm *pCont )
 {
     //It's possible that the Cont will get destroyed.
-    SwCntntFrm *pCnt = pCont->ContainsCntnt();
-    while ( pCnt && pCnt->IsInFtn() )
+    SwContentFrm *pCnt = pCont->ContainsContent();
+    while ( pCnt && pCnt->IsInFootnote() )
     {
         pCnt->Calc();
-        pCnt = pCnt->GetNextCntntFrm();
+        pCnt = pCnt->GetNextContentFrm();
     }
 }
 
@@ -3599,12 +3599,12 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 
     SwShortCut aShortCut( *pFrm, rRect );
     bool bCnt;
-    if ( (bCnt = pFrm->IsCntntFrm()) )
+    if ( (bCnt = pFrm->IsContentFrm()) )
         pFrm->Calc();
 
-    if ( pFrm->IsFtnContFrm() )
+    if ( pFrm->IsFootnoteContFrm() )
     {
-        ::lcl_EmergencyFormatFtnCont( const_cast<SwFtnContFrm*>(static_cast<const SwFtnContFrm*>(pFrm)) );
+        ::lcl_EmergencyFormatFootnoteCont( const_cast<SwFootnoteContFrm*>(static_cast<const SwFootnoteContFrm*>(pFrm)) );
         pFrm = Lower();
     }
 
@@ -3661,7 +3661,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
                 {
                     gProp.pSGlobalShell->InvalidateWindows( aPaintRect );
                     pFrm = pFrm->GetNext();
-                    if ( pFrm && (bCnt = pFrm->IsCntntFrm()) )
+                    if ( pFrm && (bCnt = pFrm->IsContentFrm()) )
                         pFrm->Calc();
                     continue;
                 }
@@ -3675,10 +3675,10 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
             {
                 //Paint the column separator line if needed. The page is
                 //responsible for the page frame - not the upper.
-                const SwFrmFmt *pFmt = GetUpper() && GetUpper()->IsPageFrm()
-                                            ? GetUpper()->GetFmt()
-                                            : GetFmt();
-                const SwFmtCol &rCol = pFmt->GetCol();
+                const SwFrameFormat *pFormat = GetUpper() && GetUpper()->IsPageFrm()
+                                            ? GetUpper()->GetFormat()
+                                            : GetFormat();
+                const SwFormatCol &rCol = pFormat->GetCol();
                 if ( rCol.GetLineAdj() != COLADJ_NONE )
                 {
                     if ( !pPage )
@@ -3688,12 +3688,12 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
                 }
             }
         }
-        if ( !bCnt && pFrm->GetNext() && pFrm->GetNext()->IsFtnContFrm() )
-            ::lcl_EmergencyFormatFtnCont( const_cast<SwFtnContFrm*>(static_cast<const SwFtnContFrm*>(pFrm->GetNext())) );
+        if ( !bCnt && pFrm->GetNext() && pFrm->GetNext()->IsFootnoteContFrm() )
+            ::lcl_EmergencyFormatFootnoteCont( const_cast<SwFootnoteContFrm*>(static_cast<const SwFootnoteContFrm*>(pFrm->GetNext())) );
 
         pFrm = pFrm->GetNext();
 
-        if ( pFrm && (bCnt = pFrm->IsCntntFrm()) )
+        if ( pFrm && (bCnt = pFrm->IsContentFrm()) )
             pFrm->Calc();
     }
 }
@@ -3767,7 +3767,7 @@ void SwPageFrm::PaintBreak( ) const
         if ( pBodyFrm )
         {
             const SwLayoutFrm* pLayBody = static_cast< const SwLayoutFrm* >( pBodyFrm );
-            const SwFlowFrm *pFlowFrm = pLayBody->ContainsCntnt();
+            const SwFlowFrm *pFlowFrm = pLayBody->ContainsContent();
 
             // Test if the first node is a table
             const SwFrm* pFirstFrm = pLayBody->Lower();
@@ -3803,7 +3803,7 @@ void SwColumnFrm::PaintBreak( ) const
 
         if ( pBodyFrm )
         {
-            const SwCntntFrm *pCnt = static_cast< const SwLayoutFrm* >( pBodyFrm )->ContainsCntnt();
+            const SwContentFrm *pCnt = static_cast< const SwLayoutFrm* >( pBodyFrm )->ContainsContent();
             if ( pCnt && pCnt->IsColBreak( true ) )
             {
                 // Paint the break only if:
@@ -3928,12 +3928,12 @@ void SwPageFrm::PaintDecorators( ) const
                 // Footer
                 if ( gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Footer ) )
                 {
-                    const SwFrm* pFtnContFrm = Lower();
-                    while ( pFtnContFrm )
+                    const SwFrm* pFootnoteContFrm = Lower();
+                    while ( pFootnoteContFrm )
                     {
-                        if ( pFtnContFrm->IsFtnContFrm() )
-                            aBodyRect.AddBottom( pFtnContFrm->Frm().Bottom() - aBodyRect.Bottom() );
-                        pFtnContFrm = pFtnContFrm->GetNext();
+                        if ( pFootnoteContFrm->IsFootnoteContFrm() )
+                            aBodyRect.AddBottom( pFootnoteContFrm->Frm().Bottom() - aBodyRect.Bottom() );
+                        pFootnoteContFrm = pFootnoteContFrm->GetNext();
                     }
 
                     long nFooterYOff = aBodyRect.Bottom();
@@ -3960,9 +3960,9 @@ void SwPageFrm::PaintDecorators( ) const
 */
 bool SwFlyFrm::IsBackgroundTransparent() const
 {
-    bool bBackgroundTransparent = GetFmt()->IsBackgroundTransparent();
+    bool bBackgroundTransparent = GetFormat()->IsBackgroundTransparent();
     if ( !bBackgroundTransparent &&
-         static_cast<const SwFlyFrmFmt*>(GetFmt())->IsBackgroundBrushInherited() )
+         static_cast<const SwFlyFrameFormat*>(GetFormat())->IsBackgroundBrushInherited() )
     {
         const SvxBrushItem* pBackgrdBrush = 0;
         const Color* pSectionTOXColor = 0;
@@ -4016,7 +4016,7 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh )
 
     //Attribute dependent, don't paint for printer or Preview
     bool bPaint =  gProp.pSFlyOnlyDraw ||
-                       static_cast<SwContact*>(pUserCall)->GetFmt()->GetPrint().GetValue();
+                       static_cast<SwContact*>(pUserCall)->GetFormat()->GetPrint().GetValue();
     if ( !bPaint )
         bPaint = pSh->GetWin() && !pSh->IsPreview();
 
@@ -4141,14 +4141,14 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     pOut->SetClipRegion();
     const SwPageFrm* pPage = FindPageFrm();
 
-    const SwNoTxtFrm *pNoTxt = Lower() && Lower()->IsNoTxtFrm()
-                                                ? static_cast<const SwNoTxtFrm*>(Lower()) : 0;
+    const SwNoTextFrm *pNoText = Lower() && Lower()->IsNoTextFrm()
+                                                ? static_cast<const SwNoTextFrm*>(Lower()) : 0;
 
     bool bIsChart = false; //#i102950# don't paint additional borders for charts
     //check whether we have a chart
-    if(pNoTxt)
+    if(pNoText)
     {
-        const SwNoTxtNode* pNoTNd = dynamic_cast<const SwNoTxtNode*>(pNoTxt->GetNode());
+        const SwNoTextNode* pNoTNd = dynamic_cast<const SwNoTextNode*>(pNoText->GetNode());
         if( pNoTNd )
         {
             SwOLENode* pOLENd = const_cast<SwOLENode*>(pNoTNd->GetOLENode());
@@ -4158,7 +4158,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     }
 
     {
-        bool bContour = GetFmt()->GetSurround().IsContour();
+        bool bContour = GetFormat()->GetSurround().IsContour();
         tools::PolyPolygon aPoly;
         if ( bContour )
         {
@@ -4171,19 +4171,19 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         // #i47804# - distinguish complete background paint
         // and margin paint.
         // paint complete background for Writer text fly frames
-        bool bPaintCompleteBack( !pNoTxt );
+        bool bPaintCompleteBack( !pNoText );
         // paint complete background for transparent graphic and contour,
         // if own background color exists.
-        const bool bIsGraphicTransparent = pNoTxt && pNoTxt->IsTransparent();
+        const bool bIsGraphicTransparent = pNoText && pNoText->IsTransparent();
         if ( !bPaintCompleteBack &&
              ( bIsGraphicTransparent|| bContour ) )
         {
-            const SwFrmFmt* pSwFrmFmt = dynamic_cast< const SwFrmFmt* >(GetFmt());
+            const SwFrameFormat* pSwFrameFormat = dynamic_cast< const SwFrameFormat* >(GetFormat());
 
-            if (pSwFrmFmt && pSwFrmFmt->supportsFullDrawingLayerFillAttributeSet())
+            if (pSwFrameFormat && pSwFrameFormat->supportsFullDrawingLayerFillAttributeSet())
             {
                 //UUUU check for transparency
-                const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes(pSwFrmFmt->getSdrAllFillAttributesHelper());
+                const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes(pSwFrameFormat->getSdrAllFillAttributesHelper());
 
                 // check if the new fill attributes are used
                 if(aFillAttributes.get() && aFillAttributes->isUsed())
@@ -4193,7 +4193,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
             }
             else
             {
-                SvxBrushItem aBack = GetFmt()->makeBackgroundBrushItem();
+                SvxBrushItem aBack = GetFormat()->makeBackgroundBrushItem();
                 // OD 07.08.2002 #99657# #GetTransChg#
                 //     to determine, if background has to be painted, by checking, if
                 //     background color is not COL_TRANSPARENT ("no fill"/"auto fill")
@@ -4210,10 +4210,10 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         // for transparent graphics in layer Hell, if parent fly frame isn't
         // in layer Hell. It's only painted the intersection between the
         // parent fly frame area and the paint area <aRect>
-        const IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess();
+        const IDocumentDrawModelAccess* pIDDMA = GetFormat()->getIDocumentDrawModelAccess();
 
         if (bIsGraphicTransparent &&
-            GetFmt()->GetDoc()->getIDocumentSettingAccess().get(DocumentSettingId::SUBTRACT_FLYS) &&
+            GetFormat()->GetDoc()->getIDocumentSettingAccess().get(DocumentSettingId::SUBTRACT_FLYS) &&
             GetVirtDrawObj()->GetLayer() == pIDDMA->GetHellId() &&
             GetAnchorFrm()->FindFlyFrm() )
         {
@@ -4256,7 +4256,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
                 // suppress painting of background in printing area for
                 // non-transparent graphics.
                 if ( bPaintMarginOnly ||
-                     ( pNoTxt && !bIsGraphicTransparent ) )
+                     ( pNoText && !bIsGraphicTransparent ) )
                 {
                     //What we actually want to paint is the small stripe between
                     //PrtArea and outer border.
@@ -4268,7 +4268,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
                     pOut->Push();
                     // #i80822#
                     // apply clip region under the same conditions, which are
-                    // used in <SwNoTxtFrm::Paint(..)> to set the clip region
+                    // used in <SwNoTextFrm::Paint(..)> to set the clip region
                     // for painting the graphic/OLE. Thus, the clip region is
                     // also applied for the PDF export.
                     SwViewShell *pSh = getRootFrm()->GetCurrShell();
@@ -4364,7 +4364,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 
     pOut->Pop();
 
-    if ( gProp.pSProgress && pNoTxt )
+    if ( gProp.pSProgress && pNoText )
         gProp.pSProgress->Reschedule();
 }
 
@@ -4634,7 +4634,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect,
 {
     SvxShadowItem rShadow = rAttrs.GetShadow();
 
-    const bool bCnt    = IsCntntFrm();
+    const bool bCnt    = IsContentFrm();
     const bool bTop    = !bCnt || rAttrs.GetTopLine  ( *(this) );
     const bool bBottom = !bCnt || rAttrs.GetBottomLine( *(this) );
 
@@ -4658,7 +4658,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect,
     //         "asked" their frame format.
     const bool bDrawFullShadowRectangle =
             ( IsLayoutFrm() &&
-              (static_cast<const SwLayoutFrm*>(this))->GetFmt()->IsBackgroundTransparent()
+              (static_cast<const SwLayoutFrm*>(this))->GetFormat()->IsBackgroundTransparent()
             );
 
     SWRECTFN( this );
@@ -4690,7 +4690,7 @@ void SwFrm::PaintBorderLine( const SwRect& rRect,
     }
 
     if (pPage->GetSortedObjs() &&
-        pPage->GetFmt()->GetDoc()->getIDocumentSettingAccess().get(DocumentSettingId::SUBTRACT_FLYS))
+        pPage->GetFormat()->GetDoc()->getIDocumentSettingAccess().get(DocumentSettingId::SUBTRACT_FLYS))
     {
         SwRegionRects aRegion( aOut, 4 );
         ::lcl_SubtractFlys( this, pPage, aOut, aRegion, gProp );
@@ -4719,7 +4719,7 @@ static void lcl_SubTopBottom( SwRect&              _iorRect,
                                    const bool       _bPrtOutputDev,
                                    SwPaintProperties& properties )
 {
-    const bool bCnt = _rFrm.IsCntntFrm();
+    const bool bCnt = _rFrm.IsContentFrm();
     if ( _rBox.GetTop() && _rBox.GetTop()->GetInWidth() &&
          ( !bCnt || _rAttrs.GetTopLine( _rFrm ) )
        )
@@ -4980,7 +4980,7 @@ static void lcl_PaintLeftRightLine( const bool         _bLeft,
                                       (aRect.*_rRectFn->fnGetWidth)() );
     }
 
-    if ( _rFrm.IsCntntFrm() )
+    if ( _rFrm.IsContentFrm() )
     {
         ::lcl_ExtendLeftAndRight( aRect, _rFrm, _rAttrs, _rRectFn );
 
@@ -5422,7 +5422,7 @@ void SwFrm::ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSeque
 void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
                          const SwBorderAttrs &rAttrs ) const
 {
-    // There's nothing (Row,Body,Ftn,Root,Column,NoTxt) need to do here
+    // There's nothing (Row,Body,Footnote,Root,Column,NoText) need to do here
     if ((GetType() & (FRM_NOTXT|FRM_ROW|FRM_BODY|FRM_FTN|FRM_COLUMN|FRM_ROOT)))
         return;
 
@@ -5487,7 +5487,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
             //     drawing of border by setting <bDrawOnlyShadowForTransparentFrame>
             //     to true.
             if ( IsLayoutFrm() &&
-                 static_cast<const SwLayoutFrm*>(this)->GetFmt()->IsBackgroundTransparent() )
+                 static_cast<const SwLayoutFrm*>(this)->GetFormat()->IsBackgroundTransparent() )
             {
                  bDrawOnlyShadowForTransparentFrame = true;
             }
@@ -5515,7 +5515,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
             SWRECTFN( pDirRefFrm )
             ::lcl_PaintLeftRightLine ( true, *(this), *(pPage), aRect, rRect, rAttrs, fnRect, gProp);
             ::lcl_PaintLeftRightLine ( false, *(this), *(pPage), aRect, rRect, rAttrs, fnRect, gProp);
-            if ( !IsCntntFrm() || rAttrs.GetTopLine( *(this) ) )
+            if ( !IsContentFrm() || rAttrs.GetTopLine( *(this) ) )
             {
                 // -
                 //-hack
@@ -5532,7 +5532,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
                     ::lcl_PaintTopBottomLine( true, *(this), *(pPage), aRect, rRect, rAttrs, fnRect, gProp );
                 }
             }
-            if ( !IsCntntFrm() || rAttrs.GetBottomLine( *(this) ) )
+            if ( !IsContentFrm() || rAttrs.GetBottomLine( *(this) ) )
             {
                 // -
                 //-hack
@@ -5560,7 +5560,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
  * Currently only the top frame needs to be taken into account
  * Other lines and shadows are set aside
  */
-void SwFtnContFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
+void SwFootnoteContFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
                                 const SwBorderAttrs & ) const
 {
     //If the rectangle is completely inside the PrtArea, no border needs to
@@ -5572,7 +5572,7 @@ void SwFtnContFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
 }
 
 /// Paint footnote lines.
-void SwFtnContFrm::PaintLine( const SwRect& rRect,
+void SwFootnoteContFrm::PaintLine( const SwRect& rRect,
                               const SwPageFrm *pPage ) const
 {
     //The length of the line is derived from the percentual indication on the
@@ -5581,7 +5581,7 @@ void SwFtnContFrm::PaintLine( const SwRect& rRect,
 
     if ( !pPage )
         pPage = FindPageFrm();
-    const SwPageFtnInfo &rInf = pPage->GetPageDesc()->GetFtnInfo();
+    const SwPageFootnoteInfo &rInf = pPage->GetPageDesc()->GetFootnoteInfo();
 
     SWRECTFN( this )
     SwTwips nPrtWidth = (Prt().*fnRect->fnGetWidth)();
@@ -5612,7 +5612,7 @@ void SwFtnContFrm::PaintLine( const SwRect& rRect,
 }
 
 /// Paints the separator line for inside columns
-void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
+void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFormatCol &rFormatCol,
                                  const SwPageFrm *pPage ) const
 {
     const SwFrm *pCol = Lower();
@@ -5624,11 +5624,11 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
     SwRect aLineRect = Prt();
     aLineRect += Frm().Pos();
 
-    SwTwips nTop = ((aLineRect.*fnRect->fnGetHeight)()*rFmtCol.GetLineHeight())
+    SwTwips nTop = ((aLineRect.*fnRect->fnGetHeight)()*rFormatCol.GetLineHeight())
                    / 100 - (aLineRect.*fnRect->fnGetHeight)();
     SwTwips nBottom = 0;
 
-    switch ( rFmtCol.GetLineAdj() )
+    switch ( rFormatCol.GetLineAdj() )
     {
         case COLADJ_CENTER:
             nBottom = nTop / 2; nTop -= nBottom; break;
@@ -5645,7 +5645,7 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
     if( nBottom )
         (aLineRect.*fnRect->fnAddBottom)( nBottom );
 
-    SwTwips nPenHalf = rFmtCol.GetLineWidth();
+    SwTwips nPenHalf = rFormatCol.GetLineWidth();
     (aLineRect.*fnRect->fnSetWidth)( nPenHalf );
     nPenHalf /= 2;
 
@@ -5659,8 +5659,8 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
         (aLineRect.*fnRect->fnSetPosX)
             ( (pCol->Frm().*fnGetX)() - nPenHalf );
         if ( aRect.IsOver( aLineRect ) )
-            PaintBorderLine( aRect, aLineRect , pPage, &rFmtCol.GetLineColor(),
-                   rFmtCol.GetLineStyle() );
+            PaintBorderLine( aRect, aLineRect , pPage, &rFormatCol.GetLineColor(),
+                   rFormatCol.GetLineStyle() );
         pCol = pCol->GetNext();
     }
 }
@@ -5686,7 +5686,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
                 bool bGrid = pGrid->GetRubyTextBelow();
                 bool bCell = GRID_LINES_CHARS == pGrid->GetGridType();
                 long nGrid = pGrid->GetBaseHeight();
-                const SwDoc* pDoc = GetFmt()->GetDoc();
+                const SwDoc* pDoc = GetFormat()->GetDoc();
                 long nGridWidth = GetGridWidth(*pGrid, *pDoc);
                 long nRuby = pGrid->GetRubyHeight();
                 long nSum = nGrid + nRuby;
@@ -6419,7 +6419,7 @@ SwRect SwPageFrm::GetBoundRect() const
 }
 
 void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage,
-                       const bool bLowerBorder, const bool bOnlyTxtBackground ) const
+                       const bool bLowerBorder, const bool bOnlyTextBackground ) const
 {
     if ( !pPage )
         pPage = FindPageFrm();
@@ -6439,19 +6439,19 @@ void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage,
     // OD 20.11.2002 #104598# - take care of page margin area
     // Note: code move from <SwFrm::PaintBackground(..)> to new method
     // <SwPageFrm::Paintmargin(..)>.
-    if ( IsPageFrm() && !bOnlyTxtBackground)
+    if ( IsPageFrm() && !bOnlyTextBackground)
     {
         static_cast<const SwPageFrm*>(this)->PaintMarginArea( rRect, gProp.pSGlobalShell );
     }
 
     // paint background
     {
-        PaintBackground( rRect, pPage, rAttrs, false, bLowerBorder, bOnlyTxtBackground );
+        PaintBackground( rRect, pPage, rAttrs, false, bLowerBorder, bOnlyTextBackground );
     }
 
     // OD 06.08.2002 #99657# - paint border before painting background
     // paint grid for page frame and paint border
-    if (!bOnlyTxtBackground)
+    if (!bOnlyTextBackground)
     {
         SwRect aRect( rRect );
         if( IsPageFrm() )
@@ -6478,7 +6478,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
                              const SwBorderAttrs & rAttrs,
                              const bool bLowerMode,
                              const bool bLowerBorder,
-                             const bool bOnlyTxtBackground ) const
+                             const bool bOnlyTextBackground ) const
 {
     // OD 20.01.2003 #i1837# - no paint of table background, if corresponding
     // option is *not* set.
@@ -6555,7 +6555,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
     }
 
     SwRect aPaintRect( Frm() );
-    if( IsTxtFrm() || IsSctFrm() )
+    if( IsTextFrm() || IsSctFrm() )
         aPaintRect = UnionFrm( true );
 
     if ( aPaintRect.IsOver( rRect ) )
@@ -6565,7 +6565,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
             const bool bBrowse = pSh->GetViewOptions()->getBrowseMode();
             SwRect aRect;
             if ( (bPageFrm && bBrowse) ||
-                 (IsTxtFrm() && Prt().SSize() == Frm().SSize()) )
+                 (IsTextFrm() && Prt().SSize() == Frm().SSize()) )
             {
                 aRect = Frm();
                 ::SwAlignRect( aRect, gProp.pSGlobalShell );
@@ -6573,7 +6573,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
             else
             {
                 ::lcl_CalcBorderRect( aRect, this, rAttrs, false, gProp);
-                if ( (IsTxtFrm() || IsTabFrm()) && GetPrev() )
+                if ( (IsTextFrm() || IsTabFrm()) && GetPrev() )
                 {
                     if ( GetPrev()->GetAttrSet()->GetBackground() == GetAttrSet()->GetBackground() &&
                          lcl_compareFillAttributes(GetPrev()->getSdrAllFillAttributesHelper(), getSdrAllFillAttributesHelper()))
@@ -6652,7 +6652,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
                     //     background transparency have to be considered
                     //     Set missing 5th parameter to the default value GRFNUM_NO
                     //         - see declaration in /core/inc/frmtool.hxx.
-                        if (IsTxtFrm() || !bOnlyTxtBackground)
+                        if (IsTextFrm() || !bOnlyTextBackground)
                             ::DrawGraphic(
                                 pItem,
                                 pOut,
@@ -6765,7 +6765,7 @@ void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage,
                 for ( size_t i = 0; i < rObjs.size(); ++i )
                 {
                     const SwAnchoredObject* pAnchoredObj = rObjs[i];
-                    if ( pPage->GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId(
+                    if ( pPage->GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId(
                                     pAnchoredObj->GetDrawObj()->GetLayer() ) &&
                          pAnchoredObj->ISA(SwFlyFrm) )
                     {
@@ -6773,8 +6773,8 @@ void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage,
                                     static_cast<const SwFlyFrm*>(pAnchoredObj);
                         if ( pFly->IsFlyInCntFrm() && pFly->Frm().IsOver( rRect ) )
                         {
-                            if ( !pFly->Lower() || !pFly->Lower()->IsNoTxtFrm() ||
-                                 !static_cast<const SwNoTxtFrm*>(pFly->Lower())->HasAnimation())
+                            if ( !pFly->Lower() || !pFly->Lower()->IsNoTextFrm() ||
+                                 !static_cast<const SwNoTextFrm*>(pFly->Lower())->HasAnimation())
                                 pFly->RefreshLaySubsidiary( pPage, rRect );
                         }
                     }
@@ -6787,7 +6787,7 @@ void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage,
 
 /**
  * Subsidiary lines to paint the PrtAreas
- * Only the LayoutFrms which directly contain Cntnt
+ * Only the LayoutFrms which directly contain Content
  * Paints the desired line and pays attention to not overpaint any flys
  */
 static void lcl_RefreshLine( const SwLayoutFrm *pLay,
@@ -6856,7 +6856,7 @@ static void lcl_RefreshLine( const SwLayoutFrm *pLay,
             // OD 2004-02-12 #110582#-2 - do *not* consider fly frame, which
             // belongs to a invisible layer
             if ( pFly->IsBackgroundTransparent() ||
-                 !pFly->GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( pObj->GetLayer() ) )
+                 !pFly->GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( pObj->GetLayer() ) )
             {
                 aIter.Next();
                 continue;
@@ -6993,20 +6993,20 @@ void SwPageFrm::PaintSubsidiaryLines( const SwPageFrm *,
     if ( !gProp.pSGlobalShell->IsHeaderFooterEdit() )
     {
         const SwFrm* pLay = Lower();
-        const SwFrm* pFtnCont = NULL;
+        const SwFrm* pFootnoteCont = NULL;
         const SwFrm* pPageBody = NULL;
-        while ( pLay && !( pFtnCont && pPageBody ) )
+        while ( pLay && !( pFootnoteCont && pPageBody ) )
         {
-            if ( pLay->IsFtnContFrm( ) )
-                pFtnCont = pLay;
+            if ( pLay->IsFootnoteContFrm( ) )
+                pFootnoteCont = pLay;
             if ( pLay->IsBodyFrm() )
                 pPageBody = pLay;
             pLay = pLay->GetNext();
         }
 
         SwRect aArea( pPageBody->Frm() );
-        if ( pFtnCont )
-            aArea.AddBottom( pFtnCont->Frm().Bottom() - aArea.Bottom() );
+        if ( pFootnoteCont )
+            aArea.AddBottom( pFootnoteCont->Frm().Bottom() - aArea.Bottom() );
 
         if ( !gProp.pSGlobalShell->GetViewOptions()->IsViewMetaChars( ) )
             ProcessPrimitives( lcl_CreatePageAreaDelimiterPrimitives( aArea ) );
@@ -7019,12 +7019,12 @@ void SwColumnFrm::PaintSubsidiaryLines( const SwPageFrm *,
                                         const SwRect & ) const
 {
     const SwFrm* pLay = Lower();
-    const SwFrm* pFtnCont = NULL;
+    const SwFrm* pFootnoteCont = NULL;
     const SwFrm* pColBody = NULL;
-    while ( pLay && !( pFtnCont && pColBody ) )
+    while ( pLay && !( pFootnoteCont && pColBody ) )
     {
-        if ( pLay->IsFtnContFrm( ) )
-            pFtnCont = pLay;
+        if ( pLay->IsFootnoteContFrm( ) )
+            pFootnoteCont = pLay;
         if ( pLay->IsBodyFrm() )
             pColBody = pLay;
         pLay = pLay->GetNext();
@@ -7043,8 +7043,8 @@ void SwColumnFrm::PaintSubsidiaryLines( const SwPageFrm *,
             aArea.Top( GetUpper()->Frm().Top() );
     }
 
-    if ( pFtnCont )
-        aArea.AddBottom( pFtnCont->Frm().Bottom() - aArea.Bottom() );
+    if ( pFootnoteCont )
+        aArea.AddBottom( pFootnoteCont->Frm().Bottom() - aArea.Bottom() );
 
     ::SwAlignRect( aArea, gProp.pSGlobalShell );
 
@@ -7090,7 +7090,7 @@ void SwHeadFootFrm::PaintSubsidiaryLines( const SwPageFrm *, const SwRect & ) co
  * This method is overridden in order to have no subsidiary lines
  * around the footnotes.
  */
-void SwFtnFrm::PaintSubsidiaryLines( const SwPageFrm *,
+void SwFootnoteFrm::PaintSubsidiaryLines( const SwPageFrm *,
                                         const SwRect & ) const
 {
 }
@@ -7099,7 +7099,7 @@ void SwFtnFrm::PaintSubsidiaryLines( const SwPageFrm *,
  * This method is overridden in order to have no subsidiary lines
  * around the footnotes containers.
  */
-void SwFtnContFrm::PaintSubsidiaryLines( const SwPageFrm *,
+void SwFootnoteContFrm::PaintSubsidiaryLines( const SwPageFrm *,
                                         const SwRect & ) const
 {
 }
@@ -7158,7 +7158,7 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
     // OD 18.11.2002 #99672# - collect body, header, footer, footnote and section
     // sub-lines in <pSpecSubsLine> array.
     const bool bSpecialSublines = IsBodyFrm() || IsHeaderFrm() || IsFooterFrm() ||
-                                  IsFtnFrm() || IsSctFrm();
+                                  IsFootnoteFrm() || IsSctFrm();
     SwLineRects* pUsedSubsLines = bSpecialSublines ? gProp.pSSpecSubsLines : gProp.pSSubsLines;
 
     // NOTE: for cell frames only left and right (horizontal layout) respectively
@@ -7233,7 +7233,7 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
  */
 void SwPageFrm::RefreshExtraData( const SwRect &rRect ) const
 {
-    const SwLineNumberInfo &rInfo = GetFmt()->GetDoc()->GetLineNumberInfo();
+    const SwLineNumberInfo &rInfo = GetFormat()->GetDoc()->GetLineNumberInfo();
     bool bLineInFly = (rInfo.IsPaintLineNumbers() && rInfo.IsCountInFlys())
         || (sal_Int16)SW_MOD()->GetRedlineMarkPos() != text::HoriOrientation::NONE;
 
@@ -7261,22 +7261,22 @@ void SwPageFrm::RefreshExtraData( const SwRect &rRect ) const
 void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const
 {
 
-    const SwLineNumberInfo &rInfo = GetFmt()->GetDoc()->GetLineNumberInfo();
+    const SwLineNumberInfo &rInfo = GetFormat()->GetDoc()->GetLineNumberInfo();
     bool bLineInBody = rInfo.IsPaintLineNumbers(),
              bLineInFly  = bLineInBody && rInfo.IsCountInFlys(),
              bRedLine = (sal_Int16)SW_MOD()->GetRedlineMarkPos()!=text::HoriOrientation::NONE;
 
-    const SwCntntFrm *pCnt = ContainsCntnt();
+    const SwContentFrm *pCnt = ContainsContent();
     while ( pCnt && IsAnLower( pCnt ) )
     {
-        if ( pCnt->IsTxtFrm() && ( bRedLine ||
+        if ( pCnt->IsTextFrm() && ( bRedLine ||
              ( !pCnt->IsInTab() &&
                ((bLineInBody && pCnt->IsInDocBody()) ||
                (bLineInFly  && pCnt->IsInFly())) ) ) &&
              pCnt->Frm().Top() <= rRect.Bottom() &&
              pCnt->Frm().Bottom() >= rRect.Top() )
         {
-            static_cast<const SwTxtFrm*>(pCnt)->PaintExtraData( rRect );
+            static_cast<const SwTextFrm*>(pCnt)->PaintExtraData( rRect );
         }
         if ( bLineInFly && pCnt->GetDrawObjs() )
             for ( size_t i = 0; i < pCnt->GetDrawObjs()->size(); ++i )
@@ -7291,7 +7291,7 @@ void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const
                         pFly->RefreshExtraData( rRect );
                 }
         }
-        pCnt = pCnt->GetNextCntntFrm();
+        pCnt = pCnt->GetNextContentFrm();
     }
 }
 
@@ -7634,16 +7634,16 @@ void SetOutDevAndWin( SwViewShell *pSh, OutputDevice *pO,
     pSh->mpOpt->SetZoom( nZoom );
 }
 
-Graphic SwFrmFmt::MakeGraphic( ImageMap* )
+Graphic SwFrameFormat::MakeGraphic( ImageMap* )
 {
     return Graphic();
 }
 
-Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
+Graphic SwFlyFrameFormat::MakeGraphic( ImageMap* pMap )
 {
     Graphic aRet;
     //search any Fly!
-    SwIterator<SwFrm,SwFmt> aIter( *this );
+    SwIterator<SwFrm,SwFormat> aIter( *this );
     SwFrm *pFirst = aIter.First();
     SwViewShell *pSh;
     if ( pFirst && 0 != ( pSh = pFirst->getRootFrm()->GetCurrShell()) )
@@ -7745,7 +7745,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
     return aRet;
 }
 
-Graphic SwDrawFrmFmt::MakeGraphic( ImageMap* )
+Graphic SwDrawFrameFormat::MakeGraphic( ImageMap* )
 {
     Graphic aRet;
     SwDrawModel* pMod = getIDocumentDrawModelAccess()->GetDrawModel();
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index cb8ccff8a4a8..aa2ba0e663ec 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -41,30 +41,30 @@
 #include <sortedobjs.hxx>
 
 SwSectionFrm::SwSectionFrm( SwSection &rSect, SwFrm* pSib )
-    : SwLayoutFrm( rSect.GetFmt(), pSib )
+    : SwLayoutFrm( rSect.GetFormat(), pSib )
     , SwFlowFrm( static_cast<SwFrm&>(*this) )
     , pSection( &rSect )
-    , bFtnAtEnd(false)
+    , bFootnoteAtEnd(false)
     , bEndnAtEnd(false)
-    , bCntntLock(false)
-    , bOwnFtnNum(false)
-    , bFtnLock(false)
+    , bContentLock(false)
+    , bOwnFootnoteNum(false)
+    , bFootnoteLock(false)
 {
     mnFrmType = FRM_SECTION;
 
-    CalcFtnAtEndFlag();
+    CalcFootnoteAtEndFlag();
     CalcEndAtEndFlag();
 }
 
 SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, bool bMaster ) :
-    SwLayoutFrm( rSect.GetFmt(), rSect.getRootFrm() ),
+    SwLayoutFrm( rSect.GetFormat(), rSect.getRootFrm() ),
     SwFlowFrm( (SwFrm&)*this ),
     pSection( rSect.GetSection() ),
-    bFtnAtEnd( rSect.IsFtnAtEnd() ),
+    bFootnoteAtEnd( rSect.IsFootnoteAtEnd() ),
     bEndnAtEnd( rSect.IsEndnAtEnd() ),
-    bCntntLock( false ),
-    bOwnFtnNum( false ),
-    bFtnLock( false )
+    bContentLock( false ),
+    bOwnFootnoteNum( false ),
+    bFootnoteLock( false )
 {
     mnFrmType = FRM_SECTION;
 
@@ -101,16 +101,16 @@ void SwSectionFrm::Init()
     (Frm().*fnRect->fnSetHeight)( 0 );
 
     // #109700# LRSpace for sections
-    const SvxLRSpaceItem& rLRSpace = GetFmt()->GetLRSpace();
+    const SvxLRSpaceItem& rLRSpace = GetFormat()->GetLRSpace();
     (Prt().*fnRect->fnSetLeft)( rLRSpace.GetLeft() );
     (Prt().*fnRect->fnSetWidth)( nWidth - rLRSpace.GetLeft() -
                                  rLRSpace.GetRight() );
     (Prt().*fnRect->fnSetHeight)( 0 );
 
-    const SwFmtCol &rCol = GetFmt()->GetCol();
-    if( ( rCol.GetNumCols() > 1 || IsAnyNoteAtEnd() ) && !IsInFtn() )
+    const SwFormatCol &rCol = GetFormat()->GetCol();
+    if( ( rCol.GetNumCols() > 1 || IsAnyNoteAtEnd() ) && !IsInFootnote() )
     {
-        const SwFmtCol *pOld = Lower() ? &rCol : new SwFmtCol;
+        const SwFormatCol *pOld = Lower() ? &rCol : new SwFormatCol;
         ChgColumns( *pOld, rCol, IsAnyNoteAtEnd() );
         if( pOld != &rCol )
             delete pOld;
@@ -119,7 +119,7 @@ void SwSectionFrm::Init()
 
 void SwSectionFrm::DestroyImpl()
 {
-    if( GetFmt() && !GetFmt()->GetDoc()->IsInDtor() )
+    if( GetFormat() && !GetFormat()->GetDoc()->IsInDtor() )
     {
         SwRootFrm *pRootFrm = getRootFrm();
         if( pRootFrm )
@@ -173,8 +173,8 @@ void SwSectionFrm::DelEmpty( bool bRemove )
                  pViewShell->GetLayout()->IsAnyShellAccessible() )
             {
                 pViewShell->InvalidateAccessibleParaFlowRelation(
-                                dynamic_cast<SwTxtFrm*>(FindNextCnt( true )),
-                                dynamic_cast<SwTxtFrm*>(FindPrevCnt( true )) );
+                                dynamic_cast<SwTextFrm*>(FindNextCnt( true )),
+                                dynamic_cast<SwTextFrm*>(FindPrevCnt( true )) );
             }
         }
         _Cut( bRemove );
@@ -233,10 +233,10 @@ void SwSectionFrm::_Cut( bool bRemove )
         pFrm->_InvalidatePos();
         if( pFrm->IsSctFrm() )
             pFrm = static_cast<SwSectionFrm*>(pFrm)->ContainsAny();
-        if ( pFrm && pFrm->IsCntntFrm() )
+        if ( pFrm && pFrm->IsContentFrm() )
         {
             pFrm->InvalidatePage( pPage );
-            if( IsInFtn() && !GetIndPrev() )
+            if( IsInFootnote() && !GetIndPrev() )
                 pPrepFrm = pFrm;
         }
     }
@@ -247,7 +247,7 @@ void SwSectionFrm::_Cut( bool bRemove )
         if ( 0 != (pFrm = GetPrev()) )
         {   pFrm->SetRetouche();
             pFrm->Prepare( PREP_WIDOWS_ORPHANS );
-            if ( pFrm->IsCntntFrm() )
+            if ( pFrm->IsContentFrm() )
                 pFrm->InvalidatePage( pPage );
         }
         // If I am (was) the only FlowFrm in my Upper, then he has to take over
@@ -264,7 +264,7 @@ void SwSectionFrm::_Cut( bool bRemove )
     if( bRemove )
     {
         RemoveFromLayout();
-        if( pUp && !pUp->Lower() && pUp->IsFtnFrm() && !pUp->IsColLocked() &&
+        if( pUp && !pUp->Lower() && pUp->IsFootnoteFrm() && !pUp->IsColLocked() &&
             pUp->GetUpper() )
         {
             pUp->Cut();
@@ -293,7 +293,7 @@ void SwSectionFrm::_Cut( bool bRemove )
 void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
 {
     OSL_ENSURE( pParent, "No parent for Paste()." );
-    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is CntntFrm." );
+    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is ContentFrm." );
     OSL_ENSURE( pParent != this, "I'm my own parent." );
     OSL_ENSURE( pSibling != this, "I'm my own neighbour." );
     OSL_ENSURE( !GetPrev() && !GetUpper(),
@@ -337,9 +337,9 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
                 {
                     while ( pTmp->GetNext() )
                         pTmp = pTmp->GetNext();
-                    SwFrm* pSave = ::SaveCntnt( pCol );
+                    SwFrm* pSave = ::SaveContent( pCol );
                     if (pSave)
-                        ::RestoreCntnt( pSave, pSibling->GetUpper(), pTmp, true );
+                        ::RestoreContent( pSave, pSibling->GetUpper(), pTmp, true );
                 }
             }
         }
@@ -360,7 +360,7 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
         }
         if( !static_cast<SwLayoutFrm*>(pParent)->Lower() )
         {
-            SwSectionFrm::MoveCntntAndDelete( static_cast<SwSectionFrm*>(pParent), false );
+            SwSectionFrm::MoveContentAndDelete( static_cast<SwSectionFrm*>(pParent), false );
             pParent = this;
         }
     }
@@ -375,7 +375,7 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
     {
         pSibling->_InvalidatePos();
         pSibling->_InvalidatePrt();
-        if ( pSibling->IsCntntFrm() )
+        if ( pSibling->IsContentFrm() )
             pSibling->InvalidatePage( pPage );
     }
 
@@ -388,7 +388,7 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
         if ( !IsFollow() )
         {
             GetPrev()->InvalidateSize();
-            if ( GetPrev()->IsCntntFrm() )
+            if ( GetPrev()->IsContentFrm() )
                 GetPrev()->InvalidatePage( pPage );
         }
     }
@@ -405,15 +405,15 @@ bool SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const
     if( !pFrm->IsSctFrm() )
         return false;
 
-    const SwSectionFmt *pTmp = static_cast<const SwSectionFmt*>(GetFmt());
+    const SwSectionFormat *pTmp = static_cast<const SwSectionFormat*>(GetFormat());
 
-    const SwFrmFmt *pOtherFmt = static_cast<const SwSectionFrm*>(pFrm)->GetFmt();
+    const SwFrameFormat *pOtherFormat = static_cast<const SwSectionFrm*>(pFrm)->GetFormat();
     do
     {
         pTmp = pTmp->GetParent();
         if( !pTmp )
             return false;
-        if( pTmp == pOtherFmt )
+        if( pTmp == pOtherFormat )
             return true;
     } while( true ); // ( pTmp->GetSect().GetValue() );
 }
@@ -429,7 +429,7 @@ void SwSectionFrm::MergeNext( SwSectionFrm* pNxt )
     {
         PROTOCOL( this, PROT_SECTION, ACT_MERGE, pNxt )
 
-        SwFrm* pTmp = ::SaveCntnt( pNxt );
+        SwFrm* pTmp = ::SaveContent( pNxt );
         if( pTmp )
         {
             SwFrm* pLast = Lower();
@@ -447,7 +447,7 @@ void SwSectionFrm::MergeNext( SwSectionFrm* pNxt )
                             pLast = pLast->GetNext();
                 }
             }
-            ::RestoreCntnt( pTmp, pLay, pLast, true );
+            ::RestoreContent( pTmp, pLay, pLast, true );
         }
         SetFollow( pNxt->GetFollow() );
         pNxt->SetFollow( NULL );
@@ -473,7 +473,7 @@ bool SwSectionFrm::SplitSect( SwFrm* pFrm, bool bApres )
     if( pSect != this )
         return false;
     // Put the content aside
-    SwFrm* pSav = ::SaveCntnt( this, bApres ? pOther : pFrm );
+    SwFrm* pSav = ::SaveContent( this, bApres ? pOther : pFrm );
     OSL_ENSURE( pSav, "SplitSect: What's on?" );
     if( pSav ) // be robust
     {   // Create a new SctFrm, not as a Follower/master
@@ -491,7 +491,7 @@ bool SwSectionFrm::SplitSect( SwFrm* pFrm, bool bApres )
             // Search for last layout frame, e.g. for columned sections.
             while( pLay->Lower() && pLay->Lower()->IsLayoutFrm() )
                 pLay = static_cast<SwLayoutFrm*>(pLay->Lower());
-            ::RestoreCntnt( pSav, pLay, NULL, true );
+            ::RestoreContent( pSav, pLay, NULL, true );
         }
         _InvalidateSize();
         if( HasFollow() )
@@ -505,7 +505,7 @@ bool SwSectionFrm::SplitSect( SwFrm* pFrm, bool bApres )
 }
 
 /**
-|*  MoveCntnt is called for destroying a SectionFrms, due to
+|*  MoveContent is called for destroying a SectionFrms, due to
 |*  the cancellation or hiding of a section, to handle the content.
 |*  If the SectionFrm hasn't broken up another one, then the content
 |*  is moved to the Upper. Otherwise the content is moved to another
@@ -530,23 +530,23 @@ static void lcl_InvalidateInfFlags( SwFrm* pFrm, bool bInva )
     }
 }
 
-// Works like SwCntntFrm::ImplGetNextCntntFrm, but starts with a LayoutFrm
-static SwCntntFrm* lcl_GetNextCntntFrm( const SwLayoutFrm* pLay, bool bFwd )
+// Works like SwContentFrm::ImplGetNextContentFrm, but starts with a LayoutFrm
+static SwContentFrm* lcl_GetNextContentFrm( const SwLayoutFrm* pLay, bool bFwd )
 {
     if ( bFwd )
     {
-        if ( pLay->GetNext() && pLay->GetNext()->IsCntntFrm() )
-            return const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(pLay->GetNext()));
+        if ( pLay->GetNext() && pLay->GetNext()->IsContentFrm() )
+            return const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pLay->GetNext()));
     }
     else
     {
-        if ( pLay->GetPrev() && pLay->GetPrev()->IsCntntFrm() )
-            return const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(pLay->GetPrev()));
+        if ( pLay->GetPrev() && pLay->GetPrev()->IsContentFrm() )
+            return const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pLay->GetPrev()));
     }
 
     // #100926#
     const SwFrm* pFrm = pLay;
-    SwCntntFrm *pCntntFrm = 0;
+    SwContentFrm *pContentFrm = 0;
     bool bGoingUp = true;
     do {
         const SwFrm *p = 0;
@@ -573,16 +573,16 @@ static SwCntntFrm* lcl_GetNextCntntFrm( const SwLayoutFrm* pLay, bool bFwd )
                 p = p->GetNext();
 
         pFrm = p;
-    } while ( 0 == (pCntntFrm = (pFrm->IsCntntFrm() ? const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(pFrm)) : 0) ));
+    } while ( 0 == (pContentFrm = (pFrm->IsContentFrm() ? const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pFrm)) : 0) ));
 
-    return pCntntFrm;
+    return pContentFrm;
 }
 
 #define FIRSTLEAF( pLayFrm ) ( ( pLayFrm->Lower() && pLayFrm->Lower()->IsColumnFrm() )\
                     ? pLayFrm->GetNextLayoutLeaf() \
                     : pLayFrm )
 
-void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave )
+void SwSectionFrm::MoveContentAndDelete( SwSectionFrm* pDel, bool bSave )
 {
     bool bSize = pDel->Lower() && pDel->Lower()->IsColumnFrm();
     SwFrm* pPrv = pDel->GetPrev();
@@ -590,27 +590,27 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave )
     // OD 27.03.2003 #i12711# - initialize local pointer variables.
     SwSectionFrm* pPrvSct = NULL;
     SwSectionFrm* pNxtSct = NULL;
-    SwSectionFmt* pParent = static_cast<SwSectionFmt*>(pDel->GetFmt())->GetParent();
+    SwSectionFormat* pParent = static_cast<SwSectionFormat*>(pDel->GetFormat())->GetParent();
     if( pDel->IsInTab() && pParent )
     {
         SwTabFrm *pTab = pDel->FindTabFrm();
         // If we are within a table, we can only have broken up sections that
         // are inside as well, but not a section that contains the whole table.
-        if( pTab->IsInSct() && pParent == pTab->FindSctFrm()->GetFmt() )
+        if( pTab->IsInSct() && pParent == pTab->FindSctFrm()->GetFormat() )
             pParent = NULL;
     }
     // If our Format has a parent, we have probably broken up another
     // SectionFrm, which has to be checked. To do so we first acquire the
-    // succeeding and the preceding CntntFrm, let's see if they
+    // succeeding and the preceding ContentFrm, let's see if they
     // lay in the SectionFrms.
     // OD 27.03.2003 #i12711# - check, if previous and next section belonging
     // together and can be joined, *not* only if deleted section contains content.
     if ( pParent )
     {
-        SwFrm* pPrvCntnt = lcl_GetNextCntntFrm( pDel, false );
-        pPrvSct = pPrvCntnt ? pPrvCntnt->FindSctFrm() : NULL;
-        SwFrm* pNxtCntnt = lcl_GetNextCntntFrm( pDel, true );
-        pNxtSct = pNxtCntnt ? pNxtCntnt->FindSctFrm() : NULL;
+        SwFrm* pPrvContent = lcl_GetNextContentFrm( pDel, false );
+        pPrvSct = pPrvContent ? pPrvContent->FindSctFrm() : NULL;
+        SwFrm* pNxtContent = lcl_GetNextContentFrm( pDel, true );
+        pNxtSct = pNxtContent ? pNxtContent->FindSctFrm() : NULL;
     }
     else
     {
@@ -619,25 +619,25 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave )
     }
 
     // Now the content is put aside and the frame is destroyed
-    SwFrm *pSave = bSave ? ::SaveCntnt( pDel ) : NULL;
-    bool bOldFtn = true;
-    if( pSave && pUp->IsFtnFrm() )
+    SwFrm *pSave = bSave ? ::SaveContent( pDel ) : NULL;
+    bool bOldFootnote = true;
+    if( pSave && pUp->IsFootnoteFrm() )
     {
-        bOldFtn = static_cast<SwFtnFrm*>(pUp)->IsColLocked();
-        static_cast<SwFtnFrm*>(pUp)->ColLock();
+        bOldFootnote = static_cast<SwFootnoteFrm*>(pUp)->IsColLocked();
+        static_cast<SwFootnoteFrm*>(pUp)->ColLock();
     }
     pDel->DelEmpty( true );
     SwFrm::DestroyFrm(pDel);
     if( pParent )
     {   // Search for the appropriate insert position
-        if( pNxtSct && pNxtSct->GetFmt() == pParent )
+        if( pNxtSct && pNxtSct->GetFormat() == pParent )
         {   // Here we can insert outselves at the beginning
             pUp = FIRSTLEAF( pNxtSct );
             pPrv = NULL;
-            if( pPrvSct && !( pPrvSct->GetFmt() == pParent ) )
+            if( pPrvSct && !( pPrvSct->GetFormat() == pParent ) )
                 pPrvSct = NULL; // In order that nothing is merged
         }
-        else if( pPrvSct && pPrvSct->GetFmt() == pParent )
+        else if( pPrvSct && pPrvSct->GetFormat() == pParent )
         {   // Wonderful, here we can insert ourselves at the end
             pUp = pPrvSct;
             if( pUp->Lower() && pUp->Lower()->IsColumnFrm() )
@@ -674,15 +674,15 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave )
     if( pSave )
     {
         lcl_InvalidateInfFlags( pSave, bSize );
-        ::RestoreCntnt( pSave, pUp, pPrv, true );
-        pUp->FindPageFrm()->InvalidateCntnt();
-        if( !bOldFtn )
-            static_cast<SwFtnFrm*>(pUp)->ColUnlock();
+        ::RestoreContent( pSave, pUp, pPrv, true );
+        pUp->FindPageFrm()->InvalidateContent();
+        if( !bOldFootnote )
+            static_cast<SwFootnoteFrm*>(pUp)->ColUnlock();
     }
     // Now two parts of the superior section could possibly be merged
     if( pPrvSct && !pPrvSct->IsJoinLocked() )
     {
-        OSL_ENSURE( pNxtSct, "MoveCntnt: No Merge" );
+        OSL_ENSURE( pNxtSct, "MoveContent: No Merge" );
         pPrvSct->MergeNext( pNxtSct );
     }
 }
@@ -738,7 +738,7 @@ void SwSectionFrm::MakeAll()
         mbValidSize = false;
 
 #if OSL_DEBUG_LEVEL > 1
-    const SwFmtCol &rCol = GetFmt()->GetCol();
+    const SwFormatCol &rCol = GetFormat()->GetCol();
     (void)rCol;
 #endif
     SwLayoutFrm::MakeAll();
@@ -753,58 +753,58 @@ bool SwSectionFrm::ShouldBwdMoved( SwLayoutFrm *, bool , bool & )
     return false;
 }
 
-const SwSectionFmt* SwSectionFrm::_GetEndSectFmt() const
+const SwSectionFormat* SwSectionFrm::_GetEndSectFormat() const
 {
-    const SwSectionFmt *pFmt = pSection->GetFmt();
-    while( !pFmt->GetEndAtTxtEnd().IsAtEnd() )
+    const SwSectionFormat *pFormat = pSection->GetFormat();
+    while( !pFormat->GetEndAtTextEnd().IsAtEnd() )
     {
-        if( pFmt->GetRegisteredIn()->ISA( SwSectionFmt ) )
-            pFmt = static_cast<const SwSectionFmt*>(pFmt->GetRegisteredIn());
+        if( pFormat->GetRegisteredIn()->ISA( SwSectionFormat ) )
+            pFormat = static_cast<const SwSectionFormat*>(pFormat->GetRegisteredIn());
         else
             return NULL;
     }
-    return pFmt;
+    return pFormat;
 }
 
-static void lcl_FindCntntFrm( SwCntntFrm* &rpCntntFrm, SwFtnFrm* &rpFtnFrm,
-    SwFrm* pFrm, bool &rbChkFtn )
+static void lcl_FindContentFrm( SwContentFrm* &rpContentFrm, SwFootnoteFrm* &rpFootnoteFrm,
+    SwFrm* pFrm, bool &rbChkFootnote )
 {
     if( pFrm )
     {
         while( pFrm->GetNext() )
             pFrm = pFrm->GetNext();
-        while( !rpCntntFrm && pFrm )
+        while( !rpContentFrm && pFrm )
         {
-            if( pFrm->IsCntntFrm() )
-                rpCntntFrm = static_cast<SwCntntFrm*>(pFrm);
+            if( pFrm->IsContentFrm() )
+                rpContentFrm = static_cast<SwContentFrm*>(pFrm);
             else if( pFrm->IsLayoutFrm() )
             {
-                if( pFrm->IsFtnFrm() )
+                if( pFrm->IsFootnoteFrm() )
                 {
-                    if( rbChkFtn )
+                    if( rbChkFootnote )
                     {
-                        rpFtnFrm = static_cast<SwFtnFrm*>(pFrm);
-                        rbChkFtn = rpFtnFrm->GetAttr()->GetFtn().IsEndNote();
+                        rpFootnoteFrm = static_cast<SwFootnoteFrm*>(pFrm);
+                        rbChkFootnote = rpFootnoteFrm->GetAttr()->GetFootnote().IsEndNote();
                     }
                 }
                 else
-                    lcl_FindCntntFrm( rpCntntFrm, rpFtnFrm,
-                        static_cast<SwLayoutFrm*>(pFrm)->Lower(), rbChkFtn );
+                    lcl_FindContentFrm( rpContentFrm, rpFootnoteFrm,
+                        static_cast<SwLayoutFrm*>(pFrm)->Lower(), rbChkFootnote );
             }
             pFrm = pFrm->GetPrev();
         }
     }
 }
 
-SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode )
+SwContentFrm *SwSectionFrm::FindLastContent( sal_uInt8 nMode )
 {
-    SwCntntFrm *pRet = NULL;
-    SwFtnFrm *pFtnFrm = NULL;
+    SwContentFrm *pRet = NULL;
+    SwFootnoteFrm *pFootnoteFrm = NULL;
     SwSectionFrm *pSect = this;
     if( nMode )
     {
-        const SwSectionFmt *pFmt = IsEndnAtEnd() ? GetEndSectFmt() :
-                                     pSection->GetFmt();
+        const SwSectionFormat *pFormat = IsEndnAtEnd() ? GetEndSectFormat() :
+                                     pSection->GetFormat();
         do {
             while( pSect->HasFollow() )
                 pSect = pSect->GetFollow();
@@ -813,23 +813,23 @@ SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode )
                    !static_cast<SwSectionFrm*>(pTmp)->GetSection() )
                 pTmp = pTmp->FindNext();
             if( pTmp && pTmp->IsSctFrm() &&
-                static_cast<SwSectionFrm*>(pTmp)->IsDescendantFrom( pFmt ) )
+                static_cast<SwSectionFrm*>(pTmp)->IsDescendantFrom( pFormat ) )
                 pSect = static_cast<SwSectionFrm*>(pTmp);
             else
                 break;
         } while( true );
     }
-    bool bFtnFound = nMode == FINDMODE_ENDNOTE;
+    bool bFootnoteFound = nMode == FINDMODE_ENDNOTE;
     do
     {
-        lcl_FindCntntFrm( pRet, pFtnFrm, pSect->Lower(), bFtnFound );
+        lcl_FindContentFrm( pRet, pFootnoteFrm, pSect->Lower(), bFootnoteFound );
         if( pRet || !pSect->IsFollow() || !nMode ||
             ( FINDMODE_MYLAST == nMode && this == pSect ) )
             break;
         pSect = pSect->FindMaster();
     } while( pSect );
-    if( ( nMode == FINDMODE_ENDNOTE ) && pFtnFrm )
-        pRet = pFtnFrm->ContainsCntnt();
+    if( ( nMode == FINDMODE_ENDNOTE ) && pFootnoteFrm )
+        pRet = pFootnoteFrm->ContainsContent();
     return pRet;
 }
 
@@ -848,17 +848,17 @@ bool SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const
 /**
  *  CollectEndnotes looks for endnotes in the sectionfrm and his follows,
  *  the endnotes will cut off the layout and put into the array.
- *  If the first endnote is not a master-SwFtnFrm, the whole sectionfrm
+ *  If the first endnote is not a master-SwFootnoteFrm, the whole sectionfrm
  *  contains only endnotes and it is not necessary to collect them.
  */
-static SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, bool &rbEmpty,
+static SwFootnoteFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, bool &rbEmpty,
     SwLayouter *pLayouter )
 {
     // if rEmpty is set, the rpSect is already searched
     SwSectionFrm* pSect = rbEmpty ? rpSect->GetFollow() : rpSect;
     while( pSect )
     {
-       OSL_ENSURE( (pSect->Lower() && pSect->Lower()->IsColumnFrm()) || pSect->GetUpper()->IsFtnFrm(),
+       OSL_ENSURE( (pSect->Lower() && pSect->Lower()->IsColumnFrm()) || pSect->GetUpper()->IsFootnoteFrm(),
                 "InsertEndnotes: Where's my column?" );
 
         // i73332: Columned section in endnote
@@ -868,17 +868,17 @@ static SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, bool &rbEmpty,
 
         while( pCol ) // check all columns
         {
-            SwFtnContFrm* pFtnCont = pCol->FindFtnCont();
-            if( pFtnCont )
+            SwFootnoteContFrm* pFootnoteCont = pCol->FindFootnoteCont();
+            if( pFootnoteCont )
             {
-                SwFtnFrm* pRet = static_cast<SwFtnFrm*>(pFtnCont->Lower());
+                SwFootnoteFrm* pRet = static_cast<SwFootnoteFrm*>(pFootnoteCont->Lower());
                 while( pRet ) // look for endnotes
                 {
                     /* CollectEndNode can destroy pRet so we need to get the
                        next early
                     */
-                    SwFtnFrm* pRetNext = static_cast<SwFtnFrm*>(pRet->GetNext());
-                    if( pRet->GetAttr()->GetFtn().IsEndNote() )
+                    SwFootnoteFrm* pRetNext = static_cast<SwFootnoteFrm*>(pRet->GetNext());
+                    if( pRet->GetAttr()->GetFootnote().IsEndNote() )
                     {
                         if( pRet->GetMaster() )
                         {
@@ -933,16 +933,16 @@ void SwSectionFrm::CollectEndnotes( SwLayouter* pLayouter )
 {
     OSL_ENSURE( IsColLocked(), "CollectEndnotes: You love the risk?" );
     // i73332: Section in footnode does not have columns!
-    OSL_ENSURE( (Lower() && Lower()->IsColumnFrm()) || GetUpper()->IsFtnFrm(), "Where's my column?" );
+    OSL_ENSURE( (Lower() && Lower()->IsColumnFrm()) || GetUpper()->IsFootnoteFrm(), "Where's my column?" );
 
     SwSectionFrm* pSect = this;
-    SwFtnFrm* pFtn;
+    SwFootnoteFrm* pFootnote;
     bool bEmpty = false;
     // pSect is the last sectionfrm without endnotes or the this-pointer
     // the first sectionfrm with endnotes may be destroyed, when the endnotes
     // is cutted
-    while( 0 != (pFtn = lcl_FindEndnote( pSect, bEmpty, pLayouter )) )
-        pLayouter->CollectEndnote( pFtn );
+    while( 0 != (pFootnote = lcl_FindEndnote( pSect, bEmpty, pLayouter )) )
+        pLayouter->CollectEndnote( pFootnote );
     if( pLayouter->HasEndnotes() )
         lcl_ColumnRefresh( this, true );
 }
@@ -985,18 +985,18 @@ void SwSectionFrm::_CheckClipping( bool bGrow, bool bMaximize )
     // OD 03.11.2003 #i19737# - introduce local variable <bExtraCalc> to indicate
     // that a calculation has to be done beside the value of <bCalc>.
     bool bExtraCalc = false;
-    if( !bCalc && !bGrow && IsAnyNoteAtEnd() && !IsInFtn() )
+    if( !bCalc && !bGrow && IsAnyNoteAtEnd() && !IsInFootnote() )
     {
         SwSectionFrm *pSect = this;
         bool bEmpty = false;
-        SwLayoutFrm* pFtn = IsEndnAtEnd() ?
+        SwLayoutFrm* pFootnote = IsEndnAtEnd() ?
             lcl_FindEndnote( pSect, bEmpty, NULL ) : NULL;
-        if( pFtn )
+        if( pFootnote )
         {
-            pFtn = pFtn->FindFtnBossFrm();
-            SwFrm* pTmp = FindLastCntnt( FINDMODE_LASTCNT );
+            pFootnote = pFootnote->FindFootnoteBossFrm();
+            SwFrm* pTmp = FindLastContent( FINDMODE_LASTCNT );
             // OD 08.11.2002 #104840# - use <SwLayoutFrm::IsBefore(..)>
-            if ( pTmp && pFtn->IsBefore( pTmp->FindFtnBossFrm() ) )
+            if ( pTmp && pFootnote->IsBefore( pTmp->FindFootnoteBossFrm() ) )
                 bExtraCalc = true;
         }
         else if( GetFollow() && !GetFollow()->ContainsAny() )
@@ -1033,13 +1033,13 @@ void SwSectionFrm::_CheckClipping( bool bGrow, bool bMaximize )
             if( Lower()->IsColumnFrm() )
             {
                 lcl_ColumnRefresh( this, false );
-                ::CalcCntnt( this );
+                ::CalcContent( this );
             }
             else
             {
                 ChgLowersProp( aOldSz );
-                if( !bMaximize && !IsCntntLocked() )
-                    ::CalcCntnt( this );
+                if( !bMaximize && !IsContentLocked() )
+                    ::CalcContent( this );
             }
         }
     }
@@ -1182,8 +1182,8 @@ class ExtraFormatToPositionObjs
 
                 // format content - first with collecting its foot-/endnotes before content
                 // format, second without collecting its foot-/endnotes.
-                ::CalcCntnt( mpSectFrm );
-                ::CalcCntnt( mpSectFrm, true );
+                ::CalcContent( mpSectFrm );
+                ::CalcContent( mpSectFrm, true );
 
                 // keep locked position of lower floating screen objects
                 SwPageFrm* pPageFrm = mpSectFrm->FindPageFrm();
@@ -1225,7 +1225,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
         SwTwips nUpper = CalcUpperSpace();
 
         // #109700# LRSpace for sections
-        const SvxLRSpaceItem& rLRSpace = GetFmt()->GetLRSpace();
+        const SvxLRSpaceItem& rLRSpace = GetFormat()->GetLRSpace();
         (this->*fnRect->fnSetXMargins)( rLRSpace.GetLeft(), rLRSpace.GetRight() );
 
         if( nUpper != (this->*fnRect->fnGetTopMargin)() )
@@ -1261,8 +1261,8 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
         // and releases this position lock keeping on destruction.
         ExtraFormatToPositionObjs aExtraFormatToPosObjs( *this );
         if ( !bMaximize &&
-             GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) &&
-             !GetFmt()->GetBalancedColumns().GetValue() )
+             GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) &&
+             !GetFormat()->GetBalancedColumns().GetValue() )
         {
             aExtraFormatToPosObjs.FormatSectionToPositionObjs();
         }
@@ -1280,7 +1280,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
             (maFrm.*fnRect->fnSetWidth)( nWidth );
 
             // #109700# LRSpace for sections
-            const SvxLRSpaceItem& rLRSpace = GetFmt()->GetLRSpace();
+            const SvxLRSpaceItem& rLRSpace = GetFormat()->GetLRSpace();
             (maPrt.*fnRect->fnSetWidth)( nWidth - rLRSpace.GetLeft() -
                                         rLRSpace.GetRight() );
 
@@ -1313,7 +1313,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
                     }
                     // #126020# - adjust check for empty section
                     // #130797# - correct fix #126020#
-                    while( HasFollow() && !GetFollow()->ContainsCntnt() &&
+                    while( HasFollow() && !GetFollow()->ContainsContent() &&
                            !GetFollow()->ContainsAny( true ) )
                     {
                         SwFrm* pOld = GetFollow();
@@ -1332,13 +1332,13 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
                         pFrm = static_cast<SwColumnFrm*>(pFrm)->Lower();
                         pFrm->Calc();
                         pFrm = static_cast<SwLayoutFrm*>(pFrm)->Lower();
-                        CalcFtnCntnt();
+                        CalcFootnoteContent();
                     }
-                    // If we are in a columned frame which calls a CalcCntnt
+                    // If we are in a columned frame which calls a CalcContent
                     // in the FormatWidthCols, the content might need calculating
                     if( pFrm && !pFrm->IsValid() && IsInFly() &&
                         FindFlyFrm()->IsColLocked() )
-                        ::CalcCntnt( this );
+                        ::CalcContent( this );
                     nRemaining += InnerHeight();
                     bMaximize = HasFollow();
                 }
@@ -1385,20 +1385,20 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
                         pFrm = static_cast<SwColumnFrm*>(pFrm)->Lower();
                         pFrm->Calc();
                         pFrm = static_cast<SwLayoutFrm*>(pFrm)->Lower();
-                        CalcFtnCntnt();
+                        CalcFootnoteContent();
                     }
                     bool bUnderSz = false;
                     while( pFrm )
                     {
-                        if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsUndersized() )
+                        if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsUndersized() )
                         {
                             pFrm->Prepare( PREP_ADJUST_FRM );
                             bUnderSz = true;
                         }
                         pFrm = pFrm->GetNext();
                     }
-                    if( bUnderSz && !IsCntntLocked() )
-                        ::CalcCntnt( this );
+                    if( bUnderSz && !IsContentLocked() )
+                        ::CalcContent( this );
                 }
             }
         }
@@ -1493,7 +1493,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
 
     // Always end up in the same section: Body again inside Body etc.
     const bool bBody = IsInDocBody();
-    const bool bFtnPage = FindPageFrm()->IsFtnPage();
+    const bool bFootnotePage = FindPageFrm()->IsFootnotePage();
 
     SwLayoutFrm *pLayLeaf;
     // A shortcut for TabFrms such that not all cells need to be visited
@@ -1501,7 +1501,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
         pLayLeaf = 0;
     else if( IsTabFrm() )
     {
-        SwCntntFrm* pTmpCnt = static_cast<SwTabFrm*>(this)->FindLastCntnt();
+        SwContentFrm* pTmpCnt = static_cast<SwTabFrm*>(this)->FindLastContent();
         pLayLeaf = pTmpCnt ? pTmpCnt->GetUpper() : 0;
     }
     else
@@ -1526,14 +1526,14 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
             // another SectionFrm can be inserted here, or we have to continue
             // searching
             SwPageFrm* pNxtPg = pLayLeaf->FindPageFrm();
-            if ( !bFtnPage && pNxtPg->IsFtnPage() )
+            if ( !bFootnotePage && pNxtPg->IsFootnotePage() )
             {   // If I reached the end note pages it's over
                 pLayLeaf = 0;
                 continue;
             }
             // Once inBody always inBody, don't step into tables and not into other sections
             if ( (bBody && !pLayLeaf->IsInDocBody()) ||
-                 (IsInFtn() != pLayLeaf->IsInFtn() ) ||
+                 (IsInFootnote() != pLayLeaf->IsInFootnote() ) ||
                  pLayLeaf->IsInTab() ||
                  ( pLayLeaf->IsInSct() && ( !pSect->HasFollow()
                    || pSect->GetFollow() != pLayLeaf->FindSctFrm() ) ) )
@@ -1597,15 +1597,15 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
             if( pTmp && pTmp != pSect->GetFollow() )
             {
                 SwFlowFrm* pNxt;
-                SwCntntFrm* pNxtCntnt = NULL;
-                if( pTmp->IsCntntFrm() )
+                SwContentFrm* pNxtContent = NULL;
+                if( pTmp->IsContentFrm() )
                 {
-                    pNxt = static_cast<SwCntntFrm*>(pTmp);
-                    pNxtCntnt = static_cast<SwCntntFrm*>(pTmp);
+                    pNxt = static_cast<SwContentFrm*>(pTmp);
+                    pNxtContent = static_cast<SwContentFrm*>(pTmp);
                 }
                 else
                 {
-                    pNxtCntnt = static_cast<SwLayoutFrm*>(pTmp)->ContainsCntnt();
+                    pNxtContent = static_cast<SwLayoutFrm*>(pTmp)->ContainsContent();
                     if( pTmp->IsSctFrm() )
                         pNxt = static_cast<SwSectionFrm*>(pTmp);
                     else
@@ -1613,23 +1613,23 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
                         OSL_ENSURE( pTmp->IsTabFrm(), "GetNextSctLeaf: Wrong Type" );
                         pNxt = static_cast<SwTabFrm*>(pTmp);
                     }
-                    while( !pNxtCntnt && 0 != ( pTmp = pTmp->GetNext() ) )
+                    while( !pNxtContent && 0 != ( pTmp = pTmp->GetNext() ) )
                     {
-                        if( pTmp->IsCntntFrm() )
-                            pNxtCntnt = static_cast<SwCntntFrm*>(pTmp);
+                        if( pTmp->IsContentFrm() )
+                            pNxtContent = static_cast<SwContentFrm*>(pTmp);
                         else
-                            pNxtCntnt = static_cast<SwLayoutFrm*>(pTmp)->ContainsCntnt();
+                            pNxtContent = static_cast<SwLayoutFrm*>(pTmp)->ContainsContent();
                     }
                 }
-                if( pNxtCntnt )
+                if( pNxtContent )
                 {
-                    SwFtnBossFrm* pOldBoss = pSect->FindFtnBossFrm( true );
-                    if( pOldBoss == pNxtCntnt->FindFtnBossFrm( true ) )
+                    SwFootnoteBossFrm* pOldBoss = pSect->FindFootnoteBossFrm( true );
+                    if( pOldBoss == pNxtContent->FindFootnoteBossFrm( true ) )
                     {
-                        SwSaveFtnHeight aHeight( pOldBoss,
+                        SwSaveFootnoteHeight aHeight( pOldBoss,
                             pOldBoss->Frm().Top() + pOldBoss->Frm().Height() );
-                        pSect->GetUpper()->MoveLowerFtns( pNxtCntnt, pOldBoss,
-                                    pLayLeaf->FindFtnBossFrm( true ), false );
+                        pSect->GetUpper()->MoveLowerFootnotes( pNxtContent, pOldBoss,
+                                    pLayLeaf->FindFootnoteBossFrm( true ), false );
                     }
                 }
                 pNxt->MoveSubTree( pLayLeaf, pNew->GetNext() );
@@ -1763,7 +1763,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
                 SwFlowFrm::SetMoveBwdJump( true );
         }
         else if ( bFly )
-            break;  // Cntnts in Flys every layout sheet should be right. Why?
+            break;  // Contents in Flys every layout sheet should be right. Why?
         else
             pLayLeaf = pLayLeaf->GetPrevLayoutLeaf();
     }
@@ -1874,10 +1874,10 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst )
         if ( nDist <= 0L )
             return 0L;
 
-        bool bInCalcCntnt = GetUpper() && IsInFly() && FindFlyFrm()->IsLocked();
+        bool bInCalcContent = GetUpper() && IsInFly() && FindFlyFrm()->IsLocked();
         // OD 2004-03-15 #116561# - allow grow in online layout
         bool bGrow = !Lower() || !Lower()->IsColumnFrm() || !Lower()->GetNext() ||
-             GetSection()->GetFmt()->GetBalancedColumns().GetValue();
+             GetSection()->GetFormat()->GetBalancedColumns().GetValue();
         if( !bGrow )
         {
              const SwViewShell *pSh = getRootFrm()->GetCurrShell();
@@ -1886,7 +1886,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst )
         if( bGrow )
         {
             SwTwips nGrow;
-            if( IsInFtn() )
+            if( IsInFootnote() )
                 nGrow = 0;
             else
             {
@@ -1895,7 +1895,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst )
                                            (Frm().*fnRect->fnGetBottom)() );
             }
             SwTwips nSpace = nGrow;
-            if( !bInCalcCntnt && nGrow < nDist && GetUpper() )
+            if( !bInCalcContent && nGrow < nDist && GetUpper() )
                 nGrow += GetUpper()->Grow( LONG_MAX, true );
 
             if( nGrow > nDist )
@@ -1905,7 +1905,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst )
                 nGrow = 0;
                 if( nDist && !bTst )
                 {
-                    if( bInCalcCntnt )
+                    if( bInCalcContent )
                         _InvalidateSize();
                     else
                         InvalidateSize();
@@ -1913,7 +1913,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst )
             }
             else if( !bTst )
             {
-                if( bInCalcCntnt )
+                if( bInCalcContent )
                     _InvalidateSize();
                 else if( nSpace < nGrow &&  nDist != nSpace + GetUpper()->
                          Grow( nGrow - nSpace, false ) )
@@ -1951,7 +1951,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst )
                         pFrm = pFrm->GetNext();
                     if( pFrm )
                     {
-                        if( bInCalcCntnt )
+                        if( bInCalcContent )
                             pFrm->_InvalidatePos();
                         else
                             pFrm->InvalidatePos();
@@ -1962,7 +1962,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst )
                 // was moved forward due to the positioning of its objects ).
                 // Thus, invalivate this next frame, if document compatibility
                 // option 'Consider wrapping style influence on object positioning' is ON.
-                else if ( GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
+                else if ( GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
                 {
                     InvalidateNextPos();
                 }
@@ -1971,7 +1971,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst )
         }
         if ( !bTst )
         {
-            if( bInCalcCntnt )
+            if( bInCalcContent )
                 _InvalidateSize();
             else
                 InvalidateSize();
@@ -1996,8 +1996,8 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, bool bTst )
             if ( nDist > nFrmHeight )
                 nDist = nFrmHeight;
 
-            if ( Lower()->IsColumnFrm() && Lower()->GetNext() && // FtnAtEnd
-                 !GetSection()->GetFmt()->GetBalancedColumns().GetValue() )
+            if ( Lower()->IsColumnFrm() && Lower()->GetNext() && // FootnoteAtEnd
+                 !GetSection()->GetFormat()->GetBalancedColumns().GetValue() )
             {   // With column bases the format takes over the control of the
                 // growth (because of the balance)
                 if ( !bTst )
@@ -2026,7 +2026,7 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, bool bTst )
                 // The footer frame does not grow in its FormatSize function
                 // but during the calculation of the content of the section
                 // frame. The section frame grows until some of its text is
-                // located on top of the fly frame. The next call of CalcCntnt
+                // located on top of the fly frame. The next call of CalcContent
                 // tries to shrink the section and here it would also shrink
                 // the footer. This may not happen, because shrinking the footer
                 // would cause the top of the section frame to overlap with the
@@ -2072,7 +2072,7 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, bool bTst )
 |*  GetNextLayout, in tables and headers/footers there is none, however in the
 |*  DocBody and in foot notes there is always one.
 |*
-|*  This routine is used in the TxtFormatter to decided whether it's allowed to
+|*  This routine is used in the TextFormatter to decided whether it's allowed to
 |*  create a (paragraph-)Follow or whether the paragraph has to stick together
 |*/
 bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
@@ -2081,9 +2081,9 @@ bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
     if( HasFollow() || ( pFrm->GetUpper()->IsColBodyFrm() &&
         pFrm->GetUpper()->GetUpper()->GetNext() ) )
         return true;
-    if( pFrm->IsInFtn() )
+    if( pFrm->IsInFootnote() )
     {
-        if( IsInFtn() )
+        if( IsInFootnote() )
         {
             if( GetUpper()->IsInSct() )
             {
@@ -2096,7 +2096,7 @@ bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
         }
         // The content of footnote inside a columned sectionfrm is moveable
         // except in the last column
-        const SwLayoutFrm *pLay = pFrm->FindFtnFrm()->GetUpper()->GetUpper();
+        const SwLayoutFrm *pLay = pFrm->FindFootnoteFrm()->GetUpper()->GetUpper();
         if( pLay->IsColumnFrm() && pLay->GetNext() )
         {
             // The first paragraph in the first footnote in the first column
@@ -2104,7 +2104,7 @@ bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
             // if the columnbody is empty.
             bool bRet = false;
             if( pLay->GetIndPrev() || pFrm->GetIndPrev() ||
-                pFrm->FindFtnFrm()->GetPrev() )
+                pFrm->FindFootnoteFrm()->GetPrev() )
                 bRet = true;
             else
             {
@@ -2112,7 +2112,7 @@ bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
                 if( pBody && pBody->Lower() )
                     bRet = true;
             }
-            if( bRet && ( IsFtnAtEnd() || !Growable() ) )
+            if( bRet && ( IsFootnoteAtEnd() || !Growable() ) )
                 return true;
         }
     }
@@ -2198,39 +2198,39 @@ SwFrm* SwFrm::_GetIndNext()
     return NULL;
 }
 
-bool SwSectionFrm::IsDescendantFrom( const SwSectionFmt* pFmt ) const
+bool SwSectionFrm::IsDescendantFrom( const SwSectionFormat* pFormat ) const
 {
-    if( !pSection || !pFmt )
+    if( !pSection || !pFormat )
         return false;
-    const SwSectionFmt *pMyFmt = pSection->GetFmt();
-    while( pFmt != pMyFmt )
+    const SwSectionFormat *pMyFormat = pSection->GetFormat();
+    while( pFormat != pMyFormat )
     {
-        if( pMyFmt->GetRegisteredIn()->ISA( SwSectionFmt ) )
-            pMyFmt = static_cast<const SwSectionFmt*>(pMyFmt->GetRegisteredIn());
+        if( pMyFormat->GetRegisteredIn()->ISA( SwSectionFormat ) )
+            pMyFormat = static_cast<const SwSectionFormat*>(pMyFormat->GetRegisteredIn());
         else
             return false;
     }
     return true;
 }
 
-void SwSectionFrm::CalcFtnAtEndFlag()
+void SwSectionFrm::CalcFootnoteAtEndFlag()
 {
-    SwSectionFmt *pFmt = GetSection()->GetFmt();
-    sal_uInt16 nVal = pFmt->GetFtnAtTxtEnd( false ).GetValue();
-    bFtnAtEnd = FTNEND_ATPGORDOCEND != nVal;
-    bOwnFtnNum = FTNEND_ATTXTEND_OWNNUMSEQ == nVal ||
+    SwSectionFormat *pFormat = GetSection()->GetFormat();
+    sal_uInt16 nVal = pFormat->GetFootnoteAtTextEnd( false ).GetValue();
+    bFootnoteAtEnd = FTNEND_ATPGORDOCEND != nVal;
+    bOwnFootnoteNum = FTNEND_ATTXTEND_OWNNUMSEQ == nVal ||
                  FTNEND_ATTXTEND_OWNNUMANDFMT == nVal;
-    while( !bFtnAtEnd && !bOwnFtnNum )
+    while( !bFootnoteAtEnd && !bOwnFootnoteNum )
     {
-        if( pFmt->GetRegisteredIn()->ISA( SwSectionFmt ) )
-            pFmt = static_cast<SwSectionFmt*>(pFmt->GetRegisteredIn());
+        if( pFormat->GetRegisteredIn()->ISA( SwSectionFormat ) )
+            pFormat = static_cast<SwSectionFormat*>(pFormat->GetRegisteredIn());
         else
             break;
-        nVal = pFmt->GetFtnAtTxtEnd( false ).GetValue();
+        nVal = pFormat->GetFootnoteAtTextEnd( false ).GetValue();
         if( FTNEND_ATPGORDOCEND != nVal )
         {
-            bFtnAtEnd = true;
-            bOwnFtnNum = bOwnFtnNum ||FTNEND_ATTXTEND_OWNNUMSEQ == nVal ||
+            bFootnoteAtEnd = true;
+            bOwnFootnoteNum = bOwnFootnoteNum ||FTNEND_ATTXTEND_OWNNUMSEQ == nVal ||
                          FTNEND_ATTXTEND_OWNNUMANDFMT == nVal;
         }
     }
@@ -2238,20 +2238,20 @@ void SwSectionFrm::CalcFtnAtEndFlag()
 
 bool SwSectionFrm::IsEndnoteAtMyEnd() const
 {
-    return pSection->GetFmt()->GetEndAtTxtEnd( false ).IsAtEnd();
+    return pSection->GetFormat()->GetEndAtTextEnd( false ).IsAtEnd();
 }
 
 void SwSectionFrm::CalcEndAtEndFlag()
 {
-    SwSectionFmt *pFmt = GetSection()->GetFmt();
-    bEndnAtEnd = pFmt->GetEndAtTxtEnd( false ).IsAtEnd();
+    SwSectionFormat *pFormat = GetSection()->GetFormat();
+    bEndnAtEnd = pFormat->GetEndAtTextEnd( false ).IsAtEnd();
     while( !bEndnAtEnd )
     {
-        if( pFmt->GetRegisteredIn()->ISA( SwSectionFmt ) )
-            pFmt = static_cast<SwSectionFmt*>(pFmt->GetRegisteredIn());
+        if( pFormat->GetRegisteredIn()->ISA( SwSectionFormat ) )
+            pFormat = static_cast<SwSectionFormat*>(pFormat->GetRegisteredIn());
         else
             break;
-        bEndnAtEnd = pFmt->GetEndAtTxtEnd( false ).IsAtEnd();
+        bEndnAtEnd = pFormat->GetEndAtTextEnd( false ).IsAtEnd();
     }
 }
 
@@ -2298,7 +2298,7 @@ void SwSectionFrm::SwClientNotify( const SwModify& rMod, const SfxHint& rHint )
                     dynamic_cast<const SwSectionFrmMoveAndDeleteHint*>(&rHint);
     if ( pHint && pHint->GetId() == SFX_HINT_DYING && &rMod == GetRegisteredIn() )
     {
-        SwSectionFrm::MoveCntntAndDelete( this, pHint->IsSaveCntnt() );
+        SwSectionFrm::MoveContentAndDelete( this, pHint->IsSaveContent() );
     }
 }
 
@@ -2312,13 +2312,13 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew
     {   // Suppress multi columns in foot notes
         case RES_FMT_CHG:
         {
-            const SwFmtCol& rNewCol = GetFmt()->GetCol();
-            if( !IsInFtn() )
+            const SwFormatCol& rNewCol = GetFormat()->GetCol();
+            if( !IsInFootnote() )
             {
                 // Nasty case. When allocating a template we can not count
                 // on the old column attribute. We're left with creating a
                 // temporary attribute here.
-                SwFmtCol aCol;
+                SwFormatCol aCol;
                 if ( Lower() && Lower()->IsColumnFrm() )
                 {
                     sal_uInt16 nCol = 0;
@@ -2329,15 +2329,15 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew
                     } while ( pTmp );
                     aCol.Init( nCol, 0, 1000 );
                 }
-                bool bChgFtn = IsFtnAtEnd();
+                bool bChgFootnote = IsFootnoteAtEnd();
                 bool const bChgEndn = IsEndnAtEnd();
                 bool const bChgMyEndn = IsEndnoteAtMyEnd();
-                CalcFtnAtEndFlag();
+                CalcFootnoteAtEndFlag();
                 CalcEndAtEndFlag();
-                bChgFtn = ( bChgFtn != IsFtnAtEnd() ) ||
+                bChgFootnote = ( bChgFootnote != IsFootnoteAtEnd() ) ||
                           ( bChgEndn != IsEndnAtEnd() ) ||
                           ( bChgMyEndn != IsEndnoteAtMyEnd() );
-                ChgColumns( aCol, rNewCol, bChgFtn );
+                ChgColumns( aCol, rNewCol, bChgFootnote );
                 rInvFlags |= 0x10;
             }
             rInvFlags |= 0x01;
@@ -2346,25 +2346,25 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew
             break;
 
         case RES_COL:
-            if( !IsInFtn() )
+            if( !IsInFootnote() )
             {
                 assert(pOld && pNew);
                 if (pOld && pNew)
                 {
-                    ChgColumns( *static_cast<const SwFmtCol*>(pOld), *static_cast<const SwFmtCol*>(pNew) );
+                    ChgColumns( *static_cast<const SwFormatCol*>(pOld), *static_cast<const SwFormatCol*>(pNew) );
                     rInvFlags |= 0x11;
                 }
             }
             break;
 
         case RES_FTN_AT_TXTEND:
-            if( !IsInFtn() )
+            if( !IsInFootnote() )
             {
-                bool const bOld = IsFtnAtEnd();
-                CalcFtnAtEndFlag();
-                if (bOld != IsFtnAtEnd())
+                bool const bOld = IsFootnoteAtEnd();
+                CalcFootnoteAtEndFlag();
+                if (bOld != IsFootnoteAtEnd())
                 {
-                    const SwFmtCol& rNewCol = GetFmt()->GetCol();
+                    const SwFormatCol& rNewCol = GetFormat()->GetCol();
                     ChgColumns( rNewCol, rNewCol, true );
                     rInvFlags |= 0x01;
                 }
@@ -2372,14 +2372,14 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew
             break;
 
         case RES_END_AT_TXTEND:
-            if( !IsInFtn() )
+            if( !IsInFootnote() )
             {
                 bool const bOld = IsEndnAtEnd();
                 bool const bMyOld = IsEndnoteAtMyEnd();
                 CalcEndAtEndFlag();
                 if (bOld != IsEndnAtEnd() || bMyOld != IsEndnoteAtMyEnd())
                 {
-                    const SwFmtCol& rNewCol = GetFmt()->GetCol();
+                    const SwFormatCol& rNewCol = GetFormat()->GetCol();
                     ChgColumns( rNewCol, rNewCol, true );
                     rInvFlags |= 0x01;
                 }
@@ -2432,9 +2432,9 @@ bool SwSectionFrm::ToMaximize( bool bCheckFollow ) const
         if( pFoll )
             return true;
     }
-    if( IsFtnAtEnd() )
+    if( IsFootnoteAtEnd() )
         return false;
-    const SwFtnContFrm* pCont = ContainsFtnCont();
+    const SwFootnoteContFrm* pCont = ContainsFootnoteCont();
     if( !IsEndnAtEnd() )
         return 0 != pCont;
     bool bRet = false;
@@ -2443,20 +2443,20 @@ bool SwSectionFrm::ToMaximize( bool bCheckFollow ) const
         if( pCont->FindFootNote() )
             bRet = true;
         else
-            pCont = ContainsFtnCont( pCont );
+            pCont = ContainsFootnoteCont( pCont );
     }
     return bRet;
 }
 
-/// Check every Column for FtnContFrms.
-SwFtnContFrm* SwSectionFrm::ContainsFtnCont( const SwFtnContFrm* pCont ) const
+/// Check every Column for FootnoteContFrms.
+SwFootnoteContFrm* SwSectionFrm::ContainsFootnoteCont( const SwFootnoteContFrm* pCont ) const
 {
-    SwFtnContFrm* pRet = NULL;
+    SwFootnoteContFrm* pRet = NULL;
     const SwLayoutFrm* pLay;
     if( pCont )
     {
-        pLay = pCont->FindFtnBossFrm( false );
-        OSL_ENSURE( IsAnLower( pLay ), "ConatainsFtnCont: Wrong FtnContainer" );
+        pLay = pCont->FindFootnoteBossFrm( false );
+        OSL_ENSURE( IsAnLower( pLay ), "ConatainsFootnoteCont: Wrong FootnoteContainer" );
         pLay = static_cast<const SwLayoutFrm*>(pLay->GetNext());
     }
     else if( Lower() && Lower()->IsColumnFrm() )
@@ -2467,9 +2467,9 @@ SwFtnContFrm* SwSectionFrm::ContainsFtnCont( const SwFtnContFrm* pCont ) const
     {
         if( pLay->Lower() && pLay->Lower()->GetNext() )
         {
-            OSL_ENSURE( pLay->Lower()->GetNext()->IsFtnContFrm(),
+            OSL_ENSURE( pLay->Lower()->GetNext()->IsFootnoteContFrm(),
                     "ToMaximize: Unexpected Frame" );
-            pRet = const_cast<SwFtnContFrm*>(static_cast<const SwFtnContFrm*>(pLay->Lower()->GetNext()));
+            pRet = const_cast<SwFootnoteContFrm*>(static_cast<const SwFootnoteContFrm*>(pLay->Lower()->GetNext()));
         }
         OSL_ENSURE( !pLay->GetNext() || pLay->GetNext()->IsLayoutFrm(),
                 "ToMaximize: ColFrm expected" );
@@ -2478,19 +2478,19 @@ SwFtnContFrm* SwSectionFrm::ContainsFtnCont( const SwFtnContFrm* pCont ) const
     return pRet;
 }
 
-void SwSectionFrm::InvalidateFtnPos()
+void SwSectionFrm::InvalidateFootnotePos()
 {
-    SwFtnContFrm* pCont = ContainsFtnCont( NULL );
+    SwFootnoteContFrm* pCont = ContainsFootnoteCont( NULL );
     if( pCont )
     {
-        SwFrm *pTmp = pCont->ContainsCntnt();
+        SwFrm *pTmp = pCont->ContainsContent();
         if( pTmp )
             pTmp->_InvalidatePos();
     }
 }
 
 /** Returns the value that the section would like to be
- * greater if it has undersized TxtFrms in it,
+ * greater if it has undersized TextFrms in it,
  * otherwise Null.
  * If necessary the undersized-flag is corrected.
  */
@@ -2506,9 +2506,9 @@ long SwSectionFrm::Undersize( bool bOverSize )
     return nRet;
 }
 
-void SwSectionFrm::CalcFtnCntnt()
+void SwSectionFrm::CalcFootnoteContent()
 {
-    SwFtnContFrm* pCont = ContainsFtnCont();
+    SwFootnoteContFrm* pCont = ContainsFootnoteCont();
     if( pCont )
     {
         SwFrm* pFrm = pCont->ContainsAny();
@@ -2516,9 +2516,9 @@ void SwSectionFrm::CalcFtnCntnt()
             pCont->Calc();
         while( pFrm && IsAnLower( pFrm ) )
         {
-            SwFtnFrm* pFtn = pFrm->FindFtnFrm();
-            if( pFtn )
-                pFtn->Calc();
+            SwFootnoteFrm* pFootnote = pFrm->FindFootnoteFrm();
+            if( pFootnote )
+                pFootnote->Calc();
             pFrm->Calc();
             if( pFrm->IsSctFrm() )
             {
@@ -2562,7 +2562,7 @@ void SwRootFrm::_DeleteEmptySct()
         mpDestroy->erase( mpDestroy->begin() );
         OSL_ENSURE( !pSect->IsColLocked() && !pSect->IsJoinLocked(),
                 "DeleteEmptySct: Locked SectionFrm" );
-        if( !pSect->Frm().HasArea() && !pSect->ContainsCntnt() )
+        if( !pSect->Frm().HasArea() && !pSect->ContainsContent() )
         {
             SwLayoutFrm* pUp = pSect->GetUpper();
             pSect->RemoveFromLayout();
@@ -2571,7 +2571,7 @@ void SwRootFrm::_DeleteEmptySct()
             {
                 if( pUp->IsPageBodyFrm() )
                     pUp->getRootFrm()->SetSuperfluous();
-                else if( pUp->IsFtnFrm() && !pUp->IsColLocked() &&
+                else if( pUp->IsFootnoteFrm() && !pUp->IsColLocked() &&
                     pUp->GetUpper() )
                 {
                     pUp->Cut();
@@ -2603,7 +2603,7 @@ bool SwSectionFrm::IsBalancedSection() const
     bool bRet = false;
     if ( GetSection() && Lower() && Lower()->IsColumnFrm() && Lower()->GetNext() )
     {
-        bRet = !GetSection()->GetFmt()->GetBalancedColumns().GetValue();
+        bRet = !GetSection()->GetFormat()->GetBalancedColumns().GetValue();
     }
     return bRet;
 }
diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx
index 96f91903ddfb..dcf25b321b21 100644
--- a/sw/source/core/layout/softpagebreak.cxx
+++ b/sw/source/core/layout/softpagebreak.cxx
@@ -25,10 +25,10 @@
 #include "tabfrm.hxx"
 #include <calbck.hxx>
 
-void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
+void SwTextNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
 {
-    SwIterator<SwTxtFrm,SwTxtNode> aIter( *this );
-    for( const SwTxtFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+    SwIterator<SwTextFrm,SwTextNode> aIter( *this );
+    for( const SwTextFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
     {
         // No soft page break in header or footer
         if( pFrm->FindFooterOrHeader() || pFrm->IsInFly() )
@@ -40,7 +40,7 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
         // No soft page break at the first page
         if( pPage && pPage->GetPrev() )
         {
-            const SwCntntFrm* pFirst2 = pPage->FindFirstBodyCntnt();
+            const SwContentFrm* pFirst2 = pPage->FindFirstBodyContent();
             // Special handling for content frame in table frames
             if( pFrm->IsInTab() )
             {
@@ -75,7 +75,7 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
                     const SwFrm* pCell = pRow->Lower();
                     while( pCell )
                     {
-                        pFirst2 = static_cast<const SwLayoutFrm*>(pCell)->ContainsCntnt();
+                        pFirst2 = static_cast<const SwLayoutFrm*>(pCell)->ContainsContent();
                         if( pFirst2 == pFrm )
                         {   // Here we are: a first content inside a cell
                             // inside the splitted row => soft page break
@@ -96,9 +96,9 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
 bool SwTableLine::hasSoftPageBreak() const
 {
     // No soft page break for sub tables
-    if( GetUpper() || !GetFrmFmt() )
+    if( GetUpper() || !GetFrameFormat() )
         return false;
-    SwIterator<SwRowFrm,SwFmt> aIter( *GetFrmFmt() );
+    SwIterator<SwRowFrm,SwFormat> aIter( *GetFrameFormat() );
     for( SwRowFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
     {
         if( pLast->GetTabLine() == this )
@@ -118,7 +118,7 @@ bool SwTableLine::hasSoftPageBreak() const
             // No soft page break at the first page of the document
             if( pPage && !pPage->GetPrev() )
                 return false;
-            const SwCntntFrm* pFirst = pPage ? pPage->FindFirstBodyCntnt() : NULL;
+            const SwContentFrm* pFirst = pPage ? pPage->FindFirstBodyContent() : NULL;
             // No soft page break for
             //   tables which does not contain the first body content of the page
             if( !pFirst || !pTab->IsAnLower( pFirst->FindTabFrm() ) )
diff --git a/sw/source/core/layout/sortedobjs.cxx b/sw/source/core/layout/sortedobjs.cxx
index 5893a4823822..ea26372c06f3 100644
--- a/sw/source/core/layout/sortedobjs.cxx
+++ b/sw/source/core/layout/sortedobjs.cxx
@@ -78,12 +78,12 @@ struct ObjAnchorOrder
                      const SwAnchoredObject* _pNewAnchoredObj )
     {
         // get attributes of listed object
-        const SwFrmFmt& rFmtListed = _pListedAnchoredObj->GetFrmFmt();
-        const SwFmtAnchor* pAnchorListed = &(rFmtListed.GetAnchor());
+        const SwFrameFormat& rFormatListed = _pListedAnchoredObj->GetFrameFormat();
+        const SwFormatAnchor* pAnchorListed = &(rFormatListed.GetAnchor());
 
         // get attributes of new object
-        const SwFrmFmt& rFmtNew = _pNewAnchoredObj->GetFrmFmt();
-        const SwFmtAnchor* pAnchorNew = &(rFmtNew.GetAnchor());
+        const SwFrameFormat& rFormatNew = _pNewAnchoredObj->GetFrameFormat();
+        const SwFormatAnchor* pAnchorNew = &(rFormatNew.GetAnchor());
 
         // check for to-page anchored objects
         if ((pAnchorListed->GetAnchorId() == FLY_AT_PAGE) &&
@@ -122,24 +122,24 @@ struct ObjAnchorOrder
 
         // Both objects aren't anchor to page or to fly
         // Thus, compare content anchor nodes, if existing.
-        const SwPosition* pCntntAnchorListed = pAnchorListed->GetCntntAnchor();
-        const SwPosition* pCntntAnchorNew = pAnchorNew->GetCntntAnchor();
-        if ( pCntntAnchorListed && pCntntAnchorNew &&
-             pCntntAnchorListed->nNode != pCntntAnchorNew->nNode )
+        const SwPosition* pContentAnchorListed = pAnchorListed->GetContentAnchor();
+        const SwPosition* pContentAnchorNew = pAnchorNew->GetContentAnchor();
+        if ( pContentAnchorListed && pContentAnchorNew &&
+             pContentAnchorListed->nNode != pContentAnchorNew->nNode )
         {
-            return pCntntAnchorListed->nNode < pCntntAnchorNew->nNode;
+            return pContentAnchorListed->nNode < pContentAnchorNew->nNode;
         }
 
         // objects anchored at the same content.
         // --> OD 2006-11-29 #???# - objects have to be ordered by anchor node position
         // Thus, compare content anchor node positions and anchor type,
         // if not anchored at-paragraph
-        if (pCntntAnchorListed && pCntntAnchorNew)
+        if (pContentAnchorListed && pContentAnchorNew)
         {
             sal_Int32 nListedIndex = pAnchorListed->GetAnchorId() != FLY_AT_PARA ?
-                pCntntAnchorListed->nContent.GetIndex() : 0;
+                pContentAnchorListed->nContent.GetIndex() : 0;
             sal_Int32 nNewIndex = pAnchorNew->GetAnchorId() != FLY_AT_PARA ?
-                pCntntAnchorNew->nContent.GetIndex() : 0;
+                pContentAnchorNew->nContent.GetIndex() : 0;
             if (nListedIndex != nNewIndex)
             {
                 return nListedIndex < nNewIndex;
@@ -156,15 +156,15 @@ struct ObjAnchorOrder
         // objects anchored at the same content and at the same content anchor
         // node position with the same anchor type
         // Thus, compare its wrapping style including its layer
-        const IDocumentDrawModelAccess* pIDDMA = rFmtListed.getIDocumentDrawModelAccess();
+        const IDocumentDrawModelAccess* pIDDMA = rFormatListed.getIDocumentDrawModelAccess();
         const SdrLayerID nHellId = pIDDMA->GetHellId();
         const SdrLayerID nInvisibleHellId = pIDDMA->GetInvisibleHellId();
         const bool bWrapThroughOrHellListed =
-                    rFmtListed.GetSurround().GetSurround() == SURROUND_THROUGHT ||
+                    rFormatListed.GetSurround().GetSurround() == SURROUND_THROUGHT ||
                     _pListedAnchoredObj->GetDrawObj()->GetLayer() == nHellId ||
                     _pListedAnchoredObj->GetDrawObj()->GetLayer() == nInvisibleHellId;
         const bool bWrapThroughOrHellNew =
-                    rFmtNew.GetSurround().GetSurround() == SURROUND_THROUGHT ||
+                    rFormatNew.GetSurround().GetSurround() == SURROUND_THROUGHT ||
                     _pNewAnchoredObj->GetDrawObj()->GetLayer() == nHellId ||
                     _pNewAnchoredObj->GetDrawObj()->GetLayer() == nInvisibleHellId;
         if ( bWrapThroughOrHellListed != bWrapThroughOrHellNew )
@@ -181,10 +181,10 @@ struct ObjAnchorOrder
 
         // objects anchored at the same content with a set text wrapping
         // Thus, compare wrap influences on object position
-        const SwFmtWrapInfluenceOnObjPos* pWrapInfluenceOnObjPosListed =
-                                        &(rFmtListed.GetWrapInfluenceOnObjPos());
-        const SwFmtWrapInfluenceOnObjPos* pWrapInfluenceOnObjPosNew =
-                                        &(rFmtNew.GetWrapInfluenceOnObjPos());
+        const SwFormatWrapInfluenceOnObjPos* pWrapInfluenceOnObjPosListed =
+                                        &(rFormatListed.GetWrapInfluenceOnObjPos());
+        const SwFormatWrapInfluenceOnObjPos* pWrapInfluenceOnObjPosNew =
+                                        &(rFormatNew.GetWrapInfluenceOnObjPos());
         // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
         if ( pWrapInfluenceOnObjPosListed->GetWrapInfluenceOnObjPos( true ) !=
                 pWrapInfluenceOnObjPosNew->GetWrapInfluenceOnObjPos( true ) )
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 8844a386c3a3..a29b09ea844d 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -214,19 +214,19 @@ void SwFrm::CheckDirChange()
                     };
 
                     SwTableLine* pLine = const_cast<SwTableLine*>(static_cast<SwCellFrm*>(this)->GetTabBox()->GetUpper());
-                    SwFrmFmt* pFrmFmt = pLine->GetFrmFmt();
-                    SwFmtFrmSize aNew( pFrmFmt->GetFrmSize() );
+                    SwFrameFormat* pFrameFormat = pLine->GetFrameFormat();
+                    SwFormatFrmSize aNew( pFrameFormat->GetFrmSize() );
                     if ( ATT_FIX_SIZE != aNew.GetHeightSizeType() )
                         aNew.SetHeightSizeType( ATT_MIN_SIZE );
                     if ( aNew.GetHeight() < MIN_VERT_CELL_HEIGHT )
                         aNew.SetHeight( MIN_VERT_CELL_HEIGHT );
-                    SwDoc* pDoc = pFrmFmt->GetDoc();
-                    pDoc->SetAttr( aNew, *pLine->ClaimFrmFmt() );
+                    SwDoc* pDoc = pFrameFormat->GetDoc();
+                    pDoc->SetAttr( aNew, *pLine->ClaimFrameFormat() );
                 }
             }
 
             SwFrm* pFrm = static_cast<SwLayoutFrm*>(this)->Lower();
-            const SwFmtCol* pCol = NULL;
+            const SwFormatCol* pCol = NULL;
             SwLayoutFrm* pBody = 0;
             if( pFrm )
             {
@@ -236,14 +236,14 @@ void SwFrm::CheckDirChange()
                     // we have to look for columns and rearrange them.
                     pBody = static_cast<SwPageFrm*>(this)->FindBodyCont();
                     if(pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm())
-                        pCol = &static_cast<SwPageFrm*>(this)->GetFmt()->GetCol();
+                        pCol = &static_cast<SwPageFrm*>(this)->GetFormat()->GetCol();
                 }
                 else if( pFrm->IsColumnFrm() )
                 {
                     pBody = static_cast<SwLayoutFrm*>(this);
-                    const SwFrmFmt *pFmt = pBody->GetFmt();
-                    if( pFmt )
-                        pCol = &pFmt->GetCol();
+                    const SwFrameFormat *pFormat = pBody->GetFormat();
+                    if( pFormat )
+                        pCol = &pFormat->GetCol();
                 }
             }
             while( pFrm )
@@ -254,8 +254,8 @@ void SwFrm::CheckDirChange()
             if( pCol )
                 pBody->AdjustColumns( pCol, true );
         }
-        else if( IsTxtFrm() )
-            static_cast<SwTxtFrm*>(this)->Prepare( PREP_CLEAR );
+        else if( IsTextFrm() )
+            static_cast<SwTextFrm*>(this)->Prepare( PREP_CLEAR );
 
         // #i31698# - notify anchored objects also for page frames.
         // Remove code above for special handling of page frames
@@ -296,10 +296,10 @@ Point SwFrm::GetFrmAnchorPos( bool bIgnoreFlysAnchoredAtThisFrame ) const
     if ( ( IsVertical() && !IsVertLR() ) || IsRightToLeft() )
         aAnchor.X() += Frm().Width();
 
-    if ( IsTxtFrm() )
+    if ( IsTextFrm() )
     {
         SwTwips nBaseOfstForFly =
-            static_cast<const SwTxtFrm*>(this)->GetBaseOfstForFly( bIgnoreFlysAnchoredAtThisFrame );
+            static_cast<const SwTextFrm*>(this)->GetBaseOfstForFly( bIgnoreFlysAnchoredAtThisFrame );
         if ( IsVertical() )
             aAnchor.Y() += nBaseOfstForFly;
         else
@@ -308,9 +308,9 @@ Point SwFrm::GetFrmAnchorPos( bool bIgnoreFlysAnchoredAtThisFrame ) const
         // OD 2004-03-10 #i11860# - if option 'Use former object positioning'
         // is OFF, consider the lower space and the line spacing of the
         // previous frame and the spacing considered for the page grid
-        const SwTxtFrm* pThisTxtFrm = static_cast<const SwTxtFrm*>(this);
+        const SwTextFrm* pThisTextFrm = static_cast<const SwTextFrm*>(this);
         const SwTwips nUpperSpaceAmountConsideredForPrevFrmAndPageGrid =
-                pThisTxtFrm->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid();
+                pThisTextFrm->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid();
         if ( IsVertical() )
         {
             aAnchor.X() -= nUpperSpaceAmountConsideredForPrevFrmAndPageGrid;
@@ -391,37 +391,37 @@ void SwFrm::DestroyFrm(SwFrm *const pFrm)
     }
 }
 
-const SwFrmFmt * SwLayoutFrm::GetFmt() const
+const SwFrameFormat * SwLayoutFrm::GetFormat() const
 {
-    return static_cast< const SwFrmFmt * >( GetDep() );
+    return static_cast< const SwFrameFormat * >( GetDep() );
 }
 
-SwFrmFmt * SwLayoutFrm::GetFmt()
+SwFrameFormat * SwLayoutFrm::GetFormat()
 {
-    return static_cast< SwFrmFmt * >( GetDep() );
+    return static_cast< SwFrameFormat * >( GetDep() );
 }
 
-void SwLayoutFrm::SetFrmFmt( SwFrmFmt *pNew )
+void SwLayoutFrm::SetFrameFormat( SwFrameFormat *pNew )
 {
-    if ( pNew != GetFmt() )
+    if ( pNew != GetFormat() )
     {
-        SwFmtChg aOldFmt( GetFmt() );
+        SwFormatChg aOldFormat( GetFormat() );
         pNew->Add( this );
-        SwFmtChg aNewFmt( pNew );
-        ModifyNotification( &aOldFmt, &aNewFmt );
+        SwFormatChg aNewFormat( pNew );
+        ModifyNotification( &aOldFormat, &aNewFormat );
     }
 }
 
-SwCntntFrm::SwCntntFrm( SwCntntNode * const pCntnt, SwFrm* pSib ) :
-    SwFrm( pCntnt, pSib ),
+SwContentFrm::SwContentFrm( SwContentNode * const pContent, SwFrm* pSib ) :
+    SwFrm( pContent, pSib ),
     SwFlowFrm( (SwFrm&)*this )
 {
 }
 
-void SwCntntFrm::DestroyImpl()
+void SwContentFrm::DestroyImpl()
 {
-    const SwCntntNode* pCNd;
-    if( 0 != ( pCNd = PTR_CAST( SwCntntNode, GetRegisteredIn() )) &&
+    const SwContentNode* pCNd;
+    if( 0 != ( pCNd = PTR_CAST( SwContentNode, GetRegisteredIn() )) &&
         !pCNd->GetDoc()->IsInDtor() )
     {
         //Unregister from root if I'm still in turbo there.
@@ -436,11 +436,11 @@ void SwCntntFrm::DestroyImpl()
     SwFrm::DestroyImpl();
 }
 
-SwCntntFrm::~SwCntntFrm()
+SwContentFrm::~SwContentFrm()
 {
 }
 
-void SwCntntFrm::RegisterToNode( SwCntntNode& rNode )
+void SwContentFrm::RegisterToNode( SwContentNode& rNode )
 {
     rNode.Add( this );
 }
@@ -457,7 +457,7 @@ void SwLayoutFrm::DestroyImpl()
 
     SwFrm *pFrm = m_pLower;
 
-    if( GetFmt() && !GetFmt()->GetDoc()->IsInDtor() )
+    if( GetFormat() && !GetFormat()->GetDoc()->IsInDtor() )
     {
         while ( pFrm )
         {
@@ -683,9 +683,9 @@ const SwRect SwFrm::UnionFrm( bool bBorder ) const
             nAdd += rShadow.CalcShadowSpace( SvxShadowItemSide::RIGHT );
         }
     }
-    if( IsTxtFrm() && static_cast<const SwTxtFrm*>(this)->HasPara() )
+    if( IsTextFrm() && static_cast<const SwTextFrm*>(this)->HasPara() )
     {
-        long nTmp = static_cast<const SwTxtFrm*>(this)->HangingMargin();
+        long nTmp = static_cast<const SwTextFrm*>(this)->HangingMargin();
         if( nTmp > nAdd )
             nAdd = nTmp;
     }
diff --git a/sw/source/core/layout/swselectionlist.cxx b/sw/source/core/layout/swselectionlist.cxx
index a3613f20cb2c..ac71d89c2841 100644
--- a/sw/source/core/layout/swselectionlist.cxx
+++ b/sw/source/core/layout/swselectionlist.cxx
@@ -33,7 +33,7 @@ namespace {
         - the SwRootFrm if the frame is part of a page body
         - the SwHeaderFrm if the frame is part of a page header
         - the SwFooterFrm if the frame is part of a page footer
-        - the (master) SwFtnFrm if the frame is part of footnote
+        - the (master) SwFootnoteFrm if the frame is part of footnote
         - the (first) SwFlyFrm if the frame is part of a (linked) fly frame
 
         @param pFrm
@@ -54,11 +54,11 @@ namespace {
                     pFly = pFly->GetPrevLink();
                 break;
             }
-            if( pFrm->IsFtnFrm() )
+            if( pFrm->IsFootnoteFrm() )
             {
-                const SwFtnFrm* pFtn = static_cast<const SwFtnFrm*>( pFrm );
-                while( pFtn->GetMaster() )
-                    pFtn = pFtn->GetMaster();
+                const SwFootnoteFrm* pFootnote = static_cast<const SwFootnoteFrm*>( pFrm );
+                while( pFootnote->GetMaster() )
+                    pFootnote = pFootnote->GetMaster();
                 break;
             }
             pFrm = pFrm->GetUpper();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index fe60fdad4316..879bdff06afd 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -59,7 +59,7 @@
 using namespace ::com::sun::star;
 
 SwTabFrm::SwTabFrm( SwTable &rTab, SwFrm* pSib )
-    : SwLayoutFrm( rTab.GetFrmFmt(), pSib )
+    : SwLayoutFrm( rTab.GetFrameFormat(), pSib )
     , SwFlowFrm( static_cast<SwFrm&>(*this) )
     , m_pTable( &rTab )
     , m_bComplete(false)
@@ -97,7 +97,7 @@ SwTabFrm::SwTabFrm( SwTable &rTab, SwFrm* pSib )
 }
 
 SwTabFrm::SwTabFrm( SwTabFrm &rTab )
-    : SwLayoutFrm( rTab.GetFmt(), &rTab )
+    : SwLayoutFrm( rTab.GetFormat(), &rTab )
     , SwFlowFrm( static_cast<SwFrm&>(*this) )
     , m_pTable( rTab.GetTable() )
     , m_bComplete(false)
@@ -297,12 +297,12 @@ static void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm,
                     // that anchored object is correctly positioned.
                     pAnchoredObj->ClearCharRectAndTopOfLine();
                     pAnchoredObj->SetCurrRelPos( Point( 0, 0 ) );
-                    if ( pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId()
+                    if ( pAnchoredObj->GetFrameFormat().GetAnchor().GetAnchorId()
                             == FLY_AS_CHAR )
                     {
                         pAnchoredObj->AnchorFrm()
                                 ->Prepare( PREP_FLY_ATTR_CHG,
-                                           &(pAnchoredObj->GetFrmFmt()) );
+                                           &(pAnchoredObj->GetFrameFormat()) );
                     }
                     if ( pAnchoredObj->ISA(SwFlyFrm) )
                     {
@@ -434,7 +434,7 @@ static void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine )
         }
         else
         {
-            SwFrm *pTmp = ::SaveCntnt( pCurrSourceCell );
+            SwFrm *pTmp = ::SaveContent( pCurrSourceCell );
             if ( pTmp )
             {
                 // NEW TABLES
@@ -444,7 +444,7 @@ static void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine )
 
                 // Find last content
                 SwFrm* pFrm = pDestCell->GetLastLower();
-                ::RestoreCntnt( pTmp, pDestCell, pFrm, true );
+                ::RestoreContent( pTmp, pDestCell, pFrm, true );
             }
         }
         pCurrDestCell = static_cast<SwCellFrm*>(pCurrDestCell->GetNext());
@@ -456,11 +456,11 @@ static void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine )
 // the footnote boss of rSource to the footnote boss of rDest.
 static void lcl_MoveFootnotes( SwTabFrm& rSource, SwTabFrm& rDest, SwLayoutFrm& rRowFrm )
 {
-    if ( !rSource.GetFmt()->GetDoc()->GetFtnIdxs().empty() )
+    if ( !rSource.GetFormat()->GetDoc()->GetFootnoteIdxs().empty() )
     {
-        SwFtnBossFrm* pOldBoss = rSource.FindFtnBossFrm( true );
-        SwFtnBossFrm* pNewBoss = rDest.FindFtnBossFrm( true );
-        rRowFrm.MoveLowerFtns( 0, pOldBoss, pNewBoss, true );
+        SwFootnoteBossFrm* pOldBoss = rSource.FindFootnoteBossFrm( true );
+        SwFootnoteBossFrm* pNewBoss = rDest.FindFootnoteBossFrm( true );
+        rRowFrm.MoveLowerFootnotes( 0, pOldBoss, pNewBoss, true );
     }
 }
 
@@ -525,7 +525,7 @@ static void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine,
                     pCell = pCell->GetNext();
                 }
 
-                const SwFmtFrmSize &rSz = pTmpLastLineRow->GetFmt()->GetFrmSize();
+                const SwFormatFrmSize &rSz = pTmpLastLineRow->GetFormat()->GetFrmSize();
                 if ( rSz.GetHeightSizeType() == ATT_MIN_SIZE )
                     nMinHeight = std::max( nMinHeight, rSz.GetHeight() );
             }
@@ -580,7 +580,7 @@ static void lcl_PostprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine )
         {
             SwRowFrm* pRowFrm = static_cast<SwRowFrm*>(pCurrMasterCell->GetLastLower());
 
-            if ( NULL != pRowFrm->GetPrev() && !pRowFrm->ContainsCntnt() )
+            if ( NULL != pRowFrm->GetPrev() && !pRowFrm->ContainsContent() )
             {
                 OSL_ENSURE( pRowFrm->GetFollowRow(), "Deleting row frame without follow" );
 
@@ -692,7 +692,7 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine,
             SwCellFrm* pCurrMasterCell = static_cast<SwCellFrm*>(rLastLine.Lower());
             while ( pCurrMasterCell )
             {
-                if ( !pCurrMasterCell->ContainsCntnt() && pCurrMasterCell->GetTabBox()->getRowSpan() >= 1 )
+                if ( !pCurrMasterCell->ContainsContent() && pCurrMasterCell->GetTabBox()->getRowSpan() >= 1 )
                 {
                     bRet = false;
                     break;
@@ -705,7 +705,7 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine,
     // 3. Check if last line does not contain any content:
     if ( bRet )
     {
-        if ( !rLastLine.ContainsCntnt() )
+        if ( !rLastLine.ContainsContent() )
         {
             bRet = false;
         }
@@ -714,7 +714,7 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine,
     // 4. Check if follow flow line does not contain content:
     if ( bRet )
     {
-        if ( !rFollowLine.IsRowSpanLine() && !rFollowLine.ContainsCntnt() )
+        if ( !rFollowLine.IsRowSpanLine() && !rFollowLine.ContainsContent() )
         {
             bRet = false;
         }
@@ -1103,16 +1103,16 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee
             pHeadline->InsertBefore( pFoll, 0 );
 
             SwPageFrm *pPage = pHeadline->FindPageFrm();
-            const SwFrmFmts *pTbl = GetFmt()->GetDoc()->GetSpzFrmFmts();
-            if( !pTbl->empty() )
+            const SwFrameFormats *pTable = GetFormat()->GetDoc()->GetSpzFrameFormats();
+            if( !pTable->empty() )
             {
                 sal_uLong nIndex;
-                SwCntntFrm* pFrm = pHeadline->ContainsCntnt();
+                SwContentFrm* pFrm = pHeadline->ContainsContent();
                 while( pFrm )
                 {
                     nIndex = pFrm->GetNode()->GetIndex();
-                    AppendObjs( pTbl, nIndex, pFrm, pPage, GetFmt()->GetDoc());
-                    pFrm = pFrm->GetNextCntntFrm();
+                    AppendObjs( pTable, nIndex, pFrm, pPage, GetFormat()->GetDoc());
+                    pFrm = pFrm->GetNextContentFrm();
                     if( !pHeadline->IsAnLower( pFrm ) )
                         break;
                 }
@@ -1349,7 +1349,7 @@ static void lcl_InvalidateAllLowersPrt( SwLayoutFrm* pLayFrm )
     }
 }
 
-bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
+bool SwContentFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
                                  long nBottom, bool bSkipRowSpanCells )
 {
     if ( !pLay )
@@ -1358,7 +1358,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
     // LONG_MAX == nBottom means we have to calculate all
     bool bAll = LONG_MAX == nBottom;
     bool bRet = false;
-    SwCntntFrm *pCnt = pLay->ContainsCntnt();
+    SwContentFrm *pCnt = pLay->ContainsContent();
     SWRECTFN( pLay )
 
     // FME 2007-08-30 #i81146# new loop control
@@ -1370,10 +1370,10 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
     {
         // #115759# - check, if a format of content frame is
         // possible. Thus, 'copy' conditions, found at the beginning of
-        // <SwCntntFrm::MakeAll(..)>, and check these.
+        // <SwContentFrm::MakeAll(..)>, and check these.
         const bool bFormatPossible = !pCnt->IsJoinLocked() &&
-                                     ( !pCnt->IsTxtFrm() ||
-                                       !static_cast<SwTxtFrm*>(pCnt)->IsLocked() ) &&
+                                     ( !pCnt->IsTextFrm() ||
+                                       !static_cast<SwTextFrm*>(pCnt)->IsLocked() ) &&
                                      ( pCnt->IsFollow() || !StackHack::IsLocked() );
 
         // NEW TABLES
@@ -1398,11 +1398,11 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
             // to format the floating screen objects
             // #i46941# - frame has to be valid
             // Note: frame could be invalid after calling its format, if it's locked.
-            OSL_ENSURE( !pCnt->IsTxtFrm() ||
+            OSL_ENSURE( !pCnt->IsTextFrm() ||
                     pCnt->IsValid() ||
-                    static_cast<SwTxtFrm*>(pCnt)->IsJoinLocked(),
-                    "<SwCntntFrm::CalcLowers(..)> - text frame invalid and not locked." );
-            if ( pCnt->IsTxtFrm() && pCnt->IsValid() )
+                    static_cast<SwTextFrm*>(pCnt)->IsJoinLocked(),
+                    "<SwContentFrm::CalcLowers(..)> - text frame invalid and not locked." );
+            if ( pCnt->IsTextFrm() && pCnt->IsValid() )
             {
                 // #i23129#, #i36347# - pass correct page frame to
                 // the object formatter
@@ -1420,12 +1420,12 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
                     if ( nLoopControlRuns < nLoopControlMax )
                     {
                         // restart format with first content
-                        pCnt = pLay->ContainsCntnt();
+                        pCnt = pLay->ContainsContent();
                         continue;
                     }
 
 #if OSL_DEBUG_LEVEL > 1
-                    OSL_FAIL( "LoopControl in SwCntntFrm::CalcLowers" );
+                    OSL_FAIL( "LoopControl in SwContentFrm::CalcLowers" );
 #endif
                 }
             }
@@ -1433,7 +1433,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
         }
         if( ! bAll && (*fnRect->fnYDiff)((pCnt->Frm().*fnRect->fnGetTop)(), nBottom) > 0 )
             break;
-        pCnt = pCnt->GetNextCntntFrm();
+        pCnt = pCnt->GetNextContentFrm();
     }
     return bRet;
 }
@@ -1519,7 +1519,7 @@ static void lcl_RecalcRow( SwRowFrm& rRow, long nBottom )
         {
             // #115759# - force another format of the
             // lowers, if at least one of it was invalid.
-            bCheck = SwCntntFrm::CalcLowers( &rRow, rRow.GetUpper(), nBottom, true );
+            bCheck = SwContentFrm::CalcLowers( &rRow, rRow.GetUpper(), nBottom, true );
 
             // NEW TABLES
             // First we calculate the cells with row span of < 1, afterwards
@@ -1538,7 +1538,7 @@ static void lcl_RecalcRow( SwRowFrm& rRow, long nBottom )
                         SwCellFrm& rToRecalc = 0 == i ?
                                                const_cast<SwCellFrm&>(pCellFrm->FindStartEndOfRowSpanCell( true, true )) :
                                                *pCellFrm;
-                        bCheck  |= SwCntntFrm::CalcLowers( &rToRecalc, &rToRecalc, nBottom, false );
+                        bCheck  |= SwContentFrm::CalcLowers( &rToRecalc, &rToRecalc, nBottom, false );
                     }
 
                     pCellFrm = static_cast<SwCellFrm*>(pCellFrm->GetNext());
@@ -1641,7 +1641,7 @@ static bool lcl_NoPrev( const SwFrm& rFrm )
 // a table frame and format it to assure keep attribute.
 // method return true, if a next content frame is formatted.
 // Precondition: The given table frame hasn't a follow and isn't a follow.
-SwFrm* sw_FormatNextCntntForKeep( SwTabFrm* pTabFrm )
+SwFrm* sw_FormatNextContentForKeep( SwTabFrm* pTabFrm )
 {
     // find next content, table or section
     SwFrm* pNxt = pTabFrm->FindNext();
@@ -1753,7 +1753,7 @@ void SwTabFrm::MakeAll()
     bool bMovedFwd  = false;
     // gets set to true when the Frm is split
     bool bSplit = false;
-    const bool bFtnsInDoc = !GetFmt()->GetDoc()->GetFtnIdxs().empty();
+    const bool bFootnotesInDoc = !GetFormat()->GetDoc()->GetFootnoteIdxs().empty();
     const bool bFly     = IsInFly();
 
     SwBorderAttrAccess  *pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
@@ -1765,7 +1765,7 @@ void SwTabFrm::MakeAll()
     // All rows should keep together
     // OD 2004-05-25 #i21478# - don't split table, if it has to keep with next
     const bool bDontSplit = !IsFollow() &&
-                            ( !GetFmt()->GetLayoutSplit().GetValue() || bKeep );
+                            ( !GetFormat()->GetLayoutSplit().GetValue() || bKeep );
 
     // The number of repeated headlines
     const sal_uInt16 nRepeat = GetTable()->GetRowsToRepeat();
@@ -1777,7 +1777,7 @@ void SwTabFrm::MakeAll()
     // #131283#
     // Indicates that two individual rows may keep together, based on the keep
     // attribute set at the first paragraph in the first cell.
-    const bool bTableRowKeep = !bDontSplit && GetFmt()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP);
+    const bool bTableRowKeep = !bDontSplit && GetFormat()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP);
 
     // The Magic Move: Used for the table row keep feature.
     // If only the last row of the table wants to keep (implicitly by setting
@@ -1935,15 +1935,15 @@ void SwTabFrm::MakeAll()
                         pMaster->InvalidatePos();
                 }
             }
-            SwFtnBossFrm *pOldBoss = bFtnsInDoc ? FindFtnBossFrm( true ) : 0;
+            SwFootnoteBossFrm *pOldBoss = bFootnotesInDoc ? FindFootnoteBossFrm( true ) : 0;
             bool bReformat;
             if ( MoveBwd( bReformat ) )
             {
                 SWREFRESHFN( this )
                 bMovedBwd = true;
                 aNotify.SetLowersComplete( false );
-                if ( bFtnsInDoc )
-                    MoveLowerFtns( 0, pOldBoss, 0, true );
+                if ( bFootnotesInDoc )
+                    MoveLowerFootnotes( 0, pOldBoss, 0, true );
                 if ( bReformat || bKeep )
                 {
                     long nOldTop = (Frm().*fnRect->fnGetTop)();
@@ -1977,7 +1977,7 @@ void SwTabFrm::MakeAll()
                         // Thus, find next content, table or section
                         // and, if a section is found, get its first
                         // content.
-                        if ( 0 != sw_FormatNextCntntForKeep( this ) && !GetNext() )
+                        if ( 0 != sw_FormatNextContentForKeep( this ) && !GetNext() )
                         {
                             mbValidPos = false;
                         }
@@ -2070,11 +2070,11 @@ void SwTabFrm::MakeAll()
 
                         while ( pRowToMove && nRowsToMove-- > 0 )
                         {
-                            const bool bMoveFtns = bFtnsInDoc && !GetFollow()->IsJoinLocked();
+                            const bool bMoveFootnotes = bFootnotesInDoc && !GetFollow()->IsJoinLocked();
 
-                            SwFtnBossFrm *pOldBoss = 0;
-                            if ( bMoveFtns )
-                                pOldBoss = pRowToMove->FindFtnBossFrm( true );
+                            SwFootnoteBossFrm *pOldBoss = 0;
+                            if ( bMoveFootnotes )
+                                pOldBoss = pRowToMove->FindFootnoteBossFrm( true );
 
                             SwFrm* pNextRow = pRowToMove->GetNext();
 
@@ -2090,8 +2090,8 @@ void SwTabFrm::MakeAll()
                             }
 
                             //Displace the footnotes!
-                            if ( bMoveFtns )
-                                if ( static_cast<SwLayoutFrm*>(pRowToMove)->MoveLowerFtns( 0, pOldBoss, FindFtnBossFrm( true ), true ) )
+                            if ( bMoveFootnotes )
+                                if ( static_cast<SwLayoutFrm*>(pRowToMove)->MoveLowerFootnotes( 0, pOldBoss, FindFootnoteBossFrm( true ), true ) )
                                     GetUpper()->Calc();
 
                             pRowToMove = pNextRow;
@@ -2137,7 +2137,7 @@ void SwTabFrm::MakeAll()
                     // it has to be avoided, that superior table is formatted.
                     // Thus, find next content, table or section and, if a section
                     // is found, get its first content.
-                    const SwFrm* pTmpNxt = sw_FormatNextCntntForKeep( this );
+                    const SwFrm* pTmpNxt = sw_FormatNextContentForKeep( this );
 
                     pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
                     pAttrs = pAccess->Get();
@@ -2533,9 +2533,9 @@ bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
     // --> #108724# Page header/footer content doesn't have to wrap around
     //              floating screen objects
 
-    const IDocumentSettingAccess* pIDSA = GetFmt()->getIDocumentSettingAccess();
+    const IDocumentSettingAccess* pIDSA = GetFormat()->getIDocumentSettingAccess();
     const bool bWrapAllowed = pIDSA->get(DocumentSettingId::USE_FORMER_TEXT_WRAPPING) ||
-                                ( !IsInFtn() && 0 == FindFooterOrHeader() );
+                                ( !IsInFootnote() && 0 == FindFooterOrHeader() );
 
     if ( pPage->GetSortedObjs() && bWrapAllowed )
     {
@@ -2570,7 +2570,7 @@ bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
                 //   E.g., it could happen, that the fly frame is still registered
                 //   at the page frame, the table is on, but it's anchor character
                 //   text frame has already changed its page.
-                const SwTxtFrm* pAnchorCharFrm = pFly->FindAnchorCharFrm();
+                const SwTextFrm* pAnchorCharFrm = pFly->FindAnchorCharFrm();
                 bool bConsiderFly =
                     // #i46807# - do not consider invalid
                     // Writer fly frames.
@@ -2616,8 +2616,8 @@ bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
 
                 if ( bConsiderFly )
                 {
-                    const SwFmtSurround   &rSur = pFly->GetFmt()->GetSurround();
-                    const SwFmtHoriOrient &rHori= pFly->GetFmt()->GetHoriOrient();
+                    const SwFormatSurround   &rSur = pFly->GetFormat()->GetSurround();
+                    const SwFormatHoriOrient &rHori= pFly->GetFormat()->GetHoriOrient();
                     if ( SURROUND_NONE == rSur.GetSurround() )
                     {
                         long nBottom = (aFlyRect.*fnRect->fnGetBottom)();
@@ -2693,7 +2693,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
     if ( !mbValidPrtArea )
     {   mbValidPrtArea = true;
 
-        //The width of the PrtArea is given by the FrmFmt, the borders have to
+        //The width of the PrtArea is given by the FrameFormat, the borders have to
         //be set accordingly.
         //Minimum borders are determined depending on margins and shadows.
         //The borders are adjusted so that the PrtArea is aligned into the Frm
@@ -2711,7 +2711,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
         //The width possibly is a percentage value. If the table is inside
         //something else, the value applies to the surrounding. If it's the body
         //the value applies to the screen width in the BrowseView.
-        const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize();
+        const SwFormatFrmSize &rSz = GetFormat()->GetFrmSize();
         // OD 14.03.2003 #i9040# - adjust variable name.
         const SwTwips nWishedTableWidth = CalcRel( rSz, true );
 
@@ -2720,7 +2720,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
         // OD 14.03.2003 #i9040# - insert new variables for left/right spacing.
         SwTwips nLeftSpacing  = 0;
         SwTwips nRightSpacing = 0;
-        switch ( GetFmt()->GetHoriOrient().GetHoriOrient() )
+        switch ( GetFormat()->GetHoriOrient().GetHoriOrient() )
         {
             case text::HoriOrientation::LEFT:
                 {
@@ -2861,7 +2861,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
 
         // #i26250# - extend bottom printing area, if table
         // is last content inside a table cell.
-        if ( GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) &&
+        if ( GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) &&
              GetUpper()->IsInTab() && !GetIndNext() )
         {
             nLower += pAttrs->GetULSpace().GetLower();
@@ -2968,7 +2968,7 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
         if ( GetNext() )
         {
             GetNext()->_InvalidatePos();
-            if ( GetNext()->IsCntntFrm() )
+            if ( GetNext()->IsContentFrm() )
                 GetNext()->InvalidatePage( pPage );
         }
         // #i28701# - Due to the new object positioning the
@@ -2976,7 +2976,7 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
         // forward due to the positioning of its objects ). Thus, invalivate this
         // next frame, if document compatibility option 'Consider wrapping style
         // influence on object positioning' is ON.
-        else if ( GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
+        else if ( GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
         {
             InvalidateNextPos();
         }
@@ -2984,7 +2984,7 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
         InvalidatePage( pPage );
         SetComplete();
 
-        SvxBrushItem aBack = GetFmt()->makeBackgroundBrushItem();
+        SvxBrushItem aBack = GetFormat()->makeBackgroundBrushItem();
         const SvxGraphicPosition ePos = aBack.GetGraphicPos();
         if ( GPOS_NONE != ePos && GPOS_TILED != ePos )
             SetCompletePaint();
@@ -3034,7 +3034,7 @@ void SwTabFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
             if ( nInvFlags & 0x04 )
             {
                 pTmp->_InvalidatePrt();
-                if ( pTmp->IsCntntFrm() )
+                if ( pTmp->IsContentFrm() )
                     pTmp->InvalidatePage( pPage );
             }
             if ( nInvFlags & 0x10 )
@@ -3043,7 +3043,7 @@ void SwTabFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
         if ( nInvFlags & 0x08 && 0 != (pTmp = GetPrev()) )
         {
             pTmp->_InvalidatePrt();
-            if ( pTmp->IsCntntFrm() )
+            if ( pTmp->IsContentFrm() )
                 pTmp->InvalidatePage( pPage );
         }
         if ( nInvFlags & 0x20  )
@@ -3103,10 +3103,10 @@ void SwTabFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                 {
                     if ( !GetPrev() )
                         CheckPageDescs( pPage );
-                    if (GetFmt()->GetPageDesc().GetNumOffset())
+                    if (GetFormat()->GetPageDesc().GetNumOffset())
                         static_cast<SwRootFrm*>(pPage->GetUpper())->SetVirtPageNum( true );
-                    SwDocPosUpdate aMsgHnt( pPage->Frm().Top() );
-                    GetFmt()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt );
+                    SwDocPosUpdate aMsgHint( pPage->Frm().Top() );
+                    GetFormat()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint );
                 }
             }
             break;
@@ -3148,11 +3148,11 @@ void SwTabFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
     }
 }
 
-bool SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const
+bool SwTabFrm::GetInfo( SfxPoolItem &rHint ) const
 {
-    if ( RES_VIRTPAGENUM_INFO == rHnt.Which() && IsInDocBody() && !IsFollow() )
+    if ( RES_VIRTPAGENUM_INFO == rHint.Which() && IsInDocBody() && !IsFollow() )
     {
-        SwVirtPageNumInfo &rInfo = static_cast<SwVirtPageNumInfo&>(rHnt);
+        SwVirtPageNumInfo &rInfo = static_cast<SwVirtPageNumInfo&>(rHint);
         const SwPageFrm *pPage = FindPageFrm();
         if ( pPage  )
         {
@@ -3174,11 +3174,11 @@ bool SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const
     return true;
 }
 
-SwCntntFrm *SwTabFrm::FindLastCntnt()
+SwContentFrm *SwTabFrm::FindLastContent()
 {
     SwFrm *pRet = m_pLower;
 
-    while ( pRet && !pRet->IsCntntFrm() )
+    while ( pRet && !pRet->IsContentFrm() )
     {
         SwFrm *pOld = pRet;
 
@@ -3197,7 +3197,7 @@ SwCntntFrm *SwTabFrm::FindLastCntnt()
         {
             // Check all other columns if there is a column based section with
             // an empty last column at the end of the last line - this is done
-            // by SwSectionFrm::FindLastCntnt
+            // by SwSectionFrm::FindLastContent
             if( pRet->IsColBodyFrm() )
             {
 #if OSL_DEBUG_LEVEL > 0
@@ -3205,23 +3205,23 @@ SwCntntFrm *SwTabFrm::FindLastCntnt()
                 OSL_ENSURE( pSect, "Where does this column come fron?");
                 OSL_ENSURE( IsAnLower( pSect ), "Splited cell?" );
 #endif
-                return pRet->FindSctFrm()->FindLastCntnt();
+                return pRet->FindSctFrm()->FindLastContent();
             }
 
             // pRet may be a cell frame without a lower (cell has been split).
             // We have to find the last content the hard way:
 
-            OSL_ENSURE( pRet->IsCellFrm(), "SwTabFrm::FindLastCntnt failed" );
+            OSL_ENSURE( pRet->IsCellFrm(), "SwTabFrm::FindLastContent failed" );
             const SwFrm* pRow = pRet->GetUpper();
             while ( pRow && !pRow->GetUpper()->IsTabFrm() )
                 pRow = pRow->GetUpper();
-            const SwCntntFrm* pCntntFrm = pRow ? static_cast<const SwLayoutFrm*>(pRow)->ContainsCntnt() : NULL;
+            const SwContentFrm* pContentFrm = pRow ? static_cast<const SwLayoutFrm*>(pRow)->ContainsContent() : NULL;
             pRet = 0;
 
-            while ( pCntntFrm && static_cast<const SwLayoutFrm*>(pRow)->IsAnLower( pCntntFrm ) )
+            while ( pContentFrm && static_cast<const SwLayoutFrm*>(pRow)->IsAnLower( pContentFrm ) )
             {
-                pRet = const_cast<SwCntntFrm*>(pCntntFrm);
-                pCntntFrm = pCntntFrm->GetNextCntntFrm();
+                pRet = const_cast<SwContentFrm*>(pContentFrm);
+                pContentFrm = pContentFrm->GetNextContentFrm();
             }
         }
     }
@@ -3237,10 +3237,10 @@ SwCntntFrm *SwTabFrm::FindLastCntnt()
             pRet = pRet->GetNext();
 
         if( pRet->IsSctFrm() )
-            pRet = static_cast<SwSectionFrm*>(pRet)->FindLastCntnt();
+            pRet = static_cast<SwSectionFrm*>(pRet)->FindLastContent();
     }
 
-    return static_cast<SwCntntFrm*>(pRet);
+    return static_cast<SwContentFrm*>(pRet);
 }
 
 /// Return value defines if the frm needs to be relocated
@@ -3325,7 +3325,7 @@ bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool &rReformat )
             SwRowFrm* pFirstRow = GetFirstNonHeadlineRow();
             if ( pFirstRow && pFirstRow->IsInFollowFlowRow() &&
                  SwLayouter::DoesRowContainMovedFwdFrm(
-                                            *(pFirstRow->GetFmt()->GetDoc()),
+                                            *(pFirstRow->GetFormat()->GetDoc()),
                                             *(pFirstRow) ) )
             {
                 return false;
@@ -3356,7 +3356,7 @@ void SwTabFrm::Cut()
         //which is obsolete now as it became the first one
         pFrm->_InvalidatePrt();
         pFrm->_InvalidatePos();
-        if ( pFrm->IsCntntFrm() )
+        if ( pFrm->IsContentFrm() )
             pFrm->InvalidatePage( pPage );
         if( IsInSct() && !GetPrev() )
         {
@@ -3376,7 +3376,7 @@ void SwTabFrm::Cut()
         {   pFrm->SetRetouche();
             pFrm->Prepare( PREP_WIDOWS_ORPHANS );
             pFrm->_InvalidatePos();
-            if ( pFrm->IsCntntFrm() )
+            if ( pFrm->IsContentFrm() )
                 pFrm->InvalidatePage( pPage );
         }
         //If I am (was) the only FlowFrm in my own upper, it has to do
@@ -3403,12 +3403,12 @@ void SwTabFrm::Cut()
     RemoveFromLayout();
     if ( pUp )
     {
-        OSL_ENSURE( !pUp->IsFtnFrm(), "Table in Footnote." );
+        OSL_ENSURE( !pUp->IsFootnoteFrm(), "Table in Footnote." );
         SwSectionFrm *pSct = 0;
         // #126020# - adjust check for empty section
         // #130797# - correct fix #126020#
         if ( !pUp->Lower() && pUp->IsInSct() &&
-             !(pSct = pUp->FindSctFrm())->ContainsCntnt() &&
+             !(pSct = pUp->FindSctFrm())->ContainsContent() &&
              !pSct->ContainsAny( true ) )
         {
             if ( pUp->GetUpper() )
@@ -3432,7 +3432,7 @@ void SwTabFrm::Cut()
 void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
 {
     OSL_ENSURE( pParent, "No parent for pasting." );
-    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is CntntFrm." );
+    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is ContentFrm." );
     OSL_ENSURE( pParent != this, "I'm the parent myself." );
     OSL_ENSURE( pSibling != this, "I'm my own neighbour." );
     OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(),
@@ -3449,7 +3449,7 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
     {
         GetNext()->_InvalidatePos();
         GetNext()->_InvalidatePrt();
-        if ( GetNext()->IsCntntFrm() )
+        if ( GetNext()->IsContentFrm() )
             GetNext()->InvalidatePage( pPage );
     }
 
@@ -3464,14 +3464,14 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
         if ( !IsFollow() )
         {
             GetPrev()->InvalidateSize();
-            if ( GetPrev()->IsCntntFrm() )
+            if ( GetPrev()->IsContentFrm() )
                 GetPrev()->InvalidatePage( pPage );
         }
     }
     else if ( GetNext() )
-        //Take the marging into account when dealing with CntntFrm's. There are
+        //Take the marging into account when dealing with ContentFrm's. There are
         //two situations (both always happen at once):
-        //a) The Cntnt becomes the first in a chain
+        //a) The Content becomes the first in a chain
         //b) The new follower was the first in a chain before
         GetNext()->_InvalidatePrt();
 
@@ -3482,9 +3482,9 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
 
         if ( !GetPrev() )//At least needed for HTML with a table at the beginning.
         {
-            const SwPageDesc *pDesc = GetFmt()->GetPageDesc().GetPageDesc();
+            const SwPageDesc *pDesc = GetFormat()->GetPageDesc().GetPageDesc();
             if ( (pDesc && pDesc != pPage->GetPageDesc()) ||
-                 (!pDesc && pPage->GetPageDesc() != &GetFmt()->GetDoc()->GetPageDesc(0)) )
+                 (!pDesc && pPage->GetPageDesc() != &GetFormat()->GetDoc()->GetPageDesc(0)) )
                 CheckPageDescs( pPage, true );
         }
     }
@@ -3497,7 +3497,7 @@ void SwTabFrm::Prepare( const PrepareHint eHint, const void *, bool )
 }
 
 SwRowFrm::SwRowFrm(const SwTableLine &rLine, SwFrm* pSib, bool bInsertContent)
-    : SwLayoutFrm( rLine.GetFrmFmt(), pSib )
+    : SwLayoutFrm( rLine.GetFrameFormat(), pSib )
     , m_pTabLine( &rLine )
     , m_pFollowRow( 0 )
     // #i29550#
@@ -3525,7 +3525,7 @@ SwRowFrm::SwRowFrm(const SwTableLine &rLine, SwFrm* pSib, bool bInsertContent)
 
 void SwRowFrm::DestroyImpl()
 {
-    SwModify* pMod = GetFmt();
+    SwModify* pMod = GetFormat();
     if( pMod )
     {
         pMod->Remove( this );           // remove,
@@ -3593,29 +3593,29 @@ long CalcHeightWithFlys( const SwFrm *pFrm )
     SWRECTFN( pFrm )
     long nHeight = 0;
     const SwFrm* pTmp = pFrm->IsSctFrm() ?
-            static_cast<const SwSectionFrm*>(pFrm)->ContainsCntnt() : pFrm;
+            static_cast<const SwSectionFrm*>(pFrm)->ContainsContent() : pFrm;
     while( pTmp )
     {
         // #i26945# - consider follow text frames
         const SwSortedObjs* pObjs( 0L );
         bool bIsFollow( false );
-        if ( pTmp->IsTxtFrm() && static_cast<const SwTxtFrm*>(pTmp)->IsFollow() )
+        if ( pTmp->IsTextFrm() && static_cast<const SwTextFrm*>(pTmp)->IsFollow() )
         {
             const SwFrm* pMaster;
             // #i46450# Master does not necessarily have
             // to exist if this function is called from JoinFrm() ->
             // Cut() -> Shrink()
-            const SwTxtFrm* pTmpFrm = static_cast<const SwTxtFrm*>(pTmp);
-            if ( pTmpFrm->GetPrev() && pTmpFrm->GetPrev()->IsTxtFrm() &&
-                 static_cast<const SwTxtFrm*>(pTmpFrm->GetPrev())->GetFollow() &&
-                 static_cast<const SwTxtFrm*>(pTmpFrm->GetPrev())->GetFollow() != pTmp )
+            const SwTextFrm* pTmpFrm = static_cast<const SwTextFrm*>(pTmp);
+            if ( pTmpFrm->GetPrev() && pTmpFrm->GetPrev()->IsTextFrm() &&
+                 static_cast<const SwTextFrm*>(pTmpFrm->GetPrev())->GetFollow() &&
+                 static_cast<const SwTextFrm*>(pTmpFrm->GetPrev())->GetFollow() != pTmp )
                  pMaster = 0;
             else
                  pMaster = pTmpFrm->FindMaster();
 
             if ( pMaster )
             {
-                 pObjs = static_cast<const SwTxtFrm*>(pTmp)->FindMaster()->GetDrawObjs();
+                 pObjs = static_cast<const SwTextFrm*>(pTmp)->FindMaster()->GetDrawObjs();
                 bIsFollow = true;
             }
         }
@@ -3639,15 +3639,15 @@ long CalcHeightWithFlys( const SwFrm *pFrm )
                 {
                     // OD 30.09.2003 #i18732# - only objects, which follow
                     // the text flow have to be considered.
-                    const SwFrmFmt& rFrmFmt = pAnchoredObj->GetFrmFmt();
+                    const SwFrameFormat& rFrameFormat = pAnchoredObj->GetFrameFormat();
                     const bool bConsiderObj =
-                        (rFrmFmt.GetAnchor().GetAnchorId() != FLY_AS_CHAR) &&
+                        (rFrameFormat.GetAnchor().GetAnchorId() != FLY_AS_CHAR) &&
                             pAnchoredObj->GetObjRect().Top() != FAR_AWAY &&
-                            rFrmFmt.GetFollowTextFlow().GetValue() &&
+                            rFrameFormat.GetFollowTextFlow().GetValue() &&
                             pAnchoredObj->GetPageFrm() == pTmp->FindPageFrm();
                     if ( bConsiderObj )
                     {
-                        const SwFmtFrmSize &rSz = rFrmFmt.GetFrmSize();
+                        const SwFormatFrmSize &rSz = rFrameFormat.GetFrmSize();
                         if( !rSz.GetHeightPercent() )
                         {
                             const SwTwips nDistOfFlyBottomToAnchorTop =
@@ -3784,7 +3784,7 @@ static SwTwips lcl_CalcMinRowHeight( const SwRowFrm* _pRow,
 {
     SWRECTFN( _pRow )
 
-    const SwFmtFrmSize &rSz = _pRow->GetFmt()->GetFrmSize();
+    const SwFormatFrmSize &rSz = _pRow->GetFormat()->GetFrmSize();
 
     if ( _pRow->HasFixSize() && !_pRow->IsRowSpanLine() )
     {
@@ -3848,7 +3848,7 @@ static sal_uInt16 lcl_GetTopSpace( const SwRowFrm& rRow )
             nTmpTopSpace = lcl_GetTopSpace( *static_cast<const SwRowFrm*>(pCurrLower->Lower()) );
         else
         {
-            const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFmt()->GetAttrSet();
+            const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFormat()->GetAttrSet();
             const SvxBoxItem& rBoxItem = rSet.GetBox();
             nTmpTopSpace = rBoxItem.CalcLineSpace( SvxBoxItemLine::TOP, true );
         }
@@ -3869,7 +3869,7 @@ static sal_uInt16 lcl_GetTopLineDist( const SwRowFrm& rRow )
             nTmpTopLineDist = lcl_GetTopLineDist( *static_cast<const SwRowFrm*>(pCurrLower->Lower()) );
         else
         {
-            const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFmt()->GetAttrSet();
+            const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFormat()->GetAttrSet();
             const SvxBoxItem& rBoxItem = rSet.GetBox();
             nTmpTopLineDist = rBoxItem.GetDistance( SvxBoxItemLine::TOP );
         }
@@ -3893,7 +3893,7 @@ static sal_uInt16 lcl_GetBottomLineSize( const SwRowFrm& rRow )
         }
         else
         {
-            const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFmt()->GetAttrSet();
+            const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFormat()->GetAttrSet();
             const SvxBoxItem& rBoxItem = rSet.GetBox();
             nTmpBottomLineSize = rBoxItem.CalcLineSpace( SvxBoxItemLine::BOTTOM, true ) -
                                  rBoxItem.GetDistance( SvxBoxItemLine::BOTTOM );
@@ -3918,7 +3918,7 @@ static sal_uInt16 lcl_GetBottomLineDist( const SwRowFrm& rRow )
         }
         else
         {
-            const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFmt()->GetAttrSet();
+            const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFormat()->GetAttrSet();
             const SvxBoxItem& rBoxItem = rSet.GetBox();
             nTmpBottomLineDist = rBoxItem.GetDistance( SvxBoxItemLine::BOTTOM );
         }
@@ -3995,7 +3995,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
             // If we found a 'previous' row, we look for the appropriate row frame:
             if ( pPrevTabLine )
             {
-                SwIterator<SwRowFrm,SwFmt> aIter( *pPrevTabLine->GetFrmFmt() );
+                SwIterator<SwRowFrm,SwFormat> aIter( *pPrevTabLine->GetFrameFormat() );
                 for ( SwRowFrm* pRow = aIter.First(); pRow; pRow = aIter.Next() )
                 {
                     // #115759# - do *not* take repeated
@@ -4051,7 +4051,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
 #if OSL_DEBUG_LEVEL > 0
         if ( HasFixSize() )
         {
-            const SwFmtFrmSize &rFrmSize = GetFmt()->GetFrmSize();
+            const SwFormatFrmSize &rFrmSize = GetFormat()->GetFrmSize();
             OSL_ENSURE( rFrmSize.GetSize().Height() > 0, "Hat ihn" );
         }
 #endif
@@ -4279,7 +4279,7 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
     //Only shrink as much as the content of the biggest cell allows.
     SwTwips nRealDist = nDist;
     {
-        const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize();
+        const SwFormatFrmSize &rSz = GetFormat()->GetFrmSize();
         SwTwips nMinHeight = rSz.GetHeightSizeType() == ATT_MIN_SIZE ?
                              rSz.GetHeight() :
                              0;
@@ -4361,7 +4361,7 @@ bool SwRowFrm::IsRowSplitAllowed() const
     // Fixed size rows are never allowed to split:
     if ( HasFixSize() )
     {
-        OSL_ENSURE( ATT_FIX_SIZE == GetFmt()->GetFrmSize().GetHeightSizeType(), "pRow claims to have fixed size" );
+        OSL_ENSURE( ATT_FIX_SIZE == GetFormat()->GetFrmSize().GetHeightSizeType(), "pRow claims to have fixed size" );
         return false;
     }
 
@@ -4371,8 +4371,8 @@ bool SwRowFrm::IsRowSplitAllowed() const
          pTabFrm->IsInHeadline( *this ) )
         return false;
 
-    const SwTableLineFmt* pFrmFmt = static_cast<SwTableLineFmt*>(GetTabLine()->GetFrmFmt());
-    const SwFmtRowSplit& rLP = pFrmFmt->GetRowSplit();
+    const SwTableLineFormat* pFrameFormat = static_cast<SwTableLineFormat*>(GetTabLine()->GetFrameFormat());
+    const SwFormatRowSplit& rLP = pFrameFormat->GetRowSplit();
     return rLP.GetValue();
 }
 
@@ -4381,17 +4381,17 @@ bool SwRowFrm::ShouldRowKeepWithNext() const
     bool bRet = false;
 
     const SwCellFrm* pCell = static_cast<const SwCellFrm*>(Lower());
-    const SwFrm* pTxt = pCell->Lower();
+    const SwFrm* pText = pCell->Lower();
 
-    if ( pTxt && pTxt->IsTxtFrm() )
+    if ( pText && pText->IsTextFrm() )
     {
-        bRet = static_cast<const SwTxtFrm*>(pTxt)->GetTxtNode()->GetSwAttrSet().GetKeep().GetValue();
+        bRet = static_cast<const SwTextFrm*>(pText)->GetTextNode()->GetSwAttrSet().GetKeep().GetValue();
     }
     return bRet;
 }
 
 SwCellFrm::SwCellFrm(const SwTableBox &rBox, SwFrm* pSib, bool bInsertContent)
-    : SwLayoutFrm( rBox.GetFrmFmt(), pSib )
+    : SwLayoutFrm( rBox.GetFrameFormat(), pSib )
     , m_pTabBox( &rBox )
 {
     mnFrmType = FRM_CELL;
@@ -4399,12 +4399,12 @@ SwCellFrm::SwCellFrm(const SwTableBox &rBox, SwFrm* pSib, bool bInsertContent)
     if ( !bInsertContent )
         return;
 
-    //If a StartIdx is available, CntntFrms are added in the cell, otherwise
+    //If a StartIdx is available, ContentFrms are added in the cell, otherwise
     //Rows have to be present and those are added.
     if ( rBox.GetSttIdx() )
     {
         sal_uLong nIndex = rBox.GetSttIdx();
-        ::_InsertCnt( this, rBox.GetFrmFmt()->GetDoc(), ++nIndex );
+        ::_InsertCnt( this, rBox.GetFrameFormat()->GetDoc(), ++nIndex );
     }
     else
     {
@@ -4421,7 +4421,7 @@ SwCellFrm::SwCellFrm(const SwTableBox &rBox, SwFrm* pSib, bool bInsertContent)
 
 void SwCellFrm::DestroyImpl()
 {
-    SwModify* pMod = GetFmt();
+    SwModify* pMod = GetFormat();
     if( pMod )
     {
         // At this stage the lower frames aren't destroyed already,
@@ -4488,7 +4488,7 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva )
                     // from its anchor frame.
                     bool bVertPosDepOnAnchor( true );
                     {
-                        SwFmtVertOrient aVert( pAnchoredObj->GetFrmFmt().GetVertOrient() );
+                        SwFormatVertOrient aVert( pAnchoredObj->GetFrameFormat().GetVertOrient() );
                         switch ( aVert.GetRelationOrient() )
                         {
                             case text::RelOrientation::PAGE_FRAME:
@@ -4589,7 +4589,7 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva )
                         if ( pTabFrm &&
                              !( pTabFrm->IsFollow() &&
                                 pTabFrm->FindMaster()->IsRebuildLastLine() ) &&
-                            (pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId()
+                            (pAnchoredObj->GetFrameFormat().GetAnchor().GetAnchorId()
                                                             != FLY_AS_CHAR))
                         {
                             SwPageFrm* pPageFrm = pAnchoredObj->GetPageFrm();
@@ -4611,7 +4611,7 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva )
                         // #i52904# - re-introduce direct move
                         // of drawing objects
                         const bool bDirectMove =
-                                static_cast<const SwDrawFrmFmt&>(pAnchoredObj->GetFrmFmt()).IsPosAttrSet() &&
+                                static_cast<const SwDrawFrameFormat&>(pAnchoredObj->GetFrameFormat()).IsPosAttrSet() &&
                                 bVertPosDepOnAnchor &&
                                 !pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos();
                         if ( bDirectMove )
@@ -4654,8 +4654,8 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva )
         // #i26945# - consider content inside fly frames
         if ( nDistanceToUpperPrtBottom < 0 &&
              ( ( pFrm->IsInFly() &&
-                 ( !pFrm->IsTxtFrm() ||
-                   !static_cast<SwTxtFrm*>(pFrm)->IsUndersized() ) ) ||
+                 ( !pFrm->IsTextFrm() ||
+                   !static_cast<SwTextFrm*>(pFrm)->IsUndersized() ) ) ||
                pFrm->IsInSplitTableRow() ) )
         {
             pFrm->InvalidatePos();
@@ -4720,7 +4720,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
         SwTwips nWidth;
         if ( GetNext() )
         {
-            const SwTwips nWish = pTab->GetFmt()->GetFrmSize().GetWidth();
+            const SwTwips nWish = pTab->GetFormat()->GetFrmSize().GetWidth();
             nWidth = pAttrs->GetSize().Width();
 
             OSL_ENSURE( nWish, "Table without width?" );
@@ -4743,7 +4743,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
                     do
                     {
                         pTmpBox = rBoxes[ i++ ];
-                        nSumWidth += pTmpBox->GetFrmFmt()->GetFrmSize().GetWidth();
+                        nSumWidth += pTmpBox->GetFrameFormat()->GetFrmSize().GetWidth();
                     }
                     while ( pTmpBox != GetTabBox() );
 
@@ -4813,7 +4813,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
             }
         }
     }
-    const SwFmtVertOrient &rOri = pAttrs->GetAttrSet().GetVertOrient();
+    const SwFormatVertOrient &rOri = pAttrs->GetAttrSet().GetVertOrient();
 
     if ( !Lower() )
         return;
@@ -4828,7 +4828,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
     // #116532# Do not consider vertical alignment in grid mode
          !(pPg = FindPageFrm())->HasGrid() )
     {
-        if ( !Lower()->IsCntntFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() )
+        if ( !Lower()->IsContentFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() )
         {
             // OSL_ENSURE(for HTML-import!
             OSL_ENSURE( false, "VAlign to cell without content" );
@@ -4838,7 +4838,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
         // #i43913# - no vertical alignment, if wrapping
         // style influence is considered on object positioning and
         // an object is anchored inside the cell.
-        const bool bConsiderWrapOnObjPos( GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) );
+        const bool bConsiderWrapOnObjPos( GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) );
         //No alignment if border with flow overlaps the cell.
         if ( pPg->GetSortedObjs() )
         {
@@ -4849,8 +4849,8 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
                 SwRect aTmp( pAnchoredObj->GetObjRect() );
                 if ( aTmp.IsOver( aRect ) )
                 {
-                    const SwFrmFmt& rAnchoredObjFrmFmt = pAnchoredObj->GetFrmFmt();
-                    const SwFmtSurround &rSur = rAnchoredObjFrmFmt.GetSurround();
+                    const SwFrameFormat& rAnchoredObjFrameFormat = pAnchoredObj->GetFrameFormat();
+                    const SwFormatSurround &rSur = rAnchoredObjFrameFormat.GetSurround();
 
                     if ( SURROUND_THROUGHT != rSur.GetSurround() )
                     {
@@ -4873,7 +4873,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
                         if ( bConsiderWrapOnObjPos ||
                              !IsAnLower( pAnch ) ||
                              pAnchoredObj->IsTmpConsiderWrapInfluence() ||
-                             !rAnchoredObjFrmFmt.GetFollowTextFlow().GetValue() )
+                             !rAnchoredObjFrameFormat.GetFollowTextFlow().GetValue() )
                         {
                             bVertDir = false;
                             break;
@@ -4910,7 +4910,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
     else
     {
         //Was an old alignment taken into account?
-        if ( Lower()->IsCntntFrm() )
+        if ( Lower()->IsContentFrm() )
         {
             const long lYStart = (this->*fnRect->fnGetPrtTop)();
             lcl_ArrangeLowers( this, lYStart, true );
@@ -4931,9 +4931,9 @@ void SwCellFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
     if ( pItem )
     {
         bool bInva = true;
-        if ( text::VertOrientation::NONE == static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() &&
+        if ( text::VertOrientation::NONE == static_cast<const SwFormatVertOrient*>(pItem)->GetVertOrient() &&
              // OD 04.11.2003 #112910#
-             Lower() && Lower()->IsCntntFrm() )
+             Lower() && Lower()->IsContentFrm() )
         {
             SWRECTFN( this )
             const long lYStart = (this->*fnRect->fnGetPrtTop)();
@@ -5075,7 +5075,7 @@ bool SwTable::IsHeadline( const SwTableLine& rLine ) const
 
 bool SwTabFrm::IsLayoutSplitAllowed() const
 {
-    return GetFmt()->GetLayoutSplit().GetValue();
+    return GetFormat()->GetLayoutSplit().GetValue();
 }
 
 // #i29550#
@@ -5097,7 +5097,7 @@ sal_uInt16 SwTabFrm::GetBottomLineSize() const
 
 bool SwTabFrm::IsCollapsingBorders() const
 {
-    return static_cast<const SfxBoolItem&>(GetFmt()->GetAttrSet().Get( RES_COLLAPSING_BORDERS )).GetValue();
+    return static_cast<const SfxBoolItem&>(GetFormat()->GetAttrSet().Get( RES_COLLAPSING_BORDERS )).GetValue();
 }
 
 /// Local helper function to calculate height of first text row
@@ -5143,11 +5143,11 @@ static SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine )
             {
                 nTmpHeight = static_cast<const SwTabFrm*>(pTmp)->CalcHeightOfFirstContentLine();
             }
-            else if ( pTmp->IsTxtFrm() )
+            else if ( pTmp->IsTextFrm() )
             {
-                SwTxtFrm* pTxtFrm = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pTmp));
-                pTxtFrm->GetFormatted();
-                nTmpHeight = pTxtFrm->FirstLineHeight();
+                SwTextFrm* pTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pTmp));
+                pTextFrm->GetFormatted();
+                nTmpHeight = pTextFrm->FirstLineHeight();
             }
 
             if ( USHRT_MAX != nTmpHeight )
@@ -5173,8 +5173,8 @@ static SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine )
                     // #115759# - do *not* consider the
                     // additional lower space for 'master' text frames
                     if ( pLast && pLast->IsFlowFrm() &&
-                         ( !pLast->IsTxtFrm() ||
-                           !static_cast<const SwTxtFrm*>(pLast)->GetFollow() ) )
+                         ( !pLast->IsTextFrm() ||
+                           !static_cast<const SwTextFrm*>(pLast)->GetFollow() ) )
                     {
                         nReal += SwFlowFrm::CastFlowFrm(pLast)->CalcAddLowerSpaceAsLastInTableCell();
                     }
@@ -5182,8 +5182,8 @@ static SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine )
                     // #115759# - do *not* consider the upper
                     // and the lower space for follow text frames.
                     if ( pTmp->IsFlowFrm() &&
-                         ( !pTmp->IsTxtFrm() ||
-                           !static_cast<const SwTxtFrm*>(pTmp)->IsFollow() ) )
+                         ( !pTmp->IsTextFrm() ||
+                           !static_cast<const SwTextFrm*>(pTmp)->IsFollow() ) )
                     {
                         nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp)->CalcUpperSpace( NULL, pLast);
                         nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp)->CalcLowerSpace();
@@ -5192,8 +5192,8 @@ static SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine )
                     // space of <pTmp>, if contains only one line.
                     // In this case it would be the new last text frame, which
                     // would have no follow and thus would add this space.
-                    if ( pTmp->IsTxtFrm() &&
-                         const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pTmp))
+                    if ( pTmp->IsTextFrm() &&
+                         const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pTmp))
                                             ->GetLineCount( COMPLETE_STRING ) == 1 )
                     {
                         nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp)
@@ -5244,7 +5244,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const
 {
     SWRECTFN( this )
 
-    const bool bDontSplit = !IsFollow() && !GetFmt()->GetLayoutSplit().GetValue();
+    const bool bDontSplit = !IsFollow() && !GetFormat()->GetLayoutSplit().GetValue();
 
     if ( bDontSplit )
     {
@@ -5268,7 +5268,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const
     // Calculate the height of the keeping lines
     // (headlines + following keeping lines):
     SwTwips nKeepHeight = nRepeatHeight;
-    if ( GetFmt()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP) )
+    if ( GetFormat()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP) )
     {
         sal_uInt16 nKeepRows = nRepeat;
 
@@ -5343,7 +5343,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const
             const SwTwips nHeightOfFirstContentLine = lcl_CalcHeightOfFirstContentLine( *pFirstRow );
 
             // Consider minimum row height:
-            const SwFmtFrmSize &rSz = static_cast<const SwRowFrm*>(pFirstRow)->GetFmt()->GetFrmSize();
+            const SwFormatFrmSize &rSz = static_cast<const SwRowFrm*>(pFirstRow)->GetFormat()->GetFrmSize();
             const SwTwips nMinRowHeight = rSz.GetHeightSizeType() == ATT_MIN_SIZE ?
                                           rSz.GetHeight() : 0;
 
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 4e3766533c13..578192f54ec1 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -61,8 +61,8 @@ namespace {
             const SwVirtFlyDrawObj* pObj =
                                 static_cast<const SwVirtFlyDrawObj*>(aIter());
             const SwAnchoredObject* pAnchoredObj = GetUserCall( aIter() )->GetAnchoredObj( aIter() );
-            const SwFmtSurround& rSurround = pAnchoredObj->GetFrmFmt().GetSurround();
-            const SvxOpaqueItem& rOpaque = pAnchoredObj->GetFrmFmt().GetOpaque();
+            const SwFormatSurround& rSurround = pAnchoredObj->GetFrameFormat().GetSurround();
+            const SvxOpaqueItem& rOpaque = pAnchoredObj->GetFrameFormat().GetOpaque();
             bool bInBackground = ( rSurround.GetSurround() == SURROUND_THROUGHT ) && !rOpaque.GetValue();
 
             bool bBackgroundMatches = ( bInBackground && bSearchBackground ) ||
@@ -138,7 +138,7 @@ public:
 
 static SwCrsrOszControl aOszCtrl = { 0, 0, 0 };
 
-/** Searches the CntntFrm owning the PrtArea containing the point. */
+/** Searches the ContentFrm owning the PrtArea containing the point. */
 bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
                                SwCrsrMoveState* pCMS, bool ) const
 {
@@ -149,13 +149,13 @@ bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
         pFrm->Calc();
 
         // #i43742# New function
-        const bool bCntntCheck = pFrm->IsTxtFrm() && pCMS && pCMS->bCntntCheck;
-        const SwRect aPaintRect( bCntntCheck ?
+        const bool bContentCheck = pFrm->IsTextFrm() && pCMS && pCMS->bContentCheck;
+        const SwRect aPaintRect( bContentCheck ?
                                  pFrm->UnionFrm() :
                                  pFrm->PaintArea() );
 
         if ( aPaintRect.IsInside( rPoint ) &&
-             ( bCntntCheck || pFrm->GetCrsrOfst( pPos, rPoint, pCMS ) ) )
+             ( bContentCheck || pFrm->GetCrsrOfst( pPos, rPoint, pCMS ) ) )
             bRet = true;
         else
             pFrm = pFrm->GetNext();
@@ -198,7 +198,7 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
         SwPosition aBackPos( *pPos );
         SwPosition aTextPos( *pPos );
 
-        //We fix the StartPoint if no Cntnt below the page 'answers' and then
+        //We fix the StartPoint if no Content below the page 'answers' and then
         //start all over again one page before the current one.
         //However we can't use Flys in such a case.
         if ( SwLayoutFrm::GetCrsrOfst( &aTextPos, aPoint, pCMS ) )
@@ -212,12 +212,12 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
                 static_cast<SwCrsrMoveState*>(pCMS)->bStop = true;
                 return false;
             }
-            const SwCntntFrm *pCnt = GetCntntPos( aPoint, false, false, false, pCMS, false );
+            const SwContentFrm *pCnt = GetContentPos( aPoint, false, false, false, pCMS, false );
             if ( pCMS && pCMS->bStop )
                 return false;
 
             OSL_ENSURE( pCnt, "Crsr is gone to a Black hole" );
-            if( pCMS && pCMS->pFill && pCnt->IsTxtFrm() )
+            if( pCMS && pCMS->pFill && pCnt->IsTextFrm() )
                 bTextRet = pCnt->GetCrsrOfst( &aTextPos, rPoint, pCMS );
             else
                 bTextRet = pCnt->GetCrsrOfst( &aTextPos, aPoint, pCMS );
@@ -226,21 +226,21 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
             {
                 // Set point to pCnt, delete mark
                 // this may happen, if pCnt is hidden
-                aTextPos = SwPosition( *pCnt->GetNode(), SwIndex( const_cast<SwTxtNode*>(static_cast<const SwTxtNode*>(pCnt->GetNode())), 0 ) );
+                aTextPos = SwPosition( *pCnt->GetNode(), SwIndex( const_cast<SwTextNode*>(static_cast<const SwTextNode*>(pCnt->GetNode())), 0 ) );
                 bTextRet = true;
             }
         }
 
-        SwCntntNode* pContentNode = aTextPos.nNode.GetNode().GetCntntNode();
+        SwContentNode* pContentNode = aTextPos.nNode.GetNode().GetContentNode();
         bool bConsiderBackground = true;
         // If the text position is a clickable field, then that should have priority.
-        if (pContentNode && pContentNode->IsTxtNode())
+        if (pContentNode && pContentNode->IsTextNode())
         {
-            SwTxtNode* pTxtNd = pContentNode->GetTxtNode();
-            SwTxtAttr* pTxtAttr = pTxtNd->GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
-            if (pTxtAttr)
+            SwTextNode* pTextNd = pContentNode->GetTextNode();
+            SwTextAttr* pTextAttr = pTextNd->GetTextAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
+            if (pTextAttr)
             {
-                const SwField* pField = pTxtAttr->GetFmtFld().GetField();
+                const SwField* pField = pTextAttr->GetFormatField().GetField();
                 if (pField->IsClickable())
                     bConsiderBackground = false;
             }
@@ -272,7 +272,7 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
             bool bValidTextDistance = false;
             if (pContentNode)
             {
-                SwCntntFrm* pTextFrm = pContentNode->getLayoutFrm( getRootFrm( ) );
+                SwContentFrm* pTextFrm = pContentNode->getLayoutFrm( getRootFrm( ) );
 
                 // try this again but prefer the "previous" position
                 SwCrsrMoveState aMoveState;
@@ -320,11 +320,11 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
 
             double nBackDistance = 0;
             bool bValidBackDistance = false;
-            SwCntntNode* pBackNd = aBackPos.nNode.GetNode( ).GetCntntNode( );
+            SwContentNode* pBackNd = aBackPos.nNode.GetNode( ).GetContentNode( );
             if ( pBackNd && bConsiderBackground)
             {
                 // FIXME There are still cases were we don't have the proper node here.
-                SwCntntFrm* pBackFrm = pBackNd->getLayoutFrm( getRootFrm( ) );
+                SwContentFrm* pBackFrm = pBackNd->getLayoutFrm( getRootFrm( ) );
                 SwRect rBackRect;
                 if (pBackFrm)
                 {
@@ -456,7 +456,7 @@ bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
 }
 
 /**
- * If this is about a Cntnt-carrying cell the Crsr will be force inserted into one of the CntntFrms
+ * If this is about a Content-carrying cell the Crsr will be force inserted into one of the ContentFrms
  * if there are no other options.
  *
  * There is no entry for protected cells.
@@ -469,7 +469,7 @@ bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
         return false;
 
     if ( !(pCMS && pCMS->bSetInReadOnly) &&
-         GetFmt()->GetProtect().IsCntntProtected() )
+         GetFormat()->GetProtect().IsContentProtected() )
         return false;
 
     if ( pCMS && pCMS->eState == MV_TBLSEL )
@@ -507,8 +507,8 @@ bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
             {
                 const bool bFill = pCMS && pCMS->pFill;
                 Point aPoint( rPoint );
-                const SwCntntFrm *pCnt = GetCntntPos( rPoint, true );
-                if( bFill && pCnt->IsTxtFrm() )
+                const SwContentFrm *pCnt = GetContentPos( rPoint, true );
+                if( bFill && pCnt->IsTextFrm() )
                 {
                     rPoint = aPoint;
                 }
@@ -543,7 +543,7 @@ bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
     //If an Frm contains a graphic, but only text was requested, it basically
     //won't accept the Crsr.
     if ( bInside && pCMS && pCMS->eState == MV_SETONLYTEXT &&
-         (!Lower() || Lower()->IsNoTxtFrm()) )
+         (!Lower() || Lower()->IsNoTextFrm()) )
         bInside = false;
 
     const SwPageFrm *pPage = FindPageFrm();
@@ -588,10 +588,10 @@ bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
         {
             const bool bFill = pCMS && pCMS->pFill;
             Point aPoint( rPoint );
-            const SwCntntFrm *pCnt = GetCntntPos( rPoint, true, false, false, pCMS );
+            const SwContentFrm *pCnt = GetContentPos( rPoint, true, false, false, pCMS );
             if ( pCMS && pCMS->bStop )
                 return false;
-            if( bFill && pCnt->IsTxtFrm() )
+            if( bFill && pCnt->IsTextFrm() )
             {
                 rPoint = aPoint;
             }
@@ -604,35 +604,35 @@ bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
 }
 
 /** Layout dependent cursor travelling */
-bool SwCntntFrm::LeftMargin(SwPaM *pPam) const
+bool SwContentFrm::LeftMargin(SwPaM *pPam) const
 {
     if( &pPam->GetNode() != GetNode() )
         return false;
-    const_cast<SwCntntNode*>(GetNode())->
+    const_cast<SwContentNode*>(GetNode())->
         MakeStartIndex(&pPam->GetPoint()->nContent);
     return true;
 }
 
-bool SwCntntFrm::RightMargin(SwPaM *pPam, bool) const
+bool SwContentFrm::RightMargin(SwPaM *pPam, bool) const
 {
     if( &pPam->GetNode() != GetNode() )
         return false;
-    const_cast<SwCntntNode*>(GetNode())->
+    const_cast<SwContentNode*>(GetNode())->
         MakeEndIndex(&pPam->GetPoint()->nContent);
     return true;
 }
 
-static const SwCntntFrm *lcl_GetNxtCnt( const SwCntntFrm* pCnt )
+static const SwContentFrm *lcl_GetNxtCnt( const SwContentFrm* pCnt )
 {
-    return pCnt->GetNextCntntFrm();
+    return pCnt->GetNextContentFrm();
 }
 
-static const SwCntntFrm *lcl_GetPrvCnt( const SwCntntFrm* pCnt )
+static const SwContentFrm *lcl_GetPrvCnt( const SwContentFrm* pCnt )
 {
-    return pCnt->GetPrevCntntFrm();
+    return pCnt->GetPrevContentFrm();
 }
 
-typedef const SwCntntFrm *(*GetNxtPrvCnt)( const SwCntntFrm* );
+typedef const SwContentFrm *(*GetNxtPrvCnt)( const SwContentFrm* );
 
 /// Frame in repeated headline?
 static bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm,
@@ -647,7 +647,7 @@ static bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm,
 /// Skip protected table cells. Optionally also skip repeated headlines.
 //MA 1998-01-26: Chg also skip other protected areas
 //FME: Skip follow flow cells
-static const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
+static const SwContentFrm * lcl_MissProtectedFrames( const SwContentFrm *pCnt,
                                                    GetNxtPrvCnt fnNxtPrv,
                                                    bool bMissHeadline,
                                                    bool bInReadOnly,
@@ -662,7 +662,7 @@ static const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
             while ( pCell && !pCell->IsCellFrm() )
                 pCell = pCell->GetUpper();
             if ( !pCell ||
-                    (( ( bInReadOnly || !pCell->GetFmt()->GetProtect().IsCntntProtected() ) &&
+                    (( ( bInReadOnly || !pCell->GetFormat()->GetProtect().IsContentProtected() ) &&
                       ( !bMissHeadline || !lcl_IsInRepeatedHeadline( pCell ) ) &&
                       ( !bMissFollowFlowLine || !pCell->IsInFollowFlowRow() ) &&
                        !pCell->IsCoveredCell()) ) )
@@ -678,23 +678,23 @@ static const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
     return pCnt;
 }
 
-static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
+static bool lcl_UpDown( SwPaM *pPam, const SwContentFrm *pStart,
                     GetNxtPrvCnt fnNxtPrv, bool bInReadOnly )
 {
     OSL_ENSURE( &pPam->GetNode() == pStart->GetNode(),
             "lcl_UpDown doesn't work for others." );
 
-    const SwCntntFrm *pCnt = 0;
+    const SwContentFrm *pCnt = 0;
 
     //We have to cheat a little bit during a table selection: Go to the
     //beginning of the cell while going up and go to the end of the cell while
     //going down.
-    bool bTblSel = false;
+    bool bTableSel = false;
     if ( pStart->IsInTab() &&
         pPam->GetNode( true ).StartOfSectionNode() !=
         pPam->GetNode( false ).StartOfSectionNode() )
     {
-        bTblSel = true;
+        bTableSel = true;
         const SwLayoutFrm  *pCell = pStart->GetUpper();
         while ( !pCell->IsCellFrm() )
             pCell = pCell->GetUpper();
@@ -705,15 +705,15 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
             static_cast<const SwCellFrm*>(pCell)->GetFollowCell() :
             static_cast<const SwCellFrm*>(pCell)->GetPreviousCell();
 
-        const SwCntntFrm* pTmpStart = pStart;
-        while ( pTmpCell && 0 != ( pTmpStart = pTmpCell->ContainsCntnt() ) )
+        const SwContentFrm* pTmpStart = pStart;
+        while ( pTmpCell && 0 != ( pTmpStart = pTmpCell->ContainsContent() ) )
         {
             pCell = pTmpCell;
             pTmpCell = bFwd ?
                 static_cast<const SwCellFrm*>(pCell)->GetFollowCell() :
                 static_cast<const SwCellFrm*>(pCell)->GetPreviousCell();
         }
-        const SwCntntFrm *pNxt = pCnt = pTmpStart;
+        const SwContentFrm *pNxt = pCnt = pTmpStart;
 
         while ( pCell->IsAnLower( pNxt ) )
         {
@@ -723,7 +723,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
     }
 
     pCnt = (*fnNxtPrv)( pCnt ? pCnt : pStart );
-    pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel );
+    pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel );
 
     const SwTabFrm *pStTab = pStart->FindTabFrm();
     const SwTabFrm *pTable = 0;
@@ -731,7 +731,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
     bool bEnd = !bTab;
 
     const SwFrm* pVertRefFrm = pStart;
-    if ( bTblSel && pStTab )
+    if ( bTableSel && pStTab )
         pVertRefFrm = pStTab;
     SWRECTFN( pVertRefFrm )
 
@@ -796,32 +796,32 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
         if ( pStart->IsInDocBody() )
         {
             while ( pCnt && (!pCnt->IsInDocBody() ||
-                             (pCnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsHiddenNow())))
+                             (pCnt->IsTextFrm() && static_cast<const SwTextFrm*>(pCnt)->IsHiddenNow())))
             {
                 pCnt = (*fnNxtPrv)( pCnt );
-                pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel );
+                pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel );
             }
         }
 
         //If I'm in the FootNoteArea, I try to reach the next FootNoteArea in
         //case of necessity.
-        else if ( pStart->IsInFtn() )
+        else if ( pStart->IsInFootnote() )
         {
-            while ( pCnt && (!pCnt->IsInFtn() ||
-                            (pCnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsHiddenNow())))
+            while ( pCnt && (!pCnt->IsInFootnote() ||
+                            (pCnt->IsTextFrm() && static_cast<const SwTextFrm*>(pCnt)->IsHiddenNow())))
             {
                 pCnt = (*fnNxtPrv)( pCnt );
-                pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel );
+                pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel );
             }
         }
 
-        //In Flys we can go ahead blindly as long as we find a Cntnt.
+        //In Flys we can go ahead blindly as long as we find a Content.
         else if ( pStart->IsInFly() )
         {
-            if ( pCnt && pCnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsHiddenNow() )
+            if ( pCnt && pCnt->IsTextFrm() && static_cast<const SwTextFrm*>(pCnt)->IsHiddenNow() )
             {
                 pCnt = (*fnNxtPrv)( pCnt );
-                pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel );
+                pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel );
             }
         }
 
@@ -842,10 +842,10 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
             }
             if ( !bSame )
                 pCnt = 0;
-            else if ( pCnt && pCnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsHiddenNow() ) // i73332
+            else if ( pCnt && pCnt->IsTextFrm() && static_cast<const SwTextFrm*>(pCnt)->IsHiddenNow() ) // i73332
             {
                 pCnt = (*fnNxtPrv)( pCnt );
-                pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel );
+                pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel );
             }
         }
 
@@ -905,13 +905,13 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
                     if ( pCell && pCell->Frm().IsInside( aInsideCell ) )
                     {
                         bEnd = true;
-                        //Get the right Cntnt out of the cell.
+                        //Get the right Content out of the cell.
                         if ( !pCnt->Frm().IsInside( aInsideCnt ) )
                         {
-                            pCnt = pCell->ContainsCntnt();
+                            pCnt = pCell->ContainsContent();
                             if ( fnNxtPrv == lcl_GetPrvCnt )
-                                while ( pCell->IsAnLower(pCnt->GetNextCntntFrm()) )
-                                    pCnt = pCnt->GetNextCntntFrm();
+                                while ( pCell->IsAnLower(pCnt->GetNextContentFrm()) )
+                                    pCnt = pCnt->GetNextContentFrm();
                         }
                     }
                     else if ( pCnt->Frm().IsInside( aInsideCnt ) )
@@ -921,16 +921,16 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
             if ( !bEnd )
             {
                 pCnt = (*fnNxtPrv)( pCnt );
-                pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel );
+                pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel );
             }
         }
 
     } while ( !bEnd ||
-              (pCnt && pCnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsHiddenNow()));
+              (pCnt && pCnt->IsTextFrm() && static_cast<const SwTextFrm*>(pCnt)->IsHiddenNow()));
 
     if( pCnt )
     {   // set the Point on the Content-Node
-        SwCntntNode *pCNd = const_cast<SwCntntNode*>(pCnt->GetNode());
+        SwContentNode *pCNd = const_cast<SwContentNode*>(pCnt->GetNode());
         pPam->GetPoint()->nNode = *pCNd;
         if ( fnNxtPrv == lcl_GetPrvCnt )
             pCNd->MakeEndIndex( &pPam->GetPoint()->nContent );
@@ -941,12 +941,12 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
     return false;
 }
 
-bool SwCntntFrm::UnitUp( SwPaM* pPam, const SwTwips, bool bInReadOnly ) const
+bool SwContentFrm::UnitUp( SwPaM* pPam, const SwTwips, bool bInReadOnly ) const
 {
     return ::lcl_UpDown( pPam, this, lcl_GetPrvCnt, bInReadOnly );
 }
 
-bool SwCntntFrm::UnitDown( SwPaM* pPam, const SwTwips, bool bInReadOnly ) const
+bool SwContentFrm::UnitDown( SwPaM* pPam, const SwTwips, bool bInReadOnly ) const
 {
     return ::lcl_UpDown( pPam, this, lcl_GetNxtCnt, bInReadOnly );
 }
@@ -960,7 +960,7 @@ sal_uInt16 SwRootFrm::GetCurrPage( const SwPaM *pActualCrsr ) const
 {
     OSL_ENSURE( pActualCrsr, "got no page cursor" );
     SwFrm const*const pActFrm = pActualCrsr->GetPoint()->nNode.GetNode().
-                                    GetCntntNode()->getLayoutFrm( this, 0,
+                                    GetContentNode()->getLayoutFrm( this, 0,
                                                     pActualCrsr->GetPoint(),
                                                     false );
     return pActFrm->FindPageFrm()->GetPhyPageNum();
@@ -983,13 +983,13 @@ sal_uInt16 SwRootFrm::SetCurrPage( SwCursor* pToSet, sal_uInt16 nPageNum )
     {   if ( pPage->GetNext() )
             pPage = static_cast<SwPageFrm*>(pPage->GetNext());
         else
-        {   //Search the first CntntFrm and format until a new page is started
-            //or until the CntntFrm are all done.
-            const SwCntntFrm *pCntnt = pPage->ContainsCntnt();
-            while ( pCntnt && pPage->IsAnLower( pCntnt ) )
+        {   //Search the first ContentFrm and format until a new page is started
+            //or until the ContentFrm are all done.
+            const SwContentFrm *pContent = pPage->ContainsContent();
+            while ( pContent && pPage->IsAnLower( pContent ) )
             {
-                pCntnt->Calc();
-                pCntnt = pCntnt->GetNextCntntFrm();
+                pContent->Calc();
+                pContent = pContent->GetNextContentFrm();
             }
             //Either this is a new page or we found the last page.
             if ( pPage->GetNext() )
@@ -999,42 +999,42 @@ sal_uInt16 SwRootFrm::SetCurrPage( SwCursor* pToSet, sal_uInt16 nPageNum )
         }
     }
     //pPage now points to the 'requested' page. Now we have to create the PaM
-    //on the beginning of the first CntntFrm in the body-text.
+    //on the beginning of the first ContentFrm in the body-text.
     //If this is a footnote-page, the PaM will be set in the first footnote.
-    const SwCntntFrm *pCntnt = pPage->ContainsCntnt();
-    if ( pPage->IsFtnPage() )
-        while ( pCntnt && !pCntnt->IsInFtn() )
-            pCntnt = pCntnt->GetNextCntntFrm();
+    const SwContentFrm *pContent = pPage->ContainsContent();
+    if ( pPage->IsFootnotePage() )
+        while ( pContent && !pContent->IsInFootnote() )
+            pContent = pContent->GetNextContentFrm();
     else
-        while ( pCntnt && !pCntnt->IsInDocBody() )
-            pCntnt = pCntnt->GetNextCntntFrm();
-    if ( pCntnt )
+        while ( pContent && !pContent->IsInDocBody() )
+            pContent = pContent->GetNextContentFrm();
+    if ( pContent )
     {
-        SwCntntNode* pCNd = const_cast<SwCntntNode*>(pCntnt->GetNode());
+        SwContentNode* pCNd = const_cast<SwContentNode*>(pContent->GetNode());
         pToSet->GetPoint()->nNode = *pCNd;
         pCNd->MakeStartIndex( &pToSet->GetPoint()->nContent );
-        pToSet->GetPoint()->nContent = static_cast<const SwTxtFrm*>(pCntnt)->GetOfst();
+        pToSet->GetPoint()->nContent = static_cast<const SwTextFrm*>(pContent)->GetOfst();
 
         SwShellCrsr* pSCrsr = dynamic_cast<SwShellCrsr*>(pToSet);
         if( pSCrsr )
         {
             Point &rPt = pSCrsr->GetPtPos();
-            rPt = pCntnt->Frm().Pos();
-            rPt += pCntnt->Prt().Pos();
+            rPt = pContent->Frm().Pos();
+            rPt += pContent->Prt().Pos();
         }
         return pPage->GetPhyPageNum();
     }
     return 0;
 }
 
-SwCntntFrm *GetFirstSub( const SwLayoutFrm *pLayout )
+SwContentFrm *GetFirstSub( const SwLayoutFrm *pLayout )
 {
-    return const_cast<SwPageFrm*>(static_cast<const SwPageFrm*>(pLayout))->FindFirstBodyCntnt();
+    return const_cast<SwPageFrm*>(static_cast<const SwPageFrm*>(pLayout))->FindFirstBodyContent();
 }
 
-SwCntntFrm *GetLastSub( const SwLayoutFrm *pLayout )
+SwContentFrm *GetLastSub( const SwLayoutFrm *pLayout )
 {
-    return const_cast<SwPageFrm*>(static_cast<const SwPageFrm*>(pLayout))->FindLastBodyCntnt();
+    return const_cast<SwPageFrm*>(static_cast<const SwPageFrm*>(pLayout))->FindLastBodyContent();
 }
 
 SwLayoutFrm *GetNextFrm( const SwLayoutFrm *pFrm )
@@ -1043,7 +1043,7 @@ SwLayoutFrm *GetNextFrm( const SwLayoutFrm *pFrm )
         (pFrm->GetNext() && pFrm->GetNext()->IsLayoutFrm()) ?
                                             const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(pFrm->GetNext())) : 0;
     // #i39402# in case of an empty page
-    if(pNext && !pNext->ContainsCntnt())
+    if(pNext && !pNext->ContainsContent())
         pNext = (pNext->GetNext() && pNext->GetNext()->IsLayoutFrm()) ?
                                             static_cast<SwLayoutFrm*>(pNext->GetNext()) : 0;
     return pNext;
@@ -1060,7 +1060,7 @@ SwLayoutFrm *GetPrevFrm( const SwLayoutFrm *pFrm )
         (pFrm->GetPrev() && pFrm->GetPrev()->IsLayoutFrm()) ?
                                             const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(pFrm->GetPrev())) : 0;
     // #i39402# in case of an empty page
-    if(pPrev && !pPrev->ContainsCntnt())
+    if(pPrev && !pPrev->ContainsContent())
         pPrev = (pPrev->GetPrev() && pPrev->GetPrev()->IsLayoutFrm()) ?
                                             static_cast<SwLayoutFrm*>(pPrev->GetPrev()) : 0;
     return pPrev;
@@ -1078,7 +1078,7 @@ SwWhichPage fnPageNext = GetNextFrm;
  * Returns the first/last Contentframe (controlled using the parameter fnPosPage)
  * of the current/previous/next page (controlled using the parameter fnWhichPage).
  */
-bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage,
+bool GetFrmInPage( const SwContentFrm *pCnt, SwWhichPage fnWhichPage,
                    SwPosPage fnPosPage, SwPaM *pPam )
 {
     //First find the requested page, at first the current, then the one which
@@ -1087,7 +1087,7 @@ bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage,
     if ( !pLayoutFrm || (0 == (pLayoutFrm = (*fnWhichPage)(pLayoutFrm))) )
         return false;
 
-    //Now the desired CntntFrm below the page
+    //Now the desired ContentFrm below the page
     if( 0 == (pCnt = (*fnPosPage)(pLayoutFrm)) )
         return false;
     else
@@ -1107,7 +1107,7 @@ bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage,
                         // with repeated headings.
                         // To actually make a "real" move we take the first content
                         // of the next row
-                        pCnt = pRow->ContainsCntnt();
+                        pCnt = pRow->ContainsContent();
                         if ( ! pCnt )
                             return false;
                     }
@@ -1115,14 +1115,14 @@ bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage,
             }
         }
 
-        SwCntntNode *pCNd = const_cast<SwCntntNode*>(pCnt->GetNode());
+        SwContentNode *pCNd = const_cast<SwContentNode*>(pCnt->GetNode());
         pPam->GetPoint()->nNode = *pCNd;
         sal_Int32 nIdx;
         if( fnPosPage == GetFirstSub )
-            nIdx = static_cast<const SwTxtFrm*>(pCnt)->GetOfst();
+            nIdx = static_cast<const SwTextFrm*>(pCnt)->GetOfst();
         else
             nIdx = pCnt->GetFollow() ?
-                    static_cast<const SwTxtFrm*>(pCnt)->GetFollow()->GetOfst()-1 : pCNd->Len();
+                    static_cast<const SwTextFrm*>(pCnt)->GetFollow()->GetOfst()-1 : pCNd->Len();
         pPam->GetPoint()->nContent.Assign( pCNd, nIdx );
         return true;
     }
@@ -1139,13 +1139,13 @@ static sal_uInt64 CalcDiff(const Point &rPt1, const Point &rPt2)
     return (dX * dX) + (dY * dY);
 }
 
-/** Check if the point lies inside the page part in which also the CntntFrame lies.
+/** Check if the point lies inside the page part in which also the ContentFrame lies.
  *
  * In this context header, page body, footer and footnote-container count as page part.
- * This will suit the purpose that the CntntFrm which lies in the "right" page part will be
+ * This will suit the purpose that the ContentFrm which lies in the "right" page part will be
  * accepted instead of one which doesn't lie there although his distance to the point is shorter.
  */
-static const SwLayoutFrm* lcl_Inside( const SwCntntFrm *pCnt, Point& rPt )
+static const SwLayoutFrm* lcl_Inside( const SwContentFrm *pCnt, Point& rPt )
 {
     const SwLayoutFrm* pUp = pCnt->GetUpper();
     while( pUp )
@@ -1156,40 +1156,40 @@ static const SwLayoutFrm* lcl_Inside( const SwCntntFrm *pCnt, Point& rPt )
                 return pUp;
             return NULL;
         }
-        if( pUp->IsFtnContFrm() )
+        if( pUp->IsFootnoteContFrm() )
             return pUp->Frm().IsInside( rPt ) ? pUp : NULL;
         pUp = pUp->GetUpper();
     }
     return NULL;
 }
 
-/** Search for the nearest Cntnt to pass.
+/** Search for the nearest Content to pass.
  *
  * Considers the previous, the current and the next page.
  * If no content is found, the area gets expanded until one is found.
  *
- * @return The 'semantically correct' position inside the PrtArea of the found CntntFrm.
+ * @return The 'semantically correct' position inside the PrtArea of the found ContentFrm.
  */
-const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
+const SwContentFrm *SwLayoutFrm::GetContentPos( Point& rPoint,
                                             const bool bDontLeave,
                                             const bool bBodyOnly,
                                             const bool bCalc,
                                             const SwCrsrMoveState *pCMS,
                                             const bool bDefaultExpand ) const
 {
-    //Determine the first CntntFrm.
+    //Determine the first ContentFrm.
     const SwLayoutFrm *pStart = (!bDontLeave && bDefaultExpand && GetPrev()) ?
                                     static_cast<const SwLayoutFrm*>(GetPrev()) : this;
-    const SwCntntFrm *pCntnt = pStart->ContainsCntnt();
+    const SwContentFrm *pContent = pStart->ContainsContent();
 
-    if ( !pCntnt && (GetPrev() && !bDontLeave) )
-        pCntnt = ContainsCntnt();
+    if ( !pContent && (GetPrev() && !bDontLeave) )
+        pContent = ContainsContent();
 
-    if ( bBodyOnly && pCntnt && !pCntnt->IsInDocBody() )
-        while ( pCntnt && !pCntnt->IsInDocBody() )
-            pCntnt = pCntnt->GetNextCntntFrm();
+    if ( bBodyOnly && pContent && !pContent->IsInDocBody() )
+        while ( pContent && !pContent->IsInDocBody() )
+            pContent = pContent->GetNextContentFrm();
 
-    const SwCntntFrm *pActual= pCntnt;
+    const SwContentFrm *pActual= pContent;
     const SwLayoutFrm *pInside = NULL;
     sal_uInt16 nMaxPage = GetPhyPageNum() + (bDefaultExpand ? 1 : 0);
     Point aPoint = rPoint;
@@ -1197,76 +1197,76 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
 
     while ( true )  //A loop to be sure we always find one.
     {
-        while ( pCntnt &&
-                ((!bDontLeave || IsAnLower( pCntnt )) &&
-                (pCntnt->GetPhyPageNum() <= nMaxPage)) )
+        while ( pContent &&
+                ((!bDontLeave || IsAnLower( pContent )) &&
+                (pContent->GetPhyPageNum() <= nMaxPage)) )
         {
-            if ( ( bCalc || pCntnt->Frm().Width() ) &&
-                 ( !bBodyOnly || pCntnt->IsInDocBody() ) )
+            if ( ( bCalc || pContent->Frm().Width() ) &&
+                 ( !bBodyOnly || pContent->IsInDocBody() ) )
             {
-                //If the Cntnt lies in a protected area (cell, Ftn, section),
-                //we search the next Cntnt which is not protected.
-                const SwCntntFrm *pComp = pCntnt;
-                pCntnt = ::lcl_MissProtectedFrames( pCntnt, lcl_GetNxtCnt, false,
+                //If the Content lies in a protected area (cell, Footnote, section),
+                //we search the next Content which is not protected.
+                const SwContentFrm *pComp = pContent;
+                pContent = ::lcl_MissProtectedFrames( pContent, lcl_GetNxtCnt, false,
                                         pCMS && pCMS->bSetInReadOnly, false );
-                if ( pComp != pCntnt )
+                if ( pComp != pContent )
                     continue;
 
-                if ( !pCntnt->IsTxtFrm() || !static_cast<const SwTxtFrm*>(pCntnt)->IsHiddenNow() )
+                if ( !pContent->IsTextFrm() || !static_cast<const SwTextFrm*>(pContent)->IsHiddenNow() )
                 {
                     if ( bCalc )
-                        pCntnt->Calc();
+                        pContent->Calc();
 
-                    SwRect aCntFrm( pCntnt->UnionFrm() );
+                    SwRect aCntFrm( pContent->UnionFrm() );
                     if ( aCntFrm.IsInside( rPoint ) )
                     {
-                        pActual = pCntnt;
+                        pActual = pContent;
                         aPoint = rPoint;
                         break;
                     }
-                    //The distance from rPoint to the nearest Point of pCntnt
+                    //The distance from rPoint to the nearest Point of pContent
                     //will now be calculated.
-                    Point aCntntPoint( rPoint );
+                    Point aContentPoint( rPoint );
 
                     //First set the vertical position
-                    if ( aCntFrm.Top() > aCntntPoint.Y() )
-                        aCntntPoint.Y() = aCntFrm.Top();
-                    else if ( aCntFrm.Bottom() < aCntntPoint.Y() )
-                        aCntntPoint.Y() = aCntFrm.Bottom();
+                    if ( aCntFrm.Top() > aContentPoint.Y() )
+                        aContentPoint.Y() = aCntFrm.Top();
+                    else if ( aCntFrm.Bottom() < aContentPoint.Y() )
+                        aContentPoint.Y() = aCntFrm.Bottom();
 
                     //Now the horizontal position
-                    if ( aCntFrm.Left() > aCntntPoint.X() )
-                        aCntntPoint.X() = aCntFrm.Left();
-                    else if ( aCntFrm.Right() < aCntntPoint.X() )
-                        aCntntPoint.X() = aCntFrm.Right();
+                    if ( aCntFrm.Left() > aContentPoint.X() )
+                        aContentPoint.X() = aCntFrm.Left();
+                    else if ( aCntFrm.Right() < aContentPoint.X() )
+                        aContentPoint.X() = aCntFrm.Right();
 
                     // pInside is a page area in which the point lies. As soon
                     // as pInside != 0 only frames are accepted which are
                     // placed inside.
-                    if( !pInside || ( pInside->IsAnLower( pCntnt ) &&
-                        ( !pCntnt->IsInFtn() || pInside->IsFtnContFrm() ) ) )
+                    if( !pInside || ( pInside->IsAnLower( pContent ) &&
+                        ( !pContent->IsInFootnote() || pInside->IsFootnoteContFrm() ) ) )
                     {
-                        const sal_uInt64 nDiff = ::CalcDiff(aCntntPoint, rPoint);
+                        const sal_uInt64 nDiff = ::CalcDiff(aContentPoint, rPoint);
                         bool bBetter = nDiff < nDistance;  // This one is nearer
                         if( !pInside )
                         {
-                            pInside = lcl_Inside( pCntnt, rPoint );
+                            pInside = lcl_Inside( pContent, rPoint );
                             if( pInside )  // In the "right" page area
                                 bBetter = true;
                         }
                         if( bBetter )
                         {
-                            aPoint = aCntntPoint;
+                            aPoint = aContentPoint;
                             nDistance = nDiff;
-                            pActual = pCntnt;
+                            pActual = pContent;
                         }
                     }
                 }
             }
-            pCntnt = pCntnt->GetNextCntntFrm();
+            pContent = pContent->GetNextContentFrm();
             if ( bBodyOnly )
-                while ( pCntnt && !pCntnt->IsInDocBody() )
-                    pCntnt = pCntnt->GetNextCntntFrm();
+                while ( pContent && !pContent->IsInDocBody() )
+                    pContent = pContent->GetNextContentFrm();
         }
         if ( !pActual )
         {   //If we not yet found one we have to expand the searched
@@ -1275,22 +1275,22 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
             //the body, we can expand the searched area sufficiently in one step.
             if ( bBodyOnly )
             {
-                while ( !pCntnt && pStart->GetPrev() )
+                while ( !pContent && pStart->GetPrev() )
                 {
                     ++nMaxPage;
                     if( !pStart->GetPrev()->IsLayoutFrm() )
                         return 0;
                     pStart = static_cast<const SwLayoutFrm*>(pStart->GetPrev());
-                    pCntnt = pStart->IsInDocBody()
-                                ? pStart->ContainsCntnt()
-                                : pStart->FindPageFrm()->FindFirstBodyCntnt();
+                    pContent = pStart->IsInDocBody()
+                                ? pStart->ContainsContent()
+                                : pStart->FindPageFrm()->FindFirstBodyContent();
                 }
-                if ( !pCntnt )  // Somewhere down the road we have to start with one!
+                if ( !pContent )  // Somewhere down the road we have to start with one!
                 {
-                    pCntnt = pStart->FindPageFrm()->GetUpper()->ContainsCntnt();
-                    while ( pCntnt && !pCntnt->IsInDocBody() )
-                        pCntnt = pCntnt->GetNextCntntFrm();
-                    if ( !pCntnt )
+                    pContent = pStart->FindPageFrm()->GetUpper()->ContainsContent();
+                    while ( pContent && !pContent->IsInDocBody() )
+                        pContent = pContent->GetNextContentFrm();
+                    if ( !pContent )
                         return 0;   // There is no document content yet!
                 }
             }
@@ -1302,21 +1302,21 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
                     if( !pStart->GetPrev()->IsLayoutFrm() )
                         return 0;
                     pStart = static_cast<const SwLayoutFrm*>(pStart->GetPrev());
-                    pCntnt = pStart->ContainsCntnt();
+                    pContent = pStart->ContainsContent();
                 }
                 else // Somewhere down the road we have to start with one!
-                    pCntnt = pStart->FindPageFrm()->GetUpper()->ContainsCntnt();
+                    pContent = pStart->FindPageFrm()->GetUpper()->ContainsContent();
             }
-            pActual = pCntnt;
+            pActual = pContent;
         }
         else
             break;
     }
 
-    OSL_ENSURE( pActual, "no Cntnt found." );
-    OSL_ENSURE( !bBodyOnly || pActual->IsInDocBody(), "Cntnt not in Body." );
+    OSL_ENSURE( pActual, "no Content found." );
+    OSL_ENSURE( !bBodyOnly || pActual->IsInDocBody(), "Content not in Body." );
 
-    //Special case for selecting tables not in repeated TblHeadlines.
+    //Special case for selecting tables not in repeated TableHeadlines.
     if ( pActual->IsInTab() && pCMS && pCMS->eState == MV_TBLSEL )
     {
         const SwTabFrm *pTab = pActual->FindTabFrm();
@@ -1371,38 +1371,38 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
     return pActual;
 }
 
-/** Same as SwLayoutFrm::GetCntntPos(). Specialized for fields and border. */
-void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const
+/** Same as SwLayoutFrm::GetContentPos(). Specialized for fields and border. */
+void SwPageFrm::GetContentPosition( const Point &rPt, SwPosition &rPos ) const
 {
-    //Determine the first CntntFrm.
-    const SwCntntFrm *pCntnt = ContainsCntnt();
-    if ( pCntnt )
+    //Determine the first ContentFrm.
+    const SwContentFrm *pContent = ContainsContent();
+    if ( pContent )
     {
         //Look back one more (if possible).
-        const SwCntntFrm *pTmp = pCntnt->GetPrevCntntFrm();
+        const SwContentFrm *pTmp = pContent->GetPrevContentFrm();
         while ( pTmp && !pTmp->IsInDocBody() )
-            pTmp = pTmp->GetPrevCntntFrm();
+            pTmp = pTmp->GetPrevContentFrm();
         if ( pTmp )
-            pCntnt = pTmp;
+            pContent = pTmp;
     }
     else
-        pCntnt = GetUpper()->ContainsCntnt();
+        pContent = GetUpper()->ContainsContent();
 
-    const SwCntntFrm *pAct = pCntnt;
+    const SwContentFrm *pAct = pContent;
     Point aAct       = rPt;
     sal_uInt64 nDist = SAL_MAX_UINT64;
 
-    while ( pCntnt )
+    while ( pContent )
     {
-        SwRect aCntFrm( pCntnt->UnionFrm() );
+        SwRect aCntFrm( pContent->UnionFrm() );
         if ( aCntFrm.IsInside( rPt ) )
         {
             //This is the nearest one.
-            pAct = pCntnt;
+            pAct = pContent;
             break;
         }
 
-        //Calculate the distance from rPt to the nearest point of pCntnt.
+        //Calculate the distance from rPt to the nearest point of pContent.
         Point aPoint( rPt );
 
         //Calculate the vertical position first
@@ -1422,15 +1422,15 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const
         {
             aAct    = aPoint;
             nDist   = nDiff;
-            pAct    = pCntnt;
+            pAct    = pContent;
         }
         else if ( aCntFrm.Top() > Frm().Bottom() )
             //In terms of fields, it's not possible to be closer any more!
             break;
 
-        pCntnt = pCntnt->GetNextCntntFrm();
-        while ( pCntnt && !pCntnt->IsInDocBody() )
-            pCntnt = pCntnt->GetNextCntntFrm();
+        pContent = pContent->GetNextContentFrm();
+        while ( pContent && !pContent->IsInDocBody() )
+            pContent = pContent->GetNextContentFrm();
     }
 
     //Bring the point into the PrtArea.
@@ -1446,9 +1446,9 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const
 
     if( !pAct->IsValid() )
     {
-        // CntntFrm not formatted -> always on node-beginning
-        SwCntntNode* pCNd = const_cast<SwCntntNode*>(pAct->GetNode());
-        OSL_ENSURE( pCNd, "Where is my CntntNode?" );
+        // ContentFrm not formatted -> always on node-beginning
+        SwContentNode* pCNd = const_cast<SwContentNode*>(pAct->GetNode());
+        OSL_ENSURE( pCNd, "Where is my ContentNode?" );
         rPos.nNode = *pCNd;
         rPos.nContent.Assign( pCNd, 0 );
     }
@@ -1481,19 +1481,19 @@ class DisableCallbackAction
         }
 };
 
-/** Search the nearest Cntnt to the passed point.
+/** Search the nearest Content to the passed point.
  *
  * Only search inside the BodyText.
  * @note Only the nearest vertically one will be searched.
  * @note JP 11.10.2001: only in tables we try to find the right column - Bug 72294
  */
-Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, bool bNext ) const
+Point SwRootFrm::GetNextPrevContentPos( const Point& rPoint, bool bNext ) const
 {
     // #123110# - disable creation of an action by a callback
     // event during processing of this method. Needed because formatting is
     // triggered by this method.
     DisableCallbackAction aDisableCallbackAction( *this );
-    //Search the first CntntFrm and his successor in the body area.
+    //Search the first ContentFrm and his successor in the body area.
     //To be efficient (and not formatting too much) we'll start at the correct
     //page.
     const SwLayoutFrm *pPage = static_cast<const SwLayoutFrm*>(Lower());
@@ -1501,9 +1501,9 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, bool bNext ) const
         while( pPage->GetNext() && pPage->Frm().Bottom() < rPoint.Y() )
             pPage = static_cast<const SwLayoutFrm*>(pPage->GetNext());
 
-    const SwCntntFrm *pCnt = pPage ? pPage->ContainsCntnt() : ContainsCntnt();
+    const SwContentFrm *pCnt = pPage ? pPage->ContainsContent() : ContainsContent();
     while ( pCnt && !pCnt->IsInDocBody() )
-        pCnt = pCnt->GetNextCntntFrm();
+        pCnt = pCnt->GetNextContentFrm();
 
     if ( !pCnt )
         return Point( 0, 0 );
@@ -1511,32 +1511,32 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, bool bNext ) const
     pCnt->Calc();
     if( !bNext )
     {
-        // As long as the point lies before the first CntntFrm and there are
+        // As long as the point lies before the first ContentFrm and there are
         // still precedent pages I'll go to the next page.
         while ( rPoint.Y() < pCnt->Frm().Top() && pPage->GetPrev() )
         {
             pPage = static_cast<const SwLayoutFrm*>(pPage->GetPrev());
-            pCnt = pPage->ContainsCntnt();
+            pCnt = pPage->ContainsContent();
             while ( !pCnt )
             {
                 pPage = static_cast<const SwLayoutFrm*>(pPage->GetPrev());
                 if ( pPage )
-                    pCnt = pPage->ContainsCntnt();
+                    pCnt = pPage->ContainsContent();
                 else
-                    return ContainsCntnt()->UnionFrm().Pos();
+                    return ContainsContent()->UnionFrm().Pos();
             }
             pCnt->Calc();
         }
     }
 
-    //Does the point lie above the first CntntFrm?
+    //Does the point lie above the first ContentFrm?
     if ( rPoint.Y() < pCnt->Frm().Top() && !lcl_IsInRepeatedHeadline( pCnt ) )
         return pCnt->UnionFrm().Pos();
 
     Point aRet(0, 0);
     do
     {
-        //Does the point lie in the current CntntFrm?
+        //Does the point lie in the current ContentFrm?
         SwRect aCntFrm( pCnt->UnionFrm() );
         if ( aCntFrm.IsInside( rPoint ) && !lcl_IsInRepeatedHeadline( pCnt ))
         {
@@ -1544,21 +1544,21 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, bool bNext ) const
             break;
         }
 
-        //Is the current one the last CntntFrm?
-        //If the next CntntFrm lies behind the point, then the current on is the
+        //Is the current one the last ContentFrm?
+        //If the next ContentFrm lies behind the point, then the current on is the
         //one we searched.
-        const SwCntntFrm *pNxt = pCnt->GetNextCntntFrm();
+        const SwContentFrm *pNxt = pCnt->GetNextContentFrm();
         while ( pNxt && !pNxt->IsInDocBody() )
-            pNxt = pNxt->GetNextCntntFrm();
+            pNxt = pNxt->GetNextContentFrm();
 
-        //Does the point lie behind the last CntntFrm?
+        //Does the point lie behind the last ContentFrm?
         if ( !pNxt )
         {
             aRet = Point( aCntFrm.Right(), aCntFrm.Bottom() );
             break;
         }
 
-        //If the next CntntFrm lies behind the point then it is the one we
+        //If the next ContentFrm lies behind the point then it is the one we
         //searched.
         const SwTabFrm* pTFrm;
         pNxt->Calc();
@@ -1641,9 +1641,9 @@ bool SwRootFrm::IsDummyPage( sal_uInt16 nPageNum ) const
  */
 bool SwFrm::IsProtected() const
 {
-    if (this->IsCntntFrm() && static_cast<const SwCntntFrm*>(this)->GetNode())
+    if (this->IsContentFrm() && static_cast<const SwContentFrm*>(this)->GetNode())
     {
-        const SwDoc *pDoc=static_cast<const SwCntntFrm*>(this)->GetNode()->GetDoc();
+        const SwDoc *pDoc=static_cast<const SwContentFrm*>(this)->GetNode()->GetDoc();
         bool isFormProtected=pDoc->GetDocumentSettingManager().get(DocumentSettingId::PROTECT_FORM );
         if (isFormProtected)
         {
@@ -1655,17 +1655,17 @@ bool SwFrm::IsProtected() const
     const SwFrm *pFrm = this;
     do
     {
-        if ( pFrm->IsCntntFrm() )
+        if ( pFrm->IsContentFrm() )
         {
-            if ( static_cast<const SwCntntFrm*>(pFrm)->GetNode() &&
-                 static_cast<const SwCntntFrm*>(pFrm)->GetNode()->IsInProtectSect() )
+            if ( static_cast<const SwContentFrm*>(pFrm)->GetNode() &&
+                 static_cast<const SwContentFrm*>(pFrm)->GetNode()->IsInProtectSect() )
                 return true;
         }
         else
         {
-            if ( static_cast<const SwLayoutFrm*>(pFrm)->GetFmt() &&
-                 static_cast<const SwLayoutFrm*>(pFrm)->GetFmt()->
-                 GetProtect().IsCntntProtected() )
+            if ( static_cast<const SwLayoutFrm*>(pFrm)->GetFormat() &&
+                 static_cast<const SwLayoutFrm*>(pFrm)->GetFormat()->
+                 GetProtect().IsContentProtected() )
                 return true;
             if ( pFrm->IsCoveredCell() )
                 return true;
@@ -1685,8 +1685,8 @@ bool SwFrm::IsProtected() const
             }
             pFrm = static_cast<const SwFlyFrm*>(pFrm)->GetAnchorFrm();
         }
-        else if ( pFrm->IsFtnFrm() )
-            pFrm = static_cast<const SwFtnFrm*>(pFrm)->GetRef();
+        else if ( pFrm->IsFootnoteFrm() )
+            pFrm = static_cast<const SwFootnoteFrm*>(pFrm)->GetRef();
         else
             pFrm = pFrm->GetUpper();
 
@@ -1719,7 +1719,7 @@ bool SwFrm::WannaRightPage() const
     if ( !pPage || !pPage->GetUpper() )
         return true;
 
-    const SwFrm *pFlow = pPage->FindFirstBodyCntnt();
+    const SwFrm *pFlow = pPage->FindFirstBodyContent();
     const SwPageDesc *pDesc = 0;
     ::boost::optional<sal_uInt16> oPgNum;
     if ( pFlow )
@@ -1729,7 +1729,7 @@ bool SwFrm::WannaRightPage() const
         const SwFlowFrm *pTmp = SwFlowFrm::CastFlowFrm( pFlow );
         if ( !pTmp->IsFollow() )
         {
-            const SwFmtPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc();
+            const SwFormatPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc();
             pDesc = rPgDesc.GetPageDesc();
             oPgNum = rPgDesc.GetNumOffset();
         }
@@ -1743,7 +1743,7 @@ bool SwFrm::WannaRightPage() const
             pDesc = pPrv->GetPageDesc()->GetFollow();
         else
         {
-            const SwDoc* pDoc = pPage->GetFmt()->GetDoc();
+            const SwDoc* pDoc = pPage->GetFormat()->GetDoc();
             pDesc = &pDoc->GetPageDesc( 0 );
         }
     }
@@ -1759,9 +1759,9 @@ bool SwFrm::WannaRightPage() const
     }
     if( !pPage->IsEmptyPage() )
     {
-        if( !pDesc->GetRightFmt() )
+        if( !pDesc->GetRightFormat() )
             bOdd = false;
-        else if( !pDesc->GetLeftFmt() )
+        else if( !pDesc->GetLeftFormat() )
             bOdd = true;
     }
     return bOdd;
@@ -1812,7 +1812,7 @@ sal_uInt16 SwFrm::GetVirtPageNum() const
     //attributes we get the sections.
     const SwPageFrm *pVirtPage = 0;
     const SwFrm *pFrm = 0;
-    const SfxItemPool &rPool = pPage->GetFmt()->GetDoc()->GetAttrPool();
+    const SfxItemPool &rPool = pPage->GetFormat()->GetDoc()->GetAttrPool();
     sal_uInt32 nMaxItems = rPool.GetItemCount2( RES_PAGEDESC );
     for( sal_uInt32 n = 0; n < nMaxItems; ++n )
     {
@@ -1820,7 +1820,7 @@ sal_uInt16 SwFrm::GetVirtPageNum() const
         if ( 0 == pItem )
             continue;
 
-        const SwFmtPageDesc *pDesc = static_cast<const SwFmtPageDesc*>(pItem);
+        const SwFormatPageDesc *pDesc = static_cast<const SwFormatPageDesc*>(pItem);
         if ( pDesc->GetNumOffset() && pDesc->GetDefinedIn() )
         {
             const SwModify *pMod = pDesc->GetDefinedIn();
@@ -1853,21 +1853,21 @@ sal_uInt16 SwFrm::GetVirtPageNum() const
 }
 
 /** Determines and sets those cells which are enclosed by the selection. */
-bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
+bool SwRootFrm::MakeTableCrsrs( SwTableCursor& rTableCrsr )
 {
     //Find Union-Rects and tables (Follows) of the selection.
-    OSL_ENSURE( rTblCrsr.GetCntntNode() && rTblCrsr.GetCntntNode( false ),
+    OSL_ENSURE( rTableCrsr.GetContentNode() && rTableCrsr.GetContentNode( false ),
             "Tabselection nicht auf Cnt." );
 
     bool bRet = false;
 
     // For new table models there's no need to ask the layout..
-    if( rTblCrsr.NewTableSelection() )
+    if( rTableCrsr.NewTableSelection() )
         return true;
 
     Point aPtPt, aMkPt;
     {
-        SwShellCrsr* pShCrsr = dynamic_cast<SwShellCrsr*>(&rTblCrsr);
+        SwShellCrsr* pShCrsr = dynamic_cast<SwShellCrsr*>(&rTableCrsr);
 
         if( pShCrsr )
         {
@@ -1877,8 +1877,8 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
     }
 
     // #151012# Made code robust here
-    const SwCntntNode* pTmpStartNode = rTblCrsr.GetCntntNode();
-    const SwCntntNode* pTmpEndNode   = rTblCrsr.GetCntntNode(false);
+    const SwContentNode* pTmpStartNode = rTableCrsr.GetContentNode();
+    const SwContentNode* pTmpEndNode   = rTableCrsr.GetContentNode(false);
 
     const SwFrm* pTmpStartFrm = pTmpStartNode ? pTmpStartNode->getLayoutFrm( this, &aPtPt, 0, false ) : 0;
     const SwFrm* pTmpEndFrm   = pTmpEndNode   ?   pTmpEndNode->getLayoutFrm( this, &aMkPt, 0, false ) : 0;
@@ -1886,7 +1886,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
     const SwLayoutFrm* pStart = pTmpStartFrm ? pTmpStartFrm->GetUpper() : 0;
     const SwLayoutFrm* pEnd   = pTmpEndFrm   ? pTmpEndFrm->GetUpper() : 0;
 
-    OSL_ENSURE( pStart && pEnd, "MakeTblCrsrs: Good to have the code robust here!" );
+    OSL_ENSURE( pStart && pEnd, "MakeTableCrsrs: Good to have the code robust here!" );
 
     /* #109590# Only change table boxes if the frames are
         valid. Needed because otherwise the table cursor after moving
@@ -1898,7 +1898,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
 
         SwSelBoxes aNew;
 
-        const bool bReadOnlyAvailable = rTblCrsr.IsReadOnlyAvailable();
+        const bool bReadOnlyAvailable = rTableCrsr.IsReadOnlyAvailable();
 
         for ( size_t i = 0; i < aUnions.size(); ++i )
         {
@@ -1919,9 +1919,9 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
                     while ( pCell && pRow->IsAnLower( pCell ) )
                     {
                         OSL_ENSURE( pCell->IsCellFrm(), "Frame without cell" );
-                        if( IsFrmInTblSel( pUnion->GetUnion(), pCell ) &&
+                        if( IsFrmInTableSel( pUnion->GetUnion(), pCell ) &&
                             (bReadOnlyAvailable ||
-                             !pCell->GetFmt()->GetProtect().IsCntntProtected()))
+                             !pCell->GetFormat()->GetProtect().IsContentProtected()))
                         {
                             SwTableBox* pInsBox = const_cast<SwTableBox*>(
                                 static_cast<const SwCellFrm*>(pCell)->GetTabBox());
@@ -1956,7 +1956,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
             }
         }
 
-        rTblCrsr.ActualizeSelection( aNew );
+        rTableCrsr.ActualizeSelection( aNew );
         bRet = true;
     }
 
@@ -2015,24 +2015,24 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
     SwRegionRects aRegion( !bIgnoreVisArea ?
                            pSh->VisArea() :
                            Frm() );
-    if( !pStartPos->nNode.GetNode().IsCntntNode() ||
-        !pStartPos->nNode.GetNode().GetCntntNode()->getLayoutFrm(this) ||
+    if( !pStartPos->nNode.GetNode().IsContentNode() ||
+        !pStartPos->nNode.GetNode().GetContentNode()->getLayoutFrm(this) ||
         ( pStartPos->nNode != pEndPos->nNode &&
-          ( !pEndPos->nNode.GetNode().IsCntntNode() ||
-            !pEndPos->nNode.GetNode().GetCntntNode()->getLayoutFrm(this) ) ) )
+          ( !pEndPos->nNode.GetNode().IsContentNode() ||
+            !pEndPos->nNode.GetNode().GetContentNode()->getLayoutFrm(this) ) ) )
     {
         return;
     }
 
-    //First obtain the CntntFrms for the start and the end - those are needed
+    //First obtain the ContentFrms for the start and the end - those are needed
     //anyway.
-    SwCntntFrm const* pStartFrm = pStartPos->nNode.GetNode().
-        GetCntntNode()->getLayoutFrm( this, &rCrsr.GetSttPos(), pStartPos );
+    SwContentFrm const* pStartFrm = pStartPos->nNode.GetNode().
+        GetContentNode()->getLayoutFrm( this, &rCrsr.GetSttPos(), pStartPos );
 
-    SwCntntFrm const* pEndFrm   = pEndPos->nNode.GetNode().
-        GetCntntNode()->getLayoutFrm( this, &rCrsr.GetEndPos(), pEndPos );
+    SwContentFrm const* pEndFrm   = pEndPos->nNode.GetNode().
+        GetContentNode()->getLayoutFrm( this, &rCrsr.GetEndPos(), pEndPos );
 
-    OSL_ENSURE( (pStartFrm && pEndFrm), "Keine CntntFrms gefunden." );
+    OSL_ENSURE( (pStartFrm && pEndFrm), "Keine ContentFrms gefunden." );
 
     //Do not subtract the FlyFrms in which selected Frames lie.
     SwSortedObjs aSortObjs;
@@ -2053,15 +2053,15 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
     // allowed (header/footer/table-headline) for two pages.
     do {    // middle check loop
         const SwLayoutFrm* pSttLFrm = pStartFrm->GetUpper();
-        const sal_uInt16 cHdFtTblHd = FRM_HEADER | FRM_FOOTER | FRM_TAB;
+        const sal_uInt16 cHdFtTableHd = FRM_HEADER | FRM_FOOTER | FRM_TAB;
         while( pSttLFrm &&
-            ! (cHdFtTblHd & pSttLFrm->GetType() ))
+            ! (cHdFtTableHd & pSttLFrm->GetType() ))
             pSttLFrm = pSttLFrm->GetUpper();
         if( !pSttLFrm )
             break;
         const SwLayoutFrm* pEndLFrm = pEndFrm->GetUpper();
         while( pEndLFrm &&
-            ! (cHdFtTblHd & pEndLFrm->GetType() ))
+            ! (cHdFtTableHd & pEndLFrm->GetType() ))
             pEndLFrm = pEndLFrm->GetUpper();
         if( !pEndLFrm )
             break;
@@ -2075,7 +2075,7 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
             // On different pages? Then always on the start-page
             if( pEndLFrm->FindPageFrm() != pSttLFrm->FindPageFrm() )
             {
-                // Set end- to the start-CntntFrame
+                // Set end- to the start-ContentFrame
                 if( pStartPos == rCrsr.GetPoint() )
                     pEndFrm = pStartFrm;
                 else
@@ -2093,7 +2093,7 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
                     ( lcl_IsInRepeatedHeadline( pStartFrm ) ||
                     lcl_IsInRepeatedHeadline( pEndFrm ) ) )
                 {
-                    // Set end- to the start-CntntFrame
+                    // Set end- to the start-ContentFrame
                     if( pStartPos == rCrsr.GetPoint() )
                         pEndFrm = pStartFrm;
                     else
@@ -2109,7 +2109,7 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
     aTmpState.bNoScroll = true;
     aTmpState.nCursorBidiLevel = pStartFrm->IsRightToLeft() ? 1 : 0;
 
-    //CntntRects to Start- and EndFrms.
+    //ContentRects to Start- and EndFrms.
     SwRect aStRect, aEndRect;
     pStartFrm->GetCharRect( aStRect, *pStartPos, &aTmpState );
     Sw2LinesPos *pSt2Pos = aTmpState.p2Lines;
@@ -2478,31 +2478,31 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
         if (pSh->IsSelectAll())
             pCellBox = 0;
 
-        const SwCntntFrm *pCntnt = pStartFrm->GetNextCntntFrm();
+        const SwContentFrm *pContent = pStartFrm->GetNextContentFrm();
         SwRect aPrvRect;
 
-        OSL_ENSURE( pCntnt,
+        OSL_ENSURE( pContent,
             "<SwRootFrm::CalcFrmRects(..)> - no content frame. This is a serious defect -> please inform OD" );
-        while ( pCntnt && pCntnt != pEndFrm )
+        while ( pContent && pContent != pEndFrm )
         {
-            if ( pCntnt->IsInFly() )
+            if ( pContent->IsInFly() )
             {
-                const SwAnchoredObject* pObj = pCntnt->FindFlyFrm();
+                const SwAnchoredObject* pObj = pContent->FindFlyFrm();
                 aSortObjs.Insert( *(const_cast<SwAnchoredObject*>(pObj)) );
             }
 
             // Consider only frames which have the same IsInDocBody value like pStartFrm
             // If pStartFrm is inside a SwCellFrm, consider only frames which are inside the
             // same cell frame (or its follow cell)
-            const SwTableBox* pTmpCellBox = pCntnt->GetUpper()->IsCellFrm() ?
-                static_cast<const SwCellFrm*>(pCntnt->GetUpper())->GetTabBox() : 0;
+            const SwTableBox* pTmpCellBox = pContent->GetUpper()->IsCellFrm() ?
+                static_cast<const SwCellFrm*>(pContent->GetUpper())->GetTabBox() : 0;
             if (pSh->IsSelectAll())
                 pTmpCellBox = 0;
-            if ( bBody == pCntnt->IsInDocBody() &&
+            if ( bBody == pContent->IsInDocBody() &&
                 ( !pCellBox || pCellBox == pTmpCellBox ) )
             {
-                SwRect aCRect( pCntnt->UnionFrm( true ) );
-                aCRect.Intersection( pCntnt->PaintArea() );
+                SwRect aCRect( pContent->UnionFrm( true ) );
+                aCRect.Intersection( pContent->PaintArea() );
                 if( aCRect.IsOver( aRegion.GetOrigin() ))
                 {
                     SwRect aTmp( aPrvRect );
@@ -2521,8 +2521,8 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
                     }
                 }
             }
-            pCntnt = pCntnt->GetNextCntntFrm();
-            OSL_ENSURE( pCntnt,
+            pContent = pContent->GetNextContentFrm();
+            OSL_ENSURE( pContent,
                 "<SwRootFrm::CalcFrmRects(..)> - no content frame. This is a serious defect!" );
         }
         if ( aPrvRect.HasArea() )
@@ -2573,8 +2573,8 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
                     continue;
                 const SwFlyFrm* pFly = static_cast<const SwFlyFrm*>(pAnchoredObj);
                 const SwVirtFlyDrawObj* pObj = pFly->GetVirtDrawObj();
-                const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround();
-                const SwPosition* anchoredAt = pAnchoredObj->GetFrmFmt().GetAnchor().GetCntntAnchor();
+                const SwFormatSurround &rSur = pFly->GetFormat()->GetSurround();
+                const SwPosition* anchoredAt = pAnchoredObj->GetFrameFormat().GetAnchor().GetContentAnchor();
                 bool inSelection = ( anchoredAt != NULL && *pStartPos <= *anchoredAt && *anchoredAt < *pEndPos );
                 if( anchoredAt != NULL && *anchoredAt == *pEndPos )
                 {
@@ -2584,7 +2584,7 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
                     else
                     {
                         SwNodeIndex idx( nodes.GetEndOfContent());
-                     if( SwCntntNode* last = SwNodes::GoPrevious( &idx ))
+                     if( SwContentNode* last = SwNodes::GoPrevious( &idx ))
                         inSelection = *pEndPos == SwPosition( *last, last->Len());
                     }
                 }
@@ -2629,14 +2629,14 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr)
 
     //Because it looks better, we close the DropCaps.
     SwRect aDropRect;
-    if ( pStartFrm->IsTxtFrm() )
+    if ( pStartFrm->IsTextFrm() )
     {
-        if ( static_cast<const SwTxtFrm*>(pStartFrm)->GetDropRect( aDropRect ) )
+        if ( static_cast<const SwTextFrm*>(pStartFrm)->GetDropRect( aDropRect ) )
             Sub( aRegion, aDropRect );
     }
-    if ( pEndFrm != pStartFrm && pEndFrm->IsTxtFrm() )
+    if ( pEndFrm != pStartFrm && pEndFrm->IsTextFrm() )
     {
-        if ( static_cast<const SwTxtFrm*>(pEndFrm)->GetDropRect( aDropRect ) )
+        if ( static_cast<const SwTextFrm*>(pEndFrm)->GetDropRect( aDropRect ) )
             Sub( aRegion, aDropRect );
     }
 
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index 5603fe0833f1..3561928d4ac4 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -31,9 +31,9 @@ void SwFrm::Paint(SwRect const&, SwPrintData const*const) const
     OSL_FAIL( "Paint() of the base class called." );
 }
 
-bool SwCntntFrm::WouldFit( SwTwips &, bool&, bool )
+bool SwContentFrm::WouldFit( SwTwips &, bool&, bool )
 {
-    OSL_FAIL( "WouldFit of CntntFrm called." );
+    OSL_FAIL( "WouldFit of ContentFrm called." );
     return false;
 }
 
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 505e225bf48b..6ab254e6b9aa 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -67,7 +67,7 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) :
     mbInfBody( false ),
     mbInfTab ( false ),
     mbInfFly ( false ),
-    mbInfFtn ( false ),
+    mbInfFootnote ( false ),
     mbInfSct ( false )
     , m_isInDestroy(false)
 {
@@ -83,17 +83,17 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) :
 
 const IDocumentDrawModelAccess* SwFrm::getIDocumentDrawModelAccess()
 {
-    return GetUpper()->GetFmt()->getIDocumentDrawModelAccess();
+    return GetUpper()->GetFormat()->getIDocumentDrawModelAccess();
 }
 
-bool SwFrm::KnowsFormat( const SwFmt& rFmt ) const
+bool SwFrm::KnowsFormat( const SwFormat& rFormat ) const
 {
-    return GetRegisteredIn() == &rFmt;
+    return GetRegisteredIn() == &rFormat;
 }
 
-void SwFrm::RegisterToFormat( SwFmt& rFmt )
+void SwFrm::RegisterToFormat( SwFormat& rFormat )
 {
-    rFmt.Add( this );
+    rFormat.Add( this );
 }
 
 void SwFrm::CheckDir( sal_uInt16 nDir, bool bVert, bool bOnlyBiDi, bool bBrowse )
@@ -152,12 +152,12 @@ void SwFrm::CheckDirection( bool bVert )
 
 void SwSectionFrm::CheckDirection( bool bVert )
 {
-    const SwFrmFmt* pFmt = GetFmt();
-    if( pFmt )
+    const SwFrameFormat* pFormat = GetFormat();
+    if( pFormat )
     {
         const SwViewShell *pSh = getRootFrm()->GetCurrShell();
         const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
-        CheckDir(static_cast<const SvxFrameDirectionItem&>(pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(),
+        CheckDir(static_cast<const SvxFrameDirectionItem&>(pFormat->GetFormatAttr(RES_FRAMEDIR)).GetValue(),
                     bVert, true, bBrowseMode );
     }
     else
@@ -166,12 +166,12 @@ void SwSectionFrm::CheckDirection( bool bVert )
 
 void SwFlyFrm::CheckDirection( bool bVert )
 {
-    const SwFrmFmt* pFmt = GetFmt();
-    if( pFmt )
+    const SwFrameFormat* pFormat = GetFormat();
+    if( pFormat )
     {
         const SwViewShell *pSh = getRootFrm()->GetCurrShell();
         const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
-        CheckDir(static_cast<const SvxFrameDirectionItem&>(pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(),
+        CheckDir(static_cast<const SvxFrameDirectionItem&>(pFormat->GetFormatAttr(RES_FRAMEDIR)).GetValue(),
                     bVert, false, bBrowseMode );
     }
     else
@@ -180,12 +180,12 @@ void SwFlyFrm::CheckDirection( bool bVert )
 
 void SwTabFrm::CheckDirection( bool bVert )
 {
-    const SwFrmFmt* pFmt = GetFmt();
-    if( pFmt )
+    const SwFrameFormat* pFormat = GetFormat();
+    if( pFormat )
     {
         const SwViewShell *pSh = getRootFrm()->GetCurrShell();
         const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
-        CheckDir(static_cast<const SvxFrameDirectionItem&>(pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(),
+        CheckDir(static_cast<const SvxFrameDirectionItem&>(pFormat->GetFormatAttr(RES_FRAMEDIR)).GetValue(),
                     bVert, true, bBrowseMode );
     }
     else
@@ -194,12 +194,12 @@ void SwTabFrm::CheckDirection( bool bVert )
 
 void SwCellFrm::CheckDirection( bool bVert )
 {
-    const SwFrmFmt* pFmt = GetFmt();
+    const SwFrameFormat* pFormat = GetFormat();
     const SfxPoolItem* pItem;
     // Check if the item is set, before actually
     // using it. Otherwise the dynamic pool default is used, which may be set
     // to LTR in case of OOo 1.0 documents.
-    if( pFmt && SfxItemState::SET == pFmt->GetItemState( RES_FRAMEDIR, true, &pItem ) )
+    if( pFormat && SfxItemState::SET == pFormat->GetItemState( RES_FRAMEDIR, true, &pItem ) )
     {
         const SvxFrameDirectionItem* pFrmDirItem = static_cast<const SvxFrameDirectionItem*>(pItem);
         const SwViewShell *pSh = getRootFrm()->GetCurrShell();
@@ -210,7 +210,7 @@ void SwCellFrm::CheckDirection( bool bVert )
         SwFrm::CheckDirection( bVert );
 }
 
-void SwTxtFrm::CheckDirection( bool bVert )
+void SwTextFrm::CheckDirection( bool bVert )
 {
     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
     const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
@@ -339,7 +339,7 @@ void SwFrm::Prepare( const PrepareHint, const void *, bool )
 
 /**
  * Invalidates the page in which the Frm is currently placed.
- * The page is invalidated depending on the type (Layout, Cntnt, FlyFrm)
+ * The page is invalidated depending on the type (Layout, Content, FlyFrm)
  */
 void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
 {
@@ -369,18 +369,18 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
 
     if ( pPage && pPage->GetUpper() )
     {
-        if ( pPage->GetFmt()->GetDoc()->IsInDtor() )
+        if ( pPage->GetFormat()->GetDoc()->IsInDtor() )
             return;
 
         SwRootFrm *pRoot = const_cast<SwRootFrm*>(static_cast<const SwRootFrm*>(pPage->GetUpper()));
         const SwFlyFrm *pFly = FindFlyFrm();
-        if ( IsCntntFrm() )
+        if ( IsContentFrm() )
         {
             if ( pRoot->IsTurboAllowed() )
             {
                 // If a ContentFrame wants to register for a second time, make it a TurboAction.
                 if ( !pRoot->GetTurbo() || this == pRoot->GetTurbo() )
-                    pRoot->SetTurbo( static_cast<const SwCntntFrm*>(this) );
+                    pRoot->SetTurbo( static_cast<const SwContentFrm*>(this) );
                 else
                 {
                     pRoot->DisallowTurbo();
@@ -398,15 +398,15 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
                     {
                         if ( pFly->IsFlyInCntFrm() )
                         {   pPage->InvalidateFlyInCnt();
-                            static_cast<const SwFlyInCntFrm*>(pFly)->InvalidateCntnt();
+                            static_cast<const SwFlyInCntFrm*>(pFly)->InvalidateContent();
                             pFly->GetAnchorFrm()->InvalidatePage();
                         }
                         else
-                            pPage->InvalidateFlyCntnt();
+                            pPage->InvalidateFlyContent();
                     }
                 }
                 else
-                    pPage->InvalidateCntnt();
+                    pPage->InvalidateContent();
             }
         }
         else
@@ -437,8 +437,8 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
         }
         pRoot->SetIdleFlags();
 
-        const SwTxtNode *pTxtNode = dynamic_cast< const SwTxtNode * >(GetDep());
-        if (pTxtNode && pTxtNode->IsGrammarCheckDirty())
+        const SwTextNode *pTextNode = dynamic_cast< const SwTextNode * >(GetDep());
+        if (pTextNode && pTextNode->IsGrammarCheckDirty())
             pRoot->SetNeedGrammarCheck( true );
     }
 }
@@ -459,9 +459,9 @@ Size SwFrm::ChgSize( const Size& aNewSize )
         long nDiff = nNew - (maFrm.*fnRect->fnGetHeight)();
         if( nDiff )
         {
-            if ( GetUpper()->IsFtnBossFrm() && HasFixSize() &&
+            if ( GetUpper()->IsFootnoteBossFrm() && HasFixSize() &&
                  NA_GROW_SHRINK !=
-                 static_cast<SwFtnBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this ) )
+                 static_cast<SwFootnoteBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this ) )
             {
                 (maFrm.*fnRect->fnSetHeight)( nNew );
                 SwTwips nReal = static_cast<SwLayoutFrm*>(this)->AdjustNeighbourhood(nDiff);
@@ -715,16 +715,16 @@ void SwFrm::RemoveFromLayout()
     mpUpper = 0;
 }
 
-void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
+void SwContentFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
 {
     OSL_ENSURE( pParent, "No parent for pasting." );
-    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is CntntFrm." );
+    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is ContentFrm." );
     OSL_ENSURE( pParent != this, "I'm the parent." );
     OSL_ENSURE( pSibling != this, "I'm my own neighbour." );
     OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(),
             "I'm still registered somewhere" );
     OSL_ENSURE( !pSibling || pSibling->IsFlowFrm(),
-            "<SwCntntFrm::Paste(..)> - sibling not of expected type." );
+            "<SwContentFrm::Paste(..)> - sibling not of expected type." );
 
     //Insert in the tree.
     InsertBefore( static_cast<SwLayoutFrm*>(pParent), pSibling );
@@ -748,8 +748,8 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
         pNxt->_InvalidatePos();
         pNxt->InvalidatePage( pPage );
         if( pNxt->IsSctFrm() )
-            pNxt = static_cast<SwSectionFrm*>(pNxt)->ContainsCntnt();
-        if( pNxt && pNxt->IsTxtFrm() && pNxt->IsInFtn() )
+            pNxt = static_cast<SwSectionFrm*>(pNxt)->ContainsContent();
+        if( pNxt && pNxt->IsTextFrm() && pNxt->IsInFootnote() )
             pNxt->Prepare( PREP_FTN, 0, false );
     }
 
@@ -763,7 +763,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
     {
         if ( IsFollow() )
             //I'm a direct follower of my master now
-            static_cast<SwCntntFrm*>(GetPrev())->Prepare( PREP_FOLLOW_FOLLOWS );
+            static_cast<SwContentFrm*>(GetPrev())->Prepare( PREP_FOLLOW_FOLLOWS );
         else
         {
             if ( GetPrev()->Frm().Height() !=
@@ -784,7 +784,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
             GetPrev()->InvalidatePage( pPage );
         }
     }
-    if ( IsInFtn() )
+    if ( IsInFootnote() )
     {
         SwFrm* pFrm = GetIndPrev();
         if( pFrm && pFrm->IsSctFrm() )
@@ -793,7 +793,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
             pFrm->Prepare( PREP_QUOVADIS, 0, false );
         if( !GetNext() )
         {
-            pFrm = FindFtnFrm()->GetNext();
+            pFrm = FindFootnoteFrm()->GetNext();
             if( pFrm && 0 != (pFrm=static_cast<SwLayoutFrm*>(pFrm)->ContainsAny()) )
                 pFrm->_InvalidatePrt();
         }
@@ -817,7 +817,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
     }
 }
 
-void SwCntntFrm::Cut()
+void SwContentFrm::Cut()
 {
     OSL_ENSURE( GetUpper(), "Cut without Upper()." );
 
@@ -828,10 +828,10 @@ void SwCntntFrm::Cut()
     {
         if( pFrm->IsSctFrm() )
             pFrm = static_cast<SwSectionFrm*>(pFrm)->ContainsAny();
-        if ( pFrm && pFrm->IsCntntFrm() )
+        if ( pFrm && pFrm->IsContentFrm() )
         {
             pFrm->_InvalidatePrt();
-            if( IsInFtn() )
+            if( IsInFootnote() )
                 pFrm->Prepare( PREP_QUOVADIS, 0, false );
         }
         // #i26250# - invalidate printing area of previous
@@ -875,7 +875,7 @@ void SwCntntFrm::Cut()
                 pFrm->InvalidatePage( pPage );
             }
         }
-        if( pFrm && IsInFtn() )
+        if( pFrm && IsInFootnote() )
             pFrm->Prepare( PREP_ERGOSUM, 0, false );
         if( IsInSct() && !GetPrev() )
         {
@@ -897,7 +897,7 @@ void SwCntntFrm::Cut()
             pFrm->_InvalidatePos();
             pFrm->InvalidatePage( pPage );
         }
-        // If I'm (was) the only CntntFrm in my upper, it has to do the
+        // If I'm (was) the only ContentFrm in my upper, it has to do the
         // retouching. Also, perhaps a page became empty.
         else
         {   SwRootFrm *pRoot = getRootFrm();
@@ -937,7 +937,7 @@ void SwCntntFrm::Cut()
     {
         SwSectionFrm *pSct = 0;
         if ( !pUp->Lower() &&
-             ( ( pUp->IsFtnFrm() && !pUp->IsColLocked() ) ||
+             ( ( pUp->IsFootnoteFrm() && !pUp->IsColLocked() ) ||
                ( pUp->IsInSct() &&
                  // #i29438#
                  // We have to consider the case that the section may be "empty"
@@ -946,14 +946,14 @@ void SwCntntFrm::Cut()
                  !pUp->IsCellFrm() &&
                  // #126020# - adjust check for empty section
                  // #130797# - correct fix #126020#
-                 !(pSct = pUp->FindSctFrm())->ContainsCntnt() &&
+                 !(pSct = pUp->FindSctFrm())->ContainsContent() &&
                  !pSct->ContainsAny( true ) ) ) )
         {
             if ( pUp->GetUpper() )
             {
 
                 // prevent delete of <ColLocked> footnote frame
-                if ( pUp->IsFtnFrm() && !pUp->IsColLocked())
+                if ( pUp->IsFootnoteFrm() && !pUp->IsColLocked())
                 {
                     if( pUp->GetNext() && !pUp->GetPrev() )
                     {
@@ -967,8 +967,8 @@ void SwCntntFrm::Cut()
                 else
                 {
 
-                    if ( pSct->IsColLocked() || !pSct->IsInFtn() ||
-                         ( pUp->IsFtnFrm() && pUp->IsColLocked() ) )
+                    if ( pSct->IsColLocked() || !pSct->IsInFootnote() ||
+                         ( pUp->IsFootnoteFrm() && pUp->IsColLocked() ) )
                     {
                         pSct->DelEmpty( false );
                         // If a locked section may not be deleted then at least
@@ -997,7 +997,7 @@ void SwCntntFrm::Cut()
 void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
 {
     OSL_ENSURE( pParent, "No parent for pasting." );
-    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is CntntFrm." );
+    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is ContentFrm." );
     OSL_ENSURE( pParent != this, "I'm the parent oneself." );
     OSL_ENSURE( pSibling != this, "I'm my own neighbour." );
     OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(),
@@ -1051,7 +1051,7 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
         if( 0 != pFrm )
         {
             pFrm->_InvalidatePos();
-            if( IsInFtn() )
+            if( IsInFootnote() )
             {
                 if( pFrm->IsSctFrm() )
                     pFrm = static_cast<SwSectionFrm*>(pFrm)->ContainsAny();
@@ -1059,7 +1059,7 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
                     pFrm->Prepare( PREP_ERGOSUM, 0, false );
             }
         }
-        if ( IsInFtn() && 0 != ( pFrm = GetIndPrev() ) )
+        if ( IsInFootnote() && 0 != ( pFrm = GetIndPrev() ) )
         {
             if( pFrm->IsSctFrm() )
                 pFrm = static_cast<SwSectionFrm*>(pFrm)->ContainsAny();
@@ -1072,8 +1072,8 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
     {
         // AdjustNeighbourhood is now also called in columns which are not
         // placed inside a frame
-        sal_uInt8 nAdjust = GetUpper()->IsFtnBossFrm() ?
-                static_cast<SwFtnBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this )
+        sal_uInt8 nAdjust = GetUpper()->IsFootnoteBossFrm() ?
+                static_cast<SwFootnoteBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this )
                 : NA_GROW_SHRINK;
         SwTwips nGrow = (Frm().*fnRect->fnGetHeight)();
         if( NA_ONLY_ADJUST == nAdjust )
@@ -1110,9 +1110,9 @@ void SwLayoutFrm::Cut()
     // of his content
     if ( pUp && nShrink )
     {
-        if( pUp->IsFtnBossFrm() )
+        if( pUp->IsFootnoteBossFrm() )
         {
-            sal_uInt8 nAdjust= static_cast<SwFtnBossFrm*>(pUp)->NeighbourhoodAdjustment( this );
+            sal_uInt8 nAdjust= static_cast<SwFootnoteBossFrm*>(pUp)->NeighbourhoodAdjustment( this );
             if( NA_ONLY_ADJUST == nAdjust )
                 AdjustNeighbourhood( -nShrink );
             else
@@ -1184,7 +1184,7 @@ SwTwips SwFrm::Grow( SwTwips nDist, bool bTst, bool bInfo )
             {
                 nPrtHeight = (Prt().*fnRect->fnGetHeight)();
                 (Prt().*fnRect->fnSetHeight)( nPrtHeight +
-                        ( IsCntntFrm() ? nDist : nReal ) );
+                        ( IsContentFrm() ? nDist : nReal ) );
             }
             return nReal;
         }
@@ -1225,7 +1225,7 @@ SwTwips SwFrm::Shrink( SwTwips nDist, bool bTst, bool bInfo )
             {
                 const SwTwips nPrtHeight = (Prt().*fnRect->fnGetHeight)();
                 (Prt().*fnRect->fnSetHeight)( nPrtHeight -
-                        ( IsCntntFrm() ? nDist : nReal ) );
+                        ( IsContentFrm() ? nDist : nReal ) );
             }
             return nReal;
         }
@@ -1257,7 +1257,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
 {
     PROTOCOL_ENTER( this, PROT_ADJUSTN, 0, &nDiff );
 
-    if ( !nDiff || !GetUpper()->IsFtnBossFrm() ) // only inside pages/columns
+    if ( !nDiff || !GetUpper()->IsFootnoteBossFrm() ) // only inside pages/columns
         return 0L;
 
     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
@@ -1296,7 +1296,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
                 if ( !pViewShell || pViewShell->VisArea().Height() >= pUp->Frm().Height() )
                 {
                     //First minimize Body, it will grow again later.
-                    SwFrm *pBody = static_cast<SwFtnBossFrm*>(pUp)->FindBodyCont();
+                    SwFrm *pBody = static_cast<SwFootnoteBossFrm*>(pUp)->FindBodyCont();
                     const long nTmp = nChg - pBody->Prt().Height();
                     if ( !bTst )
                     {
@@ -1338,7 +1338,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
             {
                 SetCompletePaint();
                 if ( !IsHeaderFrm() )
-                    static_cast<SwFtnBossFrm*>(pUp)->FindBodyCont()->SetCompletePaint();
+                    static_cast<SwFootnoteBossFrm*>(pUp)->FindBodyCont()->SetCompletePaint();
             }
             //Invalidate the page because of the frames. Thereby the page becomes
             //the right size again if a frame didn't fit. This only works
@@ -1362,7 +1362,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
                 GetNext()->_InvalidatePos();
 
             //Trigger a repaint if necessary.
-            SvxBrushItem aBack(pUp->GetFmt()->makeBackgroundBrushItem());
+            SvxBrushItem aBack(pUp->GetFormat()->makeBackgroundBrushItem());
             const SvxGraphicPosition ePos = aBack.GetGraphicPos();
             if ( ePos != GPOS_NONE && ePos != GPOS_TILED )
                 pViewShell->InvalidateWindows( pUp->Frm() );
@@ -1401,7 +1401,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
             nBrowseAdd = nChg;
     }
 
-    const SwFtnBossFrm *pBoss = static_cast<SwFtnBossFrm*>(GetUpper());
+    const SwFootnoteBossFrm *pBoss = static_cast<SwFootnoteBossFrm*>(GetUpper());
 
     SwTwips nReal = 0,
             nAdd  = 0;
@@ -1414,22 +1414,22 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
         {
             SwSectionFrm *pSect = FindSctFrm();
             if( nDiff > 0 && pSect->IsEndnAtEnd() && GetNext() &&
-                GetNext()->IsFtnContFrm() )
+                GetNext()->IsFootnoteContFrm() )
             {
-                SwFtnContFrm* pCont = static_cast<SwFtnContFrm*>(GetNext());
+                SwFootnoteContFrm* pCont = static_cast<SwFootnoteContFrm*>(GetNext());
                 SwTwips nMinH = 0;
-                SwFtnFrm* pFtn = static_cast<SwFtnFrm*>(pCont->Lower());
-                bool bFtn = false;
-                while( pFtn )
+                SwFootnoteFrm* pFootnote = static_cast<SwFootnoteFrm*>(pCont->Lower());
+                bool bFootnote = false;
+                while( pFootnote )
                 {
-                    if( !pFtn->GetAttr()->GetFtn().IsEndNote() )
+                    if( !pFootnote->GetAttr()->GetFootnote().IsEndNote() )
                     {
-                        nMinH += (pFtn->Frm().*fnRect->fnGetHeight)();
-                        bFtn = true;
+                        nMinH += (pFootnote->Frm().*fnRect->fnGetHeight)();
+                        bFootnote = true;
                     }
-                    pFtn = static_cast<SwFtnFrm*>(pFtn->GetNext());
+                    pFootnote = static_cast<SwFootnoteFrm*>(pFootnote->GetNext());
                 }
-                if( bFtn )
+                if( bFootnote )
                     nMinH += (pCont->Prt().*fnRect->fnGetTop)();
                 nReal = (pCont->Frm().*fnRect->fnGetHeight)() - nMinH;
                 if( nReal > nDiff )
@@ -1447,9 +1447,9 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
     }
     else
     {
-        const bool bFtnPage = pBoss->IsPageFrm() && static_cast<const SwPageFrm*>(pBoss)->IsFtnPage();
-        if ( bFtnPage && !IsFtnContFrm() )
-            pFrm = (SwFrm*)pBoss->FindFtnCont();
+        const bool bFootnotePage = pBoss->IsPageFrm() && static_cast<const SwPageFrm*>(pBoss)->IsFootnotePage();
+        if ( bFootnotePage && !IsFootnoteContFrm() )
+            pFrm = (SwFrm*)pBoss->FindFootnoteCont();
         if ( !pFrm )
             pFrm = (SwFrm*)pBoss->FindBodyCont();
 
@@ -1460,7 +1460,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
         nReal = (pFrm->Frm().*fnRect->fnGetHeight)();
         if( nReal > nDiff )
             nReal = nDiff;
-        if( !bFtnPage )
+        if( !bFootnotePage )
         {
             //Respect the minimal boundary!
             if( nReal )
@@ -1469,8 +1469,8 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
                 if ( nReal > nMax )
                     nReal = nMax;
             }
-            if( !IsFtnContFrm() && nDiff > nReal &&
-                pFrm->GetNext() && pFrm->GetNext()->IsFtnContFrm()
+            if( !IsFootnoteContFrm() && nDiff > nReal &&
+                pFrm->GetNext() && pFrm->GetNext()->IsFootnoteContFrm()
                 && ( pFrm->GetNext()->IsVertical() == IsVertical() )
                 )
             {
@@ -1521,8 +1521,8 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
                 {
                     SwFlyFrm* pFly = static_cast<SwFlyFrm*>(pAnchoredObj);
                     OSL_ENSURE( !pFly->IsFlyInCntFrm(), "FlyInCnt at Page?" );
-                    const SwFmtVertOrient &rVert =
-                                        pFly->GetFmt()->GetVertOrient();
+                    const SwFormatVertOrient &rVert =
+                                        pFly->GetFormat()->GetVertOrient();
                     // When do we have to invalidate?
                     // If a frame is aligned on a PageTextArea and the header
                     // changes a TOP, MIDDLE or NONE aligned frame needs to
@@ -1612,7 +1612,7 @@ void SwFrm::ImplInvalidateLineNum()
     if ( _InvalidationAllowed( INVALID_LINENUM ) )
     {
         mbValidLineNum = false;
-        OSL_ENSURE( IsTxtFrm(), "line numbers are implemented for text only" );
+        OSL_ENSURE( IsTextFrm(), "line numbers are implemented for text only" );
         InvalidatePage();
 
         // OD 2004-05-19 #i28701#
@@ -1622,9 +1622,9 @@ void SwFrm::ImplInvalidateLineNum()
 
 void SwFrm::ReinitializeFrmSizeAttrFlags()
 {
-    const SwFmtFrmSize &rFmtSize = GetAttrSet()->GetFrmSize();
-    if ( ATT_VAR_SIZE == rFmtSize.GetHeightSizeType() ||
-         ATT_MIN_SIZE == rFmtSize.GetHeightSizeType())
+    const SwFormatFrmSize &rFormatSize = GetAttrSet()->GetFrmSize();
+    if ( ATT_VAR_SIZE == rFormatSize.GetHeightSizeType() ||
+         ATT_MIN_SIZE == rFormatSize.GetHeightSizeType())
     {
         mbFixSize = false;
         if ( GetType() & (FRM_HEADER | FRM_FOOTER | FRM_ROW) )
@@ -1635,7 +1635,7 @@ void SwFrm::ReinitializeFrmSizeAttrFlags()
                 pFrm->_InvalidatePrt();
                 pFrm = pFrm->GetNext();
             }
-            SwCntntFrm *pCnt = static_cast<SwLayoutFrm*>(this)->ContainsCntnt();
+            SwContentFrm *pCnt = static_cast<SwLayoutFrm*>(this)->ContainsContent();
             // #i36991# - be save.
             // E.g., a row can contain *no* content.
             if ( pCnt )
@@ -1645,17 +1645,17 @@ void SwFrm::ReinitializeFrmSizeAttrFlags()
                 {
                     pCnt->Prepare( PREP_ADJUST_FRM );
                     pCnt->_InvalidateSize();
-                    pCnt = pCnt->GetNextCntntFrm();
+                    pCnt = pCnt->GetNextContentFrm();
                 } while ( static_cast<SwLayoutFrm*>(this)->IsAnLower( pCnt ) );
             }
         }
     }
-    else if ( rFmtSize.GetHeightSizeType() == ATT_FIX_SIZE )
+    else if ( rFormatSize.GetHeightSizeType() == ATT_FIX_SIZE )
     {
         if( IsVertical() )
-            ChgSize( Size( rFmtSize.GetWidth(), Frm().Height()));
+            ChgSize( Size( rFormatSize.GetWidth(), Frm().Height()));
         else
-            ChgSize( Size( Frm().Width(), rFmtSize.GetHeight()));
+            ChgSize( Size( Frm().Width(), rFormatSize.GetHeight()));
     }
 }
 
@@ -1703,7 +1703,7 @@ void SwFrm::ValidateThisAndAllLowers( const sal_uInt16 nStage )
     }
 }
 
-SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
+SwTwips SwContentFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     SWRECTFN( this )
 
@@ -1731,7 +1731,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
             // due to the positioning of its objects ). Thus, invalivate this next frame,
             // if document compatibility option 'Consider wrapping style influence on
             // object positioning' is ON.
-            else if ( GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
+            else if ( GetUpper()->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
             {
                 InvalidateNextPos();
             }
@@ -1748,7 +1748,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
 
     if ( !bTst )
     {
-        //Cntnts are always resized to the wished value.
+        //Contents are always resized to the wished value.
         long nOld = (Frm().*fnRect->fnGetHeight)();
         (Frm().*fnRect->fnSetHeight)( nOld + nDist );
         if( IsVertical()&& !IsVertLR() && !IsReverse() )
@@ -1758,7 +1758,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
         {
             if ( pTab->GetTable()->GetHTMLTableLayout() &&
                  !pTab->IsJoinLocked() &&
-                 !pTab->GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() )
+                 !pTab->GetFormat()->GetDoc()->GetDocShell()->IsReadOnly() )
             {
                 pTab->InvalidatePos();
                 pTab->SetResizeHTMLTable();
@@ -1797,7 +1797,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
         {
             GetNext()->InvalidatePos();
         }
-        else if ( GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
+        else if ( GetUpper()->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) )
         {
             InvalidateNextPos();
         }
@@ -1806,7 +1806,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
     return nReal;
 }
 
-SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
+SwTwips SwContentFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     SWRECTFN( this )
     OSL_ENSURE( nDist >= 0, "nDist < 0" );
@@ -1846,7 +1846,7 @@ SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
         {
             if ( pTab->GetTable()->GetHTMLTableLayout() &&
                  !pTab->IsJoinLocked() &&
-                 !pTab->GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() )
+                 !pTab->GetFormat()->GetDoc()->GetDocShell()->IsReadOnly() )
             {
                 pTab->InvalidatePos();
                 pTab->SetResizeHTMLTable();
@@ -1886,8 +1886,8 @@ SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
 
                     if( aBound.IsOver( aRect ) )
                     {
-                        const SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
-                        if( SURROUND_THROUGHT != rFmt.GetSurround().GetSurround() )
+                        const SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat();
+                        if( SURROUND_THROUGHT != rFormat.GetSurround().GetSurround() )
                         {
                             const SwFrm* pAnchor = pAnchoredObj->GetAnchorFrm();
                             if ( pAnchor && pAnchor->FindFooterOrHeader() == GetUpper() )
@@ -1919,7 +1919,7 @@ SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
     return nReal;
 }
 
-void SwCntntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
+void SwContentFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
 {
     sal_uInt8 nInvFlags = 0;
 
@@ -1992,7 +1992,7 @@ void SwCntntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
     }
 }
 
-void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew,
+void SwContentFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew,
                               sal_uInt8 &rInvFlags,
                             SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet )
 {
@@ -2013,8 +2013,8 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew,
                     CheckPageDescs( pPage );
                 if ( GetAttrSet()->GetPageDesc().GetNumOffset() )
                     static_cast<SwRootFrm*>(pPage->GetUpper())->SetVirtPageNum( true );
-                SwDocPosUpdate aMsgHnt( pPage->Frm().Top() );
-                pPage->GetFmt()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt );
+                SwDocPosUpdate aMsgHint( pPage->Frm().Top() );
+                pPage->GetFormat()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint );
             }
             break;
 
@@ -2045,12 +2045,12 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew,
                 }
                 // OD 2004-03-17 #i11860#
                 if ( GetIndNext() &&
-                     !GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::USE_FORMER_OBJECT_POS) )
+                     !GetUpper()->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::USE_FORMER_OBJECT_POS) )
                 {
                     // OD 2004-07-01 #i28701# - use new method <InvalidateObjs(..)>
                     GetIndNext()->InvalidateObjs( true );
                 }
-                Prepare( PREP_UL_SPACE );   //TxtFrm has to correct line spacing.
+                Prepare( PREP_UL_SPACE );   //TextFrm has to correct line spacing.
                 rInvFlags |= 0x80;
                 /* no break here */
             }
@@ -2065,7 +2065,7 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew,
         case RES_BREAK:
             {
                 rInvFlags |= 0x42;
-                const IDocumentSettingAccess* pIDSA = GetUpper()->GetFmt()->getIDocumentSettingAccess();
+                const IDocumentSettingAccess* pIDSA = GetUpper()->GetFormat()->getIDocumentSettingAccess();
                 if( pIDSA->get(DocumentSettingId::PARA_SPACE_MAX) ||
                     pIDSA->get(DocumentSettingId::PARA_SPACE_MAX_AT_PAGES) )
                 {
@@ -2095,7 +2095,7 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew,
         case RES_PARATR_CONNECT_BORDER:
         {
             rInvFlags |= 0x01;
-            if ( IsTxtFrm() )
+            if ( IsTextFrm() )
             {
                 InvalidateNextPrtArea();
             }
@@ -2142,12 +2142,12 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew,
     }
 }
 
-SwLayoutFrm::SwLayoutFrm(SwFrmFmt *const pFmt, SwFrm *const pSib)
-    : SwFrm(pFmt, pSib)
+SwLayoutFrm::SwLayoutFrm(SwFrameFormat *const pFormat, SwFrm *const pSib)
+    : SwFrm(pFormat, pSib)
     , m_pLower(nullptr)
 {
-    const SwFmtFrmSize &rFmtSize = pFmt->GetFrmSize();
-    if ( rFmtSize.GetHeightSizeType() == ATT_FIX_SIZE )
+    const SwFormatFrmSize &rFormatSize = pFormat->GetFrmSize();
+    if ( rFormatSize.GetHeightSizeType() == ATT_FIX_SIZE )
         mbFixSize = true;
 }
 
@@ -2179,8 +2179,8 @@ SwTwips SwLayoutFrm::InnerHeight() const
         do
         {
             nRet += (pCnt->Frm().*fnRect->fnGetHeight)();
-            if( pCnt->IsCntntFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsUndersized() )
-                nRet += static_cast<const SwTxtFrm*>(pCnt)->GetParHeight() -
+            if( pCnt->IsContentFrm() && static_cast<const SwTextFrm*>(pCnt)->IsUndersized() )
+                nRet += static_cast<const SwTextFrm*>(pCnt)->GetParHeight() -
                         (pCnt->Prt().*fnRect->fnGetHeight)();
             if( pCnt->IsLayoutFrm() && !pCnt->IsTabFrm() )
                 nRet += static_cast<const SwLayoutFrm*>(pCnt)->InnerHeight() -
@@ -2237,8 +2237,8 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
     {
         if ( GetUpper() )
         {   // AdjustNeighbourhood now only for the columns (but not in frames)
-            sal_uInt8 nAdjust = GetUpper()->IsFtnBossFrm() ?
-                static_cast<SwFtnBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this )
+            sal_uInt8 nAdjust = GetUpper()->IsFootnoteBossFrm() ?
+                static_cast<SwFootnoteBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this )
                 : NA_GROW_SHRINK;
             if( NA_ONLY_ADJUST == nAdjust )
                 nReal = AdjustNeighbourhood( nReal, bTst );
@@ -2271,7 +2271,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
                 if( NA_GROW_ADJUST == nAdjust && nGrow < nReal )
                     nReal += AdjustNeighbourhood( nReal - nGrow, bTst );
 
-                if ( IsFtnFrm() && (nGrow != nReal) && GetNext() )
+                if ( IsFootnoteFrm() && (nGrow != nReal) && GetNext() )
                 {
                     //Footnotes can replace their successor.
                     SwTwips nSpace = bTst ? 0 : -nDist;
@@ -2287,7 +2287,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
                     if ( nReal > nSpace )
                         nReal = nSpace;
                     if ( nReal && !bTst )
-                        static_cast<SwFtnFrm*>(this)->InvalidateNxtFtnCnts( FindPageFrm() );
+                        static_cast<SwFootnoteFrm*>(this)->InvalidateNxtFootnoteCnts( FindPageFrm() );
                 }
                 else
                     nReal = nGrow;
@@ -2319,7 +2319,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
             if ( GetNext() )
             {
                 GetNext()->_InvalidatePos();
-                if ( GetNext()->IsCntntFrm() )
+                if ( GetNext()->IsContentFrm() )
                     GetNext()->InvalidatePage( pPage );
             }
             if ( !IsPageBodyFrm() )
@@ -2333,7 +2333,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
             if( IsCellFrm() )
                 InvaPercentLowers( nReal );
 
-            SvxBrushItem aBack(GetFmt()->makeBackgroundBrushItem());
+            SvxBrushItem aBack(GetFormat()->makeBackgroundBrushItem());
             const SvxGraphicPosition ePos = aBack.GetGraphicPos();
             if ( GPOS_NONE != ePos && GPOS_TILED != ePos )
                 SetCompletePaint();
@@ -2398,8 +2398,8 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
         bMoveAccFrm = true;
     }
 
-    sal_uInt8 nAdjust = GetUpper() && GetUpper()->IsFtnBossFrm() ?
-                   static_cast<SwFtnBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this )
+    sal_uInt8 nAdjust = GetUpper() && GetUpper()->IsFootnoteBossFrm() ?
+                   static_cast<SwFootnoteBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this )
                    : NA_GROW_SHRINK;
 
     // AdjustNeighbourhood also in columns (but not in frames)
@@ -2466,7 +2466,7 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
         if ( GetNext() )
         {
             GetNext()->_InvalidatePos();
-            if ( GetNext()->IsCntntFrm() )
+            if ( GetNext()->IsContentFrm() )
                 GetNext()->InvalidatePage( pPage );
             if ( IsTabFrm() )
                 static_cast<SwTabFrm*>(this)->SetComplete();
@@ -2487,10 +2487,10 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
             _InvalidateAll();
             InvalidatePage( pPage );
             bool bCompletePaint = true;
-            const SwFrmFmt* pFmt = GetFmt();
-            if (pFmt)
+            const SwFrameFormat* pFormat = GetFormat();
+            if (pFormat)
             {
-                SvxBrushItem aBack(pFmt->makeBackgroundBrushItem());
+                SvxBrushItem aBack(pFormat->makeBackgroundBrushItem());
                 const SvxGraphicPosition ePos = aBack.GetGraphicPos();
                 if ( GPOS_NONE == ePos || GPOS_TILED == ePos )
                     bCompletePaint = false;
@@ -2505,16 +2505,16 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
         if( IsCellFrm() )
             InvaPercentLowers( nReal );
 
-        SwCntntFrm *pCnt;
-        if( IsFtnFrm() && !static_cast<SwFtnFrm*>(this)->GetAttr()->GetFtn().IsEndNote() &&
-            ( GetFmt()->GetDoc()->GetFtnInfo().ePos != FTNPOS_CHAPTER ||
-              ( IsInSct() && FindSctFrm()->IsFtnAtEnd() ) ) &&
-              0 != (pCnt = static_cast<SwFtnFrm*>(this)->GetRefFromAttr() ) )
+        SwContentFrm *pCnt;
+        if( IsFootnoteFrm() && !static_cast<SwFootnoteFrm*>(this)->GetAttr()->GetFootnote().IsEndNote() &&
+            ( GetFormat()->GetDoc()->GetFootnoteInfo().ePos != FTNPOS_CHAPTER ||
+              ( IsInSct() && FindSctFrm()->IsFootnoteAtEnd() ) ) &&
+              0 != (pCnt = static_cast<SwFootnoteFrm*>(this)->GetRefFromAttr() ) )
         {
             if ( pCnt->IsFollow() )
             {   // If we are in an other column/page than the frame with the
                 // reference, we don't need to invalidate its master.
-                SwFrm *pTmp = pCnt->FindFtnBossFrm(true) == FindFtnBossFrm(true)
+                SwFrm *pTmp = pCnt->FindFootnoteBossFrm(true) == FindFootnoteBossFrm(true)
                               ?  &pCnt->FindMaster()->GetFrm() : pCnt;
                 pTmp->Prepare( PREP_ADJUST_FRM );
                 pTmp->InvalidateSize();
@@ -2589,7 +2589,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
         if( pLowerFrm->IsSctFrm() )
             pLowerFrm = static_cast<SwSectionFrm*>(pLowerFrm)->GetSection() &&
                    !static_cast<SwSectionFrm*>(pLowerFrm)->ToMaximize( false ) ?
-                   static_cast<SwSectionFrm*>(pLowerFrm)->FindLastCntnt() : NULL;
+                   static_cast<SwSectionFrm*>(pLowerFrm)->FindLastContent() : NULL;
 
         // continue with found last lower, probably the last content of a section
         if ( pLowerFrm )
@@ -2620,8 +2620,8 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
                 if( !pLowerFrm->IsFlowFrm() ||
                     !SwFlowFrm::CastFlowFrm( pLowerFrm )->HasFollow() )
                     pLowerFrm->InvalidateNextPos( true );
-                if ( pLowerFrm->IsTxtFrm() )
-                    static_cast<SwCntntFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM );
+                if ( pLowerFrm->IsTextFrm() )
+                    static_cast<SwContentFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM );
             }
             else
             {
@@ -2652,8 +2652,8 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
                 {
                     pLowerFrm->_InvalidateSize();
                     pLowerFrm->InvalidatePage( pPage );
-                    if ( pLowerFrm->IsTxtFrm() )
-                        static_cast<SwCntntFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM );
+                    if ( pLowerFrm->IsTextFrm() )
+                        static_cast<SwContentFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM );
                 }
             }
             // #i41694# - improvement by removing duplicates
@@ -2676,7 +2676,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
     } // end of { special case }
 
     // Invalidate page for content only once.
-    bool bInvaPageForCntnt = true;
+    bool bInvaPageForContent = true;
 
     // Declare booleans <bFixChgd> and <bVarChgd>, indicating for text frame
     // adjustment, if fixed/variable size has changed.
@@ -2711,13 +2711,13 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
     // Travel through all lowers using <GetNext()>
     while ( pLowerFrm )
     {
-        if ( pLowerFrm->IsTxtFrm() )
+        if ( pLowerFrm->IsTextFrm() )
         {
             // Text frames will only be invalidated - prepare invalidation
             if ( bFixChgd )
-                static_cast<SwCntntFrm*>(pLowerFrm)->Prepare( PREP_FIXSIZE_CHG );
+                static_cast<SwContentFrm*>(pLowerFrm)->Prepare( PREP_FIXSIZE_CHG );
             if ( bVarChgd )
-                static_cast<SwCntntFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM );
+                static_cast<SwContentFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM );
         }
         else
         {
@@ -2738,7 +2738,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
                         // frames to its upper width.
                         pLowerFrm->Frm().Width( Prt().Width() );
                     }
-                    else if( rOldSize.Width() && !pLowerFrm->IsFtnFrm() )
+                    else if( rOldSize.Width() && !pLowerFrm->IsFootnoteFrm() )
                     {
                         // Adjust frame width proportional, if lower isn't a
                         // foot note frame and condition <nLowerType & nFixWidth>
@@ -2785,7 +2785,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
                     // the <Grow> of header or footer are overwritten.
                     // NOTE: Height of header/footer frame is determined by contents.
                     else if ( rOldSize.Height() &&
-                              !pLowerFrm->IsFtnFrm() &&
+                              !pLowerFrm->IsFootnoteFrm() &&
                               !pLowerFrm->IsHeaderFrm() &&
                               !pLowerFrm->IsFooterFrm()
                             )
@@ -2815,9 +2815,9 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
                              ( IsColumnFrm() && IsInSct() )
                            )
                         {
-                            OSL_ENSURE( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFtnContFrm(),
+                            OSL_ENSURE( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFootnoteContFrm(),
                                     "ChgLowersProp - only for body or foot note container" );
-                            if ( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFtnContFrm() )
+                            if ( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFootnoteContFrm() )
                             {
                                 if ( IsVertical() || pLowerFrm->IsBodyFrm() )
                                 {
@@ -2863,7 +2863,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
                                 SwFrm* pTmp = Lower();
                                 while( pTmp->GetNext() )
                                 {
-                                    if( !pTmp->IsFtnContFrm() || !pTmp->IsVertical() )
+                                    if( !pTmp->IsFootnoteContFrm() || !pTmp->IsVertical() )
                                         nSum -= pTmp->Frm().Height();
                                     pTmp = pTmp->GetNext();
                                 }
@@ -2879,16 +2879,16 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
         } // end of else { NOT text frame }
 
         pLowerFrm->_InvalidateAll();
-        if ( bInvaPageForCntnt && pLowerFrm->IsCntntFrm() )
+        if ( bInvaPageForContent && pLowerFrm->IsContentFrm() )
         {
             pLowerFrm->InvalidatePage();
-            bInvaPageForCntnt = false;
+            bInvaPageForContent = false;
         }
 
         if ( !pLowerFrm->GetNext() && pLowerFrm->IsRetoucheFrm() )
         {
             //If a growth took place and the subordinate elements can retouch
-            //itself (currently Tabs, Sections and Cntnt) we trigger it.
+            //itself (currently Tabs, Sections and Content) we trigger it.
             if ( rOldSize.Height() < Prt().SSize().Height() ||
                  rOldSize.Width() < Prt().SSize().Width() )
                 pLowerFrm->SetRetouche();
@@ -2903,16 +2903,16 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
            Lower()->IsColumnFrm() )
     {
         // get column attribute
-        const SwFmtCol* pColAttr = NULL;
+        const SwFormatCol* pColAttr = NULL;
         if ( IsPageBodyFrm() )
         {
             OSL_ENSURE( GetUpper()->IsPageFrm(), "Upper is not page frame" );
-            pColAttr = &GetUpper()->GetFmt()->GetCol();
+            pColAttr = &GetUpper()->GetFormat()->GetCol();
         }
         else
         {
             OSL_ENSURE( IsFlyFrm() || IsSctFrm(), "Columns not in fly or section" );
-            pColAttr = &GetFmt()->GetCol();
+            pColAttr = &GetFormat()->GetCol();
         }
 
         if ( pColAttr->IsOrtho() && pColAttr->GetNumCols() > 1 )
@@ -2950,7 +2950,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
         if ( !HasFixSize() )
         {
             const SwTwips nBorder = nUpper + nLower;
-            const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize();
+            const SwFormatFrmSize &rSz = GetFormat()->GetFrmSize();
             SwTwips nMinHeight = rSz.GetHeightSizeType() == ATT_MIN_SIZE ? rSz.GetHeight() : 0;
             do
             {   mbValidSize = true;
@@ -2961,9 +2961,9 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
                 SwFrm *pFrm = Lower();
                 while ( pFrm )
                 {   nRemaining += (pFrm->Frm().*fnRect->fnGetHeight)();
-                    if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsUndersized() )
-                    // This TxtFrm would like to be a bit bigger
-                        nRemaining += static_cast<SwTxtFrm*>(pFrm)->GetParHeight()
+                    if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsUndersized() )
+                    // This TextFrm would like to be a bit bigger
+                        nRemaining += static_cast<SwTextFrm*>(pFrm)->GetParHeight()
                                       - (pFrm->Prt().*fnRect->fnGetHeight)();
                     else if( pFrm->IsSctFrm() && static_cast<SwSectionFrm*>(pFrm)->IsUndersized() )
                         nRemaining += static_cast<SwSectionFrm*>(pFrm)->Undersize();
@@ -3017,7 +3017,7 @@ static void InvaPercentFlys( SwFrm *pFrm, SwTwips nDiff )
         if ( pAnchoredObj->ISA(SwFlyFrm) )
         {
             SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pAnchoredObj);
-            const SwFmtFrmSize &rSz = pFly->GetFmt()->GetFrmSize();
+            const SwFormatFrmSize &rSz = pFly->GetFormat()->GetFrmSize();
             if ( rSz.GetWidthPercent() || rSz.GetHeightPercent() )
             {
                 bool bNotify = true;
@@ -3033,7 +3033,7 @@ static void InvaPercentFlys( SwFrm *pFrm, SwTwips nDiff )
                     // 100% height and no text wrap inside a cell of a table.
                     if( pFly->Frm().Height()*10 >
                         ( nDiff + pRel->Prt().Height() )*9 &&
-                        pFly->GetFmt()->GetSurround().GetSurround() !=
+                        pFly->GetFormat()->GetSurround().GetSurround() !=
                         SURROUND_THROUGHT )
                        bNotify = false;
                 }
@@ -3049,7 +3049,7 @@ void SwLayoutFrm::InvaPercentLowers( SwTwips nDiff )
     if ( GetDrawObjs() )
         ::InvaPercentFlys( this, nDiff );
 
-    SwFrm *pFrm = ContainsCntnt();
+    SwFrm *pFrm = ContainsContent();
     if ( pFrm )
         do
         {
@@ -3063,7 +3063,7 @@ void SwLayoutFrm::InvaPercentLowers( SwTwips nDiff )
 
             if ( pFrm->IsTabFrm() )
             {
-                const SwFmtFrmSize &rSz = static_cast<SwLayoutFrm*>(pFrm)->GetFmt()->GetFrmSize();
+                const SwFormatFrmSize &rSz = static_cast<SwLayoutFrm*>(pFrm)->GetFormat()->GetFrmSize();
                 if ( rSz.GetWidthPercent() || rSz.GetHeightPercent() )
                     pFrm->InvalidatePrt();
             }
@@ -3073,7 +3073,7 @@ void SwLayoutFrm::InvaPercentLowers( SwTwips nDiff )
         } while ( pFrm && IsAnLower( pFrm ) ) ;
 }
 
-long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, bool ) const
+long SwLayoutFrm::CalcRel( const SwFormatFrmSize &rSz, bool ) const
 {
     long nRet     = rSz.GetWidth(),
          nPercent = rSz.GetWidthPercent();
@@ -3109,9 +3109,9 @@ static long lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm )
     {
         if( pFrm && pFrm->IsBodyFrm() )
             pFrm = static_cast<SwBodyFrm*>(pFrm)->Lower();
-        if ( pFrm && pFrm->IsTxtFrm() )
+        if ( pFrm && pFrm->IsTextFrm() )
         {
-            const long nTmp = static_cast<SwTxtFrm*>(pFrm)->FirstLineHeight();
+            const long nTmp = static_cast<SwTextFrm*>(pFrm)->FirstLineHeight();
             if ( nTmp != USHRT_MAX )
             {
                 if ( pCol == pLayFrm->Lower() )
@@ -3132,7 +3132,7 @@ static long lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm )
 
 static bool lcl_IsFlyHeightClipped( SwLayoutFrm *pLay )
 {
-    SwFrm *pFrm = pLay->ContainsCntnt();
+    SwFrm *pFrm = pLay->ContainsContent();
     while ( pFrm )
     {
         if ( pFrm->IsInTab() )
@@ -3172,7 +3172,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
     //   than the amount of columns.
     //3. Go back to 1. until everything is stable.
 
-    const SwFmtCol &rCol = rAttrs.GetAttrSet().GetCol();
+    const SwFormatCol &rCol = rAttrs.GetAttrSet().GetCol();
     const sal_uInt16 nNumCols = rCol.GetNumCols();
 
     bool bEnd = false;
@@ -3228,7 +3228,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
             if( nMaximum > BROWSE_HEIGHT )
                 nMaximum = BROWSE_HEIGHT;
 
-            bNoBalance = static_cast<SwSectionFrm*>(this)->GetSection()->GetFmt()->
+            bNoBalance = static_cast<SwSectionFrm*>(this)->GetSection()->GetFormat()->
                          GetBalancedColumns().GetValue();
             SwFrm* pAny = ContainsAny();
             if( bNoBalance ||
@@ -3243,16 +3243,16 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
                     nTop = nMaximum;
                 (this->*fnRect->fnSetYMargins)( nTop, 0 );
             }
-            if( !pAny && !static_cast<SwSectionFrm*>(this)->IsFtnLock() )
+            if( !pAny && !static_cast<SwSectionFrm*>(this)->IsFootnoteLock() )
             {
-                SwFtnContFrm* pFtnCont = static_cast<SwSectionFrm*>(this)->ContainsFtnCont();
-                if( pFtnCont )
+                SwFootnoteContFrm* pFootnoteCont = static_cast<SwSectionFrm*>(this)->ContainsFootnoteCont();
+                if( pFootnoteCont )
                 {
-                    SwFrm* pFtnAny = pFtnCont->ContainsAny();
-                    if( pFtnAny && pFtnAny->IsValid() )
+                    SwFrm* pFootnoteAny = pFootnoteCont->ContainsAny();
+                    if( pFootnoteAny && pFootnoteAny->IsValid() )
                     {
                         bBackLock = true;
-                        static_cast<SwSectionFrm*>(this)->SetFtnLock( true );
+                        static_cast<SwSectionFrm*>(this)->SetFootnoteLock( true );
                     }
                 }
             }
@@ -3299,11 +3299,11 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
                 // ColumnFrms have a BodyFrm now, which needs to be calculated
                 pCol->Lower()->Calc();
                 if( pCol->Lower()->GetNext() )
-                    pCol->Lower()->GetNext()->Calc();  // SwFtnCont
+                    pCol->Lower()->GetNext()->Calc();  // SwFootnoteCont
                 pCol = static_cast<SwLayoutFrm*>(pCol->GetNext());
             }
 
-            ::CalcCntnt( this );
+            ::CalcContent( this );
 
             pCol = static_cast<SwLayoutFrm*>(Lower());
             OSL_ENSURE( pCol && pCol->GetNext(), ":-( column making holidays?");
@@ -3312,7 +3312,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
             // OD 28.03.2003 #108446# - check for all column content and all columns
             while ( bMinDiff && pCol )
             {
-                bMinDiff = 0 != pCol->ContainsCntnt();
+                bMinDiff = 0 != pCol->ContainsContent();
                 pCol = static_cast<SwLayoutFrm*>(pCol->GetNext());
             }
             pCol = static_cast<SwLayoutFrm*>(Lower());
@@ -3339,7 +3339,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
                 {
                     bFoundLower = true;
                     pLay = static_cast<SwLayoutFrm*>(pLay->GetNext());
-                    OSL_ENSURE( pLay->IsFtnContFrm(),"FtnContainer expected" );
+                    OSL_ENSURE( pLay->IsFootnoteContFrm(),"FootnoteContainer expected" );
                     nInnerHeight += pLay->InnerHeight();
                     nInnerHeight += (pLay->Frm().*fnRect->fnGetHeight)() -
                                     (pLay->Prt().*fnRect->fnGetHeight)();
@@ -3486,11 +3486,11 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
                     if( IsSctFrm() && static_cast<SwSectionFrm*>(this)->HasFollow() )
                     {
                         // If we created a Follow, we need to give its content
-                        // the opportunity to flow back inside the CalcCntnt
-                        SwCntntFrm* pTmpCntnt =
-                            static_cast<SwSectionFrm*>(this)->GetFollow()->ContainsCntnt();
-                        if( pTmpCntnt )
-                            pTmpCntnt->_InvalidatePos();
+                        // the opportunity to flow back inside the CalcContent
+                        SwContentFrm* pTmpContent =
+                            static_cast<SwSectionFrm*>(this)->GetFollow()->ContainsContent();
+                        if( pTmpContent )
+                            pTmpContent->_InvalidatePos();
                     }
                 }
                 else
@@ -3503,24 +3503,24 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
     }
     // OD 01.04.2003 #108446# - Don't collect endnotes for sections. Thus, set
     // 2nd parameter to <true>.
-    ::CalcCntnt( this, true );
+    ::CalcContent( this, true );
     if( IsSctFrm() )
     {
         // OD 14.03.2003 #i11760# - adjust 2nd parameter - sal_True --> true
-        ::CalcCntnt( this, true );
+        ::CalcContent( this, true );
         if( bBackLock )
-            static_cast<SwSectionFrm*>(this)->SetFtnLock( false );
+            static_cast<SwSectionFrm*>(this)->SetFootnoteLock( false );
     }
 }
 
-static SwCntntFrm* lcl_InvalidateSection( SwFrm *pCnt, sal_uInt8 nInv )
+static SwContentFrm* lcl_InvalidateSection( SwFrm *pCnt, sal_uInt8 nInv )
 {
     SwSectionFrm* pSect = pCnt->FindSctFrm();
-    // If our CntntFrm is placed inside a table or a footnote, only sections
+    // If our ContentFrm is placed inside a table or a footnote, only sections
     // which are also placed inside are meant.
     // Exception: If a table is directly passed.
     if( ( ( pCnt->IsInTab() && !pSect->IsInTab() ) ||
-        ( pCnt->IsInFtn() && !pSect->IsInFtn() ) ) && !pCnt->IsTabFrm() )
+        ( pCnt->IsInFootnote() && !pSect->IsInFootnote() ) ) && !pCnt->IsTabFrm() )
         return NULL;
     if( nInv & INV_SIZE )
         pSect->_InvalidateSize();
@@ -3531,12 +3531,12 @@ static SwCntntFrm* lcl_InvalidateSection( SwFrm *pCnt, sal_uInt8 nInv )
     SwFlowFrm *pFoll = pSect->GetFollow();
     // Temporary separation from follow
     pSect->SetFollow( NULL );
-    SwCntntFrm* pRet = pSect->FindLastCntnt();
+    SwContentFrm* pRet = pSect->FindLastContent();
     pSect->SetFollow( pFoll );
     return pRet;
 }
 
-static SwCntntFrm* lcl_InvalidateTable( SwTabFrm *pTable, sal_uInt8 nInv )
+static SwContentFrm* lcl_InvalidateTable( SwTabFrm *pTable, sal_uInt8 nInv )
 {
     if( ( nInv & INV_SECTION ) && pTable->IsInSct() )
         lcl_InvalidateSection( pTable, nInv );
@@ -3546,15 +3546,15 @@ static SwCntntFrm* lcl_InvalidateTable( SwTabFrm *pTable, sal_uInt8 nInv )
         pTable->_InvalidatePos();
     if( nInv & INV_PRTAREA )
         pTable->_InvalidatePrt();
-    return pTable->FindLastCntnt();
+    return pTable->FindLastContent();
 }
 
-static void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv );
+static void lcl_InvalidateAllContent( SwContentFrm *pCnt, sal_uInt8 nInv );
 
-static void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv )
+static void lcl_InvalidateContent( SwContentFrm *pCnt, sal_uInt8 nInv )
 {
-    SwCntntFrm *pLastTabCnt = NULL;
-    SwCntntFrm *pLastSctCnt = NULL;
+    SwContentFrm *pLastTabCnt = NULL;
+    SwContentFrm *pLastSctCnt = NULL;
     while ( pCnt )
     {
         if( nInv & INV_SECTION )
@@ -3569,15 +3569,15 @@ static void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv )
             }
 #if OSL_DEBUG_LEVEL > 0
             else
-                OSL_ENSURE( !pLastSctCnt, "Where's the last SctCntnt?" );
+                OSL_ENSURE( !pLastSctCnt, "Where's the last SctContent?" );
 #endif
         }
         if( nInv & INV_TABLE )
         {
             if( pCnt->IsInTab() )
             {
-                // To not call FindTabFrm() for each CntntFrm of a table and
-                // then invalidate the table, we remember the last CntntFrm of
+                // To not call FindTabFrm() for each ContentFrm of a table and
+                // then invalidate the table, we remember the last ContentFrm of
                 // the table and ignore IsInTab() until we are past it.
                 // When entering the table, LastSctCnt is set to null, so
                 // sections inside the table are correctly invalidated.
@@ -3596,7 +3596,7 @@ static void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv )
             }
 #if OSL_DEBUG_LEVEL > 0
             else
-                OSL_ENSURE( !pLastTabCnt, "Where's the last TabCntnt?" );
+                OSL_ENSURE( !pLastTabCnt, "Where's the last TabContent?" );
 #endif
         }
 
@@ -3609,12 +3609,12 @@ static void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv )
         if ( nInv & INV_LINENUM )
             pCnt->InvalidateLineNum();
         if ( pCnt->GetDrawObjs() )
-            lcl_InvalidateAllCntnt( pCnt, nInv );
-        pCnt = pCnt->GetNextCntntFrm();
+            lcl_InvalidateAllContent( pCnt, nInv );
+        pCnt = pCnt->GetNextContentFrm();
     }
 }
 
-static void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv )
+static void lcl_InvalidateAllContent( SwContentFrm *pCnt, sal_uInt8 nInv )
 {
     SwSortedObjs &rObjs = *pCnt->GetDrawObjs();
     for ( size_t i = 0; i < rObjs.size(); ++i )
@@ -3625,7 +3625,7 @@ static void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv )
             SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pAnchoredObj);
             if ( pFly->IsFlyInCntFrm() )
             {
-                ::lcl_InvalidateCntnt( pFly->ContainsCntnt(), nInv );
+                ::lcl_InvalidateContent( pFly->ContainsContent(), nInv );
                 if( nInv & INV_DIRECTION )
                     pFly->CheckDirChange();
             }
@@ -3633,17 +3633,17 @@ static void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv )
     }
 }
 
-void SwRootFrm::InvalidateAllCntnt( sal_uInt8 nInv )
+void SwRootFrm::InvalidateAllContent( sal_uInt8 nInv )
 {
     // First process all page bound FlyFrms.
     SwPageFrm *pPage = static_cast<SwPageFrm*>(Lower());
     while( pPage )
     {
         pPage->InvalidateFlyLayout();
-        pPage->InvalidateFlyCntnt();
+        pPage->InvalidateFlyContent();
         pPage->InvalidateFlyInCnt();
         pPage->InvalidateLayout();
-        pPage->InvalidateCntnt();
+        pPage->InvalidateContent();
         pPage->InvalidatePage( pPage ); // So even the Turbo disappears if applicable
 
         if ( pPage->GetSortedObjs() )
@@ -3655,7 +3655,7 @@ void SwRootFrm::InvalidateAllCntnt( sal_uInt8 nInv )
                 if ( pAnchoredObj->ISA(SwFlyFrm) )
                 {
                     SwFlyFrm* pFly = static_cast<SwFlyFrm*>(pAnchoredObj);
-                    ::lcl_InvalidateCntnt( pFly->ContainsCntnt(), nInv );
+                    ::lcl_InvalidateContent( pFly->ContainsContent(), nInv );
                     if ( nInv & INV_DIRECTION )
                         pFly->CheckDirChange();
                 }
@@ -3667,7 +3667,7 @@ void SwRootFrm::InvalidateAllCntnt( sal_uInt8 nInv )
     }
 
     //Invalidate the whole document content and the character bound Flys here.
-    ::lcl_InvalidateCntnt( ContainsCntnt(), nInv );
+    ::lcl_InvalidateContent( ContainsContent(), nInv );
 
     if( nInv & INV_PRTAREA )
     {
@@ -3694,7 +3694,7 @@ void SwRootFrm::InvalidateAllObjPos()
             for ( size_t i = 0; i < rObjs.size(); ++i )
             {
                 SwAnchoredObject* pAnchoredObj = rObjs[i];
-                const SwFmtAnchor& rAnch = pAnchoredObj->GetFrmFmt().GetAnchor();
+                const SwFormatAnchor& rAnch = pAnchoredObj->GetFrameFormat().GetAnchor();
                 if ((rAnch.GetAnchorId() != FLY_AT_PARA) &&
                     (rAnch.GetAnchorId() != FLY_AT_CHAR))
                 {
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 54bf5e037d77..2957aa073359 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -104,14 +104,14 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj()
     // determine format the object belongs to
     {
         // #i28701#
-        mpFrmFmt = &mpAnchoredObj->GetFrmFmt();
-        assert(mpFrmFmt &&
+        mpFrameFormat = &mpAnchoredObj->GetFrameFormat();
+        assert(mpFrameFormat &&
                 "<SwAnchoredObjectPosition::_GetInfoAboutObj() - missing frame format.");
     }
 
     // #i62875# - determine attribute value of <Follow-Text-Flow>
     {
-        mbFollowTextFlow = mpFrmFmt->GetFollowTextFlow().GetValue();
+        mbFollowTextFlow = mpFrameFormat->GetFollowTextFlow().GetValue();
     }
 
     // determine, if anchored object has not to be captured on the page.
@@ -121,7 +121,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj()
     // - it doesn't follow the text flow
     {
         mbDoNotCaptureAnchoredObj = !mbIsObjFly && !mbFollowTextFlow &&
-                                    mpFrmFmt->getIDocumentSettingAccess()->get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE);
+                                    mpFrameFormat->getIDocumentSettingAccess()->get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE);
     }
 }
 
@@ -160,18 +160,18 @@ SwTwips SwAnchoredObjectPosition::_GetTopForObjPos( const SwFrm& _rFrm,
 {
     SwTwips nTopOfFrmForObjPos = (_rFrm.Frm().*_fnRect->fnGetTop)();
 
-    if ( _rFrm.IsTxtFrm() )
+    if ( _rFrm.IsTextFrm() )
     {
-        const SwTxtFrm& rTxtFrm = static_cast<const SwTxtFrm&>(_rFrm);
+        const SwTextFrm& rTextFrm = static_cast<const SwTextFrm&>(_rFrm);
         if ( _bVert )
         {
             nTopOfFrmForObjPos -=
-                rTxtFrm.GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid();
+                rTextFrm.GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid();
         }
         else
         {
             nTopOfFrmForObjPos +=
-                rTxtFrm.GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid();
+                rTextFrm.GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid();
         }
     }
 
@@ -193,8 +193,8 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues(
     // #i11860# - upper space amount of <_rVertOrientFrm> considered
     // for previous frame
     const SwTwips nVertOrientUpperSpaceForPrevFrmAndPageGrid =
-            _rVertOrientFrm.IsTxtFrm()
-            ? static_cast<const SwTxtFrm&>(_rVertOrientFrm).
+            _rVertOrientFrm.IsTextFrm()
+            ? static_cast<const SwTextFrm&>(_rVertOrientFrm).
                         GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid()
             : 0;
     switch ( _eRelOrient )
@@ -411,7 +411,7 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnc
     {
         // #i26945# - no extension of restricted area, if
         // object's attribute follow text flow is set and its inside a table
-        if ( GetFrmFmt().getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) &&
+        if ( GetFrameFormat().getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) &&
              ( !bFollowTextFlow ||
                !GetAnchoredObj().GetAnchorFrm()->IsInTab() ) )
         {
@@ -477,20 +477,20 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnc
         // tdf#91260 - allow textboxes extending beyond the page bottom
         if ( nAdjustedRelPosY < nProposedRelPosY )
         {
-            const SwFrmFmt* pFmt = &(GetFrmFmt());
+            const SwFrameFormat* pFormat = &(GetFrameFormat());
             if ( SwTextBoxHelper::isTextBox(&GetObject()) )
             {
                 // shrink textboxes to extend beyond the page bottom
-                SwFrmFmt* pFrmFmt = ::FindFrmFmt(&GetObject());
-                SfxItemSet aTextBoxSet(pFrmFmt->GetDoc()->GetAttrPool(), aFrmFmtSetRange);
-                SwFmtFrmSize aSize(pFmt->GetFrmSize());
+                SwFrameFormat* pFrameFormat = ::FindFrameFormat(&GetObject());
+                SfxItemSet aTextBoxSet(pFrameFormat->GetDoc()->GetAttrPool(), aFrameFormatSetRange);
+                SwFormatFrmSize aSize(pFormat->GetFrmSize());
                 SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - nAdjustedRelPosY);
                 aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 );
                 aTextBoxSet.Put(aSize);
                 if (aTextBoxSet.Count())
-                    pFrmFmt->GetDoc()->SetFlyFrmAttr(*pFrmFmt, aTextBoxSet);
+                    pFrameFormat->GetDoc()->SetFlyFrmAttr(*pFrameFormat, aTextBoxSet);
                 nAdjustedRelPosY = nProposedRelPosY;
-            } else if ( SwTextBoxHelper::findTextBox(pFmt) )
+            } else if ( SwTextBoxHelper::findTextBox(pFormat) )
                 // when the shape has a textbox, use only the proposed vertical position
                 nAdjustedRelPosY = nProposedRelPosY;
         }
@@ -568,10 +568,10 @@ void SwAnchoredObjectPosition::_GetHoriAlignmentValues( const SwFrm&  _rHoriOrie
         {
             nWidth = (_rHoriOrientFrm.Prt().*fnRect->fnGetWidth)();
             nOffset = (_rHoriOrientFrm.*fnRect->fnGetLeftMargin)();
-            if ( _rHoriOrientFrm.IsTxtFrm() )
+            if ( _rHoriOrientFrm.IsTextFrm() )
             {
                 // consider movement of text frame left
-                nOffset += static_cast<const SwTxtFrm&>(_rHoriOrientFrm).GetBaseOfstForFly( !_bObjWrapThrough );
+                nOffset += static_cast<const SwTextFrm&>(_rHoriOrientFrm).GetBaseOfstForFly( !_bObjWrapThrough );
             }
             else if ( _rHoriOrientFrm.IsPageFrm() && bVert )
             {
@@ -690,8 +690,8 @@ void SwAnchoredObjectPosition::_GetHoriAlignmentValues( const SwFrm&  _rHoriOrie
             // text frame, as we do want to have the textbox overlap with its
             // draw shape.
             bool bIgnoreFlysAnchoredAtFrame = !_bObjWrapThrough || SwTextBoxHelper::isTextBox(&GetObject());
-            nOffset = _rHoriOrientFrm.IsTxtFrm() ?
-                   static_cast<const SwTxtFrm&>(_rHoriOrientFrm).GetBaseOfstForFly( bIgnoreFlysAnchoredAtFrame ) :
+            nOffset = _rHoriOrientFrm.IsTextFrm() ?
+                   static_cast<const SwTextFrm&>(_rHoriOrientFrm).GetBaseOfstForFly( bIgnoreFlysAnchoredAtFrame ) :
                    0;
             break;
         }
@@ -760,7 +760,7 @@ void SwAnchoredObjectPosition::_ToggleHoriOrientAndAlign(
 SwTwips SwAnchoredObjectPosition::_CalcRelPosX(
                                 const SwFrm& _rHoriOrientFrm,
                                 const SwEnvironmentOfAnchoredObject& _rEnvOfObj,
-                                const SwFmtHoriOrient& _rHoriOrient,
+                                const SwFormatHoriOrient& _rHoriOrient,
                                 const SvxLRSpaceItem& _rLRSpacing,
                                 const SvxULSpaceItem& _rULSpacing,
                                 const bool _bObjWrapThrough,
@@ -880,14 +880,14 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
                                           ) const
 {
     // #i26791#
-    if ( !GetAnchorFrm().ISA(SwTxtFrm) ||
+    if ( !GetAnchorFrm().ISA(SwTextFrm) ||
          !GetAnchoredObj().ISA(SwFlyAtCntFrm) )
     {
         OSL_FAIL( "<SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(..) - usage for wrong anchor type" );
         return _nProposedRelPosX;
     }
 
-    const SwTxtFrm& rAnchorTxtFrm = static_cast<const SwTxtFrm&>(GetAnchorFrm());
+    const SwTextFrm& rAnchorTextFrm = static_cast<const SwTextFrm&>(GetAnchorFrm());
     // #i26791#
     const SwFlyAtCntFrm& rFlyAtCntFrm =
                         static_cast<const SwFlyAtCntFrm&>(GetAnchoredObj());
@@ -897,7 +897,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
     SwTwips nAdjustedRelPosX = _nProposedRelPosX;
 
     // determine proposed object bound rectangle
-    Point aTmpPos = (rAnchorTxtFrm.Frm().*fnRect->fnGetPos)();
+    Point aTmpPos = (rAnchorTextFrm.Frm().*fnRect->fnGetPos)();
     if( bVert )
     {
         aTmpPos.X() -= _nRelPosY + aObjBoundRect.Width();
@@ -912,8 +912,8 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
 
     const sal_uInt32 nObjOrdNum = GetObject().GetOrdNum();
     const SwPageFrm* pObjPage = rFlyAtCntFrm.FindPageFrm();
-    const SwFrm* pObjContext = ::FindKontext( &rAnchorTxtFrm, FRM_COLUMN );
-    sal_uLong nObjIndex = rAnchorTxtFrm.GetTxtNode()->GetIndex();
+    const SwFrm* pObjContext = ::FindKontext( &rAnchorTextFrm, FRM_COLUMN );
+    sal_uLong nObjIndex = rAnchorTextFrm.GetTextNode()->GetIndex();
     SwOrderIter aIter( pObjPage, true );
     const SwFlyFrm* pFly = static_cast<const SwVirtFlyDrawObj*>(aIter.Bottom())->GetFlyFrm();
     while ( pFly && nObjOrdNum > pFly->GetVirtDrawObj()->GetOrdNumDirect() )
@@ -923,7 +923,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
         {
             if( bVert )
             {
-                const SvxULSpaceItem& rOtherUL = pFly->GetFmt()->GetULSpace();
+                const SvxULSpaceItem& rOtherUL = pFly->GetFormat()->GetULSpace();
                 const SwTwips nOtherTop = pFly->Frm().Top() - rOtherUL.GetUpper();
                 const SwTwips nOtherBot = pFly->Frm().Bottom() + rOtherUL.GetLower();
                 if ( nOtherTop <= aTmpObjRect.Bottom() + _rULSpacing.GetLower() &&
@@ -932,9 +932,9 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
                     if ( _eHoriOrient == text::HoriOrientation::LEFT )
                     {
                         SwTwips nTmp = nOtherBot + 1 + _rULSpacing.GetUpper() -
-                                       rAnchorTxtFrm.Frm().Top();
+                                       rAnchorTextFrm.Frm().Top();
                         if ( nTmp > nAdjustedRelPosX &&
-                             rAnchorTxtFrm.Frm().Top() + nTmp +
+                             rAnchorTextFrm.Frm().Top() + nTmp +
                              aObjBoundRect.Height() + _rULSpacing.GetLower()
                              <= pObjPage->Frm().Height() + pObjPage->Frm().Top() )
                         {
@@ -945,21 +945,21 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
                     {
                         SwTwips nTmp = nOtherTop - 1 - _rULSpacing.GetLower() -
                                        aObjBoundRect.Height() -
-                                       rAnchorTxtFrm.Frm().Top();
+                                       rAnchorTextFrm.Frm().Top();
                         if ( nTmp < nAdjustedRelPosX &&
-                             rAnchorTxtFrm.Frm().Top() + nTmp - _rULSpacing.GetUpper()
+                             rAnchorTextFrm.Frm().Top() + nTmp - _rULSpacing.GetUpper()
                               >= pObjPage->Frm().Top() )
                         {
                             nAdjustedRelPosX = nTmp;
                         }
                     }
-                    aTmpObjRect.Pos().Y() = rAnchorTxtFrm.Frm().Top() +
+                    aTmpObjRect.Pos().Y() = rAnchorTextFrm.Frm().Top() +
                                             nAdjustedRelPosX;
                 }
             }
             else
             {
-                const SvxLRSpaceItem& rOtherLR = pFly->GetFmt()->GetLRSpace();
+                const SvxLRSpaceItem& rOtherLR = pFly->GetFormat()->GetLRSpace();
                 const SwTwips nOtherLeft = pFly->Frm().Left() - rOtherLR.GetLeft();
                 const SwTwips nOtherRight = pFly->Frm().Right() + rOtherLR.GetRight();
                 if( nOtherLeft <= aTmpObjRect.Right() + _rLRSpacing.GetRight() &&
@@ -968,9 +968,9 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
                     if ( _eHoriOrient == text::HoriOrientation::LEFT )
                     {
                         SwTwips nTmp = nOtherRight + 1 + _rLRSpacing.GetLeft() -
-                                       rAnchorTxtFrm.Frm().Left();
+                                       rAnchorTextFrm.Frm().Left();
                         if ( nTmp > nAdjustedRelPosX &&
-                             rAnchorTxtFrm.Frm().Left() + nTmp +
+                             rAnchorTextFrm.Frm().Left() + nTmp +
                              aObjBoundRect.Width() + _rLRSpacing.GetRight()
                              <= pObjPage->Frm().Width() + pObjPage->Frm().Left() )
                         {
@@ -981,15 +981,15 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
                     {
                         SwTwips nTmp = nOtherLeft - 1 - _rLRSpacing.GetRight() -
                                        aObjBoundRect.Width() -
-                                       rAnchorTxtFrm.Frm().Left();
+                                       rAnchorTextFrm.Frm().Left();
                         if ( nTmp < nAdjustedRelPosX &&
-                             rAnchorTxtFrm.Frm().Left() + nTmp - _rLRSpacing.GetLeft()
+                             rAnchorTextFrm.Frm().Left() + nTmp - _rLRSpacing.GetLeft()
                              >= pObjPage->Frm().Left() )
                         {
                             nAdjustedRelPosX = nTmp;
                         }
                     }
-                    aTmpObjRect.Pos().X() = rAnchorTxtFrm.Frm().Left() +
+                    aTmpObjRect.Pos().X() = rAnchorTextFrm.Frm().Left() +
                                             nAdjustedRelPosX;
                 }
             } // end of <if (bVert)>
@@ -1024,10 +1024,10 @@ bool SwAnchoredObjectPosition::_DrawAsideFly( const SwFlyFrm* _pFly,
          ::FindKontext( _pFly->GetAnchorFrm(), FRM_COLUMN ) == _pObjContext )
     {
         sal_uLong nOtherIndex =
-            static_cast<const SwTxtFrm*>(_pFly->GetAnchorFrm())->GetTxtNode()->GetIndex();
+            static_cast<const SwTextFrm*>(_pFly->GetAnchorFrm())->GetTextNode()->GetIndex();
         if( _nObjIndex >= nOtherIndex )
         {
-            const SwFmtHoriOrient& rHori = _pFly->GetFmt()->GetHoriOrient();
+            const SwFormatHoriOrient& rHori = _pFly->GetFormat()->GetHoriOrient();
             sal_Int16 eOtherRelOrient = rHori.GetRelationOrient();
             if( text::RelOrientation::CHAR != eOtherRelOrient )
             {
diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
index 9c9dd6c0fa76..8b5e8ef12358 100644
--- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
@@ -61,12 +61,12 @@ SwAsCharAnchoredObjectPosition::~SwAsCharAnchoredObjectPosition()
 {}
 
 /** method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> to needed type */
-const SwTxtFrm& SwAsCharAnchoredObjectPosition::GetAnchorTxtFrm() const
+const SwTextFrm& SwAsCharAnchoredObjectPosition::GetAnchorTextFrm() const
 {
-    OSL_ENSURE( GetAnchorFrm().ISA(SwTxtFrm),
-            "SwAsCharAnchoredObjectPosition::GetAnchorTxtFrm() - wrong anchor frame type" );
+    OSL_ENSURE( GetAnchorFrm().ISA(SwTextFrm),
+            "SwAsCharAnchoredObjectPosition::GetAnchorTextFrm() - wrong anchor frame type" );
 
-    return static_cast<const SwTxtFrm&>(GetAnchorFrm());
+    return static_cast<const SwTextFrm&>(GetAnchorFrm());
 }
 
 /** calculate position for object
@@ -78,7 +78,7 @@ const SwTxtFrm& SwAsCharAnchoredObjectPosition::GetAnchorTxtFrm() const
 */
 void SwAsCharAnchoredObjectPosition::CalcPosition()
 {
-    const SwTxtFrm& rAnchorFrm = GetAnchorTxtFrm();
+    const SwTextFrm& rAnchorFrm = GetAnchorTextFrm();
     // swap anchor frame, if swapped. Note: destructor takes care of the 'undo'
     SwFrmSwapper aFrmSwapper( &rAnchorFrm, false );
 
@@ -86,14 +86,14 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
 
     Point aAnchorPos( mrProposedAnchorPos );
 
-    const SwFrmFmt& rFrmFmt = GetFrmFmt();
+    const SwFrameFormat& rFrameFormat = GetFrameFormat();
 
     SwRect aObjBoundRect( GetAnchoredObj().GetObjRect() );
     SwTwips nObjWidth = (aObjBoundRect.*fnRect->fnGetWidth)();
 
     // determine spacing values considering layout-/text-direction
-    const SvxLRSpaceItem& rLRSpace = rFrmFmt.GetLRSpace();
-    const SvxULSpaceItem& rULSpace = rFrmFmt.GetULSpace();
+    const SvxLRSpaceItem& rLRSpace = rFrameFormat.GetLRSpace();
+    const SvxULSpaceItem& rULSpace = rFrameFormat.GetULSpace();
     SwTwips nLRSpaceLeft, nLRSpaceRight, nULSpaceUpper, nULSpaceLower;
     {
         if ( rAnchorFrm.IsVertical() )
@@ -160,7 +160,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
     aObjBoundRect.Height( aObjBoundRect.Height() + nULSpaceLower );
 
     // calculate relative position to given base line.
-    const SwFmtVertOrient& rVert = rFrmFmt.GetVertOrient();
+    const SwFormatVertOrient& rVert = rFrameFormat.GetVertOrient();
     const SwTwips nObjBoundHeight = ( mnFlags & AS_CHAR_ROTATE )
                                     ? aObjBoundRect.Width()
                                     : aObjBoundRect.Height();
@@ -211,11 +211,11 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
             const sal_Int16 eVertOrient = rVert.GetVertOrient();
             if( rVert.GetPos() != nRelPos && eVertOrient != text::VertOrientation::NONE )
             {
-                SwFmtVertOrient aVert( rVert );
+                SwFormatVertOrient aVert( rVert );
                 aVert.SetPos( nRelPos );
-                const_cast<SwFrmFmt&>(rFrmFmt).LockModify();
-                const_cast<SwFrmFmt&>(rFrmFmt).SetFmtAttr( aVert );
-                const_cast<SwFrmFmt&>(rFrmFmt).UnlockModify();
+                const_cast<SwFrameFormat&>(rFrameFormat).LockModify();
+                const_cast<SwFrameFormat&>(rFrameFormat).SetFormatAttr( aVert );
+                const_cast<SwFrameFormat&>(rFrameFormat).UnlockModify();
             }
 
             // determine absolute anchor position considering layout directions.
@@ -334,7 +334,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
 */
 SwTwips SwAsCharAnchoredObjectPosition::_GetRelPosToBase(
                                             const SwTwips _nObjBoundHeight,
-                                            const SwFmtVertOrient& _rVert )
+                                            const SwFormatVertOrient& _rVert )
 {
     SwTwips nRelPosToBase = 0;
 
diff --git a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
index 547811040de6..9d022c5dce13 100644
--- a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
+++ b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
@@ -80,7 +80,7 @@ const SwLayoutFrm& SwEnvironmentOfAnchoredObject::GetVertEnvironmentLayoutFrm(
                 !pVertEnvironmentLayFrm->IsFlyFrm() &&
                 !pVertEnvironmentLayFrm->IsHeaderFrm() &&
                 !pVertEnvironmentLayFrm->IsFooterFrm() &&
-                !pVertEnvironmentLayFrm->IsFtnFrm() &&
+                !pVertEnvironmentLayFrm->IsFootnoteFrm() &&
                 !pVertEnvironmentLayFrm->IsPageBodyFrm() &&
                 !pVertEnvironmentLayFrm->IsPageFrm() )
         {
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index c037bf9de3c8..ab31474c1cc5 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -45,7 +45,7 @@
 using namespace objectpositioning;
 using namespace ::com::sun::star;
 
-SwToCntntAnchoredObjectPosition::SwToCntntAnchoredObjectPosition( SdrObject& _rDrawObj )
+SwToContentAnchoredObjectPosition::SwToContentAnchoredObjectPosition( SdrObject& _rDrawObj )
     : SwAnchoredObjectPosition ( _rDrawObj ),
       mpVertPosOrientFrm( 0 ),
       // #i26791#
@@ -57,36 +57,36 @@ SwToCntntAnchoredObjectPosition::SwToCntntAnchoredObjectPosition( SdrObject& _rD
       mnToCharTopOfLine( 0 )
 {}
 
-SwToCntntAnchoredObjectPosition::~SwToCntntAnchoredObjectPosition()
+SwToContentAnchoredObjectPosition::~SwToContentAnchoredObjectPosition()
 {}
 
-bool SwToCntntAnchoredObjectPosition::IsAnchoredToChar() const
+bool SwToContentAnchoredObjectPosition::IsAnchoredToChar() const
 {
     return mbAnchorToChar;
 }
 
-const SwFrm* SwToCntntAnchoredObjectPosition::ToCharOrientFrm() const
+const SwFrm* SwToContentAnchoredObjectPosition::ToCharOrientFrm() const
 {
     return mpToCharOrientFrm;
 }
 
-const SwRect* SwToCntntAnchoredObjectPosition::ToCharRect() const
+const SwRect* SwToContentAnchoredObjectPosition::ToCharRect() const
 {
     return mpToCharRect;
 }
 
 // #i22341#
-SwTwips SwToCntntAnchoredObjectPosition::ToCharTopOfLine() const
+SwTwips SwToContentAnchoredObjectPosition::ToCharTopOfLine() const
 {
     return mnToCharTopOfLine;
 }
 
-SwTxtFrm& SwToCntntAnchoredObjectPosition::GetAnchorTxtFrm() const
+SwTextFrm& SwToContentAnchoredObjectPosition::GetAnchorTextFrm() const
 {
-    OSL_ENSURE( GetAnchorFrm().ISA(SwTxtFrm),
-            "SwToCntntAnchoredObjectPosition::GetAnchorTxtFrm() - wrong anchor frame type" );
+    OSL_ENSURE( GetAnchorFrm().ISA(SwTextFrm),
+            "SwToContentAnchoredObjectPosition::GetAnchorTextFrm() - wrong anchor frame type" );
 
-    return static_cast<SwTxtFrm&>(GetAnchorFrm());
+    return static_cast<SwTextFrm&>(GetAnchorFrm());
 }
 
 // #i23512#
@@ -134,10 +134,10 @@ static bool lcl_DoesVertPosFits( const SwTwips _nRelPosY,
     return bVertPosFits;
 }
 
-void SwToCntntAnchoredObjectPosition::CalcPosition()
+void SwToContentAnchoredObjectPosition::CalcPosition()
 {
     // get format of object
-    const SwFrmFmt& rFrmFmt = GetFrmFmt();
+    const SwFrameFormat& rFrameFormat = GetFrameFormat();
 
     // declare and set <pFooter> to footer frame, if object is anchored
     // at a frame belonging to the footer.
@@ -156,11 +156,11 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
     }
 
     // determine left/right and its upper/lower spacing.
-    const SvxLRSpaceItem &rLR = rFrmFmt.GetLRSpace();
-    const SvxULSpaceItem &rUL = rFrmFmt.GetULSpace();
+    const SvxLRSpaceItem &rLR = rFrameFormat.GetLRSpace();
+    const SvxULSpaceItem &rUL = rFrameFormat.GetULSpace();
 
     // determine, if object has no surrounding.
-    const SwFmtSurround& rSurround = rFrmFmt.GetSurround();
+    const SwFormatSurround& rSurround = rFrameFormat.GetSurround();
     const bool bNoSurround = rSurround.GetSurround() == SURROUND_NONE;
     const bool bWrapThrough = rSurround.GetSurround() == SURROUND_THROUGHT;
 
@@ -170,11 +170,11 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
     // #i18732# - grow only, if object has to follow the text flow
     const bool bGrow = DoesObjFollowsTextFlow() &&
                        ( !GetAnchorFrm().IsInTab() ||
-                         !rFrmFmt.GetFrmSize().GetHeightPercent() );
+                         !rFrameFormat.GetFrmSize().GetHeightPercent() );
 
     // get text frame the object is anchored at
-    const SwTxtFrm& rAnchorTxtFrm = GetAnchorTxtFrm();
-    SWRECTFN( (&rAnchorTxtFrm) )
+    const SwTextFrm& rAnchorTextFrm = GetAnchorTextFrm();
+    SWRECTFN( (&rAnchorTextFrm) )
 
     const SwRect aObjBoundRect( GetAnchoredObj().GetObjRect() );
 
@@ -185,18 +185,18 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
 
     SwTwips nRelDiff = 0;
 
-    bool bMoveable = rAnchorTxtFrm.IsMoveable();
+    bool bMoveable = rAnchorTextFrm.IsMoveable();
 
     // determine frame the object position has to be oriented at.
-    const SwTxtFrm* pOrientFrm = &rAnchorTxtFrm;
-    const SwTxtFrm* pAnchorFrmForVertPos = &rAnchorTxtFrm;
+    const SwTextFrm* pOrientFrm = &rAnchorTextFrm;
+    const SwTextFrm* pAnchorFrmForVertPos = &rAnchorTextFrm;
     {
         // if object is at-character anchored, determine character-rectangle
         // and frame, position has to be oriented at.
-        mbAnchorToChar = (FLY_AT_CHAR == rFrmFmt.GetAnchor().GetAnchorId());
+        mbAnchorToChar = (FLY_AT_CHAR == rFrameFormat.GetAnchor().GetAnchorId());
         if ( mbAnchorToChar )
         {
-            const SwFmtAnchor& rAnch = rFrmFmt.GetAnchor();
+            const SwFormatAnchor& rAnch = rFrameFormat.GetAnchor();
             // #i26791# - use new object instance of <SwAnchoredObject>
             // Due to table break algorithm the character
             // rectangle can have no height. Thus, check also the width
@@ -214,7 +214,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                     // Get default for <mpVertPosOrientFrm>, if it's not set.
                     if ( !mpVertPosOrientFrm )
                     {
-                        mpVertPosOrientFrm = rAnchorTxtFrm.GetUpper();
+                        mpVertPosOrientFrm = rAnchorTextFrm.GetUpper();
                     }
                     return;
                 }
@@ -222,8 +222,8 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
             mpToCharRect = &(GetAnchoredObj().GetLastCharRect());
             // #i22341# - get top of line, in which the anchor character is.
             mnToCharTopOfLine = GetAnchoredObj().GetLastTopOfLine();
-            pOrientFrm = &(const_cast<SwTxtFrm&>(rAnchorTxtFrm).GetFrmAtOfst(
-                                rAnch.GetCntntAnchor()->nContent.GetIndex() ) );
+            pOrientFrm = &(const_cast<SwTextFrm&>(rAnchorTextFrm).GetFrmAtOfst(
+                                rAnch.GetContentAnchor()->nContent.GetIndex() ) );
             mpToCharOrientFrm = pOrientFrm;
         }
     }
@@ -233,7 +233,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
     {
 
         // determine vertical positioning and alignment attributes
-        SwFmtVertOrient aVert( rFrmFmt.GetVertOrient() );
+        SwFormatVertOrient aVert( rFrameFormat.GetVertOrient() );
 
         // #i18732# - determine layout frame for vertical
         // positions aligned to 'page areas'.
@@ -305,7 +305,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                     }
                     else
                     {
-                        OSL_FAIL( "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
+                        OSL_FAIL( "<SwToContentAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
                     }
                 }
                 break;
@@ -324,7 +324,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                     }
                     else
                     {
-                        OSL_FAIL( "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
+                        OSL_FAIL( "<SwToContentAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
                     }
                 }
                 break;
@@ -364,7 +364,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                     }
                     else
                     {
-                        OSL_FAIL( "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
+                        OSL_FAIL( "<SwToContentAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
                     }
                 }
                 break;
@@ -376,13 +376,13 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
             // the frame, the object is oriented at.
             // #i28701# - correction: adjust relative position,
             // only if the floating screen object has to follow the text flow.
-            if ( DoesObjFollowsTextFlow() && pOrientFrm != &rAnchorTxtFrm )
+            if ( DoesObjFollowsTextFlow() && pOrientFrm != &rAnchorTextFrm )
             {
                 // #i11860# - use new method <_GetTopForObjPos>
                 // to get top of frame for object positioning.
                 const SwTwips nTopOfOrient = _GetTopForObjPos( *pOrientFrm, fnRect, bVert );
                 nRelPosY += (*fnRect->fnYDiff)( nTopOfOrient,
-                                      _GetTopForObjPos( rAnchorTxtFrm, fnRect, bVert ) );
+                                      _GetTopForObjPos( rAnchorTextFrm, fnRect, bVert ) );
             }
 
             // #i42124# - capture object inside vertical
@@ -409,9 +409,9 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                 if ( nAttrRelPosY != aVert.GetPos() )
                 {
                     aVert.SetPos( nAttrRelPosY );
-                    const_cast<SwFrmFmt&>(rFrmFmt).LockModify();
-                    const_cast<SwFrmFmt&>(rFrmFmt).SetFmtAttr( aVert );
-                    const_cast<SwFrmFmt&>(rFrmFmt).UnlockModify();
+                    const_cast<SwFrameFormat&>(rFrameFormat).LockModify();
+                    const_cast<SwFrameFormat&>(rFrameFormat).SetFormatAttr( aVert );
+                    const_cast<SwFrameFormat&>(rFrameFormat).UnlockModify();
                 }
             }
 
@@ -433,21 +433,21 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
         // Determine upper of frame vertical position is oriented at.
         // #i28701# - determine 'virtual' anchor frame.
         // This frame is used in the following instead of the 'real' anchor
-        // frame <rAnchorTxtFrm> for the 'vertical' position in all cases.
+        // frame <rAnchorTextFrm> for the 'vertical' position in all cases.
         const SwLayoutFrm* pUpperOfOrientFrm = 0L;
         {
             // #i28701# - As long as the anchor frame is on the
             // same page as <pOrientFrm> and the vertical position isn't aligned
             // automatic at the anchor character or the top of the line of the
             // anchor character, the anchor frame determines the vertical position.
-            if ( &rAnchorTxtFrm == pOrientFrm ||
-                 ( rAnchorTxtFrm.FindPageFrm() == pOrientFrm->FindPageFrm() &&
+            if ( &rAnchorTextFrm == pOrientFrm ||
+                 ( rAnchorTextFrm.FindPageFrm() == pOrientFrm->FindPageFrm() &&
                    aVert.GetVertOrient() == text::VertOrientation::NONE &&
                    aVert.GetRelationOrient() != text::RelOrientation::CHAR &&
                    aVert.GetRelationOrient() != text::RelOrientation::TEXT_LINE ) )
             {
-                pUpperOfOrientFrm = rAnchorTxtFrm.GetUpper();
-                pAnchorFrmForVertPos = &rAnchorTxtFrm;
+                pUpperOfOrientFrm = rAnchorTextFrm.GetUpper();
+                pAnchorFrmForVertPos = &rAnchorTextFrm;
             }
             else
             {
@@ -516,9 +516,9 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                 {
                     // #i11860# - consider upper space amount of previous frame
                     SwTwips nTopMargin = (pAnchorFrmForVertPos->*fnRect->fnGetTopMargin)();
-                    if ( pAnchorFrmForVertPos->IsTxtFrm() )
+                    if ( pAnchorFrmForVertPos->IsTextFrm() )
                     {
-                        nTopMargin -= static_cast<const SwTxtFrm*>(pAnchorFrmForVertPos)->
+                        nTopMargin -= static_cast<const SwTextFrm*>(pAnchorFrmForVertPos)->
                             GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid();
                     }
                     nVertOffsetToFrmAnchorPos += nTopMargin;
@@ -588,7 +588,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                 SwTwips nAvail =
                     (*fnRect->fnYDiff)( (pUpperOfOrientFrm->*fnRect->fnGetPrtBottom)(),
                                         nTopOfAnch );
-                const bool bInFtn = pAnchorFrmForVertPos->IsInFtn();
+                const bool bInFootnote = pAnchorFrmForVertPos->IsInFootnote();
                 while ( nRelPosY )
                 {
                     // #i23512# - correction:
@@ -646,20 +646,20 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                             {
                                 // follow the text flow
                                 nRelPosY -= nAvail;
-                                MakePageType eMakePage = bInFtn ? MAKEPAGE_NONE
+                                MakePageType eMakePage = bInFootnote ? MAKEPAGE_NONE
                                                                 : MAKEPAGE_APPEND;
                                 const bool bInSct = pUpperOfOrientFrm->IsInSct();
                                 if( bInSct )
                                     eMakePage = MAKEPAGE_NOSECTION;
 
                                 const SwLayoutFrm* pTmp =
-                                    pUpperOfOrientFrm->GetLeaf( eMakePage, true, &rAnchorTxtFrm );
+                                    pUpperOfOrientFrm->GetLeaf( eMakePage, true, &rAnchorTextFrm );
                                 if ( pTmp &&
                                      ( !bInSct ||
                                        pUpperOfOrientFrm->FindSctFrm()->IsAnFollow( pTmp->FindSctFrm() ) ) )
                                 {
                                     pUpperOfOrientFrm = pTmp;
-                                    bMoveable = rAnchorTxtFrm.IsMoveable( pUpperOfOrientFrm );
+                                    bMoveable = rAnchorTextFrm.IsMoveable( pUpperOfOrientFrm );
                                     SWREFRESHFN( pUpperOfOrientFrm )
                                     nAvail = (pUpperOfOrientFrm->Prt().*fnRect->fnGetHeight)();
                                 }
@@ -681,7 +681,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                                     else
                                     {
 #if OSL_DEBUG_LEVEL > 1
-                                        OSL_FAIL( "<SwToCntntAnchoredObjectPosition::CalcPosition()> - code under investigation by OD, please inform OD about this assertion!" );
+                                        OSL_FAIL( "<SwToContentAnchoredObjectPosition::CalcPosition()> - code under investigation by OD, please inform OD about this assertion!" );
 #endif
                                         nRelDiff = nRelPosY;
                                         nRelPosY = 0;
@@ -760,7 +760,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
             // consider section frame for grow in online layout and
             // consider page alignment for grow in table.
             SwLayoutFrm* pLayoutFrmToGrow = 0L;
-            if ( bBrowse && rAnchorTxtFrm.IsMoveable() )
+            if ( bBrowse && rAnchorTextFrm.IsMoveable() )
             {
                 if ( pUpperOfOrientFrm->IsInSct() )
                 {
@@ -779,7 +779,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                                     const_cast<SwLayoutFrm*>(pUpperOfOrientFrm);
                 }
             }
-            else if ( rAnchorTxtFrm.IsInTab() && bGrow )
+            else if ( rAnchorTextFrm.IsInTab() && bGrow )
             {
                 pLayoutFrmToGrow = const_cast<SwLayoutFrm*>(pUpperOfOrientFrm);
             }
@@ -805,7 +805,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                 // and has no follow, the table frame is notified,
                 // that the object doesn't fit into the table cell.
                 // Adjustment of position isn't needed in this case.
-                if ( pOrientFrm == &rAnchorTxtFrm &&
+                if ( pOrientFrm == &rAnchorTextFrm &&
                      !pOrientFrm->GetFollow() &&
                      !pOrientFrm->GetIndPrev() )
                 {
@@ -852,7 +852,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                     nDist = (GetAnchoredObj().GetObjRect().*fnRect->fnBottomDist)(
                               (pUpperOfOrientFrm->*fnRect->fnGetPrtBottom)() );
                     if ( nDist < 0 &&
-                         pOrientFrm == &rAnchorTxtFrm && !pOrientFrm->GetIndPrev() )
+                         pOrientFrm == &rAnchorTextFrm && !pOrientFrm->GetIndPrev() )
                     {
                         const_cast<SwTabFrm*>(pOrientFrm->FindTabFrm())
                                                         ->SetDoesObjsFit( false );
@@ -862,7 +862,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
             else
             {
                 // follow text flow
-                const bool bInFtn = rAnchorTxtFrm.IsInFtn();
+                const bool bInFootnote = rAnchorTextFrm.IsInFootnote();
                 while( bMoveable && nDist < 0 )
                 {
                     bool bInSct = pUpperOfOrientFrm->IsInSct();
@@ -890,12 +890,12 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                     const SwLayoutFrm* pNextLay = pUpperOfOrientFrm->GetLeaf(
                                     ( bInSct
                                       ? MAKEPAGE_NOSECTION
-                                      : ( bInFtn ? MAKEPAGE_NONE : MAKEPAGE_APPEND ) ),
-                                    true, &rAnchorTxtFrm );
+                                      : ( bInFootnote ? MAKEPAGE_NONE : MAKEPAGE_APPEND ) ),
+                                    true, &rAnchorTextFrm );
                     // correction:
                     // If anchor is in footnote and proposed next layout environment
                     // isn't a footnote frame, object can't follow the text flow
-                    if ( bInFtn && pNextLay && !pNextLay->IsFtnFrm() )
+                    if ( bInFootnote && pNextLay && !pNextLay->IsFootnoteFrm() )
                     {
                         pNextLay = 0L;
                     }
@@ -915,7 +915,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                                 aRelPos.Y() = nTmpRelPosY;
                             pUpperOfOrientFrm = pNextLay;
                             SWREFRESHFN( pUpperOfOrientFrm )
-                            bMoveable = rAnchorTxtFrm.IsMoveable( pUpperOfOrientFrm );
+                            bMoveable = rAnchorTextFrm.IsMoveable( pUpperOfOrientFrm );
                             if( bVertX )
                             {
                                 // --> OD 2009-08-31 #mongolianlayout#
@@ -975,7 +975,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
     // determine 'horizontal' position
     {
         // determine horizontal positioning and alignment attributes
-        SwFmtHoriOrient aHori( rFrmFmt.GetHoriOrient() );
+        SwFormatHoriOrient aHori( rFrameFormat.GetHoriOrient() );
 
         // set calculated vertical position in order to determine correct
         // frame, the horizontal position is oriented at.
@@ -1031,9 +1031,9 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                  aHori.GetPos() != nAttrRelPosX )
             {
                 aHori.SetPos( nAttrRelPosX );
-                const_cast<SwFrmFmt&>(rFrmFmt).LockModify();
-                const_cast<SwFrmFmt&>(rFrmFmt).SetFmtAttr( aHori );
-                const_cast<SwFrmFmt&>(rFrmFmt).UnlockModify();
+                const_cast<SwFrameFormat&>(rFrameFormat).LockModify();
+                const_cast<SwFrameFormat&>(rFrameFormat).SetFormatAttr( aHori );
+                const_cast<SwFrameFormat&>(rFrameFormat).UnlockModify();
             }
         }
     }
@@ -1052,12 +1052,12 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
         {
             GetAnchoredObj().SetObjLeft( nTopOfAnch + aRelPos.X() );
         }
-        GetAnchoredObj().SetObjTop( rAnchorTxtFrm.Frm().Top() +
+        GetAnchoredObj().SetObjTop( rAnchorTextFrm.Frm().Top() +
                                     aRelPos.Y() );
     }
     else
     {
-        GetAnchoredObj().SetObjLeft( rAnchorTxtFrm.Frm().Left() +
+        GetAnchoredObj().SetObjLeft( rAnchorTextFrm.Frm().Left() +
                                      aRelPos.X() );
         GetAnchoredObj().SetObjTop( nTopOfAnch + aRelPos.Y() );
     }
@@ -1069,7 +1069,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
 /**
  * Determine frame for horizontal position
  */
-const SwFrm& SwToCntntAnchoredObjectPosition::_GetHoriVirtualAnchor(
+const SwFrm& SwToContentAnchoredObjectPosition::_GetHoriVirtualAnchor(
                                         const SwLayoutFrm& _rProposedFrm ) const
 {
     const SwFrm* pHoriVirtAnchFrm = &_rProposedFrm;
@@ -1080,8 +1080,8 @@ const SwFrm& SwToCntntAnchoredObjectPosition::_GetHoriVirtualAnchor(
     const SwFrm* pFrm = _rProposedFrm.Lower();
     while ( pFrm )
     {
-        if ( pFrm->IsCntntFrm() &&
-             GetAnchorTxtFrm().IsAnFollow( static_cast<const SwCntntFrm*>(pFrm) ) )
+        if ( pFrm->IsContentFrm() &&
+             GetAnchorTextFrm().IsAnFollow( static_cast<const SwContentFrm*>(pFrm) ) )
         {
             pHoriVirtAnchFrm = pFrm;
             break;
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
index fe23cfed5df2..923346a299a4 100644
--- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
@@ -54,18 +54,18 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
 
     SWRECTFN( (&GetAnchorFrm()) );
 
-    const SwFrmFmt& rFrmFmt = GetFrmFmt();
-    const SvxLRSpaceItem &rLR = rFrmFmt.GetLRSpace();
-    const SvxULSpaceItem &rUL = rFrmFmt.GetULSpace();
+    const SwFrameFormat& rFrameFormat = GetFrameFormat();
+    const SvxLRSpaceItem &rLR = rFrameFormat.GetLRSpace();
+    const SvxULSpaceItem &rUL = rFrameFormat.GetULSpace();
 
-    const bool bFlyAtFly = FLY_AT_FLY == rFrmFmt.GetAnchor().GetAnchorId();
+    const bool bFlyAtFly = FLY_AT_FLY == rFrameFormat.GetAnchor().GetAnchorId();
 
     // determine position.
     // 'vertical' and 'horizontal' position are calculated separately
     Point aRelPos;
 
     // calculate 'vertical' position
-    SwFmtVertOrient aVert( rFrmFmt.GetVertOrient() );
+    SwFormatVertOrient aVert( rFrameFormat.GetVertOrient() );
     {
         // to-frame anchored objects are *only* vertical positioned centered or
         // bottom, if its wrap mode is 'throught' and its anchor frame has fixed
@@ -74,7 +74,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
         if ( ( bFlyAtFly &&
                ( eVertOrient == text::VertOrientation::CENTER ||
                  eVertOrient == text::VertOrientation::BOTTOM ) &&
-             SURROUND_THROUGHT != rFrmFmt.GetSurround().GetSurround() &&
+             SURROUND_THROUGHT != rFrameFormat.GetSurround().GetSurround() &&
              !GetAnchorFrm().HasFixSize() ) )
         {
             eVertOrient = text::VertOrientation::TOP;
@@ -94,9 +94,9 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
                  aVert.GetPos() != nAttrRelPosY )
             {
                 aVert.SetPos( nAttrRelPosY );
-                const_cast<SwFrmFmt&>(rFrmFmt).LockModify();
-                const_cast<SwFrmFmt&>(rFrmFmt).SetFmtAttr( aVert );
-                const_cast<SwFrmFmt&>(rFrmFmt).UnlockModify();
+                const_cast<SwFrameFormat&>(rFrameFormat).LockModify();
+                const_cast<SwFrameFormat&>(rFrameFormat).SetFormatAttr( aVert );
+                const_cast<SwFrameFormat&>(rFrameFormat).UnlockModify();
             }
         }
 
@@ -137,7 +137,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
     } // end of determination of vertical position
 
     // calculate 'horizontal' position
-    SwFmtHoriOrient aHori( rFrmFmt.GetHoriOrient() );
+    SwFormatHoriOrient aHori( rFrameFormat.GetHoriOrient() );
     {
         // consider toggle of horizontal position for even pages.
         const bool bToggle = aHori.IsPosToggle() &&
@@ -215,9 +215,9 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
                  aHori.GetPos() != nAttrRelPosX )
             {
                 aHori.SetPos( nAttrRelPosX );
-                const_cast<SwFrmFmt&>(rFrmFmt).LockModify();
-                const_cast<SwFrmFmt&>(rFrmFmt).SetFmtAttr( aHori );
-                const_cast<SwFrmFmt&>(rFrmFmt).UnlockModify();
+                const_cast<SwFrameFormat&>(rFrameFormat).LockModify();
+                const_cast<SwFrameFormat&>(rFrameFormat).SetFormatAttr( aHori );
+                const_cast<SwFrameFormat&>(rFrameFormat).UnlockModify();
             }
         }
     } // end of determination of horizontal position
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index d69ddd98c745..ddedf7716b32 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -209,9 +209,9 @@ void SwEmbedObjectLink::Closed()
 
 SwOLENode::SwOLENode( const SwNodeIndex &rWhere,
                     const svt::EmbeddedObjectRef& xObj,
-                    SwGrfFmtColl *pGrfColl,
+                    SwGrfFormatColl *pGrfColl,
                     SwAttrSet* pAutoAttr ) :
-    SwNoTxtNode( rWhere, ND_OLENODE, pGrfColl, pAutoAttr ),
+    SwNoTextNode( rWhere, ND_OLENODE, pGrfColl, pAutoAttr ),
     aOLEObj( xObj ),
     bOLESizeInvalid( false ),
     mpObjectLink( NULL )
@@ -222,9 +222,9 @@ SwOLENode::SwOLENode( const SwNodeIndex &rWhere,
 SwOLENode::SwOLENode( const SwNodeIndex &rWhere,
                     const OUString &rString,
                     sal_Int64 nAspect,
-                    SwGrfFmtColl *pGrfColl,
+                    SwGrfFormatColl *pGrfColl,
                     SwAttrSet* pAutoAttr ) :
-    SwNoTxtNode( rWhere, ND_OLENODE, pGrfColl, pAutoAttr ),
+    SwNoTextNode( rWhere, ND_OLENODE, pGrfColl, pAutoAttr ),
     aOLEObj( rString, nAspect ),
     bOLESizeInvalid( false ),
     mpObjectLink( NULL )
@@ -244,7 +244,7 @@ const Graphic* SwOLENode::GetGraphic()
     return 0;
 }
 
-SwCntntNode *SwOLENode::SplitCntntNode( const SwPosition & )
+SwContentNode *SwOLENode::SplitContentNode( const SwPosition & )
 {
     // Multiply OLE objects?
     OSL_FAIL( "OleNode: can't split." );
@@ -336,7 +336,7 @@ bool SwOLENode::SavePersistentData()
             */
             bool bKeepObjectToTempStorage = true;
             uno::Reference < embed::XEmbeddedObject > xIP = GetOLEObj().GetOleRef();
-            if (IsChart() && !sChartTblName.isEmpty()
+            if (IsChart() && !sChartTableName.isEmpty()
                 && svt::EmbeddedObjectRef::TryRunningState(xIP))
             {
                 uno::Reference< chart2::XChartDocument > xChart( xIP->getComponent(), UNO_QUERY );
@@ -369,7 +369,7 @@ bool SwOLENode::SavePersistentData()
 
 SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere,
                     const svt::EmbeddedObjectRef& xObj,
-                                    SwGrfFmtColl* pGrfColl,
+                                    SwGrfFormatColl* pGrfColl,
                                     SwAttrSet* pAutoAttr )
 {
     OSL_ENSURE( pGrfColl,"SwNodes::MakeOLENode: Formatpointer is 0." );
@@ -391,7 +391,7 @@ SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere,
 }
 
 SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere,
-    const OUString &rName, sal_Int64 nAspect, SwGrfFmtColl* pGrfColl, SwAttrSet* pAutoAttr )
+    const OUString &rName, sal_Int64 nAspect, SwGrfFormatColl* pGrfColl, SwAttrSet* pAutoAttr )
 {
     OSL_ENSURE( pGrfColl,"SwNodes::MakeOLENode: Formatpointer is 0." );
 
@@ -417,7 +417,7 @@ Size SwOLENode::GetTwipSize() const
     return const_cast<SwOLENode*>(this)->aOLEObj.GetObject().GetSize( &aMapMode );
 }
 
-SwCntntNode* SwOLENode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
+SwContentNode* SwOLENode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
 {
     // If there's already a SvPersist instance, we use it
     SfxObjectShell* pPersistShell = pDoc->GetPersist();
@@ -443,10 +443,10 @@ SwCntntNode* SwOLENode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
         OUString());
 
     SwOLENode* pOLENd = pDoc->GetNodes().MakeOLENode( rIdx, aNewName, GetAspect(),
-                                    pDoc->GetDfltGrfFmtColl(),
+                                    pDoc->GetDfltGrfFormatColl(),
                                     const_cast<SwAttrSet*>(GetpSwAttrSet()) );
 
-    pOLENd->SetChartTblName( GetChartTblName() );
+    pOLENd->SetChartTableName( GetChartTableName() );
     pOLENd->SetTitle( GetTitle() );
     pOLENd->SetDescription( GetDescription() );
     pOLENd->SetContour( HasContour(), HasAutomaticContour() );
@@ -464,15 +464,15 @@ bool SwOLENode::IsInGlobalDocSection() const
     sal_uLong nEndExtraIdx = GetNodes().GetEndOfExtras().GetIndex();
     const SwNode* pAnchorNd = this;
     do {
-        SwFrmFmt* pFlyFmt = pAnchorNd->GetFlyFmt();
-        if( !pFlyFmt )
+        SwFrameFormat* pFlyFormat = pAnchorNd->GetFlyFormat();
+        if( !pFlyFormat )
             return false;
 
-        const SwFmtAnchor& rAnchor = pFlyFmt->GetAnchor();
-        if( !rAnchor.GetCntntAnchor() )
+        const SwFormatAnchor& rAnchor = pFlyFormat->GetAnchor();
+        if( !rAnchor.GetContentAnchor() )
             return false;
 
-        pAnchorNd = &rAnchor.GetCntntAnchor()->nNode.GetNode();
+        pAnchorNd = &rAnchor.GetContentAnchor()->nNode.GetNode();
     } while( pAnchorNd->GetIndex() < nEndExtraIdx );
 
     const SwSectionNode* pSectNd = pAnchorNd->FindSectionNode();
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index 1c8657d66c9c..1796f26d7447 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -43,54 +43,54 @@
 
 using namespace ::com::sun::star;
 
-TYPEINIT2_AUTOFACTORY( SwFmtDrop, SfxPoolItem, SwClient);
+TYPEINIT2_AUTOFACTORY( SwFormatDrop, SfxPoolItem, SwClient);
 TYPEINIT1_AUTOFACTORY( SwRegisterItem, SfxBoolItem);
 TYPEINIT1_AUTOFACTORY( SwNumRuleItem, SfxStringItem);
 TYPEINIT1_AUTOFACTORY( SwParaConnectBorderItem, SfxBoolItem);
 
-SwFmtDrop::SwFmtDrop()
+SwFormatDrop::SwFormatDrop()
     : SfxPoolItem( RES_PARATR_DROP ),
     SwClient( 0 ),
     pDefinedIn( 0 ),
     nDistance( 0 ),
-    nReadFmt( USHRT_MAX ),
+    nReadFormat( USHRT_MAX ),
     nLines( 0 ),
     nChars( 0 ),
     bWholeWord( false )
 {
 }
 
-SwFmtDrop::SwFmtDrop( const SwFmtDrop &rCpy )
+SwFormatDrop::SwFormatDrop( const SwFormatDrop &rCpy )
     : SfxPoolItem( RES_PARATR_DROP ),
     SwClient( rCpy.GetRegisteredInNonConst() ),
     pDefinedIn( 0 ),
     nDistance( rCpy.GetDistance() ),
-    nReadFmt( rCpy.nReadFmt ),
+    nReadFormat( rCpy.nReadFormat ),
     nLines( rCpy.GetLines() ),
     nChars( rCpy.GetChars() ),
     bWholeWord( rCpy.GetWholeWord() )
 {
 }
 
-SwFmtDrop::~SwFmtDrop()
+SwFormatDrop::~SwFormatDrop()
 {
 }
 
-void SwFmtDrop::SetCharFmt( SwCharFmt *pNew )
+void SwFormatDrop::SetCharFormat( SwCharFormat *pNew )
 {
     // Rewire
     if ( GetRegisteredIn() )
         GetRegisteredInNonConst()->Remove( this );
     if(pNew)
         pNew->Add( this );
-    nReadFmt = USHRT_MAX;
+    nReadFormat = USHRT_MAX;
 }
 
-void SwFmtDrop::Modify( const SfxPoolItem*, const SfxPoolItem * )
+void SwFormatDrop::Modify( const SfxPoolItem*, const SfxPoolItem * )
 {
     if( pDefinedIn )
     {
-        if( !pDefinedIn->ISA( SwFmt ))
+        if( !pDefinedIn->ISA( SwFormat ))
             pDefinedIn->ModifyNotification( this, this );
         else if( pDefinedIn->HasWriterListeners() &&
                 !pDefinedIn->IsModifyLocked() )
@@ -102,28 +102,28 @@ void SwFmtDrop::Modify( const SfxPoolItem*, const SfxPoolItem * )
     }
 }
 
-bool SwFmtDrop::GetInfo( SfxPoolItem& ) const
+bool SwFormatDrop::GetInfo( SfxPoolItem& ) const
 {
     return true; // Continue
 }
 
-bool SwFmtDrop::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatDrop::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return ( nLines == static_cast<const SwFmtDrop&>(rAttr).GetLines() &&
-             nChars == static_cast<const SwFmtDrop&>(rAttr).GetChars() &&
-             nDistance ==  static_cast<const SwFmtDrop&>(rAttr).GetDistance() &&
-             bWholeWord == static_cast<const SwFmtDrop&>(rAttr).GetWholeWord() &&
-             GetCharFmt() == static_cast<const SwFmtDrop&>(rAttr).GetCharFmt() &&
-             pDefinedIn == static_cast<const SwFmtDrop&>(rAttr).pDefinedIn );
+    return ( nLines == static_cast<const SwFormatDrop&>(rAttr).GetLines() &&
+             nChars == static_cast<const SwFormatDrop&>(rAttr).GetChars() &&
+             nDistance ==  static_cast<const SwFormatDrop&>(rAttr).GetDistance() &&
+             bWholeWord == static_cast<const SwFormatDrop&>(rAttr).GetWholeWord() &&
+             GetCharFormat() == static_cast<const SwFormatDrop&>(rAttr).GetCharFormat() &&
+             pDefinedIn == static_cast<const SwFormatDrop&>(rAttr).pDefinedIn );
 }
 
-SfxPoolItem* SwFmtDrop::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatDrop::Clone( SfxItemPool* ) const
 {
-    return new SwFmtDrop( *this );
+    return new SwFormatDrop( *this );
 }
 
-bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     switch(nMemberId&~CONVERT_TWIPS)
     {
@@ -145,9 +145,9 @@ bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
         case MID_DROPCAP_CHAR_STYLE_NAME :
         {
             OUString sName;
-            if(GetCharFmt())
+            if(GetCharFormat())
                 sName = SwStyleNameMapper::GetProgName(
-                        GetCharFmt()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
+                        GetCharFormat()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
             rVal <<= sName;
         }
         break;
@@ -155,7 +155,7 @@ bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return true;
 }
 
-bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     switch(nMemberId&~CONVERT_TWIPS)
     {
diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx
index 0ff31eff2074..cb50b2080016 100644
--- a/sw/source/core/sw3io/sw3convert.cxx
+++ b/sw/source/core/sw3io/sw3convert.cxx
@@ -57,7 +57,7 @@ struct OldFormats
     sal_uInt16              nOldFormat;
 };
 
-static const OldFormats aOldDateFmt40[] =
+static const OldFormats aOldDateFormat40[] =
 {
     // Date fields
     { NF_DATE_SYSTEM_SHORT,         DFF_SSYS },     // Short system date
@@ -81,7 +81,7 @@ static const OldFormats aOldDateFmt40[] =
     { NF_NUMERIC_START,             0  }            // End of table
 };
 
-static const OldFormats aOldDateFmt30[] =
+static const OldFormats aOldDateFormat30[] =
 {
     // Date fields
     { NF_DATE_SYSTEM_SHORT,         DFF_SSYS },     // Short system date
@@ -105,7 +105,7 @@ static const OldFormats aOldDateFmt30[] =
     { NF_NUMERIC_START,             0  }            // End of table
 };
 
-static const OldFormats aOldTimeFmt[] =
+static const OldFormats aOldTimeFormat[] =
 {
     // Time fields
     { NF_TIME_HHMMSS,               TF_SYSTEM },    // System time
@@ -115,7 +115,7 @@ static const OldFormats aOldTimeFmt[] =
     { NF_NUMERIC_START,             0 }             // End of table
 };
 
-static const OldFormats aOldGetSetExpFmt40[] =
+static const OldFormats aOldGetSetExpFormat40[] =
 {
     { NF_TEXT,                      VVF_CMD },      // Show command
     { NF_TEXT,                      VVF_INVISIBLE },// Invisible
@@ -142,7 +142,7 @@ static const OldFormats aOldGetSetExpFmt40[] =
     { NF_NUMERIC_START,                 0  }        // End of table
 };
 
-static const OldFormats aOldGetSetExpFmt30[] =
+static const OldFormats aOldGetSetExpFormat30[] =
 {
     { NF_TEXT,                      VVF_CMD },      // Show command
     { NF_TEXT,                      VVF_INVISIBLE },// Invisible
@@ -170,10 +170,10 @@ static const OldFormats aOldGetSetExpFmt30[] =
 };
 
 void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
-                                sal_uInt16& rSubType, sal_uLong &rFmt,
+                                sal_uInt16& rSubType, sal_uLong &rFormat,
                                 sal_uInt16 nVersion )
 {
-    const OldFormats *pOldFmt = 0L;
+    const OldFormats *pOldFormat = 0L;
 
     switch( rWhich )
     {
@@ -185,8 +185,8 @@ void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
                 if( RES_FIXDATEFLD == rWhich )
                     rSubType |= FIXEDFLD;
                 rWhich = RES_DATETIMEFLD;
-                pOldFmt = nVersion<SWG_INETBROWSER ? aOldDateFmt30
-                                                   : aOldDateFmt40;
+                pOldFormat = nVersion<SWG_INETBROWSER ? aOldDateFormat30
+                                                   : aOldDateFormat40;
             }
             break;
 
@@ -198,7 +198,7 @@ void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
                 if( RES_FIXTIMEFLD == rWhich )
                     rSubType |= FIXEDFLD;
                 rWhich = RES_DATETIMEFLD;
-                pOldFmt = aOldTimeFmt;
+                pOldFormat = aOldTimeFormat;
             }
             break;
 
@@ -206,8 +206,8 @@ void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
             if( nVersion < SWG_NEWFIELDS )
             {
                 rSubType = nsSwExtendedSubType::SUB_OWN_FMT;
-                pOldFmt = nVersion<SWG_INETBROWSER ? aOldGetSetExpFmt30
-                                                    : aOldGetSetExpFmt40;
+                pOldFormat = nVersion<SWG_INETBROWSER ? aOldGetSetExpFormat30
+                                                    : aOldGetSetExpFormat40;
             }
             break;
 
@@ -217,15 +217,15 @@ void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
         case RES_USERFLD:
             if( nVersion < SWG_NEWFIELDS )
             {
-                if( rFmt == VVF_INVISIBLE )
+                if( rFormat == VVF_INVISIBLE )
                 {
                     rSubType = nsSwExtendedSubType::SUB_INVISIBLE;
-                    rFmt = 0;
+                    rFormat = 0;
                 }
-                else if( rFmt == VVF_CMD )
+                else if( rFormat == VVF_CMD )
                 {
                     rSubType = nsSwExtendedSubType::SUB_CMD;
-                    rFmt = 0;
+                    rFormat = 0;
                 }
                 else
                 {
@@ -234,42 +234,42 @@ void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
                     // in the subtype; if it's a valid format in the first
                     // place.
                     if( RES_SETEXPFLD==rWhich &&
-                        /*rFmt >= (sal_uInt16)SVX_NUM_CHARS_UPPER_LETTER && always true*/
-                        rFmt <= (sal_uInt16)SVX_NUM_BITMAP )
+                        /*rFormat >= (sal_uInt16)SVX_NUM_CHARS_UPPER_LETTER && always true*/
+                        rFormat <= (sal_uInt16)SVX_NUM_BITMAP )
                     {
-                        rSubType = (sal_uInt16)rFmt;
+                        rSubType = (sal_uInt16)rFormat;
                     }
-                    pOldFmt = nVersion<SWG_INETBROWSER ? aOldGetSetExpFmt30
-                                                       : aOldGetSetExpFmt40;
+                    pOldFormat = nVersion<SWG_INETBROWSER ? aOldGetSetExpFormat30
+                                                       : aOldGetSetExpFormat40;
                 }
             }
             break;
         case RES_DOCINFOFLD:
             if( nVersion < SWG_NEWFIELDS )
             {
-                switch( rFmt )
+                switch( rFormat )
                 {
                 case RF_AUTHOR: rSubType = DI_SUB_AUTHOR;   break;
                 case RF_TIME:   rSubType = DI_SUB_TIME; break;
                 case RF_DATE:   rSubType = DI_SUB_DATE; break;
                 case RF_ALL:    rSubType = DI_SUB_DATE; break;
                 }
-                rFmt = 0;
+                rFormat = 0;
             }
             break;
     }
 
-    if( pOldFmt )
+    if( pOldFormat )
     {
         SvNumberFormatter *pFormatter = rDoc.GetNumberFormatter();
         sal_uInt16 i = 0;
 
-        while( pOldFmt[i].eFormatIdx != NF_NUMERIC_START ||
-               pOldFmt[i].nOldFormat)
+        while( pOldFormat[i].eFormatIdx != NF_NUMERIC_START ||
+               pOldFormat[i].nOldFormat)
         {
-            if( rFmt == pOldFmt[i].nOldFormat )
+            if( rFormat == pOldFormat[i].nOldFormat )
             {
-                rFmt = pFormatter->GetFormatIndex(pOldFmt[i].eFormatIdx, LANGUAGE_SYSTEM);
+                rFormat = pFormatter->GetFormatIndex(pOldFormat[i].eFormatIdx, LANGUAGE_SYSTEM);
                 break;
             }
             i++;
diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index 37315e3cb9db..1a236fabdf02 100644
--- a/sw/source/core/sw3io/swacorr.cxx
+++ b/sw/source/core/sw3io/swacorr.cxx
@@ -95,7 +95,7 @@ bool SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >&  rStg,
 SwAutoCorrect::SwAutoCorrect( const SvxAutoCorrect& rACorr )
     : SvxAutoCorrect( rACorr )
 {
-    SwEditShell::SetAutoFmtFlags(&GetSwFlags());
+    SwEditShell::SetAutoFormatFlags(&GetSwFlags());
 }
 
 SwAutoCorrect::~SwAutoCorrect()
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index ab2b0df98d36..a9fec82f46a7 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -145,14 +145,14 @@ void SwXMLTextBlocks::ClearDoc()
     pDocShell->ClearEmbeddedObjects();
 }
 
-void SwXMLTextBlocks::AddName( const OUString& rShort, const OUString& rLong, bool bOnlyTxt )
+void SwXMLTextBlocks::AddName( const OUString& rShort, const OUString& rLong, bool bOnlyText )
 {
     aPackageName = GeneratePackageName( rShort );
-    AddName(rShort, rLong, aPackageName, bOnlyTxt);
+    AddName(rShort, rLong, aPackageName, bOnlyText);
 }
 
 void SwXMLTextBlocks::AddName( const OUString& rShort, const OUString& rLong,
-                               const OUString& rPackageName, bool bOnlyTxt )
+                               const OUString& rPackageName, bool bOnlyText )
 {
     sal_uInt16 nIdx = GetIndex( rShort );
     if (nIdx != USHRT_MAX)
@@ -161,8 +161,8 @@ void SwXMLTextBlocks::AddName( const OUString& rShort, const OUString& rLong,
         aNames.erase( aNames.begin() + nIdx );
     }
     SwBlockName* pNew = new SwBlockName( rShort, rLong, rPackageName );
-    pNew->bIsOnlyTxtFlagInit = true;
-    pNew->bIsOnlyTxt = bOnlyTxt;
+    pNew->bIsOnlyTextFlagInit = true;
+    pNew->bIsOnlyText = bOnlyText;
     aNames.insert( pNew );
     bInfoChanged = true;
 }
@@ -501,7 +501,7 @@ void SwXMLTextBlocks::SetIsTextOnly( const OUString& rShort, bool bNewValue )
 {
     sal_uInt16 nIdx = GetIndex ( rShort );
     if (nIdx != USHRT_MAX)
-        aNames[nIdx]->bIsOnlyTxt = bNewValue;
+        aNames[nIdx]->bIsOnlyText = bNewValue;
 }
 
 bool SwXMLTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const
@@ -510,13 +510,13 @@ bool SwXMLTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const
     bool bRet = false;
     if (nIdx != USHRT_MAX)
     {
-        bRet = aNames[nIdx]->bIsOnlyTxt;
+        bRet = aNames[nIdx]->bIsOnlyText;
     }
     return bRet;
 }
 bool SwXMLTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const
 {
-    return aNames[nIdx]->bIsOnlyTxt;
+    return aNames[nIdx]->bIsOnlyText;
 }
 
 bool SwXMLTextBlocks::IsFileUCBStorage( const OUString & rFileName)
@@ -581,20 +581,20 @@ sal_uLong SwXMLTextBlocks::PutText( const OUString& rShort, const OUString& rNam
 
 void SwXMLTextBlocks::MakeBlockText( const OUString& rText )
 {
-    SwTxtNode* pTxtNode = pDoc->GetNodes()[ pDoc->GetNodes().GetEndOfContent().
-                                        GetIndex() - 1 ]->GetTxtNode();
-    if( pTxtNode->GetTxtColl() == pDoc->GetDfltTxtFmtColl() )
-        pTxtNode->ChgFmtColl( pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+    SwTextNode* pTextNode = pDoc->GetNodes()[ pDoc->GetNodes().GetEndOfContent().
+                                        GetIndex() - 1 ]->GetTextNode();
+    if( pTextNode->GetTextColl() == pDoc->GetDfltTextFormatColl() )
+        pTextNode->ChgFormatColl( pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
 
     sal_Int32 nPos = 0;
     do
     {
         if ( nPos )
         {
-            pTxtNode = static_cast<SwTxtNode*>(pTxtNode->AppendNode( SwPosition( *pTxtNode ) ));
+            pTextNode = static_cast<SwTextNode*>(pTextNode->AppendNode( SwPosition( *pTextNode ) ));
         }
-        SwIndex aIdx( pTxtNode );
-        pTxtNode->InsertText( rText.getToken( 0, '\015', nPos ), aIdx );
+        SwIndex aIdx( pTextNode );
+        pTextNode->InsertText( rText.getToken( 0, '\015', nPos ), aIdx );
     } while ( -1 != nPos );
 }
 
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 2a96fba8b8b4..17f0cbf0e04e 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -158,7 +158,7 @@ const struct SvEventDescription aAutotextEvents[] =
 };
 
 sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
-                                      SvxMacroTableDtor& rMacroTbl,
+                                      SvxMacroTableDtor& rMacroTable,
                                       bool bFileAlreadyOpen )
 {
     // set current auto text
@@ -252,7 +252,7 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
 
                     // and finally, copy macro into table
                     if (0 == nRet)
-                        pDescriptor->copyMacrosIntoTable(rMacroTbl);
+                        pDescriptor->copyMacrosIntoTable(rMacroTable);
                 }
                 else
                     nRet = ERR_SWG_READ_ERROR;
@@ -519,7 +519,7 @@ void SwXMLTextBlocks::WriteInfo()
 
 sal_uLong SwXMLTextBlocks::SetMacroTable(
     sal_uInt16 nIdx,
-    const SvxMacroTableDtor& rMacroTbl,
+    const SvxMacroTableDtor& rMacroTable,
     bool bFileAlreadyOpen )
 {
     // set current autotext
@@ -576,7 +576,7 @@ sal_uLong SwXMLTextBlocks::SetMacroTable(
 
             // construct events object
             uno::Reference<XNameAccess> xEvents =
-                new SvMacroTableEventDescriptor(rMacroTbl,aAutotextEvents);
+                new SvMacroTableEventDescriptor(rMacroTable,aAutotextEvents);
 
             // prepare arguments (prepend doc handler to given arguments)
             Sequence<Any> aParams(2);
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index f678f7a55234..333cc1edad84 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -57,7 +57,7 @@ sal_uInt16 SwImpBlocks::Hash( const OUString& r )
 
 SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong )
     : aShort( rShort ), aLong( rLong ), aPackageName (rShort),
-    bIsOnlyTxtFlagInit( false ), bIsOnlyTxt( false ), bInPutMuchBlocks(false)
+    bIsOnlyTextFlagInit( false ), bIsOnlyText( false ), bInPutMuchBlocks(false)
 {
     nHashS = SwImpBlocks::Hash( rShort );
     nHashL = SwImpBlocks::Hash( rLong );
@@ -65,7 +65,7 @@ SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong )
 
 SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong, const OUString& rPackageName)
     : aShort( rShort ), aLong( rLong ), aPackageName (rPackageName),
-    bIsOnlyTxtFlagInit( false ), bIsOnlyTxt( false ), bInPutMuchBlocks(false)
+    bIsOnlyTextFlagInit( false ), bIsOnlyText( false ), bInPutMuchBlocks(false)
 {
     nHashS = SwImpBlocks::Hash( rShort );
     nHashL = SwImpBlocks::Hash( rLong );
@@ -184,7 +184,7 @@ OUString SwImpBlocks::GetPackageName( sal_uInt16 n ) const
 }
 
 void SwImpBlocks::AddName( const OUString& rShort, const OUString& rLong,
-                           bool bOnlyTxt )
+                           bool bOnlyText )
 {
     sal_uInt16 nIdx = GetIndex( rShort );
     if( nIdx != USHRT_MAX )
@@ -193,8 +193,8 @@ void SwImpBlocks::AddName( const OUString& rShort, const OUString& rLong,
         aNames.erase( aNames.begin() + nIdx );
     }
     SwBlockName* pNew = new SwBlockName( rShort, rLong );
-    pNew->bIsOnlyTxtFlagInit = true;
-    pNew->bIsOnlyTxt = bOnlyTxt;
+    pNew->bIsOnlyTextFlagInit = true;
+    pNew->bIsOnlyText = bOnlyText;
     aNames.insert( pNew );
 }
 
@@ -357,10 +357,10 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString
              nErr = pImp->Rename( n, aNew, aLong );
             if( !nErr )
             {
-                bool bOnlyTxt = pImp->aNames[ n ]->bIsOnlyTxt;
+                bool bOnlyText = pImp->aNames[ n ]->bIsOnlyText;
                 delete pImp->aNames[n];
                 pImp->aNames.erase( pImp->aNames.begin() + n );
-                pImp->AddName( aNew, aLong, bOnlyTxt );
+                pImp->AddName( aNew, aLong, bOnlyText );
                 nErr = pImp->MakeBlockList();
             }
         }
@@ -471,7 +471,7 @@ sal_uInt16 SwTextBlocks::PutDoc()
 }
 
 sal_uInt16 SwTextBlocks::PutText( const OUString& rShort, const OUString& rName,
-                                  const OUString& rTxt )
+                                  const OUString& rText )
 {
     sal_uInt16 nIdx = USHRT_MAX;
     if( pImp )
@@ -488,7 +488,7 @@ sal_uInt16 SwTextBlocks::PutText( const OUString& rShort, const OUString& rName,
         if( bOk )
         {
             OUString aNew = GetAppCharClass().uppercase( rShort );
-            nErr = pImp->PutText( aNew, rName, rTxt );
+            nErr = pImp->PutText( aNew, rName, rText );
             pImp->nCur = USHRT_MAX;
             if( !nErr )
             {
@@ -545,14 +545,14 @@ bool SwTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const
     if( pImp && !pImp->bInPutMuchBlocks )
     {
         SwBlockName* pBlkNm = const_cast<SwBlockName*>( pImp->aNames[ nIdx ] );
-        if( !pBlkNm->bIsOnlyTxtFlagInit &&
+        if( !pBlkNm->bIsOnlyTextFlagInit &&
             !pImp->IsFileChanged() && !pImp->OpenFile( true ) )
         {
-            pBlkNm->bIsOnlyTxt = pImp->IsOnlyTextBlock( pBlkNm->aShort );
-            pBlkNm->bIsOnlyTxtFlagInit = true;
+            pBlkNm->bIsOnlyText = pImp->IsOnlyTextBlock( pBlkNm->aShort );
+            pBlkNm->bIsOnlyTextFlagInit = true;
             pImp->CloseFile();
         }
-        bRet = pBlkNm->bIsOnlyTxt;
+        bRet = pBlkNm->bIsOnlyText;
     }
     return bRet;
 }
@@ -562,8 +562,8 @@ bool SwTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const
     sal_uInt16 nIdx = pImp->GetIndex( rShort );
     if( USHRT_MAX != nIdx )
     {
-        if( pImp->aNames[ nIdx ]->bIsOnlyTxtFlagInit )
-            return pImp->aNames[ nIdx ]->bIsOnlyTxt;
+        if( pImp->aNames[ nIdx ]->bIsOnlyTextFlagInit )
+            return pImp->aNames[ nIdx ]->bIsOnlyText;
         return IsOnlyTextBlock( nIdx );
     }
 
@@ -571,19 +571,19 @@ bool SwTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const
     return false;
 }
 
-bool SwTextBlocks::GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl )
+bool SwTextBlocks::GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTable )
 {
     bool bRet = true;
     if ( pImp && !pImp->bInPutMuchBlocks )
-        bRet = ( 0 == pImp->GetMacroTable( nIdx, rMacroTbl ) );
+        bRet = ( 0 == pImp->GetMacroTable( nIdx, rMacroTable ) );
     return bRet;
 }
 
-bool SwTextBlocks::SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTbl )
+bool SwTextBlocks::SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTable )
 {
     bool bRet = true;
     if ( pImp && !pImp->bInPutMuchBlocks )
-        bRet = ( 0 == pImp->SetMacroTable( nIdx, rMacroTbl ) );
+        bRet = ( 0 == pImp->SetMacroTable( nIdx, rMacroTable ) );
     return bRet;
 }
 
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index f84425700203..c52209f895fd 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -84,7 +84,7 @@ the undo object to notify, maybe empty
 */
 
 bool SwTable::NewMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
-     const SwSelBoxes& rMerged, SwTableBox*, SwUndoTblMerge* pUndo )
+     const SwSelBoxes& rMerged, SwTableBox*, SwUndoTableMerge* pUndo )
 {
     if( pUndo )
         pUndo->SetSelBoxes( rBoxes );
@@ -132,7 +132,7 @@ static void lcl_CheckMinMax( long& rMin, long& rMax, const SwTableLine& rLine, s
     {
         SwTableBox* pBox = rLine.GetTabBoxes()[nCurrBox];
         OSL_ENSURE( pBox, "Missing table box" );
-        nWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        nWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
         nNew += nWidth;
     }
     // nNew is the right border of the wished box
@@ -168,7 +168,7 @@ static long lcl_Box2LeftBorder( const SwTableBox& rBox )
         OSL_ENSURE( pBox, "Missing table box" );
         if( pBox == &rBox )
             return nLeft;
-        nLeft += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        nLeft += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
     }
     OSL_FAIL( "Box not found in own upper?" );
     return nLeft;
@@ -200,7 +200,7 @@ static SwTableBox* lcl_LeftBorder2Box( long nLeft, const SwTableLine* pLine )
     {
         SwTableBox* pBox = pLine->GetTabBoxes()[nCurrBox];
         OSL_ENSURE( pBox, "Missing table box" );
-        if( pBox->GetFrmFmt()->GetFrmSize().GetWidth() )
+        if( pBox->GetFrameFormat()->GetFrmSize().GetWidth() )
         {
             if( nCurrLeft == nLeft )
                 return pBox;
@@ -215,7 +215,7 @@ static SwTableBox* lcl_LeftBorder2Box( long nLeft, const SwTableLine* pLine )
                 return pBox;
             }
         }
-        nCurrLeft += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        nCurrLeft += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
     }
     OSL_FAIL( "Didn't found wished box" );
     return 0;
@@ -390,7 +390,7 @@ SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM& rPam ) const
             SwTableBox* pBox = pLine->GetTabBoxes()[nCurrBox];
             OSL_ENSURE( pBox, "Missing table box" );
             nLeft = nRight;
-            nRight += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+            nRight += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
             long nRowSpan = pBox->getRowSpan();
             if( nRight <= nMin )
             {
@@ -570,9 +570,9 @@ SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM& rPam ) const
             pCurr = aNewWidthList.begin();
         while( pCurr != aNewWidthList.end() )
         {
-            SwFrmFmt* pFmt = pCurr->first->ClaimFrmFmt();
-            long nNewWidth = pFmt->GetFrmSize().GetWidth() + pCurr->second;
-            pFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nNewWidth, 0 ) );
+            SwFrameFormat* pFormat = pCurr->first->ClaimFrameFormat();
+            long nNewWidth = pFormat->GetFrmSize().GetWidth() + pCurr->second;
+            pFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nNewWidth, 0 ) );
             ++pCurr;
         }
     }
@@ -590,7 +590,7 @@ SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM& rPam ) const
 
 static void lcl_InvalidateCellFrm( const SwTableBox& rBox )
 {
-    SwIterator<SwCellFrm,SwFmt> aIter( *rBox.GetFrmFmt() );
+    SwIterator<SwCellFrm,SwFormat> aIter( *rBox.GetFrameFormat() );
     for( SwCellFrm* pCell = aIter.First(); pCell; pCell = aIter.Next() )
     {
         if( pCell->GetTabBox() == &rBox )
@@ -616,7 +616,7 @@ static long lcl_InsertPosition( SwTable &rTable, std::vector<sal_uInt16>& rInsPo
     {
         SwTableBox *pBox = rBoxes[j];
         SwTableLine* pLine = pBox->GetUpper();
-        long nWidth = rBoxes[j]->GetFrmFmt()->GetFrmSize().GetWidth();
+        long nWidth = rBoxes[j]->GetFrameFormat()->GetFrmSize().GetWidth();
         nAddWidth += nWidth;
         sal_uInt16 nCurrBox = pLine->GetTabBoxes().GetPos( pBox );
         sal_uInt16 nCurrLine = rTable.GetTabLines().GetPos( pLine );
@@ -664,7 +664,7 @@ bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     { // Calculation of the insert positions and the width of the new boxes
         sal_uInt64 nTableWidth = 0;
         for( size_t i = 0; i < aLines[0]->GetTabBoxes().size(); ++i )
-            nTableWidth += aLines[0]->GetTabBoxes()[i]->GetFrmFmt()->GetFrmSize().GetWidth();
+            nTableWidth += aLines[0]->GetTabBoxes()[i]->GetFrameFormat()->GetFrmSize().GetWidth();
 
         // Fill the vector of insert positions and the (average) width to insert
         sal_uInt64 nAddWidth = lcl_InsertPosition( *this, aInsPos, rBoxes, bBehind );
@@ -691,8 +691,8 @@ bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     aFndBox.SetTableLines( rBoxes, *this );
     aFndBox.DelFrms( *this );
 
-    SwTableNode* pTblNd = GetTableNode();
-    std::vector<SwTableBoxFmt*> aInsFormat( nCnt, 0 );
+    SwTableNode* pTableNd = GetTableNode();
+    std::vector<SwTableBoxFormat*> aInsFormat( nCnt, 0 );
     size_t nLastLine = SAL_MAX_SIZE;
     long nLastRowSpan = 1;
 
@@ -704,8 +704,8 @@ bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
         SwTableBox* pBox = pLine->GetTabBoxes()[ nInsPos ];
         if( bBehind )
             ++nInsPos;
-        SwTableBoxFmt* pBoxFrmFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt());
-        ::_InsTblBox( pDoc, pTblNd, pLine, pBoxFrmFmt, pBox, nInsPos, nCnt );
+        SwTableBoxFormat* pBoxFrameFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
+        ::_InsTableBox( pDoc, pTableNd, pLine, pBoxFrameFormat, pBox, nInsPos, nCnt );
         long nRowSpan = pBox->getRowSpan();
         long nDiff = i - nLastLine;
         bool bNewSpan = false;
@@ -737,7 +737,7 @@ bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
             else
                 nLastRowSpan = nRowSpan;
         }
-        const SvxBoxItem& aSelBoxItem = pBoxFrmFmt->GetBox();
+        const SvxBoxItem& aSelBoxItem = pBoxFrameFormat->GetBox();
         SvxBoxItem* pNoRightBorder = 0;
         if( aSelBoxItem.GetRight() )
         {
@@ -750,21 +750,21 @@ bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
             if( bNewSpan )
             {
                 pCurrBox->setRowSpan( nLastRowSpan );
-                SwFrmFmt* pFrmFmt = pCurrBox->ClaimFrmFmt();
-                SwFmtFrmSize aFrmSz( pFrmFmt->GetFrmSize() );
+                SwFrameFormat* pFrameFormat = pCurrBox->ClaimFrameFormat();
+                SwFormatFrmSize aFrmSz( pFrameFormat->GetFrmSize() );
                 aFrmSz.SetWidth( nNewBoxWidth );
-                pFrmFmt->SetFmtAttr( aFrmSz );
+                pFrameFormat->SetFormatAttr( aFrmSz );
                 if( pNoRightBorder && ( !bBehind || j+1 < nCnt ) )
-                    pFrmFmt->SetFmtAttr( *pNoRightBorder );
-                aInsFormat[j] = static_cast<SwTableBoxFmt*>(pFrmFmt);
+                    pFrameFormat->SetFormatAttr( *pNoRightBorder );
+                aInsFormat[j] = static_cast<SwTableBoxFormat*>(pFrameFormat);
             }
             else
-                pCurrBox->ChgFrmFmt( aInsFormat[j] );
+                pCurrBox->ChgFrameFormat( aInsFormat[j] );
         }
         if( bBehind && pNoRightBorder )
         {
-            SwFrmFmt* pFrmFmt = pBox->ClaimFrmFmt();
-            pFrmFmt->SetFmtAttr( *pNoRightBorder );
+            SwFrameFormat* pFrameFormat = pBox->ClaimFrameFormat();
+            pFrameFormat->SetFormatAttr( *pNoRightBorder );
         }
         delete pNoRightBorder;
     }
@@ -775,7 +775,7 @@ bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
         const SwTableBoxes &rTabBoxes = aLines[0]->GetTabBoxes();
         long nNewWidth = 0;
         for( size_t i = 0; i < rTabBoxes.size(); ++i )
-            nNewWidth += rTabBoxes[i]->GetFrmFmt()->GetFrmSize().GetWidth();
+            nNewWidth += rTabBoxes[i]->GetFrameFormat()->GetFrmSize().GetWidth();
         OSL_ENSURE( nNewWidth > 0, "Very small" );
     }
 #endif
@@ -810,7 +810,7 @@ can be Null, e.g. when called by Redo(..)
 */
 
 bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
-   SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo )
+   SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo )
 {
     if( !bNewModel )
     {
@@ -837,7 +837,7 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
     // bottom box of the selection. If this is a overlapped cell,
     // the appropriate master box.
     SwTableBox* pLastBox = 0; // the right-bottom (master) cell
-    SwDoc* pDoc = GetFrmFmt()->GetDoc();
+    SwDoc* pDoc = GetFrameFormat()->GetDoc();
     SwPosition aInsPos( *pMergeBox->GetSttNd()->EndOfSectionNode() );
     SwPaM aChkPam( aInsPos );
     // The number of lines in the selection rectangle: nLineCount
@@ -887,7 +887,7 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
                     SwNodeIndex& rInsPosNd = aInsPos.nNode;
                     SwPaM aPam( aInsPos );
                     aPam.GetPoint()->nNode.Assign( *pBox->GetSttNd()->EndOfSectionNode(), -1 );
-                    SwCntntNode* pCNd = aPam.GetCntntNode();
+                    SwContentNode* pCNd = aPam.GetContentNode();
                     aPam.GetPoint()->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
                     SwNodeIndex aSttNdIdx( *pBox->GetSttNd(), 1 );
                     bool const bUndo = pDoc->GetIDocumentUndoRedo().DoesUndo();
@@ -895,14 +895,14 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
                     {
                         pDoc->GetIDocumentUndoRedo().DoUndo(false);
                     }
-                    pDoc->getIDocumentContentOperations().AppendTxtNode( *aPam.GetPoint() );
+                    pDoc->getIDocumentContentOperations().AppendTextNode( *aPam.GetPoint() );
                     if( pUndo )
                     {
                         pDoc->GetIDocumentUndoRedo().DoUndo(bUndo);
                     }
                     SwNodeRange aRg( aSttNdIdx, aPam.GetPoint()->nNode );
                     if( pUndo )
-                        pUndo->MoveBoxCntnt( pDoc, aRg, rInsPosNd );
+                        pUndo->MoveBoxContent( pDoc, aRg, rInsPosNd );
                     else
                     {
                         pDoc->getIDocumentContentOperations().MoveNodeRange( aRg, rInsPosNd,
@@ -924,9 +924,9 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
         // A row containing overlapped cells is superfluous,
         // these cells can be put into rBoxes for deletion
         _FindSuperfluousRows( rBoxes, pFirstLn, pLastLn );
-        // pNewFmt will be set to the new master box and the overlapped cells
-        SwFrmFmt* pNewFmt = pMergeBox->ClaimFrmFmt();
-        pNewFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, pSel->mnMergeWidth, 0 ) );
+        // pNewFormat will be set to the new master box and the overlapped cells
+        SwFrameFormat* pNewFormat = pMergeBox->ClaimFrameFormat();
+        pNewFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, pSel->mnMergeWidth, 0 ) );
         for( size_t nCurrLine = 0; nCurrLine < nLineCount; ++nCurrLine )
         {
             const SwSelBoxes* pBoxes = pSel->aBoxes[ nCurrLine ];
@@ -938,23 +938,23 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
                 {
                     // Even this box will be deleted soon,
                     // we have to correct the width to avoid side effects
-                    SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
-                    pFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, 0, 0 ) );
+                    SwFrameFormat* pFormat = pBox->ClaimFrameFormat();
+                    pFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, 0, 0 ) );
                 }
                 else
-                    pBox->ChgFrmFmt( static_cast<SwTableBoxFmt*>(pNewFmt) );
+                    pBox->ChgFrameFormat( static_cast<SwTableBoxFormat*>(pNewFormat) );
             }
         }
         if( pLastBox ) // Robust
         {
             // The new borders of the master cell...
-            SvxBoxItem aBox( pMergeBox->GetFrmFmt()->GetBox() );
+            SvxBoxItem aBox( pMergeBox->GetFrameFormat()->GetBox() );
             bool bOld = aBox.GetRight() || aBox.GetBottom();
-            const SvxBoxItem& rBox = pLastBox->GetFrmFmt()->GetBox();
+            const SvxBoxItem& rBox = pLastBox->GetFrameFormat()->GetBox();
             aBox.SetLine( rBox.GetRight(), SvxBoxItemLine::RIGHT );
             aBox.SetLine( rBox.GetBottom(), SvxBoxItemLine::BOTTOM );
             if( bOld || aBox.GetLeft() || aBox.GetTop() || aBox.GetRight() || aBox.GetBottom() )
-                (*ppMergeBox)->GetFrmFmt()->SetFmtAttr( aBox );
+                (*ppMergeBox)->GetFrameFormat()->SetFormatAttr( aBox );
         }
 
         if( pUndo )
@@ -1105,8 +1105,8 @@ static void lcl_UnMerge( const SwTable& rTable, SwTableBox& rBox, size_t nCnt,
         for (size_t i = 0; i < nCount; ++i)
         {
             SwTableLine* pLine = aBoxes[ i ]->GetUpper();
-            SwFrmFmt *pRowFmt = pLine->GetFrmFmt();
-            pHeights[ i ] = pRowFmt->GetFrmSize().GetHeight();
+            SwFrameFormat *pRowFormat = pLine->GetFrameFormat();
+            pHeights[ i ] = pRowFormat->GetFrmSize().GetHeight();
             nHeight += pHeights[ i ];
         }
         SwTwips nSumH = 0;
@@ -1158,15 +1158,15 @@ void SwTable::InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nRowIdx, sal_uInt16 nCnt
     SwSelBoxes aBoxes;
     SwTableLine& rLine = *GetTabLines()[ nRowIdx ];
     lcl_FillSelBoxes( aBoxes, rLine );
-    SwFmtFrmSize aFSz( rLine.GetFrmFmt()->GetFrmSize() );
+    SwFormatFrmSize aFSz( rLine.GetFrameFormat()->GetFrmSize() );
     if( ATT_VAR_SIZE != aFSz.GetHeightSizeType() )
     {
-        SwFrmFmt* pFrmFmt = rLine.ClaimFrmFmt();
+        SwFrameFormat* pFrameFormat = rLine.ClaimFrameFormat();
         long nNewHeight = aFSz.GetHeight() / ( nCnt + 1 );
         if( !nNewHeight )
             ++nNewHeight;
         aFSz.SetHeight( nNewHeight );
-        pFrmFmt->SetFmtAttr( aFSz );
+        pFrameFormat->SetFormatAttr( aFSz );
     }
     _InsertRow( pDoc, aBoxes, nCnt, true );
     const size_t nBoxCount = rLine.GetTabBoxes().size();
@@ -1421,11 +1421,11 @@ bool SwTable::NewSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             {
                 InsertSpannedRow( pDoc, nFirst, 1 );
                 SwTableLine* pRow = GetTabLines()[ nFirst ];
-                SwFrmFmt* pRowFmt = pRow->ClaimFrmFmt();
-                SwFmtFrmSize aFSz( pRowFmt->GetFrmSize() );
+                SwFrameFormat* pRowFormat = pRow->ClaimFrameFormat();
+                SwFormatFrmSize aFSz( pRowFormat->GetFrmSize() );
                 aFSz.SetHeightSizeType( ATT_MIN_SIZE );
                 aFSz.SetHeight( *pSplit - nLast );
-                pRowFmt->SetFmtAttr( aFSz );
+                pRowFormat->SetFormatAttr( aFSz );
                 nLast = *pSplit;
                 ++pSplit;
                 ++nFirst;
@@ -1433,11 +1433,11 @@ bool SwTable::NewSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             if( pSplit != aSplitLines.end() && *pCurr == *pSplit )
                 ++pSplit;
             SwTableLine* pRow = GetTabLines()[ nFirst ];
-            SwFrmFmt* pRowFmt = pRow->ClaimFrmFmt();
-            SwFmtFrmSize aFSz( pRowFmt->GetFrmSize() );
+            SwFrameFormat* pRowFormat = pRow->ClaimFrameFormat();
+            SwFormatFrmSize aFSz( pRowFormat->GetFrmSize() );
             aFSz.SetHeightSizeType( ATT_MIN_SIZE );
             aFSz.SetHeight( *pCurr - nLast );
-            pRowFmt->SetFmtAttr( aFSz );
+            pRowFormat->SetFormatAttr( aFSz );
             nLast = *pCurr;
             ++pCurr;
             ++nFirst;
@@ -1553,7 +1553,7 @@ void SwTable::PrepareDelBoxes( const SwSelBoxes& rBoxes )
         {
             SwTableBox* pBox = rBoxes[i];
             long nRowSpan = pBox->getRowSpan();
-            if( nRowSpan != 1 && pBox->GetFrmFmt()->GetFrmSize().GetWidth() )
+            if( nRowSpan != 1 && pBox->GetFrameFormat()->GetFrmSize().GetWidth() )
             {
                 long nLeft = lcl_Box2LeftBorder( *pBox );
                 SwTableLine *pLine = pBox->GetUpper();
@@ -1614,7 +1614,7 @@ static void lcl_SearchSelBox( const SwTable &rTable, SwSelBoxes& rBoxes, long nM
     {
         SwTableBox* pBox = rLine.GetTabBoxes()[nCurrBox];
         OSL_ENSURE( pBox, "Missing table box" );
-        long nWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        long nWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
         nRight += nWidth;
         if( nRight > nMin )
         {
@@ -1627,7 +1627,7 @@ static void lcl_SearchSelBox( const SwTable &rTable, SwSelBoxes& rBoxes, long nM
             long nRowSpan = pBox->getRowSpan();
             if( bAdd &&
                 ( !bChkProtected ||
-                !pBox->GetFrmFmt()->GetProtect().IsCntntProtected() ) )
+                !pBox->GetFrameFormat()->GetProtect().IsContentProtected() ) )
             {
                 size_t const nOldCnt = rBoxes.size();
                 rBoxes.insert( pBox );
@@ -1695,7 +1695,7 @@ void SwTable::CreateSelection( const SwNode* pStartNd, const SwNode* pEndNd,
             if( pBox->GetSttNd() == pEndNd || pBox->GetSttNd() == pStartNd )
             {
                 if( !bChkProtected ||
-                    !pBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
+                    !pBox->GetFrameFormat()->GetProtect().IsContentProtected() )
                     rBoxes.insert( pBox );
                 if( nFound )
                 {
@@ -1738,7 +1738,7 @@ void SwTable::CreateSelection( const SwNode* pStartNd, const SwNode* pEndNd,
                 SwTableBox* pBox = pLine->GetTabBoxes()[nCurrBox];
                 OSL_ENSURE( pBox, "Missing table box" );
                 if( pBox->getRowSpan() > 0 && ( !bChkProtected ||
-                    !pBox->GetFrmFmt()->GetProtect().IsCntntProtected() ) )
+                    !pBox->GetFrameFormat()->GetProtect().IsContentProtected() ) )
                     rBoxes.insert( pBox );
             }
         }
@@ -1833,7 +1833,7 @@ void SwTable::ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax
         {
             long nLeft = nRight;
             SwTableBox* pBox = pLine->GetTabBoxes()[nCurrBox];
-            nRight += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+            nRight += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
             if( nLeft >= rMin && nRight <= rMax )
                 rBoxes.insert( pBox );
         }
@@ -1849,7 +1849,7 @@ void SwTable::PrepareDeleteCol( long nMin, long nMax )
     if( aLines.empty() || nMax < nMin )
         return;
     long nMid = nMin ? ( nMin + nMax ) / 2 : 0;
-    const SwTwips nTabSize = GetFrmFmt()->GetFrmSize().GetWidth();
+    const SwTwips nTabSize = GetFrameFormat()->GetFrmSize().GetWidth();
     if( nTabSize == nMax )
         nMid = nMax;
     const size_t nLineCnt = aLines.size();
@@ -1862,7 +1862,7 @@ void SwTable::PrepareDeleteCol( long nMin, long nMax )
         {
             long nLeft = nRight;
             SwTableBox* pBox = pLine->GetTabBoxes()[nCurrBox];
-            nRight += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+            nRight += pBox->GetFrameFormat()->GetFrmSize().GetWidth();
             if( nRight < nMin )
                 continue;
             if( nLeft > nMax )
@@ -1879,10 +1879,10 @@ void SwTable::PrepareDeleteCol( long nMin, long nMax )
                 nNewWidth = 0;
             if( nNewWidth >= 0 )
             {
-                SwFrmFmt* pFrmFmt = pBox->ClaimFrmFmt();
-                SwFmtFrmSize aFrmSz( pFrmFmt->GetFrmSize() );
+                SwFrameFormat* pFrameFormat = pBox->ClaimFrameFormat();
+                SwFormatFrmSize aFrmSz( pFrameFormat->GetFrmSize() );
                 aFrmSz.SetWidth( nNewWidth );
-                pFrmFmt->SetFmtAttr( aFrmSz );
+                pFrameFormat->SetFormatAttr( aFrmSz );
             }
         }
     }
@@ -2105,7 +2105,7 @@ void SwTable::CheckConsistency() const
     if( !IsNewModel() )
         return;
     const size_t nLineCount = GetTabLines().size();
-    const SwTwips nTabSize = GetFrmFmt()->GetFrmSize().GetWidth();
+    const SwTwips nTabSize = GetFrameFormat()->GetFrmSize().GetWidth();
     SwTwips nLineWidth = 0;
     std::list< RowSpanCheck > aRowSpanCells;
     std::list< RowSpanCheck >::iterator aIter = aRowSpanCells.end();
@@ -2120,7 +2120,7 @@ void SwTable::CheckConsistency() const
         {
             SwTableBox* pBox = pLine->GetTabBoxes()[nCurrCol];
             SAL_WARN_IF( !pBox, "sw.core", "Missing Table Box" );
-            SwTwips nNewWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth() + nWidth;
+            SwTwips nNewWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth() + nWidth;
             long nRowSp = pBox->getRowSpan();
             if( nRowSp < 0 )
             {
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 6fcab86bdd65..bd36f015b8a3 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -71,31 +71,31 @@ using namespace com::sun::star;
 TYPEINIT1( SwTable, SwClient );
 TYPEINIT1( SwTableBox, SwClient );
 TYPEINIT1( SwTableLine, SwClient );
-TYPEINIT1( SwTableFmt, SwFrmFmt );
-TYPEINIT1( SwTableBoxFmt, SwFrmFmt );
-TYPEINIT1( SwTableLineFmt, SwFrmFmt );
+TYPEINIT1( SwTableFormat, SwFrameFormat );
+TYPEINIT1( SwTableBoxFormat, SwFrameFormat );
+TYPEINIT1( SwTableLineFormat, SwFrameFormat );
 
 #define COLFUZZY 20
 
-void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
+void ChgTextToNum( SwTableBox& rBox, const OUString& rText, const Color* pCol,
                     bool bChgAlign, sal_uLong nNdPos );
 
 class SwTableBox_Impl
 {
-    Color *mpUserColor, *mpNumFmtColor;
+    Color *mpUserColor, *mpNumFormatColor;
     long mnRowSpan;
     bool mbDummyFlag;
 
     static void SetNewCol( Color** ppCol, const Color* pNewCol );
 public:
-    SwTableBox_Impl() : mpUserColor(0), mpNumFmtColor(0), mnRowSpan(1),
+    SwTableBox_Impl() : mpUserColor(0), mpNumFormatColor(0), mnRowSpan(1),
         mbDummyFlag( false ) {}
-    ~SwTableBox_Impl() { delete mpUserColor; delete mpNumFmtColor; }
+    ~SwTableBox_Impl() { delete mpUserColor; delete mpNumFormatColor; }
 
     const Color* GetSaveUserColor() const       { return mpUserColor; }
-    const Color* GetSaveNumFmtColor() const     { return mpNumFmtColor; }
+    const Color* GetSaveNumFormatColor() const     { return mpNumFormatColor; }
     void SetSaveUserColor(const Color* p )      { SetNewCol( &mpUserColor, p ); }
-    void SetSaveNumFmtColor( const Color* p )   { SetNewCol( &mpNumFmtColor, p ); }
+    void SetSaveNumFormatColor( const Color* p )   { SetNewCol( &mpNumFormatColor, p ); }
     long getRowSpan() const { return mnRowSpan; }
     void setRowSpan( long nNewRowSpan ) { mnRowSpan = nNewRowSpan; }
     bool getDummyFlag() const { return mbDummyFlag; }
@@ -107,9 +107,9 @@ inline const Color* SwTableBox::GetSaveUserColor() const
     return pImpl ? pImpl->GetSaveUserColor() : 0;
 }
 
-inline const Color* SwTableBox::GetSaveNumFmtColor() const
+inline const Color* SwTableBox::GetSaveNumFormatColor() const
 {
-    return pImpl ? pImpl->GetSaveNumFmtColor() : 0;
+    return pImpl ? pImpl->GetSaveNumFormatColor() : 0;
 }
 
 inline void SwTableBox::SetSaveUserColor(const Color* p )
@@ -120,12 +120,12 @@ inline void SwTableBox::SetSaveUserColor(const Color* p )
         ( pImpl = new SwTableBox_Impl ) ->SetSaveUserColor( p );
 }
 
-inline void SwTableBox::SetSaveNumFmtColor( const Color* p )
+inline void SwTableBox::SetSaveNumFormatColor( const Color* p )
 {
     if( pImpl )
-        pImpl->SetSaveNumFmtColor( p );
+        pImpl->SetSaveNumFormatColor( p );
     else if( p )
-        ( pImpl = new SwTableBox_Impl )->SetSaveNumFmtColor( p );
+        ( pImpl = new SwTableBox_Impl )->SetSaveNumFormatColor( p );
 }
 
 long SwTableBox::getRowSpan() const
@@ -161,25 +161,25 @@ void SwTableBox::setDummyFlag( bool bDummy )
 }
 
 //JP 15.09.98: Bug 55741 - Keep tabs (front and rear)
-static OUString& lcl_TabToBlankAtSttEnd( OUString& rTxt )
+static OUString& lcl_TabToBlankAtSttEnd( OUString& rText )
 {
     sal_Unicode c;
     sal_Int32 n;
 
-    for( n = 0; n < rTxt.getLength() && ' ' >= ( c = rTxt[n] ); ++n )
+    for( n = 0; n < rText.getLength() && ' ' >= ( c = rText[n] ); ++n )
         if( '\x9' == c )
-            rTxt = rTxt.replaceAt( n, 1, " " );
-    for( n = rTxt.getLength(); n && ' ' >= ( c = rTxt[--n] ); )
+            rText = rText.replaceAt( n, 1, " " );
+    for( n = rText.getLength(); n && ' ' >= ( c = rText[--n] ); )
         if( '\x9' == c )
-            rTxt = rTxt.replaceAt( n, 1, " " );
-    return rTxt;
+            rText = rText.replaceAt( n, 1, " " );
+    return rText;
 }
 
-static OUString& lcl_DelTabsAtSttEnd( OUString& rTxt )
+static OUString& lcl_DelTabsAtSttEnd( OUString& rText )
 {
     sal_Unicode c;
     sal_Int32 n;
-    OUStringBuffer sBuff(rTxt);
+    OUStringBuffer sBuff(rText);
 
     for( n = 0; n < sBuff.getLength() && ' ' >= ( c = sBuff[ n ]); ++n )
     {
@@ -191,60 +191,60 @@ static OUString& lcl_DelTabsAtSttEnd( OUString& rTxt )
         if( '\x9' == c )
             sBuff.remove( n, 1 );
     }
-    rTxt = sBuff.makeStringAndClear();
-    return rTxt;
+    rText = sBuff.makeStringAndClear();
+    return rText;
 }
 
-void _InsTblBox( SwDoc* pDoc, SwTableNode* pTblNd,
-                        SwTableLine* pLine, SwTableBoxFmt* pBoxFrmFmt,
+void _InsTableBox( SwDoc* pDoc, SwTableNode* pTableNd,
+                        SwTableLine* pLine, SwTableBoxFormat* pBoxFrameFormat,
                         SwTableBox* pBox,
                         sal_uInt16 nInsPos, sal_uInt16 nCnt )
 {
     OSL_ENSURE( pBox->GetSttNd(), "Box with no start node" );
     SwNodeIndex aIdx( *pBox->GetSttNd(), +1 );
-    SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+    SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
     if( !pCNd )
         pCNd = pDoc->GetNodes().GoNext( &aIdx );
     OSL_ENSURE( pCNd, "Box with no content node" );
 
-    if( pCNd->IsTxtNode() )
+    if( pCNd->IsTextNode() )
     {
-        if( pBox->GetSaveNumFmtColor() && pCNd->GetpSwAttrSet() )
+        if( pBox->GetSaveNumFormatColor() && pCNd->GetpSwAttrSet() )
         {
             SwAttrSet aAttrSet( *pCNd->GetpSwAttrSet() );
             if( pBox->GetSaveUserColor() )
                 aAttrSet.Put( SvxColorItem( *pBox->GetSaveUserColor(), RES_CHRATR_COLOR ));
             else
                 aAttrSet.ClearItem( RES_CHRATR_COLOR );
-            pDoc->GetNodes().InsBoxen( pTblNd, pLine, pBoxFrmFmt,
-                                    static_cast<SwTxtNode*>(pCNd)->GetTxtColl(),
+            pDoc->GetNodes().InsBoxen( pTableNd, pLine, pBoxFrameFormat,
+                                    static_cast<SwTextNode*>(pCNd)->GetTextColl(),
                                     &aAttrSet, nInsPos, nCnt );
         }
         else
-            pDoc->GetNodes().InsBoxen( pTblNd, pLine, pBoxFrmFmt,
-                                    static_cast<SwTxtNode*>(pCNd)->GetTxtColl(),
+            pDoc->GetNodes().InsBoxen( pTableNd, pLine, pBoxFrameFormat,
+                                    static_cast<SwTextNode*>(pCNd)->GetTextColl(),
                                     pCNd->GetpSwAttrSet(),
                                     nInsPos, nCnt );
     }
     else
-        pDoc->GetNodes().InsBoxen( pTblNd, pLine, pBoxFrmFmt,
-                pDoc->GetDfltTxtFmtColl(), 0,
+        pDoc->GetNodes().InsBoxen( pTableNd, pLine, pBoxFrameFormat,
+                pDoc->GetDfltTextFormatColl(), 0,
                 nInsPos, nCnt );
 
     long nRowSpan = pBox->getRowSpan();
     if( nRowSpan != 1 )
     {
-        SwTableBoxes& rTblBoxes = pLine->GetTabBoxes();
+        SwTableBoxes& rTableBoxes = pLine->GetTabBoxes();
         for( sal_uInt16 i = 0; i < nCnt; ++i )
         {
-            pBox = rTblBoxes[ i + nInsPos ];
+            pBox = rTableBoxes[ i + nInsPos ];
             pBox->setRowSpan( nRowSpan );
         }
     }
 }
 
-SwTable::SwTable( SwTableFmt* pFmt )
-    : SwClient( pFmt ),
+SwTable::SwTable( SwTableFormat* pFormat )
+    : SwClient( pFormat ),
     pHTMLLayout( 0 ),
     pTableNode( 0 ),
     nGrfsThatResize( 0 ),
@@ -253,14 +253,14 @@ SwTable::SwTable( SwTableFmt* pFmt )
     bNewModel( true )
 {
     // default value set in the options
-    eTblChgMode = (TblChgMode)GetTblChgDefaultMode();
+    eTableChgMode = (TableChgMode)GetTableChgDefaultMode();
 }
 
 SwTable::SwTable( const SwTable& rTable )
-    : SwClient( rTable.GetFrmFmt() ),
+    : SwClient( rTable.GetFrameFormat() ),
     pHTMLLayout( 0 ),
     pTableNode( 0 ),
-    eTblChgMode( rTable.eTblChgMode ),
+    eTableChgMode( rTable.eTableChgMode ),
     nGrfsThatResize( 0 ),
     nRowsToRepeat( rTable.GetRowsToRepeat() ),
     bModifyLocked( false ),
@@ -280,7 +280,7 @@ SwTable::~SwTable()
 {
     if( refObj.Is() )
     {
-        SwDoc* pDoc = GetFrmFmt()->GetDoc();
+        SwDoc* pDoc = GetFrameFormat()->GetDoc();
         if( !pDoc->IsInDtor() )         // then remove from the list
             pDoc->getIDocumentLinksAdministration().GetLinkManager().RemoveServer( &refObj );
 
@@ -288,11 +288,11 @@ SwTable::~SwTable()
     }
 
     // the table can be deleted if it's the last client of the FrameFormat
-    SwTableFmt* pFmt = static_cast<SwTableFmt*>(GetFrmFmt());
-    pFmt->Remove( this );               // remove
+    SwTableFormat* pFormat = static_cast<SwTableFormat*>(GetFrameFormat());
+    pFormat->Remove( this );               // remove
 
-    if( !pFmt->HasWriterListeners() )
-        pFmt->GetDoc()->DelTblFrmFmt( pFmt );   // and delete
+    if( !pFormat->HasWriterListeners() )
+        pFormat->GetDoc()->DelTableFrameFormat( pFormat );   // and delete
 
     // Delete the pointers from the SortArray of the boxes. The objects
     // are preserved and are deleted by the lines/boxes arrays dtor.
@@ -314,37 +314,37 @@ inline T lcl_MulDiv64(sal_uInt64 nA, sal_uInt64 nM, sal_uInt64 nD)
 
 }
 
-static void FmtInArr( std::vector<SwFmt*>& rFmtArr, SwFmt* pBoxFmt )
+static void FormatInArr( std::vector<SwFormat*>& rFormatArr, SwFormat* pBoxFormat )
 {
-    std::vector<SwFmt*>::const_iterator it = std::find( rFmtArr.begin(), rFmtArr.end(), pBoxFmt );
-    if ( it == rFmtArr.end() )
-        rFmtArr.push_back( pBoxFmt );
+    std::vector<SwFormat*>::const_iterator it = std::find( rFormatArr.begin(), rFormatArr.end(), pBoxFormat );
+    if ( it == rFormatArr.end() )
+        rFormatArr.push_back( pBoxFormat );
 }
 
 static void lcl_ModifyBoxes( SwTableBoxes &rBoxes, const long nOld,
-                         const long nNew, std::vector<SwFmt*>& rFmtArr );
+                         const long nNew, std::vector<SwFormat*>& rFormatArr );
 
 static void lcl_ModifyLines( SwTableLines &rLines, const long nOld,
-                         const long nNew, std::vector<SwFmt*>& rFmtArr, const bool bCheckSum )
+                         const long nNew, std::vector<SwFormat*>& rFormatArr, const bool bCheckSum )
 {
     for ( size_t i = 0; i < rLines.size(); ++i )
-        ::lcl_ModifyBoxes( rLines[i]->GetTabBoxes(), nOld, nNew, rFmtArr );
+        ::lcl_ModifyBoxes( rLines[i]->GetTabBoxes(), nOld, nNew, rFormatArr );
     if( bCheckSum )
     {
-        for( size_t i = 0; i < rFmtArr.size(); ++i )
+        for( size_t i = 0; i < rFormatArr.size(); ++i )
         {
-            SwFmt* pFmt = rFmtArr[i];
-            const SwTwips nBox = lcl_MulDiv64<SwTwips>(pFmt->GetFrmSize().GetWidth(), nNew, nOld);
-            SwFmtFrmSize aNewBox( ATT_VAR_SIZE, nBox, 0 );
-            pFmt->LockModify();
-            pFmt->SetFmtAttr( aNewBox );
-            pFmt->UnlockModify();
+            SwFormat* pFormat = rFormatArr[i];
+            const SwTwips nBox = lcl_MulDiv64<SwTwips>(pFormat->GetFrmSize().GetWidth(), nNew, nOld);
+            SwFormatFrmSize aNewBox( ATT_VAR_SIZE, nBox, 0 );
+            pFormat->LockModify();
+            pFormat->SetFormatAttr( aNewBox );
+            pFormat->UnlockModify();
         }
     }
 }
 
 static void lcl_ModifyBoxes( SwTableBoxes &rBoxes, const long nOld,
-                         const long nNew, std::vector<SwFmt*>& rFmtArr )
+                         const long nNew, std::vector<SwFormat*>& rFormatArr )
 {
     sal_uInt64 nSum = 0; // To avoid rounding errors we summarize all box widths
     sal_uInt64 nOriginalSum = 0; // Sum of original widths
@@ -354,11 +354,11 @@ static void lcl_ModifyBoxes( SwTableBoxes &rBoxes, const long nOld,
         if ( !rBox.GetTabLines().empty() )
         {
             // For SubTables the rounding problem will not be solved :-(
-            ::lcl_ModifyLines( rBox.GetTabLines(), nOld, nNew, rFmtArr, false );
+            ::lcl_ModifyLines( rBox.GetTabLines(), nOld, nNew, rFormatArr, false );
         }
         // Adjust the box
-        SwFrmFmt *pFmt = rBox.GetFrmFmt();
-        sal_uInt64 nBox = pFmt->GetFrmSize().GetWidth();
+        SwFrameFormat *pFormat = rBox.GetFrameFormat();
+        sal_uInt64 nBox = pFormat->GetFrmSize().GetWidth();
         nOriginalSum += nBox;
         nBox *= nNew;
         nBox /= nOld;
@@ -366,15 +366,15 @@ static void lcl_ModifyBoxes( SwTableBoxes &rBoxes, const long nOld,
         if( nWishedSum > 0 )
         {
             if( nBox == nWishedSum )
-                FmtInArr( rFmtArr, pFmt );
+                FormatInArr( rFormatArr, pFormat );
             else
             {
                 nBox = nWishedSum;
-                pFmt = rBox.ClaimFrmFmt();
-                SwFmtFrmSize aNewBox( ATT_VAR_SIZE, static_cast< SwTwips >(nBox), 0 );
-                pFmt->LockModify();
-                pFmt->SetFmtAttr( aNewBox );
-                pFmt->UnlockModify();
+                pFormat = rBox.ClaimFrameFormat();
+                SwFormatFrmSize aNewBox( ATT_VAR_SIZE, static_cast< SwTwips >(nBox), 0 );
+                pFormat->LockModify();
+                pFormat->SetFormatAttr( aNewBox );
+                pFormat->UnlockModify();
             }
         }
         else {
@@ -388,7 +388,7 @@ void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
     // catch SSize changes, to adjust the lines/boxes
     const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ;
-    const SwFmtFrmSize* pNewSize = 0, *pOldSize = 0;
+    const SwFormatFrmSize* pNewSize = 0, *pOldSize = 0;
 
     if( RES_ATTRSET_CHG == nWhich )
     {
@@ -400,8 +400,8 @@ void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
     }
     else if( RES_FRM_SIZE == nWhich )
     {
-        pOldSize = static_cast<const SwFmtFrmSize*>(pOld);
-        pNewSize = static_cast<const SwFmtFrmSize*>(pNew);
+        pOldSize = static_cast<const SwFormatFrmSize*>(pOld);
+        pNewSize = static_cast<const SwFormatFrmSize*>(pNew);
     }
     else
         CheckRegistration( pOld, pNew );
@@ -412,9 +412,9 @@ void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 
 void SwTable::AdjustWidths( const long nOld, const long nNew )
 {
-    std::vector<SwFmt*> aFmtArr;
-    aFmtArr.reserve( aLines[0]->GetTabBoxes().size() );
-    ::lcl_ModifyLines( aLines, nOld, nNew, aFmtArr, true );
+    std::vector<SwFormat*> aFormatArr;
+    aFormatArr.reserve( aLines[0]->GetTabBoxes().size() );
+    ::lcl_ModifyLines( aLines, nOld, nNew, aFormatArr, true );
 }
 
 static void lcl_RefreshHidden( SwTabCols &rToFill, size_t nPos )
@@ -430,10 +430,10 @@ static void lcl_RefreshHidden( SwTabCols &rToFill, size_t nPos )
 }
 
 static void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox,
-                   const SwFrmFmt *pTabFmt, const bool bHidden,
+                   const SwFrameFormat *pTabFormat, const bool bHidden,
                    const bool bRefreshHidden )
 {
-    const long nWish = pTabFmt->GetFrmSize().GetWidth();
+    const long nWish = pTabFormat->GetFrmSize().GetWidth();
     OSL_ENSURE(nWish, "weird <= 0 width frmfrm");
 
     // The value for the left edge of the box is calculated from the
@@ -453,7 +453,7 @@ static void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox,
             const SwTableBoxes &rBoxes = pLine->GetTabBoxes();
             for ( size_t i = 0; i < rBoxes.size(); ++i )
             {
-                const SwTwips nWidth = rBoxes[i]->GetFrmFmt()->GetFrmSize().GetWidth();
+                const SwTwips nWidth = rBoxes[i]->GetFrameFormat()->GetFrmSize().GetWidth();
                 nSum += nWidth;
                 const long nTmp = lcl_MulDiv64<long>(nSum, nAct, nWish);
 
@@ -539,7 +539,7 @@ static void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox,
 }
 
 static void lcl_ProcessBoxGet( const SwTableBox *pBox, SwTabCols &rToFill,
-                        const SwFrmFmt *pTabFmt, bool bRefreshHidden )
+                        const SwFrameFormat *pTabFormat, bool bRefreshHidden )
 {
     if ( !pBox->GetTabLines().empty() )
     {
@@ -548,24 +548,24 @@ static void lcl_ProcessBoxGet( const SwTableBox *pBox, SwTabCols &rToFill,
         {
             const SwTableBoxes &rBoxes = rLines[i]->GetTabBoxes();
             for ( size_t j = 0; j < rBoxes.size(); ++j )
-                ::lcl_ProcessBoxGet( rBoxes[j], rToFill, pTabFmt, bRefreshHidden);
+                ::lcl_ProcessBoxGet( rBoxes[j], rToFill, pTabFormat, bRefreshHidden);
         }
     }
     else
-        ::lcl_SortedTabColInsert( rToFill, pBox, pTabFmt, false, bRefreshHidden );
+        ::lcl_SortedTabColInsert( rToFill, pBox, pTabFormat, false, bRefreshHidden );
 }
 
 static void lcl_ProcessLineGet( const SwTableLine *pLine, SwTabCols &rToFill,
-                         const SwFrmFmt *pTabFmt )
+                         const SwFrameFormat *pTabFormat )
 {
     for ( size_t i = 0; i < pLine->GetTabBoxes().size(); ++i )
     {
         const SwTableBox *pBox = pLine->GetTabBoxes()[i];
         if ( pBox->GetSttNd() )
-            ::lcl_SortedTabColInsert( rToFill, pBox, pTabFmt, true, false );
+            ::lcl_SortedTabColInsert( rToFill, pBox, pTabFormat, true, false );
         else
             for ( size_t j = 0; j < pBox->GetTabLines().size(); ++j )
-                ::lcl_ProcessLineGet( pBox->GetTabLines()[j], rToFill, pTabFmt );
+                ::lcl_ProcessLineGet( pBox->GetTabLines()[j], rToFill, pTabFormat );
     }
 }
 
@@ -607,13 +607,13 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
     // covered by the border.
     // 4. Scan the table again and insert _all_ boxes, this time as hidden.
 
-    const SwFrmFmt *pTabFmt = GetFrmFmt();
+    const SwFrameFormat *pTabFormat = GetFrameFormat();
 
     // 1.
     const SwTableBoxes &rBoxes = pStart->GetUpper()->GetTabBoxes();
 
     for ( size_t i = 0; i < rBoxes.size(); ++i )
-        ::lcl_ProcessBoxGet( rBoxes[i], rToFill, pTabFmt, bRefreshHidden );
+        ::lcl_ProcessBoxGet( rBoxes[i], rToFill, pTabFormat, bRefreshHidden );
 
     // 2. and 3.
     const SwTableLine *pLine = pStart->GetUpper()->GetUpper() ?
@@ -623,7 +623,7 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
         const SwTableBoxes &rBoxes2 = pLine->GetTabBoxes();
         for ( size_t k = 0; k < rBoxes2.size(); ++k )
             ::lcl_SortedTabColInsert( rToFill, rBoxes2[k],
-                                      pTabFmt, false, bRefreshHidden );
+                                      pTabFormat, false, bRefreshHidden );
         pLine = pLine->GetUpper() ? pLine->GetUpper()->GetUpper() : 0;
     }
 
@@ -633,7 +633,7 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
         if ( !bCurRowOnly )
         {
             for ( size_t i = 0; i < aLines.size(); ++i )
-                ::lcl_ProcessLineGet( aLines[i], rToFill, pTabFmt );
+                ::lcl_ProcessLineGet( aLines[i], rToFill, pTabFormat );
         }
 
         rToFill.Remove( 0, 1 );
@@ -660,7 +660,7 @@ struct Parm
     long nNewWish,
          nOldWish;
     std::deque<SwTableBox*> aBoxArr;
-    SwShareBoxFmts aShareFmts;
+    SwShareBoxFormats aShareFormats;
 
     Parm( const SwTabCols &rN, const SwTabCols &rO )
         : rNew( rN ), rOld( rO ), nNewWish(0), nOldWish(0)
@@ -712,7 +712,7 @@ static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
             for ( size_t i = 0; (i < rBoxes.size()) && (rBoxes[i] != pCur); ++i)
             {
                 nLeft += lcl_MulDiv64<long>(
-                    rBoxes[i]->GetFrmFmt()->GetFrmSize().GetWidth(),
+                    rBoxes[i]->GetFrameFormat()->GetFrmSize().GetWidth(),
                     nOldAct, rParm.nOldWish);
             }
             pCur  = pLine->GetUpper();
@@ -724,7 +724,7 @@ static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
         {
             // Right edge is left edge plus width.
             const long nWidth = lcl_MulDiv64<long>(
-                pBox->GetFrmFmt()->GetFrmSize().GetWidth(),
+                pBox->GetFrameFormat()->GetFrmSize().GetWidth(),
                 nOldAct, rParm.nOldWish);
             const long nRight = nLeft + nWidth;
             size_t nLeftPos  = 0;
@@ -758,7 +758,7 @@ static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
             {
                 // Calculate the difference to the edge touching the first box.
                 const long nWidth = lcl_MulDiv64<long>(
-                    pBox->GetFrmFmt()->GetFrmSize().GetWidth(),
+                    pBox->GetFrameFormat()->GetFrmSize().GetWidth(),
                     nOldAct, rParm.nOldWish);
                 const long nTmp = nWidth + rParm.rOld.GetLeft();
                 for ( size_t i = 0; i < rParm.rOld.Count(); ++i )
@@ -775,12 +775,12 @@ static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
 
         if( pBox->getRowSpan() == 1 )
         {
-            SwTableBoxes& rTblBoxes = pBox->GetUpper()->GetTabBoxes();
-            const sal_uInt16 nPos = rTblBoxes.GetPos( pBox );
-            if( nPos && rTblBoxes[ nPos - 1 ]->getRowSpan() != 1 )
+            SwTableBoxes& rTableBoxes = pBox->GetUpper()->GetTabBoxes();
+            const sal_uInt16 nPos = rTableBoxes.GetPos( pBox );
+            if( nPos && rTableBoxes[ nPos - 1 ]->getRowSpan() != 1 )
                 nLeftDiff = 0;
-            if( nPos + 1 < (sal_uInt16)rTblBoxes.size() &&
-                rTblBoxes[ nPos + 1 ]->getRowSpan() != 1 )
+            if( nPos + 1 < (sal_uInt16)rTableBoxes.size() &&
+                rTableBoxes[ nPos + 1 ]->getRowSpan() != 1 )
                 nRightDiff = 0;
         }
         else
@@ -802,11 +802,11 @@ static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
             // Adjust the box and all superiors by the difference amount.
             while ( pBox )
             {
-                SwFmtFrmSize aFmtFrmSize( pBox->GetFrmFmt()->GetFrmSize() );
-                aFmtFrmSize.SetWidth( aFmtFrmSize.GetWidth() + nDiff );
-                if ( aFmtFrmSize.GetWidth() < 0 )
-                    aFmtFrmSize.SetWidth( -aFmtFrmSize.GetWidth() );
-                rParm.aShareFmts.SetSize( *pBox, aFmtFrmSize );
+                SwFormatFrmSize aFormatFrmSize( pBox->GetFrameFormat()->GetFrmSize() );
+                aFormatFrmSize.SetWidth( aFormatFrmSize.GetWidth() + nDiff );
+                if ( aFormatFrmSize.GetWidth() < 0 )
+                    aFormatFrmSize.SetWidth( -aFormatFrmSize.GetWidth() );
+                rParm.aShareFormats.SetSize( *pBox, aFormatFrmSize );
 
                 // The outer cells of the last row are responsible to adjust a surrounding cell.
                 // Last line check:
@@ -868,10 +868,10 @@ static void lcl_AdjustBox( SwTableBox *pBox, const long nDiff, Parm &rParm )
         ::lcl_AdjustLines( pBox->GetTabLines(), nDiff, rParm );
 
     // Adjust the size of the box.
-    SwFmtFrmSize aFmtFrmSize( pBox->GetFrmFmt()->GetFrmSize() );
-    aFmtFrmSize.SetWidth( aFmtFrmSize.GetWidth() + nDiff );
+    SwFormatFrmSize aFormatFrmSize( pBox->GetFrameFormat()->GetFrmSize() );
+    aFormatFrmSize.SetWidth( aFormatFrmSize.GetWidth() + nDiff );
 
-    rParm.aShareFmts.SetSize( *pBox, aFmtFrmSize );
+    rParm.aShareFormats.SetSize( *pBox, aFormatFrmSize );
 }
 
 void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
@@ -892,27 +892,27 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
     // Convert the edges. We need to adjust the size of the table and some boxes.
     // For the size adjustment, we must not make use of the Modify, since that'd
     // adjust all boxes, which we really don't want.
-    SwFrmFmt *pFmt = GetFrmFmt();
-    aParm.nOldWish = aParm.nNewWish = pFmt->GetFrmSize().GetWidth();
+    SwFrameFormat *pFormat = GetFrameFormat();
+    aParm.nOldWish = aParm.nNewWish = pFormat->GetFrmSize().GetWidth();
     if ( (rOld.GetLeft() != rNew.GetLeft()) ||
          (rOld.GetRight()!= rNew.GetRight()) )
     {
         LockModify();
         {
-            SvxLRSpaceItem aLR( pFmt->GetLRSpace() );
-            SvxShadowItem aSh( pFmt->GetShadow() );
+            SvxLRSpaceItem aLR( pFormat->GetLRSpace() );
+            SvxShadowItem aSh( pFormat->GetShadow() );
 
             SwTwips nShRight = aSh.CalcShadowSpace( SvxShadowItemSide::RIGHT );
             SwTwips nShLeft = aSh.CalcShadowSpace( SvxShadowItemSide::LEFT );
 
             aLR.SetLeft ( rNew.GetLeft() - nShLeft );
             aLR.SetRight( rNew.GetRightMax() - rNew.GetRight() - nShRight );
-            pFmt->SetFmtAttr( aLR );
+            pFormat->SetFormatAttr( aLR );
 
             // The alignment of the table needs to be adjusted accordingly.
             // This is done by preserving the exact positions that have been
             // set by the user.
-            SwFmtHoriOrient aOri( pFmt->GetHoriOrient() );
+            SwFormatHoriOrient aOri( pFormat->GetHoriOrient() );
             if(text::HoriOrientation::NONE != aOri.GetHoriOrient())
             {
                 const bool bLeftDist = rNew.GetLeft() != nShLeft;
@@ -926,7 +926,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
                 else
                     aOri.SetHoriOrient( text::HoriOrientation::LEFT_AND_WIDTH );
             }
-            pFmt->SetFmtAttr( aOri );
+            pFormat->SetFormatAttr( aOri );
         }
         const long nAct = rOld.GetRight() - rOld.GetLeft(); // +1 why?
         long nTabDiff = 0;
@@ -953,12 +953,12 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
             aParm.nNewWish += nTabDiff;
             if ( aParm.nNewWish < 0 )
                 aParm.nNewWish = USHRT_MAX; // Oops! Have to roll back.
-            SwFmtFrmSize aSz( pFmt->GetFrmSize() );
+            SwFormatFrmSize aSz( pFormat->GetFrmSize() );
             if ( aSz.GetWidth() != aParm.nNewWish )
             {
                 aSz.SetWidth( aParm.nNewWish );
                 aSz.SetWidthPercent( 0 );
-                pFmt->SetFmtAttr( aSz );
+                pFormat->SetFormatAttr( aSz );
             }
         }
         UnlockModify();
@@ -1022,7 +1022,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
 #ifdef DBG_UTIL
     {
         // do some checking for correct table widths
-        SwTwips nSize = GetFrmFmt()->GetFrmSize().GetWidth();
+        SwTwips nSize = GetFrameFormat()->GetFrmSize().GetWidth();
         for (size_t n = 0; n < aLines.size(); ++n)
         {
             _CheckBoxWidth( *aLines[ n ], nSize );
@@ -1046,7 +1046,7 @@ static void lcl_AdjustWidthsInLine( SwTableLine* pLine, ChangeList& rOldNew,
     for( size_t i = 0; i < nCount; ++i )
     {
         SwTableBox* pBox = pLine->GetTabBoxes()[i];
-        SwTwips nWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        SwTwips nWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
         SwTwips nNewWidth = nWidth - nRest;
         nRest = 0;
         nBorder += nWidth;
@@ -1076,9 +1076,9 @@ static void lcl_AdjustWidthsInLine( SwTableLine* pLine, ChangeList& rOldNew,
                 nRest += 1 - nNewWidth;
                 nNewWidth = 1;
             }
-            SwFmtFrmSize aFmtFrmSize( pBox->GetFrmFmt()->GetFrmSize() );
-            aFmtFrmSize.SetWidth( nNewWidth );
-            rParm.aShareFmts.SetSize( *pBox, aFmtFrmSize );
+            SwFormatFrmSize aFormatFrmSize( pBox->GetFrameFormat()->GetFrmSize() );
+            aFormatFrmSize.SetWidth( nNewWidth );
+            rParm.aShareFormats.SetSize( *pBox, aFormatFrmSize );
         }
     }
 }
@@ -1109,7 +1109,7 @@ static void lcl_CalcNewWidths( std::list<sal_uInt16> &rSpanPos, ChangeList& rCha
     for( size_t nCurrBox = 0; nCurrBox < nCount; ++nCurrBox )
     {
         SwTableBox* pBox = pLine->GetTabBoxes()[nCurrBox];
-        SwTwips nCurrWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+        SwTwips nCurrWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
         const long nRowSpan = pBox->getRowSpan();
         const bool bCurrRowSpan = bTop ? nRowSpan < 0 :
             ( nRowSpan > 1 || nRowSpan < -1 );
@@ -1376,10 +1376,10 @@ sal_uInt16 SwTable::_GetBoxNum( OUString& rStr, bool bFirstPart,
         else
         {
             nRet = 0;
-            const OUString aTxt( rStr.copy( 0, nPos ) );
-            if ( !bPerformValidCheck || lcl_IsValidRowName( aTxt ) )
+            const OUString aText( rStr.copy( 0, nPos ) );
+            if ( !bPerformValidCheck || lcl_IsValidRowName( aText ) )
             {
-                nRet = static_cast<sal_uInt16>(aTxt.toInt32());
+                nRet = static_cast<sal_uInt16>(aText.toInt32());
             }
             rStr = rStr.copy( nPos+1 );
         }
@@ -1389,7 +1389,7 @@ sal_uInt16 SwTable::_GetBoxNum( OUString& rStr, bool bFirstPart,
 
 // #i80314#
 // add 2nd parameter and its handling
-const SwTableBox* SwTable::GetTblBox( const OUString& rName,
+const SwTableBox* SwTable::GetTableBox( const OUString& rName,
                                       const bool bPerformValidCheck ) const
 {
     const SwTableBox* pBox = 0;
@@ -1436,38 +1436,38 @@ const SwTableBox* SwTable::GetTblBox( const OUString& rName,
     return pBox;
 }
 
-SwTableBox* SwTable::GetTblBox( sal_uLong nSttIdx )
+SwTableBox* SwTable::GetTableBox( sal_uLong nSttIdx )
 {
     // For optimizations, don't always process the entire SortArray.
     // Converting text to table, tries certain conditions
     // to ask for a table box of a table that is not yet having a format
-    if(!GetFrmFmt())
+    if(!GetFrameFormat())
         return 0;
     SwTableBox* pRet = 0;
-    SwNodes& rNds = GetFrmFmt()->GetDoc()->GetNodes();
+    SwNodes& rNds = GetFrameFormat()->GetDoc()->GetNodes();
     sal_uLong nIndex = nSttIdx + 1;
-    SwCntntNode* pCNd = 0;
-    SwTableNode* pTblNd = 0;
+    SwContentNode* pCNd = 0;
+    SwTableNode* pTableNd = 0;
 
     while ( nIndex < rNds.Count() )
     {
-        pTblNd = rNds[ nIndex ]->GetTableNode();
-        if ( pTblNd )
+        pTableNd = rNds[ nIndex ]->GetTableNode();
+        if ( pTableNd )
             break;
 
-        pCNd = rNds[ nIndex ]->GetCntntNode();
+        pCNd = rNds[ nIndex ]->GetContentNode();
         if ( pCNd )
             break;
 
         ++nIndex;
     }
 
-    if ( pCNd || pTblNd )
+    if ( pCNd || pTableNd )
     {
         SwModify* pModify = pCNd;
         // #144862# Better handling of table in table
-        if ( pTblNd && pTblNd->GetTable().GetFrmFmt() )
-            pModify = pTblNd->GetTable().GetFrmFmt();
+        if ( pTableNd && pTableNd->GetTable().GetFrameFormat() )
+            pModify = pTableNd->GetTable().GetFrameFormat();
 
         SwFrm* pFrm = pModify ? SwIterator<SwFrm,SwModify>(*pModify).First() : nullptr;
         while ( pFrm && !pFrm->IsCellFrm() )
@@ -1490,7 +1490,7 @@ SwTableBox* SwTable::GetTblBox( sal_uLong nSttIdx )
     return pRet;
 }
 
-bool SwTable::IsTblComplex() const
+bool SwTable::IsTableComplex() const
 {
     // Returns true for complex tables, i.e. tables that contain nestings,
     // like containing boxes not part of the first line, e.g. results of
@@ -1505,9 +1505,9 @@ bool SwTable::IsTblComplex() const
     return false;
 }
 
-SwTableLine::SwTableLine( SwTableLineFmt *pFmt, sal_uInt16 nBoxes,
+SwTableLine::SwTableLine( SwTableLineFormat *pFormat, sal_uInt16 nBoxes,
                             SwTableBox *pUp )
-    : SwClient( pFmt ),
+    : SwClient( pFormat ),
     aBoxes(),
     pUpper( pUp )
 {
@@ -1521,38 +1521,38 @@ SwTableLine::~SwTableLine()
         delete aBoxes[i];
     }
     // the TabelleLine can be deleted if it's the last client of the FrameFormat
-    SwModify* pMod = GetFrmFmt();
+    SwModify* pMod = GetFrameFormat();
     pMod->Remove( this );               // remove,
     if( !pMod->HasWriterListeners() )
         delete pMod;    // and delete
 }
 
-SwFrmFmt* SwTableLine::ClaimFrmFmt()
+SwFrameFormat* SwTableLine::ClaimFrameFormat()
 {
     // This method makes sure that this object is an exclusive SwTableLine client
-    // of an SwTableLineFmt object
-    // If other SwTableLine objects currently listen to the same SwTableLineFmt as
+    // of an SwTableLineFormat object
+    // If other SwTableLine objects currently listen to the same SwTableLineFormat as
     // this one, something needs to be done
-    SwTableLineFmt *pRet = static_cast<SwTableLineFmt*>(GetFrmFmt());
-    SwIterator<SwTableLine,SwFmt> aIter( *pRet );
+    SwTableLineFormat *pRet = static_cast<SwTableLineFormat*>(GetFrameFormat());
+    SwIterator<SwTableLine,SwFormat> aIter( *pRet );
     for( SwTableLine* pLast = aIter.First(); pLast; pLast = aIter.Next() )
     {
         if ( pLast != this )
         {
-            // found another SwTableLine that is a client of the current Fmt
-            // create a new Fmt as a copy and use it for this object
-            SwTableLineFmt *pNewFmt = pRet->GetDoc()->MakeTableLineFmt();
-            *pNewFmt = *pRet;
+            // found another SwTableLine that is a client of the current Format
+            // create a new Format as a copy and use it for this object
+            SwTableLineFormat *pNewFormat = pRet->GetDoc()->MakeTableLineFormat();
+            *pNewFormat = *pRet;
 
-            // register SwRowFrms that know me as clients at the new Fmt
-            SwIterator<SwRowFrm,SwFmt> aFrmIter( *pRet );
+            // register SwRowFrms that know me as clients at the new Format
+            SwIterator<SwRowFrm,SwFormat> aFrmIter( *pRet );
             for( SwRowFrm* pFrm = aFrmIter.First(); pFrm; pFrm = aFrmIter.Next() )
                 if( pFrm->GetTabLine() == this )
-                    pFrm->RegisterToFormat( *pNewFmt );
+                    pFrm->RegisterToFormat( *pNewFormat );
 
             // register myself
-            pNewFmt->Add( this );
-            pRet = pNewFmt;
+            pNewFormat->Add( this );
+            pRet = pNewFormat;
             break;
         }
     }
@@ -1560,17 +1560,17 @@ SwFrmFmt* SwTableLine::ClaimFrmFmt()
     return pRet;
 }
 
-void SwTableLine::ChgFrmFmt( SwTableLineFmt *pNewFmt )
+void SwTableLine::ChgFrameFormat( SwTableLineFormat *pNewFormat )
 {
-    SwFrmFmt *pOld = GetFrmFmt();
-    SwIterator<SwRowFrm,SwFmt> aIter( *pOld );
+    SwFrameFormat *pOld = GetFrameFormat();
+    SwIterator<SwRowFrm,SwFormat> aIter( *pOld );
 
     // First, re-register the Frms.
     for( SwRowFrm* pRow = aIter.First(); pRow; pRow = aIter.Next() )
     {
         if( pRow->GetTabLine() == this )
         {
-            pRow->RegisterToFormat( *pNewFmt );
+            pRow->RegisterToFormat( *pNewFormat );
 
             pRow->InvalidateSize();
             pRow->_InvalidatePrt();
@@ -1598,7 +1598,7 @@ void SwTableLine::ChgFrmFmt( SwTableLineFmt *pNewFmt )
     }
 
     // Now, re-register self.
-    pNewFmt->Add( this );
+    pNewFormat->Add( this );
 
     if ( !pOld->HasWriterListeners() )
         delete pOld;
@@ -1608,7 +1608,7 @@ SwTwips SwTableLine::GetTableLineHeight( bool& bLayoutAvailable ) const
 {
     SwTwips nRet = 0;
     bLayoutAvailable = false;
-    SwIterator<SwRowFrm,SwFmt> aIter( *GetFrmFmt() );
+    SwIterator<SwRowFrm,SwFormat> aIter( *GetFrameFormat() );
     // A row could appear several times in headers/footers so only one chain of master/follow tables
     // will be accepted...
     const SwTabFrm* pChain = NULL; // My chain
@@ -1643,7 +1643,7 @@ SwTwips SwTableLine::GetTableLineHeight( bool& bLayoutAvailable ) const
     return nRet;
 }
 
-SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, sal_uInt16 nLines, SwTableLine *pUp )
+SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, sal_uInt16 nLines, SwTableLine *pUp )
     : SwClient( 0 ),
     aLines(),
     pSttNd( 0 ),
@@ -1651,42 +1651,42 @@ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, sal_uInt16 nLines, SwTableLine *pUp
     pImpl( 0 )
 {
     aLines.reserve( nLines );
-    CheckBoxFmt( pFmt )->Add( this );
+    CheckBoxFormat( pFormat )->Add( this );
 }
 
-SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwNodeIndex &rIdx,
+SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, const SwNodeIndex &rIdx,
                         SwTableLine *pUp )
     : SwClient( 0 ),
     aLines(),
     pUpper( pUp ),
     pImpl( 0 )
 {
-    CheckBoxFmt( pFmt )->Add( this );
+    CheckBoxFormat( pFormat )->Add( this );
 
     pSttNd = rIdx.GetNode().GetStartNode();
 
     // insert into the table
-    const SwTableNode* pTblNd = pSttNd->FindTableNode();
-    OSL_ENSURE( pTblNd, "In which table is that box?" );
-    SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
+    const SwTableNode* pTableNd = pSttNd->FindTableNode();
+    OSL_ENSURE( pTableNd, "In which table is that box?" );
+    SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTableNd->GetTable().
                                 GetTabSortBoxes();
     SwTableBox* p = this;   // error: &this
     rSrtArr.insert( p );        // insert
 }
 
-SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwStartNode& rSttNd, SwTableLine *pUp ) :
+SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, const SwStartNode& rSttNd, SwTableLine *pUp ) :
     SwClient( 0 ),
     aLines(),
     pSttNd( &rSttNd ),
     pUpper( pUp ),
     pImpl( 0 )
 {
-    CheckBoxFmt( pFmt )->Add( this );
+    CheckBoxFormat( pFormat )->Add( this );
 
     // insert into the table
-    const SwTableNode* pTblNd = pSttNd->FindTableNode();
-    OSL_ENSURE( pTblNd, "In which table is the box?" );
-    SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
+    const SwTableNode* pTableNd = pSttNd->FindTableNode();
+    OSL_ENSURE( pTableNd, "In which table is the box?" );
+    SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTableNd->GetTable().
                                 GetTabSortBoxes();
     SwTableBox* p = this;   // error: &this
     rSrtArr.insert( p );        // insert
@@ -1697,9 +1697,9 @@ void SwTableBox::RemoveFromTable()
     if (pSttNd) // box containing contents?
     {
         // remove from table
-        const SwTableNode* pTblNd = pSttNd->FindTableNode();
-        assert(pTblNd && "In which table is that box?");
-        SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
+        const SwTableNode* pTableNd = pSttNd->FindTableNode();
+        assert(pTableNd && "In which table is that box?");
+        SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTableNd->GetTable().
                                     GetTabSortBoxes();
         SwTableBox *p = this;   // error: &this
         rSrtArr.erase( p );        // remove
@@ -1709,13 +1709,13 @@ void SwTableBox::RemoveFromTable()
 
 SwTableBox::~SwTableBox()
 {
-    if (!GetFrmFmt()->GetDoc()->IsInDtor())
+    if (!GetFrameFormat()->GetDoc()->IsInDtor())
     {
         RemoveFromTable();
     }
 
     // the TabelleBox can be deleted if it's the last client of the FrameFormat
-    SwModify* pMod = GetFrmFmt();
+    SwModify* pMod = GetFrameFormat();
     pMod->Remove( this );               // remove,
     if( !pMod->HasWriterListeners() )
         delete pMod;    // and delete
@@ -1723,77 +1723,77 @@ SwTableBox::~SwTableBox()
     delete pImpl;
 }
 
-SwTableBoxFmt* SwTableBox::CheckBoxFmt( SwTableBoxFmt* pFmt )
+SwTableBoxFormat* SwTableBox::CheckBoxFormat( SwTableBoxFormat* pFormat )
 {
     // We might need to create a new format here, because the box must be
-    // added to the format solely if pFmt has a value or formular.
-    if( SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_VALUE, false ) ||
-        SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_FORMULA, false ) )
+    // added to the format solely if pFormat has a value or formular.
+    if( SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_VALUE, false ) ||
+        SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_FORMULA, false ) )
     {
-        SwTableBox* pOther = SwIterator<SwTableBox,SwFmt>( *pFmt ).First();
+        SwTableBox* pOther = SwIterator<SwTableBox,SwFormat>( *pFormat ).First();
         if( pOther )
         {
-            SwTableBoxFmt* pNewFmt = pFmt->GetDoc()->MakeTableBoxFmt();
-            pNewFmt->LockModify();
-            *pNewFmt = *pFmt;
+            SwTableBoxFormat* pNewFormat = pFormat->GetDoc()->MakeTableBoxFormat();
+            pNewFormat->LockModify();
+            *pNewFormat = *pFormat;
 
             // Remove values and formulars
-            pNewFmt->ResetFmtAttr( RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
-            pNewFmt->UnlockModify();
+            pNewFormat->ResetFormatAttr( RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
+            pNewFormat->UnlockModify();
 
-            pFmt = pNewFmt;
+            pFormat = pNewFormat;
         }
     }
-    return pFmt;
+    return pFormat;
 }
 
-SwFrmFmt* SwTableBox::ClaimFrmFmt()
+SwFrameFormat* SwTableBox::ClaimFrameFormat()
 {
     // This method makes sure that this object is an exclusive SwTableBox client
-    // of an SwTableBoxFmt object
-    // If other SwTableBox objects currently listen to the same SwTableBoxFmt as
+    // of an SwTableBoxFormat object
+    // If other SwTableBox objects currently listen to the same SwTableBoxFormat as
     // this one, something needs to be done
-    SwTableBoxFmt *pRet = static_cast<SwTableBoxFmt*>(GetFrmFmt());
-    SwIterator<SwTableBox,SwFmt> aIter( *pRet );
+    SwTableBoxFormat *pRet = static_cast<SwTableBoxFormat*>(GetFrameFormat());
+    SwIterator<SwTableBox,SwFormat> aIter( *pRet );
     for( SwTableBox* pLast = aIter.First(); pLast; pLast = aIter.Next() )
     {
         if ( pLast != this )
         {
             // Found another SwTableBox object
-            // create a new Fmt as a copy and assign me to it
+            // create a new Format as a copy and assign me to it
             // don't copy values and formulas
-            SwTableBoxFmt* pNewFmt = pRet->GetDoc()->MakeTableBoxFmt();
-            pNewFmt->LockModify();
-            *pNewFmt = *pRet;
-            pNewFmt->ResetFmtAttr( RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
-            pNewFmt->UnlockModify();
+            SwTableBoxFormat* pNewFormat = pRet->GetDoc()->MakeTableBoxFormat();
+            pNewFormat->LockModify();
+            *pNewFormat = *pRet;
+            pNewFormat->ResetFormatAttr( RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
+            pNewFormat->UnlockModify();
 
             // re-register SwCellFrm objects that know me
-            SwIterator<SwCellFrm,SwFmt> aFrmIter( *pRet );
+            SwIterator<SwCellFrm,SwFormat> aFrmIter( *pRet );
             for( SwCellFrm* pCell = aFrmIter.First(); pCell; pCell = aFrmIter.Next() )
                 if( pCell->GetTabBox() == this )
-                    pCell->RegisterToFormat( *pNewFmt );
+                    pCell->RegisterToFormat( *pNewFormat );
 
             // re-register myself
-            pNewFmt->Add( this );
-            pRet = pNewFmt;
+            pNewFormat->Add( this );
+            pRet = pNewFormat;
             break;
         }
     }
     return pRet;
 }
 
-void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt )
+void SwTableBox::ChgFrameFormat( SwTableBoxFormat* pNewFormat )
 {
-    SwFrmFmt *pOld = GetFrmFmt();
-    SwIterator<SwCellFrm,SwFmt> aIter( *pOld );
+    SwFrameFormat *pOld = GetFrameFormat();
+    SwIterator<SwCellFrm,SwFormat> aIter( *pOld );
 
     // First, re-register the Frms.
     for( SwCellFrm* pCell = aIter.First(); pCell; pCell = aIter.Next() )
     {
         if( pCell->GetTabBox() == this )
         {
-            pCell->RegisterToFormat( *pNewFmt );
+            pCell->RegisterToFormat( *pNewFormat );
             pCell->InvalidateSize();
             pCell->_InvalidatePrt();
             pCell->SetCompletePaint();
@@ -1815,7 +1815,7 @@ void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt )
     }
 
     // Now, re-register self.
-    pNewFmt->Add( this );
+    pNewFormat->Add( this );
 
     if( !pOld->HasWriterListeners() )
         delete pOld;
@@ -1823,7 +1823,7 @@ void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt )
 
 // Return the name of this box. This is determined dynamically
 // resulting from the position in the lines/boxes/tables.
-void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm )
+void sw_GetTableBoxColStr( sal_uInt16 nCol, OUString& rNm )
 {
     const sal_uInt16 coDiff = 52;   // 'A'-'Z' 'a' - 'z'
 
@@ -1849,7 +1849,7 @@ Point SwTableBox::GetCoordinates() const
         return Point( 0, 0 );
     }
 
-    const SwTable& rTbl = pSttNd->FindTableNode()->GetTable();
+    const SwTable& rTable = pSttNd->FindTableNode()->GetTable();
     sal_uInt16 nX, nY;
     const SwTableBox* pBox = this;
     do {
@@ -1857,7 +1857,7 @@ Point SwTableBox::GetCoordinates() const
         const SwTableLine* pLine = pBox->GetUpper();
         // at the first level?
         const SwTableLines* pLines = pLine->GetUpper()
-                ? &pLine->GetUpper()->GetTabLines() : &rTbl.GetTabLines();
+                ? &pLine->GetUpper()->GetTabLines() : &rTable.GetTabLines();
 
         nY = pLines->GetPos( pLine ) + 1 ;
         nX = pBoxes->GetPos( pBox ) + 1 ;
@@ -1874,7 +1874,7 @@ OUString SwTableBox::GetName() const
         return OUString();
     }
 
-    const SwTable& rTbl = pSttNd->FindTableNode()->GetTable();
+    const SwTable& rTable = pSttNd->FindTableNode()->GetTable();
     sal_uInt16 nPos;
     OUString sNm, sTmp;
     const SwTableBox* pBox = this;
@@ -1883,7 +1883,7 @@ OUString SwTableBox::GetName() const
         const SwTableLine* pLine = pBox->GetUpper();
         // at the first level?
         const SwTableLines* pLines = pLine->GetUpper()
-                ? &pLine->GetUpper()->GetTabLines() : &rTbl.GetTabLines();
+                ? &pLine->GetUpper()->GetTabLines() : &rTable.GetTabLines();
 
         sTmp = OUString::number( nPos = pLines->GetPos( pLine ) + 1 );
         if( !sNm.isEmpty() )
@@ -1895,26 +1895,26 @@ OUString SwTableBox::GetName() const
         if( 0 != ( pBox = pLine->GetUpper()) )
             sNm = sTmp + "." + sNm;
         else
-            sw_GetTblBoxColStr( nPos, sNm );
+            sw_GetTableBoxColStr( nPos, sNm );
 
     } while( pBox );
     return sNm;
 }
 
-bool SwTableBox::IsInHeadline( const SwTable* pTbl ) const
+bool SwTableBox::IsInHeadline( const SwTable* pTable ) const
 {
     if( !GetUpper() )           // should only happen upon merge.
         return false;
 
-    if( !pTbl )
-        pTbl = &pSttNd->FindTableNode()->GetTable();
+    if( !pTable )
+        pTable = &pSttNd->FindTableNode()->GetTable();
 
     const SwTableLine* pLine = GetUpper();
     while( pLine->GetUpper() )
         pLine = pLine->GetUpper()->GetUpper();
 
     // Headerline?
-    return pTbl->GetTabLines()[ 0 ] == pLine;
+    return pTable->GetTabLines()[ 0 ] == pLine;
 }
 
 sal_uLong SwTableBox::GetSttIdx() const
@@ -1930,20 +1930,20 @@ bool SwTable::GetInfo( SfxPoolItem& rInfo ) const
         case RES_AUTOFMT_DOCNODE:
         {
             const SwTableNode* pNode = GetTableNode();
-            if (pNode && &pNode->GetNodes() == static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes)
+            if (pNode && &pNode->GetNodes() == static_cast<SwAutoFormatGetDocNode&>(rInfo).pNodes)
             {
                 if (!m_TabSortContentBoxes.empty())
                 {
                     SwNodeIndex aIdx( *m_TabSortContentBoxes[0]->GetSttNd() );
-                    static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode =
-                                    GetFrmFmt()->GetDoc()->GetNodes().GoNext( &aIdx );
+                    static_cast<SwAutoFormatGetDocNode&>(rInfo).pContentNode =
+                                    GetFrameFormat()->GetDoc()->GetNodes().GoNext( &aIdx );
                 }
                 return false;
             }
             break;
         }
         case RES_FINDNEARESTNODE:
-            if( GetFrmFmt() && static_cast<const SwFmtPageDesc&>(GetFrmFmt()->GetFmtAttr(
+            if( GetFrameFormat() && static_cast<const SwFormatPageDesc&>(GetFrameFormat()->GetFormatAttr(
                 RES_PAGEDESC )).GetPageDesc() &&
                 !m_TabSortContentBoxes.empty() &&
                 m_TabSortContentBoxes[0]->GetSttNd()->GetNodes().IsDocNodes() )
@@ -1952,16 +1952,16 @@ bool SwTable::GetInfo( SfxPoolItem& rInfo ) const
             break;
 
         case RES_CONTENT_VISIBLE:
-            static_cast<SwPtrMsgPoolItem&>(rInfo).pObject = SwIterator<SwFrm,SwFmt>( *GetFrmFmt() ).First();
+            static_cast<SwPtrMsgPoolItem&>(rInfo).pObject = SwIterator<SwFrm,SwFormat>( *GetFrameFormat() ).First();
             return false;
     }
     return true;
 }
 
-SwTable * SwTable::FindTable( SwFrmFmt const*const pFmt )
+SwTable * SwTable::FindTable( SwFrameFormat const*const pFormat )
 {
-    return (pFmt)
-        ? SwIterator<SwTable,SwFmt>(*pFmt).First()
+    return (pFormat)
+        ? SwIterator<SwTable,SwFormat>(*pFormat).First()
         : nullptr;
 }
 
@@ -1986,26 +1986,26 @@ void SwTable::SetHTMLTableLayout( SwHTMLTableLayout *p )
     pHTMLLayout = p;
 }
 
-void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
+void ChgTextToNum( SwTableBox& rBox, const OUString& rText, const Color* pCol,
                     bool bChgAlign )
 {
-    sal_uLong nNdPos = rBox.IsValidNumTxtNd( true );
-    ChgTextToNum( rBox,rTxt,pCol,bChgAlign,nNdPos);
+    sal_uLong nNdPos = rBox.IsValidNumTextNd( true );
+    ChgTextToNum( rBox,rText,pCol,bChgAlign,nNdPos);
 }
-void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
+void ChgTextToNum( SwTableBox& rBox, const OUString& rText, const Color* pCol,
                     bool bChgAlign,sal_uLong nNdPos )
 {
 
     if( ULONG_MAX != nNdPos )
     {
-        SwDoc* pDoc = rBox.GetFrmFmt()->GetDoc();
-        SwTxtNode* pTNd = pDoc->GetNodes()[ nNdPos ]->GetTxtNode();
+        SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc();
+        SwTextNode* pTNd = pDoc->GetNodes()[ nNdPos ]->GetTextNode();
         const SfxPoolItem* pItem;
 
         // assign adjustment
         if( bChgAlign )
         {
-            pItem = &pTNd->SwCntntNode::GetAttr( RES_PARATR_ADJUST );
+            pItem = &pTNd->SwContentNode::GetAttr( RES_PARATR_ADJUST );
             SvxAdjust eAdjust = static_cast<const SvxAdjustItem*>(pItem)->GetAdjust();
             if( SVX_ADJUST_LEFT == eAdjust || SVX_ADJUST_BLOCK == eAdjust )
             {
@@ -2020,14 +2020,14 @@ void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
             GetItemState( RES_CHRATR_COLOR, false, &pItem ))
             pItem = 0;
 
-        const Color* pOldNumFmtColor = rBox.GetSaveNumFmtColor();
+        const Color* pOldNumFormatColor = rBox.GetSaveNumFormatColor();
         const Color* pNewUserColor = pItem ? &static_cast<const SvxColorItem*>(pItem)->GetValue() : 0;
 
-        if( ( pNewUserColor && pOldNumFmtColor &&
-                *pNewUserColor == *pOldNumFmtColor ) ||
-            ( !pNewUserColor && !pOldNumFmtColor ))
+        if( ( pNewUserColor && pOldNumFormatColor &&
+                *pNewUserColor == *pOldNumFormatColor ) ||
+            ( !pNewUserColor && !pOldNumFormatColor ))
         {
-            // Keep the user color, set updated values, delete old NumFmtColor if needed
+            // Keep the user color, set updated values, delete old NumFormatColor if needed
             if( pCol )
                 // if needed, set the color
                 pTNd->SetAttr( SvxColorItem( *pCol, RES_CHRATR_COLOR ));
@@ -2050,12 +2050,12 @@ void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
                 pTNd->SetAttr( SvxColorItem( *pCol, RES_CHRATR_COLOR ));
 
         }
-        rBox.SetSaveNumFmtColor( pCol );
+        rBox.SetSaveNumFormatColor( pCol );
 
-        if( pTNd->GetTxt() != rTxt )
+        if( pTNd->GetText() != rText )
         {
             // Exchange text. Bugfix to keep Tabs (front and back!)
-            const OUString& rOrig = pTNd->GetTxt();
+            const OUString& rOrig = pTNd->GetText();
             sal_Int32 n;
 
             for( n = 0; n < rOrig.getLength() && '\x9' == rOrig[n]; ++n )
@@ -2070,59 +2070,59 @@ void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
             // Reset DontExpand-Flags before exchange, to retrigger expansion
             {
                 SwIndex aResetIdx( aIdx, n );
-                pTNd->DontExpandFmt( aResetIdx, false, false );
+                pTNd->DontExpandFormat( aResetIdx, false, false );
             }
 
-            if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+            if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
             {
                 SwPaM aTemp(*pTNd, 0, *pTNd, rOrig.getLength());
                 pDoc->getIDocumentRedlineAccess().DeleteRedline(aTemp, true, USHRT_MAX);
             }
 
             pTNd->EraseText( aIdx, n, SwInsertFlags::EMPTYEXPAND );
-            pTNd->InsertText( rTxt, aIdx, SwInsertFlags::EMPTYEXPAND );
+            pTNd->InsertText( rText, aIdx, SwInsertFlags::EMPTYEXPAND );
 
             if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() )
             {
-                SwPaM aTemp(*pTNd, 0, *pTNd, rTxt.getLength());
+                SwPaM aTemp(*pTNd, 0, *pTNd, rText.getLength());
                 pDoc->getIDocumentRedlineAccess().AppendRedline(new SwRangeRedline(nsRedlineType_t::REDLINE_INSERT, aTemp), true);
             }
         }
 
         // assign vertical orientation
         if( bChgAlign &&
-            ( SfxItemState::SET != rBox.GetFrmFmt()->GetItemState(
+            ( SfxItemState::SET != rBox.GetFrameFormat()->GetItemState(
                 RES_VERT_ORIENT, true, &pItem ) ||
-                text::VertOrientation::TOP == static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() ))
+                text::VertOrientation::TOP == static_cast<const SwFormatVertOrient*>(pItem)->GetVertOrient() ))
         {
-            rBox.GetFrmFmt()->SetFmtAttr( SwFmtVertOrient( 0, text::VertOrientation::BOTTOM ));
+            rBox.GetFrameFormat()->SetFormatAttr( SwFormatVertOrient( 0, text::VertOrientation::BOTTOM ));
         }
     }
 }
 
-void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt )
+void ChgNumToText( SwTableBox& rBox, sal_uLong nFormat )
 {
-    sal_uLong nNdPos = rBox.IsValidNumTxtNd( false );
+    sal_uLong nNdPos = rBox.IsValidNumTextNd( false );
     if( ULONG_MAX != nNdPos )
     {
-        SwDoc* pDoc = rBox.GetFrmFmt()->GetDoc();
-        SwTxtNode* pTNd = pDoc->GetNodes()[ nNdPos ]->GetTxtNode();
-        bool bChgAlign = pDoc->IsInsTblAlignNum();
+        SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc();
+        SwTextNode* pTNd = pDoc->GetNodes()[ nNdPos ]->GetTextNode();
+        bool bChgAlign = pDoc->IsInsTableAlignNum();
         const SfxPoolItem* pItem;
 
         Color* pCol = 0;
-        if( css::util::NumberFormat::TEXT != static_cast<sal_Int16>(nFmt) )
+        if( css::util::NumberFormat::TEXT != static_cast<sal_Int16>(nFormat) )
         {
             // special text format:
             OUString sTmp;
-            const OUString sTxt( pTNd->GetTxt() );
-            pDoc->GetNumberFormatter()->GetOutputString( sTxt, nFmt, sTmp, &pCol );
-            if( sTxt != sTmp )
+            const OUString sText( pTNd->GetText() );
+            pDoc->GetNumberFormatter()->GetOutputString( sText, nFormat, sTmp, &pCol );
+            if( sText != sTmp )
             {
                 // exchange text
-                SwIndex aIdx( pTNd, sTxt.getLength() );
+                SwIndex aIdx( pTNd, sText.getLength() );
                 // Reset DontExpand-Flags before exchange, to retrigger expansion
-                pTNd->DontExpandFmt( aIdx, false, false );
+                pTNd->DontExpandFormat( aIdx, false, false );
                 aIdx = 0;
                 pTNd->EraseText( aIdx, SAL_MAX_INT32, SwInsertFlags::EMPTYEXPAND );
                 pTNd->InsertText( sTmp, aIdx, SwInsertFlags::EMPTYEXPAND );
@@ -2144,14 +2144,14 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt )
             GetItemState( RES_CHRATR_COLOR, false, &pItem ))
             pItem = 0;
 
-        const Color* pOldNumFmtColor = rBox.GetSaveNumFmtColor();
+        const Color* pOldNumFormatColor = rBox.GetSaveNumFormatColor();
         const Color* pNewUserColor = pItem ? &static_cast<const SvxColorItem*>(pItem)->GetValue() : 0;
 
-        if( ( pNewUserColor && pOldNumFmtColor &&
-                *pNewUserColor == *pOldNumFmtColor ) ||
-            ( !pNewUserColor && !pOldNumFmtColor ))
+        if( ( pNewUserColor && pOldNumFormatColor &&
+                *pNewUserColor == *pOldNumFormatColor ) ||
+            ( !pNewUserColor && !pOldNumFormatColor ))
         {
-            // Keep the user color, set updated values, delete old NumFmtColor if needed
+            // Keep the user color, set updated values, delete old NumFormatColor if needed
             if( pCol )
                 // if needed, set the color
                 pTNd->SetAttr( SvxColorItem( *pCol, RES_CHRATR_COLOR ));
@@ -2174,28 +2174,28 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt )
                 pTNd->SetAttr( SvxColorItem( *pCol, RES_CHRATR_COLOR ));
 
         }
-        rBox.SetSaveNumFmtColor( pCol );
+        rBox.SetSaveNumFormatColor( pCol );
 
         // assign vertical orientation
         if( bChgAlign &&
-            SfxItemState::SET == rBox.GetFrmFmt()->GetItemState(
+            SfxItemState::SET == rBox.GetFrameFormat()->GetItemState(
             RES_VERT_ORIENT, false, &pItem ) &&
-            text::VertOrientation::BOTTOM == static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() )
+            text::VertOrientation::BOTTOM == static_cast<const SwFormatVertOrient*>(pItem)->GetVertOrient() )
         {
-            rBox.GetFrmFmt()->SetFmtAttr( SwFmtVertOrient( 0, text::VertOrientation::TOP ));
+            rBox.GetFrameFormat()->SetFormatAttr( SwFormatVertOrient( 0, text::VertOrientation::TOP ));
         }
     }
 }
 
 // for detection of modifications (mainly TableBoxAttribute)
-void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     if( !IsModifyLocked() && !IsInDocDTOR() )
     {
-        const SwTblBoxNumFormat *pNewFmt = 0;
-        const SwTblBoxFormula *pNewFml = 0;
-        const SwTblBoxValue *pNewVal = 0;
-        sal_uLong nOldFmt = css::util::NumberFormat::TEXT;
+        const SwTableBoxNumFormat *pNewFormat = 0;
+        const SwTableBoxFormula *pNewFormula = 0;
+        const SwTableBoxValue *pNewVal = 0;
+        sal_uLong nOldFormat = css::util::NumberFormat::TEXT;
 
         switch( pNew ? pNew->Which() : 0 )
         {
@@ -2203,29 +2203,29 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
             {
                 const SfxItemSet& rSet = *static_cast<const SwAttrSetChg*>(pNew)->GetChgSet();
                 if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMAT,
-                                    false, reinterpret_cast<const SfxPoolItem**>(&pNewFmt) ) )
-                    nOldFmt = static_cast<const SwTblBoxNumFormat&>(static_cast<const SwAttrSetChg*>(pOld)->
+                                    false, reinterpret_cast<const SfxPoolItem**>(&pNewFormat) ) )
+                    nOldFormat = static_cast<const SwTableBoxNumFormat&>(static_cast<const SwAttrSetChg*>(pOld)->
                             GetChgSet()->Get( RES_BOXATR_FORMAT )).GetValue();
                 rSet.GetItemState( RES_BOXATR_FORMULA, false,
-                                    reinterpret_cast<const SfxPoolItem**>(&pNewFml) );
+                                    reinterpret_cast<const SfxPoolItem**>(&pNewFormula) );
                 rSet.GetItemState( RES_BOXATR_VALUE, false,
                                     reinterpret_cast<const SfxPoolItem**>(&pNewVal) );
                 break;
             }
             case RES_BOXATR_FORMAT:
-                pNewFmt = static_cast<const SwTblBoxNumFormat*>(pNew);
-                nOldFmt = static_cast<const SwTblBoxNumFormat*>(pOld)->GetValue();
+                pNewFormat = static_cast<const SwTableBoxNumFormat*>(pNew);
+                nOldFormat = static_cast<const SwTableBoxNumFormat*>(pOld)->GetValue();
                 break;
             case RES_BOXATR_FORMULA:
-                pNewFml = static_cast<const SwTblBoxFormula*>(pNew);
+                pNewFormula = static_cast<const SwTableBoxFormula*>(pNew);
                 break;
             case RES_BOXATR_VALUE:
-                pNewVal = static_cast<const SwTblBoxValue*>(pNew);
+                pNewVal = static_cast<const SwTableBoxValue*>(pNew);
                 break;
         }
 
         // something changed and some BoxAttribut remained in the set!
-        if( pNewFmt || pNewFml || pNewVal )
+        if( pNewFormat || pNewFormula || pNewVal )
         {
             GetDoc()->getIDocumentFieldsAccess().SetFieldsDirty(true, NULL, 0);
 
@@ -2234,42 +2234,42 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                 SfxItemState::SET == GetItemState( RES_BOXATR_FORMULA, false ) )
             {
                 // fetch the box
-                SwIterator<SwTableBox,SwFmt> aIter( *this );
+                SwIterator<SwTableBox,SwFormat> aIter( *this );
                 SwTableBox* pBox = aIter.First();
                 if( pBox )
                 {
                     OSL_ENSURE( !aIter.Next(), "zeor or more than one box at format" );
 
-                    sal_uLong nNewFmt;
-                    if( pNewFmt )
+                    sal_uLong nNewFormat;
+                    if( pNewFormat )
                     {
-                        nNewFmt = pNewFmt->GetValue();
+                        nNewFormat = pNewFormat->GetValue();
                         // new formatting
                         // is it newer or has the current been removed?
                         if( SfxItemState::SET != GetItemState( RES_BOXATR_VALUE, false ))
-                            pNewFmt = 0;
+                            pNewFormat = 0;
                     }
                     else
                     {
                         // fetch the current Item
                         GetItemState( RES_BOXATR_FORMAT, false,
-                                            reinterpret_cast<const SfxPoolItem**>(&pNewFmt) );
-                        nOldFmt = GetTblBoxNumFmt().GetValue();
-                        nNewFmt = pNewFmt ? pNewFmt->GetValue() : nOldFmt;
+                                            reinterpret_cast<const SfxPoolItem**>(&pNewFormat) );
+                        nOldFormat = GetTableBoxNumFormat().GetValue();
+                        nNewFormat = pNewFormat ? pNewFormat->GetValue() : nOldFormat;
                     }
 
                     // is it newer or has the current been removed?
                     if( pNewVal )
                     {
-                        if( css::util::NumberFormat::TEXT != static_cast<sal_Int16>(nNewFmt) )
+                        if( css::util::NumberFormat::TEXT != static_cast<sal_Int16>(nNewFormat) )
                         {
                             if( SfxItemState::SET == GetItemState( RES_BOXATR_VALUE, false ))
-                                nOldFmt = css::util::NumberFormat::TEXT;
+                                nOldFormat = css::util::NumberFormat::TEXT;
                             else
-                                nNewFmt = css::util::NumberFormat::TEXT;
+                                nNewFormat = css::util::NumberFormat::TEXT;
                         }
-                        else if( css::util::NumberFormat::TEXT == static_cast<sal_Int16>(nNewFmt) )
-                            nOldFmt = 0;
+                        else if( css::util::NumberFormat::TEXT == static_cast<sal_Int16>(nNewFormat) )
+                            nOldFormat = 0;
                     }
 
                     // Logic:
@@ -2282,59 +2282,59 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                     // !Text -> Text:
                     //          - align left for horizontal alignment, if RIGHT
                     //          - align top for vertical alignment, if BOTTOM is set
-                    SvNumberFormatter* pNumFmtr = GetDoc()->GetNumberFormatter();
-                    bool bNewIsTxtFmt = pNumFmtr->IsTextFormat( nNewFmt ) ||
-                                        css::util::NumberFormat::TEXT == static_cast<sal_Int16>(nNewFmt);
+                    SvNumberFormatter* pNumFormatr = GetDoc()->GetNumberFormatter();
+                    bool bNewIsTextFormat = pNumFormatr->IsTextFormat( nNewFormat ) ||
+                                        css::util::NumberFormat::TEXT == static_cast<sal_Int16>(nNewFormat);
 
-                    if( (!bNewIsTxtFmt && nOldFmt != nNewFmt) || pNewFml )
+                    if( (!bNewIsTextFormat && nOldFormat != nNewFormat) || pNewFormula )
                     {
-                        bool bChgTxt = true;
+                        bool bChgText = true;
                         double fVal = 0;
                         if( !pNewVal && SfxItemState::SET != GetItemState(
                             RES_BOXATR_VALUE, false, reinterpret_cast<const SfxPoolItem**>(&pNewVal) ))
                         {
                             // so far, no value has been set, so try to evaluate the content
-                            sal_uLong nNdPos = pBox->IsValidNumTxtNd( true );
+                            sal_uLong nNdPos = pBox->IsValidNumTextNd( true );
                             if( ULONG_MAX != nNdPos )
                             {
-                                sal_uInt32 nTmpFmtIdx = nNewFmt;
-                                OUString aTxt( GetDoc()->GetNodes()[ nNdPos ]
-                                                ->GetTxtNode()->GetRedlineTxt());
-                                if( aTxt.isEmpty() )
-                                    bChgTxt = false;
+                                sal_uInt32 nTmpFormatIdx = nNewFormat;
+                                OUString aText( GetDoc()->GetNodes()[ nNdPos ]
+                                                ->GetTextNode()->GetRedlineText());
+                                if( aText.isEmpty() )
+                                    bChgText = false;
                                 else
                                 {
                                     // Keep Tabs
-                                    lcl_TabToBlankAtSttEnd( aTxt );
+                                    lcl_TabToBlankAtSttEnd( aText );
 
                                     // JP 22.04.98: Bug 49659 -
                                     //  Special casing for percent
-                                    bool bIsNumFmt = false;
+                                    bool bIsNumFormat = false;
                                     if( css::util::NumberFormat::PERCENT ==
-                                        pNumFmtr->GetType( nNewFmt ))
+                                        pNumFormatr->GetType( nNewFormat ))
                                     {
-                                        sal_uInt32 nTmpFmt = 0;
-                                        if( pNumFmtr->IsNumberFormat(
-                                                    aTxt, nTmpFmt, fVal ))
+                                        sal_uInt32 nTmpFormat = 0;
+                                        if( pNumFormatr->IsNumberFormat(
+                                                    aText, nTmpFormat, fVal ))
                                         {
                                             if( css::util::NumberFormat::NUMBER ==
-                                                pNumFmtr->GetType( nTmpFmt ))
-                                                aTxt += "%";
+                                                pNumFormatr->GetType( nTmpFormat ))
+                                                aText += "%";
 
-                                            bIsNumFmt = pNumFmtr->IsNumberFormat(
-                                                        aTxt, nTmpFmtIdx, fVal );
+                                            bIsNumFormat = pNumFormatr->IsNumberFormat(
+                                                        aText, nTmpFormatIdx, fVal );
                                         }
                                     }
                                     else
-                                        bIsNumFmt = pNumFmtr->IsNumberFormat(
-                                                        aTxt, nTmpFmtIdx, fVal );
+                                        bIsNumFormat = pNumFormatr->IsNumberFormat(
+                                                        aText, nTmpFormatIdx, fVal );
 
-                                    if( bIsNumFmt )
+                                    if( bIsNumFormat )
                                     {
                                         // directly assign value - without Modify
                                         bool bIsLockMod = IsModifyLocked();
                                         LockModify();
-                                        SetFmtAttr( SwTblBoxValue( fVal ));
+                                        SetFormatAttr( SwTableBoxValue( fVal ));
                                         if( !bIsLockMod )
                                             UnlockModify();
                                     }
@@ -2346,86 +2346,86 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 
                         // format contents with the new value assigned and write to paragraph
                         Color* pCol = 0;
-                        OUString sNewTxt;
+                        OUString sNewText;
                         if( DBL_MAX == fVal )
                         {
-                            sNewTxt = SwViewShell::GetShellRes()->aCalc_Error;
+                            sNewText = SwViewShell::GetShellRes()->aCalc_Error;
                         }
                         else
                         {
-                            pNumFmtr->GetOutputString( fVal, nNewFmt, sNewTxt, &pCol );
+                            pNumFormatr->GetOutputString( fVal, nNewFormat, sNewText, &pCol );
 
-                            if( !bChgTxt )
+                            if( !bChgText )
                             {
-                                sNewTxt.clear();
+                                sNewText.clear();
                             }
                         }
 
                         // across all boxes
-                        ChgTextToNum( *pBox, sNewTxt, pCol,
-                                        GetDoc()->IsInsTblAlignNum() );
+                        ChgTextToNum( *pBox, sNewText, pCol,
+                                        GetDoc()->IsInsTableAlignNum() );
 
                     }
-                    else if( bNewIsTxtFmt && nOldFmt != nNewFmt )
+                    else if( bNewIsTextFormat && nOldFormat != nNewFormat )
                     {
-                        ChgNumToText( *pBox, nNewFmt );
+                        ChgNumToText( *pBox, nNewFormat );
                     }
                 }
             }
         }
     }
     // call base class
-    SwFrmFmt::Modify( pOld, pNew );
+    SwFrameFormat::Modify( pOld, pNew );
 }
 
-bool SwTableBoxFmt::supportsFullDrawingLayerFillAttributeSet() const
+bool SwTableBoxFormat::supportsFullDrawingLayerFillAttributeSet() const
 {
     return false;
 }
 
-bool SwTableFmt::supportsFullDrawingLayerFillAttributeSet() const
+bool SwTableFormat::supportsFullDrawingLayerFillAttributeSet() const
 {
     return false;
 }
 
-bool SwTableLineFmt::supportsFullDrawingLayerFillAttributeSet() const
+bool SwTableLineFormat::supportsFullDrawingLayerFillAttributeSet() const
 {
     return false;
 }
 
-bool SwTableBox::HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
-                            bool& rIsEmptyTxtNd ) const
+bool SwTableBox::HasNumContent( double& rNum, sal_uInt32& rFormatIndex,
+                            bool& rIsEmptyTextNd ) const
 {
     bool bRet = false;
-    sal_uLong nNdPos = IsValidNumTxtNd( true );
+    sal_uLong nNdPos = IsValidNumTextNd( true );
     if( ULONG_MAX != nNdPos )
     {
-        OUString aTxt( pSttNd->GetNodes()[ nNdPos ]->GetTxtNode()->GetRedlineTxt() );
+        OUString aText( pSttNd->GetNodes()[ nNdPos ]->GetTextNode()->GetRedlineText() );
         // Keep Tabs
-        lcl_TabToBlankAtSttEnd( aTxt );
-        rIsEmptyTxtNd = aTxt.isEmpty();
-        SvNumberFormatter* pNumFmtr = GetFrmFmt()->GetDoc()->GetNumberFormatter();
+        lcl_TabToBlankAtSttEnd( aText );
+        rIsEmptyTextNd = aText.isEmpty();
+        SvNumberFormatter* pNumFormatr = GetFrameFormat()->GetDoc()->GetNumberFormatter();
 
         const SfxPoolItem* pItem;
-        if( SfxItemState::SET == GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT, false, &pItem ))
+        if( SfxItemState::SET == GetFrameFormat()->GetItemState( RES_BOXATR_FORMAT, false, &pItem ))
         {
-            rFmtIndex = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
+            rFormatIndex = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
             // Special casing for percent
-            if( !rIsEmptyTxtNd && css::util::NumberFormat::PERCENT == pNumFmtr->GetType( rFmtIndex ))
+            if( !rIsEmptyTextNd && css::util::NumberFormat::PERCENT == pNumFormatr->GetType( rFormatIndex ))
             {
-                sal_uInt32 nTmpFmt = 0;
-                if( pNumFmtr->IsNumberFormat( aTxt, nTmpFmt, rNum ) &&
-                    css::util::NumberFormat::NUMBER == pNumFmtr->GetType( nTmpFmt ))
-                    aTxt += "%";
+                sal_uInt32 nTmpFormat = 0;
+                if( pNumFormatr->IsNumberFormat( aText, nTmpFormat, rNum ) &&
+                    css::util::NumberFormat::NUMBER == pNumFormatr->GetType( nTmpFormat ))
+                    aText += "%";
             }
         }
         else
-            rFmtIndex = 0;
+            rFormatIndex = 0;
 
-        bRet = pNumFmtr->IsNumberFormat( aTxt, rFmtIndex, rNum );
+        bRet = pNumFormatr->IsNumberFormat( aText, rFormatIndex, rNum );
     }
     else
-        rIsEmptyTxtNd = false;
+        rIsEmptyTextNd = false;
     return bRet;
 }
 
@@ -2433,39 +2433,39 @@ bool SwTableBox::IsNumberChanged() const
 {
     bool bRet = true;
 
-    if( SfxItemState::SET == GetFrmFmt()->GetItemState( RES_BOXATR_FORMULA, false ))
+    if( SfxItemState::SET == GetFrameFormat()->GetItemState( RES_BOXATR_FORMULA, false ))
     {
-        const SwTblBoxNumFormat *pNumFmt;
-        const SwTblBoxValue *pValue;
+        const SwTableBoxNumFormat *pNumFormat;
+        const SwTableBoxValue *pValue;
 
-        if( SfxItemState::SET != GetFrmFmt()->GetItemState( RES_BOXATR_VALUE, false,
+        if( SfxItemState::SET != GetFrameFormat()->GetItemState( RES_BOXATR_VALUE, false,
             reinterpret_cast<const SfxPoolItem**>(&pValue) ))
             pValue = 0;
-        if( SfxItemState::SET != GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT, false,
-            reinterpret_cast<const SfxPoolItem**>(&pNumFmt) ))
-            pNumFmt = 0;
+        if( SfxItemState::SET != GetFrameFormat()->GetItemState( RES_BOXATR_FORMAT, false,
+            reinterpret_cast<const SfxPoolItem**>(&pNumFormat) ))
+            pNumFormat = 0;
 
         sal_uLong nNdPos;
-        if( pNumFmt && pValue && ULONG_MAX != ( nNdPos = IsValidNumTxtNd( true ) ) )
+        if( pNumFormat && pValue && ULONG_MAX != ( nNdPos = IsValidNumTextNd( true ) ) )
         {
-            OUString sNewTxt, sOldTxt( pSttNd->GetNodes()[ nNdPos ]->
-                                    GetTxtNode()->GetRedlineTxt() );
-            lcl_DelTabsAtSttEnd( sOldTxt );
+            OUString sNewText, sOldText( pSttNd->GetNodes()[ nNdPos ]->
+                                    GetTextNode()->GetRedlineText() );
+            lcl_DelTabsAtSttEnd( sOldText );
 
             Color* pCol = 0;
-            GetFrmFmt()->GetDoc()->GetNumberFormatter()->GetOutputString(
-                pValue->GetValue(), pNumFmt->GetValue(), sNewTxt, &pCol );
+            GetFrameFormat()->GetDoc()->GetNumberFormatter()->GetOutputString(
+                pValue->GetValue(), pNumFormat->GetValue(), sNewText, &pCol );
 
-            bRet = sNewTxt != sOldTxt ||
-                    !( ( !pCol && !GetSaveNumFmtColor() ) ||
-                       ( pCol && GetSaveNumFmtColor() &&
-                        *pCol == *GetSaveNumFmtColor() ));
+            bRet = sNewText != sOldText ||
+                    !( ( !pCol && !GetSaveNumFormatColor() ) ||
+                       ( pCol && GetSaveNumFormatColor() &&
+                        *pCol == *GetSaveNumFormatColor() ));
         }
     }
     return bRet;
 }
 
-sal_uLong SwTableBox::IsValidNumTxtNd( bool bCheckAttr ) const
+sal_uLong SwTableBox::IsValidNumTextNd( bool bCheckAttr ) const
 {
     sal_uLong nPos = ULONG_MAX;
     if( pSttNd )
@@ -2473,7 +2473,7 @@ sal_uLong SwTableBox::IsValidNumTxtNd( bool bCheckAttr ) const
         SwNodeIndex aIdx( *pSttNd );
         sal_uLong nIndex = aIdx.GetIndex();
         const sal_uLong nIndexEnd = pSttNd->GetNodes()[ nIndex ]->EndOfSectionIndex();
-        const SwTxtNode *pTextNode = 0;
+        const SwTextNode *pTextNode = 0;
         while( ++nIndex < nIndexEnd )
         {
             const SwNode* pNode = pSttNd->GetNodes()[nIndex];
@@ -2482,7 +2482,7 @@ sal_uLong SwTableBox::IsValidNumTxtNd( bool bCheckAttr ) const
                 pTextNode = 0;
                 break;
             }
-            if( pNode->IsTxtNode() )
+            if( pNode->IsTextNode() )
             {
                 if( pTextNode )
                 {
@@ -2491,7 +2491,7 @@ sal_uLong SwTableBox::IsValidNumTxtNd( bool bCheckAttr ) const
                 }
                 else
                 {
-                    pTextNode = pNode->GetTxtNode();
+                    pTextNode = pNode->GetTextNode();
                     nPos = nIndex;
                 }
             }
@@ -2508,7 +2508,7 @@ sal_uLong SwTableBox::IsValidNumTxtNd( bool bCheckAttr ) const
                     sal_Int32 nNextSetField = 0;
                     for( size_t n = 0; n < pHts->Count(); ++n )
                     {
-                        const SwTxtAttr* pAttr = (*pHts)[ n ];
+                        const SwTextAttr* pAttr = (*pHts)[ n ];
                         if( RES_TXTATR_NOEND_BEGIN <= pAttr->Which() )
                         {
                             if ( (pAttr->GetStart() == nNextSetField)
@@ -2518,7 +2518,7 @@ sal_uLong SwTableBox::IsValidNumTxtNd( bool bCheckAttr ) const
                                 // it inserts hidden variable-set fields at
                                 // the beginning of para in cell, but they
                                 // should not turn cell into text cell
-                                const SwField* pField = pAttr->GetFmtFld().GetField();
+                                const SwField* pField = pAttr->GetFormatField().GetField();
                                 if (pField &&
                                     (pField->GetTypeId() == TYP_SETFLD) &&
                                     (0 != (static_cast<SwSetExpField const*>
@@ -2546,17 +2546,17 @@ sal_uLong SwTableBox::IsValidNumTxtNd( bool bCheckAttr ) const
 sal_uInt16 SwTableBox::IsFormulaOrValueBox() const
 {
     sal_uInt16 nWhich = 0;
-    const SwTxtNode* pTNd;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if( SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_FORMULA, false ))
+    const SwTextNode* pTNd;
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if( SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_FORMULA, false ))
         nWhich = RES_BOXATR_FORMULA;
-    else if( SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_VALUE, false ) &&
-            !pFmt->GetDoc()->GetNumberFormatter()->IsTextFormat(
-                pFmt->GetTblBoxNumFmt().GetValue() ))
+    else if( SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_VALUE, false ) &&
+            !pFormat->GetDoc()->GetNumberFormatter()->IsTextFormat(
+                pFormat->GetTableBoxNumFormat().GetValue() ))
         nWhich = RES_BOXATR_VALUE;
     else if( pSttNd && pSttNd->GetIndex() + 2 == pSttNd->EndOfSectionIndex()
             && 0 != ( pTNd = pSttNd->GetNodes()[ pSttNd->GetIndex() + 1 ]
-            ->GetTxtNode() ) && pTNd->GetTxt().isEmpty())
+            ->GetTextNode() ) && pTNd->GetText().isEmpty())
         nWhich = USHRT_MAX;
 
     return nWhich;
@@ -2564,26 +2564,26 @@ sal_uInt16 SwTableBox::IsFormulaOrValueBox() const
 
 void SwTableBox::ActualiseValueBox()
 {
-    const SfxPoolItem *pFmtItem, *pValItem;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if( SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_FORMAT, true, &pFmtItem )
-        && SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_VALUE, true, &pValItem ))
+    const SfxPoolItem *pFormatItem, *pValItem;
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if( SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_FORMAT, true, &pFormatItem )
+        && SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_VALUE, true, &pValItem ))
     {
-        const sal_uLong nFmtId = static_cast<const SwTblBoxNumFormat*>(pFmtItem)->GetValue();
+        const sal_uLong nFormatId = static_cast<const SwTableBoxNumFormat*>(pFormatItem)->GetValue();
         sal_uLong nNdPos = ULONG_MAX;
-        SvNumberFormatter* pNumFmtr = pFmt->GetDoc()->GetNumberFormatter();
+        SvNumberFormatter* pNumFormatr = pFormat->GetDoc()->GetNumberFormatter();
 
-        if( !pNumFmtr->IsTextFormat( nFmtId ) &&
-            ULONG_MAX != (nNdPos = IsValidNumTxtNd( true )) )
+        if( !pNumFormatr->IsTextFormat( nFormatId ) &&
+            ULONG_MAX != (nNdPos = IsValidNumTextNd( true )) )
         {
-            double fVal = static_cast<const SwTblBoxValue*>(pValItem)->GetValue();
+            double fVal = static_cast<const SwTableBoxValue*>(pValItem)->GetValue();
             Color* pCol = 0;
-            OUString sNewTxt;
-            pNumFmtr->GetOutputString( fVal, nFmtId, sNewTxt, &pCol );
+            OUString sNewText;
+            pNumFormatr->GetOutputString( fVal, nFormatId, sNewText, &pCol );
 
-            const OUString& rTxt = pSttNd->GetNodes()[ nNdPos ]->GetTxtNode()->GetTxt();
-            if( rTxt != sNewTxt )
-                ChgTextToNum( *this, sNewTxt, pCol, false ,nNdPos);
+            const OUString& rText = pSttNd->GetNodes()[ nNdPos ]->GetTextNode()->GetText();
+            if( rText != sNewText )
+                ChgTextToNum( *this, sNewText, pCol, false ,nNdPos);
         }
     }
 }
@@ -2619,8 +2619,8 @@ public:
     void setTable(const SwTable * pTable)
     {
         m_pTable = pTable;
-        SwFrmFmt * pFrmFmt = m_pTable->GetFrmFmt();
-        m_pTabFrm = SwIterator<SwTabFrm,SwFmt>(*pFrmFmt).First();
+        SwFrameFormat * pFrameFormat = m_pTable->GetFrameFormat();
+        m_pTabFrm = SwIterator<SwTabFrm,SwFormat>(*pFrameFormat).First();
         if (m_pTabFrm && m_pTabFrm->IsFollow())
             m_pTabFrm = m_pTabFrm->FindMaster(true);
     }
@@ -2754,26 +2754,26 @@ const SwTableBox * SwTableCellInfo::getTableBox() const
     return pRet;
 }
 
-void SwTable::RegisterToFormat( SwFmt& rFmt )
+void SwTable::RegisterToFormat( SwFormat& rFormat )
 {
-    rFmt.Add( this );
+    rFormat.Add( this );
 }
 
 bool SwTable::HasLayout() const
 {
-    const SwFrmFmt* pFrmFmt = GetFrmFmt();
+    const SwFrameFormat* pFrameFormat = GetFrameFormat();
     //a table in a clipboard document doesn't have any layout information
-    return pFrmFmt && SwIterator<SwTabFrm,SwFmt>(*pFrmFmt).First();
+    return pFrameFormat && SwIterator<SwTabFrm,SwFormat>(*pFrameFormat).First();
 }
 
-void SwTableLine::RegisterToFormat( SwFmt& rFmt )
+void SwTableLine::RegisterToFormat( SwFormat& rFormat )
 {
-    rFmt.Add( this );
+    rFormat.Add( this );
 }
 
-void SwTableBox::RegisterToFormat( SwFmt& rFmt )
+void SwTableBox::RegisterToFormat( SwFormat& rFormat )
 {
-    rFmt.Add( this );
+    rFormat.Add( this );
 }
 
 // free's any remaining child objects
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index ab8f3cb7ad76..3f4af08fa8ea 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -166,14 +166,14 @@ bool lcl_IsHeadlineCell( const SwCellFrm& rCellFrm )
 {
     bool bRet = false;
 
-    const SwCntntFrm *pCnt = rCellFrm.ContainsCntnt();
-    if ( pCnt && pCnt->IsTxtFrm() )
+    const SwContentFrm *pCnt = rCellFrm.ContainsContent();
+    if ( pCnt && pCnt->IsTextFrm() )
     {
-        const SwTxtNode* pTxtNode = static_cast<const SwTxtFrm*>(pCnt)->GetTxtNode();
-        const SwFmt* pTxtFmt = pTxtNode->GetFmtColl();
+        const SwTextNode* pTextNode = static_cast<const SwTextFrm*>(pCnt)->GetTextNode();
+        const SwFormat* pTextFormat = pTextNode->GetFormatColl();
 
         OUString sStyleName;
-        SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+        SwStyleNameMapper::FillProgName( pTextFormat->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
         bRet = sStyleName == aTableHeadingName;
     }
 
@@ -207,9 +207,9 @@ void* lcl_GetKeyFromFrame( const SwFrm& rFrm )
     void* pKey = 0;
 
     if ( rFrm.IsPageFrm() )
-        pKey = (void*)static_cast<const SwPageFrm&>(rFrm).GetFmt()->getIDocumentSettingAccess();
-    else if ( rFrm.IsTxtFrm() )
-        pKey = (void*)static_cast<const SwTxtFrm&>(rFrm).GetTxtNode();
+        pKey = (void*)static_cast<const SwPageFrm&>(rFrm).GetFormat()->getIDocumentSettingAccess();
+    else if ( rFrm.IsTextFrm() )
+        pKey = (void*)static_cast<const SwTextFrm&>(rFrm).GetTextNode();
     else if ( rFrm.IsSctFrm() )
         pKey = (void*)static_cast<const SwSectionFrm&>(rFrm).GetSection();
     else if ( rFrm.IsTabFrm() )
@@ -226,7 +226,7 @@ void* lcl_GetKeyFromFrame( const SwFrm& rFrm )
     return pKey;
 }
 
-bool lcl_HasPreviousParaSameNumRule( const SwTxtNode& rNode )
+bool lcl_HasPreviousParaSameNumRule( const SwTextNode& rNode )
 {
     bool bRet = false;
     SwNodeIndex aIdx( rNode );
@@ -239,15 +239,15 @@ bool lcl_HasPreviousParaSameNumRule( const SwTxtNode& rNode )
     {
         --aIdx;
 
-        if (aIdx.GetNode().IsTxtNode())
+        if (aIdx.GetNode().IsTextNode())
         {
-            const SwTxtNode* pPrevTxtNd = aIdx.GetNode().GetTxtNode();
-            const SwNumRule * pPrevNumRule = pPrevTxtNd->GetNumRule();
+            const SwTextNode* pPrevTextNd = aIdx.GetNode().GetTextNode();
+            const SwNumRule * pPrevNumRule = pPrevTextNd->GetNumRule();
 
             // We find the previous text node. Now check, if the previous text node
             // has the same numrule like rNode:
             if ( (pPrevNumRule == pNumRule) &&
-                 (!pPrevTxtNd->IsOutline() == !rNode.IsOutline()))
+                 (!pPrevTextNd->IsOutline() == !rNode.IsOutline()))
                 bRet = true;
 
             break;
@@ -342,8 +342,8 @@ bool SwTaggedPDFHelper::CheckReopenTag()
         }
         else if ( rFrm.IsFlyFrm() )
         {
-            const SwFmtAnchor& rAnchor =
-                static_cast<const SwFlyFrm*>(&rFrm)->GetFmt()->GetAnchor();
+            const SwFormatAnchor& rAnchor =
+                static_cast<const SwFlyFrm*>(&rFrm)->GetFormat()->GetAnchor();
             if ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
                 (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
                 (FLY_AT_PAGE == rAnchor.GetAnchorId()))
@@ -422,9 +422,9 @@ void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const OUS
 
     if ( mpNumInfo )
     {
-        const SwTxtFrm& rTxtFrm = static_cast<const SwTxtFrm&>(mpNumInfo->mrFrm);
-        const SwTxtNode* pTxtNd = rTxtFrm.GetTxtNode();
-        const SwNodeNum* pNodeNum = pTxtNd->GetNum();
+        const SwTextFrm& rTextFrm = static_cast<const SwTextFrm&>(mpNumInfo->mrFrm);
+        const SwTextNode* pTextNd = rTextFrm.GetTextNode();
+        const SwNodeNum* pNodeNum = pTextNd->GetNum();
 
         if ( vcl::PDFWriter::List == eType )
         {
@@ -443,7 +443,7 @@ void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const OUS
 
         if ( ( rFrm.IsPageFrm() && !static_cast<const SwPageFrm&>(rFrm).GetPrev() ) ||
              ( rFrm.IsFlowFrm() && !SwFlowFrm::CastFlowFrm(&rFrm)->IsFollow() && SwFlowFrm::CastFlowFrm(&rFrm)->HasFollow() ) ||
-             ( rFrm.IsTxtFrm() && rFrm.GetDrawObjs() ) ||
+             ( rFrm.IsTextFrm() && rFrm.GetDrawObjs() ) ||
              ( rFrm.IsRowFrm() && rFrm.IsInSplitTableRow() ) ||
              ( rFrm.IsCellFrm() && const_cast<SwFrm&>(rFrm).GetNextCellLeaf( MAKEPAGE_NONE ) ) )
         {
@@ -618,18 +618,18 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
 
         if ( bTextIndent )
         {
-            OSL_ENSURE( pFrm->IsTxtFrm(), "Frame type <-> tag attribute mismatch" );
+            OSL_ENSURE( pFrm->IsTextFrm(), "Frame type <-> tag attribute mismatch" );
             const SvxLRSpaceItem &rSpace =
-                static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode()->GetSwAttrSet().GetLRSpace();
-            nVal =  rSpace.GetTxtFirstLineOfst();
+                static_cast<const SwTextFrm*>(pFrm)->GetTextNode()->GetSwAttrSet().GetLRSpace();
+            nVal =  rSpace.GetTextFirstLineOfst();
             if ( 0 != nVal )
                 mpPDFExtOutDevData->SetStructureAttributeNumerical( vcl::PDFWriter::TextIndent, nVal );
         }
 
         if ( bTextAlign )
         {
-            OSL_ENSURE( pFrm->IsTxtFrm(), "Frame type <-> tag attribute mismatch" );
-            const SwAttrSet& aSet = static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode()->GetSwAttrSet();
+            OSL_ENSURE( pFrm->IsTextFrm(), "Frame type <-> tag attribute mismatch" );
+            const SwAttrSet& aSet = static_cast<const SwTextFrm*>(pFrm)->GetTextNode()->GetSwAttrSet();
             const SvxAdjust nAdjust = aSet.GetAdjust().GetAdjust();
             if ( SVX_ADJUST_BLOCK == nAdjust || SVX_ADJUST_CENTER == nAdjust ||
                  (  (pFrm->IsRightToLeft() && SVX_ADJUST_LEFT == nAdjust) ||
@@ -649,13 +649,13 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
         {
             OSL_ENSURE( pFrm->IsFlyFrm(), "Frame type <-> tag attribute mismatch" );
             const SwFlyFrm* pFly = static_cast<const SwFlyFrm*>(pFrm);
-            if ( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
+            if ( pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
             {
-                const SwNoTxtFrm* pNoTxtFrm   = static_cast<const SwNoTxtFrm*>(pFly->Lower());
-                const SwNoTxtNode* pNoTxtNode = static_cast<const SwNoTxtNode*>(pNoTxtFrm->GetNode());
+                const SwNoTextFrm* pNoTextFrm   = static_cast<const SwNoTextFrm*>(pFly->Lower());
+                const SwNoTextNode* pNoTextNode = static_cast<const SwNoTextNode*>(pNoTextFrm->GetNode());
 
-                const OUString aAlternateTxt( pNoTxtNode->GetTitle() );
-                mpPDFExtOutDevData->SetAlternateText( aAlternateTxt );
+                const OUString aAlternateText( pNoTextNode->GetTitle() );
+                mpPDFExtOutDevData->SetAlternateText( aAlternateText );
             }
         }
 
@@ -722,7 +722,7 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
     else if ( mpPorInfo )
     {
         const SwLinePortion* pPor = &mpPorInfo->mrPor;
-        const SwTxtPaintInfo& rInf = mpPorInfo->mrTxtPainter.GetInfo();
+        const SwTextPaintInfo& rInf = mpPorInfo->mrTextPainter.GetInfo();
 
         bool bActualText = false;
         bool bBaselineShift = false;
@@ -761,12 +761,12 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
 
         if ( bActualText )
         {
-            OUString aActualTxt;
+            OUString aActualText;
             if (pPor->GetWhichPor() == POR_SOFTHYPH || pPor->GetWhichPor() == POR_HYPH)
-                aActualTxt = OUString(0xad); // soft hyphen
+                aActualText = OUString(0xad); // soft hyphen
             else
-                aActualTxt = rInf.GetTxt().copy(rInf.GetIdx(), pPor->GetLen());
-            mpPDFExtOutDevData->SetActualText( aActualTxt );
+                aActualText = rInf.GetText().copy(rInf.GetIdx(), pPor->GetLen());
+            mpPDFExtOutDevData->SetActualText( aActualText );
         }
 
         if ( bBaselineShift )
@@ -833,19 +833,19 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
         return;
 
     const SwFrm& rFrm = mpNumInfo->mrFrm;
-    OSL_ENSURE( rFrm.IsTxtFrm(), "numbered only for text frames" );
-    const SwTxtFrm& rTxtFrm = static_cast<const SwTxtFrm&>(rFrm);
+    OSL_ENSURE( rFrm.IsTextFrm(), "numbered only for text frames" );
+    const SwTextFrm& rTextFrm = static_cast<const SwTextFrm&>(rFrm);
 
     // Lowers of NonStructureElements should not be considered:
 
-    if ( lcl_IsInNonStructEnv( rTxtFrm ) || rTxtFrm.IsFollow() )
+    if ( lcl_IsInNonStructEnv( rTextFrm ) || rTextFrm.IsFollow() )
         return;
 
-    const SwTxtNode* pTxtNd = rTxtFrm.GetTxtNode();
-    const SwNumRule* pNumRule = pTxtNd->GetNumRule();
-    const SwNodeNum* pNodeNum = pTxtNd->GetNum();
+    const SwTextNode* pTextNd = rTextFrm.GetTextNode();
+    const SwNumRule* pNumRule = pTextNd->GetNumRule();
+    const SwNodeNum* pNodeNum = pTextNd->GetNum();
 
-    const bool bNumbered = !pTxtNd->IsOutline() && pNodeNum && pNodeNum->GetParent() && pNumRule;
+    const bool bNumbered = !pTextNd->IsOutline() && pNodeNum && pNodeNum->GetParent() && pNumRule;
 
     // Check, if we have to reopen a list or a list body:
     // First condition:
@@ -854,7 +854,7 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
         return;
 
     const SwNumberTreeNode* pParent = pNodeNum->GetParent();
-    const bool bSameNumbering = lcl_HasPreviousParaSameNumRule(*pTxtNd);
+    const bool bSameNumbering = lcl_HasPreviousParaSameNumRule(*pTextNd);
 
     // Second condition: current numbering is not 'interrupted'
     if ( bSameNumbering )
@@ -867,8 +867,8 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
         //   and its level > 1 or
         // - Numbering should restart at the current node and its level > 1
         // - The current item has no label
-        const bool bNewSubListStart = pParent->GetParent() && (pParent->IsFirst( pNodeNum ) || pTxtNd->IsListRestart() );
-        const bool bNoLabel = !pTxtNd->IsCountedInList() && !pTxtNd->IsListRestart();
+        const bool bNewSubListStart = pParent->GetParent() && (pParent->IsFirst( pNodeNum ) || pTextNd->IsListRestart() );
+        const bool bNoLabel = !pTextNd->IsCountedInList() && !pTextNd->IsListRestart();
         if ( bNewSubListStart || bNoLabel )
         {
             // Fine, we try to reopen the appropriate list body
@@ -908,7 +908,7 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
             }
         }
         // 2. We have to reopen an existing list tag:
-        else if ( !pParent->IsFirst( pNodeNum ) && !pTxtNd->IsListRestart() )
+        else if ( !pParent->IsFirst( pNodeNum ) && !pTextNd->IsListRestart() )
         {
             // any other than the first node in a list level has to reopen the current
             // list. The current list is associated in a map with the first child of the list:
@@ -950,8 +950,8 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
     }
 
     // New tags:
-    const bool bNewListTag = (pNodeNum->GetParent()->IsFirst( pNodeNum ) || pTxtNd->IsListRestart() || !bSameNumbering);
-    const bool bNewItemTag = bNewListTag || pTxtNd->IsCountedInList(); // If the text node is not counted, we do not start a new list item:
+    const bool bNewListTag = (pNodeNum->GetParent()->IsFirst( pNodeNum ) || pTextNd->IsListRestart() || !bSameNumbering);
+    const bool bNewItemTag = bNewListTag || pTextNd->IsCountedInList(); // If the text node is not counted, we do not start a new list item:
 
     if ( bNewListTag )
         BeginTag( vcl::PDFWriter::List, OUString(aListString) );
@@ -1058,19 +1058,19 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
 
         case FRM_TXT :
             {
-                const SwTxtNode* pTxtNd =
-                    static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode();
+                const SwTextNode* pTextNd =
+                    static_cast<const SwTextFrm*>(pFrm)->GetTextNode();
 
-                const SwFmt* pTxtFmt = pTxtNd->GetFmtColl();
-                const SwFmt* pParentTxtFmt = pTxtFmt ? pTxtFmt->DerivedFrom() : NULL;
+                const SwFormat* pTextFormat = pTextNd->GetFormatColl();
+                const SwFormat* pParentTextFormat = pTextFormat ? pTextFormat->DerivedFrom() : NULL;
 
                 OUString sStyleName;
                 OUString sParentStyleName;
 
-                if ( pTxtFmt)
-                    SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
-                if ( pParentTxtFmt)
-                    SwStyleNameMapper::FillProgName( pParentTxtFmt->GetName(), sParentStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+                if ( pTextFormat)
+                    SwStyleNameMapper::FillProgName( pTextFormat->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+                if ( pParentTextFormat)
+                    SwStyleNameMapper::FillProgName( pParentTextFormat->GetName(), sParentStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
 
                 // This is the default. If the paragraph could not be mapped to
                 // any of the standard pdf tags, we write a user defined tag
@@ -1112,9 +1112,9 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
 
                 // Heading: H1 - H6
 
-                if ( pTxtNd->IsOutline() )
+                if ( pTextNd->IsOutline() )
                 {
-                    int nRealLevel = pTxtNd->GetAttrOutlineLevel()-1;
+                    int nRealLevel = pTextNd->GetAttrOutlineLevel()-1;
                     nRealLevel = nRealLevel > 5 ? 5 : nRealLevel;
 
                     nPDFType =  static_cast<sal_uInt16>(vcl::PDFWriter::H1 + nRealLevel);
@@ -1258,12 +1258,12 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
             // fly in content or fly at page
             {
                 const SwFlyFrm* pFly = static_cast<const SwFlyFrm*>(pFrm);
-                if ( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
+                if ( pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
                 {
                     bool bFormula = false;
 
-                    const SwNoTxtFrm* pNoTxtFrm = static_cast<const SwNoTxtFrm*>(pFly->Lower());
-                    SwOLENode* pOLENd = const_cast<SwOLENode*>(pNoTxtFrm->GetNode()->GetOLENode());
+                    const SwNoTextFrm* pNoTextFrm = static_cast<const SwNoTextFrm*>(pFly->Lower());
+                    SwOLENode* pOLENd = const_cast<SwOLENode*>(pNoTextFrm->GetNode()->GetOLENode());
                     if ( pOLENd )
                     {
                         SwOLEObj& aOLEObj = pOLENd->GetOLEObj();
@@ -1313,8 +1313,8 @@ void SwTaggedPDFHelper::EndStructureElements()
 void SwTaggedPDFHelper::BeginInlineStructureElements()
 {
     const SwLinePortion* pPor = &mpPorInfo->mrPor;
-    const SwTxtPaintInfo& rInf = mpPorInfo->mrTxtPainter.GetInfo();
-    const SwTxtFrm* pFrm = rInf.GetTxtFrm();
+    const SwTextPaintInfo& rInf = mpPorInfo->mrTextPainter.GetInfo();
+    const SwTextFrm* pFrm = rInf.GetTextFrm();
 
     // Lowers of NonStructureElements should not be considered:
 
@@ -1339,24 +1339,24 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
         case POR_TXT :
         case POR_PARA :
             {
-                SwTxtNode* pNd = const_cast<SwTxtNode*>(pFrm->GetTxtNode());
-                SwTxtAttr const*const pInetFmtAttr =
-                    pNd->GetTxtAttrAt(rInf.GetIdx(), RES_TXTATR_INETFMT);
+                SwTextNode* pNd = const_cast<SwTextNode*>(pFrm->GetTextNode());
+                SwTextAttr const*const pInetFormatAttr =
+                    pNd->GetTextAttrAt(rInf.GetIdx(), RES_TXTATR_INETFMT);
 
                 OUString sStyleName;
-                if ( !pInetFmtAttr )
+                if ( !pInetFormatAttr )
                 {
-                    ::std::vector<SwTxtAttr *> const charAttrs(
-                        pNd->GetTxtAttrsAt(rInf.GetIdx(), RES_TXTATR_CHARFMT));
+                    ::std::vector<SwTextAttr *> const charAttrs(
+                        pNd->GetTextAttrsAt(rInf.GetIdx(), RES_TXTATR_CHARFMT));
                     // TODO: handle more than 1 char style?
-                    const SwCharFmt* pCharFmt = (charAttrs.size())
-                        ? (*charAttrs.begin())->GetCharFmt().GetCharFmt() : 0;
-                    if ( pCharFmt )
-                        SwStyleNameMapper::FillProgName( pCharFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+                    const SwCharFormat* pCharFormat = (charAttrs.size())
+                        ? (*charAttrs.begin())->GetCharFormat().GetCharFormat() : 0;
+                    if ( pCharFormat )
+                        SwStyleNameMapper::FillProgName( pCharFormat->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
                 }
 
                 // Check for Link:
-                if( pInetFmtAttr )
+                if( pInetFormatAttr )
                 {
                     nPDFType = vcl::PDFWriter::Link;
                     aPDFType = aLinkString;
@@ -1405,19 +1405,19 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
         case POR_FLD :
             {
                 // check field type:
-                const sal_Int32 nIdx = static_cast<const SwFldPortion*>(pPor)->IsFollow() ?
+                const sal_Int32 nIdx = static_cast<const SwFieldPortion*>(pPor)->IsFollow() ?
                                         rInf.GetIdx() - 1 :
                                         rInf.GetIdx();
-                const SwTxtAttr* pHint = mpPorInfo->mrTxtPainter.GetAttr( nIdx );
+                const SwTextAttr* pHint = mpPorInfo->mrTextPainter.GetAttr( nIdx );
                 if ( pHint && RES_TXTATR_FIELD == pHint->Which() )
                 {
-                    const SwField* pFld = pHint->GetFmtFld().GetField();
-                    if ( RES_GETREFFLD == pFld->Which() )
+                    const SwField* pField = pHint->GetFormatField().GetField();
+                    if ( RES_GETREFFLD == pField->Which() )
                     {
                         nPDFType = vcl::PDFWriter::Link;
                         aPDFType = aLinkString;
                     }
-                    else if ( RES_AUTHORITY == pFld->Which() )
+                    else if ( RES_AUTHORITY == pField->Which() )
                     {
                         nPDFType = vcl::PDFWriter::BibEntry;
                         aPDFType = aBibEntryString;
@@ -1565,20 +1565,20 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
 
         if ( pPDFExtOutDevData->GetIsExportNotes() )
         {
-            SwFieldType* pType = mrSh.GetFldType( RES_POSTITFLD, OUString() );
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-            for( SwFmtFld* pFirst = aIter.First(); pFirst; )
+            SwFieldType* pType = mrSh.GetFieldType( RES_POSTITFLD, OUString() );
+            SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+            for( SwFormatField* pFirst = aIter.First(); pFirst; )
             {
-                if( pFirst->GetTxtFld() && pFirst->IsFldInDoc() )
+                if( pFirst->GetTextField() && pFirst->IsFieldInDoc() )
                 {
-                    const SwTxtNode* pTNd = pFirst->GetTxtFld()->GetpTxtNode();
+                    const SwTextNode* pTNd = pFirst->GetTextField()->GetpTextNode();
                     OSL_ENSURE( 0 != pTNd, "Enhanced pdf export - text node is missing" );
 
                     // 1. Check if the whole paragraph is hidden
                     // 2. Move to the field
                     // 3. Check for hidden text attribute
                     if ( !pTNd->IsHidden() &&
-                          mrSh.GotoFld( *pFirst ) &&
+                          mrSh.GotoFormatField( *pFirst ) &&
                          !mrSh.SelectHiddenRange() )
                     {
                         // Link Rectangle
@@ -1607,7 +1607,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
                             // The title should consist of the author and the date:
                             aNote.Title = pField->GetPar1() + ", " + sDate;
                             // Guess what the contents contains...
-                            aNote.Contents = pField->GetTxt();
+                            aNote.Contents = pField->GetText();
 
                             // Link Export
                             Rectangle aRect(SwRectToPDFRect(pCurrPage, rNoteRect.SVRect()));
@@ -1629,7 +1629,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
             SwGetINetAttr* p = &rAttr;
             OSL_ENSURE( 0 != p, "Enhanced pdf export - SwGetINetAttr is missing" );
 
-            const SwTxtNode* pTNd = p->rINetAttr.GetpTxtNode();
+            const SwTextNode* pTNd = p->rINetAttr.GetpTextNode();
             OSL_ENSURE( 0 != pTNd, "Enhanced pdf export - text node is missing" );
 
             // 1. Check if the whole paragraph is hidden
@@ -1641,12 +1641,12 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
             {
                 // Select the hyperlink:
                 mrSh.SwCrsrShell::Right( 1, CRSR_SKIP_CHARS );
-                if ( mrSh.SwCrsrShell::SelectTxtAttr( RES_TXTATR_INETFMT, true ) )
+                if ( mrSh.SwCrsrShell::SelectTextAttr( RES_TXTATR_INETFMT, true ) )
                 {
                     // First, we create the destination, because there may be more
                     // than one link to this destination:
                     OUString aURL( INetURLObject::decode(
-                        p->rINetAttr.GetINetFmt().GetValue(),
+                        p->rINetAttr.GetINetFormat().GetValue(),
                         INetURLObject::DECODE_UNAMBIGUOUS,
                         RTL_TEXTENCODING_UTF8 ) );
 
@@ -1736,19 +1736,19 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
 
         // HYPERLINKS (Graphics, Frames, OLEs )
 
-        const SwFrmFmts* pTbl = pDoc->GetSpzFrmFmts();
-        const size_t nSpzFrmFmtsCount = pTbl->size();
-        for( size_t n = 0; n < nSpzFrmFmtsCount; ++n )
+        const SwFrameFormats* pTable = pDoc->GetSpzFrameFormats();
+        const size_t nSpzFrameFormatsCount = pTable->size();
+        for( size_t n = 0; n < nSpzFrameFormatsCount; ++n )
         {
-            const SwFrmFmt* pFrmFmt = (*pTbl)[n];
+            const SwFrameFormat* pFrameFormat = (*pTable)[n];
             const SfxPoolItem* pItem;
-            if ( RES_DRAWFRMFMT != pFrmFmt->Which() &&
-                 SfxItemState::SET == pFrmFmt->GetAttrSet().GetItemState( RES_URL, true, &pItem ) )
+            if ( RES_DRAWFRMFMT != pFrameFormat->Which() &&
+                 SfxItemState::SET == pFrameFormat->GetAttrSet().GetItemState( RES_URL, true, &pItem ) )
             {
                 const SwPageFrm* pCurrPage =
                     static_cast<const SwPageFrm*>( mrSh.GetLayout()->Lower() );
 
-                OUString aURL( static_cast<const SwFmtURL*>(pItem)->GetURL() );
+                OUString aURL( static_cast<const SwFormatURL*>(pItem)->GetURL() );
                 const bool bIntern = '#' == aURL[0];
 
                 // Create the destination for internal links:
@@ -1778,7 +1778,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
                 if ( !bIntern || -1 != nDestId )
                 {
                     Point aNullPt;
-                    const SwRect aLinkRect = pFrmFmt->FindLayoutRect( false, &aNullPt );
+                    const SwRect aLinkRect = pFrameFormat->FindLayoutRect( false, &aNullPt );
 
                     // Link PageNums
                     std::vector<sal_Int32> aLinkPageNums = CalcOutputPageNums( aLinkRect );
@@ -1797,13 +1797,13 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
                             pPDFExtOutDevData->SetLinkURL( nLinkId, aURL );
 
                         // #i44368# Links in Header/Footer
-                        const SwFmtAnchor &rAnch = pFrmFmt->GetAnchor();
+                        const SwFormatAnchor &rAnch = pFrameFormat->GetAnchor();
                         if (FLY_AT_PAGE != rAnch.GetAnchorId())
                         {
-                            const SwPosition* pPosition = rAnch.GetCntntAnchor();
+                            const SwPosition* pPosition = rAnch.GetContentAnchor();
                             if ( pPosition && pDoc->IsInHeaderFooter( pPosition->nNode ) )
                             {
-                                const SwTxtNode* pTNd = pPosition->nNode.GetNode().GetTxtNode();
+                                const SwTextNode* pTNd = pPosition->nNode.GetNode().GetTextNode();
                                 if ( pTNd )
                                     MakeHeaderFooterLinks( *pPDFExtOutDevData, *pTNd, aLinkRect, nDestId, aURL, bIntern );
                             }
@@ -1816,20 +1816,20 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
 
         // REFERENCES
 
-        SwFieldType* pType = mrSh.GetFldType( RES_GETREFFLD, OUString() );
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-        for( SwFmtFld* pFirst = aIter.First(); pFirst; )
+        SwFieldType* pType = mrSh.GetFieldType( RES_GETREFFLD, OUString() );
+        SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+        for( SwFormatField* pFirst = aIter.First(); pFirst; )
         {
-            if( pFirst->GetTxtFld() && pFirst->IsFldInDoc() )
+            if( pFirst->GetTextField() && pFirst->IsFieldInDoc() )
             {
-                const SwTxtNode* pTNd = pFirst->GetTxtFld()->GetpTxtNode();
+                const SwTextNode* pTNd = pFirst->GetTextField()->GetpTextNode();
                OSL_ENSURE( 0 != pTNd, "Enhanced pdf export - text node is missing" );
 
                 // 1. Check if the whole paragraph is hidden
                 // 2. Move to the field
                 // 3. Check for hidden text attribute
                 if ( !pTNd->IsHidden() &&
-                      mrSh.GotoFld( *pFirst ) &&
+                      mrSh.GotoFormatField( *pFirst ) &&
                      !mrSh.SelectHiddenRange() )
                 {
                     // Select the field:
@@ -1906,19 +1906,19 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
 
         // FOOTNOTES
 
-        const size_t nFtnCount = pDoc->GetFtnIdxs().size();
-        for ( size_t nIdx = 0; nIdx < nFtnCount; ++nIdx )
+        const size_t nFootnoteCount = pDoc->GetFootnoteIdxs().size();
+        for ( size_t nIdx = 0; nIdx < nFootnoteCount; ++nIdx )
         {
             // Set cursor to text node that contains the footnote:
-            const SwTxtFtn* pTxtFtn = pDoc->GetFtnIdxs()[ nIdx ];
-            SwTxtNode& rTNd = const_cast<SwTxtNode&>(pTxtFtn->GetTxtNode());
+            const SwTextFootnote* pTextFootnote = pDoc->GetFootnoteIdxs()[ nIdx ];
+            SwTextNode& rTNd = const_cast<SwTextNode&>(pTextFootnote->GetTextNode());
 
             mrSh._GetCrsr()->GetPoint()->nNode = rTNd;
-            mrSh._GetCrsr()->GetPoint()->nContent.Assign( &rTNd, pTxtFtn->GetStart() );
+            mrSh._GetCrsr()->GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() );
 
             // 1. Check if the whole paragraph is hidden
             // 2. Check for hidden text attribute
-            if ( rTNd.GetTxtNode()->IsHidden() || mrSh.SelectHiddenRange() )
+            if ( rTNd.GetTextNode()->IsHidden() || mrSh.SelectHiddenRange() )
                 continue;
 
             SwCrsrSaveState aSaveState( *mrSh._GetCrsr() );
@@ -1941,7 +1941,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
             const SwRect aLinkRect( aTmp[ 0 ] );
 
             // Goto footnote text:
-            if ( mrSh.GotoFtnTxt() )
+            if ( mrSh.GotoFootnoteText() )
             {
                 // Link PageNums
                 std::vector<sal_Int32> aLinkPageNums = CalcOutputPageNums( aLinkRect );
@@ -1992,12 +1992,12 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
             for ( sal_uInt16 i = 0; i < nOutlineCount; ++i )
             {
                 // Check if outline is hidden
-                const SwTxtNode* pTNd = mrSh.GetNodes().GetOutLineNds()[ i ]->GetTxtNode();
+                const SwTextNode* pTNd = mrSh.GetNodes().GetOutLineNds()[ i ]->GetTextNode();
                 OSL_ENSURE( 0 != pTNd, "Enhanced pdf export - text node is missing" );
 
                 if ( pTNd->IsHidden() ||
                      // #i40292# Skip empty outlines:
-                     pTNd->GetTxt().isEmpty())
+                     pTNd->GetText().isEmpty())
                     continue;
 
                 // Get parent id from stack:
@@ -2207,7 +2207,7 @@ std::vector< sal_Int32 > SwEnhancedPDFExportHelper::CalcOutputPageNums(
 }
 
 void SwEnhancedPDFExportHelper::MakeHeaderFooterLinks( vcl::PDFExtOutDevData& rPDFExtOutDevData,
-                                                       const SwTxtNode& rTNd,
+                                                       const SwTextNode& rTNd,
                                                        const SwRect& rLinkRect,
                                                        sal_Int32 nDestId,
                                                        const OUString& rURL,
@@ -2217,8 +2217,8 @@ void SwEnhancedPDFExportHelper::MakeHeaderFooterLinks( vcl::PDFExtOutDevData& rP
     // the offset of the link rectangle calculates as follows:
     const Point aOffset = rLinkRect.Pos() + mrOut.GetMapMode().GetOrigin();
 
-    SwIterator<SwTxtFrm,SwTxtNode> aIter( rTNd );
-    for ( SwTxtFrm* pTmpFrm = aIter.First(); pTmpFrm; pTmpFrm = aIter.Next() )
+    SwIterator<SwTextFrm,SwTextNode> aIter( rTNd );
+    for ( SwTextFrm* pTmpFrm = aIter.First(); pTmpFrm; pTmpFrm = aIter.Next() )
         {
             // Add offset to current page:
             const SwPageFrm* pPageFrm = pTmpFrm->FindPageFrm();
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index c1ecd6a8e89f..f0c7a6b206fb 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -40,12 +40,12 @@ class SwAttrHandler
 {
 private:
 
-    /// Container for SwTxtAttr Objects
+    /// Container for SwTextAttr Objects
     class SwAttrStack
     {
     private:
-        SwTxtAttr* pInitialArray[ INITIAL_NUM_ATTR ];
-        SwTxtAttr** pArray;
+        SwTextAttr* pInitialArray[ INITIAL_NUM_ATTR ];
+        SwTextAttr** pArray;
         sal_uInt16 nCount; // number of elements on stack
         sal_uInt16 nSize;  // number of positions in Array
 
@@ -59,23 +59,23 @@ private:
         inline void Reset() { nCount = 0; };
 
         // insert on top
-        inline void Push( const SwTxtAttr& rAttr ) { Insert( rAttr, nCount ); };
+        inline void Push( const SwTextAttr& rAttr ) { Insert( rAttr, nCount ); };
         // insert at specified position, take care for not inserting behind
         // the value returned by Count()
-        void Insert( const SwTxtAttr& rAttr, const sal_uInt16 nPos );
+        void Insert( const SwTextAttr& rAttr, const sal_uInt16 nPos );
 
         // remove specified attribute
-        void Remove( const SwTxtAttr& rAttr );
+        void Remove( const SwTextAttr& rAttr );
 
         // get attribute from top if exists, otherwise 0
-        const SwTxtAttr* Top() const;
+        const SwTextAttr* Top() const;
 
         // number of elements on stack
         inline sal_uInt16 Count() const { return nCount; };
 
         // returns position of rAttr on Stack if found, otherwise USHRT_MAX
         // can be used for Remove of an attribute
-        sal_uInt16 Pos( const SwTxtAttr& rAttr ) const;
+        sal_uInt16 Pos( const SwTextAttr& rAttr ) const;
     };
 
     SwAttrStack aAttrStack[ NUM_ATTRIBUTE_STACKS ]; // stack collection
@@ -95,7 +95,7 @@ private:
     // push attribute to specified stack, returns true, if attribute has
     // been pushed on top of stack (important for stacks containing different
     // attributes with different priority and redlining)
-    bool Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem );
+    bool Push( const SwTextAttr& rAttr, const SfxPoolItem& rItem );
 
     // apply top attribute on stack to font
     void ActivateTop( SwFont& rFnt, sal_uInt16 nStackPos );
@@ -118,11 +118,11 @@ public:
     void Reset( );
 
     // insert specified attribute and change font
-    void PushAndChg( const SwTxtAttr& rAttr, SwFont& rFnt );
+    void PushAndChg( const SwTextAttr& rAttr, SwFont& rFnt );
 
     // remove specified attribute and reset font
-    void PopAndChg( const SwTxtAttr& rAttr, SwFont& rFnt );
-    void Pop( const SwTxtAttr& rAttr );
+    void PopAndChg( const SwTextAttr& rAttr, SwFont& rFnt );
+    void Pop( const SwTextAttr& rAttr );
 
     // apply script dependent attributes
     // void ChangeScript( SwFont& rFnt, const sal_uInt8 nScr );
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index e3cbe00f99be..155e02b23d3d 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -128,7 +128,7 @@ const sal_uInt8 StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] =
     43, // RES_TXTATR_INPUTFIELD                 // 55
 };
 
-namespace CharFmt
+namespace CharFormat
 {
 
 /// Returns the item set associated with an character/inet/auto style
@@ -138,17 +138,17 @@ const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr )
 
     if ( RES_TXTATR_AUTOFMT == rAttr.Which() )
     {
-        pSet = static_cast<const SwFmtAutoFmt&>(rAttr).GetStyleHandle().get();
+        pSet = static_cast<const SwFormatAutoFormat&>(rAttr).GetStyleHandle().get();
     }
     else
     {
         // Get the attributes from the template
-        const SwCharFmt* pFmt = RES_TXTATR_INETFMT == rAttr.Which() ?
-                        static_cast<const SwFmtINetFmt&>(rAttr).GetTxtINetFmt()->GetCharFmt() :
-                        static_cast<const SwFmtCharFmt&>(rAttr).GetCharFmt();
-        if( pFmt )
+        const SwCharFormat* pFormat = RES_TXTATR_INETFMT == rAttr.Which() ?
+                        static_cast<const SwFormatINetFormat&>(rAttr).GetTextINetFormat()->GetCharFormat() :
+                        static_cast<const SwFormatCharFormat&>(rAttr).GetCharFormat();
+        if( pFormat )
         {
-            pSet = &pFmt->GetAttrSet();
+            pSet = &pFormat->GetAttrSet();
         }
     }
 
@@ -156,13 +156,13 @@ const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr )
 }
 
 /// Extracts pool item of type nWhich from rAttr
-const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich )
+const SfxPoolItem* GetItem( const SwTextAttr& rAttr, sal_uInt16 nWhich )
 {
     if ( RES_TXTATR_INETFMT == rAttr.Which() ||
          RES_TXTATR_CHARFMT == rAttr.Which() ||
          RES_TXTATR_AUTOFMT == rAttr.Which() )
     {
-        const SfxItemSet* pSet = CharFmt::GetItemSet( rAttr.GetAttr() );
+        const SfxItemSet* pSet = CharFormat::GetItemSet( rAttr.GetAttr() );
         if ( !pSet ) return 0;
 
        bool bInParent = RES_TXTATR_AUTOFMT != rAttr.Which();
@@ -176,11 +176,11 @@ const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich )
 }
 
 /// Checks if item is included in character/inet/auto style
-bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr )
+bool IsItemIncluded( const sal_uInt16 nWhich, const SwTextAttr *pAttr )
 {
     bool bRet = false;
 
-    const SfxItemSet* pItemSet = CharFmt::GetItemSet( pAttr->GetAttr() );
+    const SfxItemSet* pItemSet = CharFormat::GetItemSet( pAttr->GetAttr() );
     if ( pItemSet )
         bRet = SfxItemState::SET == pItemSet->GetItemState( nWhich, true );
 
@@ -195,7 +195,7 @@ bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr )
  *     1. We never take the 'visited' color during printing/pdf export/preview
  *     2. The user has chosen to override these colors in the view options
  */
-static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr,
+static bool lcl_ChgHyperLinkColor( const SwTextAttr& rAttr,
                             const SfxPoolItem& rItem,
                             const SwViewShell* pShell,
                             Color* pColor )
@@ -210,8 +210,8 @@ static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr,
     // We do not want to show visited links:
     // (printing, pdf export, page preview)
 
-    SwTxtINetFmt & rINetAttr(const_cast<SwTxtINetFmt&>(
-                            static_txtattr_cast<SwTxtINetFmt const&>(rAttr)));
+    SwTextINetFormat & rINetAttr(const_cast<SwTextINetFormat&>(
+                            static_txtattr_cast<SwTextINetFormat const&>(rAttr)));
     if ( pShell->GetOut()->GetOutDevType() == OUTDEV_PRINTER ||
          pShell->GetViewOptions()->IsPDFExport() ||
          pShell->GetViewOptions()->IsPagePreview() )
@@ -222,9 +222,9 @@ static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr,
             {
                 // take color from character format 'unvisited link'
                 rINetAttr.SetVisited(false);
-                const SwCharFmt* pTmpFmt = rINetAttr.GetCharFmt();
+                const SwCharFormat* pTmpFormat = rINetAttr.GetCharFormat();
                 const SfxPoolItem* pItem;
-                if (SfxItemState::SET == pTmpFmt->GetItemState(RES_CHRATR_COLOR, true, &pItem))
+                if (SfxItemState::SET == pTmpFormat->GetItemState(RES_CHRATR_COLOR, true, &pItem))
                     *pColor = static_cast<const SvxColorItem*>(pItem)->GetValue();
                 rINetAttr.SetVisited(true);
             }
@@ -270,7 +270,7 @@ inline SwAttrHandler::SwAttrStack::SwAttrStack()
     pArray = pInitialArray;
 }
 
-void SwAttrHandler::SwAttrStack::Insert( const SwTxtAttr& rAttr, const sal_uInt16 nPos )
+void SwAttrHandler::SwAttrStack::Insert( const SwTextAttr& rAttr, const sal_uInt16 nPos )
 {
     // do we still have enough space?
     if ( nCount >= nSize )
@@ -279,19 +279,19 @@ void SwAttrHandler::SwAttrStack::Insert( const SwTxtAttr& rAttr, const sal_uInt1
         if ( INITIAL_NUM_ATTR == nSize )
         {
             nSize += STACK_INCREMENT;
-            pArray = new SwTxtAttr*[ nSize ];
+            pArray = new SwTextAttr*[ nSize ];
             // copy from pInitArray to new Array
             memcpy( pArray, pInitialArray,
-                    INITIAL_NUM_ATTR * sizeof(SwTxtAttr*)
+                    INITIAL_NUM_ATTR * sizeof(SwTextAttr*)
                     );
         }
         // we are in new memory
         else
         {
             nSize += STACK_INCREMENT;
-            SwTxtAttr** pTmpArray = new SwTxtAttr*[ nSize ];
+            SwTextAttr** pTmpArray = new SwTextAttr*[ nSize ];
             // copy from pArray to new Array
-            memcpy( pTmpArray, pArray, nCount * sizeof(SwTxtAttr*) );
+            memcpy( pTmpArray, pArray, nCount * sizeof(SwTextAttr*) );
             // free old array
             delete [] pArray;
             pArray = pTmpArray;
@@ -302,31 +302,31 @@ void SwAttrHandler::SwAttrStack::Insert( const SwTxtAttr& rAttr, const sal_uInt1
 
     if ( nPos < nCount )
         memmove( pArray + nPos + 1, pArray + nPos,
-                ( nCount - nPos ) * sizeof(SwTxtAttr*)
+                ( nCount - nPos ) * sizeof(SwTextAttr*)
                 );
-    pArray[ nPos ] = const_cast<SwTxtAttr*>(&rAttr);
+    pArray[ nPos ] = const_cast<SwTextAttr*>(&rAttr);
 
     nCount++;
 }
 
-void SwAttrHandler::SwAttrStack::Remove( const SwTxtAttr& rAttr )
+void SwAttrHandler::SwAttrStack::Remove( const SwTextAttr& rAttr )
 {
     sal_uInt16 nPos = Pos( rAttr );
     if ( nPos < nCount )
     {
         memmove( pArray + nPos, pArray + nPos + 1,
-                ( nCount - 1 - nPos ) * sizeof(SwTxtAttr*)
+                ( nCount - 1 - nPos ) * sizeof(SwTextAttr*)
                 );
         nCount--;
     }
 }
 
-const SwTxtAttr* SwAttrHandler::SwAttrStack::Top() const
+const SwTextAttr* SwAttrHandler::SwAttrStack::Top() const
 {
     return nCount ? pArray[ nCount - 1 ] : 0;
 }
 
-sal_uInt16 SwAttrHandler::SwAttrStack::Pos( const SwTxtAttr& rAttr ) const
+sal_uInt16 SwAttrHandler::SwAttrStack::Pos( const SwTextAttr& rAttr ) const
 {
     if ( ! nCount )
         // empty stack
@@ -404,7 +404,7 @@ void SwAttrHandler::Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAS,
     }
 
     // It is possible, that Init is called more than once, e.g., in a
-    // SwTxtFrm::FormatOnceMore situation.
+    // SwTextFrm::FormatOnceMore situation.
     delete pFnt;
     pFnt = new SwFont( rFnt );
 }
@@ -415,7 +415,7 @@ void SwAttrHandler::Reset( )
         aAttrStack[ i ].Reset();
 }
 
-void SwAttrHandler::PushAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
+void SwAttrHandler::PushAndChg( const SwTextAttr& rAttr, SwFont& rFnt )
 {
     // these special attributes in fact represent a collection of attributes
     // they have to be pushed to each stack they belong to
@@ -423,7 +423,7 @@ void SwAttrHandler::PushAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
          RES_TXTATR_CHARFMT == rAttr.Which() ||
          RES_TXTATR_AUTOFMT == rAttr.Which() )
     {
-        const SfxItemSet* pSet = CharFmt::GetItemSet( rAttr.GetAttr() );
+        const SfxItemSet* pSet = CharFormat::GetItemSet( rAttr.GetAttr() );
         if ( !pSet ) return;
 
         for ( sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++)
@@ -459,7 +459,7 @@ void SwAttrHandler::PushAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
     }
 }
 
-bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem )
+bool SwAttrHandler::Push( const SwTextAttr& rAttr, const SfxPoolItem& rItem )
 {
     OSL_ENSURE( rItem.Which() < RES_TXTATR_WITHEND_END,
             "I do not want this attribute, nWhich >= RES_TXTATR_WITHEND_END" );
@@ -472,7 +472,7 @@ bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem )
 
     // attributes originating from redlining have highest priority
     // second priority are hyperlink attributes, which have a color replacement
-    const SwTxtAttr* pTopAttr = aAttrStack[ nStack ].Top();
+    const SwTextAttr* pTopAttr = aAttrStack[ nStack ].Top();
     if ( !pTopAttr
          || rAttr.IsPriorityAttr()
          || ( !pTopAttr->IsPriorityAttr()
@@ -488,7 +488,7 @@ bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem )
     return false;
 }
 
-void SwAttrHandler::PopAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
+void SwAttrHandler::PopAndChg( const SwTextAttr& rAttr, SwFont& rFnt )
 {
     if ( RES_TXTATR_WITHEND_END <= rAttr.Which() )
         return; // robust
@@ -499,7 +499,7 @@ void SwAttrHandler::PopAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
          RES_TXTATR_CHARFMT == rAttr.Which() ||
          RES_TXTATR_AUTOFMT == rAttr.Which() )
     {
-        const SfxItemSet* pSet = CharFmt::GetItemSet( rAttr.GetAttr() );
+        const SfxItemSet* pSet = CharFormat::GetItemSet( rAttr.GetAttr() );
         if ( !pSet ) return;
 
         for ( sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++)
@@ -529,7 +529,7 @@ void SwAttrHandler::PopAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
 }
 
 /// Only used during redlining
-void SwAttrHandler::Pop( const SwTxtAttr& rAttr )
+void SwAttrHandler::Pop( const SwTextAttr& rAttr )
 {
     OSL_ENSURE( rAttr.Which() < RES_TXTATR_WITHEND_END,
             "I do not have this attribute, nWhich >= RES_TXTATR_WITHEND_END" );
@@ -546,7 +546,7 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr )
             "I cannot activate this attribute, nWhich >= RES_TXTATR_WITHEND_END" );
 
     const sal_uInt16 nStackPos = StackPos[ nAttr ];
-    const SwTxtAttr* pTopAt = aAttrStack[ nStackPos ].Top();
+    const SwTextAttr* pTopAt = aAttrStack[ nStackPos ].Top();
     if ( pTopAt )
     {
         const SfxPoolItem* pItemNext(NULL);
@@ -556,7 +556,7 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr )
              RES_TXTATR_CHARFMT == pTopAt->Which() ||
              RES_TXTATR_AUTOFMT == pTopAt->Which() )
         {
-            const SfxItemSet* pSet = CharFmt::GetItemSet( pTopAt->GetAttr() );
+            const SfxItemSet* pSet = CharFormat::GetItemSet( pTopAt->GetAttr() );
             if (pSet)
                 pSet->GetItemState( nAttr, RES_TXTATR_AUTOFMT != pTopAt->Which(), &pItemNext );
         }
@@ -593,11 +593,11 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr )
         // check, if an rotation attribute has to be applied
         const sal_uInt16 nTwoLineStack = StackPos[ RES_CHRATR_TWO_LINES ];
         bool bTwoLineAct = false;
-        const SwTxtAttr* pTwoLineAttr = aAttrStack[ nTwoLineStack ].Top();
+        const SwTextAttr* pTwoLineAttr = aAttrStack[ nTwoLineStack ].Top();
 
         if ( pTwoLineAttr )
         {
-             const SfxPoolItem* pTwoLineItem = CharFmt::GetItem( *pTwoLineAttr, RES_CHRATR_TWO_LINES );
+             const SfxPoolItem* pTwoLineItem = CharFormat::GetItem( *pTwoLineAttr, RES_CHRATR_TWO_LINES );
              bTwoLineAct = static_cast<const SvxTwoLinesItem*>(pTwoLineItem)->GetValue();
         }
         else
@@ -609,11 +609,11 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr )
 
         // eventually, an rotate attribute has to be activated
         const sal_uInt16 nRotateStack = StackPos[ RES_CHRATR_ROTATE ];
-        const SwTxtAttr* pRotateAttr = aAttrStack[ nRotateStack ].Top();
+        const SwTextAttr* pRotateAttr = aAttrStack[ nRotateStack ].Top();
 
         if ( pRotateAttr )
         {
-            const SfxPoolItem* pRotateItem = CharFmt::GetItem( *pRotateAttr, RES_CHRATR_ROTATE );
+            const SfxPoolItem* pRotateItem = CharFormat::GetItem( *pRotateAttr, RES_CHRATR_ROTATE );
             rFnt.SetVertical( static_cast<const SvxCharRotateItem*>(pRotateItem)->GetValue(),
                                bVertLayout );
         }
@@ -677,10 +677,10 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush )
         case RES_CHRATR_UNDERLINE :
         {
             const sal_uInt16 nStackPos = StackPos[ RES_CHRATR_HIDDEN ];
-            const SwTxtAttr* pTopAt = aAttrStack[ nStackPos ].Top();
+            const SwTextAttr* pTopAt = aAttrStack[ nStackPos ].Top();
 
             const SfxPoolItem* pTmpItem = pTopAt ?
-                                          CharFmt::GetItem( *pTopAt, RES_CHRATR_HIDDEN ) :
+                                          CharFormat::GetItem( *pTopAt, RES_CHRATR_HIDDEN ) :
                                           pDefaultArray[ nStackPos ];
 
             if( (mpShell && !mpShell->GetWin()) ||
@@ -814,11 +814,11 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush )
 
             const sal_uInt16 nTwoLineStack = StackPos[ RES_CHRATR_TWO_LINES ];
             bool bTwoLineAct = false;
-            const SwTxtAttr* pTwoLineAttr = aAttrStack[ nTwoLineStack ].Top();
+            const SwTextAttr* pTwoLineAttr = aAttrStack[ nTwoLineStack ].Top();
 
             if ( pTwoLineAttr )
             {
-                const SfxPoolItem* pTwoLineItem = CharFmt::GetItem( *pTwoLineAttr, RES_CHRATR_TWO_LINES );
+                const SfxPoolItem* pTwoLineItem = CharFormat::GetItem( *pTwoLineAttr, RES_CHRATR_TWO_LINES );
                 bTwoLineAct = static_cast<const SvxTwoLinesItem*>(pTwoLineItem)->GetValue();
             }
             else
@@ -851,11 +851,11 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush )
                 break;
 
             const sal_uInt16 nRotateStack = StackPos[ RES_CHRATR_ROTATE ];
-            const SwTxtAttr* pRotateAttr = aAttrStack[ nRotateStack ].Top();
+            const SwTextAttr* pRotateAttr = aAttrStack[ nRotateStack ].Top();
 
             if ( pRotateAttr )
             {
-                const SfxPoolItem* pRotateItem = CharFmt::GetItem( *pRotateAttr, RES_CHRATR_ROTATE );
+                const SfxPoolItem* pRotateItem = CharFormat::GetItem( *pRotateAttr, RES_CHRATR_ROTATE );
                 rFnt.SetVertical( static_cast<const SvxCharRotateItem*>(pRotateItem)->GetValue(),
                                    bVertLayout );
             }
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index 8bdd175f98d7..db06123d6809 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -116,7 +116,7 @@ IMPL_LINK_NOARG_TYPED(SwBlink, Blinker, Timer *, void)
 }
 
 void SwBlink::Insert( const Point& rPoint, const SwLinePortion* pPor,
-                      const SwTxtFrm *pTxtFrm, sal_uInt16 nDir )
+                      const SwTextFrm *pTextFrm, sal_uInt16 nDir )
 {
     SwBlinkPortion *pBlinkPor = new SwBlinkPortion( pPor, nDir );
 
@@ -129,9 +129,9 @@ void SwBlink::Insert( const Point& rPoint, const SwLinePortion* pPor,
     else
     {
         pBlinkPor->SetPos( rPoint );
-        pBlinkPor->SetRootFrm( pTxtFrm->getRootFrm() );
+        pBlinkPor->SetRootFrm( pTextFrm->getRootFrm() );
         aList.insert( pBlinkPor );
-        pTxtFrm->SetBlinkPor();
+        pTextFrm->SetBlinkPor();
         if( pPor->IsLayPortion() || pPor->IsParaPortion() )
             const_cast<SwLineLayout*>(static_cast<const SwLineLayout*>(pPor))->SetBlinking();
 
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 324a3b3b082a..51abdd35146f 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -55,18 +55,18 @@ using namespace ::com::sun::star;
  * - RightMargin abstains from adjusting position with -1
  * - GetCharRect returns a GetEndCharRect for MV_RIGHTMARGIN
  * - GetEndCharRect sets bRightMargin to true
- * - SwTxtCursor::bRightMargin is set to false by CharCrsrToLine
+ * - SwTextCursor::bRightMargin is set to false by CharCrsrToLine
  */
 
 namespace
 {
 
-SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos,
+SwTextFrm *GetAdjFrmAtPos( SwTextFrm *pFrm, const SwPosition &rPos,
                           const bool bRightMargin, const bool bNoScroll = true )
 {
     // RightMargin in the last master line
     const sal_Int32 nOffset = rPos.nContent.GetIndex();
-    SwTxtFrm *pFrmAtPos = pFrm;
+    SwTextFrm *pFrmAtPos = pFrm;
     if( !bNoScroll || pFrm->GetFollow() )
     {
         pFrmAtPos = pFrm->GetFrmAtPos( rPos );
@@ -103,7 +103,7 @@ SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos,
 
 }
 
-bool sw_ChangeOffset( SwTxtFrm* pFrm, sal_Int32 nNew )
+bool sw_ChangeOffset( SwTextFrm* pFrm, sal_Int32 nNew )
 {
     // Do not scroll in areas and outside of flies
     OSL_ENSURE( !pFrm->IsFollow(), "Illegal Scrolling by Follow!" );
@@ -138,17 +138,17 @@ bool sw_ChangeOffset( SwTxtFrm* pFrm, sal_Int32 nNew )
     return false;
 }
 
-SwTxtFrm& SwTxtFrm::GetFrmAtOfst( const sal_Int32 nWhere )
+SwTextFrm& SwTextFrm::GetFrmAtOfst( const sal_Int32 nWhere )
 {
-    SwTxtFrm* pRet = this;
+    SwTextFrm* pRet = this;
     while( pRet->HasFollow() && nWhere >= pRet->GetFollow()->GetOfst() )
         pRet = pRet->GetFollow();
     return *pRet;
 }
 
-SwTxtFrm *SwTxtFrm::GetFrmAtPos( const SwPosition &rPos )
+SwTextFrm *SwTextFrm::GetFrmAtPos( const SwPosition &rPos )
 {
-    SwTxtFrm *pFoll = this;
+    SwTextFrm *pFoll = this;
     while( pFoll->GetFollow() )
     {
         if( rPos.nContent.GetIndex() > pFoll->GetFollow()->GetOfst() )
@@ -156,7 +156,7 @@ SwTxtFrm *SwTxtFrm::GetFrmAtPos( const SwPosition &rPos )
         else
         {
             if( rPos.nContent.GetIndex() == pFoll->GetFollow()->GetOfst()
-                 && !SwTxtCursor::IsRightMargin() )
+                 && !SwTextCursor::IsRightMargin() )
                  pFoll = pFoll->GetFollow();
             else
                 break;
@@ -172,10 +172,10 @@ SwTxtFrm *SwTxtFrm::GetFrmAtPos( const SwPosition &rPos )
  * Both are virtual in the frame base class and thus are redefined here.
  */
 
-bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
+bool SwTextFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
                             SwCrsrMoveState *pCMS ) const
 {
-    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::GetCharRect with swapped frame" );
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTextFrm::GetCharRect with swapped frame" );
 
     if( IsLocked() || IsHiddenNow() )
         return false;
@@ -189,7 +189,7 @@ bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
     // Optimisation: reading ahead saves us a GetAdjFrmAtPos
     const bool bRightMargin = pCMS && ( MV_RIGHTMARGIN == pCMS->eState );
     const bool bNoScroll = pCMS && pCMS->bNoScroll;
-    SwTxtFrm *pFrm = GetAdjFrmAtPos( const_cast<SwTxtFrm*>(this), rPos, bRightMargin,
+    SwTextFrm *pFrm = GetAdjFrmAtPos( const_cast<SwTextFrm*>(this), rPos, bRightMargin,
                                      bNoScroll );
     pFrm->GetFormatted();
     const SwFrm* pTmpFrm = (SwFrm*)pFrm->GetUpper();
@@ -208,9 +208,9 @@ bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
     if ( pFrm->IsEmpty() || ! (pFrm->Prt().*fnRect->fnGetHeight)() )
     {
         Point aPnt1 = pFrm->Frm().Pos() + pFrm->Prt().Pos();
-        SwTxtNode* pTxtNd = const_cast<SwTxtFrm*>(this)->GetTxtNode();
+        SwTextNode* pTextNd = const_cast<SwTextFrm*>(this)->GetTextNode();
         short nFirstOffset;
-        pTxtNd->GetFirstLineOfsWithNum( nFirstOffset );
+        pTextNd->GetFirstLineOfsWithNum( nFirstOffset );
 
         Point aPnt2;
         if ( bVert )
@@ -266,8 +266,8 @@ bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
         do
         {
             {
-                SwTxtSizeInfo aInf( pFrm );
-                SwTxtCursor  aLine( pFrm, &aInf );
+                SwTextSizeInfo aInf( pFrm );
+                SwTextCursor  aLine( pFrm, &aInf );
                 nNextOfst = aLine.GetEnd();
                 // See comment in AdjustFrm
                 // Include the line's last char?
@@ -285,7 +285,7 @@ bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
                 (rOrig.*fnRect->fnGetBottom)() == nUpperMaxY &&
                 pFrm->GetOfst() < nOffset &&
                 !pFrm->IsFollow() && !bNoScroll &&
-                pFrm->GetTxtNode()->GetTxt().getLength() != nNextOfst)
+                pFrm->GetTextNode()->GetText().getLength() != nNextOfst)
             {
                 bGoOn = sw_ChangeOffset( pFrm, nNextOfst );
             }
@@ -353,13 +353,13 @@ bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
  * and is used by the auto-positioned frame.
  */
 
-bool SwTxtFrm::GetAutoPos( SwRect& rOrig, const SwPosition &rPos ) const
+bool SwTextFrm::GetAutoPos( SwRect& rOrig, const SwPosition &rPos ) const
 {
     if( IsHiddenNow() )
         return false;
 
     const sal_Int32 nOffset = rPos.nContent.GetIndex();
-    SwTxtFrm* pFrm = &(const_cast<SwTxtFrm*>(this)->GetFrmAtOfst( nOffset ));
+    SwTextFrm* pFrm = &(const_cast<SwTextFrm*>(this)->GetFrmAtOfst( nOffset ));
 
     pFrm->GetFormatted();
     const SwFrm* pTmpFrm = (SwFrm*)pFrm->GetUpper();
@@ -413,8 +413,8 @@ bool SwTxtFrm::GetAutoPos( SwRect& rOrig, const SwPosition &rPos ) const
         if ( bVert )
             nMaxY = pFrm->SwitchVerticalToHorizontal( nMaxY );
 
-        SwTxtSizeInfo aInf( pFrm );
-        SwTxtCursor aLine( pFrm, &aInf );
+        SwTextSizeInfo aInf( pFrm );
+        SwTextCursor aLine( pFrm, &aInf );
         SwCrsrMoveState aTmpState( MV_SETONLYTEXT );
         aTmpState.bRealHeight = true;
         if( aLine.GetCharRect( &rOrig, nOffset, &aTmpState, nMaxY ) )
@@ -443,7 +443,7 @@ bool SwTxtFrm::GetAutoPos( SwRect& rOrig, const SwPosition &rPos ) const
     - If a proportional line spacing is applied use top of anchor character as
       top of the line.
 */
-bool SwTxtFrm::GetTopOfLine( SwTwips& _onTopOfLine,
+bool SwTextFrm::GetTopOfLine( SwTwips& _onTopOfLine,
                              const SwPosition& _rPos ) const
 {
     bool bRet = true;
@@ -451,7 +451,7 @@ bool SwTxtFrm::GetTopOfLine( SwTwips& _onTopOfLine,
     // get position offset
     const sal_Int32 nOffset = _rPos.nContent.GetIndex();
 
-    if ( GetTxt().getLength() < nOffset )
+    if ( GetText().getLength() < nOffset )
     {
         bRet = false;
     }
@@ -467,7 +467,7 @@ bool SwTxtFrm::GetTopOfLine( SwTwips& _onTopOfLine,
         else
         {
             // determine formatted text frame that contains the requested position
-            SwTxtFrm* pFrm = &(const_cast<SwTxtFrm*>(this)->GetFrmAtOfst( nOffset ));
+            SwTextFrm* pFrm = &(const_cast<SwTextFrm*>(this)->GetFrmAtOfst( nOffset ));
             pFrm->GetFormatted();
             SWREFRESHFN( pFrm )
             // If proportional line spacing is applied
@@ -492,8 +492,8 @@ bool SwTxtFrm::GetTopOfLine( SwTwips& _onTopOfLine,
                 // assure that text frame is in a horizontal layout
                 SwFrmSwapper aSwapper( pFrm, true );
                 // determine text line that contains the requested position
-                SwTxtSizeInfo aInf( pFrm );
-                SwTxtCursor aLine( pFrm, &aInf );
+                SwTextSizeInfo aInf( pFrm );
+                SwTextCursor aLine( pFrm, &aInf );
                 aLine.CharCrsrToLine( nOffset );
                 // determine top of line
                 _onTopOfLine = aLine.Y();
@@ -538,7 +538,7 @@ struct SwFillData
     void SetOrient( const sal_Int16 eNew ){ pCMS->pFill->eOrient = eNew; }
 };
 
-bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
+bool SwTextFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
                     const bool bChgFrm, SwCrsrMoveState* pCMS ) const
 {
     // _GetCrsrOfst is called by GetCrsrOfst and GetKeyCrsrOfst.
@@ -547,14 +547,14 @@ bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
     if( IsLocked() || IsHiddenNow() )
         return false;
 
-    const_cast<SwTxtFrm*>(this)->GetFormatted();
+    const_cast<SwTextFrm*>(this)->GetFormatted();
 
     Point aOldPoint( rPoint );
 
     if ( IsVertical() )
     {
         SwitchVerticalToHorizontal( (Point&)rPoint );
-        const_cast<SwTxtFrm*>(this)->SwapWidthAndHeight();
+        const_cast<SwTextFrm*>(this)->SwapWidthAndHeight();
     }
 
     if ( IsRightToLeft() )
@@ -565,9 +565,9 @@ bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
 
     if ( IsEmpty() )
     {
-        SwTxtNode* pTxtNd = const_cast<SwTxtFrm*>(this)->GetTxtNode();
-        pPos->nNode = *pTxtNd;
-        pPos->nContent.Assign( pTxtNd, 0 );
+        SwTextNode* pTextNd = const_cast<SwTextFrm*>(this)->GetTextNode();
+        pPos->nNode = *pTextNd;
+        pPos->nContent.Assign( pTextNd, 0 );
         if( pCMS && pCMS->bFieldInfo )
         {
             SwTwips nDiff = rPoint.X() - Frm().Left() - Prt().Left();
@@ -577,8 +577,8 @@ bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
     }
     else
     {
-        SwTxtSizeInfo aInf( const_cast<SwTxtFrm*>(this) );
-        SwTxtCursor  aLine( const_cast<SwTxtFrm*>(this), &aInf );
+        SwTextSizeInfo aInf( const_cast<SwTextFrm*>(this) );
+        SwTextCursor  aLine( const_cast<SwTextFrm*>(this), &aInf );
 
         // See comment in AdjustFrm()
         SwTwips nMaxY = Frm().Top() + Prt().Top() + Prt().Height();
@@ -601,21 +601,21 @@ bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
 
     // pPos is a pure IN parameter and must not be evaluated.
     // pIter->GetCrsrOfst returns from a nesting with COMPLETE_STRING.
-    // If SwTxtIter::GetCrsrOfst calls GetCrsrOfst further by itself
+    // If SwTextIter::GetCrsrOfst calls GetCrsrOfst further by itself
     // nNode changes the position.
     // In such cases, pPos must not be calculated.
         if( COMPLETE_STRING != nOffset )
         {
-            SwTxtNode* pTxtNd = const_cast<SwTxtFrm*>(this)->GetTxtNode();
-            pPos->nNode = *pTxtNd;
-            pPos->nContent.Assign( pTxtNd, nOffset );
+            SwTextNode* pTextNd = const_cast<SwTextFrm*>(this)->GetTextNode();
+            pPos->nNode = *pTextNd;
+            pPos->nContent.Assign( pTextNd, nOffset );
             if( pFillData )
             {
-                if (pTxtNd->GetTxt().getLength() > nOffset ||
+                if (pTextNd->GetText().getLength() > nOffset ||
                     rPoint.Y() < Frm().Top() )
                     pFillData->bInner = true;
                 pFillData->bFirstLine = aLine.GetLineNr() < 2;
-                if (pTxtNd->GetTxt().getLength())
+                if (pTextNd->GetText().getLength())
                 {
                     pFillData->bEmpty = false;
                     pFillData->nLineWidth = aLine.GetCurr()->Width();
@@ -634,7 +634,7 @@ bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
     {
         if ( bChgFillData )
             SwitchHorizontalToVertical( pFillData->Fill().aCrsr.Pos() );
-        const_cast<SwTxtFrm*>(this)->SwapWidthAndHeight();
+        const_cast<SwTextFrm*>(this)->SwapWidthAndHeight();
     }
 
     if ( IsRightToLeft() && bChgFillData )
@@ -654,7 +654,7 @@ bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
     return true;
 }
 
-bool SwTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& rPoint,
+bool SwTextFrm::GetCrsrOfst(SwPosition* pPos, Point& rPoint,
                                SwCrsrMoveState* pCMS, bool ) const
 {
     const bool bChgFrm = !(pCMS && MV_UPDOWN == pCMS->eState);
@@ -665,21 +665,21 @@ bool SwTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& rPoint,
  * Layout-oriented cursor movement to the line start.
  */
 
-bool SwTxtFrm::LeftMargin(SwPaM *pPam) const
+bool SwTextFrm::LeftMargin(SwPaM *pPam) const
 {
     if( &pPam->GetNode() != GetNode() )
-        pPam->GetPoint()->nNode = *const_cast<SwTxtFrm*>(this)->GetTxtNode();
+        pPam->GetPoint()->nNode = *const_cast<SwTextFrm*>(this)->GetTextNode();
 
-    SwTxtFrm *pFrm = GetAdjFrmAtPos( const_cast<SwTxtFrm*>(this), *pPam->GetPoint(),
-                                     SwTxtCursor::IsRightMargin() );
+    SwTextFrm *pFrm = GetAdjFrmAtPos( const_cast<SwTextFrm*>(this), *pPam->GetPoint(),
+                                     SwTextCursor::IsRightMargin() );
     pFrm->GetFormatted();
     sal_Int32 nIndx;
     if ( pFrm->IsEmpty() )
         nIndx = 0;
     else
     {
-        SwTxtSizeInfo aInf( pFrm );
-        SwTxtCursor  aLine( pFrm, &aInf );
+        SwTextSizeInfo aInf( pFrm );
+        SwTextCursor  aLine( pFrm, &aInf );
 
         aLine.CharCrsrToLine(pPam->GetPoint()->nContent.GetIndex());
         nIndx = aLine.GetStart();
@@ -689,8 +689,8 @@ bool SwTxtFrm::LeftMargin(SwPaM *pPam) const
             nIndx = 0;
         }
     }
-    pPam->GetPoint()->nContent = SwIndex( pFrm->GetTxtNode(), nIndx );
-    SwTxtCursor::SetRightMargin( false );
+    pPam->GetPoint()->nContent = SwIndex( pFrm->GetTextNode(), nIndx );
+    SwTextCursor::SetRightMargin( false );
     return true;
 }
 
@@ -700,38 +700,38 @@ bool SwTxtFrm::LeftMargin(SwPaM *pPam) const
  * the last char in order to append text.
  */
 
-bool SwTxtFrm::RightMargin(SwPaM *pPam, bool bAPI) const
+bool SwTextFrm::RightMargin(SwPaM *pPam, bool bAPI) const
 {
     if( &pPam->GetNode() != GetNode() )
-        pPam->GetPoint()->nNode = *const_cast<SwTxtFrm*>(this)->GetTxtNode();
+        pPam->GetPoint()->nNode = *const_cast<SwTextFrm*>(this)->GetTextNode();
 
-    SwTxtFrm *pFrm = GetAdjFrmAtPos( const_cast<SwTxtFrm*>(this), *pPam->GetPoint(),
-                                     SwTxtCursor::IsRightMargin() );
+    SwTextFrm *pFrm = GetAdjFrmAtPos( const_cast<SwTextFrm*>(this), *pPam->GetPoint(),
+                                     SwTextCursor::IsRightMargin() );
     pFrm->GetFormatted();
     sal_Int32 nRightMargin;
     if ( IsEmpty() )
         nRightMargin = 0;
     else
     {
-        SwTxtSizeInfo aInf( pFrm );
-        SwTxtCursor  aLine( pFrm, &aInf );
+        SwTextSizeInfo aInf( pFrm );
+        SwTextCursor  aLine( pFrm, &aInf );
 
         aLine.CharCrsrToLine(pPam->GetPoint()->nContent.GetIndex());
         nRightMargin = aLine.GetStart() + aLine.GetCurr()->GetLen();
 
         // We skip hard line brakes
         if( aLine.GetCurr()->GetLen() &&
-            CH_BREAK == aInf.GetTxt()[nRightMargin - 1])
+            CH_BREAK == aInf.GetText()[nRightMargin - 1])
             --nRightMargin;
         else if( !bAPI && (aLine.GetNext() || pFrm->GetFollow()) )
         {
             while( nRightMargin > aLine.GetStart() &&
-                ' ' == aInf.GetTxt()[nRightMargin - 1])
+                ' ' == aInf.GetText()[nRightMargin - 1])
                 --nRightMargin;
         }
     }
-    pPam->GetPoint()->nContent = SwIndex( pFrm->GetTxtNode(), nRightMargin );
-    SwTxtCursor::SetRightMargin( !bAPI );
+    pPam->GetPoint()->nContent = SwIndex( pFrm->GetTextNode(), nRightMargin );
+    SwTextCursor::SetRightMargin( !bAPI );
     return true;
 }
 
@@ -745,11 +745,11 @@ class SwSetToRightMargin
     bool bRight;
 public:
     inline SwSetToRightMargin() : bRight( false ) { }
-    inline ~SwSetToRightMargin() { SwTxtCursor::SetRightMargin( bRight ); }
+    inline ~SwSetToRightMargin() { SwTextCursor::SetRightMargin( bRight ); }
     inline void SetRight( const bool bNew ) { bRight = bNew; }
 };
 
-bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
+bool SwTextFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
                         bool bSetInReadOnly ) const
 {
     // Set the RightMargin if needed
@@ -761,10 +761,10 @@ bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
     {
         // If the PaM is located within different boxes, we have a table selection,
         // which is handled by the base class.
-        return SwCntntFrm::UnitUp( pPam, nOffset, bSetInReadOnly );
+        return SwContentFrm::UnitUp( pPam, nOffset, bSetInReadOnly );
     }
 
-    const_cast<SwTxtFrm*>(this)->GetFormatted();
+    const_cast<SwTextFrm*>(this)->GetFormatted();
     const sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
     SwRect aCharBox;
 
@@ -774,10 +774,10 @@ bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
         do
         {
             if( nFormat != COMPLETE_STRING && !IsFollow() )
-                sw_ChangeOffset( const_cast<SwTxtFrm*>(this), nFormat );
+                sw_ChangeOffset( const_cast<SwTextFrm*>(this), nFormat );
 
-            SwTxtSizeInfo aInf( const_cast<SwTxtFrm*>(this) );
-            SwTxtCursor  aLine( const_cast<SwTxtFrm*>(this), &aInf );
+            SwTextSizeInfo aInf( const_cast<SwTextFrm*>(this) );
+            SwTextCursor  aLine( const_cast<SwTextFrm*>(this), &aInf );
 
             // Optimize away flys with no flow and IsDummy()
             if( nPos )
@@ -821,7 +821,7 @@ bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
                 aCharBox.SSize().Width() /= 2;
                 aCharBox.Pos().X() = aCharBox.Pos().X() - 150;
 
-                // See comment in SwTxtFrm::GetCrsrOfst()
+                // See comment in SwTextFrm::GetCrsrOfst()
 #if OSL_DEBUG_LEVEL > 0
                 const sal_uLong nOldNode = pPam->GetPoint()->nNode.GetIndex();
 #endif
@@ -830,7 +830,7 @@ bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
                                                          aCharBox.Pos(), false );
 #if OSL_DEBUG_LEVEL > 0
                 OSL_ENSURE( nOldNode == pPam->GetPoint()->nNode.GetIndex(),
-                        "SwTxtFrm::UnitUp: illegal node change" );
+                        "SwTextFrm::UnitUp: illegal node change" );
 #endif
 
                 // We make sure that we move up.
@@ -840,7 +840,7 @@ bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
                     aSet.SetRight( true );
                 }
                 pPam->GetPoint()->nContent =
-                      SwIndex( const_cast<SwTxtFrm*>(this)->GetTxtNode(), nTmpOfst );
+                      SwIndex( const_cast<SwTextFrm*>(this)->GetTextNode(), nTmpOfst );
                 return true;
             }
 
@@ -858,13 +858,13 @@ bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
      */
     if ( IsFollow() )
     {
-        const SwTxtFrm *pTmpPrev = FindMaster();
+        const SwTextFrm *pTmpPrev = FindMaster();
         sal_Int32 nOffs = GetOfst();
         if( pTmpPrev )
         {
             SwViewShell *pSh = getRootFrm()->GetCurrShell();
             const bool bProtectedAllowed = pSh && pSh->GetViewOptions()->IsCursorInProtectedArea();
-            const SwTxtFrm *pPrevPrev = pTmpPrev;
+            const SwTextFrm *pPrevPrev = pTmpPrev;
             // We skip protected frames and frames without content here
             while( pPrevPrev && ( pPrevPrev->GetOfst() == nOffs ||
                    ( !bProtectedAllowed && pPrevPrev->IsProtected() ) ) )
@@ -877,12 +877,12 @@ bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
                     pPrevPrev = NULL;
             }
             if ( !pPrevPrev )
-                return pTmpPrev->SwCntntFrm::UnitUp( pPam, nOffset, bSetInReadOnly );
+                return pTmpPrev->SwContentFrm::UnitUp( pPam, nOffset, bSetInReadOnly );
             aCharBox.Pos().Y() = pPrevPrev->Frm().Bottom() - 1;
             return pPrevPrev->GetKeyCrsrOfst( pPam->GetPoint(), aCharBox.Pos() );
         }
     }
-    return SwCntntFrm::UnitUp( pPam, nOffset, bSetInReadOnly );
+    return SwContentFrm::UnitUp( pPam, nOffset, bSetInReadOnly );
 }
 
 // Used for Bidi. nPos is the logical position in the string, bLeft indicates
@@ -1035,7 +1035,7 @@ static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, sal_Int32 nI
     }
 }
 
-void SwTxtFrm::PrepareVisualMove( sal_Int32& nPos, sal_uInt8& nCrsrLevel,
+void SwTextFrm::PrepareVisualMove( sal_Int32& nPos, sal_uInt8& nCrsrLevel,
                                   bool& bForward, bool bInsertCrsr )
 {
     if( IsEmpty() || IsHiddenNow() )
@@ -1043,8 +1043,8 @@ void SwTxtFrm::PrepareVisualMove( sal_Int32& nPos, sal_uInt8& nCrsrLevel,
 
     GetFormatted();
 
-    SwTxtSizeInfo aInf(this);
-    SwTxtCursor  aLine(this, &aInf);
+    SwTextSizeInfo aInf(this);
+    SwTextCursor  aLine(this, &aInf);
 
     if( nPos )
         aLine.CharCrsrToLine( nPos );
@@ -1077,7 +1077,7 @@ void SwTxtFrm::PrepareVisualMove( sal_Int32& nPos, sal_uInt8& nCrsrLevel,
 
     // Bidi functions from icu 2.0
 
-    const sal_Unicode* pLineString = GetTxtNode()->GetTxt().getStr();
+    const sal_Unicode* pLineString = GetTextNode()->GetText().getStr();
 
     UErrorCode nError = U_ZERO_ERROR;
     UBiDi* pBidi = ubidi_openSized( nLen, 0, &nError );
@@ -1138,7 +1138,7 @@ void SwTxtFrm::PrepareVisualMove( sal_Int32& nPos, sal_uInt8& nCrsrLevel,
     ubidi_close( pBidi );
 }
 
-bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
+bool SwTextFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
                          bool bSetInReadOnly ) const
 {
 
@@ -1148,15 +1148,15 @@ bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
     {
         // If the PaM is located within different boxes, we have a table selection,
         // which is handled by the base class.
-        return SwCntntFrm::UnitDown( pPam, nOffset, bSetInReadOnly );
+        return SwContentFrm::UnitDown( pPam, nOffset, bSetInReadOnly );
     }
-    const_cast<SwTxtFrm*>(this)->GetFormatted();
+    const_cast<SwTextFrm*>(this)->GetFormatted();
     const sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
     SwRect aCharBox;
-    const SwCntntFrm *pTmpFollow = 0;
+    const SwContentFrm *pTmpFollow = 0;
 
     if ( IsVertical() )
-        const_cast<SwTxtFrm*>(this)->SwapWidthAndHeight();
+        const_cast<SwTextFrm*>(this)->SwapWidthAndHeight();
 
     if ( !IsEmpty() && !IsHiddenNow() )
     {
@@ -1164,11 +1164,11 @@ bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
         do
         {
             if( nFormat != COMPLETE_STRING && !IsFollow() &&
-                !sw_ChangeOffset( const_cast<SwTxtFrm*>(this), nFormat ) )
+                !sw_ChangeOffset( const_cast<SwTextFrm*>(this), nFormat ) )
                 break;
 
-            SwTxtSizeInfo aInf( const_cast<SwTxtFrm*>(this) );
-            SwTxtCursor  aLine( const_cast<SwTxtFrm*>(this), &aInf );
+            SwTextSizeInfo aInf( const_cast<SwTextFrm*>(this) );
+            SwTextCursor  aLine( const_cast<SwTextFrm*>(this), &aInf );
             nFormat = aLine.GetEnd();
 
             aLine.CharCrsrToLine( nPos );
@@ -1183,7 +1183,7 @@ bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
             {
                 aCharBox.SSize().Width() /= 2;
 #if OSL_DEBUG_LEVEL > 0
-                // See comment in SwTxtFrm::GetCrsrOfst()
+                // See comment in SwTextFrm::GetCrsrOfst()
                 const sal_uLong nOldNode = pPam->GetPoint()->nNode.GetIndex();
 #endif
                 if ( pNextLine && ! bFirstOfDouble )
@@ -1193,23 +1193,23 @@ bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
                                  aCharBox.Pos(), false );
 #if OSL_DEBUG_LEVEL > 0
                 OSL_ENSURE( nOldNode == pPam->GetPoint()->nNode.GetIndex(),
-                    "SwTxtFrm::UnitDown: illegal node change" );
+                    "SwTextFrm::UnitDown: illegal node change" );
 #endif
 
                 // We make sure that we move down.
                 if( nTmpOfst <= nStart && ! bFirstOfDouble )
                     nTmpOfst = nStart + 1;
                 pPam->GetPoint()->nContent =
-                      SwIndex( const_cast<SwTxtFrm*>(this)->GetTxtNode(), nTmpOfst );
+                      SwIndex( const_cast<SwTextFrm*>(this)->GetTextNode(), nTmpOfst );
 
                 if ( IsVertical() )
-                    const_cast<SwTxtFrm*>(this)->SwapWidthAndHeight();
+                    const_cast<SwTextFrm*>(this)->SwapWidthAndHeight();
 
                 return true;
             }
             if( 0 != ( pTmpFollow = GetFollow() ) )
             {   // Skip protected follows
-                const SwCntntFrm* pTmp = pTmpFollow;
+                const SwContentFrm* pTmp = pTmpFollow;
                 SwViewShell *pSh = getRootFrm()->GetCurrShell();
                 if( !pSh || !pSh->GetViewOptions()->IsCursorInProtectedArea() )
                 {
@@ -1222,8 +1222,8 @@ bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
                 if( !pTmpFollow ) // Only protected ones left
                 {
                     if ( IsVertical() )
-                        const_cast<SwTxtFrm*>(this)->SwapWidthAndHeight();
-                    return pTmp->SwCntntFrm::UnitDown( pPam, nOffset, bSetInReadOnly );
+                        const_cast<SwTextFrm*>(this)->SwapWidthAndHeight();
+                    return pTmp->SwContentFrm::UnitDown( pPam, nOffset, bSetInReadOnly );
                 }
 
                 aLine.GetCharRect( &aCharBox, nPos );
@@ -1231,7 +1231,7 @@ bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
             }
             else if( !IsFollow() )
             {
-                sal_Int32 nTmpLen = aInf.GetTxt().getLength();
+                sal_Int32 nTmpLen = aInf.GetText().getLength();
                 if( aLine.GetEnd() < nTmpLen )
                 {
                     if( nFormat <= GetOfst() )
@@ -1251,48 +1251,48 @@ bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
         pTmpFollow = GetFollow();
 
     if ( IsVertical() )
-        const_cast<SwTxtFrm*>(this)->SwapWidthAndHeight();
+        const_cast<SwTextFrm*>(this)->SwapWidthAndHeight();
 
     // We take a shortcut for follows
     if( pTmpFollow )
     {
         aCharBox.Pos().Y() = pTmpFollow->Frm().Top() + 1;
-        return static_cast<const SwTxtFrm*>(pTmpFollow)->GetKeyCrsrOfst( pPam->GetPoint(),
+        return static_cast<const SwTextFrm*>(pTmpFollow)->GetKeyCrsrOfst( pPam->GetPoint(),
                                                      aCharBox.Pos() );
     }
-    return SwCntntFrm::UnitDown( pPam, nOffset, bSetInReadOnly );
+    return SwContentFrm::UnitDown( pPam, nOffset, bSetInReadOnly );
 }
 
-bool SwTxtFrm::UnitUp(SwPaM *pPam, const SwTwips nOffset,
+bool SwTextFrm::UnitUp(SwPaM *pPam, const SwTwips nOffset,
                       bool bSetInReadOnly ) const
 {
-    /* We call CntntNode::GertFrm() in CrsrSh::Up().
+    /* We call ContentNode::GertFrm() in CrsrSh::Up().
      * This _always returns the master.
      * In order to not mess with cursor travelling, we correct here
-     * in SwTxtFrm.
+     * in SwTextFrm.
      * We calculate UnitUp for pFrm. pFrm is either a master (= this) or a
      * follow (!= this).
      */
-    const SwTxtFrm *pFrm = GetAdjFrmAtPos( const_cast<SwTxtFrm*>(this), *(pPam->GetPoint()),
-                                           SwTxtCursor::IsRightMargin() );
+    const SwTextFrm *pFrm = GetAdjFrmAtPos( const_cast<SwTextFrm*>(this), *(pPam->GetPoint()),
+                                           SwTextCursor::IsRightMargin() );
     const bool bRet = pFrm->_UnitUp( pPam, nOffset, bSetInReadOnly );
 
-    // No SwTxtCursor::SetRightMargin( false );
+    // No SwTextCursor::SetRightMargin( false );
     // Instead we have a SwSetToRightMargin in _UnitUp
     return bRet;
 }
 
-bool SwTxtFrm::UnitDown(SwPaM *pPam, const SwTwips nOffset,
+bool SwTextFrm::UnitDown(SwPaM *pPam, const SwTwips nOffset,
                         bool bSetInReadOnly ) const
 {
-    const SwTxtFrm *pFrm = GetAdjFrmAtPos(const_cast<SwTxtFrm*>(this), *(pPam->GetPoint()),
-                                           SwTxtCursor::IsRightMargin() );
+    const SwTextFrm *pFrm = GetAdjFrmAtPos(const_cast<SwTextFrm*>(this), *(pPam->GetPoint()),
+                                           SwTextCursor::IsRightMargin() );
     const bool bRet = pFrm->_UnitDown( pPam, nOffset, bSetInReadOnly );
-    SwTxtCursor::SetRightMargin( false );
+    SwTextCursor::SetRightMargin( false );
     return bRet;
 }
 
-void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
+void SwTextFrm::FillCrsrPos( SwFillData& rFill ) const
 {
     if( !rFill.bColumn && GetUpper()->IsColBodyFrm() ) // ColumnFrms now with BodyFrm
     {
@@ -1329,16 +1329,16 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
             }
             // No filling, if the last frame in the targeted column does
             // not contain a paragraph, but e.g. a table
-            if( pFrm->IsTxtFrm() )
+            if( pFrm->IsTextFrm() )
             {
                 rFill.Fill().nColumnCnt = nNextCol;
                 rFill.bColumn = true;
                 if( rFill.pPos )
                 {
-                    SwTxtNode* pTxtNd = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pFrm))->GetTxtNode();
-                    rFill.pPos->nNode = *pTxtNd;
+                    SwTextNode* pTextNd = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pFrm))->GetTextNode();
+                    rFill.pPos->nNode = *pTextNd;
                     rFill.pPos->nContent.Assign(
-                            pTxtNd, pTxtNd->GetTxt().getLength());
+                            pTextNd, pTextNd->GetText().getLength());
                 }
                 if( nNextCol )
                 {
@@ -1347,25 +1347,25 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
                 }
                 else
                     rFill.aFrm = pFrm->Frm();
-                static_cast<const SwTxtFrm*>(pFrm)->FillCrsrPos( rFill );
+                static_cast<const SwTextFrm*>(pFrm)->FillCrsrPos( rFill );
             }
             return;
         }
     }
     SwFont *pFnt;
-    SwTxtFmtColl* pColl = GetTxtNode()->GetTxtColl();
-    SwTwips nFirst = GetTxtNode()->GetSwAttrSet().GetULSpace().GetLower();
+    SwTextFormatColl* pColl = GetTextNode()->GetTextColl();
+    SwTwips nFirst = GetTextNode()->GetSwAttrSet().GetULSpace().GetLower();
     SwTwips nDiff = rFill.Y() - Frm().Bottom();
     if( nDiff < nFirst )
         nDiff = -1;
     else
-        pColl = &pColl->GetNextTxtFmtColl();
-    SwAttrSet aSet( const_cast<SwDoc*>(GetTxtNode()->GetDoc())->GetAttrPool(), aTxtFmtCollSetRange );
+        pColl = &pColl->GetNextTextFormatColl();
+    SwAttrSet aSet( const_cast<SwDoc*>(GetTextNode()->GetDoc())->GetAttrPool(), aTextFormatCollSetRange );
     const SwAttrSet* pSet = &pColl->GetAttrSet();
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
-    if( GetTxtNode()->HasSwAttrSet() )
+    if( GetTextNode()->HasSwAttrSet() )
     {
-        aSet.Put( *GetTxtNode()->GetpSwAttrSet() );
+        aSet.Put( *GetTextNode()->GetpSwAttrSet() );
         aSet.SetParent( pSet );
         pSet = &aSet;
         pFnt = new SwFont( pSet, GetNode()->getIDocumentSettingAccess() );
@@ -1378,7 +1378,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
     }
     OutputDevice* pOut = pSh->GetOut();
     if( !pSh->GetViewOptions()->getBrowseMode() || pSh->GetViewOptions()->IsPrtFormat() )
-        pOut = GetTxtNode()->getIDocumentDeviceAccess()->getReferenceDevice( true );
+        pOut = GetTextNode()->getIDocumentDeviceAccess()->getReferenceDevice( true );
 
     pFnt->SetFntChg( true );
     pFnt->ChgPhysFnt( pSh, *pOut );
@@ -1429,7 +1429,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
                 rRect.Top( rRect.Top() + nFirst );
             rRect.Height( nLineHeight );
             SwTwips nLeft = rFill.Left() + rLRSpace.GetLeft() +
-                            GetTxtNode()->GetLeftMarginWithNum();
+                            GetTextNode()->GetLeftMarginWithNum();
             SwTwips nRight = rFill.Right() - rLRSpace.GetRight();
             SwTwips nCenter = ( nLeft + nRight ) / 2;
             rRect.Left( nLeft );
@@ -1467,7 +1467,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
                 {
                     const OUString aTmp("  ");
                     SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aTmp, 0, 2 );
-                    nSpace = pFnt->_GetTxtSize( aDrawInf ).Width()/2;
+                    nSpace = pFnt->_GetTextSize( aDrawInf ).Width()/2;
                 }
                 if( rFill.X() >= nRight )
                 {
@@ -1501,9 +1501,9 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
                 }
                 else if( rFill.X() > nLeft )
                 {
-                    SwTwips nTxtLeft = rFill.Left() + rLRSpace.GetTxtLeft() +
-                                    GetTxtNode()->GetLeftMarginWithNum( true );
-                    rFill.nLineWidth += rFill.bFirstLine ? nLeft : nTxtLeft;
+                    SwTwips nTextLeft = rFill.Left() + rLRSpace.GetTextLeft() +
+                                    GetTextNode()->GetLeftMarginWithNum( true );
+                    rFill.nLineWidth += rFill.bFirstLine ? nLeft : nTextLeft;
                     SwTwips nLeftTab = nLeft;
                     SwTwips nRightTab = nLeft;
                     sal_uInt16 nSpaceCnt = 0;
@@ -1515,9 +1515,9 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
                         if( nIdx < rRuler.Count() )
                         {
                             const SvxTabStop &rTabStop = rRuler.operator[](nIdx);
-                            nRightTab = nTxtLeft + rTabStop.GetTabPos();
-                            if( nLeftTab < nTxtLeft && nRightTab > nTxtLeft )
-                                nRightTab = nTxtLeft;
+                            nRightTab = nTextLeft + rTabStop.GetTabPos();
+                            if( nLeftTab < nTextLeft && nRightTab > nTextLeft )
+                                nRightTab = nTextLeft;
                             else
                                 ++nIdx;
                             if( nRightTab > rFill.nLineWidth )
@@ -1529,9 +1529,9 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
                                 static_cast<const SvxTabStopItem &>(pSet->
                                 GetPool()->GetDefaultItem( RES_PARATR_TABSTOP ));
                             const SwTwips nDefTabDist = rTab[0].GetTabPos();
-                            nRightTab = nLeftTab - nTxtLeft;
+                            nRightTab = nLeftTab - nTextLeft;
                             nRightTab /= nDefTabDist;
-                            nRightTab = nRightTab * nDefTabDist + nTxtLeft;
+                            nRightTab = nRightTab * nDefTabDist + nTextLeft;
                             while ( nRightTab <= nLeftTab )
                                 nRightTab += nDefTabDist;
                             if( nRightTab > rFill.nLineWidth )
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 802a131815ec..cb70ff23c9ce 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -67,7 +67,7 @@ public:
 };
 sal_uInt16 FormatLevel::nLevel = 0;
 
-void ValidateTxt( SwFrm *pFrm )     // Friend of frame
+void ValidateText( SwFrm *pFrm )     // Friend of frame
 {
     if ( ( ! pFrm->IsVertical() &&
              pFrm->Frm().Width() == pFrm->GetUpper()->Prt().Width() ) ||
@@ -76,7 +76,7 @@ void ValidateTxt( SwFrm *pFrm )     // Friend of frame
         pFrm->mbValidSize = true;
 }
 
-void SwTxtFrm::ValidateFrm()
+void SwTextFrm::ValidateFrm()
 {
     // Validate surroundings to avoid oscillation
     SWAP_IF_SWAPPED( this )
@@ -98,7 +98,7 @@ void SwTxtFrm::ValidateFrm()
         if( pSct )
             pSct->ColUnlock();
     }
-    ValidateTxt( this );
+    ValidateText( this );
 
     // We at least have to save the MustFit flag!
     OSL_ENSURE( HasPara(), "ResetPreps(), missing ParaPortion." );
@@ -110,7 +110,7 @@ void SwTxtFrm::ValidateFrm()
     UNDO_SWAP( this )
 }
 
-// After a RemoveFtn the BodyFrm and all Frms contained within it, need to be
+// After a RemoveFootnote the BodyFrm and all Frms contained within it, need to be
 // recalculated, so that the DeadLine is right.
 // First we search outwards, on the way back we calculate everything.
 void _ValidateBodyFrm( SwFrm *pFrm )
@@ -123,16 +123,16 @@ void _ValidateBodyFrm( SwFrm *pFrm )
             pFrm->Calc();
         else
         {
-            const bool bOld = static_cast<SwSectionFrm*>(pFrm)->IsCntntLocked();
-            static_cast<SwSectionFrm*>(pFrm)->SetCntntLock( true );
+            const bool bOld = static_cast<SwSectionFrm*>(pFrm)->IsContentLocked();
+            static_cast<SwSectionFrm*>(pFrm)->SetContentLock( true );
             pFrm->Calc();
             if( !bOld )
-                static_cast<SwSectionFrm*>(pFrm)->SetCntntLock( false );
+                static_cast<SwSectionFrm*>(pFrm)->SetContentLock( false );
         }
     }
 }
 
-void SwTxtFrm::ValidateBodyFrm()
+void SwTextFrm::ValidateBodyFrm()
 {
     SWAP_IF_SWAPPED( this )
 
@@ -144,13 +144,13 @@ void SwTxtFrm::ValidateBodyFrm()
     UNDO_SWAP( this )
 }
 
-bool SwTxtFrm::_GetDropRect( SwRect &rRect ) const
+bool SwTextFrm::_GetDropRect( SwRect &rRect ) const
 {
     SWAP_IF_NOT_SWAPPED( this )
 
-    OSL_ENSURE( HasPara(), "SwTxtFrm::_GetDropRect: try again next year." );
-    SwTxtSizeInfo aInf( const_cast<SwTxtFrm*>(this) );
-    SwTxtMargin aLine( const_cast<SwTxtFrm*>(this), &aInf );
+    OSL_ENSURE( HasPara(), "SwTextFrm::_GetDropRect: try again next year." );
+    SwTextSizeInfo aInf( const_cast<SwTextFrm*>(this) );
+    SwTextMargin aLine( const_cast<SwTextFrm*>(this), &aInf );
     if( aLine.GetDropLines() )
     {
         rRect.Top( aLine.Y() );
@@ -172,7 +172,7 @@ bool SwTxtFrm::_GetDropRect( SwRect &rRect ) const
     return false;
 }
 
-const SwBodyFrm *SwTxtFrm::FindBodyFrm() const
+const SwBodyFrm *SwTextFrm::FindBodyFrm() const
 {
     if ( IsInDocBody() )
     {
@@ -184,19 +184,19 @@ const SwBodyFrm *SwTxtFrm::FindBodyFrm() const
     return 0;
 }
 
-bool SwTxtFrm::CalcFollow( const sal_Int32 nTxtOfst )
+bool SwTextFrm::CalcFollow( const sal_Int32 nTextOfst )
 {
     SWAP_IF_SWAPPED( this )
 
     OSL_ENSURE( HasFollow(), "CalcFollow: missing Follow." );
 
-    SwTxtFrm* pMyFollow = GetFollow();
+    SwTextFrm* pMyFollow = GetFollow();
 
     SwParaPortion *pPara = GetPara();
-    const bool bFollowFld = pPara && pPara->IsFollowField();
+    const bool bFollowField = pPara && pPara->IsFollowField();
 
-    if( !pMyFollow->GetOfst() || pMyFollow->GetOfst() != nTxtOfst ||
-        bFollowFld || pMyFollow->IsFieldFollow() ||
+    if( !pMyFollow->GetOfst() || pMyFollow->GetOfst() != nTextOfst ||
+        bFollowField || pMyFollow->IsFieldFollow() ||
         ( pMyFollow->IsVertical() && !pMyFollow->Prt().Width() ) ||
         ( ! pMyFollow->IsVertical() && !pMyFollow->Prt().Height() ) )
     {
@@ -209,17 +209,17 @@ bool SwTxtFrm::CalcFollow( const sal_Int32 nTxtOfst )
         SwTwips nMyPos = (Frm().*fnRect->fnGetTop)();
 
         const SwPageFrm *pPage = 0;
-        bool bOldInvaCntnt = true;
+        bool bOldInvaContent = true;
         if ( !IsInFly() && GetNext() )
         {
             pPage = FindPageFrm();
             // Minimize = that is set back if needed - for invalidation see below
-            bOldInvaCntnt  = pPage->IsInvalidCntnt();
+            bOldInvaContent  = pPage->IsInvalidContent();
         }
 
-        pMyFollow->_SetOfst( nTxtOfst );
-        pMyFollow->SetFieldFollow( bFollowFld );
-        if( HasFtn() || pMyFollow->HasFtn() )
+        pMyFollow->_SetOfst( nTextOfst );
+        pMyFollow->SetFieldFollow( bFollowField );
+        if( HasFootnote() || pMyFollow->HasFootnote() )
         {
             ValidateFrm();
             ValidateBodyFrm();
@@ -231,10 +231,10 @@ bool SwTxtFrm::CalcFollow( const sal_Int32 nTxtOfst )
         }
 
         // The footnote area must not get larger
-        SwSaveFtnHeight aSave( FindFtnBossFrm( true ), LONG_MAX );
+        SwSaveFootnoteHeight aSave( FindFootnoteBossFrm( true ), LONG_MAX );
 
-        pMyFollow->CalcFtnFlag();
-        if ( !pMyFollow->GetNext() && !pMyFollow->HasFtn() )
+        pMyFollow->CalcFootnoteFlag();
+        if ( !pMyFollow->GetNext() && !pMyFollow->HasFootnote() )
             nOldBottom = bVert ? 0 : LONG_MAX;
 
         while( true )
@@ -285,12 +285,12 @@ bool SwTxtFrm::CalcFollow( const sal_Int32 nTxtOfst )
 
                     pMyFollow->Calc();
                     // The Follow can tell from its Frm().Height() that something went wrong
-                    OSL_ENSURE( !pMyFollow->GetPrev(), "SwTxtFrm::CalcFollow: cheesy follow" );
+                    OSL_ENSURE( !pMyFollow->GetPrev(), "SwTextFrm::CalcFollow: cheesy follow" );
                     if( pMyFollow->GetPrev() )
                     {
                         pMyFollow->Prepare( PREP_CLEAR );
                         pMyFollow->Calc();
-                        OSL_ENSURE( !pMyFollow->GetPrev(), "SwTxtFrm::CalcFollow: very cheesy follow" );
+                        OSL_ENSURE( !pMyFollow->GetPrev(), "SwTextFrm::CalcFollow: very cheesy follow" );
                     }
 
                     // OD 14.03.2003 #i11760# - reset control flag for follow format.
@@ -310,7 +310,7 @@ bool SwTxtFrm::CalcFollow( const sal_Int32 nTxtOfst )
                 break;
         }
 
-        if( HasFtn() || pMyFollow->HasFtn() )
+        if( HasFootnote() || pMyFollow->HasFootnote() )
         {
             ValidateBodyFrm();
             ValidateFrm();
@@ -323,12 +323,12 @@ bool SwTxtFrm::CalcFollow( const sal_Int32 nTxtOfst )
 
         if ( pPage )
         {
-            if ( !bOldInvaCntnt )
-                pPage->ValidateCntnt();
+            if ( !bOldInvaContent )
+                pPage->ValidateContent();
         }
 
 #if OSL_DEBUG_LEVEL > 0
-        OSL_ENSURE( pOldUp == GetUpper(), "SwTxtFrm::CalcFollow: heavy follow" );
+        OSL_ENSURE( pOldUp == GetUpper(), "SwTextFrm::CalcFollow: heavy follow" );
 #endif
 
         const long nRemaining =
@@ -348,7 +348,7 @@ bool SwTxtFrm::CalcFollow( const sal_Int32 nTxtOfst )
     return false;
 }
 
-void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit )
+void SwTextFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit )
 {
     if( IsUndersized() )
     {
@@ -369,14 +369,14 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit )
         SwTwips nChgHeight = nChgHght;
         if( nChgHght && !bHasToFit )
         {
-            if( IsInFtn() && !IsInSct() )
+            if( IsInFootnote() && !IsInSct() )
             {
                 SwTwips nReal = Grow( nChgHght, true );
                 if( nReal < nChgHght )
                 {
                     SwTwips nBot = (*fnRect->fnYInc)( (Frm().*fnRect->fnGetBottom)(),
                                                       nChgHght - nReal );
-                    SwFrm* pCont = FindFtnFrm()->GetUpper();
+                    SwFrm* pCont = FindFootnoteFrm()->GetUpper();
 
                     if( (pCont->Frm().*fnRect->fnBottomDist)( nBot ) > 0 )
                     {
@@ -458,7 +458,7 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit )
             nRstHeight += nAdd;
         }
 
-        // nRstHeight < 0 means that the TxtFrm is located completely outside of its Upper.
+        // nRstHeight < 0 means that the TextFrm is located completely outside of its Upper.
         // This can happen, if it's located within a FlyAtCntFrm, which changed sides by a
         // Grow(). In such a case, it's wrong to execute the following Grow().
         // In the case of a bug, we end up with an infinite loop.
@@ -468,7 +468,7 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit )
         if( nRstHeight < nFrmHeight )
         {
             // It can be that I have the right size, but the Upper is too small and can get me some room
-            if( ( nRstHeight >= 0 || ( IsInFtn() && IsInSct() ) ) && !bHasToFit )
+            if( ( nRstHeight >= 0 || ( IsInFootnote() && IsInSct() ) ) && !bHasToFit )
                 nRstHeight += GetUpper()->Grow( nFrmHeight - nRstHeight );
             // In column sections we do not want to get too big or else more areas are created by
             // GetNextSctLeaf. Instead, we shrink and remember bUndersized, so that FormatWidthCols
@@ -499,15 +499,15 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit )
     UNDO_SWAP( this )
 }
 
-com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTxtFrm::GetTabStopInfo( SwTwips CurrentPos )
+com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTextFrm::GetTabStopInfo( SwTwips CurrentPos )
 {
     com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs(1);
     ::com::sun::star::style::TabStop ts;
 
-    SwTxtFormatInfo     aInf( this );
-    SwTxtFormatter      aLine( this, &aInf );
-    SwTxtCursor         TxtCursor( this, &aInf );
-    const Point aCharPos( TxtCursor.GetTopLeft() );
+    SwTextFormatInfo     aInf( this );
+    SwTextFormatter      aLine( this, &aInf );
+    SwTextCursor         TextCursor( this, &aInf );
+    const Point aCharPos( TextCursor.GetTopLeft() );
 
     SwTwips nRight = aLine.Right();
     CurrentPos -= aCharPos.X();
@@ -539,11 +539,11 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTxtFrm::GetT
 }
 
 // AdjustFollow expects the following situation:
-// The SwTxtIter points to the lower end of the Master, the Offset is set in the Follow.
+// The SwTextIter points to the lower end of the Master, the Offset is set in the Follow.
 // nOffset holds the Offset in the text string, from which the Master closes
 // and the Follow starts.
 // If it's 0, the FollowFrame is deleted.
-void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
+void SwTextFrm::_AdjustFollow( SwTextFormatter &rLine,
                              const sal_Int32 nOffset, const sal_Int32 nEnd,
                              const sal_uInt8 nMode )
 {
@@ -556,9 +556,9 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
     {
         while( GetFollow() )
         {
-            if( static_cast<SwTxtFrm*>(GetFollow())->IsLocked() )
+            if( static_cast<SwTextFrm*>(GetFollow())->IsLocked() )
             {
-                OSL_FAIL( "+SwTxtFrm::JoinFrm: Follow is locked." );
+                OSL_FAIL( "+SwTextFrm::JoinFrm: Follow is locked." );
                 return;
             }
             if (GetFollow()->IsDeleteForbidden())
@@ -572,7 +572,7 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
     // Dancing on the volcano: We'll just format the last line quickly
     // for the QuoVadis stuff.
     // The Offset can move of course:
-    const sal_Int32 nNewOfst = ( IsInFtn() && ( !GetIndNext() || HasFollow() ) ) ?
+    const sal_Int32 nNewOfst = ( IsInFootnote() && ( !GetIndNext() || HasFollow() ) ) ?
                             rLine.FormatQuoVadis(nOffset) : nOffset;
 
     if( !(nMode & 1) )
@@ -601,40 +601,40 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
     }
 }
 
-SwCntntFrm *SwTxtFrm::JoinFrm()
+SwContentFrm *SwTextFrm::JoinFrm()
 {
-    OSL_ENSURE( GetFollow(), "+SwTxtFrm::JoinFrm: no follow" );
-    SwTxtFrm  *pFoll = GetFollow();
+    OSL_ENSURE( GetFollow(), "+SwTextFrm::JoinFrm: no follow" );
+    SwTextFrm  *pFoll = GetFollow();
 
-    SwTxtFrm *pNxt = pFoll->GetFollow();
+    SwTextFrm *pNxt = pFoll->GetFollow();
 
     // All footnotes of the to-be-destroyed Follow are relocated to us
     sal_Int32 nStart = pFoll->GetOfst();
-    if ( pFoll->HasFtn() )
+    if ( pFoll->HasFootnote() )
     {
-        const SwpHints *pHints = pFoll->GetTxtNode()->GetpSwpHints();
+        const SwpHints *pHints = pFoll->GetTextNode()->GetpSwpHints();
         if( pHints )
         {
-            SwFtnBossFrm *pFtnBoss = 0;
-            SwFtnBossFrm *pEndBoss = 0;
+            SwFootnoteBossFrm *pFootnoteBoss = 0;
+            SwFootnoteBossFrm *pEndBoss = 0;
             for ( size_t i = 0; i < pHints->Count(); ++i )
             {
-                const SwTxtAttr *pHt = (*pHints)[i];
+                const SwTextAttr *pHt = (*pHints)[i];
                 if( RES_TXTATR_FTN==pHt->Which() && pHt->GetStart()>=nStart )
                 {
-                    if( pHt->GetFtn().IsEndNote() )
+                    if( pHt->GetFootnote().IsEndNote() )
                     {
                         if( !pEndBoss )
-                            pEndBoss = pFoll->FindFtnBossFrm();
-                        SwFtnBossFrm::ChangeFtnRef( pFoll, static_cast<const SwTxtFtn*>(pHt), this );
+                            pEndBoss = pFoll->FindFootnoteBossFrm();
+                        SwFootnoteBossFrm::ChangeFootnoteRef( pFoll, static_cast<const SwTextFootnote*>(pHt), this );
                     }
                     else
                     {
-                        if( !pFtnBoss )
-                            pFtnBoss = pFoll->FindFtnBossFrm( true );
-                        SwFtnBossFrm::ChangeFtnRef( pFoll, static_cast<const SwTxtFtn*>(pHt), this );
+                        if( !pFootnoteBoss )
+                            pFootnoteBoss = pFoll->FindFootnoteBossFrm( true );
+                        SwFootnoteBossFrm::ChangeFootnoteRef( pFoll, static_cast<const SwTextFootnote*>(pHt), this );
                     }
-                    SetFtn( true );
+                    SetFootnote( true );
                 }
             }
         }
@@ -644,13 +644,13 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
     else if ( pFoll->GetValidPrtAreaFlag() ||
               pFoll->GetValidSizeFlag() )
     {
-        pFoll->CalcFtnFlag();
-        OSL_ENSURE( !pFoll->HasFtn(), "Missing FtnFlag." );
+        pFoll->CalcFootnoteFlag();
+        OSL_ENSURE( !pFoll->HasFootnote(), "Missing FootnoteFlag." );
     }
 #endif
 
     pFoll->MoveFlyInCnt( this, nStart, COMPLETE_STRING );
-    pFoll->SetFtn( false );
+    pFoll->SetFootnote( false );
     // #i27138#
     // notify accessibility paragraphs objects about changed CONTENT_FLOWS_FROM/_TO relation.
     // Relation CONTENT_FLOWS_FROM for current next paragraph will change
@@ -662,7 +662,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
              pViewShell->GetLayout()->IsAnyShellAccessible() )
         {
             pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pFoll->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pFoll->FindNextCnt( true )),
                             this );
         }
     }
@@ -672,14 +672,14 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
     return pNxt;
 }
 
-SwCntntFrm *SwTxtFrm::SplitFrm( const sal_Int32 nTxtPos )
+SwContentFrm *SwTextFrm::SplitFrm( const sal_Int32 nTextPos )
 {
     SWAP_IF_SWAPPED( this )
 
     // The Paste sends a Modify() to me
     // I lock myself, so that my data does not disappear
-    TxtFrmLockGuard aLock( this );
-    SwTxtFrm *pNew = static_cast<SwTxtFrm *>(GetTxtNode()->MakeFrm( this ));
+    TextFrmLockGuard aLock( this );
+    SwTextFrm *pNew = static_cast<SwTextFrm *>(GetTextNode()->MakeFrm( this ));
 
     pNew->SetFollow( GetFollow() );
     SetFollow( pNew );
@@ -696,38 +696,38 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const sal_Int32 nTxtPos )
              pViewShell->GetLayout()->IsAnyShellAccessible() )
         {
             pViewShell->InvalidateAccessibleParaFlowRelation(
-                            dynamic_cast<SwTxtFrm*>(pNew->FindNextCnt( true )),
+                            dynamic_cast<SwTextFrm*>(pNew->FindNextCnt( true )),
                             this );
         }
     }
 
     // If footnotes end up in pNew bz our actions, we need
     // to re-register them
-    if ( HasFtn() )
+    if ( HasFootnote() )
     {
-        const SwpHints *pHints = GetTxtNode()->GetpSwpHints();
+        const SwpHints *pHints = GetTextNode()->GetpSwpHints();
         if( pHints )
         {
-            SwFtnBossFrm *pFtnBoss = 0;
-            SwFtnBossFrm *pEndBoss = 0;
+            SwFootnoteBossFrm *pFootnoteBoss = 0;
+            SwFootnoteBossFrm *pEndBoss = 0;
             for ( size_t i = 0; i < pHints->Count(); ++i )
             {
-                const SwTxtAttr *pHt = (*pHints)[i];
-                if( RES_TXTATR_FTN==pHt->Which() && pHt->GetStart()>=nTxtPos )
+                const SwTextAttr *pHt = (*pHints)[i];
+                if( RES_TXTATR_FTN==pHt->Which() && pHt->GetStart()>=nTextPos )
                 {
-                    if( pHt->GetFtn().IsEndNote() )
+                    if( pHt->GetFootnote().IsEndNote() )
                     {
                         if( !pEndBoss )
-                            pEndBoss = FindFtnBossFrm();
-                        SwFtnBossFrm::ChangeFtnRef( this, static_cast<const SwTxtFtn*>(pHt), pNew );
+                            pEndBoss = FindFootnoteBossFrm();
+                        SwFootnoteBossFrm::ChangeFootnoteRef( this, static_cast<const SwTextFootnote*>(pHt), pNew );
                     }
                     else
                     {
-                        if( !pFtnBoss )
-                            pFtnBoss = FindFtnBossFrm( true );
-                        SwFtnBossFrm::ChangeFtnRef( this, static_cast<const SwTxtFtn*>(pHt), pNew );
+                        if( !pFootnoteBoss )
+                            pFootnoteBoss = FindFootnoteBossFrm( true );
+                        SwFootnoteBossFrm::ChangeFootnoteRef( this, static_cast<const SwTextFootnote*>(pHt), pNew );
                     }
-                    pNew->SetFtn( true );
+                    pNew->SetFootnote( true );
                 }
             }
         }
@@ -736,22 +736,22 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const sal_Int32 nTxtPos )
 #ifdef DBG_UTIL
     else
     {
-        CalcFtnFlag( nTxtPos-1 );
-        OSL_ENSURE( !HasFtn(), "Missing FtnFlag." );
+        CalcFootnoteFlag( nTextPos-1 );
+        OSL_ENSURE( !HasFootnote(), "Missing FootnoteFlag." );
     }
 #endif
 
-    MoveFlyInCnt( pNew, nTxtPos, COMPLETE_STRING );
+    MoveFlyInCnt( pNew, nTextPos, COMPLETE_STRING );
 
     // No SetOfst or CalcFollow, because an AdjustFollow follows immediately anyways
 
-    pNew->ManipOfst( nTxtPos );
+    pNew->ManipOfst( nTextPos );
 
     UNDO_SWAP( this )
     return pNew;
 }
 
-void SwTxtFrm::_SetOfst( const sal_Int32 nNewOfst )
+void SwTextFrm::_SetOfst( const sal_Int32 nNewOfst )
 {
     // We do not need to invalidate out Follow.
     // We are a Follow, get formatted right away and call
@@ -762,15 +762,15 @@ void SwTxtFrm::_SetOfst( const sal_Int32 nNewOfst )
     {
         SwCharRange &rReformat = pPara->GetReformat();
         rReformat.Start() = 0;
-        rReformat.Len() = GetTxt().getLength();
+        rReformat.Len() = GetText().getLength();
         pPara->GetDelta() = rReformat.Len();
     }
     InvalidateSize();
 }
 
-bool SwTxtFrm::CalcPreps()
+bool SwTextFrm::CalcPreps()
 {
-    OSL_ENSURE( ! IsVertical() || ! IsSwapped(), "SwTxtFrm::CalcPreps with swapped frame" );
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(), "SwTextFrm::CalcPreps with swapped frame" );
     SWRECTFN( this );
 
     SwParaPortion *pPara = GetPara();
@@ -791,7 +791,7 @@ bool SwTxtFrm::CalcPreps()
         {
             if( !GetFollow() )
             {
-                OSL_ENSURE( GetFollow(), "+SwTxtFrm::CalcPreps: no credits" );
+                OSL_ENSURE( GetFollow(), "+SwTextFrm::CalcPreps: no credits" );
                 return false;
             }
 
@@ -828,7 +828,7 @@ bool SwTxtFrm::CalcPreps()
             else
             {
                 OSL_ENSURE( nChgHeight < (Prt().*fnRect->fnGetHeight)(),
-                        "+SwTxtFrm::CalcPrep: want to shrink" );
+                        "+SwTextFrm::CalcPrep: want to shrink" );
 
                 nChgHeight = (Prt().*fnRect->fnGetHeight)() - nChgHeight;
 
@@ -853,13 +853,13 @@ bool SwTxtFrm::CalcPreps()
         }
         else if ( bPrepAdjust )
         {
-            if ( HasFtn() )
+            if ( HasFootnote() )
             {
-                if( !CalcPrepFtnAdjust() )
+                if( !CalcPrepFootnoteAdjust() )
                 {
                     if( bPrepMustFit )
                     {
-                        SwTxtLineAccess aAccess( this );
+                        SwTextLineAccess aAccess( this );
                         aAccess.GetPara()->SetPrepMustFit();
                     }
                     return false;
@@ -868,8 +868,8 @@ bool SwTxtFrm::CalcPreps()
 
             SWAP_IF_NOT_SWAPPED( this )
 
-            SwTxtFormatInfo aInf( this );
-            SwTxtFormatter aLine( this, &aInf );
+            SwTextFormatInfo aInf( this );
+            SwTextFormatter aLine( this, &aInf );
 
             WidowsAndOrphans aFrmBreak( this );
             // Whatever the attributes say: we split the paragraph in
@@ -898,14 +898,14 @@ bool SwTxtFrm::CalcPreps()
                 // Let's see if it works ...
                 aLine.TruncLines();
                 aFrmBreak.SetRstHeight( aLine );
-                FormatAdjust( aLine, aFrmBreak, aInf.GetTxt().getLength(), aInf.IsStop() );
+                FormatAdjust( aLine, aFrmBreak, aInf.GetText().getLength(), aInf.IsStop() );
             }
             else
             {
                 if( !GetFollow() )
                 {
                     FormatAdjust( aLine, aFrmBreak,
-                                  aInf.GetTxt().getLength(), aInf.IsStop() );
+                                  aInf.GetText().getLength(), aInf.IsStop() );
                 }
                 else if ( !aFrmBreak.IsKeepAlways() )
                 {
@@ -956,7 +956,7 @@ bool SwTxtFrm::CalcPreps()
             MoveFlyInCnt( pFrm, nNew, COMPLETE_STRING );\
     }
 
-void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
+void SwTextFrm::FormatAdjust( SwTextFormatter &rLine,
                              WidowsAndOrphans &rFrmBreak,
                              const sal_Int32 nStrLen,
                              const bool bDummy )
@@ -970,7 +970,7 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
     const bool bHasToFit = pPara->IsPrepMustFit();
 
     // The StopFlag is set by footnotes which want to go onto the next page
-    // Call base class method <SwTxtFrmBreak::IsBreakNow(..)>
+    // Call base class method <SwTextFrmBreak::IsBreakNow(..)>
     // instead of method <WidowsAndOrphans::IsBreakNow(..)> to get a break,
     // even if due to widow rule no enough lines exists.
     sal_uInt8 nNew = ( !GetFollow() &&
@@ -986,7 +986,7 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
     bool bOnlyContainsAsCharAnchoredObj =
             !IsFollow() && nStrLen == 1 &&
             GetDrawObjs() && GetDrawObjs()->size() == 1 &&
-            (*GetDrawObjs())[0]->GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR;
+            (*GetDrawObjs())[0]->GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR;
 
     // Still try split text frame if we have columns.
     if (FindColFrm())
@@ -1031,7 +1031,7 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
         if( GetFollow() )
         {
             if( nNew && nOld < nEnd )
-                RemoveFtn( nOld, nEnd - nOld );
+                RemoveFootnote( nOld, nEnd - nOld );
             CHG_OFFSET( GetFollow(), nEnd )
             if( !bDelta )
                 GetFollow()->ManipOfst( nEnd );
@@ -1050,11 +1050,11 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
             // Example of this case: When an empty, but numbered paragraph
             // at the end of page is completely displaced by a fly frame.
             // Thus, the text frame introduced a follow by a
-            // <SwTxtFrm::SplitFrm(..)> - see below. The follow then shows
+            // <SwTextFrm::SplitFrm(..)> - see below. The follow then shows
             // the numbering and must stay.
             if ( GetFollow()->GetOfst() != nEnd ||
                  GetFollow()->IsFieldFollow() ||
-                 ( nStrLen == 0 && GetTxtNode()->GetNumRule() ) )
+                 ( nStrLen == 0 && GetTextNode()->GetNumRule() ) )
             {
                 nNew |= 3;
             }
@@ -1077,14 +1077,14 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
             // as-character anchored object.
             if ( !bOnlyContainsAsCharAnchoredObj &&
                  ( nStrLen > 0 ||
-                   ( nStrLen == 0 && GetTxtNode()->GetNumRule() ) )
+                   ( nStrLen == 0 && GetTextNode()->GetNumRule() ) )
                )
             {
                 SplitFrm( nEnd );
                 nNew |= 3;
             }
         }
-        // If the remaining height changed e.g by RemoveFtn() we need to
+        // If the remaining height changed e.g by RemoveFootnote() we need to
         // fill up in order to avoid oscillation.
         if( bDummy && pBodyFrm &&
            nBodyHeight < ( IsVertical() ?
@@ -1115,7 +1115,7 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
 
     AdjustFrm( nChg, bHasToFit );
 
-    if( HasFollow() || IsInFtn() )
+    if( HasFollow() || IsInFootnote() )
         _AdjustFollow( rLine, nEnd, nStrLen, nNew );
 
     pPara->SetPrepMustFit( false );
@@ -1125,10 +1125,10 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
 
 // bPrev is set whether Reformat.Start() was called because of Prev().
 // Else, wo don't know whether we can limit the repaint or not.
-bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const bool bPrev )
+bool SwTextFrm::FormatLine( SwTextFormatter &rLine, const bool bPrev )
 {
     OSL_ENSURE( ! IsVertical() || IsSwapped(),
-            "SwTxtFrm::FormatLine( rLine, bPrev) with unswapped frame" );
+            "SwTextFrm::FormatLine( rLine, bPrev) with unswapped frame" );
     SwParaPortion *pPara = rLine.GetInfo().GetParaPortion();
     const SwLineLayout *pOldCur = rLine.GetCurr();
     const sal_Int32 nOldLen    = pOldCur->GetLen();
@@ -1144,9 +1144,9 @@ bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const bool bPrev )
     const sal_Int32 nNewStart = rLine.FormatLine( rLine.GetStart() );
 
     OSL_ENSURE( Frm().Pos().Y() + Prt().Pos().Y() == rLine.GetFirstPos(),
-            "SwTxtFrm::FormatLine: frame leaves orbit." );
+            "SwTextFrm::FormatLine: frame leaves orbit." );
     OSL_ENSURE( rLine.GetCurr()->Height(),
-            "SwTxtFrm::FormatLine: line height is zero" );
+            "SwTextFrm::FormatLine: line height is zero" );
 
     // The current line break object
     const SwLineLayout *pNew = rLine.GetCurr();
@@ -1172,7 +1172,7 @@ bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const bool bPrev )
     SwRepaint &rRepaint = pPara->GetRepaint();
     if( bUnChg && rRepaint.Top() == rLine.Y()
                && (bPrev || nNewStart <= pPara->GetReformat().Start())
-               && (nNewStart < GetTxtNode()->GetTxt().getLength()))
+               && (nNewStart < GetTextNode()->GetText().getLength()))
     {
         rRepaint.Top( nBottom );
         rRepaint.Height( 0 );
@@ -1245,7 +1245,7 @@ bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const bool bPrev )
         return true;
 
     // Until the String's end?
-    if (nNewStart >= GetTxtNode()->GetTxt().getLength())
+    if (nNewStart >= GetTextNode()->GetText().getLength())
         return false;
 
     if( rLine.GetInfo().IsShift() )
@@ -1261,15 +1261,15 @@ bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const bool bPrev )
     return 0 != pPara->GetDelta();
 }
 
-void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
+void SwTextFrm::_Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf,
                         const bool bAdjust )
 {
-    OSL_ENSURE( ! IsVertical() || IsSwapped(),"SwTxtFrm::_Format with unswapped frame" );
+    OSL_ENSURE( ! IsVertical() || IsSwapped(),"SwTextFrm::_Format with unswapped frame" );
 
     SwParaPortion *pPara = rLine.GetInfo().GetParaPortion();
     rLine.SetUnclipped( false );
 
-    const OUString &rString = GetTxtNode()->GetTxt();
+    const OUString &rString = GetTextNode()->GetText();
     const sal_Int32 nStrLen = rString.getLength();
 
     SwCharRange &rReformat = pPara->GetReformat();
@@ -1399,7 +1399,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
     bool bJumpMidHyph  = false;
     bool bWatchMidHyph = false;
 
-    const SwAttrSet& rAttrSet = GetTxtNode()->GetSwAttrSet();
+    const SwAttrSet& rAttrSet = GetTextNode()->GetSwAttrSet();
     bool bMaxHyph = ( 0 !=
         ( rInf.MaxHyph() = rAttrSet.GetHyphenZone().GetMaxHyphens() ) );
     if ( bMaxHyph )
@@ -1407,15 +1407,15 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
 
     if( IsFollow() && IsFieldFollow() && rLine.GetStart() == GetOfst() )
     {
-        SwTxtFrm *pMaster = FindMaster();
-        OSL_ENSURE( pMaster, "SwTxtFrm::Format: homeless follow" );
+        SwTextFrm *pMaster = FindMaster();
+        OSL_ENSURE( pMaster, "SwTextFrm::Format: homeless follow" );
         const SwLineLayout* pLine=NULL;
         if (pMaster)
         {
             if( !pMaster->HasPara() )
                 pMaster->GetFormatted();
-            SwTxtSizeInfo aInf( pMaster );
-            SwTxtIter aMasterLine( pMaster, &aInf );
+            SwTextSizeInfo aInf( pMaster );
+            SwTextIter aMasterLine( pMaster, &aInf );
             aMasterLine.Bottom();
             pLine = aMasterLine.GetCurr();
         }
@@ -1558,7 +1558,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
     if( !rInf.IsTest() )
     {
         // FormatAdjust does not pay off at OnceMore
-        if( bAdjust || !rLine.GetDropFmt() || !rLine.CalcOnceMore() )
+        if( bAdjust || !rLine.GetDropFormat() || !rLine.CalcOnceMore() )
         {
             FormatAdjust( rLine, aFrmBreak, nStrLen, rInf.IsStop() );
         }
@@ -1576,17 +1576,17 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
     }
 }
 
-void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
+void SwTextFrm::FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf )
 {
     OSL_ENSURE( ! IsVertical() || IsSwapped(),
-            "A frame is not swapped in SwTxtFrm::FormatOnceMore" );
+            "A frame is not swapped in SwTextFrm::FormatOnceMore" );
 
     SwParaPortion *pPara = rLine.GetInfo().GetParaPortion();
     if( !pPara )
         return;
 
     // If necessary the pPara
-    sal_uInt16 nOld  = static_cast<const SwTxtMargin&>(rLine).GetDropHeight();
+    sal_uInt16 nOld  = static_cast<const SwTextMargin&>(rLine).GetDropHeight();
     bool bShrink = false;
     bool bGrow   = false;
     bool bGoOn   = rLine.IsOnceMore();
@@ -1596,16 +1596,16 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
         ++nGo;
         rInf.Init();
         rLine.Top();
-        if( !rLine.GetDropFmt() )
+        if( !rLine.GetDropFormat() )
             rLine.SetOnceMore( false );
-        SwCharRange aRange( 0, rInf.GetTxt().getLength() );
+        SwCharRange aRange( 0, rInf.GetText().getLength() );
         pPara->GetReformat() = aRange;
         _Format( rLine, rInf );
 
         bGoOn = rLine.IsOnceMore();
         if( bGoOn )
         {
-            const sal_uInt16 nNew = static_cast<const SwTxtMargin&>(rLine).GetDropHeight();
+            const sal_uInt16 nNew = static_cast<const SwTextMargin&>(rLine).GetDropHeight();
             if( nOld == nNew )
                 bGoOn = false;
             else
@@ -1624,11 +1624,11 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
             // If something went wrong, we need to reformat again
             if( !bGoOn )
             {
-                rInf.CtorInitTxtFormatInfo( this );
-                rLine.CtorInitTxtFormatter( this, &rInf );
+                rInf.CtorInitTextFormatInfo( this );
+                rLine.CtorInitTextFormatter( this, &rInf );
                 rLine.SetDropLines( 1 );
                 rLine.CalcDropHeight( 1 );
-                SwCharRange aTmpRange( 0, rInf.GetTxt().getLength() );
+                SwCharRange aTmpRange( 0, rInf.GetText().getLength() );
                 pPara->GetReformat() = aTmpRange;
                 _Format( rLine, rInf, true );
                 // We paint everything ...
@@ -1638,9 +1638,9 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
     }
 }
 
-void SwTxtFrm::_Format( SwParaPortion *pPara )
+void SwTextFrm::_Format( SwParaPortion *pPara )
 {
-    const bool bIsEmpty = GetTxt().isEmpty();
+    const bool bIsEmpty = GetText().isEmpty();
 
     if ( bIsEmpty )
     {
@@ -1665,8 +1665,8 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
     if ( IsVertical() )
         SwapWidthAndHeight();
 
-    SwTxtFormatInfo aInf( this );
-    SwTxtFormatter  aLine( this, &aInf );
+    SwTextFormatInfo aInf( this );
+    SwTextFormatter  aLine( this, &aInf );
 
     HideAndShowObjects();
 
@@ -1699,19 +1699,19 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
 
 // We calculate the text frame's size and send a notification.
 // Shrink() or Grow() to adjust the frame's size to the changed required space.
-void SwTxtFrm::Format( const SwBorderAttrs * )
+void SwTextFrm::Format( const SwBorderAttrs * )
 {
     SWRECTFN( this )
 
     CalcAdditionalFirstLineOffset();
 
-    // The range autopilot or the BASIC interface pass us TxtFrms with
+    // The range autopilot or the BASIC interface pass us TextFrms with
     // a width <= 0 from time to time
     if( (Prt().*fnRect->fnGetWidth)() <= 0 )
     {
         // If MustFit is set, we shrink to the Upper's bottom edge if needed.
         // Else we just take a standard size of 12 Pt. (240 twip).
-        SwTxtLineAccess aAccess( this );
+        SwTextLineAccess aAccess( this );
         long nFrmHeight = (Frm().*fnRect->fnGetHeight)();
         if( aAccess.GetPara()->IsPrepMustFit() )
         {
@@ -1734,7 +1734,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
         return;
     }
 
-    const sal_Int32 nStrLen = GetTxtNode()->GetTxt().getLength();
+    const sal_Int32 nStrLen = GetTextNode()->GetText().getLength();
     if ( nStrLen || !FormatEmpty() )
     {
 
@@ -1769,19 +1769,19 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
         }
 
         // We do not want to be interrupted during formatting
-        TxtFrmLockGuard aLock(this);
-        SwTxtLineAccess aAccess( this );
-        const bool bNew = !aAccess.SwTxtLineAccess::IsAvailable();
+        TextFrmLockGuard aLock(this);
+        SwTextLineAccess aAccess( this );
+        const bool bNew = !aAccess.SwTextLineAccess::IsAvailable();
         const bool bSetOfst =
-            (GetOfst() && GetOfst() > GetTxtNode()->GetTxt().getLength());
+            (GetOfst() && GetOfst() > GetTextNode()->GetText().getLength());
 
         if( CalcPreps() )
             ; // nothing
-        // We return if already formatted, but if the TxtFrm was just created
+        // We return if already formatted, but if the TextFrm was just created
         // and does not have any format information
         else if( !bNew && !aAccess.GetPara()->GetReformat().Len() )
         {
-            if( GetTxtNode()->GetSwAttrSet().GetRegister().GetValue() )
+            if( GetTextNode()->GetSwAttrSet().GetRegister().GetValue() )
             {
                 aAccess.GetPara()->SetPrepAdjust();
                 aAccess.GetPara()->SetPrep();
@@ -1791,8 +1791,8 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
         }
         else if( bSetOfst && IsFollow() )
         {
-            SwTxtFrm *pMaster = FindMaster();
-            OSL_ENSURE( pMaster, "SwTxtFrm::Format: homeless follow" );
+            SwTextFrm *pMaster = FindMaster();
+            OSL_ENSURE( pMaster, "SwTextFrm::Format: homeless follow" );
             if( pMaster )
                 pMaster->Prepare( PREP_FOLLOW_FOLLOWS );
             SwTwips nMaxY = (GetUpper()->*fnRect->fnGetPrtBottom)();
@@ -1808,30 +1808,30 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
                 _SetOfst( 0 );
 
             const bool bOrphan = IsWidow();
-            const SwFtnBossFrm* pFtnBoss = HasFtn() ? FindFtnBossFrm() : 0;
-            SwTwips nFtnHeight = 0;
-            if( pFtnBoss )
+            const SwFootnoteBossFrm* pFootnoteBoss = HasFootnote() ? FindFootnoteBossFrm() : 0;
+            SwTwips nFootnoteHeight = 0;
+            if( pFootnoteBoss )
             {
-                const SwFtnContFrm* pCont = pFtnBoss->FindFtnCont();
-                nFtnHeight = pCont ? (pCont->Frm().*fnRect->fnGetHeight)() : 0;
+                const SwFootnoteContFrm* pCont = pFootnoteBoss->FindFootnoteCont();
+                nFootnoteHeight = pCont ? (pCont->Frm().*fnRect->fnGetHeight)() : 0;
             }
             do
             {
                 _Format( aAccess.GetPara() );
-                if( pFtnBoss && nFtnHeight )
+                if( pFootnoteBoss && nFootnoteHeight )
                 {
-                    const SwFtnContFrm* pCont = pFtnBoss->FindFtnCont();
+                    const SwFootnoteContFrm* pCont = pFootnoteBoss->FindFootnoteCont();
                     SwTwips nNewHeight = pCont ? (pCont->Frm().*fnRect->fnGetHeight)() : 0;
                     // If we lost some footnotes, we may have more space
                     // for our main text, so we have to format again ...
-                    if( nNewHeight < nFtnHeight )
-                        nFtnHeight = nNewHeight;
+                    if( nNewHeight < nFootnoteHeight )
+                        nFootnoteHeight = nNewHeight;
                     else
                         break;
                 }
                 else
                     break;
-            } while ( pFtnBoss );
+            } while ( pFootnoteBoss );
             if( bOrphan )
             {
                 ValidateFrm();
@@ -1870,10 +1870,10 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
 // frames will not calculated during the painting. So I actually want to
 // avoid a formatting during painting, but since I'm a coward, I'll only
 // force the quick formatting in the situation of issue i29062.
-bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
+bool SwTextFrm::FormatQuick( bool bForceQuickFormat )
 {
     OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
-            "SwTxtFrm::FormatQuick with swapped frame" );
+            "SwTextFrm::FormatQuick with swapped frame" );
 
     if( IsEmpty() && FormatEmpty() )
         return true;
@@ -1884,27 +1884,27 @@ bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
         ( ( IsVertical() ? Prt().Width() : Prt().Height() ) && IsHiddenNow() ) )
         return false;
 
-    SwTxtLineAccess aAccess( this );
+    SwTextLineAccess aAccess( this );
     SwParaPortion *pPara = aAccess.GetPara();
     if( !pPara )
         return false;
 
     SwFrmSwapper aSwapper( this, true );
 
-    TxtFrmLockGuard aLock(this);
-    SwTxtFormatInfo aInf( this, false, true );
+    TextFrmLockGuard aLock(this);
+    SwTextFormatInfo aInf( this, false, true );
     if( 0 != aInf.MaxHyph() )   // Respect MaxHyphen!
         return false;
 
-    SwTxtFormatter  aLine( this, &aInf );
+    SwTextFormatter  aLine( this, &aInf );
 
     // DropCaps are too complicated ...
-    if( aLine.GetDropFmt() )
+    if( aLine.GetDropFormat() )
         return false;
 
     sal_Int32 nStart = GetOfst();
     const sal_Int32 nEnd = GetFollow()
-                      ? GetFollow()->GetOfst() : aInf.GetTxt().getLength();
+                      ? GetFollow()->GetOfst() : aInf.GetText().getLength();
     do
     {
         sal_Int32 nShift = aLine.FormatLine(nStart) - nStart;
@@ -1929,7 +1929,7 @@ bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
         return false;
     }
 
-    if (m_pFollow && nStart != (static_cast<SwTxtFrm*>(m_pFollow))->GetOfst())
+    if (m_pFollow && nStart != (static_cast<SwTextFrm*>(m_pFollow))->GetOfst())
         return false; // can be caused by e.g. Orphans
 
     // We made it!
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index 2c813eafe51b..e1a795cbb51b 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -21,27 +21,27 @@
 #include <frminf.hxx>
 #include <itrtxt.hxx>
 
-sal_Int32 SwTxtMargin::GetTxtStart() const
+sal_Int32 SwTextMargin::GetTextStart() const
 {
-    const OUString &rTxt = GetInfo().GetTxt();
+    const OUString &rText = GetInfo().GetText();
     const sal_Int32 nEnd = nStart + pCurr->GetLen();
 
     for( sal_Int32 i = nStart; i < nEnd; ++i )
     {
-        const sal_Unicode aChar = rTxt[i];
+        const sal_Unicode aChar = rText[i];
         if( CH_TAB != aChar && ' ' != aChar )
             return i;
     }
     return nEnd;
 }
 
-sal_Int32 SwTxtMargin::GetTxtEnd() const
+sal_Int32 SwTextMargin::GetTextEnd() const
 {
-    const OUString &rTxt = GetInfo().GetTxt();
+    const OUString &rText = GetInfo().GetText();
     const sal_Int32 nEnd = nStart + pCurr->GetLen();
     for( sal_Int32 i = nEnd - 1; i >= nStart; --i )
     {
-        const sal_Unicode aChar = rTxt[i];
+        const sal_Unicode aChar = rText[i];
         if( CH_TAB != aChar && CH_BREAK != aChar && ' ' != aChar )
             return i + 1;
     }
@@ -49,7 +49,7 @@ sal_Int32 SwTxtMargin::GetTxtEnd() const
 }
 
 // Does the paragraph fit into one line?
-bool SwTxtFrmInfo::IsOneLine() const
+bool SwTextFrmInfo::IsOneLine() const
 {
     const SwLineLayout *pLay = pFrm->GetPara();
     if( !pLay )
@@ -70,7 +70,7 @@ bool SwTxtFrmInfo::IsOneLine() const
 }
 
 // Is the line filled for X percent?
-bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
+bool SwTextFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
 {
     const SwLineLayout *pLay = pFrm->GetPara();
     if( !pLay )
@@ -83,39 +83,39 @@ bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
 }
 
 // Where does the text start (without whitespace)? (document global)
-SwTwips SwTxtFrmInfo::GetLineStart( const SwTxtCursor &rLine )
+SwTwips SwTextFrmInfo::GetLineStart( const SwTextCursor &rLine )
 {
-    const sal_Int32 nTxtStart = rLine.GetTxtStart();
-    if( rLine.GetStart() == nTxtStart )
+    const sal_Int32 nTextStart = rLine.GetTextStart();
+    if( rLine.GetStart() == nTextStart )
         return rLine.GetLineStart();
 
     SwRect aRect;
-    if( const_cast<SwTxtCursor&>(rLine).GetCharRect( &aRect, nTxtStart ) )
+    if( const_cast<SwTextCursor&>(rLine).GetCharRect( &aRect, nTextStart ) )
         return aRect.Left();
 
     return rLine.GetLineStart();
 }
 
 // Where does the text start (without whitespace)? (relative in the Frame)
-SwTwips SwTxtFrmInfo::GetLineStart() const
+SwTwips SwTextFrmInfo::GetLineStart() const
 {
-    SwTxtSizeInfo aInf( const_cast<SwTxtFrm*>(pFrm) );
-    SwTxtCursor aLine( const_cast<SwTxtFrm*>(pFrm), &aInf );
+    SwTextSizeInfo aInf( const_cast<SwTextFrm*>(pFrm) );
+    SwTextCursor aLine( const_cast<SwTextFrm*>(pFrm), &aInf );
     return GetLineStart( aLine ) - pFrm->Frm().Left() - pFrm->Prt().Left();
 }
 
 // Calculates the character's position and returns the middle position
-SwTwips SwTxtFrmInfo::GetCharPos( sal_Int32 nChar, bool bCenter ) const
+SwTwips SwTextFrmInfo::GetCharPos( sal_Int32 nChar, bool bCenter ) const
 {
     SWRECTFN( pFrm )
     SwFrmSwapper aSwapper( pFrm, true );
 
-    SwTxtSizeInfo aInf( const_cast<SwTxtFrm*>(pFrm) );
-    SwTxtCursor aLine( const_cast<SwTxtFrm*>(pFrm), &aInf );
+    SwTextSizeInfo aInf( const_cast<SwTextFrm*>(pFrm) );
+    SwTextCursor aLine( const_cast<SwTextFrm*>(pFrm), &aInf );
 
     SwTwips nStt, nNext;
     SwRect aRect;
-    if( static_cast<SwTxtCursor&>(aLine).GetCharRect( &aRect, nChar ) )
+    if( static_cast<SwTextCursor&>(aLine).GetCharRect( &aRect, nChar ) )
     {
         if ( bVert )
             pFrm->SwitchHorizontalToVertical( aRect );
@@ -128,7 +128,7 @@ SwTwips SwTxtFrmInfo::GetCharPos( sal_Int32 nChar, bool bCenter ) const
     if( !bCenter )
         return nStt - (pFrm->Frm().*fnRect->fnGetLeft)();
 
-    if( static_cast<SwTxtCursor&>(aLine).GetCharRect( &aRect, nChar+1 ) )
+    if( static_cast<SwTextCursor&>(aLine).GetCharRect( &aRect, nChar+1 ) )
     {
         if ( bVert )
             pFrm->SwitchHorizontalToVertical( aRect );
@@ -141,7 +141,7 @@ SwTwips SwTxtFrmInfo::GetCharPos( sal_Int32 nChar, bool bCenter ) const
     return (( nNext + nStt ) / 2 ) - (pFrm->Frm().*fnRect->fnGetLeft)();
 }
 
-SwPaM *AddPam( SwPaM *pPam, const SwTxtFrm* pTxtFrm,
+SwPaM *AddPam( SwPaM *pPam, const SwTextFrm* pTextFrm,
                 const sal_Int32 nPos, const sal_Int32 nLen )
 {
     if( nLen )
@@ -160,7 +160,7 @@ SwPaM *AddPam( SwPaM *pPam, const SwTxtFrm* pTxtFrm,
         }
 
         SwIndex &rContent = pPam->GetPoint()->nContent;
-        rContent.Assign( const_cast<SwTxtNode*>(pTxtFrm->GetTxtNode()), nPos );
+        rContent.Assign( const_cast<SwTextNode*>(pTextFrm->GetTextNode()), nPos );
         pPam->SetMark();
         rContent += nLen;
     }
@@ -168,17 +168,17 @@ SwPaM *AddPam( SwPaM *pPam, const SwTxtFrm* pTxtFrm,
 }
 
 // Accumulates the whitespace at line start and end in the Pam
-void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, bool bWithLineBreak ) const
+void SwTextFrmInfo::GetSpaces( SwPaM &rPam, bool bWithLineBreak ) const
 {
-    SwTxtSizeInfo aInf( const_cast<SwTxtFrm*>(pFrm) );
-    SwTxtMargin aLine( const_cast<SwTxtFrm*>(pFrm), &aInf );
+    SwTextSizeInfo aInf( const_cast<SwTextFrm*>(pFrm) );
+    SwTextMargin aLine( const_cast<SwTextFrm*>(pFrm), &aInf );
     SwPaM *pPam = &rPam;
     bool bFirstLine = true;
     do {
 
         if( aLine.GetCurr()->GetLen() )
         {
-            sal_Int32 nPos = aLine.GetTxtStart();
+            sal_Int32 nPos = aLine.GetTextStart();
             // Do NOT include the blanks/tabs from the first line
             // in the selection
             if( !bFirstLine && nPos > aLine.GetStart() )
@@ -189,7 +189,7 @@ void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, bool bWithLineBreak ) const
             // in the selection
             if( aLine.GetNext() )
             {
-                nPos = aLine.GetTxtEnd();
+                nPos = aLine.GetTextEnd();
 
                 if( nPos < aLine.GetEnd() )
                 {
@@ -207,22 +207,22 @@ void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, bool bWithLineBreak ) const
 
 // Is there a bullet/symbol etc. at the text position?
 // Fonts: CharSet, SYMBOL und DONTKNOW
-bool SwTxtFrmInfo::IsBullet( sal_Int32 nTxtStart ) const
+bool SwTextFrmInfo::IsBullet( sal_Int32 nTextStart ) const
 {
-    SwTxtSizeInfo aInf( const_cast<SwTxtFrm*>(pFrm) );
-    SwTxtMargin aLine( const_cast<SwTxtFrm*>(pFrm), &aInf );
-    aInf.SetIdx( nTxtStart );
-    return aLine.IsSymbol( nTxtStart );
+    SwTextSizeInfo aInf( const_cast<SwTextFrm*>(pFrm) );
+    SwTextMargin aLine( const_cast<SwTextFrm*>(pFrm), &aInf );
+    aInf.SetIdx( nTextStart );
+    return aLine.IsSymbol( nTextStart );
 }
 
 // Get first line indent
 // The precondition for a positive or negative first line indent:
 // All lines (except for the first one) have the same left margin.
 // We do not want to be so picky and work with a tolerance of TOLERANCE twips.
-SwTwips SwTxtFrmInfo::GetFirstIndent() const
+SwTwips SwTextFrmInfo::GetFirstIndent() const
 {
-    SwTxtSizeInfo aInf( const_cast<SwTxtFrm*>(pFrm) );
-    SwTxtCursor aLine( const_cast<SwTxtFrm*>(pFrm), &aInf );
+    SwTextSizeInfo aInf( const_cast<SwTextFrm*>(pFrm) );
+    SwTextCursor aLine( const_cast<SwTextFrm*>(pFrm), &aInf );
     const SwTwips nFirst = GetLineStart( aLine );
     const SwTwips TOLERANCE = 20;
 
@@ -251,18 +251,18 @@ SwTwips SwTxtFrmInfo::GetFirstIndent() const
     return 1;
 }
 
-sal_Int32 SwTxtFrmInfo::GetBigIndent( sal_Int32& rFndPos,
-                                    const SwTxtFrm *pNextFrm ) const
+sal_Int32 SwTextFrmInfo::GetBigIndent( sal_Int32& rFndPos,
+                                    const SwTextFrm *pNextFrm ) const
 {
-    SwTxtSizeInfo aInf( const_cast<SwTxtFrm*>(pFrm) );
-    SwTxtCursor aLine( const_cast<SwTxtFrm*>(pFrm), &aInf );
+    SwTextSizeInfo aInf( const_cast<SwTextFrm*>(pFrm) );
+    SwTextCursor aLine( const_cast<SwTextFrm*>(pFrm), &aInf );
     SwTwips nNextIndent = 0;
 
     if( pNextFrm )
     {
         // I'm a single line
-        SwTxtSizeInfo aNxtInf( const_cast<SwTxtFrm*>(pNextFrm) );
-        SwTxtCursor aNxtLine( const_cast<SwTxtFrm*>(pNextFrm), &aNxtInf );
+        SwTextSizeInfo aNxtInf( const_cast<SwTextFrm*>(pNextFrm) );
+        SwTextCursor aNxtLine( const_cast<SwTextFrm*>(pNextFrm), &aNxtInf );
         nNextIndent = GetLineStart( aNxtLine );
     }
     else
@@ -284,20 +284,20 @@ sal_Int32 SwTxtFrmInfo::GetBigIndent( sal_Int32& rFndPos,
         return 0;
 
     // Is on front of a non-space
-    const OUString& rTxt = aInf.GetTxt();
-    sal_Unicode aChar = rTxt[rFndPos];
+    const OUString& rText = aInf.GetText();
+    sal_Unicode aChar = rText[rFndPos];
     if( CH_TAB == aChar || CH_BREAK == aChar || ' ' == aChar ||
         (( CH_TXTATR_BREAKWORD == aChar || CH_TXTATR_INWORD == aChar ) &&
             aInf.HasHint( rFndPos ) ) )
         return 0;
 
     // and after a space
-    aChar = rTxt[rFndPos - 1];
+    aChar = rText[rFndPos - 1];
     if( CH_TAB != aChar && CH_BREAK != aChar &&
         ( ( CH_TXTATR_BREAKWORD != aChar && CH_TXTATR_INWORD != aChar ) ||
             !aInf.HasHint( rFndPos - 1 ) ) &&
         // More than two Blanks!
-        ( ' ' != aChar || ' ' != rTxt[rFndPos - 2] ) )
+        ( ' ' != aChar || ' ' != rText[rFndPos - 2] ) )
         return 0;
 
     SwRect aRect;
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 9d2c4ad55b24..a5b65ac30c42 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -60,7 +60,7 @@ class SwExtraPainter
 {
     SwSaveClip aClip;
     SwRect aRect;
-    const SwTxtFrm* pTxtFrm;
+    const SwTextFrm* pTextFrm;
     SwViewShell *pSh;
     SwFont* pFnt;
     const SwLineNumberInfo &rLineInf;
@@ -72,7 +72,7 @@ class SwExtraPainter
     bool bLineNum;
     inline bool IsClipChg() { return aClip.IsChg(); }
 public:
-    SwExtraPainter( const SwTxtFrm *pFrm, SwViewShell *pVwSh,
+    SwExtraPainter( const SwTextFrm *pFrm, SwViewShell *pVwSh,
         const SwLineNumberInfo &rLnInf, const SwRect &rRct,
         sal_Int16 eHor, bool bLnNm );
     ~SwExtraPainter() { delete pFnt; }
@@ -86,12 +86,12 @@ public:
     void PaintRedline( SwTwips nY, long nMax );
 };
 
-SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, SwViewShell *pVwSh,
+SwExtraPainter::SwExtraPainter( const SwTextFrm *pFrm, SwViewShell *pVwSh,
                                 const SwLineNumberInfo &rLnInf, const SwRect &rRct,
                                 sal_Int16 eHor, bool bLnNm )
     : aClip( pVwSh->GetWin() || pFrm->IsUndersized() ? pVwSh->GetOut() : 0 )
     , aRect( rRct )
-    , pTxtFrm( pFrm )
+    , pTextFrm( pFrm )
     , pSh( pVwSh )
     , pFnt( 0 )
     , rLineInf( rLnInf )
@@ -122,9 +122,9 @@ SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, SwViewShell *pVwSh,
         */
         nDivider = !rLineInf.GetDivider().isEmpty() ? rLineInf.GetDividerCountBy() : 0;
         nX = pFrm->Frm().Left();
-        SwCharFmt* pFmt = rLineInf.GetCharFmt( const_cast<IDocumentStylePoolAccess&>(*pFrm->GetNode()->getIDocumentStylePoolAccess()) );
-        OSL_ENSURE( pFmt, "PaintExtraData without CharFmt" );
-        pFnt = new SwFont( &pFmt->GetAttrSet(), pFrm->GetTxtNode()->getIDocumentSettingAccess() );
+        SwCharFormat* pFormat = rLineInf.GetCharFormat( const_cast<IDocumentStylePoolAccess&>(*pFrm->GetNode()->getIDocumentStylePoolAccess()) );
+        OSL_ENSURE( pFormat, "PaintExtraData without CharFormat" );
+        pFnt = new SwFont( &pFormat->GetAttrSet(), pFrm->GetTextNode()->getIDocumentSettingAccess() );
         pFnt->Invalidate();
         pFnt->ChgPhysFnt( pSh, *pSh->GetOut() );
         pFnt->SetVertical( 0, pFrm->IsVertical() );
@@ -195,7 +195,7 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed )
     aDrawInf.SetSmartTags( NULL );
     aDrawInf.SetLeft( 0 );
     aDrawInf.SetRight( LONG_MAX );
-    aDrawInf.SetFrm( pTxtFrm );
+    aDrawInf.SetFrm( pTextFrm );
     aDrawInf.SetFont( pFnt );
     aDrawInf.SetSnapToGrid( false );
     aDrawInf.SetIgnoreFrmRTL( true );
@@ -220,7 +220,7 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed )
     bool bPaint = true;
     if( !IsClipChg() )
     {
-        Size aSize = pTmpFnt->_GetTxtSize( aDrawInf );
+        Size aSize = pTmpFnt->_GetTextSize( aDrawInf );
         if( bGoLeft )
             aTmpPos.X() -= aSize.Width();
         // calculate rectangle containing the line number
@@ -232,11 +232,11 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed )
             if( aRct.Intersection( aRect ).IsEmpty() )
                 bPaint = false;
             else
-                aClip.ChgClip( aRect, pTxtFrm );
+                aClip.ChgClip( aRect, pTextFrm );
         }
     }
     else if( bGoLeft )
-        aTmpPos.X() -= pTmpFnt->_GetTxtSize( aDrawInf ).Width();
+        aTmpPos.X() -= pTmpFnt->_GetTextSize( aDrawInf ).Width();
     aDrawInf.SetPos( aTmpPos );
     if( bPaint )
         pTmpFnt->_DrawText( aDrawInf );
@@ -263,31 +263,31 @@ void SwExtraPainter::PaintRedline( SwTwips nY, long nMax )
         {
             if( aRct.Intersection( aRect ).IsEmpty() )
                 return;
-            aClip.ChgClip( aRect, pTxtFrm );
+            aClip.ChgClip( aRect, pTextFrm );
         }
     }
     const Color aOldCol( pSh->GetOut()->GetLineColor() );
     pSh->GetOut()->SetLineColor( SW_MOD()->GetRedlineMarkColor() );
 
-    if ( pTxtFrm->IsVertical() )
+    if ( pTextFrm->IsVertical() )
     {
-        pTxtFrm->SwitchHorizontalToVertical( aStart );
-        pTxtFrm->SwitchHorizontalToVertical( aEnd );
+        pTextFrm->SwitchHorizontalToVertical( aStart );
+        pTextFrm->SwitchHorizontalToVertical( aEnd );
     }
 
     pSh->GetOut()->DrawLine( aStart, aEnd );
     pSh->GetOut()->SetLineColor( aOldCol );
 }
 
-void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
+void SwTextFrm::PaintExtraData( const SwRect &rRect ) const
 {
     if( Frm().Top() > rRect.Bottom() || Frm().Bottom() < rRect.Top() )
         return;
 
-    const SwTxtNode& rTxtNode = *GetTxtNode();
-    const IDocumentRedlineAccess* pIDRA = rTxtNode.getIDocumentRedlineAccess();
-    const SwLineNumberInfo &rLineInf = rTxtNode.GetDoc()->GetLineNumberInfo();
-    const SwFmtLineNumber &rLineNum = GetAttrSet()->GetLineNumber();
+    const SwTextNode& rTextNode = *GetTextNode();
+    const IDocumentRedlineAccess* pIDRA = rTextNode.getIDocumentRedlineAccess();
+    const SwLineNumberInfo &rLineInf = rTextNode.GetDoc()->GetLineNumberInfo();
+    const SwFormatLineNumber &rLineNum = GetAttrSet()->GetLineNumber();
     bool bLineNum = !IsInTab() && rLineInf.IsPaintLineNumbers() &&
                ( !IsInFly() || rLineInf.IsCountInFlys() ) && rLineNum.IsCount();
     sal_Int16 eHor = (sal_Int16)SW_MOD()->GetRedlineMarkPos();
@@ -316,23 +316,23 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
 
         if( HasPara() )
         {
-            TxtFrmLockGuard aLock(const_cast<SwTxtFrm*>(this));
+            TextFrmLockGuard aLock(const_cast<SwTextFrm*>(this));
 
-            SwTxtLineAccess aAccess( this );
+            SwTextLineAccess aAccess( this );
             aAccess.GetPara();
 
-            SwTxtPaintInfo aInf( const_cast<SwTxtFrm*>(this), rRect );
+            SwTextPaintInfo aInf( const_cast<SwTextFrm*>(this), rRect );
 
             aLayoutModeModifier.Modify( false );
 
-            SwTxtPainter  aLine( const_cast<SwTxtFrm*>(this), &aInf );
+            SwTextPainter  aLine( const_cast<SwTextFrm*>(this), &aInf );
             bool bNoDummy = !aLine.GetNext(); // Only one empty line!
 
             while( aLine.Y() + aLine.GetLineHeight() <= rRect.Top() )
             {
                 if( !aLine.GetCurr()->IsDummy() &&
                     ( rLineInf.IsCountBlankLines() ||
-                      aLine.GetCurr()->HasCntnt() ) )
+                      aLine.GetCurr()->HasContent() ) )
                     aExtra.IncLineNr();
                 if( !aLine.Next() )
                 {
@@ -349,7 +349,7 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
             {
                 while ( aLine.Y() < GetMinPrtLine() )
                 {
-                    if( ( rLineInf.IsCountBlankLines() || aLine.GetCurr()->HasCntnt() )
+                    if( ( rLineInf.IsCountBlankLines() || aLine.GetCurr()->HasContent() )
                         && !aLine.GetCurr()->IsDummy() )
                         aExtra.IncLineNr();
                     if( !aLine.Next() )
@@ -364,7 +364,7 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
                     if( bNoDummy || !aLine.GetCurr()->IsDummy() )
                     {
                         bool bRed = bRedLine && aLine.GetCurr()->HasRedline();
-                        if( rLineInf.IsCountBlankLines() || aLine.GetCurr()->HasCntnt() )
+                        if( rLineInf.IsCountBlankLines() || aLine.GetCurr()->HasContent() )
                         {
                             if( bLineNum &&
                                 ( aExtra.HasNumber() || aExtra.HasDivider() ) )
@@ -385,7 +385,7 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
         }
         else
         {
-            if ( USHRT_MAX == pIDRA->GetRedlinePos(rTxtNode, USHRT_MAX) )
+            if ( USHRT_MAX == pIDRA->GetRedlinePos(rTextNode, USHRT_MAX) )
                 bRedLine = false;
 
             if( bLineNum && rLineInf.IsCountBlankLines() &&
@@ -403,7 +403,7 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
     }
 }
 
-SwRect SwTxtFrm::Paint()
+SwRect SwTextFrm::Paint()
 {
 #if OSL_DEBUG_LEVEL > 1
     const SwTwips nDbgY = Frm().Top();
@@ -411,7 +411,7 @@ SwRect SwTxtFrm::Paint()
 #endif
 
     // finger layout
-    OSL_ENSURE( GetValidPosFlag(), "+SwTxtFrm::Paint: no Calc()" );
+    OSL_ENSURE( GetValidPosFlag(), "+SwTextFrm::Paint: no Calc()" );
 
     SwRect aRet( Prt() );
     if ( IsEmpty() || !HasPara() )
@@ -454,42 +454,42 @@ SwRect SwTxtFrm::Paint()
     return aRet;
 }
 
-bool SwTxtFrm::PaintEmpty( const SwRect &rRect, bool bCheck ) const
+bool SwTextFrm::PaintEmpty( const SwRect &rRect, bool bCheck ) const
 {
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
     if( pSh && ( pSh->GetViewOptions()->IsParagraph() || bInitFont ) )
     {
         bInitFont = false;
-        SwTxtFly aTxtFly( this );
-        aTxtFly.SetTopRule();
+        SwTextFly aTextFly( this );
+        aTextFly.SetTopRule();
         SwRect aRect;
-        if( bCheck && aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) )
+        if( bCheck && aTextFly.IsOn() && aTextFly.IsAnyObj( aRect ) )
             return false;
         else if( pSh->GetWin() )
         {
             SwFont *pFnt;
-            const SwTxtNode& rTxtNode = *GetTxtNode();
-            if ( rTxtNode.HasSwAttrSet() )
+            const SwTextNode& rTextNode = *GetTextNode();
+            if ( rTextNode.HasSwAttrSet() )
             {
-                const SwAttrSet *pAttrSet = &( rTxtNode.GetSwAttrSet() );
-                pFnt = new SwFont( pAttrSet, rTxtNode.getIDocumentSettingAccess() );
+                const SwAttrSet *pAttrSet = &( rTextNode.GetSwAttrSet() );
+                pFnt = new SwFont( pAttrSet, rTextNode.getIDocumentSettingAccess() );
             }
             else
             {
-                SwFontAccess aFontAccess( &rTxtNode.GetAnyFmtColl(), pSh );
+                SwFontAccess aFontAccess( &rTextNode.GetAnyFormatColl(), pSh );
                 pFnt = new SwFont( aFontAccess.Get()->GetFont() );
             }
 
-            const IDocumentRedlineAccess* pIDRA = rTxtNode.getIDocumentRedlineAccess();
+            const IDocumentRedlineAccess* pIDRA = rTextNode.getIDocumentRedlineAccess();
             if( IDocumentRedlineAccess::IsShowChanges( pIDRA->GetRedlineMode() ) )
             {
-                const sal_uInt16 nRedlPos = pIDRA->GetRedlinePos( rTxtNode, USHRT_MAX );
+                const sal_uInt16 nRedlPos = pIDRA->GetRedlinePos( rTextNode, USHRT_MAX );
                 if( USHRT_MAX != nRedlPos )
                 {
                     SwAttrHandler aAttrHandler;
-                    aAttrHandler.Init(  rTxtNode.GetSwAttrSet(),
-                                       *rTxtNode.getIDocumentSettingAccess(), NULL );
-                    SwRedlineItr aRedln( rTxtNode, *pFnt, aAttrHandler, nRedlPos, true );
+                    aAttrHandler.Init(  rTextNode.GetSwAttrSet(),
+                                       *rTextNode.getIDocumentSettingAccess(), NULL );
+                    SwRedlineItr aRedln( rTextNode, *pFnt, aAttrHandler, nRedlPos, true );
                 }
             }
 
@@ -513,10 +513,10 @@ bool SwTxtFrm::PaintEmpty( const SwRect &rRect, bool bCheck ) const
                 Point aPos = Frm().Pos() + Prt().Pos();
 
                 const SvxLRSpaceItem &rSpace =
-                    GetTxtNode()->GetSwAttrSet().GetLRSpace();
+                    GetTextNode()->GetSwAttrSet().GetLRSpace();
 
-                if ( rSpace.GetTxtFirstLineOfst() > 0 )
-                    aPos.X() += rSpace.GetTxtFirstLineOfst();
+                if ( rSpace.GetTextFirstLineOfst() > 0 )
+                    aPos.X() += rSpace.GetTextFirstLineOfst();
 
                 SwSaveClip *pClip;
                 if( IsUndersized() )
@@ -529,7 +529,7 @@ bool SwTxtFrm::PaintEmpty( const SwRect &rRect, bool bCheck ) const
 
                 aPos.Y() += pFnt->GetAscent( pSh, *pSh->GetOut() );
 
-                if ( GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() &&
+                if ( GetTextNode()->GetSwAttrSet().GetParaGrid().GetValue() &&
                      IsInDocBody() )
                 {
                     SwTextGridItem const*const pGrid(GetGridItem(FindPageFrm()));
@@ -575,7 +575,7 @@ bool SwTxtFrm::PaintEmpty( const SwRect &rRect, bool bCheck ) const
     return false;
 }
 
-void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
+void SwTextFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 {
     ResetRepaint();
 
@@ -601,11 +601,11 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         // It can happen that the IdleCollector withdrew my cached information
         if( !HasPara() )
         {
-            OSL_ENSURE( GetValidPosFlag(), "+SwTxtFrm::Paint: no Calc()" );
+            OSL_ENSURE( GetValidPosFlag(), "+SwTextFrm::Paint: no Calc()" );
 
             // #i29062# pass info that we are currently
             // painting.
-            const_cast<SwTxtFrm*>(this)->GetFormatted( true );
+            const_cast<SwTextFrm*>(this)->GetFormatted( true );
             if( IsEmpty() )
             {
                 PaintEmpty( rRect, false );
@@ -613,22 +613,22 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
             }
             if( !HasPara() )
             {
-                OSL_ENSURE( false, "+SwTxtFrm::Paint: missing format information" );
+                OSL_ENSURE( false, "+SwTextFrm::Paint: missing format information" );
                 return;
             }
         }
 
         // We don't want to be interrupted while painting.
         // Do that after thr Format()!
-        TxtFrmLockGuard aLock(const_cast<SwTxtFrm*>(this));
+        TextFrmLockGuard aLock(const_cast<SwTextFrm*>(this));
 
-        // We only paint the part of the TxtFrm which changed, is within the
+        // We only paint the part of the TextFrm which changed, is within the
         // range and was requested to paint.
         // One could think that the area rRect _needs_ to be painted, although
         // rRepaint is set. Indeed, we cannot avoid this problem from a formal
         // perspective. Luckily we can assume rRepaint to be empty when we need
         // paint the while Frm.
-        SwTxtLineAccess aAccess( this );
+        SwTextLineAccess aAccess( this );
         SwParaPortion *pPara = aAccess.GetPara();
 
         SwRepaint &rRepaint = pPara->GetRepaint();
@@ -656,16 +656,16 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         if ( IsRightToLeft() )
             SwitchRTLtoLTR( (SwRect&)rRect );
 
-        SwTxtPaintInfo aInf( const_cast<SwTxtFrm*>(this), rRect );
-        aInf.SetWrongList( const_cast<SwTxtNode*>(GetTxtNode())->GetWrong() );
-        aInf.SetGrammarCheckList( const_cast<SwTxtNode*>(GetTxtNode())->GetGrammarCheck() );
-        aInf.SetSmartTags( const_cast<SwTxtNode*>(GetTxtNode())->GetSmartTags() );
-        aInf.GetTxtFly().SetTopRule();
+        SwTextPaintInfo aInf( const_cast<SwTextFrm*>(this), rRect );
+        aInf.SetWrongList( const_cast<SwTextNode*>(GetTextNode())->GetWrong() );
+        aInf.SetGrammarCheckList( const_cast<SwTextNode*>(GetTextNode())->GetGrammarCheck() );
+        aInf.SetSmartTags( const_cast<SwTextNode*>(GetTextNode())->GetSmartTags() );
+        aInf.GetTextFly().SetTopRule();
 
-        SwTxtPainter  aLine( const_cast<SwTxtFrm*>(this), &aInf );
+        SwTextPainter  aLine( const_cast<SwTextFrm*>(this), &aInf );
         // Optimization: if no free flying Frm overlaps into our line, the
-        // SwTxtFly just switches off
-        aInf.GetTxtFly().Relax();
+        // SwTextFly just switches off
+        aInf.GetTextFly().Relax();
 
         OutputDevice* pOut = aInf.GetOut();
         const bool bOnWin = pSh->GetWin() != 0;
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 6f7008b1ab02..5c351da76e17 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -44,19 +44,19 @@ using namespace ::com::sun::star::linguistic2;
 // provides information for line break calculation
 // returns true if no line break has to be performed
 // otherwise possible break or hyphenation position is determined
-bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
+bool SwTextGuess::Guess( const SwTextPortion& rPor, SwTextFormatInfo &rInf,
                             const sal_uInt16 nPorHeight )
 {
     nCutPos = rInf.GetIdx();
 
     // Empty strings are always 0
-    if( !rInf.GetLen() || rInf.GetTxt().isEmpty() )
+    if( !rInf.GetLen() || rInf.GetText().isEmpty() )
         return false;
 
-    OSL_ENSURE( rInf.GetIdx() < rInf.GetTxt().getLength(),
-            "+SwTxtGuess::Guess: invalid SwTxtFormatInfo" );
+    OSL_ENSURE( rInf.GetIdx() < rInf.GetText().getLength(),
+            "+SwTextGuess::Guess: invalid SwTextFormatInfo" );
 
-    OSL_ENSURE( nPorHeight, "+SwTxtGuess::Guess: no height" );
+    OSL_ENSURE( nPorHeight, "+SwTextGuess::Guess: no height" );
 
     sal_uInt16 nMaxSizeDiff;
 
@@ -66,13 +66,13 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
     sal_uInt16 nMaxComp = ( SW_CJK == rInf.GetFont()->GetActual() ) &&
                         rSI.CountCompChg() &&
                         ! rInf.IsMulti() &&
-                        ! rPor.InFldGrp() &&
+                        ! rPor.InFieldGrp() &&
                         ! rPor.IsDropPortion() ?
                         10000 :
                             0 ;
 
     SwTwips nLineWidth = rInf.Width() - rInf.X();
-    sal_Int32 nMaxLen = rInf.GetTxt().getLength() - rInf.GetIdx();
+    sal_Int32 nMaxLen = rInf.GetText().getLength() - rInf.GetIdx();
 
     if ( rInf.GetLen() < nMaxLen )
         nMaxLen = rInf.GetLen();
@@ -89,13 +89,13 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         if ( rInf.SnapToGrid() )
         {
             SwTextGridItem const*const pGrid(
-                    GetGridItem(rInf.GetTxtFrm()->FindPageFrm()));
+                    GetGridItem(rInf.GetTextFrm()->FindPageFrm()));
             bAddItalic = !pGrid || GRID_LINES_CHARS != pGrid->GetGridType();
         }
 
         // do not add extra italic value for an isolated blank:
         if ( 1 == rInf.GetLen() &&
-             CH_BLANK == rInf.GetTxt()[ rInf.GetIdx() ] )
+             CH_BLANK == rInf.GetText()[ rInf.GetIdx() ] )
             bAddItalic = false;
 
         nItalic = bAddItalic ? nPorHeight / 12 : 0;
@@ -112,15 +112,15 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 
     nLineWidth -= nLeftRightBorderSpace;
 
-    const bool bUnbreakableNumberings = rInf.GetTxtFrm()->GetTxtNode()->
+    const bool bUnbreakableNumberings = rInf.GetTextFrm()->GetTextNode()->
             getIDocumentSettingAccess()->get(DocumentSettingId::UNBREAKABLE_NUMBERINGS);
 
     // first check if everything fits to line
     if ( ( long ( nLineWidth ) * 2 > long ( nMaxLen ) * nPorHeight ) ||
          ( bUnbreakableNumberings && rPor.IsNumberPortion() ) )
     {
-        // call GetTxtSize with maximum compression (for kanas)
-        rInf.GetTxtSize( &rSI, rInf.GetIdx(), nMaxLen,
+        // call GetTextSize with maximum compression (for kanas)
+        rInf.GetTextSize( &rSI, rInf.GetIdx(), nMaxLen,
                          nMaxComp, nBreakWidth, nMaxSizeDiff );
 
         if ( ( nBreakWidth <= nLineWidth ) || ( bUnbreakableNumberings && rPor.IsNumberPortion() ) )
@@ -128,10 +128,10 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
             // portion fits to line
             nCutPos = rInf.GetIdx() + nMaxLen;
             if( nItalic &&
-                ( nCutPos >= rInf.GetTxt().getLength() ||
+                ( nCutPos >= rInf.GetText().getLength() ||
                   // #i48035# Needed for CalcFitToContent
                   // if first line ends with a manual line break
-                  rInf.GetTxt()[ nCutPos ] == CH_BREAK ) )
+                  rInf.GetText()[ nCutPos ] == CH_BREAK ) )
                 nBreakWidth = nBreakWidth + nItalic;
 
             // save maximum width for later use
@@ -152,20 +152,20 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
     // considering an additional "-" for hyphenation
     if( bHyph )
     {
-        nCutPos = rInf.GetTxtBreak( nLineWidth, nMaxLen, nMaxComp, nHyphPos, rInf.GetCachedVclData().get() );
+        nCutPos = rInf.GetTextBreak( nLineWidth, nMaxLen, nMaxComp, nHyphPos, rInf.GetCachedVclData().get() );
 
         if ( !nHyphPos && rInf.GetIdx() )
             nHyphPos = rInf.GetIdx() - 1;
     }
     else
     {
-        nCutPos = rInf.GetTxtBreak( nLineWidth, nMaxLen, nMaxComp, rInf.GetCachedVclData().get() );
+        nCutPos = rInf.GetTextBreak( nLineWidth, nMaxLen, nMaxComp, rInf.GetCachedVclData().get() );
 
 #if OSL_DEBUG_LEVEL > 1
         if ( COMPLETE_STRING != nCutPos )
         {
             sal_uInt16 nMinSize;
-            rInf.GetTxtSize( &rSI, rInf.GetIdx(), nCutPos - rInf.GetIdx(),
+            rInf.GetTextSize( &rSI, rInf.GetIdx(), nCutPos - rInf.GetIdx(),
                              nMaxComp, nMinSize, nMaxSizeDiff );
             OSL_ENSURE( nMinSize <= nLineWidth, "What a Guess!!!" );
         }
@@ -176,14 +176,14 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
     {
         // second check if everything fits to line
         nCutPos = nBreakPos = rInf.GetIdx() + nMaxLen - 1;
-        rInf.GetTxtSize( &rSI, rInf.GetIdx(), nMaxLen, nMaxComp,
+        rInf.GetTextSize( &rSI, rInf.GetIdx(), nMaxLen, nMaxComp,
                          nBreakWidth, nMaxSizeDiff );
 
         // The following comparison should always give true, otherwise
-        // there likely has been a pixel rounding error in GetTxtBreak
+        // there likely has been a pixel rounding error in GetTextBreak
         if ( nBreakWidth <= nLineWidth )
         {
-            if( nItalic && ( nBreakPos + 1 ) >= rInf.GetTxt().getLength() )
+            if( nItalic && ( nBreakPos + 1 ) >= rInf.GetText().getLength() )
                 nBreakWidth = nBreakWidth + nItalic;
 
             // save maximum width for later use
@@ -198,7 +198,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 
     // we have to trigger an underflow for a footnote portion
     // which does not fit to the current line
-    if ( rPor.IsFtnPortion() )
+    if ( rPor.IsFootnotePortion() )
     {
         nBreakPos = rInf.GetIdx();
         nCutPos = -1;
@@ -207,18 +207,18 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 
     sal_Int32 nPorLen = 0;
     // do not call the break iterator nCutPos is a blank
-    sal_Unicode cCutChar = nCutPos < rInf.GetTxt().getLength() ? rInf.GetTxt()[nCutPos] : 0;
+    sal_Unicode cCutChar = nCutPos < rInf.GetText().getLength() ? rInf.GetText()[nCutPos] : 0;
     if( CH_BLANK == cCutChar || CH_FULL_BLANK == cCutChar )
     {
         nBreakPos = nCutPos;
         sal_Int32 nX = nBreakPos;
 
-        const SvxAdjust& rAdjust = rInf.GetTxtFrm()->GetTxtNode()->GetSwAttrSet().GetAdjust().GetAdjust();
+        const SvxAdjust& rAdjust = rInf.GetTextFrm()->GetTextNode()->GetSwAttrSet().GetAdjust().GetAdjust();
         if ( rAdjust == SVX_ADJUST_LEFT )
         {
             // we step back until a non blank character has been found
             // or there is only one more character left
-            while( nX && nBreakPos > rInf.GetTxt().getLength() &&
+            while( nX && nBreakPos > rInf.GetText().getLength() &&
                    ( CH_BLANK == ( cCutChar = rInf.GetChar( --nX ) ) ||
                      CH_FULL_BLANK == cCutChar ) )
                 --nBreakPos;
@@ -233,7 +233,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 
         if( nBreakPos > rInf.GetIdx() )
             nPorLen = nBreakPos - rInf.GetIdx();
-        while( ++nCutPos < rInf.GetTxt().getLength() &&
+        while( ++nCutPos < rInf.GetText().getLength() &&
                ( CH_BLANK == ( cCutChar = rInf.GetChar( nCutPos ) ) ||
                  CH_FULL_BLANK == cCutChar ) )
             ; // nothing
@@ -248,7 +248,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         // the field portion, we trigger an underflow.
 
         sal_Int32 nOldIdx = rInf.GetIdx();
-        sal_Unicode cFldChr = 0;
+        sal_Unicode cFieldChr = 0;
 
 #if OSL_DEBUG_LEVEL > 0
         OUString aDebugString;
@@ -256,32 +256,32 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 
         // be careful: a field portion can be both: 0x01 (common field)
         // or 0x02 (the follow of a footnode)
-        if ( rInf.GetLast() && rInf.GetLast()->InFldGrp() &&
-             ! rInf.GetLast()->IsFtnPortion() &&
+        if ( rInf.GetLast() && rInf.GetLast()->InFieldGrp() &&
+             ! rInf.GetLast()->IsFootnotePortion() &&
              rInf.GetIdx() > rInf.GetLineStart() &&
              CH_TXTATR_BREAKWORD ==
-                ( cFldChr = rInf.GetTxt()[ rInf.GetIdx() - 1 ] ) )
+                ( cFieldChr = rInf.GetText()[ rInf.GetIdx() - 1 ] ) )
         {
-            SwFldPortion* pFld = static_cast<SwFldPortion*>(rInf.GetLast());
-            OUString aTxt;
-            pFld->GetExpTxt( rInf, aTxt );
+            SwFieldPortion* pField = static_cast<SwFieldPortion*>(rInf.GetLast());
+            OUString aText;
+            pField->GetExpText( rInf, aText );
 
-            if ( !aTxt.isEmpty() )
+            if ( !aText.isEmpty() )
             {
-                nFieldDiff = aTxt.getLength() - 1;
+                nFieldDiff = aText.getLength() - 1;
                 nCutPos = nCutPos + nFieldDiff;
                 nHyphPos = nHyphPos + nFieldDiff;
 
 #if OSL_DEBUG_LEVEL > 0
-                aDebugString = rInf.GetTxt();
+                aDebugString = rInf.GetText();
 #endif
 
-                OUString& rOldTxt = const_cast<OUString&> (rInf.GetTxt());
-                rOldTxt = rOldTxt.replaceAt( rInf.GetIdx() - 1, 1, aTxt );
+                OUString& rOldText = const_cast<OUString&> (rInf.GetText());
+                rOldText = rOldText.replaceAt( rInf.GetIdx() - 1, 1, aText );
                 rInf.SetIdx( rInf.GetIdx() + nFieldDiff );
             }
             else
-                cFldChr = 0;
+                cFieldChr = 0;
         }
 
         LineBreakHyphenationOptions aHyphOpt;
@@ -303,7 +303,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         // If we are inside a field portion, we use a temporary string which
         // differs from the string at the textnode. Therefore we are not allowed
         // to call the GetLang function.
-        if ( nCutPos && ! rPor.InFldGrp() )
+        if ( nCutPos && ! rPor.InFieldGrp() )
         {
             const CharClass& rCC = GetAppCharClass();
 
@@ -314,40 +314,40 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
             // step further than the beginning of the expanded field
             // (which is the position of the field placeholder in our
             // original string).
-            const sal_Int32 nDoNotStepOver = CH_TXTATR_BREAKWORD == cFldChr ?
+            const sal_Int32 nDoNotStepOver = CH_TXTATR_BREAKWORD == cFieldChr ?
                                               rInf.GetIdx() - nFieldDiff - 1:
                                               0;
 
             if ( nLangIndex > nDoNotStepOver &&
-                    rInf.GetTxt().getLength() == nLangIndex )
+                    rInf.GetText().getLength() == nLangIndex )
                 --nLangIndex;
 
             while ( nLangIndex > nDoNotStepOver &&
-                    ! rCC.isLetterNumeric( rInf.GetTxt(), nLangIndex ) )
+                    ! rCC.isLetterNumeric( rInf.GetText(), nLangIndex ) )
                 --nLangIndex;
 
             // last "real" character is not inside our current portion
             // we have to check the script type of the last "real" character
             if ( nLangIndex < rInf.GetIdx() )
             {
-                sal_uInt16 nScript = g_pBreakIt->GetRealScriptOfText( rInf.GetTxt(),
+                sal_uInt16 nScript = g_pBreakIt->GetRealScriptOfText( rInf.GetText(),
                                                                 nLangIndex );
                 OSL_ENSURE( nScript, "Script is not between 1 and 4" );
 
                 // compare current script with script from last "real" character
                 if ( nScript - 1 != rInf.GetFont()->GetActual() )
-                    aLang = rInf.GetTxtFrm()->GetTxtNode()->GetLang(
-                        CH_TXTATR_BREAKWORD == cFldChr ?
+                    aLang = rInf.GetTextFrm()->GetTextNode()->GetLang(
+                        CH_TXTATR_BREAKWORD == cFieldChr ?
                         nDoNotStepOver :
                         nLangIndex, 0, nScript );
             }
         }
 
         const ForbiddenCharacters aForbidden(
-                *rInf.GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->getForbiddenCharacters( aLang, true ) );
+                *rInf.GetTextFrm()->GetNode()->getIDocumentSettingAccess()->getForbiddenCharacters( aLang, true ) );
 
         const bool bAllowHanging = rInf.IsHanging() && ! rInf.IsMulti() &&
-                                      ! rPor.InFldGrp();
+                                      ! rPor.InFieldGrp();
 
         LineBreakUserOptions aUserOpt(
                 aForbidden.beginLine, aForbidden.endLine,
@@ -367,7 +367,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         // determines first possible line break from nCutPos to
         // start index of current line
         LineBreakResults aResult = g_pBreakIt->GetBreakIter()->getLineBreak(
-            rInf.GetTxt(), nCutPos, aLocale,
+            rInf.GetText(), nCutPos, aLocale,
             rInf.GetLineStart(), aHyphOpt, aUserOpt );
 
         nBreakPos = aResult.breakIndex;
@@ -377,7 +377,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         // we have to be careful with footnote portions, they always come in
         // with an index 0
         if ( nBreakPos < rInf.GetLineStart() && rInf.IsFirstMulti() &&
-             ! rInf.IsFtnInside() )
+             ! rInf.IsFootnoteInside() )
             nBreakPos = rInf.GetLineStart();
 
         nBreakStart = nBreakPos;
@@ -406,7 +406,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
             if( nBreakPos >= rInf.GetIdx() )
             {
                 nPorLen = nBreakPos - rInf.GetIdx();
-                if( '-' == rInf.GetTxt()[ nBreakPos - 1 ] )
+                if( '-' == rInf.GetText()[ nBreakPos - 1 ] )
                     xHyphWord = NULL;
             }
         }
@@ -420,10 +420,10 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
             // check, if break position is soft hyphen and an underflow
             // has to be triggered
             if( nBreakPos > rInf.GetLineStart() && rInf.GetIdx() &&
-                CHAR_SOFTHYPHEN == rInf.GetTxt()[ nBreakPos - 1 ] )
+                CHAR_SOFTHYPHEN == rInf.GetText()[ nBreakPos - 1 ] )
                 nBreakPos = rInf.GetIdx() - 1;
 
-            const SvxAdjust& rAdjust = rInf.GetTxtFrm()->GetTxtNode()->GetSwAttrSet().GetAdjust().GetAdjust();
+            const SvxAdjust& rAdjust = rInf.GetTextFrm()->GetTextNode()->GetSwAttrSet().GetAdjust().GetAdjust();
             if( rAdjust != SVX_ADJUST_LEFT )
             {
                 // Delete any blanks at the end of a line, but be careful:
@@ -432,7 +432,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
                 // underflow
                 sal_Int32 nX = nBreakPos;
                 while( nX > rInf.GetLineStart() &&
-                       ( CH_TXTATR_BREAKWORD != cFldChr || nX > rInf.GetIdx() ) &&
+                       ( CH_TXTATR_BREAKWORD != cFieldChr || nX > rInf.GetIdx() ) &&
                        ( CH_BLANK == rInf.GetChar( --nX ) ||
                          CH_FULL_BLANK == rInf.GetChar( nX ) ) )
                     nBreakPos = nX;
@@ -452,7 +452,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         if( nBreakPos > nCutPos && nBreakPos != COMPLETE_STRING )
         {
             const sal_Int32 nHangingLen = nBreakPos - nCutPos;
-            SwPosSize aTmpSize = rInf.GetTxtSize( &rSI, nCutPos,
+            SwPosSize aTmpSize = rInf.GetTextSize( &rSI, nCutPos,
                                                   nHangingLen, 0 );
             aTmpSize.Width(aTmpSize.Width() + nLeftRightBorderSpace);
             OSL_ENSURE( !pHanging, "A hanging portion is hanging around" );
@@ -466,7 +466,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         // value, but we cannot correct the nBreakStart value:
         // If we have found a hyphenation position, nBreakStart can lie before
         // the field.
-        if ( CH_TXTATR_BREAKWORD == cFldChr )
+        if ( CH_TXTATR_BREAKWORD == cFieldChr )
         {
             if ( nBreakPos < rInf.GetIdx() )
                 nBreakPos = nOldIdx - 1;
@@ -480,13 +480,13 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
                     "I've got field trouble, part2!" );
             nCutPos = nCutPos - nFieldDiff;
 
-            OUString& rOldTxt = const_cast<OUString&> (rInf.GetTxt());
-            OUString aReplacement( cFldChr );
-            rOldTxt = rOldTxt.replaceAt( nOldIdx - 1, nFieldDiff + 1, aReplacement);
+            OUString& rOldText = const_cast<OUString&> (rInf.GetText());
+            OUString aReplacement( cFieldChr );
+            rOldText = rOldText.replaceAt( nOldIdx - 1, nFieldDiff + 1, aReplacement);
             rInf.SetIdx( nOldIdx );
 
 #if OSL_DEBUG_LEVEL > 0
-            OSL_ENSURE( aDebugString == rInf.GetTxt(),
+            OSL_ENSURE( aDebugString == rInf.GetText(),
                     "Somebody, somebody, somebody put something in my string" );
 #endif
         }
@@ -494,7 +494,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 
     if( nPorLen )
     {
-        rInf.GetTxtSize( &rSI, rInf.GetIdx(), nPorLen,
+        rInf.GetTextSize( &rSI, rInf.GetIdx(), nPorLen,
                          nMaxComp, nBreakWidth, nMaxSizeDiff,
                          rInf.GetCachedVclData().get() );
 
@@ -515,12 +515,12 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 
 // returns true if word at position nPos has a diffenrent spelling
 // if hyphenated at this position (old german spelling)
-bool SwTxtGuess::AlternativeSpelling( const SwTxtFormatInfo &rInf,
+bool SwTextGuess::AlternativeSpelling( const SwTextFormatInfo &rInf,
     const sal_Int32 nPos )
 {
     // get word boundaries
     Boundary aBound =
-        g_pBreakIt->GetBreakIter()->getWordBoundary( rInf.GetTxt(), nPos,
+        g_pBreakIt->GetBreakIter()->getWordBoundary( rInf.GetText(), nPos,
         g_pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ),
         WordType::DICTIONARY_WORD, true );
     nBreakStart = aBound.startPos;
@@ -529,13 +529,13 @@ bool SwTxtGuess::AlternativeSpelling( const SwTxtFormatInfo &rInf,
     // if everything else fails, we want to cut at nPos
     nCutPos = nPos;
 
-    OUString aTxt( rInf.GetTxt().copy( nBreakStart, nWordLen ) );
+    OUString aText( rInf.GetText().copy( nBreakStart, nWordLen ) );
 
     // check, if word has alternative spelling
     Reference< XHyphenator >  xHyph( ::GetHyphenator() );
     OSL_ENSURE( xHyph.is(), "Hyphenator is missing");
     //! subtract 1 since the UNO-interface is 0 based
-    xHyphWord = xHyph->queryAlternativeSpelling( aTxt,
+    xHyphWord = xHyph->queryAlternativeSpelling( aText,
                         g_pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ),
                         nPos - nBreakStart, rInf.GetHyphValues() );
     return xHyphWord.is() && xHyphWord->isAlternativeSpelling();
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index 250868687165..267c7c468636 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -24,9 +24,9 @@
 #include "breakit.hxx"
 #include "porrst.hxx"
 
-class SwTxtFormatInfo;
+class SwTextFormatInfo;
 
-class SwTxtGuess
+class SwTextGuess
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord >  xHyphWord;
     SwHangingPortion *pHanging; // for hanging punctuation
@@ -37,15 +37,15 @@ class SwTxtGuess
                                // a field in the text has been expanded
     sal_uInt16 nBreakWidth;    // width of the broken portion
 public:
-    inline SwTxtGuess(): pHanging( NULL ), nCutPos(0), nBreakStart(0),
+    inline SwTextGuess(): pHanging( NULL ), nCutPos(0), nBreakStart(0),
                         nBreakPos(0), nFieldDiff(0), nBreakWidth(0)
         { }
-    ~SwTxtGuess() { delete pHanging; }
+    ~SwTextGuess() { delete pHanging; }
 
     // true, if current portion still fits to current line
-    bool Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
+    bool Guess( const SwTextPortion& rPor, SwTextFormatInfo &rInf,
                     const sal_uInt16 nHeight );
-    bool AlternativeSpelling( const SwTxtFormatInfo &rInf, const sal_Int32 nPos );
+    bool AlternativeSpelling( const SwTextFormatInfo &rInf, const sal_Int32 nPos );
 
     inline SwHangingPortion* GetHangingPortion() const { return pHanging; }
     inline void ClearHangingPortion() { pHanging = NULL; }
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 8f2d3f9e93d2..e07a40b037cc 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -87,7 +87,7 @@ using namespace ::com::sun::star::beans;
 #define DRAW_SPECIAL_OPTIONS_ROTATE 2
 
 #ifdef DBG_UTIL
-bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
+bool SwTextSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
 #endif
 
 SwLineInfo::SwLineInfo()
@@ -105,11 +105,11 @@ SwLineInfo::~SwLineInfo()
     delete pRuler;
 }
 void SwLineInfo::CtorInitLineInfo( const SwAttrSet& rAttrSet,
-                                   const SwTxtNode& rTxtNode )
+                                   const SwTextNode& rTextNode )
 {
     delete pRuler;
     pRuler = new SvxTabStopItem( rAttrSet.GetTabStops() );
-    if ( rTxtNode.GetListTabStopPosition( nListTabStopPosition ) )
+    if ( rTextNode.GetListTabStopPosition( nListTabStopPosition ) )
     {
         bListTabStopIncluded = true;
 
@@ -130,7 +130,7 @@ void SwLineInfo::CtorInitLineInfo( const SwAttrSet& rAttrSet,
         }
     }
 
-    if ( !rTxtNode.getIDocumentSettingAccess()->get(DocumentSettingId::TABS_RELATIVE_TO_INDENT) )
+    if ( !rTextNode.getIDocumentSettingAccess()->get(DocumentSettingId::TABS_RELATIVE_TO_INDENT) )
     {
         // remove default tab stop at position 0
         for ( sal_uInt16 i = 0; i < pRuler->Count(); i++ )
@@ -149,26 +149,26 @@ void SwLineInfo::CtorInitLineInfo( const SwAttrSet& rAttrSet,
     nDefTabStop = USHRT_MAX;
 }
 
-void SwTxtInfo::CtorInitTxtInfo( SwTxtFrm *pFrm )
+void SwTextInfo::CtorInitTextInfo( SwTextFrm *pFrm )
 {
     m_pPara = pFrm->GetPara();
-    m_nTxtStart = pFrm->GetOfst();
+    m_nTextStart = pFrm->GetOfst();
     if (!m_pPara)
     {
-        SAL_WARN("sw.core", "+SwTxtInfo::CTOR: missing paragraph information");
+        SAL_WARN("sw.core", "+SwTextInfo::CTOR: missing paragraph information");
         pFrm->Format();
         m_pPara = pFrm->GetPara();
     }
 }
 
-SwTxtInfo::SwTxtInfo( const SwTxtInfo &rInf )
-    : m_pPara( const_cast<SwTxtInfo&>(rInf).GetParaPortion() )
-    , m_nTxtStart( rInf.GetTxtStart() )
+SwTextInfo::SwTextInfo( const SwTextInfo &rInf )
+    : m_pPara( const_cast<SwTextInfo&>(rInf).GetParaPortion() )
+    , m_nTextStart( rInf.GetTextStart() )
 { }
 
 #if OSL_DEBUG_LEVEL > 0
 
-void ChkOutDev( const SwTxtSizeInfo &rInf )
+void ChkOutDev( const SwTextSizeInfo &rInf )
 {
     if ( !rInf.GetVsh() )
         return;
@@ -179,26 +179,26 @@ void ChkOutDev( const SwTxtSizeInfo &rInf )
 }
 #endif
 
-inline sal_Int32 GetMinLen( const SwTxtSizeInfo &rInf )
+inline sal_Int32 GetMinLen( const SwTextSizeInfo &rInf )
 {
-    const sal_Int32 nTxtLen = rInf.GetTxt().getLength();
+    const sal_Int32 nTextLen = rInf.GetText().getLength();
     if (rInf.GetLen() == COMPLETE_STRING)
-        return nTxtLen;
+        return nTextLen;
     const sal_Int32 nInfLen = rInf.GetIdx() + rInf.GetLen();
-    return std::min(nTxtLen, nInfLen);
+    return std::min(nTextLen, nInfLen);
 }
 
-SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew )
-    : SwTxtInfo( rNew ),
+SwTextSizeInfo::SwTextSizeInfo( const SwTextSizeInfo &rNew )
+    : SwTextInfo( rNew ),
       m_pKanaComp(rNew.GetpKanaComp()),
-      m_pVsh(const_cast<SwTxtSizeInfo&>(rNew).GetVsh()),
-      m_pOut(const_cast<SwTxtSizeInfo&>(rNew).GetOut()),
-      m_pRef(const_cast<SwTxtSizeInfo&>(rNew).GetRefDev()),
-      m_pFnt(const_cast<SwTxtSizeInfo&>(rNew).GetFont()),
+      m_pVsh(const_cast<SwTextSizeInfo&>(rNew).GetVsh()),
+      m_pOut(const_cast<SwTextSizeInfo&>(rNew).GetOut()),
+      m_pRef(const_cast<SwTextSizeInfo&>(rNew).GetRefDev()),
+      m_pFnt(const_cast<SwTextSizeInfo&>(rNew).GetFont()),
       m_pUnderFnt(rNew.GetUnderFnt()),
       m_pFrm(rNew.m_pFrm),
       m_pOpt(&rNew.GetOpt()),
-      m_pTxt(&rNew.GetTxt()),
+      m_pText(&rNew.GetText()),
       m_nIdx(rNew.GetIdx()),
       m_nLen(rNew.GetLen()),
       m_nKanaIdx( rNew.GetKanaIdx() ),
@@ -206,8 +206,8 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew )
       m_bNotEOL( rNew.NotEOL() ),
       m_bURLNotify( rNew.URLNotify() ),
       m_bStopUnderflow( rNew.StopUnderflow() ),
-      m_bFtnInside( rNew.IsFtnInside() ),
-      m_bOtherThanFtnInside( rNew.IsOtherThanFtnInside() ),
+      m_bFootnoteInside( rNew.IsFootnoteInside() ),
+      m_bOtherThanFootnoteInside( rNew.IsOtherThanFootnoteInside() ),
       m_bMulti( rNew.IsMulti() ),
       m_bFirstMulti( rNew.IsFirstMulti() ),
       m_bRuby( rNew.IsRuby() ),
@@ -222,14 +222,14 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew )
 #endif
 }
 
-void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt,
+void SwTextSizeInfo::CtorInitTextSizeInfo( SwTextFrm *pFrame, SwFont *pNewFnt,
                    const sal_Int32 nNewIdx, const sal_Int32 nNewLen )
 {
     m_pKanaComp = NULL;
     m_nKanaIdx = 0;
     m_pFrm = pFrame;
-    CtorInitTxtInfo( m_pFrm );
-    const SwTxtNode *pNd = m_pFrm->GetTxtNode();
+    CtorInitTextInfo( m_pFrm );
+    const SwTextNode *pNd = m_pFrm->GetTextNode();
     m_pVsh = m_pFrm->getRootFrm()->GetCurrShell();
 
     // Get the output and reference device
@@ -286,30 +286,30 @@ void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt,
 
     m_pFnt = pNewFnt;
     m_pUnderFnt = 0;
-    m_pTxt = &pNd->GetTxt();
+    m_pText = &pNd->GetText();
 
     m_nIdx = nNewIdx;
     m_nLen = nNewLen;
     m_bNotEOL = false;
-    m_bStopUnderflow = m_bFtnInside = m_bOtherThanFtnInside = false;
+    m_bStopUnderflow = m_bFootnoteInside = m_bOtherThanFootnoteInside = false;
     m_bMulti = m_bFirstMulti = m_bRuby = m_bHanging = m_bScriptSpace =
         m_bForbiddenChars = false;
 
     SetLen( GetMinLen( *this ) );
 }
 
-SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const OUString* pTxt,
+SwTextSizeInfo::SwTextSizeInfo( const SwTextSizeInfo &rNew, const OUString* pText,
                               const sal_Int32 nIndex, const sal_Int32 nLength )
-    : SwTxtInfo( rNew ),
+    : SwTextInfo( rNew ),
       m_pKanaComp(rNew.GetpKanaComp()),
-      m_pVsh(const_cast<SwTxtSizeInfo&>(rNew).GetVsh()),
-      m_pOut(const_cast<SwTxtSizeInfo&>(rNew).GetOut()),
-      m_pRef(const_cast<SwTxtSizeInfo&>(rNew).GetRefDev()),
-      m_pFnt(const_cast<SwTxtSizeInfo&>(rNew).GetFont()),
+      m_pVsh(const_cast<SwTextSizeInfo&>(rNew).GetVsh()),
+      m_pOut(const_cast<SwTextSizeInfo&>(rNew).GetOut()),
+      m_pRef(const_cast<SwTextSizeInfo&>(rNew).GetRefDev()),
+      m_pFnt(const_cast<SwTextSizeInfo&>(rNew).GetFont()),
       m_pUnderFnt(rNew.GetUnderFnt()),
       m_pFrm( rNew.m_pFrm ),
       m_pOpt(&rNew.GetOpt()),
-      m_pTxt(pTxt),
+      m_pText(pText),
       m_nIdx(nIndex),
       m_nLen(nLength),
       m_nKanaIdx( rNew.GetKanaIdx() ),
@@ -317,8 +317,8 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const OUString* pTxt,
       m_bNotEOL( rNew.NotEOL() ),
       m_bURLNotify( rNew.URLNotify() ),
       m_bStopUnderflow( rNew.StopUnderflow() ),
-      m_bFtnInside( rNew.IsFtnInside() ),
-      m_bOtherThanFtnInside( rNew.IsOtherThanFtnInside() ),
+      m_bFootnoteInside( rNew.IsFootnoteInside() ),
+      m_bOtherThanFootnoteInside( rNew.IsOtherThanFootnoteInside() ),
       m_bMulti( rNew.IsMulti() ),
       m_bFirstMulti( rNew.IsFirstMulti() ),
       m_bRuby( rNew.IsRuby() ),
@@ -334,7 +334,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const OUString* pTxt,
     SetLen( GetMinLen( *this ) );
 }
 
-void SwTxtSizeInfo::SelectFont()
+void SwTextSizeInfo::SelectFont()
 {
      // The path needs to go via ChgPhysFnt or the FontMetricCache gets confused.
      // In this case pLastMet has it's old value.
@@ -343,31 +343,31 @@ void SwTxtSizeInfo::SelectFont()
     GetFont()->ChgPhysFnt( m_pVsh, *GetOut() );
 }
 
-void SwTxtSizeInfo::NoteAnimation() const
+void SwTextSizeInfo::NoteAnimation() const
 {
     if( OnWin() )
         SwRootFrm::FlushVout();
 
     OSL_ENSURE( m_pOut == m_pVsh->GetOut(),
-            "SwTxtSizeInfo::NoteAnimation() changed m_pOut" );
+            "SwTextSizeInfo::NoteAnimation() changed m_pOut" );
 }
 
-SwPosSize SwTxtSizeInfo::GetTxtSize( OutputDevice* pOutDev,
+SwPosSize SwTextSizeInfo::GetTextSize( OutputDevice* pOutDev,
                                      const SwScriptInfo* pSI,
-                                     const OUString& rTxt,
+                                     const OUString& rText,
                                      const sal_Int32 nIndex,
                                      const sal_Int32 nLength,
                                      const sal_uInt16 nComp) const
 {
-    SwDrawTextInfo aDrawInf( m_pVsh, *pOutDev, pSI, rTxt, nIndex, nLength );
+    SwDrawTextInfo aDrawInf( m_pVsh, *pOutDev, pSI, rText, nIndex, nLength );
     aDrawInf.SetFrm( m_pFrm );
     aDrawInf.SetFont( m_pFnt );
     aDrawInf.SetSnapToGrid( SnapToGrid() );
     aDrawInf.SetKanaComp( nComp );
-    return m_pFnt->_GetTxtSize( aDrawInf );
+    return m_pFnt->_GetTextSize( aDrawInf );
 }
 
-SwPosSize SwTxtSizeInfo::GetTxtSize() const
+SwPosSize SwTextSizeInfo::GetTextSize() const
 {
     const SwScriptInfo& rSI =
                      const_cast<SwParaPortion*>(GetParaPortion())->GetScriptInfo();
@@ -380,31 +380,31 @@ SwPosSize SwTxtSizeInfo::GetTxtSize() const
                     GetKanaComp() :
                                 0 ;
 
-    SwDrawTextInfo aDrawInf( m_pVsh, *m_pOut, &rSI, *m_pTxt, m_nIdx, m_nLen );
+    SwDrawTextInfo aDrawInf( m_pVsh, *m_pOut, &rSI, *m_pText, m_nIdx, m_nLen );
     aDrawInf.SetFrm( m_pFrm );
     aDrawInf.SetFont( m_pFnt );
     aDrawInf.SetSnapToGrid( SnapToGrid() );
     aDrawInf.SetKanaComp( nComp );
-    return m_pFnt->_GetTxtSize( aDrawInf );
+    return m_pFnt->_GetTextSize( aDrawInf );
 }
 
-void SwTxtSizeInfo::GetTxtSize( const SwScriptInfo* pSI, const sal_Int32 nIndex,
+void SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nIndex,
                                 const sal_Int32 nLength, const sal_uInt16 nComp,
                                 sal_uInt16& nMinSize, sal_uInt16& nMaxSizeDiff,
                                 vcl::TextLayoutCache const*const pCache) const
 {
-    SwDrawTextInfo aDrawInf( m_pVsh, *m_pOut, pSI, *m_pTxt, nIndex, nLength,
+    SwDrawTextInfo aDrawInf( m_pVsh, *m_pOut, pSI, *m_pText, nIndex, nLength,
             0, false, pCache);
     aDrawInf.SetFrm( m_pFrm );
     aDrawInf.SetFont( m_pFnt );
     aDrawInf.SetSnapToGrid( SnapToGrid() );
     aDrawInf.SetKanaComp( nComp );
-    SwPosSize aSize = m_pFnt->_GetTxtSize( aDrawInf );
+    SwPosSize aSize = m_pFnt->_GetTextSize( aDrawInf );
     nMaxSizeDiff = (sal_uInt16)aDrawInf.GetKanaDiff();
     nMinSize = aSize.Width();
 }
 
-sal_Int32 SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
+sal_Int32 SwTextSizeInfo::GetTextBreak( const long nLineWidth,
                                        const sal_Int32 nMaxLen,
                                        const sal_uInt16 nComp,
                                        vcl::TextLayoutCache const*const pCache) const
@@ -412,19 +412,19 @@ sal_Int32 SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
     const SwScriptInfo& rScriptInfo =
                      const_cast<SwParaPortion*>(GetParaPortion())->GetScriptInfo();
 
-    OSL_ENSURE( m_pRef == m_pOut, "GetTxtBreak is supposed to use the RefDev" );
+    OSL_ENSURE( m_pRef == m_pOut, "GetTextBreak is supposed to use the RefDev" );
     SwDrawTextInfo aDrawInf( m_pVsh, *m_pOut, &rScriptInfo,
-                             *m_pTxt, GetIdx(), nMaxLen,  0, false, pCache );
+                             *m_pText, GetIdx(), nMaxLen,  0, false, pCache );
     aDrawInf.SetFrm( m_pFrm );
     aDrawInf.SetFont( m_pFnt );
     aDrawInf.SetSnapToGrid( SnapToGrid() );
     aDrawInf.SetKanaComp( nComp );
     aDrawInf.SetHyphPos( 0 );
 
-    return m_pFnt->GetTxtBreak( aDrawInf, nLineWidth );
+    return m_pFnt->GetTextBreak( aDrawInf, nLineWidth );
 }
 
-sal_Int32 SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
+sal_Int32 SwTextSizeInfo::GetTextBreak( const long nLineWidth,
                                        const sal_Int32 nMaxLen,
                                        const sal_uInt16 nComp,
                                        sal_Int32& rExtraCharPos,
@@ -433,27 +433,27 @@ sal_Int32 SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
     const SwScriptInfo& rScriptInfo =
                      const_cast<SwParaPortion*>(GetParaPortion())->GetScriptInfo();
 
-    OSL_ENSURE( m_pRef == m_pOut, "GetTxtBreak is supposed to use the RefDev" );
+    OSL_ENSURE( m_pRef == m_pOut, "GetTextBreak is supposed to use the RefDev" );
     SwDrawTextInfo aDrawInf( m_pVsh, *m_pOut, &rScriptInfo,
-                             *m_pTxt, GetIdx(), nMaxLen, 0, false, pCache );
+                             *m_pText, GetIdx(), nMaxLen, 0, false, pCache );
     aDrawInf.SetFrm( m_pFrm );
     aDrawInf.SetFont( m_pFnt );
     aDrawInf.SetSnapToGrid( SnapToGrid() );
     aDrawInf.SetKanaComp( nComp );
     aDrawInf.SetHyphPos( &rExtraCharPos );
 
-    return m_pFnt->GetTxtBreak( aDrawInf, nLineWidth );
+    return m_pFnt->GetTextBreak( aDrawInf, nLineWidth );
 }
 
-bool SwTxtSizeInfo::_HasHint( const SwTxtNode* pTxtNode, sal_Int32 nPos )
+bool SwTextSizeInfo::_HasHint( const SwTextNode* pTextNode, sal_Int32 nPos )
 {
-    return pTxtNode->GetTxtAttrForCharAt(nPos);
+    return pTextNode->GetTextAttrForCharAt(nPos);
 }
 
-void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPaint )
+void SwTextPaintInfo::CtorInitTextPaintInfo( SwTextFrm *pFrame, const SwRect &rPaint )
 {
-    CtorInitTxtSizeInfo( pFrame );
-    aTxtFly.CtorInitTxtFly( pFrame ),
+    CtorInitTextSizeInfo( pFrame );
+    aTextFly.CtorInitTextFly( pFrame ),
     aPaintRect = rPaint;
     nSpaceIdx = 0;
     pSpaceAdd = NULL;
@@ -468,27 +468,27 @@ void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPain
 #endif
 }
 
-SwTxtPaintInfo::SwTxtPaintInfo( const SwTxtPaintInfo &rInf, const OUString* pTxt )
-    : SwTxtSizeInfo( rInf, pTxt ),
+SwTextPaintInfo::SwTextPaintInfo( const SwTextPaintInfo &rInf, const OUString* pText )
+    : SwTextSizeInfo( rInf, pText ),
       pWrongList( rInf.GetpWrongList() ),
       pGrammarCheckList( rInf.GetGrammarCheckList() ),
       pSmartTags( rInf.GetSmartTags() ),
       pSpaceAdd( rInf.GetpSpaceAdd() ),
       pBrushItem( rInf.GetBrushItem() ),
-      aTxtFly( rInf.GetTxtFly() ),
+      aTextFly( rInf.GetTextFly() ),
       aPos( rInf.GetPos() ),
       aPaintRect( rInf.GetPaintRect() ),
       nSpaceIdx( rInf.GetSpaceIdx() )
 { }
 
-SwTxtPaintInfo::SwTxtPaintInfo( const SwTxtPaintInfo &rInf )
-    : SwTxtSizeInfo( rInf ),
+SwTextPaintInfo::SwTextPaintInfo( const SwTextPaintInfo &rInf )
+    : SwTextSizeInfo( rInf ),
       pWrongList( rInf.GetpWrongList() ),
       pGrammarCheckList( rInf.GetGrammarCheckList() ),
       pSmartTags( rInf.GetSmartTags() ),
       pSpaceAdd( rInf.GetpSpaceAdd() ),
       pBrushItem( rInf.GetBrushItem() ),
-      aTxtFly( rInf.GetTxtFly() ),
+      aTextFly( rInf.GetTextFly() ),
       aPos( rInf.GetPos() ),
       aPaintRect( rInf.GetPaintRect() ),
       nSpaceIdx( rInf.GetSpaceIdx() )
@@ -497,7 +497,7 @@ SwTxtPaintInfo::SwTxtPaintInfo( const SwTxtPaintInfo &rInf )
 extern Color aGlobalRetoucheColor;
 
 /// Returns if the current background color is dark.
-static bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
+static bool lcl_IsDarkBackground( const SwTextPaintInfo& rInf )
 {
     const Color* pCol = rInf.GetFont()->GetBackColor();
     if( ! pCol || COL_TRANSPARENT == pCol->GetColor() )
@@ -512,7 +512,7 @@ static bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
         // See implementation in /core/layout/paintfrm.cxx
         // There is a background color, if there is a background brush and
         // its color is *not* "no fill"/"auto fill".
-        if( rInf.GetTxtFrm()->GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigBackRect, false ) )
+        if( rInf.GetTextFrm()->GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigBackRect, false ) )
         {
             if ( !pCol )
                 pCol = &pItem->GetColor();
@@ -531,7 +531,7 @@ static bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
     return pCol->IsDark();
 }
 
-void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor,
+void SwTextPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor,
                                 const sal_Int32 nStart, const sal_Int32 nLength,
                                 const bool bKern, const bool bWrong,
                                 const bool bSmartTag,
@@ -543,7 +543,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
     if( GetFont()->IsBlink() && OnWin() && rPor.Width() )
     {
         // check if accessibility options allow blinking portions:
-        const SwViewShell* pSh = GetTxtFrm()->getRootFrm()->GetCurrShell();
+        const SwViewShell* pSh = GetTextFrm()->getRootFrm()->GetCurrShell();
         if ( pSh && ! pSh->GetAccessibilityOptions()->IsStopAnimatedText() &&
              ! pSh->IsPreview() )
         {
@@ -552,16 +552,16 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
 
             Point aPoint( aPos );
 
-            if ( GetTxtFrm()->IsRightToLeft() )
-                GetTxtFrm()->SwitchLTRtoRTL( aPoint );
+            if ( GetTextFrm()->IsRightToLeft() )
+                GetTextFrm()->SwitchLTRtoRTL( aPoint );
 
             if ( TEXT_LAYOUT_BIDI_STRONG != GetOut()->GetLayoutMode() )
                 aPoint.X() -= rPor.Width();
 
-            if ( GetTxtFrm()->IsVertical() )
-                GetTxtFrm()->SwitchHorizontalToVertical( aPoint );
+            if ( GetTextFrm()->IsVertical() )
+                GetTextFrm()->SwitchHorizontalToVertical( aPoint );
 
-            pBlink->Insert( aPoint, &rPor, GetTxtFrm(), m_pFnt->GetOrientation() );
+            pBlink->Insert( aPoint, &rPor, GetTextFrm(), m_pFnt->GetOrientation() );
 
             if( !pBlink->IsVisible() )
                 return;
@@ -575,7 +575,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
 
     // The SwScriptInfo is useless if we are inside a field portion
     SwScriptInfo* pSI = 0;
-    if ( ! rPor.InFldGrp() )
+    if ( ! rPor.InFieldGrp() )
         pSI = &GetParaPortion()->GetScriptInfo();
 
     // in some cases, kana compression is not allowed or suppressed for
@@ -607,8 +607,8 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
         sal_Int32 nCharCnt = 0;
         // #i41860# Thai justified alignment needs some
         // additional information:
-        aDrawInf.SetNumberOfBlanks( rPor.InTxtGrp() ?
-                                    static_cast<const SwTxtPortion&>(rPor).GetSpaceCnt( *this, nCharCnt ) :
+        aDrawInf.SetNumberOfBlanks( rPor.InTextGrp() ?
+                                    static_cast<const SwTextPortion&>(rPor).GetSpaceCnt( *this, nCharCnt ) :
                                     0 );
     }
 
@@ -618,7 +618,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
     // the font is used to identify the current script via nActual
     aDrawInf.SetFont( m_pFnt );
     // the frame is used to identify the orientation
-    aDrawInf.SetFrm( GetTxtFrm() );
+    aDrawInf.SetFrm( GetTextFrm() );
     // we have to know if the paragraph should snap to grid
     aDrawInf.SetSnapToGrid( SnapToGrid() );
     // for underlining we must know when not to add extra space behind
@@ -629,16 +629,16 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
 
     // Draw text next to the left border
     Point aFontPos(aPos);
-    if( m_pFnt->GetLeftBorder() && !static_cast<const SwTxtPortion&>(rPor).GetJoinBorderWithPrev() )
+    if( m_pFnt->GetLeftBorder() && !static_cast<const SwTextPortion&>(rPor).GetJoinBorderWithPrev() )
     {
         const sal_uInt16 nLeftBorderSpace = m_pFnt->GetLeftBorderSpace();
-        if ( GetTxtFrm()->IsRightToLeft() )
+        if ( GetTextFrm()->IsRightToLeft() )
         {
             aFontPos.X() -= nLeftBorderSpace;
         }
         else
         {
-            switch( m_pFnt->GetOrientation(GetTxtFrm()->IsVertical()) )
+            switch( m_pFnt->GetOrientation(GetTextFrm()->IsVertical()) )
             {
                 case 0 :
                     aFontPos.X() += nLeftBorderSpace;
@@ -660,7 +660,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
             aFontPos.X() = 0;
     }
 
-    if( GetTxtFly().IsOn() )
+    if( GetTextFly().IsOn() )
     {
         // aPos needs to be the TopLeft, because we cannot calculate the
         // ClipRects otherwise
@@ -673,7 +673,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
         aDrawInf.SetWrong( bTmpWrong ? pWrongList : NULL );
         aDrawInf.SetGrammarCheck( bTmpGrammarCheck ? pGrammarCheckList : NULL );
         aDrawInf.SetSmartTags( bTmpSmart ? pSmartTags : NULL );
-        GetTxtFly().DrawTextOpaque( aDrawInf );
+        GetTextFly().DrawTextOpaque( aDrawInf );
     }
     else
     {
@@ -690,7 +690,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
     }
 }
 
-void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
+void SwTextPaintInfo::CalcRect( const SwLinePortion& rPor,
                                SwRect* pRect, SwRect* pIntersect,
                                const bool bInsideBox ) const
 {
@@ -700,7 +700,7 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
     if( rPor.InSpaceGrp() && GetSpaceAdd() )
     {
         SwTwips nAdd = rPor.CalcSpacing( GetSpaceAdd(), *this );
-        if( rPor.InFldGrp() && GetSpaceAdd() < 0 && nAdd )
+        if( rPor.InFieldGrp() && GetSpaceAdd() < 0 && nAdd )
             nAdd += GetSpaceAdd() / SPACING_PRECISION_FACTOR;
         aSize.Width() += nAdd;
     }
@@ -726,14 +726,14 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
     else
     {
         aPoint.A() = X();
-        if ( GetTxtFrm()->IsVertLR() )
+        if ( GetTextFrm()->IsVertLR() )
             aPoint.B() = Y() - rPor.Height() + rPor.GetAscent();
         else
             aPoint.B() = Y() - rPor.GetAscent();
     }
 
     // Adjust x coordinate if we are inside a bidi portion
-    const bool bFrmDir = GetTxtFrm()->IsRightToLeft();
+    const bool bFrmDir = GetTextFrm()->IsRightToLeft();
     const bool bCounterDir = ( !bFrmDir && DIR_RIGHT2LEFT == GetDirection() ) ||
                              (  bFrmDir && DIR_LEFT2RIGHT == GetDirection() );
 
@@ -742,19 +742,19 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
 
     SwRect aRect( aPoint, aSize );
 
-    if ( GetTxtFrm()->IsRightToLeft() )
-        GetTxtFrm()->SwitchLTRtoRTL( aRect );
+    if ( GetTextFrm()->IsRightToLeft() )
+        GetTextFrm()->SwitchLTRtoRTL( aRect );
 
-    if ( GetTxtFrm()->IsVertical() )
-        GetTxtFrm()->SwitchHorizontalToVertical( aRect );
+    if ( GetTextFrm()->IsVertical() )
+        GetTextFrm()->SwitchHorizontalToVertical( aRect );
 
-    if( bInsideBox && rPor.InTxtGrp() )
+    if( bInsideBox && rPor.InTextGrp() )
     {
         const bool bJoinWithPrev =
-            static_cast<const SwTxtPortion&>(rPor).GetJoinBorderWithPrev();
+            static_cast<const SwTextPortion&>(rPor).GetJoinBorderWithPrev();
         const bool bJoinWithNext =
-            static_cast<const SwTxtPortion&>(rPor).GetJoinBorderWithNext();
-        const bool bIsVert = GetTxtFrm()->IsVertical();
+            static_cast<const SwTextPortion&>(rPor).GetJoinBorderWithNext();
+        const bool bIsVert = GetTextFrm()->IsVertical();
         aRect.Top(aRect.Top() + GetFont()->CalcShadowSpace(SvxShadowItemSide::TOP, bIsVert, bJoinWithPrev, bJoinWithNext ));
         aRect.Bottom(aRect.Bottom() - GetFont()->CalcShadowSpace(SvxShadowItemSide::BOTTOM, bIsVert, bJoinWithPrev, bJoinWithNext ));
         aRect.Left(aRect.Left() + GetFont()->CalcShadowSpace(SvxShadowItemSide::LEFT, bIsVert, bJoinWithPrev, bJoinWithNext ));
@@ -788,7 +788,7 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
  * @param bCenter Draw the character centered, otherwise left aligned
  * @param bRotate Rotate the character if character rotation is set
  */
-static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rPor,
+static void lcl_DrawSpecial( const SwTextPaintInfo& rInf, const SwLinePortion& rPor,
                       SwRect& rRect, const Color& rCol, sal_Unicode cChar,
                       sal_uInt8 nOptions )
 {
@@ -796,10 +796,10 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
     bool bRotate = 0 != ( nOptions & DRAW_SPECIAL_OPTIONS_ROTATE );
 
     // rRect is given in absolute coordinates
-    if ( rInf.GetTxtFrm()->IsRightToLeft() )
-        rInf.GetTxtFrm()->SwitchRTLtoLTR( rRect );
-    if ( rInf.GetTxtFrm()->IsVertical() )
-        rInf.GetTxtFrm()->SwitchVerticalToHorizontal( rRect );
+    if ( rInf.GetTextFrm()->IsRightToLeft() )
+        rInf.GetTextFrm()->SwitchRTLtoLTR( rRect );
+    if ( rInf.GetTextFrm()->IsVertical() )
+        rInf.GetTextFrm()->SwitchVerticalToHorizontal( rRect );
 
     const SwFont* pOldFnt = rInf.GetFont();
 
@@ -816,7 +816,7 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
 
     // Some of the current values are set at the font:
     if ( ! bRotate )
-        m_pFnt->SetVertical( 0, rInf.GetTxtFrm()->IsVertical() );
+        m_pFnt->SetVertical( 0, rInf.GetTextFrm()->IsVertical() );
     else
         m_pFnt->SetVertical( pOldFnt->GetOrientation() );
 
@@ -825,10 +825,10 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
     Size aFontSize( 0, SPECIAL_FONT_HEIGHT );
     m_pFnt->SetSize( aFontSize, m_pFnt->GetActual() );
 
-    const_cast<SwTxtPaintInfo&>(rInf).SetFont( m_pFnt );
+    const_cast<SwTextPaintInfo&>(rInf).SetFont( m_pFnt );
 
     // The maximum width depends on the current orientation
-    const sal_uInt16 nDir = m_pFnt->GetOrientation( rInf.GetTxtFrm()->IsVertical() );
+    const sal_uInt16 nDir = m_pFnt->GetOrientation( rInf.GetTextFrm()->IsVertical() );
     SwTwips nMaxWidth;
     if (nDir == 900 || nDir == 2700)
         nMaxWidth = rRect.Height();
@@ -840,7 +840,7 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
 
     // check if char fits into rectangle
     const OUString aTmp( cChar );
-    aFontSize = rInf.GetTxtSize( aTmp ).SvLSize();
+    aFontSize = rInf.GetTextSize( aTmp ).SvLSize();
     while ( aFontSize.Width() > nMaxWidth )
     {
         SwTwips nFactor = ( 100 * aFontSize.Width() ) / nMaxWidth;
@@ -856,7 +856,7 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
 
         m_pFnt->SetSize( aFontSize, nAct );
 
-        aFontSize = rInf.GetTxtSize( aTmp ).SvLSize();
+        aFontSize = rInf.GetTextSize( aTmp ).SvLSize();
 
         if ( aFontSize.Width() >= nOldWidth )
             break;
@@ -887,22 +887,22 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
     }
 
     Point aTmpPos( nX, nY );
-    const_cast<SwTxtPaintInfo&>(rInf).SetPos( aTmpPos );
+    const_cast<SwTextPaintInfo&>(rInf).SetPos( aTmpPos );
     sal_uInt16 nOldWidth = rPor.Width();
     const_cast<SwLinePortion&>(rPor).Width( (sal_uInt16)aFontSize.Width() );
     rInf.DrawText( aTmp, rPor );
     const_cast<SwLinePortion&>(rPor).Width( nOldWidth );
-    const_cast<SwTxtPaintInfo&>(rInf).SetFont( const_cast<SwFont*>(pOldFnt) );
-    const_cast<SwTxtPaintInfo&>(rInf).SetPos( aOldPos );
+    const_cast<SwTextPaintInfo&>(rInf).SetFont( const_cast<SwFont*>(pOldFnt) );
+    const_cast<SwTextPaintInfo&>(rInf).SetPos( aOldPos );
 }
 
-void SwTxtPaintInfo::DrawRect( const SwRect &rRect, bool bNoGraphic,
+void SwTextPaintInfo::DrawRect( const SwRect &rRect, bool bNoGraphic,
                                bool bRetouche ) const
 {
     if ( OnWin() || !bRetouche )
     {
-        if( aTxtFly.IsOn() )
-            const_cast<SwTxtPaintInfo*>(this)->GetTxtFly().
+        if( aTextFly.IsOn() )
+            const_cast<SwTextPaintInfo*>(this)->GetTextFly().
                 DrawFlyRect( m_pOut, rRect, *this, bNoGraphic );
         else if ( bNoGraphic )
             m_pOut->DrawRect( rRect.SVRect() );
@@ -920,7 +920,7 @@ void SwTxtPaintInfo::DrawRect( const SwRect &rRect, bool bNoGraphic,
     }
 }
 
-void SwTxtPaintInfo::DrawTab( const SwLinePortion &rPor ) const
+void SwTextPaintInfo::DrawTab( const SwLinePortion &rPor ) const
 {
     if( OnWin() )
     {
@@ -930,14 +930,14 @@ void SwTxtPaintInfo::DrawTab( const SwLinePortion &rPor ) const
         if ( ! aRect.HasArea() )
             return;
 
-        const sal_Unicode cChar = GetTxtFrm()->IsRightToLeft() ? CHAR_TAB_RTL : CHAR_TAB;
+        const sal_Unicode cChar = GetTextFrm()->IsRightToLeft() ? CHAR_TAB_RTL : CHAR_TAB;
         const sal_uInt8 nOptions = DRAW_SPECIAL_OPTIONS_CENTER | DRAW_SPECIAL_OPTIONS_ROTATE;
 
         lcl_DrawSpecial( *this, rPor, aRect, Color(NON_PRINTING_CHARACTER_COLOR), cChar, nOptions );
     }
 }
 
-void SwTxtPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const
+void SwTextPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const
 {
     if( OnWin() )
     {
@@ -949,7 +949,7 @@ void SwTxtPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const
 
         if( aRect.HasArea() )
         {
-            const sal_Unicode cChar = GetTxtFrm()->IsRightToLeft() ?
+            const sal_Unicode cChar = GetTextFrm()->IsRightToLeft() ?
                                       CHAR_LINEBREAK_RTL : CHAR_LINEBREAK;
             const sal_uInt8 nOptions = 0;
 
@@ -960,7 +960,7 @@ void SwTxtPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const
     }
 }
 
-void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const
+void SwTextPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const
 {
     Size aSize( SPECIAL_FONT_HEIGHT, SPECIAL_FONT_HEIGHT );
     SwRect aRect( static_cast<const SwArrowPortion&>(rPor).GetPos(), aSize );
@@ -982,8 +982,8 @@ void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const
         cChar = CHAR_RIGHT_ARROW;
     }
 
-    if ( GetTxtFrm()->IsVertical() )
-        GetTxtFrm()->SwitchHorizontalToVertical( aRect );
+    if ( GetTextFrm()->IsVertical() )
+        GetTextFrm()->SwitchHorizontalToVertical( aRect );
 
     Color aCol( COL_LIGHTRED );
 
@@ -994,7 +994,7 @@ void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const
     }
 }
 
-void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, bool bScript ) const
+void SwTextPaintInfo::DrawPostIts( const SwLinePortion&, bool bScript ) const
 {
     if( OnWin() && m_pOpt->IsPostIts() )
     {
@@ -1005,7 +1005,7 @@ void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, bool bScript ) const
         const sal_uInt16 nFontHeight = m_pFnt->GetHeight( m_pVsh, *GetOut() );
         const sal_uInt16 nFontAscent = m_pFnt->GetAscent( m_pVsh, *GetOut() );
 
-        switch ( m_pFnt->GetOrientation( GetTxtFrm()->IsVertical() ) )
+        switch ( m_pFnt->GetOrientation( GetTextFrm()->IsVertical() ) )
         {
         case 0 :
             aSize.Width() = nPostItsWidth;
@@ -1030,18 +1030,18 @@ void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, bool bScript ) const
 
         SwRect aTmpRect( aTmp, aSize );
 
-        if ( GetTxtFrm()->IsRightToLeft() )
-            GetTxtFrm()->SwitchLTRtoRTL( aTmpRect );
+        if ( GetTextFrm()->IsRightToLeft() )
+            GetTextFrm()->SwitchLTRtoRTL( aTmpRect );
 
-        if ( GetTxtFrm()->IsVertical() )
-            GetTxtFrm()->SwitchHorizontalToVertical( aTmpRect );
+        if ( GetTextFrm()->IsVertical() )
+            GetTextFrm()->SwitchHorizontalToVertical( aTmpRect );
 
         const Rectangle aRect( aTmpRect.SVRect() );
         SwViewOption::PaintPostIts( const_cast<OutputDevice*>(GetOut()), aRect, bScript );
     }
 }
 
-void SwTxtPaintInfo::DrawCheckBox(const SwFieldFormCheckboxPortion &rPor, bool bChecked) const
+void SwTextPaintInfo::DrawCheckBox(const SwFieldFormCheckboxPortion &rPor, bool bChecked) const
 {
     SwRect aIntersect;
     CalcRect( rPor, &aIntersect, 0 );
@@ -1072,9 +1072,9 @@ void SwTxtPaintInfo::DrawCheckBox(const SwFieldFormCheckboxPortion &rPor, bool b
     }
 }
 
-void SwTxtPaintInfo::DrawBackground( const SwLinePortion &rPor ) const
+void SwTextPaintInfo::DrawBackground( const SwLinePortion &rPor ) const
 {
-    OSL_ENSURE( OnWin(), "SwTxtPaintInfo::DrawBackground: printer pollution ?" );
+    OSL_ENSURE( OnWin(), "SwTextPaintInfo::DrawBackground: printer pollution ?" );
 
     SwRect aIntersect;
     CalcRect( rPor, 0, &aIntersect, true );
@@ -1100,14 +1100,14 @@ void SwTxtPaintInfo::DrawBackground( const SwLinePortion &rPor ) const
     }
 }
 
-void SwTxtPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
+void SwTextPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
 {
     {
         SwRect aIntersect;
         CalcRect( rPor, &aIntersect, 0, true );
         if(aIntersect.HasArea())
         {
-            SwTxtNode *pNd = m_pFrm->GetTxtNode();
+            SwTextNode *pNd = m_pFrm->GetTextNode();
             const ::sw::mark::IMark* pFieldmark = NULL;
             if(pNd)
             {
@@ -1119,7 +1119,7 @@ void SwTxtPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
                     pFieldmark=doc->getIDocumentMarkAccess()->getFieldmarkFor(aPosition);
                 }
             }
-            bool bIsStartMark=(1==GetLen() && CH_TXT_ATR_FIELDSTART==GetTxt()[GetIdx()]);
+            bool bIsStartMark=(1==GetLen() && CH_TXT_ATR_FIELDSTART==GetText()[GetIdx()]);
             if(pFieldmark) {
                 OSL_TRACE("Found Fieldmark");
                 SAL_INFO("sw.core", pFieldmark->ToString() << "\n");
@@ -1173,19 +1173,19 @@ void SwTxtPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
     }
 }
 
-void SwTxtPaintInfo::DrawBorder( const SwLinePortion &rPor ) const
+void SwTextPaintInfo::DrawBorder( const SwLinePortion &rPor ) const
 {
     SwRect aDrawArea;
     CalcRect( rPor, &aDrawArea );
     if ( aDrawArea.HasArea() )
     {
         PaintCharacterBorder(
-            *m_pFnt, aDrawArea, GetTxtFrm()->IsVertical(),
+            *m_pFnt, aDrawArea, GetTextFrm()->IsVertical(),
             rPor.GetJoinBorderWithPrev(), rPor.GetJoinBorderWithNext());
     }
 }
 
-void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
+void SwTextPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
                                   const sal_uInt16 nWhich ) const
 {
     if( OnWin() && !IsMulti() )
@@ -1207,7 +1207,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
                  && !GetOpt().IsReadonly()
                  && SwViewOption::IsFieldShadings()
                  && ( POR_NUMBER != nWhich
-                      || m_pFrm->GetTxtNode()->HasMarkedLabel())) // #i27615#
+                      || m_pFrm->GetTextNode()->HasMarkedLabel())) // #i27615#
             {
                 bDraw = true;
             }
@@ -1225,7 +1225,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
         case POR_BLANK:     if ( GetOpt().IsHardBlank())bDraw = true; break;
         default:
             {
-                OSL_ENSURE( false, "SwTxtPaintInfo::DrawViewOpt: don't know how to draw this" );
+                OSL_ENSURE( false, "SwTextPaintInfo::DrawViewOpt: don't know how to draw this" );
                 break;
             }
         }
@@ -1234,7 +1234,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
     }
 }
 
-void SwTxtPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const
+void SwTextPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const
 {
     OSL_ENSURE( pNoteURL, "NotifyURL: pNoteURL gone with the wind!" );
 
@@ -1243,13 +1243,13 @@ void SwTxtPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const
 
     if( aIntersect.HasArea() )
     {
-        SwTxtNode *pNd = const_cast<SwTxtNode*>(GetTxtFrm()->GetTxtNode());
-        SwTxtAttr *const pAttr =
-            pNd->GetTxtAttrAt(GetIdx(), RES_TXTATR_INETFMT);
+        SwTextNode *pNd = const_cast<SwTextNode*>(GetTextFrm()->GetTextNode());
+        SwTextAttr *const pAttr =
+            pNd->GetTextAttrAt(GetIdx(), RES_TXTATR_INETFMT);
         if( pAttr )
         {
-            const SwFmtINetFmt& rFmt = pAttr->GetINetFmt();
-            pNoteURL->InsertURLNote( rFmt.GetValue(), rFmt.GetTargetFrame(),
+            const SwFormatINetFormat& rFormat = pAttr->GetINetFormat();
+            pNoteURL->InsertURLNote( rFormat.GetValue(), rFormat.GetTargetFrame(),
                 aIntersect );
         }
     }
@@ -1284,16 +1284,16 @@ static void lcl_InitHyphValues( PropertyValues &rVals,
     }
 }
 
-const PropertyValues & SwTxtFormatInfo::GetHyphValues() const
+const PropertyValues & SwTextFormatInfo::GetHyphValues() const
 {
     OSL_ENSURE( 2 == aHyphVals.getLength(),
             "hyphenation values not yet initialized" );
     return aHyphVals;
 }
 
-bool SwTxtFormatInfo::InitHyph( const bool bAutoHyphen )
+bool SwTextFormatInfo::InitHyph( const bool bAutoHyphen )
 {
-    const SwAttrSet& rAttrSet = GetTxtFrm()->GetTxtNode()->GetSwAttrSet();
+    const SwAttrSet& rAttrSet = GetTextFrm()->GetTextNode()->GetSwAttrSet();
     SetHanging( rAttrSet.GetHangingPunctuation().GetValue() );
     SetScriptSpace( rAttrSet.GetScriptSpace().GetValue() );
     SetForbiddenChars( rAttrSet.GetForbiddenRule().GetValue() );
@@ -1309,10 +1309,10 @@ bool SwTxtFormatInfo::InitHyph( const bool bAutoHyphen )
     return bAuto;
 }
 
-void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const bool bNewInterHyph,
+void SwTextFormatInfo::CtorInitTextFormatInfo( SwTextFrm *pNewFrm, const bool bNewInterHyph,
                                 const bool bNewQuick, const bool bTst )
 {
-    CtorInitTxtPaintInfo( pNewFrm, SwRect() );
+    CtorInitTextPaintInfo( pNewFrm, SwRect() );
 
     bQuick = bNewQuick;
     bInterHyph = bNewInterHyph;
@@ -1347,7 +1347,7 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const bool bNewI
         // set digit mode to what will be used later to get same results
         SwDigitModeModifier const m(*m_pRef, LANGUAGE_NONE /*dummy*/);
         assert(m_pRef->GetDigitLanguage() != LANGUAGE_NONE);
-        SetCachedVclData(m_pRef->CreateTextLayoutCache(*m_pTxt));
+        SetCachedVclData(m_pRef->CreateTextLayoutCache(*m_pText));
     }
 
     Init();
@@ -1357,10 +1357,10 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const bool bNewI
  * If the Hyphenator returns ERROR or the language is set to NOLANGUAGE
  * we do not hyphenate.
  * Else, we always hyphenate if we do interactive hyphenation.
- * If we do not do interactive hyphenation, we only hyphenate if ParaFmt is
+ * If we do not do interactive hyphenation, we only hyphenate if ParaFormat is
  * set to automatic hyphenation.
  */
-bool SwTxtFormatInfo::IsHyphenate() const
+bool SwTextFormatInfo::IsHyphenate() const
 {
     if( !bInterHyph && !bAutoHyph )
         return false;
@@ -1379,27 +1379,27 @@ bool SwTxtFormatInfo::IsHyphenate() const
     return xHyph->hasLocale( g_pBreakIt->GetLocale(eTmp) );
 }
 
-const SwFmtDrop *SwTxtFormatInfo::GetDropFmt() const
+const SwFormatDrop *SwTextFormatInfo::GetDropFormat() const
 {
-    const SwFmtDrop *pDrop = &GetTxtFrm()->GetTxtNode()->GetSwAttrSet().GetDrop();
+    const SwFormatDrop *pDrop = &GetTextFrm()->GetTextNode()->GetSwAttrSet().GetDrop();
     if( 1 >= pDrop->GetLines() ||
         ( !pDrop->GetChars() && !pDrop->GetWholeWord() ) )
         pDrop = 0;
     return pDrop;
 }
 
-void SwTxtFormatInfo::Init()
+void SwTextFormatInfo::Init()
 {
     // Not initialized: pRest, nLeft, nRight, nFirst, nRealWidth
     X(0);
-    bArrowDone = bFull = bFtnDone = bErgoDone = bNumDone = bNoEndHyph =
+    bArrowDone = bFull = bFootnoteDone = bErgoDone = bNumDone = bNoEndHyph =
         bNoMidHyph = bStop = bNewLine = bUnderflow = bTabOverflow = false;
 
     // generally we do not allow number portions in follows, except...
-    if ( GetTxtFrm()->IsFollow() )
+    if ( GetTextFrm()->IsFollow() )
     {
-        const SwTxtFrm* pMaster = GetTxtFrm()->FindMaster();
-        OSL_ENSURE(pMaster, "pTxtFrm without Master");
+        const SwTextFrm* pMaster = GetTextFrm()->FindMaster();
+        OSL_ENSURE(pMaster, "pTextFrm without Master");
         const SwLinePortion* pTmpPara = pMaster ? pMaster->GetPara() : NULL;
 
         // there is a master for this follow and the master does not have
@@ -1411,7 +1411,7 @@ void SwTxtFormatInfo::Init()
     pRoot = 0;
     pLast = 0;
     pFly = 0;
-    pLastFld = 0;
+    pLastField = 0;
     pLastTab = 0;
     pUnderflow = 0;
     cTabDecimal = 0;
@@ -1421,7 +1421,7 @@ void SwTxtFormatInfo::Init()
     nUnderScorePos = COMPLETE_STRING;
     cHookChar = 0;
     SetIdx(0);
-    SetLen( GetTxt().getLength() );
+    SetLen( GetText().getLength() );
     SetPaintOfst(0);
 }
 
@@ -1433,14 +1433,14 @@ void SwTxtFormatInfo::Init()
  * the line width is the rest width from the surrounding line
  * and the bMulti and bFirstMulti-flag has to be set correctly.
  */
-SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
-    SwLineLayout& rLay, SwTwips nActWidth ) : SwTxtPaintInfo( rInf ),
+SwTextFormatInfo::SwTextFormatInfo( const SwTextFormatInfo& rInf,
+    SwLineLayout& rLay, SwTwips nActWidth ) : SwTextPaintInfo( rInf ),
     bTabOverflow( false )
 {
     pRoot = &rLay;
     pLast = &rLay;
     pFly = NULL;
-    pLastFld = NULL;
+    pLastField = NULL;
     pUnderflow = NULL;
     pRest = NULL;
     pLastTab = NULL;
@@ -1461,7 +1461,7 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
     nMinTrailing = 0;
     nMinWordLength = 0;
     bFull = false;
-    bFtnDone = true;
+    bFootnoteDone = true;
     bErgoDone = true;
     bNumDone = true;
     bArrowDone = true;
@@ -1486,12 +1486,12 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
     SetFirstMulti( rInf.IsFirstMulti() );
 }
 
-bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
+bool SwTextFormatInfo::_CheckFootnotePortion( SwLineLayout* pCurr )
 {
     const sal_uInt16 nHeight = pCurr->GetRealHeight();
     for( SwLinePortion *pPor = pCurr->GetPortion(); pPor; pPor = pPor->GetPortion() )
     {
-        if( pPor->IsFtnPortion() && nHeight > static_cast<SwFtnPortion*>(pPor)->Orig() )
+        if( pPor->IsFootnotePortion() && nHeight > static_cast<SwFootnotePortion*>(pPor)->Orig() )
         {
             SetLineHeight( nHeight );
             SetLineNetHeight( pCurr->Height() );
@@ -1501,7 +1501,7 @@ bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
     return false;
 }
 
-sal_Int32 SwTxtFormatInfo::ScanPortionEnd( const sal_Int32 nStart,
+sal_Int32 SwTextFormatInfo::ScanPortionEnd( const sal_Int32 nStart,
                                             const sal_Int32 nEnd )
 {
     cHookChar = 0;
@@ -1515,7 +1515,7 @@ sal_Int32 SwTxtFormatInfo::ScanPortionEnd( const sal_Int32 nStart,
     const sal_Unicode cThousandSep2 = ',' == cTabDec ? '.' : '\'';
 
     bool bNumFound = false;
-    const bool bTabCompat = GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
+    const bool bTabCompat = GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
 
     for( ; i < nEnd; ++i )
     {
@@ -1581,7 +1581,7 @@ sal_Int32 SwTxtFormatInfo::ScanPortionEnd( const sal_Int32 nStart,
 
     // Check if character *behind* the portion has
     // to become the hook:
-    if ( i == nEnd && i < GetTxt().getLength() && bNumFound )
+    if ( i == nEnd && i < GetText().getLength() && bNumFound )
     {
         const sal_Unicode cPos = GetChar( i );
         if ( cPos != cTabDec && cPos != cThousandSep && cPos !=cThousandSep2 && ( 0x2F >= cPos || cPos >= 0x3A ) )
@@ -1594,7 +1594,7 @@ sal_Int32 SwTxtFormatInfo::ScanPortionEnd( const sal_Int32 nStart,
     return i;
 }
 
-bool SwTxtFormatInfo::LastKernPortion()
+bool SwTextFormatInfo::LastKernPortion()
 {
     if( GetLast() )
     {
@@ -1622,13 +1622,13 @@ bool SwTxtFormatInfo::LastKernPortion()
     return false;
 }
 
-SwTxtSlot::SwTxtSlot(
-    const SwTxtSizeInfo *pNew,
+SwTextSlot::SwTextSlot(
+    const SwTextSizeInfo *pNew,
     const SwLinePortion *pPor,
-    bool bTxtLen,
+    bool bTextLen,
     bool bExgLists,
     OUString const & rCh )
-    : pOldTxt(0)
+    : pOldText(0)
     , pOldSmartTagList(0)
     , pOldGrammarCheckList(0)
     , pTempList(0)
@@ -1638,94 +1638,94 @@ SwTxtSlot::SwTxtSlot(
 {
     if( rCh.isEmpty() )
     {
-        bOn = pPor->GetExpTxt( *pNew, aTxt );
+        bOn = pPor->GetExpText( *pNew, aText );
     }
     else
     {
-        aTxt = rCh;
+        aText = rCh;
         bOn = true;
     }
 
     // The text is replaced ...
     if( bOn )
     {
-        pInf = const_cast<SwTxtSizeInfo*>(pNew);
+        pInf = const_cast<SwTextSizeInfo*>(pNew);
         nIdx = pInf->GetIdx();
         nLen = pInf->GetLen();
-        pOldTxt = &(pInf->GetTxt());
+        pOldText = &(pInf->GetText());
         m_pOldCachedVclData = pInf->GetCachedVclData();
-        pInf->SetTxt( aTxt );
+        pInf->SetText( aText );
         pInf->SetIdx( 0 );
-        pInf->SetLen( bTxtLen ? pInf->GetTxt().getLength() : pPor->GetLen() );
+        pInf->SetLen( bTextLen ? pInf->GetText().getLength() : pPor->GetLen() );
         pInf->SetCachedVclData(nullptr);
 
         // ST2
         if ( bExgLists )
         {
-            pOldSmartTagList = static_cast<SwTxtPaintInfo*>(pInf)->GetSmartTags();
+            pOldSmartTagList = static_cast<SwTextPaintInfo*>(pInf)->GetSmartTags();
             if ( pOldSmartTagList )
             {
                 const sal_uInt16 nPos = pOldSmartTagList->GetWrongPos(nIdx);
                 const sal_Int32 nListPos = pOldSmartTagList->Pos(nPos);
                 if( nListPos == nIdx )
-                    static_cast<SwTxtPaintInfo*>(pInf)->SetSmartTags( pOldSmartTagList->SubList( nPos ) );
-                else if( !pTempList && nPos < pOldSmartTagList->Count() && nListPos < nIdx && !aTxt.isEmpty() )
+                    static_cast<SwTextPaintInfo*>(pInf)->SetSmartTags( pOldSmartTagList->SubList( nPos ) );
+                else if( !pTempList && nPos < pOldSmartTagList->Count() && nListPos < nIdx && !aText.isEmpty() )
                 {
                     pTempList = new SwWrongList( WRONGLIST_SMARTTAG );
-                    pTempList->Insert( OUString(), 0, 0, aTxt.getLength(), 0 );
-                    static_cast<SwTxtPaintInfo*>(pInf)->SetSmartTags( pTempList );
+                    pTempList->Insert( OUString(), 0, 0, aText.getLength(), 0 );
+                    static_cast<SwTextPaintInfo*>(pInf)->SetSmartTags( pTempList );
                 }
                 else
-                    static_cast<SwTxtPaintInfo*>(pInf)->SetSmartTags( 0);
+                    static_cast<SwTextPaintInfo*>(pInf)->SetSmartTags( 0);
             }
-            pOldGrammarCheckList = static_cast<SwTxtPaintInfo*>(pInf)->GetGrammarCheckList();
+            pOldGrammarCheckList = static_cast<SwTextPaintInfo*>(pInf)->GetGrammarCheckList();
             if ( pOldGrammarCheckList )
             {
                 const sal_uInt16 nPos = pOldGrammarCheckList->GetWrongPos(nIdx);
                 const sal_Int32 nListPos = pOldGrammarCheckList->Pos(nPos);
                 if( nListPos == nIdx )
-                    static_cast<SwTxtPaintInfo*>(pInf)->SetGrammarCheckList( pOldGrammarCheckList->SubList( nPos ) );
-                else if( !pTempList && nPos < pOldGrammarCheckList->Count() && nListPos < nIdx && !aTxt.isEmpty() )
+                    static_cast<SwTextPaintInfo*>(pInf)->SetGrammarCheckList( pOldGrammarCheckList->SubList( nPos ) );
+                else if( !pTempList && nPos < pOldGrammarCheckList->Count() && nListPos < nIdx && !aText.isEmpty() )
                 {
                     pTempList = new SwWrongList( WRONGLIST_GRAMMAR );
-                    pTempList->Insert( OUString(), 0, 0, aTxt.getLength(), 0 );
-                    static_cast<SwTxtPaintInfo*>(pInf)->SetGrammarCheckList( pTempList );
+                    pTempList->Insert( OUString(), 0, 0, aText.getLength(), 0 );
+                    static_cast<SwTextPaintInfo*>(pInf)->SetGrammarCheckList( pTempList );
                 }
                 else
-                    static_cast<SwTxtPaintInfo*>(pInf)->SetGrammarCheckList( 0);
+                    static_cast<SwTextPaintInfo*>(pInf)->SetGrammarCheckList( 0);
             }
         }
     }
 }
 
-SwTxtSlot::~SwTxtSlot()
+SwTextSlot::~SwTextSlot()
 {
     if( bOn )
     {
         pInf->SetCachedVclData(m_pOldCachedVclData);
-        pInf->SetTxt( *pOldTxt );
+        pInf->SetText( *pOldText );
         pInf->SetIdx( nIdx );
         pInf->SetLen( nLen );
 
         // ST2
         // Restore old smart tag list
         if ( pOldSmartTagList )
-            static_cast<SwTxtPaintInfo*>(pInf)->SetSmartTags( pOldSmartTagList );
+            static_cast<SwTextPaintInfo*>(pInf)->SetSmartTags( pOldSmartTagList );
         if ( pOldGrammarCheckList )
-            static_cast<SwTxtPaintInfo*>(pInf)->SetGrammarCheckList( pOldGrammarCheckList );
+            static_cast<SwTextPaintInfo*>(pInf)->SetGrammarCheckList( pOldGrammarCheckList );
         delete pTempList;
     }
 }
 
-SwFontSave::SwFontSave(const SwTxtSizeInfo &rInf, SwFont *pNew,
+SwFontSave::SwFontSave(const SwTextSizeInfo &rInf, SwFont *pNew,
         SwAttrIter* pItr)
     : pInf(NULL)
-    , pFnt(pNew ? const_cast<SwTxtSizeInfo&>(rInf).GetFont() : NULL)
+    , pFnt(pNew ? const_cast<SwTextSizeInfo&>(rInf).GetFont() : NULL)
     , pIter(NULL)
 {
     if( pFnt )
     {
-        pInf = &const_cast<SwTxtSizeInfo&>(rInf);
+        pInf = &const_cast<SwTextSizeInfo&>(rInf);
         // In these cases we temporarily switch to the new font:
         // 1. the fonts have a different magic number
         // 2. they have different script types
@@ -1768,7 +1768,7 @@ SwFontSave::~SwFontSave()
     }
 }
 
-bool SwTxtFormatInfo::ChgHyph( const bool bNew )
+bool SwTextFormatInfo::ChgHyph( const bool bNew )
 {
     const bool bOld = bAutoHyph;
     if( bAutoHyph != bNew )
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 192531027059..a1a30cbd46af 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -40,15 +40,15 @@ class SvxLineSpacingItem;
 class SvxTabStop;
 class SvxTabStopItem;
 class SwAttrSet;
-class SwFldPortion;
+class SwFieldPortion;
 class SwFlyPortion;
-class SwFmtDrop;
+class SwFormatDrop;
 class SwLineLayout;
 class SwLinePortion;
 class SwParaPortion;
 class SwTabPortion;
-class SwTxtFrm;
-class SwTxtSizeInfo;
+class SwTextFrm;
+class SwTextSizeInfo;
 class SwViewOption;
 class SwViewShell;
 class SwAttrIter;
@@ -71,7 +71,7 @@ class SwWrongList;
 // Respects the attribute LineSpace when calculating the Height/Ascent
 class SwLineInfo
 {
-    friend class SwTxtIter;
+    friend class SwTextIter;
 
     SvxTabStopItem* pRuler;
     const SvxLineSpacingItem *pSpace;
@@ -81,7 +81,7 @@ class SwLineInfo
     long nListTabStopPosition;
 
     void CtorInitLineInfo( const SwAttrSet& rAttrSet,
-                           const SwTxtNode& rTxtNode );
+                           const SwTextNode& rTextNode );
 
     SwLineInfo();
     ~SwLineInfo();
@@ -116,39 +116,39 @@ public:
     friend SvStream & WriteSwLineInfo( SvStream &rOS, const SwLineInfo &rInf );
 };
 
-class SwTxtInfo
+class SwTextInfo
 {
     // Implementation in txthyph.cxx
-    friend void SetParaPortion( SwTxtInfo *pInf, SwParaPortion *pRoot );
+    friend void SetParaPortion( SwTextInfo *pInf, SwParaPortion *pRoot );
     SwParaPortion *m_pPara;
-    sal_Int32 m_nTxtStart; // TxtOfst for Follows
+    sal_Int32 m_nTextStart; // TextOfst for Follows
 
 protected:
-    SwTxtInfo()
+    SwTextInfo()
         : m_pPara(0)
-        , m_nTxtStart(0)
+        , m_nTextStart(0)
     {}
 
 public:
-    void CtorInitTxtInfo( SwTxtFrm *pFrm );
-    SwTxtInfo( const SwTxtInfo &rInf );
-    SwTxtInfo( SwTxtFrm *pFrm ) { CtorInitTxtInfo( pFrm ); }
+    void CtorInitTextInfo( SwTextFrm *pFrm );
+    SwTextInfo( const SwTextInfo &rInf );
+    SwTextInfo( SwTextFrm *pFrm ) { CtorInitTextInfo( pFrm ); }
     SwParaPortion *GetParaPortion() { return m_pPara; }
     const SwParaPortion *GetParaPortion() const { return m_pPara; }
-    sal_Int32 GetTxtStart() const { return m_nTxtStart; }
+    sal_Int32 GetTextStart() const { return m_nTextStart; }
 
-    friend SvStream & WriteSwTxtInfo( SvStream &rOS, const SwTxtInfo &rInf );
+    friend SvStream & WriteSwTextInfo( SvStream &rOS, const SwTextInfo &rInf );
 };
 
-class SwTxtSizeInfo : public SwTxtInfo
+class SwTextSizeInfo : public SwTextInfo
 {
 private:
-    typedef ::std::map< sal_uIntPtr, sal_uInt16 > SwTxtPortionMap;
+    typedef ::std::map< sal_uIntPtr, sal_uInt16 > SwTextPortionMap;
 
 protected:
     // during formatting, a small database is built, mapping portion pointers
     // to their maximum size (used for kana compression)
-    SwTxtPortionMap m_aMaxWidth;
+    SwTextPortionMap m_aMaxWidth;
     // for each line, an array of compression values is calculated
     // this array is passed over to the info structure
     std::deque<sal_uInt16>* m_pKanaComp;
@@ -159,24 +159,24 @@ protected:
     VclPtr<OutputDevice> m_pOut;
     VclPtr<OutputDevice> m_pRef;
 
-    // performance hack - this is only used by SwTxtFormatInfo but
+    // performance hack - this is only used by SwTextFormatInfo but
     // because it's not even possible to dynamic_cast these things
     // currently it has to be stored here
     std::shared_ptr<vcl::TextLayoutCache> m_pCachedVclData;
 
     SwFont *m_pFnt;
     SwUnderlineFont *m_pUnderFnt; // Font for underlining
-    SwTxtFrm *m_pFrm;
+    SwTextFrm *m_pFrm;
     const SwViewOption *m_pOpt;
-    const OUString *m_pTxt;
+    const OUString *m_pText;
     sal_Int32 m_nIdx, m_nLen;
     sal_uInt16 m_nKanaIdx;
     bool m_bOnWin     : 1;
     bool m_bNotEOL    : 1;
     bool m_bURLNotify : 1;
     bool m_bStopUnderflow : 1; // Underflow was stopped e.g. by a FlyPortion
-    bool m_bFtnInside : 1;     // the current line contains a footnote
-    bool m_bOtherThanFtnInside : 1; // the current line contains another portion than a footnote portion.
+    bool m_bFootnoteInside : 1;     // the current line contains a footnote
+    bool m_bOtherThanFootnoteInside : 1; // the current line contains another portion than a footnote portion.
                                     // needed for checking keep together of footnote portion with previous portion
     bool m_bMulti : 1;        // inside a multiportion
     bool m_bFirstMulti : 1;   // this flag is used for two purposes:
@@ -191,10 +191,10 @@ protected:
     sal_uInt8 m_nDirection : 2; // writing direction: 0/90/180/270 degree
 
 protected:
-    void CtorInitTxtSizeInfo( SwTxtFrm *pFrm, SwFont *pFnt = 0,
+    void CtorInitTextSizeInfo( SwTextFrm *pFrm, SwFont *pFnt = 0,
                    const sal_Int32 nIdx = 0,
                    const sal_Int32 nLen = COMPLETE_STRING );
-    SwTxtSizeInfo()
+    SwTextSizeInfo()
         : m_pKanaComp(0)
         , m_pVsh(0)
         , m_pOut(0)
@@ -203,7 +203,7 @@ protected:
         , m_pUnderFnt(0)
         , m_pFrm(0)
         , m_pOpt(0)
-        , m_pTxt(0)
+        , m_pText(0)
         , m_nIdx(0)
         , m_nLen(0)
         , m_nKanaIdx(0)
@@ -211,8 +211,8 @@ protected:
         , m_bNotEOL   (false)
         , m_bURLNotify(false)
         , m_bStopUnderflow(false)
-        , m_bFtnInside(false)
-        , m_bOtherThanFtnInside(false)
+        , m_bFootnoteInside(false)
+        , m_bOtherThanFootnoteInside(false)
         , m_bMulti(false)
         , m_bFirstMulti(false)
         , m_bRuby(false)
@@ -223,17 +223,17 @@ protected:
         , m_nDirection(0)
         {}
 public:
-    SwTxtSizeInfo( const SwTxtSizeInfo &rInf );
-    SwTxtSizeInfo( const SwTxtSizeInfo &rInf, const OUString* pTxt,
+    SwTextSizeInfo( const SwTextSizeInfo &rInf );
+    SwTextSizeInfo( const SwTextSizeInfo &rInf, const OUString* pText,
                    const sal_Int32 nIdx = 0,
                    const sal_Int32 nLen = COMPLETE_STRING );
 
-    SwTxtSizeInfo( SwTxtFrm *pTxtFrm, SwFont *pTxtFnt = 0,
+    SwTextSizeInfo( SwTextFrm *pTextFrm, SwFont *pTextFnt = 0,
                    const sal_Int32 nIndex = 0,
                    const sal_Int32 nLength = COMPLETE_STRING )
         : m_bOnWin(false)
     {
-        CtorInitTxtSizeInfo( pTxtFrm, pTxtFnt, nIndex, nLength );
+        CtorInitTextSizeInfo( pTextFrm, pTextFnt, nIndex, nLength );
     }
 
     // GetMultiAttr returns the text attribute of the multiportion,
@@ -249,10 +249,10 @@ public:
     inline void SetURLNotify( const bool bNew ) { m_bURLNotify = bNew; }
     inline bool StopUnderflow() const { return m_bStopUnderflow; }
     inline void SetStopUnderflow( const bool bNew ) { m_bStopUnderflow = bNew; }
-    inline bool IsFtnInside() const { return m_bFtnInside; }
-    inline void SetFtnInside( const bool bNew ) { m_bFtnInside = bNew; }
-    inline bool IsOtherThanFtnInside() const { return m_bOtherThanFtnInside; }
-    inline void SetOtherThanFtnInside( const bool bNew ) { m_bOtherThanFtnInside = bNew; }
+    inline bool IsFootnoteInside() const { return m_bFootnoteInside; }
+    inline void SetFootnoteInside( const bool bNew ) { m_bFootnoteInside = bNew; }
+    inline bool IsOtherThanFootnoteInside() const { return m_bOtherThanFootnoteInside; }
+    inline void SetOtherThanFootnoteInside( const bool bNew ) { m_bOtherThanFootnoteInside = bNew; }
     inline bool IsMulti() const { return m_bMulti; }
     inline void SetMulti( const bool bNew ) { m_bMulti = bNew; }
     inline bool IsFirstMulti() const { return m_bFirstMulti; }
@@ -289,29 +289,29 @@ public:
     inline SwUnderlineFont* GetUnderFnt() const { return m_pUnderFnt; }
 
     inline const  SwViewOption &GetOpt() const { return *m_pOpt; }
-    inline const OUString &GetTxt() const { return *m_pTxt; }
+    inline const OUString &GetText() const { return *m_pText; }
     inline sal_Unicode GetChar( const sal_Int32 nPos ) const
-    { if (m_pTxt && nPos < m_pTxt->getLength()) return (*m_pTxt)[ nPos ]; return 0; }
+    { if (m_pText && nPos < m_pText->getLength()) return (*m_pText)[ nPos ]; return 0; }
 
-    sal_uInt16      GetTxtHeight() const;
+    sal_uInt16      GetTextHeight() const;
 
-    SwPosSize GetTxtSize( OutputDevice* pOut, const SwScriptInfo* pSI,
-                          const OUString& rTxt, const sal_Int32 nIdx,
+    SwPosSize GetTextSize( OutputDevice* pOut, const SwScriptInfo* pSI,
+                          const OUString& rText, const sal_Int32 nIdx,
                           const sal_Int32 nLen, const sal_uInt16 nComp ) const;
-    SwPosSize GetTxtSize() const;
-    void GetTxtSize( const SwScriptInfo* pSI, const sal_Int32 nIdx,
+    SwPosSize GetTextSize() const;
+    void GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nIdx,
                       const sal_Int32 nLen, const sal_uInt16 nComp,
                       sal_uInt16& nMinSize, sal_uInt16& nMaxSizeDiff,
                       vcl::TextLayoutCache const* = nullptr) const;
-    inline SwPosSize GetTxtSize( const SwScriptInfo* pSI, const sal_Int32 nIdx,
+    inline SwPosSize GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nIdx,
                                  const sal_Int32 nLen, const sal_uInt16 nComp ) const;
-    inline SwPosSize GetTxtSize( const OUString &rTxt ) const;
+    inline SwPosSize GetTextSize( const OUString &rText ) const;
 
-    sal_Int32 GetTxtBreak( const long nLineWidth,
+    sal_Int32 GetTextBreak( const long nLineWidth,
                                            const sal_Int32 nMaxLen,
                                            const sal_uInt16 nComp,
                            vcl::TextLayoutCache const* = nullptr) const;
-    sal_Int32 GetTxtBreak( const long nLineWidth,
+    sal_Int32 GetTextBreak( const long nLineWidth,
                                            const sal_Int32 nMaxLen,
                                            const sal_uInt16 nComp,
                                            sal_Int32& rExtraCharPos,
@@ -323,9 +323,9 @@ public:
     inline void SetIdx( const sal_Int32 nNew ) { m_nIdx = nNew; }
     inline sal_Int32 GetLen() const { return m_nLen; }
     inline void SetLen( const sal_Int32 nNew ) { m_nLen = nNew; }
-    inline void SetTxt( const OUString &rNew ){ m_pTxt = &rNew; }
+    inline void SetText( const OUString &rNew ){ m_pText = &rNew; }
 
-    friend SvStream & WriteSwTxtSizeInfo( SvStream &rOS, const SwTxtSizeInfo &rInf );
+    friend SvStream & WriteSwTextSizeInfo( SvStream &rOS, const SwTextSizeInfo &rInf );
 
     // No Bullets for the symbol font!
     inline bool IsNoSymbol() const
@@ -334,12 +334,12 @@ public:
     void NoteAnimation() const;
 
     // Home is where Your heart is...
-    inline SwTxtFrm *GetTxtFrm() { return m_pFrm; }
-    inline const SwTxtFrm *GetTxtFrm() const { return m_pFrm; }
+    inline SwTextFrm *GetTextFrm() { return m_pFrm; }
+    inline const SwTextFrm *GetTextFrm() const { return m_pFrm; }
 
     inline bool HasHint( sal_Int32 nPos ) const
-        { return _HasHint( m_pFrm->GetTxtNode(), nPos ); }
-    static bool _HasHint( const SwTxtNode* pTxtNode, sal_Int32 nPos );
+        { return _HasHint( m_pFrm->GetTextNode(), nPos ); }
+    static bool _HasHint( const SwTextNode* pTextNode, sal_Int32 nPos );
 
     // If Kana Compression is enabled, a minimum and maximum portion width
     // is calculated. We format lines with minimal size and share remaining
@@ -352,7 +352,7 @@ public:
     };
     inline sal_uInt16 GetMaxWidthDiff( const void *nKey )
     {
-        SwTxtPortionMap::iterator it = m_aMaxWidth.find( reinterpret_cast<sal_uIntPtr>(nKey) );
+        SwTextPortionMap::iterator it = m_aMaxWidth.find( reinterpret_cast<sal_uIntPtr>(nKey) );
 
         if( it != m_aMaxWidth.end() )
             return it->second;
@@ -394,7 +394,7 @@ public:
 #endif
 };
 
-class SwTxtPaintInfo : public SwTxtSizeInfo
+class SwTextPaintInfo : public SwTextSizeInfo
 {
     const SwWrongList *pWrongList;
     const SwWrongList *pGrammarCheckList;
@@ -402,7 +402,7 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
     std::vector<long>* pSpaceAdd;
     const SvxBrushItem *pBrushItem; // For the background
     SwRect      aItemRect;          // Also for the background
-    SwTxtFly    aTxtFly;    // Calculate the FlyFrm
+    SwTextFly    aTextFly;    // Calculate the FlyFrm
     Point       aPos;       // Paint position
     SwRect      aPaintRect; // Original paint rect (from Layout paint)
 
@@ -413,11 +413,11 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
                    const bool bSmartTag = false,
                    const bool bGrammarCheck = false );
 
-    SwTxtPaintInfo &operator=(const SwTxtPaintInfo&) SAL_DELETED_FUNCTION;
+    SwTextPaintInfo &operator=(const SwTextPaintInfo&) SAL_DELETED_FUNCTION;
     void _NotifyURL( const SwLinePortion &rPor ) const;
 
 protected:
-    SwTxtPaintInfo()
+    SwTextPaintInfo()
         : pWrongList(0)
         , pGrammarCheckList(0)
         , pSmartTags(0)
@@ -431,26 +431,26 @@ protected:
         {}
 
 public:
-    SwTxtPaintInfo( const SwTxtPaintInfo &rInf );
-    SwTxtPaintInfo( const SwTxtPaintInfo &rInf, const OUString* pTxt );
+    SwTextPaintInfo( const SwTextPaintInfo &rInf );
+    SwTextPaintInfo( const SwTextPaintInfo &rInf, const OUString* pText );
 
-    void CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPaint );
+    void CtorInitTextPaintInfo( SwTextFrm *pFrame, const SwRect &rPaint );
 
     void SetBack( const SvxBrushItem *pItem,
                   const SwRect &rRect ) { pBrushItem = pItem; aItemRect = rRect;}
     const SvxBrushItem *GetBrushItem() const { return pBrushItem; }
     const SwRect       &GetBrushRect() const { return aItemRect;  }
 
-    inline SwTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPaint )
-           { CtorInitTxtPaintInfo( pFrame, rPaint ); }
+    inline SwTextPaintInfo( SwTextFrm *pFrame, const SwRect &rPaint )
+           { CtorInitTextPaintInfo( pFrame, rPaint ); }
 
     inline SwTwips X() const { return aPos.X(); }
     inline void X( const long nNew ) { aPos.X() = nNew; }
     inline SwTwips Y() const { return aPos.Y(); }
     inline void Y( const SwTwips nNew ) { aPos.Y() = nNew; }
 
-    inline SwTxtFly& GetTxtFly() { return aTxtFly; }
-    inline const SwTxtFly& GetTxtFly() const { return aTxtFly; }
+    inline SwTextFly& GetTextFly() { return aTextFly; }
+    inline const SwTextFly& GetTextFly() const { return aTextFly; }
     inline void DrawText( const OUString &rText, const SwLinePortion &rPor,
                           const sal_Int32 nIdx = 0,
                           const sal_Int32 nLen = COMPLETE_STRING,
@@ -505,7 +505,7 @@ public:
     inline const SwRect &GetPaintRect() const { return aPaintRect; }
     inline void SetPaintRect( const SwRect &rNew ) { aPaintRect = rNew; }
 
-    friend SvStream & WriteSwTxtPaintInfo( SvStream &rOS, const SwTxtPaintInfo &rInf );
+    friend SvStream & WriteSwTextPaintInfo( SvStream &rOS, const SwTextPaintInfo &rInf );
 
     // STUFF FOR JUSTIFIED ALIGNMENT
 
@@ -531,7 +531,7 @@ public:
     inline const SwWrongList* GetSmartTags() const { return pSmartTags; }
 };
 
-class SwTxtFormatInfo : public SwTxtPaintInfo
+class SwTextFormatInfo : public SwTextPaintInfo
 {
     // temporary arguments for hyphenation
     com::sun::star::beans::PropertyValues   aHyphVals;
@@ -539,14 +539,14 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
     SwLineLayout    *pRoot;       // The Root of the current line (pCurr)
     SwLinePortion   *pLast;       // The last Portion
     SwFlyPortion    *pFly;        // The following FlyPortion
-    SwFldPortion    *pLastFld;    // Wrapped Field
+    SwFieldPortion    *pLastField;    // Wrapped Field
     SwLinePortion   *pUnderflow;  // Underflow: Last Portion
     SwLinePortion   *pRest;       // The Rest is the start of the next Line
 
     SwTabPortion    *pLastTab;     // The _last_ TabPortion
 
     sal_Int32 nSoftHyphPos;    // SoftHyphPos forr Hyphenation
-    sal_Int32 nLineStart;      // Current line start in rTxt
+    sal_Int32 nLineStart;      // Current line start in rText
     sal_Int32 nUnderScorePos;  // enlarge repaint if underscore has been found
     // #i34348# Changed type from sal_uInt16 to SwTwips
     SwTwips nLeft;              // Left margin
@@ -563,7 +563,7 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
     sal_Int16  nMinWordLength;  // minimum length of word to be hyphenated
 
     bool bFull : 1;             // Line is full
-    bool bFtnDone : 1;          // Ftn already formatted
+    bool bFootnoteDone : 1;          // Footnote already formatted
     bool bErgoDone : 1;         // ErgoDone already formatted
     bool bNumDone : 1;          // bNumDone already formatted
     bool bArrowDone : 1;        // Arrow to the left for scrolling paragraphs
@@ -590,18 +590,18 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
 
     // Hyphenating ...
     bool InitHyph( const bool bAuto = false );
-    bool _CheckFtnPortion( SwLineLayout* pCurr );
+    bool _CheckFootnotePortion( SwLineLayout* pCurr );
 
 public:
-    void CtorInitTxtFormatInfo( SwTxtFrm *pFrm, const bool bInterHyph = false,
+    void CtorInitTextFormatInfo( SwTextFrm *pFrm, const bool bInterHyph = false,
         const bool bQuick = false, const bool bTst = false );
-    inline SwTxtFormatInfo(SwTxtFrm *pFrame, const bool bInterHyphL = false,
+    inline SwTextFormatInfo(SwTextFrm *pFrame, const bool bInterHyphL = false,
             const bool bQuickL = false, const bool bTst = false)
-           { CtorInitTxtFormatInfo( pFrame, bInterHyphL, bQuickL, bTst ); }
+           { CtorInitTextFormatInfo( pFrame, bInterHyphL, bQuickL, bTst ); }
 
     // For the formatting inside a double line in a line (multi-line portion)
     // we need a modified text-format-info:
-    SwTxtFormatInfo( const SwTxtFormatInfo& rInf, SwLineLayout& rLay,
+    SwTextFormatInfo( const SwTextFormatInfo& rInf, SwLineLayout& rLay,
         SwTwips nActWidth );
 
     inline sal_uInt16 Width() const { return nWidth; }
@@ -678,7 +678,7 @@ public:
     inline sal_Int32 GetSoftHyphPos() const { return nSoftHyphPos; }
     inline void SetSoftHyphPos( const sal_Int32 nNew ) { nSoftHyphPos = nNew; }
 
-    inline void SetParaFtn();
+    inline void SetParaFootnote();
 
     // FlyFrms
     inline SwFlyPortion *GetFly() { return pFly; }
@@ -693,16 +693,16 @@ public:
     inline void SetTabDecimal( const sal_Unicode cNew ) { cTabDecimal = cNew;}
 
     // Last*
-    inline SwFldPortion *GetLastFld() { return pLastFld; }
-    inline void SetLastFld( SwFldPortion *pNew ) { pLastFld = pNew; }
+    inline SwFieldPortion *GetLastField() { return pLastField; }
+    inline void SetLastField( SwFieldPortion *pNew ) { pLastField = pNew; }
 
     inline void ClearHookChar() { cHookChar = 0; }
     inline void SetHookChar( const sal_Unicode cNew ) { cHookChar = cNew; }
     inline sal_Unicode GetHookChar() const { return cHookChar; }
 
     // Done-Flags
-    inline bool IsFtnDone() const { return bFtnDone; }
-    inline void SetFtnDone( const bool bNew ) { bFtnDone = bNew; }
+    inline bool IsFootnoteDone() const { return bFootnoteDone; }
+    inline void SetFootnoteDone( const bool bNew ) { bFootnoteDone = bNew; }
     inline bool IsErgoDone() const { return bErgoDone; }
     inline void SetErgoDone( const bool bNew ) { bErgoDone = bNew; }
     inline bool IsNumDone() const { return bNumDone; }
@@ -710,7 +710,7 @@ public:
     inline bool IsArrowDone() const { return bArrowDone; }
     inline void SetArrowDone( const bool bNew ) { bArrowDone = bNew; }
 
-    // For SwTxtPortion::Hyphenate
+    // For SwTextPortion::Hyphenate
     inline bool IsSoftHyph( const sal_Int32 nPos ) const;
     bool ChgHyph( const bool bNew );
 
@@ -722,15 +722,15 @@ public:
     // Calls HyphenateWord() of Hyphenator
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XHyphenatedWord >
-                HyphWord( const OUString &rTxt, const sal_Int32 nMinTrail );
+                HyphWord( const OUString &rText, const sal_Int32 nMinTrail );
     const com::sun::star::beans::PropertyValues &
                 GetHyphValues() const;
 
-    bool CheckFtnPortion( SwLineLayout* pCurr )
-        { return IsFtnInside() && _CheckFtnPortion( pCurr ); }
+    bool CheckFootnotePortion( SwLineLayout* pCurr )
+        { return IsFootnoteInside() && _CheckFootnotePortion( pCurr ); }
 
-    // Dropcaps called by SwTxtFormatter::CTOR
-    const SwFmtDrop *GetDropFmt() const;
+    // Dropcaps called by SwTextFormatter::CTOR
+    const SwFormatDrop *GetDropFormat() const;
 
     // Sets the last SwKernPortion as pLast, if it is followed by empty portions
     bool LastKernPortion();
@@ -739,7 +739,7 @@ public:
     // Return: Position; sets cHookChar if necessary
     sal_Int32 ScanPortionEnd( const sal_Int32 nStart, const sal_Int32 nEnd );
 
-    friend SvStream & WriteSwTxtFormatInfo( SvStream &rOS, const SwTxtFormatInfo &rInf );
+    friend SvStream & WriteSwTextFormatInfo( SvStream &rOS, const SwTextFormatInfo &rInf );
 
     inline void SetTabOverflow( bool bOverflow ) { bTabOverflow = bOverflow; }
     inline bool IsTabOverflow() { return bTabOverflow; }
@@ -747,17 +747,17 @@ public:
 };
 
 /**
- * For the text replacement and restoration of SwTxtSizeInfo.
+ * For the text replacement and restoration of SwTextSizeInfo.
  * The way this is done is a bit of a hack: Although rInf is const we change it
  * anyway.
  * Because rInf is restorated again in the DTOR, we can do this.
  * You could call it a "logical const", if you wish.
  */
-class SwTxtSlot
+class SwTextSlot
 {
-    OUString aTxt;
+    OUString aText;
     std::shared_ptr<vcl::TextLayoutCache> m_pOldCachedVclData;
-    const OUString *pOldTxt;
+    const OUString *pOldText;
     const SwWrongList* pOldSmartTagList;
     const SwWrongList* pOldGrammarCheckList;
     SwWrongList* pTempList;
@@ -765,106 +765,106 @@ class SwTxtSlot
     sal_Int32 nLen;
     bool bOn;
 protected:
-    SwTxtSizeInfo *pInf;
+    SwTextSizeInfo *pInf;
 public:
     // The replacement string originates either from the portion via GetExpText()
     // or from the rCh, if it is not empty.
-    SwTxtSlot( const SwTxtSizeInfo *pNew, const SwLinePortion *pPor, bool bTxtLen,
+    SwTextSlot( const SwTextSizeInfo *pNew, const SwLinePortion *pPor, bool bTextLen,
                bool bExgLists, OUString const & rCh = OUString() );
-    ~SwTxtSlot();
+    ~SwTextSlot();
     bool IsOn() const { return bOn; }
 };
 
 class SwFontSave
 {
-    SwTxtSizeInfo *pInf;
+    SwTextSizeInfo *pInf;
     SwFont        *pFnt;
     SwAttrIter    *pIter;
 public:
-    SwFontSave( const SwTxtSizeInfo &rInf, SwFont *pFnt,
+    SwFontSave( const SwTextSizeInfo &rInf, SwFont *pFnt,
                 SwAttrIter* pItr = NULL );
    ~SwFontSave();
 };
 
-inline sal_uInt16 SwTxtSizeInfo::GetAscent() const
+inline sal_uInt16 SwTextSizeInfo::GetAscent() const
 {
-    SAL_WARN_IF( !GetOut(), "sw.core", "SwTxtSizeInfo::GetAscent() without m_pOut" );
+    SAL_WARN_IF( !GetOut(), "sw.core", "SwTextSizeInfo::GetAscent() without m_pOut" );
 
     return const_cast<SwFont*>(GetFont())->GetAscent( m_pVsh, *GetOut() );
 }
 
-inline sal_uInt16 SwTxtSizeInfo::GetTxtHeight() const
+inline sal_uInt16 SwTextSizeInfo::GetTextHeight() const
 {
-    SAL_WARN_IF( !GetOut(), "sw.core", "SwTxtSizeInfo::GetTxtHeight() without m_pOut" );
+    SAL_WARN_IF( !GetOut(), "sw.core", "SwTextSizeInfo::GetTextHeight() without m_pOut" );
 
     return const_cast<SwFont*>(GetFont())->GetHeight( m_pVsh, *GetOut() );
 }
 
-inline SwPosSize SwTxtSizeInfo::GetTxtSize( const OUString &rTxt ) const
+inline SwPosSize SwTextSizeInfo::GetTextSize( const OUString &rText ) const
 {
-    return GetTxtSize( m_pOut, 0, rTxt, 0, rTxt.getLength(), 0 );
+    return GetTextSize( m_pOut, 0, rText, 0, rText.getLength(), 0 );
 }
 
-inline SwPosSize SwTxtSizeInfo::GetTxtSize( const SwScriptInfo* pSI,
+inline SwPosSize SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI,
                                             const sal_Int32 nNewIdx,
                                             const sal_Int32 nNewLen,
                                             const sal_uInt16 nCompress ) const
 {
-    return GetTxtSize( m_pOut, pSI, *m_pTxt, nNewIdx, nNewLen, nCompress );
+    return GetTextSize( m_pOut, pSI, *m_pText, nNewIdx, nNewLen, nCompress );
 }
 
-inline SwTwips SwTxtPaintInfo::GetPaintOfst() const
+inline SwTwips SwTextPaintInfo::GetPaintOfst() const
 {
     return GetParaPortion()->GetRepaint().GetOfst();
 }
 
-inline void SwTxtPaintInfo::SetPaintOfst( const SwTwips nNew )
+inline void SwTextPaintInfo::SetPaintOfst( const SwTwips nNew )
 {
     GetParaPortion()->GetRepaint().SetOfst( nNew );
 }
 
-inline void SwTxtPaintInfo::DrawText( const OUString &rText,
+inline void SwTextPaintInfo::DrawText( const OUString &rText,
                             const SwLinePortion &rPor,
                             const sal_Int32 nStart, const sal_Int32 nLength,
                             const bool bKern ) const
 {
-    const_cast<SwTxtPaintInfo*>(this)->_DrawText( rText, rPor, nStart, nLength, bKern );
+    const_cast<SwTextPaintInfo*>(this)->_DrawText( rText, rPor, nStart, nLength, bKern );
 }
 
-inline void SwTxtPaintInfo::DrawText( const SwLinePortion &rPor,
+inline void SwTextPaintInfo::DrawText( const SwLinePortion &rPor,
         const sal_Int32 nLength, const bool bKern ) const
 {
-    const_cast<SwTxtPaintInfo*>(this)->_DrawText( *m_pTxt, rPor, m_nIdx, nLength, bKern );
+    const_cast<SwTextPaintInfo*>(this)->_DrawText( *m_pText, rPor, m_nIdx, nLength, bKern );
 }
 
-inline void SwTxtPaintInfo::DrawMarkedText( const SwLinePortion &rPor,
+inline void SwTextPaintInfo::DrawMarkedText( const SwLinePortion &rPor,
                                             const sal_Int32 nLength,
                                             const bool bKern,
                                             const bool bWrong,
                                             const bool bSmartTags,
                                             const bool bGrammarCheck ) const
 {
-    const_cast<SwTxtPaintInfo*>(this)->_DrawText( *m_pTxt, rPor, m_nIdx, nLength, bKern, bWrong, bSmartTags, bGrammarCheck );
+    const_cast<SwTextPaintInfo*>(this)->_DrawText( *m_pText, rPor, m_nIdx, nLength, bKern, bWrong, bSmartTags, bGrammarCheck );
 }
 
-inline sal_Int32 SwTxtFormatInfo::GetReformatStart() const
+inline sal_Int32 SwTextFormatInfo::GetReformatStart() const
 {
     return GetParaPortion()->GetReformat().Start();
 }
 
-inline const SwAttrSet& SwTxtFormatInfo::GetCharAttr() const
+inline const SwAttrSet& SwTextFormatInfo::GetCharAttr() const
 {
-    return GetTxtFrm()->GetTxtNode()->GetSwAttrSet();
+    return GetTextFrm()->GetTextNode()->GetSwAttrSet();
 }
 
-inline void SwTxtFormatInfo::SetParaFtn()
+inline void SwTextFormatInfo::SetParaFootnote()
 {
-    GetTxtFrm()->SetFtn( true );
+    GetTextFrm()->SetFootnote( true );
 }
 
-inline bool SwTxtFormatInfo::IsSoftHyph( const sal_Int32 nPos ) const
+inline bool SwTextFormatInfo::IsSoftHyph( const sal_Int32 nPos ) const
 {
-    return CHAR_SOFTHYPHEN == GetTxtFrm()->GetTxtNode()->GetTxt()[nPos];
+    return CHAR_SOFTHYPHEN == GetTextFrm()->GetTextNode()->GetText()[nPos];
 }
 
 #endif
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index b48c6d009b21..1e74bdac46e2 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -35,7 +35,7 @@
 
 using namespace ::com::sun::star;
 
-void SwTxtAdjuster::FormatBlock( )
+void SwTextAdjuster::FormatBlock( )
 {
     // Block format does not apply to the last line.
     // And for tabs it doesn't exist out of tradition
@@ -44,7 +44,7 @@ void SwTxtAdjuster::FormatBlock( )
     const SwLinePortion *pFly = 0;
 
     bool bSkip = !IsLastBlock() &&
-        nStart + pCurr->GetLen() >= GetInfo().GetTxt().getLength();
+        nStart + pCurr->GetLen() >= GetInfo().GetText().getLength();
 
     // Multi-line fields are tricky, because we need to check whether there are
     // any other text portions in the paragraph.
@@ -56,7 +56,7 @@ void SwTxtAdjuster::FormatBlock( )
             const SwLinePortion *pPor = pCurr->GetFirstPortion();
             while( pPor && bSkip )
             {
-                if( pPor->InTxtGrp() )
+                if( pPor->InTextGrp() )
                     bSkip = false;
                 pPor = pPor->GetPortion();
             }
@@ -84,7 +84,7 @@ void SwTxtAdjuster::FormatBlock( )
                 // Look for the last Fly which has text coming after it:
                 if( pPos->IsFlyPortion() )
                     pTmpFly = pPos; // Found a Fly
-                else if ( pTmpFly && pPos->InTxtGrp() )
+                else if ( pTmpFly && pPos->InTextGrp() )
                 {
                     pFly = pTmpFly; // A Fly with follow-up text!
                     pTmpFly = NULL;
@@ -109,7 +109,7 @@ void SwTxtAdjuster::FormatBlock( )
     GetInfo().GetParaPortion()->GetRepaint().SetOfst(0);
 }
 
-static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, SwTxtIter& rItr,
+static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTextSizeInfo& rInf, SwTextIter& rItr,
                                 sal_Int32& rKashidas, sal_Int32& nGluePortion )
 {
     // i60594 validate Kashida justification
@@ -157,7 +157,7 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, S
             }
 
             sal_Int32 nKashidasDropped = 0;
-            if ( !SwScriptInfo::IsArabicText( rInf.GetTxt(), nIdx, nNext - nIdx ) )
+            if ( !SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - nIdx ) )
             {
                 nKashidasDropped = nKashidasInAttr;
                 rKashidas -= nKashidasDropped;
@@ -166,7 +166,7 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, S
             {
                 ComplexTextLayoutMode nOldLayout = rInf.GetOut()->GetLayoutMode();
                 rInf.GetOut()->SetLayoutMode ( nOldLayout | TEXT_LAYOUT_BIDI_RTL );
-                nKashidasDropped = rInf.GetOut()->ValidateKashidas ( rInf.GetTxt(), nIdx, nNext - nIdx,
+                nKashidasDropped = rInf.GetOut()->ValidateKashidas ( rInf.GetText(), nIdx, nNext - nIdx,
                                                nKashidasInAttr, pKashidaPos + nKashidaIdx,
                                                pKashidaPosDropped );
                 rInf.GetOut()->SetLayoutMode ( nOldLayout );
@@ -188,7 +188,7 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, S
     return (rKashidas > 0);
 }
 
-static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, SwTxtIter& rItr, sal_Int32& rKashidas,
+static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, SwTextSizeInfo& rInf, SwTextIter& rItr, sal_Int32& rKashidas,
                              sal_Int32& nGluePortion, const long nGluePortionWidth, long& nSpaceAdd )
 {
     // check kashida width
@@ -215,7 +215,7 @@ static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, SwTx
             sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( 0, 0, nIdx, nNext - nIdx );
 
             long nFontMinKashida = rInf.GetOut()->GetMinKashida();
-            if ( nFontMinKashida && nKashidasInAttr > 0 && SwScriptInfo::IsArabicText( rInf.GetTxt(), nIdx, nNext - nIdx ) )
+            if ( nFontMinKashida && nKashidasInAttr > 0 && SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - nIdx ) )
             {
                 sal_Int32 nKashidasDropped = 0;
                 while ( rKashidas && nGluePortion && nKashidasInAttr > 0 &&
@@ -247,12 +247,12 @@ static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, SwTx
 // CalcNewBlock() must only be called _after_ CalcLine()!
 // We always span between two RandPortions or FixPortions (Tabs and Flys).
 // We count the Glues and call ExpandBlock.
-void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
+void SwTextAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
                                   const SwLinePortion *pStopAt, SwTwips nReal, bool bSkipKashida )
 {
     OSL_ENSURE( GetInfo().IsMulti() || SVX_ADJUST_BLOCK == GetAdjust(),
             "CalcNewBlock: Why?" );
-    OSL_ENSURE( pCurrent->Height(), "SwTxtAdjuster::CalcBlockAdjust: missing CalcLine()" );
+    OSL_ENSURE( pCurrent->Height(), "SwTextAdjuster::CalcBlockAdjust: missing CalcLine()" );
 
     pCurrent->InitSpaceAdd();
     sal_Int32 nGluePortion = 0;
@@ -261,8 +261,8 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
 
     // i60591: hennerdrews
     SwScriptInfo& rSI = GetInfo().GetParaPortion()->GetScriptInfo();
-    SwTxtSizeInfo aInf ( GetTxtFrm() );
-    SwTxtIter aItr ( GetTxtFrm(), &aInf );
+    SwTextSizeInfo aInf ( GetTextFrm() );
+    SwTextIter aItr ( GetTextFrm(), &aInf );
 
     if ( rSI.CountKashida() )
     {
@@ -286,7 +286,7 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
 
     // #i49277#
     const bool bDoNotJustifyLinesWithManualBreak =
-                GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->get(DocumentSettingId::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK);
+                GetTextFrm()->GetNode()->getIDocumentSettingAccess()->get(DocumentSettingId::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK);
 
     SwLinePortion *pPos = pCurrent->GetPortion();
 
@@ -299,8 +299,8 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
            break;
         }
 
-        if ( pPos->InTxtGrp() )
-            nGluePortion = nGluePortion + static_cast<SwTxtPortion*>(pPos)->GetSpaceCnt( GetInfo(), nCharCnt );
+        if ( pPos->InTextGrp() )
+            nGluePortion = nGluePortion + static_cast<SwTextPortion*>(pPos)->GetSpaceCnt( GetInfo(), nCharCnt );
         else if( pPos->IsMultiPortion() )
         {
             SwMultiPortion* pMulti = static_cast<SwMultiPortion*>(pPos);
@@ -394,9 +394,9 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
     }
 }
 
-SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent )
+SwTwips SwTextAdjuster::CalcKanaAdj( SwLineLayout* pCurrent )
 {
-    OSL_ENSURE( pCurrent->Height(), "SwTxtAdjuster::CalcBlockAdjust: missing CalcLine()" );
+    OSL_ENSURE( pCurrent->Height(), "SwTextAdjuster::CalcBlockAdjust: missing CalcLine()" );
     OSL_ENSURE( !pCurrent->GetpKanaComp(), "pKanaComp already exists!!" );
 
     std::deque<sal_uInt16> *pNewKana = new std::deque<sal_uInt16>();
@@ -416,7 +416,7 @@ SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent )
 
     while( pPos )
     {
-        if ( pPos->InTxtGrp() )
+        if ( pPos->InTextGrp() )
         {
             // get maximum portion width from info structure, calculated
             // during text formatting
@@ -494,7 +494,7 @@ SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent )
 
     while( pPos )
     {
-        if ( pPos->InTxtGrp() )
+        if ( pPos->InTextGrp() )
         {
             const sal_uInt16 nMinWidth = pPos->Width();
 
@@ -530,7 +530,7 @@ SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent )
     return nRepaintOfst;
 }
 
-SwMarginPortion *SwTxtAdjuster::CalcRightMargin( SwLineLayout *pCurrent,
+SwMarginPortion *SwTextAdjuster::CalcRightMargin( SwLineLayout *pCurrent,
     SwTwips nReal )
 {
     long nRealWidth;
@@ -581,7 +581,7 @@ SwMarginPortion *SwTxtAdjuster::CalcRightMargin( SwLineLayout *pCurrent,
     return pRight;
 }
 
-void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
+void SwTextAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
 {
     // 1) We insert a left margin:
     SwMarginPortion *pLeft = pCurrent->CalcLeftMargin();
@@ -596,7 +596,7 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
 
     // If we only have one line, the text portion is consecutive and we center, then ...
     bool bComplete = 0 == nStart;
-    const bool bTabCompat = GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
+    const bool bTabCompat = GetTextFrm()->GetNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
     bool bMultiTab = false;
 
     while( pPos )
@@ -617,7 +617,7 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
                 // to left-aligned.
                 // The first text portion gets the whole Glue, but only if we have
                 // more than one line.
-                if( bComplete && GetInfo().GetTxt().getLength() == nLen )
+                if( bComplete && GetInfo().GetText().getLength() == nLen )
                     static_cast<SwGluePortion*>(pPos)->MoveHalfGlue( pGlue );
                 else
                 {
@@ -656,7 +656,7 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
         pLeft->AdjustRight( pCurrent );
 }
 
-void SwTxtAdjuster::CalcAdjLine( SwLineLayout *pCurrent )
+void SwTextAdjuster::CalcAdjLine( SwLineLayout *pCurrent )
 {
     OSL_ENSURE( pCurrent->IsFormatAdj(), "CalcAdjLine: Why?" );
 
@@ -686,27 +686,27 @@ void SwTxtAdjuster::CalcAdjLine( SwLineLayout *pCurrent )
 // adding the word, that still fits onto the line! For this reason the FlyPortion's
 // width is still correct if we get a deadlock-situation of:
 // bFirstWord && !WORDFITS
-SwFlyPortion *SwTxtAdjuster::CalcFlyPortion( const long nRealWidth,
+SwFlyPortion *SwTextAdjuster::CalcFlyPortion( const long nRealWidth,
                                              const SwRect &rCurrRect )
 {
-    SwTxtFly aTxtFly( GetTxtFrm() );
+    SwTextFly aTextFly( GetTextFrm() );
 
     const sal_uInt16 nCurrWidth = pCurr->PrtWidth();
     SwFlyPortion *pFlyPortion = 0;
 
     SwRect aLineVert( rCurrRect );
-    if ( GetTxtFrm()->IsRightToLeft() )
-        GetTxtFrm()->SwitchLTRtoRTL( aLineVert );
-    if ( GetTxtFrm()->IsVertical() )
-        GetTxtFrm()->SwitchHorizontalToVertical( aLineVert );
+    if ( GetTextFrm()->IsRightToLeft() )
+        GetTextFrm()->SwitchLTRtoRTL( aLineVert );
+    if ( GetTextFrm()->IsVertical() )
+        GetTextFrm()->SwitchHorizontalToVertical( aLineVert );
 
     // aFlyRect is document-global!
-    SwRect aFlyRect( aTxtFly.GetFrm( aLineVert ) );
+    SwRect aFlyRect( aTextFly.GetFrm( aLineVert ) );
 
-    if ( GetTxtFrm()->IsRightToLeft() )
-        GetTxtFrm()->SwitchRTLtoLTR( aFlyRect );
-    if ( GetTxtFrm()->IsVertical() )
-        GetTxtFrm()->SwitchVerticalToHorizontal( aFlyRect );
+    if ( GetTextFrm()->IsRightToLeft() )
+        GetTextFrm()->SwitchRTLtoLTR( aFlyRect );
+    if ( GetTextFrm()->IsVertical() )
+        GetTextFrm()->SwitchVerticalToHorizontal( aFlyRect );
 
     // If a Frame overlapps we open a Portion
     if( aFlyRect.HasArea() )
@@ -731,7 +731,7 @@ SwFlyPortion *SwTxtAdjuster::CalcFlyPortion( const long nRealWidth,
 }
 
 // CalcDropAdjust is called at the end by Format() if needed
-void SwTxtAdjuster::CalcDropAdjust()
+void SwTextAdjuster::CalcDropAdjust()
 {
     OSL_ENSURE( 1<GetDropLines() && SVX_ADJUST_LEFT!=GetAdjust() && SVX_ADJUST_BLOCK!=GetAdjust(),
             "CalcDropAdjust: No reason for DropAdjustment." );
@@ -814,7 +814,7 @@ void SwTxtAdjuster::CalcDropAdjust()
     }
 }
 
-void SwTxtAdjuster::CalcDropRepaint()
+void SwTextAdjuster::CalcDropRepaint()
 {
     Top();
     SwRepaint &rRepaint = GetInfo().GetParaPortion()->GetRepaint();
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index b85e351b0a82..3201e7f92f92 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -59,22 +59,22 @@
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star;
 
-void SwAttrIter::Chg( SwTxtAttr *pHt )
+void SwAttrIter::Chg( SwTextAttr *pHt )
 {
     assert(pHt && pFnt && "No attribute of font available for change");
     if( pRedln && pRedln->IsOn() )
-        pRedln->ChangeTxtAttr( pFnt, *pHt, true );
+        pRedln->ChangeTextAttr( pFnt, *pHt, true );
     else
         aAttrHandler.PushAndChg( *pHt, *pFnt );
     nChgCnt++;
 }
 
-void SwAttrIter::Rst( SwTxtAttr *pHt )
+void SwAttrIter::Rst( SwTextAttr *pHt )
 {
     assert(pHt && pFnt && "No attribute of font available for reset");
     // get top from stack after removing pHt
     if( pRedln && pRedln->IsOn() )
-        pRedln->ChangeTxtAttr( pFnt, *pHt, false );
+        pRedln->ChangeTextAttr( pFnt, *pHt, false );
     else
         aAttrHandler.PopAndChg( *pHt, *pFnt );
     nChgCnt--;
@@ -101,9 +101,9 @@ SwAttrIter::~SwAttrIter()
  * The Formatter later on encounters such a special character and retrieves the
  * degenerate attribute via GetAttr().
  */
-SwTxtAttr *SwAttrIter::GetAttr( const sal_Int32 nPosition ) const
+SwTextAttr *SwAttrIter::GetAttr( const sal_Int32 nPosition ) const
 {
-    return (m_pTxtNode) ? m_pTxtNode->GetTxtAttrForCharAt(nPosition) : 0;
+    return (m_pTextNode) ? m_pTextNode->GetTextAttrForCharAt(nPosition) : 0;
 }
 
 bool SwAttrIter::SeekAndChgAttrIter( const sal_Int32 nNewPos, OutputDevice* pOut )
@@ -162,13 +162,13 @@ bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFo
 
     if ( pHints && !bParaFont )
     {
-        SwTxtAttr *pTxtAttr;
+        SwTextAttr *pTextAttr;
         // While we've not reached the end of the StartArray && the TextAttribute starts at position 0...
         while ( ( nStartIndex < pHints->GetStartCount() ) &&
-                !((pTxtAttr=pHints->GetStart(nStartIndex))->GetStart()) )
+                !((pTextAttr=pHints->GetStart(nStartIndex))->GetStart()) )
         {
             // open the TextAttributes
-            Chg( pTxtAttr );
+            Chg( pTextAttr );
             nStartIndex++;
         }
     }
@@ -194,7 +194,7 @@ bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFo
 // AMA: New AttrIter Nov 94
 void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
 {
-    SwTxtAttr *pTxtAttr;
+    SwTextAttr *pTextAttr;
 
     if ( nStartIndex ) // If attributes have been opened at all ...
     {
@@ -203,11 +203,11 @@ void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
         // As long as we've not yet reached the end of EndArray and the
         // TextAttribute ends before or at the new position ...
         while ( ( nEndIndex < pHints->GetEndCount() ) &&
-                (*(pTxtAttr=pHints->GetEnd(nEndIndex))->GetAnyEnd()<=nNewPos))
+                (*(pTextAttr=pHints->GetEnd(nEndIndex))->GetAnyEnd()<=nNewPos))
         {
             // Close the TextAttributes, whoes StartPos were before or at
             // the old nPos and are currently open
-            if (pTxtAttr->GetStart() <= nPos)  Rst( pTxtAttr );
+            if (pTextAttr->GetStart() <= nPos)  Rst( pTextAttr );
             nEndIndex++;
         }
     }
@@ -223,11 +223,11 @@ void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
     // As long as we've not yet reached the end of EndArray and the
     // TextAttribute ends before or at the new position ...
     while ( ( nStartIndex < pHints->GetStartCount() ) &&
-            ((pTxtAttr=pHints->GetStart(nStartIndex))->GetStart()<=nNewPos) )
+            ((pTextAttr=pHints->GetStart(nStartIndex))->GetStart()<=nNewPos) )
     {
 
         // open the TextAttributes, whose ends lie behind the new position
-        if ( *pTxtAttr->GetAnyEnd() > nNewPos )  Chg( pTxtAttr );
+        if ( *pTextAttr->GetAnyEnd() > nNewPos )  Chg( pTextAttr );
         nStartIndex++;
     }
 
@@ -288,7 +288,7 @@ sal_Int32 SwAttrIter::GetNextAttr( ) const
         // are there attribute starts left?
         for (size_t i = nStartIndex; i < pHints->GetStartCount(); ++i)
         {
-            SwTxtAttr *const pAttr(pHints->GetStart(i));
+            SwTextAttr *const pAttr(pHints->GetStart(i));
             if (!pAttr->IsFormatIgnoreStart())
             {
                 nNext = pAttr->GetStart();
@@ -298,7 +298,7 @@ sal_Int32 SwAttrIter::GetNextAttr( ) const
         // are there attribute ends left?
         for (size_t i = nEndIndex; i < pHints->GetEndCount(); ++i)
         {
-            SwTxtAttr *const pAttr(pHints->GetEnd(i));
+            SwTextAttr *const pAttr(pHints->GetEnd(i));
             if (!pAttr->IsFormatIgnoreEnd())
             {
                 sal_Int32 const nNextEnd = *pAttr->GetAnyEnd();
@@ -307,11 +307,11 @@ sal_Int32 SwAttrIter::GetNextAttr( ) const
             }
         }
     }
-    if (m_pTxtNode!=NULL) {
+    if (m_pTextNode!=NULL) {
         // TODO: maybe use hints like FieldHints for this instead of looking at the text...
-        const sal_Int32 l = nNext<m_pTxtNode->Len() ? nNext : m_pTxtNode->Len();
+        const sal_Int32 l = nNext<m_pTextNode->Len() ? nNext : m_pTextNode->Len();
         sal_Int32 p=nPos;
-        const sal_Unicode* aStr = m_pTxtNode->GetTxt().getStr();
+        const sal_Unicode* aStr = m_pTextNode->GetText().getStr();
         while (p<l)
         {
             sal_Unicode aChar = aStr[p];
@@ -354,7 +354,7 @@ public:
     void NewWord() { nWordAdd = nWordWidth = 0; }
 };
 
-static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString &rTxt,
+static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString &rText,
     sal_Int32 nIdx, sal_Int32 nEnd )
 {
     bool bRet = false;
@@ -365,8 +365,8 @@ static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString &
         LanguageType eLang = pFnt->GetLanguage();
         if( g_pBreakIt->GetBreakIter().is() )
         {
-            bClear = CH_BLANK == rTxt[ nStop ];
-            Boundary aBndry( g_pBreakIt->GetBreakIter()->getWordBoundary( rTxt, nIdx,
+            bClear = CH_BLANK == rText[ nStop ];
+            Boundary aBndry( g_pBreakIt->GetBreakIter()->getWordBoundary( rText, nIdx,
                              g_pBreakIt->GetLocale( eLang ),
                              WordType::DICTIONARY_WORD, true ) );
             nStop = aBndry.endPos;
@@ -379,19 +379,19 @@ static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString &
         }
         else
         {
-            while( nStop < nEnd && CH_BLANK != rTxt[ nStop ] )
+            while( nStop < nEnd && CH_BLANK != rText[ nStop ] )
                 ++nStop;
             bClear = nStop == nIdx;
             if ( bClear )
             {
                 rArg.NewWord();
-                while( nStop < nEnd && CH_BLANK == rTxt[ nStop ] )
+                while( nStop < nEnd && CH_BLANK == rText[ nStop ] )
                     ++nStop;
             }
         }
 
-        SwDrawTextInfo aDrawInf( rArg.pSh, *rArg.pOut, 0, rTxt, nIdx, nStop - nIdx );
-        long nAktWidth = pFnt->_GetTxtSize( aDrawInf ).Width();
+        SwDrawTextInfo aDrawInf( rArg.pSh, *rArg.pOut, 0, rText, nIdx, nStop - nIdx );
+        long nAktWidth = pFnt->_GetTextSize( aDrawInf ).Width();
         rArg.nRowWidth += nAktWidth;
         if( bClear )
             rArg.NewWord();
@@ -408,10 +408,10 @@ static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString &
     return bRet;
 }
 
-bool SwTxtNode::IsSymbol( const sal_Int32 nBegin ) const
+bool SwTextNode::IsSymbol( const sal_Int32 nBegin ) const
 {
     SwScriptInfo aScriptInfo;
-    SwAttrIter aIter( *const_cast<SwTxtNode*>(this), aScriptInfo );
+    SwAttrIter aIter( *const_cast<SwTextNode*>(this), aScriptInfo );
     aIter.Seek( nBegin );
     return aIter.GetFnt()->IsSymbol(
         const_cast<SwViewShell *>(getIDocumentLayoutAccess()->GetCurrentViewShell()) );
@@ -430,14 +430,14 @@ public:
     void Minimum( long nNew ) { if( nNew > nMinWidth ) nMinWidth = nNew; }
 };
 
-static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn )
+static void lcl_MinMaxNode( SwFrameFormat* pNd, SwMinMaxNodeArgs* pIn )
 {
-    const SwFmtAnchor& rFmtA = pNd->GetAnchor();
+    const SwFormatAnchor& rFormatA = pNd->GetAnchor();
 
-    if ((FLY_AT_PARA == rFmtA.GetAnchorId()) ||
-        (FLY_AT_CHAR == rFmtA.GetAnchorId()))
+    if ((FLY_AT_PARA == rFormatA.GetAnchorId()) ||
+        (FLY_AT_CHAR == rFormatA.GetAnchorId()))
     {
-        const SwPosition *pPos = rFmtA.GetCntntAnchor();
+        const SwPosition *pPos = rFormatA.GetContentAnchor();
         OSL_ENSURE(pPos && pIn, "Unexpected NULL arguments");
         if (!pPos || !pIn || pIn->nIndx != pPos->nNode.GetIndex())
             return;
@@ -445,27 +445,27 @@ static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn )
 
     long nMin, nMax;
     SwHTMLTableLayout *pLayout = 0;
-    const bool bIsDrawFrmFmt = pNd->Which()==RES_DRAWFRMFMT;
-    if( !bIsDrawFrmFmt )
+    const bool bIsDrawFrameFormat = pNd->Which()==RES_DRAWFRMFMT;
+    if( !bIsDrawFrameFormat )
     {
         // Does the frame contain a table at the start or the end?
         const SwNodes& rNodes = pNd->GetDoc()->GetNodes();
-        const SwFmtCntnt& rFlyCntnt = pNd->GetCntnt();
-        sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
-        SwTableNode* pTblNd = rNodes[nStt+1]->GetTableNode();
-        if( !pTblNd )
+        const SwFormatContent& rFlyContent = pNd->GetContent();
+        sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex();
+        SwTableNode* pTableNd = rNodes[nStt+1]->GetTableNode();
+        if( !pTableNd )
         {
             SwNode *pNd2 = rNodes[nStt];
             pNd2 = rNodes[pNd2->EndOfSectionIndex()-1];
             if( pNd2->IsEndNode() )
-                pTblNd = pNd2->StartOfSectionNode()->GetTableNode();
+                pTableNd = pNd2->StartOfSectionNode()->GetTableNode();
         }
 
-        if( pTblNd )
-            pLayout = pTblNd->GetTable().GetHTMLTableLayout();
+        if( pTableNd )
+            pLayout = pTableNd->GetTable().GetHTMLTableLayout();
     }
 
-    const SwFmtHoriOrient& rOrient = pNd->GetHoriOrient();
+    const SwFormatHoriOrient& rOrient = pNd->GetHoriOrient();
     sal_Int16 eHoriOri = rOrient.GetHoriOrient();
 
     long nDiff;
@@ -477,7 +477,7 @@ static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn )
     }
     else
     {
-        if( bIsDrawFrmFmt )
+        if( bIsDrawFrameFormat )
         {
             const SdrObject* pSObj = pNd->FindSdrObject();
             if( pSObj )
@@ -488,7 +488,7 @@ static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn )
         }
         else
         {
-            const SwFmtFrmSize &rSz = pNd->GetFrmSize();
+            const SwFormatFrmSize &rSz = pNd->GetFrmSize();
             nMin = rSz.GetWidth();
         }
         nMax = nMin;
@@ -553,7 +553,7 @@ static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn )
 /**
  * Changing this method very likely requires changing of GetScalingOfSelectedText
  */
-void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax,
+void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax,
                                sal_uLong& rAbsMin, OutputDevice* pOut ) const
 {
     SwViewShell const * pSh = GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
@@ -573,7 +573,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
     rAbsMin = 0;
 
     const SvxLRSpaceItem &rSpace = GetSwAttrSet().GetLRSpace();
-    long nLROffset = rSpace.GetTxtLeft() + GetLeftMarginWithNum( true );
+    long nLROffset = rSpace.GetTextLeft() + GetLeftMarginWithNum( true );
     short nFLOffs;
     // For enumerations a negative first line indentation is probably filled already
     if( !GetFirstLineOfsWithNum( nFLOffs ) || nFLOffs > nLROffset )
@@ -588,12 +588,12 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
     aNodeArgs.nRightDiff = 0;
     if( nIndex )
     {
-        SwFrmFmts* pTmp = const_cast<SwFrmFmts*>(GetDoc()->GetSpzFrmFmts());
+        SwFrameFormats* pTmp = const_cast<SwFrameFormats*>(GetDoc()->GetSpzFrameFormats());
         if( pTmp )
         {
             aNodeArgs.nIndx = nIndex;
-            for( SwFrmFmt *pFmt : *pTmp )
-                lcl_MinMaxNode( pFmt, &aNodeArgs );
+            for( SwFrameFormat *pFormat : *pTmp )
+                lcl_MinMaxNode( pFormat, &aNodeArgs );
         }
     }
     if( aNodeArgs.nLeftRest < 0 )
@@ -609,7 +609,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
         aNodeArgs.nMaxWidth -= aNodeArgs.nRightRest;
 
     SwScriptInfo aScriptInfo;
-    SwAttrIter aIter( *const_cast<SwTxtNode*>(this), aScriptInfo );
+    SwAttrIter aIter( *const_cast<SwTextNode*>(this), aScriptInfo );
     sal_Int32 nIdx = 0;
     aIter.SeekAndChgAttrIter( nIdx, pOut );
     sal_Int32 nLen = m_Text.getLength();
@@ -622,7 +622,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
         sal_Int32 nStop = aScriptInfo.NextScriptChg( nIdx );
         if( nNextChg > nStop )
             nNextChg = nStop;
-        SwTxtAttr *pHint = NULL;
+        SwTextAttr *pHint = NULL;
         sal_Unicode cChar = CH_BLANK;
         nStop = nIdx;
         while( nStop < nLen && nStop < nNextChg &&
@@ -667,7 +667,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
                 OUString sTmp( cChar );
                 SwDrawTextInfo aDrawInf( getIDocumentLayoutAccess()->GetCurrentViewShell(),
                     *pOut, 0, sTmp, 0, 1, 0, false );
-                nAktWidth = aIter.GetFnt()->_GetTxtSize( aDrawInf ).Width();
+                nAktWidth = aIter.GetFnt()->_GetTextSize( aDrawInf ).Width();
                 aArg.nWordWidth += nAktWidth;
                 aArg.nRowWidth += nAktWidth;
                 if( (long)rAbsMin < aArg.nWordWidth )
@@ -689,11 +689,11 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
                 {
                     case RES_TXTATR_FLYCNT :
                     {
-                        SwFrmFmt *pFrmFmt = pHint->GetFlyCnt().GetFrmFmt();
-                        const SvxLRSpaceItem &rLR = pFrmFmt->GetLRSpace();
-                        if( RES_DRAWFRMFMT == pFrmFmt->Which() )
+                        SwFrameFormat *pFrameFormat = pHint->GetFlyCnt().GetFrameFormat();
+                        const SvxLRSpaceItem &rLR = pFrameFormat->GetLRSpace();
+                        if( RES_DRAWFRMFMT == pFrameFormat->Which() )
                         {
-                            const SdrObject* pSObj = pFrmFmt->FindSdrObject();
+                            const SdrObject* pSObj = pFrameFormat->FindSdrObject();
                             if( pSObj )
                                 nAktWidth = pSObj->GetCurrentBoundRect().GetWidth();
                             else
@@ -701,8 +701,8 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
                         }
                         else
                         {
-                            const SwFmtFrmSize& rTmpSize = pFrmFmt->GetFrmSize();
-                            if( RES_FLYFRMFMT == pFrmFmt->Which()
+                            const SwFormatFrmSize& rTmpSize = pFrameFormat->GetFrmSize();
+                            if( RES_FLYFRMFMT == pFrameFormat->Which()
                                 && rTmpSize.GetWidthPercent() )
                             {
                                 // This is a hack for the wollowing situation: In the paragraph there's a
@@ -715,7 +715,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
                                     rMax = USHRT_MAX;
                             }
                             else
-                                nAktWidth = pFrmFmt->GetFrmSize().GetWidth();
+                                nAktWidth = pFrameFormat->GetFrmSize().GetWidth();
                         }
                         nAktWidth += rLR.GetLeft();
                         nAktWidth += rLR.GetRight();
@@ -729,9 +729,9 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
                     }
                     case RES_TXTATR_FTN :
                     {
-                        const OUString aTxt = pHint->GetFtn().GetNumStr();
-                        if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0,
-                            aTxt.getLength() ) )
+                        const OUString aText = pHint->GetFootnote().GetNumStr();
+                        if( lcl_MinMaxString( aArg, aIter.GetFnt(), aText, 0,
+                            aText.getLength() ) )
                             nAdd = 20;
                         break;
                     }
@@ -739,10 +739,10 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
                     case RES_TXTATR_FIELD :
                     case RES_TXTATR_ANNOTATION :
                         {
-                            SwField *pFld = const_cast<SwField*>(pHint->GetFmtFld().GetField());
-                            const OUString aTxt = pFld->ExpandField(true);
-                            if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0,
-                                aTxt.getLength() ) )
+                            SwField *pField = const_cast<SwField*>(pHint->GetFormatField().GetField());
+                            const OUString aText = pField->ExpandField(true);
+                            if( lcl_MinMaxString( aArg, aIter.GetFnt(), aText, 0,
+                                aText.getLength() ) )
                                 nAdd = 20;
                             break;
                         }
@@ -785,7 +785,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
  *
  * Changing this method very likely requires changing of "GetMinMaxSize"
  */
-sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
+sal_uInt16 SwTextNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
     const
 {
     SwViewShell const * pSh = GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
@@ -813,11 +813,11 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
             return 100;
 
         SwScriptInfo aScriptInfo;
-        SwAttrIter aIter( *const_cast<SwTxtNode*>(this), aScriptInfo );
+        SwAttrIter aIter( *const_cast<SwTextNode*>(this), aScriptInfo );
         aIter.SeekAndChgAttrIter( nStt, pOut );
 
         Boundary aBound =
-            g_pBreakIt->GetBreakIter()->getWordBoundary( GetTxt(), nStt,
+            g_pBreakIt->GetBreakIter()->getWordBoundary( GetText(), nStt,
             g_pBreakIt->GetLocale( aIter.GetFnt()->GetLanguage() ),
             WordType::DICTIONARY_WORD, true );
 
@@ -839,14 +839,14 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
     }
 
     SwScriptInfo aScriptInfo;
-    SwAttrIter aIter( *const_cast<SwTxtNode*>(this), aScriptInfo );
+    SwAttrIter aIter( *const_cast<SwTextNode*>(this), aScriptInfo );
 
     // We do not want scaling attributes to be considered during this
     // calculation. For this, we push a temporary scaling attribute with
     // scaling value 100 and priority flag on top of the scaling stack
     SwAttrHandler& rAH = aIter.GetAttrHandler();
     SvxCharScaleWidthItem aItem(100, RES_CHRATR_SCALEW);
-    SwTxtAttrEnd aAttr( aItem, nStt, nEnd );
+    SwTextAttrEnd aAttr( aItem, nStt, nEnd );
     aAttr.SetPriorityAttr( true );
     rAH.PushAndChg( aAttr, *(aIter.GetFnt()) );
 
@@ -864,7 +864,7 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
 
         sal_Int32 nStop = nIdx;
         sal_Unicode cChar = CH_BLANK;
-        SwTxtAttr* pHint = NULL;
+        SwTextAttr* pHint = NULL;
 
         // stop at special characters in [ nIdx, nNextChg ]
         while( nStop < nEnd && nStop < nNextChg )
@@ -891,8 +891,8 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
         // calculate text widths up to cChar
         if ( nStop > nIdx )
         {
-            SwDrawTextInfo aDrawInf( pSh, *pOut, 0, GetTxt(), nIdx, nStop - nIdx );
-            nProWidth += aIter.GetFnt()->_GetTxtSize( aDrawInf ).Width();
+            SwDrawTextInfo aDrawInf( pSh, *pOut, 0, GetText(), nIdx, nStop - nIdx );
+            nProWidth += aIter.GetFnt()->_GetTextSize( aDrawInf ).Width();
         }
 
         nIdx = nStop;
@@ -909,7 +909,7 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
             // tab receives width of one space
             OUString sTmp( CH_BLANK );
             SwDrawTextInfo aDrawInf( pSh, *pOut, 0, sTmp, 0, 1 );
-            nProWidth += aIter.GetFnt()->_GetTxtSize( aDrawInf ).Width();
+            nProWidth += aIter.GetFnt()->_GetTextSize( aDrawInf ).Width();
             nIdx++;
         }
         else if ( cChar == CHAR_SOFTHYPHEN )
@@ -918,7 +918,7 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
         {
             OUString sTmp( cChar );
             SwDrawTextInfo aDrawInf( pSh, *pOut, 0, sTmp, 0, 1 );
-            nProWidth += aIter.GetFnt()->_GetTxtSize( aDrawInf ).Width();
+            nProWidth += aIter.GetFnt()->_GetTextSize( aDrawInf ).Width();
             nIdx++;
         }
         else if ( pHint && ( cChar == CH_TXTATR_BREAKWORD || cChar == CH_TXTATR_INWORD ) )
@@ -927,21 +927,21 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
             {
             case RES_TXTATR_FTN :
                 {
-                    const OUString aTxt = pHint->GetFtn().GetNumStr();
-                    SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aTxt, 0, aTxt.getLength() );
+                    const OUString aText = pHint->GetFootnote().GetNumStr();
+                    SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aText, 0, aText.getLength() );
 
-                    nProWidth += aIter.GetFnt()->_GetTxtSize( aDrawInf ).Width();
+                    nProWidth += aIter.GetFnt()->_GetTextSize( aDrawInf ).Width();
                     break;
                 }
 
             case RES_TXTATR_FIELD :
             case RES_TXTATR_ANNOTATION :
                 {
-                    SwField *pFld = const_cast<SwField*>(pHint->GetFmtFld().GetField());
-                    OUString const aTxt = pFld->ExpandField(true);
-                    SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aTxt, 0, aTxt.getLength() );
+                    SwField *pField = const_cast<SwField*>(pHint->GetFormatField().GetField());
+                    OUString const aText = pField->ExpandField(true);
+                    SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aText, 0, aText.getLength() );
 
-                    nProWidth += aIter.GetFnt()->_GetTxtSize( aDrawInf ).Width();
+                    nProWidth += aIter.GetFnt()->_GetTextSize( aDrawInf ).Width();
                     break;
                 }
 
@@ -957,9 +957,9 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
     nWidth = std::max( nWidth, nProWidth );
 
     // search for a text frame this node belongs to
-    SwIterator<SwTxtFrm,SwTxtNode> aFrmIter( *this );
-    SwTxtFrm* pFrm = 0;
-    for( SwTxtFrm* pTmpFrm = aFrmIter.First(); pTmpFrm; pTmpFrm = aFrmIter.Next() )
+    SwIterator<SwTextFrm,SwTextNode> aFrmIter( *this );
+    SwTextFrm* pFrm = 0;
+    for( SwTextFrm* pTmpFrm = aFrmIter.First(); pTmpFrm; pTmpFrm = aFrmIter.Next() )
     {
             if ( pTmpFrm->GetOfst() <= nStt &&
                 ( !pTmpFrm->GetFollow() ||
@@ -973,8 +973,8 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
     // search for the line containing nStt
     if ( pFrm && pFrm->HasPara() )
     {
-        SwTxtInfo aInf( pFrm );
-        SwTxtIter aLine( pFrm, &aInf );
+        SwTextInfo aInf( pFrm );
+        SwTextIter aLine( pFrm, &aInf );
         aLine.CharToLine( nStt );
         pOut->SetMapMode( aOldMap );
         return (sal_uInt16)( nWidth ?
@@ -986,20 +986,20 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
     aIter.SeekAndChgAttrIter( nStt, pOut );
     pOut->SetMapMode( aOldMap );
 
-    SwDrawTextInfo aDrawInf( pSh, *pOut, 0, GetTxt(), nStt, 1 );
+    SwDrawTextInfo aDrawInf( pSh, *pOut, 0, GetText(), nStt, 1 );
     return (sal_uInt16)
-           ( nWidth ? ((100 * aIter.GetFnt()->_GetTxtSize( aDrawInf ).Height()) / nWidth ) : 0 );
+           ( nWidth ? ((100 * aIter.GetFnt()->_GetTextSize( aDrawInf ).Height()) / nWidth ) : 0 );
 }
 
-SwTwips SwTxtNode::GetWidthOfLeadingTabs() const
+SwTwips SwTextNode::GetWidthOfLeadingTabs() const
 {
     SwTwips nRet = 0;
 
     sal_Int32 nIdx = 0;
 
-    while ( nIdx < GetTxt().getLength() )
+    while ( nIdx < GetText().getLength() )
     {
-        const sal_Unicode cCh = GetTxt()[nIdx];
+        const sal_Unicode cCh = GetText()[nIdx];
         if ( cCh!='\t' && cCh!=' ' )
         {
             break;
@@ -1013,8 +1013,8 @@ SwTwips SwTxtNode::GetWidthOfLeadingTabs() const
         aPos.nContent += nIdx;
 
         // Find the non-follow text frame:
-        SwIterator<SwTxtFrm,SwTxtNode> aIter( *this );
-        for( SwTxtFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+        SwIterator<SwTextFrm,SwTextNode> aIter( *this );
+        for( SwTextFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
         {
             // Only consider master frames:
             if ( !pFrm->IsFollow() )
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 7fb9ada2e7ad..6f19241b3dbc 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -27,12 +27,12 @@
 class OutputDevice;
 class SwFont;
 class SwpHints;
-class SwTxtAttr;
+class SwTextAttr;
 class SwAttrSet;
-class SwTxtNode;
+class SwTextNode;
 class SwRedlineItr;
 class SwViewShell;
-class SwTxtFrm;
+class SwTextFrm;
 
 class SwAttrIter
 {
@@ -56,16 +56,16 @@ private:
     sal_uInt8 nPropFont;
     const void* aMagicNo[ SW_SCRIPTS ];
     sal_uInt16 aFntIdx[ SW_SCRIPTS ];
-    const SwTxtNode* m_pTxtNode;
+    const SwTextNode* m_pTextNode;
 
     void SeekFwd( const sal_Int32 nPos );
     void SetFnt( SwFont* pNew ) { pFnt = pNew; }
 
 protected:
-    void Chg( SwTxtAttr *pHt );
-    void Rst( SwTxtAttr *pHt );
-    void CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm = 0 );
-    SwAttrIter(SwTxtNode* pTxtNode)
+    void Chg( SwTextAttr *pHt );
+    void Rst( SwTextAttr *pHt );
+    void CtorInitAttrIter( SwTextNode& rTextNode, SwScriptInfo& rScrInf, SwTextFrm* pFrm = 0 );
+    SwAttrIter(SwTextNode* pTextNode)
         : pShell(0)
         , pFnt(0)
         , pHints(0)
@@ -78,16 +78,16 @@ protected:
         , nEndIndex(0)
         , nPos(0)
         , nPropFont(0)
-        , m_pTxtNode(pTxtNode)
+        , m_pTextNode(pTextNode)
         {
             aMagicNo[SW_LATIN] = aMagicNo[SW_CJK] = aMagicNo[SW_CTL] = NULL;
         }
 
 public:
     // Constructor, destructor
-    SwAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf )
-        : pShell(0), pFnt(0), pHints(0), pScriptInfo(0), pLastOut(0), nChgCnt(0), pRedln(0),nPropFont(0), m_pTxtNode(&rTxtNode)
-        { CtorInitAttrIter( rTxtNode, rScrInf ); }
+    SwAttrIter( SwTextNode& rTextNode, SwScriptInfo& rScrInf )
+        : pShell(0), pFnt(0), pHints(0), pScriptInfo(0), pLastOut(0), nChgCnt(0), pRedln(0),nPropFont(0), m_pTextNode(&rTextNode)
+        { CtorInitAttrIter( rTextNode, rScrInf ); }
 
     virtual ~SwAttrIter();
 
@@ -111,7 +111,7 @@ public:
     bool HasHints() const { return 0 != pHints; }
 
     // Returns the attribute for a position
-    SwTxtAttr *GetAttr( const sal_Int32 nPos ) const;
+    SwTextAttr *GetAttr( const sal_Int32 nPos ) const;
 
     const SwAttrSet* GetAttrSet() const { return pAttrSet; }
 
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index dd149c7ad225..d8ea12b83da7 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -49,51 +49,51 @@
 
 // Not reentrant !!!
 // is set in GetCharRect and is interpreted in UnitUp/Down.
-bool SwTxtCursor::bRightMargin = false;
+bool SwTextCursor::bRightMargin = false;
 
 // After calculating the position of a character during GetCharRect
 // this function allows to find the coordinates of a position (defined
 // in pCMS->pSpecialPos) inside a special portion (e.g., a field)
-static void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig,
+static void lcl_GetCharRectInsideField( SwTextSizeInfo& rInf, SwRect& rOrig,
                                  const SwCrsrMoveState& rCMS,
                                  const SwLinePortion& rPor )
 {
     OSL_ENSURE( rCMS.pSpecialPos, "Information about special pos missing" );
 
-    if ( rPor.InFldGrp() && !static_cast<const SwFldPortion&>(rPor).GetExp().isEmpty() )
+    if ( rPor.InFieldGrp() && !static_cast<const SwFieldPortion&>(rPor).GetExp().isEmpty() )
     {
         const sal_Int32 nCharOfst = rCMS.pSpecialPos->nCharOfst;
-        sal_Int32 nFldIdx = 0;
-        sal_Int32 nFldLen = 0;
+        sal_Int32 nFieldIdx = 0;
+        sal_Int32 nFieldLen = 0;
 
         OUString sString;
         const OUString* pString = 0;
         const SwLinePortion* pPor = &rPor;
         do
         {
-            if ( pPor->InFldGrp() )
+            if ( pPor->InFieldGrp() )
             {
-                sString = static_cast<const SwFldPortion*>(pPor)->GetExp();
+                sString = static_cast<const SwFieldPortion*>(pPor)->GetExp();
                 pString = &sString;
-                nFldLen = pString->getLength();
+                nFieldLen = pString->getLength();
             }
             else
             {
                 pString = 0;
-                nFldLen = 0;
+                nFieldLen = 0;
             }
 
-            if ( ! pPor->GetPortion() || nFldIdx + nFldLen > nCharOfst )
+            if ( ! pPor->GetPortion() || nFieldIdx + nFieldLen > nCharOfst )
                 break;
 
-            nFldIdx = nFldIdx + nFldLen;
+            nFieldIdx = nFieldIdx + nFieldLen;
             rOrig.Pos().X() += pPor->Width();
             pPor = pPor->GetPortion();
 
         } while ( true );
 
-        OSL_ENSURE( nCharOfst >= nFldIdx, "Request of position inside field failed" );
-        sal_Int32 nLen = nCharOfst - nFldIdx + 1;
+        OSL_ENSURE( nCharOfst >= nFieldIdx, "Request of position inside field failed" );
+        sal_Int32 nLen = nCharOfst - nFieldIdx + 1;
 
         if ( pString )
         {
@@ -103,14 +103,14 @@ static void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig,
             sal_Int32 nOldLen = pPor->GetLen();
             const_cast<SwLinePortion*>(pPor)->SetLen( nLen - 1 );
             const SwTwips nX1 = pPor->GetLen() ?
-                                pPor->GetTxtSize( rInf ).Width() :
+                                pPor->GetTextSize( rInf ).Width() :
                                 0;
 
             SwTwips nX2 = 0;
             if ( rCMS.bRealWidth )
             {
                 const_cast<SwLinePortion*>(pPor)->SetLen( nLen );
-                nX2 = pPor->GetTxtSize( rInf ).Width();
+                nX2 = pPor->GetTextSize( rInf ).Width();
             }
 
             const_cast<SwLinePortion*>(pPor)->SetLen( nOldLen );
@@ -131,13 +131,13 @@ static void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig,
 
 // #i111284#
 namespace {
-    bool AreListLevelIndentsApplicableAndLabelAlignmentActive( const SwTxtNode& rTxtNode )
+    bool AreListLevelIndentsApplicableAndLabelAlignmentActive( const SwTextNode& rTextNode )
     {
         bool bRet( false );
 
-        if ( rTxtNode.GetNumRule() && rTxtNode.AreListLevelIndentsApplicable() )
+        if ( rTextNode.GetNumRule() && rTextNode.AreListLevelIndentsApplicable() )
         {
-            int nListLevel = rTxtNode.GetActualListLevel();
+            int nListLevel = rTextNode.GetActualListLevel();
 
             if (nListLevel < 0)
                 nListLevel = 0;
@@ -145,9 +145,9 @@ namespace {
             if (nListLevel >= MAXLEVEL)
                 nListLevel = MAXLEVEL - 1;
 
-            const SwNumFmt& rNumFmt =
-                    rTxtNode.GetNumRule()->Get( static_cast<sal_uInt16>(nListLevel) );
-            if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+            const SwNumFormat& rNumFormat =
+                    rTextNode.GetNumRule()->Get( static_cast<sal_uInt16>(nListLevel) );
+            if ( rNumFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
             {
                 bRet = true;
             }
@@ -157,19 +157,19 @@ namespace {
     }
 } // end of anonymous namespace
 
-void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
+void SwTextMargin::CtorInitTextMargin( SwTextFrm *pNewFrm, SwTextSizeInfo *pNewInf )
 {
-    CtorInitTxtIter( pNewFrm, pNewInf );
+    CtorInitTextIter( pNewFrm, pNewInf );
 
     pInf = pNewInf;
     GetInfo().SetFont( GetFnt() );
-    const SwTxtNode *pNode = pFrm->GetTxtNode();
+    const SwTextNode *pNode = pFrm->GetTextNode();
 
-    const SvxLRSpaceItem &rSpace = pFrm->GetTxtNode()->GetSwAttrSet().GetLRSpace();
+    const SvxLRSpaceItem &rSpace = pFrm->GetTextNode()->GetSwAttrSet().GetLRSpace();
     // #i95907#
     // #i111284#
     const bool bListLevelIndentsApplicableAndLabelAlignmentActive(
-        AreListLevelIndentsApplicableAndLabelAlignmentActive( *(pFrm->GetTxtNode()) ) );
+        AreListLevelIndentsApplicableAndLabelAlignmentActive( *(pFrm->GetTextNode()) ) );
 
     // Carefully adjust the text formatting ranges.
 
@@ -192,10 +192,10 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
                 pNode->GetLeftMarginWithNum() -
                 // #i95907#
                 // #i111284#
-                // rSpace.GetLeft() + rSpace.GetTxtLeft();
+                // rSpace.GetLeft() + rSpace.GetTextLeft();
                 ( bListLevelIndentsApplicableAndLabelAlignmentActive
                   ? 0
-                  : ( rSpace.GetLeft() - rSpace.GetTxtLeft() ) );
+                  : ( rSpace.GetLeft() - rSpace.GetTextLeft() ) );
     }
     else
     {
@@ -213,12 +213,12 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
                     // #i111284#
                     ( bListLevelIndentsApplicableAndLabelAlignmentActive
                       ? 0
-                      : ( rSpace.GetLeft() - rSpace.GetTxtLeft() ) );
+                      : ( rSpace.GetLeft() - rSpace.GetTextLeft() ) );
         }
         else
         {
             nLeft = pFrm->Frm().Left() +
-                    std::max( long( rSpace.GetTxtLeft() + nLMWithNum ),
+                    std::max( long( rSpace.GetTextLeft() + nLMWithNum ),
                          pFrm->Prt().Left() );
         }
     }
@@ -307,11 +307,11 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
         else
         {
               nFirst = pFrm->Frm().Left() +
-                     std::max( rSpace.GetTxtLeft() + nLMWithNum+ nFirstLineOfs,
+                     std::max( rSpace.GetTextLeft() + nLMWithNum+ nFirstLineOfs,
                           pFrm->Prt().Left() );
         }
 
-        // Note: <SwTxtFrm::GetAdditionalFirstLineOffset()> returns a negative
+        // Note: <SwTextFrm::GetAdditionalFirstLineOffset()> returns a negative
         //       value for the new list label position and space mode LABEL_ALIGNMENT
         //       and label alignment CENTER and RIGHT in L2R layout respectively
         //       label alignment LEFT and CENTER in R2L layout
@@ -320,7 +320,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
         if( nFirst >= nRight )
             nFirst = nRight - 1;
     }
-    const SvxAdjustItem& rAdjust = pFrm->GetTxtNode()->GetSwAttrSet().GetAdjust();
+    const SvxAdjustItem& rAdjust = pFrm->GetTextNode()->GetSwAttrSet().GetAdjust();
     nAdjust = static_cast<sal_uInt16>(rAdjust.GetAdjust());
 
     // left is left and right is right
@@ -350,7 +350,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
     DropInit();
 }
 
-void SwTxtMargin::DropInit()
+void SwTextMargin::DropInit()
 {
     nDropLeft = nDropLines = nDropHeight = nDropDescent = 0;
     const SwParaPortion *pPara = GetInfo().GetParaPortion();
@@ -368,7 +368,7 @@ void SwTxtMargin::DropInit()
 }
 
 // The function is interpreting / observing / evaluating / keeping / respecting the first line indention and the specified width.
-SwTwips SwTxtMargin::GetLineStart() const
+SwTwips SwTextMargin::GetLineStart() const
 {
     SwTwips nRet = GetLeftMargin();
     if( GetAdjust() != SVX_ADJUST_LEFT &&
@@ -384,15 +384,15 @@ SwTwips SwTxtMargin::GetLineStart() const
     return nRet;
 }
 
-void SwTxtCursor::CtorInitTxtCursor( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
+void SwTextCursor::CtorInitTextCursor( SwTextFrm *pNewFrm, SwTextSizeInfo *pNewInf )
 {
-    CtorInitTxtMargin( pNewFrm, pNewInf );
+    CtorInitTextMargin( pNewFrm, pNewInf );
     // 6096: Attention, the iterators are derived!
     // GetInfo().SetOut( GetInfo().GetWin() );
 }
 
 // 1170: Ancient bug: Shift-End forgets the last character ...
-bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst,
+bool SwTextCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                                   SwCrsrMoveState* pCMS, const long nMax )
 {
     // 1170: Ambiguity of document positions
@@ -406,7 +406,7 @@ bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst,
     {
         // 8810: Master line RightMargin, after that LeftMargin
         const bool bRet = GetCharRect( pOrig, nOfst, pCMS, nMax );
-        bRightMargin = nOfst >= GetEnd() && nOfst < GetInfo().GetTxt().getLength();
+        bRightMargin = nOfst >= GetEnd() && nOfst < GetInfo().GetText().getLength();
         return bRet;
     }
 
@@ -429,7 +429,7 @@ bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst,
     while( pPor )
     {
         nX = nX + pPor->Width();
-        if( pPor->InTxtGrp() || ( pPor->GetLen() && !pPor->IsFlyPortion()
+        if( pPor->InTextGrp() || ( pPor->GetLen() && !pPor->IsFlyPortion()
             && !pPor->IsHolePortion() ) || pPor->IsBreakPortion() )
         {
             nLast = nX;
@@ -460,17 +460,17 @@ bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst,
     return true;
 }
 
-// internal function, called by SwTxtCursor::GetCharRect() to calculate
+// internal function, called by SwTextCursor::GetCharRect() to calculate
 // the relative character position in the current line.
 // pOrig referes to x and y coordinates, width and height of the cursor
 // pCMS is used for restricting the cursor, if there are different font
 // heights in one line ( first value = offset to y of pOrig, second
 // value = real height of (shortened) cursor
-void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
+void SwTextCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
     SwCrsrMoveState* pCMS )
 {
-    const OUString aText = GetInfo().GetTxt();
-    SwTxtSizeInfo aInf( GetInfo(), &aText, nStart );
+    const OUString aText = GetInfo().GetText();
+    SwTextSizeInfo aInf( GetInfo(), &aText, nStart );
     if( GetPropFont() )
         aInf.GetFont()->SetProportion( GetPropFont() );
     sal_uInt16 nTmpAscent, nTmpHeight;  // Line height
@@ -511,11 +511,11 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
         size_t nKanaIdx = 0;
         long nSpaceAdd = pCurr->IsSpaceAdd() ? pCurr->GetLLSpaceAdd( 0 ) : 0;
 
-        bool bNoTxt = true;
+        bool bNoText = true;
 
         // First all portions without Len at beginning of line are skipped.
         // Exceptions are the mean special portions from WhichFirstPortion:
-        // Num, ErgoSum, FtnNum, FeldReste
+        // Num, ErgoSum, FootnoteNum, FeldReste
         // 8477: but also the only Textportion of an empty line with
         // Right/Center-Adjustment! So not just pPor->GetExpandPortion() ...
         while( pPor && !pPor->GetLen() && ! bInsideFirstField )
@@ -523,13 +523,13 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
             nX += pPor->Width();
             if ( pPor->InSpaceGrp() && nSpaceAdd )
                 nX += pPor->CalcSpacing( nSpaceAdd, aInf );
-            if( bNoTxt )
+            if( bNoText )
                 nTmpFirst = nX;
-            // 8670: EndPortions count once as TxtPortions.
-            // if( pPor->InTxtGrp() || pPor->IsBreakPortion() )
-            if( pPor->InTxtGrp() || pPor->IsBreakPortion() || pPor->InTabGrp() )
+            // 8670: EndPortions count once as TextPortions.
+            // if( pPor->InTextGrp() || pPor->IsBreakPortion() )
+            if( pPor->InTextGrp() || pPor->IsBreakPortion() || pPor->InTabGrp() )
             {
-                bNoTxt = false;
+                bNoText = false;
                 nTmpFirst = nX;
             }
             if( pPor->IsMultiPortion() && static_cast<SwMultiPortion*>(pPor)->HasTabulator() )
@@ -548,7 +548,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
             if( pPor->InFixMargGrp() )
             {
                 if( pPor->IsMarginPortion() )
-                    bNoTxt = false;
+                    bNoText = false;
                 else
                 {
                     // fix margin portion => next SpaceAdd, KanaComp value
@@ -575,7 +575,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
         else
         {
             if( !pPor->IsMarginPortion() && !pPor->IsPostItsPortion() &&
-                (!pPor->InFldGrp() || pPor->GetAscent() ) )
+                (!pPor->InFieldGrp() || pPor->GetAscent() ) )
             {
                 nPorHeight = pPor->Height();
                 nPorAscent = pPor->GetAscent();
@@ -584,7 +584,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                    ( bWidth && ( pPor->IsKernPortion() || pPor->IsMultiPortion() ) ) ) )
             {
                 if( !pPor->IsMarginPortion() && !pPor->IsPostItsPortion() &&
-                    (!pPor->InFldGrp() || pPor->GetAscent() ) )
+                    (!pPor->InFieldGrp() || pPor->GetAscent() ) )
                 {
                     nPorHeight = pPor->Height();
                     nPorAscent = pPor->GetAscent();
@@ -714,7 +714,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                             SetPropFont( 50 );
 
                         SwTextGridItem const*const pGrid(
-                                GetGridItem(GetTxtFrm()->FindPageFrm()));
+                                GetGridItem(GetTextFrm()->FindPageFrm()));
                         const bool bHasGrid = pGrid && GetInfo().SnapToGrid();
                         const sal_uInt16 nRubyHeight = bHasGrid ?
                                                    pGrid->GetRubyHeight() : 0;
@@ -886,7 +886,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                             SwTwips nTmp = nX;
                             aInf.SetKanaComp( pKanaComp );
                             aInf.SetKanaIdx( nKanaIdx );
-                            nX += pPor->GetTxtSize( aInf ).Width();
+                            nX += pPor->GetTextSize( aInf ).Width();
                             aInf.SetOnWin( bOldOnWin );
                             if ( pPor->InSpaceGrp() && nSpaceAdd )
                                 nX += pPor->CalcSpacing( nSpaceAdd, aInf );
@@ -895,7 +895,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                                 pPor->SetLen( pPor->GetLen() + 1 );
                                 aInf.SetLen( pPor->GetLen() );
                                 aInf.SetOnWin( false ); // keine BULLETs!
-                                nTmp += pPor->GetTxtSize( aInf ).Width();
+                                nTmp += pPor->GetTextSize( aInf ).Width();
                                 aInf.SetOnWin( bOldOnWin );
                                 if ( pPor->InSpaceGrp() && nSpaceAdd )
                                     nTmp += pPor->CalcSpacing(nSpaceAdd, aInf);
@@ -905,7 +905,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                         pPor->SetLen( nOldLen );
 
                         // Shift the cursor with the right border width
-                        // Note: nX remains positive because GetTxtSize() also include the width of the right border
+                        // Note: nX remains positive because GetTextSize() also include the width of the right border
                         if( aInf.GetIdx() < nOfst && nOfst < aInf.GetIdx() + pPor->GetLen() )
                         {
                             // Find the current drop portion part and use its right border
@@ -939,15 +939,15 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
         if( pPor )
         {
             OSL_ENSURE( !pPor->InNumberGrp() || bInsideFirstField, "Number surprise" );
-            bool bEmptyFld = false;
-            if( pPor->InFldGrp() && pPor->GetLen() )
+            bool bEmptyField = false;
+            if( pPor->InFieldGrp() && pPor->GetLen() )
             {
-                SwFldPortion *pTmp = static_cast<SwFldPortion*>(pPor);
+                SwFieldPortion *pTmp = static_cast<SwFieldPortion*>(pPor);
                 while( pTmp->HasFollow() && pTmp->GetExp().isEmpty() )
                 {
                     sal_uInt16 nAddX = pTmp->Width();
                     SwLinePortion *pNext = pTmp->GetPortion();
-                    while( pNext && !pNext->InFldGrp() )
+                    while( pNext && !pNext->InFieldGrp() )
                     {
                         OSL_ENSURE( !pNext->GetLen(), "Where's my field follow?" );
                         nAddX = nAddX + pNext->Width();
@@ -955,18 +955,18 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                     }
                     if( !pNext )
                         break;
-                    pTmp = static_cast<SwFldPortion*>(pNext);
+                    pTmp = static_cast<SwFieldPortion*>(pNext);
                     nPorHeight = pTmp->Height();
                     nPorAscent = pTmp->GetAscent();
                     nX += nAddX;
-                    bEmptyFld = true;
+                    bEmptyField = true;
                 }
             }
             // 8513: Fields in justified text, skipped
             while( pPor && !pPor->GetLen() && ! bInsideFirstField &&
                    ( pPor->IsFlyPortion() || pPor->IsKernPortion() ||
                      pPor->IsBlankPortion() || pPor->InTabGrp() ||
-                     ( !bEmptyFld && pPor->InFldGrp() ) ) )
+                     ( !bEmptyField && pPor->InFieldGrp() ) ) )
             {
                 if ( pPor->InSpaceGrp() && nSpaceAdd )
                     nX += pPor->PrtWidth() +
@@ -1032,7 +1032,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
             }
             if( pPor && pCMS )
             {
-                if( pCMS->bFieldInfo && pPor->InFldGrp() && pPor->Width() )
+                if( pCMS->bFieldInfo && pPor->InFieldGrp() && pPor->Width() )
                     pOrig->Width( pPor->Width() );
                 if( pPor->IsDropPortion() )
                 {
@@ -1076,7 +1076,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                         aInf.SetOnWin( false ); // keine BULLETs!
                         aInf.SetKanaComp( pKanaComp );
                         aInf.SetKanaIdx( nKanaIdx );
-                        nTmp = pPor->GetTxtSize( aInf ).Width();
+                        nTmp = pPor->GetTextSize( aInf ).Width();
                         aInf.SetOnWin( bOldOnWin );
                         if ( pPor->InSpaceGrp() && nSpaceAdd )
                             nTmp += pPor->CalcSpacing( nSpaceAdd, aInf );
@@ -1164,7 +1164,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
     }
 }
 
-bool SwTxtCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
+bool SwTextCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                                SwCrsrMoveState* pCMS, const long nMax )
 {
     CharCrsrToLine(nOfst);
@@ -1213,7 +1213,7 @@ bool SwTxtCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
         pCMS->p2Lines->aPortion.Pos().Y() += aCharPos.Y();
     }
 
-    const bool bTabOverMargin = GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVER_MARGIN);
+    const bool bTabOverMargin = GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVER_MARGIN);
     // Make sure the cursor respects the right margin, unless in compat mode, where the tab size has priority over the margin size.
     if( pOrig->Left() > nTmpRight && !bTabOverMargin)
         pOrig->Pos().X() = nTmpRight;
@@ -1238,13 +1238,13 @@ bool SwTxtCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                 pCMS->aRealHeight.Y() = nMax - nTmp;
         }
     }
-    long nOut = pOrig->Right() - GetTxtFrm()->Frm().Right();
+    long nOut = pOrig->Right() - GetTextFrm()->Frm().Right();
     if( nOut > 0 )
     {
-        if( GetTxtFrm()->Frm().Width() < GetTxtFrm()->Prt().Left()
-                                   + GetTxtFrm()->Prt().Width() )
-            nOut += GetTxtFrm()->Frm().Width() - GetTxtFrm()->Prt().Left()
-                    - GetTxtFrm()->Prt().Width();
+        if( GetTextFrm()->Frm().Width() < GetTextFrm()->Prt().Left()
+                                   + GetTextFrm()->Prt().Width() )
+            nOut += GetTextFrm()->Frm().Width() - GetTextFrm()->Prt().Left()
+                    - GetTextFrm()->Prt().Width();
         if( nOut > 0 )
             pOrig->Pos().X() -= nOut + 10;
     }
@@ -1253,13 +1253,13 @@ bool SwTxtCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
 }
 
 // Return: Offset in String
-sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
+sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
                                     bool nChgNode, SwCrsrMoveState* pCMS ) const
 {
     // If necessary, as catch up, do the adjustment
     GetAdjusted();
 
-    const OUString &rText = GetInfo().GetTxt();
+    const OUString &rText = GetInfo().GetText();
     sal_Int32 nOffset = 0;
 
     // x is the horizontal offset within the line.
@@ -1305,7 +1305,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
     {
         if ( pPor->InSpaceGrp() && nSpaceAdd )
         {
-            const_cast<SwTxtSizeInfo&>(GetInfo()).SetIdx( nCurrStart );
+            const_cast<SwTextSizeInfo&>(GetInfo()).SetIdx( nCurrStart );
             nWidth = nWidth + sal_uInt16( pPor->CalcSpacing( nSpaceAdd, GetInfo() ) );
         }
         if( ( pPor->InFixMargGrp() && ! pPor->IsMarginPortion() ) ||
@@ -1334,7 +1334,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
     if ( pPor->IsPostItsPortion() )
         nWidth30 = 30 + pPor->GetViewWidth( GetInfo() ) / 2;
     else
-        nWidth30 = ! nWidth && pPor->GetLen() && pPor->InToxRefOrFldGrp() ?
+        nWidth30 = ! nWidth && pPor->GetLen() && pPor->InToxRefOrFieldGrp() ?
                      30 :
                      nWidth;
 
@@ -1349,7 +1349,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
         {
             if ( pPor->InSpaceGrp() && nSpaceAdd )
             {
-                const_cast<SwTxtSizeInfo&>(GetInfo()).SetIdx( nCurrStart );
+                const_cast<SwTextSizeInfo&>(GetInfo()).SetIdx( nCurrStart );
                 nWidth = nWidth + sal_uInt16( pPor->CalcSpacing( nSpaceAdd, GetInfo() ) );
             }
 
@@ -1378,7 +1378,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
         if ( pPor->IsPostItsPortion() )
             nWidth30 = 30 +  pPor->GetViewWidth( GetInfo() ) / 2;
         else
-            nWidth30 = ! nWidth && pPor->GetLen() && pPor->InToxRefOrFldGrp() ?
+            nWidth30 = ! nWidth && pPor->GetLen() && pPor->InToxRefOrFieldGrp() ?
                          30 :
                          nWidth;
         if( !pPor->IsFlyPortion() && !pPor->IsMarginPortion() )
@@ -1390,7 +1390,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
     if( nX==nWidth )
     {
         SwLinePortion *pNextPor = pPor->GetPortion();
-        while( pNextPor && pNextPor->InFldGrp() && !pNextPor->Width() )
+        while( pNextPor && pNextPor->InFieldGrp() && !pNextPor->Width() )
         {
             nCurrStart = nCurrStart + pPor->GetLen();
             pPor = pNextPor;
@@ -1400,14 +1400,14 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
         }
     }
 
-    const_cast<SwTxtSizeInfo&>(GetInfo()).SetIdx( nOldIdx );
+    const_cast<SwTextSizeInfo&>(GetInfo()).SetIdx( nOldIdx );
 
     sal_Int32 nLength = pPor->GetLen();
 
     const bool bFieldInfo = pCMS && pCMS->bFieldInfo;
 
     if( bFieldInfo && ( nWidth30 < nX || bRightOver || bLeftOver ||
-        ( pPor->InNumberGrp() && !pPor->IsFtnNumPortion() ) ||
+        ( pPor->InNumberGrp() && !pPor->IsFootnoteNumPortion() ) ||
         ( pPor->IsMarginPortion() && nWidth > nX + 30 ) ) )
         static_cast<SwCrsrMoveState*>(pCMS)->bPosCorr = true;
 
@@ -1417,7 +1417,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
         if( pCMS->bInFrontOfLabel)
         {
             if (! (2 * nX < nWidth && pPor->InNumberGrp() &&
-                   !pPor->IsFtnNumPortion()))
+                   !pPor->IsFootnoteNumPortion()))
                 pCMS->bInFrontOfLabel = false;
         }
     }
@@ -1434,8 +1434,8 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
 
             if (!bRightOver && nX)
             {
-                if( pPor->IsFtnNumPortion())
-                    static_cast<SwCrsrMoveState*>(pCMS)->bFtnNoInfo = true;
+                if( pPor->IsFootnoteNumPortion())
+                    static_cast<SwCrsrMoveState*>(pCMS)->bFootnoteNoInfo = true;
                 else if (pPor->InNumberGrp() ) // #i23726#
                 {
                     static_cast<SwCrsrMoveState*>(pCMS)->nInNumPostionOffset = nX;
@@ -1453,7 +1453,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
               // in the last line of a centered paragraph
               nCurrStart < rText.getLength() ) )
             --nCurrStart;
-        else if( pPor->InFldGrp() && static_cast<SwFldPortion*>(pPor)->IsFollow()
+        else if( pPor->InFieldGrp() && static_cast<SwFieldPortion*>(pPor)->IsFollow()
                  && nWidth > nX )
         {
             if( bFieldInfo )
@@ -1476,7 +1476,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
             // Else we may not enter the character-supplying frame...
             if( !( nChgNode && pPos && pPor->IsFlyCntPortion() ) )
             {
-                if ( pPor->InFldGrp() ||
+                if ( pPor->InFieldGrp() ||
                      ( pPor->IsMultiPortion() &&
                        static_cast<SwMultiPortion*>(pPor)->IsBidi()  ) )
                 {
@@ -1489,8 +1489,8 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
                     }
 
                     if( nWidth - nHeight/2 <= nX &&
-                        ( ! pPor->InFldGrp() ||
-                          !static_cast<SwFldPortion*>(pPor)->HasFollow() ) )
+                        ( ! pPor->InFieldGrp() ||
+                          !static_cast<SwFieldPortion*>(pPor)->HasFollow() ) )
                         ++nCurrStart;
                 }
                 else if ( ( !pPor->IsFlyPortion() || ( pPor->GetPortion() &&
@@ -1513,9 +1513,9 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
             if ( pPor->IsPostItsPortion() || pPor->IsBreakPortion() ||
                  pPor->InToxRefGrp() )
                 return nCurrStart;
-            if ( pPor->InFldGrp() )
+            if ( pPor->InFieldGrp() )
             {
-                if( bRightOver && !static_cast<SwFldPortion*>(pPor)->HasFollow() )
+                if( bRightOver && !static_cast<SwFieldPortion*>(pPor)->HasFollow() )
                     ++nCurrStart;
                 return nCurrStart;
             }
@@ -1537,8 +1537,8 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
             // if we are in the first line of a double line portion, we have
             // to add a value to nTmpY for not staying in this line
             // we also want to skip the first line, if we are inside ruby
-            if ( ( static_cast<SwTxtSizeInfo*>(pInf)->IsMulti() &&
-                   static_cast<SwTxtSizeInfo*>(pInf)->IsFirstMulti() ) ||
+            if ( ( static_cast<SwTextSizeInfo*>(pInf)->IsMulti() &&
+                   static_cast<SwTextSizeInfo*>(pInf)->IsFirstMulti() ) ||
                  ( static_cast<SwMultiPortion*>(pPor)->IsRuby() &&
                    static_cast<SwMultiPortion*>(pPor)->OnTop() ) )
                 nTmpY += static_cast<SwMultiPortion*>(pPor)->Height();
@@ -1550,7 +1550,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
                  ! static_cast<SwMultiPortion*>(pPor)->OnTop() )
                 nTmpY = 0;
 
-            SwTxtCursorSave aSave( const_cast<SwTxtCursor*>(static_cast<const SwTxtCursor*>(this)), static_cast<SwMultiPortion*>(pPor),
+            SwTextCursorSave aSave( const_cast<SwTextCursor*>(static_cast<const SwTextCursor*>(this)), static_cast<SwMultiPortion*>(pPor),
                  nTmpY, nX, nCurrStart, nSpaceAdd );
 
             SwLayoutModeModifier aLayoutModeModifier( *GetInfo().GetOut() );
@@ -1582,7 +1582,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
             return GetCrsrOfst( pPos, Point( GetLineStart() + nX, rPoint.Y() ),
                                 nChgNode, pCMS );
         }
-        if( pPor->InTxtGrp() )
+        if( pPor->InTextGrp() )
         {
             sal_uInt8 nOldProp;
             if( GetPropFont() )
@@ -1593,9 +1593,9 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
             else
                 nOldProp = 0;
             {
-                SwTxtSizeInfo aSizeInf( GetInfo(), &rText, nCurrStart );
-                const_cast<SwTxtCursor*>(this)->SeekAndChg( aSizeInf );
-                SwTxtSlot aDiffTxt( &aSizeInf, static_cast<SwTxtPortion*>(pPor), false, false );
+                SwTextSizeInfo aSizeInf( GetInfo(), &rText, nCurrStart );
+                const_cast<SwTextCursor*>(this)->SeekAndChg( aSizeInf );
+                SwTextSlot aDiffText( &aSizeInf, static_cast<SwTextPortion*>(pPor), false, false );
                 SwFontSave aSave( aSizeInf, pPor->IsDropPortion() ?
                         static_cast<SwDropPortion*>(pPor)->GetFnt() : NULL );
 
@@ -1605,7 +1605,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
                 SwDrawTextInfo aDrawInf( aSizeInf.GetVsh(),
                                          *aSizeInf.GetOut(),
                                          &pPara->GetScriptInfo(),
-                                         aSizeInf.GetTxt(),
+                                         aSizeInf.GetText(),
                                          aSizeInf.GetIdx(),
                                          pPor->GetLen() );
 
@@ -1646,12 +1646,12 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
                     sal_Int32 nCharCnt = 0;
                     // #i41860# Thai justified alignemt needs some
                     // additional information:
-                    aDrawInf.SetNumberOfBlanks( pPor->InTxtGrp() ?
-                                                static_cast<const SwTxtPortion*>(pPor)->GetSpaceCnt( aSizeInf, nCharCnt ) :
+                    aDrawInf.SetNumberOfBlanks( pPor->InTextGrp() ?
+                                                static_cast<const SwTextPortion*>(pPor)->GetSpaceCnt( aSizeInf, nCharCnt ) :
                                                 0 );
                 }
 
-                if ( pPor->InFldGrp() && pCMS && pCMS->pSpecialPos )
+                if ( pPor->InFieldGrp() && pCMS && pCMS->pSpecialPos )
                     aDrawInf.SetLen( COMPLETE_STRING );
 
                 aDrawInf.SetSpace( nSpaceAdd );
@@ -1662,13 +1662,13 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
 
                 if ( SW_CJK == aSizeInf.GetFont()->GetActual() &&
                      pPara->GetScriptInfo().CountCompChg() &&
-                    ! pPor->InFldGrp() )
+                    ! pPor->InFieldGrp() )
                     aDrawInf.SetKanaComp( nKanaComp );
 
                 nLength = aSizeInf.GetFont()->_GetCrsrOfst( aDrawInf );
 
                 // get position inside field portion?
-                if ( pPor->InFldGrp() && pCMS && pCMS->pSpecialPos )
+                if ( pPor->InFieldGrp() && pCMS && pCMS->pSpecialPos )
                 {
                     pCMS->pSpecialPos->nCharOfst = nLength;
                     nLength = 0;
@@ -1698,7 +1698,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
                 SwFlyInCntFrm *pTmp = static_cast<SwFlyCntPortion*>(pPor)->GetFlyFrm();
                 SwFrm* pLower = pTmp->GetLower();
                 bool bChgNode = pLower
-                    && (pLower->IsTxtFrm() || pLower->IsLayoutFrm());
+                    && (pLower->IsTextFrm() || pLower->IsLayoutFrm());
                 Point aTmpPoint( rPoint );
 
                 if ( pFrm->IsRightToLeft() )
@@ -1715,7 +1715,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
                     // After a change of the frame, our font must be still
                     // available for/in the OutputDevice.
                     // For comparison: Paint and new SwFlyCntPortion !
-                    static_cast<SwTxtSizeInfo*>(pInf)->SelectFont();
+                    static_cast<SwTextSizeInfo*>(pInf)->SelectFont();
 
                     // 6776: The pIter->GetCrsrOfst is returning here
                     // from a nesting with COMPLETE_STRING.
@@ -1755,7 +1755,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
     true if any overlapping text portion has been found and put into list
     false if no portion overlaps, the list has been unchanged
 */
-bool SwTxtFrm::FillSelection( SwSelectionList& rSelList, const SwRect& rRect ) const
+bool SwTextFrm::FillSelection( SwSelectionList& rSelList, const SwRect& rRect ) const
 {
     bool bRet = false;
     // PaintArea() instead Frm() for negative indents
@@ -1767,7 +1767,7 @@ bool SwTxtFrm::FillSelection( SwSelectionList& rSelList, const SwRect& rRect ) c
         SwRect aRect( aTmpFrm );
         aRect.Intersection( rRect );
         // rNode without const to create SwPaMs
-        SwCntntNode &rNode = const_cast<SwCntntNode&>( *GetNode() );
+        SwContentNode &rNode = const_cast<SwContentNode&>( *GetNode() );
         SwNodeIndex aIdx( rNode );
         SwPosition aPosL( aIdx, SwIndex( &rNode, 0 ) );
         if( IsEmpty() )
@@ -1780,8 +1780,8 @@ bool SwTxtFrm::FillSelection( SwSelectionList& rSelList, const SwRect& rRect ) c
             sal_Int32 nOld = -1;
             SwPosition aPosR( aPosL );
             Point aPoint;
-            SwTxtInfo aInf( const_cast<SwTxtFrm*>(this) );
-            SwTxtIter aLine( const_cast<SwTxtFrm*>(this), &aInf );
+            SwTextInfo aInf( const_cast<SwTextFrm*>(this) );
+            SwTextIter aLine( const_cast<SwTextFrm*>(this), &aInf );
             // We have to care for top-to-bottom layout, where right becomes top etc.
             SWRECTFN( this )
             SwTwips nTop = (aRect.*fnRect->fnGetTop)();
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 505e017ebe7a..a8f5ff228ddd 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -70,28 +70,28 @@ using namespace ::com::sun::star;
 
 namespace {
     //! Calculates and sets optimal repaint offset for the current line
-    static long lcl_CalcOptRepaint( SwTxtFormatter &rThis,
+    static long lcl_CalcOptRepaint( SwTextFormatter &rThis,
                                     SwLineLayout &rCurr,
                                     const sal_Int32 nOldLineEnd,
                                     const std::vector<long> &rFlyStarts );
     //! Determine if we need to build hidden portions
-    static bool lcl_BuildHiddenPortion( const SwTxtSizeInfo& rInf, sal_Int32 &rPos );
+    static bool lcl_BuildHiddenPortion( const SwTextSizeInfo& rInf, sal_Int32 &rPos );
 
     // Check whether the two font has the same border
     static bool lcl_HasSameBorder(const SwFont& rFirst, const SwFont& rSecond);
 }
 
-inline void ClearFly( SwTxtFormatInfo &rInf )
+inline void ClearFly( SwTextFormatInfo &rInf )
 {
     delete rInf.GetFly();
     rInf.SetFly(0);
 }
 
-void SwTxtFormatter::CtorInitTxtFormatter( SwTxtFrm *pNewFrm, SwTxtFormatInfo *pNewInf )
+void SwTextFormatter::CtorInitTextFormatter( SwTextFrm *pNewFrm, SwTextFormatInfo *pNewInf )
 {
-    CtorInitTxtPainter( pNewFrm, pNewInf );
+    CtorInitTextPainter( pNewFrm, pNewInf );
     pInf = pNewInf;
-    pDropFmt = GetInfo().GetDropFmt();
+    pDropFormat = GetInfo().GetDropFormat();
     pMulti = NULL;
 
     bOnceMore = false;
@@ -105,15 +105,15 @@ void SwTxtFormatter::CtorInitTxtFormatter( SwTxtFrm *pNewFrm, SwTxtFormatInfo *p
     m_nHintEndIndex = 0;
     m_pFirstOfBorderMerge = 0;
 
-    if( nStart > GetInfo().GetTxt().getLength() )
+    if( nStart > GetInfo().GetText().getLength() )
     {
-        OSL_ENSURE( false, "+SwTxtFormatter::CTOR: bad offset" );
-        nStart = GetInfo().GetTxt().getLength();
+        OSL_ENSURE( false, "+SwTextFormatter::CTOR: bad offset" );
+        nStart = GetInfo().GetText().getLength();
     }
 
 }
 
-SwTxtFormatter::~SwTxtFormatter()
+SwTextFormatter::~SwTextFormatter()
 {
     // Extremely unlikely, but still possible
     // e.g.: field splits up, widows start to matter
@@ -124,7 +124,7 @@ SwTxtFormatter::~SwTxtFormatter()
     }
 }
 
-void SwTxtFormatter::Insert( SwLineLayout *pLay )
+void SwTextFormatter::Insert( SwLineLayout *pLay )
 {
     // Insert BEHIND the current element
     if ( pCurr )
@@ -136,12 +136,12 @@ void SwTxtFormatter::Insert( SwLineLayout *pLay )
         pCurr = pLay;
 }
 
-sal_uInt16 SwTxtFormatter::GetFrmRstHeight() const
+sal_uInt16 SwTextFormatter::GetFrmRstHeight() const
 {
     // We want the rest height relative to the page.
     // If we're in a table, then pFrm->GetUpper() is not the page.
 
-    // GetFrmRstHeight() is being called with Ftn.
+    // GetFrmRstHeight() is being called with Footnote.
     // Wrong: const SwFrm *pUpper = pFrm->GetUpper();
     const SwFrm *pPage = (const SwFrm*)pFrm->FindPageFrm();
     const SwTwips nHeight = pPage->Frm().Top()
@@ -153,7 +153,7 @@ sal_uInt16 SwTxtFormatter::GetFrmRstHeight() const
         return sal_uInt16( nHeight );
 }
 
-SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf )
+SwLinePortion *SwTextFormatter::Underflow( SwTextFormatInfo &rInf )
 {
     // Save values and initialize rInf
     SwLinePortion *pUnderflow = rInf.GetUnderflow();
@@ -218,16 +218,16 @@ SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf )
     }
 
     // What? The under-flow portion is not in the portion chain?
-    OSL_ENSURE( pPor, "SwTxtFormatter::Underflow: overflow but underflow" );
+    OSL_ENSURE( pPor, "SwTextFormatter::Underflow: overflow but underflow" );
 
     // OD 2004-05-26 #i29529# - correction: no delete of footnotes
-//    if( rInf.IsFtnInside() && pPor && !rInf.IsQuick() )
+//    if( rInf.IsFootnoteInside() && pPor && !rInf.IsQuick() )
 //    {
 //        SwLinePortion *pTmp = pPor->GetPortion();
 //        while( pTmp )
 //        {
-//            if( pTmp->IsFtnPortion() )
-//                ((SwFtnPortion*)pTmp)->ClearFtn();
+//            if( pTmp->IsFootnotePortion() )
+//                ((SwFootnotePortion*)pTmp)->ClearFootnote();
 //            pTmp = pTmp->GetPortion();
 //        }
 //    }
@@ -276,7 +276,7 @@ SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf )
     // Here inly the other way around:
     if( rInf.GetLast() == pCurr )
     {
-        if( pPor->InTxtGrp() && !pPor->InExpGrp() )
+        if( pPor->InTextGrp() && !pPor->InExpGrp() )
         {
             const sal_uInt16 nOldWhich = pCurr->GetWhichPor();
             *(SwLinePortion*)pCurr = *pPor;
@@ -289,8 +289,8 @@ SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf )
     }
     pPor->Truncate();
     SwLinePortion *const pRest( rInf.GetRest() );
-    if (pRest && pRest->InFldGrp() &&
-        static_cast<SwFldPortion*>(pRest)->IsNoLength())
+    if (pRest && pRest->InFieldGrp() &&
+        static_cast<SwFieldPortion*>(pRest)->IsNoLength())
     {
         // HACK: decrement again, so we pick up the suffix in next line!
         --m_nHintEndIndex;
@@ -300,7 +300,7 @@ SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf )
     return pPor;
 }
 
-void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf,
+void SwTextFormatter::InsertPortion( SwTextFormatInfo &rInf,
                                     SwLinePortion *pPor ) const
 {
     // The new portion is inserted, but everything's different for
@@ -313,7 +313,7 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf,
         }
 
         // #i112181#
-        rInf.SetOtherThanFtnInside( rInf.IsOtherThanFtnInside() || !pPor->IsFtnPortion() );
+        rInf.SetOtherThanFootnoteInside( rInf.IsOtherThanFootnoteInside() || !pPor->IsFootnotePortion() );
     }
     else
     {
@@ -326,7 +326,7 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf,
         }
         pLast->Insert( pPor );
 
-        rInf.SetOtherThanFtnInside( rInf.IsOtherThanFtnInside() || !pPor->IsFtnPortion() );
+        rInf.SetOtherThanFootnoteInside( rInf.IsOtherThanFootnoteInside() || !pPor->IsFootnotePortion() );
 
         // Adjust maxima
         if( pCurr->Height() < pPor->Height() )
@@ -345,14 +345,14 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf,
     }
 }
 
-void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
+void SwTextFormatter::BuildPortions( SwTextFormatInfo &rInf )
 {
-    OSL_ENSURE( rInf.GetTxt().getLength() < COMPLETE_STRING,
-            "SwTxtFormatter::BuildPortions: bad text length in info" );
+    OSL_ENSURE( rInf.GetText().getLength() < COMPLETE_STRING,
+            "SwTextFormatter::BuildPortions: bad text length in info" );
 
     rInf.ChkNoHyph( CntEndHyph(), CntMidHyph() );
 
-    // First NewTxtPortion() decides whether pCurr ends up in pPor.
+    // First NewTextPortion() decides whether pCurr ends up in pPor.
     // We need to make sure that the font is being set in any case.
     // This is done automatically in CalcAscent.
     rInf.SetLast( pCurr );
@@ -366,7 +366,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
     SeekAndChg( rInf );
 
     // Width() is shortened in CalcFlyWidth if we have a FlyPortion
-    OSL_ENSURE( !rInf.X() || pMulti, "SwTxtFormatter::BuildPortion X=0?" );
+    OSL_ENSURE( !rInf.X() || pMulti, "SwTextFormatter::BuildPortion X=0?" );
     CalcFlyWidth( rInf );
     SwFlyPortion *pFly = rInf.GetFly();
     if( pFly )
@@ -384,7 +384,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
     const bool bHasGrid = pGrid && rInf.SnapToGrid() &&
                               GRID_LINES_CHARS == pGrid->GetGridType();
 
-    const SwDoc *pDoc = rInf.GetTxtFrm()->GetNode()->GetDoc();
+    const SwDoc *pDoc = rInf.GetTextFrm()->GetNode()->GetDoc();
     const sal_uInt16 nGridWidth = (bHasGrid) ? GetGridWidth(*pGrid, *pDoc) : 0;
 
     // used for grid mode only:
@@ -399,16 +399,16 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
     while( pPor && !rInf.IsStop() )
     {
         OSL_ENSURE( rInf.GetLen() < COMPLETE_STRING &&
-                rInf.GetIdx() <= rInf.GetTxt().getLength(),
-                "SwTxtFormatter::BuildPortions: bad length in info" );
+                rInf.GetIdx() <= rInf.GetText().getLength(),
+                "SwTextFormatter::BuildPortions: bad length in info" );
 
         // We have to check the script for fields in order to set the
         // correct nActual value for the font.
-        if( pPor->InFldGrp() )
-            static_cast<SwFldPortion*>(pPor)->CheckScript( rInf );
+        if( pPor->InFieldGrp() )
+            static_cast<SwFieldPortion*>(pPor)->CheckScript( rInf );
 
         if( ! bHasGrid && rInf.HasScriptSpace() &&
-            rInf.GetLast() && rInf.GetLast()->InTxtGrp() &&
+            rInf.GetLast() && rInf.GetLast()->InTextGrp() &&
             rInf.GetLast()->Width() && !rInf.GetLast()->InNumberGrp() )
         {
             sal_uInt8 nNxtActual = rInf.GetFont()->GetActual();
@@ -419,24 +419,24 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
 
             // are there any punctuation characters on both sides
             // of the kerning portion?
-            if ( pPor->InFldGrp() )
+            if ( pPor->InFieldGrp() )
             {
-                OUString aAltTxt;
-                if ( static_cast<SwFldPortion*>(pPor)->GetExpTxt( rInf, aAltTxt ) &&
-                        !aAltTxt.isEmpty() )
+                OUString aAltText;
+                if ( static_cast<SwFieldPortion*>(pPor)->GetExpText( rInf, aAltText ) &&
+                        !aAltText.isEmpty() )
                 {
-                    bAllowBehind = rCC.isLetterNumeric( aAltTxt, 0 );
+                    bAllowBehind = rCC.isLetterNumeric( aAltText, 0 );
 
-                    const SwFont* pTmpFnt = static_cast<SwFldPortion*>(pPor)->GetFont();
+                    const SwFont* pTmpFnt = static_cast<SwFieldPortion*>(pPor)->GetFont();
                     if ( pTmpFnt )
                         nNxtActual = pTmpFnt->GetActual();
                 }
             }
             else
             {
-                const OUString& rTxt = rInf.GetTxt();
+                const OUString& rText = rInf.GetText();
                 sal_Int32 nIdx = rInf.GetIdx();
-                bAllowBehind = nIdx < rTxt.getLength() && rCC.isLetterNumeric(rTxt, nIdx);
+                bAllowBehind = nIdx < rText.getLength() && rCC.isLetterNumeric(rText, nIdx);
             }
 
             const SwLinePortion* pLast = rInf.GetLast();
@@ -444,15 +444,15 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
             {
                 bool bAllowBefore = false;
 
-                if ( pLast->InFldGrp() )
+                if ( pLast->InFieldGrp() )
                 {
-                    OUString aAltTxt;
-                    if ( static_cast<const SwFldPortion*>(pLast)->GetExpTxt( rInf, aAltTxt ) &&
-                         !aAltTxt.isEmpty() )
+                    OUString aAltText;
+                    if ( static_cast<const SwFieldPortion*>(pLast)->GetExpText( rInf, aAltText ) &&
+                         !aAltText.isEmpty() )
                     {
-                        bAllowBefore = rCC.isLetterNumeric( aAltTxt, aAltTxt.getLength() - 1 );
+                        bAllowBefore = rCC.isLetterNumeric( aAltText, aAltText.getLength() - 1 );
 
-                        const SwFont* pTmpFnt = static_cast<const SwFldPortion*>(pLast)->GetFont();
+                        const SwFont* pTmpFnt = static_cast<const SwFieldPortion*>(pLast)->GetFont();
                         if ( pTmpFnt )
                         {
                             nLstActual = pTmpFnt->GetActual();
@@ -462,7 +462,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
                 }
                 else if ( rInf.GetIdx() )
                 {
-                    bAllowBefore = rCC.isLetterNumeric( rInf.GetTxt(), rInf.GetIdx() - 1 );
+                    bAllowBefore = rCC.isLetterNumeric( rInf.GetText(), rInf.GetIdx() - 1 );
                     // Note: ScriptType returns values in [1,4]
                     if ( bAllowBefore )
                         nLstActual = pScriptInfo->ScriptType( rInf.GetIdx() - 1 ) - 1;
@@ -475,7 +475,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
                 {
                     SwKernPortion* pKrn =
                         new SwKernPortion( *rInf.GetLast(), nLstHeight,
-                                           pLast->InFldGrp() && pPor->InFldGrp() );
+                                           pLast->InFieldGrp() && pPor->InFieldGrp() );
                     rInf.GetLast()->SetPortion( NULL );
                     InsertPortion( rInf, pKrn );
                 }
@@ -587,20 +587,20 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
             nUnderLineStart = 0;
 
         if( pPor->IsFlyCntPortion() || ( pPor->IsMultiPortion() &&
-            static_cast<SwMultiPortion*>(pPor)->HasFlyInCntnt() ) )
+            static_cast<SwMultiPortion*>(pPor)->HasFlyInContent() ) )
             SetFlyInCntBase();
         // bUnderflow needs to be reset or we wrap again at the next softhyphen
         if ( !bFull )
         {
             rInf.ClrUnderflow();
-            if( ! bHasGrid && rInf.HasScriptSpace() && pPor->InTxtGrp() &&
-                pPor->GetLen() && !pPor->InFldGrp() )
+            if( ! bHasGrid && rInf.HasScriptSpace() && pPor->InTextGrp() &&
+                pPor->GetLen() && !pPor->InFieldGrp() )
             {
                 // The distance between two different scripts is set
                 // to 20% of the fontheight.
                 sal_Int32 nTmp = rInf.GetIdx() + pPor->GetLen();
                 if( nTmp == pScriptInfo->NextScriptChg( nTmp - 1 ) &&
-                    nTmp != rInf.GetTxt().getLength() )
+                    nTmp != rInf.GetText().getLength() )
                 {
                     const sal_uInt16 nDist = (sal_uInt16)(rInf.GetFont()->GetHeight()/5);
 
@@ -609,8 +609,8 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
                         // we do not want a kerning portion if any end
                         // would be a punctuation character
                         const CharClass& rCC = GetAppCharClass();
-                        if ( rCC.isLetterNumeric( rInf.GetTxt(), nTmp - 1 ) &&
-                             rCC.isLetterNumeric( rInf.GetTxt(), nTmp ) )
+                        if ( rCC.isLetterNumeric( rInf.GetText(), nTmp - 1 ) &&
+                             rCC.isLetterNumeric( rInf.GetText(), nTmp ) )
                         {
                             // does the kerning portion still fit into the line?
                             if ( rInf.X() + pPor->Width() + nDist <= rInf.Width() )
@@ -629,7 +629,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
             const SwTwips nRestWidth = rInf.Width() - rInf.X() - pPor->Width();
 
             const sal_uInt8 nCurrScript = pFnt->GetActual(); // pScriptInfo->ScriptType( rInf.GetIdx() );
-            const sal_uInt8 nNextScript = nTmp >= rInf.GetTxt().getLength() ?
+            const sal_uInt8 nNextScript = nTmp >= rInf.GetText().getLength() ?
                                      SW_CJK :
                                      SwScriptInfo::WhichFont( nTmp, 0, pScriptInfo );
 
@@ -672,7 +672,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
             }
             else if ( pPor->IsMultiPortion() || pPor->InFixMargGrp() ||
                       pPor->IsFlyCntPortion() || pPor->InNumberGrp() ||
-                      pPor->InFldGrp() || nCurrScript != nNextScript )
+                      pPor->InFieldGrp() || nCurrScript != nNextScript )
                 // next portion should snap to grid
                 pGridKernPortion = 0;
         }
@@ -712,7 +712,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
     rInf.SetTabOverflow( false );
 }
 
-void SwTxtFormatter::CalcAdjustLine( SwLineLayout *pCurrent )
+void SwTextFormatter::CalcAdjustLine( SwLineLayout *pCurrent )
 {
     if( SVX_ADJUST_LEFT != GetAdjust() && !pMulti)
     {
@@ -727,16 +727,16 @@ void SwTxtFormatter::CalcAdjustLine( SwLineLayout *pCurrent )
     }
 }
 
-void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor )
+void SwTextFormatter::CalcAscent( SwTextFormatInfo &rInf, SwLinePortion *pPor )
 {
     bool bCalc = false;
-    if ( pPor->InFldGrp() && static_cast<SwFldPortion*>(pPor)->GetFont() )
+    if ( pPor->InFieldGrp() && static_cast<SwFieldPortion*>(pPor)->GetFont() )
     {
-        // Numbering + InterNetFlds can keep an own font, then their size is
+        // Numbering + InterNetFields can keep an own font, then their size is
         // independent from hard attribute values
-        SwFont* pFldFnt = static_cast<SwFldPortion*>(pPor)->pFnt;
-        SwFontSave aSave( rInf, pFldFnt );
-        pPor->Height( rInf.GetTxtHeight() );
+        SwFont* pFieldFnt = static_cast<SwFieldPortion*>(pPor)->pFnt;
+        SwFontSave aSave( rInf, pFieldFnt );
+        pPor->Height( rInf.GetTextHeight() );
         pPor->SetAscent( rInf.GetAscent() );
         bCalc = true;
     }
@@ -764,7 +764,7 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor )
         {
             if( bFirstPor )
             {
-                if( !rInf.GetTxt().isEmpty() )
+                if( !rInf.GetText().isEmpty() )
                 {
                     if ( pPor->GetLen() || !rInf.GetIdx()
                          || ( pCurr != pLast && !pLast->IsFlyPortion() )
@@ -787,10 +787,10 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor )
                 bChg = SeekAndChg( rInf );
         }
         if( bChg || bFirstPor || !pPor->GetAscent()
-            || !rInf.GetLast()->InTxtGrp() )
+            || !rInf.GetLast()->InTextGrp() )
         {
             pPor->SetAscent( rInf.GetAscent()  );
-            pPor->Height( rInf.GetTxtHeight() );
+            pPor->Height( rInf.GetTextHeight() );
             bCalc = true;
         }
         else
@@ -800,7 +800,7 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor )
         }
     }
 
-    if( pPor->InTxtGrp() && bCalc )
+    if( pPor->InTextGrp() && bCalc )
     {
         pPor->SetAscent(pPor->GetAscent() +
             rInf.GetFont()->GetTopBorderSpace());
@@ -810,20 +810,20 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor )
     }
 }
 
-class SwMetaPortion : public SwTxtPortion
+class SwMetaPortion : public SwTextPortion
 {
 public:
     inline  SwMetaPortion() { SetWhichPor( POR_META ); }
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
 //    OUTPUT_OPERATOR
 };
 
-void SwMetaPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwMetaPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if ( Width() )
     {
         rInf.DrawViewOpt( *this, POR_META );
-        SwTxtPortion::Paint( rInf );
+        SwTextPortion::Paint( rInf );
     }
 }
 
@@ -848,16 +848,16 @@ namespace sw { namespace mark {
     }
 } }
 
-SwTxtPortion *SwTxtFormatter::WhichTxtPor( SwTxtFormatInfo &rInf ) const
+SwTextPortion *SwTextFormatter::WhichTextPor( SwTextFormatInfo &rInf ) const
 {
-    SwTxtPortion *pPor = 0;
+    SwTextPortion *pPor = 0;
     if( GetFnt()->IsTox() )
     {
         pPor = new SwToxPortion;
     }
     else if ( GetFnt()->IsInputField() )
     {
-        pPor = new SwTxtInputFldPortion();
+        pPor = new SwTextInputFieldPortion();
     }
     else
     {
@@ -872,13 +872,13 @@ SwTxtPortion *SwTxtFormatter::WhichTxtPor( SwTxtFormatInfo &rInf ) const
             // Only at the End!
             // If pCurr does not have a width, it can however already have content.
             // E.g. for non-displayable characters
-            if (rInf.GetTxt()[rInf.GetIdx()]==CH_TXT_ATR_FIELDSTART)
+            if (rInf.GetText()[rInf.GetIdx()]==CH_TXT_ATR_FIELDSTART)
                 pPor = new SwFieldMarkPortion();
-            else if (rInf.GetTxt()[rInf.GetIdx()]==CH_TXT_ATR_FIELDEND)
+            else if (rInf.GetText()[rInf.GetIdx()]==CH_TXT_ATR_FIELDEND)
                 pPor = new SwFieldMarkPortion();
-            else if (rInf.GetTxt()[rInf.GetIdx()]==CH_TXT_ATR_FORMELEMENT)
+            else if (rInf.GetText()[rInf.GetIdx()]==CH_TXT_ATR_FORMELEMENT)
             {
-                SwTxtNode *pNd = const_cast<SwTxtNode *>(rInf.GetTxtFrm()->GetTxtNode());
+                SwTextNode *pNd = const_cast<SwTextNode *>(rInf.GetTextFrm()->GetTextNode());
                 const SwDoc *doc = pNd->GetDoc();
                 SwIndex aIndex(pNd, rInf.GetIdx());
                 SwPosition aPosition(*pNd, aIndex);
@@ -913,7 +913,7 @@ SwTxtPortion *SwTxtFormatter::WhichTxtPor( SwTxtFormatInfo &rInf ) const
                     pPor = pCurr;
                 else
                 {
-                    pPor = new SwTxtPortion;
+                    pPor = new SwTextPortion;
                     if ( GetFnt()->IsURL() )
                     {
                         pPor->SetWhichPor( POR_URL );
@@ -931,16 +931,16 @@ SwTxtPortion *SwTxtFormatter::WhichTxtPor( SwTxtFormatInfo &rInf ) const
 // 3) CH_TXTATR_BREAKWORD / CH_TXTATR_INWORD
 // 4) next attribute change
 
-SwTxtPortion *SwTxtFormatter::NewTxtPortion( SwTxtFormatInfo &rInf )
+SwTextPortion *SwTextFormatter::NewTextPortion( SwTextFormatInfo &rInf )
 {
     // If we're at the line's beginning, we take pCurr
-    // If pCurr is not derived from SwTxtPortion, we need to duplicate
+    // If pCurr is not derived from SwTextPortion, we need to duplicate
     Seek( rInf.GetIdx() );
-    SwTxtPortion *pPor = WhichTxtPor( rInf );
+    SwTextPortion *pPor = WhichTextPor( rInf );
 
     // until next attribute change:
     const sal_Int32 nNextAttr = GetNextAttr();
-    sal_Int32 nNextChg = std::min( nNextAttr, rInf.GetTxt().getLength() );
+    sal_Int32 nNextChg = std::min( nNextAttr, rInf.GetText().getLength() );
 
     // end of script type:
     const sal_Int32 nNextScript = pScriptInfo->NextScriptChg( rInf.GetIdx() );
@@ -973,7 +973,7 @@ SwTxtPortion *SwTxtFormatter::NewTxtPortion( SwTxtFormatInfo &rInf )
         nExpect = 1;
     nExpect = rInf.GetIdx() + ((rInf.Width() - rInf.X()) / nExpect);
     if( nExpect > rInf.GetIdx() && nNextChg > nExpect )
-        nNextChg = std::min( nExpect, rInf.GetTxt().getLength() );
+        nNextChg = std::min( nExpect, rInf.GetText().getLength() );
 
     // we keep an invariant during method calls:
     // there are no portion ending characters like hard spaces
@@ -996,7 +996,7 @@ SwTxtPortion *SwTxtFormatter::NewTxtPortion( SwTxtFormatInfo &rInf )
     return pPor;
 }
 
-SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
+SwLinePortion *SwTextFormatter::WhichFirstPortion(SwTextFormatInfo &rInf)
 {
     SwLinePortion *pPor = 0;
 
@@ -1010,8 +1010,8 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
         if( pPor->IsErgoSumPortion() )
             rInf.SetErgoDone(true);
         else
-            if( pPor->IsFtnNumPortion() )
-                rInf.SetFtnDone(true);
+            if( pPor->IsFootnoteNumPortion() )
+                rInf.SetFootnoteDone(true);
             else
                 if( pPor->InNumberGrp() )
                     rInf.SetNumDone(true);
@@ -1025,12 +1025,12 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
     // pFrm->GetOfst() == 0!
     if( rInf.GetIdx() )
     {
-        // We now too can elongate FtnPortions and ErgoSumPortions
+        // We now too can elongate FootnotePortions and ErgoSumPortions
 
         // 1. The ErgoSumTexts
         if( !rInf.IsErgoDone() )
         {
-            if( pFrm->IsInFtn() && !pFrm->GetIndPrev() )
+            if( pFrm->IsInFootnote() && !pFrm->GetIndPrev() )
                 pPor = (SwLinePortion*)NewErgoSumPortion( rInf );
             rInf.SetErgoDone( true );
         }
@@ -1048,7 +1048,7 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
         if ( ! pPor && ! pCurr->GetPortion() )
         {
             SwTextGridItem const*const pGrid(
-                    GetGridItem(GetTxtFrm()->FindPageFrm()));
+                    GetGridItem(GetTextFrm()->FindPageFrm()));
             if ( pGrid )
                 pPor = new SwKernPortion( *pCurr );
         }
@@ -1068,23 +1068,23 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
     else
     {
         // 5. The foot note count
-        if( !rInf.IsFtnDone() )
+        if( !rInf.IsFootnoteDone() )
         {
             OSL_ENSURE( ( ! rInf.IsMulti() && ! pMulti ) || pMulti->HasRotation(),
                      "Rotated number portion trouble" );
 
-            const bool bFtnNum = pFrm->IsFtnNumFrm();
-            rInf.GetParaPortion()->SetFtnNum( bFtnNum );
-            if( bFtnNum )
-                pPor = (SwLinePortion*)NewFtnNumPortion( rInf );
-            rInf.SetFtnDone( true );
+            const bool bFootnoteNum = pFrm->IsFootnoteNumFrm();
+            rInf.GetParaPortion()->SetFootnoteNum( bFootnoteNum );
+            if( bFootnoteNum )
+                pPor = (SwLinePortion*)NewFootnoteNumPortion( rInf );
+            rInf.SetFootnoteDone( true );
         }
 
         // 6. The ErgoSumTexts of course also exist in the TextMaster,
-        // it's crucial whether the SwFtnFrm is aFollow
+        // it's crucial whether the SwFootnoteFrm is aFollow
         if( !rInf.IsErgoDone() && !pPor && ! rInf.IsMulti() )
         {
-            if( pFrm->IsInFtn() && !pFrm->GetIndPrev() )
+            if( pFrm->IsInFootnote() && !pFrm->GetIndPrev() )
                 pPor = (SwLinePortion*)NewErgoSumPortion( rInf );
             rInf.SetErgoDone( true );
         }
@@ -1096,19 +1096,19 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
                      "Rotated number portion trouble" );
 
             // If we're in the follow, then of course not
-            if( GetTxtFrm()->GetTxtNode()->GetNumRule() )
+            if( GetTextFrm()->GetTextNode()->GetNumRule() )
                 pPor = (SwLinePortion*)NewNumberPortion( rInf );
             rInf.SetNumDone( true );
         }
         // 8. The DropCaps
-        if( !pPor && GetDropFmt() && ! rInf.IsMulti() )
+        if( !pPor && GetDropFormat() && ! rInf.IsMulti() )
             pPor = (SwLinePortion*)NewDropPortion( rInf );
 
         // 9. Kerning portions at beginning of line in grid mode
         if ( !pPor && !pCurr->GetPortion() )
         {
             SwTextGridItem const*const pGrid(
-                    GetGridItem(GetTxtFrm()->FindPageFrm()));
+                    GetGridItem(GetTextFrm()->FindPageFrm()));
             if ( pGrid )
                 pPor = new SwKernPortion( *pCurr );
         }
@@ -1116,8 +1116,8 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
 
         // 10. Decimal tab portion at the beginning of each line in table cells
         if ( !pPor && !pCurr->GetPortion() &&
-             GetTxtFrm()->IsInTab() &&
-             GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT) )
+             GetTextFrm()->IsInTab() &&
+             GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT) )
         {
             pPor = NewTabPortion( rInf, true );
         }
@@ -1139,8 +1139,8 @@ static bool lcl_OldFieldRest( const SwLineLayout* pCurr )
     bool bRet = false;
     while( pPor && !bRet )
     {
-        bRet = (pPor->InFldGrp() && static_cast<const SwFldPortion*>(pPor)->IsFollow()) ||
-            (pPor->IsMultiPortion() && static_cast<const SwMultiPortion*>(pPor)->IsFollowFld());
+        bRet = (pPor->InFieldGrp() && static_cast<const SwFieldPortion*>(pPor)->IsFollow()) ||
+            (pPor->IsMultiPortion() && static_cast<const SwMultiPortion*>(pPor)->IsFollowField());
         if( !pPor->GetLen() )
             break;
         pPor = pPor->GetPortion();
@@ -1149,7 +1149,7 @@ static bool lcl_OldFieldRest( const SwLineLayout* pCurr )
 }
 
 /* NewPortion sets rInf.nLen
- * A SwTxtPortion is limited by a tab, break, txtatr or attr change
+ * A SwTextPortion is limited by a tab, break, txtatr or attr change
  * We can have three cases:
  * 1) The line is full and the wrap was not emulated
  *    -> return 0;
@@ -1159,13 +1159,13 @@ static bool lcl_OldFieldRest( const SwLineLayout* pCurr )
  *    -> CalcFlyWidth emulates the width and return portion, if needed
  */
 
-SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
+SwLinePortion *SwTextFormatter::NewPortion( SwTextFormatInfo &rInf )
 {
     // Underflow takes precedence
     rInf.SetStopUnderflow( false );
     if( rInf.GetUnderflow() )
     {
-        OSL_ENSURE( rInf.IsFull(), "SwTxtFormatter::NewPortion: underflow but not full" );
+        OSL_ENSURE( rInf.IsFull(), "SwTextFormatter::NewPortion: underflow but not full" );
         return Underflow( rInf );
     }
 
@@ -1193,8 +1193,8 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
             return rInf.GetFly();
         }
         // Ein fieser Sonderfall: ein Rahmen ohne Umlauf kreuzt den
-        // Ftn-Bereich. Wir muessen die Ftn-Portion als Zeilenrest
-        // bekanntgeben, damit SwTxtFrm::Format nicht abbricht
+        // Footnote-Bereich. Wir muessen die Footnote-Portion als Zeilenrest
+        // bekanntgeben, damit SwTextFrm::Format nicht abbricht
         // (die Textmasse wurde ja durchformatiert).
         if( rInf.GetRest() )
             rInf.SetNewLine( true );
@@ -1257,7 +1257,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
                     if ( rInf.SnapToGrid() )
                     {
                         SwTextGridItem const*const pGrid(
-                                GetGridItem(GetTxtFrm()->FindPageFrm()));
+                                GetGridItem(GetTextFrm()->FindPageFrm()));
                         if ( pGrid )
                         {
                             bRubyTop = ! pGrid->GetRubyTextBelow();
@@ -1266,12 +1266,12 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
                     }
 
                     pTmp = new SwRubyPortion( *pCreate, *rInf.GetFont(),
-                                              *GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess(),
+                                              *GetTextFrm()->GetTextNode()->getIDocumentSettingAccess(),
                                               nEnd, 0, pRubyPos );
                 }
                 else if( SW_MC_ROTATE == pCreate->nId )
                     pTmp = new SwRotatedPortion( *pCreate, nEnd,
-                                                 GetTxtFrm()->IsRightToLeft() );
+                                                 GetTextFrm()->IsRightToLeft() );
                 else
                     pTmp = new SwDoubleLinePortion( *pCreate, nEnd );
 
@@ -1289,17 +1289,17 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
             /* Wir holen uns nocheinmal cChar, um sicherzustellen, dass das
              * Tab jetzt wirklich ansteht und nicht auf die naechste Zeile
              * gewandert ist ( so geschehen hinter Rahmen ).
-             * Wenn allerdings eine FldPortion im Rest wartet, muessen wir
+             * Wenn allerdings eine FieldPortion im Rest wartet, muessen wir
              * das cChar natuerlich aus dem Feldinhalt holen, z.B. bei
              * DezimalTabs und Feldern (22615)
             */
-            if( !rInf.GetRest() || !rInf.GetRest()->InFldGrp() )
+            if( !rInf.GetRest() || !rInf.GetRest()->InFieldGrp() )
                 cChar = rInf.GetChar( rInf.GetIdx() );
             rInf.ClearHookChar();
         }
         else
         {
-            if( rInf.GetIdx() >= rInf.GetTxt().getLength() )
+            if( rInf.GetIdx() >= rInf.GetText().getLength() )
             {
                 rInf.SetFull(true);
                 CalcFlyWidth( rInf );
@@ -1346,7 +1346,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
                     // We have a decimal tab portion in the line and the next character has to be
                     // aligned at the tab stop position. We store the width from the beginning of
                     // the tab stop portion up to the portion containint the decimal separator:
-                  if ( GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT) /*rInf.GetVsh()->IsTabCompat();*/ &&
+                  if ( GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT) /*rInf.GetVsh()->IsTabCompat();*/ &&
                          POR_TABDECIMAL == pLastTabPortion->GetWhichPor() )
                     {
                         OSL_ENSURE( rInf.X() >= pLastTabPortion->Fix(), "Decimal tab stop position cannot be calculated" );
@@ -1372,7 +1372,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
                 {
                     if( rInf.IsFull() )
                         return 0;
-                    pPor = NewTxtPortion( rInf );
+                    pPor = NewTextPortion( rInf );
                 }
                 break;
             }
@@ -1396,20 +1396,20 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
     // choose a rotated character attribute.
     if ( pPor && ! pMulti )
     {
-        if ( pPor->IsFtnPortion() )
+        if ( pPor->IsFootnotePortion() )
         {
-            const SwTxtFtn* pTxtFtn = static_cast<SwFtnPortion*>(pPor)->GetTxtFtn();
+            const SwTextFootnote* pTextFootnote = static_cast<SwFootnotePortion*>(pPor)->GetTextFootnote();
 
-            if ( pTxtFtn )
+            if ( pTextFootnote )
             {
-                SwFmtFtn& rFtn = (SwFmtFtn&)pTxtFtn->GetFtn();
-                const SwDoc *pDoc = rInf.GetTxtFrm()->GetNode()->GetDoc();
+                SwFormatFootnote& rFootnote = (SwFormatFootnote&)pTextFootnote->GetFootnote();
+                const SwDoc *pDoc = rInf.GetTextFrm()->GetNode()->GetDoc();
                 const SwEndNoteInfo* pInfo;
-                if( rFtn.IsEndNote() )
+                if( rFootnote.IsEndNote() )
                     pInfo = &pDoc->GetEndNoteInfo();
                 else
-                    pInfo = &pDoc->GetFtnInfo();
-                const SwAttrSet& rSet = pInfo->GetAnchorCharFmt((SwDoc&)*pDoc)->GetAttrSet();
+                    pInfo = &pDoc->GetFootnoteInfo();
+                const SwAttrSet& rSet = pInfo->GetAnchorCharFormat((SwDoc&)*pDoc)->GetAttrSet();
 
                 const SfxPoolItem* pItem;
                 sal_uInt16 nDir = 0;
@@ -1428,11 +1428,11 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
         }
         else if ( pPor->InNumberGrp() )
         {
-            const SwFont* pNumFnt = static_cast<SwFldPortion*>(pPor)->GetFont();
+            const SwFont* pNumFnt = static_cast<SwFieldPortion*>(pPor)->GetFont();
 
             if ( pNumFnt )
             {
-                sal_uInt16 nDir = pNumFnt->GetOrientation( rInf.GetTxtFrm()->IsVertical() );
+                sal_uInt16 nDir = pNumFnt->GetOrientation( rInf.GetTextFrm()->IsVertical() );
                 if ( 0 != nDir )
                 {
                     delete pPor;
@@ -1441,7 +1441,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
                                                     DIR_TOP2BOTTOM );
 
                     rInf.SetNumDone( false );
-                    rInf.SetFtnDone( false );
+                    rInf.SetFootnoteDone( false );
                 }
             }
         }
@@ -1460,13 +1460,13 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
     // Werte bereithalten muss:
     if( !pCurr->Height() )
     {
-        OSL_ENSURE( pCurr->Height(), "SwTxtFormatter::NewPortion: limbo dance" );
+        OSL_ENSURE( pCurr->Height(), "SwTextFormatter::NewPortion: limbo dance" );
         pCurr->Height( pPor->Height() );
         pCurr->SetAscent( pPor->GetAscent() );
     }
 
     OSL_ENSURE( !pPor || pPor->Height(),
-            "SwTxtFormatter::NewPortion: something went wrong");
+            "SwTextFormatter::NewPortion: something went wrong");
     if( pPor->IsPostItsPortion() && rInf.X() >= rInf.Width() && rInf.GetFly() )
     {
         delete pPor;
@@ -1475,15 +1475,15 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
     return pPor;
 }
 
-sal_Int32 SwTxtFormatter::FormatLine(const sal_Int32 nStartPos)
+sal_Int32 SwTextFormatter::FormatLine(const sal_Int32 nStartPos)
 {
     OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
-            "SwTxtFormatter::FormatLine( nStartPos ) with unswapped frame" );
+            "SwTextFormatter::FormatLine( nStartPos ) with unswapped frame" );
 
     // For the formatting routines, we set pOut to the reference device.
     SwHookOut aHook( GetInfo() );
-    if( GetInfo().GetLen() < GetInfo().GetTxt().getLength() )
-        GetInfo().SetLen( GetInfo().GetTxt().getLength() );
+    if( GetInfo().GetLen() < GetInfo().GetText().getLength() )
+        GetInfo().SetLen( GetInfo().GetText().getLength() );
 
     bool bBuild = true;
     SetFlyInCntBase( false );
@@ -1500,11 +1500,11 @@ sal_Int32 SwTxtFormatter::FormatLine(const sal_Int32 nStartPos)
 
     // fly positioning can make it necessary format a line several times
     // for this, we have to keep a copy of our rest portion
-    SwLinePortion* pFld = GetInfo().GetRest();
-    boost::scoped_ptr<SwFldPortion> xSaveFld;
+    SwLinePortion* pField = GetInfo().GetRest();
+    boost::scoped_ptr<SwFieldPortion> xSaveField;
 
-    if ( pFld && pFld->InFldGrp() && !pFld->IsFtnPortion() )
-        xSaveFld.reset(new SwFldPortion( *static_cast<SwFldPortion*>(pFld) ));
+    if ( pField && pField->InFieldGrp() && !pField->IsFootnotePortion() )
+        xSaveField.reset(new SwFieldPortion( *static_cast<SwFieldPortion*>(pField) ));
 
     // for an optimal repaint rectangle, we want to compare fly portions
     // before and after the BuildPortions call
@@ -1531,8 +1531,8 @@ sal_Int32 SwTxtFormatter::FormatLine(const sal_Int32 nStartPos)
     // Hier folgt bald die Unterlaufpruefung.
     while( bBuild )
     {
-        GetInfo().SetFtnInside( false );
-        GetInfo().SetOtherThanFtnInside( false );
+        GetInfo().SetFootnoteInside( false );
+        GetInfo().SetOtherThanFootnoteInside( false );
 
         // These values must not be reset by FormatReset();
         const bool bOldNumDone = GetInfo().IsNumDone();
@@ -1588,8 +1588,8 @@ sal_Int32 SwTxtFormatter::FormatLine(const sal_Int32 nStartPos)
         }
         else
         {
-            bBuild = ( GetInfo().GetTxtFly().IsOn() && ChkFlyUnderflow(GetInfo()) )
-                     || GetInfo().CheckFtnPortion(pCurr);
+            bBuild = ( GetInfo().GetTextFly().IsOn() && ChkFlyUnderflow(GetInfo()) )
+                     || GetInfo().CheckFootnotePortion(pCurr);
             if( bBuild )
             {
                 GetInfo().SetNumDone( bOldNumDone );
@@ -1603,8 +1603,8 @@ sal_Int32 SwTxtFormatter::FormatLine(const sal_Int32 nStartPos)
                 }
 
                 // set original rest portion
-                if ( xSaveFld )
-                    GetInfo().SetRest( new SwFldPortion( *xSaveFld ) );
+                if ( xSaveField )
+                    GetInfo().SetRest( new SwFieldPortion( *xSaveField ) );
 
                 pCurr->SetLen( 0 );
                 pCurr->Width(0);
@@ -1616,7 +1616,7 @@ sal_Int32 SwTxtFormatter::FormatLine(const sal_Int32 nStartPos)
     // In case of compat mode, it's possible that a tab portion is wider after
     // formatting than before. If this is the case, we also have to make sure
     // the SwLineLayout is wider as well.
-    if (GetInfo().GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVER_MARGIN))
+    if (GetInfo().GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVER_MARGIN))
     {
         sal_uInt16 nSum = 0;
         SwLinePortion* pPor = pCurr->GetFirstPortion();
@@ -1649,7 +1649,7 @@ sal_Int32 SwTxtFormatter::FormatLine(const sal_Int32 nStartPos)
     GetInfo().GetParaPortion()->GetReformat().LeftMove( GetInfo().GetIdx() );
 
     // delete master copy of rest portion
-    xSaveFld.reset();
+    xSaveField.reset();
 
     sal_Int32 nNewStart = nStartPos + pCurr->GetLen();
 
@@ -1680,7 +1680,7 @@ sal_Int32 SwTxtFormatter::FormatLine(const sal_Int32 nStartPos)
     return nNewStart;
 }
 
-void SwTxtFormatter::RecalcRealHeight()
+void SwTextFormatter::RecalcRealHeight()
 {
     do
     {
@@ -1688,7 +1688,7 @@ void SwTxtFormatter::RecalcRealHeight()
     } while (Next());
 }
 
-void SwTxtFormatter::CalcRealHeight( bool bNewLine )
+void SwTextFormatter::CalcRealHeight( bool bNewLine )
 {
     sal_uInt16 nLineHeight = pCurr->Height();
     pCurr->SetClipping( false );
@@ -1736,7 +1736,7 @@ void SwTxtFormatter::CalcRealHeight( bool bNewLine )
     // Zeile am Absatzende geben (bei leeren Abs?tzen oder nach einem
     // Shift-Return), die das Register durchaus beachten soll.
     if( !pCurr->IsDummy() || ( !pCurr->GetNext() &&
-        GetStart() >= GetTxtFrm()->GetTxt().getLength() && !bNewLine ) )
+        GetStart() >= GetTextFrm()->GetText().getLength() && !bNewLine ) )
     {
         const SvxLineSpacingItem *pSpace = aLineInf.GetLineSpacing();
         if( pSpace )
@@ -1747,7 +1747,7 @@ void SwTxtFormatter::CalcRealHeight( bool bNewLine )
                     // shrink first line of paragraph too on spacing < 100%
                     if (IsParaLine() &&
                         pSpace->GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP
-                        && GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::PROP_LINE_SPACING_SHRINKS_FIRST_LINE))
+                        && GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::PROP_LINE_SPACING_SHRINKS_FIRST_LINE))
                     {
                         long nTmp = pSpace->GetPropLineSpace();
                         // Word will render < 50% too but it's just not readable
@@ -1844,7 +1844,7 @@ void SwTxtFormatter::CalcRealHeight( bool bNewLine )
     pCurr->SetRealHeight( nLineHeight );
 }
 
-void SwTxtFormatter::FeedInf( SwTxtFormatInfo &rInf ) const
+void SwTextFormatter::FeedInf( SwTextFormatInfo &rInf ) const
 {
     // 3260, 3860: Fly auf jeden Fall loeschen!
     ClearFly( rInf );
@@ -1865,9 +1865,9 @@ void SwTxtFormatter::FeedInf( SwTxtFormatInfo &rInf ) const
          nTmpRight > USHRT_MAX ||
          nTmpFirst > USHRT_MAX )
     {
-        SWRECTFN( rInf.GetTxtFrm() )
-        nTmpLeft = (rInf.GetTxtFrm()->Frm().*fnRect->fnGetLeft)();
-        nTmpRight = (rInf.GetTxtFrm()->Frm().*fnRect->fnGetRight)();
+        SWRECTFN( rInf.GetTextFrm() )
+        nTmpLeft = (rInf.GetTextFrm()->Frm().*fnRect->fnGetLeft)();
+        nTmpRight = (rInf.GetTextFrm()->Frm().*fnRect->fnGetRight)();
         nTmpFirst = nTmpLeft;
     }
 
@@ -1877,14 +1877,14 @@ void SwTxtFormatter::FeedInf( SwTxtFormatInfo &rInf ) const
 
     rInf.RealWidth( sal_uInt16(rInf.Right() - GetLeftMargin()) );
     rInf.Width( rInf.RealWidth() );
-    if( const_cast<SwTxtFormatter*>(this)->GetRedln() )
+    if( const_cast<SwTextFormatter*>(this)->GetRedln() )
     {
-        const_cast<SwTxtFormatter*>(this)->GetRedln()->Clear( const_cast<SwTxtFormatter*>(this)->GetFnt() );
-        const_cast<SwTxtFormatter*>(this)->GetRedln()->Reset();
+        const_cast<SwTextFormatter*>(this)->GetRedln()->Clear( const_cast<SwTextFormatter*>(this)->GetFnt() );
+        const_cast<SwTextFormatter*>(this)->GetRedln()->Reset();
     }
 }
 
-void SwTxtFormatter::FormatReset( SwTxtFormatInfo &rInf )
+void SwTextFormatter::FormatReset( SwTextFormatInfo &rInf )
 {
     pCurr->Truncate();
     pCurr->Init();
@@ -1898,12 +1898,12 @@ void SwTxtFormatter::FormatReset( SwTxtFormatInfo &rInf )
     FeedInf( rInf );
 }
 
-bool SwTxtFormatter::CalcOnceMore()
+bool SwTextFormatter::CalcOnceMore()
 {
-    if( pDropFmt )
+    if( pDropFormat )
     {
         const sal_uInt16 nOldDrop = GetDropHeight();
-        CalcDropHeight( pDropFmt->GetLines() );
+        CalcDropHeight( pDropFormat->GetLines() );
         bOnceMore = nOldDrop != GetDropHeight();
     }
     else
@@ -1911,10 +1911,10 @@ bool SwTxtFormatter::CalcOnceMore()
     return bOnceMore;
 }
 
-SwTwips SwTxtFormatter::CalcBottomLine() const
+SwTwips SwTextFormatter::CalcBottomLine() const
 {
     SwTwips nRet = Y() + GetLineHeight();
-    SwTwips nMin = GetInfo().GetTxtFly().GetMinBottom();
+    SwTwips nMin = GetInfo().GetTextFly().GetMinBottom();
     if( nMin && ++nMin > nRet )
     {
         SwTwips nDist = pFrm->Frm().Height() - pFrm->Prt().Height()
@@ -1928,7 +1928,7 @@ SwTwips SwTxtFormatter::CalcBottomLine() const
             {
                 ((SwRepaint&)GetInfo().GetParaPortion()
                     ->GetRepaint()).Bottom( nRet-1 );
-                ((SwTxtFormatInfo&)GetInfo()).SetPaintOfst( 0 );
+                ((SwTextFormatInfo&)GetInfo()).SetPaintOfst( 0 );
             }
         }
     }
@@ -1936,7 +1936,7 @@ SwTwips SwTxtFormatter::CalcBottomLine() const
 }
 
 // FME/OD: This routine does a limited text formatting.
-SwTwips SwTxtFormatter::_CalcFitToContent()
+SwTwips SwTextFormatter::_CalcFitToContent()
 {
     FormatReset( GetInfo() );
     BuildPortions( GetInfo() );
@@ -1946,8 +1946,8 @@ SwTwips SwTxtFormatter::_CalcFitToContent()
 
 // determines if the calculation of a repaint offset is allowed
 // otherwise each line is painted from 0 (this is a copy of the beginning
-// of the former SwTxtFormatter::Recycle() function
-bool SwTxtFormatter::AllowRepaintOpt() const
+// of the former SwTextFormatter::Recycle() function
+bool SwTextFormatter::AllowRepaintOpt() const
 {
     // reformat position in front of current line? Only in this case
     // we want to set the repaint offset
@@ -1989,7 +1989,7 @@ bool SwTxtFormatter::AllowRepaintOpt() const
     const sal_Int32 nReformat = GetInfo().GetReformatStart();
     if( bOptimizeRepaint && COMPLETE_STRING != nReformat )
     {
-        const sal_Unicode cCh = nReformat >= GetInfo().GetTxt().getLength() ? 0 : GetInfo().GetTxt()[ nReformat ];
+        const sal_Unicode cCh = nReformat >= GetInfo().GetText().getLength() ? 0 : GetInfo().GetText()[ nReformat ];
         bOptimizeRepaint = ( CH_TXTATR_BREAKWORD != cCh && CH_TXTATR_INWORD != cCh )
                             || ! GetInfo().HasHint( nReformat );
     }
@@ -1997,10 +1997,10 @@ bool SwTxtFormatter::AllowRepaintOpt() const
     return bOptimizeRepaint;
 }
 
-void SwTxtFormatter::CalcUnclipped( SwTwips& rTop, SwTwips& rBottom )
+void SwTextFormatter::CalcUnclipped( SwTwips& rTop, SwTwips& rBottom )
 {
     OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
-            "SwTxtFormatter::CalcUnclipped with unswapped frame" );
+            "SwTextFormatter::CalcUnclipped with unswapped frame" );
 
     long nFlyAsc, nFlyDesc;
     pCurr->MaxAscentDescent( rTop, rBottom, nFlyAsc, nFlyDesc );
@@ -2009,17 +2009,17 @@ void SwTxtFormatter::CalcUnclipped( SwTwips& rTop, SwTwips& rBottom )
     rTop -= nFlyAsc;
 }
 
-void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart,
+void SwTextFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart,
     sal_Int32 nStartIdx, bool bAlways ) const
 {
     OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
-            "SwTxtFormatter::UpdatePos with unswapped frame" );
+            "SwTextFormatter::UpdatePos with unswapped frame" );
 
     if( GetInfo().IsTest() )
         return;
     SwLinePortion *pFirst = pCurrent->GetFirstPortion();
     SwLinePortion *pPos = pFirst;
-    SwTxtPaintInfo aTmpInf( GetInfo() );
+    SwTextPaintInfo aTmpInf( GetInfo() );
     aTmpInf.SetpSpaceAdd( pCurrent->GetpLLSpaceAdd() );
     aTmpInf.ResetSpaceIdx();
     aTmpInf.SetKanaComp( pCurrent->GetpKanaComp() );
@@ -2084,18 +2084,18 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart,
             else
             {
                 Point aBase( aTmpInf.GetPos() );
-                if ( GetInfo().GetTxtFrm()->IsVertical() )
-                    GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( aBase );
+                if ( GetInfo().GetTextFrm()->IsVertical() )
+                    GetInfo().GetTextFrm()->SwitchHorizontalToVertical( aBase );
 
-                static_cast<SwFlyCntPortion*>(pPos)->SetBase( *aTmpInf.GetTxtFrm(),
+                static_cast<SwFlyCntPortion*>(pPos)->SetBase( *aTmpInf.GetTextFrm(),
                     aBase, nTmpAscent, nTmpDescent, nFlyAsc,
                     nFlyDesc, nFlags );
             }
         }
-        if( pPos->IsMultiPortion() && static_cast<SwMultiPortion*>(pPos)->HasFlyInCntnt() )
+        if( pPos->IsMultiPortion() && static_cast<SwMultiPortion*>(pPos)->HasFlyInContent() )
         {
             OSL_ENSURE( !GetMulti(), "Too much multi" );
-            const_cast<SwTxtFormatter*>(static_cast<const SwTxtFormatter*>(this))->pMulti = static_cast<SwMultiPortion*>(pPos);
+            const_cast<SwTextFormatter*>(static_cast<const SwTextFormatter*>(this))->pMulti = static_cast<SwMultiPortion*>(pPos);
             SwLineLayout *pLay = &GetMulti()->GetRoot();
             Point aSt( aTmpInf.X(), aStart.Y() );
 
@@ -2124,17 +2124,17 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart,
                 aSt.Y() += pLay->Height();
                 pLay = pLay->GetNext();
             } while ( pLay );
-            const_cast<SwTxtFormatter*>(this)->pMulti = NULL;
+            const_cast<SwTextFormatter*>(this)->pMulti = NULL;
         }
         pPos->Move( aTmpInf );
         pPos = pPos->GetPortion();
     }
 }
 
-void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const
+void SwTextFormatter::AlignFlyInCntBase( long nBaseLine ) const
 {
     OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
-            "SwTxtFormatter::AlignFlyInCntBase with unswapped frame" );
+            "SwTextFormatter::AlignFlyInCntBase with unswapped frame" );
 
     if( GetInfo().IsTest() )
         return;
@@ -2162,15 +2162,15 @@ void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const
             else
             {
                 Point aBase;
-                if ( GetInfo().GetTxtFrm()->IsVertical() )
+                if ( GetInfo().GetTextFrm()->IsVertical() )
                 {
-                    nBaseLine = GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( nBaseLine );
+                    nBaseLine = GetInfo().GetTextFrm()->SwitchHorizontalToVertical( nBaseLine );
                     aBase = Point( nBaseLine, static_cast<SwFlyCntPortion*>(pPos)->GetRefPoint().Y() );
                 }
                 else
                     aBase = Point( static_cast<SwFlyCntPortion*>(pPos)->GetRefPoint().X(), nBaseLine );
 
-                static_cast<SwFlyCntPortion*>(pPos)->SetBase( *GetInfo().GetTxtFrm(), aBase, nTmpAscent, nTmpDescent,
+                static_cast<SwFlyCntPortion*>(pPos)->SetBase( *GetInfo().GetTextFrm(), aBase, nTmpAscent, nTmpDescent,
                     nFlyAsc, nFlyDesc, nFlags );
             }
         }
@@ -2178,9 +2178,9 @@ void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const
     }
 }
 
-bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const
+bool SwTextFormatter::ChkFlyUnderflow( SwTextFormatInfo &rInf ) const
 {
-    OSL_ENSURE( rInf.GetTxtFly().IsOn(), "SwTxtFormatter::ChkFlyUnderflow: why?" );
+    OSL_ENSURE( rInf.GetTextFly().IsOn(), "SwTextFormatter::ChkFlyUnderflow: why?" );
     if( GetCurr() )
     {
         // First we check, whether a fly overlaps with the line.
@@ -2191,7 +2191,7 @@ bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const
         SwRect aLineVert( aLine );
         if ( pFrm->IsVertical() )
             pFrm->SwitchHorizontalToVertical( aLineVert );
-        SwRect aInter( rInf.GetTxtFly().GetFrm( aLineVert ) );
+        SwRect aInter( rInf.GetTextFly().GetFrm( aLineVert ) );
         if ( pFrm->IsVertical() )
             pFrm->SwitchVerticalToHorizontal( aInter );
 
@@ -2211,7 +2211,7 @@ bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const
             aLineVert = aLine;
             if ( pFrm->IsVertical() )
                 pFrm->SwitchHorizontalToVertical( aLineVert );
-            aInter = rInf.GetTxtFly().GetFrm( aLineVert );
+            aInter = rInf.GetTextFly().GetFrm( aLineVert );
             if ( pFrm->IsVertical() )
                 pFrm->SwitchVerticalToHorizontal( aInter );
 
@@ -2266,13 +2266,13 @@ bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const
     return false;
 }
 
-void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
+void SwTextFormatter::CalcFlyWidth( SwTextFormatInfo &rInf )
 {
     if( GetMulti() || rInf.GetFly() )
         return;
 
-    SwTxtFly& rTxtFly = rInf.GetTxtFly();
-    if( !rTxtFly.IsOn() || rInf.IsIgnoreFly() )
+    SwTextFly& rTextFly = rInf.GetTextFly();
+    if( !rTextFly.IsOn() || rInf.IsIgnoreFly() )
         return;
 
     const SwLinePortion *pLast = rInf.GetLast();
@@ -2317,7 +2317,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
 
     if ( pFrm->IsVertical() )
         pFrm->SwitchHorizontalToVertical( aLineVert );
-    SwRect aInter( rTxtFly.GetFrm( aLineVert ) );
+    SwRect aInter( rTextFly.GetFrm( aLineVert ) );
 
     if ( pFrm->IsRightToLeft() )
         pFrm->SwitchRTLtoLTR( aInter );
@@ -2331,9 +2331,9 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
         bool bForced = false;
         if( aInter.Left() <= nLeftMin )
         {
-            SwTwips nFrmLeft = GetTxtFrm()->Frm().Left();
-            if( GetTxtFrm()->Prt().Left() < 0 )
-                nFrmLeft += GetTxtFrm()->Prt().Left();
+            SwTwips nFrmLeft = GetTextFrm()->Frm().Left();
+            if( GetTextFrm()->Prt().Left() < 0 )
+                nFrmLeft += GetTextFrm()->Prt().Left();
             if( aInter.Left() < nFrmLeft )
                 aInter.Left( nFrmLeft );
 
@@ -2351,7 +2351,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
             // For a negative first line indent, we set this flag to show
             // that the indentation/margin has been moved.
             // This needs to be respected by the DefaultTab at the zero position.
-            if( IsFirstTxtLine() && HasNegFirst() )
+            if( IsFirstTextLine() && HasNegFirst() )
                 bForced = true;
         }
         aInter.Intersection( aLine );
@@ -2363,7 +2363,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
 
         // Although no text is left, we need to format another line,
         // because also empty lines need to avoid a Fly with no wrapping.
-        if( bFullLine && rInf.GetIdx() == rInf.GetTxt().getLength() )
+        if( bFullLine && rInf.GetIdx() == rInf.GetText().getLength() )
         {
             rInf.SetNewLine( true );
             // 8221: We know that for dummies, it holds ascent == height
@@ -2390,7 +2390,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
             // on this behaviour.
             // To my knowledge we only have two places where DummyLines can be
             // created: here and in MakeFlyDummies.
-            // IsDummy() is evaluated in IsFirstTxtLine(), when moving lines
+            // IsDummy() is evaluated in IsFirstTextLine(), when moving lines
             // and in relation with DropCaps.
             pFly->Height( sal_uInt16(aInter.Height()) );
 
@@ -2398,7 +2398,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
             // or the next margin's top edge, which we need to respect.
             // That means we can comfortably grow up to this value; that's how
             // we save a few empty lines.
-            long nNextTop = rTxtFly.GetNextTop();
+            long nNextTop = rTextFly.GetNextTop();
             if ( pFrm->IsVertical() )
                 nNextTop = pFrm->SwitchVerticalToHorizontal( nNextTop );
             if( nNextTop > aInter.Bottom() )
@@ -2414,7 +2414,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
         }
         else
         {
-            if( rInf.GetIdx() == rInf.GetTxt().getLength() )
+            if( rInf.GetIdx() == rInf.GetText().getLength() )
             {
                 // Don't use nHeight, or we have a huge descent
                 pFly->Height( pLast->Height() );
@@ -2447,7 +2447,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
                                     (pBody->*fnRect->fnGetPrtLeft)() :
                                     (pPageFrm->*fnRect->fnGetPrtLeft)();
 
-            const SwDoc *pDoc = rInf.GetTxtFrm()->GetNode()->GetDoc();
+            const SwDoc *pDoc = rInf.GetTextFrm()->GetNode()->GetDoc();
             const sal_uInt16 nGridWidth = GetGridWidth(*pGrid, *pDoc);
 
             SwTwips nStartX = GetLeftMargin();
@@ -2472,16 +2472,16 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
     }
 }
 
-SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf,
-                                                   SwTxtAttr *pHint ) const
+SwFlyCntPortion *SwTextFormatter::NewFlyCntPortion( SwTextFormatInfo &rInf,
+                                                   SwTextAttr *pHint ) const
 {
     SwFlyCntPortion *pRet = 0;
     const SwFrm *pFrame = (SwFrm*)pFrm;
 
     SwFlyInCntFrm *pFly;
-    SwFrmFmt* pFrmFmt = static_cast<SwTxtFlyCnt*>(pHint)->GetFlyCnt().GetFrmFmt();
-    if( RES_FLYFRMFMT == pFrmFmt->Which() )
-        pFly = static_cast<SwTxtFlyCnt*>(pHint)->GetFlyFrm(pFrame);
+    SwFrameFormat* pFrameFormat = static_cast<SwTextFlyCnt*>(pHint)->GetFlyCnt().GetFrameFormat();
+    if( RES_FLYFRMFMT == pFrameFormat->Which() )
+        pFly = static_cast<SwTextFlyCnt*>(pHint)->GetFlyFrm(pFrame);
     else
         pFly = NULL;
     // aBase is the document-global position, from which the new extra portion is placed
@@ -2500,15 +2500,15 @@ SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf,
     // he actually never was in.
     sal_uInt16 nAscent = 0;
 
-    const bool bTxtFrmVertical = GetInfo().GetTxtFrm()->IsVertical();
+    const bool bTextFrmVertical = GetInfo().GetTextFrm()->IsVertical();
 
     const bool bUseFlyAscent = pFly && pFly->GetValidPosFlag() &&
-                               0 != ( bTxtFrmVertical ?
+                               0 != ( bTextFrmVertical ?
                                       pFly->GetRefPoint().X() :
                                       pFly->GetRefPoint().Y() );
 
     if ( bUseFlyAscent )
-         nAscent = static_cast<sal_uInt16>( std::abs( int( bTxtFrmVertical ?
+         nAscent = static_cast<sal_uInt16>( std::abs( int( bTextFrmVertical ?
                                                   pFly->GetRelPos().X() :
                                                   pFly->GetRelPos().Y() ) ) );
 
@@ -2532,12 +2532,12 @@ SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf,
     }
 
     Point aTmpBase( aBase );
-    if ( GetInfo().GetTxtFrm()->IsVertical() )
-        GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( aTmpBase );
+    if ( GetInfo().GetTextFrm()->IsVertical() )
+        GetInfo().GetTextFrm()->SwitchHorizontalToVertical( aTmpBase );
 
     if( pFly )
     {
-        pRet = new SwFlyCntPortion( *GetInfo().GetTxtFrm(), pFly, aTmpBase,
+        pRet = new SwFlyCntPortion( *GetInfo().GetTextFrm(), pFly, aTmpBase,
                                     nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc, nMode );
         // We need to make sure that our font is set again in the OutputDevice
         // It could be that the FlyInCnt was added anew and GetFlyFrm() would
@@ -2552,17 +2552,17 @@ SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf,
             if( !rInf.IsTest() )
             {
                 aTmpBase = aBase;
-                if ( GetInfo().GetTxtFrm()->IsVertical() )
-                    GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( aTmpBase );
+                if ( GetInfo().GetTextFrm()->IsVertical() )
+                    GetInfo().GetTextFrm()->SwitchHorizontalToVertical( aTmpBase );
 
-                pRet->SetBase( *rInf.GetTxtFrm(), aTmpBase, nTmpAscent,
+                pRet->SetBase( *rInf.GetTextFrm(), aTmpBase, nTmpAscent,
                                nTmpDescent, nFlyAsc, nFlyDesc, nMode );
             }
         }
     }
     else
     {
-        pRet = new SwFlyCntPortion( *rInf.GetTxtFrm(), static_cast<SwDrawContact*>(pFrmFmt->FindContactObj()),
+        pRet = new SwFlyCntPortion( *rInf.GetTextFrm(), static_cast<SwDrawContact*>(pFrameFormat->FindContactObj()),
            aTmpBase, nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc, nMode );
     }
     return pRet;
@@ -2570,7 +2570,7 @@ SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf,
 
 /* Drop portion is a special case, because it has parts which aren't portions
    but we have handle them just like portions */
-void SwTxtFormatter::MergeCharacterBorder( SwDropPortion& rPortion )
+void SwTextFormatter::MergeCharacterBorder( SwDropPortion& rPortion )
 {
     if( rPortion.GetLines() > 1 )
     {
@@ -2588,7 +2588,7 @@ void SwTxtFormatter::MergeCharacterBorder( SwDropPortion& rPortion )
     }
 }
 
-void SwTxtFormatter::MergeCharacterBorder( SwLinePortion& rPortion, SwTxtFormatInfo& rInf )
+void SwTextFormatter::MergeCharacterBorder( SwLinePortion& rPortion, SwTextFormatInfo& rInf )
 {
     const SwFont aCurFont = *rInf.GetFont();
     if( aCurFont.HasBorder() )
@@ -2602,7 +2602,7 @@ void SwTxtFormatter::MergeCharacterBorder( SwLinePortion& rPortion, SwTxtFormatI
             if( !rPortion.GetJoinBorderWithPrev() )
             {
                 rPortion.SetJoinBorderWithPrev(true);
-                if( rPortion.InTxtGrp() && rPortion.Width() > aCurFont.GetLeftBorderSpace() )
+                if( rPortion.InTextGrp() && rPortion.Width() > aCurFont.GetLeftBorderSpace() )
                     rPortion.Width(rPortion.Width() - aCurFont.GetLeftBorderSpace());
             }
         }
@@ -2615,7 +2615,7 @@ void SwTxtFormatter::MergeCharacterBorder( SwLinePortion& rPortion, SwTxtFormatI
         // Get next portion's font
         bool bSeek = false;
         if( !rInf.IsFull() && // Not the last portion of the line (in case of line break)
-            rInf.GetIdx() + rPortion.GetLen() != rInf.GetTxt().getLength() ) // Not the last portion of the paragraph
+            rInf.GetIdx() + rPortion.GetLen() != rInf.GetText().getLength() ) // Not the last portion of the paragraph
             bSeek = Seek(rInf.GetIdx() + rPortion.GetLen());
 
         // If next portion has the same border then merge
@@ -2625,7 +2625,7 @@ void SwTxtFormatter::MergeCharacterBorder( SwLinePortion& rPortion, SwTxtFormatI
             if( !rPortion.GetJoinBorderWithNext() )
             {
                 rPortion.SetJoinBorderWithNext(true);
-                if( rPortion.InTxtGrp() && rPortion.Width() > aCurFont.GetRightBorderSpace() )
+                if( rPortion.InTextGrp() && rPortion.Width() > aCurFont.GetRightBorderSpace() )
                     rPortion.Width(rPortion.Width() - aCurFont.GetRightBorderSpace());
             }
         }
@@ -2681,18 +2681,18 @@ void SwTxtFormatter::MergeCharacterBorder( SwLinePortion& rPortion, SwTxtFormatI
 
 namespace {
     // calculates and sets optimal repaint offset for the current line
-    long lcl_CalcOptRepaint( SwTxtFormatter &rThis,
+    long lcl_CalcOptRepaint( SwTextFormatter &rThis,
                          SwLineLayout &rCurr,
                          const sal_Int32 nOldLineEnd,
                          const std::vector<long> &rFlyStarts )
     {
-        SwTxtFormatInfo txtFmtInfo = rThis.GetInfo();
-        if ( txtFmtInfo.GetIdx() < txtFmtInfo.GetReformatStart() )
+        SwTextFormatInfo txtFormatInfo = rThis.GetInfo();
+        if ( txtFormatInfo.GetIdx() < txtFormatInfo.GetReformatStart() )
         // the reformat position is behind our new line, that means
         // something of our text has moved to the next line
             return 0;
 
-        sal_Int32 nReformat = std::min<sal_Int32>( txtFmtInfo.GetReformatStart(), nOldLineEnd );
+        sal_Int32 nReformat = std::min<sal_Int32>( txtFormatInfo.GetReformatStart(), nOldLineEnd );
 
         // in case we do not have any fly in our line, our repaint position
         // is the changed position - 1
@@ -2702,9 +2702,9 @@ namespace {
             // for example: the beginning of the first right tab stop
             // if this value is 0, this means that we do not have an upper
             // limit for the repaint offset
-            const long nFormatRepaint = txtFmtInfo.GetPaintOfst();
+            const long nFormatRepaint = txtFormatInfo.GetPaintOfst();
 
-            if ( nReformat < txtFmtInfo.GetLineStart() + 3 )
+            if ( nReformat < txtFormatInfo.GetLineStart() + 3 )
                 return 0;
 
             // step back two positions for smoother repaint
@@ -2715,7 +2715,7 @@ namespace {
             // #i28795#, #i34607#, #i38388#
             // step back six(!) more characters for complex scripts
             // this is required e.g., for Khmer (thank you, Javier!)
-            const SwScriptInfo& rSI = txtFmtInfo.GetParaPortion()->GetScriptInfo();
+            const SwScriptInfo& rSI = txtFormatInfo.GetParaPortion()->GetScriptInfo();
             sal_Int32 nMaxContext = 0;
             if( ::i18n::ScriptType::COMPLEX == rSI.ScriptType( nReformat ) )
                 nMaxContext = 6;
@@ -2730,28 +2730,28 @@ namespace {
     #endif
             if( nMaxContext > 0 )
             {
-                if ( nReformat > txtFmtInfo.GetLineStart() + nMaxContext )
+                if ( nReformat > txtFormatInfo.GetLineStart() + nMaxContext )
                     nReformat = nReformat - nMaxContext;
                 else
-                    nReformat = txtFmtInfo.GetLineStart();
+                    nReformat = txtFormatInfo.GetLineStart();
             }
 
             // Weird situation: Our line used to end with a hole portion
             // and we delete some characters at the end of our line. We have
             // to take care for repainting the blanks which are not anymore
             // covered by the hole portion
-            while ( nReformat > txtFmtInfo.GetLineStart() &&
-                    CH_BLANK == txtFmtInfo.GetChar( nReformat ) )
+            while ( nReformat > txtFormatInfo.GetLineStart() &&
+                    CH_BLANK == txtFormatInfo.GetChar( nReformat ) )
                 --nReformat;
 
-            OSL_ENSURE( nReformat < txtFmtInfo.GetIdx(), "Reformat too small for me!" );
+            OSL_ENSURE( nReformat < txtFormatInfo.GetIdx(), "Reformat too small for me!" );
             SwRect aRect;
 
             // Note: GetChareRect is not const. It definitely changes the
             // bMulti flag. We have to save and resore the old value.
-            bool bOldMulti = txtFmtInfo.IsMulti();
+            bool bOldMulti = txtFormatInfo.IsMulti();
             rThis.GetCharRect( &aRect, nReformat );
-            txtFmtInfo.SetMulti( bOldMulti );
+            txtFormatInfo.SetMulti( bOldMulti );
 
             return nFormatRepaint ? std::min( aRect.Left(), nFormatRepaint ) :
                                     aRect.Left();
@@ -2794,7 +2794,7 @@ namespace {
     }
 
     // Determine if we need to build hidden portions
-    bool lcl_BuildHiddenPortion( const SwTxtSizeInfo& rInf, sal_Int32 &rPos )
+    bool lcl_BuildHiddenPortion( const SwTextSizeInfo& rInf, sal_Int32 &rPos )
     {
         // Only if hidden text should not be shown:
     //    if ( rInf.GetVsh() && rInf.GetVsh()->GetWin() && rInf.GetOpt().IsShowHiddenChar() )
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index ad2b7f54cfbf..104dea7e9716 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -23,17 +23,17 @@
 class SwFlyCntPortion;
 class SwInterHyphInfo;
 class SwDropPortion;
-class SwFmtDrop;
-class SwTxtAttr;
+class SwFormatDrop;
+class SwTextAttr;
 class SwNumberPortion;
 class SwErgoSumPortion;
 class SwExpandPortion;
 class SwMultiPortion;
-class SwFtnPortion;
+class SwFootnotePortion;
 
-class SwTxtFormatter : public SwTxtPainter
+class SwTextFormatter : public SwTextPainter
 {
-    const SwFmtDrop *pDropFmt;
+    const SwFormatDrop *pDropFormat;
     SwMultiPortion* pMulti; // during formatting a multi-portion
     sal_uInt8 nCntEndHyph;  // Counts consecutive hyphens at the line end
     sal_uInt8 nCntMidHyph;  // Counts consecutive hyphens before flies
@@ -47,63 +47,63 @@ class SwTxtFormatter : public SwTxtPainter
     size_t m_nHintEndIndex; // HACK for TryNewNoLengthPortion
     SwLinePortion* m_pFirstOfBorderMerge; // The first text portion of a joined border (during portion bulding)
 
-    SwLinePortion *NewPortion( SwTxtFormatInfo &rInf );
-    SwTxtPortion  *NewTxtPortion( SwTxtFormatInfo &rInf );
-    SwLinePortion *NewExtraPortion( SwTxtFormatInfo &rInf );
-    SwTabPortion *NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) const;
-    SwNumberPortion *NewNumberPortion( SwTxtFormatInfo &rInf ) const;
-    SwDropPortion *NewDropPortion( SwTxtFormatInfo &rInf );
-    SwNumberPortion *NewFtnNumPortion( SwTxtFormatInfo &rInf ) const;
-    SwErgoSumPortion *NewErgoSumPortion( SwTxtFormatInfo &rInf ) const;
-    SwExpandPortion *NewFldPortion( SwTxtFormatInfo &rInf,
-                                    const SwTxtAttr *pHt ) const;
-    SwFtnPortion *NewFtnPortion( SwTxtFormatInfo &rInf, SwTxtAttr *pHt );
+    SwLinePortion *NewPortion( SwTextFormatInfo &rInf );
+    SwTextPortion  *NewTextPortion( SwTextFormatInfo &rInf );
+    SwLinePortion *NewExtraPortion( SwTextFormatInfo &rInf );
+    SwTabPortion *NewTabPortion( SwTextFormatInfo &rInf, bool bAuto ) const;
+    SwNumberPortion *NewNumberPortion( SwTextFormatInfo &rInf ) const;
+    SwDropPortion *NewDropPortion( SwTextFormatInfo &rInf );
+    SwNumberPortion *NewFootnoteNumPortion( SwTextFormatInfo &rInf ) const;
+    SwErgoSumPortion *NewErgoSumPortion( SwTextFormatInfo &rInf ) const;
+    SwExpandPortion *NewFieldPortion( SwTextFormatInfo &rInf,
+                                    const SwTextAttr *pHt ) const;
+    SwFootnotePortion *NewFootnotePortion( SwTextFormatInfo &rInf, SwTextAttr *pHt );
 
     /**
         Sets a new portion for an object anchored as character
      */
-    SwFlyCntPortion *NewFlyCntPortion( SwTxtFormatInfo &rInf,
-                                       SwTxtAttr *pHt ) const;
-    SwLinePortion *WhichFirstPortion( SwTxtFormatInfo &rInf );
-    SwTxtPortion *WhichTxtPor( SwTxtFormatInfo &rInf ) const;
-    SwExpandPortion * TryNewNoLengthPortion( SwTxtFormatInfo & rInfo );
+    SwFlyCntPortion *NewFlyCntPortion( SwTextFormatInfo &rInf,
+                                       SwTextAttr *pHt ) const;
+    SwLinePortion *WhichFirstPortion( SwTextFormatInfo &rInf );
+    SwTextPortion *WhichTextPor( SwTextFormatInfo &rInf ) const;
+    SwExpandPortion * TryNewNoLengthPortion( SwTextFormatInfo & rInfo );
 
     // The center pice of formatting
-    void BuildPortions( SwTxtFormatInfo &rInf );
+    void BuildPortions( SwTextFormatInfo &rInf );
 
-    bool BuildMultiPortion( SwTxtFormatInfo &rInf, SwMultiPortion& rMulti );
+    bool BuildMultiPortion( SwTextFormatInfo &rInf, SwMultiPortion& rMulti );
 
     /**
         Calculation of the emulated right side.
 
         Determines the next object, that reaches into the rest of the line and
         constructs the appropriate FlyPortion.
-        SwTxtFly::GetFrm(const SwRect&, bool) will be needed for this.
+        SwTextFly::GetFrm(const SwRect&, bool) will be needed for this.
 
         The right edge can be shortened by flys
      */
-    void CalcFlyWidth( SwTxtFormatInfo &rInf );
+    void CalcFlyWidth( SwTextFormatInfo &rInf );
 
-    // Is overloaded by SwTxtFormatter because of UpdatePos
+    // Is overloaded by SwTextFormatter because of UpdatePos
     void CalcAdjustLine( SwLineLayout *pCurr );
 
     // considers line spacing attributes
     void CalcRealHeight( bool bNewLine = false );
 
     // Transfers the data to rInf
-    void FeedInf( SwTxtFormatInfo &rInf ) const;
+    void FeedInf( SwTextFormatInfo &rInf ) const;
 
     // Treats underflow situations
-    SwLinePortion *Underflow( SwTxtFormatInfo &rInf );
+    SwLinePortion *Underflow( SwTextFormatInfo &rInf );
 
     // Calculates the ascent and the height from the fontmetric
-    void CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor );
+    void CalcAscent( SwTextFormatInfo &rInf, SwLinePortion *pPor );
 
     // determines, if a optimized repaint rectange is allowed
     bool AllowRepaintOpt() const;
 
     // Is called by FormatLine
-    void FormatReset( SwTxtFormatInfo &rInf );
+    void FormatReset( SwTextFormatInfo &rInf );
 
     /**
         The position of the portions changes with the adjustment.
@@ -128,10 +128,10 @@ class SwTxtFormatter : public SwTxtPainter
         We check this and return true, meaning that the line has to be
         formatted again.
      */
-    bool ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const;
+    bool ChkFlyUnderflow( SwTextFormatInfo &rInf ) const;
 
     // Insert portion
-    void InsertPortion( SwTxtFormatInfo &rInf, SwLinePortion *pPor ) const;
+    void InsertPortion( SwTextFormatInfo &rInf, SwLinePortion *pPor ) const;
 
     // Guess height for the DropPortion
     void GuessDropHeight( const sal_uInt16 nLines );
@@ -151,14 +151,14 @@ public:
     // Amongst others for DropCaps
     bool CalcOnceMore();
 
-    void CtorInitTxtFormatter( SwTxtFrm *pFrm, SwTxtFormatInfo *pInf );
-    SwTxtFormatter(SwTxtFrm *pTxtFrm, SwTxtFormatInfo *pTxtFmtInf)
-        : SwTxtPainter(pTxtFrm->GetTxtNode())
+    void CtorInitTextFormatter( SwTextFrm *pFrm, SwTextFormatInfo *pInf );
+    SwTextFormatter(SwTextFrm *pTextFrm, SwTextFormatInfo *pTextFormatInf)
+        : SwTextPainter(pTextFrm->GetTextNode())
         , bUnclipped(false)
     {
-        CtorInitTxtFormatter( pTxtFrm, pTxtFmtInf );
+        CtorInitTextFormatter( pTextFrm, pTextFormatInf );
     }
-    virtual ~SwTxtFormatter();
+    virtual ~SwTextFormatter();
 
     sal_Int32 FormatLine( const sal_Int32 nStart );
 
@@ -168,7 +168,7 @@ public:
     bool Hyphenate( SwInterHyphInfo &rInf );
 
     // A special method for QuoVadis texts:
-    // nErgo is the page number of the ErgoSum Ftn
+    // nErgo is the page number of the ErgoSum Footnote
     // At 0 it's still unclear
     sal_Int32 FormatQuoVadis( const sal_Int32 nStart );
 
@@ -181,10 +181,10 @@ public:
     // FormatQuick(); Refresh formatting information
     bool IsQuick() const { return GetInfo().IsQuick(); }
 
-    // Create a SwLineLayout if needed, which avoids Ftn/Fly to oscillate
+    // Create a SwLineLayout if needed, which avoids Footnote/Fly to oscillate
     void MakeDummyLine();
 
-    // SwTxtIter functionality
+    // SwTextIter functionality
     void Insert( SwLineLayout *pLine );
 
     // The remaining height to the page border
@@ -195,8 +195,8 @@ public:
 
     SwLinePortion* MakeRestPortion(const SwLineLayout* pLine, sal_Int32 nPos);
 
-    const SwFmtDrop *GetDropFmt() const { return pDropFmt; }
-    void ClearDropFmt() { pDropFmt = 0; }
+    const SwFormatDrop *GetDropFormat() const { return pDropFormat; }
+    void ClearDropFormat() { pDropFormat = 0; }
 
     SwMultiPortion *GetMulti() const { return pMulti; }
 
@@ -215,10 +215,10 @@ public:
     bool IsFlyInCntBase() const { return bFlyInCntBase; }
     void SetFlyInCntBase( bool bNew = true ) { bFlyInCntBase = bNew; }
 
-    SwTxtFormatInfo &GetInfo()
-        { return static_cast<SwTxtFormatInfo&>(SwTxtIter::GetInfo()); }
-    const SwTxtFormatInfo &GetInfo() const
-        { return static_cast<const SwTxtFormatInfo&>(SwTxtIter::GetInfo()); }
+    SwTextFormatInfo &GetInfo()
+        { return static_cast<SwTextFormatInfo&>(SwTextIter::GetInfo()); }
+    const SwTextFormatInfo &GetInfo() const
+        { return static_cast<const SwTextFormatInfo&>(SwTextIter::GetInfo()); }
 
     void InitCntHyph() { CntHyphens( nCntEndHyph, nCntMidHyph ); }
     const sal_uInt8 &CntEndHyph() const { return nCntEndHyph; }
@@ -241,7 +241,7 @@ public:
      * @param   rPortion    portion for merge
      * @param   rInf        contain information
     **/
-    void MergeCharacterBorder( SwLinePortion& rPortion, SwTxtFormatInfo& rInf );
+    void MergeCharacterBorder( SwLinePortion& rPortion, SwTextFormatInfo& rInf );
 };
 
 #endif
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 760b663810aa..1a6c3d0b58aa 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -57,7 +57,7 @@
 
 // Returns, if we have an underline breaking situation
 // Adding some more conditions here means you also have to change them
-// in SwTxtPainter::CheckSpecialUnderline
+// in SwTextPainter::CheckSpecialUnderline
 bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt )
 {
     return UNDERLINE_NONE == rFnt.GetUnderline() ||
@@ -69,9 +69,9 @@ bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt )
            SVX_CASEMAP_KAPITAELCHEN == rFnt.GetCaseMap();
 }
 
-void SwTxtPainter::CtorInitTxtPainter( SwTxtFrm *pNewFrm, SwTxtPaintInfo *pNewInf )
+void SwTextPainter::CtorInitTextPainter( SwTextFrm *pNewFrm, SwTextPaintInfo *pNewInf )
 {
-    CtorInitTxtCursor( pNewFrm, pNewInf );
+    CtorInitTextCursor( pNewFrm, pNewInf );
     pInf = pNewInf;
     SwFont *pMyFnt = GetFnt();
     GetInfo().SetFont( pMyFnt );
@@ -79,14 +79,14 @@ void SwTxtPainter::CtorInitTxtPainter( SwTxtFrm *pNewFrm, SwTxtPaintInfo *pNewIn
     if( ALIGN_BASELINE != pMyFnt->GetAlign() )
     {
         OSL_ENSURE( ALIGN_BASELINE == pMyFnt->GetAlign(),
-                "+SwTxtPainter::CTOR: font alignment revolution" );
+                "+SwTextPainter::CTOR: font alignment revolution" );
         pMyFnt->SetAlign( ALIGN_BASELINE );
     }
 #endif
     bPaintDrop = false;
 }
 
-SwLinePortion *SwTxtPainter::CalcPaintOfst( const SwRect &rPaint )
+SwLinePortion *SwTextPainter::CalcPaintOfst( const SwRect &rPaint )
 {
     SwLinePortion *pPor = pCurr->GetFirstPortion();
     GetInfo().SetPaintOfst( 0 );
@@ -135,7 +135,7 @@ SwLinePortion *SwTxtPainter::CalcPaintOfst( const SwRect &rPaint )
 //    ausgefuehrt (objektiv langsam, subjektiv schnell).
 // Da der User in der Regel subjektiv urteilt, wird die 2. Methode
 // als Default eingestellt.
-void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
+void SwTextPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
                                  const bool bUnderSz )
 {
 #if OSL_DEBUG_LEVEL > 1
@@ -156,7 +156,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
     const bool bDrawInWindow = GetInfo().OnWin();
 
     // 6882: Leerzeilen duerfen nicht wegoptimiert werden bei Paragraphzeichen.
-    const bool bEndPor = GetInfo().GetOpt().IsParagraph() && GetInfo().GetTxt().isEmpty();
+    const bool bEndPor = GetInfo().GetOpt().IsParagraph() && GetInfo().GetText().isEmpty();
 
     SwLinePortion *pPor = bEndPor ? pCurr->GetFirstPortion() : CalcPaintOfst( rPaint );
 
@@ -231,12 +231,12 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
     if( !pPor && !bEndPor )
         return;
 
-    // Baseline-Ausgabe auch bei nicht-TxtPortions (vgl. TabPor mit Fill)
+    // Baseline-Ausgabe auch bei nicht-TextPortions (vgl. TabPor mit Fill)
     // if no special vertical alignment is used,
     // we calculate Y value for the whole line
-    SwTextGridItem const*const pGrid(GetGridItem(GetTxtFrm()->FindPageFrm()));
+    SwTextGridItem const*const pGrid(GetGridItem(GetTextFrm()->FindPageFrm()));
     const bool bAdjustBaseLine =
-        GetLineInfo().HasSpecialAlign( GetTxtFrm()->IsVertical() ) ||
+        GetLineInfo().HasSpecialAlign( GetTextFrm()->IsVertical() ) ||
         ( 0 != pGrid );
     const SwTwips nLineBaseLine = GetInfo().GetPos().Y() + nTmpAscent;
     if ( ! bAdjustBaseLine )
@@ -289,15 +289,15 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
             // end character has the same font as this portion
             // (only in special vertical alignment case, otherwise the first
             // portion of the line is used)
-            if ( pPor->Width() && pPor->InTxtGrp() )
+            if ( pPor->Width() && pPor->InTextGrp() )
                 pEndTempl = pPor;
         }
 
         // Ein Sonderfall sind GluePortions, die Blanks ausgeben.
 
-        // 6168: Der Rest einer FldPortion zog sich die Attribute der naechsten
+        // 6168: Der Rest einer FieldPortion zog sich die Attribute der naechsten
         // Portion an, dies wird durch SeekAndChgBefore vermieden:
-        if( ( bRest && pPor->InFldGrp() && !pPor->GetLen() ) )
+        if( ( bRest && pPor->InFieldGrp() && !pPor->GetLen() ) )
             SeekAndChgBefore( GetInfo() );
         else if ( pPor->IsQuoVadisPortion() )
         {
@@ -306,7 +306,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
             if( GetRedln() && pCurr->HasRedline() )
                 GetRedln()->Seek( *pFnt, nOffset, 0 );
         }
-        else if( pPor->InTxtGrp() || pPor->InFldGrp() || pPor->InTabGrp() )
+        else if( pPor->InTextGrp() || pPor->InFieldGrp() || pPor->InTabGrp() )
             SeekAndChg( GetInfo() );
         else if ( !bFirst && pPor->IsBreakPortion() && GetInfo().GetOpt().IsParagraph() )
         {
@@ -382,7 +382,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
         // reset (for special vertical alignment)
         GetInfo().Y( nOldY );
 
-        if( GetFnt()->IsURL() && pPor->InTxtGrp() )
+        if( GetFnt()->IsURL() && pPor->InTextGrp() )
             GetInfo().NotifyURL( *pPor );
 
         bFirst &= !pPor->GetLen();
@@ -414,8 +414,8 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
 
         if( !GetNextLine() &&
             GetInfo().GetVsh() && !GetInfo().GetVsh()->IsPreview() &&
-            GetInfo().GetOpt().IsParagraph() && !GetTxtFrm()->GetFollow() &&
-            GetInfo().GetIdx() >= GetInfo().GetTxt().getLength() )
+            GetInfo().GetOpt().IsParagraph() && !GetTextFrm()->GetFollow() &&
+            GetInfo().GetIdx() >= GetInfo().GetText().getLength() )
         {
             const SwTmpEndPortion aEnd( *pEndTempl );
             GetFnt()->ChgPhysFnt( GetInfo().GetVsh(), *pOut );
@@ -430,10 +430,10 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
         if( GetInfo().GetVsh() && !GetInfo().GetVsh()->IsPreview() )
         {
             const bool bNextUndersized =
-                ( GetTxtFrm()->GetNext() &&
-                  0 == GetTxtFrm()->GetNext()->Prt().Height() &&
-                  GetTxtFrm()->GetNext()->IsTxtFrm() &&
-                  static_cast<SwTxtFrm*>(GetTxtFrm()->GetNext())->IsUndersized() ) ;
+                ( GetTextFrm()->GetNext() &&
+                  0 == GetTextFrm()->GetNext()->Prt().Height() &&
+                  GetTextFrm()->GetNext()->IsTextFrm() &&
+                  static_cast<SwTextFrm*>(GetTextFrm()->GetNext())->IsUndersized() ) ;
 
             if( bUnderSz || bNextUndersized )
             {
@@ -444,9 +444,9 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
                     GetInfo().DrawRedArrow( *pArrow );
 
                 // GetInfo().Y() must be current baseline
-                SwTwips nDiff = GetInfo().Y() + nTmpHeight - nTmpAscent - GetTxtFrm()->Frm().Bottom();
+                SwTwips nDiff = GetInfo().Y() + nTmpHeight - nTmpAscent - GetTextFrm()->Frm().Bottom();
                 if( ( nDiff > 0 &&
-                      ( GetEnd() < GetInfo().GetTxt().getLength() ||
+                      ( GetEnd() < GetInfo().GetText().getLength() ||
                         ( nDiff > nTmpHeight/2 && GetPrevLine() ) ) ) ||
                     (nDiff >= 0 && bNextUndersized) )
 
@@ -464,7 +464,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
         rClip.ChgClip( rPaint, pFrm );
 }
 
-void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
+void SwTextPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
                                           long nAdjustBaseLine )
 {
     // Check if common underline should not be continued
@@ -487,7 +487,7 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
 
     OSL_ENSURE( GetFnt() && UNDERLINE_NONE != GetFnt()->GetUnderline(),
             "CheckSpecialUnderline without underlined font" );
-    MultiSelection aUnderMulti( Range( 0, GetInfo().GetTxt().getLength() ) );
+    MultiSelection aUnderMulti( Range( 0, GetInfo().GetText().getLength() ) );
     const SwFont* pParaFnt = GetAttrHandler().GetFont();
     if( pParaFnt && pParaFnt->GetUnderline() == GetFnt()->GetUnderline() )
         aUnderMulti.SelectAll();
@@ -496,15 +496,15 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
     {
         for ( size_t nTmp = 0; nTmp < pHints->GetStartCount(); ++nTmp )
         {
-            SwTxtAttr* const pTxtAttr = pHints->GetStart( nTmp );
+            SwTextAttr* const pTextAttr = pHints->GetStart( nTmp );
 
             const SvxUnderlineItem* pItem =
-                    static_cast<const SvxUnderlineItem*>(CharFmt::GetItem( *pTxtAttr, RES_CHRATR_UNDERLINE ));
+                    static_cast<const SvxUnderlineItem*>(CharFormat::GetItem( *pTextAttr, RES_CHRATR_UNDERLINE ));
 
             if ( pItem )
             {
-                const sal_Int32 nSt = pTxtAttr->GetStart();
-                const sal_Int32 nEnd = *pTxtAttr->GetEnd();
+                const sal_Int32 nSt = pTextAttr->GetStart();
+                const sal_Int32 nEnd = *pTextAttr->GetEnd();
                 if( nEnd > nSt )
                 {
                     const bool bUnderSelect = pFnt->GetUnderline() == pItem->GetLineStyle();
@@ -544,7 +544,7 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
     {
         // here starts the algorithm for calculating the underline font
         SwScriptInfo& rScriptInfo = GetInfo().GetParaPortion()->GetScriptInfo();
-        SwAttrIter aIter( *GetInfo().GetTxtFrm()->GetTxtNode(),
+        SwAttrIter aIter( *GetInfo().GetTextFrm()->GetTextNode(),
                           rScriptInfo );
 
         sal_Int32 nTmpIdx = nIndx;
diff --git a/sw/source/core/text/itrpaint.hxx b/sw/source/core/text/itrpaint.hxx
index 3f5bb35f65f3..20fb2df23259 100644
--- a/sw/source/core/text/itrpaint.hxx
+++ b/sw/source/core/text/itrpaint.hxx
@@ -20,10 +20,10 @@
 #define INCLUDED_SW_SOURCE_CORE_TEXT_ITRPAINT_HXX
 #include "itrtxt.hxx"
 
-class SwSaveClip;          // SwTxtPainter
+class SwSaveClip;          // SwTextPainter
 class SwMultiPortion;
 
-class SwTxtPainter : public SwTxtCursor
+class SwTextPainter : public SwTextCursor
 {
     bool bPaintDrop;
 
@@ -31,18 +31,18 @@ class SwTxtPainter : public SwTxtCursor
     void CheckSpecialUnderline( const SwLinePortion* pPor,
                                 long nAdjustBaseLine = 0 );
 protected:
-    void CtorInitTxtPainter( SwTxtFrm *pFrm, SwTxtPaintInfo *pInf );
-    SwTxtPainter(SwTxtNode* pTxtNode)
-        : SwTxtCursor(pTxtNode)
+    void CtorInitTextPainter( SwTextFrm *pFrm, SwTextPaintInfo *pInf );
+    SwTextPainter(SwTextNode* pTextNode)
+        : SwTextCursor(pTextNode)
         , bPaintDrop(false)
     {
     }
 
 public:
-    SwTxtPainter(SwTxtFrm *pTxtFrm, SwTxtPaintInfo *pTxtPaintInf)
-        : SwTxtCursor(pTxtFrm->GetTxtNode())
+    SwTextPainter(SwTextFrm *pTextFrm, SwTextPaintInfo *pTextPaintInf)
+        : SwTextCursor(pTextFrm->GetTextNode())
     {
-        CtorInitTxtPainter( pTxtFrm, pTxtPaintInf );
+        CtorInitTextPainter( pTextFrm, pTextPaintInf );
     }
     void DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
                        const bool bUnderSz );
@@ -53,10 +53,10 @@ public:
                             const SwMultiPortion* pEnvPor = 0 );
     inline void SetPaintDrop( const bool bNew ) { bPaintDrop = bNew; }
     inline bool IsPaintDrop() const { return bPaintDrop; }
-    inline SwTxtPaintInfo &GetInfo()
-        { return static_cast<SwTxtPaintInfo&>(SwTxtIter::GetInfo()); }
-    inline const SwTxtPaintInfo &GetInfo() const
-        { return static_cast<const SwTxtPaintInfo&>(SwTxtIter::GetInfo()); }
+    inline SwTextPaintInfo &GetInfo()
+        { return static_cast<SwTextPaintInfo&>(SwTextIter::GetInfo()); }
+    inline const SwTextPaintInfo &GetInfo() const
+        { return static_cast<const SwTextPaintInfo&>(SwTextIter::GetInfo()); }
 };
 
 bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt );
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 920b22f66035..e211d2d50759 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -33,9 +33,9 @@
 #include "txtfrm.hxx"
 #include "porfly.hxx"
 
-void SwTxtIter::CtorInitTxtIter( SwTxtFrm *pNewFrm, SwTxtInfo *pNewInf )
+void SwTextIter::CtorInitTextIter( SwTextFrm *pNewFrm, SwTextInfo *pNewInf )
 {
-    SwTxtNode *pNode = pNewFrm->GetTxtNode();
+    SwTextNode *pNode = pNewFrm->GetTextNode();
 
     OSL_ENSURE( pNewFrm->GetPara(), "No paragraph" );
 
@@ -45,30 +45,30 @@ void SwTxtIter::CtorInitTxtIter( SwTxtFrm *pNewFrm, SwTxtInfo *pNewInf )
     pInf = pNewInf;
     aLineInf.CtorInitLineInfo( pNode->GetSwAttrSet(), *pNode );
     nFrameStart = pFrm->Frm().Pos().Y() + pFrm->Prt().Pos().Y();
-    SwTxtIter::Init();
+    SwTextIter::Init();
 
     // Order is important: only execute FillRegister if GetValue!=0
     bRegisterOn = pNode->GetSwAttrSet().GetRegister().GetValue()
         && pFrm->FillRegister( nRegStart, nRegDiff );
 }
 
-void SwTxtIter::Init()
+void SwTextIter::Init()
 {
     pCurr = pInf->GetParaPortion();
-    nStart = pInf->GetTxtStart();
+    nStart = pInf->GetTextStart();
     nY = nFrameStart;
     bPrev = true;
     pPrev = 0;
     nLineNr = 1;
 }
 
-void SwTxtIter::CalcAscentAndHeight( sal_uInt16 &rAscent, sal_uInt16 &rHeight ) const
+void SwTextIter::CalcAscentAndHeight( sal_uInt16 &rAscent, sal_uInt16 &rHeight ) const
 {
     rHeight = GetLineHeight();
     rAscent = pCurr->GetAscent() + rHeight - pCurr->Height();
 }
 
-SwLineLayout *SwTxtIter::_GetPrev()
+SwLineLayout *SwTextIter::_GetPrev()
 {
     pPrev = 0;
     bPrev = true;
@@ -80,14 +80,14 @@ SwLineLayout *SwTxtIter::_GetPrev()
     return pPrev = pLay;
 }
 
-const SwLineLayout *SwTxtIter::GetPrev()
+const SwLineLayout *SwTextIter::GetPrev()
 {
     if(! bPrev)
         _GetPrev();
     return pPrev;
 }
 
-const SwLineLayout *SwTxtIter::Prev()
+const SwLineLayout *SwTextIter::Prev()
 {
     if( !bPrev )
         _GetPrev();
@@ -105,7 +105,7 @@ const SwLineLayout *SwTxtIter::Prev()
         return 0;
 }
 
-const SwLineLayout *SwTxtIter::Next()
+const SwLineLayout *SwTextIter::Next()
 {
     if(pCurr->GetNext())
     {
@@ -121,7 +121,7 @@ const SwLineLayout *SwTxtIter::Next()
         return 0;
 }
 
-const SwLineLayout *SwTxtIter::NextLine()
+const SwLineLayout *SwTextIter::NextLine()
 {
     const SwLineLayout *pNext = Next();
     while( pNext && pNext->IsDummy() && pNext->GetNext() )
@@ -131,7 +131,7 @@ const SwLineLayout *SwTxtIter::NextLine()
     return pNext;
 }
 
-const SwLineLayout *SwTxtIter::GetNextLine() const
+const SwLineLayout *SwTextIter::GetNextLine() const
 {
     const SwLineLayout *pNext = pCurr->GetNext();
     while( pNext && pNext->IsDummy() && pNext->GetNext() )
@@ -141,7 +141,7 @@ const SwLineLayout *SwTxtIter::GetNextLine() const
     return pNext;
 }
 
-const SwLineLayout *SwTxtIter::GetPrevLine()
+const SwLineLayout *SwTextIter::GetPrevLine()
 {
     const SwLineLayout *pRoot = pInf->GetParaPortion();
     if( pRoot == pCurr )
@@ -167,7 +167,7 @@ const SwLineLayout *SwTxtIter::GetPrevLine()
     return pLay;
 }
 
-const SwLineLayout *SwTxtIter::PrevLine()
+const SwLineLayout *SwTextIter::PrevLine()
 {
     const SwLineLayout *pMyPrev = Prev();
     if( !pMyPrev )
@@ -182,7 +182,7 @@ const SwLineLayout *SwTxtIter::PrevLine()
     return pMyPrev ? pMyPrev : pLast;
 }
 
-void SwTxtIter::Bottom()
+void SwTextIter::Bottom()
 {
     while( Next() )
     {
@@ -190,7 +190,7 @@ void SwTxtIter::Bottom()
     }
 }
 
-void SwTxtIter::CharToLine(const sal_Int32 nChar)
+void SwTextIter::CharToLine(const sal_Int32 nChar)
 {
     while( nStart + pCurr->GetLen() <= nChar && Next() )
         ;
@@ -199,7 +199,7 @@ void SwTxtIter::CharToLine(const sal_Int32 nChar)
 }
 
 // 1170: beruecksichtigt Mehrdeutigkeiten:
-const SwLineLayout *SwTxtCursor::CharCrsrToLine( const sal_Int32 nPosition )
+const SwLineLayout *SwTextCursor::CharCrsrToLine( const sal_Int32 nPosition )
 {
     CharToLine( nPosition );
     if( nPosition != nStart )
@@ -211,7 +211,7 @@ const SwLineLayout *SwTxtCursor::CharCrsrToLine( const sal_Int32 nPosition )
     return bPrevious ? PrevLine() : pCurr;
 }
 
-sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
+sal_uInt16 SwTextCursor::AdjustBaseLine( const SwLineLayout& rLine,
                                     const SwLinePortion* pPor,
                                     sal_uInt16 nPorHeight, sal_uInt16 nPorAscent,
                                     const bool bAutoToCentered ) const
@@ -272,9 +272,9 @@ sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
                 nOfst += rLine.Height() - nPorHeight + nPorAscent;
                 break;
             case SvxParaVertAlignItem::AUTOMATIC :
-                if ( bAutoToCentered || GetInfo().GetTxtFrm()->IsVertical() )
+                if ( bAutoToCentered || GetInfo().GetTextFrm()->IsVertical() )
                 {
-                    if( GetInfo().GetTxtFrm()->IsVertLR() )
+                    if( GetInfo().GetTextFrm()->IsVertLR() )
                             nOfst += rLine.Height() - ( rLine.Height() - nPorHeight ) / 2 - nPorAscent;
                     else
                             nOfst += ( rLine.Height() - nPorHeight ) / 2 + nPorAscent;
@@ -290,7 +290,7 @@ sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
     return nOfst;
 }
 
-const SwLineLayout *SwTxtIter::TwipsToLine( const SwTwips y)
+const SwLineLayout *SwTextIter::TwipsToLine( const SwTwips y)
 {
     while( nY + GetLineHeight() <= y && Next() )
         ;
@@ -306,15 +306,15 @@ static bool lcl_NeedsFieldRest( const SwLineLayout* pCurr )
     bool bRet = false;
     while( pPor && !bRet )
     {
-        bRet = pPor->InFldGrp() && static_cast<const SwFldPortion*>(pPor)->HasFollow();
-        if( !pPor->GetPortion() || !pPor->GetPortion()->InFldGrp() )
+        bRet = pPor->InFieldGrp() && static_cast<const SwFieldPortion*>(pPor)->HasFollow();
+        if( !pPor->GetPortion() || !pPor->GetPortion()->InFieldGrp() )
             break;
         pPor = pPor->GetPortion();
     }
     return bRet;
 }
 
-void SwTxtIter::TruncLines( bool bNoteFollow )
+void SwTextIter::TruncLines( bool bNoteFollow )
 {
     SwLineLayout *pDel = pCurr->GetNext();
     const sal_Int32 nEnd = nStart + pCurr->GetLen();
@@ -328,7 +328,7 @@ void SwTxtIter::TruncLines( bool bNoteFollow )
                                                         lcl_NeedsFieldRest( pCurr ) );
 
             // bug 88534: wrong positioning of flys
-            SwTxtFrm* pFollow = GetTxtFrm()->GetFollow();
+            SwTextFrm* pFollow = GetTextFrm()->GetFollow();
             if ( pFollow && ! pFollow->IsLocked() &&
                  nEnd == pFollow->GetOfst() )
             {
@@ -342,12 +342,12 @@ void SwTxtIter::TruncLines( bool bNoteFollow )
                     pLine = pLine->GetNext();
                 }
 
-                SwpHints* pTmpHints = GetTxtFrm()->GetTxtNode()->GetpSwpHints();
+                SwpHints* pTmpHints = GetTextFrm()->GetTextNode()->GetpSwpHints();
 
                 // examine hints in range nEnd - (nEnd + nRangeChar)
                 for( size_t i = 0; i < pTmpHints->Count(); ++i )
                 {
-                    const SwTxtAttr* pHt = pTmpHints->GetTextHint( i );
+                    const SwTextAttr* pHt = pTmpHints->GetTextHint( i );
                     if( RES_TXTATR_FLYCNT == pHt->Which() )
                     {
                         // check, if hint is in our range
@@ -363,13 +363,13 @@ void SwTxtIter::TruncLines( bool bNoteFollow )
     }
     if( pCurr->IsDummy() &&
         !pCurr->GetLen() &&
-         nStart < GetTxtFrm()->GetTxt().getLength() )
+         nStart < GetTextFrm()->GetText().getLength() )
         pCurr->SetRealHeight( 1 );
     if( GetHints() )
-        pFrm->RemoveFtn( nEnd );
+        pFrm->RemoveFootnote( nEnd );
 }
 
-void SwTxtIter::CntHyphens( sal_uInt8 &nEndCnt, sal_uInt8 &nMidCnt) const
+void SwTextIter::CntHyphens( sal_uInt8 &nEndCnt, sal_uInt8 &nMidCnt) const
 {
     nEndCnt = 0;
     nMidCnt = 0;
@@ -394,7 +394,7 @@ void SwTxtIter::CntHyphens( sal_uInt8 &nEndCnt, sal_uInt8 &nMidCnt) const
 
 // Change current output device to formatting device, this has to be done before
 // formatting.
-SwHookOut::SwHookOut( SwTxtSizeInfo& rInfo ) :
+SwHookOut::SwHookOut( SwTextSizeInfo& rInfo ) :
      pInf( &rInfo ),
      pOut( rInfo.GetOut() ),
      bOnWin( rInfo.OnWin() )
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 2008fefcff30..95f821d98c9a 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -22,18 +22,18 @@
 #include "itratr.hxx"
 #include "inftxt.hxx"
 
-class SwTxtFrm;
+class SwTextFrm;
 struct SwPosition;
 struct SwCrsrMoveState;
 class SwMarginPortion;
 class SwFlyPortion;
 
-class SwTxtIter : public SwAttrIter
+class SwTextIter : public SwAttrIter
 {
 protected:
     SwLineInfo aLineInf;
-    SwTxtFrm  *pFrm;
-    SwTxtInfo *pInf;
+    SwTextFrm  *pFrm;
+    SwTextInfo *pInf;
     SwLineLayout *pCurr;
     SwLineLayout *pPrev;
     SwTwips nFrameStart;
@@ -52,9 +52,9 @@ protected:
 
     // Reset in the first line
     void Init();
-    void CtorInitTxtIter( SwTxtFrm *pFrm, SwTxtInfo *pInf );
-    SwTxtIter(SwTxtNode* pTxtNode)
-        : SwAttrIter(pTxtNode)
+    void CtorInitTextIter( SwTextFrm *pFrm, SwTextInfo *pInf );
+    SwTextIter(SwTextNode* pTextNode)
+        : SwAttrIter(pTextNode)
         , pFrm(NULL)
         , pInf(NULL)
         , pCurr(NULL)
@@ -73,13 +73,13 @@ protected:
     {
     }
 public:
-    SwTxtIter(SwTxtFrm *pTxtFrm, SwTxtInfo *pTxtInf)
-        : SwAttrIter(pTxtFrm->GetTxtNode())
+    SwTextIter(SwTextFrm *pTextFrm, SwTextInfo *pTextInf)
+        : SwAttrIter(pTextFrm->GetTextNode())
         , bOneBlock(false)
         , bLastBlock(false)
         , bLastCenter(false)
     {
-        CtorInitTxtIter(pTxtFrm, pTxtInf);
+        CtorInitTextIter(pTextFrm, pTextInf);
     }
     inline const SwLineLayout *GetCurr() const { return pCurr; } // NEVER 0!
     inline const SwLineLayout *GetNext() const { return pCurr->GetNext(); }
@@ -94,8 +94,8 @@ public:
     inline sal_uInt16 RegDiff() const { return nRegDiff; }
     inline bool IsRegisterOn() const { return bRegisterOn; }
 
-    inline SwTxtInfo &GetInfo() { return *pInf; }
-    inline const SwTxtInfo &GetInfo() const { return *pInf; }
+    inline SwTextInfo &GetInfo() { return *pInf; }
+    inline const SwTextInfo &GetInfo() const { return *pInf; }
 
     inline void Top() { Init(); }
     void Bottom();
@@ -118,8 +118,8 @@ public:
     void CalcAscentAndHeight( sal_uInt16 &rAscent, sal_uInt16 &rHeight ) const;
 
     // Lots of trouble for querying pCurr == pPara
-    inline bool IsFirstTxtLine() const
-    { return nStart == GetInfo().GetTxtStart() &&
+    inline bool IsFirstTextLine() const
+    { return nStart == GetInfo().GetTextStart() &&
         !( pCurr->IsDummy() && GetNextLine() ); }
 
     // Replacement for the old IsFirstLine()
@@ -128,18 +128,18 @@ public:
 
     const SwLineInfo &GetLineInfo() const { return aLineInf; }
     inline SwTwips GetFirstPos() const { return nFrameStart; }
-    inline bool SeekAndChg( SwTxtSizeInfo &rInf );
-    inline bool SeekAndChgBefore( SwTxtSizeInfo &rInf );
-    inline bool SeekStartAndChg( SwTxtSizeInfo &rInf, const bool bPara=false );
+    inline bool SeekAndChg( SwTextSizeInfo &rInf );
+    inline bool SeekAndChgBefore( SwTextSizeInfo &rInf );
+    inline bool SeekStartAndChg( SwTextSizeInfo &rInf, const bool bPara=false );
 
-    inline SwTxtFrm *GetTxtFrm() { return pFrm; }
-    inline const SwTxtFrm *GetTxtFrm() const { return pFrm; }
+    inline SwTextFrm *GetTextFrm() { return pFrm; }
+    inline const SwTextFrm *GetTextFrm() const { return pFrm; }
 
     // Counts consecutive hyphens in order to be within the boundary given by MaxHyphens
     void CntHyphens( sal_uInt8 &nEndCnt, sal_uInt8 &nMidCnt) const;
 };
 
-class SwTxtMargin : public SwTxtIter
+class SwTextMargin : public SwTextIter
 {
 private:
           SwTwips nLeft;
@@ -159,9 +159,9 @@ protected:
     // For CalcFlyAdjust
     inline void SetDropLeft( const sal_uInt16 nNew ) { nDropLeft = nNew; }
 
-    void CtorInitTxtMargin( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
-    SwTxtMargin(SwTxtNode* pTxtNode)
-        : SwTxtIter(pTxtNode)
+    void CtorInitTextMargin( SwTextFrm *pFrm, SwTextSizeInfo *pInf );
+    SwTextMargin(SwTextNode* pTextNode)
+        : SwTextIter(pTextNode)
         , nLeft(0)
         , nRight(0)
         , nFirst(0)
@@ -174,10 +174,10 @@ protected:
     {
     }
 public:
-    SwTxtMargin(SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf)
-        : SwTxtIter(pTxtFrm->GetTxtNode())
+    SwTextMargin(SwTextFrm *pTextFrm, SwTextSizeInfo *pTextSizeInf)
+        : SwTextIter(pTextFrm->GetTextNode())
     {
-        CtorInitTxtMargin( pTxtFrm, pTxtSizeInf );
+        CtorInitTextMargin( pTextFrm, pTextSizeInf );
     }
     inline SwTwips GetLeftMargin() const;
     inline SwTwips Left() const;
@@ -211,19 +211,19 @@ public:
     inline void SetDropDescent( const sal_uInt16 nNew ) { nDropDescent = nNew; }
     void DropInit();
 
-    // Returns the TxtPos for start and end of the current line without whitespace
+    // Returns the TextPos for start and end of the current line without whitespace
     // Implemented in frminf.cxx
-    sal_Int32 GetTxtStart() const;
-    sal_Int32 GetTxtEnd() const;
+    sal_Int32 GetTextStart() const;
+    sal_Int32 GetTextEnd() const;
 
-    inline SwTxtSizeInfo &GetInfo()
-        { return static_cast<SwTxtSizeInfo&>(SwTxtIter::GetInfo()); }
-    inline const SwTxtSizeInfo &GetInfo() const
-        { return static_cast<const SwTxtSizeInfo&>(SwTxtIter::GetInfo()); }
+    inline SwTextSizeInfo &GetInfo()
+        { return static_cast<SwTextSizeInfo&>(SwTextIter::GetInfo()); }
+    inline const SwTextSizeInfo &GetInfo() const
+        { return static_cast<const SwTextSizeInfo&>(SwTextIter::GetInfo()); }
 
 };
 
-class SwTxtAdjuster : public SwTxtMargin
+class SwTextAdjuster : public SwTextMargin
 {
     // Adjusts the portion, if we have adjustment and FlyFrms
     void CalcFlyAdjust( SwLineLayout *pCurr );
@@ -239,23 +239,23 @@ class SwTxtAdjuster : public SwTxtMargin
                                   const SwRect &rCurrRect );
 
 protected:
-    inline SwTxtAdjuster(SwTxtNode* pTxtNode) : SwTxtMargin(pTxtNode) { }
+    inline SwTextAdjuster(SwTextNode* pTextNode) : SwTextMargin(pTextNode) { }
     // Creates the Glues for adjusted paragraphs
     void CalcNewBlock( SwLineLayout *pCurr, const SwLinePortion *pStopAt,
         SwTwips nReal = 0, bool bSkipKashida = false );
     SwTwips CalcKanaAdj( SwLineLayout *pCurr );
 public:
-    inline SwTxtAdjuster( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf ) : SwTxtMargin(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
-           { CtorInitTxtMargin( pTxtFrm, pTxtSizeInf ); }
+    inline SwTextAdjuster( SwTextFrm *pTextFrm, SwTextSizeInfo *pTextSizeInf ) : SwTextMargin(pTextFrm!=NULL?pTextFrm->GetTextNode():NULL)
+           { CtorInitTextMargin( pTextFrm, pTextSizeInf ); }
 
-    // Is overloaded by SwTxtFormatter due to UpdatePos
+    // Is overloaded by SwTextFormatter due to UpdatePos
     void CalcAdjLine( SwLineLayout *pCurr );
 
     // For adjusting afterwards
     inline void GetAdjusted() const
     {
         if( pCurr->IsFormatAdj() )
-            const_cast<SwTxtAdjuster*>(this)->CalcAdjLine( pCurr );
+            const_cast<SwTextAdjuster*>(this)->CalcAdjLine( pCurr );
     }
 
     // Special treatment for DropCaps
@@ -263,23 +263,23 @@ public:
     void CalcDropRepaint();
 };
 
-class SwTxtCursor : public SwTxtAdjuster
+class SwTextCursor : public SwTextAdjuster
 {
-    // A small helper-class to save SwTxtCursor member, manipulate them
+    // A small helper-class to save SwTextCursor member, manipulate them
     // and to restore them
-    friend class SwTxtCursorSave;
+    friend class SwTextCursorSave;
 
     // Ambiguities
     static bool bRightMargin;
     void _GetCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* );
 protected:
-    void CtorInitTxtCursor( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
-    SwTxtCursor(SwTxtNode* pTxtNode) : SwTxtAdjuster(pTxtNode) { }
+    void CtorInitTextCursor( SwTextFrm *pFrm, SwTextSizeInfo *pInf );
+    SwTextCursor(SwTextNode* pTextNode) : SwTextAdjuster(pTextNode) { }
 public:
-    SwTxtCursor( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf )
-        : SwTxtAdjuster(pTxtFrm->GetTxtNode())
+    SwTextCursor( SwTextFrm *pTextFrm, SwTextSizeInfo *pTextSizeInf )
+        : SwTextAdjuster(pTextFrm->GetTextNode())
     {
-        CtorInitTxtCursor(pTxtFrm, pTxtSizeInf);
+        CtorInitTextCursor(pTextFrm, pTextSizeInf);
     }
     bool GetCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* = 0,
         const long nMax = 0 );
@@ -304,20 +304,20 @@ public:
 // formatting.
 class SwHookOut
 {
-    SwTxtSizeInfo* pInf;
+    SwTextSizeInfo* pInf;
     VclPtr<OutputDevice> pOut;
     bool bOnWin;
 public:
-    SwHookOut( SwTxtSizeInfo& rInfo );
+    SwHookOut( SwTextSizeInfo& rInfo );
     ~SwHookOut();
 };
 
-inline bool SwTxtIter::SeekAndChg( SwTxtSizeInfo &rInf )
+inline bool SwTextIter::SeekAndChg( SwTextSizeInfo &rInf )
 {
     return SeekAndChgAttrIter( rInf.GetIdx(), rInf.GetOut() );
 }
 
-inline bool SwTxtIter::SeekAndChgBefore( SwTxtSizeInfo &rInf )
+inline bool SwTextIter::SeekAndChgBefore( SwTextSizeInfo &rInf )
 {
     if ( rInf.GetIdx() )
         return SeekAndChgAttrIter( rInf.GetIdx()-1, rInf.GetOut() );
@@ -325,17 +325,17 @@ inline bool SwTxtIter::SeekAndChgBefore( SwTxtSizeInfo &rInf )
         return SeekAndChgAttrIter( rInf.GetIdx(), rInf.GetOut() );
 }
 
-inline bool SwTxtIter::SeekStartAndChg( SwTxtSizeInfo &rInf, const bool bPara )
+inline bool SwTextIter::SeekStartAndChg( SwTextSizeInfo &rInf, const bool bPara )
 {
     return SeekStartAndChgAttrIter( rInf.GetOut(), bPara );
 }
 
-inline SwTwips SwTxtMargin::GetLeftMargin() const
+inline SwTwips SwTextMargin::GetLeftMargin() const
 {
-    return IsFirstTxtLine() ? nFirst : Left();
+    return IsFirstTextLine() ? nFirst : Left();
 }
 
-inline SwTwips SwTxtMargin::Left() const
+inline SwTwips SwTextMargin::Left() const
 {
     return (nDropLines >= nLineNr && 1 != nLineNr) ? nFirst + nDropLeft : nLeft;
 }
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 815e9eb07beb..568b03ff48d5 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -58,7 +58,7 @@ public:
     void SetJoinBorderWithNext( const bool bJoinNext ) { m_bJoinBorderWithNext = bJoinNext; }
 };
 
-class SwDropPortion : public SwTxtPortion
+class SwDropPortion : public SwTextPortion
 {
     friend class SwDropCapCache;
     SwDropPortionPart* pPart; // due to script/attribute changes
@@ -70,8 +70,8 @@ class SwDropPortion : public SwTxtPortion
     short nX;               // X PaintOffset
     short nY;               // Y Offset
 
-    bool FormatTxt( SwTxtFormatInfo &rInf );
-    void PaintTxt( const SwTxtPaintInfo &rInf ) const;
+    bool FormatText( SwTextFormatInfo &rInf );
+    void PaintText( const SwTextPaintInfo &rInf ) const;
 
     inline void Fix( const sal_uInt16 nNew ) { nFix = nNew; }
 public:
@@ -81,10 +81,10 @@ public:
                    const sal_uInt16 nDistance );
     virtual ~SwDropPortion();
 
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-            void PaintDrop( const SwTxtPaintInfo &rInf ) const;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+            void PaintDrop( const SwTextPaintInfo &rInf ) const;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
     virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
 
     inline sal_uInt16 GetLines() const { return nLines; }
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 31d6da800f01..161117ed334a 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -25,10 +25,10 @@
 sal_Int32 SwExpandPortion::GetCrsrOfst( const sal_uInt16 nOfst ) const
 { return SwLinePortion::GetCrsrOfst( nOfst ); }
 
-bool SwExpandPortion::GetExpTxt( const SwTxtSizeInfo&, OUString &rTxt ) const
+bool SwExpandPortion::GetExpText( const SwTextSizeInfo&, OUString &rText ) const
 {
-    rTxt.clear();
-    // Do not do: return 0 != rTxt.Len();
+    rText.clear();
+    // Do not do: return 0 != rText.Len();
     // Reason being: empty fields replace CH_TXTATR with an empty string
     return true;
 }
@@ -38,19 +38,19 @@ void SwExpandPortion::HandlePortion( SwPortionHandler& rPH ) const
     rPH.Special( GetLen(), OUString(), GetWhichPor() );
 }
 
-SwPosSize SwExpandPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
+SwPosSize SwExpandPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
 {
-    SwTxtSlot aDiffTxt( &rInf, this, false, false );
-    return rInf.GetTxtSize();
+    SwTextSlot aDiffText( &rInf, this, false, false );
+    return rInf.GetTextSize();
 }
 
-bool SwExpandPortion::Format( SwTxtFormatInfo &rInf )
+bool SwExpandPortion::Format( SwTextFormatInfo &rInf )
 {
-    SwTxtSlot aDiffTxt( &rInf, this, true, false );
+    SwTextSlot aDiffText( &rInf, this, true, false );
     const sal_Int32 nFullLen = rInf.GetLen();
 
     // As odd as it may seem: the query for GetLen() must return
-    // false due to the ExpandPortions _after_ the aDiffTxt (see SoftHyphs)
+    // false due to the ExpandPortions _after_ the aDiffText (see SoftHyphs)
     // caused by the SetFull ...
     if( !nFullLen )
     {
@@ -58,17 +58,17 @@ bool SwExpandPortion::Format( SwTxtFormatInfo &rInf )
         Width(0);
         return false;
     }
-    return SwTxtPortion::Format( rInf );
+    return SwTextPortion::Format( rInf );
 }
 
-void SwExpandPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwExpandPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
-    SwTxtSlot aDiffTxt( &rInf, this, true, true );
+    SwTextSlot aDiffText( &rInf, this, true, true );
     const SwFont aOldFont = *rInf.GetFont();
     if( GetJoinBorderWithPrev() )
-        const_cast<SwTxtPaintInfo&>(rInf).GetFont()->SetLeftBorder(0);
+        const_cast<SwTextPaintInfo&>(rInf).GetFont()->SetLeftBorder(0);
     if( GetJoinBorderWithNext() )
-        const_cast<SwTxtPaintInfo&>(rInf).GetFont()->SetRightBorder(0);
+        const_cast<SwTextPaintInfo&>(rInf).GetFont()->SetRightBorder(0);
 
     rInf.DrawBackBrush( *this );
     rInf.DrawBorder( *this );
@@ -91,7 +91,7 @@ void SwExpandPortion::Paint( const SwTxtPaintInfo &rInf ) const
         rInf.DrawText( *this, rInf.GetLen(), false );
 
     if( GetJoinBorderWithPrev() || GetJoinBorderWithNext() )
-        *const_cast<SwTxtPaintInfo&>(rInf).GetFont() = aOldFont;
+        *const_cast<SwTextPaintInfo&>(rInf).GetFont() = aOldFont;
 }
 
 SwLinePortion *SwBlankPortion::Compress() { return this; }
@@ -101,7 +101,7 @@ SwLinePortion *SwBlankPortion::Compress() { return this; }
  * underflows!
  * Causes problems with Fly
  */
-sal_uInt16 SwBlankPortion::MayUnderflow( const SwTxtFormatInfo &rInf,
+sal_uInt16 SwBlankPortion::MayUnderflow( const SwTextFormatInfo &rInf,
     sal_Int32 nIdx, bool bUnderflow )
 {
     if( rInf.StopUnderflow() )
@@ -116,9 +116,9 @@ sal_uInt16 SwBlankPortion::MayUnderflow( const SwTxtFormatInfo &rInf,
 
     // If a Blank is preceding us, we do not need to trigger underflow
     // If a Blank is succeeding us, we do not need to pass on the underflow
-    if (bUnderflow && nIdx + 1 < rInf.GetTxt().getLength() && CH_BLANK == rInf.GetTxt()[nIdx + 1])
+    if (bUnderflow && nIdx + 1 < rInf.GetText().getLength() && CH_BLANK == rInf.GetText()[nIdx + 1])
         return 0;
-    if( nIdx && !const_cast<SwTxtFormatInfo&>(rInf).GetFly() )
+    if( nIdx && !const_cast<SwTextFormatInfo&>(rInf).GetFly() )
     {
         while( pPos && !pPos->IsFlyPortion() )
             pPos = pPos->GetPortion();
@@ -151,7 +151,7 @@ sal_uInt16 SwBlankPortion::MayUnderflow( const SwTxtFormatInfo &rInf,
 /**
  * Format End of Line
  */
-void SwBlankPortion::FormatEOL( SwTxtFormatInfo &rInf )
+void SwBlankPortion::FormatEOL( SwTextFormatInfo &rInf )
 {
     sal_uInt16 nMay = MayUnderflow( rInf, rInf.GetIdx() - nLineLength, true );
     if( nMay )
@@ -173,7 +173,7 @@ void SwBlankPortion::FormatEOL( SwTxtFormatInfo &rInf )
 /**
  * Pass on the underflows and trigger them ourselves!
  */
-bool SwBlankPortion::Format( SwTxtFormatInfo &rInf )
+bool SwBlankPortion::Format( SwTextFormatInfo &rInf )
 {
     const bool bFull = rInf.IsUnderflow() || SwExpandPortion::Format( rInf );
     if( bFull && MayUnderflow( rInf, rInf.GetIdx(), rInf.IsUnderflow() ) )
@@ -186,16 +186,16 @@ bool SwBlankPortion::Format( SwTxtFormatInfo &rInf )
     return bFull;
 }
 
-void SwBlankPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwBlankPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( !bMulti ) // No gray background for multiportion brackets
         rInf.DrawViewOpt( *this, POR_BLANK );
     SwExpandPortion::Paint( rInf );
 }
 
-bool SwBlankPortion::GetExpTxt( const SwTxtSizeInfo&, OUString &rTxt ) const
+bool SwBlankPortion::GetExpText( const SwTextSizeInfo&, OUString &rText ) const
 {
-    rTxt = OUString(cChar);
+    rText = OUString(cChar);
     return true;
 }
 
@@ -211,19 +211,19 @@ SwPostItsPortion::SwPostItsPortion( bool bScrpt )
     SetWhichPor( POR_POSTITS );
 }
 
-void SwPostItsPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwPostItsPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( rInf.OnWin() && Width() )
         rInf.DrawPostIts( *this, IsScript() );
 }
 
-sal_uInt16 SwPostItsPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
+sal_uInt16 SwPostItsPortion::GetViewWidth( const SwTextSizeInfo &rInf ) const
 {
     // Unbelievable: PostIts are always visible
     return rInf.OnWin() ? SwViewOption::GetPostItsWidth( rInf.GetOut() ) : 0;
 }
 
-bool SwPostItsPortion::Format( SwTxtFormatInfo &rInf )
+bool SwPostItsPortion::Format( SwTextFormatInfo &rInf )
 {
     const bool bRet = SwLinePortion::Format( rInf );
     // PostIts should not have an effect on line height etc.
@@ -232,12 +232,12 @@ bool SwPostItsPortion::Format( SwTxtFormatInfo &rInf )
     return bRet;
 }
 
-bool SwPostItsPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwPostItsPortion::GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const
 {
     if( rInf.OnWin() && rInf.GetOpt().IsPostIts() )
-        rTxt = " ";
+        rText = " ";
     else
-        rTxt.clear();
+        rText.clear();
     return true;
 }
 
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 8ecf8c5ea9b7..cf2374aed66f 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -22,15 +22,15 @@
 
 #include "portxt.hxx"
 
-class SwExpandPortion : public SwTxtPortion
+class SwExpandPortion : public SwTextPortion
 {
 public:
     inline  SwExpandPortion() { SetWhichPor( POR_EXP ); }
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
     virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
-    virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+    virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
@@ -51,11 +51,11 @@ public:
     void SetMulti( bool bNew ) { bMulti = bNew; }
 
     virtual SwLinePortion *Compress() SAL_OVERRIDE;
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
-    virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    static sal_uInt16 MayUnderflow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx,
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+    virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    static sal_uInt16 MayUnderflow( const SwTextFormatInfo &rInf, sal_Int32 nIdx,
         bool bUnderflow );
 
     // Accessibility: pass information about this portion to the PortionHandler
@@ -69,10 +69,10 @@ class SwPostItsPortion : public SwExpandPortion
     bool    bScript;
 public:
             SwPostItsPortion( bool bScrpt );
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
     bool IsScript() const { return bScript; }
     OUTPUT_OPERATOR_OVERRIDE
 };
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 95b1542fe8cc..a13c1501777b 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -45,10 +45,10 @@
 
 using namespace ::com::sun::star;
 
-SwLinePortion *SwFldPortion::Compress()
+SwLinePortion *SwFieldPortion::Compress()
 { return (GetLen() || !aExpand.isEmpty() || SwLinePortion::Compress()) ? this : 0; }
 
-SwFldPortion *SwFldPortion::Clone( const OUString &rExpand ) const
+SwFieldPortion *SwFieldPortion::Clone( const OUString &rExpand ) const
 {
     SwFont *pNewFnt;
     if( 0 != ( pNewFnt = pFnt ) )
@@ -56,75 +56,75 @@ SwFldPortion *SwFldPortion::Clone( const OUString &rExpand ) const
         pNewFnt = new SwFont( *pFnt );
     }
     // #i107143#
-    // pass placeholder property to created <SwFldPortion> instance.
-    SwFldPortion* pClone = new SwFldPortion( rExpand, pNewFnt, bPlaceHolder );
+    // pass placeholder property to created <SwFieldPortion> instance.
+    SwFieldPortion* pClone = new SwFieldPortion( rExpand, pNewFnt, bPlaceHolder );
     pClone->SetNextOffset( nNextOffset );
     pClone->m_bNoLength = this->m_bNoLength;
     return pClone;
 }
 
-void SwFldPortion::TakeNextOffset( const SwFldPortion* pFld )
+void SwFieldPortion::TakeNextOffset( const SwFieldPortion* pField )
 {
-    OSL_ENSURE( pFld, "TakeNextOffset: Missing Source" );
-    nNextOffset = pFld->GetNextOffset();
+    OSL_ENSURE( pField, "TakeNextOffset: Missing Source" );
+    nNextOffset = pField->GetNextOffset();
     aExpand = aExpand.replaceAt( 0, nNextOffset, "" );
     bFollow = true;
 }
 
-SwFldPortion::SwFldPortion( const OUString &rExpand, SwFont *pFont, bool bPlaceHold )
+SwFieldPortion::SwFieldPortion( const OUString &rExpand, SwFont *pFont, bool bPlaceHold )
     : aExpand(rExpand), pFnt(pFont), nNextOffset(0), nNextScriptChg(COMPLETE_STRING), nViewWidth(0)
     , bFollow( false ), bLeft( false), bHide( false)
     , bCenter (false), bHasFollow( false )
     , bAnimated( false), bNoPaint( false)
     , bReplace( false), bPlaceHolder( bPlaceHold )
     , m_bNoLength( false )
-    , m_nAttrFldType(0)
+    , m_nAttrFieldType(0)
 {
     SetWhichPor( POR_FLD );
 }
 
-SwFldPortion::SwFldPortion( const SwFldPortion& rFld )
-    : SwExpandPortion( rFld )
-    , aExpand( rFld.GetExp() )
-    , nNextOffset( rFld.GetNextOffset() )
-    , nNextScriptChg( rFld.GetNextScriptChg() )
-    , nViewWidth( rFld.nViewWidth )
-    , bFollow( rFld.IsFollow() )
-    , bLeft( rFld.IsLeft() )
-    , bHide( rFld.IsHide() )
-    , bCenter( rFld.IsCenter() )
-    , bHasFollow( rFld.HasFollow() )
-    , bAnimated ( rFld.bAnimated )
-    , bNoPaint( rFld.bNoPaint)
-    , bReplace( rFld.bReplace )
-    , bPlaceHolder( rFld.bPlaceHolder )
-    , m_bNoLength( rFld.m_bNoLength )
-    , m_nAttrFldType( rFld.m_nAttrFldType)
+SwFieldPortion::SwFieldPortion( const SwFieldPortion& rField )
+    : SwExpandPortion( rField )
+    , aExpand( rField.GetExp() )
+    , nNextOffset( rField.GetNextOffset() )
+    , nNextScriptChg( rField.GetNextScriptChg() )
+    , nViewWidth( rField.nViewWidth )
+    , bFollow( rField.IsFollow() )
+    , bLeft( rField.IsLeft() )
+    , bHide( rField.IsHide() )
+    , bCenter( rField.IsCenter() )
+    , bHasFollow( rField.HasFollow() )
+    , bAnimated ( rField.bAnimated )
+    , bNoPaint( rField.bNoPaint)
+    , bReplace( rField.bReplace )
+    , bPlaceHolder( rField.bPlaceHolder )
+    , m_bNoLength( rField.m_bNoLength )
+    , m_nAttrFieldType( rField.m_nAttrFieldType)
 {
-    if ( rFld.HasFont() )
-        pFnt = new SwFont( *rFld.GetFont() );
+    if ( rField.HasFont() )
+        pFnt = new SwFont( *rField.GetFont() );
     else
         pFnt = 0;
 
     SetWhichPor( POR_FLD );
 }
 
-SwFldPortion::~SwFldPortion()
+SwFieldPortion::~SwFieldPortion()
 {
     delete pFnt;
     if( pBlink )
         pBlink->Delete( this );
 }
 
-sal_uInt16 SwFldPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
+sal_uInt16 SwFieldPortion::GetViewWidth( const SwTextSizeInfo &rInf ) const
 {
     // even though this is const, nViewWidth should be computed at the very end:
-    SwFldPortion* pThis = const_cast<SwFldPortion*>(this);
+    SwFieldPortion* pThis = const_cast<SwFieldPortion*>(this);
     if( !Width() && rInf.OnWin() && !rInf.GetOpt().IsPagePreview() &&
             !rInf.GetOpt().IsReadonly() && SwViewOption::IsFieldShadings() )
     {
         if( !nViewWidth )
-            pThis->nViewWidth = rInf.GetTxtSize(OUString(' ')).Width();
+            pThis->nViewWidth = rInf.GetTextSize(OUString(' ')).Width();
     }
     else
         pThis->nViewWidth = 0;
@@ -134,37 +134,37 @@ sal_uInt16 SwFldPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
 /**
  * Never just use SetLen(0)
  */
-class SwFldSlot
+class SwFieldSlot
 {
     std::shared_ptr<vcl::TextLayoutCache> m_pOldCachedVclData;
-    const OUString *pOldTxt;
-    OUString aTxt;
+    const OUString *pOldText;
+    OUString aText;
     sal_Int32 nIdx;
     sal_Int32 nLen;
-    SwTxtFormatInfo *pInf;
+    SwTextFormatInfo *pInf;
     bool bOn;
 public:
-    SwFldSlot( const SwTxtFormatInfo* pNew, const SwFldPortion *pPor );
-    ~SwFldSlot();
+    SwFieldSlot( const SwTextFormatInfo* pNew, const SwFieldPortion *pPor );
+    ~SwFieldSlot();
 };
 
-SwFldSlot::SwFldSlot( const SwTxtFormatInfo* pNew, const SwFldPortion *pPor )
-    : pOldTxt(NULL)
+SwFieldSlot::SwFieldSlot( const SwTextFormatInfo* pNew, const SwFieldPortion *pPor )
+    : pOldText(NULL)
     , nIdx(0)
     , nLen(0)
     , pInf(NULL)
 {
-    bOn = pPor->GetExpTxt( *pNew, aTxt );
+    bOn = pPor->GetExpText( *pNew, aText );
 
     // The text will be replaced ...
     if( bOn )
     {
-        pInf = const_cast<SwTxtFormatInfo*>(pNew);
+        pInf = const_cast<SwTextFormatInfo*>(pNew);
         nIdx = pInf->GetIdx();
         nLen = pInf->GetLen();
-        pOldTxt = &(pInf->GetTxt());
+        pOldText = &(pInf->GetText());
         m_pOldCachedVclData = pInf->GetCachedVclData();
-        pInf->SetLen( aTxt.getLength() );
+        pInf->SetLen( aText.getLength() );
         pInf->SetCachedVclData(nullptr);
         if( pPor->IsFollow() )
         {
@@ -173,45 +173,45 @@ SwFldSlot::SwFldSlot( const SwTxtFormatInfo* pNew, const SwFldPortion *pPor )
         }
         else
         {
-            aTxt = (*pOldTxt).replaceAt(nIdx, 1, aTxt);
+            aText = (*pOldText).replaceAt(nIdx, 1, aText);
         }
-        pInf->SetTxt( aTxt );
+        pInf->SetText( aText );
     }
 }
 
-SwFldSlot::~SwFldSlot()
+SwFieldSlot::~SwFieldSlot()
 {
     if( bOn )
     {
         pInf->SetCachedVclData(m_pOldCachedVclData);
-        pInf->SetTxt( *pOldTxt );
+        pInf->SetText( *pOldText );
         pInf->SetIdx( nIdx );
         pInf->SetLen( nLen );
         pInf->SetFakeLineStart( false );
     }
 }
 
-void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf )
+void SwFieldPortion::CheckScript( const SwTextSizeInfo &rInf )
 {
-    OUString aTxt;
-    if( GetExpTxt( rInf, aTxt ) && !aTxt.isEmpty() && g_pBreakIt->GetBreakIter().is() )
+    OUString aText;
+    if( GetExpText( rInf, aText ) && !aText.isEmpty() && g_pBreakIt->GetBreakIter().is() )
     {
         sal_uInt8 nActual = pFnt ? pFnt->GetActual() : rInf.GetFont()->GetActual();
-        sal_uInt16 nScript = g_pBreakIt->GetBreakIter()->getScriptType( aTxt, 0 );
+        sal_uInt16 nScript = g_pBreakIt->GetBreakIter()->getScriptType( aText, 0 );
         sal_Int32 nChg = 0;
         if( i18n::ScriptType::WEAK == nScript )
         {
-            nChg = g_pBreakIt->GetBreakIter()->endOfScript(aTxt,0,nScript);
-            if (nChg < aTxt.getLength() && nChg >= 0)
-                nScript = g_pBreakIt->GetBreakIter()->getScriptType( aTxt, nChg );
+            nChg = g_pBreakIt->GetBreakIter()->endOfScript(aText,0,nScript);
+            if (nChg < aText.getLength() && nChg >= 0)
+                nScript = g_pBreakIt->GetBreakIter()->getScriptType( aText, nChg );
         }
 
-        // nNextScriptChg will be evaluated during SwFldPortion::Format()
+        // nNextScriptChg will be evaluated during SwFieldPortion::Format()
 
-        if (nChg < aTxt.getLength() && nChg >= 0)
-            nNextScriptChg = g_pBreakIt->GetBreakIter()->endOfScript( aTxt, nChg, nScript );
+        if (nChg < aText.getLength() && nChg >= 0)
+            nNextScriptChg = g_pBreakIt->GetBreakIter()->endOfScript( aText, nChg, nScript );
         else
-            nNextScriptChg = aTxt.getLength();
+            nNextScriptChg = aText.getLength();
 
         sal_uInt8 nTmp;
         switch ( nScript ) {
@@ -224,16 +224,16 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf )
         // #i16354# Change script type for RTL text to CTL.
         const SwScriptInfo& rSI = rInf.GetParaPortion()->GetScriptInfo();
         // #i98418#
-        const sal_uInt8 nFldDir = ( IsNumberPortion() || IsFtnNumPortion() ) ?
+        const sal_uInt8 nFieldDir = ( IsNumberPortion() || IsFootnoteNumPortion() ) ?
                              rSI.GetDefaultDir() :
                              rSI.DirType( IsFollow() ? rInf.GetIdx() - 1 : rInf.GetIdx() );
 
-        bool bPerformUBA = UBIDI_LTR != nFldDir || i18n::ScriptType::COMPLEX == nScript;
+        bool bPerformUBA = UBIDI_LTR != nFieldDir || i18n::ScriptType::COMPLEX == nScript;
         if (bPerformUBA)
         {
             UErrorCode nError = U_ZERO_ERROR;
-            UBiDi* pBidi = ubidi_openSized( aTxt.getLength(), 0, &nError );
-            ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aTxt.getStr()), aTxt.getLength(), nFldDir, NULL, &nError );
+            UBiDi* pBidi = ubidi_openSized( aText.getLength(), 0, &nError );
+            ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.getStr()), aText.getLength(), nFieldDir, NULL, &nError );
             int32_t nEnd;
             UBiDiLevel nCurrDir;
             ubidi_getLogicalRun( pBidi, 0, &nEnd, &nCurrDir );
@@ -248,7 +248,7 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf )
                 nCurrDir = UBIDI_RTL;
                 for( sal_Int32 nCharIdx = 0; nCharIdx < nEnd; ++nCharIdx )
                 {
-                    UCharDirection nCharDir = u_charDirection ( aTxt[ nCharIdx ]);
+                    UCharDirection nCharDir = u_charDirection ( aText[ nCharIdx ]);
                     if ( nCharDir == U_LEFT_TO_RIGHT ||
                          nCharDir == U_LEFT_TO_RIGHT_EMBEDDING ||
                          nCharDir == U_LEFT_TO_RIGHT_OVERRIDE )
@@ -274,9 +274,9 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf )
         // keep determined script type for footnote portions as preferred script type.
         // For footnote portions a font can not be created directly - see footnote
         // portion format method.
-        if ( IsFtnPortion() )
+        if ( IsFootnotePortion() )
         {
-            static_cast<SwFtnPortion*>(this)->SetPreferredScriptType( nTmp );
+            static_cast<SwFootnotePortion*>(this)->SetPreferredScriptType( nTmp );
         }
         else if ( nTmp != nActual )
         {
@@ -287,15 +287,15 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf )
     }
 }
 
-bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
+bool SwFieldPortion::Format( SwTextFormatInfo &rInf )
 {
-    // Scope wegen aDiffTxt::DTOR!
+    // Scope wegen aDiffText::DTOR!
     sal_Int32 nRest;
     bool bFull = false;
     bool bEOL = false;
-    const sal_Int32 nTxtRest = rInf.GetTxt().getLength() - rInf.GetIdx();
+    const sal_Int32 nTextRest = rInf.GetText().getLength() - rInf.GetIdx();
     {
-        SwFldSlot aDiffTxt( &rInf, this );
+        SwFieldSlot aDiffText( &rInf, this );
         SwLayoutModeModifier aLayoutModeModifier( *rInf.GetOut() );
         aLayoutModeModifier.SetAuto();
 
@@ -327,7 +327,7 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
         const sal_Int32 nFollow = IsFollow() ? 0 : 1;
 
         // As odd is may seem: the query for GetLen() must return false due
-        // to the ExpandPortions _after_ aDiffTxt (see SoftHyphs), caused
+        // to the ExpandPortions _after_ aDiffText (see SoftHyphs), caused
         // by SetFull.
         if( !nFullLen )
         {
@@ -340,16 +340,16 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
             sal_Int32 nOldLineStart = rInf.GetLineStart();
             if( IsFollow() )
                 rInf.SetLineStart( 0 );
-            rInf.SetNotEOL( nFullLen == nOldFullLen && nTxtRest > nFollow );
+            rInf.SetNotEOL( nFullLen == nOldFullLen && nTextRest > nFollow );
 
             // the height depending on the fields font is set,
-            // this is required for SwTxtGuess::Guess
-            Height( rInf.GetTxtHeight() + rInf.GetFont()->GetTopBorderSpace() +
+            // this is required for SwTextGuess::Guess
+            Height( rInf.GetTextHeight() + rInf.GetFont()->GetTopBorderSpace() +
                     rInf.GetFont()->GetBottomBorderSpace() );
             // If a kerning portion is inserted after our field portion,
             // the ascent and height must be known
             SetAscent( rInf.GetAscent() + rInf.GetFont()->GetTopBorderSpace() );
-            bFull = SwTxtPortion::Format( rInf );
+            bFull = SwTextPortion::Format( rInf );
             rInf.SetNotEOL( false );
             rInf.SetLineStart( nOldLineStart );
         }
@@ -368,7 +368,7 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
             sal_Int32 nNextOfst = aExpand.getLength() - nRest;
 
             if ( IsQuoVadisPortion() )
-                nNextOfst = nNextOfst + static_cast<SwQuoVadisPortion*>(this)->GetContTxt().getLength();
+                nNextOfst = nNextOfst + static_cast<SwQuoVadisPortion*>(this)->GetContText().getLength();
 
             OUString aNew( aExpand.copy( nNextOfst ) );
             aExpand = aExpand.copy( 0, nNextOfst );
@@ -399,13 +399,13 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
             // Even if there is no more text left for a follow field,
             // we have to build a follow field portion (without font),
             // otherwise the HookChar mechanism would not work.
-            SwFldPortion *pFld = Clone( aNew );
-            if( !aNew.isEmpty() && !pFld->GetFont() )
+            SwFieldPortion *pField = Clone( aNew );
+            if( !aNew.isEmpty() && !pField->GetFont() )
             {
                 SwFont *pNewFnt = new SwFont( *rInf.GetFont() );
-                pFld->SetFont( pNewFnt );
+                pField->SetFont( pNewFnt );
             }
-            pFld->SetFollow( true );
+            pField->SetFollow( true );
             SetHasFollow( true );
 
             // For a newly created field, nNextOffset contains the Offset
@@ -413,8 +413,8 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
             // If a FollowField is created when formatting, this FollowField's
             // Offset is being held in nNextOffset
             nNextOffset = nNextOffset + nNextOfst;
-            pFld->SetNextOffset( nNextOffset );
-            rInf.SetRest( pFld );
+            pField->SetNextOffset( nNextOffset );
+            rInf.SetRest( pField );
         }
     }
 
@@ -423,11 +423,11 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
     return bFull;
 }
 
-void SwFldPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwFieldPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     SwFontSave aSave( rInf, pFnt );
 
-    OSL_ENSURE( GetLen() <= 1, "SwFldPortion::Paint: rest-portion pollution?" );
+    OSL_ENSURE( GetLen() <= 1, "SwFieldPortion::Paint: rest-portion pollution?" );
     if( Width() && ( !bPlaceHolder || rInf.GetOpt().IsShowPlaceHolderFields() ) )
     {
         // A very liberal use of the background
@@ -436,18 +436,18 @@ void SwFldPortion::Paint( const SwTxtPaintInfo &rInf ) const
     }
 }
 
-bool SwFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwFieldPortion::GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const
 {
-    rTxt = aExpand;
-    if( rTxt.isEmpty() && rInf.OnWin() &&
+    rText = aExpand;
+    if( rText.isEmpty() && rInf.OnWin() &&
         !rInf.GetOpt().IsPagePreview() && !rInf.GetOpt().IsReadonly() &&
             SwViewOption::IsFieldShadings() &&
             !HasFollow() )
-        rTxt = " ";
+        rText = " ";
     return true;
 }
 
-void SwFldPortion::HandlePortion( SwPortionHandler& rPH ) const
+void SwFieldPortion::HandlePortion( SwPortionHandler& rPH ) const
 {
     sal_Int32 nH = 0;
     sal_Int32 nW = 0;
@@ -459,18 +459,18 @@ void SwFldPortion::HandlePortion( SwPortionHandler& rPH ) const
     rPH.Special( GetLen(), aExpand, GetWhichPor(), nH, nW, pFnt );
     if( GetWhichPor() == POR_FLD )
     {
-        rPH.SetAttrFieldType(m_nAttrFldType);
+        rPH.SetAttrFieldType(m_nAttrFieldType);
     }
 }
 
-SwPosSize SwFldPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
+SwPosSize SwFieldPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
 {
     SwFontSave aSave( rInf, pFnt );
-    SwPosSize aSize( SwExpandPortion::GetTxtSize( rInf ) );
+    SwPosSize aSize( SwExpandPortion::GetTextSize( rInf ) );
     return aSize;
 }
 
-SwFldPortion *SwHiddenPortion::Clone(const OUString &rExpand ) const
+SwFieldPortion *SwHiddenPortion::Clone(const OUString &rExpand ) const
 {
     SwFont *pNewFnt;
     if( 0 != ( pNewFnt = pFnt ) )
@@ -478,7 +478,7 @@ SwFldPortion *SwHiddenPortion::Clone(const OUString &rExpand ) const
     return new SwHiddenPortion( rExpand, pNewFnt );
 }
 
-void SwHiddenPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwHiddenPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( Width() )
     {
@@ -488,10 +488,10 @@ void SwHiddenPortion::Paint( const SwTxtPaintInfo &rInf ) const
     }
 }
 
-bool SwHiddenPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwHiddenPortion::GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const
 {
     // Do not query for IsHidden()!
-    return SwFldPortion::GetExpTxt( rInf, rTxt );
+    return SwFieldPortion::GetExpText( rInf, rText );
 }
 
 SwNumberPortion::SwNumberPortion( const OUString &rExpand,
@@ -500,7 +500,7 @@ SwNumberPortion::SwNumberPortion( const OUString &rExpand,
                                   const bool bCntr,
                                   const sal_uInt16 nMinDst,
                                   const bool bLabelAlignmentPosAndSpaceModeActive )
-        : SwFldPortion( rExpand, pFont ),
+        : SwFieldPortion( rExpand, pFont ),
           nFixWidth(0),
           nMinDist( nMinDst ),
           mbLabelAlignmentPosAndSpaceModeActive( bLabelAlignmentPosAndSpaceModeActive )
@@ -516,7 +516,7 @@ sal_Int32 SwNumberPortion::GetCrsrOfst( const sal_uInt16 ) const
     return 0;
 }
 
-SwFldPortion *SwNumberPortion::Clone( const OUString &rExpand ) const
+SwFieldPortion *SwNumberPortion::Clone( const OUString &rExpand ) const
 {
     SwFont *pNewFnt;
     if( 0 != ( pNewFnt = pFnt ) )
@@ -532,10 +532,10 @@ SwFldPortion *SwNumberPortion::Clone( const OUString &rExpand ) const
  * to cause the line to overflow
  * We need to keep the Fly's evasion tactics in mind
  */
-bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
+bool SwNumberPortion::Format( SwTextFormatInfo &rInf )
 {
     SetHide( false );
-    const bool bFull = SwFldPortion::Format( rInf );
+    const bool bFull = SwFieldPortion::Format( rInf );
     SetLen( 0 );
     // a numbering portion can be contained in a rotated portion!!!
     nFixWidth = rInf.IsMulti() ? Height() : Width();
@@ -549,13 +549,13 @@ bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
 
         if ( !mbLabelAlignmentPosAndSpaceModeActive )
         {
-            if ( !rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING) &&
+            if ( !rInf.GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING) &&
                  // #i32902#
-                 !IsFtnNumPortion() )
+                 !IsFootnoteNumPortion() )
             {
                 nDiff = rInf.Left()
-                    + rInf.GetTxtFrm()->GetTxtNode()->
-                    GetSwAttrSet().GetLRSpace().GetTxtFirstLineOfst()
+                    + rInf.GetTextFrm()->GetTextNode()->
+                    GetSwAttrSet().GetLRSpace().GetTextFirstLineOfst()
                     - rInf.First()
                     + rInf.ForcedLeftMargin();
             }
@@ -608,7 +608,7 @@ bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
  * the line anymore. In order for the Numbering to follow through,
  * we hide this NumberPortion
  */
-void SwNumberPortion::FormatEOL( SwTxtFormatInfo& )
+void SwNumberPortion::FormatEOL( SwTextFormatInfo& )
 {
 
     // This caused trouble with flys anchored as characters.
@@ -623,12 +623,12 @@ void SwNumberPortion::FormatEOL( SwTxtFormatInfo& )
  * A hidden NumberPortion is not displayed, unless there are TextPortions in
  * this line or there's just one line at all
  */
-void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwNumberPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if ( IsHide() && rInf.GetParaPortion() && rInf.GetParaPortion()->GetNext() )
     {
         SwLinePortion *pTmp = GetPortion();
-        while ( pTmp && !pTmp->InTxtGrp() )
+        while ( pTmp && !pTmp->InTextGrp() )
             pTmp = pTmp->GetPortion();
         if ( !pTmp )
             return;
@@ -687,12 +687,12 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const
             sal_uInt16 nSpaceOffs = nFixWidth;
             pThis->Width( nFixWidth );
 
-            if( ( IsLeft() && ! rInf.GetTxtFrm()->IsRightToLeft() ) ||
-                ( ! IsLeft() && ! IsCenter() && rInf.GetTxtFrm()->IsRightToLeft() ) )
+            if( ( IsLeft() && ! rInf.GetTextFrm()->IsRightToLeft() ) ||
+                ( ! IsLeft() && ! IsCenter() && rInf.GetTextFrm()->IsRightToLeft() ) )
                 SwExpandPortion::Paint( rInf );
             else
             {
-                SwTxtPaintInfo aInf( rInf );
+                SwTextPaintInfo aInf( rInf );
                 if( nOffset < nMinDist )
                     nOffset = 0;
                 else
@@ -715,7 +715,7 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const
             }
             if( bPaintSpace && nOldWidth > nSpaceOffs )
             {
-                SwTxtPaintInfo aInf( rInf );
+                SwTextPaintInfo aInf( rInf );
                 aInf.X( aInf.X() + nSpaceOffs );
 
                 // #i53199# Adjust position of underline:
@@ -727,7 +727,7 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const
 
                 pThis->Width( nOldWidth - nSpaceOffs + 12 );
                 {
-                    SwTxtSlot aDiffTxt( &aInf, this, true, false, "  " );
+                    SwTextSlot aDiffText( &aInf, this, true, false, "  " );
                     aInf.DrawText( *this, aInf.GetLen(), true );
                 }
             }
@@ -756,7 +756,7 @@ SwGrfNumPortion::SwGrfNumPortion(
         SwFrm*,
         const OUString& rGraphicFollowedBy,
         const SvxBrushItem* pGrfBrush,
-        const SwFmtVertOrient* pGrfOrient, const Size& rGrfSize,
+        const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize,
         const bool bLft, const bool bCntr, const sal_uInt16 nMinDst,
         const bool bLabelAlignmentPosAndSpaceModeActive ) :
     SwNumberPortion( rGraphicFollowedBy, NULL, bLft, bCntr, nMinDst,
@@ -813,14 +813,14 @@ void SwGrfNumPortion::StopAnimation( OutputDevice* pOut )
     }
 }
 
-bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
+bool SwGrfNumPortion::Format( SwTextFormatInfo &rInf )
 {
     SetHide( false );
 //    Width( nFixWidth );
     sal_uInt16 nFollowedByWidth( 0 );
     if ( mbLabelAlignmentPosAndSpaceModeActive )
     {
-        SwFldPortion::Format( rInf );
+        SwFieldPortion::Format( rInf );
         nFollowedByWidth = Width();
         SetLen( 0 );
     }
@@ -878,14 +878,14 @@ bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
  * A hidden NumberPortion is not displayed, unless there are TextPortions in
  * this line or there's only one line at all
  */
-void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwGrfNumPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( DontPaint() )
         return;
     if ( IsHide() && rInf.GetParaPortion() && rInf.GetParaPortion()->GetNext() )
     {
         SwLinePortion *pTmp = GetPortion();
-        while ( pTmp && !pTmp->InTxtGrp() )
+        while ( pTmp && !pTmp->InTextGrp() )
             pTmp = pTmp->GetPortion();
         if ( !pTmp )
             return;
@@ -895,8 +895,8 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const
     Size aSize( nTmpWidth, GetGrfHeight() - 2 * GRFNUM_SECURE );
 
     const bool bTmpLeft = mbLabelAlignmentPosAndSpaceModeActive ||
-                              ( IsLeft() && ! rInf.GetTxtFrm()->IsRightToLeft() ) ||
-                              ( ! IsLeft() && ! IsCenter() && rInf.GetTxtFrm()->IsRightToLeft() );
+                              ( IsLeft() && ! rInf.GetTextFrm()->IsRightToLeft() ) ||
+                              ( ! IsLeft() && ! IsCenter() && rInf.GetTextFrm()->IsRightToLeft() );
 
     if( nFixWidth < Width() && !bTmpLeft )
     {
@@ -932,8 +932,8 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const
         bDraw = !rInf.GetOpt().IsGraphic();
         if( !nId )
         {
-            SetId( sal_IntPtr( rInf.GetTxtFrm() ) );
-            rInf.GetTxtFrm()->SetAnimation();
+            SetId( sal_IntPtr( rInf.GetTextFrm() ) );
+            rInf.GetTextFrm()->SetAnimation();
         }
         if( aTmp.IsOver( rInf.GetPaintRect() ) && !bDraw )
         {
@@ -947,7 +947,7 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const
                 Graphic* pGraph = const_cast<Graphic*>(pBrush->GetGraphic());
                 if (pGraph)
                     pGraph->StopAnimation(0,nId);
-                rInf.GetTxtFrm()->getRootFrm()->GetCurrShell()->InvalidateWindows( aTmp );
+                rInf.GetTextFrm()->getRootFrm()->GetCurrShell()->InvalidateWindows( aTmp );
             }
 
             else if ( pViewShell &&
@@ -978,7 +978,7 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const
     }
 
     SwRect aRepaint( rInf.GetPaintRect() );
-    const SwTxtFrm& rFrm = *rInf.GetTxtFrm();
+    const SwTextFrm& rFrm = *rInf.GetTextFrm();
     if( rFrm.IsVertical() )
     {
         rFrm.SwitchHorizontalToVertical( aTmp );
@@ -1034,9 +1034,9 @@ void SwGrfNumPortion::SetBase( long nLnAscent, long nLnDescent,
     }
 }
 
-void SwTxtFrm::StopAnimation( OutputDevice* pOut )
+void SwTextFrm::StopAnimation( OutputDevice* pOut )
 {
-    OSL_ENSURE( HasAnimation(), "SwTxtFrm::StopAnimation: Which Animation?" );
+    OSL_ENSURE( HasAnimation(), "SwTextFrm::StopAnimation: Which Animation?" );
     if( HasPara() )
     {
         SwLineLayout *pLine = GetPara();
@@ -1060,8 +1060,8 @@ void SwTxtFrm::StopAnimation( OutputDevice* pOut )
 /**
  * Initializes the script array and clears the width array
  */
-SwCombinedPortion::SwCombinedPortion( const OUString &rTxt )
-    : SwFldPortion( rTxt )
+SwCombinedPortion::SwCombinedPortion( const OUString &rText )
+    : SwFieldPortion( rText )
     , nUpPos(0)
     , nLowPos(0)
     , nProportion(55)
@@ -1076,9 +1076,9 @@ SwCombinedPortion::SwCombinedPortion( const OUString &rTxt )
     if( g_pBreakIt->GetBreakIter().is() )
     {
         sal_uInt8 nScr = SW_SCRIPTS;
-        for( sal_Int32 i = 0; i < rTxt.getLength(); ++i )
+        for( sal_Int32 i = 0; i < rText.getLength(); ++i )
         {
-            switch ( g_pBreakIt->GetBreakIter()->getScriptType( rTxt, i ) ) {
+            switch ( g_pBreakIt->GetBreakIter()->getScriptType( rText, i ) ) {
                 case i18n::ScriptType::LATIN : nScr = SW_LATIN; break;
                 case i18n::ScriptType::ASIAN : nScr = SW_CJK; break;
                 case i18n::ScriptType::COMPLEX : nScr = SW_CTL; break;
@@ -1094,9 +1094,9 @@ SwCombinedPortion::SwCombinedPortion( const OUString &rTxt )
     memset( &aWidth, 0, sizeof(aWidth) );
 }
 
-void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwCombinedPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
-    OSL_ENSURE( GetLen() <= 1, "SwFldPortion::Paint: rest-portion pollution?" );
+    OSL_ENSURE( GetLen() <= 1, "SwFieldPortion::Paint: rest-portion pollution?" );
     if( Width() )
     {
         rInf.DrawBackBrush( *this );
@@ -1139,15 +1139,15 @@ void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const
                     aTmpFont.SetSize( aTmpSz, nAct );
                 }
             }
-            const_cast<SwTxtPaintInfo&>(rInf).SetPos( aOutPos );
+            const_cast<SwTextPaintInfo&>(rInf).SetPos( aOutPos );
             rInf.DrawText( aExpand, *this, i, 1 );
         }
         // rInf is const, so we have to take back our manipulations
-        const_cast<SwTxtPaintInfo&>(rInf).SetPos( aOldPos );
+        const_cast<SwTextPaintInfo&>(rInf).SetPos( aOldPos );
     }
 }
 
-bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
+bool SwCombinedPortion::Format( SwTextFormatInfo &rInf )
 {
     const sal_Int32 nCount = aExpand.getLength();
     if( !nCount )
@@ -1178,7 +1178,7 @@ bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
     }
 
     const sal_Int32 nTop = ( nCount + 1 ) / 2; // the first character of the second line
-    SwViewShell *pSh = rInf.GetTxtFrm()->getRootFrm()->GetCurrShell();
+    SwViewShell *pSh = rInf.GetTextFrm()->getRootFrm()->GetCurrShell();
     SwFont aTmpFont( *rInf.GetFont() );
     SwFontSave aFontSave( rInf, &aTmpFont );
     nProportion = 55;
@@ -1217,7 +1217,7 @@ bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
             }
 
             SwDrawTextInfo aDrawInf( pSh, *rInf.GetOut(), 0, aExpand, i, 1 );
-            Size aSize = aTmpFont._GetTxtSize( aDrawInf );
+            Size aSize = aTmpFont._GetTextSize( aDrawInf );
             const sal_uInt16 nAsc = aTmpFont.GetAscent( pSh, *rInf.GetOut() );
             aPos[ i ] = (sal_uInt16)aSize.Width();
             if( i == nTop ) // enter the second line
@@ -1291,8 +1291,8 @@ bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
     const bool bFull = rInf.Width() < rInf.X() + Width();
     if( bFull )
     {
-        if( rInf.GetLineStart() == rInf.GetIdx() && (!rInf.GetLast()->InFldGrp()
-            || !static_cast<SwFldPortion*>(rInf.GetLast())->IsFollow() ) )
+        if( rInf.GetLineStart() == rInf.GetIdx() && (!rInf.GetLast()->InFieldGrp()
+            || !static_cast<SwFieldPortion*>(rInf.GetLast())->IsFollow() ) )
             Width( (sal_uInt16)( rInf.Width() - rInf.X() ) );
         else
         {
@@ -1306,14 +1306,14 @@ bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
     return bFull;
 }
 
-sal_uInt16 SwCombinedPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
+sal_uInt16 SwCombinedPortion::GetViewWidth( const SwTextSizeInfo &rInf ) const
 {
     if( !GetLen() ) // for the dummy part at the end of the line, where
         return 0;   // the combined portion doesn't fit.
-    return SwFldPortion::GetViewWidth( rInf );
+    return SwFieldPortion::GetViewWidth( rInf );
 }
 
-SwFldPortion *SwFieldFormDropDownPortion::Clone(const OUString &rExpand) const
+SwFieldPortion *SwFieldFormDropDownPortion::Clone(const OUString &rExpand) const
 {
     return new SwFieldFormDropDownPortion(rExpand);
 }
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 19e59364c2fa..fe96aa42cfbe 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -25,12 +25,12 @@
 
 class SwFont;
 class SvxBrushItem;
-class SwFmtVertOrient;
+class SwFormatVertOrient;
 class SwFrm;
 
-class SwFldPortion : public SwExpandPortion
+class SwFieldPortion : public SwExpandPortion
 {
-    friend class SwTxtFormatter;
+    friend class SwTextFormatter;
 protected:
     OUString  aExpand;          // The expanded field
     SwFont  *pFnt;              // For multi-line fields
@@ -53,26 +53,26 @@ protected:
     inline void SetNoLength()       { m_bNoLength = true; }
 
 public:
-    SwFldPortion( const SwFldPortion& rFld );
-    SwFldPortion( const OUString &rExpand, SwFont *pFnt = 0, bool bPlaceHolder = false );
-    virtual ~SwFldPortion();
+    SwFieldPortion( const SwFieldPortion& rField );
+    SwFieldPortion( const OUString &rExpand, SwFont *pFnt = 0, bool bPlaceHolder = false );
+    virtual ~SwFieldPortion();
 
-    sal_uInt16 m_nAttrFldType;
-    void TakeNextOffset( const SwFldPortion* pFld );
-    void CheckScript( const SwTxtSizeInfo &rInf );
+    sal_uInt16 m_nAttrFieldType;
+    void TakeNextOffset( const SwFieldPortion* pField );
+    void CheckScript( const SwTextSizeInfo &rInf );
     inline bool HasFont() const { return 0 != pFnt; }
     // #i89179# - made public
     inline const SwFont *GetFont() const { return pFnt; }
 
     inline OUString GetExp() const { return aExpand; }
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
 
     // Empty fields are also allowed
     virtual SwLinePortion *Compress() SAL_OVERRIDE;
 
-    virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
 
     inline bool IsFollow() const { return bFollow; }
     inline void SetFollow( bool bNew ) { bFollow = bNew; }
@@ -96,10 +96,10 @@ public:
     inline void SetNextScriptChg( sal_Int32 nNew ) { nNextScriptChg = nNew; }
 
     // Field cloner for SplitGlue
-    virtual SwFldPortion *Clone( const OUString &rExpand ) const;
+    virtual SwFieldPortion *Clone( const OUString &rExpand ) const;
 
-    // Extra GetTxtSize because of pFnt
-    virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+    // Extra GetTextSize because of pFnt
+    virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
@@ -110,21 +110,21 @@ public:
 /**
  * Distinguish only for painting/hide
  */
-class SwHiddenPortion : public SwFldPortion
+class SwHiddenPortion : public SwFieldPortion
 {
 public:
     inline SwHiddenPortion( const OUString &rExpand, SwFont *pFntL = 0 )
-         : SwFldPortion( rExpand, pFntL )
+         : SwFieldPortion( rExpand, pFntL )
         { SetLen(1); SetWhichPor( POR_HIDDEN ); }
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
 
     // Field cloner for SplitGlue
-    virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+    virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
     OUTPUT_OPERATOR_OVERRIDE
 };
 
-class SwNumberPortion : public SwFldPortion
+class SwNumberPortion : public SwFieldPortion
 {
 protected:
     sal_uInt16  nFixWidth;      // See Glues
@@ -138,13 +138,13 @@ public:
                      const bool bCenter,
                      const sal_uInt16 nMinDst,
                      const bool bLabelAlignmentPosAndSpaceModeActive );
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
     virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
 
     // Field cloner for SplitGlue
-    virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
-    virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+    virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
 
     OUTPUT_OPERATOR_OVERRIDE
 };
@@ -173,15 +173,15 @@ public:
     SwGrfNumPortion( SwFrm *pFrm,
                      const OUString& rGraphicFollowedBy,
                      const SvxBrushItem* pGrfBrush,
-                     const SwFmtVertOrient* pGrfOrient,
+                     const SwFormatVertOrient* pGrfOrient,
                      const Size& rGrfSize,
                      const bool bLeft,
                      const bool bCenter,
                      const sal_uInt16 nMinDst,
                      const bool bLabelAlignmentPosAndSpaceModeActive );
     virtual ~SwGrfNumPortion();
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
 
     void SetBase( long nLnAscent, long nLnDescent,
         long nFlyAscent, long nFlyDescent );
@@ -211,7 +211,7 @@ public:
  *        ...  ..B  .C.  C.D   .D.E.   D.E.F
  *        </pre>
  */
-class SwCombinedPortion : public SwFldPortion
+class SwCombinedPortion : public SwFieldPortion
 {
     sal_uInt16 aPos[6];     // up to six X positions
     sal_uInt16 aWidth[3];   // one width for every scripttype
@@ -221,9 +221,9 @@ class SwCombinedPortion : public SwFldPortion
     sal_uInt8 nProportion;  // relative font height
 public:
     SwCombinedPortion( const OUString &rExpand );
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
     OUTPUT_OPERATOR_OVERRIDE
 };
 
@@ -231,15 +231,15 @@ namespace sw { namespace mark {
     class IFieldmark;
 } }
 
-class SwFieldFormDropDownPortion : public SwFldPortion
+class SwFieldFormDropDownPortion : public SwFieldPortion
 {
 public:
     SwFieldFormDropDownPortion(const OUString &rExpand)
-        : SwFldPortion(rExpand)
+        : SwFieldPortion(rExpand)
     {
     }
     // Field cloner for SplitGlue
-    virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+    virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
 };
 
 #endif
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 312e3cc4db9f..ac84ea739bce 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -46,11 +46,11 @@
  * class SwFlyPortion => we expect a frame-locale SwRect!
  */
 
-void SwFlyPortion::Paint( const SwTxtPaintInfo& ) const
+void SwFlyPortion::Paint( const SwTextPaintInfo& ) const
 {
 }
 
-bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
+bool SwFlyPortion::Format( SwTextFormatInfo &rInf )
 {
     OSL_ENSURE( Fix() >= rInf.X(), "SwFlyPortion::Format" );
 
@@ -72,13 +72,13 @@ bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
     rInf.GetParaPortion()->SetFly( true );
 
     // trailing blank:
-    if( rInf.GetIdx() < rInf.GetTxt().getLength() &&  1 < rInf.GetIdx()
+    if( rInf.GetIdx() < rInf.GetText().getLength() &&  1 < rInf.GetIdx()
         && !rInf.GetRest()
         && ' ' == rInf.GetChar( rInf.GetIdx() )
         && ' ' != rInf.GetChar( rInf.GetIdx() - 1 )
         && ( !rInf.GetLast() || !rInf.GetLast()->IsBreakPortion() ) )
     {
-        SetBlankWidth( rInf.GetTxtSize(OUString(' ')).Width() );
+        SetBlankWidth( rInf.GetTextSize(OUString(' ')).Width() );
         SetLen( 1 );
     }
 
@@ -96,7 +96,7 @@ bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
     return false;
 }
 
-bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
+bool SwFlyCntPortion::Format( SwTextFormatInfo &rInf )
 {
     bool bFull = rInf.Width() < rInf.X() + PrtWidth();
 
@@ -147,7 +147,7 @@ bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
  * @param nStart
  * @param nEnd
  */
-void SwTxtFrm::MoveFlyInCnt( SwTxtFrm *pNew, sal_Int32 nStart, sal_Int32 nEnd )
+void SwTextFrm::MoveFlyInCnt( SwTextFrm *pNew, sal_Int32 nStart, sal_Int32 nEnd )
 {
     SwSortedObjs *pObjs = 0L;
     if ( 0 != (pObjs = GetDrawObjs()) )
@@ -156,10 +156,10 @@ void SwTxtFrm::MoveFlyInCnt( SwTxtFrm *pNew, sal_Int32 nStart, sal_Int32 nEnd )
         {
             // Consider changed type of <SwSortedList> entries
             SwAnchoredObject* pAnchoredObj = (*pObjs)[i];
-            const SwFmtAnchor& rAnch = pAnchoredObj->GetFrmFmt().GetAnchor();
+            const SwFormatAnchor& rAnch = pAnchoredObj->GetFrameFormat().GetAnchor();
             if (rAnch.GetAnchorId() == FLY_AS_CHAR)
             {
-                const SwPosition* pPos = rAnch.GetCntntAnchor();
+                const SwPosition* pPos = rAnch.GetContentAnchor();
                 const sal_Int32 nIdx = pPos->nContent.GetIndex();
                 if ( nIdx >= nStart && nEnd > nIdx )
                 {
@@ -180,20 +180,20 @@ void SwTxtFrm::MoveFlyInCnt( SwTxtFrm *pNew, sal_Int32 nStart, sal_Int32 nEnd )
     }
 }
 
-sal_Int32 SwTxtFrm::CalcFlyPos( SwFrmFmt* pSearch )
+sal_Int32 SwTextFrm::CalcFlyPos( SwFrameFormat* pSearch )
 {
-    SwpHints* pHints = GetTxtNode()->GetpSwpHints();
+    SwpHints* pHints = GetTextNode()->GetpSwpHints();
     OSL_ENSURE( pHints, "CalcFlyPos: Why me?" );
     if( !pHints )
         return COMPLETE_STRING;
-    SwTxtAttr* pFound = NULL;
+    SwTextAttr* pFound = NULL;
     for ( size_t i = 0; i < pHints->Count(); ++i )
     {
-        SwTxtAttr *pHt = pHints->GetTextHint( i );
+        SwTextAttr *pHt = pHints->GetTextHint( i );
         if( RES_TXTATR_FLYCNT == pHt->Which() )
         {
-            SwFrmFmt* pFrmFmt = pHt->GetFlyCnt().GetFrmFmt();
-            if( pFrmFmt == pSearch )
+            SwFrameFormat* pFrameFormat = pHt->GetFlyCnt().GetFrameFormat();
+            if( pFrameFormat == pSearch )
                 pFound = pHt;
         }
     }
@@ -203,7 +203,7 @@ sal_Int32 SwTxtFrm::CalcFlyPos( SwFrmFmt* pSearch )
     return pFound->GetStart();
 }
 
-void SwFlyCntPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwFlyCntPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( bDraw )
     {
@@ -220,11 +220,11 @@ void SwFlyCntPortion::Paint( const SwTxtPaintInfo &rInf ) const
         // Re-paint everything at a CompletePaint call
         SwRect aRepaintRect( rInf.GetPaintRect() );
 
-        if ( rInf.GetTxtFrm()->IsRightToLeft() )
-            rInf.GetTxtFrm()->SwitchLTRtoRTL( aRepaintRect );
+        if ( rInf.GetTextFrm()->IsRightToLeft() )
+            rInf.GetTextFrm()->SwitchLTRtoRTL( aRepaintRect );
 
-        if ( rInf.GetTxtFrm()->IsVertical() )
-            rInf.GetTxtFrm()->SwitchHorizontalToVertical( aRepaintRect );
+        if ( rInf.GetTextFrm()->IsVertical() )
+            rInf.GetTextFrm()->SwitchHorizontalToVertical( aRepaintRect );
 
         if( (GetFlyFrm()->IsCompletePaint() ||
              GetFlyFrm()->Frm().IsOver( aRepaintRect )) &&
@@ -240,17 +240,17 @@ void SwFlyCntPortion::Paint( const SwTxtPaintInfo &rInf ) const
                 SwLayoutModeModifier aLayoutModeModifier( *rInf.GetOut() );
                 GetFlyFrm()->Paint( aRect );
             }
-            ((SwTxtPaintInfo&)rInf).GetRefDev()->SetLayoutMode(
+            ((SwTextPaintInfo&)rInf).GetRefDev()->SetLayoutMode(
                     rInf.GetOut()->GetLayoutMode() );
 
             // As the OutputDevice might be anything, the font must be re-selected.
             // Being in const method should not be a problem.
-            ((SwTxtPaintInfo&)rInf).SelectFont();
+            ((SwTextPaintInfo&)rInf).SelectFont();
 
             OSL_ENSURE( ! rInf.GetVsh() || rInf.GetVsh()->GetOut() == rInf.GetOut(),
                     "SwFlyCntPortion::Paint: Outdev has changed" );
             if( rInf.GetVsh() )
-                ((SwTxtPaintInfo&)rInf).SetOut( rInf.GetVsh()->GetOut() );
+                ((SwTextPaintInfo&)rInf).SetOut( rInf.GetVsh()->GetOut() );
         }
     }
 }
@@ -258,7 +258,7 @@ void SwFlyCntPortion::Paint( const SwTxtPaintInfo &rInf ) const
 /**
  * Use the dimensions of pFly->OutRect()
  */
-SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
+SwFlyCntPortion::SwFlyCntPortion( const SwTextFrm& rFrm,
                                   SwFlyInCntFrm *pFly, const Point &rBase,
                                   long nLnAscent, long nLnDescent,
                                   long nFlyAsc, long nFlyDesc,
@@ -275,7 +275,7 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
     SetWhichPor( POR_FLYCNT );
 }
 
-SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
+SwFlyCntPortion::SwFlyCntPortion( const SwTextFrm& rFrm,
                                   SwDrawContact *pDrawContact, const Point &rBase,
                                   long nLnAscent, long nLnDescent,
                                   long nFlyAsc, long nFlyDesc,
@@ -308,7 +308,7 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
  *
  * @param rBase CAUTION: needs to be an absolute value!
  */
-void SwFlyCntPortion::SetBase( const SwTxtFrm& rFrm, const Point &rBase,
+void SwFlyCntPortion::SetBase( const SwTextFrm& rFrm, const Point &rBase,
                                long nLnAscent, long nLnDescent,
                                long nFlyAsc, long nFlyDesc,
                                objectpositioning::AsCharFlags nFlags )
@@ -327,7 +327,7 @@ void SwFlyCntPortion::SetBase( const SwTxtFrm& rFrm, const Point &rBase,
         }
 
         // Call <SwAnchoredDrawObject::MakeObjPos()> to assure that flag at
-        // the <DrawFrmFmt> and at the <SwAnchoredDrawObject> instance are
+        // the <DrawFrameFormat> and at the <SwAnchoredDrawObject> instance are
         // correctly set
         if ( pSdrObj )
         {
@@ -354,31 +354,31 @@ void SwFlyCntPortion::SetBase( const SwTxtFrm& rFrm, const Point &rBase,
         aObjPositioning.CalcPosition();
     }
 
-    SwFrmFmt* pShape = FindFrmFmt(pSdrObj);
-    const SwFmtAnchor& rAnchor(pShape->GetAnchor());
+    SwFrameFormat* pShape = FindFrameFormat(pSdrObj);
+    const SwFormatAnchor& rAnchor(pShape->GetAnchor());
     if (rAnchor.GetAnchorId() == FLY_AS_CHAR)
     {
         // This is an inline draw shape, see if it has a textbox.
-        SwFrmFmt* pTextBox = SwTextBoxHelper::findTextBox(pShape);
+        SwFrameFormat* pTextBox = SwTextBoxHelper::findTextBox(pShape);
         if (pTextBox)
         {
             // It has, so look up its text rectangle, and adjust the position
             // of the textbox accordingly.
             Rectangle aTextRectangle = SwTextBoxHelper::getTextRectangle(pShape);
 
-            SwFmtHoriOrient aHori(pTextBox->GetHoriOrient());
+            SwFormatHoriOrient aHori(pTextBox->GetHoriOrient());
             aHori.SetHoriOrient(css::text::HoriOrientation::NONE);
             sal_Int32 nLeft = aTextRectangle.getX() - rFrm.Frm().Left();
             aHori.SetPos(nLeft);
 
-            SwFmtVertOrient aVert(pTextBox->GetVertOrient());
+            SwFormatVertOrient aVert(pTextBox->GetVertOrient());
             aVert.SetVertOrient(css::text::VertOrientation::NONE);
             sal_Int32 nTop = aTextRectangle.getY() - rFrm.Frm().Top() - nFlyAsc;
             aVert.SetPos(nTop);
 
             pTextBox->LockModify();
-            pTextBox->SetFmtAttr(aHori);
-            pTextBox->SetFmtAttr(aVert);
+            pTextBox->SetFormatAttr(aHori);
+            pTextBox->SetFormatAttr(aVert);
             pTextBox->UnlockModify();
         }
     }
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index c4db0a6e0e93..ff31005315dd 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -25,7 +25,7 @@
 
 class SwDrawContact;
 class SwFlyInCntFrm;
-class SwTxtFrm;
+class SwTextFrm;
 struct SwCrsrMoveState;
 
 class SwFlyPortion : public SwFixPortion
@@ -36,8 +36,8 @@ public:
         : SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); }
     inline sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; }
     inline void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; }
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
     OUTPUT_OPERATOR_OVERRIDE
 };
 
@@ -53,12 +53,12 @@ class SwFlyCntPortion : public SwLinePortion
 
 public:
     // Use new datatype for parameter <nFlags>
-    SwFlyCntPortion( const SwTxtFrm& rFrm, SwFlyInCntFrm *pFly,
+    SwFlyCntPortion( const SwTextFrm& rFrm, SwFlyInCntFrm *pFly,
                      const Point &rBase,
                      long nAscent, long nDescent, long nFlyAsc, long nFlyDesc,
                      objectpositioning::AsCharFlags nFlags );
     // Use new datatype for parameter <nFlags>
-    SwFlyCntPortion( const SwTxtFrm& rFrm, SwDrawContact *pDrawContact,
+    SwFlyCntPortion( const SwTextFrm& rFrm, SwDrawContact *pDrawContact,
                      const Point &rBase,
                      long nAscent, long nDescent, long nFlyAsc, long nFlyDesc,
                      objectpositioning::AsCharFlags nFlags );
@@ -75,14 +75,14 @@ public:
     inline void SetAlign( sal_uInt8 nNew ) { nAlign = nNew; }
     inline void SetMax( bool bNew ) { bMax = bNew; }
     // Use new datatype for parameter <nFlags>
-    void SetBase( const SwTxtFrm& rFrm, const Point &rBase,
+    void SetBase( const SwTextFrm& rFrm, const Point &rBase,
                   long nLnAscent, long nLnDescent,
                   long nFlyAscent, long nFlyDescent,
                   objectpositioning::AsCharFlags nFlags );
     sal_Int32 GetFlyCrsrOfst( const sal_uInt16 nOfst, const Point &rPoint,
                         SwPosition *pPos, SwCrsrMoveState* pCMS ) const;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
     OUTPUT_OPERATOR_OVERRIDE
 };
 
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 51d5f755008b..2a532022c386 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -21,58 +21,58 @@
 
 #include "porfld.hxx"
 
-class SwTxtFrm;
-class SwTxtFtn;
+class SwTextFrm;
+class SwTextFootnote;
 
-class SwFtnPortion : public SwFldPortion
+class SwFootnotePortion : public SwFieldPortion
 {
-    SwTxtFtn *pFtn;
+    SwTextFootnote *pFootnote;
     sal_uInt16 nOrigHeight;
     // #i98418#
     bool mbPreferredScriptTypeSet;
     sal_uInt8 mnPreferredScriptType;
 public:
-    SwFtnPortion( const OUString &rExpand, SwTxtFtn *pFtn,
+    SwFootnotePortion( const OUString &rExpand, SwTextFootnote *pFootnote,
                   sal_uInt16 nOrig = USHRT_MAX );
     sal_uInt16& Orig() { return nOrigHeight; }
 
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
-    virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+    virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
 
     // #i98418#
     void SetPreferredScriptType( sal_uInt8 nPreferredScriptType );
 
-    const SwTxtFtn* GetTxtFtn() const { return pFtn; };
+    const SwTextFootnote* GetTextFootnote() const { return pFootnote; };
     OUTPUT_OPERATOR_OVERRIDE
 };
 
-class SwFtnNumPortion : public SwNumberPortion
+class SwFootnoteNumPortion : public SwNumberPortion
 {
 public:
-    SwFtnNumPortion( const OUString &rExpand, SwFont *pFntL )
+    SwFootnoteNumPortion( const OUString &rExpand, SwFont *pFntL )
          : SwNumberPortion( rExpand, pFntL, true, false, 0, false )
          { SetWhichPor( POR_FTNNUM ); }
 
     OUTPUT_OPERATOR_OVERRIDE
 };
 
-class SwQuoVadisPortion : public SwFldPortion
+class SwQuoVadisPortion : public SwFieldPortion
 {
     OUString   aErgo;
 public:
     SwQuoVadisPortion( const OUString &rExp, const OUString& rStr );
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
 
     void SetNumber( const OUString& rStr ) { aErgo = rStr; }
-    const OUString GetQuoTxt() const { return aExpand; }
-    const OUString &GetContTxt() const { return aErgo; }
+    const OUString GetQuoText() const { return aExpand; }
+    const OUString &GetContText() const { return aErgo; }
 
     // Field cloner for SplitGlue
-    virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+    virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
@@ -80,15 +80,15 @@ public:
     OUTPUT_OPERATOR_OVERRIDE
 };
 
-class SwErgoSumPortion : public SwFldPortion
+class SwErgoSumPortion : public SwFieldPortion
 {
 public:
     SwErgoSumPortion( const OUString &rExp, const OUString& rStr );
     virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
 
     // Field cloner for SplitGlue
-    virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+    virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
     OUTPUT_OPERATOR_OVERRIDE
 };
 
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index bcad1ebb2a59..18b09bae87c7 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -42,7 +42,7 @@ sal_Int32 SwGluePortion::GetCrsrOfst( const sal_uInt16 nOfst ) const
         return nOfst / (Width() / GetLen());
 }
 
-SwPosSize SwGluePortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
+SwPosSize SwGluePortion::GetTextSize( const SwTextSizeInfo &rInf ) const
 {
     if( 1 >= GetLen() || rInf.GetLen() > GetLen() || !Width() || !GetLen() )
         return SwPosSize(*this);
@@ -50,20 +50,20 @@ SwPosSize SwGluePortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
         return SwPosSize( (Width() / GetLen()) * rInf.GetLen(), Height() );
 }
 
-bool SwGluePortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwGluePortion::GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const
 {
     if( GetLen() && rInf.OnWin() &&
         rInf.GetOpt().IsBlank() && rInf.IsNoSymbol() )
     {
         OUStringBuffer aBuf;
         comphelper::string::padToLength(aBuf, GetLen(), CH_BULLET);
-        rTxt = aBuf.makeStringAndClear();
+        rText = aBuf.makeStringAndClear();
         return true;
     }
     return false;
 }
 
-void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwGluePortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( !GetLen() )
         return;
@@ -72,9 +72,9 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
     {
         OUStringBuffer aBuf;
         comphelper::string::padToLength(aBuf, GetFixWidth() / GetLen(), ' ');
-        OUString aTxt(aBuf.makeStringAndClear());
-        SwTxtPaintInfo aInf( rInf, &aTxt );
-        aInf.DrawText( *this, aTxt.getLength(), true );
+        OUString aText(aBuf.makeStringAndClear());
+        SwTextPaintInfo aInf( rInf, &aText );
+        aInf.DrawText( *this, aText.getLength(), true );
     }
 
     if( rInf.OnWin() && rInf.GetOpt().IsBlank() && rInf.IsNoSymbol() )
@@ -87,12 +87,12 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
         if( 1 == GetLen() )
         {
             OUString aBullet( CH_BULLET );
-            SwPosSize aBulletSize( rInf.GetTxtSize( aBullet ) );
+            SwPosSize aBulletSize( rInf.GetTextSize( aBullet ) );
             Point aPos( rInf.GetPos() );
             aPos.X() += (Width()/2) - (aBulletSize.Width()/2);
-            SwTxtPaintInfo aInf( rInf, &aBullet );
+            SwTextPaintInfo aInf( rInf, &aBullet );
             aInf.SetPos( aPos );
-            SwTxtPortion aBulletPor;
+            SwTextPortion aBulletPor;
             aBulletPor.Width( aBulletSize.Width() );
             aBulletPor.Height( aBulletSize.Height() );
             aBulletPor.SetAscent( GetAscent() );
@@ -100,7 +100,7 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
         }
         else
         {
-            SwTxtSlot aSlot( &rInf, this, true, false );
+            SwTextSlot aSlot( &rInf, this, true, false );
             rInf.DrawText( *this, rInf.GetLen(), true );
         }
     }
@@ -200,12 +200,12 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr )
                 SwFlyPortion *pFly = static_cast<SwFlyPortion *>(pRight);
                 if ( pFly->GetBlankWidth() < nRightGlue )
                 {
-                    // Creating new TxtPortion, that takes over the
+                    // Creating new TextPortion, that takes over the
                     // Blank previously swallowed by the Fly.
                     nRightGlue = nRightGlue - pFly->GetBlankWidth();
                     pFly->SubPrtWidth( pFly->GetBlankWidth() );
                     pFly->SetLen( 0 );
-                    SwTxtPortion *pNewPor = new SwTxtPortion;
+                    SwTextPortion *pNewPor = new SwTextPortion;
                     pNewPor->SetLen( 1 );
                     pNewPor->Height( pFly->Height() );
                     pNewPor->Width( pFly->GetBlankWidth() );
@@ -235,7 +235,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr )
                     pPrevPrev->SetPortion( pRight );
                     pPrev->SetPortion( pRight->GetPortion() );
                     pRight->SetPortion( pPrev );
-                    if ( pPrev->GetPortion() && pPrev->InTxtGrp()
+                    if ( pPrev->GetPortion() && pPrev->InTextGrp()
                          && pPrev->GetPortion()->IsHolePortion() )
                     {
                         SwHolePortion *pHolePor =
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index e3cbb134911e..058d95137cc2 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -40,10 +40,10 @@ public:
     inline void MoveAllGlue( SwGluePortion *pTarget );
     inline void MoveHalfGlue( SwGluePortion *pTarget );
     inline void AdjFixWidth();
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
     virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
-    virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+    virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
 
     OUTPUT_OPERATOR_OVERRIDE
 };
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 996e4ec863a2..5d4edb75c6f2 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -28,8 +28,8 @@ public:
     {
         SetWhichPor( POR_HYPH );
     }
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
@@ -47,7 +47,7 @@ public:
         SetWhichPor( POR_HYPHSTR );
     }
 
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
@@ -63,15 +63,15 @@ class SwSoftHyphPortion : public SwHyphPortion
 
 public:
     SwSoftHyphPortion();
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
     virtual SwLinePortion *Compress() SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
     inline void SetExpand( const bool bNew ) { bExpand = bNew; }
     bool IsExpand() const { return bExpand; }
 
-    virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
@@ -83,7 +83,7 @@ class SwSoftHyphStrPortion : public SwHyphStrPortion
 {
 public:
     SwSoftHyphStrPortion( const OUString &rStr );
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
     OUTPUT_OPERATOR_OVERRIDE
 };
 
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 72845e871ae0..4e41c32cde8e 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -104,11 +104,11 @@ static bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh )
     return bRet;
 }
 
-static  bool lcl_HasStrongLTR ( const OUString& rTxt, sal_Int32 nStart, sal_Int32 nEnd )
+static  bool lcl_HasStrongLTR ( const OUString& rText, sal_Int32 nStart, sal_Int32 nEnd )
  {
      for( sal_Int32 nCharIdx = nStart; nCharIdx < nEnd; ++nCharIdx )
      {
-         const UCharDirection nCharDir = u_charDirection ( rTxt[ nCharIdx ] );
+         const UCharDirection nCharDir = u_charDirection ( rText[ nCharIdx ] );
          if ( nCharDir == U_LEFT_TO_RIGHT ||
               nCharDir == U_LEFT_TO_RIGHT_EMBEDDING ||
               nCharDir == U_LEFT_TO_RIGHT_OVERRIDE )
@@ -139,7 +139,7 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
     {
         if( GetLen() )
         {
-            pPortion = SwTxtPortion::CopyLinePortion(*this);
+            pPortion = SwTextPortion::CopyLinePortion(*this);
             if( IsBlinking() && pBlink )
             {
                 SetBlinking( false );
@@ -161,19 +161,19 @@ SwLinePortion *SwLineLayout::Append( SwLinePortion *pIns )
     // First attribute change: copy mass and length from *pIns into the first
     // text portion
     if( !pPortion )
-        pPortion = SwTxtPortion::CopyLinePortion(*this);
+        pPortion = SwTextPortion::CopyLinePortion(*this);
     // Call with scope or we'll end up with recursion!
     return pPortion->SwLinePortion::Append( pIns );
 }
 
 // For special treatment of empty lines
 
-bool SwLineLayout::Format( SwTxtFormatInfo &rInf )
+bool SwLineLayout::Format( SwTextFormatInfo &rInf )
 {
     if( GetLen() )
-        return SwTxtPortion::Format( rInf );
+        return SwTextPortion::Format( rInf );
 
-    Height( rInf.GetTxtHeight() );
+    Height( rInf.GetTextHeight() );
     return true;
 }
 
@@ -184,7 +184,7 @@ SwMarginPortion *SwLineLayout::CalcLeftMargin()
     SwMarginPortion *pLeft = (GetPortion() && GetPortion()->IsMarginPortion()) ?
         static_cast<SwMarginPortion *>(GetPortion()) : 0;
     if( !GetPortion() )
-         SetPortion(SwTxtPortion::CopyLinePortion(*this));
+         SetPortion(SwTextPortion::CopyLinePortion(*this));
     if( !pLeft )
     {
         pLeft = new SwMarginPortion( 0 );
@@ -233,12 +233,12 @@ void SwLineLayout::CreateSpaceAdd( const long nInit )
 }
 
 // Returns true if there are only blanks in [nStt, nEnd[
-static bool lcl_HasOnlyBlanks( const OUString& rTxt, sal_Int32 nStt, sal_Int32 nEnd )
+static bool lcl_HasOnlyBlanks( const OUString& rText, sal_Int32 nStt, sal_Int32 nEnd )
 {
     bool bBlankOnly = true;
     while ( nStt < nEnd )
     {
-        const sal_Unicode cChar = rTxt[ nStt++ ];
+        const sal_Unicode cChar = rText[ nStt++ ];
         if ( ' ' != cChar && 0x3000 != cChar )
         {
             bBlankOnly = false;
@@ -249,7 +249,7 @@ static bool lcl_HasOnlyBlanks( const OUString& rTxt, sal_Int32 nStt, sal_Int32 n
 }
 
 // Swapped out from FormatLine()
-void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
+void SwLineLayout::CalcLine( SwTextFormatter &rLine, SwTextFormatInfo &rInf )
 {
     const sal_uInt16 nLineWidth = rInf.RealWidth();
 
@@ -270,14 +270,14 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
 
     // #i3952#
     const bool bIgnoreBlanksAndTabsForLineHeightCalculation =
-            rInf.GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION);
+            rInf.GetTextFrm()->GetNode()->getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION);
 
     bool bHasBlankPortion = false;
     bool bHasOnlyBlankPortions = true;
 
     if( pPortion )
     {
-        SetCntnt( false );
+        SetContent( false );
         if( pPortion->IsBreakPortion() )
         {
             SetLen( pPortion->GetLen() );
@@ -326,7 +326,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
                 {
                     if ( pPos->InTabGrp() || pPos->IsHolePortion() ||
                             ( pPos->IsTextPortion() &&
-                              lcl_HasOnlyBlanks( rInf.GetTxt(), nPorSttIdx, nPorSttIdx + pPos->GetLen() ) ) )
+                              lcl_HasOnlyBlanks( rInf.GetText(), nPorSttIdx, nPorSttIdx + pPos->GetLen() ) ) )
                     {
                         pLast = pPos;
                         pPos = pPos->GetPortion();
@@ -411,7 +411,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
                                 Height(nPosHeight);
                         }
                         if( pPos->IsFlyCntPortion() || ( pPos->IsMultiPortion()
-                            && static_cast<SwMultiPortion*>(pPos)->HasFlyInCntnt() ) )
+                            && static_cast<SwMultiPortion*>(pPos)->HasFlyInContent() ) )
                             rLine.SetFlyInCntBase();
                         if( pPos->IsFlyCntPortion() &&
                             static_cast<SwFlyCntPortion*>(pPos)->GetAlign() )
@@ -432,20 +432,20 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
                 else if( pPos->GetLen() )
                     bTmpDummy = false;
 
-                if( !HasCntnt() && !pPos->InNumberGrp() )
+                if( !HasContent() && !pPos->InNumberGrp() )
                 {
                     if ( pPos->InExpGrp() )
                     {
-                        OUString aTxt;
-                        if( pPos->GetExpTxt( rInf, aTxt ) && !aTxt.isEmpty() )
-                            SetCntnt();
+                        OUString aText;
+                        if( pPos->GetExpText( rInf, aText ) && !aText.isEmpty() )
+                            SetContent();
                     }
-                    else if( ( pPos->InTxtGrp() || pPos->IsMultiPortion() ) &&
+                    else if( ( pPos->InTextGrp() || pPos->IsMultiPortion() ) &&
                              pPos->GetLen() )
-                        SetCntnt();
+                        SetContent();
                 }
 
-                bTmpDummy &= !HasCntnt() && ( !pPos->Width() || pPos->IsFlyPortion() );
+                bTmpDummy &= !HasContent() && ( !pPos->Width() || pPos->IsFlyPortion() );
 
                 pLast = pPos;
                 pPos = pPos->GetPortion();
@@ -487,11 +487,11 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
     }
     else
     {
-        SetCntnt( !bTmpDummy );
+        SetContent( !bTmpDummy );
 
         // #i3952#
         if ( bIgnoreBlanksAndTabsForLineHeightCalculation &&
-             lcl_HasOnlyBlanks( rInf.GetTxt(), rInf.GetLineStart(), rInf.GetLineStart() + GetLen() ) )
+             lcl_HasOnlyBlanks( rInf.GetText(), rInf.GetLineStart(), rInf.GetLineStart() + GetLen() ) )
         {
             bHasBlankPortion = true;
         }
@@ -599,12 +599,12 @@ SwScriptInfo::~SwScriptInfo()
 
 // Converts i18n Script Type (LATIN, ASIAN, COMPLEX, WEAK) to
 // Sw Script Types (SW_LATIN, SW_CJK, SW_CTL), used to identify the font
-sal_uInt8 SwScriptInfo::WhichFont( sal_Int32 nIdx, const OUString* pTxt, const SwScriptInfo* pSI )
+sal_uInt8 SwScriptInfo::WhichFont( sal_Int32 nIdx, const OUString* pText, const SwScriptInfo* pSI )
 {
-    assert((pSI || pTxt) && "How should I determine the script type?");
+    assert((pSI || pText) && "How should I determine the script type?");
     const sal_uInt16 nScript = pSI
         ? pSI->ScriptType( nIdx )                         // use our SwScriptInfo if available
-        : g_pBreakIt->GetRealScriptOfText( *pTxt, nIdx ); // else  ask the break iterator
+        : g_pBreakIt->GetRealScriptOfText( *pText, nIdx ); // else  ask the break iterator
 
     switch ( nScript ) {
         case i18n::ScriptType::LATIN : return SW_LATIN;
@@ -616,22 +616,22 @@ sal_uInt8 SwScriptInfo::WhichFont( sal_Int32 nIdx, const OUString* pTxt, const S
     return SW_LATIN;
 }
 
-// searches for script changes in rTxt and stores them
-void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode )
+// searches for script changes in rText and stores them
+void SwScriptInfo::InitScriptInfo( const SwTextNode& rNode )
 {
     InitScriptInfo( rNode, nDefaultDir == UBIDI_RTL );
 }
 
-void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
+void SwScriptInfo::InitScriptInfo( const SwTextNode& rNode, bool bRTL )
 {
     if( !g_pBreakIt->GetBreakIter().is() )
         return;
 
-    const OUString& rTxt = rNode.GetTxt();
+    const OUString& rText = rNode.GetText();
 
     // HIDDEN TEXT INFORMATION
 
-    Range aRange( 0, !rTxt.isEmpty() ? rTxt.getLength() - 1 : 0 );
+    Range aRange( 0, !rText.isEmpty() ? rText.getLength() - 1 : 0 );
     MultiSelection aHiddenMulti( aRange );
     CalcHiddenRanges( rNode, aHiddenMulti );
 
@@ -722,13 +722,13 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
     // we go back in our group until we reach the first character of
     // type nScript
     while ( nChg > nGrpStart &&
-            nScript != g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nChg ) )
+            nScript != g_pBreakIt->GetBreakIter()->getScriptType( rText, nChg ) )
         --nChg;
 
     // If we are at the start of a group, we do not trust nScript,
     // we better get nScript from the breakiterator:
     if ( nChg == nGrpStart )
-        nScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nChg );
+        nScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rText, nChg );
 
     // INVALID DATA FROM THE SCRIPT INFO ARRAYS HAS TO BE DELETED:
 
@@ -765,17 +765,17 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
     // TAKE CARE OF WEAK CHARACTERS: WE MUST FIND AN APPROPRIATE
     // SCRIPT FOR WEAK CHARACTERS AT THE BEGINNING OF A PARAGRAPH
 
-    if( WEAK == g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nChg ) )
+    if( WEAK == g_pBreakIt->GetBreakIter()->getScriptType( rText, nChg ) )
     {
         // If the beginning of the current group is weak, this means that
         // all of the characters in this grounp are weak. We have to assign
         // the scripts to these characters depending on the fonts which are
         // set for these characters to display them.
         sal_Int32 nEnd =
-                g_pBreakIt->GetBreakIter()->endOfScript( rTxt, nChg, WEAK );
+                g_pBreakIt->GetBreakIter()->endOfScript( rText, nChg, WEAK );
 
-        if (nEnd > rTxt.getLength() || nEnd < 0)
-            nEnd = rTxt.getLength();
+        if (nEnd > rText.getLength() || nEnd < 0)
+            nEnd = rText.getLength();
 
         nScript = SvtLanguageOptions::GetI18NScriptTypeOfLanguage( GetAppLanguage() );
 
@@ -786,8 +786,8 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
         nChg = nEnd;
 
         // Get next script type or set to weak in order to exit
-        sal_uInt8 nNextScript = ( nEnd < rTxt.getLength() ) ?
-           (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nEnd ) :
+        sal_uInt8 nNextScript = ( nEnd < rText.getLength() ) ?
+           (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rText, nEnd ) :
            (sal_uInt8)WEAK;
 
         if ( nScript != nNextScript )
@@ -800,41 +800,41 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
 
     // UPDATE THE SCRIPT INFO ARRAYS:
 
-    while ( nChg < rTxt.getLength() || ( aScriptChanges.empty() && rTxt.isEmpty() ) )
+    while ( nChg < rText.getLength() || ( aScriptChanges.empty() && rText.isEmpty() ) )
     {
         SAL_WARN_IF( i18n::ScriptType::WEAK == nScript,
                 "sw.core", "Inserting WEAK into SwScriptInfo structure" );
 
         sal_Int32 nSearchStt = nChg;
-        nChg = g_pBreakIt->GetBreakIter()->endOfScript( rTxt, nSearchStt, nScript );
+        nChg = g_pBreakIt->GetBreakIter()->endOfScript( rText, nSearchStt, nScript );
 
-        if (nChg > rTxt.getLength() || nChg < 0)
-            nChg = rTxt.getLength();
+        if (nChg > rText.getLength() || nChg < 0)
+            nChg = rText.getLength();
 
         // #i28203#
         // for 'complex' portions, we make sure that a portion does not contain more
         // than one script:
         if( i18n::ScriptType::COMPLEX == nScript )
         {
-            const short nScriptType = ScriptTypeDetector::getCTLScriptType( rTxt, nSearchStt );
+            const short nScriptType = ScriptTypeDetector::getCTLScriptType( rText, nSearchStt );
             sal_Int32 nNextCTLScriptStart = nSearchStt;
             short nCurrentScriptType = nScriptType;
             while( com::sun::star::i18n::CTLScriptType::CTL_UNKNOWN == nCurrentScriptType || nScriptType == nCurrentScriptType )
             {
-                nNextCTLScriptStart = ScriptTypeDetector::endOfCTLScriptType( rTxt, nNextCTLScriptStart );
-                if( nNextCTLScriptStart >= rTxt.getLength() || nNextCTLScriptStart >= nChg )
+                nNextCTLScriptStart = ScriptTypeDetector::endOfCTLScriptType( rText, nNextCTLScriptStart );
+                if( nNextCTLScriptStart >= rText.getLength() || nNextCTLScriptStart >= nChg )
                     break;
-                nCurrentScriptType = ScriptTypeDetector::getCTLScriptType( rTxt, nNextCTLScriptStart );
+                nCurrentScriptType = ScriptTypeDetector::getCTLScriptType( rText, nNextCTLScriptStart );
             }
             nChg = std::min( nChg, nNextCTLScriptStart );
         }
 
         // special case for dotted circle since it can be used with complex
         // before a mark, so we want it associated with the mark's script
-        if (nChg < rTxt.getLength() && nChg > 0 && (i18n::ScriptType::WEAK ==
-            g_pBreakIt->GetBreakIter()->getScriptType(rTxt,nChg - 1)))
+        if (nChg < rText.getLength() && nChg > 0 && (i18n::ScriptType::WEAK ==
+            g_pBreakIt->GetBreakIter()->getScriptType(rText,nChg - 1)))
         {
-            int8_t nType = u_charType(rTxt[nChg] );
+            int8_t nType = u_charType(rText[nChg] );
             if (nType == U_NON_SPACING_MARK || nType == U_ENCLOSING_MARK ||
                 nType == U_COMBINING_SPACING_MARK )
             {
@@ -862,7 +862,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
 
             while ( nLastCompression < nChg )
             {
-                sal_Unicode cChar = rTxt[ nLastCompression ];
+                sal_Unicode cChar = rText[ nLastCompression ];
 
                 // examine current character
                 switch ( cChar )
@@ -919,7 +919,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
         // we search for connecting opportunities (kashida)
         else if ( bAdjustBlock && i18n::ScriptType::COMPLEX == nScript )
         {
-            SwScanner aScanner( rNode, rNode.GetTxt(), 0, ModelToViewHelper(),
+            SwScanner aScanner( rNode, rNode.GetText(), 0, ModelToViewHelper(),
                                 i18n::WordType::DICTIONARY_WORD,
                                 nLastKashida, nChg );
 
@@ -1084,8 +1084,8 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
             } // end of kashida search
         }
 
-        if ( nChg < rTxt.getLength() )
-            nScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nChg );
+        if ( nChg < rText.getLength() )
+            nScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rText, nChg );
 
         nLastCompression = nChg;
         nLastKashida = nChg;
@@ -1123,7 +1123,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
     // do not call the unicode bidi algorithm if not required
     if ( bPerformUBA )
     {
-        UpdateBidiInfo( rTxt );
+        UpdateBidiInfo( rText );
 
         // #i16354# Change script type for RTL text to CTL:
         // 1. All text in RTL runs will use the CTL font
@@ -1138,7 +1138,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
                 const sal_Int32 nEnd = GetDirChg( nDirIdx );
 
             if ( nCurrDirType % 2 == UBIDI_RTL  || // text in RTL run
-                ( nCurrDirType > UBIDI_LTR && !lcl_HasStrongLTR( rTxt, nStart, nEnd ) ) ) // non-strong text in embedded LTR run
+                ( nCurrDirType > UBIDI_LTR && !lcl_HasStrongLTR( rText, nStart, nEnd ) ) ) // non-strong text in embedded LTR run
             {
                 // nScriptIdx points into the ScriptArrays:
                 size_t nScriptIdx = 0;
@@ -1195,7 +1195,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
     }
 }
 
-void SwScriptInfo::UpdateBidiInfo( const OUString& rTxt )
+void SwScriptInfo::UpdateBidiInfo( const OUString& rText )
 {
     // remove invalid entries from direction information arrays
     aDirectionChanges.clear();
@@ -1203,10 +1203,10 @@ void SwScriptInfo::UpdateBidiInfo( const OUString& rTxt )
     // Bidi functions from icu 2.0
 
     UErrorCode nError = U_ZERO_ERROR;
-    UBiDi* pBidi = ubidi_openSized( rTxt.getLength(), 0, &nError );
+    UBiDi* pBidi = ubidi_openSized( rText.getLength(), 0, &nError );
     nError = U_ZERO_ERROR;
 
-    ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(rTxt.getStr()), rTxt.getLength(),    // UChar != sal_Unicode in MinGW
+    ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(rText.getStr()), rText.getLength(),    // UChar != sal_Unicode in MinGW
                    nDefaultDir, NULL, &nError );
     nError = U_ZERO_ERROR;
     int nCount = ubidi_countRuns( pBidi, &nError );
@@ -1284,11 +1284,11 @@ sal_uInt8 SwScriptInfo::DirType(const sal_Int32 nPos) const
 }
 
 // Takes a string and replaced the hidden ranges with cChar.
-sal_Int32 SwScriptInfo::MaskHiddenRanges( const SwTxtNode& rNode, OUStringBuffer & rText,
+sal_Int32 SwScriptInfo::MaskHiddenRanges( const SwTextNode& rNode, OUStringBuffer & rText,
                                        const sal_Int32 nStt, const sal_Int32 nEnd,
                                        const sal_Unicode cChar )
 {
-    assert(rNode.GetTxt().getLength() == rText.getLength());
+    assert(rNode.GetText().getLength() == rText.getLength());
 
     PositionList aList;
     sal_Int32 nHiddenStart;
@@ -1319,8 +1319,8 @@ sal_Int32 SwScriptInfo::MaskHiddenRanges( const SwTxtNode& rNode, OUStringBuffer
     return nNumOfHiddenChars;
 }
 
-// Takes a SwTxtNode and deletes the hidden ranges from the node.
-void SwScriptInfo::DeleteHiddenRanges( SwTxtNode& rNode )
+// Takes a SwTextNode and deletes the hidden ranges from the node.
+void SwScriptInfo::DeleteHiddenRanges( SwTextNode& rNode )
 {
     PositionList aList;
     sal_Int32 nHiddenStart;
@@ -1338,7 +1338,7 @@ void SwScriptInfo::DeleteHiddenRanges( SwTxtNode& rNode )
     }
 }
 
-bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPos,
+bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTextNode& rNode, sal_Int32 nPos,
                                            sal_Int32& rnStartPos, sal_Int32& rnEndPos,
                                            PositionList* pList )
 {
@@ -1361,11 +1361,11 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo
             if ( pList )
             {
                 pList->push_back( 0 );
-                pList->push_back(rNode.GetTxt().getLength());
+                pList->push_back(rNode.GetText().getLength());
             }
 
             rnStartPos = 0;
-            rnEndPos = rNode.GetTxt().getLength();
+            rnEndPos = rNode.GetText().getLength();
             return true;
         }
     }
@@ -1378,7 +1378,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo
 
         bNewContainsHiddenChars = pSI->GetBoundsOfHiddenRange( nPos, rnStartPos, rnEndPos, pList );
         const bool bNewHiddenCharsHidePara =
-            rnStartPos == 0 && rnEndPos >= rNode.GetTxt().getLength();
+            rnStartPos == 0 && rnEndPos >= rNode.GetText().getLength();
         rNode.SetHiddenCharAttribute( bNewHiddenCharsHidePara, bNewContainsHiddenChars );
     }
     else
@@ -1386,8 +1386,8 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo
 
         // No valid SwScriptInfo Object, we have to do it the hard way:
 
-        Range aRange(0, (!rNode.GetTxt().isEmpty())
-                            ? rNode.GetTxt().getLength() - 1
+        Range aRange(0, (!rNode.GetText().isEmpty())
+                            ? rNode.GetText().getLength() - 1
                             : 0);
         MultiSelection aHiddenMulti( aRange );
         SwScriptInfo::CalcHiddenRanges( rNode, aHiddenMulti );
@@ -1403,7 +1403,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo
             {
                 rnStartPos = nHiddenStart;
                 rnEndPos   = std::min<sal_Int32>(nHiddenEnd,
-                                                 rNode.GetTxt().getLength());
+                                                 rNode.GetText().getLength());
                 break;
             }
         }
@@ -1458,7 +1458,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( sal_Int32 nPos, sal_Int32& rnStartPos
     return CountHiddenChg() > 0;
 }
 
-bool SwScriptInfo::IsInHiddenRange( const SwTxtNode& rNode, sal_Int32 nPos )
+bool SwScriptInfo::IsInHiddenRange( const SwTextNode& rNode, sal_Int32 nPos )
 {
     sal_Int32 nStartPos;
     sal_Int32 nEndPos;
@@ -1704,8 +1704,8 @@ sal_Int32 SwScriptInfo::KashidaJustify( long* pKernArray,
 
 // Checks if the current text is 'Arabic' text. Note that only the first
 // character has to be checked because a ctl portion only contains one
-// script, see NewTxtPortion
-bool SwScriptInfo::IsArabicText( const OUString& rTxt, sal_Int32 nStt, sal_Int32 nLen )
+// script, see NewTextPortion
+bool SwScriptInfo::IsArabicText( const OUString& rText, sal_Int32 nStt, sal_Int32 nLen )
 {
     using namespace ::com::sun::star::i18n;
     static const ScriptTypeList typeList[] = {
@@ -1717,7 +1717,7 @@ bool SwScriptInfo::IsArabicText( const OUString& rTxt, sal_Int32 nStt, sal_Int32
     const CharClass& rCC = GetAppCharClass();
     sal_Int32 nIdx = nStt;
     const sal_Int32 nEnd = nStt + nLen;
-    while ( nIdx < nEnd && !rCC.isLetterNumeric( rTxt, nIdx ) )
+    while ( nIdx < nEnd && !rCC.isLetterNumeric( rText, nIdx ) )
     {
         ++nIdx;
     }
@@ -1726,7 +1726,7 @@ bool SwScriptInfo::IsArabicText( const OUString& rTxt, sal_Int32 nStt, sal_Int32
     {
         // no regular character found in this portion. Go backward:
         --nIdx;
-        while ( nIdx >= 0 && !rCC.isLetterNumeric( rTxt, nIdx ) )
+        while ( nIdx >= 0 && !rCC.isLetterNumeric( rText, nIdx ) )
         {
             --nIdx;
         }
@@ -1734,7 +1734,7 @@ bool SwScriptInfo::IsArabicText( const OUString& rTxt, sal_Int32 nStt, sal_Int32
 
     if( nIdx >= 0 )
     {
-        const sal_Unicode cCh = rTxt[nIdx];
+        const sal_Unicode cCh = rText[nIdx];
         const sal_Int16 type = unicode::getUnicodeScriptType( cCh, typeList, UnicodeScript_kScriptCount );
         return type == UnicodeScript_kArabic;
     }
@@ -1890,12 +1890,12 @@ bool SwScriptInfo::MarkKashidasInvalid(sal_Int32 nCnt, sal_Int32* pKashidaPositi
     return true;
 }
 
-sal_Int32 SwScriptInfo::ThaiJustify( const OUString& rTxt, long* pKernArray,
+sal_Int32 SwScriptInfo::ThaiJustify( const OUString& rText, long* pKernArray,
                                      long* pScrArray, sal_Int32 nStt,
                                      sal_Int32 nLen, sal_Int32 nNumberOfBlanks,
                                      long nSpaceAdd )
 {
-    SAL_WARN_IF( nStt + nLen > rTxt.getLength(), "sw.core", "String in ThaiJustify too small" );
+    SAL_WARN_IF( nStt + nLen > rText.getLength(), "sw.core", "String in ThaiJustify too small" );
 
     SwTwips nNumOfTwipsToDistribute = nSpaceAdd * nNumberOfBlanks /
                                       SPACING_PRECISION_FACTOR;
@@ -1905,7 +1905,7 @@ sal_Int32 SwScriptInfo::ThaiJustify( const OUString& rTxt, long* pKernArray,
 
     for (sal_Int32 nI = 0; nI < nLen; ++nI)
     {
-        const sal_Unicode cCh = rTxt[nStt + nI];
+        const sal_Unicode cCh = rText[nStt + nI];
 
         // check if character is not above or below base
         if ( ( 0xE34 > cCh || cCh > 0xE3A ) &&
@@ -1928,13 +1928,13 @@ sal_Int32 SwScriptInfo::ThaiJustify( const OUString& rTxt, long* pKernArray,
     return nCnt;
 }
 
-SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTxtNode& rTNd,
+SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTextNode& rTNd,
                                            bool bAllowInvalid )
 {
-    SwIterator<SwTxtFrm,SwTxtNode> aIter( rTNd );
+    SwIterator<SwTextFrm,SwTextNode> aIter( rTNd );
     SwScriptInfo* pScriptInfo = 0;
 
-    for( SwTxtFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
+    for( SwTextFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
     {
         pScriptInfo = const_cast<SwScriptInfo*>(pLast->GetScriptInfo());
         if ( pScriptInfo )
@@ -1958,7 +1958,7 @@ SwParaPortion::SwParaPortion()
     , bFlag16(false)
 {
     FormatReset();
-    bFlys = bFtnNum = bMargin = false;
+    bFlys = bFootnoteNum = bMargin = false;
     SetWhichPor( POR_PARA );
 }
 
@@ -2032,7 +2032,7 @@ SwTwips SwLineLayout::_GetHangingMargin() const
     return nDiff;
 }
 
-SwTwips SwTxtFrm::HangingMargin() const
+SwTwips SwTextFrm::HangingMargin() const
 {
     SAL_WARN_IF( !HasPara(), "sw.core", "Don't call me without a paraportion" );
     if( !GetPara()->IsMargin() )
@@ -2051,10 +2051,10 @@ SwTwips SwTxtFrm::HangingMargin() const
     return nRet;
 }
 
-void SwScriptInfo::selectHiddenTextProperty(const SwTxtNode& rNode, MultiSelection &rHiddenMulti)
+void SwScriptInfo::selectHiddenTextProperty(const SwTextNode& rNode, MultiSelection &rHiddenMulti)
 {
-    assert((rNode.GetTxt().isEmpty() && rHiddenMulti.GetTotalRange().Len() == 1)
-        || (rNode.GetTxt().getLength() == rHiddenMulti.GetTotalRange().Len()));
+    assert((rNode.GetText().isEmpty() && rHiddenMulti.GetTotalRange().Len() == 1)
+        || (rNode.GetText().getLength() == rHiddenMulti.GetTotalRange().Len()));
 
     const SfxPoolItem* pItem = 0;
     if( SfxItemState::SET == rNode.GetSwAttrSet().GetItemState( RES_CHRATR_HIDDEN, true, &pItem ) &&
@@ -2069,13 +2069,13 @@ void SwScriptInfo::selectHiddenTextProperty(const SwTxtNode& rNode, MultiSelecti
     {
         for( size_t nTmp = 0; nTmp < pHints->GetStartCount(); ++nTmp )
         {
-            const SwTxtAttr* pTxtAttr = pHints->GetStart( nTmp );
+            const SwTextAttr* pTextAttr = pHints->GetStart( nTmp );
             const SvxCharHiddenItem* pHiddenItem =
-                static_cast<const SvxCharHiddenItem*>( CharFmt::GetItem( *pTxtAttr, RES_CHRATR_HIDDEN ) );
+                static_cast<const SvxCharHiddenItem*>( CharFormat::GetItem( *pTextAttr, RES_CHRATR_HIDDEN ) );
             if( pHiddenItem )
             {
-                const sal_Int32 nSt = pTxtAttr->GetStart();
-                const sal_Int32 nEnd = *pTxtAttr->End();
+                const sal_Int32 nSt = pTextAttr->GetStart();
+                const sal_Int32 nEnd = *pTextAttr->End();
                 if( nEnd > nSt )
                 {
                     Range aTmp( nSt, nEnd - 1 );
@@ -2086,19 +2086,19 @@ void SwScriptInfo::selectHiddenTextProperty(const SwTxtNode& rNode, MultiSelecti
     }
 }
 
-void SwScriptInfo::selectRedLineDeleted(const SwTxtNode& rNode, MultiSelection &rHiddenMulti, bool bSelect)
+void SwScriptInfo::selectRedLineDeleted(const SwTextNode& rNode, MultiSelection &rHiddenMulti, bool bSelect)
 {
-    assert((rNode.GetTxt().isEmpty() && rHiddenMulti.GetTotalRange().Len() == 1)
-        || (rNode.GetTxt().getLength() == rHiddenMulti.GetTotalRange().Len()));
+    assert((rNode.GetText().isEmpty() && rHiddenMulti.GetTotalRange().Len() == 1)
+        || (rNode.GetText().getLength() == rHiddenMulti.GetTotalRange().Len()));
 
     const IDocumentRedlineAccess& rIDRA = *rNode.getIDocumentRedlineAccess();
     if ( IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineMode() ) )
     {
         sal_uInt16 nAct = rIDRA.GetRedlinePos( rNode, USHRT_MAX );
 
-        for ( ; nAct < rIDRA.GetRedlineTbl().size(); nAct++ )
+        for ( ; nAct < rIDRA.GetRedlineTable().size(); nAct++ )
         {
-            const SwRangeRedline* pRed = rIDRA.GetRedlineTbl()[ nAct ];
+            const SwRangeRedline* pRed = rIDRA.GetRedlineTable()[ nAct ];
 
             if (pRed->Start()->nNode > rNode.GetIndex())
                 break;
@@ -2110,7 +2110,7 @@ void SwScriptInfo::selectRedLineDeleted(const SwTxtNode& rNode, MultiSelection &
             sal_Int32 nRedlnEnd;
             pRed->CalcStartEnd( rNode.GetIndex(), nRedlStart, nRedlnEnd );
             //clip it if the redline extends past the end of the nodes text
-            nRedlnEnd = std::min<sal_Int32>(nRedlnEnd, rNode.GetTxt().getLength());
+            nRedlnEnd = std::min<sal_Int32>(nRedlnEnd, rNode.GetText().getLength());
             if ( nRedlnEnd > nRedlStart )
             {
                 Range aTmp( nRedlStart, nRedlnEnd - 1 );
@@ -2121,7 +2121,7 @@ void SwScriptInfo::selectRedLineDeleted(const SwTxtNode& rNode, MultiSelection &
 }
 
 // Returns a MultiSection indicating the hidden ranges.
-void SwScriptInfo::CalcHiddenRanges( const SwTxtNode& rNode, MultiSelection& rHiddenMulti )
+void SwScriptInfo::CalcHiddenRanges( const SwTextNode& rNode, MultiSelection& rHiddenMulti )
 {
     selectHiddenTextProperty(rNode, rHiddenMulti);
 
@@ -2139,7 +2139,7 @@ void SwScriptInfo::CalcHiddenRanges( const SwTxtNode& rNode, MultiSelection& rHi
         const sal_Int32 nHiddenStart = rRange.Min();
         const sal_Int32 nHiddenEnd = rRange.Max() + 1;
         bNewHiddenCharsHidePara =
-            (nHiddenStart == 0 && nHiddenEnd >= rNode.GetTxt().getLength());
+            (nHiddenStart == 0 && nHiddenEnd >= rNode.GetText().getLength());
     }
     rNode.SetHiddenCharAttribute( bNewHiddenCharsHidePara, bNewContainsHiddenChars );
 }
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index a19be482353c..e42aa5c8031c 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -32,7 +32,7 @@
 class SwMarginPortion;
 class SwDropPortion;
 class SvStream;
-class SwTxtFormatter;
+class SwTextFormatter;
 
 class SwCharRange
 {
@@ -76,7 +76,7 @@ public:
 };
 
 /// Collection of SwLinePortion instances, representing one line of text
-class SwLineLayout : public SwTxtPortion
+class SwLineLayout : public SwTextPortion
 {
 private:
     SwLineLayout *pNext;                // The next Line
@@ -125,8 +125,8 @@ public:
     inline bool IsRest() const { return bRest; }
     inline void SetBlinking( const bool bNew = true ) { bBlinking = bNew; }
     inline bool IsBlinking() const { return bBlinking; }
-    inline void SetCntnt( const bool bNew = true ) { bContent = bNew; }
-    inline bool HasCntnt() const { return bContent; }
+    inline void SetContent( const bool bNew = true ) { bContent = bNew; }
+    inline bool HasContent() const { return bContent; }
     inline void SetRedline( const bool bNew = true ) { bRedline = bNew; }
     inline bool HasRedline() const { return bRedline; }
     inline void SetForcedLeftMargin( const bool bNew = true ) { bForcedLeftMargin = bNew; }
@@ -153,7 +153,7 @@ public:
     void Init( SwLinePortion *pNextPortion = NULL);
 
     // Collects the data for the line
-    void CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf );
+    void CalcLine( SwTextFormatter &rLine, SwTextFormatInfo &rInf );
 
     inline void SetRealHeight( sal_uInt16 nNew ) { nRealHeight = nNew; }
     inline sal_uInt16 GetRealHeight() const { return nRealHeight; }
@@ -165,7 +165,7 @@ public:
         { return _GetHangingMargin(); }
 
     // For special treatment for empty lines
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
 
     // Stuff for justified alignment
     inline bool IsSpaceAdd() { return pLLSpaceAdd != NULL; }
@@ -244,7 +244,7 @@ class SwParaPortion : public SwLineLayout
     // Fraction aZoom;
     long nDelta;
 
-    // If a SwTxtFrm is locked, no changes occur to the formatting data (under
+    // If a SwTextFrm is locked, no changes occur to the formatting data (under
     // pLine) (compare with Orphans)
     bool bFlys          : 1; // Overlapping Flys?
     bool bPrep          : 1; // PREP_*
@@ -254,7 +254,7 @@ class SwParaPortion : public SwLineLayout
     bool bFollowField   : 1; // We have a bit of field left for the Follow
 
     bool bFixLineHeight : 1; // Fixed line height
-    bool bFtnNum    : 1; // contains a footnotenumberportion
+    bool bFootnoteNum    : 1; // contains a footnotenumberportion
     bool bMargin    : 1; // contains a hanging punctuation in the margin
 
     bool bFlag00    : 1;
@@ -285,7 +285,7 @@ public:
     inline SwScriptInfo& GetScriptInfo() { return aScriptInfo; }
     inline const SwScriptInfo& GetScriptInfo() const { return aScriptInfo; }
 
-    // For SwTxtFrm::Format: returns the paragraph's current length
+    // For SwTextFrm::Format: returns the paragraph's current length
     sal_Int32 GetParLen() const;
 
     // For Prepare()
@@ -309,8 +309,8 @@ public:
     inline void SetFixLineHeight( const bool bNew = true ) { bFixLineHeight = bNew; }
     inline bool IsFixLineHeight() const { return bFixLineHeight; }
 
-    inline void SetFtnNum( const bool bNew = true ) { bFtnNum = bNew; }
-    inline bool IsFtnNum() const { return bFtnNum; }
+    inline void SetFootnoteNum( const bool bNew = true ) { bFootnoteNum = bNew; }
+    inline bool IsFootnoteNum() const { return bFootnoteNum; }
     inline void SetMargin( const bool bNew = true ) { bMargin = bNew; }
     inline bool IsMargin() const { return bMargin; }
     inline void SetFlag00( const bool bNew = true ) { bFlag00 = bNew; }
@@ -338,7 +338,7 @@ public:
     const SwDropPortion *FindDropPortion() const;
 
 #ifdef DBG_UTIL
-    void dumpAsXml( xmlTextWriter* writer, SwTxtFrm* pTxtFrm );
+    void dumpAsXml( xmlTextWriter* writer, SwTextFrm* pTextFrm );
 #endif
 
     OUTPUT_OPERATOR_OVERRIDE
@@ -369,7 +369,7 @@ inline void SwParaPortion::FormatReset()
 {
     nDelta = 0;
     aReformat = SwCharRange(0, COMPLETE_STRING);
-    // bFlys needs to be retained in SwTxtFrm::_Format() so that empty
+    // bFlys needs to be retained in SwTextFrm::_Format() so that empty
     // paragraphs that needed to avoid Frames with no flow, reformat
     // when the Frame disappears from the Area
     // bFlys = false;
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 3215844dbd0a..01fc7285ebf2 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -63,7 +63,7 @@ SwLinePortion *SwLinePortion::Compress()
     return GetLen() || Width() ? this : 0;
 }
 
-sal_uInt16 SwLinePortion::GetViewWidth( const SwTxtSizeInfo & ) const
+sal_uInt16 SwLinePortion::GetViewWidth( const SwTextSizeInfo & ) const
 {
     return 0;
 }
@@ -78,7 +78,7 @@ SwLinePortion::SwLinePortion( ) :
 {
 }
 
-void SwLinePortion::PrePaint( const SwTxtPaintInfo& rInf,
+void SwLinePortion::PrePaint( const SwTextPaintInfo& rInf,
                               const SwLinePortion* pLast ) const
 {
     OSL_ENSURE( rInf.OnWin(), "SwLinePortion::PrePaint: don't prepaint on a printer");
@@ -96,14 +96,14 @@ void SwLinePortion::PrePaint( const SwTxtPaintInfo& rInf,
         nLastWidth = nLastWidth + (sal_uInt16)pLast->CalcSpacing( rInf.GetSpaceAdd(), rInf );
 
     sal_uInt16 nPos;
-    SwTxtPaintInfo aInf( rInf );
+    SwTextPaintInfo aInf( rInf );
 
-    const bool bBidiPor = rInf.GetTxtFrm()->IsRightToLeft() !=
+    const bool bBidiPor = rInf.GetTextFrm()->IsRightToLeft() !=
                           bool( TEXT_LAYOUT_BIDI_RTL & rInf.GetOut()->GetLayoutMode() );
 
     sal_uInt16 nDir = bBidiPor ?
                   1800 :
-                  rInf.GetFont()->GetOrientation( rInf.GetTxtFrm()->IsVertical() );
+                  rInf.GetFont()->GetOrientation( rInf.GetTextFrm()->IsVertical() );
 
     switch ( nDir )
     {
@@ -139,15 +139,15 @@ void SwLinePortion::PrePaint( const SwTxtPaintInfo& rInf,
     pThis->Width(0);
 }
 
-void SwLinePortion::CalcTxtSize( const SwTxtSizeInfo &rInf )
+void SwLinePortion::CalcTextSize( const SwTextSizeInfo &rInf )
 {
     if( GetLen() == rInf.GetLen()  )
-        *static_cast<SwPosSize*>(this) = GetTxtSize( rInf );
+        *static_cast<SwPosSize*>(this) = GetTextSize( rInf );
     else
     {
-        SwTxtSizeInfo aInf( rInf );
+        SwTextSizeInfo aInf( rInf );
         aInf.SetLen( GetLen() );
-        *static_cast<SwPosSize*>(this) = GetTxtSize( aInf );
+        *static_cast<SwPosSize*>(this) = GetTextSize( aInf );
     }
 }
 
@@ -230,14 +230,14 @@ sal_Int32 SwLinePortion::GetCrsrOfst( const sal_uInt16 nOfst ) const
         return 0;
 }
 
-SwPosSize SwLinePortion::GetTxtSize( const SwTxtSizeInfo & ) const
+SwPosSize SwLinePortion::GetTextSize( const SwTextSizeInfo & ) const
 {
-    OSL_ENSURE( false, "SwLinePortion::GetTxtSize: don't ask me about sizes, "
+    OSL_ENSURE( false, "SwLinePortion::GetTextSize: don't ask me about sizes, "
                    "I'm only a stupid SwLinePortion" );
     return SwPosSize();
 }
 
-bool SwLinePortion::Format( SwTxtFormatInfo &rInf )
+bool SwLinePortion::Format( SwTextFormatInfo &rInf )
 {
     if( rInf.X() > rInf.Width() )
     {
@@ -265,13 +265,13 @@ bool SwLinePortion::Format( SwTxtFormatInfo &rInf )
 
 // Format end of line
 
-void SwLinePortion::FormatEOL( SwTxtFormatInfo & )
+void SwLinePortion::FormatEOL( SwTextFormatInfo & )
 { }
 
-void SwLinePortion::Move( SwTxtPaintInfo &rInf )
+void SwLinePortion::Move( SwTextPaintInfo &rInf )
 {
     bool bB2T = rInf.GetDirection() == DIR_BOTTOM2TOP;
-    const bool bFrmDir = rInf.GetTxtFrm()->IsRightToLeft();
+    const bool bFrmDir = rInf.GetTextFrm()->IsRightToLeft();
     bool bCounterDir = ( ! bFrmDir && DIR_RIGHT2LEFT == rInf.GetDirection() ) ||
                        (   bFrmDir && DIR_LEFT2RIGHT == rInf.GetDirection() );
 
@@ -305,12 +305,12 @@ void SwLinePortion::Move( SwTxtPaintInfo &rInf )
     rInf.SetIdx( rInf.GetIdx() + GetLen() );
 }
 
-long SwLinePortion::CalcSpacing( long , const SwTxtSizeInfo & ) const
+long SwLinePortion::CalcSpacing( long , const SwTextSizeInfo & ) const
 {
     return 0;
 }
 
-bool SwLinePortion::GetExpTxt( const SwTxtSizeInfo &, OUString & ) const
+bool SwLinePortion::GetExpText( const SwTextSizeInfo &, OUString & ) const
 {
     return false;
 }
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 59f272f08d24..792c9ef3b63e 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -26,9 +26,9 @@
 #include <libxml/xmlwriter.h>
 #endif
 
-class SwTxtSizeInfo;
-class SwTxtPaintInfo;
-class SwTxtFormatInfo;
+class SwTextSizeInfo;
+class SwTextPaintInfo;
+class SwTextFormatInfo;
 class SwPortionHandler;
 
 // The portions output operators are virtual methods of the portion.
@@ -107,19 +107,19 @@ public:
     inline sal_uInt16 GetWhichPor( ) const        { return nWhichPor; }
 
 // Group queries
-    inline bool InTxtGrp() const { return (nWhichPor & PORGRP_TXT) != 0; }
+    inline bool InTextGrp() const { return (nWhichPor & PORGRP_TXT) != 0; }
     inline bool InGlueGrp() const { return (nWhichPor & PORGRP_GLUE) != 0; }
     inline bool InTabGrp() const { return (nWhichPor & PORGRP_TAB) != 0; }
     inline bool InHyphGrp() const { return (nWhichPor & PORGRP_HYPH) != 0; }
     inline bool InNumberGrp() const { return (nWhichPor & PORGRP_NUMBER) != 0; }
     inline bool InFixGrp() const { return (nWhichPor & PORGRP_FIX) != 0; }
-    inline bool InFldGrp() const { return (nWhichPor & PORGRP_FLD) != 0; }
+    inline bool InFieldGrp() const { return (nWhichPor & PORGRP_FLD) != 0; }
     inline bool InToxRefGrp() const { return (nWhichPor & PORGRP_TOXREF) != 0; }
-    inline bool InToxRefOrFldGrp() const { return (nWhichPor & ( PORGRP_FLD | PORGRP_TOXREF )) != 0; }
+    inline bool InToxRefOrFieldGrp() const { return (nWhichPor & ( PORGRP_FLD | PORGRP_TOXREF )) != 0; }
     inline bool InExpGrp() const { return (nWhichPor & PORGRP_EXP) != 0; }
     inline bool InTabnLftGrp() const { return (nWhichPor & PORGRP_TABNOTLFT) != 0; }
     inline bool InFixMargGrp() const { return (nWhichPor & PORGRP_FIXMARG) != 0; }
-    inline bool InSpaceGrp() const { return InTxtGrp() || IsMultiPortion(); }
+    inline bool InSpaceGrp() const { return InTextGrp() || IsMultiPortion(); }
 // Individual queries
     inline bool IsGrfNumPortion() const { return nWhichPor == POR_GRFNUM; }
     inline bool IsFlyCntPortion() const { return nWhichPor == POR_FLYCNT; }
@@ -130,8 +130,8 @@ public:
     inline bool IsTabCntPortion() const { return nWhichPor == POR_TABCENTER; }
     inline bool IsTabDecimalPortion() const { return nWhichPor == POR_TABDECIMAL; }
     inline bool IsTabLeftPortion() const { return nWhichPor == POR_TABLEFT; }
-    inline bool IsFtnNumPortion() const { return nWhichPor == POR_FTNNUM; }
-    inline bool IsFtnPortion() const { return nWhichPor == POR_FTN; }
+    inline bool IsFootnoteNumPortion() const { return nWhichPor == POR_FTNNUM; }
+    inline bool IsFootnotePortion() const { return nWhichPor == POR_FTN; }
     inline bool IsTmpEndPortion() const { return nWhichPor == POR_TMPEND; }
     inline bool IsDropPortion() const { return nWhichPor == POR_DROP; }
     inline bool IsLayPortion() const { return nWhichPor == POR_LAY; }
@@ -156,26 +156,26 @@ public:
     SwLinePortion *FindLastPortion();
 
     virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const;
-    virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
-    void CalcTxtSize( const SwTxtSizeInfo &rInfo );
+    virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const;
+    void CalcTextSize( const SwTextSizeInfo &rInfo );
 
     // Output
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const = 0;
-    void PrePaint( const SwTxtPaintInfo &rInf, const SwLinePortion *pLast ) const;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const = 0;
+    void PrePaint( const SwTextPaintInfo &rInf, const SwLinePortion *pLast ) const;
 
-    virtual bool Format( SwTxtFormatInfo &rInf );
+    virtual bool Format( SwTextFormatInfo &rInf );
     // Is called for the line's last portion
-    virtual void FormatEOL( SwTxtFormatInfo &rInf );
-            void Move( SwTxtPaintInfo &rInf );
+    virtual void FormatEOL( SwTextFormatInfo &rInf );
+            void Move( SwTextPaintInfo &rInf );
 
-    // For SwTxtSlot
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+    // For SwTextSlot
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const;
 
-    // For SwFldPortion, SwSoftHyphPortion
-    virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const;
+    // For SwFieldPortion, SwSoftHyphPortion
+    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const;
 
     // for text- and multi-portions
-    virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const;
+    virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const;
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 755869f62849..ca60bae72fc2 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -58,28 +58,28 @@ using namespace ::com::sun::star;
 // and by another SwLineLayout via pNext to realize a doubleline portion.
 SwMultiPortion::~SwMultiPortion()
 {
-    delete pFldRest;
+    delete pFieldRest;
 }
 
-void SwMultiPortion::Paint( const SwTxtPaintInfo & ) const
+void SwMultiPortion::Paint( const SwTextPaintInfo & ) const
 {
-    OSL_FAIL( "Don't try SwMultiPortion::Paint, try SwTxtPainter::PaintMultiPortion" );
+    OSL_FAIL( "Don't try SwMultiPortion::Paint, try SwTextPainter::PaintMultiPortion" );
 }
 
 // Summarize the internal lines to calculate the (external) size.
 // The internal line has to calculate first.
-void SwMultiPortion::CalcSize( SwTxtFormatter& rLine, SwTxtFormatInfo &rInf )
+void SwMultiPortion::CalcSize( SwTextFormatter& rLine, SwTextFormatInfo &rInf )
 {
     Width( 0 );
     Height( 0 );
     SetAscent( 0 );
-    SetFlyInCntnt( false );
+    SetFlyInContent( false );
     SwLineLayout *pLay = &GetRoot();
     do
     {
         pLay->CalcLine( rLine, rInf );
         if( rLine.IsFlyInCntBase() )
-            SetFlyInCntnt( true );
+            SetFlyInContent( true );
         if( IsRuby() && ( OnTop() == ( pLay == &GetRoot() ) ) )
         {
             // An empty phonetic line don't need an ascent or a height.
@@ -114,7 +114,7 @@ void SwMultiPortion::CalcSize( SwTxtFormatter& rLine, SwTxtFormatInfo &rInf )
     }
 }
 
-long SwMultiPortion::CalcSpacing( long , const SwTxtSizeInfo & ) const
+long SwMultiPortion::CalcSpacing( long , const SwTextSizeInfo & ) const
 {
     return 0;
 }
@@ -156,9 +156,9 @@ SwRotatedPortion::SwRotatedPortion( const SwMultiCreator& rCreate,
     const SvxCharRotateItem* pRot = static_cast<const SvxCharRotateItem*>(rCreate.pItem);
     if( !pRot )
     {
-        const SwTxtAttr& rAttr = *rCreate.pAttr;
+        const SwTextAttr& rAttr = *rCreate.pAttr;
         const SfxPoolItem *const pItem =
-                CharFmt::GetItem(rAttr, RES_CHRATR_ROTATE);
+                CharFormat::GetItem(rAttr, RES_CHRATR_ROTATE);
         if ( pItem )
         {
             pRot = static_cast<const SvxCharRotateItem*>(pItem);
@@ -187,7 +187,7 @@ SwBidiPortion::SwBidiPortion( sal_Int32 nEnd, sal_uInt8 nLv )
         SetDirection( DIR_LEFT2RIGHT );
 }
 
-long SwBidiPortion::CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo& rInf ) const
+long SwBidiPortion::CalcSpacing( long nSpaceAdd, const SwTextSizeInfo& rInf ) const
 {
     return HasTabulator() ? 0 : GetSpaceCnt(rInf) * nSpaceAdd / SPACING_PRECISION_FACTOR;
 }
@@ -204,7 +204,7 @@ bool SwBidiPortion::ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const
     return false;
 }
 
-sal_Int32 SwBidiPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf ) const
+sal_Int32 SwBidiPortion::GetSpaceCnt( const SwTextSizeInfo &rInf ) const
 {
     // Calculate number of blanks for justified alignment
     SwLinePortion* pPor = GetRoot().GetFirstPortion();
@@ -214,15 +214,15 @@ sal_Int32 SwBidiPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf ) const
 
     for( nBlanks = 0; pPor; pPor = pPor->GetPortion() )
     {
-        if( pPor->InTxtGrp() )
-            nBlanks = nBlanks + static_cast<SwTxtPortion*>(pPor)->GetSpaceCnt( rInf, nNull );
+        if( pPor->InTextGrp() )
+            nBlanks = nBlanks + static_cast<SwTextPortion*>(pPor)->GetSpaceCnt( rInf, nNull );
         else if ( pPor->IsMultiPortion() &&
                  static_cast<SwMultiPortion*>(pPor)->IsBidi() )
             nBlanks = nBlanks + static_cast<SwBidiPortion*>(pPor)->GetSpaceCnt( rInf );
 
-        ((SwTxtSizeInfo &)rInf).SetIdx( rInf.GetIdx() + pPor->GetLen() );
+        ((SwTextSizeInfo &)rInf).SetIdx( rInf.GetIdx() + pPor->GetLen() );
     }
-    ((SwTxtSizeInfo &)rInf).SetIdx( nTmpStart );
+    ((SwTextSizeInfo &)rInf).SetIdx( nTmpStart );
     return nBlanks;
 }
 
@@ -269,11 +269,11 @@ SwDoubleLinePortion::SwDoubleLinePortion(const SwMultiCreator& rCreate, sal_Int3
         pBracket->nStart = 0;
     else
     {
-        const SwTxtAttr& rAttr = *rCreate.pAttr;
+        const SwTextAttr& rAttr = *rCreate.pAttr;
         pBracket->nStart = rAttr.GetStart();
 
         const SfxPoolItem * const pItem =
-            CharFmt::GetItem( rAttr, RES_CHRATR_TWO_LINES );
+            CharFormat::GetItem( rAttr, RES_CHRATR_TWO_LINES );
         if ( pItem )
         {
             pTwo = static_cast<const SvxTwoLinesItem*>(pItem);
@@ -292,15 +292,15 @@ SwDoubleLinePortion::SwDoubleLinePortion(const SwMultiCreator& rCreate, sal_Int3
     sal_uInt8 nTmp = SW_SCRIPTS;
     if( pBracket->cPre > 255 )
     {
-        OUString aTxt = OUString(pBracket->cPre);
-        nTmp = SwScriptInfo::WhichFont( 0, &aTxt, 0 );
+        OUString aText = OUString(pBracket->cPre);
+        nTmp = SwScriptInfo::WhichFont( 0, &aText, 0 );
     }
     pBracket->nPreScript = nTmp;
     nTmp = SW_SCRIPTS;
     if( pBracket->cPost > 255 )
     {
-        OUString aTxt = OUString(pBracket->cPost);
-        nTmp = SwScriptInfo::WhichFont( 0, &aTxt, 0 );
+        OUString aText = OUString(pBracket->cPost);
+        nTmp = SwScriptInfo::WhichFont( 0, &aText, 0 );
     }
     pBracket->nPostScript = nTmp;
 
@@ -319,10 +319,10 @@ SwDoubleLinePortion::SwDoubleLinePortion(const SwMultiCreator& rCreate, sal_Int3
 
 // paints the wished bracket,
 // if the multiportion has surrounding brackets.
-// The X-position of the SwTxtPaintInfo will be modified:
+// The X-position of the SwTextPaintInfo will be modified:
 // the open bracket sets position behind itself,
 // the close bracket in front of itself.
-void SwDoubleLinePortion::PaintBracket( SwTxtPaintInfo &rInf,
+void SwDoubleLinePortion::PaintBracket( SwTextPaintInfo &rInf,
                                         long nSpaceAdd,
                                         bool bOpen ) const
 {
@@ -372,7 +372,7 @@ void SwDoubleLinePortion::SetBrackets( const SwDoubleLinePortion& rDouble )
 // calculates the size of the brackets => pBracket,
 // reduces the nMaxWidth-parameter ( minus bracket-width )
 // and moves the rInf-x-position behind the opening bracket.
-void SwDoubleLinePortion::FormatBrackets( SwTxtFormatInfo &rInf, SwTwips& nMaxWidth )
+void SwDoubleLinePortion::FormatBrackets( SwTextFormatInfo &rInf, SwTwips& nMaxWidth )
 {
     nMaxWidth -= rInf.X();
     SwFont* pTmpFnt = new SwFont( *rInf.GetFont() );
@@ -386,7 +386,7 @@ void SwDoubleLinePortion::FormatBrackets( SwTxtFormatInfo &rInf, SwTwips& nMaxWi
         if( SW_SCRIPTS > pBracket->nPreScript )
             pTmpFnt->SetActual( pBracket->nPreScript );
         SwFontSave aSave( rInf, pTmpFnt );
-        SwPosSize aSize = rInf.GetTxtSize( aStr );
+        SwPosSize aSize = rInf.GetTextSize( aStr );
         pBracket->nAscent = rInf.GetAscent();
         pBracket->nHeight = aSize.Height();
         pTmpFnt->SetActual( nActualScr );
@@ -410,7 +410,7 @@ void SwDoubleLinePortion::FormatBrackets( SwTxtFormatInfo &rInf, SwTwips& nMaxWi
         if( SW_SCRIPTS > pBracket->nPostScript )
             pTmpFnt->SetActual( pBracket->nPostScript );
         SwFontSave aSave( rInf, pTmpFnt );
-        SwPosSize aSize = rInf.GetTxtSize( aStr );
+        SwPosSize aSize = rInf.GetTextSize( aStr );
         const sal_uInt16 nTmpAsc = rInf.GetAscent();
         if( nTmpAsc > pBracket->nAscent )
         {
@@ -439,7 +439,7 @@ void SwDoubleLinePortion::FormatBrackets( SwTxtFormatInfo &rInf, SwTwips& nMaxWi
 // calculates the number of blanks in each line and
 // the difference of the width of the two lines.
 // These results are used from the text adjustment.
-void SwDoubleLinePortion::CalcBlanks( SwTxtFormatInfo &rInf )
+void SwDoubleLinePortion::CalcBlanks( SwTextFormatInfo &rInf )
 {
     SwLinePortion* pPor = GetRoot().GetFirstPortion();
     sal_Int32 nNull = 0;
@@ -448,8 +448,8 @@ void SwDoubleLinePortion::CalcBlanks( SwTxtFormatInfo &rInf )
     SetTab2( false );
     for( nBlank1 = 0; pPor; pPor = pPor->GetPortion() )
     {
-        if( pPor->InTxtGrp() )
-            nBlank1 = nBlank1 + static_cast<SwTxtPortion*>(pPor)->GetSpaceCnt( rInf, nNull );
+        if( pPor->InTextGrp() )
+            nBlank1 = nBlank1 + static_cast<SwTextPortion*>(pPor)->GetSpaceCnt( rInf, nNull );
         rInf.SetIdx( rInf.GetIdx() + pPor->GetLen() );
         if( pPor->InTabGrp() )
             SetTab1( true );
@@ -462,8 +462,8 @@ void SwDoubleLinePortion::CalcBlanks( SwTxtFormatInfo &rInf )
     }
     for( nBlank2 = 0; pPor; pPor = pPor->GetPortion() )
     {
-        if( pPor->InTxtGrp() )
-            nBlank2 = nBlank2 + static_cast<SwTxtPortion*>(pPor)->GetSpaceCnt( rInf, nNull );
+        if( pPor->InTextGrp() )
+            nBlank2 = nBlank2 + static_cast<SwTextPortion*>(pPor)->GetSpaceCnt( rInf, nNull );
         rInf.SetIdx( rInf.GetIdx() + pPor->GetLen() );
         if( pPor->InTabGrp() )
             SetTab2( true );
@@ -471,7 +471,7 @@ void SwDoubleLinePortion::CalcBlanks( SwTxtFormatInfo &rInf )
     rInf.SetIdx( nStart );
 }
 
-long SwDoubleLinePortion::CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo & ) const
+long SwDoubleLinePortion::CalcSpacing( long nSpaceAdd, const SwTextSizeInfo & ) const
 {
     return HasTabulator() ? 0 : GetSpaceCnt() * nSpaceAdd / SPACING_PRECISION_FACTOR;
 }
@@ -553,7 +553,7 @@ SwRubyPortion::SwRubyPortion( const SwMultiCreator& rCreate, const SwFont& rFnt,
     SetRuby();
     OSL_ENSURE( SW_MC_RUBY == rCreate.nId, "Ruby expected" );
     OSL_ENSURE( RES_TXTATR_CJK_RUBY == rCreate.pAttr->Which(), "Wrong attribute" );
-    const SwFmtRuby& rRuby = rCreate.pAttr->GetRuby();
+    const SwFormatRuby& rRuby = rCreate.pAttr->GetRuby();
     nAdjustment = rRuby.GetAdjustment();
     nRubyOffset = nOffs;
 
@@ -563,12 +563,12 @@ SwRubyPortion::SwRubyPortion( const SwMultiCreator& rCreate, const SwFont& rFnt,
     else
         SetTop( ! rRuby.GetPosition() );
 
-    const SwCharFmt *const pFmt =
-        static_txtattr_cast<SwTxtRuby const*>(rCreate.pAttr)->GetCharFmt();
+    const SwCharFormat *const pFormat =
+        static_txtattr_cast<SwTextRuby const*>(rCreate.pAttr)->GetCharFormat();
     SwFont *pRubyFont;
-    if( pFmt )
+    if( pFormat )
     {
-        const SwAttrSet& rSet = pFmt->GetAttrSet();
+        const SwAttrSet& rSet = pFormat->GetAttrSet();
          pRubyFont = new SwFont( rFnt );
         pRubyFont->SetDiffFnt( &rSet, &rIDocumentSettingAccess );
 
@@ -579,16 +579,16 @@ SwRubyPortion::SwRubyPortion( const SwMultiCreator& rCreate, const SwFont& rFnt,
         pRubyFont = NULL;
 
     OUString aStr = rRuby.GetText().copy( nOffs );
-    SwFldPortion *pFld = new SwFldPortion( aStr, pRubyFont );
-    pFld->SetNextOffset( nOffs );
-    pFld->SetFollow( true );
+    SwFieldPortion *pField = new SwFieldPortion( aStr, pRubyFont );
+    pField->SetNextOffset( nOffs );
+    pField->SetFollow( true );
 
     if( OnTop() )
-        GetRoot().SetPortion( pFld );
+        GetRoot().SetPortion( pField );
     else
     {
         GetRoot().SetNext( new SwLineLayout() );
-        GetRoot().GetNext()->SetPortion( pFld );
+        GetRoot().GetNext()->SetPortion( pField );
     }
 
     // ruby portions have the same direction as the frame directions
@@ -615,7 +615,7 @@ SwRubyPortion::SwRubyPortion( const SwMultiCreator& rCreate, const SwFont& rFnt,
 // Notice: the smaller line will be manipulated, normally it's the ruby line,
 // but it could be the main text, too.
 // If there is a tabulator in smaller line, no adjustment is possible.
-void SwRubyPortion::_Adjust( SwTxtFormatInfo &rInf )
+void SwRubyPortion::_Adjust( SwTextFormatInfo &rInf )
 {
     SwTwips nLineDiff = GetRoot().Width() - GetRoot().GetNext()->Width();
     sal_Int32 nOldIdx = rInf.GetIdx();
@@ -650,8 +650,8 @@ void SwRubyPortion::_Adjust( SwTxtFormatInfo &rInf )
             SwLinePortion *pPor;
             for( pPor = pCurr->GetFirstPortion(); pPor; pPor = pPor->GetPortion() )
             {
-                if( pPor->InTxtGrp() )
-                    static_cast<SwTxtPortion*>(pPor)->GetSpaceCnt( rInf, nCharCnt );
+                if( pPor->InTextGrp() )
+                    static_cast<SwTextPortion*>(pPor)->GetSpaceCnt( rInf, nCharCnt );
                 rInf.SetIdx( rInf.GetIdx() + pPor->GetLen() );
             }
             if( nCharCnt > nSub )
@@ -678,7 +678,7 @@ void SwRubyPortion::_Adjust( SwTxtFormatInfo &rInf )
     if( nLeft || nRight )
     {
         if( !pCurr->GetPortion() )
-            pCurr->SetPortion(SwTxtPortion::CopyLinePortion(*pCurr));
+            pCurr->SetPortion(SwTextPortion::CopyLinePortion(*pCurr));
         if( nLeft )
         {
             SwMarginPortion *pMarg = new SwMarginPortion( 0 );
@@ -712,17 +712,17 @@ void SwRubyPortion::CalcRubyOffset()
             return;
     }
     const SwLinePortion *pPor = pCurr->GetFirstPortion();
-    const SwFldPortion *pFld = NULL;
+    const SwFieldPortion *pField = NULL;
     while( pPor )
     {
-        if( pPor->InFldGrp() )
-            pFld = static_cast<const SwFldPortion*>(pPor);
+        if( pPor->InFieldGrp() )
+            pField = static_cast<const SwFieldPortion*>(pPor);
         pPor = pPor->GetPortion();
     }
-    if( pFld )
+    if( pField )
     {
-        if( pFld->HasFollow() )
-            nRubyOffset = pFld->GetNextOffset();
+        if( pField->HasFollow() )
+            nRubyOffset = pField->GetNextOffset();
         else
             nRubyOffset = COMPLETE_STRING;
     }
@@ -734,10 +734,10 @@ void SwRubyPortion::CalcRubyOffset()
 // no 2-line-format reference is passed. If there is a 2-line-format reference,
 // then the rValue is set only, if the 2-line-attribute's value is set _and_
 // the 2-line-formats has the same brackets.
-static bool lcl_Has2Lines( const SwTxtAttr& rAttr, const SvxTwoLinesItem* &rpRef,
+static bool lcl_Has2Lines( const SwTextAttr& rAttr, const SvxTwoLinesItem* &rpRef,
     bool &rValue )
 {
-    const SfxPoolItem* pItem = CharFmt::GetItem( rAttr, RES_CHRATR_TWO_LINES );
+    const SfxPoolItem* pItem = CharFormat::GetItem( rAttr, RES_CHRATR_TWO_LINES );
     if( pItem )
     {
         rValue = static_cast<const SvxTwoLinesItem*>(pItem)->GetValue();
@@ -760,10 +760,10 @@ static bool lcl_Has2Lines( const SwTxtAttr& rAttr, const SvxTwoLinesItem* &rpRef
 // If there is a charrotate-format reference, then the rValue is set only,
 // if the charrotate-attribute's value is set _and_ identical
 // to the charrotate-format's value.
-static bool lcl_HasRotation( const SwTxtAttr& rAttr,
+static bool lcl_HasRotation( const SwTextAttr& rAttr,
     const SvxCharRotateItem* &rpRef, bool &rValue )
 {
-    const SfxPoolItem* pItem = CharFmt::GetItem( rAttr, RES_CHRATR_ROTATE );
+    const SfxPoolItem* pItem = CharFormat::GetItem( rAttr, RES_CHRATR_ROTATE );
     if ( pItem )
     {
         rValue = static_cast<const SvxCharRotateItem*>(pItem)->GetValue();
@@ -787,7 +787,7 @@ static bool lcl_HasRotation( const SwTxtAttr& rAttr,
 // interrupts the first attribute.
 // E.g. a ruby portion interrupts a 2-line-attribute, a 2-line-attribute
 // with different brackets interrupts another 2-line-attribute.
-SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
+SwMultiCreator* SwTextSizeInfo::GetMultiCreator( sal_Int32 &rPos,
                                                 SwMultiPortion* pMulti ) const
 {
     SwScriptInfo& rSI = const_cast<SwParaPortion*>(GetParaPortion())->GetScriptInfo();
@@ -802,22 +802,22 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
     }
     else
         // no nested bidi portion required
-        nCurrLevel = GetTxtFrm()->IsRightToLeft() ? 1 : 0;
+        nCurrLevel = GetTextFrm()->IsRightToLeft() ? 1 : 0;
 
     // check if there is a field at rPos:
     sal_uInt8 nNextLevel = nCurrLevel;
-    bool bFldBidi = false;
+    bool bFieldBidi = false;
 
-    if ( rPos < GetTxt().getLength() && CH_TXTATR_BREAKWORD == GetChar( rPos ) )
+    if ( rPos < GetText().getLength() && CH_TXTATR_BREAKWORD == GetChar( rPos ) )
     {
-        bFldBidi = true;
+        bFieldBidi = true;
     }
     else
         nNextLevel = rSI.DirType( rPos );
 
-    if ( GetTxt().getLength() != rPos && nNextLevel > nCurrLevel )
+    if ( GetText().getLength() != rPos && nNextLevel > nCurrLevel )
     {
-        rPos = bFldBidi ? rPos + 1 : rSI.NextDirChg( rPos, &nCurrLevel );
+        rPos = bFieldBidi ? rPos + 1 : rSI.NextDirChg( rPos, &nCurrLevel );
         if ( COMPLETE_STRING == rPos )
             return NULL;
         SwMultiCreator *pRet = new SwMultiCreator;
@@ -834,28 +834,28 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
 
     const SvxCharRotateItem* pRotate = NULL;
     const SfxPoolItem* pRotItem;
-    if( SfxItemState::SET == m_pFrm->GetTxtNode()->GetSwAttrSet().
+    if( SfxItemState::SET == m_pFrm->GetTextNode()->GetSwAttrSet().
         GetItemState( RES_CHRATR_ROTATE, true, &pRotItem ) &&
         static_cast<const SvxCharRotateItem*>(pRotItem)->GetValue() )
         pRotate = static_cast<const SvxCharRotateItem*>(pRotItem);
     else
         pRotItem = NULL;
     const SvxTwoLinesItem* p2Lines = NULL;
-    const SwTxtNode *pLclTxtNode = m_pFrm->GetTxtNode();
-    if( !pLclTxtNode )
+    const SwTextNode *pLclTextNode = m_pFrm->GetTextNode();
+    if( !pLclTextNode )
         return NULL;
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET == pLclTxtNode->GetSwAttrSet().
+    if( SfxItemState::SET == pLclTextNode->GetSwAttrSet().
         GetItemState( RES_CHRATR_TWO_LINES, true, &pItem ) &&
         static_cast<const SvxTwoLinesItem*>(pItem)->GetValue() )
         p2Lines = static_cast<const SvxTwoLinesItem*>(pItem);
     else
         pItem = NULL;
 
-    const SwpHints *pHints = pLclTxtNode->GetpSwpHints();
+    const SwpHints *pHints = pLclTextNode->GetpSwpHints();
     if( !pHints && !p2Lines && !pRotate )
         return NULL;
-    const SwTxtAttr *pRuby = NULL;
+    const SwTextAttr *pRuby = NULL;
     bool bTwo = false;
     bool bRot = false;
     size_t n2Lines = SAL_MAX_SIZE;
@@ -863,7 +863,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
     const size_t nCount = pHints ? pHints->Count() : 0;
     for( size_t i = 0; i < nCount; ++i )
     {
-        const SwTxtAttr *pTmp = (*pHints)[i];
+        const SwTextAttr *pTmp = (*pHints)[i];
         sal_Int32 nStart = pTmp->GetStart();
         if( rPos < nStart )
             break;
@@ -896,11 +896,11 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
         pRet->pItem = NULL;
         pRet->pAttr = pRuby;
         pRet->nId = SW_MC_RUBY;
-        pRet->nLevel = GetTxtFrm()->IsRightToLeft() ? 1 : 0;
+        pRet->nLevel = GetTextFrm()->IsRightToLeft() ? 1 : 0;
         return pRet;
     }
     if( n2Lines < nCount || ( pItem && pItem == p2Lines &&
-        rPos < GetTxt().getLength() ) )
+        rPos < GetText().getLength() ) )
     {   // The winner is a 2-line-attribute,
         // the end of the multiportion depends on the following attributes...
         SwMultiCreator *pRet = new SwMultiCreator;
@@ -920,7 +920,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
             aEnd.push_front( *pRet->pAttr->End() );
             if( pItem )
             {
-                aEnd.front() = GetTxt().getLength();
+                aEnd.front() = GetText().getLength();
                 bOn = static_cast<const SvxTwoLinesItem*>(pItem)->GetEndBracket() ==
                         p2Lines->GetEndBracket() &&
                       static_cast<const SvxTwoLinesItem*>(pItem)->GetStartBracket() ==
@@ -931,10 +931,10 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
         {
             pRet->pItem = pItem;
             pRet->pAttr = NULL;
-            aEnd.push_front( GetTxt().getLength() );
+            aEnd.push_front( GetText().getLength() );
         }
         pRet->nId = SW_MC_DOUBLE;
-        pRet->nLevel = GetTxtFrm()->IsRightToLeft() ? 1 : 0;
+        pRet->nLevel = GetTextFrm()->IsRightToLeft() ? 1 : 0;
 
         // n2Lines is the index of the last 2-line-attribute, which contains
         // the actual position.
@@ -955,7 +955,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
         // continuity attribute.
         for( size_t i = 0; i < nCount; ++i )
         {
-            const SwTxtAttr *pTmp = (*pHints)[i];
+            const SwTextAttr *pTmp = (*pHints)[i];
             if( *pTmp->GetAnyEnd() <= rPos )
                 continue;
             if( rPos < pTmp->GetStart() )
@@ -1016,7 +1016,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
         return pRet;
     }
     if( nRotate < nCount || ( pRotItem && pRotItem == pRotate &&
-        rPos < GetTxt().getLength() ) )
+        rPos < GetText().getLength() ) )
     {   // The winner is a rotate-attribute,
         // the end of the multiportion depends on the following attributes...
         SwMultiCreator *pRet = new SwMultiCreator;
@@ -1028,12 +1028,12 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
         // The bOn flag signs the state of the last 2-line attribute in the
         // aEnd-stack, which could interrupts the winning rotation attribute.
         bool bOn = pItem;
-        aEnd.push_front( GetTxt().getLength() );
+        aEnd.push_front( GetText().getLength() );
 
         sal_Int32 n2Start = rPos;
         for( size_t i = 0; i < nCount; ++i )
         {
-            const SwTxtAttr *pTmp = (*pHints)[i];
+            const SwTextAttr *pTmp = (*pHints)[i];
             if( *pTmp->GetAnyEnd() <= n2Start )
                 continue;
             if( n2Start < pTmp->GetStart() )
@@ -1092,7 +1092,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
             aEnd.push_front( *pRet->pAttr->End() );
             if( pRotItem )
             {
-                aEnd.front() = GetTxt().getLength();
+                aEnd.front() = GetText().getLength();
                 bOn = static_cast<const SvxCharRotateItem*>(pRotItem)->GetValue() ==
                         pRotate->GetValue();
             }
@@ -1101,11 +1101,11 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
         {
             pRet->pItem = pRotItem;
             pRet->pAttr = NULL;
-            aEnd.push_front( GetTxt().getLength() );
+            aEnd.push_front( GetText().getLength() );
         }
         for( size_t i = 0; i < nCount; ++i )
         {
-            const SwTxtAttr *pTmp = (*pHints)[i];
+            const SwTextAttr *pTmp = (*pHints)[i];
             if( *pTmp->GetAnyEnd() <= rPos )
                 continue;
             if( rPos < pTmp->GetStart() )
@@ -1165,7 +1165,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos,
 // The destructor restores the values of the last manipulation.
 class SwSpaceManipulator
 {
-    SwTxtPaintInfo& rInfo;
+    SwTextPaintInfo& rInfo;
     SwMultiPortion& rMulti;
     std::vector<long>* pOldSpaceAdd;
     sal_uInt16 nOldSpIdx;
@@ -1173,13 +1173,13 @@ class SwSpaceManipulator
     bool bSpaceChg;
     sal_uInt8 nOldDir;
 public:
-    SwSpaceManipulator( SwTxtPaintInfo& rInf, SwMultiPortion& rMult );
+    SwSpaceManipulator( SwTextPaintInfo& rInf, SwMultiPortion& rMult );
     ~SwSpaceManipulator();
     void SecondLine();
     inline long GetSpaceAdd() const { return nSpaceAdd; }
 };
 
-SwSpaceManipulator::SwSpaceManipulator( SwTxtPaintInfo& rInf,
+SwSpaceManipulator::SwSpaceManipulator( SwTextPaintInfo& rInf,
                                         SwMultiPortion& rMult )
     : rInfo(rInf)
     , rMulti(rMult)
@@ -1247,8 +1247,8 @@ SwSpaceManipulator::~SwSpaceManipulator()
 
 // Manages the paint for a SwMultiPortion.
 // External, for the calling function, it seems to be a normal Paint-function,
-// internal it is like a SwTxtFrm::Paint with multiple DrawTextLines
-void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
+// internal it is like a SwTextFrm::Paint with multiple DrawTextLines
+void SwTextPainter::PaintMultiPortion( const SwRect &rPaint,
     SwMultiPortion& rMulti, const SwMultiPortion* pEnvPor )
 {
     SwTextGridItem const*const pGrid(GetGridItem(pFrm->FindPageFrm()));
@@ -1284,7 +1284,7 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
         // and the layout mode
         OSL_ENSURE( ! pEnvPor || pEnvPor->IsBidi(),
                 "Oh no, I expected a BidiPortion" );
-        nFrmDir = GetInfo().GetTxtFrm()->IsRightToLeft() ? 1 : 0;
+        nFrmDir = GetInfo().GetTextFrm()->IsRightToLeft() ? 1 : 0;
         nEnvDir = pEnvPor ? static_cast<const SwBidiPortion*>(pEnvPor)->GetLevel() % 2 : nFrmDir;
         nThisDir = static_cast<SwBidiPortion&>(rMulti).GetLevel() % 2;
     }
@@ -1434,14 +1434,14 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
         bool bSeeked = true;
         GetInfo().SetLen( pPor->GetLen() );
 
-        if( bRest && pPor->InFldGrp() && !pPor->GetLen() )
+        if( bRest && pPor->InFieldGrp() && !pPor->GetLen() )
         {
-            if( static_cast<SwFldPortion*>(pPor)->HasFont() )
+            if( static_cast<SwFieldPortion*>(pPor)->HasFont() )
                  bSeeked = false;
             else
                 SeekAndChgBefore( GetInfo() );
         }
-        else if( pPor->InTxtGrp() || pPor->InFldGrp() || pPor->InTabGrp() )
+        else if( pPor->InTextGrp() || pPor->InFieldGrp() || pPor->InTabGrp() )
             SeekAndChg( GetInfo() );
         else if ( !bFirst && pPor->IsBreakPortion() && GetInfo().GetOpt().IsParagraph() )
         {
@@ -1474,7 +1474,7 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
         {
             // we do not allow any rotation inside a bidi portion
             SwFont* pTmpFont = GetInfo().GetFont();
-            pTmpFont->SetVertical( 0, GetInfo().GetTxtFrm()->IsVertical() );
+            pTmpFont->SetVertical( 0, GetInfo().GetTextFrm()->IsVertical() );
         }
 
         if( pPor->IsMultiPortion() && static_cast<SwMultiPortion*>(pPor)->IsBidi() )
@@ -1486,7 +1486,7 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
         else
             pPor->Paint( GetInfo() );
 
-        if( GetFnt()->IsURL() && pPor->InTxtGrp() )
+        if( GetFnt()->IsURL() && pPor->InTextGrp() )
             GetInfo().NotifyURL( *pPor );
 
         bFirst &= !pPor->GetLen();
@@ -1573,25 +1573,25 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
     SetPropFont( 0 );
 }
 
-static bool lcl_ExtractFieldFollow( SwLineLayout* pLine, SwLinePortion* &rpFld )
+static bool lcl_ExtractFieldFollow( SwLineLayout* pLine, SwLinePortion* &rpField )
 {
     SwLinePortion* pLast = pLine;
-    rpFld = pLine->GetPortion();
-    while( rpFld && !rpFld->InFldGrp() )
+    rpField = pLine->GetPortion();
+    while( rpField && !rpField->InFieldGrp() )
     {
-        pLast = rpFld;
-        rpFld = rpFld->GetPortion();
+        pLast = rpField;
+        rpField = rpField->GetPortion();
     }
-    bool bRet = rpFld != 0;
+    bool bRet = rpField != 0;
     if( bRet )
     {
-        if( static_cast<SwFldPortion*>(rpFld)->IsFollow() )
+        if( static_cast<SwFieldPortion*>(rpField)->IsFollow() )
         {
-            rpFld->Truncate();
+            rpField->Truncate();
             pLast->SetPortion( NULL );
         }
         else
-            rpFld = NULL;
+            rpField = NULL;
     }
     pLine->Truncate();
     return bRet;
@@ -1600,7 +1600,7 @@ static bool lcl_ExtractFieldFollow( SwLineLayout* pLine, SwLinePortion* &rpFld )
 // If a multi portion completely has to go to the
 // next line, this function is called to trunctate
 // the rest of the remaining multi portion
-static void lcl_TruncateMultiPortion( SwMultiPortion& rMulti, SwTxtFormatInfo& rInf,
+static void lcl_TruncateMultiPortion( SwMultiPortion& rMulti, SwTextFormatInfo& rInf,
                                sal_Int32 nStartIdx )
 {
     rMulti.GetRoot().Truncate();
@@ -1620,8 +1620,8 @@ static void lcl_TruncateMultiPortion( SwMultiPortion& rMulti, SwTxtFormatInfo& r
 
 // Manages the formatting of a SwMultiPortion. External, for the calling
 // function, it seems to be a normal Format-function, internal it is like a
-// SwTxtFrm::_Format with multiple BuildPortions
-bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
+// SwTextFrm::_Format with multiple BuildPortions
+bool SwTextFormatter::BuildMultiPortion( SwTextFormatInfo &rInf,
     SwMultiPortion& rMulti )
 {
     SwTwips nMaxWidth = rInf.Width();
@@ -1654,7 +1654,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
     if ( rMulti.IsBidi() )
     {
         // set layout mode
-        aLayoutModeModifier.Modify( ! rInf.GetTxtFrm()->IsRightToLeft() );
+        aLayoutModeModifier.Modify( ! rInf.GetTextFrm()->IsRightToLeft() );
     }
 
     SwTwips nTmpX = 0;
@@ -1681,15 +1681,15 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
             if (!pUpperFrm)
                 return false;
             const SwTableLine* pLine = static_cast<const SwRowFrm*>(pUpperFrm->GetUpper())->GetTabLine();
-            const SwFmtFrmSize& rFrmFmtSize = pLine->GetFrmFmt()->GetFrmSize();
-            if ( ATT_VAR_SIZE == rFrmFmtSize.GetHeightSizeType() )
+            const SwFormatFrmSize& rFrameFormatSize = pLine->GetFrameFormat()->GetFrmSize();
+            if ( ATT_VAR_SIZE == rFrameFormatSize.GetHeightSizeType() )
                 pUpperFrm = pPage;
         }
-        if ( pUpperFrm == pPage && !pFrm->IsInFtn() )
+        if ( pUpperFrm == pPage && !pFrm->IsInFootnote() )
             pUpperFrm = pPage->FindBodyCont();
 
         nMaxWidth = pUpperFrm ?
-                    ( rInf.GetTxtFrm()->IsVertical() ?
+                    ( rInf.GetTextFrm()->IsVertical() ?
                       pUpperFrm->Prt().Width() :
                       pUpperFrm->Prt().Height() ) :
                     USHRT_MAX;
@@ -1733,14 +1733,14 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
     }
 
     // save some values
-    const OUString* pOldTxt = &(rInf.GetTxt());
+    const OUString* pOldText = &(rInf.GetText());
     const SwTwips nOldPaintOfst = rInf.GetPaintOfst();
     std::shared_ptr<vcl::TextLayoutCache> const pOldCachedVclData(rInf.GetCachedVclData());
     rInf.SetCachedVclData(nullptr);
 
-    OUString const aMultiStr( rInf.GetTxt().copy(0, nMultiLen + rInf.GetIdx()) );
-    rInf.SetTxt( aMultiStr );
-    SwTxtFormatInfo aInf( rInf, rMulti.GetRoot(), nActWidth );
+    OUString const aMultiStr( rInf.GetText().copy(0, nMultiLen + rInf.GetIdx()) );
+    rInf.SetText( aMultiStr );
+    SwTextFormatInfo aInf( rInf, rMulti.GetRoot(), nActWidth );
     // Do we allow break cuts? The FirstMulti-Flag is evaluated during
     // line break determination.
     bool bFirstMulti = rInf.GetIdx() != rInf.GetLineStart();
@@ -1768,16 +1768,16 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
         aInf.RealWidth( sal_uInt16(nActWidth) );
         aInf.SetFirstMulti( bFirstMulti );
         aInf.SetNumDone( rInf.IsNumDone() );
-        aInf.SetFtnDone( rInf.IsFtnDone() );
+        aInf.SetFootnoteDone( rInf.IsFootnoteDone() );
 
         if( pFirstRest )
         {
-            OSL_ENSURE( pFirstRest->InFldGrp(), "BuildMulti: Fieldrest expected");
-            SwFldPortion *pFld =
-                static_cast<SwFldPortion*>(pFirstRest)->Clone(
-                    static_cast<SwFldPortion*>(pFirstRest)->GetExp() );
-            pFld->SetFollow( true );
-            aInf.SetRest( pFld );
+            OSL_ENSURE( pFirstRest->InFieldGrp(), "BuildMulti: Fieldrest expected");
+            SwFieldPortion *pField =
+                static_cast<SwFieldPortion*>(pFirstRest)->Clone(
+                    static_cast<SwFieldPortion*>(pFirstRest)->GetExp() );
+            pField->SetFollow( true );
+            aInf.SetRest( pField );
         }
         aInf.SetRuby( rMulti.IsRuby() && rMulti.OnTop() );
 
@@ -1812,18 +1812,18 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
             pCurr = pCurr->GetNext();
             nStart = aInf.GetIdx();
             aInf.X( nTmpX );
-            SwTxtFormatInfo aTmp( aInf, *pCurr, nActWidth );
+            SwTextFormatInfo aTmp( aInf, *pCurr, nActWidth );
             if( rMulti.IsRuby() )
             {
                 aTmp.SetRuby( !rMulti.OnTop() );
                 pNextFirst = aInf.GetRest();
                 if( pSecondRest )
                 {
-                    OSL_ENSURE( pSecondRest->InFldGrp(), "Fieldrest expected");
-                    SwFldPortion *pFld = static_cast<SwFldPortion*>(pSecondRest)->Clone(
-                                    static_cast<SwFldPortion*>(pSecondRest)->GetExp() );
-                    pFld->SetFollow( true );
-                    aTmp.SetRest( pFld );
+                    OSL_ENSURE( pSecondRest->InFieldGrp(), "Fieldrest expected");
+                    SwFieldPortion *pField = static_cast<SwFieldPortion*>(pSecondRest)->Clone(
+                                    static_cast<SwFieldPortion*>(pSecondRest)->GetExp() );
+                    pField->SetFollow( true );
+                    aTmp.SetRest( pField );
                 }
                 if( !rMulti.OnTop() && nFirstLen < nMultiLen )
                     bRet = true;
@@ -1867,7 +1867,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
             nActWidth = ( 3 * nMaxWidth + nMinWidth + 3 ) / 4;
             if ( nActWidth == nMaxWidth && rInf.GetLineStart() == rInf.GetIdx() )
             // we have too less space, we must allow break cuts
-            // ( the first multi flag is considered during TxtPortion::_Format() )
+            // ( the first multi flag is considered during TextPortion::_Format() )
                 bFirstMulti = false;
             if( nActWidth <= nMinWidth )
                 break;
@@ -1876,7 +1876,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
         {
             // For Solaris, this optimization can causes trouble:
             // Setting this to the portion width ( = rMulti.Width() )
-            // can make GetTextBreak inside SwTxtGuess::Guess return to small
+            // can make GetTextBreak inside SwTextGuess::Guess return to small
             // values. Therefore we add some extra twips.
             if( nActWidth > nTmpX + rMulti.Width() + 6 )
                 nActWidth = nTmpX + rMulti.Width() + 6;
@@ -1966,7 +1966,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
     // line break has to be performed!
     if( bRet )
     {
-        OSL_ENSURE( !pNextFirst || pNextFirst->InFldGrp(),
+        OSL_ENSURE( !pNextFirst || pNextFirst->InFieldGrp(),
             "BuildMultiPortion: Surprising restportion, field expected" );
         SwMultiPortion *pTmp;
         if( rMulti.IsDouble() )
@@ -1974,7 +1974,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
                                             nMultiLen + rInf.GetIdx() );
         else if( rMulti.IsRuby() )
         {
-            OSL_ENSURE( !pNextSecond || pNextSecond->InFldGrp(),
+            OSL_ENSURE( !pNextSecond || pNextSecond->InFieldGrp(),
                 "BuildMultiPortion: Surprising restportion, field expected" );
 
             if ( rInf.GetIdx() == rInf.GetLineStart() )
@@ -1988,7 +1988,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
                     pTmp->GetRoot().SetNext( new SwLineLayout() );
                     pTmp->GetRoot().GetNext()->SetPortion( pNextSecond );
                 }
-                pTmp->SetFollowFld();
+                pTmp->SetFollowField();
             }
             else
             {
@@ -2044,7 +2044,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
 
         if( pNextFirst && pTmp )
         {
-            pTmp->SetFollowFld();
+            pTmp->SetFollowField();
             pTmp->GetRoot().SetPortion( pNextFirst );
         }
         else
@@ -2056,11 +2056,11 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
     }
 
     rInf.SetCachedVclData(pOldCachedVclData);
-    rInf.SetTxt( *pOldTxt );
+    rInf.SetText( *pOldText );
     rInf.SetPaintOfst( nOldPaintOfst );
     rInf.SetStop( aInf.IsStop() );
     rInf.SetNumDone( true );
-    rInf.SetFtnDone( true );
+    rInf.SetFootnoteDone( true );
     SeekAndChg( rInf );
     delete pFirstRest;
     delete pSecondRest;
@@ -2080,7 +2080,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
 // restportion. This may be a multiportion, e.g. if the field is surrounded by
 // a doubleline- or ruby-portion.
 // The second parameter is the start index of the line.
-SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine,
+SwLinePortion* SwTextFormatter::MakeRestPortion( const SwLineLayout* pLine,
     sal_Int32 nPosition )
 {
     if( !nPosition )
@@ -2089,7 +2089,7 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine,
     const SwMultiPortion *pTmpMulti = NULL;
     const SwMultiPortion *pHelpMulti = NULL;
     const SwLinePortion* pPor = pLine->GetFirstPortion();
-    SwFldPortion *pFld = NULL;
+    SwFieldPortion *pField = NULL;
     while( pPor )
     {
         if( pPor->GetLen() )
@@ -2100,18 +2100,18 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine,
                 pTmpMulti = NULL;
             }
         }
-        if( pPor->InFldGrp() )
+        if( pPor->InFieldGrp() )
         {
             if( !pHelpMulti )
                 pTmpMulti = NULL;
-            pFld = const_cast<SwFldPortion*>(static_cast<const SwFldPortion*>(pPor));
+            pField = const_cast<SwFieldPortion*>(static_cast<const SwFieldPortion*>(pPor));
         }
         else if( pPor->IsMultiPortion() )
         {
             OSL_ENSURE( !pHelpMulti || pHelpMulti->IsBidi(),
                     "Nested multiportions are forbidden." );
 
-            pFld = NULL;
+            pField = NULL;
             pTmpMulti = static_cast<const SwMultiPortion*>(pPor);
         }
         pPor = pPor->GetPortion();
@@ -2141,20 +2141,20 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine,
             }
         }
     }
-    if( pFld && !pFld->HasFollow() )
-        pFld = NULL;
+    if( pField && !pField->HasFollow() )
+        pField = NULL;
 
     SwLinePortion *pRest = NULL;
-    if( pFld )
+    if( pField )
     {
-        const SwTxtAttr *pHint = GetAttr( nPosition - 1 );
+        const SwTextAttr *pHint = GetAttr( nPosition - 1 );
         if ( pHint
              && ( pHint->Which() == RES_TXTATR_FIELD
                   || pHint->Which() == RES_TXTATR_ANNOTATION ) )
         {
-            pRest = NewFldPortion( GetInfo(), pHint );
-            if( pRest->InFldGrp() )
-                static_cast<SwFldPortion*>(pRest)->TakeNextOffset( pFld );
+            pRest = NewFieldPortion( GetInfo(), pHint );
+            if( pRest->InFieldGrp() )
+                static_cast<SwFieldPortion*>(pRest)->TakeNextOffset( pField );
             else
             {
                 delete pRest;
@@ -2204,7 +2204,7 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine,
             }
 
             pTmp = new SwRubyPortion( *pCreate, *GetInfo().GetFont(),
-                                      *pFrm->GetTxtNode()->getIDocumentSettingAccess(),
+                                      *pFrm->GetTextNode()->getIDocumentSettingAccess(),
                                        nMultiPos, static_cast<const SwRubyPortion*>(pHelpMulti)->GetRubyOffset(),
                                        pRubyPos );
         }
@@ -2216,7 +2216,7 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine,
             return pRest;
         }
         delete pCreate;
-        pTmp->SetFollowFld();
+        pTmp->SetFollowField();
         if( pRest )
         {
             SwLineLayout *pLay = &pTmp->GetRoot();
@@ -2233,65 +2233,65 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine,
     return pRest;
 }
 
-// SwTxtCursorSave notes the start and current line of a SwTxtCursor,
+// SwTextCursorSave notes the start and current line of a SwTextCursor,
 // sets them to the values for GetCrsrOfst inside a multiportion
 // and restores them in the destructor.
-SwTxtCursorSave::SwTxtCursorSave( SwTxtCursor* pTxtCursor,
+SwTextCursorSave::SwTextCursorSave( SwTextCursor* pTextCursor,
                                   SwMultiPortion* pMulti,
                                   SwTwips nY,
                                   sal_uInt16& nX,
                                   sal_Int32 nCurrStart,
                                   long nSpaceAdd )
 {
-    pTxtCrsr = pTxtCursor;
-    nStart = pTxtCursor->nStart;
-    pTxtCursor->nStart = nCurrStart;
-    pCurr = pTxtCursor->pCurr;
-    pTxtCursor->pCurr = &pMulti->GetRoot();
-    while( pTxtCursor->Y() + pTxtCursor->GetLineHeight() < nY &&
-        pTxtCursor->Next() )
+    pTextCrsr = pTextCursor;
+    nStart = pTextCursor->nStart;
+    pTextCursor->nStart = nCurrStart;
+    pCurr = pTextCursor->pCurr;
+    pTextCursor->pCurr = &pMulti->GetRoot();
+    while( pTextCursor->Y() + pTextCursor->GetLineHeight() < nY &&
+        pTextCursor->Next() )
         ; // nothing
-    nWidth = pTxtCursor->pCurr->Width();
-    nOldProp = pTxtCursor->GetPropFont();
+    nWidth = pTextCursor->pCurr->Width();
+    nOldProp = pTextCursor->GetPropFont();
 
     if ( pMulti->IsDouble() || pMulti->IsBidi() )
     {
-        bSpaceChg = pMulti->ChgSpaceAdd( pTxtCursor->pCurr, nSpaceAdd );
+        bSpaceChg = pMulti->ChgSpaceAdd( pTextCursor->pCurr, nSpaceAdd );
 
         sal_Int32 nSpaceCnt;
         if ( pMulti->IsDouble() )
         {
-            pTxtCursor->SetPropFont( 50 );
+            pTextCursor->SetPropFont( 50 );
             nSpaceCnt = static_cast<SwDoubleLinePortion*>(pMulti)->GetSpaceCnt();
         }
         else
         {
-            const sal_Int32 nOldIdx = pTxtCursor->GetInfo().GetIdx();
-            pTxtCursor->GetInfo().SetIdx ( nCurrStart );
-            nSpaceCnt = static_cast<SwBidiPortion*>(pMulti)->GetSpaceCnt(pTxtCursor->GetInfo());
-            pTxtCursor->GetInfo().SetIdx ( nOldIdx );
+            const sal_Int32 nOldIdx = pTextCursor->GetInfo().GetIdx();
+            pTextCursor->GetInfo().SetIdx ( nCurrStart );
+            nSpaceCnt = static_cast<SwBidiPortion*>(pMulti)->GetSpaceCnt(pTextCursor->GetInfo());
+            pTextCursor->GetInfo().SetIdx ( nOldIdx );
         }
 
         if( nSpaceAdd > 0 && !pMulti->HasTabulator() )
-            pTxtCursor->pCurr->Width( static_cast<sal_uInt16>(nWidth + nSpaceAdd * nSpaceCnt / SPACING_PRECISION_FACTOR ) );
+            pTextCursor->pCurr->Width( static_cast<sal_uInt16>(nWidth + nSpaceAdd * nSpaceCnt / SPACING_PRECISION_FACTOR ) );
 
         // For a BidiPortion we have to calculate the offset from the
         // end of the portion
         if ( nX && pMulti->IsBidi() )
-            nX = pTxtCursor->pCurr->Width() - nX;
+            nX = pTextCursor->pCurr->Width() - nX;
     }
     else
         bSpaceChg = false;
 }
 
-SwTxtCursorSave::~SwTxtCursorSave()
+SwTextCursorSave::~SwTextCursorSave()
 {
     if( bSpaceChg )
-        SwDoubleLinePortion::ResetSpaceAdd( pTxtCrsr->pCurr );
-    pTxtCrsr->pCurr->Width( nWidth );
-    pTxtCrsr->pCurr = pCurr;
-    pTxtCrsr->nStart = nStart;
-    pTxtCrsr->SetPropFont( nOldProp );
+        SwDoubleLinePortion::ResetSpaceAdd( pTextCrsr->pCurr );
+    pTextCrsr->pCurr->Width( nWidth );
+    pTextCrsr->pCurr = pCurr;
+    pTextCrsr->nStart = nStart;
+    pTextCrsr->SetPropFont( nOldProp );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 67071a8245bb..f78baddd1ffa 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -22,12 +22,12 @@
 #include "porlay.hxx"
 #include "porexp.hxx"
 
-class SwTxtFormatInfo;
-class SwFldPortion;
-class SwTxtCursor;
+class SwTextFormatInfo;
+class SwFieldPortion;
+class SwTextCursor;
 class SwLineLayout;
-class SwTxtPaintInfo;
-class SwTxtAttr;
+class SwTextPaintInfo;
+class SwTextAttr;
 class SfxPoolItem;
 class SwFont;
 
@@ -43,7 +43,7 @@ class SwFont;
 
 struct SwMultiCreator
 {
-    const SwTxtAttr* pAttr;
+    const SwTextAttr* pAttr;
     const SfxPoolItem* pItem;
     sal_uInt8 nId;
     sal_uInt8 nLevel;
@@ -73,7 +73,7 @@ struct SwBracket
 class SwMultiPortion : public SwLinePortion
 {
     SwLineLayout aRoot;     // One or more lines
-    SwFldPortion *pFldRest; // Field rest from the previous line
+    SwFieldPortion *pFieldRest; // Field rest from the previous line
     bool bTab1      :1;     // First line tabulator
     bool bTab2      :1;     // Second line includes tabulator
     bool bDouble    :1;     // Double line
@@ -81,12 +81,12 @@ class SwMultiPortion : public SwLinePortion
     bool bBidi      :1;
     bool bTop       :1;     // Phonetic position
     bool bFormatted :1;     // Already formatted
-    bool bFollowFld :1;     // Field follow inside
-    bool bFlyInCntnt:1;     // Fly as character inside
+    bool bFollowField :1;     // Field follow inside
+    bool bFlyInContent:1;     // Fly as character inside
     sal_uInt8 nDirection:2; // Direction (0/90/180/270 degrees)
 protected:
     explicit SwMultiPortion(sal_Int32 nEnd)
-        : pFldRest(0)
+        : pFieldRest(0)
         , bTab1(false)
         , bTab2(false)
         , bDouble(false)
@@ -94,8 +94,8 @@ protected:
         , bBidi(false)
         , bTop(false)
         , bFormatted(false)
-        , bFollowFld(false)
-        , bFlyInCntnt(false)
+        , bFollowField(false)
+        , bFlyInContent(false)
         , nDirection(0)
     {
         SetWhichPor(POR_MULTI);
@@ -114,28 +114,28 @@ public:
     virtual ~SwMultiPortion();
     const SwLineLayout& GetRoot() const { return aRoot; }
     SwLineLayout& GetRoot() { return aRoot; }
-    SwFldPortion* GetFldRest() { return pFldRest; }
-    void SetFldRest( SwFldPortion* pNew ) { pFldRest = pNew; }
+    SwFieldPortion* GetFieldRest() { return pFieldRest; }
+    void SetFieldRest( SwFieldPortion* pNew ) { pFieldRest = pNew; }
 
     inline bool HasTabulator() const { return bTab1 || bTab2; }
     inline bool IsFormatted() const { return bFormatted; }
     inline void SetFormatted() { bFormatted = true; }
-    inline bool IsFollowFld() const { return bFollowFld; }
-    inline void SetFollowFld() { bFollowFld = true; }
-    inline bool HasFlyInCntnt() const { return bFlyInCntnt; }
-    inline void SetFlyInCntnt( bool bNew ) { bFlyInCntnt = bNew; }
+    inline bool IsFollowField() const { return bFollowField; }
+    inline void SetFollowField() { bFollowField = true; }
+    inline bool HasFlyInContent() const { return bFlyInContent; }
+    inline void SetFlyInContent( bool bNew ) { bFlyInContent = bNew; }
     inline bool IsDouble() const { return bDouble; }
     inline bool IsRuby() const { return bRuby; }
     inline bool IsBidi() const { return bBidi; }
     inline bool OnTop() const { return bTop; }
     void ActualizeTabulator();
 
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
     virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const;
 
     // Summarize the internal lines to calculate the (external) size
-    void CalcSize( SwTxtFormatter& rLine, SwTxtFormatInfo &rInf );
+    void CalcSize( SwTextFormatter& rLine, SwTextFormatInfo &rInf );
 
     inline bool HasBrackets() const;
     inline bool HasRotation() const { return 0 != (1 & nDirection); }
@@ -163,15 +163,15 @@ public:
 
     inline SwBracket* GetBrackets() const { return pBracket; }
     void SetBrackets( const SwDoubleLinePortion& rDouble );
-    void PaintBracket( SwTxtPaintInfo& rInf, long nSpaceAdd, bool bOpen ) const;
-    void FormatBrackets( SwTxtFormatInfo &rInf, SwTwips& nMaxWidth );
+    void PaintBracket( SwTextPaintInfo& rInf, long nSpaceAdd, bool bOpen ) const;
+    void FormatBrackets( SwTextFormatInfo &rInf, SwTwips& nMaxWidth );
     inline sal_uInt16 PreWidth() const { return pBracket->nPreWidth; };
     inline sal_uInt16 PostWidth() const { return pBracket->nPostWidth; }
     inline void ClearBrackets()
         { pBracket->nPreWidth = pBracket->nPostWidth=0; Width( 0 ); }
     inline sal_uInt16 BracketWidth(){ return PreWidth() + PostWidth(); }
 
-    void CalcBlanks( SwTxtFormatInfo &rInf );
+    void CalcBlanks( SwTextFormatInfo &rInf );
     static void ResetSpaceAdd( SwLineLayout* pCurr );
     inline SwTwips GetLineDiff() const { return nLineDiff; }
     inline sal_Int32 GetSpaceCnt() const
@@ -181,7 +181,7 @@ public:
     inline sal_Int32 GetBlank1() const { return nBlank1; }
     inline sal_Int32 GetBlank2() const { return nBlank2; }
 
-    virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
     virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE;
 };
 
@@ -189,7 +189,7 @@ class SwRubyPortion : public SwMultiPortion
 {
     sal_Int32 nRubyOffset;
     sal_uInt16 nAdjustment;
-    void _Adjust( SwTxtFormatInfo &rInf);
+    void _Adjust( SwTextFormatInfo &rInf);
 public:
     SwRubyPortion( const SwRubyPortion& rRuby, sal_Int32 nEnd );
 
@@ -199,7 +199,7 @@ public:
                    const bool* pForceRubyPos );
 
     void CalcRubyOffset();
-    inline void Adjust( SwTxtFormatInfo &rInf )
+    inline void Adjust( SwTextFormatInfo &rInf )
         { if(nAdjustment && GetRoot().GetNext()) _Adjust(rInf); }
     inline sal_uInt16 GetAdjustment() const { return nAdjustment; }
     inline sal_Int32 GetRubyOffset() const { return nRubyOffset; }
@@ -223,27 +223,27 @@ public:
 
     inline sal_uInt8 GetLevel() const { return nLevel; }
     // Get number of blanks for justified alignment
-    sal_Int32 GetSpaceCnt( const SwTxtSizeInfo &rInf ) const;
+    sal_Int32 GetSpaceCnt( const SwTextSizeInfo &rInf ) const;
     // Calculates extra spacing based on number of blanks
-    virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
     // Manipulate the spacing array at pCurr
     virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE;
 };
 
 // For cursor travelling in multiportions
 
-class SwTxtCursorSave
+class SwTextCursorSave
 {
-    SwTxtCursor* pTxtCrsr;
+    SwTextCursor* pTextCrsr;
     SwLineLayout* pCurr;
     sal_Int32 nStart;
     sal_uInt16 nWidth;
     sal_uInt8 nOldProp;
     bool bSpaceChg;
 public:
-    SwTxtCursorSave( SwTxtCursor* pTxtCursor, SwMultiPortion* pMulti,
+    SwTextCursorSave( SwTextCursor* pTextCursor, SwMultiPortion* pMulti,
         SwTwips nY, sal_uInt16& nX, sal_Int32 nCurrStart, long nSpaceAdd );
-    ~SwTxtCursorSave();
+    ~SwTextCursorSave();
 };
 
 inline bool SwMultiPortion::HasBrackets() const
diff --git a/sw/source/core/text/porref.cxx b/sw/source/core/text/porref.cxx
index 1f17acc7acbe..8e8e11aa5738 100644
--- a/sw/source/core/text/porref.cxx
+++ b/sw/source/core/text/porref.cxx
@@ -23,12 +23,12 @@
 #include "porref.hxx"
 #include "inftxt.hxx"
 
-void SwRefPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwRefPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( Width() )
     {
         rInf.DrawViewOpt( *this, POR_REF );
-        SwTxtPortion::Paint( rInf );
+        SwTextPortion::Paint( rInf );
     }
 }
 
@@ -40,7 +40,7 @@ SwIsoRefPortion::SwIsoRefPortion() : nViewWidth(0)
     SetWhichPor( POR_ISOREF );
 }
 
-sal_uInt16 SwIsoRefPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
+sal_uInt16 SwIsoRefPortion::GetViewWidth( const SwTextSizeInfo &rInf ) const
 {
     // Although we are const, nViewWidth should be calculated in the last
     // moment possible
@@ -49,19 +49,19 @@ sal_uInt16 SwIsoRefPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
             !rInf.GetOpt().IsReadonly() && !rInf.GetOpt().IsPagePreview() )
     {
         if( !nViewWidth )
-            pThis->nViewWidth = rInf.GetTxtSize(OUString(' ')).Width();
+            pThis->nViewWidth = rInf.GetTextSize(OUString(' ')).Width();
     }
     else
         pThis->nViewWidth = 0;
     return nViewWidth;
 }
 
-bool SwIsoRefPortion::Format( SwTxtFormatInfo &rInf )
+bool SwIsoRefPortion::Format( SwTextFormatInfo &rInf )
 {
     return SwLinePortion::Format( rInf );
 }
 
-void SwIsoRefPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwIsoRefPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( Width() )
         rInf.DrawViewOpt( *this, POR_REF );
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index e3ed4d9c39d0..8035d7f462c2 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.hxx
@@ -21,11 +21,11 @@
 
 #include "portxt.hxx"
 
-class SwRefPortion : public SwTxtPortion
+class SwRefPortion : public SwTextPortion
 {
 public:
     inline  SwRefPortion(){ SetWhichPor( POR_REF ); }
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
     OUTPUT_OPERATOR_OVERRIDE
 };
 
@@ -35,10 +35,10 @@ class SwIsoRefPortion : public SwRefPortion
 
 public:
             SwIsoRefPortion();
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
     virtual SwLinePortion *Compress() SAL_OVERRIDE;
-    virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index d9d4fb922cc1..aadea9a52914 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -57,7 +57,7 @@ SwTmpEndPortion::SwTmpEndPortion( const SwLinePortion &rPortion )
     SetWhichPor( POR_TMPEND );
 }
 
-void SwTmpEndPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwTmpEndPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if (rInf.OnWin() && rInf.GetOpt().IsParagraph())
     {
@@ -65,12 +65,12 @@ void SwTmpEndPortion::Paint( const SwTxtPaintInfo &rInf ) const
 
         SwFont aFont(*pOldFnt);
         aFont.SetColor(NON_PRINTING_CHARACTER_COLOR);
-        const_cast<SwTxtPaintInfo&>(rInf).SetFont(&aFont);
+        const_cast<SwTextPaintInfo&>(rInf).SetFont(&aFont);
 
         // draw the pilcrow
         rInf.DrawText(OUString(CH_PAR), *this);
 
-        const_cast<SwTxtPaintInfo&>(rInf).SetFont(const_cast<SwFont*>(pOldFnt));
+        const_cast<SwTextPaintInfo&>(rInf).SetFont(const_cast<SwFont*>(pOldFnt));
     }
 }
 
@@ -84,25 +84,25 @@ SwBreakPortion::SwBreakPortion( const SwLinePortion &rPortion )
 sal_Int32 SwBreakPortion::GetCrsrOfst( const sal_uInt16 ) const
 { return 0; }
 
-sal_uInt16 SwBreakPortion::GetViewWidth( const SwTxtSizeInfo & ) const
+sal_uInt16 SwBreakPortion::GetViewWidth( const SwTextSizeInfo & ) const
 { return 0; }
 
 SwLinePortion *SwBreakPortion::Compress()
-{ return (GetPortion() && GetPortion()->InTxtGrp() ? 0 : this); }
+{ return (GetPortion() && GetPortion()->InTextGrp() ? 0 : this); }
 
-void SwBreakPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwBreakPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( rInf.OnWin() && rInf.GetOpt().IsLineBreak() )
         rInf.DrawLineBreak( *this );
 }
 
-bool SwBreakPortion::Format( SwTxtFormatInfo &rInf )
+bool SwBreakPortion::Format( SwTextFormatInfo &rInf )
 {
     const SwLinePortion *pRoot = rInf.GetRoot();
     Width( 0 );
     Height( pRoot->Height() );
     SetAscent( pRoot->GetAscent() );
-    if ( rInf.GetIdx()+1 == rInf.GetTxt().getLength() )
+    if ( rInf.GetIdx()+1 == rInf.GetText().getLength() )
         rInf.SetNewLine( true );
     return true;
 }
@@ -135,7 +135,7 @@ SwKernPortion::SwKernPortion( const SwLinePortion& rPortion ) :
     SetWhichPor( POR_KERN );
 }
 
-void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwKernPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( Width() )
     {
@@ -151,18 +151,18 @@ void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const
 
         if( rInf.GetFont()->IsPaintBlank() )
         {
-            OUString aTxtDouble("  ");
+            OUString aTextDouble("  ");
 
             SwRect aClipRect;
             rInf.CalcRect( *this, &aClipRect, 0 );
             SwSaveClip aClip( const_cast<OutputDevice*>(rInf.GetOut()) );
             aClip.ChgClip( aClipRect, 0 );
-            rInf.DrawText( aTxtDouble, *this, 0, 2, true );
+            rInf.DrawText( aTextDouble, *this, 0, 2, true );
         }
     }
 }
 
-void SwKernPortion::FormatEOL( SwTxtFormatInfo &rInf )
+void SwKernPortion::FormatEOL( SwTextFormatInfo &rInf )
 {
     if ( bGridKern )
         return;
@@ -185,32 +185,32 @@ SwArrowPortion::SwArrowPortion( const SwLinePortion &rPortion ) :
     SetWhichPor( POR_ARROW );
 }
 
-SwArrowPortion::SwArrowPortion( const SwTxtPaintInfo &rInf )
+SwArrowPortion::SwArrowPortion( const SwTextPaintInfo &rInf )
     : bLeft( false )
 {
-    Height( (sal_uInt16)(rInf.GetTxtFrm()->Prt().Height()) );
-    aPos.X() = rInf.GetTxtFrm()->Frm().Left() +
-               rInf.GetTxtFrm()->Prt().Right();
-    aPos.Y() = rInf.GetTxtFrm()->Frm().Top() +
-               rInf.GetTxtFrm()->Prt().Bottom();
+    Height( (sal_uInt16)(rInf.GetTextFrm()->Prt().Height()) );
+    aPos.X() = rInf.GetTextFrm()->Frm().Left() +
+               rInf.GetTextFrm()->Prt().Right();
+    aPos.Y() = rInf.GetTextFrm()->Frm().Top() +
+               rInf.GetTextFrm()->Prt().Bottom();
     SetWhichPor( POR_ARROW );
 }
 
-void SwArrowPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwArrowPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     const_cast<SwArrowPortion*>(this)->aPos = rInf.GetPos();
 }
 
 SwLinePortion *SwArrowPortion::Compress() { return this; }
 
-SwTwips SwTxtFrm::EmptyHeight() const
+SwTwips SwTextFrm::EmptyHeight() const
 {
     if (IsCollapse()) {
         SwViewShell *pSh = getRootFrm()->GetCurrShell();
         if ( pSh->IsA( TYPE(SwCrsrShell) ) ) {
             SwCrsrShell *pCrSh = static_cast<SwCrsrShell*>(pSh);
-            SwCntntFrm *pCurrFrm=pCrSh->GetCurrFrm();
-            if (pCurrFrm==(SwCntntFrm*)this) {
+            SwContentFrm *pCurrFrm=pCrSh->GetCurrFrm();
+            if (pCurrFrm==(SwContentFrm*)this) {
                 // do nothing
             } else {
                 return 1;
@@ -219,20 +219,20 @@ SwTwips SwTxtFrm::EmptyHeight() const
             return 1;
         }
     }
-    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::EmptyHeight with swapped frame" );
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTextFrm::EmptyHeight with swapped frame" );
 
     SwFont *pFnt;
-    const SwTxtNode& rTxtNode = *GetTxtNode();
-    const IDocumentSettingAccess* pIDSA = rTxtNode.getIDocumentSettingAccess();
+    const SwTextNode& rTextNode = *GetTextNode();
+    const IDocumentSettingAccess* pIDSA = rTextNode.getIDocumentSettingAccess();
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
-    if ( rTxtNode.HasSwAttrSet() )
+    if ( rTextNode.HasSwAttrSet() )
     {
-        const SwAttrSet *pAttrSet = &( rTxtNode.GetSwAttrSet() );
+        const SwAttrSet *pAttrSet = &( rTextNode.GetSwAttrSet() );
         pFnt = new SwFont( pAttrSet, pIDSA );
     }
     else
     {
-        SwFontAccess aFontAccess( &rTxtNode.GetAnyFmtColl(), pSh);
+        SwFontAccess aFontAccess( &rTextNode.GetAnyFormatColl(), pSh);
         pFnt = new SwFont( aFontAccess.Get()->GetFont() );
         pFnt->ChkMagic( pSh, pFnt->GetActual() );
     }
@@ -244,19 +244,19 @@ SwTwips SwTxtFrm::EmptyHeight() const
     if ( !pOut || !pSh->GetViewOptions()->getBrowseMode() ||
          pSh->GetViewOptions()->IsPrtFormat() )
     {
-        pOut = rTxtNode.getIDocumentDeviceAccess()->getReferenceDevice(true);
+        pOut = rTextNode.getIDocumentDeviceAccess()->getReferenceDevice(true);
     }
 
-    const IDocumentRedlineAccess* pIDRA = rTxtNode.getIDocumentRedlineAccess();
+    const IDocumentRedlineAccess* pIDRA = rTextNode.getIDocumentRedlineAccess();
     if( IDocumentRedlineAccess::IsShowChanges( pIDRA->GetRedlineMode() ) )
     {
-        const sal_uInt16 nRedlPos = pIDRA->GetRedlinePos( rTxtNode, USHRT_MAX );
+        const sal_uInt16 nRedlPos = pIDRA->GetRedlinePos( rTextNode, USHRT_MAX );
         if( USHRT_MAX != nRedlPos )
         {
             SwAttrHandler aAttrHandler;
-            aAttrHandler.Init(  GetTxtNode()->GetSwAttrSet(),
-                               *GetTxtNode()->getIDocumentSettingAccess(), NULL );
-            SwRedlineItr aRedln( rTxtNode, *pFnt, aAttrHandler,
+            aAttrHandler.Init(  GetTextNode()->GetSwAttrSet(),
+                               *GetTextNode()->getIDocumentSettingAccess(), NULL );
+            SwRedlineItr aRedln( rTextNode, *pFnt, aAttrHandler,
                                  nRedlPos, true );
         }
     }
@@ -276,18 +276,18 @@ SwTwips SwTxtFrm::EmptyHeight() const
     return nRet;
 }
 
-bool SwTxtFrm::FormatEmpty()
+bool SwTextFrm::FormatEmpty()
 {
-    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::FormatEmpty with swapped frame" );
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTextFrm::FormatEmpty with swapped frame" );
 
     bool bCollapse = EmptyHeight( ) == 1 && this->IsCollapse( );
 
-    if ( HasFollow() || GetTxtNode()->GetpSwpHints() ||
-        0 != GetTxtNode()->GetNumRule() ||
-        GetTxtNode()->HasHiddenCharAttribute( true ) ||
-         IsInFtn() || ( HasPara() && GetPara()->IsPrepMustFit() ) )
+    if ( HasFollow() || GetTextNode()->GetpSwpHints() ||
+        0 != GetTextNode()->GetNumRule() ||
+        GetTextNode()->HasHiddenCharAttribute( true ) ||
+         IsInFootnote() || ( HasPara() && GetPara()->IsPrepMustFit() ) )
         return false;
-    const SwAttrSet& aSet = GetTxtNode()->GetSwAttrSet();
+    const SwAttrSet& aSet = GetTextNode()->GetSwAttrSet();
     const SvxAdjust nAdjust = aSet.GetAdjust().GetAdjust();
     if( !bCollapse && ( ( ( ! IsRightToLeft() && ( SVX_ADJUST_LEFT != nAdjust ) ) ||
           (   IsRightToLeft() && ( SVX_ADJUST_RIGHT != nAdjust ) ) ) ||
@@ -299,16 +299,16 @@ bool SwTxtFrm::FormatEmpty()
         aSet.GetLRSpace().IsAutoFirst() ) )
         return false;
 
-    SwTxtFly aTxtFly( this );
+    SwTextFly aTextFly( this );
     SwRect aRect;
     bool bFirstFlyCheck = 0 != Prt().Height();
     if ( !bCollapse && bFirstFlyCheck &&
-            aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) )
+            aTextFly.IsOn() && aTextFly.IsAnyObj( aRect ) )
         return false;
 
     SwTwips nHeight = EmptyHeight();
 
-    if ( GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() &&
+    if ( GetTextNode()->GetSwAttrSet().GetParaGrid().GetValue() &&
             IsInDocBody() )
     {
         SwTextGridItem const*const pGrid(GetGridItem(FindPageFrm()));
@@ -335,7 +335,7 @@ bool SwTxtFrm::FormatEmpty()
         SetCompletePaint();
     }
     if( !bCollapse && !bFirstFlyCheck &&
-            aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) )
+            aTextFly.IsOn() && aTextFly.IsAnyObj( aRect ) )
         return false;
 
     // #i35635# - call method <HideAndShowObjects()>
@@ -345,7 +345,7 @@ bool SwTxtFrm::FormatEmpty()
     return true;
 }
 
-bool SwTxtFrm::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff )
+bool SwTextFrm::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff )
 {
     const SwFrm *pFrm = this;
     rRegDiff = 0;
@@ -365,10 +365,10 @@ bool SwTxtFrm::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff )
                 rRegDiff = pDesc->GetRegHeight();
                 if( !rRegDiff )
                 {
-                    const SwTxtFmtColl *pFmt = pDesc->GetRegisterFmtColl();
-                    if( pFmt )
+                    const SwTextFormatColl *pFormat = pDesc->GetRegisterFormatColl();
+                    if( pFormat )
                     {
-                        const SvxLineSpacingItem &rSpace = pFmt->GetLineSpacing();
+                        const SvxLineSpacingItem &rSpace = pFormat->GetLineSpacing();
                         if( SVX_LINE_SPACE_FIX == rSpace.GetLineSpaceRule() )
                         {
                             rRegDiff = rSpace.GetLineHeight();
@@ -378,13 +378,13 @@ bool SwTxtFrm::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff )
                         else
                         {
                             SwViewShell *pSh = getRootFrm()->GetCurrShell();
-                            SwFontAccess aFontAccess( pFmt, pSh );
+                            SwFontAccess aFontAccess( pFormat, pSh );
                             SwFont aFnt( aFontAccess.Get()->GetFont() );
 
                             OutputDevice *pOut = 0;
                             if( !pSh || !pSh->GetViewOptions()->getBrowseMode() ||
                                 pSh->GetViewOptions()->IsPrtFormat() )
-                                pOut = GetTxtNode()->getIDocumentDeviceAccess()->getReferenceDevice( true );
+                                pOut = GetTextNode()->getIDocumentDeviceAccess()->getReferenceDevice( true );
 
                             if( pSh && !pOut )
                                 pOut = pSh->GetWin();
@@ -455,7 +455,7 @@ bool SwTxtFrm::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff )
     return ( 0 != rRegDiff );
 }
 
-void SwHiddenTextPortion::Paint( const SwTxtPaintInfo & rInf) const
+void SwHiddenTextPortion::Paint( const SwTextPaintInfo & rInf) const
 {
     (void)rInf;
 #ifdef DBG_UTIL
@@ -472,15 +472,15 @@ void SwHiddenTextPortion::Paint( const SwTxtPaintInfo & rInf) const
 #endif
 }
 
-bool SwHiddenTextPortion::Format( SwTxtFormatInfo &rInf )
+bool SwHiddenTextPortion::Format( SwTextFormatInfo &rInf )
 {
     Width( 0 );
-    rInf.GetTxtFrm()->HideFootnotes( rInf.GetIdx(), rInf.GetIdx() + GetLen() );
+    rInf.GetTextFrm()->HideFootnotes( rInf.GetIdx(), rInf.GetIdx() + GetLen() );
 
     return false;
 };
 
-void SwControlCharPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwControlCharPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if ( Width() )  // is only set during prepaint mode
     {
@@ -504,27 +504,27 @@ void SwControlCharPortion::Paint( const SwTxtPaintInfo &rInf ) const
                 case CHAR_ZWSP :
                     aOutString = "/"; break;
 //                case CHAR_LRM :
-//                    rTxt = sal_Unicode(0x2514); break;
+//                    rText = sal_Unicode(0x2514); break;
 //                case CHAR_RLM :
-//                    rTxt = sal_Unicode(0x2518); break;
+//                    rText = sal_Unicode(0x2518); break;
             }
 
             if ( !mnHalfCharWidth )
-                mnHalfCharWidth = rInf.GetTxtSize( aOutString ).Width() / 2;
+                mnHalfCharWidth = rInf.GetTextSize( aOutString ).Width() / 2;
 
             Point aOldPos = rInf.GetPos();
             Point aNewPos( aOldPos );
             aNewPos.X() = aNewPos.X() + ( Width() / 2 ) - mnHalfCharWidth;
-            const_cast< SwTxtPaintInfo& >( rInf ).SetPos( aNewPos );
+            const_cast< SwTextPaintInfo& >( rInf ).SetPos( aNewPos );
 
             rInf.DrawText( aOutString, *this );
 
-            const_cast< SwTxtPaintInfo& >( rInf ).SetPos( aOldPos );
+            const_cast< SwTextPaintInfo& >( rInf ).SetPos( aOldPos );
         }
     }
 }
 
-bool SwControlCharPortion::Format( SwTxtFormatInfo &rInf )
+bool SwControlCharPortion::Format( SwTextFormatInfo &rInf )
 {
     const SwLinePortion* pRoot = rInf.GetRoot();
     Width( 0 );
@@ -534,10 +534,10 @@ bool SwControlCharPortion::Format( SwTxtFormatInfo &rInf )
     return false;
 }
 
-sal_uInt16 SwControlCharPortion::GetViewWidth( const SwTxtSizeInfo& rInf ) const
+sal_uInt16 SwControlCharPortion::GetViewWidth( const SwTextSizeInfo& rInf ) const
 {
     if( !mnViewWidth )
-        mnViewWidth = rInf.GetTxtSize(OUString(' ')).Width();
+        mnViewWidth = rInf.GetTextSize(OUString(' ')).Width();
 
     return mnViewWidth;
 }
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index 90ba3743f030..31f8ab0448bd 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -24,13 +24,13 @@
 #define LINE_BREAK_WIDTH        150
 #define SPECIAL_FONT_HEIGHT     200
 
-class SwTxtFormatInfo;
+class SwTextFormatInfo;
 
 class SwTmpEndPortion : public SwLinePortion
 {
 public:
     explicit SwTmpEndPortion( const SwLinePortion &rPortion );
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
     OUTPUT_OPERATOR_OVERRIDE
 };
 
@@ -40,9 +40,9 @@ public:
     explicit SwBreakPortion( const SwLinePortion &rPortion );
     // Returns 0 if we have no usable data
     virtual SwLinePortion *Compress() SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
     virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
 
     // Accessibility: pass information about this portion to the PortionHandler
@@ -71,8 +71,8 @@ public:
     // of rPortion. It is only used for kerning portions for grid mode
     explicit SwKernPortion( const SwLinePortion &rPortion );
 
-    virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
 
     OUTPUT_OPERATOR_OVERRIDE
 };
@@ -83,8 +83,8 @@ class SwArrowPortion : public SwLinePortion
     bool bLeft;
 public:
     explicit SwArrowPortion( const SwLinePortion &rPortion );
-    explicit SwArrowPortion( const SwTxtPaintInfo &rInf );
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    explicit SwArrowPortion( const SwTextPaintInfo &rInf );
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
     virtual SwLinePortion *Compress() SAL_OVERRIDE;
     inline bool IsLeft() const { return bLeft; }
     inline const Point& GetPos() const { return aPos; }
@@ -95,7 +95,7 @@ public:
 // other punctuation marks are allowed to display in the margin of the page
 // by a user option.
 // The SwHangingPortion is the corresponding textportion to do that.
-class SwHangingPortion : public SwTxtPortion
+class SwHangingPortion : public SwTextPortion
 {
     sal_uInt16 nInnerWidth;
 public:
@@ -112,8 +112,8 @@ public:
     explicit SwHiddenTextPortion( sal_Int32 nLen )
         { SetWhichPor( POR_HIDDEN_TXT );  SetLen( nLen ); }
 
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
 };
 
 class SwControlCharPortion : public SwLinePortion
@@ -132,9 +132,9 @@ public:
         SetWhichPor( POR_CONTROLCHAR ); SetLen( 1 );
     }
 
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo& rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo& rInf ) const SAL_OVERRIDE;
 };
 
 #endif
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index aa0ba81e94e3..fa635c1f0359 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -28,13 +28,13 @@ class SwTabPortion : public SwFixPortion
     const bool bAutoTabStop;
 
     // Format() branches either into PreFormat() or PostFormat()
-    bool PreFormat( SwTxtFormatInfo &rInf );
+    bool PreFormat( SwTextFormatInfo &rInf );
 public:
     SwTabPortion( const sal_uInt16 nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true );
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    bool PostFormat( SwTxtFormatInfo &rInf );
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    bool PostFormat( SwTextFormatInfo &rInf );
     inline  bool IsFilled() const { return 0 != cFill; }
     inline  sal_uInt16 GetTabPos() const { return nTabPos; }
     inline  bool IsAutoTabStop() const { return bAutoTabStop; }
@@ -112,7 +112,7 @@ public:
                                     const sal_Unicode cFillChar = '\0' )
          : SwTabDecimalPortion( nTabPosVal, cTab, cFillChar )
     { SetLen( 0 ); }
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
 };
 
 #endif
diff --git a/sw/source/core/text/portox.cxx b/sw/source/core/text/portox.cxx
index 79873dec6c17..c5e6802c8a92 100644
--- a/sw/source/core/text/portox.cxx
+++ b/sw/source/core/text/portox.cxx
@@ -23,12 +23,12 @@
 #include "portox.hxx"
 #include "inftxt.hxx"
 
-void SwToxPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwToxPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( Width() )
     {
         rInf.DrawViewOpt( *this, POR_TOX );
-        SwTxtPortion::Paint( rInf );
+        SwTextPortion::Paint( rInf );
     }
 }
 
@@ -40,7 +40,7 @@ SwIsoToxPortion::SwIsoToxPortion() : nViewWidth(0)
     SetWhichPor( POR_ISOTOX );
 }
 
-sal_uInt16 SwIsoToxPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
+sal_uInt16 SwIsoToxPortion::GetViewWidth( const SwTextSizeInfo &rInf ) const
 {
     // Although we are const, nViewWidth should be calculated in the last
     // moment possible
@@ -51,19 +51,19 @@ sal_uInt16 SwIsoToxPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
             !rInf.GetOpt().IsReadonly() && SwViewOption::IsFieldShadings()   )
     {
         if( !nViewWidth )
-            pThis->nViewWidth = rInf.GetTxtSize(OUString(' ')).Width();
+            pThis->nViewWidth = rInf.GetTextSize(OUString(' ')).Width();
     }
     else
         pThis->nViewWidth = 0;
     return nViewWidth;
 }
 
-bool SwIsoToxPortion::Format( SwTxtFormatInfo &rInf )
+bool SwIsoToxPortion::Format( SwTextFormatInfo &rInf )
 {
     return SwLinePortion::Format( rInf );
 }
 
-void SwIsoToxPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwIsoToxPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( Width() )
         rInf.DrawViewOpt( *this, POR_TOX );
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index 0f6483fc8e1a..2d5811ed9bda 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -22,11 +22,11 @@
 
 #include "portxt.hxx"
 
-class SwToxPortion : public SwTxtPortion
+class SwToxPortion : public SwTextPortion
 {
 public:
     inline  SwToxPortion(){ SetWhichPor( POR_TOX ); }
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
     OUTPUT_OPERATOR_OVERRIDE
 };
 
@@ -36,10 +36,10 @@ class SwIsoToxPortion : public SwToxPortion
 
 public:
             SwIsoToxPortion();
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
     virtual SwLinePortion *Compress() SAL_OVERRIDE;
-    virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 4b78981d039d..5220493a09d8 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::i18n::ScriptType;
 
 // Returns for how many characters an extra space has to be added
 // (for justified alignment).
-static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo &rInf, const OUString* pStr,
+static sal_Int32 lcl_AddSpace( const SwTextSizeInfo &rInf, const OUString* pStr,
                                const SwLinePortion& rPor )
 {
     sal_Int32 nPos, nEnd;
@@ -63,7 +63,7 @@ static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo &rInf, const OUString* pStr,
     {
         nPos = rInf.GetIdx();
         nEnd = rInf.GetIdx() + rPor.GetLen();
-        pStr = &rInf.GetTxt();
+        pStr = &rInf.GetText();
         pSI = &const_cast<SwParaPortion*>(rInf.GetParaPortion())->GetScriptInfo();
     }
 
@@ -89,7 +89,7 @@ static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo &rInf, const OUString* pStr,
     if ( nEnd > nPos && ASIAN == nScript )
     {
         LanguageType aLang =
-            rInf.GetTxtFrm()->GetTxtNode()->GetLang( rInf.GetIdx(), 1, nScript );
+            rInf.GetTextFrm()->GetTextNode()->GetLang( rInf.GetIdx(), 1, nScript );
 
         if (!MsLangId::isKorean(aLang))
         {
@@ -126,7 +126,7 @@ static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo &rInf, const OUString* pStr,
     if ( nEnd > nPos && COMPLEX == nScript )
     {
         LanguageType aLang =
-            rInf.GetTxtFrm()->GetTxtNode()->GetLang( rInf.GetIdx(), 1, nScript );
+            rInf.GetTextFrm()->GetTextNode()->GetLang( rInf.GetIdx(), 1, nScript );
 
         if ( LANGUAGE_THAI == aLang )
         {
@@ -152,13 +152,13 @@ static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo &rInf, const OUString* pStr,
             LATIN == nScript && ( nEnd == nPos + 1 ) && pSI &&
             ( i18n::ScriptType::COMPLEX ==
               pSI->ScriptType( nPos + 1 ) ) &&
-            rInf.GetTxtFrm() && rInf.GetTxtFrm()->IsRightToLeft();
+            rInf.GetTextFrm() && rInf.GetTextFrm()->IsRightToLeft();
 
     if ( bDoNotAddSpace )
         return nCnt;
 
-    sal_Int32 nTxtEnd = std::min(nEnd, pStr->getLength());
-    for ( ; nPos < nTxtEnd; ++nPos )
+    sal_Int32 nTextEnd = std::min(nEnd, pStr->getLength());
+    for ( ; nPos < nTextEnd; ++nPos )
     {
         if( CH_BLANK == (*pStr)[ nPos ] )
             ++nCnt;
@@ -170,7 +170,7 @@ static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo &rInf, const OUString* pStr,
     // nPos referes to the original string, even if a field string has
     // been passed to this function
     nPos = rInf.GetIdx() + rPor.GetLen();
-    if ( nPos < rInf.GetTxt().getLength() )
+    if ( nPos < rInf.GetText().getLength() )
     {
         sal_uInt8 nNextScript = 0;
         const SwLinePortion* pPor = rPor.GetPortion();
@@ -184,21 +184,21 @@ static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo &rInf, const OUString* pStr,
         if ( CH_TXTATR_BREAKWORD == rInf.GetChar( nPos ) && pPor->InExpGrp() )
         {
             bool bOldOnWin = rInf.OnWin();
-            ((SwTxtSizeInfo &)rInf).SetOnWin( false );
+            ((SwTextSizeInfo &)rInf).SetOnWin( false );
 
             OUString aStr;
-            pPor->GetExpTxt( rInf, aStr );
-            ((SwTxtSizeInfo &)rInf).SetOnWin( bOldOnWin );
+            pPor->GetExpText( rInf, aStr );
+            ((SwTextSizeInfo &)rInf).SetOnWin( bOldOnWin );
 
             nNextScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( aStr, 0 );
         }
         else
-            nNextScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rInf.GetTxt(), nPos );
+            nNextScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rInf.GetText(), nPos );
 
         if( ASIAN == nNextScript )
         {
             LanguageType aLang =
-                rInf.GetTxtFrm()->GetTxtNode()->GetLang( nPos, 1, nNextScript );
+                rInf.GetTextFrm()->GetTextNode()->GetLang( nPos, 1, nNextScript );
 
             if (!MsLangId::isKorean(aLang))
                 ++nCnt;
@@ -208,15 +208,15 @@ static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo &rInf, const OUString* pStr,
     return nCnt;
 }
 
-SwTxtPortion * SwTxtPortion::CopyLinePortion(const SwLinePortion &rPortion)
+SwTextPortion * SwTextPortion::CopyLinePortion(const SwLinePortion &rPortion)
 {
-    SwTxtPortion *const pNew(new SwTxtPortion);
+    SwTextPortion *const pNew(new SwTextPortion);
     static_cast<SwLinePortion&>(*pNew) = rPortion;
     pNew->SetWhichPor( POR_TXT ); // overwrite that!
     return pNew;
 }
 
-void SwTxtPortion::BreakCut( SwTxtFormatInfo &rInf, const SwTxtGuess &rGuess )
+void SwTextPortion::BreakCut( SwTextFormatInfo &rInf, const SwTextGuess &rGuess )
 {
     // The word/char is larger than the line
     // Special case 1: The word is larger than the line
@@ -231,7 +231,7 @@ void SwTxtPortion::BreakCut( SwTxtFormatInfo &rInf, const SwTxtGuess &rGuess )
         {
             rInf.SetLen( nLen );
             SetLen( nLen );
-            CalcTxtSize( rInf );
+            CalcTextSize( rInf );
 
             // changing these values requires also changing them in
             // guess.cxx
@@ -261,7 +261,7 @@ void SwTxtPortion::BreakCut( SwTxtFormatInfo &rInf, const SwTxtGuess &rGuess )
     }
 }
 
-void SwTxtPortion::BreakUnderflow( SwTxtFormatInfo &rInf )
+void SwTextPortion::BreakUnderflow( SwTextFormatInfo &rInf )
 {
     Truncate();
     Height( 0 );
@@ -271,13 +271,13 @@ void SwTxtPortion::BreakUnderflow( SwTxtFormatInfo &rInf )
     rInf.SetUnderflow( this );
 }
 
-static bool lcl_HasContent( const SwFldPortion& rFld, SwTxtFormatInfo &rInf )
+static bool lcl_HasContent( const SwFieldPortion& rField, SwTextFormatInfo &rInf )
 {
-    OUString aTxt;
-    return rFld.GetExpTxt( rInf, aTxt ) && !aTxt.isEmpty();
+    OUString aText;
+    return rField.GetExpText( rInf, aText ) && !aText.isEmpty();
 }
 
-bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
+bool SwTextPortion::_Format( SwTextFormatInfo &rInf )
 {
     // 5744: If only the hypen does not fit anymore, we still need to wrap
     // the word, or else return true!
@@ -289,7 +289,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
         const bool bHyph = rInf.ChgHyph( true );
         if( rInf.IsHyphenate() )
         {
-            SwTxtGuess aGuess;
+            SwTextGuess aGuess;
             // check for alternative spelling left from the soft hyphen
             // this should usually be true but
             aGuess.AlternativeSpelling( rInf, rInf.GetSoftHyphPos() - 1 );
@@ -301,7 +301,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
         return bFull;
     }
 
-    SwTxtGuess aGuess;
+    SwTextGuess aGuess;
     const bool bFull = !aGuess.Guess( *this, rInf, Height() );
 
     // these are the possible cases:
@@ -322,7 +322,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
     {
         Width( aGuess.BreakWidth() );
         // Vorsicht !
-        if( !InExpGrp() || InFldGrp() )
+        if( !InExpGrp() || InFieldGrp() )
             SetLen( rInf.GetLen() );
 
         short nKern = rInf.GetFont()->CheckKerning();
@@ -366,11 +366,11 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
         //   text portion, if they are not followed by a blank
         //   (work around different definition of tab stop character - breaking or
         //   non breaking character - in compatibility mode)
-        else if ( ( IsFtnPortion() && rInf.IsFakeLineStart() &&
+        else if ( ( IsFootnotePortion() && rInf.IsFakeLineStart() &&
 
-                    rInf.IsOtherThanFtnInside() ) ||
+                    rInf.IsOtherThanFootnoteInside() ) ||
                   ( rInf.GetLast() &&
-                    rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT) &&
+                    rInf.GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT) &&
                     rInf.GetLast()->InTabGrp() &&
                     rInf.GetLineStart() + rInf.GetLast()->GetLen() < rInf.GetIdx() &&
                     aGuess.BreakPos() == rInf.GetIdx()  &&
@@ -388,10 +388,10 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
                  rInf.IsFirstMulti() ||
                  ( rInf.GetLast() &&
                     ( rInf.GetLast()->IsFlyPortion() ||
-                        ( rInf.GetLast()->InFldGrp() &&
+                        ( rInf.GetLast()->InFieldGrp() &&
                           ! rInf.GetLast()->InNumberGrp() &&
                           ! rInf.GetLast()->IsErgoSumPortion() &&
-                          lcl_HasContent(*static_cast<SwFldPortion*>(rInf.GetLast()),rInf ) ) ) ) )
+                          lcl_HasContent(*static_cast<SwFieldPortion*>(rInf.GetLast()),rInf ) ) ) ) )
         {
             if ( rInf.X() + aGuess.BreakWidth() <= rInf.Width() )
                 Width( aGuess.BreakWidth() );
@@ -434,7 +434,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
     return bFull;
 }
 
-bool SwTxtPortion::Format( SwTxtFormatInfo &rInf )
+bool SwTextPortion::Format( SwTextFormatInfo &rInf )
 {
     if( rInf.X() > rInf.Width() || (!GetLen() && !InExpGrp()) )
     {
@@ -447,8 +447,8 @@ bool SwTxtPortion::Format( SwTxtFormatInfo &rInf )
     }
 
     OSL_ENSURE( rInf.RealWidth() || (rInf.X() == rInf.Width()),
-        "SwTxtPortion::Format: missing real width" );
-    OSL_ENSURE( Height(), "SwTxtPortion::Format: missing height" );
+        "SwTextPortion::Format: missing real width" );
+    OSL_ENSURE( Height(), "SwTextPortion::Format: missing height" );
 
     return _Format( rInf );
 }
@@ -461,11 +461,11 @@ bool SwTxtPortion::Format( SwTxtFormatInfo &rInf )
 // with the MarginPortion.
 
 // rInf.nIdx points to the next word, nIdx-1 is the portion's last char
-void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf )
+void SwTextPortion::FormatEOL( SwTextFormatInfo &rInf )
 {
     if( ( !GetPortion() || ( GetPortion()->IsKernPortion() &&
         !GetPortion()->GetPortion() ) ) && GetLen() &&
-        rInf.GetIdx() < rInf.GetTxt().getLength() &&
+        rInf.GetIdx() < rInf.GetText().getLength() &&
         1 < rInf.GetIdx() && ' ' == rInf.GetChar( rInf.GetIdx() - 1 )
         && !rInf.GetLast()->IsHolePortion() )
     {
@@ -481,7 +481,7 @@ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf )
         if( nHoleLen == GetLen() )
             nBlankSize = Width();
         else
-            nBlankSize = nHoleLen * rInf.GetTxtSize(OUString(' ')).Width();
+            nBlankSize = nHoleLen * rInf.GetTextSize(OUString(' ')).Width();
         Width( Width() - nBlankSize );
         rInf.X( rInf.X() - nBlankSize );
         SetLen( GetLen() - nHoleLen );
@@ -492,16 +492,16 @@ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf )
     }
 }
 
-sal_Int32 SwTxtPortion::GetCrsrOfst( const sal_uInt16 nOfst ) const
+sal_Int32 SwTextPortion::GetCrsrOfst( const sal_uInt16 nOfst ) const
 {
-    OSL_ENSURE( false, "SwTxtPortion::GetCrsrOfst: don't use this method!" );
+    OSL_ENSURE( false, "SwTextPortion::GetCrsrOfst: don't use this method!" );
     return SwLinePortion::GetCrsrOfst( nOfst );
 }
 
-// The GetTxtSize() assumes that the own length is correct
-SwPosSize SwTxtPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
+// The GetTextSize() assumes that the own length is correct
+SwPosSize SwTextPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
 {
-    SwPosSize aSize = rInf.GetTxtSize();
+    SwPosSize aSize = rInf.GetTextSize();
     if( !GetJoinBorderWithPrev() )
         aSize.Width(aSize.Width() + rInf.GetFont()->GetLeftBorderSpace() );
     if( !GetJoinBorderWithNext() )
@@ -514,21 +514,21 @@ SwPosSize SwTxtPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
     return aSize;
 }
 
-void SwTxtPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwTextPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
-    if (rInf.OnWin() && 1==rInf.GetLen() && CH_TXT_ATR_FIELDEND==rInf.GetTxt()[rInf.GetIdx()])
+    if (rInf.OnWin() && 1==rInf.GetLen() && CH_TXT_ATR_FIELDEND==rInf.GetText()[rInf.GetIdx()])
     {
         assert(false); // this is some debugging only code
         rInf.DrawBackBrush( *this );
-        const OUString aTxt(CH_TXT_ATR_SUBST_FIELDEND);
-        rInf.DrawText( aTxt, *this, 0, aTxt.getLength(), false );
+        const OUString aText(CH_TXT_ATR_SUBST_FIELDEND);
+        rInf.DrawText( aText, *this, 0, aText.getLength(), false );
     }
-    else if (rInf.OnWin() && 1==rInf.GetLen() && CH_TXT_ATR_FIELDSTART==rInf.GetTxt()[rInf.GetIdx()])
+    else if (rInf.OnWin() && 1==rInf.GetLen() && CH_TXT_ATR_FIELDSTART==rInf.GetText()[rInf.GetIdx()])
     {
         assert(false); // this is some debugging only code
         rInf.DrawBackBrush( *this );
-        const OUString aTxt(CH_TXT_ATR_SUBST_FIELDSTART);
-        rInf.DrawText( aTxt, *this, 0, aTxt.getLength(), false );
+        const OUString aText(CH_TXT_ATR_SUBST_FIELDSTART);
+        rInf.DrawText( aText, *this, 0, aText.getLength(), false );
     }
     else if( GetLen() )
     {
@@ -554,14 +554,14 @@ void SwTxtPortion::Paint( const SwTxtPaintInfo &rInf ) const
     }
 }
 
-bool SwTxtPortion::GetExpTxt( const SwTxtSizeInfo &, OUString & ) const
+bool SwTextPortion::GetExpText( const SwTextSizeInfo &, OUString & ) const
 {
     return false;
 }
 
 // Responsible for the justified paragraph. They calculate the blank
 // count and the resulting added space.
-sal_Int32 SwTxtPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf,
+sal_Int32 SwTextPortion::GetSpaceCnt( const SwTextSizeInfo &rInf,
                                       sal_Int32& rCharCnt ) const
 {
     sal_Int32 nCnt = 0;
@@ -573,11 +573,11 @@ sal_Int32 SwTxtPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf,
             // OnWin() likes to return a blank instead of an empty string from
             // time to time. We cannot use that here at all, however.
             bool bOldOnWin = rInf.OnWin();
-            ((SwTxtSizeInfo &)rInf).SetOnWin( false );
+            ((SwTextSizeInfo &)rInf).SetOnWin( false );
 
             OUString aStr;
-            GetExpTxt( rInf, aStr );
-            ((SwTxtSizeInfo &)rInf).SetOnWin( bOldOnWin );
+            GetExpText( rInf, aStr );
+            ((SwTextSizeInfo &)rInf).SetOnWin( bOldOnWin );
 
             nCnt = nCnt + lcl_AddSpace( rInf, &aStr, *this );
             nPos = aStr.getLength();
@@ -592,7 +592,7 @@ sal_Int32 SwTxtPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf,
     return nCnt;
 }
 
-long SwTxtPortion::CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const
+long SwTextPortion::CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const
 {
     sal_Int32 nCnt = 0;
 
@@ -603,11 +603,11 @@ long SwTxtPortion::CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) cons
             // OnWin() likes to return a blank instead of an empty string from
             // time to time. We cannot use that here at all, however.
             bool bOldOnWin = rInf.OnWin();
-            ((SwTxtSizeInfo &)rInf).SetOnWin( false );
+            ((SwTextSizeInfo &)rInf).SetOnWin( false );
 
             OUString aStr;
-            GetExpTxt( rInf, aStr );
-            ((SwTxtSizeInfo &)rInf).SetOnWin( bOldOnWin );
+            GetExpText( rInf, aStr );
+            ((SwTextSizeInfo &)rInf).SetOnWin( bOldOnWin );
             if( nSpaceAdd > 0 )
                 nCnt = nCnt + lcl_AddSpace( rInf, &aStr, *this );
             else
@@ -642,20 +642,20 @@ long SwTxtPortion::CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) cons
     return nCnt * nSpaceAdd / SPACING_PRECISION_FACTOR;
 }
 
-void SwTxtPortion::HandlePortion( SwPortionHandler& rPH ) const
+void SwTextPortion::HandlePortion( SwPortionHandler& rPH ) const
 {
     rPH.Text( GetLen(), GetWhichPor(), Height(), Width() );
 }
 
-SwTxtInputFldPortion::SwTxtInputFldPortion()
-    : SwTxtPortion()
+SwTextInputFieldPortion::SwTextInputFieldPortion()
+    : SwTextPortion()
     , mbContainsInputFieldStart( false )
     , mbContainsInputFieldEnd( false )
 {
     SetWhichPor( POR_INPUTFLD );
 }
 
-bool SwTxtInputFldPortion::Format( SwTxtFormatInfo &rInf )
+bool SwTextInputFieldPortion::Format( SwTextFormatInfo &rInf )
 {
     mbContainsInputFieldStart =
         rInf.GetChar( rInf.GetIdx() ) == CH_TXT_ATR_INPUTFIELDSTART;
@@ -670,7 +670,7 @@ bool SwTxtInputFldPortion::Format( SwTxtFormatInfo &rInf )
     }
     else
     {
-        SwTxtSlot aFormatTxt( &rInf, this, true, true );
+        SwTextSlot aFormatText( &rInf, this, true, true );
         if ( rInf.GetLen() == 0 )
         {
             Width( 0 );
@@ -683,7 +683,7 @@ bool SwTxtInputFldPortion::Format( SwTxtFormatInfo &rInf )
                 rInf.SetLineStart( 0 );
             }
 
-            bRet = SwTxtPortion::Format( rInf );
+            bRet = SwTextPortion::Format( rInf );
 
             if ( mbContainsInputFieldEnd )
             {
@@ -709,18 +709,18 @@ bool SwTxtInputFldPortion::Format( SwTxtFormatInfo &rInf )
     return bRet;
 }
 
-void SwTxtInputFldPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwTextInputFieldPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if ( Width() )
     {
         rInf.DrawViewOpt( *this, POR_INPUTFLD );
-        SwTxtSlot aPaintTxt( &rInf, this, true, true,
+        SwTextSlot aPaintText( &rInf, this, true, true,
                              ContainsOnlyDummyChars() ? OUString(" ") : OUString() );
-        SwTxtPortion::Paint( rInf );
+        SwTextPortion::Paint( rInf );
     }
 }
 
-bool SwTxtInputFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwTextInputFieldPortion::GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const
 {
     sal_Int32 nIdx = rInf.GetIdx();
     sal_Int32 nLen = rInf.GetLen();
@@ -733,23 +733,23 @@ bool SwTxtInputFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt
     {
         --nLen;
     }
-    rTxt = rInf.GetTxt().copy( nIdx, std::min( nLen, rInf.GetTxt().getLength() - nIdx ) );
+    rText = rInf.GetText().copy( nIdx, std::min( nLen, rInf.GetText().getLength() - nIdx ) );
 
     return true;
 }
 
-SwPosSize SwTxtInputFldPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
+SwPosSize SwTextInputFieldPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
 {
-    SwTxtSlot aFormatTxt( &rInf, this, true, false );
+    SwTextSlot aFormatText( &rInf, this, true, false );
     if ( rInf.GetLen() == 0 )
     {
         return SwPosSize( 0, 0 );
     }
 
-    return rInf.GetTxtSize();
+    return rInf.GetTextSize();
 }
 
-sal_uInt16 SwTxtInputFldPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
+sal_uInt16 SwTextInputFieldPortion::GetViewWidth( const SwTextSizeInfo &rInf ) const
 {
     if( !Width()
         && ContainsOnlyDummyChars()
@@ -757,20 +757,20 @@ sal_uInt16 SwTxtInputFldPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
         && !rInf.GetOpt().IsReadonly()
         && SwViewOption::IsFieldShadings() )
     {
-        return rInf.GetTxtSize( " " ).Width();
+        return rInf.GetTextSize( " " ).Width();
     }
 
-    return SwTxtPortion::GetViewWidth( rInf );
+    return SwTextPortion::GetViewWidth( rInf );
 }
 
-bool SwTxtInputFldPortion::ContainsOnlyDummyChars() const
+bool SwTextInputFieldPortion::ContainsOnlyDummyChars() const
 {
     return GetLen() <= 2
            && mbContainsInputFieldStart
            && mbContainsInputFieldEnd;
 }
 
-SwHolePortion::SwHolePortion( const SwTxtPortion &rPor )
+SwHolePortion::SwHolePortion( const SwTextPortion &rPor )
     : nBlankWidth( 0 )
 {
     SetLen( 1 );
@@ -781,7 +781,7 @@ SwHolePortion::SwHolePortion( const SwTxtPortion &rPor )
 
 SwLinePortion *SwHolePortion::Compress() { return this; }
 
-void SwHolePortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwHolePortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( !rInf.GetOut() )
         return;
@@ -805,14 +805,14 @@ void SwHolePortion::Paint( const SwTxtPaintInfo &rInf ) const
         pFontSave = new SwFontSave( rInf, pHoleFont );
     }
 
-    const OUString aTxt( ' ' );
-    rInf.DrawText( aTxt, *this, 0, 1, false );
+    const OUString aText( ' ' );
+    rInf.DrawText( aText, *this, 0, 1, false );
 
     delete pFontSave;
     delete pHoleFont;
 }
 
-bool SwHolePortion::Format( SwTxtFormatInfo &rInf )
+bool SwHolePortion::Format( SwTextFormatInfo &rInf )
 {
     return rInf.IsFull() || rInf.X() >= rInf.Width();
 }
@@ -822,21 +822,21 @@ void SwHolePortion::HandlePortion( SwPortionHandler& rPH ) const
     rPH.Text( GetLen(), GetWhichPor() );
 }
 
-void SwFieldMarkPortion::Paint( const SwTxtPaintInfo & /*rInf*/) const
+void SwFieldMarkPortion::Paint( const SwTextPaintInfo & /*rInf*/) const
 {
     // These shouldn't be painted!
-    //SwTxtPortion::Paint(rInf);
+    //SwTextPortion::Paint(rInf);
 }
 
-bool SwFieldMarkPortion::Format( SwTxtFormatInfo & )
+bool SwFieldMarkPortion::Format( SwTextFormatInfo & )
 {
     Width(0);
     return false;
 }
 
-void SwFieldFormCheckboxPortion::Paint( const SwTxtPaintInfo& rInf ) const
+void SwFieldFormCheckboxPortion::Paint( const SwTextPaintInfo& rInf ) const
 {
-    SwTxtNode* pNd = const_cast<SwTxtNode*>(rInf.GetTxtFrm()->GetTxtNode());
+    SwTextNode* pNd = const_cast<SwTextNode*>(rInf.GetTextFrm()->GetTextNode());
     const SwDoc *doc=pNd->GetDoc();
     SwIndex aIndex( pNd, rInf.GetIdx() );
     SwPosition aPosition(*pNd, aIndex);
@@ -854,9 +854,9 @@ void SwFieldFormCheckboxPortion::Paint( const SwTxtPaintInfo& rInf ) const
     }
 }
 
-bool SwFieldFormCheckboxPortion::Format( SwTxtFormatInfo & rInf )
+bool SwFieldFormCheckboxPortion::Format( SwTextFormatInfo & rInf )
 {
-    SwTxtNode *pNd = const_cast < SwTxtNode * >( rInf.GetTxtFrm(  )->GetTxtNode(  ) );
+    SwTextNode *pNd = const_cast < SwTextNode * >( rInf.GetTextFrm(  )->GetTextNode(  ) );
     const SwDoc *doc = pNd->GetDoc(  );
     SwIndex aIndex( pNd, rInf.GetIdx(  ) );
     SwPosition aPosition( *pNd, aIndex );
@@ -864,8 +864,8 @@ bool SwFieldFormCheckboxPortion::Format( SwTxtFormatInfo & rInf )
     OSL_ENSURE(pBM && pBM->GetFieldname( ) == ODF_FORMCHECKBOX, "Where is my form field bookmark???");
     if (pBM && pBM->GetFieldname( ) == ODF_FORMCHECKBOX)
     {
-        Width( rInf.GetTxtHeight(  ) );
-        Height( rInf.GetTxtHeight(  ) );
+        Width( rInf.GetTextHeight(  ) );
+        Height( rInf.GetTextHeight(  ) );
         SetAscent( rInf.GetAscent(  ) );
     }
     return false;
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 3f30ba7fc75f..660d38d72209 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -23,48 +23,48 @@
 
 #include "porlin.hxx"
 
-class SwTxtGuess;
+class SwTextGuess;
 
 /// This portion represents a part of the paragraph string.
-class SwTxtPortion : public SwLinePortion
+class SwTextPortion : public SwLinePortion
 {
-    void BreakCut( SwTxtFormatInfo &rInf, const SwTxtGuess &rGuess );
-    void BreakUnderflow( SwTxtFormatInfo &rInf );
-    bool _Format( SwTxtFormatInfo &rInf );
+    void BreakCut( SwTextFormatInfo &rInf, const SwTextGuess &rGuess );
+    void BreakUnderflow( SwTextFormatInfo &rInf );
+    bool _Format( SwTextFormatInfo &rInf );
 
 public:
-    inline SwTxtPortion(){ SetWhichPor( POR_TXT ); }
-    static SwTxtPortion * CopyLinePortion(const SwLinePortion &rPortion);
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    inline SwTextPortion(){ SetWhichPor( POR_TXT ); }
+    static SwTextPortion * CopyLinePortion(const SwLinePortion &rPortion);
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
     virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
-    virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
-    virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+    virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
 
     // Counts the spaces for justified paragraph
-    sal_Int32 GetSpaceCnt( const SwTxtSizeInfo &rInf, sal_Int32& rCnt ) const;
+    sal_Int32 GetSpaceCnt( const SwTextSizeInfo &rInf, sal_Int32& rCnt ) const;
 
-    bool CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess );
+    bool CreateHyphen( SwTextFormatInfo &rInf, SwTextGuess &rGuess );
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
 
     OUTPUT_OPERATOR_OVERRIDE
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTxtPortion)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTextPortion)
 };
 
-class SwTxtInputFldPortion : public SwTxtPortion
+class SwTextInputFieldPortion : public SwTextPortion
 {
 public:
-    SwTxtInputFldPortion();
+    SwTextInputFieldPortion();
 
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual sal_uInt16 GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
-    virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+    virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
 
 private:
     bool mbContainsInputFieldStart;
@@ -76,12 +76,12 @@ class SwHolePortion : public SwLinePortion
 {
     sal_uInt16 nBlankWidth;
 public:
-            SwHolePortion( const SwTxtPortion &rPor );
+            SwHolePortion( const SwTextPortion &rPor );
     inline sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; }
     inline void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; }
     virtual SwLinePortion *Compress() SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
@@ -90,23 +90,23 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwHolePortion)
 };
 
-class SwFieldMarkPortion : public SwTxtPortion
+class SwFieldMarkPortion : public SwTextPortion
 {
     public:
-        inline SwFieldMarkPortion() : SwTxtPortion()
+        inline SwFieldMarkPortion() : SwTextPortion()
             { }
-        virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-        virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+        virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+        virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
 };
 
-class SwFieldFormCheckboxPortion : public SwTxtPortion
+class SwFieldFormCheckboxPortion : public SwTextPortion
 {
 public:
-    SwFieldFormCheckboxPortion() : SwTxtPortion()
+    SwFieldFormCheckboxPortion() : SwTextPortion()
     {
     }
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
-    virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+    virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+    virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 3a3155424bac..9edc033e5eae 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -43,21 +43,21 @@
 
 using namespace ::com::sun::star;
 
-void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm )
+void SwAttrIter::CtorInitAttrIter( SwTextNode& rTextNode, SwScriptInfo& rScrInf, SwTextFrm* pFrm )
 {
     // during HTML-Import it can happen, that no layout exists
-    SwRootFrm* pRootFrm = rTxtNode.getIDocumentLayoutAccess()->GetCurrentLayout();
+    SwRootFrm* pRootFrm = rTextNode.getIDocumentLayoutAccess()->GetCurrentLayout();
     pShell = pRootFrm ? pRootFrm->GetCurrShell() : 0;
 
     pScriptInfo = &rScrInf;
 
     // attributes set at the whole paragraph
-    pAttrSet = rTxtNode.GetpSwAttrSet();
+    pAttrSet = rTextNode.GetpSwAttrSet();
     // attribute array
-    pHints = rTxtNode.GetpSwpHints();
+    pHints = rTextNode.GetpSwpHints();
 
     // Build a font matching the default paragraph style:
-    SwFontAccess aFontAccess( &rTxtNode.GetAnyFmtColl(), pShell );
+    SwFontAccess aFontAccess( &rTextNode.GetAnyFormatColl(), pShell );
     delete pFnt;
     pFnt = new SwFont( aFontAccess.Get()->GetFont() );
 
@@ -80,14 +80,14 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
     // consider them during construction of the default array, and apply
     // them to the font
     aAttrHandler.Init( aFontAccess.Get()->GetDefault(), pAttrSet,
-                       *rTxtNode.getIDocumentSettingAccess(), pShell, *pFnt, bVertLayout );
+                       *rTextNode.getIDocumentSettingAccess(), pShell, *pFnt, bVertLayout );
 
     aMagicNo[SW_LATIN] = aMagicNo[SW_CJK] = aMagicNo[SW_CTL] = NULL;
 
     // determine script changes if not already done for current paragraph
     OSL_ENSURE( pScriptInfo, "No script info available");
     if ( pScriptInfo->GetInvalidityA() != COMPLETE_STRING )
-         pScriptInfo->InitScriptInfo( rTxtNode, bRTL );
+         pScriptInfo->InitScriptInfo( rTextNode, bRTL );
 
     if ( g_pBreakIt->GetBreakIter().is() )
     {
@@ -115,7 +115,7 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
                 pFnt->ChkMagic( pShell, nTmp );
                 pFnt->GetMagic( aMagicNo[ nTmp ], aFntIdx[ nTmp ], nTmp );
             }
-        } while (nChg < rTxtNode.GetTxt().getLength());
+        } while (nChg < rTextNode.GetText().getLength());
     }
     else
     {
@@ -125,14 +125,14 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
 
     nStartIndex = nEndIndex = nPos = nChgCnt = 0;
     nPropFont = 0;
-    SwDoc* pDoc = rTxtNode.GetDoc();
-    const IDocumentRedlineAccess* pIDRA = rTxtNode.getIDocumentRedlineAccess();
+    SwDoc* pDoc = rTextNode.GetDoc();
+    const IDocumentRedlineAccess* pIDRA = rTextNode.getIDocumentRedlineAccess();
 
-    const SwExtTextInput* pExtInp = pDoc->GetExtTextInput( rTxtNode );
+    const SwExtTextInput* pExtInp = pDoc->GetExtTextInput( rTextNode );
     const bool bShow = IDocumentRedlineAccess::IsShowChanges( pIDRA->GetRedlineMode() );
     if( pExtInp || bShow )
     {
-        const sal_uInt16 nRedlPos = pIDRA->GetRedlinePos( rTxtNode, USHRT_MAX );
+        const sal_uInt16 nRedlPos = pIDRA->GetRedlinePos( rTextNode, USHRT_MAX );
         if( pExtInp || USHRT_MAX != nRedlPos )
         {
             const std::vector<sal_uInt16> *pArr = 0;
@@ -144,7 +144,7 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
                 Seek( 0 );
             }
 
-            pRedln = new SwRedlineItr( rTxtNode, *pFnt, aAttrHandler, nRedlPos,
+            pRedln = new SwRedlineItr( rTextNode, *pFnt, aAttrHandler, nRedlPos,
                                         bShow, pArr, nInputStt );
 
             if( pRedln->IsOn() )
@@ -156,7 +156,7 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
 // The Redline-Iterator
 // The following information/states exist in RedlineIterator:
 //
-// nFirst is the first index of RedlineTbl, which overlaps with the paragraph.
+// nFirst is the first index of RedlineTable, which overlaps with the paragraph.
 //
 // nAct is the currently active (if bOn is set) or the next possible index.
 // nStart and nEnd give you the borders of the object within the paragraph.
@@ -165,12 +165,12 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
 //
 // If nAct is set to COMPLETE_STRING (via Reset()), then currently no
 // Redline is active, nStart and nEnd are invalid.
-SwRedlineItr::SwRedlineItr( const SwTxtNode& rTxtNd, SwFont& rFnt,
+SwRedlineItr::SwRedlineItr( const SwTextNode& rTextNd, SwFont& rFnt,
                             SwAttrHandler& rAH, sal_Int32 nRed, bool bShw,
                             const std::vector<sal_uInt16> *pArr,
                             sal_Int32 nExtStart )
-    : rDoc( *rTxtNd.GetDoc() ), rAttrHandler( rAH ), pSet( 0 ),
-      nNdIdx( rTxtNd.GetIndex() ), nFirst( nRed ),
+    : rDoc( *rTextNd.GetDoc() ), rAttrHandler( rAH ), pSet( 0 ),
+      nNdIdx( rTextNd.GetIndex() ), nFirst( nRed ),
       nAct( COMPLETE_STRING ), bOn( false ), bShow( bShw )
 {
     if( pArr )
@@ -223,16 +223,16 @@ short SwRedlineItr::_Seek(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld)
         nStart = COMPLETE_STRING;
         nEnd = COMPLETE_STRING;
 
-        for( ; nAct < (sal_Int32)rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size() ; ++nAct )
+        for( ; nAct < (sal_Int32)rDoc.getIDocumentRedlineAccess().GetRedlineTable().size() ; ++nAct )
         {
-            rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd );
+            rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd );
 
             if( nNew < nEnd )
             {
                 if( nNew >= nStart ) // der einzig moegliche Kandidat
                 {
                     bOn = true;
-                    const SwRangeRedline *pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nAct ];
+                    const SwRangeRedline *pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ];
 
                     if (pSet)
                         pSet->ClearItem();
@@ -255,7 +255,7 @@ short SwRedlineItr::_Seek(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld)
                         if( ( nWhich < RES_CHRATR_END ) &&
                             ( SfxItemState::SET == pSet->GetItemState( nWhich, true, &pItem ) ) )
                         {
-                            SwTxtAttr* pAttr = MakeRedlineTxtAttr(
+                            SwTextAttr* pAttr = MakeRedlineTextAttr(
                                 const_cast<SwDoc&>(rDoc),
                                 *const_cast<SfxPoolItem*>(pItem) );
                             pAttr->SetPriorityAttr( true );
@@ -297,9 +297,9 @@ void SwRedlineItr::FillHints( sal_uInt16 nAuthor, RedlineType_t eType )
     }
 }
 
-void SwRedlineItr::ChangeTxtAttr( SwFont* pFnt, SwTxtAttr &rHt, bool bChg )
+void SwRedlineItr::ChangeTextAttr( SwFont* pFnt, SwTextAttr &rHt, bool bChg )
 {
-    OSL_ENSURE( IsOn(), "SwRedlineItr::ChangeTxtAttr: Off?" );
+    OSL_ENSURE( IsOn(), "SwRedlineItr::ChangeTextAttr: Off?" );
 
     if( !bShow && !pExt )
         return;
@@ -324,13 +324,13 @@ void SwRedlineItr::_Clear( SwFont* pFnt )
     bOn = false;
     while (!m_Hints.empty())
     {
-        SwTxtAttr *pPos = m_Hints.front();
+        SwTextAttr *pPos = m_Hints.front();
         m_Hints.pop_front();
         if( pFnt )
             rAttrHandler.PopAndChg( *pPos, *pFnt );
         else
             rAttrHandler.Pop( *pPos );
-        SwTxtAttr::Destroy(pPos, const_cast<SwDoc&>(rDoc).GetAttrPool() );
+        SwTextAttr::Destroy(pPos, const_cast<SwDoc&>(rDoc).GetAttrPool() );
     }
     if( pFnt )
         pFnt->SetNoCol( false );
@@ -344,7 +344,7 @@ sal_Int32 SwRedlineItr::_GetNextRedln( sal_Int32 nNext )
     if( COMPLETE_STRING == nAct )
     {
         nAct = nFirst;
-        rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd );
+        rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd );
     }
     if( bOn || !nStart )
     {
@@ -382,9 +382,9 @@ bool SwRedlineItr::CheckLine( sal_Int32 nChkStart, sal_Int32 nChkEnd )
     sal_Int32 nOldAct = nAct;
     bool bRet = false;
 
-    for( nAct = nFirst; nAct < (sal_Int32)rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size() ; ++nAct )
+    for( nAct = nFirst; nAct < (sal_Int32)rDoc.getIDocumentRedlineAccess().GetRedlineTable().size() ; ++nAct )
     {
-        rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd );
+        rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd );
         if( nChkEnd < nStart )
             break;
         if( nChkStart <= nEnd && ( nChkEnd > nStart || COMPLETE_STRING == nEnd ) )
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 90e3bc5f5881..0863e423954a 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -26,7 +26,7 @@
 #include "swfont.hxx"
 #include <vector>
 
-class SwTxtNode;
+class SwTextNode;
 class SwDoc;
 class SfxItemSet;
 class SwAttrHandler;
@@ -57,7 +57,7 @@ public:
 
 class SwRedlineItr
 {
-    std::deque<SwTxtAttr *> m_Hints;
+    std::deque<SwTextAttr *> m_Hints;
     const SwDoc& rDoc;
     SwAttrHandler& rAttrHandler;
     SfxItemSet *pSet;
@@ -80,13 +80,13 @@ class SwRedlineItr
     sal_Int32 NextExtend( sal_Int32 nNext )
         { if( pExt ) return pExt->Next( nNext ); return nNext; }
 public:
-    SwRedlineItr( const SwTxtNode& rTxtNd, SwFont& rFnt, SwAttrHandler& rAH,
+    SwRedlineItr( const SwTextNode& rTextNd, SwFont& rFnt, SwAttrHandler& rAH,
         sal_Int32 nRedlPos, bool bShw, const std::vector<sal_uInt16> *pArr = 0,
         sal_Int32 nExtStart = COMPLETE_STRING );
     ~SwRedlineItr();
     inline bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); }
     inline void Clear( SwFont* pFnt ) { if( bOn ) _Clear( pFnt ); }
-    void ChangeTxtAttr( SwFont* pFnt, SwTxtAttr &rHt, bool bChg );
+    void ChangeTextAttr( SwFont* pFnt, SwTextAttr &rHt, bool bChg );
     inline short Seek( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld )
         { if( bShow || pExt ) return _Seek( rFnt, nNew, nOld ); return 0; }
     inline void Reset() { if( nAct != nFirst ) nAct = COMPLETE_STRING;
diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx
index 51d442cb1ab1..00a7d4549024 100644
--- a/sw/source/core/text/txtcache.cxx
+++ b/sw/source/core/text/txtcache.cxx
@@ -21,67 +21,67 @@
 #include "txtfrm.hxx"
 #include "porlay.hxx"
 
-SwTxtLine::SwTxtLine( SwTxtFrm *pFrm, SwParaPortion *pNew ) :
+SwTextLine::SwTextLine( SwTextFrm *pFrm, SwParaPortion *pNew ) :
     SwCacheObj( (void*)pFrm ),
     pLine( pNew )
 {
 }
 
-SwTxtLine::~SwTxtLine()
+SwTextLine::~SwTextLine()
 {
     delete pLine;
 }
 
-SwCacheObj *SwTxtLineAccess::NewObj()
+SwCacheObj *SwTextLineAccess::NewObj()
 {
-    return new SwTxtLine( const_cast<SwTxtFrm *>(static_cast<SwTxtFrm const *>(pOwner)) );
+    return new SwTextLine( const_cast<SwTextFrm *>(static_cast<SwTextFrm const *>(pOwner)) );
 }
 
-SwParaPortion *SwTxtLineAccess::GetPara()
+SwParaPortion *SwTextLineAccess::GetPara()
 {
-    SwTxtLine *pRet;
+    SwTextLine *pRet;
     if ( pObj )
-        pRet = static_cast<SwTxtLine*>(pObj);
+        pRet = static_cast<SwTextLine*>(pObj);
     else
     {
-        pRet = static_cast<SwTxtLine*>(Get());
-        const_cast<SwTxtFrm *>(static_cast<SwTxtFrm const *>(pOwner))->SetCacheIdx( pRet->GetCachePos() );
+        pRet = static_cast<SwTextLine*>(Get());
+        const_cast<SwTextFrm *>(static_cast<SwTextFrm const *>(pOwner))->SetCacheIdx( pRet->GetCachePos() );
     }
     if ( !pRet->GetPara() )
         pRet->SetPara( new SwParaPortion );
     return pRet->GetPara();
 }
 
-SwTxtLineAccess::SwTxtLineAccess( const SwTxtFrm *pOwn ) :
-    SwCacheAccess( *SwTxtFrm::GetTxtCache(), pOwn, pOwn->GetCacheIdx() )
+SwTextLineAccess::SwTextLineAccess( const SwTextFrm *pOwn ) :
+    SwCacheAccess( *SwTextFrm::GetTextCache(), pOwn, pOwn->GetCacheIdx() )
 {
 }
 
-bool SwTxtLineAccess::IsAvailable() const
+bool SwTextLineAccess::IsAvailable() const
 {
-    return pObj && static_cast<SwTxtLine*>(pObj)->GetPara();
+    return pObj && static_cast<SwTextLine*>(pObj)->GetPara();
 }
 
-bool SwTxtFrm::_HasPara() const
+bool SwTextFrm::_HasPara() const
 {
-    SwTxtLine *pTxtLine = static_cast<SwTxtLine*>(SwTxtFrm::GetTxtCache()->
+    SwTextLine *pTextLine = static_cast<SwTextLine*>(SwTextFrm::GetTextCache()->
                                             Get( this, GetCacheIdx(), false ));
-    if ( pTxtLine )
+    if ( pTextLine )
     {
-        if ( pTxtLine->GetPara() )
+        if ( pTextLine->GetPara() )
             return true;
     }
     else
-        const_cast<SwTxtFrm*>(this)->nCacheIdx = USHRT_MAX;
+        const_cast<SwTextFrm*>(this)->nCacheIdx = USHRT_MAX;
 
     return false;
 }
 
-SwParaPortion *SwTxtFrm::GetPara()
+SwParaPortion *SwTextFrm::GetPara()
 {
     if ( GetCacheIdx() != USHRT_MAX )
     {
-        SwTxtLine *pLine = static_cast<SwTxtLine*>(SwTxtFrm::GetTxtCache()->
+        SwTextLine *pLine = static_cast<SwTextLine*>(SwTextFrm::GetTextCache()->
                                         Get( this, GetCacheIdx(), false ));
         if ( pLine )
             return pLine->GetPara();
@@ -91,35 +91,35 @@ SwParaPortion *SwTxtFrm::GetPara()
     return 0;
 }
 
-void SwTxtFrm::ClearPara()
+void SwTextFrm::ClearPara()
 {
-    OSL_ENSURE( !IsLocked(), "+SwTxtFrm::ClearPara: this is locked." );
+    OSL_ENSURE( !IsLocked(), "+SwTextFrm::ClearPara: this is locked." );
     if ( !IsLocked() && GetCacheIdx() != USHRT_MAX )
     {
-        SwTxtLine *pTxtLine = static_cast<SwTxtLine*>(SwTxtFrm::GetTxtCache()->
+        SwTextLine *pTextLine = static_cast<SwTextLine*>(SwTextFrm::GetTextCache()->
                                         Get( this, GetCacheIdx(), false ));
-        if ( pTxtLine )
+        if ( pTextLine )
         {
-            delete pTxtLine->GetPara();
-            pTxtLine->SetPara( 0 );
+            delete pTextLine->GetPara();
+            pTextLine->SetPara( 0 );
         }
         else
             nCacheIdx = USHRT_MAX;
     }
 }
 
-void SwTxtFrm::SetPara( SwParaPortion *pNew, bool bDelete )
+void SwTextFrm::SetPara( SwParaPortion *pNew, bool bDelete )
 {
     if ( GetCacheIdx() != USHRT_MAX )
     {
         // Only change the information, the CacheObj stays there
-        SwTxtLine *pTxtLine = static_cast<SwTxtLine*>(SwTxtFrm::GetTxtCache()->
+        SwTextLine *pTextLine = static_cast<SwTextLine*>(SwTextFrm::GetTextCache()->
                                         Get( this, GetCacheIdx(), false ));
-        if ( pTxtLine )
+        if ( pTextLine )
         {
             if( bDelete )
-                delete pTxtLine->GetPara();
-            pTxtLine->SetPara( pNew );
+                delete pTextLine->GetPara();
+            pTextLine->SetPara( pNew );
         }
         else
         {
@@ -129,9 +129,9 @@ void SwTxtFrm::SetPara( SwParaPortion *pNew, bool bDelete )
     }
     else if ( pNew )
     {   // Insert a new one
-        SwTxtLine *pTxtLine = new SwTxtLine( this, pNew );
-        if ( SwTxtFrm::GetTxtCache()->Insert( pTxtLine ) )
-            nCacheIdx = pTxtLine->GetCachePos();
+        SwTextLine *pTextLine = new SwTextLine( this, pNew );
+        if ( SwTextFrm::GetTextCache()->Insert( pTextLine ) )
+            nCacheIdx = pTextLine->GetCachePos();
         else
         {
             OSL_FAIL( "+SetPara: InsertCache failed." );
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index 67c7d82f1a5a..286427503cca 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -24,17 +24,17 @@
 #include "swcache.hxx"
 
 class SwParaPortion;
-class SwTxtFrm;
+class SwTextFrm;
 
-class SwTxtLine : public SwCacheObj
+class SwTextLine : public SwCacheObj
 {
     SwParaPortion *pLine;
 
 public:
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTxtLine)
+    DECL_FIXEDMEMPOOL_NEWDEL(SwTextLine)
 
-    SwTxtLine( SwTxtFrm *pFrm, SwParaPortion *pNew = 0 );
-    virtual ~SwTxtLine();
+    SwTextLine( SwTextFrm *pFrm, SwParaPortion *pNew = 0 );
+    virtual ~SwTextLine();
 
     inline       SwParaPortion *GetPara()       { return pLine; }
     inline const SwParaPortion *GetPara() const { return pLine; }
@@ -42,25 +42,25 @@ public:
     inline void SetPara( SwParaPortion *pNew ) { pLine = pNew; }
 };
 
-class SwTxtLineAccess : public SwCacheAccess
+class SwTextLineAccess : public SwCacheAccess
 {
 
 protected:
     virtual SwCacheObj *NewObj() SAL_OVERRIDE;
 
 public:
-    SwTxtLineAccess( const SwTxtFrm *pOwner );
+    SwTextLineAccess( const SwTextFrm *pOwner );
 
     SwParaPortion *GetPara();
 
-    inline SwTxtLine &GetTxtLine();
+    inline SwTextLine &GetTextLine();
 
     virtual bool IsAvailable() const SAL_OVERRIDE;
 };
 
-inline SwTxtLine &SwTxtLineAccess::GetTxtLine()
+inline SwTextLine &SwTextLineAccess::GetTextLine()
 {
-    return *static_cast<SwTxtLine*>(Get());
+    return *static_cast<SwTextLine*>(Get());
 }
 
 #endif
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index bd06251d064f..296b487845a6 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -46,17 +46,17 @@ using namespace ::com::sun::star;
  * The width and height of the drop caps portion are passed as arguments,
  * the position is calculated from the values in rInf
  */
-static bool lcl_IsDropFlyInter( const SwTxtFormatInfo &rInf,
+static bool lcl_IsDropFlyInter( const SwTextFormatInfo &rInf,
                              sal_uInt16 nWidth, sal_uInt16 nHeight )
 {
-    const SwTxtFly& rTxtFly = rInf.GetTxtFly();
-    if( rTxtFly.IsOn() )
+    const SwTextFly& rTextFly = rInf.GetTextFly();
+    if( rTextFly.IsOn() )
     {
-        SwRect aRect( rInf.GetTxtFrm()->Frm().Pos(), Size( nWidth, nHeight) );
-        aRect.Pos() += rInf.GetTxtFrm()->Prt().Pos();
+        SwRect aRect( rInf.GetTextFrm()->Frm().Pos(), Size( nWidth, nHeight) );
+        aRect.Pos() += rInf.GetTextFrm()->Prt().Pos();
         aRect.Pos().X() += rInf.X();
         aRect.Pos().Y() = rInf.Y();
-        aRect = rTxtFly.GetFrm( aRect );
+        aRect = rTextFly.GetFrm( aRect );
         return aRect.HasArea();
     }
 
@@ -65,19 +65,19 @@ static bool lcl_IsDropFlyInter( const SwTxtFormatInfo &rInf,
 
 class SwDropSave
 {
-    SwTxtPaintInfo* pInf;
+    SwTextPaintInfo* pInf;
     sal_Int32 nIdx;
     sal_Int32 nLen;
     long nX;
     long nY;
 
 public:
-    SwDropSave( const SwTxtPaintInfo &rInf );
+    SwDropSave( const SwTextPaintInfo &rInf );
     ~SwDropSave();
 };
 
-SwDropSave::SwDropSave( const SwTxtPaintInfo &rInf ) :
-        pInf( const_cast<SwTxtPaintInfo*>(&rInf) ), nIdx( rInf.GetIdx() ),
+SwDropSave::SwDropSave( const SwTextPaintInfo &rInf ) :
+        pInf( const_cast<SwTextPaintInfo*>(&rInf) ), nIdx( rInf.GetIdx() ),
         nLen( rInf.GetLen() ), nX( rInf.X() ), nY( rInf.Y() )
 {
 }
@@ -122,9 +122,9 @@ SwDropPortion::~SwDropPortion()
 }
 
 /// nWishLen = 0 indicates that we want a whole word
-sal_Int32 SwTxtNode::GetDropLen( sal_Int32 nWishLen ) const
+sal_Int32 SwTextNode::GetDropLen( sal_Int32 nWishLen ) const
 {
-    sal_Int32 nEnd = GetTxt().getLength();
+    sal_Int32 nEnd = GetText().getLength();
     if( nWishLen && nWishLen < nEnd )
         nEnd = nWishLen;
 
@@ -132,11 +132,11 @@ sal_Int32 SwTxtNode::GetDropLen( sal_Int32 nWishLen ) const
     {
         // find first word
         const SwAttrSet& rAttrSet = GetSwAttrSet();
-        const sal_uInt16 nTxtScript = g_pBreakIt->GetRealScriptOfText( GetTxt(), 0 );
+        const sal_uInt16 nTextScript = g_pBreakIt->GetRealScriptOfText( GetText(), 0 );
 
         LanguageType eLanguage;
 
-        switch ( nTxtScript )
+        switch ( nTextScript )
         {
         case i18n::ScriptType::ASIAN :
             eLanguage = rAttrSet.GetCJKLanguage().GetLanguage();
@@ -150,7 +150,7 @@ sal_Int32 SwTxtNode::GetDropLen( sal_Int32 nWishLen ) const
         }
 
         Boundary aBound =
-            g_pBreakIt->GetBreakIter()->getWordBoundary( GetTxt(), 0,
+            g_pBreakIt->GetBreakIter()->getWordBoundary( GetText(), 0,
             g_pBreakIt->GetLocale( eLanguage ), WordType::DICTIONARY_WORD, true );
 
         nEnd = aBound.endPos;
@@ -159,10 +159,10 @@ sal_Int32 SwTxtNode::GetDropLen( sal_Int32 nWishLen ) const
     sal_Int32 i = 0;
     for( ; i < nEnd; ++i )
     {
-        sal_Unicode const cChar = GetTxt()[i];
+        sal_Unicode const cChar = GetText()[i];
         if( CH_TAB == cChar || CH_BREAK == cChar ||
             (( CH_TXTATR_BREAKWORD == cChar || CH_TXTATR_INWORD == cChar )
-                && SwTxtSizeInfo::_HasHint( this, i ) ) )
+                && SwTextSizeInfo::_HasHint( this, i ) ) )
             break;
     }
     return i;
@@ -173,14 +173,14 @@ sal_Int32 SwTxtNode::GetDropLen( sal_Int32 nWishLen ) const
  * drop cap sizes passed back by reference are font height, drop height
  * and drop descent.
  */
-bool SwTxtNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescent) const
+bool SwTextNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescent) const
 {
     rFontHeight = 0;
     rDropHeight = 0;
     rDropDescent =0;
 
     const SwAttrSet& rSet = GetSwAttrSet();
-    const SwFmtDrop& rDrop = rSet.GetDrop();
+    const SwFormatDrop& rDrop = rSet.GetDrop();
 
     // Return (0,0) if there is no drop cap at this paragraph
     if( 1 >= rDrop.GetLines() ||
@@ -190,8 +190,8 @@ bool SwTxtNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescen
     }
 
     // get text frame
-    SwIterator<SwTxtFrm,SwTxtNode> aIter( *this );
-    for( SwTxtFrm* pLastFrm = aIter.First(); pLastFrm; pLastFrm = aIter.Next() )
+    SwIterator<SwTextFrm,SwTextNode> aIter( *this );
+    for( SwTextFrm* pLastFrm = aIter.First(); pLastFrm; pLastFrm = aIter.Next() )
     {
         // Only (master-) text frames can have a drop cap.
         if ( !pLastFrm->IsFollow() )
@@ -242,7 +242,7 @@ bool SwTxtNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescen
 }
 
 /// Manipulate the width, otherwise the chars are being stretched
-void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf ) const
+void SwDropPortion::PaintText( const SwTextPaintInfo &rInf ) const
 {
     OSL_ENSURE( nDropHeight && pPart && nLines != 1, "Drop Portion painted twice" );
 
@@ -252,7 +252,7 @@ void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf ) const
     const sal_uInt16 nOldAscent = GetAscent();
 
     const SwTwips nBasePosY  = rInf.Y();
-    const_cast<SwTxtPaintInfo&>(rInf).Y( nBasePosY + nY );
+    const_cast<SwTextPaintInfo&>(rInf).Y( nBasePosY + nY );
     const_cast<SwDropPortion*>(this)->SetAscent( nOldAscent + nY );
     SwDropSave aSave( rInf );
     // for text inside drop portions we let vcl handle the text directions
@@ -263,7 +263,7 @@ void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf ) const
     {
         const_cast<SwDropPortion*>(this)->SetLen( pCurrPart->GetLen() );
         const_cast<SwDropPortion*>(this)->Width( pCurrPart->GetWidth() );
-        const_cast<SwTxtPaintInfo&>(rInf).SetLen( pCurrPart->GetLen() );
+        const_cast<SwTextPaintInfo&>(rInf).SetLen( pCurrPart->GetLen() );
         SwFontSave aFontSave( rInf, &pCurrPart->GetFont() );
         const_cast<SwDropPortion*>(this)->SetJoinBorderWithNext(pCurrPart->GetJoinBorderWithNext());
         const_cast<SwDropPortion*>(this)->SetJoinBorderWithPrev(pCurrPart->GetJoinBorderWithPrev());
@@ -275,14 +275,14 @@ void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf ) const
             rInf.DrawBackground( *this );
         }
 
-        SwTxtPortion::Paint( rInf );
+        SwTextPortion::Paint( rInf );
 
-        const_cast<SwTxtPaintInfo&>(rInf).SetIdx( rInf.GetIdx() + pCurrPart->GetLen() );
-        const_cast<SwTxtPaintInfo&>(rInf).X( rInf.X() + pCurrPart->GetWidth() );
+        const_cast<SwTextPaintInfo&>(rInf).SetIdx( rInf.GetIdx() + pCurrPart->GetLen() );
+        const_cast<SwTextPaintInfo&>(rInf).X( rInf.X() + pCurrPart->GetWidth() );
         pCurrPart = pCurrPart->GetFollow();
     }
 
-    const_cast<SwTxtPaintInfo&>(rInf).Y( nBasePosY );
+    const_cast<SwTextPaintInfo&>(rInf).Y( nBasePosY );
     const_cast<SwDropPortion*>(this)->Width( nOldWidth );
     const_cast<SwDropPortion*>(this)->SetLen( nOldLen );
     const_cast<SwDropPortion*>(this)->SetAscent( nOldAscent );
@@ -290,7 +290,7 @@ void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf ) const
     const_cast<SwDropPortion*>(this)->SetJoinBorderWithPrev(false);
 }
 
-void SwDropPortion::PaintDrop( const SwTxtPaintInfo &rInf ) const
+void SwDropPortion::PaintDrop( const SwTextPaintInfo &rInf ) const
 {
     // normal output is being done during the normal painting
     if( ! nDropHeight || ! pPart || nLines == 1 )
@@ -308,7 +308,7 @@ void SwDropPortion::PaintDrop( const SwTxtPaintInfo &rInf ) const
     // make good for retouching
 
     // Set baseline
-    const_cast<SwTxtPaintInfo&>(rInf).Y( aOutPos.Y() + nDropHeight );
+    const_cast<SwTextPaintInfo&>(rInf).Y( aOutPos.Y() + nDropHeight );
 
     // for background
     const_cast<SwDropPortion*>(this)->Height( nDropHeight + nDropDescent );
@@ -324,19 +324,19 @@ void SwDropPortion::PaintDrop( const SwTxtPaintInfo &rInf ) const
         aClipRect.Intersection( rInf.GetPaintRect() );
     }
     SwSaveClip aClip( const_cast<OutputDevice*>(rInf.GetOut()) );
-    aClip.ChgClip( aClipRect, rInf.GetTxtFrm() );
+    aClip.ChgClip( aClipRect, rInf.GetTextFrm() );
 
     // Just do, what we always do ...
-    PaintTxt( rInf );
+    PaintText( rInf );
 
     // save old values
     const_cast<SwDropPortion*>(this)->Height( nOldHeight );
     const_cast<SwDropPortion*>(this)->Width( nOldWidth );
     const_cast<SwDropPortion*>(this)->SetAscent( nOldAscent );
-    const_cast<SwTxtPaintInfo&>(rInf).Y( nOldPosY );
+    const_cast<SwTextPaintInfo&>(rInf).Y( nOldPosY );
 }
 
-void SwDropPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwDropPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     // normal output is being done here
     if( ! nDropHeight || ! pPart || 1 == nLines )
@@ -347,10 +347,10 @@ void SwDropPortion::Paint( const SwTxtPaintInfo &rInf ) const
 
         // make sure that font is not rotated
         SwFont* pTmpFont = 0;
-        if ( rInf.GetFont()->GetOrientation( rInf.GetTxtFrm()->IsVertical() ) )
+        if ( rInf.GetFont()->GetOrientation( rInf.GetTextFrm()->IsVertical() ) )
         {
             pTmpFont = new SwFont( *rInf.GetFont() );
-            pTmpFont->SetVertical( 0, rInf.GetTxtFrm()->IsVertical() );
+            pTmpFont->SetVertical( 0, rInf.GetTextFrm()->IsVertical() );
         }
 
         SwFontSave aFontSave( rInf, pTmpFont );
@@ -358,16 +358,16 @@ void SwDropPortion::Paint( const SwTxtPaintInfo &rInf ) const
         SwLayoutModeModifier aLayoutModeModifier( *rInf.GetOut() );
         aLayoutModeModifier.SetAuto();
 
-        SwTxtPortion::Paint( rInf );
+        SwTextPortion::Paint( rInf );
         delete pTmpFont;
     }
 }
 
-bool SwDropPortion::FormatTxt( SwTxtFormatInfo &rInf )
+bool SwDropPortion::FormatText( SwTextFormatInfo &rInf )
 {
     const sal_Int32 nOldLen = GetLen();
     const sal_Int32 nOldInfLen = rInf.GetLen();
-    if (!SwTxtPortion::Format( rInf ))
+    if (!SwTextPortion::Format( rInf ))
         return false;
 
     // looks like shit, but what can we do?
@@ -379,7 +379,7 @@ bool SwDropPortion::FormatTxt( SwTxtFormatInfo &rInf )
     return true;
 }
 
-SwPosSize SwDropPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
+SwPosSize SwDropPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
 {
     sal_uInt16 nMyX = 0;
     sal_Int32 nIdx = 0;
@@ -397,8 +397,8 @@ SwPosSize SwDropPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
     sal_Int32 nOldIdx = rInf.GetIdx();
     sal_Int32 nOldLen = rInf.GetLen();
 
-    const_cast<SwTxtSizeInfo&>(rInf).SetIdx( nIdx );
-    const_cast<SwTxtSizeInfo&>(rInf).SetLen( rInf.GetLen() - nIdx );
+    const_cast<SwTextSizeInfo&>(rInf).SetIdx( nIdx );
+    const_cast<SwTextSizeInfo&>(rInf).SetLen( rInf.GetLen() - nIdx );
 
     if( pCurrPart )
     {
@@ -408,11 +408,11 @@ SwPosSize SwDropPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
 
     // robust
     SwFontSave aFontSave( rInf, pCurrPart ? &pCurrPart->GetFont() : 0 );
-    SwPosSize aPosSize( SwTxtPortion::GetTxtSize( rInf ) );
+    SwPosSize aPosSize( SwTextPortion::GetTextSize( rInf ) );
     aPosSize.Width( aPosSize.Width() + nMyX );
 
-    const_cast<SwTxtSizeInfo&>(rInf).SetIdx( nOldIdx );
-    const_cast<SwTxtSizeInfo&>(rInf).SetLen( nOldLen );
+    const_cast<SwTextSizeInfo&>(rInf).SetIdx( nOldIdx );
+    const_cast<SwTextSizeInfo&>(rInf).SetLen( nOldLen );
     if( pCurrPart )
     {
         const_cast<SwDropPortion*>(this)->SetJoinBorderWithNext(false);
@@ -427,7 +427,7 @@ sal_Int32 SwDropPortion::GetCrsrOfst( const sal_uInt16 ) const
     return 0;
 }
 
-void SwTxtFormatter::CalcDropHeight( const sal_uInt16 nLines )
+void SwTextFormatter::CalcDropHeight( const sal_uInt16 nLines )
 {
     const SwLinePortion *const pOldCurr = GetCurr();
     sal_uInt16 nDropHght = 0;
@@ -479,7 +479,7 @@ void SwTxtFormatter::CalcDropHeight( const sal_uInt16 nLines )
     {
         if( !Next() )
         {
-            OSL_ENSURE( false, "SwTxtFormatter::_CalcDropHeight: left Toulouse" );
+            OSL_ENSURE( false, "SwTextFormatter::_CalcDropHeight: left Toulouse" );
             break;
         }
     }
@@ -489,7 +489,7 @@ void SwTxtFormatter::CalcDropHeight( const sal_uInt16 nLines )
  * We assume hat the font height doesn't change and that at first there
  * are at least as many lines, as the DropCap-setting claims
  */
-void SwTxtFormatter::GuessDropHeight( const sal_uInt16 nLines )
+void SwTextFormatter::GuessDropHeight( const sal_uInt16 nLines )
 {
     OSL_ENSURE( nLines, "GuessDropHeight: Give me more Lines!" );
     sal_uInt16 nAscent = 0;
@@ -504,16 +504,16 @@ void SwTxtFormatter::GuessDropHeight( const sal_uInt16 nLines )
     SetDropHeight( nHeight * nLines - GetDropDescent() );
 }
 
-SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
+SwDropPortion *SwTextFormatter::NewDropPortion( SwTextFormatInfo &rInf )
 {
-    if( !pDropFmt )
+    if( !pDropFormat )
         return 0;
 
-    sal_Int32 nPorLen = pDropFmt->GetWholeWord() ? 0 : pDropFmt->GetChars();
-    nPorLen = pFrm->GetTxtNode()->GetDropLen( nPorLen );
+    sal_Int32 nPorLen = pDropFormat->GetWholeWord() ? 0 : pDropFormat->GetChars();
+    nPorLen = pFrm->GetTextNode()->GetDropLen( nPorLen );
     if( !nPorLen )
     {
-        static_cast<SwTxtFormatter*>(this)->ClearDropFmt();
+        static_cast<SwTextFormatter*>(this)->ClearDropFormat();
         return 0;
     }
 
@@ -523,17 +523,17 @@ SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
     if ( !( GetDropHeight() || IsOnceMore() ) )
     {
         if ( GetNext() )
-            CalcDropHeight( pDropFmt->GetLines() );
+            CalcDropHeight( pDropFormat->GetLines() );
         else
-            GuessDropHeight( pDropFmt->GetLines() );
+            GuessDropHeight( pDropFormat->GetLines() );
     }
 
     // the DropPortion
     if( GetDropHeight() )
         pDropPor = new SwDropPortion( GetDropLines(), GetDropHeight(),
-                                      GetDropDescent(), pDropFmt->GetDistance() );
+                                      GetDropDescent(), pDropFormat->GetDistance() );
     else
-       pDropPor = new SwDropPortion( 0,0,0,pDropFmt->GetDistance() );
+       pDropPor = new SwDropPortion( 0,0,0,pDropFormat->GetDistance() );
 
     pDropPor->SetLen( nPorLen );
 
@@ -543,14 +543,14 @@ SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
     // font is used.
     if ( GetDropLines() < 2 )
     {
-        static_cast<SwTxtFormatter*>(this)->SetPaintDrop( true );
+        static_cast<SwTextFormatter*>(this)->SetPaintDrop( true );
         return pDropPor;
     }
 
     // build DropPortionParts:
     OSL_ENSURE( ! rInf.GetIdx(), "Drop Portion not at 0 position!" );
     sal_Int32 nNextChg = 0;
-    const SwCharFmt* pFmt = pDropFmt->GetCharFmt();
+    const SwCharFormat* pFormat = pDropFormat->GetCharFormat();
     SwDropPortionPart* pCurrPart = 0;
 
     while ( nNextChg  < nPorLen )
@@ -560,18 +560,18 @@ SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
 
         // the font is deleted in the destructor of the drop portion part
         SwFont* pTmpFnt = new SwFont( *rInf.GetFont() );
-        if ( pFmt )
+        if ( pFormat )
         {
-            const SwAttrSet& rSet = pFmt->GetAttrSet();
-            pTmpFnt->SetDiffFnt( &rSet, pFrm->GetTxtNode()->getIDocumentSettingAccess() );
+            const SwAttrSet& rSet = pFormat->GetAttrSet();
+            pTmpFnt->SetDiffFnt( &rSet, pFrm->GetTextNode()->getIDocumentSettingAccess() );
         }
 
         // we do not allow a vertical font for the drop portion
-        pTmpFnt->SetVertical( 0, rInf.GetTxtFrm()->IsVertical() );
+        pTmpFnt->SetVertical( 0, rInf.GetTextFrm()->IsVertical() );
 
         // find next attribute change / script change
         const sal_Int32 nTmpIdx = nNextChg;
-        sal_Int32 nNextAttr = std::min( static_cast<sal_Int32>(GetNextAttr()), rInf.GetTxt().getLength() );
+        sal_Int32 nNextAttr = std::min( static_cast<sal_Int32>(GetNextAttr()), rInf.GetText().getLength() );
         nNextChg = pScriptInfo->NextScriptChg( nTmpIdx );
         if( nNextChg > nNextAttr )
             nNextChg = nNextAttr;
@@ -589,11 +589,11 @@ SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
         pCurrPart = pPart;
     }
 
-    static_cast<SwTxtFormatter*>(this)->SetPaintDrop( true );
+    static_cast<SwTextFormatter*>(this)->SetPaintDrop( true );
     return pDropPor;
 }
 
-void SwTxtPainter::PaintDropPortion()
+void SwTextPainter::PaintDropPortion()
 {
     const SwDropPortion *pDrop = GetInfo().GetParaPortion()->FindDropPortion();
     OSL_ENSURE( pDrop, "DrapCop-Portion not available." );
@@ -643,7 +643,7 @@ void SwTxtPainter::PaintDropPortion()
 class SwDropCapCache
 {
     long aMagicNo[ DROP_CACHE_SIZE ];
-    OUString aTxt[ DROP_CACHE_SIZE ];
+    OUString aText[ DROP_CACHE_SIZE ];
     sal_uInt16 aFactor[ DROP_CACHE_SIZE ];
     sal_uInt16 aWishedHeight[ DROP_CACHE_SIZE ];
     short aDescent[ DROP_CACHE_SIZE ];
@@ -651,7 +651,7 @@ class SwDropCapCache
 public:
     SwDropCapCache();
     ~SwDropCapCache(){}
-    void CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf );
+    void CalcFontSize( SwDropPortion* pDrop, SwTextFormatInfo &rInf );
 };
 
 // SwDropCapCache Ctor / Dtor
@@ -666,7 +666,7 @@ void SwDropPortion::DeleteDropCapCache()
     delete pDropCapCache;
 }
 
-void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
+void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTextFormatInfo &rInf )
 {
     const void* pFntNo = 0;
     sal_uInt16 nTmpIdx = 0;
@@ -676,7 +676,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
     SwDropPortionPart* pCurrPart = pDrop->GetPart();
     const bool bUseCache = ! pCurrPart->GetFollow() && !pCurrPart->GetFont().HasBorder();
     sal_Int32 nIdx = rInf.GetIdx();
-    OUString aStr(rInf.GetTxt().copy(nIdx, pCurrPart->GetLen()));
+    OUString aStr(rInf.GetText().copy(nIdx, pCurrPart->GetLen()));
 
     long nAscent = 0;
     long nDescent = 0;
@@ -691,7 +691,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
         nTmpIdx = 0;
 
         while( nTmpIdx < DROP_CACHE_SIZE &&
-            ( aTxt[ nTmpIdx ] != aStr || aMagicNo[ nTmpIdx ] != sal_IntPtr(pFntNo) ||
+            ( aText[ nTmpIdx ] != aStr || aMagicNo[ nTmpIdx ] != sal_IntPtr(pFntNo) ||
             aWishedHeight[ nTmpIdx ] != pDrop->GetDropHeight() ) )
             ++nTmpIdx;
     }
@@ -726,7 +726,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
         {
             // save keys for cache
             aMagicNo[ nTmpIdx ] = sal_IntPtr(pFntNo);
-            aTxt[ nTmpIdx ] = aStr;
+            aText[ nTmpIdx ] = aStr;
             aWishedHeight[ nTmpIdx ] = sal_uInt16(nWishedHeight);
             // save initial scaling factor
             aFactor[ nTmpIdx ] = (sal_uInt16)nFactor;
@@ -778,7 +778,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
                 nAscent = rFnt.GetAscent( rInf.GetVsh(), *pOut );
 
                 // we get the rectangle that covers all chars
-                bool bHaveGlyphRect = pOut->GetTextBoundRect( aRect, rInf.GetTxt(), 0,
+                bool bHaveGlyphRect = pOut->GetTextBoundRect( aRect, rInf.GetText(), 0,
                                      nIdx, pCurrPart->GetLen() ) &&
                                  ! aRect.IsEmpty();
 
@@ -797,7 +797,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
                         }
                         pWin->SetFont( rFnt.GetActualFont() );
 
-                        bHaveGlyphRect = pWin->GetTextBoundRect( aRect, rInf.GetTxt(), 0,
+                        bHaveGlyphRect = pWin->GetTextBoundRect( aRect, rInf.GetText(), 0,
                                             nIdx, pCurrPart->GetLen() ) &&
                                         ! aRect.IsEmpty();
                     }
@@ -855,7 +855,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
             // respect to a common baseline : 0
 
             // get descent and ascent from union
-            if ( rInf.GetTxtFrm()->IsVertical() )
+            if ( rInf.GetTextFrm()->IsVertical() )
             {
                 nDescent = aCommonRect.Left();
                 nAscent = aCommonRect.Right();
@@ -933,7 +933,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
     pDrop->SetY( (short)nDescent );
 }
 
-bool SwDropPortion::Format( SwTxtFormatInfo &rInf )
+bool SwDropPortion::Format( SwTextFormatInfo &rInf )
 {
     bool bFull = false;
     Fix( (sal_uInt16)rInf.X() );
@@ -962,7 +962,7 @@ bool SwDropPortion::Format( SwTxtFormatInfo &rInf )
                     SwFontSave aFontSave( rInf, &rFnt );
                     SetJoinBorderWithNext(pCurrPart->GetJoinBorderWithNext());
                     SetJoinBorderWithPrev(pCurrPart->GetJoinBorderWithPrev());
-                    bFull = FormatTxt( rInf );
+                    bFull = FormatText( rInf );
 
                     if ( bFull )
                         break;
@@ -995,9 +995,9 @@ bool SwDropPortion::Format( SwTxtFormatInfo &rInf )
 
         if( bFull )
         {
-            // FormatTxt could have caused nHeight to be 0
+            // FormatText could have caused nHeight to be 0
             if ( !Height() )
-                Height( rInf.GetTxtHeight() );
+                Height( rInf.GetTextHeight() );
 
             // And now for another round
             nDropHeight = nLines = 0;
@@ -1005,16 +1005,16 @@ bool SwDropPortion::Format( SwTxtFormatInfo &rInf )
             pPart = NULL;
 
             // Meanwhile use normal formatting
-            bFull = SwTxtPortion::Format( rInf );
+            bFull = SwTextPortion::Format( rInf );
         }
         else
             rInf.SetDropInit( true );
 
-        Height( rInf.GetTxtHeight() );
+        Height( rInf.GetTextHeight() );
         SetAscent( rInf.GetAscent() );
     }
     else
-        bFull = SwTxtPortion::Format( rInf );
+        bFull = SwTextPortion::Format( rInf );
 
     if( bFull )
         nDistance = 0;
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 39bbdc9c6712..98fc3c98158c 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -68,26 +68,26 @@ static bool lcl_IsInBody( SwFrm *pFrm )
     }
 }
 
-SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
-                                                const SwTxtAttr *pHint ) const
+SwExpandPortion *SwTextFormatter::NewFieldPortion( SwTextFormatInfo &rInf,
+                                                const SwTextAttr *pHint ) const
 {
     SwExpandPortion *pRet = 0;
     SwFrm *pFrame = pFrm;
-    SwField *pFld = const_cast<SwField*>(pHint->GetFmtFld().GetField());
-    const bool bName = rInf.GetOpt().IsFldName();
+    SwField *pField = const_cast<SwField*>(pHint->GetFormatField().GetField());
+    const bool bName = rInf.GetOpt().IsFieldName();
 
-    SwCharFmt* pChFmt = 0;
+    SwCharFormat* pChFormat = 0;
     bool bNewFlyPor = false;
     sal_uInt16 subType = 0;
 
     // set language
-    const_cast<SwTxtFormatter*>(this)->SeekAndChg( rInf );
-    if (pFld->GetLanguage() != GetFnt()->GetLanguage())
+    const_cast<SwTextFormatter*>(this)->SeekAndChg( rInf );
+    if (pField->GetLanguage() != GetFnt()->GetLanguage())
     {
-        pFld->SetLanguage( GetFnt()->GetLanguage() );
+        pField->SetLanguage( GetFnt()->GetLanguage() );
         // let the visual note know about its new language
-        if (pFld->GetTyp()->Which()==RES_POSTITFLD)
-            const_cast<SwFmtFld*> (&pHint->GetFmtFld())->Broadcast( SwFmtFldHint( &pHint->GetFmtFld(), SwFmtFldHintWhich::LANGUAGE ) );
+        if (pField->GetTyp()->Which()==RES_POSTITFLD)
+            const_cast<SwFormatField*> (&pHint->GetFormatField())->Broadcast( SwFormatFieldHint( &pHint->GetFormatField(), SwFormatFieldHintWhich::LANGUAGE ) );
     }
 
     SwViewShell *pSh = rInf.GetVsh();
@@ -95,111 +95,111 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
     bool const bInClipboard( pDoc == nullptr || pDoc->IsClipBoard() );
     bool bPlaceHolder = false;
 
-    switch( pFld->GetTyp()->Which() )
+    switch( pField->GetTyp()->Which() )
     {
         case RES_SCRIPTFLD:
         case RES_POSTITFLD:
-            pRet = new SwPostItsPortion( RES_SCRIPTFLD == pFld->GetTyp()->Which() );
+            pRet = new SwPostItsPortion( RES_SCRIPTFLD == pField->GetTyp()->Which() );
             break;
 
         case RES_COMBINED_CHARS:
             {
                 if( bName )
-                    pRet = new SwFldPortion( pFld->GetFieldName() );
+                    pRet = new SwFieldPortion( pField->GetFieldName() );
                 else
-                    pRet = new SwCombinedPortion( pFld->ExpandField(bInClipboard) );
+                    pRet = new SwCombinedPortion( pField->ExpandField(bInClipboard) );
             }
             break;
 
         case RES_HIDDENTXTFLD:
             {
                 OUString const aStr( (bName)
-                        ? pFld->GetFieldName()
-                        : pFld->ExpandField(bInClipboard) );
+                        ? pField->GetFieldName()
+                        : pField->ExpandField(bInClipboard) );
                 pRet = new SwHiddenPortion(aStr);
             }
             break;
 
         case RES_CHAPTERFLD:
-            if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() )
+            if( !bName && pSh && !pSh->Imp()->IsUpdateExpFields() )
             {
-                static_cast<SwChapterField*>(pFld)->ChangeExpansion( pFrame,
-                    &static_txtattr_cast<SwTxtFld const*>(pHint)->GetTxtNode());
+                static_cast<SwChapterField*>(pField)->ChangeExpansion( pFrame,
+                    &static_txtattr_cast<SwTextField const*>(pHint)->GetTextNode());
             }
             {
                 OUString const aStr( (bName)
-                        ? pFld->GetFieldName()
-                        : pFld->ExpandField(bInClipboard) );
-                pRet = new SwFldPortion( aStr );
+                        ? pField->GetFieldName()
+                        : pField->ExpandField(bInClipboard) );
+                pRet = new SwFieldPortion( aStr );
             }
             break;
 
         case RES_DOCSTATFLD:
-            if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() )
+            if( !bName && pSh && !pSh->Imp()->IsUpdateExpFields() )
             {
-                static_cast<SwDocStatField*>(pFld)->ChangeExpansion( pFrame );
+                static_cast<SwDocStatField*>(pField)->ChangeExpansion( pFrame );
             }
             {
                 OUString const aStr( (bName)
-                        ? pFld->GetFieldName()
-                        : pFld->ExpandField(bInClipboard) );
-                pRet = new SwFldPortion( aStr );
+                        ? pField->GetFieldName()
+                        : pField->ExpandField(bInClipboard) );
+                pRet = new SwFieldPortion( aStr );
             }
-            static_cast<SwFldPortion*>(pRet)->m_nAttrFldType= ATTR_PAGECOOUNTFLD;
+            static_cast<SwFieldPortion*>(pRet)->m_nAttrFieldType= ATTR_PAGECOOUNTFLD;
             break;
 
         case RES_PAGENUMBERFLD:
         {
-            if( !bName && pSh && pSh->GetLayout() && !pSh->Imp()->IsUpdateExpFlds() )
+            if( !bName && pSh && pSh->GetLayout() && !pSh->Imp()->IsUpdateExpFields() )
             {
-                SwPageNumberFieldType *pPageNr = static_cast<SwPageNumberFieldType *>(pFld->GetTyp());
+                SwPageNumberFieldType *pPageNr = static_cast<SwPageNumberFieldType *>(pField->GetTyp());
 
                 const SwRootFrm* pTmpRootFrm = pSh->GetLayout();
                 const bool bVirt = pTmpRootFrm->IsVirtPageNum();
 
                 sal_uInt16 nVirtNum = pFrame->GetVirtPageNum();
                 sal_uInt16 nNumPages = pTmpRootFrm->GetPageNum();
-                sal_Int16 nNumFmt = -1;
-                if(SVX_NUM_PAGEDESC == pFld->GetFormat())
-                    nNumFmt = pFrame->FindPageFrm()->GetPageDesc()->GetNumType().GetNumberingType();
-                static_cast<SwPageNumberField*>(pFld)
+                sal_Int16 nNumFormat = -1;
+                if(SVX_NUM_PAGEDESC == pField->GetFormat())
+                    nNumFormat = pFrame->FindPageFrm()->GetPageDesc()->GetNumType().GetNumberingType();
+                static_cast<SwPageNumberField*>(pField)
                     ->ChangeExpansion(nVirtNum, nNumPages);
                 pPageNr->ChangeExpansion(pDoc,
-                                            bVirt, nNumFmt > -1 ? &nNumFmt : 0);
+                                            bVirt, nNumFormat > -1 ? &nNumFormat : 0);
             }
             {
                 OUString const aStr( (bName)
-                        ? pFld->GetFieldName()
-                        : pFld->ExpandField(bInClipboard) );
-                pRet = new SwFldPortion( aStr );
+                        ? pField->GetFieldName()
+                        : pField->ExpandField(bInClipboard) );
+                pRet = new SwFieldPortion( aStr );
             }
-            static_cast<SwFldPortion*>(pRet)->m_nAttrFldType= ATTR_PAGENUMBERFLD;
+            static_cast<SwFieldPortion*>(pRet)->m_nAttrFieldType= ATTR_PAGENUMBERFLD;
             break;
         }
         case RES_GETEXPFLD:
         {
-            if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() )
+            if( !bName && pSh && !pSh->Imp()->IsUpdateExpFields() )
             {
-                SwGetExpField* pExpFld = static_cast<SwGetExpField*>(pFld);
+                SwGetExpField* pExpField = static_cast<SwGetExpField*>(pField);
                 if( !::lcl_IsInBody( pFrame ) )
                 {
-                    pExpFld->ChgBodyTxtFlag( false );
-                    pExpFld->ChangeExpansion(*pFrame,
-                            *static_txtattr_cast<SwTxtFld const*>(pHint));
+                    pExpField->ChgBodyTextFlag( false );
+                    pExpField->ChangeExpansion(*pFrame,
+                            *static_txtattr_cast<SwTextField const*>(pHint));
                 }
-                else if( !pExpFld->IsInBodyTxt() )
+                else if( !pExpField->IsInBodyText() )
                 {
                     // Was something else previously, thus: expand first, then convert it!
-                    pExpFld->ChangeExpansion(*pFrame,
-                            *static_txtattr_cast<SwTxtFld const*>(pHint));
-                    pExpFld->ChgBodyTxtFlag( true );
+                    pExpField->ChangeExpansion(*pFrame,
+                            *static_txtattr_cast<SwTextField const*>(pHint));
+                    pExpField->ChgBodyTextFlag( true );
                 }
             }
             {
                 OUString const aStr( (bName)
-                        ? pFld->GetFieldName()
-                        : pFld->ExpandField(bInClipboard) );
-                pRet = new SwFldPortion( aStr );
+                        ? pField->GetFieldName()
+                        : pField->ExpandField(bInClipboard) );
+                pRet = new SwFieldPortion( aStr );
             }
             break;
         }
@@ -207,69 +207,69 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
         {
             if( !bName )
             {
-                SwDBField* pDBFld = static_cast<SwDBField*>(pFld);
-                pDBFld->ChgBodyTxtFlag( ::lcl_IsInBody( pFrame ) );
+                SwDBField* pDBField = static_cast<SwDBField*>(pField);
+                pDBField->ChgBodyTextFlag( ::lcl_IsInBody( pFrame ) );
             }
             {
                 OUString const aStr( (bName)
-                        ? pFld->GetFieldName()
-                        : pFld->ExpandField(bInClipboard) );
-                pRet = new SwFldPortion(aStr);
+                        ? pField->GetFieldName()
+                        : pField->ExpandField(bInClipboard) );
+                pRet = new SwFieldPortion(aStr);
             }
             break;
         }
         case RES_REFPAGEGETFLD:
-            if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() )
+            if( !bName && pSh && !pSh->Imp()->IsUpdateExpFields() )
             {
-                static_cast<SwRefPageGetField*>(pFld)->ChangeExpansion(pFrame,
-                        static_txtattr_cast<SwTxtFld const*>(pHint));
+                static_cast<SwRefPageGetField*>(pField)->ChangeExpansion(pFrame,
+                        static_txtattr_cast<SwTextField const*>(pHint));
             }
             {
                 OUString const aStr( (bName)
-                        ? pFld->GetFieldName()
-                        : pFld->ExpandField(bInClipboard) );
-                pRet = new SwFldPortion(aStr);
+                        ? pField->GetFieldName()
+                        : pField->ExpandField(bInClipboard) );
+                pRet = new SwFieldPortion(aStr);
             }
             break;
 
         case RES_JUMPEDITFLD:
             if( !bName )
-                pChFmt = static_cast<SwJumpEditField*>(pFld)->GetCharFmt();
+                pChFormat = static_cast<SwJumpEditField*>(pField)->GetCharFormat();
             bNewFlyPor = true;
             bPlaceHolder = true;
             break;
         case RES_GETREFFLD:
-            subType = static_cast<SwGetRefField*>(pFld)->GetSubType();
+            subType = static_cast<SwGetRefField*>(pField)->GetSubType();
             {
                 OUString const str( (bName)
-                        ? pFld->GetFieldName()
-                        : pFld->ExpandField(bInClipboard) );
-                pRet = new SwFldPortion(str);
+                        ? pField->GetFieldName()
+                        : pField->ExpandField(bInClipboard) );
+                pRet = new SwFieldPortion(str);
             }
             if( subType == REF_BOOKMARK  )
-                static_cast<SwFldPortion*>(pRet)->m_nAttrFldType = ATTR_BOOKMARKFLD;
+                static_cast<SwFieldPortion*>(pRet)->m_nAttrFieldType = ATTR_BOOKMARKFLD;
             else if( subType == REF_SETREFATTR )
-                static_cast<SwFldPortion*>(pRet)->m_nAttrFldType = ATTR_SETREFATTRFLD;
+                static_cast<SwFieldPortion*>(pRet)->m_nAttrFieldType = ATTR_SETREFATTRFLD;
             break;
         case RES_DATETIMEFLD:
-            subType = static_cast<SwDateTimeField*>(pFld)->GetSubType();
+            subType = static_cast<SwDateTimeField*>(pField)->GetSubType();
             {
                 OUString const str( (bName)
-                        ? pFld->GetFieldName()
-                        : pFld->ExpandField(bInClipboard) );
-                pRet = new SwFldPortion(str);
+                        ? pField->GetFieldName()
+                        : pField->ExpandField(bInClipboard) );
+                pRet = new SwFieldPortion(str);
             }
             if( subType & DATEFLD  )
-                static_cast<SwFldPortion*>(pRet)->m_nAttrFldType= ATTR_DATEFLD;
+                static_cast<SwFieldPortion*>(pRet)->m_nAttrFieldType= ATTR_DATEFLD;
             else if( subType & TIMEFLD )
-                static_cast<SwFldPortion*>(pRet)->m_nAttrFldType = ATTR_TIMEFLD;
+                static_cast<SwFieldPortion*>(pRet)->m_nAttrFieldType = ATTR_TIMEFLD;
             break;
         default:
             {
                 OUString const aStr( (bName)
-                        ? pFld->GetFieldName()
-                        : pFld->ExpandField(bInClipboard) );
-                pRet = new SwFldPortion(aStr);
+                        ? pField->GetFieldName()
+                        : pField->ExpandField(bInClipboard) );
+                pRet = new SwFieldPortion(aStr);
             }
     }
 
@@ -279,23 +279,23 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
         if( !bName )
         {
             pTmpFnt = new SwFont( *pFnt );
-            pTmpFnt->SetDiffFnt( &pChFmt->GetAttrSet(), pFrm->GetTxtNode()->getIDocumentSettingAccess() );
+            pTmpFnt->SetDiffFnt( &pChFormat->GetAttrSet(), pFrm->GetTextNode()->getIDocumentSettingAccess() );
         }
         {
             OUString const aStr( (bName)
-                    ? pFld->GetFieldName()
-                    : pFld->ExpandField(bInClipboard) );
-            pRet = new SwFldPortion(aStr, pTmpFnt, bPlaceHolder);
+                    ? pField->GetFieldName()
+                    : pField->ExpandField(bInClipboard) );
+            pRet = new SwFieldPortion(aStr, pTmpFnt, bPlaceHolder);
         }
     }
 
     return pRet;
 }
 
-static SwFldPortion * lcl_NewMetaPortion(SwTxtAttr & rHint, const bool bPrefix)
+static SwFieldPortion * lcl_NewMetaPortion(SwTextAttr & rHint, const bool bPrefix)
 {
     ::sw::Meta *const pMeta(
-        static_cast<SwFmtMeta &>(rHint.GetAttr()).GetMeta() );
+        static_cast<SwFormatMeta &>(rHint.GetAttr()).GetMeta() );
     OUString fix;
     ::sw::MetaField *const pField( dynamic_cast< ::sw::MetaField * >(pMeta) );
     OSL_ENSURE(pField, "lcl_NewMetaPortion: no meta field?");
@@ -303,7 +303,7 @@ static SwFldPortion * lcl_NewMetaPortion(SwTxtAttr & rHint, const bool bPrefix)
     {
         pField->GetPrefixAndSuffix((bPrefix) ? &fix : 0, (bPrefix) ? 0 : &fix);
     }
-    return new SwFldPortion( fix );
+    return new SwFieldPortion( fix );
 }
 
 /**
@@ -314,14 +314,14 @@ static SwFldPortion * lcl_NewMetaPortion(SwTxtAttr & rHint, const bool bPrefix)
  * due to Underflow. In that case, m_nHintEndIndex must be decremented,
  * so the portion will be created again on the next line.
  */
-SwExpandPortion * SwTxtFormatter::TryNewNoLengthPortion(SwTxtFormatInfo & rInfo)
+SwExpandPortion * SwTextFormatter::TryNewNoLengthPortion(SwTextFormatInfo & rInfo)
 {
     if (pHints)
     {
         const sal_Int32 nIdx(rInfo.GetIdx());
         while (m_nHintEndIndex < pHints->GetEndCount())
         {
-            SwTxtAttr & rHint( *pHints->GetEnd(m_nHintEndIndex) );
+            SwTextAttr & rHint( *pHints->GetEnd(m_nHintEndIndex) );
             sal_Int32 const nEnd( *rHint.GetAnyEnd() );
             if (nEnd > nIdx)
             {
@@ -332,7 +332,7 @@ SwExpandPortion * SwTxtFormatter::TryNewNoLengthPortion(SwTxtFormatInfo & rInfo)
             {
                 if (RES_TXTATR_METAFIELD == rHint.Which())
                 {
-                    SwFldPortion *const pPortion(
+                    SwFieldPortion *const pPortion(
                             lcl_NewMetaPortion(rHint, false));
                     pPortion->SetNoLength(); // no CH_TXTATR at hint end!
                     return pPortion;
@@ -343,13 +343,13 @@ SwExpandPortion * SwTxtFormatter::TryNewNoLengthPortion(SwTxtFormatInfo & rInfo)
     return 0;
 }
 
-SwLinePortion *SwTxtFormatter::NewExtraPortion( SwTxtFormatInfo &rInf )
+SwLinePortion *SwTextFormatter::NewExtraPortion( SwTextFormatInfo &rInf )
 {
-    SwTxtAttr *pHint = GetAttr( rInf.GetIdx() );
+    SwTextAttr *pHint = GetAttr( rInf.GetIdx() );
     SwLinePortion *pRet = 0;
     if( !pHint )
     {
-        pRet = new SwTxtPortion;
+        pRet = new SwTextPortion;
         pRet->SetLen( 1 );
         rInf.SetLen( 1 );
         return pRet;
@@ -364,13 +364,13 @@ SwLinePortion *SwTxtFormatter::NewExtraPortion( SwTxtFormatInfo &rInf )
         }
     case RES_TXTATR_FTN :
         {
-            pRet = NewFtnPortion( rInf, pHint );
+            pRet = NewFootnotePortion( rInf, pHint );
             break;
         }
     case RES_TXTATR_FIELD :
     case RES_TXTATR_ANNOTATION :
         {
-            pRet = NewFldPortion( rInf, pHint );
+            pRet = NewFieldPortion( rInf, pHint );
             break;
         }
     case RES_TXTATR_REFMARK :
@@ -393,7 +393,7 @@ SwLinePortion *SwTxtFormatter::NewExtraPortion( SwTxtFormatInfo &rInf )
     if( !pRet )
     {
         const OUString aNothing;
-        pRet = new SwFldPortion( aNothing );
+        pRet = new SwFieldPortion( aNothing );
         rInf.SetLen( 1 );
     }
     return pRet;
@@ -404,22 +404,22 @@ SwLinePortion *SwTxtFormatter::NewExtraPortion( SwTxtFormatInfo &rInf )
  * character than can be configured to be shown). However, in practice MSO also uses it as direct formatting
  * for numbering in that paragraph. I don't know if the problem is in the spec or in MSWord.
  */
-static void checkApplyParagraphMarkFormatToNumbering( SwFont* pNumFnt, SwTxtFormatInfo& rInf, const IDocumentSettingAccess* pIDSA )
+static void checkApplyParagraphMarkFormatToNumbering( SwFont* pNumFnt, SwTextFormatInfo& rInf, const IDocumentSettingAccess* pIDSA )
 {
-    SwTxtNode* node = rInf.GetTxtFrm()->GetTxtNode();
+    SwTextNode* node = rInf.GetTextFrm()->GetTextNode();
     if( !pIDSA->get(DocumentSettingId::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING ))
         return;
     if( SwpHints* hints = node->GetpSwpHints())
     {
         for( size_t i = 0; i < hints->Count(); ++i )
         {
-            SwTxtAttr* hint = hints->GetTextHint( i );
+            SwTextAttr* hint = hints->GetTextHint( i );
             // Formatting for the paragraph mark is set to apply only to the (non-existent) extra character
             // the at end of the txt node.
             if( hint->Which() == RES_TXTATR_AUTOFMT && hint->GetEnd() != NULL
                 && hint->GetStart() == *hint->GetEnd() && hint->GetStart() == node->Len())
             {
-                std::shared_ptr<SfxItemSet> pSet(hint->GetAutoFmt().GetStyleHandle());
+                std::shared_ptr<SfxItemSet> pSet(hint->GetAutoFormat().GetStyleHandle());
 
                 // Check each item and in case it should be ignored, then clear it.
                 std::shared_ptr<SfxItemSet> pCleanedSet;
@@ -431,7 +431,7 @@ static void checkApplyParagraphMarkFormatToNumbering( SwFont* pNumFnt, SwTxtForm
                     const SfxPoolItem* pItem = aIter.GetCurItem();
                     while (true)
                     {
-                        if (SwTxtNode::IsIgnoredCharFmtForNumbering(pItem->Which()))
+                        if (SwTextNode::IsIgnoredCharFormatForNumbering(pItem->Which()))
                             pCleanedSet->ClearItem(pItem->Which());
 
                         if (aIter.IsAtEnd())
@@ -447,20 +447,20 @@ static void checkApplyParagraphMarkFormatToNumbering( SwFont* pNumFnt, SwTxtForm
 }
 
 
-SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
+SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) const
 {
-    if( rInf.IsNumDone() || rInf.GetTxtStart() != nStart
-                || rInf.GetTxtStart() != rInf.GetIdx() )
+    if( rInf.IsNumDone() || rInf.GetTextStart() != nStart
+                || rInf.GetTextStart() != rInf.GetIdx() )
         return 0;
 
     SwNumberPortion *pRet = 0;
-    const SwTxtNode* pTxtNd = GetTxtFrm()->GetTxtNode();
-    const SwNumRule* pNumRule = pTxtNd->GetNumRule();
+    const SwTextNode* pTextNd = GetTextFrm()->GetTextNode();
+    const SwNumRule* pNumRule = pTextNd->GetNumRule();
 
     // Has a "valid" number?
-    if( pTxtNd->IsNumbered() && pTxtNd->IsCountedInList())
+    if( pTextNd->IsNumbered() && pTextNd->IsCountedInList())
     {
-        int nLevel = pTxtNd->GetActualListLevel();
+        int nLevel = pTextNd->GetActualListLevel();
 
         if (nLevel < 0)
             nLevel = 0;
@@ -468,21 +468,21 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
         if (nLevel >= MAXLEVEL)
             nLevel = MAXLEVEL - 1;
 
-        const SwNumFmt &rNumFmt = pNumRule->Get( nLevel );
-        const bool bLeft = SVX_ADJUST_LEFT == rNumFmt.GetNumAdjust();
-        const bool bCenter = SVX_ADJUST_CENTER == rNumFmt.GetNumAdjust();
+        const SwNumFormat &rNumFormat = pNumRule->Get( nLevel );
+        const bool bLeft = SVX_ADJUST_LEFT == rNumFormat.GetNumAdjust();
+        const bool bCenter = SVX_ADJUST_CENTER == rNumFormat.GetNumAdjust();
         const bool bLabelAlignmentPosAndSpaceModeActive(
-                rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT );
+                rNumFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT );
         const sal_uInt16 nMinDist = bLabelAlignmentPosAndSpaceModeActive
-                                ? 0 : rNumFmt.GetCharTextDistance();
+                                ? 0 : rNumFormat.GetCharTextDistance();
 
-        if( SVX_NUM_BITMAP == rNumFmt.GetNumberingType() )
+        if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() )
         {
-            pRet = new SwGrfNumPortion( const_cast<SwTxtFrm*>(GetTxtFrm()),
-                                        pTxtNd->GetLabelFollowedBy(),
-                                        rNumFmt.GetBrush(),
-                                        rNumFmt.GetGraphicOrientation(),
-                                        rNumFmt.GetGraphicSize(),
+            pRet = new SwGrfNumPortion( const_cast<SwTextFrm*>(GetTextFrm()),
+                                        pTextNd->GetLabelFollowedBy(),
+                                        rNumFormat.GetBrush(),
+                                        rNumFormat.GetGraphicOrientation(),
+                                        rNumFormat.GetGraphicSize(),
                                         bLeft, bCenter, nMinDist,
                                         bLabelAlignmentPosAndSpaceModeActive );
             long nTmpA = rInf.GetLast()->GetAscent();
@@ -493,17 +493,17 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
         else
         {
             // The SwFont is created dynamically and passed in the ctor,
-            // as the CharFmt only returns an SV-Font.
+            // as the CharFormat only returns an SV-Font.
             // In the dtor of SwNumberPortion, the SwFont is deleted.
             SwFont *pNumFnt = 0;
-            const SwAttrSet* pFmt = rNumFmt.GetCharFmt() ?
-                                    &rNumFmt.GetCharFmt()->GetAttrSet() :
+            const SwAttrSet* pFormat = rNumFormat.GetCharFormat() ?
+                                    &rNumFormat.GetCharFormat()->GetAttrSet() :
                                     NULL;
-            const IDocumentSettingAccess* pIDSA = pTxtNd->getIDocumentSettingAccess();
+            const IDocumentSettingAccess* pIDSA = pTextNd->getIDocumentSettingAccess();
 
-            if( SVX_NUM_CHAR_SPECIAL == rNumFmt.GetNumberingType() )
+            if( SVX_NUM_CHAR_SPECIAL == rNumFormat.GetNumberingType() )
             {
-                const vcl::Font *pFmtFnt = rNumFmt.GetBulletFont();
+                const vcl::Font *pFormatFnt = rNumFormat.GetBulletFont();
 
                 // Build a new bullet font basing on the current paragraph font:
                 pNumFnt = new SwFont( &rInf.GetCharAttr(), pIDSA );
@@ -528,19 +528,19 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
 
                 // Apply the explicit attributes from the character style
                 // associated with the numering to the new bullet font.
-                if( pFmt )
-                    pNumFnt->SetDiffFnt( pFmt, pIDSA );
+                if( pFormat )
+                    pNumFnt->SetDiffFnt( pFormat, pIDSA );
 
                 checkApplyParagraphMarkFormatToNumbering( pNumFnt, rInf, pIDSA );
 
-                if ( pFmtFnt )
+                if ( pFormatFnt )
                 {
                     const sal_uInt8 nAct = pNumFnt->GetActual();
-                    pNumFnt->SetFamily( pFmtFnt->GetFamily(), nAct );
-                    pNumFnt->SetName( pFmtFnt->GetName(), nAct );
-                    pNumFnt->SetStyleName( pFmtFnt->GetStyleName(), nAct );
-                    pNumFnt->SetCharSet( pFmtFnt->GetCharSet(), nAct );
-                    pNumFnt->SetPitch( pFmtFnt->GetPitch(), nAct );
+                    pNumFnt->SetFamily( pFormatFnt->GetFamily(), nAct );
+                    pNumFnt->SetName( pFormatFnt->GetName(), nAct );
+                    pNumFnt->SetStyleName( pFormatFnt->GetStyleName(), nAct );
+                    pNumFnt->SetCharSet( pFormatFnt->GetCharSet(), nAct );
+                    pNumFnt->SetPitch( pFormatFnt->GetPitch(), nAct );
                 }
 
                 // we do not allow a vertical font
@@ -548,25 +548,25 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
                                       pFrm->IsVertical() );
 
                 // --> OD 2008-01-23 #newlistelevelattrs#
-                pRet = new SwBulletPortion( rNumFmt.GetBulletChar(),
-                                            pTxtNd->GetLabelFollowedBy(),
+                pRet = new SwBulletPortion( rNumFormat.GetBulletChar(),
+                                            pTextNd->GetLabelFollowedBy(),
                                             pNumFnt,
                                             bLeft, bCenter, nMinDist,
                                             bLabelAlignmentPosAndSpaceModeActive );
             }
             else
             {
-                OUString aTxt( pTxtNd->GetNumString() );
-                if ( !aTxt.isEmpty() )
+                OUString aText( pTextNd->GetNumString() );
+                if ( !aText.isEmpty() )
                 {
-                    aTxt += pTxtNd->GetLabelFollowedBy();
+                    aText += pTextNd->GetLabelFollowedBy();
                 }
 
                 // Not just an optimization ...
                 // A number portion without text will be assigned a width of 0.
                 // The succeeding text portion will flow into the BreakCut in the BreakLine,
                 // although  we have rInf.GetLast()->GetFlyPortion()!
-                if( !aTxt.isEmpty() )
+                if( !aText.isEmpty() )
                 {
 
                     // Build a new numbering font basing on the current paragraph font:
@@ -584,15 +584,15 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
 
                     // Apply the explicit attributes from the character style
                     // associated with the numering to the new bullet font.
-                    if( pFmt )
-                        pNumFnt->SetDiffFnt( pFmt, pIDSA );
+                    if( pFormat )
+                        pNumFnt->SetDiffFnt( pFormat, pIDSA );
 
                     checkApplyParagraphMarkFormatToNumbering( pNumFnt, rInf, pIDSA );
 
                     // we do not allow a vertical font
                     pNumFnt->SetVertical( pNumFnt->GetOrientation(), pFrm->IsVertical() );
 
-                    pRet = new SwNumberPortion( aTxt, pNumFnt,
+                    pRet = new SwNumberPortion( aText, pNumFnt,
                                                 bLeft, bCenter, nMinDist,
                                                 bLabelAlignmentPosAndSpaceModeActive );
                 }
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index cb32445f4ba2..ed33e4c08011 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -172,16 +172,16 @@ void ClrContourCache()
 // #i68520#
 const SwRect SwContourCache::CalcBoundRect( const SwAnchoredObject* pAnchoredObj,
                                             const SwRect &rLine,
-                                            const SwTxtFrm* pFrm,
+                                            const SwTextFrm* pFrm,
                                             const long nXPos,
                                             const bool bRight )
 {
     SwRect aRet;
-    const SwFrmFmt* pFmt = &(pAnchoredObj->GetFrmFmt());
-    if( pFmt->GetSurround().IsContour() &&
+    const SwFrameFormat* pFormat = &(pAnchoredObj->GetFrameFormat());
+    if( pFormat->GetSurround().IsContour() &&
         ( !pAnchoredObj->ISA(SwFlyFrm) ||
           ( static_cast<const SwFlyFrm*>(pAnchoredObj)->Lower() &&
-            static_cast<const SwFlyFrm*>(pAnchoredObj)->Lower()->IsNoTxtFrm() ) ) )
+            static_cast<const SwFlyFrm*>(pAnchoredObj)->Lower()->IsNoTextFrm() ) ) )
     {
         aRet = pAnchoredObj->GetObjRectWithSpaces();
         if( aRet.IsOver( rLine ) )
@@ -190,7 +190,7 @@ const SwRect SwContourCache::CalcBoundRect( const SwAnchoredObject* pAnchoredObj
                 pContourCache = new SwContourCache;
 
             aRet = pContourCache->ContourRect(
-                    pFmt, pAnchoredObj->GetDrawObj(), pFrm, rLine, nXPos, bRight );
+                    pFormat, pAnchoredObj->GetDrawObj(), pFrm, rLine, nXPos, bRight );
         }
         else
             aRet.Width( 0 );
@@ -203,8 +203,8 @@ const SwRect SwContourCache::CalcBoundRect( const SwAnchoredObject* pAnchoredObj
     return aRet;
 }
 
-const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
-    const SdrObject* pObj, const SwTxtFrm* pFrm, const SwRect &rLine,
+const SwRect SwContourCache::ContourRect( const SwFormat* pFormat,
+    const SdrObject* pObj, const SwTextFrm* pFrm, const SwRect &rLine,
     const long nXPos, const bool bRight )
 {
     SwRect aRet;
@@ -242,15 +242,15 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
             ::basegfx::B2DPolyPolygon aContourPoly(pObj->TakeContour());
             pPolyPolygon = new ::basegfx::B2DPolyPolygon(aContourPoly);
         }
-        const SvxLRSpaceItem &rLRSpace = pFmt->GetLRSpace();
-        const SvxULSpaceItem &rULSpace = pFmt->GetULSpace();
+        const SvxLRSpaceItem &rLRSpace = pFormat->GetLRSpace();
+        const SvxULSpaceItem &rULSpace = pFormat->GetULSpace();
         memmove( pTextRanger + 1, pTextRanger, nObjCnt * sizeof( TextRanger* ) );
         memmove( (SdrObject**)pSdrObj + 1, pSdrObj, nObjCnt++ * sizeof( SdrObject* ) );
         pSdrObj[ 0 ] = pObj; // due to #37347 the Object must be entered only
                              // after GetContour()
         pTextRanger[ 0 ] = new TextRanger( aPolyPolygon, pPolyPolygon, 20,
             (sal_uInt16)rLRSpace.GetLeft(), (sal_uInt16)rLRSpace.GetRight(),
-            pFmt->GetSurround().IsOutside(), false, pFrm->IsVertical() );
+            pFormat->GetSurround().IsOutside(), false, pFrm->IsVertical() );
         pTextRanger[ 0 ]->SetUpper( rULSpace.GetUpper() );
         pTextRanger[ 0 ]->SetLower( rULSpace.GetLower() );
 
@@ -310,7 +310,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
     return aRet;
 }
 
-SwTxtFly::SwTxtFly()
+SwTextFly::SwTextFly()
     : pPage(0)
     , mpCurrAnchoredObj(0)
     , pCurrFrm(0)
@@ -328,42 +328,42 @@ SwTxtFly::SwTxtFly()
 {
 }
 
-SwTxtFly::SwTxtFly( const SwTxtFrm *pFrm )
+SwTextFly::SwTextFly( const SwTextFrm *pFrm )
 {
-    CtorInitTxtFly( pFrm );
+    CtorInitTextFly( pFrm );
 }
 
-SwTxtFly::SwTxtFly( const SwTxtFly& rTxtFly )
+SwTextFly::SwTextFly( const SwTextFly& rTextFly )
 {
-    pPage = rTxtFly.pPage;
-    mpCurrAnchoredObj = rTxtFly.mpCurrAnchoredObj;
-    pCurrFrm = rTxtFly.pCurrFrm;
-    pMaster = rTxtFly.pMaster;
-    if( rTxtFly.mpAnchoredObjList )
+    pPage = rTextFly.pPage;
+    mpCurrAnchoredObj = rTextFly.mpCurrAnchoredObj;
+    pCurrFrm = rTextFly.pCurrFrm;
+    pMaster = rTextFly.pMaster;
+    if( rTextFly.mpAnchoredObjList )
     {
-        mpAnchoredObjList = new SwAnchoredObjList( *(rTxtFly.mpAnchoredObjList) );
+        mpAnchoredObjList = new SwAnchoredObjList( *(rTextFly.mpAnchoredObjList) );
     }
     else
     {
         mpAnchoredObjList = NULL;
     }
 
-    bOn = rTxtFly.bOn;
-    bTopRule = rTxtFly.bTopRule;
-    nMinBottom = rTxtFly.nMinBottom;
-    nNextTop = rTxtFly.nNextTop;
-    nIndex = rTxtFly.nIndex;
-    mbIgnoreCurrentFrame = rTxtFly.mbIgnoreCurrentFrame;
-    mbIgnoreContour = rTxtFly.mbIgnoreContour;
-    mbIgnoreObjsInHeaderFooter = rTxtFly.mbIgnoreObjsInHeaderFooter;
+    bOn = rTextFly.bOn;
+    bTopRule = rTextFly.bTopRule;
+    nMinBottom = rTextFly.nMinBottom;
+    nNextTop = rTextFly.nNextTop;
+    nIndex = rTextFly.nIndex;
+    mbIgnoreCurrentFrame = rTextFly.mbIgnoreCurrentFrame;
+    mbIgnoreContour = rTextFly.mbIgnoreContour;
+    mbIgnoreObjsInHeaderFooter = rTextFly.mbIgnoreObjsInHeaderFooter;
 }
 
-SwTxtFly::~SwTxtFly()
+SwTextFly::~SwTextFly()
 {
     delete mpAnchoredObjList;
 }
 
-void SwTxtFly::CtorInitTxtFly( const SwTxtFrm *pFrm )
+void SwTextFly::CtorInitTextFly( const SwTextFrm *pFrm )
 {
     mbIgnoreCurrentFrame = false;
     mbIgnoreContour = false;
@@ -389,7 +389,7 @@ void SwTxtFly::CtorInitTxtFly( const SwTxtFrm *pFrm )
     nIndex = ULONG_MAX;
 }
 
-SwRect SwTxtFly::_GetFrm( const SwRect &rRect, bool bTop ) const
+SwRect SwTextFly::_GetFrm( const SwRect &rRect, bool bTop ) const
 {
     SwRect aRet;
     if( ForEach( rRect, &aRet, true ) )
@@ -408,7 +408,7 @@ SwRect SwTxtFly::_GetFrm( const SwRect &rRect, bool bTop ) const
     return aRet;
 }
 
-bool SwTxtFly::IsAnyFrm() const
+bool SwTextFly::IsAnyFrm() const
 {
     SWAP_IF_SWAPPED( pCurrFrm )
 
@@ -421,9 +421,9 @@ bool SwTxtFly::IsAnyFrm() const
     return bRet;
 }
 
-bool SwTxtFly::IsAnyObj( const SwRect &rRect ) const
+bool SwTextFly::IsAnyObj( const SwRect &rRect ) const
 {
-   OSL_ENSURE( bOn, "SwTxtFly::IsAnyObj: Who's knocking?" );
+   OSL_ENSURE( bOn, "SwTextFly::IsAnyObj: Who's knocking?" );
 
     SwRect aRect( rRect );
     if ( aRect.IsEmpty() )
@@ -452,15 +452,15 @@ bool SwTxtFly::IsAnyObj( const SwRect &rRect ) const
     return false;
 }
 
-const SwCntntFrm* SwTxtFly::_GetMaster()
+const SwContentFrm* SwTextFly::_GetMaster()
 {
     pMaster = pCurrFrm;
     while( pMaster && pMaster->IsFollow() )
-        pMaster = (SwCntntFrm*)pMaster->FindMaster();
+        pMaster = (SwContentFrm*)pMaster->FindMaster();
     return pMaster;
 }
 
-bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf )
+bool SwTextFly::DrawTextOpaque( SwDrawTextInfo &rInf )
 {
     SwSaveClip aClipSave( rInf.GetpOut() );
     SwRect aRect( rInf.GetPos(), rInf.GetSize() );
@@ -515,9 +515,9 @@ bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf )
                 const SwFlyFrm& rFly = dynamic_cast<const SwFlyFrm&>(*pTmpAnchoredObj);
                 if( aRegion.GetOrigin().IsOver( rFly.Frm() ) )
                 {
-                    const SwFrmFmt *pFmt = rFly.GetFmt();
-                    const SwFmtSurround &rSur = pFmt->GetSurround();
-                    const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+                    const SwFrameFormat *pFormat = rFly.GetFormat();
+                    const SwFormatSurround &rSur = pFormat->GetSurround();
+                    const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
                     // Only the ones who are opaque and more to the top
                     if( ! rFly.IsBackgroundTransparent() &&
                         SURROUND_THROUGHT == rSur.GetSurround() &&
@@ -534,12 +534,12 @@ bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf )
                       )
                     {
                         // Except for the content is transparent
-                        const SwNoTxtFrm *pNoTxt =
-                                rFly.Lower() && rFly.Lower()->IsNoTxtFrm()
-                                                   ? static_cast<const SwNoTxtFrm*>(rFly.Lower())
+                        const SwNoTextFrm *pNoText =
+                                rFly.Lower() && rFly.Lower()->IsNoTextFrm()
+                                                   ? static_cast<const SwNoTextFrm*>(rFly.Lower())
                                                    : 0;
-                        if ( !pNoTxt ||
-                             (!pNoTxt->IsTransparent() && !rSur.IsContour()) )
+                        if ( !pNoText ||
+                             (!pNoText->IsTransparent() && !rSur.IsContour()) )
                         {
                             bOpaque = true;
                             aRegion -= rFly.Frm();
@@ -582,8 +582,8 @@ bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf )
     return true;
 }
 
-void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect,
-        const SwTxtPaintInfo &rInf, bool bNoGraphic )
+void SwTextFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect,
+        const SwTextPaintInfo &rInf, bool bNoGraphic )
 {
     SwRegionRects aRegion( rRect );
     OSL_ENSURE( !bTopRule, "DrawFlyRect: Wrong TopRule" );
@@ -604,7 +604,7 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect,
             if (pFly)
             {
                 // #i68520#
-                const SwFmtSurround& rSur = pAnchoredObjTmp->GetFrmFmt().GetSurround();
+                const SwFormatSurround& rSur = pAnchoredObjTmp->GetFrameFormat().GetSurround();
 
                 // OD 24.01.2003 #106593# - correct clipping of fly frame area.
                 // Consider that fly frame background/shadow can be transparent
@@ -618,8 +618,8 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect,
                           : !rSur.IsContour() ) &&
                         !pFly->IsBackgroundTransparent() &&
                         ( !pFly->Lower() ||
-                          !pFly->Lower()->IsNoTxtFrm() ||
-                          !static_cast<const SwNoTxtFrm*>(pFly->Lower())->IsTransparent() );
+                          !pFly->Lower()->IsNoTextFrm() ||
+                          !static_cast<const SwNoTextFrm*>(pFly->Lower())->IsTransparent() );
                 if ( bClipFlyArea )
                 {
                     // #i68520#
@@ -657,8 +657,8 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect,
  * #i26945# - change first parameter
  * Now it's the <SwAnchoredObject> instance of the floating screen object
  */
-bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
-                       const bool bInFtn,
+bool SwTextFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
+                       const bool bInFootnote,
                        const bool bInFooterOrHeader )
 {
     // #i68520#
@@ -677,19 +677,19 @@ bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
             }
         }
 
-        if( ( bInFtn || bInFooterOrHeader ) && bTopRule )
+        if( ( bInFootnote || bInFooterOrHeader ) && bTopRule )
         {
             // #i26945#
-            const SwFrmFmt& rFrmFmt = _pAnchoredObj->GetFrmFmt();
-            const SwFmtAnchor& rNewA = rFrmFmt.GetAnchor();
+            const SwFrameFormat& rFrameFormat = _pAnchoredObj->GetFrameFormat();
+            const SwFormatAnchor& rNewA = rFrameFormat.GetAnchor();
             if (FLY_AT_PAGE == rNewA.GetAnchorId())
             {
-                if ( bInFtn )
+                if ( bInFootnote )
                     return false;
 
                 if ( bInFooterOrHeader )
                 {
-                    SwFmtVertOrient aVert( rFrmFmt.GetVertOrient() );
+                    SwFormatVertOrient aVert( rFrameFormat.GetVertOrient() );
                     bool bVertPrt = aVert.GetRelationOrient() == text::RelOrientation::PRINT_AREA ||
                             aVert.GetRelationOrient() == text::RelOrientation::PAGE_PRINT_AREA;
                     if( bVertPrt )
@@ -718,13 +718,13 @@ bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
             {
                 // Within chained Flys we only avoid Lower
                 // #i68520#
-                const SwFmtChain &rChain = mpCurrAnchoredObj->GetFrmFmt().GetChain();
+                const SwFormatChain &rChain = mpCurrAnchoredObj->GetFrameFormat().GetChain();
                 if ( !rChain.GetPrev() && !rChain.GetNext() )
                 {
                     // #i26945#
-                    const SwFmtAnchor& rNewA = _pAnchoredObj->GetFrmFmt().GetAnchor();
+                    const SwFormatAnchor& rNewA = _pAnchoredObj->GetFrameFormat().GetAnchor();
                     // #i68520#
-                    const SwFmtAnchor& rCurrA = mpCurrAnchoredObj->GetFrmFmt().GetAnchor();
+                    const SwFormatAnchor& rCurrA = mpCurrAnchoredObj->GetFrameFormat().GetAnchor();
 
                     // If <mpCurrAnchoredObj> is anchored as character, its content
                     // does not wrap around pNew
@@ -776,7 +776,7 @@ bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
         if ( bEvade )
         {
             // #i26945#
-            const SwFmtAnchor& rNewA = _pAnchoredObj->GetFrmFmt().GetAnchor();
+            const SwFormatAnchor& rNewA = _pAnchoredObj->GetFrameFormat().GetAnchor();
             OSL_ENSURE( FLY_AS_CHAR != rNewA.GetAnchorId(),
                     "Don't call GetTop with a FlyInCntFrm" );
             if (FLY_AT_PAGE == rNewA.GetAnchorId())
@@ -791,7 +791,7 @@ bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
             const SwFrm* pTmp = _pAnchoredObj->GetAnchorFrm();
             if( pTmp == pCurrFrm )
                 return true;
-            if( pTmp->IsTxtFrm() && ( pTmp->IsInFly() || pTmp->IsInFtn() ) )
+            if( pTmp->IsTextFrm() && ( pTmp->IsInFly() || pTmp->IsInFootnote() ) )
             {
                 // #i26945#
                 Point aPos = _pAnchoredObj->GetObjRect().Pos();
@@ -801,7 +801,7 @@ bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
             // #115759#
             // If <pTmp> is a text frame inside a table, take the upper
             // of the anchor frame, which contains the anchor position.
-            else if ( pTmp->IsTxtFrm() && pTmp->IsInTab() )
+            else if ( pTmp->IsTextFrm() && pTmp->IsInTab() )
             {
                 pTmp = const_cast<SwAnchoredObject*>(_pAnchoredObj)
                                 ->GetAnchorFrmContainingAnchPos()->GetUpper();
@@ -817,7 +817,7 @@ bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
             // object position and former text wrapping is applied.
             // This condition is typically for documents imported from the
             // OpenOffice.org file format.
-            const IDocumentSettingAccess* pIDSA = pCurrFrm->GetTxtNode()->getIDocumentSettingAccess();
+            const IDocumentSettingAccess* pIDSA = pCurrFrm->GetTextNode()->getIDocumentSettingAccess();
             if ( (  pIDSA->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ||
                    !pIDSA->get(DocumentSettingId::USE_FORMER_TEXT_WRAPPING) ) &&
                  ::FindKontext( pTmp, 0 ) == ::FindKontext( pCurrFrm, 0 ) )
@@ -839,11 +839,11 @@ bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
 
                 // Compare indices:
                 // The Index of the other is retrieved from the anchor attr.
-                sal_uLong nTmpIndex = rNewA.GetCntntAnchor()->nNode.GetIndex();
+                sal_uLong nTmpIndex = rNewA.GetContentAnchor()->nNode.GetIndex();
                 // Now check whether the current paragraph is before the anchor
                 // of the displaced object in the text, then we don't have to
                 // get out of its way.
-                // If possible determine Index via SwFmtAnchor because
+                // If possible determine Index via SwFormatAnchor because
                 // otherwise it's quite expensive.
                 if( ULONG_MAX == nIndex )
                     nIndex = pCurrFrm->GetNode()->GetIndex();
@@ -857,7 +857,7 @@ bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
 }
 
 // #i68520#
-SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
+SwAnchoredObjList* SwTextFly::InitAnchoredObjList()
 {
     OSL_ENSURE( pCurrFrm, "InitFlyList: No Frame, no FlyList" );
     // #i68520#
@@ -870,10 +870,10 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
     // --> #108724# Page header/footer content doesn't have to wrap around
     //              floating screen objects
     const bool bFooterHeader = 0 != pCurrFrm->FindFooterOrHeader();
-    const IDocumentSettingAccess* pIDSA = pCurrFrm->GetTxtNode()->getIDocumentSettingAccess();
+    const IDocumentSettingAccess* pIDSA = pCurrFrm->GetTextNode()->getIDocumentSettingAccess();
     // #i40155# - check, if frame is marked not to wrap
     const bool bWrapAllowed = ( pIDSA->get(DocumentSettingId::USE_FORMER_TEXT_WRAPPING) ||
-                                    ( !pCurrFrm->IsInFtn() && !bFooterHeader ) );
+                                    ( !pCurrFrm->IsInFootnote() && !bFooterHeader ) );
 
     bOn = false;
 
@@ -901,7 +901,7 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
         const long nLeft = (aRect.*fnRect->fnGetLeft)() + 1;
         const bool bR2L = pCurrFrm->IsRightToLeft();
 
-        const IDocumentDrawModelAccess* pIDDMA = pCurrFrm->GetTxtNode()->getIDocumentDrawModelAccess();
+        const IDocumentDrawModelAccess* pIDDMA = pCurrFrm->GetTextNode()->getIDocumentDrawModelAccess();
 
         for( size_t i = 0; i < nCount; ++i )
         {
@@ -911,7 +911,7 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
             // #118809# - If requested, do not consider
             // objects in page header|footer for text frames not in page
             // header|footer. This is requested for the calculation of
-            // the base offset for objects <SwTxtFrm::CalcBaseOfstForFly()>
+            // the base offset for objects <SwTextFrm::CalcBaseOfstForFly()>
             // #i20505# Do not consider oversized objects
             SwAnchoredObject* pAnchoredObj = (*pSorted)[ i ];
             assert(pAnchoredObj);
@@ -938,7 +938,7 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
             // #i26945# - pass <pAnchoredObj> to method
             // <GetTop(..)> instead of only the <SdrObject> instance of the
             // anchored object
-            if ( GetTop( pAnchoredObj, pCurrFrm->IsInFtn(), bFooterHeader ) )
+            if ( GetTop( pAnchoredObj, pCurrFrm->IsInFootnote(), bFooterHeader ) )
             {
                 // OD 11.03.2003 #107862# - adjust insert position:
                 // overlapping objects should be sorted from left to right and
@@ -956,14 +956,14 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
                     mpAnchoredObjList->insert( aInsPosIter, pAnchoredObj );
                 }
 
-                const SwFmtSurround &rFlyFmt = pAnchoredObj->GetFrmFmt().GetSurround();
+                const SwFormatSurround &rFlyFormat = pAnchoredObj->GetFrameFormat().GetSurround();
                 // #i68520#
-                if ( rFlyFmt.IsAnchorOnly() &&
+                if ( rFlyFormat.IsAnchorOnly() &&
                      pAnchoredObj->GetAnchorFrm() == GetMaster() )
                 {
-                    const SwFmtVertOrient &rTmpFmt =
-                                    pAnchoredObj->GetFrmFmt().GetVertOrient();
-                    if( text::VertOrientation::BOTTOM != rTmpFmt.GetVertOrient() )
+                    const SwFormatVertOrient &rTmpFormat =
+                                    pAnchoredObj->GetFrameFormat().GetVertOrient();
+                    if( text::VertOrientation::BOTTOM != rTmpFormat.GetVertOrient() )
                         nMinBottom = ( bVert && nMinBottom ) ?
                                      std::min( nMinBottom, aBound.Left() ) :
                                      std::max( nMinBottom, (aBound.*fnRect->fnGetBottom)() );
@@ -991,11 +991,11 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
     return mpAnchoredObjList;
 }
 
-SwTwips SwTxtFly::CalcMinBottom() const
+SwTwips SwTextFly::CalcMinBottom() const
 {
     SwTwips nRet = 0;
-    const SwCntntFrm *pLclMaster = GetMaster();
-    OSL_ENSURE(pLclMaster, "SwTxtFly without master");
+    const SwContentFrm *pLclMaster = GetMaster();
+    OSL_ENSURE(pLclMaster, "SwTextFly without master");
     const SwSortedObjs *pDrawObj = pLclMaster ? pLclMaster->GetDrawObjs() : NULL;
     const size_t nCount = pDrawObj ? pDrawObj->size() : 0;
     if( nCount )
@@ -1004,12 +1004,12 @@ SwTwips SwTxtFly::CalcMinBottom() const
         for( size_t i = 0; i < nCount; ++i )
         {
             SwAnchoredObject* pAnchoredObj = (*pDrawObj)[ i ];
-            const SwFmtSurround &rFlyFmt = pAnchoredObj->GetFrmFmt().GetSurround();
-            if( rFlyFmt.IsAnchorOnly() )
+            const SwFormatSurround &rFlyFormat = pAnchoredObj->GetFrameFormat().GetSurround();
+            if( rFlyFormat.IsAnchorOnly() )
             {
-                const SwFmtVertOrient &rTmpFmt =
-                                    pAnchoredObj->GetFrmFmt().GetVertOrient();
-                if( text::VertOrientation::BOTTOM != rTmpFmt.GetVertOrient() )
+                const SwFormatVertOrient &rTmpFormat =
+                                    pAnchoredObj->GetFrameFormat().GetVertOrient();
+                if( text::VertOrientation::BOTTOM != rTmpFormat.GetVertOrient() )
                 {
                     const SwRect aBound( pAnchoredObj->GetObjRectWithSpaces() );
                     if( aBound.Top() < nEndOfFrm )
@@ -1025,7 +1025,7 @@ SwTwips SwTxtFly::CalcMinBottom() const
     return nRet;
 }
 
-bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const
+bool SwTextFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const
 {
     SWAP_IF_SWAPPED( pCurrFrm )
 
@@ -1049,14 +1049,14 @@ bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const
             if ( mpCurrAnchoredObj != pAnchoredObj && aRect.IsOver( rRect ) )
             {
                 // #i68520#
-                const SwFmt* pFmt( &(pAnchoredObj->GetFrmFmt()) );
-                const SwFmtSurround &rSur = pFmt->GetSurround();
+                const SwFormat* pFormat( &(pAnchoredObj->GetFrameFormat()) );
+                const SwFormatSurround &rSur = pFormat->GetSurround();
                 if( bAvoid )
                 {
                     // If the text flows below, it has no influence on
                     // formatting. In LineIter::DrawText() it is "just"
                     // necessary to clevely set the ClippingRegions
-                    const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+                    const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
                     if( ( SURROUND_THROUGHT == rSur.GetSurround() &&
                           ( !rSur.IsAnchorOnly() ||
                             // #i68520#
@@ -1111,7 +1111,7 @@ bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const
 }
 
 // #i68520#
-SwAnchoredObjList::size_type SwTxtFly::GetPos( const SwAnchoredObject* pAnchoredObj ) const
+SwAnchoredObjList::size_type SwTextFly::GetPos( const SwAnchoredObject* pAnchoredObj ) const
 {
     SwAnchoredObjList::size_type nCount = GetAnchoredObjList()->size();
     SwAnchoredObjList::size_type nRet = 0;
@@ -1121,13 +1121,13 @@ SwAnchoredObjList::size_type SwTxtFly::GetPos( const SwAnchoredObject* pAnchored
 }
 
 // #i68520#
-void SwTxtFly::CalcRightMargin( SwRect &rFly,
+void SwTextFly::CalcRightMargin( SwRect &rFly,
                                 SwAnchoredObjList::size_type nFlyPos,
                                 const SwRect &rLine ) const
 {
     // Usually the right margin is the right margin of the Printarea
     OSL_ENSURE( ! pCurrFrm->IsVertical() || ! pCurrFrm->IsSwapped(),
-            "SwTxtFly::CalcRightMargin with swapped frame" );
+            "SwTextFly::CalcRightMargin with swapped frame" );
     SWRECTFN( pCurrFrm )
     // #118796# - correct determination of right of printing area
     SwTwips nRight = (pCurrFrm->*fnRect->fnGetPrtRight)();
@@ -1210,12 +1210,12 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly,
 }
 
 // #i68520#
-void SwTxtFly::CalcLeftMargin( SwRect &rFly,
+void SwTextFly::CalcLeftMargin( SwRect &rFly,
                                SwAnchoredObjList::size_type nFlyPos,
                                const SwRect &rLine ) const
 {
     OSL_ENSURE( ! pCurrFrm->IsVertical() || ! pCurrFrm->IsSwapped(),
-            "SwTxtFly::CalcLeftMargin with swapped frame" );
+            "SwTextFly::CalcLeftMargin with swapped frame" );
     SWRECTFN( pCurrFrm )
     // #118796# - correct determination of left of printing area
     SwTwips nLeft = (pCurrFrm->*fnRect->fnGetPrtLeft)();
@@ -1274,7 +1274,7 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly,
 }
 
 // #i68520#
-SwRect SwTxtFly::AnchoredObjToRect( const SwAnchoredObject* pAnchoredObj,
+SwRect SwTextFly::AnchoredObjToRect( const SwAnchoredObject* pAnchoredObj,
                             const SwRect &rLine ) const
 {
     SWRECTFN( pCurrFrm )
@@ -1339,15 +1339,15 @@ SwRect SwTxtFly::AnchoredObjToRect( const SwAnchoredObject* pAnchoredObj,
 // Wrap on both sides up to a frame width of 1.5cm
 #define FRAME_MAX 850
 
-SwSurround SwTxtFly::_GetSurroundForTextWrap( const SwAnchoredObject* pAnchoredObj ) const
+SwSurround SwTextFly::_GetSurroundForTextWrap( const SwAnchoredObject* pAnchoredObj ) const
 {
-    const SwFrmFmt* pFmt = &(pAnchoredObj->GetFrmFmt());
-    const SwFmtSurround &rFlyFmt = pFmt->GetSurround();
-    SwSurround eSurroundForTextWrap = rFlyFmt.GetSurround();
+    const SwFrameFormat* pFormat = &(pAnchoredObj->GetFrameFormat());
+    const SwFormatSurround &rFlyFormat = pFormat->GetSurround();
+    SwSurround eSurroundForTextWrap = rFlyFormat.GetSurround();
 
-    if( rFlyFmt.IsAnchorOnly() && pAnchoredObj->GetAnchorFrm() != GetMaster() )
+    if( rFlyFormat.IsAnchorOnly() && pAnchoredObj->GetAnchorFrm() != GetMaster() )
     {
-        const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+        const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
         if ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
             (FLY_AT_CHAR == rAnchor.GetAnchorId()))
         {
@@ -1409,7 +1409,7 @@ SwSurround SwTxtFly::_GetSurroundForTextWrap( const SwAnchoredObject* pAnchoredO
     return eSurroundForTextWrap;
 }
 
-bool SwTxtFly::IsAnyFrm( const SwRect &rLine ) const
+bool SwTextFly::IsAnyFrm( const SwRect &rLine ) const
 {
 
     SWAP_IF_SWAPPED( pCurrFrm )
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index cc801a926a83..4ce9409198d7 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -77,10 +77,10 @@
 #include <calbck.hxx>
 #include <ftnidx.hxx>
 
-TYPEINIT1( SwTxtFrm, SwCntntFrm );
+TYPEINIT1( SwTextFrm, SwContentFrm );
 
 /// Switches width and height of the text frame
-void SwTxtFrm::SwapWidthAndHeight()
+void SwTextFrm::SwapWidthAndHeight()
 {
     if ( ! bIsSwapped )
     {
@@ -116,7 +116,7 @@ void SwTxtFrm::SwapWidthAndHeight()
  * Calculates the coordinates of a rectangle when switching from
  * horizontal to vertical layout.
  */
-void SwTxtFrm::SwitchHorizontalToVertical( SwRect& rRect ) const
+void SwTextFrm::SwitchHorizontalToVertical( SwRect& rRect ) const
 {
     // calc offset inside frame
     long nOfstX, nOfstY;
@@ -154,7 +154,7 @@ void SwTxtFrm::SwitchHorizontalToVertical( SwRect& rRect ) const
  * Calculates the coordinates of a point when switching from
  * horizontal to vertical layout.
  */
-void SwTxtFrm::SwitchHorizontalToVertical( Point& rPoint ) const
+void SwTextFrm::SwitchHorizontalToVertical( Point& rPoint ) const
 {
     // calc offset inside frame
     const long nOfstX = rPoint.X() - Frm().Left();
@@ -177,7 +177,7 @@ void SwTxtFrm::SwitchHorizontalToVertical( Point& rPoint ) const
  * Calculates the a limit value when switching from
  * horizontal to vertical layout.
  */
-long SwTxtFrm::SwitchHorizontalToVertical( long nLimit ) const
+long SwTextFrm::SwitchHorizontalToVertical( long nLimit ) const
 {
     Point aTmp( 0, nLimit );
     SwitchHorizontalToVertical( aTmp );
@@ -188,7 +188,7 @@ long SwTxtFrm::SwitchHorizontalToVertical( long nLimit ) const
  * Calculates the coordinates of a rectangle when switching from
  * vertical to horizontal layout.
  */
-void SwTxtFrm::SwitchVerticalToHorizontal( SwRect& rRect ) const
+void SwTextFrm::SwitchVerticalToHorizontal( SwRect& rRect ) const
 {
     long nOfstX;
 
@@ -218,7 +218,7 @@ void SwTxtFrm::SwitchVerticalToHorizontal( SwRect& rRect ) const
  * Calculates the coordinates of a point when switching from
  * vertical to horizontal layout.
  */
-void SwTxtFrm::SwitchVerticalToHorizontal( Point& rPoint ) const
+void SwTextFrm::SwitchVerticalToHorizontal( Point& rPoint ) const
 {
     long nOfstX;
 
@@ -244,32 +244,32 @@ void SwTxtFrm::SwitchVerticalToHorizontal( Point& rPoint ) const
  * Calculates the a limit value when switching from
  * vertical to horizontal layout.
  */
-long SwTxtFrm::SwitchVerticalToHorizontal( long nLimit ) const
+long SwTextFrm::SwitchVerticalToHorizontal( long nLimit ) const
 {
     Point aTmp( nLimit, 0 );
     SwitchVerticalToHorizontal( aTmp );
     return aTmp.Y();
 }
 
-SwFrmSwapper::SwFrmSwapper( const SwTxtFrm* pTxtFrm, bool bSwapIfNotSwapped )
-    : pFrm( pTxtFrm ), bUndo( false )
+SwFrmSwapper::SwFrmSwapper( const SwTextFrm* pTextFrm, bool bSwapIfNotSwapped )
+    : pFrm( pTextFrm ), bUndo( false )
 {
     if ( pFrm->IsVertical() &&
         ( (   bSwapIfNotSwapped && ! pFrm->IsSwapped() ) ||
           ( ! bSwapIfNotSwapped && pFrm->IsSwapped() ) ) )
     {
         bUndo = true;
-        const_cast<SwTxtFrm*>(pFrm)->SwapWidthAndHeight();
+        const_cast<SwTextFrm*>(pFrm)->SwapWidthAndHeight();
     }
 }
 
 SwFrmSwapper::~SwFrmSwapper()
 {
     if ( bUndo )
-        const_cast<SwTxtFrm*>(pFrm)->SwapWidthAndHeight();
+        const_cast<SwTextFrm*>(pFrm)->SwapWidthAndHeight();
 }
 
-void SwTxtFrm::SwitchLTRtoRTL( SwRect& rRect ) const
+void SwTextFrm::SwitchLTRtoRTL( SwRect& rRect ) const
 {
     SWAP_IF_NOT_SWAPPED( this )
 
@@ -282,7 +282,7 @@ void SwTxtFrm::SwitchLTRtoRTL( SwRect& rRect ) const
     UNDO_SWAP( this )
 }
 
-void SwTxtFrm::SwitchLTRtoRTL( Point& rPoint ) const
+void SwTextFrm::SwitchLTRtoRTL( Point& rPoint ) const
 {
     SWAP_IF_NOT_SWAPPED( this )
 
@@ -335,9 +335,9 @@ SwDigitModeModifier::~SwDigitModeModifier()
     const_cast<OutputDevice&>(rOut).SetDigitLanguage( nOldLanguageType );
 }
 
-void SwTxtFrm::Init()
+void SwTextFrm::Init()
 {
-    OSL_ENSURE( !IsLocked(), "+SwTxtFrm::Init: this is locked." );
+    OSL_ENSURE( !IsLocked(), "+SwTextFrm::Init: this is locked." );
     if( !IsLocked() )
     {
         ClearPara();
@@ -349,13 +349,13 @@ void SwTxtFrm::Init()
     }
 }
 
-SwTxtFrm::SwTxtFrm(SwTxtNode * const pNode, SwFrm* pSib )
-    : SwCntntFrm( pNode, pSib )
+SwTextFrm::SwTextFrm(SwTextNode * const pNode, SwFrm* pSib )
+    : SwContentFrm( pNode, pSib )
     , nAllLines( 0 )
     , nThisLines( 0 )
     , mnFlyAnchorOfst( 0 )
     , mnFlyAnchorOfstNoWrap( 0 )
-    , mnFtnLine( 0 )
+    , mnFootnoteLine( 0 )
     , mnHeightOfLastLine( 0 ) // OD 2004-03-17 #i11860#
     , mnAdditionalFirstLineOffset( 0 )
     , nOfst( 0 )
@@ -364,8 +364,8 @@ SwTxtFrm::SwTxtFrm(SwTxtNode * const pNode, SwFrm* pSib )
     , bWidow( false )
     , bJustWidow( false )
     , bEmpty( false )
-    , bInFtnConnect( false )
-    , bFtn( false )
+    , bInFootnoteConnect( false )
+    , bFootnote( false )
     , bRepaint( false )
     , bBlinkPor( false )
     , bFieldFollow( false )
@@ -376,50 +376,50 @@ SwTxtFrm::SwTxtFrm(SwTxtNode * const pNode, SwFrm* pSib )
     mnFrmType = FRM_TXT;
 }
 
-void SwTxtFrm::DestroyImpl()
+void SwTextFrm::DestroyImpl()
 {
-    // Remove associated SwParaPortion from pTxtCache
+    // Remove associated SwParaPortion from pTextCache
     ClearPara();
 
-    const SwCntntNode* pCNd;
-    if( 0 != ( pCNd = PTR_CAST( SwCntntNode, GetRegisteredIn() )) &&
-        !pCNd->GetDoc()->IsInDtor() && HasFtn() )
+    const SwContentNode* pCNd;
+    if( 0 != ( pCNd = PTR_CAST( SwContentNode, GetRegisteredIn() )) &&
+        !pCNd->GetDoc()->IsInDtor() && HasFootnote() )
     {
-        SwTxtNode *pTxtNd = static_cast<SwTxtFrm*>(this)->GetTxtNode();
-        const SwFtnIdxs &rFtnIdxs = pCNd->GetDoc()->GetFtnIdxs();
+        SwTextNode *pTextNd = static_cast<SwTextFrm*>(this)->GetTextNode();
+        const SwFootnoteIdxs &rFootnoteIdxs = pCNd->GetDoc()->GetFootnoteIdxs();
         size_t nPos = 0;
         sal_uLong nIndex = pCNd->GetIndex();
-        rFtnIdxs.SeekEntry( *pTxtNd, &nPos );
-        if( nPos < rFtnIdxs.size() )
+        rFootnoteIdxs.SeekEntry( *pTextNd, &nPos );
+        if( nPos < rFootnoteIdxs.size() )
         {
-            while( nPos && pTxtNd == &(rFtnIdxs[ nPos ]->GetTxtNode()) )
+            while( nPos && pTextNd == &(rFootnoteIdxs[ nPos ]->GetTextNode()) )
                 --nPos;
-            if( nPos || pTxtNd != &(rFtnIdxs[ nPos ]->GetTxtNode()) )
+            if( nPos || pTextNd != &(rFootnoteIdxs[ nPos ]->GetTextNode()) )
                 ++nPos;
         }
-        while( nPos < rFtnIdxs.size() )
+        while( nPos < rFootnoteIdxs.size() )
         {
-            SwTxtFtn* pTxtFtn = rFtnIdxs[ nPos ];
-            if( pTxtFtn->GetTxtNode().GetIndex() > nIndex )
+            SwTextFootnote* pTextFootnote = rFootnoteIdxs[ nPos ];
+            if( pTextFootnote->GetTextNode().GetIndex() > nIndex )
                 break;
-            pTxtFtn->DelFrms( this );
+            pTextFootnote->DelFrms( this );
             ++nPos;
         }
     }
 
-    SwCntntFrm::DestroyImpl();
+    SwContentFrm::DestroyImpl();
 }
 
-SwTxtFrm::~SwTxtFrm()
+SwTextFrm::~SwTextFrm()
 {
 }
 
-const OUString& SwTxtFrm::GetTxt() const
+const OUString& SwTextFrm::GetText() const
 {
-    return GetTxtNode()->GetTxt();
+    return GetTextNode()->GetText();
 }
 
-void SwTxtFrm::ResetPreps()
+void SwTextFrm::ResetPreps()
 {
     if ( GetCacheIdx() != USHRT_MAX )
     {
@@ -429,18 +429,18 @@ void SwTxtFrm::ResetPreps()
     }
 }
 
-bool SwTxtFrm::IsHiddenNow() const
+bool SwTextFrm::IsHiddenNow() const
 {
     SwFrmSwapper aSwapper( this, true );
 
     if( !Frm().Width() && IsValid() && GetUpper()->IsValid() ) // invalid when stack overflows (StackHack)!
     {
-//        OSL_FAIL( "SwTxtFrm::IsHiddenNow: thin frame" );
+//        OSL_FAIL( "SwTextFrm::IsHiddenNow: thin frame" );
         return true;
     }
 
-    const bool bHiddenCharsHidePara = GetTxtNode()->HasHiddenCharAttribute( true );
-    const bool bHiddenParaField = GetTxtNode()->HasHiddenParaField();
+    const bool bHiddenCharsHidePara = GetTextNode()->HasHiddenCharAttribute( true );
+    const bool bHiddenParaField = GetTextNode()->HasHiddenParaField();
     const SwViewShell* pVsh = getRootFrm()->GetCurrShell();
 
     if ( pVsh && ( bHiddenCharsHidePara || bHiddenParaField ) )
@@ -448,7 +448,7 @@ bool SwTxtFrm::IsHiddenNow() const
         if (
              ( bHiddenParaField &&
                ( !pVsh->GetViewOptions()->IsShowHiddenPara() &&
-                 !pVsh->GetViewOptions()->IsFldName() ) ) ||
+                 !pVsh->GetViewOptions()->IsFieldName() ) ) ||
              ( bHiddenCharsHidePara &&
                !pVsh->GetViewOptions()->IsShowHiddenChar() ) )
         {
@@ -460,7 +460,7 @@ bool SwTxtFrm::IsHiddenNow() const
 }
 
 /// Removes Textfrm's attachments, when it's hidden
-void SwTxtFrm::HideHidden()
+void SwTextFrm::HideHidden()
 {
     OSL_ENSURE( !GetFollow() && IsHiddenNow(),
             "HideHidden on visible frame of hidden frame has follow" );
@@ -474,16 +474,16 @@ void SwTxtFrm::HideHidden()
     ClearPara();
 }
 
-void SwTxtFrm::HideFootnotes( sal_Int32 nStart, sal_Int32 nEnd )
+void SwTextFrm::HideFootnotes( sal_Int32 nStart, sal_Int32 nEnd )
 {
-    const SwpHints *pHints = GetTxtNode()->GetpSwpHints();
+    const SwpHints *pHints = GetTextNode()->GetpSwpHints();
     if( pHints )
     {
         const size_t nSize = pHints->Count();
         SwPageFrm *pPage = 0;
         for ( size_t i = 0; i < nSize; ++i )
         {
-            const SwTxtAttr *pHt = (*pHints)[i];
+            const SwTextAttr *pHt = (*pHints)[i];
             if ( pHt->Which() == RES_TXTATR_FTN )
             {
                 const sal_Int32 nIdx = pHt->GetStart();
@@ -493,7 +493,7 @@ void SwTxtFrm::HideFootnotes( sal_Int32 nStart, sal_Int32 nEnd )
                 {
                     if( !pPage )
                         pPage = FindPageFrm();
-                    pPage->RemoveFtn( this, static_cast<const SwTxtFtn*>(pHt) );
+                    pPage->RemoveFootnote( this, static_cast<const SwTextFootnote*>(pHt) );
                 }
             }
         }
@@ -510,7 +510,7 @@ void SwTxtFrm::HideFootnotes( sal_Int32 nStart, sal_Int32 nEnd )
  * (b) the paragraph is the last content in the document and
  * (c) the anchor character is an as-character anchored graphic.
  */
-bool sw_HideObj( const SwTxtFrm& _rFrm,
+bool sw_HideObj( const SwTextFrm& _rFrm,
                   const RndStdIds _eAnchorType,
                   const sal_Int32 _nObjAnchorPos,
                   SwAnchoredObject* _pAnchoredObj )
@@ -519,29 +519,29 @@ bool sw_HideObj( const SwTxtFrm& _rFrm,
 
     if (_eAnchorType == FLY_AT_CHAR)
     {
-        const IDocumentSettingAccess* pIDSA = _rFrm.GetTxtNode()->getIDocumentSettingAccess();
+        const IDocumentSettingAccess* pIDSA = _rFrm.GetTextNode()->getIDocumentSettingAccess();
         if ( !pIDSA->get(DocumentSettingId::USE_FORMER_TEXT_WRAPPING) &&
              !pIDSA->get(DocumentSettingId::OLD_LINE_SPACING) &&
              !pIDSA->get(DocumentSettingId::USE_FORMER_OBJECT_POS) &&
               pIDSA->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) &&
              _rFrm.IsInDocBody() && !_rFrm.FindNextCnt() )
         {
-            const OUString &rStr = _rFrm.GetTxtNode()->GetTxt();
+            const OUString &rStr = _rFrm.GetTextNode()->GetText();
             const sal_Unicode cAnchorChar = _nObjAnchorPos < rStr.getLength() ? rStr[_nObjAnchorPos] : 0;
             if (cAnchorChar == CH_TXTATR_BREAKWORD)
             {
-                const SwTxtAttr* const pHint(
-                    _rFrm.GetTxtNode()->GetTxtAttrForCharAt(_nObjAnchorPos,
+                const SwTextAttr* const pHint(
+                    _rFrm.GetTextNode()->GetTextAttrForCharAt(_nObjAnchorPos,
                         RES_TXTATR_FLYCNT) );
                 if ( pHint )
                 {
-                    const SwFrmFmt* pFrmFmt =
-                        static_cast<const SwTxtFlyCnt*>(pHint)->GetFlyCnt().GetFrmFmt();
-                    if ( pFrmFmt->Which() == RES_FLYFRMFMT )
+                    const SwFrameFormat* pFrameFormat =
+                        static_cast<const SwTextFlyCnt*>(pHint)->GetFlyCnt().GetFrameFormat();
+                    if ( pFrameFormat->Which() == RES_FLYFRMFMT )
                     {
-                        SwNodeIndex nCntntIndex = *(pFrmFmt->GetCntnt().GetCntntIdx());
-                        ++nCntntIndex;
-                        if ( nCntntIndex.GetNode().IsNoTxtNode() )
+                        SwNodeIndex nContentIndex = *(pFrameFormat->GetContent().GetContentIdx());
+                        ++nContentIndex;
+                        if ( nContentIndex.GetNode().IsNoTextNode() )
                         {
                             bRet = false;
                             // set needed data structure values for object positioning
@@ -571,7 +571,7 @@ bool sw_HideObj( const SwTxtFrm& _rFrm,
  * - is called from HideHidden() - should hide objects in hidden paragraphs and
  * - from _Format() - should hide/show objects in partly visible paragraphs
  */
-void SwTxtFrm::HideAndShowObjects()
+void SwTextFrm::HideAndShowObjects()
 {
     if ( GetDrawObjs() )
     {
@@ -585,7 +585,7 @@ void SwTxtFrm::HideAndShowObjects()
                 // #120729# - hotfix
                 // under certain conditions
                 const RndStdIds eAnchorType( pContact->GetAnchorId() );
-                const sal_Int32 nObjAnchorPos = pContact->GetCntntAnchorIndex().GetIndex();
+                const sal_Int32 nObjAnchorPos = pContact->GetContentAnchorIndex().GetIndex();
                 if ((eAnchorType != FLY_AT_CHAR) ||
                     sw_HideObj( *this, eAnchorType, nObjAnchorPos,
                                  (*GetDrawObjs())[i] ))
@@ -598,7 +598,7 @@ void SwTxtFrm::HideAndShowObjects()
         {
             // paragraph is visible, but can contain hidden text portion.
             // first we check if objects are allowed to be hidden:
-            const SwTxtNode& rNode = *GetTxtNode();
+            const SwTextNode& rNode = *GetTextNode();
             const SwViewShell* pVsh = getRootFrm()->GetCurrShell();
             const bool bShouldBeHidden = !pVsh || !pVsh->GetWin() ||
                                          !pVsh->GetViewOptions()->IsShowHiddenChar();
@@ -622,7 +622,7 @@ void SwTxtFrm::HideAndShowObjects()
                 {
                     sal_Int32 nHiddenStart;
                     sal_Int32 nHiddenEnd;
-                    const sal_Int32 nObjAnchorPos = pContact->GetCntntAnchorIndex().GetIndex();
+                    const sal_Int32 nObjAnchorPos = pContact->GetContentAnchorIndex().GetIndex();
                     SwScriptInfo::GetBoundsOfHiddenRange( rNode, nObjAnchorPos, nHiddenStart, nHiddenEnd, 0 );
                     // #120729# - hotfix
                     // under certain conditions
@@ -634,7 +634,7 @@ void SwTxtFrm::HideAndShowObjects()
                 }
                 else
                 {
-                    OSL_FAIL( "<SwTxtFrm::HideAndShowObjects()> - object not anchored at/inside paragraph!?" );
+                    OSL_FAIL( "<SwTextFrm::HideAndShowObjects()> - object not anchored at/inside paragraph!?" );
                 }
             }
         }
@@ -642,8 +642,8 @@ void SwTxtFrm::HideAndShowObjects()
 
     if (IsFollow())
     {
-        SwTxtFrm *pMaster = FindMaster();
-        OSL_ENSURE(pMaster, "SwTxtFrm without master");
+        SwTextFrm *pMaster = FindMaster();
+        OSL_ENSURE(pMaster, "SwTextFrm without master");
         if (pMaster)
             pMaster->HideAndShowObjects();
     }
@@ -651,28 +651,28 @@ void SwTxtFrm::HideAndShowObjects()
 
 /**
  * Returns the first possible break point in the current line.
- * This method is used in SwTxtFrm::Format() to decide whether the previous
+ * This method is used in SwTextFrm::Format() to decide whether the previous
  * line has to be formatted as well.
  * nFound is <= nEndLine.
  */
-sal_Int32 SwTxtFrm::FindBrk( const OUString &rTxt,
+sal_Int32 SwTextFrm::FindBrk( const OUString &rText,
                               const sal_Int32 nStart,
                               const sal_Int32 nEnd )
 {
     sal_Int32 nFound = nStart;
-    const sal_Int32 nEndLine = std::min( nEnd, rTxt.getLength() - 1 );
+    const sal_Int32 nEndLine = std::min( nEnd, rText.getLength() - 1 );
 
     // skip all leading blanks (see bug #2235).
-    while( nFound <= nEndLine && ' ' == rTxt[nFound] )
+    while( nFound <= nEndLine && ' ' == rText[nFound] )
     {
          nFound++;
     }
 
-    // A tricky situation with the TxtAttr-Dummy-character (in this case "$"):
+    // A tricky situation with the TextAttr-Dummy-character (in this case "$"):
     // "Dr.$Meyer" at the beginning of the second line. Typing a blank after that
     // doesn't result in the word moving into first line, even though that would work.
     // For this reason we don't skip the dummy char.
-    while( nFound <= nEndLine && ' ' != rTxt[nFound] )
+    while( nFound <= nEndLine && ' ' != rText[nFound] )
     {
         nFound++;
     }
@@ -680,7 +680,7 @@ sal_Int32 SwTxtFrm::FindBrk( const OUString &rTxt,
     return nFound;
 }
 
-bool SwTxtFrm::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const
+bool SwTextFrm::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const
 {
     if( nLen != COMPLETE_STRING && GetOfst() > nPos + nLen ) // the range preceded us
         return false;
@@ -691,7 +691,7 @@ bool SwTxtFrm::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const
     const sal_Int32 nMax = GetFollow()->GetOfst();
 
     // either the range overlap or our text has been deleted
-    if( nMax > nPos || nMax > GetTxt().getLength() )
+    if( nMax > nPos || nMax > GetText().getLength() )
         return true;
 
     // changes made in the first line of a follow can modify the master
@@ -699,13 +699,13 @@ bool SwTxtFrm::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const
     return pPara && ( nPos <= nMax + pPara->GetLen() );
 }
 
-inline void SwTxtFrm::InvalidateRange(const SwCharRange &aRange, const long nD)
+inline void SwTextFrm::InvalidateRange(const SwCharRange &aRange, const long nD)
 {
     if ( IsIdxInside( aRange.Start(), aRange.Len() ) )
         _InvalidateRange( aRange, nD );
 }
 
-void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD)
+void SwTextFrm::_InvalidateRange( const SwCharRange &aRange, const long nD)
 {
     if ( !HasPara() )
     {   InvalidateSize();
@@ -739,17 +739,17 @@ void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD)
     }
 }
 
-void SwTxtFrm::CalcLineSpace()
+void SwTextFrm::CalcLineSpace()
 {
     OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
-            "SwTxtFrm::CalcLineSpace with swapped frame!" );
+            "SwTextFrm::CalcLineSpace with swapped frame!" );
 
     if( IsLocked() || !HasPara() )
         return;
 
     SwParaPortion *pPara;
     if( GetDrawObjs() ||
-        GetTxtNode()->GetSwAttrSet().GetLRSpace().IsAutoFirst() ||
+        GetTextNode()->GetSwAttrSet().GetLRSpace().IsAutoFirst() ||
         ( pPara = GetPara() )->IsFixLineHeight() )
     {
         Init();
@@ -758,8 +758,8 @@ void SwTxtFrm::CalcLineSpace()
 
     Size aNewSize( Prt().SSize() );
 
-    SwTxtFormatInfo aInf( this );
-    SwTxtFormatter aLine( this, &aInf );
+    SwTextFormatInfo aInf( this );
+    SwTextFormatter aLine( this, &aInf );
     if( aLine.GetDropLines() )
     {
         Init();
@@ -773,14 +773,14 @@ void SwTxtFrm::CalcLineSpace()
 
     SwTwips nDelta = aNewSize.Height() - Prt().Height();
     // Underflow with free-flying frames
-    if( aInf.GetTxtFly().IsOn() )
+    if( aInf.GetTextFly().IsOn() )
     {
         SwRect aTmpFrm( Frm() );
         if( nDelta < 0 )
             aTmpFrm.Height( Prt().Height() );
         else
             aTmpFrm.Height( aNewSize.Height() );
-        if( aInf.GetTxtFly().Relax( aTmpFrm ) )
+        if( aInf.GetTextFly().Relax( aTmpFrm ) )
         {
             Init();
             return;
@@ -789,7 +789,7 @@ void SwTxtFrm::CalcLineSpace()
 
     if( nDelta )
     {
-        SwTxtFrmBreak aBreak( this );
+        SwTextFrmBreak aBreak( this );
         if( GetFollow() || aBreak.IsBreakNow( aLine ) )
         {
             // if there is a Follow() or if we need to break here, reformat
@@ -804,52 +804,52 @@ void SwTxtFrm::CalcLineSpace()
     }
 }
 
-static void lcl_SetWrong( SwTxtFrm& rFrm, sal_Int32 nPos, sal_Int32 nCnt, bool bMove )
+static void lcl_SetWrong( SwTextFrm& rFrm, sal_Int32 nPos, sal_Int32 nCnt, bool bMove )
 {
     if ( !rFrm.IsFollow() )
     {
-        SwTxtNode* pTxtNode = rFrm.GetTxtNode();
-        IGrammarContact* pGrammarContact = getGrammarContact( *pTxtNode );
+        SwTextNode* pTextNode = rFrm.GetTextNode();
+        IGrammarContact* pGrammarContact = getGrammarContact( *pTextNode );
         SwGrammarMarkUp* pWrongGrammar = pGrammarContact ?
-            pGrammarContact->getGrammarCheck( *pTxtNode, false ) :
-            pTxtNode->GetGrammarCheck();
-        bool bGrammarProxy = pWrongGrammar != pTxtNode->GetGrammarCheck();
+            pGrammarContact->getGrammarCheck( *pTextNode, false ) :
+            pTextNode->GetGrammarCheck();
+        bool bGrammarProxy = pWrongGrammar != pTextNode->GetGrammarCheck();
         if( bMove )
         {
-            if( pTxtNode->GetWrong() )
-                pTxtNode->GetWrong()->Move( nPos, nCnt );
+            if( pTextNode->GetWrong() )
+                pTextNode->GetWrong()->Move( nPos, nCnt );
             if( pWrongGrammar )
                 pWrongGrammar->MoveGrammar( nPos, nCnt );
-            if( bGrammarProxy && pTxtNode->GetGrammarCheck() )
-                pTxtNode->GetGrammarCheck()->MoveGrammar( nPos, nCnt );
-            if( pTxtNode->GetSmartTags() )
-                pTxtNode->GetSmartTags()->Move( nPos, nCnt );
+            if( bGrammarProxy && pTextNode->GetGrammarCheck() )
+                pTextNode->GetGrammarCheck()->MoveGrammar( nPos, nCnt );
+            if( pTextNode->GetSmartTags() )
+                pTextNode->GetSmartTags()->Move( nPos, nCnt );
         }
         else
         {
-            if( pTxtNode->GetWrong() )
-                pTxtNode->GetWrong()->Invalidate( nPos, nCnt );
+            if( pTextNode->GetWrong() )
+                pTextNode->GetWrong()->Invalidate( nPos, nCnt );
             if( pWrongGrammar )
                 pWrongGrammar->Invalidate( nPos, nCnt );
-            if( pTxtNode->GetSmartTags() )
-                pTxtNode->GetSmartTags()->Invalidate( nPos, nCnt );
+            if( pTextNode->GetSmartTags() )
+                pTextNode->GetSmartTags()->Invalidate( nPos, nCnt );
         }
         const sal_Int32 nEnd = nPos + (nCnt > 0 ? nCnt : 1 );
-        if ( !pTxtNode->GetWrong() && !pTxtNode->IsWrongDirty() )
+        if ( !pTextNode->GetWrong() && !pTextNode->IsWrongDirty() )
         {
-            pTxtNode->SetWrong( new SwWrongList( WRONGLIST_SPELL ) );
-            pTxtNode->GetWrong()->SetInvalid( nPos, nEnd );
+            pTextNode->SetWrong( new SwWrongList( WRONGLIST_SPELL ) );
+            pTextNode->GetWrong()->SetInvalid( nPos, nEnd );
         }
-        if ( !pTxtNode->GetSmartTags() && !pTxtNode->IsSmartTagDirty() )
+        if ( !pTextNode->GetSmartTags() && !pTextNode->IsSmartTagDirty() )
         {
-            pTxtNode->SetSmartTags( new SwWrongList( WRONGLIST_SMARTTAG ) );
-            pTxtNode->GetSmartTags()->SetInvalid( nPos, nEnd );
+            pTextNode->SetSmartTags( new SwWrongList( WRONGLIST_SMARTTAG ) );
+            pTextNode->GetSmartTags()->SetInvalid( nPos, nEnd );
         }
-        pTxtNode->SetWrongDirty( true );
-        pTxtNode->SetGrammarCheckDirty( true );
-        pTxtNode->SetWordCountDirty( true );
-        pTxtNode->SetAutoCompleteWordDirty( true );
-        pTxtNode->SetSmartTagDirty( true );
+        pTextNode->SetWrongDirty( true );
+        pTextNode->SetGrammarCheckDirty( true );
+        pTextNode->SetWordCountDirty( true );
+        pTextNode->SetAutoCompleteWordDirty( true );
+        pTextNode->SetSmartTagDirty( true );
     }
 
     SwRootFrm *pRootFrm = rFrm.getRootFrm();
@@ -868,20 +868,20 @@ static void lcl_SetWrong( SwTxtFrm& rFrm, sal_Int32 nPos, sal_Int32 nCnt, bool b
     }
 }
 
-static void lcl_SetScriptInval( SwTxtFrm& rFrm, sal_Int32 nPos )
+static void lcl_SetScriptInval( SwTextFrm& rFrm, sal_Int32 nPos )
 {
     if( rFrm.GetPara() )
         rFrm.GetPara()->GetScriptInfo().SetInvalidityA( nPos );
 }
 
-static void lcl_ModifyOfst( SwTxtFrm* pFrm, sal_Int32 nPos, sal_Int32 nLen )
+static void lcl_ModifyOfst( SwTextFrm* pFrm, sal_Int32 nPos, sal_Int32 nLen )
 {
     while( pFrm && pFrm->GetOfst() <= nPos )
         pFrm = pFrm->GetFollow();
     while( pFrm )
     {
         if (nLen == COMPLETE_STRING)
-            pFrm->ManipOfst( pFrm->GetTxtNode()->GetTxt().getLength() );
+            pFrm->ManipOfst( pFrm->GetTextNode()->GetText().getLength() );
         else
             pFrm->ManipOfst( pFrm->GetOfst() + nLen );
         pFrm = pFrm->GetFollow();
@@ -907,14 +907,14 @@ static bool hasA11yRelevantAttribute( const std::vector<sal_uInt16>& nWhich )
     return false;
 }
 
-void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
+void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
     const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
 
     // modifications concerning frame attributes are processed by the base class
-    if( IsInRange( aFrmFmtSetRange, nWhich ) || RES_FMT_CHG == nWhich )
+    if( IsInRange( aFrameFormatSetRange, nWhich ) || RES_FMT_CHG == nWhich )
     {
-        SwCntntFrm::Modify( pOld, pNew );
+        SwContentFrm::Modify( pOld, pNew );
         if( nWhich == RES_FMT_CHG && getRootFrm()->GetCurrShell() )
         {
             // collection has changed
@@ -939,8 +939,8 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
     // warning: one has to ensure that all variables are set
     sal_Int32 nPos;
     sal_Int32 nLen;
-    bool bSetFldsDirty = false;
-    bool bRecalcFtnFlag = false;
+    bool bSetFieldsDirty = false;
+    bool bRecalcFootnoteFlag = false;
 
     switch( nWhich )
     {
@@ -951,8 +951,8 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
         break;
         case RES_INS_TXT:
         {
-            nPos = static_cast<const SwInsTxt*>(pNew)->nPos;
-            nLen = static_cast<const SwInsTxt*>(pNew)->nLen;
+            nPos = static_cast<const SwInsText*>(pNew)->nPos;
+            nLen = static_cast<const SwInsText*>(pNew)->nLen;
             if( IsIdxInside( nPos, nLen ) )
             {
                 if( !nLen )
@@ -968,7 +968,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
             }
             lcl_SetWrong( *this, nPos, nLen, true );
             lcl_SetScriptInval( *this, nPos );
-            bSetFldsDirty = true;
+            bSetFieldsDirty = true;
             if( HasFollow() )
                 lcl_ModifyOfst( this, nPos, nLen );
         }
@@ -979,15 +979,15 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
             InvalidateRange( SwCharRange( nPos, 1 ), -1 );
             lcl_SetWrong( *this, nPos, -1, true );
             lcl_SetScriptInval( *this, nPos );
-            bSetFldsDirty = bRecalcFtnFlag = true;
+            bSetFieldsDirty = bRecalcFootnoteFlag = true;
             if( HasFollow() )
                 lcl_ModifyOfst( this, nPos, COMPLETE_STRING );
         }
         break;
         case RES_DEL_TXT:
         {
-            nPos = static_cast<const SwDelTxt*>(pNew)->nStart;
-            nLen = static_cast<const SwDelTxt*>(pNew)->nLen;
+            nPos = static_cast<const SwDelText*>(pNew)->nStart;
+            nLen = static_cast<const SwDelText*>(pNew)->nLen;
             const sal_Int32 m = -nLen;
             if( IsIdxInside( nPos, nLen ) )
             {
@@ -998,7 +998,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
             }
             lcl_SetWrong( *this, nPos, m, true );
             lcl_SetScriptInval( *this, nPos );
-            bSetFldsDirty = bRecalcFtnFlag = true;
+            bSetFieldsDirty = bRecalcFootnoteFlag = true;
             if( HasFollow() )
                 lcl_ModifyOfst( this, nPos, nLen );
         }
@@ -1014,7 +1014,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
                 // E.g.: empty line, set 14 pt!
                 // if( !nLen ) nLen = 1;
 
-                // FtnNummbers need to be formatted
+                // FootnoteNummbers need to be formatted
                 if( !nLen )
                     nLen = 1;
 
@@ -1030,7 +1030,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
             }
 
             if( isA11yRelevantAttribute( static_cast<const SwUpdateAttr*>(pNew)->getWhichAttr() ) &&
-                    hasA11yRelevantAttribute( static_cast<const SwUpdateAttr*>(pNew)->getFmtAttr() ) )
+                    hasA11yRelevantAttribute( static_cast<const SwUpdateAttr*>(pNew)->getFormatAttr() ) )
             {
                 // #i104008#
                 SwViewShell* pViewSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0;
@@ -1069,7 +1069,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
         case RES_TXTATR_FIELD:
         case RES_TXTATR_ANNOTATION:
             {
-                nPos = static_cast<const SwFmtFld*>(pNew)->GetTxtFld()->GetStart();
+                nPos = static_cast<const SwFormatField*>(pNew)->GetTextField()->GetStart();
                 if( IsIdxInside( nPos, 1 ) )
                 {
                     if( pNew == pOld )
@@ -1082,7 +1082,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
                     else
                         _InvalidateRange( SwCharRange( nPos, 1 ) );
                 }
-                bSetFldsDirty = true;
+                bSetFieldsDirty = true;
                 // ST2
                 if ( SwSmartTagMgr::Get().IsSmartTagsEnabled() )
                     lcl_SetWrong( *this, nPos, nPos + 1, false );
@@ -1091,9 +1091,9 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 
         case RES_TXTATR_FTN :
         {
-            nPos = static_cast<const SwFmtFtn*>(pNew)->GetTxtFtn()->GetStart();
-            if( IsInFtn() || IsIdxInside( nPos, 1 ) )
-                Prepare( PREP_FTN, static_cast<const SwFmtFtn*>(pNew)->GetTxtFtn() );
+            nPos = static_cast<const SwFormatFootnote*>(pNew)->GetTextFootnote()->GetStart();
+            if( IsInFootnote() || IsIdxInside( nPos, 1 ) )
+                Prepare( PREP_FTN, static_cast<const SwFormatFootnote*>(pNew)->GetTextFootnote() );
             break;
         }
 
@@ -1108,7 +1108,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 
             if( SfxItemState::SET == rNewSet.GetItemState( RES_TXTATR_FTN, false, &pItem ))
             {
-                nPos = static_cast<const SwFmtFtn*>(pItem)->GetTxtFtn()->GetStart();
+                nPos = static_cast<const SwFormatFootnote*>(pItem)->GetTextFootnote()->GetStart();
                 if( IsIdxInside( nPos, 1 ) )
                     Prepare( PREP_FTN, pNew );
                 nClear = 0x01;
@@ -1117,7 +1117,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 
             if( SfxItemState::SET == rNewSet.GetItemState( RES_TXTATR_FIELD, false, &pItem ))
             {
-                nPos = static_cast<const SwFmtFld*>(pItem)->GetTxtFld()->GetStart();
+                nPos = static_cast<const SwFormatField*>(pItem)->GetTextField()->GetStart();
                 if( IsIdxInside( nPos, 1 ) )
                 {
                     const SfxPoolItem* pOldItem = pOld ?
@@ -1280,10 +1280,10 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
                         aOldSet.ClearItem( RES_PARATR_SPLIT );
                         aNewSet.ClearItem( RES_PARATR_SPLIT );
                     }
-                    SwCntntFrm::Modify( &aOldSet, &aNewSet );
+                    SwContentFrm::Modify( &aOldSet, &aNewSet );
                 }
                 else
-                    SwCntntFrm::Modify( pOld, pNew );
+                    SwContentFrm::Modify( pOld, pNew );
             }
 
             if (isA11yRelevantAttribute(nWhich))
@@ -1306,9 +1306,9 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
                 const SwDocPosUpdate *pDocPos = static_cast<const SwDocPosUpdate*>(pOld);
                 if( pDocPos->nDocPos <= maFrm.Top() )
                 {
-                    const SwFmtFld *pFld = static_cast<const SwFmtFld *>(pNew);
+                    const SwFormatField *pField = static_cast<const SwFormatField *>(pNew);
                     InvalidateRange(
-                        SwCharRange( pFld->GetTxtFld()->GetStart(), 1 ) );
+                        SwCharRange( pField->GetTextField()->GetStart(), 1 ) );
                 }
             }
             break;
@@ -1317,7 +1317,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
             if ( GetPrev() )
                 CheckKeep();
             Prepare( PREP_CLEAR );
-            bSetFldsDirty = true;
+            bSetFieldsDirty = true;
             break;
         case RES_FRAMEDIR :
             SetDerivedR2L( false );
@@ -1337,18 +1337,18 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
         }
     } // switch
 
-    if( bSetFldsDirty )
+    if( bSetFieldsDirty )
         GetNode()->getIDocumentFieldsAccess()->SetFieldsDirty( true, GetNode(), 1 );
 
-    if ( bRecalcFtnFlag )
-        CalcFtnFlag();
+    if ( bRecalcFootnoteFlag )
+        CalcFootnoteFlag();
 }
 
-bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const
+bool SwTextFrm::GetInfo( SfxPoolItem &rHint ) const
 {
-    if ( RES_VIRTPAGENUM_INFO == rHnt.Which() && IsInDocBody() && ! IsFollow() )
+    if ( RES_VIRTPAGENUM_INFO == rHint.Which() && IsInDocBody() && ! IsFollow() )
     {
-        SwVirtPageNumInfo &rInfo = static_cast<SwVirtPageNumInfo&>(rHnt);
+        SwVirtPageNumInfo &rInfo = static_cast<SwVirtPageNumInfo&>(rHint);
         const SwPageFrm *pPage = FindPageFrm();
         if ( pPage )
         {
@@ -1370,9 +1370,9 @@ bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const
     return true;
 }
 
-void SwTxtFrm::PrepWidows( const sal_uInt16 nNeed, bool bNotify )
+void SwTextFrm::PrepWidows( const sal_uInt16 nNeed, bool bNotify )
 {
-    OSL_ENSURE(GetFollow() && nNeed, "+SwTxtFrm::Prepare: lost all friends");
+    OSL_ENSURE(GetFollow() && nNeed, "+SwTextFrm::Prepare: lost all friends");
 
     SwParaPortion *pPara = GetPara();
     if ( !pPara )
@@ -1384,8 +1384,8 @@ void SwTxtFrm::PrepWidows( const sal_uInt16 nNeed, bool bNotify )
     // We yield a few lines and shrink in CalcPreps()
     SWAP_IF_NOT_SWAPPED( this )
 
-    SwTxtSizeInfo aInf( this );
-    SwTxtMargin aLine( this, &aInf );
+    SwTextSizeInfo aInf( this );
+    SwTextMargin aLine( this, &aInf );
     aLine.Bottom();
     sal_Int32 nTmpLen = aLine.GetCurr()->GetLen();
     while( nHave && aLine.PrevLine() )
@@ -1424,30 +1424,30 @@ void SwTxtFrm::PrepWidows( const sal_uInt16 nNeed, bool bNotify )
     UNDO_SWAP( this )
 }
 
-static bool lcl_ErgoVadis( SwTxtFrm* pFrm, sal_Int32 &rPos, const PrepareHint ePrep )
+static bool lcl_ErgoVadis( SwTextFrm* pFrm, sal_Int32 &rPos, const PrepareHint ePrep )
 {
-    const SwFtnInfo &rFtnInfo = pFrm->GetNode()->GetDoc()->GetFtnInfo();
+    const SwFootnoteInfo &rFootnoteInfo = pFrm->GetNode()->GetDoc()->GetFootnoteInfo();
     if( ePrep == PREP_ERGOSUM )
     {
-        if( rFtnInfo.aErgoSum.isEmpty() )
+        if( rFootnoteInfo.aErgoSum.isEmpty() )
             return false;
         rPos = pFrm->GetOfst();
     }
     else
     {
-        if( rFtnInfo.aQuoVadis.isEmpty() )
+        if( rFootnoteInfo.aQuoVadis.isEmpty() )
             return false;
         if( pFrm->HasFollow() )
             rPos = pFrm->GetFollow()->GetOfst();
         else
-            rPos = pFrm->GetTxt().getLength();
+            rPos = pFrm->GetText().getLength();
         if( rPos )
             --rPos; // our last character
     }
     return true;
 }
 
-void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
+void SwTextFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                         bool bNotify )
 {
     SwFrmSwapper aSwapper( this, false );
@@ -1479,18 +1479,18 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                         break;
                 }
                 // Are there any free-flying frames on this page?
-                SwTxtFly aTxtFly( this );
-                if( aTxtFly.IsOn() )
+                SwTextFly aTextFly( this );
+                if( aTextFly.IsOn() )
                 {
                     // Does any free-flying frame overlap?
-                    if ( aTxtFly.Relax() || IsUndersized() )
+                    if ( aTextFly.Relax() || IsUndersized() )
                         break;
                 }
-                if( GetTxtNode()->GetSwAttrSet().GetRegister().GetValue())
+                if( GetTextNode()->GetSwAttrSet().GetRegister().GetValue())
                     break;
 
                 SwTextGridItem const*const pGrid(GetGridItem(FindPageFrm()));
-                if ( pGrid && GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() )
+                if ( pGrid && GetTextNode()->GetSwAttrSet().GetParaGrid().GetValue() )
                     break;
 
                 // #i28701# - consider anchored objects
@@ -1507,7 +1507,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
     if( !HasPara() && PREP_MUST_FIT != ePrep )
     {
         SetInvalidVert( true ); // Test
-        OSL_ENSURE( !IsLocked(), "SwTxtFrm::Prepare: three of a perfect pair" );
+        OSL_ENSURE( !IsLocked(), "SwTextFrm::Prepare: three of a perfect pair" );
         if ( bNotify )
             InvalidateSize();
         else
@@ -1516,7 +1516,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
     }
 
     // Get object from cache while locking
-    SwTxtLineAccess aAccess( this );
+    SwTextLineAccess aAccess( this );
     SwParaPortion *pPara = aAccess.GetPara();
 
     switch( ePrep )
@@ -1527,7 +1527,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                                 _InvalidateSize();
                                 /* no break here */
         case PREP_ADJUST_FRM :  pPara->SetPrepAdjust();
-                                if( IsFtnNumFrm() != pPara->IsFtnNum() ||
+                                if( IsFootnoteNumFrm() != pPara->IsFootnoteNum() ||
                                     IsUndersized() )
                                 {
                                     InvalidateRange( SwCharRange( 0, 1 ), 1);
@@ -1550,21 +1550,21 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
 
         case PREP_FTN :
         {
-            SwTxtFtn const *pFtn = static_cast<SwTxtFtn const *>(pVoid);
-            if( IsInFtn() )
+            SwTextFootnote const *pFootnote = static_cast<SwTextFootnote const *>(pVoid);
+            if( IsInFootnote() )
             {
-                // Am I the first TxtFrm of a footnote?
+                // Am I the first TextFrm of a footnote?
                 if( !GetPrev() )
-                    // So we're a TxtFrm of the footnote, which has
+                    // So we're a TextFrm of the footnote, which has
                     // to display the footnote number or the ErgoSum text
                     InvalidateRange( SwCharRange( 0, 1 ), 1);
 
                 if( !GetNext() )
                 {
-                    // We're the last Ftn; we need to update the
+                    // We're the last Footnote; we need to update the
                     // QuoVadis texts now
-                    const SwFtnInfo &rFtnInfo = GetNode()->GetDoc()->GetFtnInfo();
-                    if( !pPara->UpdateQuoVadis( rFtnInfo.aQuoVadis ) )
+                    const SwFootnoteInfo &rFootnoteInfo = GetNode()->GetDoc()->GetFootnoteInfo();
+                    if( !pPara->UpdateQuoVadis( rFootnoteInfo.aQuoVadis ) )
                     {
                         sal_Int32 nPos = pPara->GetParLen();
                         if( nPos )
@@ -1575,8 +1575,8 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
             }
             else
             {
-                // We are the TxtFrm _with_ the footnote
-                const sal_Int32 nPos = pFtn->GetStart();
+                // We are the TextFrm _with_ the footnote
+                const sal_Int32 nPos = pFootnote->GetStart();
                 InvalidateRange( SwCharRange( nPos, 1 ), 1);
             }
             break;
@@ -1599,7 +1599,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                     --nNxtOfst;
                 InvalidateRange( SwCharRange( nNxtOfst, 1 ), 1);
             }
-            if( IsInFtn() )
+            if( IsInFootnote() )
             {
                 sal_Int32 nPos;
                 if( lcl_ErgoVadis( this, nPos, PREP_QUOVADIS ) )
@@ -1608,7 +1608,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                     InvalidateRange( SwCharRange( nPos, 1 ), 0 );
             }
             // If we have a page number field, we must invalidate those spots
-            SwpHints *pHints = GetTxtNode()->GetpSwpHints();
+            SwpHints *pHints = GetTextNode()->GetpSwpHints();
             if( pHints )
             {
                 const size_t nSize = pHints->Count();
@@ -1616,20 +1616,20 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                                     GetFollow()->GetOfst() : COMPLETE_STRING;
                 for ( size_t i = 0; i < nSize; ++i )
                 {
-                    const SwTxtAttr *pHt = (*pHints)[i];
+                    const SwTextAttr *pHt = (*pHints)[i];
                     const sal_Int32 nStart = pHt->GetStart();
                     if( nStart >= GetOfst() )
                     {
                         if( nStart >= nEnd )
                             break;
 
-                // If we're flowing back and own a Ftn, the Ftn also flows
+                // If we're flowing back and own a Footnote, the Footnote also flows
                 // with us. So that it doesn't obstruct us, we send ourselves
                 // a ADJUST_FRM.
                 // pVoid != 0 means MoveBwd()
                         const sal_uInt16 nWhich = pHt->Which();
                         if( RES_TXTATR_FIELD == nWhich ||
-                            (HasFtn() && pVoid && RES_TXTATR_FTN == nWhich))
+                            (HasFootnote() && pVoid && RES_TXTATR_FTN == nWhich))
                         InvalidateRange( SwCharRange( nStart, 1 ), 1 );
                     }
                 }
@@ -1648,7 +1648,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
             if ( GetValidPrtAreaFlag() )
             {
                 SwTextGridItem const*const pGrid(GetGridItem(FindPageFrm()));
-                if ( pGrid && GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() )
+                if ( pGrid && GetTextNode()->GetSwAttrSet().GetParaGrid().GetValue() )
                     InvalidatePrt();
             }
 
@@ -1674,7 +1674,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                             SwAnchoredObject* pAnchoredObj = (*GetDrawObjs())[i];
                             // #i28701# - consider all
                             // to-character anchored objects
-                            if ( pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId()
+                            if ( pAnchoredObj->GetFrameFormat().GetAnchor().GetAnchorId()
                                     == FLY_AT_CHAR )
                             {
                                 bFormat = true;
@@ -1685,11 +1685,11 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                     if( !bFormat )
                     {
                         // Are there any free-flying frames on this page?
-                        SwTxtFly aTxtFly( this );
-                        if( aTxtFly.IsOn() )
+                        SwTextFly aTextFly( this );
+                        if( aTextFly.IsOn() )
                         {
                             // Does any free-flying frame overlap?
-                            bFormat = aTxtFly.Relax() || IsUndersized();
+                            bFormat = aTextFly.Relax() || IsUndersized();
                         }
                     }
                 }
@@ -1708,12 +1708,12 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
             }
             else
             {
-                if( GetTxtNode()->GetSwAttrSet().GetRegister().GetValue() )
+                if( GetTextNode()->GetSwAttrSet().GetRegister().GetValue() )
                     Prepare( PREP_REGISTER, 0, bNotify );
 
                 // The Frames need to be readjusted, which caused by changes
                 // in position
-                else if( HasFtn() )
+                else if( HasFootnote() )
                 {
                     Prepare( PREP_ADJUST_FRM, 0, bNotify );
                     _InvalidateSize();
@@ -1724,7 +1724,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
             break;
         }
         case PREP_REGISTER:
-            if( GetTxtNode()->GetSwAttrSet().GetRegister().GetValue() )
+            if( GetTextNode()->GetSwAttrSet().GetRegister().GetValue() )
             {
                 pPara->SetPrepAdjust();
                 CalcLineSpace();
@@ -1770,7 +1770,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
         {
             if( pVoid )
             {
-                sal_Int32 nWhere = CalcFlyPos( const_cast<SwFrmFmt *>(static_cast<SwFrmFmt const *>(pVoid)) );
+                sal_Int32 nWhere = CalcFlyPos( const_cast<SwFrameFormat *>(static_cast<SwFrameFormat const *>(pVoid)) );
                 OSL_ENSURE( COMPLETE_STRING != nWhere, "Prepare: Why me?" );
                 InvalidateRange( SwCharRange( nWhere, 1 ) );
                 return;
@@ -1815,20 +1815,20 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
  * The frame is changed in size and position, its SwParaPortion is moved aside
  * and a new one is created.
  * To achieve this, run formatting with bTestFormat flag set.
- * In the destructor the TxtFrm is reset to its original state.
+ * In the destructor the TextFrm is reset to its original state.
  */
 class SwTestFormat
 {
-    SwTxtFrm *pFrm;
+    SwTextFrm *pFrm;
     SwParaPortion *pOldPara;
     SwRect aOldFrm, aOldPrt;
 public:
-    SwTestFormat( SwTxtFrm* pTxtFrm, const SwFrm* pPrv, SwTwips nMaxHeight );
+    SwTestFormat( SwTextFrm* pTextFrm, const SwFrm* pPrv, SwTwips nMaxHeight );
     ~SwTestFormat();
 };
 
-SwTestFormat::SwTestFormat( SwTxtFrm* pTxtFrm, const SwFrm* pPre, SwTwips nMaxHeight )
-    : pFrm( pTxtFrm )
+SwTestFormat::SwTestFormat( SwTextFrm* pTextFrm, const SwFrm* pPre, SwTwips nMaxHeight )
+    : pFrm( pTextFrm )
 {
     aOldFrm = pFrm->Frm();
     aOldPrt = pFrm->Prt();
@@ -1868,8 +1868,8 @@ SwTestFormat::SwTestFormat( SwTxtFrm* pTxtFrm, const SwFrm* pPre, SwTwips nMaxHe
     if ( pFrm->IsVertical() )
         pFrm->SwapWidthAndHeight();
 
-    SwTxtFormatInfo aInf( pFrm, false, true, true );
-    SwTxtFormatter  aLine( pFrm, &aInf );
+    SwTextFormatInfo aInf( pFrm, false, true, true );
+    SwTextFormatter  aLine( pFrm, &aInf );
 
     pFrm->_Format( aLine, aInf );
 
@@ -1886,7 +1886,7 @@ SwTestFormat::~SwTestFormat()
     pFrm->SetPara( pOldPara );
 }
 
-bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, bool &bSplit )
+bool SwTextFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, bool &bSplit )
 {
     PROTOCOL_ENTER( this, PROT_TESTFORMAT, 0, 0 )
 
@@ -1895,7 +1895,7 @@ bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, bool &bSplit
 
     SwTestFormat aSave( this, pPrv, rMaxHeight );
 
-    return SwTxtFrm::WouldFit( rMaxHeight, bSplit, true );
+    return SwTextFrm::WouldFit( rMaxHeight, bSplit, true );
 }
 
 /**
@@ -1910,10 +1910,10 @@ bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, bool &bSplit
  *
  * @returns true if I can split
  */
-bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, bool &bSplit, bool bTst )
+bool SwTextFrm::WouldFit( SwTwips &rMaxHeight, bool &bSplit, bool bTst )
 {
     OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
-            "SwTxtFrm::WouldFit with swapped frame" );
+            "SwTextFrm::WouldFit with swapped frame" );
     SWRECTFN( this );
 
     if( IsLocked() )
@@ -1925,8 +1925,8 @@ bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, bool &bSplit, bool bTst )
 
     // OD 2004-05-24 #i27801# - correction: 'short cut' for empty paragraph
     // can *not* be applied, if test format is in progress. The test format doesn't
-    // adjust the frame and the printing area - see method <SwTxtFrm::_Format(..)>,
-    // which is called in <SwTxtFrm::TestFormat(..)>
+    // adjust the frame and the printing area - see method <SwTextFrm::_Format(..)>,
+    // which is called in <SwTextFrm::TestFormat(..)>
     if ( IsEmpty() && !bTst )
     {
         bSplit = false;
@@ -1966,7 +1966,7 @@ bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, bool &bSplit, bool bTst )
                     !GetFollow()->Frm().Width() :
                     !GetFollow()->Frm().Height() ) )
             {
-                SwTxtFrm* pFoll = GetFollow()->GetFollow();
+                SwTextFrm* pFoll = GetFollow()->GetFollow();
                 while( pFoll &&
                         ( pFoll->IsVertical() ?
                          !pFoll->Frm().Width() :
@@ -1982,8 +1982,8 @@ bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, bool &bSplit, bool bTst )
 
     SWAP_IF_NOT_SWAPPED( this );
 
-    SwTxtSizeInfo aInf( this );
-    SwTxtMargin aLine( this, &aInf );
+    SwTextSizeInfo aInf( this );
+    SwTextMargin aLine( this, &aInf );
 
     WidowsAndOrphans aFrmBreak( this, rMaxHeight, bSplit );
 
@@ -2009,10 +2009,10 @@ bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, bool &bSplit, bool bTst )
     return bRet;
 }
 
-sal_uInt16 SwTxtFrm::GetParHeight() const
+sal_uInt16 SwTextFrm::GetParHeight() const
 {
     OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
-            "SwTxtFrm::GetParHeight with swapped frame" );
+            "SwTextFrm::GetParHeight with swapped frame" );
 
     if( !HasPara() )
     {   // For non-empty paragraphs this is a special case
@@ -2020,7 +2020,7 @@ sal_uInt16 SwTxtFrm::GetParHeight() const
         sal_uInt16 nRet = (sal_uInt16)Prt().SSize().Height();
         if( IsUndersized() )
         {
-            if( IsEmpty() || GetTxt().isEmpty() )
+            if( IsEmpty() || GetText().isEmpty() )
                 nRet = (sal_uInt16)EmptyHeight();
             else
                 ++nRet;
@@ -2050,7 +2050,7 @@ sal_uInt16 SwTxtFrm::GetParHeight() const
 /**
  * @returns this _always_ in the formatted state!
  */
-SwTxtFrm* SwTxtFrm::GetFormatted( bool bForceQuickFormat )
+SwTextFrm* SwTextFrm::GetFormatted( bool bForceQuickFormat )
 {
     SWAP_IF_SWAPPED( this )
 
@@ -2076,7 +2076,7 @@ SwTxtFrm* SwTxtFrm::GetFormatted( bool bForceQuickFormat )
     return this;
 }
 
-SwTwips SwTxtFrm::CalcFitToContent()
+SwTwips SwTextFrm::CalcFitToContent()
 {
     // #i31490#
     // If we are currently locked, we better return with a
@@ -2104,11 +2104,11 @@ SwTwips SwTxtFrm::CalcFitToContent()
         Frm().Pos().X() += nOldFrmWidth - nPageWidth;
 
     // #i31490#
-    TxtFrmLockGuard aLock( this );
+    TextFrmLockGuard aLock( this );
 
-    SwTxtFormatInfo aInf( this, false, true, true );
+    SwTextFormatInfo aInf( this, false, true, true );
     aInf.SetIgnoreFly( true );
-    SwTxtFormatter  aLine( this, &aInf );
+    SwTextFormatter  aLine( this, &aInf );
     SwHookOut aHook( aInf );
 
     // #i54031# - assure mininum of MINLAY twips.
@@ -2133,7 +2133,7 @@ SwTwips SwTxtFrm::CalcFitToContent()
  * line offset for the real text formatting due to the value of label
  * adjustment attribute of the list level.
  */
-void SwTxtFrm::CalcAdditionalFirstLineOffset()
+void SwTextFrm::CalcAdditionalFirstLineOffset()
 {
     if ( IsLocked() )
         return;
@@ -2141,11 +2141,11 @@ void SwTxtFrm::CalcAdditionalFirstLineOffset()
     // reset additional first line offset
     mnAdditionalFirstLineOffset = 0;
 
-    const SwTxtNode* pTxtNode( GetTxtNode() );
-    if ( pTxtNode && pTxtNode->IsNumbered() && pTxtNode->IsCountedInList() &&
-         pTxtNode->GetNumRule() )
+    const SwTextNode* pTextNode( GetTextNode() );
+    if ( pTextNode && pTextNode->IsNumbered() && pTextNode->IsCountedInList() &&
+         pTextNode->GetNumRule() )
     {
-        int nListLevel = pTxtNode->GetActualListLevel();
+        int nListLevel = pTextNode->GetActualListLevel();
 
         if (nListLevel < 0)
             nListLevel = 0;
@@ -2153,9 +2153,9 @@ void SwTxtFrm::CalcAdditionalFirstLineOffset()
         if (nListLevel >= MAXLEVEL)
             nListLevel = MAXLEVEL - 1;
 
-        const SwNumFmt& rNumFmt =
-                pTxtNode->GetNumRule()->Get( static_cast<sal_uInt16>(nListLevel) );
-        if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+        const SwNumFormat& rNumFormat =
+                pTextNode->GetNumRule()->Get( static_cast<sal_uInt16>(nListLevel) );
+        if ( rNumFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
         {
             // keep current paragraph portion and apply dummy paragraph portion
             SwParaPortion* pOldPara = GetPara();
@@ -2163,37 +2163,37 @@ void SwTxtFrm::CalcAdditionalFirstLineOffset()
             SetPara( pDummy, false );
 
             // lock paragraph
-            TxtFrmLockGuard aLock( this );
+            TextFrmLockGuard aLock( this );
 
             // simulate text formatting
-            SwTxtFormatInfo aInf( this, false, true, true );
+            SwTextFormatInfo aInf( this, false, true, true );
             aInf.SetIgnoreFly( true );
-            SwTxtFormatter aLine( this, &aInf );
+            SwTextFormatter aLine( this, &aInf );
             SwHookOut aHook( aInf );
             aLine._CalcFitToContent();
 
             // determine additional first line offset
             const SwLinePortion* pFirstPortion = aLine.GetCurr()->GetFirstPortion();
-            if ( pFirstPortion->InNumberGrp() && !pFirstPortion->IsFtnNumPortion() )
+            if ( pFirstPortion->InNumberGrp() && !pFirstPortion->IsFootnoteNumPortion() )
             {
                 SwTwips nNumberPortionWidth( pFirstPortion->Width() );
 
                 const SwLinePortion* pPortion = pFirstPortion->GetPortion();
                 while ( pPortion &&
-                        pPortion->InNumberGrp() && !pPortion->IsFtnNumPortion())
+                        pPortion->InNumberGrp() && !pPortion->IsFootnoteNumPortion())
                 {
                     nNumberPortionWidth += pPortion->Width();
                     pPortion = pPortion->GetPortion();
                 }
 
                 if ( ( IsRightToLeft() &&
-                       rNumFmt.GetNumAdjust() == SVX_ADJUST_LEFT ) ||
+                       rNumFormat.GetNumAdjust() == SVX_ADJUST_LEFT ) ||
                      ( !IsRightToLeft() &&
-                       rNumFmt.GetNumAdjust() == SVX_ADJUST_RIGHT ) )
+                       rNumFormat.GetNumAdjust() == SVX_ADJUST_RIGHT ) )
                 {
                     mnAdditionalFirstLineOffset = -nNumberPortionWidth;
                 }
-                else if ( rNumFmt.GetNumAdjust() == SVX_ADJUST_CENTER )
+                else if ( rNumFormat.GetNumAdjust() == SVX_ADJUST_CENTER )
                 {
                     mnAdditionalFirstLineOffset = -(nNumberPortionWidth/2);
                 }
@@ -2217,7 +2217,7 @@ void SwTxtFrm::CalcAdditionalFirstLineOffset()
  *                  determine the height of the last line, which
  *                  uses the font
  */
-void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
+void SwTextFrm::_CalcHeightOfLastLine( const bool _bUseFont )
 {
     // #i71281#
     // invalidate printing area, if height of last line changes
@@ -2225,7 +2225,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
 
     // determine output device
     SwViewShell* pVsh = getRootFrm()->GetCurrShell();
-    OSL_ENSURE( pVsh, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no SwViewShell" );
+    OSL_ENSURE( pVsh, "<SwTextFrm::_GetHeightOfLastLineForPropLineSpacing()> - no SwViewShell" );
 
     // #i78921# - make code robust, according to provided patch
     // There could be no <SwViewShell> instance in the case of loading a binary
@@ -2235,13 +2235,13 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
         return;
     }
     OutputDevice* pOut = pVsh->GetOut();
-    const IDocumentSettingAccess* pIDSA = GetTxtNode()->getIDocumentSettingAccess();
+    const IDocumentSettingAccess* pIDSA = GetTextNode()->getIDocumentSettingAccess();
     if ( !pVsh->GetViewOptions()->getBrowseMode() ||
           pVsh->GetViewOptions()->IsPrtFormat() )
     {
-        pOut = GetTxtNode()->getIDocumentDeviceAccess()->getReferenceDevice( true );
+        pOut = GetTextNode()->getIDocumentDeviceAccess()->getReferenceDevice( true );
     }
-    OSL_ENSURE( pOut, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no OutputDevice" );
+    OSL_ENSURE( pOut, "<SwTextFrm::_GetHeightOfLastLineForPropLineSpacing()> - no OutputDevice" );
     // #i78921# - make code robust, according to provided patch
     if ( !pOut )
     {
@@ -2293,7 +2293,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
         else
         {
             bool bCalcHeightOfLastLine = true;
-            if ( ( !HasPara() && IsEmpty( ) ) || GetTxt().isEmpty() )
+            if ( ( !HasPara() && IsEmpty( ) ) || GetText().isEmpty() )
             {
                 mnHeightOfLastLine = EmptyHeight();
                 bCalcHeightOfLastLine = false;
@@ -2302,7 +2302,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
             if ( bCalcHeightOfLastLine )
             {
                 OSL_ENSURE( HasPara(),
-                        "<SwTxtFrm::_CalcHeightOfLastLine()> - missing paragraph portions." );
+                        "<SwTextFrm::_CalcHeightOfLastLine()> - missing paragraph portions." );
                 const SwLineLayout* pLineLayout = GetPara();
                 while ( pLineLayout && pLineLayout->GetNext() )
                 {
@@ -2355,7 +2355,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
  *                            value of a proportional line spacing is
  *                            returned or not
  */
-long SwTxtFrm::GetLineSpace( const bool _bNoPropLineSpace ) const
+long SwTextFrm::GetLineSpace( const bool _bNoPropLineSpace ) const
 {
     long nRet = 0;
 
@@ -2397,7 +2397,7 @@ long SwTxtFrm::GetLineSpace( const bool _bNoPropLineSpace ) const
     return nRet;
 }
 
-sal_uInt16 SwTxtFrm::FirstLineHeight() const
+sal_uInt16 SwTextFrm::FirstLineHeight() const
 {
     if ( !HasPara() )
     {
@@ -2412,17 +2412,17 @@ sal_uInt16 SwTxtFrm::FirstLineHeight() const
     return pPara->Height();
 }
 
-sal_uInt16 SwTxtFrm::GetLineCount( sal_Int32 nPos )
+sal_uInt16 SwTextFrm::GetLineCount( sal_Int32 nPos )
 {
     sal_uInt16 nRet = 0;
-    SwTxtFrm *pFrm = this;
+    SwTextFrm *pFrm = this;
     do
     {
         pFrm->GetFormatted();
         if( !pFrm->HasPara() )
             break;
-        SwTxtSizeInfo aInf( pFrm );
-        SwTxtMargin aLine( pFrm, &aInf );
+        SwTextSizeInfo aInf( pFrm );
+        SwTextMargin aLine( pFrm, &aInf );
         if( COMPLETE_STRING == nPos )
             aLine.Bottom();
         else
@@ -2433,15 +2433,15 @@ sal_uInt16 SwTxtFrm::GetLineCount( sal_Int32 nPos )
     return nRet;
 }
 
-void SwTxtFrm::ChgThisLines()
+void SwTextFrm::ChgThisLines()
 {
     // not necessary to format here (GerFormatted etc.), because we have to come from there!
     sal_uLong nNew = 0;
     const SwLineNumberInfo &rInf = GetNode()->GetDoc()->GetLineNumberInfo();
-    if ( !GetTxt().isEmpty() && HasPara() )
+    if ( !GetText().isEmpty() && HasPara() )
     {
-        SwTxtSizeInfo aInf( this );
-        SwTxtMargin aLine( this, &aInf );
+        SwTextSizeInfo aInf( this );
+        SwTextMargin aLine( this, &aInf );
         if ( rInf.IsCountBlankLines() )
         {
             aLine.Bottom();
@@ -2451,7 +2451,7 @@ void SwTxtFrm::ChgThisLines()
         {
             do
             {
-                if( aLine.GetCurr()->HasCntnt() )
+                if( aLine.GetCurr()->HasContent() )
                     ++nNew;
             } while ( aLine.NextLine() );
         }
@@ -2466,7 +2466,7 @@ void SwTxtFrm::ChgThisLines()
             nAllLines -= nThisLines;
             nThisLines = nNew;
             nAllLines  += nThisLines;
-            SwFrm *pNxt = GetNextCntntFrm();
+            SwFrm *pNxt = GetNextContentFrm();
             while( pNxt && pNxt->IsInTab() )
             {
                 if( 0 != (pNxt = pNxt->FindTabFrm()) )
@@ -2488,7 +2488,7 @@ void SwTxtFrm::ChgThisLines()
     }
 }
 
-void SwTxtFrm::RecalcAllLines()
+void SwTextFrm::RecalcAllLines()
 {
     ValidateLineNum();
 
@@ -2497,31 +2497,31 @@ void SwTxtFrm::RecalcAllLines()
     if ( !IsInTab() )
     {
         const sal_uLong nOld = GetAllLines();
-        const SwFmtLineNumber &rLineNum = pAttrSet->GetLineNumber();
+        const SwFormatLineNumber &rLineNum = pAttrSet->GetLineNumber();
         sal_uLong nNewNum;
-        const bool bRestart = GetTxtNode()->GetDoc()->GetLineNumberInfo().IsRestartEachPage();
+        const bool bRestart = GetTextNode()->GetDoc()->GetLineNumberInfo().IsRestartEachPage();
 
         if ( !IsFollow() && rLineNum.GetStartValue() && rLineNum.IsCount() )
             nNewNum = rLineNum.GetStartValue() - 1;
         // If it is a follow or not has not be considered if it is a restart at each page; the
         // restart should also take affekt at follows.
-        else if ( bRestart && FindPageFrm()->FindFirstBodyCntnt() == this )
+        else if ( bRestart && FindPageFrm()->FindFirstBodyContent() == this )
         {
             nNewNum = 0;
         }
         else
         {
-            SwCntntFrm *pPrv = GetPrevCntntFrm();
+            SwContentFrm *pPrv = GetPrevContentFrm();
             while ( pPrv &&
                     (pPrv->IsInTab() || pPrv->IsInDocBody() != IsInDocBody()) )
-                pPrv = pPrv->GetPrevCntntFrm();
+                pPrv = pPrv->GetPrevContentFrm();
 
             // #i78254# Restart line numbering at page change
             // First body content may be in table!
             if ( bRestart && pPrv && pPrv->FindPageFrm() != FindPageFrm() )
                 pPrv = 0;
 
-            nNewNum = pPrv ? static_cast<SwTxtFrm*>(pPrv)->GetAllLines() : 0;
+            nNewNum = pPrv ? static_cast<SwTextFrm*>(pPrv)->GetAllLines() : 0;
         }
         if ( rLineNum.IsCount() )
             nNewNum += GetThisLines();
@@ -2529,10 +2529,10 @@ void SwTxtFrm::RecalcAllLines()
         if ( nOld != nNewNum )
         {
             nAllLines = nNewNum;
-            SwCntntFrm *pNxt = GetNextCntntFrm();
+            SwContentFrm *pNxt = GetNextContentFrm();
             while ( pNxt &&
                     (pNxt->IsInTab() || pNxt->IsInDocBody() != IsInDocBody()) )
-                pNxt = pNxt->GetNextCntntFrm();
+                pNxt = pNxt->GetNextContentFrm();
             if ( pNxt )
             {
                 if ( pNxt->GetUpper() != GetUpper() )
@@ -2544,7 +2544,7 @@ void SwTxtFrm::RecalcAllLines()
     }
 }
 
-void SwTxtFrm::VisitPortions( SwPortionHandler& rPH ) const
+void SwTextFrm::VisitPortions( SwPortionHandler& rPH ) const
 {
     const SwParaPortion* pPara = IsValid() ? GetPara() : NULL;
 
@@ -2571,17 +2571,17 @@ void SwTxtFrm::VisitPortions( SwPortionHandler& rPH ) const
     rPH.Finish();
 }
 
-const SwScriptInfo* SwTxtFrm::GetScriptInfo() const
+const SwScriptInfo* SwTextFrm::GetScriptInfo() const
 {
     const SwParaPortion* pPara = GetPara();
     return pPara ? &pPara->GetScriptInfo() : 0;
 }
 
 /**
- * Helper function for SwTxtFrm::CalcBasePosForFly()
+ * Helper function for SwTextFrm::CalcBasePosForFly()
  */
-static SwTwips lcl_CalcFlyBasePos( const SwTxtFrm& rFrm, SwRect aFlyRect,
-                            SwTxtFly& rTxtFly )
+static SwTwips lcl_CalcFlyBasePos( const SwTextFrm& rFrm, SwRect aFlyRect,
+                            SwTextFly& rTextFly )
 {
     SWRECTFN( (&rFrm) )
     SwTwips nRet = rFrm.IsRightToLeft() ?
@@ -2590,7 +2590,7 @@ static SwTwips lcl_CalcFlyBasePos( const SwTxtFrm& rFrm, SwRect aFlyRect,
 
     do
     {
-        SwRect aRect = rTxtFly.GetFrm( aFlyRect );
+        SwRect aRect = rTextFly.GetFrm( aFlyRect );
         if ( 0 != (aRect.*fnRect->fnGetWidth)() )
         {
             if ( rFrm.IsRightToLeft() )
@@ -2626,12 +2626,12 @@ static SwTwips lcl_CalcFlyBasePos( const SwTxtFrm& rFrm, SwRect aFlyRect,
     return nRet;
 }
 
-void SwTxtFrm::CalcBaseOfstForFly()
+void SwTextFrm::CalcBaseOfstForFly()
 {
     OSL_ENSURE( !IsVertical() || !IsSwapped(),
-            "SwTxtFrm::CalcBasePosForFly with swapped frame!" );
+            "SwTextFrm::CalcBasePosForFly with swapped frame!" );
 
-    const SwNode* pNode = GetTxtNode();
+    const SwNode* pNode = GetTextNode();
     if ( !pNode->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_FLY_OFFSETS) )
         return;
 
@@ -2658,15 +2658,15 @@ void SwTxtFrm::CalcBaseOfstForFly()
         (aFlyRect.*fnRect->fnSetTopAndHeight)( nTop, nLineHeight );
     }
 
-    SwTxtFly aTxtFly( this );
-    aTxtFly.SetIgnoreCurrentFrame( true );
-    aTxtFly.SetIgnoreContour( true );
+    SwTextFly aTextFly( this );
+    aTextFly.SetIgnoreCurrentFrame( true );
+    aTextFly.SetIgnoreContour( true );
     // #118809# - ignore objects in page header|footer for
     // text frames not in page header|footer
-    aTxtFly.SetIgnoreObjsInHeaderFooter( true );
-    SwTwips nRet1 = lcl_CalcFlyBasePos( *this, aFlyRect, aTxtFly );
-    aTxtFly.SetIgnoreCurrentFrame( false );
-    SwTwips nRet2 = lcl_CalcFlyBasePos( *this, aFlyRect, aTxtFly );
+    aTextFly.SetIgnoreObjsInHeaderFooter( true );
+    SwTwips nRet1 = lcl_CalcFlyBasePos( *this, aFlyRect, aTextFly );
+    aTextFly.SetIgnoreCurrentFrame( false );
+    SwTwips nRet2 = lcl_CalcFlyBasePos( *this, aFlyRect, aTextFly );
 
     // make values relative to frame start position
     SwTwips nLeft = IsRightToLeft() ?
@@ -2680,10 +2680,10 @@ void SwTxtFrm::CalcBaseOfstForFly()
 /**
  * Repaint all text frames of the given text node
  */
-void SwTxtFrm::repaintTextFrames( const SwTxtNode& rNode )
+void SwTextFrm::repaintTextFrames( const SwTextNode& rNode )
 {
-    SwIterator<SwTxtFrm,SwTxtNode> aIter( rNode );
-    for( const SwTxtFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+    SwIterator<SwTextFrm,SwTextNode> aIter( rNode );
+    for( const SwTextFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
     {
         SwRect aRec( pFrm->PaintArea() );
         const SwRootFrm *pRootFrm = pFrm->getRootFrm();
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index f5be1d3288f1..07ba9d6e8083 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -55,24 +55,24 @@
 
 using namespace ::com::sun::star;
 
-bool SwTxtFrm::_IsFtnNumFrm() const
+bool SwTextFrm::_IsFootnoteNumFrm() const
 {
-    const SwFtnFrm* pFtn = FindFtnFrm()->GetMaster();
-    while( pFtn && !pFtn->ContainsCntnt() )
-        pFtn = pFtn->GetMaster();
-    return !pFtn;
+    const SwFootnoteFrm* pFootnote = FindFootnoteFrm()->GetMaster();
+    while( pFootnote && !pFootnote->ContainsContent() )
+        pFootnote = pFootnote->GetMaster();
+    return !pFootnote;
 }
 
 /**
- * Looks for the TxtFrm matching the SwTxtFtn within a master-follow chain
+ * Looks for the TextFrm matching the SwTextFootnote within a master-follow chain
  */
-SwTxtFrm *SwTxtFrm::FindFtnRef( const SwTxtFtn *pFtn )
+SwTextFrm *SwTextFrm::FindFootnoteRef( const SwTextFootnote *pFootnote )
 {
-    SwTxtFrm *pFrm = this;
-    const bool bFwd = pFtn->GetStart() >= GetOfst();
+    SwTextFrm *pFrm = this;
+    const bool bFwd = pFootnote->GetStart() >= GetOfst();
     while( pFrm )
     {
-        if( SwFtnBossFrm::FindFtn( pFrm, pFtn ) )
+        if( SwFootnoteBossFrm::FindFootnote( pFrm, pFootnote ) )
             return pFrm;
         pFrm = bFwd ? pFrm->GetFollow() :
                       pFrm->IsFollow() ? pFrm->FindMaster() : 0;
@@ -81,14 +81,14 @@ SwTxtFrm *SwTxtFrm::FindFtnRef( const SwTxtFtn *pFtn )
 }
 
 #ifdef DBG_UTIL
-void SwTxtFrm::CalcFtnFlag( sal_Int32 nStop )// For testing the SplitFrm
+void SwTextFrm::CalcFootnoteFlag( sal_Int32 nStop )// For testing the SplitFrm
 #else
-void SwTxtFrm::CalcFtnFlag()
+void SwTextFrm::CalcFootnoteFlag()
 #endif
 {
-    bFtn = false;
+    bFootnote = false;
 
-    const SwpHints *pHints = GetTxtNode()->GetpSwpHints();
+    const SwpHints *pHints = GetTextNode()->GetpSwpHints();
     if( !pHints )
         return;
 
@@ -103,7 +103,7 @@ void SwTxtFrm::CalcFtnFlag()
 
     for ( size_t i = 0; i < nSize; ++i )
     {
-        const SwTxtAttr *pHt = (*pHints)[i];
+        const SwTextAttr *pHt = (*pHints)[i];
         if ( pHt->Which() == RES_TXTATR_FTN )
         {
             const sal_Int32 nIdx = pHt->GetStart();
@@ -111,41 +111,41 @@ void SwTxtFrm::CalcFtnFlag()
                 break;
             if( GetOfst() <= nIdx )
             {
-                bFtn = true;
+                bFootnote = true;
                 break;
             }
         }
     }
 }
 
-bool SwTxtFrm::CalcPrepFtnAdjust()
+bool SwTextFrm::CalcPrepFootnoteAdjust()
 {
-    OSL_ENSURE( HasFtn(), "Who´s calling me?" );
-    SwFtnBossFrm *pBoss = FindFtnBossFrm( true );
-    const SwFtnFrm *pFtn = pBoss->FindFirstFtn( this );
-    if( pFtn && FTNPOS_CHAPTER != GetNode()->GetDoc()->GetFtnInfo().ePos &&
+    OSL_ENSURE( HasFootnote(), "Who´s calling me?" );
+    SwFootnoteBossFrm *pBoss = FindFootnoteBossFrm( true );
+    const SwFootnoteFrm *pFootnote = pBoss->FindFirstFootnote( this );
+    if( pFootnote && FTNPOS_CHAPTER != GetNode()->GetDoc()->GetFootnoteInfo().ePos &&
         ( !pBoss->GetUpper()->IsSctFrm() ||
-        !static_cast<SwSectionFrm*>(pBoss->GetUpper())->IsFtnAtEnd() ) )
+        !static_cast<SwSectionFrm*>(pBoss->GetUpper())->IsFootnoteAtEnd() ) )
     {
-        const SwFtnContFrm *pCont = pBoss->FindFtnCont();
+        const SwFootnoteContFrm *pCont = pBoss->FindFootnoteCont();
         bool bReArrange = true;
 
         SWRECTFN( this )
         if ( pCont && (*fnRect->fnYDiff)( (pCont->Frm().*fnRect->fnGetTop)(),
                                           (Frm().*fnRect->fnGetBottom)() ) > 0 )
         {
-            pBoss->RearrangeFtns( (Frm().*fnRect->fnGetBottom)(), false,
-                                  pFtn->GetAttr() );
+            pBoss->RearrangeFootnotes( (Frm().*fnRect->fnGetBottom)(), false,
+                                  pFootnote->GetAttr() );
             ValidateBodyFrm();
             ValidateFrm();
-            pFtn = pBoss->FindFirstFtn( this );
+            pFootnote = pBoss->FindFirstFootnote( this );
         }
         else
             bReArrange = false;
-        if( !pCont || !pFtn || bReArrange != (pFtn->FindFtnBossFrm() == pBoss) )
+        if( !pCont || !pFootnote || bReArrange != (pFootnote->FindFootnoteBossFrm() == pBoss) )
         {
-            SwTxtFormatInfo aInf( this );
-            SwTxtFormatter aLine( this, &aInf );
+            SwTextFormatInfo aInf( this );
+            SwTextFormatter aLine( this, &aInf );
             aLine.TruncLines();
             SetPara( 0 ); // May be deleted!
             ResetPreps();
@@ -159,14 +159,14 @@ bool SwTxtFrm::CalcPrepFtnAdjust()
  * Local helper function. Checks if nLower should be taken as the boundary
  * for the footnote.
  */
-static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
+static SwTwips lcl_GetFootnoteLower( const SwTextFrm* pFrm, SwTwips nLower )
 {
     // nLower is an absolute value. It denotes the bottom of the line
     // containing the footnote.
     SWRECTFN( pFrm )
 
     OSL_ENSURE( !pFrm->IsVertical() || !pFrm->IsSwapped(),
-            "lcl_GetFtnLower with swapped frame" );
+            "lcl_GetFootnoteLower with swapped frame" );
 
     SwTwips nAdd;
     SwTwips nRet = nLower;
@@ -179,7 +179,7 @@ static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
         // b) The table row is not allowed to split
 
         // Inside a table, there are no footnotes,
-        // see SwFrm::FindFtnBossFrm. So we don't have to check
+        // see SwFrm::FindFootnoteBossFrm. So we don't have to check
         // the case that pFrm is inside a (footnote collecting) section
         // within the table.
         const SwFrm* pRow = pFrm;
@@ -252,27 +252,27 @@ static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
     return nRet;
 }
 
-SwTwips SwTxtFrm::GetFtnLine( const SwTxtFtn *pFtn ) const
+SwTwips SwTextFrm::GetFootnoteLine( const SwTextFootnote *pFootnote ) const
 {
     OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
-            "SwTxtFrm::GetFtnLine with swapped frame" );
+            "SwTextFrm::GetFootnoteLine with swapped frame" );
 
-    SwTxtFrm *pThis = const_cast<SwTxtFrm*>(this);
+    SwTextFrm *pThis = const_cast<SwTextFrm*>(this);
 
     if( !HasPara() )
     {
         // #109071# GetFormatted() does not work here, bacause most probably
         // the frame is currently locked. We return the previous value.
-        return pThis->mnFtnLine > 0 ?
-               pThis->mnFtnLine :
+        return pThis->mnFootnoteLine > 0 ?
+               pThis->mnFootnoteLine :
                IsVertical() ? Frm().Left() : Frm().Bottom();
     }
 
     SWAP_IF_NOT_SWAPPED( this )
 
-    SwTxtInfo aInf( pThis );
-    SwTxtIter aLine( pThis, &aInf );
-    const sal_Int32 nPos = pFtn->GetStart();
+    SwTextInfo aInf( pThis );
+    SwTextIter aLine( pThis, &aInf );
+    const sal_Int32 nPos = pFootnote->GetStart();
     aLine.CharToLine( nPos );
 
     SwTwips nRet = aLine.Y() + SwTwips(aLine.GetLineHeight());
@@ -281,36 +281,36 @@ SwTwips SwTxtFrm::GetFtnLine( const SwTxtFtn *pFtn ) const
 
     UNDO_SWAP( this )
 
-    nRet = lcl_GetFtnLower( pThis, nRet );
+    nRet = lcl_GetFootnoteLower( pThis, nRet );
 
-    pThis->mnFtnLine = nRet;
+    pThis->mnFootnoteLine = nRet;
     return nRet;
 }
 
 /**
- * Calculates the maximum reachable height for the TxtFrm in the Ftn Area.
- * The cell's bottom margin with the Ftn Reference limit's this height.
+ * Calculates the maximum reachable height for the TextFrm in the Footnote Area.
+ * The cell's bottom margin with the Footnote Reference limit's this height.
  */
-SwTwips SwTxtFrm::_GetFtnFrmHeight() const
+SwTwips SwTextFrm::_GetFootnoteFrmHeight() const
 {
-    OSL_ENSURE( !IsFollow() && IsInFtn(), "SwTxtFrm::SetFtnLine: moon walk" );
+    OSL_ENSURE( !IsFollow() && IsInFootnote(), "SwTextFrm::SetFootnoteLine: moon walk" );
 
-    const SwFtnFrm *pFtnFrm = FindFtnFrm();
-    const SwTxtFrm *pRef = static_cast<const SwTxtFrm *>(pFtnFrm->GetRef());
-    const SwFtnBossFrm *pBoss = FindFtnBossFrm();
-    if( pBoss != pRef->FindFtnBossFrm( !pFtnFrm->GetAttr()->
-                                        GetFtn().IsEndNote() ) )
+    const SwFootnoteFrm *pFootnoteFrm = FindFootnoteFrm();
+    const SwTextFrm *pRef = static_cast<const SwTextFrm *>(pFootnoteFrm->GetRef());
+    const SwFootnoteBossFrm *pBoss = FindFootnoteBossFrm();
+    if( pBoss != pRef->FindFootnoteBossFrm( !pFootnoteFrm->GetAttr()->
+                                        GetFootnote().IsEndNote() ) )
         return 0;
 
     SWAP_IF_SWAPPED( this )
 
-    SwTwips nHeight = pRef->IsInFtnConnect() ?
-                            1 : pRef->GetFtnLine( pFtnFrm->GetAttr() );
+    SwTwips nHeight = pRef->IsInFootnoteConnect() ?
+                            1 : pRef->GetFootnoteLine( pFootnoteFrm->GetAttr() );
     if( nHeight )
     {
-        // As odd as it may seem: the first Ftn on the page may not touch the
-        // Ftn Reference, when entering text in the Ftn Area.
-        const SwFrm *pCont = pFtnFrm->GetUpper();
+        // As odd as it may seem: the first Footnote on the page may not touch the
+        // Footnote Reference, when entering text in the Footnote Area.
+        const SwFrm *pCont = pFootnoteFrm->GetUpper();
 
         // Height within the Container which we're allowed to consume anyways
         SWRECTFN( pCont )
@@ -330,20 +330,20 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const
                     break;
                 pTmp = pTmp->GetUpper();
             }
-            OSL_ENSURE( bInvalidPos, "Hanging below FtnCont" );
+            OSL_ENSURE( bInvalidPos, "Hanging below FootnoteCont" );
         }
 #endif
 
         if ( (*fnRect->fnYDiff)( (pCont->Frm().*fnRect->fnGetTop)(), nHeight) > 0 )
         {
             // Growth potential of the container
-            if ( !pRef->IsInFtnConnect() )
+            if ( !pRef->IsInFootnoteConnect() )
             {
-                SwSaveFtnHeight aSave( const_cast<SwFtnBossFrm*>(pBoss), nHeight  );
-                nHeight = const_cast<SwFtnContFrm*>(static_cast<const SwFtnContFrm*>(pCont))->Grow( LONG_MAX, true );
+                SwSaveFootnoteHeight aSave( const_cast<SwFootnoteBossFrm*>(pBoss), nHeight  );
+                nHeight = const_cast<SwFootnoteContFrm*>(static_cast<const SwFootnoteContFrm*>(pCont))->Grow( LONG_MAX, true );
             }
             else
-                nHeight = const_cast<SwFtnContFrm*>(static_cast<const SwFtnContFrm*>(pCont))->Grow( LONG_MAX, true );
+                nHeight = const_cast<SwFootnoteContFrm*>(static_cast<const SwFootnoteContFrm*>(pCont))->Grow( LONG_MAX, true );
 
             nHeight += nTmp;
             if( nHeight < 0 )
@@ -364,42 +364,42 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const
     return nHeight;
 }
 
-SwTxtFrm *SwTxtFrm::FindQuoVadisFrm()
+SwTextFrm *SwTextFrm::FindQuoVadisFrm()
 {
-    // Check whether we're in a FtnFrm
-    if( GetIndPrev() || !IsInFtn() )
+    // Check whether we're in a FootnoteFrm
+    if( GetIndPrev() || !IsInFootnote() )
         return 0;
 
-    // To the preceding FtnFrm
-    SwFtnFrm *pFtnFrm = FindFtnFrm()->GetMaster();
-    if( !pFtnFrm )
+    // To the preceding FootnoteFrm
+    SwFootnoteFrm *pFootnoteFrm = FindFootnoteFrm()->GetMaster();
+    if( !pFootnoteFrm )
         return 0;
 
-    // Now the last Cntnt
-    SwCntntFrm *pCnt = pFtnFrm->ContainsCntnt();
+    // Now the last Content
+    SwContentFrm *pCnt = pFootnoteFrm->ContainsContent();
     if( !pCnt )
         return NULL;
-    SwCntntFrm *pLast;
+    SwContentFrm *pLast;
     do
     {   pLast = pCnt;
-        pCnt = pCnt->GetNextCntntFrm();
-    } while( pCnt && pFtnFrm->IsAnLower( pCnt ) );
-    return static_cast<SwTxtFrm*>(pLast);
+        pCnt = pCnt->GetNextContentFrm();
+    } while( pCnt && pFootnoteFrm->IsAnLower( pCnt ) );
+    return static_cast<SwTextFrm*>(pLast);
 }
 
-void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen )
+void SwTextFrm::RemoveFootnote( const sal_Int32 nStart, const sal_Int32 nLen )
 {
-    if ( !IsFtnAllowed() )
+    if ( !IsFootnoteAllowed() )
         return;
 
-    SwpHints *pHints = GetTxtNode()->GetpSwpHints();
+    SwpHints *pHints = GetTextNode()->GetpSwpHints();
     if( !pHints )
         return;
 
     bool bRollBack = nLen != COMPLETE_STRING;
     const size_t nSize = pHints->Count();
     sal_Int32 nEnd;
-    SwTxtFrm* pSource;
+    SwTextFrm* pSource;
     if( bRollBack )
     {
         nEnd = nStart + nLen;
@@ -417,13 +417,13 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen )
     {
         SwPageFrm* pUpdate = NULL;
         bool bRemove = false;
-        SwFtnBossFrm *pFtnBoss = 0;
-        SwFtnBossFrm *pEndBoss = 0;
-        bool bFtnEndDoc
-            = FTNPOS_CHAPTER == GetNode()->GetDoc()->GetFtnInfo().ePos;
+        SwFootnoteBossFrm *pFootnoteBoss = 0;
+        SwFootnoteBossFrm *pEndBoss = 0;
+        bool bFootnoteEndDoc
+            = FTNPOS_CHAPTER == GetNode()->GetDoc()->GetFootnoteInfo().ePos;
         for ( size_t i = nSize; i; )
         {
-            SwTxtAttr *pHt = pHints->GetTextHint(--i);
+            SwTextAttr *pHt = pHints->GetTextHint(--i);
             if ( RES_TXTATR_FTN != pHt->Which() )
                 continue;
 
@@ -433,25 +433,25 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen )
 
             if( nEnd >= nIdx )
             {
-                SwTxtFtn *pFtn = static_cast<SwTxtFtn*>(pHt);
-                const bool bEndn = pFtn->GetFtn().IsEndNote();
+                SwTextFootnote *pFootnote = static_cast<SwTextFootnote*>(pHt);
+                const bool bEndn = pFootnote->GetFootnote().IsEndNote();
 
                 if( bEndn )
                 {
                     if( !pEndBoss )
-                        pEndBoss = pSource->FindFtnBossFrm();
+                        pEndBoss = pSource->FindFootnoteBossFrm();
                 }
                 else
                 {
-                    if( !pFtnBoss )
+                    if( !pFootnoteBoss )
                     {
-                        pFtnBoss = pSource->FindFtnBossFrm( true );
-                        if( pFtnBoss->GetUpper()->IsSctFrm() )
+                        pFootnoteBoss = pSource->FindFootnoteBossFrm( true );
+                        if( pFootnoteBoss->GetUpper()->IsSctFrm() )
                         {
                             SwSectionFrm* pSect = static_cast<SwSectionFrm*>(
-                                                  pFtnBoss->GetUpper());
-                            if( pSect->IsFtnAtEnd() )
-                                bFtnEndDoc = false;
+                                                  pFootnoteBoss->GetUpper());
+                            if( pSect->IsFootnoteAtEnd() )
+                                bFootnoteEndDoc = false;
                         }
                     }
                 }
@@ -459,62 +459,62 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen )
                 // We don't delete, but move instead.
                 // Three cases are to be considered:
                 // 1) There's neither Follow nor PrevFollow:
-                //    -> RemoveFtn() (maybe even a OSL_ENSURE(value))
+                //    -> RemoveFootnote() (maybe even a OSL_ENSURE(value))
                 //
                 // 2) nStart > GetOfst, I have a Follow
-                //    -> Ftn moves into Follow
+                //    -> Footnote moves into Follow
                 //
                 // 3) nStart < GetOfst, I am a Follow
-                //    -> Ftn moves into the PrevFollow
+                //    -> Footnote moves into the PrevFollow
                 //
                 // Both need to be on one Page/in one Column
-                SwFtnFrm *pFtnFrm = SwFtnBossFrm::FindFtn(pSource, pFtn);
+                SwFootnoteFrm *pFootnoteFrm = SwFootnoteBossFrm::FindFootnote(pSource, pFootnote);
 
-                if( pFtnFrm )
+                if( pFootnoteFrm )
                 {
-                    const bool bEndDoc = bEndn || bFtnEndDoc;
+                    const bool bEndDoc = bEndn || bFootnoteEndDoc;
                     if( bRollBack )
                     {
-                        while ( pFtnFrm )
+                        while ( pFootnoteFrm )
                         {
-                            pFtnFrm->SetRef( this );
-                            pFtnFrm = pFtnFrm->GetFollow();
-                            SetFtn( true );
+                            pFootnoteFrm->SetRef( this );
+                            pFootnoteFrm = pFootnoteFrm->GetFollow();
+                            SetFootnote( true );
                         }
                     }
                     else if( GetFollow() )
                     {
-                        SwCntntFrm *pDest = GetFollow();
-                        while( pDest->GetFollow() && static_cast<SwTxtFrm*>(pDest->
+                        SwContentFrm *pDest = GetFollow();
+                        while( pDest->GetFollow() && static_cast<SwTextFrm*>(pDest->
                                GetFollow())->GetOfst() <= nIdx )
                             pDest = pDest->GetFollow();
-                        OSL_ENSURE( !SwFtnBossFrm::FindFtn(
-                            pDest,pFtn),"SwTxtFrm::RemoveFtn: footnote exists");
+                        OSL_ENSURE( !SwFootnoteBossFrm::FindFootnote(
+                            pDest,pFootnote),"SwTextFrm::RemoveFootnote: footnote exists");
 
                         // Never deregister; always move
                         if ( bEndDoc ||
-                             !pFtnFrm->FindFtnBossFrm()->IsBefore( pDest->FindFtnBossFrm( !bEndn ) )
+                             !pFootnoteFrm->FindFootnoteBossFrm()->IsBefore( pDest->FindFootnoteBossFrm( !bEndn ) )
                            )
                         {
-                            SwPageFrm* pTmp = pFtnFrm->FindPageFrm();
+                            SwPageFrm* pTmp = pFootnoteFrm->FindPageFrm();
                             if( pUpdate && pUpdate != pTmp )
-                                pUpdate->UpdateFtnNum();
+                                pUpdate->UpdateFootnoteNum();
                             pUpdate = pTmp;
-                            while ( pFtnFrm )
+                            while ( pFootnoteFrm )
                             {
-                                pFtnFrm->SetRef( pDest );
-                                pFtnFrm = pFtnFrm->GetFollow();
+                                pFootnoteFrm->SetRef( pDest );
+                                pFootnoteFrm = pFootnoteFrm->GetFollow();
                             }
                         }
                         else
                         {
-                            pFtnBoss->MoveFtns( this, pDest, pFtn );
+                            pFootnoteBoss->MoveFootnotes( this, pDest, pFootnote );
                             bRemove = true;
                         }
-                        static_cast<SwTxtFrm*>(pDest)->SetFtn( true );
+                        static_cast<SwTextFrm*>(pDest)->SetFootnote( true );
 
-                        OSL_ENSURE( SwFtnBossFrm::FindFtn( pDest,
-                           pFtn),"SwTxtFrm::RemoveFtn: footnote ChgRef failed");
+                        OSL_ENSURE( SwFootnoteBossFrm::FindFootnote( pDest,
+                           pFootnote),"SwTextFrm::RemoveFootnote: footnote ChgRef failed");
                     }
                     else
                     {
@@ -523,29 +523,29 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen )
                             pEndBoss->FindSctFrm(), NULL ) ) )
                         {
                             if( bEndn )
-                                pEndBoss->RemoveFtn( this, pFtn );
+                                pEndBoss->RemoveFootnote( this, pFootnote );
                             else
-                                pFtnBoss->RemoveFtn( this, pFtn );
+                                pFootnoteBoss->RemoveFootnote( this, pFootnote );
                             bRemove = bRemove || !bEndDoc;
-                            OSL_ENSURE( !SwFtnBossFrm::FindFtn( this, pFtn ),
-                            "SwTxtFrm::RemoveFtn: can't get off that footnote" );
+                            OSL_ENSURE( !SwFootnoteBossFrm::FindFootnote( this, pFootnote ),
+                            "SwTextFrm::RemoveFootnote: can't get off that footnote" );
                         }
                     }
                 }
             }
         }
         if( pUpdate )
-            pUpdate->UpdateFtnNum();
+            pUpdate->UpdateFootnoteNum();
 
         // We brake the oscillation
-        if( bRemove && !bFtnEndDoc && HasPara() )
+        if( bRemove && !bFootnoteEndDoc && HasPara() )
         {
             ValidateBodyFrm();
             ValidateFrm();
         }
     }
 
-    // We call the RemoveFtn from within the FindBreak, because the last line is
+    // We call the RemoveFootnote from within the FindBreak, because the last line is
     // to be passed to the Follow. The Offset of the Follow is, however, outdated;
     // it'll be set soon. CalcFntFlag depends on a correctly set Follow Offset.
     // Therefore we temporarily calculate the Follow Offset here
@@ -555,7 +555,7 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen )
         nOldOfst = GetFollow()->GetOfst();
         GetFollow()->ManipOfst( nStart + ( bRollBack ? nLen : 0 ) );
     }
-    pSource->CalcFtnFlag();
+    pSource->CalcFootnoteFlag();
     if( nOldOfst < COMPLETE_STRING )
         GetFollow()->ManipOfst( nOldOfst );
 }
@@ -564,48 +564,48 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen )
 /**
  * We basically only have two possibilities:
  *
- * a) The Ftn is already present
+ * a) The Footnote is already present
  *    => we move it, if another pSrcFrm has been found
  *
- * b) The Ftn is not present
+ * b) The Footnote is not present
  *    => we have it created for us
  *
- * Whether the Ftn ends up on our Page/Column, doesn't matter in this
+ * Whether the Footnote ends up on our Page/Column, doesn't matter in this
  * context.
  *
  * Optimization for Endnotes.
  *
- * Another problem: if the Deadline falls within the Ftn Area, we need
- * to move the Ftn.
+ * Another problem: if the Deadline falls within the Footnote Area, we need
+ * to move the Footnote.
  *
  * @returns false on any type of error
  */
-void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
+void SwTextFrm::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDeadLine )
 {
     OSL_ENSURE( !IsVertical() || !IsSwapped(),
-            "SwTxtFrm::ConnectFtn with swapped frame" );
+            "SwTextFrm::ConnectFootnote with swapped frame" );
 
-    bFtn = true;
-    bInFtnConnect = true; // Just reset!
-    const bool bEnd = pFtn->GetFtn().IsEndNote();
+    bFootnote = true;
+    bInFootnoteConnect = true; // Just reset!
+    const bool bEnd = pFootnote->GetFootnote().IsEndNote();
 
     // We want to store this value, because it is needed as a fallback
-    // in GetFtnLine(), if there is no paragraph information available
-    mnFtnLine = nDeadLine;
+    // in GetFootnoteLine(), if there is no paragraph information available
+    mnFootnoteLine = nDeadLine;
 
     // We always need a parent (Page/Column)
     SwSectionFrm *pSect;
-    SwCntntFrm *pCntnt = this;
+    SwContentFrm *pContent = this;
     if( bEnd && IsInSct() )
     {
         pSect = FindSctFrm();
         if( pSect->IsEndnAtEnd() )
-            pCntnt = pSect->FindLastCntnt( FINDMODE_ENDNOTE );
-        if( !pCntnt )
-            pCntnt = this;
+            pContent = pSect->FindLastContent( FINDMODE_ENDNOTE );
+        if( !pContent )
+            pContent = this;
     }
 
-    SwFtnBossFrm *pBoss = pCntnt->FindFtnBossFrm( !bEnd );
+    SwFootnoteBossFrm *pBoss = pContent->FindFootnoteBossFrm( !bEnd );
 
 #if OSL_DEBUG_LEVEL > 1
     SwTwips nRstHeight = GetRstHeight();
@@ -613,51 +613,51 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
 
     pSect = pBoss->FindSctFrm();
     bool bDocEnd = bEnd ? !( pSect && pSect->IsEndnAtEnd() ) :
-                   ( !( pSect && pSect->IsFtnAtEnd() ) &&
-                       FTNPOS_CHAPTER == GetNode()->GetDoc()->GetFtnInfo().ePos );
+                   ( !( pSect && pSect->IsFootnoteAtEnd() ) &&
+                       FTNPOS_CHAPTER == GetNode()->GetDoc()->GetFootnoteInfo().ePos );
 
-    // Ftn can be registered with the Follow
-    SwCntntFrm *pSrcFrm = FindFtnRef( pFtn );
+    // Footnote can be registered with the Follow
+    SwContentFrm *pSrcFrm = FindFootnoteRef( pFootnote );
 
     if( bDocEnd )
     {
         if( pSect && pSrcFrm )
         {
-            SwFtnFrm *pFtnFrm = SwFtnBossFrm::FindFtn( pSrcFrm, pFtn );
-            if( pFtnFrm && pFtnFrm->IsInSct() )
+            SwFootnoteFrm *pFootnoteFrm = SwFootnoteBossFrm::FindFootnote( pSrcFrm, pFootnote );
+            if( pFootnoteFrm && pFootnoteFrm->IsInSct() )
             {
-                pBoss->RemoveFtn( pSrcFrm, pFtn );
+                pBoss->RemoveFootnote( pSrcFrm, pFootnote );
                 pSrcFrm = 0;
             }
         }
     }
     else if( bEnd && pSect )
     {
-        SwFtnFrm *pFtnFrm = pSrcFrm ? SwFtnBossFrm::FindFtn( pSrcFrm, pFtn ) : NULL;
-        if( pFtnFrm && !pFtnFrm->GetUpper() )
-            pFtnFrm = NULL;
+        SwFootnoteFrm *pFootnoteFrm = pSrcFrm ? SwFootnoteBossFrm::FindFootnote( pSrcFrm, pFootnote ) : NULL;
+        if( pFootnoteFrm && !pFootnoteFrm->GetUpper() )
+            pFootnoteFrm = NULL;
         SwDoc *pDoc = GetNode()->GetDoc();
-        if( SwLayouter::Collecting( pDoc, pSect, pFtnFrm ) )
+        if( SwLayouter::Collecting( pDoc, pSect, pFootnoteFrm ) )
         {
             if( !pSrcFrm )
             {
-                SwFtnFrm *pNew = new SwFtnFrm(pDoc->GetDfltFrmFmt(),this,this,pFtn);
-                 SwNodeIndex aIdx( *pFtn->GetStartNode(), 1 );
+                SwFootnoteFrm *pNew = new SwFootnoteFrm(pDoc->GetDfltFrameFormat(),this,this,pFootnote);
+                 SwNodeIndex aIdx( *pFootnote->GetStartNode(), 1 );
                  ::_InsertCnt( pNew, pDoc, aIdx.GetIndex() );
                 GetNode()->getIDocumentLayoutAccess()->GetLayouter()->CollectEndnote( pNew );
             }
             else if( pSrcFrm != this )
-                SwFtnBossFrm::ChangeFtnRef( pSrcFrm, pFtn, this );
-            bInFtnConnect = false;
+                SwFootnoteBossFrm::ChangeFootnoteRef( pSrcFrm, pFootnote, this );
+            bInFootnoteConnect = false;
             return;
         }
         else if( pSrcFrm )
         {
-            SwFtnBossFrm *pFtnBoss = pFtnFrm->FindFtnBossFrm();
-            if( !pFtnBoss->IsInSct() ||
-                pFtnBoss->ImplFindSctFrm()->GetSection()!=pSect->GetSection() )
+            SwFootnoteBossFrm *pFootnoteBoss = pFootnoteFrm->FindFootnoteBossFrm();
+            if( !pFootnoteBoss->IsInSct() ||
+                pFootnoteBoss->ImplFindSctFrm()->GetSection()!=pSect->GetSection() )
             {
-                pBoss->RemoveFtn( pSrcFrm, pFtn );
+                pBoss->RemoveFootnote( pSrcFrm, pFootnote );
                 pSrcFrm = 0;
             }
         }
@@ -666,27 +666,27 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
     if( bDocEnd || bEnd )
     {
         if( !pSrcFrm )
-            pBoss->AppendFtn( this, pFtn );
+            pBoss->AppendFootnote( this, pFootnote );
         else if( pSrcFrm != this )
-            SwFtnBossFrm::ChangeFtnRef( pSrcFrm, pFtn, this );
-        bInFtnConnect = false;
+            SwFootnoteBossFrm::ChangeFootnoteRef( pSrcFrm, pFootnote, this );
+        bInFootnoteConnect = false;
         return;
     }
 
-    SwSaveFtnHeight aHeight( pBoss, nDeadLine );
+    SwSaveFootnoteHeight aHeight( pBoss, nDeadLine );
 
-    if( !pSrcFrm ) // No Ftn was found at all
-        pBoss->AppendFtn( this, pFtn );
+    if( !pSrcFrm ) // No Footnote was found at all
+        pBoss->AppendFootnote( this, pFootnote );
     else
     {
-        SwFtnFrm *pFtnFrm = SwFtnBossFrm::FindFtn( pSrcFrm, pFtn );
-        SwFtnBossFrm *pFtnBoss = pFtnFrm->FindFtnBossFrm();
+        SwFootnoteFrm *pFootnoteFrm = SwFootnoteBossFrm::FindFootnote( pSrcFrm, pFootnote );
+        SwFootnoteBossFrm *pFootnoteBoss = pFootnoteFrm->FindFootnoteBossFrm();
 
         bool bBrutal = false;
 
-        if( pFtnBoss == pBoss ) // Ref and Ftn are on the same Page/Column
+        if( pFootnoteBoss == pBoss ) // Ref and Footnote are on the same Page/Column
         {
-            SwFrm *pCont = pFtnFrm->GetUpper();
+            SwFrm *pCont = pFootnoteFrm->GetUpper();
 
             SWRECTFN ( pCont )
             long nDiff = (*fnRect->fnYDiff)( (pCont->Frm().*fnRect->fnGetTop)(),
@@ -697,13 +697,13 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
                 // If the Footnote has been registered to a Follow, we need to
                 // rewire it now too
                 if ( pSrcFrm != this )
-                    SwFtnBossFrm::ChangeFtnRef( pSrcFrm, pFtn, this );
+                    SwFootnoteBossFrm::ChangeFootnoteRef( pSrcFrm, pFootnote, this );
 
                 // We have some room left, so the Footnote can grow
-                if ( pFtnFrm->GetFollow() && nDiff > 0 )
+                if ( pFootnoteFrm->GetFollow() && nDiff > 0 )
                 {
                     SwTwips nHeight = (pCont->Frm().*fnRect->fnGetHeight)();
-                    pBoss->RearrangeFtns( nDeadLine, false, pFtn );
+                    pBoss->RearrangeFootnotes( nDeadLine, false, pFootnote );
                     ValidateBodyFrm();
                     ValidateFrm();
                     SwViewShell *pSh = getRootFrm()->GetCurrShell();
@@ -711,7 +711,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
                         // So that we don't miss anything
                         pSh->InvalidateWindows( pCont->Frm() );
                 }
-                bInFtnConnect = false;
+                bInFootnoteConnect = false;
                 return;
             }
             else
@@ -719,7 +719,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
         }
         else
         {
-            // Ref and Ftn are not on one Page; attempt to move is necessary
+            // Ref and Footnote are not on one Page; attempt to move is necessary
             SwFrm* pTmp = this;
             while( pTmp->GetNext() && pSrcFrm != pTmp )
                 pTmp = pTmp->GetNext();
@@ -727,54 +727,54 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
                 bBrutal = true;
             else
             {   // If our Parent is in a column Area, but the Page already has a
-                // FtnContainer, we can only brute force it
-                if( pSect && pSect->FindFtnBossFrm( !bEnd )->FindFtnCont() )
+                // FootnoteContainer, we can only brute force it
+                if( pSect && pSect->FindFootnoteBossFrm( !bEnd )->FindFootnoteCont() )
                     bBrutal = true;
 
-                else if ( !pFtnFrm->GetPrev() ||
-                          pFtnBoss->IsBefore( pBoss )
+                else if ( !pFootnoteFrm->GetPrev() ||
+                          pFootnoteBoss->IsBefore( pBoss )
                         )
                 {
-                    SwFtnBossFrm *pSrcBoss = pSrcFrm->FindFtnBossFrm( !bEnd );
-                    pSrcBoss->MoveFtns( pSrcFrm, this, pFtn );
+                    SwFootnoteBossFrm *pSrcBoss = pSrcFrm->FindFootnoteBossFrm( !bEnd );
+                    pSrcBoss->MoveFootnotes( pSrcFrm, this, pFootnote );
                 }
                 else
-                    SwFtnBossFrm::ChangeFtnRef( pSrcFrm, pFtn, this );
+                    SwFootnoteBossFrm::ChangeFootnoteRef( pSrcFrm, pFootnote, this );
             }
         }
 
         // The brute force method: Remove Footnote and append.
-        // We need to call SetFtnDeadLine(), as we can more easily adapt the
-        // nMaxFtnHeight after RemoveFtn
+        // We need to call SetFootnoteDeadLine(), as we can more easily adapt the
+        // nMaxFootnoteHeight after RemoveFootnote
         if( bBrutal )
         {
-            pBoss->RemoveFtn( pSrcFrm, pFtn, false );
-            SwSaveFtnHeight *pHeight = bEnd ? NULL : new SwSaveFtnHeight( pBoss, nDeadLine );
-            pBoss->AppendFtn( this, pFtn );
+            pBoss->RemoveFootnote( pSrcFrm, pFootnote, false );
+            SwSaveFootnoteHeight *pHeight = bEnd ? NULL : new SwSaveFootnoteHeight( pBoss, nDeadLine );
+            pBoss->AppendFootnote( this, pFootnote );
             delete pHeight;
         }
     }
 
-    // In column Areas, that not yet reach the Page's border a RearrangeFtns is not
+    // In column Areas, that not yet reach the Page's border a RearrangeFootnotes is not
     // useful yet, as the Footnote container has not yet been calculated
     if( !pSect || !pSect->Growable() )
     {
         // Validate environment, to avoid oscillation
-        SwSaveFtnHeight aNochmal( pBoss, nDeadLine );
+        SwSaveFootnoteHeight aNochmal( pBoss, nDeadLine );
         ValidateBodyFrm();
-        pBoss->RearrangeFtns( nDeadLine, true );
+        pBoss->RearrangeFootnotes( nDeadLine, true );
         ValidateFrm();
     }
-    else if( pSect->IsFtnAtEnd() )
+    else if( pSect->IsFootnoteAtEnd() )
     {
         ValidateBodyFrm();
         ValidateFrm();
     }
 
 #if OSL_DEBUG_LEVEL > 1
-    // pFtnFrm may have changed due to Calc ...
-    SwFtnFrm *pFtnFrm = pBoss->FindFtn( this, pFtn );
-    if( pFtnFrm && pBoss != pFtnFrm->FindFtnBossFrm( !bEnd ) )
+    // pFootnoteFrm may have changed due to Calc ...
+    SwFootnoteFrm *pFootnoteFrm = pBoss->FindFootnote( this, pFootnote );
+    if( pFootnoteFrm && pBoss != pFootnoteFrm->FindFootnoteBossFrm( !bEnd ) )
     {
         int bla = 5;
         (void)bla;
@@ -782,28 +782,28 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
     nRstHeight = GetRstHeight();
     (void)nRstHeight;
 #endif
-    bInFtnConnect = false;
+    bInFootnoteConnect = false;
     return;
 }
 
 /**
- * The portion for the Ftn Reference in the Text
+ * The portion for the Footnote Reference in the Text
  */
-SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
-                                             SwTxtAttr *pHint )
+SwFootnotePortion *SwTextFormatter::NewFootnotePortion( SwTextFormatInfo &rInf,
+                                             SwTextAttr *pHint )
 {
     OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
-            "NewFtnPortion with unswapped frame" );
+            "NewFootnotePortion with unswapped frame" );
 
-    if( !pFrm->IsFtnAllowed() )
+    if( !pFrm->IsFootnoteAllowed() )
         return 0;
 
-    SwTxtFtn  *pFtn = static_cast<SwTxtFtn*>(pHint);
-    const SwFmtFtn& rFtn = static_cast<const SwFmtFtn&>(pFtn->GetFtn());
+    SwTextFootnote  *pFootnote = static_cast<SwTextFootnote*>(pHint);
+    const SwFormatFootnote& rFootnote = static_cast<const SwFormatFootnote&>(pFootnote->GetFootnote());
     SwDoc *pDoc = pFrm->GetNode()->GetDoc();
 
     if( rInf.IsTest() )
-        return new SwFtnPortion( rFtn.GetViewNumStr( *pDoc ), pFtn );
+        return new SwFootnotePortion( rFootnote.GetViewNumStr( *pDoc ), pFootnote );
 
     SWAP_IF_SWAPPED( pFrm )
 
@@ -827,43 +827,43 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
     if( bVertical )
         nLower = pFrm->SwitchHorizontalToVertical( nLower );
 
-    nLower = lcl_GetFtnLower( pFrm, nLower );
+    nLower = lcl_GetFootnoteLower( pFrm, nLower );
 
     // We just refresh.
     // The Connect does not do anything useful in this case, but will
-    // mostly throw away the Ftn and create it anew.
+    // mostly throw away the Footnote and create it anew.
     if( !rInf.IsQuick() )
-        pFrm->ConnectFtn( pFtn, nLower );
+        pFrm->ConnectFootnote( pFootnote, nLower );
 
-    SwTxtFrm *pScrFrm = pFrm->FindFtnRef( pFtn );
-    SwFtnBossFrm *pBoss = pFrm->FindFtnBossFrm( !rFtn.IsEndNote() );
-    SwFtnFrm *pFtnFrm = NULL;
+    SwTextFrm *pScrFrm = pFrm->FindFootnoteRef( pFootnote );
+    SwFootnoteBossFrm *pBoss = pFrm->FindFootnoteBossFrm( !rFootnote.IsEndNote() );
+    SwFootnoteFrm *pFootnoteFrm = NULL;
     if( pScrFrm )
-        pFtnFrm = SwFtnBossFrm::FindFtn( pScrFrm, pFtn );
+        pFootnoteFrm = SwFootnoteBossFrm::FindFootnote( pScrFrm, pFootnote );
 
     // We see whether our Append has caused some Footnote to
     // still be on the Page/Column. If not, our line disappears too,
     // which will lead to the following undesired behaviour:
-    // Ftn1 still fits onto the Page/Column, but Ftn2 doesn't.
-    // The Ftn2 Reference remains on the Page/Column. The Footnote itself
+    // Footnote1 still fits onto the Page/Column, but Footnote2 doesn't.
+    // The Footnote2 Reference remains on the Page/Column. The Footnote itself
     // is on the next Page/Column.
     //
     // Exception: If the Page/Column cannot accomodate another line,
-    // the Ftn Reference should be moved to the next one.
-    if( !rFtn.IsEndNote() )
+    // the Footnote Reference should be moved to the next one.
+    if( !rFootnote.IsEndNote() )
     {
         SwSectionFrm *pSct = pBoss->FindSctFrm();
-        bool bAtSctEnd = pSct && pSct->IsFtnAtEnd();
-        if( FTNPOS_CHAPTER != pDoc->GetFtnInfo().ePos || bAtSctEnd )
+        bool bAtSctEnd = pSct && pSct->IsFootnoteAtEnd();
+        if( FTNPOS_CHAPTER != pDoc->GetFootnoteInfo().ePos || bAtSctEnd )
         {
-            SwFrm* pFtnCont = pBoss->FindFtnCont();
+            SwFrm* pFootnoteCont = pBoss->FindFootnoteCont();
             // If the Parent is within an Area, it can only be a Column of this
             // Area. If this one is not the first Column, we can avoid it.
             if( !pFrm->IsInTab() && ( GetLineNr() > 1 || pFrm->GetPrev() ||
                 ( !bAtSctEnd && pFrm->GetIndPrev() ) ||
                 ( pSct && pBoss->GetPrev() ) ) )
             {
-                if( !pFtnCont )
+                if( !pFootnoteCont )
                 {
                     rInf.SetStop( true );
                     UNDO_SWAP( pFrm )
@@ -875,12 +875,12 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
                     // Page/Page column
                     if( pSct && !bAtSctEnd ) // Is the Container in a (column) Area?
                     {
-                        SwFtnBossFrm* pTmp = pBoss->FindSctFrm()->FindFtnBossFrm( true );
-                        SwFtnContFrm* pFtnC = pTmp->FindFtnCont();
-                        if( pFtnC )
+                        SwFootnoteBossFrm* pTmp = pBoss->FindSctFrm()->FindFootnoteBossFrm( true );
+                        SwFootnoteContFrm* pFootnoteC = pTmp->FindFootnoteCont();
+                        if( pFootnoteC )
                         {
-                            SwFtnFrm* pTmpFrm = static_cast<SwFtnFrm*>(pFtnC->Lower());
-                            if( pTmpFrm && *pTmpFrm < pFtn )
+                            SwFootnoteFrm* pTmpFrm = static_cast<SwFootnoteFrm*>(pFootnoteC->Lower());
+                            if( pTmpFrm && *pTmpFrm < pFootnote )
                             {
                                 rInf.SetStop( true );
                                 UNDO_SWAP( pFrm )
@@ -894,18 +894,18 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
                     if( bVertical )
                         nTmpBot = pFrm->SwitchHorizontalToVertical( nTmpBot );
 
-                    SWRECTFN( pFtnCont )
+                    SWRECTFN( pFootnoteCont )
 
                     const long nDiff = (*fnRect->fnYDiff)(
-                                            (pFtnCont->Frm().*fnRect->fnGetTop)(),
+                                            (pFootnoteCont->Frm().*fnRect->fnGetTop)(),
                                              nTmpBot );
 
                     if( pScrFrm && nDiff < 0 )
                     {
-                        if( pFtnFrm )
+                        if( pFootnoteFrm )
                         {
-                            SwFtnBossFrm *pFtnBoss = pFtnFrm->FindFtnBossFrm();
-                            if( pFtnBoss != pBoss )
+                            SwFootnoteBossFrm *pFootnoteBoss = pFootnoteFrm->FindFootnoteBossFrm();
+                            if( pFootnoteBoss != pBoss )
                             {
                                 // We're in the last Line and the Footnote has moved
                                 // to another Page. We also want to be on that Page!
@@ -919,10 +919,10 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
             }
         }
     }
-    // Finally: Create FtnPortion and exit ...
-    SwFtnPortion *pRet = new SwFtnPortion( rFtn.GetViewNumStr( *pDoc ),
-                                           pFtn, nReal );
-    rInf.SetFtnInside( true );
+    // Finally: Create FootnotePortion and exit ...
+    SwFootnotePortion *pRet = new SwFootnotePortion( rFootnote.GetViewNumStr( *pDoc ),
+                                           pFootnote, nReal );
+    rInf.SetFootnoteInside( true );
 
     UNDO_SWAP( pFrm )
 
@@ -930,34 +930,34 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
  }
 
 /**
- * The portion for the Ftn Numbering in the Ftn Area
+ * The portion for the Footnote Numbering in the Footnote Area
  */
-SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const
+SwNumberPortion *SwTextFormatter::NewFootnoteNumPortion( SwTextFormatInfo &rInf ) const
 {
-    OSL_ENSURE( pFrm->IsInFtn() && !pFrm->GetIndPrev() && !rInf.IsFtnDone(),
+    OSL_ENSURE( pFrm->IsInFootnote() && !pFrm->GetIndPrev() && !rInf.IsFootnoteDone(),
             "This is the wrong place for a ftnnumber" );
-    if( rInf.GetTxtStart() != nStart ||
-        rInf.GetTxtStart() != rInf.GetIdx() )
+    if( rInf.GetTextStart() != nStart ||
+        rInf.GetTextStart() != rInf.GetIdx() )
         return 0;
 
-    const SwFtnFrm* pFtnFrm = pFrm->FindFtnFrm();
-    const SwTxtFtn* pFtn = pFtnFrm->GetAttr();
+    const SwFootnoteFrm* pFootnoteFrm = pFrm->FindFootnoteFrm();
+    const SwTextFootnote* pFootnote = pFootnoteFrm->GetAttr();
 
     // Aha! So we're in the Footnote Area!
-    SwFmtFtn& rFtn = (SwFmtFtn&)pFtn->GetFtn();
+    SwFormatFootnote& rFootnote = (SwFormatFootnote&)pFootnote->GetFootnote();
 
     SwDoc *pDoc = pFrm->GetNode()->GetDoc();
-    OUString aFtnTxt( rFtn.GetViewNumStr( *pDoc, true ));
+    OUString aFootnoteText( rFootnote.GetViewNumStr( *pDoc, true ));
 
     const SwEndNoteInfo* pInfo;
-    if( rFtn.IsEndNote() )
+    if( rFootnote.IsEndNote() )
         pInfo = &pDoc->GetEndNoteInfo();
     else
-        pInfo = &pDoc->GetFtnInfo();
-    const SwAttrSet& rSet = pInfo->GetCharFmt(*pDoc)->GetAttrSet();
+        pInfo = &pDoc->GetFootnoteInfo();
+    const SwAttrSet& rSet = pInfo->GetCharFormat(*pDoc)->GetAttrSet();
 
     const SwAttrSet* pParSet = &rInf.GetCharAttr();
-    const IDocumentSettingAccess* pIDSA = pFrm->GetTxtNode()->getIDocumentSettingAccess();
+    const IDocumentSettingAccess* pIDSA = pFrm->GetTextNode()->getIDocumentSettingAccess();
     SwFont *pNumFnt = new SwFont( pParSet, pIDSA );
 
     // #i37142#
@@ -965,7 +965,7 @@ SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const
     // Overline style of paragraph font should not be considered
     // Weight style of paragraph font should not be considered
     // Posture style of paragraph font should not be considered
-    // See also #i18463# and SwTxtFormatter::NewNumberPortion()
+    // See also #i18463# and SwTextFormatter::NewNumberPortion()
     pNumFnt->SetUnderline( UNDERLINE_NONE );
     pNumFnt->SetOverline( UNDERLINE_NONE );
     pNumFnt->SetItalic( ITALIC_NONE, SW_LATIN );
@@ -978,30 +978,30 @@ SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const
     pNumFnt->SetDiffFnt(&rSet, pIDSA );
     pNumFnt->SetVertical( pNumFnt->GetOrientation(), pFrm->IsVertical() );
 
-    SwFtnNumPortion* pNewPor = new SwFtnNumPortion( aFtnTxt, pNumFnt );
+    SwFootnoteNumPortion* pNewPor = new SwFootnoteNumPortion( aFootnoteText, pNumFnt );
     pNewPor->SetLeft( !pFrm->IsRightToLeft() );
     return pNewPor;
 }
 
 OUString lcl_GetPageNumber( const SwPageFrm* pPage )
 {
-    OSL_ENSURE( pPage, "GetPageNumber: Homeless TxtFrm" );
+    OSL_ENSURE( pPage, "GetPageNumber: Homeless TextFrm" );
     const sal_uInt16 nVirtNum = pPage->GetVirtPageNum();
     const SvxNumberType& rNum = pPage->GetPageDesc()->GetNumType();
     return rNum.GetNumStr( nVirtNum );
 }
 
-SwErgoSumPortion *SwTxtFormatter::NewErgoSumPortion( SwTxtFormatInfo &rInf ) const
+SwErgoSumPortion *SwTextFormatter::NewErgoSumPortion( SwTextFormatInfo &rInf ) const
 {
     // We cannot assume we're a Follow
-    if( !pFrm->IsInFtn()  || pFrm->GetPrev() ||
+    if( !pFrm->IsInFootnote()  || pFrm->GetPrev() ||
         rInf.IsErgoDone() || rInf.GetIdx() != pFrm->GetOfst() ||
-        pFrm->ImplFindFtnFrm()->GetAttr()->GetFtn().IsEndNote() )
+        pFrm->ImplFindFootnoteFrm()->GetAttr()->GetFootnote().IsEndNote() )
         return 0;
 
     // Aha, wir sind also im Fussnotenbereich
-    const SwFtnInfo &rFtnInfo = pFrm->GetNode()->GetDoc()->GetFtnInfo();
-    SwTxtFrm *pQuoFrm = pFrm->FindQuoVadisFrm();
+    const SwFootnoteInfo &rFootnoteInfo = pFrm->GetNode()->GetDoc()->GetFootnoteInfo();
+    SwTextFrm *pQuoFrm = pFrm->FindQuoVadisFrm();
     if( !pQuoFrm )
         return 0;
     const SwPageFrm* pPage = pFrm->FindPageFrm();
@@ -1012,22 +1012,22 @@ SwErgoSumPortion *SwTxtFormatter::NewErgoSumPortion( SwTxtFormatInfo &rInf ) con
     SwParaPortion *pPara = pQuoFrm->GetPara();
     if( pPara )
         pPara->SetErgoSumNum( aPage );
-    if( rFtnInfo.aErgoSum.isEmpty() )
+    if( rFootnoteInfo.aErgoSum.isEmpty() )
         return 0;
-    SwErgoSumPortion *pErgo = new SwErgoSumPortion( rFtnInfo.aErgoSum,
+    SwErgoSumPortion *pErgo = new SwErgoSumPortion( rFootnoteInfo.aErgoSum,
                                 lcl_GetPageNumber( pQuoPage ) );
     return pErgo;
 }
 
-sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 nOffset )
+sal_Int32 SwTextFormatter::FormatQuoVadis( const sal_Int32 nOffset )
 {
     OSL_ENSURE( ! pFrm->IsVertical() || ! pFrm->IsSwapped(),
-            "SwTxtFormatter::FormatQuoVadis with swapped frame" );
+            "SwTextFormatter::FormatQuoVadis with swapped frame" );
 
-    if( !pFrm->IsInFtn() || pFrm->ImplFindFtnFrm()->GetAttr()->GetFtn().IsEndNote() )
+    if( !pFrm->IsInFootnote() || pFrm->ImplFindFootnoteFrm()->GetAttr()->GetFootnote().IsEndNote() )
         return nOffset;
 
-    const SwFrm* pErgoFrm = pFrm->FindFtnFrm()->GetFollow();
+    const SwFrm* pErgoFrm = pFrm->FindFootnoteFrm()->GetFollow();
     if( !pErgoFrm && pFrm->HasFollow() )
         pErgoFrm = pFrm->GetFollow();
     if( !pErgoFrm )
@@ -1049,9 +1049,9 @@ sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 nOffset )
             return nOffset; // If the ErgoSum is on the same Page
     }
 
-    SwTxtFormatInfo &rInf = GetInfo();
-    const SwFtnInfo &rFtnInfo = pFrm->GetNode()->GetDoc()->GetFtnInfo();
-    if( rFtnInfo.aQuoVadis.isEmpty() )
+    SwTextFormatInfo &rInf = GetInfo();
+    const SwFootnoteInfo &rFootnoteInfo = pFrm->GetNode()->GetDoc()->GetFootnoteInfo();
+    if( rFootnoteInfo.aQuoVadis.isEmpty() )
         return nOffset;
 
     // A remark on QuoVadis/ErgoSum:
@@ -1083,9 +1083,9 @@ sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 nOffset )
     rInf.RealWidth( nOldRealWidth - nLastLeft );
 
     OUString aErgo = lcl_GetPageNumber( pErgoFrm->FindPageFrm() );
-    SwQuoVadisPortion *pQuo = new SwQuoVadisPortion(rFtnInfo.aQuoVadis, aErgo );
+    SwQuoVadisPortion *pQuo = new SwQuoVadisPortion(rFootnoteInfo.aQuoVadis, aErgo );
     pQuo->SetAscent( rInf.GetAscent()  );
-    pQuo->Height( rInf.GetTxtHeight() );
+    pQuo->Height( rInf.GetTextHeight() );
     pQuo->Format( rInf );
     sal_uInt16 nQuoWidth = pQuo->Width();
     SwLinePortion* pCurrPor = pQuo;
@@ -1215,10 +1215,10 @@ sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 nOffset )
  * This function creates a Line that reaches to the other Page Margin.
  * DummyLines or DummyPortions make sure, that osicllations stop, because
  * there's no way to flow back.
- * They are used for Footnotes in paragraph-bound Frames and for Ftn
+ * They are used for Footnotes in paragraph-bound Frames and for Footnote
  * oscillations
  */
-void SwTxtFormatter::MakeDummyLine()
+void SwTextFormatter::MakeDummyLine()
 {
     sal_uInt16 nRstHeight = GetFrmRstHeight();
     if( pCurr && nRstHeight > pCurr->Height() )
@@ -1232,35 +1232,35 @@ void SwTxtFormatter::MakeDummyLine()
     }
 }
 
-class SwFtnSave
+class SwFootnoteSave
 {
-    SwTxtSizeInfo *pInf;
+    SwTextSizeInfo *pInf;
     SwFont       *pFnt;
     SwFont       *pOld;
 public:
-    SwFtnSave( const SwTxtSizeInfo &rInf,
-               const SwTxtFtn *pTxtFtn,
+    SwFootnoteSave( const SwTextSizeInfo &rInf,
+               const SwTextFootnote *pTextFootnote,
                const bool bApplyGivenScriptType,
                const sal_uInt8 nGivenScriptType );
-   ~SwFtnSave();
+   ~SwFootnoteSave();
 };
 
-SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf,
-                      const SwTxtFtn* pTxtFtn,
+SwFootnoteSave::SwFootnoteSave( const SwTextSizeInfo &rInf,
+                      const SwTextFootnote* pTextFootnote,
                       const bool bApplyGivenScriptType,
                       const sal_uInt8 nGivenScriptType )
-    : pInf( &((SwTxtSizeInfo&)rInf) )
+    : pInf( &((SwTextSizeInfo&)rInf) )
     , pFnt( 0 )
     , pOld( 0 )
 {
-    if( pTxtFtn && rInf.GetTxtFrm() )
+    if( pTextFootnote && rInf.GetTextFrm() )
     {
-        pFnt = ((SwTxtSizeInfo&)rInf).GetFont();
+        pFnt = ((SwTextSizeInfo&)rInf).GetFont();
           pOld = new SwFont( *pFnt );
         pOld->GetTox() = pFnt->GetTox();
         pFnt->GetTox() = 0;
-        SwFmtFtn& rFtn = (SwFmtFtn&)pTxtFtn->GetFtn();
-        const SwDoc *pDoc = rInf.GetTxtFrm()->GetNode()->GetDoc();
+        SwFormatFootnote& rFootnote = (SwFormatFootnote&)pTextFootnote->GetFootnote();
+        const SwDoc *pDoc = rInf.GetTextFrm()->GetNode()->GetDoc();
 
         // #i98418#
         if ( bApplyGivenScriptType )
@@ -1270,17 +1270,17 @@ SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf,
         else
         {
             // examine text and set script
-            OUString aTmpStr( rFtn.GetViewNumStr( *pDoc ) );
+            OUString aTmpStr( rFootnote.GetViewNumStr( *pDoc ) );
             pFnt->SetActual( SwScriptInfo::WhichFont( 0, &aTmpStr, 0 ) );
         }
 
         const SwEndNoteInfo* pInfo;
-        if( rFtn.IsEndNote() )
+        if( rFootnote.IsEndNote() )
             pInfo = &pDoc->GetEndNoteInfo();
         else
-            pInfo = &pDoc->GetFtnInfo();
-        const SwAttrSet& rSet = pInfo->GetAnchorCharFmt((SwDoc&)*pDoc)->GetAttrSet();
-        pFnt->SetDiffFnt( &rSet, rInf.GetTxtFrm()->GetNode()->getIDocumentSettingAccess() );
+            pInfo = &pDoc->GetFootnoteInfo();
+        const SwAttrSet& rSet = pInfo->GetAnchorCharFormat((SwDoc&)*pDoc)->GetAttrSet();
+        pFnt->SetDiffFnt( &rSet, rInf.GetTextFrm()->GetNode()->getIDocumentSettingAccess() );
 
         // we reduce footnote size, if we are inside a double line portion
         if ( ! pOld->GetEscapement() && 50 == pOld->GetPropr() )
@@ -1296,7 +1296,7 @@ SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf,
         if( SfxItemState::SET == rSet.GetItemState( RES_CHRATR_ROTATE,
             true, &pItem ))
             pFnt->SetVertical( static_cast<const SvxCharRotateItem*>(pItem)->GetValue(),
-                                rInf.GetTxtFrm()->IsVertical() );
+                                rInf.GetTextFrm()->IsVertical() );
 
         pFnt->ChgPhysFnt( pInf->GetVsh(), *pInf->GetOut() );
 
@@ -1308,7 +1308,7 @@ SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf,
         pFnt = NULL;
 }
 
-SwFtnSave::~SwFtnSave()
+SwFootnoteSave::~SwFootnoteSave()
 {
     if( pFnt )
     {
@@ -1320,10 +1320,10 @@ SwFtnSave::~SwFtnSave()
     }
 }
 
-SwFtnPortion::SwFtnPortion( const OUString &rExpand,
-                            SwTxtFtn *pFootn, sal_uInt16 nReal )
-        : SwFldPortion( rExpand, 0 )
-        , pFtn(pFootn)
+SwFootnotePortion::SwFootnotePortion( const OUString &rExpand,
+                            SwTextFootnote *pFootn, sal_uInt16 nReal )
+        : SwFieldPortion( rExpand, 0 )
+        , pFootnote(pFootn)
         , nOrigHeight( nReal )
         // #i98418#
         , mbPreferredScriptTypeSet( false )
@@ -1333,79 +1333,79 @@ SwFtnPortion::SwFtnPortion( const OUString &rExpand,
     SetWhichPor( POR_FTN );
 }
 
-bool SwFtnPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
+bool SwFootnotePortion::GetExpText( const SwTextSizeInfo &, OUString &rText ) const
 {
-    rTxt = aExpand;
+    rText = aExpand;
     return true;
 }
 
-bool SwFtnPortion::Format( SwTxtFormatInfo &rInf )
+bool SwFootnotePortion::Format( SwTextFormatInfo &rInf )
 {
     // #i98418#
-//    SwFtnSave aFtnSave( rInf, pFtn );
-    SwFtnSave aFtnSave( rInf, pFtn, mbPreferredScriptTypeSet, mnPreferredScriptType );
+//    SwFootnoteSave aFootnoteSave( rInf, pFootnote );
+    SwFootnoteSave aFootnoteSave( rInf, pFootnote, mbPreferredScriptTypeSet, mnPreferredScriptType );
     // the idx is manipulated in SwExpandPortion::Format
     // this flag indicates, that a footnote is allowed to trigger
-    // an underflow during SwTxtGuess::Guess
+    // an underflow during SwTextGuess::Guess
     rInf.SetFakeLineStart( rInf.GetIdx() > rInf.GetLineStart() );
-    const bool bFull = SwFldPortion::Format( rInf );
+    const bool bFull = SwFieldPortion::Format( rInf );
     rInf.SetFakeLineStart( false );
     SetAscent( rInf.GetAscent() );
-    Height( rInf.GetTxtHeight() );
-    rInf.SetFtnDone( !bFull );
+    Height( rInf.GetTextHeight() );
+    rInf.SetFootnoteDone( !bFull );
     if( !bFull )
-        rInf.SetParaFtn();
+        rInf.SetParaFootnote();
     return bFull;
 }
 
-void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwFootnotePortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     // #i98418#
-//    SwFtnSave aFtnSave( rInf, pFtn );
-    SwFtnSave aFtnSave( rInf, pFtn, mbPreferredScriptTypeSet, mnPreferredScriptType );
+//    SwFootnoteSave aFootnoteSave( rInf, pFootnote );
+    SwFootnoteSave aFootnoteSave( rInf, pFootnote, mbPreferredScriptTypeSet, mnPreferredScriptType );
     rInf.DrawViewOpt( *this, POR_FTN );
     SwExpandPortion::Paint( rInf );
 }
 
-SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &rInfo ) const
+SwPosSize SwFootnotePortion::GetTextSize( const SwTextSizeInfo &rInfo ) const
 {
     // #i98418#
-//    SwFtnSave aFtnSave( rInfo, pFtn );
-    SwFtnSave aFtnSave( rInfo, pFtn, mbPreferredScriptTypeSet, mnPreferredScriptType );
-    return SwExpandPortion::GetTxtSize( rInfo );
+//    SwFootnoteSave aFootnoteSave( rInfo, pFootnote );
+    SwFootnoteSave aFootnoteSave( rInfo, pFootnote, mbPreferredScriptTypeSet, mnPreferredScriptType );
+    return SwExpandPortion::GetTextSize( rInfo );
 }
 
 // #i98418#
-void SwFtnPortion::SetPreferredScriptType( sal_uInt8 nPreferredScriptType )
+void SwFootnotePortion::SetPreferredScriptType( sal_uInt8 nPreferredScriptType )
 {
     mbPreferredScriptTypeSet = true;
     mnPreferredScriptType = nPreferredScriptType;
 }
 
-SwFldPortion *SwQuoVadisPortion::Clone( const OUString &rExpand ) const
+SwFieldPortion *SwQuoVadisPortion::Clone( const OUString &rExpand ) const
 {
     return new SwQuoVadisPortion( rExpand, aErgo );
 }
 
 SwQuoVadisPortion::SwQuoVadisPortion( const OUString &rExp, const OUString& rStr )
-    : SwFldPortion( rExp ), aErgo(rStr)
+    : SwFieldPortion( rExp ), aErgo(rStr)
 {
     SetLen(0);
     SetWhichPor( POR_QUOVADIS );
 }
 
-bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
+bool SwQuoVadisPortion::Format( SwTextFormatInfo &rInf )
 {
     // First try; maybe the Text fits
     CheckScript( rInf );
-    bool bFull = SwFldPortion::Format( rInf );
+    bool bFull = SwFieldPortion::Format( rInf );
     SetLen( 0 );
 
     if( bFull )
     {
         // Second try; we make the String shorter
         aExpand = "...";
-        bFull = SwFldPortion::Format( rInf );
+        bFull = SwFieldPortion::Format( rInf );
         SetLen( 0 );
         if( bFull  )
             // Third try; we're done: we crush
@@ -1421,13 +1421,13 @@ bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
     return bFull;
 }
 
-bool SwQuoVadisPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
+bool SwQuoVadisPortion::GetExpText( const SwTextSizeInfo &, OUString &rText ) const
 {
-    rTxt = aExpand;
+    rText = aExpand;
     // if this QuoVadisPortion has a follow, the follow is responsible for
     // the ergo text.
     if ( ! HasFollow() )
-        rTxt += aErgo;
+        rText += aErgo;
     return true;
 }
 
@@ -1436,26 +1436,26 @@ void SwQuoVadisPortion::HandlePortion( SwPortionHandler& rPH ) const
     rPH.Special( GetLen(), aExpand + aErgo, GetWhichPor() );
 }
 
-void SwQuoVadisPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwQuoVadisPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     // We _always_ want to ouput per DrawStretchText, because nErgo
     // can quickly switch
     if( PrtWidth() )
     {
         rInf.DrawViewOpt( *this, POR_QUOVADIS );
-        SwTxtSlot aDiffTxt( &rInf, this, true, false );
+        SwTextSlot aDiffText( &rInf, this, true, false );
         SwFontSave aSave( rInf, pFnt );
         rInf.DrawText( *this, rInf.GetLen(), true );
     }
 }
 
-SwFldPortion *SwErgoSumPortion::Clone( const OUString &rExpand ) const
+SwFieldPortion *SwErgoSumPortion::Clone( const OUString &rExpand ) const
 {
     return new SwErgoSumPortion( rExpand, OUString() );
 }
 
 SwErgoSumPortion::SwErgoSumPortion(const OUString &rExp, const OUString& rStr)
-    : SwFldPortion( rExp )
+    : SwFieldPortion( rExp )
 {
     SetLen(0);
     aExpand += rStr;
@@ -1470,9 +1470,9 @@ sal_Int32 SwErgoSumPortion::GetCrsrOfst( const sal_uInt16 ) const
     return 0;
 }
 
-bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
+bool SwErgoSumPortion::Format( SwTextFormatInfo &rInf )
 {
-    const bool bFull = SwFldPortion::Format( rInf );
+    const bool bFull = SwFieldPortion::Format( rInf );
     SetLen( 0 );
     rInf.SetErgoDone( true );
 
@@ -1508,7 +1508,7 @@ void SwParaPortion::SetErgoSumNum( const OUString& rErgo )
 }
 
 /**
- * Is called in SwTxtFrm::Prepare()
+ * Is called in SwTextFrm::Prepare()
  */
 bool SwParaPortion::UpdateQuoVadis( const OUString &rQuo )
 {
@@ -1529,7 +1529,7 @@ bool SwParaPortion::UpdateQuoVadis( const OUString &rQuo )
     if( !pQuo )
         return false;
 
-    return pQuo->GetQuoTxt() == rQuo;
+    return pQuo->GetQuoText() == rQuo;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 54316b949d3e..9ced752ad8aa 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -35,18 +35,18 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::i18n;
 
-Reference< XHyphenatedWord >  SwTxtFormatInfo::HyphWord(
-                                const OUString &rTxt, const sal_Int32 nMinTrail )
+Reference< XHyphenatedWord >  SwTextFormatInfo::HyphWord(
+                                const OUString &rText, const sal_Int32 nMinTrail )
 {
-    if( rTxt.getLength() < 4 || m_pFnt->IsSymbol(m_pVsh) )
+    if( rText.getLength() < 4 || m_pFnt->IsSymbol(m_pVsh) )
         return 0;
     Reference< XHyphenator >  xHyph = ::GetHyphenator();
     Reference< XHyphenatedWord > xHyphWord;
 
     if( xHyph.is() )
-        xHyphWord = xHyph->hyphenate( OUString(rTxt),
+        xHyphWord = xHyph->hyphenate( OUString(rText),
                             g_pBreakIt->GetLocale( m_pFnt->GetLanguage() ),
-                            rTxt.getLength() - nMinTrail, GetHyphValues() );
+                            rText.getLength() - nMinTrail, GetHyphValues() );
     return xHyphWord;
 
 }
@@ -54,15 +54,15 @@ Reference< XHyphenatedWord >  SwTxtFormatInfo::HyphWord(
 /**
  * We format a row for interactive hyphenation
  */
-bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
+bool SwTextFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
 {
-    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"swapped frame at SwTxtFrm::Hyphenate" );
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"swapped frame at SwTextFrm::Hyphenate" );
 
     if( !g_pBreakIt->GetBreakIter().is() )
         return false;
 
     // We lock it, to start with
-    OSL_ENSURE( !IsLocked(), "SwTxtFrm::Hyphenate: this is locked" );
+    OSL_ENSURE( !IsLocked(), "SwTextFrm::Hyphenate: this is locked" );
 
     // The frame::Frame must have a valid SSize!
     Calc();
@@ -72,14 +72,14 @@ bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
     if( !IsEmpty() )
     {
         // We always need to enable hyphenation
-        // Don't be afraid: the SwTxtIter saves the old row in the hyphenate
-        TxtFrmLockGuard aLock( this );
+        // Don't be afraid: the SwTextIter saves the old row in the hyphenate
+        TextFrmLockGuard aLock( this );
 
         if ( IsVertical() )
             SwapWidthAndHeight();
 
-        SwTxtFormatInfo aInf( this, true ); // true for interactive hyph!
-        SwTxtFormatter aLine( this, &aInf );
+        SwTextFormatInfo aInf( this, true ); // true for interactive hyph!
+        SwTextFormatter aLine( this, &aInf );
         aLine.CharToLine( rHyphInf.nStart );
 
         // If we're within the first word of a row, it could've been hyphenated
@@ -116,27 +116,27 @@ bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
  * the UI expects it to be.
  * TODO: We can of course optimize this a lot.
  */
-void SetParaPortion( SwTxtInfo *pInf, SwParaPortion *pRoot )
+void SetParaPortion( SwTextInfo *pInf, SwParaPortion *pRoot )
 {
     OSL_ENSURE( pRoot, "SetParaPortion: no root anymore" );
     pInf->m_pPara = pRoot;
 }
 
-bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
+bool SwTextFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
 {
-    SwTxtFormatInfo &rInf = GetInfo();
+    SwTextFormatInfo &rInf = GetInfo();
 
     // We never need to hyphenate anything in the last row
     // Except for, if it contains a FlyPortion or if it's the
     // last row of the Master
-    if( !GetNext() && !rInf.GetTxtFly().IsOn() && !pFrm->GetFollow() )
+    if( !GetNext() && !rInf.GetTextFly().IsOn() && !pFrm->GetFollow() )
         return false;
 
     sal_Int32 nWrdStart = nStart;
 
     // We need to retain the old row
     // E.g.: The attribute for hyphenation was not set, but
-    // it's always set in SwTxtFrm::Hyphenate, because we want
+    // it's always set in SwTextFrm::Hyphenate, because we want
     // to set breakpoints.
     SwLineLayout *pOldCurr = pCurr;
 
@@ -150,7 +150,7 @@ bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
         SwParaPortion *pPara = new SwParaPortion();
         SetParaPortion( &rInf, pPara );
         pCurr = pPara;
-        OSL_ENSURE( IsParaLine(), "SwTxtFormatter::Hyphenate: not the first" );
+        OSL_ENSURE( IsParaLine(), "SwTextFormatter::Hyphenate: not the first" );
     }
     else
         pCurr = new SwLineLayout();
@@ -203,7 +203,7 @@ bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
     if( pOldCurr->IsParaPortion() )
     {
         SetParaPortion( &rInf, static_cast<SwParaPortion*>(pOldCurr) );
-        OSL_ENSURE( IsParaLine(), "SwTxtFormatter::Hyphenate: even not the first" );
+        OSL_ENSURE( IsParaLine(), "SwTextFormatter::Hyphenate: even not the first" );
     }
 
     if( nWrdStart==0 )
@@ -221,18 +221,18 @@ bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
     Reference< XHyphenatedWord > xHyphWord;
 
     Boundary aBound =
-        g_pBreakIt->GetBreakIter()->getWordBoundary( rInf.GetTxt(), nWrdStart,
+        g_pBreakIt->GetBreakIter()->getWordBoundary( rInf.GetText(), nWrdStart,
         g_pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ), WordType::DICTIONARY_WORD, true );
     nWrdStart = aBound.startPos;
     nLen = aBound.endPos - nWrdStart;
     if ( nLen == 0 )
         return false;
 
-    OUString aSelTxt( rInf.GetTxt().copy(nWrdStart, nLen) );
+    OUString aSelText( rInf.GetText().copy(nWrdStart, nLen) );
     const sal_Int32 nMinTrail = ( nWrdStart + nLen > nEnd ) ? nWrdStart + nLen - nEnd - 1 : 0;
 
     //!! rHyphInf.SetHyphWord( ... ) mu??? hier geschehen
-    xHyphWord = rInf.HyphWord( aSelTxt, nMinTrail );
+    xHyphWord = rInf.HyphWord( aSelText, nMinTrail );
     if ( xHyphWord.is() )
     {
         rHyphInf.SetHyphWord( xHyphWord );
@@ -249,23 +249,23 @@ bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
     return false;
 }
 
-bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
+bool SwTextPortion::CreateHyphen( SwTextFormatInfo &rInf, SwTextGuess &rGuess )
 {
     Reference< XHyphenatedWord >  xHyphWord = rGuess.HyphWord();
 
-    OSL_ENSURE( !pPortion, "SwTxtPortion::CreateHyphen(): another portion, another planet..." );
-    OSL_ENSURE( xHyphWord.is(), "SwTxtPortion::CreateHyphen(): You are lucky! The code is robust here." );
+    OSL_ENSURE( !pPortion, "SwTextPortion::CreateHyphen(): another portion, another planet..." );
+    OSL_ENSURE( xHyphWord.is(), "SwTextPortion::CreateHyphen(): You are lucky! The code is robust here." );
 
     if( rInf.IsHyphForbud() ||
         pPortion || // robust
         !xHyphWord.is() || // more robust
         // Mehrzeilige Felder duerfen nicht interaktiv getrennt werden.
-        ( rInf.IsInterHyph() && InFldGrp() ) )
+        ( rInf.IsInterHyph() && InFieldGrp() ) )
         return false;
 
     SwHyphPortion *pHyphPor;
     sal_Int32 nPorEnd;
-    SwTxtSizeInfo aInf( rInf );
+    SwTextSizeInfo aInf( rInf );
 
     // first case: hyphenated word has alternative spelling
     if ( xHyphWord->isAlternativeSpelling() )
@@ -274,23 +274,23 @@ bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
         aAltSpell = SvxGetAltSpelling( xHyphWord );
         OSL_ENSURE( aAltSpell.bIsAltSpelling, "no alternatve spelling" );
 
-        OUString aAltTxt = aAltSpell.aReplacement;
+        OUString aAltText = aAltSpell.aReplacement;
         nPorEnd = aAltSpell.nChangedPos + rGuess.BreakStart() - rGuess.FieldDiff();
         sal_Int32 nTmpLen = 0;
 
         // soft hyphen at alternative spelling position?
-        if( rInf.GetTxt()[ rInf.GetSoftHyphPos() ] == CHAR_SOFTHYPHEN )
+        if( rInf.GetText()[ rInf.GetSoftHyphPos() ] == CHAR_SOFTHYPHEN )
         {
-            pHyphPor = new SwSoftHyphStrPortion( aAltTxt );
+            pHyphPor = new SwSoftHyphStrPortion( aAltText );
             nTmpLen = 1;
         }
         else {
-            pHyphPor = new SwHyphStrPortion( aAltTxt );
+            pHyphPor = new SwHyphStrPortion( aAltText );
         }
 
         // length of pHyphPor is adjusted
-        pHyphPor->SetLen( aAltTxt.getLength() + 1 );
-        (SwPosSize&)(*pHyphPor) = pHyphPor->GetTxtSize( rInf );
+        pHyphPor->SetLen( aAltText.getLength() + 1 );
+        (SwPosSize&)(*pHyphPor) = pHyphPor->GetTextSize( rInf );
         pHyphPor->SetLen( aAltSpell.nChangedLength + nTmpLen );
     }
     else
@@ -306,7 +306,7 @@ bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
         rInf.GetFont()->GetMagic( pTmpMagic, nFntIdx, rInf.GetFont()->GetActual() );
         if( !pLastMagicNo || pLastMagicNo != pTmpMagic ) {
             pLastMagicNo = pTmpMagic;
-            (SwPosSize&)(*pHyphPor) = pHyphPor->GetTxtSize( rInf );
+            (SwPosSize&)(*pHyphPor) = pHyphPor->GetTextSize( rInf );
             aMiniCacheH = pHyphPor->Height();
             aMiniCacheW = pHyphPor->Width();
         } else {
@@ -328,7 +328,7 @@ bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
         aInf.SetLen( nPorEnd - rInf.GetIdx() );
         pHyphPor->SetAscent( GetAscent() );
         SetLen( aInf.GetLen() );
-        CalcTxtSize( aInf );
+        CalcTextSize( aInf );
 
         Insert( pHyphPor );
 
@@ -345,9 +345,9 @@ bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
     return false;
 }
 
-bool SwHyphPortion::GetExpTxt( const SwTxtSizeInfo &/*rInf*/, OUString &rTxt ) const
+bool SwHyphPortion::GetExpText( const SwTextSizeInfo &/*rInf*/, OUString &rText ) const
 {
-    rTxt = "-";
+    rText = "-";
     return true;
 }
 
@@ -356,17 +356,17 @@ void SwHyphPortion::HandlePortion( SwPortionHandler& rPH ) const
     rPH.Special( GetLen(), OUString('-'), GetWhichPor() );
 }
 
-bool SwHyphPortion::Format( SwTxtFormatInfo &rInf )
+bool SwHyphPortion::Format( SwTextFormatInfo &rInf )
 {
     const SwLinePortion *pLast = rInf.GetLast();
     Height( pLast->Height() );
     SetAscent( pLast->GetAscent() );
-    OUString aTxt;
+    OUString aText;
 
-    if( !GetExpTxt( rInf, aTxt ) )
+    if( !GetExpText( rInf, aText ) )
         return false;
 
-    PrtWidth( rInf.GetTxtSize( aTxt ).Width() );
+    PrtWidth( rInf.GetTextSize( aText ).Width() );
     const bool bFull = rInf.Width() <= rInf.X() + PrtWidth();
     if( bFull && !rInf.IsUnderflow() ) {
         Truncate();
@@ -376,9 +376,9 @@ bool SwHyphPortion::Format( SwTxtFormatInfo &rInf )
     return bFull;
 }
 
-bool SwHyphStrPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
+bool SwHyphStrPortion::GetExpText( const SwTextSizeInfo &, OUString &rText ) const
 {
-    rTxt = aExpand;
+    rText = aExpand;
     return true;
 }
 
@@ -396,7 +396,7 @@ SwSoftHyphPortion::SwSoftHyphPortion() :
     SetWhichPor( POR_SOFTHYPH );
 }
 
-sal_uInt16 SwSoftHyphPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
+sal_uInt16 SwSoftHyphPortion::GetViewWidth( const SwTextSizeInfo &rInf ) const
 {
     // Although we're in the const, nViewWidth should be calculated at
     // the last possible moment
@@ -404,7 +404,7 @@ sal_uInt16 SwSoftHyphPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
     {
         if( !nViewWidth )
             const_cast<SwSoftHyphPortion*>(this)->nViewWidth
-                = rInf.GetTxtSize(OUString('-')).Width();
+                = rInf.GetTextSize(OUString('-')).Width();
     }
     else
         const_cast<SwSoftHyphPortion*>(this)->nViewWidth = 0;
@@ -421,7 +421,7 @@ sal_uInt16 SwSoftHyphPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
  *  3) SoftHyph is at the end of the line, ViewOpt or or off
  *     -> always visible, neighbors unchanged
  */
-void SwSoftHyphPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwSoftHyphPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( Width() )
     {
@@ -447,7 +447,7 @@ void SwSoftHyphPortion::Paint( const SwTxtPaintInfo &rInf ) const
  * 3) Underflow() and bFull = true
  * 4) {Zuc} calls hyphenate => {Zuk}{-}{ker}
  */
-bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
+bool SwSoftHyphPortion::Format( SwTextFormatInfo &rInf )
 {
     bool bFull = true;
 
@@ -465,7 +465,7 @@ bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
             // if the soft hyphend word has an alternative spelling
             // when hyphenated (old german spelling), the soft hyphen
             // portion has to trigger an underflow
-            SwTxtGuess aGuess;
+            SwTextGuess aGuess;
             bFull = rInf.IsInterHyph() ||
                     !aGuess.AlternativeSpelling( rInf, rInf.GetIdx() - 1 );
         }
@@ -505,7 +505,7 @@ bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
 /**
  * Format End of Line
  */
-void SwSoftHyphPortion::FormatEOL( SwTxtFormatInfo &rInf )
+void SwSoftHyphPortion::FormatEOL( SwTextFormatInfo &rInf )
 {
     if( !IsExpand() )
     {
@@ -537,14 +537,14 @@ void SwSoftHyphPortion::FormatEOL( SwTxtFormatInfo &rInf )
  * - if we're at the end of the line
  * - if we're before a (real/emulated) line break
  */
-bool SwSoftHyphPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwSoftHyphPortion::GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const
 {
     if( IsExpand() || ( rInf.OnWin() && rInf.GetOpt().IsSoftHyph() ) ||
         ( GetPortion() && ( GetPortion()->InFixGrp() ||
           GetPortion()->IsDropPortion() || GetPortion()->IsLayPortion() ||
           GetPortion()->IsParaPortion() || GetPortion()->IsBreakPortion() ) ) )
     {
-        return SwHyphPortion::GetExpTxt( rInf, rTxt );
+        return SwHyphPortion::GetExpText( rInf, rText );
     }
     return false;
 }
@@ -557,7 +557,7 @@ void SwSoftHyphPortion::HandlePortion( SwPortionHandler& rPH ) const
     rPH.Special( GetLen(), OUString('-'), nWhich );
 }
 
-void SwSoftHyphStrPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwSoftHyphStrPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     // Bug or feature?:
     // {Zu}{k-}{ker}, {k-} will be gray instead of {-}
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index 4e42e23b5950..15f1309b860e 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -38,16 +38,16 @@
 #include "txtfly.hxx"
 #include "dbg_lay.hxx"
 
-SwCache *SwTxtFrm::pTxtCache = 0;
-long SwTxtFrm::nMinPrtLine = 0;
+SwCache *SwTextFrm::pTextCache = 0;
+long SwTextFrm::nMinPrtLine = 0;
 SwContourCache *pContourCache = 0;
 SwDropCapCache *pDropCapCache = 0;
 
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtLine )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTextLine )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwParaPortion ) // Paragraphs
 IMPL_FIXEDMEMPOOL_NEWDEL( SwLineLayout ) // Lines
 IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion ) // e.g. Blanks at the line end
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtPortion ) // Attribute change
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTextPortion ) // Attribute change
 
 // Are ONLY used in init.cxx.
 // There we have extern void _TextFinit()
@@ -56,13 +56,13 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtPortion ) // Attribute change
 void _TextInit()
 {
     pFntCache = new SwFntCache; // Cache for SwSubFont -> SwFntObj = { Font aFont, Font* pScrFont, Font* pPrtFont, OutputDevice* pPrinter, ... }
-    pSwFontCache = new SwFontCache; // Cache for SwTxtFmtColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray }
-    SwCache *pTxtCache = new SwCache( 250 // Cache for SwTxtFrm -> SwTxtLine = { SwParaPortion* pLine }
+    pSwFontCache = new SwFontCache; // Cache for SwTextFormatColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray }
+    SwCache *pTextCache = new SwCache( 250 // Cache for SwTextFrm -> SwTextLine = { SwParaPortion* pLine }
 #ifdef DBG_UTIL
-    , "static SwTxtFrm::pTxtCache"
+    , "static SwTextFrm::pTextCache"
 #endif
     );
-    SwTxtFrm::SetTxtCache( pTxtCache );
+    SwTextFrm::SetTextCache( pTextCache );
     pWaveCol = new Color( COL_GRAY );
     PROTOCOL_INIT
 }
@@ -70,7 +70,7 @@ void _TextInit()
 void _TextFinit()
 {
     PROTOCOL_STOP
-    delete SwTxtFrm::GetTxtCache();
+    delete SwTextFrm::GetTextCache();
     delete pSwFontCache;
     delete pFntCache;
     delete pBlink;
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index e1f503e44925..1e29121a8cb9 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -57,11 +57,11 @@ static void Error()
             return rOs; \
         }
 
-IMPL_OUTOP( SwTxtPortion )
+IMPL_OUTOP( SwTextPortion )
 IMPL_OUTOP( SwLinePortion )
 IMPL_OUTOP( SwBreakPortion )
 IMPL_OUTOP( SwGluePortion )
-IMPL_OUTOP( SwFldPortion )
+IMPL_OUTOP( SwFieldPortion )
 IMPL_OUTOP( SwHiddenPortion )
 IMPL_OUTOP( SwHyphPortion )
 IMPL_OUTOP( SwFixPortion )
@@ -73,8 +73,8 @@ IMPL_OUTOP( SwBulletPortion )
 IMPL_OUTOP( SwGrfNumPortion )
 IMPL_OUTOP( SwLineLayout )
 IMPL_OUTOP( SwParaPortion )
-IMPL_OUTOP( SwFtnPortion )
-IMPL_OUTOP( SwFtnNumPortion )
+IMPL_OUTOP( SwFootnotePortion )
+IMPL_OUTOP( SwFootnoteNumPortion )
 IMPL_OUTOP( SwTmpEndPortion )
 IMPL_OUTOP( SwHyphStrPortion )
 IMPL_OUTOP( SwExpandPortion )
@@ -180,10 +180,10 @@ SvStream &SwLinePortion::operator<<( SvStream &rOs ) const //$ ostream
     return rOs;
 }
 
-SvStream &SwTxtPortion::operator<<( SvStream &rOs ) const //$ ostream
+SvStream &SwTextPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {TXT:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {TXT:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -191,8 +191,8 @@ SvStream &SwTxtPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwTmpEndPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {END:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {END:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     if( PrtWidth() )
         rOs.WriteCharPtr("(view)");
@@ -202,8 +202,8 @@ SvStream &SwTmpEndPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwBreakPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {BREAK:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {BREAK:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -211,8 +211,8 @@ SvStream &SwBreakPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwKernPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {KERN:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {KERN:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -220,8 +220,8 @@ SvStream &SwKernPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwArrowPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {ARROW:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {ARROW:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -229,8 +229,8 @@ SvStream &SwArrowPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwMultiPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {MULTI:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {MULTI:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -238,8 +238,8 @@ SvStream &SwMultiPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwCombinedPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {COMBINED:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {COMBINED:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -247,8 +247,8 @@ SvStream &SwCombinedPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwLineLayout::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {LINE:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {LINE:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     SwLinePortion *pPos = GetPortion();
     while( pPos )
@@ -263,8 +263,8 @@ SvStream &SwLineLayout::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwGluePortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {GLUE:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {GLUE:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     rOs.WriteCharPtr(" F:").WriteUInt16(GetFixWidth());
     rOs.WriteCharPtr(" G:").WriteInt16(GetPrtGlue());
@@ -274,8 +274,8 @@ SvStream &SwGluePortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwFixPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {FIX:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {FIX:" );
+    rOs.WriteCharPtr(pText);
     SwGluePortion::operator<<( rOs );
     rOs.WriteCharPtr(" Fix:").WriteUInt16(nFix);
     rOs.WriteCharPtr(pClose);
@@ -284,8 +284,8 @@ SvStream &SwFixPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwFlyPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {FLY:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {FLY:" );
+    rOs.WriteCharPtr(pText);
     SwFixPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -293,8 +293,8 @@ SvStream &SwFlyPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwMarginPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {MAR:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {MAR:" );
+    rOs.WriteCharPtr(pText);
     SwGluePortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -302,19 +302,19 @@ SvStream &SwMarginPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwFlyCntPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {FLYCNT:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {FLYCNT:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     if( bDraw )
     {
-        CONSTCHAR( pTxt2, " {DRAWINCNT" );
-        rOs.WriteCharPtr(pTxt2);
+        CONSTCHAR( pText2, " {DRAWINCNT" );
+        rOs.WriteCharPtr(pText2);
         rOs.WriteCharPtr(pClose);
     }
     else
     {
-        CONSTCHAR( pTxt2, " {FRM:" );
-        rOs.WriteCharPtr(pTxt2);
+        CONSTCHAR( pText2, " {FRM:" );
+        rOs.WriteCharPtr(pText2);
         rOs.WriteCharPtr(" {FRM:");
         WriteSwRect(rOs, GetFlyFrm()->Frm()).WriteCharPtr(pClose);
         rOs.WriteCharPtr(" {PRT:");
@@ -327,26 +327,26 @@ SvStream &SwFlyCntPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwExpandPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {EXP:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {EXP:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
 }
 
-SvStream &SwFtnPortion::operator<<( SvStream &rOs ) const //$ ostream
+SvStream &SwFootnotePortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {FTN:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {FTN:" );
+    rOs.WriteCharPtr(pText);
     SwExpandPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
 }
 
-SvStream &SwFtnNumPortion::operator<<( SvStream &rOs ) const //$ ostream
+SvStream &SwFootnoteNumPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {FTNNUM:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {FTNNUM:" );
+    rOs.WriteCharPtr(pText);
     SwNumberPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -354,8 +354,8 @@ SvStream &SwFtnNumPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwNumberPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {NUMBER:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {NUMBER:" );
+    rOs.WriteCharPtr(pText);
     SwExpandPortion::operator<<( rOs );
     rOs.WriteCharPtr(" Exp:\"").WriteChar('\"');
     rOs.WriteCharPtr(pClose);
@@ -364,8 +364,8 @@ SvStream &SwNumberPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwBulletPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {BULLET:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {BULLET:" );
+    rOs.WriteCharPtr(pText);
     SwNumberPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -373,8 +373,8 @@ SvStream &SwBulletPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwGrfNumPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {GRFNUM:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {GRFNUM:" );
+    rOs.WriteCharPtr(pText);
     SwNumberPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -382,35 +382,35 @@ SvStream &SwGrfNumPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwHiddenPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {Hidden:" );
-    rOs.WriteCharPtr(pTxt);
-    SwFldPortion::operator<<( rOs );
+    CONSTCHAR( pText, " {Hidden:" );
+    rOs.WriteCharPtr(pText);
+    SwFieldPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
 }
 
 SvStream &SwToxPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {TOX:" );
-    rOs.WriteCharPtr(pTxt);
-    SwTxtPortion::operator<<( rOs );
+    CONSTCHAR( pText, " {TOX:" );
+    rOs.WriteCharPtr(pText);
+    SwTextPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
 }
 
 SvStream &SwRefPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {Ref:" );
-    rOs.WriteCharPtr(pTxt);
-    SwTxtPortion::operator<<( rOs );
+    CONSTCHAR( pText, " {Ref:" );
+    rOs.WriteCharPtr(pText);
+    SwTextPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
 }
 
 SvStream &SwIsoToxPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {ISOTOX:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {ISOTOX:" );
+    rOs.WriteCharPtr(pText);
     SwToxPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -418,8 +418,8 @@ SvStream &SwIsoToxPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwIsoRefPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {ISOREF:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {ISOREF:" );
+    rOs.WriteCharPtr(pText);
     SwRefPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -427,8 +427,8 @@ SvStream &SwIsoRefPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwHyphPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {HYPH:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {HYPH:" );
+    rOs.WriteCharPtr(pText);
     SwExpandPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -436,8 +436,8 @@ SvStream &SwHyphPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwHyphStrPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {HYPHSTR:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {HYPHSTR:" );
+    rOs.WriteCharPtr(pText);
     SwExpandPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -445,8 +445,8 @@ SvStream &SwHyphStrPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwSoftHyphPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {SOFTHYPH:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {SOFTHYPH:" );
+    rOs.WriteCharPtr(pText);
     SwHyphPortion::operator<<( rOs );
     rOs.WriteCharPtr(IsExpand() ? " on" : " off");
     rOs.WriteCharPtr(pClose);
@@ -455,8 +455,8 @@ SvStream &SwSoftHyphPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwSoftHyphStrPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {SOFTHYPHSTR:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {SOFTHYPHSTR:" );
+    rOs.WriteCharPtr(pText);
     SwHyphStrPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -464,17 +464,17 @@ SvStream &SwSoftHyphStrPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwBlankPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {BLANK:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {BLANK:" );
+    rOs.WriteCharPtr(pText);
     SwExpandPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
 }
 
-SvStream &SwFldPortion::operator<<( SvStream &rOs ) const //$ ostream
+SvStream &SwFieldPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {FLD:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {FLD:" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     if( IsFollow() )
         rOs.WriteCharPtr(" F!");
@@ -484,8 +484,8 @@ SvStream &SwFldPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwPostItsPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {POSTITS" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {POSTITS" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -493,8 +493,8 @@ SvStream &SwPostItsPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwTabPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {TAB" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {TAB" );
+    rOs.WriteCharPtr(pText);
     SwFixPortion::operator<<( rOs );
     rOs.WriteCharPtr(" T:").WriteUInt16(nTabPos);
     if( IsFilled() )
@@ -505,8 +505,8 @@ SvStream &SwTabPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwTabLeftPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {TABLEFT" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {TABLEFT" );
+    rOs.WriteCharPtr(pText);
     SwTabPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -514,8 +514,8 @@ SvStream &SwTabLeftPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwTabRightPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {TABRIGHT" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {TABRIGHT" );
+    rOs.WriteCharPtr(pText);
     SwTabPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -523,8 +523,8 @@ SvStream &SwTabRightPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwTabCenterPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {TABCENTER" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {TABCENTER" );
+    rOs.WriteCharPtr(pText);
     SwTabPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -532,8 +532,8 @@ SvStream &SwTabCenterPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwTabDecimalPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {TABDECIMAL" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {TABDECIMAL" );
+    rOs.WriteCharPtr(pText);
     SwTabPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -541,8 +541,8 @@ SvStream &SwTabDecimalPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwParaPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {PAR" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {PAR" );
+    rOs.WriteCharPtr(pText);
     SwLineLayout::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -550,8 +550,8 @@ SvStream &SwParaPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwHolePortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {HOLE" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {HOLE" );
+    rOs.WriteCharPtr(pText);
     SwLinePortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
@@ -559,26 +559,26 @@ SvStream &SwHolePortion::operator<<( SvStream &rOs ) const //$ ostream
 
 SvStream &SwQuoVadisPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {QUOVADIS" );
-    rOs.WriteCharPtr(pTxt);
-    SwFldPortion::operator<<( rOs );
+    CONSTCHAR( pText, " {QUOVADIS" );
+    rOs.WriteCharPtr(pText);
+    SwFieldPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
 }
 
 SvStream &SwErgoSumPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {ERGOSUM" );
-    rOs.WriteCharPtr(pTxt);
-    SwFldPortion::operator<<( rOs );
+    CONSTCHAR( pText, " {ERGOSUM" );
+    rOs.WriteCharPtr(pText);
+    SwFieldPortion::operator<<( rOs );
     rOs.WriteCharPtr(pClose);
     return rOs;
 }
 
-SvStream &operator<<( SvStream &rOs, const SwTxtSizeInfo &rInf ) //$ ostream
+SvStream &operator<<( SvStream &rOs, const SwTextSizeInfo &rInf ) //$ ostream
 {
-    CONSTCHAR( pTxt, " {SIZEINFO:" );
-    rOs.WriteCharPtr(pTxt);
+    CONSTCHAR( pText, " {SIZEINFO:" );
+    rOs.WriteCharPtr(pText);
     rOs.WriteChar(' ').WriteCharPtr(rInf.OnWin() ? "WIN:" : "PRT:");
     rOs.WriteCharPtr(" Idx:").WriteInt32(rInf.GetIdx());
     rOs.WriteCharPtr(" Len:").WriteInt32(rInf.GetLen());
@@ -588,9 +588,9 @@ SvStream &operator<<( SvStream &rOs, const SwTxtSizeInfo &rInf ) //$ ostream
 
 SvStream &SwDropPortion::operator<<( SvStream &rOs ) const //$ ostream
 {
-    CONSTCHAR( pTxt, " {DROP:" );
-    rOs.WriteCharPtr(pTxt);
-    SwTxtPortion::operator<<( rOs );
+    CONSTCHAR( pText, " {DROP:" );
+    rOs.WriteCharPtr(pText);
+    SwTextPortion::operator<<( rOs );
     if( pPart && nDropHeight )
     {
         rOs.WriteCharPtr(" H:").WriteUInt16(nDropHeight);
diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx
index c7328401e79b..e055a8fd40d6 100644
--- a/sw/source/core/text/txtpaint.cxx
+++ b/sw/source/core/text/txtpaint.cxx
@@ -39,7 +39,7 @@ void SwSaveClip::Reset()
     }
 }
 
-void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm,
+void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTextFrm* pFrm,
                            bool bEnlargeRect )
 {
     SwRect aOldRect( rRect );
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index 607d6c5cf3a1..ce4357fdeb03 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -30,12 +30,12 @@ class SwSaveClip
           bool     bChg;
 protected:
     VclPtr<OutputDevice> pOut;
-    void _ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm,
+    void _ChgClip( const SwRect &rRect, const SwTextFrm* pFrm,
                    bool bEnlargeRect );
 public:
     inline SwSaveClip( OutputDevice* pOut );
     inline ~SwSaveClip();
-    inline void ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm = 0,
+    inline void ChgClip( const SwRect &rRect, const SwTextFrm* pFrm = 0,
                          bool bEnlargeRect = false)
              { if( pOut ) _ChgClip( rRect, pFrm, bEnlargeRect ); }
            void Reset();
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 2bc75dee0a83..522e1c2e47a6 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -61,7 +61,7 @@ sal_uInt16 SwLineInfo::NumberOfTabStops() const
     return pRuler->Count();
 }
 
-SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) const
+SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto ) const
 {
     sal_Unicode cFill = 0;
     sal_Unicode cDec = 0;
@@ -76,7 +76,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
 
         // #i91133#
         const bool bTabsRelativeToIndent =
-            pFrm->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TABS_RELATIVE_TO_INDENT);
+            pFrm->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TABS_RELATIVE_TO_INDENT);
         const SwTwips nTabLeft = bRTL
                                  ? pFrm->Frm().Right() -
                                    ( bTabsRelativeToIndent ? GetTabLeft() : 0 )
@@ -169,7 +169,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
                        : ( ( nCount + 1 ) * nDefTabDist );
 
             // --> FME 2004-09-21 #117919 Minimum tab stop width is 1 or 51 twips:
-            const SwTwips nMinimumTabWidth = pFrm->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT) ? 0 : 50;
+            const SwTwips nMinimumTabWidth = pFrm->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT) ? 0 : 50;
             if( (  bRTL && nTabLeft - nNextPos >= nCurrentAbsPos - nMinimumTabWidth ) ||
                  ( !bRTL && nNextPos + nTabLeft <= nCurrentAbsPos + nMinimumTabWidth  ) )
             {
@@ -230,7 +230,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
                       !pTabStop ||
                       nNextPos != aLineInf.GetListTabStopPosition() ) ||
                     // compatibility option TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST:
-                    pFrm->GetTxtNode()->getIDocumentSettingAccess()->
+                    pFrm->GetTextNode()->getIDocumentSettingAccess()->
                         get(DocumentSettingId::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST);
                 if ( bTabAtLeftMarginAllowed )
                 {
@@ -280,7 +280,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
         default:
             {
                 OSL_ENSURE( SVX_TAB_ADJUST_LEFT == eAdj || SVX_TAB_ADJUST_DEFAULT == eAdj,
-                    "+SwTxtFormatter::NewTabPortion: unknown adjustment" );
+                    "+SwTextFormatter::NewTabPortion: unknown adjustment" );
                 pTabPor = new SwTabLeftPortion( nNewTabPos, cFill, bAutoTabStop );
                 break;
             }
@@ -301,7 +301,7 @@ SwTabPortion::SwTabPortion( const sal_uInt16 nTabPosition, const sal_Unicode cFi
     SetWhichPor( POR_TAB );
 }
 
-bool SwTabPortion::Format( SwTxtFormatInfo &rInf )
+bool SwTabPortion::Format( SwTextFormatInfo &rInf )
 {
     SwTabPortion *pLastTab = rInf.GetLastTab();
     if( pLastTab == this )
@@ -311,21 +311,21 @@ bool SwTabPortion::Format( SwTxtFormatInfo &rInf )
     return PreFormat( rInf );
 }
 
-void SwTabPortion::FormatEOL( SwTxtFormatInfo &rInf )
+void SwTabPortion::FormatEOL( SwTextFormatInfo &rInf )
 {
     if( rInf.GetLastTab() == this && !IsTabLeftPortion() )
         PostFormat( rInf );
 }
 
-bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
+bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf )
 {
     OSL_ENSURE( rInf.X() <= GetTabPos(), "SwTabPortion::PreFormat: rush hour" );
 
     // Here we settle down ...
     Fix( static_cast<sal_uInt16>(rInf.X()) );
 
-    const bool bTabCompat = rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
-    const bool bTabOverflow = rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVERFLOW);
+    const bool bTabCompat = rInf.GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
+    const bool bTabOverflow = rInf.GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVERFLOW);
 
     // The minimal width of a tab is one blank at least.
     // #i37686# In compatibility mode, the minimum width
@@ -346,8 +346,8 @@ bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
             pSave.reset( new SwFontSave( rInf, const_cast<SwFont*>(pNumberPortionFont) ) );
         }
         OUString aTmp( ' ' );
-        SwTxtSizeInfo aInf( rInf, &aTmp );
-        nMinimumTabWidth = aInf.GetTxtSize().Width();
+        SwTextSizeInfo aInf( rInf, &aTmp );
+        nMinimumTabWidth = aInf.GetTextSize().Width();
     }
     PrtWidth( nMinimumTabWidth );
 
@@ -358,7 +358,7 @@ bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
                      ( rInf.Width() <= rInf.X() + PrtWidth() && rInf.X() <= rInf.Width() ) ;
 
     // #95477# Rotated tab stops get the width of one blank
-    const sal_uInt16 nDir = rInf.GetFont()->GetOrientation( rInf.GetTxtFrm()->IsVertical() );
+    const sal_uInt16 nDir = rInf.GetFont()->GetOrientation( rInf.GetTextFrm()->IsVertical() );
 
     if( ! bFull && 0 == nDir )
     {
@@ -383,10 +383,10 @@ bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
                 // In tabulator compatibility mode, we reset the bFull flag
                 // if the tabulator is at the end of the paragraph and the
                 // tab stop position is outside the frame:
-                bool bAtParaEnd = rInf.GetIdx() + GetLen() == rInf.GetTxt().getLength();
+                bool bAtParaEnd = rInf.GetIdx() + GetLen() == rInf.GetText().getLength();
                 if ( bFull && bTabCompat &&
                      ( ( bTabOverflow && ( rInf.IsTabOverflow() || !IsAutoTabStop() ) ) || bAtParaEnd ) &&
-                     GetTabPos() >= rInf.GetTxtFrm()->Frm().Width() )
+                     GetTabPos() >= rInf.GetTextFrm()->Frm().Width() )
                 {
                     bFull = false;
                     if ( bTabOverflow && !IsAutoTabStop() )
@@ -429,9 +429,9 @@ bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
     }
 }
 
-bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf )
+bool SwTabPortion::PostFormat( SwTextFormatInfo &rInf )
 {
-    const bool bTabOverMargin = rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVER_MARGIN);
+    const bool bTabOverMargin = rInf.GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVER_MARGIN);
     // If the tab position is larger than the right margin, it gets scaled down by default.
     // However, if compat mode enabled, we allow tabs to go over the margin: the rest of the paragraph is not broken into lines.
     const sal_uInt16 nRight = bTabOverMargin ? GetTabPos() : std::min(GetTabPos(), rInf.Width());
@@ -446,7 +446,7 @@ bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf )
 
     const sal_uInt16 nWhich = GetWhichPor();
     OSL_ENSURE( POR_TABLEFT != nWhich, "SwTabPortion::PostFormat: already formatted" );
-    const bool bTabCompat = rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
+    const bool bTabCompat = rInf.GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
 
     // #127428# Abandon dec. tab position if line is full
     if ( bTabCompat && POR_TABDECIMAL == nWhich )
@@ -500,7 +500,7 @@ bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf )
 /**
  * Ex: LineIter::DrawTab()
  */
-void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
+void SwTabPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
 #if OSL_DEBUG_LEVEL > 1
     // We want to view the fixed width
@@ -557,7 +557,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
     if( rInf.GetFont()->IsPaintBlank() )
     {
         // Tabs with filling/filled tabs
-        const sal_uInt16 nCharWidth = rInf.GetTxtSize(OUString(' ')).Width();
+        const sal_uInt16 nCharWidth = rInf.GetTextSize(OUString(' ')).Width();
 
         // Robust:
         if( nCharWidth )
@@ -574,7 +574,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
     if( IsFilled() )
     {
         // Tabs with filling/filled tabs
-        const sal_uInt16 nCharWidth = rInf.GetTxtSize(OUString(cFill)).Width();
+        const sal_uInt16 nCharWidth = rInf.GetTextSize(OUString(cFill)).Width();
         OSL_ENSURE( nCharWidth, "!SwTabPortion::Paint: sophisticated tabchar" );
 
         // Robust:
@@ -591,7 +591,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
     }
 }
 
-void SwAutoTabDecimalPortion::Paint( const SwTxtPaintInfo & ) const
+void SwAutoTabDecimalPortion::Paint( const SwTextPaintInfo & ) const
 {
 }
 
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 305c6ddd9d2a..f526c28cb2e2 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -44,17 +44,17 @@ namespace
 {
 
 // A Follow on the same page as its master is nasty.
-inline bool IsNastyFollow( const SwTxtFrm *pFrm )
+inline bool IsNastyFollow( const SwTextFrm *pFrm )
 {
     OSL_ENSURE( !pFrm->IsFollow() || !pFrm->GetPrev() ||
-            static_cast<const SwTxtFrm*>(pFrm->GetPrev())->GetFollow() == pFrm,
+            static_cast<const SwTextFrm*>(pFrm->GetPrev())->GetFollow() == pFrm,
             "IsNastyFollow: Was ist denn hier los?" );
     return  pFrm->IsFollow() && pFrm->GetPrev();
 }
 
 }
 
-SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const SwTwips nRst )
+SwTextFrmBreak::SwTextFrmBreak( SwTextFrm *pNewFrm, const SwTwips nRst )
     : nRstHeight(nRst), pFrm(pNewFrm)
 {
     SWAP_IF_SWAPPED( pFrm )
@@ -66,13 +66,13 @@ SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const SwTwips nRst )
         const SwSectionFrm* const pSct = pFrm->FindSctFrm();
         bKeep = pSct->Lower()->IsColumnFrm() && !pSct->MoveAllowed( pFrm );
     }
-    bKeep = bKeep || !pFrm->GetTxtNode()->GetSwAttrSet().GetSplit().GetValue() ||
-        pFrm->GetTxtNode()->GetSwAttrSet().GetKeep().GetValue();
+    bKeep = bKeep || !pFrm->GetTextNode()->GetSwAttrSet().GetSplit().GetValue() ||
+        pFrm->GetTextNode()->GetSwAttrSet().GetKeep().GetValue();
     bBreak = false;
 
-    if( !nRstHeight && !pFrm->IsFollow() && pFrm->IsInFtn() && pFrm->HasPara() )
+    if( !nRstHeight && !pFrm->IsFollow() && pFrm->IsInFootnote() && pFrm->HasPara() )
     {
-        nRstHeight = pFrm->GetFtnFrmHeight();
+        nRstHeight = pFrm->GetFootnoteFrmHeight();
         nRstHeight += (pFrm->Prt().*fnRect->fnGetHeight)() -
                       (pFrm->Frm().*fnRect->fnGetHeight)();
         if( nRstHeight < 0 )
@@ -102,7 +102,7 @@ SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const SwTwips nRst )
  * be done until the Follow is formatted. Unfortunately this is crucial
  * to decide if the whole paragraph goes to the next page or not.
  */
-bool SwTxtFrmBreak::IsInside( SwTxtMargin &rLine ) const
+bool SwTextFrmBreak::IsInside( SwTextMargin &rLine ) const
 {
     bool bFit = false;
 
@@ -151,9 +151,9 @@ bool SwTxtFrmBreak::IsInside( SwTxtMargin &rLine ) const
             // grow the requested area.
             nHeight += pFrm->GrowTst( LONG_MAX );
 
-            // The Grow() returns the height by which the Upper of the TxtFrm
-            // would let the TxtFrm grow.
-            // The TxtFrm itself can grow as much as it wants.
+            // The Grow() returns the height by which the Upper of the TextFrm
+            // would let the TextFrm grow.
+            // The TextFrm itself can grow as much as it wants.
             bFit = nHeight >= nLineHeight;
         }
     }
@@ -163,7 +163,7 @@ bool SwTxtFrmBreak::IsInside( SwTxtMargin &rLine ) const
     return bFit;
 }
 
-bool SwTxtFrmBreak::IsBreakNow( SwTxtMargin &rLine )
+bool SwTextFrmBreak::IsBreakNow( SwTextMargin &rLine )
 {
     SWAP_IF_SWAPPED( pFrm )
 
@@ -173,7 +173,7 @@ bool SwTxtFrmBreak::IsBreakNow( SwTxtMargin &rLine )
         bBreak = false;
     else
     {
-        /* This class assumes that the SwTxtMargin is processed from Top to
+        /* This class assumes that the SwTextMargin is processed from Top to
          * Bottom. Because of performance reasons we stop splitting in the
          * following cases:
          * If only one line does not fit.
@@ -190,9 +190,9 @@ bool SwTxtFrmBreak::IsBreakNow( SwTxtMargin &rLine )
             bKeep = true;
             bBreak = false;
         }
-        else if(bFirstLine && pFrm->IsInFtn() && !pFrm->FindFtnFrm()->GetPrev())
+        else if(bFirstLine && pFrm->IsInFootnote() && !pFrm->FindFootnoteFrm()->GetPrev())
         {
-            SwLayoutFrm* pTmp = pFrm->FindFtnBossFrm()->FindBodyCont();
+            SwLayoutFrm* pTmp = pFrm->FindFootnoteBossFrm()->FindBodyCont();
             if( !pTmp || !pTmp->Lower() )
                 bBreak = false;
         }
@@ -204,7 +204,7 @@ bool SwTxtFrmBreak::IsBreakNow( SwTxtMargin &rLine )
 }
 
 /// OD 2004-02-27 #106629# - no longer inline
-void SwTxtFrmBreak::SetRstHeight( const SwTxtMargin &rLine )
+void SwTextFrmBreak::SetRstHeight( const SwTextMargin &rLine )
 {
     // OD, FME 2004-02-27 #106629# - consider bottom margin
     SWRECTFN( pFrm )
@@ -222,9 +222,9 @@ void SwTxtFrmBreak::SetRstHeight( const SwTxtMargin &rLine )
         nRstHeight += rLine.Y() - nOrigin;
 }
 
-WidowsAndOrphans::WidowsAndOrphans( SwTxtFrm *pNewFrm, const SwTwips nRst,
+WidowsAndOrphans::WidowsAndOrphans( SwTextFrm *pNewFrm, const SwTwips nRst,
     bool bChkKeep   )
-    : SwTxtFrmBreak( pNewFrm, nRst ), nWidLines( 0 ), nOrphLines( 0 )
+    : SwTextFrmBreak( pNewFrm, nRst ), nWidLines( 0 ), nOrphLines( 0 )
 {
     SWAP_IF_SWAPPED( pFrm )
 
@@ -232,7 +232,7 @@ WidowsAndOrphans::WidowsAndOrphans( SwTxtFrm *pNewFrm, const SwTwips nRst,
     {
         // 5652: If pararagraph should not be split but is larger than
         // the page, then bKeep is overruled.
-        if( bChkKeep && !pFrm->GetPrev() && !pFrm->IsInFtn() &&
+        if( bChkKeep && !pFrm->GetPrev() && !pFrm->IsInFootnote() &&
             pFrm->IsMoveable() &&
             ( !pFrm->IsInSct() || pFrm->FindSctFrm()->MoveAllowed(pFrm) ) )
             bKeep = false;
@@ -242,11 +242,11 @@ WidowsAndOrphans::WidowsAndOrphans( SwTxtFrm *pNewFrm, const SwTwips nRst,
         // nevertheless the paragraph can request lines from the Master
         // because of the Orphan rule.
         if( pFrm->IsFollow() )
-            nWidLines = pFrm->GetTxtNode()->GetSwAttrSet().GetWidows().GetValue();
+            nWidLines = pFrm->GetTextNode()->GetSwAttrSet().GetWidows().GetValue();
     }
     else
     {
-        const SwAttrSet& rSet = pFrm->GetTxtNode()->GetSwAttrSet();
+        const SwAttrSet& rSet = pFrm->GetTextNode()->GetSwAttrSet();
         const SvxOrphansItem  &rOrph = rSet.GetOrphans();
         if ( rOrph.GetValue() > 1 )
             nOrphLines = rOrph.GetValue();
@@ -273,14 +273,14 @@ WidowsAndOrphans::WidowsAndOrphans( SwTxtFrm *pNewFrm, const SwTwips nRst,
             }
         }
 
-        if( pFrm->IsInFtn() && !pFrm->GetIndPrev() )
+        if( pFrm->IsInFootnote() && !pFrm->GetIndPrev() )
         {
             // Inside of footnotes there are good reasons to turn off the Keep attribute
             // as well as Widows/Orphans.
-            SwFtnFrm *pFtn = pFrm->FindFtnFrm();
-            const bool bFt = !pFtn->GetAttr()->GetFtn().IsEndNote();
-            if( !pFtn->GetPrev() &&
-                pFtn->FindFtnBossFrm( bFt ) != pFtn->GetRef()->FindFtnBossFrm( bFt )
+            SwFootnoteFrm *pFootnote = pFrm->FindFootnoteFrm();
+            const bool bFt = !pFootnote->GetAttr()->GetFootnote().IsEndNote();
+            if( !pFootnote->GetPrev() &&
+                pFootnote->FindFootnoteBossFrm( bFt ) != pFootnote->GetRef()->FindFootnoteBossFrm( bFt )
                 && ( !pFrm->IsInSct() || pFrm->FindSctFrm()->MoveAllowed(pFrm) ) )
             {
                 bResetFlags = true;
@@ -299,11 +299,11 @@ WidowsAndOrphans::WidowsAndOrphans( SwTxtFrm *pNewFrm, const SwTwips nRst,
 }
 
 /**
- * The Find*-Methodes do not only search, but adjust the SwTxtMargin to the
+ * The Find*-Methodes do not only search, but adjust the SwTextMargin to the
  * line where the paragraph should have a break and truncate the paragraph there.
  * FindBreak()
  */
-bool WidowsAndOrphans::FindBreak( SwTxtFrm *pFrame, SwTxtMargin &rLine,
+bool WidowsAndOrphans::FindBreak( SwTextFrm *pFrame, SwTextMargin &rLine,
     bool bHasToFit )
 {
     // OD 2004-02-25 #i16128# - Why member <pFrm> _*and*_ parameter <pFrame>??
@@ -351,12 +351,12 @@ bool WidowsAndOrphans::FindBreak( SwTxtFrm *pFrame, SwTxtMargin &rLine,
 }
 
 /**
- * FindWidows positions the SwTxtMargin of the Master to the line where to
+ * FindWidows positions the SwTextMargin of the Master to the line where to
  * break by examining and formatting the Follow.
  * Returns true if the Widows-rule matches, that means that the
  * paragraph should not be split (keep) !
  */
-bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin &rLine )
+bool WidowsAndOrphans::FindWidows( SwTextFrm *pFrame, SwTextMargin &rLine )
 {
     OSL_ENSURE( ! pFrame->IsVertical() || ! pFrame->IsSwapped(),
             "WidowsAndOrphans::FindWidows with swapped frame" );
@@ -367,7 +367,7 @@ bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin &rLine )
     rLine.Bottom();
 
     // We can still cut something off
-    SwTxtFrm *pMaster = pFrame->FindMaster();
+    SwTextFrm *pMaster = pFrame->FindMaster();
     OSL_ENSURE(pMaster, "+WidowsAndOrphans::FindWidows: Widows in a master?");
     if( !pMaster )
         return false;
@@ -480,7 +480,7 @@ bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin &rLine )
     return true;
 }
 
-bool WidowsAndOrphans::WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight, bool bTst )
+bool WidowsAndOrphans::WouldFit( SwTextMargin &rLine, SwTwips &rMaxHeight, bool bTst )
 {
     // Here it does not matter, if pFrm is swapped or not.
     // IsInside() takes care of itself
@@ -516,7 +516,7 @@ bool WidowsAndOrphans::WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight, bool b
         // because we are just in the middle of calculating the break.
         // In Ctor of WidowsAndOrphans the nWidLines are only calced for
         // Follows from the AttrSet - so we catch up now:
-        const SwAttrSet& rSet = pFrm->GetTxtNode()->GetSwAttrSet();
+        const SwAttrSet& rSet = pFrm->GetTextNode()->GetSwAttrSet();
         nWidLines = rSet.GetWidows().GetValue();
     }
 
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 117c6886c388..3d8ee94e9af0 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -18,23 +18,23 @@
  */
 #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_WIDORP_HXX
 #define INCLUDED_SW_SOURCE_CORE_TEXT_WIDORP_HXX
-class SwTxtFrm;
+class SwTextFrm;
 
 #include "swtypes.hxx"
 #include "itrtxt.hxx"
 
-class SwTxtFrmBreak
+class SwTextFrmBreak
 {
 private:
     SwTwips  nRstHeight;
     SwTwips  nOrigin;
 protected:
-    SwTxtFrm *pFrm;
+    SwTextFrm *pFrm;
     bool     bBreak;
     bool     bKeep;
 public:
-    SwTxtFrmBreak( SwTxtFrm *pFrm, const SwTwips nRst = 0  );
-    bool IsBreakNow( SwTxtMargin &rLine );
+    SwTextFrmBreak( SwTextFrm *pFrm, const SwTwips nRst = 0  );
+    bool IsBreakNow( SwTextMargin &rLine );
 
     bool IsBroken() const     { return bBreak; }
     bool IsKeepAlways() const { return bKeep; }
@@ -44,38 +44,38 @@ public:
     inline bool GetKeep() const { return bKeep; }
     inline void SetKeep( const bool bNew ) { bKeep = bNew; }
 
-    bool IsInside( SwTxtMargin &rLine ) const;
+    bool IsInside( SwTextMargin &rLine ) const;
 
-    // In order to be able to handle special cases with Ftn.
-    // SetRstHeight sets the rest height for SwTxtFrmBreak. This is needed
+    // In order to be able to handle special cases with Footnote.
+    // SetRstHeight sets the rest height for SwTextFrmBreak. This is needed
     // to call TruncLines() without IsBreakNow() returning another value.
     // We assume that rLine is pointing to the last non-fitting line.
 
     // OD 2004-02-27 #106629# - no longer inline
-    void SetRstHeight( const SwTxtMargin &rLine );
+    void SetRstHeight( const SwTextMargin &rLine );
     SwTwips GetRstHeight() const { return nRstHeight; }
 };
 
-class WidowsAndOrphans : public SwTxtFrmBreak
+class WidowsAndOrphans : public SwTextFrmBreak
 {
 private:
     sal_uInt16   nWidLines, nOrphLines;
 
 public:
-    WidowsAndOrphans( SwTxtFrm *pFrm, const SwTwips nRst = 0,
+    WidowsAndOrphans( SwTextFrm *pFrm, const SwTwips nRst = 0,
         bool bCheckKeep = true );
-    bool FindWidows( SwTxtFrm *pFrm, SwTxtMargin &rLine );
+    bool FindWidows( SwTextFrm *pFrm, SwTextMargin &rLine );
     sal_uInt16 GetWidowsLines() const
     { return nWidLines; }
     sal_uInt16 GetOrphansLines() const
     { return nOrphLines; }
     void ClrOrphLines(){ nOrphLines = 0; }
 
-    bool FindBreak( SwTxtFrm *pFrm, SwTxtMargin &rLine, bool bHasToFit );
-    bool WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight, bool bTest );
+    bool FindBreak( SwTextFrm *pFrm, SwTextMargin &rLine, bool bHasToFit );
+    bool WouldFit( SwTextMargin &rLine, SwTwips &rMaxHeight, bool bTest );
     // OD 2004-02-25 #i16128# - rename method to avoid confusion with base class
-    // method <SwTxtFrmBreak::IsBreakNow>, which isn't virtual.
-    bool IsBreakNowWidAndOrp( SwTxtMargin &rLine )
+    // method <SwTextFrmBreak::IsBreakNow>, which isn't virtual.
+    bool IsBreakNowWidAndOrp( SwTextMargin &rLine )
     {
         return ( rLine.GetLineNr() > nOrphLines ) && IsBreakNow( rLine );
     }
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index aab4a3badde7..951b415ff565 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -324,20 +324,20 @@ void SwFrm::dumpAsXml( xmlTextWriterPtr writer ) const
         }
 
         // Dump the children
-        if ( IsTxtFrm(  ) )
+        if ( IsTextFrm(  ) )
         {
-            const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm *>(this);
-            OUString aTxt = pTxtFrm->GetTxt(  );
+            const SwTextFrm *pTextFrm = static_cast<const SwTextFrm *>(this);
+            OUString aText = pTextFrm->GetText(  );
             for ( int i = 0; i < 32; i++ )
             {
-                aTxt = aTxt.replace( i, '*' );
+                aText = aText.replace( i, '*' );
             }
-            OString aTxt8 =OUStringToOString( aTxt,
+            OString aText8 =OUStringToOString( aText,
                                                           RTL_TEXTENCODING_UTF8 );
             xmlTextWriterWriteString( writer,
-                                      reinterpret_cast<const xmlChar *>(aTxt8.getStr(  )) );
+                                      reinterpret_cast<const xmlChar *>(aText8.getStr(  )) );
             XmlPortionDumper pdumper( writer );
-            pTxtFrm->VisitPortions( pdumper );
+            pTextFrm->VisitPortions( pdumper );
 
         }
         else
@@ -379,18 +379,18 @@ void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const
         xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "upper" ), "%" SAL_PRIuUINT32, GetUpper()->GetFrmId() );
     if ( GetLower( ) )
         xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "lower" ), "%" SAL_PRIuUINT32, GetLower()->GetFrmId() );
-    if ( IsTxtFrm(  ) )
+    if ( IsTextFrm(  ) )
     {
-        const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm *>(this);
-        const SwTxtNode *pTxtNode = pTxtFrm->GetTxtNode();
-        xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "txtNodeIndex" ), TMP_FORMAT, pTxtNode->GetIndex() );
+        const SwTextFrm *pTextFrm = static_cast<const SwTextFrm *>(this);
+        const SwTextNode *pTextNode = pTextFrm->GetTextNode();
+        xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "txtNodeIndex" ), TMP_FORMAT, pTextNode->GetIndex() );
     }
     if (IsHeaderFrm() || IsFooterFrm())
     {
         const SwHeadFootFrm *pHeadFootFrm = static_cast<const SwHeadFootFrm*>(this);
-        OUString aFmtName = pHeadFootFrm->GetFmt()->GetName();
-        xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), "%s", BAD_CAST(OUStringToOString(aFmtName, RTL_TEXTENCODING_UTF8).getStr()));
-        xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtPtr" ), "%p", pHeadFootFrm->GetFmt());
+        OUString aFormatName = pHeadFootFrm->GetFormat()->GetName();
+        xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), "%s", BAD_CAST(OUStringToOString(aFormatName, RTL_TEXTENCODING_UTF8).getStr()));
+        xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtPtr" ), "%p", pHeadFootFrm->GetFormat());
     }
 }
 
@@ -433,14 +433,14 @@ void SwFont::dumpAsXml(xmlTextWriterPtr writer) const
     xmlTextWriterEndElement(writer);
 }
 
-void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const
+void SwTextFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const
 {
     SwFrm::dumpAsXmlAttributes( writer );
     if ( HasFollow() )
         xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%" SAL_PRIuUINT32, GetFollow()->GetFrmId() );
 
     if (m_pPrecede != NULL)
-        xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%" SAL_PRIuUINT32, static_cast<SwTxtFrm*>(m_pPrecede)->GetFrmId() );
+        xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%" SAL_PRIuUINT32, static_cast<SwTextFrm*>(m_pPrecede)->GetFrmId() );
 }
 
 void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const
diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx b/sw/source/core/tox/ToxLinkProcessor.cxx
index 30b0cbfa1cfb..bd2d6f8937e7 100644
--- a/sw/source/core/tox/ToxLinkProcessor.cxx
+++ b/sw/source/core/tox/ToxLinkProcessor.cxx
@@ -42,8 +42,8 @@ ToxLinkProcessor::CloseLink(sal_Int32 endPosition, const OUString& url)
 
     const OUString& characterStyle = startedLink.mCharacterStyle;
     sal_uInt16 poolId = ObtainPoolId(characterStyle);
-    closedLink->mINetFmt.SetVisitedFmtAndId(characterStyle, poolId);
-    closedLink->mINetFmt.SetINetFmtAndId(characterStyle, poolId);
+    closedLink->mINetFormat.SetVisitedFormatAndId(characterStyle, poolId);
+    closedLink->mINetFormat.SetINetFormatAndId(characterStyle, poolId);
 
     mClosedLinks.push_back(closedLink);
 }
@@ -61,10 +61,10 @@ ToxLinkProcessor::ObtainPoolId(const OUString& characterStyle) const
 
 
 void
-ToxLinkProcessor::InsertLinkAttributes(SwTxtNode& node)
+ToxLinkProcessor::InsertLinkAttributes(SwTextNode& node)
 {
     for (ClosedLink& clink : mClosedLinks) {
-        node.InsertItem(clink.mINetFmt, clink.mStartTextPos, clink.mEndTextPos);
+        node.InsertItem(clink.mINetFormat, clink.mStartTextPos, clink.mEndTextPos);
     }
 }
 
diff --git a/sw/source/core/tox/ToxTabStopTokenHandler.cxx b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
index 67fd69bc66aa..fbcc176690f5 100644
--- a/sw/source/core/tox/ToxTabStopTokenHandler.cxx
+++ b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
@@ -38,7 +38,7 @@ DefaultToxTabStopTokenHandler::DefaultToxTabStopTokenHandler(sal_uInt32 indexOfS
 
 ToxTabStopTokenHandler::HandledTabStopToken
 DefaultToxTabStopTokenHandler::HandleTabStopToken(
-        const SwFormToken& aToken, const SwTxtNode& targetNode, const SwRootFrm *currentLayout) const
+        const SwFormToken& aToken, const SwTextNode& targetNode, const SwRootFrm *currentLayout) const
 {
     HandledTabStopToken result;
 
@@ -48,11 +48,11 @@ DefaultToxTabStopTokenHandler::HandleTabStopToken(
 
     // check whether a tab adjustment has been specified.
     if (SVX_TAB_ADJUST_END > aToken.eTabAlign) {
-        const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>( targetNode.SwCntntNode::GetAttr(RES_LR_SPACE, true) );
+        const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>( targetNode.SwContentNode::GetAttr(RES_LR_SPACE, true) );
 
         long nTabPosition = aToken.nTabStopPosition;
-        if (!mTabPositionIsRelativeToParagraphIndent && rLR.GetTxtLeft()) {
-            nTabPosition -= rLR.GetTxtLeft();
+        if (!mTabPositionIsRelativeToParagraphIndent && rLR.GetTextLeft()) {
+            nTabPosition -= rLR.GetTextLeft();
         }
         result.tabStop = SvxTabStop(nTabPosition, aToken.eTabAlign, cDfltDecimalChar, aToken.cTabFillChar);
         return result;
@@ -71,9 +71,9 @@ DefaultToxTabStopTokenHandler::HandleTabStopToken(
     //#i24363# tab stops relative to indent
     if (mTabStopReferencePolicy == TABSTOPS_RELATIVE_TO_INDENT) {
         // left margin of paragraph style
-        const SvxLRSpaceItem& rLRSpace = targetNode.GetTxtColl()->GetLRSpace();
+        const SvxLRSpaceItem& rLRSpace = targetNode.GetTextColl()->GetLRSpace();
         nRightMargin -= rLRSpace.GetLeft();
-        nRightMargin -= rLRSpace.GetTxtFirstLineOfst();
+        nRightMargin -= rLRSpace.GetTextFirstLineOfst();
     }
 
     result.tabStop = SvxTabStop(nRightMargin, SVX_TAB_ADJUST_RIGHT, cDfltDecimalChar, aToken.cTabFillChar);
@@ -81,7 +81,7 @@ DefaultToxTabStopTokenHandler::HandleTabStopToken(
 }
 
 long
-DefaultToxTabStopTokenHandler::CalculatePageMarginFromPageDescription(const SwTxtNode& targetNode) const
+DefaultToxTabStopTokenHandler::CalculatePageMarginFromPageDescription(const SwTextNode& targetNode) const
 {
     size_t nPgDescNdIdx = targetNode.GetIndex() + 1;
     const SwPageDesc *pPageDesc = targetNode.FindPageDesc(false, &nPgDescNdIdx);
@@ -90,18 +90,18 @@ DefaultToxTabStopTokenHandler::CalculatePageMarginFromPageDescription(const SwTx
         // table-of-content section.
         pPageDesc = &mDefaultPageDescription;
     }
-    const SwFrmFmt& rPgDscFmt = pPageDesc->GetMaster();
-    long result = rPgDscFmt.GetFrmSize().GetWidth() - rPgDscFmt.GetLRSpace().GetLeft()
-            - rPgDscFmt.GetLRSpace().GetRight();
+    const SwFrameFormat& rPgDscFormat = pPageDesc->GetMaster();
+    long result = rPgDscFormat.GetFrmSize().GetWidth() - rPgDscFormat.GetLRSpace().GetLeft()
+            - rPgDscFormat.GetLRSpace().GetRight();
     return result;
 }
 
 
 /*static*/ bool
-DefaultToxTabStopTokenHandler::CanUseLayoutRectangle(const SwTxtNode& targetNode, const SwRootFrm *currentLayout)
+DefaultToxTabStopTokenHandler::CanUseLayoutRectangle(const SwTextNode& targetNode, const SwRootFrm *currentLayout)
 {
     const SwPageDesc* pageDescription =
-            static_cast<const SwFmtPageDesc&>( targetNode.SwCntntNode::GetAttr(RES_PAGEDESC)).GetPageDesc();
+            static_cast<const SwFormatPageDesc&>( targetNode.SwContentNode::GetAttr(RES_PAGEDESC)).GetPageDesc();
 
     if (!pageDescription) {
         return false;
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index 246ec5a70604..11eab33dc5d8 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -69,11 +69,11 @@ ToxTextGenerator::GetNumStringOfFirstNode( const SwTOXSortTabBase& rBase, bool b
     }
 
     OUString sRet;
-    if (rBase.pTxtMark) { // only if it's not a Mark
+    if (rBase.pTextMark) { // only if it's not a Mark
         return sRet;
     }
 
-    const SwTxtNode* pNd = rBase.aTOXSources[0].pNd->GetTxtNode();
+    const SwTextNode* pNd = rBase.aTOXSources[0].pNd->GetTextNode();
     if (!pNd) {
         return sRet;
     }
@@ -110,13 +110,13 @@ ToxTextGenerator::HandleChapterToken(const SwTOXSortTabBase& rBase, const SwForm
     }
 
     // A bit tricky: Find a random Frame
-    const SwCntntNode* contentNode = rBase.aTOXSources.at(0).pNd->GetCntntNode();
+    const SwContentNode* contentNode = rBase.aTOXSources.at(0).pNd->GetContentNode();
     if (!contentNode) {
         return OUString();
     }
 
     // #i53420#
-    const SwCntntFrm* contentFrame = contentNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout());
+    const SwContentFrm* contentFrame = contentNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout());
     if (!contentFrame) {
         return OUString();
     }
@@ -125,26 +125,26 @@ ToxTextGenerator::HandleChapterToken(const SwTOXSortTabBase& rBase, const SwForm
 }
 
 OUString
-ToxTextGenerator::GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwCntntFrm* contentFrame,
-        const SwCntntNode *contentNode) const
+ToxTextGenerator::GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrm* contentFrame,
+        const SwContentNode *contentNode) const
 {
     OUString retval;
 
     SwChapterFieldType chapterFieldType;
-    SwChapterField aFld = ObtainChapterField(&chapterFieldType, &chapterToken, contentFrame, contentNode);
+    SwChapterField aField = ObtainChapterField(&chapterFieldType, &chapterToken, contentFrame, contentNode);
 
     //---> #i89791#
     // continue to support CF_NUMBER and CF_NUM_TITLE in order to handle ODF 1.0/1.1 written by OOo 3.x
     // in the same way as OOo 2.x would handle them.
     if (CF_NUM_NOPREPST_TITLE == chapterToken.nChapterFormat || CF_NUMBER == chapterToken.nChapterFormat) {
-        retval += aFld.GetNumber(); // get the string number without pre/postfix
+        retval += aField.GetNumber(); // get the string number without pre/postfix
     }
     else if (CF_NUMBER_NOPREPST == chapterToken.nChapterFormat || CF_NUM_TITLE == chapterToken.nChapterFormat) {
-        retval += aFld.GetNumber();
+        retval += aField.GetNumber();
         retval += " ";
-        retval += aFld.GetTitle();
+        retval += aField.GetTitle();
     } else if (CF_TITLE == chapterToken.nChapterFormat) {
-        retval += aFld.GetTitle();
+        retval += aField.GetTitle();
     }
     return retval;
 }
@@ -156,14 +156,14 @@ ToxTextGenerator::GenerateText(SwDoc* pDoc, const std::vector<SwTOXSortTabBase*>
         sal_uInt16 indexOfEntryToProcess, sal_uInt16 numberOfEntriesToProcess)
 {
     // pTOXNd is only set at the first mark
-    SwTxtNode* pTOXNd = const_cast<SwTxtNode*>(entries.at(indexOfEntryToProcess)->pTOXNd);
+    SwTextNode* pTOXNd = const_cast<SwTextNode*>(entries.at(indexOfEntryToProcess)->pTOXNd);
     // FIXME this operates directly on the node text
-    OUString & rTxt = const_cast<OUString&>(pTOXNd->GetTxt());
-    rTxt.clear();
+    OUString & rText = const_cast<OUString&>(pTOXNd->GetText());
+    rText.clear();
     for(sal_uInt16 nIndex = indexOfEntryToProcess; nIndex < indexOfEntryToProcess + numberOfEntriesToProcess; nIndex++)
     {
         if(nIndex > indexOfEntryToProcess)
-            rTxt += ", "; // comma separation
+            rText += ", "; // comma separation
         // Initialize String with the Pattern from the form
         const SwTOXSortTabBase& rBase = *entries.at(nIndex);
         sal_uInt16 nLvl = rBase.GetLevel();
@@ -178,12 +178,12 @@ ToxTextGenerator::GenerateText(SwDoc* pDoc, const std::vector<SwTOXSortTabBase*>
         while(aIt != aPattern.end()) // #i21237#
         {
             SwFormToken aToken = *aIt; // #i21237#
-            sal_Int32 nStartCharStyle = rTxt.getLength();
+            sal_Int32 nStartCharStyle = rText.getLength();
             switch( aToken.eTokenType )
             {
             case TOKEN_ENTRY_NO:
                 // for TOC numbering
-                rTxt += GetNumStringOfFirstNode( rBase, aToken.nChapterFormat == CF_NUMBER, static_cast<sal_uInt8>(aToken.nOutlineLevel - 1) ) ;
+                rText += GetNumStringOfFirstNode( rBase, aToken.nChapterFormat == CF_NUMBER, static_cast<sal_uInt8>(aToken.nOutlineLevel - 1) ) ;
                 break;
 
             case TOKEN_ENTRY_TEXT: {
@@ -195,9 +195,9 @@ ToxTextGenerator::GenerateText(SwDoc* pDoc, const std::vector<SwTOXSortTabBase*>
             case TOKEN_ENTRY:
                 {
                     // for TOC numbering
-                    rTxt += GetNumStringOfFirstNode( rBase, true, MAXLEVEL );
-                    SwIndex aIdx( pTOXNd, rTxt.getLength() );
-                    ToxWhitespaceStripper stripper(rBase.GetTxt().sText);
+                    rText += GetNumStringOfFirstNode( rBase, true, MAXLEVEL );
+                    SwIndex aIdx( pTOXNd, rText.getLength() );
+                    ToxWhitespaceStripper stripper(rBase.GetText().sText);
                     pTOXNd->InsertText(stripper.GetStrippedString(), aIdx);
                 }
                 break;
@@ -205,35 +205,35 @@ ToxTextGenerator::GenerateText(SwDoc* pDoc, const std::vector<SwTOXSortTabBase*>
             case TOKEN_TAB_STOP: {
                 ToxTabStopTokenHandler::HandledTabStopToken htst =
                         mTabStopTokenHandler->HandleTabStopToken(aToken, *pTOXNd, pDoc->getIDocumentLayoutAccess().GetCurrentLayout());
-                rTxt += htst.text;
+                rText += htst.text;
                 aTStops.Insert(htst.tabStop);
                 break;
             }
 
             case TOKEN_TEXT:
-                rTxt += aToken.sText;
+                rText += aToken.sText;
                 break;
 
             case TOKEN_PAGE_NUMS:
-                rTxt += ConstructPageNumberPlaceholder(rBase.aTOXSources.size());
+                rText += ConstructPageNumberPlaceholder(rBase.aTOXSources.size());
                 break;
 
             case TOKEN_CHAPTER_INFO:
-                rTxt += HandleChapterToken(rBase, aToken, pDoc);
+                rText += HandleChapterToken(rBase, aToken, pDoc);
                 break;
 
             case TOKEN_LINK_START:
-                mLinkProcessor->StartNewLink(rTxt.getLength(), aToken.sCharStyleName);
+                mLinkProcessor->StartNewLink(rText.getLength(), aToken.sCharStyleName);
                 break;
 
             case TOKEN_LINK_END:
-                mLinkProcessor->CloseLink(rTxt.getLength(), rBase.GetURL());
+                mLinkProcessor->CloseLink(rText.getLength(), rBase.GetURL());
                 break;
 
             case TOKEN_AUTHORITY:
                 {
                     ToxAuthorityField eField = (ToxAuthorityField)aToken.nAuthorityField;
-                    SwIndex aIdx( pTOXNd, rTxt.getLength() );
+                    SwIndex aIdx( pTOXNd, rText.getLength() );
                     rBase.FillText( *pTOXNd, aIdx, static_cast<sal_uInt16>(eField) );
                 }
                 break;
@@ -242,17 +242,17 @@ ToxTextGenerator::GenerateText(SwDoc* pDoc, const std::vector<SwTOXSortTabBase*>
 
             if ( !aToken.sCharStyleName.isEmpty() )
             {
-                SwCharFmt* pCharFmt;
+                SwCharFormat* pCharFormat;
                 if( USHRT_MAX != aToken.nPoolId )
-                    pCharFmt = pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( aToken.nPoolId );
+                    pCharFormat = pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( aToken.nPoolId );
                 else
-                    pCharFmt = pDoc->FindCharFmtByName( aToken.sCharStyleName);
+                    pCharFormat = pDoc->FindCharFormatByName( aToken.sCharStyleName);
 
-                if (pCharFmt)
+                if (pCharFormat)
                 {
-                    SwFmtCharFmt aFmt( pCharFmt );
-                    pTOXNd->InsertItem( aFmt, nStartCharStyle,
-                        rTxt.getLength(), SetAttrMode::DONTEXPAND );
+                    SwFormatCharFormat aFormat( pCharFormat );
+                    pTOXNd->InsertItem( aFormat, nStartCharStyle,
+                        rText.getLength(), SetAttrMode::DONTEXPAND );
                 }
             }
 
@@ -265,13 +265,13 @@ ToxTextGenerator::GenerateText(SwDoc* pDoc, const std::vector<SwTOXSortTabBase*>
 }
 
 /*static*/ std::shared_ptr<SfxItemSet>
-ToxTextGenerator::CollectAttributesForTox(const SwTxtAttr& hint, SwAttrPool& pool)
+ToxTextGenerator::CollectAttributesForTox(const SwTextAttr& hint, SwAttrPool& pool)
 {
     std::shared_ptr<SfxItemSet> retval(new SfxItemSet(pool));
     if (hint.Which() != RES_TXTATR_AUTOFMT) {
         return retval;
     }
-    const SwFmtAutoFmt& afmt = hint.GetAutoFmt();
+    const SwFormatAutoFormat& afmt = hint.GetAutoFormat();
     SfxItemIter aIter( *afmt.GetStyleHandle());
     const SfxPoolItem* pItem = aIter.GetCurItem();
     while (true) {
@@ -294,21 +294,21 @@ ToxTextGenerator::HandledTextToken
 ToxTextGenerator::HandleTextToken(const SwTOXSortTabBase& source, SwAttrPool& pool)
 {
     HandledTextToken result;
-    ToxWhitespaceStripper stripper(source.GetTxt().sText);
+    ToxWhitespaceStripper stripper(source.GetText().sText);
     result.text = stripper.GetStrippedString();
 
-    const SwTxtNode* pSrc = source.aTOXSources.at(0).pNd->GetTxtNode();
+    const SwTextNode* pSrc = source.aTOXSources.at(0).pNd->GetTextNode();
     if (!pSrc->HasHints()) {
         return result;
     }
     const SwpHints& hints = pSrc->GetSwpHints();
     for (size_t i = 0; i < hints.Count(); ++i) {
-        const SwTxtAttr* hint = hints[i];
+        const SwTextAttr* hint = hints[i];
         std::shared_ptr<SfxItemSet> attributesToClone = CollectAttributesForTox(*hint, pool);
         if (attributesToClone->Count() <= 0) {
             continue;
         }
-        SwFmtAutoFmt* clone = static_cast<SwFmtAutoFmt*>(hint->GetAutoFmt().Clone());
+        SwFormatAutoFormat* clone = static_cast<SwFormatAutoFormat*>(hint->GetAutoFormat().Clone());
         clone->SetStyleHandle(attributesToClone);
 
         result.autoFormats.push_back(clone);
@@ -319,9 +319,9 @@ ToxTextGenerator::HandleTextToken(const SwTOXSortTabBase& source, SwAttrPool& po
 }
 
 /*static*/ void
-ToxTextGenerator::ApplyHandledTextToken(const HandledTextToken& htt, SwTxtNode& targetNode)
+ToxTextGenerator::ApplyHandledTextToken(const HandledTextToken& htt, SwTextNode& targetNode)
 {
-    sal_Int32 offset = targetNode.GetTxt().getLength();
+    sal_Int32 offset = targetNode.GetText().getLength();
     SwIndex aIdx(&targetNode, offset);
     targetNode.InsertText(htt.text, aIdx);
     for (size_t i=0; i < htt.autoFormats.size(); ++i) {
@@ -350,8 +350,8 @@ ToxTextGenerator::ConstructPageNumberPlaceholder(size_t numberOfToxSources)
 
 /*virtual*/ SwChapterField
 ToxTextGenerator::ObtainChapterField(SwChapterFieldType* chapterFieldType,
-        const SwFormToken* chapterToken, const SwCntntFrm* contentFrame,
-        const SwCntntNode* contentNode) const
+        const SwFormToken* chapterToken, const SwContentFrm* contentFrame,
+        const SwContentNode* contentNode) const
 {
     assert(chapterToken);
     assert(chapterToken->nOutlineLevel >= 1);
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 14417ca08b4c..3ba10e149c04 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -98,7 +98,7 @@ SwTOXMark::SwTOXMark()
     : SfxPoolItem( RES_TXTATR_TOXMARK )
     , SwModify( 0 )
     ,
-    pTxtAttr( 0 ), nLevel( 0 ),
+    pTextAttr( 0 ), nLevel( 0 ),
     bAutoGenerated(false),
     bMainEntry(false)
 {
@@ -108,7 +108,7 @@ SwTOXMark::SwTOXMark( const SwTOXType* pTyp )
     : SfxPoolItem( RES_TXTATR_TOXMARK )
     , SwModify( const_cast<SwTOXType*>(pTyp) )
     ,
-    pTxtAttr( 0 ), nLevel( 0 ),
+    pTextAttr( 0 ), nLevel( 0 ),
     bAutoGenerated(false),
     bMainEntry(false)
 {
@@ -122,7 +122,7 @@ SwTOXMark::SwTOXMark( const SwTOXMark& rCopy )
     aTextReading( rCopy.aTextReading ),
     aPrimaryKeyReading( rCopy.aPrimaryKeyReading ),
     aSecondaryKeyReading( rCopy.aSecondaryKeyReading ),
-    pTxtAttr( 0 ), nLevel( rCopy.nLevel ),
+    pTextAttr( 0 ), nLevel( rCopy.nLevel ),
     bAutoGenerated( rCopy.bAutoGenerated),
     bMainEntry(rCopy.bMainEntry)
 {
@@ -172,14 +172,14 @@ OUString SwTOXMark::GetText() const
     if( !aAltText.isEmpty() )
         return aAltText;
 
-    if( pTxtAttr && pTxtAttr->GetpTxtNd() )
+    if( pTextAttr && pTextAttr->GetpTextNd() )
     {
-        const sal_Int32* pEndIdx = pTxtAttr->GetEnd();
+        const sal_Int32* pEndIdx = pTextAttr->GetEnd();
         OSL_ENSURE( pEndIdx, "TOXMark without mark!");
         if( pEndIdx )
         {
-            const sal_Int32 nStt = pTxtAttr->GetStart();
-            return pTxtAttr->GetpTxtNd()->GetExpandTxt( nStt, *pEndIdx-nStt );
+            const sal_Int32 nStt = pTextAttr->GetStart();
+            return pTextAttr->GetpTextNd()->GetExpandText( nStt, *pEndIdx-nStt );
         }
     }
 
@@ -192,7 +192,7 @@ void SwTOXMark::InsertTOXMarks( SwTOXMarks& aMarks, const SwTOXType& rType )
     SwTOXMark* pMark = aIter.First();
     while( pMark )
     {
-        if(pMark->GetTxtTOXMark())
+        if(pMark->GetTextTOXMark())
             aMarks.push_back(pMark);
         pMark = aIter.Next();
     }
@@ -369,7 +369,7 @@ void SwForm::AdjustTabStops( SwDoc& rDoc ) // #i21237#
     const sal_uInt16 nFormMax = GetFormMax();
     for ( sal_uInt16 nLevel = 1; nLevel < nFormMax; ++nLevel )
     {
-        SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName( GetTemplate(nLevel) );
+        SwTextFormatColl* pColl = rDoc.FindTextFormatCollByName( GetTemplate(nLevel) );
         if( pColl == NULL )
         {
             // Paragraph Style for this level has not been created.
@@ -421,7 +421,7 @@ OUString SwForm::GetFormPageNums()    {return OUString("<#>");}
 OUString SwForm::GetFormLinkStt()     {return OUString("<LS>");}
 OUString SwForm::GetFormLinkEnd()     {return OUString("<LE>");}
 OUString SwForm::GetFormEntryNum()    {return OUString("<E#>");}
-OUString SwForm::GetFormEntryTxt()    {return OUString("<ET>");}
+OUString SwForm::GetFormEntryText()    {return OUString("<ET>");}
 OUString SwForm::GetFormChapterMark() {return OUString("<C>");}
 OUString SwForm::GetFormText()        {return OUString("<X>");}
 OUString SwForm::GetFormAuth()        {return OUString("<A>");}
@@ -571,7 +571,7 @@ OUString SwFormToken::GetString() const
             sToken = SwForm::GetFormEntryNum();
         break;
         case TOKEN_ENTRY_TEXT:
-            sToken = SwForm::GetFormEntryTxt();
+            sToken = SwForm::GetFormEntryText();
         break;
         case TOKEN_ENTRY:
             sToken = SwForm::GetFormEntry();
@@ -673,7 +673,7 @@ static FormTokenType lcl_GetTokenType(const OUString & sToken,
         { SwForm::GetFormLinkStt(),     1, TOKEN_LINK_START },
         { SwForm::GetFormLinkEnd(),     1, TOKEN_LINK_END },
         { SwForm::GetFormEntryNum(),    1, TOKEN_ENTRY_NO },
-        { SwForm::GetFormEntryTxt(),    1, TOKEN_ENTRY_TEXT },
+        { SwForm::GetFormEntryText(),    1, TOKEN_ENTRY_TEXT },
         { SwForm::GetFormChapterMark(), 1, TOKEN_CHAPTER_INFO },
         { SwForm::GetFormText(),        1, TOKEN_TEXT },
         { SwForm::GetFormEntry(),       1, TOKEN_ENTRY },
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 26aeb734c1c1..9bb56ead2954 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -42,13 +42,13 @@ IndexEntrySupplierWrapper::~IndexEntrySupplierWrapper()
 {
 }
 
-OUString IndexEntrySupplierWrapper::GetIndexKey( const OUString& rTxt,
-                                                 const OUString& rTxtReading,
+OUString IndexEntrySupplierWrapper::GetIndexKey( const OUString& rText,
+                                                 const OUString& rTextReading,
                                                  const ::com::sun::star::lang::Locale& rLocale ) const
 {
     OUString sRet;
     try {
-        sRet = xIES->getIndexKey( rTxt, rTxtReading, rLocale );
+        sRet = xIES->getIndexKey( rText, rTextReading, rLocale );
     }
     catch (const uno::Exception& e)
     {
@@ -101,15 +101,15 @@ bool IndexEntrySupplierWrapper::LoadAlgorithm(
 }
 
 sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
-            const OUString& rTxt1, const OUString& rTxtReading1,
+            const OUString& rText1, const OUString& rTextReading1,
             const ::com::sun::star::lang::Locale& rLocale1,
-            const OUString& rTxt2, const OUString& rTxtReading2,
+            const OUString& rText2, const OUString& rTextReading2,
             const ::com::sun::star::lang::Locale& rLocale2 ) const
 {
     sal_Int16 nRet = 0;
     try {
-        nRet = xIES->compareIndexEntry( rTxt1, rTxtReading1, rLocale1,
-                                        rTxt2, rTxtReading2, rLocale2 );
+        nRet = xIES->compareIndexEntry( rText1, rTextReading1, rLocale1,
+                                        rText2, rTextReading2, rLocale2 );
     }
     catch (const uno::Exception& e)
     {
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index c64afc1cd1ea..3916a6c8d4b9 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -127,12 +127,12 @@ OUString SwTOXInternational::GetFollowingText( bool bMorePages ) const
 }
 
 // SortElement for TOX entries
-SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
-                                    const SwTxtTOXMark* pMark,
+SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwContentNode* pNd,
+                                    const SwTextTOXMark* pMark,
                                     const SwTOXInternational* pInter,
                                     const lang::Locale* pLocale )
-    : pTOXNd( 0 ), pTxtMark( pMark ), pTOXIntl( pInter ),
-    nPos( 0 ), nCntPos( 0 ), nType( static_cast<sal_uInt16>(nTyp) ), bValidTxt( false )
+    : pTOXNd( 0 ), pTextMark( pMark ), pTOXIntl( pInter ),
+    nPos( 0 ), nCntPos( 0 ), nType( static_cast<sal_uInt16>(nTyp) ), bValidText( false )
 {
     if ( pLocale )
         aLocale = *pLocale;
@@ -140,9 +140,9 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
     if( pNd )
     {
         sal_Int32 n = 0;
-        if( pTxtMark )
-            n = pTxtMark->GetStart();
-        SwTOXSource aTmp( pNd, n, pTxtMark && pTxtMark->GetTOXMark().IsMainEntry() );
+        if( pTextMark )
+            n = pTextMark->GetStart();
+        SwTOXSource aTmp( pNd, n, pTextMark && pTextMark->GetTOXMark().IsMainEntry() );
         aTOXSources.push_back(aTmp);
 
         nPos = pNd->GetIndex();
@@ -158,12 +158,12 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
             {
                 // Then get the 'anchor' (body) position
                 Point aPt;
-                const SwCntntFrm* pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+                const SwContentFrm* pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
                 if( pFrm )
                 {
                     SwPosition aPos( *pNd );
                     const SwDoc& rDoc = *pNd->GetDoc();
-                    bool const bResult = GetBodyTxtNode( rDoc, aPos, *pFrm );
+                    bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrm );
                     OSL_ENSURE(bResult, "where is the text node");
                     (void) bResult; // unused in non-debug
                     nPos = aPos.nNode.GetIndex();
@@ -183,10 +183,10 @@ OUString SwTOXSortTabBase::GetURL() const
     return OUString();
 }
 
-void SwTOXSortTabBase::FillText( SwTxtNode& rNd, const SwIndex& rInsPos,
+void SwTOXSortTabBase::FillText( SwTextNode& rNd, const SwIndex& rInsPos,
                                     sal_uInt16 ) const
 {
-    rNd.InsertText( GetTxt().sText, rInsPos );
+    rNd.InsertText( GetText().sText, rInsPos );
 }
 
 bool SwTOXSortTabBase::operator==( const SwTOXSortTabBase& rCmp )
@@ -197,19 +197,19 @@ bool SwTOXSortTabBase::operator==( const SwTOXSortTabBase& rCmp )
 
     if( TOX_SORT_CONTENT == nType )
     {
-        bRet = bRet && pTxtMark && rCmp.pTxtMark &&
-                pTxtMark->GetStart() == rCmp.pTxtMark->GetStart();
+        bRet = bRet && pTextMark && rCmp.pTextMark &&
+                pTextMark->GetStart() == rCmp.pTextMark->GetStart();
 
         if( bRet )
         {
             // Both pointers exist -> compare text
             // else -> compare AlternativeText
-            const sal_Int32 *pEnd  = pTxtMark->End();
-            const sal_Int32 *pEndCmp = rCmp.pTxtMark->End();
+            const sal_Int32 *pEnd  = pTextMark->End();
+            const sal_Int32 *pEndCmp = rCmp.pTextMark->End();
 
             bRet = ( ( pEnd && pEndCmp ) || ( !pEnd && !pEndCmp ) ) &&
-                    pTOXIntl->IsEqual( GetTxt(), GetLocale(),
-                                       rCmp.GetTxt(), rCmp.GetLocale() );
+                    pTOXIntl->IsEqual( GetText(), GetLocale(),
+                                       rCmp.GetText(), rCmp.GetLocale() );
         }
     }
     return bRet;
@@ -232,40 +232,40 @@ bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
 
             if( pFirst && pFirst == pNext )
             {
-                if( TOX_SORT_CONTENT == nType && pTxtMark && rCmp.pTxtMark )
+                if( TOX_SORT_CONTENT == nType && pTextMark && rCmp.pTextMark )
                 {
-                    if( pTxtMark->GetStart() < rCmp.pTxtMark->GetStart() )
+                    if( pTextMark->GetStart() < rCmp.pTextMark->GetStart() )
                         return true;
 
-                    if( pTxtMark->GetStart() == rCmp.pTxtMark->GetStart() )
+                    if( pTextMark->GetStart() == rCmp.pTextMark->GetStart() )
                     {
-                        const sal_Int32 *pEnd = pTxtMark->End();
-                        const sal_Int32 *pEndCmp = rCmp.pTxtMark->End();
+                        const sal_Int32 *pEnd = pTextMark->End();
+                        const sal_Int32 *pEndCmp = rCmp.pTextMark->End();
 
                         // Both pointers exist -> compare text
                         // else -> compare AlternativeText
                         if( ( pEnd && pEndCmp ) || ( !pEnd && !pEndCmp ) )
                         {
-                            return pTOXIntl->IsLess( GetTxt(), GetLocale(),
-                                                      rCmp.GetTxt(), rCmp.GetLocale() );
+                            return pTOXIntl->IsLess( GetText(), GetLocale(),
+                                                      rCmp.GetText(), rCmp.GetLocale() );
                         }
                         if( pEnd && !pEndCmp )
                             return true;
                     }
                 }
             }
-            else if( pFirst && pFirst->IsTxtNode() &&
-                     pNext && pNext->IsTxtNode() )
-                    return ::IsFrameBehind( *static_cast<const SwTxtNode*>(pNext), nCntPos,
-                                            *static_cast<const SwTxtNode*>(pFirst), nCntPos );
+            else if( pFirst && pFirst->IsTextNode() &&
+                     pNext && pNext->IsTextNode() )
+                    return ::IsFrameBehind( *static_cast<const SwTextNode*>(pNext), nCntPos,
+                                            *static_cast<const SwTextNode*>(pFirst), nCntPos );
         }
     }
     return false;
 }
 
 // Sorted keyword entry
-SwTOXIndex::SwTOXIndex( const SwTxtNode& rNd,
-                        const SwTxtTOXMark* pMark, sal_uInt16 nOptions,
+SwTOXIndex::SwTOXIndex( const SwTextNode& rNd,
+                        const SwTextTOXMark* pMark, sal_uInt16 nOptions,
                         sal_uInt8 nKyLevel,
                         const SwTOXInternational& rIntl,
                         const lang::Locale& rLocale )
@@ -286,10 +286,10 @@ bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
     if(GetLevel() != rCmp.GetLevel() || nKeyLevel != rCmp.nKeyLevel)
         return false;
 
-    OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword");
+    OSL_ENSURE(pTextMark, "pTextMark == 0, No keyword");
 
-    bool bRet = pTOXIntl->IsEqual( GetTxt(), GetLocale(),
-                                   rCmp.GetTxt(), rCmp.GetLocale() );
+    bool bRet = pTOXIntl->IsEqual( GetText(), GetLocale(),
+                                   rCmp.GetText(), rCmp.GetLocale() );
 
     // If we don't summarize we need to evaluate the Pos
     if(bRet && !(GetOptions() & nsSwTOIOptions::TOI_SAME_ENTRY))
@@ -304,10 +304,10 @@ bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
 {
     const SwTOXIndex& rCmp = static_cast<const SwTOXIndex&>(rCmpBase);
 
-    OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword");
+    OSL_ENSURE(pTextMark, "pTextMark == 0, No keyword");
 
-    const TextAndReading aMyTaR(GetTxt());
-    const TextAndReading aOtherTaR(rCmp.GetTxt());
+    const TextAndReading aMyTaR(GetText());
+    const TextAndReading aOtherTaR(rCmp.GetText());
 
     bool bRet = GetLevel() == rCmp.GetLevel() &&
                 pTOXIntl->IsLess( aMyTaR, GetLocale(),
@@ -328,8 +328,8 @@ bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
 
 TextAndReading SwTOXIndex::GetText_Impl() const
 {
-    OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword");
-    const SwTOXMark& rTOXMark = pTxtMark->GetTOXMark();
+    OSL_ENSURE(pTextMark, "pTextMark == 0, No keyword");
+    const SwTOXMark& rTOXMark = pTextMark->GetTOXMark();
 
     TextAndReading aRet;
     switch(nKeyLevel)
@@ -362,39 +362,39 @@ TextAndReading SwTOXIndex::GetText_Impl() const
     return aRet;
 }
 
-void SwTOXIndex::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) const
+void SwTOXIndex::FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) const
 {
-    const sal_Int32* pEnd = pTxtMark->End();
+    const sal_Int32* pEnd = pTextMark->End();
 
     TextAndReading aRet;
-    if( pEnd && !pTxtMark->GetTOXMark().IsAlternativeText() &&
+    if( pEnd && !pTextMark->GetTOXMark().IsAlternativeText() &&
             0 == (GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY))
     {
-        aRet.sText = static_cast<const SwTxtNode*>(aTOXSources[0].pNd)->GetExpandTxt(
-                            pTxtMark->GetStart(),
-                            *pEnd - pTxtMark->GetStart());
+        aRet.sText = static_cast<const SwTextNode*>(aTOXSources[0].pNd)->GetExpandText(
+                            pTextMark->GetStart(),
+                            *pEnd - pTextMark->GetStart());
         if(nsSwTOIOptions::TOI_INITIAL_CAPS & nOpt && pTOXIntl && !aRet.sText.isEmpty())
         {
             aRet.sText = pTOXIntl->ToUpper( aRet.sText, 0 ) + aRet.sText.copy(1);
         }
     }
     else
-        aRet = GetTxt();
+        aRet = GetText();
 
     rNd.InsertText( aRet.sText, rInsPos );
 }
 
 sal_uInt16 SwTOXIndex::GetLevel() const
 {
-    OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword");
+    OSL_ENSURE(pTextMark, "pTextMark == 0, No keyword");
 
     sal_uInt16 nForm = FORM_PRIMARY_KEY;
 
     if( 0 == (GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY)&&
-        !pTxtMark->GetTOXMark().GetPrimaryKey().isEmpty() )
+        !pTextMark->GetTOXMark().GetPrimaryKey().isEmpty() )
     {
         nForm = FORM_SECONDARY_KEY;
-        if( !pTxtMark->GetTOXMark().GetSecondaryKey().isEmpty() )
+        if( !pTextMark->GetTOXMark().GetSecondaryKey().isEmpty() )
             nForm = FORM_ENTRY;
     }
     return nForm;
@@ -413,15 +413,15 @@ SwTOXCustom::SwTOXCustom(const TextAndReading& rKey,
 bool SwTOXCustom::operator==(const SwTOXSortTabBase& rCmpBase)
 {
     return GetLevel() == rCmpBase.GetLevel() &&
-           pTOXIntl->IsEqual( GetTxt(), GetLocale(),
-                              rCmpBase.GetTxt(), rCmpBase.GetLocale() );
+           pTOXIntl->IsEqual( GetText(), GetLocale(),
+                              rCmpBase.GetText(), rCmpBase.GetLocale() );
 }
 
 bool SwTOXCustom::operator < (const SwTOXSortTabBase& rCmpBase)
 {
     return  GetLevel() <= rCmpBase.GetLevel() &&
-            pTOXIntl->IsLess( GetTxt(), GetLocale(),
-                              rCmpBase.GetTxt(), rCmpBase.GetLocale() );
+            pTOXIntl->IsLess( GetText(), GetLocale(),
+                              rCmpBase.GetText(), rCmpBase.GetLocale() );
 }
 
 sal_uInt16 SwTOXCustom::GetLevel() const
@@ -435,7 +435,7 @@ TextAndReading SwTOXCustom::GetText_Impl() const
 }
 
 // Sorts the TOX entries
-SwTOXContent::SwTOXContent( const SwTxtNode& rNd, const SwTxtTOXMark* pMark,
+SwTOXContent::SwTOXContent( const SwTextNode& rNd, const SwTextTOXMark* pMark,
                         const SwTOXInternational& rIntl)
     : SwTOXSortTabBase( TOX_SORT_CONTENT, &rNd, pMark, &rIntl )
 {
@@ -445,29 +445,29 @@ SwTOXContent::SwTOXContent( const SwTxtNode& rNd, const SwTxtTOXMark* pMark,
 
 TextAndReading SwTOXContent::GetText_Impl() const
 {
-    const sal_Int32* pEnd = pTxtMark->End();
-    if( pEnd && !pTxtMark->GetTOXMark().IsAlternativeText() )
+    const sal_Int32* pEnd = pTextMark->End();
+    if( pEnd && !pTextMark->GetTOXMark().IsAlternativeText() )
     {
         return TextAndReading(
-            static_cast<const SwTxtNode*>(aTOXSources[0].pNd)->GetExpandTxt(
-                                     pTxtMark->GetStart(),
-                                     *pEnd - pTxtMark->GetStart() ),
-            pTxtMark->GetTOXMark().GetTextReading());
+            static_cast<const SwTextNode*>(aTOXSources[0].pNd)->GetExpandText(
+                                     pTextMark->GetStart(),
+                                     *pEnd - pTextMark->GetStart() ),
+            pTextMark->GetTOXMark().GetTextReading());
     }
 
-    return TextAndReading(pTxtMark->GetTOXMark().GetAlternativeText(), OUString());
+    return TextAndReading(pTextMark->GetTOXMark().GetAlternativeText(), OUString());
 }
 
-void SwTOXContent::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) const
+void SwTOXContent::FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) const
 {
-    const sal_Int32* pEnd = pTxtMark->End();
-    if( pEnd && !pTxtMark->GetTOXMark().IsAlternativeText() )
-        static_cast<const SwTxtNode*>(aTOXSources[0].pNd)->GetExpandTxt( rNd, &rInsPos,
-                                    pTxtMark->GetStart(),
-                                    *pEnd - pTxtMark->GetStart() );
+    const sal_Int32* pEnd = pTextMark->End();
+    if( pEnd && !pTextMark->GetTOXMark().IsAlternativeText() )
+        static_cast<const SwTextNode*>(aTOXSources[0].pNd)->GetExpandText( rNd, &rInsPos,
+                                    pTextMark->GetStart(),
+                                    *pEnd - pTextMark->GetStart() );
     else
     {
-        rNd.InsertText( GetTxt().sText, rInsPos );
+        rNd.InsertText( GetText().sText, rInsPos );
     }
 }
 
@@ -475,13 +475,13 @@ void SwTOXContent::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16
 
 sal_uInt16 SwTOXContent::GetLevel() const
 {
-    return pTxtMark->GetTOXMark().GetLevel();
+    return pTextMark->GetTOXMark().GetLevel();
 }
 
 // TOX assembled from paragraphs
 // Watch out for OLE/graphics when sorting!
 // The position must not come from the document, but from the "anchor"!
-SwTOXPara::SwTOXPara( const SwCntntNode& rNd, SwTOXElement eT, sal_uInt16 nLevel, const OUString& sSeqName )
+SwTOXPara::SwTOXPara( const SwContentNode& rNd, SwTOXElement eT, sal_uInt16 nLevel, const OUString& sSeqName )
     : SwTOXSortTabBase( TOX_SORT_PARA, &rNd, 0, 0 ),
     eType( eT ),
     m_nLevel(nLevel),
@@ -493,14 +493,14 @@ SwTOXPara::SwTOXPara( const SwCntntNode& rNd, SwTOXElement eT, sal_uInt16 nLevel
 
 TextAndReading SwTOXPara::GetText_Impl() const
 {
-    const SwCntntNode* pNd = aTOXSources[0].pNd;
+    const SwContentNode* pNd = aTOXSources[0].pNd;
     switch( eType )
     {
     case nsSwTOXElement::TOX_SEQUENCE:
     case nsSwTOXElement::TOX_TEMPLATE:
     case nsSwTOXElement::TOX_OUTLINELEVEL:
         {
-            return TextAndReading(static_cast<const SwTxtNode*>(pNd)->GetExpandTxt(
+            return TextAndReading(static_cast<const SwTextNode*>(pNd)->GetExpandText(
                     nStartIndex,
                     nEndIndex == -1 ? -1 : nEndIndex - nStartIndex),
                     OUString());
@@ -512,7 +512,7 @@ TextAndReading SwTOXPara::GetText_Impl() const
     case nsSwTOXElement::TOX_FRAME:
         {
             // Find the FlyFormat; the object/graphic name is there
-            SwFrmFmt* pFly = pNd->GetFlyFmt();
+            SwFrameFormat* pFly = pNd->GetFlyFormat();
             if( pFly )
                 return TextAndReading(pFly->GetName(), OUString());
 
@@ -530,29 +530,29 @@ TextAndReading SwTOXPara::GetText_Impl() const
     return TextAndReading();
 }
 
-void SwTOXPara::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) const
+void SwTOXPara::FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) const
 {
     if( nsSwTOXElement::TOX_TEMPLATE == eType || nsSwTOXElement::TOX_SEQUENCE == eType  || nsSwTOXElement::TOX_OUTLINELEVEL == eType)
     {
-        const SwTxtNode* pSrc = static_cast<const SwTxtNode*>(aTOXSources[0].pNd);
-        pSrc->GetExpandTxt( rNd, &rInsPos, nStartIndex,
+        const SwTextNode* pSrc = static_cast<const SwTextNode*>(aTOXSources[0].pNd);
+        pSrc->GetExpandText( rNd, &rInsPos, nStartIndex,
                 nEndIndex == -1 ? -1 : nEndIndex - nStartIndex,
                 false, false, true );
     }
     else
     {
-        rNd.InsertText( GetTxt().sText.replace('\t', ' '), rInsPos );
+        rNd.InsertText( GetText().sText.replace('\t', ' '), rInsPos );
     }
 }
 
 sal_uInt16 SwTOXPara::GetLevel() const
 {
     sal_uInt16 nRet = m_nLevel;
-    const SwCntntNode*  pNd = aTOXSources[0].pNd;
+    const SwContentNode*  pNd = aTOXSources[0].pNd;
 
-    if( nsSwTOXElement::TOX_OUTLINELEVEL == eType && pNd->GetTxtNode() )
+    if( nsSwTOXElement::TOX_OUTLINELEVEL == eType && pNd->GetTextNode() )
     {
-        const int nTmp = static_cast<const SwTxtNode*>(pNd)->GetAttrOutlineLevel();
+        const int nTmp = static_cast<const SwTextNode*>(pNd)->GetAttrOutlineLevel();
         if(nTmp != 0 )
             nRet = static_cast<sal_uInt16>(nTmp);
     }
@@ -561,20 +561,20 @@ sal_uInt16 SwTOXPara::GetLevel() const
 
 OUString SwTOXPara::GetURL() const
 {
-    OUString aTxt;
-    const SwCntntNode* pNd = aTOXSources[0].pNd;
+    OUString aText;
+    const SwContentNode* pNd = aTOXSources[0].pNd;
     switch( eType )
     {
     case nsSwTOXElement::TOX_TEMPLATE:
     case nsSwTOXElement::TOX_OUTLINELEVEL:
         {
-            const SwTxtNode * pTxtNd = pNd->GetTxtNode();
+            const SwTextNode * pTextNd = pNd->GetTextNode();
 
-            SwDoc* pDoc = const_cast<SwDoc*>( pTxtNd->GetDoc() );
-            ::sw::mark::IMark const * const pMark = pDoc->getIDocumentMarkAccess()->getMarkForTxtNode(
-                                *(pTxtNd),
+            SwDoc* pDoc = const_cast<SwDoc*>( pTextNd->GetDoc() );
+            ::sw::mark::IMark const * const pMark = pDoc->getIDocumentMarkAccess()->getMarkForTextNode(
+                                *(pTextNd),
                                 IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK);
-            aTxt = "#" + pMark->GetName();
+            aText = "#" + pMark->GetName();
         }
         break;
 
@@ -583,10 +583,10 @@ OUString SwTOXPara::GetURL() const
     case nsSwTOXElement::TOX_FRAME:
         {
             // Find the FlyFormat; the object/graphic name is there
-            SwFrmFmt* pFly = pNd->GetFlyFmt();
+            SwFrameFormat* pFly = pNd->GetFlyFormat();
             if( pFly )
             {
-                aTxt = "#" + pFly->GetName() + OUStringLiteral1<cMarkSeparator>();
+                aText = "#" + pFly->GetName() + OUStringLiteral1<cMarkSeparator>();
                 const sal_Char* pStr;
                 switch( eType )
                 {
@@ -596,23 +596,23 @@ OUString SwTOXPara::GetURL() const
                 default:            pStr = 0;
                 }
                 if( pStr )
-                    aTxt += OUString::createFromAscii( pStr );
+                    aText += OUString::createFromAscii( pStr );
             }
         }
         break;
     case nsSwTOXElement::TOX_SEQUENCE:
         {
-            aTxt = "#" + m_sSequenceName + OUStringLiteral1<cMarkSeparator>()
+            aText = "#" + m_sSequenceName + OUStringLiteral1<cMarkSeparator>()
                  + "sequence";
         }
         break;
     default: break;
     }
-    return aTxt;
+    return aText;
 }
 
 // Table
-SwTOXTable::SwTOXTable( const SwCntntNode& rNd )
+SwTOXTable::SwTOXTable( const SwContentNode& rNd )
     : SwTOXSortTabBase( TOX_SORT_TABLE, &rNd, 0, 0 ),
     nLevel(FORM_ALPHA_DELIMITTER)
 {
@@ -627,7 +627,7 @@ TextAndReading SwTOXTable::GetText_Impl() const
             reinterpret_cast<const SwTableNode*>(pNd->FindTableNode());
         if (pTableNd)
         {
-            return TextAndReading(pTableNd->GetTable().GetFrmFmt()->GetName(), OUString());
+            return TextAndReading(pTableNd->GetTable().GetFrameFormat()->GetName(), OUString());
         }
     }
 
@@ -650,20 +650,20 @@ OUString SwTOXTable::GetURL() const
     if (!pNd)
         return OUString();
 
-    const OUString sName = static_cast<const SwTableNode*>(pNd)->GetTable().GetFrmFmt()->GetName();
+    const OUString sName = static_cast<const SwTableNode*>(pNd)->GetTable().GetFrameFormat()->GetName();
     if ( sName.isEmpty() )
         return OUString();
 
     return "#" + sName + OUStringLiteral1<cMarkSeparator>() + "table";
 }
 
-SwTOXAuthority::SwTOXAuthority( const SwCntntNode& rNd,
-                SwFmtFld& rField, const SwTOXInternational& rIntl ) :
+SwTOXAuthority::SwTOXAuthority( const SwContentNode& rNd,
+                SwFormatField& rField, const SwTOXInternational& rIntl ) :
     SwTOXSortTabBase( TOX_SORT_AUTHORITY, &rNd, 0, &rIntl ),
     m_rField(rField)
 {
-    if(rField.GetTxtFld())
-        nCntPos = rField.GetTxtFld()->GetStart();
+    if(rField.GetTextField())
+        nCntPos = rField.GetTextField()->GetStart();
 }
 
 sal_uInt16 SwTOXAuthority::GetLevel() const
@@ -682,7 +682,7 @@ sal_uInt16 SwTOXAuthority::GetLevel() const
     return nRet;
 }
 
-static OUString lcl_GetText(SwFmtFld const& rField)
+static OUString lcl_GetText(SwFormatField const& rField)
 {
     return rField.GetField()->ExpandField(true);
 }
@@ -692,7 +692,7 @@ TextAndReading SwTOXAuthority::GetText_Impl() const
     return TextAndReading(lcl_GetText(m_rField), OUString());
 }
 
-void    SwTOXAuthority::FillText( SwTxtNode& rNd,
+void    SwTOXAuthority::FillText( SwTextNode& rNd,
                         const SwIndex& rInsPos, sal_uInt16 nAuthField ) const
 {
     SwAuthorityField* pField = static_cast<SwAuthorityField*>(m_rField.GetField());
diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx
index caa60485b010..d1895dcf60df 100644
--- a/sw/source/core/txtnode/SwGrammarContact.cxx
+++ b/sw/source/core/txtnode/SwGrammarContact.cxx
@@ -43,7 +43,7 @@ class SwGrammarContact : public IGrammarContact, public SwClient
     Timer aTimer;
     SwGrammarMarkUp *mpProxyList;
     bool mbFinished;
-    SwTxtNode* getMyTxtNode() { return static_cast<SwTxtNode*>(GetRegisteredIn()); }
+    SwTextNode* getMyTextNode() { return static_cast<SwTextNode*>(GetRegisteredIn()); }
       DECL_LINK_TYPED( TimerRepaint, Timer *, void );
 
 public:
@@ -52,8 +52,8 @@ public:
 
     // (pure) virtual functions of IGrammarContact
     virtual void updateCursorPosition( const SwPosition& rNewPos ) SAL_OVERRIDE;
-    virtual SwGrammarMarkUp* getGrammarCheck( SwTxtNode& rTxtNode, bool bCreate ) SAL_OVERRIDE;
-    virtual void finishGrammarCheck( SwTxtNode& rTxtNode ) SAL_OVERRIDE;
+    virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool bCreate ) SAL_OVERRIDE;
+    virtual void finishGrammarCheck( SwTextNode& rTextNode ) SAL_OVERRIDE;
 protected:
     // virtual function of SwClient
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
@@ -72,9 +72,9 @@ IMPL_LINK_TYPED( SwGrammarContact, TimerRepaint, Timer *, pTimer, void )
         pTimer->Stop();
         if( GetRegisteredIn() )
         {   //Replace the old wrong list by the proxy list and repaint all frames
-            getMyTxtNode()->SetGrammarCheck( mpProxyList, true );
+            getMyTextNode()->SetGrammarCheck( mpProxyList, true );
             mpProxyList = 0;
-            SwTxtFrm::repaintTextFrames( *getMyTxtNode() );
+            SwTextFrm::repaintTextFrames( *getMyTextNode() );
         }
     }
 }
@@ -82,30 +82,30 @@ IMPL_LINK_TYPED( SwGrammarContact, TimerRepaint, Timer *, pTimer, void )
 /* I'm always a client of the current paragraph */
 void SwGrammarContact::updateCursorPosition( const SwPosition& rNewPos )
 {
-    SwTxtNode* pTxtNode = rNewPos.nNode.GetNode().GetTxtNode();
-    if( pTxtNode != GetRegisteredIn() ) // paragraph has been changed
+    SwTextNode* pTextNode = rNewPos.nNode.GetNode().GetTextNode();
+    if( pTextNode != GetRegisteredIn() ) // paragraph has been changed
     {
         aTimer.Stop();
         if( GetRegisteredIn() ) // My last paragraph has been left
         {
             if( mpProxyList )
             {   // replace old list by the proxy list and repaint
-                getMyTxtNode()->SetGrammarCheck( mpProxyList, true );
-                SwTxtFrm::repaintTextFrames( *getMyTxtNode() );
+                getMyTextNode()->SetGrammarCheck( mpProxyList, true );
+                SwTextFrm::repaintTextFrames( *getMyTextNode() );
             }
             GetRegisteredInNonConst()->Remove( this ); // good bye old paragraph
             mpProxyList = 0;
         }
-        if( pTxtNode )
-            pTxtNode->Add( this ); // welcome new paragraph
+        if( pTextNode )
+            pTextNode->Add( this ); // welcome new paragraph
     }
 }
 
 /* deliver a grammar check list for the given text node */
-SwGrammarMarkUp* SwGrammarContact::getGrammarCheck( SwTxtNode& rTxtNode, bool bCreate )
+SwGrammarMarkUp* SwGrammarContact::getGrammarCheck( SwTextNode& rTextNode, bool bCreate )
 {
     SwGrammarMarkUp *pRet = 0;
-    if( GetRegisteredIn() == &rTxtNode ) // hey, that's my current paragraph!
+    if( GetRegisteredIn() == &rTextNode ) // hey, that's my current paragraph!
     {   // so you will get a proxy list...
         if( bCreate )
         {
@@ -116,8 +116,8 @@ SwGrammarMarkUp* SwGrammarContact::getGrammarCheck( SwTxtNode& rTxtNode, bool bC
             }
             if( !mpProxyList )
             {
-                if( rTxtNode.GetGrammarCheck() )
-                    mpProxyList = static_cast<SwGrammarMarkUp*>(rTxtNode.GetGrammarCheck()->Clone());
+                if( rTextNode.GetGrammarCheck() )
+                    mpProxyList = static_cast<SwGrammarMarkUp*>(rTextNode.GetGrammarCheck()->Clone());
                 else
                 {
                     mpProxyList = new SwGrammarMarkUp();
@@ -130,13 +130,13 @@ SwGrammarMarkUp* SwGrammarContact::getGrammarCheck( SwTxtNode& rTxtNode, bool bC
     }
     else
     {
-        pRet = rTxtNode.GetGrammarCheck(); // do you have already a list?
+        pRet = rTextNode.GetGrammarCheck(); // do you have already a list?
         if( bCreate && !pRet ) // do you want to create a list?
         {
             pRet = new SwGrammarMarkUp();
             pRet->SetInvalid( 0, COMPLETE_STRING );
-            rTxtNode.SetGrammarCheck( pRet );
-            rTxtNode.SetGrammarCheckDirty( true );
+            rTextNode.SetGrammarCheck( pRet );
+            rTextNode.SetGrammarCheckDirty( true );
         }
     }
     return pRet;
@@ -157,10 +157,10 @@ void SwGrammarContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem * )
     }
 }
 
-void SwGrammarContact::finishGrammarCheck( SwTxtNode& rTxtNode )
+void SwGrammarContact::finishGrammarCheck( SwTextNode& rTextNode )
 {
-    if( &rTxtNode != GetRegisteredIn() ) // not my paragraph
-        SwTxtFrm::repaintTextFrames( rTxtNode ); // can be repainted directly
+    if( &rTextNode != GetRegisteredIn() ) // not my paragraph
+        SwTextFrm::repaintTextFrames( rTextNode ); // can be repainted directly
     else
     {
         if( mpProxyList )
@@ -168,10 +168,10 @@ void SwGrammarContact::finishGrammarCheck( SwTxtNode& rTxtNode )
             mbFinished = true;
             aTimer.Start(); // will replace old list and repaint with delay
         }
-        else if( getMyTxtNode()->GetGrammarCheck() )
+        else if( getMyTextNode()->GetGrammarCheck() )
         {   // all grammar problems seems to be gone, no delay needed
-            getMyTxtNode()->SetGrammarCheck( 0, true );
-            SwTxtFrm::repaintTextFrames( *getMyTxtNode() );
+            getMyTextNode()->SetGrammarCheck( 0, true );
+            SwTextFrm::repaintTextFrames( *getMyTextNode() );
         }
     }
 }
@@ -181,11 +181,11 @@ IGrammarContact* createGrammarContact()
     return new SwGrammarContact();
 }
 
-void finishGrammarCheck( SwTxtNode& rTxtNode )
+void finishGrammarCheck( SwTextNode& rTextNode )
 {
-    IGrammarContact* pGrammarContact = getGrammarContact( rTxtNode );
+    IGrammarContact* pGrammarContact = getGrammarContact( rTextNode );
     if( pGrammarContact )
-        pGrammarContact->finishGrammarCheck( rTxtNode );
+        pGrammarContact->finishGrammarCheck( rTextNode );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 2fb6b160b58a..0a25e5921637 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -38,35 +38,35 @@
 #include <fieldhint.hxx>
 #include <svl/smplhint.hxx>
 
-TYPEINIT3(SwFmtFld, SfxPoolItem, SwModify, SfxBroadcaster)
+TYPEINIT3(SwFormatField, SfxPoolItem, SwModify, SfxBroadcaster)
 
 // constructor for default item in attribute-pool
-SwFmtFld::SwFmtFld( sal_uInt16 nWhich )
+SwFormatField::SwFormatField( sal_uInt16 nWhich )
     : SfxPoolItem( nWhich )
     , SwModify(0)
     , SfxBroadcaster()
     , mpField( NULL )
-    , mpTxtFld( NULL )
+    , mpTextField( NULL )
 {
 }
 
-SwFmtFld::SwFmtFld( const SwField &rFld )
+SwFormatField::SwFormatField( const SwField &rField )
     : SfxPoolItem( RES_TXTATR_FIELD )
-    , SwModify( rFld.GetTyp() )
+    , SwModify( rField.GetTyp() )
     , SfxBroadcaster()
-    , mpField( rFld.CopyField() )
-    , mpTxtFld( NULL )
+    , mpField( rField.CopyField() )
+    , mpTextField( NULL )
 {
     if ( GetField()->GetTyp()->Which() == RES_INPUTFLD )
     {
         // input field in-place editing
         SetWhich( RES_TXTATR_INPUTFIELD );
-        static_cast<SwInputField*>(GetField())->SetFmtFld( *this );
+        static_cast<SwInputField*>(GetField())->SetFormatField( *this );
     }
     else if (GetField()->GetTyp()->Which() == RES_SETEXPFLD)
     {
-        // see SwWrtShell::StartInputFldDlg
-        static_cast<SwSetExpField *>(GetField())->SetFmtFld(*this);
+        // see SwWrtShell::StartInputFieldDlg
+        static_cast<SwSetExpField *>(GetField())->SetFormatField(*this);
     }
     else if ( GetField()->GetTyp()->Which() == RES_POSTITFLD )
     {
@@ -79,12 +79,12 @@ SwFmtFld::SwFmtFld( const SwField &rFld )
 // Since Items are used in ItemPool and in default constructed ItemSets with
 // full pool range, all items need to be clonable. Thus, this one needed to be
 // corrected
-SwFmtFld::SwFmtFld( const SwFmtFld& rAttr )
+SwFormatField::SwFormatField( const SwFormatField& rAttr )
     : SfxPoolItem( RES_TXTATR_FIELD )
     , SwModify(0)
     , SfxBroadcaster()
     , mpField( NULL )
-    , mpTxtFld( NULL )
+    , mpTextField( NULL )
 {
     if ( rAttr.GetField() )
     {
@@ -97,12 +97,12 @@ SwFmtFld::SwFmtFld( const SwFmtFld& rAttr )
             SwInputField *pField = dynamic_cast<SwInputField*>(GetField());
             assert(pField);
             if (pField)
-                pField->SetFmtFld( *this );
+                pField->SetFormatField( *this );
         }
         else if (GetField()->GetTyp()->Which() == RES_SETEXPFLD)
         {
-            // see SwWrtShell::StartInputFldDlg
-            static_cast<SwSetExpField *>(GetField())->SetFmtFld(*this);
+            // see SwWrtShell::StartInputFieldDlg
+            static_cast<SwSetExpField *>(GetField())->SetFormatField(*this);
         }
         else if ( GetField()->GetTyp()->Which() == RES_POSTITFLD )
         {
@@ -112,14 +112,14 @@ SwFmtFld::SwFmtFld( const SwFmtFld& rAttr )
     }
 }
 
-SwFmtFld::~SwFmtFld()
+SwFormatField::~SwFormatField()
 {
     SwFieldType* pType = mpField ? mpField->GetTyp() : 0;
 
     if (pType && pType->Which() == RES_DBFLD)
         pType = 0;  // DB-Feldtypen zerstoeren sich selbst
 
-    Broadcast( SwFmtFldHint( this, SwFmtFldHintWhich::REMOVED ) );
+    Broadcast( SwFormatFieldHint( this, SwFormatFieldHintWhich::REMOVED ) );
     delete mpField;
 
     // bei einige FeldTypen muessen wir den FeldTypen noch loeschen
@@ -150,64 +150,64 @@ SwFmtFld::~SwFmtFld()
     }
 }
 
-void SwFmtFld::RegisterToFieldType( SwFieldType& rType )
+void SwFormatField::RegisterToFieldType( SwFieldType& rType )
 {
     rType.Add(this);
 }
 
 // #111840#
-void SwFmtFld::SetField(SwField * _pField)
+void SwFormatField::SetField(SwField * _pField)
 {
     delete mpField;
 
     mpField = _pField;
     if ( GetField()->GetTyp()->Which() == RES_INPUTFLD )
     {
-        static_cast<SwInputField* >(GetField())->SetFmtFld( *this );
+        static_cast<SwInputField* >(GetField())->SetFormatField( *this );
     }
     else if (GetField()->GetTyp()->Which() == RES_SETEXPFLD)
     {
-        // see SwWrtShell::StartInputFldDlg
-        static_cast<SwSetExpField *>(GetField())->SetFmtFld(*this);
+        // see SwWrtShell::StartInputFieldDlg
+        static_cast<SwSetExpField *>(GetField())->SetFormatField(*this);
     }
-    Broadcast( SwFmtFldHint( this, SwFmtFldHintWhich::CHANGED ) );
+    Broadcast( SwFormatFieldHint( this, SwFormatFieldHintWhich::CHANGED ) );
 }
 
-void SwFmtFld::SetTxtFld( SwTxtFld& rTxtFld )
+void SwFormatField::SetTextField( SwTextField& rTextField )
 {
-    mpTxtFld = &rTxtFld;
+    mpTextField = &rTextField;
 }
 
-void SwFmtFld::ClearTxtFld()
+void SwFormatField::ClearTextField()
 {
-    mpTxtFld = NULL;
+    mpTextField = NULL;
 }
 
-bool SwFmtFld::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatField::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return ( ( mpField && static_cast<const SwFmtFld&>(rAttr).GetField()
-               && mpField->GetTyp() == static_cast<const SwFmtFld&>(rAttr).GetField()->GetTyp()
-               && mpField->GetFormat() == static_cast<const SwFmtFld&>(rAttr).GetField()->GetFormat() ) )
-             || ( !mpField && !static_cast<const SwFmtFld&>(rAttr).GetField() );
+    return ( ( mpField && static_cast<const SwFormatField&>(rAttr).GetField()
+               && mpField->GetTyp() == static_cast<const SwFormatField&>(rAttr).GetField()->GetTyp()
+               && mpField->GetFormat() == static_cast<const SwFormatField&>(rAttr).GetField()->GetFormat() ) )
+             || ( !mpField && !static_cast<const SwFormatField&>(rAttr).GetField() );
 }
 
-SfxPoolItem* SwFmtFld::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatField::Clone( SfxItemPool* ) const
 {
-    return new SwFmtFld( *this );
+    return new SwFormatField( *this );
 }
 
-void SwFmtFld::InvalidateField()
+void SwFormatField::InvalidateField()
 {
     SwPtrMsgPoolItem const item(RES_REMOVE_UNO_OBJECT,
             &static_cast<SwModify&>(*this)); // cast to base class (void*)
     NotifyClients(&item, &item);
 }
 
-void SwFmtFld::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
+void SwFormatField::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
 {
     SwClient::SwClientNotify(rModify, rHint);
-    if( !mpTxtFld )
+    if( !mpTextField )
         return;
 
     const SwFieldHint* pHint = dynamic_cast<const SwFieldHint*>( &rHint );
@@ -216,9 +216,9 @@ void SwFmtFld::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
         // replace field content by text
         SwPaM* pPaM = pHint->GetPaM();
         SwDoc* pDoc = pPaM->GetDoc();
-        const SwTxtNode& rTxtNode = mpTxtFld->GetTxtNode();
-        pPaM->GetPoint()->nNode = rTxtNode;
-        pPaM->GetPoint()->nContent.Assign( const_cast<SwTxtNode*>(&rTxtNode), mpTxtFld->GetStart() );
+        const SwTextNode& rTextNode = mpTextField->GetTextNode();
+        pPaM->GetPoint()->nNode = rTextNode;
+        pPaM->GetPoint()->nContent.Assign( const_cast<SwTextNode*>(&rTextNode), mpTextField->GetStart() );
 
         OUString const aEntry( GetField()->ExpandField( pDoc->IsClipBoard() ) );
         pPaM->SetMark();
@@ -228,7 +228,7 @@ void SwFmtFld::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
     }
 }
 
-void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwFormatField::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
     {   // invalidate cached UNO object
@@ -238,15 +238,15 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         return;
     }
 
-    if( !mpTxtFld )
+    if( !mpTextField )
         return;
 
     // don't do anything, especially not expand!
     if( pNew && pNew->Which() == RES_OBJECTDYING )
         return;
 
-    SwTxtNode* pTxtNd = &mpTxtFld->GetTxtNode();
-    OSL_ENSURE( pTxtNd, "wo ist denn mein Node?" );
+    SwTextNode* pTextNd = &mpTextField->GetTextNode();
+    OSL_ENSURE( pTextNd, "wo ist denn mein Node?" );
     if( pNew )
     {
         switch( pNew->Which() )
@@ -254,24 +254,24 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         case RES_TXTATR_FLDCHG:
                 // "Farbe hat sich geaendert !"
                 // this, this fuer "nur Painten"
-                pTxtNd->ModifyNotification( this, this );
+                pTextNd->ModifyNotification( this, this );
                 return;
         case RES_REFMARKFLD_UPDATE:
                 // GetReferenz-Felder aktualisieren
                 if( RES_GETREFFLD == GetField()->GetTyp()->Which() )
                 {
                     // #i81002#
-                    static_cast<SwGetRefField*>(GetField())->UpdateField( mpTxtFld );
+                    static_cast<SwGetRefField*>(GetField())->UpdateField( mpTextField );
                 }
                 break;
         case RES_DOCPOS_UPDATE:
-                // Je nach DocPos aktualisieren (SwTxtFrm::Modify())
-                pTxtNd->ModifyNotification( pNew, this );
+                // Je nach DocPos aktualisieren (SwTextFrm::Modify())
+                pTextNd->ModifyNotification( pNew, this );
                 return;
 
         case RES_ATTRSET_CHG:
         case RES_FMT_CHG:
-                pTxtNd->ModifyNotification( pOld, pNew );
+                pTextNd->ModifyNotification( pOld, pNew );
                 return;
         default:
                 break;
@@ -287,7 +287,7 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         case RES_DBNUMSETFLD:
         case RES_DBNEXTSETFLD:
         case RES_DBNAMEFLD:
-            pTxtNd->ModifyNotification( 0, pNew);
+            pTextNd->ModifyNotification( 0, pNew);
             return;
     }
 
@@ -296,93 +296,93 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         SwUserFieldType* pType = static_cast<SwUserFieldType*>(GetField()->GetTyp());
         if(!pType->IsValid())
         {
-            SwCalc aCalc( *pTxtNd->GetDoc() );
+            SwCalc aCalc( *pTextNd->GetDoc() );
             pType->GetValue( aCalc );
         }
     }
 
     const bool bForceNotify = (pOld == NULL) && (pNew == NULL);
-    mpTxtFld->ExpandTxtFld( bForceNotify );
+    mpTextField->ExpandTextField( bForceNotify );
 }
 
-bool SwFmtFld::GetInfo( SfxPoolItem& rInfo ) const
+bool SwFormatField::GetInfo( SfxPoolItem& rInfo ) const
 {
-    const SwTxtNode* pTxtNd;
+    const SwTextNode* pTextNd;
     if( RES_AUTOFMT_DOCNODE != rInfo.Which() ||
-        !mpTxtFld || 0 == ( pTxtNd = mpTxtFld->GetpTxtNode() ) ||
-        &pTxtNd->GetNodes() != static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes )
+        !mpTextField || 0 == ( pTextNd = mpTextField->GetpTextNode() ) ||
+        &pTextNd->GetNodes() != static_cast<SwAutoFormatGetDocNode&>(rInfo).pNodes )
         return true;
 
-    static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = pTxtNd;
+    static_cast<SwAutoFormatGetDocNode&>(rInfo).pContentNode = pTextNd;
     return false;
 }
 
-bool SwFmtFld::IsFldInDoc() const
+bool SwFormatField::IsFieldInDoc() const
 {
-    return mpTxtFld != NULL
-           && mpTxtFld->IsFldInDoc();
+    return mpTextField != NULL
+           && mpTextField->IsFieldInDoc();
 }
 
-bool SwFmtFld::IsProtect() const
+bool SwFormatField::IsProtect() const
 {
-    return mpTxtFld != NULL
-           && mpTxtFld->GetpTxtNode() != NULL
-           && mpTxtFld->GetpTxtNode()->IsProtect();
+    return mpTextField != NULL
+           && mpTextField->GetpTextNode() != NULL
+           && mpTextField->GetpTextNode()->IsProtect();
 }
 
-// class SwTxtFld ////////////////////////////////////////////////////
+// class SwTextField ////////////////////////////////////////////////////
 
-SwTxtFld::SwTxtFld(
-    SwFmtFld & rAttr,
+SwTextField::SwTextField(
+    SwFormatField & rAttr,
     sal_Int32 const nStartPos,
     bool const bInClipboard)
-    : SwTxtAttr( rAttr, nStartPos )
+    : SwTextAttr( rAttr, nStartPos )
 // fdo#39694 the ExpandField here may not give the correct result in all cases,
 // but is better than nothing
     , m_aExpand( rAttr.GetField()->ExpandField(bInClipboard) )
-    , m_pTxtNode( NULL )
+    , m_pTextNode( NULL )
 {
-    rAttr.SetTxtFld( *this );
+    rAttr.SetTextField( *this );
     SetHasDummyChar(true);
 }
 
-SwTxtFld::~SwTxtFld( )
+SwTextField::~SwTextField( )
 {
-    SwFmtFld & rFmtFld( static_cast<SwFmtFld &>(GetAttr()) );
-    if ( this == rFmtFld.GetTxtFld() )
+    SwFormatField & rFormatField( static_cast<SwFormatField &>(GetAttr()) );
+    if ( this == rFormatField.GetTextField() )
     {
-        rFmtFld.ClearTxtFld();
+        rFormatField.ClearTextField();
     }
 }
 
-bool SwTxtFld::IsFldInDoc() const
+bool SwTextField::IsFieldInDoc() const
 {
-    return GetpTxtNode() != NULL
-           && GetpTxtNode()->GetNodes().IsDocNodes();
+    return GetpTextNode() != NULL
+           && GetpTextNode()->GetNodes().IsDocNodes();
 }
 
-void SwTxtFld::ExpandTxtFld(const bool bForceNotify) const
+void SwTextField::ExpandTextField(const bool bForceNotify) const
 {
-    OSL_ENSURE( m_pTxtNode, "SwTxtFld: where is my TxtNode?" );
+    OSL_ENSURE( m_pTextNode, "SwTextField: where is my TextNode?" );
 
-    const SwField* pFld = GetFmtFld().GetField();
-    const OUString aNewExpand( pFld->ExpandField(m_pTxtNode->GetDoc()->IsClipBoard()) );
+    const SwField* pField = GetFormatField().GetField();
+    const OUString aNewExpand( pField->ExpandField(m_pTextNode->GetDoc()->IsClipBoard()) );
 
     if (aNewExpand == m_aExpand)
     {
         // Bei Seitennummernfeldern
-        const sal_uInt16 nWhich = pFld->GetTyp()->Which();
+        const sal_uInt16 nWhich = pField->GetTyp()->Which();
         if ( RES_CHAPTERFLD != nWhich
              && RES_PAGENUMBERFLD != nWhich
              && RES_REFPAGEGETFLD != nWhich
              // Page count fields to not use aExpand during formatting,
              // therefore an invalidation of the text frame has to be triggered even if aNewExpand == aExpand:
-             && ( RES_DOCSTATFLD != nWhich || DS_PAGE != static_cast<const SwDocStatField*>(pFld)->GetSubType() )
-             && ( RES_GETEXPFLD != nWhich || static_cast<const SwGetExpField*>(pFld)->IsInBodyTxt() ) )
+             && ( RES_DOCSTATFLD != nWhich || DS_PAGE != static_cast<const SwDocStatField*>(pField)->GetSubType() )
+             && ( RES_GETEXPFLD != nWhich || static_cast<const SwGetExpField*>(pField)->IsInBodyText() ) )
         {
-            if( m_pTxtNode->CalcHiddenParaField() )
+            if( m_pTextNode->CalcHiddenParaField() )
             {
-                m_pTxtNode->ModifyNotification( 0, 0 );
+                m_pTextNode->ModifyNotification( 0, 0 );
             }
             if ( !bForceNotify )
             {
@@ -394,230 +394,230 @@ void SwTxtFld::ExpandTxtFld(const bool bForceNotify) const
 
     m_aExpand = aNewExpand;
 
-    const_cast<SwTxtFld*>(this)->NotifyContentChange( const_cast<SwFmtFld&>(GetFmtFld()) );
+    const_cast<SwTextField*>(this)->NotifyContentChange( const_cast<SwFormatField&>(GetFormatField()) );
 }
 
-void SwTxtFld::CopyTxtFld( SwTxtFld *pDest ) const
+void SwTextField::CopyTextField( SwTextField *pDest ) const
 {
-    OSL_ENSURE( m_pTxtNode, "SwTxtFld: where is my TxtNode?" );
-    OSL_ENSURE( pDest->m_pTxtNode, "SwTxtFld: where is pDest's TxtNode?" );
+    OSL_ENSURE( m_pTextNode, "SwTextField: where is my TextNode?" );
+    OSL_ENSURE( pDest->m_pTextNode, "SwTextField: where is pDest's TextNode?" );
 
-    IDocumentFieldsAccess* pIDFA = m_pTxtNode->getIDocumentFieldsAccess();
-    IDocumentFieldsAccess* pDestIDFA = pDest->m_pTxtNode->getIDocumentFieldsAccess();
+    IDocumentFieldsAccess* pIDFA = m_pTextNode->getIDocumentFieldsAccess();
+    IDocumentFieldsAccess* pDestIDFA = pDest->m_pTextNode->getIDocumentFieldsAccess();
 
-    SwFmtFld& rDestFmtFld = (SwFmtFld&)pDest->GetFmtFld();
-    const sal_uInt16 nFldWhich = rDestFmtFld.GetField()->GetTyp()->Which();
+    SwFormatField& rDestFormatField = (SwFormatField&)pDest->GetFormatField();
+    const sal_uInt16 nFieldWhich = rDestFormatField.GetField()->GetTyp()->Which();
 
     if( pIDFA != pDestIDFA )
     {
         // Die Hints stehen in unterschiedlichen Dokumenten,
         // der Feldtyp muss im neuen Dokument angemeldet werden.
         // Z.B: Kopieren ins ClipBoard.
-        SwFieldType* pFldType;
-        if( nFldWhich != RES_DBFLD
-            && nFldWhich != RES_USERFLD
-            && nFldWhich != RES_SETEXPFLD
-            && nFldWhich != RES_DDEFLD
-            && RES_AUTHORITY != nFldWhich )
+        SwFieldType* pFieldType;
+        if( nFieldWhich != RES_DBFLD
+            && nFieldWhich != RES_USERFLD
+            && nFieldWhich != RES_SETEXPFLD
+            && nFieldWhich != RES_DDEFLD
+            && RES_AUTHORITY != nFieldWhich )
         {
-            pFldType = pDestIDFA->GetSysFldType( nFldWhich );
+            pFieldType = pDestIDFA->GetSysFieldType( nFieldWhich );
         }
         else
         {
-            pFldType = pDestIDFA->InsertFldType( *rDestFmtFld.GetField()->GetTyp() );
+            pFieldType = pDestIDFA->InsertFieldType( *rDestFormatField.GetField()->GetTyp() );
         }
 
         // Sonderbehandlung fuer DDE-Felder
-        if( RES_DDEFLD == nFldWhich )
+        if( RES_DDEFLD == nFieldWhich )
         {
-            if( rDestFmtFld.GetTxtFld() )
+            if( rDestFormatField.GetTextField() )
             {
-                static_cast<SwDDEFieldType*>(rDestFmtFld.GetField()->GetTyp())->DecRefCnt();
+                static_cast<SwDDEFieldType*>(rDestFormatField.GetField()->GetTyp())->DecRefCnt();
             }
-            static_cast<SwDDEFieldType*>(pFldType)->IncRefCnt();
+            static_cast<SwDDEFieldType*>(pFieldType)->IncRefCnt();
         }
 
-        OSL_ENSURE( pFldType, "unbekannter FieldType" );
-        pFldType->Add( &rDestFmtFld );          // ummelden
-        rDestFmtFld.GetField()->ChgTyp( pFldType );
+        OSL_ENSURE( pFieldType, "unbekannter FieldType" );
+        pFieldType->Add( &rDestFormatField );          // ummelden
+        rDestFormatField.GetField()->ChgTyp( pFieldType );
     }
 
     // Expressionfelder Updaten
-    if( nFldWhich == RES_SETEXPFLD
-        || nFldWhich == RES_GETEXPFLD
-        || nFldWhich == RES_HIDDENTXTFLD )
+    if( nFieldWhich == RES_SETEXPFLD
+        || nFieldWhich == RES_GETEXPFLD
+        || nFieldWhich == RES_HIDDENTXTFLD )
     {
-        SwTxtFld* pFld = const_cast<SwTxtFld*>(this);
-        pDestIDFA->UpdateExpFlds( pFld, true );
+        SwTextField* pField = const_cast<SwTextField*>(this);
+        pDestIDFA->UpdateExpFields( pField, true );
     }
     // Tabellenfelder auf externe Darstellung
-    else if( RES_TABLEFLD == nFldWhich
-             && static_cast<SwTblField*>(rDestFmtFld.GetField())->IsIntrnlName() )
+    else if( RES_TABLEFLD == nFieldWhich
+             && static_cast<SwTableField*>(rDestFormatField.GetField())->IsIntrnlName() )
     {
         // erzeuge aus der internen (fuer CORE) die externe (fuer UI) Formel
-        const SwTableNode* pTblNd = m_pTxtNode->FindTableNode();
-        if( pTblNd )        // steht in einer Tabelle
-            static_cast<SwTblField*>(rDestFmtFld.GetField())->PtrToBoxNm( &pTblNd->GetTable() );
+        const SwTableNode* pTableNd = m_pTextNode->FindTableNode();
+        if( pTableNd )        // steht in einer Tabelle
+            static_cast<SwTableField*>(rDestFormatField.GetField())->PtrToBoxNm( &pTableNd->GetTable() );
     }
 }
 
-void SwTxtFld::NotifyContentChange(SwFmtFld& rFmtFld)
+void SwTextField::NotifyContentChange(SwFormatField& rFormatField)
 {
     //if not in undo section notify the change
-    if (m_pTxtNode && m_pTxtNode->GetNodes().IsDocNodes())
+    if (m_pTextNode && m_pTextNode->GetNodes().IsDocNodes())
     {
-        m_pTxtNode->ModifyNotification(0, &rFmtFld);
+        m_pTextNode->ModifyNotification(0, &rFormatField);
     }
 }
 
 /*static*/
-void SwTxtFld::GetPamForTxtFld(
-    const SwTxtFld& rTxtFld,
-    boost::shared_ptr< SwPaM >& rPamForTxtFld )
+void SwTextField::GetPamForTextField(
+    const SwTextField& rTextField,
+    boost::shared_ptr< SwPaM >& rPamForTextField )
 {
-    if (rTxtFld.GetpTxtNode() == NULL)
+    if (rTextField.GetpTextNode() == NULL)
     {
-        SAL_WARN("sw.core", "<SwTxtFld::GetPamForField> - missing <SwTxtNode>");
+        SAL_WARN("sw.core", "<SwTextField::GetPamForField> - missing <SwTextNode>");
         return;
     }
 
-    const SwTxtNode& rTxtNode = rTxtFld.GetTxtNode();
+    const SwTextNode& rTextNode = rTextField.GetTextNode();
 
-    rPamForTxtFld.reset( new SwPaM( rTxtNode,
-                                    (rTxtFld.End() != NULL) ? *(rTxtFld.End()) : ( rTxtFld.GetStart() + 1 ),
-                                    rTxtNode,
-                                    rTxtFld.GetStart() ) );
+    rPamForTextField.reset( new SwPaM( rTextNode,
+                                    (rTextField.End() != NULL) ? *(rTextField.End()) : ( rTextField.GetStart() + 1 ),
+                                    rTextNode,
+                                    rTextField.GetStart() ) );
 
 }
 
 /*static*/
-void SwTxtFld::DeleteTxtFld( const SwTxtFld& rTxtFld )
+void SwTextField::DeleteTextField( const SwTextField& rTextField )
 {
-    if (rTxtFld.GetpTxtNode() != NULL)
+    if (rTextField.GetpTextNode() != NULL)
     {
-        boost::shared_ptr< SwPaM > pPamForTxtFld;
-        GetPamForTxtFld(rTxtFld, pPamForTxtFld);
-        if (pPamForTxtFld.get() != NULL)
+        boost::shared_ptr< SwPaM > pPamForTextField;
+        GetPamForTextField(rTextField, pPamForTextField);
+        if (pPamForTextField.get() != NULL)
         {
-            rTxtFld.GetTxtNode().GetDoc()->getIDocumentContentOperations().DeleteAndJoin(*pPamForTxtFld);
+            rTextField.GetTextNode().GetDoc()->getIDocumentContentOperations().DeleteAndJoin(*pPamForTextField);
         }
     }
 }
 
-// class SwTxtInputFld ///////////////////////////////////////////////
+// class SwTextInputField ///////////////////////////////////////////////
 
 // input field in-place editing
-SwTxtInputFld::SwTxtInputFld(
-    SwFmtFld & rAttr,
+SwTextInputField::SwTextInputField(
+    SwFormatField & rAttr,
     sal_Int32 const nStart,
     sal_Int32 const nEnd,
     bool const bInClipboard )
 
-    : SwTxtAttr( rAttr, nStart )
-    , SwTxtAttrNesting( rAttr, nStart, nEnd )
-    , SwTxtFld( rAttr, nStart, bInClipboard )
+    : SwTextAttr( rAttr, nStart )
+    , SwTextAttrNesting( rAttr, nStart, nEnd )
+    , SwTextField( rAttr, nStart, bInClipboard )
     , m_bLockNotifyContentChange( false )
 {
     SetHasDummyChar( false );
     SetHasContent( true );
 }
 
-SwTxtInputFld::~SwTxtInputFld()
+SwTextInputField::~SwTextInputField()
 {
 }
 
-void SwTxtInputFld::LockNotifyContentChange()
+void SwTextInputField::LockNotifyContentChange()
 {
     m_bLockNotifyContentChange = true;
 }
 
-void SwTxtInputFld::UnlockNotifyContentChange()
+void SwTextInputField::UnlockNotifyContentChange()
 {
     m_bLockNotifyContentChange = false;
 }
 
-void SwTxtInputFld::NotifyContentChange( SwFmtFld& rFmtFld )
+void SwTextInputField::NotifyContentChange( SwFormatField& rFormatField )
 {
     if ( !m_bLockNotifyContentChange )
     {
         LockNotifyContentChange();
 
-        SwTxtFld::NotifyContentChange( rFmtFld );
+        SwTextField::NotifyContentChange( rFormatField );
         UpdateTextNodeContent( GetFieldContent() );
 
         UnlockNotifyContentChange();
     }
 }
 
-const OUString SwTxtInputFld::GetFieldContent() const
+const OUString SwTextInputField::GetFieldContent() const
 {
-    return GetFmtFld().GetField()->ExpandField(false);
+    return GetFormatField().GetField()->ExpandField(false);
 }
 
-void SwTxtInputFld::UpdateFieldContent()
+void SwTextInputField::UpdateFieldContent()
 {
-    if ( IsFldInDoc()
+    if ( IsFieldInDoc()
          && GetStart() != (*End()) )
     {
         OSL_ENSURE( (*End()) - GetStart() >= 2,
-                "<SwTxtInputFld::UpdateFieldContent()> - Are CH_TXT_ATR_INPUTFIELDSTART and/or CH_TXT_ATR_INPUTFIELDEND missing?" );
+                "<SwTextInputField::UpdateFieldContent()> - Are CH_TXT_ATR_INPUTFIELDSTART and/or CH_TXT_ATR_INPUTFIELDEND missing?" );
         // skip CH_TXT_ATR_INPUTFIELDSTART character
         const sal_Int32 nIdx = GetStart() + 1;
         // skip CH_TXT_ATR_INPUTFIELDEND character
         const sal_Int32 nLen = static_cast<sal_Int32>(std::max<sal_Int32>( 0, ( (*End()) - 1 - nIdx ) ));
-        const OUString aNewFieldContent = GetTxtNode().GetExpandTxt( nIdx, nLen );
+        const OUString aNewFieldContent = GetTextNode().GetExpandText( nIdx, nLen );
 
-        const SwInputField* pInputFld = dynamic_cast<const SwInputField*>(GetFmtFld().GetField());
-        OSL_ENSURE( pInputFld != NULL,
-                "<SwTxtInputFld::GetContent()> - Missing <SwInputFld> instance!" );
-        if ( pInputFld != NULL )
+        const SwInputField* pInputField = dynamic_cast<const SwInputField*>(GetFormatField().GetField());
+        OSL_ENSURE( pInputField != NULL,
+                "<SwTextInputField::GetContent()> - Missing <SwInputField> instance!" );
+        if ( pInputField != NULL )
         {
-            const_cast<SwInputField*>(pInputFld)->applyFieldContent( aNewFieldContent );
+            const_cast<SwInputField*>(pInputField)->applyFieldContent( aNewFieldContent );
             // trigger update of fields for scenarios in which the Input Field's content is part of e.g. a table formula
-            GetTxtNode().GetDoc()->getIDocumentFieldsAccess().GetUpdtFlds().SetFieldsDirty(true);
+            GetTextNode().GetDoc()->getIDocumentFieldsAccess().GetUpdateFields().SetFieldsDirty(true);
         }
     }
 }
 
-void SwTxtInputFld::UpdateTextNodeContent( const OUString& rNewContent )
+void SwTextInputField::UpdateTextNodeContent( const OUString& rNewContent )
 {
-    if ( !IsFldInDoc() )
+    if ( !IsFieldInDoc() )
     {
-        OSL_ENSURE( false, "<SwTxtInputFld::UpdateTextNodeContent(..)> - misusage as Input Field is not in document content." );
+        OSL_ENSURE( false, "<SwTextInputField::UpdateTextNodeContent(..)> - misusage as Input Field is not in document content." );
         return;
     }
 
     OSL_ENSURE( (*End()) - GetStart() >= 2,
-            "<SwTxtInputFld::UpdateTextNodeContent(..)> - Are CH_TXT_ATR_INPUTFIELDSTART and/or CH_TXT_ATR_INPUTFIELDEND missing?" );
+            "<SwTextInputField::UpdateTextNodeContent(..)> - Are CH_TXT_ATR_INPUTFIELDSTART and/or CH_TXT_ATR_INPUTFIELDEND missing?" );
     // skip CH_TXT_ATR_INPUTFIELDSTART character
     const sal_Int32 nIdx = GetStart() + 1;
     // skip CH_TXT_ATR_INPUTFIELDEND character
     const sal_Int32 nDelLen = std::max<sal_Int32>( 0, ( (*End()) - 1 - nIdx ) );
-    SwIndex aIdx( &GetTxtNode(), nIdx );
-    GetTxtNode().ReplaceText( aIdx, nDelLen, rNewContent );
+    SwIndex aIdx( &GetTextNode(), nIdx );
+    GetTextNode().ReplaceText( aIdx, nDelLen, rNewContent );
 }
 
-// class SwTxtAnnotationFld //////////////////////////////////////////
+// class SwTextAnnotationField //////////////////////////////////////////
 
 // text annotation field
-SwTxtAnnotationFld::SwTxtAnnotationFld(
-    SwFmtFld & rAttr,
+SwTextAnnotationField::SwTextAnnotationField(
+    SwFormatField & rAttr,
     sal_Int32 const nStart,
     bool const bInClipboard )
-    : SwTxtAttr( rAttr, nStart )
-    , SwTxtFld( rAttr, nStart, bInClipboard )
+    : SwTextAttr( rAttr, nStart )
+    , SwTextField( rAttr, nStart, bInClipboard )
 {
 }
 
-SwTxtAnnotationFld::~SwTxtAnnotationFld()
+SwTextAnnotationField::~SwTextAnnotationField()
 {
 }
 
-::sw::mark::IMark* SwTxtAnnotationFld::GetAnnotationMark(
+::sw::mark::IMark* SwTextAnnotationField::GetAnnotationMark(
     SwDoc* pDoc ) const
 {
-    const SwPostItField* pPostItField = dynamic_cast<const SwPostItField*>(GetFmtFld().GetField());
-    OSL_ENSURE( pPostItField != NULL, "<SwTxtAnnotationFld::GetAnnotationMark()> - field missing" );
+    const SwPostItField* pPostItField = dynamic_cast<const SwPostItField*>(GetFormatField().GetField());
+    OSL_ENSURE( pPostItField != NULL, "<SwTextAnnotationField::GetAnnotationMark()> - field missing" );
     if ( pPostItField == NULL )
     {
         return NULL;
@@ -627,7 +627,7 @@ SwTxtAnnotationFld::~SwTxtAnnotationFld()
     {
         pDoc = static_cast<const SwPostItFieldType*>(pPostItField->GetTyp())->GetDoc();
     }
-    OSL_ENSURE( pDoc != NULL, "<SwTxtAnnotationFld::GetAnnotationMark()> - missing document" );
+    OSL_ENSURE( pDoc != NULL, "<SwTextAnnotationField::GetAnnotationMark()> - missing document" );
     if ( pDoc == NULL )
     {
         return NULL;
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index 009e5c004242..bca151d1dd74 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -35,87 +35,87 @@
 #include <objectformatter.hxx>
 #include <calbck.hxx>
 
-SwFmtFlyCnt::SwFmtFlyCnt( SwFrmFmt *pFrmFmt )
+SwFormatFlyCnt::SwFormatFlyCnt( SwFrameFormat *pFrameFormat )
     : SfxPoolItem( RES_TXTATR_FLYCNT ),
-    pTxtAttr( 0 ),
-    pFmt( pFrmFmt )
+    pTextAttr( 0 ),
+    pFormat( pFrameFormat )
 {
 }
 
-bool SwFmtFlyCnt::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatFlyCnt::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return( pTxtAttr && static_cast<const SwFmtFlyCnt&>(rAttr).pTxtAttr &&
-            pTxtAttr->GetStart() == static_cast<const SwFmtFlyCnt&>(rAttr).pTxtAttr->GetStart() &&
-            pFmt == static_cast<const SwFmtFlyCnt&>(rAttr).GetFrmFmt() );
+    return( pTextAttr && static_cast<const SwFormatFlyCnt&>(rAttr).pTextAttr &&
+            pTextAttr->GetStart() == static_cast<const SwFormatFlyCnt&>(rAttr).pTextAttr->GetStart() &&
+            pFormat == static_cast<const SwFormatFlyCnt&>(rAttr).GetFrameFormat() );
 }
 
-SfxPoolItem* SwFmtFlyCnt::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatFlyCnt::Clone( SfxItemPool* ) const
 {
-    return new SwFmtFlyCnt( pFmt );
+    return new SwFormatFlyCnt( pFormat );
 }
 
-SwTxtFlyCnt::SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStartPos )
-    : SwTxtAttr( rAttr, nStartPos )
+SwTextFlyCnt::SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStartPos )
+    : SwTextAttr( rAttr, nStartPos )
 {
-    rAttr.pTxtAttr = this;
+    rAttr.pTextAttr = this;
     SetHasDummyChar(true);
 }
 
 /*
  * An dieser Stelle soll einmal der Gesamtzusammenhang bei der Erzeugung
- * eines neuen SwTxtFlyCnt erlaeutert werden.
- * Das MakeTxtHint() wird z.B. im SwTxtNode::Copy() gerufen.
+ * eines neuen SwTextFlyCnt erlaeutert werden.
+ * Das MakeTextHint() wird z.B. im SwTextNode::Copy() gerufen.
  * Fuer die komplette Verdopplung sind folgende Schritte notwendig:
- * 1) Duplizieren des pFmt incl. Inhalt, Attributen etc.
+ * 1) Duplizieren des pFormat incl. Inhalt, Attributen etc.
  * 2) Setzen des Ankers
  * 3) Benachrichtigung
  * Da fuer die Bewaeltigung der Aufgaben nicht immer alle Informationen
  * bereitstehen und darueber hinaus bestimmte Methoden erst zu einem
  * spaeteren Zeitpunkt gerufen werden duerfen (weil nocht nicht alle
  * Nodeinformationen vorliegen), verteilt sich der Ablauf.
- * ad 1) MakeTxtHint() wird durch den Aufruf von SwDoc::CopyLayout()
- * der das neue FlyFrmFmt erzeugt und mit dem duplizierten Inhalt des
+ * ad 1) MakeTextHint() wird durch den Aufruf von SwDoc::CopyLayout()
+ * der das neue FlyFrameFormat erzeugt und mit dem duplizierten Inhalt des
  * FlyFrm verbunden.
- * ad 2) SetAnchor() wird von SwTxtNode::Insert() gerufen und sorgt fuer das
- * setzen des Ankers (die SwPosition des Dummy-Zeichens wird dem FlyFrmFmt
- * per SetAttr bekannt gegeben). Dies kann nicht im MakeTxtHint erledigt
+ * ad 2) SetAnchor() wird von SwTextNode::Insert() gerufen und sorgt fuer das
+ * setzen des Ankers (die SwPosition des Dummy-Zeichens wird dem FlyFrameFormat
+ * per SetAttr bekannt gegeben). Dies kann nicht im MakeTextHint erledigt
  * werden, da der Zielnode unbestimmt ist.
  * ad 3) _GetFlyFrm() wird im Formatierungsprozess vom LineIter gerufen
- * und sucht den FlyFrm zum Dummyzeichen des aktuellen CntntFrm. Wird keiner
+ * und sucht den FlyFrm zum Dummyzeichen des aktuellen ContentFrm. Wird keiner
  * gefunden, so wird ein neuer FlyFrm angelegt.
- * Kritisch an diesem Vorgehen ist, dass das pCntnt->AppendFly() eine
- * sofortige Neuformatierung von pCntnt anstoesst. Die Rekursion kommt
- * allerdings durch den Lockmechanismus in SwTxtFrm::Format() nicht
+ * Kritisch an diesem Vorgehen ist, dass das pContent->AppendFly() eine
+ * sofortige Neuformatierung von pContent anstoesst. Die Rekursion kommt
+ * allerdings durch den Lockmechanismus in SwTextFrm::Format() nicht
  * zu stande.
  * Attraktiv ist der Umstand, dass niemand ueber die vom Node abhaengigen
- * CntntFrms iterieren braucht, um die FlyInCntFrm anzulegen. Dies geschieht
+ * ContentFrms iterieren braucht, um die FlyInCntFrm anzulegen. Dies geschieht
  * bei der Arbeit.
  */
 
-void SwTxtFlyCnt::CopyFlyFmt( SwDoc* pDoc )
+void SwTextFlyCnt::CopyFlyFormat( SwDoc* pDoc )
 {
-    SwFrmFmt* pFmt = GetFlyCnt().GetFrmFmt();
-    OSL_ENSURE( pFmt, "von welchem Format soll ich eine Kopie erzeugen?" );
-    // Das FlyFrmFmt muss dupliziert werden.
-    // In CopyLayoutFmt (siehe doclay.cxx) wird das FlyFrmFmt erzeugt
+    SwFrameFormat* pFormat = GetFlyCnt().GetFrameFormat();
+    OSL_ENSURE( pFormat, "von welchem Format soll ich eine Kopie erzeugen?" );
+    // Das FlyFrameFormat muss dupliziert werden.
+    // In CopyLayoutFormat (siehe doclay.cxx) wird das FlyFrameFormat erzeugt
     // und der Inhalt dupliziert.
 
     // disable undo while copying attribute
     ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-    SwFmtAnchor aAnchor( pFmt->GetAnchor() );
+    SwFormatAnchor aAnchor( pFormat->GetAnchor() );
     if ((FLY_AT_PAGE != aAnchor.GetAnchorId()) &&
-        (pDoc != pFmt->GetDoc()))   // different documents?
+        (pDoc != pFormat->GetDoc()))   // different documents?
     {
         // JP 03.06.96: dann sorge dafuer, das der koperierte Anker auf
         //              gueltigen Content zeigt! Die Umsetzung auf die
         //              richtige Position erfolgt spaeter.
         SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), +2 );
-        SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+        SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
         if( !pCNd )
             pCNd = pDoc->GetNodes().GoNext( &aIdx );
 
-        SwPosition pos = *aAnchor.GetCntntAnchor();
+        SwPosition pos = *aAnchor.GetContentAnchor();
         pos.nNode = aIdx;
         if (FLY_AS_CHAR == aAnchor.GetAnchorId())
         {
@@ -124,21 +124,21 @@ void SwTxtFlyCnt::CopyFlyFmt( SwDoc* pDoc )
         else
         {
             pos.nContent.Assign( 0, 0 );
-            OSL_ENSURE( false, "CopyFlyFmt: Was fuer ein Anker?" );
+            OSL_ENSURE( false, "CopyFlyFormat: Was fuer ein Anker?" );
         }
         aAnchor.SetAnchor( &pos );
     }
 
-    SwFrmFmt* pNew = pDoc->getIDocumentLayoutAccess().CopyLayoutFmt( *pFmt, aAnchor, false, false );
-    ((SwFmtFlyCnt&)GetFlyCnt()).SetFlyFmt( pNew );
+    SwFrameFormat* pNew = pDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFormat, aAnchor, false, false );
+    ((SwFormatFlyCnt&)GetFlyCnt()).SetFlyFormat( pNew );
 }
 
-// SetAnchor() wird von SwTxtNode::Insert() gerufen und sorgt fuer das
-// setzen des Ankers (die SwPosition des Dummy-Zeichens wird dem FlyFrmFmt
-// per SetAttr bekannt gegeben). Dies kann nicht im MakeTxtHint erledigt
+// SetAnchor() wird von SwTextNode::Insert() gerufen und sorgt fuer das
+// setzen des Ankers (die SwPosition des Dummy-Zeichens wird dem FlyFrameFormat
+// per SetAttr bekannt gegeben). Dies kann nicht im MakeTextHint erledigt
 // werden, da der Zielnode unbestimmt ist.
-// (siehe Kommentar in SwTxtFlyCnt::MakeTxtHint)
-void SwTxtFlyCnt::SetAnchor( const SwTxtNode *pNode )
+// (siehe Kommentar in SwTextFlyCnt::MakeTextHint)
+void SwTextFlyCnt::SetAnchor( const SwTextNode *pNode )
 {
     // fuers Undo muss der neue Anker schon bekannt sein !
 
@@ -146,17 +146,17 @@ void SwTxtFlyCnt::SetAnchor( const SwTxtNode *pNode )
 
     SwDoc* pDoc = const_cast<SwDoc*>(pNode->GetDoc());
 
-    SwIndex aIdx( const_cast<SwTxtNode*>(pNode), GetStart() );
+    SwIndex aIdx( const_cast<SwTextNode*>(pNode), GetStart() );
     SwPosition aPos( *pNode->StartOfSectionNode(), aIdx );
-    SwFrmFmt* pFmt = GetFlyCnt().GetFrmFmt();
-    SwFmtAnchor aAnchor( pFmt->GetAnchor() );
+    SwFrameFormat* pFormat = GetFlyCnt().GetFrameFormat();
+    SwFormatAnchor aAnchor( pFormat->GetAnchor() );
 
-    if( !aAnchor.GetCntntAnchor() ||
-        !aAnchor.GetCntntAnchor()->nNode.GetNode().GetNodes().IsDocNodes() ||
-        &aAnchor.GetCntntAnchor()->nNode.GetNode() != (SwNode*)pNode )
+    if( !aAnchor.GetContentAnchor() ||
+        !aAnchor.GetContentAnchor()->nNode.GetNode().GetNodes().IsDocNodes() ||
+        &aAnchor.GetContentAnchor()->nNode.GetNode() != (SwNode*)pNode )
         aPos.nNode = *pNode;
     else
-        aPos.nNode = aAnchor.GetCntntAnchor()->nNode;
+        aPos.nNode = aAnchor.GetContentAnchor()->nNode;
 
     aAnchor.SetType( FLY_AS_CHAR );        // default!
     aAnchor.SetAnchor( &aPos );
@@ -165,67 +165,67 @@ void SwTxtFlyCnt::SetAnchor( const SwTxtNode *pNode )
     // JP 25.04.95: wird innerhalb des SplitNodes die Frames verschoben
     //              koennen die Frames erhalten bleiben.
     if( ( !pNode->GetpSwpHints() || !pNode->GetpSwpHints()->IsInSplitNode() )
-        && RES_DRAWFRMFMT != pFmt->Which() )
-        pFmt->DelFrms();
+        && RES_DRAWFRMFMT != pFormat->Which() )
+        pFormat->DelFrms();
 
     // stehen wir noch im falschen Dokument ?
-    if( pDoc != pFmt->GetDoc() )
+    if( pDoc != pFormat->GetDoc() )
     {
         // disable undo while copying attribute
         ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-        SwFrmFmt* pNew = pDoc->getIDocumentLayoutAccess().CopyLayoutFmt( *pFmt, aAnchor, false, false );
+        SwFrameFormat* pNew = pDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFormat, aAnchor, false, false );
 
-        ::sw::UndoGuard const undoGuardFmt(
-            pFmt->GetDoc()->GetIDocumentUndoRedo());
-        pFmt->GetDoc()->getIDocumentLayoutAccess().DelLayoutFmt( pFmt );
-        ((SwFmtFlyCnt&)GetFlyCnt()).SetFlyFmt( pNew );
+        ::sw::UndoGuard const undoGuardFormat(
+            pFormat->GetDoc()->GetIDocumentUndoRedo());
+        pFormat->GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat( pFormat );
+        ((SwFormatFlyCnt&)GetFlyCnt()).SetFlyFormat( pNew );
     }
     else if( pNode->GetpSwpHints() &&
             pNode->GetpSwpHints()->IsInSplitNode() &&
-            RES_DRAWFRMFMT != pFmt->Which() )
+            RES_DRAWFRMFMT != pFormat->Which() )
     {
-        pFmt->LockModify();
-        pFmt->SetFmtAttr( aAnchor );        // nur den Anker neu setzen
-        pFmt->UnlockModify();
+        pFormat->LockModify();
+        pFormat->SetFormatAttr( aAnchor );        // nur den Anker neu setzen
+        pFormat->UnlockModify();
     }
     else
-        pFmt->SetFmtAttr( aAnchor );        // nur den Anker neu setzen
+        pFormat->SetFormatAttr( aAnchor );        // nur den Anker neu setzen
 
     // Am Node haengen u.a. abhaengige CntFrms.
     // Fuer jeden CntFrm wird ein SwFlyInCntFrm angelegt.
 }
 
 // _GetFlyFrm() wird im Formatierungsprozess vom LineIter gerufen
-// und sucht den FlyFrm zum Dummyzeichen des aktuellen CntntFrm. Wird keiner
+// und sucht den FlyFrm zum Dummyzeichen des aktuellen ContentFrm. Wird keiner
 // gefunden, so wird ein neuer FlyFrm angelegt.
-// (siehe Kommentar ind SwTxtFlyCnt::MakeTxtHint)
-SwFlyInCntFrm *SwTxtFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm )
+// (siehe Kommentar ind SwTextFlyCnt::MakeTextHint)
+SwFlyInCntFrm *SwTextFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm )
 {
-    SwFrmFmt* pFrmFmt = GetFlyCnt().GetFrmFmt();
-    if( RES_DRAWFRMFMT == pFrmFmt->Which() )
+    SwFrameFormat* pFrameFormat = GetFlyCnt().GetFrameFormat();
+    if( RES_DRAWFRMFMT == pFrameFormat->Which() )
     {
-        OSL_ENSURE(  false, "SwTxtFlyCnt::_GetFlyFrm: DrawInCnt-Baustelle!" );
+        OSL_ENSURE(  false, "SwTextFlyCnt::_GetFlyFrm: DrawInCnt-Baustelle!" );
         return NULL;
     }
 
-    SwIterator<SwFlyFrm,SwFmt> aIter( *GetFlyCnt().pFmt );
-    OSL_ENSURE( pCurrFrm->IsTxtFrm(), "SwTxtFlyCnt::_GetFlyFrm for TxtFrms only." );
+    SwIterator<SwFlyFrm,SwFormat> aIter( *GetFlyCnt().pFormat );
+    OSL_ENSURE( pCurrFrm->IsTextFrm(), "SwTextFlyCnt::_GetFlyFrm for TextFrms only." );
     SwFrm* pFrm = aIter.First();
     if ( pFrm )
     {
-        SwTxtFrm *pFirst = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCurrFrm));
+        SwTextFrm *pFirst = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pCurrFrm));
         while ( pFirst->IsFollow() )
             pFirst = pFirst->FindMaster();
         do
             {
-                SwTxtFrm *pTmp = pFirst;
+                SwTextFrm *pTmp = pFirst;
                 do
                 {   if( static_cast<SwFlyFrm*>(pFrm)->GetAnchorFrm() == static_cast<SwFrm*>(pTmp) )
                     {
                         if ( pTmp != pCurrFrm )
                         {
                             pTmp->RemoveFly( static_cast<SwFlyFrm*>(pFrm) );
-                            const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCurrFrm))->AppendFly( static_cast<SwFlyFrm*>(pFrm) );
+                            const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pCurrFrm))->AppendFly( static_cast<SwFlyFrm*>(pFrm) );
                         }
                         return static_cast<SwFlyInCntFrm*>(pFrm);
                     }
@@ -240,10 +240,10 @@ SwFlyInCntFrm *SwTxtFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm )
     // Wir haben keinen passenden FlyFrm gefunden, deswegen wird ein
     // neuer angelegt.
     // Dabei wird eine sofortige Neuformatierung von pCurrFrm angestossen.
-    // Die Rekursion wird durch den Lockmechanismus in SwTxtFrm::Format()
+    // Die Rekursion wird durch den Lockmechanismus in SwTextFrm::Format()
     // abgewuergt.
     SwFrm* pCurrFrame = const_cast< SwFrm* >(pCurrFrm);
-    SwFlyInCntFrm *pFly = new SwFlyInCntFrm( static_cast<SwFlyFrmFmt*>(pFrmFmt), pCurrFrame, pCurrFrame );
+    SwFlyInCntFrm *pFly = new SwFlyInCntFrm( static_cast<SwFlyFrameFormat*>(pFrameFormat), pCurrFrame, pCurrFrame );
     pCurrFrame->AppendFly( pFly );
     pFly->RegistFlys();
 
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index 0d3db1110825..aab92d3e93a8 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -42,27 +42,27 @@ namespace {
     /// @param[in]  pExclude A footnote whose reference number should be excluded from the set.
     /// @param[out] rUsedRef The set of used reference numbers.
     /// @param[out] rInvalid  A returned list of all items that had an invalid reference number.
-    static void lcl_FillUsedFtnRefNumbers(SwDoc &rDoc,
-                                         SwTxtFtn *pExclude,
+    static void lcl_FillUsedFootnoteRefNumbers(SwDoc &rDoc,
+                                         SwTextFootnote *pExclude,
                                          std::set<sal_uInt16> &rUsedRef,
-                                         std::vector<SwTxtFtn*> &rInvalid)
+                                         std::vector<SwTextFootnote*> &rInvalid)
     {
-        SwFtnIdxs& ftnIdxs = rDoc.GetFtnIdxs();
+        SwFootnoteIdxs& ftnIdxs = rDoc.GetFootnoteIdxs();
 
         rInvalid.clear();
 
         for( size_t n = 0; n < ftnIdxs.size(); ++n )
         {
-            SwTxtFtn* pTxtFtn = ftnIdxs[ n ];
-            if ( pTxtFtn != pExclude )
+            SwTextFootnote* pTextFootnote = ftnIdxs[ n ];
+            if ( pTextFootnote != pExclude )
             {
-                if ( USHRT_MAX == pTxtFtn->GetSeqRefNo() )
+                if ( USHRT_MAX == pTextFootnote->GetSeqRefNo() )
                 {
-                    rInvalid.push_back(pTxtFtn);
+                    rInvalid.push_back(pTextFootnote);
                 }
                 else
                 {
-                    rUsedRef.insert( pTxtFtn->GetSeqRefNo() );
+                    rUsedRef.insert( pTextFootnote->GetSeqRefNo() );
                 }
             }
         }
@@ -117,33 +117,33 @@ namespace {
 
 }
 
-SwFmtFtn::SwFmtFtn( bool bEndNote )
+SwFormatFootnote::SwFormatFootnote( bool bEndNote )
     : SfxPoolItem( RES_TXTATR_FTN )
     , SwModify(0)
-    , m_pTxtAttr(0)
+    , m_pTextAttr(0)
     , m_nNumber(0)
     , m_bEndNote(bEndNote)
 {
 }
 
-bool SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatFootnote::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return m_nNumber  == static_cast<const SwFmtFtn&>(rAttr).m_nNumber &&
-           m_aNumber  == static_cast<const SwFmtFtn&>(rAttr).m_aNumber &&
-           m_bEndNote == static_cast<const SwFmtFtn&>(rAttr).m_bEndNote;
+    return m_nNumber  == static_cast<const SwFormatFootnote&>(rAttr).m_nNumber &&
+           m_aNumber  == static_cast<const SwFormatFootnote&>(rAttr).m_aNumber &&
+           m_bEndNote == static_cast<const SwFormatFootnote&>(rAttr).m_bEndNote;
 }
 
-SfxPoolItem* SwFmtFtn::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatFootnote::Clone( SfxItemPool* ) const
 {
-    SwFmtFtn* pNew  = new SwFmtFtn;
+    SwFormatFootnote* pNew  = new SwFormatFootnote;
     pNew->m_aNumber = m_aNumber;
     pNew->m_nNumber = m_nNumber;
     pNew->m_bEndNote = m_bEndNote;
     return pNew;
 }
 
-void SwFmtFtn::Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
+void SwFormatFootnote::Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
 {
     NotifyClients(pOld, pNew);
     if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
@@ -152,45 +152,45 @@ void SwFmtFtn::Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
     }
 }
 
-void SwFmtFtn::InvalidateFootnote()
+void SwFormatFootnote::InvalidateFootnote()
 {
     SwPtrMsgPoolItem const item(RES_REMOVE_UNO_OBJECT,
             &static_cast<SwModify&>(*this)); // cast to base class (void*)
     NotifyClients(&item, &item);
 }
 
-void SwFmtFtn::SetEndNote( bool b )
+void SwFormatFootnote::SetEndNote( bool b )
 {
     if ( b != m_bEndNote )
     {
-        if ( GetTxtFtn() )
+        if ( GetTextFootnote() )
         {
-            GetTxtFtn()->DelFrms(0);
+            GetTextFootnote()->DelFrms(0);
         }
         m_bEndNote = b;
     }
 }
 
-SwFmtFtn::~SwFmtFtn()
+SwFormatFootnote::~SwFormatFootnote()
 {
 }
 
-void SwFmtFtn::GetFtnText( OUString& rStr ) const
+void SwFormatFootnote::GetFootnoteText( OUString& rStr ) const
 {
-    if( m_pTxtAttr->GetStartNode() )
+    if( m_pTextAttr->GetStartNode() )
     {
-        SwNodeIndex aIdx( *m_pTxtAttr->GetStartNode(), 1 );
-        SwCntntNode* pCNd = aIdx.GetNode().GetTxtNode();
+        SwNodeIndex aIdx( *m_pTextAttr->GetStartNode(), 1 );
+        SwContentNode* pCNd = aIdx.GetNode().GetTextNode();
         if( !pCNd )
             pCNd = aIdx.GetNodes().GoNext( &aIdx );
 
-        if( pCNd->IsTxtNode() ) {
-            rStr = static_cast<SwTxtNode*>(pCNd)->GetExpandTxt();
+        if( pCNd->IsTextNode() ) {
+            rStr = static_cast<SwTextNode*>(pCNd)->GetExpandText();
 
             ++aIdx;
             while ( !aIdx.GetNode().IsEndNode() ) {
-                if ( aIdx.GetNode().IsTxtNode() )
-                    rStr += "  " + static_cast<SwTxtNode*>((aIdx.GetNode().GetTxtNode()))->GetExpandTxt();
+                if ( aIdx.GetNode().IsTextNode() )
+                    rStr += "  " + static_cast<SwTextNode*>((aIdx.GetNode().GetTextNode()))->GetExpandText();
                 ++aIdx;
             }
         }
@@ -198,7 +198,7 @@ void SwFmtFtn::GetFtnText( OUString& rStr ) const
 }
 
     // returnt den anzuzeigenden String der Fuss-/Endnote
-OUString SwFmtFtn::GetViewNumStr( const SwDoc& rDoc, bool bInclStrings ) const
+OUString SwFormatFootnote::GetViewNumStr( const SwDoc& rDoc, bool bInclStrings ) const
 {
     OUString sRet( GetNumStr() );
     if( sRet.isEmpty() )
@@ -206,25 +206,25 @@ OUString SwFmtFtn::GetViewNumStr( const SwDoc& rDoc, bool bInclStrings ) const
         // dann ist die Nummer von Interesse, also ueber die Info diese
         // besorgen.
         bool bMakeNum = true;
-        const SwSectionNode* pSectNd = m_pTxtAttr
-                    ? SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr( *m_pTxtAttr )
+        const SwSectionNode* pSectNd = m_pTextAttr
+                    ? SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr( *m_pTextAttr )
                     : 0;
 
         if( pSectNd )
         {
-            const SwFmtFtnEndAtTxtEnd& rFtnEnd = static_cast<const SwFmtFtnEndAtTxtEnd&>(
-                pSectNd->GetSection().GetFmt()->GetFmtAttr(
+            const SwFormatFootnoteEndAtTextEnd& rFootnoteEnd = static_cast<const SwFormatFootnoteEndAtTextEnd&>(
+                pSectNd->GetSection().GetFormat()->GetFormatAttr(
                                 IsEndNote() ?
                                 static_cast<sal_uInt16>(RES_END_AT_TXTEND) :
                                 static_cast<sal_uInt16>(RES_FTN_AT_TXTEND) ) );
 
-            if( FTNEND_ATTXTEND_OWNNUMANDFMT == rFtnEnd.GetValue() )
+            if( FTNEND_ATTXTEND_OWNNUMANDFMT == rFootnoteEnd.GetValue() )
             {
                 bMakeNum = false;
-                sRet = rFtnEnd.GetSwNumType().GetNumStr( GetNumber() );
+                sRet = rFootnoteEnd.GetSwNumType().GetNumStr( GetNumber() );
                 if( bInclStrings )
                 {
-                    sRet = rFtnEnd.GetPrefix() + sRet + rFtnEnd.GetSuffix();
+                    sRet = rFootnoteEnd.GetPrefix() + sRet + rFootnoteEnd.GetSuffix();
                 }
             }
         }
@@ -235,8 +235,8 @@ OUString SwFmtFtn::GetViewNumStr( const SwDoc& rDoc, bool bInclStrings ) const
             if( IsEndNote() )
                 pInfo = &rDoc.GetEndNoteInfo();
             else
-                pInfo = &rDoc.GetFtnInfo();
-            sRet = pInfo->aFmt.GetNumStr( GetNumber() );
+                pInfo = &rDoc.GetFootnoteInfo();
+            sRet = pInfo->aFormat.GetNumStr( GetNumber() );
             if( bInclStrings )
             {
                 sRet = pInfo->GetPrefix() + sRet + pInfo->GetSuffix();
@@ -246,22 +246,22 @@ OUString SwFmtFtn::GetViewNumStr( const SwDoc& rDoc, bool bInclStrings ) const
     return sRet;
 }
 
-SwTxtFtn::SwTxtFtn( SwFmtFtn& rAttr, sal_Int32 nStartPos )
-    : SwTxtAttr( rAttr, nStartPos )
+SwTextFootnote::SwTextFootnote( SwFormatFootnote& rAttr, sal_Int32 nStartPos )
+    : SwTextAttr( rAttr, nStartPos )
     , m_pStartNode( 0 )
-    , m_pTxtNode( 0 )
+    , m_pTextNode( 0 )
     , m_nSeqNo( USHRT_MAX )
 {
-    rAttr.m_pTxtAttr = this;
+    rAttr.m_pTextAttr = this;
     SetHasDummyChar(true);
 }
 
-SwTxtFtn::~SwTxtFtn()
+SwTextFootnote::~SwTextFootnote()
 {
     SetStartNode( 0 );
 }
 
-void SwTxtFtn::SetStartNode( const SwNodeIndex *pNewNode, bool bDelNode )
+void SwTextFootnote::SetStartNode( const SwNodeIndex *pNewNode, bool bDelNode )
 {
     if( pNewNode )
     {
@@ -280,16 +280,16 @@ void SwTxtFtn::SetStartNode( const SwNodeIndex *pNewNode, bool bDelNode )
         // 1) Die Fussnoten muessen bei ihren Seiten abgemeldet werden
         // 2) Die Fussnoten-Sektion in den Inserts muss geloescht werden.
         SwDoc* pDoc;
-        if ( m_pTxtNode )
+        if ( m_pTextNode )
         {
-            pDoc = m_pTxtNode->GetDoc();
+            pDoc = m_pTextNode->GetDoc();
         }
         else
         {
             //JP 27.01.97: der sw3-Reader setzt einen StartNode aber das
             //              Attribut ist noch nicht im TextNode verankert.
             //              Wird es geloescht (z.B. bei Datei einfuegen mit
-            //              Ftn in einen Rahmen), muss auch der Inhalt
+            //              Footnote in einen Rahmen), muss auch der Inhalt
             //              geloescht werden
             pDoc = m_pStartNode->GetNodes().GetDoc();
         }
@@ -314,58 +314,58 @@ void SwTxtFtn::SetStartNode( const SwNodeIndex *pNewNode, bool bDelNode )
         DELETEZ( m_pStartNode );
 
         // loesche die Fussnote noch aus dem Array am Dokument
-        for( size_t n = 0; n < pDoc->GetFtnIdxs().size(); ++n )
-            if( this == pDoc->GetFtnIdxs()[n] )
+        for( size_t n = 0; n < pDoc->GetFootnoteIdxs().size(); ++n )
+            if( this == pDoc->GetFootnoteIdxs()[n] )
             {
-                pDoc->GetFtnIdxs().erase( pDoc->GetFtnIdxs().begin() + n );
+                pDoc->GetFootnoteIdxs().erase( pDoc->GetFootnoteIdxs().begin() + n );
                 // gibt noch weitere Fussnoten
-                if( !pDoc->IsInDtor() && n < pDoc->GetFtnIdxs().size() )
+                if( !pDoc->IsInDtor() && n < pDoc->GetFootnoteIdxs().size() )
                 {
-                    SwNodeIndex aTmp( pDoc->GetFtnIdxs()[n]->GetTxtNode() );
-                    pDoc->GetFtnIdxs().UpdateFtn( aTmp );
+                    SwNodeIndex aTmp( pDoc->GetFootnoteIdxs()[n]->GetTextNode() );
+                    pDoc->GetFootnoteIdxs().UpdateFootnote( aTmp );
                 }
                 break;
             }
     }
 }
 
-void SwTxtFtn::SetNumber( const sal_uInt16 nNewNum, const OUString &sNumStr )
+void SwTextFootnote::SetNumber( const sal_uInt16 nNewNum, const OUString &sNumStr )
 {
-    SwFmtFtn& rFtn = (SwFmtFtn&)GetFtn();
+    SwFormatFootnote& rFootnote = (SwFormatFootnote&)GetFootnote();
 
-    rFtn.m_aNumber = sNumStr;
+    rFootnote.m_aNumber = sNumStr;
     if ( sNumStr.isEmpty() )
     {
-        rFtn.m_nNumber = nNewNum;
+        rFootnote.m_nNumber = nNewNum;
     }
 
-    OSL_ENSURE( m_pTxtNode, "SwTxtFtn: where is my TxtNode?" );
-    SwNodes &rNodes = m_pTxtNode->GetDoc()->GetNodes();
-    m_pTxtNode->ModifyNotification( 0, &rFtn );
+    OSL_ENSURE( m_pTextNode, "SwTextFootnote: where is my TextNode?" );
+    SwNodes &rNodes = m_pTextNode->GetDoc()->GetNodes();
+    m_pTextNode->ModifyNotification( 0, &rFootnote );
     if ( m_pStartNode )
     {
-        // must iterate over all TxtNodes because of footnotes on other pages
+        // must iterate over all TextNodes because of footnotes on other pages
         sal_uLong nSttIdx = m_pStartNode->GetIndex() + 1;
         sal_uLong nEndIdx = m_pStartNode->GetNode().EndOfSectionIndex();
         for( ; nSttIdx < nEndIdx; ++nSttIdx )
         {
             // Es koennen ja auch Grafiken in der Fussnote stehen ...
             SwNode* pNd;
-            if( ( pNd = rNodes[ nSttIdx ] )->IsTxtNode() )
-                static_cast<SwTxtNode*>(pNd)->ModifyNotification( 0, &rFtn );
+            if( ( pNd = rNodes[ nSttIdx ] )->IsTextNode() )
+                static_cast<SwTextNode*>(pNd)->ModifyNotification( 0, &rFootnote );
         }
     }
 }
 
 // Die Fussnoten duplizieren
-void SwTxtFtn::CopyFtn(
-    SwTxtFtn & rDest,
-    SwTxtNode & rDestNode ) const
+void SwTextFootnote::CopyFootnote(
+    SwTextFootnote & rDest,
+    SwTextNode & rDestNode ) const
 {
     if (m_pStartNode && !rDest.GetStartNode())
     {
         // dest missing node section? create it here!
-        // (happens in SwTxtNode::CopyText if pDest == this)
+        // (happens in SwTextNode::CopyText if pDest == this)
         rDest.MakeNewTextSection( rDestNode.GetNodes() );
     }
     if (m_pStartNode && rDest.GetStartNode())
@@ -379,12 +379,12 @@ void SwTxtFtn::CopyFtn(
                     *m_pStartNode->GetNode().EndOfSectionNode() );
 
         // insert at the end of rDest, i.e., the nodes are appended.
-        // nDestLen contains number of CntntNodes in rDest _before_ copy.
+        // nDestLen contains number of ContentNodes in rDest _before_ copy.
         SwNodeIndex aStart( *(rDest.GetStartNode()) );
         SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() );
         sal_uLong  nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1;
 
-        m_pTxtNode->GetDoc()->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aEnd, NULL, true );
+        m_pTextNode->GetDoc()->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aEnd, NULL, true );
 
         // in case the destination section was not empty, delete the old nodes
         // before:   Src: SxxxE,  Dst: SnE
@@ -395,61 +395,61 @@ void SwTxtFtn::CopyFtn(
     }
 
     // also copy user defined number string
-    if( !GetFtn().m_aNumber.isEmpty() )
+    if( !GetFootnote().m_aNumber.isEmpty() )
     {
-        const_cast<SwFmtFtn &>(rDest.GetFtn()).m_aNumber = GetFtn().m_aNumber;
+        const_cast<SwFormatFootnote &>(rDest.GetFootnote()).m_aNumber = GetFootnote().m_aNumber;
     }
 }
 
     // lege eine neue leere TextSection fuer diese Fussnote an
-void SwTxtFtn::MakeNewTextSection( SwNodes& rNodes )
+void SwTextFootnote::MakeNewTextSection( SwNodes& rNodes )
 {
     if ( m_pStartNode )
         return;
 
-    // Nun verpassen wir dem TxtNode noch die Fussnotenvorlage.
-    SwTxtFmtColl *pFmtColl;
+    // Nun verpassen wir dem TextNode noch die Fussnotenvorlage.
+    SwTextFormatColl *pFormatColl;
     const SwEndNoteInfo* pInfo;
     sal_uInt16 nPoolId;
 
-    if( GetFtn().IsEndNote() )
+    if( GetFootnote().IsEndNote() )
     {
         pInfo = &rNodes.GetDoc()->GetEndNoteInfo();
         nPoolId = RES_POOLCOLL_ENDNOTE;
     }
     else
     {
-        pInfo = &rNodes.GetDoc()->GetFtnInfo();
+        pInfo = &rNodes.GetDoc()->GetFootnoteInfo();
         nPoolId = RES_POOLCOLL_FOOTNOTE;
     }
 
-    if( 0 == (pFmtColl = pInfo->GetFtnTxtColl() ) )
-        pFmtColl = rNodes.GetDoc()->getIDocumentStylePoolAccess().GetTxtCollFromPool( nPoolId );
+    if( 0 == (pFormatColl = pInfo->GetFootnoteTextColl() ) )
+        pFormatColl = rNodes.GetDoc()->getIDocumentStylePoolAccess().GetTextCollFromPool( nPoolId );
 
     SwStartNode* pSttNd = rNodes.MakeTextSection( SwNodeIndex( rNodes.GetEndOfInserts() ),
-                                        SwFootnoteStartNode, pFmtColl );
+                                        SwFootnoteStartNode, pFormatColl );
     m_pStartNode = new SwNodeIndex( *pSttNd );
 }
 
-void SwTxtFtn::DelFrms( const SwFrm* pSib )
+void SwTextFootnote::DelFrms( const SwFrm* pSib )
 {
-    // delete the FtnFrames from the pages
-    OSL_ENSURE( m_pTxtNode, "SwTxtFtn: where is my TxtNode?" );
-    if ( !m_pTxtNode )
+    // delete the FootnoteFrames from the pages
+    OSL_ENSURE( m_pTextNode, "SwTextFootnote: where is my TextNode?" );
+    if ( !m_pTextNode )
         return;
 
     const SwRootFrm* pRoot = pSib ? pSib->getRootFrm() : 0;
     bool bFrmFnd = false;
     {
-        SwIterator<SwCntntFrm,SwTxtNode> aIter( *m_pTxtNode );
-        for( SwCntntFrm* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
+        SwIterator<SwContentFrm,SwTextNode> aIter( *m_pTextNode );
+        for( SwContentFrm* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
         {
             if( pRoot != pFnd->getRootFrm() && pRoot )
                 continue;
             SwPageFrm* pPage = pFnd->FindPageFrm();
             if( pPage )
             {
-                pPage->RemoveFtn( pFnd, this );
+                pPage->RemoveFootnote( pFnd, this );
                 bFrmFnd = true;
             }
         }
@@ -459,37 +459,37 @@ void SwTxtFtn::DelFrms( const SwFrm* pSib )
     if ( !bFrmFnd && m_pStartNode )
     {
         SwNodeIndex aIdx( *m_pStartNode );
-        SwCntntNode* pCNd = m_pTxtNode->GetNodes().GoNext( &aIdx );
+        SwContentNode* pCNd = m_pTextNode->GetNodes().GoNext( &aIdx );
         if( pCNd )
         {
-            SwIterator<SwCntntFrm,SwCntntNode> aIter( *pCNd );
-            for( SwCntntFrm* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
+            SwIterator<SwContentFrm,SwContentNode> aIter( *pCNd );
+            for( SwContentFrm* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
             {
                 if( pRoot != pFnd->getRootFrm() && pRoot )
                     continue;
                 SwPageFrm* pPage = pFnd->FindPageFrm();
 
                 SwFrm *pFrm = pFnd->GetUpper();
-                while ( pFrm && !pFrm->IsFtnFrm() )
+                while ( pFrm && !pFrm->IsFootnoteFrm() )
                     pFrm = pFrm->GetUpper();
 
-                SwFtnFrm *pFtn = static_cast<SwFtnFrm*>(pFrm);
-                while ( pFtn && pFtn->GetMaster() )
-                    pFtn = pFtn->GetMaster();
-                OSL_ENSURE( pFtn->GetAttr() == this, "Ftn mismatch error." );
+                SwFootnoteFrm *pFootnote = static_cast<SwFootnoteFrm*>(pFrm);
+                while ( pFootnote && pFootnote->GetMaster() )
+                    pFootnote = pFootnote->GetMaster();
+                OSL_ENSURE( pFootnote->GetAttr() == this, "Footnote mismatch error." );
 
-                while ( pFtn )
+                while ( pFootnote )
                 {
-                    SwFtnFrm *pFoll = pFtn->GetFollow();
-                    pFtn->Cut();
-                    SwFrm::DestroyFrm(pFtn);
-                    pFtn = pFoll;
+                    SwFootnoteFrm *pFoll = pFootnote->GetFollow();
+                    pFootnote->Cut();
+                    SwFrm::DestroyFrm(pFootnote);
+                    pFootnote = pFoll;
                 }
 
                 // #i20556# During hiding of a section, the connection
                 // to the layout is already lost. pPage may be 0:
                 if ( pPage )
-                    pPage->UpdateFtnNum();
+                    pPage->UpdateFootnoteNum();
             }
         }
     }
@@ -497,18 +497,18 @@ void SwTxtFtn::DelFrms( const SwFrm* pSib )
 
 /// Set the sequence number for the current footnote.
 /// @returns The new sequence number or USHRT_MAX if invalid.
-sal_uInt16 SwTxtFtn::SetSeqRefNo()
+sal_uInt16 SwTextFootnote::SetSeqRefNo()
 {
-    if( !m_pTxtNode )
+    if( !m_pTextNode )
         return USHRT_MAX;
 
-    SwDoc* pDoc = m_pTxtNode->GetDoc();
+    SwDoc* pDoc = m_pTextNode->GetDoc();
     if( pDoc->IsInReading() )
         return USHRT_MAX;
 
     std::set<sal_uInt16> aUsedNums;
-    std::vector<SwTxtFtn*> badRefNums;
-    ::lcl_FillUsedFtnRefNumbers(*pDoc, this, aUsedNums, badRefNums);
+    std::vector<SwTextFootnote*> badRefNums;
+    ::lcl_FillUsedFootnoteRefNumbers(*pDoc, this, aUsedNums, badRefNums);
     if ( ::lcl_IsRefNumAvailable(aUsedNums, m_nSeqNo) )
         return m_nSeqNo;
     std::vector<sal_uInt16> unused;
@@ -518,11 +518,11 @@ sal_uInt16 SwTxtFtn::SetSeqRefNo()
 
 /// Set a unique sequential reference number for every footnote in the document.
 /// @param[in] rDoc The document to be processed.
-void SwTxtFtn::SetUniqueSeqRefNo( SwDoc& rDoc )
+void SwTextFootnote::SetUniqueSeqRefNo( SwDoc& rDoc )
 {
     std::set<sal_uInt16> aUsedNums;
-    std::vector<SwTxtFtn*> badRefNums;
-    ::lcl_FillUsedFtnRefNumbers(rDoc, NULL, aUsedNums, badRefNums);
+    std::vector<SwTextFootnote*> badRefNums;
+    ::lcl_FillUsedFootnoteRefNumbers(rDoc, NULL, aUsedNums, badRefNums);
     std::vector<sal_uInt16> aUnused;
     ::lcl_FillUnusedSeqRefNums(aUnused, aUsedNums, badRefNums.size());
 
@@ -532,7 +532,7 @@ void SwTxtFtn::SetUniqueSeqRefNo( SwDoc& rDoc )
     }
 }
 
-void SwTxtFtn::CheckCondColl()
+void SwTextFootnote::CheckCondColl()
 {
 //FEATURE::CONDCOLL
     if( GetStartNode() )
diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx
index 3fbb19b17346..416e29ea9964 100644
--- a/sw/source/core/txtnode/atrref.cxx
+++ b/sw/source/core/txtnode/atrref.cxx
@@ -24,38 +24,38 @@
 #include <txtrfmrk.hxx>
 #include <swfont.hxx>
 
-SwFmtRefMark::~SwFmtRefMark( )
+SwFormatRefMark::~SwFormatRefMark( )
 {
 }
 
-SwFmtRefMark::SwFmtRefMark( const OUString& rName )
+SwFormatRefMark::SwFormatRefMark( const OUString& rName )
     : SfxPoolItem(RES_TXTATR_REFMARK)
     , SwModify(0)
-    , pTxtAttr(0)
+    , pTextAttr(0)
     , aRefName(rName)
 {
 }
 
-SwFmtRefMark::SwFmtRefMark( const SwFmtRefMark& rAttr )
+SwFormatRefMark::SwFormatRefMark( const SwFormatRefMark& rAttr )
     : SfxPoolItem(RES_TXTATR_REFMARK)
     , SwModify(0)
-    , pTxtAttr(0)
+    , pTextAttr(0)
     , aRefName(rAttr.aRefName)
 {
 }
 
-bool SwFmtRefMark::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatRefMark::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return aRefName == static_cast<const SwFmtRefMark&>(rAttr).aRefName;
+    return aRefName == static_cast<const SwFormatRefMark&>(rAttr).aRefName;
 }
 
-SfxPoolItem* SwFmtRefMark::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatRefMark::Clone( SfxItemPool* ) const
 {
-    return new SwFmtRefMark( *this );
+    return new SwFormatRefMark( *this );
 }
 
-void SwFmtRefMark::Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
+void SwFormatRefMark::Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
 {
     NotifyClients(pOld, pNew);
     if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
@@ -64,7 +64,7 @@ void SwFmtRefMark::Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
     }
 }
 
-void SwFmtRefMark::InvalidateRefMark()
+void SwFormatRefMark::InvalidateRefMark()
 {
     SwPtrMsgPoolItem const item(RES_REMOVE_UNO_OBJECT,
             &static_cast<SwModify&>(*this)); // cast to base class (void*)
@@ -73,14 +73,14 @@ void SwFmtRefMark::InvalidateRefMark()
 
 // Attribut fuer Inhalts-/Positions-Referenzen im Text
 
-SwTxtRefMark::SwTxtRefMark( SwFmtRefMark& rAttr,
+SwTextRefMark::SwTextRefMark( SwFormatRefMark& rAttr,
             sal_Int32 const nStartPos, sal_Int32 const*const pEnd)
-    : SwTxtAttr(rAttr, nStartPos)
-    , SwTxtAttrEnd( rAttr, nStartPos, nStartPos )
-    , m_pTxtNode( 0 )
+    : SwTextAttr(rAttr, nStartPos)
+    , SwTextAttrEnd( rAttr, nStartPos, nStartPos )
+    , m_pTextNode( 0 )
     , m_pEnd( 0 )
 {
-    rAttr.pTxtAttr = this;
+    rAttr.pTextAttr = this;
     if ( pEnd )
     {
         m_nEnd = *pEnd;
@@ -94,7 +94,7 @@ SwTxtRefMark::SwTxtRefMark( SwFmtRefMark& rAttr,
     SetOverlapAllowedAttr( true );
 }
 
-sal_Int32* SwTxtRefMark::GetEnd()
+sal_Int32* SwTextRefMark::GetEnd()
 {
     return m_pEnd;
 }
diff --git a/sw/source/core/txtnode/atrtox.cxx b/sw/source/core/txtnode/atrtox.cxx
index 66aad100ca22..99e7382a00d4 100644
--- a/sw/source/core/txtnode/atrtox.cxx
+++ b/sw/source/core/txtnode/atrtox.cxx
@@ -23,14 +23,14 @@
 #include <tox.hxx>
 #include <ndtxt.hxx>
 
-SwTxtTOXMark::SwTxtTOXMark( SwTOXMark& rAttr,
+SwTextTOXMark::SwTextTOXMark( SwTOXMark& rAttr,
             sal_Int32 const nStartPos, sal_Int32 const*const pEnd)
-    : SwTxtAttr( rAttr, nStartPos )
-    , SwTxtAttrEnd( rAttr, nStartPos, nStartPos )
-    , m_pTxtNode( 0 )
+    : SwTextAttr( rAttr, nStartPos )
+    , SwTextAttrEnd( rAttr, nStartPos, nStartPos )
+    , m_pTextNode( 0 )
     , m_pEnd( 0 )
 {
-    rAttr.pTxtAttr = this;
+    rAttr.pTextAttr = this;
     if ( rAttr.GetAlternativeText().isEmpty() )
     {
         m_nEnd = *pEnd;
@@ -44,16 +44,16 @@ SwTxtTOXMark::SwTxtTOXMark( SwTOXMark& rAttr,
     SetOverlapAllowedAttr( true );
 }
 
-SwTxtTOXMark::~SwTxtTOXMark()
+SwTextTOXMark::~SwTextTOXMark()
 {
 }
 
-sal_Int32* SwTxtTOXMark::GetEnd()
+sal_Int32* SwTextTOXMark::GetEnd()
 {
     return m_pEnd;
 }
 
-void SwTxtTOXMark::CopyTOXMark( SwDoc* pDoc )
+void SwTextTOXMark::CopyTOXMark( SwDoc* pDoc )
 {
     SwTOXMark& rTOX = (SwTOXMark&)GetTOXMark();
     TOXTypes    eType   = rTOX.GetTOXType()->GetType();
diff --git a/sw/source/core/txtnode/chrfmt.cxx b/sw/source/core/txtnode/chrfmt.cxx
index 9557ba8145fe..9e303170105e 100644
--- a/sw/source/core/txtnode/chrfmt.cxx
+++ b/sw/source/core/txtnode/chrfmt.cxx
@@ -22,21 +22,21 @@
 #include <charfmt.hxx>
 #include <docary.hxx>
 
-TYPEINIT1( SwCharFmt, SwFmt );  //rtti fuer SwCharFmt
+TYPEINIT1( SwCharFormat, SwFormat );  //rtti fuer SwCharFormat
 
-void SwCharFmt::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwCharFormat::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swCharFmt"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swCharFormat"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetName().toUtf8().getStr()));
     GetAttrSet().dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
-void SwCharFmts::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwCharFormats::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swCharFmts"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swCharFormats"));
     for (size_t i = 0; i < size(); ++i)
-        GetFmt(i)->dumpAsXml(pWriter);
+        GetFormat(i)->dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index f2af63f11902..90a45b94b6a1 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -53,221 +53,221 @@
 
 using namespace ::com::sun::star;
 
-TYPEINIT1_AUTOFACTORY(SwFmtINetFmt, SfxPoolItem);
-TYPEINIT1_AUTOFACTORY(SwFmtAutoFmt, SfxPoolItem);
+TYPEINIT1_AUTOFACTORY(SwFormatINetFormat, SfxPoolItem);
+TYPEINIT1_AUTOFACTORY(SwFormatAutoFormat, SfxPoolItem);
 
-SwFmtCharFmt::SwFmtCharFmt( SwCharFmt *pFmt )
+SwFormatCharFormat::SwFormatCharFormat( SwCharFormat *pFormat )
     : SfxPoolItem( RES_TXTATR_CHARFMT ),
-    SwClient(pFmt),
-    pTxtAttr( 0 )
+    SwClient(pFormat),
+    pTextAttr( 0 )
 {
 }
 
-SwFmtCharFmt::SwFmtCharFmt( const SwFmtCharFmt& rAttr )
+SwFormatCharFormat::SwFormatCharFormat( const SwFormatCharFormat& rAttr )
     : SfxPoolItem( RES_TXTATR_CHARFMT ),
-    SwClient( rAttr.GetCharFmt() ),
-    pTxtAttr( 0 )
+    SwClient( rAttr.GetCharFormat() ),
+    pTextAttr( 0 )
 {
 }
 
-SwFmtCharFmt::~SwFmtCharFmt() {}
+SwFormatCharFormat::~SwFormatCharFormat() {}
 
-bool SwFmtCharFmt::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatCharFormat::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return GetCharFmt() == static_cast<const SwFmtCharFmt&>(rAttr).GetCharFmt();
+    return GetCharFormat() == static_cast<const SwFormatCharFormat&>(rAttr).GetCharFormat();
 }
 
-SfxPoolItem* SwFmtCharFmt::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatCharFormat::Clone( SfxItemPool* ) const
 {
-    return new SwFmtCharFmt( *this );
+    return new SwFormatCharFormat( *this );
 }
 
 // weiterleiten an das TextAttribut
-void SwFmtCharFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwFormatCharFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
-    if( pTxtAttr )
-        pTxtAttr->ModifyNotification( pOld, pNew );
+    if( pTextAttr )
+        pTextAttr->ModifyNotification( pOld, pNew );
 }
 
 // weiterleiten an das TextAttribut
-bool SwFmtCharFmt::GetInfo( SfxPoolItem& rInfo ) const
+bool SwFormatCharFormat::GetInfo( SfxPoolItem& rInfo ) const
 {
-    return pTxtAttr && pTxtAttr->GetInfo( rInfo );
+    return pTextAttr && pTextAttr->GetInfo( rInfo );
 }
-bool SwFmtCharFmt::QueryValue( uno::Any& rVal, sal_uInt8 ) const
+bool SwFormatCharFormat::QueryValue( uno::Any& rVal, sal_uInt8 ) const
 {
-    OUString sCharFmtName;
-    if(GetCharFmt())
-        SwStyleNameMapper::FillProgName(GetCharFmt()->GetName(), sCharFmtName,  nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
-    rVal <<= sCharFmtName;
+    OUString sCharFormatName;
+    if(GetCharFormat())
+        SwStyleNameMapper::FillProgName(GetCharFormat()->GetName(), sCharFormatName,  nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
+    rVal <<= sCharFormatName;
     return true;
 }
-bool SwFmtCharFmt::PutValue( const uno::Any& , sal_uInt8   )
+bool SwFormatCharFormat::PutValue( const uno::Any& , sal_uInt8   )
 {
     OSL_FAIL("Zeichenvorlage kann mit PutValue nicht gesetzt werden!");
     return false;
 }
 
-SwFmtAutoFmt::SwFmtAutoFmt( sal_uInt16 nInitWhich )
+SwFormatAutoFormat::SwFormatAutoFormat( sal_uInt16 nInitWhich )
     : SfxPoolItem( nInitWhich )
 {
 }
 
-SwFmtAutoFmt::SwFmtAutoFmt( const SwFmtAutoFmt& rAttr )
+SwFormatAutoFormat::SwFormatAutoFormat( const SwFormatAutoFormat& rAttr )
     : SfxPoolItem( rAttr.Which() ), mpHandle( rAttr.mpHandle )
 {
 }
 
-SwFmtAutoFmt::~SwFmtAutoFmt()
+SwFormatAutoFormat::~SwFormatAutoFormat()
 {
 }
 
-bool SwFmtAutoFmt::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatAutoFormat::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return mpHandle == static_cast<const SwFmtAutoFmt&>(rAttr).mpHandle;
+    return mpHandle == static_cast<const SwFormatAutoFormat&>(rAttr).mpHandle;
 }
 
-SfxPoolItem* SwFmtAutoFmt::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatAutoFormat::Clone( SfxItemPool* ) const
 {
-    return new SwFmtAutoFmt( *this );
+    return new SwFormatAutoFormat( *this );
 }
 
-bool SwFmtAutoFmt::QueryValue( uno::Any& rVal, sal_uInt8 ) const
+bool SwFormatAutoFormat::QueryValue( uno::Any& rVal, sal_uInt8 ) const
 {
-    OUString sCharFmtName = StylePool::nameOf( mpHandle );
-    rVal <<= OUString( sCharFmtName );
+    OUString sCharFormatName = StylePool::nameOf( mpHandle );
+    rVal <<= OUString( sCharFormatName );
     return true;
 }
 
-bool SwFmtAutoFmt::PutValue( const uno::Any& , sal_uInt8 )
+bool SwFormatAutoFormat::PutValue( const uno::Any& , sal_uInt8 )
 {
     //the format is not renameable via API
     return false;
 }
 
-void SwFmtAutoFmt::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatAutoFormat::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtAutoFmt"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatAutoFormat"));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     mpHandle->dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 }
 
-SwFmtINetFmt::SwFmtINetFmt()
+SwFormatINetFormat::SwFormatINetFormat()
     : SfxPoolItem( RES_TXTATR_INETFMT )
     , msURL()
     , msTargetFrame()
-    , msINetFmtName()
-    , msVisitedFmtName()
+    , msINetFormatName()
+    , msVisitedFormatName()
     , msHyperlinkName()
-    , mpMacroTbl( 0 )
-    , mpTxtAttr( 0 )
-    , mnINetFmtId( 0 )
-    , mnVisitedFmtId( 0 )
+    , mpMacroTable( 0 )
+    , mpTextAttr( 0 )
+    , mnINetFormatId( 0 )
+    , mnVisitedFormatId( 0 )
 {}
 
-SwFmtINetFmt::SwFmtINetFmt( const OUString& rURL, const OUString& rTarget )
+SwFormatINetFormat::SwFormatINetFormat( const OUString& rURL, const OUString& rTarget )
     : SfxPoolItem( RES_TXTATR_INETFMT )
     , msURL( rURL )
     , msTargetFrame( rTarget )
-    , msINetFmtName()
-    , msVisitedFmtName()
+    , msINetFormatName()
+    , msVisitedFormatName()
     , msHyperlinkName()
-    , mpMacroTbl( 0 )
-    , mpTxtAttr( 0 )
-    , mnINetFmtId( RES_POOLCHR_INET_NORMAL )
-    , mnVisitedFmtId( RES_POOLCHR_INET_VISIT )
+    , mpMacroTable( 0 )
+    , mpTextAttr( 0 )
+    , mnINetFormatId( RES_POOLCHR_INET_NORMAL )
+    , mnVisitedFormatId( RES_POOLCHR_INET_VISIT )
 {
-    SwStyleNameMapper::FillUIName( mnINetFmtId, msINetFmtName );
-    SwStyleNameMapper::FillUIName( mnVisitedFmtId, msVisitedFmtName );
+    SwStyleNameMapper::FillUIName( mnINetFormatId, msINetFormatName );
+    SwStyleNameMapper::FillUIName( mnVisitedFormatId, msVisitedFormatName );
 }
 
-SwFmtINetFmt::SwFmtINetFmt( const SwFmtINetFmt& rAttr )
+SwFormatINetFormat::SwFormatINetFormat( const SwFormatINetFormat& rAttr )
     : SfxPoolItem( RES_TXTATR_INETFMT )
     , msURL( rAttr.GetValue() )
     , msTargetFrame( rAttr.msTargetFrame )
-    , msINetFmtName( rAttr.msINetFmtName )
-    , msVisitedFmtName( rAttr.msVisitedFmtName )
+    , msINetFormatName( rAttr.msINetFormatName )
+    , msVisitedFormatName( rAttr.msVisitedFormatName )
     , msHyperlinkName( rAttr.msHyperlinkName )
-    , mpMacroTbl( 0 )
-    , mpTxtAttr( 0 )
-    , mnINetFmtId( rAttr.mnINetFmtId )
-    , mnVisitedFmtId( rAttr.mnVisitedFmtId )
+    , mpMacroTable( 0 )
+    , mpTextAttr( 0 )
+    , mnINetFormatId( rAttr.mnINetFormatId )
+    , mnVisitedFormatId( rAttr.mnVisitedFormatId )
 {
-    if ( rAttr.GetMacroTbl() )
-        mpMacroTbl = new SvxMacroTableDtor( *rAttr.GetMacroTbl() );
+    if ( rAttr.GetMacroTable() )
+        mpMacroTable = new SvxMacroTableDtor( *rAttr.GetMacroTable() );
 }
 
-SwFmtINetFmt::~SwFmtINetFmt()
+SwFormatINetFormat::~SwFormatINetFormat()
 {
-    delete mpMacroTbl;
+    delete mpMacroTable;
 }
 
-bool SwFmtINetFmt::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatINetFormat::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
     bool bRet = SfxPoolItem::operator==( (SfxPoolItem&) rAttr )
-                && msURL == static_cast<const SwFmtINetFmt&>(rAttr).msURL
-                && msHyperlinkName == static_cast<const SwFmtINetFmt&>(rAttr).msHyperlinkName
-                && msTargetFrame == static_cast<const SwFmtINetFmt&>(rAttr).msTargetFrame
-                && msINetFmtName == static_cast<const SwFmtINetFmt&>(rAttr).msINetFmtName
-                && msVisitedFmtName == static_cast<const SwFmtINetFmt&>(rAttr).msVisitedFmtName
-                && mnINetFmtId == static_cast<const SwFmtINetFmt&>(rAttr).mnINetFmtId
-                && mnVisitedFmtId == static_cast<const SwFmtINetFmt&>(rAttr).mnVisitedFmtId;
+                && msURL == static_cast<const SwFormatINetFormat&>(rAttr).msURL
+                && msHyperlinkName == static_cast<const SwFormatINetFormat&>(rAttr).msHyperlinkName
+                && msTargetFrame == static_cast<const SwFormatINetFormat&>(rAttr).msTargetFrame
+                && msINetFormatName == static_cast<const SwFormatINetFormat&>(rAttr).msINetFormatName
+                && msVisitedFormatName == static_cast<const SwFormatINetFormat&>(rAttr).msVisitedFormatName
+                && mnINetFormatId == static_cast<const SwFormatINetFormat&>(rAttr).mnINetFormatId
+                && mnVisitedFormatId == static_cast<const SwFormatINetFormat&>(rAttr).mnVisitedFormatId;
 
     if( !bRet )
         return false;
 
-    const SvxMacroTableDtor* pOther = static_cast<const SwFmtINetFmt&>(rAttr).mpMacroTbl;
-    if( !mpMacroTbl )
+    const SvxMacroTableDtor* pOther = static_cast<const SwFormatINetFormat&>(rAttr).mpMacroTable;
+    if( !mpMacroTable )
         return ( !pOther || pOther->empty() );
     if( !pOther )
-        return mpMacroTbl->empty();
+        return mpMacroTable->empty();
 
-    const SvxMacroTableDtor& rOwn = *mpMacroTbl;
+    const SvxMacroTableDtor& rOwn = *mpMacroTable;
     const SvxMacroTableDtor& rOther = *pOther;
 
     return rOwn == rOther;
 }
 
-SfxPoolItem* SwFmtINetFmt::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatINetFormat::Clone( SfxItemPool* ) const
 {
-    return new SwFmtINetFmt( *this );
+    return new SwFormatINetFormat( *this );
 }
 
-void SwFmtINetFmt::SetMacroTbl( const SvxMacroTableDtor* pNewTbl )
+void SwFormatINetFormat::SetMacroTable( const SvxMacroTableDtor* pNewTable )
 {
-    if( pNewTbl )
+    if( pNewTable )
     {
-        if( mpMacroTbl )
-            *mpMacroTbl = *pNewTbl;
+        if( mpMacroTable )
+            *mpMacroTable = *pNewTable;
         else
-            mpMacroTbl = new SvxMacroTableDtor( *pNewTbl );
+            mpMacroTable = new SvxMacroTableDtor( *pNewTable );
     }
     else
-        delete mpMacroTbl, mpMacroTbl = 0;
+        delete mpMacroTable, mpMacroTable = 0;
 }
 
-void SwFmtINetFmt::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro )
+void SwFormatINetFormat::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro )
 {
-    if( !mpMacroTbl )
-        mpMacroTbl = new SvxMacroTableDtor;
+    if( !mpMacroTable )
+        mpMacroTable = new SvxMacroTableDtor;
 
-    mpMacroTbl->Insert( nEvent, rMacro );
+    mpMacroTable->Insert( nEvent, rMacro );
 }
 
-const SvxMacro* SwFmtINetFmt::GetMacro( sal_uInt16 nEvent ) const
+const SvxMacro* SwFormatINetFormat::GetMacro( sal_uInt16 nEvent ) const
 {
     const SvxMacro* pRet = 0;
-    if( mpMacroTbl && mpMacroTbl->IsKeyValid( nEvent ) )
-        pRet = mpMacroTbl->Get( nEvent );
+    if( mpMacroTable && mpMacroTable->IsKeyValid( nEvent ) )
+        pRet = mpMacroTable->Get( nEvent );
     return pRet;
 }
 
-bool SwFmtINetFmt::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatINetFormat::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -283,9 +283,9 @@ bool SwFmtINetFmt::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
         break;
         case MID_URL_VISITED_FMT:
         {
-            OUString sVal = msVisitedFmtName;
-            if (sVal.isEmpty() && mnVisitedFmtId != 0)
-                SwStyleNameMapper::FillUIName(mnVisitedFmtId, sVal);
+            OUString sVal = msVisitedFormatName;
+            if (sVal.isEmpty() && mnVisitedFormatId != 0)
+                SwStyleNameMapper::FillUIName(mnVisitedFormatId, sVal);
             if (!sVal.isEmpty())
                 SwStyleNameMapper::FillProgName(sVal, sVal,
                         nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true);
@@ -294,9 +294,9 @@ bool SwFmtINetFmt::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
         break;
         case MID_URL_UNVISITED_FMT:
         {
-            OUString sVal = msINetFmtName;
-            if (sVal.isEmpty() && mnINetFmtId != 0)
-                SwStyleNameMapper::FillUIName(mnINetFmtId, sVal);
+            OUString sVal = msINetFormatName;
+            if (sVal.isEmpty() && mnINetFormatId != 0)
+                SwStyleNameMapper::FillUIName(mnINetFormatId, sVal);
             if (!sVal.isEmpty())
                 SwStyleNameMapper::FillProgName(sVal, sVal,
                         nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true);
@@ -308,7 +308,7 @@ bool SwFmtINetFmt::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
             // create (and return) event descriptor
             SwHyperlinkEventDescriptor* pEvents =
                 new SwHyperlinkEventDescriptor();
-            pEvents->copyMacrosFromINetFmt(*this);
+            pEvents->copyMacrosFromINetFormat(*this);
             uno::Reference<container::XNameReplace> xNameReplace(pEvents);
 
             // all others return a string; so we just set rVal here and exit
@@ -321,7 +321,7 @@ bool SwFmtINetFmt::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     }
     return true;
 }
-bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId  )
+bool SwFormatINetFormat::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId  )
 {
     bool bRet = true;
     nMemberId &= ~CONVERT_TWIPS;
@@ -340,7 +340,7 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId  )
             SwHyperlinkEventDescriptor* pEvents = new SwHyperlinkEventDescriptor();
             uno::Reference< lang::XServiceInfo> xHold = pEvents;
             pEvents->copyMacrosFromNameReplace(xReplace);
-            pEvents->copyMacrosIntoINetFmt(*this);
+            pEvents->copyMacrosIntoINetFormat(*this);
         }
         else
         {
@@ -371,8 +371,8 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId  )
                 rVal >>= sVal;
                 OUString aString;
                 SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
-                msVisitedFmtName = aString;
-                mnVisitedFmtId = SwStyleNameMapper::GetPoolIdFromUIName( msVisitedFmtName,
+                msVisitedFormatName = aString;
+                mnVisitedFormatId = SwStyleNameMapper::GetPoolIdFromUIName( msVisitedFormatName,
                                                nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
             }
             break;
@@ -382,8 +382,8 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId  )
                 rVal >>= sVal;
                 OUString aString;
                 SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
-                msINetFmtName = aString;
-                mnINetFmtId = SwStyleNameMapper::GetPoolIdFromUIName( msINetFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
+                msINetFormatName = aString;
+                mnINetFormatId = SwStyleNameMapper::GetPoolIdFromUIName( msINetFormatName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
             }
             break;
             default:
@@ -393,70 +393,70 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId  )
     return bRet;
 }
 
-SwFmtRuby::SwFmtRuby( const OUString& rRubyTxt )
+SwFormatRuby::SwFormatRuby( const OUString& rRubyText )
     : SfxPoolItem( RES_TXTATR_CJK_RUBY ),
-    sRubyTxt( rRubyTxt ),
-    pTxtAttr( 0 ),
-    nCharFmtId( 0 ),
+    sRubyText( rRubyText ),
+    pTextAttr( 0 ),
+    nCharFormatId( 0 ),
     nPosition( 0 ),
     nAdjustment( 0 )
 {
 }
 
-SwFmtRuby::SwFmtRuby( const SwFmtRuby& rAttr )
+SwFormatRuby::SwFormatRuby( const SwFormatRuby& rAttr )
     : SfxPoolItem( RES_TXTATR_CJK_RUBY ),
-    sRubyTxt( rAttr.sRubyTxt ),
-    sCharFmtName( rAttr.sCharFmtName ),
-    pTxtAttr( 0 ),
-    nCharFmtId( rAttr.nCharFmtId),
+    sRubyText( rAttr.sRubyText ),
+    sCharFormatName( rAttr.sCharFormatName ),
+    pTextAttr( 0 ),
+    nCharFormatId( rAttr.nCharFormatId),
     nPosition( rAttr.nPosition ),
     nAdjustment( rAttr.nAdjustment )
 {
 }
 
-SwFmtRuby::~SwFmtRuby()
+SwFormatRuby::~SwFormatRuby()
 {
 }
 
-SwFmtRuby& SwFmtRuby::operator=( const SwFmtRuby& rAttr )
+SwFormatRuby& SwFormatRuby::operator=( const SwFormatRuby& rAttr )
 {
-    sRubyTxt = rAttr.sRubyTxt;
-    sCharFmtName = rAttr.sCharFmtName;
-    nCharFmtId = rAttr.nCharFmtId;
+    sRubyText = rAttr.sRubyText;
+    sCharFormatName = rAttr.sCharFormatName;
+    nCharFormatId = rAttr.nCharFormatId;
     nPosition = rAttr.nPosition;
     nAdjustment = rAttr.nAdjustment;
-    pTxtAttr =  0;
+    pTextAttr =  0;
     return *this;
 }
 
-bool SwFmtRuby::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatRuby::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return sRubyTxt == static_cast<const SwFmtRuby&>(rAttr).sRubyTxt &&
-           sCharFmtName == static_cast<const SwFmtRuby&>(rAttr).sCharFmtName &&
-           nCharFmtId == static_cast<const SwFmtRuby&>(rAttr).nCharFmtId &&
-           nPosition == static_cast<const SwFmtRuby&>(rAttr).nPosition &&
-           nAdjustment == static_cast<const SwFmtRuby&>(rAttr).nAdjustment;
+    return sRubyText == static_cast<const SwFormatRuby&>(rAttr).sRubyText &&
+           sCharFormatName == static_cast<const SwFormatRuby&>(rAttr).sCharFormatName &&
+           nCharFormatId == static_cast<const SwFormatRuby&>(rAttr).nCharFormatId &&
+           nPosition == static_cast<const SwFormatRuby&>(rAttr).nPosition &&
+           nAdjustment == static_cast<const SwFormatRuby&>(rAttr).nAdjustment;
 }
 
-SfxPoolItem* SwFmtRuby::Clone( SfxItemPool* ) const
+SfxPoolItem* SwFormatRuby::Clone( SfxItemPool* ) const
 {
-    return new SwFmtRuby( *this );
+    return new SwFormatRuby( *this );
 }
 
-bool SwFmtRuby::QueryValue( uno::Any& rVal,
+bool SwFormatRuby::QueryValue( uno::Any& rVal,
                             sal_uInt8 nMemberId ) const
 {
     bool bRet = true;
     nMemberId &= ~CONVERT_TWIPS;
     switch( nMemberId )
     {
-        case MID_RUBY_TEXT: rVal <<= sRubyTxt;                    break;
+        case MID_RUBY_TEXT: rVal <<= sRubyText;                    break;
         case MID_RUBY_ADJUST:  rVal <<= (sal_Int16)nAdjustment;    break;
         case MID_RUBY_CHARSTYLE:
         {
             OUString aString;
-            SwStyleNameMapper::FillProgName(sCharFmtName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
+            SwStyleNameMapper::FillProgName(sCharFormatName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
             rVal <<= aString;
         }
         break;
@@ -470,7 +470,7 @@ bool SwFmtRuby::QueryValue( uno::Any& rVal,
     }
     return bRet;
 }
-bool SwFmtRuby::PutValue( const uno::Any& rVal,
+bool SwFormatRuby::PutValue( const uno::Any& rVal,
                             sal_uInt8 nMemberId  )
 {
     bool bRet = true;
@@ -481,7 +481,7 @@ bool SwFmtRuby::PutValue( const uno::Any& rVal,
         {
             OUString sTmp;
             bRet = rVal >>= sTmp;
-            sRubyTxt = sTmp;
+            sRubyText = sTmp;
         }
         break;
          case MID_RUBY_ADJUST:
@@ -509,7 +509,7 @@ bool SwFmtRuby::PutValue( const uno::Any& rVal,
             OUString sTmp;
             bRet = rVal >>= sTmp;
             if(bRet)
-                sCharFmtName = SwStyleNameMapper::GetUIName(sTmp, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
+                sCharFormatName = SwStyleNameMapper::GetUIName(sTmp, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
         }
         break;
         default:
@@ -518,95 +518,95 @@ bool SwFmtRuby::PutValue( const uno::Any& rVal,
     return bRet;
 }
 
-SwFmtMeta * SwFmtMeta::CreatePoolDefault(const sal_uInt16 i_nWhich)
+SwFormatMeta * SwFormatMeta::CreatePoolDefault(const sal_uInt16 i_nWhich)
 {
-    return new SwFmtMeta(i_nWhich);
+    return new SwFormatMeta(i_nWhich);
 }
 
-SwFmtMeta::SwFmtMeta(const sal_uInt16 i_nWhich)
+SwFormatMeta::SwFormatMeta(const sal_uInt16 i_nWhich)
     : SfxPoolItem( i_nWhich )
     , m_pMeta()
-    , m_pTxtAttr( 0 )
+    , m_pTextAttr( 0 )
 {
    OSL_ENSURE((RES_TXTATR_META == i_nWhich) || (RES_TXTATR_METAFIELD == i_nWhich),
-            "ERROR: SwFmtMeta: invalid which id!");
+            "ERROR: SwFormatMeta: invalid which id!");
 }
 
-SwFmtMeta::SwFmtMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
+SwFormatMeta::SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
                         const sal_uInt16 i_nWhich )
     : SfxPoolItem( i_nWhich )
     , m_pMeta( i_pMeta )
-    , m_pTxtAttr( 0 )
+    , m_pTextAttr( 0 )
 {
    OSL_ENSURE((RES_TXTATR_META == i_nWhich) || (RES_TXTATR_METAFIELD == i_nWhich),
-            "ERROR: SwFmtMeta: invalid which id!");
-    OSL_ENSURE(m_pMeta, "SwFmtMeta: no Meta ?");
-    // DO NOT call m_pMeta->SetFmtMeta(this) here; only from SetTxtAttr!
+            "ERROR: SwFormatMeta: invalid which id!");
+    OSL_ENSURE(m_pMeta, "SwFormatMeta: no Meta ?");
+    // DO NOT call m_pMeta->SetFormatMeta(this) here; only from SetTextAttr!
 }
 
-SwFmtMeta::~SwFmtMeta()
+SwFormatMeta::~SwFormatMeta()
 {
-    if (m_pMeta && (m_pMeta->GetFmtMeta() == this))
+    if (m_pMeta && (m_pMeta->GetFormatMeta() == this))
     {
-        NotifyChangeTxtNode(0);
-        m_pMeta->SetFmtMeta(0);
+        NotifyChangeTextNode(0);
+        m_pMeta->SetFormatMeta(0);
     }
 }
 
-bool SwFmtMeta::operator==( const SfxPoolItem & i_rOther ) const
+bool SwFormatMeta::operator==( const SfxPoolItem & i_rOther ) const
 {
     assert(SfxPoolItem::operator==(i_rOther));
     return SfxPoolItem::operator==( i_rOther )
-        && (m_pMeta == static_cast<SwFmtMeta const &>( i_rOther ).m_pMeta);
+        && (m_pMeta == static_cast<SwFormatMeta const &>( i_rOther ).m_pMeta);
 }
 
-SfxPoolItem * SwFmtMeta::Clone( SfxItemPool * /*pPool*/ ) const
+SfxPoolItem * SwFormatMeta::Clone( SfxItemPool * /*pPool*/ ) const
 {
     // if this is indeed a copy, then DoCopy must be called later!
     return (m_pMeta) // #i105148# pool default may be cloned also!
-        ? new SwFmtMeta( m_pMeta, Which() ) : new SwFmtMeta( Which() );
+        ? new SwFormatMeta( m_pMeta, Which() ) : new SwFormatMeta( Which() );
 }
 
-void SwFmtMeta::SetTxtAttr(SwTxtMeta * const i_pTxtAttr)
+void SwFormatMeta::SetTextAttr(SwTextMeta * const i_pTextAttr)
 {
-    OSL_ENSURE(!(m_pTxtAttr && i_pTxtAttr),
-        "SwFmtMeta::SetTxtAttr: already has text attribute?");
-    OSL_ENSURE(  m_pTxtAttr || i_pTxtAttr ,
-        "SwFmtMeta::SetTxtAttr: no attribute to remove?");
-    m_pTxtAttr = i_pTxtAttr;
-    OSL_ENSURE(m_pMeta, "inserted SwFmtMeta has no sw::Meta?");
+    OSL_ENSURE(!(m_pTextAttr && i_pTextAttr),
+        "SwFormatMeta::SetTextAttr: already has text attribute?");
+    OSL_ENSURE(  m_pTextAttr || i_pTextAttr ,
+        "SwFormatMeta::SetTextAttr: no attribute to remove?");
+    m_pTextAttr = i_pTextAttr;
+    OSL_ENSURE(m_pMeta, "inserted SwFormatMeta has no sw::Meta?");
     // the sw::Meta must be able to find the current text attribute!
     if (m_pMeta)
     {
-        if (i_pTxtAttr)
+        if (i_pTextAttr)
         {
-            m_pMeta->SetFmtMeta(this);
+            m_pMeta->SetFormatMeta(this);
         }
-        else if (m_pMeta->GetFmtMeta() == this)
+        else if (m_pMeta->GetFormatMeta() == this)
         {   // text attribute gone => de-register from text node!
-            NotifyChangeTxtNode(0);
-            m_pMeta->SetFmtMeta(0);
+            NotifyChangeTextNode(0);
+            m_pMeta->SetFormatMeta(0);
         }
     }
 }
 
-void SwFmtMeta::NotifyChangeTxtNode(SwTxtNode *const pTxtNode)
+void SwFormatMeta::NotifyChangeTextNode(SwTextNode *const pTextNode)
 {
-    // N.B.: do not reset m_pTxtAttr here: see call in nodes.cxx,
+    // N.B.: do not reset m_pTextAttr here: see call in nodes.cxx,
     // where the hint is not deleted!
-    OSL_ENSURE(m_pMeta, "SwFmtMeta::NotifyChangeTxtNode: no Meta?");
-    if (m_pMeta && (m_pMeta->GetFmtMeta() == this))
+    OSL_ENSURE(m_pMeta, "SwFormatMeta::NotifyChangeTextNode: no Meta?");
+    if (m_pMeta && (m_pMeta->GetFormatMeta() == this))
     {   // do not call Modify, that would call SwXMeta::Modify!
-        m_pMeta->NotifyChangeTxtNode(pTxtNode);
+        m_pMeta->NotifyChangeTextNode(pTextNode);
     }
 }
 
-// this SwFmtMeta has been cloned and points at the same sw::Meta as the source
+// this SwFormatMeta has been cloned and points at the same sw::Meta as the source
 // this method copies the sw::Meta
-void SwFmtMeta::DoCopy(::sw::MetaFieldManager & i_rTargetDocManager,
-        SwTxtNode & i_rTargetTxtNode)
+void SwFormatMeta::DoCopy(::sw::MetaFieldManager & i_rTargetDocManager,
+        SwTextNode & i_rTargetTextNode)
 {
-    OSL_ENSURE(m_pMeta, "DoCopy called for SwFmtMeta with no sw::Meta?");
+    OSL_ENSURE(m_pMeta, "DoCopy called for SwFormatMeta with no sw::Meta?");
     if (m_pMeta)
     {
         const ::boost::shared_ptr< ::sw::Meta> pOriginal( m_pMeta );
@@ -622,7 +622,7 @@ void SwFmtMeta::DoCopy(::sw::MetaFieldManager & i_rTargetDocManager,
                 pMetaField->m_nNumberFormat, pMetaField->IsFixedLanguage() );
         }
         // Meta must have a text node before calling RegisterAsCopyOf
-        m_pMeta->NotifyChangeTxtNode(& i_rTargetTxtNode);
+        m_pMeta->NotifyChangeTextNode(& i_rTargetTextNode);
         // this cannot be done in Clone: a Clone is not necessarily a copy!
         m_pMeta->RegisterAsCopyOf(*pOriginal);
     }
@@ -630,11 +630,11 @@ void SwFmtMeta::DoCopy(::sw::MetaFieldManager & i_rTargetDocManager,
 
 namespace sw {
 
-Meta::Meta(SwFmtMeta * const i_pFmt)
+Meta::Meta(SwFormatMeta * const i_pFormat)
     : ::sfx2::Metadatable()
     , SwModify()
-    , m_pFmt(i_pFmt)
-    , m_pTxtNode(0)
+    , m_pFormat(i_pFormat)
+    , m_pTextNode(0)
 {
 }
 
@@ -642,29 +642,29 @@ Meta::~Meta()
 {
 }
 
-SwTxtMeta * Meta::GetTxtAttr() const
+SwTextMeta * Meta::GetTextAttr() const
 {
-    return (m_pFmt) ? m_pFmt->GetTxtAttr() : 0;
+    return (m_pFormat) ? m_pFormat->GetTextAttr() : 0;
 }
 
 
-void Meta::NotifyChangeTxtNodeImpl()
+void Meta::NotifyChangeTextNodeImpl()
 {
-    if (m_pTxtNode && (GetRegisteredIn() != m_pTxtNode))
+    if (m_pTextNode && (GetRegisteredIn() != m_pTextNode))
     {
-        m_pTxtNode->Add(this);
+        m_pTextNode->Add(this);
     }
-    else if (!m_pTxtNode && GetRegisteredIn())
+    else if (!m_pTextNode && GetRegisteredIn())
     {
         GetRegisteredInNonConst()->Remove(this);
     }
 }
 
-void Meta::NotifyChangeTxtNode(SwTxtNode *const pTxtNode)
+void Meta::NotifyChangeTextNode(SwTextNode *const pTextNode)
 {
-    m_pTxtNode = pTxtNode;
-    NotifyChangeTxtNodeImpl();
-    if (!pTxtNode) // text node gone? invalidate UNO object!
+    m_pTextNode = pTextNode;
+    NotifyChangeTextNodeImpl();
+    if (!pTextNode) // text node gone? invalidate UNO object!
     {
         SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT,
             &static_cast<SwModify&>(*this) ); // cast to base class!
@@ -685,34 +685,34 @@ void Meta::Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew )
 // sfx2::Metadatable
 ::sfx2::IXmlIdRegistry& Meta::GetRegistry()
 {
-    SwTxtNode * const pTxtNode( GetTxtNode() );
+    SwTextNode * const pTextNode( GetTextNode() );
     // GetRegistry may only be called on a meta that is actually in the
     // document, which means it has a pointer to its text node
-    OSL_ENSURE(pTxtNode, "ERROR: GetRegistry: no text node?");
-    if (!pTxtNode)
+    OSL_ENSURE(pTextNode, "ERROR: GetRegistry: no text node?");
+    if (!pTextNode)
         throw uno::RuntimeException();
-    return pTxtNode->GetRegistry();
+    return pTextNode->GetRegistry();
 }
 
 bool Meta::IsInClipboard() const
 {
-    const SwTxtNode * const pTxtNode( GetTxtNode() );
-// no text node: in UNDO  OSL_ENSURE(pTxtNode, "IsInClipboard: no text node?");
-    return pTxtNode && pTxtNode->IsInClipboard();
+    const SwTextNode * const pTextNode( GetTextNode() );
+// no text node: in UNDO  OSL_ENSURE(pTextNode, "IsInClipboard: no text node?");
+    return pTextNode && pTextNode->IsInClipboard();
 }
 
 bool Meta::IsInUndo() const
 {
-    const SwTxtNode * const pTxtNode( GetTxtNode() );
-// no text node: in UNDO  OSL_ENSURE(pTxtNode, "IsInUndo: no text node?");
-    return pTxtNode == nullptr || pTxtNode->IsInUndo();
+    const SwTextNode * const pTextNode( GetTextNode() );
+// no text node: in UNDO  OSL_ENSURE(pTextNode, "IsInUndo: no text node?");
+    return pTextNode == nullptr || pTextNode->IsInUndo();
 }
 
 bool Meta::IsInContent() const
 {
-    const SwTxtNode * const pTxtNode( GetTxtNode() );
-    OSL_ENSURE(pTxtNode, "IsInContent: no text node?");
-    return pTxtNode == nullptr || pTxtNode->IsInContent();
+    const SwTextNode * const pTextNode( GetTextNode() );
+    OSL_ENSURE(pTextNode, "IsInContent: no text node?");
+    return pTextNode == nullptr || pTextNode->IsInContent();
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable >
@@ -721,9 +721,9 @@ Meta::MakeUnoObject()
     return SwXMeta::CreateXMeta(*this);
 }
 
-MetaField::MetaField(SwFmtMeta * const i_pFmt,
+MetaField::MetaField(SwFormatMeta * const i_pFormat,
             const sal_uInt32 nNumberFormat, const bool bIsFixedLanguage)
-    : Meta(i_pFmt)
+    : Meta(i_pFormat)
     , m_nNumberFormat( nNumberFormat )
     , m_bIsFixedLanguage( bIsFixedLanguage )
 {
@@ -739,8 +739,8 @@ void MetaField::GetPrefixAndSuffix(
                 "GetPrefixAndSuffix: no SwXMetaField?");
         if (xMetaField.is())
         {
-            SwTxtNode * const pTxtNode( GetTxtNode() );
-            SwDocShell const * const pShell(pTxtNode->GetDoc()->GetDocShell());
+            SwTextNode * const pTextNode( GetTextNode() );
+            SwDocShell const * const pShell(pTextNode->GetDoc()->GetDocShell());
             const uno::Reference<frame::XModel> xModel(
                 (pShell) ? pShell->GetModel() : 0,  uno::UNO_SET_THROW);
             getPrefixAndSuffix(xModel, xMetaField, o_pPrefix, o_pSuffix);
@@ -756,11 +756,11 @@ sal_uInt32 MetaField::GetNumberFormat(OUString const & rContent) const
 {
     //TODO: this probably lacks treatment for some special cases
     sal_uInt32 nNumberFormat( m_nNumberFormat );
-    SwTxtNode * const pTxtNode( GetTxtNode() );
-    if (pTxtNode)
+    SwTextNode * const pTextNode( GetTextNode() );
+    if (pTextNode)
     {
         SvNumberFormatter *const pNumberFormatter(
-                pTxtNode->GetDoc()->GetNumberFormatter() );
+                pTextNode->GetDoc()->GetNumberFormatter() );
         double number;
         (void) pNumberFormatter->IsNumberFormat(
                 rContent, nNumberFormat, number );
@@ -780,11 +780,11 @@ MetaFieldManager::MetaFieldManager()
 }
 
 ::boost::shared_ptr<MetaField>
-MetaFieldManager::makeMetaField(SwFmtMeta * const i_pFmt,
+MetaFieldManager::makeMetaField(SwFormatMeta * const i_pFormat,
         const sal_uInt32 nNumberFormat, const bool bIsFixedLanguage)
 {
     const ::boost::shared_ptr<MetaField> pMetaField(
-        new MetaField(i_pFmt, nNumberFormat, bIsFixedLanguage) );
+        new MetaField(i_pFormat, nNumberFormat, bIsFixedLanguage) );
     m_MetaFields.push_back(pMetaField);
     return pMetaField;
 }
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 9cb932048738..2aa82024bb69 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1793,7 +1793,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 
 Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
 {
-    Size aTxtSize;
+    Size aTextSize;
     const sal_Int32 nLn = ( COMPLETE_STRING != rInf.GetLen() ) ? rInf.GetLen() :
                            rInf.GetText().getLength();
 
@@ -1824,24 +1824,24 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
             else
                 pOutDev = rInf.GetpOut();
 
-            aTxtSize.Width() =
+            aTextSize.Width() =
                     pOutDev->GetTextWidth( rInf.GetText(), rInf.GetIdx(), nLn );
 
             OSL_ENSURE( !rInf.GetShell() ||
                     ( USHRT_MAX != GetGuessedLeading() && USHRT_MAX != GetExtLeading() ),
                 "Leading values should be already calculated" );
-            aTxtSize.Height() = pOutDev->GetTextHeight() +
+            aTextSize.Height() = pOutDev->GetTextHeight() +
                                 GetFontLeading( rInf.GetShell(), rInf.GetOut() );
 
-            long nAvgWidthPerChar = aTxtSize.Width() / nLn;
+            long nAvgWidthPerChar = aTextSize.Width() / nLn;
 
             const sal_uLong i = nAvgWidthPerChar ?
                             ( nAvgWidthPerChar - 1 ) / nGridWidth + 1:
                             1;
 
-            aTxtSize.Width() = i * nGridWidth * nLn;
+            aTextSize.Width() = i * nGridWidth * nLn;
             rInf.SetKanaDiff( 0 );
-            return aTxtSize;
+            return aTextSize;
         }
     }
 
@@ -1862,15 +1862,15 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
             }
             else
                 pOutDev = rInf.GetpOut();
-            aTxtSize.Width() = pOutDev->GetTextWidth( rInf.GetText(), rInf.GetIdx(), nLn );
-            aTxtSize.Height() = pOutDev->GetTextHeight() +
+            aTextSize.Width() = pOutDev->GetTextWidth( rInf.GetText(), rInf.GetIdx(), nLn );
+            aTextSize.Height() = pOutDev->GetTextHeight() +
                                 GetFontLeading( rInf.GetShell(), rInf.GetOut() );
-            aTxtSize.Width() += nLn * nGridWidthAdd;
+            aTextSize.Width() += nLn * nGridWidthAdd;
             //if ( rInf.GetKern() && nLn )
-            //    aTxtSize.Width() += ( nLn ) * long( rInf.GetKern() );
+            //    aTextSize.Width() += ( nLn ) * long( rInf.GetKern() );
 
             rInf.SetKanaDiff( 0 );
-            return aTxtSize;
+            return aTextSize;
         }
     }
 
@@ -1890,9 +1890,9 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
     {
         if( !pPrtFont->IsSameInstance( pPrinter->GetFont() ) )
             pPrinter->SetFont(*pPrtFont);
-        aTxtSize.Width() = pPrinter->GetTextWidth( rInf.GetText(),
+        aTextSize.Width() = pPrinter->GetTextWidth( rInf.GetText(),
                                                    rInf.GetIdx(), nLn );
-        aTxtSize.Height() = pPrinter->GetTextHeight();
+        aTextSize.Height() = pPrinter->GetTextHeight();
         long* pKernArray = new long[nLn];
         CreateScrFont( *rInf.GetShell(), rInf.GetOut() );
         if( !GetScrFont()->IsSameInstance( rInf.GetOut().GetFont() ) )
@@ -1953,7 +1953,7 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
         }
 
         delete[] pKernArray;
-        aTxtSize.Width() = nScrPos;
+        aTextSize.Width() = nScrPos;
     }
     else
     {
@@ -1967,28 +1967,28 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
             rInf.SetKanaDiff( rInf.GetScriptInfo()->Compress( pKernArray,
                 rInf.GetIdx(), nLn, rInf.GetKanaComp(),
                 (sal_uInt16) aFont.GetSize().Height() ) );
-            aTxtSize.Width() = pKernArray[ nLn - 1 ];
+            aTextSize.Width() = pKernArray[ nLn - 1 ];
             delete[] pKernArray;
         }
         else
         {
-            aTxtSize.Width() = rInf.GetOut().GetTextWidth( rInf.GetText(),
+            aTextSize.Width() = rInf.GetOut().GetTextWidth( rInf.GetText(),
                                                            rInf.GetIdx(), nLn,
                                                            rInf.GetVclCache());
             rInf.SetKanaDiff( 0 );
         }
 
-        aTxtSize.Height() = rInf.GetOut().GetTextHeight();
+        aTextSize.Height() = rInf.GetOut().GetTextHeight();
     }
 
     if ( rInf.GetKern() && nLn )
-        aTxtSize.Width() += ( nLn - 1 ) * long( rInf.GetKern() );
+        aTextSize.Width() += ( nLn - 1 ) * long( rInf.GetKern() );
 
     OSL_ENSURE( !rInf.GetShell() ||
             ( USHRT_MAX != GetGuessedLeading() && USHRT_MAX != GetExtLeading() ),
               "Leading values should be already calculated" );
-    aTxtSize.Height() += GetFontLeading( rInf.GetShell(), rInf.GetOut() );
-    return aTxtSize;
+    aTextSize.Height() += GetFontLeading( rInf.GetShell(), rInf.GetOut() );
+    return aTextSize;
 }
 
 sal_Int32 SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf )
@@ -2301,7 +2301,7 @@ SwCacheObj *SwFntAccess::NewObj( )
     return new SwFntObj( *static_cast<SwSubFont const *>(pOwner), ++pMagicNo, pShell );
 }
 
-sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
+sal_Int32 SwFont::GetTextBreak( SwDrawTextInfo& rInf, long nTextWidth )
 {
     ChgFnt( rInf.GetShell(), rInf.GetOut() );
 
@@ -2314,7 +2314,7 @@ sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
     OSL_ENSURE( !bCompress || ( rInf.GetScriptInfo() && rInf.GetScriptInfo()->
             CountCompChg()), "Compression without info" );
 
-    sal_Int32 nTxtBreak = 0;
+    sal_Int32 nTextBreak = 0;
     long nKern = 0;
 
     sal_Int32 nLn = rInf.GetLen() == COMPLETE_STRING
@@ -2342,14 +2342,14 @@ sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
             nAvgWidthPerChar = i * nGridWidth;
             long nCurrPos = nAvgWidthPerChar;
 
-            while( nTxtBreak < rInf.GetLen() && nTextWidth >= nCurrPos )
+            while( nTextBreak < rInf.GetLen() && nTextWidth >= nCurrPos )
             {
                 nCurrPos += nAvgWidthPerChar;
-                ++nTxtBreak;
+                ++nTextBreak;
             }
 
             delete[] pKernArray;
-            return nTxtBreak + rInf.GetIdx();
+            return nTextBreak + rInf.GetIdx();
         }
     }
 
@@ -2365,20 +2365,20 @@ sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
             long* pKernArray = new long[rInf.GetLen()];
             rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray,
                                             rInf.GetIdx(), rInf.GetLen() );
-            long nCurrPos = pKernArray[nTxtBreak] + nGridWidthAdd;
-            while( nTxtBreak < rInf.GetLen() && nTextWidth >= nCurrPos)
+            long nCurrPos = pKernArray[nTextBreak] + nGridWidthAdd;
+            while( nTextBreak < rInf.GetLen() && nTextWidth >= nCurrPos)
             {
-                nTxtBreak++;
-                nCurrPos = pKernArray[nTxtBreak] + nGridWidthAdd * ( nTxtBreak + 1 );
+                nTextBreak++;
+                nCurrPos = pKernArray[nTextBreak] + nGridWidthAdd * ( nTextBreak + 1 );
             }
             delete[] pKernArray;
-            return nTxtBreak + rInf.GetIdx();
+            return nTextBreak + rInf.GetIdx();
         }
     }
 
     if( aSub[nActual].IsCapital() && nLn )
     {
-        nTxtBreak = GetCapitalBreak( rInf.GetShell(), rInf.GetpOut(),
+        nTextBreak = GetCapitalBreak( rInf.GetShell(), rInf.GetpOut(),
             rInf.GetScriptInfo(), rInf.GetText(), nTextWidth, rInf.GetIdx(),
             nLn );
     }
@@ -2429,38 +2429,38 @@ sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
 
         if( rInf.GetHyphPos() ) {
             sal_Int32 nHyphPos = *rInf.GetHyphPos();
-            nTxtBreak = rInf.GetOut().GetTextBreak( *pTmpText, nTextWidth,
+            nTextBreak = rInf.GetOut().GetTextBreak( *pTmpText, nTextWidth,
                              static_cast<sal_Unicode>('-'), nHyphPos,
                              nTmpIdx, nTmpLen, nKern, rInf.GetVclCache());
             *rInf.GetHyphPos() = (nHyphPos == -1) ? COMPLETE_STRING : nHyphPos;
         }
         else
-            nTxtBreak = rInf.GetOut().GetTextBreak( *pTmpText, nTextWidth,
+            nTextBreak = rInf.GetOut().GetTextBreak( *pTmpText, nTextWidth,
                              nTmpIdx, nTmpLen, nKern, rInf.GetVclCache());
 
-        if ( bTextReplaced && nTxtBreak != -1 )
+        if ( bTextReplaced && nTextBreak != -1 )
         {
             if ( nTmpLen != nLn )
-                nTxtBreak = sw_CalcCaseMap( *this, rInf.GetText(),
-                                             rInf.GetIdx(), nLn, nTxtBreak );
+                nTextBreak = sw_CalcCaseMap( *this, rInf.GetText(),
+                                             rInf.GetIdx(), nLn, nTextBreak );
             else
-                nTxtBreak = nTxtBreak + rInf.GetIdx();
+                nTextBreak = nTextBreak + rInf.GetIdx();
         }
     }
 
-    sal_Int32 nTxtBreak2 = nTxtBreak == -1 ? COMPLETE_STRING : nTxtBreak;
+    sal_Int32 nTextBreak2 = nTextBreak == -1 ? COMPLETE_STRING : nTextBreak;
 
     if ( ! bCompress )
-        return nTxtBreak2;
+        return nTextBreak2;
 
-    nTxtBreak2 = nTxtBreak2 - rInf.GetIdx();
+    nTextBreak2 = nTextBreak2 - rInf.GetIdx();
 
-    if( nTxtBreak2 < nLn )
+    if( nTextBreak2 < nLn )
     {
-        if( !nTxtBreak2 && nLn )
+        if( !nTextBreak2 && nLn )
             nLn = 1;
-        else if( nLn > 2 * nTxtBreak2 )
-            nLn = 2 * nTxtBreak2;
+        else if( nLn > 2 * nTextBreak2 )
+            nLn = 2 * nTextBreak2;
         long* pKernArray = new long[ nLn ];
         rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray,
                                     rInf.GetIdx(), nLn );
@@ -2468,22 +2468,22 @@ sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
                             rInf.GetKanaComp(), (sal_uInt16)GetHeight( nActual ) ) )
         {
             long nKernAdd = nKern;
-            sal_Int32 nTmpBreak = nTxtBreak2;
-            if( nKern && nTxtBreak2 )
-                nKern *= nTxtBreak2 - 1;
-            while( nTxtBreak2<nLn && nTextWidth >= pKernArray[nTxtBreak2] +nKern )
+            sal_Int32 nTmpBreak = nTextBreak2;
+            if( nKern && nTextBreak2 )
+                nKern *= nTextBreak2 - 1;
+            while( nTextBreak2<nLn && nTextWidth >= pKernArray[nTextBreak2] +nKern )
             {
                 nKern += nKernAdd;
-                ++nTxtBreak2;
+                ++nTextBreak2;
             }
             if( rInf.GetHyphPos() )
-                *rInf.GetHyphPos() += nTxtBreak2 - nTmpBreak; // It's not perfect
+                *rInf.GetHyphPos() += nTextBreak2 - nTmpBreak; // It's not perfect
         }
         delete[] pKernArray;
     }
-    nTxtBreak2 = nTxtBreak2 + rInf.GetIdx();
+    nTextBreak2 = nTextBreak2 + rInf.GetIdx();
 
-    return nTxtBreak2;
+    return nTextBreak2;
 }
 
 extern Color aGlobalRetoucheColor;
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index b7b856045723..5087242b9ff2 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -108,26 +108,26 @@ public:
 class SwDoGetCapitalSize : public SwDoCapitals
 {
 protected:
-    Size aTxtSize;
+    Size aTextSize;
 public:
     SwDoGetCapitalSize( SwDrawTextInfo &rInfo ) : SwDoCapitals ( rInfo ) { }
     virtual ~SwDoGetCapitalSize() {}
     virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE;
     virtual void Do() SAL_OVERRIDE;
-    const Size &GetSize() const { return aTxtSize; }
+    const Size &GetSize() const { return aTextSize; }
 };
 
 void SwDoGetCapitalSize::Init( SwFntObj *, SwFntObj * )
 {
-    aTxtSize.Height() = 0;
-    aTxtSize.Width() = 0;
+    aTextSize.Height() = 0;
+    aTextSize.Width() = 0;
 }
 
 void SwDoGetCapitalSize::Do()
 {
-    aTxtSize.Width() += rInf.GetSize().Width();
+    aTextSize.Width() += rInf.GetSize().Width();
     if( rInf.GetUpper() )
-        aTxtSize.Height() = rInf.GetSize().Height();
+        aTextSize.Height() = rInf.GetSize().Height();
 }
 
 Size SwSubFont::GetCapitalSize( SwDrawTextInfo& rInf )
@@ -141,27 +141,27 @@ Size SwSubFont::GetCapitalSize( SwDrawTextInfo& rInf )
     rInf.SetDrawSpace( false );
     SwDoGetCapitalSize aDo( rInf );
     DoOnCapitals( aDo );
-    Size aTxtSize( aDo.GetSize() );
+    Size aTextSize( aDo.GetSize() );
 
     // End:
-    if( !aTxtSize.Height() )
+    if( !aTextSize.Height() )
     {
         SV_STAT( nGetTextSize );
-        aTxtSize.Height() = short ( rInf.GetpOut()->GetTextHeight() );
+        aTextSize.Height() = short ( rInf.GetpOut()->GetTextHeight() );
     }
     rInf.SetKern( nOldKern );
-    return aTxtSize;
+    return aTextSize;
 }
 
 class SwDoGetCapitalBreak : public SwDoCapitals
 {
 protected:
-    long nTxtWidth;
+    long nTextWidth;
     sal_Int32 m_nBreak;
 public:
     SwDoGetCapitalBreak( SwDrawTextInfo &rInfo, long const nWidth)
         :   SwDoCapitals ( rInfo )
-        ,   nTxtWidth( nWidth )
+        ,   nTextWidth( nWidth )
         ,   m_nBreak( -1 )
         { }
     virtual ~SwDoGetCapitalBreak() {}
@@ -176,14 +176,14 @@ void SwDoGetCapitalBreak::Init( SwFntObj *, SwFntObj * )
 
 void SwDoGetCapitalBreak::Do()
 {
-    if ( nTxtWidth )
+    if ( nTextWidth )
     {
-        if ( rInf.GetSize().Width() < nTxtWidth )
-            nTxtWidth -= rInf.GetSize().Width();
+        if ( rInf.GetSize().Width() < nTextWidth )
+            nTextWidth -= rInf.GetSize().Width();
         else
         {
             sal_Int32 nEnd = rInf.GetEnd();
-            m_nBreak = GetOut().GetTextBreak( rInf.GetText(), nTxtWidth,
+            m_nBreak = GetOut().GetTextBreak( rInf.GetText(), nTextWidth,
                                rInf.GetIdx(), rInf.GetLen(), rInf.GetKern() );
 
             if (m_nBreak > nEnd || m_nBreak < 0)
@@ -202,18 +202,18 @@ void SwDoGetCapitalBreak::Do()
                     m_nBreak = m_nBreak + GetCapInf()->nIdx;
             }
 
-            nTxtWidth = 0;
+            nTextWidth = 0;
         }
     }
 }
 
 sal_Int32 SwFont::GetCapitalBreak( SwViewShell const * pSh, const OutputDevice* pOut,
-    const SwScriptInfo* pScript, const OUString& rTxt, long const nTextWidth,
+    const SwScriptInfo* pScript, const OUString& rText, long const nTextWidth,
     const sal_Int32 nIdx, const sal_Int32 nLen )
 {
     // Start:
     Point aPos( 0, 0 );
-    SwDrawTextInfo aInfo(pSh, *const_cast<OutputDevice*>(pOut), pScript, rTxt, nIdx, nLen,
+    SwDrawTextInfo aInfo(pSh, *const_cast<OutputDevice*>(pOut), pScript, rText, nIdx, nLen,
         0, false);
     aInfo.SetPos( aPos );
     aInfo.SetSpace( 0 );
@@ -469,13 +469,13 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
     OSL_ENSURE( pLastFont, "SwFont::DoOnCapitals: No LastFont?!" );
 
     long nKana = 0;
-    const OUString aTxt( CalcCaseMap( rDo.GetInf().GetText() ) );
+    const OUString aText( CalcCaseMap( rDo.GetInf().GetText() ) );
     sal_Int32 nMaxPos = std::min( rDo.GetInf().GetText().getLength() - rDo.GetInf().GetIdx(),
                              rDo.GetInf().GetLen() );
     rDo.GetInf().SetLen( nMaxPos );
 
     const OUString oldText = rDo.GetInf().GetText();
-    rDo.GetInf().SetText( aTxt );
+    rDo.GetInf().SetText( aText );
     sal_Int32 nPos = rDo.GetInf().GetIdx();
     sal_Int32 nOldPos = nPos;
     nMaxPos = nMaxPos + nPos;
@@ -485,7 +485,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
     // text is different. If yes, do special handling.
     OUString aNewText;
     SwCapitalInfo aCapInf(oldText);
-    bool bCaseMapLengthDiffers(aTxt.getLength() != oldText.getLength());
+    bool bCaseMapLengthDiffers(aText.getLength() != oldText.getLength());
     if ( bCaseMapLengthDiffers )
         rDo.SetCapInf( aCapInf );
 
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx b/sw/source/core/txtnode/modeltoviewhelper.cxx
index dddf82f23c94..b125f0507827 100644
--- a/sw/source/core/txtnode/modeltoviewhelper.cxx
+++ b/sw/source/core/txtnode/modeltoviewhelper.cxx
@@ -80,9 +80,9 @@ struct containsPos
     }
 };
 
-ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, ExpandMode eMode)
+ModelToViewHelper::ModelToViewHelper(const SwTextNode &rNode, ExpandMode eMode)
 {
-    const OUString& rNodeText = rNode.GetTxt();
+    const OUString& rNodeText = rNode.GetText();
     m_aRetText = rNodeText;
 
     if (eMode == ExpandMode::PassThrough)
@@ -130,7 +130,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, ExpandMode eMode)
         const SwpHints* pSwpHints2 = rNode.GetpSwpHints();
         for ( size_t i = 0; pSwpHints2 && i < pSwpHints2->Count(); ++i )
         {
-            const SwTxtAttr* pAttr = (*pSwpHints2)[i];
+            const SwTextAttr* pAttr = (*pSwpHints2)[i];
             if (pAttr->HasDummyChar())
             {
                 const sal_Int32 nDummyCharPos = pAttr->GetStart();
@@ -149,19 +149,19 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, ExpandMode eMode)
                             {
                                 aFieldResult.m_sExpand = (eMode & ExpandMode::ReplaceMode)
                                     ? OUString(CHAR_ZWSP)
-                                    : static_txtattr_cast<SwTxtFld const*>(pAttr)->
-                                      GetFmtFld().GetField()->ExpandField(true);
+                                    : static_txtattr_cast<SwTextField const*>(pAttr)->
+                                      GetFormatField().GetField()->ExpandField(true);
                                 aFieldResult.m_eType = FieldResult::FIELD;
                             }
                             break;
                         case RES_TXTATR_FTN:
                             if (eMode & ExpandMode::ExpandFootnote)
                             {
-                                const SwFmtFtn& rFtn = static_cast<SwTxtFtn const*>(pAttr)->GetFtn();
+                                const SwFormatFootnote& rFootnote = static_cast<SwTextFootnote const*>(pAttr)->GetFootnote();
                                 const SwDoc *pDoc = rNode.GetDoc();
                                 aFieldResult.m_sExpand = (eMode & ExpandMode::ReplaceMode)
                                     ? OUString(CHAR_ZWSP)
-                                    : rFtn.GetViewNumStr(*pDoc);
+                                    : rFootnote.GetViewNumStr(*pDoc);
                                 aFieldResult.m_eType = FieldResult::FOOTNOTE;
                             }
                             break;
diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index bbaea16e05a0..cb312434eea0 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -30,7 +30,7 @@
 // Sortierreihenfolge: Start, Ende (umgekehrt!), Which-Wert (umgekehrt!),
 //                     als letztes die Adresse selbst
 
-static bool lcl_IsLessStart( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
+static bool lcl_IsLessStart( const SwTextAttr &rHt1, const SwTextAttr &rHt2 )
 {
     if ( rHt1.GetStart() == rHt2.GetStart() )
     {
@@ -45,9 +45,9 @@ static bool lcl_IsLessStart( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
                 if ( RES_TXTATR_CHARFMT == nWhich1 )
                 {
                     const sal_uInt16 nS1 =
-                        static_txtattr_cast<const SwTxtCharFmt&>(rHt1).GetSortNumber();
+                        static_txtattr_cast<const SwTextCharFormat&>(rHt1).GetSortNumber();
                     const sal_uInt16 nS2 =
-                        static_txtattr_cast<const SwTxtCharFmt&>(rHt2).GetSortNumber();
+                        static_txtattr_cast<const SwTextCharFormat&>(rHt2).GetSortNumber();
                     if ( nS1 != nS2 ) // robust
                         return nS1 < nS2;
                 }
@@ -63,7 +63,7 @@ static bool lcl_IsLessStart( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
 }
 
 // Zuerst nach Ende danach nach Ptr
-static bool lcl_IsLessEnd( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
+static bool lcl_IsLessEnd( const SwTextAttr &rHt1, const SwTextAttr &rHt2 )
 {
     const sal_Int32 nHt1 = *rHt1.GetAnyEnd();
     const sal_Int32 nHt2 = *rHt2.GetAnyEnd();
@@ -78,9 +78,9 @@ static bool lcl_IsLessEnd( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
                 if ( RES_TXTATR_CHARFMT == nWhich1 )
                 {
                     const sal_uInt16 nS1 =
-                        static_txtattr_cast<const SwTxtCharFmt&>(rHt1).GetSortNumber();
+                        static_txtattr_cast<const SwTextCharFormat&>(rHt1).GetSortNumber();
                     const sal_uInt16 nS2 =
-                        static_txtattr_cast<const SwTxtCharFmt&>(rHt2).GetSortNumber();
+                        static_txtattr_cast<const SwTextCharFormat&>(rHt2).GetSortNumber();
                     if ( nS1 != nS2 ) // robust
                         return nS1 > nS2;
                 }
@@ -96,31 +96,31 @@ static bool lcl_IsLessEnd( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
     return ( nHt1 < nHt2 );
 }
 
-bool CompareSwpHtStart::operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const
+bool CompareSwpHtStart::operator()(SwTextAttr* const lhs, SwTextAttr* const rhs) const
 {
   return lcl_IsLessStart( *lhs, *rhs );
 }
 
-bool CompareSwpHtEnd::operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const
+bool CompareSwpHtEnd::operator()(SwTextAttr* const lhs, SwTextAttr* const rhs) const
 {
   return lcl_IsLessEnd( *lhs, *rhs );
 }
 
-void SwpHintsArray::Insert( const SwTxtAttr *pHt )
+void SwpHintsArray::Insert( const SwTextAttr *pHt )
 {
     Resort();
-    assert(m_HintStarts.find(const_cast<SwTxtAttr*>(pHt))
+    assert(m_HintStarts.find(const_cast<SwTextAttr*>(pHt))
             == m_HintStarts.end()); // "Insert: hint already in HtStart"
-    assert(m_HintEnds.find(const_cast<SwTxtAttr*>(pHt))
+    assert(m_HintEnds.find(const_cast<SwTextAttr*>(pHt))
             == m_HintEnds.end());   // "Insert: hint already in HtEnd"
-    m_HintStarts.insert( const_cast<SwTxtAttr*>(pHt) );
-    m_HintEnds  .insert( const_cast<SwTxtAttr*>(pHt) );
+    m_HintStarts.insert( const_cast<SwTextAttr*>(pHt) );
+    m_HintEnds  .insert( const_cast<SwTextAttr*>(pHt) );
 }
 
 void SwpHintsArray::DeleteAtPos( const size_t nPos )
 {
     // optimization: nPos is the position in the Starts array
-    SwTxtAttr *pHt = m_HintStarts[ nPos ];
+    SwTextAttr *pHt = m_HintStarts[ nPos ];
     m_HintStarts.erase( m_HintStarts.begin() + nPos );
 
     Resort();
@@ -130,10 +130,10 @@ void SwpHintsArray::DeleteAtPos( const size_t nPos )
     (void) done; // unused in NDEBUG
 }
 
-bool SwpHintsArray::Contains( const SwTxtAttr *pHt ) const
+bool SwpHintsArray::Contains( const SwTextAttr *pHt ) const
 {
     // DO NOT use find() or CHECK here!
-    // if called from SwTxtNode::InsertItem, pHt has already been deleted,
+    // if called from SwTextNode::InsertItem, pHt has already been deleted,
     // so it cannot be dereferenced
     for (size_t i = 0; i < m_HintStarts.size(); ++i)
     {
@@ -163,21 +163,21 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
     sal_Int32 nLastStart = 0;
     sal_Int32 nLastEnd   = 0;
 
-    const SwTxtAttr *pLastStart = 0;
-    const SwTxtAttr *pLastEnd = 0;
-    std::set<SwTxtAttr const*> RsidOnlyAutoFmts;
+    const SwTextAttr *pLastStart = 0;
+    const SwTextAttr *pLastEnd = 0;
+    std::set<SwTextAttr const*> RsidOnlyAutoFormats;
     if (bPortionsMerged)
     {
         for (size_t i = 0; i < Count(); ++i)
         {
-            SwTxtAttr const*const pHint(m_HintStarts[i]);
+            SwTextAttr const*const pHint(m_HintStarts[i]);
             if (RES_TXTATR_AUTOFMT == pHint->Which())
             {
                 std::shared_ptr<SfxItemSet> const pSet(
-                        pHint->GetAutoFmt().GetStyleHandle());
+                        pHint->GetAutoFormat().GetStyleHandle());
                 if (pSet->Count() == 1 && pSet->GetItem(RES_CHRATR_RSID, false))
                 {
-                    RsidOnlyAutoFmts.insert(pHint);
+                    RsidOnlyAutoFormats.insert(pHint);
                 }
             }
         }
@@ -188,7 +188,7 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
         // --- Start-Kontrolle ---
 
         // 2a) gueltiger Pointer? vgl. DELETEFF
-        const SwTxtAttr *pHt = m_HintStarts[i];
+        const SwTextAttr *pHt = m_HintStarts[i];
         CHECK_ERR( 0xFF != *reinterpret_cast<unsigned char const *>(pHt), "HintsCheck: start ptr was deleted" );
 
         // 3a) Stimmt die Start-Sortierung?
@@ -205,7 +205,7 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
         // --- End-Kontrolle ---
 
         // 2b) gueltiger Pointer? vgl. DELETEFF
-        const SwTxtAttr *pHtEnd = m_HintEnds[i];
+        const SwTextAttr *pHtEnd = m_HintEnds[i];
         CHECK_ERR( 0xFF != *reinterpret_cast<unsigned char const *>(pHtEnd), "HintsCheck: end ptr was deleted" );
 
         // 3b) Stimmt die End-Sortierung?
@@ -223,13 +223,13 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
         // --- Ueberkreuzungen ---
 
         // 5) gleiche Pointer in beiden Arrays
-        if (m_HintStarts.find(const_cast<SwTxtAttr*>(pHt)) == m_HintStarts.end())
+        if (m_HintStarts.find(const_cast<SwTextAttr*>(pHt)) == m_HintStarts.end())
             nIdx = COMPLETE_STRING;
 
         CHECK_ERR( COMPLETE_STRING != nIdx, "HintsCheck: no GetStartOf" );
 
         // 6) gleiche Pointer in beiden Arrays
-        if (m_HintEnds.find(const_cast<SwTxtAttr*>(pHt)) == m_HintEnds.end())
+        if (m_HintEnds.find(const_cast<SwTextAttr*>(pHt)) == m_HintEnds.end())
             nIdx = COMPLETE_STRING;
 
         CHECK_ERR( COMPLETE_STRING != nIdx, "HintsCheck: no GetEndOf" );
@@ -245,8 +245,8 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
                    "HintsCheck: Character attribute in end array" );
 
         // 8) style portion check
-        const SwTxtAttr* pHtThis = m_HintStarts[i];
-        const SwTxtAttr* pHtLast = i > 0 ? m_HintStarts[i-1] : 0;
+        const SwTextAttr* pHtThis = m_HintStarts[i];
+        const SwTextAttr* pHtLast = i > 0 ? m_HintStarts[i-1] : 0;
         CHECK_ERR( (0 == i)
             ||  (   (RES_TXTATR_CHARFMT != pHtLast->Which())
                 &&  (RES_TXTATR_AUTOFMT != pHtLast->Which()))
@@ -261,9 +261,9 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
                     ) // never two AUTOFMT on same range
                 &&  (   (pHtThis->Which() != RES_TXTATR_CHARFMT)
                     ||  (pHtLast->Which() != RES_TXTATR_CHARFMT)
-                    ||  (static_txtattr_cast<const SwTxtCharFmt *>(pHtThis)
+                    ||  (static_txtattr_cast<const SwTextCharFormat *>(pHtThis)
                                 ->GetSortNumber() !=
-                         static_txtattr_cast<const SwTxtCharFmt *>(pHtLast)
+                         static_txtattr_cast<const SwTextCharFormat *>(pHtLast)
                                 ->GetSortNumber())
                     ) // multiple CHARFMT on same range need distinct sortnr
                 )
@@ -285,7 +285,7 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
                 bool bForbidContinuation(!bNoLength && !bNeedContinuation);
                 if (RES_TXTATR_AUTOFMT == pHt->Which())
                 {
-                    if (RsidOnlyAutoFmts.find(pHt) != RsidOnlyAutoFmts.end())
+                    if (RsidOnlyAutoFormats.find(pHt) != RsidOnlyAutoFormats.end())
                     {
                         assert(pHt->IsFormatIgnoreStart());
                         bNeedContinuation = false;
@@ -297,7 +297,7 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
                     bool bFound(false);
                     for (size_t j = i + 1; j < Count(); ++j)
                     {
-                        SwTxtAttr *const pOther(m_HintStarts[j]);
+                        SwTextAttr *const pOther(m_HintStarts[j]);
                         if (pOther->GetStart() > *pHt->End())
                         {
                             break; // done
@@ -317,8 +317,8 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
                                     bFound = true;
                                 }
                                 else if (bForbidContinuation &&
-                                         (RsidOnlyAutoFmts.find(pOther) ==
-                                          RsidOnlyAutoFmts.end()))
+                                         (RsidOnlyAutoFormats.find(pOther) ==
+                                          RsidOnlyAutoFormats.end()))
                                 {
                                     assert(!pOther->IsFormatIgnoreStart());
                                 }
@@ -343,7 +343,7 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
         {
             for ( size_t j = 0; j < Count(); ++j )
             {
-                SwTxtAttr const * const pOther( m_HintStarts[j] );
+                SwTextAttr const * const pOther( m_HintStarts[j] );
                 if ( pOther->IsNesting() &&  (i != j) )
                 {
                     SwComparePosition cmp = ComparePosition(
@@ -356,12 +356,12 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
             }
         }
 
-        // 10) dummy char check (unfortunately cannot check SwTxtNode::m_Text)
+        // 10) dummy char check (unfortunately cannot check SwTextNode::m_Text)
         if (pHtThis->HasDummyChar())
         {
             for ( sal_uInt16 j = 0; j < i; ++j )
             {
-                SwTxtAttr const * const pOther( m_HintStarts[j] );
+                SwTextAttr const * const pOther( m_HintStarts[j] );
                 if (pOther->HasDummyChar())
                 {
                     CHECK_ERR( (pOther->GetStart() != pHtThis->GetStart()),
@@ -376,7 +376,7 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const
 #endif      /* DBG_UTIL */
 
 // Resort() is called before every Insert and Delete.
-// Various SwTxtNode methods modify hints in a way that violates the
+// Various SwTextNode methods modify hints in a way that violates the
 // sort order of the m_HintStarts, m_HintEnds arrays, so this method is needed
 // to restore the order.
 
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index f1a0a7bcb632..a56d67582aa0 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -93,9 +93,9 @@
 
 using namespace ::com::sun::star;
 
-typedef std::vector<SwTxtAttr*> SwpHts;
+typedef std::vector<SwTextAttr*> SwpHts;
 
-TYPEINIT1( SwTxtNode, SwCntntNode )
+TYPEINIT1( SwTextNode, SwContentNode )
 
 // unfortunately everyone can change Hints without ensuring order or the linking between them
 #ifdef DBG_UTIL
@@ -106,13 +106,13 @@ TYPEINIT1( SwTxtNode, SwCntntNode )
 #define CHECK_SWPHINTS(pNd)
 #endif
 
-SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
-                                 SwTxtFmtColl *pColl,
+SwTextNode *SwNodes::MakeTextNode( const SwNodeIndex & rWhere,
+                                 SwTextFormatColl *pColl,
                                  SwAttrSet* pAutoAttr )
 {
     OSL_ENSURE( pColl, "Collection pointer is 0." );
 
-    SwTxtNode *pNode = new SwTxtNode( rWhere, pColl, pAutoAttr );
+    SwTextNode *pNode = new SwTextNode( rWhere, pColl, pAutoAttr );
 
     SwNodeIndex aIdx( *pNode );
 
@@ -143,7 +143,7 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
 
         case ND_SECTIONNODE:
             if( static_cast<SwSectionNode*>(pNd)->GetSection().IsHidden() ||
-                static_cast<SwSectionNode*>(pNd)->IsCntntHidden() )
+                static_cast<SwSectionNode*>(pNd)->IsContentHidden() )
             {
                 SwNodeIndex aTmpIdx( *pNode );
                 pNd = FindPrvNxtFrmNode( aTmpIdx, pNode );
@@ -158,7 +158,7 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
         case ND_TEXTNODE:
         case ND_GRFNODE:
         case ND_OLENODE:
-            static_cast<SwCntntNode*>(pNd)->MakeFrms( *pNode );
+            static_cast<SwContentNode*>(pNd)->MakeFrms( *pNode );
             return pNode;
 
         case ND_ENDNODE:
@@ -194,8 +194,8 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
     } while( true );
 }
 
-SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl, const SfxItemSet* pAutoAttr )
-:   SwCntntNode( rWhere, ND_TEXTNODE, pTxtColl ),
+SwTextNode::SwTextNode( const SwNodeIndex &rWhere, SwTextFormatColl *pTextColl, const SfxItemSet* pAutoAttr )
+:   SwContentNode( rWhere, ND_TEXTNODE, pTextColl ),
     m_pSwpHints( 0 ),
     mpNodeNum( 0 ),
     m_Text(),
@@ -223,9 +223,9 @@ SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl, const S
         // apply paragraph style's assigned outline style list level as
         // list level of the paragraph, if it has none set already.
         if ( !HasAttrListLevel() &&
-             pTxtColl && pTxtColl->IsAssignedToListLevelOfOutlineStyle() )
+             pTextColl && pTextColl->IsAssignedToListLevelOfOutlineStyle() )
         {
-            SetAttrListLevel( pTxtColl->GetAssignedOutlineStyleLevel() );
+            SetAttrListLevel( pTextColl->GetAssignedOutlineStyleLevel() );
         }
         AddToList();
     }
@@ -237,7 +237,7 @@ SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl, const S
     m_bRecalcHiddenCharFlags = true;
 }
 
-SwTxtNode::~SwTxtNode()
+SwTextNode::~SwTextNode()
 {
     // delete only removes the pointer not the array elements!
     if ( m_pSwpHints )
@@ -268,11 +268,11 @@ SwTxtNode::~SwTxtNode()
 
     if (HasWriterListeners())
     {
-        DelFrms_TxtNodePart();
+        DelFrms_TextNodePart();
     }
 }
 
-void SwTxtNode::FileLoadedInitHints()
+void SwTextNode::FileLoadedInitHints()
 {
     if (m_pSwpHints)
     {
@@ -280,110 +280,110 @@ void SwTxtNode::FileLoadedInitHints()
     }
 }
 
-SwCntntFrm *SwTxtNode::MakeFrm( SwFrm* pSib )
+SwContentFrm *SwTextNode::MakeFrm( SwFrm* pSib )
 {
     // fdo#52028: ODF file import does not result in MergePortions being called
     // for every attribute, since that would be inefficient.  So call it here.
     FileLoadedInitHints();
-    SwCntntFrm *pFrm = new SwTxtFrm( this, pSib );
+    SwContentFrm *pFrm = new SwTextFrm( this, pSib );
     return pFrm;
 }
 
-sal_Int32 SwTxtNode::Len() const
+sal_Int32 SwTextNode::Len() const
 {
     return m_Text.getLength();
 }
 
 // After a split node, it's necessary to actualize the ref-pointer of the ftnfrms.
-static void lcl_ChangeFtnRef( SwTxtNode &rNode )
+static void lcl_ChangeFootnoteRef( SwTextNode &rNode )
 {
     SwpHints *pSwpHints = rNode.GetpSwpHints();
     if( pSwpHints && rNode.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
     {
-        SwCntntFrm* pFrm = NULL;
+        SwContentFrm* pFrm = NULL;
         // OD 07.11.2002 #104840# - local variable to remember first footnote
         // of node <rNode> in order to invalidate position of its first content.
         // Thus, in its <MakeAll()> it will checked its position relative to its reference.
-        SwFtnFrm* pFirstFtnOfNode = 0;
+        SwFootnoteFrm* pFirstFootnoteOfNode = 0;
         for( size_t j = pSwpHints->Count(); j; )
         {
-            SwTxtAttr* pHt = pSwpHints->GetTextHint(--j);
+            SwTextAttr* pHt = pSwpHints->GetTextHint(--j);
             if (RES_TXTATR_FTN == pHt->Which())
             {
                 if( !pFrm )
                 {
-                    pFrm = SwIterator<SwCntntFrm,SwTxtNode>(rNode).First();
+                    pFrm = SwIterator<SwContentFrm,SwTextNode>(rNode).First();
                     if (!pFrm)
                         return;
                 }
-                SwTxtFtn *pAttr = static_cast<SwTxtFtn*>(pHt);
-                OSL_ENSURE( pAttr->GetStartNode(), "FtnAtr ohne StartNode." );
+                SwTextFootnote *pAttr = static_cast<SwTextFootnote*>(pHt);
+                OSL_ENSURE( pAttr->GetStartNode(), "FootnoteAtr ohne StartNode." );
                 SwNodeIndex aIdx( *pAttr->GetStartNode(), 1 );
-                SwCntntNode *pNd = aIdx.GetNode().GetCntntNode();
+                SwContentNode *pNd = aIdx.GetNode().GetContentNode();
                 if ( !pNd )
                     pNd = pFrm->GetAttrSet()->GetDoc()->
                             GetNodes().GoNextSection( &aIdx, true, false );
                 if ( !pNd )
                     continue;
 
-                SwIterator<SwCntntFrm,SwCntntNode> aIter( *pNd );
-                SwCntntFrm* pCntnt = aIter.First();
-                if( pCntnt )
+                SwIterator<SwContentFrm,SwContentNode> aIter( *pNd );
+                SwContentFrm* pContent = aIter.First();
+                if( pContent )
                 {
-                    OSL_ENSURE( pCntnt->getRootFrm() == pFrm->getRootFrm(),
-                            "lcl_ChangeFtnRef: Layout double?" );
-                    SwFtnFrm *pFtn = pCntnt->FindFtnFrm();
-                    if( pFtn && pFtn->GetAttr() == pAttr )
+                    OSL_ENSURE( pContent->getRootFrm() == pFrm->getRootFrm(),
+                            "lcl_ChangeFootnoteRef: Layout double?" );
+                    SwFootnoteFrm *pFootnote = pContent->FindFootnoteFrm();
+                    if( pFootnote && pFootnote->GetAttr() == pAttr )
                     {
-                        while( pFtn->GetMaster() )
-                            pFtn = pFtn->GetMaster();
+                        while( pFootnote->GetMaster() )
+                            pFootnote = pFootnote->GetMaster();
                         // #104840# - remember footnote frame
-                        pFirstFtnOfNode = pFtn;
-                        while ( pFtn )
+                        pFirstFootnoteOfNode = pFootnote;
+                        while ( pFootnote )
                         {
-                            pFtn->SetRef( pFrm );
-                            pFtn = pFtn->GetFollow();
-                            static_cast<SwTxtFrm*>(pFrm)->SetFtn( true );
+                            pFootnote->SetRef( pFrm );
+                            pFootnote = pFootnote->GetFollow();
+                            static_cast<SwTextFrm*>(pFrm)->SetFootnote( true );
                         }
                     }
 #if OSL_DEBUG_LEVEL > 0
-                    while( 0 != (pCntnt = aIter.Next()) )
+                    while( 0 != (pContent = aIter.Next()) )
                     {
-                        SwFtnFrm *pDbgFtn = pCntnt->FindFtnFrm();
-                        OSL_ENSURE( !pDbgFtn || pDbgFtn->GetRef() == pFrm,
-                                "lcl_ChangeFtnRef: Who's that guy?" );
+                        SwFootnoteFrm *pDbgFootnote = pContent->FindFootnoteFrm();
+                        OSL_ENSURE( !pDbgFootnote || pDbgFootnote->GetRef() == pFrm,
+                                "lcl_ChangeFootnoteRef: Who's that guy?" );
                     }
 #endif
                 }
             }
         } // end of for-loop on <SwpHints>
         // #104840# - invalidate
-        if ( pFirstFtnOfNode )
+        if ( pFirstFootnoteOfNode )
         {
-            SwCntntFrm* pCntnt = pFirstFtnOfNode->ContainsCntnt();
-            if ( pCntnt )
+            SwContentFrm* pContent = pFirstFootnoteOfNode->ContainsContent();
+            if ( pContent )
             {
-                pCntnt->_InvalidatePos();
+                pContent->_InvalidatePos();
             }
         }
     }
 }
 
-SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
+SwContentNode *SwTextNode::SplitContentNode( const SwPosition &rPos )
 {
     bool parentIsOutline = IsOutline();
 
     // create a node "in front" of me
     const sal_Int32 nSplitPos = rPos.nContent.GetIndex();
-    const sal_Int32 nTxtLen = m_Text.getLength();
-    SwTxtNode* const pNode =
-        _MakeNewTxtNode( rPos.nNode, false, nSplitPos==nTxtLen );
+    const sal_Int32 nTextLen = m_Text.getLength();
+    SwTextNode* const pNode =
+        _MakeNewTextNode( rPos.nNode, false, nSplitPos==nTextLen );
 
     // the first paragraph gets the XmlId,
     // _except_ if it is empty and the second is not empty
     if (nSplitPos != 0) {
         pNode->RegisterAsCopyOf(*this, true);
-        if (nSplitPos == nTxtLen)
+        if (nSplitPos == nTextLen)
         {
             this->RemoveMetadataReference();
             // NB: SwUndoSplitNode will call pNode->JoinNext,
@@ -400,7 +400,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
         ResetAttr( RES_PARATR_LIST_LEVEL );
     }
 
-    if ( HasWriterListeners() && !m_Text.isEmpty() && (nTxtLen / 2) < nSplitPos )
+    if ( HasWriterListeners() && !m_Text.isEmpty() && (nTextLen / 2) < nSplitPos )
     {
         // optimization for SplitNode: If a split is at the end of a node then
         // move the frames from the current to the new one and create new ones
@@ -409,7 +409,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
         LockModify();   // disable notifications
 
         // werden FlyFrames mit verschoben, so muessen diese nicht ihre
-        // Frames zerstoeren. Im SwTxtFly::SetAnchor wird es abgefragt!
+        // Frames zerstoeren. Im SwTextFly::SetAnchor wird es abgefragt!
         if ( HasHints() )
         {
             pNode->GetOrCreateSwpHints().SetInSplitNode(true);
@@ -460,10 +460,10 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
             {
                 for ( size_t j = m_pSwpHints->Count(); j; )
                 {
-                    SwTxtAttr* const pHt = m_pSwpHints->GetTextHint( --j );
+                    SwTextAttr* const pHt = m_pSwpHints->GetTextHint( --j );
                     if ( RES_TXTATR_FLYCNT == pHt ->Which() )
                     {
-                        pHt->GetFlyCnt().GetFrmFmt()->DelFrms();
+                        pHt->GetFlyCnt().GetFrameFormat()->DelFrms();
                     }
                     else if ( pHt->DontExpand() )
                     {
@@ -480,12 +480,12 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
 
         }
 
-        SwIterator<SwCntntFrm,SwTxtNode> aIter( *this );
-        for( SwCntntFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+        SwIterator<SwContentFrm,SwTextNode> aIter( *this );
+        for( SwContentFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
         {
             pFrm->RegisterToNode( *pNode );
-            if( pFrm->IsTxtFrm() && !pFrm->IsFollow() && static_cast<SwTxtFrm*>(pFrm)->GetOfst() )
-                static_cast<SwTxtFrm*>(pFrm)->SetOfst( 0 );
+            if( pFrm->IsTextFrm() && !pFrm->IsFollow() && static_cast<SwTextFrm*>(pFrm)->GetOfst() )
+                static_cast<SwTextFrm*>(pFrm)->SetOfst( 0 );
         }
 
         if ( IsInCache() )
@@ -500,28 +500,28 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
         // with length zero, because we have to notify about the changed
         // text node.
         const SwRootFrm *pRootFrm;
-        if ( (nTxtLen != nSplitPos) ||
+        if ( (nTextLen != nSplitPos) ||
             ( (pRootFrm = pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout()) != 0 &&
               pRootFrm->IsAnyShellAccessible() ) )
         {
             // dann sage den Frames noch, das am Ende etwas "geloescht" wurde
-            if( 1 == nTxtLen - nSplitPos )
+            if( 1 == nTextLen - nSplitPos )
             {
                 SwDelChr aHint( nSplitPos );
                 pNode->NotifyClients( 0, &aHint );
             }
             else
             {
-                SwDelTxt aHint( nSplitPos, nTxtLen - nSplitPos );
+                SwDelText aHint( nSplitPos, nTextLen - nSplitPos );
                 pNode->NotifyClients( 0, &aHint );
             }
         }
         if ( HasHints() )
         {
-            MoveTxtAttr_To_AttrSet();
+            MoveTextAttr_To_AttrSet();
         }
         pNode->MakeFrms( *this );       // neue Frames anlegen.
-        lcl_ChangeFtnRef( *this );
+        lcl_ChangeFootnoteRef( *this );
     }
     else
     {
@@ -548,7 +548,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
         {
             for ( size_t j = m_pSwpHints->Count(); j; )
             {
-                SwTxtAttr* const pHt = m_pSwpHints->GetTextHint( --j );
+                SwTextAttr* const pHt = m_pSwpHints->GetTextHint( --j );
                 const sal_Int32* const pEnd = pHt->GetEnd();
                 if ( pHt->DontExpand() && pEnd && (pHt->GetStart() == *pEnd) )
                 {
@@ -557,7 +557,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
                     DestroyAttr( pHt );
                 }
             }
-            MoveTxtAttr_To_AttrSet();
+            MoveTextAttr_To_AttrSet();
         }
 
         if( pList )
@@ -582,7 +582,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
         {
             MakeFrms( *pNode );     // neue Frames anlegen.
         }
-        lcl_ChangeFtnRef( *pNode );
+        lcl_ChangeFootnoteRef( *pNode );
     }
 
     {
@@ -600,12 +600,12 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
     return pNode;
 }
 
-void SwTxtNode::MoveTxtAttr_To_AttrSet()
+void SwTextNode::MoveTextAttr_To_AttrSet()
 {
-    OSL_ENSURE( m_pSwpHints, "MoveTxtAttr_To_AttrSet without SwpHints?" );
+    OSL_ENSURE( m_pSwpHints, "MoveTextAttr_To_AttrSet without SwpHints?" );
     for ( size_t i = 0; m_pSwpHints && i < m_pSwpHints->Count(); ++i )
     {
-        SwTxtAttr *pHt = m_pSwpHints->GetTextHint(i);
+        SwTextAttr *pHt = m_pSwpHints->GetTextHint(i);
 
         if( pHt->GetStart() )
             break;
@@ -615,7 +615,7 @@ void SwTxtNode::MoveTxtAttr_To_AttrSet()
         if( !pHtEndIdx )
             continue;
 
-        if (*pHtEndIdx < m_Text.getLength() || pHt->IsCharFmtAttr())
+        if (*pHtEndIdx < m_Text.getLength() || pHt->IsCharFormatAttr())
             break;
 
         if( !pHt->IsDontMoveAttr() &&
@@ -629,83 +629,83 @@ void SwTxtNode::MoveTxtAttr_To_AttrSet()
 
 }
 
-SwCntntNode *SwTxtNode::JoinNext()
+SwContentNode *SwTextNode::JoinNext()
 {
     SwNodes& rNds = GetNodes();
     SwNodeIndex aIdx( *this );
-    if( SwCntntNode::CanJoinNext( &aIdx ) )
+    if( SwContentNode::CanJoinNext( &aIdx ) )
     {
         SwDoc* pDoc = rNds.GetDoc();
-        const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-        pCntntStore->Save(pDoc, aIdx.GetIndex(), SAL_MAX_INT32);
-        SwTxtNode *pTxtNode = aIdx.GetNode().GetTxtNode();
+        const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+        pContentStore->Save(pDoc, aIdx.GetIndex(), SAL_MAX_INT32);
+        SwTextNode *pTextNode = aIdx.GetNode().GetTextNode();
         sal_Int32 nOldLen = m_Text.getLength();
 
         // METADATA: merge
-        this->JoinMetadatable(*pTxtNode, !this->Len(), !pTxtNode->Len());
+        this->JoinMetadatable(*pTextNode, !this->Len(), !pTextNode->Len());
 
         SwWrongList *pList = GetWrong();
         if( pList )
         {
-            pList->JoinList( pTxtNode->GetWrong(), nOldLen );
+            pList->JoinList( pTextNode->GetWrong(), nOldLen );
             SetWrongDirty( true );
             SetWrong( 0, false );
         }
         else
         {
-            pList = pTxtNode->GetWrong();
+            pList = pTextNode->GetWrong();
             if( pList )
             {
                 pList->Move( 0, nOldLen );
                 SetWrongDirty( true );
-                pTxtNode->SetWrong( 0, false );
+                pTextNode->SetWrong( 0, false );
             }
         }
 
         SwGrammarMarkUp *pList3 = GetGrammarCheck();
         if( pList3 )
         {
-            pList3->JoinGrammarList( pTxtNode->GetGrammarCheck(), nOldLen );
+            pList3->JoinGrammarList( pTextNode->GetGrammarCheck(), nOldLen );
             SetGrammarCheckDirty( true );
             SetGrammarCheck( 0, false );
         }
         else
         {
-            pList3 = pTxtNode->GetGrammarCheck();
+            pList3 = pTextNode->GetGrammarCheck();
             if( pList3 )
             {
                 pList3->MoveGrammar( 0, nOldLen );
                 SetGrammarCheckDirty( true );
-                pTxtNode->SetGrammarCheck( 0, false );
+                pTextNode->SetGrammarCheck( 0, false );
             }
         }
 
         SwWrongList *pList2 = GetSmartTags();
         if( pList2 )
         {
-            pList2->JoinList( pTxtNode->GetSmartTags(), nOldLen );
+            pList2->JoinList( pTextNode->GetSmartTags(), nOldLen );
             SetSmartTagDirty( true );
             SetSmartTags( 0, false );
         }
         else
         {
-            pList2 = pTxtNode->GetSmartTags();
+            pList2 = pTextNode->GetSmartTags();
             if( pList2 )
             {
                 pList2->Move( 0, nOldLen );
                 SetSmartTagDirty( true );
-                pTxtNode->SetSmartTags( 0, false );
+                pTextNode->SetSmartTags( 0, false );
             }
         }
 
         { // wg. SwIndex
-            pTxtNode->CutText( this, SwIndex(pTxtNode), pTxtNode->Len() );
+            pTextNode->CutText( this, SwIndex(pTextNode), pTextNode->Len() );
         }
         // verschiebe noch alle Bookmarks/TOXMarks
-        if( !pCntntStore->Empty())
-            pCntntStore->Restore( pDoc, GetIndex(), nOldLen );
+        if( !pContentStore->Empty())
+            pContentStore->Restore( pDoc, GetIndex(), nOldLen );
 
-        if( pTxtNode->HasAnyIndex() )
+        if( pTextNode->HasAnyIndex() )
         {
             // alle Crsr/StkCrsr/UnoCrsr aus dem Loeschbereich verschieben
             pDoc->CorrAbs( aIdx, SwPosition( *this ), nOldLen, true );
@@ -717,30 +717,30 @@ SwCntntNode *SwTxtNode::JoinNext()
         InvalidateNumRule();
     }
     else {
-        OSL_FAIL( "kein TxtNode." );
+        OSL_FAIL( "kein TextNode." );
     }
 
     return this;
 }
 
-SwCntntNode *SwTxtNode::JoinPrev()
+SwContentNode *SwTextNode::JoinPrev()
 {
     SwNodes& rNds = GetNodes();
     SwNodeIndex aIdx( *this );
-    if( SwCntntNode::CanJoinPrev( &aIdx ) )
+    if( SwContentNode::CanJoinPrev( &aIdx ) )
     {
         SwDoc* pDoc = rNds.GetDoc();
-        const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
-        pCntntStore->Save( pDoc, aIdx.GetIndex(), SAL_MAX_INT32);
-        SwTxtNode *pTxtNode = aIdx.GetNode().GetTxtNode();
-        const sal_Int32 nLen = pTxtNode->Len();
+        const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+        pContentStore->Save( pDoc, aIdx.GetIndex(), SAL_MAX_INT32);
+        SwTextNode *pTextNode = aIdx.GetNode().GetTextNode();
+        const sal_Int32 nLen = pTextNode->Len();
 
-        SwWrongList *pList = pTxtNode->GetWrong();
+        SwWrongList *pList = pTextNode->GetWrong();
         if( pList )
         {
             pList->JoinList( GetWrong(), Len() );
             SetWrongDirty( true );
-            pTxtNode->SetWrong( 0, false );
+            pTextNode->SetWrong( 0, false );
             SetWrong( NULL );
         }
         else
@@ -754,12 +754,12 @@ SwCntntNode *SwTxtNode::JoinPrev()
             }
         }
 
-        SwGrammarMarkUp *pList3 = pTxtNode->GetGrammarCheck();
+        SwGrammarMarkUp *pList3 = pTextNode->GetGrammarCheck();
         if( pList3 )
         {
             pList3->JoinGrammarList( GetGrammarCheck(), Len() );
             SetGrammarCheckDirty( true );
-            pTxtNode->SetGrammarCheck( 0, false );
+            pTextNode->SetGrammarCheck( 0, false );
             SetGrammarCheck( NULL );
         }
         else
@@ -773,12 +773,12 @@ SwCntntNode *SwTxtNode::JoinPrev()
             }
         }
 
-        SwWrongList *pList2 = pTxtNode->GetSmartTags();
+        SwWrongList *pList2 = pTextNode->GetSmartTags();
         if( pList2 )
         {
             pList2->JoinList( GetSmartTags(), Len() );
             SetSmartTagDirty( true );
-            pTxtNode->SetSmartTags( 0, false );
+            pTextNode->SetSmartTags( 0, false );
             SetSmartTags( NULL );
         }
         else
@@ -793,13 +793,13 @@ SwCntntNode *SwTxtNode::JoinPrev()
         }
 
         { // wg. SwIndex
-            pTxtNode->CutText( this, SwIndex(this), SwIndex(pTxtNode), nLen );
+            pTextNode->CutText( this, SwIndex(this), SwIndex(pTextNode), nLen );
         }
         // verschiebe noch alle Bookmarks/TOXMarks
-        if( !pCntntStore->Empty() )
-            pCntntStore->Restore( pDoc, GetIndex() );
+        if( !pContentStore->Empty() )
+            pContentStore->Restore( pDoc, GetIndex() );
 
-        if( pTxtNode->HasAnyIndex() )
+        if( pTextNode->HasAnyIndex() )
         {
             // alle Crsr/StkCrsr/UnoCrsr aus dem Loeschbereich verschieben
             pDoc->CorrAbs( aIdx, SwPosition( *this ), nLen, true );
@@ -811,36 +811,36 @@ SwCntntNode *SwTxtNode::JoinPrev()
         InvalidateNumRule();
     }
     else {
-        OSL_FAIL( "kein TxtNode." );
+        OSL_FAIL( "kein TextNode." );
     }
 
     return this;
 }
 
 // erzeugt einen AttrSet mit Bereichen fuer Frame-/Para/Char-Attributen
-void SwTxtNode::NewAttrSet( SwAttrPool& rPool )
+void SwTextNode::NewAttrSet( SwAttrPool& rPool )
 {
     OSL_ENSURE( !mpAttrSet.get(), "AttrSet ist doch gesetzt" );
-    SwAttrSet aNewAttrSet( rPool, aTxtNodeSetRange );
+    SwAttrSet aNewAttrSet( rPool, aTextNodeSetRange );
 
     // put names of parent style and conditional style:
-    const SwFmtColl* pAnyFmtColl = &GetAnyFmtColl();
-    const SwFmtColl* pFmtColl = GetFmtColl();
+    const SwFormatColl* pAnyFormatColl = &GetAnyFormatColl();
+    const SwFormatColl* pFormatColl = GetFormatColl();
     OUString sVal;
-    SwStyleNameMapper::FillProgName( pAnyFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
-    SfxStringItem aAnyFmtColl( RES_FRMATR_STYLE_NAME, sVal );
-    if ( pFmtColl != pAnyFmtColl )
-        SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
-    SfxStringItem aFmtColl( RES_FRMATR_CONDITIONAL_STYLE_NAME, sVal );
-    aNewAttrSet.Put( aAnyFmtColl );
-    aNewAttrSet.Put( aFmtColl );
-
-    aNewAttrSet.SetParent( &pAnyFmtColl->GetAttrSet() );
+    SwStyleNameMapper::FillProgName( pAnyFormatColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+    SfxStringItem aAnyFormatColl( RES_FRMATR_STYLE_NAME, sVal );
+    if ( pFormatColl != pAnyFormatColl )
+        SwStyleNameMapper::FillProgName( pFormatColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+    SfxStringItem aFormatColl( RES_FRMATR_CONDITIONAL_STYLE_NAME, sVal );
+    aNewAttrSet.Put( aAnyFormatColl );
+    aNewAttrSet.Put( aFormatColl );
+
+    aNewAttrSet.SetParent( &pAnyFormatColl->GetAttrSet() );
     mpAttrSet = GetDoc()->GetIStyleAccess().getAutomaticStyle( aNewAttrSet, IStyleAccess::AUTO_STYLE_PARA );
 }
 
 // override SwIndexReg::Update => text hints do not need SwIndex for start/end!
-void SwTxtNode::Update(
+void SwTextNode::Update(
     SwIndex const & rPos,
     const sal_Int32 nChangeLen,
     const bool bNegative,
@@ -855,14 +855,14 @@ void SwTxtNode::Update(
     {
         if ( bNegative )
         {
-            std::vector<SwTxtInputFld*> aTxtInputFlds;
+            std::vector<SwTextInputField*> aTextInputFields;
 
             const sal_Int32 nChangeEnd = nChangePos + nChangeLen;
             for ( size_t n = 0; n < m_pSwpHints->Count(); ++n )
             {
-                bool bTxtAttrChanged = false;
-                bool bStartOfTxtAttrChanged = false;
-                SwTxtAttr * const pHint = m_pSwpHints->GetTextHint(n);
+                bool bTextAttrChanged = false;
+                bool bStartOfTextAttrChanged = false;
+                SwTextAttr * const pHint = m_pSwpHints->GetTextHint(n);
                 sal_Int32 &       rStart = pHint->GetStart();
                 if ( rStart > nChangePos )
                 {
@@ -874,7 +874,7 @@ void SwTxtNode::Update(
                     {
                          rStart = nChangePos;
                     }
-                    bStartOfTxtAttrChanged = true;
+                    bStartOfTextAttrChanged = true;
                 }
 
                 sal_Int32 * const pEnd = pHint->GetEnd();
@@ -890,24 +890,24 @@ void SwTxtNode::Update(
                         {
                             *pEnd = nChangePos;
                         }
-                        bTxtAttrChanged = !bStartOfTxtAttrChanged;
+                        bTextAttrChanged = !bStartOfTextAttrChanged;
                     }
                 }
 
-                if ( bTxtAttrChanged
+                if ( bTextAttrChanged
                      && pHint->Which() == RES_TXTATR_INPUTFIELD )
                 {
-                    SwTxtInputFld* pTxtInputFld = dynamic_cast<SwTxtInputFld*>(pHint);
-                    if ( pTxtInputFld )
-                        aTxtInputFlds.push_back(pTxtInputFld);
+                    SwTextInputField* pTextInputField = dynamic_cast<SwTextInputField*>(pHint);
+                    if ( pTextInputField )
+                        aTextInputFields.push_back(pTextInputField);
                 }
             }
 
             //wait until all the attribute positions are correct
             //before updating the field contents
-            for (SwTxtInputFld* pTxtInputFld : aTxtInputFlds)
+            for (SwTextInputField* pTextInputField : aTextInputFields)
             {
-                pTxtInputFld->UpdateFieldContent();
+                pTextInputField->UpdateFieldContent();
             }
 
             m_pSwpHints->MergePortions( *this );
@@ -918,15 +918,15 @@ void SwTxtNode::Update(
             bool bResort = false;
             bool bMergePortionsNeeded = false;
             const int coArrSz = RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN;
-            std::vector<SwTxtInputFld*> aTxtInputFlds;
+            std::vector<SwTextInputField*> aTextInputFields;
 
             bool aDontExp[ coArrSz ];
             memset( &aDontExp, 0, coArrSz * sizeof(bool) );
 
             for ( size_t n = 0; n < m_pSwpHints->Count(); ++n )
             {
-                bool bTxtAttrChanged = false;
-                SwTxtAttr * const pHint = m_pSwpHints->GetTextHint(n);
+                bool bTextAttrChanged = false;
+                SwTextAttr * const pHint = m_pSwpHints->GetTextHint(n);
                 sal_Int32 &       rStart = pHint->GetStart();
                 sal_Int32 * const pEnd = pHint->GetEnd();
                 if ( rStart >= nChangePos )
@@ -942,7 +942,7 @@ void SwTxtNode::Update(
                     if ( (*pEnd > nChangePos) || IsIgnoreDontExpand() )
                     {
                         *pEnd = *pEnd + nChangeLen;
-                        bTxtAttrChanged = true;
+                        bTextAttrChanged = true;
                     }
                     else // *pEnd == nChangePos
                     {
@@ -966,7 +966,7 @@ void SwTxtNode::Update(
                             {
                                 bMergePortionsNeeded = true;
                             }
-                            if ( pHint->IsCharFmtAttr() )
+                            if ( pHint->IsCharFormatAttr() )
                             {
                                 bNoExp = true;
                                 aDontExp[ RES_TXTATR_CHARFMT - RES_CHRATR_BEGIN ] = true;
@@ -983,42 +983,42 @@ void SwTxtNode::Update(
                             }
                             for(SwpHts::iterator it =  pCollector->begin(); it != pCollector->end(); ++it)
                             {
-                               SwTxtAttr *pTmp = *it;
+                               SwTextAttr *pTmp = *it;
                                if( nWhich == pTmp->Which() )
                                {
                                    pCollector->erase( it );
-                                   SwTxtAttr::Destroy( pTmp,
+                                   SwTextAttr::Destroy( pTmp,
                                        GetDoc()->GetAttrPool() );
                                    break;
                                }
                             }
-                            SwTxtAttr * const pTmp =
-                            MakeTxtAttr( *GetDoc(),
+                            SwTextAttr * const pTmp =
+                            MakeTextAttr( *GetDoc(),
                                 pHint->GetAttr(), nChangePos, nChangePos + nChangeLen);
                             pCollector->push_back( pTmp );
                         }
                         else
                         {
                             *pEnd = *pEnd + nChangeLen;
-                            bTxtAttrChanged = true;
+                            bTextAttrChanged = true;
                         }
                     }
                 }
 
-                if ( bTxtAttrChanged
+                if ( bTextAttrChanged
                      && pHint->Which() == RES_TXTATR_INPUTFIELD )
                 {
-                    SwTxtInputFld* pTxtInputFld = dynamic_cast<SwTxtInputFld*>(pHint);
-                    if ( pTxtInputFld )
-                        aTxtInputFlds.push_back(pTxtInputFld);
+                    SwTextInputField* pTextInputField = dynamic_cast<SwTextInputField*>(pHint);
+                    if ( pTextInputField )
+                        aTextInputFields.push_back(pTextInputField);
                 }
             }
 
             //wait until all the attribute positions are correct
             //before updating the field contents
-            for (SwTxtInputFld* pTxtInputFld : aTxtInputFlds)
+            for (SwTextInputField* pTextInputField : aTextInputFields)
             {
-                pTxtInputFld->UpdateFieldContent();
+                pTextInputField->UpdateFieldContent();
             }
 
             if (bMergePortionsNeeded)
@@ -1036,10 +1036,10 @@ void SwTxtNode::Update(
     SwIndexReg aTmpIdxReg;
     if ( !bNegative && !bDelete )
     {
-        const SwRedlineTbl& rTbl = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
-        for ( size_t i = 0; i < rTbl.size(); ++i )
+        const SwRedlineTable& rTable = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+        for ( size_t i = 0; i < rTable.size(); ++i )
         {
-            SwRangeRedline *const pRedl = rTbl[ i ];
+            SwRangeRedline *const pRedl = rTable[ i ];
             if ( pRedl->HasMark() )
             {
                 SwPosition* const pEnd = pRedl->End();
@@ -1060,9 +1060,9 @@ void SwTxtNode::Update(
                 {
                     rIdx.Assign( &aTmpIdxReg, rIdx.GetIndex() );
                 }
-                // the unused position must not be on a SwTxtNode
+                // the unused position must not be on a SwTextNode
                 bool const isOneUsed(&pRedl->GetBound(true) == pRedl->GetPoint());
-                assert(!pRedl->GetBound(!isOneUsed).nNode.GetNode().IsTxtNode());
+                assert(!pRedl->GetBound(!isOneUsed).nNode.GetNode().IsTextNode());
                 assert(!pRedl->GetBound(!isOneUsed).nContent.GetIdxReg()); (void)isOneUsed;
             }
         }
@@ -1112,51 +1112,51 @@ void SwTxtNode::Update(
 
         // at-char anchored flys shouldn't be moved, either.
 #if OSL_DEBUG_LEVEL > 0
-        std::list<SwFrmFmt*> checkFmts;
-        const SwFrmFmts& rFmts = *GetDoc()->GetSpzFrmFmts();
-        for (SwFrmFmts::const_iterator pFmt = rFmts.begin(); pFmt != rFmts.end(); ++pFmt)
+        std::list<SwFrameFormat*> checkFormats;
+        const SwFrameFormats& rFormats = *GetDoc()->GetSpzFrameFormats();
+        for (SwFrameFormats::const_iterator pFormat = rFormats.begin(); pFormat != rFormats.end(); ++pFormat)
         {
-            const SwFmtAnchor& rAnchor = (*pFmt)->GetAnchor();
-            const SwPosition* pCntntAnchor = rAnchor.GetCntntAnchor();
-            if (rAnchor.GetAnchorId() == FLY_AT_CHAR && pCntntAnchor)
+            const SwFormatAnchor& rAnchor = (*pFormat)->GetAnchor();
+            const SwPosition* pContentAnchor = rAnchor.GetContentAnchor();
+            if (rAnchor.GetAnchorId() == FLY_AT_CHAR && pContentAnchor)
             {
                 // The fly is at-char anchored and has an anchor position.
-                SwIndex& rEndIdx = const_cast<SwIndex&>(pCntntAnchor->nContent);
-                if (&pCntntAnchor->nNode.GetNode() == this && rEndIdx.GetIndex() == rPos.GetIndex())
+                SwIndex& rEndIdx = const_cast<SwIndex&>(pContentAnchor->nContent);
+                if (&pContentAnchor->nNode.GetNode() == this && rEndIdx.GetIndex() == rPos.GetIndex())
                 {
                     // The anchor position is exactly our insert position.
                     #if 0
                     rEndIdx.Assign(&aTmpIdxReg, rEndIdx.GetIndex());
                     #endif
-                    checkFmts.push_back( *pFmt );
+                    checkFormats.push_back( *pFormat );
                 }
             }
         }
 #endif
-        std::vector<SwFrmFmt*> const*const pFlys(GetAnchoredFlys());
+        std::vector<SwFrameFormat*> const*const pFlys(GetAnchoredFlys());
         for (size_t i = 0; pFlys && i != pFlys->size(); ++i)
         {
-            SwFrmFmt const*const pFmt = (*pFlys)[i];
-            const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-            const SwPosition* pCntntAnchor = rAnchor.GetCntntAnchor();
-            if (rAnchor.GetAnchorId() == FLY_AT_CHAR && pCntntAnchor)
+            SwFrameFormat const*const pFormat = (*pFlys)[i];
+            const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
+            const SwPosition* pContentAnchor = rAnchor.GetContentAnchor();
+            if (rAnchor.GetAnchorId() == FLY_AT_CHAR && pContentAnchor)
             {
                 // The fly is at-char anchored and has an anchor position.
-                SwIndex& rEndIdx = const_cast<SwIndex&>(pCntntAnchor->nContent);
-                if (&pCntntAnchor->nNode.GetNode() == this && rEndIdx.GetIndex() == rPos.GetIndex())
+                SwIndex& rEndIdx = const_cast<SwIndex&>(pContentAnchor->nContent);
+                if (&pContentAnchor->nNode.GetNode() == this && rEndIdx.GetIndex() == rPos.GetIndex())
                 {
                     // The anchor position is exactly our insert position.
                     rEndIdx.Assign(&aTmpIdxReg, rEndIdx.GetIndex());
 #if OSL_DEBUG_LEVEL > 0
-                    std::list<SwFrmFmt*>::iterator checkPos = std::find( checkFmts.begin(), checkFmts.end(), pFmt );
-                    assert( checkPos != checkFmts.end());
-                    checkFmts.erase( checkPos );
+                    std::list<SwFrameFormat*>::iterator checkPos = std::find( checkFormats.begin(), checkFormats.end(), pFormat );
+                    assert( checkPos != checkFormats.end());
+                    checkFormats.erase( checkPos );
 #endif
                 }
             }
         }
 #if OSL_DEBUG_LEVEL > 0
-        assert( checkFmts.empty());
+        assert( checkFormats.empty());
 #endif
     }
 
@@ -1180,14 +1180,14 @@ void SwTxtNode::Update(
 
     //Any drawing objects anchored into this text node may be sorted by their
     //anchor position which may have changed here, so resort them
-    SwCntntFrm* pCntntFrm = getLayoutFrm(GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout());
-    SwSortedObjs* pSortedObjs = pCntntFrm ? pCntntFrm->GetDrawObjs() : NULL;
+    SwContentFrm* pContentFrm = getLayoutFrm(GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout());
+    SwSortedObjs* pSortedObjs = pContentFrm ? pContentFrm->GetDrawObjs() : NULL;
     if (pSortedObjs)
         pSortedObjs->UpdateAll();
 }
 
-void SwTxtNode::_ChgTxtCollUpdateNum( const SwTxtFmtColl *pOldColl,
-                                        const SwTxtFmtColl *pNewColl)
+void SwTextNode::_ChgTextCollUpdateNum( const SwTextFormatColl *pOldColl,
+                                        const SwTextFormatColl *pNewColl)
 {
     SwDoc* pDoc = GetDoc();
     OSL_ENSURE( pDoc, "Kein Doc?" );
@@ -1209,13 +1209,13 @@ void SwTxtNode::_ChgTxtCollUpdateNum( const SwTxtFmtColl *pOldColl,
 
     SwNodes& rNds = GetNodes();
     // Update beim Level 0 noch die Fussnoten !!
-    if( ( !nNewLevel || !nOldLevel) && pDoc && !pDoc->GetFtnIdxs().empty() &&
-        FTNNUM_CHAPTER == pDoc->GetFtnInfo().eNum &&
+    if( ( !nNewLevel || !nOldLevel) && pDoc && !pDoc->GetFootnoteIdxs().empty() &&
+        FTNNUM_CHAPTER == pDoc->GetFootnoteInfo().eNum &&
         rNds.IsDocNodes() )
     {
         SwNodeIndex aTmpIndex( rNds, GetIndex());
 
-        pDoc->GetFtnIdxs().UpdateFtn( aTmpIndex);
+        pDoc->GetFootnoteIdxs().UpdateFootnote( aTmpIndex);
     }
 
     if( pNewColl && RES_CONDTXTFMTCOLL == pNewColl->Which() )
@@ -1228,13 +1228,13 @@ void SwTxtNode::_ChgTxtCollUpdateNum( const SwTxtFmtColl *pOldColl,
 // Wenn man sich genau am Ende einer Text- bzw. INetvorlage befindet,
 // bekommt diese das DontExpand-Flag verpasst
 
-bool SwTxtNode::DontExpandFmt( const SwIndex& rIdx, bool bFlag,
-                                bool bFmtToTxtAttributes )
+bool SwTextNode::DontExpandFormat( const SwIndex& rIdx, bool bFlag,
+                                bool bFormatToTextAttributes )
 {
     const sal_Int32 nIdx = rIdx.GetIndex();
-    if (bFmtToTxtAttributes && nIdx == m_Text.getLength())
+    if (bFormatToTextAttributes && nIdx == m_Text.getLength())
     {
-        FmtToTxtAttr( this );
+        FormatToTextAttr( this );
     }
 
     bool bRet = false;
@@ -1244,7 +1244,7 @@ bool SwTxtNode::DontExpandFmt( const SwIndex& rIdx, bool bFlag,
         size_t nPos = nEndCnt;
         while( nPos )
         {
-            SwTxtAttr *pTmp = m_pSwpHints->GetEnd( --nPos );
+            SwTextAttr *pTmp = m_pSwpHints->GetEnd( --nPos );
             sal_Int32 *pEnd = pTmp->GetEnd();
             if( !pEnd || *pEnd > nIdx )
                 continue;
@@ -1262,41 +1262,41 @@ bool SwTxtNode::DontExpandFmt( const SwIndex& rIdx, bool bFlag,
     return bRet;
 }
 
-static bool lcl_GetTxtAttrDefault(sal_Int32 nIndex, sal_Int32 nHintStart, sal_Int32 nHintEnd)
+static bool lcl_GetTextAttrDefault(sal_Int32 nIndex, sal_Int32 nHintStart, sal_Int32 nHintEnd)
 {
     return ((nHintStart <= nIndex) && (nIndex <  nHintEnd));
 }
-static bool lcl_GetTxtAttrExpand(sal_Int32 nIndex, sal_Int32 nHintStart, sal_Int32 nHintEnd)
+static bool lcl_GetTextAttrExpand(sal_Int32 nIndex, sal_Int32 nHintStart, sal_Int32 nHintEnd)
 {
     return ((nHintStart <  nIndex) && (nIndex <= nHintEnd));
 }
-static bool lcl_GetTxtAttrParent(sal_Int32 nIndex, sal_Int32 nHintStart, sal_Int32 nHintEnd)
+static bool lcl_GetTextAttrParent(sal_Int32 nIndex, sal_Int32 nHintStart, sal_Int32 nHintEnd)
 {
     return ((nHintStart <  nIndex) && (nIndex <  nHintEnd));
 }
 
 static void
-lcl_GetTxtAttrs(
-    ::std::vector<SwTxtAttr *> *const pVector,
-    SwTxtAttr **const ppTxtAttr,
+lcl_GetTextAttrs(
+    ::std::vector<SwTextAttr *> *const pVector,
+    SwTextAttr **const ppTextAttr,
     SwpHints *const pSwpHints,
     sal_Int32 const nIndex, RES_TXTATR const nWhich,
-    enum SwTxtNode::GetTxtAttrMode const eMode)
+    enum SwTextNode::GetTextAttrMode const eMode)
 {
     size_t const nSize = (pSwpHints) ? pSwpHints->Count() : 0;
     sal_Int32 nPreviousIndex(0); // index of last hint with nWhich
     bool (*pMatchFunc)(sal_Int32, sal_Int32, sal_Int32)=0;
     switch (eMode)
     {
-        case SwTxtNode::DEFAULT:   pMatchFunc = &lcl_GetTxtAttrDefault; break;
-        case SwTxtNode::EXPAND:    pMatchFunc = &lcl_GetTxtAttrExpand;  break;
-        case SwTxtNode::PARENT:    pMatchFunc = &lcl_GetTxtAttrParent;  break;
+        case SwTextNode::DEFAULT:   pMatchFunc = &lcl_GetTextAttrDefault; break;
+        case SwTextNode::EXPAND:    pMatchFunc = &lcl_GetTextAttrExpand;  break;
+        case SwTextNode::PARENT:    pMatchFunc = &lcl_GetTextAttrParent;  break;
         default: assert(false);
     }
 
     for( size_t i = 0; i < nSize; ++i )
     {
-        SwTxtAttr *const pHint = pSwpHints->GetTextHint(i);
+        SwTextAttr *const pHint = pSwpHints->GetTextHint(i);
         sal_Int32 const nHintStart = pHint->GetStart();
         if (nIndex < nHintStart)
         {
@@ -1329,7 +1329,7 @@ lcl_GetTxtAttrs(
             }
             else
             {
-                *ppTxtAttr = pHint; // and possibly overwrite outer hint
+                *ppTextAttr = pHint; // and possibly overwrite outer hint
             }
             if (!pEndIdx)
             {
@@ -1339,18 +1339,18 @@ lcl_GetTxtAttrs(
     }
 }
 
-::std::vector<SwTxtAttr *>
-SwTxtNode::GetTxtAttrsAt(sal_Int32 const nIndex, RES_TXTATR const nWhich,
-                        enum GetTxtAttrMode const eMode) const
+::std::vector<SwTextAttr *>
+SwTextNode::GetTextAttrsAt(sal_Int32 const nIndex, RES_TXTATR const nWhich,
+                        enum GetTextAttrMode const eMode) const
 {
-    ::std::vector<SwTxtAttr *> ret;
-    lcl_GetTxtAttrs(& ret, 0, m_pSwpHints, nIndex, nWhich, eMode);
+    ::std::vector<SwTextAttr *> ret;
+    lcl_GetTextAttrs(& ret, 0, m_pSwpHints, nIndex, nWhich, eMode);
     return ret;
 }
 
-SwTxtAttr *
-SwTxtNode::GetTxtAttrAt(sal_Int32 const nIndex, RES_TXTATR const nWhich,
-                        enum GetTxtAttrMode const eMode) const
+SwTextAttr *
+SwTextNode::GetTextAttrAt(sal_Int32 const nIndex, RES_TXTATR const nWhich,
+                        enum GetTextAttrMode const eMode) const
 {
     assert(    (nWhich == RES_TXTATR_META)
             || (nWhich == RES_TXTATR_METAFIELD)
@@ -1359,28 +1359,28 @@ SwTxtNode::GetTxtAttrAt(sal_Int32 const nIndex, RES_TXTATR const nWhich,
             || (nWhich == RES_TXTATR_CJK_RUBY)
             || (nWhich == RES_TXTATR_UNKNOWN_CONTAINER)
             || (nWhich == RES_TXTATR_INPUTFIELD ) );
-            // "GetTxtAttrAt() will give wrong result for this hint!")
+            // "GetTextAttrAt() will give wrong result for this hint!")
 
-    SwTxtAttr * pRet(0);
-    lcl_GetTxtAttrs(0, & pRet, m_pSwpHints, nIndex, nWhich, eMode);
+    SwTextAttr * pRet(0);
+    lcl_GetTextAttrs(0, & pRet, m_pSwpHints, nIndex, nWhich, eMode);
     return pRet;
 }
 
-const SwTxtInputFld* SwTxtNode::GetOverlappingInputFld( const SwTxtAttr& rTxtAttr ) const
+const SwTextInputField* SwTextNode::GetOverlappingInputField( const SwTextAttr& rTextAttr ) const
 {
-    const SwTxtInputFld* pTxtInputFld = NULL;
+    const SwTextInputField* pTextInputField = NULL;
 
-    pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtAttrAt( rTxtAttr.GetStart(), RES_TXTATR_INPUTFIELD, PARENT ));
+    pTextInputField = dynamic_cast<const SwTextInputField*>(GetTextAttrAt( rTextAttr.GetStart(), RES_TXTATR_INPUTFIELD, PARENT ));
 
-    if ( pTxtInputFld == NULL && rTxtAttr.End() != NULL )
+    if ( pTextInputField == NULL && rTextAttr.End() != NULL )
     {
-        pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtAttrAt( *(rTxtAttr.End()), RES_TXTATR_INPUTFIELD, PARENT ));
+        pTextInputField = dynamic_cast<const SwTextInputField*>(GetTextAttrAt( *(rTextAttr.End()), RES_TXTATR_INPUTFIELD, PARENT ));
     }
 
-    return pTxtInputFld;
+    return pTextInputField;
 }
 
-void SwTxtNode::DelFrms_TxtNodePart()
+void SwTextNode::DelFrms_TextNodePart()
 {
     SetWrong( NULL );
     SetWrongDirty( true );
@@ -1395,39 +1395,39 @@ void SwTxtNode::DelFrms_TxtNodePart()
     SetAutoCompleteWordDirty( true );
 }
 
-SwTxtFld* SwTxtNode::GetFldTxtAttrAt(
+SwTextField* SwTextNode::GetFieldTextAttrAt(
     const sal_Int32 nIndex,
-    const bool bIncludeInputFldAtStart ) const
+    const bool bIncludeInputFieldAtStart ) const
 {
-    SwTxtFld* pTxtFld = NULL;
+    SwTextField* pTextField = NULL;
 
-    pTxtFld = dynamic_cast<SwTxtFld*>(GetTxtAttrForCharAt( nIndex, RES_TXTATR_FIELD ));
-    if ( pTxtFld == NULL )
+    pTextField = dynamic_cast<SwTextField*>(GetTextAttrForCharAt( nIndex, RES_TXTATR_FIELD ));
+    if ( pTextField == NULL )
     {
-        pTxtFld = dynamic_cast<SwTxtFld*>(GetTxtAttrForCharAt( nIndex, RES_TXTATR_ANNOTATION ));
+        pTextField = dynamic_cast<SwTextField*>(GetTextAttrForCharAt( nIndex, RES_TXTATR_ANNOTATION ));
     }
-    if ( pTxtFld == NULL )
+    if ( pTextField == NULL )
     {
-        pTxtFld =
-            dynamic_cast<SwTxtFld*>( GetTxtAttrAt(
+        pTextField =
+            dynamic_cast<SwTextField*>( GetTextAttrAt(
                 nIndex,
                 RES_TXTATR_INPUTFIELD,
-                bIncludeInputFldAtStart ? DEFAULT : PARENT ));
+                bIncludeInputFieldAtStart ? DEFAULT : PARENT ));
     }
 
-    return pTxtFld;
+    return pTextField;
 }
 
-static SwCharFmt* lcl_FindCharFmt( const SwCharFmts* pCharFmts, const OUString& rName )
+static SwCharFormat* lcl_FindCharFormat( const SwCharFormats* pCharFormats, const OUString& rName )
 {
     if( !rName.isEmpty() )
     {
-        const size_t nArrLen = pCharFmts->size();
+        const size_t nArrLen = pCharFormats->size();
         for( size_t i = 1; i < nArrLen; i++ )
         {
-            SwCharFmt* pFmt = (*pCharFmts)[ i ];
-            if( pFmt->GetName()==rName )
-                return pFmt;
+            SwCharFormat* pFormat = (*pCharFormats)[ i ];
+            if( pFormat->GetName()==rName )
+                return pFormat;
         }
     }
     return NULL;
@@ -1435,10 +1435,10 @@ static SwCharFmt* lcl_FindCharFmt( const SwCharFmts* pCharFmts, const OUString&
 
 void lcl_CopyHint(
     const sal_uInt16 nWhich,
-    const SwTxtAttr * const pHt,
-    SwTxtAttr *const pNewHt,
+    const SwTextAttr * const pHt,
+    SwTextAttr *const pNewHt,
     SwDoc *const pOtherDoc,
-    SwTxtNode *const pDest )
+    SwTextNode *const pDest )
 {
     assert(nWhich == pHt->Which()); // wrong hint-id
     switch( nWhich )
@@ -1446,7 +1446,7 @@ void lcl_CopyHint(
     // copy nodesarray section with footnote content
     case RES_TXTATR_FTN :
             assert(pDest); // "lcl_CopyHint: no destination text node?"
-            static_cast<const SwTxtFtn*>(pHt)->CopyFtn( *static_cast<SwTxtFtn*>(pNewHt), *pDest);
+            static_cast<const SwTextFootnote*>(pHt)->CopyFootnote( *static_cast<SwTextFootnote*>(pNewHt), *pDest);
             break;
 
     // Beim Kopieren von Feldern in andere Dokumente
@@ -1457,24 +1457,24 @@ void lcl_CopyHint(
         {
             if( pOtherDoc != NULL )
             {
-                static_txtattr_cast<const SwTxtFld*>(pHt)->CopyTxtFld(
-                        static_txtattr_cast<SwTxtFld*>(pNewHt));
+                static_txtattr_cast<const SwTextField*>(pHt)->CopyTextField(
+                        static_txtattr_cast<SwTextField*>(pNewHt));
             }
 
             // Tabellenformel ??
-            const SwFmtFld& rFld = pHt->GetFmtFld();
-            if( RES_TABLEFLD == rFld.GetField()->GetTyp()->Which()
-                && static_cast<const SwTblField*>(rFld.GetField())->IsIntrnlName())
+            const SwFormatField& rField = pHt->GetFormatField();
+            if( RES_TABLEFLD == rField.GetField()->GetTyp()->Which()
+                && static_cast<const SwTableField*>(rField.GetField())->IsIntrnlName())
             {
                 // wandel die interne in eine externe Formel um
-                const SwTableNode* const pDstTblNd =
-                    static_txtattr_cast<const SwTxtFld*>(pHt)->GetTxtNode().FindTableNode();
-                if( pDstTblNd )
+                const SwTableNode* const pDstTableNd =
+                    static_txtattr_cast<const SwTextField*>(pHt)->GetTextNode().FindTableNode();
+                if( pDstTableNd )
                 {
-                    SwTblField* const pTblFld =
-                        const_cast<SwTblField*>(static_cast<const SwTblField*>(
-                            pNewHt->GetFmtFld().GetField()));
-                    pTblFld->PtrToBoxNm( &pDstTblNd->GetTable() );
+                    SwTableField* const pTableField =
+                        const_cast<SwTableField*>(static_cast<const SwTableField*>(
+                            pNewHt->GetFormatField().GetField()));
+                    pTableField->PtrToBoxNm( &pDstTableNd->GetTable() );
                 }
             }
         }
@@ -1484,8 +1484,8 @@ void lcl_CopyHint(
     case RES_TXTATR_ANNOTATION :
         if( pOtherDoc != NULL )
         {
-            static_txtattr_cast<const SwTxtFld*>(pHt)->CopyTxtFld(
-                    static_txtattr_cast<SwTxtFld*>(pNewHt));
+            static_txtattr_cast<const SwTextField*>(pHt)->CopyTextField(
+                    static_txtattr_cast<SwTextField*>(pNewHt));
         }
         break;
 
@@ -1495,7 +1495,7 @@ void lcl_CopyHint(
         {
             // Beim Kopieren von TOXMarks(Client) in andere Dokumente
             // muss der Verzeichnis (Modify) ausgetauscht werden
-            static_txtattr_cast<SwTxtTOXMark*>(pNewHt)->CopyTOXMark(pOtherDoc);
+            static_txtattr_cast<SwTextTOXMark*>(pNewHt)->CopyTOXMark(pOtherDoc);
         }
         break;
 
@@ -1505,15 +1505,15 @@ void lcl_CopyHint(
         if( pDest && pDest->GetpSwpHints()
             && pDest->GetpSwpHints()->Contains( pNewHt ) )
         {
-            SwCharFmt* pFmt =
-                static_cast<SwCharFmt*>(pHt->GetCharFmt().GetCharFmt());
+            SwCharFormat* pFormat =
+                static_cast<SwCharFormat*>(pHt->GetCharFormat().GetCharFormat());
 
             if (pOtherDoc)
             {
-                pFmt = pOtherDoc->CopyCharFmt( *pFmt );
+                pFormat = pOtherDoc->CopyCharFormat( *pFormat );
             }
-            const_cast<SwFmtCharFmt&>( static_cast<const SwFmtCharFmt&>(
-                pNewHt->GetCharFmt() ) ).SetCharFmt( pFmt );
+            const_cast<SwFormatCharFormat&>( static_cast<const SwFormatCharFormat&>(
+                pNewHt->GetCharFormat() ) ).SetCharFormat( pFormat );
         }
         break;
     case RES_TXTATR_INETFMT :
@@ -1524,38 +1524,38 @@ void lcl_CopyHint(
                 && pDest->GetpSwpHints()->Contains( pNewHt ) )
             {
                 const SwDoc* const pDoc = static_txtattr_cast<
-                        const SwTxtINetFmt*>(pHt)->GetTxtNode().GetDoc();
+                        const SwTextINetFormat*>(pHt)->GetTextNode().GetDoc();
                 if ( pDoc )
                 {
-                    const SwCharFmts* pCharFmts = pDoc->GetCharFmts();
-                    const SwFmtINetFmt& rFmt = pHt->GetINetFmt();
-                    SwCharFmt* pFmt;
-                    pFmt = lcl_FindCharFmt( pCharFmts, rFmt.GetINetFmt() );
-                    if( pFmt )
-                        pOtherDoc->CopyCharFmt( *pFmt );
-                    pFmt = lcl_FindCharFmt( pCharFmts, rFmt.GetVisitedFmt() );
-                    if( pFmt )
-                        pOtherDoc->CopyCharFmt( *pFmt );
+                    const SwCharFormats* pCharFormats = pDoc->GetCharFormats();
+                    const SwFormatINetFormat& rFormat = pHt->GetINetFormat();
+                    SwCharFormat* pFormat;
+                    pFormat = lcl_FindCharFormat( pCharFormats, rFormat.GetINetFormat() );
+                    if( pFormat )
+                        pOtherDoc->CopyCharFormat( *pFormat );
+                    pFormat = lcl_FindCharFormat( pCharFormats, rFormat.GetVisitedFormat() );
+                    if( pFormat )
+                        pOtherDoc->CopyCharFormat( *pFormat );
                 }
             }
             //JP 24.04.98: Bug 49753 - ein TextNode muss am Attribut
             //              gesetzt sein, damit die Vorlagen erzeugt
             //              werden koenne
-            SwTxtINetFmt *const pINetHt = static_txtattr_cast<SwTxtINetFmt*>(pNewHt);
-            if ( !pINetHt->GetpTxtNode() )
+            SwTextINetFormat *const pINetHt = static_txtattr_cast<SwTextINetFormat*>(pNewHt);
+            if ( !pINetHt->GetpTextNode() )
             {
-                pINetHt->ChgTxtNode( pDest );
+                pINetHt->ChgTextNode( pDest );
             }
 
             //JP 22.10.97: Bug 44875 - Verbindung zum Format herstellen
-            pINetHt->GetCharFmt();
+            pINetHt->GetCharFormat();
             break;
         }
     case RES_TXTATR_META:
     case RES_TXTATR_METAFIELD:
         OSL_ENSURE( pNewHt, "copying Meta should not fail!" );
         OSL_ENSURE( pDest
-                    && (CH_TXTATR_INWORD == pDest->GetTxt()[pNewHt->GetStart()]),
+                    && (CH_TXTATR_INWORD == pDest->GetText()[pNewHt->GetStart()]),
             "missing CH_TXTATR?");
         break;
     }
@@ -1566,7 +1566,7 @@ void lcl_CopyHint(
 //                  kopiert! CopyAttr wird vornehmlich dann gerufen,
 //                  wenn Attribute fuer einen Node mit leerem String
 //                  gesetzt werden sollen.
-void SwTxtNode::CopyAttr( SwTxtNode *pDest, const sal_Int32 nTxtStartIdx,
+void SwTextNode::CopyAttr( SwTextNode *pDest, const sal_Int32 nTextStartIdx,
                           const sal_Int32 nOldPos )
 {
     if ( HasHints() )    // keine Attribute, keine Kekse
@@ -1576,9 +1576,9 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const sal_Int32 nTxtStartIdx,
 
         for ( size_t i = 0; i < m_pSwpHints->Count(); ++i )
         {
-            SwTxtAttr *const pHt = m_pSwpHints->GetTextHint(i);
+            SwTextAttr *const pHt = m_pSwpHints->GetTextHint(i);
             sal_Int32 const nAttrStartIdx = pHt->GetStart();
-            if ( nTxtStartIdx < nAttrStartIdx )
+            if ( nTextStartIdx < nAttrStartIdx )
                 break; // ueber das Textende, da nLen == 0
 
             const sal_Int32 *const pEndIdx = pHt->GetEnd();
@@ -1586,14 +1586,14 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const sal_Int32 nTxtStartIdx,
             {
                 sal_uInt16 const nWhich = pHt->Which();
                 if (RES_TXTATR_INPUTFIELD != nWhich // fdo#74981 skip fields
-                    && (    *pEndIdx > nTxtStartIdx
-                        || (*pEndIdx == nTxtStartIdx
-                            && nAttrStartIdx == nTxtStartIdx)))
+                    && (    *pEndIdx > nTextStartIdx
+                        || (*pEndIdx == nTextStartIdx
+                            && nAttrStartIdx == nTextStartIdx)))
                 {
                     if ( RES_TXTATR_REFMARK != nWhich )
                     {
                         // attribute in the area => copy
-                        SwTxtAttr *const pNewHt =
+                        SwTextAttr *const pNewHt =
                             pDest->InsertItem( pHt->GetAttr(), nOldPos, nOldPos, SetAttrMode::IS_COPY);
                         if ( pNewHt )
                         {
@@ -1615,7 +1615,7 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const sal_Int32 nTxtStartIdx,
 
     if( this != pDest )
     {
-        // Frames benachrichtigen, sonst verschwinden die Ftn-Nummern
+        // Frames benachrichtigen, sonst verschwinden die Footnote-Nummern
         SwUpdateAttr aHint(
             nOldPos,
             nOldPos,
@@ -1627,7 +1627,7 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const sal_Int32 nTxtStartIdx,
 
 // kopiert Zeichen und Attibute in pDest, wird angehaengt
 // introduction of new optional parameter to control, if all attributes have to be copied.
-void SwTxtNode::CopyText( SwTxtNode *const pDest,
+void SwTextNode::CopyText( SwTextNode *const pDest,
                       const SwIndex &rStart,
                       const sal_Int32 nLen,
                       const bool bForceCopyOfAllAttrs )
@@ -1637,19 +1637,19 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
 }
 
 // introduction of new optional parameter to control, if all attributes have to be copied.
-void SwTxtNode::CopyText( SwTxtNode *const pDest,
+void SwTextNode::CopyText( SwTextNode *const pDest,
                       const SwIndex &rDestStart,
                       const SwIndex &rStart,
                       sal_Int32 nLen,
                       const bool bForceCopyOfAllAttrs )
 {
-    sal_Int32 nTxtStartIdx = rStart.GetIndex();
+    sal_Int32 nTextStartIdx = rStart.GetIndex();
     sal_Int32 nDestStart = rDestStart.GetIndex();      // alte Pos merken
 
     if (pDest->GetDoc()->IsClipBoard() && this->GetNum())
     {
         // #i111677# cache expansion of source (for clipboard)
-        pDest->m_pNumStringCache.reset( (nTxtStartIdx != 0)
+        pDest->m_pNumStringCache.reset( (nTextStartIdx != 0)
             ? new OUString // fdo#49076: numbering only if copy from para start
             : new OUString(this->GetNumString()));
     }
@@ -1658,7 +1658,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
     {
         // wurde keine Laenge angegeben, dann Kopiere die Attribute
         // an der Position rStart.
-        CopyAttr( pDest, nTxtStartIdx, nDestStart );
+        CopyAttr( pDest, nTextStartIdx, nDestStart );
 
         // harte Absatz umspannende Attribute kopieren
         if( HasSwAttrSet() )
@@ -1668,7 +1668,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
             if ( !bForceCopyOfAllAttrs &&
                  ( nDestStart ||
                    pDest->HasSwAttrSet() ||
-                   nLen != pDest->GetTxt().getLength()))
+                   nLen != pDest->GetText().getLength()))
             {
                 SfxItemSet aCharSet( pDest->GetDoc()->GetAttrPool(),
                                     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
@@ -1695,7 +1695,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
     //JP 15.02.96: Bug 25537 - Attributbehandlung am Ende fehlt! Darum
     //              ueber die InsertMethode den Text einfuegen und nicht
     //              selbst direkt
-    pDest->InsertText( m_Text.copy(nTxtStartIdx, nLen), rDestStart,
+    pDest->InsertText( m_Text.copy(nTextStartIdx, nLen), rDestStart,
                    SwInsertFlags::EMPTYEXPAND );
 
     // um reale Groesse Updaten !
@@ -1713,7 +1713,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
         if ( !bForceCopyOfAllAttrs &&
              ( nDestStart ||
                pDest->HasSwAttrSet() ||
-               nLen != pDest->GetTxt().getLength()))
+               nLen != pDest->GetText().getLength()))
         {
             SfxItemSet aCharSet( pDest->GetDoc()->GetAttrPool(),
                 RES_CHRATR_BEGIN, RES_CHRATR_END-1,
@@ -1738,8 +1738,8 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
 
     // Ende erst jetzt holen, weil beim Kopieren in sich selbst der
     // Start-Index und alle Attribute vorher aktualisiert werden.
-    nTxtStartIdx = rStart.GetIndex();
-    const sal_Int32 nEnd = nTxtStartIdx + nLen;
+    nTextStartIdx = rStart.GetIndex();
+    const sal_Int32 nEnd = nTextStartIdx + nLen;
 
     // 2. Attribute kopieren
     // durch das Attribute-Array, bis der Anfang des Geltungsbereiches
@@ -1762,7 +1762,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
         if (!( nAttrStartIdx < nEnd))
             break;
 
-        SwTxtAttr * const pHt = m_pSwpHints->GetTextHint(n);
+        SwTextAttr * const pHt = m_pSwpHints->GetTextHint(n);
         const sal_Int32 * const pEndIdx = pHt->GetEnd();
         const sal_uInt16 nWhich = pHt->Which();
 
@@ -1789,8 +1789,8 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
         if ( nWhich == RES_TXTATR_INPUTFIELD )
         {
             OSL_ENSURE( pEndIdx != NULL,
-                    "<SwTxtNode::CopyText(..)> - RES_TXTATR_INPUTFIELD without EndIndex!" );
-            if ( nAttrStartIdx < nTxtStartIdx
+                    "<SwTextNode::CopyText(..)> - RES_TXTATR_INPUTFIELD without EndIndex!" );
+            if ( nAttrStartIdx < nTextStartIdx
                  || ( pEndIdx != NULL
                       && *(pEndIdx) > nEnd ) )
             {
@@ -1801,17 +1801,17 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
         sal_Int32 nAttrStt = 0;
         sal_Int32 nAttrEnd = 0;
 
-        if( nAttrStartIdx < nTxtStartIdx )
+        if( nAttrStartIdx < nTextStartIdx )
         {
             // start is before selection
             // copy hints with end and CH_TXTATR only if dummy char is copied
-            if ( pEndIdx && (*pEndIdx > nTxtStartIdx) && !pHt->HasDummyChar() )
+            if ( pEndIdx && (*pEndIdx > nTextStartIdx) && !pHt->HasDummyChar() )
             {
                 // attribute with extent and the end is in the selection
                 nAttrStt = nDestStart;
                 nAttrEnd = (*pEndIdx > nEnd)
                     ? rDestStart.GetIndex()
-                    : nDestStart + (*pEndIdx) - nTxtStartIdx;
+                    : nDestStart + (*pEndIdx) - nTextStartIdx;
             }
             else
             {
@@ -1821,12 +1821,12 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
         else
         {
             // start is in the selection
-            nAttrStt = nDestStart + ( nAttrStartIdx - nTxtStartIdx );
+            nAttrStt = nDestStart + ( nAttrStartIdx - nTextStartIdx );
             if( pEndIdx )
             {
                 nAttrEnd = *pEndIdx > nEnd
                     ? rDestStart.GetIndex()
-                    : nDestStart + ( *pEndIdx - nTxtStartIdx );
+                    : nDestStart + ( *pEndIdx - nTextStartIdx );
             }
             else
             {
@@ -1834,12 +1834,12 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
             }
         }
 
-        SwTxtAttr * pNewHt = 0;
+        SwTextAttr * pNewHt = 0;
 
         if( pDest == this )
         {
             // copy the hint here, but insert it later
-            pNewHt = MakeTxtAttr( *GetDoc(), pHt->GetAttr(),
+            pNewHt = MakeTextAttr( *GetDoc(), pHt->GetAttr(),
                     nAttrStt, nAttrEnd, COPY, pDest );
 
             lcl_CopyHint(nWhich, pHt, pNewHt, 0, pDest);
@@ -1882,7 +1882,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
     {
         for ( size_t i = 0; i < aRefMrkArr.size(); ++i )
         {
-            SwTxtAttr * const pNewHt = aRefMrkArr[i];
+            SwTextAttr * const pNewHt = aRefMrkArr[i];
             if( pNewHt->GetEnd() )
             {
                 pDest->GetpSwpHints()->Delete( pNewHt );
@@ -1900,7 +1900,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
     CHECK_SWPHINTS(pDest);
 }
 
-OUString SwTxtNode::InsertText( const OUString & rStr, const SwIndex & rIdx,
+OUString SwTextNode::InsertText( const OUString & rStr, const SwIndex & rIdx,
         const SwInsertFlags nMode )
 {
     assert(rIdx <= m_Text.getLength()); // invalid index
@@ -1909,7 +1909,7 @@ OUString SwTxtNode::InsertText( const OUString & rStr, const SwIndex & rIdx,
     sal_Int32 nLen = m_Text.getLength() - aPos;
     sal_Int32 const nOverflow(rStr.getLength() - GetSpaceLeft());
     SAL_WARN_IF(nOverflow > 0, "sw.core",
-            "SwTxtNode::InsertText: node text with insertion > capacity.");
+            "SwTextNode::InsertText: node text with insertion > capacity.");
     OUString const sInserted(
         (nOverflow > 0) ? rStr.copy(0, rStr.getLength() - nOverflow) : rStr);
     if (sInserted.isEmpty())
@@ -1944,7 +1944,7 @@ OUString SwTxtNode::InsertText( const OUString & rStr, const SwIndex & rIdx,
         for ( size_t i = 0; i < m_pSwpHints->Count() &&
                 rIdx >= (*m_pSwpHints)[i]->GetStart(); ++i )
         {
-            SwTxtAttr * const pHt = m_pSwpHints->GetTextHint( i );
+            SwTextAttr * const pHt = m_pSwpHints->GetTextHint( i );
             sal_Int32 * const pEndIdx = pHt->GetEnd();
             if( !pEndIdx )
                 continue;
@@ -2009,24 +2009,24 @@ OUString SwTxtNode::InsertText( const OUString & rStr, const SwIndex & rIdx,
 
     if ( HasWriterListeners() )
     {
-        SwInsTxt aHint( aPos, nLen );
+        SwInsText aHint( aPos, nLen );
         NotifyClients( 0, &aHint );
     }
 
     // By inserting a character, the hidden flags
-    // at the TxtNode can become invalid:
+    // at the TextNode can become invalid:
     SetCalcHiddenCharFlags();
 
     CHECK_SWPHINTS(this);
     return sInserted;
 }
 
-void SwTxtNode::CutText( SwTxtNode * const pDest,
+void SwTextNode::CutText( SwTextNode * const pDest,
             const SwIndex & rStart, const sal_Int32 nLen )
 {
     if(pDest)
     {
-        SwIndex aDestStt(pDest, pDest->GetTxt().getLength());
+        SwIndex aDestStt(pDest, pDest->GetText().getLength());
         CutImpl( pDest, aDestStt, rStart, nLen, false );
     }
     else
@@ -2037,7 +2037,7 @@ void SwTxtNode::CutText( SwTxtNode * const pDest,
     }
 }
 
-void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
+void SwTextNode::CutImpl( SwTextNode * const pDest, const SwIndex & rDestStart,
          const SwIndex & rStart, sal_Int32 nLen, const bool bUpdate )
 {
     if(!pDest)
@@ -2066,7 +2066,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
         return;
     }
 
-    sal_Int32 nTxtStartIdx = rStart.GetIndex();
+    sal_Int32 nTextStartIdx = rStart.GetIndex();
     sal_Int32 nDestStart = rDestStart.GetIndex();      // alte Pos merken
     const sal_Int32 nInitSize = pDest->m_Text.getLength();
 
@@ -2076,9 +2076,9 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
         OSL_FAIL("mst: entering dead and bitrotted code; fasten your seatbelts!");
         assert(false);
         OUStringBuffer buf(m_Text);
-        buf.insert(nDestStart, m_Text.copy(nTxtStartIdx, nLen));
+        buf.insert(nDestStart, m_Text.copy(nTextStartIdx, nLen));
         buf.remove(
-            nTxtStartIdx + ((nDestStart < nTxtStartIdx) ? nLen : 0), nLen);
+            nTextStartIdx + ((nDestStart < nTextStartIdx) ? nLen : 0), nLen);
         m_Text = buf.makeStringAndClear();
 
         const sal_Int32 nEnd = rStart.GetIndex() + nLen;
@@ -2094,26 +2094,26 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
         size_t nAttrCnt = 0;
         while ( m_pSwpHints && nAttrCnt < m_pSwpHints->Count() )
         {
-            SwTxtAttr * const pHt = m_pSwpHints->GetTextHint(nAttrCnt);
+            SwTextAttr * const pHt = m_pSwpHints->GetTextHint(nAttrCnt);
             const sal_Int32 nAttrStartIdx = pHt->GetStart();
             if (!( nAttrStartIdx < nEnd ))
                 break;
             const sal_Int32 * const pEndIdx = pHt->GetEnd();
             const sal_uInt16 nWhich = pHt->Which();
-            SwTxtAttr *pNewHt = 0;
+            SwTextAttr *pNewHt = 0;
 
-            if(nAttrStartIdx < nTxtStartIdx)
+            if(nAttrStartIdx < nTextStartIdx)
             {
                 // Anfang liegt vor dem Bereich
                 if ( RES_TXTATR_REFMARK != nWhich && !pHt->HasDummyChar() &&
-                    pEndIdx && *pEndIdx > nTxtStartIdx )
+                    pEndIdx && *pEndIdx > nTextStartIdx )
                 {
                     // Attribut mit einem Bereich
                     // und das Ende des Attribut liegt im Bereich
-                    pNewHt = MakeTxtAttr( *GetDoc(), pHt->GetAttr(), 0,
+                    pNewHt = MakeTextAttr( *GetDoc(), pHt->GetAttr(), 0,
                                         *pEndIdx > nEnd
                                             ? nLen
-                                            : *pEndIdx - nTxtStartIdx );
+                                            : *pEndIdx - nTextStartIdx );
                 }
             }
             else
@@ -2124,21 +2124,21 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
                     // Attribut verschieben
                     m_pSwpHints->Delete( pHt );
                     // die Start/End Indicies neu setzen
-                    pHt->GetStart() = nAttrStartIdx - nTxtStartIdx;
+                    pHt->GetStart() = nAttrStartIdx - nTextStartIdx;
                     if( pEndIdx )
-                        *pHt->GetEnd() = *pEndIdx - nTxtStartIdx;
+                        *pHt->GetEnd() = *pEndIdx - nTextStartIdx;
                     aArr.push_back( pHt );
                     continue;           // while-Schleife weiter, ohne ++ !
                 }
                     // das Ende liegt dahinter
                 else if (RES_TXTATR_REFMARK != nWhich && !pHt->HasDummyChar())
                 {
-                    pNewHt = MakeTxtAttr( *GetDoc(),
+                    pNewHt = MakeTextAttr( *GetDoc(),
                                           pHt->GetAttr(),
-                                          nAttrStartIdx - nTxtStartIdx,
+                                          nAttrStartIdx - nTextStartIdx,
                                           ( *pEndIdx > nEnd
                                             ? nLen
-                                            : *pEndIdx - nTxtStartIdx ));
+                                            : *pEndIdx - nTextStartIdx ));
                 }
             }
             if( pNewHt )
@@ -2163,9 +2163,9 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
         CHECK_SWPHINTS(this);
 
         // dann setze die kopierten/geloeschten Attribute in den Node
-        if( nDestStart <= nTxtStartIdx )
+        if( nDestStart <= nTextStartIdx )
         {
-            nTxtStartIdx = nTxtStartIdx + nLen;
+            nTextStartIdx = nTextStartIdx + nLen;
         }
         else
         {
@@ -2174,7 +2174,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
 
         for ( size_t n = 0; n < aArr.size(); ++n )
         {
-            SwTxtAttr *const pNewHt = aArr[n];
+            SwTextAttr *const pNewHt = aArr[n];
             pNewHt->GetStart() = nDestStart + pNewHt->GetStart();
             sal_Int32 * const pEndIdx = pNewHt->GetEnd();
             if ( pEndIdx )
@@ -2187,8 +2187,8 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
     else
     {
         pDest->m_Text = pDest->m_Text.replaceAt(nDestStart, 0,
-                            m_Text.copy(nTxtStartIdx, nLen));
-        m_Text = m_Text.replaceAt(nTxtStartIdx, nLen, "");
+                            m_Text.copy(nTextStartIdx, nLen));
+        m_Text = m_Text.replaceAt(nTextStartIdx, nLen, "");
         if (GetSpaceLeft()<0)
         {   // FIXME: could only happen when called from SwRangeRedline::Show.
             // unfortunately can't really do anything here to handle that...
@@ -2221,7 +2221,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
         {
             // alle, oder nur die CharAttribute ?
             if( nInitSize || pDest->HasSwAttrSet() ||
-                nLen != pDest->GetTxt().getLength())
+                nLen != pDest->GetText().getLength())
             {
                 SfxItemSet aCharSet( pDest->GetDoc()->GetAttrPool(),
                                     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
@@ -2246,29 +2246,29 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
         size_t nAttrCnt = 0;
         while ( m_pSwpHints && (nAttrCnt < m_pSwpHints->Count()) )
         {
-            SwTxtAttr * const pHt = m_pSwpHints->GetTextHint(nAttrCnt);
+            SwTextAttr * const pHt = m_pSwpHints->GetTextHint(nAttrCnt);
             const sal_Int32 nAttrStartIdx = pHt->GetStart();
             if (!( nAttrStartIdx < nEnd ))
                 break;
             const sal_Int32 * const pEndIdx = pHt->GetEnd();
             const sal_uInt16 nWhich = pHt->Which();
-            SwTxtAttr *pNewHt = 0;
+            SwTextAttr *pNewHt = 0;
 
             // if the hint has a dummy character, then it must not be split!
-            if(nAttrStartIdx < nTxtStartIdx)
+            if(nAttrStartIdx < nTextStartIdx)
             {
                 // Anfang liegt vor dem Bereich
                 if( !pHt->HasDummyChar() && ( RES_TXTATR_REFMARK != nWhich
-                    || bUndoNodes ) && pEndIdx && *pEndIdx > nTxtStartIdx )
+                    || bUndoNodes ) && pEndIdx && *pEndIdx > nTextStartIdx )
                 {
                     // Attribut mit einem Bereich
                     // und das Ende des Attribut liegt im Bereich
-                    pNewHt = MakeTxtAttr( *pDest->GetDoc(), pHt->GetAttr(),
+                    pNewHt = MakeTextAttr( *pDest->GetDoc(), pHt->GetAttr(),
                                     nDestStart,
                                     nDestStart + (
                                         *pEndIdx > nEnd
                                             ? nLen
-                                            : *pEndIdx - nTxtStartIdx ) );
+                                            : *pEndIdx - nTextStartIdx ) );
                 }
             }
             else
@@ -2291,13 +2291,13 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
                         bMergePortionsNeeded = true;
                     }
                     pHt->GetStart() =
-                            nDestStart + (nAttrStartIdx - nTxtStartIdx);
+                            nDestStart + (nAttrStartIdx - nTextStartIdx);
                     if( pEndIdx )
                     {
                         *pHt->GetEnd() = nDestStart + (
                                         *pEndIdx > nEnd
                                             ? nLen
-                                            : *pEndIdx - nTxtStartIdx );
+                                            : *pEndIdx - nTextStartIdx );
                     }
                     pDest->InsertHint( pHt,
                               SetAttrMode::NOTXTATRCHR
@@ -2311,11 +2311,11 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
                     // das Ende liegt dahinter
                 else if( RES_TXTATR_REFMARK != nWhich || bUndoNodes )
                 {
-                    pNewHt = MakeTxtAttr( *GetDoc(), pHt->GetAttr(),
-                                          nDestStart + (nAttrStartIdx - nTxtStartIdx),
+                    pNewHt = MakeTextAttr( *GetDoc(), pHt->GetAttr(),
+                                          nDestStart + (nAttrStartIdx - nTextStartIdx),
                                           nDestStart + ( *pEndIdx > nEnd
                                                          ? nLen
-                                                         : *pEndIdx - nTxtStartIdx ));
+                                                         : *pEndIdx - nTextStartIdx ));
                 }
             }
             if ( pNewHt )
@@ -2340,7 +2340,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
             SwpHts aArr;
             while ( nAttrCnt < m_pSwpHints->Count() )
             {
-                SwTxtAttr * const pHt = m_pSwpHints->GetTextHint(nAttrCnt);
+                SwTextAttr * const pHt = m_pSwpHints->GetTextHint(nAttrCnt);
                 if ( nEnd != pHt->GetStart() )
                     break;
                 const sal_Int32 * const pEndIdx = pHt->GetEnd();
@@ -2358,7 +2358,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
 
             for ( size_t n = 0; n < aArr.size(); ++n )
             {
-                SwTxtAttr * const pHt = aArr[ n ];
+                SwTextAttr * const pHt = aArr[ n ];
                 pHt->GetStart() = *pHt->GetEnd() = rStart.GetIndex();
                 InsertHint( pHt );
             }
@@ -2379,13 +2379,13 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
     TryDeleteSwpHints();
 
     // Frames benachrichtigen;
-    SwInsTxt aInsHint( nDestStart, nLen );
+    SwInsText aInsHint( nDestStart, nLen );
     pDest->ModifyNotification( 0, &aInsHint );
-    SwDelTxt aDelHint( nTxtStartIdx, nLen );
+    SwDelText aDelHint( nTextStartIdx, nLen );
     ModifyNotification( 0, &aDelHint );
 }
 
-void SwTxtNode::EraseText(const SwIndex &rIdx, const sal_Int32 nCount,
+void SwTextNode::EraseText(const SwIndex &rIdx, const sal_Int32 nCount,
         const SwInsertFlags nMode )
 {
     assert(rIdx <= m_Text.getLength()); // invalid index
@@ -2403,7 +2403,7 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const sal_Int32 nCount,
 
     for ( size_t i = 0; m_pSwpHints && i < m_pSwpHints->Count(); ++i )
     {
-        SwTxtAttr *pHt = m_pSwpHints->GetTextHint(i);
+        SwTextAttr *pHt = m_pSwpHints->GetTextHint(i);
 
         const sal_Int32 nHintStart = pHt->GetStart();
 
@@ -2473,20 +2473,20 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const sal_Int32 nCount,
     }
     else
     {
-        SwDelTxt aHint( nStartIdx, nCnt );
+        SwDelText aHint( nStartIdx, nCnt );
         NotifyClients( 0, &aHint );
     }
 
     OSL_ENSURE(rIdx.GetIndex() == nStartIdx, "huh? start index has changed?");
 
     // By deleting a character, the hidden flags
-    // at the TxtNode can become invalid:
+    // at the TextNode can become invalid:
     SetCalcHiddenCharFlags();
 
     CHECK_SWPHINTS(this);
 }
 
-void SwTxtNode::GCAttr()
+void SwTextNode::GCAttr()
 {
     if ( !HasHints() )
         return;
@@ -2499,7 +2499,7 @@ void SwTxtNode::GCAttr()
 
     for ( size_t i = 0; m_pSwpHints && i < m_pSwpHints->Count(); ++i )
     {
-        SwTxtAttr * const pHt = m_pSwpHints->GetTextHint(i);
+        SwTextAttr * const pHt = m_pSwpHints->GetTextHint(i);
 
         // wenn Ende und Start gleich sind --> loeschen
         const sal_Int32 * const pEndIdx = pHt->GetEnd();
@@ -2521,20 +2521,20 @@ void SwTxtNode::GCAttr()
 
     if(bChanged)
     {
-        //TxtFrm's reagieren auf aHint, andere auf aNew
+        //TextFrm's reagieren auf aHint, andere auf aNew
         SwUpdateAttr aHint(
             nMin,
             nMax,
             0);
 
         NotifyClients( 0, &aHint );
-        SwFmtChg aNew( GetTxtColl() );
+        SwFormatChg aNew( GetTextColl() );
         NotifyClients( 0, &aNew );
     }
 }
 
 // #i23726#
-SwNumRule* SwTxtNode::_GetNumRule(bool bInParent) const
+SwNumRule* SwTextNode::_GetNumRule(bool bInParent) const
 {
     SwNumRule* pRet = 0;
 
@@ -2559,7 +2559,7 @@ SwNumRule* SwTxtNode::_GetNumRule(bool bInParent) const
                SfxItemState::SET !=
                 GetpSwAttrSet()->GetItemState( RES_PARATR_NUMRULE, false ) ) )
         {
-            SwTxtFmtColl* pColl = GetTxtColl();
+            SwTextFormatColl* pColl = GetTextColl();
             if ( pColl )
             {
                 const SwNumRuleItem& rDirectItem = pColl->GetNumRule( false );
@@ -2574,12 +2574,12 @@ SwNumRule* SwTxtNode::_GetNumRule(bool bInParent) const
     return pRet;
 }
 
-SwNumRule* SwTxtNode::GetNumRule(bool bInParent) const
+SwNumRule* SwTextNode::GetNumRule(bool bInParent) const
 {
     return _GetNumRule(bInParent);
 }
 
-void SwTxtNode::NumRuleChgd()
+void SwTextNode::NumRuleChgd()
 {
     if ( IsInList() )
     {
@@ -2598,7 +2598,7 @@ void SwTxtNode::NumRuleChgd()
     SetInSwFntCache( false );
 
     // Sending "noop" modify in order to cause invalidations of registered
-    // <SwTxtFrm> instances to get the list style change respectively the change
+    // <SwTextFrm> instances to get the list style change respectively the change
     // in the list tree reflected in the layout.
     // Important note:
     {
@@ -2610,13 +2610,13 @@ void SwTxtNode::NumRuleChgd()
 }
 
 // -> #i27615#
-bool SwTxtNode::IsNumbered() const
+bool SwTextNode::IsNumbered() const
 {
     SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
     return pRule && IsCountedInList();
 }
 
-bool SwTxtNode::HasMarkedLabel() const
+bool SwTextNode::HasMarkedLabel() const
 {
     bool bResult = false;
 
@@ -2630,13 +2630,13 @@ bool SwTxtNode::HasMarkedLabel() const
 }
 // <- #i27615#
 
-SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext,
+SwTextNode* SwTextNode::_MakeNewTextNode( const SwNodeIndex& rPos, bool bNext,
                                        bool bChgFollow )
 {
     /* hartes PageBreak/PageDesc/ColumnBreak aus AUTO-Set ignorieren */
     SwAttrSet* pNewAttrSet = 0;
     // #i75353#
-    bool bClearHardSetNumRuleWhenFmtCollChanges( false );
+    bool bClearHardSetNumRuleWhenFormatCollChanges( false );
     if( HasSwAttrSet() )
     {
         pNewAttrSet = new SwAttrSet( *GetpSwAttrSet() );
@@ -2690,7 +2690,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext,
                     // #i75353#
                     // No clear of hard set numbering rule at an outline paragraph at this point.
                     // Only if the paragraph style changes - see below.
-                    bClearHardSetNumRuleWhenFmtCollChanges = true;
+                    bClearHardSetNumRuleWhenFormatCollChanges = true;
                 }
                 bRemoveFromCache = true;
             }
@@ -2707,9 +2707,9 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext,
     }
     SwNodes& rNds = GetNodes();
 
-    SwTxtFmtColl* pColl = GetTxtColl();
+    SwTextFormatColl* pColl = GetTextColl();
 
-    SwTxtNode *pNode = new SwTxtNode( rPos, pColl, pNewAttrSet );
+    SwTextNode *pNode = new SwTextNode( rPos, pColl, pNewAttrSet );
 
     delete pNewAttrSet;
 
@@ -2726,21 +2726,21 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext,
     // jetzt kann es sein, das durch die Nummerierung dem neuen Node eine
     // Vorlage aus dem Pool zugewiesen wurde. Dann darf diese nicht
     // nochmal uebergeplaettet werden !!
-    if( pColl != pNode->GetTxtColl() ||
-        ( bChgFollow && pColl != GetTxtColl() ))
+    if( pColl != pNode->GetTextColl() ||
+        ( bChgFollow && pColl != GetTextColl() ))
         return pNode;       // mehr duerfte nicht gemacht werden oder ????
 
-    pNode->_ChgTxtCollUpdateNum( 0, pColl ); // fuer Nummerierung/Gliederung
+    pNode->_ChgTextCollUpdateNum( 0, pColl ); // fuer Nummerierung/Gliederung
     if( bNext || !bChgFollow )
         return pNode;
 
-    SwTxtFmtColl *pNextColl = &pColl->GetNextTxtFmtColl();
+    SwTextFormatColl *pNextColl = &pColl->GetNextTextFormatColl();
     // #i101870#
     // perform action on different paragraph styles before applying the new paragraph style
     if (pNextColl != pColl)
     {
         // #i75353#
-        if ( bClearHardSetNumRuleWhenFmtCollChanges )
+        if ( bClearHardSetNumRuleWhenFormatCollChanges )
         {
             std::vector<sal_uInt16> aClearWhichIds;
             aClearWhichIds.push_back( RES_PARATR_NUMRULE );
@@ -2751,16 +2751,16 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext,
             }
         }
     }
-    ChgFmtColl( pNextColl );
+    ChgFormatColl( pNextColl );
 
     return pNode;
 }
 
-SwCntntNode* SwTxtNode::AppendNode( const SwPosition & rPos )
+SwContentNode* SwTextNode::AppendNode( const SwPosition & rPos )
 {
     // Position hinter dem eingefuegt wird
     SwNodeIndex aIdx( rPos.nNode, 1 );
-    SwTxtNode* pNew = _MakeNewTxtNode( aIdx, true );
+    SwTextNode* pNew = _MakeNewTextNode( aIdx, true );
 
     // reset list attributes at appended text node
     pNew->ResetAttr( RES_PARATR_LIST_ISRESTART );
@@ -2782,7 +2782,7 @@ SwCntntNode* SwTxtNode::AppendNode( const SwPosition & rPos )
     return pNew;
 }
 
-SwTxtAttr * SwTxtNode::GetTxtAttrForCharAt(
+SwTextAttr * SwTextNode::GetTextAttrForCharAt(
     const sal_Int32 nIndex,
     const RES_TXTATR nWhich ) const
 {
@@ -2790,7 +2790,7 @@ SwTxtAttr * SwTxtNode::GetTxtAttrForCharAt(
     {
         for ( size_t i = 0; i < m_pSwpHints->Count(); ++i )
         {
-            SwTxtAttr * const pHint = m_pSwpHints->GetTextHint(i);
+            SwTextAttr * const pHint = m_pSwpHints->GetTextHint(i);
             const sal_Int32 nStartPos = pHint->GetStart();
             if ( nIndex < nStartPos )
             {
@@ -2817,33 +2817,33 @@ inline sal_uInt16 lcl_BoundListLevel(const int nActualLevel)
 }
 
 // -> #i29560#
-bool SwTxtNode::HasNumber() const
+bool SwTextNode::HasNumber() const
 {
     bool bResult = false;
 
     const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
     if ( pRule )
     {
-        SwNumFmt aFmt(pRule->Get(lcl_BoundListLevel(GetActualListLevel())));
+        SwNumFormat aFormat(pRule->Get(lcl_BoundListLevel(GetActualListLevel())));
 
         // #i40041#
-        bResult = aFmt.IsEnumeration() &&
-            SVX_NUM_NUMBER_NONE != aFmt.GetNumberingType();
+        bResult = aFormat.IsEnumeration() &&
+            SVX_NUM_NUMBER_NONE != aFormat.GetNumberingType();
     }
 
     return bResult;
 }
 
-bool SwTxtNode::HasBullet() const
+bool SwTextNode::HasBullet() const
 {
     bool bResult = false;
 
     const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
     if ( pRule )
     {
-        SwNumFmt aFmt(pRule->Get(lcl_BoundListLevel(GetActualListLevel())));
+        SwNumFormat aFormat(pRule->Get(lcl_BoundListLevel(GetActualListLevel())));
 
-        bResult = aFmt.IsItemize();
+        bResult = aFormat.IsItemize();
     }
 
     return bResult;
@@ -2852,7 +2852,7 @@ bool SwTxtNode::HasBullet() const
 
 // #128041# - introduce parameter <_bInclPrefixAndSuffixStrings>
 //i53420 added max outline parameter
-OUString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings,
+OUString SwTextNode::GetNumString( const bool _bInclPrefixAndSuffixStrings,
         const unsigned int _nRestrictToThisLevel ) const
 {
     if (GetDoc()->IsClipBoard() && m_pNumStringCache.get())
@@ -2866,7 +2866,7 @@ OUString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings,
     {
         SvxNumberType const& rNumberType(
                 pRule->Get( lcl_BoundListLevel(GetActualListLevel()) ) );
-        if (rNumberType.IsTxtFmt() ||
+        if (rNumberType.IsTextFormat() ||
 
             (style::NumberingType::NUMBER_NONE == rNumberType.GetNumberingType()))
         {
@@ -2880,23 +2880,23 @@ OUString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings,
     return OUString();
 }
 
-long SwTxtNode::GetLeftMarginWithNum( bool bTxtLeft ) const
+long SwTextNode::GetLeftMarginWithNum( bool bTextLeft ) const
 {
     long nRet = 0;
     const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
     if( pRule )
     {
-        const SwNumFmt& rFmt = pRule->Get(lcl_BoundListLevel(GetActualListLevel()));
+        const SwNumFormat& rFormat = pRule->Get(lcl_BoundListLevel(GetActualListLevel()));
 
-        if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+        if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
         {
-            nRet = rFmt.GetAbsLSpace();
+            nRet = rFormat.GetAbsLSpace();
 
-            if( !bTxtLeft )
+            if( !bTextLeft )
             {
-                if( 0 > rFmt.GetFirstLineOffset() &&
-                    nRet > -rFmt.GetFirstLineOffset() )
-                    nRet = nRet + rFmt.GetFirstLineOffset();
+                if( 0 > rFormat.GetFirstLineOffset() &&
+                    nRet > -rFormat.GetFirstLineOffset() )
+                    nRet = nRet + rFormat.GetFirstLineOffset();
                 else
                     nRet = 0;
             }
@@ -2904,17 +2904,17 @@ long SwTxtNode::GetLeftMarginWithNum( bool bTxtLeft ) const
             if( pRule->IsAbsSpaces() )
                 nRet = nRet - GetSwAttrSet().GetLRSpace().GetLeft();
         }
-        else if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+        else if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
         {
             if ( AreListLevelIndentsApplicable() )
             {
-                nRet = rFmt.GetIndentAt();
+                nRet = rFormat.GetIndentAt();
                 // #i90401#
                 // Only negative first line indents have consider for the left margin
-                if ( !bTxtLeft &&
-                     rFmt.GetFirstLineIndent() < 0 )
+                if ( !bTextLeft &&
+                     rFormat.GetFirstLineIndent() < 0 )
                 {
-                    nRet = nRet + rFmt.GetFirstLineIndent();
+                    nRet = nRet + rFormat.GetFirstLineIndent();
                 }
             }
         }
@@ -2923,7 +2923,7 @@ long SwTxtNode::GetLeftMarginWithNum( bool bTxtLeft ) const
     return nRet;
 }
 
-bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
+bool SwTextNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
 {
     // #i95907#
     rFLOffset = 0;
@@ -2934,27 +2934,27 @@ bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
     {
         if ( IsCountedInList() )
         {
-            const SwNumFmt& rFmt = pRule->Get(lcl_BoundListLevel(GetActualListLevel()));
-            if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+            const SwNumFormat& rFormat = pRule->Get(lcl_BoundListLevel(GetActualListLevel()));
+            if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                rFLOffset = rFmt.GetFirstLineOffset();
+                rFLOffset = rFormat.GetFirstLineOffset();
 
                 if (!getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING))
                 {
                     SvxLRSpaceItem aItem = GetSwAttrSet().GetLRSpace();
-                    rFLOffset = rFLOffset + aItem.GetTxtFirstLineOfst();
+                    rFLOffset = rFLOffset + aItem.GetTextFirstLineOfst();
                 }
             }
-            else if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+            else if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
             {
                 if ( AreListLevelIndentsApplicable() )
                 {
-                    rFLOffset = rFmt.GetFirstLineIndent();
+                    rFLOffset = rFormat.GetFirstLineIndent();
                 }
                 else if (!getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING))
                 {
                     SvxLRSpaceItem aItem = GetSwAttrSet().GetLRSpace();
-                    rFLOffset = aItem.GetTxtFirstLineOfst();
+                    rFLOffset = aItem.GetTextFirstLineOfst();
                 }
             }
         }
@@ -2962,33 +2962,33 @@ bool SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
         return true;
     }
 
-    rFLOffset = GetSwAttrSet().GetLRSpace().GetTxtFirstLineOfst();
+    rFLOffset = GetSwAttrSet().GetLRSpace().GetTextFirstLineOfst();
     return false;
 }
 
-SwTwips SwTxtNode::GetAdditionalIndentForStartingNewList() const
+SwTwips SwTextNode::GetAdditionalIndentForStartingNewList() const
 {
     SwTwips nAdditionalIndent = 0;
 
     const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
     if ( pRule )
     {
-        const SwNumFmt& rFmt = pRule->Get(lcl_BoundListLevel(GetActualListLevel()));
-        if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+        const SwNumFormat& rFormat = pRule->Get(lcl_BoundListLevel(GetActualListLevel()));
+        if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
         {
             nAdditionalIndent = GetSwAttrSet().GetLRSpace().GetLeft();
 
             if (getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING))
             {
                 nAdditionalIndent = nAdditionalIndent -
-                                    GetSwAttrSet().GetLRSpace().GetTxtFirstLineOfst();
+                                    GetSwAttrSet().GetLRSpace().GetTextFirstLineOfst();
             }
         }
-        else if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+        else if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
         {
             if ( AreListLevelIndentsApplicable() )
             {
-                nAdditionalIndent = rFmt.GetIndentAt() + rFmt.GetFirstLineIndent();
+                nAdditionalIndent = rFormat.GetIndentAt() + rFormat.GetFirstLineIndent();
             }
             else
             {
@@ -2996,7 +2996,7 @@ SwTwips SwTxtNode::GetAdditionalIndentForStartingNewList() const
                 if (getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING))
                 {
                     nAdditionalIndent = nAdditionalIndent -
-                                        GetSwAttrSet().GetLRSpace().GetTxtFirstLineOfst();
+                                        GetSwAttrSet().GetLRSpace().GetTextFirstLineOfst();
                 }
             }
         }
@@ -3010,15 +3010,15 @@ SwTwips SwTxtNode::GetAdditionalIndentForStartingNewList() const
 }
 
 // #i96772#
-void SwTxtNode::ClearLRSpaceItemDueToListLevelIndents( SvxLRSpaceItem& o_rLRSpaceItem ) const
+void SwTextNode::ClearLRSpaceItemDueToListLevelIndents( SvxLRSpaceItem& o_rLRSpaceItem ) const
 {
     if ( AreListLevelIndentsApplicable() )
     {
         const SwNumRule* pRule = GetNumRule();
         if ( pRule && GetActualListLevel() >= 0 )
         {
-            const SwNumFmt& rFmt = pRule->Get(lcl_BoundListLevel(GetActualListLevel()));
-            if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+            const SwNumFormat& rFormat = pRule->Get(lcl_BoundListLevel(GetActualListLevel()));
+            if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
                 o_rLRSpaceItem = aLR;
@@ -3028,7 +3028,7 @@ void SwTxtNode::ClearLRSpaceItemDueToListLevelIndents( SvxLRSpaceItem& o_rLRSpac
 }
 
 // #i91133#
-long SwTxtNode::GetLeftMarginForTabCalculation() const
+long SwTextNode::GetLeftMarginForTabCalculation() const
 {
     long nLeftMarginForTabCalc = 0;
 
@@ -3036,91 +3036,91 @@ long SwTxtNode::GetLeftMarginForTabCalculation() const
     const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0;
     if( pRule )
     {
-        const SwNumFmt& rFmt = pRule->Get(lcl_BoundListLevel(GetActualListLevel()));
-        if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+        const SwNumFormat& rFormat = pRule->Get(lcl_BoundListLevel(GetActualListLevel()));
+        if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
         {
             if ( AreListLevelIndentsApplicable() )
             {
-                nLeftMarginForTabCalc = rFmt.GetIndentAt();
+                nLeftMarginForTabCalc = rFormat.GetIndentAt();
                 bLeftMarginForTabCalcSetToListLevelIndent = true;
             }
         }
     }
     if ( !bLeftMarginForTabCalcSetToListLevelIndent )
     {
-        nLeftMarginForTabCalc = GetSwAttrSet().GetLRSpace().GetTxtLeft();
+        nLeftMarginForTabCalc = GetSwAttrSet().GetLRSpace().GetTextLeft();
     }
 
     return nLeftMarginForTabCalc;
 }
 
 static void Replace0xFF(
-    SwTxtNode const& rNode,
-    OUStringBuffer & rTxt,
-    sal_Int32 & rTxtStt,
+    SwTextNode const& rNode,
+    OUStringBuffer & rText,
+    sal_Int32 & rTextStt,
     sal_Int32 nEndPos,
-    bool const bExpandFlds,
-    bool const bExpandFtn = true )
+    bool const bExpandFields,
+    bool const bExpandFootnote = true )
 {
     if (rNode.GetpSwpHints())
     {
         sal_Unicode cSrchChr = CH_TXTATR_BREAKWORD;
         for( int nSrchIter = 0; 2 > nSrchIter; ++nSrchIter, cSrchChr = CH_TXTATR_INWORD )
         {
-            sal_Int32 nPos = rTxt.indexOf(cSrchChr);
+            sal_Int32 nPos = rText.indexOf(cSrchChr);
             while (-1 != nPos && nPos < nEndPos)
             {
-                const SwTxtAttr* const pAttr =
-                    rNode.GetTxtAttrForCharAt(rTxtStt + nPos);
+                const SwTextAttr* const pAttr =
+                    rNode.GetTextAttrForCharAt(rTextStt + nPos);
                 if( pAttr )
                 {
                     switch( pAttr->Which() )
                     {
                     case RES_TXTATR_FIELD:
                     case RES_TXTATR_ANNOTATION:
-                        rTxt.remove(nPos, 1);
-                        if( bExpandFlds )
+                        rText.remove(nPos, 1);
+                        if( bExpandFields )
                         {
                             const OUString aExpand(
-                                static_txtattr_cast<SwTxtFld const*>(pAttr)->GetFmtFld().GetField()->ExpandField(true));
-                            rTxt.insert(nPos, aExpand);
+                                static_txtattr_cast<SwTextField const*>(pAttr)->GetFormatField().GetField()->ExpandField(true));
+                            rText.insert(nPos, aExpand);
                             nPos = nPos + aExpand.getLength();
                             nEndPos = nEndPos + aExpand.getLength();
-                            rTxtStt = rTxtStt - aExpand.getLength();
+                            rTextStt = rTextStt - aExpand.getLength();
                         }
-                        ++rTxtStt;
+                        ++rTextStt;
                         break;
 
                     case RES_TXTATR_FTN:
-                        rTxt.remove(nPos, 1);
-                        if( bExpandFlds && bExpandFtn )
+                        rText.remove(nPos, 1);
+                        if( bExpandFields && bExpandFootnote )
                         {
-                            const SwFmtFtn& rFtn = pAttr->GetFtn();
+                            const SwFormatFootnote& rFootnote = pAttr->GetFootnote();
                             OUString sExpand;
-                            if( !rFtn.GetNumStr().isEmpty() )
-                                sExpand = rFtn.GetNumStr();
-                            else if( rFtn.IsEndNote() )
-                                sExpand = rNode.GetDoc()->GetEndNoteInfo().aFmt.
-                                                GetNumStr( rFtn.GetNumber() );
+                            if( !rFootnote.GetNumStr().isEmpty() )
+                                sExpand = rFootnote.GetNumStr();
+                            else if( rFootnote.IsEndNote() )
+                                sExpand = rNode.GetDoc()->GetEndNoteInfo().aFormat.
+                                                GetNumStr( rFootnote.GetNumber() );
                             else
-                                sExpand = rNode.GetDoc()->GetFtnInfo().aFmt.
-                                                GetNumStr( rFtn.GetNumber() );
-                            rTxt.insert(nPos, sExpand);
+                                sExpand = rNode.GetDoc()->GetFootnoteInfo().aFormat.
+                                                GetNumStr( rFootnote.GetNumber() );
+                            rText.insert(nPos, sExpand);
                             nPos = nPos + sExpand.getLength();
                             nEndPos = nEndPos + sExpand.getLength();
-                            rTxtStt = rTxtStt - sExpand.getLength();
+                            rTextStt = rTextStt - sExpand.getLength();
                         }
-                        ++rTxtStt;
+                        ++rTextStt;
                         break;
 
                     default:
-                        rTxt.remove(nPos, 1);
-                        ++rTxtStt;
+                        rText.remove(nPos, 1);
+                        ++rTextStt;
                     }
                 }
                 else
                     ++nPos, ++nEndPos;
-                nPos = rTxt.indexOf(cSrchChr, nPos);
+                nPos = rText.indexOf(cSrchChr, nPos);
             }
         }
     }
@@ -3128,28 +3128,28 @@ static void Replace0xFF(
 
 // Expand fields
 // #i83479# - handling of new parameters
-OUString SwTxtNode::GetExpandTxt(  const sal_Int32 nIdx,
+OUString SwTextNode::GetExpandText(  const sal_Int32 nIdx,
                                    const sal_Int32 nLen,
                                    const bool bWithNum,
                                    const bool bAddSpaceAfterListLabelStr,
                                    const bool bWithSpacesForLevel,
-                                   const bool bWithFtn ) const
+                                   const bool bWithFootnote ) const
 
 {
     ExpandMode eMode = ExpandMode::ExpandFields;
-    if (bWithFtn)
+    if (bWithFootnote)
         eMode |= ExpandMode::ExpandFootnote;
 
     ModelToViewHelper aConversionMap(*this, eMode);
     OUString aExpandText = aConversionMap.getViewText();
     const sal_Int32 nExpandBegin = aConversionMap.ConvertToViewPosition( nIdx );
-    sal_Int32 nEnd = nLen == -1 ? GetTxt().getLength() : nIdx + nLen;
+    sal_Int32 nEnd = nLen == -1 ? GetText().getLength() : nIdx + nLen;
     const sal_Int32 nExpandEnd = aConversionMap.ConvertToViewPosition( nEnd );
-    OUStringBuffer aTxt(aExpandText.copy(nExpandBegin, nExpandEnd-nExpandBegin));
+    OUStringBuffer aText(aExpandText.copy(nExpandBegin, nExpandEnd-nExpandBegin));
 
     // remove dummy characters of Input Fields
-    comphelper::string::remove(aTxt, CH_TXT_ATR_INPUTFIELDSTART);
-    comphelper::string::remove(aTxt, CH_TXT_ATR_INPUTFIELDEND);
+    comphelper::string::remove(aText, CH_TXT_ATR_INPUTFIELDSTART);
+    comphelper::string::remove(aText, CH_TXT_ATR_INPUTFIELDEND);
 
     if( bWithNum )
     {
@@ -3158,9 +3158,9 @@ OUString SwTxtNode::GetExpandTxt(  const sal_Int32 nIdx,
             if ( bAddSpaceAfterListLabelStr )
             {
                 const sal_Unicode aSpace = ' ';
-                aTxt.insert(0, aSpace);
+                aText.insert(0, aSpace);
             }
-            aTxt.insert(0, GetNumString());
+            aText.insert(0, GetNumString());
         }
     }
 
@@ -3169,28 +3169,28 @@ OUString SwTxtNode::GetExpandTxt(  const sal_Int32 nIdx,
         const sal_Unicode aSpace = ' ';
         for (int nLevel = GetActualListLevel(); nLevel > 0; --nLevel)
         {
-            aTxt.insert(0, aSpace);
-            aTxt.insert(0, aSpace);
+            aText.insert(0, aSpace);
+            aText.insert(0, aSpace);
         }
     }
 
-    return aTxt.makeStringAndClear();
+    return aText.makeStringAndClear();
 }
 
-bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
+bool SwTextNode::GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx,
                         sal_Int32 nIdx, sal_Int32 nLen, bool bWithNum,
-                        bool bWithFtn, bool bReplaceTabsWithSpaces ) const
+                        bool bWithFootnote, bool bReplaceTabsWithSpaces ) const
 {
     if( &rDestNd == this )
         return false;
 
-    SwIndex aDestIdx(&rDestNd, rDestNd.GetTxt().getLength());
+    SwIndex aDestIdx(&rDestNd, rDestNd.GetText().getLength());
     if( pDestIdx )
         aDestIdx = *pDestIdx;
     const sal_Int32 nDestStt = aDestIdx.GetIndex();
 
     // Text einfuegen
-    OUStringBuffer buf(GetTxt());
+    OUStringBuffer buf(GetText());
     if( bReplaceTabsWithSpaces )
         buf.replace('\t', ' ');
 
@@ -3217,7 +3217,7 @@ bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
         sal_Int32 nInsPos = nDestStt - nIdx;
         for ( size_t i = 0; i < m_pSwpHints->Count(); ++i )
         {
-            const SwTxtAttr* pHt = (*m_pSwpHints)[i];
+            const SwTextAttr* pHt = (*m_pSwpHints)[i];
             const sal_Int32 nAttrStartIdx = pHt->GetStart();
             const sal_uInt16 nWhich = pHt->Which();
             if (nIdx + nLen <= nAttrStartIdx)
@@ -3231,7 +3231,7 @@ bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
             {
                 const SvxFontItem* const pFont =
                     static_cast<const SvxFontItem*>(
-                        CharFmt::GetItem( *pHt, RES_CHRATR_FONT ));
+                        CharFormat::GetItem( *pHt, RES_CHRATR_FONT ));
                 if ( pFont && RTL_TEXTENCODING_SYMBOL == pFont->GetCharSet() )
                 {
                     // attribute in area => copy
@@ -3248,14 +3248,14 @@ bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
                 case RES_TXTATR_ANNOTATION:
                     {
                         OUString const aExpand(
-                            static_txtattr_cast<SwTxtFld const*>(pHt)->GetFmtFld().GetField()->ExpandField(true));
+                            static_txtattr_cast<SwTextField const*>(pHt)->GetFormatField().GetField()->ExpandField(true));
                         if (!aExpand.isEmpty())
                         {
                             ++aDestIdx;     // dahinter einfuegen;
                             OUString const ins(
                                 rDestNd.InsertText( aExpand, aDestIdx));
                             SAL_INFO_IF(ins.getLength() != aExpand.getLength(),
-                                    "sw.core", "GetExpandTxt lossage");
+                                    "sw.core", "GetExpandText lossage");
                             aDestIdx = nInsPos + nAttrStartIdx;
                             nInsPos += ins.getLength();
                         }
@@ -3266,18 +3266,18 @@ bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
 
                 case RES_TXTATR_FTN:
                     {
-                        if ( bWithFtn )
+                        if ( bWithFootnote )
                         {
-                            const SwFmtFtn& rFtn = pHt->GetFtn();
+                            const SwFormatFootnote& rFootnote = pHt->GetFootnote();
                             OUString sExpand;
-                            if( !rFtn.GetNumStr().isEmpty() )
-                                sExpand = rFtn.GetNumStr();
-                            else if( rFtn.IsEndNote() )
-                                sExpand = GetDoc()->GetEndNoteInfo().aFmt.
-                                GetNumStr( rFtn.GetNumber() );
+                            if( !rFootnote.GetNumStr().isEmpty() )
+                                sExpand = rFootnote.GetNumStr();
+                            else if( rFootnote.IsEndNote() )
+                                sExpand = GetDoc()->GetEndNoteInfo().aFormat.
+                                GetNumStr( rFootnote.GetNumber() );
                             else
-                                sExpand = GetDoc()->GetFtnInfo().aFmt.
-                                                GetNumStr( rFtn.GetNumber() );
+                                sExpand = GetDoc()->GetFootnoteInfo().aFormat.
+                                                GetNumStr( rFootnote.GetNumber() );
                             if( !sExpand.isEmpty() )
                             {
                                 ++aDestIdx;     // insert behind
@@ -3289,7 +3289,7 @@ bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
                                         aDestIdx.GetIndex() );
                                 OUString const ins( rDestNd.InsertText(sExpand, aDestIdx, SwInsertFlags::EMPTYEXPAND));
                                 SAL_INFO_IF(ins.getLength() != sExpand.getLength(),
-                                        "sw.core", "GetExpandTxt lossage");
+                                        "sw.core", "GetExpandText lossage");
                                 aDestIdx = nInsPos + nAttrStartIdx;
                                 nInsPos += ins.getLength();
                             }
@@ -3315,9 +3315,9 @@ bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
 
     aDestIdx = 0;
     sal_Int32 nStartDelete(-1);
-    while (aDestIdx < rDestNd.GetTxt().getLength())
+    while (aDestIdx < rDestNd.GetText().getLength())
     {
-        sal_Unicode const cur(rDestNd.GetTxt()[aDestIdx.GetIndex()]);
+        sal_Unicode const cur(rDestNd.GetText()[aDestIdx.GetIndex()]);
         if (   (cChar == cur) // filter substituted hidden text
             || (CH_TXT_ATR_FIELDSTART  == cur) // filter all fieldmarks
             || (CH_TXT_ATR_FIELDEND    == cur)
@@ -3328,7 +3328,7 @@ bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
                 nStartDelete = aDestIdx.GetIndex(); // start deletion range
             }
             ++aDestIdx;
-            if (aDestIdx < rDestNd.GetTxt().getLength())
+            if (aDestIdx < rDestNd.GetText().getLength())
             {
                 continue;
             } // else: end of paragraph => delete, see below
@@ -3352,8 +3352,8 @@ bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
     return true;
 }
 
-OUString SwTxtNode::GetRedlineTxt( sal_Int32 nIdx, sal_Int32 nLen,
-                                   bool bExpandFlds, bool bWithNum ) const
+OUString SwTextNode::GetRedlineText( sal_Int32 nIdx, sal_Int32 nLen,
+                                   bool bExpandFields, bool bWithNum ) const
 {
     std::vector<sal_Int32> aRedlArr;
     const SwDoc* pDoc = GetDoc();
@@ -3362,9 +3362,9 @@ OUString SwTxtNode::GetRedlineTxt( sal_Int32 nIdx, sal_Int32 nLen,
     {
         // es existiert fuer den Node irgendein Redline-Delete-Object
         const sal_uLong nNdIdx = GetIndex();
-        for( ; nRedlPos < pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() ; ++nRedlPos )
+        for( ; nRedlPos < pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() ; ++nRedlPos )
         {
-            const SwRangeRedline* pTmp = pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos ];
+            const SwRangeRedline* pTmp = pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos ];
             if( nsRedlineType_t::REDLINE_DELETE == pTmp->GetType() )
             {
                 const SwPosition *pRStt = pTmp->Start(), *pREnd = pTmp->End();
@@ -3388,7 +3388,7 @@ OUString SwTxtNode::GetRedlineTxt( sal_Int32 nIdx, sal_Int32 nLen,
                         aRedlArr.push_back( pREnd->nContent.GetIndex() );
                     else
                     {
-                        aRedlArr.push_back(GetTxt().getLength());
+                        aRedlArr.push_back(GetText().getLength());
                         break;      // mehr kann nicht kommen
                     }
                 }
@@ -3398,12 +3398,12 @@ OUString SwTxtNode::GetRedlineTxt( sal_Int32 nIdx, sal_Int32 nLen,
         }
     }
 
-    OUStringBuffer aTxt((nLen > GetTxt().getLength())
-                ? GetTxt().copy(nIdx)
-                : GetTxt().copy(nIdx, nLen));
+    OUStringBuffer aText((nLen > GetText().getLength())
+                ? GetText().copy(nIdx)
+                : GetText().copy(nIdx, nLen));
 
-    sal_Int32 nTxtStt = nIdx;
-    sal_Int32 nIdxEnd = nIdx + aTxt.getLength();
+    sal_Int32 nTextStt = nIdx;
+    sal_Int32 nIdxEnd = nIdx + aText.getLength();
     for( size_t n = 0; n < aRedlArr.size(); n += 2 )
     {
         sal_Int32 nStt = aRedlArr[ n ];
@@ -3414,21 +3414,21 @@ OUString SwTxtNode::GetRedlineTxt( sal_Int32 nIdx, sal_Int32 nLen,
             if( nStt < nIdx ) nStt = nIdx;
             if( nIdxEnd < nEnd ) nEnd = nIdxEnd;
             const sal_Int32 nDelCnt = nEnd - nStt;
-            aTxt.remove(nStt - nTxtStt, nDelCnt);
-            Replace0xFF(*this, aTxt, nTxtStt, nStt - nTxtStt, bExpandFlds);
-            nTxtStt += nDelCnt;
+            aText.remove(nStt - nTextStt, nDelCnt);
+            Replace0xFF(*this, aText, nTextStt, nStt - nTextStt, bExpandFields);
+            nTextStt += nDelCnt;
         }
         else if( nStt >= nIdxEnd )
             break;
     }
-    Replace0xFF(*this, aTxt, nTxtStt, aTxt.getLength(), bExpandFlds);
+    Replace0xFF(*this, aText, nTextStt, aText.getLength(), bExpandFields);
 
     if( bWithNum )
-        aTxt.insert(0, GetNumString());
-    return aTxt.makeStringAndClear();
+        aText.insert(0, GetNumString());
+    return aText.makeStringAndClear();
 }
 
-void SwTxtNode::ReplaceText( const SwIndex& rStart, const sal_Int32 nDelLen,
+void SwTextNode::ReplaceText( const SwIndex& rStart, const sal_Int32 nDelLen,
                              const OUString & rStr)
 {
     assert( rStart.GetIndex() < m_Text.getLength()     // index out of bounds
@@ -3436,7 +3436,7 @@ void SwTxtNode::ReplaceText( const SwIndex& rStart, const sal_Int32 nDelLen,
 
     sal_Int32 const nOverflow(rStr.getLength() - nDelLen - GetSpaceLeft());
     SAL_WARN_IF(nOverflow > 0, "sw.core",
-            "SwTxtNode::ReplaceText: node text with insertion > node capacity.");
+            "SwTextNode::ReplaceText: node text with insertion > node capacity.");
     OUString const sInserted(
         (nOverflow > 0) ? rStr.copy(0, rStr.getLength() - nOverflow) : rStr);
     if (sInserted.isEmpty() && 0 == nDelLen)
@@ -3452,7 +3452,7 @@ void SwTxtNode::ReplaceText( const SwIndex& rStart, const sal_Int32 nDelLen,
         if ((CH_TXTATR_BREAKWORD == m_Text[nPos]) ||
             (CH_TXTATR_INWORD    == m_Text[nPos]))
         {
-            SwTxtAttr *const pHint = GetTxtAttrForCharAt( nPos );
+            SwTextAttr *const pHint = GetTextAttrForCharAt( nPos );
             if (pHint)
             {
                assert(!( pHint->GetEnd() && pHint->HasDummyChar()
@@ -3479,9 +3479,9 @@ void SwTxtNode::ReplaceText( const SwIndex& rStart, const sal_Int32 nDelLen,
         m_Text = m_Text.replaceAt(rStart.GetIndex(), nLen - 1, "");
         Update( rStart, nLen - 1, true );
 
-        OUString aTmpTxt( sInserted.copy(1) );
-        m_Text = m_Text.replaceAt(rStart.GetIndex(), 0, aTmpTxt);
-        Update( rStart, aTmpTxt.getLength(), false );
+        OUString aTmpText( sInserted.copy(1) );
+        m_Text = m_Text.replaceAt(rStart.GetIndex(), 0, aTmpText);
+        Update( rStart, aTmpText.getLength(), false );
     }
     else
     {
@@ -3493,15 +3493,15 @@ void SwTxtNode::ReplaceText( const SwIndex& rStart, const sal_Int32 nDelLen,
     }
 
     SetIgnoreDontExpand( bOldExpFlg );
-    SwDelTxt aDelHint( nStartPos, nDelLen );
+    SwDelText aDelHint( nStartPos, nDelLen );
     NotifyClients( 0, &aDelHint );
 
-    SwInsTxt aHint( nStartPos, sInserted.getLength() );
+    SwInsText aHint( nStartPos, sInserted.getLength() );
     NotifyClients( 0, &aHint );
 }
 
 namespace {
-    static void lcl_ResetParAttrs( SwTxtNode &rTxtNode )
+    static void lcl_ResetParAttrs( SwTextNode &rTextNode )
     {
         std::set<sal_uInt16> aAttrs;
         aAttrs.insert( aAttrs.end(), RES_PARATR_LIST_ID );
@@ -3509,10 +3509,10 @@ namespace {
         aAttrs.insert( aAttrs.end(), RES_PARATR_LIST_ISRESTART );
         aAttrs.insert( aAttrs.end(), RES_PARATR_LIST_RESTARTVALUE );
         aAttrs.insert( aAttrs.end(), RES_PARATR_LIST_ISCOUNTED );
-        SwPaM aPam( rTxtNode );
+        SwPaM aPam( rTextNode );
         // #i96644#
         // suppress side effect "send data changed events"
-        rTxtNode.GetDoc()->ResetAttrs( aPam, false, aAttrs, false );
+        rTextNode.GetDoc()->ResetAttrs( aPam, false, aAttrs, false );
     }
 
     // Helper method for special handling of modified attributes at text node.
@@ -3524,7 +3524,7 @@ namespace {
     // Same as (1).
     // (3) on changing the list style - RES_PARATR_NUMRULE:
     // Same as (1).
-    void HandleModifyAtTxtNode( SwTxtNode& rTxtNode,
+    void HandleModifyAtTextNode( SwTextNode& rTextNode,
                                 const SfxPoolItem* pOldValue,
                                 const SfxPoolItem* pNewValue )
     {
@@ -3539,27 +3539,27 @@ namespace {
             case RES_FMT_CHG:
             {
                 bParagraphStyleChanged = true;
-                if( rTxtNode.GetNodes().IsDocNodes() )
+                if( rTextNode.GetNodes().IsDocNodes() )
                 {
-                    const SwNumRule* pFormerNumRuleAtTxtNode =
-                        rTxtNode.GetNum() ? rTxtNode.GetNum()->GetNumRule() : 0;
-                    if ( pFormerNumRuleAtTxtNode )
+                    const SwNumRule* pFormerNumRuleAtTextNode =
+                        rTextNode.GetNum() ? rTextNode.GetNum()->GetNumRule() : 0;
+                    if ( pFormerNumRuleAtTextNode )
                     {
-                        sOldNumRule = pFormerNumRuleAtTxtNode->GetName();
+                        sOldNumRule = pFormerNumRuleAtTextNode->GetName();
                     }
-                    if ( rTxtNode.IsEmptyListStyleDueToSetOutlineLevelAttr() )
+                    if ( rTextNode.IsEmptyListStyleDueToSetOutlineLevelAttr() )
                     {
-                        const SwNumRuleItem& rNumRuleItem = rTxtNode.GetTxtColl()->GetNumRule();
+                        const SwNumRuleItem& rNumRuleItem = rTextNode.GetTextColl()->GetNumRule();
                         if ( !rNumRuleItem.GetValue().isEmpty() )
                         {
-                            rTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
+                            rTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
                         }
                     }
-                    const SwNumRule* pNumRuleAtTxtNode = rTxtNode.GetNumRule();
-                    if ( pNumRuleAtTxtNode )
+                    const SwNumRule* pNumRuleAtTextNode = rTextNode.GetNumRule();
+                    if ( pNumRuleAtTextNode )
                     {
                         bNumRuleSet = true;
-                        sNumRule = pNumRuleAtTxtNode->GetName();
+                        sNumRule = pNumRuleAtTextNode->GetName();
                     }
                 }
                 break;
@@ -3567,11 +3567,11 @@ namespace {
             case RES_ATTRSET_CHG:
             {
                 const SfxPoolItem* pItem = 0;
-                const SwNumRule* pFormerNumRuleAtTxtNode =
-                    rTxtNode.GetNum() ? rTxtNode.GetNum()->GetNumRule() : 0;
-                if ( pFormerNumRuleAtTxtNode )
+                const SwNumRule* pFormerNumRuleAtTextNode =
+                    rTextNode.GetNum() ? rTextNode.GetNum()->GetNumRule() : 0;
+                if ( pFormerNumRuleAtTextNode )
                 {
-                    sOldNumRule = pFormerNumRuleAtTxtNode->GetName();
+                    sOldNumRule = pFormerNumRuleAtTextNode->GetName();
                 }
 
                 const SwAttrSetChg* pSet = dynamic_cast<const SwAttrSetChg*>(pNewValue);
@@ -3579,41 +3579,41 @@ namespace {
                         SfxItemState::SET )
                 {
                     // #i70748#
-                    rTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
+                    rTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
                     bNumRuleSet = true;
                 }
                 // #i70748#
                 // The new list style set at the paragraph.
-                const SwNumRule* pNumRuleAtTxtNode = rTxtNode.GetNumRule();
-                if ( pNumRuleAtTxtNode )
+                const SwNumRule* pNumRuleAtTextNode = rTextNode.GetNumRule();
+                if ( pNumRuleAtTextNode )
                 {
-                    sNumRule = pNumRuleAtTxtNode->GetName();
+                    sNumRule = pNumRuleAtTextNode->GetName();
                 }
                 break;
             }
             case RES_PARATR_NUMRULE:
             {
-                if ( rTxtNode.GetNodes().IsDocNodes() )
+                if ( rTextNode.GetNodes().IsDocNodes() )
                 {
-                    const SwNumRule* pFormerNumRuleAtTxtNode =
-                        rTxtNode.GetNum() ? rTxtNode.GetNum()->GetNumRule() : 0;
-                    if ( pFormerNumRuleAtTxtNode )
+                    const SwNumRule* pFormerNumRuleAtTextNode =
+                        rTextNode.GetNum() ? rTextNode.GetNum()->GetNumRule() : 0;
+                    if ( pFormerNumRuleAtTextNode )
                     {
-                        sOldNumRule = pFormerNumRuleAtTxtNode->GetName();
+                        sOldNumRule = pFormerNumRuleAtTextNode->GetName();
                     }
 
                     if ( pNewValue )
                     {
                         // #i70748#
-                        rTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
+                        rTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
                         bNumRuleSet = true;
                     }
                     // #i70748#
                     // The new list style set at the paragraph.
-                    const SwNumRule* pNumRuleAtTxtNode = rTxtNode.GetNumRule();
-                    if ( pNumRuleAtTxtNode )
+                    const SwNumRule* pNumRuleAtTextNode = rTextNode.GetNumRule();
+                    if ( pNumRuleAtTextNode )
                     {
-                        sNumRule = pNumRuleAtTxtNode->GetName();
+                        sNumRule = pNumRuleAtTextNode->GetName();
                     }
                 }
                 break;
@@ -3625,69 +3625,69 @@ namespace {
             {
                 if (sNumRule.isEmpty())
                 {
-                    rTxtNode.RemoveFromList();
+                    rTextNode.RemoveFromList();
                     if ( bParagraphStyleChanged )
                     {
-                        lcl_ResetParAttrs(rTxtNode);
+                        lcl_ResetParAttrs(rTextNode);
                     }
                 }
                 else
                 {
-                    rTxtNode.RemoveFromList();
+                    rTextNode.RemoveFromList();
                     // If new list style is the outline style, apply outline
                     // level as the list level.
                     if (sNumRule==SwNumRule::GetOutlineRuleName())
                     {
                         // #i70748#
-                        OSL_ENSURE( rTxtNode.GetTxtColl()->IsAssignedToListLevelOfOutlineStyle(),
-                                "<HandleModifyAtTxtNode()> - text node with outline style, but its paragraph style is not assigned to outline style." );
+                        OSL_ENSURE( rTextNode.GetTextColl()->IsAssignedToListLevelOfOutlineStyle(),
+                                "<HandleModifyAtTextNode()> - text node with outline style, but its paragraph style is not assigned to outline style." );
                         const int nNewListLevel =
-                            rTxtNode.GetTxtColl()->GetAssignedOutlineStyleLevel();
+                            rTextNode.GetTextColl()->GetAssignedOutlineStyleLevel();
                         if ( 0 <= nNewListLevel && nNewListLevel < MAXLEVEL )
                         {
-                            rTxtNode.SetAttrListLevel( nNewListLevel );
+                            rTextNode.SetAttrListLevel( nNewListLevel );
                         }
                     }
-                    rTxtNode.AddToList();
+                    rTextNode.AddToList();
                 }
             }
             else // <sNumRule.Len() == 0 && sOldNumRule.Len() != 0>
             {
-                rTxtNode.RemoveFromList();
+                rTextNode.RemoveFromList();
                 if ( bParagraphStyleChanged )
                 {
-                    lcl_ResetParAttrs(rTxtNode);
+                    lcl_ResetParAttrs(rTextNode);
                     // #i70748#
-                    if ( dynamic_cast<const SfxUInt16Item &>(rTxtNode.GetAttr( RES_PARATR_OUTLINELEVEL, false )).GetValue() > 0 )
+                    if ( dynamic_cast<const SfxUInt16Item &>(rTextNode.GetAttr( RES_PARATR_OUTLINELEVEL, false )).GetValue() > 0 )
                     {
-                        rTxtNode.SetEmptyListStyleDueToSetOutlineLevelAttr();
+                        rTextNode.SetEmptyListStyleDueToSetOutlineLevelAttr();
                     }
                 }
             }
         }
-        else if (!sNumRule.isEmpty() && !rTxtNode.IsInList())
+        else if (!sNumRule.isEmpty() && !rTextNode.IsInList())
         {
-            rTxtNode.AddToList();
+            rTextNode.AddToList();
         }
     }
-    // End of method <HandleModifyAtTxtNode>
+    // End of method <HandleModifyAtTextNode>
 }
 
-void SwTxtNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
+void SwTextNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
 {
     bool bWasNotifiable = m_bNotifiable;
     m_bNotifiable = false;
 
     // Override Modify so that deleting styles works properly (outline
     // numbering!).
-    // Never call _ChgTxtCollUpdateNum for Nodes in Undo.
+    // Never call _ChgTextCollUpdateNum for Nodes in Undo.
     if( pOldValue && pNewValue && RES_FMT_CHG == pOldValue->Which() &&
-        GetRegisteredIn() == static_cast<const SwFmtChg*>(pNewValue)->pChangedFmt &&
+        GetRegisteredIn() == static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat &&
         GetNodes().IsDocNodes() )
     {
-        _ChgTxtCollUpdateNum(
-                        static_cast<const SwTxtFmtColl*>(static_cast<const SwFmtChg*>(pOldValue)->pChangedFmt),
-                        static_cast<const SwTxtFmtColl*>(static_cast<const SwFmtChg*>(pNewValue)->pChangedFmt) );
+        _ChgTextCollUpdateNum(
+                        static_cast<const SwTextFormatColl*>(static_cast<const SwFormatChg*>(pOldValue)->pChangedFormat),
+                        static_cast<const SwTextFormatColl*>(static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat) );
     }
 
     //UUUU reset fill information
@@ -3714,10 +3714,10 @@ void SwTxtNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVal
 
     if ( !mbInSetOrResetAttr )
     {
-        HandleModifyAtTxtNode( *this, pOldValue, pNewValue );
+        HandleModifyAtTextNode( *this, pOldValue, pNewValue );
     }
 
-    SwCntntNode::Modify( pOldValue, pNewValue );
+    SwContentNode::Modify( pOldValue, pNewValue );
 
     SwDoc * pDoc = GetDoc();
     // #125329# - assure that text node is in document nodes array
@@ -3735,24 +3735,24 @@ void SwTxtNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVal
     }
 }
 
-SwFmtColl* SwTxtNode::ChgFmtColl( SwFmtColl *pNewColl )
+SwFormatColl* SwTextNode::ChgFormatColl( SwFormatColl *pNewColl )
 {
-    OSL_ENSURE( pNewColl,"ChgFmtColl: Collectionpointer has value 0." );
-    OSL_ENSURE( HAS_BASE( SwTxtFmtColl, pNewColl ),
-                "ChgFmtColl: is not a Text Collection pointer." );
+    OSL_ENSURE( pNewColl,"ChgFormatColl: Collectionpointer has value 0." );
+    OSL_ENSURE( HAS_BASE( SwTextFormatColl, pNewColl ),
+                "ChgFormatColl: is not a Text Collection pointer." );
 
-    SwTxtFmtColl *pOldColl = GetTxtColl();
+    SwTextFormatColl *pOldColl = GetTextColl();
     if( pNewColl != pOldColl )
     {
         SetCalcHiddenCharFlags();
-        SwCntntNode::ChgFmtColl( pNewColl );
+        SwContentNode::ChgFormatColl( pNewColl );
         OSL_ENSURE( !mbInSetOrResetAttr,
-                "DEBUG OSL_ENSURE(ON - <SwTxtNode::ChgFmtColl(..)> called during <Set/ResetAttr(..)>" );
+                "DEBUG OSL_ENSURE(ON - <SwTextNode::ChgFormatColl(..)> called during <Set/ResetAttr(..)>" );
         if ( !mbInSetOrResetAttr )
         {
-            SwFmtChg aTmp1( pOldColl );
-            SwFmtChg aTmp2( pNewColl );
-            HandleModifyAtTxtNode( *this, &aTmp1, &aTmp2  );
+            SwFormatChg aTmp1( pOldColl );
+            SwFormatChg aTmp2( pNewColl );
+            HandleModifyAtTextNode( *this, &aTmp1, &aTmp2  );
         }
 
         //UUUU reset fill information on parent style change
@@ -3765,7 +3765,7 @@ SwFmtColl* SwTxtNode::ChgFmtColl( SwFmtColl *pNewColl )
     // nur wenn im normalen Nodes-Array
     if( GetNodes().IsDocNodes() )
     {
-        _ChgTxtCollUpdateNum( pOldColl, static_cast<SwTxtFmtColl *>(pNewColl) );
+        _ChgTextCollUpdateNum( pOldColl, static_cast<SwTextFormatColl *>(pNewColl) );
     }
 
     GetNodes().UpdateOutlineNode(*this);
@@ -3773,16 +3773,16 @@ SwFmtColl* SwTxtNode::ChgFmtColl( SwFmtColl *pNewColl )
     return pOldColl;
 }
 
-SwNodeNum* SwTxtNode::CreateNum() const
+SwNodeNum* SwTextNode::CreateNum() const
 {
     if ( !mpNodeNum )
     {
-        mpNodeNum = new SwNodeNum( const_cast<SwTxtNode*>(this) );
+        mpNodeNum = new SwNodeNum( const_cast<SwTextNode*>(this) );
     }
     return mpNodeNum;
 }
 
-SwNumberTree::tNumberVector SwTxtNode::GetNumberVector() const
+SwNumberTree::tNumberVector SwTextNode::GetNumberVector() const
 {
     if ( GetNum() )
     {
@@ -3795,7 +3795,7 @@ SwNumberTree::tNumberVector SwTxtNode::GetNumberVector() const
     }
 }
 
-bool SwTxtNode::IsOutline() const
+bool SwTextNode::IsOutline() const
 {
     bool bResult = false;
 
@@ -3815,22 +3815,22 @@ bool SwTxtNode::IsOutline() const
     return bResult;
 }
 
-bool SwTxtNode::IsOutlineStateChanged() const
+bool SwTextNode::IsOutlineStateChanged() const
 {
     return IsOutline() != m_bLastOutlineState;
 }
 
-void SwTxtNode::UpdateOutlineState()
+void SwTextNode::UpdateOutlineState()
 {
     m_bLastOutlineState = IsOutline();
 }
 
-int SwTxtNode::GetAttrOutlineLevel() const
+int SwTextNode::GetAttrOutlineLevel() const
 {
     return static_cast<const SfxUInt16Item &>(GetAttr(RES_PARATR_OUTLINELEVEL)).GetValue();
 }
 
-void SwTxtNode::SetAttrOutlineLevel(int nLevel)
+void SwTextNode::SetAttrOutlineLevel(int nLevel)
 {
     assert(0 <= nLevel && nLevel <= MAXLEVEL); // Level Out Of Range
     if ( 0 <= nLevel && nLevel <= MAXLEVEL )
@@ -3842,7 +3842,7 @@ void SwTxtNode::SetAttrOutlineLevel(int nLevel)
 
 // #i70748#
 
-void SwTxtNode::SetEmptyListStyleDueToSetOutlineLevelAttr()
+void SwTextNode::SetEmptyListStyleDueToSetOutlineLevelAttr()
 {
     if ( !mbEmptyListStyleSetDueToSetOutlineLevelAttr )
     {
@@ -3851,7 +3851,7 @@ void SwTxtNode::SetEmptyListStyleDueToSetOutlineLevelAttr()
     }
 }
 
-void SwTxtNode::ResetEmptyListStyleDueToResetOutlineLevelAttr()
+void SwTextNode::ResetEmptyListStyleDueToResetOutlineLevelAttr()
 {
     if ( mbEmptyListStyleSetDueToSetOutlineLevelAttr )
     {
@@ -3860,7 +3860,7 @@ void SwTxtNode::ResetEmptyListStyleDueToResetOutlineLevelAttr()
     }
 }
 
-void SwTxtNode::SetAttrListLevel( int nLevel )
+void SwTextNode::SetAttrListLevel( int nLevel )
 {
     if ( nLevel < 0 || nLevel >= MAXLEVEL )
     {
@@ -3873,13 +3873,13 @@ void SwTxtNode::SetAttrListLevel( int nLevel )
     SetAttr( aNewListLevelItem );
 }
 
-bool SwTxtNode::HasAttrListLevel() const
+bool SwTextNode::HasAttrListLevel() const
 {
     return GetpSwAttrSet() &&
            GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_LEVEL, false ) == SfxItemState::SET;
 }
 
-int SwTxtNode::GetAttrListLevel() const
+int SwTextNode::GetAttrListLevel() const
 {
     int nAttrListLevel = 0;
 
@@ -3890,12 +3890,12 @@ int SwTxtNode::GetAttrListLevel() const
     return nAttrListLevel;
 }
 
-int SwTxtNode::GetActualListLevel() const
+int SwTextNode::GetActualListLevel() const
 {
     return GetNum() ? GetNum()->GetLevelInListTree() : -1;
 }
 
-void SwTxtNode::SetListRestart( bool bRestart )
+void SwTextNode::SetListRestart( bool bRestart )
 {
     if ( !bRestart )
     {
@@ -3911,7 +3911,7 @@ void SwTxtNode::SetListRestart( bool bRestart )
     }
 }
 
-bool SwTxtNode::IsListRestart() const
+bool SwTextNode::IsListRestart() const
 {
     const SfxBoolItem& aIsRestartItem =
         dynamic_cast<const SfxBoolItem&>(GetAttr( RES_PARATR_LIST_ISRESTART ));
@@ -3923,7 +3923,7 @@ bool SwTxtNode::IsListRestart() const
     This includes all kinds of numbering/bullet/outlines.
     The concrete list label string has to be checked, too.
  */
-bool SwTxtNode::HasVisibleNumberingOrBullet() const
+bool SwTextNode::HasVisibleNumberingOrBullet() const
 {
     const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L;
     if ( pRule && IsCountedInList())
@@ -3931,15 +3931,15 @@ bool SwTxtNode::HasVisibleNumberingOrBullet() const
         // #i87154#
         // Correction of #newlistlevelattrs#:
         // The numbering type has to be checked for bullet lists.
-        const SwNumFmt& rFmt = pRule->Get( lcl_BoundListLevel(GetActualListLevel()) );
-        return SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType() ||
+        const SwNumFormat& rFormat = pRule->Get( lcl_BoundListLevel(GetActualListLevel()) );
+        return SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType() ||
                !pRule->MakeNumString( *(GetNum()) ).isEmpty();
     }
 
     return false;
 }
 
-void SwTxtNode::SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber nNumber )
+void SwTextNode::SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber nNumber )
 {
     const bool bChanged( HasAttrListRestartValue()
                          ? GetAttrListRestartValue() != nNumber
@@ -3960,22 +3960,22 @@ void SwTxtNode::SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber nNumber
     }
 }
 
-bool SwTxtNode::HasAttrListRestartValue() const
+bool SwTextNode::HasAttrListRestartValue() const
 {
     return GetpSwAttrSet() &&
            GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_RESTARTVALUE, false ) == SfxItemState::SET;
 }
-SwNumberTree::tSwNumTreeNumber SwTxtNode::GetAttrListRestartValue() const
+SwNumberTree::tSwNumTreeNumber SwTextNode::GetAttrListRestartValue() const
 {
     OSL_ENSURE( HasAttrListRestartValue(),
-            "<SwTxtNode::GetAttrListRestartValue()> - only ask for list restart value, if attribute is set at text node." );
+            "<SwTextNode::GetAttrListRestartValue()> - only ask for list restart value, if attribute is set at text node." );
 
     const SfxInt16Item& aListRestartValueItem =
         dynamic_cast<const SfxInt16Item&>(GetAttr( RES_PARATR_LIST_RESTARTVALUE ));
     return static_cast<SwNumberTree::tSwNumTreeNumber>(aListRestartValueItem.GetValue());
 }
 
-SwNumberTree::tSwNumTreeNumber SwTxtNode::GetActualListStartValue() const
+SwNumberTree::tSwNumTreeNumber SwTextNode::GetActualListStartValue() const
 {
     SwNumberTree::tSwNumTreeNumber nListRestartValue = 1;
 
@@ -3988,11 +3988,11 @@ SwNumberTree::tSwNumTreeNumber SwTxtNode::GetActualListStartValue() const
         SwNumRule* pRule = GetNumRule();
         if ( pRule )
         {
-            const SwNumFmt* pFmt =
-                    pRule->GetNumFmt( static_cast<sal_uInt16>(GetAttrListLevel()) );
-            if ( pFmt )
+            const SwNumFormat* pFormat =
+                    pRule->GetNumFormat( static_cast<sal_uInt16>(GetAttrListLevel()) );
+            if ( pFormat )
             {
-                nListRestartValue = pFmt->GetStart();
+                nListRestartValue = pFormat->GetStart();
             }
         }
     }
@@ -4000,12 +4000,12 @@ SwNumberTree::tSwNumTreeNumber SwTxtNode::GetActualListStartValue() const
     return nListRestartValue;
 }
 
-bool SwTxtNode::IsNotifiable() const
+bool SwTextNode::IsNotifiable() const
 {
     return m_bNotifiable && IsNotificationEnabled();
 }
 
-bool SwTxtNode::IsNotificationEnabled() const
+bool SwTextNode::IsNotificationEnabled() const
 {
     bool bResult = false;
     const SwDoc * pDoc = GetDoc();
@@ -4016,7 +4016,7 @@ bool SwTxtNode::IsNotificationEnabled() const
     return bResult;
 }
 
-void SwTxtNode::SetCountedInList( bool bCounted )
+void SwTextNode::SetCountedInList( bool bCounted )
 {
     if ( bCounted )
     {
@@ -4031,7 +4031,7 @@ void SwTxtNode::SetCountedInList( bool bCounted )
     }
 }
 
-bool SwTxtNode::IsCountedInList() const
+bool SwTextNode::IsCountedInList() const
 {
     const SfxBoolItem& aIsCountedInListItem =
         dynamic_cast<const SfxBoolItem&>(GetAttr( RES_PARATR_LIST_ISCOUNTED ));
@@ -4039,11 +4039,11 @@ bool SwTxtNode::IsCountedInList() const
     return aIsCountedInListItem.GetValue();
 }
 
-void SwTxtNode::AddToList()
+void SwTextNode::AddToList()
 {
     if ( IsInList() )
     {
-        OSL_FAIL( "<SwTxtNode::AddToList()> - the text node is already added to a list. Serious defect -> please inform OD" );
+        OSL_FAIL( "<SwTextNode::AddToList()> - the text node is already added to a list. Serious defect -> please inform OD" );
         return;
     }
 
@@ -4061,7 +4061,7 @@ void SwTxtNode::AddToList()
             }
         }
         OSL_ENSURE( pList != 0,
-                "<SwTxtNode::AddToList()> - no list for given list id. Serious defect -> please inform OD" );
+                "<SwTextNode::AddToList()> - no list for given list id. Serious defect -> please inform OD" );
         if ( pList )
         {
             pList->InsertListItem( *CreateNum(), GetAttrListLevel() );
@@ -4070,7 +4070,7 @@ void SwTxtNode::AddToList()
     }
 }
 
-void SwTxtNode::RemoveFromList()
+void SwTextNode::RemoveFromList()
 {
     if ( IsInList() )
     {
@@ -4083,12 +4083,12 @@ void SwTxtNode::RemoveFromList()
     }
 }
 
-bool SwTxtNode::IsInList() const
+bool SwTextNode::IsInList() const
 {
     return GetNum() != 0 && GetNum()->GetParent() != 0;
 }
 
-bool SwTxtNode::IsFirstOfNumRule() const
+bool SwTextNode::IsFirstOfNumRule() const
 {
     bool bResult = false;
 
@@ -4098,7 +4098,7 @@ bool SwTxtNode::IsFirstOfNumRule() const
     return bResult;
 }
 
-void SwTxtNode::SetListId(OUString const& rListId)
+void SwTextNode::SetListId(OUString const& rListId)
 {
     const SfxStringItem& rListIdItem =
             dynamic_cast<const SfxStringItem&>(GetAttr( RES_PARATR_LIST_ID ));
@@ -4116,7 +4116,7 @@ void SwTxtNode::SetListId(OUString const& rListId)
     }
 }
 
-OUString SwTxtNode::GetListId() const
+OUString SwTextNode::GetListId() const
 {
     OUString sListId;
 
@@ -4152,7 +4152,7 @@ OUString SwTxtNode::GetListId() const
 
     @return boolean
 */
-bool SwTxtNode::AreListLevelIndentsApplicable() const
+bool SwTextNode::AreListLevelIndentsApplicable() const
 {
     bool bAreListLevelIndentsApplicable( true );
 
@@ -4180,7 +4180,7 @@ bool SwTxtNode::AreListLevelIndentsApplicable() const
         // paragraph has no hard-set indent attributes
 
         // check, paragraph's
-        const SwTxtFmtColl* pColl = GetTxtColl();
+        const SwTextFormatColl* pColl = GetTextColl();
         while ( pColl )
         {
             if ( pColl->GetAttrSet().GetItemState( RES_LR_SPACE, false ) == SfxItemState::SET )
@@ -4198,9 +4198,9 @@ bool SwTxtNode::AreListLevelIndentsApplicable() const
                 break;
             }
 
-            pColl = dynamic_cast<const SwTxtFmtColl*>(pColl->DerivedFrom());
+            pColl = dynamic_cast<const SwTextFormatColl*>(pColl->DerivedFrom());
             OSL_ENSURE( pColl,
-                    "<SwTxtNode::AreListLevelIndentsApplicable()> - something wrong in paragraph's style hierarchy. The applied list style is not found." );
+                    "<SwTextNode::AreListLevelIndentsApplicable()> - something wrong in paragraph's style hierarchy. The applied list style is not found." );
         }
     }
 
@@ -4215,19 +4215,19 @@ bool SwTxtNode::AreListLevelIndentsApplicable() const
 
     @return boolean - indicating, if a list tab stop position is provided
 */
-bool SwTxtNode::GetListTabStopPosition( long& nListTabStopPosition ) const
+bool SwTextNode::GetListTabStopPosition( long& nListTabStopPosition ) const
 {
     bool bListTanStopPositionProvided( false );
 
     const SwNumRule* pNumRule = GetNum() ? GetNum()->GetNumRule() : 0;
     if ( pNumRule && HasVisibleNumberingOrBullet() && GetActualListLevel() >= 0 )
     {
-        const SwNumFmt& rFmt = pNumRule->Get( static_cast<sal_uInt16>(GetActualListLevel()) );
-        if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT &&
-             rFmt.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
+        const SwNumFormat& rFormat = pNumRule->Get( static_cast<sal_uInt16>(GetActualListLevel()) );
+        if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT &&
+             rFormat.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
         {
             bListTanStopPositionProvided = true;
-            nListTabStopPosition = rFmt.GetListtabPos();
+            nListTabStopPosition = rFormat.GetListtabPos();
 
             if ( getIDocumentSettingAccess()->get(DocumentSettingId::TABS_RELATIVE_TO_INDENT) )
             {
@@ -4235,12 +4235,12 @@ bool SwTxtNode::GetListTabStopPosition( long& nListTabStopPosition ) const
                 // indent value of the paragraph. Thus, adjust <nListTabStopPos>.
                 if ( AreListLevelIndentsApplicable() )
                 {
-                    nListTabStopPosition -= rFmt.GetIndentAt();
+                    nListTabStopPosition -= rFormat.GetIndentAt();
                 }
                 else if (!getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING))
                 {
                     SvxLRSpaceItem aItem = GetSwAttrSet().GetLRSpace();
-                    nListTabStopPosition -= aItem.GetTxtLeft();
+                    nListTabStopPosition -= aItem.GetTextLeft();
                 }
             }
         }
@@ -4249,15 +4249,15 @@ bool SwTxtNode::GetListTabStopPosition( long& nListTabStopPosition ) const
     return bListTanStopPositionProvided;
 }
 
-OUString SwTxtNode::GetLabelFollowedBy() const
+OUString SwTextNode::GetLabelFollowedBy() const
 {
     const SwNumRule* pNumRule = GetNum() ? GetNum()->GetNumRule() : 0;
     if ( pNumRule && HasVisibleNumberingOrBullet() && GetActualListLevel() >= 0 )
     {
-        const SwNumFmt& rFmt = pNumRule->Get( static_cast<sal_uInt16>(GetActualListLevel()) );
-        if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+        const SwNumFormat& rFormat = pNumRule->Get( static_cast<sal_uInt16>(GetActualListLevel()) );
+        if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
         {
-            switch ( rFmt.GetLabelFollowedBy() )
+            switch ( rFormat.GetLabelFollowedBy() )
             {
                 case SvxNumberFormat::LISTTAB:
                 {
@@ -4276,7 +4276,7 @@ OUString SwTxtNode::GetLabelFollowedBy() const
                 break;
                 default:
                 {
-                    OSL_FAIL( "<SwTxtNode::GetLabelFollowedBy()> - unknown SvxNumberFormat::GetLabelFollowedBy() return value" );
+                    OSL_FAIL( "<SwTextNode::GetLabelFollowedBy()> - unknown SvxNumberFormat::GetLabelFollowedBy() return value" );
                 }
             }
         }
@@ -4285,7 +4285,7 @@ OUString SwTxtNode::GetLabelFollowedBy() const
     return OUString();
 }
 
-void SwTxtNode::CalcHiddenCharFlags() const
+void SwTextNode::CalcHiddenCharFlags() const
 {
     sal_Int32 nStartPos;
     sal_Int32 nEndPos;
@@ -4294,7 +4294,7 @@ void SwTxtNode::CalcHiddenCharFlags() const
 }
 
 // #i12836# enhanced pdf export
-bool SwTxtNode::IsHidden() const
+bool SwTextNode::IsHidden() const
 {
     if ( HasHiddenParaField() || HasHiddenCharAttribute( true ) )
         return true;
@@ -4334,18 +4334,18 @@ namespace {
     // (6) Notify list tree, if count in list - RES_PARATR_LIST_ISCOUNTED - is set
     //     and changed after the attributes have been set
     // (7) Set or Reset emtpy list style due to changed outline level - RES_PARATR_OUTLINELEVEL.
-    class HandleSetAttrAtTxtNode
+    class HandleSetAttrAtTextNode
     {
         public:
-            HandleSetAttrAtTxtNode( SwTxtNode& rTxtNode,
+            HandleSetAttrAtTextNode( SwTextNode& rTextNode,
                                     const SfxPoolItem& pItem );
-            HandleSetAttrAtTxtNode( SwTxtNode& rTxtNode,
+            HandleSetAttrAtTextNode( SwTextNode& rTextNode,
                                     const SfxItemSet& rItemSet );
-            ~HandleSetAttrAtTxtNode();
+            ~HandleSetAttrAtTextNode();
 
         private:
-            SwTxtNode& mrTxtNode;
-            bool mbAddTxtNodeToList;
+            SwTextNode& mrTextNode;
+            bool mbAddTextNodeToList;
             bool mbUpdateListLevel;
             bool mbUpdateListRestart;
             bool mbUpdateListCount;
@@ -4353,10 +4353,10 @@ namespace {
             bool mbOutlineLevelSet;
     };
 
-    HandleSetAttrAtTxtNode::HandleSetAttrAtTxtNode( SwTxtNode& rTxtNode,
+    HandleSetAttrAtTextNode::HandleSetAttrAtTextNode( SwTextNode& rTextNode,
                                                     const SfxPoolItem& pItem )
-        : mrTxtNode( rTxtNode ),
-          mbAddTxtNodeToList( false ),
+        : mrTextNode( rTextNode ),
+          mbAddTextNodeToList( false ),
           mbUpdateListLevel( false ),
           mbUpdateListRestart( false ),
           mbUpdateListCount( false ),
@@ -4368,16 +4368,16 @@ namespace {
             // handle RES_PARATR_NUMRULE
             case RES_PARATR_NUMRULE:
             {
-                mrTxtNode.RemoveFromList();
+                mrTextNode.RemoveFromList();
 
                 const SwNumRuleItem& pNumRuleItem =
                                 dynamic_cast<const SwNumRuleItem&>(pItem);
                 if ( !pNumRuleItem.GetValue().isEmpty() )
                 {
-                    mbAddTxtNodeToList = true;
+                    mbAddTextNodeToList = true;
                     // #i105562#
 
-                    mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
+                    mrTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
                 }
             }
             break;
@@ -4388,14 +4388,14 @@ namespace {
                 const SfxStringItem& pListIdItem =
                                         dynamic_cast<const SfxStringItem&>(pItem);
                 OSL_ENSURE( pListIdItem.GetValue().getLength() > 0,
-                        "<HandleSetAttrAtTxtNode(..)> - empty list id attribute not excepted. Serious defect -> please inform OD." );
-                const OUString sListIdOfTxtNode = rTxtNode.GetListId();
-                if ( pListIdItem.GetValue() != sListIdOfTxtNode )
+                        "<HandleSetAttrAtTextNode(..)> - empty list id attribute not excepted. Serious defect -> please inform OD." );
+                const OUString sListIdOfTextNode = rTextNode.GetListId();
+                if ( pListIdItem.GetValue() != sListIdOfTextNode )
                 {
-                    mbAddTxtNodeToList = true;
-                    if ( mrTxtNode.IsInList() )
+                    mbAddTextNodeToList = true;
+                    if ( mrTextNode.IsInList() )
                     {
-                        mrTxtNode.RemoveFromList();
+                        mrTextNode.RemoveFromList();
                     }
                 }
             }
@@ -4406,7 +4406,7 @@ namespace {
             {
                 const SfxInt16Item& aListLevelItem =
                                     dynamic_cast<const SfxInt16Item&>(pItem);
-                if ( aListLevelItem.GetValue() != mrTxtNode.GetAttrListLevel() )
+                if ( aListLevelItem.GetValue() != mrTextNode.GetAttrListLevel() )
                 {
                     mbUpdateListLevel = true;
                 }
@@ -4419,7 +4419,7 @@ namespace {
                 const SfxBoolItem& aListIsRestartItem =
                                     dynamic_cast<const SfxBoolItem&>(pItem);
                 if ( aListIsRestartItem.GetValue() !=
-                                    mrTxtNode.IsListRestart() )
+                                    mrTextNode.IsListRestart() )
                 {
                     mbUpdateListRestart = true;
                 }
@@ -4431,8 +4431,8 @@ namespace {
             {
                 const SfxInt16Item& aListRestartValueItem =
                                     dynamic_cast<const SfxInt16Item&>(pItem);
-                if ( !mrTxtNode.HasAttrListRestartValue() ||
-                     aListRestartValueItem.GetValue() != mrTxtNode.GetAttrListRestartValue() )
+                if ( !mrTextNode.HasAttrListRestartValue() ||
+                     aListRestartValueItem.GetValue() != mrTextNode.GetAttrListRestartValue() )
                 {
                     mbUpdateListRestart = true;
                 }
@@ -4445,7 +4445,7 @@ namespace {
                 const SfxBoolItem& aIsCountedInListItem =
                                     dynamic_cast<const SfxBoolItem&>(pItem);
                 if ( aIsCountedInListItem.GetValue() !=
-                                    mrTxtNode.IsCountedInList() )
+                                    mrTextNode.IsCountedInList() )
                 {
                     mbUpdateListCount = true;
                 }
@@ -4458,7 +4458,7 @@ namespace {
             {
                 const SfxUInt16Item& aOutlineLevelItem =
                                     dynamic_cast<const SfxUInt16Item&>(pItem);
-                if ( aOutlineLevelItem.GetValue() != mrTxtNode.GetAttrOutlineLevel() )
+                if ( aOutlineLevelItem.GetValue() != mrTextNode.GetAttrOutlineLevel() )
                 {
                     mbOutlineLevelSet = true;
                 }
@@ -4468,10 +4468,10 @@ namespace {
 
     }
 
-    HandleSetAttrAtTxtNode::HandleSetAttrAtTxtNode( SwTxtNode& rTxtNode,
+    HandleSetAttrAtTextNode::HandleSetAttrAtTextNode( SwTextNode& rTextNode,
                                                     const SfxItemSet& rItemSet )
-        : mrTxtNode( rTxtNode ),
-          mbAddTxtNodeToList( false ),
+        : mrTextNode( rTextNode ),
+          mbAddTextNodeToList( false ),
           mbUpdateListLevel( false ),
           mbUpdateListRestart( false ),
           mbUpdateListCount( false ),
@@ -4482,15 +4482,15 @@ namespace {
         // handle RES_PARATR_NUMRULE
         if ( rItemSet.GetItemState( RES_PARATR_NUMRULE, false, &pItem ) == SfxItemState::SET )
         {
-            mrTxtNode.RemoveFromList();
+            mrTextNode.RemoveFromList();
 
             const SwNumRuleItem* pNumRuleItem =
                             dynamic_cast<const SwNumRuleItem*>(pItem);
             if ( !pNumRuleItem->GetValue().isEmpty() )
             {
-                mbAddTxtNodeToList = true;
+                mbAddTextNodeToList = true;
                 // #i70748#
-                mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
+                mrTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
             }
         }
 
@@ -4499,14 +4499,14 @@ namespace {
         {
             const SfxStringItem* pListIdItem =
                                     dynamic_cast<const SfxStringItem*>(pItem);
-            const OUString sListIdOfTxtNode = mrTxtNode.GetListId();
+            const OUString sListIdOfTextNode = mrTextNode.GetListId();
             if ( pListIdItem &&
-                 pListIdItem->GetValue() != sListIdOfTxtNode )
+                 pListIdItem->GetValue() != sListIdOfTextNode )
             {
-                mbAddTxtNodeToList = true;
-                if ( mrTxtNode.IsInList() )
+                mbAddTextNodeToList = true;
+                if ( mrTextNode.IsInList() )
                 {
-                    mrTxtNode.RemoveFromList();
+                    mrTextNode.RemoveFromList();
                 }
             }
         }
@@ -4516,7 +4516,7 @@ namespace {
         {
             const SfxInt16Item* pListLevelItem =
                                 dynamic_cast<const SfxInt16Item*>(pItem);
-            if (pListLevelItem && pListLevelItem->GetValue() != mrTxtNode.GetAttrListLevel())
+            if (pListLevelItem && pListLevelItem->GetValue() != mrTextNode.GetAttrListLevel())
             {
                 mbUpdateListLevel = true;
             }
@@ -4527,7 +4527,7 @@ namespace {
         {
             const SfxBoolItem* pListIsRestartItem =
                                 dynamic_cast<const SfxBoolItem*>(pItem);
-            if (pListIsRestartItem && pListIsRestartItem->GetValue() != mrTxtNode.IsListRestart())
+            if (pListIsRestartItem && pListIsRestartItem->GetValue() != mrTextNode.IsListRestart())
             {
                 mbUpdateListRestart = true;
             }
@@ -4538,8 +4538,8 @@ namespace {
         {
             const SfxInt16Item* pListRestartValueItem =
                                 dynamic_cast<const SfxInt16Item*>(pItem);
-            if ( !mrTxtNode.HasAttrListRestartValue() || (pListRestartValueItem &&
-                 pListRestartValueItem->GetValue() != mrTxtNode.GetAttrListRestartValue()) )
+            if ( !mrTextNode.HasAttrListRestartValue() || (pListRestartValueItem &&
+                 pListRestartValueItem->GetValue() != mrTextNode.GetAttrListRestartValue()) )
             {
                 mbUpdateListRestart = true;
             }
@@ -4551,7 +4551,7 @@ namespace {
             const SfxBoolItem* pIsCountedInListItem =
                                 dynamic_cast<const SfxBoolItem*>(pItem);
             if (pIsCountedInListItem && pIsCountedInListItem->GetValue() !=
-                mrTxtNode.IsCountedInList())
+                mrTextNode.IsCountedInList())
             {
                 mbUpdateListCount = true;
             }
@@ -4564,89 +4564,89 @@ namespace {
             const SfxUInt16Item* pOutlineLevelItem =
                                 dynamic_cast<const SfxUInt16Item*>(pItem);
             if (pOutlineLevelItem && pOutlineLevelItem->GetValue() !=
-                mrTxtNode.GetAttrOutlineLevel())
+                mrTextNode.GetAttrOutlineLevel())
             {
                 mbOutlineLevelSet = true;
             }
         }
     }
 
-    HandleSetAttrAtTxtNode::~HandleSetAttrAtTxtNode()
+    HandleSetAttrAtTextNode::~HandleSetAttrAtTextNode()
     {
-        if ( mbAddTxtNodeToList )
+        if ( mbAddTextNodeToList )
         {
-            SwNumRule* pNumRuleAtTxtNode = mrTxtNode.GetNumRule();
-            if ( pNumRuleAtTxtNode )
+            SwNumRule* pNumRuleAtTextNode = mrTextNode.GetNumRule();
+            if ( pNumRuleAtTextNode )
             {
-                mrTxtNode.AddToList();
+                mrTextNode.AddToList();
             }
         }
         else
         {
-            if ( mbUpdateListLevel && mrTxtNode.IsInList() )
+            if ( mbUpdateListLevel && mrTextNode.IsInList() )
             {
-                const_cast<SwNodeNum*>(mrTxtNode.GetNum())->SetLevelInListTree(
-                                                    mrTxtNode.GetAttrListLevel() );
+                const_cast<SwNodeNum*>(mrTextNode.GetNum())->SetLevelInListTree(
+                                                    mrTextNode.GetAttrListLevel() );
             }
 
-            if ( mbUpdateListRestart && mrTxtNode.IsInList() )
+            if ( mbUpdateListRestart && mrTextNode.IsInList() )
             {
-                SwNodeNum* pNodeNum = const_cast<SwNodeNum*>(mrTxtNode.GetNum());
+                SwNodeNum* pNodeNum = const_cast<SwNodeNum*>(mrTextNode.GetNum());
                 pNodeNum->InvalidateMe();
                 pNodeNum->NotifyInvalidSiblings();
             }
 
-            if ( mbUpdateListCount && mrTxtNode.IsInList() )
+            if ( mbUpdateListCount && mrTextNode.IsInList() )
             {
-                const_cast<SwNodeNum*>(mrTxtNode.GetNum())->InvalidateAndNotifyTree();
+                const_cast<SwNodeNum*>(mrTextNode.GetNum())->InvalidateAndNotifyTree();
             }
         }
 
         // #i70748#
         if (mbOutlineLevelSet)
         {
-            mrTxtNode.GetNodes().UpdateOutlineNode(mrTxtNode);
-            if (mrTxtNode.GetAttrOutlineLevel() == 0)
+            mrTextNode.GetNodes().UpdateOutlineNode(mrTextNode);
+            if (mrTextNode.GetAttrOutlineLevel() == 0)
             {
-                mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
+                mrTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
             }
             else
             {
                 const SfxPoolItem* pItem = 0;
-                if ( mrTxtNode.GetSwAttrSet().GetItemState( RES_PARATR_NUMRULE,
+                if ( mrTextNode.GetSwAttrSet().GetItemState( RES_PARATR_NUMRULE,
                                                             true, &pItem )
                                                                 != SfxItemState::SET )
                 {
-                    mrTxtNode.SetEmptyListStyleDueToSetOutlineLevelAttr();
+                    mrTextNode.SetEmptyListStyleDueToSetOutlineLevelAttr();
                 }
             }
         }
     }
-    // End of class <HandleSetAttrAtTxtNode>
+    // End of class <HandleSetAttrAtTextNode>
 }
 
-bool SwTxtNode::SetAttr( const SfxPoolItem& pItem )
+bool SwTextNode::SetAttr( const SfxPoolItem& pItem )
 {
     const bool bOldIsSetOrResetAttr( mbInSetOrResetAttr );
     mbInSetOrResetAttr = true;
 
-    HandleSetAttrAtTxtNode aHandleSetAttr( *this, pItem );
+    HandleSetAttrAtTextNode aHandleSetAttr( *this, pItem );
 
-    bool bRet = SwCntntNode::SetAttr( pItem );
+    bool bRet = SwContentNode::SetAttr( pItem );
 
     mbInSetOrResetAttr = bOldIsSetOrResetAttr;
 
     return bRet;
 }
 
-bool SwTxtNode::SetAttr( const SfxItemSet& rSet )
+bool SwTextNode::SetAttr( const SfxItemSet& rSet )
 {
     const bool bOldIsSetOrResetAttr( mbInSetOrResetAttr );
     mbInSetOrResetAttr = true;
 
-    HandleSetAttrAtTxtNode aHandleSetAttr( *this, rSet );
+    HandleSetAttrAtTextNode aHandleSetAttr( *this, rSet );
 
-    bool bRet = SwCntntNode::SetAttr( rSet );
+    bool bRet = SwContentNode::SetAttr( rSet );
 
     mbInSetOrResetAttr = bOldIsSetOrResetAttr;
 
@@ -4670,30 +4670,30 @@ namespace {
     // (5) Notify list tree, if list restart value - RES_PARATR_LIST_RESTARTVALUE - is reset.
     // (6) Notify list tree, if count in list - RES_PARATR_LIST_ISCOUNTED - is reset.
     // (7) Reset empty list style, if outline level attribute - RES_PARATR_OUTLINELEVEL - is reset.
-    class HandleResetAttrAtTxtNode
+    class HandleResetAttrAtTextNode
     {
         public:
-            HandleResetAttrAtTxtNode( SwTxtNode& rTxtNode,
+            HandleResetAttrAtTextNode( SwTextNode& rTextNode,
                                       const sal_uInt16 nWhich1,
                                       const sal_uInt16 nWhich2 );
-            HandleResetAttrAtTxtNode( SwTxtNode& rTxtNode,
+            HandleResetAttrAtTextNode( SwTextNode& rTextNode,
                                       const std::vector<sal_uInt16>& rWhichArr );
-            HandleResetAttrAtTxtNode( SwTxtNode& rTxtNode );
+            HandleResetAttrAtTextNode( SwTextNode& rTextNode );
 
-            ~HandleResetAttrAtTxtNode();
+            ~HandleResetAttrAtTextNode();
 
         private:
-            SwTxtNode& mrTxtNode;
+            SwTextNode& mrTextNode;
             bool mbListStyleOrIdReset;
             bool mbUpdateListLevel;
             bool mbUpdateListRestart;
             bool mbUpdateListCount;
     };
 
-    HandleResetAttrAtTxtNode::HandleResetAttrAtTxtNode( SwTxtNode& rTxtNode,
+    HandleResetAttrAtTextNode::HandleResetAttrAtTextNode( SwTextNode& rTextNode,
                                                         const sal_uInt16 nWhich1,
                                                         const sal_uInt16 nWhich2 )
-        : mrTxtNode( rTxtNode ),
+        : mrTextNode( rTextNode ),
           mbListStyleOrIdReset( false ),
           mbUpdateListLevel( false ),
           mbUpdateListRestart( false ),
@@ -4705,13 +4705,13 @@ namespace {
             // RES_PARATR_NUMRULE and RES_PARATR_LIST_ID
             if ( nWhich1 <= RES_PARATR_NUMRULE && RES_PARATR_NUMRULE <= nWhich2 )
             {
-                bRemoveFromList = mrTxtNode.GetNumRule() != 0;
+                bRemoveFromList = mrTextNode.GetNumRule() != 0;
                 mbListStyleOrIdReset = true;
             }
             else if ( nWhich1 <= RES_PARATR_LIST_ID && RES_PARATR_LIST_ID <= nWhich2 )
             {
-                bRemoveFromList = mrTxtNode.GetpSwAttrSet() &&
-                    mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, false ) == SfxItemState::SET;
+                bRemoveFromList = mrTextNode.GetpSwAttrSet() &&
+                    mrTextNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, false ) == SfxItemState::SET;
                 // #i92898#
                 mbListStyleOrIdReset = true;
             }
@@ -4721,26 +4721,26 @@ namespace {
                 // RES_PARATR_LIST_LEVEL
                 mbUpdateListLevel = ( nWhich1 <= RES_PARATR_LIST_LEVEL &&
                                       RES_PARATR_LIST_LEVEL <= nWhich2 &&
-                                      mrTxtNode.HasAttrListLevel() );
+                                      mrTextNode.HasAttrListLevel() );
 
                 // RES_PARATR_LIST_ISRESTART and RES_PARATR_LIST_RESTARTVALUE
                 mbUpdateListRestart =
                     ( nWhich1 <= RES_PARATR_LIST_ISRESTART && RES_PARATR_LIST_ISRESTART <= nWhich2 &&
-                      mrTxtNode.IsListRestart() ) ||
+                      mrTextNode.IsListRestart() ) ||
                     ( nWhich1 <= RES_PARATR_LIST_RESTARTVALUE && RES_PARATR_LIST_RESTARTVALUE <= nWhich2 &&
-                      mrTxtNode.HasAttrListRestartValue() );
+                      mrTextNode.HasAttrListRestartValue() );
 
                 // RES_PARATR_LIST_ISCOUNTED
                 mbUpdateListCount =
                     ( nWhich1 <= RES_PARATR_LIST_ISCOUNTED && RES_PARATR_LIST_ISCOUNTED <= nWhich2 &&
-                      !mrTxtNode.IsCountedInList() );
+                      !mrTextNode.IsCountedInList() );
             }
 
             // #i70748#
             // RES_PARATR_OUTLINELEVEL
             if ( nWhich1 <= RES_PARATR_OUTLINELEVEL && RES_PARATR_OUTLINELEVEL <= nWhich2 )
             {
-                mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
+                mrTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
             }
         }
         else
@@ -4748,13 +4748,13 @@ namespace {
             // RES_PARATR_NUMRULE and RES_PARATR_LIST_ID
             if ( nWhich1 == RES_PARATR_NUMRULE )
             {
-                bRemoveFromList = mrTxtNode.GetNumRule() != 0;
+                bRemoveFromList = mrTextNode.GetNumRule() != 0;
                 mbListStyleOrIdReset = true;
             }
             else if ( nWhich1 == RES_PARATR_LIST_ID )
             {
-                bRemoveFromList = mrTxtNode.GetpSwAttrSet() &&
-                    mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, false ) == SfxItemState::SET;
+                bRemoveFromList = mrTextNode.GetpSwAttrSet() &&
+                    mrTextNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, false ) == SfxItemState::SET;
                 // #i92898#
                 mbListStyleOrIdReset = true;
             }
@@ -4762,36 +4762,36 @@ namespace {
             // RES_PARATR_OUTLINELEVEL
             else if ( nWhich1 == RES_PARATR_OUTLINELEVEL )
             {
-                mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
+                mrTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
             }
 
             if ( !bRemoveFromList )
             {
                 // RES_PARATR_LIST_LEVEL
                 mbUpdateListLevel = nWhich1 == RES_PARATR_LIST_LEVEL &&
-                                    mrTxtNode.HasAttrListLevel();
+                                    mrTextNode.HasAttrListLevel();
 
                 // RES_PARATR_LIST_ISRESTART and RES_PARATR_LIST_RESTARTVALUE
                 mbUpdateListRestart = ( nWhich1 == RES_PARATR_LIST_ISRESTART &&
-                                        mrTxtNode.IsListRestart() ) ||
+                                        mrTextNode.IsListRestart() ) ||
                                       ( nWhich1 == RES_PARATR_LIST_RESTARTVALUE &&
-                                        mrTxtNode.HasAttrListRestartValue() );
+                                        mrTextNode.HasAttrListRestartValue() );
 
                 // RES_PARATR_LIST_ISCOUNTED
                 mbUpdateListCount = nWhich1 == RES_PARATR_LIST_ISCOUNTED &&
-                                    !mrTxtNode.IsCountedInList();
+                                    !mrTextNode.IsCountedInList();
             }
         }
 
-        if ( bRemoveFromList && mrTxtNode.IsInList() )
+        if ( bRemoveFromList && mrTextNode.IsInList() )
         {
-            mrTxtNode.RemoveFromList();
+            mrTextNode.RemoveFromList();
         }
     }
 
-    HandleResetAttrAtTxtNode::HandleResetAttrAtTxtNode( SwTxtNode& rTxtNode,
+    HandleResetAttrAtTextNode::HandleResetAttrAtTextNode( SwTextNode& rTextNode,
                                                         const std::vector<sal_uInt16>& rWhichArr )
-        : mrTxtNode( rTxtNode ),
+        : mrTextNode( rTextNode ),
           mbListStyleOrIdReset( false ),
           mbUpdateListLevel( false ),
           mbUpdateListRestart( false ),
@@ -4806,14 +4806,14 @@ namespace {
                 if ( *it == RES_PARATR_NUMRULE )
                 {
                     bRemoveFromList = bRemoveFromList ||
-                                      mrTxtNode.GetNumRule() != 0;
+                                      mrTextNode.GetNumRule() != 0;
                     mbListStyleOrIdReset = true;
                 }
                 else if ( *it == RES_PARATR_LIST_ID )
                 {
                     bRemoveFromList = bRemoveFromList ||
-                        ( mrTxtNode.GetpSwAttrSet() &&
-                          mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, false ) == SfxItemState::SET );
+                        ( mrTextNode.GetpSwAttrSet() &&
+                          mrTextNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, false ) == SfxItemState::SET );
                     // #i92898#
                     mbListStyleOrIdReset = true;
                 }
@@ -4821,7 +4821,7 @@ namespace {
                 // RES_PARATR_OUTLINELEVEL
                 else if ( *it == RES_PARATR_OUTLINELEVEL )
                 {
-                    mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
+                    mrTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
                 }
 
                 if ( !bRemoveFromList )
@@ -4829,161 +4829,161 @@ namespace {
                     // RES_PARATR_LIST_LEVEL
                     mbUpdateListLevel = mbUpdateListLevel ||
                                         ( *it == RES_PARATR_LIST_LEVEL &&
-                                          mrTxtNode.HasAttrListLevel() );
+                                          mrTextNode.HasAttrListLevel() );
 
                     // RES_PARATR_LIST_ISRESTART and RES_PARATR_LIST_RESTARTVALUE
                     mbUpdateListRestart = mbUpdateListRestart ||
                                           ( *it == RES_PARATR_LIST_ISRESTART &&
-                                            mrTxtNode.IsListRestart() ) ||
+                                            mrTextNode.IsListRestart() ) ||
                                           ( *it == RES_PARATR_LIST_RESTARTVALUE &&
-                                            mrTxtNode.HasAttrListRestartValue() );
+                                            mrTextNode.HasAttrListRestartValue() );
 
                     // RES_PARATR_LIST_ISCOUNTED
                     mbUpdateListCount = mbUpdateListCount ||
                                         ( *it == RES_PARATR_LIST_ISCOUNTED &&
-                                          !mrTxtNode.IsCountedInList() );
+                                          !mrTextNode.IsCountedInList() );
                 }
             }
         }
 
-        if ( bRemoveFromList && mrTxtNode.IsInList() )
+        if ( bRemoveFromList && mrTextNode.IsInList() )
         {
-            mrTxtNode.RemoveFromList();
+            mrTextNode.RemoveFromList();
         }
     }
 
-    HandleResetAttrAtTxtNode::HandleResetAttrAtTxtNode( SwTxtNode& rTxtNode )
-        : mrTxtNode( rTxtNode ),
+    HandleResetAttrAtTextNode::HandleResetAttrAtTextNode( SwTextNode& rTextNode )
+        : mrTextNode( rTextNode ),
           mbListStyleOrIdReset( false ),
           mbUpdateListLevel( false ),
           mbUpdateListRestart( false ),
           mbUpdateListCount( false )
     {
         mbListStyleOrIdReset = true;
-        if ( rTxtNode.IsInList() )
+        if ( rTextNode.IsInList() )
         {
-            rTxtNode.RemoveFromList();
+            rTextNode.RemoveFromList();
         }
         // #i70748#
-        mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
+        mrTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
     }
 
-    HandleResetAttrAtTxtNode::~HandleResetAttrAtTxtNode()
+    HandleResetAttrAtTextNode::~HandleResetAttrAtTextNode()
     {
-        if ( mbListStyleOrIdReset && !mrTxtNode.IsInList() )
+        if ( mbListStyleOrIdReset && !mrTextNode.IsInList() )
         {
             // check, if in spite of the reset of the list style or the list id
             // the paragraph still has to be added to a list.
-            if (mrTxtNode.GetNumRule() && !mrTxtNode.GetListId().isEmpty())
+            if (mrTextNode.GetNumRule() && !mrTextNode.GetListId().isEmpty())
             {
                 // #i96062#
                 // If paragraph has no list level attribute set and list style
                 // is the outline style, apply outline level as the list level.
-                if ( !mrTxtNode.HasAttrListLevel() &&
-                     mrTxtNode.GetNumRule()->GetName()==SwNumRule::GetOutlineRuleName() &&
-                     mrTxtNode.GetTxtColl()->IsAssignedToListLevelOfOutlineStyle() )
+                if ( !mrTextNode.HasAttrListLevel() &&
+                     mrTextNode.GetNumRule()->GetName()==SwNumRule::GetOutlineRuleName() &&
+                     mrTextNode.GetTextColl()->IsAssignedToListLevelOfOutlineStyle() )
                 {
-                    int nNewListLevel = mrTxtNode.GetTxtColl()->GetAssignedOutlineStyleLevel();
+                    int nNewListLevel = mrTextNode.GetTextColl()->GetAssignedOutlineStyleLevel();
                     if ( 0 <= nNewListLevel && nNewListLevel < MAXLEVEL )
                     {
-                        mrTxtNode.SetAttrListLevel( nNewListLevel );
+                        mrTextNode.SetAttrListLevel( nNewListLevel );
                     }
                 }
-                mrTxtNode.AddToList();
+                mrTextNode.AddToList();
             }
             // #i70748#
             // #i105562#
-            else if ( mrTxtNode.GetpSwAttrSet() &&
-                      dynamic_cast<const SfxUInt16Item &>(mrTxtNode.GetAttr( RES_PARATR_OUTLINELEVEL, false )).GetValue() > 0 )
+            else if ( mrTextNode.GetpSwAttrSet() &&
+                      dynamic_cast<const SfxUInt16Item &>(mrTextNode.GetAttr( RES_PARATR_OUTLINELEVEL, false )).GetValue() > 0 )
             {
-                mrTxtNode.SetEmptyListStyleDueToSetOutlineLevelAttr();
+                mrTextNode.SetEmptyListStyleDueToSetOutlineLevelAttr();
             }
         }
 
-        if ( mrTxtNode.IsInList() )
+        if ( mrTextNode.IsInList() )
         {
             if ( mbUpdateListLevel )
             {
-                SwNodeNum* pNodeNum = const_cast<SwNodeNum*>(mrTxtNode.GetNum());
-                pNodeNum->SetLevelInListTree( mrTxtNode.GetAttrListLevel() );
+                SwNodeNum* pNodeNum = const_cast<SwNodeNum*>(mrTextNode.GetNum());
+                pNodeNum->SetLevelInListTree( mrTextNode.GetAttrListLevel() );
             }
 
             if ( mbUpdateListRestart )
             {
-                SwNodeNum* pNodeNum = const_cast<SwNodeNum*>(mrTxtNode.GetNum());
+                SwNodeNum* pNodeNum = const_cast<SwNodeNum*>(mrTextNode.GetNum());
                 pNodeNum->InvalidateMe();
                 pNodeNum->NotifyInvalidSiblings();
             }
 
             if ( mbUpdateListCount )
             {
-                SwNodeNum* pNodeNum = const_cast<SwNodeNum*>(mrTxtNode.GetNum());
+                SwNodeNum* pNodeNum = const_cast<SwNodeNum*>(mrTextNode.GetNum());
                 pNodeNum->InvalidateAndNotifyTree();
             }
         }
     }
-    // End of class <HandleResetAttrAtTxtNode>
+    // End of class <HandleResetAttrAtTextNode>
 }
 
-bool SwTxtNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwTextNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     const bool bOldIsSetOrResetAttr( mbInSetOrResetAttr );
     mbInSetOrResetAttr = true;
 
-    HandleResetAttrAtTxtNode aHandleResetAttr( *this, nWhich1, nWhich2 );
+    HandleResetAttrAtTextNode aHandleResetAttr( *this, nWhich1, nWhich2 );
 
-    bool bRet = SwCntntNode::ResetAttr( nWhich1, nWhich2 );
+    bool bRet = SwContentNode::ResetAttr( nWhich1, nWhich2 );
 
     mbInSetOrResetAttr = bOldIsSetOrResetAttr;
 
     return bRet;
 }
 
-bool SwTxtNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
+bool SwTextNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
 {
     const bool bOldIsSetOrResetAttr( mbInSetOrResetAttr );
     mbInSetOrResetAttr = true;
 
-    HandleResetAttrAtTxtNode aHandleResetAttr( *this, rWhichArr );
+    HandleResetAttrAtTextNode aHandleResetAttr( *this, rWhichArr );
 
-    bool bRet = SwCntntNode::ResetAttr( rWhichArr );
+    bool bRet = SwContentNode::ResetAttr( rWhichArr );
 
     mbInSetOrResetAttr = bOldIsSetOrResetAttr;
 
     return bRet;
 }
 
-sal_uInt16 SwTxtNode::ResetAllAttr()
+sal_uInt16 SwTextNode::ResetAllAttr()
 {
     const bool bOldIsSetOrResetAttr( mbInSetOrResetAttr );
     mbInSetOrResetAttr = true;
 
-    HandleResetAttrAtTxtNode aHandleResetAttr( *this );
+    HandleResetAttrAtTextNode aHandleResetAttr( *this );
 
-    const sal_uInt16 nRet = SwCntntNode::ResetAllAttr();
+    const sal_uInt16 nRet = SwContentNode::ResetAllAttr();
 
     mbInSetOrResetAttr = bOldIsSetOrResetAttr;
 
     return nRet;
 }
 
-void SwTxtNode::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwTextNode::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swTxtNode"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swTextNode"));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("index"), BAD_CAST(OString::number(GetIndex()).getStr()));
 
-    OUString sText = GetTxt();
+    OUString sText = GetText();
     for (int i = 0; i < 32; ++i)
         sText = sText.replace(i, '*');
     xmlTextWriterStartElement(pWriter, BAD_CAST("m_Text"));
     xmlTextWriterWriteString(pWriter, BAD_CAST(sText.toUtf8().getStr()));
     xmlTextWriterEndElement(pWriter);
 
-    if (GetFmtColl())
+    if (GetFormatColl())
     {
-        xmlTextWriterStartElement(pWriter, BAD_CAST("swTxtFmtColl"));
-        xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetFmtColl()->GetName().toUtf8().getStr()));
+        xmlTextWriterStartElement(pWriter, BAD_CAST("swTextFormatColl"));
+        xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetFormatColl()->GetName().toUtf8().getStr()));
         xmlTextWriterEndElement(pWriter);
     }
 
@@ -5009,7 +5009,7 @@ void SwTxtNode::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterEndElement(pWriter);
 }
 
-sal_uInt32 SwTxtNode::GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const
+sal_uInt32 SwTextNode::GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const
 {
     SfxItemSet aSet( (SfxItemPool&) (GetDoc()->GetAttrPool()), RES_CHRATR_RSID, RES_CHRATR_RSID );
     if ( GetAttr(aSet, nStt, nEnd) )
@@ -5022,51 +5022,51 @@ sal_uInt32 SwTxtNode::GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const
     return 0;
 }
 
-sal_uInt32 SwTxtNode::GetParRsid() const
+sal_uInt32 SwTextNode::GetParRsid() const
 {
     return reinterpret_cast<const SvxRsidItem&>(GetAttr( RES_PARATR_RSID )).GetValue();
 }
 
-bool SwTxtNode::CompareParRsid( const SwTxtNode &rTxtNode ) const
+bool SwTextNode::CompareParRsid( const SwTextNode &rTextNode ) const
 {
     sal_uInt32 nThisRsid = GetParRsid();
-    sal_uInt32 nRsid = rTxtNode.GetParRsid();
+    sal_uInt32 nRsid = rTextNode.GetParRsid();
 
     return nThisRsid == nRsid;
 }
 
-bool SwTxtNode::CompareRsid( const SwTxtNode &rTxtNode, sal_Int32 nStt1, sal_Int32 nStt2,
+bool SwTextNode::CompareRsid( const SwTextNode &rTextNode, sal_Int32 nStt1, sal_Int32 nStt2,
                             sal_Int32 nEnd1, sal_Int32 nEnd2 ) const
 
 {
     sal_uInt32 nThisRsid = GetRsid( nStt1, nEnd1 ? nEnd1 : nStt1 );
-    sal_uInt32 nRsid = rTxtNode.GetRsid( nStt2, nEnd2 ? nEnd2 : nStt2 );
+    sal_uInt32 nRsid = rTextNode.GetRsid( nStt2, nEnd2 ? nEnd2 : nStt2 );
 
     return nThisRsid == nRsid;
 }
 
 // sw::Metadatable
-::sfx2::IXmlIdRegistry& SwTxtNode::GetRegistry()
+::sfx2::IXmlIdRegistry& SwTextNode::GetRegistry()
 {
     return GetDoc()->GetXmlIdRegistry();
 }
 
-bool SwTxtNode::IsInClipboard() const
+bool SwTextNode::IsInClipboard() const
 {
     return GetDoc()->IsClipBoard();
 }
 
-bool SwTxtNode::IsInUndo() const
+bool SwTextNode::IsInUndo() const
 {
     return GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(GetNodes());
 }
 
-bool SwTxtNode::IsInContent() const
+bool SwTextNode::IsInContent() const
 {
     return !GetDoc()->IsInHeaderFooter( SwNodeIndex(*this) );
 }
 
-void SwTxtNode::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
+void SwTextNode::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
 {
     SwClient::SwClientNotify(rModify, rHint);
     const SwAttrHint* pHint = dynamic_cast<const SwAttrHint*>(&rHint);
@@ -5077,7 +5077,7 @@ void SwTxtNode::SwClientNotify( const SwModify& rModify, const SfxHint& rHint )
 #include <unoparagraph.hxx>
 
 uno::Reference< rdf::XMetadatable >
-SwTxtNode::MakeUnoObject()
+SwTextNode::MakeUnoObject()
 {
     const uno::Reference<rdf::XMetadatable> xMeta(
             SwXParagraph::CreateXParagraph(*GetDoc(), this), uno::UNO_QUERY);
@@ -5085,12 +5085,12 @@ SwTxtNode::MakeUnoObject()
 }
 
 //UUUU
-drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwTxtNode::getSdrAllFillAttributesHelper() const
+drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwTextNode::getSdrAllFillAttributesHelper() const
 {
     // create SdrAllFillAttributesHelper on demand
     if(!maFillAttributes.get())
     {
-        const_cast< SwTxtNode* >(this)->maFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(GetSwAttrSet()));
+        const_cast< SwTextNode* >(this)->maFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(GetSwAttrSet()));
     }
 
     return maFillAttributes;
diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx
index b705bbfc0951..e867b1dcd7ac 100644
--- a/sw/source/core/txtnode/swfntcch.cxx
+++ b/sw/source/core/txtnode/swfntcch.cxx
@@ -26,15 +26,15 @@
 extern const sal_uInt8 StackPos[];
 
 // globale Variablen, werden in SwFntCch.Hxx bekanntgegeben
-// Der FontCache wird in TxtInit.Cxx _TXTINIT erzeugt und in _TXTEXIT geloescht
+// Der FontCache wird in TextInit.Cxx _TXTINIT erzeugt und in _TXTEXIT geloescht
 SwFontCache *pSwFontCache = NULL;
 
 SwFontObj::SwFontObj( const void *pOwn, SwViewShell *pSh ) :
     SwCacheObj( pOwn ),
-    aSwFont( &static_cast<SwTxtFmtColl const *>(pOwn)->GetAttrSet(), pSh ? pSh->getIDocumentSettingAccess() : 0 )
+    aSwFont( &static_cast<SwTextFormatColl const *>(pOwn)->GetAttrSet(), pSh ? pSh->getIDocumentSettingAccess() : 0 )
 {
     aSwFont.GoMagic( pSh, aSwFont.GetActual() );
-    const SwAttrSet& rAttrSet = static_cast<SwTxtFmtColl const *>(pOwn)->GetAttrSet();
+    const SwAttrSet& rAttrSet = static_cast<SwTextFormatColl const *>(pOwn)->GetAttrSet();
     for (sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++)
         pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, true );
 }
@@ -45,7 +45,7 @@ SwFontObj::~SwFontObj()
 
 SwFontAccess::SwFontAccess( const void *pOwn, SwViewShell *pSh ) :
     SwCacheAccess( *pSwFontCache, pOwn,
-            static_cast<const SwTxtFmtColl*>(pOwn)->IsInSwFntCache() ),
+            static_cast<const SwTextFormatColl*>(pOwn)->IsInSwFntCache() ),
     pShell( pSh )
 {
 }
@@ -57,7 +57,7 @@ SwFontObj *SwFontAccess::Get( )
 
 SwCacheObj *SwFontAccess::NewObj( )
 {
-    const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(pOwner))->SetInSwFntCache( true );
+    const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(pOwner))->SetInSwFntCache( true );
     return new SwFontObj( pOwner, pShell );
 }
 
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index c79495621574..60d50e794a59 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -1062,7 +1062,7 @@ sal_uInt16 SwSubFont::GetHeight( SwViewShell *pSh, const OutputDevice& rOut )
     return nHeight; // + nLeading;
 }
 
-Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
+Size SwSubFont::_GetTextSize( SwDrawTextInfo& rInf )
 {
     // Robust: Eigentlich sollte der Font bereits eingestellt sein, aber
     // sicher ist sicher ...
@@ -1072,20 +1072,20 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
 
     SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()->GetLanguage() );
 
-    Size aTxtSize;
+    Size aTextSize;
     sal_Int32 nLn = ( rInf.GetLen() == COMPLETE_STRING ? rInf.GetText().getLength()
                                                    : rInf.GetLen() );
     rInf.SetLen( nLn );
     if( IsCapital() && nLn )
-        aTxtSize = GetCapitalSize( rInf );
+        aTextSize = GetCapitalSize( rInf );
     else
     {
         SV_STAT( nGetTextSize );
         long nOldKern = rInf.GetKern();
-        const OUString oldTxt = rInf.GetText();
+        const OUString oldText = rInf.GetText();
         rInf.SetKern( CheckKerning() );
         if ( !IsCaseMap() )
-            aTxtSize = pLastFont->GetTextSize( rInf );
+            aTextSize = pLastFont->GetTextSize( rInf );
         else
         {
             OUString aTmp = CalcCaseMap( rInf.GetText() );
@@ -1107,7 +1107,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
                 rInf.SetIdx( 0 );
                 rInf.SetLen( aNewText.getLength() );
 
-                aTxtSize = pLastFont->GetTextSize( rInf );
+                aTextSize = pLastFont->GetTextSize( rInf );
 
                 rInf.SetIdx( nOldIdx );
                 rInf.SetLen( nOldLen );
@@ -1115,21 +1115,21 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
             else
             {
                 rInf.SetText( aTmp );
-                aTxtSize = pLastFont->GetTextSize( rInf );
+                aTextSize = pLastFont->GetTextSize( rInf );
             }
 
             rInf.SetText(oldStr);
         }
         rInf.SetKern( nOldKern );
-        rInf.SetText(oldTxt);
+        rInf.SetText(oldText);
         // 15142: Ein Wort laenger als eine Zeile, beim Zeilenumbruch
         //        hochgestellt, muss seine effektive Hoehe melden.
         if( GetEscapement() )
         {
             const sal_uInt16 nAscent = pLastFont->GetFontAscent( rInf.GetShell(),
                                                              rInf.GetOut() );
-            aTxtSize.Height() =
-                (long)CalcEscHeight( (sal_uInt16)aTxtSize.Height(), nAscent);
+            aTextSize.Height() =
+                (long)CalcEscHeight( (sal_uInt16)aTextSize.Height(), nAscent);
         }
     }
 
@@ -1141,7 +1141,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
         rInf.SetText( aNewText );
         rInf.SetIdx( 0 );
         rInf.SetLen( aNewText.getLength() );
-        aTxtSize = pLastFont->GetTextSize( rInf );
+        aTextSize = pLastFont->GetTextSize( rInf );
         rInf.SetIdx( nOldIdx );
         rInf.SetLen( nOldLen );
     }
@@ -1153,12 +1153,12 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
         rInf.SetText( aNewText );
         rInf.SetIdx( 0 );
         rInf.SetLen( aNewText.getLength() );
-        aTxtSize = pLastFont->GetTextSize( rInf );
+        aTextSize = pLastFont->GetTextSize( rInf );
         rInf.SetIdx( nOldIdx );
         rInf.SetLen( nOldLen );
     }
 
-    return aTxtSize;
+    return aTextSize;
 }
 
 void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const bool bGrey )
@@ -1239,7 +1239,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const bool bGrey )
 
     if( pUnderFnt && nOldUnder != UNDERLINE_NONE )
     {
-        Size aFontSize = _GetTxtSize( rInf );
+        Size aFontSize = _GetTextSize( rInf );
         const OUString oldStr = rInf.GetText();
         OUString aStr("  ");
 
@@ -1390,7 +1390,7 @@ sal_Int32 SwSubFont::_GetCrsrOfst( SwDrawTextInfo& rInf )
         nCrsr = GetCapitalCrsrOfst( rInf );
     else
     {
-        const OUString oldTxt = rInf.GetText();
+        const OUString oldText = rInf.GetText();
         long nOldKern = rInf.GetKern();
         rInf.SetKern( CheckKerning() );
         SV_STAT( nGetTextSize );
@@ -1403,7 +1403,7 @@ sal_Int32 SwSubFont::_GetCrsrOfst( SwDrawTextInfo& rInf )
             nCrsr = pLastFont->GetCrsrOfst( rInf );
         }
         rInf.SetKern( nOldKern );
-        rInf.SetText(oldTxt);
+        rInf.SetText(oldText);
     }
     return nCrsr;
 }
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 428256799a0c..452ae53001e9 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -96,26 +96,26 @@ SwpHints::SwpHints()
 {
 }
 
-struct TxtAttrDeleter
+struct TextAttrDeleter
 {
     SwAttrPool & m_rPool;
-    TxtAttrDeleter( SwDoc & rDoc ) : m_rPool( rDoc.GetAttrPool() ) { }
-    void operator() (SwTxtAttr * const pAttr)
+    TextAttrDeleter( SwDoc & rDoc ) : m_rPool( rDoc.GetAttrPool() ) { }
+    void operator() (SwTextAttr * const pAttr)
     {
         if (RES_TXTATR_META == pAttr->Which() ||
             RES_TXTATR_METAFIELD == pAttr->Which())
         {
-            static_txtattr_cast<SwTxtMeta *>(pAttr)->ChgTxtNode(0); // prevents ASSERT
+            static_txtattr_cast<SwTextMeta *>(pAttr)->ChgTextNode(0); // prevents ASSERT
         }
-        SwTxtAttr::Destroy( pAttr, m_rPool );
+        SwTextAttr::Destroy( pAttr, m_rPool );
     }
 };
 
-struct TxtAttrContains
+struct TextAttrContains
 {
     sal_Int32 m_nPos;
-    TxtAttrContains( const sal_Int32 nPos ) : m_nPos( nPos ) { }
-    bool operator() (SwTxtAttrEnd * const pAttr)
+    TextAttrContains( const sal_Int32 nPos ) : m_nPos( nPos ) { }
+    bool operator() (SwTextAttrEnd * const pAttr)
     {
         return (pAttr->GetStart() < m_nPos) && (m_nPos < *pAttr->End());
     }
@@ -208,54 +208,54 @@ splitPolicy(const sal_uInt16 nWhichNew, const sal_uInt16 nWhichOther)
     }
 }
 
-void SwTxtINetFmt::InitINetFmt(SwTxtNode & rNode)
+void SwTextINetFormat::InitINetFormat(SwTextNode & rNode)
 {
-    ChgTxtNode(&rNode);
-    SwCharFmt * const pFmt(
-         rNode.GetDoc()->getIDocumentStylePoolAccess().GetCharFmtFromPool(RES_POOLCHR_INET_NORMAL) );
-    pFmt->Add( this );
+    ChgTextNode(&rNode);
+    SwCharFormat * const pFormat(
+         rNode.GetDoc()->getIDocumentStylePoolAccess().GetCharFormatFromPool(RES_POOLCHR_INET_NORMAL) );
+    pFormat->Add( this );
 }
 
-void SwTxtRuby::InitRuby(SwTxtNode & rNode)
+void SwTextRuby::InitRuby(SwTextNode & rNode)
 {
-    ChgTxtNode(&rNode);
-    SwCharFmt * const pFmt(
-        rNode.GetDoc()->getIDocumentStylePoolAccess().GetCharFmtFromPool(RES_POOLCHR_RUBYTEXT) );
-    pFmt->Add( this );
+    ChgTextNode(&rNode);
+    SwCharFormat * const pFormat(
+        rNode.GetDoc()->getIDocumentStylePoolAccess().GetCharFormatFromPool(RES_POOLCHR_RUBYTEXT) );
+    pFormat->Add( this );
 }
 
 /**
   Create a new nesting text hint.
  */
-static SwTxtAttrNesting *
-MakeTxtAttrNesting(SwTxtNode & rNode, SwTxtAttrNesting & rNesting,
+static SwTextAttrNesting *
+MakeTextAttrNesting(SwTextNode & rNode, SwTextAttrNesting & rNesting,
         const sal_Int32 nStart, const sal_Int32 nEnd)
 {
-    SwTxtAttr * const pNew( MakeTxtAttr(
+    SwTextAttr * const pNew( MakeTextAttr(
             *rNode.GetDoc(), rNesting.GetAttr(), nStart, nEnd ) );
     switch (pNew->Which())
     {
         case RES_TXTATR_INETFMT:
         {
-            static_txtattr_cast<SwTxtINetFmt*>(pNew)->InitINetFmt(rNode);
+            static_txtattr_cast<SwTextINetFormat*>(pNew)->InitINetFormat(rNode);
             break;
         }
         case RES_TXTATR_CJK_RUBY:
         {
-            static_txtattr_cast<SwTxtRuby*>(pNew)->InitRuby(rNode);
+            static_txtattr_cast<SwTextRuby*>(pNew)->InitRuby(rNode);
             break;
         }
         default:
-            assert(!"MakeTxtAttrNesting: what the hell is that?");
+            assert(!"MakeTextAttrNesting: what the hell is that?");
             break;
     }
-    return static_txtattr_cast<SwTxtAttrNesting*>(pNew);
+    return static_txtattr_cast<SwTextAttrNesting*>(pNew);
 }
 
-typedef ::std::vector<SwTxtAttrNesting *> NestList_t;
+typedef ::std::vector<SwTextAttrNesting *> NestList_t;
 
 static void
-lcl_DoSplitNew(NestList_t & rSplits, SwTxtNode & rNode,
+lcl_DoSplitNew(NestList_t & rSplits, SwTextNode & rNode,
     const sal_Int32 nNewStart,
     const sal_Int32 nOtherStart, const sal_Int32 nOtherEnd, bool bOtherDummy)
 {
@@ -264,12 +264,12 @@ lcl_DoSplitNew(NestList_t & rSplits, SwTxtNode & rNode,
     // first find the portion that is split (not necessarily the last one!)
     NestList_t::iterator const iter(
         ::std::find_if( rSplits.begin(), rSplits.end(),
-            TxtAttrContains(nSplitPos) ) );
+            TextAttrContains(nSplitPos) ) );
     if (iter != rSplits.end()) // already split here?
     {
         const sal_Int32 nStartPos( // skip other's dummy character!
             (bSplitAtStart && bOtherDummy) ? nSplitPos + 1 : nSplitPos );
-        SwTxtAttrNesting * const pNew( MakeTxtAttrNesting(
+        SwTextAttrNesting * const pNew( MakeTextAttrNesting(
                 rNode, **iter, nStartPos, *(*iter)->GetEnd() ) );
         *(*iter)->GetEnd() = nSplitPos;
         rSplits.insert(iter + 1, pNew);
@@ -280,7 +280,7 @@ lcl_DoSplitNew(NestList_t & rSplits, SwTxtNode & rNode,
   Insert nesting hint into the hints array. Also calls NoteInHistory.
   @param    rNewHint    the hint to be inserted (must not overlap existing!)
  */
-void SwpHints::InsertNesting(SwTxtAttrNesting & rNewHint)
+void SwpHints::InsertNesting(SwTextAttrNesting & rNewHint)
 {
     SwpHintsArray::Insert(& rNewHint);
     NoteInHistory( & rNewHint, true );
@@ -354,7 +354,7 @@ splitting of exising hints that is necessary for backward compatibility.
     @returns        true iff hint was successfully inserted
 */
 bool
-SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
+SwpHints::TryInsertNesting( SwTextNode & rNode, SwTextAttrNesting & rNewHint )
 {
 //    INVARIANT:  the nestable hints in the array are properly nested
     const sal_uInt16 nNewWhich( rNewHint.Which() );
@@ -377,7 +377,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
     // pass 1: split the inserted hint into fragments if necessary
     for ( size_t i = 0; i < GetEndCount(); ++i )
     {
-        SwTxtAttr * const pOther = GetEnd(i);
+        SwTextAttr * const pOther = GetEnd(i);
 
         if (pOther->IsNesting())
         {
@@ -391,7 +391,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
                     case FAIL:
                         SAL_INFO("sw.core", "cannot insert hint: overlap");
                         ::std::for_each(SplitNew.begin(), SplitNew.end(),
-                            TxtAttrDeleter(*rNode.GetDoc()));
+                            TextAttrDeleter(*rNode.GetDoc()));
                         return false;
                     case SPLIT_NEW:
                         lcl_DoSplitNew(SplitNew, rNode, nNewStart,
@@ -399,7 +399,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
                         break;
                     case SPLIT_OTHER:
                         OverlappingExisting.push_back(
-                            static_txtattr_cast<SwTxtAttrNesting*>(pOther));
+                            static_txtattr_cast<SwTextAttrNesting*>(pOther));
                         break;
                     default:
                         assert(!"bad code monkey");
@@ -412,7 +412,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
                 {
                 // ruby and hyperlink: if there is nesting, _overwrite_
                 OverwrittenExisting.push_back(
-                    static_txtattr_cast<SwTxtAttrNesting*>(pOther));
+                    static_txtattr_cast<SwTextAttrNesting*>(pOther));
                 }
                 else if ((nNewStart == nOtherStart) && pOther->HasDummyChar())
                 {
@@ -488,8 +488,8 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
                                 SAL_INFO("sw.core", "hints array full :-(");
                                 return false;
                             }
-                            SwTxtAttrNesting * const pOtherLeft(
-                                MakeTxtAttrNesting( rNode, **itOther,
+                            SwTextAttrNesting * const pOtherLeft(
+                                MakeTextAttrNesting( rNode, **itOther,
                                     nOtherStart, nSplitNewEnd ) );
                             InsertNesting( *pOtherLeft );
                         }
@@ -507,8 +507,8 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
                                 SAL_INFO("sw.core", "hints array full :-(");
                                 return false;
                             }
-                            SwTxtAttrNesting * const pOtherRight(
-                                MakeTxtAttrNesting( rNode, **itOther,
+                            SwTextAttrNesting * const pOtherRight(
+                                MakeTextAttrNesting( rNode, **itOther,
                                     nSplitNewStart, nOtherEnd ) );
                             InsertNesting( *pOtherRight );
                         }
@@ -558,8 +558,8 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
             Delete( *itOther ); // this also does NoteInHistory!
             if (nNewEnd < nOtherEnd)
             {
-                SwTxtAttrNesting * const pOtherRight(
-                    MakeTxtAttrNesting(
+                SwTextAttrNesting * const pOtherRight(
+                    MakeTextAttrNesting(
                         rNode, **itOther, nNewEnd, nOtherEnd ) );
                 bool const bSuccess( TryInsertNesting(rNode, *pOtherRight) );
                 SAL_WARN_IF(!bSuccess, "sw.core", "recursive call 1 failed?");
@@ -588,7 +588,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
 // RES_TXTATR_CHARFMT. The new attribute itself will
 // split any existing RES_TXTATR_AUTOFMT or RES_TXTATR_CHARFMT.
 
-void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
+void SwpHints::BuildPortions( SwTextNode& rNode, SwTextAttr& rNewHint,
         const SetAttrMode nMode )
 {
     const sal_uInt16 nWhich = rNewHint.Which();
@@ -597,8 +597,8 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
     const sal_Int32 nThisEnd =   *rNewHint.GetEnd();
     const bool bNoLengthAttribute = nThisStart == nThisEnd;
 
-    std::vector<SwTxtAttr*> aInsDelHints;
-    std::vector<SwTxtAttr*>::iterator aIter;
+    std::vector<SwTextAttr*> aInsDelHints;
+    std::vector<SwTextAttr*>::iterator aIter;
 
     assert( RES_TXTATR_CHARFMT == rNewHint.Which() ||
             RES_TXTATR_AUTOFMT == rNewHint.Which() );
@@ -610,7 +610,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
     {
         for ( size_t i = 0; i < Count(); ++i )
         {
-            SwTxtAttr* pOther = GetTextHint(i);
+            SwTextAttr* pOther = GetTextHint(i);
 
             if ( RES_TXTATR_CHARFMT != pOther->Which() &&
                  RES_TXTATR_AUTOFMT != pOther->Which() )
@@ -623,12 +623,12 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
             // Split pOther if necessary:
             if ( nOtherStart < nThisStart && nThisStart < nOtherEnd )
             {
-                SwTxtAttr* pNewAttr = MakeTxtAttr( *rNode.GetDoc(),
+                SwTextAttr* pNewAttr = MakeTextAttr( *rNode.GetDoc(),
                         pOther->GetAttr(), nOtherStart, nThisStart );
                 if ( RES_TXTATR_CHARFMT == pOther->Which() )
                 {
-                    static_txtattr_cast<SwTxtCharFmt*>(pNewAttr)->SetSortNumber(
-                        static_txtattr_cast<SwTxtCharFmt*>(pOther)->GetSortNumber() );
+                    static_txtattr_cast<SwTextCharFormat*>(pNewAttr)->SetSortNumber(
+                        static_txtattr_cast<SwTextCharFormat*>(pOther)->GetSortNumber() );
                 }
                 aInsDelHints.push_back( pNewAttr );
 
@@ -643,12 +643,12 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
             // Split pOther if necessary:
             if ( nOtherStart < nThisEnd && nThisEnd < nOtherEnd )
             {
-                SwTxtAttr* pNewAttr = MakeTxtAttr( *rNode.GetDoc(),
+                SwTextAttr* pNewAttr = MakeTextAttr( *rNode.GetDoc(),
                         pOther->GetAttr(), nOtherStart, nThisEnd );
                 if ( RES_TXTATR_CHARFMT == pOther->Which() )
                 {
-                    static_txtattr_cast<SwTxtCharFmt*>(pNewAttr)->SetSortNumber(
-                        static_txtattr_cast<SwTxtCharFmt*>(pOther)->GetSortNumber());
+                    static_txtattr_cast<SwTextCharFormat*>(pNewAttr)->SetSortNumber(
+                        static_txtattr_cast<SwTextCharFormat*>(pOther)->GetSortNumber());
                 }
                 aInsDelHints.push_back( pNewAttr );
 
@@ -681,7 +681,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
     {
         for ( size_t i = 0; i < Count(); ++i )
         {
-            const SwTxtAttr* pOther = GetTextHint(i);
+            const SwTextAttr* pOther = GetTextHint(i);
 
             if ( RES_TXTATR_CHARFMT != pOther->Which() &&
                  RES_TXTATR_AUTOFMT != pOther->Which() )
@@ -713,7 +713,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
         // Get all hints that are in [nPorStart, nPorEnd[:
         for ( size_t i = 0; i < Count(); ++i )
         {
-            SwTxtAttr *pOther = GetTextHint(i);
+            SwTextAttr *pOther = GetTextHint(i);
 
             if ( RES_TXTATR_CHARFMT != pOther->Which() &&
                  RES_TXTATR_AUTOFMT != pOther->Which() )
@@ -731,7 +731,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
             }
         }
 
-        SwTxtAttr* pNewAttr = 0;
+        SwTextAttr* pNewAttr = 0;
         if ( RES_TXTATR_CHARFMT == nWhich )
         {
             // pNewHint can be inserted after calculating the sort value.
@@ -744,16 +744,16 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
                 if ( RES_TXTATR_CHARFMT == (*aIter)->Which() )
                 {
                     // #i74589#
-                    const SwFmtCharFmt& rOtherCharFmt = (*aIter)->GetCharFmt();
-                    const SwFmtCharFmt& rThisCharFmt = rNewHint.GetCharFmt();
-                    const bool bSameCharFmt = rOtherCharFmt.GetCharFmt() == rThisCharFmt.GetCharFmt();
+                    const SwFormatCharFormat& rOtherCharFormat = (*aIter)->GetCharFormat();
+                    const SwFormatCharFormat& rThisCharFormat = rNewHint.GetCharFormat();
+                    const bool bSameCharFormat = rOtherCharFormat.GetCharFormat() == rThisCharFormat.GetCharFormat();
 
                     // #i90311#
                     // Do not remove existing character format hint during XML import
                     if ( !rNode.GetDoc()->IsInXMLImport() &&
                          ( !( SetAttrMode::DONTREPLACE & nMode ) ||
                            bNoLengthAttribute ||
-                           bSameCharFmt ) )
+                           bSameCharFormat ) )
                     {
                         // Remove old hint
                         Delete( *aIter );
@@ -767,18 +767,18 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
                     // remove all attributes from auto styles, which are explicitly set in
                     // the new character format:
                     OSL_ENSURE( RES_TXTATR_AUTOFMT == (*aIter)->Which(), "AUTOSTYLES - Misc trouble" );
-                    SwTxtAttr* pOther = *aIter;
-                    std::shared_ptr<SfxItemSet> pOldStyle = static_cast<const SwFmtAutoFmt&>(pOther->GetAttr()).GetStyleHandle();
+                    SwTextAttr* pOther = *aIter;
+                    std::shared_ptr<SfxItemSet> pOldStyle = static_cast<const SwFormatAutoFormat&>(pOther->GetAttr()).GetStyleHandle();
 
                     // For each attribute in the automatic style check if it
                     // is also set the new character style:
                     SfxItemSet aNewSet( *pOldStyle->GetPool(),
-                        aCharAutoFmtSetRange);
+                        aCharAutoFormatSetRange);
                     SfxItemIter aItemIter( *pOldStyle );
                     const SfxPoolItem* pItem = aItemIter.GetCurItem();
                     while( true )
                     {
-                        if ( !CharFmt::IsItemIncluded( pItem->Which(), &rNewHint ) )
+                        if ( !CharFormat::IsItemIncluded( pItem->Which(), &rNewHint ) )
                         {
                             aNewSet.Put( *pItem );
                         }
@@ -796,7 +796,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
                     // Create new AutoStyle
                     if ( aNewSet.Count() )
                     {
-                        pNewAttr = MakeTxtAttr( *rNode.GetDoc(),
+                        pNewAttr = MakeTextAttr( *rNode.GetDoc(),
                                 aNewSet, nPorStart, nPorEnd );
                         SwpHintsArray::Insert( pNewAttr );
                         NoteInHistory( pNewAttr, true );
@@ -816,30 +816,30 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
             }
             else
             {
-                pNewAttr = MakeTxtAttr( *rNode.GetDoc(), rNewHint.GetAttr(),
+                pNewAttr = MakeTextAttr( *rNode.GetDoc(), rNewHint.GetAttr(),
                         nPorStart, nPorEnd );
-                static_txtattr_cast<SwTxtCharFmt*>(pNewAttr)->SetSortNumber(nCharStyleCount);
+                static_txtattr_cast<SwTextCharFormat*>(pNewAttr)->SetSortNumber(nCharStyleCount);
             }
         }
         else
         {
             // Find the current autostyle. Mix attributes if necessary.
-            SwTxtAttr* pCurrentAutoStyle = 0;
-            SwTxtAttr* pCurrentCharFmt = 0;
+            SwTextAttr* pCurrentAutoStyle = 0;
+            SwTextAttr* pCurrentCharFormat = 0;
             aIter = aInsDelHints.begin();
             while ( aIter != aInsDelHints.end() )
             {
                 if ( RES_TXTATR_AUTOFMT == (*aIter)->Which() )
                     pCurrentAutoStyle = *aIter;
                 else if ( RES_TXTATR_CHARFMT == (*aIter)->Which() )
-                    pCurrentCharFmt = *aIter;
+                    pCurrentCharFormat = *aIter;
                 ++aIter;
             }
 
-            std::shared_ptr<SfxItemSet> pNewStyle = static_cast<const SwFmtAutoFmt&>(rNewHint.GetAttr()).GetStyleHandle();
+            std::shared_ptr<SfxItemSet> pNewStyle = static_cast<const SwFormatAutoFormat&>(rNewHint.GetAttr()).GetStyleHandle();
             if ( pCurrentAutoStyle )
             {
-                std::shared_ptr<SfxItemSet> pCurrentStyle = static_cast<const SwFmtAutoFmt&>(pCurrentAutoStyle->GetAttr()).GetStyleHandle();
+                std::shared_ptr<SfxItemSet> pCurrentStyle = static_cast<const SwFormatAutoFormat&>(pCurrentAutoStyle->GetAttr()).GetStyleHandle();
 
                 // Merge attributes
                 SfxItemSet aNewSet( *pCurrentStyle );
@@ -860,7 +860,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
                              pTmpItem == pItem )
                         {
                             // Do not clear item if the attribute is set in a character format:
-                            if ( !pCurrentCharFmt || 0 == CharFmt::GetItem( *pCurrentCharFmt, pItem->Which() ) )
+                            if ( !pCurrentCharFormat || 0 == CharFormat::GetItem( *pCurrentCharFormat, pItem->Which() ) )
                                 aNewSet.ClearItem( pItem->Which() );
                         }
                     }
@@ -873,7 +873,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
 
                 // Create new AutoStyle
                 if ( aNewSet.Count() )
-                    pNewAttr = MakeTxtAttr( *rNode.GetDoc(), aNewSet,
+                    pNewAttr = MakeTextAttr( *rNode.GetDoc(), aNewSet,
                             nPorStart, nPorEnd );
             }
             else
@@ -898,7 +898,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
                              pTmpItem == pItem )
                         {
                             // Do not clear item if the attribute is set in a character format:
-                            if ( !pCurrentCharFmt || 0 == CharFmt::GetItem( *pCurrentCharFmt, pItem->Which() ) )
+                            if ( !pCurrentCharFormat || 0 == CharFormat::GetItem( *pCurrentCharFormat, pItem->Which() ) )
                             {
                                 if ( !pNewSet )
                                     pNewSet = pNewStyle->Clone( true );
@@ -932,7 +932,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
                 }
                 else if ( pNewStyle.get() )
                 {
-                    pNewAttr = MakeTxtAttr( *rNode.GetDoc(), *pNewStyle,
+                    pNewAttr = MakeTextAttr( *rNode.GetDoc(), *pNewStyle,
                             nPorStart, nPorEnd );
                 }
             }
@@ -958,7 +958,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
         rNode.DestroyAttr( &rNewHint );
 }
 
-SwTxtAttr* MakeRedlineTxtAttr( SwDoc & rDoc, SfxPoolItem & rAttr )
+SwTextAttr* MakeRedlineTextAttr( SwDoc & rDoc, SfxPoolItem & rAttr )
 {
     // this is intended _only_ for special-purpose redline attributes!
     switch (rAttr.Which())
@@ -984,38 +984,38 @@ SwTxtAttr* MakeRedlineTxtAttr( SwDoc & rDoc, SfxPoolItem & rAttr )
     // FIXME: this const_cast is evil!
     SfxPoolItem& rNew =
         const_cast<SfxPoolItem&>( rDoc.GetAttrPool().Put( rAttr ) );
-    return new SwTxtAttrEnd( rNew, 0, 0 );
+    return new SwTextAttrEnd( rNew, 0, 0 );
 }
 
 // create new text attribute
-SwTxtAttr* MakeTxtAttr(
+SwTextAttr* MakeTextAttr(
     SwDoc & rDoc,
     SfxPoolItem& rAttr,
     sal_Int32 const nStt,
     sal_Int32 const nEnd,
     CopyOrNew_t const bIsCopy,
-    SwTxtNode *const pTxtNode )
+    SwTextNode *const pTextNode )
 {
     if ( isCHRATR(rAttr.Which()) )
     {
-        // Somebody wants to build a SwTxtAttr for a character attribute.
+        // Somebody wants to build a SwTextAttr for a character attribute.
         // Sorry, this is not allowed any longer.
         // You'll get a brand new autostyle attribute:
         SfxItemSet aItemSet( rDoc.GetAttrPool(),
                 RES_CHRATR_BEGIN, RES_CHRATR_END );
         aItemSet.Put( rAttr );
-        return MakeTxtAttr( rDoc, aItemSet, nStt, nEnd );
+        return MakeTextAttr( rDoc, aItemSet, nStt, nEnd );
     }
     else if ( RES_TXTATR_AUTOFMT == rAttr.Which() &&
-              static_cast<const SwFmtAutoFmt&>(rAttr).GetStyleHandle()->
+              static_cast<const SwFormatAutoFormat&>(rAttr).GetStyleHandle()->
                 GetPool() != &rDoc.GetAttrPool() )
     {
         // If the attribute is an auto-style which refers to a pool that is
         // different from rDoc's pool, we have to correct this:
-        const StylePool::SfxItemSet_Pointer_t pAutoStyle = static_cast<const SwFmtAutoFmt&>(rAttr).GetStyleHandle();
+        const StylePool::SfxItemSet_Pointer_t pAutoStyle = static_cast<const SwFormatAutoFormat&>(rAttr).GetStyleHandle();
         std::unique_ptr<const SfxItemSet> pNewSet(
                 pAutoStyle->SfxItemSet::Clone( true, &rDoc.GetAttrPool() ));
-        SwTxtAttr* pNew = MakeTxtAttr( rDoc, *pNewSet, nStt, nEnd );
+        SwTextAttr* pNew = MakeTextAttr( rDoc, *pNewSet, nStt, nEnd );
         return pNew;
     }
 
@@ -1024,104 +1024,104 @@ SwTxtAttr* MakeTxtAttr(
     SfxPoolItem& rNew =
         const_cast<SfxPoolItem&>( rDoc.GetAttrPool().Put( rAttr ) );
 
-    SwTxtAttr* pNew = 0;
+    SwTextAttr* pNew = 0;
     switch( rNew.Which() )
     {
     case RES_TXTATR_CHARFMT:
         {
-            SwFmtCharFmt &rFmtCharFmt = static_cast<SwFmtCharFmt&>(rNew);
-            if( !rFmtCharFmt.GetCharFmt() )
+            SwFormatCharFormat &rFormatCharFormat = static_cast<SwFormatCharFormat&>(rNew);
+            if( !rFormatCharFormat.GetCharFormat() )
             {
-                rFmtCharFmt.SetCharFmt( rDoc.GetDfltCharFmt() );
+                rFormatCharFormat.SetCharFormat( rDoc.GetDfltCharFormat() );
             }
 
-            pNew = new SwTxtCharFmt( rFmtCharFmt, nStt, nEnd );
+            pNew = new SwTextCharFormat( rFormatCharFormat, nStt, nEnd );
         }
         break;
     case RES_TXTATR_INETFMT:
-        pNew = new SwTxtINetFmt( static_cast<SwFmtINetFmt&>(rNew), nStt, nEnd );
+        pNew = new SwTextINetFormat( static_cast<SwFormatINetFormat&>(rNew), nStt, nEnd );
         break;
 
     case RES_TXTATR_FIELD:
-        pNew = new SwTxtFld( static_cast<SwFmtFld &>(rNew), nStt,
+        pNew = new SwTextField( static_cast<SwFormatField &>(rNew), nStt,
                     rDoc.IsClipBoard() );
         break;
 
     case RES_TXTATR_ANNOTATION:
         {
-            pNew = new SwTxtAnnotationFld( static_cast<SwFmtFld &>(rNew), nStt, rDoc.IsClipBoard() );
+            pNew = new SwTextAnnotationField( static_cast<SwFormatField &>(rNew), nStt, rDoc.IsClipBoard() );
             if (bIsCopy == COPY)
             {
                 // On copy of the annotation field do not keep the annotated text range by removing
                 // the relation to its annotation mark (relation established via annotation field's name).
                 // If the annotation mark is also copied, the relation and thus the annotated text range will be reestablished,
                 // when the annotation mark is created and inserted into the document.
-                const_cast<SwPostItField&>(dynamic_cast<const SwPostItField&>(*(pNew->GetFmtFld().GetField()))).SetName(OUString());
+                const_cast<SwPostItField&>(dynamic_cast<const SwPostItField&>(*(pNew->GetFormatField().GetField()))).SetName(OUString());
             }
         }
         break;
 
     case RES_TXTATR_INPUTFIELD:
-        pNew = new SwTxtInputFld( static_cast<SwFmtFld &>(rNew), nStt, nEnd,
+        pNew = new SwTextInputField( static_cast<SwFormatField &>(rNew), nStt, nEnd,
                     rDoc.IsClipBoard() );
         break;
 
     case RES_TXTATR_FLYCNT:
         {
             // erst hier wird das Frame-Format kopiert (mit Inhalt) !!
-            pNew = new SwTxtFlyCnt( static_cast<SwFmtFlyCnt&>(rNew), nStt );
+            pNew = new SwTextFlyCnt( static_cast<SwFormatFlyCnt&>(rNew), nStt );
             // Kopie von einem Text-Attribut
-            if ( static_cast<const SwFmtFlyCnt &>(rAttr).GetTxtFlyCnt() )
+            if ( static_cast<const SwFormatFlyCnt &>(rAttr).GetTextFlyCnt() )
             {
                 // then the format must be copied
-                static_cast<SwTxtFlyCnt *>(pNew)->CopyFlyFmt( &rDoc );
+                static_cast<SwTextFlyCnt *>(pNew)->CopyFlyFormat( &rDoc );
             }
         }
         break;
     case RES_TXTATR_FTN:
-        pNew = new SwTxtFtn( static_cast<SwFmtFtn&>(rNew), nStt );
+        pNew = new SwTextFootnote( static_cast<SwFormatFootnote&>(rNew), nStt );
         // ggfs. SeqNo kopieren
-        if( static_cast<SwFmtFtn&>(rAttr).GetTxtFtn() )
-            static_cast<SwTxtFtn*>(pNew)->SetSeqNo( static_cast<SwFmtFtn&>(rAttr).GetTxtFtn()->GetSeqRefNo() );
+        if( static_cast<SwFormatFootnote&>(rAttr).GetTextFootnote() )
+            static_cast<SwTextFootnote*>(pNew)->SetSeqNo( static_cast<SwFormatFootnote&>(rAttr).GetTextFootnote()->GetSeqRefNo() );
         break;
     case RES_TXTATR_REFMARK:
         pNew = nStt == nEnd
-                ? new SwTxtRefMark( static_cast<SwFmtRefMark&>(rNew), nStt )
-                : new SwTxtRefMark( static_cast<SwFmtRefMark&>(rNew), nStt, &nEnd );
+                ? new SwTextRefMark( static_cast<SwFormatRefMark&>(rNew), nStt )
+                : new SwTextRefMark( static_cast<SwFormatRefMark&>(rNew), nStt, &nEnd );
         break;
     case RES_TXTATR_TOXMARK:
-        pNew = new SwTxtTOXMark( static_cast<SwTOXMark&>(rNew), nStt, &nEnd );
+        pNew = new SwTextTOXMark( static_cast<SwTOXMark&>(rNew), nStt, &nEnd );
         break;
     case RES_TXTATR_CJK_RUBY:
-        pNew = new SwTxtRuby( static_cast<SwFmtRuby&>(rNew), nStt, nEnd );
+        pNew = new SwTextRuby( static_cast<SwFormatRuby&>(rNew), nStt, nEnd );
         break;
     case RES_TXTATR_META:
     case RES_TXTATR_METAFIELD:
-        pNew = SwTxtMeta::CreateTxtMeta( rDoc.GetMetaFieldManager(), pTxtNode,
-                static_cast<SwFmtMeta&>(rNew), nStt, nEnd, bIsCopy == COPY );
+        pNew = SwTextMeta::CreateTextMeta( rDoc.GetMetaFieldManager(), pTextNode,
+                static_cast<SwFormatMeta&>(rNew), nStt, nEnd, bIsCopy == COPY );
         break;
     default:
         assert(RES_TXTATR_AUTOFMT == rNew.Which());
-        pNew = new SwTxtAttrEnd( rNew, nStt, nEnd );
+        pNew = new SwTextAttrEnd( rNew, nStt, nEnd );
         break;
     }
 
     return pNew;
 }
 
-SwTxtAttr* MakeTxtAttr( SwDoc & rDoc, const SfxItemSet& rSet,
+SwTextAttr* MakeTextAttr( SwDoc & rDoc, const SfxItemSet& rSet,
                         sal_Int32 nStt, sal_Int32 nEnd )
 {
     IStyleAccess& rStyleAccess = rDoc.GetIStyleAccess();
     const StylePool::SfxItemSet_Pointer_t pAutoStyle = rStyleAccess.getAutomaticStyle( rSet, IStyleAccess::AUTO_STYLE_CHAR );
-    SwFmtAutoFmt aNewAutoFmt;
-    aNewAutoFmt.SetStyleHandle( pAutoStyle );
-    SwTxtAttr* pNew = MakeTxtAttr( rDoc, aNewAutoFmt, nStt, nEnd );
+    SwFormatAutoFormat aNewAutoFormat;
+    aNewAutoFormat.SetStyleHandle( pAutoStyle );
+    SwTextAttr* pNew = MakeTextAttr( rDoc, aNewAutoFormat, nStt, nEnd );
     return pNew;
 }
 
 // loesche das Text-Attribut (muss beim Pool abgemeldet werden!)
-void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
+void SwTextNode::DestroyAttr( SwTextAttr* pAttr )
 {
     if( pAttr )
     {
@@ -1132,10 +1132,10 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
         case RES_TXTATR_FLYCNT:
             {
                 // siehe auch die Anmerkung "Loeschen von Formaten
-                // zeichengebundener Frames" in fesh.cxx, SwFEShell::DelFmt()
-                SwFrmFmt* pFmt = pAttr->GetFlyCnt().GetFrmFmt();
-                if( pFmt )      // vom Undo auf 0 gesetzt ??
-                    pDoc->getIDocumentLayoutAccess().DelLayoutFmt( pFmt );
+                // zeichengebundener Frames" in fesh.cxx, SwFEShell::DelFormat()
+                SwFrameFormat* pFormat = pAttr->GetFlyCnt().GetFrameFormat();
+                if( pFormat )      // vom Undo auf 0 gesetzt ??
+                    pDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFormat );
             }
             break;
 
@@ -1144,8 +1144,8 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
             break;
 
         case RES_TXTATR_FTN:
-            static_cast<SwTxtFtn*>(pAttr)->SetStartNode( 0 );
-            static_cast<SwFmtFtn&>(pAttr->GetAttr()).InvalidateFootnote();
+            static_cast<SwTextFootnote*>(pAttr)->SetStartNode( 0 );
+            static_cast<SwFormatFootnote&>(pAttr->GetAttr()).InvalidateFootnote();
             break;
 
         case RES_TXTATR_FIELD:
@@ -1153,18 +1153,18 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
         case RES_TXTATR_INPUTFIELD:
             if( !pDoc->IsInDtor() )
             {
-                SwTxtFld *const pTxtFld(static_txtattr_cast<SwTxtFld*>(pAttr));
+                SwTextField *const pTextField(static_txtattr_cast<SwTextField*>(pAttr));
                 // Wenn wir ein HiddenParaField sind, dann muessen wir
                 // ggf. fuer eine Neuberechnung des Visible-Flags sorgen.
-                const SwField* pFld = pAttr->GetFmtFld().GetField();
+                const SwField* pField = pAttr->GetFormatField().GetField();
 
                 //JP 06-08-95: DDE-Felder bilden eine Ausnahme
-                OSL_ENSURE( RES_DDEFLD == pFld->GetTyp()->Which() ||
-                        this == pTxtFld->GetpTxtNode(),
+                OSL_ENSURE( RES_DDEFLD == pField->GetTyp()->Which() ||
+                        this == pTextField->GetpTextNode(),
                         "Wo steht denn dieses Feld?" );
 
                 // bestimmte Felder mussen am Doc das Calculations-Flag updaten
-                switch( pFld->GetTyp()->Which() )
+                switch( pField->GetTyp()->Which() )
                 {
                 case RES_HIDDENPARAFLD:
                     SetCalcHiddenParaField();
@@ -1176,22 +1176,22 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
                 case RES_HIDDENTXTFLD:
                 case RES_DBNUMSETFLD:
                 case RES_DBNEXTSETFLD:
-                    if( !pDoc->getIDocumentFieldsAccess().IsNewFldLst() && GetNodes().IsDocNodes() )
-                        pDoc->getIDocumentFieldsAccess().InsDelFldInFldLst(false, *pTxtFld);
+                    if( !pDoc->getIDocumentFieldsAccess().IsNewFieldLst() && GetNodes().IsDocNodes() )
+                        pDoc->getIDocumentFieldsAccess().InsDelFieldInFieldLst(false, *pTextField);
                     break;
                 case RES_DDEFLD:
-                    if (GetNodes().IsDocNodes() && pTxtFld->GetpTxtNode())
-                        static_cast<SwDDEFieldType*>(pFld->GetTyp())->DecRefCnt();
+                    if (GetNodes().IsDocNodes() && pTextField->GetpTextNode())
+                        static_cast<SwDDEFieldType*>(pField->GetTyp())->DecRefCnt();
                     break;
                 case RES_POSTITFLD:
                     {
-                        const_cast<SwFmtFld&>(pAttr->GetFmtFld()).Broadcast(
-                            SwFmtFldHint(&pTxtFld->GetFmtFld(), SwFmtFldHintWhich::REMOVED));
+                        const_cast<SwFormatField&>(pAttr->GetFormatField()).Broadcast(
+                            SwFormatFieldHint(&pTextField->GetFormatField(), SwFormatFieldHintWhich::REMOVED));
                         break;
                     }
                 }
             }
-            static_cast<SwFmtFld&>(pAttr->GetAttr()).InvalidateField();
+            static_cast<SwFormatField&>(pAttr->GetAttr()).InvalidateField();
             break;
 
         case RES_TXTATR_TOXMARK:
@@ -1199,23 +1199,23 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
             break;
 
         case RES_TXTATR_REFMARK:
-            static_cast<SwFmtRefMark&>(pAttr->GetAttr()).InvalidateRefMark();
+            static_cast<SwFormatRefMark&>(pAttr->GetAttr()).InvalidateRefMark();
             break;
 
         case RES_TXTATR_META:
         case RES_TXTATR_METAFIELD:
-            static_txtattr_cast<SwTxtMeta*>(pAttr)->ChgTxtNode(0);
+            static_txtattr_cast<SwTextMeta*>(pAttr)->ChgTextNode(0);
             break;
 
         default:
             break;
         }
 
-        SwTxtAttr::Destroy( pAttr, pDoc->GetAttrPool() );
+        SwTextAttr::Destroy( pAttr, pDoc->GetAttrPool() );
     }
 }
 
-SwTxtAttr* SwTxtNode::InsertItem(
+SwTextAttr* SwTextNode::InsertItem(
     SfxPoolItem& rAttr,
     const sal_Int32 nStart,
     const sal_Int32 nEnd,
@@ -1223,10 +1223,10 @@ SwTxtAttr* SwTxtNode::InsertItem(
 {
    // character attributes will be inserted as automatic styles:
     OSL_ENSURE( !isCHRATR(rAttr.Which()), "AUTOSTYLES - "
-        "SwTxtNode::InsertItem should not be called with character attributes");
+        "SwTextNode::InsertItem should not be called with character attributes");
 
-    SwTxtAttr *const pNew =
-        MakeTxtAttr(
+    SwTextAttr *const pNew =
+        MakeTextAttr(
             *GetDoc(),
             rAttr,
             nStart,
@@ -1250,7 +1250,7 @@ SwTxtAttr* SwTxtNode::InsertItem(
 }
 
 // take ownership of pAttr; if insertion fails, delete pAttr
-bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
+bool SwTextNode::InsertHint( SwTextAttr * const pAttr, const SetAttrMode nMode )
 {
     bool bHiddenPara = false;
 
@@ -1274,8 +1274,8 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
         {
         case RES_TXTATR_FLYCNT:
             {
-                SwTxtFlyCnt *pFly = static_cast<SwTxtFlyCnt *>(pAttr);
-                SwFrmFmt* pFmt = pAttr->GetFlyCnt().GetFrmFmt();
+                SwTextFlyCnt *pFly = static_cast<SwTextFlyCnt *>(pAttr);
+                SwFrameFormat* pFormat = pAttr->GetFlyCnt().GetFrameFormat();
                 if( !(SetAttrMode::NOTXTATRCHR & nInsMode) )
                 {
                     // Wir muessen zuerst einfuegen, da in SetAnchor()
@@ -1284,18 +1284,18 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                     // gesetzt ist, dann korrigiere dieses nach dem Einfuegen
                     // des Zeichens. Sonst muesste das immer  ausserhalb
                     // erfolgen (Fehleranfaellig !)
-                    const SwFmtAnchor* pAnchor = 0;
-                    pFmt->GetItemState( RES_ANCHOR, false,
+                    const SwFormatAnchor* pAnchor = 0;
+                    pFormat->GetItemState( RES_ANCHOR, false,
                         reinterpret_cast<const SfxPoolItem**>(&pAnchor) );
 
                     SwIndex aIdx( this, pAttr->GetStart() );
-                    const OUString c(GetCharOfTxtAttr(*pAttr));
+                    const OUString c(GetCharOfTextAttr(*pAttr));
                     OUString const ins( InsertText(c, aIdx, nInsertFlags) );
                     if (ins.isEmpty())
                     {
                         // do not record deletion of Format!
                         ::sw::UndoGuard const ug(
-                                pFmt->GetDoc()->GetIDocumentUndoRedo());
+                                pFormat->GetDoc()->GetIDocumentUndoRedo());
                         DestroyAttr(pAttr);
                         return false; // text node full :(
                     }
@@ -1303,34 +1303,34 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
 
                     if (pAnchor &&
                         (FLY_AS_CHAR == pAnchor->GetAnchorId()) &&
-                        pAnchor->GetCntntAnchor() &&
-                        pAnchor->GetCntntAnchor()->nNode == *this &&
-                        pAnchor->GetCntntAnchor()->nContent == aIdx )
+                        pAnchor->GetContentAnchor() &&
+                        pAnchor->GetContentAnchor()->nNode == *this &&
+                        pAnchor->GetContentAnchor()->nContent == aIdx )
                     {
                         --const_cast<SwIndex&>(
-                            pAnchor->GetCntntAnchor()->nContent);
+                            pAnchor->GetContentAnchor()->nContent);
                     }
                 }
                 pFly->SetAnchor( this );
 
                 // Format-Pointer kann sich im SetAnchor geaendert haben!
                 // (Kopieren in andere Docs!)
-                pFmt = pAttr->GetFlyCnt().GetFrmFmt();
-                SwDoc *pDoc = pFmt->GetDoc();
+                pFormat = pAttr->GetFlyCnt().GetFrameFormat();
+                SwDoc *pDoc = pFormat->GetDoc();
 
                 // OD 26.06.2003 #108784# - allow drawing objects in header/footer.
                 // But don't allow control objects in header/footer
-                if( RES_DRAWFRMFMT == pFmt->Which() &&
-                    pDoc->IsInHeaderFooter( pFmt->GetAnchor().GetCntntAnchor()->nNode ) )
+                if( RES_DRAWFRMFMT == pFormat->Which() &&
+                    pDoc->IsInHeaderFooter( pFormat->GetAnchor().GetContentAnchor()->nNode ) )
                 {
                     SwDrawContact* pDrawContact =
-                        static_cast<SwDrawContact*>(pFmt->FindContactObj());
+                        static_cast<SwDrawContact*>(pFormat->FindContactObj());
                     if ( pDrawContact &&
                          pDrawContact->GetMaster() &&
                          ::CheckControlLayer( pDrawContact->GetMaster() ) )
                     {
                         // das soll nicht meoglich sein; hier verhindern
-                        // Der Dtor des TxtHints loescht nicht das Zeichen.
+                        // Der Dtor des TextHints loescht nicht das Zeichen.
                         // Wenn ein CH_TXTATR_.. vorliegt, dann muss man
                         // dieses explizit loeschen
                         if( SetAttrMode::NOTXTATRCHR & nInsMode )
@@ -1358,7 +1358,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
         case RES_TXTATR_FTN :
             {
                 // Fussnoten, man kommt an alles irgendwie heran.
-                // CntntNode erzeugen und in die Inserts-Section stellen
+                // ContentNode erzeugen und in die Inserts-Section stellen
                 SwDoc *pDoc = GetDoc();
                 SwNodes &rNodes = pDoc->GetNodes();
 
@@ -1366,7 +1366,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                 if( StartOfSectionIndex() < rNodes.GetEndOfAutotext().GetIndex() )
                 {
                     // das soll nicht meoglich sein; hier verhindern
-                    // Der Dtor des TxtHints loescht nicht das Zeichen.
+                    // Der Dtor des TextHints loescht nicht das Zeichen.
                     // Wenn ein CH_TXTATR_.. vorliegt, dann muss man
                     // dieses explizit loeschen
                     if( SetAttrMode::NOTXTATRCHR & nInsMode )
@@ -1387,10 +1387,10 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                 }
 
                 // wird eine neue Fussnote eingefuegt ??
-                bool bNewFtn = 0 == static_cast<SwTxtFtn*>(pAttr)->GetStartNode();
-                if( bNewFtn )
+                bool bNewFootnote = 0 == static_cast<SwTextFootnote*>(pAttr)->GetStartNode();
+                if( bNewFootnote )
                 {
-                    static_cast<SwTxtFtn*>(pAttr)->MakeNewTextSection( GetNodes() );
+                    static_cast<SwTextFootnote*>(pAttr)->MakeNewTextSection( GetNodes() );
                     SwRegHistory* pHist = GetpSwpHints()
                         ? GetpSwpHints()->GetHistory() : 0;
                     if( pHist )
@@ -1400,11 +1400,11 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                 {
                     // loesche alle Frames der Section, auf die der StartNode zeigt
                     sal_uLong nSttIdx =
-                        static_cast<SwTxtFtn*>(pAttr)->GetStartNode()->GetIndex();
+                        static_cast<SwTextFootnote*>(pAttr)->GetStartNode()->GetIndex();
                     sal_uLong nEndIdx = rNodes[ nSttIdx++ ]->EndOfSectionIndex();
                     for( ; nSttIdx < nEndIdx; ++nSttIdx )
                     {
-                        SwCntntNode* pCNd = rNodes[ nSttIdx ]->GetCntntNode();
+                        SwContentNode* pCNd = rNodes[ nSttIdx ]->GetContentNode();
                         if( 0 != pCNd )
                             pCNd->DelFrms();
                     }
@@ -1416,7 +1416,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                     // entstehen koennen und das Attribut im _SortArr_ am
                     // Dokument nicht eingetrage wird.
                     SwIndex aNdIdx( this, pAttr->GetStart() );
-                    const OUString c(GetCharOfTxtAttr(*pAttr));
+                    const OUString c(GetCharOfTextAttr(*pAttr));
                     OUString const ins( InsertText(c, aNdIdx, nInsertFlags) );
                     if (ins.isEmpty())
                     {
@@ -1426,40 +1426,40 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                     nInsMode |= SetAttrMode::NOTXTATRCHR;
                 }
 
-                // Wir tragen uns am FtnIdx-Array des Docs ein ...
-                SwTxtFtn* pTxtFtn = 0;
-                if( !bNewFtn )
+                // Wir tragen uns am FootnoteIdx-Array des Docs ein ...
+                SwTextFootnote* pTextFootnote = 0;
+                if( !bNewFootnote )
                 {
-                    // eine alte Ftn wird umgehaengt (z.B. SplitNode)
-                    for( size_t n = 0; n < pDoc->GetFtnIdxs().size(); ++n )
-                        if( pAttr == pDoc->GetFtnIdxs()[n] )
+                    // eine alte Footnote wird umgehaengt (z.B. SplitNode)
+                    for( size_t n = 0; n < pDoc->GetFootnoteIdxs().size(); ++n )
+                        if( pAttr == pDoc->GetFootnoteIdxs()[n] )
                         {
                             // neuen Index zuweisen, dafuer aus dem SortArray
                             // loeschen und neu eintragen
-                            pTxtFtn = pDoc->GetFtnIdxs()[n];
-                            pDoc->GetFtnIdxs().erase( pDoc->GetFtnIdxs().begin() + n );
+                            pTextFootnote = pDoc->GetFootnoteIdxs()[n];
+                            pDoc->GetFootnoteIdxs().erase( pDoc->GetFootnoteIdxs().begin() + n );
                             break;
                         }
                         // wenn ueber Undo der StartNode gesetzt wurde, kann
                         // der Index noch gar nicht in der Verwaltung stehen !!
                 }
-                if( !pTxtFtn )
-                    pTxtFtn = static_cast<SwTxtFtn*>(pAttr);
+                if( !pTextFootnote )
+                    pTextFootnote = static_cast<SwTextFootnote*>(pAttr);
 
                 // fuers Update der Nummern und zum Sortieren
                 // muss der Node gesetzt sein.
-                static_cast<SwTxtFtn*>(pAttr)->ChgTxtNode( this );
+                static_cast<SwTextFootnote*>(pAttr)->ChgTextNode( this );
 
-                // FussNote im Redline-Bereich NICHT ins FtnArray einfuegen!
+                // FussNote im Redline-Bereich NICHT ins FootnoteArray einfuegen!
                 if( StartOfSectionIndex() > rNodes.GetEndOfRedlines().GetIndex() )
                 {
-                    const bool bSuccess = pDoc->GetFtnIdxs().insert(pTxtFtn).second;
-                    OSL_ENSURE( bSuccess, "FtnIdx not inserted." );
+                    const bool bSuccess = pDoc->GetFootnoteIdxs().insert(pTextFootnote).second;
+                    OSL_ENSURE( bSuccess, "FootnoteIdx not inserted." );
                     (void) bSuccess; // unused in non-debug
                 }
                 SwNodeIndex aTmpIndex( *this );
-                pDoc->GetFtnIdxs().UpdateFtn( aTmpIndex);
-                static_cast<SwTxtFtn*>(pAttr)->SetSeqRefNo();
+                pDoc->GetFootnoteIdxs().UpdateFootnote( aTmpIndex);
+                static_cast<SwTextFootnote*>(pAttr)->SetSeqRefNo();
             }
             break;
 
@@ -1467,7 +1467,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                 {
                     // fuer HiddenParaFields Benachrichtigungsmechanismus
                     // anwerfen
-                    if( RES_HIDDENPARAFLD == pAttr->GetFmtFld().GetField()->GetTyp()->Which() )
+                    if( RES_HIDDENPARAFLD == pAttr->GetFormatField().GetField()->GetTyp()->Which() )
                     {
                         bHiddenPara = true;
                     }
@@ -1475,14 +1475,14 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                 break;
 
         }
-        // Fuer SwTxtHints ohne Endindex werden CH_TXTATR_..
+        // Fuer SwTextHints ohne Endindex werden CH_TXTATR_..
         // eingefuegt, aStart muss danach um einen zurueckgesetzt werden.
-        // Wenn wir im SwTxtNode::Copy stehen, so wurde das Zeichen bereits
+        // Wenn wir im SwTextNode::Copy stehen, so wurde das Zeichen bereits
         // mitkopiert. In solchem Fall ist SETATTR_NOTXTATRCHR angegeben worden.
         if( !(SetAttrMode::NOTXTATRCHR & nInsMode) )
         {
             SwIndex aIdx( this, pAttr->GetStart() );
-            OUString const ins( InsertText(OUString(GetCharOfTxtAttr(*pAttr)),
+            OUString const ins( InsertText(OUString(GetCharOfTextAttr(*pAttr)),
                         aIdx, nInsertFlags) );
             if (ins.isEmpty())
             {
@@ -1510,19 +1510,19 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
         {
         case RES_TXTATR_INPUTFIELD:
             {
-                SwTxtInputFld* pTxtInputFld = dynamic_cast<SwTxtInputFld*>(pAttr);
-                if ( pTxtInputFld )
+                SwTextInputField* pTextInputField = dynamic_cast<SwTextInputField*>(pAttr);
+                if ( pTextInputField )
                 {
                     if( !(SetAttrMode::NOTXTATRCHR & nMode) )
                     {
                         SwIndex aIdx( this, pAttr->GetStart() );
                         InsertText( OUString(CH_TXT_ATR_INPUTFIELDSTART), aIdx, nInsertFlags );
-                        const OUString aContent = pTxtInputFld->GetFieldContent();
+                        const OUString aContent = pTextInputField->GetFieldContent();
                         InsertText( aContent, aIdx, nInsertFlags );
                         InsertText( OUString(CH_TXT_ATR_INPUTFIELDEND), aIdx, nInsertFlags );
 
                         sal_Int32* const pEnd(pAttr->GetEnd());
-                        OSL_ENSURE( pEnd != NULL, "<SwTxtNode::InsertHint(..)> - missing end of RES_TXTATR_INPUTFIELD!" );
+                        OSL_ENSURE( pEnd != NULL, "<SwTextNode::InsertHint(..)> - missing end of RES_TXTATR_INPUTFIELD!" );
                         if ( pEnd != NULL )
                         {
                             *pEnd = *pEnd + 2 + aContent.getLength();
@@ -1538,7 +1538,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                             InsertText( OUString(CH_TXT_ATR_INPUTFIELDSTART), aIdx, nInsertFlags );
                             bInputFieldStartCharInserted = true;
                             sal_Int32* const pEnd(pAttr->GetEnd());
-                            OSL_ENSURE( pEnd != NULL, "<SwTxtNode::InsertHint(..)> - missing end of RES_TXTATR_INPUTFIELD!" );
+                            OSL_ENSURE( pEnd != NULL, "<SwTextNode::InsertHint(..)> - missing end of RES_TXTATR_INPUTFIELD!" );
                             if ( pEnd != NULL )
                             {
                                 *pEnd = *pEnd + 1;
@@ -1547,7 +1547,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                         }
 
                         sal_Int32* const pEnd(pAttr->GetEnd());
-                        OSL_ENSURE( pEnd != NULL, "<SwTxtNode::InsertHint(..)> - missing end of RES_TXTATR_INPUTFIELD!" );
+                        OSL_ENSURE( pEnd != NULL, "<SwTextNode::InsertHint(..)> - missing end of RES_TXTATR_INPUTFIELD!" );
                         if ( pEnd != NULL
                              && m_Text[ *(pEnd) - 1 ] != CH_TXT_ATR_INPUTFIELDEND )
                         {
@@ -1571,8 +1571,8 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
     // handle overlap with an existing InputField
     bool bInsertHint = true;
     {
-        const SwTxtInputFld* pTxtInputFld = GetOverlappingInputFld( *pAttr );
-        if ( pTxtInputFld != NULL )
+        const SwTextInputField* pTextInputField = GetOverlappingInputField( *pAttr );
+        if ( pTextInputField != NULL )
         {
             if ( pAttr->End() == NULL )
             {
@@ -1580,13 +1580,13 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
             }
             else
             {
-                if ( pAttr->GetStart() > pTxtInputFld->GetStart() )
+                if ( pAttr->GetStart() > pTextInputField->GetStart() )
                 {
-                    pAttr->GetStart() = pTxtInputFld->GetStart();
+                    pAttr->GetStart() = pTextInputField->GetStart();
                 }
-                if ( *(pAttr->End()) < *(pTxtInputFld->End()) )
+                if ( *(pAttr->End()) < *(pTextInputField->End()) )
                 {
-                    *(pAttr->GetEnd()) = *(pTxtInputFld->End());
+                    *(pAttr->GetEnd()) = *(pTextInputField->End());
                 }
             }
         }
@@ -1646,7 +1646,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
     return bRet;
 }
 
-void SwTxtNode::DeleteAttribute( SwTxtAttr * const pAttr )
+void SwTextNode::DeleteAttribute( SwTextAttr * const pAttr )
 {
     if ( !HasHints() )
     {
@@ -1664,7 +1664,7 @@ void SwTxtNode::DeleteAttribute( SwTxtAttr * const pAttr )
     else if ( pAttr->HasContent() )
     {
         const SwIndex aIdx( this, pAttr->GetStart() );
-        OSL_ENSURE( pAttr->End() != NULL, "<SwTxtNode::DeleteAttribute(..)> - missing End() at <SwTxtAttr> instance which has content" );
+        OSL_ENSURE( pAttr->End() != NULL, "<SwTextNode::DeleteAttribute(..)> - missing End() at <SwTextAttr> instance which has content" );
         EraseText( aIdx, *pAttr->End() - pAttr->GetStart() );
     }
     else
@@ -1676,7 +1676,7 @@ void SwTxtNode::DeleteAttribute( SwTxtAttr * const pAttr )
             pAttr->Which());
 
         m_pSwpHints->Delete( pAttr );
-        SwTxtAttr::Destroy( pAttr, GetDoc()->GetAttrPool() );
+        SwTextAttr::Destroy( pAttr, GetDoc()->GetAttrPool() );
         NotifyClients( 0, &aHint );
 
         TryDeleteSwpHints();
@@ -1684,7 +1684,7 @@ void SwTxtNode::DeleteAttribute( SwTxtAttr * const pAttr )
 }
 
 //FIXME: this does NOT respect SORT NUMBER (for CHARFMT)!
-void SwTxtNode::DeleteAttributes(
+void SwTextNode::DeleteAttributes(
     const sal_uInt16 nWhich,
     const sal_Int32 nStart,
     const sal_Int32 nEnd )
@@ -1694,13 +1694,13 @@ void SwTxtNode::DeleteAttributes(
 
     for ( size_t nPos = 0; m_pSwpHints && nPos < m_pSwpHints->Count(); ++nPos )
     {
-        SwTxtAttr * const pTxtHt = m_pSwpHints->GetTextHint( nPos );
-        const sal_Int32 nHintStart = pTxtHt->GetStart();
+        SwTextAttr * const pTextHt = m_pSwpHints->GetTextHint( nPos );
+        const sal_Int32 nHintStart = pTextHt->GetStart();
         if (nStart < nHintStart)
         {
             break; // sorted by start
         }
-        else if ( (nStart == nHintStart) && (nWhich == pTxtHt->Which()) )
+        else if ( (nStart == nHintStart) && (nWhich == pTextHt->Which()) )
         {
             if ( nWhich == RES_CHRATR_HIDDEN  )
             {
@@ -1710,36 +1710,36 @@ void SwTxtNode::DeleteAttributes(
             else if ( nWhich == RES_TXTATR_CHARFMT )
             {
                 // Check if character format contains hidden attribute:
-                const SwCharFmt* pFmt = pTxtHt->GetCharFmt().GetCharFmt();
+                const SwCharFormat* pFormat = pTextHt->GetCharFormat().GetCharFormat();
                 const SfxPoolItem* pItem;
-                if ( SfxItemState::SET == pFmt->GetItemState( RES_CHRATR_HIDDEN, true, &pItem ) )
+                if ( SfxItemState::SET == pFormat->GetItemState( RES_CHRATR_HIDDEN, true, &pItem ) )
                     SetCalcHiddenCharFlags();
             }
             // #i75430# Recalc hidden flags if necessary
             else if ( nWhich == RES_TXTATR_AUTOFMT )
             {
                 // Check if auto style contains hidden attribute:
-                const SfxPoolItem* pHiddenItem = CharFmt::GetItem( *pTxtHt, RES_CHRATR_HIDDEN );
+                const SfxPoolItem* pHiddenItem = CharFormat::GetItem( *pTextHt, RES_CHRATR_HIDDEN );
                 if ( pHiddenItem )
                     SetCalcHiddenCharFlags();
                 // for auto styles DeleteAttributes is only called from Undo
                 // so it shouldn't need to care about ignore start/end flags
             }
 
-            sal_Int32 const * const pEndIdx = pTxtHt->GetEnd();
+            sal_Int32 const * const pEndIdx = pTextHt->GetEnd();
 
-            if ( pTxtHt->HasDummyChar() )
+            if ( pTextHt->HasDummyChar() )
             {
                 // Unbedingt Copy-konstruieren!
                 const SwIndex aIdx( this, nStart );
-                // erase the CH_TXTATR, which will also delete pTxtHt
+                // erase the CH_TXTATR, which will also delete pTextHt
                 EraseText( aIdx, 1 );
             }
-            else if ( pTxtHt->HasContent() )
+            else if ( pTextHt->HasContent() )
             {
                 const SwIndex aIdx( this, nStart );
-                OSL_ENSURE( pTxtHt->End() != NULL, "<SwTxtNode::DeleteAttributes(..)> - missing End() at <SwTxtAttr> instance which has content" );
-                EraseText( aIdx, *pTxtHt->End() - nStart );
+                OSL_ENSURE( pTextHt->End() != NULL, "<SwTextNode::DeleteAttributes(..)> - missing End() at <SwTextAttr> instance which has content" );
+                EraseText( aIdx, *pTextHt->End() - nStart );
             }
             else if( *pEndIdx == nEnd )
             {
@@ -1753,7 +1753,7 @@ void SwTxtNode::DeleteAttributes(
                     nWhich);
 
                 m_pSwpHints->DeleteAtPos( nPos );    // gefunden, loeschen,
-                SwTxtAttr::Destroy( pTxtHt, GetDoc()->GetAttrPool() );
+                SwTextAttr::Destroy( pTextHt, GetDoc()->GetAttrPool() );
                 NotifyClients( 0, &aHint );
             }
         }
@@ -1761,7 +1761,7 @@ void SwTxtNode::DeleteAttributes(
     TryDeleteSwpHints();
 }
 
-void SwTxtNode::DelSoftHyph( const sal_Int32 nStt, const sal_Int32 nEnd )
+void SwTextNode::DelSoftHyph( const sal_Int32 nStt, const sal_Int32 nEnd )
 {
     sal_Int32 nFndPos = nStt;
     sal_Int32 nEndPos = nEnd;
@@ -1778,7 +1778,7 @@ void SwTxtNode::DelSoftHyph( const sal_Int32 nStt, const sal_Int32 nEnd )
     }
 }
 
-bool SwTxtNode::IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich)
+bool SwTextNode::IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich)
 {
     return (nWhich ==  RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_COLOR || nWhich == RES_CHRATR_BACKGROUND || nWhich == RES_CHRATR_ESCAPEMENT);
 }
@@ -1787,7 +1787,7 @@ bool SwTxtNode::IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich)
 //Font underline;
 //Font Italic of Western, CJK and CTL;
 //Font Bold of Wertern, CJK and CTL;
-bool lcl_IsIgnoredCharFmtForBullets(const sal_uInt16 nWhich)
+bool lcl_IsIgnoredCharFormatForBullets(const sal_uInt16 nWhich)
 {
     return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_POSTURE || nWhich == RES_CHRATR_WEIGHT
         || nWhich == RES_CHRATR_CJK_POSTURE || nWhich == RES_CHRATR_CJK_WEIGHT
@@ -1795,12 +1795,12 @@ bool lcl_IsIgnoredCharFmtForBullets(const sal_uInt16 nWhich)
 }
 
 //Condition for expanding char set to character style of specified number rule level:
-//The item inside the set should not conflict to any exist and non-default item inside paragraph properties set (SwCntntNode::SwPAttrSet);
+//The item inside the set should not conflict to any exist and non-default item inside paragraph properties set (SwContentNode::SwPAttrSet);
 //The node should have applied a number rule;
 //The node should be counted in a list, if not, make it to be;
 //The item should not conflict to any exist and non-default item inside the character of specified number rule level;
 //The item should not be ignored depend on the exact number rule type;
-bool SwTxtNode::TryCharSetExpandToNum(const SfxItemSet& aCharSet)
+bool SwTextNode::TryCharSetExpandToNum(const SfxItemSet& aCharSet)
 {
     bool bRet = false;
     SfxItemIter aIter( aCharSet );
@@ -1823,21 +1823,21 @@ bool SwTxtNode::TryCharSetExpandToNum(const SfxItemSet& aCharSet)
 
     if (nLevel != -1 && pCurrNum)
     {
-        const SwNumFmt* pCurrNumFmt = pCurrNum->GetNumFmt(static_cast<sal_uInt16>(nLevel));
-        if (pCurrNumFmt)
+        const SwNumFormat* pCurrNumFormat = pCurrNum->GetNumFormat(static_cast<sal_uInt16>(nLevel));
+        if (pCurrNumFormat)
         {
-            if (pCurrNumFmt->IsItemize() && lcl_IsIgnoredCharFmtForBullets(nWhich))
+            if (pCurrNumFormat->IsItemize() && lcl_IsIgnoredCharFormatForBullets(nWhich))
                 return bRet;
-            if (pCurrNumFmt->IsEnumeration() && SwTxtNode::IsIgnoredCharFmtForNumbering(nWhich))
+            if (pCurrNumFormat->IsEnumeration() && SwTextNode::IsIgnoredCharFormatForNumbering(nWhich))
                 return bRet;
-            SwCharFmt* pCurrCharFmt =pCurrNumFmt->GetCharFmt();
+            SwCharFormat* pCurrCharFormat =pCurrNumFormat->GetCharFormat();
 
-            if (pCurrCharFmt && pCurrCharFmt->GetItemState(nWhich,false) != SfxItemState::SET)
+            if (pCurrCharFormat && pCurrCharFormat->GetItemState(nWhich,false) != SfxItemState::SET)
             {
-                pCurrCharFmt->SetFmtAttr(*pItem);
-                SwNumFmt aNewNumFmt(*pCurrNumFmt);
-                aNewNumFmt.SetCharFmt(pCurrCharFmt);
-                pCurrNum->Set(nLevel,aNewNumFmt);
+                pCurrCharFormat->SetFormatAttr(*pItem);
+                SwNumFormat aNewNumFormat(*pCurrNumFormat);
+                aNewNumFormat.SetCharFormat(pCurrCharFormat);
+                pCurrNum->Set(nLevel,aNewNumFormat);
                 bRet = true;
             }
         }
@@ -1847,8 +1847,8 @@ bool SwTxtNode::TryCharSetExpandToNum(const SfxItemSet& aCharSet)
 }
 
 // setze diese Attribute am TextNode. Wird der gesamte Bereich umspannt,
-// dann setze sie nur im AutoAttrSet (SwCntntNode:: SetAttr)
-bool SwTxtNode::SetAttr(
+// dann setze sie nur im AutoAttrSet (SwContentNode:: SetAttr)
+bool SwTextNode::SetAttr(
     const SfxItemSet& rSet,
     const sal_Int32 nStt,
     const sal_Int32 nEnd,
@@ -1859,7 +1859,7 @@ bool SwTxtNode::SetAttr(
 
     // teil die Sets auf (fuer Selektion in Nodes)
     const SfxItemSet* pSet = &rSet;
-    SfxItemSet aTxtSet( *rSet.GetPool(), RES_TXTATR_BEGIN, RES_TXTATR_END-1 );
+    SfxItemSet aTextSet( *rSet.GetPool(), RES_TXTATR_BEGIN, RES_TXTATR_END-1 );
 
     // gesamter Bereich
     if ( !nStt && (nEnd == m_Text.getLength()) &&
@@ -1867,50 +1867,50 @@ bool SwTxtNode::SetAttr(
     {
         // sind am Node schon Zeichenvorlagen gesetzt, muss man diese Attribute
         // (rSet) immer als TextAttribute setzen, damit sie angezeigt werden.
-        bool bHasCharFmts = false;
+        bool bHasCharFormats = false;
         if ( HasHints() )
         {
             for ( size_t n = 0; n < m_pSwpHints->Count(); ++n )
             {
-                if ( (*m_pSwpHints)[ n ]->IsCharFmtAttr() )
+                if ( (*m_pSwpHints)[ n ]->IsCharFormatAttr() )
                 {
-                    bHasCharFmts = true;
+                    bHasCharFormats = true;
                     break;
                 }
             }
         }
 
-        if( !bHasCharFmts )
+        if( !bHasCharFormats )
         {
-            aTxtSet.Put( rSet );
+            aTextSet.Put( rSet );
             // If there are any character attributes in rSet,
             // we want to set them at the paragraph:
-            if( aTxtSet.Count() != rSet.Count() )
+            if( aTextSet.Count() != rSet.Count() )
             {
                 const bool bRet = SetAttr( rSet );
-                if( !aTxtSet.Count() )
+                if( !aTextSet.Count() )
                     return bRet;
             }
 
             // check for auto style:
             const SfxPoolItem* pItem;
-            const bool bAutoStyle = SfxItemState::SET == aTxtSet.GetItemState( RES_TXTATR_AUTOFMT, false, &pItem );
+            const bool bAutoStyle = SfxItemState::SET == aTextSet.GetItemState( RES_TXTATR_AUTOFMT, false, &pItem );
             if ( bAutoStyle )
             {
-                std::shared_ptr<SfxItemSet> pAutoStyleSet = static_cast<const SwFmtAutoFmt*>(pItem)->GetStyleHandle();
+                std::shared_ptr<SfxItemSet> pAutoStyleSet = static_cast<const SwFormatAutoFormat*>(pItem)->GetStyleHandle();
                 const bool bRet = SetAttr( *pAutoStyleSet );
-                if( 1 == aTxtSet.Count() )
+                if( 1 == aTextSet.Count() )
                     return bRet;
             }
 
             // Continue with the text attributes:
-            pSet = &aTxtSet;
+            pSet = &aTextSet;
         }
     }
 
     GetOrCreateSwpHints();
 
-    SfxItemSet aCharSet( *rSet.GetPool(), aCharAutoFmtSetRange );
+    SfxItemSet aCharSet( *rSet.GetPool(), aCharAutoFormatSetRange );
 
     size_t nCount = 0;
     SfxItemIter aIter( *pSet );
@@ -1922,16 +1922,16 @@ bool SwTxtNode::SetAttr(
         {
             const sal_uInt16 nWhich = pItem->Which();
             OSL_ENSURE( isCHRATR(nWhich) || isTXTATR(nWhich),
-                    "SwTxtNode::SetAttr(): unknown attribute" );
+                    "SwTextNode::SetAttr(): unknown attribute" );
             if ( isCHRATR(nWhich) || isTXTATR(nWhich) )
             {
                 if ((RES_TXTATR_CHARFMT == nWhich) &&
-                    (GetDoc()->GetDfltCharFmt() ==
-                     static_cast<const SwFmtCharFmt*>(pItem)->GetCharFmt()))
+                    (GetDoc()->GetDfltCharFormat() ==
+                     static_cast<const SwFormatCharFormat*>(pItem)->GetCharFormat()))
                 {
                     SwIndex aIndex( this, nStt );
-                    RstTxtAttr( aIndex, nEnd - nStt, RES_TXTATR_CHARFMT, 0 );
-                    DontExpandFmt( aIndex );
+                    RstTextAttr( aIndex, nEnd - nStt, RES_TXTATR_CHARFMT, 0 );
+                    DontExpandFormat( aIndex );
                 }
                 else
                 {
@@ -1943,7 +1943,7 @@ bool SwTxtNode::SetAttr(
                     else
                     {
 
-                        SwTxtAttr *const pNew = MakeTxtAttr( *GetDoc(),
+                        SwTextAttr *const pNew = MakeTextAttr( *GetDoc(),
                                 const_cast<SfxPoolItem&>(*pItem), nStt, nEnd );
                         if ( pNew )
                         {
@@ -1968,7 +1968,7 @@ bool SwTxtNode::SetAttr(
 
     if ( aCharSet.Count() )
     {
-        SwTxtAttr* pTmpNew = MakeTxtAttr( *GetDoc(), aCharSet, nStt, nEnd );
+        SwTextAttr* pTmpNew = MakeTextAttr( *GetDoc(), aCharSet, nStt, nEnd );
         if ( InsertHint( pTmpNew, nMode ) )
         {
             ++nCount;
@@ -1984,7 +1984,7 @@ static void lcl_MergeAttr( SfxItemSet& rSet, const SfxPoolItem& rAttr )
 {
     if ( RES_TXTATR_AUTOFMT == rAttr.Which() )
     {
-        const SfxItemSet* pCFSet = CharFmt::GetItemSet( rAttr );
+        const SfxItemSet* pCFSet = CharFormat::GetItemSet( rAttr );
         if ( !pCFSet )
             return;
         SfxWhichIter aIter( *pCFSet );
@@ -2002,13 +2002,13 @@ static void lcl_MergeAttr( SfxItemSet& rSet, const SfxPoolItem& rAttr )
         rSet.Put( rAttr );
 }
 
-static void lcl_MergeAttr_ExpandChrFmt( SfxItemSet& rSet, const SfxPoolItem& rAttr )
+static void lcl_MergeAttr_ExpandChrFormat( SfxItemSet& rSet, const SfxPoolItem& rAttr )
 {
     if( RES_TXTATR_CHARFMT == rAttr.Which() ||
         RES_TXTATR_INETFMT == rAttr.Which() ||
         RES_TXTATR_AUTOFMT == rAttr.Which() )
     {
-        const SfxItemSet* pCFSet = CharFmt::GetItemSet( rAttr );
+        const SfxItemSet* pCFSet = CharFormat::GetItemSet( rAttr );
 
         if ( pCFSet )
         {
@@ -2047,20 +2047,20 @@ public:
     SwPoolItemEndPair() : mpItem( 0 ), mnEndPos( 0 ) {};
 };
 
-static void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTxtNode& rTxtNode,
+static void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTextNode& rTextNode,
                                             SfxItemSet& rSet )
 {
-    if ( rTxtNode.AreListLevelIndentsApplicable() )
+    if ( rTextNode.AreListLevelIndentsApplicable() )
     {
-        const SwNumRule* pRule = rTxtNode.GetNumRule();
-        if ( pRule && rTxtNode.GetActualListLevel() >= 0 )
+        const SwNumRule* pRule = rTextNode.GetNumRule();
+        if ( pRule && rTextNode.GetActualListLevel() >= 0 )
         {
-            const SwNumFmt& rFmt = pRule->Get(static_cast<sal_uInt16>(rTxtNode.GetActualListLevel()));
-            if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+            const SwNumFormat& rFormat = pRule->Get(static_cast<sal_uInt16>(rTextNode.GetActualListLevel()));
+            if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
             {
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
-                aLR.SetTxtLeft( rFmt.GetIndentAt() );
-                aLR.SetTxtFirstLineOfst( static_cast<short>(rFmt.GetFirstLineIndent()) );
+                aLR.SetTextLeft( rFormat.GetIndentAt() );
+                aLR.SetTextFirstLineOfst( static_cast<short>(rFormat.GetFirstLineIndent()) );
                 rSet.Put( aLR );
             }
         }
@@ -2068,8 +2068,8 @@ static void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTxtNode& rTxtNode,
 }
 
 // erfrage die Attribute vom TextNode ueber den Bereich
-bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
-                         const bool bOnlyTxtAttr, const bool bGetFromChrFmt,
+bool SwTextNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
+                         const bool bOnlyTextAttr, const bool bGetFromChrFormat,
                          const bool bMergeIndentValuesOfNumRule ) const
 {
     if( HasHints() )
@@ -2087,17 +2087,17 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
          */
 
         void (*fnMergeAttr)( SfxItemSet&, const SfxPoolItem& )
-            = bGetFromChrFmt ? &lcl_MergeAttr_ExpandChrFmt
+            = bGetFromChrFormat ? &lcl_MergeAttr_ExpandChrFormat
                              : &lcl_MergeAttr;
 
-        // dann besorge mal die Auto-(Fmt)Attribute
-        SfxItemSet aFmtSet( *rSet.GetPool(), rSet.GetRanges() );
-        if( !bOnlyTxtAttr )
+        // dann besorge mal die Auto-(Format)Attribute
+        SfxItemSet aFormatSet( *rSet.GetPool(), rSet.GetRanges() );
+        if( !bOnlyTextAttr )
         {
-            SwCntntNode::GetAttr( aFmtSet );
+            SwContentNode::GetAttr( aFormatSet );
             if ( bMergeIndentValuesOfNumRule )
             {
-                lcl_MergeListLevelIndentAsLRSpaceItem( *this, aFmtSet );
+                lcl_MergeListLevelIndentAsLRSpaceItem( *this, aFormatSet );
             }
         }
 
@@ -2107,7 +2107,7 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
         {
             for (size_t n = 0; n < nSize; ++n)
             {
-                const SwTxtAttr* pHt = (*m_pSwpHints)[n];
+                const SwTextAttr* pHt = (*m_pSwpHints)[n];
                 const sal_Int32 nAttrStart = pHt->GetStart();
                 if( nAttrStart > nEnd )         // ueber den Bereich hinaus
                     break;
@@ -2133,7 +2133,7 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
 
             for (size_t n = 0; n < nSize; ++n)
             {
-                const SwTxtAttr* pHt = (*m_pSwpHints)[n];
+                const SwTextAttr* pHt = (*m_pSwpHints)[n];
                 const sal_Int32 nAttrStart = pHt->GetStart();
                 if( nAttrStart > nEnd )         // ueber den Bereich hinaus
                     break;
@@ -2149,14 +2149,14 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
                         continue;
 
                     if( nEnd <= *pAttrEnd )     // hinter oder genau Ende
-                        (*fnMergeAttr)( aFmtSet, pHt->GetAttr() );
+                        (*fnMergeAttr)( aFormatSet, pHt->GetAttr() );
                     else
-//                  else if( pHt->GetAttr() != aFmtSet.Get( pHt->Which() ) )
+//                  else if( pHt->GetAttr() != aFormatSet.Get( pHt->Which() ) )
                         // uneindeutig
                         bChkInvalid = true;
                 }
                 else if( nAttrStart < nEnd      // reicht in den Bereich
-)//                      && pHt->GetAttr() != aFmtSet.Get( pHt->Which() ) )
+)//                      && pHt->GetAttr() != aFormatSet.Get( pHt->Which() ) )
                     bChkInvalid = true;
 
                 if( bChkInvalid )
@@ -2167,7 +2167,7 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
 
                     if ( RES_TXTATR_AUTOFMT == pHt->Which() )
                     {
-                        const SfxItemSet* pAutoSet = CharFmt::GetItemSet( pHt->GetAttr() );
+                        const SfxItemSet* pAutoSet = CharFormat::GetItemSet( pHt->GetAttr() );
                         if ( pAutoSet )
                         {
                             pItemIter.reset( new SfxItemIter( *pAutoSet ) );
@@ -2183,7 +2183,7 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
                     {
                         const sal_uInt16 nHintWhich = pItem->Which();
                         OSL_ENSURE(!isUNKNOWNATR(nHintWhich),
-                                "SwTxtNode::GetAttr(): unknown attribute?");
+                                "SwTextNode::GetAttr(): unknown attribute?");
 
                         if ( !pAttrArr.get() )
                         {
@@ -2206,7 +2206,7 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
                         {
                             if( !pPrev->mpItem )
                             {
-                                if ( bOnlyTxtAttr || *pItem != aFmtSet.Get( nHintWhich ) )
+                                if ( bOnlyTextAttr || *pItem != aFormatSet.Get( nHintWhich ) )
                                 {
                                     if( nAttrStart > nStt )
                                     {
@@ -2254,7 +2254,7 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
 
                         if( nEnd <= rItemPair.mnEndPos ) // hinter oder genau Ende
                         {
-                            if( *rItemPair.mpItem != aFmtSet.Get( nWh ) )
+                            if( *rItemPair.mpItem != aFormatSet.Get( nWh ) )
                                 (*fnMergeAttr)( rSet, *rItemPair.mpItem );
                         }
                         else
@@ -2264,18 +2264,18 @@ bool SwTxtNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
                 }
             }
         }
-        if( aFmtSet.Count() )
+        if( aFormatSet.Count() )
         {
             // aus dem Format-Set alle entfernen, die im TextSet auch gesetzt sind
-            aFmtSet.Differentiate( rSet );
+            aFormatSet.Differentiate( rSet );
             // jetzt alle zusammen "mergen"
-            rSet.Put( aFmtSet );
+            rSet.Put( aFormatSet );
         }
     }
-    else if( !bOnlyTxtAttr )
+    else if( !bOnlyTextAttr )
     {
-        // dann besorge mal die Auto-(Fmt)Attribute
-        SwCntntNode::GetAttr( rSet );
+        // dann besorge mal die Auto-(Format)Attribute
+        SwContentNode::GetAttr( rSet );
         if ( bMergeIndentValuesOfNumRule )
         {
             lcl_MergeListLevelIndentAsLRSpaceItem( *this, rSet );
@@ -2289,7 +2289,7 @@ namespace
 {
 
 typedef std::pair<sal_Int32, sal_Int32> AttrSpan_t;
-typedef std::multimap<AttrSpan_t, const SwTxtAttr*> AttrSpanMap_t;
+typedef std::multimap<AttrSpan_t, const SwTextAttr*> AttrSpanMap_t;
 
 struct IsAutoStyle
 {
@@ -2320,13 +2320,13 @@ struct RemovePresentAttrs
             return;
         }
 
-        const SwTxtAttr* const pAutoStyle(i_rAttrSpan.second);
+        const SwTextAttr* const pAutoStyle(i_rAttrSpan.second);
         SfxItemIter aIter(m_rAttrSet);
         const SfxPoolItem* pItem(aIter.GetCurItem());
         while (pItem)
         {
             const sal_uInt16 nWhich(pItem->Which());
-            if (CharFmt::IsItemIncluded(nWhich, pAutoStyle))
+            if (CharFormat::IsItemIncluded(nWhich, pAutoStyle))
             {
                 m_rAttrSet.ClearItem(nWhich);
             }
@@ -2357,7 +2357,7 @@ lcl_CollectHintSpans(const SwpHints& i_rHints, const sal_Int32 nLength,
 
     for (size_t i = 0; i < i_rHints.Count(); ++i)
     {
-        const SwTxtAttr* const pHint(i_rHints[i]);
+        const SwTextAttr* const pHint(i_rHints[i]);
         const sal_uInt16 nWhich(pHint->Which());
         if (nWhich == RES_TXTATR_CHARFMT || nWhich == RES_TXTATR_AUTOFMT)
         {
@@ -2369,7 +2369,7 @@ lcl_CollectHintSpans(const SwpHints& i_rHints, const sal_Int32 nLength,
             {
                 // insert dummy span covering the gap
                 o_rSpanMap.insert(AttrSpanMap_t::value_type(
-                    AttrSpan_t(nLastEnd, aSpan.first), (const SwTxtAttr *)0));
+                    AttrSpan_t(nLastEnd, aSpan.first), (const SwTextAttr *)0));
             }
 
             nLastEnd = aSpan.second;
@@ -2380,7 +2380,7 @@ lcl_CollectHintSpans(const SwpHints& i_rHints, const sal_Int32 nLength,
     if (nLastEnd != nLength && nLength != 0)
     {
         o_rSpanMap.insert(
-            AttrSpanMap_t::value_type(AttrSpan_t(nLastEnd, nLength), (const SwTxtAttr *)0));
+            AttrSpanMap_t::value_type(AttrSpan_t(nLastEnd, nLength), (const SwTextAttr *)0));
     }
 }
 
@@ -2411,11 +2411,11 @@ struct SfxItemSetClearer
 
 }
 
-/** Does the hard work of SwTxtNode::FmtToTxtAttr: the real conversion
+/** Does the hard work of SwTextNode::FormatToTextAttr: the real conversion
     of items to automatic styles.
  */
 void
-SwTxtNode::impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet)
+SwTextNode::impl_FormatToTextAttr(const SfxItemSet& i_rAttrSet)
 {
     typedef AttrSpanMap_t::iterator AttrSpanMap_iterator_t;
     AttrSpanMap_t aAttrSpanMap;
@@ -2454,9 +2454,9 @@ SwTxtNode::impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet)
             {
                 // there already is an automatic style on that span:
                 // create new one and remove the original one
-                SwTxtAttr* const pAutoStyle(const_cast<SwTxtAttr*>(aAutoStyleIt->second));
+                SwTextAttr* const pAutoStyle(const_cast<SwTextAttr*>(aAutoStyleIt->second));
                 const std::shared_ptr<SfxItemSet> pOldStyle(
-                        static_cast<const SwFmtAutoFmt&>(
+                        static_cast<const SwFormatAutoFormat&>(
                             pAutoStyle->GetAttr()).GetStyleHandle());
                 aCurSet.Put(*pOldStyle);
 
@@ -2465,7 +2465,7 @@ SwTxtNode::impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet)
                 DestroyAttr(pAutoStyle);
             }
             m_pSwpHints->Insert(
-                    MakeTxtAttr(*GetDoc(), aCurSet,
+                    MakeTextAttr(*GetDoc(), aCurSet,
                         aCurRange->first.first, aCurRange->first.second));
         }
 
@@ -2481,9 +2481,9 @@ SwTxtNode::impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet)
     ClearItemsFromAttrSet(aClearedIds);
 }
 
-void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd )
+void SwTextNode::FormatToTextAttr( SwTextNode* pNd )
 {
-    SfxItemSet aThisSet( GetDoc()->GetAttrPool(), aCharFmtSetRange );
+    SfxItemSet aThisSet( GetDoc()->GetAttrPool(), aCharFormatSetRange );
     if( HasSwAttrSet() && GetpSwAttrSet()->Count() )
         aThisSet.Put( *GetpSwAttrSet() );
 
@@ -2491,7 +2491,7 @@ void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd )
 
     if( pNd == this )
     {
-        impl_FmtToTxtAttr(aThisSet);
+        impl_FormatToTextAttr(aThisSet);
     }
     else
     {
@@ -2506,7 +2506,7 @@ void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd )
         //     4     a       a      clear item in this
         //     5     a       b      convert item to attr of this
 
-        SfxItemSet aNdSet( pNd->GetDoc()->GetAttrPool(), aCharFmtSetRange );
+        SfxItemSet aNdSet( pNd->GetDoc()->GetAttrPool(), aCharFormatSetRange );
         if( pNd->HasSwAttrSet() && pNd->GetpSwAttrSet()->Count() )
             aNdSet.Put( *pNd->GetpSwAttrSet() );
 
@@ -2518,7 +2518,7 @@ void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd )
         {
             SfxItemIter aIter( aThisSet );
             const SfxPoolItem* pItem = aIter.GetCurItem(), *pNdItem = 0;
-            SfxItemSet aConvertSet( GetDoc()->GetAttrPool(), aCharFmtSetRange );
+            SfxItemSet aConvertSet( GetDoc()->GetAttrPool(), aCharFormatSetRange );
             std::vector<sal_uInt16> aClearWhichIds;
 
             while( true )
@@ -2549,7 +2549,7 @@ void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd )
             ClearItemsFromAttrSet( aClearWhichIds );
 
             // 2, 5/ convert all other items to attrs
-            impl_FmtToTxtAttr(aConvertSet);
+            impl_FormatToTextAttr(aConvertSet);
         }
 
         {
@@ -2557,11 +2557,11 @@ void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd )
                     SfxItemSetClearer(aNdSet));
 
             // 3/ convert items to attrs
-            pNd->impl_FmtToTxtAttr(aNdSet);
+            pNd->impl_FormatToTextAttr(aNdSet);
 
             if( aNdSet.Count() )
             {
-                SwFmtChg aTmp1( pNd->GetFmtColl() );
+                SwFormatChg aTmp1( pNd->GetFormatColl() );
                 pNd->NotifyClients( &aTmp1, &aTmp1 );
             }
         }
@@ -2578,7 +2578,7 @@ void SwpHints::CalcFlags()
     const size_t nSize = Count();
     for( size_t nPos = 0; nPos < nSize; ++nPos )
     {
-        const SwTxtAttr* pAttr = (*this)[ nPos ];
+        const SwTextAttr* pAttr = (*this)[ nPos ];
         switch( pAttr->Which() )
         {
         case RES_TXTATR_FTN:
@@ -2588,8 +2588,8 @@ void SwpHints::CalcFlags()
             break;
         case RES_TXTATR_FIELD:
             {
-                const SwField* pFld = pAttr->GetFmtFld().GetField();
-                if( RES_DDEFLD == pFld->GetTyp()->Which() )
+                const SwField* pField = pAttr->GetFormatField().GetField();
+                if( RES_DDEFLD == pField->GetTyp()->Which() )
                 {
                     m_bDDEFields = true;
                     if ( m_bFootnote )
@@ -2607,19 +2607,19 @@ bool SwpHints::CalcHiddenParaField()
     bool bOldHasHiddenParaField = m_bHasHiddenParaField;
     bool bNewHasHiddenParaField  = false;
     const size_t nSize = Count();
-    const SwTxtAttr *pTxtHt;
+    const SwTextAttr *pTextHt;
 
     for( size_t nPos = 0; nPos < nSize; ++nPos )
     {
-        pTxtHt = (*this)[ nPos ];
-        const sal_uInt16 nWhich = pTxtHt->Which();
+        pTextHt = (*this)[ nPos ];
+        const sal_uInt16 nWhich = pTextHt->Which();
 
         if( RES_TXTATR_FIELD == nWhich )
         {
-            const SwFmtFld& rFld = pTxtHt->GetFmtFld();
-            if( RES_HIDDENPARAFLD == rFld.GetField()->GetTyp()->Which() )
+            const SwFormatField& rField = pTextHt->GetFormatField();
+            if( RES_HIDDENPARAFLD == rField.GetField()->GetTyp()->Which() )
             {
-                if( !static_cast<const SwHiddenParaField*>(rFld.GetField())->IsHidden() )
+                if( !static_cast<const SwHiddenParaField*>(rField.GetField())->IsHidden() )
                 {
                     SetHiddenParaField(false);
                     return bOldHasHiddenParaField != bNewHasHiddenParaField;
@@ -2635,12 +2635,12 @@ bool SwpHints::CalcHiddenParaField()
     return bOldHasHiddenParaField != bNewHasHiddenParaField;
 }
 
-void SwpHints::NoteInHistory( SwTxtAttr *pAttr, const bool bNew )
+void SwpHints::NoteInHistory( SwTextAttr *pAttr, const bool bNew )
 {
     if ( m_pHistory ) { m_pHistory->AddHint( pAttr, bNew ); }
 }
 
-bool SwpHints::MergePortions( SwTxtNode& rNode )
+bool SwpHints::MergePortions( SwTextNode& rNode )
 {
     if ( !Count() )
         return false;
@@ -2649,28 +2649,28 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
     SwpHintsArray::Resort();
 
     bool bRet = false;
-    typedef std::multimap< int, std::pair<SwTxtAttr*, bool> > PortionMap;
+    typedef std::multimap< int, std::pair<SwTextAttr*, bool> > PortionMap;
     PortionMap aPortionMap;
-    std::map<int, bool> RsidOnlyAutoFmtFlagMap;
+    std::map<int, bool> RsidOnlyAutoFormatFlagMap;
     sal_Int32 nLastPorStart = COMPLETE_STRING;
     int nKey = 0;
 
     // get portions by start position:
     for ( size_t i = 0; i < Count(); ++i )
     {
-        SwTxtAttr *pHt = GetTextHint( i );
+        SwTextAttr *pHt = GetTextHint( i );
         if ( RES_TXTATR_CHARFMT != pHt->Which() &&
              RES_TXTATR_AUTOFMT != pHt->Which() )
              //&&
              //RES_TXTATR_INETFMT != pHt->Which() )
             continue;
 
-        bool isRsidOnlyAutoFmt(false);
+        bool isRsidOnlyAutoFormat(false);
         // check for RSID-only AUTOFMT
         if (RES_TXTATR_AUTOFMT == pHt->Which())
         {
             std::shared_ptr<SfxItemSet> const pSet(
-                    pHt->GetAutoFmt().GetStyleHandle());
+                    pHt->GetAutoFormat().GetStyleHandle());
             if ((pSet->Count() == 1) && pSet->GetItem(RES_CHRATR_RSID, false))
             {
                 // fdo#70201: eliminate no-extent RSID-only AUTOFMT
@@ -2678,7 +2678,7 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
                 if (pHt->GetStart() == *pHt->GetEnd())
                 {
                     SwpHintsArray::DeleteAtPos(i); // kill it without History!
-                    SwTxtAttr::Destroy(pHt, rNode.GetDoc()->GetAttrPool());
+                    SwTextAttr::Destroy(pHt, rNode.GetDoc()->GetAttrPool());
                     --i;
                     continue;
                 }
@@ -2690,7 +2690,7 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
                     pHt->SetFormatIgnoreEnd  (true);
                     NoteInHistory(pHt, true);
                 }
-                isRsidOnlyAutoFmt = true;
+                isRsidOnlyAutoFormat = true;
             }
         }
 
@@ -2706,8 +2706,8 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
             ++nKey;
         nLastPorStart = nPorStart;
         aPortionMap.insert(std::make_pair(nKey,
-                            std::make_pair(pHt, isRsidOnlyAutoFmt)));
-        RsidOnlyAutoFmtFlagMap[nKey] = isRsidOnlyAutoFmt;
+                            std::make_pair(pHt, isRsidOnlyAutoFormat)));
+        RsidOnlyAutoFormatFlagMap[nKey] = isRsidOnlyAutoFormat;
     }
 
     // check if portion i can be merged with portion i+1:
@@ -2725,17 +2725,17 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
         enum { MATCH, DIFFER_ONLY_RSID, DIFFER } eMerge(MATCH);
         size_t const nAttributesInPor1 = std::distance(aRange1.first, aRange1.second);
         size_t const nAttributesInPor2 = std::distance(aRange2.first, aRange2.second);
-        bool const isRsidOnlyAutoFmt1(RsidOnlyAutoFmtFlagMap[i]);
-        bool const isRsidOnlyAutoFmt2(RsidOnlyAutoFmtFlagMap[j]);
+        bool const isRsidOnlyAutoFormat1(RsidOnlyAutoFormatFlagMap[i]);
+        bool const isRsidOnlyAutoFormat2(RsidOnlyAutoFormatFlagMap[j]);
 
         // if both have one they could be equal, but not if only one has it
-        bool const bSkipRsidOnlyAutoFmt(nAttributesInPor1 != nAttributesInPor2);
+        bool const bSkipRsidOnlyAutoFormat(nAttributesInPor1 != nAttributesInPor2);
 
         // this loop needs to handle the case where one has a CHARFMT and the
         // other CHARFMT + RSID-only AUTOFMT, so...
         // want to skip over RSID-only AUTOFMT here, hence the -1
-        if ((nAttributesInPor1 - ((isRsidOnlyAutoFmt1) ? 1 : 0)) ==
-            (nAttributesInPor2 - ((isRsidOnlyAutoFmt2) ? 1 : 0))
+        if ((nAttributesInPor1 - ((isRsidOnlyAutoFormat1) ? 1 : 0)) ==
+            (nAttributesInPor2 - ((isRsidOnlyAutoFormat2) ? 1 : 0))
             && (nAttributesInPor1 != 0 || nAttributesInPor2 != 0))
         {
             // _if_ there is one element more either in aRange1 or aRange2
@@ -2750,8 +2750,8 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
                     eMerge = DIFFER;
                     break;
                 }
-                // skip it - cannot be equal if bSkipRsidOnlyAutoFmt is set
-                if (bSkipRsidOnlyAutoFmt
+                // skip it - cannot be equal if bSkipRsidOnlyAutoFormat is set
+                if (bSkipRsidOnlyAutoFormat
                     && aIter1 != aRange1.second && aIter1->second.second)
                 {
                     assert(DIFFER != eMerge);
@@ -2759,7 +2759,7 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
                     ++aIter1;
                     continue;
                 }
-                if (bSkipRsidOnlyAutoFmt
+                if (bSkipRsidOnlyAutoFormat
                     && aIter2 != aRange2.second && aIter2->second.second)
                 {
                     assert(DIFFER != eMerge);
@@ -2768,8 +2768,8 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
                     continue;
                 }
                 assert(aIter1 != aRange1.second && aIter2 != aRange2.second);
-                SwTxtAttr const*const p1 = aIter1->second.first;
-                SwTxtAttr const*const p2 = aIter2->second.first;
+                SwTextAttr const*const p1 = aIter1->second.first;
+                SwTextAttr const*const p2 = aIter2->second.first;
                 if (p1->Which() != p2->Which())
                 {
                     eMerge = DIFFER;
@@ -2781,8 +2781,8 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
                     // in the RSID, which should have no effect on text layout
                     if (RES_TXTATR_AUTOFMT == p1->Which())
                     {
-                        SfxItemSet set1(*p1->GetAutoFmt().GetStyleHandle());
-                        SfxItemSet set2(*p2->GetAutoFmt().GetStyleHandle());
+                        SfxItemSet set1(*p1->GetAutoFormat().GetStyleHandle());
+                        SfxItemSet set2(*p2->GetAutoFormat().GetStyleHandle());
 
                         set1.ClearItem(RES_CHRATR_RSID);
                         set2.ClearItem(RES_CHRATR_RSID);
@@ -2843,7 +2843,7 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
             sal_Int32 nNewPortionEnd = 0;
             for ( aIter2 = aRange2.first; aIter2 != aRange2.second; ++aIter2 )
             {
-                SwTxtAttr *const p2 = aIter2->second.first;
+                SwTextAttr *const p2 = aIter2->second.first;
                 nNewPortionEnd = *p2->GetEnd();
 
                 const size_t nCountBeforeDelete = Count();
@@ -2860,7 +2860,7 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
             aRange1 = aPortionMap.equal_range( i );
             for ( aIter1 = aRange1.first; aIter1 != aRange1.second; ++aIter1 )
             {
-                SwTxtAttr *const p1 = aIter1->second.first;
+                SwTextAttr *const p1 = aIter1->second.first;
                 NoteInHistory( p1 );
                 *p1->GetEnd() = nNewPortionEnd;
                 NoteInHistory( p1, true );
@@ -2881,7 +2881,7 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
             {
                 if (!aIter1->second.second) // already set above, don't change
                 {
-                    SwTxtAttr *const pCurrent(aIter1->second.first);
+                    SwTextAttr *const pCurrent(aIter1->second.first);
                     if (pCurrent->IsFormatIgnoreEnd() != bSetIgnoreFlag)
                     {
                         NoteInHistory(pCurrent);
@@ -2894,7 +2894,7 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
             {
                 if (!aIter2->second.second) // already set above, don't change
                 {
-                    SwTxtAttr *const pCurrent(aIter2->second.first);
+                    SwTextAttr *const pCurrent(aIter2->second.first);
                     if (pCurrent->IsFormatIgnoreStart() != bSetIgnoreFlag)
                     {
                         NoteInHistory(pCurrent);
@@ -2912,15 +2912,15 @@ bool SwpHints::MergePortions( SwTxtNode& rNode )
 }
 
 // check if there is already a character format and adjust the sort numbers
-static void lcl_CheckSortNumber( const SwpHints& rHints, SwTxtCharFmt& rNewCharFmt )
+static void lcl_CheckSortNumber( const SwpHints& rHints, SwTextCharFormat& rNewCharFormat )
 {
-    const sal_Int32 nHtStart = rNewCharFmt.GetStart();
-    const sal_Int32 nHtEnd   = *rNewCharFmt.GetEnd();
+    const sal_Int32 nHtStart = rNewCharFormat.GetStart();
+    const sal_Int32 nHtEnd   = *rNewCharFormat.GetEnd();
     sal_uInt16 nSortNumber = 0;
 
     for ( size_t i = 0; i < rHints.Count(); ++i )
     {
-        const SwTxtAttr* pOtherHt = rHints[i];
+        const SwTextAttr* pOtherHt = rHints[i];
 
         const sal_Int32 nOtherStart = pOtherHt->GetStart();
 
@@ -2933,13 +2933,13 @@ static void lcl_CheckSortNumber( const SwpHints& rHints, SwTxtCharFmt& rNewCharF
 
             if ( nOtherStart == nHtStart && nOtherEnd == nHtEnd )
             {
-                nSortNumber = static_txtattr_cast<const SwTxtCharFmt*>(pOtherHt)->GetSortNumber() + 1;
+                nSortNumber = static_txtattr_cast<const SwTextCharFormat*>(pOtherHt)->GetSortNumber() + 1;
             }
         }
     }
 
     if ( nSortNumber > 0 )
-        rNewCharFmt.SetSortNumber( nSortNumber );
+        rNewCharFormat.SetSortNumber( nSortNumber );
 }
 
 /*
@@ -2950,8 +2950,8 @@ static void lcl_CheckSortNumber( const SwpHints& rHints, SwTxtCharFmt& rNewCharF
  * The return value indicates successful insertion.
  */
 bool SwpHints::TryInsertHint(
-    SwTxtAttr* const pHint,
-    SwTxtNode &rNode,
+    SwTextAttr* const pHint,
+    SwTextNode &rNode,
     const SetAttrMode nMode )
 {
     if ( MAX_HINTS <= Count() ) // we're sorry, this flight is overbooked...
@@ -2975,18 +2975,18 @@ bool SwpHints::TryInsertHint(
     case RES_TXTATR_CHARFMT:
     {
         // Check if character format contains hidden attribute:
-        const SwCharFmt* pFmt = pHint->GetCharFmt().GetCharFmt();
+        const SwCharFormat* pFormat = pHint->GetCharFormat().GetCharFormat();
         const SfxPoolItem* pItem;
-        if ( SfxItemState::SET == pFmt->GetItemState( RES_CHRATR_HIDDEN, true, &pItem ) )
+        if ( SfxItemState::SET == pFormat->GetItemState( RES_CHRATR_HIDDEN, true, &pItem ) )
             rNode.SetCalcHiddenCharFlags();
 
-        static_txtattr_cast<SwTxtCharFmt*>(pHint)->ChgTxtNode( &rNode );
+        static_txtattr_cast<SwTextCharFormat*>(pHint)->ChgTextNode( &rNode );
         break;
     }
     // #i75430# Recalc hidden flags if necessary
     case RES_TXTATR_AUTOFMT:
     {
-        std::shared_ptr<SfxItemSet> const pSet( pHint->GetAutoFmt().GetStyleHandle() );
+        std::shared_ptr<SfxItemSet> const pSet( pHint->GetAutoFormat().GetStyleHandle() );
         if (pHint->GetStart() == *pHint->GetEnd())
         {
             if (pSet->Count() == 1 && pSet->GetItem(RES_CHRATR_RSID, false))
@@ -2996,11 +2996,11 @@ bool SwpHints::TryInsertHint(
             }
         }
         // Check if auto style contains hidden attribute:
-        const SfxPoolItem* pHiddenItem = CharFmt::GetItem( *pHint, RES_CHRATR_HIDDEN );
+        const SfxPoolItem* pHiddenItem = CharFormat::GetItem( *pHint, RES_CHRATR_HIDDEN );
         if ( pHiddenItem )
             rNode.SetCalcHiddenCharFlags();
 
-        // fdo#71556: populate aWhichFmtAttr member of SwMsgPoolItem
+        // fdo#71556: populate aWhichFormatAttr member of SwMsgPoolItem
         const sal_uInt16 *pRanges = pSet->GetRanges();
         while( (*pRanges) != 0 )
         {
@@ -3015,24 +3015,24 @@ bool SwpHints::TryInsertHint(
         break;
     }
     case RES_TXTATR_INETFMT:
-        static_txtattr_cast<SwTxtINetFmt*>(pHint)->InitINetFmt(rNode);
+        static_txtattr_cast<SwTextINetFormat*>(pHint)->InitINetFormat(rNode);
         break;
 
     case RES_TXTATR_FIELD:
     case RES_TXTATR_ANNOTATION:
     case RES_TXTATR_INPUTFIELD:
         {
-            SwTxtFld *const pTxtFld(static_txtattr_cast<SwTxtFld*>(pHint));
-            bool bDelFirst = 0 != pTxtFld->GetpTxtNode();
-            pTxtFld->ChgTxtNode( &rNode );
+            SwTextField *const pTextField(static_txtattr_cast<SwTextField*>(pHint));
+            bool bDelFirst = 0 != pTextField->GetpTextNode();
+            pTextField->ChgTextNode( &rNode );
             SwDoc* pDoc = rNode.GetDoc();
-            const SwField* pFld = pTxtFld->GetFmtFld().GetField();
+            const SwField* pField = pTextField->GetFormatField().GetField();
 
-            if( !pDoc->getIDocumentFieldsAccess().IsNewFldLst() )
+            if( !pDoc->getIDocumentFieldsAccess().IsNewFieldLst() )
             {
                 // was fuer ein Feld ist es denn ??
                 // bestimmte Felder mussen am Doc das Calculations-Flag updaten
-                switch( pFld->GetTyp()->Which() )
+                switch( pField->GetTyp()->Which() )
                 {
                 case RES_DBFLD:
                 case RES_SETEXPFLD:
@@ -3042,14 +3042,14 @@ bool SwpHints::TryInsertHint(
                 case RES_DBNEXTSETFLD:
                     {
                         if( bDelFirst )
-                            pDoc->getIDocumentFieldsAccess().InsDelFldInFldLst(false, *pTxtFld);
+                            pDoc->getIDocumentFieldsAccess().InsDelFieldInFieldLst(false, *pTextField);
                         if( rNode.GetNodes().IsDocNodes() )
-                            pDoc->getIDocumentFieldsAccess().InsDelFldInFldLst(true, *pTxtFld);
+                            pDoc->getIDocumentFieldsAccess().InsDelFieldInFieldLst(true, *pTextField);
                     }
                     break;
                 case RES_DDEFLD:
                     if( rNode.GetNodes().IsDocNodes() )
-                        static_cast<SwDDEFieldType*>(pFld->GetTyp())->IncRefCnt();
+                        static_cast<SwDDEFieldType*>(pField->GetTyp())->IncRefCnt();
                     break;
                 }
             }
@@ -3057,58 +3057,58 @@ bool SwpHints::TryInsertHint(
             // gehts ins normale Nodes-Array?
             if( rNode.GetNodes().IsDocNodes() )
             {
-                bool bInsFldType = false;
-                switch( pFld->GetTyp()->Which() )
+                bool bInsFieldType = false;
+                switch( pField->GetTyp()->Which() )
                 {
                 case RES_SETEXPFLD:
-                    bInsFldType = static_cast<SwSetExpFieldType*>(pFld->GetTyp())->IsDeleted();
-                    if( nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(pFld->GetTyp())->GetType() )
+                    bInsFieldType = static_cast<SwSetExpFieldType*>(pField->GetTyp())->IsDeleted();
+                    if( nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(pField->GetTyp())->GetType() )
                     {
                         // bevor die ReferenzNummer gesetzt wird, sollte
                         // das Feld am richtigen FeldTypen haengen!
-                        SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(
-                                    pDoc->getIDocumentFieldsAccess().InsertFldType( *pFld->GetTyp() ) );
-                        if( pFldType != pFld->GetTyp() )
+                        SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(
+                                    pDoc->getIDocumentFieldsAccess().InsertFieldType( *pField->GetTyp() ) );
+                        if( pFieldType != pField->GetTyp() )
                         {
-                            SwFmtFld* pFmtFld = const_cast<SwFmtFld*>(&pTxtFld->GetFmtFld());
-                            pFmtFld->RegisterToFieldType( *pFldType );
-                            pFmtFld->GetField()->ChgTyp( pFldType );
+                            SwFormatField* pFormatField = const_cast<SwFormatField*>(&pTextField->GetFormatField());
+                            pFormatField->RegisterToFieldType( *pFieldType );
+                            pFormatField->GetField()->ChgTyp( pFieldType );
                         }
-                        pFldType->SetSeqRefNo( *const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pFld)) );
+                        pFieldType->SetSeqRefNo( *const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pField)) );
                     }
                     break;
                 case RES_USERFLD:
-                    bInsFldType = static_cast<SwUserFieldType*>(pFld->GetTyp())->IsDeleted();
+                    bInsFieldType = static_cast<SwUserFieldType*>(pField->GetTyp())->IsDeleted();
                     break;
 
                 case RES_DDEFLD:
-                    if( pDoc->getIDocumentFieldsAccess().IsNewFldLst() )
-                        static_cast<SwDDEFieldType*>(pFld->GetTyp())->IncRefCnt();
-                    bInsFldType = static_cast<SwDDEFieldType*>(pFld->GetTyp())->IsDeleted();
+                    if( pDoc->getIDocumentFieldsAccess().IsNewFieldLst() )
+                        static_cast<SwDDEFieldType*>(pField->GetTyp())->IncRefCnt();
+                    bInsFieldType = static_cast<SwDDEFieldType*>(pField->GetTyp())->IsDeleted();
                     break;
 
                 case RES_POSTITFLD:
                     if ( pDoc->GetDocShell() )
                     {
-                        pDoc->GetDocShell()->Broadcast( SwFmtFldHint(
-                            &pTxtFld->GetFmtFld(), SwFmtFldHintWhich::INSERTED));
+                        pDoc->GetDocShell()->Broadcast( SwFormatFieldHint(
+                            &pTextField->GetFormatField(), SwFormatFieldHintWhich::INSERTED));
                     }
                     break;
                 }
-                if( bInsFldType )
-                    pDoc->getIDocumentFieldsAccess().InsDeletedFldType( *pFld->GetTyp() );
+                if( bInsFieldType )
+                    pDoc->getIDocumentFieldsAccess().InsDeletedFieldType( *pField->GetTyp() );
             }
         }
         break;
     case RES_TXTATR_FTN :
-        static_cast<SwTxtFtn*>(pHint)->ChgTxtNode( &rNode );
+        static_cast<SwTextFootnote*>(pHint)->ChgTextNode( &rNode );
         break;
     case RES_TXTATR_REFMARK:
-        static_txtattr_cast<SwTxtRefMark*>(pHint)->ChgTxtNode( &rNode );
+        static_txtattr_cast<SwTextRefMark*>(pHint)->ChgTextNode( &rNode );
         if( rNode.GetNodes().IsDocNodes() )
         {
             // search for a reference with the same name
-            SwTxtAttr* pTmpHt;
+            SwTextAttr* pTmpHt;
             sal_Int32 *pTmpHtEnd;
             sal_Int32 *pTmpHintEnd;
             for( size_t n = 0, nEnd = Count(); n < nEnd; ++n )
@@ -3152,16 +3152,16 @@ bool SwpHints::TryInsertHint(
         }
         break;
     case RES_TXTATR_TOXMARK:
-        static_txtattr_cast<SwTxtTOXMark*>(pHint)->ChgTxtNode( &rNode );
+        static_txtattr_cast<SwTextTOXMark*>(pHint)->ChgTextNode( &rNode );
         break;
 
     case RES_TXTATR_CJK_RUBY:
-        static_txtattr_cast<SwTxtRuby*>(pHint)->InitRuby(rNode);
+        static_txtattr_cast<SwTextRuby*>(pHint)->InitRuby(rNode);
         break;
 
     case RES_TXTATR_META:
     case RES_TXTATR_METAFIELD:
-        static_txtattr_cast<SwTxtMeta *>(pHint)->ChgTxtNode( &rNode );
+        static_txtattr_cast<SwTextMeta *>(pHint)->ChgTextNode( &rNode );
         break;
 
     case RES_CHRATR_HIDDEN:
@@ -3172,10 +3172,10 @@ bool SwpHints::TryInsertHint(
     if( SetAttrMode::DONTEXPAND & nMode )
         pHint->SetDontExpand( true );
 
-    // SwTxtAttrs ohne Ende werden sonderbehandelt:
+    // SwTextAttrs ohne Ende werden sonderbehandelt:
     // Sie werden natuerlich in das Array insertet, aber sie werden nicht
     // in die pPrev/Next/On/Off-Verkettung aufgenommen.
-    // Der Formatierer erkennt diese TxtHints an dem CH_TXTATR_.. im Text !
+    // Der Formatierer erkennt diese TextHints an dem CH_TXTATR_.. im Text !
     sal_Int32 nHtStart = pHint->GetStart();
     if( !pHtEnd )
     {
@@ -3220,7 +3220,7 @@ bool SwpHints::TryInsertHint(
     if (pHint->IsNesting())
     {
         const bool bRet(
-            TryInsertNesting(rNode, *static_txtattr_cast<SwTxtAttrNesting*>(pHint)));
+            TryInsertNesting(rNode, *static_txtattr_cast<SwTextAttrNesting*>(pHint)));
         if (!bRet) return false;
     }
     // Currently REFMARK and TOXMARK have OverlapAllowed set to true.
@@ -3235,7 +3235,7 @@ bool SwpHints::TryInsertHint(
            RES_TXTATR_CHARFMT == nWhich ) )
     {
         OSL_ENSURE( nWhich != RES_TXTATR_AUTOFMT ||
-                static_cast<const SwFmtAutoFmt&>(pHint->GetAttr()).GetStyleHandle()->GetPool() ==
+                static_cast<const SwFormatAutoFormat&>(pHint->GetAttr()).GetStyleHandle()->GetPool() ==
                 &rNode.GetDoc()->GetAttrPool(),
                 "AUTOSTYLES - Pool mismatch" );
 
@@ -3262,7 +3262,7 @@ bool SwpHints::TryInsertHint(
         {
             // #i82989# Check sort numbers in NoHintAdjustMode
             if ( RES_TXTATR_CHARFMT == nWhich )
-                lcl_CheckSortNumber(*this, *static_txtattr_cast<SwTxtCharFmt*>(pHint));
+                lcl_CheckSortNumber(*this, *static_txtattr_cast<SwTextCharFormat*>(pHint));
 
             SwpHintsArray::Insert( pHint );
             NoteInHistory( pHint, true );
@@ -3290,33 +3290,33 @@ bool SwpHints::TryInsertHint(
 
 void SwpHints::DeleteAtPos( const size_t nPos )
 {
-    SwTxtAttr *pHint = GetTextHint(nPos);
+    SwTextAttr *pHint = GetTextHint(nPos);
     // ChainDelete( pHint );
     NoteInHistory( pHint );
     SwpHintsArray::DeleteAtPos( nPos );
 
     if( pHint->Which() == RES_TXTATR_FIELD )
     {
-        SwTxtFld *const pTxtFld(static_txtattr_cast<SwTxtFld*>(pHint));
-        const SwFieldType* pFldTyp = pTxtFld->GetFmtFld().GetField()->GetTyp();
-        if( RES_DDEFLD == pFldTyp->Which() )
+        SwTextField *const pTextField(static_txtattr_cast<SwTextField*>(pHint));
+        const SwFieldType* pFieldTyp = pTextField->GetFormatField().GetField()->GetTyp();
+        if( RES_DDEFLD == pFieldTyp->Which() )
         {
-            const SwTxtNode* pNd = pTxtFld->GetpTxtNode();
+            const SwTextNode* pNd = pTextField->GetpTextNode();
             if( pNd && pNd->GetNodes().IsDocNodes() )
-                const_cast<SwDDEFieldType*>(static_cast<const SwDDEFieldType*>(pFldTyp))->DecRefCnt();
-            pTxtFld->ChgTxtNode(0);
+                const_cast<SwDDEFieldType*>(static_cast<const SwDDEFieldType*>(pFieldTyp))->DecRefCnt();
+            pTextField->ChgTextNode(0);
         }
         else if ( m_bHasHiddenParaField &&
-                 RES_HIDDENPARAFLD == pFldTyp->Which() )
+                 RES_HIDDENPARAFLD == pFieldTyp->Which() )
         {
             m_bCalcHiddenParaField = true;
         }
     }
     else if ( pHint->Which() == RES_TXTATR_ANNOTATION )
     {
-        SwTxtFld *const pTxtFld(static_txtattr_cast<SwTxtFld*>(pHint));
-        const_cast<SwFmtFld&>(pTxtFld->GetFmtFld()).Broadcast(
-            SwFmtFldHint(&pTxtFld->GetFmtFld(), SwFmtFldHintWhich::REMOVED));
+        SwTextField *const pTextField(static_txtattr_cast<SwTextField*>(pHint));
+        const_cast<SwFormatField&>(pTextField->GetFormatField()).Broadcast(
+            SwFormatFieldHint(&pTextField->GetFormatField(), SwFormatFieldHintWhich::REMOVED));
     }
 
     CalcFlags();
@@ -3326,23 +3326,23 @@ void SwpHints::DeleteAtPos( const size_t nPos )
 // Ist der Hint schon bekannt, dann suche die Position und loesche ihn.
 // Ist er nicht im Array, so gibt es ein OSL_ENSURE(!!
 
-void SwpHints::Delete( SwTxtAttr* pTxtHt )
+void SwpHints::Delete( SwTextAttr* pTextHt )
 {
-    // Attr 2.0: SwpHintsArr::Delete( pTxtHt );
-    const size_t nPos = GetStartOf( pTxtHt );
+    // Attr 2.0: SwpHintsArr::Delete( pTextHt );
+    const size_t nPos = GetStartOf( pTextHt );
     OSL_ENSURE( SAL_MAX_SIZE != nPos, "Attribut nicht im Attribut-Array!" );
     if( SAL_MAX_SIZE != nPos )
         DeleteAtPos( nPos );
 }
 
-void SwTxtNode::ClearSwpHintsArr( bool bDelFields )
+void SwTextNode::ClearSwpHintsArr( bool bDelFields )
 {
     if ( HasHints() )
     {
         size_t nPos = 0;
         while ( nPos < m_pSwpHints->Count() )
         {
-            SwTxtAttr* pDel = m_pSwpHints->GetTextHint( nPos );
+            SwTextAttr* pDel = m_pSwpHints->GetTextHint( nPos );
             bool bDel = false;
 
             switch( pDel->Which() )
@@ -3372,7 +3372,7 @@ void SwTxtNode::ClearSwpHintsArr( bool bDelFields )
     }
 }
 
-sal_uInt16 SwTxtNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen,
+sal_uInt16 SwTextNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen,
                            sal_uInt16 nScript ) const
 {
     sal_uInt16 nRet = LANGUAGE_DONTKNOW;
@@ -3392,7 +3392,7 @@ sal_uInt16 SwTxtNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen,
         for ( size_t i = 0; i < nSize; ++i )
         {
             // ist der Attribut-Anfang schon groesser als der Idx ?
-            const SwTxtAttr *pHt = m_pSwpHints->operator[](i);
+            const SwTextAttr *pHt = m_pSwpHints->operator[](i);
             const sal_Int32 nAttrStart = pHt->GetStart();
             if( nEnd < nAttrStart )
                 break;
@@ -3400,7 +3400,7 @@ sal_uInt16 SwTxtNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen,
             const sal_uInt16 nWhich = pHt->Which();
 
             if( nWhichId == nWhich ||
-                    ( ( pHt->IsCharFmtAttr() || RES_TXTATR_AUTOFMT == nWhich ) && CharFmt::IsItemIncluded( nWhichId, pHt ) ) )
+                    ( ( pHt->IsCharFormatAttr() || RES_TXTATR_AUTOFMT == nWhich ) && CharFormat::IsItemIncluded( nWhichId, pHt ) ) )
             {
                 const sal_Int32 *pEndIdx = pHt->End();
                 // Ueberlappt das Attribut den Bereich?
@@ -3419,7 +3419,7 @@ sal_uInt16 SwTxtNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen,
                     if( pHt->DontExpand() ? nBegin >= *pEndIdx : nBegin > *pEndIdx)
                         continue;
                 }
-                const SfxPoolItem* pItem = CharFmt::GetItem( *pHt, nWhichId );
+                const SfxPoolItem* pItem = CharFormat::GetItem( *pHt, nWhichId );
                 const sal_uInt16 nLng = static_cast<const SvxLanguageItem*>(pItem)->GetLanguage();
 
                 // Umfasst das Attribut den Bereich komplett?
@@ -3439,7 +3439,7 @@ sal_uInt16 SwTxtNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen,
     return nRet;
 }
 
-sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr )
+sal_Unicode GetCharOfTextAttr( const SwTextAttr& rAttr )
 {
     sal_Unicode cRet = CH_TXTATR_BREAKWORD;
     switch ( rAttr.Which() )
@@ -3461,7 +3461,7 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr )
         break;
 
         default:
-            OSL_FAIL("GetCharOfTxtAttr: unknown attr");
+            OSL_FAIL("GetCharOfTextAttr: unknown attr");
             break;
     }
     return cRet;
diff --git a/sw/source/core/txtnode/txatbase.cxx b/sw/source/core/txtnode/txatbase.cxx
index d0be2b452cde..0d3c8dac089e 100644
--- a/sw/source/core/txtnode/txatbase.cxx
+++ b/sw/source/core/txtnode/txatbase.cxx
@@ -24,13 +24,13 @@
 #include <fmtfld.hxx>
 #include <docufld.hxx>
 
-SwTxtAttr::SwTxtAttr( SfxPoolItem& rAttr, sal_Int32 nStart )
+SwTextAttr::SwTextAttr( SfxPoolItem& rAttr, sal_Int32 nStart )
     : m_pAttr( &rAttr )
     , m_nStart( nStart )
     , m_bDontExpand( false )
     , m_bLockExpandFlag( false )
     , m_bDontMoveAttr( false )
-    , m_bCharFmtAttr( false )
+    , m_bCharFormatAttr( false )
     , m_bOverlapAllowedAttr( false )
     , m_bPriorityAttr( false )
     , m_bDontExpandStart( false )
@@ -42,16 +42,16 @@ SwTxtAttr::SwTxtAttr( SfxPoolItem& rAttr, sal_Int32 nStart )
 {
 }
 
-SwTxtAttr::~SwTxtAttr( )
+SwTextAttr::~SwTextAttr( )
 {
 }
 
-sal_Int32* SwTxtAttr::GetEnd()
+sal_Int32* SwTextAttr::GetEnd()
 {
     return 0;
 }
 
-void SwTxtAttr::Destroy( SwTxtAttr * pToDestroy, SfxItemPool& rPool )
+void SwTextAttr::Destroy( SwTextAttr * pToDestroy, SfxItemPool& rPool )
 {
     if (!pToDestroy) return;
     SfxPoolItem * const pAttr = pToDestroy->m_pAttr;
@@ -59,25 +59,25 @@ void SwTxtAttr::Destroy( SwTxtAttr * pToDestroy, SfxItemPool& rPool )
     rPool.Remove( *pAttr );
 }
 
-bool SwTxtAttr::operator==( const SwTxtAttr& rAttr ) const
+bool SwTextAttr::operator==( const SwTextAttr& rAttr ) const
 {
     return GetAttr() == rAttr.GetAttr();
 }
 
-SwTxtAttrEnd::SwTxtAttrEnd( SfxPoolItem& rAttr,
+SwTextAttrEnd::SwTextAttrEnd( SfxPoolItem& rAttr,
         sal_Int32 nStart, sal_Int32 nEnd ) :
-    SwTxtAttr( rAttr, nStart ), m_nEnd( nEnd )
+    SwTextAttr( rAttr, nStart ), m_nEnd( nEnd )
 {
 }
 
-sal_Int32* SwTxtAttrEnd::GetEnd()
+sal_Int32* SwTextAttrEnd::GetEnd()
 {
     return & m_nEnd;
 }
 
-void SwTxtAttr::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwTextAttr::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swTxtAttr"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swTextAttr"));
 
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("start"), BAD_CAST(OString::number(m_nStart).getStr()));
     if (End())
@@ -99,15 +99,15 @@ void SwTxtAttr::dumpAsXml(xmlTextWriterPtr pWriter) const
     case RES_TXTATR_CHARFMT:
         {
             pWhich = "character format";
-            if (SwCharFmt* pCharFmt = GetCharFmt().GetCharFmt())
-                oValue = "name: " + OUStringToOString(pCharFmt->GetName(), RTL_TEXTENCODING_UTF8);
+            if (SwCharFormat* pCharFormat = GetCharFormat().GetCharFormat())
+                oValue = "name: " + OUStringToOString(pCharFormat->GetName(), RTL_TEXTENCODING_UTF8);
             break;
         }
     case RES_TXTATR_INETFMT:
         {
             pWhich = "inet format";
-            const SwFmtINetFmt& rFmt = GetINetFmt();
-            oValue = "url: " + rFmt.GetValue().toUtf8();
+            const SwFormatINetFormat& rFormat = GetINetFormat();
+            oValue = "url: " + rFormat.GetValue().toUtf8();
             break;
         }
     default:
@@ -118,7 +118,7 @@ void SwTxtAttr::dumpAsXml(xmlTextWriterPtr pWriter) const
     if (oValue)
         xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(oValue->getStr()));
     if (Which() == RES_TXTATR_AUTOFMT)
-        GetAutoFmt().dumpAsXml(pWriter);
+        GetAutoFormat().dumpAsXml(pWriter);
 
     xmlTextWriterEndElement(pWriter);
 }
diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx
index 132554012ff4..c9f7158ffe4a 100644
--- a/sw/source/core/txtnode/txatritr.cxx
+++ b/sw/source/core/txtnode/txatritr.cxx
@@ -93,17 +93,17 @@ bool SwScriptIterator::Next()
     return bRet;
 }
 
-SwTxtAttrIterator::SwTxtAttrIterator( const SwTxtNode& rTNd, sal_uInt16 nWhchId,
+SwTextAttrIterator::SwTextAttrIterator( const SwTextNode& rTNd, sal_uInt16 nWhchId,
                                         sal_Int32 nStt,
                                         bool bUseGetWhichOfScript )
-    : aSIter( rTNd.GetTxt(), nStt ), rTxtNd( rTNd ),
+    : aSIter( rTNd.GetText(), nStt ), rTextNd( rTNd ),
     pParaItem( 0 ), nAttrPos( 0 ), nChgPos( nStt ), nWhichId( nWhchId ),
     bIsUseGetWhichOfScript( bUseGetWhichOfScript )
 {
     SearchNextChg();
 }
 
-bool SwTxtAttrIterator::Next()
+bool SwTextAttrIterator::Next()
 {
     bool bRet = false;
     if (nChgPos < aSIter.GetText().getLength())
@@ -112,7 +112,7 @@ bool SwTxtAttrIterator::Next()
         if( !aStack.empty() )
         {
             do {
-                const SwTxtAttr* pHt = aStack.front();
+                const SwTextAttr* pHt = aStack.front();
                 const sal_Int32 nEndPos = *pHt->End();
                 if( nChgPos >= nEndPos )
                     aStack.pop_front();
@@ -127,7 +127,7 @@ bool SwTxtAttrIterator::Next()
             SearchNextChg();
             if( !aStack.empty() )
             {
-                const SwTxtAttr* pHt = aStack.front();
+                const SwTextAttr* pHt = aStack.front();
                 const sal_Int32 nEndPos = *pHt->End();
                 if( nChgPos >= nEndPos )
                 {
@@ -139,7 +139,7 @@ bool SwTxtAttrIterator::Next()
                         const sal_uInt16 nWId = bIsUseGetWhichOfScript
                             ? GetWhichOfScript( nWhichId, aSIter.GetCurrScript() )
                             : nWhichId;
-                        pCurItem = &pHt->GetCharFmt().GetCharFmt()->GetFmtAttr(nWId);
+                        pCurItem = &pHt->GetCharFormat().GetCharFormat()->GetFormatAttr(nWId);
                     }
                     else
                         pCurItem = &pHt->GetAttr();
@@ -154,7 +154,7 @@ bool SwTxtAttrIterator::Next()
     return bRet;
 }
 
-void SwTxtAttrIterator::AddToStack( const SwTxtAttr& rAttr )
+void SwTextAttrIterator::AddToStack( const SwTextAttr& rAttr )
 {
     size_t nIns = 0;
     const sal_Int32 nEndPos = *rAttr.End();
@@ -165,7 +165,7 @@ void SwTxtAttrIterator::AddToStack( const SwTxtAttr& rAttr )
     aStack.insert( aStack.begin() + nIns, &rAttr );
 }
 
-void SwTxtAttrIterator::SearchNextChg()
+void SwTextAttrIterator::SearchNextChg()
 {
     sal_uInt16 nWh = 0;
     if( nChgPos == aSIter.GetScriptChgPos() )
@@ -182,14 +182,14 @@ void SwTxtAttrIterator::SearchNextChg()
         nWh = bIsUseGetWhichOfScript ?
                 GetWhichOfScript( nWhichId,
                                   aSIter.GetCurrScript() ) : nWhichId;
-        pParaItem = &rTxtNd.GetSwAttrSet().Get( nWh );
+        pParaItem = &rTextNd.GetSwAttrSet().Get( nWh );
     }
 
     sal_Int32 nStt = nChgPos;
     nChgPos = aSIter.GetScriptChgPos();
     pCurItem = pParaItem;
 
-    const SwpHints* pHts = rTxtNd.GetpSwpHints();
+    const SwpHints* pHts = rTextNd.GetpSwpHints();
     if( pHts )
     {
         if( !nWh )
@@ -202,7 +202,7 @@ void SwTxtAttrIterator::SearchNextChg()
         const SfxPoolItem* pItem = 0;
         for( ; nAttrPos < pHts->Count(); ++nAttrPos )
         {
-            const SwTxtAttr* pHt = (*pHts)[ nAttrPos ];
+            const SwTextAttr* pHt = (*pHts)[ nAttrPos ];
             const sal_Int32* pEnd = pHt->End();
             const sal_Int32 nHtStt = pHt->GetStart();
             if( nHtStt < nStt && ( !pEnd || *pEnd <= nStt ))
@@ -211,7 +211,7 @@ void SwTxtAttrIterator::SearchNextChg()
             if( nHtStt >= nChgPos )
                 break;
 
-            pItem = CharFmt::GetItem( *pHt, nWh );
+            pItem = CharFormat::GetItem( *pHt, nWh );
             if ( pItem )
             {
                 if( nHtStt > nStt )
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index 923da67a3baf..34483d974781 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -35,58 +35,58 @@
 #include <IDocumentState.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 
-TYPEINIT1(SwTxtINetFmt,SwClient);
-TYPEINIT1(SwTxtRuby,SwClient);
+TYPEINIT1(SwTextINetFormat,SwClient);
+TYPEINIT1(SwTextRuby,SwClient);
 
-SwTxtCharFmt::SwTxtCharFmt( SwFmtCharFmt& rAttr,
+SwTextCharFormat::SwTextCharFormat( SwFormatCharFormat& rAttr,
                     sal_Int32 nStt, sal_Int32 nEnde )
-    : SwTxtAttr( rAttr, nStt )
-    , SwTxtAttrEnd( rAttr, nStt, nEnde )
-    , m_pTxtNode( 0 )
+    : SwTextAttr( rAttr, nStt )
+    , SwTextAttrEnd( rAttr, nStt, nEnde )
+    , m_pTextNode( 0 )
     , m_nSortNumber( 0 )
 {
-    rAttr.pTxtAttr = this;
-    SetCharFmtAttr( true );
+    rAttr.pTextAttr = this;
+    SetCharFormatAttr( true );
 }
 
-SwTxtCharFmt::~SwTxtCharFmt( )
+SwTextCharFormat::~SwTextCharFormat( )
 {
 }
 
-void SwTxtCharFmt::ModifyNotification( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwTextCharFormat::ModifyNotification( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
     OSL_ENSURE(  isCHRATR(nWhich) || (RES_OBJECTDYING == nWhich)
              || (RES_ATTRSET_CHG == nWhich) || (RES_FMT_CHG == nWhich),
-        "SwTxtCharFmt::Modify(): unknown Modify");
+        "SwTextCharFormat::Modify(): unknown Modify");
 
-    if ( m_pTxtNode )
+    if ( m_pTextNode )
     {
         SwUpdateAttr aUpdateAttr(
             GetStart(),
             *GetEnd(),
             nWhich);
 
-        m_pTxtNode->ModifyNotification( &aUpdateAttr, &aUpdateAttr );
+        m_pTextNode->ModifyNotification( &aUpdateAttr, &aUpdateAttr );
     }
 }
 
-bool SwTxtCharFmt::GetInfo( SfxPoolItem& rInfo ) const
+bool SwTextCharFormat::GetInfo( SfxPoolItem& rInfo ) const
 {
-    if ( RES_AUTOFMT_DOCNODE != rInfo.Which() || !m_pTxtNode ||
-        &m_pTxtNode->GetNodes() != static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes )
+    if ( RES_AUTOFMT_DOCNODE != rInfo.Which() || !m_pTextNode ||
+        &m_pTextNode->GetNodes() != static_cast<SwAutoFormatGetDocNode&>(rInfo).pNodes )
     {
         return true;
     }
 
-    static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = m_pTxtNode;
+    static_cast<SwAutoFormatGetDocNode&>(rInfo).pContentNode = m_pTextNode;
     return false;
 }
 
-SwTxtAttrNesting::SwTxtAttrNesting( SfxPoolItem & i_rAttr,
+SwTextAttrNesting::SwTextAttrNesting( SfxPoolItem & i_rAttr,
             const sal_Int32 i_nStart, const sal_Int32 i_nEnd )
-    : SwTxtAttr( i_rAttr, i_nStart )
-    , SwTxtAttrEnd( i_rAttr, i_nStart, i_nEnd )
+    : SwTextAttr( i_rAttr, i_nStart )
+    , SwTextAttrEnd( i_rAttr, i_nStart, i_nEnd )
 {
     SetDontExpand( true );  // never expand this attribute
     // lock the expand flag: simple guarantee that nesting will not be
@@ -96,46 +96,46 @@ SwTxtAttrNesting::SwTxtAttrNesting( SfxPoolItem & i_rAttr,
     SetNesting( true );
 }
 
-SwTxtAttrNesting::~SwTxtAttrNesting()
+SwTextAttrNesting::~SwTextAttrNesting()
 {
 }
 
-SwTxtINetFmt::SwTxtINetFmt( SwFmtINetFmt& rAttr,
+SwTextINetFormat::SwTextINetFormat( SwFormatINetFormat& rAttr,
                             sal_Int32 nStart, sal_Int32 nEnd )
-    : SwTxtAttr( rAttr, nStart )
-    , SwTxtAttrNesting( rAttr, nStart, nEnd )
+    : SwTextAttr( rAttr, nStart )
+    , SwTextAttrNesting( rAttr, nStart, nEnd )
     , SwClient( 0 )
-    , m_pTxtNode( 0 )
+    , m_pTextNode( 0 )
     , m_bVisited( false )
     , m_bVisitedValid( false )
 {
-    rAttr.mpTxtAttr  = this;
-    SetCharFmtAttr( true );
+    rAttr.mpTextAttr  = this;
+    SetCharFormatAttr( true );
 }
 
-SwTxtINetFmt::~SwTxtINetFmt( )
+SwTextINetFormat::~SwTextINetFormat( )
 {
 }
 
-SwCharFmt* SwTxtINetFmt::GetCharFmt()
+SwCharFormat* SwTextINetFormat::GetCharFormat()
 {
-    const SwFmtINetFmt& rFmt = SwTxtAttrEnd::GetINetFmt();
-    SwCharFmt* pRet = NULL;
+    const SwFormatINetFormat& rFormat = SwTextAttrEnd::GetINetFormat();
+    SwCharFormat* pRet = NULL;
 
-    if (!rFmt.GetValue().isEmpty())
+    if (!rFormat.GetValue().isEmpty())
     {
-        SwDoc* pDoc = GetTxtNode().GetDoc();
+        SwDoc* pDoc = GetTextNode().GetDoc();
         if( !IsVisitedValid() )
         {
-            SetVisited( pDoc->IsVisitedURL( rFmt.GetValue() ) );
+            SetVisited( pDoc->IsVisitedURL( rFormat.GetValue() ) );
             SetVisitedValid( true );
         }
 
-        const sal_uInt16 nId = IsVisited() ? rFmt.GetVisitedFmtId() : rFmt.GetINetFmtId();
-        const OUString& rStr = IsVisited() ? rFmt.GetVisitedFmt() : rFmt.GetINetFmt();
+        const sal_uInt16 nId = IsVisited() ? rFormat.GetVisitedFormatId() : rFormat.GetINetFormatId();
+        const OUString& rStr = IsVisited() ? rFormat.GetVisitedFormat() : rFormat.GetINetFormat();
         if (rStr.isEmpty())
         {
-            OSL_ENSURE( false, "<SwTxtINetFmt::GetCharFmt()> - missing character format at hyperlink attribute");
+            OSL_ENSURE( false, "<SwTextINetFormat::GetCharFormat()> - missing character format at hyperlink attribute");
         }
 
         // JP 10.02.2000, Bug 72806: dont modify the doc for getting the
@@ -148,9 +148,9 @@ SwCharFmt* SwTxtINetFmt::GetCharFmt()
             pDoc->SetOle2Link( Link<>() );
         }
 
-        pRet = IsPoolUserFmt( nId )
-               ? pDoc->FindCharFmtByName( rStr )
-               : pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( nId );
+        pRet = IsPoolUserFormat( nId )
+               ? pDoc->FindCharFormatByName( rStr )
+               : pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( nId );
 
         if ( bResetMod )
         {
@@ -167,98 +167,98 @@ SwCharFmt* SwTxtINetFmt::GetCharFmt()
     return pRet;
 }
 
-void SwTxtINetFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwTextINetFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
     OSL_ENSURE(  isCHRATR(nWhich) || (RES_OBJECTDYING == nWhich)
              || (RES_ATTRSET_CHG == nWhich) || (RES_FMT_CHG == nWhich),
-        "SwTxtINetFmt::Modify(): unknown Modify");
+        "SwTextINetFormat::Modify(): unknown Modify");
 
-    if ( m_pTxtNode )
+    if ( m_pTextNode )
     {
         SwUpdateAttr aUpdateAttr(
             GetStart(),
             *GetEnd(),
             nWhich);
 
-        m_pTxtNode->ModifyNotification( &aUpdateAttr, &aUpdateAttr );
+        m_pTextNode->ModifyNotification( &aUpdateAttr, &aUpdateAttr );
     }
 }
 
     // erfrage vom Modify Informationen
-bool SwTxtINetFmt::GetInfo( SfxPoolItem& rInfo ) const
+bool SwTextINetFormat::GetInfo( SfxPoolItem& rInfo ) const
 {
-    if ( RES_AUTOFMT_DOCNODE != rInfo.Which() || !m_pTxtNode ||
-        &m_pTxtNode->GetNodes() != static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes )
+    if ( RES_AUTOFMT_DOCNODE != rInfo.Which() || !m_pTextNode ||
+        &m_pTextNode->GetNodes() != static_cast<SwAutoFormatGetDocNode&>(rInfo).pNodes )
     {
         return true;
     }
 
-    static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = m_pTxtNode;
+    static_cast<SwAutoFormatGetDocNode&>(rInfo).pContentNode = m_pTextNode;
     return false;
 }
 
-bool SwTxtINetFmt::IsProtect( ) const
+bool SwTextINetFormat::IsProtect( ) const
 {
-    return m_pTxtNode && m_pTxtNode->IsProtect();
+    return m_pTextNode && m_pTextNode->IsProtect();
 }
 
-SwTxtRuby::SwTxtRuby( SwFmtRuby& rAttr,
+SwTextRuby::SwTextRuby( SwFormatRuby& rAttr,
                       sal_Int32 nStart, sal_Int32 nEnd )
-    : SwTxtAttr( rAttr, nStart )
-    , SwTxtAttrNesting( rAttr, nStart, nEnd )
+    : SwTextAttr( rAttr, nStart )
+    , SwTextAttrNesting( rAttr, nStart, nEnd )
     , SwClient( 0 )
-    , m_pTxtNode( 0 )
+    , m_pTextNode( 0 )
 {
-    rAttr.pTxtAttr  = this;
+    rAttr.pTextAttr  = this;
 }
 
-SwTxtRuby::~SwTxtRuby()
+SwTextRuby::~SwTextRuby()
 {
 }
 
-void SwTxtRuby::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
+void SwTextRuby::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
     const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
     OSL_ENSURE(  isCHRATR(nWhich) || (RES_OBJECTDYING == nWhich)
              || (RES_ATTRSET_CHG == nWhich) || (RES_FMT_CHG == nWhich),
-        "SwTxtRuby::Modify(): unknown Modify");
+        "SwTextRuby::Modify(): unknown Modify");
 
-    if ( m_pTxtNode )
+    if ( m_pTextNode )
     {
         SwUpdateAttr aUpdateAttr(
             GetStart(),
             *GetEnd(),
             nWhich);
 
-        m_pTxtNode->ModifyNotification( &aUpdateAttr, &aUpdateAttr );
+        m_pTextNode->ModifyNotification( &aUpdateAttr, &aUpdateAttr );
     }
 }
 
-bool SwTxtRuby::GetInfo( SfxPoolItem& rInfo ) const
+bool SwTextRuby::GetInfo( SfxPoolItem& rInfo ) const
 {
-    if( RES_AUTOFMT_DOCNODE != rInfo.Which() || !m_pTxtNode ||
-        &m_pTxtNode->GetNodes() != static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes )
+    if( RES_AUTOFMT_DOCNODE != rInfo.Which() || !m_pTextNode ||
+        &m_pTextNode->GetNodes() != static_cast<SwAutoFormatGetDocNode&>(rInfo).pNodes )
     {
         return true;
     }
 
-    static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = m_pTxtNode;
+    static_cast<SwAutoFormatGetDocNode&>(rInfo).pContentNode = m_pTextNode;
     return false;
 }
 
-SwCharFmt* SwTxtRuby::GetCharFmt()
+SwCharFormat* SwTextRuby::GetCharFormat()
 {
-    const SwFmtRuby& rFmt = SwTxtAttrEnd::GetRuby();
-    SwCharFmt* pRet = 0;
+    const SwFormatRuby& rFormat = SwTextAttrEnd::GetRuby();
+    SwCharFormat* pRet = 0;
 
-    if( !rFmt.GetText().isEmpty() )
+    if( !rFormat.GetText().isEmpty() )
     {
-        const SwDoc* pDoc = GetTxtNode().GetDoc();
-        const OUString rStr = rFmt.GetCharFmtName();
+        const SwDoc* pDoc = GetTextNode().GetDoc();
+        const OUString rStr = rFormat.GetCharFormatName();
         const sal_uInt16 nId = rStr.isEmpty()
                              ? static_cast<sal_uInt16>(RES_POOLCHR_RUBYTEXT)
-                             : rFmt.GetCharFmtId();
+                             : rFormat.GetCharFormatId();
 
         // JP 10.02.2000, Bug 72806: dont modify the doc for getting the
         //              correct charstyle.
@@ -270,9 +270,9 @@ SwCharFmt* SwTxtRuby::GetCharFmt()
             const_cast<SwDoc*>(pDoc)->SetOle2Link( Link<>() );
         }
 
-        pRet = IsPoolUserFmt( nId )
-                ? pDoc->FindCharFmtByName( rStr )
-                : const_cast<SwDoc*>(pDoc)->getIDocumentStylePoolAccess().GetCharFmtFromPool( nId );
+        pRet = IsPoolUserFormat( nId )
+                ? pDoc->FindCharFormatByName( rStr )
+                : const_cast<SwDoc*>(pDoc)->getIDocumentStylePoolAccess().GetCharFormatFromPool( nId );
 
         if( bResetMod )
         {
@@ -289,48 +289,48 @@ SwCharFmt* SwTxtRuby::GetCharFmt()
     return pRet;
 }
 
-SwTxtMeta *
-SwTxtMeta::CreateTxtMeta(
+SwTextMeta *
+SwTextMeta::CreateTextMeta(
     ::sw::MetaFieldManager & i_rTargetDocManager,
-    SwTxtNode *const i_pTargetTxtNode,
-    SwFmtMeta & i_rAttr,
+    SwTextNode *const i_pTargetTextNode,
+    SwFormatMeta & i_rAttr,
     sal_Int32 const i_nStart,
     sal_Int32 const i_nEnd,
     bool const i_bIsCopy)
 {
     if (i_bIsCopy)
     {   // i_rAttr is already cloned, now call DoCopy to copy the sw::Meta
-        OSL_ENSURE(i_pTargetTxtNode, "cannot copy Meta without target node");
-        i_rAttr.DoCopy(i_rTargetDocManager, *i_pTargetTxtNode);
+        OSL_ENSURE(i_pTargetTextNode, "cannot copy Meta without target node");
+        i_rAttr.DoCopy(i_rTargetDocManager, *i_pTargetTextNode);
     }
-    SwTxtMeta *const pTxtMeta(new SwTxtMeta(i_rAttr, i_nStart, i_nEnd));
-    return pTxtMeta;
+    SwTextMeta *const pTextMeta(new SwTextMeta(i_rAttr, i_nStart, i_nEnd));
+    return pTextMeta;
 }
 
-SwTxtMeta::SwTxtMeta( SwFmtMeta & i_rAttr,
+SwTextMeta::SwTextMeta( SwFormatMeta & i_rAttr,
         const sal_Int32 i_nStart, const sal_Int32 i_nEnd )
-    : SwTxtAttr( i_rAttr, i_nStart )
-    , SwTxtAttrNesting( i_rAttr, i_nStart, i_nEnd )
+    : SwTextAttr( i_rAttr, i_nStart )
+    , SwTextAttrNesting( i_rAttr, i_nStart, i_nEnd )
 {
-    i_rAttr.SetTxtAttr( this );
+    i_rAttr.SetTextAttr( this );
     SetHasDummyChar(true);
 }
 
-SwTxtMeta::~SwTxtMeta()
+SwTextMeta::~SwTextMeta()
 {
-    SwFmtMeta & rFmtMeta( static_cast<SwFmtMeta &>(GetAttr()) );
-    if (rFmtMeta.GetTxtAttr() == this)
+    SwFormatMeta & rFormatMeta( static_cast<SwFormatMeta &>(GetAttr()) );
+    if (rFormatMeta.GetTextAttr() == this)
     {
-        rFmtMeta.SetTxtAttr(0);
+        rFormatMeta.SetTextAttr(0);
     }
 }
 
-void SwTxtMeta::ChgTxtNode(SwTxtNode * const pNode)
+void SwTextMeta::ChgTextNode(SwTextNode * const pNode)
 {
-    SwFmtMeta & rFmtMeta( static_cast<SwFmtMeta &>(GetAttr()) );
-    if (rFmtMeta.GetTxtAttr() == this)
+    SwFormatMeta & rFormatMeta( static_cast<SwFormatMeta &>(GetAttr()) );
+    if (rFormatMeta.GetTextAttr() == this)
     {
-        rFmtMeta.NotifyChangeTxtNode(pNode);
+        rFormatMeta.NotifyChangeTextNode(pNode);
     }
 }
 
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 06ebf9d4aef1..0c42a7662cb8 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -90,8 +90,8 @@ using namespace ::com::sun::star::smarttags;
 
 // Wir ersparen uns in Hyphenate ein GetFrm()
 // Achtung: in edlingu.cxx stehen die Variablen!
-extern const SwTxtNode *pLinguNode;
-extern       SwTxtFrm  *pLinguFrm;
+extern const SwTextNode *pLinguNode;
+extern       SwTextFrm  *pLinguFrm;
 
 /*
  * This has basically the same function as SwScriptInfo::MaskHiddenRanges,
@@ -99,7 +99,7 @@ extern       SwTxtFrm  *pLinguFrm;
  */
 
 static sal_Int32
-lcl_MaskRedlines( const SwTxtNode& rNode, OUStringBuffer& rText,
+lcl_MaskRedlines( const SwTextNode& rNode, OUStringBuffer& rText,
                          sal_Int32 nStt, sal_Int32 nEnd,
                          const sal_Unicode cChar )
 {
@@ -107,9 +107,9 @@ lcl_MaskRedlines( const SwTxtNode& rNode, OUStringBuffer& rText,
 
     const SwDoc& rDoc = *rNode.GetDoc();
 
-    for ( size_t nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( rNode, USHRT_MAX ); nAct < rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size(); ++nAct )
+    for ( size_t nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( rNode, USHRT_MAX ); nAct < rDoc.getIDocumentRedlineAccess().GetRedlineTable().size(); ++nAct )
     {
-        const SwRangeRedline* pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nAct ];
+        const SwRangeRedline* pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ];
 
         if ( pRed->Start()->nNode > rNode.GetIndex() )
             break;
@@ -143,7 +143,7 @@ lcl_MaskRedlines( const SwTxtNode& rNode, OUStringBuffer& rText,
  * Used for spell checking. Deleted redlines and hidden characters are masked
  */
 static bool
-lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText,
+lcl_MaskRedlinesAndHiddenText( const SwTextNode& rNode, OUStringBuffer& rText,
                                       sal_Int32 nStt, sal_Int32 nEnd,
                                       const sal_Unicode cChar = CH_TXTATR_INWORD,
                                       bool bCheckShowHiddenChar = true )
@@ -177,21 +177,21 @@ lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText,
 /**
  * Used for spell checking. Calculates a rectangle for repaint.
  */
-static SwRect lcl_CalculateRepaintRect( SwTxtFrm& rTxtFrm, sal_Int32 nChgStart, sal_Int32 nChgEnd )
+static SwRect lcl_CalculateRepaintRect( SwTextFrm& rTextFrm, sal_Int32 nChgStart, sal_Int32 nChgEnd )
 {
     SwRect aRect;
 
-    SwTxtNode *pNode = rTxtFrm.GetTxtNode();
+    SwTextNode *pNode = rTextFrm.GetTextNode();
 
     SwNodeIndex aNdIdx( *pNode );
     SwPosition aPos( aNdIdx, SwIndex( pNode, nChgEnd ) );
     SwCrsrMoveState aTmpState( MV_NONE );
     aTmpState.b2Lines = true;
-    rTxtFrm.GetCharRect( aRect, aPos, &aTmpState );
+    rTextFrm.GetCharRect( aRect, aPos, &aTmpState );
     // information about end of repaint area
     Sw2LinesPos* pEnd2Pos = aTmpState.p2Lines;
 
-    const SwTxtFrm *pEndFrm = &rTxtFrm;
+    const SwTextFrm *pEndFrm = &rTextFrm;
 
     while( pEndFrm->HasFollow() &&
            nChgEnd >= pEndFrm->GetFollow()->GetOfst() )
@@ -214,12 +214,12 @@ static SwRect lcl_CalculateRepaintRect( SwTxtFrm& rTxtFrm, sal_Int32 nChgStart,
     aTmpState.p2Lines = NULL;
     SwRect aTmp;
     aPos = SwPosition( aNdIdx, SwIndex( pNode, nChgStart ) );
-    rTxtFrm.GetCharRect( aTmp, aPos, &aTmpState );
+    rTextFrm.GetCharRect( aTmp, aPos, &aTmpState );
 
     // i63141: GetCharRect(..) could cause a formatting,
-    // during the formatting SwTxtFrms could be joined, deleted, created...
+    // during the formatting SwTextFrms could be joined, deleted, created...
     // => we have to reinit pStartFrm and pEndFrm after the formatting
-    const SwTxtFrm* pStartFrm = &rTxtFrm;
+    const SwTextFrm* pStartFrm = &rTextFrm;
     while( pStartFrm->HasFollow() &&
            nChgStart >= pStartFrm->GetFollow()->GetOfst() )
         pStartFrm = pStartFrm->GetFollow();
@@ -246,7 +246,7 @@ static SwRect lcl_CalculateRepaintRect( SwTxtFrm& rTxtFrm, sal_Int32 nChgStart,
 
     bool bSameFrame = true;
 
-    if( rTxtFrm.HasFollow() )
+    if( rTextFrm.HasFollow() )
     {
         if( pEndFrm != pStartFrm )
         {
@@ -371,7 +371,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess,
  * @param bInclRefToxMark ???
  */
 
-void SwTxtNode::RstTxtAttr(
+void SwTextNode::RstTextAttr(
     const SwIndex &rIdx,
     const sal_Int32 nLen,
     const sal_uInt16 nWhich,
@@ -386,20 +386,20 @@ void SwTxtNode::RstTxtAttr(
     sal_Int32 nEnd = nStt + nLen;
     {
         // enlarge range for the reset of text attributes in case of an overlapping input field
-        const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtAttrAt( nStt, RES_TXTATR_INPUTFIELD, PARENT ));
-        if ( pTxtInputFld == NULL )
+        const SwTextInputField* pTextInputField = dynamic_cast<const SwTextInputField*>(GetTextAttrAt( nStt, RES_TXTATR_INPUTFIELD, PARENT ));
+        if ( pTextInputField == NULL )
         {
-            pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtAttrAt(nEnd, RES_TXTATR_INPUTFIELD, PARENT ));
+            pTextInputField = dynamic_cast<const SwTextInputField*>(GetTextAttrAt(nEnd, RES_TXTATR_INPUTFIELD, PARENT ));
         }
-        if ( pTxtInputFld != NULL )
+        if ( pTextInputField != NULL )
         {
-            if ( nStt > pTxtInputFld->GetStart() )
+            if ( nStt > pTextInputField->GetStart() )
             {
-                nStt = pTxtInputFld->GetStart();
+                nStt = pTextInputField->GetStart();
             }
-            if ( nEnd < *(pTxtInputFld->End()) )
+            if ( nEnd < *(pTextInputField->End()) )
             {
-                nEnd = *(pTxtInputFld->End());
+                nEnd = *(pTextInputField->End());
             }
         }
     }
@@ -413,13 +413,13 @@ void SwTxtNode::RstTxtAttr(
 
     // We have to remember the "new" attributes that have
     // been introduced by splitting surrounding attributes (case 2,3,4).
-    std::vector<SwTxtAttr *> newAttributes;
-    std::vector<SwTxtAttr *> delAttributes;
+    std::vector<SwTextAttr *> newAttributes;
+    std::vector<SwTextAttr *> delAttributes;
 
     // iterate over attribute array until start of attribute is behind deletion range
     size_t i = 0;
     sal_Int32 nAttrStart;
-    SwTxtAttr *pHt = NULL;
+    SwTextAttr *pHt = NULL;
     while ( (i < m_pSwpHints->Count())
             && ( ( ( nAttrStart = (*m_pSwpHints)[i]->GetStart()) < nEnd )
                  || nLen==0 ) && !bExactRange)
@@ -462,7 +462,7 @@ void SwTxtNode::RstTxtAttr(
                 // if the current attribute is an autostyle, we have to check if the autostyle
                 // and pSet have any attributes in common. If so, pStyleHandle will contain
                 // a handle to AutoStyle / pSet:
-                bSkipAttr = !lcl_HaveCommonAttributes( getIDocumentStyleAccess(), pSet, 0, *static_cast<const SwFmtAutoFmt&>(pHt->GetAttr()).GetStyleHandle(), pStyleHandle );
+                bSkipAttr = !lcl_HaveCommonAttributes( getIDocumentStyleAccess(), pSet, 0, *static_cast<const SwFormatAutoFormat&>(pHt->GetAttr()).GetStyleHandle(), pStyleHandle );
             }
         }
         else if ( nWhich )
@@ -471,7 +471,7 @@ void SwTxtNode::RstTxtAttr(
             bSkipAttr = nWhich != pHt->Which();
             if ( bSkipAttr && RES_TXTATR_AUTOFMT == pHt->Which() )
             {
-                bSkipAttr = !lcl_HaveCommonAttributes( getIDocumentStyleAccess(), 0, nWhich, *static_cast<const SwFmtAutoFmt&>(pHt->GetAttr()).GetStyleHandle(), pStyleHandle );
+                bSkipAttr = !lcl_HaveCommonAttributes( getIDocumentStyleAccess(), 0, nWhich, *static_cast<const SwFormatAutoFormat&>(pHt->GetAttr()).GetStyleHandle(), pStyleHandle );
             }
         }
         else if ( !bInclRefToxMark )
@@ -511,7 +511,7 @@ void SwTxtNode::RstTxtAttr(
 
                     if ( pStyleHandle.get() )
                     {
-                        SwTxtAttr* pNew = MakeTxtAttr( *GetDoc(),
+                        SwTextAttr* pNew = MakeTextAttr( *GetDoc(),
                                 *pStyleHandle, nAttrStart, nAttrEnd );
                         newAttributes.push_back(pNew);
                     }
@@ -526,7 +526,7 @@ void SwTxtNode::RstTxtAttr(
 
                     if ( pStyleHandle.get() && nAttrStart < nEnd )
                     {
-                        SwTxtAttr* pNew = MakeTxtAttr( *GetDoc(),
+                        SwTextAttr* pNew = MakeTextAttr( *GetDoc(),
                                 *pStyleHandle, nAttrStart, nEnd );
                         newAttributes.push_back(pNew);
                     }
@@ -554,7 +554,7 @@ void SwTxtNode::RstTxtAttr(
 
                     if ( pStyleHandle.get() )
                     {
-                        SwTxtAttr* pNew = MakeTxtAttr( *GetDoc(),
+                        SwTextAttr* pNew = MakeTextAttr( *GetDoc(),
                             *pStyleHandle, nStt, nAttrEnd );
                         newAttributes.push_back(pNew);
                     }
@@ -576,20 +576,20 @@ void SwTxtNode::RstTxtAttr(
 
                     if ( pStyleHandle.get() && nStt < nEnd )
                     {
-                        SwTxtAttr* pNew = MakeTxtAttr( *GetDoc(),
+                        SwTextAttr* pNew = MakeTextAttr( *GetDoc(),
                             *pStyleHandle, nStt, nEnd );
                         newAttributes.push_back(pNew);
                     }
 
                     if( nEnd < nTmpEnd )
                     {
-                        SwTxtAttr* pNew = MakeTxtAttr( *GetDoc(),
+                        SwTextAttr* pNew = MakeTextAttr( *GetDoc(),
                             pHt->GetAttr(), nEnd, nTmpEnd );
                         if ( pNew )
                         {
-                            SwTxtCharFmt* pCharFmt = dynamic_cast<SwTxtCharFmt*>(pHt);
-                            if ( pCharFmt )
-                                static_txtattr_cast<SwTxtCharFmt*>(pNew)->SetSortNumber(pCharFmt->GetSortNumber());
+                            SwTextCharFormat* pCharFormat = dynamic_cast<SwTextCharFormat*>(pHt);
+                            if ( pCharFormat )
+                                static_txtattr_cast<SwTextCharFormat*>(pNew)->SetSortNumber(pCharFormat->GetSortNumber());
 
                             newAttributes.push_back(pNew);
                         }
@@ -605,7 +605,7 @@ void SwTxtNode::RstTxtAttr(
         // Only delete the hints which start at nStt and end at nEnd.
         for (i = 0; i < m_pSwpHints->Count(); ++i)
         {
-            SwTxtAttr* pHint = m_pSwpHints->GetTextHint(i);
+            SwTextAttr* pHint = m_pSwpHints->GetTextHint(i);
             if (pHint->GetStart() != nStt)
                 continue;
 
@@ -623,14 +623,14 @@ void SwTxtNode::RstTxtAttr(
     }
 
     // delay deleting the hints because it re-sorts the hints array
-    for (SwTxtAttr *const pDel : delAttributes)
+    for (SwTextAttr *const pDel : delAttributes)
     {
         m_pSwpHints->Delete(pDel);
         DestroyAttr(pDel);
     }
 
     // delay inserting the hints because it re-sorts the hints array
-    for (SwTxtAttr *const pNew : newAttributes)
+    for (SwTextAttr *const pNew : newAttributes)
     {
         InsertHint(pNew, SetAttrMode::NOHINTADJUST);
     }
@@ -644,14 +644,14 @@ void SwTxtNode::RstTxtAttr(
             m_pSwpHints->MergePortions(*this);
         }
 
-        // TxtFrm's respond to aHint, others to aNew
+        // TextFrm's respond to aHint, others to aNew
         SwUpdateAttr aHint(
             nMin,
             nMax,
             0);
 
         NotifyClients( 0, &aHint );
-        SwFmtChg aNew( GetFmtColl() );
+        SwFormatChg aNew( GetFormatColl() );
         NotifyClients( 0, &aNew );
     }
 }
@@ -671,7 +671,7 @@ sal_Int32 clipIndexBounds(const OUString &rStr, sal_Int32 nPos)
 // Absatzes, dann wird das erste Wort zurueckgeliefert.
 // Wenn dieses erste Wort nur aus Whitespaces besteht, returnen wir
 // einen leeren String.
-OUString SwTxtNode::GetCurWord( sal_Int32 nPos ) const
+OUString SwTextNode::GetCurWord( sal_Int32 nPos ) const
 {
     assert(nPos <= m_Text.getLength()); // invalid index
 
@@ -713,11 +713,11 @@ OUString SwTxtNode::GetCurWord( sal_Int32 nPos ) const
                        aBndry.endPos - aBndry.startPos);
 }
 
-SwScanner::SwScanner( const SwTxtNode& rNd, const OUString& rTxt,
+SwScanner::SwScanner( const SwTextNode& rNd, const OUString& rText,
     const LanguageType* pLang, const ModelToViewHelper& rConvMap,
     sal_uInt16 nType, sal_Int32 nStart, sal_Int32 nEnde, bool bClp )
     : rNode( rNd )
-    , aPreDashReplacementText(rTxt)
+    , aPreDashReplacementText(rText)
     , pLanguage( pLang )
     , m_ModelToView( rConvMap )
     , nLen( 0 )
@@ -939,13 +939,13 @@ bool SwScanner::NextWord()
     return true;
 }
 
-bool SwTxtNode::Spell(SwSpellArgs* pArgs)
+bool SwTextNode::Spell(SwSpellArgs* pArgs)
 {
-    // Die Aehnlichkeiten zu SwTxtFrm::_AutoSpell sind beabsichtigt ...
+    // Die Aehnlichkeiten zu SwTextFrm::_AutoSpell sind beabsichtigt ...
     // ACHTUNG: Ev. Bugs in beiden Routinen fixen!
 
     // modify string according to redline information and hidden text
-    const OUString aOldTxt( m_Text );
+    const OUString aOldText( m_Text );
     OUStringBuffer buf(m_Text);
     const bool bRestoreString =
         lcl_MaskRedlinesAndHiddenText(*this, buf, 0, m_Text.getLength());
@@ -995,7 +995,7 @@ bool SwTxtNode::Spell(SwSpellArgs* pArgs)
                 // reset original text
                 if ( bRestoreString )
                 {
-                    m_Text = aOldTxt;
+                    m_Text = aOldText;
                 }
                 return false;
             }
@@ -1060,13 +1060,13 @@ bool SwTxtNode::Spell(SwSpellArgs* pArgs)
     // reset original text
     if ( bRestoreString )
     {
-        m_Text = aOldTxt;
+        m_Text = aOldText;
     }
 
     return pArgs->xSpellAlt.is();
 }
 
-void SwTxtNode::SetLanguageAndFont( const SwPaM &rPaM,
+void SwTextNode::SetLanguageAndFont( const SwPaM &rPaM,
     LanguageType nLang, sal_uInt16 nLangWhichId,
     const vcl::Font *pFont,  sal_uInt16 nFontWhichId )
 {
@@ -1101,7 +1101,7 @@ void SwTxtNode::SetLanguageAndFont( const SwPaM &rPaM,
 
 }
 
-bool SwTxtNode::Convert( SwConversionArgs &rArgs )
+bool SwTextNode::Convert( SwConversionArgs &rArgs )
 {
     // get range of text within node to be converted
     // (either all the text or the text within the selection
@@ -1117,7 +1117,7 @@ bool SwTxtNode::Convert( SwConversionArgs &rArgs )
     rArgs.aConvText.clear();
 
     // modify string according to redline information and hidden text
-    const OUString aOldTxt( m_Text );
+    const OUString aOldText( m_Text );
     OUStringBuffer buf(m_Text);
     const bool bRestoreString =
         lcl_MaskRedlinesAndHiddenText(*this, buf, 0, m_Text.getLength());
@@ -1230,15 +1230,15 @@ bool SwTxtNode::Convert( SwConversionArgs &rArgs )
     // restore original text
     if ( bRestoreString )
     {
-        m_Text = aOldTxt;
+        m_Text = aOldText;
     }
 
     return !rArgs.aConvText.isEmpty();
 }
 
-// Die Aehnlichkeiten zu SwTxtNode::Spell sind beabsichtigt ...
+// Die Aehnlichkeiten zu SwTextNode::Spell sind beabsichtigt ...
 // ACHTUNG: Ev. Bugs in beiden Routinen fixen!
-SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, sal_Int32 nActPos )
+SwRect SwTextFrm::_AutoSpell( const SwContentNode* pActNode, sal_Int32 nActPos )
 {
     SwRect aRect;
 #if OSL_DEBUG_LEVEL > 1
@@ -1246,29 +1246,29 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, sal_Int32 nActPos )
     if ( bStop )
         return aRect;
 #endif
-    // Die Aehnlichkeiten zu SwTxtNode::Spell sind beabsichtigt ...
+    // Die Aehnlichkeiten zu SwTextNode::Spell sind beabsichtigt ...
     // ACHTUNG: Ev. Bugs in beiden Routinen fixen!
-    SwTxtNode *pNode = GetTxtNode();
+    SwTextNode *pNode = GetTextNode();
     if( pNode != pActNode || !nActPos )
         nActPos = COMPLETE_STRING;
 
     SwAutoCompleteWord& rACW = SwDoc::GetAutoCompleteWords();
 
     // modify string according to redline information and hidden text
-    const OUString aOldTxt( pNode->GetTxt() );
+    const OUString aOldText( pNode->GetText() );
     OUStringBuffer buf(pNode->m_Text);
     const bool bRestoreString =
-        lcl_MaskRedlinesAndHiddenText(*pNode, buf, 0, pNode->GetTxt().getLength());
+        lcl_MaskRedlinesAndHiddenText(*pNode, buf, 0, pNode->GetText().getLength());
     if (bRestoreString)
     {   // ??? UGLY: is it really necessary to modify m_Text here?
         pNode->m_Text = buf.makeStringAndClear();
     }
 
     // a change of data indicates that at least one word has been modified
-    const bool bRedlineChg = (pNode->GetTxt().getStr() != aOldTxt.getStr());
+    const bool bRedlineChg = (pNode->GetText().getStr() != aOldText.getStr());
 
     sal_Int32 nBegin = 0;
-    sal_Int32 nEnd = pNode->GetTxt().getLength();
+    sal_Int32 nEnd = pNode->GetText().getLength();
     sal_Int32 nInsertPos = 0;
     sal_Int32 nChgStart = COMPLETE_STRING;
     sal_Int32 nChgEnd = 0;
@@ -1283,7 +1283,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, sal_Int32 nActPos )
         nBegin = pNode->GetWrong()->GetBeginInv();
         if( COMPLETE_STRING != nBegin )
         {
-            nEnd = std::max(pNode->GetWrong()->GetEndInv(), pNode->GetTxt().getLength());
+            nEnd = std::max(pNode->GetWrong()->GetEndInv(), pNode->GetText().getLength());
         }
 
         // get word around nBegin, we start at nBegin - 1
@@ -1294,7 +1294,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, sal_Int32 nActPos )
 
             LanguageType eActLang = pNode->GetLang( nBegin );
             Boundary aBound =
-                g_pBreakIt->GetBreakIter()->getWordBoundary( pNode->GetTxt(), nBegin,
+                g_pBreakIt->GetBreakIter()->getWordBoundary( pNode->GetText(), nBegin,
                     g_pBreakIt->GetLocale( eActLang ),
                     WordType::DICTIONARY_WORD, true );
             nBegin = aBound.startPos;
@@ -1323,7 +1323,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, sal_Int32 nActPos )
         uno::Reference< XSpellChecker1 > xSpell( ::GetSpellChecker() );
         SwDoc* pDoc = pNode->GetDoc();
 
-        SwScanner aScanner( *pNode, pNode->GetTxt(), 0, ModelToViewHelper(),
+        SwScanner aScanner( *pNode, pNode->GetText(), 0, ModelToViewHelper(),
                             WordType::DICTIONARY_WORD, nBegin, nEnd);
 
         while( aScanner.NextWord() )
@@ -1381,7 +1381,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, sal_Int32 nActPos )
     // i63141 before calling GetCharRect(..) with formatting!
     if ( bRestoreString )
     {
-        pNode->m_Text = aOldTxt;
+        pNode->m_Text = aOldText;
     }
     if( pNode->GetWrong() )
     {
@@ -1426,11 +1426,11 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, sal_Int32 nActPos )
     @param nActPos ???
     @return SwRect Repaint area
 */
-SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, sal_Int32 /*nActPos*/ )
+SwRect SwTextFrm::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActPos*/ )
 {
     SwRect aRet;
-    SwTxtNode *pNode = GetTxtNode();
-    const OUString& rText = pNode->GetTxt();
+    SwTextNode *pNode = GetTextNode();
+    const OUString& rText = pNode->GetText();
 
     // Iterate over language portions
     SmartTagMgr& rSmartTagMgr = SwSmartTagMgr::Get();
@@ -1545,9 +1545,9 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, sal_Int32 /*nActPos*/
 }
 
 // Wird vom CollectAutoCmplWords gerufen
-void SwTxtFrm::CollectAutoCmplWrds( SwCntntNode* pActNode, sal_Int32 nActPos )
+void SwTextFrm::CollectAutoCmplWrds( SwContentNode* pActNode, sal_Int32 nActPos )
 {
-    SwTxtNode *pNode = GetTxtNode();
+    SwTextNode *pNode = GetTextNode();
     if( pNode != pActNode || !nActPos )
         nActPos = COMPLETE_STRING;
 
@@ -1555,14 +1555,14 @@ void SwTxtFrm::CollectAutoCmplWrds( SwCntntNode* pActNode, sal_Int32 nActPos )
     SwAutoCompleteWord& rACW = SwDoc::GetAutoCompleteWords();
 
     sal_Int32  nBegin = 0;
-    sal_Int32  nEnd = pNode->GetTxt().getLength();
+    sal_Int32  nEnd = pNode->GetText().getLength();
     sal_Int32  nLen;
     bool bACWDirty = false, bAnyWrd = false;
 
     if( nBegin < nEnd )
     {
         int nCnt = 200;
-        SwScanner aScanner( *pNode, pNode->GetTxt(), 0, ModelToViewHelper(),
+        SwScanner aScanner( *pNode, pNode->GetText(), 0, ModelToViewHelper(),
                             WordType::DICTIONARY_WORD, nBegin, nEnd );
         while( aScanner.NextWord() )
         {
@@ -1594,8 +1594,8 @@ void SwTxtFrm::CollectAutoCmplWrds( SwCntntNode* pActNode, sal_Int32 nActPos )
         pNode->SetAutoCompleteWordDirty( false );
 }
 
-/** Findet den TxtFrm und sucht dessen CalcHyph */
-bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
+/** Findet den TextFrm und sucht dessen CalcHyph */
+bool SwTextNode::Hyphenate( SwInterHyphInfo &rHyphInf )
 {
     // Abkuerzung: am Absatz ist keine Sprache eingestellt:
     if ( LANGUAGE_NONE == sal_uInt16( GetSwAttrSet().GetLanguage().GetLanguage() )
@@ -1609,9 +1609,9 @@ bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
     if( pLinguNode != this )
     {
         pLinguNode = this;
-        pLinguFrm = static_cast<SwTxtFrm*>(getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), rHyphInf.GetCrsrPos() ));
+        pLinguFrm = static_cast<SwTextFrm*>(getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), rHyphInf.GetCrsrPos() ));
     }
-    SwTxtFrm *pFrm = pLinguFrm;
+    SwTextFrm *pFrm = pLinguFrm;
     if( pFrm )
         pFrm = &(pFrm->GetFrmAtOfst( rHyphInf.nStart ));
     else
@@ -1619,7 +1619,7 @@ bool SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
         // 4935: Seit der Trennung ueber Sonderbereiche sind Faelle
         // moeglich, in denen kein Frame zum Node vorliegt.
         // Also keinOSL_ENSURE
-        OSL_ENSURE( pFrm, "!SwTxtNode::Hyphenate: can't find any frame" );
+        OSL_ENSURE( pFrm, "!SwTextNode::Hyphenate: can't find any frame" );
         return false;
     }
 
@@ -1655,7 +1655,7 @@ namespace
 }
 
 // change text to Upper/Lower/Hiragana/Katagana/...
-void SwTxtNode::TransliterateText(
+void SwTextNode::TransliterateText(
     utl::TransliterationWrapper& rTrans,
     sal_Int32 nStt, sal_Int32 nEnd,
     SwUndoTransliterate* pUndo )
@@ -1685,12 +1685,12 @@ void SwTxtNode::TransliterateText(
             Boundary aSttBndry;
             Boundary aEndBndry;
             aSttBndry = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                        GetTxt(), nStt,
+                        GetText(), nStt,
                         g_pBreakIt->GetLocale( GetLang( nStt ) ),
                         nWordType,
                         true /*prefer forward direction*/);
             aEndBndry = g_pBreakIt->GetBreakIter()->getWordBoundary(
-                        GetTxt(), nEnd,
+                        GetText(), nEnd,
                         g_pBreakIt->GetLocale( GetLang( nEnd ) ),
                         nWordType,
                         false /*prefer backward direction*/);
@@ -1699,7 +1699,7 @@ void SwTxtNode::TransliterateText(
             if (aSttBndry.endPos <= nStt)
             {
                 aSttBndry = g_pBreakIt->GetBreakIter()->nextWord(
-                        GetTxt(), aSttBndry.endPos,
+                        GetText(), aSttBndry.endPos,
                         g_pBreakIt->GetLocale( GetLang( aSttBndry.endPos ) ),
                         nWordType);
             }
@@ -1707,7 +1707,7 @@ void SwTxtNode::TransliterateText(
             if (aEndBndry.startPos >= nEnd)
             {
                 aEndBndry = g_pBreakIt->GetBreakIter()->previousWord(
-                        GetTxt(), aEndBndry.startPos,
+                        GetText(), aEndBndry.startPos,
                         g_pBreakIt->GetLocale( GetLang( aEndBndry.startPos ) ),
                         nWordType);
             }
@@ -1722,7 +1722,7 @@ void SwTxtNode::TransliterateText(
 
                 Sequence <sal_Int32> aOffsets;
                 OUString const sChgd( rTrans.transliterate(
-                            GetTxt(), GetLang(nStt), nStt, nLen, &aOffsets) );
+                            GetText(), GetLang(nStt), nStt, nLen, &aOffsets) );
 
                 assert(nStt < m_Text.getLength());
                 if (0 != rtl_ustr_shortenedCompare_WithLength(
@@ -1737,7 +1737,7 @@ void SwTxtNode::TransliterateText(
                 }
 
                 aCurWordBndry = g_pBreakIt->GetBreakIter()->nextWord(
-                        GetTxt(), nEnd,
+                        GetText(), nEnd,
                         g_pBreakIt->GetLocale( GetLang( nEnd ) ),
                         nWordType);
             }
@@ -1747,18 +1747,18 @@ void SwTxtNode::TransliterateText(
             // for 'sentence case' we need to iterate sentence by sentence
 
             sal_Int32 nLastStart = g_pBreakIt->GetBreakIter()->beginOfSentence(
-                    GetTxt(), nEnd,
+                    GetText(), nEnd,
                     g_pBreakIt->GetLocale( GetLang( nEnd ) ) );
             sal_Int32 nLastEnd = g_pBreakIt->GetBreakIter()->endOfSentence(
-                    GetTxt(), nLastStart,
+                    GetText(), nLastStart,
                     g_pBreakIt->GetLocale( GetLang( nLastStart ) ) );
 
             // extend nStt, nEnd to the current sentence boundaries
             sal_Int32 nCurrentStart = g_pBreakIt->GetBreakIter()->beginOfSentence(
-                    GetTxt(), nStt,
+                    GetText(), nStt,
                     g_pBreakIt->GetLocale( GetLang( nStt ) ) );
             sal_Int32 nCurrentEnd = g_pBreakIt->GetBreakIter()->endOfSentence(
-                    GetTxt(), nCurrentStart,
+                    GetText(), nCurrentStart,
                     g_pBreakIt->GetLocale( GetLang( nCurrentStart ) ) );
 
             // prevent backtracking to the previous sentence if selection starts at end of a sentence
@@ -1769,16 +1769,16 @@ void SwTxtNode::TransliterateText(
                 // Thus to get the real sentence start we should locate the next real word,
                 // that is one found by DICTIONARY_WORD
                 i18n::Boundary aBndry = g_pBreakIt->GetBreakIter()->nextWord(
-                        GetTxt(), nCurrentEnd,
+                        GetText(), nCurrentEnd,
                         g_pBreakIt->GetLocale( GetLang( nCurrentEnd ) ),
                         i18n::WordType::DICTIONARY_WORD);
 
                 // now get new current sentence boundaries
                 nCurrentStart = g_pBreakIt->GetBreakIter()->beginOfSentence(
-                        GetTxt(), aBndry.startPos,
+                        GetText(), aBndry.startPos,
                         g_pBreakIt->GetLocale( GetLang( aBndry.startPos) ) );
                 nCurrentEnd = g_pBreakIt->GetBreakIter()->endOfSentence(
-                        GetTxt(), nCurrentStart,
+                        GetText(), nCurrentStart,
                         g_pBreakIt->GetLocale( GetLang( nCurrentStart) ) );
             }
             // prevent advancing to the next sentence if selection ends at start of a sentence
@@ -1789,11 +1789,11 @@ void SwTxtNode::TransliterateText(
                 // Thus to get the real sentence start we should locate the previous real word,
                 // that is one found by DICTIONARY_WORD
                 i18n::Boundary aBndry = g_pBreakIt->GetBreakIter()->previousWord(
-                        GetTxt(), nLastStart,
+                        GetText(), nLastStart,
                         g_pBreakIt->GetLocale( GetLang( nLastStart) ),
                         i18n::WordType::DICTIONARY_WORD);
                 nLastEnd = g_pBreakIt->GetBreakIter()->endOfSentence(
-                        GetTxt(), aBndry.startPos,
+                        GetText(), aBndry.startPos,
                         g_pBreakIt->GetLocale( GetLang( aBndry.startPos) ) );
                 if (nCurrentEnd > nLastEnd)
                     nCurrentEnd = nLastEnd;
@@ -1805,7 +1805,7 @@ void SwTxtNode::TransliterateText(
                 OSL_ENSURE( nLen > 0, "invalid word length of 0" );
 
                 Sequence <sal_Int32> aOffsets;
-                OUString const sChgd( rTrans.transliterate(GetTxt(),
+                OUString const sChgd( rTrans.transliterate(GetText(),
                     GetLang(nCurrentStart), nCurrentStart, nLen, &aOffsets) );
 
                 assert(nStt < m_Text.getLength());
@@ -1822,12 +1822,12 @@ void SwTxtNode::TransliterateText(
 
                 Boundary aFirstWordBndry;
                 aFirstWordBndry = g_pBreakIt->GetBreakIter()->nextWord(
-                        GetTxt(), nCurrentEnd,
+                        GetText(), nCurrentEnd,
                         g_pBreakIt->GetLocale( GetLang( nCurrentEnd ) ),
                         nWordType);
                 nCurrentStart = aFirstWordBndry.startPos;
                 nCurrentEnd = g_pBreakIt->GetBreakIter()->endOfSentence(
-                        GetTxt(), nCurrentStart,
+                        GetText(), nCurrentStart,
                         g_pBreakIt->GetLocale( GetLang( nCurrentStart ) ) );
             }
         }
@@ -1892,7 +1892,7 @@ void SwTxtNode::TransliterateText(
                 nSum += rData.sChanged.getLength() - rData.nLen;
                 if (nSum > static_cast<size_t>(GetSpaceLeft()))
                 {
-                    SAL_WARN("sw.core", "SwTxtNode::ReplaceTextOnly: "
+                    SAL_WARN("sw.core", "SwTextNode::ReplaceTextOnly: "
                             "node text with insertion > node capacity.");
                     return;
                 }
@@ -1904,7 +1904,7 @@ void SwTxtNode::TransliterateText(
     }
 }
 
-void SwTxtNode::ReplaceTextOnly( sal_Int32 nPos, sal_Int32 nLen,
+void SwTextNode::ReplaceTextOnly( sal_Int32 nPos, sal_Int32 nLen,
                                 const OUString & rText,
                                 const Sequence<sal_Int32>& rOffsets )
 {
@@ -1944,16 +1944,16 @@ void SwTxtNode::ReplaceTextOnly( sal_Int32 nPos, sal_Int32 nLen,
         Update( SwIndex( this, nMyOff ), nLen - nMyOff, true );
 
     // notify the layout!
-    SwDelTxt aDelHint( nPos, nTLen );
+    SwDelText aDelHint( nPos, nTLen );
     NotifyClients( 0, &aDelHint );
 
-    SwInsTxt aHint( nPos, nTLen );
+    SwInsText aHint( nPos, nTLen );
     NotifyClients( 0, &aHint );
 }
 
 // the return values allows us to see if we did the heavy-
 // lifting required to actually break and count the words.
-bool SwTxtNode::CountWords( SwDocStat& rStat,
+bool SwTextNode::CountWords( SwDocStat& rStat,
                             sal_Int32 nStt, sal_Int32 nEnd ) const
 {
     if( nStt > nEnd )
@@ -1964,7 +1964,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat,
     {   //not counting txtnodes used to hold deleted redline content
         return false;
     }
-    bool bCountAll = ( (0 == nStt) && (GetTxt().getLength() == nEnd) );
+    bool bCountAll = ( (0 == nStt) && (GetText().getLength() == nEnd) );
     ++rStat.nAllPara; // #i93174#: count _all_ paragraphs
     if ( IsHidden() )
     {   // not counting hidden paras
@@ -2135,7 +2135,7 @@ struct SwParaIdleData_Impl
         bAutoComplDirty     ( true ) {};
 };
 
-void SwTxtNode::InitSwParaStatistics( bool bNew )
+void SwTextNode::InitSwParaStatistics( bool bNew )
 {
     if ( bNew )
     {
@@ -2151,7 +2151,7 @@ void SwTxtNode::InitSwParaStatistics( bool bNew )
     }
 }
 
-void SwTxtNode::SetWrong( SwWrongList* pNew, bool bDelete )
+void SwTextNode::SetWrong( SwWrongList* pNew, bool bDelete )
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2163,18 +2163,18 @@ void SwTxtNode::SetWrong( SwWrongList* pNew, bool bDelete )
     }
 }
 
-SwWrongList* SwTxtNode::GetWrong()
+SwWrongList* SwTextNode::GetWrong()
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->pWrong : 0;
 }
 
 // #i71360#
-const SwWrongList* SwTxtNode::GetWrong() const
+const SwWrongList* SwTextNode::GetWrong() const
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->pWrong : 0;
 }
 
-void SwTxtNode::SetGrammarCheck( SwGrammarMarkUp* pNew, bool bDelete )
+void SwTextNode::SetGrammarCheck( SwGrammarMarkUp* pNew, bool bDelete )
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2186,12 +2186,12 @@ void SwTxtNode::SetGrammarCheck( SwGrammarMarkUp* pNew, bool bDelete )
     }
 }
 
-SwGrammarMarkUp* SwTxtNode::GetGrammarCheck()
+SwGrammarMarkUp* SwTextNode::GetGrammarCheck()
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->pGrammarCheck : 0;
 }
 
-void SwTxtNode::SetSmartTags( SwWrongList* pNew, bool bDelete )
+void SwTextNode::SetSmartTags( SwWrongList* pNew, bool bDelete )
 {
     OSL_ENSURE( !pNew || SwSmartTagMgr::Get().IsSmartTagsEnabled(),
             "Weird - we have a smart tag list without any recognizers?" );
@@ -2206,12 +2206,12 @@ void SwTxtNode::SetSmartTags( SwWrongList* pNew, bool bDelete )
     }
 }
 
-SwWrongList* SwTxtNode::GetSmartTags()
+SwWrongList* SwTextNode::GetSmartTags()
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->pSmartTags : 0;
 }
 
-void SwTxtNode::SetParaNumberOfWords( sal_uLong nNew ) const
+void SwTextNode::SetParaNumberOfWords( sal_uLong nNew ) const
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2219,12 +2219,12 @@ void SwTxtNode::SetParaNumberOfWords( sal_uLong nNew ) const
     }
 }
 
-sal_uLong SwTxtNode::GetParaNumberOfWords() const
+sal_uLong SwTextNode::GetParaNumberOfWords() const
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->nNumberOfWords : 0;
 }
 
-void SwTxtNode::SetParaNumberOfAsianWords( sal_uLong nNew ) const
+void SwTextNode::SetParaNumberOfAsianWords( sal_uLong nNew ) const
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2232,12 +2232,12 @@ void SwTxtNode::SetParaNumberOfAsianWords( sal_uLong nNew ) const
     }
 }
 
-sal_uLong SwTxtNode::GetParaNumberOfAsianWords() const
+sal_uLong SwTextNode::GetParaNumberOfAsianWords() const
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->nNumberOfAsianWords : 0;
 }
 
-void SwTxtNode::SetParaNumberOfChars( sal_uLong nNew ) const
+void SwTextNode::SetParaNumberOfChars( sal_uLong nNew ) const
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2245,12 +2245,12 @@ void SwTxtNode::SetParaNumberOfChars( sal_uLong nNew ) const
     }
 }
 
-sal_uLong SwTxtNode::GetParaNumberOfChars() const
+sal_uLong SwTextNode::GetParaNumberOfChars() const
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->nNumberOfChars : 0;
 }
 
-void SwTxtNode::SetWordCountDirty( bool bNew ) const
+void SwTextNode::SetWordCountDirty( bool bNew ) const
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2258,12 +2258,12 @@ void SwTxtNode::SetWordCountDirty( bool bNew ) const
     }
 }
 
-sal_uLong SwTxtNode::GetParaNumberOfCharsExcludingSpaces() const
+sal_uLong SwTextNode::GetParaNumberOfCharsExcludingSpaces() const
 {
     return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->nNumberOfCharsExcludingSpaces : 0;
 }
 
-void SwTxtNode::SetParaNumberOfCharsExcludingSpaces( sal_uLong nNew ) const
+void SwTextNode::SetParaNumberOfCharsExcludingSpaces( sal_uLong nNew ) const
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2271,12 +2271,12 @@ void SwTxtNode::SetParaNumberOfCharsExcludingSpaces( sal_uLong nNew ) const
     }
 }
 
-bool SwTxtNode::IsWordCountDirty() const
+bool SwTextNode::IsWordCountDirty() const
 {
     return m_pParaIdleData_Impl && m_pParaIdleData_Impl->bWordCountDirty;
 }
 
-void SwTxtNode::SetWrongDirty( bool bNew ) const
+void SwTextNode::SetWrongDirty( bool bNew ) const
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2284,12 +2284,12 @@ void SwTxtNode::SetWrongDirty( bool bNew ) const
     }
 }
 
-bool SwTxtNode::IsWrongDirty() const
+bool SwTextNode::IsWrongDirty() const
 {
     return m_pParaIdleData_Impl && m_pParaIdleData_Impl->bWrongDirty;
 }
 
-void SwTxtNode::SetGrammarCheckDirty( bool bNew ) const
+void SwTextNode::SetGrammarCheckDirty( bool bNew ) const
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2297,12 +2297,12 @@ void SwTxtNode::SetGrammarCheckDirty( bool bNew ) const
     }
 }
 
-bool SwTxtNode::IsGrammarCheckDirty() const
+bool SwTextNode::IsGrammarCheckDirty() const
 {
     return m_pParaIdleData_Impl && m_pParaIdleData_Impl->bGrammarCheckDirty;
 }
 
-void SwTxtNode::SetSmartTagDirty( bool bNew ) const
+void SwTextNode::SetSmartTagDirty( bool bNew ) const
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2310,12 +2310,12 @@ void SwTxtNode::SetSmartTagDirty( bool bNew ) const
     }
 }
 
-bool SwTxtNode::IsSmartTagDirty() const
+bool SwTextNode::IsSmartTagDirty() const
 {
     return m_pParaIdleData_Impl && m_pParaIdleData_Impl->bSmartTagDirty;
 }
 
-void SwTxtNode::SetAutoCompleteWordDirty( bool bNew ) const
+void SwTextNode::SetAutoCompleteWordDirty( bool bNew ) const
 {
     if ( m_pParaIdleData_Impl )
     {
@@ -2323,7 +2323,7 @@ void SwTxtNode::SetAutoCompleteWordDirty( bool bNew ) const
     }
 }
 
-bool SwTxtNode::IsAutoCompleteWordDirty() const
+bool SwTextNode::IsAutoCompleteWordDirty() const
 {
     return m_pParaIdleData_Impl && m_pParaIdleData_Impl->bAutoComplDirty;
 }
diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx
index 080e8b2f24f6..b63a51a89201 100644
--- a/sw/source/core/undo/SwUndoField.cxx
+++ b/sw/source/core/undo/SwUndoField.cxx
@@ -49,7 +49,7 @@ SwPosition SwUndoField::GetPosition()
 {
     SwNode * pNode = pDoc->GetNodes()[nNodeIndex];
     SwNodeIndex aNodeIndex(*pNode);
-    SwIndex aIndex(pNode->GetCntntNode(), nOffset);
+    SwIndex aIndex(pNode->GetContentNode(), nOffset);
     SwPosition aResult(aNodeIndex, aIndex);
 
     return aResult;
@@ -58,11 +58,11 @@ SwPosition SwUndoField::GetPosition()
 SwUndoFieldFromDoc::SwUndoFieldFromDoc(const SwPosition & rPos,
                          const SwField & rOldField,
                          const SwField & rNewField,
-                         SwMsgPoolItem * _pHnt, bool _bUpdate, SwUndoId _nId)
+                         SwMsgPoolItem * _pHint, bool _bUpdate, SwUndoId _nId)
     : SwUndoField(rPos,_nId)
     , pOldField(rOldField.CopyField())
     , pNewField(rNewField.CopyField())
-    , pHnt(_pHnt)
+    , pHint(_pHint)
     , bUpdate(_bUpdate)
 {
     OSL_ENSURE(pOldField, "No old field!");
@@ -78,27 +78,27 @@ SwUndoFieldFromDoc::~SwUndoFieldFromDoc()
 
 void SwUndoFieldFromDoc::UndoImpl(::sw::UndoRedoContext &)
 {
-    SwTxtFld * pTxtFld = sw::DocumentFieldsManager::GetTxtFldAtPos(GetPosition());
-    const SwField * pField = pTxtFld ? pTxtFld->GetFmtFld().GetField() : NULL;
+    SwTextField * pTextField = sw::DocumentFieldsManager::GetTextFieldAtPos(GetPosition());
+    const SwField * pField = pTextField ? pTextField->GetFormatField().GetField() : NULL;
 
     if (pField)
     {
-        pDoc->getIDocumentFieldsAccess().UpdateFld(pTxtFld, *pOldField, pHnt, bUpdate);
+        pDoc->getIDocumentFieldsAccess().UpdateField(pTextField, *pOldField, pHint, bUpdate);
     }
 }
 
 void SwUndoFieldFromDoc::DoImpl()
 {
-    SwTxtFld * pTxtFld = sw::DocumentFieldsManager::GetTxtFldAtPos(GetPosition());
-    const SwField * pField = pTxtFld ? pTxtFld->GetFmtFld().GetField() : NULL;
+    SwTextField * pTextField = sw::DocumentFieldsManager::GetTextFieldAtPos(GetPosition());
+    const SwField * pField = pTextField ? pTextField->GetFormatField().GetField() : NULL;
 
     if (pField)
     {
-        pDoc->getIDocumentFieldsAccess().UpdateFld(pTxtFld, *pNewField, pHnt, bUpdate);
-        SwFmtFld* pDstFmtFld = const_cast<SwFmtFld*>(&pTxtFld->GetFmtFld());
+        pDoc->getIDocumentFieldsAccess().UpdateField(pTextField, *pNewField, pHint, bUpdate);
+        SwFormatField* pDstFormatField = const_cast<SwFormatField*>(&pTextField->GetFormatField());
 
-        if ( pDoc->getIDocumentFieldsAccess().GetFldType(RES_POSTITFLD, aEmptyOUStr, false) == pDstFmtFld->GetField()->GetTyp() )
-            pDoc->GetDocShell()->Broadcast( SwFmtFldHint( pDstFmtFld, SwFmtFldHintWhich::INSERTED ) );
+        if ( pDoc->getIDocumentFieldsAccess().GetFieldType(RES_POSTITFLD, aEmptyOUStr, false) == pDstFormatField->GetField()->GetTyp() )
+            pDoc->GetDocShell()->Broadcast( SwFormatFieldHint( pDstFormatField, SwFormatFieldHintWhich::INSERTED ) );
     }
 }
 
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index 55e9953b87bf..5f01e86a3018 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -31,8 +31,8 @@
 #include <IDocumentUndoRedo.hxx>
 #include <comcore.hrc>
 
-SwUndoFmtCreate::SwUndoFmtCreate
-(SwUndoId nUndoId, SwFmt * _pNew, SwFmt * _pDerivedFrom, SwDoc * _pDoc)
+SwUndoFormatCreate::SwUndoFormatCreate
+(SwUndoId nUndoId, SwFormat * _pNew, SwFormat * _pDerivedFrom, SwDoc * _pDoc)
     : SwUndo(nUndoId), pNew(_pNew),
       pDoc(_pDoc), pNewSet(NULL), nId(0), bAuto(false)
 {
@@ -40,11 +40,11 @@ SwUndoFmtCreate::SwUndoFmtCreate
         sDerivedFrom = _pDerivedFrom->GetName();
 }
 
-SwUndoFmtCreate::~SwUndoFmtCreate()
+SwUndoFormatCreate::~SwUndoFormatCreate()
 {
 }
 
-void SwUndoFmtCreate::UndoImpl(::sw::UndoRedoContext &)
+void SwUndoFormatCreate::UndoImpl(::sw::UndoRedoContext &)
 {
     if (pNew)
     {
@@ -57,7 +57,7 @@ void SwUndoFmtCreate::UndoImpl(::sw::UndoRedoContext &)
         if (pNew)
         {
             pNewSet = new SfxItemSet(pNew->GetAttrSet());
-            nId = pNew->GetPoolFmtId() & COLL_GET_RANGE_BITS;
+            nId = pNew->GetPoolFormatId() & COLL_GET_RANGE_BITS;
             bAuto = pNew->IsAuto();
 
             Delete();
@@ -65,26 +65,26 @@ void SwUndoFmtCreate::UndoImpl(::sw::UndoRedoContext &)
     }
 }
 
-void SwUndoFmtCreate::RedoImpl(::sw::UndoRedoContext &)
+void SwUndoFormatCreate::RedoImpl(::sw::UndoRedoContext &)
 {
-    SwFmt * pDerivedFrom = Find(sDerivedFrom);
-    SwFmt * pFmt = Create(pDerivedFrom);
+    SwFormat * pDerivedFrom = Find(sDerivedFrom);
+    SwFormat * pFormat = Create(pDerivedFrom);
 
-    if (pFmt && pNewSet)
+    if (pFormat && pNewSet)
     {
-        pFmt->SetAuto(bAuto);
-        pDoc->ChgFmt(*pFmt, *pNewSet);
-        pFmt->SetPoolFmtId((pFmt->GetPoolFmtId()
+        pFormat->SetAuto(bAuto);
+        pDoc->ChgFormat(*pFormat, *pNewSet);
+        pFormat->SetPoolFormatId((pFormat->GetPoolFormatId()
                             & ~COLL_GET_RANGE_BITS)
                            | nId);
 
-        pNew = pFmt;
+        pNew = pFormat;
     }
     else
         pNew = NULL;
 }
 
-SwRewriter SwUndoFmtCreate::GetRewriter() const
+SwRewriter SwUndoFormatCreate::GetRewriter() const
 {
     if (sNewName.isEmpty() && pNew)
         sNewName = pNew->GetName();
@@ -96,40 +96,40 @@ SwRewriter SwUndoFmtCreate::GetRewriter() const
     return aRewriter;
 }
 
-SwUndoFmtDelete::SwUndoFmtDelete
-(SwUndoId nUndoId, SwFmt * _pOld, SwDoc * _pDoc)
+SwUndoFormatDelete::SwUndoFormatDelete
+(SwUndoId nUndoId, SwFormat * _pOld, SwDoc * _pDoc)
     : SwUndo(nUndoId),
       pDoc(_pDoc), sOldName(_pOld->GetName()),
       aOldSet(_pOld->GetAttrSet())
 {
     sDerivedFrom = _pOld->DerivedFrom()->GetName();
-    nId = _pOld->GetPoolFmtId() & COLL_GET_RANGE_BITS;
+    nId = _pOld->GetPoolFormatId() & COLL_GET_RANGE_BITS;
     bAuto = _pOld->IsAuto();
 }
 
-SwUndoFmtDelete::~SwUndoFmtDelete()
+SwUndoFormatDelete::~SwUndoFormatDelete()
 {
 }
 
-void SwUndoFmtDelete::UndoImpl(::sw::UndoRedoContext &)
+void SwUndoFormatDelete::UndoImpl(::sw::UndoRedoContext &)
 {
-    SwFmt * pDerivedFrom = Find(sDerivedFrom);
+    SwFormat * pDerivedFrom = Find(sDerivedFrom);
 
-    SwFmt * pFmt = Create(pDerivedFrom);
+    SwFormat * pFormat = Create(pDerivedFrom);
 
-    if (pFmt)
+    if (pFormat)
     {
-        pDoc->ChgFmt(*pFmt, aOldSet);
-        pFmt->SetAuto(bAuto);
-        pFmt->SetPoolFmtId((pFmt->GetPoolFmtId() &
+        pDoc->ChgFormat(*pFormat, aOldSet);
+        pFormat->SetAuto(bAuto);
+        pFormat->SetPoolFormatId((pFormat->GetPoolFormatId() &
                                 ~COLL_GET_RANGE_BITS)
                                | nId);
     }
 }
 
-void SwUndoFmtDelete::RedoImpl(::sw::UndoRedoContext &)
+void SwUndoFormatDelete::RedoImpl(::sw::UndoRedoContext &)
 {
-    SwFmt * pOld = Find(sOldName);
+    SwFormat * pOld = Find(sOldName);
 
     if (pOld)
     {
@@ -137,7 +137,7 @@ void SwUndoFmtDelete::RedoImpl(::sw::UndoRedoContext &)
     }
 }
 
-SwRewriter SwUndoFmtDelete::GetRewriter() const
+SwRewriter SwUndoFormatDelete::GetRewriter() const
 {
     SwRewriter aRewriter;
 
@@ -146,7 +146,7 @@ SwRewriter SwUndoFmtDelete::GetRewriter() const
     return aRewriter;
 }
 
-SwUndoRenameFmt::SwUndoRenameFmt(SwUndoId nUndoId,
+SwUndoRenameFormat::SwUndoRenameFormat(SwUndoId nUndoId,
                                  const OUString & _sOldName,
                                  const OUString & _sNewName,
                                  SwDoc * _pDoc)
@@ -155,31 +155,31 @@ SwUndoRenameFmt::SwUndoRenameFmt(SwUndoId nUndoId,
 {
 }
 
-SwUndoRenameFmt::~SwUndoRenameFmt()
+SwUndoRenameFormat::~SwUndoRenameFormat()
 {
 }
 
-void SwUndoRenameFmt::UndoImpl(::sw::UndoRedoContext &)
+void SwUndoRenameFormat::UndoImpl(::sw::UndoRedoContext &)
 {
-    SwFmt * pFmt = Find(sNewName);
+    SwFormat * pFormat = Find(sNewName);
 
-    if (pFmt)
+    if (pFormat)
     {
-        pDoc->RenameFmt(*pFmt, sOldName, true);
+        pDoc->RenameFormat(*pFormat, sOldName, true);
     }
 }
 
-void SwUndoRenameFmt::RedoImpl(::sw::UndoRedoContext &)
+void SwUndoRenameFormat::RedoImpl(::sw::UndoRedoContext &)
 {
-    SwFmt *  pFmt = Find(sOldName);
+    SwFormat *  pFormat = Find(sOldName);
 
-    if (pFmt)
+    if (pFormat)
     {
-        pDoc->RenameFmt(*pFmt, sNewName, true);
+        pDoc->RenameFormat(*pFormat, sNewName, true);
     }
 }
 
-SwRewriter SwUndoRenameFmt::GetRewriter() const
+SwRewriter SwUndoRenameFormat::GetRewriter() const
 {
     SwRewriter aRewriter;
 
@@ -190,189 +190,189 @@ SwRewriter SwUndoRenameFmt::GetRewriter() const
     return aRewriter;
 }
 
-SwUndoTxtFmtCollCreate::SwUndoTxtFmtCollCreate
-(SwTxtFmtColl * _pNew, SwTxtFmtColl * _pDerivedFrom, SwDoc * _pDoc)
-    : SwUndoFmtCreate(UNDO_TXTFMTCOL_CREATE, _pNew, _pDerivedFrom, _pDoc)
+SwUndoTextFormatCollCreate::SwUndoTextFormatCollCreate
+(SwTextFormatColl * _pNew, SwTextFormatColl * _pDerivedFrom, SwDoc * _pDoc)
+    : SwUndoFormatCreate(UNDO_TXTFMTCOL_CREATE, _pNew, _pDerivedFrom, _pDoc)
 {
 }
 
-SwFmt * SwUndoTxtFmtCollCreate::Create(SwFmt * pDerivedFrom)
+SwFormat * SwUndoTextFormatCollCreate::Create(SwFormat * pDerivedFrom)
 {
-    return pDoc->MakeTxtFmtColl(sNewName, static_cast<SwTxtFmtColl *>(pDerivedFrom), true);
+    return pDoc->MakeTextFormatColl(sNewName, static_cast<SwTextFormatColl *>(pDerivedFrom), true);
 }
 
-void SwUndoTxtFmtCollCreate::Delete()
+void SwUndoTextFormatCollCreate::Delete()
 {
-    pDoc->DelTxtFmtColl(static_cast<SwTxtFmtColl *>(pNew), true);
+    pDoc->DelTextFormatColl(static_cast<SwTextFormatColl *>(pNew), true);
 }
 
-SwFmt * SwUndoTxtFmtCollCreate::Find(const OUString & rName) const
+SwFormat * SwUndoTextFormatCollCreate::Find(const OUString & rName) const
 {
-    return pDoc->FindTxtFmtCollByName(rName);
+    return pDoc->FindTextFormatCollByName(rName);
 }
 
-SwUndoTxtFmtCollDelete::SwUndoTxtFmtCollDelete(SwTxtFmtColl * _pOld,
+SwUndoTextFormatCollDelete::SwUndoTextFormatCollDelete(SwTextFormatColl * _pOld,
                                                SwDoc * _pDoc)
-    : SwUndoFmtDelete(UNDO_TXTFMTCOL_DELETE, _pOld, _pDoc)
+    : SwUndoFormatDelete(UNDO_TXTFMTCOL_DELETE, _pOld, _pDoc)
 {
 }
 
-SwFmt * SwUndoTxtFmtCollDelete::Create(SwFmt * pDerivedFrom)
+SwFormat * SwUndoTextFormatCollDelete::Create(SwFormat * pDerivedFrom)
 {
-    return pDoc->MakeTxtFmtColl(sOldName, static_cast<SwTxtFmtColl *>(pDerivedFrom), true);
+    return pDoc->MakeTextFormatColl(sOldName, static_cast<SwTextFormatColl *>(pDerivedFrom), true);
 }
 
-void SwUndoTxtFmtCollDelete::Delete(SwFmt * pOld)
+void SwUndoTextFormatCollDelete::Delete(SwFormat * pOld)
 {
-    pDoc->DelTxtFmtColl(static_cast<SwTxtFmtColl *>(pOld), true);
+    pDoc->DelTextFormatColl(static_cast<SwTextFormatColl *>(pOld), true);
 }
 
-SwFmt * SwUndoTxtFmtCollDelete::Find(const OUString & rName) const
+SwFormat * SwUndoTextFormatCollDelete::Find(const OUString & rName) const
 {
-    return pDoc->FindTxtFmtCollByName(rName);
+    return pDoc->FindTextFormatCollByName(rName);
 }
 
-SwUndoCondTxtFmtCollCreate::SwUndoCondTxtFmtCollCreate(SwConditionTxtFmtColl *_pNew,
-    SwTxtFmtColl *_pDerivedFrom, SwDoc *_pDoc)
-    : SwUndoTxtFmtCollCreate(_pNew, _pDerivedFrom, _pDoc)
+SwUndoCondTextFormatCollCreate::SwUndoCondTextFormatCollCreate(SwConditionTextFormatColl *_pNew,
+    SwTextFormatColl *_pDerivedFrom, SwDoc *_pDoc)
+    : SwUndoTextFormatCollCreate(_pNew, _pDerivedFrom, _pDoc)
 {
 }
 
-SwFmt * SwUndoCondTxtFmtCollCreate::Create(SwFmt * pDerivedFrom)
+SwFormat * SwUndoCondTextFormatCollCreate::Create(SwFormat * pDerivedFrom)
 {
-    return pDoc->MakeCondTxtFmtColl(sNewName, static_cast<SwTxtFmtColl *>(pDerivedFrom), true);
+    return pDoc->MakeCondTextFormatColl(sNewName, static_cast<SwTextFormatColl *>(pDerivedFrom), true);
 }
 
-SwUndoCondTxtFmtCollDelete::SwUndoCondTxtFmtCollDelete(SwTxtFmtColl * _pOld,
+SwUndoCondTextFormatCollDelete::SwUndoCondTextFormatCollDelete(SwTextFormatColl * _pOld,
                                                        SwDoc * _pDoc)
-    : SwUndoTxtFmtCollDelete(_pOld, _pDoc)
+    : SwUndoTextFormatCollDelete(_pOld, _pDoc)
 {
 }
 
-SwFmt * SwUndoCondTxtFmtCollDelete::Create(SwFmt * pDerivedFrom)
+SwFormat * SwUndoCondTextFormatCollDelete::Create(SwFormat * pDerivedFrom)
 {
-    return pDoc->MakeCondTxtFmtColl(sOldName, static_cast<SwTxtFmtColl *>(pDerivedFrom), true);
+    return pDoc->MakeCondTextFormatColl(sOldName, static_cast<SwTextFormatColl *>(pDerivedFrom), true);
 }
 
-SwUndoRenameFmtColl::SwUndoRenameFmtColl(const OUString & sInitOldName,
+SwUndoRenameFormatColl::SwUndoRenameFormatColl(const OUString & sInitOldName,
                                          const OUString & sInitNewName,
                                          SwDoc * _pDoc)
-    : SwUndoRenameFmt(UNDO_TXTFMTCOL_RENAME, sInitOldName, sInitNewName, _pDoc)
+    : SwUndoRenameFormat(UNDO_TXTFMTCOL_RENAME, sInitOldName, sInitNewName, _pDoc)
 {
 }
 
-SwFmt * SwUndoRenameFmtColl::Find(const OUString & rName) const
+SwFormat * SwUndoRenameFormatColl::Find(const OUString & rName) const
 {
-    return pDoc->FindTxtFmtCollByName(rName);
+    return pDoc->FindTextFormatCollByName(rName);
 }
 
-SwUndoCharFmtCreate::SwUndoCharFmtCreate(SwCharFmt * pNewFmt,
-                                         SwCharFmt * pDerivedFrom,
+SwUndoCharFormatCreate::SwUndoCharFormatCreate(SwCharFormat * pNewFormat,
+                                         SwCharFormat * pDerivedFrom,
                                          SwDoc * pDocument)
-    : SwUndoFmtCreate(UNDO_CHARFMT_CREATE, pNewFmt, pDerivedFrom, pDocument)
+    : SwUndoFormatCreate(UNDO_CHARFMT_CREATE, pNewFormat, pDerivedFrom, pDocument)
 {
 }
 
-SwFmt * SwUndoCharFmtCreate::Create(SwFmt * pDerivedFrom)
+SwFormat * SwUndoCharFormatCreate::Create(SwFormat * pDerivedFrom)
 {
-    return pDoc->MakeCharFmt(sNewName, static_cast<SwCharFmt *>(pDerivedFrom), true);
+    return pDoc->MakeCharFormat(sNewName, static_cast<SwCharFormat *>(pDerivedFrom), true);
 }
 
-void SwUndoCharFmtCreate::Delete()
+void SwUndoCharFormatCreate::Delete()
 {
-    pDoc->DelCharFmt(static_cast<SwCharFmt *>(pNew), true);
+    pDoc->DelCharFormat(static_cast<SwCharFormat *>(pNew), true);
 }
 
-SwFmt * SwUndoCharFmtCreate::Find(const OUString & rName) const
+SwFormat * SwUndoCharFormatCreate::Find(const OUString & rName) const
 {
-    return pDoc->FindCharFmtByName(rName);
+    return pDoc->FindCharFormatByName(rName);
 }
 
-SwUndoCharFmtDelete::SwUndoCharFmtDelete(SwCharFmt * pOld, SwDoc * pDocument)
-    : SwUndoFmtDelete(UNDO_CHARFMT_DELETE, pOld, pDocument)
+SwUndoCharFormatDelete::SwUndoCharFormatDelete(SwCharFormat * pOld, SwDoc * pDocument)
+    : SwUndoFormatDelete(UNDO_CHARFMT_DELETE, pOld, pDocument)
 {
 }
 
-SwFmt * SwUndoCharFmtDelete::Create(SwFmt * pDerivedFrom)
+SwFormat * SwUndoCharFormatDelete::Create(SwFormat * pDerivedFrom)
 {
-    return pDoc->MakeCharFmt(sOldName, static_cast<SwCharFmt *>(pDerivedFrom), true);
+    return pDoc->MakeCharFormat(sOldName, static_cast<SwCharFormat *>(pDerivedFrom), true);
 }
 
-void SwUndoCharFmtDelete::Delete(SwFmt * pFmt)
+void SwUndoCharFormatDelete::Delete(SwFormat * pFormat)
 {
-    pDoc->DelCharFmt(static_cast<SwCharFmt *>(pFmt), true);
+    pDoc->DelCharFormat(static_cast<SwCharFormat *>(pFormat), true);
 }
 
-SwFmt * SwUndoCharFmtDelete::Find(const OUString & rName) const
+SwFormat * SwUndoCharFormatDelete::Find(const OUString & rName) const
 {
-    return pDoc->FindCharFmtByName(rName);
+    return pDoc->FindCharFormatByName(rName);
 }
 
-SwUndoRenameCharFmt::SwUndoRenameCharFmt(const OUString & sInitOldName,
+SwUndoRenameCharFormat::SwUndoRenameCharFormat(const OUString & sInitOldName,
                                          const OUString & sInitNewName,
                                          SwDoc * pDocument)
-    : SwUndoRenameFmt(UNDO_CHARFMT_RENAME, sInitOldName, sInitNewName, pDocument)
+    : SwUndoRenameFormat(UNDO_CHARFMT_RENAME, sInitOldName, sInitNewName, pDocument)
 {
 }
 
-SwFmt * SwUndoRenameCharFmt::Find(const OUString & rName) const
+SwFormat * SwUndoRenameCharFormat::Find(const OUString & rName) const
 {
-    return pDoc->FindCharFmtByName(rName);
+    return pDoc->FindCharFormatByName(rName);
 }
 
-SwUndoFrmFmtCreate::SwUndoFrmFmtCreate(SwFrmFmt * pNewFmt,
-                                       SwFrmFmt * pDerivedFrom,
+SwUndoFrameFormatCreate::SwUndoFrameFormatCreate(SwFrameFormat * pNewFormat,
+                                       SwFrameFormat * pDerivedFrom,
                                        SwDoc * pDocument)
-    : SwUndoFmtCreate(UNDO_FRMFMT_CREATE, pNewFmt, pDerivedFrom, pDocument),
-      bAuto(pNewFmt->IsAuto())
+    : SwUndoFormatCreate(UNDO_FRMFMT_CREATE, pNewFormat, pDerivedFrom, pDocument),
+      bAuto(pNewFormat->IsAuto())
 {
 }
 
-SwFmt * SwUndoFrmFmtCreate::Create(SwFmt * pDerivedFrom)
+SwFormat * SwUndoFrameFormatCreate::Create(SwFormat * pDerivedFrom)
 {
-    return pDoc->MakeFrmFmt(sNewName, static_cast<SwFrmFmt *>(pDerivedFrom), true, bAuto);
+    return pDoc->MakeFrameFormat(sNewName, static_cast<SwFrameFormat *>(pDerivedFrom), true, bAuto);
 }
 
-void SwUndoFrmFmtCreate::Delete()
+void SwUndoFrameFormatCreate::Delete()
 {
-    pDoc->DelFrmFmt(static_cast<SwFrmFmt *>(pNew), true);
+    pDoc->DelFrameFormat(static_cast<SwFrameFormat *>(pNew), true);
 }
 
-SwFmt * SwUndoFrmFmtCreate::Find(const OUString & rName) const
+SwFormat * SwUndoFrameFormatCreate::Find(const OUString & rName) const
 {
-    return pDoc->FindFrmFmtByName(rName);
+    return pDoc->FindFrameFormatByName(rName);
 }
 
-SwUndoFrmFmtDelete::SwUndoFrmFmtDelete(SwFrmFmt * pOld, SwDoc * pDocument)
-    : SwUndoFmtDelete(UNDO_FRMFMT_DELETE, pOld, pDocument)
+SwUndoFrameFormatDelete::SwUndoFrameFormatDelete(SwFrameFormat * pOld, SwDoc * pDocument)
+    : SwUndoFormatDelete(UNDO_FRMFMT_DELETE, pOld, pDocument)
 {
 }
 
-SwFmt * SwUndoFrmFmtDelete::Create(SwFmt * pDerivedFrom)
+SwFormat * SwUndoFrameFormatDelete::Create(SwFormat * pDerivedFrom)
 {
-    return pDoc->MakeFrmFmt(sOldName, static_cast<SwFrmFmt *>(pDerivedFrom), true);
+    return pDoc->MakeFrameFormat(sOldName, static_cast<SwFrameFormat *>(pDerivedFrom), true);
 }
 
-void SwUndoFrmFmtDelete::Delete(SwFmt * pFmt)
+void SwUndoFrameFormatDelete::Delete(SwFormat * pFormat)
 {
-    pDoc->DelFrmFmt(static_cast<SwFrmFmt *>(pFmt), true);
+    pDoc->DelFrameFormat(static_cast<SwFrameFormat *>(pFormat), true);
 }
 
-SwFmt * SwUndoFrmFmtDelete::Find(const OUString & rName) const
+SwFormat * SwUndoFrameFormatDelete::Find(const OUString & rName) const
 {
-    return pDoc->FindFrmFmtByName(rName);
+    return pDoc->FindFrameFormatByName(rName);
 }
 
-SwUndoRenameFrmFmt::SwUndoRenameFrmFmt(const OUString & sInitOldName,
+SwUndoRenameFrameFormat::SwUndoRenameFrameFormat(const OUString & sInitOldName,
                                        const OUString & sInitNewName,
                                        SwDoc * pDocument)
-    : SwUndoRenameFmt(UNDO_FRMFMT_RENAME, sInitOldName, sInitNewName, pDocument)
+    : SwUndoRenameFormat(UNDO_FRMFMT_RENAME, sInitOldName, sInitNewName, pDocument)
 {
 }
 
-SwFmt * SwUndoRenameFrmFmt::Find(const OUString & rName) const
+SwFormat * SwUndoRenameFrameFormat::Find(const OUString & rName) const
 {
-    return pDoc->FindFrmFmtByName(rName);
+    return pDoc->FindFrameFormatByName(rName);
 }
 
 SwUndoNumruleCreate::SwUndoNumruleCreate(const SwNumRule * _pNew,
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index b304dfc11258..c55eb68139a4 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -42,48 +42,48 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
     sal_uLong nFooterMaster = ULONG_MAX;
     sal_uLong nFooterLeft = ULONG_MAX;
 
-    SwFmtHeader& rHead = (SwFmtHeader&)rPageDesc.GetMaster().GetHeader();
-    SwFmtFooter& rFoot = (SwFmtFooter&)rPageDesc.GetMaster().GetFooter();
-    SwFmtHeader& rLeftHead = (SwFmtHeader&)rPageDesc.GetLeft().GetHeader();
-    SwFmtFooter& rLeftFoot = (SwFmtFooter&)rPageDesc.GetLeft().GetFooter();
+    SwFormatHeader& rHead = (SwFormatHeader&)rPageDesc.GetMaster().GetHeader();
+    SwFormatFooter& rFoot = (SwFormatFooter&)rPageDesc.GetMaster().GetFooter();
+    SwFormatHeader& rLeftHead = (SwFormatHeader&)rPageDesc.GetLeft().GetHeader();
+    SwFormatFooter& rLeftFoot = (SwFormatFooter&)rPageDesc.GetLeft().GetFooter();
     if( rHead.IsActive() )
     {
-        SwFrmFmt* pHeaderFmt = rHead.GetHeaderFmt();
-        if( pHeaderFmt )
+        SwFrameFormat* pHeaderFormat = rHead.GetHeaderFormat();
+        if( pHeaderFormat )
         {
-            const SwFmtCntnt* pCntnt = &pHeaderFmt->GetCntnt();
-            if( pCntnt->GetCntntIdx() )
-                nHeaderMaster = pCntnt->GetCntntIdx()->GetIndex();
+            const SwFormatContent* pContent = &pHeaderFormat->GetContent();
+            if( pContent->GetContentIdx() )
+                nHeaderMaster = pContent->GetContentIdx()->GetIndex();
             else
                 nHeaderMaster = 0;
         }
-        SwFrmFmt* pLeftHeaderFmt = rLeftHead.GetHeaderFmt();
-        if( pLeftHeaderFmt )
+        SwFrameFormat* pLeftHeaderFormat = rLeftHead.GetHeaderFormat();
+        if( pLeftHeaderFormat )
         {
-            const SwFmtCntnt* pLeftCntnt = &pLeftHeaderFmt->GetCntnt();
-            if( pLeftCntnt->GetCntntIdx() )
-                nHeaderLeft = pLeftCntnt->GetCntntIdx()->GetIndex();
+            const SwFormatContent* pLeftContent = &pLeftHeaderFormat->GetContent();
+            if( pLeftContent->GetContentIdx() )
+                nHeaderLeft = pLeftContent->GetContentIdx()->GetIndex();
             else
                 nHeaderLeft = 0;
         }
     }
     if( rFoot.IsActive() )
     {
-        SwFrmFmt* pFooterFmt = rFoot.GetFooterFmt();
-        if( pFooterFmt )
+        SwFrameFormat* pFooterFormat = rFoot.GetFooterFormat();
+        if( pFooterFormat )
         {
-            const SwFmtCntnt* pCntnt = &pFooterFmt->GetCntnt();
-            if( pCntnt->GetCntntIdx() )
-                nFooterMaster = pCntnt->GetCntntIdx()->GetIndex();
+            const SwFormatContent* pContent = &pFooterFormat->GetContent();
+            if( pContent->GetContentIdx() )
+                nFooterMaster = pContent->GetContentIdx()->GetIndex();
             else
                 nFooterMaster = 0;
         }
-        SwFrmFmt* pLeftFooterFmt = rLeftFoot.GetFooterFmt();
-        if( pLeftFooterFmt )
+        SwFrameFormat* pLeftFooterFormat = rLeftFoot.GetFooterFormat();
+        if( pLeftFooterFormat )
         {
-            const SwFmtCntnt* pLeftCntnt = &pLeftFooterFmt->GetCntnt();
-            if( pLeftCntnt->GetCntntIdx() )
-                nFooterLeft = pLeftCntnt->GetCntntIdx()->GetIndex();
+            const SwFormatContent* pLeftContent = &pLeftFooterFormat->GetContent();
+            if( pLeftContent->GetContentIdx() )
+                nFooterLeft = pLeftContent->GetContentIdx()->GetIndex();
             else
                 nFooterLeft = 0;
         }
@@ -120,10 +120,10 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
     */
     SwPageDesc &rOldDesc = aOld.m_PageDesc;
     SwPageDesc &rNewDesc = aNew.m_PageDesc;
-    const SwFmtHeader& rOldHead = rOldDesc.GetMaster().GetHeader();
-    const SwFmtHeader& rNewHead = rNewDesc.GetMaster().GetHeader();
-    const SwFmtFooter& rOldFoot = rOldDesc.GetMaster().GetFooter();
-    const SwFmtFooter& rNewFoot = rNewDesc.GetMaster().GetFooter();
+    const SwFormatHeader& rOldHead = rOldDesc.GetMaster().GetHeader();
+    const SwFormatHeader& rNewHead = rNewDesc.GetMaster().GetHeader();
+    const SwFormatFooter& rOldFoot = rOldDesc.GetMaster().GetFooter();
+    const SwFormatFooter& rNewFoot = rNewDesc.GetMaster().GetFooter();
     /* bExchange must not be set, if the old page descriptor will stay active.
     Two known situations:
     #i67735#: renaming a page descriptor
@@ -144,39 +144,39 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
     {
         if( rNewHead.IsActive() )
         {
-            SwFrmFmt* pFormat = new SwFrmFmt( *rNewHead.GetHeaderFmt() );
+            SwFrameFormat* pFormat = new SwFrameFormat( *rNewHead.GetHeaderFormat() );
             // The Ctor of this object will remove the duplicate!
-            SwFmtHeader aFormatHeader(pFormat);
+            SwFormatHeader aFormatHeader(pFormat);
             if (!rNewDesc.IsHeaderShared())
             {
-                pFormat = new SwFrmFmt( *rNewDesc.GetLeft().GetHeader().GetHeaderFmt() );
+                pFormat = new SwFrameFormat( *rNewDesc.GetLeft().GetHeader().GetHeaderFormat() );
                 // The Ctor of this object will remove the duplicate!
-                SwFmtHeader aLeftHeader(pFormat);
+                SwFormatHeader aLeftHeader(pFormat);
             }
             if (!rNewDesc.IsFirstShared())
             {
-                pFormat = new SwFrmFmt( *rNewDesc.GetFirstMaster().GetHeader().GetHeaderFmt() );
+                pFormat = new SwFrameFormat( *rNewDesc.GetFirstMaster().GetHeader().GetHeaderFormat() );
                 // The Ctor of this object will remove the duplicate!
-                SwFmtHeader aFirstHeader(pFormat);
+                SwFormatHeader aFirstHeader(pFormat);
             }
         }
         // Same procedure for footers...
         if( rNewFoot.IsActive() )
         {
-            SwFrmFmt* pFormat = new SwFrmFmt( *rNewFoot.GetFooterFmt() );
+            SwFrameFormat* pFormat = new SwFrameFormat( *rNewFoot.GetFooterFormat() );
             // The Ctor of this object will remove the duplicate!
-            SwFmtFooter aFormatFooter(pFormat);
+            SwFormatFooter aFormatFooter(pFormat);
             if (!rNewDesc.IsFooterShared())
             {
-                pFormat = new SwFrmFmt( *rNewDesc.GetLeft().GetFooter().GetFooterFmt() );
+                pFormat = new SwFrameFormat( *rNewDesc.GetLeft().GetFooter().GetFooterFormat() );
                 // The Ctor of this object will remove the duplicate!
-                SwFmtFooter aLeftFooter(pFormat);
+                SwFormatFooter aLeftFooter(pFormat);
             }
             if (!rNewDesc.IsFirstShared())
             {
-                pFormat = new SwFrmFmt( *rNewDesc.GetFirstMaster().GetFooter().GetFooterFmt() );
+                pFormat = new SwFrameFormat( *rNewDesc.GetFirstMaster().GetFooter().GetFooterFormat() );
                 // The Ctor of this object will remove the duplicate!
-                SwFmtFooter aFirstFooter(pFormat);
+                SwFormatFooter aFirstFooter(pFormat);
             }
         }
 
@@ -197,8 +197,8 @@ SwUndoPageDesc::~SwUndoPageDesc()
 void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDest )
 {
     OSL_ENSURE( bExchange, "You shouldn't do that." );
-    const SwFmtHeader& rDestHead = rDest.GetMaster().GetHeader();
-    const SwFmtHeader& rSourceHead = rSource.GetMaster().GetHeader();
+    const SwFormatHeader& rDestHead = rDest.GetMaster().GetHeader();
+    const SwFormatHeader& rSourceHead = rSource.GetMaster().GetHeader();
     if( rDestHead.IsActive() )
     {
         // Let the destination page description point to the source node position,
@@ -206,131 +206,131 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes
         const SfxPoolItem* pItem;
         rDest.GetMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem );
         SfxPoolItem *pNewItem = pItem->Clone();
-        SwFrmFmt* pNewFmt = static_cast<SwFmtHeader*>(pNewItem)->GetHeaderFmt();
+        SwFrameFormat* pNewFormat = static_cast<SwFormatHeader*>(pNewItem)->GetHeaderFormat();
 #if OSL_DEBUG_LEVEL > 1
-        const SwFmtCntnt& rSourceCntnt = rSourceHead.GetHeaderFmt()->GetCntnt();
-        (void)rSourceCntnt;
-        const SwFmtCntnt& rDestCntnt = rDestHead.GetHeaderFmt()->GetCntnt();
-        (void)rDestCntnt;
+        const SwFormatContent& rSourceContent = rSourceHead.GetHeaderFormat()->GetContent();
+        (void)rSourceContent;
+        const SwFormatContent& rDestContent = rDestHead.GetHeaderFormat()->GetContent();
+        (void)rDestContent;
 #endif
-        pNewFmt->SetFmtAttr( rSourceHead.GetHeaderFmt()->GetCntnt() );
+        pNewFormat->SetFormatAttr( rSourceHead.GetHeaderFormat()->GetContent() );
         delete pNewItem;
 
         // Let the source page description point to zero node position,
         // it loses the responsible and can be destroyed without removing the content nodes.
         rSource.GetMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem );
         pNewItem = pItem->Clone();
-        pNewFmt = static_cast<SwFmtHeader*>(pNewItem)->GetHeaderFmt();
-        pNewFmt->SetFmtAttr( SwFmtCntnt() );
+        pNewFormat = static_cast<SwFormatHeader*>(pNewItem)->GetHeaderFormat();
+        pNewFormat->SetFormatAttr( SwFormatContent() );
         delete pNewItem;
 
         if( !rDest.IsHeaderShared() )
         {
             // Same procedure for unshared header..
-            const SwFmtHeader& rSourceLeftHead = rSource.GetLeft().GetHeader();
+            const SwFormatHeader& rSourceLeftHead = rSource.GetLeft().GetHeader();
             rDest.GetLeft().GetAttrSet().GetItemState( RES_HEADER, false, &pItem );
             pNewItem = pItem->Clone();
-            pNewFmt = static_cast<SwFmtHeader*>(pNewItem)->GetHeaderFmt();
+            pNewFormat = static_cast<SwFormatHeader*>(pNewItem)->GetHeaderFormat();
 #if OSL_DEBUG_LEVEL > 1
-            const SwFmtCntnt& rSourceCntnt1 = rSourceLeftHead.GetHeaderFmt()->GetCntnt();
-            (void)rSourceCntnt1;
-            const SwFmtCntnt& rDestCntnt1 = rDest.GetLeft().GetHeader().GetHeaderFmt()->GetCntnt();
-            (void)rDestCntnt1;
+            const SwFormatContent& rSourceContent1 = rSourceLeftHead.GetHeaderFormat()->GetContent();
+            (void)rSourceContent1;
+            const SwFormatContent& rDestContent1 = rDest.GetLeft().GetHeader().GetHeaderFormat()->GetContent();
+            (void)rDestContent1;
 #endif
-            pNewFmt->SetFmtAttr( rSourceLeftHead.GetHeaderFmt()->GetCntnt() );
+            pNewFormat->SetFormatAttr( rSourceLeftHead.GetHeaderFormat()->GetContent() );
             delete pNewItem;
             rSource.GetLeft().GetAttrSet().GetItemState( RES_HEADER, false, &pItem );
             pNewItem = pItem->Clone();
-            pNewFmt = static_cast<SwFmtHeader*>(pNewItem)->GetHeaderFmt();
-            pNewFmt->SetFmtAttr( SwFmtCntnt() );
+            pNewFormat = static_cast<SwFormatHeader*>(pNewItem)->GetHeaderFormat();
+            pNewFormat->SetFormatAttr( SwFormatContent() );
             delete pNewItem;
         }
         if (!rDest.IsFirstShared())
         {
             // Same procedure for unshared header..
-            const SwFmtHeader& rSourceFirstMasterHead = rSource.GetFirstMaster().GetHeader();
+            const SwFormatHeader& rSourceFirstMasterHead = rSource.GetFirstMaster().GetHeader();
             rDest.GetFirstMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem );
             pNewItem = pItem->Clone();
-            pNewFmt = static_cast<SwFmtHeader*>(pNewItem)->GetHeaderFmt();
+            pNewFormat = static_cast<SwFormatHeader*>(pNewItem)->GetHeaderFormat();
 #if OSL_DEBUG_LEVEL > 1
-            const SwFmtCntnt& rSourceCntnt1 = rSourceFirstMasterHead.GetHeaderFmt()->GetCntnt();
-            (void)rSourceCntnt1;
-            const SwFmtCntnt& rDestCntnt1 = rDest.GetFirstMaster().GetHeader().GetHeaderFmt()->GetCntnt();
-            (void)rDestCntnt1;
+            const SwFormatContent& rSourceContent1 = rSourceFirstMasterHead.GetHeaderFormat()->GetContent();
+            (void)rSourceContent1;
+            const SwFormatContent& rDestContent1 = rDest.GetFirstMaster().GetHeader().GetHeaderFormat()->GetContent();
+            (void)rDestContent1;
 #endif
-            pNewFmt->SetFmtAttr( rSourceFirstMasterHead.GetHeaderFmt()->GetCntnt() );
+            pNewFormat->SetFormatAttr( rSourceFirstMasterHead.GetHeaderFormat()->GetContent() );
             delete pNewItem;
             rSource.GetFirstMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem );
             pNewItem = pItem->Clone();
-            pNewFmt = static_cast<SwFmtHeader*>(pNewItem)->GetHeaderFmt();
-            pNewFmt->SetFmtAttr( SwFmtCntnt() );
+            pNewFormat = static_cast<SwFormatHeader*>(pNewItem)->GetHeaderFormat();
+            pNewFormat->SetFormatAttr( SwFormatContent() );
             delete pNewItem;
         }
     }
     // Same procedure for footers...
-    const SwFmtFooter& rDestFoot = rDest.GetMaster().GetFooter();
-    const SwFmtFooter& rSourceFoot = rSource.GetMaster().GetFooter();
+    const SwFormatFooter& rDestFoot = rDest.GetMaster().GetFooter();
+    const SwFormatFooter& rSourceFoot = rSource.GetMaster().GetFooter();
     if( rDestFoot.IsActive() )
     {
         const SfxPoolItem* pItem;
         rDest.GetMaster().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem );
         SfxPoolItem *pNewItem = pItem->Clone();
-        SwFrmFmt *pNewFmt = static_cast<SwFmtFooter*>(pNewItem)->GetFooterFmt();
-        pNewFmt->SetFmtAttr( rSourceFoot.GetFooterFmt()->GetCntnt() );
+        SwFrameFormat *pNewFormat = static_cast<SwFormatFooter*>(pNewItem)->GetFooterFormat();
+        pNewFormat->SetFormatAttr( rSourceFoot.GetFooterFormat()->GetContent() );
         delete pNewItem;
 
 #if OSL_DEBUG_LEVEL > 1
-        const SwFmtCntnt& rFooterSourceCntnt = rSourceFoot.GetFooterFmt()->GetCntnt();
-        (void)rFooterSourceCntnt;
-        const SwFmtCntnt& rFooterDestCntnt = rDestFoot.GetFooterFmt()->GetCntnt();
-        (void)rFooterDestCntnt;
+        const SwFormatContent& rFooterSourceContent = rSourceFoot.GetFooterFormat()->GetContent();
+        (void)rFooterSourceContent;
+        const SwFormatContent& rFooterDestContent = rDestFoot.GetFooterFormat()->GetContent();
+        (void)rFooterDestContent;
 #endif
         rSource.GetMaster().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem );
         pNewItem = pItem->Clone();
-        pNewFmt = static_cast<SwFmtFooter*>(pNewItem)->GetFooterFmt();
-        pNewFmt->SetFmtAttr( SwFmtCntnt() );
+        pNewFormat = static_cast<SwFormatFooter*>(pNewItem)->GetFooterFormat();
+        pNewFormat->SetFormatAttr( SwFormatContent() );
         delete pNewItem;
 
         if( !rDest.IsFooterShared() )
         {
-            const SwFmtFooter& rSourceLeftFoot = rSource.GetLeft().GetFooter();
+            const SwFormatFooter& rSourceLeftFoot = rSource.GetLeft().GetFooter();
 #if OSL_DEBUG_LEVEL > 1
-            const SwFmtCntnt& rFooterSourceCntnt2 = rSourceLeftFoot.GetFooterFmt()->GetCntnt();
-            const SwFmtCntnt& rFooterDestCntnt2 =
-                rDest.GetLeft().GetFooter().GetFooterFmt()->GetCntnt();
-            (void)rFooterSourceCntnt2;
-            (void)rFooterDestCntnt2;
+            const SwFormatContent& rFooterSourceContent2 = rSourceLeftFoot.GetFooterFormat()->GetContent();
+            const SwFormatContent& rFooterDestContent2 =
+                rDest.GetLeft().GetFooter().GetFooterFormat()->GetContent();
+            (void)rFooterSourceContent2;
+            (void)rFooterDestContent2;
 #endif
             rDest.GetLeft().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem );
             pNewItem = pItem->Clone();
-            pNewFmt = static_cast<SwFmtFooter*>(pNewItem)->GetFooterFmt();
-            pNewFmt->SetFmtAttr( rSourceLeftFoot.GetFooterFmt()->GetCntnt() );
+            pNewFormat = static_cast<SwFormatFooter*>(pNewItem)->GetFooterFormat();
+            pNewFormat->SetFormatAttr( rSourceLeftFoot.GetFooterFormat()->GetContent() );
             delete pNewItem;
             rSource.GetLeft().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem );
             pNewItem = pItem->Clone();
-            pNewFmt = static_cast<SwFmtFooter*>(pNewItem)->GetFooterFmt();
-            pNewFmt->SetFmtAttr( SwFmtCntnt() );
+            pNewFormat = static_cast<SwFormatFooter*>(pNewItem)->GetFooterFormat();
+            pNewFormat->SetFormatAttr( SwFormatContent() );
             delete pNewItem;
         }
         if (!rDest.IsFirstShared())
         {
-            const SwFmtFooter& rSourceFirstMasterFoot = rSource.GetFirstMaster().GetFooter();
+            const SwFormatFooter& rSourceFirstMasterFoot = rSource.GetFirstMaster().GetFooter();
 #if OSL_DEBUG_LEVEL > 1
-            const SwFmtCntnt& rFooterSourceCntnt2 = rSourceFirstMasterFoot.GetFooterFmt()->GetCntnt();
-            const SwFmtCntnt& rFooterDestCntnt2 =
-                rDest.GetFirstMaster().GetFooter().GetFooterFmt()->GetCntnt();
-            (void)rFooterSourceCntnt2;
-            (void)rFooterDestCntnt2;
+            const SwFormatContent& rFooterSourceContent2 = rSourceFirstMasterFoot.GetFooterFormat()->GetContent();
+            const SwFormatContent& rFooterDestContent2 =
+                rDest.GetFirstMaster().GetFooter().GetFooterFormat()->GetContent();
+            (void)rFooterSourceContent2;
+            (void)rFooterDestContent2;
 #endif
             rDest.GetFirstMaster().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem );
             pNewItem = pItem->Clone();
-            pNewFmt = static_cast<SwFmtFooter*>(pNewItem)->GetFooterFmt();
-            pNewFmt->SetFmtAttr( rSourceFirstMasterFoot.GetFooterFmt()->GetCntnt() );
+            pNewFormat = static_cast<SwFormatFooter*>(pNewItem)->GetFooterFormat();
+            pNewFormat->SetFormatAttr( rSourceFirstMasterFoot.GetFooterFormat()->GetContent() );
             delete pNewItem;
             rSource.GetFirstMaster().GetAttrSet().GetItemState( RES_FOOTER, false, &pItem );
             pNewItem = pItem->Clone();
-            pNewFmt = static_cast<SwFmtFooter*>(pNewItem)->GetFooterFmt();
-            pNewFmt->SetFmtAttr( SwFmtCntnt() );
+            pNewFormat = static_cast<SwFormatFooter*>(pNewItem)->GetFooterFormat();
+            pNewFormat->SetFormatAttr( SwFormatContent() );
             delete pNewItem;
         }
     }
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index dc726a5cfe67..9a40d8cc3f8a 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -63,37 +63,37 @@ OUString SwHistoryHint::GetDescription() const
     return OUString();
 }
 
-SwHistorySetFmt::SwHistorySetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNd )
+SwHistorySetFormat::SwHistorySetFormat( const SfxPoolItem* pFormatHt, sal_uLong nNd )
     :  SwHistoryHint( HSTRY_SETFMTHNT )
-    ,  m_pAttr( pFmtHt->Clone() )
+    ,  m_pAttr( pFormatHt->Clone() )
     ,  m_nNodeIndex( nNd )
 {
     switch ( m_pAttr->Which() )
     {
         case RES_PAGEDESC:
-            static_cast<SwFmtPageDesc&>(*m_pAttr).ChgDefinedIn( 0 );
+            static_cast<SwFormatPageDesc&>(*m_pAttr).ChgDefinedIn( 0 );
             break;
         case RES_PARATR_DROP:
-            static_cast<SwFmtDrop&>(*m_pAttr).ChgDefinedIn( 0 );
+            static_cast<SwFormatDrop&>(*m_pAttr).ChgDefinedIn( 0 );
             break;
         case RES_BOXATR_FORMULA:
         {
             // save formulas always in plain text
-            SwTblBoxFormula& rNew = static_cast<SwTblBoxFormula&>(*m_pAttr);
+            SwTableBoxFormula& rNew = static_cast<SwTableBoxFormula&>(*m_pAttr);
             if ( rNew.IsIntrnlName() )
             {
-                const SwTblBoxFormula& rOld =
-                    *static_cast<const SwTblBoxFormula*>(pFmtHt);
+                const SwTableBoxFormula& rOld =
+                    *static_cast<const SwTableBoxFormula*>(pFormatHt);
                 const SwNode* pNd = rOld.GetNodeOfFormula();
                 if ( pNd )
                 {
                     const SwTableNode* pTableNode = pNd->FindTableNode();
                     if (pTableNode)
                     {
-                        SwTableFmlUpdate aMsgHnt( &pTableNode->GetTable() );
-                        aMsgHnt.eFlags = TBL_BOXNAME;
+                        SwTableFormulaUpdate aMsgHint( &pTableNode->GetTable() );
+                        aMsgHint.eFlags = TBL_BOXNAME;
                         rNew.ChgDefinedIn( rOld.GetDefinedIn() );
-                        rNew.ChangeState( &aMsgHnt );
+                        rNew.ChangeState( &aMsgHint );
                     }
                 }
             }
@@ -103,14 +103,14 @@ SwHistorySetFmt::SwHistorySetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNd )
     }
 }
 
-OUString SwHistorySetFmt::GetDescription() const
+OUString SwHistorySetFormat::GetDescription() const
 {
     OUString aResult;
 
     switch (m_pAttr->Which())
     {
     case RES_BREAK:
-        switch ((static_cast<SvxFmtBreakItem &>(*m_pAttr)).GetBreak())
+        switch ((static_cast<SvxFormatBreakItem &>(*m_pAttr)).GetBreak())
         {
         case SVX_BREAK_PAGE_BEFORE:
         case SVX_BREAK_PAGE_AFTER:
@@ -135,16 +135,16 @@ OUString SwHistorySetFmt::GetDescription() const
     return aResult;
 }
 
-void SwHistorySetFmt::SetInDoc( SwDoc* pDoc, bool bTmpSet )
+void SwHistorySetFormat::SetInDoc( SwDoc* pDoc, bool bTmpSet )
 {
     SwNode * pNode = pDoc->GetNodes()[ m_nNodeIndex ];
-    if ( pNode->IsCntntNode() )
+    if ( pNode->IsContentNode() )
     {
-        static_cast<SwCntntNode*>(pNode)->SetAttr( *m_pAttr );
+        static_cast<SwContentNode*>(pNode)->SetAttr( *m_pAttr );
     }
     else if ( pNode->IsTableNode() )
     {
-        static_cast<SwTableNode*>(pNode)->GetTable().GetFrmFmt()->SetFmtAttr(
+        static_cast<SwTableNode*>(pNode)->GetTable().GetFrameFormat()->SetFormatAttr(
                 *m_pAttr );
     }
     else if ( pNode->IsStartNode() && (SwTableBoxStartNode ==
@@ -153,10 +153,10 @@ void SwHistorySetFmt::SetInDoc( SwDoc* pDoc, bool bTmpSet )
         SwTableNode* pTNd = pNode->FindTableNode();
         if ( pTNd )
         {
-            SwTableBox* pBox = pTNd->GetTable().GetTblBox( m_nNodeIndex );
+            SwTableBox* pBox = pTNd->GetTable().GetTableBox( m_nNodeIndex );
             if (pBox)
             {
-                pBox->ClaimFrmFmt()->SetFmtAttr( *m_pAttr );
+                pBox->ClaimFrameFormat()->SetFormatAttr( *m_pAttr );
             }
         }
     }
@@ -167,38 +167,38 @@ void SwHistorySetFmt::SetInDoc( SwDoc* pDoc, bool bTmpSet )
     }
 }
 
-SwHistorySetFmt::~SwHistorySetFmt()
+SwHistorySetFormat::~SwHistorySetFormat()
 {
 }
 
-SwHistoryResetFmt::SwHistoryResetFmt(const SfxPoolItem* pFmtHt, sal_uLong nNodeIdx)
+SwHistoryResetFormat::SwHistoryResetFormat(const SfxPoolItem* pFormatHt, sal_uLong nNodeIdx)
     : SwHistoryHint( HSTRY_RESETFMTHNT )
     , m_nNodeIndex( nNodeIdx )
-    , m_nWhich( pFmtHt->Which() )
+    , m_nWhich( pFormatHt->Which() )
 {
 }
 
-void SwHistoryResetFmt::SetInDoc( SwDoc* pDoc, bool )
+void SwHistoryResetFormat::SetInDoc( SwDoc* pDoc, bool )
 {
     SwNode * pNode = pDoc->GetNodes()[ m_nNodeIndex ];
-    if ( pNode->IsCntntNode() )
+    if ( pNode->IsContentNode() )
     {
-        static_cast<SwCntntNode*>(pNode)->ResetAttr( m_nWhich );
+        static_cast<SwContentNode*>(pNode)->ResetAttr( m_nWhich );
     }
     else if ( pNode->IsTableNode() )
     {
-        static_cast<SwTableNode*>(pNode)->GetTable().GetFrmFmt()->
-            ResetFmtAttr( m_nWhich );
+        static_cast<SwTableNode*>(pNode)->GetTable().GetFrameFormat()->
+            ResetFormatAttr( m_nWhich );
     }
 }
 
-SwHistorySetTxt::SwHistorySetTxt( SwTxtAttr* pTxtHt, sal_uLong nNodePos )
+SwHistorySetText::SwHistorySetText( SwTextAttr* pTextHt, sal_uLong nNodePos )
     : SwHistoryHint( HSTRY_SETTXTHNT )
     , m_nNodeIndex( nNodePos )
-    , m_nStart( pTxtHt->GetStart() )
-    , m_nEnd( *pTxtHt->GetAnyEnd() )
-    , m_bFormatIgnoreStart(pTxtHt->IsFormatIgnoreStart())
-    , m_bFormatIgnoreEnd  (pTxtHt->IsFormatIgnoreEnd  ())
+    , m_nStart( pTextHt->GetStart() )
+    , m_nEnd( *pTextHt->GetAnyEnd() )
+    , m_bFormatIgnoreStart(pTextHt->IsFormatIgnoreStart())
+    , m_bFormatIgnoreEnd  (pTextHt->IsFormatIgnoreEnd  ())
 {
     // Caution: the following attributes generate no format attributes:
     //  - NoLineBreak, NoHypen, Inserted, Deleted
@@ -206,38 +206,38 @@ SwHistorySetTxt::SwHistorySetTxt( SwTxtAttr* pTxtHt, sal_uLong nNodePos )
 
     // a little bit complicated but works: first assign a copy of the
     // default value and afterwards the values from text attribute
-    if ( RES_TXTATR_CHARFMT == pTxtHt->Which() )
+    if ( RES_TXTATR_CHARFMT == pTextHt->Which() )
     {
-        m_pAttr.reset( new SwFmtCharFmt( pTxtHt->GetCharFmt().GetCharFmt() ) );
+        m_pAttr.reset( new SwFormatCharFormat( pTextHt->GetCharFormat().GetCharFormat() ) );
     }
     else
     {
-        m_pAttr.reset( pTxtHt->GetAttr().Clone() );
+        m_pAttr.reset( pTextHt->GetAttr().Clone() );
     }
 }
 
-SwHistorySetTxt::~SwHistorySetTxt()
+SwHistorySetText::~SwHistorySetText()
 {
 }
 
-void SwHistorySetTxt::SetInDoc( SwDoc* pDoc, bool )
+void SwHistorySetText::SetInDoc( SwDoc* pDoc, bool )
 {
     if ( !m_pAttr.get() )
         return;
 
     if ( RES_TXTATR_CHARFMT == m_pAttr->Which() )
     {
-        // ask the Doc if the CharFmt still exists
-        if ( !pDoc->GetCharFmts()->Contains( (static_cast<SwFmtCharFmt&>(*m_pAttr)).GetCharFmt() ) )
+        // ask the Doc if the CharFormat still exists
+        if ( !pDoc->GetCharFormats()->Contains( (static_cast<SwFormatCharFormat&>(*m_pAttr)).GetCharFormat() ) )
             return; // do not set, format does not exist
     }
 
-    SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    OSL_ENSURE( pTxtNd, "SwHistorySetTxt::SetInDoc: not a TextNode" );
+    SwTextNode * pTextNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTextNode();
+    OSL_ENSURE( pTextNd, "SwHistorySetText::SetInDoc: not a TextNode" );
 
-    if ( pTxtNd )
+    if ( pTextNd )
     {
-        SwTxtAttr *const pAttr = pTxtNd->InsertItem(*m_pAttr, m_nStart, m_nEnd,
+        SwTextAttr *const pAttr = pTextNd->InsertItem(*m_pAttr, m_nStart, m_nEnd,
                         SetAttrMode::NOTXTATRCHR |
                         SetAttrMode::NOHINTADJUST );
         // shouldn't be possible to hit any error/merging path from here
@@ -253,108 +253,108 @@ void SwHistorySetTxt::SetInDoc( SwDoc* pDoc, bool )
     }
 }
 
-SwHistorySetTxtFld::SwHistorySetTxtFld( SwTxtFld* pTxtFld, sal_uLong nNodePos )
+SwHistorySetTextField::SwHistorySetTextField( SwTextField* pTextField, sal_uLong nNodePos )
     : SwHistoryHint( HSTRY_SETTXTFLDHNT )
-    , m_pFld( new SwFmtFld( *pTxtFld->GetFmtFld().GetField() ) )
+    , m_pField( new SwFormatField( *pTextField->GetFormatField().GetField() ) )
 {
     // only copy if not Sys-FieldType
-    SwDoc* pDoc = pTxtFld->GetTxtNode().GetDoc();
-
-    m_nFldWhich = m_pFld->GetField()->GetTyp()->Which();
-    if (m_nFldWhich == RES_DBFLD ||
-        m_nFldWhich == RES_USERFLD ||
-        m_nFldWhich == RES_SETEXPFLD ||
-        m_nFldWhich == RES_DDEFLD ||
-        !pDoc->getIDocumentFieldsAccess().GetSysFldType( m_nFldWhich ))
+    SwDoc* pDoc = pTextField->GetTextNode().GetDoc();
+
+    m_nFieldWhich = m_pField->GetField()->GetTyp()->Which();
+    if (m_nFieldWhich == RES_DBFLD ||
+        m_nFieldWhich == RES_USERFLD ||
+        m_nFieldWhich == RES_SETEXPFLD ||
+        m_nFieldWhich == RES_DDEFLD ||
+        !pDoc->getIDocumentFieldsAccess().GetSysFieldType( m_nFieldWhich ))
     {
-        m_pFldType.reset( m_pFld->GetField()->GetTyp()->Copy() );
-        m_pFld->GetField()->ChgTyp( m_pFldType.get() ); // change field type
+        m_pFieldType.reset( m_pField->GetField()->GetTyp()->Copy() );
+        m_pField->GetField()->ChgTyp( m_pFieldType.get() ); // change field type
     }
     m_nNodeIndex = nNodePos;
-    m_nPos = pTxtFld->GetStart();
+    m_nPos = pTextField->GetStart();
 }
 
-OUString SwHistorySetTxtFld::GetDescription() const
+OUString SwHistorySetTextField::GetDescription() const
 {
-    return m_pFld->GetField()->GetDescription();
+    return m_pField->GetField()->GetDescription();
 }
 
-SwHistorySetTxtFld::~SwHistorySetTxtFld()
+SwHistorySetTextField::~SwHistorySetTextField()
 {
 }
 
-void SwHistorySetTxtFld::SetInDoc( SwDoc* pDoc, bool )
+void SwHistorySetTextField::SetInDoc( SwDoc* pDoc, bool )
 {
-    if ( !m_pFld.get() )
+    if ( !m_pField.get() )
         return;
 
-    SwFieldType* pNewFldType = m_pFldType.get();
-    if ( !pNewFldType )
+    SwFieldType* pNewFieldType = m_pFieldType.get();
+    if ( !pNewFieldType )
     {
-        pNewFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType( m_nFldWhich );
+        pNewFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType( m_nFieldWhich );
     }
     else
     {
         // register type with the document
-        pNewFldType = pDoc->getIDocumentFieldsAccess().InsertFldType( *m_pFldType );
+        pNewFieldType = pDoc->getIDocumentFieldsAccess().InsertFieldType( *m_pFieldType );
     }
 
-    m_pFld->GetField()->ChgTyp( pNewFldType ); // change field type
+    m_pField->GetField()->ChgTyp( pNewFieldType ); // change field type
 
-    SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    OSL_ENSURE( pTxtNd, "SwHistorySetTxtFld: no TextNode" );
+    SwTextNode * pTextNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTextNode();
+    OSL_ENSURE( pTextNd, "SwHistorySetTextField: no TextNode" );
 
-    if ( pTxtNd )
+    if ( pTextNd )
     {
-        pTxtNd->InsertItem( *m_pFld, m_nPos, m_nPos,
+        pTextNd->InsertItem( *m_pField, m_nPos, m_nPos,
                     SetAttrMode::NOTXTATRCHR );
     }
 }
 
-SwHistorySetRefMark::SwHistorySetRefMark( SwTxtRefMark* pTxtHt, sal_uLong nNodePos )
+SwHistorySetRefMark::SwHistorySetRefMark( SwTextRefMark* pTextHt, sal_uLong nNodePos )
     : SwHistoryHint( HSTRY_SETREFMARKHNT )
-    , m_RefName( pTxtHt->GetRefMark().GetRefName() )
+    , m_RefName( pTextHt->GetRefMark().GetRefName() )
     , m_nNodeIndex( nNodePos )
-    , m_nStart( pTxtHt->GetStart() )
-    , m_nEnd( *pTxtHt->GetAnyEnd() )
+    , m_nStart( pTextHt->GetStart() )
+    , m_nEnd( *pTextHt->GetAnyEnd() )
 {
 }
 
 void SwHistorySetRefMark::SetInDoc( SwDoc* pDoc, bool )
 {
-    SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    OSL_ENSURE( pTxtNd, "SwHistorySetRefMark: no TextNode" );
-    if ( !pTxtNd )
+    SwTextNode * pTextNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTextNode();
+    OSL_ENSURE( pTextNd, "SwHistorySetRefMark: no TextNode" );
+    if ( !pTextNd )
         return;
 
-    SwFmtRefMark aRefMark( m_RefName );
+    SwFormatRefMark aRefMark( m_RefName );
 
     // if a reference mark without an end already exists here: must not insert!
     if ( m_nStart != m_nEnd ||
-         !pTxtNd->GetTxtAttrForCharAt( m_nStart, RES_TXTATR_REFMARK ) )
+         !pTextNd->GetTextAttrForCharAt( m_nStart, RES_TXTATR_REFMARK ) )
     {
-        pTxtNd->InsertItem( aRefMark, m_nStart, m_nEnd,
+        pTextNd->InsertItem( aRefMark, m_nStart, m_nEnd,
                             SetAttrMode::NOTXTATRCHR );
     }
 }
 
-SwHistorySetTOXMark::SwHistorySetTOXMark( SwTxtTOXMark* pTxtHt, sal_uLong nNodePos )
+SwHistorySetTOXMark::SwHistorySetTOXMark( SwTextTOXMark* pTextHt, sal_uLong nNodePos )
     : SwHistoryHint( HSTRY_SETTOXMARKHNT )
-    , m_TOXMark( pTxtHt->GetTOXMark() )
+    , m_TOXMark( pTextHt->GetTOXMark() )
     , m_TOXName( m_TOXMark.GetTOXType()->GetTypeName() )
     , m_eTOXTypes( m_TOXMark.GetTOXType()->GetType() )
     , m_nNodeIndex( nNodePos )
-    , m_nStart( pTxtHt->GetStart() )
-    , m_nEnd( *pTxtHt->GetAnyEnd() )
+    , m_nStart( pTextHt->GetStart() )
+    , m_nEnd( *pTextHt->GetAnyEnd() )
 {
     m_TOXMark.DeRegister();
 }
 
 void SwHistorySetTOXMark::SetInDoc( SwDoc* pDoc, bool )
 {
-    SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    OSL_ENSURE( pTxtNd, "SwHistorySetTOXMark: no TextNode" );
-    if ( !pTxtNd )
+    SwTextNode * pTextNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTextNode();
+    OSL_ENSURE( pTextNd, "SwHistorySetTOXMark: no TextNode" );
+    if ( !pTextNd )
         return;
 
     // search for respective TOX type
@@ -377,7 +377,7 @@ void SwHistorySetTOXMark::SetInDoc( SwDoc* pDoc, bool )
     SwTOXMark aNew( m_TOXMark );
     aNew.RegisterToTOXType( *pToxType );
 
-    pTxtNd->InsertItem( aNew, m_nStart, m_nEnd,
+    pTextNd->InsertItem( aNew, m_nStart, m_nEnd,
                         SetAttrMode::NOTXTATRCHR );
 }
 
@@ -393,7 +393,7 @@ bool SwHistorySetTOXMark::IsEqual( const SwTOXMark& rCmp ) const
            );
 }
 
-SwHistoryResetTxt::SwHistoryResetTxt( sal_uInt16 nWhich,
+SwHistoryResetText::SwHistoryResetText( sal_uInt16 nWhich,
             sal_Int32 nAttrStart, sal_Int32 nAttrEnd, sal_uLong nNodePos )
     : SwHistoryHint( HSTRY_RESETTXTHNT )
     , m_nNodeIndex( nNodePos ), m_nStart( nAttrStart ), m_nEnd( nAttrEnd )
@@ -401,49 +401,49 @@ SwHistoryResetTxt::SwHistoryResetTxt( sal_uInt16 nWhich,
 {
 }
 
-void SwHistoryResetTxt::SetInDoc( SwDoc* pDoc, bool )
+void SwHistoryResetText::SetInDoc( SwDoc* pDoc, bool )
 {
-    SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    OSL_ENSURE( pTxtNd, "SwHistoryResetTxt: no TextNode" );
-    if ( pTxtNd )
+    SwTextNode * pTextNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTextNode();
+    OSL_ENSURE( pTextNd, "SwHistoryResetText: no TextNode" );
+    if ( pTextNd )
     {
-        pTxtNd->DeleteAttributes( m_nAttr, m_nStart, m_nEnd );
+        pTextNd->DeleteAttributes( m_nAttr, m_nStart, m_nEnd );
     }
 }
 
-SwHistorySetFootnote::SwHistorySetFootnote( SwTxtFtn* pTxtFtn, sal_uLong nNodePos )
+SwHistorySetFootnote::SwHistorySetFootnote( SwTextFootnote* pTextFootnote, sal_uLong nNodePos )
     : SwHistoryHint( HSTRY_SETFTNHNT )
     , m_pUndo( new SwUndoSaveSection )
-    , m_FootnoteNumber( pTxtFtn->GetFtn().GetNumStr() )
+    , m_FootnoteNumber( pTextFootnote->GetFootnote().GetNumStr() )
     , m_nNodeIndex( nNodePos )
-    , m_nStart( pTxtFtn->GetStart() )
-    , m_bEndNote( pTxtFtn->GetFtn().IsEndNote() )
+    , m_nStart( pTextFootnote->GetStart() )
+    , m_bEndNote( pTextFootnote->GetFootnote().IsEndNote() )
 {
-    OSL_ENSURE( pTxtFtn->GetStartNode(),
+    OSL_ENSURE( pTextFootnote->GetStartNode(),
             "SwHistorySetFootnote: Footnote without Section" );
 
     // keep the old NodePos (because who knows what later will be saved/deleted
     // in SaveSection)
-    SwDoc* pDoc = const_cast<SwDoc*>(pTxtFtn->GetTxtNode().GetDoc());
+    SwDoc* pDoc = const_cast<SwDoc*>(pTextFootnote->GetTextNode().GetDoc());
     SwNode* pSaveNd = pDoc->GetNodes()[ m_nNodeIndex ];
 
-    // keep pointer to StartNode of FtnSection and reset its attribute for now
+    // keep pointer to StartNode of FootnoteSection and reset its attribute for now
     // (as a result, its/all Frms will be deleted automatically)
-    SwNodeIndex aSttIdx( *pTxtFtn->GetStartNode() );
-    pTxtFtn->SetStartNode( 0, false );
+    SwNodeIndex aSttIdx( *pTextFootnote->GetStartNode() );
+    pTextFootnote->SetStartNode( 0, false );
 
     m_pUndo->SaveSection( aSttIdx );
     m_nNodeIndex = pSaveNd->GetIndex();
 }
 
-SwHistorySetFootnote::SwHistorySetFootnote( const SwTxtFtn &rTxtFtn )
+SwHistorySetFootnote::SwHistorySetFootnote( const SwTextFootnote &rTextFootnote )
     : SwHistoryHint( HSTRY_SETFTNHNT )
-    , m_FootnoteNumber( rTxtFtn.GetFtn().GetNumStr() )
-    , m_nNodeIndex( _SwTxtFtn_GetIndex( (&rTxtFtn) ) )
-    , m_nStart( rTxtFtn.GetStart() )
-    , m_bEndNote( rTxtFtn.GetFtn().IsEndNote() )
+    , m_FootnoteNumber( rTextFootnote.GetFootnote().GetNumStr() )
+    , m_nNodeIndex( _SwTextFootnote_GetIndex( (&rTextFootnote) ) )
+    , m_nStart( rTextFootnote.GetStart() )
+    , m_bEndNote( rTextFootnote.GetFootnote().IsEndNote() )
 {
-    OSL_ENSURE( rTxtFtn.GetStartNode(),
+    OSL_ENSURE( rTextFootnote.GetStartNode(),
             "SwHistorySetFootnote: Footnote without Section" );
 }
 
@@ -458,95 +458,95 @@ SwHistorySetFootnote::~SwHistorySetFootnote()
 
 void SwHistorySetFootnote::SetInDoc( SwDoc* pDoc, bool )
 {
-    SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    OSL_ENSURE( pTxtNd, "SwHistorySetFootnote: no TextNode" );
-    if ( !pTxtNd )
+    SwTextNode * pTextNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTextNode();
+    OSL_ENSURE( pTextNd, "SwHistorySetFootnote: no TextNode" );
+    if ( !pTextNd )
         return;
 
     if ( m_pUndo.get() )
     {
         // set the footnote in the TextNode
-        SwFmtFtn aTemp( m_bEndNote );
-        SwFmtFtn& rNew = const_cast<SwFmtFtn&>(
-                static_cast<const SwFmtFtn&>(pDoc->GetAttrPool().Put(aTemp)) );
+        SwFormatFootnote aTemp( m_bEndNote );
+        SwFormatFootnote& rNew = const_cast<SwFormatFootnote&>(
+                static_cast<const SwFormatFootnote&>(pDoc->GetAttrPool().Put(aTemp)) );
         if ( !m_FootnoteNumber.isEmpty() )
         {
             rNew.SetNumStr( m_FootnoteNumber );
         }
-        SwTxtFtn* pTxtFtn = new SwTxtFtn( rNew, m_nStart );
+        SwTextFootnote* pTextFootnote = new SwTextFootnote( rNew, m_nStart );
 
         // create the section of the Footnote
-        SwNodeIndex aIdx( *pTxtNd );
+        SwNodeIndex aIdx( *pTextNd );
         m_pUndo->RestoreSection( pDoc, &aIdx, SwFootnoteStartNode );
-        pTxtFtn->SetStartNode( &aIdx );
+        pTextFootnote->SetStartNode( &aIdx );
         if ( m_pUndo->GetHistory() )
         {
             // create frames only now
             m_pUndo->GetHistory()->Rollback( pDoc );
         }
 
-        pTxtNd->InsertHint( pTxtFtn );
+        pTextNd->InsertHint( pTextFootnote );
     }
     else
     {
-        SwTxtFtn * const pFtn =
-            const_cast<SwTxtFtn*>( static_cast<const SwTxtFtn*>(
-                pTxtNd->GetTxtAttrForCharAt( m_nStart )));
-        SwFmtFtn &rFtn = const_cast<SwFmtFtn&>(pFtn->GetFtn());
-        rFtn.SetNumStr( m_FootnoteNumber  );
-        if ( rFtn.IsEndNote() != m_bEndNote )
+        SwTextFootnote * const pFootnote =
+            const_cast<SwTextFootnote*>( static_cast<const SwTextFootnote*>(
+                pTextNd->GetTextAttrForCharAt( m_nStart )));
+        SwFormatFootnote &rFootnote = const_cast<SwFormatFootnote&>(pFootnote->GetFootnote());
+        rFootnote.SetNumStr( m_FootnoteNumber  );
+        if ( rFootnote.IsEndNote() != m_bEndNote )
         {
-            rFtn.SetEndNote( m_bEndNote );
-            pFtn->CheckCondColl();
+            rFootnote.SetEndNote( m_bEndNote );
+            pFootnote->CheckCondColl();
         }
     }
 }
 
-SwHistoryChangeFmtColl::SwHistoryChangeFmtColl( SwFmtColl* pFmtColl, sal_uLong nNd,
+SwHistoryChangeFormatColl::SwHistoryChangeFormatColl( SwFormatColl* pFormatColl, sal_uLong nNd,
                             sal_uInt8 nNodeWhich )
     : SwHistoryHint( HSTRY_CHGFMTCOLL )
-    , m_pColl( pFmtColl )
+    , m_pColl( pFormatColl )
     , m_nNodeIndex( nNd )
     , m_nNodeType( nNodeWhich )
 {
 }
 
-void SwHistoryChangeFmtColl::SetInDoc( SwDoc* pDoc, bool )
+void SwHistoryChangeFormatColl::SetInDoc( SwDoc* pDoc, bool )
 {
-    SwCntntNode * pCntntNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetCntntNode();
-    OSL_ENSURE( pCntntNd, "SwHistoryChangeFmtColl: no ContentNode" );
+    SwContentNode * pContentNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetContentNode();
+    OSL_ENSURE( pContentNd, "SwHistoryChangeFormatColl: no ContentNode" );
 
     // before setting the format, check if it is still available in the
     // document. if it has been deleted, there is no undo!
-    if ( pCntntNd && m_nNodeType == pCntntNd->GetNodeType() )
+    if ( pContentNd && m_nNodeType == pContentNd->GetNodeType() )
     {
         if ( ND_TEXTNODE == m_nNodeType )
         {
-            if (pDoc->GetTxtFmtColls()->Contains( static_cast<SwTxtFmtColl * const>(m_pColl) ))
+            if (pDoc->GetTextFormatColls()->Contains( static_cast<SwTextFormatColl * const>(m_pColl) ))
             {
-                pCntntNd->ChgFmtColl( m_pColl );
+                pContentNd->ChgFormatColl( m_pColl );
             }
         }
-        else if (pDoc->GetGrfFmtColls()->Contains( static_cast<SwGrfFmtColl * const>(m_pColl) ))
+        else if (pDoc->GetGrfFormatColls()->Contains( static_cast<SwGrfFormatColl * const>(m_pColl) ))
         {
-            pCntntNd->ChgFmtColl( m_pColl );
+            pContentNd->ChgFormatColl( m_pColl );
         }
     }
 }
 
-SwHistoryTxtFlyCnt::SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt )
+SwHistoryTextFlyCnt::SwHistoryTextFlyCnt( SwFrameFormat* const pFlyFormat )
     : SwHistoryHint( HSTRY_FLYCNT )
-    , m_pUndo( new SwUndoDelLayFmt( pFlyFmt ) )
+    , m_pUndo( new SwUndoDelLayFormat( pFlyFormat ) )
 {
-    OSL_ENSURE( pFlyFmt, "SwHistoryTxtFlyCnt: no Format" );
+    OSL_ENSURE( pFlyFormat, "SwHistoryTextFlyCnt: no Format" );
     m_pUndo->ChgShowSel( false );
 }
 
-SwHistoryTxtFlyCnt::~SwHistoryTxtFlyCnt()
+SwHistoryTextFlyCnt::~SwHistoryTextFlyCnt()
 {
 }
 
-void SwHistoryTxtFlyCnt::SetInDoc( SwDoc* pDoc, bool )
+void SwHistoryTextFlyCnt::SetInDoc( SwDoc* pDoc, bool )
 {
     ::sw::IShellCursorSupplier *const pISCS(pDoc->GetIShellCursorSupplier());
     OSL_ASSERT(pISCS);
@@ -566,9 +566,9 @@ SwHistoryBookmark::SwHistoryBookmark(
         rBkmk.GetMarkPos().nNode.GetIndex() : 0)
     , m_nOtherNode(bSaveOtherPos ?
         rBkmk.GetOtherMarkPos().nNode.GetIndex() : 0)
-    , m_nCntnt(bSavePos ?
+    , m_nContent(bSavePos ?
         rBkmk.GetMarkPos().nContent.GetIndex() : 0)
-    , m_nOtherCntnt(bSaveOtherPos ?
+    , m_nOtherContent(bSaveOtherPos ?
         rBkmk.GetOtherMarkPos().nContent.GetIndex() :0)
     , m_bSavePos(bSavePos)
     , m_bSaveOtherPos(bSaveOtherPos)
@@ -601,14 +601,14 @@ void SwHistoryBookmark::SetInDoc( SwDoc* pDoc, bool )
 
     if(m_bSavePos)
     {
-        SwCntntNode* const pCntntNd = rNds[m_nNode]->GetCntntNode();
-        OSL_ENSURE(pCntntNd,
+        SwContentNode* const pContentNd = rNds[m_nNode]->GetContentNode();
+        OSL_ENSURE(pContentNd,
             "<SwHistoryBookmark::SetInDoc(..)>"
             " - wrong node for a mark");
 
         // #111660# don't crash when nNode1 doesn't point to content node.
-        if(pCntntNd)
-            pPam.reset(new SwPaM(*pCntntNd, m_nCntnt));
+        if(pContentNd)
+            pPam.reset(new SwPaM(*pContentNd, m_nContent));
     }
     else
     {
@@ -618,16 +618,16 @@ void SwHistoryBookmark::SetInDoc( SwDoc* pDoc, bool )
 
     if(m_bSaveOtherPos)
     {
-        SwCntntNode* const pCntntNd = rNds[m_nOtherNode]->GetCntntNode();
-        OSL_ENSURE(pCntntNd,
+        SwContentNode* const pContentNd = rNds[m_nOtherNode]->GetContentNode();
+        OSL_ENSURE(pContentNd,
             "<SwHistoryBookmark::SetInDoc(..)>"
             " - wrong node for a mark");
 
-        if(pPam.get() != NULL && pCntntNd)
+        if(pPam.get() != NULL && pContentNd)
         {
             pPam->SetMark();
             pPam->GetMark()->nNode = m_nOtherNode;
-            pPam->GetMark()->nContent.Assign(pCntntNd, m_nOtherCntnt);
+            pPam->GetMark()->nContent.Assign(pContentNd, m_nOtherContent);
         }
     }
     else if(m_bHadOtherPos)
@@ -670,7 +670,7 @@ void SwHistoryBookmark::SetInDoc( SwDoc* pDoc, bool )
 bool SwHistoryBookmark::IsEqualBookmark(const ::sw::mark::IMark& rBkmk)
 {
     return m_nNode == rBkmk.GetMarkPos().nNode.GetIndex()
-        && m_nCntnt == rBkmk.GetMarkPos().nContent.GetIndex()
+        && m_nContent == rBkmk.GetMarkPos().nContent.GetIndex()
         && m_aName == rBkmk.GetName();
 }
 
@@ -696,12 +696,12 @@ SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet& rSet,
             switch ( pItem->Which() )
             {
                 case RES_PAGEDESC:
-                    static_cast<SwFmtPageDesc*>(
+                    static_cast<SwFormatPageDesc*>(
                         const_cast<SfxPoolItem*>(pItem))->ChgDefinedIn( 0 );
                     break;
 
                 case RES_PARATR_DROP:
-                    static_cast<SwFmtDrop*>(
+                    static_cast<SwFormatDrop*>(
                         const_cast<SfxPoolItem*>(pItem))->ChgDefinedIn( 0 );
                     break;
 
@@ -712,13 +712,13 @@ SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet& rSet,
                         // Save formulas always in plain text
                         m_OldSet.ClearItem( RES_BOXATR_VALUE );
 
-                        SwTblBoxFormula& rNew =
-                            *static_cast<SwTblBoxFormula*>(
+                        SwTableBoxFormula& rNew =
+                            *static_cast<SwTableBoxFormula*>(
                                 const_cast<SfxPoolItem*>(pItem));
                         if ( rNew.IsIntrnlName() )
                         {
-                            const SwTblBoxFormula& rOld =
-                                static_cast<const SwTblBoxFormula&>(
+                            const SwTableBoxFormula& rOld =
+                                static_cast<const SwTableBoxFormula&>(
                                         rSet.Get( RES_BOXATR_FORMULA ));
                             const SwNode* pNd = rOld.GetNodeOfFormula();
                             if ( pNd )
@@ -727,11 +727,11 @@ SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet& rSet,
                                     = pNd->FindTableNode();
                                 if (pTableNode)
                                 {
-                                    SwTableFmlUpdate aMsgHnt(
+                                    SwTableFormulaUpdate aMsgHint(
                                         &pTableNode->GetTable() );
-                                    aMsgHnt.eFlags = TBL_BOXNAME;
+                                    aMsgHint.eFlags = TBL_BOXNAME;
                                     rNew.ChgDefinedIn( rOld.GetDefinedIn() );
-                                    rNew.ChangeState( &aMsgHnt );
+                                    rNew.ChangeState( &aMsgHint );
                                 }
                             }
                         }
@@ -753,22 +753,22 @@ void SwHistorySetAttrSet::SetInDoc( SwDoc* pDoc, bool )
     ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
 
     SwNode * pNode = pDoc->GetNodes()[ m_nNodeIndex ];
-    if ( pNode->IsCntntNode() )
+    if ( pNode->IsContentNode() )
     {
-        static_cast<SwCntntNode*>(pNode)->SetAttr( m_OldSet );
+        static_cast<SwContentNode*>(pNode)->SetAttr( m_OldSet );
         if ( !m_ResetArray.empty() )
         {
-            static_cast<SwCntntNode*>(pNode)->ResetAttr( m_ResetArray );
+            static_cast<SwContentNode*>(pNode)->ResetAttr( m_ResetArray );
         }
     }
     else if ( pNode->IsTableNode() )
     {
-        SwFmt& rFmt =
-            *static_cast<SwTableNode*>(pNode)->GetTable().GetFrmFmt();
-        rFmt.SetFmtAttr( m_OldSet );
+        SwFormat& rFormat =
+            *static_cast<SwTableNode*>(pNode)->GetTable().GetFrameFormat();
+        rFormat.SetFormatAttr( m_OldSet );
         if ( !m_ResetArray.empty() )
         {
-            rFmt.ResetFmtAttr( m_ResetArray.front() );
+            rFormat.ResetFormatAttr( m_ResetArray.front() );
         }
     }
 }
@@ -832,10 +832,10 @@ void SwHistoryResetAttrSet::SetInDoc( SwDoc* pDoc, bool )
 {
     ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
 
-    SwCntntNode * pCntntNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetCntntNode();
-    OSL_ENSURE( pCntntNd, "SwHistoryResetAttrSet: no CntntNode" );
+    SwContentNode * pContentNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetContentNode();
+    OSL_ENSURE( pContentNd, "SwHistoryResetAttrSet: no ContentNode" );
 
-    if (pCntntNd)
+    if (pContentNd)
     {
         std::vector<sal_uInt16>::iterator it;
         if ( USHRT_MAX == m_nEnd && USHRT_MAX == m_nStart )
@@ -843,7 +843,7 @@ void SwHistoryResetAttrSet::SetInDoc( SwDoc* pDoc, bool )
             // no area: use ContentNode
             for ( it = m_Array.begin(); it != m_Array.end(); ++it )
             {
-                pCntntNd->ResetAttr( *it );
+                pContentNd->ResetAttr( *it );
             }
         }
         else
@@ -851,18 +851,18 @@ void SwHistoryResetAttrSet::SetInDoc( SwDoc* pDoc, bool )
             // area: use TextNode
             for ( it = m_Array.begin(); it != m_Array.end(); ++it )
             {
-                pCntntNd->GetTxtNode()-> DeleteAttributes( *it, m_nStart, m_nEnd );
+                pContentNd->GetTextNode()-> DeleteAttributes( *it, m_nStart, m_nEnd );
             }
         }
     }
 }
 
-SwHistoryChangeFlyAnchor::SwHistoryChangeFlyAnchor( SwFrmFmt& rFmt )
+SwHistoryChangeFlyAnchor::SwHistoryChangeFlyAnchor( SwFrameFormat& rFormat )
     : SwHistoryHint( HSTRY_CHGFLYANCHOR )
-    , m_rFmt( rFmt )
-    , m_nOldNodeIndex( rFmt.GetAnchor().GetCntntAnchor()->nNode.GetIndex() )
-    , m_nOldContentIndex( (FLY_AT_CHAR == rFmt.GetAnchor().GetAnchorId())
-            ?   rFmt.GetAnchor().GetCntntAnchor()->nContent.GetIndex()
+    , m_rFormat( rFormat )
+    , m_nOldNodeIndex( rFormat.GetAnchor().GetContentAnchor()->nNode.GetIndex() )
+    , m_nOldContentIndex( (FLY_AT_CHAR == rFormat.GetAnchor().GetAnchorId())
+            ?   rFormat.GetAnchor().GetContentAnchor()->nContent.GetIndex()
             :   COMPLETE_STRING )
 {
 }
@@ -871,12 +871,12 @@ void SwHistoryChangeFlyAnchor::SetInDoc( SwDoc* pDoc, bool )
 {
     ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
 
-    if ( pDoc->GetSpzFrmFmts()->Contains( &m_rFmt ) )    // Format does still exist
+    if ( pDoc->GetSpzFrameFormats()->Contains( &m_rFormat ) )    // Format does still exist
     {
-        SwFmtAnchor aTmp( m_rFmt.GetAnchor() );
+        SwFormatAnchor aTmp( m_rFormat.GetAnchor() );
 
         SwNode* pNd = pDoc->GetNodes()[ m_nOldNodeIndex ];
-        SwCntntNode* pCNd = pNd->GetCntntNode();
+        SwContentNode* pCNd = pNd->GetContentNode();
         SwPosition aPos( *pNd );
         if ( COMPLETE_STRING != m_nOldContentIndex )
         {
@@ -891,68 +891,68 @@ void SwHistoryChangeFlyAnchor::SetInDoc( SwDoc* pDoc, bool )
         // so the Layout does not get confused
         if ( !pCNd || !pCNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false ) )
         {
-            m_rFmt.DelFrms();
+            m_rFormat.DelFrms();
         }
 
-        m_rFmt.SetFmtAttr( aTmp );
+        m_rFormat.SetFormatAttr( aTmp );
     }
 }
 
-SwHistoryChangeFlyChain::SwHistoryChangeFlyChain( SwFlyFrmFmt& rFmt,
-                                        const SwFmtChain& rAttr )
+SwHistoryChangeFlyChain::SwHistoryChangeFlyChain( SwFlyFrameFormat& rFormat,
+                                        const SwFormatChain& rAttr )
     : SwHistoryHint( HSTRY_CHGFLYCHAIN )
-    , m_pPrevFmt( rAttr.GetPrev() )
-    , m_pNextFmt( rAttr.GetNext() )
-    , m_pFlyFmt( &rFmt )
+    , m_pPrevFormat( rAttr.GetPrev() )
+    , m_pNextFormat( rAttr.GetNext() )
+    , m_pFlyFormat( &rFormat )
 {
 }
 
 void SwHistoryChangeFlyChain::SetInDoc( SwDoc* pDoc, bool )
 {
-    if (pDoc->GetSpzFrmFmts()->Contains( m_pFlyFmt ) )
+    if (pDoc->GetSpzFrameFormats()->Contains( m_pFlyFormat ) )
     {
-        SwFmtChain aChain;
+        SwFormatChain aChain;
 
-        if ( m_pPrevFmt &&
-             pDoc->GetSpzFrmFmts()->Contains( m_pPrevFmt ) )
+        if ( m_pPrevFormat &&
+             pDoc->GetSpzFrameFormats()->Contains( m_pPrevFormat ) )
         {
-            aChain.SetPrev( m_pPrevFmt );
-            SwFmtChain aTmp( m_pPrevFmt->GetChain() );
-            aTmp.SetNext( m_pFlyFmt );
-            m_pPrevFmt->SetFmtAttr( aTmp );
+            aChain.SetPrev( m_pPrevFormat );
+            SwFormatChain aTmp( m_pPrevFormat->GetChain() );
+            aTmp.SetNext( m_pFlyFormat );
+            m_pPrevFormat->SetFormatAttr( aTmp );
         }
 
-        if ( m_pNextFmt &&
-             pDoc->GetSpzFrmFmts()->Contains( m_pNextFmt ) )
+        if ( m_pNextFormat &&
+             pDoc->GetSpzFrameFormats()->Contains( m_pNextFormat ) )
         {
-            aChain.SetNext( m_pNextFmt );
-            SwFmtChain aTmp( m_pNextFmt->GetChain() );
-            aTmp.SetPrev( m_pFlyFmt );
-            m_pNextFmt->SetFmtAttr( aTmp );
+            aChain.SetNext( m_pNextFormat );
+            SwFormatChain aTmp( m_pNextFormat->GetChain() );
+            aTmp.SetPrev( m_pFlyFormat );
+            m_pNextFormat->SetFormatAttr( aTmp );
         }
 
         if ( aChain.GetNext() || aChain.GetPrev() )
         {
-            m_pFlyFmt->SetFmtAttr( aChain );
+            m_pFlyFormat->SetFormatAttr( aChain );
         }
     }
 }
 
 // -> #i27615#
-SwHistoryChangeCharFmt::SwHistoryChangeCharFmt(const SfxItemSet & rSet,
-                                     const OUString & sFmt)
+SwHistoryChangeCharFormat::SwHistoryChangeCharFormat(const SfxItemSet & rSet,
+                                     const OUString & sFormat)
     : SwHistoryHint(HSTRY_CHGCHARFMT)
-    , m_OldSet(rSet), m_Fmt(sFmt)
+    , m_OldSet(rSet), m_Format(sFormat)
 {
 }
 
-void SwHistoryChangeCharFmt::SetInDoc(SwDoc * pDoc, bool )
+void SwHistoryChangeCharFormat::SetInDoc(SwDoc * pDoc, bool )
 {
-    SwCharFmt * pCharFmt = pDoc->FindCharFmtByName(m_Fmt);
+    SwCharFormat * pCharFormat = pDoc->FindCharFormatByName(m_Format);
 
-    if (pCharFmt)
+    if (pCharFormat)
     {
-        pCharFmt->SetFmtAttr(m_OldSet);
+        pCharFormat->SetFormatAttr(m_OldSet);
     }
 }
 // <- #i27615#
@@ -998,18 +998,18 @@ void SwHistory::Add(
     // global tooling aka IsDefaultItem(const SfxPoolItem*) for now
     if(pOldValue && !IsDefaultItem(pOldValue))
     {
-        pHt = new SwHistorySetFmt( pOldValue, nNodeIdx );
+        pHt = new SwHistorySetFormat( pOldValue, nNodeIdx );
     }
     else
     {
-        pHt = new SwHistoryResetFmt( pNewValue, nNodeIdx );
+        pHt = new SwHistoryResetFormat( pNewValue, nNodeIdx );
     }
 
     m_SwpHstry.push_back( pHt );
 }
 
 // FIXME: refactor the following "Add" methods (DRY)?
-void SwHistory::Add( SwTxtAttr* pHint, sal_uLong nNodeIdx, bool bNewAttr )
+void SwHistory::Add( SwTextAttr* pHint, sal_uLong nNodeIdx, bool bNewAttr )
 {
     OSL_ENSURE( !m_nEndDiff, "History was not deleted after REDO" );
 
@@ -1020,44 +1020,44 @@ void SwHistory::Add( SwTxtAttr* pHint, sal_uLong nNodeIdx, bool bNewAttr )
         {
             case RES_TXTATR_FTN:
                 pHt = new SwHistorySetFootnote(
-                            static_cast<SwTxtFtn*>(pHint), nNodeIdx );
+                            static_cast<SwTextFootnote*>(pHint), nNodeIdx );
                 break;
             case RES_TXTATR_FLYCNT:
-                pHt = new SwHistoryTxtFlyCnt( static_cast<SwTxtFlyCnt*>(pHint)
-                            ->GetFlyCnt().GetFrmFmt() );
+                pHt = new SwHistoryTextFlyCnt( static_cast<SwTextFlyCnt*>(pHint)
+                            ->GetFlyCnt().GetFrameFormat() );
                 break;
             case RES_TXTATR_FIELD:
             case RES_TXTATR_ANNOTATION:
-                pHt = new SwHistorySetTxtFld(
-                        static_txtattr_cast<SwTxtFld*>(pHint), nNodeIdx);
+                pHt = new SwHistorySetTextField(
+                        static_txtattr_cast<SwTextField*>(pHint), nNodeIdx);
                 break;
             case RES_TXTATR_TOXMARK:
                 pHt = new SwHistorySetTOXMark(
-                        static_txtattr_cast<SwTxtTOXMark*>(pHint), nNodeIdx);
+                        static_txtattr_cast<SwTextTOXMark*>(pHint), nNodeIdx);
                 break;
             case RES_TXTATR_REFMARK:
                 pHt = new SwHistorySetRefMark(
-                        static_txtattr_cast<SwTxtRefMark*>(pHint), nNodeIdx);
+                        static_txtattr_cast<SwTextRefMark*>(pHint), nNodeIdx);
                 break;
             default:
-                pHt = new SwHistorySetTxt(
-                            static_cast<SwTxtAttr*>(pHint), nNodeIdx );
+                pHt = new SwHistorySetText(
+                            static_cast<SwTextAttr*>(pHint), nNodeIdx );
         }
     }
     else
     {
-        pHt = new SwHistoryResetTxt( pHint->Which(), pHint->GetStart(),
+        pHt = new SwHistoryResetText( pHint->Which(), pHint->GetStart(),
                                     *pHint->GetAnyEnd(), nNodeIdx );
     }
     m_SwpHstry.push_back( pHt );
 }
 
-void SwHistory::Add( SwFmtColl* pColl, sal_uLong nNodeIdx, sal_uInt8 nWhichNd )
+void SwHistory::Add( SwFormatColl* pColl, sal_uLong nNodeIdx, sal_uInt8 nWhichNd )
 {
     OSL_ENSURE( !m_nEndDiff, "History was not deleted after REDO" );
 
     SwHistoryHint * pHt =
-        new SwHistoryChangeFmtColl( pColl, nNodeIdx, nWhichNd );
+        new SwHistoryChangeFormatColl( pColl, nNodeIdx, nWhichNd );
     m_SwpHstry.push_back( pHt );
 }
 
@@ -1069,59 +1069,59 @@ void SwHistory::Add(const ::sw::mark::IMark& rBkmk, bool bSavePos, bool bSaveOth
     m_SwpHstry.push_back( pHt );
 }
 
-void SwHistory::Add( SwFrmFmt& rFmt )
+void SwHistory::Add( SwFrameFormat& rFormat )
 {
-    SwHistoryHint * pHt = new SwHistoryChangeFlyAnchor( rFmt );
+    SwHistoryHint * pHt = new SwHistoryChangeFlyAnchor( rFormat );
     m_SwpHstry.push_back( pHt );
 }
 
-void SwHistory::Add( SwFlyFrmFmt& rFmt, sal_uInt16& rSetPos )
+void SwHistory::Add( SwFlyFrameFormat& rFormat, sal_uInt16& rSetPos )
 {
     OSL_ENSURE( !m_nEndDiff, "History was not deleted after REDO" );
 
-    const sal_uInt16 nWh = rFmt.Which();
+    const sal_uInt16 nWh = rFormat.Which();
     if( RES_FLYFRMFMT == nWh || RES_DRAWFRMFMT == nWh )
     {
-        SwHistoryHint * pHint = new SwHistoryTxtFlyCnt( &rFmt );
+        SwHistoryHint * pHint = new SwHistoryTextFlyCnt( &rFormat );
         m_SwpHstry.push_back( pHint );
 
-        const SwFmtChain* pChainItem;
-        if( SfxItemState::SET == rFmt.GetItemState( RES_CHAIN, false,
+        const SwFormatChain* pChainItem;
+        if( SfxItemState::SET == rFormat.GetItemState( RES_CHAIN, false,
             reinterpret_cast<const SfxPoolItem**>(&pChainItem) ))
         {
             if( pChainItem->GetNext() || pChainItem->GetPrev() )
             {
                 SwHistoryHint * pHt =
-                    new SwHistoryChangeFlyChain( rFmt, *pChainItem );
+                    new SwHistoryChangeFlyChain( rFormat, *pChainItem );
                 m_SwpHstry.insert( m_SwpHstry.begin() + rSetPos++, pHt );
                 if ( pChainItem->GetNext() )
                 {
-                    SwFmtChain aTmp( pChainItem->GetNext()->GetChain() );
+                    SwFormatChain aTmp( pChainItem->GetNext()->GetChain() );
                     aTmp.SetPrev( 0 );
-                    pChainItem->GetNext()->SetFmtAttr( aTmp );
+                    pChainItem->GetNext()->SetFormatAttr( aTmp );
                 }
                 if ( pChainItem->GetPrev() )
                 {
-                    SwFmtChain aTmp( pChainItem->GetPrev()->GetChain() );
+                    SwFormatChain aTmp( pChainItem->GetPrev()->GetChain() );
                     aTmp.SetNext( 0 );
-                    pChainItem->GetPrev()->SetFmtAttr( aTmp );
+                    pChainItem->GetPrev()->SetFormatAttr( aTmp );
                 }
             }
-            rFmt.ResetFmtAttr( RES_CHAIN );
+            rFormat.ResetFormatAttr( RES_CHAIN );
         }
     }
 }
 
-void SwHistory::Add( const SwTxtFtn& rFtn )
+void SwHistory::Add( const SwTextFootnote& rFootnote )
 {
-    SwHistoryHint *pHt = new SwHistorySetFootnote( rFtn );
+    SwHistoryHint *pHt = new SwHistorySetFootnote( rFootnote );
     m_SwpHstry.push_back( pHt );
 }
 
 // #i27615#
-void SwHistory::Add(const SfxItemSet & rSet, const SwCharFmt & rFmt)
+void SwHistory::Add(const SfxItemSet & rSet, const SwCharFormat & rFormat)
 {
-    SwHistoryHint * pHt = new SwHistoryChangeCharFmt(rSet, rFmt.GetName());
+    SwHistoryHint * pHt = new SwHistoryChangeCharFormat(rSet, rFormat.GetName());
     m_SwpHstry.push_back( pHt );
 }
 
@@ -1190,15 +1190,15 @@ sal_uInt16 SwHistory::SetTmpEnd( sal_uInt16 nNewTmpEnd )
     {
         if ( HSTRY_FLYCNT == (*this)[ n ]->Which() )
         {
-            static_cast<SwHistoryTxtFlyCnt*>((*this)[ n ])
-                ->GetUDelLFmt()->RedoForRollback();
+            static_cast<SwHistoryTextFlyCnt*>((*this)[ n ])
+                ->GetUDelLFormat()->RedoForRollback();
         }
     }
 
     return nOld;
 }
 
-void SwHistory::CopyFmtAttr(
+void SwHistory::CopyFormatAttr(
     const SfxItemSet& rSet,
     sal_uLong nNodeIdx)
 {
@@ -1240,7 +1240,7 @@ void SwHistory::CopyAttr(
         return;
 
     // copy all attributes of the TextNode in the area from nStart to nEnd
-    SwTxtAttr* pHt;
+    SwTextAttr* pHt;
     for( size_t n = 0; n < pHts->Count(); ++n )
     {
         // nAttrStt must even be set when !pEndIdx
@@ -1250,7 +1250,7 @@ void SwHistory::CopyAttr(
         if( 0 !=  pEndIdx && nAttrStt > nEnd )
             break;
 
-        // never copy Flys and Ftn !!
+        // never copy Flys and Footnote !!
         bool bNextAttr = false;
         switch( pHt->Which() )
         {
@@ -1346,11 +1346,11 @@ void SwRegHistory::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 
                 if ( m_WhichIdSet.count( pItem->Which() ) )
                 {
-                    pNewHstr = new SwHistorySetFmt( pItem, m_nNodeIndex );
+                    pNewHstr = new SwHistorySetFormat( pItem, m_nNodeIndex );
                 }
                 else
                 {
-                    pNewHstr = new SwHistoryResetFmt( pItem, m_nNodeIndex );
+                    pNewHstr = new SwHistoryResetFormat( pItem, m_nNodeIndex );
                 }
             }
 
@@ -1359,7 +1359,7 @@ void SwRegHistory::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     }
 }
 
-void SwRegHistory::AddHint( SwTxtAttr* pHt, const bool bNew )
+void SwRegHistory::AddHint( SwTextAttr* pHt, const bool bNew )
 {
     m_pHistory->Add( pHt, m_nNodeIndex, bNew );
 }
@@ -1370,34 +1370,34 @@ bool SwRegHistory::InsertItems( const SfxItemSet& rSet,
     if( !rSet.Count() )
         return false;
 
-    SwTxtNode * const pTxtNode =
-        dynamic_cast<SwTxtNode *>(const_cast<SwModify *>(GetRegisteredIn()));
+    SwTextNode * const pTextNode =
+        dynamic_cast<SwTextNode *>(const_cast<SwModify *>(GetRegisteredIn()));
 
-    OSL_ENSURE(pTxtNode, "SwRegHistory not registered at text node?");
-    if (!pTxtNode)
+    OSL_ENSURE(pTextNode, "SwRegHistory not registered at text node?");
+    if (!pTextNode)
         return false;
 
-    if ( pTxtNode->GetpSwpHints() && m_pHistory )
+    if ( pTextNode->GetpSwpHints() && m_pHistory )
     {
-        pTxtNode->GetpSwpHints()->Register( this );
+        pTextNode->GetpSwpHints()->Register( this );
     }
 
-    const bool bInserted = pTxtNode->SetAttr( rSet, nStart, nEnd, nFlags );
+    const bool bInserted = pTextNode->SetAttr( rSet, nStart, nEnd, nFlags );
 
     // Caution: The array can be deleted when inserting an attribute!
     // This can happen when the value that should be added first deletes
     // an existing attribute but does not need to be added itself because
     // the paragraph attributes are identical
     // ( -> bForgetAttr in SwpHints::Insert )
-    if ( pTxtNode->GetpSwpHints() && m_pHistory )
+    if ( pTextNode->GetpSwpHints() && m_pHistory )
     {
-        pTxtNode->GetpSwpHints()->DeRegister();
+        pTextNode->GetpSwpHints()->DeRegister();
     }
 
     if ( m_pHistory && bInserted )
     {
         SwHistoryHint* pNewHstr = new SwHistoryResetAttrSet( rSet,
-                                    pTxtNode->GetIndex(), nStart, nEnd );
+                                    pTextNode->GetIndex(), nStart, nEnd );
         // the NodeIndex might be moved!
 
         m_pHistory->m_SwpHstry.push_back( pNewHstr );
@@ -1429,14 +1429,14 @@ void SwRegHistory::_MakeSetWhichIds()
     if( GetRegisteredIn() )
     {
         const SfxItemSet* pSet = 0;
-        if( GetRegisteredIn()->ISA( SwCntntNode ) )
+        if( GetRegisteredIn()->ISA( SwContentNode ) )
         {
-            pSet = static_cast<SwCntntNode*>(
+            pSet = static_cast<SwContentNode*>(
                     const_cast<SwModify*>(GetRegisteredIn()))->GetpSwAttrSet();
         }
-        else if ( GetRegisteredIn()->ISA( SwFmt ) )
+        else if ( GetRegisteredIn()->ISA( SwFormat ) )
         {
-            pSet = &static_cast<SwFmt*>(
+            pSet = &static_cast<SwFormat*>(
                     const_cast<SwModify*>(GetRegisteredIn()))->GetAttrSet();
         }
         if( pSet && pSet->Count() )
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 86f44f280dd2..8eec8e292f41 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -59,13 +59,13 @@
 #include <charfmt.hxx>
 #include <calbck.hxx>
 
-SwUndoFmtAttrHelper::SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSvDrwPt )
-    : SwClient( &rFmt )
+SwUndoFormatAttrHelper::SwUndoFormatAttrHelper( SwFormat& rFormat, bool bSvDrwPt )
+    : SwClient( &rFormat )
     , m_bSaveDrawPt( bSvDrwPt )
 {
 }
 
-void SwUndoFmtAttrHelper::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwUndoFormatAttrHelper::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     if( pOld ) {
         if ( pOld->Which() == RES_OBJECTDYING ) {
@@ -75,8 +75,8 @@ void SwUndoFmtAttrHelper::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pN
                 if ( GetUndo() ) {
                     m_pUndo->PutAttr( *pOld );
                 } else {
-                    m_pUndo.reset( new SwUndoFmtAttr( *pOld,
-                                                      *static_cast<SwFmt*>(GetRegisteredInNonConst()), m_bSaveDrawPt ) );
+                    m_pUndo.reset( new SwUndoFormatAttr( *pOld,
+                                                      *static_cast<SwFormat*>(GetRegisteredInNonConst()), m_bSaveDrawPt ) );
                 }
             } else if ( RES_ATTRSET_CHG == pOld->Which() ) {
                 if ( GetUndo() ) {
@@ -90,77 +90,77 @@ void SwUndoFmtAttrHelper::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pN
                         pItem = aIter.NextItem();
                     }
                 } else {
-                    m_pUndo.reset( new SwUndoFmtAttr(
+                    m_pUndo.reset( new SwUndoFormatAttr(
                                        *static_cast<const SwAttrSetChg*>(pOld)->GetChgSet(),
-                                       *static_cast<SwFmt*>(GetRegisteredInNonConst()), m_bSaveDrawPt ) );
+                                       *static_cast<SwFormat*>(GetRegisteredInNonConst()), m_bSaveDrawPt ) );
                 }
             }
         }
     }
 }
 
-SwUndoFmtAttr::SwUndoFmtAttr( const SfxItemSet& rOldSet,
-                              SwFmt& rChgFmt,
+SwUndoFormatAttr::SwUndoFormatAttr( const SfxItemSet& rOldSet,
+                              SwFormat& rChgFormat,
                               bool bSaveDrawPt )
     : SwUndo( UNDO_INSFMTATTR )
-    , m_pFmt( &rChgFmt )
+    , m_pFormat( &rChgFormat )
     // #i56253#
     , m_pOldSet( new SfxItemSet( rOldSet ) )
     , m_nNodeIndex( 0 )
-    , m_nFmtWhich( rChgFmt.Which() )
+    , m_nFormatWhich( rChgFormat.Which() )
     , m_bSaveDrawPt( bSaveDrawPt )
 {
     Init();
 }
 
-SwUndoFmtAttr::SwUndoFmtAttr( const SfxPoolItem& rItem, SwFmt& rChgFmt,
+SwUndoFormatAttr::SwUndoFormatAttr( const SfxPoolItem& rItem, SwFormat& rChgFormat,
                               bool bSaveDrawPt )
     : SwUndo( UNDO_INSFMTATTR )
-    , m_pFmt( &rChgFmt )
-    , m_pOldSet( m_pFmt->GetAttrSet().Clone( false ) )
+    , m_pFormat( &rChgFormat )
+    , m_pOldSet( m_pFormat->GetAttrSet().Clone( false ) )
     , m_nNodeIndex( 0 )
-    , m_nFmtWhich( rChgFmt.Which() )
+    , m_nFormatWhich( rChgFormat.Which() )
     , m_bSaveDrawPt( bSaveDrawPt )
 {
     m_pOldSet->Put( rItem );
     Init();
 }
 
-void SwUndoFmtAttr::Init()
+void SwUndoFormatAttr::Init()
 {
     // treat change of anchor specially
     if ( SfxItemState::SET == m_pOldSet->GetItemState( RES_ANCHOR, false )) {
         SaveFlyAnchor( m_bSaveDrawPt );
-    } else if ( RES_FRMFMT == m_nFmtWhich ) {
-        SwDoc* pDoc = m_pFmt->GetDoc();
-        if ( pDoc->GetTblFrmFmts()->Contains( m_pFmt )) {
+    } else if ( RES_FRMFMT == m_nFormatWhich ) {
+        SwDoc* pDoc = m_pFormat->GetDoc();
+        if ( pDoc->GetTableFrameFormats()->Contains( m_pFormat )) {
             // Table Format: save table position, table formats are volatile!
-            SwTable * pTbl = SwIterator<SwTable,SwFmt>( *m_pFmt ).First();
-            if ( pTbl ) {
-                m_nNodeIndex = pTbl->GetTabSortBoxes()[ 0 ]->GetSttNd()
+            SwTable * pTable = SwIterator<SwTable,SwFormat>( *m_pFormat ).First();
+            if ( pTable ) {
+                m_nNodeIndex = pTable->GetTabSortBoxes()[ 0 ]->GetSttNd()
                                ->FindTableNode()->GetIndex();
             }
-        } else if ( pDoc->GetSections().Contains( m_pFmt )) {
-            m_nNodeIndex = m_pFmt->GetCntnt().GetCntntIdx()->GetIndex();
-        } else if ( 0 != dynamic_cast< SwTableBoxFmt* >( m_pFmt ) ) {
-            SwTableBox * pTblBox = SwIterator<SwTableBox,SwFmt>( *m_pFmt ).First();
-            if ( pTblBox ) {
-                m_nNodeIndex = pTblBox->GetSttIdx();
+        } else if ( pDoc->GetSections().Contains( m_pFormat )) {
+            m_nNodeIndex = m_pFormat->GetContent().GetContentIdx()->GetIndex();
+        } else if ( 0 != dynamic_cast< SwTableBoxFormat* >( m_pFormat ) ) {
+            SwTableBox * pTableBox = SwIterator<SwTableBox,SwFormat>( *m_pFormat ).First();
+            if ( pTableBox ) {
+                m_nNodeIndex = pTableBox->GetSttIdx();
             }
         }
     }
 }
 
-SwUndoFmtAttr::~SwUndoFmtAttr()
+SwUndoFormatAttr::~SwUndoFormatAttr()
 {
 }
 
-void SwUndoFmtAttr::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoFormatAttr::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     // OD 2004-10-26 #i35443#
     // Important note: <Undo(..)> also called by <ReDo(..)>
 
-    if ( !m_pOldSet.get() || !m_pFmt || !IsFmtInDoc( &rContext.GetDoc() ))
+    if ( !m_pOldSet.get() || !m_pFormat || !IsFormatInDoc( &rContext.GetDoc() ))
         return;
 
     // #i35443# - If anchor attribute has been successful
@@ -181,8 +181,8 @@ void SwUndoFmtAttr::UndoImpl(::sw::UndoRedoContext & rContext)
     }
 
     if ( !bAnchorAttrRestored ) {
-        SwUndoFmtAttrHelper aTmp( *m_pFmt, m_bSaveDrawPt );
-        m_pFmt->SetFmtAttr( *m_pOldSet );
+        SwUndoFormatAttrHelper aTmp( *m_pFormat, m_bSaveDrawPt );
+        m_pFormat->SetFormatAttr( *m_pOldSet );
         if ( aTmp.GetUndo() ) {
             // transfer ownership of helper object's old set
             m_pOldSet = std::move(aTmp.GetUndo()->m_pOldSet);
@@ -190,30 +190,30 @@ void SwUndoFmtAttr::UndoImpl(::sw::UndoRedoContext & rContext)
             m_pOldSet->ClearItem();
         }
 
-        if ( RES_FLYFRMFMT == m_nFmtWhich || RES_DRAWFRMFMT == m_nFmtWhich ) {
-            rContext.SetSelections(static_cast<SwFrmFmt*>(m_pFmt), 0);
+        if ( RES_FLYFRMFMT == m_nFormatWhich || RES_DRAWFRMFMT == m_nFormatWhich ) {
+            rContext.SetSelections(static_cast<SwFrameFormat*>(m_pFormat), 0);
         }
     }
 }
 
-bool SwUndoFmtAttr::IsFmtInDoc( SwDoc* pDoc )
+bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc )
 {
     // search for the Format in the Document; if it does not exist any more,
     // the attribute is not restored!
     bool bFound = false;
-    switch ( m_nFmtWhich )
+    switch ( m_nFormatWhich )
     {
         case RES_TXTFMTCOLL:
-            bFound = pDoc->GetTxtFmtColls()->Contains( m_pFmt );
+            bFound = pDoc->GetTextFormatColls()->Contains( m_pFormat );
             break;
 
         case RES_GRFFMTCOLL:
-            bFound = pDoc->GetGrfFmtColls()->Contains(
-                    static_cast<const SwGrfFmtColl*>(m_pFmt) );
+            bFound = pDoc->GetGrfFormatColls()->Contains(
+                    static_cast<const SwGrfFormatColl*>(m_pFormat) );
             break;
 
         case RES_CHRFMT:
-            bFound = pDoc->GetCharFmts()->Contains( m_pFmt );
+            bFound = pDoc->GetCharFormats()->Contains( m_pFormat );
             break;
 
         case RES_FRMFMT:
@@ -222,29 +222,29 @@ bool SwUndoFmtAttr::IsFmtInDoc( SwDoc* pDoc )
                 SwNode* pNd = pDoc->GetNodes()[ m_nNodeIndex ];
                 if ( pNd->IsTableNode() )
                 {
-                    m_pFmt =
-                        static_cast<SwTableNode*>(pNd)->GetTable().GetFrmFmt();
+                    m_pFormat =
+                        static_cast<SwTableNode*>(pNd)->GetTable().GetFrameFormat();
                     bFound = true;
                     break;
                 }
                 else if ( pNd->IsSectionNode() )
                 {
-                    m_pFmt =
-                        static_cast<SwSectionNode*>(pNd)->GetSection().GetFmt();
+                    m_pFormat =
+                        static_cast<SwSectionNode*>(pNd)->GetSection().GetFormat();
                     bFound = true;
                     break;
                 }
                 else if ( pNd->IsStartNode() && (SwTableBoxStartNode ==
                     static_cast< SwStartNode* >(pNd)->GetStartNodeType()) )
                 {
-                    SwTableNode* pTblNode = pNd->FindTableNode();
-                    if ( pTblNode )
+                    SwTableNode* pTableNode = pNd->FindTableNode();
+                    if ( pTableNode )
                     {
                         SwTableBox* pBox =
-                            pTblNode->GetTable().GetTblBox( m_nNodeIndex );
+                            pTableNode->GetTable().GetTableBox( m_nNodeIndex );
                         if ( pBox )
                         {
-                            m_pFmt = pBox->GetFrmFmt();
+                            m_pFormat = pBox->GetFrameFormat();
                             bFound = true;
                             break;
                         }
@@ -254,10 +254,10 @@ bool SwUndoFmtAttr::IsFmtInDoc( SwDoc* pDoc )
             // no break!
         case RES_DRAWFRMFMT:
         case RES_FLYFRMFMT:
-            bFound = pDoc->GetSpzFrmFmts()->Contains( m_pFmt );
+            bFound = pDoc->GetSpzFrameFormats()->Contains( m_pFormat );
             if ( !bFound )
             {
-                bFound = pDoc->GetFrmFmts()->Contains( m_pFmt );
+                bFound = pDoc->GetFrameFormats()->Contains( m_pFormat );
             }
             break;
     }
@@ -265,68 +265,68 @@ bool SwUndoFmtAttr::IsFmtInDoc( SwDoc* pDoc )
     if ( !bFound )
     {
         // Format does not exist; reset
-        m_pFmt = 0;
+        m_pFormat = 0;
     }
 
-    return 0 != m_pFmt;
+    return 0 != m_pFormat;
 }
 
 // Check if it is still in Doc
-SwFmt* SwUndoFmtAttr::GetFmt( SwDoc& rDoc )
+SwFormat* SwUndoFormatAttr::GetFormat( SwDoc& rDoc )
 {
-    return m_pFmt && IsFmtInDoc( &rDoc ) ? m_pFmt : 0;
+    return m_pFormat && IsFormatInDoc( &rDoc ) ? m_pFormat : 0;
 }
 
-void SwUndoFmtAttr::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoFormatAttr::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     // #i35443# - Because the undo stores the attributes for
     // redo, the same code as for <Undo(..)> can be applied for <Redo(..)>
     UndoImpl(rContext);
 }
 
-void SwUndoFmtAttr::RepeatImpl(::sw::RepeatContext & rContext)
+void SwUndoFormatAttr::RepeatImpl(::sw::RepeatContext & rContext)
 {
     if ( !m_pOldSet.get() )
         return;
 
     SwDoc & rDoc(rContext.GetDoc());
 
-    switch ( m_nFmtWhich ) {
+    switch ( m_nFormatWhich ) {
     case RES_GRFFMTCOLL: {
-        SwNoTxtNode *const pNd =
-            rContext.GetRepeatPaM().GetNode().GetNoTxtNode();
+        SwNoTextNode *const pNd =
+            rContext.GetRepeatPaM().GetNode().GetNoTextNode();
         if( pNd ) {
-            rDoc.SetAttr( m_pFmt->GetAttrSet(), *pNd->GetFmtColl() );
+            rDoc.SetAttr( m_pFormat->GetAttrSet(), *pNd->GetFormatColl() );
         }
     }
     break;
 
     case RES_TXTFMTCOLL: {
-        SwTxtNode *const pNd =
-            rContext.GetRepeatPaM().GetNode().GetTxtNode();
+        SwTextNode *const pNd =
+            rContext.GetRepeatPaM().GetNode().GetTextNode();
         if( pNd ) {
-            rDoc.SetAttr( m_pFmt->GetAttrSet(), *pNd->GetFmtColl() );
+            rDoc.SetAttr( m_pFormat->GetAttrSet(), *pNd->GetFormatColl() );
         }
     }
     break;
 
     case RES_FLYFRMFMT: {
         // Check if the cursor is in a flying frame
-        // Steps: search in all FlyFrmFormats for the FlyCntnt attribute
+        // Steps: search in all FlyFrmFormats for the FlyContent attribute
         // and validate if the cursor is in the respective section
-        SwFrmFmt *const pFly =
-            rContext.GetRepeatPaM().GetNode().GetFlyFmt();
+        SwFrameFormat *const pFly =
+            rContext.GetRepeatPaM().GetNode().GetFlyFormat();
         if( pFly ) {
             // Bug 43672: do not set all attributes!
             if (SfxItemState::SET ==
-                m_pFmt->GetAttrSet().GetItemState( RES_CNTNT )) {
-                SfxItemSet aTmpSet( m_pFmt->GetAttrSet() );
+                m_pFormat->GetAttrSet().GetItemState( RES_CNTNT )) {
+                SfxItemSet aTmpSet( m_pFormat->GetAttrSet() );
                 aTmpSet.ClearItem( RES_CNTNT );
                 if( aTmpSet.Count() ) {
                     rDoc.SetAttr( aTmpSet, *pFly );
                 }
             } else {
-                rDoc.SetAttr( m_pFmt->GetAttrSet(), *pFly );
+                rDoc.SetAttr( m_pFormat->GetAttrSet(), *pFly );
             }
         }
         break;
@@ -334,18 +334,18 @@ void SwUndoFmtAttr::RepeatImpl(::sw::RepeatContext & rContext)
     }
 }
 
-SwRewriter SwUndoFmtAttr::GetRewriter() const
+SwRewriter SwUndoFormatAttr::GetRewriter() const
 {
     SwRewriter aRewriter;
 
-    if (m_pFmt) {
-        aRewriter.AddRule(UndoArg1, m_pFmt->GetName());
+    if (m_pFormat) {
+        aRewriter.AddRule(UndoArg1, m_pFormat->GetName());
     }
 
     return aRewriter;
 }
 
-void SwUndoFmtAttr::PutAttr( const SfxPoolItem& rItem )
+void SwUndoFormatAttr::PutAttr( const SfxPoolItem& rItem )
 {
     m_pOldSet->Put( rItem );
     if ( RES_ANCHOR == rItem.Which() ) {
@@ -353,38 +353,38 @@ void SwUndoFmtAttr::PutAttr( const SfxPoolItem& rItem )
     }
 }
 
-void SwUndoFmtAttr::SaveFlyAnchor( bool bSvDrwPt )
+void SwUndoFormatAttr::SaveFlyAnchor( bool bSvDrwPt )
 {
     // Format is valid, otherwise you would not reach this point here
     if( bSvDrwPt ) {
-        if ( RES_DRAWFRMFMT == m_pFmt->Which() ) {
-            Point aPt( static_cast<SwFrmFmt*>(m_pFmt)->FindSdrObject()
+        if ( RES_DRAWFRMFMT == m_pFormat->Which() ) {
+            Point aPt( static_cast<SwFrameFormat*>(m_pFormat)->FindSdrObject()
                        ->GetRelativePos() );
-            // store old value as attribute, to keep SwUndoFmtAttr small
-            m_pOldSet->Put( SwFmtFrmSize( ATT_VAR_SIZE, aPt.X(), aPt.Y() ) );
+            // store old value as attribute, to keep SwUndoFormatAttr small
+            m_pOldSet->Put( SwFormatFrmSize( ATT_VAR_SIZE, aPt.X(), aPt.Y() ) );
         }
     }
 
-    const SwFmtAnchor& rAnchor =
-        static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, false ) );
-    if( !rAnchor.GetCntntAnchor() )
+    const SwFormatAnchor& rAnchor =
+        static_cast<const SwFormatAnchor&>( m_pOldSet->Get( RES_ANCHOR, false ) );
+    if( !rAnchor.GetContentAnchor() )
         return;
 
-    sal_Int32 nCntnt = 0;
+    sal_Int32 nContent = 0;
     switch( rAnchor.GetAnchorId() ) {
     case FLY_AS_CHAR:
     case FLY_AT_CHAR:
-        nCntnt = rAnchor.GetCntntAnchor()->nContent.GetIndex();
+        nContent = rAnchor.GetContentAnchor()->nContent.GetIndex();
         // fallthrough
     case FLY_AT_PARA:
     case FLY_AT_FLY:
-        m_nNodeIndex = rAnchor.GetCntntAnchor()->nNode.GetIndex();
+        m_nNodeIndex = rAnchor.GetContentAnchor()->nNode.GetIndex();
         break;
     default:
         return;
     }
 
-    SwFmtAnchor aAnchor( rAnchor.GetAnchorId(), nCntnt );
+    SwFormatAnchor aAnchor( rAnchor.GetAnchorId(), nContent );
     m_pOldSet->Put( aAnchor );
 }
 
@@ -392,21 +392,21 @@ void SwUndoFmtAttr::SaveFlyAnchor( bool bSvDrwPt )
 // Return value indicates, if anchor attribute is restored.
 // Note: If anchor attribute is restored, all other existing attributes
 //       are also restored.
-bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
+bool SwUndoFormatAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
 {
     SwDoc *const pDoc = & rContext.GetDoc();
-    SwFlyFrmFmt* pFrmFmt = static_cast<SwFlyFrmFmt*>(m_pFmt);
-    const SwFmtAnchor& rAnchor =
-        static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, false ) );
+    SwFlyFrameFormat* pFrameFormat = static_cast<SwFlyFrameFormat*>(m_pFormat);
+    const SwFormatAnchor& rAnchor =
+        static_cast<const SwFormatAnchor&>( m_pOldSet->Get( RES_ANCHOR, false ) );
 
-    SwFmtAnchor aNewAnchor( rAnchor.GetAnchorId() );
+    SwFormatAnchor aNewAnchor( rAnchor.GetAnchorId() );
     if (FLY_AT_PAGE != rAnchor.GetAnchorId()) {
         SwNode* pNd = pDoc->GetNodes()[ m_nNodeIndex  ];
 
         if (  (FLY_AT_FLY == rAnchor.GetAnchorId())
               ? ( !pNd->IsStartNode() || (SwFlyStartNode !=
                                           static_cast<SwStartNode*>(pNd)->GetStartNodeType()) )
-              : !pNd->IsTxtNode() ) {
+              : !pNd->IsTextNode() ) {
             // #i35443# - invalid position.
             // Thus, anchor attribute not restored
             return false;
@@ -415,8 +415,8 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
         SwPosition aPos( *pNd );
         if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) ||
             (FLY_AT_CHAR == rAnchor.GetAnchorId())) {
-            aPos.nContent.Assign( static_cast<SwTxtNode*>(pNd), rAnchor.GetPageNum() );
-            if ( aPos.nContent.GetIndex() > pNd->GetTxtNode()->GetTxt().getLength()) {
+            aPos.nContent.Assign( static_cast<SwTextNode*>(pNd), rAnchor.GetPageNum() );
+            if ( aPos.nContent.GetIndex() > pNd->GetTextNode()->GetText().getLength()) {
                 // #i35443# - invalid position.
                 // Thus, anchor attribute not restored
                 return false;
@@ -428,49 +428,49 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
 
     Point aDrawSavePt, aDrawOldPt;
     if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() ) {
-        if( RES_DRAWFRMFMT == pFrmFmt->Which() ) {
+        if( RES_DRAWFRMFMT == pFrameFormat->Which() ) {
             // get the old cached value
-            const SwFmtFrmSize& rOldSize = static_cast<const SwFmtFrmSize&>(
+            const SwFormatFrmSize& rOldSize = static_cast<const SwFormatFrmSize&>(
                                                m_pOldSet->Get( RES_FRM_SIZE ) );
             aDrawSavePt.X() = rOldSize.GetWidth();
             aDrawSavePt.Y() = rOldSize.GetHeight();
             m_pOldSet->ClearItem( RES_FRM_SIZE );
 
             // write the current value into cache
-            aDrawOldPt = pFrmFmt->FindSdrObject()->GetRelativePos();
+            aDrawOldPt = pFrameFormat->FindSdrObject()->GetRelativePos();
         } else {
-            pFrmFmt->DelFrms();         // delete Frms
+            pFrameFormat->DelFrms();         // delete Frms
         }
     }
 
-    const SwFmtAnchor &rOldAnch = pFrmFmt->GetAnchor();
+    const SwFormatAnchor &rOldAnch = pFrameFormat->GetAnchor();
     // #i54336#
     // Consider case, that as-character anchored object has moved its anchor position.
     if (FLY_AS_CHAR == rOldAnch.GetAnchorId()) {
-        // With InCntnts it's tricky: the text attribute needs to be deleted.
+        // With InContents it's tricky: the text attribute needs to be deleted.
         // Unfortunately, this not only destroys the Frms but also the format.
         // To prevent that, first detach the connection between attribute and
         // format.
-        const SwPosition *pPos = rOldAnch.GetCntntAnchor();
-        SwTxtNode *pTxtNode = static_cast<SwTxtNode*>(&pPos->nNode.GetNode());
-        OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+        const SwPosition *pPos = rOldAnch.GetContentAnchor();
+        SwTextNode *pTextNode = static_cast<SwTextNode*>(&pPos->nNode.GetNode());
+        OSL_ENSURE( pTextNode->HasHints(), "Missing FlyInCnt-Hint." );
         const sal_Int32 nIdx = pPos->nContent.GetIndex();
-        SwTxtAttr * const pHnt =
-            pTxtNode->GetTxtAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
-        OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+        SwTextAttr * const pHint =
+            pTextNode->GetTextAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
+        OSL_ENSURE( pHint && pHint->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
-        OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pFrmFmt,
-                    "Wrong TxtFlyCnt-Hint." );
-        const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
+        OSL_ENSURE( pHint && pHint->GetFlyCnt().GetFrameFormat() == pFrameFormat,
+                    "Wrong TextFlyCnt-Hint." );
+        const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt()).SetFlyFormat();
 
         // Connection is now detached, therefore the attribute can be deleted
-        pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
+        pTextNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
     }
 
     {
         m_pOldSet->Put( aNewAnchor );
-        SwUndoFmtAttrHelper aTmp( *m_pFmt, m_bSaveDrawPt );
-        m_pFmt->SetFmtAttr( *m_pOldSet );
+        SwUndoFormatAttrHelper aTmp( *m_pFormat, m_bSaveDrawPt );
+        m_pFormat->SetFormatAttr( *m_pOldSet );
         if ( aTmp.GetUndo() ) {
             m_nNodeIndex = aTmp.GetUndo()->m_nNodeIndex;
             // transfer ownership of helper object's old set
@@ -480,9 +480,9 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
         }
     }
 
-    if ( RES_DRAWFRMFMT == pFrmFmt->Which() ) {
+    if ( RES_DRAWFRMFMT == pFrameFormat->Which() ) {
         SwDrawContact *pCont =
-            static_cast<SwDrawContact*>(pFrmFmt->FindContactObj());
+            static_cast<SwDrawContact*>(pFrameFormat->FindContactObj());
         // The Draw model also prepared an Undo object for its right positioning
         // which unfortunately is relative. Therefore block here a position
         // change of the Contact object by setting the anchor.
@@ -497,27 +497,27 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
 
         // cache the old value again
         m_pOldSet->Put(
-            SwFmtFrmSize( ATT_VAR_SIZE, aDrawOldPt.X(), aDrawOldPt.Y() ) );
+            SwFormatFrmSize( ATT_VAR_SIZE, aDrawOldPt.X(), aDrawOldPt.Y() ) );
     }
 
     if (FLY_AS_CHAR == aNewAnchor.GetAnchorId()) {
-        const SwPosition* pPos = aNewAnchor.GetCntntAnchor();
-        SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-        OSL_ENSURE( pTxtNd, "no Text Node at position." );
-        SwFmtFlyCnt aFmt( pFrmFmt );
-        pTxtNd->InsertItem( aFmt, pPos->nContent.GetIndex(), 0 );
+        const SwPosition* pPos = aNewAnchor.GetContentAnchor();
+        SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+        OSL_ENSURE( pTextNd, "no Text Node at position." );
+        SwFormatFlyCnt aFormat( pFrameFormat );
+        pTextNd->InsertItem( aFormat, pPos->nContent.GetIndex(), 0 );
     }
 
-    if( RES_DRAWFRMFMT != pFrmFmt->Which() )
-        pFrmFmt->MakeFrms();
+    if( RES_DRAWFRMFMT != pFrameFormat->Which() )
+        pFrameFormat->MakeFrms();
 
-    rContext.SetSelections(pFrmFmt, 0);
+    rContext.SetSelections(pFrameFormat, 0);
 
     // #i35443# - anchor attribute restored.
     return true;
 }
 
-SwUndoFmtResetAttr::SwUndoFmtResetAttr( SwFmt& rChangedFormat,
+SwUndoFormatResetAttr::SwUndoFormatResetAttr( SwFormat& rChangedFormat,
                                         const sal_uInt16 nWhichId )
     : SwUndo( UNDO_RESETATTR )
     , m_pChangedFormat( &rChangedFormat )
@@ -529,38 +529,38 @@ SwUndoFmtResetAttr::SwUndoFmtResetAttr( SwFmt& rChangedFormat,
     }
 }
 
-SwUndoFmtResetAttr::~SwUndoFmtResetAttr()
+SwUndoFormatResetAttr::~SwUndoFormatResetAttr()
 {
 }
 
-void SwUndoFmtResetAttr::UndoImpl(::sw::UndoRedoContext &)
+void SwUndoFormatResetAttr::UndoImpl(::sw::UndoRedoContext &)
 {
     if ( m_pOldItem.get() ) {
-        m_pChangedFormat->SetFmtAttr( *m_pOldItem );
+        m_pChangedFormat->SetFormatAttr( *m_pOldItem );
     }
 }
 
-void SwUndoFmtResetAttr::RedoImpl(::sw::UndoRedoContext &)
+void SwUndoFormatResetAttr::RedoImpl(::sw::UndoRedoContext &)
 {
     if ( m_pOldItem.get() ) {
-        m_pChangedFormat->ResetFmtAttr( m_nWhichId );
+        m_pChangedFormat->ResetFormatAttr( m_nWhichId );
     }
 }
 
-SwUndoResetAttr::SwUndoResetAttr( const SwPaM& rRange, sal_uInt16 nFmtId )
+SwUndoResetAttr::SwUndoResetAttr( const SwPaM& rRange, sal_uInt16 nFormatId )
     : SwUndo( UNDO_RESETATTR ), SwUndRng( rRange )
     , m_pHistory( new SwHistory )
-    , m_nFormatId( nFmtId )
+    , m_nFormatId( nFormatId )
 {
 }
 
-SwUndoResetAttr::SwUndoResetAttr( const SwPosition& rPos, sal_uInt16 nFmtId )
+SwUndoResetAttr::SwUndoResetAttr( const SwPosition& rPos, sal_uInt16 nFormatId )
     : SwUndo( UNDO_RESETATTR )
     , m_pHistory( new SwHistory )
-    , m_nFormatId( nFmtId )
+    , m_nFormatId( nFormatId )
 {
     nSttNode = nEndNode = rPos.nNode.GetIndex();
-    nSttCntnt = nEndCntnt = rPos.nContent.GetIndex();
+    nSttContent = nEndContent = rPos.nContent.GetIndex();
 }
 
 SwUndoResetAttr::~SwUndoResetAttr()
@@ -575,11 +575,11 @@ void SwUndoResetAttr::UndoImpl(::sw::UndoRedoContext & rContext)
     m_pHistory->SetTmpEnd( m_pHistory->Count() );
 
     if ((RES_CONDTXTFMTCOLL == m_nFormatId) &&
-        (nSttNode == nEndNode) && (nSttCntnt == nEndCntnt)) {
-        SwTxtNode* pTNd = rDoc.GetNodes()[ nSttNode ]->GetTxtNode();
+        (nSttNode == nEndNode) && (nSttContent == nEndContent)) {
+        SwTextNode* pTNd = rDoc.GetNodes()[ nSttNode ]->GetTextNode();
         if( pTNd ) {
-            SwIndex aIdx( pTNd, nSttCntnt );
-            pTNd->DontExpandFmt( aIdx, false );
+            SwIndex aIdx( pTNd, nSttContent );
+            pTNd->DontExpandFormat( aIdx, false );
         }
     }
 
@@ -593,7 +593,7 @@ void SwUndoResetAttr::RedoImpl(::sw::UndoRedoContext & rContext)
 
     switch ( m_nFormatId ) {
     case RES_CHRFMT:
-        rDoc.RstTxtAttrs(rPam);
+        rDoc.RstTextAttrs(rPam);
         break;
     case RES_TXTFMTCOLL:
         rDoc.ResetAttrs(rPam, false, m_Ids );
@@ -607,8 +607,8 @@ void SwUndoResetAttr::RedoImpl(::sw::UndoRedoContext & rContext)
     {
         SwTOXMarks aArr;
         SwNodeIndex aIdx( rDoc.GetNodes(), nSttNode );
-        SwPosition aPos( aIdx, SwIndex( aIdx.GetNode().GetCntntNode(),
-                                        nSttCntnt ));
+        SwPosition aPos( aIdx, SwIndex( aIdx.GetNode().GetContentNode(),
+                                        nSttContent ));
 
         sal_uInt16 nCnt = SwDoc::GetCurTOXMark( aPos, aArr );
         if( nCnt ) {
@@ -644,7 +644,7 @@ void SwUndoResetAttr::RepeatImpl(::sw::RepeatContext & rContext)
 
     switch ( m_nFormatId ) {
     case RES_CHRFMT:
-        rContext.GetDoc().RstTxtAttrs(rContext.GetRepeatPaM());
+        rContext.GetDoc().RstTextAttrs(rContext.GetRepeatPaM());
         break;
     case RES_TXTFMTCOLL:
         rContext.GetDoc().ResetAttrs(rContext.GetRepeatPaM(), false, m_Ids);
@@ -686,23 +686,23 @@ SwUndoAttr::~SwUndoAttr()
 {
 }
 
-void SwUndoAttr::SaveRedlineData( const SwPaM& rPam, bool bIsCntnt )
+void SwUndoAttr::SaveRedlineData( const SwPaM& rPam, bool bIsContent )
 {
     SwDoc* pDoc = rPam.GetDoc();
     if ( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ) {
-        m_pRedlineData.reset( new SwRedlineData( bIsCntnt
+        m_pRedlineData.reset( new SwRedlineData( bIsContent
                               ? nsRedlineType_t::REDLINE_INSERT
                               : nsRedlineType_t::REDLINE_FORMAT,
                               pDoc->getIDocumentRedlineAccess().GetRedlineAuthor() ) );
     }
 
     m_pRedlineSaveData.reset( new SwRedlineSaveDatas );
-    if ( !FillSaveDataForFmt( rPam, *m_pRedlineSaveData )) {
+    if ( !FillSaveDataForFormat( rPam, *m_pRedlineSaveData )) {
         m_pRedlineSaveData.reset(0);
     }
 
     SetRedlineMode( pDoc->getIDocumentRedlineAccess().GetRedlineMode() );
-    if ( bIsCntnt ) {
+    if ( bIsContent ) {
         m_nNodeIndex = rPam.GetPoint()->nNode.GetIndex();
     }
 }
@@ -718,7 +718,7 @@ void SwUndoAttr::UndoImpl(::sw::UndoRedoContext & rContext)
         if ( ULONG_MAX != m_nNodeIndex ) {
             aPam.DeleteMark();
             aPam.GetPoint()->nNode = m_nNodeIndex;
-            aPam.GetPoint()->nContent.Assign( aPam.GetCntntNode(), nSttCntnt );
+            aPam.GetPoint()->nContent.Assign( aPam.GetContentNode(), nSttContent );
             aPam.SetMark();
             ++aPam.GetPoint()->nContent;
             pDoc->getIDocumentRedlineAccess().DeleteRedline(aPam, false, USHRT_MAX);
@@ -794,25 +794,25 @@ void SwUndoAttr::RemoveIdx( SwDoc& rDoc )
 
     SwNodes& rNds = rDoc.GetNodes();
     for ( sal_uInt16 n = 0; n < m_pHistory->Count(); ++n ) {
-        sal_Int32 nCntnt = 0;
+        sal_Int32 nContent = 0;
         sal_uLong nNode = 0;
-        SwHistoryHint* pHstHnt = (*m_pHistory)[ n ];
-        switch ( pHstHnt->Which() ) {
+        SwHistoryHint* pHstHint = (*m_pHistory)[ n ];
+        switch ( pHstHint->Which() ) {
         case HSTRY_RESETTXTHNT: {
-            SwHistoryResetTxt * pHistoryHint
-                = static_cast<SwHistoryResetTxt*>(pHstHnt);
+            SwHistoryResetText * pHistoryHint
+                = static_cast<SwHistoryResetText*>(pHstHint);
             if ( RES_TXTATR_FTN == pHistoryHint->GetWhich() ) {
                 nNode = pHistoryHint->GetNode();
-                nCntnt = pHistoryHint->GetCntnt();
+                nContent = pHistoryHint->GetContent();
             }
         }
         break;
 
         case HSTRY_RESETATTRSET: {
             SwHistoryResetAttrSet * pHistoryHint
-                = static_cast<SwHistoryResetAttrSet*>(pHstHnt);
-            nCntnt = pHistoryHint->GetCntnt();
-            if ( COMPLETE_STRING != nCntnt ) {
+                = static_cast<SwHistoryResetAttrSet*>(pHstHint);
+            nContent = pHistoryHint->GetContent();
+            if ( COMPLETE_STRING != nContent ) {
                 const std::vector<sal_uInt16>& rArr = pHistoryHint->GetArr();
                 for ( size_t i = rArr.size(); i; ) {
                     if ( RES_TXTATR_FTN == rArr[ --i ] ) {
@@ -829,14 +829,14 @@ void SwUndoAttr::RemoveIdx( SwDoc& rDoc )
         }
 
         if( nNode ) {
-            SwTxtNode* pTxtNd = rNds[ nNode ]->GetTxtNode();
-            if( pTxtNd ) {
-                SwTxtAttr *const pTxtHt =
-                    pTxtNd->GetTxtAttrForCharAt(nCntnt, RES_TXTATR_FTN);
-                if( pTxtHt ) {
+            SwTextNode* pTextNd = rNds[ nNode ]->GetTextNode();
+            if( pTextNd ) {
+                SwTextAttr *const pTextHt =
+                    pTextNd->GetTextAttrForCharAt(nContent, RES_TXTATR_FTN);
+                if( pTextHt ) {
                     // ok, so get values
-                    SwTxtFtn* pFtn = static_cast<SwTxtFtn*>(pTxtHt);
-                    RemoveIdxFromSection( rDoc, pFtn->GetStartNode()->GetIndex() );
+                    SwTextFootnote* pFootnote = static_cast<SwTextFootnote*>(pTextHt);
+                    RemoveIdxFromSection( rDoc, pFootnote->GetStartNode()->GetIndex() );
                     return ;
                 }
             }
@@ -867,8 +867,8 @@ void SwUndoDefaultAttr::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
     if ( m_pOldSet.get() ) {
-        SwUndoFmtAttrHelper aTmp(
-            *const_cast<SwTxtFmtColl*>(rDoc.GetDfltTxtFmtColl()) );
+        SwUndoFormatAttrHelper aTmp(
+            *const_cast<SwTextFormatColl*>(rDoc.GetDfltTextFormatColl()) );
         rDoc.SetDefault( *m_pOldSet );
         m_pOldSet.reset( 0 );
         if ( aTmp.GetUndo() ) {
@@ -930,11 +930,11 @@ void SwUndoMoveLeftMargin::RepeatImpl(::sw::RepeatContext & rContext)
 }
 
 SwUndoChangeFootNote::SwUndoChangeFootNote(
-    const SwPaM& rRange, const OUString& rTxt,
+    const SwPaM& rRange, const OUString& rText,
     sal_uInt16 nNum, bool bIsEndNote )
     : SwUndo( UNDO_CHGFTN ), SwUndRng( rRange )
     , m_pHistory( new SwHistory() )
-    , m_Text( rTxt )
+    , m_Text( rText )
     , m_nNumber( nNum )
     , m_bEndNote( bIsEndNote )
 {
@@ -951,7 +951,7 @@ void SwUndoChangeFootNote::UndoImpl(::sw::UndoRedoContext & rContext)
     m_pHistory->TmpRollback( &rDoc, 0 );
     m_pHistory->SetTmpEnd( m_pHistory->Count() );
 
-    rDoc.GetFtnIdxs().UpdateAllFtn();
+    rDoc.GetFootnoteIdxs().UpdateAllFootnote();
 
     AddUndoRedoPaM(rContext);
 }
@@ -960,19 +960,19 @@ void SwUndoChangeFootNote::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc( rContext.GetDoc() );
     SwPaM & rPaM = AddUndoRedoPaM(rContext);
-    rDoc.SetCurFtn(rPaM, m_Text, m_nNumber, m_bEndNote);
+    rDoc.SetCurFootnote(rPaM, m_Text, m_nNumber, m_bEndNote);
     SetPaM(rPaM);
 }
 
 void SwUndoChangeFootNote::RepeatImpl(::sw::RepeatContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    rDoc.SetCurFtn( rContext.GetRepeatPaM(), m_Text, m_nNumber, m_bEndNote );
+    rDoc.SetCurFootnote( rContext.GetRepeatPaM(), m_Text, m_nNumber, m_bEndNote );
 }
 
-SwUndoFootNoteInfo::SwUndoFootNoteInfo( const SwFtnInfo &rInfo )
+SwUndoFootNoteInfo::SwUndoFootNoteInfo( const SwFootnoteInfo &rInfo )
     : SwUndo( UNDO_FTNINFO )
-    , m_pFootNoteInfo( new SwFtnInfo( rInfo ) )
+    , m_pFootNoteInfo( new SwFootnoteInfo( rInfo ) )
 {
 }
 
@@ -983,16 +983,16 @@ SwUndoFootNoteInfo::~SwUndoFootNoteInfo()
 void SwUndoFootNoteInfo::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    SwFtnInfo *pInf = new SwFtnInfo( rDoc.GetFtnInfo() );
-    rDoc.SetFtnInfo( *m_pFootNoteInfo );
+    SwFootnoteInfo *pInf = new SwFootnoteInfo( rDoc.GetFootnoteInfo() );
+    rDoc.SetFootnoteInfo( *m_pFootNoteInfo );
     m_pFootNoteInfo.reset( pInf );
 }
 
 void SwUndoFootNoteInfo::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    SwFtnInfo *pInf = new SwFtnInfo( rDoc.GetFtnInfo() );
-    rDoc.SetFtnInfo( *m_pFootNoteInfo );
+    SwFootnoteInfo *pInf = new SwFootnoteInfo( rDoc.GetFootnoteInfo() );
+    rDoc.SetFootnoteInfo( *m_pFootNoteInfo );
     m_pFootNoteInfo.reset( pInf );
 }
 
@@ -1022,40 +1022,40 @@ void SwUndoEndNoteInfo::RedoImpl(::sw::UndoRedoContext & rContext)
     m_pEndNoteInfo.reset( pInf );
 }
 
-SwUndoDontExpandFmt::SwUndoDontExpandFmt( const SwPosition& rPos )
+SwUndoDontExpandFormat::SwUndoDontExpandFormat( const SwPosition& rPos )
     : SwUndo( UNDO_DONTEXPAND )
     , m_nNodeIndex( rPos.nNode.GetIndex() )
     , m_nContentIndex( rPos.nContent.GetIndex() )
 {
 }
 
-void SwUndoDontExpandFmt::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoDontExpandFormat::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
     SwDoc *const pDoc = & rContext.GetDoc();
 
     SwPosition& rPos = *pPam->GetPoint();
     rPos.nNode = m_nNodeIndex;
-    rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(), m_nContentIndex);
-    pDoc->DontExpandFmt( rPos, false );
+    rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(), m_nContentIndex);
+    pDoc->DontExpandFormat( rPos, false );
 }
 
-void SwUndoDontExpandFmt::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoDontExpandFormat::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
     SwDoc *const pDoc = & rContext.GetDoc();
 
     SwPosition& rPos = *pPam->GetPoint();
     rPos.nNode = m_nNodeIndex;
-    rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(), m_nContentIndex);
-    pDoc->DontExpandFmt( rPos );
+    rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(), m_nContentIndex);
+    pDoc->DontExpandFormat( rPos );
 }
 
-void SwUndoDontExpandFmt::RepeatImpl(::sw::RepeatContext & rContext)
+void SwUndoDontExpandFormat::RepeatImpl(::sw::RepeatContext & rContext)
 {
     SwPaM & rPam = rContext.GetRepeatPaM();
     SwDoc & rDoc = rContext.GetDoc();
-    rDoc.DontExpandFmt( *rPam.GetPoint() );
+    rDoc.DontExpandFormat( *rPam.GetPoint() );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index e03897beeb13..c2871f964e72 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -50,19 +50,19 @@
     ( == AUTO ), if the anchor frame has be moved via _MoveNodes(..) and
     DelFrms(..)
 */
-static void lcl_MakeAutoFrms( const SwFrmFmts& rSpzArr, sal_uLong nMovedIndex )
+static void lcl_MakeAutoFrms( const SwFrameFormats& rSpzArr, sal_uLong nMovedIndex )
 {
     if( !rSpzArr.empty() )
     {
         for( size_t n = 0; n < rSpzArr.size(); ++n )
         {
-            SwFrmFmt * pFmt = rSpzArr[n];
-            const SwFmtAnchor* pAnchor = &pFmt->GetAnchor();
+            SwFrameFormat * pFormat = rSpzArr[n];
+            const SwFormatAnchor* pAnchor = &pFormat->GetAnchor();
             if (pAnchor->GetAnchorId() == FLY_AT_CHAR)
             {
-                const SwPosition* pAPos = pAnchor->GetCntntAnchor();
+                const SwPosition* pAPos = pAnchor->GetContentAnchor();
                 if( pAPos && nMovedIndex == pAPos->nNode.GetIndex() )
-                    pFmt->MakeFrms();
+                    pFormat->MakeFrms();
             }
         }
     }
@@ -96,7 +96,7 @@ static void lcl_MakeAutoFrms( const SwFrmFmts& rSpzArr, sal_uLong nMovedIndex )
 SwUndoDelete::SwUndoDelete(
     SwPaM& rPam,
     bool bFullPara,
-    bool bCalledByTblCpy )
+    bool bCalledByTableCpy )
     : SwUndo(UNDO_DELETE),
     SwUndRng( rPam ),
     pMvStt( 0 ),
@@ -112,19 +112,19 @@ SwUndoDelete::SwUndoDelete(
     bGroup( false ),
     bBackSp( false ),
     bJoinNext( false ),
-    bTblDelLastNd( false ),
+    bTableDelLastNd( false ),
     // bFullPara is set e.g. if an empty paragraph before a table is deleted
     bDelFullPara( bFullPara ),
     bResetPgDesc( false ),
     bResetPgBrk( false ),
-    bFromTableCopy( bCalledByTblCpy )
+    bFromTableCopy( bCalledByTableCpy )
 {
 
     bCacheComment = false;
 
     SwDoc * pDoc = rPam.GetDoc();
 
-    if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         pRedlSaveData = new SwRedlineSaveDatas;
         if( !FillSaveData( rPam, *pRedlSaveData ))
@@ -144,15 +144,15 @@ SwUndoDelete::SwUndoDelete(
     if( bDelFullPara )
     {
         OSL_ENSURE( rPam.HasMark(), "PaM ohne Mark" );
-        DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint(),
-                        DelCntntType(nsDelCntntType::DELCNT_ALL | nsDelCntntType::DELCNT_CHKNOCNTNT) );
+        DelContentIndex( *rPam.GetMark(), *rPam.GetPoint(),
+                        DelContentType(nsDelContentType::DELCNT_ALL | nsDelContentType::DELCNT_CHKNOCNTNT) );
 
         ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
         _DelBookmarks(pStt->nNode, pEnd->nNode);
     }
     else
     {
-        DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint() );
+        DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() );
         ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
         if (nEndNode - nSttNode > 1) // check for fully selected nodes
         {
@@ -169,55 +169,55 @@ SwUndoDelete::SwUndoDelete(
     bJoinNext = !bFullPara && pEnd == rPam.GetPoint();
     bBackSp = !bFullPara && !bJoinNext;
 
-    SwTxtNode *pSttTxtNd = 0, *pEndTxtNd = 0;
+    SwTextNode *pSttTextNd = 0, *pEndTextNd = 0;
     if( !bFullPara )
     {
-        pSttTxtNd = pStt->nNode.GetNode().GetTxtNode();
-        pEndTxtNd = nSttNode == nEndNode
-                    ? pSttTxtNd
-                    : pEnd->nNode.GetNode().GetTxtNode();
+        pSttTextNd = pStt->nNode.GetNode().GetTextNode();
+        pEndTextNd = nSttNode == nEndNode
+                    ? pSttTextNd
+                    : pEnd->nNode.GetNode().GetTextNode();
     }
 
     bool bMoveNds = *pStt != *pEnd      // any area still existent?
-                && ( SaveCntnt( pStt, pEnd, pSttTxtNd, pEndTxtNd ) || bFromTableCopy );
+                && ( SaveContent( pStt, pEnd, pSttTextNd, pEndTextNd ) || bFromTableCopy );
 
-    if( pSttTxtNd && pEndTxtNd && pSttTxtNd != pEndTxtNd )
+    if( pSttTextNd && pEndTextNd && pSttTextNd != pEndTextNd )
     {
         // two different TextNodes, thus save also the TextFormatCollection
-        pHistory->Add( pSttTxtNd->GetTxtColl(),pStt->nNode.GetIndex(), ND_TEXTNODE );
-        pHistory->Add( pEndTxtNd->GetTxtColl(),pEnd->nNode.GetIndex(), ND_TEXTNODE );
+        pHistory->Add( pSttTextNd->GetTextColl(),pStt->nNode.GetIndex(), ND_TEXTNODE );
+        pHistory->Add( pEndTextNd->GetTextColl(),pEnd->nNode.GetIndex(), ND_TEXTNODE );
 
         if( !bJoinNext )        // Selection from bottom to top
         {
             // When using JoinPrev() all AUTO-PageBreak's will be copied
             // correctly. To restore them with UNDO, Auto-PageBreak of the
             // EndNode needs to be reset. Same for PageDesc and ColBreak.
-            if( pEndTxtNd->HasSwAttrSet() )
+            if( pEndTextNd->HasSwAttrSet() )
             {
-                SwRegHistory aRegHist( *pEndTxtNd, pHistory );
-                if( SfxItemState::SET == pEndTxtNd->GetpSwAttrSet()->GetItemState(
+                SwRegHistory aRegHist( *pEndTextNd, pHistory );
+                if( SfxItemState::SET == pEndTextNd->GetpSwAttrSet()->GetItemState(
                         RES_BREAK, false ) )
-                    pEndTxtNd->ResetAttr( RES_BREAK );
-                if( pEndTxtNd->HasSwAttrSet() &&
-                    SfxItemState::SET == pEndTxtNd->GetpSwAttrSet()->GetItemState(
+                    pEndTextNd->ResetAttr( RES_BREAK );
+                if( pEndTextNd->HasSwAttrSet() &&
+                    SfxItemState::SET == pEndTextNd->GetpSwAttrSet()->GetItemState(
                         RES_PAGEDESC, false ) )
-                    pEndTxtNd->ResetAttr( RES_PAGEDESC );
+                    pEndTextNd->ResetAttr( RES_PAGEDESC );
             }
         }
     }
 
     // Move now also the PaM. The SPoint is at the beginning of a SSelection.
-    if( pEnd == rPam.GetPoint() && ( !bFullPara || pSttTxtNd || pEndTxtNd ) )
+    if( pEnd == rPam.GetPoint() && ( !bFullPara || pSttTextNd || pEndTextNd ) )
         rPam.Exchange();
 
-    if( !pSttTxtNd && !pEndTxtNd )
+    if( !pSttTextNd && !pEndTextNd )
         --rPam.GetPoint()->nNode;
     rPam.DeleteMark();          // the SPoint is in the selection
 
-    if( !pEndTxtNd )
-        nEndCntnt = 0;
-    if( !pSttTxtNd )
-        nSttCntnt = 0;
+    if( !pEndTextNd )
+        nEndContent = 0;
+    if( !pSttTextNd )
+        nSttContent = 0;
 
     if( bMoveNds )      // Do Nodes exist that need to be moved?
     {
@@ -225,7 +225,7 @@ SwUndoDelete::SwUndoDelete(
         SwNodes& rDocNds = pDoc->GetNodes();
         SwNodeRange aRg( rDocNds, nSttNode - nNdDiff,
                          rDocNds, nEndNode - nNdDiff );
-        if( !bFullPara && !pEndTxtNd &&
+        if( !bFullPara && !pEndTextNd &&
             &aRg.aEnd.GetNode() != &pDoc->GetNodes().GetEndOfContent() )
         {
             SwNode* pNode = aRg.aEnd.GetNode().StartOfSectionNode();
@@ -247,14 +247,14 @@ SwUndoDelete::SwUndoDelete(
             if( nReplaceDummy )
             {   // The selection has been expanded, because
                 ++aRg.aEnd;
-                if( pEndTxtNd )
+                if( pEndTextNd )
                 {
                     // The end text node has to leave the (expanded) selection
                     // The dummy is needed because _MoveNodes deletes empty
                     // sections
                     ++nReplaceDummy;
-                    SwNodeRange aMvRg( *pEndTxtNd, 0, *pEndTxtNd, 1 );
-                    SwPosition aSplitPos( *pEndTxtNd );
+                    SwNodeRange aMvRg( *pEndTextNd, 0, *pEndTextNd, 1 );
+                    SwPosition aSplitPos( *pEndTextNd );
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                     pDoc->getIDocumentContentOperations().SplitNode( aSplitPos, false );
                     rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd, true );
@@ -272,13 +272,13 @@ SwUndoDelete::SwUndoDelete(
                 ( (pTmpNd = rDocNds[ aRg.aStart.GetIndex()-1 ])->IsSectionNode() &&
                 pTmpNd->EndOfSectionIndex() < aRg.aEnd.GetIndex() ) )
                 --aRg.aStart;
-            if( pSttTxtNd )
+            if( pSttTextNd )
             {
                 nReplaceDummy = nSttNode - nNdDiff - aRg.aStart.GetIndex();
                 if( nReplaceDummy )
                 {
-                    SwNodeRange aMvRg( *pSttTxtNd, 0, *pSttTxtNd, 1 );
-                    SwPosition aSplitPos( *pSttTxtNd );
+                    SwNodeRange aMvRg( *pSttTextNd, 0, *pSttTextNd, 1 );
+                    SwPosition aSplitPos( *pSttTextNd );
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                     pDoc->getIDocumentContentOperations().SplitNode( aSplitPos, false );
                     rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart, true );
@@ -289,15 +289,15 @@ SwUndoDelete::SwUndoDelete(
 
         if( bFromTableCopy )
         {
-            if( !pEndTxtNd )
+            if( !pEndTextNd )
             {
-                if( pSttTxtNd )
+                if( pSttTextNd )
                     ++aRg.aStart;
-                else if( !bFullPara && !aRg.aEnd.GetNode().IsCntntNode() )
+                else if( !bFullPara && !aRg.aEnd.GetNode().IsContentNode() )
                     --aRg.aEnd;
             }
         }
-        else if (pSttTxtNd && (pEndTxtNd || pSttTxtNd->GetTxt().getLength()))
+        else if (pSttTextNd && (pEndTextNd || pSttTextNd->GetText().getLength()))
             ++aRg.aStart;
 
         // Step 3: Moving into UndoArray...
@@ -307,7 +307,7 @@ SwUndoDelete::SwUndoDelete(
         // remember difference!
         nNode = rNds.GetEndOfContent().GetIndex() - nNode;
 
-        if( pSttTxtNd && pEndTxtNd )
+        if( pSttTextNd && pEndTextNd )
         {
             //Step 4: Moving around sections
             nSectDiff = aRg.aEnd.GetIndex() - aRg.aStart.GetIndex();
@@ -318,26 +318,26 @@ SwUndoDelete::SwUndoDelete(
             {
                 if( bJoinNext )
                 {
-                    SwNodeRange aMvRg( *pEndTxtNd, 0, *pEndTxtNd, 1 );
+                    SwNodeRange aMvRg( *pEndTextNd, 0, *pEndTextNd, 1 );
                     rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart, true );
                 }
                 else
                 {
-                    SwNodeRange aMvRg( *pSttTxtNd, 0, *pSttTxtNd, 1 );
+                    SwNodeRange aMvRg( *pSttTextNd, 0, *pSttTextNd, 1 );
                     rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd, true );
                 }
             }
         }
         if( nSectDiff || nReplaceDummy )
-            lcl_MakeAutoFrms( *pDoc->GetSpzFrmFmts(),
-                bJoinNext ? pEndTxtNd->GetIndex() : pSttTxtNd->GetIndex() );
+            lcl_MakeAutoFrms( *pDoc->GetSpzFrameFormats(),
+                bJoinNext ? pEndTextNd->GetIndex() : pSttTextNd->GetIndex() );
     }
     else
         nNode = 0;      // moved no node -> no difference at the end
 
     // Are there any Nodes that got deleted before that (FootNotes
     // have ContentNodes)?
-    if( !pSttTxtNd && !pEndTxtNd )
+    if( !pSttTextNd && !pEndTextNd )
     {
         nNdDiff = nSttNode - rPam.GetPoint()->nNode.GetIndex() - (bFullPara ? 0 : 1);
         rPam.Move( fnMoveForward, fnGoNode );
@@ -350,7 +350,7 @@ SwUndoDelete::SwUndoDelete(
         nNdDiff -= rPam.GetPoint()->nNode.GetIndex();
     }
 
-    if( !rPam.GetNode().IsCntntNode() )
+    if( !rPam.GetNode().IsContentNode() )
         rPam.GetPoint()->nContent.Assign( 0, 0 );
 
     // is a history necessary here at all?
@@ -358,42 +358,42 @@ SwUndoDelete::SwUndoDelete(
         DELETEZ( pHistory );
 }
 
-bool SwUndoDelete::SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
-                    SwTxtNode* pSttTxtNd, SwTxtNode* pEndTxtNd )
+bool SwUndoDelete::SaveContent( const SwPosition* pStt, const SwPosition* pEnd,
+                    SwTextNode* pSttTextNd, SwTextNode* pEndTextNd )
 {
     sal_uLong nNdIdx = pStt->nNode.GetIndex();
     // 1 - copy start in Start-String
-    if( pSttTxtNd )
+    if( pSttTextNd )
     {
         bool bOneNode = nSttNode == nEndNode;
-        SwRegHistory aRHst( *pSttTxtNd, pHistory );
+        SwRegHistory aRHst( *pSttTextNd, pHistory );
         // always save all text atttibutes because of possibly overlapping
         // areas of on/off
-        pHistory->CopyAttr( pSttTxtNd->GetpSwpHints(), nNdIdx,
-                            0, pSttTxtNd->GetTxt().getLength(), true );
-        if( !bOneNode && pSttTxtNd->HasSwAttrSet() )
-                pHistory->CopyFmtAttr( *pSttTxtNd->GetpSwAttrSet(), nNdIdx );
+        pHistory->CopyAttr( pSttTextNd->GetpSwpHints(), nNdIdx,
+                            0, pSttTextNd->GetText().getLength(), true );
+        if( !bOneNode && pSttTextNd->HasSwAttrSet() )
+                pHistory->CopyFormatAttr( *pSttTextNd->GetpSwAttrSet(), nNdIdx );
 
         // the length might have changed (!!Fields!!)
         sal_Int32 nLen = ((bOneNode)
                     ? pEnd->nContent.GetIndex()
-                    : pSttTxtNd->GetTxt().getLength())
+                    : pSttTextNd->GetText().getLength())
             - pStt->nContent.GetIndex();
 
         // delete now also the text (all attribute changes are added to
         // UNDO history)
-        pSttStr = new OUString( pSttTxtNd->GetTxt().copy(nSttCntnt, nLen));
-        pSttTxtNd->EraseText( pStt->nContent, nLen );
-        if( pSttTxtNd->GetpSwpHints() )
-            pSttTxtNd->GetpSwpHints()->DeRegister();
+        pSttStr = new OUString( pSttTextNd->GetText().copy(nSttContent, nLen));
+        pSttTextNd->EraseText( pStt->nContent, nLen );
+        if( pSttTextNd->GetpSwpHints() )
+            pSttTextNd->GetpSwpHints()->DeRegister();
 
         // METADATA: store
-        bool emptied( !pSttStr->isEmpty() && !pSttTxtNd->Len() );
+        bool emptied( !pSttStr->isEmpty() && !pSttTextNd->Len() );
         if (!bOneNode || emptied) // merging may overwrite xmlids...
         {
             m_pMetadataUndoStart = (emptied)
-                ? pSttTxtNd->CreateUndoForDelete()
-                : pSttTxtNd->CreateUndo();
+                ? pSttTextNd->CreateUndoForDelete()
+                : pSttTextNd->CreateUndo();
         }
 
         if( bOneNode )
@@ -401,38 +401,38 @@ bool SwUndoDelete::SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
     }
 
     // 2 - copy end into End-String
-    if( pEndTxtNd )
+    if( pEndTextNd )
     {
-        SwIndex aEndIdx( pEndTxtNd );
+        SwIndex aEndIdx( pEndTextNd );
         nNdIdx = pEnd->nNode.GetIndex();
-        SwRegHistory aRHst( *pEndTxtNd, pHistory );
+        SwRegHistory aRHst( *pEndTextNd, pHistory );
 
         // always save all text atttibutes because of possibly overlapping
         // areas of on/off
-        pHistory->CopyAttr( pEndTxtNd->GetpSwpHints(), nNdIdx, 0,
-                            pEndTxtNd->GetTxt().getLength(), true );
+        pHistory->CopyAttr( pEndTextNd->GetpSwpHints(), nNdIdx, 0,
+                            pEndTextNd->GetText().getLength(), true );
 
-        if( pEndTxtNd->HasSwAttrSet() )
-            pHistory->CopyFmtAttr( *pEndTxtNd->GetpSwAttrSet(), nNdIdx );
+        if( pEndTextNd->HasSwAttrSet() )
+            pHistory->CopyFormatAttr( *pEndTextNd->GetpSwAttrSet(), nNdIdx );
 
         // delete now also the text (all attribute changes are added to
         // UNDO history)
-        pEndStr = new OUString( pEndTxtNd->GetTxt().copy( 0,
+        pEndStr = new OUString( pEndTextNd->GetText().copy( 0,
                                     pEnd->nContent.GetIndex() ));
-        pEndTxtNd->EraseText( aEndIdx, pEnd->nContent.GetIndex() );
-        if( pEndTxtNd->GetpSwpHints() )
-            pEndTxtNd->GetpSwpHints()->DeRegister();
+        pEndTextNd->EraseText( aEndIdx, pEnd->nContent.GetIndex() );
+        if( pEndTextNd->GetpSwpHints() )
+            pEndTextNd->GetpSwpHints()->DeRegister();
 
         // METADATA: store
-        bool emptied = !pEndStr->isEmpty() && !pEndTxtNd->Len();
+        bool emptied = !pEndStr->isEmpty() && !pEndTextNd->Len();
 
         m_pMetadataUndoEnd = (emptied)
-            ? pEndTxtNd->CreateUndoForDelete()
-            : pEndTxtNd->CreateUndo();
+            ? pEndTextNd->CreateUndoForDelete()
+            : pEndTextNd->CreateUndo();
     }
 
     // if there are only two Nodes than we're done
-    if( ( pSttTxtNd || pEndTxtNd ) && nSttNode + 1 == nEndNode )
+    if( ( pSttTextNd || pEndTextNd ) && nSttNode + 1 == nEndNode )
         return false;           // do not move any Node
 
     return true;                // move Nodes lying in between
@@ -445,7 +445,7 @@ bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
         return false;
 
     // only the deletion of single char's can be condensed
-    if( nSttNode != nEndNode || ( !bGroup && nSttCntnt+1 != nEndCntnt ))
+    if( nSttNode != nEndNode || ( !bGroup && nSttContent+1 != nEndContent ))
         return false;
 
     const SwPosition *pStt = rDelPam.Start(),
@@ -460,12 +460,12 @@ bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
 
     // Distinguish between BackSpace and Delete because the Undo array needs to
     // be constructed differently!
-    if( pEnd->nContent == nSttCntnt )
+    if( pEnd->nContent == nSttContent )
     {
         if( bGroup && !bBackSp ) return false;
         bBackSp = true;
     }
-    else if( pStt->nContent == nSttCntnt )
+    else if( pStt->nContent == nSttContent )
     {
         if( bGroup && bBackSp ) return false;
         bBackSp = false;
@@ -474,11 +474,11 @@ bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
         return false;
 
     // are both Nodes (Node/Undo array) TextNodes at all?
-    SwTxtNode * pDelTxtNd = pStt->nNode.GetNode().GetTxtNode();
-    if( !pDelTxtNd ) return false;
+    SwTextNode * pDelTextNd = pStt->nNode.GetNode().GetTextNode();
+    if( !pDelTextNd ) return false;
 
     sal_Int32 nUChrPos = bBackSp ? 0 : pSttStr->getLength()-1;
-    sal_Unicode cDelChar = pDelTxtNd->GetTxt()[ pStt->nContent.GetIndex() ];
+    sal_Unicode cDelChar = pDelTextNd->GetText()[ pStt->nContent.GetIndex() ];
     CharClass& rCC = GetAppCharClass();
     if( ( CH_TXTATR_BREAKWORD == cDelChar || CH_TXTATR_INWORD == cDelChar ) ||
         rCC.isLetterNumeric( OUString( cDelChar ), 0 ) !=
@@ -501,14 +501,14 @@ bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
 
     // Both 'deletes' can be consolidated, so 'move' the related character
     if( bBackSp )
-        nSttCntnt--;    // BackSpace: add char to array!
+        nSttContent--;    // BackSpace: add char to array!
     else
     {
-        nEndCntnt++;    // Delete: attach char at the end
+        nEndContent++;    // Delete: attach char at the end
         nUChrPos++;
     }
     (*pSttStr) = pSttStr->replaceAt( nUChrPos, 0, OUString(cDelChar) );
-    pDelTxtNd->EraseText( pStt->nContent, 1 );
+    pDelTextNd->EraseText( pStt->nContent, 1 );
 
     bGroup = true;
     return true;
@@ -717,26 +717,26 @@ SwRewriter SwUndoDelete::GetRewriter() const
     return aResult;
 }
 
-// Every object, anchored "AtCntnt" will be reanchored at rPos
-static void lcl_ReAnchorAtCntntFlyFrames( const SwFrmFmts& rSpzArr, SwPosition &rPos, sal_uLong nOldIdx )
+// Every object, anchored "AtContent" will be reanchored at rPos
+static void lcl_ReAnchorAtContentFlyFrames( const SwFrameFormats& rSpzArr, SwPosition &rPos, sal_uLong nOldIdx )
 {
     if( !rSpzArr.empty() )
     {
-        SwFlyFrmFmt* pFmt;
-        const SwFmtAnchor* pAnchor;
+        SwFlyFrameFormat* pFormat;
+        const SwFormatAnchor* pAnchor;
         const SwPosition* pAPos;
         for( size_t n = 0; n < rSpzArr.size(); ++n )
         {
-            pFmt = static_cast<SwFlyFrmFmt*>(rSpzArr[n]);
-            pAnchor = &pFmt->GetAnchor();
+            pFormat = static_cast<SwFlyFrameFormat*>(rSpzArr[n]);
+            pAnchor = &pFormat->GetAnchor();
             if (pAnchor->GetAnchorId() == FLY_AT_PARA)
             {
-                pAPos =  pAnchor->GetCntntAnchor();
+                pAPos =  pAnchor->GetContentAnchor();
                 if( pAPos && nOldIdx == pAPos->nNode.GetIndex() )
                 {
-                    SwFmtAnchor aAnch( *pAnchor );
+                    SwFormatAnchor aAnch( *pAnchor );
                     aAnch.SetAnchor( &rPos );
-                    pFmt->SetFmtAttr( aAnch );
+                    pFormat->SetFormatAttr( aAnch );
                 }
             }
         }
@@ -761,17 +761,17 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
         {
             if( pInsNd->IsTableNode() )
             {
-                pInsNd = pDoc->GetNodes().MakeTxtNode( aIdx,
-                        pDoc->GetDfltTxtFmtColl() );
+                pInsNd = pDoc->GetNodes().MakeTextNode( aIdx,
+                        pDoc->GetDfltTextFormatColl() );
                 --aIdx;
                 aPos.nNode = aIdx;
-                aPos.nContent.Assign( pInsNd->GetCntntNode(), nSttCntnt );
+                aPos.nContent.Assign( pInsNd->GetContentNode(), nSttContent );
             }
             else
             {
-                if( pInsNd->IsCntntNode() )
-                    aPos.nContent.Assign( static_cast<SwCntntNode*>(pInsNd), nSttCntnt );
-                if( !bTblDelLastNd )
+                if( pInsNd->IsContentNode() )
+                    aPos.nContent.Assign( static_cast<SwContentNode*>(pInsNd), nSttContent );
+                if( !bTableDelLastNd )
                     pInsNd = 0;         // do not delete Node!
             }
         }
@@ -783,13 +783,13 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
         if( pEndStr )
         {
             // discard attributes since they all saved!
-            SwTxtNode* pTxtNd = aPos.nNode.GetNode().GetTxtNode();
+            SwTextNode* pTextNd = aPos.nNode.GetNode().GetTextNode();
 
-            if( pTxtNd && pTxtNd->HasSwAttrSet() )
-                pTxtNd->ResetAllAttr();
+            if( pTextNd && pTextNd->HasSwAttrSet() )
+                pTextNd->ResetAllAttr();
 
-            if( pTxtNd && pTxtNd->GetpSwpHints() )
-                pTxtNd->ClearSwpHintsArr( true );
+            if( pTextNd && pTextNd->GetpSwpHints() )
+                pTextNd->ClearSwpHintsArr( true );
 
             if( pSttStr && !bFromTableCopy )
             {
@@ -800,30 +800,30 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
                 // on anchoring at the start of the selection
                 // => selection backwards needs a correction.
                 if( bBackSp )
-                    lcl_ReAnchorAtCntntFlyFrames( *pDoc->GetSpzFrmFmts(), aPos, nOldIdx );
-                pTxtNd = aPos.nNode.GetNode().GetTxtNode();
+                    lcl_ReAnchorAtContentFlyFrames( *pDoc->GetSpzFrameFormats(), aPos, nOldIdx );
+                pTextNd = aPos.nNode.GetNode().GetTextNode();
             }
-            if( pTxtNd )
+            if( pTextNd )
             {
-                OUString const ins( pTxtNd->InsertText(*pEndStr, aPos.nContent,
+                OUString const ins( pTextNd->InsertText(*pEndStr, aPos.nContent,
                         SwInsertFlags::NOHINTEXPAND) );
                 assert(ins.getLength() == pEndStr->getLength()); // must succeed
                 (void) ins;
                 // METADATA: restore
-                pTxtNd->RestoreMetadata(m_pMetadataUndoEnd);
+                pTextNd->RestoreMetadata(m_pMetadataUndoEnd);
             }
         }
         else if( pSttStr && bNodeMove )
         {
-            SwTxtNode * pNd = aPos.nNode.GetNode().GetTxtNode();
+            SwTextNode * pNd = aPos.nNode.GetNode().GetTextNode();
             if( pNd )
             {
-                if (nSttCntnt < pNd->GetTxt().getLength())
+                if (nSttContent < pNd->GetText().getLength())
                 {
                     sal_uLong nOldIdx = aPos.nNode.GetIndex();
                     pDoc->getIDocumentContentOperations().SplitNode( aPos, false );
                     if( bBackSp )
-                        lcl_ReAnchorAtCntntFlyFrames( *pDoc->GetSpzFrmFmts(), aPos, nOldIdx );
+                        lcl_ReAnchorAtContentFlyFrames( *pDoc->GetSpzFrameFormats(), aPos, nOldIdx );
                 }
                 else
                     ++aPos.nNode;
@@ -881,31 +881,31 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
         }
 
         if( pMovedNode )
-            lcl_MakeAutoFrms( *pDoc->GetSpzFrmFmts(), pMovedNode->GetIndex() );
+            lcl_MakeAutoFrms( *pDoc->GetSpzFrameFormats(), pMovedNode->GetIndex() );
 
         if( pSttStr )
         {
             aPos.nNode = nSttNode - nNdDiff + ( bJoinNext ? 0 : nReplaceDummy );
-            SwTxtNode * pTxtNd = aPos.nNode.GetNode().GetTxtNode();
+            SwTextNode * pTextNd = aPos.nNode.GetNode().GetTextNode();
             // If more than a single Node got deleted, also all "Node"
             // attributes were saved
-            if (pTxtNd != NULL)
+            if (pTextNd != NULL)
             {
-                if( pTxtNd->HasSwAttrSet() && bNodeMove && !pEndStr )
-                    pTxtNd->ResetAllAttr();
+                if( pTextNd->HasSwAttrSet() && bNodeMove && !pEndStr )
+                    pTextNd->ResetAllAttr();
 
-                if( pTxtNd->GetpSwpHints() )
-                    pTxtNd->ClearSwpHintsArr( true );
+                if( pTextNd->GetpSwpHints() )
+                    pTextNd->ClearSwpHintsArr( true );
 
                 // SectionNode mode and selection from top to bottom:
                 //  -> in StartNode is still the rest of the Join => delete
-                aPos.nContent.Assign( pTxtNd, nSttCntnt );
-                OUString const ins( pTxtNd->InsertText(*pSttStr, aPos.nContent,
+                aPos.nContent.Assign( pTextNd, nSttContent );
+                OUString const ins( pTextNd->InsertText(*pSttStr, aPos.nContent,
                         SwInsertFlags::NOHINTEXPAND) );
                 assert(ins.getLength() == pSttStr->getLength()); // must succeed
                 (void) ins;
                 // METADATA: restore
-                pTxtNd->RestoreMetadata(m_pMetadataUndoStart);
+                pTextNd->RestoreMetadata(m_pMetadataUndoStart);
             }
         }
 
@@ -937,10 +937,10 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
             sal_uInt16 nEnd = static_cast<sal_uInt16>( bResetPgBrk ? RES_BREAK : RES_PAGEDESC );
 
             SwNode* pNode = pDoc->GetNodes()[ nEndNode + 1 ];
-            if( pNode->IsCntntNode() )
-                static_cast<SwCntntNode*>(pNode)->ResetAttr( nStt, nEnd );
+            if( pNode->IsContentNode() )
+                static_cast<SwContentNode*>(pNode)->ResetAttr( nStt, nEnd );
             else if( pNode->IsTableNode() )
-                static_cast<SwTableNode*>(pNode)->GetTable().GetFrmFmt()->ResetFmtAttr( nStt, nEnd );
+                static_cast<SwTableNode*>(pNode)->GetTable().GetFrameFormat()->ResetFormatAttr( nStt, nEnd );
         }
     }
     // delete the temporarily added Node
@@ -987,13 +987,13 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext)
         if( bDelFullPara )
         {
             OSL_ENSURE( rPam.HasMark(), "PaM without Mark" );
-            DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint(),
-                            DelCntntType(nsDelCntntType::DELCNT_ALL | nsDelCntntType::DELCNT_CHKNOCNTNT) );
+            DelContentIndex( *rPam.GetMark(), *rPam.GetPoint(),
+                            DelContentType(nsDelContentType::DELCNT_ALL | nsDelContentType::DELCNT_CHKNOCNTNT) );
 
             _DelBookmarks(rPam.GetMark()->nNode, rPam.GetPoint()->nNode);
         }
         else
-            DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint() );
+            DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() );
         nSetPos = pHistory ? pHistory->Count() : 0;
 
         pHistory->Move( nSetPos, &aHstr );
@@ -1003,13 +1003,13 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext)
         if( bDelFullPara )
         {
             OSL_ENSURE( rPam.HasMark(), "PaM without Mark" );
-            DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint(),
-                            DelCntntType(nsDelCntntType::DELCNT_ALL | nsDelCntntType::DELCNT_CHKNOCNTNT) );
+            DelContentIndex( *rPam.GetMark(), *rPam.GetPoint(),
+                            DelContentType(nsDelContentType::DELCNT_ALL | nsDelContentType::DELCNT_CHKNOCNTNT) );
 
             _DelBookmarks( rPam.GetMark()->nNode, rPam.GetPoint()->nNode );
         }
         else
-            DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint() );
+            DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() );
         nSetPos = pHistory ? pHistory->Count() : 0;
     }
 
@@ -1018,33 +1018,33 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext)
         SwNodeIndex aSttIdx = ( bDelFullPara || bJoinNext )
                                     ? rPam.GetMark()->nNode
                                     : rPam.GetPoint()->nNode;
-        SwTableNode* pTblNd = aSttIdx.GetNode().GetTableNode();
-        if( pTblNd )
+        SwTableNode* pTableNd = aSttIdx.GetNode().GetTableNode();
+        if( pTableNd )
         {
-            if( bTblDelLastNd )
+            if( bTableDelLastNd )
             {
                 // than add again a Node at the end
-                const SwNodeIndex aTmpIdx( *pTblNd->EndOfSectionNode(), 1 );
-                rDoc.GetNodes().MakeTxtNode( aTmpIdx,
-                        rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
+                const SwNodeIndex aTmpIdx( *pTableNd->EndOfSectionNode(), 1 );
+                rDoc.GetNodes().MakeTextNode( aTmpIdx,
+                        rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ) );
             }
 
-            SwCntntNode* pNextNd = rDoc.GetNodes()[
-                    pTblNd->EndOfSectionIndex()+1 ]->GetCntntNode();
+            SwContentNode* pNextNd = rDoc.GetNodes()[
+                    pTableNd->EndOfSectionIndex()+1 ]->GetContentNode();
             if( pNextNd )
             {
-                SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
+                SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
 
                 const SfxPoolItem *pItem;
-                if( SfxItemState::SET == pTableFmt->GetItemState( RES_PAGEDESC,
+                if( SfxItemState::SET == pTableFormat->GetItemState( RES_PAGEDESC,
                     false, &pItem ) )
                     pNextNd->SetAttr( *pItem );
 
-                if( SfxItemState::SET == pTableFmt->GetItemState( RES_BREAK,
+                if( SfxItemState::SET == pTableFormat->GetItemState( RES_BREAK,
                     false, &pItem ) )
                     pNextNd->SetAttr( *pItem );
             }
-            pTblNd->DelFrms();
+            pTableNd->DelFrms();
         }
 
         // avoid asserts from ~SwIndexReg for deleted nodes
@@ -1088,7 +1088,7 @@ void SwUndoDelete::RepeatImpl(::sw::RepeatContext & rContext)
     if( !rPam.HasMark() )
     {
         rPam.SetMark();
-        rPam.Move( fnMoveForward, fnGoCntnt );
+        rPam.Move( fnMoveForward, fnGoContent );
     }
     if( bDelFullPara )
         rDoc.getIDocumentContentOperations().DelFullPara( rPam );
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 36d70c64f1d9..1285d1b8d8a3 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -43,7 +43,7 @@
 
 // This class saves the Pam as integers and can recompose those into a PaM
 SwUndRng::SwUndRng()
-    : nSttNode( 0 ), nEndNode( 0 ), nSttCntnt( 0 ), nEndCntnt( 0 )
+    : nSttNode( 0 ), nEndNode( 0 ), nSttContent( 0 ), nEndContent( 0 )
 {
 }
 
@@ -61,49 +61,49 @@ void SwUndRng::SetValues( const SwPaM& rPam )
                         ? rPam.GetMark()
                         : rPam.GetPoint();
         nEndNode = pEnd->nNode.GetIndex();
-        nEndCntnt = pEnd->nContent.GetIndex();
+        nEndContent = pEnd->nContent.GetIndex();
     }
     else
         // no selection !!
-        nEndNode = 0, nEndCntnt = COMPLETE_STRING;
+        nEndNode = 0, nEndContent = COMPLETE_STRING;
 
     nSttNode = pStt->nNode.GetIndex();
-    nSttCntnt = pStt->nContent.GetIndex();
+    nSttContent = pStt->nContent.GetIndex();
 }
 
-void SwUndRng::SetPaM( SwPaM & rPam, bool bCorrToCntnt ) const
+void SwUndRng::SetPaM( SwPaM & rPam, bool bCorrToContent ) const
 {
     rPam.DeleteMark();
     rPam.GetPoint()->nNode = nSttNode;
     SwNode& rNd = rPam.GetNode();
-    if( rNd.IsCntntNode() )
-        rPam.GetPoint()->nContent.Assign( rNd.GetCntntNode(), nSttCntnt );
-    else if( bCorrToCntnt )
-        rPam.Move( fnMoveForward, fnGoCntnt );
+    if( rNd.IsContentNode() )
+        rPam.GetPoint()->nContent.Assign( rNd.GetContentNode(), nSttContent );
+    else if( bCorrToContent )
+        rPam.Move( fnMoveForward, fnGoContent );
     else
         rPam.GetPoint()->nContent.Assign( 0, 0 );
 
-    if( !nEndNode && COMPLETE_STRING == nEndCntnt )       // no selection
+    if( !nEndNode && COMPLETE_STRING == nEndContent )       // no selection
         return ;
 
     rPam.SetMark();
-    if( nSttNode == nEndNode && nSttCntnt == nEndCntnt )
+    if( nSttNode == nEndNode && nSttContent == nEndContent )
         return;                             // nothing left to do
 
     rPam.GetPoint()->nNode = nEndNode;
-    if( rPam.GetNode().IsCntntNode() )
-        rPam.GetPoint()->nContent.Assign( rPam.GetNode().GetCntntNode(), nEndCntnt );
-    else if( bCorrToCntnt )
-        rPam.Move( fnMoveBackward, fnGoCntnt );
+    if( rPam.GetNode().IsContentNode() )
+        rPam.GetPoint()->nContent.Assign( rPam.GetNode().GetContentNode(), nEndContent );
+    else if( bCorrToContent )
+        rPam.Move( fnMoveBackward, fnGoContent );
     else
         rPam.GetPoint()->nContent.Assign( 0, 0 );
 }
 
 SwPaM & SwUndRng::AddUndoRedoPaM(
-        ::sw::UndoRedoContext & rContext, bool const bCorrToCntnt) const
+        ::sw::UndoRedoContext & rContext, bool const bCorrToContent) const
 {
     SwPaM & rPaM( rContext.GetCursorSupplier().CreateNewShellCursor() );
-    SetPaM( rPaM, bCorrToCntnt );
+    SetPaM( rPaM, bCorrToContent );
     return rPaM;
 }
 
@@ -284,11 +284,11 @@ SwRewriter SwUndo::GetRewriter() const
     return aResult;
 }
 
-SwUndoSaveCntnt::SwUndoSaveCntnt()
+SwUndoSaveContent::SwUndoSaveContent()
     : pHistory( 0 )
 {}
 
-SwUndoSaveCntnt::~SwUndoSaveCntnt()
+SwUndoSaveContent::~SwUndoSaveContent()
 {
     delete pHistory;
 }
@@ -301,13 +301,13 @@ SwUndoSaveCntnt::~SwUndoSaveCntnt()
 
 // If pEndNdIdx is given, Undo/Redo calls -Ins/DelFly. In that case the whole
 // section should be moved.
-void SwUndoSaveCntnt::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx,
+void SwUndoSaveContent::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx,
                     sal_uLong* pEndNdIdx, sal_Int32* pEndCntIdx )
 {
     SwDoc& rDoc = *rPaM.GetDoc();
     ::sw::UndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
 
-    SwNoTxtNode* pCpyNd = rPaM.GetNode().GetNoTxtNode();
+    SwNoTextNode* pCpyNd = rPaM.GetNode().GetNoTextNode();
 
     // here comes the actual delete (move)
     SwNodes & rNds = rDoc.GetUndoManager().GetUndoNodes();
@@ -340,7 +340,7 @@ void SwUndoSaveCntnt::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx,
         *pNodeIdx = aPos.nNode;
 }
 
-void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
+void SwUndoSaveContent::MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
                             SwPosition& rInsPos,
                             sal_uLong* pEndNdIdx, sal_Int32* pEndCntIdx )
 {
@@ -357,18 +357,18 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
     else
     {
         aPaM.GetPoint()->nNode = rNds.GetEndOfExtras();
-        GoInCntnt( aPaM, fnMoveBackward );
+        GoInContent( aPaM, fnMoveBackward );
     }
 
-    SwTxtNode* pTxtNd = aPaM.GetNode().GetTxtNode();
-    if (!pEndNdIdx && pTxtNd)
+    SwTextNode* pTextNd = aPaM.GetNode().GetTextNode();
+    if (!pEndNdIdx && pTextNd)
     {
         if( pEndCntIdx )
-            aPaM.GetPoint()->nContent.Assign( pTxtNd, *pEndCntIdx );
+            aPaM.GetPoint()->nContent.Assign( pTextNd, *pEndCntIdx );
 
         aPaM.SetMark();
         aPaM.GetPoint()->nNode = nNodeIdx;
-        aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 0);
+        aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 0);
 
         _SaveRedlEndPosForRestore aRedlRest( rInsPos.nNode, rInsPos.nContent.GetIndex() );
 
@@ -388,7 +388,7 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
 
         aRedlRest.Restore();
     }
-    else if( pEndNdIdx || !pTxtNd )
+    else if( pEndNdIdx || !pTextNd )
     {
         SwNodeRange aRg( rNds, nNodeIdx, rNds, (pEndNdIdx
                         ? ((*pEndNdIdx) + 1)
@@ -405,7 +405,7 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
 // can span an area for a Undo/Redo. (The Point is then positioned in front of
 // the area to manipulate!)
 // The flag indicates if there is still content in front of Point.
-bool SwUndoSaveCntnt::MovePtBackward( SwPaM& rPam )
+bool SwUndoSaveContent::MovePtBackward( SwPaM& rPam )
 {
     rPam.SetMark();
     if( rPam.Move( fnMoveBackward ))
@@ -418,7 +418,7 @@ bool SwUndoSaveCntnt::MovePtBackward( SwPaM& rPam )
     return false;
 }
 
-void SwUndoSaveCntnt::MovePtForward( SwPaM& rPam, bool bMvBkwrd )
+void SwUndoSaveContent::MovePtForward( SwPaM& rPam, bool bMvBkwrd )
 {
     // Was there content before this position?
     if( bMvBkwrd )
@@ -426,7 +426,7 @@ void SwUndoSaveCntnt::MovePtForward( SwPaM& rPam, bool bMvBkwrd )
     else
     {
         ++rPam.GetPoint()->nNode;
-        SwCntntNode* pCNd = rPam.GetCntntNode();
+        SwContentNode* pCNd = rPam.GetContentNode();
         if( pCNd )
             pCNd->MakeStartIndex( &rPam.GetPoint()->nContent );
         else
@@ -444,9 +444,9 @@ void SwUndoSaveCntnt::MovePtForward( SwPaM& rPam, bool bMvBkwrd )
 // #i81002# - extending method
 // delete certain (not all) cross-reference bookmarks at text node of <rMark>
 // and at text node of <rPoint>, if these text nodes aren't the same.
-void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
+void SwUndoSaveContent::DelContentIndex( const SwPosition& rMark,
                                      const SwPosition& rPoint,
-                                     DelCntntType nDelCntntType )
+                                     DelContentType nDelContentType )
 {
     const SwPosition *pStt = rMark < rPoint ? &rMark : &rPoint,
                     *pEnd = &rMark == pStt ? &rPoint : &rMark;
@@ -456,28 +456,28 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
     ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
 
     // 1. Footnotes
-    if( nsDelCntntType::DELCNT_FTN & nDelCntntType )
+    if( nsDelContentType::DELCNT_FTN & nDelContentType )
     {
-        SwFtnIdxs& rFtnArr = pDoc->GetFtnIdxs();
-        if( !rFtnArr.empty() )
+        SwFootnoteIdxs& rFootnoteArr = pDoc->GetFootnoteIdxs();
+        if( !rFootnoteArr.empty() )
         {
-            const SwNode* pFtnNd;
+            const SwNode* pFootnoteNd;
             size_t nPos = 0;
-            rFtnArr.SeekEntry( pStt->nNode, &nPos );
-            SwTxtFtn* pSrch;
+            rFootnoteArr.SeekEntry( pStt->nNode, &nPos );
+            SwTextFootnote* pSrch;
 
             // for now delete all that come afterwards
-            while( nPos < rFtnArr.size() && ( pFtnNd =
-                &( pSrch = rFtnArr[ nPos ] )->GetTxtNode())->GetIndex()
+            while( nPos < rFootnoteArr.size() && ( pFootnoteNd =
+                &( pSrch = rFootnoteArr[ nPos ] )->GetTextNode())->GetIndex()
                         <= pEnd->nNode.GetIndex() )
             {
-                const sal_Int32 nFtnSttIdx = pSrch->GetStart();
-                if( (nsDelCntntType::DELCNT_CHKNOCNTNT & nDelCntntType )
-                    ? (&pEnd->nNode.GetNode() == pFtnNd )
-                    : (( &pStt->nNode.GetNode() == pFtnNd &&
-                    pStt->nContent.GetIndex() > nFtnSttIdx) ||
-                    ( &pEnd->nNode.GetNode() == pFtnNd &&
-                    nFtnSttIdx >= pEnd->nContent.GetIndex() )) )
+                const sal_Int32 nFootnoteSttIdx = pSrch->GetStart();
+                if( (nsDelContentType::DELCNT_CHKNOCNTNT & nDelContentType )
+                    ? (&pEnd->nNode.GetNode() == pFootnoteNd )
+                    : (( &pStt->nNode.GetNode() == pFootnoteNd &&
+                    pStt->nContent.GetIndex() > nFootnoteSttIdx) ||
+                    ( &pEnd->nNode.GetNode() == pFootnoteNd &&
+                    nFootnoteSttIdx >= pEnd->nContent.GetIndex() )) )
                 {
                     ++nPos;     // continue searching
                     continue;
@@ -486,90 +486,90 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
 // FIXME: duplicated code here and below -> refactor?
                 // Unfortunately an index needs to be created. Otherwise there
                 // will be problems with TextNode because the index will be
-                // deleted in the DTOR of SwFtn!
-                SwTxtNode* pTxtNd = const_cast<SwTxtNode*>(static_cast<const SwTxtNode*>(pFtnNd));
+                // deleted in the DTOR of SwFootnote!
+                SwTextNode* pTextNd = const_cast<SwTextNode*>(static_cast<const SwTextNode*>(pFootnoteNd));
                 if( !pHistory )
                     pHistory = new SwHistory;
-                SwTxtAttr* const pFtnHnt =
-                    pTxtNd->GetTxtAttrForCharAt( nFtnSttIdx );
-                assert(pFtnHnt);
-                SwIndex aIdx( pTxtNd, nFtnSttIdx );
-                pHistory->Add( pFtnHnt, pTxtNd->GetIndex(), false );
-                pTxtNd->EraseText( aIdx, 1 );
+                SwTextAttr* const pFootnoteHint =
+                    pTextNd->GetTextAttrForCharAt( nFootnoteSttIdx );
+                assert(pFootnoteHint);
+                SwIndex aIdx( pTextNd, nFootnoteSttIdx );
+                pHistory->Add( pFootnoteHint, pTextNd->GetIndex(), false );
+                pTextNd->EraseText( aIdx, 1 );
             }
 
-            while( nPos-- && ( pFtnNd = &( pSrch = rFtnArr[ nPos ] )->
-                    GetTxtNode())->GetIndex() >= pStt->nNode.GetIndex() )
+            while( nPos-- && ( pFootnoteNd = &( pSrch = rFootnoteArr[ nPos ] )->
+                    GetTextNode())->GetIndex() >= pStt->nNode.GetIndex() )
             {
-                const sal_Int32 nFtnSttIdx = pSrch->GetStart();
-                if( !(nsDelCntntType::DELCNT_CHKNOCNTNT & nDelCntntType) && (
-                    ( &pStt->nNode.GetNode() == pFtnNd &&
-                    pStt->nContent.GetIndex() > nFtnSttIdx ) ||
-                    ( &pEnd->nNode.GetNode() == pFtnNd &&
-                    nFtnSttIdx >= pEnd->nContent.GetIndex() )))
+                const sal_Int32 nFootnoteSttIdx = pSrch->GetStart();
+                if( !(nsDelContentType::DELCNT_CHKNOCNTNT & nDelContentType) && (
+                    ( &pStt->nNode.GetNode() == pFootnoteNd &&
+                    pStt->nContent.GetIndex() > nFootnoteSttIdx ) ||
+                    ( &pEnd->nNode.GetNode() == pFootnoteNd &&
+                    nFootnoteSttIdx >= pEnd->nContent.GetIndex() )))
                     continue;               // continue searching
 
                 // Unfortunately an index needs to be created. Otherwise there
                 // will be problems with TextNode because the index will be
-                // deleted in the DTOR of SwFtn!
-                SwTxtNode* pTxtNd = const_cast<SwTxtNode*>(static_cast<const SwTxtNode*>(pFtnNd));
+                // deleted in the DTOR of SwFootnote!
+                SwTextNode* pTextNd = const_cast<SwTextNode*>(static_cast<const SwTextNode*>(pFootnoteNd));
                 if( !pHistory )
                     pHistory = new SwHistory;
-                SwTxtAttr* const pFtnHnt =
-                    pTxtNd->GetTxtAttrForCharAt( nFtnSttIdx );
-                assert(pFtnHnt);
-                SwIndex aIdx( pTxtNd, nFtnSttIdx );
-                pHistory->Add( pFtnHnt, pTxtNd->GetIndex(), false );
-                pTxtNd->EraseText( aIdx, 1 );
+                SwTextAttr* const pFootnoteHint =
+                    pTextNd->GetTextAttrForCharAt( nFootnoteSttIdx );
+                assert(pFootnoteHint);
+                SwIndex aIdx( pTextNd, nFootnoteSttIdx );
+                pHistory->Add( pFootnoteHint, pTextNd->GetIndex(), false );
+                pTextNd->EraseText( aIdx, 1 );
             }
         }
     }
 
     // 2. Flys
-    if( nsDelCntntType::DELCNT_FLY & nDelCntntType )
+    if( nsDelContentType::DELCNT_FLY & nDelContentType )
     {
         sal_uInt16 nChainInsPos = pHistory ? pHistory->Count() : 0;
-        const SwFrmFmts& rSpzArr = *pDoc->GetSpzFrmFmts();
+        const SwFrameFormats& rSpzArr = *pDoc->GetSpzFrameFormats();
         if( !rSpzArr.empty() )
         {
             const bool bDelFwrd = rMark.nNode.GetIndex() <= rPoint.nNode.GetIndex();
-            SwFrmFmt* pFmt;
-            const SwFmtAnchor* pAnchor;
+            SwFrameFormat* pFormat;
+            const SwFormatAnchor* pAnchor;
             size_t n = rSpzArr.size();
             const SwPosition* pAPos;
 
             while( n && !rSpzArr.empty() )
             {
-                pFmt = rSpzArr[--n];
-                pAnchor = &pFmt->GetAnchor();
+                pFormat = rSpzArr[--n];
+                pAnchor = &pFormat->GetAnchor();
                 switch( pAnchor->GetAnchorId() )
                 {
                 case FLY_AS_CHAR:
-                    if( 0 != (pAPos = pAnchor->GetCntntAnchor() ) &&
-                        (( nsDelCntntType::DELCNT_CHKNOCNTNT & nDelCntntType )
+                    if( 0 != (pAPos = pAnchor->GetContentAnchor() ) &&
+                        (( nsDelContentType::DELCNT_CHKNOCNTNT & nDelContentType )
                         ? ( pStt->nNode <= pAPos->nNode &&
                             pAPos->nNode < pEnd->nNode )
                         : ( *pStt <= *pAPos && *pAPos < *pEnd )) )
                     {
                         if( !pHistory )
                             pHistory = new SwHistory;
-                        SwTxtNode *const pTxtNd =
-                            pAPos->nNode.GetNode().GetTxtNode();
-                        SwTxtAttr* const pFlyHnt = pTxtNd->GetTxtAttrForCharAt(
+                        SwTextNode *const pTextNd =
+                            pAPos->nNode.GetNode().GetTextNode();
+                        SwTextAttr* const pFlyHint = pTextNd->GetTextAttrForCharAt(
                             pAPos->nContent.GetIndex());
-                        assert(pFlyHnt);
-                        pHistory->Add( pFlyHnt, 0, false );
+                        assert(pFlyHint);
+                        pHistory->Add( pFlyHint, 0, false );
                         // reset n so that no Format is skipped
                         n = n >= rSpzArr.size() ? rSpzArr.size() : n+1;
                     }
                     break;
                 case FLY_AT_PARA:
                     {
-                        pAPos =  pAnchor->GetCntntAnchor();
+                        pAPos =  pAnchor->GetContentAnchor();
                         if( pAPos )
                         {
                             bool bTmp;
-                            if( nsDelCntntType::DELCNT_CHKNOCNTNT & nDelCntntType )
+                            if( nsDelContentType::DELCNT_CHKNOCNTNT & nDelContentType )
                                 bTmp = pStt->nNode <= pAPos->nNode && pAPos->nNode < pEnd->nNode;
                             else
                             {
@@ -587,22 +587,22 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
                                     pHistory = new SwHistory;
 
                                 // Moving the anchor?
-                                if( !( nsDelCntntType::DELCNT_CHKNOCNTNT & nDelCntntType ) &&
+                                if( !( nsDelContentType::DELCNT_CHKNOCNTNT & nDelContentType ) &&
                                     ( rPoint.nNode.GetIndex() == pAPos->nNode.GetIndex() ) )
                                 {
                                     // Do not try to move the anchor to a table!
-                                    if( rMark.nNode.GetNode().GetTxtNode() )
+                                    if( rMark.nNode.GetNode().GetTextNode() )
                                     {
-                                        pHistory->Add( *pFmt );
-                                        SwFmtAnchor aAnch( *pAnchor );
+                                        pHistory->Add( *pFormat );
+                                        SwFormatAnchor aAnch( *pAnchor );
                                         SwPosition aPos( rMark.nNode );
                                         aAnch.SetAnchor( &aPos );
-                                        pFmt->SetFmtAttr( aAnch );
+                                        pFormat->SetFormatAttr( aAnch );
                                     }
                                 }
                                 else
                                 {
-                                    pHistory->Add( *static_cast<SwFlyFrmFmt *>(pFmt), nChainInsPos );
+                                    pHistory->Add( *static_cast<SwFlyFrameFormat *>(pFormat), nChainInsPos );
                                     // reset n so that no Format is skipped
                                     n = n >= rSpzArr.size() ?
                                         rSpzArr.size() : n+1;
@@ -612,30 +612,30 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
                     }
                     break;
                 case FLY_AT_CHAR:
-                    if( 0 != (pAPos = pAnchor->GetCntntAnchor() ) &&
+                    if( 0 != (pAPos = pAnchor->GetContentAnchor() ) &&
                         ( pStt->nNode <= pAPos->nNode && pAPos->nNode <= pEnd->nNode ) )
                     {
                         if( !pHistory )
                             pHistory = new SwHistory;
                         if (IsDestroyFrameAnchoredAtChar(
-                                *pAPos, *pStt, *pEnd, pDoc, nDelCntntType))
+                                *pAPos, *pStt, *pEnd, pDoc, nDelContentType))
                         {
-                            pHistory->Add( *static_cast<SwFlyFrmFmt *>(pFmt), nChainInsPos );
+                            pHistory->Add( *static_cast<SwFlyFrameFormat *>(pFormat), nChainInsPos );
                             n = n >= rSpzArr.size() ? rSpzArr.size() : n+1;
                         }
-                        else if( !( nsDelCntntType::DELCNT_CHKNOCNTNT & nDelCntntType ) )
+                        else if( !( nsDelContentType::DELCNT_CHKNOCNTNT & nDelContentType ) )
                         {
                             if( *pStt <= *pAPos && *pAPos < *pEnd )
                             {
                                 // These are the objects anchored
                                 // between section start and end position
                                 // Do not try to move the anchor to a table!
-                                if( rMark.nNode.GetNode().GetTxtNode() )
+                                if( rMark.nNode.GetNode().GetTextNode() )
                                 {
-                                    pHistory->Add( *pFmt );
-                                    SwFmtAnchor aAnch( *pAnchor );
+                                    pHistory->Add( *pFormat );
+                                    SwFormatAnchor aAnch( *pAnchor );
                                     aAnch.SetAnchor( &rMark );
-                                    pFmt->SetFmtAttr( aAnch );
+                                    pFormat->SetFormatAttr( aAnch );
                                 }
                             }
                         }
@@ -643,13 +643,13 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
                     break;
                 case FLY_AT_FLY:
 
-                    if( 0 != (pAPos = pAnchor->GetCntntAnchor() ) &&
+                    if( 0 != (pAPos = pAnchor->GetContentAnchor() ) &&
                         pStt->nNode == pAPos->nNode )
                     {
                         if( !pHistory )
                             pHistory = new SwHistory;
 
-                        pHistory->Add( *static_cast<SwFlyFrmFmt *>(pFmt), nChainInsPos );
+                        pHistory->Add( *static_cast<SwFlyFrameFormat *>(pFormat), nChainInsPos );
 
                         // reset n so that no Format is skipped
                         n = n >= rSpzArr.size() ? rSpzArr.size() : n+1;
@@ -662,7 +662,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
     }
 
     // 3. Bookmarks
-    if( nsDelCntntType::DELCNT_BKM & nDelCntntType )
+    if( nsDelContentType::DELCNT_BKM & nDelContentType )
     {
         IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
         if( pMarkAccess->getAllMarksCount() )
@@ -675,7 +675,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
                 bool bSaveOtherPos = false;
                 const ::sw::mark::IMark* pBkmk = (pMarkAccess->getAllMarksBegin() + n)->get();
 
-                if( nsDelCntntType::DELCNT_CHKNOCNTNT & nDelCntntType )
+                if( nsDelContentType::DELCNT_CHKNOCNTNT & nDelContentType )
                 {
                     if ( pStt->nNode <= pBkmk->GetMarkPos().nNode
                          && pBkmk->GetMarkPos().nNode < pEnd->nNode )
@@ -725,16 +725,16 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
                          && dynamic_cast< const ::sw::mark::CrossRefBookmark* >(pBkmk) )
                     {
                         // certain special handling for cross-reference bookmarks
-                        const bool bDifferentTxtNodesAtMarkAndPoint =
+                        const bool bDifferentTextNodesAtMarkAndPoint =
                             rMark.nNode != rPoint.nNode
-                            && rMark.nNode.GetNode().GetTxtNode()
-                            && rPoint.nNode.GetNode().GetTxtNode();
-                        if ( bDifferentTxtNodesAtMarkAndPoint )
+                            && rMark.nNode.GetNode().GetTextNode()
+                            && rPoint.nNode.GetNode().GetTextNode();
+                        if ( bDifferentTextNodesAtMarkAndPoint )
                         {
                             // delete cross-reference bookmark at <pStt>, if only part of
                             // <pEnd> text node content is deleted.
                             if( pStt->nNode == pBkmk->GetMarkPos().nNode
-                                && pEnd->nContent.GetIndex() != pEnd->nNode.GetNode().GetTxtNode()->Len() )
+                                && pEnd->nContent.GetIndex() != pEnd->nNode.GetNode().GetTextNode()->Len() )
                             {
                                 bSavePos = true;
                                 bSaveOtherPos = false; // cross-reference bookmarks are not expanded
@@ -813,7 +813,7 @@ void SwUndoSaveSection::SaveSection(
     SwPaM aPam( rRange.aStart, rRange.aEnd );
 
     // delete all footnotes, fly frames, bookmarks and indexes
-    DelCntntIndex( *aPam.GetMark(), *aPam.GetPoint() );
+    DelContentIndex( *aPam.GetMark(), *aPam.GetPoint() );
     {
         // move certain indexes out of deleted range
         SwNodeIndex aSttIdx( aPam.Start()->nNode.GetNode() );
@@ -831,10 +831,10 @@ void SwUndoSaveSection::SaveSection(
     --aPam.GetPoint()->nNode;
     ++aPam.GetMark()->nNode;
 
-    SwCntntNode* pCNd = aPam.GetCntntNode( false );
+    SwContentNode* pCNd = aPam.GetContentNode( false );
     if( pCNd )
         aPam.GetMark()->nContent.Assign( pCNd, 0 );
-    if( 0 != ( pCNd = aPam.GetCntntNode( true )) )
+    if( 0 != ( pCNd = aPam.GetContentNode( true )) )
         aPam.GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
 
     // Keep positions as SwIndex so that this section can be deleted in DTOR
@@ -900,19 +900,19 @@ SwRedlineSaveData::SwRedlineSaveData(
     {
     case POS_OVERLAP_BEFORE:        // Pos1 overlaps Pos2 at the beginning
         nEndNode = rEndPos.nNode.GetIndex();
-        nEndCntnt = rEndPos.nContent.GetIndex();
+        nEndContent = rEndPos.nContent.GetIndex();
         break;
 
     case POS_OVERLAP_BEHIND:        // Pos1 overlaps Pos2 at the end
         nSttNode = rSttPos.nNode.GetIndex();
-        nSttCntnt = rSttPos.nContent.GetIndex();
+        nSttContent = rSttPos.nContent.GetIndex();
         break;
 
     case POS_INSIDE:                // Pos1 lays completely in Pos2
         nSttNode = rSttPos.nNode.GetIndex();
-        nSttCntnt = rSttPos.nContent.GetIndex();
+        nSttContent = rSttPos.nContent.GetIndex();
         nEndNode = rEndPos.nNode.GetIndex();
-        nEndCntnt = rEndPos.nContent.GetIndex();
+        nEndContent = rEndPos.nContent.GetIndex();
         break;
 
     case POS_OUTSIDE:               // Pos2 lays completely in Pos1
@@ -932,7 +932,7 @@ SwRedlineSaveData::SwRedlineSaveData(
     }
 
 #if OSL_DEBUG_LEVEL > 0
-    nRedlineCount = rSttPos.nNode.GetNode().GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl().size();
+    nRedlineCount = rSttPos.nNode.GetNode().GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().size();
 #endif
 }
 
@@ -982,12 +982,12 @@ bool SwUndo::FillSaveData(
     SwRedlineSaveData* pNewData;
     const SwPosition* pStt = rRange.Start();
     const SwPosition* pEnd = rRange.End();
-    const SwRedlineTbl& rTbl = rRange.GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
+    const SwRedlineTable& rTable = rRange.GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
     sal_uInt16 n = 0;
     rRange.GetDoc()->getIDocumentRedlineAccess().GetRedline( *pStt, &n );
-    for ( ; n < rTbl.size(); ++n )
+    for ( ; n < rTable.size(); ++n )
     {
-        SwRangeRedline* pRedl = rTbl[n];
+        SwRangeRedline* pRedl = rTable[n];
 
         const SwComparePosition eCmpPos =
             ComparePosition( *pStt, *pEnd, *pRedl->Start(), *pRedl->End() );
@@ -1007,7 +1007,7 @@ bool SwUndo::FillSaveData(
     return !rSData.empty();
 }
 
-bool SwUndo::FillSaveDataForFmt(
+bool SwUndo::FillSaveDataForFormat(
     const SwPaM& rRange,
     SwRedlineSaveDatas& rSData )
 {
@@ -1015,12 +1015,12 @@ bool SwUndo::FillSaveDataForFmt(
 
     SwRedlineSaveData* pNewData;
     const SwPosition *pStt = rRange.Start(), *pEnd = rRange.End();
-    const SwRedlineTbl& rTbl = rRange.GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
+    const SwRedlineTable& rTable = rRange.GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
     sal_uInt16 n = 0;
     rRange.GetDoc()->getIDocumentRedlineAccess().GetRedline( *pStt, &n );
-    for ( ; n < rTbl.size(); ++n )
+    for ( ; n < rTable.size(); ++n )
     {
-        SwRangeRedline* pRedl = rTbl[n];
+        SwRangeRedline* pRedl = rTable[n];
         if ( nsRedlineType_t::REDLINE_FORMAT == pRedl->GetType() )
         {
             const SwComparePosition eCmpPos = ComparePosition( *pStt, *pEnd, *pRedl->Start(), *pRedl->End() );
@@ -1051,7 +1051,7 @@ void SwUndo::SetSaveData( SwDoc& rDoc, SwRedlineSaveDatas& rSData )
 #if OSL_DEBUG_LEVEL > 0
     // check redline count against count saved in RedlineSaveData object
     assert(rSData.empty() ||
-           (rSData[0].nRedlineCount == rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size()));
+           (rSData[0].nRedlineCount == rDoc.getIDocumentRedlineAccess().GetRedlineTable().size()));
             // "redline count not restored properly"
 #endif
 
@@ -1078,8 +1078,8 @@ bool SwUndo::CanRedlineGroup( SwRedlineSaveDatas& rCurr,
         const SwRedlineSaveData& rGet = rCheck[ n ];
         if( rSet.nSttNode != rGet.nSttNode ||
             rSet.GetMvSttIdx() || rGet.GetMvSttIdx() ||
-            ( bCurrIsEnd ? rSet.nSttCntnt != rGet.nEndCntnt
-                            : rSet.nEndCntnt != rGet.nSttCntnt ) ||
+            ( bCurrIsEnd ? rSet.nSttContent != rGet.nEndContent
+                            : rSet.nEndContent != rGet.nSttContent ) ||
             !rGet.CanCombine( rSet ) )
         {
             return false;
@@ -1091,9 +1091,9 @@ bool SwUndo::CanRedlineGroup( SwRedlineSaveDatas& rCurr,
         SwRedlineSaveData& rSet = rCurr[ n ];
         const SwRedlineSaveData& rGet = rCheck[ n ];
         if( bCurrIsEnd )
-            rSet.nSttCntnt = rGet.nSttCntnt;
+            rSet.nSttContent = rGet.nSttContent;
         else
-            rSet.nEndCntnt = rGet.nEndCntnt;
+            rSet.nEndContent = rGet.nEndContent;
     }
     return true;
 }
@@ -1120,7 +1120,7 @@ OUString ShortenString(const OUString & rStr, sal_Int32 nLength, const OUString
 
 bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos,
         SwPosition const & rStart, SwPosition const & rEnd, const SwDoc* doc,
-        DelCntntType const nDelCntntType)
+        DelContentType const nDelContentType)
 {
     bool inSelection = rAnchorPos < rEnd;
     if( rAnchorPos == rEnd )
@@ -1131,7 +1131,7 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos,
         else
         {
             SwNodeIndex idx( nodes.GetEndOfContent());
-         if( SwCntntNode* last = SwNodes::GoPrevious( &idx ))
+         if( SwContentNode* last = SwNodes::GoPrevious( &idx ))
             inSelection = rEnd == SwPosition( *last, last->Len());
         }
     }
@@ -1140,7 +1140,7 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos,
     // - anchored in start of the selection with "CheckNoContent"
     // - anchored in start of sel. and the selection start at pos 0
     return  inSelection
-         && (   (nsDelCntntType::DELCNT_CHKNOCNTNT & nDelCntntType)
+         && (   (nsDelContentType::DELCNT_CHKNOCNTNT & nDelContentType)
             ||  (rStart.nNode < rAnchorPos.nNode)
             ||  !rStart.nContent.GetIndex()
             );
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index fc6829207705..6260382cc1e5 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -39,20 +39,20 @@
 #include <dcontact.hxx>
 #include <ndole.hxx>
 
-SwUndoFlyBase::SwUndoFlyBase( SwFrmFmt* pFormat, SwUndoId nUndoId )
+SwUndoFlyBase::SwUndoFlyBase( SwFrameFormat* pFormat, SwUndoId nUndoId )
     : SwUndo(nUndoId)
-    , pFrmFmt(pFormat)
+    , pFrameFormat(pFormat)
     , nNdPgPos(0)
     , nCntPos(0)
     , nRndId(0)
-    , bDelFmt(false)
+    , bDelFormat(false)
 {
 }
 
 SwUndoFlyBase::~SwUndoFlyBase()
 {
-    if( bDelFmt )       // delete during an Undo?
-        delete pFrmFmt;
+    if( bDelFormat )       // delete during an Undo?
+        delete pFrameFormat;
 }
 
 void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm)
@@ -60,14 +60,14 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm)
     SwDoc *const pDoc = & rContext.GetDoc();
 
     // add again into array
-    SwFrmFmts& rFlyFmts = *pDoc->GetSpzFrmFmts();
-    rFlyFmts.push_back( pFrmFmt );
+    SwFrameFormats& rFlyFormats = *pDoc->GetSpzFrameFormats();
+    rFlyFormats.push_back( pFrameFormat );
 
     // OD 26.06.2003 #108784# - insert 'master' drawing object into drawing page
-    if ( RES_DRAWFRMFMT == pFrmFmt->Which() )
+    if ( RES_DRAWFRMFMT == pFrameFormat->Which() )
     {
         SwDrawContact* pDrawContact =
-            static_cast<SwDrawContact*>(pFrmFmt->FindContactObj());
+            static_cast<SwDrawContact*>(pFrameFormat->FindContactObj());
         if ( pDrawContact )
         {
             pDrawContact->InsertMasterIntoDrawPage();
@@ -77,7 +77,7 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm)
         }
     }
 
-    SwFmtAnchor aAnchor( (RndStdIds)nRndId );
+    SwFormatAnchor aAnchor( (RndStdIds)nRndId );
 
     if (FLY_AT_PAGE == nRndId)
     {
@@ -89,39 +89,39 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm)
         aNewPos.nNode = nNdPgPos;
         if ((FLY_AS_CHAR == nRndId) || (FLY_AT_CHAR == nRndId))
         {
-            aNewPos.nContent.Assign( aNewPos.nNode.GetNode().GetCntntNode(),
+            aNewPos.nContent.Assign( aNewPos.nNode.GetNode().GetContentNode(),
                                     nCntPos );
         }
         aAnchor.SetAnchor( &aNewPos );
     }
 
-    pFrmFmt->SetFmtAttr( aAnchor );     // reset anchor
+    pFrameFormat->SetFormatAttr( aAnchor );     // reset anchor
 
-    if( RES_DRAWFRMFMT != pFrmFmt->Which() )
+    if( RES_DRAWFRMFMT != pFrameFormat->Which() )
     {
         // get Content and reset ContentAttribute
         SwNodeIndex aIdx( pDoc->GetNodes() );
         RestoreSection( pDoc, &aIdx, SwFlyStartNode );
-        pFrmFmt->SetFmtAttr( SwFmtCntnt( aIdx.GetNode().GetStartNode() ));
+        pFrameFormat->SetFormatAttr( SwFormatContent( aIdx.GetNode().GetStartNode() ));
     }
 
-    // Set InCntntAttribute not until there is content!
+    // Set InContentAttribute not until there is content!
     // Otherwise the layout would format the Fly beforehand but would not find
     // content; this happened with graphics from the internet.
     if (FLY_AS_CHAR == nRndId)
     {
         // there must be at least the attribute in a TextNode
-        SwCntntNode* pCNd = aAnchor.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
-        OSL_ENSURE( pCNd->IsTxtNode(), "no Text Node at position." );
-        SwFmtFlyCnt aFmt( pFrmFmt );
-        pCNd->GetTxtNode()->InsertItem( aFmt, nCntPos, nCntPos );
+        SwContentNode* pCNd = aAnchor.GetContentAnchor()->nNode.GetNode().GetContentNode();
+        OSL_ENSURE( pCNd->IsTextNode(), "no Text Node at position." );
+        SwFormatFlyCnt aFormat( pFrameFormat );
+        pCNd->GetTextNode()->InsertItem( aFormat, nCntPos, nCntPos );
     }
 
-    pFrmFmt->MakeFrms();
+    pFrameFormat->MakeFrms();
 
     if( bShowSelFrm )
     {
-        rContext.SetSelections(pFrmFmt, 0);
+        rContext.SetSelections(pFrameFormat, 0);
     }
 
     if( GetHistory() )
@@ -132,74 +132,74 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm)
     case FLY_AS_CHAR:
     case FLY_AT_CHAR:
         {
-            const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-            nNdPgPos = rAnchor.GetCntntAnchor()->nNode.GetIndex();
-            nCntPos = rAnchor.GetCntntAnchor()->nContent.GetIndex();
+            const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+            nNdPgPos = rAnchor.GetContentAnchor()->nNode.GetIndex();
+            nCntPos = rAnchor.GetContentAnchor()->nContent.GetIndex();
         }
         break;
     case FLY_AT_PARA:
     case FLY_AT_FLY:
         {
-            const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-            nNdPgPos = rAnchor.GetCntntAnchor()->nNode.GetIndex();
+            const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+            nNdPgPos = rAnchor.GetContentAnchor()->nNode.GetIndex();
         }
         break;
     case FLY_AT_PAGE:
         break;
     }
-    bDelFmt =  false;
+    bDelFormat =  false;
 }
 
 void SwUndoFlyBase::DelFly( SwDoc* pDoc )
 {
-    bDelFmt = true;                 // delete Format in DTOR
-    pFrmFmt->DelFrms();                 // destroy Frms
+    bDelFormat = true;                 // delete Format in DTOR
+    pFrameFormat->DelFrms();                 // destroy Frms
 
     // all Uno objects should now log themselves off
     {
-        SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFrmFmt );
-        pFrmFmt->ModifyNotification( &aMsgHint, &aMsgHint );
+        SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, pFrameFormat );
+        pFrameFormat->ModifyNotification( &aMsgHint, &aMsgHint );
     }
 
-    if ( RES_DRAWFRMFMT != pFrmFmt->Which() )
+    if ( RES_DRAWFRMFMT != pFrameFormat->Which() )
     {
         // if there is content than save it
-        const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-        OSL_ENSURE( rCntnt.GetCntntIdx(), "Fly ohne Inhalt" );
+        const SwFormatContent& rContent = pFrameFormat->GetContent();
+        OSL_ENSURE( rContent.GetContentIdx(), "Fly ohne Inhalt" );
 
-        SaveSection( *rCntnt.GetCntntIdx() );
-        const_cast<SwFmtCntnt&>(rCntnt).SetNewCntntIdx( (const SwNodeIndex*)0 );
+        SaveSection( *rContent.GetContentIdx() );
+        const_cast<SwFormatContent&>(rContent).SetNewContentIdx( (const SwNodeIndex*)0 );
     }
     // OD 02.07.2003 #108784# - remove 'master' drawing object from drawing page
-    else if ( RES_DRAWFRMFMT == pFrmFmt->Which() )
+    else if ( RES_DRAWFRMFMT == pFrameFormat->Which() )
     {
         SwDrawContact* pDrawContact =
-            static_cast<SwDrawContact*>(pFrmFmt->FindContactObj());
+            static_cast<SwDrawContact*>(pFrameFormat->FindContactObj());
         if ( pDrawContact )
         {
             pDrawContact->RemoveMasterFromDrawPage();
         }
     }
 
-    const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-    const SwPosition* pPos = rAnchor.GetCntntAnchor();
+    const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+    const SwPosition* pPos = rAnchor.GetContentAnchor();
     // The positions in Nodes array got shifted.
     nRndId = static_cast<sal_uInt16>(rAnchor.GetAnchorId());
     if (FLY_AS_CHAR == nRndId)
     {
         nNdPgPos = pPos->nNode.GetIndex();
         nCntPos = pPos->nContent.GetIndex();
-        SwTxtNode *const pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-        OSL_ENSURE( pTxtNd, "Kein Textnode gefunden" );
-        SwTxtFlyCnt* const pAttr = static_cast<SwTxtFlyCnt*>(
-            pTxtNd->GetTxtAttrForCharAt( nCntPos, RES_TXTATR_FLYCNT ) );
+        SwTextNode *const pTextNd = pPos->nNode.GetNode().GetTextNode();
+        OSL_ENSURE( pTextNd, "Kein Textnode gefunden" );
+        SwTextFlyCnt* const pAttr = static_cast<SwTextFlyCnt*>(
+            pTextNd->GetTextAttrForCharAt( nCntPos, RES_TXTATR_FLYCNT ) );
         // attribute is still in TextNode, delete
-        if( pAttr && pAttr->GetFlyCnt().GetFrmFmt() == pFrmFmt )
+        if( pAttr && pAttr->GetFlyCnt().GetFrameFormat() == pFrameFormat )
         {
             // Pointer to 0, do not delete
-            const_cast<SwFmtFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFmt();
+            const_cast<SwFormatFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFormat();
             SwIndex aIdx( pPos->nContent );
-            pTxtNd->EraseText( aIdx, 1 );
+            pTextNd->EraseText( aIdx, 1 );
         }
     }
     else if (FLY_AT_CHAR == nRndId)
@@ -216,21 +216,21 @@ void SwUndoFlyBase::DelFly( SwDoc* pDoc )
         nNdPgPos = rAnchor.GetPageNum();
     }
 
-    pFrmFmt->ResetFmtAttr( RES_ANCHOR );        // delete anchor
+    pFrameFormat->ResetFormatAttr( RES_ANCHOR );        // delete anchor
 
     // delete from array
-    SwFrmFmts& rFlyFmts = *pDoc->GetSpzFrmFmts();
-    rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFrmFmt ));
+    SwFrameFormats& rFlyFormats = *pDoc->GetSpzFrameFormats();
+    rFlyFormats.erase( std::find( rFlyFormats.begin(), rFlyFormats.end(), pFrameFormat ));
 }
 
-SwUndoInsLayFmt::SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx )
+SwUndoInsLayFormat::SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx )
     : SwUndoFlyBase( pFormat, RES_DRAWFRMFMT == pFormat->Which() ?
                                             UNDO_INSDRAWFMT : UNDO_INSLAYFMT ),
     mnCrsrSaveIndexPara( nNodeIdx ), mnCrsrSaveIndexPos( nCntIdx )
 {
-    const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
+    const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
     nRndId = static_cast<sal_uInt16>(rAnchor.GetAnchorId());
-    bDelFmt = false;
+    bDelFormat = false;
     switch( nRndId )
     {
     case FLY_AT_PAGE:
@@ -238,12 +238,12 @@ SwUndoInsLayFmt::SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, sal_Int
         break;
     case FLY_AT_PARA:
     case FLY_AT_FLY:
-        nNdPgPos = rAnchor.GetCntntAnchor()->nNode.GetIndex();
+        nNdPgPos = rAnchor.GetContentAnchor()->nNode.GetIndex();
         break;
     case FLY_AS_CHAR:
     case FLY_AT_CHAR:
         {
-            const SwPosition* pPos = rAnchor.GetCntntAnchor();
+            const SwPosition* pPos = rAnchor.GetContentAnchor();
             nCntPos = pPos->nContent.GetIndex();
             nNdPgPos = pPos->nNode.GetIndex();
         }
@@ -253,25 +253,25 @@ SwUndoInsLayFmt::SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, sal_Int
     }
 }
 
-SwUndoInsLayFmt::~SwUndoInsLayFmt()
+SwUndoInsLayFormat::~SwUndoInsLayFormat()
 {
 }
 
-void SwUndoInsLayFmt::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoInsLayFormat::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc(rContext.GetDoc());
-    const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-    if( rCntnt.GetCntntIdx() )  // no content
+    const SwFormatContent& rContent = pFrameFormat->GetContent();
+    if( rContent.GetContentIdx() )  // no content
     {
         bool bRemoveIdx = true;
         if( mnCrsrSaveIndexPara > 0 )
         {
-            SwTxtNode *const pNode =
-                rDoc.GetNodes()[mnCrsrSaveIndexPara]->GetTxtNode();
+            SwTextNode *const pNode =
+                rDoc.GetNodes()[mnCrsrSaveIndexPara]->GetTextNode();
             if( pNode )
             {
                 SwNodeIndex aIdx( rDoc.GetNodes(),
-                        rCntnt.GetCntntIdx()->GetIndex() );
+                        rContent.GetContentIdx()->GetIndex() );
                 SwNodeIndex aEndIdx( rDoc.GetNodes(),
                         aIdx.GetNode().EndOfSectionIndex() );
                 SwIndex aIndex( pNode, mnCrsrSaveIndexPos );
@@ -282,22 +282,22 @@ void SwUndoInsLayFmt::UndoImpl(::sw::UndoRedoContext & rContext)
         }
         if( bRemoveIdx )
         {
-            RemoveIdxFromSection( rDoc, rCntnt.GetCntntIdx()->GetIndex() );
+            RemoveIdxFromSection( rDoc, rContent.GetContentIdx()->GetIndex() );
         }
     }
     DelFly(& rDoc);
 }
 
-void SwUndoInsLayFmt::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoInsLayFormat::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     InsFly(rContext);
 }
 
-void SwUndoInsLayFmt::RepeatImpl(::sw::RepeatContext & rContext)
+void SwUndoInsLayFormat::RepeatImpl(::sw::RepeatContext & rContext)
 {
     SwDoc *const pDoc = & rContext.GetDoc();
     // get anchor and reset it
-    SwFmtAnchor aAnchor( pFrmFmt->GetAnchor() );
+    SwFormatAnchor aAnchor( pFrameFormat->GetAnchor() );
     if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
         (FLY_AT_CHAR == aAnchor.GetAnchorId()) ||
         (FLY_AS_CHAR == aAnchor.GetAnchorId()))
@@ -331,17 +331,17 @@ void SwUndoInsLayFmt::RepeatImpl(::sw::RepeatContext & rContext)
         OSL_FAIL( "What kind of anchor is this?" );
     }
 
-    SwFrmFmt* pFlyFmt = pDoc->getIDocumentLayoutAccess().CopyLayoutFmt( *pFrmFmt, aAnchor, true, true );
-    (void) pFlyFmt;
+    SwFrameFormat* pFlyFormat = pDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFrameFormat, aAnchor, true, true );
+    (void) pFlyFormat;
 }
 
 // #111827#
-OUString SwUndoInsLayFmt::GetComment() const
+OUString SwUndoInsLayFormat::GetComment() const
 {
     OUString aResult;
 
     // HACK: disable caching:
-    // the SfxUndoManager calls GetComment() too early: the pFrmFmt does not
+    // the SfxUndoManager calls GetComment() too early: the pFrameFormat does not
     // have a SwDrawContact yet, so it will fall back to SwUndo::GetComment(),
     // which sets pComment to a wrong value.
 //    if (! pComment)
@@ -352,9 +352,9 @@ OUString SwUndoInsLayFmt::GetComment() const
           comment of the SdrObject. Otherwise use the default comment.
         */
         bool bDone = false;
-        if (pFrmFmt)
+        if (pFrameFormat)
         {
-            const SdrObject * pSdrObj = pFrmFmt->FindSdrObject();
+            const SdrObject * pSdrObj = pFrameFormat->FindSdrObject();
             if ( pSdrObj )
             {
                 aResult = SdrUndoNewObj::GetComment( *pSdrObj );
@@ -372,20 +372,20 @@ OUString SwUndoInsLayFmt::GetComment() const
 }
 
 static SwUndoId
-lcl_GetSwUndoId(SwFrmFmt *const pFrmFmt)
+lcl_GetSwUndoId(SwFrameFormat *const pFrameFormat)
 {
-    if (RES_DRAWFRMFMT != pFrmFmt->Which())
+    if (RES_DRAWFRMFMT != pFrameFormat->Which())
     {
-        const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-        OSL_ENSURE( rCntnt.GetCntntIdx(), "Fly without content" );
+        const SwFormatContent& rContent = pFrameFormat->GetContent();
+        OSL_ENSURE( rContent.GetContentIdx(), "Fly without content" );
 
-        SwNodeIndex firstNode(*rCntnt.GetCntntIdx(), 1);
-        SwNoTxtNode *const pNoTxtNode(firstNode.GetNode().GetNoTxtNode());
-        if (pNoTxtNode && pNoTxtNode->IsGrfNode())
+        SwNodeIndex firstNode(*rContent.GetContentIdx(), 1);
+        SwNoTextNode *const pNoTextNode(firstNode.GetNode().GetNoTextNode());
+        if (pNoTextNode && pNoTextNode->IsGrfNode())
         {
             return UNDO_DELGRF;
         }
-        else if (pNoTxtNode && pNoTxtNode->IsOLENode())
+        else if (pNoTextNode && pNoTextNode->IsOLENode())
         {
             // surprisingly not UNDO_DELOLE, which does not seem to work
             return UNDO_DELETE;
@@ -394,7 +394,7 @@ lcl_GetSwUndoId(SwFrmFmt *const pFrmFmt)
     return UNDO_DELLAYFMT;
 }
 
-SwUndoDelLayFmt::SwUndoDelLayFmt( SwFrmFmt* pFormat )
+SwUndoDelLayFormat::SwUndoDelLayFormat( SwFrameFormat* pFormat )
     : SwUndoFlyBase( pFormat, lcl_GetSwUndoId(pFormat) )
     , bShowSelFrm( true )
 {
@@ -402,11 +402,11 @@ SwUndoDelLayFmt::SwUndoDelLayFmt( SwFrmFmt* pFormat )
     DelFly( pDoc );
 }
 
-SwRewriter SwUndoDelLayFmt::GetRewriter() const
+SwRewriter SwUndoDelLayFormat::GetRewriter() const
 {
     SwRewriter aRewriter;
 
-    SwDoc * pDoc = pFrmFmt->GetDoc();
+    SwDoc * pDoc = pFrameFormat->GetDoc();
 
     if (pDoc)
     {
@@ -415,7 +415,7 @@ SwRewriter SwUndoDelLayFmt::GetRewriter() const
         {
             SwNode *const pNd = & pIdx->GetNode();
 
-            if ( pNd->IsNoTxtNode() && pNd->IsOLENode())
+            if ( pNd->IsNoTextNode() && pNd->IsOLENode())
             {
                 SwOLENode * pOLENd = pNd->GetOLENode();
 
@@ -427,76 +427,76 @@ SwRewriter SwUndoDelLayFmt::GetRewriter() const
     return aRewriter;
 }
 
-void SwUndoDelLayFmt::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoDelLayFormat::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     InsFly( rContext, bShowSelFrm );
 }
 
-void SwUndoDelLayFmt::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoDelLayFormat::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc(rContext.GetDoc());
-    const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-    if( rCntnt.GetCntntIdx() )  // no content
+    const SwFormatContent& rContent = pFrameFormat->GetContent();
+    if( rContent.GetContentIdx() )  // no content
     {
-        RemoveIdxFromSection(rDoc, rCntnt.GetCntntIdx()->GetIndex());
+        RemoveIdxFromSection(rDoc, rContent.GetContentIdx()->GetIndex());
     }
 
     DelFly(& rDoc);
 }
 
-void SwUndoDelLayFmt::RedoForRollback()
+void SwUndoDelLayFormat::RedoForRollback()
 {
-    const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-    if( rCntnt.GetCntntIdx() )  // no content
-        RemoveIdxFromSection( *pFrmFmt->GetDoc(),
-                                rCntnt.GetCntntIdx()->GetIndex() );
+    const SwFormatContent& rContent = pFrameFormat->GetContent();
+    if( rContent.GetContentIdx() )  // no content
+        RemoveIdxFromSection( *pFrameFormat->GetDoc(),
+                                rContent.GetContentIdx()->GetIndex() );
 
-    DelFly( pFrmFmt->GetDoc() );
+    DelFly( pFrameFormat->GetDoc() );
 }
 
-SwUndoSetFlyFmt::SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt )
-    : SwUndo( UNDO_SETFLYFRMFMT ), SwClient( &rFlyFmt ), pFrmFmt( &rFlyFmt ),
-    pOldFmt( static_cast<SwFrmFmt*>(rFlyFmt.DerivedFrom()) ), pNewFmt( &rNewFrmFmt ),
-    pItemSet( new SfxItemSet( *rFlyFmt.GetAttrSet().GetPool(),
-                                rFlyFmt.GetAttrSet().GetRanges() )),
+SwUndoSetFlyFormat::SwUndoSetFlyFormat( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFrameFormat )
+    : SwUndo( UNDO_SETFLYFRMFMT ), SwClient( &rFlyFormat ), pFrameFormat( &rFlyFormat ),
+    pOldFormat( static_cast<SwFrameFormat*>(rFlyFormat.DerivedFrom()) ), pNewFormat( &rNewFrameFormat ),
+    pItemSet( new SfxItemSet( *rFlyFormat.GetAttrSet().GetPool(),
+                                rFlyFormat.GetAttrSet().GetRanges() )),
     nOldNode( 0 ), nNewNode( 0 ),
-    nOldCntnt( 0 ), nNewCntnt( 0 ),
+    nOldContent( 0 ), nNewContent( 0 ),
     nOldAnchorTyp( 0 ), nNewAnchorTyp( 0 ), bAnchorChgd( false )
 {
 }
 
-SwRewriter SwUndoSetFlyFmt::GetRewriter() const
+SwRewriter SwUndoSetFlyFormat::GetRewriter() const
 {
     SwRewriter aRewriter;
 
-    if (pNewFmt)
-        aRewriter.AddRule(UndoArg1, pNewFmt->GetName());
+    if (pNewFormat)
+        aRewriter.AddRule(UndoArg1, pNewFormat->GetName());
 
     return aRewriter;
 }
 
-SwUndoSetFlyFmt::~SwUndoSetFlyFmt()
+SwUndoSetFlyFormat::~SwUndoSetFlyFormat()
 {
     delete pItemSet;
 }
 
-void SwUndoSetFlyFmt::DeRegisterFromFormat( SwFmt& rFmt )
+void SwUndoSetFlyFormat::DeRegisterFromFormat( SwFormat& rFormat )
 {
-    rFmt.Remove(this);
+    rFormat.Remove(this);
 }
 
-void SwUndoSetFlyFmt::GetAnchor( SwFmtAnchor& rAnchor,
-                                sal_uLong nNode, sal_Int32 nCntnt )
+void SwUndoSetFlyFormat::GetAnchor( SwFormatAnchor& rAnchor,
+                                sal_uLong nNode, sal_Int32 nContent )
 {
     RndStdIds nAnchorTyp = rAnchor.GetAnchorId();
     if (FLY_AT_PAGE != nAnchorTyp)
     {
-        SwNode* pNd = pFrmFmt->GetDoc()->GetNodes()[ nNode ];
+        SwNode* pNd = pFrameFormat->GetDoc()->GetNodes()[ nNode ];
 
         if( FLY_AT_FLY == nAnchorTyp
                 ? ( !pNd->IsStartNode() || SwFlyStartNode !=
                     static_cast<SwStartNode*>(pNd)->GetStartNodeType() )
-                : !pNd->IsTxtNode() )
+                : !pNd->IsTextNode() )
         {
             pNd = 0;    // invalid position
         }
@@ -506,13 +506,13 @@ void SwUndoSetFlyFmt::GetAnchor( SwFmtAnchor& rAnchor,
             if ((FLY_AS_CHAR == nAnchorTyp) ||
                 (FLY_AT_CHAR == nAnchorTyp))
             {
-                if (nCntnt > pNd->GetTxtNode()->GetTxt().getLength())
+                if (nContent > pNd->GetTextNode()->GetText().getLength())
                 {
                     pNd = 0;    // invalid position
                 }
                 else
                 {
-                    aPos.nContent.Assign(pNd->GetTxtNode(), nCntnt);
+                    aPos.nContent.Assign(pNd->GetTextNode(), nContent);
                 }
             }
             if ( pNd )
@@ -529,31 +529,31 @@ void SwUndoSetFlyFmt::GetAnchor( SwFmtAnchor& rAnchor,
         }
     }
     else
-        rAnchor.SetPageNum( nCntnt );
+        rAnchor.SetPageNum( nContent );
 }
 
-void SwUndoSetFlyFmt::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoSetFlyFormat::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
 
     // Is the new Format still existent?
-    if( rDoc.GetFrmFmts()->Contains( pOldFmt ) )
+    if( rDoc.GetFrameFormats()->Contains( pOldFormat ) )
     {
         if( bAnchorChgd )
-            pFrmFmt->DelFrms();
+            pFrameFormat->DelFrms();
 
-        if( pFrmFmt->DerivedFrom() != pOldFmt )
-            pFrmFmt->SetDerivedFrom( pOldFmt );
+        if( pFrameFormat->DerivedFrom() != pOldFormat )
+            pFrameFormat->SetDerivedFrom( pOldFormat );
 
         SfxItemIter aIter( *pItemSet );
         const SfxPoolItem* pItem = aIter.GetCurItem();
         while( pItem )
         {
             if( IsInvalidItem( pItem ))
-                pFrmFmt->ResetFmtAttr( pItemSet->GetWhichByPos(
+                pFrameFormat->ResetFormatAttr( pItemSet->GetWhichByPos(
                                         aIter.GetCurPos() ));
             else
-                pFrmFmt->SetFmtAttr( *pItem );
+                pFrameFormat->SetFormatAttr( *pItem );
 
             if( aIter.IsAtEnd() )
                 break;
@@ -562,73 +562,73 @@ void SwUndoSetFlyFmt::UndoImpl(::sw::UndoRedoContext & rContext)
 
         if( bAnchorChgd )
         {
-            const SwFmtAnchor& rOldAnch = pFrmFmt->GetAnchor();
+            const SwFormatAnchor& rOldAnch = pFrameFormat->GetAnchor();
             if (FLY_AS_CHAR == rOldAnch.GetAnchorId())
             {
-                // With InCntnts it's tricky: the text attribute needs to be
+                // With InContents it's tricky: the text attribute needs to be
                 // deleted. Unfortunately, this not only destroys the Frms but
                 // also the format. To prevent that, first detach the
                 // connection between attribute and format.
-                const SwPosition *pPos = rOldAnch.GetCntntAnchor();
-                SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-                OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+                const SwPosition *pPos = rOldAnch.GetContentAnchor();
+                SwTextNode *pTextNode = pPos->nNode.GetNode().GetTextNode();
+                OSL_ENSURE( pTextNode->HasHints(), "Missing FlyInCnt-Hint." );
                 const sal_Int32 nIdx = pPos->nContent.GetIndex();
-                SwTxtAttr * pHnt = pTxtNode->GetTxtAttrForCharAt(
+                SwTextAttr * pHint = pTextNode->GetTextAttrForCharAt(
                         nIdx, RES_TXTATR_FLYCNT );
-                OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+                OSL_ENSURE( pHint && pHint->Which() == RES_TXTATR_FLYCNT,
                             "Missing FlyInCnt-Hint." );
-                OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pFrmFmt,
-                            "Wrong TxtFlyCnt-Hint." );
-                const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
+                OSL_ENSURE( pHint && pHint->GetFlyCnt().GetFrameFormat() == pFrameFormat,
+                            "Wrong TextFlyCnt-Hint." );
+                const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt()).SetFlyFormat();
 
                 // Connection is now detached, therefore the attribute can be
                 // deleted
-                pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
+                pTextNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
             }
 
             // reposition anchor
-            SwFmtAnchor aNewAnchor( (RndStdIds) nOldAnchorTyp );
-            GetAnchor( aNewAnchor, nOldNode, nOldCntnt );
-            pFrmFmt->SetFmtAttr( aNewAnchor );
+            SwFormatAnchor aNewAnchor( (RndStdIds) nOldAnchorTyp );
+            GetAnchor( aNewAnchor, nOldNode, nOldContent );
+            pFrameFormat->SetFormatAttr( aNewAnchor );
 
             if (FLY_AS_CHAR == aNewAnchor.GetAnchorId())
             {
-                const SwPosition* pPos = aNewAnchor.GetCntntAnchor();
-                SwFmtFlyCnt aFmt( pFrmFmt );
-                pPos->nNode.GetNode().GetTxtNode()->InsertItem( aFmt,
-                    nOldCntnt, 0 );
+                const SwPosition* pPos = aNewAnchor.GetContentAnchor();
+                SwFormatFlyCnt aFormat( pFrameFormat );
+                pPos->nNode.GetNode().GetTextNode()->InsertItem( aFormat,
+                    nOldContent, 0 );
             }
 
-            pFrmFmt->MakeFrms();
+            pFrameFormat->MakeFrms();
         }
-        rContext.SetSelections(pFrmFmt, 0);
+        rContext.SetSelections(pFrameFormat, 0);
     }
 }
 
-void SwUndoSetFlyFmt::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoSetFlyFormat::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
 
     // Is the new Format still existent?
-    if( rDoc.GetFrmFmts()->Contains( pNewFmt ) )
+    if( rDoc.GetFrameFormats()->Contains( pNewFormat ) )
     {
 
         if( bAnchorChgd )
         {
-            SwFmtAnchor aNewAnchor( (RndStdIds) nNewAnchorTyp );
-            GetAnchor( aNewAnchor, nNewNode, nNewCntnt );
-            SfxItemSet aSet( rDoc.GetAttrPool(), aFrmFmtSetRange );
+            SwFormatAnchor aNewAnchor( (RndStdIds) nNewAnchorTyp );
+            GetAnchor( aNewAnchor, nNewNode, nNewContent );
+            SfxItemSet aSet( rDoc.GetAttrPool(), aFrameFormatSetRange );
             aSet.Put( aNewAnchor );
-            rDoc.SetFrmFmtToFly( *pFrmFmt, *pNewFmt, &aSet );
+            rDoc.SetFrameFormatToFly( *pFrameFormat, *pNewFormat, &aSet );
         }
         else
-            rDoc.SetFrmFmtToFly( *pFrmFmt, *pNewFmt, 0 );
+            rDoc.SetFrameFormatToFly( *pFrameFormat, *pNewFormat, 0 );
 
-        rContext.SetSelections(pFrmFmt, 0);
+        rContext.SetSelections(pFrameFormat, 0);
     }
 }
 
-void SwUndoSetFlyFmt::PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem )
+void SwUndoSetFlyFormat::PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem )
 {
     if( pItem && pItem != GetDfltAttr( nWhich ) )
     {
@@ -640,36 +640,36 @@ void SwUndoSetFlyFmt::PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem )
 
             bAnchorChgd = true;
 
-            const SwFmtAnchor* pAnchor = static_cast<const SwFmtAnchor*>(pItem);
+            const SwFormatAnchor* pAnchor = static_cast<const SwFormatAnchor*>(pItem);
             switch( nOldAnchorTyp = static_cast<sal_uInt16>(pAnchor->GetAnchorId()) )
             {
             case FLY_AS_CHAR:
             case FLY_AT_CHAR:
-                nOldCntnt = pAnchor->GetCntntAnchor()->nContent.GetIndex();
+                nOldContent = pAnchor->GetContentAnchor()->nContent.GetIndex();
                 //fall-through
             case FLY_AT_PARA:
             case FLY_AT_FLY:
-                nOldNode = pAnchor->GetCntntAnchor()->nNode.GetIndex();
+                nOldNode = pAnchor->GetContentAnchor()->nNode.GetIndex();
                 break;
 
             default:
-                nOldCntnt = pAnchor->GetPageNum();
+                nOldContent = pAnchor->GetPageNum();
             }
 
-            pAnchor = &pFrmFmt->GetAnchor();
+            pAnchor = &pFrameFormat->GetAnchor();
             switch( nNewAnchorTyp = static_cast<sal_uInt16>(pAnchor->GetAnchorId()) )
             {
             case FLY_AS_CHAR:
             case FLY_AT_CHAR:
-                nNewCntnt = pAnchor->GetCntntAnchor()->nContent.GetIndex();
+                nNewContent = pAnchor->GetContentAnchor()->nContent.GetIndex();
                 //fall-through
             case FLY_AT_PARA:
             case FLY_AT_FLY:
-                nNewNode = pAnchor->GetCntntAnchor()->nNode.GetIndex();
+                nNewNode = pAnchor->GetContentAnchor()->nNode.GetIndex();
                 break;
 
             default:
-                nNewCntnt = pAnchor->GetPageNum();
+                nNewContent = pAnchor->GetPageNum();
             }
         }
         else
@@ -679,7 +679,7 @@ void SwUndoSetFlyFmt::PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem )
         pItemSet->InvalidateItem( nWhich );
 }
 
-void SwUndoSetFlyFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* )
+void SwUndoSetFlyFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* )
 {
     if( pOld )
     {
diff --git a/sw/source/core/undo/undoflystrattr.cxx b/sw/source/core/undo/undoflystrattr.cxx
index 3993ef2f6728..76bff54e965b 100644
--- a/sw/source/core/undo/undoflystrattr.cxx
+++ b/sw/source/core/undo/undoflystrattr.cxx
@@ -21,12 +21,12 @@
 #include <frmfmt.hxx>
 
 
-SwUndoFlyStrAttr::SwUndoFlyStrAttr( SwFlyFrmFmt& rFlyFrmFmt,
+SwUndoFlyStrAttr::SwUndoFlyStrAttr( SwFlyFrameFormat& rFlyFrameFormat,
                                     const SwUndoId eUndoId,
                                     const OUString& sOldStr,
                                     const OUString& sNewStr )
     : SwUndo( eUndoId ),
-      mrFlyFrmFmt( rFlyFrmFmt ),
+      mrFlyFrameFormat( rFlyFrameFormat ),
       msOldStr( sOldStr ),
       msNewStr( sNewStr )
 {
@@ -44,12 +44,12 @@ void SwUndoFlyStrAttr::UndoImpl(::sw::UndoRedoContext &)
     {
         case UNDO_FLYFRMFMT_TITLE:
         {
-            mrFlyFrmFmt.SetObjTitle( msOldStr, true );
+            mrFlyFrameFormat.SetObjTitle( msOldStr, true );
         }
         break;
         case UNDO_FLYFRMFMT_DESCRIPTION:
         {
-            mrFlyFrmFmt.SetObjDescription( msOldStr, true );
+            mrFlyFrameFormat.SetObjDescription( msOldStr, true );
         }
         break;
         default:
@@ -64,12 +64,12 @@ void SwUndoFlyStrAttr::RedoImpl(::sw::UndoRedoContext &)
     {
         case UNDO_FLYFRMFMT_TITLE:
         {
-            mrFlyFrmFmt.SetObjTitle( msNewStr, true );
+            mrFlyFrameFormat.SetObjTitle( msNewStr, true );
         }
         break;
         case UNDO_FLYFRMFMT_DESCRIPTION:
         {
-            mrFlyFrmFmt.SetObjDescription( msNewStr, true );
+            mrFlyFrameFormat.SetObjDescription( msNewStr, true );
         }
         break;
         default:
@@ -82,7 +82,7 @@ SwRewriter SwUndoFlyStrAttr::GetRewriter() const
 {
     SwRewriter aResult;
 
-    aResult.AddRule( UndoArg1, mrFlyFrmFmt.GetName() );
+    aResult.AddRule( UndoArg1, mrFlyFrameFormat.GetName() );
 
     return aResult;
 }
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index ecbfd4fb128f..c054c9900d29 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -48,7 +48,7 @@
 
 struct SwUndoGroupObjImpl
 {
-    SwDrawFrmFmt* pFmt;
+    SwDrawFrameFormat* pFormat;
     SdrObject* pObj;
     sal_uLong nNodeIdx;
 };
@@ -108,110 +108,110 @@ OUString SwSdrUndo::GetComment() const
     return pSdrUndo->GetComment();
 }
 
-static void lcl_SendRemoveToUno( SwFmt& rFmt )
+static void lcl_SendRemoveToUno( SwFormat& rFormat )
 {
-    SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, &rFmt );
-    rFmt.ModifyNotification( &aMsgHint, &aMsgHint );
+    SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, &rFormat );
+    rFormat.ModifyNotification( &aMsgHint, &aMsgHint );
 }
 
-static void lcl_SaveAnchor( SwFrmFmt* pFmt, sal_uLong& rNodePos )
+static void lcl_SaveAnchor( SwFrameFormat* pFormat, sal_uLong& rNodePos )
 {
-    const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+    const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
     if ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
         (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
         (FLY_AT_FLY  == rAnchor.GetAnchorId()) ||
         (FLY_AS_CHAR == rAnchor.GetAnchorId()))
     {
-        rNodePos = rAnchor.GetCntntAnchor()->nNode.GetIndex();
-        sal_Int32 nCntntPos = 0;
+        rNodePos = rAnchor.GetContentAnchor()->nNode.GetIndex();
+        sal_Int32 nContentPos = 0;
 
         if (FLY_AS_CHAR == rAnchor.GetAnchorId())
         {
-            nCntntPos = rAnchor.GetCntntAnchor()->nContent.GetIndex();
+            nContentPos = rAnchor.GetContentAnchor()->nContent.GetIndex();
 
             // destroy TextAttribute
-            SwTxtNode *pTxtNd = pFmt->GetDoc()->GetNodes()[ rNodePos ]->GetTxtNode();
-            OSL_ENSURE( pTxtNd, "No text node found!" );
-            SwTxtFlyCnt* pAttr = static_cast<SwTxtFlyCnt*>(
-                pTxtNd->GetTxtAttrForCharAt( nCntntPos, RES_TXTATR_FLYCNT ));
+            SwTextNode *pTextNd = pFormat->GetDoc()->GetNodes()[ rNodePos ]->GetTextNode();
+            OSL_ENSURE( pTextNd, "No text node found!" );
+            SwTextFlyCnt* pAttr = static_cast<SwTextFlyCnt*>(
+                pTextNd->GetTextAttrForCharAt( nContentPos, RES_TXTATR_FLYCNT ));
             // attribute still in text node, delete
-            if( pAttr && pAttr->GetFlyCnt().GetFrmFmt() == pFmt )
+            if( pAttr && pAttr->GetFlyCnt().GetFrameFormat() == pFormat )
             {
                 // just set pointer to 0, don't delete
-                const_cast<SwFmtFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFmt();
-                SwIndex aIdx( pTxtNd, nCntntPos );
-                pTxtNd->EraseText( aIdx, 1 );
+                const_cast<SwFormatFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFormat();
+                SwIndex aIdx( pTextNd, nContentPos );
+                pTextNd->EraseText( aIdx, 1 );
             }
         }
         else if (FLY_AT_CHAR == rAnchor.GetAnchorId())
         {
-            nCntntPos = rAnchor.GetCntntAnchor()->nContent.GetIndex();
+            nContentPos = rAnchor.GetContentAnchor()->nContent.GetIndex();
         }
 
-        pFmt->SetFmtAttr( SwFmtAnchor( rAnchor.GetAnchorId(), nCntntPos ) );
+        pFormat->SetFormatAttr( SwFormatAnchor( rAnchor.GetAnchorId(), nContentPos ) );
     }
 }
 
-static void lcl_RestoreAnchor( SwFrmFmt* pFmt, sal_uLong& rNodePos )
+static void lcl_RestoreAnchor( SwFrameFormat* pFormat, sal_uLong& rNodePos )
 {
-    const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+    const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
     if ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
         (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
         (FLY_AT_FLY  == rAnchor.GetAnchorId()) ||
         (FLY_AS_CHAR == rAnchor.GetAnchorId()))
     {
-        const sal_Int32 nCntntPos = rAnchor.GetPageNum();
-        SwNodes& rNds = pFmt->GetDoc()->GetNodes();
+        const sal_Int32 nContentPos = rAnchor.GetPageNum();
+        SwNodes& rNds = pFormat->GetDoc()->GetNodes();
 
         SwNodeIndex aIdx( rNds, rNodePos );
         SwPosition aPos( aIdx );
 
-        SwFmtAnchor aTmp( rAnchor.GetAnchorId() );
+        SwFormatAnchor aTmp( rAnchor.GetAnchorId() );
         if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) ||
             (FLY_AT_CHAR == rAnchor.GetAnchorId()))
         {
-            aPos.nContent.Assign( aIdx.GetNode().GetCntntNode(), nCntntPos );
+            aPos.nContent.Assign( aIdx.GetNode().GetContentNode(), nContentPos );
         }
         aTmp.SetAnchor( &aPos );
-        pFmt->SetFmtAttr( aTmp );
+        pFormat->SetFormatAttr( aTmp );
 
         if (FLY_AS_CHAR == rAnchor.GetAnchorId())
         {
-            SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
-            OSL_ENSURE( pTxtNd, "no Text Node" );
-            SwFmtFlyCnt aFmt( pFmt );
-            pTxtNd->InsertItem( aFmt, nCntntPos, nCntntPos );
+            SwTextNode *pTextNd = aIdx.GetNode().GetTextNode();
+            OSL_ENSURE( pTextNd, "no Text Node" );
+            SwFormatFlyCnt aFormat( pFormat );
+            pTextNd->InsertItem( aFormat, nContentPos, nContentPos );
         }
     }
 }
 
 SwUndoDrawGroup::SwUndoDrawGroup( sal_uInt16 nCnt )
-    : SwUndo( UNDO_DRAWGROUP ), nSize( nCnt + 1 ), bDelFmt( true )
+    : SwUndo( UNDO_DRAWGROUP ), nSize( nCnt + 1 ), bDelFormat( true )
 {
     pObjArr = new SwUndoGroupObjImpl[ nSize ];
 }
 
 SwUndoDrawGroup::~SwUndoDrawGroup()
 {
-    if( bDelFmt )
+    if( bDelFormat )
     {
         SwUndoGroupObjImpl* pTmp = pObjArr + 1;
         for( sal_uInt16 n = 1; n < nSize; ++n, ++pTmp )
-            delete pTmp->pFmt;
+            delete pTmp->pFormat;
     }
     else
-        delete pObjArr->pFmt;
+        delete pObjArr->pFormat;
 
     delete [] pObjArr;
 }
 
 void SwUndoDrawGroup::UndoImpl(::sw::UndoRedoContext &)
 {
-    bDelFmt = false;
+    bDelFormat = false;
 
     // save group object
-    SwDrawFrmFmt* pFmt = pObjArr->pFmt;
-    SwDrawContact* pDrawContact = static_cast<SwDrawContact*>(pFmt->FindContactObj());
+    SwDrawFrameFormat* pFormat = pObjArr->pFormat;
+    SwDrawContact* pDrawContact = static_cast<SwDrawContact*>(pFormat->FindContactObj());
     SdrObject* pObj = pDrawContact->GetMaster();
     pObjArr->pObj = pObj;
 
@@ -219,46 +219,46 @@ void SwUndoDrawGroup::UndoImpl(::sw::UndoRedoContext &)
     pDrawContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
     pObj->SetUserCall( 0 );
 
-    ::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
+    ::lcl_SaveAnchor( pFormat, pObjArr->nNodeIdx );
 
     // notify UNO objects to decouple
-    ::lcl_SendRemoveToUno( *pFmt );
+    ::lcl_SendRemoveToUno( *pFormat );
 
     // remove from array
-    SwDoc* pDoc = pFmt->GetDoc();
-    SwFrmFmts& rFlyFmts = *pDoc->GetSpzFrmFmts();
-    rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
+    SwDoc* pDoc = pFormat->GetDoc();
+    SwFrameFormats& rFlyFormats = *pDoc->GetSpzFrameFormats();
+    rFlyFormats.erase( std::find( rFlyFormats.begin(), rFlyFormats.end(), pFormat ));
 
     for( sal_uInt16 n = 1; n < nSize; ++n )
     {
         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
 
-        ::lcl_RestoreAnchor( rSave.pFmt, rSave.nNodeIdx );
-        rFlyFmts.push_back( rSave.pFmt );
+        ::lcl_RestoreAnchor( rSave.pFormat, rSave.nNodeIdx );
+        rFlyFormats.push_back( rSave.pFormat );
 
         pObj = rSave.pObj;
 
-        SwDrawContact *pContact = new SwDrawContact( rSave.pFmt, pObj );
+        SwDrawContact *pContact = new SwDrawContact( rSave.pFormat, pObj );
         pContact->ConnectToLayout();
         // #i45718# - follow-up of #i35635# move object to visible layer
         pContact->MoveObjToVisibleLayer( pObj );
         // #i45952# - notify that position attributes are already set
-        OSL_ENSURE( rSave.pFmt->ISA(SwDrawFrmFmt),
+        OSL_ENSURE( rSave.pFormat->ISA(SwDrawFrameFormat),
                 "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
-        if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
+        if ( rSave.pFormat->ISA(SwDrawFrameFormat) )
         {
-            static_cast<SwDrawFrmFmt*>(rSave.pFmt)->PosAttrSet();
+            static_cast<SwDrawFrameFormat*>(rSave.pFormat)->PosAttrSet();
         }
     }
 }
 
 void SwUndoDrawGroup::RedoImpl(::sw::UndoRedoContext &)
 {
-    bDelFmt = true;
+    bDelFormat = true;
 
     // remove from array
-    SwDoc* pDoc = pObjArr->pFmt->GetDoc();
-    SwFrmFmts& rFlyFmts = *pDoc->GetSpzFrmFmts();
+    SwDoc* pDoc = pObjArr->pFormat->GetDoc();
+    SwFrameFormats& rFlyFormats = *pDoc->GetSpzFrameFormats();
 
     for( sal_uInt16 n = 1; n < nSize; ++n )
     {
@@ -272,174 +272,174 @@ void SwUndoDrawGroup::RedoImpl(::sw::UndoRedoContext &)
         pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
         pObj->SetUserCall( 0 );
 
-        ::lcl_SaveAnchor( rSave.pFmt, rSave.nNodeIdx );
+        ::lcl_SaveAnchor( rSave.pFormat, rSave.nNodeIdx );
 
         // notify UNO objects to decouple
-        ::lcl_SendRemoveToUno( *rSave.pFmt );
+        ::lcl_SendRemoveToUno( *rSave.pFormat );
 
-        rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), rSave.pFmt ));
+        rFlyFormats.erase( std::find( rFlyFormats.begin(), rFlyFormats.end(), rSave.pFormat ));
     }
 
     // re-insert group object
-    ::lcl_RestoreAnchor( pObjArr->pFmt, pObjArr->nNodeIdx );
-    rFlyFmts.push_back( pObjArr->pFmt );
+    ::lcl_RestoreAnchor( pObjArr->pFormat, pObjArr->nNodeIdx );
+    rFlyFormats.push_back( pObjArr->pFormat );
 
-    SwDrawContact *pContact = new SwDrawContact( pObjArr->pFmt, pObjArr->pObj );
+    SwDrawContact *pContact = new SwDrawContact( pObjArr->pFormat, pObjArr->pObj );
     // #i26791# - correction: connect object to layout
     pContact->ConnectToLayout();
     // #i45718# - follow-up of #i35635# move object to visible layer
     pContact->MoveObjToVisibleLayer( pObjArr->pObj );
     // #i45952# - notify that position attributes are already set
-    OSL_ENSURE( pObjArr->pFmt->ISA(SwDrawFrmFmt),
+    OSL_ENSURE( pObjArr->pFormat->ISA(SwDrawFrameFormat),
             "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
-    if ( pObjArr->pFmt->ISA(SwDrawFrmFmt) )
+    if ( pObjArr->pFormat->ISA(SwDrawFrameFormat) )
     {
-        static_cast<SwDrawFrmFmt*>(pObjArr->pFmt)->PosAttrSet();
+        static_cast<SwDrawFrameFormat*>(pObjArr->pFormat)->PosAttrSet();
     }
 }
 
-void SwUndoDrawGroup::AddObj( sal_uInt16 nPos, SwDrawFrmFmt* pFmt, SdrObject* pObj )
+void SwUndoDrawGroup::AddObj( sal_uInt16 nPos, SwDrawFrameFormat* pFormat, SdrObject* pObj )
 {
     SwUndoGroupObjImpl& rSave = *( pObjArr + nPos + 1 );
     rSave.pObj = pObj;
-    rSave.pFmt = pFmt;
-    ::lcl_SaveAnchor( pFmt, rSave.nNodeIdx );
+    rSave.pFormat = pFormat;
+    ::lcl_SaveAnchor( pFormat, rSave.nNodeIdx );
 
        // notify UNO objects to decouple
-    ::lcl_SendRemoveToUno( *pFmt );
+    ::lcl_SendRemoveToUno( *pFormat );
 
     // remove from array
-    SwFrmFmts& rFlyFmts = *pFmt->GetDoc()->GetSpzFrmFmts();
-    rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
+    SwFrameFormats& rFlyFormats = *pFormat->GetDoc()->GetSpzFrameFormats();
+    rFlyFormats.erase( std::find( rFlyFormats.begin(), rFlyFormats.end(), pFormat ));
 }
 
-void SwUndoDrawGroup::SetGroupFmt( SwDrawFrmFmt* pFmt )
+void SwUndoDrawGroup::SetGroupFormat( SwDrawFrameFormat* pFormat )
 {
     pObjArr->pObj = 0;
-    pObjArr->pFmt = pFmt;
+    pObjArr->pFormat = pFormat;
 }
 
 SwUndoDrawUnGroup::SwUndoDrawUnGroup( SdrObjGroup* pObj )
-    : SwUndo( UNDO_DRAWUNGROUP ), bDelFmt( false )
+    : SwUndo( UNDO_DRAWUNGROUP ), bDelFormat( false )
 {
     nSize = (sal_uInt16)pObj->GetSubList()->GetObjCount() + 1;
     pObjArr = new SwUndoGroupObjImpl[ nSize ];
 
     SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
-    SwDrawFrmFmt* pFmt = static_cast<SwDrawFrmFmt*>(pContact->GetFmt());
+    SwDrawFrameFormat* pFormat = static_cast<SwDrawFrameFormat*>(pContact->GetFormat());
 
     pObjArr->pObj = pObj;
-    pObjArr->pFmt = pFmt;
+    pObjArr->pFormat = pFormat;
 
     // object will destroy itself
     pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
     pObj->SetUserCall( 0 );
 
-    ::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
+    ::lcl_SaveAnchor( pFormat, pObjArr->nNodeIdx );
 
        // notify UNO objects to decouple
-    ::lcl_SendRemoveToUno( *pFmt );
+    ::lcl_SendRemoveToUno( *pFormat );
 
     // remove from array
-    SwFrmFmts& rFlyFmts = *pFmt->GetDoc()->GetSpzFrmFmts();
-    rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
+    SwFrameFormats& rFlyFormats = *pFormat->GetDoc()->GetSpzFrameFormats();
+    rFlyFormats.erase( std::find( rFlyFormats.begin(), rFlyFormats.end(), pFormat ));
 }
 
 SwUndoDrawUnGroup::~SwUndoDrawUnGroup()
 {
-    if( bDelFmt )
+    if( bDelFormat )
     {
         SwUndoGroupObjImpl* pTmp = pObjArr + 1;
         for( sal_uInt16 n = 1; n < nSize; ++n, ++pTmp )
-            delete pTmp->pFmt;
+            delete pTmp->pFormat;
     }
     else
-        delete pObjArr->pFmt;
+        delete pObjArr->pFormat;
 
     delete [] pObjArr;
 }
 
 void SwUndoDrawUnGroup::UndoImpl(::sw::UndoRedoContext & rContext)
 {
-    bDelFmt = true;
+    bDelFormat = true;
 
     SwDoc *const pDoc = & rContext.GetDoc();
-    SwFrmFmts& rFlyFmts = *pDoc->GetSpzFrmFmts();
+    SwFrameFormats& rFlyFormats = *pDoc->GetSpzFrameFormats();
 
     // remove from array
     for( sal_uInt16 n = 1; n < nSize; ++n )
     {
         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
 
-        ::lcl_SaveAnchor( rSave.pFmt, rSave.nNodeIdx );
+        ::lcl_SaveAnchor( rSave.pFormat, rSave.nNodeIdx );
 
            // notify UNO objects to decouple
-        ::lcl_SendRemoveToUno( *rSave.pFmt );
+        ::lcl_SendRemoveToUno( *rSave.pFormat );
 
-        rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), rSave.pFmt ));
+        rFlyFormats.erase( std::find( rFlyFormats.begin(), rFlyFormats.end(), rSave.pFormat ));
     }
 
     // re-insert group object
-    ::lcl_RestoreAnchor( pObjArr->pFmt, pObjArr->nNodeIdx );
-    rFlyFmts.push_back( pObjArr->pFmt );
+    ::lcl_RestoreAnchor( pObjArr->pFormat, pObjArr->nNodeIdx );
+    rFlyFormats.push_back( pObjArr->pFormat );
 
-    SwDrawContact *pContact = new SwDrawContact( pObjArr->pFmt, pObjArr->pObj );
+    SwDrawContact *pContact = new SwDrawContact( pObjArr->pFormat, pObjArr->pObj );
     pContact->ConnectToLayout();
     // #i45718# - follow-up of #i35635# move object to visible layer
     pContact->MoveObjToVisibleLayer( pObjArr->pObj );
     // #i45952# - notify that position attributes are already set
-    OSL_ENSURE( pObjArr->pFmt->ISA(SwDrawFrmFmt),
+    OSL_ENSURE( pObjArr->pFormat->ISA(SwDrawFrameFormat),
             "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
-    if ( pObjArr->pFmt->ISA(SwDrawFrmFmt) )
+    if ( pObjArr->pFormat->ISA(SwDrawFrameFormat) )
     {
-        static_cast<SwDrawFrmFmt*>(pObjArr->pFmt)->PosAttrSet();
+        static_cast<SwDrawFrameFormat*>(pObjArr->pFormat)->PosAttrSet();
     }
 }
 
 void SwUndoDrawUnGroup::RedoImpl(::sw::UndoRedoContext &)
 {
-    bDelFmt = false;
+    bDelFormat = false;
 
     // save group object
-    SwDrawFrmFmt* pFmt = pObjArr->pFmt;
-    SwDrawContact* pContact = static_cast<SwDrawContact*>(pFmt->FindContactObj());
+    SwDrawFrameFormat* pFormat = pObjArr->pFormat;
+    SwDrawContact* pContact = static_cast<SwDrawContact*>(pFormat->FindContactObj());
 
         // object will destroy itself
     pContact->Changed( *pObjArr->pObj, SDRUSERCALL_DELETE,
         pObjArr->pObj->GetLastBoundRect() );
     pObjArr->pObj->SetUserCall( 0 );
 
-    ::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
+    ::lcl_SaveAnchor( pFormat, pObjArr->nNodeIdx );
 
        // notify UNO objects to decouple
-    ::lcl_SendRemoveToUno( *pFmt );
+    ::lcl_SendRemoveToUno( *pFormat );
 
     // remove from array
-    SwDoc* pDoc = pFmt->GetDoc();
-    SwFrmFmts& rFlyFmts = *pDoc->GetSpzFrmFmts();
-    rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
+    SwDoc* pDoc = pFormat->GetDoc();
+    SwFrameFormats& rFlyFormats = *pDoc->GetSpzFrameFormats();
+    rFlyFormats.erase( std::find( rFlyFormats.begin(), rFlyFormats.end(), pFormat ));
 
     for( sal_uInt16 n = 1; n < nSize; ++n )
     {
         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
 
-        ::lcl_RestoreAnchor( rSave.pFmt, rSave.nNodeIdx );
-        rFlyFmts.push_back( rSave.pFmt );
+        ::lcl_RestoreAnchor( rSave.pFormat, rSave.nNodeIdx );
+        rFlyFormats.push_back( rSave.pFormat );
 
         // #i45952# - notify that position attributes are already set
-        OSL_ENSURE( rSave.pFmt->ISA(SwDrawFrmFmt),
+        OSL_ENSURE( rSave.pFormat->ISA(SwDrawFrameFormat),
                 "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
-        if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
+        if ( rSave.pFormat->ISA(SwDrawFrameFormat) )
         {
-            static_cast<SwDrawFrmFmt*>(rSave.pFmt)->PosAttrSet();
+            static_cast<SwDrawFrameFormat*>(rSave.pFormat)->PosAttrSet();
         }
     }
 }
 
-void SwUndoDrawUnGroup::AddObj( sal_uInt16 nPos, SwDrawFrmFmt* pFmt )
+void SwUndoDrawUnGroup::AddObj( sal_uInt16 nPos, SwDrawFrameFormat* pFormat )
 {
     SwUndoGroupObjImpl& rSave = *( pObjArr + nPos + 1 );
-    rSave.pFmt = pFmt;
+    rSave.pFormat = pFormat;
     rSave.pObj = 0;
 }
 
@@ -456,9 +456,9 @@ void
 SwUndoDrawUnGroupConnectToLayout::UndoImpl(::sw::UndoRedoContext &)
 {
     for ( std::vector< SdrObject >::size_type i = 0;
-          i < aDrawFmtsAndObjs.size(); ++i )
+          i < aDrawFormatsAndObjs.size(); ++i )
     {
-        SdrObject* pObj( aDrawFmtsAndObjs[i].second );
+        SdrObject* pObj( aDrawFormatsAndObjs[i].second );
         SwDrawContact* pDrawContact( dynamic_cast<SwDrawContact*>(pObj->GetUserCall()) );
         OSL_ENSURE( pDrawContact,
                 "<SwUndoDrawUnGroupConnectToLayout::Undo(..)> -- missing SwDrawContact instance" );
@@ -475,26 +475,26 @@ SwUndoDrawUnGroupConnectToLayout::UndoImpl(::sw::UndoRedoContext &)
 void
 SwUndoDrawUnGroupConnectToLayout::RedoImpl(::sw::UndoRedoContext &)
 {
-    for ( std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > >::size_type i = 0;
-          i < aDrawFmtsAndObjs.size(); ++i )
+    for ( std::vector< std::pair< SwDrawFrameFormat*, SdrObject* > >::size_type i = 0;
+          i < aDrawFormatsAndObjs.size(); ++i )
     {
-        SwDrawFrmFmt* pFmt( aDrawFmtsAndObjs[i].first );
-        SdrObject* pObj( aDrawFmtsAndObjs[i].second );
-        SwDrawContact *pContact = new SwDrawContact( pFmt, pObj );
+        SwDrawFrameFormat* pFormat( aDrawFormatsAndObjs[i].first );
+        SdrObject* pObj( aDrawFormatsAndObjs[i].second );
+        SwDrawContact *pContact = new SwDrawContact( pFormat, pObj );
         pContact->ConnectToLayout();
         pContact->MoveObjToVisibleLayer( pObj );
     }
 }
 
-void SwUndoDrawUnGroupConnectToLayout::AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
+void SwUndoDrawUnGroupConnectToLayout::AddFormatAndObj( SwDrawFrameFormat* pDrawFrameFormat,
                                                      SdrObject* pDrawObject )
 {
-    aDrawFmtsAndObjs.push_back(
-            std::pair< SwDrawFrmFmt*, SdrObject* >( pDrawFrmFmt, pDrawObject ) );
+    aDrawFormatsAndObjs.push_back(
+            std::pair< SwDrawFrameFormat*, SdrObject* >( pDrawFrameFormat, pDrawObject ) );
 }
 
 SwUndoDrawDelete::SwUndoDrawDelete( sal_uInt16 nCnt )
-    : SwUndo( UNDO_DRAWDELETE ), nSize( nCnt ), bDelFmt( true )
+    : SwUndo( UNDO_DRAWDELETE ), nSize( nCnt ), bDelFormat( true )
 {
     pObjArr = new SwUndoGroupObjImpl[ nSize ];
     pMarkLst = new SdrMarkList();
@@ -502,11 +502,11 @@ SwUndoDrawDelete::SwUndoDrawDelete( sal_uInt16 nCnt )
 
 SwUndoDrawDelete::~SwUndoDrawDelete()
 {
-    if( bDelFmt )
+    if( bDelFormat )
     {
         SwUndoGroupObjImpl* pTmp = pObjArr;
         for( size_t n = 0; n < pMarkLst->GetMarkCount(); ++n, ++pTmp )
-            delete pTmp->pFmt;
+            delete pTmp->pFormat;
     }
     delete [] pObjArr;
     delete pMarkLst;
@@ -514,24 +514,24 @@ SwUndoDrawDelete::~SwUndoDrawDelete()
 
 void SwUndoDrawDelete::UndoImpl(::sw::UndoRedoContext & rContext)
 {
-    bDelFmt = false;
-    SwFrmFmts & rFlyFmts = *rContext.GetDoc().GetSpzFrmFmts();
+    bDelFormat = false;
+    SwFrameFormats & rFlyFormats = *rContext.GetDoc().GetSpzFrameFormats();
     for( size_t n = 0; n < pMarkLst->GetMarkCount(); ++n )
     {
         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
-        ::lcl_RestoreAnchor( rSave.pFmt, rSave.nNodeIdx );
-        rFlyFmts.push_back( rSave.pFmt );
+        ::lcl_RestoreAnchor( rSave.pFormat, rSave.nNodeIdx );
+        rFlyFormats.push_back( rSave.pFormat );
         SdrObject *pObj = rSave.pObj;
-        SwDrawContact *pContact = new SwDrawContact( rSave.pFmt, pObj );
+        SwDrawContact *pContact = new SwDrawContact( rSave.pFormat, pObj );
         pContact->_Changed( *pObj, SDRUSERCALL_INSERTED, NULL );
         // #i45718# - follow-up of #i35635# move object to visible layer
         pContact->MoveObjToVisibleLayer( pObj );
         // #i45952# - notify that position attributes are already set
-        OSL_ENSURE( rSave.pFmt->ISA(SwDrawFrmFmt),
+        OSL_ENSURE( rSave.pFormat->ISA(SwDrawFrameFormat),
                 "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
-        if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
+        if ( rSave.pFormat->ISA(SwDrawFrameFormat) )
         {
-            static_cast<SwDrawFrmFmt*>(rSave.pFmt)->PosAttrSet();
+            static_cast<SwDrawFrameFormat*>(rSave.pFormat)->PosAttrSet();
         }
     }
     rContext.SetSelections(0, pMarkLst);
@@ -539,42 +539,42 @@ void SwUndoDrawDelete::UndoImpl(::sw::UndoRedoContext & rContext)
 
 void SwUndoDrawDelete::RedoImpl(::sw::UndoRedoContext & rContext)
 {
-    bDelFmt = true;
-    SwFrmFmts & rFlyFmts = *rContext.GetDoc().GetSpzFrmFmts();
+    bDelFormat = true;
+    SwFrameFormats & rFlyFormats = *rContext.GetDoc().GetSpzFrameFormats();
     for( size_t n = 0; n < pMarkLst->GetMarkCount(); ++n )
     {
         SwUndoGroupObjImpl& rSave = *( pObjArr + n );
         SdrObject *pObj = rSave.pObj;
         SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
-        SwDrawFrmFmt *pFmt = static_cast<SwDrawFrmFmt*>(pContact->GetFmt());
+        SwDrawFrameFormat *pFormat = static_cast<SwDrawFrameFormat*>(pContact->GetFormat());
 
         // object will destroy itself
         pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
         pObj->SetUserCall( 0 );
 
            // notify UNO objects to decouple
-        ::lcl_SendRemoveToUno( *pFmt );
+        ::lcl_SendRemoveToUno( *pFormat );
 
-        rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
-        ::lcl_SaveAnchor( pFmt, rSave.nNodeIdx );
+        rFlyFormats.erase( std::find( rFlyFormats.begin(), rFlyFormats.end(), pFormat ));
+        ::lcl_SaveAnchor( pFormat, rSave.nNodeIdx );
     }
 }
 
-void SwUndoDrawDelete::AddObj( sal_uInt16 , SwDrawFrmFmt* pFmt,
+void SwUndoDrawDelete::AddObj( sal_uInt16 , SwDrawFrameFormat* pFormat,
                                 const SdrMark& rMark )
 {
     SwUndoGroupObjImpl& rSave = *( pObjArr + pMarkLst->GetMarkCount() );
     rSave.pObj = rMark.GetMarkedSdrObj();
-    rSave.pFmt = pFmt;
-    ::lcl_SaveAnchor( pFmt, rSave.nNodeIdx );
+    rSave.pFormat = pFormat;
+    ::lcl_SaveAnchor( pFormat, rSave.nNodeIdx );
 
        // notify UNO objects to decouple
-    ::lcl_SendRemoveToUno( *pFmt );
+    ::lcl_SendRemoveToUno( *pFormat );
 
     // remove from array
-    SwDoc* pDoc = pFmt->GetDoc();
-    SwFrmFmts& rFlyFmts = *pDoc->GetSpzFrmFmts();
-    rFlyFmts.erase( std::find( rFlyFmts.begin(), rFlyFmts.end(), pFmt ));
+    SwDoc* pDoc = pFormat->GetDoc();
+    SwFrameFormats& rFlyFormats = *pDoc->GetSpzFrameFormats();
+    rFlyFormats.erase( std::find( rFlyFormats.begin(), rFlyFormats.end(), pFormat ));
 
     pMarkLst->InsertEntry( rMark );
 }
diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx
index 458b400860f9..7759230e559a 100644
--- a/sw/source/core/undo/unfmco.cxx
+++ b/sw/source/core/undo/unfmco.cxx
@@ -25,28 +25,28 @@
 #include "rolbck.hxx"
 #include "docary.hxx"
 
-SwUndoFmtColl::SwUndoFmtColl( const SwPaM& rRange,
-                              SwFmtColl* pColl,
+SwUndoFormatColl::SwUndoFormatColl( const SwPaM& rRange,
+                              SwFormatColl* pColl,
                               const bool bReset,
                               const bool bResetListAttrs )
     : SwUndo( UNDO_SETFMTCOLL ),
       SwUndRng( rRange ),
       pHistory( new SwHistory ),
-      pFmtColl( pColl ),
+      pFormatColl( pColl ),
       mbReset( bReset ),
       mbResetListAttrs( bResetListAttrs )
 {
     // #i31191#
     if ( pColl )
-        aFmtName = pColl->GetName();
+        aFormatName = pColl->GetName();
 }
 
-SwUndoFmtColl::~SwUndoFmtColl()
+SwUndoFormatColl::~SwUndoFormatColl()
 {
     delete pHistory;
 }
 
-void SwUndoFmtColl::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoFormatColl::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     // restore old values
     pHistory->TmpRollback(& rContext.GetDoc(), 0);
@@ -56,39 +56,39 @@ void SwUndoFmtColl::UndoImpl(::sw::UndoRedoContext & rContext)
     AddUndoRedoPaM(rContext);
 }
 
-void SwUndoFmtColl::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoFormatColl::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwPaM & rPam = AddUndoRedoPaM(rContext);
 
-    DoSetFmtColl(rContext.GetDoc(), rPam);
+    DoSetFormatColl(rContext.GetDoc(), rPam);
 }
 
-void SwUndoFmtColl::RepeatImpl(::sw::RepeatContext & rContext)
+void SwUndoFormatColl::RepeatImpl(::sw::RepeatContext & rContext)
 {
-    DoSetFmtColl(rContext.GetDoc(), rContext.GetRepeatPaM());
+    DoSetFormatColl(rContext.GetDoc(), rContext.GetRepeatPaM());
 }
 
-void SwUndoFmtColl::DoSetFmtColl(SwDoc & rDoc, SwPaM & rPaM)
+void SwUndoFormatColl::DoSetFormatColl(SwDoc & rDoc, SwPaM & rPaM)
 {
     // Only one TextFrmColl can be applied to a section, thus request only in
     // this array.
 
     // does the format still exist?
-    if( rDoc.GetTxtFmtColls()->Contains(static_cast<SwTxtFmtColl*>(pFmtColl)) )
+    if( rDoc.GetTextFormatColls()->Contains(static_cast<SwTextFormatColl*>(pFormatColl)) )
     {
-        rDoc.SetTxtFmtColl(rPaM, static_cast<SwTxtFmtColl*>(pFmtColl), mbReset,
+        rDoc.SetTextFormatColl(rPaM, static_cast<SwTextFormatColl*>(pFormatColl), mbReset,
                            mbResetListAttrs);
     }
 }
 
-SwRewriter SwUndoFmtColl::GetRewriter() const
+SwRewriter SwUndoFormatColl::GetRewriter() const
 {
     SwRewriter aResult;
 
     // #i31191# Use stored format name instead of
-    // pFmtColl->GetName(), because pFmtColl does not have to be available
+    // pFormatColl->GetName(), because pFormatColl does not have to be available
     // anymore.
-    aResult.AddRule(UndoArg1, aFmtName );
+    aResult.AddRule(UndoArg1, aFormatName );
 
     return aResult;
 }
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 931cb1f580cc..58bdcf48c34b 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -60,21 +60,21 @@ using namespace ::com::sun::star;
 
 // INSERT
 
-OUString * SwUndoInsert::GetTxtFromDoc() const
+OUString * SwUndoInsert::GetTextFromDoc() const
 {
     OUString * pResult = NULL;
 
     SwNodeIndex aNd( pDoc->GetNodes(), nNode);
-    SwCntntNode* pCNd = aNd.GetNode().GetCntntNode();
-    SwPaM aPaM( *pCNd, nCntnt );
+    SwContentNode* pCNd = aNd.GetNode().GetContentNode();
+    SwPaM aPaM( *pCNd, nContent );
 
     aPaM.SetMark();
 
-    if( pCNd->IsTxtNode() )
+    if( pCNd->IsTextNode() )
     {
-        OUString sTxt = pCNd->GetTxtNode()->GetTxt();
+        OUString sText = pCNd->GetTextNode()->GetText();
 
-        sal_Int32 nStart = nCntnt-nLen;
+        sal_Int32 nStart = nContent-nLen;
         sal_Int32 nLength = nLen;
 
         if (nStart < 0)
@@ -83,7 +83,7 @@ OUString * SwUndoInsert::GetTxtFromDoc() const
             nStart = 0;
         }
 
-        pResult = new OUString(sTxt.copy(nStart, nLength));
+        pResult = new OUString(sText.copy(nStart, nLength));
     }
 
     return pResult;
@@ -100,7 +100,7 @@ void SwUndoInsert::Init(const SwNodeIndex & rNd)
         SetRedlineMode( pDoc->getIDocumentRedlineAccess().GetRedlineMode() );
     }
 
-    pUndoTxt = GetTxtFromDoc();
+    pUndoText = GetTextFromDoc();
 
     bCacheComment = false;
 }
@@ -110,8 +110,8 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt,
             sal_Int32 nL,
             const SwInsertFlags nInsertFlags,
             bool bWDelim )
-    : SwUndo(UNDO_TYPING), pTxt( 0 ), pRedlData( 0 ),
-        nNode( rNd.GetIndex() ), nCntnt(nCnt), nLen(nL),
+    : SwUndo(UNDO_TYPING), pText( 0 ), pRedlData( 0 ),
+        nNode( rNd.GetIndex() ), nContent(nCnt), nLen(nL),
         bIsWordDelim( bWDelim ), bIsAppend( false )
     , m_bWithRsid(false)
     , m_nInsertFlags(nInsertFlags)
@@ -121,8 +121,8 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt,
 
 // #111827#
 SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd )
-    : SwUndo(UNDO_SPLITNODE), pTxt( 0 ),
-        pRedlData( 0 ), nNode( rNd.GetIndex() ), nCntnt(0), nLen(1),
+    : SwUndo(UNDO_SPLITNODE), pText( 0 ),
+        pRedlData( 0 ), nNode( rNd.GetIndex() ), nContent(0), nLen(1),
         bIsWordDelim( false ), bIsAppend( true )
     , m_bWithRsid(false)
     , m_nInsertFlags(SwInsertFlags::EMPTYEXPAND)
@@ -140,10 +140,10 @@ bool SwUndoInsert::CanGrouping( sal_Unicode cIns )
         !GetAppCharClass().isLetterNumeric( OUString( cIns )) )
     {
         nLen++;
-        nCntnt++;
+        nContent++;
 
-        if (pUndoTxt)
-            (*pUndoTxt) += OUString(cIns);
+        if (pUndoText)
+            (*pUndoText) += OUString(cIns);
 
         return true;
     }
@@ -154,7 +154,7 @@ bool SwUndoInsert::CanGrouping( const SwPosition& rPos )
 {
     bool bRet = false;
     if( nNode == rPos.nNode.GetIndex() &&
-        nCntnt == rPos.nContent.GetIndex() )
+        nContent == rPos.nContent.GetIndex() )
     {
         // consider Redline
         SwDoc& rDoc = *rPos.nNode.GetNode().GetDoc();
@@ -166,17 +166,17 @@ bool SwUndoInsert::CanGrouping( const SwPosition& rPos )
             // than there is or was still an active Redline:
             // Check if there is another Redline at the InsPosition. If the
             // same exists only once, it can be combined.
-            const SwRedlineTbl& rTbl = rDoc.getIDocumentRedlineAccess().GetRedlineTbl();
-            if( !rTbl.empty() )
+            const SwRedlineTable& rTable = rDoc.getIDocumentRedlineAccess().GetRedlineTable();
+            if( !rTable.empty() )
             {
                 SwRedlineData aRData( nsRedlineType_t::REDLINE_INSERT, rDoc.getIDocumentRedlineAccess().GetRedlineAuthor() );
                 const SwIndexReg* pIReg = rPos.nContent.GetIdxReg();
-                for( size_t i = 0; i < rTbl.size(); ++i )
+                for( size_t i = 0; i < rTable.size(); ++i )
                 {
-                    SwRangeRedline* pRedl = rTbl[ i ];
+                    SwRangeRedline* pRedl = rTable[ i ];
                     SwIndex* pIdx = &pRedl->End()->nContent;
                     if( pIReg == pIdx->GetIdxReg() &&
-                        nCntnt == pIdx->GetIndex() )
+                        nContent == pIdx->GetIndex() )
                     {
                         if( !pRedl->HasMark() || !pRedlData ||
                             *pRedl != *pRedlData || *pRedl != aRData )
@@ -202,10 +202,10 @@ SwUndoInsert::~SwUndoInsert()
             rUNds.GetEndOfExtras().GetIndex() - m_pUndoNodeIndex->GetIndex());
         m_pUndoNodeIndex.reset();
     }
-    else if( pTxt )     // the inserted text
-        delete pTxt;
+    else if( pText )     // the inserted text
+        delete pText;
     delete pRedlData;
-    delete pUndoTxt;
+    delete pUndoText;
 }
 
 void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext)
@@ -219,7 +219,7 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext)
 
         if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
         {
-            pPam->GetPoint()->nContent.Assign( pPam->GetCntntNode(), 0 );
+            pPam->GetPoint()->nContent.Assign( pPam->GetContentNode(), 0 );
             pPam->SetMark();
             pPam->Move( fnMoveBackward );
             pPam->Exchange();
@@ -227,22 +227,22 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext)
         }
         pPam->DeleteMark();
         pTmpDoc->getIDocumentContentOperations().DelFullPara( *pPam );
-        pPam->GetPoint()->nContent.Assign( pPam->GetCntntNode(), 0 );
+        pPam->GetPoint()->nContent.Assign( pPam->GetContentNode(), 0 );
     }
     else
     {
         sal_uLong nNd = nNode;
-        sal_Int32 nCnt = nCntnt;
+        sal_Int32 nCnt = nContent;
         if( nLen )
         {
             SwNodeIndex aNd( pTmpDoc->GetNodes(), nNode);
-            SwCntntNode* pCNd = aNd.GetNode().GetCntntNode();
-            SwPaM aPaM( *pCNd, nCntnt );
+            SwContentNode* pCNd = aNd.GetNode().GetContentNode();
+            SwPaM aPaM( *pCNd, nContent );
 
             aPaM.SetMark();
 
-            SwTxtNode * const pTxtNode( pCNd->GetTxtNode() );
-            if ( pTxtNode )
+            SwTextNode * const pTextNode( pCNd->GetTextNode() );
+            if ( pTextNode )
             {
                 aPaM.GetPoint()->nContent -= nLen;
                 if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
@@ -252,16 +252,16 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext)
                     // RSID was added: remove any CHARFMT/AUTOFMT that may be
                     // set on the deleted text; EraseText will leave empty
                     // ones behind otherwise
-                    pTxtNode->DeleteAttributes(RES_TXTATR_AUTOFMT,
+                    pTextNode->DeleteAttributes(RES_TXTATR_AUTOFMT,
                         aPaM.GetPoint()->nContent.GetIndex(),
                         aPaM.GetMark()->nContent.GetIndex());
-                    pTxtNode->DeleteAttributes(RES_TXTATR_CHARFMT,
+                    pTextNode->DeleteAttributes(RES_TXTATR_CHARFMT,
                         aPaM.GetPoint()->nContent.GetIndex(),
                         aPaM.GetMark()->nContent.GetIndex());
                 }
                 RemoveIdxFromRange( aPaM, false );
-                pTxt = new OUString( pTxtNode->GetTxt().copy(nCntnt-nLen, nLen) );
-                pTxtNode->EraseText( aPaM.GetPoint()->nContent, nLen );
+                pText = new OUString( pTextNode->GetText().copy(nContent-nLen, nLen) );
+                pTextNode->EraseText( aPaM.GetPoint()->nContent, nLen );
             }
             else                // otherwise Graphics/OLE/Text/...
             {
@@ -274,14 +274,14 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext)
             nNd = aPaM.GetPoint()->nNode.GetIndex();
             nCnt = aPaM.GetPoint()->nContent.GetIndex();
 
-            if( !pTxt )
+            if( !pText )
             {
                 m_pUndoNodeIndex.reset(
                         new SwNodeIndex(pDoc->GetNodes().GetEndOfContent()));
                 MoveToUndoNds(aPaM, m_pUndoNodeIndex.get());
             }
             nNode = aPaM.GetPoint()->nNode.GetIndex();
-            nCntnt = aPaM.GetPoint()->nContent.GetIndex();
+            nContent = aPaM.GetPoint()->nContent.GetIndex();
         }
 
         // set cursor to Undo range
@@ -289,10 +289,10 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext)
 
         pPam->GetPoint()->nNode = nNd;
         pPam->GetPoint()->nContent.Assign(
-                pPam->GetPoint()->nNode.GetNode().GetCntntNode(), nCnt );
+                pPam->GetPoint()->nNode.GetNode().GetContentNode(), nCnt );
     }
 
-    DELETEZ(pUndoTxt);
+    DELETEZ(pUndoText);
 }
 
 void SwUndoInsert::RedoImpl(::sw::UndoRedoContext & rContext)
@@ -304,7 +304,7 @@ void SwUndoInsert::RedoImpl(::sw::UndoRedoContext & rContext)
     if( bIsAppend )
     {
         pPam->GetPoint()->nNode = nNode - 1;
-        pTmpDoc->getIDocumentContentOperations().AppendTxtNode( *pPam->GetPoint() );
+        pTmpDoc->getIDocumentContentOperations().AppendTextNode( *pPam->GetPoint() );
 
         pPam->SetMark();
         pPam->Move( fnMoveBackward );
@@ -318,7 +318,7 @@ void SwUndoInsert::RedoImpl(::sw::UndoRedoContext & rContext)
             pTmpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
         }
         else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) &&
-                !pTmpDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+                !pTmpDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
             pTmpDoc->getIDocumentRedlineAccess().SplitRedline( *pPam );
 
         pPam->DeleteMark();
@@ -326,23 +326,23 @@ void SwUndoInsert::RedoImpl(::sw::UndoRedoContext & rContext)
     else
     {
         pPam->GetPoint()->nNode = nNode;
-        SwCntntNode *const pCNd =
-            pPam->GetPoint()->nNode.GetNode().GetCntntNode();
-        pPam->GetPoint()->nContent.Assign( pCNd, nCntnt );
+        SwContentNode *const pCNd =
+            pPam->GetPoint()->nNode.GetNode().GetContentNode();
+        pPam->GetPoint()->nContent.Assign( pCNd, nContent );
 
         if( nLen )
         {
             const bool bMvBkwrd = MovePtBackward( *pPam );
 
-            if( pTxt )
+            if( pText )
             {
-                SwTxtNode *const pTxtNode = pCNd->GetTxtNode();
-                OSL_ENSURE( pTxtNode, "where is my textnode ?" );
+                SwTextNode *const pTextNode = pCNd->GetTextNode();
+                OSL_ENSURE( pTextNode, "where is my textnode ?" );
                 OUString const ins(
-                    pTxtNode->InsertText( *pTxt, pPam->GetMark()->nContent,
+                    pTextNode->InsertText( *pText, pPam->GetMark()->nContent,
                     m_nInsertFlags) );
-                assert(ins.getLength() == pTxt->getLength()); // must succeed
-                DELETEZ( pTxt );
+                assert(ins.getLength() == pText->getLength()); // must succeed
+                DELETEZ( pText );
                 if (m_bWithRsid) // re-insert RSID
                 {
                     SwPaM pam(*pPam->GetMark(), 0); // mark -> point
@@ -357,7 +357,7 @@ void SwUndoInsert::RedoImpl(::sw::UndoRedoContext & rContext)
                 MoveFromUndoNds(*pTmpDoc, nMvNd, *pPam->GetMark());
             }
             nNode = pPam->GetMark()->nNode.GetIndex();
-            nCntnt = pPam->GetMark()->nContent.GetIndex();
+            nContent = pPam->GetMark()->nContent.GetIndex();
 
             MovePtForward( *pPam, bMvBkwrd );
             pPam->Exchange();
@@ -370,12 +370,12 @@ void SwUndoInsert::RedoImpl(::sw::UndoRedoContext & rContext)
                 pTmpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
             }
             else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) &&
-                    !pTmpDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+                    !pTmpDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
                 pTmpDoc->getIDocumentRedlineAccess().SplitRedline(*pPam);
         }
     }
 
-    pUndoTxt = GetTxtFromDoc();
+    pUndoText = GetTextFromDoc();
 }
 
 void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext)
@@ -385,14 +385,14 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext)
 
     SwDoc & rDoc = rContext.GetDoc();
     SwNodeIndex aNd( rDoc.GetNodes(), nNode );
-    SwCntntNode* pCNd = aNd.GetNode().GetCntntNode();
+    SwContentNode* pCNd = aNd.GetNode().GetContentNode();
 
     if( !bIsAppend && 1 == nLen )       // >1 than always Text, otherwise Graphics/OLE/Text/...
     {
-        SwPaM aPaM( *pCNd, nCntnt );
+        SwPaM aPaM( *pCNd, nContent );
         aPaM.SetMark();
         aPaM.Move(fnMoveBackward);
-        pCNd = aPaM.GetCntntNode();
+        pCNd = aPaM.GetContentNode();
     }
 
 // What happens with the possible selected range ???
@@ -402,14 +402,14 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext)
     case ND_TEXTNODE:
         if( bIsAppend )
         {
-            rDoc.getIDocumentContentOperations().AppendTxtNode( *rContext.GetRepeatPaM().GetPoint() );
+            rDoc.getIDocumentContentOperations().AppendTextNode( *rContext.GetRepeatPaM().GetPoint() );
         }
         else
         {
-            OUString const aTxt( pCNd->GetTxtNode()->GetTxt() );
+            OUString const aText( pCNd->GetTextNode()->GetText() );
             ::sw::GroupUndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
             rDoc.getIDocumentContentOperations().InsertString( rContext.GetRepeatPaM(),
-                aTxt.copy(nCntnt - nLen, nLen) );
+                aText.copy(nContent - nLen, nLen) );
         }
         break;
     case ND_GRFNODE:
@@ -458,10 +458,10 @@ SwRewriter SwUndoInsert::GetRewriter() const
     OUString * pStr = NULL;
     bool bDone = false;
 
-    if (pTxt)
-        pStr = pTxt;
-    else if (pUndoTxt)
-        pStr = pUndoTxt;
+    if (pText)
+        pStr = pText;
+    else if (pUndoText)
+        pStr = pUndoText;
 
     if (pStr)
     {
@@ -483,7 +483,7 @@ SwRewriter SwUndoInsert::GetRewriter() const
 }
 
 class SwUndoReplace::Impl
-    : private SwUndoSaveCntnt
+    : private SwUndoSaveContent
 {
     OUString m_sOld;
     OUString m_sIns;
@@ -606,11 +606,11 @@ SwUndoReplace::Impl::Impl(
 
     m_bSplitNext = m_nSttNd != pEnd->nNode.GetIndex();
 
-    SwTxtNode* pNd = pStt->nNode.GetNode().GetTxtNode();
+    SwTextNode* pNd = pStt->nNode.GetNode().GetTextNode();
     OSL_ENSURE( pNd, "Dude, where's my TextNode?" );
 
     pHistory = new SwHistory;
-    DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint() );
+    DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() );
 
     m_nSetPos = pHistory->Count();
 
@@ -620,22 +620,22 @@ SwUndoReplace::Impl::Impl(
     if ( pNd->GetpSwpHints() )
     {
         pHistory->CopyAttr( pNd->GetpSwpHints(), nNewPos, 0,
-                            pNd->GetTxt().getLength(), true );
+                            pNd->GetText().getLength(), true );
     }
 
     if ( m_bSplitNext )
     {
         if( pNd->HasSwAttrSet() )
-            pHistory->CopyFmtAttr( *pNd->GetpSwAttrSet(), nNewPos );
-        pHistory->Add( pNd->GetTxtColl(), nNewPos, ND_TEXTNODE );
+            pHistory->CopyFormatAttr( *pNd->GetpSwAttrSet(), nNewPos );
+        pHistory->Add( pNd->GetTextColl(), nNewPos, ND_TEXTNODE );
 
-        SwTxtNode* pNext = pEnd->nNode.GetNode().GetTxtNode();
+        SwTextNode* pNext = pEnd->nNode.GetNode().GetTextNode();
         sal_uLong nTmp = pNext->GetIndex();
         pHistory->CopyAttr( pNext->GetpSwpHints(), nTmp, 0,
-                            pNext->GetTxt().getLength(), true );
+                            pNext->GetText().getLength(), true );
         if( pNext->HasSwAttrSet() )
-            pHistory->CopyFmtAttr( *pNext->GetpSwAttrSet(), nTmp );
-        pHistory->Add( pNext->GetTxtColl(),nTmp, ND_TEXTNODE );
+            pHistory->CopyFormatAttr( *pNext->GetpSwAttrSet(), nTmp );
+        pHistory->Add( pNext->GetTextColl(),nTmp, ND_TEXTNODE );
         // METADATA: store
         m_pMetadataUndoStart = pNd  ->CreateUndo();
         m_pMetadataUndoEnd   = pNext->CreateUndo();
@@ -644,9 +644,9 @@ SwUndoReplace::Impl::Impl(
     if( !pHistory->Count() )
         delete pHistory, pHistory = 0;
 
-    const sal_Int32 nECnt = m_bSplitNext ? pNd->GetTxt().getLength()
+    const sal_Int32 nECnt = m_bSplitNext ? pNd->GetText().getLength()
         : pEnd->nContent.GetIndex();
-    m_sOld = pNd->GetTxt().copy( m_nSttCnt, nECnt - m_nSttCnt );
+    m_sOld = pNd->GetText().copy( m_nSttCnt, nECnt - m_nSttCnt );
 }
 
 void SwUndoReplace::Impl::UndoImpl(::sw::UndoRedoContext & rContext)
@@ -655,7 +655,7 @@ void SwUndoReplace::Impl::UndoImpl(::sw::UndoRedoContext & rContext)
     SwPaM & rPam(rContext.GetCursorSupplier().CreateNewShellCursor());
     rPam.DeleteMark();
 
-    SwTxtNode* pNd = pDoc->GetNodes()[ m_nSttNd - m_nOffset ]->GetTxtNode();
+    SwTextNode* pNd = pDoc->GetNodes()[ m_nSttNd - m_nOffset ]->GetTextNode();
     OSL_ENSURE( pNd, "Dude, where's my TextNode?" );
 
     SwAutoCorrExceptWord* pACEWord = pDoc->GetAutoCorrExceptWord();
@@ -676,13 +676,13 @@ void SwUndoReplace::Impl::UndoImpl(::sw::UndoRedoContext & rContext)
         rPam.GetPoint()->nContent.Assign( pNd, m_nSttCnt );
         rPam.SetMark();
         rPam.GetPoint()->nNode = m_nEndNd - m_nOffset;
-        rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), m_nEndCnt );
+        rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), m_nEndCnt );
         // move it out of the way so it is not registered at deleted node
         aIdx.Assign(0, 0);
 
         pDoc->getIDocumentContentOperations().DeleteAndJoin( rPam );
         rPam.DeleteMark();
-        pNd = rPam.GetNode().GetTxtNode();
+        pNd = rPam.GetNode().GetTextNode();
         OSL_ENSURE( pNd, "Dude, where's my TextNode?" );
         aIdx.Assign( pNd, m_nSttCnt );
     }
@@ -692,7 +692,7 @@ void SwUndoReplace::Impl::UndoImpl(::sw::UndoRedoContext & rContext)
         SwPosition aPos( *pNd, aIdx );
         pDoc->getIDocumentContentOperations().SplitNode( aPos, false );
         pNd->RestoreMetadata(m_pMetadataUndoEnd);
-        pNd = pDoc->GetNodes()[ m_nSttNd - m_nOffset ]->GetTxtNode();
+        pNd = pDoc->GetNodes()[ m_nSttNd - m_nOffset ]->GetTextNode();
         aIdx.Assign( pNd, m_nSttCnt );
         // METADATA: restore
         pNd->RestoreMetadata(m_pMetadataUndoStart);
@@ -741,14 +741,14 @@ void SwUndoReplace::Impl::RedoImpl(::sw::UndoRedoContext & rContext)
     rPam.DeleteMark();
     rPam.GetPoint()->nNode = m_nSttNd;
 
-    SwTxtNode* pNd = rPam.GetPoint()->nNode.GetNode().GetTxtNode();
+    SwTextNode* pNd = rPam.GetPoint()->nNode.GetNode().GetTextNode();
     OSL_ENSURE( pNd, "Dude, where's my TextNode?" );
     rPam.GetPoint()->nContent.Assign( pNd, m_nSttCnt );
     rPam.SetMark();
     if( m_bSplitNext )
     {
         rPam.GetPoint()->nNode = m_nSttNd + 1;
-        pNd = rPam.GetPoint()->nNode.GetNode().GetTxtNode();
+        pNd = rPam.GetPoint()->nNode.GetNode().GetTextNode();
     }
     rPam.GetPoint()->nContent.Assign( pNd, m_nSelEnd );
 
@@ -757,7 +757,7 @@ void SwUndoReplace::Impl::RedoImpl(::sw::UndoRedoContext & rContext)
         SwHistory* pSave = pHistory;
         SwHistory aHst;
         pHistory = &aHst;
-        DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint() );
+        DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() );
         m_nSetPos = pHistory->Count();
 
         pHistory = pSave;
@@ -766,7 +766,7 @@ void SwUndoReplace::Impl::RedoImpl(::sw::UndoRedoContext & rContext)
     else
     {
         pHistory = new SwHistory;
-        DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint() );
+        DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() );
         m_nSetPos = pHistory->Count();
         if( !m_nSetPos )
             delete pHistory, pHistory = 0;
@@ -827,7 +827,7 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext)
     if( RES_MIRROR_GRAPH_DONT != nOldMirr )
         pGrfNd->SetAttr( SwMirrorGrf() );
 
-    rContext.SetSelections(pGrfNd->GetFlyFmt(), 0);
+    rContext.SetSelections(pGrfNd->GetFlyFormat(), 0);
 }
 
 void SwUndoReRead::UndoImpl(::sw::UndoRedoContext & rContext)
@@ -858,7 +858,7 @@ void SwUndoReRead::SaveGraphicData( const SwGrfNode& rGrfNd )
 }
 
 SwUndoInsertLabel::SwUndoInsertLabel( const SwLabelType eTyp,
-                                      const OUString &rTxt,
+                                      const OUString &rText,
                                       const OUString& rSeparator,
                                       const OUString& rNumberSeparator,
                                       const bool bBef,
@@ -866,11 +866,11 @@ SwUndoInsertLabel::SwUndoInsertLabel( const SwLabelType eTyp,
                                       const OUString& rCharacterStyle,
                                       const bool bCpyBorder )
     : SwUndo( UNDO_INSERTLABEL ),
-      sText( rTxt ),
+      sText( rText ),
       sSeparator( rSeparator ),
       sNumberSeparator( rNumberSeparator ),//#i61007# order of captions
       sCharacterStyle( rCharacterStyle ),
-      nFldId( nInitId ),
+      nFieldId( nInitId ),
       eType( eTyp ),
       nLayerId( 0 ),
       bBefore( bBef ),
@@ -899,12 +899,12 @@ void SwUndoInsertLabel::UndoImpl(::sw::UndoRedoContext & rContext)
     if( LTYPE_OBJECT == eType || LTYPE_DRAW == eType )
     {
         OSL_ENSURE( OBJECT.pUndoAttr && OBJECT.pUndoFly, "Pointer not initialized" );
-        SwFrmFmt* pFmt;
+        SwFrameFormat* pFormat;
         SdrObject *pSdrObj = 0;
         if( OBJECT.pUndoAttr &&
-            0 != (pFmt = static_cast<SwFrmFmt*>(OBJECT.pUndoAttr->GetFmt( rDoc ))) &&
+            0 != (pFormat = static_cast<SwFrameFormat*>(OBJECT.pUndoAttr->GetFormat( rDoc ))) &&
             ( LTYPE_DRAW != eType ||
-              0 != (pSdrObj = pFmt->FindSdrObject()) ) )
+              0 != (pSdrObj = pFormat->FindSdrObject()) ) )
         {
             OBJECT.pUndoAttr->UndoImpl(rContext);
             OBJECT.pUndoFly->UndoImpl(rContext);
@@ -921,7 +921,7 @@ void SwUndoInsertLabel::UndoImpl(::sw::UndoRedoContext & rContext)
             SwTableNode *pNd = rDoc.GetNodes()[
                         rDoc.GetNodes()[NODE.nNode-1]->StartOfSectionIndex()]->GetTableNode();
             if ( pNd )
-                pNd->GetTable().GetFrmFmt()->ResetFmtAttr( RES_KEEP );
+                pNd->GetTable().GetFrameFormat()->ResetFormatAttr( RES_KEEP );
         }
         SwPaM aPam( rDoc.GetNodes().GetEndOfContent() );
         aPam.GetPoint()->nNode = NODE.nNode;
@@ -938,12 +938,12 @@ void SwUndoInsertLabel::RedoImpl(::sw::UndoRedoContext & rContext)
     if( LTYPE_OBJECT == eType || LTYPE_DRAW == eType )
     {
         OSL_ENSURE( OBJECT.pUndoAttr && OBJECT.pUndoFly, "Pointer not initialized" );
-        SwFrmFmt* pFmt;
+        SwFrameFormat* pFormat;
         SdrObject *pSdrObj = 0;
         if( OBJECT.pUndoAttr &&
-            0 != (pFmt = static_cast<SwFrmFmt*>(OBJECT.pUndoAttr->GetFmt( rDoc ))) &&
+            0 != (pFormat = static_cast<SwFrameFormat*>(OBJECT.pUndoAttr->GetFormat( rDoc ))) &&
             ( LTYPE_DRAW != eType ||
-              0 != (pSdrObj = pFmt->FindSdrObject()) ) )
+              0 != (pSdrObj = pFormat->FindSdrObject()) ) )
         {
             OBJECT.pUndoFly->RedoImpl(rContext);
             OBJECT.pUndoAttr->RedoImpl(rContext);
@@ -965,7 +965,7 @@ void SwUndoInsertLabel::RedoImpl(::sw::UndoRedoContext & rContext)
             SwTableNode *pNd = rDoc.GetNodes()[
                         rDoc.GetNodes()[NODE.nNode-1]->StartOfSectionIndex()]->GetTableNode();
             if ( pNd )
-                pNd->GetTable().GetFrmFmt()->SetFmtAttr( SvxFmtKeepItem(true, RES_KEEP) );
+                pNd->GetTable().GetFrameFormat()->SetFormatAttr( SvxFormatKeepItem(true, RES_KEEP) );
         }
         NODE.pUndoInsNd->UndoImpl(rContext);
         delete NODE.pUndoInsNd, NODE.pUndoInsNd = 0;
@@ -979,7 +979,7 @@ void SwUndoInsertLabel::RepeatImpl(::sw::RepeatContext & rContext)
 
     sal_uLong nIdx = 0;
 
-    SwCntntNode* pCNd = rPos.nNode.GetNode().GetCntntNode();
+    SwContentNode* pCNd = rPos.nNode.GetNode().GetContentNode();
     if( pCNd )
         switch( eType )
         {
@@ -995,9 +995,9 @@ void SwUndoInsertLabel::RepeatImpl(::sw::RepeatContext & rContext)
         case LTYPE_OBJECT:
             {
                 SwFlyFrm* pFly;
-                SwCntntFrm *pCnt = pCNd->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
+                SwContentFrm *pCnt = pCNd->getLayoutFrm( rDoc.getIDocumentLayoutAccess().GetCurrentLayout() );
                 if( pCnt && 0 != ( pFly = pCnt->FindFlyFrm() ) )
-                    nIdx = pFly->GetFmt()->GetCntnt().GetCntntIdx()->GetIndex();
+                    nIdx = pFly->GetFormat()->GetContent().GetContentIdx()->GetIndex();
             }
             break;
         case LTYPE_DRAW:
@@ -1007,7 +1007,7 @@ void SwUndoInsertLabel::RepeatImpl(::sw::RepeatContext & rContext)
     if( nIdx )
     {
         rDoc.InsertLabel( eType, sText, sSeparator, sNumberSeparator, bBefore,
-            nFldId, nIdx, sCharacterStyle, bCpyBrd );
+            nFieldId, nIdx, sCharacterStyle, bCpyBrd );
     }
 }
 
@@ -1028,18 +1028,18 @@ SwRewriter SwUndoInsertLabel::GetRewriter() const
     return aRewriter;
 }
 
-void SwUndoInsertLabel::SetFlys( SwFrmFmt& rOldFly, SfxItemSet& rChgSet,
-                                SwFrmFmt& rNewFly )
+void SwUndoInsertLabel::SetFlys( SwFrameFormat& rOldFly, SfxItemSet& rChgSet,
+                                SwFrameFormat& rNewFly )
 {
     if( LTYPE_OBJECT == eType || LTYPE_DRAW == eType )
     {
-        SwUndoFmtAttrHelper aTmp( rOldFly, false );
-        rOldFly.SetFmtAttr( rChgSet );
+        SwUndoFormatAttrHelper aTmp( rOldFly, false );
+        rOldFly.SetFormatAttr( rChgSet );
         if ( aTmp.GetUndo() )
         {
             OBJECT.pUndoAttr = aTmp.ReleaseUndo();
         }
-        OBJECT.pUndoFly = new SwUndoInsLayFmt( &rNewFly,0,0 );
+        OBJECT.pUndoFly = new SwUndoInsLayFormat( &rNewFly,0,0 );
     }
 }
 
diff --git a/sw/source/core/undo/unmove.cxx b/sw/source/core/undo/unmove.cxx
index b6b09af1d0b7..aef019ead43a 100644
--- a/sw/source/core/undo/unmove.cxx
+++ b/sw/source/core/undo/unmove.cxx
@@ -34,10 +34,10 @@ SwUndoMove::SwUndoMove( const SwPaM& rRange, const SwPosition& rMvPos )
     , nDestEndNode(0)
     , nInsPosNode(0)
     , nMvDestNode(rMvPos.nNode.GetIndex())
-    , nDestSttCntnt(0)
-    , nDestEndCntnt(0)
-    , nInsPosCntnt(0)
-    , nMvDestCntnt(rMvPos.nContent.GetIndex())
+    , nDestSttContent(0)
+    , nDestEndContent(0)
+    , nInsPosContent(0)
+    , nMvDestContent(rMvPos.nContent.GetIndex())
     , bJoinNext(false)
     , bJoinPrev(false)
     , bMoveRange(false)
@@ -45,49 +45,49 @@ SwUndoMove::SwUndoMove( const SwPaM& rRange, const SwPosition& rMvPos )
 {
     // get StartNode from footnotes before delete!
     SwDoc* pDoc = rRange.GetDoc();
-    SwTxtNode* pTxtNd = pDoc->GetNodes()[ nSttNode ]->GetTxtNode();
-    SwTxtNode* pEndTxtNd = pDoc->GetNodes()[ nEndNode ]->GetTxtNode();
+    SwTextNode* pTextNd = pDoc->GetNodes()[ nSttNode ]->GetTextNode();
+    SwTextNode* pEndTextNd = pDoc->GetNodes()[ nEndNode ]->GetTextNode();
 
     pHistory = new SwHistory;
 
-    if( pTxtNd )
+    if( pTextNd )
     {
-        pHistory->Add( pTxtNd->GetTxtColl(), nSttNode, ND_TEXTNODE );
-        if ( pTxtNd->GetpSwpHints() )
+        pHistory->Add( pTextNd->GetTextColl(), nSttNode, ND_TEXTNODE );
+        if ( pTextNd->GetpSwpHints() )
         {
-            pHistory->CopyAttr( pTxtNd->GetpSwpHints(), nSttNode,
-                                0, pTxtNd->GetTxt().getLength(), false );
+            pHistory->CopyAttr( pTextNd->GetpSwpHints(), nSttNode,
+                                0, pTextNd->GetText().getLength(), false );
         }
-        if( pTxtNd->HasSwAttrSet() )
-            pHistory->CopyFmtAttr( *pTxtNd->GetpSwAttrSet(), nSttNode );
+        if( pTextNd->HasSwAttrSet() )
+            pHistory->CopyFormatAttr( *pTextNd->GetpSwAttrSet(), nSttNode );
     }
-    if( pEndTxtNd && pEndTxtNd != pTxtNd )
+    if( pEndTextNd && pEndTextNd != pTextNd )
     {
-        pHistory->Add( pEndTxtNd->GetTxtColl(), nEndNode, ND_TEXTNODE );
-        if ( pEndTxtNd->GetpSwpHints() )
+        pHistory->Add( pEndTextNd->GetTextColl(), nEndNode, ND_TEXTNODE );
+        if ( pEndTextNd->GetpSwpHints() )
         {
-            pHistory->CopyAttr( pEndTxtNd->GetpSwpHints(), nEndNode,
-                                0, pEndTxtNd->GetTxt().getLength(), false );
+            pHistory->CopyAttr( pEndTextNd->GetpSwpHints(), nEndNode,
+                                0, pEndTextNd->GetText().getLength(), false );
         }
-        if( pEndTxtNd->HasSwAttrSet() )
-            pHistory->CopyFmtAttr( *pEndTxtNd->GetpSwAttrSet(), nEndNode );
+        if( pEndTextNd->HasSwAttrSet() )
+            pHistory->CopyFormatAttr( *pEndTextNd->GetpSwAttrSet(), nEndNode );
     }
 
-    pTxtNd = rMvPos.nNode.GetNode().GetTxtNode();
-    if (0 != pTxtNd)
+    pTextNd = rMvPos.nNode.GetNode().GetTextNode();
+    if (0 != pTextNd)
     {
-        pHistory->Add( pTxtNd->GetTxtColl(), nMvDestNode, ND_TEXTNODE );
-        if ( pTxtNd->GetpSwpHints() )
+        pHistory->Add( pTextNd->GetTextColl(), nMvDestNode, ND_TEXTNODE );
+        if ( pTextNd->GetpSwpHints() )
         {
-            pHistory->CopyAttr( pTxtNd->GetpSwpHints(), nMvDestNode,
-                                0, pTxtNd->GetTxt().getLength(), false );
+            pHistory->CopyAttr( pTextNd->GetpSwpHints(), nMvDestNode,
+                                0, pTextNd->GetText().getLength(), false );
         }
-        if( pTxtNd->HasSwAttrSet() )
-            pHistory->CopyFmtAttr( *pTxtNd->GetpSwAttrSet(), nMvDestNode );
+        if( pTextNd->HasSwAttrSet() )
+            pHistory->CopyFormatAttr( *pTextNd->GetpSwAttrSet(), nMvDestNode );
     }
 
-    nFtnStt = pHistory->Count();
-    DelFtn( rRange );
+    nFootnoteStt = pHistory->Count();
+    DelFootnote( rRange );
 
     if( pHistory && !pHistory->Count() )
         DELETEZ( pHistory );
@@ -100,42 +100,42 @@ SwUndoMove::SwUndoMove( SwDoc* pDoc, const SwNodeRange& rRg,
     , nDestEndNode(0)
     , nInsPosNode(0)
     , nMvDestNode(rMvPos.GetIndex())
-    , nDestSttCntnt(0)
-    , nDestEndCntnt(0)
-    , nInsPosCntnt(0)
+    , nDestSttContent(0)
+    , nDestEndContent(0)
+    , nInsPosContent(0)
     , bMoveRedlines(false)
 {
     bMoveRange = true;
     bJoinNext = bJoinPrev = false;
 
-    nSttCntnt = nEndCntnt = nMvDestCntnt = COMPLETE_STRING;
+    nSttContent = nEndContent = nMvDestContent = COMPLETE_STRING;
 
     nSttNode = rRg.aStart.GetIndex();
     nEndNode = rRg.aEnd.GetIndex();
 
-//  DelFtn( rRange );
-// FIXME: duplication of the method body of DelFtn below
+//  DelFootnote( rRange );
+// FIXME: duplication of the method body of DelFootnote below
 
-    // is the current move from CntntArea into the special section?
-    sal_uLong nCntntStt = pDoc->GetNodes().GetEndOfAutotext().GetIndex();
-    if( nMvDestNode < nCntntStt && rRg.aStart.GetIndex() > nCntntStt )
+    // is the current move from ContentArea into the special section?
+    sal_uLong nContentStt = pDoc->GetNodes().GetEndOfAutotext().GetIndex();
+    if( nMvDestNode < nContentStt && rRg.aStart.GetIndex() > nContentStt )
     {
         // delete all footnotes since they are undesired there
         SwPosition aPtPos( rRg.aEnd );
-        SwCntntNode* pCNd = rRg.aEnd.GetNode().GetCntntNode();
+        SwContentNode* pCNd = rRg.aEnd.GetNode().GetContentNode();
         if( pCNd )
             aPtPos.nContent.Assign( pCNd, pCNd->Len() );
         SwPosition aMkPos( rRg.aStart );
-        if( 0 != ( pCNd = aMkPos.nNode.GetNode().GetCntntNode() ))
+        if( 0 != ( pCNd = aMkPos.nNode.GetNode().GetContentNode() ))
             aMkPos.nContent.Assign( pCNd, 0 );
 
-        DelCntntIndex( aMkPos, aPtPos, nsDelCntntType::DELCNT_FTN );
+        DelContentIndex( aMkPos, aPtPos, nsDelContentType::DELCNT_FTN );
 
         if( pHistory && !pHistory->Count() )
             DELETEZ( pHistory );
     }
 
-    nFtnStt = 0;
+    nFootnoteStt = 0;
 }
 
 void SwUndoMove::SetDestRange( const SwPaM& rRange,
@@ -148,12 +148,12 @@ void SwUndoMove::SetDestRange( const SwPaM& rRange,
                         : rRange.GetPoint();
 
     nDestSttNode    = pStt->nNode.GetIndex();
-    nDestSttCntnt   = pStt->nContent.GetIndex();
+    nDestSttContent   = pStt->nContent.GetIndex();
     nDestEndNode    = pEnd->nNode.GetIndex();
-    nDestEndCntnt   = pEnd->nContent.GetIndex();
+    nDestEndContent   = pEnd->nContent.GetIndex();
 
     nInsPosNode     = rInsPos.nNode.GetIndex();
-    nInsPosCntnt    = rInsPos.nContent.GetIndex();
+    nInsPosContent    = rInsPos.nContent.GetIndex();
 
     if( bCorrPam )
     {
@@ -162,8 +162,8 @@ void SwUndoMove::SetDestRange( const SwPaM& rRange,
     }
 
     bJoinNext = nDestSttNode != nDestEndNode &&
-                pStt->nNode.GetNode().GetTxtNode() &&
-                pEnd->nNode.GetNode().GetTxtNode();
+                pStt->nNode.GetNode().GetTextNode() &&
+                pEnd->nNode.GetNode().GetTextNode();
     bJoinPrev = bJoin;
 }
 
@@ -180,7 +180,7 @@ void SwUndoMove::SetDestRange( const SwNodeIndex& rStt,
     }
     nInsPosNode  = rInsPos.GetIndex();
 
-    nDestSttCntnt = nDestEndCntnt = nInsPosCntnt = COMPLETE_STRING;
+    nDestSttContent = nDestEndContent = nInsPosContent = COMPLETE_STRING;
 }
 
 void SwUndoMove::UndoImpl(::sw::UndoRedoContext & rContext)
@@ -205,8 +205,8 @@ void SwUndoMove::UndoImpl(::sw::UndoRedoContext & rContext)
         }
         else
         {
-            SwPaM aPam( aIdx.GetNode(), nDestSttCntnt,
-                        *pDoc->GetNodes()[ nDestEndNode ], nDestEndCntnt );
+            SwPaM aPam( aIdx.GetNode(), nDestSttContent,
+                        *pDoc->GetNodes()[ nDestEndNode ], nDestEndContent );
 
             // #i17764# if redlines are to be moved, we may not remove them
             // before pDoc->Move gets a chance to handle them
@@ -214,14 +214,14 @@ void SwUndoMove::UndoImpl(::sw::UndoRedoContext & rContext)
                 RemoveIdxFromRange( aPam, false );
 
             SwPosition aPos( *pDoc->GetNodes()[ nInsPosNode] );
-            SwCntntNode* pCNd = aPos.nNode.GetNode().GetCntntNode();
-            aPos.nContent.Assign( pCNd, nInsPosCntnt );
+            SwContentNode* pCNd = aPos.nNode.GetNode().GetContentNode();
+            aPos.nContent.Assign( pCNd, nInsPosContent );
 
             if( pCNd->HasSwAttrSet() )
                 pCNd->ResetAllAttr();
 
-            if( pCNd->IsTxtNode() && static_cast<SwTxtNode*>(pCNd)->GetpSwpHints() )
-                static_cast<SwTxtNode*>(pCNd)->ClearSwpHintsArr( false );
+            if( pCNd->IsTextNode() && static_cast<SwTextNode*>(pCNd)->GetpSwpHints() )
+                static_cast<SwTextNode*>(pCNd)->ClearSwpHintsArr( false );
 
             // first delete all attributes at InsertPos
             const bool bSuccess = pDoc->getIDocumentContentOperations().MoveRange( aPam, aPos, (bMoveRedlines)
@@ -232,39 +232,39 @@ void SwUndoMove::UndoImpl(::sw::UndoRedoContext & rContext)
 
             aPam.Exchange();
             aPam.DeleteMark();
-            if( aPam.GetNode().IsCntntNode() )
-                aPam.GetNode().GetCntntNode()->ResetAllAttr();
+            if( aPam.GetNode().IsContentNode() )
+                aPam.GetNode().GetContentNode()->ResetAllAttr();
             // the Pam will be dropped now
         }
 
-        SwTxtNode* pTxtNd = aIdx.GetNode().GetTxtNode();
+        SwTextNode* pTextNd = aIdx.GetNode().GetTextNode();
         if( bJoinNext )
         {
             {
                 RemoveIdxRel( aIdx.GetIndex() + 1, SwPosition( aIdx,
-                        SwIndex(pTxtNd, pTxtNd->GetTxt().getLength())));
+                        SwIndex(pTextNd, pTextNd->GetText().getLength())));
             }
             // Are there any Pams in the next TextNode?
-            pTxtNd->JoinNext();
+            pTextNd->JoinNext();
         }
 
-        if( bJoinPrev && pTxtNd->CanJoinPrev( &aIdx ) )
+        if( bJoinPrev && pTextNd->CanJoinPrev( &aIdx ) )
         {
             // Are there any Pams in the next TextNode?
-            pTxtNd = aIdx.GetNode().GetTxtNode();
+            pTextNd = aIdx.GetNode().GetTextNode();
             {
                 RemoveIdxRel( aIdx.GetIndex() + 1, SwPosition( aIdx,
-                        SwIndex( pTxtNd, pTxtNd->GetTxt().getLength())));
+                        SwIndex( pTextNd, pTextNd->GetText().getLength())));
             }
-            pTxtNd->JoinNext();
+            pTextNd->JoinNext();
         }
 
     } while( false );
 
     if( pHistory )
     {
-        if( nFtnStt != pHistory->Count() )
-            pHistory->Rollback( pDoc, nFtnStt );
+        if( nFootnoteStt != pHistory->Count() )
+            pHistory->Rollback( pDoc, nFootnoteStt );
         pHistory->TmpRollback( pDoc, 0 );
         pHistory->SetTmpEnd( pHistory->Count() );
     }
@@ -296,30 +296,30 @@ void SwUndoMove::RedoImpl(::sw::UndoRedoContext & rContext)
     {
         SwPaM aPam( *pPam->GetPoint() );
         SetPaM( aPam );
-        SwPosition aMvPos( aIdx, SwIndex( aIdx.GetNode().GetCntntNode(),
-                                        nMvDestCntnt ));
+        SwPosition aMvPos( aIdx, SwIndex( aIdx.GetNode().GetContentNode(),
+                                        nMvDestContent ));
 
-        DelFtn( aPam );
+        DelFootnote( aPam );
         RemoveIdxFromRange( aPam, false );
 
         aIdx = aPam.Start()->nNode;
-        bool bJoinTxt = aIdx.GetNode().IsTxtNode();
+        bool bJoinText = aIdx.GetNode().IsTextNode();
 
         --aIdx;
         rDoc.getIDocumentContentOperations().MoveRange( aPam, aMvPos,
             SwMoveFlags::DEFAULT );
 
-        if( nSttNode != nEndNode && bJoinTxt )
+        if( nSttNode != nEndNode && bJoinText )
         {
             ++aIdx;
-            SwTxtNode * pTxtNd = aIdx.GetNode().GetTxtNode();
-            if( pTxtNd && pTxtNd->CanJoinNext() )
+            SwTextNode * pTextNd = aIdx.GetNode().GetTextNode();
+            if( pTextNd && pTextNd->CanJoinNext() )
             {
                 {
                     RemoveIdxRel( aIdx.GetIndex() + 1, SwPosition( aIdx,
-                            SwIndex(pTxtNd, pTxtNd->GetTxt().getLength())));
+                            SwIndex(pTextNd, pTextNd->GetText().getLength())));
                 }
-                pTxtNd->JoinNext();
+                pTextNd->JoinNext();
             }
         }
         *pPam->GetPoint() = *aPam.GetPoint();
@@ -328,17 +328,17 @@ void SwUndoMove::RedoImpl(::sw::UndoRedoContext & rContext)
     }
 }
 
-void SwUndoMove::DelFtn( const SwPaM& rRange )
+void SwUndoMove::DelFootnote( const SwPaM& rRange )
 {
-    // is the current move from CntntArea into the special section?
+    // is the current move from ContentArea into the special section?
     SwDoc* pDoc = rRange.GetDoc();
-    sal_uLong nCntntStt = pDoc->GetNodes().GetEndOfAutotext().GetIndex();
-    if( nMvDestNode < nCntntStt &&
-        rRange.GetPoint()->nNode.GetIndex() >= nCntntStt )
+    sal_uLong nContentStt = pDoc->GetNodes().GetEndOfAutotext().GetIndex();
+    if( nMvDestNode < nContentStt &&
+        rRange.GetPoint()->nNode.GetIndex() >= nContentStt )
     {
         // delete all footnotes since they are undesired there
-        DelCntntIndex( *rRange.GetMark(), *rRange.GetPoint(),
-                            nsDelCntntType::DELCNT_FTN );
+        DelContentIndex( *rRange.GetMark(), *rRange.GetPoint(),
+                            nsDelContentType::DELCNT_FTN );
 
         if( pHistory && !pHistory->Count() )
             delete pHistory, pHistory = 0;
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index 27456c98a9ee..99431193a923 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -52,9 +52,9 @@ SwUndoInsNum::SwUndoInsNum( const SwPosition& rPos, const SwNumRule& rRule,
     sReplaceRule( rReplaceRule ), nLRSavePos( 0 )
 {
     // No selection!
-    nEndNode = 0, nEndCntnt = COMPLETE_STRING;
+    nEndNode = 0, nEndContent = COMPLETE_STRING;
     nSttNode = rPos.nNode.GetIndex();
-    nSttCntnt = rPos.nContent.GetIndex();
+    nSttContent = rPos.nContent.GetIndex();
 }
 
 SwUndoInsNum::~SwUndoInsNum()
@@ -76,13 +76,13 @@ void SwUndoInsNum::UndoImpl(::sw::UndoRedoContext & rContext)
     SwDoc & rDoc = rContext.GetDoc();
 
     if( pOldNumRule )
-        rDoc.ChgNumRuleFmts( *pOldNumRule );
+        rDoc.ChgNumRuleFormats( *pOldNumRule );
 
     if( pHistory )
     {
-        SwTxtNode* pNd;
+        SwTextNode* pNd;
         if( ULONG_MAX != nSttSet &&
-            0 != ( pNd = rDoc.GetNodes()[ nSttSet ]->GetTxtNode() ))
+            0 != ( pNd = rDoc.GetNodes()[ nSttSet ]->GetTextNode() ))
                 pNd->SetListRestart( true );
         else
             pNd = 0;
@@ -108,7 +108,7 @@ void SwUndoInsNum::RedoImpl(::sw::UndoRedoContext & rContext)
     SwDoc & rDoc = rContext.GetDoc();
 
     if ( pOldNumRule )
-        rDoc.ChgNumRuleFmts( aNumRule );
+        rDoc.ChgNumRuleFormats( aNumRule );
     else if ( pHistory )
     {
         SwPaM & rPam( AddUndoRedoPaM(rContext) );
@@ -143,7 +143,7 @@ void SwUndoInsNum::RepeatImpl(::sw::RepeatContext & rContext)
     }
     else
     {
-        rDoc.ChgNumRuleFmts( aNumRule );
+        rDoc.ChgNumRuleFormats( aNumRule );
     }
 }
 
@@ -181,11 +181,11 @@ void SwUndoDelNum::UndoImpl(::sw::UndoRedoContext & rContext)
 
     for( std::vector<NodeLevel>::const_iterator i = aNodes.begin(); i != aNodes.end(); ++i )
     {
-        SwTxtNode* pNd = rDoc.GetNodes()[ i->index ]->GetTxtNode();
+        SwTextNode* pNd = rDoc.GetNodes()[ i->index ]->GetTextNode();
         OSL_ENSURE( pNd, "Where has the TextNode gone?" );
         pNd->SetAttrListLevel( i->level );
 
-        if( pNd->GetCondFmtColl() )
+        if( pNd->GetCondFormatColl() )
             pNd->ChkCondColl();
     }
 
@@ -203,7 +203,7 @@ void SwUndoDelNum::RepeatImpl(::sw::RepeatContext & rContext)
     rContext.GetDoc().DelNumRules(rContext.GetRepeatPaM());
 }
 
-void SwUndoDelNum::AddNode( const SwTxtNode& rNd, bool )
+void SwUndoDelNum::AddNode( const SwTextNode& rNd, bool )
 {
     if( rNd.GetNumRule() )
     {
@@ -224,7 +224,7 @@ void SwUndoMoveNum::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     sal_uLong nTmpStt = nSttNode, nTmpEnd = nEndNode;
 
-    if (nEndNode || nEndCntnt != COMPLETE_STRING)        // section?
+    if (nEndNode || nEndContent != COMPLETE_STRING)        // section?
     {
         if( nNewStt < nSttNode )        // moved forwards
             nEndNode = nEndNode - ( nSttNode - nNewStt );
@@ -297,11 +297,11 @@ SwUndoNumOrNoNum::SwUndoNumOrNoNum( const SwNodeIndex& rIdx, bool bOldNum,
 void SwUndoNumOrNoNum::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwNodeIndex aIdx( rContext.GetDoc().GetNodes(), nIdx );
-    SwTxtNode * pTxtNd = aIdx.GetNode().GetTxtNode();
+    SwTextNode * pTextNd = aIdx.GetNode().GetTextNode();
 
-    if (NULL != pTxtNd)
+    if (NULL != pTextNd)
     {
-        pTxtNd->SetCountedInList(mbOldNum);
+        pTextNd->SetCountedInList(mbOldNum);
     }
 }
 
@@ -309,11 +309,11 @@ void SwUndoNumOrNoNum::UndoImpl(::sw::UndoRedoContext & rContext)
 void SwUndoNumOrNoNum::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwNodeIndex aIdx( rContext.GetDoc().GetNodes(), nIdx );
-    SwTxtNode * pTxtNd = aIdx.GetNode().GetTxtNode();
+    SwTextNode * pTextNd = aIdx.GetNode().GetTextNode();
 
-    if (NULL != pTxtNd)
+    if (NULL != pTextNd)
     {
-        pTxtNd->SetCountedInList(mbNewNum);
+        pTextNd->SetCountedInList(mbNewNum);
     }
 }
 
@@ -346,12 +346,12 @@ SwUndoNumRuleStart::SwUndoNumRuleStart( const SwPosition& rPos, sal_uInt16 nStt
     , bSetSttValue(true)
     , bFlag(false)
 {
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if ( pTxtNd )
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+    if ( pTextNd )
     {
-        if ( pTxtNd->HasAttrListRestartValue() )
+        if ( pTextNd->HasAttrListRestartValue() )
         {
-            nOldStt = static_cast<sal_uInt16>(pTxtNd->GetAttrListRestartValue());
+            nOldStt = static_cast<sal_uInt16>(pTextNd->GetAttrListRestartValue());
         }
         else
         {
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 4ae473cf2126..c555cb082ca7 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -45,7 +45,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
     : SwUndo(UNDO_OVERWRITE),
       pRedlSaveData( 0 ), bGroup( false )
 {
-    if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         SwPaM aPam( rPos.nNode, rPos.nContent.GetIndex(),
                     rPos.nNode, rPos.nContent.GetIndex()+1 );
@@ -55,38 +55,38 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
     }
 
     nSttNode = rPos.nNode.GetIndex();
-    nSttCntnt = rPos.nContent.GetIndex();
+    nSttContent = rPos.nContent.GetIndex();
 
-    SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNd, "Overwrite not in a TextNode?" );
+    SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+    OSL_ENSURE( pTextNd, "Overwrite not in a TextNode?" );
 
     bInsChar = true;
-    sal_Int32 nTxtNdLen = pTxtNd->GetTxt().getLength();
-    if( nSttCntnt < nTxtNdLen )     // no pure insert?
+    sal_Int32 nTextNdLen = pTextNd->GetText().getLength();
+    if( nSttContent < nTextNdLen )     // no pure insert?
     {
-        aDelStr += OUString( pTxtNd->GetTxt()[nSttCntnt] );
+        aDelStr += OUString( pTextNd->GetText()[nSttContent] );
         if( !pHistory )
             pHistory = new SwHistory;
-        SwRegHistory aRHst( *pTxtNd, pHistory );
-        pHistory->CopyAttr( pTxtNd->GetpSwpHints(), nSttNode, 0,
-                            nTxtNdLen, false );
+        SwRegHistory aRHst( *pTextNd, pHistory );
+        pHistory->CopyAttr( pTextNd->GetpSwpHints(), nSttNode, 0,
+                            nTextNdLen, false );
         ++rPos.nContent;
         bInsChar = false;
     }
 
-    bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
-    pTxtNd->SetIgnoreDontExpand( true );
+    bool bOldExpFlg = pTextNd->IsIgnoreDontExpand();
+    pTextNd->SetIgnoreDontExpand( true );
 
-    pTxtNd->InsertText( OUString(cIns), rPos.nContent,
+    pTextNd->InsertText( OUString(cIns), rPos.nContent,
             SwInsertFlags::EMPTYEXPAND );
     aInsStr += OUString( cIns );
 
     if( !bInsChar )
     {
         const SwIndex aTmpIndex( rPos.nContent, -2 );
-        pTxtNd->EraseText( aTmpIndex, 1 );
+        pTextNd->EraseText( aTmpIndex, 1 );
     }
-    pTxtNd->SetIgnoreDontExpand( bOldExpFlg );
+    pTextNd->SetIgnoreDontExpand( bOldExpFlg );
 
     bCacheComment = false;
 }
@@ -107,10 +107,10 @@ bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
         return false;
 
     // Is the node a TextNode at all?
-    SwTxtNode * pDelTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    if( !pDelTxtNd ||
-        (pDelTxtNd->GetTxt().getLength() != rPos.nContent.GetIndex() &&
-            rPos.nContent.GetIndex() != ( nSttCntnt + aInsStr.getLength() )))
+    SwTextNode * pDelTextNd = rPos.nNode.GetNode().GetTextNode();
+    if( !pDelTextNd ||
+        (pDelTextNd->GetText().getLength() != rPos.nContent.GetIndex() &&
+            rPos.nContent.GetIndex() != ( nSttContent + aInsStr.getLength() )))
         return false;
 
     CharClass& rCC = GetAppCharClass();
@@ -131,7 +131,7 @@ bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
         bool bOk = ( !pRedlSaveData && !bSaved ) ||
                    ( pRedlSaveData && bSaved &&
                         SwUndo::CanRedlineGroup( *pRedlSaveData, aTmpSav,
-                            nSttCntnt > rPos.nContent.GetIndex() ));
+                            nSttContent > rPos.nContent.GetIndex() ));
         // aTmpSav.DeleteAndDestroyAll();
         if( !bOk )
             return false;
@@ -142,19 +142,19 @@ bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
     // both 'overwrites' can be combined so 'move' the corresponding character
     if( !bInsChar )
     {
-        if (rPos.nContent.GetIndex() < pDelTxtNd->GetTxt().getLength())
+        if (rPos.nContent.GetIndex() < pDelTextNd->GetText().getLength())
         {
-            aDelStr += OUString( pDelTxtNd->GetTxt()[rPos.nContent.GetIndex()] );
+            aDelStr += OUString( pDelTextNd->GetText()[rPos.nContent.GetIndex()] );
             ++rPos.nContent;
         }
         else
             bInsChar = true;
     }
 
-    bool bOldExpFlg = pDelTxtNd->IsIgnoreDontExpand();
-    pDelTxtNd->SetIgnoreDontExpand( true );
+    bool bOldExpFlg = pDelTextNd->IsIgnoreDontExpand();
+    pDelTextNd->SetIgnoreDontExpand( true );
 
-    OUString const ins( pDelTxtNd->InsertText(OUString(cIns), rPos.nContent,
+    OUString const ins( pDelTextNd->InsertText(OUString(cIns), rPos.nContent,
             SwInsertFlags::EMPTYEXPAND) );
     assert(ins.getLength() == 1); // check in SwDoc::Overwrite => cannot fail
     (void) ins;
@@ -163,9 +163,9 @@ bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
     if( !bInsChar )
     {
         const SwIndex aTmpIndex( rPos.nContent, -2 );
-        pDelTxtNd->EraseText( aTmpIndex, 1 );
+        pDelTextNd->EraseText( aTmpIndex, 1 );
     }
-    pDelTxtNd->SetIgnoreDontExpand( bOldExpFlg );
+    pDelTextNd->SetIgnoreDontExpand( bOldExpFlg );
 
     bGroup = true;
     return true;
@@ -178,10 +178,10 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext)
 
     pAktPam->DeleteMark();
     pAktPam->GetPoint()->nNode = nSttNode;
-    SwTxtNode* pTxtNd = pAktPam->GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNd, "Overwrite not in a TextNode?" );
+    SwTextNode* pTextNd = pAktPam->GetNode().GetTextNode();
+    OSL_ENSURE( pTextNd, "Overwrite not in a TextNode?" );
     SwIndex& rIdx = pAktPam->GetPoint()->nContent;
-    rIdx.Assign( pTxtNd, nSttCntnt );
+    rIdx.Assign( pTextNd, nSttContent );
 
     SwAutoCorrExceptWord* pACEWord = pDoc->GetAutoCorrExceptWord();
     if( pACEWord )
@@ -195,42 +195,42 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext)
     if( aInsStr.getLength() > aDelStr.getLength() )
     {
         rIdx += aDelStr.getLength();
-        pTxtNd->EraseText( rIdx, aInsStr.getLength() - aDelStr.getLength() );
-        rIdx = nSttCntnt;
+        pTextNd->EraseText( rIdx, aInsStr.getLength() - aDelStr.getLength() );
+        rIdx = nSttContent;
     }
 
     if( !aDelStr.isEmpty() )
     {
-        bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
-        pTxtNd->SetIgnoreDontExpand( true );
+        bool bOldExpFlg = pTextNd->IsIgnoreDontExpand();
+        pTextNd->SetIgnoreDontExpand( true );
 
         ++rIdx;
         for( sal_Int32 n = 0; n < aDelStr.getLength(); n++  )
         {
             // do it individually, to keep the attributes!
             OUString aTmpStr(aDelStr[n]);
-            OUString const ins( pTxtNd->InsertText(aTmpStr, rIdx) );
+            OUString const ins( pTextNd->InsertText(aTmpStr, rIdx) );
             assert(ins.getLength() == 1); // cannot fail
         (void) ins;
             rIdx -= 2;
-            pTxtNd->EraseText( rIdx, 1 );
+            pTextNd->EraseText( rIdx, 1 );
             rIdx += 2;
         }
-        pTxtNd->SetIgnoreDontExpand( bOldExpFlg );
+        pTextNd->SetIgnoreDontExpand( bOldExpFlg );
         --rIdx;
     }
 
     if( pHistory )
     {
-        if( pTxtNd->GetpSwpHints() )
-            pTxtNd->ClearSwpHintsArr( false );
+        if( pTextNd->GetpSwpHints() )
+            pTextNd->ClearSwpHintsArr( false );
         pHistory->TmpRollback( pDoc, 0, false );
     }
 
-    if( pAktPam->GetMark()->nContent.GetIndex() != nSttCntnt )
+    if( pAktPam->GetMark()->nContent.GetIndex() != nSttContent )
     {
         pAktPam->SetMark();
-        pAktPam->GetMark()->nContent = nSttCntnt;
+        pAktPam->GetMark()->nContent = nSttContent;
     }
 
     if( pRedlSaveData )
@@ -260,47 +260,47 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext)
 
     pAktPam->DeleteMark();
     pAktPam->GetPoint()->nNode = nSttNode;
-    SwTxtNode* pTxtNd = pAktPam->GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNd, "Overwrite not in TextNode?" );
+    SwTextNode* pTextNd = pAktPam->GetNode().GetTextNode();
+    OSL_ENSURE( pTextNd, "Overwrite not in TextNode?" );
     SwIndex& rIdx = pAktPam->GetPoint()->nContent;
 
     if( pRedlSaveData )
     {
-        rIdx.Assign( pTxtNd, nSttCntnt );
+        rIdx.Assign( pTextNd, nSttContent );
         pAktPam->SetMark();
         pAktPam->GetMark()->nContent += aInsStr.getLength();
         pDoc->getIDocumentRedlineAccess().DeleteRedline( *pAktPam, false, USHRT_MAX );
         pAktPam->DeleteMark();
     }
-    rIdx.Assign( pTxtNd, !aDelStr.isEmpty() ? nSttCntnt+1 : nSttCntnt );
+    rIdx.Assign( pTextNd, !aDelStr.isEmpty() ? nSttContent+1 : nSttContent );
 
-    bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
-    pTxtNd->SetIgnoreDontExpand( true );
+    bool bOldExpFlg = pTextNd->IsIgnoreDontExpand();
+    pTextNd->SetIgnoreDontExpand( true );
 
     for( sal_Int32 n = 0; n < aInsStr.getLength(); n++  )
     {
         // do it individually, to keep the attributes!
         OUString const ins(
-                pTxtNd->InsertText( OUString(aInsStr[n]), rIdx,
+                pTextNd->InsertText( OUString(aInsStr[n]), rIdx,
                 SwInsertFlags::EMPTYEXPAND) );
         assert(ins.getLength() == 1); // cannot fail
         (void) ins;
         if( n < aDelStr.getLength() )
         {
             rIdx -= 2;
-            pTxtNd->EraseText( rIdx, 1 );
+            pTextNd->EraseText( rIdx, 1 );
             rIdx += n+1 < aDelStr.getLength() ? 2 : 1;
         }
     }
-    pTxtNd->SetIgnoreDontExpand( bOldExpFlg );
+    pTextNd->SetIgnoreDontExpand( bOldExpFlg );
 
     // get back old start position from UndoNodes array
     if( pHistory )
         pHistory->SetTmpEnd( pHistory->Count() );
-    if( pAktPam->GetMark()->nContent.GetIndex() != nSttCntnt )
+    if( pAktPam->GetMark()->nContent.GetIndex() != nSttContent )
     {
         pAktPam->SetMark();
-        pAktPam->GetMark()->nContent = nSttCntnt;
+        pAktPam->GetMark()->nContent = nSttContent;
     }
 }
 
@@ -328,8 +328,8 @@ struct _UndoTransliterate_Data
     sal_uLong           nNdIdx;
     sal_Int32      nStart, nLen;
 
-    _UndoTransliterate_Data( sal_uLong nNd, sal_Int32 nStt, sal_Int32 nStrLen, const OUString& rTxt )
-        : sText( rTxt ), pHistory( 0 ), pOffsets( 0 ),
+    _UndoTransliterate_Data( sal_uLong nNd, sal_Int32 nStt, sal_Int32 nStrLen, const OUString& rText )
+        : sText( rText ), pHistory( 0 ), pOffsets( 0 ),
         nNdIdx( nNd ), nStart( nStt ), nLen( nStrLen )
     {}
     ~_UndoTransliterate_Data() { delete pOffsets; delete pHistory; }
@@ -381,14 +381,14 @@ void SwUndoTransliterate::DoTransliterate(SwDoc & rDoc, SwPaM & rPam)
     rDoc.getIDocumentContentOperations().TransliterateText( rPam, aTrans );
 }
 
-void SwUndoTransliterate::AddChanges( SwTxtNode& rTNd,
+void SwUndoTransliterate::AddChanges( SwTextNode& rTNd,
                     sal_Int32 nStart, sal_Int32 nLen,
                     uno::Sequence <sal_Int32>& rOffsets )
 {
     long nOffsLen = rOffsets.getLength();
     _UndoTransliterate_Data* pNew = new _UndoTransliterate_Data(
                         rTNd.GetIndex(), nStart, (sal_Int32)nOffsLen,
-                        rTNd.GetTxt().copy(nStart, nLen));
+                        rTNd.GetText().copy(nStart, nLen));
 
     aChanges.push_back( pNew );
 
@@ -442,7 +442,7 @@ void SwUndoTransliterate::AddChanges( SwTxtNode& rTNd,
             pNew->pHistory = new SwHistory;
             SwRegHistory aRHst( rTNd, pNew->pHistory );
             pNew->pHistory->CopyAttr( rTNd.GetpSwpHints(),
-                    pNew->nNdIdx, 0, rTNd.GetTxt().getLength(), false );
+                    pNew->nNdIdx, 0, rTNd.GetText().getLength(), false );
         }
         break;
     }
@@ -450,7 +450,7 @@ void SwUndoTransliterate::AddChanges( SwTxtNode& rTNd,
 
 void _UndoTransliterate_Data::SetChangeAtNode( SwDoc& rDoc )
 {
-    SwTxtNode* pTNd = rDoc.GetNodes()[ nNdIdx ]->GetTxtNode();
+    SwTextNode* pTNd = rDoc.GetNodes()[ nNdIdx ]->GetTextNode();
     if( pTNd )
     {
         Sequence <sal_Int32> aOffsets( pOffsets ? pOffsets->getLength() : nLen );
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 016ad41580db..4d07b681e005 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -142,18 +142,18 @@ SwUndoRedlineDelete::SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUsrId )
     : SwUndoRedline( nUsrId ? nUsrId : UNDO_DELETE, rRange ),
     bCanGroup( false ), bIsDelim( false ), bIsBackspace( false )
 {
-    const SwTxtNode* pTNd;
+    const SwTextNode* pTNd;
     if( UNDO_DELETE == mnUserId &&
-        nSttNode == nEndNode && nSttCntnt + 1 == nEndCntnt &&
-        0 != (pTNd = rRange.GetNode().GetTxtNode()) )
+        nSttNode == nEndNode && nSttContent + 1 == nEndContent &&
+        0 != (pTNd = rRange.GetNode().GetTextNode()) )
     {
-        sal_Unicode const cCh = pTNd->GetTxt()[nSttCntnt];
+        sal_Unicode const cCh = pTNd->GetText()[nSttContent];
         if( CH_TXTATR_BREAKWORD != cCh && CH_TXTATR_INWORD != cCh )
         {
             bCanGroup = true;
-            bIsDelim = !GetAppCharClass().isLetterNumeric( pTNd->GetTxt(),
-                                                            nSttCntnt );
-            bIsBackspace = nSttCntnt == rRange.GetPoint()->nContent.GetIndex();
+            bIsDelim = !GetAppCharClass().isLetterNumeric( pTNd->GetText(),
+                                                            nSttContent );
+            bIsBackspace = nSttContent == rRange.GetPoint()->nContent.GetIndex();
         }
     }
 
@@ -185,9 +185,9 @@ bool SwUndoRedlineDelete::CanGrouping( const SwUndoRedlineDelete& rNext )
         rNext.nEndNode == nEndNode )
     {
         int bIsEnd = 0;
-        if( rNext.nSttCntnt == nEndCntnt )
+        if( rNext.nSttContent == nEndContent )
             bIsEnd = 1;
-        else if( rNext.nEndCntnt == nSttCntnt )
+        else if( rNext.nEndContent == nSttContent )
             bIsEnd = -1;
 
         if( bIsEnd &&
@@ -198,9 +198,9 @@ bool SwUndoRedlineDelete::CanGrouping( const SwUndoRedlineDelete& rNext )
              )))
         {
             if( 1 == bIsEnd )
-                nEndCntnt = rNext.nEndCntnt;
+                nEndContent = rNext.nEndContent;
             else
-                nSttCntnt = rNext.nSttCntnt;
+                nSttContent = rNext.nSttContent;
             bRet = true;
         }
     }
@@ -211,7 +211,7 @@ SwUndoRedlineSort::SwUndoRedlineSort( const SwPaM& rRange,
                                     const SwSortOptions& rOpt )
     : SwUndoRedline( UNDO_SORT_TXT, rRange ),
     pOpt( new SwSortOptions( rOpt ) ),
-    nSaveEndNode( nEndNode ), nOffset( 0 ), nSaveEndCntnt( nEndCntnt )
+    nSaveEndNode( nEndNode ), nOffset( 0 ), nSaveEndContent( nEndContent )
 {
 }
 
@@ -239,10 +239,10 @@ void SwUndoRedlineSort::UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam)
         sal_uInt16 nFnd = rDoc.getIDocumentRedlineAccess().GetRedlinePos(
                             *rDoc.GetNodes()[ nSttNode + 1 ],
                             nsRedlineType_t::REDLINE_INSERT );
-        OSL_ENSURE( USHRT_MAX != nFnd && nFnd+1 < (sal_uInt16)rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size(),
+        OSL_ENSURE( USHRT_MAX != nFnd && nFnd+1 < (sal_uInt16)rDoc.getIDocumentRedlineAccess().GetRedlineTable().size(),
                     "could not find an Insert object" );
         ++nFnd;
-        rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[nFnd]->Show(1, nFnd);
+        rDoc.getIDocumentRedlineAccess().GetRedlineTable()[nFnd]->Show(1, nFnd);
     }
 
     {
@@ -250,7 +250,7 @@ void SwUndoRedlineSort::UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam)
         aTmp.GetMark()->nContent = 0;
         aTmp.SetMark();
         aTmp.GetPoint()->nNode = nSaveEndNode;
-        aTmp.GetPoint()->nContent.Assign( aTmp.GetCntntNode(), nSaveEndCntnt );
+        aTmp.GetPoint()->nContent.Assign( aTmp.GetContentNode(), nSaveEndContent );
         rDoc.getIDocumentRedlineAccess().DeleteRedline( aTmp, true, USHRT_MAX );
     }
 
@@ -259,12 +259,12 @@ void SwUndoRedlineSort::UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam)
     SwPaM *const pPam = & rPam;
     pPam->DeleteMark();
     pPam->GetPoint()->nNode.Assign( aPrevIdx.GetNode(), +1 );
-    SwCntntNode* pCNd = pPam->GetCntntNode();
+    SwContentNode* pCNd = pPam->GetContentNode();
     pPam->GetPoint()->nContent.Assign(pCNd, 0 );
     pPam->SetMark();
 
     pPam->GetPoint()->nNode += nOffsetTemp;
-    pCNd = pPam->GetCntntNode();
+    pCNd = pPam->GetContentNode();
     pPam->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
 
     SetValues( *pPam );
@@ -286,7 +286,7 @@ void SwUndoRedlineSort::RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam)
 
     pPam->DeleteMark();
     pPam->GetPoint()->nNode.Assign( aPrevIdx.GetNode(), +1 );
-    SwCntntNode* pCNd = pPam->GetCntntNode();
+    SwContentNode* pCNd = pPam->GetContentNode();
     sal_Int32 nLen = pCNd->Len();
     if( nLen > nCntStt )
         nLen = nCntStt;
@@ -294,14 +294,14 @@ void SwUndoRedlineSort::RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam)
     pPam->SetMark();
 
     pPam->GetPoint()->nNode += nOffsetTemp;
-    pCNd = pPam->GetCntntNode();
+    pCNd = pPam->GetContentNode();
     pPam->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
 
     SetValues( rPam );
 
     SetPaM( rPam );
     rPam.GetPoint()->nNode = nSaveEndNode;
-    rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), nSaveEndCntnt );
+    rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), nSaveEndContent );
 }
 
 void SwUndoRedlineSort::RepeatImpl(::sw::RepeatContext & rContext)
@@ -313,7 +313,7 @@ void SwUndoRedlineSort::SetSaveRange( const SwPaM& rRange )
 {
     const SwPosition& rPos = *rRange.End();
     nSaveEndNode = rPos.nNode.GetIndex();
-    nSaveEndCntnt = rPos.nContent.GetIndex();
+    nSaveEndContent = rPos.nContent.GetIndex();
 }
 
 void SwUndoRedlineSort::SetOffset( const SwNodeIndex& rIdx )
@@ -406,22 +406,22 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext)
         pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
 
         // per definition Point is end (in SwUndRng!)
-        SwCntntNode* pCSttNd = pPam->GetCntntNode( false );
-        SwCntntNode* pCEndNd = pPam->GetCntntNode( true );
+        SwContentNode* pCSttNd = pPam->GetContentNode( false );
+        SwContentNode* pCEndNd = pPam->GetContentNode( true );
 
         // if start- and end-content is zero, then the doc-compare moves
         // complete nodes into the current doc. And then the selection
         // must be from end to start, so the delete join into the right
         // direction.
-        if( !nSttCntnt && !nEndCntnt )
+        if( !nSttContent && !nEndContent )
             pPam->Exchange();
 
-        bool bJoinTxt, bJoinPrev;
-        sw_GetJoinFlags( *pPam, bJoinTxt, bJoinPrev );
+        bool bJoinText, bJoinPrev;
+        sw_GetJoinFlags( *pPam, bJoinText, bJoinPrev );
 
         pUnDel = new SwUndoDelete( *pPam, false );
 
-        if( bJoinTxt )
+        if( bJoinText )
             sw_JoinText( *pPam, bJoinPrev );
 
         if( pCSttNd && !pCEndNd)
@@ -464,11 +464,11 @@ void SwUndoCompDoc::RedoImpl(::sw::UndoRedoContext & rContext)
         if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
         {
             SwRangeRedline* pTmp = new SwRangeRedline( *pRedlData, *pPam );
-            static_cast<SwRedlineTbl&>(pDoc->getIDocumentRedlineAccess().GetRedlineTbl()).Insert( pTmp );
+            static_cast<SwRedlineTable&>(pDoc->getIDocumentRedlineAccess().GetRedlineTable()).Insert( pTmp );
             pTmp->InvalidateRange();
         }
         else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) &&
-                !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+                !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
             pDoc->getIDocumentRedlineAccess().SplitRedline( *pPam );
     }
     else
@@ -484,7 +484,7 @@ void SwUndoCompDoc::RedoImpl(::sw::UndoRedoContext & rContext)
         SetPaM( *pPam );
 
         SwRangeRedline* pTmp = new SwRangeRedline( *pRedlData, *pPam );
-        static_cast<SwRedlineTbl&>(pDoc->getIDocumentRedlineAccess().GetRedlineTbl()).Insert( pTmp );
+        static_cast<SwRedlineTable&>(pDoc->getIDocumentRedlineAccess().GetRedlineTable()).Insert( pTmp );
         pTmp->InvalidateRange();
     }
 
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index c78d02a3ad28..722510d05dd8 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -43,18 +43,18 @@
 static SfxItemSet* lcl_GetAttrSet( const SwSection& rSect )
 {
     // save attributes of the format (columns, color, ...)
-    // Cntnt and Protect items are not interesting since they are already
+    // Content and Protect items are not interesting since they are already
     // stored in Section, thus delete them.
     SfxItemSet* pAttr = 0;
-    if( rSect.GetFmt() )
+    if( rSect.GetFormat() )
     {
         sal_uInt16 nCnt = 1;
         if( rSect.IsProtect() )
             ++nCnt;
 
-        if( nCnt < rSect.GetFmt()->GetAttrSet().Count() )
+        if( nCnt < rSect.GetFormat()->GetAttrSet().Count() )
         {
-            pAttr = new SfxItemSet( rSect.GetFmt()->GetAttrSet() );
+            pAttr = new SfxItemSet( rSect.GetFormat()->GetAttrSet() );
             pAttr->ClearItem( RES_PROTECT );
             pAttr->ClearItem( RES_CNTNT );
             if( !pAttr->Count() )
@@ -74,7 +74,7 @@ SwUndoInsSection::SwUndoInsSection(
     , m_nSectionNodePos(0)
     , m_bSplitAtStart(false)
     , m_bSplitAtEnd(false)
-    , m_bUpdateFtn(false)
+    , m_bUpdateFootnote(false)
 {
     SwDoc& rDoc = *rPam.GetDoc();
     if( rDoc.getIDocumentRedlineAccess().IsRedlineOn() )
@@ -89,7 +89,7 @@ SwUndoInsSection::SwUndoInsSection(
 
     if( !rPam.HasMark() )
     {
-        const SwCntntNode* pCNd = rPam.GetPoint()->nNode.GetNode().GetCntntNode();
+        const SwContentNode* pCNd = rPam.GetPoint()->nNode.GetNode().GetContentNode();
         if( pCNd && pCNd->HasSwAttrSet() && (
             !rPam.GetPoint()->nContent.GetIndex() ||
             rPam.GetPoint()->nContent.GetIndex() == pCNd->Len() ))
@@ -99,7 +99,7 @@ SwUndoInsSection::SwUndoInsSection(
             if( aBrkSet.Count() )
             {
                 m_pHistory.reset( new SwHistory );
-                m_pHistory->CopyFmtAttr( aBrkSet, pCNd->GetIndex() );
+                m_pHistory->CopyFormatAttr( aBrkSet, pCNd->GetIndex() );
             }
         }
     }
@@ -124,14 +124,14 @@ void SwUndoInsSection::UndoImpl(::sw::UndoRedoContext & rContext)
 
     // no selection?
     SwNodeIndex aIdx( *pNd );
-    if( ( !nEndNode && COMPLETE_STRING == nEndCntnt ) ||
-        ( nSttNode == nEndNode && nSttCntnt == nEndCntnt ))
+    if( ( !nEndNode && COMPLETE_STRING == nEndContent ) ||
+        ( nSttNode == nEndNode && nSttContent == nEndContent ))
         // delete simply all nodes
         rDoc.GetNodes().Delete( aIdx, pNd->EndOfSectionIndex() -
                                         aIdx.GetIndex() );
     else
         // just delete format, rest happens automatically
-        rDoc.DelSectionFmt( pNd->GetSection().GetFmt() );
+        rDoc.DelSectionFormat( pNd->GetSection().GetFormat() );
 
     // do we need to consolidate?
     if (m_bSplitAtStart)
@@ -149,9 +149,9 @@ void SwUndoInsSection::UndoImpl(::sw::UndoRedoContext & rContext)
         m_pHistory->TmpRollback( &rDoc, 0, false );
     }
 
-    if (m_bUpdateFtn)
+    if (m_bUpdateFootnote)
     {
-        rDoc.GetFtnIdxs().UpdateFtn( aIdx );
+        rDoc.GetFootnoteIdxs().UpdateFootnote( aIdx );
     }
 
     AddUndoRedoPaM(rContext);
@@ -194,7 +194,7 @@ void SwUndoInsSection::RedoImpl(::sw::UndoRedoContext & rContext)
         rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
     }
     else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) &&
-            !rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+            !rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         SwPaM aPam( *pSectNd->EndOfSectionNode(), *pSectNd, 1 );
         rDoc.getIDocumentRedlineAccess().SplitRedline( aPam );
@@ -230,34 +230,34 @@ void SwUndoInsSection::RepeatImpl(::sw::RepeatContext & rContext)
 void SwUndoInsSection::Join( SwDoc& rDoc, sal_uLong nNode )
 {
     SwNodeIndex aIdx( rDoc.GetNodes(), nNode );
-    SwTxtNode* pTxtNd = aIdx.GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNd, "Where is my TextNode?" );
+    SwTextNode* pTextNd = aIdx.GetNode().GetTextNode();
+    OSL_ENSURE( pTextNd, "Where is my TextNode?" );
 
     {
         RemoveIdxRel(
             nNode + 1,
-            SwPosition( aIdx, SwIndex( pTxtNd, pTxtNd->GetTxt().getLength() ) ) );
+            SwPosition( aIdx, SwIndex( pTextNd, pTextNd->GetText().getLength() ) ) );
     }
-    pTxtNd->JoinNext();
+    pTextNd->JoinNext();
 
     if (m_pHistory.get())
     {
-        SwIndex aCntIdx( pTxtNd, 0 );
-        pTxtNd->RstTxtAttr( aCntIdx, pTxtNd->Len(), 0, 0, true );
+        SwIndex aCntIdx( pTextNd, 0 );
+        pTextNd->RstTextAttr( aCntIdx, pTextNd->Len(), 0, 0, true );
     }
 }
 
 void
-SwUndoInsSection::SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart)
+SwUndoInsSection::SaveSplitNode(SwTextNode *const pTextNd, bool const bAtStart)
 {
-    if( pTxtNd->GetpSwpHints() )
+    if( pTextNd->GetpSwpHints() )
     {
         if (!m_pHistory.get())
         {
             m_pHistory.reset( new SwHistory );
         }
-        m_pHistory->CopyAttr( pTxtNd->GetpSwpHints(), pTxtNd->GetIndex(), 0,
-                            pTxtNd->GetTxt().getLength(), false );
+        m_pHistory->CopyAttr( pTextNd->GetpSwpHints(), pTextNd->GetIndex(), 0,
+                            pTextNd->GetText().getLength(), false );
     }
 
     if (bAtStart)
@@ -283,7 +283,7 @@ private:
 
 public:
     SwUndoDelSection(
-        SwSectionFmt const&, SwSection const&, SwNodeIndex const*const);
+        SwSectionFormat const&, SwSection const&, SwNodeIndex const*const);
 
     virtual ~SwUndoDelSection();
 
@@ -291,14 +291,14 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 };
 
-SwUndo * MakeUndoDelSection(SwSectionFmt const& rFormat)
+SwUndo * MakeUndoDelSection(SwSectionFormat const& rFormat)
 {
     return new SwUndoDelSection(rFormat, *rFormat.GetSection(),
-                rFormat.GetCntnt().GetCntntIdx());
+                rFormat.GetContent().GetContentIdx());
 }
 
 SwUndoDelSection::SwUndoDelSection(
-            SwSectionFmt const& rSectionFmt, SwSection const& rSection,
+            SwSectionFormat const& rSectionFormat, SwSection const& rSection,
             SwNodeIndex const*const pIndex)
     : SwUndo( UNDO_DELSECTION )
     , m_pSectionData( new SwSectionData(rSection) )
@@ -306,7 +306,7 @@ SwUndoDelSection::SwUndoDelSection(
             ? new SwTOXBase(static_cast<SwTOXBaseSection const&>(rSection))
             : 0 )
     , m_pAttrSet( ::lcl_GetAttrSet(rSection) )
-    , m_pMetadataUndo( rSectionFmt.CreateUndo() )
+    , m_pMetadataUndo( rSectionFormat.CreateUndo() )
     , m_nStartNode( pIndex->GetIndex() )
     , m_nEndNode( pIndex->GetNode().EndOfSectionIndex() )
 {
@@ -329,21 +329,21 @@ void SwUndoDelSection::UndoImpl(::sw::UndoRedoContext & rContext)
     {
         SwNodeIndex aStt( rDoc.GetNodes(), m_nStartNode );
         SwNodeIndex aEnd( rDoc.GetNodes(), m_nEndNode-2 );
-        SwSectionFmt* pFmt = rDoc.MakeSectionFmt( 0 );
+        SwSectionFormat* pFormat = rDoc.MakeSectionFormat( 0 );
         if (m_pAttrSet.get())
         {
-            pFmt->SetFmtAttr( *m_pAttrSet );
+            pFormat->SetFormatAttr( *m_pAttrSet );
         }
 
         /// OD 04.10.2002 #102894#
         /// remember inserted section node for further calculations
         SwSectionNode* pInsertedSectNd = rDoc.GetNodes().InsertTextSection(
-                aStt, *pFmt, *m_pSectionData, 0, & aEnd);
+                aStt, *pFormat, *m_pSectionData, 0, & aEnd);
 
-        if( SfxItemState::SET == pFmt->GetItemState( RES_FTN_AT_TXTEND ) ||
-            SfxItemState::SET == pFmt->GetItemState( RES_END_AT_TXTEND ))
+        if( SfxItemState::SET == pFormat->GetItemState( RES_FTN_AT_TXTEND ) ||
+            SfxItemState::SET == pFormat->GetItemState( RES_END_AT_TXTEND ))
         {
-            rDoc.GetFtnIdxs().UpdateFtn( aStt );
+            rDoc.GetFootnoteIdxs().UpdateFootnote( aStt );
         }
 
         /// OD 04.10.2002 #102894#
@@ -359,13 +359,13 @@ void SwUndoDelSection::UndoImpl(::sw::UndoRedoContext & rContext)
              !aInsertedSect.GetCondition().isEmpty() )
         {
             SwCalc aCalc( rDoc );
-            rDoc.getIDocumentFieldsAccess().FldsToCalc(aCalc, pInsertedSectNd->GetIndex(), USHRT_MAX);
+            rDoc.getIDocumentFieldsAccess().FieldsToCalc(aCalc, pInsertedSectNd->GetIndex(), USHRT_MAX);
             bool bRecalcCondHidden =
                     aCalc.Calculate( aInsertedSect.GetCondition() ).GetBool();
             aInsertedSect.SetCondHidden( bRecalcCondHidden );
         }
 
-        pFmt->RestoreMetadata(m_pMetadataUndo);
+        pFormat->RestoreMetadata(m_pMetadataUndo);
     }
 }
 
@@ -377,7 +377,7 @@ void SwUndoDelSection::RedoImpl(::sw::UndoRedoContext & rContext)
         rDoc.GetNodes()[ m_nStartNode ]->GetSectionNode();
     OSL_ENSURE( pNd, "Where is my SectionNode?" );
     // just delete format, rest happens automatically
-    rDoc.DelSectionFmt( pNd->GetSection().GetFmt() );
+    rDoc.DelSectionFormat( pNd->GetSection().GetFormat() );
 }
 
 class SwUndoUpdateSection
@@ -400,10 +400,10 @@ public:
 };
 
 SwUndo *
-MakeUndoUpdateSection(SwSectionFmt const& rFormat, bool const bOnlyAttr)
+MakeUndoUpdateSection(SwSectionFormat const& rFormat, bool const bOnlyAttr)
 {
     return new SwUndoUpdateSection(*rFormat.GetSection(),
-                rFormat.GetCntnt().GetCntntIdx(), bOnlyAttr);
+                rFormat.GetContent().GetContentIdx(), bOnlyAttr);
 }
 
 SwUndoUpdateSection::SwUndoUpdateSection(
@@ -429,28 +429,28 @@ void SwUndoUpdateSection::UndoImpl(::sw::UndoRedoContext & rContext)
     OSL_ENSURE( pSectNd, "Where is my SectionNode?" );
 
     SwSection& rNdSect = pSectNd->GetSection();
-    SwFmt* pFmt = rNdSect.GetFmt();
+    SwFormat* pFormat = rNdSect.GetFormat();
 
     SfxItemSet* pCur = ::lcl_GetAttrSet( rNdSect );
     if (m_pAttrSet.get())
     {
         // The Content and Protect items must persist
         const SfxPoolItem* pItem;
-        m_pAttrSet->Put( pFmt->GetFmtAttr( RES_CNTNT ));
-        if( SfxItemState::SET == pFmt->GetItemState( RES_PROTECT, true, &pItem ))
+        m_pAttrSet->Put( pFormat->GetFormatAttr( RES_CNTNT ));
+        if( SfxItemState::SET == pFormat->GetItemState( RES_PROTECT, true, &pItem ))
         {
             m_pAttrSet->Put( *pItem );
         }
-        pFmt->DelDiffs( *m_pAttrSet );
+        pFormat->DelDiffs( *m_pAttrSet );
         m_pAttrSet->ClearItem( RES_CNTNT );
-        pFmt->SetFmtAttr( *m_pAttrSet );
+        pFormat->SetFormatAttr( *m_pAttrSet );
     }
     else
     {
         // than the old ones need to be deleted
-        pFmt->ResetFmtAttr( RES_FRMATR_BEGIN, RES_BREAK );
-        pFmt->ResetFmtAttr( RES_HEADER, RES_OPAQUE );
-        pFmt->ResetFmtAttr( RES_SURROUND, RES_FRMATR_END-1 );
+        pFormat->ResetFormatAttr( RES_FRMATR_BEGIN, RES_BREAK );
+        pFormat->ResetFormatAttr( RES_HEADER, RES_OPAQUE );
+        pFormat->ResetFormatAttr( RES_SURROUND, RES_FRMATR_END-1 );
     }
     m_pAttrSet.reset(pCur);
 
diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx
index c771744bab2a..a32c1cbe2e03 100644
--- a/sw/source/core/undo/unsort.cxx
+++ b/sw/source/core/undo/unsort.cxx
@@ -44,30 +44,30 @@ SwSortUndoElement::~SwSortUndoElement()
 SwUndoSort::SwUndoSort(const SwPaM& rRg, const SwSortOptions& rOpt)
     : SwUndo(UNDO_SORT_TXT)
     , SwUndRng(rRg)
-    , pUndoTblAttr(0)
+    , pUndoTableAttr(0)
     , pRedlData(0)
-    , nTblNd(0)
+    , nTableNd(0)
 {
     pSortOpt = new SwSortOptions(rOpt);
 }
 
-SwUndoSort::SwUndoSort( sal_uLong nStt, sal_uLong nEnd, const SwTableNode& rTblNd,
+SwUndoSort::SwUndoSort( sal_uLong nStt, sal_uLong nEnd, const SwTableNode& rTableNd,
                         const SwSortOptions& rOpt, bool bSaveTable )
-    : SwUndo(UNDO_SORT_TBL), pUndoTblAttr( 0 ), pRedlData( 0 )
+    : SwUndo(UNDO_SORT_TBL), pUndoTableAttr( 0 ), pRedlData( 0 )
 {
     nSttNode = nStt;
     nEndNode = nEnd;
-    nTblNd   = rTblNd.GetIndex();
+    nTableNd   = rTableNd.GetIndex();
 
     pSortOpt = new SwSortOptions(rOpt);
     if( bSaveTable )
-        pUndoTblAttr = new SwUndoAttrTbl( rTblNd );
+        pUndoTableAttr = new SwUndoAttrTable( rTableNd );
 }
 
 SwUndoSort::~SwUndoSort()
 {
     delete pSortOpt;
-    delete pUndoTblAttr;
+    delete pUndoTableAttr;
     delete pRedlData;
 }
 
@@ -79,26 +79,26 @@ void SwUndoSort::UndoImpl(::sw::UndoRedoContext & rContext)
         // Undo for Table
         RemoveIdxFromSection( rDoc, nSttNode, &nEndNode );
 
-        if( pUndoTblAttr )
+        if( pUndoTableAttr )
         {
-            pUndoTblAttr->UndoImpl(rContext);
+            pUndoTableAttr->UndoImpl(rContext);
         }
 
-        SwTableNode* pTblNd = rDoc.GetNodes()[ nTblNd ]->GetTableNode();
+        SwTableNode* pTableNd = rDoc.GetNodes()[ nTableNd ]->GetTableNode();
 
         // #i37739# A simple 'MakeFrms' after the node sorting
         // does not work if the table is inside a frame and has no prev/next.
-        SwNode2Layout aNode2Layout( *pTblNd );
+        SwNode2Layout aNode2Layout( *pTableNd );
 
-        pTblNd->DelFrms();
-        const SwTable& rTbl = pTblNd->GetTable();
+        pTableNd->DelFrms();
+        const SwTable& rTable = pTableNd->GetTable();
 
         SwMovedBoxes aMovedList;
         for( size_t i=0; i < aSortList.size(); i++)
         {
-            const SwTableBox* pSource = rTbl.GetTblBox(
+            const SwTableBox* pSource = rTable.GetTableBox(
                     *aSortList[i].SORT_TXT_TBL.TBL.pSource );
-            const SwTableBox* pTarget = rTbl.GetTblBox(
+            const SwTableBox* pTarget = rTable.GetTableBox(
                     *aSortList[i].SORT_TXT_TBL.TBL.pTarget );
 
             // move back
@@ -112,7 +112,7 @@ void SwUndoSort::UndoImpl(::sw::UndoRedoContext & rContext)
         // Restore table frames:
         // #i37739# A simple 'MakeFrms' after the node sorting
         // does not work if the table is inside a frame and has no prev/next.
-        const sal_uLong nIdx = pTblNd->GetIndex();
+        const sal_uLong nIdx = pTableNd->GetIndex();
         aNode2Layout.RestoreUpperFrms( rDoc.GetNodes(), nIdx, nIdx + 1 );
     }
     else
@@ -159,21 +159,21 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext)
         // Redo for Table
         RemoveIdxFromSection( rDoc, nSttNode, &nEndNode );
 
-        SwTableNode* pTblNd = rDoc.GetNodes()[ nTblNd ]->GetTableNode();
+        SwTableNode* pTableNd = rDoc.GetNodes()[ nTableNd ]->GetTableNode();
 
         // #i37739# A simple 'MakeFrms' after the node sorting
         // does not work if the table is inside a frame and has no prev/next.
-        SwNode2Layout aNode2Layout( *pTblNd );
+        SwNode2Layout aNode2Layout( *pTableNd );
 
-        pTblNd->DelFrms();
-        const SwTable& rTbl = pTblNd->GetTable();
+        pTableNd->DelFrms();
+        const SwTable& rTable = pTableNd->GetTable();
 
         SwMovedBoxes aMovedList;
         for(size_t i=0; i < aSortList.size(); ++i)
         {
-            const SwTableBox* pSource = rTbl.GetTblBox(
+            const SwTableBox* pSource = rTable.GetTableBox(
                     *aSortList[i].SORT_TXT_TBL.TBL.pSource );
-            const SwTableBox* pTarget = rTbl.GetTblBox(
+            const SwTableBox* pTarget = rTable.GetTableBox(
                     *aSortList[i].SORT_TXT_TBL.TBL.pTarget );
 
             // move back
@@ -183,15 +183,15 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext)
             aMovedList.push_back( pSource );
         }
 
-        if( pUndoTblAttr )
+        if( pUndoTableAttr )
         {
-            pUndoTblAttr->RedoImpl(rContext);
+            pUndoTableAttr->RedoImpl(rContext);
         }
 
         // Restore table frames:
         // #i37739# A simple 'MakeFrms' after the node sorting
         // does not work if the table is inside a frame and has no prev/next.
-        const sal_uLong nIdx = pTblNd->GetIndex();
+        const sal_uLong nIdx = pTableNd->GetIndex();
         aNode2Layout.RestoreUpperFrms( rDoc.GetNodes(), nIdx, nIdx + 1 );
     }
     else
@@ -222,10 +222,10 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext)
             delete *it;
         aIdxList.clear();
         SetPaM(rPam, true);
-        SwTxtNode const*const pTNd = rPam.GetNode().GetTxtNode();
+        SwTextNode const*const pTNd = rPam.GetNode().GetTextNode();
         if( pTNd )
         {
-            rPam.GetPoint()->nContent = pTNd->GetTxt().getLength();
+            rPam.GetPoint()->nContent = pTNd->GetText().getLength();
         }
     }
 }
@@ -238,7 +238,7 @@ void SwUndoSort::RepeatImpl(::sw::RepeatContext & rContext)
         SwPaM *const pPam = & rContext.GetRepeatPaM();
         SwDoc& rDoc = *pPam->GetDoc();
 
-        if( !rDoc.IsIdxInTbl( pPam->Start()->nNode ) )
+        if( !rDoc.IsIdxInTable( pPam->Start()->nNode ) )
             rDoc.SortText(*pPam, *pSortOpt);
     }
 }
diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx
index fc9870025196..acaf483f0d4c 100644
--- a/sw/source/core/undo/unspnd.cxx
+++ b/sw/source/core/undo/unspnd.cxx
@@ -38,16 +38,16 @@
 SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos,
                                     bool bChkTable )
     : SwUndo( UNDO_SPLITNODE ), pHistory( 0 ), pRedlData( 0 ), nNode( rPos.nNode.GetIndex() ),
-        nCntnt( rPos.nContent.GetIndex() ),
-        bTblFlag( false ), bChkTblStt( bChkTable )
+        nContent( rPos.nContent.GetIndex() ),
+        bTableFlag( false ), bChkTableStt( bChkTable )
 {
-    SwTxtNode *const pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNd, "only for TextNode" );
-    if( pTxtNd->GetpSwpHints() )
+    SwTextNode *const pTextNd = rPos.nNode.GetNode().GetTextNode();
+    OSL_ENSURE( pTextNd, "only for TextNode" );
+    if( pTextNd->GetpSwpHints() )
     {
         pHistory = new SwHistory;
-        pHistory->CopyAttr( pTxtNd->GetpSwpHints(), nNode, 0,
-                            pTxtNd->GetTxt().getLength(), false );
+        pHistory->CopyAttr( pTextNd->GetpSwpHints(), nNode, 0,
+                            pTextNd->GetText().getLength(), false );
         if( !pHistory->Count() )
             DELETEZ( pHistory );
     }
@@ -58,7 +58,7 @@ SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos,
         SetRedlineMode( pDoc->getIDocumentRedlineAccess().GetRedlineMode() );
     }
 
-    nParRsid = pTxtNd->GetParRsid();
+    nParRsid = pTextNd->GetParRsid();
 }
 
 SwUndoSplitNode::~SwUndoSplitNode()
@@ -72,53 +72,53 @@ void SwUndoSplitNode::UndoImpl(::sw::UndoRedoContext & rContext)
     SwDoc *const pDoc = & rContext.GetDoc();
     SwPaM & rPam( rContext.GetCursorSupplier().CreateNewShellCursor() );
     rPam.DeleteMark();
-    if( bTblFlag )
+    if( bTableFlag )
     {
         // than a TextNode was added directly before the current table
         SwNodeIndex& rIdx = rPam.GetPoint()->nNode;
         rIdx = nNode;
-        SwTxtNode* pTNd;
+        SwTextNode* pTNd;
         SwNode* pCurrNd = pDoc->GetNodes()[ nNode + 1 ];
-        SwTableNode* pTblNd = pCurrNd->FindTableNode();
-        if( pCurrNd->IsCntntNode() && pTblNd &&
-            0 != ( pTNd = pDoc->GetNodes()[ pTblNd->GetIndex()-1 ]->GetTxtNode() ))
+        SwTableNode* pTableNd = pCurrNd->FindTableNode();
+        if( pCurrNd->IsContentNode() && pTableNd &&
+            0 != ( pTNd = pDoc->GetNodes()[ pTableNd->GetIndex()-1 ]->GetTextNode() ))
         {
             // move break attributes
-            SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
+            SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
             const SfxItemSet* pNdSet = pTNd->GetpSwAttrSet();
             if( pNdSet )
             {
                 const SfxPoolItem *pItem;
                 if( SfxItemState::SET == pNdSet->GetItemState( RES_PAGEDESC, false,
                     &pItem ) )
-                    pTableFmt->SetFmtAttr( *pItem );
+                    pTableFormat->SetFormatAttr( *pItem );
 
                 if( SfxItemState::SET == pNdSet->GetItemState( RES_BREAK, false,
                      &pItem ) )
-                    pTableFmt->SetFmtAttr( *pItem );
+                    pTableFormat->SetFormatAttr( *pItem );
             }
 
             // than delete it again
-            SwNodeIndex aDelNd( *pTblNd, -1 );
-            rPam.GetPoint()->nContent.Assign( static_cast<SwCntntNode*>(pCurrNd), 0 );
+            SwNodeIndex aDelNd( *pTableNd, -1 );
+            rPam.GetPoint()->nContent.Assign( static_cast<SwContentNode*>(pCurrNd), 0 );
             RemoveIdxRel( aDelNd.GetIndex(), *rPam.GetPoint() );
             pDoc->GetNodes().Delete( aDelNd );
         }
     }
     else
     {
-        SwTxtNode * pTNd = pDoc->GetNodes()[ nNode ]->GetTxtNode();
+        SwTextNode * pTNd = pDoc->GetNodes()[ nNode ]->GetTextNode();
         if( pTNd )
         {
             rPam.GetPoint()->nNode = *pTNd;
-            rPam.GetPoint()->nContent.Assign(pTNd, pTNd->GetTxt().getLength());
+            rPam.GetPoint()->nContent.Assign(pTNd, pTNd->GetText().getLength());
 
             if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
             {
                 rPam.SetMark();
                 ++rPam.GetMark()->nNode;
                 rPam.GetMark()->nContent.Assign( rPam.GetMark()->
-                                    nNode.GetNode().GetCntntNode(), 0 );
+                                    nNode.GetNode().GetContentNode(), 0 );
                 pDoc->getIDocumentRedlineAccess().DeleteRedline( rPam, true, USHRT_MAX );
                 rPam.DeleteMark();
             }
@@ -130,9 +130,9 @@ void SwUndoSplitNode::UndoImpl(::sw::UndoRedoContext & rContext)
             {
                 rPam.GetPoint()->nContent = 0;
                 rPam.SetMark();
-                rPam.GetPoint()->nContent = pTNd->GetTxt().getLength();
+                rPam.GetPoint()->nContent = pTNd->GetText().getLength();
 
-                pDoc->RstTxtAttrs( rPam, true );
+                pDoc->RstTextAttrs( rPam, true );
                 pHistory->TmpRollback( pDoc, 0, false );
             }
 
@@ -143,28 +143,28 @@ void SwUndoSplitNode::UndoImpl(::sw::UndoRedoContext & rContext)
     // also set the cursor onto undo section
     rPam.DeleteMark();
     rPam.GetPoint()->nNode = nNode;
-    rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), nCntnt );
+    rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), nContent );
 }
 
 void SwUndoSplitNode::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwPaM & rPam( rContext.GetCursorSupplier().CreateNewShellCursor() );
     rPam.GetPoint()->nNode = nNode;
-    SwTxtNode * pTNd = rPam.GetNode().GetTxtNode();
-    OSL_ENSURE(pTNd, "SwUndoSplitNode::RedoImpl(): SwTxtNode expected");
+    SwTextNode * pTNd = rPam.GetNode().GetTextNode();
+    OSL_ENSURE(pTNd, "SwUndoSplitNode::RedoImpl(): SwTextNode expected");
     if (pTNd)
     {
-        rPam.GetPoint()->nContent.Assign( pTNd, nCntnt );
+        rPam.GetPoint()->nContent.Assign( pTNd, nContent );
 
         SwDoc* pDoc = rPam.GetDoc();
-        pDoc->getIDocumentContentOperations().SplitNode( *rPam.GetPoint(), bChkTblStt );
+        pDoc->getIDocumentContentOperations().SplitNode( *rPam.GetPoint(), bChkTableStt );
 
         if( pHistory )
             pHistory->SetTmpEnd( pHistory->Count() );
 
         if( ( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) ||
             ( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) &&
-                !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+                !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ))
         {
             rPam.SetMark();
             if( rPam.Move( fnMoveBackward ))
@@ -188,7 +188,7 @@ void SwUndoSplitNode::RedoImpl(::sw::UndoRedoContext & rContext)
 void SwUndoSplitNode::RepeatImpl(::sw::RepeatContext & rContext)
 {
     rContext.GetDoc().getIDocumentContentOperations().SplitNode(
-        *rContext.GetRepeatPaM().GetPoint(), bChkTblStt );
+        *rContext.GetRepeatPaM().GetPoint(), bChkTableStt );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 6e8cd9cf444c..9acedfe8bb57 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -87,13 +87,13 @@ public:
 
 class SwUndoMoves : public boost::ptr_vector<SwUndoMove> {};
 
-struct SwTblToTxtSave;
-class SwTblToTxtSaves : public boost::ptr_vector<SwTblToTxtSave> {
+struct SwTableToTextSave;
+class SwTableToTextSaves : public boost::ptr_vector<SwTableToTextSave> {
 public:
-    SwTblToTxtSaves(size_type n) : boost::ptr_vector<SwTblToTxtSave>(n) {}
+    SwTableToTextSaves(size_type n) : boost::ptr_vector<SwTableToTextSave>(n) {}
 };
 
-struct _UndoTblCpyTbl_Entry
+struct _UndoTableCpyTable_Entry
 {
     sal_uLong nBoxIdx, nOffset;
     SfxItemSet* pBoxNumAttr;
@@ -102,10 +102,10 @@ struct _UndoTblCpyTbl_Entry
     // Was the last paragraph of the new and the first paragraph of the old content joined?
     bool bJoin; // For redlining only
 
-    _UndoTblCpyTbl_Entry( const SwTableBox& rBox );
-    ~_UndoTblCpyTbl_Entry();
+    _UndoTableCpyTable_Entry( const SwTableBox& rBox );
+    ~_UndoTableCpyTable_Entry();
 };
-class _UndoTblCpyTbl_Entries : public boost::ptr_vector<_UndoTblCpyTbl_Entry> {};
+class _UndoTableCpyTable_Entries : public boost::ptr_vector<_UndoTableCpyTable_Entry> {};
 
 class _SaveBox;
 class _SaveLine;
@@ -114,28 +114,28 @@ class _SaveTable
 {
     friend class _SaveBox;
     friend class _SaveLine;
-    SfxItemSet m_aTblSet;
+    SfxItemSet m_aTableSet;
     _SaveLine* m_pLine;
     const SwTable* m_pSwTable;
     SfxItemSets m_aSets;
-    SwFrmFmts m_aFrmFmts;
+    SwFrameFormats m_aFrameFormats;
     sal_uInt16 m_nLineCount;
     bool m_bModifyBox : 1;
     bool m_bSaveFormula : 1;
     bool m_bNewModel : 1;
 
 public:
-    _SaveTable( const SwTable& rTbl, sal_uInt16 nLnCnt = USHRT_MAX,
-                bool bSaveFml = true );
+    _SaveTable( const SwTable& rTable, sal_uInt16 nLnCnt = USHRT_MAX,
+                bool bSaveFormula = true );
     ~_SaveTable();
 
-    sal_uInt16 AddFmt( SwFrmFmt* pFmt, bool bIsLine );
-    void NewFrmFmt( const SwTableLine* , const SwTableBox*, sal_uInt16 nFmtPos,
-                    SwFrmFmt* pOldFmt );
+    sal_uInt16 AddFormat( SwFrameFormat* pFormat, bool bIsLine );
+    void NewFrameFormat( const SwTableLine* , const SwTableBox*, sal_uInt16 nFormatPos,
+                    SwFrameFormat* pOldFormat );
 
-    void RestoreAttr( SwTable& rTbl, bool bModifyBox = false );
-    void SaveCntntAttrs( SwDoc* pDoc );
-    void CreateNew( SwTable& rTbl, bool bCreateFrms = true,
+    void RestoreAttr( SwTable& rTable, bool bModifyBox = false );
+    void SaveContentAttrs( SwDoc* pDoc );
+    void CreateNew( SwTable& rTable, bool bCreateFrms = true,
                     bool bRestoreChart = true );
     bool IsNewModel() const { return m_bNewModel; }
 };
@@ -150,13 +150,13 @@ class _SaveLine
     sal_uInt16 nItemSet;
 
 public:
-    _SaveLine( _SaveLine* pPrev, const SwTableLine& rLine, _SaveTable& rSTbl );
+    _SaveLine( _SaveLine* pPrev, const SwTableLine& rLine, _SaveTable& rSTable );
     ~_SaveLine();
 
-    void RestoreAttr( SwTableLine& rLine, _SaveTable& rSTbl );
-    void SaveCntntAttrs( SwDoc* pDoc );
+    void RestoreAttr( SwTableLine& rLine, _SaveTable& rSTable );
+    void SaveContentAttrs( SwDoc* pDoc );
 
-    void CreateNew( SwTable& rTbl, SwTableBox& rParent, _SaveTable& rSTbl  );
+    void CreateNew( SwTable& rTable, SwTableBox& rParent, _SaveTable& rSTable  );
 };
 
 class _SaveBox
@@ -169,18 +169,18 @@ class _SaveBox
     sal_uInt16 nItemSet;
     union
     {
-        SfxItemSets* pCntntAttrs;
+        SfxItemSets* pContentAttrs;
         _SaveLine* pLine;
     } Ptrs;
 
 public:
-    _SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTbl );
+    _SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTable );
     ~_SaveBox();
 
-    void RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl );
-    void SaveCntntAttrs( SwDoc* pDoc );
+    void RestoreAttr( SwTableBox& rBox, _SaveTable& rSTable );
+    void SaveContentAttrs( SwDoc* pDoc );
 
-    void CreateNew( SwTable& rTbl, SwTableLine& rParent, _SaveTable& rSTbl );
+    void CreateNew( SwTable& rTable, SwTableLine& rParent, _SaveTable& rSTable );
 };
 
 #if OSL_DEBUG_LEVEL > 0
@@ -197,21 +197,21 @@ The algorithmn must not rely on this even it holds for a fresh loaded table in o
 So we need to remember not only the start node position but the end node position as well.
 */
 
-struct SwTblToTxtSave
+struct SwTableToTextSave
 {
     sal_uLong m_nSttNd;
     sal_uLong m_nEndNd;
-    sal_Int32 m_nCntnt;
+    sal_Int32 m_nContent;
     SwHistory* m_pHstry;
     // metadata references for first and last paragraph in cell
     std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
     std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
 
-    SwTblToTxtSave( SwDoc& rDoc, sal_uLong nNd, sal_uLong nEndIdx, sal_Int32 nCntnt );
-    ~SwTblToTxtSave() { delete m_pHstry; }
+    SwTableToTextSave( SwDoc& rDoc, sal_uLong nNd, sal_uLong nEndIdx, sal_Int32 nContent );
+    ~SwTableToTextSave() { delete m_pHstry; }
 };
 
-sal_uInt16 aSave_BoxCntntSet[] = {
+sal_uInt16 aSave_BoxContentSet[] = {
     RES_CHRATR_COLOR, RES_CHRATR_CROSSEDOUT,
     RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
     RES_CHRATR_POSTURE, RES_CHRATR_POSTURE,
@@ -219,21 +219,21 @@ sal_uInt16 aSave_BoxCntntSet[] = {
     RES_PARATR_ADJUST, RES_PARATR_ADJUST,
     0 };
 
-SwUndoInsTbl::SwUndoInsTbl( const SwPosition& rPos, sal_uInt16 nCl, sal_uInt16 nRw,
-                            sal_uInt16 nAdj, const SwInsertTableOptions& rInsTblOpts,
-                            const SwTableAutoFmt* pTAFmt,
+SwUndoInsTable::SwUndoInsTable( const SwPosition& rPos, sal_uInt16 nCl, sal_uInt16 nRw,
+                            sal_uInt16 nAdj, const SwInsertTableOptions& rInsTableOpts,
+                            const SwTableAutoFormat* pTAFormat,
                             const std::vector<sal_uInt16> *pColArr,
                             const OUString & rName)
     : SwUndo( UNDO_INSTABLE ),
-    aInsTblOpts( rInsTblOpts ), pDDEFldType( 0 ), pColWidth( 0 ), pRedlData( 0 ), pAutoFmt( 0 ),
+    aInsTableOpts( rInsTableOpts ), pDDEFieldType( 0 ), pColWidth( 0 ), pRedlData( 0 ), pAutoFormat( 0 ),
     nSttNode( rPos.nNode.GetIndex() ), nRows( nRw ), nCols( nCl ), nAdjust( nAdj )
 {
     if( pColArr )
     {
         pColWidth = new std::vector<sal_uInt16>(*pColArr);
     }
-    if( pTAFmt )
-        pAutoFmt = new SwTableAutoFmt( *pTAFmt );
+    if( pTAFormat )
+        pAutoFormat = new SwTableAutoFormat( *pTAFormat );
 
     // consider redline
     SwDoc& rDoc = *rPos.nNode.GetNode().GetDoc();
@@ -243,86 +243,86 @@ SwUndoInsTbl::SwUndoInsTbl( const SwPosition& rPos, sal_uInt16 nCl, sal_uInt16 n
         SetRedlineMode( rDoc.getIDocumentRedlineAccess().GetRedlineMode() );
     }
 
-    sTblNm = rName;
+    sTableNm = rName;
 }
 
-SwUndoInsTbl::~SwUndoInsTbl()
+SwUndoInsTable::~SwUndoInsTable()
 {
-    delete pDDEFldType;
+    delete pDDEFieldType;
     delete pColWidth;
     delete pRedlData;
-    delete pAutoFmt;
+    delete pAutoFormat;
 }
 
-void SwUndoInsTbl::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoInsTable::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
     SwNodeIndex aIdx( rDoc.GetNodes(), nSttNode );
 
-    SwTableNode* pTblNd = aIdx.GetNode().GetTableNode();
-    OSL_ENSURE( pTblNd, "no TableNode" );
-    pTblNd->DelFrms();
+    SwTableNode* pTableNd = aIdx.GetNode().GetTableNode();
+    OSL_ENSURE( pTableNd, "no TableNode" );
+    pTableNd->DelFrms();
 
     if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
-        rDoc.getIDocumentRedlineAccess().DeleteRedline( *pTblNd, true, USHRT_MAX );
+        rDoc.getIDocumentRedlineAccess().DeleteRedline( *pTableNd, true, USHRT_MAX );
     RemoveIdxFromSection( rDoc, nSttNode );
 
     // move hard page breaks into next node
-    SwCntntNode* pNextNd = rDoc.GetNodes()[ pTblNd->EndOfSectionIndex()+1 ]->GetCntntNode();
+    SwContentNode* pNextNd = rDoc.GetNodes()[ pTableNd->EndOfSectionIndex()+1 ]->GetContentNode();
     if( pNextNd )
     {
-        SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
+        SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
         const SfxPoolItem *pItem;
 
-        if( SfxItemState::SET == pTableFmt->GetItemState( RES_PAGEDESC,
+        if( SfxItemState::SET == pTableFormat->GetItemState( RES_PAGEDESC,
             false, &pItem ) )
             pNextNd->SetAttr( *pItem );
 
-        if( SfxItemState::SET == pTableFmt->GetItemState( RES_BREAK,
+        if( SfxItemState::SET == pTableFormat->GetItemState( RES_BREAK,
             false, &pItem ) )
             pNextNd->SetAttr( *pItem );
     }
 
-    sTblNm = pTblNd->GetTable().GetFrmFmt()->GetName();
-    if( pTblNd->GetTable().IsA( TYPE( SwDDETable )) )
-        pDDEFldType = static_cast<SwDDEFieldType*>(static_cast<SwDDETable&>(pTblNd->GetTable()).
-                                        GetDDEFldType()->Copy());
+    sTableNm = pTableNd->GetTable().GetFrameFormat()->GetName();
+    if( pTableNd->GetTable().IsA( TYPE( SwDDETable )) )
+        pDDEFieldType = static_cast<SwDDEFieldType*>(static_cast<SwDDETable&>(pTableNd->GetTable()).
+                                        GetDDEFieldType()->Copy());
 
-    rDoc.GetNodes().Delete( aIdx, pTblNd->EndOfSectionIndex() -
+    rDoc.GetNodes().Delete( aIdx, pTableNd->EndOfSectionIndex() -
                                 aIdx.GetIndex() + 1 );
 
     SwPaM & rPam( rContext.GetCursorSupplier().CreateNewShellCursor() );
     rPam.DeleteMark();
     rPam.GetPoint()->nNode = aIdx;
-    rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), 0 );
+    rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), 0 );
 }
 
-void SwUndoInsTbl::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoInsTable::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
 
     SwPosition const aPos(SwNodeIndex(rDoc.GetNodes(), nSttNode));
-    const SwTable* pTbl = rDoc.InsertTable( aInsTblOpts, aPos, nRows, nCols,
+    const SwTable* pTable = rDoc.InsertTable( aInsTableOpts, aPos, nRows, nCols,
                                             nAdjust,
-                                            pAutoFmt, pColWidth );
-    ((SwFrmFmt*)pTbl->GetFrmFmt())->SetName( sTblNm );
-    SwTableNode* pTblNode = rDoc.GetNodes()[nSttNode]->GetTableNode();
+                                            pAutoFormat, pColWidth );
+    ((SwFrameFormat*)pTable->GetFrameFormat())->SetName( sTableNm );
+    SwTableNode* pTableNode = rDoc.GetNodes()[nSttNode]->GetTableNode();
 
-    if( pDDEFldType )
+    if( pDDEFieldType )
     {
-        SwDDEFieldType* pNewType = static_cast<SwDDEFieldType*>(rDoc.getIDocumentFieldsAccess().InsertFldType(
-                                                            *pDDEFldType));
-        SwDDETable* pDDETbl = new SwDDETable( pTblNode->GetTable(), pNewType );
-        pTblNode->SetNewTable( pDDETbl );
-        delete pDDEFldType, pDDEFldType = 0;
+        SwDDEFieldType* pNewType = static_cast<SwDDEFieldType*>(rDoc.getIDocumentFieldsAccess().InsertFieldType(
+                                                            *pDDEFieldType));
+        SwDDETable* pDDETable = new SwDDETable( pTableNode->GetTable(), pNewType );
+        pTableNode->SetNewTable( pDDETable );
+        delete pDDEFieldType, pDDEFieldType = 0;
     }
 
     if( (pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) ||
         ( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) &&
-            !rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+            !rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ))
     {
-        SwPaM aPam( *pTblNode->EndOfSectionNode(), *pTblNode, 1 );
-        SwCntntNode* pCNd = aPam.GetCntntNode( false );
+        SwPaM aPam( *pTableNode->EndOfSectionNode(), *pTableNode, 1 );
+        SwContentNode* pCNd = aPam.GetContentNode( false );
         if( pCNd )
             aPam.GetMark()->nContent.Assign( pCNd, 0 );
 
@@ -339,41 +339,41 @@ void SwUndoInsTbl::RedoImpl(::sw::UndoRedoContext & rContext)
     }
 }
 
-void SwUndoInsTbl::RepeatImpl(::sw::RepeatContext & rContext)
+void SwUndoInsTable::RepeatImpl(::sw::RepeatContext & rContext)
 {
     rContext.GetDoc().InsertTable(
-            aInsTblOpts, *rContext.GetRepeatPaM().GetPoint(),
-            nRows, nCols, nAdjust, pAutoFmt, pColWidth );
+            aInsTableOpts, *rContext.GetRepeatPaM().GetPoint(),
+            nRows, nCols, nAdjust, pAutoFormat, pColWidth );
 }
 
-SwRewriter SwUndoInsTbl::GetRewriter() const
+SwRewriter SwUndoInsTable::GetRewriter() const
 {
     SwRewriter aRewriter;
 
     aRewriter.AddRule(UndoArg1, SW_RES(STR_START_QUOTE));
-    aRewriter.AddRule(UndoArg2, sTblNm);
+    aRewriter.AddRule(UndoArg2, sTableNm);
     aRewriter.AddRule(UndoArg3, SW_RES(STR_END_QUOTE));
 
     return aRewriter;
 }
 
-SwTblToTxtSave::SwTblToTxtSave( SwDoc& rDoc, sal_uLong nNd, sal_uLong nEndIdx, sal_Int32 nCnt )
-    : m_nSttNd( nNd ), m_nEndNd( nEndIdx), m_nCntnt( nCnt ), m_pHstry( 0 )
+SwTableToTextSave::SwTableToTextSave( SwDoc& rDoc, sal_uLong nNd, sal_uLong nEndIdx, sal_Int32 nCnt )
+    : m_nSttNd( nNd ), m_nEndNd( nEndIdx), m_nContent( nCnt ), m_pHstry( 0 )
 {
     // keep attributes of the joined node
-    SwTxtNode* pNd = rDoc.GetNodes()[ nNd ]->GetTxtNode();
+    SwTextNode* pNd = rDoc.GetNodes()[ nNd ]->GetTextNode();
     if( pNd )
     {
         m_pHstry = new SwHistory;
 
-        m_pHstry->Add( pNd->GetTxtColl(), nNd, ND_TEXTNODE );
+        m_pHstry->Add( pNd->GetTextColl(), nNd, ND_TEXTNODE );
         if ( pNd->GetpSwpHints() )
         {
             m_pHstry->CopyAttr( pNd->GetpSwpHints(), nNd, 0,
-                        pNd->GetTxt().getLength(), false );
+                        pNd->GetText().getLength(), false );
         }
         if( pNd->HasSwAttrSet() )
-            m_pHstry->CopyFmtAttr( *pNd->GetpSwAttrSet(), nNd );
+            m_pHstry->CopyFormatAttr( *pNd->GetpSwAttrSet(), nNd );
 
         if( !m_pHstry->Count() )
             delete m_pHstry, m_pHstry = 0;
@@ -387,7 +387,7 @@ SwTblToTxtSave::SwTblToTxtSave( SwDoc& rDoc, sal_uLong nNd, sal_uLong nEndIdx, s
     // (after SectionUp, the end of the range points to the node after the cell)
     if ( nEndIdx - 1 > nNd )
     {
-        SwTxtNode* pLastNode( rDoc.GetNodes()[ nEndIdx - 1 ]->GetTxtNode() );
+        SwTextNode* pLastNode( rDoc.GetNodes()[ nEndIdx - 1 ]->GetTextNode() );
         if( pLastNode )
         {
             // METADATA: store
@@ -396,37 +396,37 @@ SwTblToTxtSave::SwTblToTxtSave( SwDoc& rDoc, sal_uLong nNd, sal_uLong nEndIdx, s
     }
 }
 
-SwUndoTblToTxt::SwUndoTblToTxt( const SwTable& rTbl, sal_Unicode cCh )
+SwUndoTableToText::SwUndoTableToText( const SwTable& rTable, sal_Unicode cCh )
     : SwUndo( UNDO_TABLETOTEXT ),
-    sTblNm( rTbl.GetFrmFmt()->GetName() ), pDDEFldType( 0 ), pHistory( 0 ),
+    sTableNm( rTable.GetFrameFormat()->GetName() ), pDDEFieldType( 0 ), pHistory( 0 ),
     nSttNd( 0 ), nEndNd( 0 ),
-    cTrenner( cCh ), nHdlnRpt( rTbl.GetRowsToRepeat() )
+    cTrenner( cCh ), nHdlnRpt( rTable.GetRowsToRepeat() )
 {
-    pTblSave = new _SaveTable( rTbl );
-    pBoxSaves = new SwTblToTxtSaves( (SwTblToTxtSaves::size_type)rTbl.GetTabSortBoxes().size() );
+    pTableSave = new _SaveTable( rTable );
+    pBoxSaves = new SwTableToTextSaves( (SwTableToTextSaves::size_type)rTable.GetTabSortBoxes().size() );
 
-    if( rTbl.IsA( TYPE( SwDDETable ) ) )
-        pDDEFldType = static_cast<SwDDEFieldType*>(static_cast<const SwDDETable&>(rTbl).GetDDEFldType()->Copy());
+    if( rTable.IsA( TYPE( SwDDETable ) ) )
+        pDDEFieldType = static_cast<SwDDEFieldType*>(static_cast<const SwDDETable&>(rTable).GetDDEFieldType()->Copy());
 
-    bCheckNumFmt = rTbl.GetFrmFmt()->GetDoc()->IsInsTblFormatNum();
+    bCheckNumFormat = rTable.GetFrameFormat()->GetDoc()->IsInsTableFormatNum();
 
     pHistory = new SwHistory;
-    const SwTableNode* pTblNd = rTbl.GetTableNode();
-    sal_uLong nTblStt = pTblNd->GetIndex(), nTblEnd = pTblNd->EndOfSectionIndex();
+    const SwTableNode* pTableNd = rTable.GetTableNode();
+    sal_uLong nTableStt = pTableNd->GetIndex(), nTableEnd = pTableNd->EndOfSectionIndex();
 
-    const SwFrmFmts& rFrmFmtTbl = *pTblNd->GetDoc()->GetSpzFrmFmts();
-    for( size_t n = 0; n < rFrmFmtTbl.size(); ++n )
+    const SwFrameFormats& rFrameFormatTable = *pTableNd->GetDoc()->GetSpzFrameFormats();
+    for( size_t n = 0; n < rFrameFormatTable.size(); ++n )
     {
-        SwFrmFmt* pFmt = rFrmFmtTbl[ n ];
-        SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-        SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+        SwFrameFormat* pFormat = rFrameFormatTable[ n ];
+        SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+        SwPosition const*const pAPos = pAnchor->GetContentAnchor();
         if (pAPos &&
             ((FLY_AT_CHAR == pAnchor->GetAnchorId()) ||
              (FLY_AT_PARA == pAnchor->GetAnchorId())) &&
-            nTblStt <= pAPos->nNode.GetIndex() &&
-            pAPos->nNode.GetIndex() < nTblEnd )
+            nTableStt <= pAPos->nNode.GetIndex() &&
+            pAPos->nNode.GetIndex() < nTableEnd )
         {
-            pHistory->Add( *pFmt );
+            pHistory->Add( *pFormat );
         }
     }
 
@@ -434,15 +434,15 @@ SwUndoTblToTxt::SwUndoTblToTxt( const SwTable& rTbl, sal_Unicode cCh )
         delete pHistory, pHistory = 0;
 }
 
-SwUndoTblToTxt::~SwUndoTblToTxt()
+SwUndoTableToText::~SwUndoTableToText()
 {
-    delete pDDEFldType;
-    delete pTblSave;
+    delete pDDEFieldType;
+    delete pTableSave;
     delete pBoxSaves;
     delete pHistory;
 }
 
-void SwUndoTblToTxt::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableToText::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
     SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
@@ -460,30 +460,30 @@ void SwUndoTblToTxt::UndoImpl(::sw::UndoRedoContext & rContext)
     SwNode2Layout aNode2Layout( aFrmIdx.GetNode() );
 
     // create TableNode structure
-    SwTableNode* pTblNd = rDoc.GetNodes().UndoTableToText( nSttNd, nEndNd, *pBoxSaves );
-    pTblNd->GetTable().SetTableModel( pTblSave->IsNewModel() );
-    SwTableFmt* pTableFmt = rDoc.MakeTblFrmFmt( sTblNm, rDoc.GetDfltFrmFmt() );
-    pTblNd->GetTable().RegisterToFormat( *pTableFmt );
-    pTblNd->GetTable().SetRowsToRepeat( nHdlnRpt );
+    SwTableNode* pTableNd = rDoc.GetNodes().UndoTableToText( nSttNd, nEndNd, *pBoxSaves );
+    pTableNd->GetTable().SetTableModel( pTableSave->IsNewModel() );
+    SwTableFormat* pTableFormat = rDoc.MakeTableFrameFormat( sTableNm, rDoc.GetDfltFrameFormat() );
+    pTableNd->GetTable().RegisterToFormat( *pTableFormat );
+    pTableNd->GetTable().SetRowsToRepeat( nHdlnRpt );
 
     // create old table structure
-    pTblSave->CreateNew( pTblNd->GetTable() );
+    pTableSave->CreateNew( pTableNd->GetTable() );
 
-    if( pDDEFldType )
+    if( pDDEFieldType )
     {
-        SwDDEFieldType* pNewType = static_cast<SwDDEFieldType*>(rDoc.getIDocumentFieldsAccess().InsertFldType(
-                                                            *pDDEFldType));
-        SwDDETable* pDDETbl = new SwDDETable( pTblNd->GetTable(), pNewType );
-        pTblNd->SetNewTable( pDDETbl, false );
-        delete pDDEFldType, pDDEFldType = 0;
+        SwDDEFieldType* pNewType = static_cast<SwDDEFieldType*>(rDoc.getIDocumentFieldsAccess().InsertFieldType(
+                                                            *pDDEFieldType));
+        SwDDETable* pDDETable = new SwDDETable( pTableNd->GetTable(), pNewType );
+        pTableNd->SetNewTable( pDDETable, false );
+        delete pDDEFieldType, pDDEFieldType = 0;
     }
 
-    if( bCheckNumFmt )
+    if( bCheckNumFormat )
     {
-        SwTableSortBoxes& rBxs = pTblNd->GetTable().GetTabSortBoxes();
+        SwTableSortBoxes& rBxs = pTableNd->GetTable().GetTabSortBoxes();
         for (size_t nBoxes = rBxs.size(); nBoxes; )
         {
-            rDoc.ChkBoxNumFmt( *rBxs[ --nBoxes ], false );
+            rDoc.ChkBoxNumFormat( *rBxs[ --nBoxes ], false );
         }
     }
 
@@ -495,89 +495,89 @@ void SwUndoTblToTxt::UndoImpl(::sw::UndoRedoContext & rContext)
     }
 
     aNode2Layout.RestoreUpperFrms( rDoc.GetNodes(),
-                                   pTblNd->GetIndex(), pTblNd->GetIndex()+1 );
+                                   pTableNd->GetIndex(), pTableNd->GetIndex()+1 );
 
     // Is a table selection requested?
     pPam->DeleteMark();
-    pPam->GetPoint()->nNode = *pTblNd->EndOfSectionNode();
+    pPam->GetPoint()->nNode = *pTableNd->EndOfSectionNode();
     pPam->SetMark();
     pPam->GetPoint()->nNode = *pPam->GetNode().StartOfSectionNode();
-    pPam->Move( fnMoveForward, fnGoCntnt );
+    pPam->Move( fnMoveForward, fnGoContent );
     pPam->Exchange();
-    pPam->Move( fnMoveBackward, fnGoCntnt );
+    pPam->Move( fnMoveBackward, fnGoContent );
 
     ClearFEShellTabCols();
 }
 
 // located in untbl.cxx and only an Undo object is allowed to call it
 SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd,
-                                const SwTblToTxtSaves& rSavedData )
+                                const SwTableToTextSaves& rSavedData )
 {
     SwNodeIndex aSttIdx( *this, nSttNd );
     SwNodeIndex aEndIdx( *this, nEndNd+1 );
 
-    SwTableNode * pTblNd = new SwTableNode( aSttIdx );
-    SwEndNode* pEndNd = new SwEndNode( aEndIdx, *pTblNd  );
+    SwTableNode * pTableNd = new SwTableNode( aSttIdx );
+    SwEndNode* pEndNd = new SwEndNode( aEndIdx, *pTableNd  );
 
     aEndIdx = *pEndNd;
 
-    /* Set pTblNd as start of section for all nodes in [nSttNd, nEndNd].
+    /* Set pTableNd as start of section for all nodes in [nSttNd, nEndNd].
        Delete all Frames attached to the nodes in that range. */
     SwNode* pNd;
     {
         sal_uLong n, nTmpEnd = aEndIdx.GetIndex();
-        for( n = pTblNd->GetIndex() + 1; n < nTmpEnd; ++n )
+        for( n = pTableNd->GetIndex() + 1; n < nTmpEnd; ++n )
         {
-            if( ( pNd = (*this)[ n ] )->IsCntntNode() )
-                static_cast<SwCntntNode*>(pNd)->DelFrms();
-            pNd->pStartOfSection = pTblNd;
+            if( ( pNd = (*this)[ n ] )->IsContentNode() )
+                static_cast<SwContentNode*>(pNd)->DelFrms();
+            pNd->pStartOfSection = pTableNd;
         }
     }
 
     // than create table structure partially. First a single line that contains
     // all boxes. The correct structure is than taken from SaveStruct.
-    SwTableBoxFmt* pBoxFmt = GetDoc()->MakeTableBoxFmt();
-    SwTableLineFmt* pLineFmt = GetDoc()->MakeTableLineFmt();
-    SwTableLine* pLine = new SwTableLine( pLineFmt, rSavedData.size(), 0 );
-    pTblNd->GetTable().GetTabLines().insert( pTblNd->GetTable().GetTabLines().begin(), pLine );
+    SwTableBoxFormat* pBoxFormat = GetDoc()->MakeTableBoxFormat();
+    SwTableLineFormat* pLineFormat = GetDoc()->MakeTableLineFormat();
+    SwTableLine* pLine = new SwTableLine( pLineFormat, rSavedData.size(), 0 );
+    pTableNd->GetTable().GetTabLines().insert( pTableNd->GetTable().GetTabLines().begin(), pLine );
 
-    const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
+    const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
     for( size_t n = rSavedData.size(); n; )
     {
-        const SwTblToTxtSave* pSave = &rSavedData[ --n ];
+        const SwTableToTextSave* pSave = &rSavedData[ --n ];
         // if the start node was merged with last from prev. cell,
         // subtract 1 from index to get the merged paragraph, and split that
-        aSttIdx = pSave->m_nSttNd - ( ( SAL_MAX_INT32 != pSave->m_nCntnt ) ? 1 : 0);
-        SwTxtNode* pTxtNd = aSttIdx.GetNode().GetTxtNode();
+        aSttIdx = pSave->m_nSttNd - ( ( SAL_MAX_INT32 != pSave->m_nContent ) ? 1 : 0);
+        SwTextNode* pTextNd = aSttIdx.GetNode().GetTextNode();
 
-        if( SAL_MAX_INT32 != pSave->m_nCntnt )
+        if( SAL_MAX_INT32 != pSave->m_nContent )
         {
             // split at ContentPosition, delete previous char (= separator)
-            OSL_ENSURE( pTxtNd, "Where is my TextNode?" );
-            SwIndex aCntPos( pTxtNd, pSave->m_nCntnt - 1 );
+            OSL_ENSURE( pTextNd, "Where is my TextNode?" );
+            SwIndex aCntPos( pTextNd, pSave->m_nContent - 1 );
 
-            pTxtNd->EraseText( aCntPos, 1 );
-            SwCntntNode* pNewNd = pTxtNd->SplitCntntNode(
+            pTextNd->EraseText( aCntPos, 1 );
+            SwContentNode* pNewNd = pTextNd->SplitContentNode(
                                         SwPosition( aSttIdx, aCntPos ));
-            if( !pCntntStore->Empty() )
-                pCntntStore->Restore( *pNewNd, pSave->m_nCntnt, pSave->m_nCntnt + 1 );
+            if( !pContentStore->Empty() )
+                pContentStore->Restore( *pNewNd, pSave->m_nContent, pSave->m_nContent + 1 );
         }
         else
         {
-            pCntntStore->Clear();
-            if( pTxtNd )
-                pCntntStore->Save( GetDoc(), aSttIdx.GetIndex(), pTxtNd->GetTxt().getLength() );
+            pContentStore->Clear();
+            if( pTextNd )
+                pContentStore->Save( GetDoc(), aSttIdx.GetIndex(), pTextNd->GetText().getLength() );
         }
 
-        if( pTxtNd )
+        if( pTextNd )
         {
             // METADATA: restore
-            pTxtNd->GetTxtNode()->RestoreMetadata(pSave->m_pMetadataUndoStart);
-            if( pTxtNd->HasSwAttrSet() )
-                pTxtNd->ResetAllAttr();
+            pTextNd->GetTextNode()->RestoreMetadata(pSave->m_pMetadataUndoStart);
+            if( pTextNd->HasSwAttrSet() )
+                pTextNd->ResetAllAttr();
 
-            if( pTxtNd->GetpSwpHints() )
-                pTxtNd->ClearSwpHintsArr( false );
+            if( pTextNd->GetpSwpHints() )
+                pTextNd->ClearSwpHintsArr( false );
         }
 
         if( pSave->m_pHstry )
@@ -591,7 +591,7 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd,
         // end points to node after cell
         if ( pSave->m_nEndNd - 1 > pSave->m_nSttNd )
         {
-            SwTxtNode* pLastNode = (*this)[ pSave->m_nEndNd - 1 ]->GetTxtNode();
+            SwTextNode* pLastNode = (*this)[ pSave->m_nEndNd - 1 ]->GetTextNode();
             if (pLastNode)
             {
                 pLastNode->RestoreMetadata(pSave->m_pMetadataUndoEnd);
@@ -601,7 +601,7 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd,
         aEndIdx = pSave->m_nEndNd;
         SwStartNode* pSttNd = new SwStartNode( aSttIdx, ND_STARTNODE,
                                                 SwTableBoxStartNode );
-        pSttNd->pStartOfSection = pTblNd;
+        pSttNd->pStartOfSection = pTableNd;
         new SwEndNode( aEndIdx, *pSttNd );
 
         for( sal_uLong i = aSttIdx.GetIndex(); i < aEndIdx.GetIndex()-1; ++i )
@@ -612,13 +612,13 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd,
                 i = pNd->EndOfSectionIndex();
         }
 
-        SwTableBox* pBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
+        SwTableBox* pBox = new SwTableBox( pBoxFormat, *pSttNd, pLine );
         pLine->GetTabBoxes().insert( pLine->GetTabBoxes().begin(), pBox );
     }
-    return pTblNd;
+    return pTableNd;
 }
 
-void SwUndoTblToTxt::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableToText::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
     SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
@@ -630,17 +630,17 @@ void SwUndoTblToTxt::RedoImpl(::sw::UndoRedoContext & rContext)
     pPam->SetMark();            // log off all indices
     pPam->DeleteMark();
 
-    SwTableNode* pTblNd = pPam->GetNode().GetTableNode();
-    OSL_ENSURE( pTblNd, "Could not find any TableNode" );
+    SwTableNode* pTableNd = pPam->GetNode().GetTableNode();
+    OSL_ENSURE( pTableNd, "Could not find any TableNode" );
 
-    if( pTblNd->GetTable().IsA( TYPE( SwDDETable )) )
-        pDDEFldType = static_cast<SwDDEFieldType*>(static_cast<SwDDETable&>(pTblNd->GetTable()).
-                                                GetDDEFldType()->Copy());
+    if( pTableNd->GetTable().IsA( TYPE( SwDDETable )) )
+        pDDEFieldType = static_cast<SwDDEFieldType*>(static_cast<SwDDETable&>(pTableNd->GetTable()).
+                                                GetDDEFieldType()->Copy());
 
-    rDoc.TableToText( pTblNd, cTrenner );
+    rDoc.TableToText( pTableNd, cTrenner );
 
     ++aSaveIdx;
-    SwCntntNode* pCNd = aSaveIdx.GetNode().GetCntntNode();
+    SwContentNode* pCNd = aSaveIdx.GetNode().GetContentNode();
     if( !pCNd && 0 == ( pCNd = rDoc.GetNodes().GoNext( &aSaveIdx ) ) &&
         0 == ( pCNd = SwNodes::GoPrevious( &aSaveIdx )) )
     {
@@ -654,72 +654,72 @@ void SwUndoTblToTxt::RedoImpl(::sw::UndoRedoContext & rContext)
     pPam->DeleteMark();
 }
 
-void SwUndoTblToTxt::RepeatImpl(::sw::RepeatContext & rContext)
+void SwUndoTableToText::RepeatImpl(::sw::RepeatContext & rContext)
 {
     SwPaM *const pPam = & rContext.GetRepeatPaM();
-    SwTableNode *const pTblNd = pPam->GetNode().FindTableNode();
-    if( pTblNd )
+    SwTableNode *const pTableNd = pPam->GetNode().FindTableNode();
+    if( pTableNd )
     {
         // move cursor out of table
-        pPam->GetPoint()->nNode = *pTblNd->EndOfSectionNode();
-        pPam->Move( fnMoveForward, fnGoCntnt );
+        pPam->GetPoint()->nNode = *pTableNd->EndOfSectionNode();
+        pPam->Move( fnMoveForward, fnGoContent );
         pPam->SetMark();
         pPam->DeleteMark();
 
-        rContext.GetDoc().TableToText( pTblNd, cTrenner );
+        rContext.GetDoc().TableToText( pTableNd, cTrenner );
     }
 }
 
-void SwUndoTblToTxt::SetRange( const SwNodeRange& rRg )
+void SwUndoTableToText::SetRange( const SwNodeRange& rRg )
 {
     nSttNd = rRg.aStart.GetIndex();
     nEndNd = rRg.aEnd.GetIndex();
 }
 
-void SwUndoTblToTxt::AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong nEndIdx, sal_Int32 nCntntIdx )
+void SwUndoTableToText::AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong nEndIdx, sal_Int32 nContentIdx )
 {
-    SwTblToTxtSave* pNew = new SwTblToTxtSave( rDoc, nNdIdx, nEndIdx, nCntntIdx );
+    SwTableToTextSave* pNew = new SwTableToTextSave( rDoc, nNdIdx, nEndIdx, nContentIdx );
     pBoxSaves->push_back( pNew );
 }
 
-SwUndoTxtToTbl::SwUndoTxtToTbl( const SwPaM& rRg,
-                                const SwInsertTableOptions& rInsTblOpts,
+SwUndoTextToTable::SwUndoTextToTable( const SwPaM& rRg,
+                                const SwInsertTableOptions& rInsTableOpts,
                                 sal_Unicode cCh, sal_uInt16 nAdj,
-                                const SwTableAutoFmt* pAFmt )
-    : SwUndo( UNDO_TEXTTOTABLE ), SwUndRng( rRg ), aInsTblOpts( rInsTblOpts ),
-      pDelBoxes( 0 ), pAutoFmt( 0 ),
+                                const SwTableAutoFormat* pAFormat )
+    : SwUndo( UNDO_TEXTTOTABLE ), SwUndRng( rRg ), aInsTableOpts( rInsTableOpts ),
+      pDelBoxes( 0 ), pAutoFormat( 0 ),
       pHistory( 0 ), cTrenner( cCh ), nAdjust( nAdj )
 {
-    if( pAFmt )
-        pAutoFmt = new SwTableAutoFmt( *pAFmt );
+    if( pAFormat )
+        pAutoFormat = new SwTableAutoFormat( *pAFormat );
 
     const SwPosition* pEnd = rRg.End();
     SwNodes& rNds = rRg.GetDoc()->GetNodes();
     bSplitEnd = pEnd->nContent.GetIndex() && ( pEnd->nContent.GetIndex()
-                        != pEnd->nNode.GetNode().GetCntntNode()->Len() ||
+                        != pEnd->nNode.GetNode().GetContentNode()->Len() ||
                 pEnd->nNode.GetIndex() >= rNds.GetEndOfContent().GetIndex()-1 );
 }
 
-SwUndoTxtToTbl::~SwUndoTxtToTbl()
+SwUndoTextToTable::~SwUndoTextToTable()
 {
     delete pDelBoxes;
-    delete pAutoFmt;
+    delete pAutoFormat;
 }
 
-void SwUndoTxtToTbl::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTextToTable::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
 
-    sal_uLong nTblNd = nSttNode;
-    if( nSttCntnt )
-        ++nTblNd;       // Node was splitted previously
-    SwNodeIndex aIdx( rDoc.GetNodes(), nTblNd );
+    sal_uLong nTableNd = nSttNode;
+    if( nSttContent )
+        ++nTableNd;       // Node was splitted previously
+    SwNodeIndex aIdx( rDoc.GetNodes(), nTableNd );
     SwTableNode *const pTNd = aIdx.GetNode().GetTableNode();
     OSL_ENSURE( pTNd, "Could not find a TableNode" );
 
-    RemoveIdxFromSection( rDoc, nTblNd );
+    RemoveIdxFromSection( rDoc, nTableNd );
 
-    sTblNm = pTNd->GetTable().GetFrmFmt()->GetName();
+    sTableNm = pTNd->GetTable().GetFrameFormat()->GetName();
 
     if( pHistory )
     {
@@ -730,12 +730,12 @@ void SwUndoTxtToTbl::UndoImpl(::sw::UndoRedoContext & rContext)
     if( pDelBoxes )
     {
         pTNd->DelFrms();
-        SwTable& rTbl = pTNd->GetTable();
+        SwTable& rTable = pTNd->GetTable();
         for( size_t n = pDelBoxes->size(); n; )
         {
-            SwTableBox* pBox = rTbl.GetTblBox( (*pDelBoxes)[ --n ] );
+            SwTableBox* pBox = rTable.GetTableBox( (*pDelBoxes)[ --n ] );
             if( pBox )
-                ::_DeleteBox( rTbl, pBox, 0, false, false );
+                ::_DeleteBox( rTable, pBox, 0, false, false );
             else {
                 OSL_ENSURE( false, "Where is my box?" );
             }
@@ -748,18 +748,18 @@ void SwUndoTxtToTbl::UndoImpl(::sw::UndoRedoContext & rContext)
     // join again at start?
     SwPaM aPam(rDoc.GetNodes().GetEndOfContent());
     SwPosition *const pPos = aPam.GetPoint();
-    if( nSttCntnt )
+    if( nSttContent )
     {
-        pPos->nNode = nTblNd;
-        pPos->nContent.Assign(pPos->nNode.GetNode().GetCntntNode(), 0);
-        if (aPam.Move(fnMoveBackward, fnGoCntnt))
+        pPos->nNode = nTableNd;
+        pPos->nContent.Assign(pPos->nNode.GetNode().GetContentNode(), 0);
+        if (aPam.Move(fnMoveBackward, fnGoContent))
         {
             SwNodeIndex & rIdx = aPam.GetPoint()->nNode;
 
             // than move, relatively, the Crsr/etc. again
             RemoveIdxRel( rIdx.GetIndex()+1, *pPos );
 
-            rIdx.GetNode().GetCntntNode()->JoinNext();
+            rIdx.GetNode().GetContentNode()->JoinNext();
         }
     }
 
@@ -768,117 +768,117 @@ void SwUndoTxtToTbl::UndoImpl(::sw::UndoRedoContext & rContext)
     {
         SwNodeIndex& rIdx = pPos->nNode;
         rIdx = nEndNode;
-        SwTxtNode* pTxtNd = rIdx.GetNode().GetTxtNode();
-        if( pTxtNd && pTxtNd->CanJoinNext() )
+        SwTextNode* pTextNd = rIdx.GetNode().GetTextNode();
+        if( pTextNd && pTextNd->CanJoinNext() )
         {
             aPam.GetMark()->nContent.Assign( 0, 0 );
             aPam.GetPoint()->nContent.Assign( 0, 0 );
 
             // than move, relatively, the Crsr/etc. again
-            pPos->nContent.Assign(pTxtNd, pTxtNd->GetTxt().getLength());
+            pPos->nContent.Assign(pTextNd, pTextNd->GetText().getLength());
             RemoveIdxRel( nEndNode + 1, *pPos );
 
-            pTxtNd->JoinNext();
+            pTextNd->JoinNext();
         }
     }
 
     AddUndoRedoPaM(rContext);
 }
 
-void SwUndoTxtToTbl::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTextToTable::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwPaM & rPam( AddUndoRedoPaM(rContext) );
     RemoveIdxFromRange(rPam, false);
     SetPaM(rPam);
 
     SwTable const*const pTable = rContext.GetDoc().TextToTable(
-                aInsTblOpts, rPam, cTrenner, nAdjust, pAutoFmt );
-    ((SwFrmFmt*)pTable->GetFrmFmt())->SetName( sTblNm );
+                aInsTableOpts, rPam, cTrenner, nAdjust, pAutoFormat );
+    ((SwFrameFormat*)pTable->GetFrameFormat())->SetName( sTableNm );
 }
 
-void SwUndoTxtToTbl::RepeatImpl(::sw::RepeatContext & rContext)
+void SwUndoTextToTable::RepeatImpl(::sw::RepeatContext & rContext)
 {
     // no Table In Table
     if (!rContext.GetRepeatPaM().GetNode().FindTableNode())
     {
-        rContext.GetDoc().TextToTable( aInsTblOpts, rContext.GetRepeatPaM(),
+        rContext.GetDoc().TextToTable( aInsTableOpts, rContext.GetRepeatPaM(),
                                         cTrenner, nAdjust,
-                                        pAutoFmt );
+                                        pAutoFormat );
     }
 }
 
-void SwUndoTxtToTbl::AddFillBox( const SwTableBox& rBox )
+void SwUndoTextToTable::AddFillBox( const SwTableBox& rBox )
 {
     if( !pDelBoxes )
         pDelBoxes = new std::vector<sal_uLong>;
     pDelBoxes->push_back( rBox.GetSttIdx() );
 }
 
-SwHistory& SwUndoTxtToTbl::GetHistory()
+SwHistory& SwUndoTextToTable::GetHistory()
 {
     if( !pHistory )
         pHistory = new SwHistory;
     return *pHistory;
 }
 
-SwUndoTblHeadline::SwUndoTblHeadline( const SwTable& rTbl, sal_uInt16 nOldHdl,
+SwUndoTableHeadline::SwUndoTableHeadline( const SwTable& rTable, sal_uInt16 nOldHdl,
                                       sal_uInt16 nNewHdl )
     : SwUndo( UNDO_TABLEHEADLINE ),
     nOldHeadline( nOldHdl ),
     nNewHeadline( nNewHdl )
 {
-    OSL_ENSURE( !rTbl.GetTabSortBoxes().empty(), "Table without content" );
-    const SwStartNode *pSttNd = rTbl.GetTabSortBoxes()[ 0 ]->GetSttNd();
+    OSL_ENSURE( !rTable.GetTabSortBoxes().empty(), "Table without content" );
+    const SwStartNode *pSttNd = rTable.GetTabSortBoxes()[ 0 ]->GetSttNd();
     OSL_ENSURE( pSttNd, "Box without content" );
 
-    nTblNd = pSttNd->StartOfSectionIndex();
+    nTableNd = pSttNd->StartOfSectionIndex();
 }
 
-void SwUndoTblHeadline::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableHeadline::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    SwTableNode* pTNd = rDoc.GetNodes()[ nTblNd ]->GetTableNode();
+    SwTableNode* pTNd = rDoc.GetNodes()[ nTableNd ]->GetTableNode();
     OSL_ENSURE( pTNd, "could not find any TableNode" );
 
     rDoc.SetRowsToRepeat( pTNd->GetTable(), nOldHeadline );
 }
 
-void SwUndoTblHeadline::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableHeadline::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
 
-    SwTableNode* pTNd = rDoc.GetNodes()[ nTblNd ]->GetTableNode();
+    SwTableNode* pTNd = rDoc.GetNodes()[ nTableNd ]->GetTableNode();
     OSL_ENSURE( pTNd, "could not find any TableNode" );
 
     rDoc.SetRowsToRepeat( pTNd->GetTable(), nNewHeadline );
 }
 
-void SwUndoTblHeadline::RepeatImpl(::sw::RepeatContext & rContext)
+void SwUndoTableHeadline::RepeatImpl(::sw::RepeatContext & rContext)
 {
-    SwTableNode *const pTblNd =
+    SwTableNode *const pTableNd =
         rContext.GetRepeatPaM().GetNode().FindTableNode();
-    if( pTblNd )
+    if( pTableNd )
     {
-        rContext.GetDoc().SetRowsToRepeat( pTblNd->GetTable(), nNewHeadline );
+        rContext.GetDoc().SetRowsToRepeat( pTableNd->GetTable(), nNewHeadline );
     }
 }
 
-_SaveTable::_SaveTable( const SwTable& rTbl, sal_uInt16 nLnCnt, bool bSaveFml )
-    : m_aTblSet(*rTbl.GetFrmFmt()->GetAttrSet().GetPool(), aTableSetRange),
-      m_pSwTable(&rTbl), m_nLineCount(nLnCnt), m_bSaveFormula(bSaveFml)
+_SaveTable::_SaveTable( const SwTable& rTable, sal_uInt16 nLnCnt, bool bSaveFormula )
+    : m_aTableSet(*rTable.GetFrameFormat()->GetAttrSet().GetPool(), aTableSetRange),
+      m_pSwTable(&rTable), m_nLineCount(nLnCnt), m_bSaveFormula(bSaveFormula)
 {
     m_bModifyBox = false;
-    m_bNewModel = rTbl.IsNewModel();
-    m_aTblSet.Put(rTbl.GetFrmFmt()->GetAttrSet());
-    m_pLine = new _SaveLine( 0, *rTbl.GetTabLines()[ 0 ], *this );
+    m_bNewModel = rTable.IsNewModel();
+    m_aTableSet.Put(rTable.GetFrameFormat()->GetAttrSet());
+    m_pLine = new _SaveLine( 0, *rTable.GetTabLines()[ 0 ], *this );
 
     _SaveLine* pLn = m_pLine;
     if( USHRT_MAX == nLnCnt )
-        nLnCnt = rTbl.GetTabLines().size();
+        nLnCnt = rTable.GetTabLines().size();
     for( sal_uInt16 n = 1; n < nLnCnt; ++n )
-        pLn = new _SaveLine( pLn, *rTbl.GetTabLines()[ n ], *this );
+        pLn = new _SaveLine( pLn, *rTable.GetTabLines()[ n ], *this );
 
-    m_aFrmFmts.clear();
+    m_aFrameFormats.clear();
     m_pSwTable = 0;
 }
 
@@ -887,15 +887,15 @@ _SaveTable::~_SaveTable()
     delete m_pLine;
 }
 
-sal_uInt16 _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine )
+sal_uInt16 _SaveTable::AddFormat( SwFrameFormat* pFormat, bool bIsLine )
 {
-    size_t nRet = m_aFrmFmts.GetPos(pFmt);
+    size_t nRet = m_aFrameFormats.GetPos(pFormat);
     if( SIZE_MAX == nRet )
     {
         // Create copy of ItemSet
-        std::shared_ptr<SfxItemSet> pSet( new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
+        std::shared_ptr<SfxItemSet> pSet( new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
             bIsLine ? aTableLineSetRange : aTableBoxSetRange ) );
-        pSet->Put( pFmt->GetAttrSet() );
+        pSet->Put( pFormat->GetAttrSet() );
         // When a formula is set, never save the value. It possibly must be
         // recalculated.
         // Save formulas always in plain text.
@@ -905,53 +905,53 @@ sal_uInt16 _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine )
             pSet->ClearItem( RES_BOXATR_VALUE );
             if (m_pSwTable && m_bSaveFormula)
             {
-                SwTableFmlUpdate aMsgHnt(m_pSwTable);
-                aMsgHnt.eFlags = TBL_BOXNAME;
-                SwTblBoxFormula* pFormulaItem = const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem));
-                pFormulaItem->ChgDefinedIn( pFmt );
-                pFormulaItem->ChangeState( &aMsgHnt );
+                SwTableFormulaUpdate aMsgHint(m_pSwTable);
+                aMsgHint.eFlags = TBL_BOXNAME;
+                SwTableBoxFormula* pFormulaItem = const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem));
+                pFormulaItem->ChgDefinedIn( pFormat );
+                pFormulaItem->ChangeState( &aMsgHint );
                 pFormulaItem->ChgDefinedIn( 0 );
             }
         }
         nRet = m_aSets.size();
         m_aSets.push_back(pSet);
-        m_aFrmFmts.insert(m_aFrmFmts.begin() + nRet, pFmt);
+        m_aFrameFormats.insert(m_aFrameFormats.begin() + nRet, pFormat);
     }
     return static_cast<sal_uInt16>(nRet);
 }
 
-void _SaveTable::RestoreAttr( SwTable& rTbl, bool bMdfyBox )
+void _SaveTable::RestoreAttr( SwTable& rTable, bool bMdfyBox )
 {
     m_bModifyBox = bMdfyBox;
 
     // first, get back attributes of TableFrmFormat
-    SwFrmFmt* pFmt = rTbl.GetFrmFmt();
-    SfxItemSet& rFmtSet  = (SfxItemSet&)pFmt->GetAttrSet();
-    rFmtSet.ClearItem();
-    rFmtSet.Put(m_aTblSet);
+    SwFrameFormat* pFormat = rTable.GetFrameFormat();
+    SfxItemSet& rFormatSet  = (SfxItemSet&)pFormat->GetAttrSet();
+    rFormatSet.ClearItem();
+    rFormatSet.Put(m_aTableSet);
 
-    if( pFmt->IsInCache() )
+    if( pFormat->IsInCache() )
     {
-        SwFrm::GetCache().Delete( pFmt );
-        pFmt->SetInCache( false );
+        SwFrm::GetCache().Delete( pFormat );
+        pFormat->SetInCache( false );
     }
 
     // for safety, invalidate all TableFrames
-    SwIterator<SwTabFrm,SwFmt> aIter( *pFmt );
+    SwIterator<SwTabFrm,SwFormat> aIter( *pFormat );
     for( SwTabFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
-        if( pLast->GetTable() == &rTbl )
+        if( pLast->GetTable() == &rTable )
         {
             pLast->InvalidateAll();
             pLast->SetCompletePaint();
         }
 
-    // fill FrmFmts with defaults (0)
-    pFmt = 0;
+    // fill FrameFormats with defaults (0)
+    pFormat = 0;
     for (size_t n = m_aSets.size(); n; --n)
-        m_aFrmFmts.push_back(pFmt);
+        m_aFrameFormats.push_back(pFormat);
 
     const size_t nLnCnt = (USHRT_MAX == m_nLineCount)
-        ? rTbl.GetTabLines().size()
+        ? rTable.GetTabLines().size()
         : m_nLineCount;
 
     _SaveLine* pLn = m_pLine;
@@ -963,53 +963,53 @@ void _SaveTable::RestoreAttr( SwTable& rTbl, bool bMdfyBox )
             break;
         }
 
-        pLn->RestoreAttr( *rTbl.GetTabLines()[ n ], *this );
+        pLn->RestoreAttr( *rTable.GetTabLines()[ n ], *this );
     }
 
-    m_aFrmFmts.clear();
+    m_aFrameFormats.clear();
     m_bModifyBox = false;
 }
 
-void _SaveTable::SaveCntntAttrs( SwDoc* pDoc )
+void _SaveTable::SaveContentAttrs( SwDoc* pDoc )
 {
-    m_pLine->SaveCntntAttrs(pDoc);
+    m_pLine->SaveContentAttrs(pDoc);
 }
 
-void _SaveTable::CreateNew( SwTable& rTbl, bool bCreateFrms,
+void _SaveTable::CreateNew( SwTable& rTable, bool bCreateFrms,
                             bool bRestoreChart )
 {
     _FndBox aTmpBox( 0, 0 );
-    aTmpBox.DelFrms( rTbl );
+    aTmpBox.DelFrms( rTable );
 
     // first, get back attributes of TableFrmFormat
-    SwFrmFmt* pFmt = rTbl.GetFrmFmt();
-    SfxItemSet& rFmtSet  = (SfxItemSet&)pFmt->GetAttrSet();
-    rFmtSet.ClearItem();
-    rFmtSet.Put(m_aTblSet);
+    SwFrameFormat* pFormat = rTable.GetFrameFormat();
+    SfxItemSet& rFormatSet  = (SfxItemSet&)pFormat->GetAttrSet();
+    rFormatSet.ClearItem();
+    rFormatSet.Put(m_aTableSet);
 
-    if( pFmt->IsInCache() )
+    if( pFormat->IsInCache() )
     {
-        SwFrm::GetCache().Delete( pFmt );
-        pFmt->SetInCache( false );
+        SwFrm::GetCache().Delete( pFormat );
+        pFormat->SetInCache( false );
     }
 
     // SwTableBox must have a format
-    SwTableBox aParent( static_cast<SwTableBoxFmt*>(pFmt), rTbl.GetTabLines().size(), 0 );
+    SwTableBox aParent( static_cast<SwTableBoxFormat*>(pFormat), rTable.GetTabLines().size(), 0 );
 
-    // fill FrmFmts with defaults (0)
-    pFmt = 0;
+    // fill FrameFormats with defaults (0)
+    pFormat = 0;
     for( size_t n = m_aSets.size(); n; --n )
-        m_aFrmFmts.push_back(pFmt);
+        m_aFrameFormats.push_back(pFormat);
 
-    m_pLine->CreateNew(rTbl, aParent, *this);
-    m_aFrmFmts.clear();
+    m_pLine->CreateNew(rTable, aParent, *this);
+    m_aFrameFormats.clear();
 
     // add new lines, delete old ones
     const size_t nOldLines = (USHRT_MAX == m_nLineCount)
-        ? rTbl.GetTabLines().size()
+        ? rTable.GetTabLines().size()
         : m_nLineCount;
 
-    SwDoc *pDoc = rTbl.GetFrmFmt()->GetDoc();
+    SwDoc *pDoc = rTable.GetFrameFormat()->GetDoc();
     SwChartDataProvider *pPCD = pDoc->getIDocumentChartDataProviderAccess().GetChartDataProvider();
     size_t n = 0;
     for( ; n < aParent.GetTabLines().size(); ++n )
@@ -1018,7 +1018,7 @@ void _SaveTable::CreateNew( SwTable& rTbl, bool bCreateFrms,
         pLn->SetUpper( 0 );
         if( n < nOldLines )
         {
-            SwTableLine* pOld = rTbl.GetTabLines()[ n ];
+            SwTableLine* pOld = rTable.GetTabLines()[ n ];
 
             // TL_CHART2: notify chart about boxes to be removed
             const SwTableBoxes &rBoxes = pOld->GetTabBoxes();
@@ -1027,14 +1027,14 @@ void _SaveTable::CreateNew( SwTable& rTbl, bool bCreateFrms,
             {
                 SwTableBox *pBox = rBoxes[k];
                 if (pPCD)
-                    pPCD->DeleteBox( &rTbl, *pBox );
+                    pPCD->DeleteBox( &rTable, *pBox );
             }
 
-            rTbl.GetTabLines()[n] = pLn;
+            rTable.GetTabLines()[n] = pLn;
             delete pOld;
         }
         else
-            rTbl.GetTabLines().insert( rTbl.GetTabLines().begin() + n, pLn );
+            rTable.GetTabLines().insert( rTable.GetTabLines().begin() + n, pLn );
     }
 
     if( n < nOldLines )
@@ -1042,14 +1042,14 @@ void _SaveTable::CreateNew( SwTable& rTbl, bool bCreateFrms,
         // remove remaining lines...
         for (size_t k1 = 0; k1 < nOldLines - n; ++k1)
         {
-            const SwTableBoxes &rBoxes = rTbl.GetTabLines()[n + k1]->GetTabBoxes();
+            const SwTableBoxes &rBoxes = rTable.GetTabLines()[n + k1]->GetTabBoxes();
             const size_t nBoxes = rBoxes.size();
             for (size_t k2 = 0; k2 < nBoxes; ++k2)
             {
                 SwTableBox *pBox = rBoxes[k2];
                 // TL_CHART2: notify chart about boxes to be removed
                 if (pPCD)
-                    pPCD->DeleteBox( &rTbl, *pBox );
+                    pPCD->DeleteBox( &rTable, *pBox );
             }
         }
 
@@ -1058,10 +1058,10 @@ void _SaveTable::CreateNew( SwTable& rTbl, bool bCreateFrms,
 #pragma warning (push, 1)
 #pragma warning (disable: 4258)
 #endif
-        for( SwTableLines::const_iterator it = rTbl.GetTabLines().begin() + n;
-             it != rTbl.GetTabLines().begin() + nOldLines; ++it )
+        for( SwTableLines::const_iterator it = rTable.GetTabLines().begin() + n;
+             it != rTable.GetTabLines().begin() + nOldLines; ++it )
             delete *it;
-        rTbl.GetTabLines().erase( rTbl.GetTabLines().begin() + n, rTbl.GetTabLines().begin() + nOldLines );
+        rTable.GetTabLines().erase( rTable.GetTabLines().begin() + n, rTable.GetTabLines().begin() + nOldLines );
 #ifdef _MSC_VER
 #pragma warning (pop)
 #endif
@@ -1070,41 +1070,41 @@ void _SaveTable::CreateNew( SwTable& rTbl, bool bCreateFrms,
     aParent.GetTabLines().erase( aParent.GetTabLines().begin(), aParent.GetTabLines().begin() + n );
 
     if( bCreateFrms )
-        aTmpBox.MakeFrms( rTbl );
+        aTmpBox.MakeFrms( rTable );
     if( bRestoreChart )
     {
         // TL_CHART2: need to inform chart of probably changed cell names
-        pDoc->UpdateCharts( rTbl.GetFrmFmt()->GetName() );
+        pDoc->UpdateCharts( rTable.GetFrameFormat()->GetName() );
     }
 }
 
-void _SaveTable::NewFrmFmt( const SwTableLine* pTblLn, const SwTableBox* pTblBx,
-                            sal_uInt16 nFmtPos, SwFrmFmt* pOldFmt )
+void _SaveTable::NewFrameFormat( const SwTableLine* pTableLn, const SwTableBox* pTableBx,
+                            sal_uInt16 nFormatPos, SwFrameFormat* pOldFormat )
 {
-    SwDoc* pDoc = pOldFmt->GetDoc();
+    SwDoc* pDoc = pOldFormat->GetDoc();
 
-    SwFrmFmt* pFmt = m_aFrmFmts[ nFmtPos ];
-    if( !pFmt )
+    SwFrameFormat* pFormat = m_aFrameFormats[ nFormatPos ];
+    if( !pFormat )
     {
-        if( pTblLn )
-            pFmt = pDoc->MakeTableLineFmt();
+        if( pTableLn )
+            pFormat = pDoc->MakeTableLineFormat();
         else
-            pFmt = pDoc->MakeTableBoxFmt();
-        pFmt->SetFmtAttr(*m_aSets[nFmtPos]);
-        m_aFrmFmts[nFmtPos] = pFmt;
+            pFormat = pDoc->MakeTableBoxFormat();
+        pFormat->SetFormatAttr(*m_aSets[nFormatPos]);
+        m_aFrameFormats[nFormatPos] = pFormat;
     }
 
     // first re-assign Frms
-    SwIterator<SwTabFrm,SwFmt> aIter( *pOldFmt );
+    SwIterator<SwTabFrm,SwFormat> aIter( *pOldFormat );
     for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() )
     {
-        if( pTblLn ? static_cast<SwRowFrm*>(pLast)->GetTabLine() == pTblLn
-                    : static_cast<SwCellFrm*>(pLast)->GetTabBox() == pTblBx )
+        if( pTableLn ? static_cast<SwRowFrm*>(pLast)->GetTabLine() == pTableLn
+                    : static_cast<SwCellFrm*>(pLast)->GetTabBox() == pTableBx )
         {
-            pLast->RegisterToFormat(*pFmt);
+            pLast->RegisterToFormat(*pFormat);
             pLast->InvalidateAll();
             pLast->ReinitializeFrmSizeAttrFlags();
-            if ( !pTblLn )
+            if ( !pTableLn )
             {
                 static_cast<SwCellFrm*>(pLast)->SetDerivedVert( false );
                 static_cast<SwCellFrm*>(pLast)->CheckDirChange();
@@ -1113,35 +1113,35 @@ void _SaveTable::NewFrmFmt( const SwTableLine* pTblLn, const SwTableBox* pTblBx,
     }
 
     // than re-assign myself
-    if ( pTblLn )
-        const_cast<SwTableLine*>(pTblLn)->RegisterToFormat( *pFmt );
-    else if ( pTblBx )
-        const_cast<SwTableBox*>(pTblBx)->RegisterToFormat( *pFmt );
+    if ( pTableLn )
+        const_cast<SwTableLine*>(pTableLn)->RegisterToFormat( *pFormat );
+    else if ( pTableBx )
+        const_cast<SwTableBox*>(pTableBx)->RegisterToFormat( *pFormat );
 
-    if (m_bModifyBox && !pTblLn)
+    if (m_bModifyBox && !pTableLn)
     {
-        const SfxPoolItem& rOld = pOldFmt->GetFmtAttr( RES_BOXATR_FORMAT ),
-                         & rNew = pFmt->GetFmtAttr( RES_BOXATR_FORMAT );
+        const SfxPoolItem& rOld = pOldFormat->GetFormatAttr( RES_BOXATR_FORMAT ),
+                         & rNew = pFormat->GetFormatAttr( RES_BOXATR_FORMAT );
         if( rOld != rNew )
-            pFmt->ModifyNotification( &rOld, &rNew );
+            pFormat->ModifyNotification( &rOld, &rNew );
     }
 
-    if( !pOldFmt->HasWriterListeners() )
-        delete pOldFmt;
+    if( !pOldFormat->HasWriterListeners() )
+        delete pOldFormat;
 }
 
-_SaveLine::_SaveLine( _SaveLine* pPrev, const SwTableLine& rLine, _SaveTable& rSTbl )
+_SaveLine::_SaveLine( _SaveLine* pPrev, const SwTableLine& rLine, _SaveTable& rSTable )
     : pNext( 0 )
 {
     if( pPrev )
         pPrev->pNext = this;
 
-    nItemSet = rSTbl.AddFmt( rLine.GetFrmFmt(), true );
+    nItemSet = rSTable.AddFormat( rLine.GetFrameFormat(), true );
 
-    pBox = new _SaveBox( 0, *rLine.GetTabBoxes()[ 0 ], rSTbl );
+    pBox = new _SaveBox( 0, *rLine.GetTabBoxes()[ 0 ], rSTable );
     _SaveBox* pBx = pBox;
     for( size_t n = 1; n < rLine.GetTabBoxes().size(); ++n )
-        pBx = new _SaveBox( pBx, *rLine.GetTabBoxes()[ n ], rSTbl );
+        pBx = new _SaveBox( pBx, *rLine.GetTabBoxes()[ n ], rSTable );
 }
 
 _SaveLine::~_SaveLine()
@@ -1150,9 +1150,9 @@ _SaveLine::~_SaveLine()
     delete pNext;
 }
 
-void _SaveLine::RestoreAttr( SwTableLine& rLine, _SaveTable& rSTbl )
+void _SaveLine::RestoreAttr( SwTableLine& rLine, _SaveTable& rSTable )
 {
-    rSTbl.NewFrmFmt( &rLine, 0, nItemSet, rLine.GetFrmFmt() );
+    rSTable.NewFrameFormat( &rLine, 0, nItemSet, rLine.GetFrameFormat() );
 
     _SaveBox* pBx = pBox;
     for( size_t n = 0; n < rLine.GetTabBoxes().size(); ++n, pBx = pBx->pNext )
@@ -1162,38 +1162,38 @@ void _SaveLine::RestoreAttr( SwTableLine& rLine, _SaveTable& rSTbl )
             OSL_ENSURE( false, "Number of boxes changed" );
             break;
         }
-        pBx->RestoreAttr( *rLine.GetTabBoxes()[ n ], rSTbl );
+        pBx->RestoreAttr( *rLine.GetTabBoxes()[ n ], rSTable );
     }
 }
 
-void _SaveLine::SaveCntntAttrs( SwDoc* pDoc )
+void _SaveLine::SaveContentAttrs( SwDoc* pDoc )
 {
-    pBox->SaveCntntAttrs( pDoc );
+    pBox->SaveContentAttrs( pDoc );
     if( pNext )
-        pNext->SaveCntntAttrs( pDoc );
+        pNext->SaveContentAttrs( pDoc );
 }
 
-void _SaveLine::CreateNew( SwTable& rTbl, SwTableBox& rParent, _SaveTable& rSTbl )
+void _SaveLine::CreateNew( SwTable& rTable, SwTableBox& rParent, _SaveTable& rSTable )
 {
-    SwTableLineFmt* pFmt = static_cast<SwTableLineFmt*>(rSTbl.m_aFrmFmts[ nItemSet ]);
-    if( !pFmt )
+    SwTableLineFormat* pFormat = static_cast<SwTableLineFormat*>(rSTable.m_aFrameFormats[ nItemSet ]);
+    if( !pFormat )
     {
-        SwDoc* pDoc = rTbl.GetFrmFmt()->GetDoc();
-        pFmt = pDoc->MakeTableLineFmt();
-        pFmt->SetFmtAttr(*rSTbl.m_aSets[nItemSet]);
-        rSTbl.m_aFrmFmts[nItemSet] = pFmt;
+        SwDoc* pDoc = rTable.GetFrameFormat()->GetDoc();
+        pFormat = pDoc->MakeTableLineFormat();
+        pFormat->SetFormatAttr(*rSTable.m_aSets[nItemSet]);
+        rSTable.m_aFrameFormats[nItemSet] = pFormat;
     }
-    SwTableLine* pNew = new SwTableLine( pFmt, 1, &rParent );
+    SwTableLine* pNew = new SwTableLine( pFormat, 1, &rParent );
 
     rParent.GetTabLines().push_back( pNew );
 
-    pBox->CreateNew( rTbl, *pNew, rSTbl );
+    pBox->CreateNew( rTable, *pNew, rSTable );
 
     if( pNext )
-        pNext->CreateNew( rTbl, rParent, rSTbl );
+        pNext->CreateNew( rTable, rParent, rSTable );
 }
 
-_SaveBox::_SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTbl )
+_SaveBox::_SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTable )
     : pNext( 0 ), nSttNode( ULONG_MAX ), nRowSpan(0)
 {
     Ptrs.pLine = 0;
@@ -1201,7 +1201,7 @@ _SaveBox::_SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTbl )
     if( pPrev )
         pPrev->pNext = this;
 
-    nItemSet = rSTbl.AddFmt( rBox.GetFrmFmt(), false );
+    nItemSet = rSTable.AddFormat( rBox.GetFrameFormat(), false );
 
     if( rBox.GetSttNd() )
     {
@@ -1210,11 +1210,11 @@ _SaveBox::_SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTbl )
     }
     else
     {
-        Ptrs.pLine = new _SaveLine( 0, *rBox.GetTabLines()[ 0 ], rSTbl );
+        Ptrs.pLine = new _SaveLine( 0, *rBox.GetTabLines()[ 0 ], rSTable );
 
         _SaveLine* pLn = Ptrs.pLine;
         for( size_t n = 1; n < rBox.GetTabLines().size(); ++n )
-            pLn = new _SaveLine( pLn, *rBox.GetTabLines()[ n ], rSTbl );
+            pLn = new _SaveLine( pLn, *rBox.GetTabLines()[ n ], rSTable );
     }
 }
 
@@ -1223,13 +1223,13 @@ _SaveBox::~_SaveBox()
     if( ULONG_MAX == nSttNode )     // no EndBox
         delete Ptrs.pLine;
     else
-        delete Ptrs.pCntntAttrs;
+        delete Ptrs.pContentAttrs;
     delete pNext;
 }
 
-void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
+void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTable )
 {
-    rSTbl.NewFrmFmt( 0, &rBox, nItemSet, rBox.GetFrmFmt() );
+    rSTable.NewFrameFormat( 0, &rBox, nItemSet, rBox.GetFrameFormat() );
 
     if( ULONG_MAX == nSttNode )     // no EndBox
     {
@@ -1248,26 +1248,26 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
                     break;
                 }
 
-                pLn->RestoreAttr( *rBox.GetTabLines()[ n ], rSTbl );
+                pLn->RestoreAttr( *rBox.GetTabLines()[ n ], rSTable );
             }
         }
     }
     else if( rBox.GetSttNd() && rBox.GetSttIdx() == nSttNode )
     {
-        if( Ptrs.pCntntAttrs )
+        if( Ptrs.pContentAttrs )
         {
-            SwNodes& rNds = rBox.GetFrmFmt()->GetDoc()->GetNodes();
+            SwNodes& rNds = rBox.GetFrameFormat()->GetDoc()->GetNodes();
             sal_uInt16 nSet = 0;
             sal_uLong nEnd = rBox.GetSttNd()->EndOfSectionIndex();
             for( sal_uLong n = nSttNode + 1; n < nEnd; ++n )
             {
-                SwCntntNode* pCNd = rNds[ n ]->GetCntntNode();
+                SwContentNode* pCNd = rNds[ n ]->GetContentNode();
                 if( pCNd )
                 {
-                    std::shared_ptr<SfxItemSet> pSet( (*Ptrs.pCntntAttrs)[ nSet++ ] );
+                    std::shared_ptr<SfxItemSet> pSet( (*Ptrs.pContentAttrs)[ nSet++ ] );
                     if( pSet )
                     {
-                        sal_uInt16 *pRstAttr = aSave_BoxCntntSet;
+                        sal_uInt16 *pRstAttr = aSave_BoxContentSet;
                         while( *pRstAttr )
                         {
                             pCNd->ResetAttr( *pRstAttr, *(pRstAttr+1) );
@@ -1287,64 +1287,64 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
     }
 }
 
-void _SaveBox::SaveCntntAttrs( SwDoc* pDoc )
+void _SaveBox::SaveContentAttrs( SwDoc* pDoc )
 {
     if( ULONG_MAX == nSttNode )     // no EndBox
     {
         // continue in current line
-        Ptrs.pLine->SaveCntntAttrs( pDoc );
+        Ptrs.pLine->SaveContentAttrs( pDoc );
     }
     else
     {
         sal_uLong nEnd = pDoc->GetNodes()[ nSttNode ]->EndOfSectionIndex();
-        Ptrs.pCntntAttrs = new SfxItemSets( (sal_uInt8)(nEnd - nSttNode - 1 ) );
+        Ptrs.pContentAttrs = new SfxItemSets( (sal_uInt8)(nEnd - nSttNode - 1 ) );
         for( sal_uLong n = nSttNode + 1; n < nEnd; ++n )
         {
-            SwCntntNode* pCNd = pDoc->GetNodes()[ n ]->GetCntntNode();
+            SwContentNode* pCNd = pDoc->GetNodes()[ n ]->GetContentNode();
             if( pCNd )
             {
                 std::shared_ptr<SfxItemSet> pSet;
                 if( pCNd->HasSwAttrSet() )
                 {
                     pSet.reset( new SfxItemSet( pDoc->GetAttrPool(),
-                                            aSave_BoxCntntSet ) );
+                                            aSave_BoxContentSet ) );
                     pSet->Put( *pCNd->GetpSwAttrSet() );
                 }
 
-                Ptrs.pCntntAttrs->push_back( pSet );
+                Ptrs.pContentAttrs->push_back( pSet );
             }
         }
     }
     if( pNext )
-        pNext->SaveCntntAttrs( pDoc );
+        pNext->SaveContentAttrs( pDoc );
 }
 
-void _SaveBox::CreateNew( SwTable& rTbl, SwTableLine& rParent, _SaveTable& rSTbl )
+void _SaveBox::CreateNew( SwTable& rTable, SwTableLine& rParent, _SaveTable& rSTable )
 {
-    SwTableBoxFmt* pFmt = static_cast<SwTableBoxFmt*>(rSTbl.m_aFrmFmts[ nItemSet ]);
-    if( !pFmt )
+    SwTableBoxFormat* pFormat = static_cast<SwTableBoxFormat*>(rSTable.m_aFrameFormats[ nItemSet ]);
+    if( !pFormat )
     {
-        SwDoc* pDoc = rTbl.GetFrmFmt()->GetDoc();
-        pFmt = pDoc->MakeTableBoxFmt();
-        pFmt->SetFmtAttr(*rSTbl.m_aSets[nItemSet]);
-        rSTbl.m_aFrmFmts[nItemSet] = pFmt;
+        SwDoc* pDoc = rTable.GetFrameFormat()->GetDoc();
+        pFormat = pDoc->MakeTableBoxFormat();
+        pFormat->SetFormatAttr(*rSTable.m_aSets[nItemSet]);
+        rSTable.m_aFrameFormats[nItemSet] = pFormat;
     }
 
     if( ULONG_MAX == nSttNode )     // no EndBox
     {
-        SwTableBox* pNew = new SwTableBox( pFmt, 1, &rParent );
+        SwTableBox* pNew = new SwTableBox( pFormat, 1, &rParent );
         rParent.GetTabBoxes().push_back( pNew );
 
-        Ptrs.pLine->CreateNew( rTbl, *pNew, rSTbl );
+        Ptrs.pLine->CreateNew( rTable, *pNew, rSTable );
     }
     else
     {
         // search box for StartNode in old table
-        SwTableBox* pBox = rTbl.GetTblBox( nSttNode );
+        SwTableBox* pBox = rTable.GetTableBox( nSttNode );
         if (pBox)
         {
-            SwFrmFmt* pOld = pBox->GetFrmFmt();
-            pBox->RegisterToFormat( *pFmt );
+            SwFrameFormat* pOld = pBox->GetFrameFormat();
+            pBox->RegisterToFormat( *pFormat );
             if( !pOld->HasWriterListeners() )
                 delete pOld;
 
@@ -1360,89 +1360,89 @@ void _SaveBox::CreateNew( SwTable& rTbl, SwTableLine& rParent, _SaveTable& rSTbl
     }
 
     if( pNext )
-        pNext->CreateNew( rTbl, rParent, rSTbl );
+        pNext->CreateNew( rTable, rParent, rSTable );
 }
 
 // UndoObject for attribute changes on table
-SwUndoAttrTbl::SwUndoAttrTbl( const SwTableNode& rTblNd, bool bClearTabCols )
+SwUndoAttrTable::SwUndoAttrTable( const SwTableNode& rTableNd, bool bClearTabCols )
     : SwUndo( UNDO_TABLE_ATTR ),
-    nSttNode( rTblNd.GetIndex() )
+    nSttNode( rTableNd.GetIndex() )
 {
     bClearTabCol = bClearTabCols;
-    pSaveTbl = new _SaveTable( rTblNd.GetTable() );
+    pSaveTable = new _SaveTable( rTableNd.GetTable() );
 }
 
-SwUndoAttrTbl::~SwUndoAttrTbl()
+SwUndoAttrTable::~SwUndoAttrTable()
 {
-    delete pSaveTbl;
+    delete pSaveTable;
 }
 
-void SwUndoAttrTbl::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoAttrTable::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    SwTableNode* pTblNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode();
-    OSL_ENSURE( pTblNd, "no TableNode" );
+    SwTableNode* pTableNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode();
+    OSL_ENSURE( pTableNd, "no TableNode" );
 
-    if (pTblNd)
+    if (pTableNd)
     {
-        _SaveTable* pOrig = new _SaveTable( pTblNd->GetTable() );
-        pSaveTbl->RestoreAttr( pTblNd->GetTable() );
-        delete pSaveTbl;
-        pSaveTbl = pOrig;
+        _SaveTable* pOrig = new _SaveTable( pTableNd->GetTable() );
+        pSaveTable->RestoreAttr( pTableNd->GetTable() );
+        delete pSaveTable;
+        pSaveTable = pOrig;
     }
 
     if( bClearTabCol )
         ClearFEShellTabCols();
 }
 
-void SwUndoAttrTbl::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoAttrTable::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     UndoImpl(rContext);
 }
 
 // UndoObject for AutoFormat on Table
-SwUndoTblAutoFmt::SwUndoTblAutoFmt( const SwTableNode& rTblNd,
-                                    const SwTableAutoFmt& rAFmt )
+SwUndoTableAutoFormat::SwUndoTableAutoFormat( const SwTableNode& rTableNd,
+                                    const SwTableAutoFormat& rAFormat )
     : SwUndo( UNDO_TABLE_AUTOFMT ),
-    nSttNode( rTblNd.GetIndex() ),
-    bSaveCntntAttr( false )
-    , m_nRepeatHeading(rTblNd.GetTable().GetRowsToRepeat())
+    nSttNode( rTableNd.GetIndex() ),
+    bSaveContentAttr( false )
+    , m_nRepeatHeading(rTableNd.GetTable().GetRowsToRepeat())
 {
-    pSaveTbl = new _SaveTable( rTblNd.GetTable() );
+    pSaveTable = new _SaveTable( rTableNd.GetTable() );
 
-    if( rAFmt.IsFont() || rAFmt.IsJustify() )
+    if( rAFormat.IsFont() || rAFormat.IsJustify() )
     {
         // than also go over the ContentNodes of the EndBoxes and collect
         // all paragraph attributes
-        pSaveTbl->SaveCntntAttrs( const_cast<SwDoc*>(rTblNd.GetDoc()) );
-        bSaveCntntAttr = true;
+        pSaveTable->SaveContentAttrs( const_cast<SwDoc*>(rTableNd.GetDoc()) );
+        bSaveContentAttr = true;
     }
 }
 
-SwUndoTblAutoFmt::~SwUndoTblAutoFmt()
+SwUndoTableAutoFormat::~SwUndoTableAutoFormat()
 {
-    delete pSaveTbl;
+    delete pSaveTable;
 }
 
-void SwUndoTblAutoFmt::SaveBoxCntnt( const SwTableBox& rBox )
+void SwUndoTableAutoFormat::SaveBoxContent( const SwTableBox& rBox )
 {
-    std::shared_ptr<SwUndoTblNumFmt> const p(new SwUndoTblNumFmt(rBox));
+    std::shared_ptr<SwUndoTableNumFormat> const p(new SwUndoTableNumFormat(rBox));
     m_Undos.push_back(p);
 }
 
 void
-SwUndoTblAutoFmt::UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext)
+SwUndoTableAutoFormat::UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    SwTableNode* pTblNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode();
-    OSL_ENSURE( pTblNd, "no TableNode" );
+    SwTableNode* pTableNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode();
+    OSL_ENSURE( pTableNd, "no TableNode" );
 
-    SwTable& table = pTblNd->GetTable();
+    SwTable& table = pTableNd->GetTable();
     _SaveTable* pOrig = new _SaveTable( table );
     // than go also over the ContentNodes of the EndBoxes and collect
     // all paragraph attributes
-    if( bSaveCntntAttr )
-        pOrig->SaveCntntAttrs( &rDoc );
+    if( bSaveContentAttr )
+        pOrig->SaveContentAttrs( &rDoc );
 
     if (bUndo)
     {
@@ -1454,60 +1454,60 @@ SwUndoTblAutoFmt::UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext)
         table.SetRowsToRepeat(m_nRepeatHeading);
     }
 
-    pSaveTbl->RestoreAttr( pTblNd->GetTable(), !bUndo );
-    delete pSaveTbl;
-    pSaveTbl = pOrig;
+    pSaveTable->RestoreAttr( pTableNd->GetTable(), !bUndo );
+    delete pSaveTable;
+    pSaveTable = pOrig;
 }
 
-void SwUndoTblAutoFmt::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableAutoFormat::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     UndoRedo(true, rContext);
 }
 
-void SwUndoTblAutoFmt::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableAutoFormat::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     UndoRedo(false, rContext);
 }
 
-SwUndoTblNdsChg::SwUndoTblNdsChg( SwUndoId nAction,
+SwUndoTableNdsChg::SwUndoTableNdsChg( SwUndoId nAction,
                                     const SwSelBoxes& rBoxes,
-                                    const SwTableNode& rTblNd,
+                                    const SwTableNode& rTableNd,
                                     long nMn, long nMx,
                                     sal_uInt16 nCnt, bool bFlg, bool bSmHght )
     : SwUndo( nAction ),
     nMin( nMn ), nMax( nMx ),
-    nSttNode( rTblNd.GetIndex() ), nCurrBox( 0 ),
+    nSttNode( rTableNd.GetIndex() ), nCurrBox( 0 ),
     nCount( nCnt ), nRelDiff( 0 ), nAbsDiff( 0 ),
     nSetColType( USHRT_MAX ),
     bFlag( bFlg ),
     bSameHeight( bSmHght )
 {
-    const SwTable& rTbl = rTblNd.GetTable();
-    pSaveTbl = new _SaveTable( rTbl );
+    const SwTable& rTable = rTableNd.GetTable();
+    pSaveTable = new _SaveTable( rTable );
 
     // and remember selection
     ReNewBoxes( rBoxes );
 }
 
-SwUndoTblNdsChg::SwUndoTblNdsChg( SwUndoId nAction,
+SwUndoTableNdsChg::SwUndoTableNdsChg( SwUndoId nAction,
                                     const SwSelBoxes& rBoxes,
-                                    const SwTableNode& rTblNd )
+                                    const SwTableNode& rTableNd )
     : SwUndo( nAction ),
     nMin( 0 ), nMax( 0 ),
-    nSttNode( rTblNd.GetIndex() ), nCurrBox( 0 ),
+    nSttNode( rTableNd.GetIndex() ), nCurrBox( 0 ),
     nCount( 0 ), nRelDiff( 0 ), nAbsDiff( 0 ),
     nSetColType( USHRT_MAX ),
     bFlag( false ),
     bSameHeight( false )
 {
-    const SwTable& rTbl = rTblNd.GetTable();
-    pSaveTbl = new _SaveTable( rTbl );
+    const SwTable& rTable = rTableNd.GetTable();
+    pSaveTable = new _SaveTable( rTable );
 
     // and remember selection
     ReNewBoxes( rBoxes );
 }
 
-void SwUndoTblNdsChg::ReNewBoxes( const SwSelBoxes& rBoxes )
+void SwUndoTableNdsChg::ReNewBoxes( const SwSelBoxes& rBoxes )
 {
     if (rBoxes.size() != m_Boxes.size())
     {
@@ -1519,16 +1519,16 @@ void SwUndoTblNdsChg::ReNewBoxes( const SwSelBoxes& rBoxes )
     }
 }
 
-SwUndoTblNdsChg::~SwUndoTblNdsChg()
+SwUndoTableNdsChg::~SwUndoTableNdsChg()
 {
-    delete pSaveTbl;
+    delete pSaveTable;
 }
 
-void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
+void SwUndoTableNdsChg::SaveNewBoxes( const SwTableNode& rTableNd,
                                     const SwTableSortBoxes& rOld )
 {
-    const SwTable& rTbl = rTblNd.GetTable();
-    const SwTableSortBoxes& rTblBoxes = rTbl.GetTabSortBoxes();
+    const SwTable& rTable = rTableNd.GetTable();
+    const SwTableSortBoxes& rTableBoxes = rTable.GetTabSortBoxes();
 
     OSL_ENSURE( ! IsDelBox(), "wrong Action" );
     pNewSttNds.reset( new std::set<_BoxMove> );
@@ -1536,16 +1536,16 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
     size_t i = 0;
     for (size_t  n = 0; n < rOld.size(); ++i)
     {
-        if( rOld[ n ] == rTblBoxes[ i ] )
+        if( rOld[ n ] == rTableBoxes[ i ] )
             ++n;
         else
             // new box: insert sorted
-            pNewSttNds->insert( _BoxMove(rTblBoxes[ i ]->GetSttIdx()) );
+            pNewSttNds->insert( _BoxMove(rTableBoxes[ i ]->GetSttIdx()) );
     }
 
-    for( ; i < rTblBoxes.size(); ++i )
+    for( ; i < rTableBoxes.size(); ++i )
         // new box: insert sorted
-        pNewSttNds->insert( _BoxMove(rTblBoxes[ i ]->GetSttIdx()) );
+        pNewSttNds->insert( _BoxMove(rTableBoxes[ i ]->GetSttIdx()) );
 }
 
 static SwTableLine* lcl_FindTableLine( const SwTable& rTable,
@@ -1574,24 +1574,24 @@ static const SwTableLines& lcl_FindParentLines( const SwTable& rTable,
     return rRet;
 }
 
-void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
+void SwUndoTableNdsChg::SaveNewBoxes( const SwTableNode& rTableNd,
                                     const SwTableSortBoxes& rOld,
                                     const SwSelBoxes& rBoxes,
                                     const std::vector<sal_uLong> &rNodeCnts )
 {
-    const SwTable& rTbl = rTblNd.GetTable();
-    const SwTableSortBoxes& rTblBoxes = rTbl.GetTabSortBoxes();
+    const SwTable& rTable = rTableNd.GetTable();
+    const SwTableSortBoxes& rTableBoxes = rTable.GetTabSortBoxes();
 
     OSL_ENSURE( ! IsDelBox(), "wrong Action" );
     pNewSttNds.reset( new std::set<_BoxMove> );
 
-    OSL_ENSURE( rTbl.IsNewModel() || rOld.size() + nCount * rBoxes.size() == rTblBoxes.size(),
+    OSL_ENSURE( rTable.IsNewModel() || rOld.size() + nCount * rBoxes.size() == rTableBoxes.size(),
         "unexpected boxes" );
-    OSL_ENSURE( rOld.size() <= rTblBoxes.size(), "more unexpected boxes" );
-    for (size_t n = 0, i = 0; i < rTblBoxes.size(); ++i)
+    OSL_ENSURE( rOld.size() <= rTableBoxes.size(), "more unexpected boxes" );
+    for (size_t n = 0, i = 0; i < rTableBoxes.size(); ++i)
     {
         if( ( n < rOld.size() ) &&
-            ( rOld[ n ] == rTblBoxes[ i ] ) )
+            ( rOld[ n ] == rTableBoxes[ i ] ) )
         {
             // box already known? Then nothing to be done.
             ++n;
@@ -1599,7 +1599,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
         else
         {
             // new box found: insert (obey sort order)
-            const SwTableBox* pBox = rTblBoxes[ i ];
+            const SwTableBox* pBox = rTableBoxes[ i ];
 
             // find the source box. It must be one in rBoxes.
             // We found the right one if it's in the same column as pBox.
@@ -1608,7 +1608,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
             const SwTableBox* pSourceBox = NULL;
             const SwTableBox* pCheckBox = NULL;
             const SwTableLine* pBoxLine = pBox->GetUpper();
-            sal_uInt16 nLineDiff = lcl_FindParentLines(rTbl,*pBox).GetPos(pBoxLine);
+            sal_uInt16 nLineDiff = lcl_FindParentLines(rTable,*pBox).GetPos(pBoxLine);
             sal_uInt16 nLineNo = 0;
             for (size_t j = 0; j < rBoxes.size(); ++j)
             {
@@ -1616,7 +1616,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
                 if( pCheckBox->GetUpper()->GetUpper() == pBox->GetUpper()->GetUpper() )
                 {
                     const SwTableLine* pCheckLine = pCheckBox->GetUpper();
-                    sal_uInt16 nCheckLine = lcl_FindParentLines( rTbl, *pCheckBox ).
+                    sal_uInt16 nCheckLine = lcl_FindParentLines( rTable, *pCheckBox ).
                     GetPos( pCheckLine );
                     if( ( !pSourceBox || nCheckLine > nLineNo ) && nCheckLine < nLineDiff )
                     {
@@ -1655,33 +1655,33 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
     }
 }
 
-void SwUndoTblNdsChg::SaveSection( SwStartNode* pSttNd )
+void SwUndoTableNdsChg::SaveSection( SwStartNode* pSttNd )
 {
     OSL_ENSURE( IsDelBox(), "wrong Action" );
     if( pDelSects.get() == NULL )
         pDelSects.reset( new SwUndoSaveSections( 10 ) );
 
-    SwTableNode* pTblNd = pSttNd->FindTableNode();
+    SwTableNode* pTableNd = pSttNd->FindTableNode();
     SwUndoSaveSection* pSave = new SwUndoSaveSection;
     pSave->SaveSection( SwNodeIndex( *pSttNd ));
 
     pDelSects->push_back( pSave );
-    nSttNode = pTblNd->GetIndex();
+    nSttNode = pTableNd->GetIndex();
 }
 
-void SwUndoTblNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
     SwNodeIndex aIdx( rDoc.GetNodes(), nSttNode );
 
-    SwTableNode *const pTblNd = aIdx.GetNode().GetTableNode();
-    OSL_ENSURE( pTblNd, "no TableNode" );
+    SwTableNode *const pTableNd = aIdx.GetNode().GetTableNode();
+    OSL_ENSURE( pTableNd, "no TableNode" );
 
-    SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-    aMsgHnt.eFlags = TBL_BOXPTR;
-    rDoc.getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+    aMsgHint.eFlags = TBL_BOXPTR;
+    rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
-    CHECK_TABLE( pTblNd->GetTable() )
+    CHECK_TABLE( pTableNd->GetTable() )
 
     _FndBox aTmpBox( 0, 0 );
     // ? TL_CHART2: notification or locking of controller required ?
@@ -1693,7 +1693,7 @@ void SwUndoTblNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
     {
         // Trick: add missing boxes in any line, they will be connected
         // correctly when calling CreateNew
-        SwTableBox* pCpyBox = pTblNd->GetTable().GetTabSortBoxes()[0];
+        SwTableBox* pCpyBox = pTableNd->GetTable().GetTabSortBoxes()[0];
         SwTableBoxes& rLnBoxes = pCpyBox->GetUpper()->GetTabBoxes();
 
         // restore sections
@@ -1703,7 +1703,7 @@ void SwUndoTblNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
             pSave->RestoreSection( &rDoc, &aIdx, SwTableBoxStartNode );
             if( pSave->GetHistory() )
                 pSave->GetHistory()->Rollback( &rDoc );
-            SwTableBox* pBox = new SwTableBox( static_cast<SwTableBoxFmt*>(pCpyBox->GetFrmFmt()), aIdx,
+            SwTableBox* pBox = new SwTableBox( static_cast<SwTableBoxFormat*>(pCpyBox->GetFrameFormat()), aIdx,
                                                 pCpyBox->GetUpper() );
             rLnBoxes.push_back( pBox );
         }
@@ -1721,12 +1721,12 @@ void SwUndoTblNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
             --n;
             // delete box from table structure
             sal_uLong nIdx = aTmp[n].index;
-            SwTableBox* pBox = pTblNd->GetTable().GetTblBox( nIdx );
+            SwTableBox* pBox = pTableNd->GetTable().GetTableBox( nIdx );
             OSL_ENSURE( pBox, "Where is my TableBox?" );
 
             // TL_CHART2: notify chart about box to be removed
             if (pPCD)
-                pPCD->DeleteBox( &pTblNd->GetTable(), *pBox );
+                pPCD->DeleteBox( &pTableNd->GetTable(), *pBox );
 
             // insert _before_ deleting the section - otherwise the box
             // has no start node so all boxes sort equal in SwSelBoxes
@@ -1737,7 +1737,7 @@ void SwUndoTblNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
                 SwNodeRange aRg( *pBox->GetSttNd(), 1,
                             *pBox->GetSttNd()->EndOfSectionNode() );
 
-                SwTableLine* pLine = lcl_FindTableLine( pTblNd->GetTable(), *pBox );
+                SwTableLine* pLine = lcl_FindTableLine( pTableNd->GetTable(), *pBox );
                 SwNodeIndex aInsPos( *(pLine->GetTabBoxes()[0]->GetSttNd()), 2 );
 
                 // adjust all StartNode indices
@@ -1765,19 +1765,19 @@ void SwUndoTblNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
         for( it = pNewSttNds->rbegin(); it != pNewSttNds->rend(); ++it )
         {
             sal_uLong nIdx = (*it).index;
-            SwTableBox* pBox = pTblNd->GetTable().GetTblBox( nIdx );
+            SwTableBox* pBox = pTableNd->GetTable().GetTableBox( nIdx );
             OSL_ENSURE( pBox, "Where's my table box?" );
             // TL_CHART2: notify chart about box to be removed
             if (pPCD)
-                pPCD->DeleteBox( &pTblNd->GetTable(), *pBox );
+                pPCD->DeleteBox( &pTableNd->GetTable(), *pBox );
             aDelBoxes.insert(pBox);
             aDelNodes.push_back(std::make_pair(pBox, nIdx));
         }
     }
 
     // fdo#57197: before deleting the SwTableBoxes, delete the SwTabFrms
-    aTmpBox.SetTableLines(aDelBoxes, pTblNd->GetTable());
-    aTmpBox.DelFrms(pTblNd->GetTable());
+    aTmpBox.SetTableLines(aDelBoxes, pTableNd->GetTable());
+    aTmpBox.DelFrms(pTableNd->GetTable());
 
     // do this _after_ deleting Frms because disposing SwAccessible requires
     // connection to the nodes, see SwAccessibleChild::IsAccessible()
@@ -1798,34 +1798,34 @@ void SwUndoTblNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
         delete pCurrBox;
     }
 
-    pSaveTbl->CreateNew( pTblNd->GetTable(), true, false );
+    pSaveTable->CreateNew( pTableNd->GetTable(), true, false );
 
     // TL_CHART2: need to inform chart of probably changed cell names
-    rDoc.UpdateCharts( pTblNd->GetTable().GetFrmFmt()->GetName() );
+    rDoc.UpdateCharts( pTableNd->GetTable().GetFrameFormat()->GetName() );
 
     if( IsDelBox() )
-        nSttNode = pTblNd->GetIndex();
+        nSttNode = pTableNd->GetIndex();
     ClearFEShellTabCols();
-    CHECK_TABLE( pTblNd->GetTable() )
+    CHECK_TABLE( pTableNd->GetTable() )
 }
 
-void SwUndoTblNdsChg::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableNdsChg::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
 
-    SwTableNode* pTblNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode();
-    OSL_ENSURE( pTblNd, "no TableNode" );
-    CHECK_TABLE( pTblNd->GetTable() )
+    SwTableNode* pTableNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode();
+    OSL_ENSURE( pTableNd, "no TableNode" );
+    CHECK_TABLE( pTableNd->GetTable() )
 
     SwSelBoxes aSelBoxes;
     for (std::set<sal_uLong>::iterator it = m_Boxes.begin();
             it != m_Boxes.end(); ++it)
     {
-        SwTableBox* pBox = pTblNd->GetTable().GetTblBox( *it );
+        SwTableBox* pBox = pTableNd->GetTable().GetTableBox( *it );
         aSelBoxes.insert( pBox );
     }
 
-    // create SelBoxes and call InsertCell/-Row/SplitTbl
+    // create SelBoxes and call InsertCell/-Row/SplitTable
     switch( GetId() )
     {
     case UNDO_TABLE_INSCOL:
@@ -1833,7 +1833,7 @@ void SwUndoTblNdsChg::RedoImpl(::sw::UndoRedoContext & rContext)
             rDoc.InsertCol( aSelBoxes, nCount, bFlag );
         else
         {
-            SwTableBox* pBox = pTblNd->GetTable().GetTblBox( nCurrBox );
+            SwTableBox* pBox = pTableNd->GetTable().GetTableBox( nCurrBox );
             rDoc.SetColRowWidthHeight( *pBox, nSetColType, nAbsDiff,
                                         nRelDiff );
         }
@@ -1844,42 +1844,42 @@ void SwUndoTblNdsChg::RedoImpl(::sw::UndoRedoContext & rContext)
             rDoc.InsertRow( aSelBoxes, nCount, bFlag );
         else
         {
-            SwTable& rTbl = pTblNd->GetTable();
-            SwTableBox* pBox = rTbl.GetTblBox( nCurrBox );
-            TblChgMode eOldMode = rTbl.GetTblChgMode();
-            rTbl.SetTblChgMode( (TblChgMode)nCount );
+            SwTable& rTable = pTableNd->GetTable();
+            SwTableBox* pBox = rTable.GetTableBox( nCurrBox );
+            TableChgMode eOldMode = rTable.GetTableChgMode();
+            rTable.SetTableChgMode( (TableChgMode)nCount );
             rDoc.SetColRowWidthHeight( *pBox, nSetColType, nAbsDiff, nRelDiff );
-            rTbl.SetTblChgMode( eOldMode );
+            rTable.SetTableChgMode( eOldMode );
         }
         break;
 
     case UNDO_TABLE_SPLIT:
-        rDoc.SplitTbl( aSelBoxes, bFlag, nCount, bSameHeight );
+        rDoc.SplitTable( aSelBoxes, bFlag, nCount, bSameHeight );
         break;
     case UNDO_TABLE_DELBOX:
     case UNDO_ROW_DELETE:
     case UNDO_COL_DELETE:
         if( USHRT_MAX == nSetColType )
         {
-            SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-            aMsgHnt.eFlags = TBL_BOXPTR;
-            rDoc.getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
-            SwTable &rTable = pTblNd->GetTable();
+            SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+            aMsgHint.eFlags = TBL_BOXPTR;
+            rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
+            SwTable &rTable = pTableNd->GetTable();
             if( nMax > nMin && rTable.IsNewModel() )
                 rTable.PrepareDeleteCol( nMin, nMax );
             rTable.DeleteSel( &rDoc, aSelBoxes, 0, this, true, true );
         }
         else
         {
-            SwTable& rTbl = pTblNd->GetTable();
+            SwTable& rTable = pTableNd->GetTable();
 
-            SwTableFmlUpdate aMsgHnt( &rTbl );
-            aMsgHnt.eFlags = TBL_BOXPTR;
-            rDoc.getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+            SwTableFormulaUpdate aMsgHint( &rTable );
+            aMsgHint.eFlags = TBL_BOXPTR;
+            rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
-            SwTableBox* pBox = rTbl.GetTblBox( nCurrBox );
-            TblChgMode eOldMode = rTbl.GetTblChgMode();
-            rTbl.SetTblChgMode( (TblChgMode)nCount );
+            SwTableBox* pBox = rTable.GetTableBox( nCurrBox );
+            TableChgMode eOldMode = rTable.GetTableChgMode();
+            rTable.SetTableChgMode( (TableChgMode)nCount );
 
             // need the SaveSections!
             rDoc.GetIDocumentUndoRedo().DoUndo( true );
@@ -1887,68 +1887,68 @@ void SwUndoTblNdsChg::RedoImpl(::sw::UndoRedoContext & rContext)
 
             switch( nSetColType & 0xff )
             {
-            case nsTblChgWidthHeightType::WH_COL_LEFT:
-            case nsTblChgWidthHeightType::WH_COL_RIGHT:
-            case nsTblChgWidthHeightType::WH_CELL_LEFT:
-            case nsTblChgWidthHeightType::WH_CELL_RIGHT:
-                 rTbl.SetColWidth( *pBox, nSetColType, nAbsDiff,
+            case nsTableChgWidthHeightType::WH_COL_LEFT:
+            case nsTableChgWidthHeightType::WH_COL_RIGHT:
+            case nsTableChgWidthHeightType::WH_CELL_LEFT:
+            case nsTableChgWidthHeightType::WH_CELL_RIGHT:
+                 rTable.SetColWidth( *pBox, nSetColType, nAbsDiff,
                                     nRelDiff, &pUndo );
                 break;
-            case nsTblChgWidthHeightType::WH_ROW_TOP:
-            case nsTblChgWidthHeightType::WH_ROW_BOTTOM:
-            case nsTblChgWidthHeightType::WH_CELL_TOP:
-            case nsTblChgWidthHeightType::WH_CELL_BOTTOM:
-                rTbl.SetRowHeight( *pBox, nSetColType, nAbsDiff,
+            case nsTableChgWidthHeightType::WH_ROW_TOP:
+            case nsTableChgWidthHeightType::WH_ROW_BOTTOM:
+            case nsTableChgWidthHeightType::WH_CELL_TOP:
+            case nsTableChgWidthHeightType::WH_CELL_BOTTOM:
+                rTable.SetRowHeight( *pBox, nSetColType, nAbsDiff,
                                     nRelDiff, &pUndo );
                 break;
             }
 
             if( pUndo )
             {
-                pDelSects->transfer( pDelSects->begin(), *static_cast<SwUndoTblNdsChg *>(pUndo)->pDelSects.get() );
+                pDelSects->transfer( pDelSects->begin(), *static_cast<SwUndoTableNdsChg *>(pUndo)->pDelSects.get() );
                 delete pUndo;
             }
             rDoc.GetIDocumentUndoRedo().DoUndo( false );
 
-            rTbl.SetTblChgMode( eOldMode );
+            rTable.SetTableChgMode( eOldMode );
         }
-        nSttNode = pTblNd->GetIndex();
+        nSttNode = pTableNd->GetIndex();
         break;
     default:
         ;
     }
     ClearFEShellTabCols();
-    CHECK_TABLE( pTblNd->GetTable() )
+    CHECK_TABLE( pTableNd->GetTable() )
 }
 
-SwUndoTblMerge::SwUndoTblMerge( const SwPaM& rTblSel )
-    : SwUndo( UNDO_TABLE_MERGE ), SwUndRng( rTblSel ), pHistory( 0 )
+SwUndoTableMerge::SwUndoTableMerge( const SwPaM& rTableSel )
+    : SwUndo( UNDO_TABLE_MERGE ), SwUndRng( rTableSel ), pHistory( 0 )
 {
-    const SwTableNode* pTblNd = rTblSel.GetNode().FindTableNode();
-    OSL_ENSURE( pTblNd, "Where is the TableNode?" );
-    pSaveTbl = new _SaveTable( pTblNd->GetTable() );
+    const SwTableNode* pTableNd = rTableSel.GetNode().FindTableNode();
+    OSL_ENSURE( pTableNd, "Where is the TableNode?" );
+    pSaveTable = new _SaveTable( pTableNd->GetTable() );
     pMoves = new SwUndoMoves;
-    nTblNode = pTblNd->GetIndex();
+    nTableNode = pTableNd->GetIndex();
 }
 
-SwUndoTblMerge::~SwUndoTblMerge()
+SwUndoTableMerge::~SwUndoTableMerge()
 {
-    delete pSaveTbl;
+    delete pSaveTable;
     delete pMoves;
     delete pHistory;
 }
 
-void SwUndoTblMerge::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableMerge::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    SwNodeIndex aIdx( rDoc.GetNodes(), nTblNode );
+    SwNodeIndex aIdx( rDoc.GetNodes(), nTableNode );
 
-    SwTableNode *const pTblNd = aIdx.GetNode().GetTableNode();
-    OSL_ENSURE( pTblNd, "no TableNode" );
+    SwTableNode *const pTableNd = aIdx.GetNode().GetTableNode();
+    OSL_ENSURE( pTableNd, "no TableNode" );
 
-    SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
-    aMsgHnt.eFlags = TBL_BOXPTR;
-    rDoc.getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
+    aMsgHint.eFlags = TBL_BOXPTR;
+    rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     _FndBox aTmpBox( 0, 0 );
     // ? TL_CHART2: notification or locking of controller required ?
@@ -1956,13 +1956,13 @@ void SwUndoTblMerge::UndoImpl(::sw::UndoRedoContext & rContext)
     // 1. restore deleted boxes:
     // Trick: add missing boxes in any line, they will be connected
     // correctly when calling CreateNew
-    SwTableBox *pBox, *pCpyBox = pTblNd->GetTable().GetTabSortBoxes()[0];
+    SwTableBox *pBox, *pCpyBox = pTableNd->GetTable().GetTabSortBoxes()[0];
     SwTableBoxes& rLnBoxes = pCpyBox->GetUpper()->GetTabBoxes();
 
-CHECKTABLE(pTblNd->GetTable())
+CHECKTABLE(pTableNd->GetTable())
 
     SwSelBoxes aSelBoxes;
-    SwTxtFmtColl* pColl = rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
+    SwTextFormatColl* pColl = rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD );
 
     std::set<sal_uLong>::iterator it;
     for (it = m_Boxes.begin(); it != m_Boxes.end(); ++it)
@@ -1970,14 +1970,14 @@ CHECKTABLE(pTblNd->GetTable())
         aIdx = *it;
         SwStartNode* pSttNd = rDoc.GetNodes().MakeTextSection( aIdx,
                                             SwTableBoxStartNode, pColl );
-        pBox = new SwTableBox( static_cast<SwTableBoxFmt*>(pCpyBox->GetFrmFmt()), *pSttNd,
+        pBox = new SwTableBox( static_cast<SwTableBoxFormat*>(pCpyBox->GetFrameFormat()), *pSttNd,
                                 pCpyBox->GetUpper() );
         rLnBoxes.push_back( pBox );
 
         aSelBoxes.insert( pBox );
     }
 
-CHECKTABLE(pTblNd->GetTable())
+CHECKTABLE(pTableNd->GetTable())
 
     SwChartDataProvider *pPCD = rDoc.getIDocumentChartDataProviderAccess().GetChartDataProvider();
     // 2. deleted the inserted boxes
@@ -1990,59 +1990,59 @@ CHECKTABLE(pTblNd->GetTable())
         if( !nIdx && n )
         {
             nIdx = aNewSttNds[ --n ];
-            pBox = pTblNd->GetTable().GetTblBox( nIdx );
+            pBox = pTableNd->GetTable().GetTableBox( nIdx );
             OSL_ENSURE( pBox, "Where is my TableBox?" );
 
-            if( !pSaveTbl->IsNewModel() )
-                rDoc.GetNodes().MakeTxtNode( SwNodeIndex(
+            if( !pSaveTable->IsNewModel() )
+                rDoc.GetNodes().MakeTextNode( SwNodeIndex(
                     *pBox->GetSttNd()->EndOfSectionNode() ), pColl );
 
             // this was the separator -> restore moved ones
             for( size_t i = pMoves->size(); i; )
             {
-                SwTxtNode* pTxtNd = 0;
+                SwTextNode* pTextNd = 0;
                 sal_Int32 nDelPos = 0;
                 SwUndoMove* pUndo = &(*pMoves)[ --i ];
                 if( !pUndo->IsMoveRange() )
                 {
-                    pTxtNd = rDoc.GetNodes()[ pUndo->GetDestSttNode() ]->GetTxtNode();
-                    nDelPos = pUndo->GetDestSttCntnt() - 1;
+                    pTextNd = rDoc.GetNodes()[ pUndo->GetDestSttNode() ]->GetTextNode();
+                    nDelPos = pUndo->GetDestSttContent() - 1;
                 }
                 pUndo->UndoImpl(rContext);
                 if( pUndo->IsMoveRange() )
                 {
                     // delete the unnecessary node
                     aIdx = pUndo->GetEndNode();
-                    SwCntntNode *pCNd = aIdx.GetNode().GetCntntNode();
+                    SwContentNode *pCNd = aIdx.GetNode().GetContentNode();
                     if( pCNd )
                     {
                         SwNodeIndex aTmp( aIdx, -1 );
-                        SwCntntNode *pMove = aTmp.GetNode().GetCntntNode();
+                        SwContentNode *pMove = aTmp.GetNode().GetContentNode();
                         if( pMove )
                             pCNd->MoveTo( *pMove );
                     }
                     rDoc.GetNodes().Delete( aIdx, 1 );
                 }
-                else if( pTxtNd )
+                else if( pTextNd )
                 {
                     // also delete not needed attributes
-                    SwIndex aTmpIdx( pTxtNd, nDelPos );
-                    if( pTxtNd->GetpSwpHints() && pTxtNd->GetpSwpHints()->Count() )
-                        pTxtNd->RstTxtAttr( aTmpIdx, pTxtNd->GetTxt().getLength() - nDelPos + 1 );
+                    SwIndex aTmpIdx( pTextNd, nDelPos );
+                    if( pTextNd->GetpSwpHints() && pTextNd->GetpSwpHints()->Count() )
+                        pTextNd->RstTextAttr( aTmpIdx, pTextNd->GetText().getLength() - nDelPos + 1 );
                     // delete separator
-                    pTxtNd->EraseText( aTmpIdx, 1 );
+                    pTextNd->EraseText( aTmpIdx, 1 );
                 }
             }
             nIdx = pBox->GetSttIdx();
         }
         else
-            pBox = pTblNd->GetTable().GetTblBox( nIdx );
+            pBox = pTableNd->GetTable().GetTableBox( nIdx );
 
-        if( !pSaveTbl->IsNewModel() )
+        if( !pSaveTable->IsNewModel() )
         {
             // TL_CHART2: notify chart about box to be removed
             if (pPCD)
-                pPCD->DeleteBox( &pTblNd->GetTable(), *pBox );
+                pPCD->DeleteBox( &pTableNd->GetTable(), *pBox );
 
             SwTableBoxes* pTBoxes = &pBox->GetUpper()->GetTabBoxes();
             pTBoxes->erase( std::find(pTBoxes->begin(), pTBoxes->end(), pBox ) );
@@ -2059,12 +2059,12 @@ CHECKTABLE(pTblNd->GetTable())
             rDoc.getIDocumentContentOperations().DeleteSection( rDoc.GetNodes()[ nIdx ] );
         }
     }
-CHECKTABLE(pTblNd->GetTable())
+CHECKTABLE(pTableNd->GetTable())
 
-    pSaveTbl->CreateNew( pTblNd->GetTable(), true, false );
+    pSaveTable->CreateNew( pTableNd->GetTable(), true, false );
 
     // TL_CHART2: need to inform chart of probably changed cell names
-    rDoc.UpdateCharts( pTblNd->GetTable().GetFrmFmt()->GetName() );
+    rDoc.UpdateCharts( pTableNd->GetTable().GetFrameFormat()->GetName() );
 
     if( pHistory )
     {
@@ -2074,27 +2074,27 @@ CHECKTABLE(pTblNd->GetTable())
     SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
     pPam->DeleteMark();
     pPam->GetPoint()->nNode = nSttNode;
-    pPam->GetPoint()->nContent.Assign( pPam->GetCntntNode(), nSttCntnt );
+    pPam->GetPoint()->nContent.Assign( pPam->GetContentNode(), nSttContent );
     pPam->SetMark();
     pPam->DeleteMark();
 
-CHECKTABLE(pTblNd->GetTable())
+CHECKTABLE(pTableNd->GetTable())
     ClearFEShellTabCols();
 }
 
-void SwUndoTblMerge::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableMerge::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
     SwPaM & rPam( AddUndoRedoPaM(rContext) );
-    rDoc.MergeTbl(rPam);
+    rDoc.MergeTable(rPam);
 }
 
-void SwUndoTblMerge::MoveBoxCntnt( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos )
+void SwUndoTableMerge::MoveBoxContent( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos )
 {
     SwNodeIndex aTmp( rRg.aStart, -1 ), aTmp2( rPos, -1 );
     SwUndoMove* pUndo = new SwUndoMove( pDoc, rRg, rPos );
     ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-    pDoc->getIDocumentContentOperations().MoveNodeRange( rRg, rPos, pSaveTbl->IsNewModel() ?
+    pDoc->getIDocumentContentOperations().MoveNodeRange( rRg, rPos, pSaveTable->IsNewModel() ?
         SwMoveFlags::NO_DELFRMS :
         SwMoveFlags::DEFAULT );
     ++aTmp;
@@ -2104,7 +2104,7 @@ void SwUndoTblMerge::MoveBoxCntnt( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& r
     pMoves->push_back( pUndo );
 }
 
-void SwUndoTblMerge::SetSelBoxes( const SwSelBoxes& rBoxes )
+void SwUndoTableMerge::SetSelBoxes( const SwSelBoxes& rBoxes )
 {
     // memorize selection
     for (size_t n = 0; n < rBoxes.size(); ++n)
@@ -2118,63 +2118,63 @@ void SwUndoTblMerge::SetSelBoxes( const SwSelBoxes& rBoxes )
     // The new table model does not delete overlapped cells (by row span),
     // so the rBoxes array might be empty even some cells have been merged.
     if( !rBoxes.empty() )
-        nTblNode = rBoxes[ 0 ]->GetSttNd()->FindTableNode()->GetIndex();
+        nTableNode = rBoxes[ 0 ]->GetSttNd()->FindTableNode()->GetIndex();
 }
 
-void SwUndoTblMerge::SaveCollection( const SwTableBox& rBox )
+void SwUndoTableMerge::SaveCollection( const SwTableBox& rBox )
 {
     if( !pHistory )
         pHistory = new SwHistory;
 
     SwNodeIndex aIdx( *rBox.GetSttNd(), 1 );
-    SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+    SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
     if( !pCNd )
         pCNd = aIdx.GetNodes().GoNext( &aIdx );
 
-    pHistory->Add( pCNd->GetFmtColl(), aIdx.GetIndex(), pCNd->GetNodeType());
+    pHistory->Add( pCNd->GetFormatColl(), aIdx.GetIndex(), pCNd->GetNodeType());
     if( pCNd->HasSwAttrSet() )
-        pHistory->CopyFmtAttr( *pCNd->GetpSwAttrSet(), aIdx.GetIndex() );
+        pHistory->CopyFormatAttr( *pCNd->GetpSwAttrSet(), aIdx.GetIndex() );
 }
 
-SwUndoTblNumFmt::SwUndoTblNumFmt( const SwTableBox& rBox,
+SwUndoTableNumFormat::SwUndoTableNumFormat( const SwTableBox& rBox,
                                     const SfxItemSet* pNewSet )
     : SwUndo(UNDO_TBLNUMFMT)
     , pBoxSet(0)
     , pHistory(0)
-    , nFmtIdx(css::util::NumberFormat::TEXT)
-    , nNewFmtIdx(0)
+    , nFormatIdx(css::util::NumberFormat::TEXT)
+    , nNewFormatIdx(0)
     , fNum(0.0)
     , fNewNum(0.0)
-    , bNewFmt(false)
-    , bNewFml(false)
+    , bNewFormat(false)
+    , bNewFormula(false)
     , bNewValue(false)
 {
     nNode = rBox.GetSttIdx();
 
-    nNdPos = rBox.IsValidNumTxtNd( 0 == pNewSet );
-    SwDoc* pDoc = rBox.GetFrmFmt()->GetDoc();
+    nNdPos = rBox.IsValidNumTextNd( 0 == pNewSet );
+    SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc();
 
     if( ULONG_MAX != nNdPos )
     {
-        SwTxtNode* pTNd = pDoc->GetNodes()[ nNdPos ]->GetTxtNode();
+        SwTextNode* pTNd = pDoc->GetNodes()[ nNdPos ]->GetTextNode();
 
         pHistory = new SwHistory;
         SwRegHistory aRHst( *rBox.GetSttNd(), pHistory );
         // always save all text atttibutes because of possibly overlapping
         // areas of on/off
         pHistory->CopyAttr( pTNd->GetpSwpHints(), nNdPos, 0,
-                            pTNd->GetTxt().getLength(), true );
+                            pTNd->GetText().getLength(), true );
 
         if( pTNd->HasSwAttrSet() )
-            pHistory->CopyFmtAttr( *pTNd->GetpSwAttrSet(), nNdPos );
+            pHistory->CopyFormatAttr( *pTNd->GetpSwAttrSet(), nNdPos );
 
-        aStr = pTNd->GetTxt();
+        aStr = pTNd->GetText();
         if( pTNd->GetpSwpHints() )
             pTNd->GetpSwpHints()->DeRegister();
     }
 
     pBoxSet = new SfxItemSet( pDoc->GetAttrPool(), aTableBoxSetRange );
-    pBoxSet->Put( rBox.GetFrmFmt()->GetAttrSet() );
+    pBoxSet->Put( rBox.GetFrameFormat()->GetAttrSet() );
 
     if( pNewSet )
     {
@@ -2182,20 +2182,20 @@ SwUndoTblNumFmt::SwUndoTblNumFmt( const SwTableBox& rBox,
         if( SfxItemState::SET == pNewSet->GetItemState( RES_BOXATR_FORMAT,
                 false, &pItem ))
         {
-            bNewFmt = true;
-            nNewFmtIdx = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
+            bNewFormat = true;
+            nNewFormatIdx = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
         }
         if( SfxItemState::SET == pNewSet->GetItemState( RES_BOXATR_FORMULA,
                 false, &pItem ))
         {
-            bNewFml = true;
-            aNewFml = static_cast<const SwTblBoxFormula*>(pItem)->GetFormula();
+            bNewFormula = true;
+            aNewFormula = static_cast<const SwTableBoxFormula*>(pItem)->GetFormula();
         }
         if( SfxItemState::SET == pNewSet->GetItemState( RES_BOXATR_VALUE,
                 false, &pItem ))
         {
             bNewValue = true;
-            fNewNum = static_cast<const SwTblBoxValue*>(pItem)->GetValue();
+            fNewNum = static_cast<const SwTableBoxValue*>(pItem)->GetValue();
         }
     }
 
@@ -2204,13 +2204,13 @@ SwUndoTblNumFmt::SwUndoTblNumFmt( const SwTableBox& rBox,
         DELETEZ( pHistory );
 }
 
-SwUndoTblNumFmt::~SwUndoTblNumFmt()
+SwUndoTableNumFormat::~SwUndoTableNumFormat()
 {
     delete pHistory;
     delete pBoxSet;
 }
 
-void SwUndoTblNumFmt::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableNumFormat::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     OSL_ENSURE( pBoxSet, "Where's the stored item set?" );
 
@@ -2218,37 +2218,37 @@ void SwUndoTblNumFmt::UndoImpl(::sw::UndoRedoContext & rContext)
     SwStartNode* pSttNd = rDoc.GetNodes()[ nNode ]->
                             FindSttNodeByType( SwTableBoxStartNode );
     OSL_ENSURE( pSttNd, "without StartNode no TableBox" );
-    SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().GetTblBox(
+    SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().GetTableBox(
                                     pSttNd->GetIndex() );
     OSL_ENSURE( pBox, "found no TableBox" );
 
-    SwTableBoxFmt* pFmt = rDoc.MakeTableBoxFmt();
-    pFmt->SetFmtAttr( *pBoxSet );
-    pBox->ChgFrmFmt( pFmt );
+    SwTableBoxFormat* pFormat = rDoc.MakeTableBoxFormat();
+    pFormat->SetFormatAttr( *pBoxSet );
+    pBox->ChgFrameFormat( pFormat );
 
     if( ULONG_MAX == nNdPos )
         return;
 
-    SwTxtNode* pTxtNd = rDoc.GetNodes()[ nNdPos ]->GetTxtNode();
+    SwTextNode* pTextNd = rDoc.GetNodes()[ nNdPos ]->GetTextNode();
     // If more than one node was deleted than all "node" attributes were also
     // saved
-    if( pTxtNd->HasSwAttrSet() )
-        pTxtNd->ResetAllAttr();
+    if( pTextNd->HasSwAttrSet() )
+        pTextNd->ResetAllAttr();
 
-    if( pTxtNd->GetpSwpHints() && !aStr.isEmpty() )
-        pTxtNd->ClearSwpHintsArr( true );
+    if( pTextNd->GetpSwpHints() && !aStr.isEmpty() )
+        pTextNd->ClearSwpHintsArr( true );
 
     // ChgTextToNum(..) only acts when the strings are different. We need to do
     // the same here.
-    if( pTxtNd->GetTxt() != aStr )
+    if( pTextNd->GetText() != aStr )
     {
         rDoc.getIDocumentRedlineAccess().DeleteRedline( *( pBox->GetSttNd() ), false, USHRT_MAX );
 
-        SwIndex aIdx( pTxtNd, 0 );
+        SwIndex aIdx( pTextNd, 0 );
         if( !aStr.isEmpty() )
         {
-            pTxtNd->EraseText( aIdx );
-            pTxtNd->InsertText( aStr, aIdx,
+            pTextNd->EraseText( aIdx );
+            pTextNd->InsertText( aStr, aIdx,
                 SwInsertFlags::NOHINTEXPAND );
         }
     }
@@ -2263,7 +2263,7 @@ void SwUndoTblNumFmt::UndoImpl(::sw::UndoRedoContext & rContext)
     SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
     pPam->DeleteMark();
     pPam->GetPoint()->nNode = nNode + 1;
-    pPam->GetPoint()->nContent.Assign( pTxtNd, 0 );
+    pPam->GetPoint()->nContent.Assign( pTextNd, 0 );
 }
 
 /** switch the RedlineMode on the given document, using
@@ -2301,7 +2301,7 @@ RedlineModeInternGuard::~RedlineModeInternGuard()
     mrDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( meOldRedlineMode );
 }
 
-void SwUndoTblNumFmt::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableNumFormat::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     // Could the box be changed?
     if( !pBoxSet )
@@ -2316,59 +2316,59 @@ void SwUndoTblNumFmt::RedoImpl(::sw::UndoRedoContext & rContext)
     SwNode * pNd = & pPam->GetPoint()->nNode.GetNode();
     SwStartNode* pSttNd = pNd->FindSttNodeByType( SwTableBoxStartNode );
     assert(pSttNd && "without StartNode no TableBox");
-    SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().GetTblBox(
+    SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().GetTableBox(
                                     pSttNd->GetIndex() );
     OSL_ENSURE( pBox, "found no TableBox" );
 
-    SwFrmFmt* pBoxFmt = pBox->ClaimFrmFmt();
-    if( bNewFmt || bNewFml || bNewValue )
+    SwFrameFormat* pBoxFormat = pBox->ClaimFrameFormat();
+    if( bNewFormat || bNewFormula || bNewValue )
     {
         SfxItemSet aBoxSet( rDoc.GetAttrPool(),
                                 RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
 
         // Resetting attributes is not enough. In addition, take care that the
         // text will be also formatted correctly.
-        pBoxFmt->LockModify();
+        pBoxFormat->LockModify();
 
-        if( bNewFml )
-            aBoxSet.Put( SwTblBoxFormula( aNewFml ));
+        if( bNewFormula )
+            aBoxSet.Put( SwTableBoxFormula( aNewFormula ));
         else
-            pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMULA );
-        if( bNewFmt )
-            aBoxSet.Put( SwTblBoxNumFormat( nNewFmtIdx ));
+            pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMULA );
+        if( bNewFormat )
+            aBoxSet.Put( SwTableBoxNumFormat( nNewFormatIdx ));
         else
-            pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
+            pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
         if( bNewValue )
-            aBoxSet.Put( SwTblBoxValue( fNewNum ));
+            aBoxSet.Put( SwTableBoxValue( fNewNum ));
         else
-            pBoxFmt->ResetFmtAttr( RES_BOXATR_VALUE );
-        pBoxFmt->UnlockModify();
+            pBoxFormat->ResetFormatAttr( RES_BOXATR_VALUE );
+        pBoxFormat->UnlockModify();
 
         // dvo: When redlining is (was) enabled, setting the attribute
         // will also change the cell content. To allow this, the
         // REDLINE_IGNORE flag must be removed during Redo. #108450#
         RedlineModeInternGuard aGuard( rDoc, nsRedlineMode_t::REDLINE_NONE, nsRedlineMode_t::REDLINE_IGNORE );
-        pBoxFmt->SetFmtAttr( aBoxSet );
+        pBoxFormat->SetFormatAttr( aBoxSet );
     }
-    else if( css::util::NumberFormat::TEXT != static_cast<sal_Int16>(nFmtIdx) )
+    else if( css::util::NumberFormat::TEXT != static_cast<sal_Int16>(nFormatIdx) )
     {
         SfxItemSet aBoxSet( rDoc.GetAttrPool(),
                             RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
 
-        aBoxSet.Put( SwTblBoxNumFormat( nFmtIdx ));
-        aBoxSet.Put( SwTblBoxValue( fNum ));
+        aBoxSet.Put( SwTableBoxNumFormat( nFormatIdx ));
+        aBoxSet.Put( SwTableBoxValue( fNum ));
 
         // Resetting attributes is not enough. In addition, take care that the
         // text will be also formatted correctly.
-        pBoxFmt->LockModify();
-        pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMULA );
-        pBoxFmt->UnlockModify();
+        pBoxFormat->LockModify();
+        pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMULA );
+        pBoxFormat->UnlockModify();
 
         // dvo: When redlining is (was) enabled, setting the attribute
         // will also change the cell content. To allow this, the
         // REDLINE_IGNORE flag must be removed during Redo. #108450#
         RedlineModeInternGuard aGuard( rDoc, nsRedlineMode_t::REDLINE_NONE, nsRedlineMode_t::REDLINE_IGNORE );
-        pBoxFmt->SetFmtAttr( aBoxSet );
+        pBoxFormat->SetFormatAttr( aBoxSet );
     }
     else
     {
@@ -2376,70 +2376,70 @@ void SwUndoTblNumFmt::RedoImpl(::sw::UndoRedoContext & rContext)
 
         // Resetting attributes is not enough. In addition, take care that the
         // text will be also formatted correctly.
-        pBoxFmt->SetFmtAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
+        pBoxFormat->SetFormatAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
 
-        pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
+        pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
     }
 
-    if( bNewFml )
+    if( bNewFormula )
     {
         // No matter what was set, an update of the table is always a good idea
-        SwTableFmlUpdate aTblUpdate( &pSttNd->FindTableNode()->GetTable() );
-        rDoc.getIDocumentFieldsAccess().UpdateTblFlds( &aTblUpdate );
+        SwTableFormulaUpdate aTableUpdate( &pSttNd->FindTableNode()->GetTable() );
+        rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
     }
 
-    if( !pNd->IsCntntNode() )
+    if( !pNd->IsContentNode() )
         pNd = rDoc.GetNodes().GoNext( &pPam->GetPoint()->nNode );
-    pPam->GetPoint()->nContent.Assign( static_cast<SwCntntNode*>(pNd), 0 );
+    pPam->GetPoint()->nContent.Assign( static_cast<SwContentNode*>(pNd), 0 );
 }
 
-void SwUndoTblNumFmt::SetBox( const SwTableBox& rBox )
+void SwUndoTableNumFormat::SetBox( const SwTableBox& rBox )
 {
     nNode = rBox.GetSttIdx();
 }
 
-_UndoTblCpyTbl_Entry::_UndoTblCpyTbl_Entry( const SwTableBox& rBox )
+_UndoTableCpyTable_Entry::_UndoTableCpyTable_Entry( const SwTableBox& rBox )
     : nBoxIdx( rBox.GetSttIdx() ), nOffset( 0 ),
     pBoxNumAttr( 0 ), pUndo( 0 ), bJoin( false )
 {
 }
 
-_UndoTblCpyTbl_Entry::~_UndoTblCpyTbl_Entry()
+_UndoTableCpyTable_Entry::~_UndoTableCpyTable_Entry()
 {
     delete pUndo;
     delete pBoxNumAttr;
 }
 
-SwUndoTblCpyTbl::SwUndoTblCpyTbl()
+SwUndoTableCpyTable::SwUndoTableCpyTable()
     : SwUndo( UNDO_TBLCPYTBL ), pInsRowUndo( 0 )
 {
-    pArr = new _UndoTblCpyTbl_Entries;
+    pArr = new _UndoTableCpyTable_Entries;
 }
 
-SwUndoTblCpyTbl::~SwUndoTblCpyTbl()
+SwUndoTableCpyTable::~SwUndoTableCpyTable()
 {
     delete pArr;
     delete pInsRowUndo;
 }
 
-void SwUndoTblCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
     _DEBUG_REDLINE( &rDoc )
 
-    SwTableNode* pTblNd = 0;
+    SwTableNode* pTableNd = 0;
     for( size_t n = pArr->size(); n; )
     {
-        _UndoTblCpyTbl_Entry* pEntry = &(*pArr)[ --n ];
+        _UndoTableCpyTable_Entry* pEntry = &(*pArr)[ --n ];
         sal_uLong nSttPos = pEntry->nBoxIdx + pEntry->nOffset;
         SwStartNode* pSNd = rDoc.GetNodes()[ nSttPos ]->StartOfSectionNode();
-        if( !pTblNd )
-            pTblNd = pSNd->FindTableNode();
+        if( !pTableNd )
+            pTableNd = pSNd->FindTableNode();
 
-        SwTableBox& rBox = *pTblNd->GetTable().GetTblBox( nSttPos );
+        SwTableBox& rBox = *pTableNd->GetTable().GetTableBox( nSttPos );
 
         SwNodeIndex aInsIdx( *rBox.GetSttNd(), 1 );
-        rDoc.GetNodes().MakeTxtNode( aInsIdx, rDoc.GetDfltTxtFmtColl() );
+        rDoc.GetNodes().MakeTextNode( aInsIdx, rDoc.GetDfltTextFormatColl() );
 
         // b62341295: Redline for copying tables
         const SwNode *pEndNode = rBox.GetSttNd()->EndOfSectionNode();
@@ -2465,11 +2465,11 @@ void SwUndoTblCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
                     // Set aTmpIdx to the beginning fo the old content
                     SwNodeIndex aTmpIdx( *pEndNode,
                             pUndoRedlineDelete->NodeDiff()-1 );
-                    SwTxtNode *pTxt = aTmpIdx.GetNode().GetTxtNode();
-                    if( pTxt )
+                    SwTextNode *pText = aTmpIdx.GetNode().GetTextNode();
+                    if( pText )
                     {
-                        aPam.GetPoint()->nNode = *pTxt;
-                        aPam.GetPoint()->nContent.Assign( pTxt,
+                        aPam.GetPoint()->nNode = *pText;
+                        aPam.GetPoint()->nContent.Assign( pText,
                                 pUndoRedlineDelete->ContentStart() );
                     }
                     else
@@ -2485,11 +2485,11 @@ void SwUndoTblCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
                     bDeleteCompleteParagraph = true;
                     bShiftPam = true;
                     SwNodeIndex aTmpIdx( *pEndNode, -1 );
-                    SwTxtNode *pTxt = aTmpIdx.GetNode().GetTxtNode();
-                    if( pTxt )
+                    SwTextNode *pText = aTmpIdx.GetNode().GetTextNode();
+                    if( pText )
                     {
-                        aPam.GetPoint()->nNode = *pTxt;
-                        aPam.GetPoint()->nContent.Assign( pTxt, 0 );
+                        aPam.GetPoint()->nNode = *pText;
+                        aPam.GetPoint()->nContent.Assign( pText, 0 );
                     }
                     else
                         *aPam.GetPoint() = SwPosition( aTmpIdx );
@@ -2508,11 +2508,11 @@ void SwUndoTblCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
                 // The aPam.Point is at the moment at the last position of the new content and has to be
                 // moved to the first position of the old content for the SwUndoDelete operation
                 SwNodeIndex aTmpIdx( aPam.GetPoint()->nNode, 1 );
-                SwTxtNode *pTxt = aTmpIdx.GetNode().GetTxtNode();
-                if( pTxt )
+                SwTextNode *pText = aTmpIdx.GetNode().GetTextNode();
+                if( pText )
                 {
-                    aPam.GetPoint()->nNode = *pTxt;
-                    aPam.GetPoint()->nContent.Assign( pTxt, 0 );
+                    aPam.GetPoint()->nNode = *pText;
+                    aPam.GetPoint()->nContent.Assign( pText, 0 );
                 }
                 else
                     *aPam.GetPoint() = SwPosition( aTmpIdx );
@@ -2536,17 +2536,17 @@ void SwUndoTblCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
 
         SfxItemSet aTmpSet( rDoc.GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE,
                                                 RES_VERT_ORIENT, RES_VERT_ORIENT, 0 );
-        aTmpSet.Put( rBox.GetFrmFmt()->GetAttrSet() );
+        aTmpSet.Put( rBox.GetFrameFormat()->GetAttrSet() );
         if( aTmpSet.Count() )
         {
-            SwFrmFmt* pBoxFmt = rBox.ClaimFrmFmt();
-            pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
-            pBoxFmt->ResetFmtAttr( RES_VERT_ORIENT );
+            SwFrameFormat* pBoxFormat = rBox.ClaimFrameFormat();
+            pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
+            pBoxFormat->ResetFormatAttr( RES_VERT_ORIENT );
         }
 
         if( pEntry->pBoxNumAttr )
         {
-            rBox.ClaimFrmFmt()->SetFmtAttr( *pEntry->pBoxNumAttr );
+            rBox.ClaimFrameFormat()->SetFormatAttr( *pEntry->pBoxNumAttr );
             delete pEntry->pBoxNumAttr, pEntry->pBoxNumAttr = 0;
         }
 
@@ -2568,7 +2568,7 @@ void SwUndoTblCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
     _DEBUG_REDLINE( &rDoc )
 }
 
-void SwUndoTblCpyTbl::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
     _DEBUG_REDLINE( &rDoc )
@@ -2578,21 +2578,21 @@ void SwUndoTblCpyTbl::RedoImpl(::sw::UndoRedoContext & rContext)
         pInsRowUndo->RedoImpl(rContext);
     }
 
-    SwTableNode* pTblNd = 0;
+    SwTableNode* pTableNd = 0;
     for( size_t n = 0; n < pArr->size(); ++n )
     {
-        _UndoTblCpyTbl_Entry* pEntry = &(*pArr)[ n ];
+        _UndoTableCpyTable_Entry* pEntry = &(*pArr)[ n ];
         sal_uLong nSttPos = pEntry->nBoxIdx + pEntry->nOffset;
         SwStartNode* pSNd = rDoc.GetNodes()[ nSttPos ]->StartOfSectionNode();
-        if( !pTblNd )
-            pTblNd = pSNd->FindTableNode();
+        if( !pTableNd )
+            pTableNd = pSNd->FindTableNode();
 
-        SwTableBox& rBox = *pTblNd->GetTable().GetTblBox( nSttPos );
+        SwTableBox& rBox = *pTableNd->GetTable().GetTableBox( nSttPos );
 
         SwNodeIndex aInsIdx( *rBox.GetSttNd(), 1 );
 
         // b62341295: Redline for copying tables - Start.
-        rDoc.GetNodes().MakeTxtNode( aInsIdx, rDoc.GetDfltTxtFmtColl() );
+        rDoc.GetNodes().MakeTextNode( aInsIdx, rDoc.GetDfltTextFormatColl() );
         SwPaM aPam( aInsIdx.GetNode(), *rBox.GetSttNd()->EndOfSectionNode());
         SwUndo* pUndo = IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ) ? 0 : new SwUndoDelete( aPam, true );
         if( pEntry->pUndo )
@@ -2628,16 +2628,16 @@ void SwUndoTblCpyTbl::RedoImpl(::sw::UndoRedoContext & rContext)
 
         SfxItemSet aTmpSet( rDoc.GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE,
                                                 RES_VERT_ORIENT, RES_VERT_ORIENT, 0 );
-        aTmpSet.Put( rBox.GetFrmFmt()->GetAttrSet() );
+        aTmpSet.Put( rBox.GetFrameFormat()->GetAttrSet() );
         if( aTmpSet.Count() )
         {
-            SwFrmFmt* pBoxFmt = rBox.ClaimFrmFmt();
-            pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
-            pBoxFmt->ResetFmtAttr( RES_VERT_ORIENT );
+            SwFrameFormat* pBoxFormat = rBox.ClaimFrameFormat();
+            pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
+            pBoxFormat->ResetFormatAttr( RES_VERT_ORIENT );
         }
         if( pEntry->pBoxNumAttr )
         {
-            rBox.ClaimFrmFmt()->SetFmtAttr( *pEntry->pBoxNumAttr );
+            rBox.ClaimFrameFormat()->SetFormatAttr( *pEntry->pBoxNumAttr );
             delete pEntry->pBoxNumAttr, pEntry->pBoxNumAttr = 0;
         }
 
@@ -2654,20 +2654,20 @@ void SwUndoTblCpyTbl::RedoImpl(::sw::UndoRedoContext & rContext)
     _DEBUG_REDLINE( &rDoc )
 }
 
-void SwUndoTblCpyTbl::AddBoxBefore( const SwTableBox& rBox, bool bDelCntnt )
+void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool bDelContent )
 {
-    if( !pArr->empty() && !bDelCntnt )
+    if( !pArr->empty() && !bDelContent )
         return;
 
-    _UndoTblCpyTbl_Entry* pEntry = new _UndoTblCpyTbl_Entry( rBox );
+    _UndoTableCpyTable_Entry* pEntry = new _UndoTableCpyTable_Entry( rBox );
     pArr->push_back( pEntry );
 
-    SwDoc* pDoc = rBox.GetFrmFmt()->GetDoc();
+    SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc();
     _DEBUG_REDLINE( pDoc )
-    if( bDelCntnt )
+    if( bDelContent )
     {
         SwNodeIndex aInsIdx( *rBox.GetSttNd(), 1 );
-        pDoc->GetNodes().MakeTxtNode( aInsIdx, pDoc->GetDfltTxtFmtColl() );
+        pDoc->GetNodes().MakeTextNode( aInsIdx, pDoc->GetDfltTextFormatColl() );
         SwPaM aPam( aInsIdx.GetNode(), *rBox.GetSttNd()->EndOfSectionNode() );
 
         if( !pDoc->getIDocumentRedlineAccess().IsRedlineOn() )
@@ -2677,20 +2677,20 @@ void SwUndoTblCpyTbl::AddBoxBefore( const SwTableBox& rBox, bool bDelCntnt )
     pEntry->pBoxNumAttr = new SfxItemSet( pDoc->GetAttrPool(),
                                     RES_BOXATR_FORMAT, RES_BOXATR_VALUE,
                                     RES_VERT_ORIENT, RES_VERT_ORIENT, 0 );
-    pEntry->pBoxNumAttr->Put( rBox.GetFrmFmt()->GetAttrSet() );
+    pEntry->pBoxNumAttr->Put( rBox.GetFrameFormat()->GetAttrSet() );
     if( !pEntry->pBoxNumAttr->Count() )
         delete pEntry->pBoxNumAttr, pEntry->pBoxNumAttr = 0;
     _DEBUG_REDLINE( pDoc )
 }
 
-void SwUndoTblCpyTbl::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, bool bDelCntnt )
+void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, bool bDelContent )
 {
-    _UndoTblCpyTbl_Entry* pEntry = &(*pArr).back();
+    _UndoTableCpyTable_Entry* pEntry = &(*pArr).back();
 
     // If the content was deleted than remove also the temporarily created node
-    if( bDelCntnt )
+    if( bDelContent )
     {
-        SwDoc* pDoc = rBox.GetFrmFmt()->GetDoc();
+        SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc();
         _DEBUG_REDLINE( pDoc )
 
         if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() )
@@ -2699,7 +2699,7 @@ void SwUndoTblCpyTbl::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rI
             pEntry->pUndo = PrepareRedline( pDoc, rBox, aTmpPos, pEntry->bJoin, false );
         }
         SwNodeIndex aDelIdx( *rBox.GetSttNd(), 1 );
-        rBox.GetFrmFmt()->GetDoc()->GetNodes().Delete( aDelIdx, 1 );
+        rBox.GetFrameFormat()->GetDoc()->GetNodes().Delete( aDelIdx, 1 );
         _DEBUG_REDLINE( pDoc )
     }
 
@@ -2712,7 +2712,7 @@ void SwUndoTblCpyTbl::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rI
 // been merged.
 // rJoin is true if Redo() is calling and the content has already been merged
 
-SwUndo* SwUndoTblCpyTbl::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox,
+SwUndo* SwUndoTableCpyTable::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox,
     const SwPosition& rPos, bool& rJoin, bool bRedo )
 {
     SwUndo *pUndo = 0;
@@ -2725,20 +2725,20 @@ SwUndo* SwUndoTblCpyTbl::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox,
     pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)( ( eOld | nsRedlineMode_t::REDLINE_DONTCOMBINE_REDLINES ) &
                                      ~nsRedlineMode_t::REDLINE_IGNORE ));
     SwPosition aInsertEnd( rPos );
-    SwTxtNode* pTxt;
+    SwTextNode* pText;
     if( !rJoin )
     {
         // If the content is not merged, the end of the insertion is at the end of the node
         // _before_ the given position rPos
         --aInsertEnd.nNode;
-        pTxt = aInsertEnd.nNode.GetNode().GetTxtNode();
-        if( pTxt )
+        pText = aInsertEnd.nNode.GetNode().GetTextNode();
+        if( pText )
         {
-            aInsertEnd.nContent.Assign(pTxt, pTxt->GetTxt().getLength());
-            if( !bRedo && rPos.nNode.GetNode().GetTxtNode() )
+            aInsertEnd.nContent.Assign(pText, pText->GetText().getLength());
+            if( !bRedo && rPos.nNode.GetNode().GetTextNode() )
             {   // Try to merge, if not called by Redo()
                 rJoin = true;
-                pTxt->JoinNext();
+                pText->JoinNext();
             }
         }
         else
@@ -2749,14 +2749,14 @@ SwUndo* SwUndoTblCpyTbl::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox,
     SwPosition aDeleteStart( rJoin ? aInsertEnd : rPos );
     if( !rJoin )
     {
-        pTxt = aDeleteStart.nNode.GetNode().GetTxtNode();
-        if( pTxt )
-            aDeleteStart.nContent.Assign( pTxt, 0 );
+        pText = aDeleteStart.nNode.GetNode().GetTextNode();
+        if( pText )
+            aDeleteStart.nContent.Assign( pText, 0 );
     }
     SwPosition aCellEnd( SwNodeIndex( *rBox.GetSttNd()->EndOfSectionNode(), -1 ) );
-    pTxt = aCellEnd.nNode.GetNode().GetTxtNode();
-    if( pTxt )
-        aCellEnd.nContent.Assign(pTxt, pTxt->GetTxt().getLength());
+    pText = aCellEnd.nNode.GetNode().GetTextNode();
+    if( pText )
+        aCellEnd.nContent.Assign(pText, pText->GetText().getLength());
     if( aDeleteStart != aCellEnd )
     {   // If the old (deleted) part is not empty, here we are...
         SwPaM aDeletePam( aDeleteStart, aCellEnd );
@@ -2771,9 +2771,9 @@ SwUndo* SwUndoTblCpyTbl::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox,
         pUndo = new SwUndoDelete( aTmpPam, true );
     }
     SwPosition aCellStart( SwNodeIndex( *rBox.GetSttNd(), 2 ) );
-    pTxt = aCellStart.nNode.GetNode().GetTxtNode();
-    if( pTxt )
-        aCellStart.nContent.Assign( pTxt, 0 );
+    pText = aCellStart.nNode.GetNode().GetTextNode();
+    if( pText )
+        aCellStart.nContent.Assign( pText, 0 );
     if( aCellStart != aInsertEnd ) // An empty insertion will not been marked
     {
         SwPaM aTmpPam( aCellStart, aInsertEnd );
@@ -2784,56 +2784,56 @@ SwUndo* SwUndoTblCpyTbl::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox,
     return pUndo;
 }
 
-bool SwUndoTblCpyTbl::InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes,
+bool SwUndoTableCpyTable::InsertRow( SwTable& rTable, const SwSelBoxes& rBoxes,
                                 sal_uInt16 nCnt )
 {
-    SwTableNode* pTblNd = const_cast<SwTableNode*>(rTbl.GetTabSortBoxes()[0]->
+    SwTableNode* pTableNd = const_cast<SwTableNode*>(rTable.GetTabSortBoxes()[0]->
                                 GetSttNd()->FindTableNode());
 
-    pInsRowUndo = new SwUndoTblNdsChg( UNDO_TABLE_INSROW, rBoxes, *pTblNd,
+    pInsRowUndo = new SwUndoTableNdsChg( UNDO_TABLE_INSROW, rBoxes, *pTableNd,
                                        0, 0, nCnt, true, false );
-    SwTableSortBoxes aTmpLst( rTbl.GetTabSortBoxes() );
+    SwTableSortBoxes aTmpLst( rTable.GetTabSortBoxes() );
 
-    bool bRet = rTbl.InsertRow( rTbl.GetFrmFmt()->GetDoc(), rBoxes, nCnt, true );
+    bool bRet = rTable.InsertRow( rTable.GetFrameFormat()->GetDoc(), rBoxes, nCnt, true );
     if( bRet )
-        pInsRowUndo->SaveNewBoxes( *pTblNd, aTmpLst );
+        pInsRowUndo->SaveNewBoxes( *pTableNd, aTmpLst );
     else
         delete pInsRowUndo, pInsRowUndo = 0;
     return bRet;
 }
 
-bool SwUndoTblCpyTbl::IsEmpty() const
+bool SwUndoTableCpyTable::IsEmpty() const
 {
     return !pInsRowUndo && pArr->empty();
 }
 
-SwUndoCpyTbl::SwUndoCpyTbl()
-    : SwUndo( UNDO_CPYTBL ), pDel( 0 ), nTblNode( 0 )
+SwUndoCpyTable::SwUndoCpyTable()
+    : SwUndo( UNDO_CPYTBL ), pDel( 0 ), nTableNode( 0 )
 {
 }
 
-SwUndoCpyTbl::~SwUndoCpyTbl()
+SwUndoCpyTable::~SwUndoCpyTable()
 {
     delete pDel;
 }
 
-void SwUndoCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoCpyTable::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    SwTableNode* pTNd = rDoc.GetNodes()[ nTblNode ]->GetTableNode();
+    SwTableNode* pTNd = rDoc.GetNodes()[ nTableNode ]->GetTableNode();
 
     // move hard page breaks into next node
-    SwCntntNode* pNextNd = rDoc.GetNodes()[ pTNd->EndOfSectionIndex()+1 ]->GetCntntNode();
+    SwContentNode* pNextNd = rDoc.GetNodes()[ pTNd->EndOfSectionIndex()+1 ]->GetContentNode();
     if( pNextNd )
     {
-        SwFrmFmt* pTableFmt = pTNd->GetTable().GetFrmFmt();
+        SwFrameFormat* pTableFormat = pTNd->GetTable().GetFrameFormat();
         const SfxPoolItem *pItem;
 
-        if( SfxItemState::SET == pTableFmt->GetItemState( RES_PAGEDESC,
+        if( SfxItemState::SET == pTableFormat->GetItemState( RES_PAGEDESC,
             false, &pItem ) )
             pNextNd->SetAttr( *pItem );
 
-        if( SfxItemState::SET == pTableFmt->GetItemState( RES_BREAK,
+        if( SfxItemState::SET == pTableFormat->GetItemState( RES_BREAK,
             false, &pItem ) )
             pNextNd->SetAttr( *pItem );
     }
@@ -2842,17 +2842,17 @@ void SwUndoCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
     pDel = new SwUndoDelete( aPam, true );
 }
 
-void SwUndoCpyTbl::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoCpyTable::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     pDel->UndoImpl(rContext);
     delete pDel, pDel = 0;
 }
 
-SwUndoSplitTbl::SwUndoSplitTbl( const SwTableNode& rTblNd,
+SwUndoSplitTable::SwUndoSplitTable( const SwTableNode& rTableNd,
     SwSaveRowSpan* pRowSp, sal_uInt16 eMode, bool bNewSize )
     : SwUndo( UNDO_SPLIT_TABLE ),
-    nTblNode( rTblNd.GetIndex() ), nOffset( 0 ), mpSaveRowSpan( pRowSp ), pSavTbl( 0 ),
-    pHistory( 0 ), nMode( eMode ), nFmlEnd( 0 ), bCalcNewSize( bNewSize )
+    nTableNode( rTableNd.GetIndex() ), nOffset( 0 ), mpSaveRowSpan( pRowSp ), pSavTable( 0 ),
+    pHistory( 0 ), nMode( eMode ), nFormulaEnd( 0 ), bCalcNewSize( bNewSize )
 {
     switch( nMode )
     {
@@ -2861,34 +2861,34 @@ SwUndoSplitTbl::SwUndoSplitTbl( const SwTableNode& rTblNd,
             // no break
     case HEADLINE_BORDERCOPY:
     case HEADLINE_BOXATTRCOPY:
-        pSavTbl = new _SaveTable( rTblNd.GetTable(), 1, false );
+        pSavTable = new _SaveTable( rTableNd.GetTable(), 1, false );
         break;
     }
 }
 
-SwUndoSplitTbl::~SwUndoSplitTbl()
+SwUndoSplitTable::~SwUndoSplitTable()
 {
-    delete pSavTbl;
+    delete pSavTable;
     delete pHistory;
     delete mpSaveRowSpan;
 }
 
-void SwUndoSplitTbl::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoSplitTable::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc *const pDoc = & rContext.GetDoc();
     SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
 
     SwNodeIndex& rIdx = pPam->GetPoint()->nNode;
-    rIdx = nTblNode + nOffset;
-    pPam->GetPoint()->nContent.Assign(rIdx.GetNode().GetCntntNode(), 0);
-    assert(rIdx.GetNode().GetCntntNode()->Len() == 0); // empty para inserted
+    rIdx = nTableNode + nOffset;
+    pPam->GetPoint()->nContent.Assign(rIdx.GetNode().GetContentNode(), 0);
+    assert(rIdx.GetNode().GetContentNode()->Len() == 0); // empty para inserted
 
     {
         // avoid asserts from ~SwIndexReg
-        SwNodeIndex const idx(pDoc->GetNodes(), nTblNode + nOffset);
+        SwNodeIndex const idx(pDoc->GetNodes(), nTableNode + nOffset);
         {
             SwPaM pam(idx);
-            pam.Move(fnMoveBackward, fnGoCntnt);
+            pam.Move(fnMoveBackward, fnGoContent);
             ::PaMCorrAbs(*pPam, *pam.GetPoint());
         }
 
@@ -2896,25 +2896,25 @@ void SwUndoSplitTbl::UndoImpl(::sw::UndoRedoContext & rContext)
         pDoc->GetNodes().Delete( idx, 1 );
     }
 
-    rIdx = nTblNode + nOffset;
-    SwTableNode* pTblNd = rIdx.GetNode().GetTableNode();
-    SwTable& rTbl = pTblNd->GetTable();
+    rIdx = nTableNode + nOffset;
+    SwTableNode* pTableNd = rIdx.GetNode().GetTableNode();
+    SwTable& rTable = pTableNd->GetTable();
 
-    SwTableFmlUpdate aMsgHnt( &rTbl );
-    aMsgHnt.eFlags = TBL_BOXPTR;
-    pDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( &rTable );
+    aMsgHint.eFlags = TBL_BOXPTR;
+    pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     switch( nMode )
     {
     case HEADLINE_BOXATRCOLLCOPY:
         if( pHistory )
-            pHistory->TmpRollback( pDoc, nFmlEnd );
+            pHistory->TmpRollback( pDoc, nFormulaEnd );
         // no break
     case HEADLINE_BOXATTRCOPY:
     case HEADLINE_BORDERCOPY:
         {
-            pSavTbl->CreateNew( rTbl, false );
-            pSavTbl->RestoreAttr( rTbl );
+            pSavTable->CreateNew( rTable, false );
+            pSavTable->RestoreAttr( rTable );
         }
         break;
 
@@ -2922,12 +2922,12 @@ void SwUndoSplitTbl::UndoImpl(::sw::UndoRedoContext & rContext)
         // the created first line has to be removed again
         {
             SwSelBoxes aSelBoxes;
-            SwTableBox* pBox = rTbl.GetTblBox( nTblNode + nOffset + 1 );
+            SwTableBox* pBox = rTable.GetTableBox( nTableNode + nOffset + 1 );
             SwTable::SelLineFromBox( pBox, aSelBoxes, true );
             _FndBox aTmpBox( 0, 0 );
-            aTmpBox.SetTableLines( aSelBoxes, rTbl );
-            aTmpBox.DelFrms( rTbl );
-            rTbl.DeleteSel( pDoc, aSelBoxes, 0, 0, false, false );
+            aTmpBox.SetTableLines( aSelBoxes, rTable );
+            aTmpBox.DelFrms( rTable );
+            rTable.DeleteSel( pDoc, aSelBoxes, 0, 0, false, false );
         }
         break;
     }
@@ -2941,26 +2941,26 @@ void SwUndoSplitTbl::UndoImpl(::sw::UndoRedoContext & rContext)
     }
     if( mpSaveRowSpan )
     {
-        pTblNd = rIdx.GetNode().FindTableNode();
-        if( pTblNd )
-            pTblNd->GetTable().RestoreRowSpan( *mpSaveRowSpan );
+        pTableNd = rIdx.GetNode().FindTableNode();
+        if( pTableNd )
+            pTableNd->GetTable().RestoreRowSpan( *mpSaveRowSpan );
     }
     ClearFEShellTabCols();
 }
 
-void SwUndoSplitTbl::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoSplitTable::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc *const pDoc = & rContext.GetDoc();
     SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
 
     pPam->DeleteMark();
-    pPam->GetPoint()->nNode = nTblNode;
+    pPam->GetPoint()->nNode = nTableNode;
     pDoc->SplitTable( *pPam->GetPoint(), nMode, bCalcNewSize );
 
     ClearFEShellTabCols();
 }
 
-void SwUndoSplitTbl::RepeatImpl(::sw::RepeatContext & rContext)
+void SwUndoSplitTable::RepeatImpl(::sw::RepeatContext & rContext)
 {
     SwPaM *const pPam = & rContext.GetRepeatPaM();
     SwDoc *const pDoc = & rContext.GetDoc();
@@ -2969,79 +2969,79 @@ void SwUndoSplitTbl::RepeatImpl(::sw::RepeatContext & rContext)
     ClearFEShellTabCols();
 }
 
-void SwUndoSplitTbl::SaveFormula( SwHistory& rHistory )
+void SwUndoSplitTable::SaveFormula( SwHistory& rHistory )
 {
     if( !pHistory )
         pHistory = new SwHistory;
 
-    nFmlEnd = rHistory.Count();
+    nFormulaEnd = rHistory.Count();
     pHistory->Move( 0, &rHistory );
 }
 
-SwUndoMergeTbl::SwUndoMergeTbl( const SwTableNode& rTblNd,
-                                const SwTableNode& rDelTblNd,
+SwUndoMergeTable::SwUndoMergeTable( const SwTableNode& rTableNd,
+                                const SwTableNode& rDelTableNd,
                                 bool bWithPrv, sal_uInt16 nMd )
-    : SwUndo( UNDO_MERGE_TABLE ), pSavTbl( 0 ),
+    : SwUndo( UNDO_MERGE_TABLE ), pSavTable( 0 ),
     pHistory( 0 ), nMode( nMd ), bWithPrev( bWithPrv )
 {
     // memorize end node of the last table cell that'll stay in position
     if( bWithPrev )
-        nTblNode = rDelTblNd.EndOfSectionIndex() - 1;
+        nTableNode = rDelTableNd.EndOfSectionIndex() - 1;
     else
-        nTblNode = rTblNd.EndOfSectionIndex() - 1;
+        nTableNode = rTableNd.EndOfSectionIndex() - 1;
 
-    aName = rDelTblNd.GetTable().GetFrmFmt()->GetName();
-    pSavTbl = new _SaveTable( rDelTblNd.GetTable() );
+    aName = rDelTableNd.GetTable().GetFrameFormat()->GetName();
+    pSavTable = new _SaveTable( rDelTableNd.GetTable() );
 
-    pSavHdl = bWithPrev ? new _SaveTable( rTblNd.GetTable(), 1 ) : 0;
+    pSavHdl = bWithPrev ? new _SaveTable( rTableNd.GetTable(), 1 ) : 0;
 }
 
-SwUndoMergeTbl::~SwUndoMergeTbl()
+SwUndoMergeTable::~SwUndoMergeTable()
 {
-    delete pSavTbl;
+    delete pSavTable;
     delete pSavHdl;
     delete pHistory;
 }
 
-void SwUndoMergeTbl::UndoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoMergeTable::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc *const pDoc = & rContext.GetDoc();
     SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
 
     pPam->DeleteMark();
     SwNodeIndex& rIdx = pPam->GetPoint()->nNode;
-    rIdx = nTblNode;
+    rIdx = nTableNode;
 
-    SwTableNode* pTblNd = rIdx.GetNode().FindTableNode();
-    SwTable* pTbl = &pTblNd->GetTable();
+    SwTableNode* pTableNd = rIdx.GetNode().FindTableNode();
+    SwTable* pTable = &pTableNd->GetTable();
 
-    SwTableFmlUpdate aMsgHnt( pTbl );
-    aMsgHnt.eFlags = TBL_BOXPTR;
-    pDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt );
+    SwTableFormulaUpdate aMsgHint( pTable );
+    aMsgHint.eFlags = TBL_BOXPTR;
+    pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     // get lines for layout update
     _FndBox aFndBox( 0, 0 );
-    aFndBox.SetTableLines( *pTbl );
-    aFndBox.DelFrms( *pTbl );
+    aFndBox.SetTableLines( *pTable );
+    aFndBox.DelFrms( *pTable );
     // ? TL_CHART2: notification or locking of controller required ?
 
     SwTableNode* pNew = pDoc->GetNodes().SplitTable( rIdx, true, false );
 
     // update layout
-    aFndBox.MakeFrms( *pTbl );
+    aFndBox.MakeFrms( *pTable );
     // ? TL_CHART2: notification or locking of controller required ?
 
     if( bWithPrev )
     {
         // move name
-        pNew->GetTable().GetFrmFmt()->SetName( pTbl->GetFrmFmt()->GetName() );
+        pNew->GetTable().GetFrameFormat()->SetName( pTable->GetFrameFormat()->GetName() );
         pSavHdl->RestoreAttr( pNew->GetTable() );
     }
     else
-        pTbl = &pNew->GetTable();
+        pTable = &pNew->GetTable();
 
-    pTbl->GetFrmFmt()->SetName( aName );
-    pSavTbl->RestoreAttr( *pTbl );
+    pTable->GetFrameFormat()->SetName( aName );
+    pSavTable->RestoreAttr( *pTable );
 
     if( pHistory )
     {
@@ -3054,7 +3054,7 @@ void SwUndoMergeTbl::UndoImpl(::sw::UndoRedoContext & rContext)
     pNew->MakeFrms( &aTmpIdx );
 
     // position cursor somewhere in content
-    SwCntntNode* pCNd = pDoc->GetNodes().GoNext( &rIdx );
+    SwContentNode* pCNd = pDoc->GetNodes().GoNext( &rIdx );
     pPam->GetPoint()->nContent.Assign( pCNd, 0 );
 
     ClearFEShellTabCols();
@@ -3063,29 +3063,29 @@ void SwUndoMergeTbl::UndoImpl(::sw::UndoRedoContext & rContext)
     SwChartDataProvider *pPCD = pDoc->getIDocumentChartDataProviderAccess().GetChartDataProvider();
     if (pPCD)
     {
-        pDoc->UpdateCharts( pTbl->GetFrmFmt()->GetName() );
-        pDoc->UpdateCharts( pNew->GetTable().GetFrmFmt()->GetName() );
+        pDoc->UpdateCharts( pTable->GetFrameFormat()->GetName() );
+        pDoc->UpdateCharts( pNew->GetTable().GetFrameFormat()->GetName() );
     }
 }
 
-void SwUndoMergeTbl::RedoImpl(::sw::UndoRedoContext & rContext)
+void SwUndoMergeTable::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc *const pDoc = & rContext.GetDoc();
     SwPaM *const pPam(& rContext.GetCursorSupplier().CreateNewShellCursor());
 
     pPam->DeleteMark();
-    pPam->GetPoint()->nNode = nTblNode;
+    pPam->GetPoint()->nNode = nTableNode;
     if( bWithPrev )
-        pPam->GetPoint()->nNode = nTblNode + 3;
+        pPam->GetPoint()->nNode = nTableNode + 3;
     else
-        pPam->GetPoint()->nNode = nTblNode;
+        pPam->GetPoint()->nNode = nTableNode;
 
     pDoc->MergeTable( *pPam->GetPoint(), bWithPrev, nMode );
 
     ClearFEShellTabCols();
 }
 
-void SwUndoMergeTbl::RepeatImpl(::sw::RepeatContext & rContext)
+void SwUndoMergeTable::RepeatImpl(::sw::RepeatContext & rContext)
 {
     SwDoc *const pDoc = & rContext.GetDoc();
     SwPaM *const pPam = & rContext.GetRepeatPaM();
@@ -3094,7 +3094,7 @@ void SwUndoMergeTbl::RepeatImpl(::sw::RepeatContext & rContext)
     ClearFEShellTabCols();
 }
 
-void SwUndoMergeTbl::SaveFormula( SwHistory& rHistory )
+void SwUndoMergeTable::SaveFormula( SwHistory& rHistory )
 {
     if( !pHistory )
         pHistory = new SwHistory;
@@ -3130,10 +3130,10 @@ void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pIn
 }
 
 #if OSL_DEBUG_LEVEL > 0
-void CheckTable( const SwTable& rTbl )
+void CheckTable( const SwTable& rTable )
 {
-    const SwNodes& rNds = rTbl.GetFrmFmt()->GetDoc()->GetNodes();
-    const SwTableSortBoxes& rSrtArr = rTbl.GetTabSortBoxes();
+    const SwNodes& rNds = rTable.GetFrameFormat()->GetDoc()->GetNodes();
+    const SwTableSortBoxes& rSrtArr = rTable.GetTabSortBoxes();
     for (size_t n = 0; n < rSrtArr.size(); ++n)
     {
         const SwTableBox* pBox = rSrtArr[ n ];
diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index 01457c71ab30..d0148ef04277 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -34,36 +34,36 @@
 
 SwUndoInserts::SwUndoInserts( SwUndoId nUndoId, const SwPaM& rPam )
     : SwUndo( nUndoId ), SwUndRng( rPam ),
-    pTxtFmtColl( 0 ), pLastNdColl(0), pFrmFmts( 0 ), pRedlData( 0 ),
-    bSttWasTxtNd( true ), nNdDiff( 0 ), nSetPos( 0 )
+    pTextFormatColl( 0 ), pLastNdColl(0), pFrameFormats( 0 ), pRedlData( 0 ),
+    bSttWasTextNd( true ), nNdDiff( 0 ), nSetPos( 0 )
 {
     pHistory = new SwHistory;
     SwDoc* pDoc = rPam.GetDoc();
 
-    SwTxtNode* pTxtNd = rPam.GetPoint()->nNode.GetNode().GetTxtNode();
-    if( pTxtNd )
+    SwTextNode* pTextNd = rPam.GetPoint()->nNode.GetNode().GetTextNode();
+    if( pTextNd )
     {
-        pTxtFmtColl = pTxtNd->GetTxtColl();
-        pHistory->CopyAttr( pTxtNd->GetpSwpHints(), nSttNode,
-                            0, pTxtNd->GetTxt().getLength(), false );
-        if( pTxtNd->HasSwAttrSet() )
-            pHistory->CopyFmtAttr( *pTxtNd->GetpSwAttrSet(), nSttNode );
+        pTextFormatColl = pTextNd->GetTextColl();
+        pHistory->CopyAttr( pTextNd->GetpSwpHints(), nSttNode,
+                            0, pTextNd->GetText().getLength(), false );
+        if( pTextNd->HasSwAttrSet() )
+            pHistory->CopyFormatAttr( *pTextNd->GetpSwAttrSet(), nSttNode );
 
-        if( !nSttCntnt )    // than take the Flys along
+        if( !nSttContent )    // than take the Flys along
         {
-            const size_t nArrLen = pDoc->GetSpzFrmFmts()->size();
+            const size_t nArrLen = pDoc->GetSpzFrameFormats()->size();
             for( size_t n = 0; n < nArrLen; ++n )
             {
-                SwFrmFmt* pFmt = (*pDoc->GetSpzFrmFmts())[n];
-                SwFmtAnchor const*const  pAnchor = &pFmt->GetAnchor();
-                const SwPosition* pAPos = pAnchor->GetCntntAnchor();
+                SwFrameFormat* pFormat = (*pDoc->GetSpzFrameFormats())[n];
+                SwFormatAnchor const*const  pAnchor = &pFormat->GetAnchor();
+                const SwPosition* pAPos = pAnchor->GetContentAnchor();
                 if (pAPos &&
                     (pAnchor->GetAnchorId() == FLY_AT_PARA) &&
                      nSttNode == pAPos->nNode.GetIndex() )
                 {
-                    if( !pFrmFmts )
-                        pFrmFmts = new std::vector<SwFrmFmt*>;
-                    pFrmFmts->push_back( pFmt );
+                    if( !pFrameFormats )
+                        pFrameFormats = new std::vector<SwFrameFormat*>;
+                    pFrameFormats->push_back( pFormat );
                 }
             }
         }
@@ -78,11 +78,11 @@ SwUndoInserts::SwUndoInserts( SwUndoId nUndoId, const SwPaM& rPam )
 
 // set destination after reading input
 void SwUndoInserts::SetInsertRange( const SwPaM& rPam, bool bScanFlys,
-                                    bool bSttIsTxtNd )
+                                    bool bSttIsTextNd )
 {
     const SwPosition* pTmpPos = rPam.End();
     nEndNode = pTmpPos->nNode.GetIndex();
-    nEndCntnt = pTmpPos->nContent.GetIndex();
+    nEndContent = pTmpPos->nContent.GetIndex();
     if( rPam.HasMark() )
     {
         if( pTmpPos == rPam.GetPoint() )
@@ -91,42 +91,42 @@ void SwUndoInserts::SetInsertRange( const SwPaM& rPam, bool bScanFlys,
             pTmpPos = rPam.GetPoint();
 
         nSttNode = pTmpPos->nNode.GetIndex();
-        nSttCntnt = pTmpPos->nContent.GetIndex();
+        nSttContent = pTmpPos->nContent.GetIndex();
 
-        if( !bSttIsTxtNd )      // if a table selection is added ...
+        if( !bSttIsTextNd )      // if a table selection is added ...
         {
             ++nSttNode;         // ... than the CopyPam is not fully correct
-            bSttWasTxtNd = false;
+            bSttWasTextNd = false;
         }
     }
 
-    if( bScanFlys && !nSttCntnt )
+    if( bScanFlys && !nSttContent )
     {
         // than collect all new Flys
         SwDoc* pDoc = rPam.GetDoc();
-        const size_t nArrLen = pDoc->GetSpzFrmFmts()->size();
+        const size_t nArrLen = pDoc->GetSpzFrameFormats()->size();
         for( size_t n = 0; n < nArrLen; ++n )
         {
-            SwFrmFmt* pFmt = (*pDoc->GetSpzFrmFmts())[n];
-            SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-            SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+            SwFrameFormat* pFormat = (*pDoc->GetSpzFrameFormats())[n];
+            SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+            SwPosition const*const pAPos = pAnchor->GetContentAnchor();
             if (pAPos &&
                 (pAnchor->GetAnchorId() == FLY_AT_PARA) &&
                 nSttNode == pAPos->nNode.GetIndex() )
             {
-                std::vector<SwFrmFmt*>::iterator it;
-                if( !pFrmFmts ||
-                    pFrmFmts->end() == ( it = std::find( pFrmFmts->begin(), pFrmFmts->end(), pFmt ) ) )
+                std::vector<SwFrameFormat*>::iterator it;
+                if( !pFrameFormats ||
+                    pFrameFormats->end() == ( it = std::find( pFrameFormats->begin(), pFrameFormats->end(), pFormat ) ) )
                 {
-                    ::boost::shared_ptr<SwUndoInsLayFmt> const pFlyUndo(
-                        new SwUndoInsLayFmt(pFmt, 0, 0));
+                    ::boost::shared_ptr<SwUndoInsLayFormat> const pFlyUndo(
+                        new SwUndoInsLayFormat(pFormat, 0, 0));
                     m_FlyUndos.push_back(pFlyUndo);
                 }
                 else
-                    pFrmFmts->erase( it );
+                    pFrameFormats->erase( it );
             }
         }
-        delete pFrmFmts, pFrmFmts = 0;
+        delete pFrameFormats, pFrameFormats = 0;
     }
 }
 
@@ -140,7 +140,7 @@ SwUndoInserts::~SwUndoInserts()
             rUNds.GetEndOfExtras().GetIndex() - m_pUndoNodeIndex->GetIndex());
         m_pUndoNodeIndex.reset();
     }
-    delete pFrmFmts;
+    delete pFrameFormats;
     delete pRedlData;
 }
 
@@ -154,26 +154,26 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext)
 
     // if Point and Mark are different text nodes so a JoinNext has to be done
     bool bJoinNext = nSttNode != nEndNode &&
-                pPam->GetMark()->nNode.GetNode().GetTxtNode() &&
-                pPam->GetPoint()->nNode.GetNode().GetTxtNode();
+                pPam->GetMark()->nNode.GetNode().GetTextNode() &&
+                pPam->GetPoint()->nNode.GetNode().GetTextNode();
 
     // Is there any content? (loading from template does not have content)
-    if( nSttNode != nEndNode || nSttCntnt != nEndCntnt )
+    if( nSttNode != nEndNode || nSttContent != nEndContent )
     {
         if( nSttNode != nEndNode )
         {
-            SwTxtNode* pTxtNd = pDoc->GetNodes()[ nEndNode ]->GetTxtNode();
-            if (pTxtNd && pTxtNd->GetTxt().getLength() == nEndCntnt)
-                pLastNdColl = pTxtNd->GetTxtColl();
+            SwTextNode* pTextNd = pDoc->GetNodes()[ nEndNode ]->GetTextNode();
+            if (pTextNd && pTextNd->GetText().getLength() == nEndContent)
+                pLastNdColl = pTextNd->GetTextColl();
         }
 
         RemoveIdxFromRange( *pPam, false );
         SetPaM(*pPam);
 
-        // are there Footnotes or CntntFlyFrames in text?
+        // are there Footnotes or ContentFlyFrames in text?
         nSetPos = pHistory->Count();
         nNdDiff = pPam->GetMark()->nNode.GetIndex();
-        DelCntntIndex( *pPam->GetMark(), *pPam->GetPoint() );
+        DelContentIndex( *pPam->GetMark(), *pPam->GetPoint() );
         nNdDiff -= pPam->GetMark()->nNode.GetIndex();
 
         if( *pPam->GetPoint() != *pPam->GetMark() )
@@ -182,8 +182,8 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext)
                     new SwNodeIndex(pDoc->GetNodes().GetEndOfContent()));
             MoveToUndoNds(*pPam, m_pUndoNodeIndex.get());
 
-            if( !bSttWasTxtNd )
-                pPam->Move( fnMoveBackward, fnGoCntnt );
+            if( !bSttWasTextNd )
+                pPam->Move( fnMoveBackward, fnGoContent );
         }
     }
 
@@ -198,14 +198,14 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext)
     }
 
     SwNodeIndex& rIdx = pPam->GetPoint()->nNode;
-    SwTxtNode* pTxtNode = rIdx.GetNode().GetTxtNode();
-    if( pTxtNode )
+    SwTextNode* pTextNode = rIdx.GetNode().GetTextNode();
+    if( pTextNode )
     {
-        if( !pTxtFmtColl ) // if 0 than it's no TextNode -> delete
+        if( !pTextFormatColl ) // if 0 than it's no TextNode -> delete
         {
             SwNodeIndex aDelIdx( rIdx );
             ++rIdx;
-            SwCntntNode* pCNd = rIdx.GetNode().GetCntntNode();
+            SwContentNode* pCNd = rIdx.GetNode().GetContentNode();
             pPam->GetPoint()->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
             pPam->SetMark();
             pPam->DeleteMark();
@@ -216,21 +216,21 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext)
         }
         else
         {
-            if( bJoinNext && pTxtNode->CanJoinNext())
+            if( bJoinNext && pTextNode->CanJoinNext())
             {
                 {
                     RemoveIdxRel( rIdx.GetIndex()+1, SwPosition( rIdx,
-                        SwIndex( pTxtNode, pTxtNode->GetTxt().getLength() )));
+                        SwIndex( pTextNode, pTextNode->GetText().getLength() )));
                 }
-                pTxtNode->JoinNext();
+                pTextNode->JoinNext();
             }
             // reset all text attributes in the paragraph!
-            pTxtNode->RstTxtAttr( SwIndex(pTxtNode, 0), pTxtNode->Len(), 0, 0, true );
+            pTextNode->RstTextAttr( SwIndex(pTextNode, 0), pTextNode->Len(), 0, 0, true );
 
-            pTxtNode->ResetAllAttr();
+            pTextNode->ResetAllAttr();
 
-            if( pDoc->GetTxtFmtColls()->Contains( pTxtFmtColl ))
-                pTxtFmtColl = static_cast<SwTxtFmtColl*>(pTxtNode->ChgFmtColl( pTxtFmtColl )) ;
+            if( pDoc->GetTextFormatColls()->Contains( pTextFormatColl ))
+                pTextFormatColl = static_cast<SwTextFormatColl*>(pTextNode->ChgFormatColl( pTextFormatColl )) ;
 
             pHistory->SetTmpEnd( nSetPos );
             pHistory->TmpRollback( pDoc, 0, false );
@@ -245,17 +245,17 @@ void SwUndoInserts::RedoImpl(::sw::UndoRedoContext & rContext)
     SwDoc* pDoc = pPam->GetDoc();
     pPam->DeleteMark();
     pPam->GetPoint()->nNode = nSttNode - nNdDiff;
-    SwCntntNode* pCNd = pPam->GetCntntNode();
-    pPam->GetPoint()->nContent.Assign( pCNd, nSttCntnt );
+    SwContentNode* pCNd = pPam->GetContentNode();
+    pPam->GetPoint()->nContent.Assign( pCNd, nSttContent );
 
-    SwTxtFmtColl* pSavTxtFmtColl = pTxtFmtColl;
-    if( pTxtFmtColl && pCNd && pCNd->IsTxtNode() )
-        pSavTxtFmtColl = static_cast<SwTxtNode*>(pCNd)->GetTxtColl();
+    SwTextFormatColl* pSavTextFormatColl = pTextFormatColl;
+    if( pTextFormatColl && pCNd && pCNd->IsTextNode() )
+        pSavTextFormatColl = static_cast<SwTextNode*>(pCNd)->GetTextColl();
 
     pHistory->SetTmpEnd( nSetPos );
 
     // retrieve start position for rollback
-    if( ( nSttNode != nEndNode || nSttCntnt != nEndCntnt ) && m_pUndoNodeIndex)
+    if( ( nSttNode != nEndNode || nSttContent != nEndContent ) && m_pUndoNodeIndex)
     {
         const bool bMvBkwrd = MovePtBackward( *pPam );
 
@@ -263,25 +263,25 @@ void SwUndoInserts::RedoImpl(::sw::UndoRedoContext & rContext)
         sal_uLong const nMvNd = m_pUndoNodeIndex->GetIndex();
         m_pUndoNodeIndex.reset();
         MoveFromUndoNds(*pDoc, nMvNd, *pPam->GetMark());
-        if( bSttWasTxtNd )
+        if( bSttWasTextNd )
             MovePtForward( *pPam, bMvBkwrd );
         pPam->Exchange();
     }
 
-    if( pDoc->GetTxtFmtColls()->Contains( pTxtFmtColl ))
+    if( pDoc->GetTextFormatColls()->Contains( pTextFormatColl ))
     {
-        SwTxtNode* pTxtNd = pPam->GetMark()->nNode.GetNode().GetTxtNode();
-        if( pTxtNd )
-            pTxtNd->ChgFmtColl( pTxtFmtColl );
+        SwTextNode* pTextNd = pPam->GetMark()->nNode.GetNode().GetTextNode();
+        if( pTextNd )
+            pTextNd->ChgFormatColl( pTextFormatColl );
     }
-    pTxtFmtColl = pSavTxtFmtColl;
+    pTextFormatColl = pSavTextFormatColl;
 
-    if( pLastNdColl && pDoc->GetTxtFmtColls()->Contains( pLastNdColl ) &&
+    if( pLastNdColl && pDoc->GetTextFormatColls()->Contains( pLastNdColl ) &&
         pPam->GetPoint()->nNode != pPam->GetMark()->nNode )
     {
-        SwTxtNode* pTxtNd = pPam->GetPoint()->nNode.GetNode().GetTxtNode();
-        if( pTxtNd )
-            pTxtNd->ChgFmtColl( pLastNdColl );
+        SwTextNode* pTextNd = pPam->GetPoint()->nNode.GetNode().GetTextNode();
+        if( pTextNd )
+            pTextNd->ChgFormatColl( pLastNdColl );
     }
 
     for (size_t n = m_FlyUndos.size(); 0 < n; --n)
@@ -299,7 +299,7 @@ void SwUndoInserts::RedoImpl(::sw::UndoRedoContext & rContext)
         pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
     }
     else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) &&
-            !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+            !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
         pDoc->getIDocumentRedlineAccess().SplitRedline( *pPam );
 }
 
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index e3c479f0032d..9955b4417c59 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -89,28 +89,28 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName,
             SwStyleNameMapper::FillUIName(uStyle, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
             SwDocStyleSheet* pStyle =
                 static_cast<SwDocStyleSheet*>(m_pDoc->GetDocShell()->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_CHAR));
-            SwFmtDrop* pDrop = 0;
-            SwFmtCharFmt *pCharFmt = 0;
+            SwFormatDrop* pDrop = 0;
+            SwFormatCharFormat *pCharFormat = 0;
             if(pStyle)
             {
                 rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet( *pStyle ) );
                 if (RES_PARATR_DROP == pMap->nWID)
                 {
-                    pDrop = static_cast<SwFmtDrop*>(rItem.Clone());   // because rItem is const...
-                    pDrop->SetCharFmt(xStyle->GetCharFmt());
+                    pDrop = static_cast<SwFormatDrop*>(rItem.Clone());   // because rItem is const...
+                    pDrop->SetCharFormat(xStyle->GetCharFormat());
                     m_pDoc->SetDefault(*pDrop);
                 }
                 else // RES_TXTATR_CHARFMT == pMap->nWID
                 {
-                    pCharFmt = static_cast<SwFmtCharFmt*>(rItem.Clone());   // because rItem is const...
-                    pCharFmt->SetCharFmt(xStyle->GetCharFmt());
-                    m_pDoc->SetDefault(*pCharFmt);
+                    pCharFormat = static_cast<SwFormatCharFormat*>(rItem.Clone());   // because rItem is const...
+                    pCharFormat->SetCharFormat(xStyle->GetCharFormat());
+                    m_pDoc->SetDefault(*pCharFormat);
                 }
             }
             else
                 throw lang::IllegalArgumentException();
             delete pDrop;
-            delete pCharFmt;
+            delete pCharFormat;
         }
         else
             throw lang::IllegalArgumentException();
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index ba53b5ecd7cb..82e1d3c3cec7 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -118,16 +118,16 @@ void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock )
     if (!pDoc)
         return;
 
-    const SwFrmFmts& rTblFmts = *pDoc->GetTblFrmFmts();
-    for( size_t n = 0; n < rTblFmts.size(); ++n )
+    const SwFrameFormats& rTableFormats = *pDoc->GetTableFrameFormats();
+    for( size_t n = 0; n < rTableFormats.size(); ++n )
     {
-        SwTable* pTmpTbl;
-        const SwTableNode* pTblNd;
-        const SwFrmFmt* pFmt = rTblFmts[ n ];
+        SwTable* pTmpTable;
+        const SwTableNode* pTableNd;
+        const SwFrameFormat* pFormat = rTableFormats[ n ];
 
-        if( 0 != ( pTmpTbl = SwTable::FindTable( pFmt ) ) &&
-            0 != ( pTblNd = pTmpTbl->GetTableNode() ) &&
-            pTblNd->GetNodes().IsDocNodes() )
+        if( 0 != ( pTmpTable = SwTable::FindTable( pFormat ) ) &&
+            0 != ( pTableNd = pTmpTable->GetTableNode() ) &&
+            pTableNd->GetNodes().IsDocNodes() )
         {
             uno::Reference< frame::XModel > xRes;
             SwOLENode *pONd;
@@ -137,7 +137,7 @@ void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock )
             {
                 ++aIdx;
                 if (0 != ( pONd = aIdx.GetNode().GetOLENode() ) &&
-                    !pONd->GetChartTblName().isEmpty() /* is chart object? */)
+                    !pONd->GetChartTableName().isEmpty() /* is chart object? */)
                 {
                     uno::Reference < embed::XEmbeddedObject > xIP = pONd->GetOLEObj().GetOleRef();
                     if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
@@ -215,38 +215,38 @@ bool FillRangeDescriptor(
     return true;
 }
 
-static OUString GetCellRangeName( SwFrmFmt &rTblFmt, SwUnoCrsr &rTblCrsr )
+static OUString GetCellRangeName( SwFrameFormat &rTableFormat, SwUnoCrsr &rTableCrsr )
 {
     OUString aRes;
 
     //!! see also SwXTextTableCursor::getRangeName
 
-    SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<SwUnoTableCrsr*>(&rTblCrsr);
-    if (!pUnoTblCrsr)
+    SwUnoTableCrsr* pUnoTableCrsr = dynamic_cast<SwUnoTableCrsr*>(&rTableCrsr);
+    if (!pUnoTableCrsr)
         return OUString();
-    pUnoTblCrsr->MakeBoxSels();
+    pUnoTableCrsr->MakeBoxSels();
 
     const SwStartNode*  pStart;
     const SwTableBox*   pStartBox   = 0;
     const SwTableBox*   pEndBox     = 0;
 
-    pStart = pUnoTblCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
+    pStart = pUnoTableCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
     if (pStart)
     {
-        const SwTable* pTable = SwTable::FindTable( &rTblFmt );
-        pEndBox = pTable->GetTblBox( pStart->GetIndex());
+        const SwTable* pTable = SwTable::FindTable( &rTableFormat );
+        pEndBox = pTable->GetTableBox( pStart->GetIndex());
         aRes = pEndBox->GetName();
 
-        if(pUnoTblCrsr->HasMark())
+        if(pUnoTableCrsr->HasMark())
         {
-            pStart = pUnoTblCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode();
-            pStartBox = pTable->GetTblBox( pStart->GetIndex());
+            pStart = pUnoTableCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode();
+            pStartBox = pTable->GetTableBox( pStart->GetIndex());
         }
         OSL_ENSURE( pStartBox, "start box not found" );
         OSL_ENSURE( pEndBox, "end box not found" );
 
         // need to switch start and end?
-        if (*pUnoTblCrsr->GetPoint() < *pUnoTblCrsr->GetMark())
+        if (*pUnoTableCrsr->GetPoint() < *pUnoTableCrsr->GetMark())
         {
             const SwTableBox* pTmpBox = pStartBox;
             pStartBox = pEndBox;
@@ -293,21 +293,21 @@ static OUString GetRangeRepFromTableAndCells( const OUString &rTableName,
 
 static bool GetTableAndCellsFromRangeRep(
         const OUString &rRangeRepresentation,
-        OUString &rTblName,
+        OUString &rTableName,
         OUString &rStartCell,
         OUString &rEndCell,
         bool bSortStartEndCells = true )
 {
     // parse range representation for table name and cell/range names
     // accepted format sth like: "Table1.A2:C5" , "Table2.A2.1:B3.2"
-    OUString aTblName;    // table name
+    OUString aTableName;    // table name
     OUString aRange;    // cell range
     OUString aStartCell;  // name of top left cell
     OUString aEndCell;    // name of bottom right cell
     sal_Int32 nIdx = rRangeRepresentation.indexOf( '.' );
     if (nIdx >= 0)
     {
-        aTblName = rRangeRepresentation.copy( 0, nIdx );
+        aTableName = rRangeRepresentation.copy( 0, nIdx );
         aRange = rRangeRepresentation.copy( nIdx + 1 );
         sal_Int32 nPos = aRange.indexOf( ':' );
         if (nPos >= 0) // a cell-range like "Table1.A2:D4"
@@ -330,11 +330,11 @@ static bool GetTableAndCellsFromRangeRep(
         }
     }
 
-    bool bSuccess = !aTblName.isEmpty() &&
+    bool bSuccess = !aTableName.isEmpty() &&
                         !aStartCell.isEmpty() && !aEndCell.isEmpty();
     if (bSuccess)
     {
-        rTblName    = aTblName;
+        rTableName    = aTableName;
         rStartCell  = aStartCell;
         rEndCell    = aEndCell;
     }
@@ -342,84 +342,84 @@ static bool GetTableAndCellsFromRangeRep(
 }
 
 static void GetTableByName( const SwDoc &rDoc, const OUString &rTableName,
-        SwFrmFmt **ppTblFmt, SwTable **ppTable)
+        SwFrameFormat **ppTableFormat, SwTable **ppTable)
 {
-    SwFrmFmt *pTblFmt = NULL;
+    SwFrameFormat *pTableFormat = NULL;
 
     // find frame format of table
     //! see SwXTextTables::getByName
-    const size_t nCount = rDoc.GetTblFrmFmtCount(true);
-    for (size_t i = 0; i < nCount && !pTblFmt; ++i)
+    const size_t nCount = rDoc.GetTableFrameFormatCount(true);
+    for (size_t i = 0; i < nCount && !pTableFormat; ++i)
     {
-        SwFrmFmt& rTblFmt = rDoc.GetTblFrmFmt(i, true);
-        if(rTableName == rTblFmt.GetName())
-            pTblFmt = &rTblFmt;
+        SwFrameFormat& rTableFormat = rDoc.GetTableFrameFormat(i, true);
+        if(rTableName == rTableFormat.GetName())
+            pTableFormat = &rTableFormat;
     }
 
-    if (ppTblFmt)
-        *ppTblFmt = pTblFmt;
+    if (ppTableFormat)
+        *ppTableFormat = pTableFormat;
 
     if (ppTable)
-        *ppTable = pTblFmt ? SwTable::FindTable( pTblFmt ) : 0;
+        *ppTable = pTableFormat ? SwTable::FindTable( pTableFormat ) : 0;
 }
 
 static void GetFormatAndCreateCursorFromRangeRep(
         const SwDoc    *pDoc,
         const OUString &rRangeRepresentation,   // must be a single range (i.e. so called sub-range)
-        SwFrmFmt    **ppTblFmt,     // will be set to the table format of the table used in the range representation
+        SwFrameFormat    **ppTableFormat,     // will be set to the table format of the table used in the range representation
         SwUnoCrsr   **ppUnoCrsr )   // will be set to cursor spanning the cell range (cursor will be created!)
 {
-    OUString aTblName;    // table name
+    OUString aTableName;    // table name
     OUString aStartCell;  // name of top left cell
     OUString aEndCell;    // name of bottom right cell
     bool bNamesFound = GetTableAndCellsFromRangeRep( rRangeRepresentation,
-                                  aTblName, aStartCell, aEndCell );
+                                  aTableName, aStartCell, aEndCell );
 
     if (!bNamesFound)
     {
-        if (ppTblFmt)
-            *ppTblFmt   = NULL;
+        if (ppTableFormat)
+            *ppTableFormat   = NULL;
         if (ppUnoCrsr)
             *ppUnoCrsr  = NULL;
     }
     else
     {
-        SwFrmFmt *pTblFmt = NULL;
+        SwFrameFormat *pTableFormat = NULL;
 
         // is the correct table format already provided?
-        if (*ppTblFmt != NULL  &&  (*ppTblFmt)->GetName() == aTblName)
-            pTblFmt = *ppTblFmt;
+        if (*ppTableFormat != NULL  &&  (*ppTableFormat)->GetName() == aTableName)
+            pTableFormat = *ppTableFormat;
         else
-            GetTableByName( *pDoc, aTblName, &pTblFmt, NULL );
+            GetTableByName( *pDoc, aTableName, &pTableFormat, NULL );
 
-        *ppTblFmt = pTblFmt;
+        *ppTableFormat = pTableFormat;
 
         if (ppUnoCrsr != NULL)
         {
             *ppUnoCrsr = NULL;  // default result in case of failure
 
-            SwTable *pTable = pTblFmt ? SwTable::FindTable( pTblFmt ) : 0;
+            SwTable *pTable = pTableFormat ? SwTable::FindTable( pTableFormat ) : 0;
             // create new SwUnoCrsr spanning the specified range
             //! see also SwXTextTable::GetRangeByName
             // #i80314#
-            // perform validation check. Thus, pass <true> as 2nd parameter to <SwTable::GetTblBox(..)>
+            // perform validation check. Thus, pass <true> as 2nd parameter to <SwTable::GetTableBox(..)>
             const SwTableBox* pTLBox =
-                            pTable ? pTable->GetTblBox( aStartCell, true ) : 0;
+                            pTable ? pTable->GetTableBox( aStartCell, true ) : 0;
             if(pTLBox)
             {
                 // The Actions need to be removed here
-                UnoActionRemoveContext aRemoveContext(pTblFmt->GetDoc());
+                UnoActionRemoveContext aRemoveContext(pTableFormat->GetDoc());
                 const SwStartNode* pSttNd = pTLBox->GetSttNd();
                 SwPosition aPos(*pSttNd);
 
                 // set cursor to top left box of range
-                SwUnoCrsr* pUnoCrsr = pTblFmt->GetDoc()->CreateUnoCrsr(aPos, true);
+                SwUnoCrsr* pUnoCrsr = pTableFormat->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
                 pUnoCrsr->SetRemainInSection( false );
 
                 // #i80314#
-                // perform validation check. Thus, pass <true> as 2nd parameter to <SwTable::GetTblBox(..)>
-                const SwTableBox* pBRBox = pTable->GetTblBox( aEndCell, true );
+                // perform validation check. Thus, pass <true> as 2nd parameter to <SwTable::GetTableBox(..)>
+                const SwTableBox* pBRBox = pTable->GetTableBox( aEndCell, true );
                 if(pBRBox)
                 {
                     pUnoCrsr->SetMark();
@@ -494,7 +494,7 @@ static void SortSubranges( uno::Sequence< OUString > &rSubRanges, bool bCmpByCol
     sal_Int32 nLen = rSubRanges.getLength();
     OUString *pSubRanges = rSubRanges.getArray();
 
-    OUString aSmallestTblName;
+    OUString aSmallestTableName;
     OUString aSmallestStartCell;
     OUString aSmallestEndCell;
 
@@ -502,18 +502,18 @@ static void SortSubranges( uno::Sequence< OUString > &rSubRanges, bool bCmpByCol
     {
         sal_Int32 nIdxOfSmallest = i;
         GetTableAndCellsFromRangeRep( pSubRanges[nIdxOfSmallest],
-                aSmallestTblName, aSmallestStartCell, aSmallestEndCell );
+                aSmallestTableName, aSmallestStartCell, aSmallestEndCell );
         if (aSmallestEndCell.isEmpty())
             aSmallestEndCell = aSmallestStartCell;
 
         for (sal_Int32 k = i+1;  k < nLen;  ++k)
         {
             // get cell names for sub range
-            OUString aTblName;
+            OUString aTableName;
             OUString aStartCell;
             OUString aEndCell;
             GetTableAndCellsFromRangeRep( pSubRanges[k],
-                    aTblName, aStartCell, aEndCell );
+                    aTableName, aStartCell, aEndCell );
             if (aEndCell.isEmpty())
                 aEndCell = aStartCell;
 
@@ -522,7 +522,7 @@ static void SortSubranges( uno::Sequence< OUString > &rSubRanges, bool bCmpByCol
                                 aSmallestStartCell, aSmallestEndCell, bCmpByColumn ))
             {
                 nIdxOfSmallest = k;
-                aSmallestTblName    = aTblName;
+                aSmallestTableName    = aTableName;
                 aSmallestStartCell  = aStartCell;
                 aSmallestEndCell    = aEndCell;
             }
@@ -631,7 +631,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
             const SwOLEObj& rOObj = pOleNode->GetOLEObj();
             if( aChartOleObjectName.equals( rOObj.GetCurrentPersistName() ) )
             {
-                aChartTableName = pOleNode->GetChartTblName();
+                aChartTableName = pOleNode->GetChartTableName();
                 break;
             }
         }
@@ -680,19 +680,19 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
 #endif
 
     // get table format for that single table from above
-    SwFrmFmt    *pTblFmt  = 0;      // pointer to table format
+    SwFrameFormat    *pTableFormat  = 0;      // pointer to table format
     SwUnoCrsr   *pUnoCrsr = 0;      // here required to check if the cells in the range do actually exist
     if (aSubRanges.getLength() > 0)
-        GetFormatAndCreateCursorFromRangeRep( pDoc, pSubRanges[0], &pTblFmt, &pUnoCrsr );
+        GetFormatAndCreateCursorFromRangeRep( pDoc, pSubRanges[0], &pTableFormat, &pUnoCrsr );
 
     boost::scoped_ptr< SwUnoCrsr > pAuto( pUnoCrsr );  // to end lifetime of object pointed to by pUnoCrsr
-    if (!pTblFmt || !pUnoCrsr)
+    if (!pTableFormat || !pUnoCrsr)
         throw lang::IllegalArgumentException();
 
-    if(pTblFmt)
+    if(pTableFormat)
     {
-        SwTable* pTable = SwTable::FindTable( pTblFmt );
-        if(pTable->IsTblComplex())
+        SwTable* pTable = SwTable::FindTable( pTableFormat );
+        if(pTable->IsTableComplex())
             return xRes;    // we can't handle this thus returning an empty references
         else
         {
@@ -711,9 +711,9 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
             sal_Int32 nSubRanges = aSubRanges.getLength();
             for (sal_Int32 i = 0;  i < nSubRanges;  ++i)
             {
-                OUString aTblName, aStartCell, aEndCell;
+                OUString aTableName, aStartCell, aEndCell;
                 bool bOk2 = GetTableAndCellsFromRangeRep(
-                                    pSubRanges[i], aTblName, aStartCell, aEndCell );
+                                    pSubRanges[i], aTableName, aStartCell, aEndCell );
                 (void) bOk2;
                 OSL_ENSURE( bOk2, "failed to get table and start/end cells" );
 
@@ -877,7 +877,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
                     aDataDesc.nBottom   = oi;
                     aDataDesc.nRight    = aDataDesc.nLeft + aDataLen[oi] - 1;
                 }
-                const OUString aBaseName =  pTblFmt->GetName() + ".";
+                const OUString aBaseName =  pTableFormat->GetName() + ".";
 
                 OUString aLabelRange;
                 if (aLabelIdx[oi] != -1)
@@ -898,15 +898,15 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
                 // get cursors spanning the cell ranges for label and data
                 SwUnoCrsr   *pLabelUnoCrsr  = 0;
                 SwUnoCrsr   *pDataUnoCrsr   = 0;
-                GetFormatAndCreateCursorFromRangeRep( pDoc, aLabelRange, &pTblFmt, &pLabelUnoCrsr);
-                GetFormatAndCreateCursorFromRangeRep( pDoc, aDataRange,  &pTblFmt, &pDataUnoCrsr);
+                GetFormatAndCreateCursorFromRangeRep( pDoc, aLabelRange, &pTableFormat, &pLabelUnoCrsr);
+                GetFormatAndCreateCursorFromRangeRep( pDoc, aDataRange,  &pTableFormat, &pDataUnoCrsr);
 
                 // create XDataSequence's from cursors
                 if (pLabelUnoCrsr)
-                    pLabelSeqs[ nSeqsIdx ] = new SwChartDataSequence( *this, *pTblFmt, pLabelUnoCrsr );
+                    pLabelSeqs[ nSeqsIdx ] = new SwChartDataSequence( *this, *pTableFormat, pLabelUnoCrsr );
                 OSL_ENSURE( pDataUnoCrsr, "pointer to data sequence missing" );
                 if (pDataUnoCrsr)
-                    pDataSeqs [ nSeqsIdx ] = new SwChartDataSequence( *this, *pTblFmt, pDataUnoCrsr );
+                    pDataSeqs [ nSeqsIdx ] = new SwChartDataSequence( *this, *pTableFormat, pDataUnoCrsr );
                 if (pLabelUnoCrsr || pDataUnoCrsr)
                     ++nSeqsIdx;
             }
@@ -1008,9 +1008,9 @@ OUString SwChartDataProvider::GetBrokenCellRangeForExport(
     if (-1 == rCellRangeRepresentation.indexOf( ';' ))
     {
         // get current cell and table names
-        OUString aTblName, aStartCell, aEndCell;
+        OUString aTableName, aStartCell, aEndCell;
         GetTableAndCellsFromRangeRep( rCellRangeRepresentation,
-            aTblName, aStartCell, aEndCell, false );
+            aTableName, aStartCell, aEndCell, false );
         sal_Int32 nStartCol = -1, nStartRow = -1, nEndCol = -1, nEndRow = -1;
         sw_GetCellPosition( aStartCell, nStartCol, nStartRow );
         sw_GetCellPosition( aEndCell, nEndCol, nEndRow );
@@ -1021,7 +1021,7 @@ OUString SwChartDataProvider::GetBrokenCellRangeForExport(
         aStartCell = sw_GetCellName( nStartCol, nStartRow );
         aEndCell   = sw_GetCellName( nEndCol, nEndRow );
 
-        return GetRangeRepFromTableAndCells( aTblName,
+        return GetRangeRepFromTableAndCells( aTableName,
                 aStartCell, aEndCell, false );
     }
 
@@ -1050,7 +1050,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
         return aResult;
     }
 
-    SwFrmFmt *pTableFmt = 0;
+    SwFrameFormat *pTableFormat = 0;
     SwTable  *pTable    = 0;
     OUString  aTableName;
     sal_Int32 nTableRows = 0;
@@ -1097,27 +1097,27 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
 
         // get table and cell names for label and values data sequences
         // (start and end cell will be sorted, i.e. start cell <= end cell)
-        OUString aLabelTblName, aLabelStartCell, aLabelEndCell;
-        OUString aValuesTblName, aValuesStartCell, aValuesEndCell;
+        OUString aLabelTableName, aLabelStartCell, aLabelEndCell;
+        OUString aValuesTableName, aValuesStartCell, aValuesEndCell;
         OUString aLabelRange, aValuesRange;
         if (xCurLabel.is())
             aLabelRange = xCurLabel->getSourceRangeRepresentation();
         if (xCurValues.is())
             aValuesRange = xCurValues->getSourceRangeRepresentation();
         if ((!aLabelRange.isEmpty() && !GetTableAndCellsFromRangeRep( aLabelRange,
-                aLabelTblName, aLabelStartCell, aLabelEndCell ))  ||
+                aLabelTableName, aLabelStartCell, aLabelEndCell ))  ||
             !GetTableAndCellsFromRangeRep( aValuesRange,
-                aValuesTblName, aValuesStartCell, aValuesEndCell ))
+                aValuesTableName, aValuesStartCell, aValuesEndCell ))
         {
             return aResult; // failed -> return empty property sequence
         }
 
         // make sure all sequences use the same table
         if (aTableName.isEmpty())
-            aTableName = aValuesTblName;  // get initial value to compare with
+            aTableName = aValuesTableName;  // get initial value to compare with
         if (aTableName.isEmpty() ||
-             aTableName != aValuesTblName ||
-            (!aLabelTblName.isEmpty() && aTableName != aLabelTblName))
+             aTableName != aValuesTableName ||
+            (!aLabelTableName.isEmpty() && aTableName != aLabelTableName))
         {
             return aResult; // failed -> return empty property sequence
         }
@@ -1170,8 +1170,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
 
             // build data used to determine 'CellRangeRepresentation' later on
 
-            GetTableByName( *pDoc, aTableName, &pTableFmt, &pTable );
-            if (!pTable || pTable->IsTblComplex())
+            GetTableByName( *pDoc, aTableName, &pTableFormat, &pTable );
+            if (!pTable || pTable->IsTableComplex())
                 return aResult; // failed -> return empty property sequence
             nTableRows = pTable->GetTabLines().size();
             nTableCols = pTable->GetTabLines().front()->GetTabBoxes().size();
@@ -1377,24 +1377,24 @@ uno::Reference< chart2::data::XDataSequence > SwChartDataProvider::Impl_createDa
     if (bDisposed)
         throw lang::DisposedException();
 
-    SwFrmFmt    *pTblFmt    = 0;    // pointer to table format
+    SwFrameFormat    *pTableFormat    = 0;    // pointer to table format
     SwUnoCrsr   *pUnoCrsr   = 0;    // pointer to new created cursor spanning the cell range
     GetFormatAndCreateCursorFromRangeRep( pDoc, rRangeRepresentation,
-                                          &pTblFmt, &pUnoCrsr );
-    if (!pTblFmt || !pUnoCrsr)
+                                          &pTableFormat, &pUnoCrsr );
+    if (!pTableFormat || !pUnoCrsr)
         throw lang::IllegalArgumentException();
 
     // check that cursors point and mark are in a single row or column.
-    OUString aCellRange( GetCellRangeName( *pTblFmt, *pUnoCrsr ) );
+    OUString aCellRange( GetCellRangeName( *pTableFormat, *pUnoCrsr ) );
     SwRangeDescriptor aDesc;
     FillRangeDescriptor( aDesc, aCellRange );
     if (aDesc.nTop != aDesc.nBottom  &&  aDesc.nLeft != aDesc.nRight)
         throw lang::IllegalArgumentException();
 
-    OSL_ENSURE( pTblFmt && pUnoCrsr, "table format or cursor missing" );
+    OSL_ENSURE( pTableFormat && pUnoCrsr, "table format or cursor missing" );
     uno::Reference< chart2::data::XDataSequence > xDataSeq;
     if (!bTestOnly)
-        xDataSeq = new SwChartDataSequence( *this, *pTblFmt, pUnoCrsr );
+        xDataSeq = new SwChartDataSequence( *this, *pTableFormat, pUnoCrsr );
 
     return xDataSeq;
 }
@@ -1530,7 +1530,7 @@ void SwChartDataProvider::InvalidateTable( const SwTable *pTable )
     if (pTable)
     {
         if (!bDisposed)
-           pTable->GetFrmFmt()->GetDoc()->getIDocumentChartDataProviderAccess().GetChartControllerHelper().StartOrContinueLocking();
+           pTable->GetFrameFormat()->GetDoc()->getIDocumentChartDataProviderAccess().GetChartControllerHelper().StartOrContinueLocking();
 
         const Set_DataSequenceRef_t &rSet = aDataSequences[ pTable ];
         Set_DataSequenceRef_t::const_iterator aIt( rSet.begin() );
@@ -1555,7 +1555,7 @@ bool SwChartDataProvider::DeleteBox( const SwTable *pTable, const SwTableBox &rB
     if (pTable)
     {
         if (!bDisposed)
-            pTable->GetFrmFmt()->GetDoc()->getIDocumentChartDataProviderAccess().GetChartControllerHelper().StartOrContinueLocking();
+            pTable->GetFrameFormat()->GetDoc()->getIDocumentChartDataProviderAccess().GetChartControllerHelper().StartOrContinueLocking();
 
         Set_DataSequenceRef_t &rSet = aDataSequences[ pTable ];
 
@@ -1611,7 +1611,7 @@ void SwChartDataProvider::DisposeAllDataSequences( const SwTable *pTable )
     if (pTable)
     {
         if (!bDisposed)
-            pTable->GetFrmFmt()->GetDoc()->getIDocumentChartDataProviderAccess().GetChartControllerHelper().StartOrContinueLocking();
+            pTable->GetFrameFormat()->GetDoc()->getIDocumentChartDataProviderAccess().GetChartControllerHelper().StartOrContinueLocking();
 
         //! make a copy of the STL container!
         //! This is necessary since calling 'dispose' will implicitly remove an element
@@ -1660,7 +1660,7 @@ void SwChartDataProvider::AddRowCols(
         const SwSelBoxes& rBoxes,
         sal_uInt16 nLines, bool bBehind )
 {
-    if (rTable.IsTblComplex())
+    if (rTable.IsTableComplex())
         return;
 
     const size_t nBoxes = rBoxes.size();
@@ -1758,12 +1758,12 @@ OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRange
     for (sal_Int32 i = 0;  i < nNumRanges;  ++i)
     {
         const OUString aRange( rRangeRepresentation.getToken(0, ';', nPos) );
-        SwFrmFmt    *pTblFmt  = 0; // pointer to table format
-        GetFormatAndCreateCursorFromRangeRep( pDoc, aRange, &pTblFmt, NULL );
-        if (!pTblFmt)
+        SwFrameFormat    *pTableFormat  = 0; // pointer to table format
+        GetFormatAndCreateCursorFromRangeRep( pDoc, aRange, &pTableFormat, NULL );
+        if (!pTableFormat)
             throw lang::IllegalArgumentException();
-        SwTable* pTable = SwTable::FindTable( pTblFmt );
-        if  (pTable->IsTblComplex())
+        SwTable* pTable = SwTable::FindTable( pTableFormat );
+        if  (pTable->IsTableComplex())
             throw uno::RuntimeException();
 
         // check that there is only one table used in all ranges
@@ -1772,10 +1772,10 @@ OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRange
         if (pTable != pFirstFoundTable)
             throw lang::IllegalArgumentException();
 
-        OUString aTblName;
+        OUString aTableName;
         OUString aStartCell;
         OUString aEndCell;
-        if (!GetTableAndCellsFromRangeRep( aRange, aTblName, aStartCell, aEndCell ))
+        if (!GetTableAndCellsFromRangeRep( aRange, aTableName, aStartCell, aEndCell ))
             throw lang::IllegalArgumentException();
 
         sal_Int32 nCol, nRow;
@@ -1786,7 +1786,7 @@ OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRange
         //!! following objects/functions are implemented in XMLRangeHelper.?xx
         //!! which is a copy of the respective file from chart2 !!
         XMLRangeHelper::CellRange aCellRange;
-        aCellRange.aTableName = aTblName;
+        aCellRange.aTableName = aTableName;
         aCellRange.aUpperLeft.nColumn   = nCol;
         aCellRange.aUpperLeft.nRow      = nRow;
         aCellRange.aUpperLeft.bIsEmpty  = false;
@@ -1897,16 +1897,16 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSource::getSupportedServiceNames(
 
 SwChartDataSequence::SwChartDataSequence(
         SwChartDataProvider &rProvider,
-        SwFrmFmt   &rTblFmt,
+        SwFrameFormat   &rTableFormat,
         SwUnoCrsr  *pTableCursor ) :
-    SwClient( &rTblFmt ),
+    SwClient( &rTableFormat ),
     aEvtListeners( GetChartMutex() ),
     aModifyListeners( GetChartMutex() ),
     aRowLabelText( SW_RES( STR_CHART2_ROW_LABEL_TEXT ) ),
     aColLabelText( SW_RES( STR_CHART2_COL_LABEL_TEXT ) ),
     xDataProvider( &rProvider ),
     pDataProvider( &rProvider ),
-    pTblCrsr( pTableCursor ),
+    pTableCrsr( pTableCursor ),
     aCursorDepend( this, pTableCursor ),
     _pPropSet( aSwMapProvider.GetPropertySet( PROPERTY_MAP_CHART2_DATA_SEQUENCE ) )
 {
@@ -1915,7 +1915,7 @@ SwChartDataSequence::SwChartDataSequence(
     acquire();
     try
     {
-        const SwTable* pTable = SwTable::FindTable( &rTblFmt );
+        const SwTable* pTable = SwTable::FindTable( &rTableFormat );
         if (pTable)
         {
             uno::Reference< chart2::data::XDataSequence > xRef( dynamic_cast< chart2::data::XDataSequence * >(this), uno::UNO_QUERY );
@@ -1938,15 +1938,15 @@ SwChartDataSequence::SwChartDataSequence(
 #if OSL_DEBUG_LEVEL > 0
     // check if it can properly convert into a SwUnoTableCrsr
     // which is required for some functions
-    SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pTblCrsr);
-    OSL_ENSURE(pUnoTblCrsr, "SwChartDataSequence: cursor not SwUnoTableCrsr");
-    (void) pUnoTblCrsr;
+    SwUnoTableCrsr* pUnoTableCrsr = dynamic_cast<SwUnoTableCrsr*>(pTableCrsr);
+    OSL_ENSURE(pUnoTableCrsr, "SwChartDataSequence: cursor not SwUnoTableCrsr");
+    (void) pUnoTableCrsr;
 #endif
 }
 
 SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) :
     SwChartDataSequenceBaseClass(),
-    SwClient( rObj.GetFrmFmt() ),
+    SwClient( rObj.GetFrameFormat() ),
     aEvtListeners( GetChartMutex() ),
     aModifyListeners( GetChartMutex() ),
     aRole( rObj.aRole ),
@@ -1954,8 +1954,8 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) :
     aColLabelText( SW_RES(STR_CHART2_COL_LABEL_TEXT) ),
     xDataProvider( rObj.pDataProvider ),
     pDataProvider( rObj.pDataProvider ),
-    pTblCrsr( rObj.pTblCrsr->Clone() ),
-    aCursorDepend( this, pTblCrsr ),
+    pTableCrsr( rObj.pTableCrsr->Clone() ),
+    aCursorDepend( this, pTableCrsr ),
     _pPropSet( rObj._pPropSet )
 {
     bDisposed = false;
@@ -1963,7 +1963,7 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) :
     acquire();
     try
     {
-        const SwTable* pTable = SwTable::FindTable( GetFrmFmt() );
+        const SwTable* pTable = SwTable::FindTable( GetFrameFormat() );
         if (pTable)
         {
             uno::Reference< chart2::data::XDataSequence > xRef( dynamic_cast< chart2::data::XDataSequence * >(this), uno::UNO_QUERY );
@@ -1986,9 +1986,9 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) :
 #if OSL_DEBUG_LEVEL > 0
     // check if it can properly convert into a SwUnoTableCrsr
     // which is required for some functions
-    SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pTblCrsr);
-    OSL_ENSURE(pUnoTblCrsr, "SwChartDataSequence: cursor not SwUnoTableCrsr");
-    (void) pUnoTblCrsr;
+    SwUnoTableCrsr* pUnoTableCrsr = dynamic_cast<SwUnoTableCrsr*>(pTableCrsr);
+    OSL_ENSURE(pUnoTableCrsr, "SwChartDataSequence: cursor not SwUnoTableCrsr");
+    (void) pUnoTableCrsr;
 #endif
 }
 
@@ -1997,7 +1997,7 @@ SwChartDataSequence::~SwChartDataSequence()
     // since the data-provider holds only weak references to the data-sequence
     // there should be no need here to release them explicitly...
 
-    delete pTblCrsr;
+    delete pTableCrsr;
 }
 
 namespace
@@ -2030,20 +2030,20 @@ uno::Sequence< uno::Any > SAL_CALL SwChartDataSequence::getData()
         throw lang::DisposedException();
 
     uno::Sequence< uno::Any > aRes;
-    SwFrmFmt* pTblFmt = GetFrmFmt();
-    if(pTblFmt)
+    SwFrameFormat* pTableFormat = GetFrameFormat();
+    if(pTableFormat)
     {
-        SwTable* pTable = SwTable::FindTable( pTblFmt );
-        if(!pTable->IsTblComplex())
+        SwTable* pTable = SwTable::FindTable( pTableFormat );
+        if(!pTable->IsTableComplex())
         {
             SwRangeDescriptor aDesc;
-            if (FillRangeDescriptor( aDesc, GetCellRangeName( *pTblFmt, *pTblCrsr ) ))
+            if (FillRangeDescriptor( aDesc, GetCellRangeName( *pTableFormat, *pTableCrsr ) ))
             {
-                //!! make copy of pTblCrsr (SwUnoCrsr )
+                //!! make copy of pTableCrsr (SwUnoCrsr )
                 // keep original cursor and make copy of it that gets handed
                 // over to the SwXCellRange object which takes ownership and
                 // thus will destroy the copy later.
-                SwXCellRange aRange( pTblCrsr->Clone(), *pTblFmt, aDesc );
+                SwXCellRange aRange( pTableCrsr->Clone(), *pTableFormat, aDesc );
                 aRange.GetDataSequence( &aRes, 0, 0 );
             }
         }
@@ -2059,12 +2059,12 @@ OUString SAL_CALL SwChartDataSequence::getSourceRangeRepresentation(  )
         throw lang::DisposedException();
 
     OUString aRes;
-    SwFrmFmt* pTblFmt = GetFrmFmt();
-    if (pTblFmt)
+    SwFrameFormat* pTableFormat = GetFrameFormat();
+    if (pTableFormat)
     {
-        const OUString aCellRange( GetCellRangeName( *pTblFmt, *pTblCrsr ) );
+        const OUString aCellRange( GetCellRangeName( *pTableFormat, *pTableCrsr ) );
         OSL_ENSURE( !aCellRange.isEmpty(), "failed to get cell range" );
-        aRes = pTblFmt->GetName() + "." + aCellRange;
+        aRes = pTableFormat->GetName() + "." + aCellRange;
     }
     return aRes;
 }
@@ -2082,13 +2082,13 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
     {
         SwRangeDescriptor aDesc;
         bool bOk = false;
-        SwFrmFmt* pTblFmt = GetFrmFmt();
-        SwTable* pTable = pTblFmt ? SwTable::FindTable( pTblFmt ) : 0;
-        if (!pTblFmt || !pTable || pTable->IsTblComplex())
+        SwFrameFormat* pTableFormat = GetFrameFormat();
+        SwTable* pTable = pTableFormat ? SwTable::FindTable( pTableFormat ) : 0;
+        if (!pTableFormat || !pTable || pTable->IsTableComplex())
             throw uno::RuntimeException();
         else
         {
-            const OUString aCellRange( GetCellRangeName( *pTblFmt, *pTblCrsr ) );
+            const OUString aCellRange( GetCellRangeName( *pTableFormat, *pTableCrsr ) );
             OSL_ENSURE( !aCellRange.isEmpty(), "failed to get cell range" );
             bOk = FillRangeDescriptor( aDesc, aCellRange );
             OSL_ENSURE( bOk, "falied to get SwRangeDescriptor" );
@@ -2101,8 +2101,8 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
             OSL_ENSURE( nColSpan == 1 || nRowSpan == 1,
                     "unexpected range of selected cells" );
 
-            OUString aTxt; // label text to be returned
-            bool bReturnEmptyTxt = false;
+            OUString aText; // label text to be returned
+            bool bReturnEmptyText = false;
             bool bUseCol = true;
             if (eLabelOrigin == chart2::data::LabelOrigin_COLUMN)
                 bUseCol = true;
@@ -2111,12 +2111,12 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
             else if (eLabelOrigin == chart2::data::LabelOrigin_SHORT_SIDE)
             {
                 bUseCol = nColSpan < nRowSpan;
-                bReturnEmptyTxt = nColSpan == nRowSpan;
+                bReturnEmptyText = nColSpan == nRowSpan;
             }
             else if (eLabelOrigin == chart2::data::LabelOrigin_LONG_SIDE)
             {
                 bUseCol = nColSpan > nRowSpan;
-                bReturnEmptyTxt = nColSpan == nRowSpan;
+                bReturnEmptyText = nColSpan == nRowSpan;
             }
             else {
                 OSL_FAIL( "unexpected case" );
@@ -2129,9 +2129,9 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
             OUString *pLabels = aLabels.getArray();
             for (sal_Int32 i = 0;  i < nSeqLen;  ++i)
             {
-                if (!bReturnEmptyTxt)
+                if (!bReturnEmptyText)
                 {
-                    aTxt = bUseCol ? aColLabelText : aRowLabelText;
+                    aText = bUseCol ? aColLabelText : aRowLabelText;
                     sal_Int32 nCol = aDesc.nLeft;
                     sal_Int32 nRow = aDesc.nTop;
                     if (bUseCol)
@@ -2162,11 +2162,11 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
                                 aRplc = "%ROWNUMBER";
                                 aNew = OUString(pBuf, (aCellName.getStr() + nLen) - pBuf);
                             }
-                            aTxt = aTxt.replaceFirst( aRplc, aNew );
+                            aText = aText.replaceFirst( aRplc, aNew );
                         }
                     }
                 }
-                pLabels[i] = aTxt;
+                pLabels[i] = aText;
             }
         }
     }
@@ -2190,20 +2190,20 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getTextualData()
         throw lang::DisposedException();
 
     uno::Sequence< OUString > aRes;
-    SwFrmFmt* pTblFmt = GetFrmFmt();
-    if(pTblFmt)
+    SwFrameFormat* pTableFormat = GetFrameFormat();
+    if(pTableFormat)
     {
-        SwTable* pTable = SwTable::FindTable( pTblFmt );
-        if(!pTable->IsTblComplex())
+        SwTable* pTable = SwTable::FindTable( pTableFormat );
+        if(!pTable->IsTableComplex())
         {
             SwRangeDescriptor aDesc;
-            if (FillRangeDescriptor( aDesc, GetCellRangeName( *pTblFmt, *pTblCrsr ) ))
+            if (FillRangeDescriptor( aDesc, GetCellRangeName( *pTableFormat, *pTableCrsr ) ))
             {
-                //!! make copy of pTblCrsr (SwUnoCrsr )
+                //!! make copy of pTableCrsr (SwUnoCrsr )
                 // keep original cursor and make copy of it that gets handed
                 // over to the SwXCellRange object which takes ownership and
                 // thus will destroy the copy later.
-                SwXCellRange aRange( pTblCrsr->Clone(), *pTblFmt, aDesc );
+                SwXCellRange aRange( pTableCrsr->Clone(), *pTableFormat, aDesc );
                 aRange.GetDataSequence( 0, &aRes, 0 );
             }
         }
@@ -2219,20 +2219,20 @@ uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData()
         throw lang::DisposedException();
 
     uno::Sequence< double > aRes;
-    SwFrmFmt* pTblFmt = GetFrmFmt();
-    if(pTblFmt)
+    SwFrameFormat* pTableFormat = GetFrameFormat();
+    if(pTableFormat)
     {
-        SwTable* pTable = SwTable::FindTable( pTblFmt );
-        if(!pTable->IsTblComplex())
+        SwTable* pTable = SwTable::FindTable( pTableFormat );
+        if(!pTable->IsTableComplex())
         {
             SwRangeDescriptor aDesc;
-            if (FillRangeDescriptor( aDesc, GetCellRangeName( *pTblFmt, *pTblCrsr ) ))
+            if (FillRangeDescriptor( aDesc, GetCellRangeName( *pTableFormat, *pTableCrsr ) ))
             {
-                //!! make copy of pTblCrsr (SwUnoCrsr )
+                //!! make copy of pTableCrsr (SwUnoCrsr )
                 // keep original cursor and make copy of it that gets handed
                 // over to the SwXCellRange object which takes ownership and
                 // thus will destroy the copy later.
-                SwXCellRange aRange( pTblCrsr->Clone(), *pTblFmt, aDesc );
+                SwXCellRange aRange( pTableCrsr->Clone(), *pTableFormat, aDesc );
 
                 // get numerical values and make an effort to return the
                 // numerical value for text formatted cells
@@ -2358,7 +2358,7 @@ void SwChartDataSequence::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pN
     // table was deleted or cursor was deleted
     if(!GetRegisteredIn() || !aCursorDepend.GetRegisteredIn())
     {
-        pTblCrsr = 0;
+        pTableCrsr = 0;
         dispose();
     }
     else
@@ -2434,7 +2434,7 @@ void SAL_CALL SwChartDataSequence::dispose(  )
         bDisposed = true;
         if (pDataProvider)
         {
-            const SwTable* pTable = SwTable::FindTable( GetFrmFmt() );
+            const SwTable* pTable = SwTable::FindTable( GetFrameFormat() );
             if (pTable)
             {
                 uno::Reference< chart2::data::XDataSequence > xRef( dynamic_cast< chart2::data::XDataSequence * >(this), uno::UNO_QUERY );
@@ -2464,7 +2464,7 @@ void SAL_CALL SwChartDataSequence::dispose(  )
             if (pLclRegisteredIn && pLclRegisteredIn->HasWriterListeners())
             {
                 pLclRegisteredIn->Remove(this);
-                pTblCrsr = NULL;
+                pTableCrsr = NULL;
             }
         }
 
@@ -2504,10 +2504,10 @@ bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
     // if the implementation cursor gets affected (i.e. thew box where it is located
     // in gets removed) we need to move it before that... (otherwise it does not need to change)
 
-    const SwStartNode* pPointStartNode = pTblCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
-    const SwStartNode* pMarkStartNode  = pTblCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode();
+    const SwStartNode* pPointStartNode = pTableCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
+    const SwStartNode* pMarkStartNode  = pTableCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode();
 
-    if (!pTblCrsr->HasMark() || (pPointStartNode == rBox.GetSttNd()  &&  pMarkStartNode == rBox.GetSttNd()))
+    if (!pTableCrsr->HasMark() || (pPointStartNode == rBox.GetSttNd()  &&  pMarkStartNode == rBox.GetSttNd()))
     {
         bNowEmpty = true;
     }
@@ -2515,9 +2515,9 @@ bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
     {
         sal_Int32 nPointRow = -1, nPointCol = -1;
         sal_Int32 nMarkRow  = -1, nMarkCol  = -1;
-        const SwTable* pTable = SwTable::FindTable( GetFrmFmt() );
-        OUString aPointCellName( pTable->GetTblBox( pPointStartNode->GetIndex() )->GetName() );
-        OUString aMarkCellName( pTable->GetTblBox( pMarkStartNode->GetIndex() )->GetName() );
+        const SwTable* pTable = SwTable::FindTable( GetFrameFormat() );
+        OUString aPointCellName( pTable->GetTableBox( pPointStartNode->GetIndex() )->GetName() );
+        OUString aMarkCellName( pTable->GetTableBox( pMarkStartNode->GetIndex() )->GetName() );
 
         sw_GetCellPosition( aPointCellName, nPointCol, nPointRow );
         sw_GetCellPosition( aMarkCellName,  nMarkCol,  nMarkRow );
@@ -2561,28 +2561,28 @@ bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
         if (bMoveHorizontal)
             nCol += bMoveLeft ? -1 : +1;
         const OUString aNewCellName = sw_GetCellName( nCol, nRow );
-        SwTableBox* pNewBox = const_cast<SwTableBox*>(pTable->GetTblBox( aNewCellName ));
+        SwTableBox* pNewBox = const_cast<SwTableBox*>(pTable->GetTableBox( aNewCellName ));
 
         if (pNewBox)    // set new position (cell range) to use
         {
             // This is how you get the first content node of a row:
             // First get a SwNodeIndex pointing to the node after SwStartNode of the box...
             SwNodeIndex aIdx( *pNewBox->GetSttNd(), +1 );
-            // This can be a SwCntntNode, but might also be a table or section node,
+            // This can be a SwContentNode, but might also be a table or section node,
             // therefore call GoNext
-            SwCntntNode *pCNd = aIdx.GetNode().GetCntntNode();
+            SwContentNode *pCNd = aIdx.GetNode().GetContentNode();
             if (!pCNd)
-                pCNd = GetFrmFmt()->GetDoc()->GetNodes().GoNext( &aIdx );
+                pCNd = GetFrameFormat()->GetDoc()->GetNodes().GoNext( &aIdx );
             // and then one can e.g. create a SwPosition:
             SwPosition aNewPos( *pCNd );   // new position to be used with cursor
 
             // if the mark is to be changed, make sure there is one
-            if (pMarkStartNode == rBox.GetSttNd() && !pTblCrsr->HasMark())
-                pTblCrsr->SetMark();
+            if (pMarkStartNode == rBox.GetSttNd() && !pTableCrsr->HasMark())
+                pTableCrsr->SetMark();
 
             // set cursor to new position
             SwPosition *pPos = (pPointStartNode == rBox.GetSttNd()) ?
-                        pTblCrsr->GetPoint() : pTblCrsr->GetMark();
+                        pTableCrsr->GetPoint() : pTableCrsr->GetMark();
             if (pPos)
             {
                 pPos->nNode     = aNewPos.nNode;
@@ -2602,13 +2602,13 @@ bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
 
 void SwChartDataSequence::FillRangeDesc( SwRangeDescriptor &rRangeDesc ) const
 {
-    SwFrmFmt* pTblFmt = GetFrmFmt();
-    if(pTblFmt)
+    SwFrameFormat* pTableFormat = GetFrameFormat();
+    if(pTableFormat)
     {
-        SwTable* pTable = SwTable::FindTable( pTblFmt );
-        if(!pTable->IsTblComplex())
+        SwTable* pTable = SwTable::FindTable( pTableFormat );
+        if(!pTable->IsTableComplex())
         {
-            FillRangeDescriptor( rRangeDesc, GetCellRangeName( *pTblFmt, *pTblCrsr ) );
+            FillRangeDescriptor( rRangeDesc, GetCellRangeName( *pTableFormat, *pTableCrsr ) );
         }
     }
 }
@@ -2630,27 +2630,27 @@ void SwChartDataSequence::FillRangeDesc( SwRangeDescriptor &rRangeDesc ) const
 bool SwChartDataSequence::ExtendTo( bool bExtendCol,
         sal_Int32 nFirstNew, sal_Int32 nCount )
 {
-    SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pTblCrsr);
-    if (!pUnoTblCrsr)
+    SwUnoTableCrsr* pUnoTableCrsr = dynamic_cast<SwUnoTableCrsr*>(pTableCrsr);
+    if (!pUnoTableCrsr)
         return false;
 
     const SwStartNode *pStartNd  = 0;
     const SwTableBox  *pStartBox = 0;
     const SwTableBox  *pEndBox   = 0;
 
-    const SwTable* pTable = SwTable::FindTable( GetFrmFmt() );
-    OSL_ENSURE( !pTable->IsTblComplex(), "table too complex" );
-    if (nCount < 1 || nFirstNew < 0 || pTable->IsTblComplex())
+    const SwTable* pTable = SwTable::FindTable( GetFrameFormat() );
+    OSL_ENSURE( !pTable->IsTableComplex(), "table too complex" );
+    if (nCount < 1 || nFirstNew < 0 || pTable->IsTableComplex())
         return false;
 
     // get range descriptor (cell range) for current data-sequence
 
-    pStartNd = pUnoTblCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
-    pEndBox = pTable->GetTblBox( pStartNd->GetIndex() );
+    pStartNd = pUnoTableCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
+    pEndBox = pTable->GetTableBox( pStartNd->GetIndex() );
     const OUString aEndBox( pEndBox->GetName() );
 
-    pStartNd = pUnoTblCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode();
-    pStartBox = pTable->GetTblBox( pStartNd->GetIndex() );
+    pStartNd = pUnoTableCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode();
+    pStartBox = pTable->GetTableBox( pStartNd->GetIndex() );
     const OUString aStartBox( pStartBox->GetName() );
 
     SwRangeDescriptor aDesc;
@@ -2700,13 +2700,13 @@ bool SwChartDataSequence::ExtendTo( bool bExtendCol,
     if (bChanged)
     {
         // move table cursor to new start and end of data-sequence
-        const SwTableBox *pNewStartBox = pTable->GetTblBox( aNewStartCell );
-        const SwTableBox *pNewEndBox   = pTable->GetTblBox( aNewEndCell );
-        pUnoTblCrsr->SetMark();
-        pUnoTblCrsr->GetPoint()->nNode = *pNewEndBox->GetSttNd();
-        pUnoTblCrsr->GetMark()->nNode  = *pNewStartBox->GetSttNd();
-        pUnoTblCrsr->Move( fnMoveForward, fnGoNode );
-        pUnoTblCrsr->MakeBoxSels();
+        const SwTableBox *pNewStartBox = pTable->GetTableBox( aNewStartCell );
+        const SwTableBox *pNewEndBox   = pTable->GetTableBox( aNewEndCell );
+        pUnoTableCrsr->SetMark();
+        pUnoTableCrsr->GetPoint()->nNode = *pNewEndBox->GetSttNd();
+        pUnoTableCrsr->GetMark()->nNode  = *pNewStartBox->GetSttNd();
+        pUnoTableCrsr->Move( fnMoveForward, fnGoNode );
+        pUnoTableCrsr->MakeBoxSels();
     }
 
     return bChanged;
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 4357191c7fa5..10fdea5d6356 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -781,11 +781,11 @@ SwXServiceProvider::MakeInstance(sal_uInt16 nObjectType, SwDoc & rDoc)
         break;
         case SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY:
         {
-            SwFieldType* pType = rDoc.getIDocumentFieldsAccess().GetFldType(RES_AUTHORITY, aEmptyOUStr, true);
+            SwFieldType* pType = rDoc.getIDocumentFieldsAccess().GetFieldType(RES_AUTHORITY, aEmptyOUStr, true);
             if(!pType)
             {
                 SwAuthorityFieldType aType(&rDoc);
-                pType = rDoc.getIDocumentFieldsAccess().InsertFldType(aType);
+                pType = rDoc.getIDocumentFieldsAccess().InsertFieldType(aType);
             }
             xRet = SwXFieldMaster::CreateXFieldMaster(&rDoc, pType);
         }
@@ -852,7 +852,7 @@ sal_Int32 SwXTextTables::getCount() throw( uno::RuntimeException, std::exception
     SolarMutexGuard aGuard;
     sal_Int32 nRet = 0;
     if(IsValid())
-        nRet = static_cast<sal_Int32>(GetDoc()->GetTblFrmFmtCount(true));
+        nRet = static_cast<sal_Int32>(GetDoc()->GetTableFrameFormatCount(true));
     return nRet;
 }
 
@@ -863,11 +863,11 @@ uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex)
     uno::Any aRet;
     if(IsValid())
     {
-        if(0 <= nIndex && GetDoc()->GetTblFrmFmtCount(true) > static_cast<size_t>(nIndex))
+        if(0 <= nIndex && GetDoc()->GetTableFrameFormatCount(true) > static_cast<size_t>(nIndex))
         {
-            SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(nIndex, true);
-            uno::Reference< XTextTable >  xTbl = SwXTextTables::GetObject(rFmt);
-            aRet.setValue( &xTbl,
+            SwFrameFormat& rFormat = GetDoc()->GetTableFrameFormat(nIndex, true);
+            uno::Reference< XTextTable >  xTable = SwXTextTables::GetObject(rFormat);
+            aRet.setValue( &xTable,
                 cppu::UnoType<XTextTable>::get());
         }
         else
@@ -885,20 +885,20 @@ uno::Any SwXTextTables::getByName(const OUString& rItemName)
     uno::Any aRet;
     if(IsValid())
     {
-        const size_t nCount = GetDoc()->GetTblFrmFmtCount(true);
-        uno::Reference< XTextTable >  xTbl;
+        const size_t nCount = GetDoc()->GetTableFrameFormatCount(true);
+        uno::Reference< XTextTable >  xTable;
         for( size_t i = 0; i < nCount; ++i)
         {
-            SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(i, true);
-            if (rItemName == rFmt.GetName())
+            SwFrameFormat& rFormat = GetDoc()->GetTableFrameFormat(i, true);
+            if (rItemName == rFormat.GetName())
             {
-                xTbl = SwXTextTables::GetObject(rFmt);
-                aRet.setValue(&xTbl,
+                xTable = SwXTextTables::GetObject(rFormat);
+                aRet.setValue(&xTable,
                     cppu::UnoType<XTextTable>::get());
                 break;
             }
         }
-        if(!xTbl.is())
+        if(!xTable.is())
             throw NoSuchElementException();
     }
     else
@@ -912,16 +912,16 @@ uno::Sequence< OUString > SwXTextTables::getElementNames()
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw uno::RuntimeException();
-    const size_t nCount = GetDoc()->GetTblFrmFmtCount(true);
+    const size_t nCount = GetDoc()->GetTableFrameFormatCount(true);
     uno::Sequence<OUString> aSeq(static_cast<sal_Int32>(nCount));
     if(nCount)
     {
         OUString* pArray = aSeq.getArray();
         for( size_t i = 0; i < nCount; ++i)
         {
-            SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(i, true);
+            SwFrameFormat& rFormat = GetDoc()->GetTableFrameFormat(i, true);
 
-            pArray[i] = rFmt.GetName();
+            pArray[i] = rFormat.GetName();
         }
     }
     return aSeq;
@@ -934,11 +934,11 @@ sal_Bool SwXTextTables::hasByName(const OUString& rName)
     bool bRet= false;
     if(IsValid())
     {
-        const size_t nCount = GetDoc()->GetTblFrmFmtCount(true);
+        const size_t nCount = GetDoc()->GetTableFrameFormatCount(true);
         for( size_t i = 0; i < nCount; ++i)
         {
-            SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(i, true);
-            if (rName == rFmt.GetName())
+            SwFrameFormat& rFormat = GetDoc()->GetTableFrameFormat(i, true);
+            if (rName == rFormat.GetName())
             {
                 bRet = true;
                 break;
@@ -962,7 +962,7 @@ sal_Bool SwXTextTables::hasElements() throw( uno::RuntimeException, std::excepti
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw uno::RuntimeException();
-    return 0 != GetDoc()->GetTblFrmFmtCount(true);
+    return 0 != GetDoc()->GetTableFrameFormatCount(true);
 }
 
 OUString SwXTextTables::getImplementationName() throw( uno::RuntimeException, std::exception )
@@ -983,9 +983,9 @@ uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames() throw( uno::
     return aRet;
 }
 
-uno::Reference<text::XTextTable> SwXTextTables::GetObject(SwFrmFmt& rFmt)
+uno::Reference<text::XTextTable> SwXTextTables::GetObject(SwFrameFormat& rFormat)
 {
-    return SwXTextTable::CreateXTextTable(& rFmt);
+    return SwXTextTable::CreateXTextTable(& rFormat);
 }
 
 namespace
@@ -997,13 +997,13 @@ namespace
     {
         typedef SwXTextFrame core_frame_t;
         typedef XTextFrame uno_frame_t;
-        static inline uno::Any wrapFrame(SwFrmFmt & rFrmFmt)
+        static inline uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
         {
             uno::Reference<text::XTextFrame> const xRet(
-                SwXTextFrame::CreateXTextFrame(*rFrmFmt.GetDoc(), &rFrmFmt));
+                SwXTextFrame::CreateXTextFrame(*rFrameFormat.GetDoc(), &rFrameFormat));
             return uno::makeAny(xRet);
         }
-        static inline bool filter(const SwNode* const pNode) { return !pNode->IsNoTxtNode(); };
+        static inline bool filter(const SwNode* const pNode) { return !pNode->IsNoTextNode(); };
     };
 
     template<>
@@ -1011,10 +1011,10 @@ namespace
     {
         typedef SwXTextGraphicObject core_frame_t;
         typedef XTextContent uno_frame_t;
-        static inline uno::Any wrapFrame(SwFrmFmt & rFrmFmt)
+        static inline uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
         {
             uno::Reference<text::XTextContent> const xRet(
-                SwXTextGraphicObject::CreateXTextGraphicObject(*rFrmFmt.GetDoc(), &rFrmFmt));
+                SwXTextGraphicObject::CreateXTextGraphicObject(*rFrameFormat.GetDoc(), &rFrameFormat));
             return uno::makeAny(xRet);
         }
         static inline bool filter(const SwNode* const pNode) { return pNode->IsGrfNode(); };
@@ -1025,32 +1025,32 @@ namespace
     {
         typedef SwXTextEmbeddedObject core_frame_t;
         typedef XEmbeddedObjectSupplier uno_frame_t;
-        static inline uno::Any wrapFrame(SwFrmFmt & rFrmFmt)
+        static inline uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
         {
             uno::Reference<text::XTextContent> const xRet(
-                SwXTextEmbeddedObject::CreateXTextEmbeddedObject(*rFrmFmt.GetDoc(), &rFrmFmt));
+                SwXTextEmbeddedObject::CreateXTextEmbeddedObject(*rFrameFormat.GetDoc(), &rFrameFormat));
             return uno::makeAny(xRet);
         }
         static inline bool filter(const SwNode* const pNode) { return pNode->IsOLENode(); };
     };
 
     template<FlyCntType T>
-    static uno::Any lcl_UnoWrapFrame(SwFrmFmt* pFmt)
+    static uno::Any lcl_UnoWrapFrame(SwFrameFormat* pFormat)
     {
-        return UnoFrameWrap_traits<T>::wrapFrame(*pFmt);
+        return UnoFrameWrap_traits<T>::wrapFrame(*pFormat);
     }
 
     // runtime adapter for lcl_UnoWrapFrame
-    static uno::Any lcl_UnoWrapFrame(SwFrmFmt* pFmt, FlyCntType eType) throw(uno::RuntimeException)
+    static uno::Any lcl_UnoWrapFrame(SwFrameFormat* pFormat, FlyCntType eType) throw(uno::RuntimeException)
     {
         switch(eType)
         {
             case FLYCNTTYPE_FRM:
-                return lcl_UnoWrapFrame<FLYCNTTYPE_FRM>(pFmt);
+                return lcl_UnoWrapFrame<FLYCNTTYPE_FRM>(pFormat);
             case FLYCNTTYPE_GRF:
-                return lcl_UnoWrapFrame<FLYCNTTYPE_GRF>(pFmt);
+                return lcl_UnoWrapFrame<FLYCNTTYPE_GRF>(pFormat);
             case FLYCNTTYPE_OLE:
-                return lcl_UnoWrapFrame<FLYCNTTYPE_OLE>(pFmt);
+                return lcl_UnoWrapFrame<FLYCNTTYPE_OLE>(pFormat);
             default:
                 throw uno::RuntimeException();
         }
@@ -1084,29 +1084,29 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc)
     : m_aFrames()
 {
     SolarMutexGuard aGuard;
-    const SwFrmFmts* const pFmts = pDoc->GetSpzFrmFmts();
-    if(pFmts->empty())
+    const SwFrameFormats* const pFormats = pDoc->GetSpzFrameFormats();
+    if(pFormats->empty())
         return;
     // #i104937#
-    const size_t nSize = pFmts->size();
+    const size_t nSize = pFormats->size();
     ::std::insert_iterator<frmcontainer_t> pInserter = ::std::insert_iterator<frmcontainer_t>(m_aFrames, m_aFrames.begin());
     // #i104937#
-    SwFrmFmt* pFmt( 0 );
+    SwFrameFormat* pFormat( 0 );
 
-    std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+    std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
 
     for( size_t i = 0; i < nSize; ++i )
     {
         // #i104937#
-        pFmt = (*pFmts)[i];
-        if(pFmt->Which() != RES_FLYFRMFMT || aTextBoxes.find(pFmt) != aTextBoxes.end())
+        pFormat = (*pFormats)[i];
+        if(pFormat->Which() != RES_FLYFRMFMT || aTextBoxes.find(pFormat) != aTextBoxes.end())
             continue;
-        const SwNodeIndex* pIdx =  pFmt->GetCntnt().GetCntntIdx();
+        const SwNodeIndex* pIdx =  pFormat->GetContent().GetContentIdx();
         if(!pIdx || !pIdx->GetNodes().IsDocNodes())
             continue;
         const SwNode* pNd = pDoc->GetNodes()[ pIdx->GetIndex() + 1 ];
         if(UnoFrameWrap_traits<T>::filter(pNd))
-            *pInserter++ = lcl_UnoWrapFrame<T>(pFmt);
+            *pInserter++ = lcl_UnoWrapFrame<T>(pFormat);
     }
 }
 
@@ -1208,10 +1208,10 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex)
     if(nIndex < 0)
         throw IndexOutOfBoundsException();
     // Ignore TextBoxes for TextFrames.
-    SwFrmFmt* pFmt = GetDoc()->GetFlyNum(static_cast<size_t>(nIndex), eType, /*bIgnoreTextBoxes=*/eType == FLYCNTTYPE_FRM);
-    if(!pFmt)
+    SwFrameFormat* pFormat = GetDoc()->GetFlyNum(static_cast<size_t>(nIndex), eType, /*bIgnoreTextBoxes=*/eType == FLYCNTTYPE_FRM);
+    if(!pFormat)
         throw IndexOutOfBoundsException();
-    return lcl_UnoWrapFrame(pFmt, eType);
+    return lcl_UnoWrapFrame(pFormat, eType);
 }
 
 uno::Any SwXFrames::getByName(const OUString& rName)
@@ -1220,22 +1220,22 @@ uno::Any SwXFrames::getByName(const OUString& rName)
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw uno::RuntimeException();
-    const SwFrmFmt* pFmt;
+    const SwFrameFormat* pFormat;
     switch(eType)
     {
         case FLYCNTTYPE_GRF:
-            pFmt = GetDoc()->FindFlyByName(rName, ND_GRFNODE);
+            pFormat = GetDoc()->FindFlyByName(rName, ND_GRFNODE);
             break;
         case FLYCNTTYPE_OLE:
-            pFmt = GetDoc()->FindFlyByName(rName, ND_OLENODE);
+            pFormat = GetDoc()->FindFlyByName(rName, ND_OLENODE);
             break;
         default:
-            pFmt = GetDoc()->FindFlyByName(rName, ND_TEXTNODE);
+            pFormat = GetDoc()->FindFlyByName(rName, ND_TEXTNODE);
             break;
     }
-    if(!pFmt)
+    if(!pFormat)
         throw NoSuchElementException();
-    return lcl_UnoWrapFrame(const_cast<SwFrmFmt*>(pFmt), eType);
+    return lcl_UnoWrapFrame(const_cast<SwFrameFormat*>(pFormat), eType);
 }
 
 uno::Sequence<OUString> SwXFrames::getElementNames() throw( uno::RuntimeException, std::exception )
@@ -1409,11 +1409,11 @@ sal_Int32 SwXTextSections::getCount() throw( uno::RuntimeException, std::excepti
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw uno::RuntimeException();
-    const SwSectionFmts& rSectFmts = GetDoc()->GetSections();
-    size_t nCount = rSectFmts.size();
+    const SwSectionFormats& rSectFormats = GetDoc()->GetSections();
+    size_t nCount = rSectFormats.size();
     for(size_t i = nCount; i; --i)
     {
-        if( !rSectFmts[i - 1]->IsInNodesArr())
+        if( !rSectFormats[i - 1]->IsInNodesArr())
             nCount--;
     }
     return nCount;
@@ -1426,23 +1426,23 @@ uno::Any SwXTextSections::getByIndex(sal_Int32 nIndex)
     uno::Reference< XTextSection >  xRet;
     if(IsValid())
     {
-        SwSectionFmts& rFmts = GetDoc()->GetSections();
+        SwSectionFormats& rFormats = GetDoc()->GetSections();
 
-        const SwSectionFmts& rSectFmts = GetDoc()->GetSections();
-        const size_t nCount = rSectFmts.size();
+        const SwSectionFormats& rSectFormats = GetDoc()->GetSections();
+        const size_t nCount = rSectFormats.size();
         for(size_t i = 0; i < nCount; ++i)
         {
-            if( !rSectFmts[i]->IsInNodesArr())
+            if( !rSectFormats[i]->IsInNodesArr())
                 nIndex ++;
             else if(static_cast<size_t>(nIndex) == i)
                 break;
             if(static_cast<size_t>(nIndex) == i)
                 break;
         }
-        if(nIndex >= 0 && static_cast<size_t>(nIndex) < rFmts.size())
+        if(nIndex >= 0 && static_cast<size_t>(nIndex) < rFormats.size())
         {
-            SwSectionFmt* pFmt = rFmts[nIndex];
-            xRet = GetObject(*pFmt);
+            SwSectionFormat* pFormat = rFormats[nIndex];
+            xRet = GetObject(*pFormat);
         }
         else
             throw IndexOutOfBoundsException();
@@ -1459,15 +1459,15 @@ uno::Any SwXTextSections::getByName(const OUString& rName)
     uno::Any aRet;
     if(IsValid())
     {
-        SwSectionFmts& rFmts = GetDoc()->GetSections();
+        SwSectionFormats& rFormats = GetDoc()->GetSections();
         uno::Reference< XTextSection >  xSect;
-        for(size_t i = 0; i < rFmts.size(); ++i)
+        for(size_t i = 0; i < rFormats.size(); ++i)
         {
-            SwSectionFmt* pFmt = rFmts[i];
-            if (pFmt->IsInNodesArr()
-                && (rName == pFmt->GetSection()->GetSectionName()))
+            SwSectionFormat* pFormat = rFormats[i];
+            if (pFormat->IsInNodesArr()
+                && (rName == pFormat->GetSection()->GetSectionName()))
             {
-                xSect = GetObject(*pFmt);
+                xSect = GetObject(*pFormat);
                 aRet.setValue(&xSect, cppu::UnoType<XTextSection>::get());
                 break;
             }
@@ -1487,27 +1487,27 @@ uno::Sequence< OUString > SwXTextSections::getElementNames()
     if(!IsValid())
         throw uno::RuntimeException();
     size_t nCount = GetDoc()->GetSections().size();
-    SwSectionFmts& rSectFmts = GetDoc()->GetSections();
+    SwSectionFormats& rSectFormats = GetDoc()->GetSections();
     for(size_t i = nCount; i; --i)
     {
-        if( !rSectFmts[i - 1]->IsInNodesArr())
+        if( !rSectFormats[i - 1]->IsInNodesArr())
             nCount--;
     }
 
     uno::Sequence<OUString> aSeq(nCount);
     if(nCount)
     {
-        SwSectionFmts& rFmts = GetDoc()->GetSections();
+        SwSectionFormats& rFormats = GetDoc()->GetSections();
         OUString* pArray = aSeq.getArray();
         size_t nIndex = 0;
         for( size_t i = 0; i < nCount; ++i, ++nIndex)
         {
-            const SwSectionFmt* pFmt = rFmts[nIndex];
-            while(!pFmt->IsInNodesArr())
+            const SwSectionFormat* pFormat = rFormats[nIndex];
+            while(!pFormat->IsInNodesArr())
             {
-                pFmt = rFmts[++nIndex];
+                pFormat = rFormats[++nIndex];
             }
-            pArray[i] = pFmt->GetSection()->GetSectionName();
+            pArray[i] = pFormat->GetSection()->GetSectionName();
         }
     }
     return aSeq;
@@ -1520,11 +1520,11 @@ sal_Bool SwXTextSections::hasByName(const OUString& rName)
     bool bRet = false;
     if(IsValid())
     {
-        SwSectionFmts& rFmts = GetDoc()->GetSections();
-        for(size_t i = 0; i < rFmts.size(); ++i)
+        SwSectionFormats& rFormats = GetDoc()->GetSections();
+        for(size_t i = 0; i < rFormats.size(); ++i)
         {
-            const SwSectionFmt* pFmt = rFmts[i];
-            if (rName == pFmt->GetSection()->GetSectionName())
+            const SwSectionFormat* pFormat = rFormats[i];
+            if (rName == pFormat->GetSection()->GetSectionName())
             {
                 bRet = true;
                 break;
@@ -1551,17 +1551,17 @@ sal_Bool SwXTextSections::hasElements() throw( uno::RuntimeException, std::excep
     size_t nCount = 0;
     if(IsValid())
     {
-        SwSectionFmts& rFmts = GetDoc()->GetSections();
-        nCount = rFmts.size();
+        SwSectionFormats& rFormats = GetDoc()->GetSections();
+        nCount = rFormats.size();
     }
     else
         throw uno::RuntimeException();
     return nCount > 0;
 }
 
-uno::Reference< XTextSection >  SwXTextSections::GetObject( SwSectionFmt& rFmt )
+uno::Reference< XTextSection >  SwXTextSections::GetObject( SwSectionFormat& rFormat )
 {
-    return SwXTextSection::CreateXTextSection(&rFmt);
+    return SwXTextSection::CreateXTextSection(&rFormat);
 }
 
 OUString SwXBookmarks::getImplementationName() throw( RuntimeException, std::exception )
@@ -1735,7 +1735,7 @@ sal_Int32 SwXNumberingRulesCollection::getCount() throw( uno::RuntimeException,
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw uno::RuntimeException();
-    return GetDoc()->GetNumRuleTbl().size();
+    return GetDoc()->GetNumRuleTable().size();
 }
 
 uno::Any SwXNumberingRulesCollection::getByIndex(sal_Int32 nIndex)
@@ -1746,9 +1746,9 @@ uno::Any SwXNumberingRulesCollection::getByIndex(sal_Int32 nIndex)
     if(IsValid())
     {
         uno::Reference< XIndexReplace >  xRef;
-        if ( static_cast<size_t>(nIndex) < GetDoc()->GetNumRuleTbl().size() )
+        if ( static_cast<size_t>(nIndex) < GetDoc()->GetNumRuleTable().size() )
         {
-            xRef = new SwXNumberingRules( *GetDoc()->GetNumRuleTbl()[ nIndex ], GetDoc());
+            xRef = new SwXNumberingRules( *GetDoc()->GetNumRuleTable()[ nIndex ], GetDoc());
             aRet.setValue(&xRef, cppu::UnoType<XIndexReplace>::get());
         }
 
@@ -1770,7 +1770,7 @@ sal_Bool SwXNumberingRulesCollection::hasElements() throw( uno::RuntimeException
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw uno::RuntimeException();
-    return !GetDoc()->GetNumRuleTbl().empty();
+    return !GetDoc()->GetNumRuleTable().empty();
 }
 
 OUString SwXFootnotes::getImplementationName() throw( RuntimeException, std::exception )
@@ -1807,13 +1807,13 @@ sal_Int32 SwXFootnotes::getCount() throw( uno::RuntimeException, std::exception
     if(!IsValid())
         throw uno::RuntimeException();
     sal_Int32 nCount = 0;
-    const size_t nFtnCnt = GetDoc()->GetFtnIdxs().size();
-    SwTxtFtn* pTxtFtn;
-    for( size_t n = 0; n < nFtnCnt; ++n )
+    const size_t nFootnoteCnt = GetDoc()->GetFootnoteIdxs().size();
+    SwTextFootnote* pTextFootnote;
+    for( size_t n = 0; n < nFootnoteCnt; ++n )
     {
-        pTxtFtn = GetDoc()->GetFtnIdxs()[ n ];
-        const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-        if ( rFtn.IsEndNote() != m_bEndnote )
+        pTextFootnote = GetDoc()->GetFootnoteIdxs()[ n ];
+        const SwFormatFootnote& rFootnote = pTextFootnote->GetFootnote();
+        if ( rFootnote.IsEndNote() != m_bEndnote )
             continue;
         nCount++;
     }
@@ -1828,20 +1828,20 @@ uno::Any SwXFootnotes::getByIndex(sal_Int32 nIndex)
     sal_Int32 nCount = 0;
     if(IsValid())
     {
-        const size_t nFtnCnt = GetDoc()->GetFtnIdxs().size();
-        SwTxtFtn* pTxtFtn;
+        const size_t nFootnoteCnt = GetDoc()->GetFootnoteIdxs().size();
+        SwTextFootnote* pTextFootnote;
         uno::Reference< XFootnote >  xRef;
-        for( size_t n = 0; n < nFtnCnt; ++n )
+        for( size_t n = 0; n < nFootnoteCnt; ++n )
         {
-            pTxtFtn = GetDoc()->GetFtnIdxs()[ n ];
-            const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-            if ( rFtn.IsEndNote() != m_bEndnote )
+            pTextFootnote = GetDoc()->GetFootnoteIdxs()[ n ];
+            const SwFormatFootnote& rFootnote = pTextFootnote->GetFootnote();
+            if ( rFootnote.IsEndNote() != m_bEndnote )
                 continue;
 
             if(nCount == nIndex)
             {
                 xRef = SwXFootnote::CreateXFootnote(*GetDoc(),
-                        &const_cast<SwFmtFtn&>(rFtn));
+                        &const_cast<SwFormatFootnote&>(rFootnote));
                 aRet <<= xRef;
                 break;
             }
@@ -1865,12 +1865,12 @@ sal_Bool SwXFootnotes::hasElements() throw( uno::RuntimeException, std::exceptio
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw uno::RuntimeException();
-    return !GetDoc()->GetFtnIdxs().empty();
+    return !GetDoc()->GetFootnoteIdxs().empty();
 }
 
-Reference<XFootnote>    SwXFootnotes::GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt )
+Reference<XFootnote>    SwXFootnotes::GetObject( SwDoc& rDoc, const SwFormatFootnote& rFormat )
 {
-    return SwXFootnote::CreateXFootnote(rDoc, &const_cast<SwFmtFtn&>(rFmt));
+    return SwXFootnote::CreateXFootnote(rDoc, &const_cast<SwFormatFootnote&>(rFormat));
 }
 
 OUString SwXReferenceMarks::getImplementationName() throw( RuntimeException, std::exception )
@@ -1918,7 +1918,7 @@ uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex)
     uno::Reference< XTextContent >  xRef;
     if(0 <= nIndex && nIndex < USHRT_MAX)
     {
-        SwFmtRefMark *const pMark = const_cast<SwFmtRefMark*>(
+        SwFormatRefMark *const pMark = const_cast<SwFormatRefMark*>(
                 GetDoc()->GetRefMark(static_cast<sal_uInt16>(nIndex)));
         if(pMark)
         {
@@ -1938,8 +1938,8 @@ uno::Any SwXReferenceMarks::getByName(const OUString& rName)
     uno::Any aRet;
     if(IsValid())
     {
-        SwFmtRefMark *const pMark =
-            const_cast<SwFmtRefMark*>(GetDoc()->GetRefMark(rName));
+        SwFormatRefMark *const pMark =
+            const_cast<SwFormatRefMark*>(GetDoc()->GetRefMark(rName));
         if(pMark)
         {
             uno::Reference<XTextContent> const xRef =
diff --git a/sw/source/core/unocore/unocrsr.cxx b/sw/source/core/unocore/unocrsr.cxx
index 36764284c518..1edb7826dcca 100644
--- a/sw/source/core/unocore/unocrsr.cxx
+++ b/sw/source/core/unocore/unocrsr.cxx
@@ -40,8 +40,8 @@ SwUnoCrsr::~SwUnoCrsr()
     if( !pDoc->IsInDtor() )
     {
         // then remove cursor from array
-        SwUnoCrsrTbl& rTbl = (SwUnoCrsrTbl&)pDoc->GetUnoCrsrTbl();
-        if( !rTbl.erase( this ) )
+        SwUnoCrsrTable& rTable = (SwUnoCrsrTable&)pDoc->GetUnoCrsrTable();
+        if( !rTable.erase( this ) )
         {
             OSL_ENSURE( false, "UNO Cursor nicht mehr im Array" );
         }
@@ -86,7 +86,7 @@ bool SwUnoCrsr::IsReadOnlyAvailable() const
     return true;
 }
 
-const SwCntntFrm*
+const SwContentFrm*
 SwUnoCrsr::DoSetBidiLevelLeftRight( bool &, bool, bool )
 {
     return 0; // not for uno cursor
@@ -147,7 +147,7 @@ bool SwUnoCrsr::IsSelOvr( int eFlags )
                         {
                             rPtIdx.Assign( *pInvalidNode->EndOfSectionNode(), 1 );
 
-                            if( !rPtIdx.GetNode().IsCntntNode() &&
+                            if( !rPtIdx.GetNode().IsContentNode() &&
                                 ( !pDoc->GetNodes().GoNextSection( &rPtIdx ) ||
                                   rPtIdx > pOldSttNd->EndOfSectionIndex() ) )
                                 break;
@@ -156,7 +156,7 @@ bool SwUnoCrsr::IsSelOvr( int eFlags )
                         {
                             rPtIdx.Assign( *pInvalidNode, -1 );
 
-                            if( !rPtIdx.GetNode().IsCntntNode() &&
+                            if( !rPtIdx.GetNode().IsContentNode() &&
                                 ( !SwNodes::GoPrevSection( &rPtIdx ) ||
                                   rPtIdx < *pOldSttNd ) )
                                 break;
@@ -169,13 +169,13 @@ bool SwUnoCrsr::IsSelOvr( int eFlags )
 
             if( bValidPos )
             {
-                SwCntntNode* pCNd = GetCntntNode();
+                SwContentNode* pCNd = GetContentNode();
                 GetPoint()->nContent.Assign( pCNd, (pCNd && !bMoveDown) ? pCNd->Len() : 0);
             }
             else
             {
                 rPtIdx = GetSavePos()->nNode;
-                GetPoint()->nContent.Assign( GetCntntNode(), GetSavePos()->nCntnt );
+                GetPoint()->nContent.Assign( GetContentNode(), GetSavePos()->nContent );
                 return true;
             }
         }
@@ -187,15 +187,15 @@ SwUnoTableCrsr::SwUnoTableCrsr(const SwPosition& rPos)
     : SwCursor(rPos, 0, false)
     , SwUnoCrsr(rPos)
     , SwTableCursor(rPos)
-    , m_aTblSel(rPos, 0, false)
+    , m_aTableSel(rPos, 0, false)
 {
     SetRemainInSection(false);
 }
 
 SwUnoTableCrsr::~SwUnoTableCrsr()
 {
-    while (m_aTblSel.GetNext() != &m_aTblSel)
-        delete m_aTblSel.GetNext();
+    while (m_aTableSel.GetNext() != &m_aTableSel)
+        delete m_aTableSel.GetNext();
 }
 
 bool SwUnoTableCrsr::IsSelOvr( int eFlags )
@@ -213,14 +213,14 @@ bool SwUnoTableCrsr::IsSelOvr( int eFlags )
 
 void SwUnoTableCrsr::MakeBoxSels()
 {
-    const SwCntntNode* pCNd;
-    bool bMakeTblCrsrs = true;
+    const SwContentNode* pCNd;
+    bool bMakeTableCrsrs = true;
     if( GetPoint()->nNode.GetIndex() && GetMark()->nNode.GetIndex() &&
-            0 != ( pCNd = GetCntntNode() ) && pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
-            0 != ( pCNd = GetCntntNode(false) ) && pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) )
-        bMakeTblCrsrs = GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout()->MakeTblCrsrs( *this );
+            0 != ( pCNd = GetContentNode() ) && pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
+            0 != ( pCNd = GetContentNode(false) ) && pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) )
+        bMakeTableCrsrs = GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout()->MakeTableCrsrs( *this );
 
-    if ( !bMakeTblCrsrs )
+    if ( !bMakeTableCrsrs )
     {
         SwSelBoxes const& rTmpBoxes = GetSelectedBoxes();
         while (!rTmpBoxes.empty())
@@ -231,19 +231,19 @@ void SwUnoTableCrsr::MakeBoxSels()
 
     if( IsChgd() )
     {
-        SwTableCursor::MakeBoxSels( &m_aTblSel );
+        SwTableCursor::MakeBoxSels( &m_aTableSel );
         if (!GetSelectedBoxesCount())
         {
             const SwTableBox* pBox;
             const SwNode* pBoxNd = GetPoint()->nNode.GetNode().FindTableBoxStartNode();
-            const SwTableNode* pTblNd = pBoxNd ? pBoxNd->FindTableNode() : 0;
-            if( pTblNd && 0 != ( pBox = pTblNd->GetTable().GetTblBox( pBoxNd->GetIndex() )) )
+            const SwTableNode* pTableNd = pBoxNd ? pBoxNd->FindTableNode() : 0;
+            if( pTableNd && 0 != ( pBox = pTableNd->GetTable().GetTableBox( pBoxNd->GetIndex() )) )
                 InsertBox( *pBox );
         }
     }
 }
 
-SwUnoCrsrTbl::~SwUnoCrsrTbl()
+SwUnoCrsrTable::~SwUnoCrsrTable()
 {
     while (!empty())
     {
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 5cb72e3549cd..e0e668b8c3a3 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -191,10 +191,10 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface> const& xIfc,
         ::sw::UnoTunnelGetImplementation<SwXFrame>(xTunnel));
     if (pFrame)
     {
-        const SwFrmFmt *const pFrmFmt(pFrame->GetFrmFmt());
-        if (pFrmFmt && pFrmFmt->GetDoc() == &rTargetDoc)
+        const SwFrameFormat *const pFrameFormat(pFrame->GetFrameFormat());
+        if (pFrameFormat && pFrameFormat->GetDoc() == &rTargetDoc)
         {
-            o_rFrame = std::make_pair(pFrmFmt->GetName(), pFrame->GetFlyCntType());
+            o_rFrame = std::make_pair(pFrameFormat->GetName(), pFrame->GetFlyCntType());
         }
         return;
     }
@@ -203,10 +203,10 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface> const& xIfc,
         ::sw::UnoTunnelGetImplementation<SwXTextTable>(xTunnel));
     if (pTextTable)
     {
-        SwFrmFmt *const pFrmFmt(pTextTable->GetFrmFmt());
-        if (pFrmFmt && pFrmFmt->GetDoc() == &rTargetDoc)
+        SwFrameFormat *const pFrameFormat(pTextTable->GetFrameFormat());
+        if (pFrameFormat && pFrameFormat->GetDoc() == &rTargetDoc)
         {
-            o_rTableName = pFrmFmt->GetName();
+            o_rTableName = pFrameFormat->GetName();
         }
         return;
     }
@@ -215,11 +215,11 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface> const& xIfc,
         ::sw::UnoTunnelGetImplementation<SwXCell>(xTunnel));
     if (pCell)
     {
-        SwFrmFmt *const pFrmFmt(pCell->GetFrmFmt());
-        if (pFrmFmt && pFrmFmt->GetDoc() == &rTargetDoc)
+        SwFrameFormat *const pFrameFormat(pCell->GetFrameFormat());
+        if (pFrameFormat && pFrameFormat->GetDoc() == &rTargetDoc)
         {
-            SwTableBox * pBox = pCell->GetTblBox();
-            SwTable *const pTable = SwTable::FindTable(pFrmFmt);
+            SwTableBox * pBox = pCell->GetTableBox();
+            SwTable *const pTable = SwTable::FindTable(pFrameFormat);
             // ??? what's the benefit of setting pBox in this convoluted way?
             pBox = pCell->FindBox(pTable, pBox);
             if (pBox)
@@ -248,7 +248,7 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface> const& xIfc,
         ::sw::UnoTunnelGetImplementation<SwXCellRange>(xTunnel));
     if (pCellRange)
     {
-        SwUnoCrsr const*const pUnoCrsr(pCellRange->GetTblCrsr());
+        SwUnoCrsr const*const pUnoCrsr(pCellRange->GetTableCrsr());
         if (pUnoCrsr && pUnoCrsr->GetDoc() == &rTargetDoc)
         {
             // probably can't copy it to o_rpPaM for this since it's
@@ -268,29 +268,29 @@ void GetSelectableFromAny(uno::Reference<uno::XInterface> const& xIfc,
 }
 
 uno::Reference<text::XTextContent>
-GetNestedTextContent(SwTxtNode & rTextNode, sal_Int32 const nIndex,
+GetNestedTextContent(SwTextNode & rTextNode, sal_Int32 const nIndex,
         bool const bParent)
 {
     // these should be unambiguous because of the dummy character
-    SwTxtNode::GetTxtAttrMode const eMode( (bParent)
-        ? SwTxtNode::PARENT : SwTxtNode::EXPAND );
-    SwTxtAttr *const pMetaTxtAttr =
-        rTextNode.GetTxtAttrAt(nIndex, RES_TXTATR_META, eMode);
-    SwTxtAttr *const pMetaFieldTxtAttr =
-        rTextNode.GetTxtAttrAt(nIndex, RES_TXTATR_METAFIELD, eMode);
+    SwTextNode::GetTextAttrMode const eMode( (bParent)
+        ? SwTextNode::PARENT : SwTextNode::EXPAND );
+    SwTextAttr *const pMetaTextAttr =
+        rTextNode.GetTextAttrAt(nIndex, RES_TXTATR_META, eMode);
+    SwTextAttr *const pMetaFieldTextAttr =
+        rTextNode.GetTextAttrAt(nIndex, RES_TXTATR_METAFIELD, eMode);
     // which is innermost?
-    SwTxtAttr *const pTxtAttr = (pMetaTxtAttr)
-        ? ((pMetaFieldTxtAttr)
-            ? ((pMetaFieldTxtAttr->GetStart() >
-                    pMetaTxtAttr->GetStart())
-                ? pMetaFieldTxtAttr : pMetaTxtAttr)
-            : pMetaTxtAttr)
-        : pMetaFieldTxtAttr;
+    SwTextAttr *const pTextAttr = (pMetaTextAttr)
+        ? ((pMetaFieldTextAttr)
+            ? ((pMetaFieldTextAttr->GetStart() >
+                    pMetaTextAttr->GetStart())
+                ? pMetaFieldTextAttr : pMetaTextAttr)
+            : pMetaTextAttr)
+        : pMetaFieldTextAttr;
     uno::Reference<XTextContent> xRet;
-    if (pTxtAttr)
+    if (pTextAttr)
     {
         ::sw::Meta *const pMeta(
-            static_cast<SwFmtMeta &>(pTxtAttr->GetAttr()).GetMeta());
+            static_cast<SwFormatMeta &>(pTextAttr->GetAttr()).GetMeta());
         OSL_ASSERT(pMeta);
         xRet.set(pMeta->MakeUnoObject(), uno::UNO_QUERY);
     }
@@ -302,7 +302,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
                                         , SwPaM& rPam
                                         , Any *pAny
                                         , PropertyState& eState
-                                        , const SwTxtNode* pNode  )
+                                        , const SwTextNode* pNode  )
 {
     PropertyState eNewState = PropertyState_DIRECT_VALUE;
     bool bDone = true;
@@ -311,10 +311,10 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
         case FN_UNO_PARA_CONT_PREV_SUBTREE:
             if (pAny)
             {
-                const SwTxtNode * pTmpNode = pNode;
+                const SwTextNode * pTmpNode = pNode;
 
                 if (!pTmpNode)
-                    pTmpNode = rPam.GetNode().GetTxtNode();
+                    pTmpNode = rPam.GetNode().GetTextNode();
 
                 bool bRet = false;
 
@@ -331,10 +331,10 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
         case FN_UNO_PARA_NUM_STRING:
             if (pAny)
             {
-                const SwTxtNode * pTmpNode = pNode;
+                const SwTextNode * pTmpNode = pNode;
 
                 if (!pTmpNode)
-                    pTmpNode = rPam.GetNode().GetTxtNode();
+                    pTmpNode = rPam.GetNode().GetTextNode();
 
                 OUString sRet;
                 if ( pTmpNode && pTmpNode->GetNum() )
@@ -348,10 +348,10 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
         case RES_PARATR_OUTLINELEVEL:
             if (pAny)
             {
-                const SwTxtNode * pTmpNode = pNode;
+                const SwTextNode * pTmpNode = pNode;
 
                 if (!pTmpNode)
-                    pTmpNode = rPam.GetNode().GetTxtNode();
+                    pTmpNode = rPam.GetNode().GetTextNode();
 
                 sal_Int16 nRet = -1;
                 if ( pTmpNode )
@@ -363,21 +363,21 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
         case FN_UNO_PARA_CONDITIONAL_STYLE_NAME:
         case FN_UNO_PARA_STYLE :
         {
-            SwFmtColl* pFmt = 0;
+            SwFormatColl* pFormat = 0;
             if(pNode)
-                pFmt = FN_UNO_PARA_CONDITIONAL_STYLE_NAME == rEntry.nWID
-                            ? pNode->GetFmtColl() : &pNode->GetAnyFmtColl();
+                pFormat = FN_UNO_PARA_CONDITIONAL_STYLE_NAME == rEntry.nWID
+                            ? pNode->GetFormatColl() : &pNode->GetAnyFormatColl();
             else
             {
-                pFmt = SwUnoCursorHelper::GetCurTxtFmtColl(rPam,
+                pFormat = SwUnoCursorHelper::GetCurTextFormatColl(rPam,
                         FN_UNO_PARA_CONDITIONAL_STYLE_NAME == rEntry.nWID);
             }
-            if(pFmt)
+            if(pFormat)
             {
                 if( pAny )
                 {
                     OUString sVal;
-                    SwStyleNameMapper::FillProgName(pFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
+                    SwStyleNameMapper::FillProgName(pFormat->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
                     *pAny <<= sVal;
                 }
             }
@@ -409,25 +409,25 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
         case FN_NUMBER_NEWSTART:
         {
             // a multi selection is not considered
-            const SwTxtNode* pTxtNd = rPam.GetNode().GetTxtNode();
-            if ( pTxtNd && pTxtNd->IsInList() )
+            const SwTextNode* pTextNd = rPam.GetNode().GetTextNode();
+            if ( pTextNd && pTextNd->IsInList() )
             {
                 if( pAny )
                 {
                     if(rEntry.nWID == FN_UNO_NUM_LEVEL)
-                        *pAny <<= (sal_Int16)(pTxtNd->GetActualListLevel());
+                        *pAny <<= (sal_Int16)(pTextNd->GetActualListLevel());
                     else if(rEntry.nWID == FN_UNO_IS_NUMBER)
                     {
-                        *pAny <<= pTxtNd->IsCountedInList();
+                        *pAny <<= pTextNd->IsCountedInList();
                     }
                     // #i91601#
                     else if ( rEntry.nWID == FN_UNO_LIST_ID )
                     {
-                        *pAny <<= pTxtNd->GetListId();
+                        *pAny <<= pTextNd->GetListId();
                     }
                     else
                     {
-                        *pAny <<= pTxtNd->IsListRestart();
+                        *pAny <<= pTextNd->IsListRestart();
                     }
                 }
             }
@@ -465,10 +465,10 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
             break;
         case FN_UNO_DOCUMENT_INDEX_MARK:
         {
-            ::std::vector<SwTxtAttr *> marks;
-            if (rPam.GetNode().IsTxtNode())
+            ::std::vector<SwTextAttr *> marks;
+            if (rPam.GetNode().IsTextNode())
             {
-                marks = rPam.GetNode().GetTxtNode()->GetTxtAttrsAt(
+                marks = rPam.GetNode().GetTextNode()->GetTextAttrsAt(
                     rPam.GetPoint()->nContent.GetIndex(), RES_TXTATR_TOXMARK);
             }
             if (marks.size())
@@ -509,18 +509,18 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
         case FN_UNO_TEXT_FIELD:
         {
             const SwPosition *pPos = rPam.Start();
-            const SwTxtNode *pTxtNd =
-                rPam.GetDoc()->GetNodes()[pPos->nNode.GetIndex()]->GetTxtNode();
-            const SwTxtAttr* pTxtAttr = (pTxtNd)
-                ? pTxtNd->GetFldTxtAttrAt( pPos->nContent.GetIndex(), true )
+            const SwTextNode *pTextNd =
+                rPam.GetDoc()->GetNodes()[pPos->nNode.GetIndex()]->GetTextNode();
+            const SwTextAttr* pTextAttr = (pTextNd)
+                ? pTextNd->GetFieldTextAttrAt( pPos->nContent.GetIndex(), true )
                 : 0;
-            if ( pTxtAttr != NULL )
+            if ( pTextAttr != NULL )
             {
                 if( pAny )
                 {
                     uno::Reference<text::XTextField> const xField(
                         SwXTextField::CreateXTextField(rPam.GetDoc(),
-                           &pTxtAttr->GetFmtFld()));
+                           &pTextAttr->GetFormatField()));
                     *pAny <<= xField;
                 }
             }
@@ -537,18 +537,18 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
             {
                 if( pAny )
                 {
-                    const SwTableNode* pTblNode = pSttNode->FindTableNode();
-                    SwFrmFmt* pTableFmt = (SwFrmFmt*)pTblNode->GetTable().GetFrmFmt();
+                    const SwTableNode* pTableNode = pSttNode->FindTableNode();
+                    SwFrameFormat* pTableFormat = (SwFrameFormat*)pTableNode->GetTable().GetFrameFormat();
                     //SwTable& rTable = static_cast<SwTableNode*>(pSttNode)->GetTable();
                     if(FN_UNO_TEXT_TABLE == rEntry.nWID)
                     {
-                        uno::Reference< XTextTable >  xTable = SwXTextTables::GetObject(*pTableFmt);
+                        uno::Reference< XTextTable >  xTable = SwXTextTables::GetObject(*pTableFormat);
                         pAny->setValue(&xTable, cppu::UnoType<XTextTable>::get());
                     }
                     else
                     {
-                        SwTableBox* pBox = pSttNode->GetTblBox();
-                        uno::Reference< XCell >  xCell = SwXCell::CreateXCell(pTableFmt, pBox);
+                        SwTableBox* pBox = pSttNode->GetTableBox();
+                        uno::Reference< XCell >  xCell = SwXCell::CreateXCell(pTableFormat, pBox);
                         pAny->setValue(&xCell, cppu::UnoType<XCell>::get());
                     }
                 }
@@ -562,13 +562,13 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
             SwStartNode* pSttNode = rPam.GetNode().StartOfSectionNode();
             SwStartNodeType eType = pSttNode->GetStartNodeType();
 
-            SwFrmFmt* pFmt;
-            if(eType == SwFlyStartNode && 0 != (pFmt = pSttNode->GetFlyFmt()))
+            SwFrameFormat* pFormat;
+            if(eType == SwFlyStartNode && 0 != (pFormat = pSttNode->GetFlyFormat()))
             {
                 if( pAny )
                 {
                     uno::Reference<XTextFrame> const xFrame(
-                        SwXTextFrame::CreateXTextFrame(*pFmt->GetDoc(), pFmt));
+                        SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), pFormat));
                     (*pAny) <<= xFrame;
                 }
             }
@@ -583,7 +583,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
             {
                 if( pAny )
                 {
-                    uno::Reference< XTextSection >  xSect = SwXTextSections::GetObject( *pSect->GetFmt() );
+                    uno::Reference< XTextSection >  xSect = SwXTextSections::GetObject( *pSect->GetFormat() );
                     pAny->setValue(&xSect, cppu::UnoType<XTextSection>::get());
                 }
             }
@@ -594,19 +594,19 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
         case FN_UNO_ENDNOTE:
         case FN_UNO_FOOTNOTE:
         {
-            SwTxtAttr *const pTxtAttr = rPam.GetNode().IsTxtNode() ?
-                rPam.GetNode().GetTxtNode()->GetTxtAttrForCharAt(
+            SwTextAttr *const pTextAttr = rPam.GetNode().IsTextNode() ?
+                rPam.GetNode().GetTextNode()->GetTextAttrForCharAt(
                     rPam.GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN) : 0;
-            if(pTxtAttr)
+            if(pTextAttr)
             {
-                const SwFmtFtn& rFtn = pTxtAttr->GetFtn();
-                if(rFtn.IsEndNote() == (FN_UNO_ENDNOTE == rEntry.nWID))
+                const SwFormatFootnote& rFootnote = pTextAttr->GetFootnote();
+                if(rFootnote.IsEndNote() == (FN_UNO_ENDNOTE == rEntry.nWID))
                 {
                     if( pAny )
                     {
                         const uno::Reference< text::XFootnote > xFootnote =
                             SwXFootnote::CreateXFootnote(*rPam.GetDoc(),
-                                    &const_cast<SwFmtFtn&>(rFtn));
+                                    &const_cast<SwFormatFootnote&>(rFootnote));
                         *pAny <<= xFootnote;
                     }
                 }
@@ -619,21 +619,21 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
         break;
         case FN_UNO_REFERENCE_MARK:
         {
-            ::std::vector<SwTxtAttr *> marks;
-            if (rPam.GetNode().IsTxtNode())
+            ::std::vector<SwTextAttr *> marks;
+            if (rPam.GetNode().IsTextNode())
             {
                 marks = (
-                rPam.GetNode().GetTxtNode()->GetTxtAttrsAt(
+                rPam.GetNode().GetTextNode()->GetTextAttrsAt(
                     rPam.GetPoint()->nContent.GetIndex(), RES_TXTATR_REFMARK));
             }
             if (marks.size())
             {
                 if( pAny )
                 {   // hmm... can only return 1 here
-                    const SwFmtRefMark& rRef = (*marks.begin())->GetRefMark();
+                    const SwFormatRefMark& rRef = (*marks.begin())->GetRefMark();
                     uno::Reference<XTextContent> const xRef =
                         SwXReferenceMark::CreateXReferenceMark(*rPam.GetDoc(),
-                                const_cast<SwFmtRefMark*>(&rRef));
+                                const_cast<SwFormatRefMark*>(&rRef));
                     pAny->setValue(&xRef, cppu::UnoType<XTextContent>::get());
                 }
             }
@@ -643,8 +643,8 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
         break;
         case FN_UNO_NESTED_TEXT_CONTENT:
         {
-            uno::Reference<XTextContent> const xRet(rPam.GetNode().IsTxtNode()
-                ? GetNestedTextContent(*rPam.GetNode().GetTxtNode(),
+            uno::Reference<XTextContent> const xRet(rPam.GetNode().IsTextNode()
+                ? GetNestedTextContent(*rPam.GetNode().GetTextNode(),
                     rPam.GetPoint()->nContent.GetIndex(), false)
                 : 0);
             if (xRet.is())
@@ -663,9 +663,9 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
         case FN_UNO_CHARFMT_SEQUENCE:
         {
 
-            SwTxtNode *const pTxtNode = rPam.GetNode().GetTxtNode();
+            SwTextNode *const pTextNode = rPam.GetNode().GetTextNode();
             if (&rPam.GetNode(true) == &rPam.GetNode(false)
-                && pTxtNode && pTxtNode->GetpSwpHints())
+                && pTextNode && pTextNode->GetpSwpHints())
             {
                 sal_Int32 nPaMStart = rPam.GetPoint()->nContent.GetIndex();
                 sal_Int32 nPaMEnd = rPam.GetMark() ? rPam.GetMark()->nContent.GetIndex() : nPaMStart;
@@ -674,10 +674,10 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
                     std::swap(nPaMStart, nPaMEnd);
                 }
                 Sequence< OUString> aCharStyles;
-                SwpHints* pHints = pTxtNode->GetpSwpHints();
+                SwpHints* pHints = pTextNode->GetpSwpHints();
                 for( size_t nAttr = 0; nAttr < pHints->GetStartCount(); ++nAttr )
                 {
-                    SwTxtAttr* pAttr = pHints->GetStart( nAttr );
+                    SwTextAttr* pAttr = pHints->GetStart( nAttr );
                     if(pAttr->Which() != RES_TXTATR_CHARFMT)
                         continue;
                     const sal_Int32 nAttrStart = pAttr->GetStart();
@@ -702,10 +702,10 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
                                     "attribute overlaps or is outside");
                             //now the name of the style has to be added to the sequence
                             aCharStyles.realloc(aCharStyles.getLength() + 1);
-                            OSL_ENSURE(pAttr->GetCharFmt().GetCharFmt(), "no character format set");
+                            OSL_ENSURE(pAttr->GetCharFormat().GetCharFormat(), "no character format set");
                             aCharStyles.getArray()[aCharStyles.getLength() - 1] =
                                         SwStyleNameMapper::GetProgName(
-                                            pAttr->GetCharFmt().GetCharFmt()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
+                                            pAttr->GetCharFormat().GetCharFormat()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
                         }
                     }
 
@@ -731,14 +731,14 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
 
 sal_Int16 IsNodeNumStart(SwPaM& rPam, PropertyState& eState)
 {
-    const SwTxtNode* pTxtNd = rPam.GetNode().GetTxtNode();
+    const SwTextNode* pTextNd = rPam.GetNode().GetTextNode();
     // correction: check, if restart value is set at the text node and use
-    // new method <SwTxtNode::GetAttrListRestartValue()> to retrieve the value
-    if ( pTxtNd && pTxtNd->GetNumRule() && pTxtNd->IsListRestart() &&
-         pTxtNd->HasAttrListRestartValue() )
+    // new method <SwTextNode::GetAttrListRestartValue()> to retrieve the value
+    if ( pTextNd && pTextNd->GetNumRule() && pTextNd->IsListRestart() &&
+         pTextNd->HasAttrListRestartValue() )
     {
         eState = PropertyState_DIRECT_VALUE;
-        sal_Int16 nTmp = sal::static_int_cast< sal_Int16 >(pTxtNd->GetAttrListRestartValue());
+        sal_Int16 nTmp = sal::static_int_cast< sal_Int16 >(pTextNd->GetAttrListRestartValue());
         return nTmp;
     }
     eState = PropertyState_DEFAULT_VALUE;
@@ -769,35 +769,35 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
                 const OUString* pBulletFontNames = pSwNum->GetBulletFontNames();
                 for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
                 {
-                    SwNumFmt aFmt(aRule.Get( i ));
+                    SwNumFormat aFormat(aRule.Get( i ));
                     if (!pNewCharStyles[i].isEmpty() &&
                         !SwXNumberingRules::isInvalidStyle(pNewCharStyles[i]) &&
-                        (!aFmt.GetCharFmt() || pNewCharStyles[i] != aFmt.GetCharFmt()->GetName()))
+                        (!aFormat.GetCharFormat() || pNewCharStyles[i] != aFormat.GetCharFormat()->GetName()))
                     {
                         if (pNewCharStyles[i].isEmpty())
                         {
                             // FIXME
                             // Is something missing/wrong here?
                             // if condition is always false due to outer check!
-                            aFmt.SetCharFmt(0);
+                            aFormat.SetCharFormat(0);
                         }
                         else
                         {
 
                             // get CharStyle and set the rule
-                            const size_t nChCount = pDoc->GetCharFmts()->size();
-                            SwCharFmt* pCharFmt = 0;
-                            for(size_t nCharFmt = 0; nCharFmt < nChCount; ++nCharFmt)
+                            const size_t nChCount = pDoc->GetCharFormats()->size();
+                            SwCharFormat* pCharFormat = 0;
+                            for(size_t nCharFormat = 0; nCharFormat < nChCount; ++nCharFormat)
                             {
-                                SwCharFmt& rChFmt = *((*(pDoc->GetCharFmts()))[nCharFmt]);
-                                if(rChFmt.GetName() == pNewCharStyles[i])
+                                SwCharFormat& rChFormat = *((*(pDoc->GetCharFormats()))[nCharFormat]);
+                                if(rChFormat.GetName() == pNewCharStyles[i])
                                 {
-                                    pCharFmt = &rChFmt;
+                                    pCharFormat = &rChFormat;
                                     break;
                                 }
                             }
 
-                            if(!pCharFmt)
+                            if(!pCharFormat)
                             {
                                 SfxStyleSheetBasePool* pPool = pDoc->GetDocShell()->GetStyleSheetPool();
                                 SfxStyleSheetBase* pBase;
@@ -805,17 +805,17 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
                             // shall it really be created?
                                 if(!pBase)
                                     pBase = &pPool->Make(pNewCharStyles[i], SFX_STYLE_FAMILY_PAGE);
-                                pCharFmt = static_cast<SwDocStyleSheet*>(pBase)->GetCharFmt();
+                                pCharFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat();
                             }
-                            if(pCharFmt)
-                                aFmt.SetCharFmt(pCharFmt);
+                            if(pCharFormat)
+                                aFormat.SetCharFormat(pCharFormat);
                         }
                     }
                     //Now again for fonts
                     if(
                        !pBulletFontNames[i].isEmpty() &&
                        !SwXNumberingRules::isInvalidStyle(pBulletFontNames[i]) &&
-                       (!aFmt.GetBulletFont() || aFmt.GetBulletFont()->GetName() != pBulletFontNames[i])
+                       (!aFormat.GetBulletFont() || aFormat.GetBulletFont()->GetName() != pBulletFontNames[i])
                       )
                     {
                         const SvxFontListItem* pFontListItem =
@@ -826,9 +826,9 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
                         vcl::FontInfo aInfo = pList->Get(
                             pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE);
                         vcl::Font aFont(aInfo);
-                        aFmt.SetBulletFont(&aFont);
+                        aFormat.SetBulletFont(&aFont);
                     }
-                    aRule.Set( i, aFmt );
+                    aRule.Set( i, aFormat );
                 }
                 UnoActionContext aAction(pDoc);
 
@@ -894,9 +894,9 @@ void  getNumberingProperty(SwPaM& rPam, PropertyState& eState, Any * pAny )
 
 void GetCurPageStyle(SwPaM& rPaM, OUString &rString)
 {
-    if (!rPaM.GetCntntNode())
+    if (!rPaM.GetContentNode())
         return; // TODO: is there an easy way to get it for tables/sections?
-    SwCntntFrm* pFrame = rPaM.GetCntntNode()->getLayoutFrm(rPaM.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout());
+    SwContentFrm* pFrame = rPaM.GetContentNode()->getLayoutFrm(rPaM.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout());
     if(pFrame)
     {
         const SwPageFrm* pPage = pFrame->FindPageFrm();
@@ -1072,7 +1072,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, const OUString& rURL,
                 pDoc->getIDocumentContentOperations().DeleteAndJoin(*pUnoCrsr);
 
             SwNodeIndex aSave(  pUnoCrsr->GetPoint()->nNode, -1 );
-            sal_Int32 nCntnt = pUnoCrsr->GetPoint()->nContent.GetIndex();
+            sal_Int32 nContent = pUnoCrsr->GetPoint()->nContent.GetIndex();
 
             sal_uInt32 nErrno = pRdr->Read( *pRead );   // and paste the document
 
@@ -1082,10 +1082,10 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, const OUString& rURL,
                 pUnoCrsr->SetMark();
                 pUnoCrsr->GetMark()->nNode = aSave;
 
-                SwCntntNode* pCntNode = aSave.GetNode().GetCntntNode();
+                SwContentNode* pCntNode = aSave.GetNode().GetContentNode();
                 if( !pCntNode )
-                    nCntnt = 0;
-                pUnoCrsr->GetMark()->nContent.Assign( pCntNode, nCntnt );
+                    nContent = 0;
+                pUnoCrsr->GetMark()->nContent.Assign( pCntNode, nContent );
             }
 
             delete pRdr;
@@ -1112,16 +1112,16 @@ bool DocInsertStringSplitCR(
 
     // grouping done in InsertString is intended for typing, not API calls
     ::sw::GroupUndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
-    SwTxtNode* const pTxtNd =
-        rNewCursor.GetPoint()->nNode.GetNode().GetTxtNode();
-    if (!pTxtNd)
+    SwTextNode* const pTextNd =
+        rNewCursor.GetPoint()->nNode.GetNode().GetTextNode();
+    if (!pTextNd)
     {
         SAL_INFO("sw.uno", "DocInsertStringSplitCR: need a text node");
         return false;
     }
-    OUString aTxt;
+    OUString aText;
     sal_Int32 nStartIdx = 0;
-    const sal_Int32 nMaxLength = COMPLETE_STRING - pTxtNd->GetTxt().getLength();
+    const sal_Int32 nMaxLength = COMPLETE_STRING - pTextNd->GetText().getLength();
 
     sal_Int32 nIdx = rText.indexOf( '\r', nStartIdx );
     if( ( nIdx == -1 && nMaxLength < rText.getLength() ) ||
@@ -1132,9 +1132,9 @@ bool DocInsertStringSplitCR(
     while (nIdx != -1 )
     {
         OSL_ENSURE( nIdx - nStartIdx >= 0, "index negative!" );
-        aTxt = rText.copy( nStartIdx, nIdx - nStartIdx );
-        if (!aTxt.isEmpty() &&
-            !rDoc.getIDocumentContentOperations().InsertString( rNewCursor, aTxt, nInsertFlags ))
+        aText = rText.copy( nStartIdx, nIdx - nStartIdx );
+        if (!aText.isEmpty() &&
+            !rDoc.getIDocumentContentOperations().InsertString( rNewCursor, aText, nInsertFlags ))
         {
             OSL_FAIL( "Doc->Insert(Str) failed." );
             bOK = false;
@@ -1147,9 +1147,9 @@ bool DocInsertStringSplitCR(
         nStartIdx = nIdx + 1;
         nIdx = rText.indexOf( '\r', nStartIdx );
     }
-    aTxt = rText.copy( nStartIdx );
-    if (!aTxt.isEmpty() &&
-        !rDoc.getIDocumentContentOperations().InsertString( rNewCursor, aTxt, nInsertFlags ))
+    aText = rText.copy( nStartIdx );
+    if (!aText.isEmpty() &&
+        !rDoc.getIDocumentContentOperations().InsertString( rNewCursor, aText, nInsertFlags ))
     {
         OSL_FAIL( "Doc->Insert(Str) failed." );
         bOK = false;
@@ -1290,7 +1290,7 @@ void makeTableRowRedline( SwTableLine& rTableLine,
     const uno::Sequence< beans::PropertyValue >& rRedlineProperties )
         throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
-    IDocumentRedlineAccess* pRedlineAccess = &rTableLine.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess();
+    IDocumentRedlineAccess* pRedlineAccess = &rTableLine.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess();
 
     RedlineType_t eType;
     if ( rRedlineType == "TableRowInsert" )
@@ -1347,7 +1347,7 @@ void makeTableCellRedline( SwTableBox& rTableBox,
     const uno::Sequence< beans::PropertyValue >& rRedlineProperties )
         throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
-    IDocumentRedlineAccess* pRedlineAccess = &rTableBox.GetFrmFmt()->GetDoc()->getIDocumentRedlineAccess();
+    IDocumentRedlineAccess* pRedlineAccess = &rTableBox.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess();
 
     RedlineType_t eType;
     if ( rRedlineType == "TableCellInsert" )
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 28e9d968b95e..7b0486537421 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -71,18 +71,18 @@ using namespace ::com::sun::star;
 
 class SwShapeDescriptor_Impl
 {
-    SwFmtHoriOrient*    pHOrient;
-    SwFmtVertOrient*    pVOrient;
-    SwFmtAnchor*        pAnchor;
-    SwFmtSurround*      pSurround;
+    SwFormatHoriOrient*    pHOrient;
+    SwFormatVertOrient*    pVOrient;
+    SwFormatAnchor*        pAnchor;
+    SwFormatSurround*      pSurround;
     SvxULSpaceItem*     pULSpace;
     SvxLRSpaceItem*     pLRSpace;
     bool            bOpaque;
     uno::Reference< text::XTextRange > xTextRange;
     // #i26791#
-    SwFmtFollowTextFlow* mpFollowTextFlow;
+    SwFormatFollowTextFlow* mpFollowTextFlow;
     // #i28701#
-    SwFmtWrapInfluenceOnObjPos* pWrapInfluenceOnObjPos;
+    SwFormatWrapInfluenceOnObjPos* pWrapInfluenceOnObjPos;
     // #i28749#
     sal_Int16 mnPositionLayoutDir;
 
@@ -101,9 +101,9 @@ public:
      pLRSpace(0),
      bOpaque(false),
      // #i26791#
-     mpFollowTextFlow( new SwFmtFollowTextFlow( false ) ),
+     mpFollowTextFlow( new SwFormatFollowTextFlow( false ) ),
      // #i28701# #i35017#
-     pWrapInfluenceOnObjPos( new SwFmtWrapInfluenceOnObjPos(
+     pWrapInfluenceOnObjPos( new SwFormatWrapInfluenceOnObjPos(
                             text::WrapInfluenceOnPosition::ONCE_CONCURRENT ) ),
      // #i28749#
      mnPositionLayoutDir( text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
@@ -123,37 +123,37 @@ public:
         // #i28701#
         delete pWrapInfluenceOnObjPos;
     }
-    SwFmtAnchor*    GetAnchor(bool bCreate = false)
+    SwFormatAnchor*    GetAnchor(bool bCreate = false)
         {
             if(bCreate && !pAnchor)
             {
-                pAnchor = new SwFmtAnchor(FLY_AS_CHAR);
+                pAnchor = new SwFormatAnchor(FLY_AS_CHAR);
             }
             return pAnchor;
         }
-    SwFmtHoriOrient* GetHOrient(bool bCreate = false)
+    SwFormatHoriOrient* GetHOrient(bool bCreate = false)
         {
             if (bCreate && !pHOrient)
             {
                 // #i26791#
-                pHOrient = new SwFmtHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::FRAME );
+                pHOrient = new SwFormatHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::FRAME );
             }
             return pHOrient;
         }
-    SwFmtVertOrient* GetVOrient(bool bCreate = false)
+    SwFormatVertOrient* GetVOrient(bool bCreate = false)
         {
             if(bCreate && !pVOrient)
             {
                 // #i26791#
-                pVOrient = new SwFmtVertOrient( 0, text::VertOrientation::NONE, text::RelOrientation::FRAME );
+                pVOrient = new SwFormatVertOrient( 0, text::VertOrientation::NONE, text::RelOrientation::FRAME );
             }
             return pVOrient;
         }
 
-    SwFmtSurround*  GetSurround(bool bCreate = false)
+    SwFormatSurround*  GetSurround(bool bCreate = false)
         {
             if(bCreate && !pSurround)
-                pSurround = new SwFmtSurround();
+                pSurround = new SwFormatSurround();
             return pSurround;
         }
     SvxLRSpaceItem* GetLRSpace(bool bCreate = false)
@@ -189,10 +189,10 @@ public:
     void SetOpaque(bool bSet){bOpaque = bSet;}
 
     // #i26791#
-    SwFmtFollowTextFlow* GetFollowTextFlow( bool _bCreate = false )
+    SwFormatFollowTextFlow* GetFollowTextFlow( bool _bCreate = false )
     {
         if ( _bCreate && !mpFollowTextFlow )
-            mpFollowTextFlow = new SwFmtFollowTextFlow( false );
+            mpFollowTextFlow = new SwFormatFollowTextFlow( false );
         return mpFollowTextFlow;
     }
     void RemoveFollowTextFlow()
@@ -223,12 +223,12 @@ public:
     }
 
     // #i28701#
-    inline SwFmtWrapInfluenceOnObjPos* GetWrapInfluenceOnObjPos(
+    inline SwFormatWrapInfluenceOnObjPos* GetWrapInfluenceOnObjPos(
                                         const bool _bCreate = false )
     {
         if ( _bCreate && !pWrapInfluenceOnObjPos )
         {
-            pWrapInfluenceOnObjPos = new SwFmtWrapInfluenceOnObjPos(
+            pWrapInfluenceOnObjPos = new SwFormatWrapInfluenceOnObjPos(
                         // #i35017#
                         text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
         }
@@ -282,8 +282,8 @@ uno::Reference< uno::XInterface >   SwFmDrawPage::GetInterface( SdrObject* pObj
     uno::Reference< XInterface >  xShape;
     if( pObj )
     {
-        SwFrmFmt* pFmt = ::FindFrmFmt( pObj );
-        SwXShape* pxShape = SwIterator<SwXShape,SwFmt>( *pFmt ).First();
+        SwFrameFormat* pFormat = ::FindFrameFormat( pObj );
+        SwXShape* pxShape = SwIterator<SwXShape,SwFormat>( *pFormat ).First();
         if(pxShape)
         {
             xShape =  *(cppu::OWeakObject*)pxShape;
@@ -310,29 +310,29 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj )
         SwFlyDrawContact* pFlyContact = static_cast<SwFlyDrawContact*>(pObj->GetUserCall());
         if(pFlyContact)
         {
-            SwFrmFmt* pFlyFmt = pFlyContact->GetFmt();
-            SwDoc* pDoc = pFlyFmt->GetDoc();
+            SwFrameFormat* pFlyFormat = pFlyContact->GetFormat();
+            SwDoc* pDoc = pFlyFormat->GetDoc();
             const SwNodeIndex* pIdx;
-            if( RES_FLYFRMFMT == pFlyFmt->Which()
-                && 0 != ( pIdx = pFlyFmt->GetCntnt().GetCntntIdx() )
+            if( RES_FLYFRMFMT == pFlyFormat->Which()
+                && 0 != ( pIdx = pFlyFormat->GetContent().GetContentIdx() )
                 && pIdx->GetNodes().IsDocNodes()
                 )
             {
                 const SwNode* pNd = pDoc->GetNodes()[ pIdx->GetIndex() + 1 ];
-                if(!pNd->IsNoTxtNode())
+                if(!pNd->IsNoTextNode())
                 {
-                    xRet.set(SwXTextFrame::CreateXTextFrame(*pDoc, pFlyFmt),
+                    xRet.set(SwXTextFrame::CreateXTextFrame(*pDoc, pFlyFormat),
                             uno::UNO_QUERY);
                 }
                 else if( pNd->IsGrfNode() )
                 {
                     xRet.set(SwXTextGraphicObject::CreateXTextGraphicObject(
-                                *pDoc, pFlyFmt), uno::UNO_QUERY);
+                                *pDoc, pFlyFormat), uno::UNO_QUERY);
                 }
                 else if( pNd->IsOLENode() )
                 {
                     xRet.set(SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
-                                *pDoc, pFlyFmt), uno::UNO_QUERY);
+                                *pDoc, pFlyFormat), uno::UNO_QUERY);
                 }
             }
             else
@@ -401,7 +401,7 @@ SwXShapesEnumeration::SwXShapesEnumeration(SwXDrawPage* const pDrawPage)
     SolarMutexGuard aGuard;
     ::std::insert_iterator<shapescontainer_t> pInserter = ::std::insert_iterator<shapescontainer_t>(m_aShapes, m_aShapes.begin());
     sal_Int32 nCount = pDrawPage->getCount();
-    std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDrawPage->GetDoc());
+    std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDrawPage->GetDoc());
     for(sal_Int32 nIdx = 0; nIdx < nCount; nIdx++)
     {
         uno::Reference<drawing::XShape> xShape = uno::Reference<drawing::XShape>(pDrawPage->getByIndex(nIdx, &aTextBoxes), uno::UNO_QUERY);
@@ -530,7 +530,7 @@ sal_Int32 SwXDrawPage::getCount() throw( uno::RuntimeException, std::exception )
     {
         static_cast<SwXDrawPage*>(this)->GetSvxPage();
 
-        std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+        std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
 
         if (aTextBoxes.empty())
             return pDrawPage->getCount();
@@ -546,7 +546,7 @@ uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex)
     return getByIndex(nIndex, 0);
 }
 
-uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex, std::set<const SwFrmFmt*>* pTextBoxes)
+uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex, std::set<const SwFrameFormat*>* pTextBoxes)
     throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
@@ -556,7 +556,7 @@ uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex, std::set<const SwFrmFmt*>* pT
         throw lang::IndexOutOfBoundsException();
 
     static_cast<SwXDrawPage*>(this)->GetSvxPage();
-    std::set<const SwFrmFmt*> aTextBoxes;
+    std::set<const SwFrameFormat*> aTextBoxes;
     if (!pTextBoxes)
     {
         // We got no set, so let's generate one.
@@ -632,7 +632,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
 
     SfxItemSet aSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
                                         RES_FRMATR_END-1 );
-    SwFmtAnchor aAnchor( FLY_AS_CHAR );
+    SwFormatAnchor aAnchor( FLY_AS_CHAR );
     bool bOpaque = false;
     if( pDesc )
     {
@@ -653,7 +653,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
         // #i32349# - if no horizontal position exists, create one
         if ( !pDesc->GetHOrient() )
         {
-            SwFmtHoriOrient* pHori = pDesc->GetHOrient( true );
+            SwFormatHoriOrient* pHori = pDesc->GetHOrient( true );
             SwTwips nHoriPos = convertMm100ToTwip(aMM100Pos.X);
             pHori->SetPos( nHoriPos );
         }
@@ -665,7 +665,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
         // #i32349# - if no vertical position exists, create one
         if ( !pDesc->GetVOrient() )
         {
-            SwFmtVertOrient* pVert = pDesc->GetVOrient( true );
+            SwFormatVertOrient* pVert = pDesc->GetVOrient( true );
             SwTwips nVertPos = convertMm100ToTwip(aMM100Pos.Y);
             pVert->SetPos( nVertPos );
         }
@@ -745,9 +745,9 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
         pTemp = pPam;
     UnoActionContext aAction(pDoc);
     pDoc->getIDocumentContentOperations().InsertDrawObj( *pTemp, *pObj, aSet );
-    SwFrmFmt* pFmt = ::FindFrmFmt( pObj );
-    if(pFmt)
-        pFmt->Add(pShape);
+    SwFrameFormat* pFormat = ::FindFrameFormat( pObj );
+    if(pFormat)
+        pFormat->Add(pShape);
     pShape->m_bDescriptor = false;
 
     delete pPam;
@@ -784,7 +784,7 @@ uno::Reference< drawing::XShapeGroup >  SwXDrawPage::group(const uno::Reference<
                 for ( size_t i = 0; !bFlyInCnt && i < rMarkList.GetMarkCount(); ++i )
                 {
                     const SdrObject *pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
-                    if (FLY_AS_CHAR == ::FindFrmFmt(const_cast<SdrObject*>(
+                    if (FLY_AS_CHAR == ::FindFrameFormat(const_cast<SdrObject*>(
                                             pObj))->GetAnchor().GetAnchorId())
                     {
                         bFlyInCnt = true;
@@ -961,9 +961,9 @@ SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) :
         SdrObject* pObj = pShape ? pShape->GetSdrObject() : 0;
         if(pObj)
         {
-            SwFrmFmt* pFmt = ::FindFrmFmt( pObj );
-            if(pFmt)
-                pFmt->Add(this);
+            SwFrameFormat* pFormat = ::FindFrameFormat( pObj );
+            if(pFormat)
+                pFormat->Add(this);
 
             lcl_addShapePropertyEventFactories( *pObj, *this );
             pImpl->bInitializedPropertyNotifier = true;
@@ -971,13 +971,13 @@ SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) :
     }
 }
 
-void SwXShape::AddExistingShapeToFmt( SdrObject& _rObj )
+void SwXShape::AddExistingShapeToFormat( SdrObject& _rObj )
 {
     SdrObjListIter aIter( _rObj, IM_DEEPNOGROUPS );
     while ( aIter.IsMore() )
     {
         SdrObject* pCurrent = aIter.Next();
-        OSL_ENSURE( pCurrent, "SwXShape::AddExistingShapeToFmt: invalid object list element!" );
+        OSL_ENSURE( pCurrent, "SwXShape::AddExistingShapeToFormat: invalid object list element!" );
         if ( !pCurrent )
             continue;
 
@@ -990,9 +990,9 @@ void SwXShape::AddExistingShapeToFmt( SdrObject& _rObj )
         {
             if ( pSwShape->m_bDescriptor )
             {
-                SwFrmFmt* pFmt = ::FindFrmFmt( const_cast< SdrObject* >( pCurrent ) );
-                if ( pFmt )
-                    pFmt->Add( pSwShape );
+                SwFrameFormat* pFormat = ::FindFrameFormat( const_cast< SdrObject* >( pCurrent ) );
+                if ( pFormat )
+                    pFormat->Add( pSwShape );
                 pSwShape->m_bDescriptor = false;
             }
 
@@ -1017,7 +1017,7 @@ SwXShape::~SwXShape()
 
 uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( uno::RuntimeException, std::exception )
 {
-    uno::Any aRet = SwTextBoxHelper::queryInterface(GetFrmFmt(), aType);
+    uno::Any aRet = SwTextBoxHelper::queryInterface(GetFrameFormat(), aType);
     if (aRet.hasValue())
         return aRet;
 
@@ -1093,7 +1093,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
             uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt*   pFmt = GetFrmFmt();
+    SwFrameFormat*   pFormat = GetFrameFormat();
     const SfxItemPropertySimpleEntry*  pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
     if(xShapeAgg.is())
     {
@@ -1102,10 +1102,10 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
             if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
                 throw beans::PropertyVetoException ("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
             // with the layout it is possible to move the anchor without changing the position
-            if(pFmt)
+            if(pFormat)
             {
-                SwAttrSet aSet(pFmt->GetAttrSet());
-                SwDoc* pDoc = pFmt->GetDoc();
+                SwAttrSet aSet(pFormat->GetAttrSet());
+                SwDoc* pDoc = pFormat->GetDoc();
                 if(RES_ANCHOR == pEntry->nWID && MID_ANCHOR_ANCHORFRAME == pEntry->nMemberId)
                 {
                     bool bDone = false;
@@ -1117,19 +1117,19 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                                 reinterpret_cast< SwXFrame * >(
                                     sal::static_int_cast< sal_IntPtr >( xTunnel->getSomething(SwXFrame::getUnoTunnelId()) ))
                                 : 0;
-                        if(pFrame && pFrame->GetFrmFmt() &&
-                            pFrame->GetFrmFmt()->GetDoc() == pDoc)
+                        if(pFrame && pFrame->GetFrameFormat() &&
+                            pFrame->GetFrameFormat()->GetDoc() == pDoc)
                         {
                             UnoActionContext aCtx(pDoc);
                             SfxItemSet aItemSet( pDoc->GetAttrPool(),
                                         RES_FRMATR_BEGIN, RES_FRMATR_END - 1 );
-                            aItemSet.SetParent(&pFmt->GetAttrSet());
-                            SwFmtAnchor aAnchor = static_cast<const SwFmtAnchor&>(aItemSet.Get(pEntry->nWID));
-                            SwPosition aPos(*pFrame->GetFrmFmt()->GetCntnt().GetCntntIdx());
+                            aItemSet.SetParent(&pFormat->GetAttrSet());
+                            SwFormatAnchor aAnchor = static_cast<const SwFormatAnchor&>(aItemSet.Get(pEntry->nWID));
+                            SwPosition aPos(*pFrame->GetFrameFormat()->GetContent().GetContentIdx());
                             aAnchor.SetAnchor(&aPos);
                             aAnchor.SetType(FLY_AT_FLY);
                             aItemSet.Put(aAnchor);
-                            pFmt->SetFmtAttr(aItemSet);
+                            pFormat->SetFormatAttr(aItemSet);
                             bDone = true;
                         }
                     }
@@ -1163,7 +1163,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                 // #i26791# - special handling for property FN_TEXT_RANGE
                 else if ( FN_TEXT_RANGE == pEntry->nWID )
                 {
-                    SwFmtAnchor aAnchor( static_cast<const SwFmtAnchor&>(aSet.Get( RES_ANCHOR )) );
+                    SwFormatAnchor aAnchor( static_cast<const SwFormatAnchor&>(aSet.Get( RES_ANCHOR )) );
                     if (aAnchor.GetAnchorId() == FLY_AT_PAGE)
                     {
                         // set property <TextRange> not valid for to-page anchored shapes
@@ -1172,45 +1172,45 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                     else
                     {
                         SwUnoInternalPaM* pInternalPam =
-                                        new SwUnoInternalPaM( *(pFmt->GetDoc()) );
+                                        new SwUnoInternalPaM( *(pFormat->GetDoc()) );
                         uno::Reference< text::XTextRange > xRg;
                         aValue >>= xRg;
                         if (::sw::XTextRangeToSwPaM(*pInternalPam, xRg) )
                         {
                             if (aAnchor.GetAnchorId() == FLY_AS_CHAR)
                             {
-                                //delete old SwFmtFlyCnt
-                                //With AnchorAsCharacter the current TxtAttribute has to be deleted.
+                                //delete old SwFormatFlyCnt
+                                //With AnchorAsCharacter the current TextAttribute has to be deleted.
                                 //Tbis removes the frame format too.
                                 //To prevent this the connection between format and attribute has to be broken before.
-                                const SwPosition *pPos = aAnchor.GetCntntAnchor();
-                                SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-                                SAL_WARN_IF( !pTxtNode->HasHints(), "sw.uno", "Missing FlyInCnt-Hint." );
+                                const SwPosition *pPos = aAnchor.GetContentAnchor();
+                                SwTextNode *pTextNode = pPos->nNode.GetNode().GetTextNode();
+                                SAL_WARN_IF( !pTextNode->HasHints(), "sw.uno", "Missing FlyInCnt-Hint." );
                                 const sal_Int32 nIdx = pPos->nContent.GetIndex();
-                                SwTxtAttr * const pHnt =
-                                    pTxtNode->GetTxtAttrForCharAt(
+                                SwTextAttr * const pHint =
+                                    pTextNode->GetTextAttrForCharAt(
                                         nIdx, RES_TXTATR_FLYCNT );
-                                SAL_WARN_IF( !pHnt || pHnt->Which() != RES_TXTATR_FLYCNT,
+                                SAL_WARN_IF( !pHint || pHint->Which() != RES_TXTATR_FLYCNT,
                                             "sw.uno", "Missing FlyInCnt-Hint." );
-                                SAL_WARN_IF( !pHnt || pHnt->GetFlyCnt().GetFrmFmt() != pFmt,
-                                            "sw.uno", "Wrong TxtFlyCnt-Hint." );
-                                const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt())
-                                    .SetFlyFmt();
+                                SAL_WARN_IF( !pHint || pHint->GetFlyCnt().GetFrameFormat() != pFormat,
+                                            "sw.uno", "Wrong TextFlyCnt-Hint." );
+                                const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt())
+                                    .SetFlyFormat();
 
                                 //The connection is removed now the attribute can be deleted.
-                                pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx );
+                                pTextNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx );
                                 //create a new one
-                                SwTxtNode *pNd = pInternalPam->GetNode().GetTxtNode();
-                                SAL_WARN_IF( !pNd, "sw.uno", "Cursor not at TxtNode." );
-                                SwFmtFlyCnt aFmt( pFmt );
-                                pNd->InsertItem(aFmt, pInternalPam->GetPoint()
+                                SwTextNode *pNd = pInternalPam->GetNode().GetTextNode();
+                                SAL_WARN_IF( !pNd, "sw.uno", "Cursor not at TextNode." );
+                                SwFormatFlyCnt aFormat( pFormat );
+                                pNd->InsertItem(aFormat, pInternalPam->GetPoint()
                                         ->nContent.GetIndex(), 0 );
                             }
                             else
                             {
                                 aAnchor.SetAnchor( pInternalPam->GetPoint() );
                                 aSet.Put(aAnchor);
-                                pFmt->SetFmtAttr(aSet);
+                                pFormat->SetFormatAttr(aSet);
                             }
                         }
                         else
@@ -1225,29 +1225,29 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                     bool bValue(false);
                     aValue >>= bValue;
                     if (bValue)
-                        SwTextBoxHelper::create(pFmt);
+                        SwTextBoxHelper::create(pFormat);
                     else
-                        SwTextBoxHelper::destroy(pFmt);
+                        SwTextBoxHelper::destroy(pFormat);
 
                 }
                 else if (pEntry->nWID == RES_CHAIN)
                 {
                     if (pEntry->nMemberId == MID_CHAIN_NEXTNAME || pEntry->nMemberId == MID_CHAIN_PREVNAME)
-                        SwTextBoxHelper::syncProperty(pFmt, pEntry->nWID, pEntry->nMemberId, aValue);
+                        SwTextBoxHelper::syncProperty(pFormat, pEntry->nWID, pEntry->nMemberId, aValue);
                 }
                 // #i28749#
                 else if ( FN_SHAPE_POSITION_LAYOUT_DIR == pEntry->nWID )
                 {
                     sal_Int16 nPositionLayoutDir = 0;
                     aValue >>= nPositionLayoutDir;
-                    pFmt->SetPositionLayoutDir( nPositionLayoutDir );
+                    pFormat->SetPositionLayoutDir( nPositionLayoutDir );
                 }
                 else if( pDoc->getIDocumentLayoutAccess().GetCurrentLayout())
                 {
                     UnoActionContext aCtx(pDoc);
                     if(RES_ANCHOR == pEntry->nWID && MID_ANCHOR_ANCHORTYPE == pEntry->nMemberId)
                     {
-                        SdrObject* pObj = pFmt->FindSdrObject();
+                        SdrObject* pObj = pFormat->FindSdrObject();
                         SdrMarkList aList;
                         SdrMark aMark(pObj);
                         aList.InsertEntry(aMark);
@@ -1259,7 +1259,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                     else
                     {
                         m_pPropSet->setPropertyValue(*pEntry, aValue, aSet);
-                        pFmt->SetFmtAttr(aSet);
+                        pFormat->SetFormatAttr(aSet);
                     }
                 }
                 else if( RES_FRM_SIZE == pEntry->nWID &&
@@ -1301,38 +1301,38 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                         sal_Int32 eNewAnchor = SWUnoHelper::GetEnumAsInt32( aValue );
 
                         //if old anchor was in_cntnt the related text attribute has to be removed
-                        const SwFmtAnchor& rOldAnchor = pFmt->GetAnchor();
+                        const SwFormatAnchor& rOldAnchor = pFormat->GetAnchor();
                         RndStdIds eOldAnchorId = rOldAnchor.GetAnchorId();
-                        SdrObject* pObj = pFmt->FindSdrObject();
-                        SwFrmFmt *pFlyFmt = FindFrmFmt( pObj );
-                        pFlyFmt->DelFrms();
+                        SdrObject* pObj = pFormat->FindSdrObject();
+                        SwFrameFormat *pFlyFormat = FindFrameFormat( pObj );
+                        pFlyFormat->DelFrms();
                         if( text::TextContentAnchorType_AS_CHARACTER != eNewAnchor &&
                             (FLY_AS_CHAR == eOldAnchorId))
                         {
-                            //With AnchorAsCharacter the current TxtAttribute has to be deleted.
+                            //With AnchorAsCharacter the current TextAttribute has to be deleted.
                             //Tbis removes the frame format too.
                             //To prevent this the connection between format and attribute has to be broken before.
-                            const SwPosition *pPos = rOldAnchor.GetCntntAnchor();
-                            SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-                            SAL_WARN_IF( !pTxtNode->HasHints(), "sw.uno", "Missing FlyInCnt-Hint." );
+                            const SwPosition *pPos = rOldAnchor.GetContentAnchor();
+                            SwTextNode *pTextNode = pPos->nNode.GetNode().GetTextNode();
+                            SAL_WARN_IF( !pTextNode->HasHints(), "sw.uno", "Missing FlyInCnt-Hint." );
                             const sal_Int32 nIdx = pPos->nContent.GetIndex();
-                            SwTxtAttr * const pHnt =
-                                pTxtNode->GetTxtAttrForCharAt(
+                            SwTextAttr * const pHint =
+                                pTextNode->GetTextAttrForCharAt(
                                     nIdx, RES_TXTATR_FLYCNT );
-                            SAL_WARN_IF( !pHnt || pHnt->Which() != RES_TXTATR_FLYCNT,
+                            SAL_WARN_IF( !pHint || pHint->Which() != RES_TXTATR_FLYCNT,
                                         "sw.uno", "Missing FlyInCnt-Hint." );
-                            SAL_WARN_IF( !pHnt || pHnt->GetFlyCnt().GetFrmFmt() != pFlyFmt,
-                                        "sw.uno", "Wrong TxtFlyCnt-Hint." );
-                            const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt())
-                                .SetFlyFmt();
+                            SAL_WARN_IF( !pHint || pHint->GetFlyCnt().GetFrameFormat() != pFlyFormat,
+                                        "sw.uno", "Wrong TextFlyCnt-Hint." );
+                            const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt())
+                                .SetFlyFormat();
 
                             //The connection is removed now the attribute can be deleted.
-                            pTxtNode->DeleteAttributes(RES_TXTATR_FLYCNT, nIdx);
+                            pTextNode->DeleteAttributes(RES_TXTATR_FLYCNT, nIdx);
                         }
                         else if( text::TextContentAnchorType_AT_PAGE != eNewAnchor &&
                                 (FLY_AT_PAGE == eOldAnchorId))
                         {
-                            SwFmtAnchor aNewAnchor( dynamic_cast< const SwFmtAnchor& >( aSet.Get( RES_ANCHOR ) ) );
+                            SwFormatAnchor aNewAnchor( dynamic_cast< const SwFormatAnchor& >( aSet.Get( RES_ANCHOR ) ) );
                             //if the fly has been anchored at page then it needs to be connected
                             //to the content position
                             SwPaM aPam(pDoc->GetNodes().GetEndOfContent());
@@ -1350,7 +1350,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                             //anchor position has to be inserted after the text attribute has been inserted
                             aNewAnchor.SetAnchor( aPam.GetPoint() );
                             aSet.Put( aNewAnchor );
-                            pFmt->SetFmtAttr(aSet);
+                            pFormat->SetFormatAttr(aSet);
                             bSetAttr = false;
                         }
                         if( text::TextContentAnchorType_AS_CHARACTER == eNewAnchor &&
@@ -1369,26 +1369,26 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                                 aPam.Move( fnMoveBackward, fnGoDoc );
                             }
                             //the RES_TXTATR_FLYCNT needs to be added now
-                            SwTxtNode *pNd = aPam.GetNode().GetTxtNode();
-                            SAL_WARN_IF( !pNd, "sw.uno", "Crsr is not in a TxtNode." );
-                            SwFmtFlyCnt aFmt( pFlyFmt );
-                            pNd->InsertItem(aFmt,
+                            SwTextNode *pNd = aPam.GetNode().GetTextNode();
+                            SAL_WARN_IF( !pNd, "sw.uno", "Crsr is not in a TextNode." );
+                            SwFormatFlyCnt aFormat( pFlyFormat );
+                            pNd->InsertItem(aFormat,
                                 aPam.GetPoint()->nContent.GetIndex(), 0 );
                             --aPam.GetPoint()->nContent; // InsertItem moved it
-                            SwFmtAnchor aNewAnchor(
-                                dynamic_cast<const SwFmtAnchor&>(
+                            SwFormatAnchor aNewAnchor(
+                                dynamic_cast<const SwFormatAnchor&>(
                                     aSet.Get(RES_ANCHOR)));
                             aNewAnchor.SetAnchor( aPam.GetPoint() );
                             aSet.Put( aNewAnchor );
                         }
                         if( bSetAttr )
-                            pFmt->SetFmtAttr(aSet);
+                            pFormat->SetFormatAttr(aSet);
                     }
                     else
-                        pFmt->SetFmtAttr(aSet);
+                        pFormat->SetFormatAttr(aSet);
                 }
-                // We have a pFmt and a pEntry as well: try to sync TextBox property.
-                SwTextBoxHelper::syncProperty(pFmt, pEntry->nWID, pEntry->nMemberId, aValue);
+                // We have a pFormat and a pEntry as well: try to sync TextBox property.
+                SwTextBoxHelper::syncProperty(pFormat, pEntry->nWID, pEntry->nMemberId, aValue);
             }
             else
             {
@@ -1470,18 +1470,18 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
             {
                     aKeepedPosition = getPosition();
             }
-            if( pFmt && pFmt->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
+            if( pFormat && pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
             {
-                UnoActionContext aCtx(pFmt->GetDoc());
+                UnoActionContext aCtx(pFormat->GetDoc());
                 xPrSet->setPropertyValue(rPropertyName, aValue);
             }
             else
                 xPrSet->setPropertyValue(rPropertyName, aValue);
 
-            if (pFmt)
+            if (pFormat)
             {
-                // We have a pFmt (but no pEntry): try to sync TextBox property.
-                SwTextBoxHelper::syncProperty(pFmt, rPropertyName, aValue);
+                // We have a pFormat (but no pEntry): try to sync TextBox property.
+                SwTextBoxHelper::syncProperty(pFormat, rPropertyName, aValue);
             }
 
             // #i31698# - restore object position, if caption point is set.
@@ -1499,13 +1499,13 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
-    SwFrmFmt*   pFmt = GetFrmFmt();
+    SwFrameFormat*   pFormat = GetFrameFormat();
     if(xShapeAgg.is())
     {
         const SfxItemPropertySimpleEntry*  pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
         if(pEntry)
         {
-            if(pFmt)
+            if(pFormat)
             {
                 if(RES_OPAQUE == pEntry->nWID)
                 {
@@ -1516,8 +1516,8 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
                         SdrObject* pObj = pSvxShape->GetSdrObject();
                         // consider invisible layers
                         aRet <<=
-                            ( pObj->GetLayer() != pFmt->GetDoc()->getIDocumentDrawModelAccess().GetHellId() &&
-                              pObj->GetLayer() != pFmt->GetDoc()->getIDocumentDrawModelAccess().GetInvisibleHellId() );
+                            ( pObj->GetLayer() != pFormat->GetDoc()->getIDocumentDrawModelAccess().GetHellId() &&
+                              pObj->GetLayer() != pFormat->GetDoc()->getIDocumentDrawModelAccess().GetInvisibleHellId() );
                     }
                 }
                 else if(FN_ANCHOR_POSITION == pEntry->nWID)
@@ -1536,7 +1536,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
                 // #i26791# - special handling for FN_TEXT_RANGE
                 else if ( FN_TEXT_RANGE == pEntry->nWID )
                 {
-                    const SwFmtAnchor aAnchor = pFmt->GetAnchor();
+                    const SwFormatAnchor aAnchor = pFormat->GetAnchor();
                     if (aAnchor.GetAnchorId() == FLY_AT_PAGE)
                     {
                         // return nothing, because property <TextRange> isn't
@@ -1546,12 +1546,12 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
                     }
                     else
                     {
-                        if ( aAnchor.GetCntntAnchor() )
+                        if ( aAnchor.GetContentAnchor() )
                         {
                             const uno::Reference< text::XTextRange > xTextRange
                                 = SwXTextRange::CreateXTextRange(
-                                                    *pFmt->GetDoc(),
-                                                    *aAnchor.GetCntntAnchor(),
+                                                    *pFormat->GetDoc(),
+                                                    *aAnchor.GetContentAnchor(),
                                                     0L );
                             aRet.setValue(&xTextRange, cppu::UnoType<text::XTextRange>::get());
                         }
@@ -1565,7 +1565,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
                 }
                 else if (pEntry->nWID == FN_TEXT_BOX)
                 {
-                    bool bValue = SwTextBoxHelper::findTextBox(pFmt);
+                    bool bValue = SwTextBoxHelper::findTextBox(pFormat);
                     aRet <<= bValue;
                 }
                 else if (pEntry->nWID == RES_CHAIN)
@@ -1575,7 +1575,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
                     case MID_CHAIN_PREVNAME:
                     case MID_CHAIN_NEXTNAME:
                     case MID_CHAIN_NAME:
-                        SwTextBoxHelper::getProperty(pFmt, pEntry->nWID, pEntry->nMemberId, aRet);
+                        SwTextBoxHelper::getProperty(pFormat, pEntry->nWID, pEntry->nMemberId, aRet);
                     break;
                     }
                 }
@@ -1588,7 +1588,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
                 }
                 else if ( FN_SHAPE_POSITION_LAYOUT_DIR == pEntry->nWID )
                 {
-                    aRet <<= pFmt->GetPositionLayoutDir();
+                    aRet <<= pFormat->GetPositionLayoutDir();
                 }
                 // #i36248#
                 else if ( FN_SHAPE_STARTPOSITION_IN_HORI_L2R == pEntry->nWID )
@@ -1637,7 +1637,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
                 }
                 else
                 {
-                    const SwAttrSet& rSet = pFmt->GetAttrSet();
+                    const SwAttrSet& rSet = pFormat->GetAttrSet();
                     m_pPropSet->getPropertyValue(*pEntry, rSet, aRet);
                 }
             }
@@ -1758,9 +1758,9 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
             else if (rPropertyName == "ZOrder")
             {
                 // Convert the real draw page position to the logical one that ignores textboxes.
-                if (pFmt)
+                if (pFormat)
                 {
-                    const SdrObject* pObj = pFmt->FindRealSdrObject();
+                    const SdrObject* pObj = pFormat->FindRealSdrObject();
                     if (pObj)
                     {
                         bool bConvert = true;
@@ -1771,7 +1771,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
                                 bConvert = false;
                         if (bConvert)
                         {
-                            std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pFmt->GetDoc());
+                            std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pFormat->GetDoc());
                             aRet <<= SwTextBoxHelper::getOrdNum(pObj, aTextBoxes);
                         }
                     }
@@ -1818,7 +1818,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates(
         throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt*   pFmt = GetFrmFmt();
+    SwFrameFormat*   pFormat = GetFrameFormat();
     uno::Sequence< beans::PropertyState > aRet(aPropertyNames.getLength());
     if(xShapeAgg.is())
     {
@@ -1855,14 +1855,14 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates(
                 else if (pEntry->nWID == FN_TEXT_BOX)
                 {
                     // The TextBox property is set, if we can find a textbox for this shape.
-                    if (pFmt && SwTextBoxHelper::findTextBox(pFmt))
+                    if (pFormat && SwTextBoxHelper::findTextBox(pFormat))
                         pRet[nProperty] = beans::PropertyState_DIRECT_VALUE;
                     else
                         pRet[nProperty] = beans::PropertyState_DEFAULT_VALUE;
                 }
-                else if(pFmt)
+                else if(pFormat)
                 {
-                    const SwAttrSet& rSet = pFmt->GetAttrSet();
+                    const SwAttrSet& rSet = pFormat->GetAttrSet();
                     SfxItemState eItemState = rSet.GetItemState(pEntry->nWID, false);
 
                     if(SfxItemState::SET == eItemState)
@@ -1931,7 +1931,7 @@ void SwXShape::setPropertyToDefault( const OUString& rPropertyName )
     throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt*   pFmt = GetFrmFmt();
+    SwFrameFormat*   pFormat = GetFrameFormat();
     if(xShapeAgg.is())
     {
         const SfxItemPropertySimpleEntry*  pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
@@ -1939,13 +1939,13 @@ void SwXShape::setPropertyToDefault( const OUString& rPropertyName )
         {
             if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
                 throw uno::RuntimeException("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
-            if(pFmt)
+            if(pFormat)
             {
-                const SfxItemSet& rSet = pFmt->GetAttrSet();
-                SfxItemSet aSet(pFmt->GetDoc()->GetAttrPool(), pEntry->nWID, pEntry->nWID);
+                const SfxItemSet& rSet = pFormat->GetAttrSet();
+                SfxItemSet aSet(pFormat->GetDoc()->GetAttrPool(), pEntry->nWID, pEntry->nWID);
                 aSet.SetParent(&rSet);
                 aSet.ClearItem(pEntry->nWID);
-                pFmt->GetDoc()->SetAttr(aSet, *pFmt);
+                pFormat->GetDoc()->SetAttr(aSet, *pFormat);
             }
             else
             {
@@ -1994,17 +1994,17 @@ uno::Any SwXShape::getPropertyDefault( const OUString& rPropertyName )
            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt*   pFmt = GetFrmFmt();
+    SwFrameFormat*   pFormat = GetFrameFormat();
     uno::Any aRet;
     if(xShapeAgg.is())
     {
         const SfxItemPropertySimpleEntry*  pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
         if(pEntry)
         {
-            if(pEntry->nWID < RES_FRMATR_END && pFmt)
+            if(pEntry->nWID < RES_FRMATR_END && pFormat)
             {
                 const SfxPoolItem& rDefItem =
-                    pFmt->GetDoc()->GetAttrPool().GetDefaultItem(pEntry->nWID);
+                    pFormat->GetDoc()->GetAttrPool().GetDefaultItem(pEntry->nWID);
                 rDefItem.QueryValue(aRet, pEntry->nMemberId);
             }
             else
@@ -2116,9 +2116,9 @@ void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange)
         {
             pDoc = pPortion->GetCursor()->GetDoc();
         }
-        else if ( !pDoc && pParagraph && pParagraph->GetTxtNode( ) )
+        else if ( !pDoc && pParagraph && pParagraph->GetTextNode( ) )
         {
-            pDoc = const_cast<SwDoc*>(pParagraph->GetTxtNode()->GetDoc());
+            pDoc = const_cast<SwDoc*>(pParagraph->GetTextNode()->GetDoc());
         }
 
     }
@@ -2150,17 +2150,17 @@ uno::Reference< text::XTextRange >  SwXShape::getAnchor() throw( uno::RuntimeExc
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextRange >  aRef;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
-        const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+        const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
         // return an anchor for non-page bound frames
         // and for page bound frames that have a page no == NULL and a content position
         if ((rAnchor.GetAnchorId() != FLY_AT_PAGE) ||
-            (rAnchor.GetCntntAnchor() && !rAnchor.GetPageNum()))
+            (rAnchor.GetContentAnchor() && !rAnchor.GetPageNum()))
         {
-            const SwPosition &rPos = *(pFmt->GetAnchor().GetCntntAnchor());
-            aRef = SwXTextRange::CreateXTextRange(*pFmt->GetDoc(), rPos, 0);
+            const SwPosition &rPos = *(pFormat->GetAnchor().GetContentAnchor());
+            aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(), rPos, 0);
         }
     }
     else
@@ -2171,20 +2171,20 @@ uno::Reference< text::XTextRange >  SwXShape::getAnchor() throw( uno::RuntimeExc
 void SwXShape::dispose() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
         // determine correct <SdrObject>
         SvxShape* pSvxShape = GetSvxShape();
         SdrObject* pObj = pSvxShape ? pSvxShape->GetSdrObject() : NULL;
         // safety assertion:
-        // <pObj> must be the same as <pFmt->FindSdrObject()>, if <pObj> isn't
+        // <pObj> must be the same as <pFormat->FindSdrObject()>, if <pObj> isn't
         // a 'virtual' drawing object.
         // correct assertion and refine it for safety reason.
         OSL_ENSURE( !pObj ||
                 pObj->ISA(SwDrawVirtObj) ||
                 pObj->GetUpGroup() ||
-                pObj == pFmt->FindSdrObject(),
+                pObj == pFormat->FindSdrObject(),
                 "<SwXShape::dispose(..) - different 'master' drawing objects!!" );
         // perform delete of draw frame format *not*
         // for 'virtual' drawing objects.
@@ -2195,15 +2195,15 @@ void SwXShape::dispose() throw( uno::RuntimeException, std::exception )
              !pObj->GetUpGroup() &&
              pObj->IsInserted() )
         {
-            if (pFmt->GetAnchor().GetAnchorId() == FLY_AS_CHAR)
+            if (pFormat->GetAnchor().GetAnchorId() == FLY_AS_CHAR)
             {
-                const SwPosition &rPos = *(pFmt->GetAnchor().GetCntntAnchor());
-                SwTxtNode *pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+                const SwPosition &rPos = *(pFormat->GetAnchor().GetContentAnchor());
+                SwTextNode *pTextNode = rPos.nNode.GetNode().GetTextNode();
                 const sal_Int32 nIdx = rPos.nContent.GetIndex();
-                pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx );
+                pTextNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx );
             }
             else
-                pFmt->GetDoc()->getIDocumentLayoutAccess().DelLayoutFmt( pFmt );
+                pFormat->GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat( pFormat );
         }
     }
     if(xShapeAgg.is())
@@ -2425,7 +2425,7 @@ void SAL_CALL SwXShape::setSize( const awt::Size& aSize )
     {
         mxShape->setSize( aSize );
     }
-    SwTextBoxHelper::syncProperty(GetFrmFmt(), RES_FRM_SIZE, MID_FRMSIZE_SIZE, uno::makeAny(aSize));
+    SwTextBoxHelper::syncProperty(GetFrameFormat(), RES_FRM_SIZE, MID_FRMSIZE_SIZE, uno::makeAny(aSize));
 }
 // #i31698#
 // implementation of virtual methods from drawing::XShapeDescriptor
@@ -2513,23 +2513,23 @@ awt::Point SwXShape::_ConvertPositionToHoriL2R( const awt::Point& rObjPos,
 {
     awt::Point aObjPosInHoriL2R( rObjPos );
 
-    SwFrmFmt* pFrmFmt = GetFrmFmt();
-    if ( pFrmFmt )
+    SwFrameFormat* pFrameFormat = GetFrameFormat();
+    if ( pFrameFormat )
     {
-        SwFrmFmt::tLayoutDir eLayoutDir = pFrmFmt->GetLayoutDir();
+        SwFrameFormat::tLayoutDir eLayoutDir = pFrameFormat->GetLayoutDir();
         switch ( eLayoutDir )
         {
-            case SwFrmFmt::HORI_L2R:
+            case SwFrameFormat::HORI_L2R:
             {
                 // nothing to do
             }
             break;
-            case SwFrmFmt::HORI_R2L:
+            case SwFrameFormat::HORI_R2L:
             {
                 aObjPosInHoriL2R.X = -rObjPos.X - rObjSize.Width;
             }
             break;
-            case SwFrmFmt::VERT_R2L:
+            case SwFrameFormat::VERT_R2L:
             {
                 aObjPosInHoriL2R.X = -rObjPos.Y - rObjSize.Width;
                 aObjPosInHoriL2R.Y = rObjPos.X;
@@ -2819,8 +2819,8 @@ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::Ru
 {
     SolarMutexGuard aGuard;
     SvxShape* pSvxShape = GetSvxShape();
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pSvxShape && pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pSvxShape && pFormat)
     {
         uno::Reference<XShapes> xShapes;
         if( xShapeAgg.is() )
@@ -2848,7 +2848,7 @@ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::Ru
                 SdrObject* pObj = pAddShape->GetSdrObject();
                 if(pObj)
                 {
-                    SwDoc* pDoc = pFmt->GetDoc();
+                    SwDoc* pDoc = pFormat->GetDoc();
                     // set layer of new drawing
                     // object to corresponding invisible layer.
                     if( FmFormInventor != pObj->GetObjInventor())
@@ -2865,9 +2865,9 @@ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::Ru
             }
             pSwShape->m_bDescriptor = false;
             //add the group member to the format of the group
-            SwFrmFmt* pShapeFmt = ::FindFrmFmt( pSvxShape->GetSdrObject() );
-            if(pShapeFmt)
-                pFmt->Add(pSwShape);
+            SwFrameFormat* pShapeFormat = ::FindFrameFormat( pSvxShape->GetSdrObject() );
+            if(pShapeFormat)
+                pFormat->Add(pSwShape);
         }
     }
     else
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index 6bb59ef44a5f..10845410a068 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -116,20 +116,20 @@ OUString SwHyperlinkEventDescriptor::getImplementationName()
     return sImplName;
 }
 
-void SwHyperlinkEventDescriptor::copyMacrosFromINetFmt(
-    const SwFmtINetFmt& aFmt)
+void SwHyperlinkEventDescriptor::copyMacrosFromINetFormat(
+    const SwFormatINetFormat& aFormat)
 {
     for(sal_uInt16 i = 0; mpSupportedMacroItems[i].mnEvent != 0; ++i)
     {
         const sal_uInt16 nEvent = mpSupportedMacroItems[i].mnEvent;
-        const SvxMacro* aMacro = aFmt.GetMacro(nEvent);
+        const SvxMacro* aMacro = aFormat.GetMacro(nEvent);
         if (NULL != aMacro)
             replaceByName(nEvent, *aMacro);
     }
 }
 
-void SwHyperlinkEventDescriptor::copyMacrosIntoINetFmt(
-    SwFmtINetFmt& aFmt)
+void SwHyperlinkEventDescriptor::copyMacrosIntoINetFormat(
+    SwFormatINetFormat& aFormat)
 {
     for(sal_uInt16 i = 0; mpSupportedMacroItems[i].mnEvent != 0; ++i)
     {
@@ -138,7 +138,7 @@ void SwHyperlinkEventDescriptor::copyMacrosIntoINetFmt(
         {
             SvxMacro aMacro(sEmpty, sEmpty);
             getByName(aMacro, nEvent);
-            aFmt.SetMacro(nEvent, aMacro);
+            aFormat.SetMacro(nEvent, aMacro);
         }
     }
 }
@@ -191,12 +191,12 @@ SwFrameEventDescriptor::~SwFrameEventDescriptor()
 
 void SwFrameEventDescriptor::setMacroItem(const SvxMacroItem& rItem)
 {
-    rFrame.GetFrmFmt()->SetFmtAttr(rItem);
+    rFrame.GetFrameFormat()->SetFormatAttr(rItem);
 }
 
 const SvxMacroItem& SwFrameEventDescriptor::getMacroItem()
 {
-    return static_cast<const SvxMacroItem&>(rFrame.GetFrmFmt()->GetFmtAttr(RES_FRMMACRO));
+    return static_cast<const SvxMacroItem&>(rFrame.GetFrameFormat()->GetFormatAttr(RES_FRMMACRO));
 }
 
 sal_uInt16 SwFrameEventDescriptor::getMacroItemWhich() const
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 23760adf7b3a..c99b9e222e82 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -200,21 +200,21 @@ static sal_uInt16 lcl_ServiceIdToResId(sal_uInt16 nServiceId)
     return pMap->nResId;
 }
 
-static sal_uInt16 lcl_GetServiceForField( const SwField& rFld )
+static sal_uInt16 lcl_GetServiceForField( const SwField& rField )
 {
-    const sal_uInt16 nWhich = rFld.Which();
+    const sal_uInt16 nWhich = rField.Which();
     sal_uInt16 nSrvId = USHRT_MAX;
     //special handling for some fields
     switch( nWhich )
     {
     case RES_INPUTFLD:
-        if( INP_USR == (rFld.GetSubType() & 0x00ff) )
+        if( INP_USR == (rField.GetSubType() & 0x00ff) )
             nSrvId = SW_SERVICE_FIELDTYPE_INPUT_USER;
         break;
 
     case RES_DOCINFOFLD:
         {
-            const sal_uInt16 nSubType = rFld.GetSubType();
+            const sal_uInt16 nSubType = rField.GetSubType();
             switch( (nSubType & 0xff))
             {
             case DI_CHANGE:
@@ -244,14 +244,14 @@ static sal_uInt16 lcl_GetServiceForField( const SwField& rFld )
         break;
 
     case RES_HIDDENTXTFLD:
-        nSrvId = TYP_CONDTXTFLD == rFld.GetSubType()
+        nSrvId = TYP_CONDTXTFLD == rField.GetSubType()
                         ? SW_SERVICE_FIELDTYPE_CONDITIONED_TEXT
                         : SW_SERVICE_FIELDTYPE_HIDDEN_TEXT;
         break;
 
     case RES_DOCSTATFLD:
         {
-            switch( rFld.GetSubType() )
+            switch( rField.GetSubType() )
             {
             case DS_PAGE: nSrvId = SW_SERVICE_FIELDTYPE_PAGE_COUNT; break;
             case DS_PARA: nSrvId = SW_SERVICE_FIELDTYPE_PARAGRAPH_COUNT; break;
@@ -583,7 +583,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFieldType* pType = GetFldType(true);
+    SwFieldType* pType = GetFieldType(true);
     if(pType)
     {
         bool bSetValue = true;
@@ -623,7 +623,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                 if ( pType->Which() == RES_USERFLD )
                 {
                     // trigger update of User field in order to get depending Input Fields updated.
-                    pType->UpdateFlds();
+                    pType->UpdateFields();
                 }
             }
             else
@@ -638,7 +638,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
     {
         OUString sTypeName;
         rValue >>= sTypeName;
-        SwFieldType * pType2 = m_pImpl->m_pDoc->getIDocumentFieldsAccess().GetFldType(
+        SwFieldType * pType2 = m_pImpl->m_pDoc->getIDocumentFieldsAccess().GetFieldType(
                 m_pImpl->m_nResTypeId, sTypeName, false);
 
         if(pType2 ||
@@ -656,7 +656,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             case RES_USERFLD :
             {
                 SwUserFieldType aType(m_pImpl->m_pDoc, sTypeName);
-                pType2 = m_pImpl->m_pDoc->getIDocumentFieldsAccess().InsertFldType(aType);
+                pType2 = m_pImpl->m_pDoc->getIDocumentFieldsAccess().InsertFieldType(aType);
                 static_cast<SwUserFieldType*>(pType2)->SetContent(m_pImpl->m_sParam1);
                 static_cast<SwUserFieldType*>(pType2)->SetValue(m_pImpl->m_fParam1);
                 static_cast<SwUserFieldType*>(pType2)->SetType(m_pImpl->m_bParam1
@@ -667,7 +667,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             {
                 SwDDEFieldType aType(sTypeName, m_pImpl->m_sParam1,
                     m_pImpl->m_bParam1 ? SfxLinkUpdateMode::ALWAYS : SfxLinkUpdateMode::ONCALL);
-                pType2 = m_pImpl->m_pDoc->getIDocumentFieldsAccess().InsertFldType(aType);
+                pType2 = m_pImpl->m_pDoc->getIDocumentFieldsAccess().InsertFieldType(aType);
             }
             break;
             case RES_SETEXPFLD :
@@ -677,13 +677,13 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                     aType.SetDelimiter(OUString(m_pImpl->m_sParam1[0]));
                 if (m_pImpl->m_nParam1 > -1 && m_pImpl->m_nParam1 < MAXLEVEL)
                     aType.SetOutlineLvl(m_pImpl->m_nParam1);
-                pType2 = m_pImpl->m_pDoc->getIDocumentFieldsAccess().InsertFldType(aType);
+                pType2 = m_pImpl->m_pDoc->getIDocumentFieldsAccess().InsertFieldType(aType);
             }
             break;
             case RES_DBFLD :
             {
                 rValue >>= m_pImpl->m_sParam3;
-                pType2 = GetFldType();
+                pType2 = GetFieldType();
             }
             break;
         }
@@ -732,7 +732,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                 && !m_pImpl->m_sParam2.isEmpty()
                 && !m_pImpl->m_sParam3.isEmpty())
             {
-                GetFldType();
+                GetFieldType();
             }
             break;
         case  RES_SETEXPFLD:
@@ -782,7 +782,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
     }
 }
 
-SwFieldType* SwXFieldMaster::GetFldType(bool const bDontCreate) const
+SwFieldType* SwXFieldMaster::GetFieldType(bool const bDontCreate) const
 {
 #if !HAVE_FEATURE_DBCONNECTIVITY
     (void) bDontCreate;
@@ -803,7 +803,7 @@ SwFieldType* SwXFieldMaster::GetFldType(bool const bDontCreate) const
         aData.sCommand = m_pImpl->m_sParam2;
         aData.nCommandType = m_pImpl->m_nParam2;
         SwDBFieldType aType(m_pImpl->m_pDoc, m_pImpl->m_sParam3, aData);
-        SwFieldType *const pType = m_pImpl->m_pDoc->getIDocumentFieldsAccess().InsertFldType(aType);
+        SwFieldType *const pType = m_pImpl->m_pDoc->getIDocumentFieldsAccess().InsertFieldType(aType);
         pType->Add(m_pImpl.get());
         const_cast<SwXFieldMaster*>(this)->m_pImpl->m_bIsDescriptor = false;
     }
@@ -814,7 +814,7 @@ SwFieldType* SwXFieldMaster::GetFldType(bool const bDontCreate) const
         return static_cast<SwFieldType*>(const_cast<SwModify*>(m_pImpl->GetRegisteredIn()));
 }
 
-typedef std::vector<SwFmtFld*> SwDependentFields;
+typedef std::vector<SwFormatField*> SwDependentFields;
 
 uno::Any SAL_CALL
 SwXFieldMaster::getPropertyValue(const OUString& rPropertyName)
@@ -823,7 +823,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
-    SwFieldType* pType = GetFldType(true);
+    SwFieldType* pType = GetFieldType(true);
     if( rPropertyName == UNO_NAME_INSTANCE_NAME )
     {
         OUString sName;
@@ -840,23 +840,23 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
         else if(rPropertyName == UNO_NAME_DEPENDENT_TEXT_FIELDS)
         {
             //fill all text fields into a sequence
-            SwDependentFields aFldArr;
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-            SwFmtFld* pFld = aIter.First();
-            while(pFld)
+            SwDependentFields aFieldArr;
+            SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+            SwFormatField* pField = aIter.First();
+            while(pField)
             {
-                if(pFld->IsFldInDoc())
-                    aFldArr.push_back(pFld);
-                pFld = aIter.Next();
+                if(pField->IsFieldInDoc())
+                    aFieldArr.push_back(pField);
+                pField = aIter.Next();
             }
 
-            uno::Sequence<uno::Reference <text::XDependentTextField> > aRetSeq(aFldArr.size());
+            uno::Sequence<uno::Reference <text::XDependentTextField> > aRetSeq(aFieldArr.size());
             uno::Reference<text::XDependentTextField>* pRetSeq = aRetSeq.getArray();
-            for(size_t i = 0; i < aFldArr.size(); ++i)
+            for(size_t i = 0; i < aFieldArr.size(); ++i)
             {
-                pFld = aFldArr[i];
+                pField = aFieldArr[i];
                 uno::Reference<text::XTextField> const xField =
-                    SwXTextField::CreateXTextField(m_pImpl->m_pDoc, pFld);
+                    SwXTextField::CreateXTextField(m_pImpl->m_pDoc, pField);
 
                 pRetSeq[i] = uno::Reference<text::XDependentTextField>(xField,
                         uno::UNO_QUERY);
@@ -983,31 +983,31 @@ void SAL_CALL SwXFieldMaster::dispose()
 throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFieldType *const pFldType = GetFldType(true);
-    if (!pFldType)
+    SwFieldType *const pFieldType = GetFieldType(true);
+    if (!pFieldType)
         throw uno::RuntimeException();
     sal_uInt16 nTypeIdx = USHRT_MAX;
-    const SwFldTypes* pTypes = m_pImpl->m_pDoc->getIDocumentFieldsAccess().GetFldTypes();
+    const SwFieldTypes* pTypes = m_pImpl->m_pDoc->getIDocumentFieldsAccess().GetFieldTypes();
     for( size_t i = 0; i < pTypes->size(); i++ )
     {
-        if((*pTypes)[i] == pFldType)
+        if((*pTypes)[i] == pFieldType)
             nTypeIdx = i;
     }
 
     // first delete all fields
-    SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
-    SwFmtFld* pFld = aIter.First();
-    while(pFld)
+    SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+    SwFormatField* pField = aIter.First();
+    while(pField)
     {
-        SwTxtFld *pTxtFld = pFld->GetTxtFld();
-        if(pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+        SwTextField *pTextField = pField->GetTextField();
+        if(pTextField && pTextField->GetTextNode().GetNodes().IsDocNodes() )
         {
-            SwTxtFld::DeleteTxtFld(*pTxtFld);
+            SwTextField::DeleteTextField(*pTextField);
         }
-        pFld = aIter.Next();
+        pField = aIter.Next();
     }
     // then delete FieldType
-    m_pImpl->m_pDoc->getIDocumentFieldsAccess().RemoveFldType(nTypeIdx);
+    m_pImpl->m_pDoc->getIDocumentFieldsAccess().RemoveFieldType(nTypeIdx);
 }
 
 void SAL_CALL SwXFieldMaster::addEventListener(
@@ -1050,7 +1050,7 @@ OUString SwXFieldMaster::GetProgrammaticName(const SwFieldType& rType, SwDoc& rD
     const OUString sName(rType.GetName());
     if(RES_SETEXPFLD == rType.Which())
     {
-        const SwFldTypes* pTypes = rDoc.getIDocumentFieldsAccess().GetFldTypes();
+        const SwFieldTypes* pTypes = rDoc.getIDocumentFieldsAccess().GetFieldTypes();
         for( size_t i = 0; i <= size_t(INIT_FLDTYPES); i++ )
         {
             if((*pTypes)[i] == &rType)
@@ -1063,11 +1063,11 @@ OUString SwXFieldMaster::GetProgrammaticName(const SwFieldType& rType, SwDoc& rD
 }
 
 OUString SwXFieldMaster::LocalizeFormula(
-    const SwSetExpField& rFld,
+    const SwSetExpField& rField,
     const OUString& rFormula,
     bool bQuery)
 {
-    const OUString sTypeName(rFld.GetTyp()->GetName());
+    const OUString sTypeName(rField.GetTyp()->GetName());
     const OUString sProgName(
         SwStyleNameMapper::GetProgName(sTypeName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL ));
     if(sProgName != sTypeName)
@@ -1139,7 +1139,7 @@ public:
     uno::WeakReference<uno::XInterface> m_wThis;
     ::cppu::OInterfaceContainerHelper m_EventListeners;
 
-    SwFmtFld const*     m_pFmtFld;
+    SwFormatField const*     m_pFormatField;
     SwDoc *             m_pDoc;
     SwTextAPIObject *   m_pTextObject;
 
@@ -1151,19 +1151,19 @@ public:
     OUString            m_sTypeName;
     boost::scoped_ptr<SwFieldProperties_Impl> m_pProps;
 
-    Impl(SwDoc *const pDoc, SwFmtFld *const pFmt,
+    Impl(SwDoc *const pDoc, SwFormatField *const pFormat,
             sal_uInt16 const nServiceId)
-        : SwClient(pFmt)
+        : SwClient(pFormat)
         , m_EventListeners(m_Mutex)
-        , m_pFmtFld(pFmt)
+        , m_pFormatField(pFormat)
         , m_pDoc(pDoc)
         , m_pTextObject(0)
-        , m_bIsDescriptor(pFmt == 0)
+        , m_bIsDescriptor(pFormat == 0)
         , m_bCallUpdate(false)
-        , m_nServiceId((pFmt)
-                ? lcl_GetServiceForField(*pFmt->GetField())
+        , m_nServiceId((pFormat)
+                ? lcl_GetServiceForField(*pFormat->GetField())
                 : nServiceId)
-        , m_pProps((pFmt) ? 0 : new SwFieldProperties_Impl)
+        , m_pProps((pFormat) ? 0 : new SwFieldProperties_Impl)
     { }
 
     virtual ~Impl()
@@ -1224,8 +1224,8 @@ SwXTextField::SwXTextField(
     }
 }
 
-SwXTextField::SwXTextField(SwFmtFld& rFmt, SwDoc & rDoc)
-    : m_pImpl(new Impl(&rDoc, &rFmt, USHRT_MAX))
+SwXTextField::SwXTextField(SwFormatField& rFormat, SwDoc & rDoc)
+    : m_pImpl(new Impl(&rDoc, &rFormat, USHRT_MAX))
 {
 }
 
@@ -1234,26 +1234,26 @@ SwXTextField::~SwXTextField()
 }
 
 uno::Reference<text::XTextField>
-SwXTextField::CreateXTextField(SwDoc *const pDoc, SwFmtFld const* pFmt,
+SwXTextField::CreateXTextField(SwDoc *const pDoc, SwFormatField const* pFormat,
         sal_uInt16 const nServiceId)
 {
-    assert(!pFmt || pDoc);
-    assert(pFmt || nServiceId != 0xFFFF);
+    assert(!pFormat || pDoc);
+    assert(pFormat || nServiceId != 0xFFFF);
     // re-use existing SwXTextField
     uno::Reference<text::XTextField> xField;
-    if (pFmt)
+    if (pFormat)
     {
-        xField = pFmt->GetXTextField();
+        xField = pFormat->GetXTextField();
     }
     if (!xField.is())
     {
-        SwXTextField *const pField( (pFmt)
-                ? new SwXTextField(const_cast<SwFmtFld&>(*pFmt), *pDoc)
+        SwXTextField *const pField( (pFormat)
+                ? new SwXTextField(const_cast<SwFormatField&>(*pFormat), *pDoc)
                 : new SwXTextField(nServiceId, pDoc));
         xField.set(pField);
-        if (pFmt)
+        if (pFormat)
         {
-            const_cast<SwFmtFld *>(pFmt)->SetXTextField(xField);
+            const_cast<SwFormatField *>(pFormat)->SetXTextField(xField);
         }
         // need a permanent Reference to initialize m_wThis
         pField->m_pImpl->m_wThis = xField;
@@ -1280,7 +1280,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     SwXFieldMaster* pMaster = reinterpret_cast< SwXFieldMaster * >(
             sal::static_int_cast< sal_IntPtr >( xMasterTunnel->getSomething( SwXFieldMaster::getUnoTunnelId()) ));
 
-    SwFieldType* pFieldType = pMaster ? pMaster->GetFldType() : 0;
+    SwFieldType* pFieldType = pMaster ? pMaster->GetFieldType() : 0;
     if (!pFieldType ||
         pFieldType->Which() != lcl_ServiceIdToResId(m_pImpl->m_nServiceId))
     {
@@ -1304,7 +1304,7 @@ SwXTextField::getTextFieldMaster() throw (uno::RuntimeException, std::exception)
     {
         if (!m_pImpl->GetRegisteredIn())
             throw uno::RuntimeException();
-        pType = m_pImpl->m_pFmtFld->GetField()->GetTyp();
+        pType = m_pImpl->m_pFormatField->GetField()->GetTyp();
     }
 
     uno::Reference<beans::XPropertySet> const xRet(
@@ -1352,12 +1352,12 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     SwUnoInternalPaM aPam(*pDoc);
     // this now needs to return TRUE
     ::sw::XTextRangeToSwPaM(aPam, xTextRange);
-    SwField* pFld = 0;
+    SwField* pField = 0;
     switch (m_pImpl->m_nServiceId)
     {
         case SW_SERVICE_FIELDTYPE_ANNOTATION:
             {
-                SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD);
+                SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_POSTITFLD);
 
                 DateTime aDateTime( DateTime::EMPTY );
                 if (m_pImpl->m_pProps->pDateTime)
@@ -1370,7 +1370,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                     aDateTime.SetSec(m_pImpl->m_pProps->pDateTime->Seconds);
                 }
                 SwPostItField* pPostItField = new SwPostItField(
-                    static_cast<SwPostItFieldType*>(pFldType),
+                    static_cast<SwPostItFieldType*>(pFieldType),
                     m_pImpl->m_pProps->sPar1, // author
                     m_pImpl->m_pProps->sPar2, // content
                     m_pImpl->m_pProps->sPar3, // author's initials
@@ -1381,13 +1381,13 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                     pPostItField->SetTextObject( m_pImpl->m_pTextObject->CreateText() );
                     pPostItField->SetPar2(m_pImpl->m_pTextObject->GetText());
                 }
-                pFld = pPostItField;
+                pField = pPostItField;
             }
             break;
         case SW_SERVICE_FIELDTYPE_SCRIPT:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_SCRIPTFLD);
-            pFld = new SwScriptField(static_cast<SwScriptFieldType*>(pFldType),
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_SCRIPTFLD);
+            pField = new SwScriptField(static_cast<SwScriptFieldType*>(pFieldType),
                     m_pImpl->m_pProps->sPar1, m_pImpl->m_pProps->sPar2,
                     m_pImpl->m_pProps->bBool1);
         }
@@ -1401,11 +1401,11 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                 nSub |= DATEFLD;
             else
                 nSub |= TIMEFLD;
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_DATETIMEFLD);
             SwDateTimeField *const pDTField = new SwDateTimeField(
-                    static_cast<SwDateTimeFieldType*>(pFldType),
+                    static_cast<SwDateTimeFieldType*>(pFieldType),
                         nSub, m_pImpl->m_pProps->nFormat);
-            pFld = pDTField;
+            pField = pDTField;
             if (m_pImpl->m_pProps->fDouble > 0.)
             {
                 pDTField->SetValue(m_pImpl->m_pProps->fDouble);
@@ -1413,48 +1413,48 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             if (m_pImpl->m_pProps->pDateTime)
             {
                 uno::Any aVal; aVal <<= *m_pImpl->m_pProps->pDateTime;
-                pFld->PutValue( aVal, FIELD_PROP_DATE_TIME );
+                pField->PutValue( aVal, FIELD_PROP_DATE_TIME );
             }
             pDTField->SetOffset(m_pImpl->m_pProps->nSubType);
         }
         break;
         case SW_SERVICE_FIELDTYPE_FILE_NAME:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_FILENAMEFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_FILENAMEFLD);
             sal_Int32 nFormat = m_pImpl->m_pProps->nFormat;
             if (m_pImpl->m_pProps->bBool2)
                 nFormat |= FF_FIXED;
             SwFileNameField *const pFNField = new SwFileNameField(
-                    static_cast<SwFileNameFieldType*>(pFldType), nFormat);
-            pFld = pFNField;
+                    static_cast<SwFileNameFieldType*>(pFieldType), nFormat);
+            pField = pFNField;
             if (!m_pImpl->m_pProps->sPar3.isEmpty())
                 pFNField->SetExpansion(m_pImpl->m_pProps->sPar3);
             uno::Any aFormat;
             aFormat <<= m_pImpl->m_pProps->nFormat;
-            pFld->PutValue( aFormat, FIELD_PROP_FORMAT );
+            pField->PutValue( aFormat, FIELD_PROP_FORMAT );
         }
         break;
         case SW_SERVICE_FIELDTYPE_TEMPLATE_NAME:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_TEMPLNAMEFLD);
-            pFld = new SwTemplNameField(static_cast<SwTemplNameFieldType*>(pFldType),
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_TEMPLNAMEFLD);
+            pField = new SwTemplNameField(static_cast<SwTemplNameFieldType*>(pFieldType),
                                         m_pImpl->m_pProps->nFormat);
             uno::Any aFormat;
             aFormat <<= m_pImpl->m_pProps->nFormat;
-            pFld->PutValue(aFormat, FIELD_PROP_FORMAT);
+            pField->PutValue(aFormat, FIELD_PROP_FORMAT);
         }
         break;
         case SW_SERVICE_FIELDTYPE_CHAPTER:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_CHAPTERFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_CHAPTERFLD);
             SwChapterField *const pChapterField = new SwChapterField(
-                    static_cast<SwChapterFieldType*>(pFldType),
+                    static_cast<SwChapterFieldType*>(pFieldType),
                     m_pImpl->m_pProps->nUSHORT1);
-            pFld = pChapterField;
+            pField = pChapterField;
             pChapterField->SetLevel(m_pImpl->m_pProps->nByte1);
             uno::Any aVal;
             aVal <<= static_cast<sal_Int16>(m_pImpl->m_pProps->nUSHORT1);
-            pFld->PutValue(aVal, FIELD_PROP_USHORT1 );
+            pField->PutValue(aVal, FIELD_PROP_USHORT1 );
         }
         break;
         case SW_SERVICE_FIELDTYPE_AUTHOR:
@@ -1463,63 +1463,63 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             if (m_pImpl->m_pProps->bBool2)
                 nFormat |= AF_FIXED;
 
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_AUTHORFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_AUTHORFLD);
             SwAuthorField *const pAuthorField = new SwAuthorField(
-                    static_cast<SwAuthorFieldType*>(pFldType), nFormat);
-            pFld = pAuthorField;
+                    static_cast<SwAuthorFieldType*>(pFieldType), nFormat);
+            pField = pAuthorField;
             pAuthorField->SetExpansion(m_pImpl->m_pProps->sPar1);
         }
         break;
         case SW_SERVICE_FIELDTYPE_CONDITIONED_TEXT:
         case SW_SERVICE_FIELDTYPE_HIDDEN_TEXT:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_HIDDENTXTFLD);
-            SwHiddenTxtField *const pHTField = new SwHiddenTxtField(
-                    static_cast<SwHiddenTxtFieldType*>(pFldType),
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_HIDDENTXTFLD);
+            SwHiddenTextField *const pHTField = new SwHiddenTextField(
+                    static_cast<SwHiddenTextFieldType*>(pFieldType),
                     m_pImpl->m_pProps->sPar1,
                     m_pImpl->m_pProps->sPar2, m_pImpl->m_pProps->sPar3,
                     static_cast<sal_uInt16>(SW_SERVICE_FIELDTYPE_HIDDEN_TEXT == m_pImpl->m_nServiceId ?
                          TYP_HIDDENTXTFLD : TYP_CONDTXTFLD));
-            pFld = pHTField;
+            pField = pHTField;
             pHTField->SetValue(m_pImpl->m_pProps->bBool1);
             uno::Any aVal;
             aVal <<= m_pImpl->m_pProps->sPar4;
-            pFld->PutValue(aVal, FIELD_PROP_PAR4 );
+            pField->PutValue(aVal, FIELD_PROP_PAR4 );
         }
         break;
         case SW_SERVICE_FIELDTYPE_HIDDEN_PARA:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_HIDDENPARAFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_HIDDENPARAFLD);
             SwHiddenParaField *const pHPField = new SwHiddenParaField(
-                    static_cast<SwHiddenParaFieldType*>(pFldType),
+                    static_cast<SwHiddenParaFieldType*>(pFieldType),
                     m_pImpl->m_pProps->sPar1);
-            pFld = pHPField;
+            pField = pHPField;
             pHPField->SetHidden(m_pImpl->m_pProps->bBool1);
         }
         break;
         case SW_SERVICE_FIELDTYPE_GET_REFERENCE:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_GETREFFLD);
-            pFld = new SwGetRefField(static_cast<SwGetRefFieldType*>(pFldType),
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_GETREFFLD);
+            pField = new SwGetRefField(static_cast<SwGetRefFieldType*>(pFieldType),
                         m_pImpl->m_pProps->sPar1,
                         0,
                         0,
                         0);
             if (!m_pImpl->m_pProps->sPar3.isEmpty())
-                static_cast<SwGetRefField*>(pFld)->SetExpand(m_pImpl->m_pProps->sPar3);
+                static_cast<SwGetRefField*>(pField)->SetExpand(m_pImpl->m_pProps->sPar3);
             uno::Any aVal;
             aVal <<= static_cast<sal_Int16>(m_pImpl->m_pProps->nUSHORT1);
-            pFld->PutValue(aVal, FIELD_PROP_USHORT1 );
+            pField->PutValue(aVal, FIELD_PROP_USHORT1 );
             aVal <<= static_cast<sal_Int16>(m_pImpl->m_pProps->nUSHORT2);
-            pFld->PutValue(aVal, FIELD_PROP_USHORT2 );
+            pField->PutValue(aVal, FIELD_PROP_USHORT2 );
             aVal <<= m_pImpl->m_pProps->nSHORT1;
-            pFld->PutValue(aVal, FIELD_PROP_SHORT1 );
+            pField->PutValue(aVal, FIELD_PROP_SHORT1 );
         }
         break;
         case SW_SERVICE_FIELDTYPE_JUMP_EDIT:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_JUMPEDITFLD);
-            pFld = new SwJumpEditField(static_cast<SwJumpEditFieldType*>(pFldType),
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_JUMPEDITFLD);
+            pField = new SwJumpEditField(static_cast<SwJumpEditFieldType*>(pFieldType),
                     m_pImpl->m_pProps->nUSHORT1, m_pImpl->m_pProps->sPar2,
                     m_pImpl->m_pProps->sPar1);
         }
@@ -1539,7 +1539,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         case SW_SERVICE_FIELDTYPE_DOCINFO_REVISION          :
         case SW_SERVICE_FIELDTYPE_DOC_INFO:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_DOCINFOFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_DOCINFOFLD);
             sal_uInt16 nSubType = aDocInfoSubTypeFromService[
                     m_pImpl->m_nServiceId - SW_SERVICE_FIELDTYPE_DOCINFO_CHANGE_AUTHOR];
             if (SW_SERVICE_FIELDTYPE_DOCINFO_CHANGE_DATE_TIME == m_pImpl->m_nServiceId ||
@@ -1560,11 +1560,11 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             }
             if (m_pImpl->m_pProps->bBool1)
                 nSubType |= DI_SUB_FIXED;
-            pFld = new SwDocInfoField(
-                    static_cast<SwDocInfoFieldType*>(pFldType), nSubType,
+            pField = new SwDocInfoField(
+                    static_cast<SwDocInfoFieldType*>(pFieldType), nSubType,
                     m_pImpl->m_pProps->sPar4, m_pImpl->m_pProps->nFormat);
             if (!m_pImpl->m_pProps->sPar3.isEmpty())
-                static_cast<SwDocInfoField*>(pFld)->SetExpansion(m_pImpl->m_pProps->sPar3);
+                static_cast<SwDocInfoField*>(pField)->SetExpansion(m_pImpl->m_pProps->sPar3);
         }
         break;
         case SW_SERVICE_FIELDTYPE_USER_EXT:
@@ -1573,90 +1573,90 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             if (m_pImpl->m_pProps->bBool1)
                 nFormat = AF_FIXED;
 
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_EXTUSERFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_EXTUSERFLD);
             SwExtUserField *const pEUField = new SwExtUserField(
-                static_cast<SwExtUserFieldType*>(pFldType),
+                static_cast<SwExtUserFieldType*>(pFieldType),
                 m_pImpl->m_pProps->nUSHORT1, nFormat);
-            pFld = pEUField;
+            pField = pEUField;
             pEUField->SetExpansion(m_pImpl->m_pProps->sPar1);
         }
         break;
         case SW_SERVICE_FIELDTYPE_USER:
         {
-            SwFieldType* pFldType =
-                pDoc->getIDocumentFieldsAccess().GetFldType(RES_USERFLD, m_pImpl->m_sTypeName, true);
-            if (!pFldType)
+            SwFieldType* pFieldType =
+                pDoc->getIDocumentFieldsAccess().GetFieldType(RES_USERFLD, m_pImpl->m_sTypeName, true);
+            if (!pFieldType)
                 throw uno::RuntimeException();
             sal_uInt16 nUserSubType = (m_pImpl->m_pProps->bBool1)
                 ? nsSwExtendedSubType::SUB_INVISIBLE : 0;
             if (m_pImpl->m_pProps->bBool2)
                 nUserSubType |= nsSwExtendedSubType::SUB_CMD;
             if (m_pImpl->m_pProps->bFormatIsDefault &&
-                nsSwGetSetExpType::GSE_STRING == static_cast<SwUserFieldType*>(pFldType)->GetType())
+                nsSwGetSetExpType::GSE_STRING == static_cast<SwUserFieldType*>(pFieldType)->GetType())
             {
                 m_pImpl->m_pProps->nFormat = -1;
             }
-            pFld = new SwUserField(static_cast<SwUserFieldType*>(pFldType),
+            pField = new SwUserField(static_cast<SwUserFieldType*>(pFieldType),
                                 nUserSubType,
                                 m_pImpl->m_pProps->nFormat);
         }
         break;
         case SW_SERVICE_FIELDTYPE_REF_PAGE_SET:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_REFPAGESETFLD);
-            pFld = new SwRefPageSetField( static_cast<SwRefPageSetFieldType*>(pFldType),
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_REFPAGESETFLD);
+            pField = new SwRefPageSetField( static_cast<SwRefPageSetFieldType*>(pFieldType),
                                 m_pImpl->m_pProps->nUSHORT1,
                                 m_pImpl->m_pProps->bBool1 );
         }
         break;
         case SW_SERVICE_FIELDTYPE_REF_PAGE_GET:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_REFPAGEGETFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_REFPAGEGETFLD);
             SwRefPageGetField *const pRGField = new SwRefPageGetField(
-                    static_cast<SwRefPageGetFieldType*>(pFldType),
+                    static_cast<SwRefPageGetFieldType*>(pFieldType),
                     m_pImpl->m_pProps->nUSHORT1 );
-            pFld = pRGField;
+            pField = pRGField;
             pRGField->SetText(m_pImpl->m_pProps->sPar1);
         }
         break;
         case SW_SERVICE_FIELDTYPE_PAGE_NUM:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_PAGENUMBERFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_PAGENUMBERFLD);
             SwPageNumberField *const pPNField = new SwPageNumberField(
-                static_cast<SwPageNumberFieldType*>(pFldType), PG_RANDOM,
+                static_cast<SwPageNumberFieldType*>(pFieldType), PG_RANDOM,
                 m_pImpl->m_pProps->nFormat,
                 m_pImpl->m_pProps->nUSHORT1);
-            pFld = pPNField;
+            pField = pPNField;
             pPNField->SetUserString(m_pImpl->m_pProps->sPar1);
             uno::Any aVal;
             aVal <<= m_pImpl->m_pProps->nSubType;
-            pFld->PutValue( aVal, FIELD_PROP_SUBTYPE );
+            pField->PutValue( aVal, FIELD_PROP_SUBTYPE );
         }
         break;
         case SW_SERVICE_FIELDTYPE_DDE:
         {
-            SwFieldType* pFldType =
-                pDoc->getIDocumentFieldsAccess().GetFldType(RES_DDEFLD, m_pImpl->m_sTypeName, true);
-            if (!pFldType)
+            SwFieldType* pFieldType =
+                pDoc->getIDocumentFieldsAccess().GetFieldType(RES_DDEFLD, m_pImpl->m_sTypeName, true);
+            if (!pFieldType)
                 throw uno::RuntimeException();
-            pFld = new SwDDEField( static_cast<SwDDEFieldType*>(pFldType) );
+            pField = new SwDDEField( static_cast<SwDDEFieldType*>(pFieldType) );
         }
         break;
         case SW_SERVICE_FIELDTYPE_DATABASE_NAME:
 #if HAVE_FEATURE_DBCONNECTIVITY
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_DBNAMEFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_DBNAMEFLD);
             SwDBData aData;
             aData.sDataSource = m_pImpl->m_pProps->sPar1;
             aData.sCommand = m_pImpl->m_pProps->sPar2;
             aData.nCommandType = m_pImpl->m_pProps->nSHORT1;
-            pFld = new SwDBNameField(static_cast<SwDBNameFieldType*>(pFldType), aData);
-            sal_uInt16  nSubType = pFld->GetSubType();
+            pField = new SwDBNameField(static_cast<SwDBNameFieldType*>(pFieldType), aData);
+            sal_uInt16  nSubType = pField->GetSubType();
             if (m_pImpl->m_pProps->bBool2)
                 nSubType &= ~nsSwExtendedSubType::SUB_INVISIBLE;
             else
                 nSubType |= nsSwExtendedSubType::SUB_INVISIBLE;
-            pFld->SetSubType(nSubType);
+            pField->SetSubType(nSubType);
         }
 #endif
         break;
@@ -1667,8 +1667,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             aData.sDataSource = m_pImpl->m_pProps->sPar1;
             aData.sCommand = m_pImpl->m_pProps->sPar2;
             aData.nCommandType = m_pImpl->m_pProps->nSHORT1;
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_DBNEXTSETFLD);
-            pFld = new SwDBNextSetField(static_cast<SwDBNextSetFieldType*>(pFldType),
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_DBNEXTSETFLD);
+            pField = new SwDBNextSetField(static_cast<SwDBNextSetFieldType*>(pFieldType),
                     m_pImpl->m_pProps->sPar3, OUString(), aData);
         }
 #endif
@@ -1680,8 +1680,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             aData.sDataSource = m_pImpl->m_pProps->sPar1;
             aData.sCommand = m_pImpl->m_pProps->sPar2;
             aData.nCommandType = m_pImpl->m_pProps->nSHORT1;
-            pFld = new SwDBNumSetField( static_cast<SwDBNumSetFieldType*>(
-                pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_DBNUMSETFLD)),
+            pField = new SwDBNumSetField( static_cast<SwDBNumSetFieldType*>(
+                pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_DBNUMSETFLD)),
                 m_pImpl->m_pProps->sPar3,
                 OUString::number(m_pImpl->m_pProps->nFormat),
                 aData );
@@ -1697,58 +1697,58 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             aData.nCommandType = m_pImpl->m_pProps->nSHORT1;
             SwDBSetNumberField *const pDBSNField =
                 new SwDBSetNumberField(static_cast<SwDBSetNumberFieldType*>(
-                        pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_DBSETNUMBERFLD)), aData,
+                        pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_DBSETNUMBERFLD)), aData,
                     m_pImpl->m_pProps->nUSHORT1);
-            pFld = pDBSNField;
+            pField = pDBSNField;
             pDBSNField->SetSetNumber(m_pImpl->m_pProps->nFormat);
-            sal_uInt16  nSubType = pFld->GetSubType();
+            sal_uInt16  nSubType = pField->GetSubType();
             if (m_pImpl->m_pProps->bBool2)
                 nSubType &= ~nsSwExtendedSubType::SUB_INVISIBLE;
             else
                 nSubType |= nsSwExtendedSubType::SUB_INVISIBLE;
-            pFld->SetSubType(nSubType);
+            pField->SetSubType(nSubType);
         }
 #endif
         break;
         case SW_SERVICE_FIELDTYPE_DATABASE:
 #if HAVE_FEATURE_DBCONNECTIVITY
         {
-            SwFieldType* pFldType =
-                pDoc->getIDocumentFieldsAccess().GetFldType(RES_DBFLD, m_pImpl->m_sTypeName, false);
-            if (!pFldType)
+            SwFieldType* pFieldType =
+                pDoc->getIDocumentFieldsAccess().GetFieldType(RES_DBFLD, m_pImpl->m_sTypeName, false);
+            if (!pFieldType)
                 throw uno::RuntimeException();
-            pFld = new SwDBField(static_cast<SwDBFieldType*>(pFldType),
+            pField = new SwDBField(static_cast<SwDBFieldType*>(pFieldType),
                     m_pImpl->m_pProps->nFormat);
-            static_cast<SwDBField*>(pFld)->InitContent(m_pImpl->m_pProps->sPar1);
-            sal_uInt16  nSubType = pFld->GetSubType();
+            static_cast<SwDBField*>(pField)->InitContent(m_pImpl->m_pProps->sPar1);
+            sal_uInt16  nSubType = pField->GetSubType();
             if (m_pImpl->m_pProps->bBool2)
                 nSubType &= ~nsSwExtendedSubType::SUB_INVISIBLE;
             else
                 nSubType |= nsSwExtendedSubType::SUB_INVISIBLE;
-            pFld->SetSubType(nSubType);
+            pField->SetSubType(nSubType);
         }
 #endif
         break;
         case SW_SERVICE_FIELDTYPE_SET_EXP:
         {
-            SwFieldType* pFldType =
-                pDoc->getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, m_pImpl->m_sTypeName, true);
-            if (!pFldType)
+            SwFieldType* pFieldType =
+                pDoc->getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, m_pImpl->m_sTypeName, true);
+            if (!pFieldType)
                 throw uno::RuntimeException();
             // detect the field type's sub type and set an appropriate number format
             if (m_pImpl->m_pProps->bFormatIsDefault &&
-                nsSwGetSetExpType::GSE_STRING == static_cast<SwSetExpFieldType*>(pFldType)->GetType())
+                nsSwGetSetExpType::GSE_STRING == static_cast<SwSetExpFieldType*>(pFieldType)->GetType())
             {
                 m_pImpl->m_pProps->nFormat = -1;
             }
             SwSetExpField *const pSEField = new SwSetExpField(
-                static_cast<SwSetExpFieldType*>(pFldType),
+                static_cast<SwSetExpFieldType*>(pFieldType),
                 m_pImpl->m_pProps->sPar2,
                 m_pImpl->m_pProps->nUSHORT2 != USHRT_MAX ?  //#i79471# the field can have a number format or a number_ing_ format
                 m_pImpl->m_pProps->nUSHORT2 : m_pImpl->m_pProps->nFormat);
-            pFld = pSEField;
+            pField = pSEField;
 
-            sal_uInt16  nSubType = pFld->GetSubType();
+            sal_uInt16  nSubType = pField->GetSubType();
             if (m_pImpl->m_pProps->bBool2)
                 nSubType &= ~nsSwExtendedSubType::SUB_INVISIBLE;
             else
@@ -1757,7 +1757,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                 nSubType |= nsSwExtendedSubType::SUB_CMD;
             else
                 nSubType &= ~nsSwExtendedSubType::SUB_CMD;
-            pFld->SetSubType(nSubType);
+            pField->SetSubType(nSubType);
             pSEField->SetSeqNumber(m_pImpl->m_pProps->nUSHORT1);
             pSEField->SetInputFlag(m_pImpl->m_pProps->bBool1);
             pSEField->SetPromptText(m_pImpl->m_pProps->sPar3);
@@ -1780,13 +1780,13 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                     nSubType = nsSwGetSetExpType::GSE_EXPR;
             }
             //make sure the SubType matches the field type
-            SwFieldType* pSetExpFld = pDoc->getIDocumentFieldsAccess().GetFldType(
+            SwFieldType* pSetExpField = pDoc->getIDocumentFieldsAccess().GetFieldType(
                     RES_SETEXPFLD, m_pImpl->m_pProps->sPar1, false);
             bool bSetGetExpFieldUninitialized = false;
-            if (pSetExpFld)
+            if (pSetExpField)
             {
                 if (nSubType != nsSwGetSetExpType::GSE_STRING &&
-                    static_cast< SwSetExpFieldType* >(pSetExpFld)->GetType() == nsSwGetSetExpType::GSE_STRING)
+                    static_cast< SwSetExpFieldType* >(pSetExpField)->GetType() == nsSwGetSetExpType::GSE_STRING)
                 nSubType = nsSwGetSetExpType::GSE_STRING;
             }
             else
@@ -1798,10 +1798,10 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                 nSubType &= ~nsSwExtendedSubType::SUB_CMD;
             SwGetExpField *const pGEField = new SwGetExpField(
                     static_cast<SwGetExpFieldType*>(
-                        pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_GETEXPFLD)),
+                        pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_GETEXPFLD)),
                     m_pImpl->m_pProps->sPar1, nSubType,
                     m_pImpl->m_pProps->nFormat);
-            pFld = pGEField;
+            pField = pGEField;
             //TODO: evaluate SubType!
             if (!m_pImpl->m_pProps->sPar4.isEmpty())
                 pGEField->ChgExpStr(m_pImpl->m_pProps->sPar4);
@@ -1813,28 +1813,28 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         case SW_SERVICE_FIELDTYPE_INPUT_USER:
         case SW_SERVICE_FIELDTYPE_INPUT:
         {
-            SwFieldType* pFldType =
-                pDoc->getIDocumentFieldsAccess().GetFldType(RES_INPUTFLD, m_pImpl->m_sTypeName, true);
-            if (!pFldType)
+            SwFieldType* pFieldType =
+                pDoc->getIDocumentFieldsAccess().GetFieldType(RES_INPUTFLD, m_pImpl->m_sTypeName, true);
+            if (!pFieldType)
                 throw uno::RuntimeException();
             sal_uInt16 nInpSubType =
                 sal::static_int_cast<sal_uInt16>(
                     SW_SERVICE_FIELDTYPE_INPUT_USER == m_pImpl->m_nServiceId
                         ? INP_USR : INP_TXT);
-            SwInputField * pTxtField =
-                new SwInputField(static_cast<SwInputFieldType*>(pFldType),
+            SwInputField * pTextField =
+                new SwInputField(static_cast<SwInputFieldType*>(pFieldType),
                                  m_pImpl->m_pProps->sPar1,
                                  m_pImpl->m_pProps->sPar2,
                                  nInpSubType);
-            pTxtField->SetHelp(m_pImpl->m_pProps->sPar3);
-            pTxtField->SetToolTip(m_pImpl->m_pProps->sPar4);
+            pTextField->SetHelp(m_pImpl->m_pProps->sPar3);
+            pTextField->SetToolTip(m_pImpl->m_pProps->sPar4);
 
-            pFld = pTxtField;
+            pField = pTextField;
         }
         break;
         case SW_SERVICE_FIELDTYPE_MACRO:
         {
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_MACROFLD);
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_MACROFLD);
             OUString aName;
 
             // support for Scripting Framework macros
@@ -1847,7 +1847,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                 SwMacroField::CreateMacroString(aName,
                     m_pImpl->m_pProps->sPar1, m_pImpl->m_pProps->sPar3);
             }
-            pFld = new SwMacroField(static_cast<SwMacroFieldType*>(pFldType), aName,
+            pField = new SwMacroField(static_cast<SwMacroFieldType*>(pFieldType), aName,
                                     m_pImpl->m_pProps->sPar2);
         }
         break;
@@ -1869,38 +1869,38 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                 case SW_SERVICE_FIELDTYPE_GRAPHIC_OBJECT_COUNT  : nSubType = DS_GRF;  break;
                 case SW_SERVICE_FIELDTYPE_EMBEDDED_OBJECT_COUNT : nSubType = DS_OLE;  break;
             }
-            SwFieldType* pFldType = pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_DOCSTATFLD);
-            pFld = new SwDocStatField(
-                    static_cast<SwDocStatFieldType*>(pFldType),
+            SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_DOCSTATFLD);
+            pField = new SwDocStatField(
+                    static_cast<SwDocStatFieldType*>(pFieldType),
                     nSubType, m_pImpl->m_pProps->nUSHORT2);
         }
         break;
         case SW_SERVICE_FIELDTYPE_BIBLIOGRAPHY:
         {
             SwAuthorityFieldType const type(pDoc);
-            pFld = new SwAuthorityField(static_cast<SwAuthorityFieldType*>(
-                        pDoc->getIDocumentFieldsAccess().InsertFldType(type)),
+            pField = new SwAuthorityField(static_cast<SwAuthorityFieldType*>(
+                        pDoc->getIDocumentFieldsAccess().InsertFieldType(type)),
                     OUString());
             if (m_pImpl->m_pProps->aPropSeq.getLength())
             {
                 uno::Any aVal;
                 aVal <<= m_pImpl->m_pProps->aPropSeq;
-                pFld->PutValue( aVal, FIELD_PROP_PROP_SEQ );
+                pField->PutValue( aVal, FIELD_PROP_PROP_SEQ );
             }
         }
         break;
         case SW_SERVICE_FIELDTYPE_COMBINED_CHARACTERS:
             // create field
-            pFld = new SwCombinedCharField( static_cast<SwCombinedCharFieldType*>(
-                        pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_COMBINED_CHARS)),
+            pField = new SwCombinedCharField( static_cast<SwCombinedCharFieldType*>(
+                        pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_COMBINED_CHARS)),
                         m_pImpl->m_pProps->sPar1);
             break;
         case SW_SERVICE_FIELDTYPE_DROPDOWN:
         {
             SwDropDownField *const pDDField = new SwDropDownField(
                 static_cast<SwDropDownFieldType *>(
-                    pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_DROPDOWN)));
-            pFld = pDDField;
+                    pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_DROPDOWN)));
+            pField = pDDField;
 
             pDDField->SetItems(m_pImpl->m_pProps->aStrings);
             pDDField->SetSelectedItem(m_pImpl->m_pProps->sPar1);
@@ -1920,22 +1920,22 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                 if (m_pImpl->m_pProps->bFormatIsDefault)
                     m_pImpl->m_pProps->nFormat = -1;
             }
-            pFld = new SwTblField( static_cast<SwTblFieldType*>(
-                pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_TABLEFLD)),
+            pField = new SwTableField( static_cast<SwTableFieldType*>(
+                pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_TABLEFLD)),
                 m_pImpl->m_pProps->sPar2,
                 nType,
                 m_pImpl->m_pProps->nFormat);
-           static_cast<SwTblField*>(pFld)->ChgExpStr(m_pImpl->m_pProps->sPar1);
+           static_cast<SwTableField*>(pField)->ChgExpStr(m_pImpl->m_pProps->sPar1);
         }
         break;
         default: OSL_FAIL("was ist das fuer ein Typ?");
     }
-    if (!pFld)
+    if (!pField)
         throw uno::RuntimeException("no SwField created?");
-    if (pFld)
+    if (pField)
     {
-        pFld->SetAutomaticLanguage(!m_pImpl->m_pProps->bBool4);
-        SwFmtFld aFmt( *pFld );
+        pField->SetAutomaticLanguage(!m_pImpl->m_pProps->bBool4);
+        SwFormatField aFormat( *pField );
 
         UnoActionContext aCont(pDoc);
         if (aPam.HasMark() &&
@@ -1958,24 +1958,24 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         {
             // Make sure we always insert the field at the end
             SwPaM aEnd(*aPam.End(), *aPam.End());
-            pDoc->getIDocumentContentOperations().InsertPoolItem(aEnd, aFmt, nInsertFlags);
+            pDoc->getIDocumentContentOperations().InsertPoolItem(aEnd, aFormat, nInsertFlags);
         }
         else
-            pDoc->getIDocumentContentOperations().InsertPoolItem(aPam, aFmt, nInsertFlags);
+            pDoc->getIDocumentContentOperations().InsertPoolItem(aPam, aFormat, nInsertFlags);
 
-        SwTxtAttr* pTxtAttr = aPam.GetNode().GetTxtNode()->GetFldTxtAttrAt( aPam.GetPoint()->nContent.GetIndex()-1, true );
+        SwTextAttr* pTextAttr = aPam.GetNode().GetTextNode()->GetFieldTextAttrAt( aPam.GetPoint()->nContent.GetIndex()-1, true );
 
         // What about updating the fields? (see fldmgr.cxx)
-        if (pTxtAttr)
+        if (pTextAttr)
         {
-            const SwFmtFld& rFld = pTxtAttr->GetFmtFld();
-            m_pImpl->m_pFmtFld = &rFld;
+            const SwFormatField& rField = pTextAttr->GetFormatField();
+            m_pImpl->m_pFormatField = &rField;
 
-            if ( pTxtAttr->Which() == RES_TXTATR_ANNOTATION
+            if ( pTextAttr->Which() == RES_TXTATR_ANNOTATION
                  && *aPam.GetPoint() != *aPam.GetMark() )
             {
                 // create annotation mark
-                const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pTxtAttr->GetFmtFld().GetField());
+                const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pTextAttr->GetFormatField().GetField());
                 OSL_ENSURE( pPostItField != NULL, "<SwXTextField::attachToRange(..)> - annotation field missing!" );
                 if ( pPostItField != NULL )
                 {
@@ -1985,13 +1985,13 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             }
         }
         else // could theoretically happen, if paragraph is full
-            throw uno::RuntimeException("no SwTxtAttr inserted?");
+            throw uno::RuntimeException("no SwTextAttr inserted?");
     }
-    delete pFld;
+    delete pField;
 
-    assert(m_pImpl->m_pFmtFld);
+    assert(m_pImpl->m_pFormatField);
     m_pImpl->m_pDoc = pDoc;
-    const_cast<SwFmtFld *>(m_pImpl->m_pFmtFld)->Add(m_pImpl.get());
+    const_cast<SwFormatField *>(m_pImpl->m_pFormatField)->Add(m_pImpl.get());
     m_pImpl->m_bIsDescriptor = false;
     if (m_pImpl->m_FieldTypeClient.GetRegisteredIn())
     {
@@ -2002,7 +2002,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     if (m_pImpl->m_bCallUpdate)
         update();
     }
-    else if ( m_pImpl->m_pFmtFld != NULL
+    else if ( m_pImpl->m_pFormatField != NULL
               && m_pImpl->m_pDoc != NULL
               && m_pImpl->m_nServiceId == SW_SERVICE_FIELDTYPE_ANNOTATION )
     {
@@ -2015,31 +2015,31 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             {
                 UnoActionContext aCont( m_pImpl->m_pDoc );
                 // insert copy of annotation at new text range
-                SwPostItField* pPostItField = static_cast< SwPostItField* >(m_pImpl->m_pFmtFld->GetField()->CopyField());
-                SwFmtFld aFmtFld( *pPostItField );
+                SwPostItField* pPostItField = static_cast< SwPostItField* >(m_pImpl->m_pFormatField->GetField()->CopyField());
+                SwFormatField aFormatField( *pPostItField );
                 delete pPostItField;
                 SwPaM aEnd( *aIntPam.End(), *aIntPam.End() );
-                m_pImpl->m_pDoc->getIDocumentContentOperations().InsertPoolItem( aEnd, aFmtFld, SetAttrMode::DEFAULT );
+                m_pImpl->m_pDoc->getIDocumentContentOperations().InsertPoolItem( aEnd, aFormatField, SetAttrMode::DEFAULT );
                 // delete former annotation
                 {
-                    const SwTxtFld* pTxtFld = m_pImpl->m_pFmtFld->GetTxtFld();
-                    SwTxtNode& rTxtNode = (SwTxtNode&)*pTxtFld->GetpTxtNode();
-                    SwPaM aPam( rTxtNode, pTxtFld->GetStart() );
+                    const SwTextField* pTextField = m_pImpl->m_pFormatField->GetTextField();
+                    SwTextNode& rTextNode = (SwTextNode&)*pTextField->GetpTextNode();
+                    SwPaM aPam( rTextNode, pTextField->GetStart() );
                     aPam.SetMark();
                     aPam.Move();
                     m_pImpl->m_pDoc->getIDocumentContentOperations().DeleteAndJoin(aPam);
                 }
                 // keep inserted annotation
                 {
-                    SwTxtFld* pTxtAttr = aEnd.GetNode().GetTxtNode()->GetFldTxtAttrAt( aEnd.End()->nContent.GetIndex()-1, true );
-                    if ( pTxtAttr != NULL )
+                    SwTextField* pTextAttr = aEnd.GetNode().GetTextNode()->GetFieldTextAttrAt( aEnd.End()->nContent.GetIndex()-1, true );
+                    if ( pTextAttr != NULL )
                     {
-                        m_pImpl->m_pFmtFld = &pTxtAttr->GetFmtFld();
+                        m_pImpl->m_pFormatField = &pTextAttr->GetFormatField();
 
                         if ( *aIntPam.GetPoint() != *aIntPam.GetMark() )
                         {
                             // create annotation mark
-                            const SwPostItField* pField = dynamic_cast< const SwPostItField* >(pTxtAttr->GetFmtFld().GetField());
+                            const SwPostItField* pField = dynamic_cast< const SwPostItField* >(pTextAttr->GetFormatField().GetField());
                             OSL_ENSURE( pField != NULL, "<SwXTextField::attach(..)> - annotation field missing!" );
                             if ( pField != NULL )
                             {
@@ -2067,13 +2067,13 @@ SwXTextField::getAnchor() throw (uno::RuntimeException, std::exception)
     if (!pField)
         return 0;
 
-    const SwTxtFld* pTxtFld = m_pImpl->m_pFmtFld->GetTxtFld();
-    if (!pTxtFld)
+    const SwTextField* pTextField = m_pImpl->m_pFormatField->GetTextField();
+    if (!pTextField)
         throw uno::RuntimeException();
 
-    boost::shared_ptr< SwPaM > pPamForTxtFld;
-    SwTxtFld::GetPamForTxtFld(*pTxtFld, pPamForTxtFld);
-    if (pPamForTxtFld.get() == NULL)
+    boost::shared_ptr< SwPaM > pPamForTextField;
+    SwTextField::GetPamForTextField(*pTextField, pPamForTextField);
+    if (pPamForTextField.get() == NULL)
         return 0;
 
     // If this is a postit field, then return the range of its annotation mark if it has one.
@@ -2085,14 +2085,14 @@ SwXTextField::getAnchor() throw (uno::RuntimeException, std::exception)
         {
             if (ppMark->get()->GetName() == pPostItField->GetName())
             {
-                pPamForTxtFld.reset(new SwPaM(ppMark->get()->GetMarkStart(), ppMark->get()->GetMarkEnd()));
+                pPamForTextField.reset(new SwPaM(ppMark->get()->GetMarkStart(), ppMark->get()->GetMarkEnd()));
                 break;
             }
         }
     }
 
     uno::Reference<text::XTextRange> xRange = SwXTextRange::CreateXTextRange(
-            *m_pImpl->m_pDoc, *(pPamForTxtFld->GetPoint()), pPamForTxtFld->GetMark());
+            *m_pImpl->m_pDoc, *(pPamForTextField->GetPoint()), pPamForTextField->GetMark());
     return xRange;
 }
 
@@ -2104,8 +2104,8 @@ void SAL_CALL SwXTextField::dispose() throw (uno::RuntimeException, std::excepti
     {
         UnoActionContext aContext(m_pImpl->m_pDoc);
 
-        assert(m_pImpl->m_pFmtFld->GetTxtFld() && "<SwXTextField::dispose()> - missing <SwTxtFld> --> crash");
-        SwTxtFld::DeleteTxtFld(*(m_pImpl->m_pFmtFld->GetTxtFld()));
+        assert(m_pImpl->m_pFormatField->GetTextField() && "<SwXTextField::dispose()> - missing <SwTextField> --> crash");
+        SwTextField::DeleteTextField(*(m_pImpl->m_pFormatField->GetTextField()));
     }
 
     if (m_pImpl->m_pTextObject)
@@ -2190,25 +2190,25 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
         {
             SwDoc * pDoc = m_pImpl->m_pDoc;
             assert(pDoc);
-            const SwTxtFld* pTxtFld = m_pImpl->m_pFmtFld->GetTxtFld();
-            if(!pTxtFld)
+            const SwTextField* pTextField = m_pImpl->m_pFormatField->GetTextField();
+            if(!pTextField)
                 throw uno::RuntimeException();
-            SwPosition aPosition( pTxtFld->GetTxtNode() );
-            aPosition.nContent = pTxtFld->GetStart();
+            SwPosition aPosition( pTextField->GetTextNode() );
+            aPosition.nContent = pTextField->GetStart();
             pDoc->getIDocumentFieldsAccess().PutValueToField( aPosition, rValue, pEntry->nWID);
         }
 
         //#i100374# notify SwPostIt about new field content
-        if (RES_POSTITFLD == nWhich && m_pImpl->m_pFmtFld)
+        if (RES_POSTITFLD == nWhich && m_pImpl->m_pFormatField)
         {
-            const_cast<SwFmtFld*>(m_pImpl->m_pFmtFld)->Broadcast(
-                    SwFmtFldHint( 0, SwFmtFldHintWhich::CHANGED ));
+            const_cast<SwFormatField*>(m_pImpl->m_pFormatField)->Broadcast(
+                    SwFormatFieldHint( 0, SwFormatFieldHintWhich::CHANGED ));
         }
 
-        // fdo#42073 notify SwTxtFld about changes of the expanded string
-        if (m_pImpl->m_pFmtFld->GetTxtFld())
+        // fdo#42073 notify SwTextField about changes of the expanded string
+        if (m_pImpl->m_pFormatField->GetTextField())
         {
-            m_pImpl->m_pFmtFld->GetTxtFld()->ExpandTxtFld();
+            m_pImpl->m_pFormatField->GetTextField()->ExpandTextField();
         }
 
         //#i100374# changing a document field should set the modify flag
@@ -2373,30 +2373,30 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                     throw uno::RuntimeException();
 
                 // get text node for the text field
-                const SwFmtFld *pFldFmt =
-                    (m_pImpl->GetField()) ? m_pImpl->m_pFmtFld : 0;
-                const SwTxtFld* pTxtFld = (pFldFmt)
-                    ? m_pImpl->m_pFmtFld->GetTxtFld() : 0;
-                if(!pTxtFld)
+                const SwFormatField *pFieldFormat =
+                    (m_pImpl->GetField()) ? m_pImpl->m_pFormatField : 0;
+                const SwTextField* pTextField = (pFieldFormat)
+                    ? m_pImpl->m_pFormatField->GetTextField() : 0;
+                if(!pTextField)
                     throw uno::RuntimeException();
-                const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
+                const SwTextNode& rTextNode = pTextField->GetTextNode();
 
                 // skip fields that are currently not in the document
                 // e.g. fields in undo or redo array
-                if (rTxtNode.GetNodes().IsDocNodes())
+                if (rTextNode.GetNodes().IsDocNodes())
                 {
-                    bool bFrame = 0 != rTxtNode.FindLayoutRect().Width(); // oder so
-                    bool bHidden = rTxtNode.IsHidden();
+                    bool bFrame = 0 != rTextNode.FindLayoutRect().Width(); // oder so
+                    bool bHidden = rTextNode.IsHidden();
                     if ( !bHidden )
                     {
                         sal_Int32 nHiddenStart;
                         sal_Int32 nHiddenEnd;
 
-                        SwPosition aPosition( pTxtFld->GetTxtNode() );
-                        aPosition.nContent = pTxtFld->GetStart();
+                        SwPosition aPosition( pTextField->GetTextNode() );
+                        aPosition.nContent = pTextField->GetStart();
 
-                        bHidden = SwScriptInfo::GetBoundsOfHiddenRange( pTxtFld->GetTxtNode(),
-                                        pTxtFld->GetStart(),
+                        bHidden = SwScriptInfo::GetBoundsOfHiddenRange( pTextField->GetTextNode(),
+                                        pTextField->GetStart(),
                                         nHiddenStart, nHiddenEnd );
                     }
 
@@ -2524,53 +2524,53 @@ void SwXTextField::removeVetoableChangeListener(const OUString& /*PropertyName*/
 void SAL_CALL SwXTextField::update() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwField * pFld = const_cast<SwField*>(m_pImpl->GetField());
-    if (pFld)
+    SwField * pField = const_cast<SwField*>(m_pImpl->GetField());
+    if (pField)
     {
-        switch(pFld->Which())
+        switch(pField->Which())
         {
             case RES_DATETIMEFLD:
-            static_cast<SwDateTimeField*>(pFld)->SetDateTime( ::DateTime( ::DateTime::SYSTEM ) );
+            static_cast<SwDateTimeField*>(pField)->SetDateTime( ::DateTime( ::DateTime::SYSTEM ) );
             break;
 
             case RES_EXTUSERFLD:
             {
-                SwExtUserField* pExtUserFld = static_cast<SwExtUserField*>(pFld);
-                pExtUserFld->SetExpansion( SwExtUserFieldType::Expand(
-                                            pExtUserFld->GetSubType(),
-                                            pExtUserFld->GetFormat() ) );
+                SwExtUserField* pExtUserField = static_cast<SwExtUserField*>(pField);
+                pExtUserField->SetExpansion( SwExtUserFieldType::Expand(
+                                            pExtUserField->GetSubType(),
+                                            pExtUserField->GetFormat() ) );
             }
             break;
 
             case RES_AUTHORFLD:
             {
-                SwAuthorField* pAuthorFld = static_cast<SwAuthorField*>(pFld);
-                pAuthorFld->SetExpansion( SwAuthorFieldType::Expand(
-                                            pAuthorFld->GetFormat() ) );
+                SwAuthorField* pAuthorField = static_cast<SwAuthorField*>(pField);
+                pAuthorField->SetExpansion( SwAuthorFieldType::Expand(
+                                            pAuthorField->GetFormat() ) );
             }
             break;
 
             case RES_FILENAMEFLD:
             {
-                SwFileNameField* pFileNameFld = static_cast<SwFileNameField*>(pFld);
-                pFileNameFld->SetExpansion( static_cast<SwFileNameFieldType*>(pFld->GetTyp())->Expand(
-                                            pFileNameFld->GetFormat() ) );
+                SwFileNameField* pFileNameField = static_cast<SwFileNameField*>(pField);
+                pFileNameField->SetExpansion( static_cast<SwFileNameFieldType*>(pField->GetTyp())->Expand(
+                                            pFileNameField->GetFormat() ) );
             }
             break;
 
             case RES_DOCINFOFLD:
             {
-                    SwDocInfoField* pDocInfFld = static_cast<SwDocInfoField*>(pFld);
-                    pDocInfFld->SetExpansion( static_cast<SwDocInfoFieldType*>(pFld->GetTyp())->Expand(
-                                                pDocInfFld->GetSubType(),
-                                                pDocInfFld->GetFormat(),
-                                                pDocInfFld->GetLanguage(),
-                                                pDocInfFld->GetName() ) );
+                    SwDocInfoField* pDocInfField = static_cast<SwDocInfoField*>(pField);
+                    pDocInfField->SetExpansion( static_cast<SwDocInfoFieldType*>(pField->GetTyp())->Expand(
+                                                pDocInfField->GetSubType(),
+                                                pDocInfField->GetFormat(),
+                                                pDocInfField->GetLanguage(),
+                                                pDocInfField->GetName() ) );
             }
             break;
         }
         // Text formatting has to be triggered.
-        const_cast<SwFmtFld*>(m_pImpl->m_pFmtFld)->ModifyNotification(0, 0);
+        const_cast<SwFormatField*>(m_pImpl->m_pFormatField)->ModifyNotification(0, 0);
     }
     else
         m_pImpl->m_bCallUpdate = true;
@@ -2629,7 +2629,7 @@ void SwXTextField::Impl::Invalidate()
     if (GetRegisteredIn())
     {
         GetRegisteredInNonConst()->Remove(this);
-        m_pFmtFld = 0;
+        m_pFormatField = 0;
         m_pDoc = 0;
         uno::Reference<uno::XInterface> const xThis(m_wThis);
         if (!xThis.is())
@@ -2654,8 +2654,8 @@ void SwXTextField::Impl::Modify(
 
     case RES_FMT_CHG:
         // Am I re-attached to a new one and will the old one be deleted?
-        if( static_cast<const SwFmtChg*>(pNew)->pChangedFmt == GetRegisteredIn() &&
-            static_cast<const SwFmtChg*>(pOld)->pChangedFmt->IsFmtInDTOR() )
+        if( static_cast<const SwFormatChg*>(pNew)->pChangedFormat == GetRegisteredIn() &&
+            static_cast<const SwFormatChg*>(pOld)->pChangedFormat->IsFormatInDTOR() )
             Invalidate();
         break;
     }
@@ -2663,9 +2663,9 @@ void SwXTextField::Impl::Modify(
 
 const SwField*  SwXTextField::Impl::GetField() const
 {
-    if (GetRegisteredIn() && m_pFmtFld)
+    if (GetRegisteredIn() && m_pFormatField)
     {
-        return m_pFmtFld->GetField();
+        return m_pFormatField->GetField();
     }
     return 0;
 }
@@ -2725,10 +2725,10 @@ static sal_uInt16 lcl_GetIdByName( OUString& rName, OUString& rTypeName )
     {
         nResId = RES_SETEXPFLD;
 
-        const OUString sFldTypName( rName.getToken( 1, '.' ));
-        const OUString sUIName( SwStyleNameMapper::GetSpecialExtraUIName( sFldTypName ) );
+        const OUString sFieldTypName( rName.getToken( 1, '.' ));
+        const OUString sUIName( SwStyleNameMapper::GetSpecialExtraUIName( sFieldTypName ) );
 
-        if( sUIName != sFldTypName )
+        if( sUIName != sFieldTypName )
             rName = comphelper::string::setToken(rName, 1, '.', sUIName);
     }
     else if (rTypeName.equalsIgnoreAsciiCase("DataBase"))
@@ -2762,7 +2762,7 @@ uno::Any SwXTextFieldMasters::getByName(const OUString& rName)
             css::uno::Reference<css::uno::XInterface>());
 
     sName = sName.copy(std::min(sTypeName.getLength()+1, sName.getLength()));
-    SwFieldType* pType = GetDoc()->getIDocumentFieldsAccess().GetFldType(nResId, sName, true);
+    SwFieldType* pType = GetDoc()->getIDocumentFieldsAccess().GetFieldType(nResId, sName, true);
     if(!pType)
         throw container::NoSuchElementException(
             "SwXTextFieldMasters::getByName(" + rName + ")",
@@ -2774,25 +2774,25 @@ uno::Any SwXTextFieldMasters::getByName(const OUString& rName)
 }
 
 bool SwXTextFieldMasters::getInstanceName(
-    const SwFieldType& rFldType, OUString& rName)
+    const SwFieldType& rFieldType, OUString& rName)
 {
     OUString sField;
 
-    switch( rFldType.Which() )
+    switch( rFieldType.Which() )
     {
     case RES_USERFLD:
-        sField = "User." + rFldType.GetName();
+        sField = "User." + rFieldType.GetName();
         break;
     case RES_DDEFLD:
-        sField = "DDE." + rFldType.GetName();
+        sField = "DDE." + rFieldType.GetName();
         break;
 
     case RES_SETEXPFLD:
-        sField = "SetExpression." + SwStyleNameMapper::GetSpecialExtraProgName( rFldType.GetName() );
+        sField = "SetExpression." + SwStyleNameMapper::GetSpecialExtraProgName( rFieldType.GetName() );
         break;
 
     case RES_DBFLD:
-        sField = "DataBase." + rFldType.GetName().replaceAll(OUString(DB_DELIM), ".");
+        sField = "DataBase." + rFieldType.GetName().replaceAll(OUString(DB_DELIM), ".");
         break;
 
     case RES_AUTHORITY:
@@ -2814,26 +2814,26 @@ uno::Sequence< OUString > SwXTextFieldMasters::getElementNames()
     if(!GetDoc())
         throw uno::RuntimeException();
 
-    const SwFldTypes* pFldTypes = GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
-    const size_t nCount = pFldTypes->size();
+    const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
+    const size_t nCount = pFieldTypes->size();
 
-    std::vector<OUString> aFldNames;
+    std::vector<OUString> aFieldNames;
     for( size_t i = 0; i < nCount; ++i )
     {
-        SwFieldType& rFldType = *((*pFldTypes)[i]);
+        SwFieldType& rFieldType = *((*pFieldTypes)[i]);
 
-        OUString sFldName;
-        if (SwXTextFieldMasters::getInstanceName(rFldType, sFldName))
+        OUString sFieldName;
+        if (SwXTextFieldMasters::getInstanceName(rFieldType, sFieldName))
         {
-            aFldNames.push_back(sFldName);
+            aFieldNames.push_back(sFieldName);
         }
     }
 
-    uno::Sequence< OUString > aSeq( static_cast<sal_Int32>(aFldNames.size()) );
+    uno::Sequence< OUString > aSeq( static_cast<sal_Int32>(aFieldNames.size()) );
     OUString* pArray = aSeq.getArray();
-    for (size_t i = 0; i<aFldNames.size(); ++i)
+    for (size_t i = 0; i<aFieldNames.size(); ++i)
     {
-        pArray[i] = aFldNames[i];
+        pArray[i] = aFieldNames[i];
     }
 
     return aSeq;
@@ -2851,7 +2851,7 @@ sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( uno::Runti
     if( USHRT_MAX != nResId )
     {
         sName = sName.copy(std::min(sTypeName.getLength()+1, sName.getLength()));
-        bRet = USHRT_MAX != nResId && 0 != GetDoc()->getIDocumentFieldsAccess().GetFldType(nResId, sName, true);
+        bRet = USHRT_MAX != nResId && 0 != GetDoc()->getIDocumentFieldsAccess().GetFieldType(nResId, sName, true);
     }
     return bRet;
 }
@@ -2946,7 +2946,7 @@ void SAL_CALL SwXTextFieldTypes::refresh() throw (uno::RuntimeException, std::ex
             throw uno::RuntimeException();
         UnoActionContext aContext(GetDoc());
         GetDoc()->getIDocumentStatistics().UpdateDocStat( false, true );
-        GetDoc()->getIDocumentFieldsAccess().UpdateFlds(0, false);
+        GetDoc()->getIDocumentFieldsAccess().UpdateFields(0, false);
     }
     // call refresh listeners (without SolarMutex locked)
     lang::EventObject const event(static_cast< ::cppu::OWeakObject*>(this));
@@ -3021,24 +3021,24 @@ SwXFieldEnumeration::SwXFieldEnumeration(SwDoc & rDoc)
     uno::Reference< text::XTextField > *pItems = m_pImpl->m_Items.getArray();
     sal_Int32 nFillPos = 0;
 
-    const SwFldTypes* pFldTypes = m_pImpl->m_pDoc->getIDocumentFieldsAccess().GetFldTypes();
-    const size_t nCount = pFldTypes->size();
+    const SwFieldTypes* pFieldTypes = m_pImpl->m_pDoc->getIDocumentFieldsAccess().GetFieldTypes();
+    const size_t nCount = pFieldTypes->size();
     for(size_t nType = 0;  nType < nCount;  ++nType)
     {
-        const SwFieldType *pCurType = (*pFldTypes)[nType];
-        SwIterator<SwFmtFld,SwFieldType> aIter( *pCurType );
-        const SwFmtFld* pCurFldFmt = aIter.First();
-        while (pCurFldFmt)
+        const SwFieldType *pCurType = (*pFieldTypes)[nType];
+        SwIterator<SwFormatField,SwFieldType> aIter( *pCurType );
+        const SwFormatField* pCurFieldFormat = aIter.First();
+        while (pCurFieldFormat)
         {
-            const SwTxtFld *pTxtFld = pCurFldFmt->GetTxtFld();
+            const SwTextField *pTextField = pCurFieldFormat->GetTextField();
             // skip fields that are currently not in the document
             // e.g. fields in undo or redo array
-            bool bSkip = !pTxtFld ||
-                         !pTxtFld->GetpTxtNode()->GetNodes().IsDocNodes();
+            bool bSkip = !pTextField ||
+                         !pTextField->GetpTextNode()->GetNodes().IsDocNodes();
             if (!bSkip)
                 pItems[ nFillPos++ ] = SwXTextField::CreateXTextField(
-                        m_pImpl->m_pDoc, pCurFldFmt);
-            pCurFldFmt = aIter.Next();
+                        m_pImpl->m_pDoc, pCurFieldFormat);
+            pCurFieldFormat = aIter.Next();
 
             // enlarge sequence if necessary
             if (m_pImpl->m_Items.getLength() == nFillPos)
@@ -3095,11 +3095,11 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
     uno::Reference< text::XTextField > *pItems = m_pImpl->m_Items.getArray();
     (void)pItems;
 #endif
-    uno::Reference< text::XTextField >  &rxFld =
+    uno::Reference< text::XTextField >  &rxField =
         m_pImpl->m_Items.getArray()[ m_pImpl->m_nNextIndex++ ];
     uno::Any aRet;
-    aRet <<= rxFld;
-    rxFld = 0;  // free memory for item that is not longer used
+    aRet <<= rxField;
+    rxField = 0;  // free memory for item that is not longer used
     return aRet;
 }
 
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index 5537ed864dba..a7a99b6c07f2 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -64,8 +64,8 @@ CreateFlatParagraphIterator(SwDoc & rDoc, sal_Int32 const nTextMarkupType,
 
 }
 
-SwXFlatParagraph::SwXFlatParagraph( SwTxtNode& rTxtNode, const OUString& aExpandText, const ModelToViewHelper& rMap )
-    : SwXFlatParagraph_Base(& rTxtNode, rMap)
+SwXFlatParagraph::SwXFlatParagraph( SwTextNode& rTextNode, const OUString& aExpandText, const ModelToViewHelper& rMap )
+    : SwXFlatParagraph_Base(& rTextNode, rMap)
     , maExpandText(aExpandText)
 {
 }
@@ -196,17 +196,17 @@ void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, sal_Bool bVal ) t
 {
     SolarMutexGuard aGuard;
 
-    if (GetTxtNode())
+    if (GetTextNode())
     {
         if ( text::TextMarkupType::SPELLCHECK == nType )
-            GetTxtNode()->SetWrongDirty( !bVal );
+            GetTextNode()->SetWrongDirty( !bVal );
         else if ( text::TextMarkupType::SMARTTAG == nType )
-            GetTxtNode()->SetSmartTagDirty( !bVal );
+            GetTextNode()->SetSmartTagDirty( !bVal );
         else if( text::TextMarkupType::PROOFREADING == nType )
         {
-            GetTxtNode()->SetGrammarCheckDirty( !bVal );
+            GetTextNode()->SetGrammarCheckDirty( !bVal );
             if( bVal )
-                ::finishGrammarCheck( *GetTxtNode() );
+                ::finishGrammarCheck( *GetTextNode() );
         }
     }
 }
@@ -215,14 +215,14 @@ void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, sal_Bool bVal ) t
 sal_Bool SAL_CALL SwXFlatParagraph::isChecked( ::sal_Int32 nType ) throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    if (GetTxtNode())
+    if (GetTextNode())
     {
         if ( text::TextMarkupType::SPELLCHECK == nType )
-            return GetTxtNode()->IsWrongDirty();
+            return GetTextNode()->IsWrongDirty();
         else if ( text::TextMarkupType::PROOFREADING == nType )
-            return GetTxtNode()->IsGrammarCheckDirty();
+            return GetTextNode()->IsGrammarCheckDirty();
         else if ( text::TextMarkupType::SMARTTAG == nType )
-            return GetTxtNode()->IsSmartTagDirty();
+            return GetTextNode()->IsSmartTagDirty();
     }
 
     return sal_False;
@@ -232,7 +232,7 @@ sal_Bool SAL_CALL SwXFlatParagraph::isChecked( ::sal_Int32 nType ) throw (uno::R
 sal_Bool SAL_CALL SwXFlatParagraph::isModified() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    return 0 == GetTxtNode();
+    return 0 == GetTextNode();
 }
 
 // text::XFlatParagraph:
@@ -240,10 +240,10 @@ lang::Locale SAL_CALL SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sa
     throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     SolarMutexGuard aGuard;
-    if (!GetTxtNode())
+    if (!GetTextNode())
         return LanguageTag::convertToLocale( LANGUAGE_NONE );
 
-    const lang::Locale aLocale( SW_BREAKITER()->GetLocale( GetTxtNode()->GetLang(nPos, nLen) ) );
+    const lang::Locale aLocale( SW_BREAKITER()->GetLocale( GetTextNode()->GetLang(nPos, nLen) ) );
     return aLocale;
 }
 
@@ -253,10 +253,10 @@ lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPo
 {
     SolarMutexGuard aGuard;
 
-    if (!GetTxtNode())
+    if (!GetTextNode())
         return LanguageTag::convertToLocale( LANGUAGE_NONE );
 
-    const lang::Locale aLocale( SW_BREAKITER()->GetLocale( GetTxtNode()->GetLang(nPos, nLen) ) );
+    const lang::Locale aLocale( SW_BREAKITER()->GetLocale( GetTextNode()->GetLang(nPos, nLen) ) );
     return aLocale;
 }
 
@@ -265,18 +265,18 @@ void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, c
 {
     SolarMutexGuard aGuard;
 
-    if (!GetTxtNode())
+    if (!GetTextNode())
         return;
 
-    SwTxtNode *const pOldTxtNode = GetTxtNode();
+    SwTextNode *const pOldTextNode = GetTextNode();
 
-    SwPaM aPaM( *GetTxtNode(), nPos, *GetTxtNode(), nPos+nLen );
+    SwPaM aPaM( *GetTextNode(), nPos, *GetTextNode(), nPos+nLen );
 
-    UnoActionContext aAction( GetTxtNode()->GetDoc() );
+    UnoActionContext aAction( GetTextNode()->GetDoc() );
 
     const uno::Reference< text::XTextRange > xRange =
         SwXTextRange::CreateXTextRange(
-            *GetTxtNode()->GetDoc(), *aPaM.GetPoint(), aPaM.GetMark() );
+            *GetTextNode()->GetDoc(), *aPaM.GetPoint(), aPaM.GetMark() );
     uno::Reference< beans::XPropertySet > xPropSet( xRange, uno::UNO_QUERY );
     if ( xPropSet.is() )
     {
@@ -284,10 +284,10 @@ void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, c
             xPropSet->setPropertyValue( aAttributes[i].Name, aAttributes[i].Value );
     }
 
-    IDocumentContentOperations* pIDCO = pOldTxtNode->getIDocumentContentOperations();
+    IDocumentContentOperations* pIDCO = pOldTextNode->getIDocumentContentOperations();
     pIDCO->ReplaceRange( aPaM, aNewText, false );
 
-    ClearTxtNode(); // TODO: is this really needed?
+    ClearTextNode(); // TODO: is this really needed?
 }
 
 // text::XFlatParagraph:
@@ -295,16 +295,16 @@ void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 n
 {
     SolarMutexGuard aGuard;
 
-    if (!GetTxtNode())
+    if (!GetTextNode())
         return;
 
-    SwPaM aPaM( *GetTxtNode(), nPos, *GetTxtNode(), nPos+nLen );
+    SwPaM aPaM( *GetTextNode(), nPos, *GetTextNode(), nPos+nLen );
 
-    UnoActionContext aAction( GetTxtNode()->GetDoc() );
+    UnoActionContext aAction( GetTextNode()->GetDoc() );
 
     const uno::Reference< text::XTextRange > xRange =
         SwXTextRange::CreateXTextRange(
-            *GetTxtNode()->GetDoc(), *aPaM.GetPoint(), aPaM.GetMark() );
+            *GetTextNode()->GetDoc(), *aPaM.GetPoint(), aPaM.GetMark() );
     uno::Reference< beans::XPropertySet > xPropSet( xRange, uno::UNO_QUERY );
     if ( xPropSet.is() )
     {
@@ -312,7 +312,7 @@ void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 n
             xPropSet->setPropertyValue( aAttributes[i].Name, aAttributes[i].Value );
     }
 
-    ClearTxtNode(); // TODO: is this really needed?
+    ClearTextNode(); // TODO: is this really needed?
 }
 
 // text::XFlatParagraph:
@@ -386,7 +386,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara()
     if (!mpDoc)
         return xRet;
 
-    SwTxtNode* pRet = 0;
+    SwTextNode* pRet = 0;
     if ( mbAutomatic )
     {
         SwViewShell* pViewShell = mpDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
@@ -405,23 +405,23 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara()
                     return xRet;
 
                 // search for invalid content:
-                SwCntntFrm* pCnt = pCurrentPage->ContainsCntnt();
+                SwContentFrm* pCnt = pCurrentPage->ContainsContent();
 
                 while( pCnt && pCurrentPage->IsAnLower( pCnt ) )
                 {
-                    SwTxtNode* pTxtNode = dynamic_cast<SwTxtNode*>( pCnt->GetNode()->GetTxtNode() );
+                    SwTextNode* pTextNode = dynamic_cast<SwTextNode*>( pCnt->GetNode()->GetTextNode() );
 
-                    if ( pTxtNode &&
+                    if ( pTextNode &&
                         ((mnType == text::TextMarkupType::SPELLCHECK &&
-                                pTxtNode->IsWrongDirty()) ||
+                                pTextNode->IsWrongDirty()) ||
                          (mnType == text::TextMarkupType::PROOFREADING &&
-                                pTxtNode->IsGrammarCheckDirty())) )
+                                pTextNode->IsGrammarCheckDirty())) )
                     {
-                        pRet = pTxtNode;
+                        pRet = pTextNode;
                         break;
                     }
 
-                    pCnt = pCnt->GetNextCntntFrm();
+                    pCnt = pCnt->GetNextContentFrm();
                 }
             }
 
@@ -453,7 +453,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara()
 
             ++mnCurrentNode;
 
-            pRet = dynamic_cast<SwTxtNode*>(pNd);
+            pRet = dynamic_cast<SwTextNode*>(pNd);
             if ( pRet )
                 break;
 
@@ -501,29 +501,29 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(co
     if ( !pFlatParagraph )
         return xRet;
 
-    SwTxtNode const*const pCurrentNode = pFlatParagraph->GetTxtNode();
+    SwTextNode const*const pCurrentNode = pFlatParagraph->GetTextNode();
 
     if ( !pCurrentNode )
         return xRet;
 
-    SwTxtNode* pNextTxtNode = 0;
+    SwTextNode* pNextTextNode = 0;
     const SwNodes& rNodes = pCurrentNode->GetDoc()->GetNodes();
 
     for( sal_uLong nCurrentNode = pCurrentNode->GetIndex() + 1; nCurrentNode < rNodes.Count(); ++nCurrentNode )
     {
         SwNode* pNd = rNodes[ nCurrentNode ];
-        pNextTxtNode = dynamic_cast<SwTxtNode*>(pNd);
-        if ( pNextTxtNode )
+        pNextTextNode = dynamic_cast<SwTextNode*>(pNd);
+        if ( pNextTextNode )
             break;
     }
 
-    if ( pNextTxtNode )
+    if ( pNextTextNode )
     {
         // Expand the string:
-        const ModelToViewHelper aConversionMap(*pNextTxtNode);
+        const ModelToViewHelper aConversionMap(*pNextTextNode);
         OUString aExpandText = aConversionMap.getViewText();
 
-        xRet = new SwXFlatParagraph( *pNextTxtNode, aExpandText, aConversionMap );
+        xRet = new SwXFlatParagraph( *pNextTextNode, aExpandText, aConversionMap );
         // keep hard references...
         m_aFlatParaList.insert( xRet );
     }
@@ -547,29 +547,29 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaBefore(c
     if ( !pFlatParagraph )
         return xRet;
 
-    SwTxtNode const*const pCurrentNode = pFlatParagraph->GetTxtNode();
+    SwTextNode const*const pCurrentNode = pFlatParagraph->GetTextNode();
 
     if ( !pCurrentNode )
         return xRet;
 
-    SwTxtNode* pPrevTxtNode = 0;
+    SwTextNode* pPrevTextNode = 0;
     const SwNodes& rNodes = pCurrentNode->GetDoc()->GetNodes();
 
     for( sal_uLong nCurrentNode = pCurrentNode->GetIndex() - 1; nCurrentNode > 0; --nCurrentNode )
     {
         SwNode* pNd = rNodes[ nCurrentNode ];
-        pPrevTxtNode = dynamic_cast<SwTxtNode*>(pNd);
-        if ( pPrevTxtNode )
+        pPrevTextNode = dynamic_cast<SwTextNode*>(pNd);
+        if ( pPrevTextNode )
             break;
     }
 
-    if ( pPrevTxtNode )
+    if ( pPrevTextNode )
     {
         // Expand the string:
-        const ModelToViewHelper aConversionMap(*pPrevTxtNode);
+        const ModelToViewHelper aConversionMap(*pPrevTextNode);
         OUString aExpandText = aConversionMap.getViewText();
 
-        xRet = new SwXFlatParagraph( *pPrevTxtNode, aExpandText, aConversionMap );
+        xRet = new SwXFlatParagraph( *pPrevTextNode, aExpandText, aConversionMap );
         // keep hard references...
         m_aFlatParaList.insert( xRet );
     }
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 9c44c672d34c..897a9878be3a 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -178,7 +178,7 @@ bool BaseFrameProperties_Impl::GetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId,
 
 bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxItemSet& rFromSet, bool& rSizeFound)
 {
-    //UUUU assert when the target SfxItemSet has no parent. It *should* have the pDfltFrmFmt
+    //UUUU assert when the target SfxItemSet has no parent. It *should* have the pDfltFrameFormat
     // from SwDoc set as parent (or similar) to have the necessary XFILL_NONE in the ItemSet
     if(!rToSet.GetParent())
     {
@@ -187,7 +187,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
 
     bool bRet = true;
     // always add an anchor to the set
-    SwFmtAnchor aAnchor ( static_cast < const SwFmtAnchor & > ( rFromSet.Get ( RES_ANCHOR ) ) );
+    SwFormatAnchor aAnchor ( static_cast < const SwFormatAnchor & > ( rFromSet.Get ( RES_ANCHOR ) ) );
     {
         const ::uno::Any* pAnchorPgNo;
         if(GetProperty(RES_ANCHOR, MID_ANCHOR_PAGENUM, pAnchorPgNo))
@@ -644,7 +644,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
         GetProperty(RES_HORI_ORIENT, MID_HORIORIENT_PAGETOGGLE, pPageT);
         if(pHori||pHoriP||pHoriR||pPageT)
         {
-            SwFmtHoriOrient aOrient ( static_cast < const :: SwFmtHoriOrient & > ( rFromSet.Get ( RES_HORI_ORIENT ) ) );
+            SwFormatHoriOrient aOrient ( static_cast < const :: SwFormatHoriOrient & > ( rFromSet.Get ( RES_HORI_ORIENT ) ) );
             if(pHori )
                 bRet &= ((SfxPoolItem&)aOrient).PutValue(*pHori, MID_HORIORIENT_ORIENT);
             if(pHoriP)
@@ -666,7 +666,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
         GetProperty(RES_VERT_ORIENT, MID_VERTORIENT_RELATION, pVertR );
         if(pVert||pVertP||pVertR)
         {
-            SwFmtVertOrient aOrient ( static_cast < const :: SwFmtVertOrient & > ( rFromSet.Get ( RES_VERT_ORIENT ) ) );
+            SwFormatVertOrient aOrient ( static_cast < const :: SwFormatVertOrient & > ( rFromSet.Get ( RES_VERT_ORIENT ) ) );
             if(pVert )
                 bRet &= ((SfxPoolItem&)aOrient).PutValue(*pVert, MID_VERTORIENT_ORIENT);
             if(pVertP)
@@ -687,7 +687,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
         GetProperty(RES_URL, MID_URL_SERVERMAP, pHySMp );
         if(pURL||pTarget||pHyLNm||pHySMp)
         {
-            SwFmtURL aURL ( static_cast < const :: SwFmtURL & > ( rFromSet.Get ( RES_URL ) ) );
+            SwFormatURL aURL ( static_cast < const :: SwFormatURL & > ( rFromSet.Get ( RES_URL ) ) );
             if(pURL)
                 bRet &= ((SfxPoolItem&)aURL).PutValue(*pURL, MID_URL_URL);
             if(pTarget)
@@ -759,7 +759,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
     GetProperty(RES_SURROUND, MID_SURROUND_ANCHORONLY, pSurAnch);
     if(pSur || pSurAnch)
     {
-        SwFmtSurround aSrnd ( static_cast < const :: SwFmtSurround & > ( rFromSet.Get ( RES_SURROUND ) ) );
+        SwFormatSurround aSrnd ( static_cast < const :: SwFormatSurround & > ( rFromSet.Get ( RES_SURROUND ) ) );
         if(pSur)
             bRet &= ((SfxPoolItem&)aSrnd).PutValue(*pSur, MID_SURROUND_SURROUNDTYPE );
         if(pSurAnch)
@@ -844,7 +844,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
             pWidthType ||pSyncWidth || pSyncHeight )
         {
             rSizeFound = true;
-            SwFmtFrmSize aFrmSz ( static_cast < const :: SwFmtFrmSize& > ( rFromSet.Get ( RES_FRM_SIZE ) ) );
+            SwFormatFrmSize aFrmSz ( static_cast < const :: SwFormatFrmSize& > ( rFromSet.Get ( RES_FRM_SIZE ) ) );
             if(pWidth)
                 bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pWidth, MID_FRMSIZE_WIDTH|CONVERT_TWIPS);
             if(pHeight)
@@ -852,11 +852,11 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
             if(pRelH )
                 bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pRelH, MID_FRMSIZE_REL_HEIGHT);
             if (pRelHRelation)
-                bRet &= const_cast<SwFmtFrmSize&>(aFrmSz).PutValue(*pRelHRelation, MID_FRMSIZE_REL_HEIGHT_RELATION);
+                bRet &= const_cast<SwFormatFrmSize&>(aFrmSz).PutValue(*pRelHRelation, MID_FRMSIZE_REL_HEIGHT_RELATION);
             if(pRelW )
                 bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pRelW, MID_FRMSIZE_REL_WIDTH);
             if (pRelWRelation)
-                bRet &= const_cast<SwFmtFrmSize&>(aFrmSz).PutValue(*pRelWRelation, MID_FRMSIZE_REL_WIDTH_RELATION);
+                bRet &= const_cast<SwFormatFrmSize&>(aFrmSz).PutValue(*pRelWRelation, MID_FRMSIZE_REL_WIDTH_RELATION);
             if(pSyncWidth)
                 bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pSyncWidth, MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT);
             if(pSyncHeight)
@@ -876,7 +876,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
         else
         {
             rSizeFound = false;
-            SwFmtFrmSize aFrmSz;
+            SwFormatFrmSize aFrmSz;
             awt::Size aSize;
             aSize.Width = 2 * MM50;
             aSize.Height = 2 * MM50;
@@ -908,9 +908,9 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
     GetProperty(RES_FOLLOW_TEXT_FLOW, 0, pFollowTextFlow);
     if ( pFollowTextFlow )
     {
-        SwFmtFollowTextFlow aFmtFollowTextFlow;
-        aFmtFollowTextFlow.PutValue(*pFollowTextFlow, 0);
-        rToSet.Put(aFmtFollowTextFlow);
+        SwFormatFollowTextFlow aFormatFollowTextFlow;
+        aFormatFollowTextFlow.PutValue(*pFollowTextFlow, 0);
+        rToSet.Put(aFormatFollowTextFlow);
     }
 
     // #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS
@@ -918,9 +918,9 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
     GetProperty(RES_WRAP_INFLUENCE_ON_OBJPOS, MID_WRAP_INFLUENCE, pWrapInfluenceOnObjPos);
     if ( pWrapInfluenceOnObjPos )
     {
-        SwFmtWrapInfluenceOnObjPos aFmtWrapInfluenceOnObjPos;
-        aFmtWrapInfluenceOnObjPos.PutValue( *pWrapInfluenceOnObjPos, MID_WRAP_INFLUENCE );
-        rToSet.Put(aFmtWrapInfluenceOnObjPos);
+        SwFormatWrapInfluenceOnObjPos aFormatWrapInfluenceOnObjPos;
+        aFormatWrapInfluenceOnObjPos.PutValue( *pWrapInfluenceOnObjPos, MID_WRAP_INFLUENCE );
+        rToSet.Put(aFormatWrapInfluenceOnObjPos);
     }
 
     {
@@ -955,7 +955,7 @@ static inline void lcl_FillCol ( SfxItemSet &rToSet, const :: SfxItemSet &rFromS
 {
     if ( pAny )
     {
-        SwFmtCol aCol ( static_cast < const :: SwFmtCol & > ( rFromSet.Get ( RES_COL ) ) );
+        SwFormatCol aCol ( static_cast < const :: SwFormatCol & > ( rFromSet.Get ( RES_COL ) ) );
         ((SfxPoolItem&)aCol).PutValue( *pAny, MID_COLUMNS);
         rToSet.Put(aCol);
     }
@@ -988,7 +988,7 @@ bool SwFrameProperties_Impl::AnyToItemSet(SwDoc *pDoc, SfxItemSet& rSet, SfxItem
     }
     else
     {
-        const :: SfxItemSet *pItemSet = &pDoc->getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_FRAME )->GetAttrSet();
+        const :: SfxItemSet *pItemSet = &pDoc->getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_FRAME )->GetAttrSet();
            bRet = FillBaseProperties( rSet, *pItemSet, rSizeFound );
         lcl_FillCol ( rSet, *pItemSet, pColumns );
     }
@@ -1067,7 +1067,7 @@ bool SwGraphicProperties_Impl::AnyToItemSet(
     }
     else
     {
-        const :: SfxItemSet *pItemSet = &pDoc->getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC )->GetAttrSet();
+        const :: SfxItemSet *pItemSet = &pDoc->getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_GRAPHIC )->GetAttrSet();
         bRet = FillBaseProperties(rFrmSet, *pItemSet, rSizeFound);
         lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet );
     }
@@ -1232,8 +1232,8 @@ SwXFrame::SwXFrame(FlyCntType eSet, const :: SfxItemPropertySet* pSet, SwDoc *pD
     }
 }
 
-SwXFrame::SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet, const :: SfxItemPropertySet* pSet)
-    : SwClient( &rFrmFmt )
+SwXFrame::SwXFrame(SwFrameFormat& rFrameFormat, FlyCntType eSet, const :: SfxItemPropertySet* pSet)
+    : SwClient( &rFrameFormat )
     , m_pImpl(new Impl)
     ,
     m_pPropSet(pSet),
@@ -1254,23 +1254,23 @@ SwXFrame::~SwXFrame()
 
 template<class Interface, class NameLookupIsHard>
 uno::Reference<Interface>
-SwXFrame::CreateXFrame(SwDoc & rDoc, SwFrmFmt *const pFrmFmt)
+SwXFrame::CreateXFrame(SwDoc & rDoc, SwFrameFormat *const pFrameFormat)
 {
-    assert(!pFrmFmt || &rDoc == pFrmFmt->GetDoc());
+    assert(!pFrameFormat || &rDoc == pFrameFormat->GetDoc());
     uno::Reference<Interface> xFrame;
-    if (pFrmFmt)
+    if (pFrameFormat)
     {
-        xFrame.set(pFrmFmt->GetXObject(), uno::UNO_QUERY); // cached?
+        xFrame.set(pFrameFormat->GetXObject(), uno::UNO_QUERY); // cached?
     }
     if (!xFrame.is())
     {
-        NameLookupIsHard *const pNew((pFrmFmt)
-                ? new NameLookupIsHard(*pFrmFmt)
+        NameLookupIsHard *const pNew((pFrameFormat)
+                ? new NameLookupIsHard(*pFrameFormat)
                 : new NameLookupIsHard(&rDoc));
         xFrame.set(pNew);
-        if (pFrmFmt)
+        if (pFrameFormat)
         {
-            pFrmFmt->SetXObject(xFrame);
+            pFrameFormat->SetXObject(xFrame);
         }
         // need a permanent Reference to initialize m_wThis
         pNew->SwXFrame::m_pImpl->m_wThis = xFrame;
@@ -1281,9 +1281,9 @@ SwXFrame::CreateXFrame(SwDoc & rDoc, SwFrmFmt *const pFrmFmt)
 OUString SwXFrame::getName() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
-        return pFmt->GetName();
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
+        return pFormat->GetName();
     if(!bIsDescriptor)
         throw uno::RuntimeException();
     return m_sName;
@@ -1292,11 +1292,11 @@ OUString SwXFrame::getName() throw( uno::RuntimeException, std::exception )
 void SwXFrame::setName(const OUString& rName) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
-        pFmt->GetDoc()->SetFlyName(static_cast<SwFlyFrmFmt&>(*pFmt), rName);
-        if(pFmt->GetName() != rName)
+        pFormat->GetDoc()->SetFlyName(static_cast<SwFlyFrameFormat&>(*pFormat), rName);
+        if(pFormat->GetName() != rName)
         {
             throw uno::RuntimeException();
         }
@@ -1344,22 +1344,22 @@ void SwXFrame::SetSelection(SwPaM& rCopySource)
     *m_pCopySource->GetMark() = *rCopySource.End();
 }
 
-SdrObject *SwXFrame::GetOrCreateSdrObject(SwFlyFrmFmt &rFmt)
+SdrObject *SwXFrame::GetOrCreateSdrObject(SwFlyFrameFormat &rFormat)
 {
-    SdrObject* pObject = rFmt.FindSdrObject();
+    SdrObject* pObject = rFormat.FindSdrObject();
     if( !pObject )
     {
-        SwDoc *pDoc = rFmt.GetDoc();
+        SwDoc *pDoc = rFormat.GetDoc();
         // #i52858# - method name changed
         SwDrawModel* pDrawModel = pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
         SwFlyDrawContact* pContactObject
-                    = new SwFlyDrawContact( &rFmt, pDrawModel );
+                    = new SwFlyDrawContact( &rFormat, pDrawModel );
         pObject = pContactObject->GetMaster();
 
-        const :: SwFmtSurround& rSurround = rFmt.GetSurround();
+        const :: SwFormatSurround& rSurround = rFormat.GetSurround();
         pObject->SetLayer(
             ( SURROUND_THROUGHT == rSurround.GetSurround() &&
-              !rFmt.GetOpaque().GetValue() ) ? pDoc->getIDocumentDrawModelAccess().GetHellId()
+              !rFormat.GetOpaque().GetValue() ) ? pDoc->getIDocumentDrawModelAccess().GetHellId()
                                              : pDoc->getIDocumentDrawModelAccess().GetHeavenId() );
         pDrawModel->GetPage(0)->InsertObject( pObject );
     }
@@ -1367,9 +1367,9 @@ SdrObject *SwXFrame::GetOrCreateSdrObject(SwFlyFrmFmt &rFmt)
     return pObject;
 }
 
-static SwFrmFmt *lcl_GetFrmFmt( const :: uno::Any& rValue, SwDoc *pDoc )
+static SwFrameFormat *lcl_GetFrameFormat( const :: uno::Any& rValue, SwDoc *pDoc )
 {
-    SwFrmFmt *pRet = 0;
+    SwFrameFormat *pRet = 0;
     SwDocShell* pDocSh = pDoc->GetDocShell();
     if(pDocSh)
     {
@@ -1382,7 +1382,7 @@ static SwFrmFmt *lcl_GetFrmFmt( const :: uno::Any& rValue, SwDoc *pDoc )
                 static_cast<SwDocStyleSheet*>(pDocSh->GetStyleSheetPool()->Find(sStyle,
                                                     SFX_STYLE_FAMILY_FRAME));
         if(pStyle)
-            pRet = pStyle->GetFrmFmt();
+            pRet = pStyle->GetFrameFormat();
     }
 
     return pRet;
@@ -1392,7 +1392,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
     throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
+    SwFrameFormat* pFormat = GetFrameFormat();
     const :: SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
 
     if (!pEntry)
@@ -1421,7 +1421,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
 
         if(bDoIt)
         {
-            const SwDoc* pDoc = (IsDescriptor() ? m_pDoc : GetFrmFmt()->GetDoc());
+            const SwDoc* pDoc = (IsDescriptor() ? m_pDoc : GetFrameFormat()->GetDoc());
             const SfxItemPool& rPool = pDoc->GetAttrPool();
             const SfxMapUnit eMapUnit(rPool.GetMetric(pEntry->nWID));
 
@@ -1432,28 +1432,28 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
         }
     }
 
-    if(pFmt)
+    if(pFormat)
     {
         bool bNextFrame = false;
         if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
             throw beans::PropertyVetoException("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
 
-        SwDoc* pDoc = pFmt->GetDoc();
+        SwDoc* pDoc = pFormat->GetDoc();
         if ( ((eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID)) ||
             (FN_PARAM_COUNTOUR_PP        == pEntry->nWID) ||
             (FN_UNO_IS_AUTOMATIC_CONTOUR == pEntry->nWID) ||
             (FN_UNO_IS_PIXEL_CONTOUR     == pEntry->nWID) )
         {
-            const :: SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const :: SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
             if(pIdx)
             {
                 SwNodeIndex aIdx(*pIdx, 1);
-                SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
+                SwNoTextNode* pNoText = aIdx.GetNode().GetNoTextNode();
                 if(pEntry->nWID == FN_PARAM_COUNTOUR_PP)
                 {
                     drawing::PointSequenceSequence aParam;
                     if(!aValue.hasValue())
-                        pNoTxt->SetContour(0);
+                        pNoText->SetContour(0);
                     else if(aValue >>= aParam)
                     {
                         tools::PolyPolygon aPoly((sal_uInt16)aParam.getLength());
@@ -1472,14 +1472,14 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                             aSet.Optimize( PolyOptimizeFlags::CLOSE );
                             aPoly.Insert( aSet );
                         }
-                        pNoTxt->SetContourAPI( &aPoly );
+                        pNoText->SetContourAPI( &aPoly );
                     }
                     else
                         throw lang::IllegalArgumentException();
                 }
                 else if(pEntry->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR )
                 {
-                    pNoTxt->SetAutomaticContour( *static_cast<sal_Bool const *>(aValue.getValue()) );
+                    pNoText->SetAutomaticContour( *static_cast<sal_Bool const *>(aValue.getValue()) );
                 }
                 else if(pEntry->nWID == FN_UNO_IS_PIXEL_CONTOUR )
                 {
@@ -1487,75 +1487,75 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                     // is no contour, or if the contour has been set by the
                     // API itself (or in other words, if the contour isn't
                     // used already).
-                    if( !pNoTxt->_HasContour() ||
-                        !pNoTxt->IsContourMapModeValid() )
-                        pNoTxt->SetPixelContour( *static_cast<sal_Bool const *>(aValue.getValue()) );
+                    if( !pNoText->_HasContour() ||
+                        !pNoText->IsContourMapModeValid() )
+                        pNoText->SetPixelContour( *static_cast<sal_Bool const *>(aValue.getValue()) );
                     else
                         throw lang::IllegalArgumentException();
                 }
                 else
                 {
-                    SfxItemSet aSet(pNoTxt->GetSwAttrSet());
+                    SfxItemSet aSet(pNoText->GetSwAttrSet());
                     m_pPropSet->setPropertyValue(*pEntry, aValue, aSet);
-                    pNoTxt->SetAttr(aSet);
+                    pNoText->SetAttr(aSet);
                 }
             }
         }
         // New attribute Title
         else if( FN_UNO_TITLE == pEntry->nWID )
         {
-            SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
+            SwFlyFrameFormat& rFlyFormat = dynamic_cast<SwFlyFrameFormat&>(*pFormat);
             OUString sTitle;
             aValue >>= sTitle;
             // assure that <SdrObject> instance exists.
-            GetOrCreateSdrObject(rFlyFmt);
-            rFlyFmt.GetDoc()->SetFlyFrmTitle(rFlyFmt, sTitle);
+            GetOrCreateSdrObject(rFlyFormat);
+            rFlyFormat.GetDoc()->SetFlyFrmTitle(rFlyFormat, sTitle);
         }
         // New attribute Description
         else if( FN_UNO_DESCRIPTION == pEntry->nWID )
         {
-            SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
+            SwFlyFrameFormat& rFlyFormat = dynamic_cast<SwFlyFrameFormat&>(*pFormat);
             OUString sDescription;
             aValue >>= sDescription;
             // assure that <SdrObject> instance exists.
-            GetOrCreateSdrObject(rFlyFmt);
-            rFlyFmt.GetDoc()->SetFlyFrmDescription(rFlyFmt, sDescription);
+            GetOrCreateSdrObject(rFlyFormat);
+            rFlyFormat.GetDoc()->SetFlyFrmDescription(rFlyFormat, sDescription);
         }
         else if(FN_UNO_FRAME_STYLE_NAME == pEntry->nWID)
         {
-            SwFrmFmt *pFrmFmt = lcl_GetFrmFmt( aValue, pFmt->GetDoc() );
-            if( pFrmFmt )
+            SwFrameFormat *pFrameFormat = lcl_GetFrameFormat( aValue, pFormat->GetDoc() );
+            if( pFrameFormat )
             {
-                UnoActionContext aAction(pFmt->GetDoc());
+                UnoActionContext aAction(pFormat->GetDoc());
 
                 SfxItemSet* pSet = 0;
                 // #i31771#, #i25798# - No adjustment of
                 // anchor ( no call of method <sw_ChkAndSetNewAnchor(..)> ),
                 // if document is currently in reading mode.
-                if ( !pFmt->GetDoc()->IsInReading() )
+                if ( !pFormat->GetDoc()->IsInReading() )
                 {
-                    // see SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, bool bKeepOrient, Point* pDocPos )
+                    // see SwFEShell::SetFrameFormat( SwFrameFormat *pNewFormat, bool bKeepOrient, Point* pDocPos )
                     SwFlyFrm *pFly = 0;
                     {
-                        const SwFrmFmt* pFmtXX = pFmt;
-                        if (PTR_CAST(SwFlyFrmFmt, pFmtXX))
-                            pFly = static_cast<const SwFlyFrmFmt*>(pFmtXX)->GetFrm();
+                        const SwFrameFormat* pFormatXX = pFormat;
+                        if (PTR_CAST(SwFlyFrameFormat, pFormatXX))
+                            pFly = static_cast<const SwFlyFrameFormat*>(pFormatXX)->GetFrm();
                     }
                     if ( pFly )
                     {
                         const :: SfxPoolItem* pItem;
-                        if( SfxItemState::SET == pFrmFmt->GetItemState( RES_ANCHOR, false, &pItem ))
+                        if( SfxItemState::SET == pFrameFormat->GetItemState( RES_ANCHOR, false, &pItem ))
                         {
-                            pSet = new SfxItemSet( pDoc->GetAttrPool(), aFrmFmtSetRange );
+                            pSet = new SfxItemSet( pDoc->GetAttrPool(), aFrameFormatSetRange );
                             pSet->Put( *pItem );
-                            if ( pFmt->GetDoc()->GetEditShell() != NULL
+                            if ( pFormat->GetDoc()->GetEditShell() != NULL
                                  && !sw_ChkAndSetNewAnchor( *pFly, *pSet ) )
                                 delete pSet, pSet = 0;
                         }
                     }
                 }
 
-                pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt, pSet, false );
+                pFormat->GetDoc()->SetFrameFormatToFly( *pFormat, *pFrameFormat, pSet, false );
                 delete pSet;
             }
             else
@@ -1567,10 +1567,10 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
             OUString sGrfName;
             OUString sFltName;
             GraphicObject *pGrfObj = 0;
-            SwDoc::GetGrfNms( *static_cast<SwFlyFrmFmt*>(pFmt), &sGrfName, &sFltName );
+            SwDoc::GetGrfNms( *static_cast<SwFlyFrameFormat*>(pFormat), &sGrfName, &sFltName );
             OUString sTmp;
             aValue >>= sTmp;
-            UnoActionContext aAction(pFmt->GetDoc());
+            UnoActionContext aAction(pFormat->GetDoc());
             if(FN_UNO_GRAPHIC_U_R_L == pEntry->nWID)
             {
                 if( sTmp.startsWith(sPackageProtocol) )
@@ -1597,7 +1597,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                 sFltName = sTmp;
             }
 
-            const :: SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const :: SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
             if(pIdx)
             {
                 SwNodeIndex aIdx(*pIdx, 1);
@@ -1608,7 +1608,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                     throw uno::RuntimeException();
                 }
                 SwPaM aGrfPaM(*pGrfNode);
-                pFmt->GetDoc()->getIDocumentContentOperations().ReRead( aGrfPaM, sGrfName, sFltName, 0,
+                pFormat->GetDoc()->getIDocumentContentOperations().ReRead( aGrfPaM, sGrfName, sFltName, 0,
                                         pGrfObj );
             }
             delete pGrfObj;
@@ -1619,7 +1619,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
             aValue >>= xGraphic;
             if(xGraphic.is())
             {
-                const :: SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+                const :: SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
                 if(pIdx)
                 {
                     SwNodeIndex aIdx(*pIdx, 1);
@@ -1630,7 +1630,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                     }
                     SwPaM aGrfPaM(*pGrfNode);
                     Graphic aGraphic( xGraphic );
-                    pFmt->GetDoc()->getIDocumentContentOperations().ReRead( aGrfPaM, OUString(), OUString(), &aGraphic, 0 );
+                    pFormat->GetDoc()->getIDocumentContentOperations().ReRead( aGrfPaM, OUString(), OUString(), &aGraphic, 0 );
                 }
             }
         }
@@ -1671,10 +1671,10 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
 
             if ( bApply )
             {
-                const :: SwFmtCntnt* pCnt = &pFmt->GetCntnt();
-                if ( pCnt->GetCntntIdx() && pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ] )
+                const :: SwFormatContent* pCnt = &pFormat->GetContent();
+                if ( pCnt->GetContentIdx() && pDoc->GetNodes()[ pCnt->GetContentIdx()->GetIndex() + 1 ] )
                 {
-                    SwOLENode* pOleNode =  pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ]->GetOLENode();
+                    SwOLENode* pOleNode =  pDoc->GetNodes()[ pCnt->GetContentIdx()->GetIndex() + 1 ]->GetOLENode();
 
                     if ( pOleNode )
                     {
@@ -1694,11 +1694,11 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
             if (sChainName.isEmpty())
             {
                 if(bNextFrame)
-                    pDoc->Unchain(*pFmt);
+                    pDoc->Unchain(*pFormat);
                 else
                 {
-                    SwFmtChain aChain( pFmt->GetChain() );
-                    SwFrmFmt *pPrev = aChain.GetPrev();
+                    SwFormatChain aChain( pFormat->GetChain() );
+                    SwFrameFormat *pPrev = aChain.GetPrev();
                     if(pPrev)
                         pDoc->Unchain(*pPrev);
                 }
@@ -1707,20 +1707,20 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
             {
                 const size_t nCount = pDoc->GetFlyCount(FLYCNTTYPE_FRM);
 
-                SwFrmFmt* pChain = 0;
+                SwFrameFormat* pChain = 0;
                 for( size_t i = 0; i < nCount; ++i )
                 {
-                    SwFrmFmt* pFmt2 = pDoc->GetFlyNum(i, FLYCNTTYPE_FRM);
-                    if(sChainName == pFmt2->GetName() )
+                    SwFrameFormat* pFormat2 = pDoc->GetFlyNum(i, FLYCNTTYPE_FRM);
+                    if(sChainName == pFormat2->GetName() )
                     {
-                        pChain = pFmt2;
+                        pChain = pFormat2;
                         break;
                     }
                 }
                 if(pChain)
                 {
-                    SwFrmFmt* pSource = bNextFrame ? pFmt : pChain;
-                    SwFrmFmt* pDest = bNextFrame ? pChain: pFmt;
+                    SwFrameFormat* pSource = bNextFrame ? pFormat : pChain;
+                    SwFrameFormat* pDest = bNextFrame ? pChain: pFormat;
                     pDoc->Chain(*pSource, *pDest);
                 }
             }
@@ -1731,11 +1731,11 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
             aValue >>= nZOrder;
 
             // Don't set an explicit ZOrder on TextBoxes.
-            std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
-            if( nZOrder >= 0 && aTextBoxes.find(pFmt) == aTextBoxes.end())
+            std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+            if( nZOrder >= 0 && aTextBoxes.find(pFormat) == aTextBoxes.end())
             {
                 SdrObject* pObject =
-                    GetOrCreateSdrObject( static_cast<SwFlyFrmFmt&>(*pFmt) );
+                    GetOrCreateSdrObject( static_cast<SwFlyFrameFormat&>(*pFormat) );
                 SwDrawModel *pDrawModel = pDoc->getIDocumentDrawModelAccess().GetDrawModel();
                 pDrawModel->GetPage(0)->
                             SetObjectOrdNum(pObject->GetOrdNum(), nZOrder);
@@ -1751,18 +1751,18 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                 SwXFrame* pFrame = xTunnel.is() ?
                         reinterpret_cast< SwXFrame * >( sal::static_int_cast< sal_IntPtr >( xTunnel->getSomething(SwXFrame::getUnoTunnelId()) ))
                         : 0;
-                if(pFrame && this != pFrame && pFrame->GetFrmFmt() && pFrame->GetFrmFmt()->GetDoc() == pDoc)
+                if(pFrame && this != pFrame && pFrame->GetFrameFormat() && pFrame->GetFrameFormat()->GetDoc() == pDoc)
                 {
                     SfxItemSet aSet( pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END - 1 );
-                    aSet.SetParent(&pFmt->GetAttrSet());
-                    SwFmtAnchor aAnchor = static_cast<const SwFmtAnchor&>(aSet.Get(pEntry->nWID));
+                    aSet.SetParent(&pFormat->GetAttrSet());
+                    SwFormatAnchor aAnchor = static_cast<const SwFormatAnchor&>(aSet.Get(pEntry->nWID));
 
-                    SwPosition aPos(*pFrame->GetFrmFmt()->GetCntnt().GetCntntIdx());
+                    SwPosition aPos(*pFrame->GetFrameFormat()->GetContent().GetContentIdx());
                     aAnchor.SetAnchor(&aPos);
                     aAnchor.SetType(FLY_AT_FLY);
                     aSet.Put(aAnchor);
-                    pDoc->SetFlyFrmAttr( *pFmt, aSet );
+                    pDoc->SetFlyFrmAttr( *pFormat, aSet );
                     bDone = true;
                 }
             }
@@ -1783,11 +1783,11 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                 0L);
             bool bDone(false);
 
-            aSet.SetParent(&pFmt->GetAttrSet());
+            aSet.SetParent(&pFormat->GetAttrSet());
 
             if(RES_BACKGROUND == pEntry->nWID)
             {
-                const SwAttrSet& rSet = pFmt->GetAttrSet();
+                const SwAttrSet& rSet = pFormat->GetAttrSet();
                 const SvxBrushItem aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet, RES_BACKGROUND));
                 SvxBrushItem aChangedBrushItem(aOriginalBrushItem);
 
@@ -1796,7 +1796,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                 if(!(aChangedBrushItem == aOriginalBrushItem))
                 {
                     setSvxBrushItemAsFillAttributesToTargetSet(aChangedBrushItem, aSet);
-                    pFmt->GetDoc()->SetFlyFrmAttr( *pFmt, aSet );
+                    pFormat->GetDoc()->SetFlyFrmAttr( *pFormat, aSet );
                 }
 
                 bDone = true;
@@ -1820,7 +1820,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
 
                 aSet.Put(XFillBmpStretchItem(drawing::BitmapMode_STRETCH == eMode));
                 aSet.Put(XFillBmpTileItem(drawing::BitmapMode_REPEAT == eMode));
-                pFmt->GetDoc()->SetFlyFrmAttr( *pFmt, aSet );
+                pFormat->GetDoc()->SetFlyFrmAttr( *pFormat, aSet );
                 bDone = true;
             }
 
@@ -1889,12 +1889,12 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
 
             if(RES_ANCHOR == pEntry->nWID && MID_ANCHOR_ANCHORTYPE == nMemberId)
             {
-                SwFmtAnchor aAnchor = static_cast<const SwFmtAnchor&>(aSet.Get(pEntry->nWID));
+                SwFormatAnchor aAnchor = static_cast<const SwFormatAnchor&>(aSet.Get(pEntry->nWID));
                 if(aAnchor.GetAnchorId() == FLY_AT_FLY)
                 {
-                    const :: SwPosition* pPosition = aAnchor.GetCntntAnchor();
-                    SwFrmFmt* pFlyFmt = pPosition ? pPosition->nNode.GetNode().GetFlyFmt() : 0;
-                    if(!pFlyFmt || pFlyFmt->Which() == RES_DRAWFRMFMT)
+                    const :: SwPosition* pPosition = aAnchor.GetContentAnchor();
+                    SwFrameFormat* pFlyFormat = pPosition ? pPosition->nNode.GetNode().GetFlyFormat() : 0;
+                    if(!pFlyFormat || pFlyFormat->Which() == RES_DRAWFRMFMT)
                     {
                         lang::IllegalArgumentException aExcept;
                         aExcept.Message = "Anchor to frame: no frame found";
@@ -1903,13 +1903,13 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                     else
                     {
                         SwPosition aPos = *pPosition;
-                        aPos.nNode = *pFlyFmt->GetCntnt().GetCntntIdx();
+                        aPos.nNode = *pFlyFormat->GetContent().GetContentIdx();
                         aAnchor.SetAnchor(&aPos);
                         aSet.Put(aAnchor);
                     }
                 }
                 else if ((aAnchor.GetAnchorId() != FLY_AT_PAGE) &&
-                         !aAnchor.GetCntntAnchor())
+                         !aAnchor.GetContentAnchor())
                 {
                     SwNode& rNode = pDoc->GetNodes().GetEndOfContent();
                     SwPaM aPam(rNode);
@@ -1921,19 +1921,19 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                 // #i31771#, #i25798# - No adjustment of
                 // anchor ( no call of method <sw_ChkAndSetNewAnchor(..)> ),
                 // if document is currently in reading mode.
-                if ( !pFmt->GetDoc()->IsInReading() )
+                if ( !pFormat->GetDoc()->IsInReading() )
                 {
                     // see SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
                     SwFlyFrm *pFly = 0;
-                    if (PTR_CAST(SwFlyFrmFmt, pFmt))
-                        pFly = static_cast<SwFlyFrmFmt*>(pFmt)->GetFrm();
+                    if (PTR_CAST(SwFlyFrameFormat, pFormat))
+                        pFly = static_cast<SwFlyFrameFormat*>(pFormat)->GetFrm();
                     if (pFly)
                     {
                         const :: SfxPoolItem* pItem;
                         if( SfxItemState::SET == aSet.GetItemState( RES_ANCHOR, false, &pItem ))
                         {
                             aSet.Put( *pItem );
-                            if ( pFmt->GetDoc()->GetEditShell() != NULL )
+                            if ( pFormat->GetDoc()->GetEditShell() != NULL )
                             {
                                 sw_ChkAndSetNewAnchor( *pFly, aSet );
                             }
@@ -1941,7 +1941,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
                     }
                 }
 
-                pFmt->GetDoc()->SetFlyFrmAttr( *pFmt, aSet );
+                pFormat->GetDoc()->SetFlyFrmAttr( *pFormat, aSet );
             }
             else if(FN_UNO_CLSID == pEntry->nWID || FN_UNO_STREAM_NAME == pEntry->nWID || FN_EMBEDDED_OBJECT == pEntry->nWID)
             {
@@ -1949,7 +1949,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
             }
             else
             {
-                pFmt->SetFmtAttr(aSet);
+                pFormat->SetFormatAttr(aSet);
             }
         }
     }
@@ -1985,7 +1985,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
 {
     SolarMutexGuard aGuard;
     uno::Any aAny;
-    SwFrmFmt* pFmt = GetFrmFmt();
+    SwFrameFormat* pFormat = GetFrameFormat();
     const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
     if (!pEntry)
         throw beans::UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -2004,7 +2004,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         pArray[4] = text::TextContentAnchorType_AT_CHARACTER;
         aAny.setValue(&aTypes, cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get());
     }
-    else if(pFmt)
+    else if(pFormat)
     {
         if( ((eType == FLYCNTTYPE_GRF) || (eType == FLYCNTTYPE_OLE)) &&
                 (isGRFATR(pEntry->nWID) ||
@@ -2012,15 +2012,15 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
                         pEntry->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR ||
                         pEntry->nWID == FN_UNO_IS_PIXEL_CONTOUR ))
         {
-            const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
             if(pIdx)
             {
                 SwNodeIndex aIdx(*pIdx, 1);
-                SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
+                SwNoTextNode* pNoText = aIdx.GetNode().GetNoTextNode();
                 if(pEntry->nWID == FN_PARAM_COUNTOUR_PP)
                 {
                     tools::PolyPolygon aContour;
-                    if( pNoTxt->GetContourAPI( aContour ) )
+                    if( pNoText->GetContourAPI( aContour ) )
                     {
                         drawing::PointSequenceSequence aPtSeq(aContour.Count());
                         drawing::PointSequence* pPSeq = aPtSeq.getArray();
@@ -2041,15 +2041,15 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
                 }
                 else if(pEntry->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR )
                 {
-                    aAny <<= pNoTxt->HasAutomaticContour();
+                    aAny <<= pNoText->HasAutomaticContour();
                 }
                 else if(pEntry->nWID == FN_UNO_IS_PIXEL_CONTOUR )
                 {
-                    aAny <<= pNoTxt->IsPixelContour();
+                    aAny <<= pNoText->IsPixelContour();
                 }
                 else
                 {
-                    SfxItemSet aSet(pNoTxt->GetSwAttrSet());
+                    SfxItemSet aSet(pNoText->GetSwAttrSet());
                     m_pPropSet->getPropertyValue(*pEntry, aSet, aAny);
                 }
             }
@@ -2057,7 +2057,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         else if( FN_UNO_GRAPHIC_U_R_L == pEntry->nWID)
         {
             OUString sGrfName;
-            const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
             if(pIdx)
             {
                 SwNodeIndex aIdx(*pIdx, 1);
@@ -2066,7 +2066,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
                     throw uno::RuntimeException();
                 if( pGrfNode->IsGrfLink() )
                 {
-                    SwDoc::GetGrfNms( *static_cast<SwFlyFrmFmt*>(pFmt), &sGrfName, 0 );
+                    SwDoc::GetGrfNms( *static_cast<SwFlyFrameFormat*>(pFormat), &sGrfName, 0 );
                 }
                 else
                 {
@@ -2081,7 +2081,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         else if( FN_UNO_REPLACEMENT_GRAPHIC_U_R_L == pEntry->nWID)
         {
             OUString sGrfName;
-            const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
 
             if(pIdx)
             {
@@ -2104,12 +2104,12 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         else if( FN_UNO_GRAPHIC_FILTER == pEntry->nWID )
         {
             OUString sFltName;
-            SwDoc::GetGrfNms( *static_cast<SwFlyFrmFmt*>(pFmt), 0, &sFltName );
+            SwDoc::GetGrfNms( *static_cast<SwFlyFrameFormat*>(pFormat), 0, &sFltName );
                 aAny <<= sFltName;
         }
         else if( FN_UNO_GRAPHIC == pEntry->nWID )
         {
-            const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
             if(pIdx)
             {
                 SwNodeIndex aIdx(*pIdx, 1);
@@ -2121,32 +2121,32 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         }
         else if(FN_UNO_FRAME_STYLE_NAME == pEntry->nWID)
         {
-            aAny <<= OUString(SwStyleNameMapper::GetProgName(pFmt->DerivedFrom()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_FRMFMT ) );
+            aAny <<= OUString(SwStyleNameMapper::GetProgName(pFormat->DerivedFrom()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_FRMFMT ) );
         }
         // #i73249#
         else if( FN_UNO_TITLE == pEntry->nWID )
         {
-            SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
+            SwFlyFrameFormat& rFlyFormat = dynamic_cast<SwFlyFrameFormat&>(*pFormat);
             // assure that <SdrObject> instance exists.
-            GetOrCreateSdrObject(rFlyFmt);
-            aAny <<= OUString(rFlyFmt.GetObjTitle());
+            GetOrCreateSdrObject(rFlyFormat);
+            aAny <<= OUString(rFlyFormat.GetObjTitle());
         }
         // New attribute Description
         else if( FN_UNO_DESCRIPTION == pEntry->nWID )
         {
-            SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
+            SwFlyFrameFormat& rFlyFormat = dynamic_cast<SwFlyFrameFormat&>(*pFormat);
             // assure that <SdrObject> instance exists.
-            GetOrCreateSdrObject(rFlyFmt);
-            aAny <<= OUString(rFlyFmt.GetObjDescription());
+            GetOrCreateSdrObject(rFlyFormat);
+            aAny <<= OUString(rFlyFormat.GetObjDescription());
         }
         else if(eType == FLYCNTTYPE_GRF &&
                 (rPropertyName == UNO_NAME_ACTUAL_SIZE))
         {
-            const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+            const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
             if(pIdx)
             {
                 SwNodeIndex aIdx(*pIdx, 1);
-                Size aActSize = aIdx.GetNode().GetNoTxtNode()->GetTwipSize();
+                Size aActSize = aIdx.GetNode().GetNoTextNode()->GetTwipSize();
                 awt::Size aTmp;
                 aTmp.Width = convertTwipToMm100(aActSize.Width());
                 aTmp.Height = convertTwipToMm100(aActSize.Height());
@@ -2155,13 +2155,13 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         }
         else if(FN_PARAM_LINK_DISPLAY_NAME == pEntry->nWID)
         {
-            aAny <<= pFmt->GetName();
+            aAny <<= pFormat->GetName();
         }
         else if(FN_UNO_Z_ORDER == pEntry->nWID)
         {
-            const SdrObject* pObj = pFmt->FindRealSdrObject();
+            const SdrObject* pObj = pFormat->FindRealSdrObject();
             if( pObj == NULL )
-                pObj = pFmt->FindSdrObject();
+                pObj = pFormat->FindSdrObject();
             if( pObj )
             {
                 aAny <<= (sal_Int32)pObj->GetOrdNum();
@@ -2171,13 +2171,13 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
                 FN_UNO_COMPONENT == pEntry->nWID ||FN_UNO_STREAM_NAME == pEntry->nWID||
                 FN_EMBEDDED_OBJECT == pEntry->nWID)
         {
-            SwDoc* pDoc = pFmt->GetDoc();
-            const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
-            OSL_ENSURE( pCnt->GetCntntIdx() &&
-                           pDoc->GetNodes()[ pCnt->GetCntntIdx()->
+            SwDoc* pDoc = pFormat->GetDoc();
+            const SwFormatContent* pCnt = &pFormat->GetContent();
+            OSL_ENSURE( pCnt->GetContentIdx() &&
+                           pDoc->GetNodes()[ pCnt->GetContentIdx()->
                                             GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
 
-            SwOLENode* pOleNode =  pDoc->GetNodes()[ pCnt->GetCntntIdx()
+            SwOLENode* pOleNode =  pDoc->GetNodes()[ pCnt->GetContentIdx()
                                             ->GetIndex() + 1 ]->GetOLENode();
             uno::Reference < embed::XEmbeddedObject > xIP = pOleNode->GetOLEObj().GetOleRef();
             OUString aHexCLSID;
@@ -2220,9 +2220,9 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         else if(WID_LAYOUT_SIZE == pEntry->nWID)
         {
             // format document completely in order to get correct value
-            pFmt->GetDoc()->GetEditShell()->CalcLayout();
+            pFormat->GetDoc()->GetEditShell()->CalcLayout();
 
-            SwFrm* pTmpFrm = SwIterator<SwFrm,SwFmt>( *pFmt ).First();
+            SwFrm* pTmpFrm = SwIterator<SwFrm,SwFormat>( *pFormat ).First();
             if ( pTmpFrm )
             {
                 OSL_ENSURE( pTmpFrm->IsValid(), "frame not valid" );
@@ -2237,7 +2237,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         {   //UUUU
             // standard UNO API read attributes
             // adapt former attr from SvxBrushItem::PutValue to new items XATTR_FILL_FIRST, XATTR_FILL_LAST
-            const SwAttrSet& rSet = pFmt->GetAttrSet();
+            const SwAttrSet& rSet = pFormat->GetAttrSet();
             bool bDone(false);
 
             if(RES_BACKGROUND == pEntry->nWID)
@@ -2324,7 +2324,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
 
         if(bDoIt)
         {
-            const SwDoc* pDoc = (IsDescriptor() ? m_pDoc : GetFrmFmt()->GetDoc());
+            const SwDoc* pDoc = (IsDescriptor() ? m_pDoc : GetFrameFormat()->GetDoc());
             const SfxItemPool& rPool = pDoc->GetAttrPool();
             const SfxMapUnit eMapUnit(rPool.GetMetric(pEntry->nWID));
 
@@ -2384,11 +2384,11 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
     SolarMutexGuard aGuard;
     uno::Sequence< beans::PropertyState > aStates(aPropertyNames.getLength());
     beans::PropertyState* pStates = aStates.getArray();
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
         const OUString* pNames = aPropertyNames.getConstArray();
-        const SwAttrSet& rFmtSet = pFmt->GetAttrSet();
+        const SwAttrSet& rFormatSet = pFormat->GetAttrSet();
         for(int i = 0; i < aPropertyNames.getLength(); i++)
         {
             const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(pNames[i]);
@@ -2408,8 +2408,8 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
             else if(OWN_ATTR_FILLBMP_MODE == pEntry->nWID)
             {
                 //UUUU
-                if(SfxItemState::SET == rFmtSet.GetItemState(XATTR_FILLBMP_STRETCH, false)
-                    || SfxItemState::SET == rFmtSet.GetItemState(XATTR_FILLBMP_TILE, false))
+                if(SfxItemState::SET == rFormatSet.GetItemState(XATTR_FILLBMP_STRETCH, false)
+                    || SfxItemState::SET == rFormatSet.GetItemState(XATTR_FILLBMP_TILE, false))
                 {
                     pStates[i] = beans::PropertyState_DIRECT_VALUE;
                 }
@@ -2424,7 +2424,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
             // fill attributes to the according SvxBrushItem entries
             else if (RES_BACKGROUND == pEntry->nWID)
             {
-                if (SWUnoHelper::needToMapFillItemsToSvxBrushItemTypes(rFmtSet, pEntry->nMemberId))
+                if (SWUnoHelper::needToMapFillItemsToSvxBrushItemTypes(rFormatSet, pEntry->nMemberId))
                     pStates[i] = beans::PropertyState_DIRECT_VALUE;
                 else
                     pStates[i] = beans::PropertyState_DEFAULT_VALUE;
@@ -2433,12 +2433,12 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
             {
                 if ((eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID))
                 {
-                    const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+                    const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
                     if(pIdx)
                     {
                         SwNodeIndex aIdx(*pIdx, 1);
-                        SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
-                        SfxItemSet aSet(pNoTxt->GetSwAttrSet());
+                        SwNoTextNode* pNoText = aIdx.GetNode().GetNoTextNode();
+                        SfxItemSet aSet(pNoText->GetSwAttrSet());
                         aSet.GetItemState(pEntry->nWID);
                         if(SfxItemState::SET == aSet.GetItemState( pEntry->nWID, false ))
                             pStates[i] = beans::PropertyState_DIRECT_VALUE;
@@ -2446,7 +2446,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
                 }
                 else
                 {
-                    if(SfxItemState::SET == rFmtSet.GetItemState( pEntry->nWID, false ))
+                    if(SfxItemState::SET == rFormatSet.GetItemState( pEntry->nWID, false ))
                         pStates[i] = beans::PropertyState_DIRECT_VALUE;
                     else
                         pStates[i] = beans::PropertyState_DEFAULT_VALUE;
@@ -2468,8 +2468,8 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
     throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
         const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
         if (!pEntry)
@@ -2481,14 +2481,14 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
         if(OWN_ATTR_FILLBMP_MODE == pEntry->nWID)
         {
             //UUUU
-            SwDoc* pDoc = pFmt->GetDoc();
+            SwDoc* pDoc = pFormat->GetDoc();
             SfxItemSet aSet(pDoc->GetAttrPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
-            aSet.SetParent(&pFmt->GetAttrSet());
+            aSet.SetParent(&pFormat->GetAttrSet());
 
             aSet.ClearItem(XATTR_FILLBMP_STRETCH);
             aSet.ClearItem(XATTR_FILLBMP_TILE);
 
-            pFmt->SetFmtAttr(aSet);
+            pFormat->SetFormatAttr(aSet);
         }
         else if( pEntry->nWID &&
             pEntry->nWID != FN_UNO_ANCHOR_TYPES &&
@@ -2496,55 +2496,55 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
         {
             if ( (eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID) )
             {
-                const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+                const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
                 if(pIdx)
                 {
                     SwNodeIndex aIdx(*pIdx, 1);
-                    SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
+                    SwNoTextNode* pNoText = aIdx.GetNode().GetNoTextNode();
                     {
-                        SfxItemSet aSet(pNoTxt->GetSwAttrSet());
+                        SfxItemSet aSet(pNoText->GetSwAttrSet());
                         aSet.ClearItem(pEntry->nWID);
-                        pNoTxt->SetAttr(aSet);
+                        pNoText->SetAttr(aSet);
                     }
                 }
             }
             // #i73249#
             else if( FN_UNO_TITLE == pEntry->nWID )
             {
-                SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
+                SwFlyFrameFormat& rFlyFormat = dynamic_cast<SwFlyFrameFormat&>(*pFormat);
                 // assure that <SdrObject> instance exists.
-                GetOrCreateSdrObject(rFlyFmt);
-                rFlyFmt.GetDoc()->SetFlyFrmTitle(rFlyFmt, aEmptyOUStr);
+                GetOrCreateSdrObject(rFlyFormat);
+                rFlyFormat.GetDoc()->SetFlyFrmTitle(rFlyFormat, aEmptyOUStr);
             }
             // New attribute Description
             else if( FN_UNO_DESCRIPTION == pEntry->nWID )
             {
-                SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
+                SwFlyFrameFormat& rFlyFormat = dynamic_cast<SwFlyFrameFormat&>(*pFormat);
                 // assure that <SdrObject> instance exists.
-                GetOrCreateSdrObject(rFlyFmt);
-                rFlyFmt.GetDoc()->SetFlyFrmDescription(rFlyFmt, aEmptyOUStr);
+                GetOrCreateSdrObject(rFlyFormat);
+                rFlyFormat.GetDoc()->SetFlyFrmDescription(rFlyFormat, aEmptyOUStr);
             }
             else
             {
-                SwDoc* pDoc = pFmt->GetDoc();
+                SwDoc* pDoc = pFormat->GetDoc();
                 SfxItemSet aSet( pDoc->GetAttrPool(),
                     RES_FRMATR_BEGIN, RES_FRMATR_END - 1 );
-                aSet.SetParent(&pFmt->GetAttrSet());
+                aSet.SetParent(&pFormat->GetAttrSet());
                 aSet.ClearItem(pEntry->nWID);
                 if(rPropertyName != UNO_NAME_ANCHOR_TYPE)
-                    pFmt->SetFmtAttr(aSet);
+                    pFormat->SetFormatAttr(aSet);
             }
         }
         else if((bNextFrame = (rPropertyName == UNO_NAME_CHAIN_NEXT_NAME))
                 || rPropertyName == UNO_NAME_CHAIN_PREV_NAME)
         {
-            SwDoc* pDoc = pFmt->GetDoc();
+            SwDoc* pDoc = pFormat->GetDoc();
             if(bNextFrame)
-                pDoc->Unchain(*pFmt);
+                pDoc->Unchain(*pFormat);
             else
             {
-                SwFmtChain aChain( pFmt->GetChain() );
-                SwFrmFmt *pPrev = aChain.GetPrev();
+                SwFormatChain aChain( pFormat->GetChain() );
+                SwFrameFormat *pPrev = aChain.GetPrev();
                 if(pPrev)
                     pDoc->Unchain(*pPrev);
             }
@@ -2560,8 +2560,8 @@ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
         const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
         if(pEntry)
@@ -2569,7 +2569,7 @@ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName )
             if ( pEntry->nWID < RES_FRMATR_END )
             {
                 const SfxPoolItem& rDefItem =
-                    pFmt->GetDoc()->GetAttrPool().GetDefaultItem(pEntry->nWID);
+                    pFormat->GetDoc()->GetAttrPool().GetDefaultItem(pEntry->nWID);
                 //UUUU
                 const sal_uInt8 nMemberId(pEntry->nMemberId & (~SFX_METRIC_ITEM));
 
@@ -2622,10 +2622,10 @@ void SwXFrame::Modify(const SfxPoolItem* pOld, const SfxPoolItem *pNew)
 void SwXFrame::dispose() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if ( pFmt )
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if ( pFormat )
     {
-        SdrObject* pObj = pFmt->FindSdrObject();
+        SdrObject* pObj = pFormat->FindSdrObject();
         // OD 11.09.2003 #112039# - add condition to perform delete of
         // format/anchor sign, not only if the object is inserted, but also
         // if a contact object is registered, which isn't in the destruction.
@@ -2634,15 +2634,15 @@ void SwXFrame::dispose() throw( uno::RuntimeException, std::exception )
                ( pObj->GetUserCall() &&
                  !static_cast<SwContact*>(pObj->GetUserCall())->IsInDTOR() ) ) )
         {
-            if (pFmt->GetAnchor().GetAnchorId() == FLY_AS_CHAR)
+            if (pFormat->GetAnchor().GetAnchorId() == FLY_AS_CHAR)
             {
-                const SwPosition &rPos = *(pFmt->GetAnchor().GetCntntAnchor());
-                SwTxtNode *pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+                const SwPosition &rPos = *(pFormat->GetAnchor().GetContentAnchor());
+                SwTextNode *pTextNode = rPos.nNode.GetNode().GetTextNode();
                 const sal_Int32 nIdx = rPos.nContent.GetIndex();
-                pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
+                pTextNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
             }
             else
-                pFmt->GetDoc()->getIDocumentLayoutAccess().DelLayoutFmt(pFmt);
+                pFormat->GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat(pFormat);
         }
     }
 
@@ -2652,17 +2652,17 @@ uno::Reference< text::XTextRange >  SwXFrame::getAnchor() throw( uno::RuntimeExc
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextRange >  aRef;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
-        const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+        const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
         // return an anchor for non-page bound frames
         // and for page bound frames that have a page no == NULL and a content position
         if ((rAnchor.GetAnchorId() != FLY_AT_PAGE) ||
-            (rAnchor.GetCntntAnchor() && !rAnchor.GetPageNum()))
+            (rAnchor.GetContentAnchor() && !rAnchor.GetPageNum()))
         {
-            const SwPosition &rPos = *(rAnchor.GetCntntAnchor());
-            aRef = SwXTextRange::CreateXTextRange(*pFmt->GetDoc(), rPos, 0);
+            const SwPosition &rPos = *(rAnchor.GetContentAnchor());
+            aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(), rPos, 0);
         }
     }
     else
@@ -2726,7 +2726,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
         SfxItemSet aFrmSet(pDoc->GetAttrPool(), aFrmAttrRange );
 
         //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
-        aFrmSet.SetParent(&pDoc->GetDfltFrmFmt()->GetAttrSet());
+        aFrmSet.SetParent(&pDoc->GetDfltFrameFormat()->GetAttrSet());
 
         // no the related items need to be added to the set
         bool bSizeFound;
@@ -2744,72 +2744,72 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
         RndStdIds eAnchorId = FLY_AT_PARA;
         if(SfxItemState::SET == aFrmSet.GetItemState(RES_ANCHOR, false, &pItem) )
         {
-            eAnchorId = static_cast<const SwFmtAnchor*>(pItem)->GetAnchorId();
+            eAnchorId = static_cast<const SwFormatAnchor*>(pItem)->GetAnchorId();
             if( FLY_AT_FLY == eAnchorId &&
                 !aPam.GetNode().FindFlyStartNode())
             {
                 // framebound only where a frame exists
-                SwFmtAnchor aAnchor(FLY_AT_PARA);
+                SwFormatAnchor aAnchor(FLY_AT_PARA);
                 aFrmSet.Put(aAnchor);
             }
             else if ((FLY_AT_PAGE == eAnchorId) &&
-                     0 == static_cast<const SwFmtAnchor*>(pItem)->GetPageNum() )
+                     0 == static_cast<const SwFormatAnchor*>(pItem)->GetPageNum() )
             {
-                SwFmtAnchor aAnchor( *static_cast<const SwFmtAnchor*>(pItem) );
+                SwFormatAnchor aAnchor( *static_cast<const SwFormatAnchor*>(pItem) );
                 aAnchor.SetAnchor( aPam.GetPoint() );
                 aFrmSet.Put(aAnchor);
             }
         }
 
         const ::uno::Any* pStyle;
-        SwFrmFmt *pParentFrmFmt = 0;
+        SwFrameFormat *pParentFrameFormat = 0;
         if(pProps->GetProperty(FN_UNO_FRAME_STYLE_NAME, 0, pStyle))
-            pParentFrmFmt = lcl_GetFrmFmt( *pStyle, pDoc );
+            pParentFrameFormat = lcl_GetFrameFormat( *pStyle, pDoc );
 
-        SwFlyFrmFmt* pFmt = 0;
+        SwFlyFrameFormat* pFormat = 0;
         if( eType == FLYCNTTYPE_FRM)
         {
             UnoActionContext aCont(pDoc);
             if(m_pCopySource)
             {
-                SwFmtAnchor* pAnchorItem = 0;
+                SwFormatAnchor* pAnchorItem = 0;
                 // the frame is inserted bound to page
                 // to prevent conflicts if the to-be-anchored position is part of the to-be-copied text
                 if (eAnchorId != FLY_AT_PAGE)
                 {
-                    pAnchorItem = static_cast<SwFmtAnchor*>(aFrmSet.Get(RES_ANCHOR).Clone());
-                    aFrmSet.Put( SwFmtAnchor( FLY_AT_PAGE, 1 ));
+                    pAnchorItem = static_cast<SwFormatAnchor*>(aFrmSet.Get(RES_ANCHOR).Clone());
+                    aFrmSet.Put( SwFormatAnchor( FLY_AT_PAGE, 1 ));
                 }
 
                 aPam.DeleteMark(); // mark position node will be deleted!
                 aIntPam.DeleteMark(); // mark position node will be deleted!
-                pFmt = pDoc->MakeFlyAndMove( *m_pCopySource, aFrmSet,
+                pFormat = pDoc->MakeFlyAndMove( *m_pCopySource, aFrmSet,
                                0,
-                               pParentFrmFmt );
-                if(pAnchorItem && pFmt)
+                               pParentFrameFormat );
+                if(pAnchorItem && pFormat)
                 {
-                    pFmt->DelFrms();
+                    pFormat->DelFrms();
                     pAnchorItem->SetAnchor( m_pCopySource->Start() );
                     SfxItemSet aAnchorSet( pDoc->GetAttrPool(), RES_ANCHOR, RES_ANCHOR );
                     aAnchorSet.Put( *pAnchorItem );
-                    pDoc->SetFlyFrmAttr( *pFmt, aAnchorSet );
+                    pDoc->SetFlyFrmAttr( *pFormat, aAnchorSet );
                     delete pAnchorItem;
                 }
                 DELETEZ( m_pCopySource );
             }
             else
             {
-                pFmt = pDoc->MakeFlySection( FLY_AT_PARA, aPam.GetPoint(),
-                                         &aFrmSet, pParentFrmFmt );
+                pFormat = pDoc->MakeFlySection( FLY_AT_PARA, aPam.GetPoint(),
+                                         &aFrmSet, pParentFrameFormat );
             }
-            if(pFmt)
+            if(pFormat)
             {
-                pFmt->Add(this);
+                pFormat->Add(this);
                 if(!m_sName.isEmpty())
-                    pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt, m_sName);
+                    pDoc->SetFlyName((SwFlyFrameFormat&)*pFormat, m_sName);
             }
             // wake up the SwXTextFrame
-            static_cast<SwXTextFrame*>(this)->SetDoc( bIsDescriptor ? m_pDoc : GetFrmFmt()->GetDoc() );
+            static_cast<SwXTextFrame*>(this)->SetDoc( bIsDescriptor ? m_pDoc : GetFrameFormat()->GetDoc() );
         }
         else if( eType == FLYCNTTYPE_GRF)
         {
@@ -2851,21 +2851,21 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                 (*pFilter) >>= sFltName;
             }
 
-            pFmt =
+            pFormat =
                 pGrfObj ? pDoc->getIDocumentContentOperations().Insert( aPam, *pGrfObj, &aFrmSet, &aGrSet,
-                                        pParentFrmFmt )
+                                        pParentFrameFormat )
                         : pDoc->getIDocumentContentOperations().Insert( aPam, sGraphicURL, sFltName, &aGraphic,
-                                        &aFrmSet, &aGrSet, pParentFrmFmt  );
+                                        &aFrmSet, &aGrSet, pParentFrameFormat  );
             delete pGrfObj;
-            if(pFmt)
+            if(pFormat)
             {
-                SwGrfNode *pGrfNd = pDoc->GetNodes()[ pFmt->GetCntnt().GetCntntIdx()
+                SwGrfNode *pGrfNd = pDoc->GetNodes()[ pFormat->GetContent().GetContentIdx()
                                             ->GetIndex()+1 ]->GetGrfNode();
                 if (pGrfNd)
                     pGrfNd->SetChgTwipSize( !bSizeFound );
-                pFmt->Add(this);
+                pFormat->Add(this);
                 if(!m_sName.isEmpty())
-                    pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt, m_sName);
+                    pDoc->SetFlyName((SwFlyFrameFormat&)*pFormat, m_sName);
 
             }
             const ::uno::Any* pSurroundContour;
@@ -2950,22 +2950,22 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                         }
                         MapMode aMyMap( MAP_TWIP );
                         aSz = OutputDevice::LogicToLogic( aSz, aRefMap, aMyMap );
-                        SwFmtFrmSize aFrmSz;
+                        SwFormatFrmSize aFrmSz;
                         aFrmSz.SetSize(aSz);
                         aFrmSet.Put(aFrmSz);
                     }
-                    SwFlyFrmFmt* pFmt2 = 0;
+                    SwFlyFrameFormat* pFormat2 = 0;
 
                     // TODO/LATER: Is it the only possible aspect here?
                     sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
                     ::svt::EmbeddedObjectRef xObjRef( xIPObj, nAspect );
-                    pFmt2 = pDoc->getIDocumentContentOperations().Insert(aPam, xObjRef, &aFrmSet, NULL, NULL );
-                    assert(pFmt2 && "Doc->Insert(notxt) failed.");
+                    pFormat2 = pDoc->getIDocumentContentOperations().Insert(aPam, xObjRef, &aFrmSet, NULL, NULL );
+                    assert(pFormat2 && "Doc->Insert(notxt) failed.");
 
                     pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
-                    pFmt2->Add(this);
+                    pFormat2->Add(this);
                     if(!m_sName.isEmpty())
-                        pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt2, m_sName);
+                        pDoc->SetFlyName((SwFlyFrameFormat&)*pFormat2, m_sName);
                 }
             }
             else if( pStreamName )
@@ -2974,12 +2974,12 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                 (*pStreamName) >>= sStreamName;
                 pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
 
-                SwFlyFrmFmt* pFrmFmt = 0;
-                pFrmFmt = pDoc->getIDocumentContentOperations().InsertOLE( aPam, sStreamName, embed::Aspects::MSOLE_CONTENT, &aFrmSet, NULL, NULL );
+                SwFlyFrameFormat* pFrameFormat = 0;
+                pFrameFormat = pDoc->getIDocumentContentOperations().InsertOLE( aPam, sStreamName, embed::Aspects::MSOLE_CONTENT, &aFrmSet, NULL, NULL );
                 pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
-                pFrmFmt->Add(this);
+                pFrameFormat->Add(this);
                 if(!m_sName.isEmpty())
-                    pDoc->SetFlyName((SwFlyFrmFmt&)*pFrmFmt, m_sName);
+                    pDoc->SetFlyName((SwFlyFrameFormat&)*pFrameFormat, m_sName);
             }
             else if( pEmbeddedObject || pStreamName )
             {
@@ -3000,16 +3000,16 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                 OUString rName;
                 mrPers.GetEmbeddedObjectContainer().InsertEmbeddedObject( obj, rName );
 
-                SwFlyFrmFmt* pFrmFmt = 0;
-                pFrmFmt = pDoc->getIDocumentContentOperations().Insert( aPam, xObj, &aFrmSet, NULL, NULL );
+                SwFlyFrameFormat* pFrameFormat = 0;
+                pFrameFormat = pDoc->getIDocumentContentOperations().Insert( aPam, xObj, &aFrmSet, NULL, NULL );
                 pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
-                pFrmFmt->Add(this);
+                pFrameFormat->Add(this);
                 if(!m_sName.isEmpty())
-                    pDoc->SetFlyName((SwFlyFrmFmt&)*pFrmFmt, m_sName);
+                    pDoc->SetFlyName((SwFlyFrameFormat&)*pFrameFormat, m_sName);
             }
         }
-        if( pFmt && pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
-            GetOrCreateSdrObject(*pFmt);
+        if( pFormat && pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
+            GetOrCreateSdrObject(*pFormat);
         const ::uno::Any* pOrder;
         if( pProps->GetProperty(FN_UNO_Z_ORDER, 0, pOrder) )
             setPropertyValue(UNO_NAME_Z_ORDER, *pOrder);
@@ -3045,22 +3045,22 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
 void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange)
     throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
-    SwFrmFmt* pFmt;
+    SwFrameFormat* pFormat;
     if(IsDescriptor())
         attachToRange(xTextRange);
-    else if(0 != (pFmt = GetFrmFmt()))
+    else if(0 != (pFormat = GetFrameFormat()))
     {
         uno::Reference<lang::XUnoTunnel> xRangeTunnel( xTextRange, uno::UNO_QUERY);
-        SwDoc* pDoc = pFmt->GetDoc();
+        SwDoc* pDoc = pFormat->GetDoc();
         SwUnoInternalPaM aIntPam(*pDoc);
         if (::sw::XTextRangeToSwPaM(aIntPam, xTextRange))
         {
             SfxItemSet aSet( pDoc->GetAttrPool(), RES_ANCHOR, RES_ANCHOR );
-            aSet.SetParent(&pFmt->GetAttrSet());
-            SwFmtAnchor aAnchor = static_cast<const SwFmtAnchor&>(aSet.Get(RES_ANCHOR));
+            aSet.SetParent(&pFormat->GetAttrSet());
+            SwFormatAnchor aAnchor = static_cast<const SwFormatAnchor&>(aSet.Get(RES_ANCHOR));
             aAnchor.SetAnchor( aIntPam.Start() );
             aSet.Put(aAnchor);
-            pDoc->SetFlyFrmAttr( *pFmt, aSet );
+            pDoc->SetFlyFrmAttr( *pFormat, aSet );
         }
         else
             throw lang::IllegalArgumentException();
@@ -3108,9 +3108,9 @@ SwXTextFrame::SwXTextFrame( SwDoc *_pDoc ) :
 {
 }
 
-SwXTextFrame::SwXTextFrame(SwFrmFmt& rFmt) :
-    SwXText(rFmt.GetDoc(), CURSOR_FRAME),
-    SwXFrame(rFmt, FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME))
+SwXTextFrame::SwXTextFrame(SwFrameFormat& rFormat) :
+    SwXText(rFormat.GetDoc(), CURSOR_FRAME),
+    SwXFrame(rFormat, FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME))
 {
 
 }
@@ -3120,9 +3120,9 @@ SwXTextFrame::~SwXTextFrame()
 }
 
 uno::Reference<text::XTextFrame>
-SwXTextFrame::CreateXTextFrame(SwDoc & rDoc, SwFrmFmt *const pFrmFmt)
+SwXTextFrame::CreateXTextFrame(SwDoc & rDoc, SwFrameFormat *const pFrameFormat)
 {
-    return CreateXFrame<text::XTextFrame, SwXTextFrame>(rDoc, pFrmFmt);
+    return CreateXFrame<text::XTextFrame, SwXTextFrame>(rDoc, pFrameFormat);
 }
 
 void SAL_CALL SwXTextFrame::acquire(  )throw()
@@ -3185,12 +3185,12 @@ const SwStartNode *SwXTextFrame::GetStartNode() const
 {
     const SwStartNode *pSttNd = 0;
 
-    const SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    const SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
-        const SwFmtCntnt& rFlyCntnt = pFmt->GetCntnt();
-        if( rFlyCntnt.GetCntntIdx() )
-            pSttNd = rFlyCntnt.GetCntntIdx()->GetNode().GetStartNode();
+        const SwFormatContent& rFlyContent = pFormat->GetContent();
+        if( rFlyContent.GetContentIdx() )
+            pSttNd = rFlyContent.GetContentIdx()->GetNode().GetStartNode();
     }
 
     return pSttNd;
@@ -3206,23 +3206,23 @@ uno::Reference< text::XTextCursor >  SwXTextFrame::createTextCursor() throw( uno
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextCursor >  aRef;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
         //save current start node to be able to check if there is content after the table -
         //otherwise the cursor would be in the body text!
-        const SwNode& rNode = pFmt->GetCntnt().GetCntntIdx()->GetNode();
+        const SwNode& rNode = pFormat->GetContent().GetContentIdx()->GetNode();
         const SwStartNode* pOwnStartNode = rNode.FindSttNodeByType(SwFlyStartNode);
 
         SwPaM aPam(rNode);
         aPam.Move(fnMoveForward, fnGoNode);
-        SwTableNode* pTblNode = aPam.GetNode().FindTableNode();
-        SwCntntNode* pCont = 0;
-        while( pTblNode )
+        SwTableNode* pTableNode = aPam.GetNode().FindTableNode();
+        SwContentNode* pCont = 0;
+        while( pTableNode )
         {
-            aPam.GetPoint()->nNode = *pTblNode->EndOfSectionNode();
+            aPam.GetPoint()->nNode = *pTableNode->EndOfSectionNode();
             pCont = GetDoc()->GetNodes().GoNext(&aPam.GetPoint()->nNode);
-            pTblNode = pCont->FindTableNode();
+            pTableNode = pCont->FindTableNode();
         }
         if(pCont)
             aPam.GetPoint()->nContent.Assign(pCont, 0);
@@ -3237,7 +3237,7 @@ uno::Reference< text::XTextCursor >  SwXTextFrame::createTextCursor() throw( uno
         }
 
         SwXTextCursor *const pXCursor = new SwXTextCursor(
-                 *pFmt->GetDoc(), this, CURSOR_FRAME, *aPam.GetPoint());
+                 *pFormat->GetDoc(), this, CURSOR_FRAME, *aPam.GetPoint());
         aRef =  static_cast<text::XWordCursor*>(pXCursor);
 #if OSL_DEBUG_LEVEL > 1
         SwUnoCrsr *const pUnoCrsr = pXCursor->GetCursor();
@@ -3253,15 +3253,15 @@ uno::Reference< text::XTextCursor >  SwXTextFrame::createTextCursorByRange(const
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextCursor >  aRef;
-    SwFrmFmt* pFmt = GetFrmFmt();
+    SwFrameFormat* pFormat = GetFrameFormat();
     SwUnoInternalPaM aPam(*GetDoc());
-    if (pFmt && ::sw::XTextRangeToSwPaM(aPam, aTextPosition))
+    if (pFormat && ::sw::XTextRangeToSwPaM(aPam, aTextPosition))
     {
-        SwNode& rNode = pFmt->GetCntnt().GetCntntIdx()->GetNode();
+        SwNode& rNode = pFormat->GetContent().GetContentIdx()->GetNode();
         if(aPam.GetNode().FindFlyStartNode() == rNode.FindFlyStartNode())
         {
             aRef = static_cast<text::XWordCursor*>(
-                    new SwXTextCursor(*pFmt->GetDoc(), this, CURSOR_FRAME,
+                    new SwXTextCursor(*pFormat->GetDoc(), this, CURSOR_FRAME,
                         *aPam.GetPoint(), aPam.GetMark()));
         }
     }
@@ -3274,10 +3274,10 @@ uno::Reference< container::XEnumeration >  SwXTextFrame::createEnumeration() thr
 {
     SolarMutexGuard aGuard;
     uno::Reference< container::XEnumeration >  aRef;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
-        SwPosition aPos(pFmt->GetCntnt().GetCntntIdx()->GetNode());
+        SwPosition aPos(pFormat->GetContent().GetContentIdx()->GetNode());
         ::std::unique_ptr<SwUnoCrsr> pUnoCursor(
                 GetDoc()->CreateUnoCrsr(aPos, false));
         pUnoCursor->Move(fnMoveForward, fnGoNode);
@@ -3392,8 +3392,8 @@ SwXTextGraphicObject::SwXTextGraphicObject( SwDoc *pDoc ) :
 {
 }
 
-SwXTextGraphicObject::SwXTextGraphicObject(SwFrmFmt& rFmt) :
-    SwXFrame(rFmt, FLYCNTTYPE_GRF, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_GRAPHIC))
+SwXTextGraphicObject::SwXTextGraphicObject(SwFrameFormat& rFormat) :
+    SwXFrame(rFormat, FLYCNTTYPE_GRF, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_GRAPHIC))
 {
 
 }
@@ -3404,9 +3404,9 @@ SwXTextGraphicObject::~SwXTextGraphicObject()
 }
 
 uno::Reference<text::XTextContent>
-SwXTextGraphicObject::CreateXTextGraphicObject(SwDoc & rDoc, SwFrmFmt *const pFrmFmt)
+SwXTextGraphicObject::CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat *const pFrameFormat)
 {
-    return CreateXFrame<text::XTextContent, SwXTextGraphicObject>(rDoc, pFrmFmt);
+    return CreateXFrame<text::XTextContent, SwXTextGraphicObject>(rDoc, pFrameFormat);
 }
 
 void SAL_CALL SwXTextGraphicObject::acquire(  )throw()
@@ -3524,8 +3524,8 @@ SwXTextEmbeddedObject::SwXTextEmbeddedObject( SwDoc *pDoc )
     , m_xOLEListener(nullptr)
 { }
 
-SwXTextEmbeddedObject::SwXTextEmbeddedObject(SwFrmFmt& rFmt) :
-    SwXFrame(rFmt, FLYCNTTYPE_OLE, aSwMapProvider.GetPropertySet(PROPERTY_MAP_EMBEDDED_OBJECT))
+SwXTextEmbeddedObject::SwXTextEmbeddedObject(SwFrameFormat& rFormat) :
+    SwXFrame(rFormat, FLYCNTTYPE_OLE, aSwMapProvider.GetPropertySet(PROPERTY_MAP_EMBEDDED_OBJECT))
 {
 
 }
@@ -3536,9 +3536,9 @@ SwXTextEmbeddedObject::~SwXTextEmbeddedObject()
 }
 
 uno::Reference<text::XTextContent>
-SwXTextEmbeddedObject::CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrmFmt *const pFrmFmt)
+SwXTextEmbeddedObject::CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat *const pFrameFormat)
 {
-    return CreateXFrame<text::XTextContent, SwXTextEmbeddedObject>(rDoc, pFrmFmt);
+    return CreateXFrame<text::XTextContent, SwXTextEmbeddedObject>(rDoc, pFrameFormat);
 }
 
 void SAL_CALL SwXTextEmbeddedObject::acquire()throw()
@@ -3622,16 +3622,16 @@ uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExte
         throw( uno::RuntimeException, std::exception )
 {
     uno::Reference< embed::XEmbeddedObject > xResult;
-    SwFrmFmt*   pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat*   pFormat = GetFrameFormat();
+    if(pFormat)
     {
-        SwDoc* pDoc = pFmt->GetDoc();
-        const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
-        OSL_ENSURE( pCnt->GetCntntIdx() &&
-                       pDoc->GetNodes()[ pCnt->GetCntntIdx()->
+        SwDoc* pDoc = pFormat->GetDoc();
+        const SwFormatContent* pCnt = &pFormat->GetContent();
+        OSL_ENSURE( pCnt->GetContentIdx() &&
+                       pDoc->GetNodes()[ pCnt->GetContentIdx()->
                                         GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
 
-        SwOLENode* pOleNode =  pDoc->GetNodes()[ pCnt->GetCntntIdx()
+        SwOLENode* pOleNode =  pDoc->GetNodes()[ pCnt->GetContentIdx()
                                         ->GetIndex() + 1 ]->GetOLENode();
         xResult = pOleNode->GetOLEObj().GetOleRef();
         if ( svt::EmbeddedObjectRef::TryRunningState( xResult ) )
@@ -3645,7 +3645,7 @@ uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExte
             uno::Reference< frame::XModel > xModel( xComp, uno::UNO_QUERY);
             if(xBrdcst.is() && xModel.is() && !m_xOLEListener.is())
             {
-                m_xOLEListener = new SwXOLEListener(*pFmt, xModel);
+                m_xOLEListener = new SwXOLEListener(*pFormat, xModel);
                 xBrdcst->addModifyListener( m_xOLEListener );
             }
         }
@@ -3655,16 +3655,16 @@ uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExte
 
 sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect() throw (uno::RuntimeException, std::exception)
 {
-    SwFrmFmt*   pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat*   pFormat = GetFrameFormat();
+    if(pFormat)
     {
-        SwDoc* pDoc = pFmt->GetDoc();
-        const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
-        OSL_ENSURE( pCnt->GetCntntIdx() &&
-                       pDoc->GetNodes()[ pCnt->GetCntntIdx()->
+        SwDoc* pDoc = pFormat->GetDoc();
+        const SwFormatContent* pCnt = &pFormat->GetContent();
+        OSL_ENSURE( pCnt->GetContentIdx() &&
+                       pDoc->GetNodes()[ pCnt->GetContentIdx()->
                                         GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
 
-        return pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ]->GetOLENode()->GetAspect();
+        return pDoc->GetNodes()[ pCnt->GetContentIdx()->GetIndex() + 1 ]->GetOLENode()->GetAspect();
     }
 
     return embed::Aspects::MSOLE_CONTENT; // return the default value
@@ -3672,31 +3672,31 @@ sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect() throw (uno::RuntimeExcepti
 
 void SAL_CALL SwXTextEmbeddedObject::setAspect( sal_Int64 nAspect ) throw (uno::RuntimeException, std::exception)
 {
-    SwFrmFmt*   pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat*   pFormat = GetFrameFormat();
+    if(pFormat)
     {
-        SwDoc* pDoc = pFmt->GetDoc();
-        const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
-        OSL_ENSURE( pCnt->GetCntntIdx() &&
-                       pDoc->GetNodes()[ pCnt->GetCntntIdx()->
+        SwDoc* pDoc = pFormat->GetDoc();
+        const SwFormatContent* pCnt = &pFormat->GetContent();
+        OSL_ENSURE( pCnt->GetContentIdx() &&
+                       pDoc->GetNodes()[ pCnt->GetContentIdx()->
                                         GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
 
-        pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ]->GetOLENode()->SetAspect( nAspect );
+        pDoc->GetNodes()[ pCnt->GetContentIdx()->GetIndex() + 1 ]->GetOLENode()->SetAspect( nAspect );
     }
 }
 
 uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplacementGraphic() throw (uno::RuntimeException, std::exception)
 {
-    SwFrmFmt*   pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat*   pFormat = GetFrameFormat();
+    if(pFormat)
     {
-        SwDoc* pDoc = pFmt->GetDoc();
-        const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
-        OSL_ENSURE( pCnt->GetCntntIdx() &&
-                       pDoc->GetNodes()[ pCnt->GetCntntIdx()->
+        SwDoc* pDoc = pFormat->GetDoc();
+        const SwFormatContent* pCnt = &pFormat->GetContent();
+        OSL_ENSURE( pCnt->GetContentIdx() &&
+                       pDoc->GetNodes()[ pCnt->GetContentIdx()->
                                         GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
 
-        const Graphic* pGraphic = pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ]->GetOLENode()->GetGraphic();
+        const Graphic* pGraphic = pDoc->GetNodes()[ pCnt->GetContentIdx()->GetIndex() + 1 ]->GetOLENode()->GetGraphic();
         if ( pGraphic )
             return pGraphic->GetXGraphic();
     }
@@ -3743,8 +3743,8 @@ uno::Reference<container::XNameReplace> SAL_CALL
 
 TYPEINIT1(SwXOLEListener, SwClient);
 
-SwXOLEListener::SwXOLEListener( SwFmt& rOLEFmt, uno::Reference< XModel > xOLE) :
-    SwClient(&rOLEFmt),
+SwXOLEListener::SwXOLEListener( SwFormat& rOLEFormat, uno::Reference< XModel > xOLE) :
+    SwClient(&rOLEFormat),
     xOLEModel(xOLE)
 {
 }
@@ -3758,14 +3758,14 @@ void SwXOLEListener::modified( const lang::EventObject& /*rEvent*/ )
     SolarMutexGuard aGuard;
 
     SwOLENode* pNd = 0;
-    SwFmt* pFmt = GetFmt();
-    if(pFmt)
-    {const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+    SwFormat* pFormat = GetFormat();
+    if(pFormat)
+    {const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
         if(pIdx)
         {
             SwNodeIndex aIdx(*pIdx, 1);
-            SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
-            pNd = pNoTxt->GetOLENode();
+            SwNoTextNode* pNoText = aIdx.GetNode().GetNoTextNode();
+            pNd = pNoText->GetOLENode();
         }
     }
     if(!pNd)
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 2cd8b2440f57..535603b190e5 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -58,27 +58,27 @@ public:
     const bool                  m_bIsEndnote;
     ::cppu::OInterfaceContainerHelper m_EventListeners;
     bool                        m_bIsDescriptor;
-    const SwFmtFtn *            m_pFmtFtn;
+    const SwFormatFootnote *            m_pFormatFootnote;
     OUString             m_sLabel;
 
     Impl(   SwXFootnote & rThis,
-            SwFmtFtn *const pFootnote,
+            SwFormatFootnote *const pFootnote,
             const bool bIsEndnote)
         : SwClient(pFootnote)
         , m_rThis(rThis)
         , m_bIsEndnote(bIsEndnote)
         , m_EventListeners(m_Mutex)
         , m_bIsDescriptor(0 == pFootnote)
-        , m_pFmtFtn(pFootnote)
+        , m_pFormatFootnote(pFootnote)
     {
     }
 
-    const SwFmtFtn* GetFootnoteFormat() const {
-        return m_rThis.GetDoc() ? m_pFmtFtn : 0;
+    const SwFormatFootnote* GetFootnoteFormat() const {
+        return m_rThis.GetDoc() ? m_pFormatFootnote : 0;
     }
 
-    SwFmtFtn const& GetFootnoteFormatOrThrow() {
-        SwFmtFtn const*const pFootnote( GetFootnoteFormat() );
+    SwFormatFootnote const& GetFootnoteFormatOrThrow() {
+        SwFormatFootnote const*const pFootnote( GetFootnoteFormat() );
         if (!pFootnote) {
             throw uno::RuntimeException(OUString(
                         "SwXFootnote: disposed or invalid"), 0);
@@ -99,7 +99,7 @@ void SwXFootnote::Impl::Invalidate()
     {
         const_cast<SwModify*>(GetRegisteredIn())->Remove(this);
     }
-    m_pFmtFtn = 0;
+    m_pFormatFootnote = 0;
     m_rThis.SetDoc(0);
     uno::Reference<uno::XInterface> const xThis(m_wThis);
     if (!xThis.is())
@@ -126,9 +126,9 @@ SwXFootnote::SwXFootnote(const bool bEndnote)
 {
 }
 
-SwXFootnote::SwXFootnote(SwDoc & rDoc, SwFmtFtn & rFmt)
+SwXFootnote::SwXFootnote(SwDoc & rDoc, SwFormatFootnote & rFormat)
     : SwXText(& rDoc, CURSOR_FOOTNOTE)
-    , m_pImpl( new SwXFootnote::Impl(*this, &rFmt, rFmt.IsEndNote()) )
+    , m_pImpl( new SwXFootnote::Impl(*this, &rFormat, rFormat.IsEndNote()) )
 {
 }
 
@@ -137,24 +137,24 @@ SwXFootnote::~SwXFootnote()
 }
 
 uno::Reference<text::XFootnote>
-SwXFootnote::CreateXFootnote(SwDoc & rDoc, SwFmtFtn *const pFootnoteFmt,
+SwXFootnote::CreateXFootnote(SwDoc & rDoc, SwFormatFootnote *const pFootnoteFormat,
         bool const isEndnote)
 {
     // i#105557: do not iterate over the registered clients: race condition
     uno::Reference<text::XFootnote> xNote;
-    if (pFootnoteFmt)
+    if (pFootnoteFormat)
     {
-        xNote = pFootnoteFmt->GetXFootnote();
+        xNote = pFootnoteFormat->GetXFootnote();
     }
     if (!xNote.is())
     {
-        SwXFootnote *const pNote((pFootnoteFmt)
-                ? new SwXFootnote(rDoc, *pFootnoteFmt)
+        SwXFootnote *const pNote((pFootnoteFormat)
+                ? new SwXFootnote(rDoc, *pFootnoteFormat)
                 : new SwXFootnote(isEndnote));
         xNote.set(pNote);
-        if (pFootnoteFmt)
+        if (pFootnoteFormat)
         {
-            pFootnoteFmt->SetXFootnote(xNote);
+            pFootnoteFormat->SetXFootnote(xNote);
         }
         // need a permanent Reference to initialize m_wThis
         pNote->m_pImpl->m_wThis = xNote;
@@ -242,10 +242,10 @@ OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException, std::exc
     SolarMutexGuard aGuard;
 
     OUString sRet;
-    SwFmtFtn const*const pFmt = m_pImpl->GetFootnoteFormat();
-    if(pFmt)
+    SwFormatFootnote const*const pFormat = m_pImpl->GetFootnoteFormat();
+    if(pFormat)
     {
-        sRet = pFmt->GetNumStr();
+        sRet = pFormat->GetNumStr();
     }
     else if (m_pImpl->m_bIsDescriptor)
     {
@@ -263,15 +263,15 @@ SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException, std:
 {
     SolarMutexGuard aGuard;
 
-    SwFmtFtn const*const pFmt = m_pImpl->GetFootnoteFormat();
-    if(pFmt)
+    SwFormatFootnote const*const pFormat = m_pImpl->GetFootnoteFormat();
+    if(pFormat)
     {
-        const SwTxtFtn* pTxtFtn = pFmt->GetTxtFtn();
-        OSL_ENSURE(pTxtFtn, "kein TextNode?");
-        SwTxtNode& rTxtNode = (SwTxtNode&)pTxtFtn->GetTxtNode();
+        const SwTextFootnote* pTextFootnote = pFormat->GetTextFootnote();
+        OSL_ENSURE(pTextFootnote, "kein TextNode?");
+        SwTextNode& rTextNode = (SwTextNode&)pTextFootnote->GetTextNode();
 
-        SwPaM aPam(rTxtNode, pTxtFtn->GetStart());
-        GetDoc()->SetCurFtn(aPam, aLabel, pFmt->GetNumber(), pFmt->IsEndNote());
+        SwPaM aPam(rTextNode, pTextFootnote->GetStart());
+        GetDoc()->SetCurFootnote(aPam, aLabel, pFormat->GetNumber(), pFormat->IsEndNote());
     }
     else if (m_pImpl->m_bIsDescriptor)
     {
@@ -313,7 +313,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     UnoActionContext aCont(pNewDoc);
     pNewDoc->getIDocumentContentOperations().DeleteAndJoin(aPam);
     aPam.DeleteMark();
-    SwFmtFtn aFootNote(m_pImpl->m_bIsEndnote);
+    SwFormatFootnote aFootNote(m_pImpl->m_bIsEndnote);
     if (!m_pImpl->m_sLabel.isEmpty())
     {
         aFootNote.SetNumStr(m_pImpl->m_sLabel);
@@ -328,23 +328,23 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 
     pNewDoc->getIDocumentContentOperations().InsertPoolItem(aPam, aFootNote, nInsertFlags);
 
-    SwTxtFtn *const pTxtAttr = static_cast<SwTxtFtn*>(
-        aPam.GetNode().GetTxtNode()->GetTxtAttrForCharAt(
+    SwTextFootnote *const pTextAttr = static_cast<SwTextFootnote*>(
+        aPam.GetNode().GetTextNode()->GetTextAttrForCharAt(
                 aPam.GetPoint()->nContent.GetIndex()-1, RES_TXTATR_FTN ));
 
-    if (pTxtAttr)
+    if (pTextAttr)
     {
-        const SwFmtFtn& rFtn = pTxtAttr->GetFtn();
-        m_pImpl->m_pFmtFtn = &rFtn;
-        const_cast<SwFmtFtn*>(m_pImpl->m_pFmtFtn)->Add(m_pImpl.get());
+        const SwFormatFootnote& rFootnote = pTextAttr->GetFootnote();
+        m_pImpl->m_pFormatFootnote = &rFootnote;
+        const_cast<SwFormatFootnote*>(m_pImpl->m_pFormatFootnote)->Add(m_pImpl.get());
         // force creation of sequence id - is used for references
         if (pNewDoc->IsInReading())
         {
-            pTxtAttr->SetSeqNo(pNewDoc->GetFtnIdxs().size());
+            pTextAttr->SetSeqNo(pNewDoc->GetFootnoteIdxs().size());
         }
         else
         {
-            pTxtAttr->SetSeqRefNo();
+            pTextAttr->SetSeqRefNo();
         }
     }
     m_pImpl->m_bIsDescriptor = false;
@@ -356,10 +356,10 @@ SwXFootnote::getAnchor() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwFmtFtn const& rFmt( m_pImpl->GetFootnoteFormatOrThrow() );
+    SwFormatFootnote const& rFormat( m_pImpl->GetFootnoteFormatOrThrow() );
 
-    SwTxtFtn const*const pTxtFtn = rFmt.GetTxtFtn();
-    SwPaM aPam( pTxtFtn->GetTxtNode(), pTxtFtn->GetStart() );
+    SwTextFootnote const*const pTextFootnote = rFormat.GetTextFootnote();
+    SwPaM aPam( pTextFootnote->GetTextNode(), pTextFootnote->GetStart() );
     SwPosition aMark( *aPam.Start() );
     aPam.SetMark();
     ++aPam.GetMark()->nContent;
@@ -372,13 +372,13 @@ void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException, std::exceptio
 {
     SolarMutexGuard aGuard;
 
-    SwFmtFtn const& rFmt( m_pImpl->GetFootnoteFormatOrThrow() );
+    SwFormatFootnote const& rFormat( m_pImpl->GetFootnoteFormatOrThrow() );
 
-    SwTxtFtn const*const pTxtFtn = rFmt.GetTxtFtn();
-    OSL_ENSURE(pTxtFtn, "no TextNode?");
-    SwTxtNode& rTxtNode = const_cast<SwTxtNode&>(pTxtFtn->GetTxtNode());
-    const sal_Int32 nPos = pTxtFtn->GetStart();
-    SwPaM aPam(rTxtNode, nPos, rTxtNode, nPos+1);
+    SwTextFootnote const*const pTextFootnote = rFormat.GetTextFootnote();
+    OSL_ENSURE(pTextFootnote, "no TextNode?");
+    SwTextNode& rTextNode = const_cast<SwTextNode&>(pTextFootnote->GetTextNode());
+    const sal_Int32 nPos = pTextFootnote->GetStart();
+    SwPaM aPam(rTextNode, nPos, rTextNode, nPos+1);
     GetDoc()->getIDocumentContentOperations().DeleteAndJoin( aPam );
 }
 
@@ -402,13 +402,13 @@ throw (uno::RuntimeException, std::exception)
 
 const SwStartNode *SwXFootnote::GetStartNode() const
 {
-    SwFmtFtn const*const   pFmt = m_pImpl->GetFootnoteFormat();
-    if(pFmt)
+    SwFormatFootnote const*const   pFormat = m_pImpl->GetFootnoteFormat();
+    if(pFormat)
     {
-        const SwTxtFtn* pTxtFtn = pFmt->GetTxtFtn();
-        if( pTxtFtn )
+        const SwTextFootnote* pTextFootnote = pFormat->GetTextFootnote();
+        if( pTextFootnote )
         {
-            return pTxtFtn->GetStartNode()->GetNode().GetStartNode();
+            return pTextFootnote->GetStartNode()->GetNode().GetStartNode();
         }
     }
     return 0;
@@ -425,10 +425,10 @@ SwXFootnote::createTextCursor() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwFmtFtn const& rFmt( m_pImpl->GetFootnoteFormatOrThrow() );
+    SwFormatFootnote const& rFormat( m_pImpl->GetFootnoteFormatOrThrow() );
 
-    SwTxtFtn const*const pTxtFtn = rFmt.GetTxtFtn();
-    SwPosition aPos( *pTxtFtn->GetStartNode() );
+    SwTextFootnote const*const pTextFootnote = rFormat.GetTextFootnote();
+    SwPosition aPos( *pTextFootnote->GetStartNode() );
     SwXTextCursor *const pXCursor =
         new SwXTextCursor(*GetDoc(), this, CURSOR_FOOTNOTE, aPos);
     SwUnoCrsr *const pUnoCrsr = pXCursor->GetCursor();
@@ -445,7 +445,7 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwFmtFtn const& rFmt( m_pImpl->GetFootnoteFormatOrThrow() );
+    SwFormatFootnote const& rFormat( m_pImpl->GetFootnoteFormatOrThrow() );
 
     SwUnoInternalPaM aPam(*GetDoc());
     if (!::sw::XTextRangeToSwPaM(aPam, xTextPosition))
@@ -453,11 +453,11 @@ throw (uno::RuntimeException, std::exception)
         throw uno::RuntimeException();
     }
 
-    SwTxtFtn const*const pTxtFtn = rFmt.GetTxtFtn();
-    SwNode const*const pFtnStartNode = &pTxtFtn->GetStartNode()->GetNode();
+    SwTextFootnote const*const pTextFootnote = rFormat.GetTextFootnote();
+    SwNode const*const pFootnoteStartNode = &pTextFootnote->GetStartNode()->GetNode();
 
     const SwNode* pStart = aPam.GetNode().FindFootnoteStartNode();
-    if (pStart != pFtnStartNode)
+    if (pStart != pFootnoteStartNode)
     {
         throw uno::RuntimeException();
     }
@@ -474,10 +474,10 @@ SwXFootnote::createEnumeration() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwFmtFtn const& rFmt( m_pImpl->GetFootnoteFormatOrThrow() );
+    SwFormatFootnote const& rFormat( m_pImpl->GetFootnoteFormatOrThrow() );
 
-    SwTxtFtn const*const pTxtFtn = rFmt.GetTxtFtn();
-    SwPosition aPos( *pTxtFtn->GetStartNode() );
+    SwTextFootnote const*const pTextFootnote = rFormat.GetTextFootnote();
+    SwPosition aPos( *pTextFootnote->GetStartNode() );
     ::std::unique_ptr<SwUnoCrsr> pUnoCursor(
         GetDoc()->CreateUnoCrsr(aPos, false));
     pUnoCursor->Move(fnMoveForward, fnGoNode);
@@ -538,12 +538,12 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
         }
         else if (rPropertyName == UNO_NAME_REFERENCE_ID)
         {
-            SwFmtFtn const*const pFmt = m_pImpl->GetFootnoteFormat();
-            if (pFmt)
+            SwFormatFootnote const*const pFormat = m_pImpl->GetFootnoteFormat();
+            if (pFormat)
             {
-                SwTxtFtn const*const pTxtFtn = pFmt->GetTxtFtn();
-                OSL_ENSURE(pTxtFtn, "no TextNode?");
-                aRet <<= static_cast<sal_Int16>(pTxtFtn->GetSeqRefNo());
+                SwTextFootnote const*const pTextFootnote = pFormat->GetTextFootnote();
+                OSL_ENSURE(pTextFootnote, "no TextNode?");
+                aRet <<= static_cast<sal_Int16>(pTextFootnote->GetSeqRefNo());
             }
         }
         else
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index d5c96944789e..e50c423b1e7c 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -334,7 +334,7 @@ public:
     Impl(   SwDoc & rDoc,
             const TOXTypes eType,
             SwTOXBaseSection *const pBaseSection)
-        : SwClient((pBaseSection) ? pBaseSection->GetFmt() : 0)
+        : SwClient((pBaseSection) ? pBaseSection->GetFormat() : 0)
         , m_Listeners(m_Mutex)
         , m_rPropSet(
             *aSwMapProvider.GetPropertySet(lcl_TypeToPropertyMap_Index(eType)))
@@ -347,18 +347,18 @@ public:
     {
     }
 
-    SwSectionFmt * GetSectionFmt() const {
-        return static_cast<SwSectionFmt *>(
+    SwSectionFormat * GetSectionFormat() const {
+        return static_cast<SwSectionFormat *>(
                 const_cast<SwModify *>(GetRegisteredIn()));
     }
 
     SwTOXBase & GetTOXSectionOrThrow() const
     {
-        SwSectionFmt *const pSectionFmt(GetSectionFmt());
+        SwSectionFormat *const pSectionFormat(GetSectionFormat());
         SwTOXBase *const pTOXSection( (m_bIsDescriptor)
             ?  &m_pProps->GetTOXBase()
-            : ((pSectionFmt)
-                ? static_cast<SwTOXBaseSection*>(pSectionFmt->GetSection())
+            : ((pSectionFormat)
+                ? static_cast<SwTOXBaseSection*>(pSectionFormat->GetSection())
                 : 0));
         if (!pTOXSection)
         {
@@ -423,8 +423,8 @@ SwXDocumentIndex::CreateXDocumentIndex(
     uno::Reference<text::XDocumentIndex> xIndex;
     if (pSection)
     {
-        SwSectionFmt const *const pFmt = pSection->GetFmt();
-        xIndex.set(pFmt->GetXObject(), uno::UNO_QUERY);
+        SwSectionFormat const *const pFormat = pSection->GetFormat();
+        xIndex.set(pFormat->GetXObject(), uno::UNO_QUERY);
     }
     if (!xIndex.is())
     {
@@ -434,7 +434,7 @@ SwXDocumentIndex::CreateXDocumentIndex(
         xIndex.set(pIndex);
         if (pSection)
         {
-            pSection->GetFmt()->SetXObject(xIndex);
+            pSection->GetFormat()->SetXObject(xIndex);
         }
         // need a permanent Reference to initialize m_wThis
         pIndex->m_pImpl->m_wThis = xIndex;
@@ -572,7 +572,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             static_cast<cppu::OWeakObject *>(this));
     }
 
-    SwSectionFmt *const pSectionFmt(m_pImpl->GetSectionFmt());
+    SwSectionFormat *const pSectionFormat(m_pImpl->GetSectionFormat());
     SwTOXBase & rTOXBase( m_pImpl->GetTOXSectionOrThrow() );
 
     sal_uInt16 nCreate = rTOXBase.GetCreateType();
@@ -614,11 +614,11 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             lcl_ConvertTOUNameToUserName(sNewName);
             OSL_ENSURE(TOX_USER == eTxBaseType,
                     "tox type name can only be changed for user indexes");
-            if (pSectionFmt)
+            if (pSectionFormat)
             {
                 if (rTOXBase.GetTOXType()->GetTypeName() != sNewName)
                 {
-                    lcl_ReAssignTOXType(pSectionFmt->GetDoc(),
+                    lcl_ReAssignTOXType(pSectionFormat->GetDoc(),
                             rTOXBase, sNewName);
                 }
             }
@@ -697,7 +697,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
         {
             bool bSet = lcl_AnyToBool(rValue);
             rTOXBase.SetProtected(bSet);
-            if (pSectionFmt)
+            if (pSectionFormat)
             {
                 static_cast<SwTOXBaseSection &>(rTOXBase).SetProtect(bSet);
             }
@@ -858,11 +858,11 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                 m_pImpl->m_rPropSet.setPropertyValue(
                         rPropertyName, rValue, aAttrSet);
 
-                const SwSectionFmts& rSects = m_pImpl->m_pDoc->GetSections();
+                const SwSectionFormats& rSects = m_pImpl->m_pDoc->GetSections();
                 for (size_t i = 0; i < rSects.size(); ++i)
                 {
-                    const SwSectionFmt* pTmpFmt = rSects[ i ];
-                    if (pTmpFmt == pSectionFmt)
+                    const SwSectionFormat* pTmpFormat = rSects[ i ];
+                    if (pTmpFormat == pSectionFormat)
                     {
                         SwSectionData tmpData(
                             static_cast<SwTOXBaseSection&>(rTOXBase));
@@ -901,11 +901,11 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             static_cast< cppu::OWeakObject * >(this));
     }
 
-    SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
+    SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
     SwTOXBase* pTOXBase = 0;
-    if (pSectionFmt)
+    if (pSectionFormat)
     {
-        pTOXBase = static_cast<SwTOXBaseSection*>(pSectionFmt->GetSection());
+        pTOXBase = static_cast<SwTOXBaseSection*>(pSectionFormat->GetSection());
     }
     else if (m_pImpl->m_bIsDescriptor)
     {
@@ -927,13 +927,13 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                 if(WID_IDX_CONTENT_SECTION == pEntry->nWID)
                 {
                     const uno::Reference <text::XTextSection> xContentSect =
-                        SwXTextSection::CreateXTextSection( pSectionFmt );
+                        SwXTextSection::CreateXTextSection( pSectionFormat );
                     aRet <<= xContentSect;
                 }
-                else if (pSectionFmt)
+                else if (pSectionFormat)
                 {
                     SwSections aSectArr;
-                    pSectionFmt->GetChildSections(aSectArr,
+                    pSectionFormat->GetChildSections(aSectArr,
                             SORTSECT_NOT, false);
                     for(size_t i = 0; i < aSectArr.size(); ++i)
                     {
@@ -942,7 +942,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                         {
                             const uno::Reference <text::XTextSection> xHeader =
                                 SwXTextSection::CreateXTextSection(
-                                    pSect->GetFmt() );
+                                    pSect->GetFormat() );
                             aRet <<= xHeader;
                             break;
                         }
@@ -1282,9 +1282,9 @@ void SAL_CALL SwXDocumentIndex::refresh() throw (uno::RuntimeException, std::exc
     {
         SolarMutexGuard g;
 
-        SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt();
-        SwTOXBaseSection *const pTOXBase = (pFmt) ?
-            static_cast<SwTOXBaseSection*>(pFmt->GetSection()) : 0;
+        SwSectionFormat *const pFormat = m_pImpl->GetSectionFormat();
+        SwTOXBaseSection *const pTOXBase = (pFormat) ?
+            static_cast<SwTOXBaseSection*>(pFormat->GetSection()) : 0;
         if (!pTOXBase)
         {
             throw uno::RuntimeException(
@@ -1381,8 +1381,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     pDoc->SetTOXBaseName(*pTOX, m_pImpl->m_pProps->GetTOXBase().GetTOXName());
 
     // update page numbers
-    pTOX->GetFmt()->Add(m_pImpl.get());
-    pTOX->GetFmt()->SetXObject(static_cast< ::cppu::OWeakObject*>(this));
+    pTOX->GetFormat()->Add(m_pImpl.get());
+    pTOX->GetFormat()->SetXObject(static_cast< ::cppu::OWeakObject*>(this));
     const_cast<SwTOXBaseSection*>(pTOX)->UpdatePageNum();
 
     m_pImpl->m_pProps.reset();
@@ -1395,22 +1395,22 @@ SwXDocumentIndex::getAnchor() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
-    if (!pSectionFmt)
+    SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
+    if (!pSectionFormat)
     {
         throw uno::RuntimeException();
     }
 
     uno::Reference< text::XTextRange > xRet;
-    SwNodeIndex const*const pIdx( pSectionFmt->GetCntnt().GetCntntIdx() );
+    SwNodeIndex const*const pIdx( pSectionFormat->GetContent().GetContentIdx() );
     if (pIdx && pIdx->GetNode().GetNodes().IsDocNodes())
     {
         SwPaM aPaM(*pIdx);
-        aPaM.Move( fnMoveForward, fnGoCntnt );
+        aPaM.Move( fnMoveForward, fnGoContent );
         aPaM.SetMark();
         aPaM.GetPoint()->nNode = *pIdx->GetNode().EndOfSectionNode();
-        aPaM.Move( fnMoveBackward, fnGoCntnt );
-        xRet = SwXTextRange::CreateXTextRange(*pSectionFmt->GetDoc(),
+        aPaM.Move( fnMoveBackward, fnGoContent );
+        xRet = SwXTextRange::CreateXTextRange(*pSectionFormat->GetDoc(),
             *aPaM.GetMark(), aPaM.GetPoint());
     }
     return xRet;
@@ -1420,11 +1420,11 @@ void SAL_CALL SwXDocumentIndex::dispose() throw (uno::RuntimeException, std::exc
 {
     SolarMutexGuard aGuard;
 
-    SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
-    if (pSectionFmt)
+    SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
+    if (pSectionFormat)
     {
-        pSectionFmt->GetDoc()->DeleteTOX(
-            *static_cast<SwTOXBaseSection*>(pSectionFmt->GetSection()),
+        pSectionFormat->GetDoc()->DeleteTOX(
+            *static_cast<SwTOXBaseSection*>(pSectionFormat->GetSection()),
             true);
     }
 }
@@ -1454,14 +1454,14 @@ OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException, std:
     SolarMutexGuard g;
 
     OUString uRet;
-    SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
+    SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
     if (m_pImpl->m_bIsDescriptor)
     {
         uRet = m_pImpl->m_pProps->GetTOXBase().GetTOXName();
     }
-    else if(pSectionFmt)
+    else if(pSectionFormat)
     {
-        uRet = pSectionFmt->GetSection()->GetSectionName();
+        uRet = pSectionFormat->GetSection()->GetSectionName();
     }
     else
     {
@@ -1480,15 +1480,15 @@ SwXDocumentIndex::setName(const OUString& rName) throw (uno::RuntimeException, s
         throw uno::RuntimeException();
     }
 
-    SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
+    SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
     if (m_pImpl->m_bIsDescriptor)
     {
         m_pImpl->m_pProps->GetTOXBase().SetTOXName(rName);
     }
-    else if (pSectionFmt)
+    else if (pSectionFormat)
     {
-        const bool bSuccess = pSectionFmt->GetDoc()->SetTOXBaseName(
-            *static_cast<SwTOXBaseSection*>(pSectionFmt->GetSection()), rName);
+        const bool bSuccess = pSectionFormat->GetDoc()->SetTOXBaseName(
+            *static_cast<SwTOXBaseSection*>(pSectionFormat->GetSection()), rName);
         if (!bSuccess)
         {
             throw uno::RuntimeException();
@@ -1503,16 +1503,16 @@ SwXDocumentIndex::setName(const OUString& rName) throw (uno::RuntimeException, s
 // MetadatableMixin
 ::sfx2::Metadatable* SwXDocumentIndex::GetCoreObject()
 {
-    SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
-    return pSectionFmt;
+    SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
+    return pSectionFormat;
 }
 
 uno::Reference<frame::XModel> SwXDocumentIndex::GetModel()
 {
-    SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
-    if (pSectionFmt)
+    SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
+    if (pSectionFormat)
     {
-        SwDocShell const*const pShell( pSectionFmt->GetDoc()->GetDocShell() );
+        SwDocShell const*const pShell( pSectionFormat->GetDoc()->GetDocShell() );
         return (pShell) ? pShell->GetModel() : 0;
     }
     return 0;
@@ -1798,13 +1798,13 @@ throw (uno::RuntimeException, std::exception)
     {
         SwTOXMark aMark(*m_pImpl->m_pTOXMark);
         aMark.SetAlternativeText(rIndexEntry);
-        SwTxtTOXMark const*const pTxtMark =
-            m_pImpl->m_pTOXMark->GetTxtTOXMark();
-        SwPaM aPam(pTxtMark->GetTxtNode(), pTxtMark->GetStart());
+        SwTextTOXMark const*const pTextMark =
+            m_pImpl->m_pTOXMark->GetTextTOXMark();
+        SwPaM aPam(pTextMark->GetTextNode(), pTextMark->GetStart());
         aPam.SetMark();
-        if(pTxtMark->End())
+        if(pTextMark->End())
         {
-            aPam.GetPoint()->nContent = *pTxtMark->End();
+            aPam.GetPoint()->nContent = *pTextMark->End();
         }
         else
             ++aPam.GetPoint()->nContent;
@@ -1986,10 +1986,10 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark(
             | SetAttrMode::DONTEXPAND)
         : SetAttrMode::DONTEXPAND;
 
-    ::std::vector<SwTxtAttr *> oldMarks;
+    ::std::vector<SwTextAttr *> oldMarks;
     if (bMark)
     {
-        oldMarks = rPam.GetNode().GetTxtNode()->GetTxtAttrsAt(
+        oldMarks = rPam.GetNode().GetTextNode()->GetTextAttrsAt(
             rPam.GetPoint()->nContent.GetIndex(), RES_TXTATR_TOXMARK);
     }
 
@@ -2000,30 +2000,30 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark(
     }
 
     // rMark was copied into the document pool; now retrieve real format...
-    SwTxtAttr * pTxtAttr(0);
+    SwTextAttr * pTextAttr(0);
     if (bMark)
     {
         // #i107672#
         // ensure that we do not retrieve a different mark at the same position
-        ::std::vector<SwTxtAttr *> const newMarks(
-            rPam.GetNode().GetTxtNode()->GetTxtAttrsAt(
+        ::std::vector<SwTextAttr *> const newMarks(
+            rPam.GetNode().GetTextNode()->GetTextAttrsAt(
                 rPam.GetPoint()->nContent.GetIndex(), RES_TXTATR_TOXMARK));
-        ::std::vector<SwTxtAttr *>::const_iterator const iter(
+        ::std::vector<SwTextAttr *>::const_iterator const iter(
             ::std::find_if(newMarks.begin(), newMarks.end(),
-                NotContainedIn<SwTxtAttr *>(oldMarks)));
+                NotContainedIn<SwTextAttr *>(oldMarks)));
         OSL_ASSERT(newMarks.end() != iter);
         if (newMarks.end() != iter)
         {
-            pTxtAttr = *iter;
+            pTextAttr = *iter;
         }
     }
     else
     {
-        pTxtAttr = rPam.GetNode().GetTxtNode()->GetTxtAttrForCharAt(
+        pTextAttr = rPam.GetNode().GetTextNode()->GetTextAttrForCharAt(
             rPam.GetPoint()->nContent.GetIndex()-1, RES_TXTATR_TOXMARK );
     }
 
-    if (!pTxtAttr)
+    if (!pTextAttr)
     {
         throw uno::RuntimeException(
             "SwXDocumentIndexMark::InsertTOXMark(): cannot insert attribute",
@@ -2031,7 +2031,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark(
     }
 
     m_pDoc = pDoc;
-    m_pTOXMark = & pTxtAttr->GetTOXMark();
+    m_pTOXMark = & pTextAttr->GetTOXMark();
     const_cast<SwTOXMark*>(m_pTOXMark)->Add(this);
     const_cast<SwTOXType &>(rTOXType).Add(& m_TypeDepend);
 }
@@ -2046,16 +2046,16 @@ SwXDocumentIndexMark::getAnchor() throw (uno::RuntimeException, std::exception)
     {
         throw uno::RuntimeException();
     }
-    if (!m_pImpl->m_pTOXMark->GetTxtTOXMark())
+    if (!m_pImpl->m_pTOXMark->GetTextTOXMark())
     {
         throw uno::RuntimeException();
     }
-    const SwTxtTOXMark* pTxtMark = m_pImpl->m_pTOXMark->GetTxtTOXMark();
-    SwPaM aPam(pTxtMark->GetTxtNode(), pTxtMark->GetStart());
+    const SwTextTOXMark* pTextMark = m_pImpl->m_pTOXMark->GetTextTOXMark();
+    SwPaM aPam(pTextMark->GetTextNode(), pTextMark->GetStart());
     aPam.SetMark();
-    if(pTxtMark->End())
+    if(pTextMark->End())
     {
-        aPam.GetPoint()->nContent = *pTxtMark->End();
+        aPam.GetPoint()->nContent = *pTextMark->End();
     }
     else
     {
@@ -2191,13 +2191,13 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                 aMark.SetSecondaryKeyReading(lcl_AnyToString(rValue));
             break;
         }
-        SwTxtTOXMark const*const pTxtMark =
-            m_pImpl->m_pTOXMark->GetTxtTOXMark();
-        SwPaM aPam(pTxtMark->GetTxtNode(), pTxtMark->GetStart());
+        SwTextTOXMark const*const pTextMark =
+            m_pImpl->m_pTOXMark->GetTextTOXMark();
+        SwPaM aPam(pTextMark->GetTextNode(), pTextMark->GetStart());
         aPam.SetMark();
-        if(pTxtMark->End())
+        if(pTextMark->End())
         {
-            aPam.GetPoint()->nContent = *pTxtMark->End();
+            aPam.GetPoint()->nContent = *pTextMark->End();
         }
         else
         {
@@ -2475,12 +2475,12 @@ SwXDocumentIndexes::getCount() throw (uno::RuntimeException, std::exception)
         throw uno::RuntimeException();
 
     sal_uInt32 nRet = 0;
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
-    for( size_t n = 0; n < rFmts.size(); ++n )
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
+    for( size_t n = 0; n < rFormats.size(); ++n )
     {
-        const SwSection* pSect = rFmts[ n ]->GetSection();
+        const SwSection* pSect = rFormats[ n ]->GetSection();
         if( TOX_CONTENT_SECTION == pSect->GetType() &&
-            pSect->GetFmt()->GetSectionNode() )
+            pSect->GetFormat()->GetSectionNode() )
         {
             ++nRet;
         }
@@ -2500,12 +2500,12 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
 
     sal_Int32 nIdx = 0;
 
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
-    for( size_t n = 0; n < rFmts.size(); ++n )
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
+    for( size_t n = 0; n < rFormats.size(); ++n )
     {
-        SwSection* pSect = rFmts[ n ]->GetSection();
+        SwSection* pSect = rFormats[ n ]->GetSection();
         if( TOX_CONTENT_SECTION == pSect->GetType() &&
-            pSect->GetFmt()->GetSectionNode() &&
+            pSect->GetFormat()->GetSectionNode() &&
             nIdx++ == nIndex )
         {
            const uno::Reference< text::XDocumentIndex > xTmp =
@@ -2530,12 +2530,12 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
     if(!IsValid())
         throw uno::RuntimeException();
 
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
-    for( size_t n = 0; n < rFmts.size(); ++n )
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
+    for( size_t n = 0; n < rFormats.size(); ++n )
     {
-        SwSection* pSect = rFmts[ n ]->GetSection();
+        SwSection* pSect = rFormats[ n ]->GetSection();
         if( TOX_CONTENT_SECTION == pSect->GetType() &&
-            pSect->GetFmt()->GetSectionNode() &&
+            pSect->GetFormat()->GetSectionNode() &&
             (static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()
                 == rName))
         {
@@ -2558,13 +2558,13 @@ SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException, std::excepti
     if(!IsValid())
         throw uno::RuntimeException();
 
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
     sal_Int32 nCount = 0;
-    for( size_t n = 0; n < rFmts.size(); ++n )
+    for( size_t n = 0; n < rFormats.size(); ++n )
     {
-        SwSection const*const pSect = rFmts[ n ]->GetSection();
+        SwSection const*const pSect = rFormats[ n ]->GetSection();
         if( TOX_CONTENT_SECTION == pSect->GetType() &&
-            pSect->GetFmt()->GetSectionNode() )
+            pSect->GetFormat()->GetSectionNode() )
         {
             ++nCount;
         }
@@ -2573,11 +2573,11 @@ SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException, std::excepti
     uno::Sequence< OUString > aRet(nCount);
     OUString* pArray = aRet.getArray();
     sal_Int32 nCnt = 0;
-    for( size_t n = 0; n < rFmts.size(); ++n )
+    for( size_t n = 0; n < rFormats.size(); ++n )
     {
-        SwSection const*const pSect = rFmts[ n ]->GetSection();
+        SwSection const*const pSect = rFormats[ n ]->GetSection();
         if( TOX_CONTENT_SECTION == pSect->GetType() &&
-            pSect->GetFmt()->GetSectionNode())
+            pSect->GetFormat()->GetSectionNode())
         {
             pArray[nCnt++] = static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName();
         }
@@ -2594,12 +2594,12 @@ throw (uno::RuntimeException, std::exception)
     if(!IsValid())
         throw uno::RuntimeException();
 
-    const SwSectionFmts& rFmts = GetDoc()->GetSections();
-    for( size_t n = 0; n < rFmts.size(); ++n )
+    const SwSectionFormats& rFormats = GetDoc()->GetSections();
+    for( size_t n = 0; n < rFormats.size(); ++n )
     {
-        SwSection const*const pSect = rFmts[ n ]->GetSection();
+        SwSection const*const pSect = rFormats[ n ]->GetSection();
         if( TOX_CONTENT_SECTION == pSect->GetType() &&
-            pSect->GetFmt()->GetSectionNode())
+            pSect->GetFormat()->GetSectionNode())
         {
             if (static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()
                     == rName)
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 82d52b99a8b6..5d118c6d6ab4 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -1521,14 +1521,14 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             break;
             case PROPERTY_MAP_CNTIDX_MARK:
             {
-                static SfxItemPropertyMapEntry const aCntntMarkMap_Impl[] =
+                static SfxItemPropertyMapEntry const aContentMarkMap_Impl[] =
                 {
                     { OUString(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT,        cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
                     { OUString(UNO_NAME_LEVEL), WID_LEVEL        ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,     0},
                     COMMON_TEXT_CONTENT_PROPERTIES
                     { OUString(), 0, css::uno::Type(), 0, 0 }
                 };
-                aMapEntriesArr[nPropertyId] = aCntntMarkMap_Impl;
+                aMapEntriesArr[nPropertyId] = aContentMarkMap_Impl;
             }
             break;
             case PROPERTY_MAP_USER_MARK:
@@ -2156,7 +2156,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             break;
             case PROPERTY_MAP_FLDTYP_CONDITIONED_TEXT      :
             {
-                static SfxItemPropertyMapEntry const aConditionedTxtFieldPropMap [] =
+                static SfxItemPropertyMapEntry const aConditionedTextFieldPropMap [] =
                 {
                     {OUString(UNO_NAME_CONDITION),      FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
                     {OUString(UNO_NAME_FALSE_CONTENT),  FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
@@ -2166,12 +2166,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     COMMON_FLDTYP_PROPERTIES
                     { OUString(), 0, css::uno::Type(), 0, 0 }
                 };
-                aMapEntriesArr[nPropertyId] = aConditionedTxtFieldPropMap;
+                aMapEntriesArr[nPropertyId] = aConditionedTextFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_HIDDEN_TEXT :
             {
-                static SfxItemPropertyMapEntry const aHiddenTxtFieldPropMap  [] =
+                static SfxItemPropertyMapEntry const aHiddenTextFieldPropMap  [] =
                 {
                     {OUString(UNO_NAME_CONDITION),      FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
                     {OUString(UNO_NAME_CONTENT) ,       FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
@@ -2180,7 +2180,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     COMMON_FLDTYP_PROPERTIES
                     { OUString(), 0, css::uno::Type(), 0, 0 }
                 };
-                aMapEntriesArr[nPropertyId] = aHiddenTxtFieldPropMap;
+                aMapEntriesArr[nPropertyId] = aHiddenTextFieldPropMap;
             }
             break;
             case PROPERTY_MAP_FLDTYP_ANNOTATION            :
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index c1259a40ee89..6de0271b635b 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -227,8 +227,8 @@ throw (lang::IllegalArgumentException)
         {
             throw lang::IllegalArgumentException();
         }
-        const SwFmtCharFmt aFmt(pStyle->GetCharFmt());
-        rSet.Put(aFmt);
+        const SwFormatCharFormat aFormat(pStyle->GetCharFormat());
+        rSet.Put(aFormat);
     }
 };
 
@@ -247,11 +247,11 @@ throw (lang::IllegalArgumentException)
         rStyleAccess.getByName(uStyle, IStyleAccess::AUTO_STYLE_CHAR );
     if(pStyle.get())
     {
-        SwFmtAutoFmt aFmt( (bPara)
+        SwFormatAutoFormat aFormat( (bPara)
             ? sal::static_int_cast< sal_uInt16 >(RES_AUTO_STYLE)
             : sal::static_int_cast< sal_uInt16 >(RES_TXTATR_AUTOFMT) );
-        aFmt.SetStyleHandle( pStyle );
-        rSet.Put(aFmt);
+        aFormat.SetStyleHandle( pStyle );
+        rSet.Put(aFormat);
     }
     else
     {
@@ -260,7 +260,7 @@ throw (lang::IllegalArgumentException)
 };
 
 void
-SwUnoCursorHelper::SetTxtFmtColl(const uno::Any & rAny, SwPaM & rPaM)
+SwUnoCursorHelper::SetTextFormatColl(const uno::Any & rAny, SwPaM & rPaM)
 throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     SwDoc *const pDoc = rPaM.GetDoc();
@@ -279,12 +279,12 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
         throw lang::IllegalArgumentException();
     }
 
-    SwTxtFmtColl *const pLocal = pStyle->GetCollection();
+    SwTextFormatColl *const pLocal = pStyle->GetCollection();
     UnoActionContext aAction(pDoc);
     pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
     SwPaM *pTmpCrsr = &rPaM;
     do {
-        pDoc->SetTxtFmtColl(*pTmpCrsr, pLocal);
+        pDoc->SetTextFormatColl(*pTmpCrsr, pLocal);
         pTmpCrsr = static_cast<SwPaM*>(pTmpCrsr->GetNext());
     } while ( pTmpCrsr != &rPaM );
     pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
@@ -299,16 +299,16 @@ SwUnoCursorHelper::SetPageDesc(
     {
         return false;
     }
-    ::std::unique_ptr<SwFmtPageDesc> pNewDesc;
+    ::std::unique_ptr<SwFormatPageDesc> pNewDesc;
     const SfxPoolItem* pItem;
     if(SfxItemState::SET == rSet.GetItemState( RES_PAGEDESC, true, &pItem ) )
     {
-        pNewDesc.reset(new SwFmtPageDesc(
-                    *static_cast<const SwFmtPageDesc*>(pItem)));
+        pNewDesc.reset(new SwFormatPageDesc(
+                    *static_cast<const SwFormatPageDesc*>(pItem)));
     }
     if (!pNewDesc.get())
     {
-        pNewDesc.reset(new SwFmtPageDesc());
+        pNewDesc.reset(new SwFormatPageDesc());
     }
     OUString sDescName;
     SwStyleNameMapper::FillUIName(uDescName, sDescName,
@@ -330,7 +330,7 @@ SwUnoCursorHelper::SetPageDesc(
         if(!bPut)
         {
             rSet.ClearItem(RES_BREAK);
-            rSet.Put(SwFmtPageDesc());
+            rSet.Put(SwFormatPageDesc());
         }
         else
         {
@@ -370,7 +370,7 @@ lcl_SetNodeNumStart(SwPaM & rCrsr, uno::Any const& rValue)
 }
 
 static bool
-lcl_setCharFmtSequence(SwPaM & rPam, uno::Any const& rValue)
+lcl_setCharFormatSequence(SwPaM & rPam, uno::Any const& rValue)
 {
     uno::Sequence<OUString> aCharStyles;
     if (!(rValue >>= aCharStyles))
@@ -415,24 +415,24 @@ lcl_setDropcapCharStyle(SwPaM & rPam, SfxItemSet & rItemSet,
             pDoc->GetDocShell()
             ->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_CHAR));
     if (!pStyle ||
-        (static_cast<SwDocStyleSheet*>(pStyle)->GetCharFmt() ==
-             pDoc->GetDfltCharFmt()))
+        (static_cast<SwDocStyleSheet*>(pStyle)->GetCharFormat() ==
+             pDoc->GetDfltCharFormat()))
     {
         throw lang::IllegalArgumentException();
     }
-    ::std::unique_ptr<SwFmtDrop> pDrop;
+    ::std::unique_ptr<SwFormatDrop> pDrop;
     SfxPoolItem const* pItem(0);
     if (SfxItemState::SET ==
             rItemSet.GetItemState(RES_PARATR_DROP, true, &pItem))
     {
-        pDrop.reset(new SwFmtDrop(*static_cast<const SwFmtDrop*>(pItem)));
+        pDrop.reset(new SwFormatDrop(*static_cast<const SwFormatDrop*>(pItem)));
     }
     if (!pDrop.get())
     {
-        pDrop.reset(new SwFmtDrop);
+        pDrop.reset(new SwFormatDrop);
     }
     const rtl::Reference<SwDocStyleSheet> xStyle(new SwDocStyleSheet(*pStyle));
-    pDrop->SetCharFmt(xStyle->GetCharFmt());
+    pDrop->SetCharFormat(xStyle->GetCharFormat());
     rItemSet.Put(*pDrop);
 }
 
@@ -445,27 +445,27 @@ lcl_setRubyCharstyle(SfxItemSet & rItemSet, uno::Any const& rValue)
         throw lang::IllegalArgumentException();
     }
 
-    ::std::unique_ptr<SwFmtRuby> pRuby;
+    ::std::unique_ptr<SwFormatRuby> pRuby;
     const SfxPoolItem* pItem;
     if (SfxItemState::SET ==
             rItemSet.GetItemState(RES_TXTATR_CJK_RUBY, true, &pItem))
     {
-        pRuby.reset(new SwFmtRuby(*static_cast<const SwFmtRuby*>(pItem)));
+        pRuby.reset(new SwFormatRuby(*static_cast<const SwFormatRuby*>(pItem)));
     }
     if (!pRuby.get())
     {
-        pRuby.reset(new SwFmtRuby(OUString()));
+        pRuby.reset(new SwFormatRuby(OUString()));
     }
     OUString sStyle;
     SwStyleNameMapper::FillUIName(sTmp, sStyle,
             nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
-    pRuby->SetCharFmtName(sStyle);
-    pRuby->SetCharFmtId(0);
+    pRuby->SetCharFormatName(sStyle);
+    pRuby->SetCharFormatId(0);
     if (!sStyle.isEmpty())
     {
         const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(
                 sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
-        pRuby->SetCharFmtId(nId);
+        pRuby->SetCharFormatId(nId);
     }
     rItemSet.Put(*pRuby);
 }
@@ -492,10 +492,10 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, uno::DeploymentExc
                     rValue, rItemSet, false);
         break;
         case FN_UNO_CHARFMT_SEQUENCE:
-            lcl_setCharFmtSequence(rPam, rValue);
+            lcl_setCharFormatSequence(rPam, rValue);
         break;
         case FN_UNO_PARA_STYLE :
-            SwUnoCursorHelper::SetTxtFmtColl(rValue, rPam);
+            SwUnoCursorHelper::SetTextFormatColl(rValue, rPam);
         break;
         case RES_AUTO_STYLE:
             lcl_setAutoStyle(rPam.GetDoc()->GetIStyleAccess(),
@@ -513,8 +513,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, uno::DeploymentExc
         case FN_UNO_IS_NUMBER:
         {
             // multi selection is not considered
-            SwTxtNode *const pTxtNd = rPam.GetNode().GetTxtNode();
-            if (!pTxtNd)
+            SwTextNode *const pTextNd = rPam.GetNode().GetTextNode();
+            if (!pTextNd)
             {
                 throw lang::IllegalArgumentException();
             }
@@ -528,7 +528,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, uno::DeploymentExc
                         throw lang::IllegalArgumentException(
                             "invalid NumberingLevel", 0, 0);
                     }
-                    pTxtNd->SetAttrListLevel(nLevel);
+                    pTextNd->SetAttrListLevel(nLevel);
                 }
             }
             // #i91601#
@@ -537,7 +537,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, uno::DeploymentExc
                 OUString sListId;
                 if (rValue >>= sListId)
                 {
-                    pTxtNd->SetListId( sListId );
+                    pTextNd->SetListId( sListId );
                 }
             }
             else if (FN_UNO_IS_NUMBER == rEntry.nWID)
@@ -547,7 +547,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, uno::DeploymentExc
                 {
                     if (!bIsNumber)
                     {
-                        pTxtNd->SetCountedInList( false );
+                        pTextNd->SetCountedInList( false );
                     }
                 }
             }
@@ -610,11 +610,11 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, uno::DeploymentExc
     return bRet;
 }
 
-SwFmtColl *
-SwUnoCursorHelper::GetCurTxtFmtColl(SwPaM & rPaM, const bool bConditional)
+SwFormatColl *
+SwUnoCursorHelper::GetCurTextFormatColl(SwPaM & rPaM, const bool bConditional)
 {
     static const sal_uLong nMaxLookup = 1000;
-    SwFmtColl *pFmt = 0;
+    SwFormatColl *pFormat = 0;
     bool bError = false;
     SwPaM *pTmpCrsr = &rPaM;
     do
@@ -624,23 +624,23 @@ SwUnoCursorHelper::GetCurTxtFmtColl(SwPaM & rPaM, const bool bConditional)
 
         if( nEndNd - nSttNd >= nMaxLookup )
         {
-            pFmt = 0;
+            pFormat = 0;
             break;
         }
 
         const SwNodes& rNds = rPaM.GetDoc()->GetNodes();
         for( sal_uLong n = nSttNd; n <= nEndNd; ++n )
         {
-            SwTxtNode const*const pNd = rNds[ n ]->GetTxtNode();
+            SwTextNode const*const pNd = rNds[ n ]->GetTextNode();
             if( pNd )
             {
-                SwFmtColl *const pNdFmt = (bConditional)
-                    ? pNd->GetFmtColl() : &pNd->GetAnyFmtColl();
-                if( !pFmt )
+                SwFormatColl *const pNdFormat = (bConditional)
+                    ? pNd->GetFormatColl() : &pNd->GetAnyFormatColl();
+                if( !pFormat )
                 {
-                    pFmt = pNdFmt;
+                    pFormat = pNdFormat;
                 }
-                else if( pFmt != pNdFmt )
+                else if( pFormat != pNdFormat )
                 {
                     bError = true;
                     break;
@@ -650,7 +650,7 @@ SwUnoCursorHelper::GetCurTxtFmtColl(SwPaM & rPaM, const bool bConditional)
 
         pTmpCrsr = static_cast<SwPaM*>(pTmpCrsr->GetNext());
     } while ( pTmpCrsr != &rPaM );
-    return (bError) ? 0 : pFmt;
+    return (bError) ? 0 : pFormat;
 }
 
 class SwXTextCursor::Impl
@@ -780,7 +780,7 @@ void SwXTextCursor::DeleteAndInsert(const OUString& rText,
         // Start/EndAction
         SwDoc* pDoc = pUnoCrsr->GetDoc();
         UnoActionContext aAction(pDoc);
-        const sal_Int32 nTxtLen = rText.getLength();
+        const sal_Int32 nTextLen = rText.getLength();
         pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
         SwCursor * pCurrent = pUnoCrsr;
         do
@@ -789,7 +789,7 @@ void SwXTextCursor::DeleteAndInsert(const OUString& rText,
             {
                 pDoc->getIDocumentContentOperations().DeleteAndJoin(*pCurrent);
             }
-            if(nTxtLen)
+            if(nTextLen)
             {
                 const bool bSuccess(
                     SwUnoCursorHelper::DocInsertStringSplitCR(
@@ -819,16 +819,16 @@ lcl_ForceIntoMeta(SwPaM & rCursor,
     OSL_ENSURE(pXMeta, "no parent?");
     if (!pXMeta)
         throw uno::RuntimeException();
-    SwTxtNode * pTxtNode;
+    SwTextNode * pTextNode;
     sal_Int32 nStart;
     sal_Int32 nEnd;
-    const bool bSuccess( pXMeta->SetContentRange(pTxtNode, nStart, nEnd) );
+    const bool bSuccess( pXMeta->SetContentRange(pTextNode, nStart, nEnd) );
     OSL_ENSURE(bSuccess, "no pam?");
     if (!bSuccess)
         throw uno::RuntimeException();
     // force the cursor back into the meta if it has moved outside
-    SwPosition start(*pTxtNode, nStart);
-    SwPosition end(*pTxtNode, nEnd);
+    SwPosition start(*pTextNode, nStart);
+    SwPosition end(*pTextNode, nEnd);
     switch (eMode)
     {
         case META_INIT_START:
@@ -863,15 +863,15 @@ bool SwXTextCursor::IsAtEndOfMeta() const
         OSL_ENSURE(pXMeta, "no meta?");
         if (pCursor && pXMeta)
         {
-            SwTxtNode * pTxtNode;
+            SwTextNode * pTextNode;
             sal_Int32 nStart;
             sal_Int32 nEnd;
             const bool bSuccess(
-                    pXMeta->SetContentRange(pTxtNode, nStart, nEnd) );
+                    pXMeta->SetContentRange(pTextNode, nStart, nEnd) );
             OSL_ENSURE(bSuccess, "no pam?");
             if (bSuccess)
             {
-                const SwPosition end(*pTxtNode, nEnd);
+                const SwPosition end(*pTextNode, nEnd);
                 if (   (*pCursor->GetPoint() == end)
                     || (*pCursor->GetMark()  == end))
                 {
@@ -1029,13 +1029,13 @@ SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException, std::exc
     {
         rUnoCursor.Move( fnMoveBackward, fnGoDoc );
         //check, that the cursor is not in a table
-        SwTableNode * pTblNode = rUnoCursor.GetNode().FindTableNode();
-        SwCntntNode * pCNode = 0;
-        while (pTblNode)
+        SwTableNode * pTableNode = rUnoCursor.GetNode().FindTableNode();
+        SwContentNode * pCNode = 0;
+        while (pTableNode)
         {
-            rUnoCursor.GetPoint()->nNode = *pTblNode->EndOfSectionNode();
+            rUnoCursor.GetPoint()->nNode = *pTableNode->EndOfSectionNode();
             pCNode = GetDoc()->GetNodes().GoNext(&rUnoCursor.GetPoint()->nNode);
-            pTblNode = (pCNode) ? pCNode->FindTableNode() : 0;
+            pTableNode = (pCNode) ? pCNode->FindTableNode() : 0;
         }
         if (pCNode)
         {
@@ -1286,8 +1286,8 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std::
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
     // end of paragraph
-    if (rUnoCursor.GetCntntNode() &&
-            (pPoint->nContent == rUnoCursor.GetCntntNode()->Len()))
+    if (rUnoCursor.GetContentNode() &&
+            (pPoint->nContent == rUnoCursor.GetContentNode()->Len()))
     {
         rUnoCursor.Right(1, CRSR_SKIP_CHARS, false, false);
     }
@@ -1458,8 +1458,8 @@ SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException, std::exception)
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     // end of paragraph?
-    bool bRet = rUnoCursor.GetCntntNode() &&
-        (rUnoCursor.GetPoint()->nContent == rUnoCursor.GetCntntNode()->Len());
+    bool bRet = rUnoCursor.GetContentNode() &&
+        (rUnoCursor.GetPoint()->nContent == rUnoCursor.GetContentNode()->Len());
     // with mark->no sentence end
     // (check if cursor is no selection, i.e. it does not have
     // a mark or else point and mark are identical)
@@ -1758,9 +1758,9 @@ OUString SAL_CALL SwXTextCursor::getString() throw (uno::RuntimeException, std::
 
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
-    OUString aTxt;
-    SwUnoCursorHelper::GetTextFromPam(rUnoCursor, aTxt);
-    return aTxt;
+    OUString aText;
+    SwUnoCursorHelper::GetTextFromPam(rUnoCursor, aText);
+    return aText;
 }
 
 void SAL_CALL
@@ -1829,7 +1829,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 }
 
 // FN_UNO_PARA_STYLE is known to set attributes for nodes, inside
-// SwUnoCursorHelper::SetTxtFmtColl, instead of extending item set.
+// SwUnoCursorHelper::SetTextFormatColl, instead of extending item set.
 // We need to get them from nodes in next call to GetCrsrAttr.
 // The rest could cause similar problems in theory, so we just list them here.
 inline bool propertyCausesSideEffectsInNodes(sal_uInt16 nWID)
@@ -2556,7 +2556,7 @@ throw (uno::RuntimeException, std::exception)
 
     SwNode& node = rUnoCursor.GetNode();
 
-    SwTxtNode* txtNode = node.GetTxtNode();
+    SwTextNode* txtNode = node.GetTextNode();
 
     if (txtNode == 0) return;
 
@@ -2577,11 +2577,11 @@ throw (uno::RuntimeException, std::exception)
     }
     else return;
 
-    SwFmtColl* fmtColl=txtNode->GetFmtColl();
+    SwFormatColl* fmtColl=txtNode->GetFormatColl();
 
     if (fmtColl == 0) return;
 
-    SwFmtChg aNew( fmtColl );
+    SwFormatChg aNew( fmtColl );
     txtNode->NotifyClients( 0, &aNew );
 }
 
@@ -2649,8 +2649,8 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable)
     }
 
 #if OSL_DEBUG_LEVEL > 1
-    const OUString *pTxt = aSeq.getConstArray();
-    (void)pTxt;
+    const OUString *pText = aSeq.getConstArray();
+    (void)pText;
 #endif
 
     pFields[0].Field = 1;
@@ -2795,10 +2795,10 @@ bool SwUnoCursorHelper::ConvertSortProperties(
             bOldSortdescriptor = true;
             sal_uInt16 nIndex = rPropName[17];
             nIndex -= '0';
-            OUString aTxt;
-            if ((aValue >>= aTxt) && nIndex < 3)
+            OUString aText;
+            if ((aValue >>= aText) && nIndex < 3)
             {
-                aKeys[nIndex]->sSortType = aTxt;
+                aKeys[nIndex]->sSortType = aText;
             }
             else
             {
@@ -2964,7 +2964,7 @@ SwXTextCursor::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor)
         // update selection
         rUnoCursor.DeleteMark();
         rUnoCursor.GetPoint()->nNode.Assign( aPrevIdx.GetNode(), +1 );
-        SwCntntNode *const pCNd = rUnoCursor.GetCntntNode();
+        SwContentNode *const pCNd = rUnoCursor.GetContentNode();
         sal_Int32 nLen = pCNd->Len();
         if (nLen > nCntStt)
         {
@@ -2974,7 +2974,7 @@ SwXTextCursor::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor)
         rUnoCursor.SetMark();
 
         rUnoCursor.GetPoint()->nNode += nOffset;
-        SwCntntNode *const pCNd2 = rUnoCursor.GetCntntNode();
+        SwContentNode *const pCNd2 = rUnoCursor.GetContentNode();
         rUnoCursor.GetPoint()->nContent.Assign( pCNd2, pCNd2->Len() );
     }
 }
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index bf5d910b615d..82d79d029bad 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -179,32 +179,32 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
 
     const sal_uInt16 nChkType = static_cast< sal_uInt16 >((_bAtCharAnchoredObjs)
             ? FLY_AT_CHAR : FLY_AT_PARA);
-    const SwCntntFrm* pCFrm;
-    const SwCntntNode* pCNd;
+    const SwContentFrm* pCFrm;
+    const SwContentNode* pCNd;
     if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() &&
-        0 != (pCNd = rIdx.GetNode().GetCntntNode()) &&
+        0 != (pCNd = rIdx.GetNode().GetContentNode()) &&
         0 != (pCFrm = pCNd->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout())) )
     {
         const SwSortedObjs *pObjs = pCFrm->GetDrawObjs();
         if( pObjs )
         {
-            std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+            std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
             for( size_t i = 0; i < pObjs->size(); ++i )
             {
                 SwAnchoredObject* pAnchoredObj = (*pObjs)[i];
-                SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
+                SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat();
 
                 // Filter out textboxes, which are not interesting at an UNO level.
-                if (aTextBoxes.find(&rFmt) != aTextBoxes.end())
+                if (aTextBoxes.find(&rFormat) != aTextBoxes.end())
                     continue;
 
-                if ( rFmt.GetAnchor().GetAnchorId() == nChkType )
+                if ( rFormat.GetAnchor().GetAnchorId() == nChkType )
                 {
                     // create SwDepend and insert into array
-                    SwDepend* pNewDepend = new SwDepend( &rClnt, &rFmt );
+                    SwDepend* pNewDepend = new SwDepend( &rClnt, &rFormat );
                     const sal_Int32 idx =
-                        rFmt.GetAnchor().GetCntntAnchor()->nContent.GetIndex();
-                    sal_uInt32 nOrder = rFmt.GetAnchor().GetOrder();
+                        rFormat.GetAnchor().GetContentAnchor()->nContent.GetIndex();
+                    sal_uInt32 nOrder = rFormat.GetAnchor().GetOrder();
 
                     // OD 2004-05-07 #i28701# - sorting no longer needed,
                     // because list <SwSortedObjs> is already sorted.
@@ -216,18 +216,18 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
     }
     else
     {
-        const SwFrmFmts& rFmts = *pDoc->GetSpzFrmFmts();
-        const size_t nSize = rFmts.size();
+        const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
+        const size_t nSize = rFormats.size();
         for ( size_t i = 0; i < nSize; i++)
         {
-            const SwFrmFmt* pFmt = rFmts[ i ];
-            const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+            const SwFrameFormat* pFormat = rFormats[ i ];
+            const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
             const SwPosition* pAnchorPos;
             if( rAnchor.GetAnchorId() == nChkType &&
-                0 != (pAnchorPos = rAnchor.GetCntntAnchor()) &&
+                0 != (pAnchorPos = rAnchor.GetContentAnchor()) &&
                     pAnchorPos->nNode == rIdx )
             {
-                SwDepend* pNewDepend = new SwDepend( &rClnt, const_cast<SwFrmFmt*>(pFmt));
+                SwDepend* pNewDepend = new SwDepend( &rClnt, const_cast<SwFrameFormat*>(pFormat));
 
                 // OD 2004-05-07 #i28701# - determine insert position for
                 // sorted <rFrameArr>
@@ -296,8 +296,8 @@ void ClientModify(SwClient* pClient, const SfxPoolItem *pOld, const SfxPoolItem
 
     case RES_FMT_CHG:
         // Is the move to the new one finished and will the old one be deleted?
-        if( static_cast<const SwFmtChg*>(pNew)->pChangedFmt == pClient->GetRegisteredIn() &&
-            static_cast<const SwFmtChg*>(pOld)->pChangedFmt->IsFmtInDTOR() )
+        if( static_cast<const SwFormatChg*>(pNew)->pChangedFormat == pClient->GetRegisteredIn() &&
+            static_cast<const SwFormatChg*>(pOld)->pChangedFormat->IsFormatInDTOR() )
             static_cast<SwModify*>(pClient->GetRegisteredIn())->Remove(pClient);
         break;
     }
@@ -334,7 +334,7 @@ void SwUnoCursorHelper::SetCrsrAttr(SwPaM & rPam,
 
     if( rSet.GetItemState( RES_PARATR_OUTLINELEVEL, false ) >= SfxItemState::DEFAULT )
     {
-        SwTxtNode * pTmpNode = rPam.GetNode().GetTxtNode();
+        SwTextNode * pTmpNode = rPam.GetNode().GetTextNode();
         if ( pTmpNode )
         {
             rPam.GetDoc()->GetNodes().UpdateOutlineNode( *pTmpNode );
@@ -343,10 +343,10 @@ void SwUnoCursorHelper::SetCrsrAttr(SwPaM & rPam,
 }
 
 // #i63870#
-// split third parameter <bCurrentAttrOnly> into new parameters <bOnlyTxtAttr>
-// and <bGetFromChrFmt> to get better control about resulting <SfxItemSet>
+// split third parameter <bCurrentAttrOnly> into new parameters <bOnlyTextAttr>
+// and <bGetFromChrFormat> to get better control about resulting <SfxItemSet>
 void SwUnoCursorHelper::GetCrsrAttr(SwPaM & rPam,
-        SfxItemSet & rSet, const bool bOnlyTxtAttr, const bool bGetFromChrFmt)
+        SfxItemSet & rSet, const bool bOnlyTextAttr, const bool bGetFromChrFormat)
 {
     static const sal_uLong nMaxLookup = 1000;
     SfxItemSet aSet( *rSet.GetPool(), rSet.GetRanges() );
@@ -378,14 +378,14 @@ void SwUnoCursorHelper::GetCrsrAttr(SwPaM & rPam,
                         ? rStart.nContent.GetIndex() : 0;
                     const sal_Int32 nEnd   = (n == nEndNd)
                         ? rEnd.nContent.GetIndex()
-                        : pNd->GetTxtNode()->GetTxt().getLength();
-                    pNd->GetTxtNode()->GetAttr(*pSet, nStart, nEnd, bOnlyTxtAttr, bGetFromChrFmt);
+                        : pNd->GetTextNode()->GetText().getLength();
+                    pNd->GetTextNode()->GetAttr(*pSet, nStart, nEnd, bOnlyTextAttr, bGetFromChrFormat);
                 }
                 break;
 
                 case ND_GRFNODE:
                 case ND_OLENODE:
-                    static_cast<SwCntntNode*>(pNd)->GetAttr( *pSet );
+                    static_cast<SwContentNode*>(pNd)->GetAttr( *pSet );
                 break;
 
                 default:
@@ -539,11 +539,11 @@ SwXParagraphEnumeration::hasMoreElements() throw (uno::RuntimeException, std::ex
 //!! compare to SwShellTableCrsr::FillRects() in viscrs.cxx
 static SwTableNode *
 lcl_FindTopLevelTable(
-        SwTableNode *const pTblNode, SwTable const*const pOwnTable)
+        SwTableNode *const pTableNode, SwTable const*const pOwnTable)
 {
     // find top-most table in current context (section) level
 
-    SwTableNode * pLast = pTblNode;
+    SwTableNode * pLast = pTableNode;
     for (SwTableNode* pTmp = pLast;
          pTmp != NULL  &&  &pTmp->GetTable() != pOwnTable;  /* we must not go up higher than the own table! */
          pTmp = pTmp->StartOfSectionNode()->FindTableNode() )
@@ -598,11 +598,11 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
 
         // os 2005-01-14: This part is only necessary to detect movements out
         // of a selection; if there is no selection we don't have to care
-        SwTableNode *const pTblNode = aNewCrsr->GetNode().FindTableNode();
+        SwTableNode *const pTableNode = aNewCrsr->GetNode().FindTableNode();
         if (((CURSOR_TBLTEXT != m_eCursorType) &&
-            (CURSOR_SELECTION_IN_TABLE != m_eCursorType)) && pTblNode)
+            (CURSOR_SELECTION_IN_TABLE != m_eCursorType)) && pTableNode)
         {
-            aNewCrsr->GetPoint()->nNode = pTblNode->EndOfSectionIndex();
+            aNewCrsr->GetPoint()->nNode = pTableNode->EndOfSectionIndex();
             aNewCrsr->Move(fnMoveForward, fnGoNode);
         }
         else
@@ -620,12 +620,12 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
     {
         pUnoCrsr->SetRemainInSection( false );
         // what to do if already in a table?
-        SwTableNode * pTblNode = pUnoCrsr->GetNode().FindTableNode();
-        pTblNode = lcl_FindTopLevelTable( pTblNode, m_pOwnTable );
-        if (pTblNode && (&pTblNode->GetTable() != m_pOwnTable))
+        SwTableNode * pTableNode = pUnoCrsr->GetNode().FindTableNode();
+        pTableNode = lcl_FindTopLevelTable( pTableNode, m_pOwnTable );
+        if (pTableNode && (&pTableNode->GetTable() != m_pOwnTable))
         {
             // this is a foreign table: go to end
-            pUnoCrsr->GetPoint()->nNode = pTblNode->EndOfSectionIndex();
+            pUnoCrsr->GetPoint()->nNode = pTableNode->EndOfSectionIndex();
             if (!pUnoCrsr->Move(fnMoveForward, fnGoNode))
             {
                 return 0;
@@ -649,21 +649,21 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
             (m_nEndIndex == pStart->nNode.GetIndex()) ? m_nLastParaEnd : -1;
 
         // position in a table, or in a simple paragraph?
-        SwTableNode * pTblNode = pUnoCrsr->GetNode().FindTableNode();
-        pTblNode = lcl_FindTopLevelTable( pTblNode, m_pOwnTable );
+        SwTableNode * pTableNode = pUnoCrsr->GetNode().FindTableNode();
+        pTableNode = lcl_FindTopLevelTable( pTableNode, m_pOwnTable );
         if (/*CURSOR_TBLTEXT != eCursorType && CURSOR_SELECTION_IN_TABLE != eCursorType && */
-            pTblNode && (&pTblNode->GetTable() != m_pOwnTable))
+            pTableNode && (&pTableNode->GetTable() != m_pOwnTable))
         {
             // this is a foreign table
-            SwFrmFmt* pTableFmt =
-                static_cast<SwFrmFmt*>(pTblNode->GetTable().GetFrmFmt());
-            xRef = SwXTextTable::CreateXTextTable(pTableFmt);
+            SwFrameFormat* pTableFormat =
+                static_cast<SwFrameFormat*>(pTableNode->GetTable().GetFrameFormat());
+            xRef = SwXTextTable::CreateXTextTable(pTableFormat);
         }
         else
         {
             text::XText *const pText = m_xParentText.get();
             xRef = SwXParagraph::CreateXParagraph(*pUnoCrsr->GetDoc(),
-                pStart->nNode.GetNode().GetTxtNode(),
+                pStart->nNode.GetNode().GetTextNode(),
                 static_cast<SwXText*>(pText), nFirstContent, nLastContent);
         }
     }
@@ -706,14 +706,14 @@ public:
     ::sw::mark::IMark * m_pMark;
 
     Impl(   SwDoc & rDoc, const enum RangePosition eRange,
-            SwFrmFmt *const pTblFmt = 0,
+            SwFrameFormat *const pTableFormat = 0,
             const uno::Reference< text::XText > & xParent = 0)
         : SwClient()
         , m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR))
         , m_eRangePosition(eRange)
         , m_rDoc(rDoc)
         , m_xParentText(xParent)
-        , m_ObjectDepend(this, pTblFmt)
+        , m_ObjectDepend(this, pTableFormat)
         , m_pMark(0)
     {
     }
@@ -775,13 +775,13 @@ SwXTextRange::SwXTextRange(SwPaM& rPam,
     SetPositions(rPam);
 }
 
-SwXTextRange::SwXTextRange(SwFrmFmt& rTblFmt)
+SwXTextRange::SwXTextRange(SwFrameFormat& rTableFormat)
     : m_pImpl(
-        new SwXTextRange::Impl(*rTblFmt.GetDoc(), RANGE_IS_TABLE, &rTblFmt) )
+        new SwXTextRange::Impl(*rTableFormat.GetDoc(), RANGE_IS_TABLE, &rTableFormat) )
 {
-    SwTable *const pTable = SwTable::FindTable( &rTblFmt );
-    SwTableNode *const pTblNode = pTable->GetTableNode();
-    SwPosition aPosition( *pTblNode );
+    SwTable *const pTable = SwTable::FindTable( &rTableFormat );
+    SwTableNode *const pTableNode = pTable->GetTableNode();
+    SwPosition aPosition( *pTableNode );
     SwPaM aPam( aPosition );
 
     SetPositions( aPam );
@@ -910,11 +910,11 @@ SwXTextRange::getText() throw (uno::RuntimeException, std::exception)
         if (m_pImpl->m_eRangePosition == RANGE_IS_TABLE &&
             m_pImpl->m_ObjectDepend.GetRegisteredIn())
         {
-            SwFrmFmt const*const pTblFmt = static_cast<SwFrmFmt const*>(
+            SwFrameFormat const*const pTableFormat = static_cast<SwFrameFormat const*>(
                     m_pImpl->m_ObjectDepend.GetRegisteredIn());
-            SwTable const*const pTable = SwTable::FindTable( pTblFmt );
-            SwTableNode const*const pTblNode = pTable->GetTableNode();
-            const SwPosition aPosition( *pTblNode );
+            SwTable const*const pTable = SwTable::FindTable( pTableFormat );
+            SwTableNode const*const pTableNode = pTable->GetTableNode();
+            const SwPosition aPosition( *pTableNode );
             m_pImpl->m_xParentText =
                 ::sw::CreateParentXText(m_pImpl->m_rDoc, aPosition);
         }
@@ -1096,28 +1096,28 @@ bool XTextRangeToSwPaM( SwUnoInternalPaM & rToFill,
 
 static bool
 lcl_IsStartNodeInFormat(const bool bHeader, SwStartNode *const pSttNode,
-    SwFrmFmt const*const pFrmFmt, SwFrmFmt*& rpFormat)
+    SwFrameFormat const*const pFrameFormat, SwFrameFormat*& rpFormat)
 {
     bool bRet = false;
-    const SfxItemSet& rSet = pFrmFmt->GetAttrSet();
+    const SfxItemSet& rSet = pFrameFormat->GetAttrSet();
     const SfxPoolItem* pItem;
     if (SfxItemState::SET == rSet.GetItemState(
             static_cast<sal_uInt16>(bHeader ? RES_HEADER : RES_FOOTER),
             true, &pItem))
     {
         SfxPoolItem *const pItemNonConst(const_cast<SfxPoolItem *>(pItem));
-        SwFrmFmt *const pHeadFootFmt = (bHeader) ?
-            static_cast<SwFmtHeader*>(pItemNonConst)->GetHeaderFmt() :
-            static_cast<SwFmtFooter*>(pItemNonConst)->GetFooterFmt();
-        if (pHeadFootFmt)
+        SwFrameFormat *const pHeadFootFormat = (bHeader) ?
+            static_cast<SwFormatHeader*>(pItemNonConst)->GetHeaderFormat() :
+            static_cast<SwFormatFooter*>(pItemNonConst)->GetFooterFormat();
+        if (pHeadFootFormat)
         {
-            const SwFmtCntnt& rFlyCntnt = pHeadFootFmt->GetCntnt();
-            const SwNode& rNode = rFlyCntnt.GetCntntIdx()->GetNode();
+            const SwFormatContent& rFlyContent = pHeadFootFormat->GetContent();
+            const SwNode& rNode = rFlyContent.GetContentIdx()->GetNode();
             SwStartNode const*const pCurSttNode = rNode.FindSttNodeByType(
                 (bHeader) ? SwHeaderStartNode : SwFooterStartNode);
             if (pCurSttNode && (pCurSttNode == pSttNode))
             {
-                rpFormat = pHeadFootFmt;
+                rpFormat = pHeadFootFormat;
                 bRet = true;
             }
         }
@@ -1163,22 +1163,22 @@ CreateParentXText(SwDoc & rDoc, const SwPosition& rPos)
     {
         case SwTableBoxStartNode:
         {
-            SwTableNode const*const pTblNode = pSttNode->FindTableNode();
-            SwFrmFmt *const pTableFmt =
-                static_cast<SwFrmFmt*>(pTblNode->GetTable().GetFrmFmt());
-            SwTableBox *const  pBox = pSttNode->GetTblBox();
+            SwTableNode const*const pTableNode = pSttNode->FindTableNode();
+            SwFrameFormat *const pTableFormat =
+                static_cast<SwFrameFormat*>(pTableNode->GetTable().GetFrameFormat());
+            SwTableBox *const  pBox = pSttNode->GetTableBox();
 
             xParentText = (pBox)
-                ? SwXCell::CreateXCell( pTableFmt, pBox )
-                : new SwXCell( pTableFmt, *pSttNode );
+                ? SwXCell::CreateXCell( pTableFormat, pBox )
+                : new SwXCell( pTableFormat, *pSttNode );
         }
         break;
         case SwFlyStartNode:
         {
-            SwFrmFmt *const pFmt = pSttNode->GetFlyFmt();
-            if (0 != pFmt)
+            SwFrameFormat *const pFormat = pSttNode->GetFlyFormat();
+            if (0 != pFormat)
             {
-                xParentText.set(SwXTextFrame::CreateXTextFrame(rDoc, pFmt),
+                xParentText.set(SwXTextFrame::CreateXTextFrame(rDoc, pFormat),
                         uno::UNO_QUERY);
             }
         }
@@ -1191,46 +1191,46 @@ CreateParentXText(SwDoc & rDoc, const SwPosition& rPos)
             for(size_t i = 0; i < nPDescCount; i++)
             {
                 const SwPageDesc& rDesc = rDoc.GetPageDesc( i );
-                const SwFrmFmt* pFrmFmtMaster = &rDesc.GetMaster();
-                const SwFrmFmt* pFrmFmtLeft = &rDesc.GetLeft();
+                const SwFrameFormat* pFrameFormatMaster = &rDesc.GetMaster();
+                const SwFrameFormat* pFrameFormatLeft = &rDesc.GetLeft();
 
-                SwFrmFmt* pHeadFootFmt = 0;
-                if (!lcl_IsStartNodeInFormat(bHeader, pSttNode, pFrmFmtMaster,
-                            pHeadFootFmt))
+                SwFrameFormat* pHeadFootFormat = 0;
+                if (!lcl_IsStartNodeInFormat(bHeader, pSttNode, pFrameFormatMaster,
+                            pHeadFootFormat))
                 {
-                    lcl_IsStartNodeInFormat(bHeader, pSttNode, pFrmFmtLeft,
-                            pHeadFootFmt);
+                    lcl_IsStartNodeInFormat(bHeader, pSttNode, pFrameFormatLeft,
+                            pHeadFootFormat);
                 }
 
-                if (pHeadFootFmt)
+                if (pHeadFootFormat)
                 {
                     xParentText = SwXHeadFootText::CreateXHeadFootText(
-                            *pHeadFootFmt, bHeader);
+                            *pHeadFootFormat, bHeader);
                 }
             }
         }
         break;
         case SwFootnoteStartNode:
         {
-            const size_t nFtnCnt = rDoc.GetFtnIdxs().size();
+            const size_t nFootnoteCnt = rDoc.GetFootnoteIdxs().size();
             uno::Reference< text::XFootnote >  xRef;
-            for (size_t n = 0; n < nFtnCnt; ++n )
+            for (size_t n = 0; n < nFootnoteCnt; ++n )
             {
-                const SwTxtFtn* pTxtFtn = rDoc.GetFtnIdxs()[ n ];
-                const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-                pTxtFtn = rFtn.GetTxtFtn();
+                const SwTextFootnote* pTextFootnote = rDoc.GetFootnoteIdxs()[ n ];
+                const SwFormatFootnote& rFootnote = pTextFootnote->GetFootnote();
+                pTextFootnote = rFootnote.GetTextFootnote();
 #if OSL_DEBUG_LEVEL > 1
                 const SwStartNode* pTmpSttNode =
-                        pTxtFtn->GetStartNode()->GetNode().
+                        pTextFootnote->GetStartNode()->GetNode().
                                 FindSttNodeByType(SwFootnoteStartNode);
                 (void)pTmpSttNode;
 #endif
 
-                if (pSttNode == pTxtFtn->GetStartNode()->GetNode().
+                if (pSttNode == pTextFootnote->GetStartNode()->GetNode().
                                     FindSttNodeByType(SwFootnoteStartNode))
                 {
                     xParentText.set(SwXFootnote::CreateXFootnote(rDoc,
-                            &const_cast<SwFmtFtn&>(rFtn)), uno::UNO_QUERY);
+                            &const_cast<SwFormatFootnote&>(rFootnote)), uno::UNO_QUERY);
                     break;
                 }
             }
@@ -1736,13 +1736,13 @@ lcl_CreateNextObject(SwUnoCrsr& i_rUnoCrsr,
     if (!i_rFrames.size())
         return false;
 
-    SwFrmFmt *const pFormat = static_cast<SwFrmFmt*>(const_cast<SwModify*>(
+    SwFrameFormat *const pFormat = static_cast<SwFrameFormat*>(const_cast<SwModify*>(
                 i_rFrames.front()->GetRegisteredIn()));
     i_rFrames.pop_front();
     // the format should be valid here, otherwise the client
     // would have been removed in ::Modify
     // check for a shape first
-    SwDrawContact* const pContact = SwIterator<SwDrawContact,SwFmt>( *pFormat ).First();
+    SwDrawContact* const pContact = SwIterator<SwDrawContact,SwFormat>( *pFormat ).First();
     if (pContact)
     {
         SdrObject * const pSdr = pContact->GetMaster();
@@ -1753,12 +1753,12 @@ lcl_CreateNextObject(SwUnoCrsr& i_rUnoCrsr,
     }
     else
     {
-        const SwNodeIndex* pIdx = pFormat->GetCntnt().GetCntntIdx();
+        const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
         OSL_ENSURE(pIdx, "where is the index?");
         SwNode const*const pNd =
             i_rUnoCrsr.GetDoc()->GetNodes()[ pIdx->GetIndex() + 1 ];
 
-        if (!pNd->IsNoTxtNode())
+        if (!pNd->IsNoTextNode())
         {
             o_rNextObject.set(SwXTextFrame::CreateXTextFrame(
                         *pFormat->GetDoc(), pFormat));
@@ -1786,22 +1786,22 @@ lcl_FillFrame(SwClient & rEnum, SwUnoCrsr& rUnoCrsr,
         FrameDependList_t & rFrames)
 {
     // search for objects at the cursor - anchored at/as char
-    SwTxtAttr const*const pTxtAttr = (rUnoCrsr.GetNode().IsTxtNode())
-        ? rUnoCrsr.GetNode().GetTxtNode()->GetTxtAttrForCharAt(
+    SwTextAttr const*const pTextAttr = (rUnoCrsr.GetNode().IsTextNode())
+        ? rUnoCrsr.GetNode().GetTextNode()->GetTextAttrForCharAt(
             rUnoCrsr.GetPoint()->nContent.GetIndex(), RES_TXTATR_FLYCNT)
         : 0;
-    if (pTxtAttr)
+    if (pTextAttr)
     {
-        const SwFmtFlyCnt& rFlyCnt = pTxtAttr->GetFlyCnt();
-        SwFrmFmt * const  pFrmFmt = rFlyCnt.GetFrmFmt();
-        SwDepend * const pNewDepend = new SwDepend(&rEnum, pFrmFmt);
+        const SwFormatFlyCnt& rFlyCnt = pTextAttr->GetFlyCnt();
+        SwFrameFormat * const  pFrameFormat = rFlyCnt.GetFrameFormat();
+        SwDepend * const pNewDepend = new SwDepend(&rEnum, pFrameFormat);
         rFrames.push_back( ::boost::shared_ptr<SwDepend>(pNewDepend) );
     }
 }
 
 SwXParaFrameEnumeration::SwXParaFrameEnumeration(
         const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode,
-        SwFrmFmt *const pFmt)
+        SwFrameFormat *const pFormat)
     : m_pImpl( new SwXParaFrameEnumeration::Impl(rPaM) )
 {
     if (PARAFRAME_PORTION_PARAGRAPH == eParaFrameMode)
@@ -1813,10 +1813,10 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(
             ::std::back_inserter(m_pImpl->m_Frames),
             ::boost::bind(&FrameDependSortListEntry::pFrameDepend, _1));
     }
-    else if (pFmt)
+    else if (pFormat)
     {
         // create SwDepend for frame and insert into array
-        SwDepend *const pNewDepend = new SwDepend(m_pImpl.get(), pFmt);
+        SwDepend *const pNewDepend = new SwDepend(m_pImpl.get(), pFormat);
         m_pImpl->m_Frames.push_back(::boost::shared_ptr<SwDepend>(pNewDepend));
     }
     else if ((PARAFRAME_PORTION_CHAR == eParaFrameMode) ||
@@ -1825,14 +1825,14 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(
         if (PARAFRAME_PORTION_TEXTRANGE == eParaFrameMode)
         {
             //get all frames that are bound at paragraph or at character
-            SwPosFlyFrms aFlyFrms(rPaM.GetDoc()->GetAllFlyFmts(m_pImpl->GetCursor(), false, true));
+            SwPosFlyFrms aFlyFrms(rPaM.GetDoc()->GetAllFlyFormats(m_pImpl->GetCursor(), false, true));
 
             for(SwPosFlyFrms::const_iterator aIter(aFlyFrms.begin()); aIter != aFlyFrms.end(); ++aIter)
             {
-                SwFrmFmt *const pFrmFmt = const_cast<SwFrmFmt*>(&((*aIter)->GetFmt()));
+                SwFrameFormat *const pFrameFormat = const_cast<SwFrameFormat*>(&((*aIter)->GetFormat()));
 
                 // create SwDepend for frame and insert into array
-                SwDepend *const pNewDepend = new SwDepend(m_pImpl.get(), pFrmFmt);
+                SwDepend *const pNewDepend = new SwDepend(m_pImpl.get(), pFrameFormat);
                 m_pImpl->m_Frames.push_back(::boost::shared_ptr<SwDepend>(pNewDepend));
             }
         }
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index bfc67557d4e3..3c188940d487 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -79,7 +79,7 @@ SwParaSelection::SwParaSelection(SwCursor & rCursor)
         m_rCursor.MovePara(fnParaCurr, fnParaStart);
     }
     // or at the end already?
-    if (m_rCursor.GetPoint()->nContent != m_rCursor.GetCntntNode()->Len())
+    if (m_rCursor.GetPoint()->nContent != m_rCursor.GetContentNode()->Len())
     {
         m_rCursor.SetMark();
         m_rCursor.MovePara(fnParaCurr, fnParaEnd);
@@ -96,7 +96,7 @@ SwParaSelection::~SwParaSelection()
 }
 
 static beans::PropertyState lcl_SwXParagraph_getPropertyState(
-                            const SwTxtNode& rTxtNode,
+                            const SwTextNode& rTextNode,
                             const SwAttrSet** ppSet,
                             const SfxItemPropertySimpleEntry& rEntry,
                             bool &rAttrSetFetched )
@@ -120,30 +120,30 @@ public:
     uno::Reference<text::XText> m_xParentText;
 
     Impl(   SwXParagraph & rThis,
-            SwTxtNode *const pTxtNode = 0,
+            SwTextNode *const pTextNode = 0,
             uno::Reference< text::XText > const & xParent = 0,
             const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = -1)
-        : SwClient(pTxtNode)
+        : SwClient(pTextNode)
         , m_rThis(rThis)
         , m_EventListeners(m_Mutex)
         , m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARAGRAPH))
-        , m_bIsDescriptor(0 == pTxtNode)
+        , m_bIsDescriptor(0 == pTextNode)
         , m_nSelectionStartPos(nSelStart)
         , m_nSelectionEndPos(nSelEnd)
         , m_xParentText(xParent)
     {
     }
 
-    SwTxtNode* GetTxtNode() {
-        return static_cast<SwTxtNode*>(GetRegisteredInNonConst());
+    SwTextNode* GetTextNode() {
+        return static_cast<SwTextNode*>(GetRegisteredInNonConst());
     }
 
-    SwTxtNode & GetTxtNodeOrThrow() {
-        SwTxtNode *const pTxtNode( GetTxtNode() );
-        if (!pTxtNode) {
+    SwTextNode & GetTextNodeOrThrow() {
+        SwTextNode *const pTextNode( GetTextNode() );
+        if (!pTextNode) {
             throw uno::RuntimeException("SwXParagraph: disposed or invalid", 0);
         }
-        return *pTxtNode;
+        return *pTextNode;
     }
 
     bool IsDescriptor() const { return m_bIsDescriptor; }
@@ -203,10 +203,10 @@ SwXParagraph::SwXParagraph()
 
 SwXParagraph::SwXParagraph(
         uno::Reference< text::XText > const & xParent,
-        SwTxtNode & rTxtNode,
+        SwTextNode & rTextNode,
         const sal_Int32 nSelStart, const sal_Int32 nSelEnd)
     : m_pImpl(
-        new SwXParagraph::Impl(*this, &rTxtNode, xParent, nSelStart, nSelEnd))
+        new SwXParagraph::Impl(*this, &rTextNode, xParent, nSelStart, nSelEnd))
 {
 }
 
@@ -214,9 +214,9 @@ SwXParagraph::~SwXParagraph()
 {
 }
 
-const SwTxtNode * SwXParagraph::GetTxtNode() const
+const SwTextNode * SwXParagraph::GetTextNode() const
 {
-    return m_pImpl->GetTxtNode();
+    return m_pImpl->GetTextNode();
 }
 
 bool SwXParagraph::IsDescriptor() const
@@ -225,16 +225,16 @@ bool SwXParagraph::IsDescriptor() const
 }
 
 uno::Reference<text::XTextContent>
-SwXParagraph::CreateXParagraph(SwDoc & rDoc, SwTxtNode *const pTxtNode,
+SwXParagraph::CreateXParagraph(SwDoc & rDoc, SwTextNode *const pTextNode,
         uno::Reference< text::XText> const& i_xParent,
         const sal_Int32 nSelStart, const sal_Int32 nSelEnd)
 {
     // re-use existing SwXParagraph
     // #i105557#: do not iterate over the registered clients: race condition
     uno::Reference<text::XTextContent> xParagraph;
-    if (pTxtNode && (-1 == nSelStart) && (-1 == nSelEnd))
+    if (pTextNode && (-1 == nSelStart) && (-1 == nSelEnd))
     {   // only use cache if no selection!
-        xParagraph.set(pTxtNode->GetXParagraph());
+        xParagraph.set(pTextNode->GetXParagraph());
     }
     if (xParagraph.is())
     {
@@ -243,20 +243,20 @@ SwXParagraph::CreateXParagraph(SwDoc & rDoc, SwTxtNode *const pTxtNode,
 
     // create new SwXParagraph
     uno::Reference<text::XText> xParentText(i_xParent);
-    if (!xParentText.is() && pTxtNode)
+    if (!xParentText.is() && pTextNode)
     {
-        SwPosition Pos(*pTxtNode);
+        SwPosition Pos(*pTextNode);
         xParentText.set(::sw::CreateParentXText( rDoc, Pos ));
     }
-    SwXParagraph *const pXPara( (pTxtNode)
-            ? new SwXParagraph(xParentText, *pTxtNode, nSelStart, nSelEnd)
+    SwXParagraph *const pXPara( (pTextNode)
+            ? new SwXParagraph(xParentText, *pTextNode, nSelStart, nSelEnd)
             : new SwXParagraph);
     // this is why the constructor is private: need to acquire pXPara here
     xParagraph.set(pXPara);
     // in order to initialize the weak pointer cache in the core object
-    if (pTxtNode && (-1 == nSelStart) && (-1 == nSelEnd))
+    if (pTextNode && (-1 == nSelStart) && (-1 == nSelEnd))
     {
-        pTxtNode->SetXParagraph(xParagraph);
+        pTextNode->SetXParagraph(xParagraph);
     }
     // need a permanent Reference to initialize m_wThis
     pXPara->m_pImpl->m_wThis = xParagraph;
@@ -265,17 +265,17 @@ SwXParagraph::CreateXParagraph(SwDoc & rDoc, SwTxtNode *const pTxtNode,
 
 bool SwXParagraph::SelectPaM(SwPaM & rPaM)
 {
-    SwTxtNode const*const pTxtNode( GetTxtNode() );
+    SwTextNode const*const pTextNode( GetTextNode() );
 
-    if (!pTxtNode)
+    if (!pTextNode)
     {
         return false;
     }
 
-    *rPaM.GetPoint() = SwPosition( *pTxtNode );
+    *rPaM.GetPoint() = SwPosition( *pTextNode );
     // set selection to the whole paragraph
     rPaM.SetMark();
-    rPaM.GetMark()->nContent = pTxtNode->GetTxt().getLength();
+    rPaM.GetMark()->nContent = pTextNode->GetText().getLength();
     return true;
 }
 
@@ -332,14 +332,14 @@ SwXParagraph::getSupportedServiceNames() throw (uno::RuntimeException, std::exce
 }
 
 void
-SwXParagraph::attachToText(SwXText & rParent, SwTxtNode & rTxtNode)
+SwXParagraph::attachToText(SwXText & rParent, SwTextNode & rTextNode)
 {
     OSL_ENSURE(m_pImpl->m_bIsDescriptor, "Paragraph is not a descriptor");
     if (m_pImpl->m_bIsDescriptor)
     {
         m_pImpl->m_bIsDescriptor = false;
-        rTxtNode.Add(m_pImpl.get());
-        rTxtNode.SetXParagraph(uno::Reference<text::XTextContent>(this));
+        rTextNode.Add(m_pImpl.get());
+        rTextNode.SetXParagraph(uno::Reference<text::XTextContent>(this));
         m_pImpl->m_xParentText = &rParent;
         if (!m_pImpl->m_sText.isEmpty())
         {
@@ -396,9 +396,9 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
     lang::IllegalArgumentException, lang::WrappedTargetException,
     uno::RuntimeException)
 {
-    SwTxtNode & rTxtNode(GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(GetTextNodeOrThrow());
 
-    SwPosition aPos( rTxtNode );
+    SwPosition aPos( rTextNode );
     SwCursor aCursor( aPos, 0, false );
     const OUString* pPropertyNames = rPropertyNames.getConstArray();
     const uno::Any* pValues = rValues.getConstArray();
@@ -548,15 +548,15 @@ uno::Sequence< uno::Any > SwXParagraph::Impl::GetPropertyValues_Impl(
 throw (beans::UnknownPropertyException, lang::WrappedTargetException,
     uno::RuntimeException)
 {
-    SwTxtNode & rTxtNode(GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(GetTextNodeOrThrow());
 
     uno::Sequence< uno::Any > aValues(rPropertyNames.getLength());
-    SwPosition aPos( rTxtNode );
+    SwPosition aPos( rTextNode );
     SwPaM aPam( aPos );
     uno::Any* pValues = aValues.getArray();
     const OUString* pPropertyNames = rPropertyNames.getConstArray();
     const SfxItemPropertyMap &rMap = m_rPropSet.getPropertyMap();
-    const SwAttrSet& rAttrSet( rTxtNode.GetSwAttrSet() );
+    const SwAttrSet& rAttrSet( rTextNode.GetSwAttrSet() );
     for (sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
     {
         SfxItemPropertySimpleEntry const*const pEntry =
@@ -572,7 +572,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
         {
             beans::PropertyState eTemp;
             const bool bDone = SwUnoCursorHelper::getCrsrPropertyValue(
-                *pEntry, aPam, &(pValues[nProp]), eTemp, &rTxtNode );
+                *pEntry, aPam, &(pValues[nProp]), eTemp, &rTextNode );
             if (!bDone)
             {
                 //UUUU
@@ -647,10 +647,10 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         throw lang::IllegalArgumentException();
     }
 
-    SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow());
 
-    //SwNode& rTxtNode = pUnoCrsr->GetPoint()->nNode.GetNode();
-    //const SwAttrSet& rAttrSet = static_cast<SwTxtNode&>(rTxtNode).GetSwAttrSet();
+    //SwNode& rTextNode = pUnoCrsr->GetPoint()->nNode.GetNode();
+    //const SwAttrSet& rAttrSet = static_cast<SwTextNode&>(rTextNode).GetSwAttrSet();
     //sal_uInt16 nAttrCount = rAttrSet.Count();
 
     const sal_Int32 nProps = rPropertyNames.getLength();
@@ -667,7 +667,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     const SfxItemPropertyMap &rPropMap =
         m_pImpl->m_rPropSet.getPropertyMap();
 
-    SwPosition aPos( rTxtNode );
+    SwPosition aPos( rTextNode );
     SwCursor aCursor( aPos, 0, false );
     SwParaSelection aParaSel( aCursor );
     for (sal_Int32 i = 0;  i < nProps;  ++i)
@@ -768,13 +768,13 @@ throw (uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
 
-    SwTxtNode & rTxtNode(GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(GetTextNodeOrThrow());
 
     // #i46786# Use SwAttrSet pointer for determining the state.
     //          Use the value SwAttrSet (from the paragraph OR the style)
     //          for determining the actual value(s).
-    const SwAttrSet* pAttrSet = rTxtNode.GetpSwAttrSet();
-    const SwAttrSet& rValueAttrSet = rTxtNode.GetSwAttrSet();
+    const SwAttrSet* pAttrSet = rTextNode.GetpSwAttrSet();
+    const SwAttrSet& rValueAttrSet = rTextNode.GetSwAttrSet();
 
     sal_Int32 nProps = rPropertyNames.getLength();
     const OUString *pProp = rPropertyNames.getConstArray();
@@ -808,7 +808,7 @@ throw (uno::RuntimeException)
                 // (compare to SwXParagraph::getPropertyState)
                 bool bAttrSetFetched = true;
                 beans::PropertyState eState = lcl_SwXParagraph_getPropertyState(
-                            rTxtNode, &pAttrSet, *pEntry, bAttrSetFetched );
+                            rTextNode, &pAttrSet, *pEntry, bAttrSetFetched );
                 rResult.State  = eState;
 
                 rResult.Result = beans::TolerantPropertySetResultType::UNKNOWN_FAILURE;
@@ -821,14 +821,14 @@ throw (uno::RuntimeException)
                     if (! ::sw::GetDefaultTextContentValue(
                                 aValue, pProp[i], pEntry->nWID ) )
                     {
-                        SwPosition aPos( rTxtNode );
+                        SwPosition aPos( rTextNode );
                         SwPaM aPam( aPos );
                         // handle properties that are not part of the attribute
                         // and thus only pretendend to be paragraph attributes
                         beans::PropertyState eTemp;
                         const bool bDone =
                             SwUnoCursorHelper::getCrsrPropertyValue(
-                                    *pEntry, aPam, &aValue, eTemp, &rTxtNode );
+                                    *pEntry, aPam, &aValue, eTemp, &rTextNode );
 
                         // if not found try the real paragraph attributes...
                         if (!bDone)
@@ -948,7 +948,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 }
 
 static beans::PropertyState lcl_SwXParagraph_getPropertyState(
-    const SwTxtNode& rTxtNode,
+    const SwTextNode& rTextNode,
     const SwAttrSet** ppSet,
     const SfxItemPropertySimpleEntry& rEntry,
     bool &rAttrSetFetched)
@@ -958,11 +958,11 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState(
 
     if(!(*ppSet) && !rAttrSetFetched)
     {
-        (*ppSet) = rTxtNode.GetpSwAttrSet();
+        (*ppSet) = rTextNode.GetpSwAttrSet();
         rAttrSetFetched = true;
     }
 
-    SwPosition aPos(rTxtNode);
+    SwPosition aPos(rTextNode);
     SwPaM aPam(aPos);
     bool bDone(false);
 
@@ -993,8 +993,8 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState(
         case FN_UNO_PARA_STYLE:
         case FN_UNO_PARA_CONDITIONAL_STYLE_NAME:
         {
-            SwFmtColl* pFmt = SwUnoCursorHelper::GetCurTxtFmtColl(aPam,rEntry.nWID == FN_UNO_PARA_CONDITIONAL_STYLE_NAME);
-            eRet = pFmt ? beans::PropertyState_DIRECT_VALUE : beans::PropertyState_AMBIGUOUS_VALUE;
+            SwFormatColl* pFormat = SwUnoCursorHelper::GetCurTextFormatColl(aPam,rEntry.nWID == FN_UNO_PARA_CONDITIONAL_STYLE_NAME);
+            eRet = pFormat ? beans::PropertyState_DIRECT_VALUE : beans::PropertyState_AMBIGUOUS_VALUE;
             bDone = true;
             break;
         }
@@ -1059,7 +1059,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow());
 
     const SwAttrSet* pSet = 0;
     SfxItemPropertySimpleEntry const*const pEntry =
@@ -1072,7 +1072,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
     }
     bool bDummy = false;
     const beans::PropertyState eRet =
-        lcl_SwXParagraph_getPropertyState(rTxtNode, &pSet, *pEntry, bDummy);
+        lcl_SwXParagraph_getPropertyState(rTextNode, &pSet, *pEntry, bDummy);
     return eRet;
 }
 
@@ -1083,7 +1083,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow());
 
     const OUString* pNames = PropertyNames.getConstArray();
     uno::Sequence< beans::PropertyState > aRet(PropertyNames.getLength());
@@ -1111,7 +1111,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
         else
         {
             *pStates = lcl_SwXParagraph_getPropertyState(
-                rTxtNode, &pSet, *pEntry, bAttrSetFetched );
+                rTextNode, &pSet, *pEntry, bAttrSetFetched );
         }
     }
 
@@ -1124,9 +1124,9 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow());
 
-    SwPosition aPos( rTxtNode );
+    SwPosition aPos( rTextNode );
     SwCursor aCursor( aPos, 0, false );
     if (rPropertyName == UNO_NAME_ANCHOR_TYPE  ||
         rPropertyName == UNO_NAME_ANCHOR_TYPES ||
@@ -1215,7 +1215,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 {
     SolarMutexGuard g;
 
-    SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow());
 
     uno::Any aRet;
     if (::sw::GetDefaultTextContentValue(aRet, rPropertyName))
@@ -1237,7 +1237,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 
     if(bBelowFrmAtrEnd || bDrawingLayerRange)
     {
-        const SfxPoolItem& rDefItem = rTxtNode.GetDoc()->GetAttrPool().GetDefaultItem(pEntry->nWID);
+        const SfxPoolItem& rDefItem = rTextNode.GetDoc()->GetAttrPool().GetDefaultItem(pEntry->nWID);
 
         rDefItem.QueryValue(aRet, pEntry->nMemberId);
     }
@@ -1261,9 +1261,9 @@ SwXParagraph::getAnchor() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow());
 
-    SwPosition aPos( rTxtNode );
+    SwPosition aPos( rTextNode );
     SwCursor aCursor( aPos, 0, false );
     // select paragraph
     SwParaSelection aParaSel( aCursor );
@@ -1276,11 +1276,11 @@ void SAL_CALL SwXParagraph::dispose() throw (uno::RuntimeException, std::excepti
 {
     SolarMutexGuard aGuard;
 
-    SwTxtNode *const pTxtNode( m_pImpl->GetTxtNode() );
-    if (pTxtNode)
+    SwTextNode *const pTextNode( m_pImpl->GetTextNode() );
+    if (pTextNode)
     {
-        SwCursor aCursor( SwPosition( *pTxtNode ), 0, false );
-        pTxtNode->GetDoc()->getIDocumentContentOperations().DelFullPara(aCursor);
+        SwCursor aCursor( SwPosition( *pTextNode ), 0, false );
+        pTextNode->GetDoc()->getIDocumentContentOperations().DelFullPara(aCursor);
         lang::EventObject const ev(static_cast< ::cppu::OWeakObject&>(*this));
         m_pImpl->m_EventListeners.disposeAndClear(ev);
     }
@@ -1307,9 +1307,9 @@ SwXParagraph::createEnumeration() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow());
 
-    SwPosition aPos( rTxtNode );
+    SwPosition aPos( rTextNode );
     SwPaM aPam ( aPos );
     const uno::Reference< container::XEnumeration > xRef =
         new SwXTextPortionEnumeration(aPam, m_pImpl->m_xParentText,
@@ -1325,7 +1325,7 @@ uno::Type SAL_CALL SwXParagraph::getElementType() throw (uno::RuntimeException,
 sal_Bool SAL_CALL SwXParagraph::hasElements() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    return GetTxtNode() != nullptr;
+    return GetTextNode() != nullptr;
 }
 
 uno::Reference< text::XText > SAL_CALL
@@ -1341,9 +1341,9 @@ SwXParagraph::getStart() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow());
 
-    SwPosition aPos( rTxtNode );
+    SwPosition aPos( rTextNode );
     SwCursor aCursor( aPos, 0, false );
     SwParaSelection aParaSel( aCursor );
     SwPaM aPam( *aCursor.Start() );
@@ -1358,9 +1358,9 @@ SwXParagraph::getEnd() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow());
 
-    SwPosition aPos( rTxtNode );
+    SwPosition aPos( rTextNode );
     SwCursor aCursor( aPos, 0, false );
     SwParaSelection aParaSel( aCursor );
     SwPaM aPam( *aCursor.End() );
@@ -1374,10 +1374,10 @@ OUString SAL_CALL SwXParagraph::getString() throw (uno::RuntimeException, std::e
 {
     SolarMutexGuard aGuard;
     OUString aRet;
-    SwTxtNode const*const pTxtNode( GetTxtNode() );
-    if (pTxtNode)
+    SwTextNode const*const pTextNode( GetTextNode() );
+    if (pTextNode)
     {
-        SwPosition aPos( *pTxtNode );
+        SwPosition aPos( *pTextNode );
         SwCursor aCursor( aPos, 0, false );
         SwParaSelection aParaSel( aCursor );
         SwUnoCursorHelper::GetTextFromPam(aCursor, aRet);
@@ -1398,16 +1398,16 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwTxtNode const*const pTxtNode( GetTxtNode() );
-    if (pTxtNode)
+    SwTextNode const*const pTextNode( GetTextNode() );
+    if (pTextNode)
     {
-        SwPosition aPos( *pTxtNode );
+        SwPosition aPos( *pTextNode );
         SwCursor aCursor( aPos, 0, false );
         if (!SwUnoCursorHelper::IsStartOfPara(aCursor)) {
             aCursor.MovePara(fnParaCurr, fnParaStart);
         }
         SwUnoCursorHelper::SelectPam(aCursor, true);
-        if (pTxtNode->GetTxt().getLength()) {
+        if (pTextNode->GetText().getLength()) {
             aCursor.MovePara(fnParaCurr, fnParaEnd);
         }
         SwUnoCursorHelper::SetString(aCursor, aString);
@@ -1434,9 +1434,9 @@ throw (uno::RuntimeException, std::exception)
         throw uno::RuntimeException();
     }
 
-    SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow());
+    SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow());
 
-    SwPosition aPos( rTxtNode );
+    SwPosition aPos( rTextNode );
     SwPaM aPam( aPos );
     uno::Reference< container::XEnumeration > xRet =
         new SwXParaFrameEnumeration(aPam, PARAFRAME_PORTION_PARAGRAPH);
@@ -1455,16 +1455,16 @@ SwXParagraph::getAvailableServiceNames() throw (uno::RuntimeException, std::exce
 // MetadatableMixin
 ::sfx2::Metadatable* SwXParagraph::GetCoreObject()
 {
-    SwTxtNode *const pTxtNode( m_pImpl->GetTxtNode() );
-    return pTxtNode;
+    SwTextNode *const pTextNode( m_pImpl->GetTextNode() );
+    return pTextNode;
 }
 
 uno::Reference<frame::XModel> SwXParagraph::GetModel()
 {
-    SwTxtNode *const pTxtNode( m_pImpl->GetTxtNode() );
-    if (pTxtNode)
+    SwTextNode *const pTextNode( m_pImpl->GetTextNode() );
+    if (pTextNode)
     {
-        SwDocShell const*const pShell( pTxtNode->GetDoc()->GetDocShell() );
+        SwDocShell const*const pShell( pTextNode->GetDoc()->GetDocShell() );
         return (pShell) ? pShell->GetModel() : 0;
     }
     return 0;
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 4381323cd660..54db6433298a 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -85,7 +85,7 @@ SwXTextPortion::SwXTextPortion(
             :  PROPERTY_MAP_TEXTPORTION_EXTENSIONS))
     , m_xParentText(rParent)
     , m_FrameDepend(this, 0)
-    , m_pFrameFmt(0)
+    , m_pFrameFormat(0)
     , m_ePortionType(eType)
     , m_bIsCollapsed(false)
 {
@@ -95,13 +95,13 @@ SwXTextPortion::SwXTextPortion(
 SwXTextPortion::SwXTextPortion(
     const SwUnoCrsr* pPortionCrsr,
     uno::Reference< text::XText > const& rParent,
-    SwFrmFmt& rFmt )
+    SwFrameFormat& rFormat )
     : m_pImpl(new Impl)
     , m_pPropSet(aSwMapProvider.GetPropertySet(
                     PROPERTY_MAP_TEXTPORTION_EXTENSIONS))
     , m_xParentText(rParent)
-    , m_FrameDepend(this, &rFmt)
-    , m_pFrameFmt(&rFmt)
+    , m_FrameDepend(this, &rFormat)
+    , m_pFrameFormat(&rFormat)
     , m_ePortionType(PORTION_FRAME)
     , m_bIsCollapsed(false)
 {
@@ -110,7 +110,7 @@ SwXTextPortion::SwXTextPortion(
 
 SwXTextPortion::SwXTextPortion(
     const SwUnoCrsr* pPortionCrsr,
-    SwTxtRuby const& rAttr,
+    SwTextRuby const& rAttr,
     uno::Reference< text::XText > const& xParent,
     bool bIsEnd )
     : m_pImpl(new Impl)
@@ -122,7 +122,7 @@ SwXTextPortion::SwXTextPortion(
     , m_pRubyAdjust ( bIsEnd ? 0 : new uno::Any )
     , m_pRubyIsAbove( bIsEnd ? 0 : new uno::Any )
     , m_FrameDepend(this, 0)
-    , m_pFrameFmt(0)
+    , m_pFrameFormat(0)
     , m_ePortionType( bIsEnd ? PORTION_RUBY_END : PORTION_RUBY_START )
     , m_bIsCollapsed(false)
 {
@@ -185,20 +185,20 @@ OUString SwXTextPortion::getString()
 throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    OUString aTxt;
+    OUString aText;
     SwUnoCrsr* pUnoCrsr = GetCursor();
     if (!pUnoCrsr)
         throw uno::RuntimeException();
 
     // TextPortions are always within a paragraph
-    SwTxtNode* pTxtNd = pUnoCrsr->GetNode().GetTxtNode();
-    if ( pTxtNd )
+    SwTextNode* pTextNd = pUnoCrsr->GetNode().GetTextNode();
+    if ( pTextNd )
     {
         const sal_Int32 nStt = pUnoCrsr->Start()->nContent.GetIndex();
-        aTxt = pTxtNd->GetExpandTxt( nStt,
+        aText = pTextNd->GetExpandText( nStt,
                 pUnoCrsr->End()->nContent.GetIndex() - nStt );
     }
-    return aTxt;
+    return aText;
 }
 
 void SwXTextPortion::setString(const OUString& aString) throw( uno::RuntimeException, std::exception )
@@ -217,7 +217,7 @@ throw( uno::RuntimeException, std::exception )
     SolarMutexGuard aGuard;
     //! PropertySetInfo for text portion extensions
     static uno::Reference< beans::XPropertySetInfo >
-            xTxtPorExtRef = aSwMapProvider.GetPropertySet(
+            xTextPorExtRef = aSwMapProvider.GetPropertySet(
                     PROPERTY_MAP_TEXTPORTION_EXTENSIONS)->getPropertySetInfo();
     //! PropertySetInfo for redline portions
     static uno::Reference< beans::XPropertySetInfo >
@@ -225,7 +225,7 @@ throw( uno::RuntimeException, std::exception )
                     PROPERTY_MAP_REDLINE_PORTION)->getPropertySetInfo();
 
     return (PORTION_REDLINE_START == m_ePortionType ||
-            PORTION_REDLINE_END   == m_ePortionType) ? xRedlPorRef : xTxtPorExtRef;
+            PORTION_REDLINE_END   == m_ePortionType) ? xRedlPorRef : xTextPorExtRef;
 }
 
 void SwXTextPortion::setPropertyValue(const OUString& rPropertyName,
@@ -855,7 +855,7 @@ uno::Reference< container::XEnumeration >  SwXTextPortion::createContentEnumerat
 
     uno::Reference< container::XEnumeration >  xRet =
         new SwXParaFrameEnumeration(*pUnoCrsr, PARAFRAME_PORTION_CHAR,
-                m_pFrameFmt);
+                m_pFrameFormat);
     return xRet;
 
 }
@@ -928,7 +928,7 @@ void SwXTextPortion::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
     ClientModify(this, pOld, pNew);
     if (!m_FrameDepend.GetRegisteredIn())
     {
-        m_pFrameFmt = 0;
+        m_pFrameFormat = 0;
     }
 }
 
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 7d899fd81d7d..932ca27f6015 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
 using namespace ::std;
 
-typedef ::std::pair< TextRangeList_t * const, SwTxtAttr const * const > PortionList_t;
+typedef ::std::pair< TextRangeList_t * const, SwTextAttr const * const > PortionList_t;
 typedef ::std::stack< PortionList_t > PortionStack_t;
 
 static void lcl_CreatePortions(
@@ -163,7 +163,7 @@ namespace
             {
                 // Crossrefbookmarks only remember the start position but have to span the whole paragraph
                 pCrossRefEndPos = unique_ptr<SwPosition>(new SwPosition(rEndPos));
-                pCrossRefEndPos->nContent = pCrossRefEndPos->nNode.GetNode().GetTxtNode()->Len();
+                pCrossRefEndPos->nContent = pCrossRefEndPos->nNode.GetNode().GetTextNode()->Len();
                 pEndPos = pCrossRefEndPos.get();
             }
             if(pEndPos)
@@ -183,12 +183,12 @@ namespace
             return;
 
         const SwNodeIndex nOwnNode = rUnoCrsr.GetPoint()->nNode;
-        SwTxtNode* pTxtNode = nOwnNode.GetNode().GetTxtNode();
-        if (!pTxtNode)
+        SwTextNode* pTextNode = nOwnNode.GetNode().GetTextNode();
+        if (!pTextNode)
         {
             // no need to consider marks starting after aEndOfPara
             SwPosition aEndOfPara(*rUnoCrsr.GetPoint());
-            aEndOfPara.nContent = aEndOfPara.nNode.GetNode().GetTxtNode()->Len();
+            aEndOfPara.nContent = aEndOfPara.nNode.GetNode().GetTextNode()->Len();
             const IDocumentMarkAccess::const_iterator_t pCandidatesEnd = upper_bound(
                 pMarkAccess->getBookmarksBegin(),
                 pMarkAccess->getBookmarksEnd(),
@@ -208,7 +208,7 @@ namespace
         {
             // A text node already knows its marks via its SwIndexes.
             std::set<sw::mark::IMark*> aSeenMarks;
-            for (const SwIndex* pIndex = pTxtNode->GetFirstIndex(); pIndex; pIndex = pIndex->GetNext())
+            for (const SwIndex* pIndex = pTextNode->GetFirstIndex(); pIndex; pIndex = pIndex->GetNext())
             {
                 // Need a non-cost mark here, as we'll create an UNO wrapper around it.
                 sw::mark::IMark* pBkmk = const_cast<sw::mark::IMark*>(pIndex->GetMark());
@@ -274,7 +274,7 @@ namespace
 
         // no need to consider annotation marks starting after aEndOfPara
         SwPosition aEndOfPara(*rUnoCrsr.GetPoint());
-        aEndOfPara.nContent = aEndOfPara.nNode.GetNode().GetTxtNode()->Len();
+        aEndOfPara.nContent = aEndOfPara.nNode.GetNode().GetTextNode()->Len();
         const IDocumentMarkAccess::const_iterator_t pCandidatesEnd = upper_bound(
             pMarkAccess->getAnnotationMarksBegin(),
             pMarkAccess->getAnnotationMarksEnd(),
@@ -298,15 +298,15 @@ namespace
             const SwPosition& rStartPos = pAnnotationMark->GetMarkStart();
             if ( rStartPos.nNode == nOwnNode )
             {
-                const SwFmtFld* pAnnotationFmtFld = pAnnotationMark->GetAnnotationFmtFld();
-                OSL_ENSURE( pAnnotationFmtFld != NULL, "<lcl_FillAnnotationStartArray(..)> - annotation fmt fld instance missing!" );
-                if ( pAnnotationFmtFld != NULL )
+                const SwFormatField* pAnnotationFormatField = pAnnotationMark->GetAnnotationFormatField();
+                OSL_ENSURE( pAnnotationFormatField != NULL, "<lcl_FillAnnotationStartArray(..)> - annotation fmt fld instance missing!" );
+                if ( pAnnotationFormatField != NULL )
                 {
                     rAnnotationStartArr.insert(
                         SwAnnotationStartPortion_ImplSharedPtr(
                             new SwAnnotationStartPortion_Impl(
                                 SwXTextField::CreateXTextField(&rDoc,
-                                    pAnnotationFmtFld),
+                                    pAnnotationFormatField),
                                 rStartPos)));
                 }
             }
@@ -368,7 +368,7 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration(
     pUnoCrsr->Add(this);
 
     OSL_ENSURE(nEnd == -1 || (nStart <= nEnd &&
-        nEnd <= pUnoCrsr->Start()->nNode.GetNode().GetTxtNode()->GetTxt().getLength()),
+        nEnd <= pUnoCrsr->Start()->nNode.GetNode().GetTextNode()->GetText().getLength()),
             "start or end value invalid!");
 
     // find all frames, graphics and OLEs that are bound AT character in para
@@ -424,14 +424,14 @@ static void
 lcl_FillFieldMarkArray(FieldMarks_t & rFieldMarks, SwUnoCrsr const & rUnoCrsr,
         const sal_Int32 i_nStartPos)
 {
-    const SwTxtNode * const pTxtNode =
-        rUnoCrsr.GetPoint()->nNode.GetNode().GetTxtNode();
-    if (!pTxtNode) return;
+    const SwTextNode * const pTextNode =
+        rUnoCrsr.GetPoint()->nNode.GetNode().GetTextNode();
+    if (!pTextNode) return;
 
     const sal_Unicode fld[] = {
         CH_TXT_ATR_FIELDSTART, CH_TXT_ATR_FIELDEND, CH_TXT_ATR_FORMELEMENT, 0 };
     sal_Int32 pos = ::std::max(static_cast<const sal_Int32>(0), i_nStartPos);
-    while ((pos = ::comphelper::string::indexOfAny(pTxtNode->GetTxt(), fld, pos)) != -1)
+    while ((pos = ::comphelper::string::indexOfAny(pTextNode->GetText(), fld, pos)) != -1)
     {
         rFieldMarks.push_back(pos);
         ++pos;
@@ -442,7 +442,7 @@ static uno::Reference<text::XTextRange>
 lcl_ExportFieldMark(
         uno::Reference< text::XText > const & i_xParentText,
         SwUnoCrsr * const pUnoCrsr,
-        const SwTxtNode * const pTxtNode )
+        const SwTextNode * const pTextNode )
 {
     uno::Reference<text::XTextRange> xRef;
     SwDoc* pDoc = pUnoCrsr->GetDoc();
@@ -458,7 +458,7 @@ lcl_ExportFieldMark(
         return 0;
     }
 
-    const sal_Unicode Char = pTxtNode->GetTxt()[start];
+    const sal_Unicode Char = pTextNode->GetText()[start];
     if (CH_TXT_ATR_FIELDSTART == Char)
     {
         ::sw::mark::IFieldmark* pFieldmark = NULL;
@@ -520,11 +520,11 @@ static Reference<XTextRange>
 lcl_CreateRefMarkPortion(
     Reference<XText> const& xParent,
     const SwUnoCrsr * const pUnoCrsr,
-    const SwTxtAttr & rAttr, const bool bEnd)
+    const SwTextAttr & rAttr, const bool bEnd)
 {
     SwDoc* pDoc = pUnoCrsr->GetDoc();
-    SwFmtRefMark& rRefMark = const_cast<SwFmtRefMark&>(
-            static_cast<const SwFmtRefMark&>(rAttr.GetAttr()));
+    SwFormatRefMark& rRefMark = const_cast<SwFormatRefMark&>(
+            static_cast<const SwFormatRefMark&>(rAttr.GetAttr()));
     Reference<XTextContent> xContent;
     if (!xContent.is())
     {
@@ -551,10 +551,10 @@ lcl_InsertRubyPortion(
     TextRangeList_t & rPortions,
     Reference<XText> const& xParent,
     const SwUnoCrsr * const pUnoCrsr,
-    const SwTxtAttr & rAttr, const bool bEnd)
+    const SwTextAttr & rAttr, const bool bEnd)
 {
     SwXTextPortion* pPortion = new SwXTextPortion(pUnoCrsr,
-            static_txtattr_cast<const SwTxtRuby&>(rAttr), xParent, bEnd);
+            static_txtattr_cast<const SwTextRuby&>(rAttr), xParent, bEnd);
     rPortions.push_back(pPortion);
     pPortion->SetCollapsed(rAttr.End() == nullptr);
 }
@@ -563,7 +563,7 @@ static Reference<XTextRange>
 lcl_CreateTOXMarkPortion(
     Reference<XText> const& xParent,
     const SwUnoCrsr * const pUnoCrsr,
-    SwTxtAttr & rAttr, const bool bEnd)
+    SwTextAttr & rAttr, const bool bEnd)
 {
     SwDoc* pDoc = pUnoCrsr->GetDoc();
     SwTOXMark & rTOXMark = static_cast<SwTOXMark&>(rAttr.GetAttr());
@@ -591,10 +591,10 @@ static uno::Reference<text::XTextRange>
 lcl_CreateMetaPortion(
     uno::Reference<text::XText> const& xParent,
     const SwUnoCrsr * const pUnoCrsr,
-    SwTxtAttr & rAttr, ::std::unique_ptr<TextRangeList_t const> && pPortions)
+    SwTextAttr & rAttr, ::std::unique_ptr<TextRangeList_t const> && pPortions)
 {
     const uno::Reference<rdf::XMetadatable> xMeta( SwXMeta::CreateXMeta(
-            *static_cast<SwFmtMeta &>(rAttr.GetAttr()).GetMeta(),
+            *static_cast<SwFormatMeta &>(rAttr.GetAttr()).GetMeta(),
             xParent, std::move(pPortions)));
     SwXTextPortion * pPortion(0);
     if (RES_TXTATR_META == rAttr.Which())
@@ -728,7 +728,7 @@ lcl_ExportHints(
     const bool bRightMoveForbidden,
     bool & o_rbCursorMoved,
     sal_Int32 & o_rNextAttrPosition,
-    std::set<const SwFrmFmt*>& rTextBoxes)
+    std::set<const SwFrameFormat*>& rTextBoxes)
 {
     // if the attribute has a dummy character, then xRef is set (except META)
     // otherwise, the portion for the attribute is inserted into rPortions!
@@ -743,7 +743,7 @@ lcl_ExportHints(
     {
         if(pHints->GetEnd(nEndIndex)->GetEnd())
         {
-            SwTxtAttr * const pAttr = pHints->GetEnd(nEndIndex);
+            SwTextAttr * const pAttr = pHints->GetEnd(nEndIndex);
             if (nNextEnd == nCurrentIndex)
             {
                 const sal_uInt16 nWhich( pAttr->Which() );
@@ -821,7 +821,7 @@ lcl_ExportHints(
     while(nStartIndex < pHints->GetStartCount() &&
         nCurrentIndex >= (nNextStart = pHints->GetStart(nStartIndex)->GetStart()))
     {
-        SwTxtAttr * const pAttr = pHints->GetStart(nStartIndex);
+        SwTextAttr * const pAttr = pHints->GetStart(nStartIndex);
         sal_uInt16 nAttrWhich = pAttr->Which();
         if (nNextStart == nCurrentIndex)
         {
@@ -839,7 +839,7 @@ lcl_ExportHints(
                                 pUnoCrsr, xParent, PORTION_FIELD);
                         Reference<XTextField> const xField =
                             SwXTextField::CreateXTextField(pDoc,
-                                    &pAttr->GetFmtFld());
+                                    &pAttr->GetFormatField());
                         pPortion->SetTextField(xField);
                     }
                     break;
@@ -851,8 +851,8 @@ lcl_ExportHints(
                         if( *pUnoCrsr->GetMark() == *pUnoCrsr->GetPoint() )
                             break;
 
-                        const SwTxtAnnotationFld* pTxtAnnotationFld = dynamic_cast<const SwTxtAnnotationFld*>( pAttr );
-                        ::sw::mark::IMark* pAnnotationMark = pTxtAnnotationFld ? pTxtAnnotationFld->GetAnnotationMark() : NULL;
+                        const SwTextAnnotationField* pTextAnnotationField = dynamic_cast<const SwTextAnnotationField*>( pAttr );
+                        ::sw::mark::IMark* pAnnotationMark = pTextAnnotationField ? pTextAnnotationField->GetAnnotationMark() : NULL;
                         if ( pAnnotationMark != NULL )
                         {
                             SwXTextPortion* pPortion = new SwXTextPortion( pUnoCrsr, xParent, PORTION_ANNOTATION_END );
@@ -865,7 +865,7 @@ lcl_ExportHints(
                             SwXTextPortion* pPortion = new SwXTextPortion( pUnoCrsr, xParent, PORTION_ANNOTATION );
                             Reference<XTextField> xField =
                                 SwXTextField::CreateXTextField(pDoc,
-                                        &pAttr->GetFmtFld());
+                                        &pAttr->GetFormatField());
                             pPortion->SetTextField(xField);
                             xRef = pPortion;
                         }
@@ -877,7 +877,7 @@ lcl_ExportHints(
                     {
 
                         pUnoCrsr->Right(
-                            pAttr->GetFmtFld().GetField()->ExpandField( true ).getLength() + 2,
+                            pAttr->GetFormatField().GetField()->ExpandField( true ).getLength() + 2,
                             CRSR_SKIP_CHARS,
                             false,
                             false );
@@ -888,7 +888,7 @@ lcl_ExportHints(
                         xRef = pPortion;
                         Reference<XTextField> xField =
                             SwXTextField::CreateXTextField(pDoc,
-                                    &pAttr->GetFmtFld());
+                                    &pAttr->GetFormatField());
                         pPortion->SetTextField(xField);
                     }
                     break;
@@ -901,7 +901,7 @@ lcl_ExportHints(
                             break; // Robust #i81708 content in covered cells
 
                         // Do not expose inline anchored textboxes.
-                        if (rTextBoxes.find(pAttr->GetFlyCnt().GetFrmFmt()) != rTextBoxes.end())
+                        if (rTextBoxes.find(pAttr->GetFlyCnt().GetFrameFormat()) != rTextBoxes.end())
                             break;
 
                         pUnoCrsr->Exchange();
@@ -920,7 +920,7 @@ lcl_ExportHints(
                             xRef = pPortion = new SwXTextPortion(
                                 pUnoCrsr, xParent, PORTION_FOOTNOTE);
                             Reference<XFootnote> xContent =
-                                SwXFootnotes::GetObject(*pDoc, pAttr->GetFtn());
+                                SwXFootnotes::GetObject(*pDoc, pAttr->GetFootnote());
                             pPortion->SetFootnote(xContent);
                         }
                     }
@@ -1033,7 +1033,7 @@ static void lcl_MoveCursor( SwUnoCrsr * const pUnoCrsr,
     const sal_Int32 nNextMarkIndex,
     const sal_Int32 nEndPos )
 {
-    sal_Int32 nMovePos = pUnoCrsr->GetCntntNode()->Len();
+    sal_Int32 nMovePos = pUnoCrsr->GetContentNode()->Len();
 
     if ((nEndPos >= 0) && (nEndPos < nMovePos))
     {
@@ -1071,17 +1071,17 @@ static void lcl_FillRedlineArray(
     SwUnoCrsr const & rUnoCrsr,
     SwXRedlinePortion_ImplList& rRedArr )
 {
-    const SwRedlineTbl& rRedTbl = rDoc.getIDocumentRedlineAccess().GetRedlineTbl();
-    const size_t nRedTblCount = rRedTbl.size();
+    const SwRedlineTable& rRedTable = rDoc.getIDocumentRedlineAccess().GetRedlineTable();
+    const size_t nRedTableCount = rRedTable.size();
 
-    if ( nRedTblCount > 0 )
+    if ( nRedTableCount > 0 )
     {
         const SwPosition* pStart = rUnoCrsr.GetPoint();
         const SwNodeIndex nOwnNode = pStart->nNode;
 
-        for(size_t nRed = 0; nRed < nRedTblCount; ++nRed)
+        for(size_t nRed = 0; nRed < nRedTableCount; ++nRed)
         {
-            const SwRangeRedline* pRedline = rRedTbl[nRed];
+            const SwRangeRedline* pRedline = rRedTable[nRed];
             const SwPosition* pRedStart = pRedline->Start();
             const SwNodeIndex nRedNode = pRedStart->nNode;
             if ( nOwnNode == nRedNode )
@@ -1098,10 +1098,10 @@ static void lcl_FillSoftPageBreakArray(
     SwUnoCrsr const & rUnoCrsr,
     SwSoftPageBreakList& rBreakArr )
 {
-    const SwTxtNode *pTxtNode =
-        rUnoCrsr.GetPoint()->nNode.GetNode().GetTxtNode();
-    if( pTxtNode )
-        pTxtNode->fillSoftPageBreakList( rBreakArr );
+    const SwTextNode *pTextNode =
+        rUnoCrsr.GetPoint()->nNode.GetNode().GetTextNode();
+    if( pTextNode )
+        pTextNode->fillSoftPageBreakList( rBreakArr );
 }
 
 static void lcl_ExportRedline(
@@ -1208,7 +1208,7 @@ static sal_Int32 lcl_ExportFrames(
         if (pFrame) // Frame could be disposed
         {
             SwXTextPortion* pPortion = new SwXTextPortion(i_pUnoCrsr, i_xParent,
-                *static_cast<SwFrmFmt*>( const_cast<SwModify*>( pFrame ) ) );
+                *static_cast<SwFrameFormat*>( const_cast<SwModify*>( pFrame ) ) );
             rPortions.push_back(pPortion);
         }
         i_rFrames.pop_front();
@@ -1259,9 +1259,9 @@ static void lcl_CreatePortions(
         (pUnoCrsr->Start()->nContent.GetIndex() != i_nStartPos))
     {
         pUnoCrsr->DeleteMark();
-        OSL_ENSURE(pUnoCrsr->Start()->nNode.GetNode().GetTxtNode() &&
-            (i_nStartPos <= pUnoCrsr->Start()->nNode.GetNode().GetTxtNode()->
-                        GetTxt().getLength()), "Incorrect start position" );
+        OSL_ENSURE(pUnoCrsr->Start()->nNode.GetNode().GetTextNode() &&
+            (i_nStartPos <= pUnoCrsr->Start()->nNode.GetNode().GetTextNode()->
+                        GetText().getLength()), "Incorrect start position" );
         // ??? should this be i_nStartPos - current position ?
         pUnoCrsr->Right(static_cast<sal_Int32>(i_nStartPos),
                 CRSR_SKIP_CHARS, false, false);
@@ -1285,9 +1285,9 @@ static void lcl_CreatePortions(
     lcl_FillAnnotationStartArray( *pDoc, *pUnoCrsr, AnnotationStarts );
 
     PortionStack_t PortionStack;
-    PortionStack.push( PortionList_t(&i_rPortions, (const SwTxtAttr *)0) );
+    PortionStack.push( PortionList_t(&i_rPortions, (const SwTextAttr *)0) );
 
-    std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pUnoCrsr->GetNode());
+    std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pUnoCrsr->GetNode());
 
     bool bAtEnd( false );
     while (!bAtEnd) // every iteration consumes at least current character!
@@ -1298,14 +1298,14 @@ static void lcl_CreatePortions(
             pUnoCrsr->DeleteMark();
         }
 
-        SwTxtNode * const pTxtNode = pUnoCrsr->GetNode().GetTxtNode();
-        if (!pTxtNode)
+        SwTextNode * const pTextNode = pUnoCrsr->GetNode().GetTextNode();
+        if (!pTextNode)
         {
             OSL_FAIL("lcl_CreatePortions: no TextNode - what now ?");
             return;
         }
 
-        SwpHints * const pHints = pTxtNode->GetpSwpHints();
+        SwpHints * const pHints = pTextNode->GetpSwpHints();
         const sal_Int32 nCurrentIndex =
             pUnoCrsr->GetPoint()->nContent.GetIndex();
         // this contains the portion which consumes the character in the
@@ -1333,7 +1333,7 @@ static void lcl_CreatePortions(
         // #111716# the cursor must not move right at the
         //          end position of a selection!
         bAtEnd = ((i_nEndPos >= 0) && (nCurrentIndex >= i_nEndPos))
-              || (nCurrentIndex >= pTxtNode->Len());
+              || (nCurrentIndex >= pTextNode->Len());
         if (pHints)
         {
             // N.B.: side-effects nNextAttrIndex, bCursorMoved; may move cursor
@@ -1353,7 +1353,7 @@ static void lcl_CreatePortions(
                 FieldMarks.size() && (FieldMarks.front() == nCurrentIndex))
             {
                 // moves cursor
-                xRef = lcl_ExportFieldMark(i_xParentText, pUnoCrsr, pTxtNode);
+                xRef = lcl_ExportFieldMark(i_xParentText, pUnoCrsr, pTextNode);
                 FieldMarks.pop_front();
             }
         }
@@ -1388,7 +1388,7 @@ static void lcl_CreatePortions(
 
             xRef = new SwXTextPortion(pUnoCrsr, i_xParentText, PORTION_TEXT);
         }
-        else if (bAtEnd && !xRef.is() && !pTxtNode->Len())
+        else if (bAtEnd && !xRef.is() && !pTextNode->Len())
         {
             // special case: for an empty paragraph, we better put out a
             // text portion because there may be a hyperlink attribute
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index f4e088503d5e..a978f7487743 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -119,7 +119,7 @@ uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor()
 
     // skip all tables at the beginning
     SwTableNode* pTableNode = pUnoCursor->GetNode().FindTableNode();
-    SwCntntNode* pContentNode = NULL;
+    SwContentNode* pContentNode = NULL;
     bool bTable = pTableNode != NULL;
     while( pTableNode != NULL )
     {
@@ -266,10 +266,10 @@ void SwXRedlinePortion::Validate() throw( uno::RuntimeException )
         throw uno::RuntimeException();
     //search for the redline
     SwDoc* pDoc = pUnoCrsr->GetDoc();
-    const SwRedlineTbl& rRedTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+    const SwRedlineTable& rRedTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
     bool bFound = false;
-    for(size_t nRed = 0; nRed < rRedTbl.size() && !bFound; nRed++)
-        bFound = &m_rRedline == rRedTbl[nRed];
+    for(size_t nRed = 0; nRed < rRedTable.size() && !bFound; nRed++)
+        bFound = &m_rRedline == rRedTable[nRed];
     if(!bFound)
         throw uno::RuntimeException();
 }
@@ -443,16 +443,16 @@ uno::Any SwXRedline::getPropertyValue( const OUString& rPropertyName )
             {
                 SwSectionNode* pSectNode = pNode->GetSectionNode();
                 OSL_ENSURE(pSectNode, "No section node!");
-                xRet = SwXTextSections::GetObject( *pSectNode->GetSection().GetFmt() );
+                xRet = SwXTextSections::GetObject( *pSectNode->GetSection().GetFormat() );
             }
             break;
             case ND_TABLENODE :
             {
-                SwTableNode* pTblNode = pNode->GetTableNode();
-                OSL_ENSURE(pTblNode, "No table node!");
-                SwTable& rTbl = pTblNode->GetTable();
-                SwFrmFmt* pTblFmt = rTbl.GetFrmFmt();
-                xRet = SwXTextTables::GetObject( *pTblFmt );
+                SwTableNode* pTableNode = pNode->GetTableNode();
+                OSL_ENSURE(pTableNode, "No table node!");
+                SwTable& rTable = pTableNode->GetTable();
+                SwFrameFormat* pTableFormat = rTable.GetFrameFormat();
+                xRet = SwXTextTables::GetObject( *pTableFormat );
             }
             break;
             case ND_TEXTNODE :
@@ -575,13 +575,13 @@ uno::Reference< text::XTextCursor >  SwXRedline::createTextCursor() throw( uno::
         pUnoCrsr->Move(fnMoveForward, fnGoNode);
 
         // is here a table?
-        SwTableNode* pTblNode = pUnoCrsr->GetNode().FindTableNode();
-        SwCntntNode* pCont = 0;
-        while( pTblNode )
+        SwTableNode* pTableNode = pUnoCrsr->GetNode().FindTableNode();
+        SwContentNode* pCont = 0;
+        while( pTableNode )
         {
-            pUnoCrsr->GetPoint()->nNode = *pTblNode->EndOfSectionNode();
+            pUnoCrsr->GetPoint()->nNode = *pTableNode->EndOfSectionNode();
             pCont = GetDoc()->GetNodes().GoNext(&pUnoCrsr->GetPoint()->nNode);
-            pTblNode = pCont->FindTableNode();
+            pTableNode = pCont->FindTableNode();
         }
         if(pCont)
             pUnoCrsr->GetPoint()->nContent.Assign(pCont, 0);
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index c536fd34e2a7..fab95a23cc27 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -50,8 +50,8 @@ sal_Int32 SwXRedlines::getCount(  ) throw(uno::RuntimeException, std::exception)
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw uno::RuntimeException();
-    const SwRedlineTbl& rRedTbl = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
-    return rRedTbl.size();
+    const SwRedlineTable& rRedTable = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+    return rRedTable.size();
 }
 
 uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex)
@@ -60,11 +60,11 @@ uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex)
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw uno::RuntimeException();
-    const SwRedlineTbl& rRedTbl = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
+    const SwRedlineTable& rRedTable = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
     uno::Any aRet;
-    if ((rRedTbl.size() > static_cast<size_t>(nIndex)) && (nIndex >= 0))
+    if ((rRedTable.size() > static_cast<size_t>(nIndex)) && (nIndex >= 0))
     {
-        uno::Reference <beans::XPropertySet> xRet = SwXRedlines::GetObject( *rRedTbl[nIndex], *GetDoc() );
+        uno::Reference <beans::XPropertySet> xRet = SwXRedlines::GetObject( *rRedTable[nIndex], *GetDoc() );
         aRet <<= xRet;
     }
     else
@@ -91,8 +91,8 @@ sal_Bool SwXRedlines::hasElements(  ) throw(uno::RuntimeException, std::exceptio
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw uno::RuntimeException();
-    const SwRedlineTbl& rRedTbl = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
-    return rRedTbl.size() > 0;
+    const SwRedlineTable& rRedTable = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+    return rRedTable.size() > 0;
 }
 
 OUString SwXRedlines::getImplementationName() throw( uno::RuntimeException, std::exception )
@@ -144,7 +144,7 @@ sal_Bool SwXRedlineEnumeration::hasMoreElements() throw( uno::RuntimeException,
 {
     if(!pDoc)
         throw uno::RuntimeException();
-    return pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() > nCurrentIndex;
+    return pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() > nCurrentIndex;
 }
 
 uno::Any SwXRedlineEnumeration::nextElement()
@@ -152,10 +152,10 @@ uno::Any SwXRedlineEnumeration::nextElement()
 {
     if(!pDoc)
         throw uno::RuntimeException();
-    const SwRedlineTbl& rRedTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
-    if( rRedTbl.size() <= nCurrentIndex )
+    const SwRedlineTable& rRedTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+    if( rRedTable.size() <= nCurrentIndex )
         throw container::NoSuchElementException();
-    uno::Reference <beans::XPropertySet> xRet = SwXRedlines::GetObject( *rRedTbl[nCurrentIndex++], *pDoc );
+    uno::Reference <beans::XPropertySet> xRet = SwXRedlines::GetObject( *rRedTable[nCurrentIndex++], *pDoc );
     uno::Any aRet;
     aRet <<= xRet;
     return aRet;
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 442a65b584ec..d322d7e32ac1 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -53,15 +53,15 @@ public:
     ::cppu::OInterfaceContainerHelper m_EventListeners;
     bool                        m_bIsDescriptor;
     SwDoc *                     m_pDoc;
-    const SwFmtRefMark *        m_pMarkFmt;
+    const SwFormatRefMark *        m_pMarkFormat;
     OUString             m_sMarkName;
 
-    Impl(   SwDoc *const pDoc, SwFmtRefMark *const pRefMark)
+    Impl(   SwDoc *const pDoc, SwFormatRefMark *const pRefMark)
         : SwClient(pRefMark)
         , m_EventListeners(m_Mutex)
         , m_bIsDescriptor(0 == pRefMark)
         , m_pDoc(pDoc)
-        , m_pMarkFmt(pRefMark)
+        , m_pMarkFormat(pRefMark)
     {
         if (pRefMark)
         {
@@ -85,7 +85,7 @@ void SwXReferenceMark::Impl::Invalidate()
         const_cast<SwModify*>(GetRegisteredIn())->Remove(this);
     }
     m_pDoc = 0;
-    m_pMarkFmt = 0;
+    m_pMarkFormat = 0;
     uno::Reference<uno::XInterface> const xThis(m_wThis);
     if (!xThis.is())
     {   // fdo#72695: if UNO object is already dead, don't revive it with event
@@ -106,7 +106,7 @@ void SwXReferenceMark::Impl::Modify( const SfxPoolItem* pOld, const SfxPoolItem
 }
 
 SwXReferenceMark::SwXReferenceMark(
-        SwDoc *const pDoc, SwFmtRefMark *const pRefMark)
+        SwDoc *const pDoc, SwFormatRefMark *const pRefMark)
     : m_pImpl( new SwXReferenceMark::Impl(pDoc, pRefMark) )
 {
 }
@@ -117,21 +117,21 @@ SwXReferenceMark::~SwXReferenceMark()
 
 uno::Reference<text::XTextContent>
 SwXReferenceMark::CreateXReferenceMark(
-        SwDoc & rDoc, SwFmtRefMark *const pMarkFmt)
+        SwDoc & rDoc, SwFormatRefMark *const pMarkFormat)
 {
     // i#105557: do not iterate over the registered clients: race condition
     uno::Reference<text::XTextContent> xMark;
-    if (pMarkFmt)
+    if (pMarkFormat)
     {
-        xMark = pMarkFmt->GetXRefMark();
+        xMark = pMarkFormat->GetXRefMark();
     }
     if (!xMark.is())
     {
-        SwXReferenceMark *const pMark(new SwXReferenceMark(&rDoc, pMarkFmt));
+        SwXReferenceMark *const pMark(new SwXReferenceMark(&rDoc, pMarkFormat));
         xMark.set(pMark);
-        if (pMarkFmt)
+        if (pMarkFormat)
         {
-            pMarkFmt->SetXRefMark(xMark);
+            pMarkFormat->SetXRefMark(xMark);
         }
         // need a permanent Reference to initialize m_wThis
         pMark->m_pImpl->m_wThis = xMark;
@@ -206,7 +206,7 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam,
     SwDoc *pDoc2 = rPam.GetDoc();
 
     UnoActionContext aCont(pDoc2);
-    SwFmtRefMark aRefMark(m_sMarkName);
+    SwFormatRefMark aRefMark(m_sMarkName);
     bool bMark = *rPam.GetPoint() != *rPam.GetMark();
 
     const bool bForceExpandHints( !bMark && pCursor && pCursor->IsAtEndOfMeta() );
@@ -215,10 +215,10 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam,
             | SetAttrMode::DONTEXPAND)
         : SetAttrMode::DONTEXPAND;
 
-    ::std::vector<SwTxtAttr *> oldMarks;
+    ::std::vector<SwTextAttr *> oldMarks;
     if (bMark)
     {
-        oldMarks = rPam.GetNode().GetTxtNode()->GetTxtAttrsAt(
+        oldMarks = rPam.GetNode().GetTextNode()->GetTextAttrsAt(
             rPam.GetPoint()->nContent.GetIndex(), RES_TXTATR_REFMARK);
     }
 
@@ -230,40 +230,40 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam,
     }
 
     // aRefMark was copied into the document pool; now retrieve real format...
-    SwTxtAttr * pTxtAttr(0);
+    SwTextAttr * pTextAttr(0);
     if (bMark)
     {
         // #i107672#
         // ensure that we do not retrieve a different mark at the same position
-        ::std::vector<SwTxtAttr *> const newMarks(
-            rPam.GetNode().GetTxtNode()->GetTxtAttrsAt(
+        ::std::vector<SwTextAttr *> const newMarks(
+            rPam.GetNode().GetTextNode()->GetTextAttrsAt(
                 rPam.GetPoint()->nContent.GetIndex(), RES_TXTATR_REFMARK));
-        ::std::vector<SwTxtAttr *>::const_iterator const iter(
+        ::std::vector<SwTextAttr *>::const_iterator const iter(
             ::std::find_if(newMarks.begin(), newMarks.end(),
-                NotContainedIn<SwTxtAttr *>(oldMarks)));
+                NotContainedIn<SwTextAttr *>(oldMarks)));
         OSL_ASSERT(newMarks.end() != iter);
         if (newMarks.end() != iter)
         {
-            pTxtAttr = *iter;
+            pTextAttr = *iter;
         }
     }
     else
     {
-        SwTxtNode *pTxtNd = rPam.GetNode().GetTxtNode();
-        OSL_ASSERT(pTxtNd);
-        pTxtAttr = pTxtNd ? rPam.GetNode().GetTxtNode()->GetTxtAttrForCharAt(
+        SwTextNode *pTextNd = rPam.GetNode().GetTextNode();
+        OSL_ASSERT(pTextNd);
+        pTextAttr = pTextNd ? rPam.GetNode().GetTextNode()->GetTextAttrForCharAt(
                 rPam.GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_REFMARK) : NULL;
     }
 
-    if (!pTxtAttr)
+    if (!pTextAttr)
     {
         throw uno::RuntimeException(
             "SwXReferenceMark::InsertRefMark(): cannot insert attribute", 0);
     }
 
-    m_pMarkFmt = &pTxtAttr->GetRefMark();
+    m_pMarkFormat = &pTextAttr->GetRefMark();
 
-    const_cast<SwFmtRefMark*>(m_pMarkFmt)->Add(this);
+    const_cast<SwFormatRefMark*>(m_pMarkFormat)->Add(this);
 }
 
 void SAL_CALL
@@ -307,21 +307,21 @@ SwXReferenceMark::getAnchor() throw (uno::RuntimeException, std::exception)
 
     if (m_pImpl->IsValid())
     {
-        SwFmtRefMark const*const pNewMark =
+        SwFormatRefMark const*const pNewMark =
             m_pImpl->m_pDoc->GetRefMark(m_pImpl->m_sMarkName);
-        if (pNewMark && (pNewMark == m_pImpl->m_pMarkFmt))
+        if (pNewMark && (pNewMark == m_pImpl->m_pMarkFormat))
         {
-            SwTxtRefMark const*const pTxtMark =
-                m_pImpl->m_pMarkFmt->GetTxtRefMark();
-            if (pTxtMark &&
-                (&pTxtMark->GetTxtNode().GetNodes() ==
+            SwTextRefMark const*const pTextMark =
+                m_pImpl->m_pMarkFormat->GetTextRefMark();
+            if (pTextMark &&
+                (&pTextMark->GetTextNode().GetNodes() ==
                     &m_pImpl->m_pDoc->GetNodes()))
             {
-                SwTxtNode const& rTxtNode = pTxtMark->GetTxtNode();
-                const ::std::unique_ptr<SwPaM> pPam( (pTxtMark->End())
-                    ?   new SwPaM( rTxtNode, *pTxtMark->End(),
-                                   rTxtNode, pTxtMark->GetStart())
-                    :   new SwPaM( rTxtNode, pTxtMark->GetStart()) );
+                SwTextNode const& rTextNode = pTextMark->GetTextNode();
+                const ::std::unique_ptr<SwPaM> pPam( (pTextMark->End())
+                    ?   new SwPaM( rTextNode, *pTextMark->End(),
+                                   rTextNode, pTextMark->GetStart())
+                    :   new SwPaM( rTextNode, pTextMark->GetStart()) );
 
                 return SwXTextRange::CreateXTextRange(
                             *m_pImpl->m_pDoc, *pPam->Start(), pPam->End());
@@ -336,23 +336,23 @@ void SAL_CALL SwXReferenceMark::dispose() throw (uno::RuntimeException, std::exc
     SolarMutexGuard aGuard;
     if (m_pImpl->IsValid())
     {
-        SwFmtRefMark const*const pNewMark =
+        SwFormatRefMark const*const pNewMark =
             m_pImpl->m_pDoc->GetRefMark(m_pImpl->m_sMarkName);
-        if (pNewMark && (pNewMark == m_pImpl->m_pMarkFmt))
+        if (pNewMark && (pNewMark == m_pImpl->m_pMarkFormat))
         {
-            SwTxtRefMark const*const pTxtMark =
-                m_pImpl->m_pMarkFmt->GetTxtRefMark();
-            if (pTxtMark &&
-                (&pTxtMark->GetTxtNode().GetNodes() ==
+            SwTextRefMark const*const pTextMark =
+                m_pImpl->m_pMarkFormat->GetTextRefMark();
+            if (pTextMark &&
+                (&pTextMark->GetTextNode().GetNodes() ==
                     &m_pImpl->m_pDoc->GetNodes()))
             {
-                SwTxtNode const& rTxtNode = pTxtMark->GetTxtNode();
-                const sal_Int32 nStt = pTxtMark->GetStart();
-                const sal_Int32 nEnd = pTxtMark->End()
-                                  ? *pTxtMark->End()
+                SwTextNode const& rTextNode = pTextMark->GetTextNode();
+                const sal_Int32 nStt = pTextMark->GetStart();
+                const sal_Int32 nEnd = pTextMark->End()
+                                  ? *pTextMark->End()
                                   : nStt + 1;
 
-                SwPaM aPam( rTxtNode, nStt, rTxtNode, nEnd );
+                SwPaM aPam( rTextNode, nStt, rTextNode, nEnd );
                 m_pImpl->m_pDoc->getIDocumentContentOperations().DeleteAndJoin( aPam );
             }
         }
@@ -407,25 +407,25 @@ throw (uno::RuntimeException, std::exception)
         {
             throw uno::RuntimeException();
         }
-        SwFmtRefMark const*const pCurMark =
+        SwFormatRefMark const*const pCurMark =
             m_pImpl->m_pDoc->GetRefMark(m_pImpl->m_sMarkName);
         if ((rName != m_pImpl->m_sMarkName)
-            && pCurMark && (pCurMark == m_pImpl->m_pMarkFmt))
+            && pCurMark && (pCurMark == m_pImpl->m_pMarkFormat))
         {
             const UnoActionContext aCont(m_pImpl->m_pDoc);
-            SwTxtRefMark const*const pTxtMark =
-                m_pImpl->m_pMarkFmt->GetTxtRefMark();
-            if (pTxtMark &&
-                (&pTxtMark->GetTxtNode().GetNodes() ==
+            SwTextRefMark const*const pTextMark =
+                m_pImpl->m_pMarkFormat->GetTextRefMark();
+            if (pTextMark &&
+                (&pTextMark->GetTextNode().GetNodes() ==
                      &m_pImpl->m_pDoc->GetNodes()))
             {
-                SwTxtNode const& rTxtNode = pTxtMark->GetTxtNode();
-                const sal_Int32 nStt = pTxtMark->GetStart();
-                const sal_Int32 nEnd = pTxtMark->End()
-                                        ? *pTxtMark->End()
+                SwTextNode const& rTextNode = pTextMark->GetTextNode();
+                const sal_Int32 nStt = pTextMark->GetStart();
+                const sal_Int32 nEnd = pTextMark->End()
+                                        ? *pTextMark->End()
                                         : nStt + 1;
 
-                SwPaM aPam( rTxtNode, nStt, rTxtNode, nEnd );
+                SwPaM aPam( rTextNode, nStt, rTextNode, nEnd );
                 // deletes the m_pImpl->m_pDoc member in the SwXReferenceMark!
                 m_pImpl->m_pDoc->getIDocumentContentOperations().DeleteAndJoin( aPam );
                 // The aPam will keep the correct and functional doc though
@@ -594,14 +594,14 @@ throw (uno::RuntimeException)
     uno::Reference< text::XTextCursor > xRet;
     if (IsValid())
     {
-        SwTxtNode * pTxtNode;
+        SwTextNode * pTextNode;
         sal_Int32 nMetaStart;
         sal_Int32 nMetaEnd;
         const bool bSuccess(
-                m_rMeta.SetContentRange(pTxtNode, nMetaStart, nMetaEnd) );
+                m_rMeta.SetContentRange(pTextNode, nMetaStart, nMetaEnd) );
         if (bSuccess)
         {
-            SwPosition aPos(*pTxtNode, nMetaStart);
+            SwPosition aPos(*pTextNode, nMetaStart);
             xRet = static_cast<text::XWordCursor*>(
                     new SwXTextCursor(*GetDoc(), &m_rMeta, CURSOR_META, aPos));
         }
@@ -634,7 +634,7 @@ SwXMetaText::createTextCursorByRange(
 
 // the Meta has a cached list of text portions for its contents
 // this list is created by SwXTextPortionEnumeration
-// the Meta listens at the SwTxtNode and throws away the cache when it changes
+// the Meta listens at the SwTextNode and throws away the cache when it changes
 class SwXMeta::Impl
     : public SwClient
 {
@@ -682,7 +682,7 @@ inline const ::sw::Meta * SwXMeta::Impl::GetMeta() const
 // SwModify
 void SwXMeta::Impl::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
-    m_pTextPortions.reset(); // throw away cache (SwTxtNode changed)
+    m_pTextPortions.reset(); // throw away cache (SwTextNode changed)
 
     ClientModify(this, pOld, pNew);
 
@@ -766,23 +766,23 @@ SwXMeta::CreateXMeta(::sw::Meta & rMeta,
     }
 
     // create new SwXMeta
-    SwTxtNode * const pTxtNode( rMeta.GetTxtNode() );
-    SAL_WARN_IF(!pTxtNode, "sw.uno", "CreateXMeta: no text node?");
-    if (!pTxtNode) { return 0; }
+    SwTextNode * const pTextNode( rMeta.GetTextNode() );
+    SAL_WARN_IF(!pTextNode, "sw.uno", "CreateXMeta: no text node?");
+    if (!pTextNode) { return 0; }
     uno::Reference<text::XText> xParentText(i_xParent);
     if (!xParentText.is())
     {
-        SwTxtMeta * const pTxtAttr( rMeta.GetTxtAttr() );
-        SAL_WARN_IF(!pTxtAttr, "sw.uno", "CreateXMeta: no text attr?");
-        if (!pTxtAttr) { return 0; }
-        const SwPosition aPos(*pTxtNode, pTxtAttr->GetStart());
-        xParentText.set( ::sw::CreateParentXText(*pTxtNode->GetDoc(), aPos) );
+        SwTextMeta * const pTextAttr( rMeta.GetTextAttr() );
+        SAL_WARN_IF(!pTextAttr, "sw.uno", "CreateXMeta: no text attr?");
+        if (!pTextAttr) { return 0; }
+        const SwPosition aPos(*pTextNode, pTextAttr->GetStart());
+        xParentText.set( ::sw::CreateParentXText(*pTextNode->GetDoc(), aPos) );
     }
     if (!xParentText.is()) { return 0; }
-    SwXMeta *const pXMeta( (RES_TXTATR_META == rMeta.GetFmtMeta()->Which())
-        ? new SwXMeta     (pTxtNode->GetDoc(), &rMeta, xParentText,
+    SwXMeta *const pXMeta( (RES_TXTATR_META == rMeta.GetFormatMeta()->Which())
+        ? new SwXMeta     (pTextNode->GetDoc(), &rMeta, xParentText,
                             pPortions.release()) // temporarily un-unique_ptr :-(
-        : new SwXMetaField(pTxtNode->GetDoc(), &rMeta, xParentText,
+        : new SwXMetaField(pTextNode->GetDoc(), &rMeta, xParentText,
                             pPortions.release()));
     // this is why the constructor is private: need to acquire pXMeta here
     xMeta.set(pXMeta);
@@ -794,20 +794,20 @@ SwXMeta::CreateXMeta(::sw::Meta & rMeta,
 }
 
 bool SwXMeta::SetContentRange(
-        SwTxtNode *& rpNode, sal_Int32 & rStart, sal_Int32 & rEnd ) const
+        SwTextNode *& rpNode, sal_Int32 & rStart, sal_Int32 & rEnd ) const
 {
     ::sw::Meta const * const pMeta( m_pImpl->GetMeta() );
     if (pMeta)
     {
-        SwTxtMeta const * const pTxtAttr( pMeta->GetTxtAttr() );
-        if (pTxtAttr)
+        SwTextMeta const * const pTextAttr( pMeta->GetTextAttr() );
+        if (pTextAttr)
         {
-            rpNode = pMeta->GetTxtNode();
+            rpNode = pMeta->GetTextNode();
             if (rpNode)
             {
                 // rStart points at the first position _within_ the meta!
-                rStart = pTxtAttr->GetStart() + 1;
-                rEnd = *pTxtAttr->End();
+                rStart = pTextAttr->GetStart() + 1;
+                rEnd = *pTextAttr->End();
                 return true;
             }
         }
@@ -818,16 +818,16 @@ bool SwXMeta::SetContentRange(
 bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
     throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
-    SwTxtNode * pTxtNode;
+    SwTextNode * pTextNode;
     sal_Int32 nMetaStart;
     sal_Int32 nMetaEnd;
-    const bool bSuccess( SetContentRange(pTxtNode, nMetaStart, nMetaEnd) );
+    const bool bSuccess( SetContentRange(pTextNode, nMetaStart, nMetaEnd) );
     OSL_ENSURE(bSuccess, "no pam?");
     if (!bSuccess)
         throw lang::DisposedException();
 
     SwPosition const * const pStartPos( rPam.Start() );
-    if (&pStartPos->nNode.GetNode() != pTxtNode)
+    if (&pStartPos->nNode.GetNode() != pTextNode)
     {
         throw lang::IllegalArgumentException(
             "trying to insert into a nesting text content, but start "
@@ -852,7 +852,7 @@ bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
     if (rPam.HasMark() && bAbsorb)
     {
         SwPosition const * const pEndPos( rPam.End() );
-        if (&pEndPos->nNode.GetNode() != pTxtNode)
+        if (&pEndPos->nNode.GetNode() != pTextNode)
         {
             throw lang::IllegalArgumentException(
                 "trying to insert into a nesting text content, but end "
@@ -958,16 +958,16 @@ SwXMeta::dispose() throw (uno::RuntimeException, std::exception)
     }
     else if (!m_pImpl->m_bIsDisposed)
     {
-        SwTxtNode * pTxtNode;
+        SwTextNode * pTextNode;
         sal_Int32 nMetaStart;
         sal_Int32 nMetaEnd;
-        const bool bSuccess(SetContentRange(pTxtNode, nMetaStart, nMetaEnd));
+        const bool bSuccess(SetContentRange(pTextNode, nMetaStart, nMetaEnd));
         OSL_ENSURE(bSuccess, "no pam?");
         if (bSuccess)
         {
             // -1 because of CH_TXTATR
-            SwPaM aPam( *pTxtNode, nMetaStart - 1, *pTxtNode, nMetaEnd );
-            SwDoc * const pDoc( pTxtNode->GetDoc() );
+            SwPaM aPam( *pTextNode, nMetaStart - 1, *pTextNode, nMetaEnd );
+            SwDoc * const pDoc( pTextNode->GetDoc() );
             pDoc->getIDocumentContentOperations().DeleteAndJoin( aPam );
 
             // removal should call Modify and do the dispose
@@ -1038,16 +1038,16 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
         ? ::boost::shared_ptr< ::sw::Meta>( new ::sw::Meta() )
         : ::boost::shared_ptr< ::sw::Meta>(
             pDoc->GetMetaFieldManager().makeMetaField()) );
-    SwFmtMeta meta(pMeta, i_nWhich); // this is cloned by Insert!
+    SwFormatMeta meta(pMeta, i_nWhich); // this is cloned by Insert!
     const bool bSuccess( pDoc->getIDocumentContentOperations().InsertPoolItem( aPam, meta, nInsertFlags ) );
-    SwTxtAttr * const pTxtAttr( pMeta->GetTxtAttr() );
+    SwTextAttr * const pTextAttr( pMeta->GetTextAttr() );
     if (!bSuccess)
     {
         throw lang::IllegalArgumentException(
             "SwXMeta::attach(): cannot create meta: range invalid?",
             static_cast< ::cppu::OWeakObject* >(this), 1);
     }
-    if (!pTxtAttr)
+    if (!pTextAttr)
     {
         OSL_FAIL("meta inserted, but has no text attribute?");
         throw uno::RuntimeException(
@@ -1087,10 +1087,10 @@ SwXMeta::getAnchor() throw (uno::RuntimeException, std::exception)
                 static_cast< ::cppu::OWeakObject* >(this));
     }
 
-    SwTxtNode * pTxtNode;
+    SwTextNode * pTextNode;
     sal_Int32 nMetaStart;
     sal_Int32 nMetaEnd;
-    const bool bSuccess(SetContentRange(pTxtNode, nMetaStart, nMetaEnd));
+    const bool bSuccess(SetContentRange(pTextNode, nMetaStart, nMetaEnd));
     OSL_ENSURE(bSuccess, "no pam?");
     if (!bSuccess)
     {
@@ -1099,9 +1099,9 @@ SwXMeta::getAnchor() throw (uno::RuntimeException, std::exception)
                 static_cast< ::cppu::OWeakObject* >(this));
     }
 
-    const SwPosition start(*pTxtNode, nMetaStart - 1); // -1 due to CH_TXTATR
-    const SwPosition end(*pTxtNode, nMetaEnd);
-    return SwXTextRange::CreateXTextRange(*pTxtNode->GetDoc(), start, &end);
+    const SwPosition start(*pTextNode, nMetaStart - 1); // -1 due to CH_TXTATR
+    const SwPosition end(*pTextNode, nMetaEnd);
+    return SwXTextRange::CreateXTextRange(*pTextNode->GetDoc(), start, &end);
 }
 
 // XTextRange
@@ -1200,17 +1200,17 @@ uno::Reference< uno::XInterface > SAL_CALL
 SwXMeta::getParent() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
-    SwTxtNode * pTxtNode;
+    SwTextNode * pTextNode;
     sal_Int32 nMetaStart;
     sal_Int32 nMetaEnd;
-    bool const bSuccess( SetContentRange(pTxtNode, nMetaStart, nMetaEnd) );
+    bool const bSuccess( SetContentRange(pTextNode, nMetaStart, nMetaEnd) );
     OSL_ENSURE(bSuccess, "no pam?");
     if (!bSuccess) { throw lang::DisposedException(); }
     // in order to prevent getting this meta, subtract 1 from nMetaStart;
     // so we get the index of the dummy character, and we exclude it
-    // by calling GetTxtAttrAt(_, _, PARENT) in GetNestedTextContent
+    // by calling GetTextAttrAt(_, _, PARENT) in GetNestedTextContent
     uno::Reference<text::XTextContent> const xRet(
-        SwUnoCursorHelper::GetNestedTextContent(*pTxtNode, nMetaStart - 1,
+        SwUnoCursorHelper::GetNestedTextContent(*pTextNode, nMetaStart - 1,
             true) );
     return xRet;
 }
@@ -1254,15 +1254,15 @@ SwXMeta::createEnumeration() throw (uno::RuntimeException, std::exception)
                 static_cast< ::cppu::OWeakObject* >(this));
     }
 
-    SwTxtNode * pTxtNode;
+    SwTextNode * pTextNode;
     sal_Int32 nMetaStart;
     sal_Int32 nMetaEnd;
-    const bool bSuccess(SetContentRange(pTxtNode, nMetaStart, nMetaEnd));
+    const bool bSuccess(SetContentRange(pTextNode, nMetaStart, nMetaEnd));
     OSL_ENSURE(bSuccess, "no pam?");
     if (!bSuccess)
         throw lang::DisposedException();
 
-    SwPaM aPam(*pTxtNode, nMetaStart);
+    SwPaM aPam(*pTextNode, nMetaStart);
 
     if (!m_pImpl->m_pTextPortions.get())
     {
@@ -1286,10 +1286,10 @@ uno::Reference<frame::XModel> SwXMeta::GetModel()
     ::sw::Meta const * const pMeta( m_pImpl->GetMeta() );
     if (pMeta)
     {
-        SwTxtNode const * const pTxtNode( pMeta->GetTxtNode() );
-        if (pTxtNode)
+        SwTextNode const * const pTextNode( pMeta->GetTextNode() );
+        if (pTextNode)
         {
-            SwDocShell const * const pShell(pTxtNode->GetDoc()->GetDocShell());
+            SwDocShell const * const pShell(pTextNode->GetDoc()->GetDocShell());
             return (pShell) ? pShell->GetModel() : 0;
         }
     }
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 6942fa1f3a31..72c22f66a29f 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -70,12 +70,12 @@ struct SwTextSectionProperties_Impl
     OUString  m_sSectionFilter;
     OUString  m_sSectionRegion;
 
-    ::std::unique_ptr<SwFmtCol>               m_pColItem;
+    ::std::unique_ptr<SwFormatCol>               m_pColItem;
     ::std::unique_ptr<SvxBrushItem>           m_pBrushItem;
-    ::std::unique_ptr<SwFmtFtnAtTxtEnd>       m_pFtnItem;
-    ::std::unique_ptr<SwFmtEndAtTxtEnd>       m_pEndItem;
+    ::std::unique_ptr<SwFormatFootnoteAtTextEnd>       m_pFootnoteItem;
+    ::std::unique_ptr<SwFormatEndAtTextEnd>       m_pEndItem;
     ::std::unique_ptr<SvXMLAttrContainerItem> m_pXMLAttr;
-    ::std::unique_ptr<SwFmtNoBalancedColumns> m_pNoBalanceItem;
+    ::std::unique_ptr<SwFormatNoBalancedColumns> m_pNoBalanceItem;
     ::std::unique_ptr<SvxFrameDirectionItem>  m_pFrameDirItem;
     ::std::unique_ptr<SvxLRSpaceItem>         m_pLRSpaceItem;
 
@@ -115,29 +115,29 @@ public:
     ::std::unique_ptr<SwTextSectionProperties_Impl> m_pProps;
 
     Impl(   SwXTextSection & rThis,
-            SwSectionFmt *const pFmt, const bool bIndexHeader)
-        : SwClient(pFmt)
+            SwSectionFormat *const pFormat, const bool bIndexHeader)
+        : SwClient(pFormat)
         , m_rThis(rThis)
         , m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_SECTION))
         , m_EventListeners(m_Mutex)
         , m_bIndexHeader(bIndexHeader)
-        , m_bIsDescriptor(0 == pFmt)
-        , m_pProps((pFmt) ? 0 : new SwTextSectionProperties_Impl())
+        , m_bIsDescriptor(0 == pFormat)
+        , m_pProps((pFormat) ? 0 : new SwTextSectionProperties_Impl())
     {
     }
 
-    SwSectionFmt * GetSectionFmt() const
+    SwSectionFormat * GetSectionFormat() const
     {
-        return static_cast<SwSectionFmt*>(const_cast<SwModify*>(
+        return static_cast<SwSectionFormat*>(const_cast<SwModify*>(
                     GetRegisteredIn()));
     }
 
-    SwSectionFmt & GetSectionFmtOrThrow() const {
-        SwSectionFmt *const pFmt( GetSectionFmt() );
-        if (!pFmt) {
+    SwSectionFormat & GetSectionFormatOrThrow() const {
+        SwSectionFormat *const pFormat( GetSectionFormat() );
+        if (!pFormat) {
             throw uno::RuntimeException("SwXTextSection: disposed or invalid", 0);
         }
-        return *pFmt;
+        return *pFormat;
     }
 
     void SAL_CALL SetPropertyValues_Impl(
@@ -174,29 +174,29 @@ void SwXTextSection::Impl::Modify( const SfxPoolItem *pOld, const SfxPoolItem *p
     m_EventListeners.disposeAndClear(ev);
 }
 
-SwSectionFmt * SwXTextSection::GetFmt() const
+SwSectionFormat * SwXTextSection::GetFormat() const
 {
-    return m_pImpl->GetSectionFmt();
+    return m_pImpl->GetSectionFormat();
 }
 
 uno::Reference< text::XTextSection >
 SwXTextSection::CreateXTextSection(
-        SwSectionFmt *const pFmt, const bool bIndexHeader)
+        SwSectionFormat *const pFormat, const bool bIndexHeader)
 {
     // re-use existing SwXTextSection
     // #i105557#: do not iterate over the registered clients: race condition
     uno::Reference< text::XTextSection > xSection;
-    if (pFmt)
+    if (pFormat)
     {
-        xSection.set(pFmt->GetXTextSection());
+        xSection.set(pFormat->GetXTextSection());
     }
     if ( !xSection.is() )
     {
-        SwXTextSection *const pNew = new SwXTextSection(pFmt, bIndexHeader);
+        SwXTextSection *const pNew = new SwXTextSection(pFormat, bIndexHeader);
         xSection.set(pNew);
-        if (pFmt)
+        if (pFormat)
         {
-            pFmt->SetXTextSection(xSection);
+            pFormat->SetXTextSection(xSection);
         }
         // need a permanent Reference to initialize m_wThis
         pNew->m_pImpl->m_wThis = xSection;
@@ -205,8 +205,8 @@ SwXTextSection::CreateXTextSection(
 }
 
 SwXTextSection::SwXTextSection(
-        SwSectionFmt *const pFmt, const bool bIndexHeader)
-    : m_pImpl( new SwXTextSection::Impl(*this, pFmt, bIndexHeader) )
+        SwSectionFormat *const pFormat, const bool bIndexHeader)
+    : m_pImpl( new SwXTextSection::Impl(*this, pFormat, bIndexHeader) )
 {
 }
 
@@ -236,11 +236,11 @@ SwXTextSection::getParentSection() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwSectionFmt & rSectionFmt( m_pImpl->GetSectionFmtOrThrow() );
+    SwSectionFormat & rSectionFormat( m_pImpl->GetSectionFormatOrThrow() );
 
-    SwSectionFmt *const pParentFmt = rSectionFmt.GetParent();
+    SwSectionFormat *const pParentFormat = rSectionFormat.GetParent();
     const uno::Reference< text::XTextSection > xRet =
-        (pParentFmt) ? CreateXTextSection(pParentFmt) : 0;
+        (pParentFormat) ? CreateXTextSection(pParentFormat) : 0;
     return xRet;
 }
 
@@ -249,15 +249,15 @@ SwXTextSection::getChildSections() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwSectionFmt & rSectionFmt( m_pImpl->GetSectionFmtOrThrow() );
+    SwSectionFormat & rSectionFormat( m_pImpl->GetSectionFormatOrThrow() );
 
     SwSections aChildren;
-    rSectionFmt.GetChildSections(aChildren, SORTSECT_NOT, false);
+    rSectionFormat.GetChildSections(aChildren, SORTSECT_NOT, false);
     uno::Sequence<uno::Reference<text::XTextSection> > aSeq(aChildren.size());
     uno::Reference< text::XTextSection > * pArray = aSeq.getArray();
     for (size_t i = 0; i < aChildren.size(); ++i)
     {
-        SwSectionFmt *const pChild = aChildren[i]->GetFmt();
+        SwSectionFormat *const pChild = aChildren[i]->GetFormat();
         pArray[i] = CreateXTextSection(pChild);
     }
     return aSeq;
@@ -319,7 +319,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         {
             // get all child sections
             SwSections aSectionsArr;
-            static_cast<const SwTOXBaseSection*>(pBase)->GetFmt()->
+            static_cast<const SwTOXBaseSection*>(pBase)->GetFormat()->
                 GetChildSections(aSectionsArr);
 
             // and search for current header section
@@ -364,9 +364,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     {
         aSet.Put(*m_pImpl->m_pProps->m_pColItem);
     }
-    if (m_pImpl->m_pProps->m_pFtnItem.get())
+    if (m_pImpl->m_pProps->m_pFootnoteItem.get())
     {
-        aSet.Put(*m_pImpl->m_pProps->m_pFtnItem);
+        aSet.Put(*m_pImpl->m_pProps->m_pFootnoteItem);
     }
     if (m_pImpl->m_pProps->m_pEndItem.get())
     {
@@ -404,8 +404,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                 "SwXTextSection::attach(): invalid TextRange",
                 static_cast< ::cppu::OWeakObject*>(this), 0);
     }
-    pRet->GetFmt()->Add(m_pImpl.get());
-    pRet->GetFmt()->SetXObject(static_cast< ::cppu::OWeakObject*>(this));
+    pRet->GetFormat()->Add(m_pImpl.get());
+    pRet->GetFormat()->SetXObject(static_cast< ::cppu::OWeakObject*>(this));
 
     // XML import must hide sections depending on their old
     //         condition status
@@ -437,21 +437,21 @@ SwXTextSection::getAnchor() throw (uno::RuntimeException, std::exception)
     SolarMutexGuard aGuard;
 
     uno::Reference< text::XTextRange >  xRet;
-    SwSectionFmt *const pSectFmt = m_pImpl->GetSectionFmt();
-    if(pSectFmt)
+    SwSectionFormat *const pSectFormat = m_pImpl->GetSectionFormat();
+    if(pSectFormat)
     {
         const SwNodeIndex* pIdx;
-        if( 0 != ( pSectFmt->GetSection() ) &&
-            0 != ( pIdx = pSectFmt->GetCntnt().GetCntntIdx() ) &&
+        if( 0 != ( pSectFormat->GetSection() ) &&
+            0 != ( pIdx = pSectFormat->GetContent().GetContentIdx() ) &&
             pIdx->GetNode().GetNodes().IsDocNodes() )
         {
             SwPaM aPaM(*pIdx);
-            aPaM.Move( fnMoveForward, fnGoCntnt );
+            aPaM.Move( fnMoveForward, fnGoContent );
 
             const SwEndNode* pEndNode = pIdx->GetNode().EndOfSectionNode();
             SwPaM aEnd(*pEndNode);
-            aEnd.Move( fnMoveBackward, fnGoCntnt );
-            xRet = SwXTextRange::CreateXTextRange(*pSectFmt->GetDoc(),
+            aEnd.Move( fnMoveBackward, fnGoContent );
+            xRet = SwXTextRange::CreateXTextRange(*pSectFormat->GetDoc(),
                 *aPaM.Start(), aEnd.Start());
         }
     }
@@ -462,10 +462,10 @@ void SAL_CALL SwXTextSection::dispose() throw (uno::RuntimeException, std::excep
 {
     SolarMutexGuard aGuard;
 
-    SwSectionFmt *const pSectFmt = m_pImpl->GetSectionFmt();
-    if (pSectFmt)
+    SwSectionFormat *const pSectFormat = m_pImpl->GetSectionFormat();
+    if (pSectFormat)
     {
-        pSectFmt->GetDoc()->DelSectionFmt( pSectFmt );
+        pSectFormat->GetDoc()->DelSectionFormat( pSectFormat );
     }
 }
 
@@ -511,20 +511,20 @@ lcl_UpdateLinkType(SwSection & rSection, bool const bLinkUpdateAlways = true)
 }
 
 static void
-lcl_UpdateSection(SwSectionFmt *const pFmt,
+lcl_UpdateSection(SwSectionFormat *const pFormat,
     ::std::unique_ptr<SwSectionData> const& pSectionData,
     ::std::unique_ptr<SfxItemSet> const& pItemSet,
     bool const bLinkModeChanged, bool const bLinkUpdateAlways = true)
 {
-    if (pFmt)
+    if (pFormat)
     {
-        SwSection & rSection = *pFmt->GetSection();
-        SwDoc *const pDoc = pFmt->GetDoc();
-        SwSectionFmts const& rFmts = pDoc->GetSections();
+        SwSection & rSection = *pFormat->GetSection();
+        SwDoc *const pDoc = pFormat->GetDoc();
+        SwSectionFormats const& rFormats = pDoc->GetSections();
         UnoActionContext aContext(pDoc);
-        for (size_t i = 0; i < rFmts.size(); ++i)
+        for (size_t i = 0; i < rFormats.size(); ++i)
         {
-            if (rFmts[i]->GetSection()->GetSectionName()
+            if (rFormats[i]->GetSection()->GetSectionName()
                     == rSection.GetSectionName())
             {
                 pDoc->UpdateSection(i, *pSectionData, pItemSet.get(),
@@ -556,14 +556,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
     {
         throw lang::IllegalArgumentException();
     }
-    SwSectionFmt *const pFmt = GetSectionFmt();
-    if (!pFmt && !m_bIsDescriptor)
+    SwSectionFormat *const pFormat = GetSectionFormat();
+    if (!pFormat && !m_bIsDescriptor)
     {
         throw uno::RuntimeException();
     }
 
     ::std::unique_ptr<SwSectionData> const pSectionData(
-        (pFmt) ? new SwSectionData(*pFmt->GetSection()) : 0);
+        (pFormat) ? new SwSectionData(*pFormat->GetSection()) : 0);
 
     OUString const*const pPropertyNames = rPropertyNames.getConstArray();
     uno::Any const*const pValues = rValues.getConstArray();
@@ -677,7 +677,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                     }
                     const OUString sTmp(!aLink.FileURL.isEmpty()
                         ? URIHelper::SmartRel2Abs(
-                            pFmt->GetDoc()->GetDocShell()->GetMedium()->GetURLObject(),
+                            pFormat->GetDoc()->GetDocShell()->GetMedium()->GetURLObject(),
                             aLink.FileURL, URIHelper::GetMaybeFileHdl())
                         : OUString());
                     const OUString sFileName(
@@ -810,9 +810,9 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             break;
             default:
             {
-                if (pFmt)
+                if (pFormat)
                 {
-                    const SfxItemSet& rOldAttrSet = pFmt->GetAttrSet();
+                    const SfxItemSet& rOldAttrSet = pFormat->GetAttrSet();
                     pItemSet.reset( new SfxItemSet(*rOldAttrSet.GetPool(), pEntry->nWID, pEntry->nWID));
                     pItemSet->Put(rOldAttrSet);
                     m_rPropSet.setPropertyValue(*pEntry,
@@ -825,7 +825,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                     {
                         if (!m_pProps->m_pColItem.get())
                         {
-                            m_pProps->m_pColItem.reset(new SwFmtCol);
+                            m_pProps->m_pColItem.reset(new SwFormatCol);
                         }
                         pPutItem = m_pProps->m_pColItem.get();
                     }
@@ -840,17 +840,17 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                     }
                     else if (RES_FTN_AT_TXTEND == pEntry->nWID)
                     {
-                        if (!m_pProps->m_pFtnItem.get())
+                        if (!m_pProps->m_pFootnoteItem.get())
                         {
-                            m_pProps->m_pFtnItem.reset(new SwFmtFtnAtTxtEnd);
+                            m_pProps->m_pFootnoteItem.reset(new SwFormatFootnoteAtTextEnd);
                         }
-                        pPutItem = m_pProps->m_pFtnItem.get();
+                        pPutItem = m_pProps->m_pFootnoteItem.get();
                     }
                     else if (RES_END_AT_TXTEND == pEntry->nWID)
                     {
                         if (!m_pProps->m_pEndItem.get())
                         {
-                            m_pProps->m_pEndItem.reset(new SwFmtEndAtTxtEnd);
+                            m_pProps->m_pEndItem.reset(new SwFormatEndAtTextEnd);
                         }
                         pPutItem = m_pProps->m_pEndItem.get();
                     }
@@ -869,7 +869,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                         if (!m_pProps->m_pNoBalanceItem.get())
                         {
                             m_pProps->m_pNoBalanceItem.reset(
-                                new SwFmtNoBalancedColumns(true));
+                                new SwFormatNoBalancedColumns(true));
                         }
                         pPutItem = m_pProps->m_pNoBalanceItem.get();
                     }
@@ -902,7 +902,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
         }
     }
 
-    lcl_UpdateSection(pFmt, pSectionData, pItemSet, bLinkModeChanged,
+    lcl_UpdateSection(pFormat, pSectionData, pItemSet, bLinkModeChanged,
         bLinkMode);
 }
 
@@ -951,15 +951,15 @@ SwXTextSection::Impl::GetPropertyValues_Impl(
 throw (beans::UnknownPropertyException, lang::WrappedTargetException,
         uno::RuntimeException)
 {
-    SwSectionFmt *const pFmt = GetSectionFmt();
-    if (!pFmt && !m_bIsDescriptor)
+    SwSectionFormat *const pFormat = GetSectionFormat();
+    if (!pFormat && !m_bIsDescriptor)
     {
         throw uno::RuntimeException();
     }
 
     uno::Sequence< uno::Any > aRet(rPropertyNames.getLength());
     uno::Any* pRet = aRet.getArray();
-    SwSection *const pSect = (pFmt) ? pFmt->GetSection() : 0;
+    SwSection *const pSect = (pFormat) ? pFormat->GetSection() : 0;
     const OUString* pPropertyNames = rPropertyNames.getConstArray();
 
     for (sal_Int32 nProperty = 0; nProperty < rPropertyNames.getLength();
@@ -1082,9 +1082,9 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             break;
             case  FN_PARAM_LINK_DISPLAY_NAME:
             {
-                if (pFmt)
+                if (pFormat)
                 {
-                    pRet[nProperty] <<= pFmt->GetSection()->GetSectionName();
+                    pRet[nProperty] <<= pFormat->GetSection()->GetSectionName();
                 }
             }
             break;
@@ -1104,7 +1104,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                     // convert section to TOXBase and get SwXDocumentIndex
                     const uno::Reference<text::XDocumentIndex> xIndex =
                         SwXDocumentIndex::CreateXDocumentIndex(
-                            *pTOXBaseSect->GetFmt()->GetDoc(), pTOXBaseSect);
+                            *pTOXBaseSect->GetFormat()->GetDoc(), pTOXBaseSect);
                     pRet[nProperty] <<= xIndex;
                 }
                 // else: no enclosing index found -> empty return value
@@ -1112,7 +1112,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             break;
             case WID_SECT_IS_GLOBAL_DOC_SECTION:
             {
-                const bool bRet = pFmt && (NULL != pFmt->GetGlobalDocSection());
+                const bool bRet = pFormat && (NULL != pFormat->GetGlobalDocSection());
                 pRet[nProperty] <<= bRet;
             }
             break;
@@ -1125,18 +1125,18 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             case FN_UNO_REDLINE_NODE_START:
             case FN_UNO_REDLINE_NODE_END:
             {
-                if (!pFmt)
+                if (!pFormat)
                     break;      // #i73247#
-                SwNode* pSectNode = pFmt->GetSectionNode();
+                SwNode* pSectNode = pFormat->GetSectionNode();
                 if (FN_UNO_REDLINE_NODE_END == pEntry->nWID)
                 {
                     pSectNode = pSectNode->EndOfSectionNode();
                 }
-                const SwRedlineTbl& rRedTbl =
-                    pFmt->GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
-                for (size_t nRed = 0; nRed < rRedTbl.size(); ++nRed)
+                const SwRedlineTable& rRedTable =
+                    pFormat->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+                for (size_t nRed = 0; nRed < rRedTable.size(); ++nRed)
                 {
-                    const SwRangeRedline* pRedline = rRedTbl[nRed];
+                    const SwRangeRedline* pRedline = rRedTable[nRed];
                     const SwNode& rRedPointNode = pRedline->GetNode(true);
                     const SwNode& rRedMarkNode = pRedline->GetNode(false);
                     if ((&rRedPointNode == pSectNode) ||
@@ -1163,10 +1163,10 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             break;
             default:
             {
-                if (pFmt)
+                if (pFormat)
                 {
                     m_rPropSet.getPropertyValue(*pEntry,
-                            pFmt->GetAttrSet(), pRet[nProperty]);
+                            pFormat->GetAttrSet(), pRet[nProperty]);
                 }
                 else
                 {
@@ -1175,7 +1175,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                     {
                         if (!m_pProps->m_pColItem.get())
                         {
-                            m_pProps->m_pColItem.reset(new SwFmtCol);
+                            m_pProps->m_pColItem.reset(new SwFormatCol);
                         }
                         pQueryItem = m_pProps->m_pColItem.get();
                     }
@@ -1190,17 +1190,17 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                     }
                     else if (RES_FTN_AT_TXTEND == pEntry->nWID)
                     {
-                        if (!m_pProps->m_pFtnItem.get())
+                        if (!m_pProps->m_pFootnoteItem.get())
                         {
-                            m_pProps->m_pFtnItem.reset(new SwFmtFtnAtTxtEnd);
+                            m_pProps->m_pFootnoteItem.reset(new SwFormatFootnoteAtTextEnd);
                         }
-                        pQueryItem = m_pProps->m_pFtnItem.get();
+                        pQueryItem = m_pProps->m_pFootnoteItem.get();
                     }
                     else if (RES_END_AT_TXTEND == pEntry->nWID)
                     {
                         if (!m_pProps->m_pEndItem.get())
                         {
-                            m_pProps->m_pEndItem.reset(new SwFmtEndAtTxtEnd);
+                            m_pProps->m_pEndItem.reset(new SwFormatEndAtTextEnd);
                         }
                         pQueryItem = m_pProps->m_pEndItem.get();
                     }
@@ -1218,7 +1218,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                         if (!m_pProps->m_pNoBalanceItem.get())
                         {
                             m_pProps->m_pNoBalanceItem.reset(
-                                new SwFmtNoBalancedColumns);
+                                new SwFormatNoBalancedColumns);
                         }
                         pQueryItem = m_pProps->m_pNoBalanceItem.get();
                     }
@@ -1373,8 +1373,8 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt();
-    if (!pFmt && !m_pImpl->m_bIsDescriptor)
+    SwSectionFormat *const pFormat = m_pImpl->GetSectionFormat();
+    if (!pFormat && !m_pImpl->m_bIsDescriptor)
     {
         throw uno::RuntimeException();
     }
@@ -1413,10 +1413,10 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
             break;
             default:
             {
-                if (pFmt)
+                if (pFormat)
                 {
                     pStates[i] = m_pImpl->m_rPropSet.getPropertyState(
-                                    pNames[i], pFmt->GetAttrSet());
+                                    pNames[i], pFormat->GetAttrSet());
                 }
                 else
                 {
@@ -1455,8 +1455,8 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt();
-    if (!pFmt && !m_pImpl->m_bIsDescriptor)
+    SwSectionFormat *const pFormat = m_pImpl->GetSectionFormat();
+    if (!pFormat && !m_pImpl->m_bIsDescriptor)
     {
         throw uno::RuntimeException();
     }
@@ -1477,7 +1477,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
     }
 
     ::std::unique_ptr<SwSectionData> const pSectionData(
-        (pFmt) ? new SwSectionData(*pFmt->GetSection()) : 0);
+        (pFormat) ? new SwSectionData(*pFormat->GetSection()) : 0);
 
     ::std::unique_ptr<SfxItemSet> pNewAttrSet;
     bool bLinkModeChanged = false;
@@ -1568,9 +1568,9 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
         {
             if (pEntry->nWID <= SFX_WHICH_MAX)
             {
-                if (pFmt)
+                if (pFormat)
                 {
-                    const SfxItemSet& rOldAttrSet = pFmt->GetAttrSet();
+                    const SfxItemSet& rOldAttrSet = pFormat->GetAttrSet();
                     pNewAttrSet.reset( new SfxItemSet(*rOldAttrSet.GetPool(), pEntry->nWID, pEntry->nWID));
                     pNewAttrSet->ClearItem(pEntry->nWID);
                 }
@@ -1589,7 +1589,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
         }
     }
 
-    lcl_UpdateSection(pFmt, pSectionData, pNewAttrSet, bLinkModeChanged);
+    lcl_UpdateSection(pFormat, pSectionData, pNewAttrSet, bLinkModeChanged);
 }
 
 uno::Any SAL_CALL
@@ -1600,7 +1600,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
     SolarMutexGuard aGuard;
 
     uno::Any aRet;
-    SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt();
+    SwSectionFormat *const pFormat = m_pImpl->GetSectionFormat();
     SfxItemPropertySimpleEntry const*const pEntry =
         m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName);
     if (!pEntry)
@@ -1637,9 +1637,9 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             ::sw::GetDefaultTextContentValue(aRet, OUString(), pEntry->nWID);
         break;
         default:
-        if(pFmt && pEntry->nWID <= SFX_WHICH_MAX)
+        if(pFormat && pEntry->nWID <= SFX_WHICH_MAX)
         {
-            SwDoc *const pDoc = pFmt->GetDoc();
+            SwDoc *const pDoc = pFormat->GetDoc();
             const SfxPoolItem& rDefItem =
                 pDoc->GetAttrPool().GetDefaultItem(pEntry->nWID);
             rDefItem.QueryValue(aRet, pEntry->nMemberId);
@@ -1653,10 +1653,10 @@ OUString SAL_CALL SwXTextSection::getName() throw (uno::RuntimeException, std::e
     SolarMutexGuard aGuard;
 
     OUString sRet;
-    SwSectionFmt const*const pFmt = m_pImpl->GetSectionFmt();
-    if(pFmt)
+    SwSectionFormat const*const pFormat = m_pImpl->GetSectionFormat();
+    if(pFormat)
     {
-        sRet = pFmt->GetSection()->GetSectionName();
+        sRet = pFormat->GetSection()->GetSectionName();
     }
     else if (m_pImpl->m_bIsDescriptor)
     {
@@ -1674,22 +1674,22 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt();
-    if(pFmt)
+    SwSectionFormat *const pFormat = m_pImpl->GetSectionFormat();
+    if(pFormat)
     {
-        SwSection *const pSect = pFmt->GetSection();
+        SwSection *const pSect = pFormat->GetSection();
         SwSectionData aSection(*pSect);
         aSection.SetSectionName(rName);
 
-        const SwSectionFmts& rFmts = pFmt->GetDoc()->GetSections();
+        const SwSectionFormats& rFormats = pFormat->GetDoc()->GetSections();
         size_t nApplyPos = SIZE_MAX;
-        for( size_t i = 0; i < rFmts.size(); ++i )
+        for( size_t i = 0; i < rFormats.size(); ++i )
         {
-            if(rFmts[i]->GetSection() == pSect)
+            if(rFormats[i]->GetSection() == pSect)
             {
                 nApplyPos = i;
             }
-            else if (rName == rFmts[i]->GetSection()->GetSectionName())
+            else if (rName == rFormats[i]->GetSection()->GetSectionName())
             {
                 throw uno::RuntimeException();
             }
@@ -1697,12 +1697,12 @@ throw (uno::RuntimeException, std::exception)
         if (nApplyPos != SIZE_MAX)
         {
             {
-                UnoActionContext aContext(pFmt->GetDoc());
-                pFmt->GetDoc()->UpdateSection(nApplyPos, aSection);
+                UnoActionContext aContext(pFormat->GetDoc());
+                pFormat->GetDoc()->UpdateSection(nApplyPos, aSection);
             }
             {
                 // temporarily remove actions to allow cursor update
-                UnoActionRemoveContext aRemoveContext( pFmt->GetDoc() );
+                UnoActionRemoveContext aRemoveContext( pFormat->GetDoc() );
             }
         }
     }
@@ -1746,16 +1746,16 @@ SwXTextSection::getSupportedServiceNames() throw (uno::RuntimeException, std::ex
 // MetadatableMixin
 ::sfx2::Metadatable* SwXTextSection::GetCoreObject()
 {
-    SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
-    return pSectionFmt;
+    SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
+    return pSectionFormat;
 }
 
 uno::Reference<frame::XModel> SwXTextSection::GetModel()
 {
-    SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
-    if (pSectionFmt)
+    SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
+    if (pSectionFormat)
     {
-        SwDocShell const*const pShell( pSectionFmt->GetDoc()->GetDocShell() );
+        SwDocShell const*const pShell( pSectionFormat->GetDoc()->GetDocShell() );
         return (pShell) ? pShell->GetModel() : 0;
     }
     return 0;
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 14bc695904df..87d0cb52785b 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -184,38 +184,38 @@ const SfxItemPropertySet* GetLineNumberingSet()
     return &aLineNumberingSet_Impl;
 }
 
-static SwCharFmt* lcl_getCharFmt(SwDoc* pDoc, const uno::Any& aValue)
+static SwCharFormat* lcl_getCharFormat(SwDoc* pDoc, const uno::Any& aValue)
 {
-    SwCharFmt* pRet = 0;
+    SwCharFormat* pRet = 0;
     OUString uTmp;
     aValue >>= uTmp;
-    OUString sCharFmt;
-    SwStyleNameMapper::FillUIName(uTmp, sCharFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true);
-    if (sCharFmt != SW_RESSTR(STR_POOLCOLL_STANDARD))
+    OUString sCharFormat;
+    SwStyleNameMapper::FillUIName(uTmp, sCharFormat, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true);
+    if (sCharFormat != SW_RESSTR(STR_POOLCOLL_STANDARD))
     {
-        pRet = pDoc->FindCharFmtByName( sCharFmt );
+        pRet = pDoc->FindCharFormatByName( sCharFormat );
     }
     if(!pRet)
     {
-        const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(sCharFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
+        const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(sCharFormat, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
         if(USHRT_MAX != nId)
-            pRet = pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( nId );
+            pRet = pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( nId );
     }
     return pRet;
 }
 
-static SwTxtFmtColl* lcl_GetParaStyle(SwDoc* pDoc, const uno::Any& aValue)
+static SwTextFormatColl* lcl_GetParaStyle(SwDoc* pDoc, const uno::Any& aValue)
 {
     OUString uTmp;
     aValue >>= uTmp;
     OUString sParaStyle;
     SwStyleNameMapper::FillUIName(uTmp, sParaStyle, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
-    SwTxtFmtColl* pRet = pDoc->FindTxtFmtCollByName( sParaStyle );
+    SwTextFormatColl* pRet = pDoc->FindTextFormatCollByName( sParaStyle );
     if( !pRet  )
     {
         const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( sParaStyle, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
         if( USHRT_MAX != nId  )
-            pRet = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nId );
+            pRet = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nId );
     }
     return pRet;
 }
@@ -304,21 +304,21 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
         {
             if ( pEntry->nFlags & PropertyAttribute::READONLY)
                 throw PropertyVetoException("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
-            SwFtnInfo aFtnInfo(pDoc->GetFtnInfo());
+            SwFootnoteInfo aFootnoteInfo(pDoc->GetFootnoteInfo());
             switch(pEntry->nWID)
             {
                 case WID_PREFIX:
                 {
                     OUString uTmp;
                     aValue >>= uTmp;
-                    aFtnInfo.SetPrefix(uTmp);
+                    aFootnoteInfo.SetPrefix(uTmp);
                 }
                 break;
                 case WID_SUFFIX:
                 {
                     OUString uTmp;
                     aValue >>= uTmp;
-                    aFtnInfo.SetSuffix(uTmp);
+                    aFootnoteInfo.SetSuffix(uTmp);
                 }
                 break;
                 case WID_NUMBERING_TYPE:
@@ -328,7 +328,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
                     if(nTmp >= 0 &&
                         (nTmp <= SVX_NUM_ARABIC ||
                             nTmp > SVX_NUM_BITMAP))
-                        aFtnInfo.aFmt.SetNumberingType(nTmp);
+                        aFootnoteInfo.aFormat.SetNumberingType(nTmp);
                     else
                         throw lang::IllegalArgumentException();
                 }
@@ -337,7 +337,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
                 {
                     sal_Int16 nTmp = 0;
                     aValue >>= nTmp;
-                    aFtnInfo.nFtnOffset = nTmp;
+                    aFootnoteInfo.nFootnoteOffset = nTmp;
                 }
                 break;
                 case WID_FOOTNOTE_COUNTING:
@@ -347,66 +347,66 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
                     switch(nTmp)
                     {
                         case  FootnoteNumbering::PER_PAGE:
-                            aFtnInfo.eNum = FTNNUM_PAGE;
+                            aFootnoteInfo.eNum = FTNNUM_PAGE;
                         break;
                         case  FootnoteNumbering::PER_CHAPTER:
-                            aFtnInfo.eNum = FTNNUM_CHAPTER;
+                            aFootnoteInfo.eNum = FTNNUM_CHAPTER;
                         break;
                         case  FootnoteNumbering::PER_DOCUMENT:
-                            aFtnInfo.eNum = FTNNUM_DOC;
+                            aFootnoteInfo.eNum = FTNNUM_DOC;
                         break;
                     }
                 }
                 break;
                 case WID_PARAGRAPH_STYLE:
                 {
-                    SwTxtFmtColl* pColl = lcl_GetParaStyle(pDoc, aValue);
+                    SwTextFormatColl* pColl = lcl_GetParaStyle(pDoc, aValue);
                     if(pColl)
-                        aFtnInfo.SetFtnTxtColl(*pColl);
+                        aFootnoteInfo.SetFootnoteTextColl(*pColl);
                 }
                 break;
                 case WID_PAGE_STYLE:
                 {
                     SwPageDesc* pDesc = lcl_GetPageDesc(pDoc, aValue);
                     if(pDesc)
-                        aFtnInfo.ChgPageDesc( pDesc );
+                        aFootnoteInfo.ChgPageDesc( pDesc );
                 }
                 break;
                 case WID_ANCHOR_CHARACTER_STYLE:
                 case WID_CHARACTER_STYLE:
                 {
-                    SwCharFmt* pFmt = lcl_getCharFmt(pDoc, aValue);
-                    if(pFmt)
+                    SwCharFormat* pFormat = lcl_getCharFormat(pDoc, aValue);
+                    if(pFormat)
                     {
                         if(pEntry->nWID == WID_ANCHOR_CHARACTER_STYLE)
-                            aFtnInfo.SetAnchorCharFmt(pFmt);
+                            aFootnoteInfo.SetAnchorCharFormat(pFormat);
                         else
-                            aFtnInfo.SetCharFmt(pFmt);
+                            aFootnoteInfo.SetCharFormat(pFormat);
                     }
                 }
                 break;
                 case WID_POSITION_END_OF_DOC:
                 {
                     bool bVal = *static_cast<sal_Bool const *>(aValue.getValue());
-                    aFtnInfo.ePos = bVal ? FTNPOS_CHAPTER : FTNPOS_PAGE;
+                    aFootnoteInfo.ePos = bVal ? FTNPOS_CHAPTER : FTNPOS_PAGE;
                 }
                 break;
                 case WID_END_NOTICE:
                 {
                     OUString uTmp;
                     aValue >>= uTmp;
-                    aFtnInfo.aQuoVadis = uTmp;
+                    aFootnoteInfo.aQuoVadis = uTmp;
                 }
                 break;
                 case WID_BEGIN_NOTICE:
                 {
                     OUString uTmp;
                     aValue >>= uTmp;
-                    aFtnInfo.aErgoSum = uTmp;
+                    aFootnoteInfo.aErgoSum = uTmp;
                 }
                 break;
             }
-            pDoc->SetFtnInfo(aFtnInfo);
+            pDoc->SetFootnoteInfo(aFootnoteInfo);
         }
         else
             throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -425,31 +425,31 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
         const SfxItemPropertySimpleEntry*  pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName );
         if(pEntry)
         {
-            const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo();
+            const SwFootnoteInfo& rFootnoteInfo = pDoc->GetFootnoteInfo();
             switch(pEntry->nWID)
             {
                 case WID_PREFIX:
                 {
-                    aRet <<= rFtnInfo.GetPrefix();
+                    aRet <<= rFootnoteInfo.GetPrefix();
                 }
                 break;
                 case WID_SUFFIX:
                 {
-                    aRet <<= rFtnInfo.GetSuffix();
+                    aRet <<= rFootnoteInfo.GetSuffix();
                 }
                 break;
                 case  WID_NUMBERING_TYPE :
                 {
-                    aRet <<= rFtnInfo.aFmt.GetNumberingType();
+                    aRet <<= rFootnoteInfo.aFormat.GetNumberingType();
                 }
                 break;
                 case  WID_START_AT:
-                    aRet <<= (sal_Int16)rFtnInfo.nFtnOffset;
+                    aRet <<= (sal_Int16)rFootnoteInfo.nFootnoteOffset;
                 break;
                 case  WID_FOOTNOTE_COUNTING  :
                 {
                     sal_Int16 nRet = 0;
-                    switch(rFtnInfo.eNum)
+                    switch(rFootnoteInfo.eNum)
                     {
                         case  FTNNUM_PAGE:
                             nRet = FootnoteNumbering::PER_PAGE;
@@ -466,7 +466,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
                 break;
                 case  WID_PARAGRAPH_STYLE    :
                 {
-                    SwTxtFmtColl* pColl = rFtnInfo.GetFtnTxtColl();
+                    SwTextFormatColl* pColl = rFootnoteInfo.GetFootnoteTextColl();
                     OUString aString;
                     if(pColl)
                         aString = pColl->GetName();
@@ -477,10 +477,10 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
                 case  WID_PAGE_STYLE :
                 {
                     OUString aString;
-                    if( rFtnInfo.KnowsPageDesc() )
+                    if( rFootnoteInfo.KnowsPageDesc() )
                     {
                         SwStyleNameMapper::FillProgName(
-                                rFtnInfo.GetPageDesc( *pDoc )->GetName(),
+                                rFootnoteInfo.GetPageDesc( *pDoc )->GetName(),
                                 aString,
                                 nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC,
                                 true);
@@ -492,21 +492,21 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
                 case WID_CHARACTER_STYLE:
                 {
                     OUString aString;
-                    const SwCharFmt* pCharFmt = 0;
+                    const SwCharFormat* pCharFormat = 0;
                     if( pEntry->nWID == WID_ANCHOR_CHARACTER_STYLE )
                     {
-                        if( rFtnInfo.GetAnchorCharFmtDep()->GetRegisteredIn() )
-                            pCharFmt = rFtnInfo.GetAnchorCharFmt(*pDoc);
+                        if( rFootnoteInfo.GetAnchorCharFormatDep()->GetRegisteredIn() )
+                            pCharFormat = rFootnoteInfo.GetAnchorCharFormat(*pDoc);
                     }
                     else
                     {
-                        if( rFtnInfo.GetCharFmtDep()->GetRegisteredIn() )
-                            pCharFmt = rFtnInfo.GetCharFmt(*pDoc);
+                        if( rFootnoteInfo.GetCharFormatDep()->GetRegisteredIn() )
+                            pCharFormat = rFootnoteInfo.GetCharFormat(*pDoc);
                     }
-                    if( pCharFmt )
+                    if( pCharFormat )
                     {
                         SwStyleNameMapper::FillProgName(
-                                pCharFmt->GetName(),
+                                pCharFormat->GetName(),
                                 aString,
                                 nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
                                 true);
@@ -515,13 +515,13 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
                 }
                 break;
                 case  WID_POSITION_END_OF_DOC:
-                    aRet <<= FTNPOS_CHAPTER == rFtnInfo.ePos;
+                    aRet <<= FTNPOS_CHAPTER == rFootnoteInfo.ePos;
                 break;
                 case  WID_END_NOTICE         :
-                    aRet <<= rFtnInfo.aQuoVadis;
+                    aRet <<= rFootnoteInfo.aQuoVadis;
                 break;
                 case  WID_BEGIN_NOTICE       :
-                    aRet <<= rFtnInfo.aErgoSum;
+                    aRet <<= rFootnoteInfo.aErgoSum;
                 break;
             }
         }
@@ -628,21 +628,21 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const
                 {
                     sal_Int16 nTmp = 0;
                     aValue >>= nTmp;
-                    aEndInfo.aFmt.SetNumberingType(nTmp);
+                    aEndInfo.aFormat.SetNumberingType(nTmp);
                 }
                 break;
                 case  WID_START_AT:
                 {
                     sal_Int16 nTmp = 0;
                     aValue >>= nTmp;
-                    aEndInfo.nFtnOffset = nTmp;
+                    aEndInfo.nFootnoteOffset = nTmp;
                 }
                 break;
                 case  WID_PARAGRAPH_STYLE    :
                 {
-                    SwTxtFmtColl* pColl = lcl_GetParaStyle(pDoc, aValue);
+                    SwTextFormatColl* pColl = lcl_GetParaStyle(pDoc, aValue);
                     if(pColl)
-                        aEndInfo.SetFtnTxtColl(*pColl);
+                        aEndInfo.SetFootnoteTextColl(*pColl);
                 }
                 break;
                 case  WID_PAGE_STYLE :
@@ -655,13 +655,13 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const
                 case WID_ANCHOR_CHARACTER_STYLE:
                 case  WID_CHARACTER_STYLE    :
                 {
-                    SwCharFmt* pFmt = lcl_getCharFmt(pDoc, aValue);
-                    if(pFmt)
+                    SwCharFormat* pFormat = lcl_getCharFormat(pDoc, aValue);
+                    if(pFormat)
                     {
                         if(pEntry->nWID == WID_ANCHOR_CHARACTER_STYLE)
-                            aEndInfo.SetAnchorCharFmt(pFmt);
+                            aEndInfo.SetAnchorCharFormat(pFormat);
                         else
-                            aEndInfo.SetCharFmt(pFmt);
+                            aEndInfo.SetCharFormat(pFormat);
                     }
                 }
                 break;
@@ -693,14 +693,14 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
                     aRet <<= rEndInfo.GetSuffix();
                 break;
                 case  WID_NUMBERING_TYPE :
-                    aRet <<= rEndInfo.aFmt.GetNumberingType();
+                    aRet <<= rEndInfo.aFormat.GetNumberingType();
                 break;
                 case  WID_START_AT:
-                    aRet <<= (sal_Int16)rEndInfo.nFtnOffset;
+                    aRet <<= (sal_Int16)rEndInfo.nFootnoteOffset;
                 break;
                 case  WID_PARAGRAPH_STYLE    :
                 {
-                    SwTxtFmtColl* pColl = rEndInfo.GetFtnTxtColl();
+                    SwTextFormatColl* pColl = rEndInfo.GetFootnoteTextColl();
                     OUString aString;
                     if(pColl)
                         aString = pColl->GetName();
@@ -731,21 +731,21 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
                 case WID_CHARACTER_STYLE:
                 {
                     OUString aString;
-                    const SwCharFmt* pCharFmt = 0;
+                    const SwCharFormat* pCharFormat = 0;
                     if( pEntry->nWID == WID_ANCHOR_CHARACTER_STYLE )
                     {
-                        if( rEndInfo.GetAnchorCharFmtDep()->GetRegisteredIn() )
-                            pCharFmt = rEndInfo.GetAnchorCharFmt(*pDoc);
+                        if( rEndInfo.GetAnchorCharFormatDep()->GetRegisteredIn() )
+                            pCharFormat = rEndInfo.GetAnchorCharFormat(*pDoc);
                     }
                     else
                     {
-                        if( rEndInfo.GetCharFmtDep()->GetRegisteredIn() )
-                            pCharFmt = rEndInfo.GetCharFmt(*pDoc);
+                        if( rEndInfo.GetCharFormatDep()->GetRegisteredIn() )
+                            pCharFormat = rEndInfo.GetCharFormat(*pDoc);
                     }
-                    if( pCharFmt )
+                    if( pCharFormat )
                     {
                         SwStyleNameMapper::FillProgName(
-                                pCharFmt->GetName(),
+                                pCharFormat->GetName(),
                                 aString,
                                 nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
                                 true );
@@ -845,9 +845,9 @@ void SwXLineNumberingProperties::setPropertyValue(
                 break;
                 case WID_CHARACTER_STYLE :
                 {
-                    SwCharFmt* pFmt = lcl_getCharFmt(pDoc, aValue);
-                    if(pFmt)
-                        aInfo.SetCharFmt(pFmt);
+                    SwCharFormat* pFormat = lcl_getCharFormat(pDoc, aValue);
+                    if(pFormat)
+                        aInfo.SetCharFormat(pFormat);
                 }
                 break;
                 case WID_NUMBERING_TYPE  :
@@ -965,7 +965,7 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName)
                     if(rInfo.HasCharFormat())
                     {
                         SwStyleNameMapper::FillProgName(
-                                    rInfo.GetCharFmt(pDoc->getIDocumentStylePoolAccess())->GetName(),
+                                    rInfo.GetCharFormat(pDoc->getIDocumentStylePoolAccess())->GetName(),
                                     aString,
                                     nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
                                     true);
@@ -1112,11 +1112,11 @@ SwXNumberingRules::SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc) :
     // if no format is set, it should work as well
     for( sal_uInt16 i = 0; i < MAXLEVEL; ++i)
     {
-        SwNumFmt rFmt(pNumRule->Get(i));
-        SwCharFmt* pCharFmt = rFmt.GetCharFmt();
-        if(pCharFmt)
+        SwNumFormat rFormat(pNumRule->Get(i));
+        SwCharFormat* pCharFormat = rFormat.GetCharFormat();
+        if(pCharFormat)
         {
-            pDoc = pCharFmt->GetDoc();
+            pDoc = pCharFormat->GetDoc();
             break;
         }
     }
@@ -1191,37 +1191,37 @@ void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElemen
         SwXNumberingRules::SetNumberingRuleByIndex( aNumRule,
                             rProperties, nIndex);
         // set character format if needed
-        const SwCharFmts* pFmts = pDocShell->GetDoc()->GetCharFmts();
-        const size_t nChCount = pFmts->size();
+        const SwCharFormats* pFormats = pDocShell->GetDoc()->GetCharFormats();
+        const size_t nChCount = pFormats->size();
         for(sal_uInt16 i = 0; i < MAXLEVEL;i++)
         {
-            SwNumFmt aFmt(aNumRule.Get( i ));
+            SwNumFormat aFormat(aNumRule.Get( i ));
             if (!m_sNewCharStyleNames[i].isEmpty() &&
                 m_sNewCharStyleNames[i] != UNO_NAME_CHARACTER_FORMAT_NONE &&
-                (!aFmt.GetCharFmt() || aFmt.GetCharFmt()->GetName()!= m_sNewCharStyleNames[i]))
+                (!aFormat.GetCharFormat() || aFormat.GetCharFormat()->GetName()!= m_sNewCharStyleNames[i]))
             {
-                SwCharFmt* pCharFmt = 0;
+                SwCharFormat* pCharFormat = 0;
                 for(size_t j = 0; j< nChCount; ++j)
                 {
-                    SwCharFmt* pTmp = (*pFmts)[j];
+                    SwCharFormat* pTmp = (*pFormats)[j];
                     if(pTmp->GetName() == m_sNewCharStyleNames[i])
                     {
-                        pCharFmt = pTmp;
+                        pCharFormat = pTmp;
                         break;
                     }
                 }
-                if(!pCharFmt)
+                if(!pCharFormat)
                 {
                     SfxStyleSheetBase* pBase;
                     pBase = pDocShell->GetStyleSheetPool()->Find(m_sNewCharStyleNames[i],
                                                                     SFX_STYLE_FAMILY_CHAR);
                     if(!pBase)
                         pBase = &pDocShell->GetStyleSheetPool()->Make(m_sNewCharStyleNames[i], SFX_STYLE_FAMILY_CHAR);
-                    pCharFmt = static_cast<SwDocStyleSheet*>(pBase)->GetCharFmt();
+                    pCharFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat();
 
                 }
-                aFmt.SetCharFmt( pCharFmt );
-                aNumRule.Set( i, aFmt );
+                aFormat.SetCharFormat( pCharFormat );
+                aNumRule.Set( i, aFormat );
             }
         }
         pDocShell->GetDoc()->SetOutlineNumRule( aNumRule );
@@ -1290,12 +1290,12 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
     SolarMutexGuard aGuard;
     OSL_ENSURE( 0 <= nIndex && nIndex < MAXLEVEL, "index out of range" );
 
-    const SwNumFmt& rFmt = rNumRule.Get( (sal_uInt16)nIndex );
+    const SwNumFormat& rFormat = rNumRule.Get( (sal_uInt16)nIndex );
 
-    SwCharFmt* pCharFmt = rFmt.GetCharFmt();
+    SwCharFormat* pCharFormat = rFormat.GetCharFormat();
     OUString CharStyleName;
-    if (pCharFmt)
-        CharStyleName = pCharFmt->GetName();
+    if (pCharFormat)
+        CharStyleName = pCharFormat->GetName();
 
     // Whether or not a style is present: the array entry overwrites this string
     if (!m_sNewCharStyleNames[nIndex].isEmpty() &&
@@ -1309,23 +1309,23 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
     {
         // template name
         OUString sValue(SW_RES(STR_POOLCOLL_HEADLINE1 + nIndex));
-        const SwTxtFmtColls* pColls = pDocShell->GetDoc()->GetTxtFmtColls();
+        const SwTextFormatColls* pColls = pDocShell->GetDoc()->GetTextFormatColls();
         const size_t nCount = pColls->size();
         for(size_t i = 0; i < nCount; ++i)
         {
-            SwTxtFmtColl &rTxtColl = *pColls->operator[](i);
-            if(rTxtColl.IsDefault())
+            SwTextFormatColl &rTextColl = *pColls->operator[](i);
+            if(rTextColl.IsDefault())
                 continue;
 
-            const sal_Int16 nOutLevel = rTxtColl.IsAssignedToListLevelOfOutlineStyle()
-                                        ? static_cast<sal_Int16>(rTxtColl.GetAssignedOutlineStyleLevel())
+            const sal_Int16 nOutLevel = rTextColl.IsAssignedToListLevelOfOutlineStyle()
+                                        ? static_cast<sal_Int16>(rTextColl.GetAssignedOutlineStyleLevel())
                                         : MAXLEVEL;
             if ( nOutLevel == nIndex )
             {
-                sValue = rTxtColl.GetName();
+                sValue = rTextColl.GetName();
                 break; // the style for the level in question has been found
             }
-            else if( sValue==rTxtColl.GetName() )
+            else if( sValue==rTextColl.GetName() )
             {
                 // if the default for the level is existing, but its
                 // level is different, then it cannot be the default.
@@ -1335,12 +1335,12 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
         SwStyleNameMapper::FillProgName(sValue, aUString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
     }
 
-    return GetPropertiesForNumFmt(rFmt, CharStyleName, (pDocShell) ? & aUString : 0);
+    return GetPropertiesForNumFormat(rFormat, CharStyleName, (pDocShell) ? & aUString : 0);
 
 }
 
-uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
-        const SwNumFmt& rFmt, OUString const& rCharFormatName,
+uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFormat(
+        const SwNumFormat& rFormat, OUString const& rCharFormatName,
         OUString const*const pHeadingStyleName)
 {
     bool bChapterNum = pHeadingStyleName != 0;
@@ -1350,20 +1350,20 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
     //fill all properties into the array
 
     //adjust
-    SvxAdjust eAdj = rFmt.GetNumAdjust();
+    SvxAdjust eAdj = rFormat.GetNumAdjust();
     sal_Int16 nINT16 = aSvxToUnoAdjust[eAdj];
     aPropertyValues.push_back(comphelper::makePropertyValue("Adjust", nINT16));
 
     //parentnumbering
-    nINT16 = rFmt.GetIncludeUpperLevels();
+    nINT16 = rFormat.GetIncludeUpperLevels();
     aPropertyValues.push_back(comphelper::makePropertyValue("ParentNumbering", nINT16));
 
     //prefix
-    OUString aUString = rFmt.GetPrefix();
+    OUString aUString = rFormat.GetPrefix();
     aPropertyValues.push_back(comphelper::makePropertyValue("Prefix", aUString));
 
     //suffix
-    aUString = rFmt.GetSuffix();
+    aUString = rFormat.GetSuffix();
     aPropertyValues.push_back(comphelper::makePropertyValue("Suffix", aUString));
 
     //char style name
@@ -1374,75 +1374,75 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
     aPropertyValues.push_back(comphelper::makePropertyValue("CharStyleName", aUString));
 
     //startvalue
-    nINT16 = rFmt.GetStart();
+    nINT16 = rFormat.GetStart();
     aPropertyValues.push_back(comphelper::makePropertyValue("StartWith", nINT16));
 
-    if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+    if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
         //leftmargin
-        sal_Int32 nINT32 = convertTwipToMm100(rFmt.GetAbsLSpace());
+        sal_Int32 nINT32 = convertTwipToMm100(rFormat.GetAbsLSpace());
         aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_LEFT_MARGIN, nINT32));
 
         //chartextoffset
-        nINT32 = convertTwipToMm100(rFmt.GetCharTextDistance());
+        nINT32 = convertTwipToMm100(rFormat.GetCharTextDistance());
         aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_SYMBOL_TEXT_DISTANCE, nINT32));
 
         //firstlineoffset
-        nINT32 = convertTwipToMm100(rFmt.GetFirstLineOffset());
+        nINT32 = convertTwipToMm100(rFormat.GetFirstLineOffset());
         aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_FIRST_LINE_OFFSET, nINT32));
     }
 
     // PositionAndSpaceMode
     nINT16 = PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION;
-    if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+    if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
     {
         nINT16 = PositionAndSpaceMode::LABEL_ALIGNMENT;
     }
     aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_POSITION_AND_SPACE_MODE, nINT16));
 
-    if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+    if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
     {
         // LabelFollowedBy
         nINT16 = LabelFollow::LISTTAB;
-        if ( rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE )
+        if ( rFormat.GetLabelFollowedBy() == SvxNumberFormat::SPACE )
         {
             nINT16 = LabelFollow::SPACE;
         }
-        else if ( rFmt.GetLabelFollowedBy() == SvxNumberFormat::NOTHING )
+        else if ( rFormat.GetLabelFollowedBy() == SvxNumberFormat::NOTHING )
         {
             nINT16 = LabelFollow::NOTHING;
         }
         aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_LABEL_FOLLOWED_BY, nINT16));
 
         // ListtabStopPosition
-        sal_Int32 nINT32 = convertTwipToMm100(rFmt.GetListtabPos());
+        sal_Int32 nINT32 = convertTwipToMm100(rFormat.GetListtabPos());
         aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_LISTTAB_STOP_POSITION, nINT32));
 
         // FirstLineIndent
-        nINT32 = convertTwipToMm100(rFmt.GetFirstLineIndent());
+        nINT32 = convertTwipToMm100(rFormat.GetFirstLineIndent());
         aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_FIRST_LINE_INDENT, nINT32));
 
         // IndentAt
-        nINT32 = convertTwipToMm100(rFmt.GetIndentAt());
+        nINT32 = convertTwipToMm100(rFormat.GetIndentAt());
         aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_INDENT_AT, nINT32));
     }
 
     //numberingtype
-    nINT16 = rFmt.GetNumberingType();
+    nINT16 = rFormat.GetNumberingType();
     aPropertyValues.push_back(comphelper::makePropertyValue("NumberingType", nINT16));
 
     if(!bChapterNum)
     {
-        if(SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType())
+        if(SVX_NUM_CHAR_SPECIAL == rFormat.GetNumberingType())
         {
             //BulletId
-            nINT16 = rFmt.GetBulletChar();
+            nINT16 = rFormat.GetBulletChar();
             aPropertyValues.push_back(comphelper::makePropertyValue("BulletId", nINT16));
 
-            const vcl::Font* pFont = rFmt.GetBulletFont();
+            const vcl::Font* pFont = rFormat.GetBulletFont();
 
             //BulletChar
-            aUString = OUString(rFmt.GetBulletChar());
+            aUString = OUString(rFormat.GetBulletChar());
             aPropertyValues.push_back(comphelper::makePropertyValue("BulletChar", aUString));
 
             //BulletFontName
@@ -1457,10 +1457,10 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
                 aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_BULLET_FONT, aDesc));
             }
         }
-        if(SVX_NUM_BITMAP == rFmt.GetNumberingType())
+        if(SVX_NUM_BITMAP == rFormat.GetNumberingType())
         {
             //GraphicURL
-            const SvxBrushItem* pBrush = rFmt.GetBrush();
+            const SvxBrushItem* pBrush = rFormat.GetBrush();
             if(pBrush)
             {
                 Any aAny;
@@ -1480,13 +1480,13 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFmt(
                 uno::Reference<awt::XBitmap> xBmp = VCLUnoHelper::CreateBitmap( pGraphic->GetBitmapEx() );
                 aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_GRAPHIC_BITMAP, xBmp));
             }
-             Size aSize = rFmt.GetGraphicSize();
+             Size aSize = rFormat.GetGraphicSize();
             // #i101131#
             // adjust conversion due to type mismatch between <Size> and <awt::Size>
             awt::Size aAwtSize(convertTwipToMm100(aSize.Width()), convertTwipToMm100(aSize.Height()));
             aPropertyValues.push_back(comphelper::makePropertyValue(UNO_NAME_GRAPHIC_SIZE, aAwtSize));
 
-            const SwFmtVertOrient* pOrient = rFmt.GetGraphicOrientation();
+            const SwFormatVertOrient* pOrient = rFormat.GetGraphicOrientation();
             if(pOrient)
             {
                 uno::Any any;
@@ -1526,12 +1526,12 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
     SolarMutexGuard aGuard;
     OSL_ENSURE( 0 <= nIndex && nIndex < MAXLEVEL, "index out of range" );
 
-    SwNumFmt aFmt(rNumRule.Get( (sal_uInt16)nIndex ));
+    SwNumFormat aFormat(rNumRule.Get( (sal_uInt16)nIndex ));
 
     OUString sHeadingStyleName;
     OUString sParagraphStyleName;
 
-    SetPropertiesToNumFmt(aFmt, m_sNewCharStyleNames[nIndex],
+    SetPropertiesToNumFormat(aFormat, m_sNewCharStyleNames[nIndex],
         &m_sNewBulletFontNames[nIndex],
         &sHeadingStyleName, &sParagraphStyleName,
         pDoc, pDocShell, rProperties);
@@ -1539,44 +1539,44 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
 
     if (pDoc && !sParagraphStyleName.isEmpty())
     {
-        const SwTxtFmtColls* pColls = pDoc->GetTxtFmtColls();
+        const SwTextFormatColls* pColls = pDoc->GetTextFormatColls();
         const size_t nCount = pColls->size();
         for (size_t k = 0; k < nCount; ++k)
         {
-            SwTxtFmtColl &rTxtColl = *((*pColls)[k]);
-            if (rTxtColl.GetName() == sParagraphStyleName)
-                rTxtColl.SetFmtAttr( SwNumRuleItem( rNumRule.GetName()));
+            SwTextFormatColl &rTextColl = *((*pColls)[k]);
+            if (rTextColl.GetName() == sParagraphStyleName)
+                rTextColl.SetFormatAttr( SwNumRuleItem( rNumRule.GetName()));
         }
     }
 
     if (!sHeadingStyleName.isEmpty())
     {
         assert(pDocShell);
-        const SwTxtFmtColls* pColls = pDocShell->GetDoc()->GetTxtFmtColls();
+        const SwTextFormatColls* pColls = pDocShell->GetDoc()->GetTextFormatColls();
         const size_t nCount = pColls->size();
         for (size_t k = 0; k < nCount; ++k)
         {
-            SwTxtFmtColl &rTxtColl = *((*pColls)[k]);
-            if (rTxtColl.IsDefault())
+            SwTextFormatColl &rTextColl = *((*pColls)[k]);
+            if (rTextColl.IsDefault())
                 continue;
-            if (rTxtColl.IsAssignedToListLevelOfOutlineStyle() &&
-                rTxtColl.GetAssignedOutlineStyleLevel() == nIndex &&
-                rTxtColl.GetName() != sHeadingStyleName)
+            if (rTextColl.IsAssignedToListLevelOfOutlineStyle() &&
+                rTextColl.GetAssignedOutlineStyleLevel() == nIndex &&
+                rTextColl.GetName() != sHeadingStyleName)
             {
-                rTxtColl.DeleteAssignmentToListLevelOfOutlineStyle();
+                rTextColl.DeleteAssignmentToListLevelOfOutlineStyle();
             }
-            else if (rTxtColl.GetName() == sHeadingStyleName)
+            else if (rTextColl.GetName() == sHeadingStyleName)
             {
-                rTxtColl.AssignToListLevelOfOutlineStyle( nIndex );
+                rTextColl.AssignToListLevelOfOutlineStyle( nIndex );
             }
         }
     }
 
-    rNumRule.Set(static_cast<sal_uInt16>(nIndex), aFmt);
+    rNumRule.Set(static_cast<sal_uInt16>(nIndex), aFormat);
 }
 
-void SwXNumberingRules::SetPropertiesToNumFmt(
-        SwNumFmt & aFmt,
+void SwXNumberingRules::SetPropertiesToNumFormat(
+        SwNumFormat & aFormat,
         OUString & rCharStyleName, OUString *const pBulletFontName,
         OUString *const pHeadingStyleName,
         OUString *const pParagraphStyleName,
@@ -1657,7 +1657,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
        {
         SvxBrushItem* pSetBrush = 0;
         Size* pSetSize = 0;
-        SwFmtVertOrient* pSetVOrient = 0;
+        SwFormatVertOrient* pSetVOrient = 0;
         bool bCharStyleNameSet = false;
 
         for(size_t i = 0; i < SAL_N_ELEMENTS( aNumPropertyNames ) && !bExcept && !bWrongArg; ++i)
@@ -1676,7 +1676,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                         nValue <= text::HoriOrientation::LEFT &&
                             USHRT_MAX != aUnoToSvxAdjust[nValue])
                     {
-                        aFmt.SetNumAdjust((SvxAdjust)aUnoToSvxAdjust[nValue]);
+                        aFormat.SetNumAdjust((SvxAdjust)aUnoToSvxAdjust[nValue]);
                     }
                     else
                         bWrongArg = true;
@@ -1687,21 +1687,21 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     sal_Int16 nSet = 0;
                     pProp->Value >>= nSet;
                     if(nSet >= 0 && MAXLEVEL >= nSet)
-                        aFmt.SetIncludeUpperLevels( static_cast< sal_uInt8 >(nSet) );
+                        aFormat.SetIncludeUpperLevels( static_cast< sal_uInt8 >(nSet) );
                 }
                 break;
                 case 2: //"Prefix",
                 {
                     OUString uTmp;
                     pProp->Value >>= uTmp;
-                    aFmt.SetPrefix(uTmp);
+                    aFormat.SetPrefix(uTmp);
                 }
                 break;
                 case 3: //"Suffix",
                 {
                     OUString uTmp;
                     pProp->Value >>= uTmp;
-                    aFmt.SetSuffix(uTmp);
+                    aFormat.SetSuffix(uTmp);
                 }
                 break;
                 case 4: //"CharStyleName",
@@ -1709,57 +1709,57 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     bCharStyleNameSet = true;
                     OUString uTmp;
                     pProp->Value >>= uTmp;
-                    OUString sCharFmtName;
-                    SwStyleNameMapper::FillUIName( uTmp, sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
-                    if (sCharFmtName == UNO_NAME_CHARACTER_FORMAT_NONE)
+                    OUString sCharFormatName;
+                    SwStyleNameMapper::FillUIName( uTmp, sCharFormatName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
+                    if (sCharFormatName == UNO_NAME_CHARACTER_FORMAT_NONE)
                     {
                         rCharStyleName = aInvalidStyle;
-                        aFmt.SetCharFmt(0);
+                        aFormat.SetCharFormat(0);
                     }
                     else if(pDocShell || pDoc)
                     {
                         SwDoc* pLocalDoc = pDoc ? pDoc : pDocShell->GetDoc();
-                        const SwCharFmts* pFmts = pLocalDoc->GetCharFmts();
-                        const size_t nChCount = pFmts->size();
+                        const SwCharFormats* pFormats = pLocalDoc->GetCharFormats();
+                        const size_t nChCount = pFormats->size();
 
-                        SwCharFmt* pCharFmt = 0;
-                        if (!sCharFmtName.isEmpty())
+                        SwCharFormat* pCharFormat = 0;
+                        if (!sCharFormatName.isEmpty())
                         {
                             for(size_t j = 0; j< nChCount; ++j)
                             {
-                                SwCharFmt* pTmp = (*pFmts)[j];
-                                if(pTmp->GetName() == sCharFmtName)
+                                SwCharFormat* pTmp = (*pFormats)[j];
+                                if(pTmp->GetName() == sCharFormatName)
                                 {
-                                    pCharFmt = pTmp;
+                                    pCharFormat = pTmp;
                                     break;
                                 }
                             }
-                            if(!pCharFmt)
+                            if(!pCharFormat)
                             {
 
                                 SfxStyleSheetBase* pBase;
                                 SfxStyleSheetBasePool* pPool = pLocalDoc->GetDocShell()->GetStyleSheetPool();
-                                pBase = static_cast<SfxStyleSheetBasePool*>(pPool)->Find(sCharFmtName, SFX_STYLE_FAMILY_CHAR);
+                                pBase = static_cast<SfxStyleSheetBasePool*>(pPool)->Find(sCharFormatName, SFX_STYLE_FAMILY_CHAR);
                                 if(!pBase)
-                                    pBase = &pPool->Make(sCharFmtName, SFX_STYLE_FAMILY_CHAR);
-                                pCharFmt = static_cast<SwDocStyleSheet*>(pBase)->GetCharFmt();
+                                    pBase = &pPool->Make(sCharFormatName, SFX_STYLE_FAMILY_CHAR);
+                                pCharFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat();
                             }
                         }
-                        aFmt.SetCharFmt( pCharFmt );
+                        aFormat.SetCharFormat( pCharFormat );
                         // #i51842#
                         // If the character format has been found its name should not be in the
                         // char style names array
                         rCharStyleName.clear();
                      }
                     else
-                        rCharStyleName = sCharFmtName;
+                        rCharStyleName = sCharFormatName;
                 }
                 break;
                 case 5: //"StartWith",
                 {
                     sal_Int16 nVal = 0;
                     pProp->Value >>= nVal;
-                    aFmt.SetStart(nVal);
+                    aFormat.SetStart(nVal);
                 }
                 break;
                 case 6: //UNO_NAME_LEFT_MARGIN,
@@ -1767,7 +1767,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     sal_Int32 nValue = 0;
                     pProp->Value >>= nValue;
                     // #i23727# nValue can be negative
-                    aFmt.SetAbsLSpace((short) convertMm100ToTwip(nValue));
+                    aFormat.SetAbsLSpace((short) convertMm100ToTwip(nValue));
                 }
                 break;
                 case 7: //UNO_NAME_SYMBOL_TEXT_DISTANCE,
@@ -1775,7 +1775,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     sal_Int32 nValue = 0;
                     pProp->Value >>= nValue;
                     if(nValue >= 0)
-                        aFmt.SetCharTextDistance((short) convertMm100ToTwip(nValue));
+                        aFormat.SetCharTextDistance((short) convertMm100ToTwip(nValue));
                     else
                         bWrongArg = true;
                 }
@@ -1786,7 +1786,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     pProp->Value >>= nValue;
                     // #i23727# nValue can be positive
                     nValue = convertMm100ToTwip(nValue);
-                    aFmt.SetFirstLineOffset((short)nValue);
+                    aFormat.SetFirstLineOffset((short)nValue);
                 }
                 break;
                 case 9: // UNO_NAME_POSITION_AND_SPACE_MODE
@@ -1795,11 +1795,11 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     pProp->Value >>= nValue;
                     if ( nValue == 0 )
                     {
-                        aFmt.SetPositionAndSpaceMode( SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
+                        aFormat.SetPositionAndSpaceMode( SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
                     }
                     else if ( nValue == 1 )
                     {
-                        aFmt.SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
+                        aFormat.SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
                     }
                     else
                     {
@@ -1813,15 +1813,15 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     pProp->Value >>= nValue;
                     if ( nValue == 0 )
                     {
-                        aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+                        aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
                     }
                     else if ( nValue == 1 )
                     {
-                        aFmt.SetLabelFollowedBy( SvxNumberFormat::SPACE );
+                        aFormat.SetLabelFollowedBy( SvxNumberFormat::SPACE );
                     }
                     else if ( nValue == 2 )
                     {
-                        aFmt.SetLabelFollowedBy( SvxNumberFormat::NOTHING );
+                        aFormat.SetLabelFollowedBy( SvxNumberFormat::NOTHING );
                     }
                     else
                     {
@@ -1836,7 +1836,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     nValue = convertMm100ToTwip(nValue);
                     if ( nValue >= 0 )
                     {
-                        aFmt.SetListtabPos( nValue );
+                        aFormat.SetListtabPos( nValue );
                     }
                     else
                     {
@@ -1849,7 +1849,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     sal_Int32 nValue = 0;
                     pProp->Value >>= nValue;
                     nValue = convertMm100ToTwip(nValue);
-                    aFmt.SetFirstLineIndent( nValue );
+                    aFormat.SetFirstLineIndent( nValue );
                 }
                 break;
                 case 13: // UNO_NAME_INDENT_AT
@@ -1857,7 +1857,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     sal_Int32 nValue = 0;
                     pProp->Value >>= nValue;
                     nValue = convertMm100ToTwip(nValue);
-                    aFmt.SetIndentAt( nValue );
+                    aFormat.SetIndentAt( nValue );
                 }
                 break;
                 case 14: //"NumberingType"
@@ -1865,7 +1865,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     sal_Int16 nSet = 0;
                     pProp->Value >>= nSet;
                     if(nSet >= 0)
-                        aFmt.SetNumberingType(nSet);
+                        aFormat.SetNumberingType(nSet);
                     else
                         bWrongArg = true;
                 }
@@ -1887,7 +1887,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     assert( !pDocShell );
                     sal_Int16 nSet = 0;
                     if( pProp->Value >>= nSet )
-                        aFmt.SetBulletChar(nSet);
+                        aFormat.SetBulletChar(nSet);
                     else
                         bWrongArg = true;
                 }
@@ -1904,7 +1904,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                         {
                             vcl::Font aFont;
                             SvxUnoFontDescriptor::ConvertToFont(desc, aFont);
-                            aFmt.SetBulletFont(&aFont);
+                            aFormat.SetBulletFont(&aFont);
                         }
                     }
                     else
@@ -1926,7 +1926,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                         vcl::FontInfo aInfo = pList->Get(
                             sBulletFontName, WEIGHT_NORMAL, ITALIC_NONE);
                         vcl::Font aFont(aInfo);
-                        aFmt.SetBulletFont(&aFont);
+                        aFormat.SetBulletFont(&aFont);
                     }
                     else if (pBulletFontName)
                         *pBulletFontName = sBulletFontName;
@@ -1939,12 +1939,12 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     pProp->Value >>= aChar;
                     if(aChar.getLength() == 1)
                     {
-                        aFmt.SetBulletChar(aChar.toChar());
+                        aFormat.SetBulletChar(aChar.toChar());
                     }
                     else if(aChar.isEmpty())
                     {
                         // If w:lvlText's value is null - set bullet char to zero
-                        aFmt.SetBulletChar(sal_Unicode(0x0));
+                        aFormat.SetBulletChar(sal_Unicode(0x0));
                     }
                     else
                     {
@@ -1959,7 +1959,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     pProp->Value >>= sBrushURL;
                     if(!pSetBrush)
                     {
-                        const SvxBrushItem* pOrigBrush = aFmt.GetBrush();
+                        const SvxBrushItem* pOrigBrush = aFormat.GetBrush();
                         if(pOrigBrush)
                         {
                             pSetBrush = new SvxBrushItem(*pOrigBrush);
@@ -1978,7 +1978,7 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     {
                         if(!pSetBrush)
                         {
-                            const SvxBrushItem* pOrigBrush = aFmt.GetBrush();
+                            const SvxBrushItem* pOrigBrush = aFormat.GetBrush();
                             if(pOrigBrush)
                             {
                                 pSetBrush = new SvxBrushItem(*pOrigBrush);
@@ -2017,10 +2017,10 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                     assert( !pDocShell );
                     if(!pSetVOrient)
                     {
-                        if(aFmt.GetGraphicOrientation())
-                            pSetVOrient = static_cast<SwFmtVertOrient*>(aFmt.GetGraphicOrientation()->Clone());
+                        if(aFormat.GetGraphicOrientation())
+                            pSetVOrient = static_cast<SwFormatVertOrient*>(aFormat.GetGraphicOrientation()->Clone());
                         else
-                            pSetVOrient = new SwFmtVertOrient;
+                            pSetVOrient = new SwFormatVertOrient;
                     }
                     pSetVOrient->PutValue(pProp->Value, MID_VERTORIENT_ORIENT);
                 }
@@ -2045,17 +2045,17 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
         }
         if(!bExcept && !bWrongArg && (pSetBrush || pSetSize || pSetVOrient))
         {
-            if(!pSetBrush && aFmt.GetBrush())
-                pSetBrush = new SvxBrushItem(*aFmt.GetBrush());
+            if(!pSetBrush && aFormat.GetBrush())
+                pSetBrush = new SvxBrushItem(*aFormat.GetBrush());
 
             if(pSetBrush)
             {
-                if(!pSetVOrient && aFmt.GetGraphicOrientation())
-                    pSetVOrient = new SwFmtVertOrient(*aFmt.GetGraphicOrientation());
+                if(!pSetVOrient && aFormat.GetGraphicOrientation())
+                    pSetVOrient = new SwFormatVertOrient(*aFormat.GetGraphicOrientation());
 
                 if(!pSetSize)
                 {
-                    pSetSize = new Size(aFmt.GetGraphicSize());
+                    pSetSize = new Size(aFormat.GetGraphicSize());
                     if(!pSetSize->Width() || !pSetSize->Height())
                     {
                         const Graphic* pGraphic = pSetBrush->GetGraphic();
@@ -2065,12 +2065,12 @@ void SwXNumberingRules::SetPropertiesToNumFmt(
                 }
                 sal_Int16 eOrient = pSetVOrient ?
                     (sal_Int16)pSetVOrient->GetVertOrient() : text::VertOrientation::NONE;
-                aFmt.SetGraphicBrush( pSetBrush, pSetSize, text::VertOrientation::NONE == eOrient ? 0 : &eOrient );
+                aFormat.SetGraphicBrush( pSetBrush, pSetSize, text::VertOrientation::NONE == eOrient ? 0 : &eOrient );
             }
         }
         if ((!bCharStyleNameSet || rCharStyleName.isEmpty())
-            && aFmt.GetNumberingType() == NumberingType::BITMAP
-            && !aFmt.GetCharFmt()
+            && aFormat.GetNumberingType() == NumberingType::BITMAP
+            && !aFormat.GetCharFormat()
             && !SwXNumberingRules::isInvalidStyle(rCharStyleName))
         {
             OUString tmp;
@@ -2330,20 +2330,20 @@ SwXTextColumns::SwXTextColumns(sal_uInt16 nColCount) :
         setColumnCount(nColCount);
 }
 
-SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) :
+SwXTextColumns::SwXTextColumns(const SwFormatCol& rFormatCol) :
     nReference(0),
-    aTextColumns(rFmtCol.GetNumCols()),
-    bIsAutomaticWidth(rFmtCol.IsOrtho()),
+    aTextColumns(rFormatCol.GetNumCols()),
+    bIsAutomaticWidth(rFormatCol.IsOrtho()),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_COLUMS))
 {
-    const sal_uInt16 nItemGutterWidth = rFmtCol.GetGutterWidth();
+    const sal_uInt16 nItemGutterWidth = rFormatCol.GetGutterWidth();
     nAutoDistance = bIsAutomaticWidth ?
                         USHRT_MAX == nItemGutterWidth ? DEF_GUTTER_WIDTH : (sal_Int32)nItemGutterWidth
                         : 0;
     nAutoDistance = convertTwipToMm100(nAutoDistance);
 
     TextColumn* pColumns = aTextColumns.getArray();
-    const SwColumns& rCols = rFmtCol.GetColumns();
+    const SwColumns& rCols = rFormatCol.GetColumns();
     for(sal_Int32 i = 0; i < aTextColumns.getLength(); ++i)
     {
         const SwColumn* pCol = &rCols[i];
@@ -2356,12 +2356,12 @@ SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) :
     if(!aTextColumns.getLength())
         nReference = USHRT_MAX;
 
-    nSepLineWidth = rFmtCol.GetLineWidth();
-    nSepLineColor = rFmtCol.GetLineColor().GetColor();
-    nSepLineHeightRelative = rFmtCol.GetLineHeight();
-    bSepLineIsOn = rFmtCol.GetLineAdj() != COLADJ_NONE;
+    nSepLineWidth = rFormatCol.GetLineWidth();
+    nSepLineColor = rFormatCol.GetLineColor().GetColor();
+    nSepLineHeightRelative = rFormatCol.GetLineHeight();
+    bSepLineIsOn = rFormatCol.GetLineAdj() != COLADJ_NONE;
     sal_Int8 nStyle = API_COL_LINE_NONE;
-    switch (rFmtCol.GetLineStyle())
+    switch (rFormatCol.GetLineStyle())
     {
         case table::BorderLineStyle::SOLID: nStyle = API_COL_LINE_SOLID; break;
         case table::BorderLineStyle::DOTTED: nStyle= API_COL_LINE_DOTTED; break;
@@ -2369,7 +2369,7 @@ SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) :
         default: break;
     }
     nSepLineStyle = nStyle;
-    switch(rFmtCol.GetLineAdj())
+    switch(rFormatCol.GetLineAdj())
     {
         case COLADJ_TOP:    nSepLineVertAlign = style::VerticalAlignment_TOP;   break;
         case COLADJ_BOTTOM: nSepLineVertAlign = style::VerticalAlignment_BOTTOM;    break;
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 7f19bf2eddf0..adc767a484cb 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -143,7 +143,7 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, bool bIsValueSearch)
     *pWeightItem  = 0,
     *pULineItem  = 0,
     *pOLineItem  = 0,
-    *pCharFmtItem  = 0,
+    *pCharFormatItem  = 0,
     *pShadItem  = 0,
     *pPostItem  = 0,
     *pNHyphItem  = 0,
@@ -269,9 +269,9 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, bool bIsValueSearch)
                     pTempItem = pShadItem;
                 break;
                 case  RES_TXTATR_CHARFMT:
-                    if(!pCharFmtItem)
-                        pCharFmtItem = rSet.GetPool()->GetDefaultItem(aIt->nWID).Clone();
-                    pTempItem = pCharFmtItem;
+                    if(!pCharFormatItem)
+                        pCharFormatItem = rSet.GetPool()->GetDefaultItem(aIt->nWID).Clone();
+                    pTempItem = pCharFormatItem;
                 break;
                 case  RES_CHRATR_UNDERLINE:
                     if(!pULineItem)
@@ -447,7 +447,7 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, bool bIsValueSearch)
     delete pWeightItem;
     delete pULineItem;
     delete pOLineItem;
-    delete pCharFmtItem  ;
+    delete pCharFormatItem  ;
     delete pShadItem;
     delete pPostItem;
     delete pNHyphItem;
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 8080292470e3..5a25218b2ab8 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -360,8 +360,8 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL,
         }
 
         SwgReaderOption aOpt;
-        aOpt.SetFrmFmts( bLoadStyleFrame );
-        aOpt.SetTxtFmts( bLoadStyleText );
+        aOpt.SetFrameFormats( bLoadStyleFrame );
+        aOpt.SetTextFormats( bLoadStyleText );
         aOpt.SetPageDescs( bLoadStylePage );
         aOpt.SetNumRules( bLoadStyleNumbering );
         aOpt.SetMerge( !bLoadStyleOverwrite );
@@ -449,22 +449,22 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
                                      RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN  +
                                      RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN;
             nIndex = nIndex - nBaseCount;
-            const size_t nArrLen = rDoc.GetCharFmts()->size();
+            const size_t nArrLen = rDoc.GetCharFormats()->size();
             for( size_t i = 0; i < nArrLen; ++i )
             {
-                SwCharFmt* pFmt = (*rDoc.GetCharFmts())[ i ];
-                if( pFmt->IsDefault() && pFmt != rDoc.GetDfltCharFmt() )
+                SwCharFormat* pFormat = (*rDoc.GetCharFormats())[ i ];
+                if( pFormat->IsDefault() && pFormat != rDoc.GetDfltCharFormat() )
                     continue;
-                if ( IsPoolUserFmt ( pFmt->GetPoolFmtId() ) )
+                if ( IsPoolUserFormat ( pFormat->GetPoolFormatId() ) )
                 {
                     if ( nIndex == nCount )
                     {
                         // the default character format needs to be set to "Default!"
-                        if(rDoc.GetDfltCharFmt() == pFmt)
+                        if(rDoc.GetDfltCharFormat() == pFormat)
                             SwStyleNameMapper::FillUIName(
                                 RES_POOLCOLL_STANDARD, *pString );
                         else
-                            *pString = pFmt->GetName();
+                            *pString = pFormat->GetName();
                         break;
                     }
                     nCount++;
@@ -483,13 +483,13 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
                                     RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN +
                                     RES_POOLCOLL_TEXT_END  - RES_POOLCOLL_TEXT_BEGIN;
             nIndex = nIndex - nBaseCount;
-            const size_t nArrLen = rDoc.GetTxtFmtColls()->size();
+            const size_t nArrLen = rDoc.GetTextFormatColls()->size();
             for ( size_t i = 0; i < nArrLen; ++i )
             {
-                SwTxtFmtColl * pColl = (*rDoc.GetTxtFmtColls())[i];
+                SwTextFormatColl * pColl = (*rDoc.GetTextFormatColls())[i];
                 if ( pColl->IsDefault() )
                     continue;
-                if ( IsPoolUserFmt ( pColl->GetPoolFmtId() ) )
+                if ( IsPoolUserFormat ( pColl->GetPoolFormatId() ) )
                 {
                     if ( nIndex == nCount )
                     {
@@ -506,17 +506,17 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
         {
             const sal_Int32 nBaseCount = RES_POOLFRM_END - RES_POOLFRM_BEGIN;
             nIndex = nIndex - nBaseCount;
-            const size_t nArrLen = rDoc.GetFrmFmts()->size();
+            const size_t nArrLen = rDoc.GetFrameFormats()->size();
             for( size_t i = 0; i < nArrLen; ++i )
             {
-                const SwFrmFmt* pFmt = (*rDoc.GetFrmFmts())[ i ];
-                if(pFmt->IsDefault() || pFmt->IsAuto())
+                const SwFrameFormat* pFormat = (*rDoc.GetFrameFormats())[ i ];
+                if(pFormat->IsDefault() || pFormat->IsAuto())
                     continue;
-                if ( IsPoolUserFmt ( pFmt->GetPoolFmtId() ) )
+                if ( IsPoolUserFormat ( pFormat->GetPoolFormatId() ) )
                 {
                     if ( nIndex == nCount )
                     {
-                        *pString = pFmt->GetName();
+                        *pString = pFormat->GetName();
                         break;
                     }
                     nCount++;
@@ -534,7 +534,7 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
             {
                 const SwPageDesc& rDesc = rDoc.GetPageDesc(i);
 
-                if ( IsPoolUserFmt ( rDesc.GetPoolFmtId() ) )
+                if ( IsPoolUserFormat ( rDesc.GetPoolFormatId() ) )
                 {
                     if ( nIndex == nCount )
                     {
@@ -551,13 +551,13 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
         {
             const sal_Int32 nBaseCount = RES_POOLNUMRULE_END - RES_POOLNUMRULE_BEGIN;
             nIndex = nIndex - nBaseCount;
-            const SwNumRuleTbl& rNumTbl = rDoc.GetNumRuleTbl();
-            for(size_t i = 0; i < rNumTbl.size(); ++i)
+            const SwNumRuleTable& rNumTable = rDoc.GetNumRuleTable();
+            for(size_t i = 0; i < rNumTable.size(); ++i)
             {
-                const SwNumRule& rRule = *rNumTbl[ i ];
+                const SwNumRule& rRule = *rNumTable[ i ];
                 if( rRule.IsAutoRule() )
                     continue;
-                if ( IsPoolUserFmt ( rRule.GetPoolFmtId() ) )
+                if ( IsPoolUserFormat ( rRule.GetPoolFormatId() ) )
                 {
                     if ( nIndex == nCount )
                     {
@@ -1854,47 +1854,47 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                     const OUString* pBulletFontNames = pSwXRules->GetBulletFontNames();
 
                     SwNumRule aSetRule(*pSwXRules->GetNumRule());
-                    const SwCharFmts* pFmts = pDoc->GetCharFmts();
-                    const size_t nChCount = pFmts->size();
+                    const SwCharFormats* pFormats = pDoc->GetCharFormats();
+                    const size_t nChCount = pFormats->size();
                     for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
                     {
 
-                        const SwNumFmt* pFmt = aSetRule.GetNumFmt( i );
-                        if(pFmt)
+                        const SwNumFormat* pFormat = aSetRule.GetNumFormat( i );
+                        if(pFormat)
                         {
-                            SwNumFmt aFmt(*pFmt);
+                            SwNumFormat aFormat(*pFormat);
                             if (!pCharStyleNames[i].isEmpty() &&
                                 !SwXNumberingRules::isInvalidStyle(pCharStyleNames[i]) &&
-                                (!pFmt->GetCharFmt() || pFmt->GetCharFmt()->GetName() != pCharStyleNames[i]) )
+                                (!pFormat->GetCharFormat() || pFormat->GetCharFormat()->GetName() != pCharStyleNames[i]) )
                             {
 
-                                SwCharFmt* pCharFmt = 0;
+                                SwCharFormat* pCharFormat = 0;
                                 for(size_t j = 0; j< nChCount; ++j)
                                 {
-                                    SwCharFmt* pTmp = (*pFmts)[j];
+                                    SwCharFormat* pTmp = (*pFormats)[j];
                                     if(pTmp->GetName() == pCharStyleNames[i])
                                     {
-                                        pCharFmt = pTmp;
+                                        pCharFormat = pTmp;
                                         break;
                                     }
                                 }
-                                if(!pCharFmt && pBasePool)
+                                if(!pCharFormat && pBasePool)
                                 {
 
                                     SfxStyleSheetBase* pBase;
                                     pBase = static_cast<SfxStyleSheetBasePool*>(pBasePool)->Find(pCharStyleNames[i], SFX_STYLE_FAMILY_CHAR);
                                     if(!pBase)
                                         pBase = &pBasePool->Make(pCharStyleNames[i], SFX_STYLE_FAMILY_CHAR);
-                                    pCharFmt = static_cast<SwDocStyleSheet*>(pBase)->GetCharFmt();
+                                    pCharFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat();
 
                                 }
 
-                                aFmt.SetCharFmt( pCharFmt );
+                                aFormat.SetCharFormat( pCharFormat );
                             }
                             // same for fonts:
                             if (!pBulletFontNames[i].isEmpty() &&
                                 !SwXNumberingRules::isInvalidStyle(pBulletFontNames[i]) &&
-                                (!pFmt->GetBulletFont() || pFmt->GetBulletFont()->GetName() != pBulletFontNames[i]) )
+                                (!pFormat->GetBulletFont() || pFormat->GetBulletFont()->GetName() != pBulletFontNames[i]) )
                             {
                                 const SvxFontListItem* pFontListItem =
                                         static_cast<const SvxFontListItem*>(pDoc->GetDocShell()
@@ -1903,9 +1903,9 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                                 vcl::FontInfo aInfo = pList->Get(
                                     pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE);
                                 vcl::Font aFont(aInfo);
-                                aFmt.SetBulletFont(&aFont);
+                                aFormat.SetBulletFont(&aFont);
                             }
-                            aSetRule.Set( i, &aFmt );
+                            aSetRule.Set( i, &aFormat );
                         }
                     }
                     rBase.getNewBase()->SetNumRule(aSetRule);
@@ -1949,14 +1949,14 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                 throw lang::IllegalArgumentException();
             SfxItemSet& rStyleSet = rBase.GetItemSet();
 
-            SwFmtPageDesc* pNewDesc = 0;
+            SwFormatPageDesc* pNewDesc = 0;
             const SfxPoolItem* pItem;
             if(SfxItemState::SET == rStyleSet.GetItemState( RES_PAGEDESC, true, &pItem ) )
             {
-                pNewDesc = new SwFmtPageDesc(*static_cast<const SwFmtPageDesc*>(pItem));
+                pNewDesc = new SwFormatPageDesc(*static_cast<const SwFormatPageDesc*>(pItem));
             }
             if(!pNewDesc)
-                pNewDesc = new SwFmtPageDesc();
+                pNewDesc = new SwFormatPageDesc();
             OUString uDescName;
             aValue >>= uDescName;
             OUString sDescName;
@@ -1980,7 +1980,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                 if(!bPut)
                 {
                     rStyleSet.ClearItem(RES_BREAK);
-                    rStyleSet.Put(SwFmtPageDesc());
+                    rStyleSet.Put(SwFormatPageDesc());
                 }
                 else
                     rStyleSet.Put(*pNewDesc);
@@ -1994,9 +1994,9 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
         {
             bool bAuto = *static_cast<sal_Bool const *>(aValue.getValue());
             if(SFX_STYLE_FAMILY_PARA == eFamily)
-                rBase.getNewBase()->GetCollection()->SetAutoUpdateFmt(bAuto);
+                rBase.getNewBase()->GetCollection()->SetAutoUpdateFormat(bAuto);
             else if(SFX_STYLE_FAMILY_FRAME == eFamily)
-                rBase.getNewBase()->GetFrmFmt()->SetAutoUpdateFmt(bAuto);
+                rBase.getNewBase()->GetFrameFormat()->SetAutoUpdateFormat(bAuto);
 
             bDone = true;
             break;
@@ -2115,20 +2115,20 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                 if(aValue >>= sTmp)
                 {
                     SfxItemSet& rStyleSet = rBase.GetItemSet();
-                    SwFmtRuby* pRuby = 0;
+                    SwFormatRuby* pRuby = 0;
                     const SfxPoolItem* pItem;
                     if(SfxItemState::SET == rStyleSet.GetItemState( RES_TXTATR_CJK_RUBY, true, &pItem ) )
-                        pRuby = new SwFmtRuby(*static_cast<const SwFmtRuby*>(pItem));
+                        pRuby = new SwFormatRuby(*static_cast<const SwFormatRuby*>(pItem));
                     if(!pRuby)
-                        pRuby = new SwFmtRuby(OUString());
+                        pRuby = new SwFormatRuby(OUString());
                     OUString sStyle;
                     SwStyleNameMapper::FillUIName(sTmp, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
-                    pRuby->SetCharFmtName( sTmp );
-                    pRuby->SetCharFmtId( 0 );
+                    pRuby->SetCharFormatName( sTmp );
+                    pRuby->SetCharFormatId( 0 );
                     if(!sTmp.isEmpty())
                     {
                         sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( sTmp, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
-                        pRuby->SetCharFmtId(nId);
+                        pRuby->SetCharFormatId(nId);
                     }
                     rStyleSet.Put(*pRuby);
                     delete pRuby;
@@ -2146,12 +2146,12 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                 {
                     SfxItemSet& rStyleSet = rBase.GetItemSet();
 
-                    SwFmtDrop* pDrop = 0;
+                    SwFormatDrop* pDrop = 0;
                     const SfxPoolItem* pItem;
                     if(SfxItemState::SET == rStyleSet.GetItemState( RES_PARATR_DROP, true, &pItem ) )
-                        pDrop = new SwFmtDrop(*static_cast<const SwFmtDrop*>(pItem));
+                        pDrop = new SwFormatDrop(*static_cast<const SwFormatDrop*>(pItem));
                     if(!pDrop)
-                        pDrop = new SwFmtDrop();
+                        pDrop = new SwFormatDrop();
                     OUString uStyle;
                     aValue >>= uStyle;
                     OUString sStyle;
@@ -2159,7 +2159,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                     SwDocStyleSheet* pStyle =
                         static_cast<SwDocStyleSheet*>(pDoc->GetDocShell()->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_CHAR));
                     if(pStyle)
-                        pDrop->SetCharFmt(pStyle->GetCharFmt());
+                        pDrop->SetCharFormat(pStyle->GetCharFormat());
                     else
                         throw lang::IllegalArgumentException();
                     rStyleSet.Put(*pDrop);
@@ -2237,7 +2237,7 @@ void SAL_CALL SwXStyle::SetPropertyValues_Impl(
     const OUString* pNames = rPropertyNames.getConstArray();
     const uno::Any* pValues = rValues.getConstArray();
 
-    SwStyleBase_Impl aBaseImpl(*m_pDoc, m_sStyleName, &GetDoc()->GetDfltTxtFmtColl()->GetAttrSet()); //UUUU add pDfltTxtFmtColl as parent
+    SwStyleBase_Impl aBaseImpl(*m_pDoc, m_sStyleName, &GetDoc()->GetDfltTextFormatColl()->GetAttrSet()); //UUUU add pDfltTextFormatColl as parent
     if(pBasePool)
     {
         const sal_uInt16 nSaveMask = pBasePool->GetSearchMask();
@@ -2323,8 +2323,8 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
             bPhys = static_cast<SwDocStyleSheet*>(pBase)->IsPhysical();
             // The standard character format is not existing physically
             if( bPhys && SFX_STYLE_FAMILY_CHAR == eFamily &&
-                static_cast<SwDocStyleSheet*>(pBase)->GetCharFmt() &&
-                static_cast<SwDocStyleSheet*>(pBase)->GetCharFmt()->IsDefault() )
+                static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat() &&
+                static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat()->IsDefault() )
                 bPhys = false;
         }
         aRet <<= bPhys;
@@ -2418,7 +2418,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                 const SfxPoolItem* pItem;
                 if (SfxItemState::SET == rBase.GetItemSet().GetItemState(RES_PAGEDESC, true, &pItem))
                 {
-                    const SwPageDesc* pDesc = static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc();
+                    const SwPageDesc* pDesc = static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc();
                     if(pDesc)
                     {
                         OUString aString;
@@ -2434,9 +2434,9 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
             {
                 bool bAuto = false;
                 if(SFX_STYLE_FAMILY_PARA == eFamily)
-                    bAuto = rBase.getNewBase()->GetCollection()->IsAutoUpdateFmt();
+                    bAuto = rBase.getNewBase()->GetCollection()->IsAutoUpdateFormat();
                 else if(SFX_STYLE_FAMILY_FRAME == eFamily)
-                    bAuto = rBase.getNewBase()->GetFrmFmt()->IsAutoUpdateFmt();
+                    bAuto = rBase.getNewBase()->GetFrameFormat()->IsAutoUpdateFormat();
                 aRet <<= bAuto;
 
                 bDone = true;
@@ -2456,20 +2456,20 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                 uno::Sequence< beans::NamedValue > aSeq(COND_COMMAND_COUNT);
                 beans::NamedValue *pSeq = aSeq.getArray();
 
-                SwFmt *pFmt = static_cast<SwDocStyleSheet*>(pBase)->GetCollection();
+                SwFormat *pFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCollection();
                 const CommandStruct *pCmds = SwCondCollItem::GetCmds();
                 for (sal_uInt16 n = 0;  n < COND_COMMAND_COUNT;  ++n)
                 {
                     OUString aStyleName;
 
                     const SwCollCondition* pCond = 0;
-                    if( pFmt && RES_CONDTXTFMTCOLL == pFmt->Which() &&
-                        0 != ( pCond = static_cast<SwConditionTxtFmtColl*>(pFmt)->
+                    if( pFormat && RES_CONDTXTFMTCOLL == pFormat->Which() &&
+                        0 != ( pCond = static_cast<SwConditionTextFormatColl*>(pFormat)->
                         HasCondition( SwCollCondition( 0, pCmds[n].nCnd, pCmds[n].nSubCond ) ) )
-                        && pCond->GetTxtFmtColl() )
+                        && pCond->GetTextFormatColl() )
                     {
                         // get programmatic style name from UI style name
-                        aStyleName = pCond->GetTxtFmtColl()->GetName();
+                        aStyleName = pCond->GetTextFormatColl()->GetName();
                         SwStyleNameMapper::FillProgName(aStyleName, aStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true);
                     }
 
@@ -2483,7 +2483,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
             }
             case FN_UNO_CATEGORY:
             {
-                const sal_uInt16 nPoolId = rBase.getNewBase()->GetCollection()->GetPoolFmtId();
+                const sal_uInt16 nPoolId = rBase.getNewBase()->GetCollection()->GetPoolFormatId();
                 short nRet = -1;
 
                 switch ( COLL_GET_RANGE_BITS & nPoolId )
@@ -2515,10 +2515,10 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
             case SID_SWREGISTER_COLLECTION:
             {
                 const SwPageDesc *pPageDesc = rBase.getNewBase()->GetPageDesc();
-                const SwTxtFmtColl* pCol = 0;
+                const SwTextFormatColl* pCol = 0;
                 OUString aString;
                 if( pPageDesc )
-                    pCol = pPageDesc->GetRegisterFmtColl();
+                    pCol = pPageDesc->GetRegisterFormatColl();
                 if( pCol )
                     SwStyleNameMapper::FillProgName(
                                 pCol->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
@@ -2645,7 +2645,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl(
     const OUString* pNames = rPropertyNames.getConstArray();
     uno::Sequence< uno::Any > aRet(rPropertyNames.getLength());
     uno::Any* pRet = aRet.getArray();
-    SwStyleBase_Impl aBase(*m_pDoc, m_sStyleName, &GetDoc()->GetDfltTxtFmtColl()->GetAttrSet()); //UUUU add pDfltTxtFmtColl as parent
+    SwStyleBase_Impl aBase(*m_pDoc, m_sStyleName, &GetDoc()->GetDfltTextFormatColl()->GetAttrSet()); //UUUU add pDfltTextFormatColl as parent
     SfxStyleSheetBase* pBase = 0;
 
     for(sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
@@ -2688,12 +2688,12 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl(
                     {
                         if (pEntry->nWID >= POOLATTR_BEGIN && pEntry->nWID < RES_UNKNOWNATR_END )
                         {
-                            SwFmt * pFmt;
+                            SwFormat * pFormat;
                             if ( eFamily == SFX_STYLE_FAMILY_CHAR )
-                                pFmt = m_pDoc->GetDfltCharFmt();
+                                pFormat = m_pDoc->GetDfltCharFormat();
                             else
-                                pFmt = m_pDoc->GetDfltFrmFmt();
-                            const SwAttrPool * pPool = pFmt->GetAttrSet().GetPool();
+                                pFormat = m_pDoc->GetDfltFrameFormat();
+                            const SwAttrPool * pPool = pFormat->GetAttrSet().GetPool();
                             const SfxPoolItem & rItem = pPool->GetDefaultItem ( pEntry->nWID );
                             rItem.QueryValue ( pRet[nProp], pEntry->nMemberId );
                         }
@@ -2983,7 +2983,7 @@ void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >&
     throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFmt *pTargetFmt = 0;
+    SwFormat *pTargetFormat = 0;
 
     if(pBasePool)
     {
@@ -2997,22 +2997,22 @@ void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >&
             switch(eFamily)
             {
                 case SFX_STYLE_FAMILY_CHAR:
-                    pTargetFmt = xStyle->GetCharFmt();
+                    pTargetFormat = xStyle->GetCharFormat();
                     break;
 
                 case SFX_STYLE_FAMILY_PARA:
-                    pTargetFmt = xStyle->GetCollection();
+                    pTargetFormat = xStyle->GetCollection();
                     break;
 
                 case SFX_STYLE_FAMILY_FRAME:
-                    pTargetFmt = xStyle->GetFrmFmt();
+                    pTargetFormat = xStyle->GetFrameFormat();
                     break;
 
                 case SFX_STYLE_FAMILY_PAGE:
                 {
                     SwPageDesc *pDesc = m_pDoc->FindPageDesc(xStyle->GetPageDesc()->GetName());
                     if( pDesc )
-                        pTargetFmt = &pDesc->GetMaster();
+                        pTargetFormat = &pDesc->GetMaster();
                     break;
                 }
                 case SFX_STYLE_FAMILY_PSEUDO:
@@ -3037,7 +3037,7 @@ void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >&
     const SfxItemPropertyMap &rMap = pPropSet->getPropertyMap();
     const OUString* pNames = aPropertyNames.getConstArray();
 
-    if(pTargetFmt)
+    if(pTargetFormat)
     {
         for(sal_Int32 nProp = 0, nEnd = aPropertyNames.getLength(); nProp < nEnd; nProp++)
         {
@@ -3060,24 +3060,24 @@ void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >&
 
             if( pEntry->nWID == RES_PARATR_OUTLINELEVEL )
             {
-                static_cast<SwTxtFmtColl*>(pTargetFmt)->DeleteAssignmentToListLevelOfOutlineStyle();
+                static_cast<SwTextFormatColl*>(pTargetFormat)->DeleteAssignmentToListLevelOfOutlineStyle();
             }
             else
             {
-                pTargetFmt->ResetFmtAttr( pEntry->nWID );
+                pTargetFormat->ResetFormatAttr( pEntry->nWID );
             }
 
             if(OWN_ATTR_FILLBMP_MODE == pEntry->nWID)
             {
                 //UUUU
-                SwDoc* pDoc = pTargetFmt->GetDoc();
+                SwDoc* pDoc = pTargetFormat->GetDoc();
                 SfxItemSet aSet(pDoc->GetAttrPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
-                aSet.SetParent(&pTargetFmt->GetAttrSet());
+                aSet.SetParent(&pTargetFormat->GetAttrSet());
 
                 aSet.ClearItem(XATTR_FILLBMP_STRETCH);
                 aSet.ClearItem(XATTR_FILLBMP_TILE);
 
-                pTargetFmt->SetFmtAttr(aSet);
+                pTargetFormat->SetFormatAttr(aSet);
             }
         }
     }
@@ -3104,17 +3104,17 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault(  )
         if(pBase)
         {
             rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet( *static_cast<SwDocStyleSheet*>(pBase) ) );
-            SwFmt *pTargetFmt = 0;
+            SwFormat *pTargetFormat = 0;
             size_t nPgDscPos = SIZE_MAX;
             switch(eFamily)
             {
                 case SFX_STYLE_FAMILY_CHAR:
-                    pTargetFmt = xStyle->GetCharFmt();
+                    pTargetFormat = xStyle->GetCharFormat();
                     break;
 
                 case SFX_STYLE_FAMILY_PARA:
                 {
-                    pTargetFmt = xStyle->GetCollection();
+                    pTargetFormat = xStyle->GetCollection();
                     if(xStyle->GetCollection())
                     {
                         xStyle->GetCollection()->DeleteAssignmentToListLevelOfOutlineStyle();
@@ -3123,7 +3123,7 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault(  )
                 }
 
                 case SFX_STYLE_FAMILY_FRAME:
-                    pTargetFmt = xStyle->GetFrmFmt();
+                    pTargetFormat = xStyle->GetFrameFormat();
                     break;
 
                 case SFX_STYLE_FAMILY_PAGE:
@@ -3131,7 +3131,7 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault(  )
                     SwPageDesc *pDesc = m_pDoc->FindPageDesc(xStyle->GetPageDesc()->GetName(), &nPgDscPos);
                     if( pDesc )
                     {
-                        pTargetFmt = &pDesc->GetMaster();
+                        pTargetFormat = &pDesc->GetMaster();
                         pDesc->SetUseOn(nsUseOnPage::PD_ALL);
                     }
                     break;
@@ -3143,7 +3143,7 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault(  )
                 default: ;
             }
 
-            if(pTargetFmt)
+            if(pTargetFormat)
             {
                 if(SIZE_MAX != nPgDscPos)
                 {
@@ -3157,12 +3157,12 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault(  )
                     SvxULSpaceItem aUL(RES_UL_SPACE);
                     aUL.SetUpper(static_cast <sal_uInt16> (nSize));
                     aUL.SetLower(static_cast <sal_uInt16> (nSize));
-                    pTargetFmt->SetFmtAttr(aLR);
-                    pTargetFmt->SetFmtAttr(aUL);
+                    pTargetFormat->SetFormatAttr(aLR);
+                    pTargetFormat->SetFormatAttr(aUL);
                     SwPageDesc* pStdPgDsc = m_pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_STANDARD);
-                    SwFmtFrmSize aFrmSz(ATT_FIX_SIZE);
+                    SwFormatFrmSize aFrmSz(ATT_FIX_SIZE);
 
-                    if(RES_POOLPAGE_STANDARD == rPageDesc.GetPoolFmtId())
+                    if(RES_POOLPAGE_STANDARD == rPageDesc.GetPoolFormatId())
                     {
                         if(m_pDoc->getIDocumentDeviceAccess().getPrinter(false))
                         {
@@ -3188,11 +3188,11 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault(  )
                         aFrmSz.SetWidth(nTmp);
                     }
 
-                    pTargetFmt->SetFmtAttr( aFrmSz );
+                    pTargetFormat->SetFormatAttr( aFrmSz );
                 }
                 else
                 {
-                    pTargetFmt->ResetAllFmtAttr();
+                    pTargetFormat->ResetAllFormatAttr();
                 }
 
                 if(SIZE_MAX != nPgDscPos)
@@ -3356,7 +3356,7 @@ static void lcl_putItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySe
     SfxItemSet& rSetSet = pNewSetItem->GetItemSet();
 
     // set parent to ItemSet to ensure XFILL_NONE as XFillStyleItem
-    rSetSet.SetParent(&pDoc->GetDfltFrmFmt()->GetAttrSet());
+    rSetSet.SetParent(&pDoc->GetDfltFrameFormat()->GetAttrSet());
 
     // replace the used SfxItemSet at the SwStyleBase_Impl temporarily and use the
     // default method to set the property
@@ -3389,7 +3389,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
     const uno::Any* pValues = rValues.getConstArray();
     const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PAGE_STYLE);
     const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
-    SwStyleBase_Impl aBaseImpl(*GetDoc(), GetStyleName(), &GetDoc()->GetDfltFrmFmt()->GetAttrSet()); //UUUU add pDfltFrmFmt as parent
+    SwStyleBase_Impl aBaseImpl(*GetDoc(), GetStyleName(), &GetDoc()->GetDfltFrameFormat()->GetAttrSet()); //UUUU add pDfltFrameFormat as parent
     if(GetBasePool())
     {
         const sal_uInt16 nSaveMask = GetBasePool()->GetSearchMask();
@@ -3483,7 +3483,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
                                     0);
 
                                 //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
-                                aTempSet.SetParent(&GetDoc()->GetDfltFrmFmt()->GetAttrSet());
+                                aTempSet.SetParent(&GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
                                 aTempSet.Put(SfxBoolItem(SID_ATTR_PAGE_ON, true));
                                 aTempSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(MM50, MM50)));
@@ -3559,7 +3559,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
                             SfxItemSet& rSetSet = pNewSetItem->GetItemSet();
 
                             // set parent to ItemSet to ensure XFILL_NONE as XFillStyleItem
-                            rSetSet.SetParent(&GetDoc()->GetDfltFrmFmt()->GetAttrSet());
+                            rSetSet.SetParent(&GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
                             // replace the used SfxItemSet at the SwStyleBase_Impl temporarily and use the
                             // default method to set the property
@@ -3586,10 +3586,10 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
                 case FN_PARAM_FTN_INFO :
                 {
                     const SfxPoolItem& rItem = aBaseImpl.GetItemSet().Get(FN_PARAM_FTN_INFO);
-                    SfxPoolItem* pNewFtnItem = rItem.Clone();
-                    bool bPut = pNewFtnItem->PutValue(pValues[nProp], pEntry->nMemberId);
-                    aBaseImpl.GetItemSet().Put(*pNewFtnItem);
-                    delete pNewFtnItem;
+                    SfxPoolItem* pNewFootnoteItem = rItem.Clone();
+                    bool bPut = pNewFootnoteItem->PutValue(pValues[nProp], pEntry->nMemberId);
+                    aBaseImpl.GetItemSet().Put(*pNewFootnoteItem);
+                    delete pNewFootnoteItem;
                     if(!bPut)
                         throw lang::IllegalArgumentException();
                     break;
@@ -3662,22 +3662,22 @@ void SwXPageStyle::setPropertyValues(
 
 static uno::Reference<text::XText>
 lcl_makeHeaderFooter(
-    const sal_uInt16 nRes, const bool bHeader, SwFrmFmt const*const pFrmFmt)
+    const sal_uInt16 nRes, const bool bHeader, SwFrameFormat const*const pFrameFormat)
 {
-    if (!pFrmFmt) { return 0; }
+    if (!pFrameFormat) { return 0; }
 
-    const SfxItemSet& rSet = pFrmFmt->GetAttrSet();
+    const SfxItemSet& rSet = pFrameFormat->GetAttrSet();
     const SfxPoolItem* pItem;
     if (SfxItemState::SET == rSet.GetItemState(nRes, true, &pItem))
     {
-        SwFrmFmt *const pHeadFootFmt = (bHeader)
-            ? static_cast<SwFmtHeader*>(const_cast<SfxPoolItem*>(pItem))->
-                    GetHeaderFmt()
-            : static_cast<SwFmtFooter*>(const_cast<SfxPoolItem*>(pItem))->
-                    GetFooterFmt();
-        if (pHeadFootFmt)
+        SwFrameFormat *const pHeadFootFormat = (bHeader)
+            ? static_cast<SwFormatHeader*>(const_cast<SfxPoolItem*>(pItem))->
+                    GetHeaderFormat()
+            : static_cast<SwFormatFooter*>(const_cast<SfxPoolItem*>(pItem))->
+                    GetFooterFormat();
+        if (pHeadFootFormat)
         {
-            return SwXHeadFootText::CreateXHeadFootText(*pHeadFootFmt, bHeader);
+            return SwXHeadFootText::CreateXHeadFootText(*pHeadFootFormat, bHeader);
         }
     }
     return 0;
@@ -3697,7 +3697,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl(
     uno::Any* pRet = aRet.getArray();
     const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PAGE_STYLE);
     const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
-    SwStyleBase_Impl aBase(*GetDoc(), GetStyleName(), &GetDoc()->GetDfltFrmFmt()->GetAttrSet()); //UUUU add pDfltFrmFmt as parent
+    SwStyleBase_Impl aBase(*GetDoc(), GetStyleName(), &GetDoc()->GetDfltFrameFormat()->GetAttrSet()); //UUUU add pDfltFrameFormat as parent
     SfxStyleSheetBase* pBase = 0;
 
     for(sal_Int32 nProp = 0; nProp < nLength; nProp++)
@@ -3865,7 +3865,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl(
                     }
 
                     const SwPageDesc& rDesc = aBase.GetOldPageDesc();
-                    const SwFrmFmt* pFrmFmt = 0;
+                    const SwFrameFormat* pFrameFormat = 0;
                     bool bShare = (bHeader && rDesc.IsHeaderShared()) || (!bHeader && rDesc.IsFooterShared());
                     bool bShareFirst = rDesc.IsFirstShared();
                     // TextLeft returns the left content if there is one,
@@ -3874,20 +3874,20 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl(
                     // comptability only.
                     if( bLeft && !bShare )
                     {
-                        pFrmFmt = &rDesc.GetLeft();
+                        pFrameFormat = &rDesc.GetLeft();
                     }
                     else if (bFirst && !bShareFirst)
                     {
-                        pFrmFmt = &rDesc.GetFirstMaster();
+                        pFrameFormat = &rDesc.GetFirstMaster();
                         // no need to make GetFirstLeft() accessible
                         // since it is always shared
                     }
                     else
                     {
-                        pFrmFmt = &rDesc.GetMaster();
+                        pFrameFormat = &rDesc.GetMaster();
                     }
                     const uno::Reference< text::XText > xRet =
-                        lcl_makeHeaderFooter(nRes, bHeader, pFrmFmt);
+                        lcl_makeHeaderFooter(nRes, bHeader, pFrameFormat);
                     if (xRet.is())
                     {
                         pRet[nProp] <<= xRet;
@@ -4152,19 +4152,19 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
     {
         case IStyleAccess::AUTO_STYLE_CHAR:
         {
-            pRange = aCharAutoFmtSetRange;
+            pRange = aCharAutoFormatSetRange;
             pPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_CHAR_AUTO_STYLE);
             break;
         }
         case IStyleAccess::AUTO_STYLE_RUBY:
         {
-            pRange = 0;//aTxtNodeSetRange;
+            pRange = 0;//aTextNodeSetRange;
             pPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_RUBY_AUTO_STYLE);
             break;
         }
         case IStyleAccess::AUTO_STYLE_PARA:
         {
-            pRange = aTxtNodeSetRange; //UUUU checked, already added support for [XATTR_FILL_FIRST, XATTR_FILL_LAST]
+            pRange = aTextNodeSetRange; //UUUU checked, already added support for [XATTR_FILL_FIRST, XATTR_FILL_LAST]
             pPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARA_AUTO_STYLE);
             break;
         }
@@ -4202,7 +4202,7 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
         //UUUU set parent to ItemSet to ensure XFILL_NONE as XFillStyleItem
         // to make cases in RES_BACKGROUND work correct; target *is* a style
         // where this is the case
-        aSet.SetParent(&pDocShell->GetDoc()->GetDfltTxtFmtColl()->GetAttrSet());
+        aSet.SetParent(&pDocShell->GetDoc()->GetDfltTextFormatColl()->GetAttrSet());
 
         //UUUU here the used DrawingLayer FillStyles are imported when family is
         // equal to IStyleAccess::AUTO_STYLE_PARA, thus we will need to serve the
@@ -4400,8 +4400,8 @@ SwAutoStylesEnumImpl::SwAutoStylesEnumImpl( SwDoc* pInitDoc, IStyleAccess::SwAut
 
         for ( sal_uInt32 nI = 0; nI < nCount; ++nI )
         {
-            const SwFmtRuby* pItem = static_cast<const SwFmtRuby*>(rAttrPool.GetItem2( RES_TXTATR_CJK_RUBY, nI ));
-            if ( pItem && pItem->GetTxtRuby() )
+            const SwFormatRuby* pItem = static_cast<const SwFormatRuby*>(rAttrPool.GetItem2( RES_TXTATR_CJK_RUBY, nI ));
+            if ( pItem && pItem->GetTextRuby() )
             {
                 std::pair< sal_uInt16, sal_uInt16 > aPair( pItem->GetPosition(), pItem->GetAdjustment() );
                 if ( aRubyMap.find( aPair ) == aRubyMap.end() )
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 522886f00e52..933743fd592f 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -117,15 +117,15 @@ namespace
         const Tcoretype* const m_pCore;
         mutable Tunotype* m_pResult;
     };
-    SwFrmFmt* lcl_EnsureCoreConnected(SwFrmFmt* pFmt, cppu::OWeakObject* pObject)
+    SwFrameFormat* lcl_EnsureCoreConnected(SwFrameFormat* pFormat, cppu::OWeakObject* pObject)
     {
-        if(!pFmt)
+        if(!pFormat)
             throw uno::RuntimeException("Lost connection to core objects", pObject);
-        return pFmt;
+        return pFormat;
     }
     SwTable* lcl_EnsureTableNotComplex(SwTable* pTable, cppu::OWeakObject* pObject)
     {
-        if(pTable->IsTblComplex())
+        if(pTable->IsTableComplex())
             throw uno::RuntimeException("Table too complex", pObject);
         return pTable;
     }
@@ -173,7 +173,7 @@ static bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSv
     return rLine.InnerLineWidth > 0 || rLine.OuterLineWidth > 0;
 }
 
-static void lcl_SetSpecialProperty(SwFrmFmt* pFmt,
+static void lcl_SetSpecialProperty(SwFrameFormat* pFormat,
                                    const SfxItemPropertySimpleEntry* pEntry,
                                    const uno::Any& aValue)
     throw (lang::IllegalArgumentException,
@@ -186,18 +186,18 @@ static void lcl_SetSpecialProperty(SwFrmFmt* pFmt,
         case  FN_TABLE_HEADLINE_COUNT:
         {
             {
-                SwTable* pTable = SwTable::FindTable( pFmt );
-                UnoActionContext aAction(pFmt->GetDoc());
+                SwTable* pTable = SwTable::FindTable( pFormat );
+                UnoActionContext aAction(pFormat->GetDoc());
                 if( pEntry->nWID == FN_TABLE_HEADLINE_REPEAT)
                 {
-                    pFmt->GetDoc()->SetRowsToRepeat( *pTable, aValue.get<bool>() ? 1 : 0 );
+                    pFormat->GetDoc()->SetRowsToRepeat( *pTable, aValue.get<bool>() ? 1 : 0 );
                 }
                 else
                 {
                     sal_Int32 nRepeat = 0;
                     aValue >>= nRepeat;
                     if( nRepeat >= 0 && nRepeat < USHRT_MAX )
-                        pFmt->GetDoc()->SetRowsToRepeat( *pTable, (sal_uInt16) nRepeat );
+                        pFormat->GetDoc()->SetRowsToRepeat( *pTable, (sal_uInt16) nRepeat );
                 }
             }
         }
@@ -207,7 +207,7 @@ static void lcl_SetSpecialProperty(SwFrmFmt* pFmt,
         case  FN_TABLE_WIDTH:
         case  FN_TABLE_RELATIVE_WIDTH:
         {
-            SwFmtFrmSize aSz( pFmt->GetFrmSize() );
+            SwFormatFrmSize aSz( pFormat->GetFrmSize() );
             if(FN_TABLE_WIDTH == pEntry->nWID)
             {
                 sal_Int32 nWidth = 0;
@@ -233,7 +233,7 @@ static void lcl_SetSpecialProperty(SwFrmFmt* pFmt,
                     throw aExcept;
                 }
             }
-            pFmt->GetDoc()->SetAttr(aSz, *pFmt);
+            pFormat->GetDoc()->SetAttr(aSz, *pFormat);
         }
         break;
 
@@ -245,10 +245,10 @@ static void lcl_SetSpecialProperty(SwFrmFmt* pFmt,
             if (!sPageStyle.isEmpty())
             {
                 SwStyleNameMapper::FillUIName(sPageStyle, sPageStyle, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true );
-                pDesc = SwPageDesc::GetByName(*pFmt->GetDoc(), sPageStyle);
+                pDesc = SwPageDesc::GetByName(*pFormat->GetDoc(), sPageStyle);
             }
-            SwFmtPageDesc aDesc( pDesc );
-            pFmt->GetDoc()->SetAttr(aDesc, *pFmt);
+            SwFormatPageDesc aDesc( pDesc );
+            pFormat->GetDoc()->SetAttr(aDesc, *pFormat);
         }
         break;
 
@@ -257,14 +257,14 @@ static void lcl_SetSpecialProperty(SwFrmFmt* pFmt,
     }
 }
 
-static uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimpleEntry* pEntry )
+static uno::Any lcl_GetSpecialProperty(SwFrameFormat* pFormat, const SfxItemPropertySimpleEntry* pEntry )
 {
     switch(pEntry->nWID)
     {
         case  FN_TABLE_HEADLINE_REPEAT:
         case  FN_TABLE_HEADLINE_COUNT:
         {
-            SwTable* pTable = SwTable::FindTable( pFmt );
+            SwTable* pTable = SwTable::FindTable( pFormat );
             const sal_uInt16 nRepeat = pTable->GetRowsToRepeat();
             if(pEntry->nWID == FN_TABLE_HEADLINE_REPEAT)
                 return uno::makeAny<bool>(nRepeat > 0);
@@ -276,7 +276,7 @@ static uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimp
         case  FN_TABLE_RELATIVE_WIDTH:
         {
             uno::Any aRet;
-            const SwFmtFrmSize& rSz = pFmt->GetFrmSize();
+            const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
             if(FN_TABLE_WIDTH == pEntry->nWID)
                 rSz.QueryValue(aRet, MID_FRMSIZE_WIDTH|CONVERT_TWIPS);
             else if(FN_TABLE_RELATIVE_WIDTH == pEntry->nWID)
@@ -288,11 +288,11 @@ static uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimp
 
         case RES_PAGEDESC:
         {
-            const SfxItemSet& rSet = pFmt->GetAttrSet();
+            const SfxItemSet& rSet = pFormat->GetAttrSet();
             const SfxPoolItem* pItem;
             if(SfxItemState::SET == rSet.GetItemState(RES_PAGEDESC, false, &pItem))
             {
-                const SwPageDesc* pDsc = static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc();
+                const SwPageDesc* pDsc = static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc();
                 if(pDsc)
                     return uno::makeAny<OUString>(SwStyleNameMapper::GetProgName(pDsc->GetName(), nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC ));
             }
@@ -312,24 +312,24 @@ static uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimp
             return uno::makeAny(text::WrapTextMode_NONE);
 
         case FN_PARAM_LINK_DISPLAY_NAME :
-            return uno::makeAny(pFmt->GetName());
+            return uno::makeAny(pFormat->GetName());
 
         case FN_UNO_REDLINE_NODE_START:
         case FN_UNO_REDLINE_NODE_END:
         {
-            SwTable* pTable = SwTable::FindTable( pFmt );
-            SwNode* pTblNode = pTable->GetTableNode();
+            SwTable* pTable = SwTable::FindTable( pFormat );
+            SwNode* pTableNode = pTable->GetTableNode();
             if(FN_UNO_REDLINE_NODE_END == pEntry->nWID)
-                pTblNode = pTblNode->EndOfSectionNode();
-            for(const SwRangeRedline* pRedline : pFmt->GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl())
+                pTableNode = pTableNode->EndOfSectionNode();
+            for(const SwRangeRedline* pRedline : pFormat->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable())
             {
                 const SwNode& rRedPointNode = pRedline->GetNode(true);
                 const SwNode& rRedMarkNode = pRedline->GetNode(false);
-                if(&rRedPointNode == pTblNode || &rRedMarkNode == pTblNode)
+                if(&rRedPointNode == pTableNode || &rRedMarkNode == pTableNode)
                 {
                     const SwNode& rStartOfRedline = SwNodeIndex(rRedPointNode) <= SwNodeIndex(rRedMarkNode) ?
                         rRedPointNode : rRedMarkNode;
-                    bool bIsStart = &rStartOfRedline == pTblNode;
+                    bool bIsStart = &rStartOfRedline == pTableNode;
                     return uno::makeAny(SwXRedlinePortion::CreateRedlineProperties(*pRedline, bIsStart));
                 }
             }
@@ -345,7 +345,7 @@ static uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimp
  *
  * Also since the implementations of tables does not really have columns using
  * this function is appropriate only for tables that are not complex (i.e.
- * where IsTblComplex() returns false).
+ * where IsTableComplex() returns false).
  *
  * @param rCellName e.g. A1..Z1, a1..z1, AA1..AZ1, Aa1..Az1, BA1..BZ1, Ba1..Bz1, ...
  * @param [IN,OUT] rColumn (0-based)
@@ -500,7 +500,7 @@ OUString sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow )
     if (nColumn < 0 || nRow < 0)
         return OUString();
     OUString sCellName;
-    sw_GetTblBoxColStr( static_cast< sal_uInt16 >(nColumn), sCellName );
+    sw_GetTableBoxColStr( static_cast< sal_uInt16 >(nColumn), sCellName );
     return sCellName + OUString::number( nRow + 1 );
 }
 
@@ -560,14 +560,14 @@ void SwRangeDescriptor::Normalize()
         std::swap(nLeft, nRight);
 }
 
-static SwXCell* lcl_CreateXCell(SwFrmFmt* pFmt, sal_Int32 nColumn, sal_Int32 nRow)
+static SwXCell* lcl_CreateXCell(SwFrameFormat* pFormat, sal_Int32 nColumn, sal_Int32 nRow)
 {
     const OUString sCellName = sw_GetCellName(nColumn, nRow);
-    SwTable* pTable = SwTable::FindTable(pFmt);
-    SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTblBox(sCellName));
+    SwTable* pTable = SwTable::FindTable(pFormat);
+    SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTableBox(sCellName));
     if(!pBox)
         return nullptr;
-    return SwXCell::CreateXCell(pFmt, pBox, pTable);
+    return SwXCell::CreateXCell(pFormat, pBox, pTable);
 }
 
 static void lcl_InspectLines(SwTableLines& rLines, std::vector<OUString>& rAllNames)
@@ -585,10 +585,10 @@ static void lcl_InspectLines(SwTableLines& rLines, std::vector<OUString>& rAllNa
     }
 }
 
-static bool lcl_FormatTable(SwFrmFmt* pTblFmt)
+static bool lcl_FormatTable(SwFrameFormat* pTableFormat)
 {
     bool bHasFrames = false;
-    SwIterator<SwFrm,SwFmt> aIter( *pTblFmt );
+    SwIterator<SwFrm,SwFormat> aIter( *pTableFormat );
     for(SwFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next())
     {
         // mba: no TYPEINFO for SwTabFrm
@@ -615,7 +615,7 @@ static void lcl_CrsrSelect(SwPaM& rCrsr, bool bExpand)
         rCrsr.DeleteMark();
 }
 
-static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, bool bRow)
+static void lcl_GetTableSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, bool bRow)
 {
     SwTabCols aCols;
     aCols.SetLeftMin ( 0 );
@@ -644,7 +644,7 @@ static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pB
 
 }
 
-static void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBox, bool bRow, SwDoc* pDoc)
+static void lcl_SetTableSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBox, bool bRow, SwDoc* pDoc)
 {
     SwTabCols aOldCols;
 
@@ -666,7 +666,7 @@ static void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableB
     SwTabCols aCols(aOldCols);
     const text::TableColumnSeparator* pArray = pSepSeq->getConstArray();
     long nLastValue = 0;
-    //sal_Int32 nTblWidth = aCols.GetRight() - aCols.GetLeft();
+    //sal_Int32 nTableWidth = aCols.GetRight() - aCols.GetLeft();
     for(size_t i = 0; i < nOldCount; ++i)
     {
         aCols[i] = pArray[i].Position;
@@ -687,20 +687,20 @@ static inline OUString lcl_getString( SwXCell &rCell )
 }
 
 /* non UNO function call to set string in SwXCell */
-void sw_setString( SwXCell &rCell, const OUString &rTxt,
-        bool bKeepNumberFmt = false )
+void sw_setString( SwXCell &rCell, const OUString &rText,
+        bool bKeepNumberFormat = false )
 {
     if(rCell.IsValid())
     {
-        SwFrmFmt* pBoxFmt = rCell.pBox->ClaimFrmFmt();
-        pBoxFmt->LockModify();
-        pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMULA );
-        pBoxFmt->ResetFmtAttr( RES_BOXATR_VALUE );
-        if (!bKeepNumberFmt)
-            pBoxFmt->SetFmtAttr( SwTblBoxNumFormat(css::util::NumberFormat::TEXT) );
-        pBoxFmt->UnlockModify();
+        SwFrameFormat* pBoxFormat = rCell.pBox->ClaimFrameFormat();
+        pBoxFormat->LockModify();
+        pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMULA );
+        pBoxFormat->ResetFormatAttr( RES_BOXATR_VALUE );
+        if (!bKeepNumberFormat)
+            pBoxFormat->SetFormatAttr( SwTableBoxNumFormat(css::util::NumberFormat::TEXT) );
+        pBoxFormat->UnlockModify();
     }
-    rCell.SwXText::setString(rTxt);
+    rCell.SwXText::setString(rText);
 }
 
 /* non UNO function call to get value from SwXCell */
@@ -708,7 +708,7 @@ double sw_getValue( SwXCell &rCell )
 {
     double fRet;
     if(rCell.IsValid() && !rCell.getString().isEmpty())
-        fRet = rCell.pBox->GetFrmFmt()->GetTblBoxValue().GetValue();
+        fRet = rCell.pBox->GetFrameFormat()->GetTableBoxValue().GetValue();
     else
         ::rtl::math::setNan( &fRet );
     return fRet;
@@ -720,12 +720,12 @@ void sw_setValue( SwXCell &rCell, double nVal )
     if(!rCell.IsValid())
         return;
     // first this text (maybe) needs to be deleted
-    sal_uLong nNdPos = rCell.pBox->IsValidNumTxtNd( true );
+    sal_uLong nNdPos = rCell.pBox->IsValidNumTextNd( true );
     if(ULONG_MAX != nNdPos)
         sw_setString( rCell, OUString(), true );   // true == keep number format
     SwDoc* pDoc = rCell.GetDoc();
     UnoActionContext aAction(pDoc);
-    SwFrmFmt* pBoxFmt = rCell.pBox->ClaimFrmFmt();
+    SwFrameFormat* pBoxFormat = rCell.pBox->ClaimFrameFormat();
     SfxItemSet aSet(pDoc->GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE);
     const SfxPoolItem* pItem;
 
@@ -733,26 +733,26 @@ void sw_setValue( SwXCell &rCell, double nVal )
     // - there is no current number format
     // - the current number format is not a number format according to the number formatter, but rather a text format
     // - the current number format is not even a valid number formatter number format, but rather Writer's own 'special' text number format
-    if(SfxItemState::SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, true, &pItem)
-        ||  pDoc->GetNumberFormatter()->IsTextFormat(static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue())
-        ||  static_cast<sal_Int16>(static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue()) == css::util::NumberFormat::TEXT)
+    if(SfxItemState::SET != pBoxFormat->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, true, &pItem)
+        ||  pDoc->GetNumberFormatter()->IsTextFormat(static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue())
+        ||  static_cast<sal_Int16>(static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue()) == css::util::NumberFormat::TEXT)
     {
-        aSet.Put(SwTblBoxNumFormat(0));
+        aSet.Put(SwTableBoxNumFormat(0));
     }
 
-    SwTblBoxValue aVal(nVal);
+    SwTableBoxValue aVal(nVal);
     aSet.Put(aVal);
-    pDoc->SetTblBoxFormulaAttrs( *rCell.pBox, aSet );
+    pDoc->SetTableBoxFormulaAttrs( *rCell.pBox, aSet );
     // update table
-    SwTableFmlUpdate aTblUpdate( SwTable::FindTable( rCell.GetFrmFmt() ));
-    pDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aTblUpdate );
+    SwTableFormulaUpdate aTableUpdate( SwTable::FindTable( rCell.GetFrameFormat() ));
+    pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
 }
 
 TYPEINIT1(SwXCell, SwClient);
 
-SwXCell::SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBx, size_t const nPos) :
-    SwXText(pTblFmt->GetDoc(), CURSOR_TBLTEXT),
-    SwClient(pTblFmt),
+SwXCell::SwXCell(SwFrameFormat* pTableFormat, SwTableBox* pBx, size_t const nPos) :
+    SwXText(pTableFormat->GetDoc(), CURSOR_TBLTEXT),
+    SwClient(pTableFormat),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TABLE_CELL)),
     pBox(pBx),
     pStartNode(nullptr),
@@ -760,9 +760,9 @@ SwXCell::SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBx, size_t const nPos) :
 {
 }
 
-SwXCell::SwXCell(SwFrmFmt* pTblFmt, const SwStartNode& rStartNode) :
-    SwXText(pTblFmt->GetDoc(), CURSOR_TBLTEXT),
-    SwClient(pTblFmt),
+SwXCell::SwXCell(SwFrameFormat* pTableFormat, const SwStartNode& rStartNode) :
+    SwXText(pTableFormat->GetDoc(), CURSOR_TBLTEXT),
+    SwClient(pTableFormat),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TABLE_CELL)),
     pBox(nullptr),
     pStartNode(&rStartNode),
@@ -855,14 +855,14 @@ bool SwXCell::IsValid() const
 {
     // FIXME: this is now a const method, to make SwXText::IsValid invisible
     // but the const_cast here are still ridiculous. TODO: find a better way.
-    SwFrmFmt* pTblFmt = pBox ? GetFrmFmt() : nullptr;
-    if(!pTblFmt)
+    SwFrameFormat* pTableFormat = pBox ? GetFrameFormat() : nullptr;
+    if(!pTableFormat)
     {
         const_cast<SwXCell*>(this)->pBox = nullptr;
     }
     else
     {
-        SwTable* pTable = SwTable::FindTable( pTblFmt );
+        SwTable* pTable = SwTable::FindTable( pTableFormat );
         SwTableBox const*const pFoundBox =
             const_cast<SwXCell*>(this)->FindBox(pTable, pBox);
         if (!pFoundBox)
@@ -878,8 +878,8 @@ OUString SwXCell::getFormula() throw( uno::RuntimeException, std::exception )
     SolarMutexGuard aGuard;
     if(!IsValid())
         return OUString();
-    SwTblBoxFormula aFormula( pBox->GetFrmFmt()->GetTblBoxFormula() );
-    SwTable* pTable = SwTable::FindTable( GetFrmFmt() );
+    SwTableBoxFormula aFormula( pBox->GetFrameFormat()->GetTableBoxFormula() );
+    SwTable* pTable = SwTable::FindTable( GetFrameFormat() );
     aFormula.PtrToBoxNm( pTable );
     return aFormula.GetFormula();
 }
@@ -891,28 +891,28 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException,
     if(!IsValid())
         return;
     // first this text (maybe) needs to be deleted
-    sal_uInt32 nNdPos = pBox->IsValidNumTxtNd( true );
+    sal_uInt32 nNdPos = pBox->IsValidNumTextNd( true );
     if(USHRT_MAX == nNdPos)
         sw_setString( *this, OUString(), true );
-    OUString sFml(comphelper::string::stripStart(rFormula, ' '));
-    if( !sFml.isEmpty() && '=' == sFml[0] )
-                sFml = sFml.copy( 1 );
-    SwTblBoxFormula aFml( sFml );
+    OUString sFormula(comphelper::string::stripStart(rFormula, ' '));
+    if( !sFormula.isEmpty() && '=' == sFormula[0] )
+                sFormula = sFormula.copy( 1 );
+    SwTableBoxFormula aFormula( sFormula );
     SwDoc* pMyDoc = GetDoc();
     UnoActionContext aAction(pMyDoc);
     SfxItemSet aSet(pMyDoc->GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_FORMULA);
     const SfxPoolItem* pItem;
-    SwFrmFmt* pBoxFmt = pBox->GetFrmFmt();
-    if(SfxItemState::SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, true, &pItem)
-        ||  pMyDoc->GetNumberFormatter()->IsTextFormat(static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue()))
+    SwFrameFormat* pBoxFormat = pBox->GetFrameFormat();
+    if(SfxItemState::SET != pBoxFormat->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, true, &pItem)
+        ||  pMyDoc->GetNumberFormatter()->IsTextFormat(static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue()))
     {
-        aSet.Put(SwTblBoxNumFormat(0));
+        aSet.Put(SwTableBoxNumFormat(0));
     }
-    aSet.Put(aFml);
-    GetDoc()->SetTblBoxFormulaAttrs( *pBox, aSet );
+    aSet.Put(aFormula);
+    GetDoc()->SetTableBoxFormulaAttrs( *pBox, aSet );
     // update table
-    SwTableFmlUpdate aTblUpdate( SwTable::FindTable( GetFrmFmt() ));
-    pMyDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aTblUpdate );
+    SwTableFormulaUpdate aTableUpdate( SwTable::FindTable( GetFrameFormat() ));
+    pMyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
 }
 
 double SwXCell::getValue() throw( uno::RuntimeException, std::exception )
@@ -1016,7 +1016,7 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV
             SAL_WARN("sw.uno", "unknown direction code, maybe it's a bitfield");
         }
         SvxFrameDirectionItem aItem(eDir, RES_FRAMEDIR);
-        pBox->GetFrmFmt()->SetFmtAttr(aItem);
+        pBox->GetFrameFormat()->SetFormatAttr(aItem);
     }
     else if(rPropertyName == "TableRedlineParams")
     {
@@ -1037,10 +1037,10 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV
             throw beans::UnknownPropertyException(rPropertyName, static_cast<cppu::OWeakObject*>(this));
         if(pEntry->nWID != FN_UNO_CELL_ROW_SPAN)
         {
-            SwFrmFmt* pBoxFmt = pBox->ClaimFrmFmt();
-            SwAttrSet aSet(pBoxFmt->GetAttrSet());
+            SwFrameFormat* pBoxFormat = pBox->ClaimFrameFormat();
+            SwAttrSet aSet(pBoxFormat->GetAttrSet());
             m_pPropSet->setPropertyValue(rPropertyName, aValue, aSet);
-            pBoxFmt->GetDoc()->SetAttr(aSet, *pBoxFmt);
+            pBoxFormat->GetDoc()->SetAttr(aSet, *pBoxFormat);
         }
         else if(aValue.isExtractableTo(cppu::UnoType<sal_Int32>::get()))
             pBox->setRowSpan(aValue.get<sal_Int32>());
@@ -1063,14 +1063,14 @@ uno::Any SwXCell::getPropertyValue(const OUString& rPropertyName)
         break;
         case FN_UNO_TEXT_SECTION:
         {
-            SwFrmFmt* pTblFmt = GetFrmFmt();
-            SwTable* pTable = SwTable::FindTable(pTblFmt);
-            SwTableNode* pTblNode = pTable->GetTableNode();
-            SwSectionNode* pSectionNode = pTblNode->FindSectionNode();
+            SwFrameFormat* pTableFormat = GetFrameFormat();
+            SwTable* pTable = SwTable::FindTable(pTableFormat);
+            SwTableNode* pTableNode = pTable->GetTableNode();
+            SwSectionNode* pSectionNode = pTableNode->FindSectionNode();
             if(!pSectionNode)
                 return uno::Any();
             SwSection& rSect = pSectionNode->GetSection();
-            return uno::makeAny(SwXTextSections::GetObject(*rSect.GetFmt()));
+            return uno::makeAny(SwXTextSections::GetObject(*rSect.GetFormat()));
         }
         break;
         case FN_UNO_CELL_NAME:
@@ -1085,7 +1085,7 @@ uno::Any SwXCell::getPropertyValue(const OUString& rPropertyName)
         break;
         default:
         {
-            const SwAttrSet& rSet = pBox->GetFrmFmt()->GetAttrSet();
+            const SwAttrSet& rSet = pBox->GetFrameFormat()->GetAttrSet();
             uno::Any aResult;
             m_pPropSet->getPropertyValue(rPropertyName, rSet, aResult);
             return aResult;
@@ -1140,26 +1140,26 @@ void SwXCell::SwClientNotify(const SwModify& rModify, const SfxHint& rHint)
     if(typeid(FindUnoInstanceHint<SwTableBox, SwXCell>) == typeid(rHint))
     {
         auto* pFindHint(static_cast<const FindUnoInstanceHint<SwTableBox, SwXCell>* >(&rHint));
-        if(!pFindHint->m_pCore && pFindHint->m_pCore == GetTblBox())
+        if(!pFindHint->m_pCore && pFindHint->m_pCore == GetTableBox())
             pFindHint->m_pResult = this;
     }
     else
         SwClient::SwClientNotify(rModify, rHint);
 }
 
-SwXCell* SwXCell::CreateXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, SwTable *pTable )
+SwXCell* SwXCell::CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable )
 {
-    if(!pTblFmt || !pBox)
+    if(!pTableFormat || !pBox)
         return nullptr;
     if(!pTable)
-        pTable = SwTable::FindTable(pTblFmt);
+        pTable = SwTable::FindTable(pTableFormat);
     SwTableSortBoxes::const_iterator it = pTable->GetTabSortBoxes().find(pBox);
     if(it == pTable->GetTabSortBoxes().end())
         return nullptr;
     size_t const nPos = it - pTable->GetTabSortBoxes().begin();
     FindUnoInstanceHint<SwTableBox, SwXCell> aHint{pBox};
-    pTblFmt->CallSwClientNotify(aHint);
-    return aHint.m_pResult ? aHint.m_pResult : new SwXCell(pTblFmt, pBox, nPos);
+    pTableFormat->CallSwClientNotify(aHint);
+    return aHint.m_pResult ? aHint.m_pResult : new SwXCell(pTableFormat, pBox, nPos);
 }
 
 /** search if a box exists in a table
@@ -1208,8 +1208,8 @@ uno::Sequence< OUString > SwXTextTableRow::getSupportedServiceNames() throw( uno
 
 TYPEINIT1(SwXTextTableRow, SwClient);
 
-SwXTextTableRow::SwXTextTableRow(SwFrmFmt* pFmt, SwTableLine* pLn) :
-    SwClient(pFmt),
+SwXTextTableRow::SwXTextTableRow(SwFrameFormat* pFormat, SwTableLine* pLn) :
+    SwClient(pFormat),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE_ROW)),
     pLine(pLn)
 { }
@@ -1232,8 +1232,8 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno:
            std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    SwTable* pTable = SwTable::FindTable( pFmt );
+    SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
+    SwTable* pTable = SwTable::FindTable( pFormat );
     SwTableLine* pLn = SwXTextTableRow::FindLine(pTable, pLine);
     if(pLn)
     {
@@ -1261,7 +1261,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno:
         {
             const SfxItemPropertySimpleEntry* pEntry =
                 m_pPropSet->getPropertyMap().getByName(rPropertyName);
-            SwDoc* pDoc = pFmt->GetDoc();
+            SwDoc* pDoc = pFormat->GetDoc();
             if (!pEntry)
                 throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
             if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
@@ -1272,7 +1272,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno:
                 case FN_UNO_ROW_HEIGHT:
                 case FN_UNO_ROW_AUTO_HEIGHT:
                 {
-                    SwFmtFrmSize aFrmSize(pLn->GetFrmFmt()->GetFrmSize());
+                    SwFormatFrmSize aFrmSize(pLn->GetFrameFormat()->GetFrmSize());
                     if(FN_UNO_ROW_AUTO_HEIGHT== pEntry->nWID)
                     {
                         bool bSet = *static_cast<sal_Bool const *>(aValue.getValue());
@@ -1286,24 +1286,24 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno:
                         aSz.Height() = convertMm100ToTwip(nHeight);
                         aFrmSize.SetSize(aSz);
                     }
-                    pDoc->SetAttr(aFrmSize, *pLn->ClaimFrmFmt());
+                    pDoc->SetAttr(aFrmSize, *pLn->ClaimFrameFormat());
                 }
                 break;
 
                 case FN_UNO_TABLE_COLUMN_SEPARATORS:
                 {
                     UnoActionContext aContext(pDoc);
-                    SwTable* pTable2 = SwTable::FindTable( pFmt );
-                    lcl_SetTblSeparators(aValue, pTable2, pLine->GetTabBoxes()[0], true, pDoc);
+                    SwTable* pTable2 = SwTable::FindTable( pFormat );
+                    lcl_SetTableSeparators(aValue, pTable2, pLine->GetTabBoxes()[0], true, pDoc);
                 }
                 break;
 
                 default:
                 {
-                    SwFrmFmt* pLnFmt = pLn->ClaimFrmFmt();
-                    SwAttrSet aSet(pLnFmt->GetAttrSet());
+                    SwFrameFormat* pLnFormat = pLn->ClaimFrameFormat();
+                    SwAttrSet aSet(pLnFormat->GetAttrSet());
                     m_pPropSet->setPropertyValue(*pEntry, aValue, aSet);
-                    pDoc->SetAttr(aSet, *pLnFmt);
+                    pDoc->SetAttr(aSet, *pLnFormat);
                 }
             }
         }
@@ -1314,8 +1314,8 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw(
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
-    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    SwTable* pTable = SwTable::FindTable( pFmt );
+    SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
+    SwTable* pTable = SwTable::FindTable( pFormat );
     SwTableLine* pLn = SwXTextTableRow::FindLine(pTable, pLine);
     if(pLn)
     {
@@ -1329,7 +1329,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw(
             case FN_UNO_ROW_HEIGHT:
             case FN_UNO_ROW_AUTO_HEIGHT:
             {
-                const SwFmtFrmSize& rSize = pLn->GetFrmFmt()->GetFrmSize();
+                const SwFormatFrmSize& rSize = pLn->GetFrameFormat()->GetFrmSize();
                 if(FN_UNO_ROW_AUTO_HEIGHT== pEntry->nWID)
                 {
                     aRet <<= ATT_VAR_SIZE == rSize.GetHeightSizeType();
@@ -1341,13 +1341,13 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw(
 
             case FN_UNO_TABLE_COLUMN_SEPARATORS:
             {
-                lcl_GetTblSeparators(aRet, pTable, pLine->GetTabBoxes()[0], true);
+                lcl_GetTableSeparators(aRet, pTable, pLine->GetTabBoxes()[0], true);
             }
             break;
 
             default:
             {
-                const SwAttrSet& rSet = pLn->GetFrmFmt()->GetAttrSet();
+                const SwAttrSet& rSet = pLn->GetFrameFormat()->GetAttrSet();
                 m_pPropSet->getPropertyValue(*pEntry, rSet, aRet);
             }
         }
@@ -1375,7 +1375,7 @@ void SwXTextTableRow::SwClientNotify(const SwModify& rModify, const SfxHint& rHi
     if(typeid(FindUnoInstanceHint<SwTableLine, SwXTextTableRow>) == typeid(rHint))
     {
         auto* pFindHint(static_cast<const FindUnoInstanceHint<SwTableLine,SwXTextTableRow>* >(&rHint));
-        if(!pFindHint->m_pCore && pFindHint->m_pCore == GetTblRow())
+        if(!pFindHint->m_pCore && pFindHint->m_pCore == GetTableRow())
             pFindHint->m_pResult = this;
     }
     else
@@ -1401,31 +1401,31 @@ sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName) throw
 IMPLEMENT_FORWARD_XINTERFACE2(SwXTextTableCursor,SwXTextTableCursor_Base,OTextCursorHelper)
 const SwPaM*        SwXTextTableCursor::GetPaM() const  { return GetCrsr(); }
 SwPaM*              SwXTextTableCursor::GetPaM()        { return GetCrsr(); }
-const SwDoc*        SwXTextTableCursor::GetDoc() const  { return GetFrmFmt()->GetDoc(); }
-SwDoc*              SwXTextTableCursor::GetDoc()        { return GetFrmFmt()->GetDoc(); }
+const SwDoc*        SwXTextTableCursor::GetDoc() const  { return GetFrameFormat()->GetDoc(); }
+SwDoc*              SwXTextTableCursor::GetDoc()        { return GetFrameFormat()->GetDoc(); }
 const SwUnoCrsr*    SwXTextTableCursor::GetCrsr() const { return static_cast<const SwUnoCrsr*>(aCrsrDepend.GetRegisteredIn()); }
 SwUnoCrsr*          SwXTextTableCursor::GetCrsr()       { return static_cast<SwUnoCrsr*>(aCrsrDepend.GetRegisteredIn()); }
 
 uno::Sequence<OUString> SwXTextTableCursor::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
     { return {"com.sun.star.text.TextTableCursor"}; }
 
-SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox) :
-    SwClient(pFmt),
+SwXTextTableCursor::SwXTextTableCursor(SwFrameFormat* pFormat, SwTableBox* pBox) :
+    SwClient(pFormat),
     aCrsrDepend(this, 0),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE_CURSOR))
 {
-    SwDoc* pDoc = pFmt->GetDoc();
+    SwDoc* pDoc = pFormat->GetDoc();
     const SwStartNode* pSttNd = pBox->GetSttNd();
     SwPosition aPos(*pSttNd);
     SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true);
     pUnoCrsr->Move( fnMoveForward, fnGoNode );
     pUnoCrsr->Add(&aCrsrDepend);
-    SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    rTblCrsr.MakeBoxSels();
+    SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    rTableCrsr.MakeBoxSels();
 }
 
-SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt& rTableFmt, const SwTableCursor* pTableSelection) :
-    SwClient(&rTableFmt),
+SwXTextTableCursor::SwXTextTableCursor(SwFrameFormat& rTableFormat, const SwTableCursor* pTableSelection) :
+    SwClient(&rTableFormat),
     aCrsrDepend(this, 0),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE_CURSOR))
 {
@@ -1456,22 +1456,22 @@ OUString SwXTextTableCursor::getRangeName()
 {
     SolarMutexGuard aGuard;
     SwUnoCrsr* pUnoCrsr = GetCrsr();
-    SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
+    SwUnoTableCrsr* pTableCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
     //!! see also SwChartDataSequence::getSourceRangeRepresentation
-    if(!pTblCrsr)
+    if(!pTableCrsr)
         return OUString();
-    pTblCrsr->MakeBoxSels();
-    const SwStartNode* pNode = pTblCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
-    const SwTable* pTable = SwTable::FindTable(GetFrmFmt());
-    const SwTableBox* pEndBox = pTable->GetTblBox(pNode->GetIndex());
-    if(pTblCrsr->HasMark())
+    pTableCrsr->MakeBoxSels();
+    const SwStartNode* pNode = pTableCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
+    const SwTable* pTable = SwTable::FindTable(GetFrameFormat());
+    const SwTableBox* pEndBox = pTable->GetTableBox(pNode->GetIndex());
+    if(pTableCrsr->HasMark())
     {
-        pNode = pTblCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode();
-        const SwTableBox* pStartBox = pTable->GetTblBox(pNode->GetIndex());
+        pNode = pTableCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode();
+        const SwTableBox* pStartBox = pTable->GetTableBox(pNode->GetIndex());
         if(pEndBox != pStartBox)
         {
             // need to switch start and end?
-            if(*pTblCrsr->GetPoint() < *pTblCrsr->GetMark())
+            if(*pTableCrsr->GetPoint() < *pTableCrsr->GetMark())
                 std::swap(pStartBox, pEndBox);
             return pStartBox->GetName() + ":" + pEndBox->GetName();
         }
@@ -1486,9 +1486,9 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& sCellName, sal_Bool
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(!pUnoCrsr)
         return false;
-    auto& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    lcl_CrsrSelect(rTblCrsr, bExpand);
-    return rTblCrsr.GotoTblBox(sCellName);
+    auto& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    lcl_CrsrSelect(rTableCrsr, bExpand);
+    return rTableCrsr.GotoTableBox(sCellName);
 }
 
 sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
@@ -1497,9 +1497,9 @@ sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool bExpand) throw( un
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(!pUnoCrsr)
         return false;
-    SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    lcl_CrsrSelect(rTblCrsr, bExpand);
-    return rTblCrsr.Left(Count, CRSR_SKIP_CHARS, false, false);
+    SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    lcl_CrsrSelect(rTableCrsr, bExpand);
+    return rTableCrsr.Left(Count, CRSR_SKIP_CHARS, false, false);
 }
 
 sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
@@ -1508,9 +1508,9 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand) throw( u
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(!pUnoCrsr)
         return false;
-    SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    lcl_CrsrSelect(rTblCrsr, bExpand);
-    return rTblCrsr.Right(Count, CRSR_SKIP_CHARS, false, false);
+    SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    lcl_CrsrSelect(rTableCrsr, bExpand);
+    return rTableCrsr.Right(Count, CRSR_SKIP_CHARS, false, false);
 }
 
 sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
@@ -1519,9 +1519,9 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool bExpand) throw( uno:
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(!pUnoCrsr)
         return false;
-    SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    lcl_CrsrSelect(rTblCrsr, bExpand);
-    return rTblCrsr.UpDown(true, Count, 0, 0);
+    SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    lcl_CrsrSelect(rTableCrsr, bExpand);
+    return rTableCrsr.UpDown(true, Count, 0, 0);
 }
 
 sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
@@ -1530,9 +1530,9 @@ sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool bExpand) throw( un
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(!pUnoCrsr)
         return false;
-    SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    lcl_CrsrSelect(rTblCrsr, bExpand);
-    return rTblCrsr.UpDown(false, Count, 0, 0);
+    SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    lcl_CrsrSelect(rTableCrsr, bExpand);
+    return rTableCrsr.UpDown(false, Count, 0, 0);
 }
 
 void SwXTextTableCursor::gotoStart(sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
@@ -1541,9 +1541,9 @@ void SwXTextTableCursor::gotoStart(sal_Bool bExpand) throw( uno::RuntimeExceptio
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(!pUnoCrsr)
         return;
-    SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    lcl_CrsrSelect(rTblCrsr, bExpand);
-    rTblCrsr.MoveTable(fnTableCurr, fnTableStart);
+    SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    lcl_CrsrSelect(rTableCrsr, bExpand);
+    rTableCrsr.MoveTable(fnTableCurr, fnTableStart);
 }
 
 void SwXTextTableCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
@@ -1552,9 +1552,9 @@ void SwXTextTableCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException,
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(!pUnoCrsr)
         return;
-    SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    lcl_CrsrSelect(rTblCrsr, bExpand);
-    rTblCrsr.MoveTable(fnTableCurr, fnTableEnd);
+    SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    lcl_CrsrSelect(rTableCrsr, bExpand);
+    rTableCrsr.MoveTable(fnTableCurr, fnTableEnd);
 }
 
 sal_Bool SwXTextTableCursor::mergeRange()
@@ -1568,20 +1568,20 @@ sal_Bool SwXTextTableCursor::mergeRange()
         // The Actions need to be revoked here
         UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
     }
-    SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    rTblCrsr.MakeBoxSels();
+    SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    rTableCrsr.MakeBoxSels();
     bool bResult;
     {
         UnoActionContext aContext(pUnoCrsr->GetDoc());
-        bResult = TBLMERGE_OK == rTblCrsr.GetDoc()->MergeTbl(rTblCrsr);
+        bResult = TBLMERGE_OK == rTableCrsr.GetDoc()->MergeTable(rTableCrsr);
     }
     if(bResult)
     {
-        size_t nCount = rTblCrsr.GetSelectedBoxesCount();
+        size_t nCount = rTableCrsr.GetSelectedBoxesCount();
         while (nCount--)
-            rTblCrsr.DeleteBox(nCount);
+            rTableCrsr.DeleteBox(nCount);
     }
-    rTblCrsr.MakeBoxSels();
+    rTableCrsr.MakeBoxSels();
     return bResult;
 }
 
@@ -1598,14 +1598,14 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal)
         // here, all actions need to be revoked
         UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
     }
-    SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    rTblCrsr.MakeBoxSels();
+    SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    rTableCrsr.MakeBoxSels();
     bool bResult;
     {
         UnoActionContext aContext(pUnoCrsr->GetDoc());
-        bResult = rTblCrsr.GetDoc()->SplitTbl(rTblCrsr.GetSelectedBoxes(), !Horizontal, Count);
+        bResult = rTableCrsr.GetDoc()->SplitTable(rTableCrsr.GetSelectedBoxes(), !Horizontal, Count);
     }
-    rTblCrsr.MakeBoxSels();
+    rTableCrsr.MakeBoxSels();
     return bResult;
 }
 
@@ -1634,11 +1634,11 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const u
         throw beans::PropertyVetoException("Property is read-only: " + rPropertyName, static_cast<cppu::OWeakObject*>(this));
     {
         auto pSttNode = pUnoCrsr->GetNode().StartOfSectionNode();
-        const SwTableNode* pTblNode = pSttNode->FindTableNode();
-        lcl_FormatTable(pTblNode->GetTable().GetFrmFmt());
+        const SwTableNode* pTableNode = pSttNode->FindTableNode();
+        lcl_FormatTable(pTableNode->GetTable().GetFrameFormat());
     }
-    auto& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
-    rTblCrsr.MakeBoxSels();
+    auto& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    rTableCrsr.MakeBoxSels();
     SwDoc* pDoc = pUnoCrsr->GetDoc();
     switch(pEntry->nWID)
     {
@@ -1659,20 +1659,20 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const u
         }
         break;
         case FN_UNO_PARA_STYLE:
-            SwUnoCursorHelper::SetTxtFmtColl(aValue, *pUnoCrsr);
+            SwUnoCursorHelper::SetTextFormatColl(aValue, *pUnoCrsr);
         break;
         default:
         {
             SfxItemSet aItemSet(pDoc->GetAttrPool(), pEntry->nWID, pEntry->nWID);
-            SwUnoCursorHelper::GetCrsrAttr(rTblCrsr.GetSelRing(),
+            SwUnoCursorHelper::GetCrsrAttr(rTableCrsr.GetSelRing(),
                     aItemSet);
 
             if (!SwUnoCursorHelper::SetCursorPropertyValue(
-                    *pEntry, aValue, rTblCrsr.GetSelRing(), aItemSet))
+                    *pEntry, aValue, rTableCrsr.GetSelRing(), aItemSet))
             {
                 m_pPropSet->setPropertyValue(*pEntry, aValue, aItemSet);
             }
-            SwUnoCursorHelper::SetCrsrAttr(rTblCrsr.GetSelRing(),
+            SwUnoCursorHelper::SetCrsrAttr(rTableCrsr.GetSelRing(),
                     aItemSet, SetAttrMode::DEFAULT, true);
         }
     }
@@ -1690,14 +1690,14 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
         return uno::Any();
     {
         auto pSttNode = pUnoCrsr->GetNode().StartOfSectionNode();
-        const SwTableNode* pTblNode = pSttNode->FindTableNode();
-        lcl_FormatTable(pTblNode->GetTable().GetFrmFmt());
+        const SwTableNode* pTableNode = pSttNode->FindTableNode();
+        lcl_FormatTable(pTableNode->GetTable().GetFrameFormat());
     }
-    SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+    SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
     auto pEntry(m_pPropSet->getPropertyMap().getByName(rPropertyName));
     if(!pEntry)
         throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast<cppu::OWeakObject*>(this));
-    rTblCrsr.MakeBoxSels();
+    rTableCrsr.MakeBoxSels();
     uno::Any aResult;
     switch(pEntry->nWID)
     {
@@ -1714,18 +1714,18 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
         break;
         case FN_UNO_PARA_STYLE:
         {
-            auto pFmt(SwUnoCursorHelper::GetCurTxtFmtColl(*pUnoCrsr, false));
-            if(pFmt)
-                aResult = uno::makeAny(pFmt->GetName());
+            auto pFormat(SwUnoCursorHelper::GetCurTextFormatColl(*pUnoCrsr, false));
+            if(pFormat)
+                aResult = uno::makeAny(pFormat->GetName());
         }
         break;
         default:
         {
-            SfxItemSet aSet(rTblCrsr.GetDoc()->GetAttrPool(),
+            SfxItemSet aSet(rTableCrsr.GetDoc()->GetAttrPool(),
                 RES_CHRATR_BEGIN, RES_FRMATR_END-1,
                 RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
                 0L);
-            SwUnoCursorHelper::GetCrsrAttr(rTblCrsr.GetSelRing(), aSet);
+            SwUnoCursorHelper::GetCrsrAttr(rTableCrsr.GetSelRing(), aSet);
             m_pPropSet->getPropertyValue(*pEntry, aSet, aResult);
         }
     }
@@ -1784,7 +1784,7 @@ public:
     template<typename Tpoolitem>
     inline void AddItemToSet(SfxItemSet& rSet, std::function<Tpoolitem()> aItemFactory, sal_uInt16 nWhich, std::initializer_list<sal_uInt16> vMember, bool bAddTwips = false);
 
-    void ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc);
+    void ApplyTableAttr(const SwTable& rTable, SwDoc& rDoc);
 };
 
 SwTableProperties_Impl::SwTableProperties_Impl()
@@ -1818,7 +1818,7 @@ void SwTableProperties_Impl::AddItemToSet(SfxItemSet& rSet, std::function<Tpooli
         rSet.Put(aItem);
     }
 }
-void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
+void SwTableProperties_Impl::ApplyTableAttr(const SwTable& rTable, SwDoc& rDoc)
 {
     SfxItemSet aSet(rDoc.GetAttrPool(),
         RES_LAYOUT_SPLIT,   RES_LAYOUT_SPLIT,
@@ -1832,14 +1832,14 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
         0
         );
     const uno::Any* pRepHead;
-    const SwFrmFmt &rFrmFmt = *rTbl.GetFrmFmt();
+    const SwFrameFormat &rFrameFormat = *rTable.GetFrameFormat();
     if(GetProperty(FN_TABLE_HEADLINE_REPEAT, 0xff, pRepHead ))
     {
         bool bVal(pRepHead->get<bool>());
-        const_cast<SwTable&>(rTbl).SetRowsToRepeat( bVal ? 1 : 0 );  // TODO: MULTIHEADER
+        const_cast<SwTable&>(rTable).SetRowsToRepeat( bVal ? 1 : 0 );  // TODO: MULTIHEADER
     }
 
-    AddItemToSet<SvxBrushItem>(aSet, [&rFrmFmt]() { return rFrmFmt.makeBackgroundBrushItem(); }, RES_BACKGROUND, {
+    AddItemToSet<SvxBrushItem>(aSet, [&rFrameFormat]() { return rFrameFormat.makeBackgroundBrushItem(); }, RES_BACKGROUND, {
         MID_BACK_COLOR,
         MID_GRAPHIC_TRANSPARENT,
         MID_GRAPHIC_POSITION,
@@ -1857,7 +1857,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
             const SwPageDesc* pDesc = SwPageDesc::GetByName(rDoc, sPageStyle);
             if(pDesc)
             {
-                SwFmtPageDesc aDesc(pDesc);
+                SwFormatPageDesc aDesc(pDesc);
                 const uno::Any* pPgNo;
                 if(GetProperty(RES_PAGEDESC, MID_PAGEDESC_PAGENUMOFFSET, pPgNo))
                 {
@@ -1871,10 +1871,10 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
     }
 
     if(bPutBreak)
-        AddItemToSet<SvxFmtBreakItem>(aSet, [&rFrmFmt]() { return rFrmFmt.GetBreak(); }, RES_BREAK, {0});
-    AddItemToSet<SvxShadowItem>(aSet, [&rFrmFmt]() { return rFrmFmt.GetShadow(); }, RES_SHADOW, {0}, true);
-    AddItemToSet<SvxFmtKeepItem>(aSet, [&rFrmFmt]() { return rFrmFmt.GetKeep(); }, RES_KEEP, {0});
-    AddItemToSet<SwFmtHoriOrient>(aSet, [&rFrmFmt]() { return rFrmFmt.GetHoriOrient(); }, RES_HORI_ORIENT, {MID_HORIORIENT_ORIENT}, true);
+        AddItemToSet<SvxFormatBreakItem>(aSet, [&rFrameFormat]() { return rFrameFormat.GetBreak(); }, RES_BREAK, {0});
+    AddItemToSet<SvxShadowItem>(aSet, [&rFrameFormat]() { return rFrameFormat.GetShadow(); }, RES_SHADOW, {0}, true);
+    AddItemToSet<SvxFormatKeepItem>(aSet, [&rFrameFormat]() { return rFrameFormat.GetKeep(); }, RES_KEEP, {0});
+    AddItemToSet<SwFormatHoriOrient>(aSet, [&rFrameFormat]() { return rFrameFormat.GetHoriOrient(); }, RES_HORI_ORIENT, {MID_HORIORIENT_ORIENT}, true);
 
     const uno::Any* pSzRel(nullptr);
     GetProperty(FN_TABLE_IS_RELATIVE_WIDTH, 0xff, pSzRel);
@@ -1884,7 +1884,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
     GetProperty(FN_TABLE_WIDTH, 0xff, pWidth);
 
     bool bPutSize = pWidth != nullptr;
-    SwFmtFrmSize aSz(ATT_VAR_SIZE);
+    SwFormatFrmSize aSz(ATT_VAR_SIZE);
     if(pWidth)
     {
         aSz.PutValue(*pWidth, MID_FRMSIZE_WIDTH);
@@ -1901,21 +1901,21 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
             aSz.SetWidth(MINLAY);
         aSet.Put(aSz);
     }
-    AddItemToSet<SvxLRSpaceItem>(aSet, [&rFrmFmt]() { return rFrmFmt.GetLRSpace(); }, RES_LR_SPACE, {
+    AddItemToSet<SvxLRSpaceItem>(aSet, [&rFrameFormat]() { return rFrameFormat.GetLRSpace(); }, RES_LR_SPACE, {
         MID_L_MARGIN|CONVERT_TWIPS,
         MID_R_MARGIN|CONVERT_TWIPS });
-    AddItemToSet<SvxULSpaceItem>(aSet, [&rFrmFmt]() { return rFrmFmt.GetULSpace(); }, RES_UL_SPACE, {
+    AddItemToSet<SvxULSpaceItem>(aSet, [&rFrameFormat]() { return rFrameFormat.GetULSpace(); }, RES_UL_SPACE, {
         MID_UP_MARGIN|CONVERT_TWIPS,
         MID_LO_MARGIN|CONVERT_TWIPS });
     const::uno::Any* pSplit(nullptr);
     if(GetProperty(RES_LAYOUT_SPLIT, 0, pSplit))
     {
-        SwFmtLayoutSplit aSp(pSplit->get<bool>());
+        SwFormatLayoutSplit aSp(pSplit->get<bool>());
         aSet.Put(aSp);
     }
     if(aSet.Count())
     {
-        rDoc.SetAttr(aSet, *rTbl.GetFrmFmt());
+        rDoc.SetAttr(aSet, *rTable.GetFrameFormat());
     }
 }
 
@@ -1952,8 +1952,8 @@ SwXTextTable::SwXTextTable()
     m_bFirstColumnAsLabel(false)
 { }
 
-SwXTextTable::SwXTextTable(SwFrmFmt& rFrmFmt)
-    : SwClient( &rFrmFmt )
+SwXTextTable::SwXTextTable(SwFrameFormat& rFrameFormat)
+    : SwClient( &rFrameFormat )
     , m_pImpl(new Impl)
     ,
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE)),
@@ -1968,17 +1968,17 @@ SwXTextTable::SwXTextTable(SwFrmFmt& rFrmFmt)
 SwXTextTable::~SwXTextTable()
     { delete pTableProps; }
 
-uno::Reference<text::XTextTable> SwXTextTable::CreateXTextTable(SwFrmFmt* const pFrmFmt)
+uno::Reference<text::XTextTable> SwXTextTable::CreateXTextTable(SwFrameFormat* const pFrameFormat)
 {
     uno::Reference<text::XTextTable> xTable;
-    if(pFrmFmt)
-        xTable.set(pFrmFmt->GetXObject(), uno::UNO_QUERY); // cached?
+    if(pFrameFormat)
+        xTable.set(pFrameFormat->GetXObject(), uno::UNO_QUERY); // cached?
     if(xTable.is())
         return xTable;
-    SwXTextTable* const pNew( (pFrmFmt) ? new SwXTextTable(*pFrmFmt) : new SwXTextTable());
+    SwXTextTable* const pNew( (pFrameFormat) ? new SwXTextTable(*pFrameFormat) : new SwXTextTable());
     xTable.set(pNew);
-    if(pFrmFmt)
-        pFrmFmt->SetXObject(xTable);
+    if(pFrameFormat)
+        pFrameFormat->SetXObject(xTable);
     // need a permanent Reference to initialize m_wThis
     pNew->m_pImpl->m_wThis = xTable;
     return xTable;
@@ -1998,8 +1998,8 @@ uno::Reference< table::XTableRows >  SwXTextTable::getRows() throw( uno::Runtime
     uno::Reference<table::XTableRows> xResult(m_xRows);
     if(xResult.is())
         return xResult;
-    if(SwFrmFmt* pFmt = GetFrmFmt())
-        m_xRows = xResult = new SwXTableRows(*pFmt);
+    if(SwFrameFormat* pFormat = GetFrameFormat())
+        m_xRows = xResult = new SwXTableRows(*pFormat);
     if(!xResult.is())
         throw uno::RuntimeException();
     return xResult;
@@ -2011,8 +2011,8 @@ uno::Reference< table::XTableColumns >  SwXTextTable::getColumns() throw( uno::R
     uno::Reference<table::XTableColumns> xResult(m_xColumns);
     if(xResult.is())
         return xResult;
-    if(SwFrmFmt* pFmt = GetFrmFmt())
-        m_xColumns = xResult = new SwXTableColumns(*pFmt);
+    if(SwFrameFormat* pFormat = GetFrameFormat())
+        m_xColumns = xResult = new SwXTableColumns(*pFormat);
     if(!xResult.is())
         throw uno::RuntimeException();
     return xResult;
@@ -2021,25 +2021,25 @@ uno::Reference< table::XTableColumns >  SwXTextTable::getColumns() throw( uno::R
 uno::Reference<table::XCell> SwXTextTable::getCellByName(const OUString& sCellName) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    SwTable* pTable = SwTable::FindTable(pFmt);
-    SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTblBox(sCellName));
+    SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
+    SwTable* pTable = SwTable::FindTable(pFormat);
+    SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTableBox(sCellName));
     if(!pBox)
         return nullptr;
-    return SwXCell::CreateXCell(pFmt, pBox);
+    return SwXCell::CreateXCell(pFormat, pBox);
 }
 
 uno::Sequence<OUString> SwXTextTable::getCellNames() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt(GetFrmFmt());
-    if(!pFmt)
+    SwFrameFormat* pFormat(GetFrameFormat());
+    if(!pFormat)
         return {};
-    SwTable* pTable = SwTable::FindTable(pFmt);
+    SwTable* pTable = SwTable::FindTable(pFormat);
     // exists at the table and at all boxes
-    SwTableLines& rTblLines = pTable->GetTabLines();
+    SwTableLines& rTableLines = pTable->GetTabLines();
     std::vector<OUString> aAllNames;
-    lcl_InspectLines(rTblLines, aAllNames);
+    lcl_InspectLines(rTableLines, aAllNames);
     return comphelper::containerToSequence<OUString>(aAllNames);
 }
 
@@ -2047,13 +2047,13 @@ uno::Reference<text::XTextTableCursor> SwXTextTable::createCursorByCellName(cons
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
+    SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
     uno::Reference<text::XTextTableCursor> xRet;
-    SwTable* pTable = SwTable::FindTable(pFmt);
-    SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTblBox(sCellName));
+    SwTable* pTable = SwTable::FindTable(pFormat);
+    SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTableBox(sCellName));
     if(!pBox || pBox->getRowSpan() == 0)
         throw uno::RuntimeException();
-    return new SwXTextTableCursor(pFmt, pBox);
+    return new SwXTextTableCursor(pFormat, pBox);
 }
 
 void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTextRange)
@@ -2102,20 +2102,20 @@ void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTex
         if(pTable)
         {
             // here, the properties of the descriptor need to be analyzed
-            pTableProps->ApplyTblAttr(*pTable, *pDoc);
-            SwFrmFmt* pTblFmt(pTable->GetFrmFmt());
-            lcl_FormatTable(pTblFmt);
+            pTableProps->ApplyTableAttr(*pTable, *pDoc);
+            SwFrameFormat* pTableFormat(pTable->GetFrameFormat());
+            lcl_FormatTable(pTableFormat);
 
-            pTblFmt->Add(this);
+            pTableFormat->Add(this);
             if(!m_sTableName.isEmpty())
             {
                 sal_uInt16 nIndex = 1;
                 OUString sTmpNameIndex(m_sTableName);
-                while(pDoc->FindTblFmtByName(sTmpNameIndex, true) && nIndex < USHRT_MAX)
+                while(pDoc->FindTableFormatByName(sTmpNameIndex, true) && nIndex < USHRT_MAX)
                 {
                     sTmpNameIndex = m_sTableName + OUString::number(nIndex++);
                 }
-                pDoc->SetTableName( *pTblFmt, sTmpNameIndex);
+                pDoc->SetTableName( *pTableFormat, sTmpNameIndex);
             }
 
             const::uno::Any* pName;
@@ -2139,19 +2139,19 @@ uno::Reference<text::XTextRange>  SwXTextTable::getAnchor()
         throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    return new SwXTextRange(*pFmt);
+    SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
+    return new SwXTextRange(*pFormat);
 }
 
 void SwXTextTable::dispose() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    SwTable* pTable = SwTable::FindTable(pFmt);
+    SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
+    SwTable* pTable = SwTable::FindTable(pFormat);
     SwSelBoxes aSelBoxes;
     for(auto& rBox : pTable->GetTabSortBoxes() )
         aSelBoxes.insert(rBox);
-    pFmt->GetDoc()->DeleteRowCol(aSelBoxes);
+    pFormat->GetDoc()->DeleteRowCol(aSelBoxes);
 }
 
 void SAL_CALL SwXTextTable::addEventListener(
@@ -2176,34 +2176,34 @@ uno::Reference<table::XCell>  SwXTextTable::getCellByPosition(sal_Int32 nColumn,
     throw( uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt(GetFrmFmt());
+    SwFrameFormat* pFormat(GetFrameFormat());
     // sheet is unimportant
-    if(nColumn >= 0 && nRow >= 0 && nColumn < USHRT_MAX && nRow < USHRT_MAX && pFmt)
+    if(nColumn >= 0 && nRow >= 0 && nColumn < USHRT_MAX && nRow < USHRT_MAX && pFormat)
     {
-        auto pXCell = lcl_CreateXCell(pFmt, nColumn, nRow);
+        auto pXCell = lcl_CreateXCell(pFormat, nColumn, nRow);
         if(pXCell)
             return pXCell;
     }
     throw lang::IndexOutOfBoundsException();
 }
 
-uno::Reference<table::XCellRange>  SwXTextTable::GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable,
+uno::Reference<table::XCellRange>  SwXTextTable::GetRangeByName(SwFrameFormat* pFormat, SwTable* pTable,
         const OUString& rTLName, const OUString& rBRName,
         SwRangeDescriptor& rDesc)
 {
     SolarMutexGuard aGuard;
-    const SwTableBox* pTLBox = pTable->GetTblBox(rTLName);
+    const SwTableBox* pTLBox = pTable->GetTableBox(rTLName);
     if(!pTLBox)
         return nullptr;
     // invalidate all actions
-    UnoActionRemoveContext aRemoveContext(pFmt->GetDoc());
+    UnoActionRemoveContext aRemoveContext(pFormat->GetDoc());
     const SwStartNode* pSttNd = pTLBox->GetSttNd();
     SwPosition aPos(*pSttNd);
     // set cursor to the upper-left cell of the range
-    SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, true);
+    SwUnoCrsr* pUnoCrsr = pFormat->GetDoc()->CreateUnoCrsr(aPos, true);
     pUnoCrsr->Move(fnMoveForward, fnGoNode);
     pUnoCrsr->SetRemainInSection(false);
-    const SwTableBox* pBRBox(pTable->GetTblBox(rBRName));
+    const SwTableBox* pBRBox(pTable->GetTableBox(rBRName));
     if(!pBRBox)
     {
         delete pUnoCrsr;
@@ -2215,20 +2215,20 @@ uno::Reference<table::XCellRange>  SwXTextTable::GetRangeByName(SwFrmFmt* pFmt,
     SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
     pCrsr->MakeBoxSels();
     // pUnoCrsr will be provided and will not be deleted
-    return new SwXCellRange(pUnoCrsr, *pFmt, rDesc);
+    return new SwXCellRange(pUnoCrsr, *pFormat, rDesc);
 }
 
 uno::Reference<table::XCellRange>  SwXTextTable::getCellRangeByPosition(sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom)
     throw(uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt(GetFrmFmt());
-    if(pFmt && nRight < USHRT_MAX && nBottom < USHRT_MAX &&
+    SwFrameFormat* pFormat(GetFrameFormat());
+    if(pFormat && nRight < USHRT_MAX && nBottom < USHRT_MAX &&
             nLeft <= nRight && nTop <= nBottom &&
             nLeft >= 0 && nRight >= 0 && nTop >= 0 && nBottom >= 0 )
     {
-        SwTable* pTable = SwTable::FindTable(pFmt);
-        if(!pTable->IsTblComplex())
+        SwTable* pTable = SwTable::FindTable(pFormat);
+        if(!pTable->IsTableComplex())
         {
             SwRangeDescriptor aDesc;
             aDesc.nTop    = nTop;
@@ -2239,7 +2239,7 @@ uno::Reference<table::XCellRange>  SwXTextTable::getCellRangeByPosition(sal_Int3
             const OUString sBRName = sw_GetCellName(aDesc.nRight, aDesc.nBottom);
             // please note that according to the 'if' statement at the begin
             // sTLName:sBRName already denotes the normalized range string
-            return GetRangeByName(pFmt, pTable, sTLName, sBRName, aDesc);
+            return GetRangeByName(pFormat, pTable, sTLName, sBRName, aDesc);
         }
     }
     throw lang::IndexOutOfBoundsException();
@@ -2250,8 +2250,8 @@ uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByName(const OUStrin
 {
     SolarMutexGuard aGuard;
     uno::Reference< table::XCellRange >  aRef;
-    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFmt), static_cast<cppu::OWeakObject*>(this));
+    SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
+    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFormat), static_cast<cppu::OWeakObject*>(this));
     sal_Int32 nPos = 0;
     const OUString sTLName(sRange.getToken(0, ':', nPos));
     const OUString sBRName(sRange.getToken(0, ':', nPos));
@@ -2267,7 +2267,7 @@ uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByName(const OUStrin
     // elsewhere when the cursor in the implementation does not
     // point to the top-left and bottom-right cells
     aDesc.Normalize();
-    return GetRangeByName(pFmt, pTable, sTLName, sBRName, aDesc);
+    return GetRangeByName(pFormat, pTable, sTLName, sBRName, aDesc);
 }
 
 uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray()
@@ -2411,11 +2411,11 @@ void SwXTextTable::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor
 {
     SolarMutexGuard aGuard;
     SwSortOptions aSortOpt;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt &&
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat &&
         SwUnoCursorHelper::ConvertSortProperties(rDescriptor, aSortOpt))
     {
-        SwTable* pTable = SwTable::FindTable( pFmt );
+        SwTable* pTable = SwTable::FindTable( pFormat );
         SwSelBoxes aBoxes;
         const SwTableSortBoxes& rTBoxes = pTable->GetTabSortBoxes();
         for (size_t n = 0; n < rTBoxes.size(); ++n)
@@ -2423,22 +2423,22 @@ void SwXTextTable::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor
             SwTableBox* pBox = rTBoxes[ n ];
             aBoxes.insert( pBox );
         }
-        UnoActionContext aContext( pFmt->GetDoc() );
-        pFmt->GetDoc()->SortTbl(aBoxes, aSortOpt);
+        UnoActionContext aContext( pFormat->GetDoc() );
+        pFormat->GetDoc()->SortTable(aBoxes, aSortOpt);
     }
 }
 
-void SwXTextTable::autoFormat(const OUString& sAutoFmtName)
+void SwXTextTable::autoFormat(const OUString& sAutoFormatName)
     throw (lang::IllegalArgumentException, uno::RuntimeException,
            std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFmt), static_cast<cppu::OWeakObject*>(this));
-    SwTableAutoFmtTbl aAutoFmtTbl;
-    aAutoFmtTbl.Load();
-    for (size_t i = aAutoFmtTbl.size(); i;)
-        if( sAutoFmtName == aAutoFmtTbl[ --i ].GetName() )
+    SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
+    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFormat), static_cast<cppu::OWeakObject*>(this));
+    SwTableAutoFormatTable aAutoFormatTable;
+    aAutoFormatTable.Load();
+    for (size_t i = aAutoFormatTable.size(); i;)
+        if( sAutoFormatName == aAutoFormatTable[ --i ].GetName() )
         {
             SwSelBoxes aBoxes;
             const SwTableSortBoxes& rTBoxes = pTable->GetTabSortBoxes();
@@ -2447,8 +2447,8 @@ void SwXTextTable::autoFormat(const OUString& sAutoFmtName)
                 SwTableBox* pBox = rTBoxes[ n ];
                 aBoxes.insert( pBox );
             }
-            UnoActionContext aContext( pFmt->GetDoc() );
-            pFmt->GetDoc()->SetTableAutoFmt( aBoxes, aAutoFmtTbl[i] );
+            UnoActionContext aContext( pFormat->GetDoc() );
+            pFormat->GetDoc()->SetTableAutoFormat( aBoxes, aAutoFormatTable[i] );
             break;
         }
 }
@@ -2465,21 +2465,21 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
           uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
+    SwFrameFormat* pFormat = GetFrameFormat();
     if(!aValue.hasValue())
         throw lang::IllegalArgumentException();
     const SfxItemPropertySimpleEntry* pEntry =
                                 m_pPropSet->getPropertyMap().getByName(rPropertyName);
     if( !pEntry )
         throw lang::IllegalArgumentException();
-    if(pFmt)
+    if(pFormat)
     {
         if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
             throw beans::PropertyVetoException("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
 
         if(0xFF == pEntry->nMemberId)
         {
-            lcl_SetSpecialProperty(pFmt, pEntry, aValue);
+            lcl_SetSpecialProperty(pFormat, pEntry, aValue);
         }
         else
         {
@@ -2568,10 +2568,10 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
                     {
                         break; // something else
                     }
-                    SwDoc* pDoc = pFmt->GetDoc();
-                    if(!lcl_FormatTable(pFmt))
+                    SwDoc* pDoc = pFormat->GetDoc();
+                    if(!lcl_FormatTable(pFormat))
                         break;
-                    SwTable* pTable = SwTable::FindTable( pFmt );
+                    SwTable* pTable = SwTable::FindTable( pFormat );
                     SwTableLines &rLines = pTable->GetTabLines();
 
                     // invalidate all actions
@@ -2642,8 +2642,8 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
                     const sal_uInt16 nRightDistance =  convertMm100ToTwip(aTableBorderDistances.RightDistance);
                     const sal_uInt16 nTopDistance =    convertMm100ToTwip(aTableBorderDistances.TopDistance);
                     const sal_uInt16 nBottomDistance = convertMm100ToTwip(aTableBorderDistances.BottomDistance);
-                    SwDoc* pDoc = pFmt->GetDoc();
-                    SwTable* pTable = SwTable::FindTable( pFmt );
+                    SwDoc* pDoc = pFormat->GetDoc();
+                    SwTable* pTable = SwTable::FindTable( pFormat );
                     SwTableLines &rLines = pTable->GetTabLines();
                     pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_START, NULL);
                     for(size_t i = 0; i < rLines.size(); ++i)
@@ -2653,8 +2653,8 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
                         for(size_t k = 0; k < rBoxes.size(); ++k)
                         {
                             SwTableBox* pBox = rBoxes[k];
-                            const SwFrmFmt* pBoxFmt = pBox->GetFrmFmt();
-                            const SvxBoxItem& rBox = pBoxFmt->GetBox();
+                            const SwFrameFormat* pBoxFormat = pBox->GetFrameFormat();
+                            const SvxBoxItem& rBox = pBoxFormat->GetBox();
                             if(
                                 (aTableBorderDistances.IsLeftDistanceValid && nLeftDistance !=   rBox.GetDistance( SvxBoxItemLine::LEFT )) ||
                                 (aTableBorderDistances.IsRightDistanceValid && nRightDistance !=  rBox.GetDistance( SvxBoxItemLine::RIGHT )) ||
@@ -2662,7 +2662,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
                                 (aTableBorderDistances.IsBottomDistanceValid && nBottomDistance != rBox.GetDistance( SvxBoxItemLine::BOTTOM )))
                             {
                                 SvxBoxItem aSetBox( rBox );
-                                SwFrmFmt* pSetBoxFmt = pBox->ClaimFrmFmt();
+                                SwFrameFormat* pSetBoxFormat = pBox->ClaimFrameFormat();
                                 if( aTableBorderDistances.IsLeftDistanceValid )
                                     aSetBox.SetDistance( nLeftDistance, SvxBoxItemLine::LEFT );
                                 if( aTableBorderDistances.IsRightDistanceValid )
@@ -2671,7 +2671,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
                                     aSetBox.SetDistance( nTopDistance, SvxBoxItemLine::TOP );
                                 if( aTableBorderDistances.IsBottomDistanceValid )
                                     aSetBox.SetDistance( nBottomDistance, SvxBoxItemLine::BOTTOM );
-                                pDoc->SetAttr( aSetBox, *pSetBoxFmt );
+                                pDoc->SetAttr( aSetBox, *pSetBoxFormat );
                             }
                         }
                     }
@@ -2681,9 +2681,9 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
 
                 case FN_UNO_TABLE_COLUMN_SEPARATORS:
                 {
-                    UnoActionContext aContext(pFmt->GetDoc());
-                    SwTable* pTable = SwTable::FindTable( pFmt );
-                    lcl_SetTblSeparators(aValue, pTable, pTable->GetTabLines()[0]->GetTabBoxes()[0], false, pFmt->GetDoc());
+                    UnoActionContext aContext(pFormat->GetDoc());
+                    SwTable* pTable = SwTable::FindTable( pFormat );
+                    lcl_SetTableSeparators(aValue, pTable, pTable->GetTabLines()[0]->GetTabBoxes()[0], false, pFormat->GetDoc());
                 }
                 break;
 
@@ -2691,9 +2691,9 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
 
                 default:
                 {
-                    SwAttrSet aSet(pFmt->GetAttrSet());
+                    SwAttrSet aSet(pFormat->GetAttrSet());
                     m_pPropSet->setPropertyValue(*pEntry, aValue, aSet);
-                    pFmt->GetDoc()->SetAttr(aSet, *pFmt);
+                    pFormat->GetDoc()->SetAttr(aSet, *pFormat);
                 }
             }
         }
@@ -2714,18 +2714,18 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
-    SwFrmFmt* pFmt = GetFrmFmt();
+    SwFrameFormat* pFormat = GetFrameFormat();
     const SfxItemPropertySimpleEntry* pEntry =
                                 m_pPropSet->getPropertyMap().getByName(rPropertyName);
 
     if (!pEntry)
         throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
 
-    if(pFmt)
+    if(pFormat)
     {
         if(0xFF == pEntry->nMemberId)
         {
-            aRet = lcl_GetSpecialProperty(pFmt, pEntry );
+            aRet = lcl_GetSpecialProperty(pFormat, pEntry );
         }
         else
         {
@@ -2757,11 +2757,11 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
                 case FN_UNO_TABLE_BORDER:
                 case FN_UNO_TABLE_BORDER2:
                 {
-                    SwDoc* pDoc = pFmt->GetDoc();
+                    SwDoc* pDoc = pFormat->GetDoc();
                     // tables without layout (invisible header/footer?)
-                    if(!lcl_FormatTable(pFmt))
+                    if(!lcl_FormatTable(pFormat))
                         break;
-                    SwTable* pTable = SwTable::FindTable( pFmt );
+                    SwTable* pTable = SwTable::FindTable( pFormat );
                     SwTableLines &rLines = pTable->GetTabLines();
 
                     // invalidate all actions
@@ -2838,7 +2838,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
                 case FN_UNO_TABLE_BORDER_DISTANCES :
                 {
                     table::TableBorderDistances aTableBorderDistances( 0, sal_True, 0, sal_True, 0, sal_True, 0, sal_True ) ;
-                    SwTable* pTable = SwTable::FindTable( pFmt );
+                    SwTable* pTable = SwTable::FindTable( pFormat );
                     const SwTableLines &rLines = pTable->GetTabLines();
                     bool bFirst = true;
                     sal_uInt16 nLeftDistance = 0;
@@ -2853,8 +2853,8 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
                         for(size_t k = 0; k < rBoxes.size(); ++k)
                         {
                             const SwTableBox* pBox = rBoxes[k];
-                            SwFrmFmt* pBoxFmt = pBox->GetFrmFmt();
-                            const SvxBoxItem& rBox = pBoxFmt->GetBox();
+                            SwFrameFormat* pBoxFormat = pBox->GetFrameFormat();
+                            const SvxBoxItem& rBox = pBoxFormat->GetBox();
                             if( bFirst )
                             {
                                 nLeftDistance =     convertTwipToMm100( rBox.GetDistance( SvxBoxItemLine::LEFT   ));
@@ -2901,8 +2901,8 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
 
                 case FN_UNO_TABLE_COLUMN_SEPARATORS:
                 {
-                    SwTable* pTable = SwTable::FindTable( pFmt );
-                    lcl_GetTblSeparators(aRet, pTable, pTable->GetTabLines()[0]->GetTabBoxes()[0], false);
+                    SwTable* pTable = SwTable::FindTable( pFormat );
+                    lcl_GetTableSeparators(aRet, pTable, pTable->GetTabLines()[0]->GetTabBoxes()[0], false);
                 }
                 break;
 
@@ -2916,14 +2916,14 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
 
                 case FN_UNO_TEXT_SECTION:
                 {
-                    SwTable* pTable = SwTable::FindTable( pFmt );
-                    SwTableNode* pTblNode = pTable->GetTableNode();
-                    SwSectionNode* pSectionNode =  pTblNode->FindSectionNode();
+                    SwTable* pTable = SwTable::FindTable( pFormat );
+                    SwTableNode* pTableNode = pTable->GetTableNode();
+                    SwSectionNode* pSectionNode =  pTableNode->FindSectionNode();
                     if(pSectionNode)
                     {
                         SwSection& rSect = pSectionNode->GetSection();
                         uno::Reference< text::XTextSection >  xSect =
-                                        SwXTextSections::GetObject( *rSect.GetFmt() );
+                                        SwXTextSections::GetObject( *rSect.GetFormat() );
                         aRet <<= xSect;
                     }
                 }
@@ -2931,7 +2931,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
 
                 default:
                 {
-                    const SwAttrSet& rSet = pFmt->GetAttrSet();
+                    const SwAttrSet& rSet = pFormat->GetAttrSet();
                     m_pPropSet->getPropertyValue(*pEntry, rSet, aRet);
                 }
             }
@@ -2965,12 +2965,12 @@ void SwXTextTable::removeVetoableChangeListener(const OUString& /*rPropertyName*
 OUString SwXTextTable::getName() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(!pFmt && !bIsDescriptor)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(!pFormat && !bIsDescriptor)
         throw uno::RuntimeException();
-    if(pFmt)
+    if(pFormat)
     {
-        return pFmt->GetName();
+        return pFormat->GetName();
     }
     return m_sTableName;
 }
@@ -2978,50 +2978,50 @@ OUString SwXTextTable::getName() throw( uno::RuntimeException, std::exception )
 void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if((!pFmt && !bIsDescriptor) ||
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if((!pFormat && !bIsDescriptor) ||
        rName.isEmpty() ||
        rName.indexOf('.')>=0 ||
        rName.indexOf(' ')>=0 )
         throw uno::RuntimeException();
 
-    if(pFmt)
+    if(pFormat)
     {
-        const OUString aOldName( pFmt->GetName() );
-        const SwFrmFmts* pFrameFormats = pFmt->GetDoc()->GetTblFrmFmts();
+        const OUString aOldName( pFormat->GetName() );
+        const SwFrameFormats* pFrameFormats = pFormat->GetDoc()->GetTableFrameFormats();
         for (size_t i = pFrameFormats->size(); i;)
         {
-            const SwFrmFmt* pTmpFmt = (*pFrameFormats)[--i];
-            if( !pTmpFmt->IsDefault() &&
-                pTmpFmt->GetName() == rName &&
-                            pFmt->GetDoc()->IsUsed( *pTmpFmt ))
+            const SwFrameFormat* pTmpFormat = (*pFrameFormats)[--i];
+            if( !pTmpFormat->IsDefault() &&
+                pTmpFormat->GetName() == rName &&
+                            pFormat->GetDoc()->IsUsed( *pTmpFormat ))
             {
                 throw uno::RuntimeException();
             }
         }
 
-        pFmt->SetName( rName );
+        pFormat->SetName( rName );
 
         SwStartNode *pStNd;
-        SwNodeIndex aIdx( *pFmt->GetDoc()->GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
+        SwNodeIndex aIdx( *pFormat->GetDoc()->GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
         while ( 0 != (pStNd = aIdx.GetNode().GetStartNode()) )
         {
             ++aIdx;
             SwNode *const pNd = & aIdx.GetNode();
             if ( pNd->IsOLENode() &&
-                aOldName == static_cast<const SwOLENode*>(pNd)->GetChartTblName() )
+                aOldName == static_cast<const SwOLENode*>(pNd)->GetChartTableName() )
             {
-                const_cast<SwOLENode*>(static_cast<const SwOLENode*>(pNd))->SetChartTblName( rName );
+                const_cast<SwOLENode*>(static_cast<const SwOLENode*>(pNd))->SetChartTableName( rName );
 
                 static_cast<SwOLENode*>(pNd)->GetOLEObj();
 
-                SwTable* pTable = SwTable::FindTable( pFmt );
+                SwTable* pTable = SwTable::FindTable( pFormat );
                 //TL_CHART2: chart needs to be notfied about name changes
-                pFmt->GetDoc()->UpdateCharts( pTable->GetFrmFmt()->GetName() );
+                pFormat->GetDoc()->UpdateCharts( pTable->GetFrameFormat()->GetName() );
             }
             aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 );
         }
-        pFmt->GetDoc()->getIDocumentState().SetModified();
+        pFormat->GetDoc()->getIDocumentState().SetModified();
     }
     else
         m_sTableName = rName;
@@ -3031,11 +3031,11 @@ sal_uInt16 SwXTextTable::getRowCount()
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nRet = 0;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
-        SwTable* pTable = SwTable::FindTable( pFmt );
-        if(!pTable->IsTblComplex())
+        SwTable* pTable = SwTable::FindTable( pFormat );
+        if(!pTable->IsTableComplex())
         {
             nRet = pTable->GetTabLines().size();
         }
@@ -3046,12 +3046,12 @@ sal_uInt16 SwXTextTable::getRowCount()
 sal_uInt16 SwXTextTable::getColumnCount()
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
+    SwFrameFormat* pFormat = GetFrameFormat();
     sal_uInt16 nRet = 0;
-    if(pFmt)
+    if(pFormat)
     {
-        SwTable* pTable = SwTable::FindTable( pFmt );
-        if(!pTable->IsTblComplex())
+        SwTable* pTable = SwTable::FindTable( pFormat );
+        if(!pTable->IsTableComplex())
         {
             SwTableLines& rLines = pTable->GetTabLines();
             SwTableLine* pLine = rLines.front();
@@ -3141,15 +3141,15 @@ uno::Sequence<OUString> SwXCellRange::getSupportedServiceNames() throw( uno::Run
         "com.sun.star.style.ParagraphPropertiesComplex" };
 }
 
-SwXCellRange::SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt,
+SwXCellRange::SwXCellRange(SwUnoCrsr* pCrsr, SwFrameFormat& rFrameFormat,
     SwRangeDescriptor& rDesc)
-    : SwClient(&rFrmFmt)
+    : SwClient(&rFrameFormat)
     , aCursorDepend(this, pCrsr)
     , m_ChartListeners(m_Mutex)
     ,
     aRgDesc(rDesc),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TABLE_RANGE)),
-    pTblCrsr(pCrsr),
+    pTableCrsr(pCrsr),
     m_bFirstRowAsLabel(false),
     m_bFirstColumnAsLabel(false)
 {
@@ -3158,21 +3158,21 @@ SwXCellRange::SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt,
 
 std::vector< uno::Reference< table::XCell > > SwXCellRange::getCells()
 {
-    SwFrmFmt* const pFmt = GetFrmFmt();
+    SwFrameFormat* const pFormat = GetFrameFormat();
     const sal_Int32 nRowCount(getRowCount());
     const sal_Int32 nColCount(getColumnCount());
     std::vector< uno::Reference< table::XCell > > vResult;
     vResult.reserve(static_cast<size_t>(nRowCount)*static_cast<size_t>(nColCount));
     for(sal_Int32 nRow = 0; nRow < nRowCount; ++nRow)
         for(sal_Int32 nCol = 0; nCol < nColCount; ++nCol)
-            vResult.push_back(uno::Reference< table::XCell >(lcl_CreateXCell(pFmt, aRgDesc.nLeft + nCol, aRgDesc.nTop + nRow)));
+            vResult.push_back(uno::Reference< table::XCell >(lcl_CreateXCell(pFormat, aRgDesc.nLeft + nCol, aRgDesc.nTop + nRow)));
     return vResult;
 }
 
 SwXCellRange::~SwXCellRange()
 {
     SolarMutexGuard aGuard;
-    delete pTblCrsr;
+    delete pTableCrsr;
 }
 
 uno::Reference< table::XCell >  SwXCellRange::getCellByPosition(sal_Int32 nColumn, sal_Int32 nRow)
@@ -3180,13 +3180,13 @@ uno::Reference< table::XCell >  SwXCellRange::getCellByPosition(sal_Int32 nColum
 {
     SolarMutexGuard aGuard;
     uno::Reference< table::XCell >  aRet;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
         if(nColumn >= 0 && nRow >= 0 &&
              getColumnCount() > nColumn && getRowCount() > nRow )
         {
-            SwXCell* pXCell = lcl_CreateXCell(pFmt,
+            SwXCell* pXCell = lcl_CreateXCell(pFormat,
                     aRgDesc.nLeft + nColumn, aRgDesc.nTop + nRow);
             if(pXCell)
                 aRet = pXCell;
@@ -3204,13 +3204,13 @@ uno::Reference< table::XCellRange >  SwXCellRange::getCellRangeByPosition(
 {
     SolarMutexGuard aGuard;
     uno::Reference< table::XCellRange >  aRet;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt && getColumnCount() > nRight && getRowCount() > nBottom &&
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat && getColumnCount() > nRight && getRowCount() > nBottom &&
         nLeft <= nRight && nTop <= nBottom
         && nLeft >= 0 && nRight >= 0 && nTop >= 0 && nBottom >= 0 )
     {
-        SwTable* pTable = SwTable::FindTable( pFmt );
-        if(!pTable->IsTblComplex())
+        SwTable* pTable = SwTable::FindTable( pFormat );
+        if(!pTable->IsTableComplex())
         {
             SwRangeDescriptor aNewDesc;
             aNewDesc.nTop    = nTop + aRgDesc.nTop;
@@ -3220,18 +3220,18 @@ uno::Reference< table::XCellRange >  SwXCellRange::getCellRangeByPosition(
             aNewDesc.Normalize();
             const OUString sTLName = sw_GetCellName(aNewDesc.nLeft, aNewDesc.nTop);
             const OUString sBRName = sw_GetCellName(aNewDesc.nRight, aNewDesc.nBottom);
-            const SwTableBox* pTLBox = pTable->GetTblBox( sTLName );
+            const SwTableBox* pTLBox = pTable->GetTableBox( sTLName );
             if(pTLBox)
             {
                 // invalidate all actions
-                UnoActionRemoveContext aRemoveContext(pFmt->GetDoc());
+                UnoActionRemoveContext aRemoveContext(pFormat->GetDoc());
                 const SwStartNode* pSttNd = pTLBox->GetSttNd();
                 SwPosition aPos(*pSttNd);
                 // set cursor in the upper-left cell of the range
-                SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, true);
+                SwUnoCrsr* pUnoCrsr = pFormat->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
                 pUnoCrsr->SetRemainInSection( false );
-                const SwTableBox* pBRBox = pTable->GetTblBox( sBRName );
+                const SwTableBox* pBRBox = pTable->GetTableBox( sBRName );
                 if(pBRBox)
                 {
                     pUnoCrsr->SetMark();
@@ -3240,7 +3240,7 @@ uno::Reference< table::XCellRange >  SwXCellRange::getCellRangeByPosition(
                     SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
                     pCrsr->MakeBoxSels();
                     // pUnoCrsr will be provided and will not be deleted
-                    SwXCellRange* pCellRange = new SwXCellRange(pUnoCrsr, *pFmt, aNewDesc);
+                    SwXCellRange* pCellRange = new SwXCellRange(pUnoCrsr, *pFormat, aNewDesc);
                     aRet = pCellRange;
                 }
                 else
@@ -3286,8 +3286,8 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
            std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
         const SfxItemPropertySimpleEntry* pEntry =
                                     m_pPropSet->getPropertyMap().getByName(rPropertyName);
@@ -3296,21 +3296,21 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
             if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
                 throw beans::PropertyVetoException("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
 
-            SwDoc* pDoc = pTblCrsr->GetDoc();
+            SwDoc* pDoc = pTableCrsr->GetDoc();
             {
                 // remove actions to enable box selection
                 UnoActionRemoveContext aRemoveContext(pDoc);
             }
-            SwUnoTableCrsr& rCrsr = dynamic_cast<SwUnoTableCrsr&>(*pTblCrsr);
+            SwUnoTableCrsr& rCrsr = dynamic_cast<SwUnoTableCrsr&>(*pTableCrsr);
             rCrsr.MakeBoxSels();
             switch(pEntry->nWID )
             {
                 case FN_UNO_TABLE_CELL_BACKGROUND:
                 {
                     SvxBrushItem aBrush( RES_BACKGROUND );
-                    SwDoc::GetBoxAttr( *pTblCrsr, aBrush );
+                    SwDoc::GetBoxAttr( *pTableCrsr, aBrush );
                     ((SfxPoolItem&)aBrush).PutValue(aValue, pEntry->nMemberId);
-                    pDoc->SetBoxAttr( *pTblCrsr, aBrush );
+                    pDoc->SetBoxAttr( *pTableCrsr, aBrush );
 
                 }
                 break;
@@ -3345,7 +3345,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
                     SvxBoxItem aBoxItem(static_cast<const SvxBoxItem&>(aSet.Get(RES_BOX)));
                     ((SfxPoolItem&)aBoxItem).PutValue(aValue, pEntry->nMemberId);
                     aSet.Put(aBoxItem);
-                    pDoc->SetTabBorders( *pTblCrsr, aSet );
+                    pDoc->SetTabBorders( *pTableCrsr, aSet );
                 }
                 break;
                 case RES_BOXATR_FORMAT:
@@ -3404,8 +3404,8 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
         const SfxItemPropertySimpleEntry* pEntry =
                                     m_pPropSet->getPropertyMap().getByName(rPropertyName);
@@ -3416,20 +3416,20 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName)
                 case FN_UNO_TABLE_CELL_BACKGROUND:
                 {
                     SvxBrushItem aBrush( RES_BACKGROUND );
-                    if(SwDoc::GetBoxAttr( *pTblCrsr, aBrush ))
+                    if(SwDoc::GetBoxAttr( *pTableCrsr, aBrush ))
                         aBrush.QueryValue(aRet, pEntry->nMemberId);
 
                 }
                 break;
                 case RES_BOX :
                 {
-                    SwDoc* pDoc = pTblCrsr->GetDoc();
+                    SwDoc* pDoc = pTableCrsr->GetDoc();
                     SfxItemSet aSet(pDoc->GetAttrPool(),
                                     RES_BOX, RES_BOX,
                                     SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
                                     0);
                     aSet.Put(SvxBoxInfoItem( SID_ATTR_BORDER_INNER ));
-                    SwDoc::GetTabBorders(*pTblCrsr, aSet);
+                    SwDoc::GetTabBorders(*pTableCrsr, aSet);
                     const SvxBoxItem& rBoxItem = static_cast<const SvxBoxItem&>(aSet.Get(RES_BOX));
                     rBoxItem.QueryValue(aRet, pEntry->nMemberId);
                 }
@@ -3439,11 +3439,11 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName)
                 break;
                 case FN_UNO_PARA_STYLE:
                 {
-                    SwFmtColl *const pTmpFmt =
-                        SwUnoCursorHelper::GetCurTxtFmtColl(*pTblCrsr, false);
+                    SwFormatColl *const pTmpFormat =
+                        SwUnoCursorHelper::GetCurTextFormatColl(*pTableCrsr, false);
                     OUString sRet;
-                    if(pFmt)
-                        sRet = pTmpFmt->GetName();
+                    if(pFormat)
+                        sRet = pTmpFormat->GetName();
                     aRet <<= sRet;
                 }
                 break;
@@ -3455,13 +3455,13 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName)
                 break;
                 default:
                 {
-                    SfxItemSet aSet(pTblCrsr->GetDoc()->GetAttrPool(),
+                    SfxItemSet aSet(pTableCrsr->GetDoc()->GetAttrPool(),
                         RES_CHRATR_BEGIN,       RES_FRMATR_END -1,
                         RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
                         RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
                         0L);
                     // first look at the attributes of the cursor
-                    SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pTblCrsr);
+                    SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pTableCrsr);
                     SwUnoCursorHelper::GetCrsrAttr(pCrsr->GetSelRing(), aSet);
                     m_pPropSet->getPropertyValue(*pEntry, aSet, aRet);
                 }
@@ -3487,7 +3487,7 @@ void SwXCellRange::removeVetoableChangeListener(const OUString& /*PropertyName*/
 
 void SwXCellRange::GetDataSequence(
         uno::Sequence< uno::Any >   *pAnySeq,   //-> first pointer != 0 is used
-        uno::Sequence< OUString >   *pTxtSeq,   //-> as output sequence
+        uno::Sequence< OUString >   *pTextSeq,   //-> as output sequence
         uno::Sequence< double >     *pDblSeq,   //-> (previous data gets overwritten)
         bool bForceNumberResults )              //-> when 'true' requires to make an
                                                 // extra effort to return a value different
@@ -3511,8 +3511,8 @@ void SwXCellRange::GetDataSequence(
     const size_t nSize = static_cast<size_t>(nRowCount) * static_cast<size_t>(nColCount);
     if (pAnySeq)
         pAnySeq->realloc( nSize );
-    else if (pTxtSeq)
-        pTxtSeq->realloc( nSize );
+    else if (pTextSeq)
+        pTextSeq->realloc( nSize );
     else if (pDblSeq)
         pDblSeq->realloc( nSize );
     else
@@ -3521,12 +3521,12 @@ void SwXCellRange::GetDataSequence(
         return;
     }
     uno::Any   *pAnyData = pAnySeq ? pAnySeq->getArray() : 0;
-    OUString   *pTxtData = pTxtSeq ? pTxtSeq->getArray() : 0;
+    OUString   *pTextData = pTextSeq ? pTextSeq->getArray() : 0;
     double     *pDblData = pDblSeq ? pDblSeq->getArray() : 0;
 
     size_t nDtaCnt = 0;
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(pFormat)
     {
         double fNan;
         ::rtl::math::setNan( & fNan );
@@ -3536,13 +3536,13 @@ void SwXCellRange::GetDataSequence(
         {
             for(sal_Int32 nCol = 0; nCol < nColCount; ++nCol)
             {
-                SwXCell * pXCell = lcl_CreateXCell(pFmt,
+                SwXCell * pXCell = lcl_CreateXCell(pFormat,
                                     aRgDesc.nLeft + nCol,
                                     aRgDesc.nTop + nRow);
                 //! keep (additional) reference to object to prevent implicit destruction
                 //! in following UNO calls (when object will get referenced)
                 xCellRef = pXCell;
-                SwTableBox * pBox = pXCell ? pXCell->GetTblBox() : 0;
+                SwTableBox * pBox = pXCell ? pXCell->GetTableBox() : 0;
                 if(!pBox)
                 {
                     throw uno::RuntimeException();
@@ -3552,14 +3552,14 @@ void SwXCellRange::GetDataSequence(
                     if (pAnyData)
                     {
                         // check if table box value item is set
-                        bool bIsNum = pBox->GetFrmFmt()->GetItemState( RES_BOXATR_VALUE, false ) == SfxItemState::SET;
+                        bool bIsNum = pBox->GetFrameFormat()->GetItemState( RES_BOXATR_VALUE, false ) == SfxItemState::SET;
                         if (!bIsNum)
                             pAnyData[nDtaCnt++] <<= lcl_getString(*pXCell);
                         else
                             pAnyData[nDtaCnt++] <<= sw_getValue(*pXCell);
                     }
-                    else if (pTxtData)
-                        pTxtData[nDtaCnt++] = lcl_getString(*pXCell);
+                    else if (pTextData)
+                        pTextData[nDtaCnt++] = lcl_getString(*pXCell);
                     else if (pDblData)
                     {
                         double fVal = fNan;
@@ -3574,18 +3574,18 @@ void SwXCellRange::GetDataSequence(
                             // from the text in the cell...
 
                             sal_uInt32 nFIndex;
-                            SvNumberFormatter* pNumFormatter = pTblCrsr->GetDoc()->GetNumberFormatter();
+                            SvNumberFormatter* pNumFormatter = pTableCrsr->GetDoc()->GetNumberFormatter();
 
-                            // look for SwTblBoxNumFormat value in parents as well
+                            // look for SwTableBoxNumFormat value in parents as well
                             const SfxPoolItem* pItem;
-                            SwFrmFmt *pBoxFmt = pXCell->GetTblBox()->GetFrmFmt();
-                            SfxItemState eState = pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, true, &pItem);
+                            SwFrameFormat *pBoxFormat = pXCell->GetTableBox()->GetFrameFormat();
+                            SfxItemState eState = pBoxFormat->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, true, &pItem);
 
                             if (eState == SfxItemState::SET)
                             {
                                 // please note that the language of the numberformat
                                 // is implicitly coded into the below value as well
-                                nFIndex = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
+                                nFIndex = static_cast<const SwTableBoxNumFormat*>(pItem)->GetValue();
 
                                 // since the current value indicates a text format but the call
                                 // to 'IsNumberFormat' below won't work for text formats
@@ -3621,8 +3621,8 @@ void SwXCellRange::GetDataSequence(
     OSL_ENSURE( nDtaCnt == nSize, "size mismatch. Invalid cell range?" );
     if (pAnySeq)
         pAnySeq->realloc( nDtaCnt );
-    else if (pTxtSeq)
-        pTxtSeq->realloc( nDtaCnt );
+    else if (pTextSeq)
+        pTextSeq->realloc( nDtaCnt );
     else if (pDblSeq)
         pDblSeq->realloc( nDtaCnt );
 }
@@ -3637,7 +3637,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray()
     const sal_Int32 nColCount = getColumnCount();
     if(!nRowCount || !nColCount)
         throw uno::RuntimeException("Table too complex", static_cast<cppu::OWeakObject*>(this));
-    lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
+    lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
     uno::Sequence< uno::Sequence< uno::Any > > aRowSeq(nRowCount);
     auto vCells(getCells());
     auto pCurrentCell(vCells.begin());
@@ -3647,12 +3647,12 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray()
         for(auto& rCellAny : rRow)
         {
             auto pCell(static_cast<SwXCell*>(pCurrentCell->get()));
-            SwTableBox* pBox = pCell ? pCell->GetTblBox() : nullptr;
+            SwTableBox* pBox = pCell ? pCell->GetTableBox() : nullptr;
             if(!pBox)
                 throw uno::RuntimeException();
             // check if table box value item is set
-            SwFrmFmt* pBoxFmt(pBox->GetFrmFmt());
-            const bool bIsNum = pBoxFmt->GetItemState(RES_BOXATR_VALUE, false) == SfxItemState::SET;
+            SwFrameFormat* pBoxFormat(pBox->GetFrameFormat());
+            const bool bIsNum = pBoxFormat->GetItemState(RES_BOXATR_VALUE, false) == SfxItemState::SET;
             rCellAny = bIsNum ? uno::makeAny(sw_getValue(*pCell)) : uno::makeAny(lcl_getString(*pCell));
             ++pCurrentCell;
         }
@@ -3668,8 +3668,8 @@ void SAL_CALL SwXCellRange::setDataArray(const uno::Sequence< uno::Sequence< uno
     const sal_Int32 nColCount = getColumnCount();
     if(!nRowCount || !nColCount)
         throw uno::RuntimeException("Table too complex", static_cast<cppu::OWeakObject*>(this));
-    SwFrmFmt* pFmt = GetFrmFmt();
-    if(!pFmt)
+    SwFrameFormat* pFormat = GetFrameFormat();
+    if(!pFormat)
         return;
     if(rArray.getLength() != nRowCount)
         throw uno::RuntimeException("Row count mismatch. expected: " + OUString::number(nRowCount) + " got: " + OUString::number(rArray.getLength()), static_cast<cppu::OWeakObject*>(this));
@@ -3682,7 +3682,7 @@ void SAL_CALL SwXCellRange::setDataArray(const uno::Sequence< uno::Sequence< uno
         for(const auto& aValue : rColSeq)
         {
             auto pCell(static_cast<SwXCell*>(pCurrentCell->get()));
-            if(!pCell || !pCell->GetTblBox())
+            if(!pCell || !pCell->GetTableBox())
                 throw uno::RuntimeException("Box for cell missing", static_cast<cppu::OWeakObject*>(this));
             if(aValue.isExtractableTo(cppu::UnoType<OUString>::get()))
                 sw_setString(*pCell, aValue.get<OUString>());
@@ -3737,7 +3737,7 @@ void SwXCellRange::setData(const uno::Sequence< uno::Sequence< double > >& rData
             nColCount-1, nRowCount-1), uno::UNO_QUERY);
         return xDataRange->setData(rData);
     }
-    lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
+    lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
     if(rData.getLength() != nRowCount)
         throw uno::RuntimeException("Row count mismatch. expected: " + OUString::number(nRowCount) + " got: " + OUString::number(rData.getLength()), static_cast<cppu::OWeakObject*>(this));
     auto vCells(getCells());
@@ -3778,7 +3778,7 @@ uno::Sequence<OUString> SwXCellRange::getLabelDescriptions(bool bRow)
     std::tie(nLeft, nTop, nRight, nBottom) = getLabelCoordinates(bRow);
     if(!nRight && !nBottom)
         throw uno::RuntimeException("Table too complex", static_cast<cppu::OWeakObject*>(this));
-    lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
+    lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
     if(!(bRow ? m_bFirstColumnAsLabel : m_bFirstRowAsLabel))
         return {};  // without labels we have no descriptions
     auto xLabelRange(getCellRangeByPosition(nLeft, nTop, nRight, nBottom));
@@ -3800,7 +3800,7 @@ uno::Sequence<OUString> SwXCellRange::getColumnDescriptions()
 void SwXCellRange::setLabelDescriptions(const uno::Sequence<OUString>& rDesc, bool bRow)
 {
     SolarMutexGuard aGuard;
-    lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
+    lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
     if(!(bRow ? m_bFirstColumnAsLabel : m_bFirstRowAsLabel))
         return; // if there are no labels we cannot set descriptions
     sal_uInt32 nLeft, nTop, nRight, nBottom;
@@ -3857,13 +3857,13 @@ void SAL_CALL SwXCellRange::sort(const uno::Sequence< beans::PropertyValue >& rD
 {
     SolarMutexGuard aGuard;
     SwSortOptions aSortOpt;
-    SwFrmFmt* pFmt(GetFrmFmt());
-    if(pFmt && SwUnoCursorHelper::ConvertSortProperties(rDescriptor, aSortOpt))
+    SwFrameFormat* pFormat(GetFrameFormat());
+    if(pFormat && SwUnoCursorHelper::ConvertSortProperties(rDescriptor, aSortOpt))
     {
-        SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pTblCrsr);
+        SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pTableCrsr);
         rTableCrsr.MakeBoxSels();
-        UnoActionContext aContext(pFmt->GetDoc());
-        pFmt->GetDoc()->SortTbl(rTableCrsr.GetSelectedBoxes(), aSortOpt);
+        UnoActionContext aContext(pFormat->GetDoc());
+        pFormat->GetDoc()->SortTable(rTableCrsr.GetSelectedBoxes(), aSortOpt);
     }
 }
 
@@ -3873,10 +3873,10 @@ sal_uInt16 SwXCellRange::getColumnCount()
 sal_uInt16 SwXCellRange::getRowCount()
     { return static_cast<sal_uInt16>(aRgDesc.nBottom - aRgDesc.nTop + 1); }
 
-const SwUnoCrsr* SwXCellRange::GetTblCrsr() const
+const SwUnoCrsr* SwXCellRange::GetTableCrsr() const
 {
-    SwFrmFmt* pFmt = GetFrmFmt();
-    return pFmt ? pTblCrsr : nullptr;
+    SwFrameFormat* pFormat = GetFrameFormat();
+    return pFormat ? pTableCrsr : nullptr;
 }
 
 void SwXCellRange::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
@@ -3885,12 +3885,12 @@ void SwXCellRange::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
     if(!GetRegisteredIn() || !aCursorDepend.GetRegisteredIn())
     {
         /*
-         * Not sure if this will cause a memory leak - this pTblCrsr
+         * Not sure if this will cause a memory leak - this pTableCrsr
          * is deleted in SwDoc and segfaults here when deleted again
          * if(!aCursorDepend.GetRegisteredIn())
-            delete pTblCrsr;
+            delete pTableCrsr;
          */
-        pTblCrsr = 0;
+        pTableCrsr = 0;
         lang::EventObject const ev(static_cast< ::cppu::OWeakObject&>(*this));
         m_ChartListeners.disposeAndClear(ev);
     }
@@ -3913,8 +3913,8 @@ uno::Sequence< OUString > SwXTableRows::getSupportedServiceNames() throw( uno::R
 
 TYPEINIT1(SwXTableRows, SwClient);
 
-SwXTableRows::SwXTableRows(SwFrmFmt& rFrmFmt) :
-    SwClient(&rFrmFmt)
+SwXTableRows::SwXTableRows(SwFrameFormat& rFrameFormat) :
+    SwClient(&rFrameFormat)
 { }
 
 SwXTableRows::~SwXTableRows()
@@ -3923,10 +3923,10 @@ SwXTableRows::~SwXTableRows()
 sal_Int32 SwXTableRows::getCount() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFrmFmt = GetFrmFmt();
-    if(!pFrmFmt)
+    SwFrameFormat* pFrameFormat = GetFrameFormat();
+    if(!pFrameFormat)
         throw uno::RuntimeException();
-    SwTable* pTable = SwTable::FindTable(pFrmFmt);
+    SwTable* pTable = SwTable::FindTable(pFrameFormat);
     return pTable->GetTabLines().size();
 }
 
@@ -3935,17 +3935,17 @@ uno::Any SwXTableRows::getByIndex(sal_Int32 nIndex)
     throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFrmFmt(lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this)));
+    SwFrameFormat* pFrameFormat(lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)));
     if(nIndex < 0)
         throw lang::IndexOutOfBoundsException();
-    SwTable* pTable = SwTable::FindTable( pFrmFmt );
+    SwTable* pTable = SwTable::FindTable( pFrameFormat );
     if(static_cast<size_t>(nIndex) >= pTable->GetTabLines().size())
         throw lang::IndexOutOfBoundsException();
     SwTableLine* pLine = pTable->GetTabLines()[nIndex];
     FindUnoInstanceHint<SwTableLine,SwXTextTableRow> aHint{pLine};
-    pFrmFmt->CallSwClientNotify(aHint);
+    pFrameFormat->CallSwClientNotify(aHint);
     if(!aHint.m_pResult)
-        aHint.m_pResult = new SwXTextTableRow(pFrmFmt, pLine);
+        aHint.m_pResult = new SwXTextTableRow(pFrameFormat, pLine);
     uno::Reference<beans::XPropertySet> xRet = (beans::XPropertySet*)aHint.m_pResult;
     return uno::makeAny(xRet);
 }
@@ -3958,8 +3958,8 @@ uno::Type SAL_CALL SwXTableRows::getElementType() throw( uno::RuntimeException,
 sal_Bool SwXTableRows::hasElements() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFrmFmt = GetFrmFmt();
-    if(!pFrmFmt)
+    SwFrameFormat* pFrameFormat = GetFrameFormat();
+    if(!pFrameFormat)
         throw uno::RuntimeException();
     // a table always has rows
     return sal_True;
@@ -3971,13 +3971,13 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
     SolarMutexGuard aGuard;
     if (nCount == 0)
         return;
-    SwFrmFmt* pFrmFmt(lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this)));
-    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFrmFmt), static_cast<cppu::OWeakObject*>(this));
+    SwFrameFormat* pFrameFormat(lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)));
+    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFrameFormat), static_cast<cppu::OWeakObject*>(this));
     const size_t nRowCount = pTable->GetTabLines().size();
     if (nCount <= 0 || !(0 <= nIndex && static_cast<size_t>(nIndex) <= nRowCount))
         throw uno::RuntimeException("Illegal arguments", static_cast<cppu::OWeakObject*>(this));
     const OUString sTLName = sw_GetCellName(0, nIndex);
-    const SwTableBox* pTLBox = pTable->GetTblBox(sTLName);
+    const SwTableBox* pTLBox = pTable->GetTableBox(sTLName);
     bool bAppend = false;
     if(!pTLBox)
     {
@@ -3993,14 +3993,14 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
     const SwStartNode* pSttNd = pTLBox->GetSttNd();
     SwPosition aPos(*pSttNd);
     // set cursor to the upper-left cell of the range
-    UnoActionContext aAction(pFrmFmt->GetDoc());
-    SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true);
+    UnoActionContext aAction(pFrameFormat->GetDoc());
+    SwUnoCrsr* pUnoCrsr = pFrameFormat->GetDoc()->CreateUnoCrsr(aPos, true);
     pUnoCrsr->Move( fnMoveForward, fnGoNode );
     {
         // remove actions
         UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
     }
-    pFrmFmt->GetDoc()->InsertRow(*pUnoCrsr, (sal_uInt16)nCount, bAppend);
+    pFrameFormat->GetDoc()->InsertRow(*pUnoCrsr, (sal_uInt16)nCount, bAppend);
     delete pUnoCrsr;
 }
 
@@ -4010,26 +4010,26 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
     SolarMutexGuard aGuard;
     if (nCount == 0)
         return;
-    SwFrmFmt* pFrmFmt(lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this)));
+    SwFrameFormat* pFrameFormat(lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)));
     if(nIndex < 0 || nCount <=0 )
         throw uno::RuntimeException();
-    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFrmFmt), static_cast<cppu::OWeakObject*>(this));
+    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFrameFormat), static_cast<cppu::OWeakObject*>(this));
     OUString sTLName = sw_GetCellName(0, nIndex);
-    const SwTableBox* pTLBox = pTable->GetTblBox(sTLName);
+    const SwTableBox* pTLBox = pTable->GetTableBox(sTLName);
     if(!pTLBox)
         throw uno::RuntimeException("Illegal arguments", static_cast<cppu::OWeakObject*>(this));
     {
         // invalidate all actions
-        UnoActionRemoveContext aRemoveContext(pFrmFmt->GetDoc());
+        UnoActionRemoveContext aRemoveContext(pFrameFormat->GetDoc());
     }
     const SwStartNode* pSttNd = pTLBox->GetSttNd();
     SwPosition aPos(*pSttNd);
     // set cursor to the upper-left cell of the range
-    SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true);
+    SwUnoCrsr* pUnoCrsr = pFrameFormat->GetDoc()->CreateUnoCrsr(aPos, true);
     pUnoCrsr->Move(fnMoveForward, fnGoNode);
     pUnoCrsr->SetRemainInSection( false );
     const OUString sBLName = sw_GetCellName(0, nIndex + nCount - 1);
-    const SwTableBox* pBLBox = pTable->GetTblBox( sBLName );
+    const SwTableBox* pBLBox = pTable->GetTableBox( sBLName );
     if(!pBLBox)
         throw uno::RuntimeException("Illegal arguments", static_cast<cppu::OWeakObject*>(this));
     pUnoCrsr->SetMark();
@@ -4038,13 +4038,13 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
     SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
     pCrsr->MakeBoxSels();
     {   // these braces are important
-        UnoActionContext aAction(pFrmFmt->GetDoc());
-        pFrmFmt->GetDoc()->DeleteRow(*pUnoCrsr);
+        UnoActionContext aAction(pFrameFormat->GetDoc());
+        pFrameFormat->GetDoc()->DeleteRow(*pUnoCrsr);
         delete pUnoCrsr;
     }
     {
         // invalidate all actions
-        UnoActionRemoveContext aRemoveContext(pFrmFmt->GetDoc());
+        UnoActionRemoveContext aRemoveContext(pFrameFormat->GetDoc());
     }
 }
 
@@ -4064,8 +4064,8 @@ uno::Sequence< OUString > SwXTableColumns::getSupportedServiceNames() throw( uno
 
 TYPEINIT1(SwXTableColumns, SwClient);
 
-SwXTableColumns::SwXTableColumns(SwFrmFmt& rFrmFmt) :
-    SwClient(&rFrmFmt)
+SwXTableColumns::SwXTableColumns(SwFrameFormat& rFrameFormat) :
+    SwClient(&rFrameFormat)
 { }
 
 SwXTableColumns::~SwXTableColumns()
@@ -4074,9 +4074,9 @@ SwXTableColumns::~SwXTableColumns()
 sal_Int32 SwXTableColumns::getCount() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFrmFmt(lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this)));
-    SwTable* pTable = SwTable::FindTable( pFrmFmt );
-//    if(!pTable->IsTblComplex())
+    SwFrameFormat* pFrameFormat(lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)));
+    SwTable* pTable = SwTable::FindTable( pFrameFormat );
+//    if(!pTable->IsTableComplex())
 //        throw uno::RuntimeException("Table too complex", static_cast<cppu::OWeakObject*>(this));
     SwTableLines& rLines = pTable->GetTabLines();
     SwTableLine* pLine = rLines.front();
@@ -4100,7 +4100,7 @@ uno::Type SAL_CALL SwXTableColumns::getElementType() throw( uno::RuntimeExceptio
 sal_Bool SwXTableColumns::hasElements() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
+    lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
     return sal_True;
 }
 
@@ -4111,15 +4111,15 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
     SolarMutexGuard aGuard;
     if (nCount == 0)
         return;
-    SwFrmFmt* pFrmFmt(lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this)));
-    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFrmFmt), static_cast<cppu::OWeakObject*>(this));
+    SwFrameFormat* pFrameFormat(lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)));
+    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFrameFormat), static_cast<cppu::OWeakObject*>(this));
     SwTableLines& rLines = pTable->GetTabLines();
     SwTableLine* pLine = rLines.front();
     const size_t nColCount = pLine->GetTabBoxes().size();
     if (nCount <= 0 || !(0 <= nIndex && static_cast<size_t>(nIndex) <= nColCount))
         throw uno::RuntimeException("Illegal arguments", static_cast<cppu::OWeakObject*>(this));
     const OUString sTLName = sw_GetCellName(nIndex, 0);
-    const SwTableBox* pTLBox = pTable->GetTblBox( sTLName );
+    const SwTableBox* pTLBox = pTable->GetTableBox( sTLName );
     bool bAppend = false;
     if(!pTLBox)
     {
@@ -4132,8 +4132,8 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
         throw uno::RuntimeException("Illegal arguments", static_cast<cppu::OWeakObject*>(this));
     const SwStartNode* pSttNd = pTLBox->GetSttNd();
     SwPosition aPos(*pSttNd);
-    UnoActionContext aAction(pFrmFmt->GetDoc());
-    SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true);
+    UnoActionContext aAction(pFrameFormat->GetDoc());
+    SwUnoCrsr* pUnoCrsr = pFrameFormat->GetDoc()->CreateUnoCrsr(aPos, true);
     pUnoCrsr->Move(fnMoveForward, fnGoNode);
 
     {
@@ -4141,7 +4141,7 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
         UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
     }
 
-    pFrmFmt->GetDoc()->InsertCol(*pUnoCrsr, (sal_uInt16)nCount, bAppend);
+    pFrameFormat->GetDoc()->InsertCol(*pUnoCrsr, (sal_uInt16)nCount, bAppend);
     delete pUnoCrsr;
 }
 
@@ -4152,26 +4152,26 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
     SolarMutexGuard aGuard;
     if (nCount == 0)
         return;
-    SwFrmFmt* pFrmFmt(lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this)));
+    SwFrameFormat* pFrameFormat(lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)));
     if(nIndex < 0 || nCount <=0 )
         throw uno::RuntimeException();
-    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFrmFmt), static_cast<cppu::OWeakObject*>(this));
+    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFrameFormat), static_cast<cppu::OWeakObject*>(this));
     const OUString sTLName = sw_GetCellName(nIndex, 0);
-    const SwTableBox* pTLBox = pTable->GetTblBox( sTLName );
+    const SwTableBox* pTLBox = pTable->GetTableBox( sTLName );
     if(!pTLBox)
         throw uno::RuntimeException("Cell not found", static_cast<cppu::OWeakObject*>(this));
     {
         // invalidate all actions
-        UnoActionRemoveContext aRemoveContext(pFrmFmt->GetDoc());
+        UnoActionRemoveContext aRemoveContext(pFrameFormat->GetDoc());
     }
     const SwStartNode* pSttNd = pTLBox->GetSttNd();
     SwPosition aPos(*pSttNd);
     // set cursor to the upper-left cell of the range
-    SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true);
+    SwUnoCrsr* pUnoCrsr = pFrameFormat->GetDoc()->CreateUnoCrsr(aPos, true);
     pUnoCrsr->Move(fnMoveForward, fnGoNode);
     pUnoCrsr->SetRemainInSection(false);
     const OUString sTRName = sw_GetCellName(nIndex + nCount - 1, 0);
-    const SwTableBox* pTRBox = pTable->GetTblBox(sTRName);
+    const SwTableBox* pTRBox = pTable->GetTableBox(sTRName);
     if(!pTRBox)
         throw uno::RuntimeException("Cell not found", static_cast<cppu::OWeakObject*>(this));
     pUnoCrsr->SetMark();
@@ -4180,13 +4180,13 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
     SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
     pCrsr->MakeBoxSels();
     {   // these braces are important
-        UnoActionContext aAction(pFrmFmt->GetDoc());
-        pFrmFmt->GetDoc()->DeleteCol(*pUnoCrsr);
+        UnoActionContext aAction(pFrameFormat->GetDoc());
+        pFrameFormat->GetDoc()->DeleteCol(*pUnoCrsr);
         delete pUnoCrsr;
     }
     {
         // invalidate all actions
-        UnoActionRemoveContext aRemoveContext(pFrmFmt->GetDoc());
+        UnoActionRemoveContext aRemoveContext(pFrameFormat->GetDoc());
     }
 }
 
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 8af3174f30bf..bd677a25a5de 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -428,7 +428,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         case text::ControlCharacter::APPEND_PARAGRAPH:
         {
             m_pImpl->m_pDoc->ClearBoxNumAttrs(aPam.GetPoint()->nNode);
-            m_pImpl->m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPam.GetPoint());
+            m_pImpl->m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPam.GetPoint());
 
             const uno::Reference<lang::XUnoTunnel> xRangeTunnel(
                     xTextRange, uno::UNO_QUERY);
@@ -642,34 +642,34 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             ::sw::UnoTunnelGetImplementation<SwXTextSection>(xSuccTunnel);
     SwXTextTable *const pXTable =
             ::sw::UnoTunnelGetImplementation<SwXTextTable>(xSuccTunnel);
-    SwFrmFmt *const pTableFmt = (pXTable) ? pXTable->GetFrmFmt() : 0;
-    SwTxtNode * pTxtNode = 0;
-    if(pTableFmt && pTableFmt->GetDoc() == GetDoc())
+    SwFrameFormat *const pTableFormat = (pXTable) ? pXTable->GetFrameFormat() : 0;
+    SwTextNode * pTextNode = 0;
+    if(pTableFormat && pTableFormat->GetDoc() == GetDoc())
     {
-        SwTable *const pTable = SwTable::FindTable( pTableFmt );
-        SwTableNode *const pTblNode = pTable->GetTableNode();
+        SwTable *const pTable = SwTable::FindTable( pTableFormat );
+        SwTableNode *const pTableNode = pTable->GetTableNode();
 
-        const SwNodeIndex aTblIdx( *pTblNode, -1 );
-        SwPosition aBefore(aTblIdx);
-        bRet = GetDoc()->getIDocumentContentOperations().AppendTxtNode( aBefore );
-        pTxtNode = aBefore.nNode.GetNode().GetTxtNode();
+        const SwNodeIndex aTableIdx( *pTableNode, -1 );
+        SwPosition aBefore(aTableIdx);
+        bRet = GetDoc()->getIDocumentContentOperations().AppendTextNode( aBefore );
+        pTextNode = aBefore.nNode.GetNode().GetTextNode();
     }
-    else if (pXSection && pXSection->GetFmt() &&
-            pXSection->GetFmt()->GetDoc() == GetDoc())
+    else if (pXSection && pXSection->GetFormat() &&
+            pXSection->GetFormat()->GetDoc() == GetDoc())
     {
-        SwSectionFmt *const pSectFmt = pXSection->GetFmt();
-        SwSectionNode *const pSectNode = pSectFmt->GetSectionNode();
+        SwSectionFormat *const pSectFormat = pXSection->GetFormat();
+        SwSectionNode *const pSectNode = pSectFormat->GetSectionNode();
 
         const SwNodeIndex aSectIdx( *pSectNode, -1 );
         SwPosition aBefore(aSectIdx);
-        bRet = GetDoc()->getIDocumentContentOperations().AppendTxtNode( aBefore );
-        pTxtNode = aBefore.nNode.GetNode().GetTxtNode();
+        bRet = GetDoc()->getIDocumentContentOperations().AppendTextNode( aBefore );
+        pTextNode = aBefore.nNode.GetNode().GetTextNode();
     }
-    if (!bRet || !pTxtNode)
+    if (!bRet || !pTextNode)
     {
         throw lang::IllegalArgumentException();
     }
-    pPara->attachToText(*this, *pTxtNode);
+    pPara->attachToText(*this, *pTextNode);
 }
 
 void SAL_CALL
@@ -700,34 +700,34 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             ::sw::UnoTunnelGetImplementation<SwXTextSection>(xPredTunnel);
     SwXTextTable *const pXTable =
             ::sw::UnoTunnelGetImplementation<SwXTextTable>(xPredTunnel);
-    SwFrmFmt *const pTableFmt = (pXTable) ? pXTable->GetFrmFmt() : 0;
+    SwFrameFormat *const pTableFormat = (pXTable) ? pXTable->GetFrameFormat() : 0;
     bool bRet = false;
-    SwTxtNode * pTxtNode = 0;
-    if(pTableFmt && pTableFmt->GetDoc() == GetDoc())
+    SwTextNode * pTextNode = 0;
+    if(pTableFormat && pTableFormat->GetDoc() == GetDoc())
     {
-        SwTable *const pTable = SwTable::FindTable( pTableFmt );
-        SwTableNode *const pTblNode = pTable->GetTableNode();
+        SwTable *const pTable = SwTable::FindTable( pTableFormat );
+        SwTableNode *const pTableNode = pTable->GetTableNode();
 
-        SwEndNode *const pTableEnd = pTblNode->EndOfSectionNode();
+        SwEndNode *const pTableEnd = pTableNode->EndOfSectionNode();
         SwPosition aTableEnd(*pTableEnd);
-        bRet = GetDoc()->getIDocumentContentOperations().AppendTxtNode( aTableEnd );
-        pTxtNode = aTableEnd.nNode.GetNode().GetTxtNode();
+        bRet = GetDoc()->getIDocumentContentOperations().AppendTextNode( aTableEnd );
+        pTextNode = aTableEnd.nNode.GetNode().GetTextNode();
     }
-    else if (pXSection && pXSection->GetFmt() &&
-            pXSection->GetFmt()->GetDoc() == GetDoc())
+    else if (pXSection && pXSection->GetFormat() &&
+            pXSection->GetFormat()->GetDoc() == GetDoc())
     {
-        SwSectionFmt *const pSectFmt = pXSection->GetFmt();
-        SwSectionNode *const pSectNode = pSectFmt->GetSectionNode();
+        SwSectionFormat *const pSectFormat = pXSection->GetFormat();
+        SwSectionNode *const pSectNode = pSectFormat->GetSectionNode();
         SwEndNode *const pEnd = pSectNode->EndOfSectionNode();
         SwPosition aEnd(*pEnd);
-        bRet = GetDoc()->getIDocumentContentOperations().AppendTxtNode( aEnd );
-        pTxtNode = aEnd.nNode.GetNode().GetTxtNode();
+        bRet = GetDoc()->getIDocumentContentOperations().AppendTextNode( aEnd );
+        pTextNode = aEnd.nNode.GetNode().GetTextNode();
     }
-    if (!bRet || !pTxtNode)
+    if (!bRet || !pTextNode)
     {
         throw lang::IllegalArgumentException();
     }
-    pPara->attachToText(*this, *pTxtNode);
+    pPara->attachToText(*this, *pTextNode);
 }
 
 void SAL_CALL
@@ -751,27 +751,27 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             ::sw::UnoTunnelGetImplementation<SwXTextSection>(xSuccTunnel);
     SwXTextTable *const pXTable =
             ::sw::UnoTunnelGetImplementation<SwXTextTable>(xSuccTunnel);
-    SwFrmFmt *const pTableFmt = (pXTable) ? pXTable->GetFrmFmt() : 0;
-    if(pTableFmt && pTableFmt->GetDoc() == GetDoc())
+    SwFrameFormat *const pTableFormat = (pXTable) ? pXTable->GetFrameFormat() : 0;
+    if(pTableFormat && pTableFormat->GetDoc() == GetDoc())
     {
-        SwTable *const pTable = SwTable::FindTable( pTableFmt );
-        SwTableNode *const pTblNode = pTable->GetTableNode();
+        SwTable *const pTable = SwTable::FindTable( pTableFormat );
+        SwTableNode *const pTableNode = pTable->GetTableNode();
 
-        const SwNodeIndex aTblIdx( *pTblNode, -1 );
-        if(aTblIdx.GetNode().IsTxtNode())
+        const SwNodeIndex aTableIdx( *pTableNode, -1 );
+        if(aTableIdx.GetNode().IsTextNode())
         {
-            SwPaM aBefore(aTblIdx);
+            SwPaM aBefore(aTableIdx);
             bRet = GetDoc()->getIDocumentContentOperations().DelFullPara( aBefore );
         }
     }
-    else if (pXSection && pXSection->GetFmt() &&
-            pXSection->GetFmt()->GetDoc() == GetDoc())
+    else if (pXSection && pXSection->GetFormat() &&
+            pXSection->GetFormat()->GetDoc() == GetDoc())
     {
-        SwSectionFmt *const pSectFmt = pXSection->GetFmt();
-        SwSectionNode *const pSectNode = pSectFmt->GetSectionNode();
+        SwSectionFormat *const pSectFormat = pXSection->GetFormat();
+        SwSectionNode *const pSectNode = pSectFormat->GetSectionNode();
 
         const SwNodeIndex aSectIdx(  *pSectNode, -1 );
-        if(aSectIdx.GetNode().IsTxtNode())
+        if(aSectIdx.GetNode().IsTextNode())
         {
             SwPaM aBefore(aSectIdx);
             bRet = GetDoc()->getIDocumentContentOperations().DelFullPara( aBefore );
@@ -804,28 +804,28 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             ::sw::UnoTunnelGetImplementation<SwXTextSection>(xPredTunnel);
     SwXTextTable *const pXTable =
             ::sw::UnoTunnelGetImplementation<SwXTextTable>(xPredTunnel);
-    SwFrmFmt *const pTableFmt = (pXTable) ? pXTable->GetFrmFmt() : 0;
-    if(pTableFmt && pTableFmt->GetDoc() == GetDoc())
+    SwFrameFormat *const pTableFormat = (pXTable) ? pXTable->GetFrameFormat() : 0;
+    if(pTableFormat && pTableFormat->GetDoc() == GetDoc())
     {
-        SwTable *const pTable = SwTable::FindTable( pTableFmt );
-        SwTableNode *const pTblNode = pTable->GetTableNode();
-        SwEndNode *const pTableEnd = pTblNode->EndOfSectionNode();
+        SwTable *const pTable = SwTable::FindTable( pTableFormat );
+        SwTableNode *const pTableNode = pTable->GetTableNode();
+        SwEndNode *const pTableEnd = pTableNode->EndOfSectionNode();
 
-        const SwNodeIndex aTblIdx( *pTableEnd, 1 );
-        if(aTblIdx.GetNode().IsTxtNode())
+        const SwNodeIndex aTableIdx( *pTableEnd, 1 );
+        if(aTableIdx.GetNode().IsTextNode())
         {
-            SwPaM aPaM(aTblIdx);
+            SwPaM aPaM(aTableIdx);
             bRet = GetDoc()->getIDocumentContentOperations().DelFullPara( aPaM );
         }
     }
-    else if (pXSection && pXSection->GetFmt() &&
-            pXSection->GetFmt()->GetDoc() == GetDoc())
+    else if (pXSection && pXSection->GetFormat() &&
+            pXSection->GetFormat()->GetDoc() == GetDoc())
     {
-        SwSectionFmt *const pSectFmt = pXSection->GetFmt();
-        SwSectionNode *const pSectNode = pSectFmt->GetSectionNode();
+        SwSectionFormat *const pSectFormat = pXSection->GetFormat();
+        SwSectionNode *const pSectNode = pSectFormat->GetSectionNode();
         SwEndNode *const pEnd = pSectNode->EndOfSectionNode();
         const SwNodeIndex aSectIdx(  *pEnd, 1 );
-        if(aSectIdx.GetNode().IsTxtNode())
+        if(aSectIdx.GetNode().IsTextNode())
         {
             SwPaM aAfter(aSectIdx);
             bRet = GetDoc()->getIDocumentContentOperations().DelFullPara( aAfter );
@@ -956,10 +956,10 @@ SwXText::setString(const OUString& rString) throw (uno::RuntimeException, std::e
         while(aStartIdx < aEndIdx);
         if(bInsertNodes)
         {
-            GetDoc()->getIDocumentContentOperations().AppendTxtNode( aStartPos );
+            GetDoc()->getIDocumentContentOperations().AppendTextNode( aStartPos );
             SwPosition aEndPos(aEndIdx.GetNode());
             SwPaM aPam(aEndPos);
-            GetDoc()->getIDocumentContentOperations().AppendTxtNode( *aPam.Start() );
+            GetDoc()->getIDocumentContentOperations().AppendTextNode( *aPam.Start() );
         }
     }
 
@@ -1150,15 +1150,15 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 //            break;
         case FN_UNO_REDLINE_NODE_END:
         {
-            const SwRedlineTbl& rRedTbl = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
-            const size_t nRedTblCount = rRedTbl.size();
-            if (nRedTblCount > 0)
+            const SwRedlineTable& rRedTable = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+            const size_t nRedTableCount = rRedTable.size();
+            if (nRedTableCount > 0)
             {
                 SwStartNode const*const pStartNode = GetStartNode();
                 const sal_uLong nOwnIndex = pStartNode->EndOfSectionIndex();
-                for (size_t nRed = 0; nRed < nRedTblCount; ++nRed)
+                for (size_t nRed = 0; nRed < nRedTableCount; ++nRed)
                 {
-                    SwRangeRedline const*const pRedline = rRedTbl[nRed];
+                    SwRangeRedline const*const pRedline = rRedTable[nRed];
                     SwPosition const*const pRedStart = pRedline->Start();
                     const SwNodeIndex nRedNode = pRedStart->nNode;
                     if (nOwnIndex == nRedNode.GetIndex())
@@ -1291,7 +1291,7 @@ SwXText::Impl::finishOrAppendParagraph(
         aPam = aStartPam;
         aPam.SetMark();
     }
-    m_pDoc->getIDocumentContentOperations().AppendTxtNode( *aPam.GetPoint() );
+    m_pDoc->getIDocumentContentOperations().AppendTextNode( *aPam.GetPoint() );
     // remove attributes from the previous paragraph
     m_pDoc->ResetAttrs(aPam);
     // in case of finishParagraph the PaM needs to be moved to the
@@ -1341,11 +1341,11 @@ SwXText::Impl::finishOrAppendParagraph(
             throw aEx;
         }
     }
-    SwTxtNode *const pTxtNode( aPam.Start()->nNode.GetNode().GetTxtNode() );
-    OSL_ENSURE(pTxtNode, "no SwTxtNode?");
-    if (pTxtNode)
+    SwTextNode *const pTextNode( aPam.Start()->nNode.GetNode().GetTextNode() );
+    OSL_ENSURE(pTextNode, "no SwTextNode?");
+    if (pTextNode)
     {
-        xRet.set(SwXParagraph::CreateXParagraph(*m_pDoc, pTxtNode, &m_rThis),
+        xRet.set(SwXParagraph::CreateXParagraph(*m_pDoc, pTextNode, &m_rThis),
                 uno::UNO_QUERY);
     }
 
@@ -1383,7 +1383,7 @@ SwXText::insertTextPortion(
     m_pImpl->m_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
 
     SwUnoCrsr *const pCursor = pTextCursor->GetCursor();
-    m_pImpl->m_pDoc->DontExpandFmt( *pCursor->Start() );
+    m_pImpl->m_pDoc->DontExpandFormat( *pCursor->Start() );
 
     if (!rText.isEmpty())
     {
@@ -1596,9 +1596,9 @@ SwXText::convertToTextFrame(
         }
         if (pStartTableNode)
         {
-            const SwNodeIndex aTblIdx(  *pStartTableNode, -1 );
-            SwPosition aBefore(aTblIdx);
-            bParaBeforeInserted = GetDoc()->getIDocumentContentOperations().AppendTxtNode( aBefore );
+            const SwNodeIndex aTableIdx(  *pStartTableNode, -1 );
+            SwPosition aBefore(aTableIdx);
+            bParaBeforeInserted = GetDoc()->getIDocumentContentOperations().AppendTextNode( aBefore );
             aStartPam.DeleteMark();
             *aStartPam.GetPoint() = aBefore;
             pStartStartNode = aStartPam.GetNode().StartOfSectionNode();
@@ -1608,7 +1608,7 @@ SwXText::convertToTextFrame(
             SwTableNode *const pEndTableNode = pEndStartNode->FindTableNode();
             SwEndNode *const pTableEnd = pEndTableNode->EndOfSectionNode();
             SwPosition aTableEnd(*pTableEnd);
-            bParaAfterInserted = GetDoc()->getIDocumentContentOperations().AppendTxtNode( aTableEnd );
+            bParaAfterInserted = GetDoc()->getIDocumentContentOperations().AppendTextNode( aTableEnd );
             pEndPam->DeleteMark();
             *pEndPam->GetPoint() = aTableEnd;
             pEndStartNode = pEndPam->GetNode().StartOfSectionNode();
@@ -1650,7 +1650,7 @@ SwXText::convertToTextFrame(
     && aStartPam.End()->nNode == pEndPam->End()->nNode )
     {
         SwPosition aEnd(*aStartPam.End());
-        bParaAfterInserted = GetDoc()->getIDocumentContentOperations().AppendTxtNode( aEnd );
+        bParaAfterInserted = GetDoc()->getIDocumentContentOperations().AppendTextNode( aEnd );
         pEndPam->DeleteMark();
         *pEndPam->GetPoint() = aEnd;
     }
@@ -1662,18 +1662,18 @@ SwXText::convertToTextFrame(
     std::set<OUString> aAnchoredFrames;
     // for shapes, we have to work with the SdrObjects, as unique name is not guaranteed in their frame format
     std::set<const SdrObject*> aAnchoredShapes;
-    for (size_t i = 0; i < m_pImpl->m_pDoc->GetSpzFrmFmts()->size(); ++i)
+    for (size_t i = 0; i < m_pImpl->m_pDoc->GetSpzFrameFormats()->size(); ++i)
     {
-        const SwFrmFmt* pFrmFmt = (*m_pImpl->m_pDoc->GetSpzFrmFmts())[i];
-        const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
+        const SwFrameFormat* pFrameFormat = (*m_pImpl->m_pDoc->GetSpzFrameFormats())[i];
+        const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
         if ((FLY_AT_PARA == rAnchor.GetAnchorId() || FLY_AT_CHAR == rAnchor.GetAnchorId()) &&
-                aStartPam.Start()->nNode.GetIndex() <= rAnchor.GetCntntAnchor()->nNode.GetIndex() &&
-                aStartPam.End()->nNode.GetIndex() >= rAnchor.GetCntntAnchor()->nNode.GetIndex())
+                aStartPam.Start()->nNode.GetIndex() <= rAnchor.GetContentAnchor()->nNode.GetIndex() &&
+                aStartPam.End()->nNode.GetIndex() >= rAnchor.GetContentAnchor()->nNode.GetIndex())
         {
-            if (pFrmFmt->Which() == RES_DRAWFRMFMT)
-                aAnchoredShapes.insert(pFrmFmt->FindSdrObject());
+            if (pFrameFormat->Which() == RES_DRAWFRMFMT)
+                aAnchoredShapes.insert(pFrameFormat->FindSdrObject());
             else
-                aAnchoredFrames.insert(pFrmFmt->GetName());
+                aAnchoredFrames.insert(pFrameFormat->GetName());
         }
     }
 
@@ -1699,31 +1699,31 @@ SwXText::convertToTextFrame(
             rNewFrame.setName(m_pImpl->m_pDoc->GetUniqueFrameName());
         }
 
-        SwTxtNode *const pTxtNode(aStartPam.GetNode().GetTxtNode());
-        OSL_ASSERT(pTxtNode);
-        if (!pTxtNode || !pTxtNode->Len()) // don't remove if it contains text!
+        SwTextNode *const pTextNode(aStartPam.GetNode().GetTextNode());
+        OSL_ASSERT(pTextNode);
+        if (!pTextNode || !pTextNode->Len()) // don't remove if it contains text!
         {
             {   // has to be in a block to remove the SwIndexes before
                 // DelFullPara is called
                 SwPaM aMovePam( aStartPam.GetNode() );
-                if (aMovePam.Move( fnMoveForward, fnGoCntnt ))
+                if (aMovePam.Move( fnMoveForward, fnGoContent ))
                 {
                     // move the anchor to the next paragraph
-                    SwFmtAnchor aNewAnchor(rNewFrame.GetFrmFmt()->GetAnchor());
+                    SwFormatAnchor aNewAnchor(rNewFrame.GetFrameFormat()->GetAnchor());
                     aNewAnchor.SetAnchor( aMovePam.Start() );
                     m_pImpl->m_pDoc->SetAttr(
-                        aNewAnchor, *rNewFrame.GetFrmFmt() );
+                        aNewAnchor, *rNewFrame.GetFrameFormat() );
 
                     // also move frames anchored to us
-                    for (size_t i = 0; i < m_pImpl->m_pDoc->GetSpzFrmFmts()->size(); ++i)
+                    for (size_t i = 0; i < m_pImpl->m_pDoc->GetSpzFrameFormats()->size(); ++i)
                     {
-                        SwFrmFmt* pFrmFmt = (*m_pImpl->m_pDoc->GetSpzFrmFmts())[i];
-                        if (aAnchoredFrames.find(pFrmFmt->GetName()) != aAnchoredFrames.end() || aAnchoredShapes.find(pFrmFmt->FindSdrObject()) != aAnchoredShapes.end())
+                        SwFrameFormat* pFrameFormat = (*m_pImpl->m_pDoc->GetSpzFrameFormats())[i];
+                        if (aAnchoredFrames.find(pFrameFormat->GetName()) != aAnchoredFrames.end() || aAnchoredShapes.find(pFrameFormat->FindSdrObject()) != aAnchoredShapes.end())
                         {
                             // copy the anchor to the next paragraph
-                            SwFmtAnchor aAnchor(pFrmFmt->GetAnchor());
+                            SwFormatAnchor aAnchor(pFrameFormat->GetAnchor());
                             aAnchor.SetAnchor(aMovePam.Start());
-                            m_pImpl->m_pDoc->SetAttr(aAnchor, *pFrmFmt);
+                            m_pImpl->m_pDoc->SetAttr(aAnchor, *pFrameFormat);
                         }
                     }
                 }
@@ -1853,9 +1853,9 @@ void SwXText::Impl::ConvertCell(
         aStartCellPam = aNewStartPaM;
 
         sal_Int32 nEndLen = 0;
-        SwTxtNode * pTxtNode = pCorrectedRange->aEnd.GetNode().GetTxtNode();
-        if (pTxtNode != NULL)
-            nEndLen = pTxtNode->Len();
+        SwTextNode * pTextNode = pCorrectedRange->aEnd.GetNode().GetTextNode();
+        if (pTextNode != NULL)
+            nEndLen = pTextNode->Len();
 
         SwPaM aNewEndPaM(pCorrectedRange->aEnd, nEndLen);
         aEndCellPam = aNewEndPaM;
@@ -1957,7 +1957,7 @@ void SwXText::Impl::ConvertCell(
     }
     // now check if there's a need to insert another paragraph break
     if (aEndCellPam.End()->nContent.GetIndex() <
-            aEndCellPam.End()->nNode.GetNode().GetTxtNode()->Len())
+            aEndCellPam.End()->nNode.GetNode().GetTextNode()->Len())
     {
         m_pDoc->getIDocumentContentOperations().SplitNode(*aEndCellPam.End(), false);
         // take care that the new start/endcell is moved to the right position
@@ -1969,11 +1969,11 @@ void SwXText::Impl::ConvertCell(
         aEndCellPam.DeleteMark();
         aEndCellPam.Move(fnMoveBackward, fnGoNode);
         aEndCellPam.GetPoint()->nContent =
-            aEndCellPam.GetNode().GetTxtNode()->Len();
+            aEndCellPam.GetNode().GetTextNode()->Len();
     }
 
     assert(aStartCellPam.Start()->nContent.GetIndex() == 0);
-    assert(aEndCellPam.End()->nContent.GetIndex() == aEndCellPam.End()->nNode.GetNode().GetTxtNode()->Len());
+    assert(aEndCellPam.End()->nContent.GetIndex() == aEndCellPam.End()->nNode.GetNode().GetTextNode()->Len());
     SwNodeRange aCellRange(aStartCellPam.Start()->nNode,
             aEndCellPam.End()->nNode);
     rRowNodes.push_back(aCellRange); // note: invalidates pLastCell!
@@ -2269,7 +2269,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         return uno::Reference< text::XTextTable >();
 
     uno::Reference<text::XTextTable> const xRet =
-        SwXTextTable::CreateXTextTable(pTable->GetFrmFmt());
+        SwXTextTable::CreateXTextTable(pTable->GetFrameFormat());
     uno::Reference<beans::XPropertySet> const xPrSet(xRet, uno::UNO_QUERY);
     // set properties to the table
     // catch lang::WrappedTargetException and lang::IndexOutOfBoundsException
@@ -2338,9 +2338,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     {
     }
 
-    assert(SwTable::FindTable(pTable->GetFrmFmt()) == pTable);
-    assert(pTable->GetFrmFmt() ==
-            dynamic_cast<SwXTextTable&>(*xRet.get()).GetFrmFmt());
+    assert(SwTable::FindTable(pTable->GetFrameFormat()) == pTable);
+    assert(pTable->GetFrameFormat() ==
+            dynamic_cast<SwXTextTable&>(*xRet.get()).GetFrameFormat());
     return xRet;
 }
 
@@ -2471,13 +2471,13 @@ SwXTextCursor * SwXBodyText::CreateTextCursor(const bool bIgnoreTables)
     aPam.Move( fnMoveBackward, fnGoDoc );
     if (!bIgnoreTables)
     {
-        SwTableNode * pTblNode = aPam.GetNode().FindTableNode();
-        SwCntntNode * pCont = 0;
-        while (pTblNode)
+        SwTableNode * pTableNode = aPam.GetNode().FindTableNode();
+        SwContentNode * pCont = 0;
+        while (pTableNode)
         {
-            aPam.GetPoint()->nNode = *pTblNode->EndOfSectionNode();
+            aPam.GetPoint()->nNode = *pTableNode->EndOfSectionNode();
             pCont = GetDoc()->GetNodes().GoNext(&aPam.GetPoint()->nNode);
-            pTblNode = pCont->FindTableNode();
+            pTableNode = pCont->FindTableNode();
         }
         if (pCont)
         {
@@ -2521,7 +2521,7 @@ throw (uno::RuntimeException, std::exception)
     SwUnoInternalPaM aPam(*GetDoc());
     if (::sw::XTextRangeToSwPaM(aPam, xTextPosition))
     {
-        if ( !aPam.GetNode().GetTxtNode() )
+        if ( !aPam.GetNode().GetTextNode() )
             throw uno::RuntimeException("Invalid text range" );
 
         SwNode& rNode = GetDoc()->GetNodes().GetEndOfContent();
@@ -2602,23 +2602,23 @@ public:
     bool                        m_bIsHeader;
 
     Impl(   SwXHeadFootText & /*rThis*/,
-            SwFrmFmt & rHeadFootFmt, const bool bIsHeader)
-        : SwClient(& rHeadFootFmt)
+            SwFrameFormat & rHeadFootFormat, const bool bIsHeader)
+        : SwClient(& rHeadFootFormat)
         , m_bIsHeader(bIsHeader)
     {
     }
 
-    SwFrmFmt * GetHeadFootFmt() const {
-        return static_cast<SwFrmFmt*>(
+    SwFrameFormat * GetHeadFootFormat() const {
+        return static_cast<SwFrameFormat*>(
                 const_cast<SwModify*>(GetRegisteredIn()));
     }
 
-    SwFrmFmt & GetHeadFootFmtOrThrow() {
-        SwFrmFmt *const pFmt( GetHeadFootFmt() );
-        if (!pFmt) {
+    SwFrameFormat & GetHeadFootFormatOrThrow() {
+        SwFrameFormat *const pFormat( GetHeadFootFormat() );
+        if (!pFormat) {
             throw uno::RuntimeException("SwXHeadFootText: disposed or invalid", 0);
         }
-        return *pFmt;
+        return *pFormat;
     }
 protected:
     // SwClient
@@ -2638,26 +2638,26 @@ bool SwXHeadFootText::IsXHeadFootText(SwClient *const pClient)
 
 uno::Reference< text::XText >
 SwXHeadFootText::CreateXHeadFootText(
-        SwFrmFmt & rHeadFootFmt, const bool bIsHeader)
+        SwFrameFormat & rHeadFootFormat, const bool bIsHeader)
 {
     // re-use existing SwXHeadFootText
     // #i105557#: do not iterate over the registered clients: race condition
-    uno::Reference< text::XText > xText(rHeadFootFmt.GetXObject(),
+    uno::Reference< text::XText > xText(rHeadFootFormat.GetXObject(),
             uno::UNO_QUERY);
     if (!xText.is())
     {
         SwXHeadFootText *const pXHFT(
-                new SwXHeadFootText(rHeadFootFmt, bIsHeader));
+                new SwXHeadFootText(rHeadFootFormat, bIsHeader));
         xText.set(pXHFT);
-        rHeadFootFmt.SetXObject(xText);
+        rHeadFootFormat.SetXObject(xText);
     }
     return xText;
 }
 
-SwXHeadFootText::SwXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader)
-    : SwXText(rHeadFootFmt.GetDoc(),
+SwXHeadFootText::SwXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader)
+    : SwXText(rHeadFootFormat.GetDoc(),
             (bIsHeader) ? CURSOR_HEADER : CURSOR_FOOTER)
-    , m_pImpl( new SwXHeadFootText::Impl(*this, rHeadFootFmt, bIsHeader) )
+    , m_pImpl( new SwXHeadFootText::Impl(*this, rHeadFootFormat, bIsHeader) )
 {
 }
 
@@ -2693,13 +2693,13 @@ SwXHeadFootText::getSupportedServiceNames() throw (uno::RuntimeException, std::e
 const SwStartNode *SwXHeadFootText::GetStartNode() const
 {
     const SwStartNode *pSttNd = 0;
-    SwFrmFmt *const pHeadFootFmt = m_pImpl->GetHeadFootFmt();
-    if(pHeadFootFmt)
+    SwFrameFormat *const pHeadFootFormat = m_pImpl->GetHeadFootFormat();
+    if(pHeadFootFormat)
     {
-        const SwFmtCntnt& rFlyCntnt = pHeadFootFmt->GetCntnt();
-        if( rFlyCntnt.GetCntntIdx() )
+        const SwFormatContent& rFlyContent = pHeadFootFormat->GetContent();
+        if( rFlyContent.GetContentIdx() )
         {
-            pSttNd = rFlyCntnt.GetCntntIdx()->GetNode().GetStartNode();
+            pSttNd = rFlyContent.GetContentIdx()->GetNode().GetStartNode();
         }
     }
     return pSttNd;
@@ -2740,11 +2740,11 @@ SwXHeadFootText::createTextCursor() throw (uno::RuntimeException, std::exception
 {
     SolarMutexGuard aGuard;
 
-    SwFrmFmt & rHeadFootFmt( m_pImpl->GetHeadFootFmtOrThrow() );
+    SwFrameFormat & rHeadFootFormat( m_pImpl->GetHeadFootFormatOrThrow() );
 
     uno::Reference< text::XTextCursor > xRet;
-    const SwFmtCntnt& rFlyCntnt = rHeadFootFmt.GetCntnt();
-    const SwNode& rNode = rFlyCntnt.GetCntntIdx()->GetNode();
+    const SwFormatContent& rFlyContent = rHeadFootFormat.GetContent();
+    const SwNode& rNode = rFlyContent.GetContentIdx()->GetNode();
     SwPosition aPos(rNode);
     SwXTextCursor *const pXCursor = new SwXTextCursor(*GetDoc(), this,
             (m_pImpl->m_bIsHeader) ? CURSOR_HEADER : CURSOR_FOOTER, aPos);
@@ -2756,13 +2756,13 @@ SwXHeadFootText::createTextCursor() throw (uno::RuntimeException, std::exception
     SwStartNode const*const pOwnStartNode = rNode.FindSttNodeByType(
             (m_pImpl->m_bIsHeader) ? SwHeaderStartNode : SwFooterStartNode);
     // is there a table here?
-    SwTableNode* pTblNode = pUnoCrsr->GetNode().FindTableNode();
-    SwCntntNode* pCont = 0;
-    while (pTblNode)
+    SwTableNode* pTableNode = pUnoCrsr->GetNode().FindTableNode();
+    SwContentNode* pCont = 0;
+    while (pTableNode)
     {
-        pUnoCrsr->GetPoint()->nNode = *pTblNode->EndOfSectionNode();
+        pUnoCrsr->GetPoint()->nNode = *pTableNode->EndOfSectionNode();
         pCont = GetDoc()->GetNodes().GoNext(&pUnoCrsr->GetPoint()->nNode);
-        pTblNode = pCont->FindTableNode();
+        pTableNode = pCont->FindTableNode();
     }
     if (pCont)
     {
@@ -2788,7 +2788,7 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwFrmFmt & rHeadFootFmt( m_pImpl->GetHeadFootFmtOrThrow() );
+    SwFrameFormat & rHeadFootFormat( m_pImpl->GetHeadFootFormatOrThrow() );
 
     SwUnoInternalPaM aPam(*GetDoc());
     if (!::sw::XTextRangeToSwPaM(aPam, xTextPosition))
@@ -2799,7 +2799,7 @@ throw (uno::RuntimeException, std::exception)
     }
 
     uno::Reference< text::XTextCursor >  xRet;
-    SwNode& rNode = rHeadFootFmt.GetCntnt().GetCntntIdx()->GetNode();
+    SwNode& rNode = rHeadFootFormat.GetContent().GetContentIdx()->GetNode();
     SwPosition aPos(rNode);
     SwPaM aHFPam(aPos);
     aHFPam.Move(fnMoveForward, fnGoNode);
@@ -2823,11 +2823,11 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwFrmFmt & rHeadFootFmt( m_pImpl->GetHeadFootFmtOrThrow() );
+    SwFrameFormat & rHeadFootFormat( m_pImpl->GetHeadFootFormatOrThrow() );
 
     uno::Reference< container::XEnumeration >  aRef;
-    const SwFmtCntnt& rFlyCntnt = rHeadFootFmt.GetCntnt();
-    const SwNode& rNode = rFlyCntnt.GetCntntIdx()->GetNode();
+    const SwFormatContent& rFlyContent = rHeadFootFormat.GetContent();
+    const SwNode& rNode = rFlyContent.GetContentIdx()->GetNode();
     SwPosition aPos(rNode);
     ::std::unique_ptr<SwUnoCrsr> pUnoCursor(
         GetDoc()->CreateUnoCrsr(aPos, false));
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index 1a7c162d4a14..0354e6ac199d 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -43,12 +43,12 @@ using namespace ::com::sun::star;
 struct SwXTextMarkup::Impl
     : public SwClient
 {
-    SwTxtNode* m_pTxtNode;
+    SwTextNode* m_pTextNode;
     ModelToViewHelper const m_ConversionMap;
 
-    Impl(SwTxtNode *const pTxtNode, const ModelToViewHelper& rMap)
-        : SwClient(pTxtNode)
-        , m_pTxtNode(pTxtNode)
+    Impl(SwTextNode *const pTextNode, const ModelToViewHelper& rMap)
+        : SwClient(pTextNode)
+        , m_pTextNode(pTextNode)
         , m_ConversionMap(rMap)
     {
     }
@@ -58,8 +58,8 @@ struct SwXTextMarkup::Impl
 };
 
 SwXTextMarkup::SwXTextMarkup(
-        SwTxtNode *const pTxtNode, const ModelToViewHelper& rMap)
-    : m_pImpl(new Impl(pTxtNode, rMap))
+        SwTextNode *const pTextNode, const ModelToViewHelper& rMap)
+    : m_pImpl(new Impl(pTextNode, rMap))
 {
 }
 
@@ -67,14 +67,14 @@ SwXTextMarkup::~SwXTextMarkup()
 {
 }
 
-SwTxtNode* SwXTextMarkup::GetTxtNode()
+SwTextNode* SwXTextMarkup::GetTextNode()
 {
-    return m_pImpl->m_pTxtNode;
+    return m_pImpl->m_pTextNode;
 }
 
-void SwXTextMarkup::ClearTxtNode()
+void SwXTextMarkup::ClearTextNode()
 {
-    m_pImpl->m_pTxtNode = nullptr;
+    m_pImpl->m_pTextNode = nullptr;
 }
 
 const ModelToViewHelper& SwXTextMarkup::GetConversionMap()
@@ -145,7 +145,7 @@ void SAL_CALL SwXTextMarkup::commitStringMarkup(
     SolarMutexGuard aGuard;
 
     // paragraph already dead or modified?
-    if (!m_pImpl->m_pTxtNode || nLength <= 0)
+    if (!m_pImpl->m_pTextNode || nLength <= 0)
         return;
 
     if ( nType == text::TextMarkupType::SMARTTAG &&
@@ -157,41 +157,41 @@ void SAL_CALL SwXTextMarkup::commitStringMarkup(
     bool bRepaint = false;
     if ( nType == text::TextMarkupType::SPELLCHECK )
     {
-        pWList = m_pImpl->m_pTxtNode->GetWrong();
+        pWList = m_pImpl->m_pTextNode->GetWrong();
         if ( !pWList )
         {
             pWList = new SwWrongList( WRONGLIST_SPELL );
-            m_pImpl->m_pTxtNode->SetWrong( pWList );
+            m_pImpl->m_pTextNode->SetWrong( pWList );
         }
     }
     else if ( nType == text::TextMarkupType::PROOFREADING || nType == text::TextMarkupType::SENTENCE )
     {
-        IGrammarContact *pGrammarContact = getGrammarContact(*m_pImpl->m_pTxtNode);
+        IGrammarContact *pGrammarContact = getGrammarContact(*m_pImpl->m_pTextNode);
         if( pGrammarContact )
         {
-            pWList = pGrammarContact->getGrammarCheck(*m_pImpl->m_pTxtNode, true);
+            pWList = pGrammarContact->getGrammarCheck(*m_pImpl->m_pTextNode, true);
             OSL_ENSURE( pWList, "GrammarContact _has_ to deliver a wrong list" );
         }
         else
         {
-            pWList = m_pImpl->m_pTxtNode->GetGrammarCheck();
+            pWList = m_pImpl->m_pTextNode->GetGrammarCheck();
             if ( !pWList )
             {
-                m_pImpl->m_pTxtNode->SetGrammarCheck( new SwGrammarMarkUp() );
-                pWList = m_pImpl->m_pTxtNode->GetGrammarCheck();
+                m_pImpl->m_pTextNode->SetGrammarCheck( new SwGrammarMarkUp() );
+                pWList = m_pImpl->m_pTextNode->GetGrammarCheck();
             }
         }
-        bRepaint = pWList == m_pImpl->m_pTxtNode->GetGrammarCheck();
+        bRepaint = pWList == m_pImpl->m_pTextNode->GetGrammarCheck();
         if( pWList->GetBeginInv() < COMPLETE_STRING )
             static_cast<SwGrammarMarkUp*>(pWList)->ClearGrammarList();
     }
     else if ( nType == text::TextMarkupType::SMARTTAG )
     {
-        pWList = m_pImpl->m_pTxtNode->GetSmartTags();
+        pWList = m_pImpl->m_pTextNode->GetSmartTags();
         if ( !pWList )
         {
             pWList = new SwWrongList( WRONGLIST_SMARTTAG );
-            m_pImpl->m_pTxtNode->SetSmartTags( pWList );
+            m_pImpl->m_pTextNode->SetSmartTags( pWList );
         }
     }
     else
@@ -290,7 +290,7 @@ void SAL_CALL SwXTextMarkup::commitStringMarkup(
     }
 
     if( bRepaint )
-        finishGrammarCheck(*m_pImpl->m_pTxtNode);
+        finishGrammarCheck(*m_pImpl->m_pTextNode);
 }
 
 static void lcl_commitGrammarMarkUp(
@@ -393,7 +393,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     SolarMutexGuard aGuard;
 
     // paragraph already dead or modified?
-    if (!m_pImpl->m_pTxtNode)
+    if (!m_pImpl->m_pTextNode)
         return;
 
     // check for equal length of all sequnces
@@ -427,23 +427,23 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     // get appropriate list to use...
     SwGrammarMarkUp* pWList = 0;
     bool bRepaint = false;
-    IGrammarContact *pGrammarContact = getGrammarContact(*m_pImpl->m_pTxtNode);
+    IGrammarContact *pGrammarContact = getGrammarContact(*m_pImpl->m_pTextNode);
     if( pGrammarContact )
     {
-        pWList = pGrammarContact->getGrammarCheck(*m_pImpl->m_pTxtNode, true);
+        pWList = pGrammarContact->getGrammarCheck(*m_pImpl->m_pTextNode, true);
         OSL_ENSURE( pWList, "GrammarContact _has_ to deliver a wrong list" );
     }
     else
     {
-        pWList = m_pImpl->m_pTxtNode->GetGrammarCheck();
+        pWList = m_pImpl->m_pTextNode->GetGrammarCheck();
         if ( !pWList )
         {
-            m_pImpl->m_pTxtNode->SetGrammarCheck( new SwGrammarMarkUp() );
-            pWList = m_pImpl->m_pTxtNode->GetGrammarCheck();
+            m_pImpl->m_pTextNode->SetGrammarCheck( new SwGrammarMarkUp() );
+            pWList = m_pImpl->m_pTextNode->GetGrammarCheck();
             pWList->SetInvalid( 0, COMPLETE_STRING );
         }
     }
-    bRepaint = pWList == m_pImpl->m_pTxtNode->GetGrammarCheck();
+    bRepaint = pWList == m_pImpl->m_pTextNode->GetGrammarCheck();
 
     bool bAcceptGrammarError = false;
     if( pWList->GetBeginInv() < COMPLETE_STRING )
@@ -474,7 +474,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     }
 
     if( bRepaint )
-        finishGrammarCheck(*m_pImpl->m_pTxtNode);
+        finishGrammarCheck(*m_pImpl->m_pTextNode);
 
     return;
 }
@@ -486,7 +486,7 @@ void SwXTextMarkup::Impl::Modify( const SfxPoolItem* /*pOld*/, const SfxPoolItem
     if ( GetRegisteredIn() )
         GetRegisteredInNonConst()->Remove( this );
 
-    m_pTxtNode = 0;
+    m_pTextNode = 0;
 }
 
 SwXStringKeyMap::SwXStringKeyMap()
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 076e8933c039..73363ae8e46d 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -48,7 +48,7 @@ SwRenderData::~SwRenderData()
 void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev )
 {
     DeletePostItData();
-    m_pPostItFields.reset(new _SetGetExpFlds);
+    m_pPostItFields.reset(new _SetGetExpFields);
     sw_GetPostIts( &pDoc->getIDocumentFieldsAccess(), m_pPostItFields.get() );
 
     //!! Disable spell and grammar checking in the temporary document.
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 01cf7e6f77b5..5c160b84caa4 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -223,7 +223,7 @@ void SwViewShellImp::NotifySizeChg( const Size &rNewSz )
             const SwFrm *pAnchor = static_cast<const SwDrawContact*>(pCont)->GetAnchorFrm();
             if ( !pAnchor || pAnchor->IsInFly() || !pAnchor->IsValid() ||
                  !pAnchor->GetUpper() || !pAnchor->FindPageFrm() ||
-                 (FLY_AS_CHAR == pCont->GetFmt()->GetAnchor().GetAnchorId()) )
+                 (FLY_AS_CHAR == pCont->GetFormat()->GetAnchor().GetAnchorId()) )
             {
                 continue;
             }
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index e759fcf0a0b4..6f9068a71562 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -159,11 +159,11 @@ bool SwViewShellImp::IsCalcLayoutProgress() const
     return pLayAct && pLayAct->IsCalcLayout();
 }
 
-bool SwViewShellImp::IsUpdateExpFlds()
+bool SwViewShellImp::IsUpdateExpFields()
 {
     if ( pLayAct && pLayAct->IsCalcLayout() )
     {
-        pLayAct->SetUpdateExpFlds();
+        pLayAct->SetUpdateExpFields();
         return true;
     }
     return false;
@@ -359,10 +359,10 @@ void SwViewShellImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster,
 }
 
 /// invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs
-void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
-                                                       const SwTxtFrm* _pToTxtFrm )
+void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
+                                                       const SwTextFrm* _pToTextFrm )
 {
-    if ( !_pFromTxtFrm && !_pToTxtFrm )
+    if ( !_pFromTextFrm && !_pToTextFrm )
     {
         // No text frame provided. Thus, nothing to do.
         return;
@@ -372,15 +372,15 @@ void SwViewShellImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFr
     {
         if ( rTmp.Imp()->IsAccessible() )
         {
-            if ( _pFromTxtFrm )
+            if ( _pFromTextFrm )
             {
                 rTmp.Imp()->GetAccessibleMap().
-                            InvalidateParaFlowRelation( *_pFromTxtFrm, true );
+                            InvalidateParaFlowRelation( *_pFromTextFrm, true );
             }
-            if ( _pToTxtFrm )
+            if ( _pToTextFrm )
             {
                 rTmp.Imp()->GetAccessibleMap().
-                            InvalidateParaFlowRelation( *_pToTxtFrm, false );
+                            InvalidateParaFlowRelation( *_pToTextFrm, false );
             }
         }
     }
@@ -399,13 +399,13 @@ void SwViewShellImp::_InvalidateAccessibleParaTextSelection()
 }
 
 /// invalidate attributes for paragraphs
-void SwViewShellImp::_InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm )
+void SwViewShellImp::_InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm )
 {
     for(SwViewShell& rTmp : GetShell()->GetRingContainer())
     {
         if ( rTmp.Imp()->IsAccessible() )
         {
-            rTmp.Imp()->GetAccessibleMap().InvalidateAttr( rTxtFrm );
+            rTmp.Imp()->GetAccessibleMap().InvalidateAttr( rTextFrm );
         }
     }
 }
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index bedaee9f038b..37762b416e99 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -615,9 +615,9 @@ bool SwViewShell::IsDummyPage( sal_uInt16 nPageNum ) const
  * Forces update of each field.
  * It notifies all fields with pNewHt. If that is 0 (default), the field
  * type is sent (???).
- * @param[in] bCloseDB Passed in to GetDoc()->UpdateFlds. [TODO] Purpose???
+ * @param[in] bCloseDB Passed in to GetDoc()->UpdateFields. [TODO] Purpose???
  */
-void SwViewShell::UpdateFlds(bool bCloseDB)
+void SwViewShell::UpdateFields(bool bCloseDB)
 {
     SET_CURR_SHELL( this );
 
@@ -627,7 +627,7 @@ void SwViewShell::UpdateFlds(bool bCloseDB)
     else
         StartAction();
 
-    GetDoc()->getIDocumentFieldsAccess().UpdateFlds(0, bCloseDB);
+    GetDoc()->getIDocumentFieldsAccess().UpdateFields(0, bCloseDB);
 
     if ( bCrsr )
         static_cast<SwCrsrShell*>(this)->EndAction();
@@ -652,7 +652,7 @@ bool SwViewShell::HasCharts() const
     {
         ++aIdx;
         const SwOLENode *pNd = aIdx.GetNode().GetOLENode();
-        if( pNd && !pNd->GetChartTblName().isEmpty() )
+        if( pNd && !pNd->GetChartTableName().isEmpty() )
         {
             bRet = true;
             break;
@@ -684,8 +684,8 @@ void SwViewShell::LayoutIdle()
 
     {
         //Prepare and recover cache, so that it will not get fouled.
-        SwSaveSetLRUOfst aSave( *SwTxtFrm::GetTxtCache(),
-                             SwTxtFrm::GetTxtCache()->GetCurMax() - 50 );
+        SwSaveSetLRUOfst aSave( *SwTextFrm::GetTextCache(),
+                             SwTextFrm::GetTextCache()->GetCurMax() - 50 );
         // #125243# there are lots of stacktraces indicating that Imp() returns NULL
         // this SwViewShell seems to be invalid - but it's not clear why
         // this return is only a workaround!
@@ -696,14 +696,14 @@ void SwViewShell::LayoutIdle()
     }
 }
 
-static void lcl_InvalidateAllCntnt( SwViewShell& rSh, sal_uInt8 nInv )
+static void lcl_InvalidateAllContent( SwViewShell& rSh, sal_uInt8 nInv )
 {
     bool bCrsr = rSh.ISA(SwCrsrShell);
     if ( bCrsr )
         static_cast<SwCrsrShell&>(rSh).StartAction();
     else
         rSh.StartAction();
-    rSh.GetLayout()->InvalidateAllCntnt( nInv );
+    rSh.GetLayout()->InvalidateAllContent( nInv );
     if ( bCrsr )
         static_cast<SwCrsrShell&>(rSh).EndAction();
     else
@@ -742,7 +742,7 @@ void SwViewShell::SetParaSpaceMax( bool bNew )
         SwWait aWait( *GetDoc()->GetDocShell(), true );
         pIDSA->set(DocumentSettingId::PARA_SPACE_MAX, bNew );
         const sal_uInt8 nInv = INV_PRTAREA | INV_TABLE | INV_SECTION;
-        lcl_InvalidateAllCntnt( *this,  nInv );
+        lcl_InvalidateAllContent( *this,  nInv );
     }
 }
 
@@ -754,7 +754,7 @@ void SwViewShell::SetParaSpaceMaxAtPages( bool bNew )
         SwWait aWait( *GetDoc()->GetDocShell(), true );
         pIDSA->set(DocumentSettingId::PARA_SPACE_MAX_AT_PAGES, bNew );
         const sal_uInt8 nInv = INV_PRTAREA | INV_TABLE | INV_SECTION;
-        lcl_InvalidateAllCntnt( *this,  nInv );
+        lcl_InvalidateAllContent( *this,  nInv );
     }
 }
 
@@ -766,7 +766,7 @@ void SwViewShell::SetTabCompat( bool bNew )
         SwWait aWait( *GetDoc()->GetDocShell(), true );
         pIDSA->set(DocumentSettingId::TAB_COMPAT, bNew );
         const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE | INV_SECTION;
-        lcl_InvalidateAllCntnt( *this, nInv );
+        lcl_InvalidateAllContent( *this, nInv );
     }
 }
 
@@ -781,7 +781,7 @@ void SwViewShell::SetAddExtLeading( bool bNew )
         if ( pTmpDrawModel )
             pTmpDrawModel->SetAddExtLeading( bNew );
         const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE | INV_SECTION;
-        lcl_InvalidateAllCntnt( *this, nInv );
+        lcl_InvalidateAllContent( *this, nInv );
     }
 }
 
@@ -809,7 +809,7 @@ void SwViewShell::SetAddParaSpacingToTableCells( bool _bAddParaSpacingToTableCel
         SwWait aWait( *GetDoc()->GetDocShell(), true );
         pIDSA->set(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS, _bAddParaSpacingToTableCells );
         const sal_uInt8 nInv = INV_PRTAREA;
-        lcl_InvalidateAllCntnt( *this, nInv );
+        lcl_InvalidateAllContent( *this, nInv );
     }
 }
 
@@ -826,7 +826,7 @@ void SwViewShell::SetUseFormerLineSpacing( bool _bUseFormerLineSpacing )
         SwWait aWait( *GetDoc()->GetDocShell(), true );
         pIDSA->set(DocumentSettingId::OLD_LINE_SPACING, _bUseFormerLineSpacing );
         const sal_uInt8 nInv = INV_PRTAREA;
-        lcl_InvalidateAllCntnt( *this, nInv );
+        lcl_InvalidateAllContent( *this, nInv );
     }
 }
 
@@ -866,7 +866,7 @@ void SwViewShell::SetUseFormerTextWrapping( bool _bUseFormerTextWrapping )
         SwWait aWait( *GetDoc()->GetDocShell(), true );
         pIDSA->set(DocumentSettingId::USE_FORMER_TEXT_WRAPPING, _bUseFormerTextWrapping );
         const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE | INV_SECTION;
-        lcl_InvalidateAllCntnt( *this, nInv );
+        lcl_InvalidateAllContent( *this, nInv );
     }
 }
 
@@ -879,7 +879,7 @@ void SwViewShell::SetDoNotJustifyLinesWithManualBreak( bool _bDoNotJustifyLinesW
         SwWait aWait( *GetDoc()->GetDocShell(), true );
         pIDSA->set(DocumentSettingId::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, _bDoNotJustifyLinesWithManualBreak );
         const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE | INV_SECTION;
-        lcl_InvalidateAllCntnt( *this, nInv );
+        lcl_InvalidateAllContent( *this, nInv );
     }
 }
 
@@ -896,7 +896,7 @@ void SwViewShell::Reformat()
     {
 
         StartAction();
-        GetLayout()->InvalidateAllCntnt( INV_SIZE | INV_POS | INV_PRTAREA );
+        GetLayout()->InvalidateAllContent( INV_SIZE | INV_POS | INV_PRTAREA );
         EndAction();
     }
 }
@@ -919,8 +919,8 @@ void SwViewShell::CalcLayout()
     SwWait aWait( *GetDoc()->GetDocShell(), true );
 
     //prepare and recover cache, so that it will not get fouled.
-    SwSaveSetLRUOfst aSaveLRU( *SwTxtFrm::GetTxtCache(),
-                                  SwTxtFrm::GetTxtCache()->GetCurMax() - 50 );
+    SwSaveSetLRUOfst aSaveLRU( *SwTextFrm::GetTextCache(),
+                                  SwTextFrm::GetTextCache()->GetCurMax() - 50 );
 
     //switch on Progress when none is running yet.
     const bool bEndProgress = SfxProgress::GetActiveProgress( GetDoc()->GetDocShell() ) == 0;
@@ -936,22 +936,22 @@ void SwViewShell::CalcLayout()
     aAction.SetStatBar( true );
     aAction.SetCalcLayout( true );
     aAction.SetReschedule( true );
-    GetDoc()->getIDocumentFieldsAccess().LockExpFlds();
+    GetDoc()->getIDocumentFieldsAccess().LockExpFields();
     aAction.Action();
-    GetDoc()->getIDocumentFieldsAccess().UnlockExpFlds();
+    GetDoc()->getIDocumentFieldsAccess().UnlockExpFields();
 
-    //the SetNewFldLst() on the Doc was cut off and must be fetched again
+    //the SetNewFieldLst() on the Doc was cut off and must be fetched again
     //(see flowfrm.cxx, txtfld.cxx)
-    if ( aAction.IsExpFlds() )
+    if ( aAction.IsExpFields() )
     {
         aAction.Reset();
         aAction.SetPaint( false );
         aAction.SetStatBar( true );
         aAction.SetReschedule( true );
 
-        SwDocPosUpdate aMsgHnt( 0 );
-        GetDoc()->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt );
-        GetDoc()->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+        SwDocPosUpdate aMsgHint( 0 );
+        GetDoc()->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint );
+        GetDoc()->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
 
         aAction.Action();
     }
@@ -1910,14 +1910,14 @@ void SwViewShell::CheckBrowseView( bool bBrowseChgd )
     } while ( pPg );
 
     // When the size ratios in browse mode change,
-    // the Position and PrtArea of the Cntnt and Tab frames must be Invalidated.
+    // the Position and PrtArea of the Content and Tab frames must be Invalidated.
     sal_uInt8 nInv = INV_PRTAREA | INV_TABLE | INV_POS;
-    // In case of browse mode change the CntntFrms need a size-Invalidate
+    // In case of browse mode change the ContentFrms need a size-Invalidate
     // because of printer/screen formatting
     if( bBrowseChgd )
         nInv |= INV_SIZE | INV_DIRECTION;
 
-    GetLayout()->InvalidateAllCntnt( nInv );
+    GetLayout()->InvalidateAllContent( nInv );
 
     SwFrm::CheckPageDescs( static_cast<SwPageFrm*>(GetLayout()->Lower()) );
 
@@ -1986,7 +1986,7 @@ void SwViewShell::ApplyViewOptions( const SwViewOption &rOpt )
         if(&rSh == this)
             continue;
         SwViewOption aOpt( *rSh.GetViewOptions() );
-        aOpt.SetFldName( rOpt.IsFldName() );
+        aOpt.SetFieldName( rOpt.IsFieldName() );
             aOpt.SetShowHiddenField( rOpt.IsShowHiddenField() );
         aOpt.SetShowHiddenPara( rOpt.IsShowHiddenPara() );
             aOpt.SetShowHiddenChar( rOpt.IsShowHiddenChar() );
@@ -2020,18 +2020,18 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
 
     if( mpOpt->IsShowHiddenField() != rOpt.IsShowHiddenField() )
     {
-        static_cast<SwHiddenTxtFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENTXTFLD ))->
+        static_cast<SwHiddenTextFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENTXTFLD ))->
                                             SetHiddenFlag( !rOpt.IsShowHiddenField() );
         bReformat = true;
     }
     if ( mpOpt->IsShowHiddenPara() != rOpt.IsShowHiddenPara() )
     {
-        SwHiddenParaFieldType* pFldType = static_cast<SwHiddenParaFieldType*>(GetDoc()->
-                                          getIDocumentFieldsAccess().GetSysFldType(RES_HIDDENPARAFLD));
-        if( pFldType && pFldType->HasWriterListeners() )
+        SwHiddenParaFieldType* pFieldType = static_cast<SwHiddenParaFieldType*>(GetDoc()->
+                                          getIDocumentFieldsAccess().GetSysFieldType(RES_HIDDENPARAFLD));
+        if( pFieldType && pFieldType->HasWriterListeners() )
         {
-            SwMsgPoolItem aHnt( RES_HIDDENPARA_PRINT );
-            pFldType->ModifyNotification( &aHnt, 0);
+            SwMsgPoolItem aHint( RES_HIDDENPARA_PRINT );
+            pFieldType->ModifyNotification( &aHint, 0);
         }
         bReformat = true;
     }
@@ -2044,7 +2044,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
     // - fieldnames apply or not ...
     // ( - SwEndPortion must _no_ longer be generated. )
     // - Of course, the screen is something completely different than the printer ...
-    bReformat = bReformat || mpOpt->IsFldName() != rOpt.IsFldName();
+    bReformat = bReformat || mpOpt->IsFieldName() != rOpt.IsFieldName();
 
     // The map mode is changed, minima/maxima will be attended by UI
     if( mpOpt->GetZoom() != rOpt.GetZoom() && !IsPreview() )
@@ -2110,14 +2110,14 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
     {
         // #i44963# Good occasion to check if page sizes in
         // page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
-        mpDoc->CheckDefaultPageFmt();
+        mpDoc->CheckDefaultPageFormat();
         CheckBrowseView( true );
     }
 
     pMyWin->Invalidate();
     if ( bReformat )
     {
-        // Nothing helps, we need to send all CntntFrms a
+        // Nothing helps, we need to send all ContentFrms a
         // Prepare, we format anew:
         StartAction();
         Reformat();
@@ -2162,7 +2162,7 @@ void SwViewShell::SetReadonlyOption(bool bSet)
         // so that the flags can be queried properly.
         mpOpt->SetReadonly( false );
 
-        bool bReformat = mpOpt->IsFldName();
+        bool bReformat = mpOpt->IsFieldName();
 
         mpOpt->SetReadonly( bSet );
 
@@ -2275,12 +2275,12 @@ void SwViewShell::InvalidateAccessibleFocus()
 /**
  * invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs #i27138#
  */
-void SwViewShell::InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
-                                                      const SwTxtFrm* _pToTxtFrm )
+void SwViewShell::InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
+                                                      const SwTextFrm* _pToTextFrm )
 {
     if ( GetLayout() && GetLayout()->IsAnyShellAccessible() )
     {
-        Imp()->_InvalidateAccessibleParaFlowRelation( _pFromTxtFrm, _pToTxtFrm );
+        Imp()->_InvalidateAccessibleParaFlowRelation( _pFromTextFrm, _pToTextFrm );
     }
 }
 
@@ -2298,11 +2298,11 @@ void SwViewShell::InvalidateAccessibleParaTextSelection()
 /**
  * invalidate attributes for paragraphs #i88069#
  */
-void SwViewShell::InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm )
+void SwViewShell::InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm )
 {
     if ( GetLayout() && GetLayout()->IsAnyShellAccessible() )
     {
-        Imp()->_InvalidateAccessibleParaAttrs( rTxtFrm );
+        Imp()->_InvalidateAccessibleParaAttrs( rTextFrm );
     }
 }
 
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 03bd9c6405b1..1c436df90235 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -100,7 +100,7 @@ void SwViewShell::Init( const SwViewOption *pNewOpt )
     // page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
     if ( !bBrowseMode )
     {
-        mpDoc->CheckDefaultPageFmt();
+        mpDoc->CheckDefaultPageFormat();
     }
     // <--
 
@@ -126,9 +126,9 @@ void SwViewShell::Init( const SwViewOption *pNewOpt )
         if( !mpLayout )
         {
             // switched to two step construction because creating the layout in SwRootFrm needs a valid pLayout set
-            mpLayout = SwRootFrmPtr(new SwRootFrm(mpDoc->GetDfltFrmFmt(), this),
+            mpLayout = SwRootFrmPtr(new SwRootFrm(mpDoc->GetDfltFrameFormat(), this),
                                     &SwFrm::DestroyFrm);
-            mpLayout->Init( mpDoc->GetDfltFrmFmt() );
+            mpLayout->Init( mpDoc->GetDfltFrameFormat() );
         }
     }
     SizeChgNotify();
@@ -200,10 +200,10 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window *pWindow,
 
     SET_CURR_SHELL( this );
 
-    static_cast<SwHiddenTxtFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENTXTFLD ))->
+    static_cast<SwHiddenTextFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENTXTFLD ))->
         SetHiddenFlag( !mpOpt->IsShowHiddenField() );
 
-    // In Init a standard FrmFmt is created.
+    // In Init a standard FrameFormat is created.
     // --> OD 2005-02-11 #i38810#
     if (   !mpDoc->GetIDocumentUndoRedo().IsUndoNoResetModified()
         && !bIsDocModified )
@@ -213,8 +213,8 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window *pWindow,
     }
 
     // extend format cache.
-    if ( SwTxtFrm::GetTxtCache()->GetCurMax() < 2550 )
-        SwTxtFrm::GetTxtCache()->IncreaseMax( 100 );
+    if ( SwTextFrm::GetTextCache()->GetCurMax() < 2550 )
+        SwTextFrm::GetTextCache()->IncreaseMax( 100 );
     if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess()->GetDrawModel() )
         Imp()->MakeDrawView();
 
@@ -274,18 +274,18 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window *pWindow,
     if ( mbPreview )
         mpImp->InitPagePreviewLayout();
 
-    static_cast<SwHiddenTxtFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENTXTFLD ))->
+    static_cast<SwHiddenTextFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENTXTFLD ))->
             SetHiddenFlag( !mpOpt->IsShowHiddenField() );
 
-    // In Init a standard FrmFmt is created.
+    // In Init a standard FrameFormat is created.
     if( !bModified && !mpDoc->GetIDocumentUndoRedo().IsUndoNoResetModified() )
     {
         mpDoc->getIDocumentState().ResetModified();
     }
 
     // extend format cache.
-    if ( SwTxtFrm::GetTxtCache()->GetCurMax() < 2550 )
-        SwTxtFrm::GetTxtCache()->IncreaseMax( 100 );
+    if ( SwTextFrm::GetTextCache()->GetCurMax() < 2550 )
+        SwTextFrm::GetTextCache()->IncreaseMax( 100 );
     if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess()->GetDrawModel() )
         Imp()->MakeDrawView();
 
@@ -320,8 +320,8 @@ SwViewShell::~SwViewShell()
                         SwIterator<SwFrm,SwGrfNode> aIter( *pGNd );
                         for( SwFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
                         {
-                            OSL_ENSURE( pFrm->IsNoTxtFrm(), "GraphicNode with Text?" );
-                            static_cast<SwNoTxtFrm*>(pFrm)->StopAnimation( mpOut );
+                            OSL_ENSURE( pFrm->IsNoTextFrm(), "GraphicNode with Text?" );
+                            static_cast<SwNoTextFrm*>(pFrm)->StopAnimation( mpOut );
                         }
                     }
                 }
@@ -345,8 +345,8 @@ SwViewShell::~SwViewShell()
         delete mpOpt;
 
         // resize format cache.
-        if ( SwTxtFrm::GetTxtCache()->GetCurMax() > 250 )
-            SwTxtFrm::GetTxtCache()->DecreaseMax( 100 );
+        if ( SwTextFrm::GetTextCache()->GetCurMax() > 250 )
+            SwTextFrm::GetTextCache()->DecreaseMax( 100 );
 
         // Remove from PaintQueue if necessary
         SwPaintQueue::Remove( this );
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 8362b1609f1b..5ea6e10cd807 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -238,8 +238,8 @@ void SwViewShell::ChgAllPageOrientation( Orientation eOri )
                 GetDoc()->CopyPageDesc(rOld, aNew);
             }
             aNew.SetLandscape( bNewOri );
-            SwFrmFmt& rFmt = aNew.GetMaster();
-            SwFmtFrmSize aSz( rFmt.GetFrmSize() );
+            SwFrameFormat& rFormat = aNew.GetMaster();
+            SwFormatFrmSize aSz( rFormat.GetFrmSize() );
             // adjust size
             // PORTRAIT  -> higher than wide
             // LANDSCAPE -> wider than high
@@ -250,7 +250,7 @@ void SwViewShell::ChgAllPageOrientation( Orientation eOri )
                 SwTwips aTmp = aSz.GetHeight();
                 aSz.SetHeight( aSz.GetWidth() );
                 aSz.SetWidth( aTmp );
-                rFmt.SetFmtAttr( aSz );
+                rFormat.SetFormatAttr( aSz );
             }
             GetDoc()->ChgPageDesc( i, aNew );
         }
@@ -273,7 +273,7 @@ void SwViewShell::ChgAllPageSize( Size &rSz )
             ::sw::UndoGuard const ug(GetDoc()->GetIDocumentUndoRedo());
             GetDoc()->CopyPageDesc( rOld, aNew );
         }
-        SwFrmFmt& rPgFmt = aNew.GetMaster();
+        SwFrameFormat& rPgFormat = aNew.GetMaster();
         Size aSz( rSz );
         const bool bOri = aNew.GetLandscape();
         if( bOri  ? aSz.Height() > aSz.Width()
@@ -284,9 +284,9 @@ void SwViewShell::ChgAllPageSize( Size &rSz )
             aSz.Width()  = aTmp;
         }
 
-        SwFmtFrmSize aFrmSz( rPgFmt.GetFrmSize() );
+        SwFormatFrmSize aFrmSz( rPgFormat.GetFrmSize() );
         aFrmSz.SetSize( aSz );
-        rPgFmt.SetFmtAttr( aFrmSz );
+        rPgFormat.SetFormatAttr( aFrmSz );
         pMyDoc->ChgPageDesc( i, aNew );
     }
 }
@@ -325,7 +325,7 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
 {
     OSL_ENSURE( this->IsA( TYPE(SwFEShell) ),"SwViewShell::Prt for FEShell only");
     SwFEShell* pFESh = static_cast<SwFEShell*>(this);
-    pPrtDoc->getIDocumentFieldsAccess().LockExpFlds();
+    pPrtDoc->getIDocumentFieldsAccess().LockExpFields();
 
     // use given printer
     //! Make a copy of it since it gets destroyed with the temporary document
@@ -356,15 +356,15 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
     Point aSelPoint;
     if( pFESh->IsTableMode() )
     {
-        SwShellTableCrsr* pShellTblCrsr = pFESh->GetTableCrsr();
+        SwShellTableCrsr* pShellTableCrsr = pFESh->GetTableCrsr();
 
-        const SwCntntNode* pCntntNode = pShellTblCrsr->GetNode().GetCntntNode();
-        const SwCntntFrm *pCntntFrm = pCntntNode ? pCntntNode->getLayoutFrm( GetLayout(), 0, pShellTblCrsr->Start() ) : 0;
-        if( pCntntFrm )
+        const SwContentNode* pContentNode = pShellTableCrsr->GetNode().GetContentNode();
+        const SwContentFrm *pContentFrm = pContentNode ? pContentNode->getLayoutFrm( GetLayout(), 0, pShellTableCrsr->Start() ) : 0;
+        if( pContentFrm )
         {
             SwRect aCharRect;
             SwCrsrMoveState aTmpState( MV_NONE );
-            pCntntFrm->GetCharRect( aCharRect, *pShellTblCrsr->Start(), &aTmpState );
+            pContentFrm->GetCharRect( aCharRect, *pShellTableCrsr->Start(), &aTmpState );
             aSelPoint = Point( aCharRect.Left(), aCharRect.Top() );
         }
     }
@@ -383,12 +383,12 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
     if( !pFESh->IsTableMode() && pActCrsr && pActCrsr->HasMark() )
     {   // Tweak paragraph attributes of last paragraph
         SwNodeIndex aNodeIdx( *pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
-        SwTxtNode* pTxtNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx )->GetTxtNode();
-        SwCntntNode *pLastNd =
-            pActCrsr->GetCntntNode( (*pActCrsr->GetMark()) <= (*pActCrsr->GetPoint()) );
+        SwTextNode* pTextNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx )->GetTextNode();
+        SwContentNode *pLastNd =
+            pActCrsr->GetContentNode( (*pActCrsr->GetMark()) <= (*pActCrsr->GetPoint()) );
         // copy the paragraph attributes of the first paragraph
-        if( pLastNd && pLastNd->IsTxtNode() )
-            static_cast<SwTxtNode*>(pLastNd)->CopyCollFmt( *pTxtNd );
+        if( pLastNd && pLastNd->IsTextNode() )
+            static_cast<SwTextNode*>(pLastNd)->CopyCollFormat( *pTextNd );
     }
 
     // fill it with the selected content
@@ -397,26 +397,26 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
     // set the page style at the first paragraph
     {
         SwNodeIndex aNodeIdx( *pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
-        SwCntntNode* pCNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx ); // go to 1st ContentNode
+        SwContentNode* pCNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx ); // go to 1st ContentNode
         if( pFESh->IsTableMode() )
         {
             SwTableNode* pTNd = pCNd->FindTableNode();
             if( pTNd )
-                pTNd->GetTable().GetFrmFmt()->SetFmtAttr( SwFmtPageDesc( pPageDesc ) );
+                pTNd->GetTable().GetFrameFormat()->SetFormatAttr( SwFormatPageDesc( pPageDesc ) );
         }
         else
         {
-            pCNd->SetAttr( SwFmtPageDesc( pPageDesc ) );
+            pCNd->SetAttr( SwFormatPageDesc( pPageDesc ) );
             if( pFirstCrsr && pFirstCrsr->HasMark() )
             {
-                SwTxtNode *pTxtNd = pCNd->GetTxtNode();
-                if( pTxtNd )
+                SwTextNode *pTextNd = pCNd->GetTextNode();
+                if( pTextNd )
                 {
-                    SwCntntNode *pFirstNd =
-                        pFirstCrsr->GetCntntNode( (*pFirstCrsr->GetMark()) > (*pFirstCrsr->GetPoint()) );
+                    SwContentNode *pFirstNd =
+                        pFirstCrsr->GetContentNode( (*pFirstCrsr->GetMark()) > (*pFirstCrsr->GetPoint()) );
                     // copy paragraph attributes of the first paragraph
-                    if( pFirstNd && pFirstNd->IsTxtNode() )
-                        static_cast<SwTxtNode*>(pFirstNd)->CopyCollFmt( *pTxtNd );
+                    if( pFirstNd && pFirstNd->IsTextNode() )
+                        static_cast<SwTextNode*>(pFirstNd)->CopyCollFormat( *pTextNd );
                 }
             }
         }
@@ -632,9 +632,9 @@ bool SwViewShell::IsAnyFieldInDoc() const
     {
         if( 0 != (pItem = mpDoc->GetAttrPool().GetItem2( RES_TXTATR_FIELD, n )))
         {
-            const SwFmtFld* pFmtFld = static_cast<const SwFmtFld*>(pItem);
-            const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-            if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+            const SwFormatField* pFormatField = static_cast<const SwFormatField*>(pItem);
+            const SwTextField* pTextField = pFormatField->GetTextField();
+            if( pTextField && pTextField->GetTextNode().GetNodes().IsDocNodes() )
             {
                 return true;
             }
@@ -646,9 +646,9 @@ bool SwViewShell::IsAnyFieldInDoc() const
     {
         if( 0 != (pItem = mpDoc->GetAttrPool().GetItem2( RES_TXTATR_INPUTFIELD, n )))
         {
-            const SwFmtFld* pFmtFld = static_cast<const SwFmtFld*>(pItem);
-            const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-            if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+            const SwFormatField* pFormatField = static_cast<const SwFormatField*>(pItem);
+            const SwTextField* pTextField = pFormatField->GetTextField();
+            if( pTextField && pTextField->GetTextNode().GetNodes().IsDocNodes() )
             {
                 return true;
             }
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 0be50d3db442..a4f32b8d2822 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -45,13 +45,13 @@
 class SwASC_AttrIter
 {
     SwASCWriter& rWrt;
-    const SwTxtNode& rNd;
+    const SwTextNode& rNd;
     sal_Int32 nAktSwPos;
 
     sal_Int32 SearchNext( sal_Int32 nStartPos );
 
 public:
-    SwASC_AttrIter( SwASCWriter& rWrt, const SwTxtNode& rNd, sal_Int32 nStt );
+    SwASC_AttrIter( SwASCWriter& rWrt, const SwTextNode& rNd, sal_Int32 nStt );
 
     void NextPos()
     {
@@ -68,10 +68,10 @@ public:
 
 SwASC_AttrIter::SwASC_AttrIter(
     SwASCWriter& rWr,
-    const SwTxtNode& rTxtNd,
+    const SwTextNode& rTextNd,
     sal_Int32 nStt )
     : rWrt( rWr )
-    , rNd( rTxtNd )
+    , rNd( rTextNd )
     , nAktSwPos( 0 )
 {
     nAktSwPos = SearchNext( nStt + 1 );
@@ -80,14 +80,14 @@ SwASC_AttrIter::SwASC_AttrIter(
 sal_Int32 SwASC_AttrIter::SearchNext( sal_Int32 nStartPos )
 {
     sal_Int32 nMinPos = SAL_MAX_INT32;
-    const SwpHints* pTxtAttrs = rNd.GetpSwpHints();
-    if( pTxtAttrs )
+    const SwpHints* pTextAttrs = rNd.GetpSwpHints();
+    if( pTextAttrs )
     {
-        // TODO: This can be optimized, if we make use of the fact that the TxtAttrs
+        // TODO: This can be optimized, if we make use of the fact that the TextAttrs
         // are sorted by starting position. We would need to remember two indices, however.
-        for ( size_t i = 0; i < pTxtAttrs->Count(); ++i )
+        for ( size_t i = 0; i < pTextAttrs->Count(); ++i )
         {
-            const SwTxtAttr* pHt = (*pTxtAttrs)[i];
+            const SwTextAttr* pHt = (*pTextAttrs)[i];
             if ( pHt->HasDummyChar() )
             {
                 sal_Int32 nPos = pHt->GetStart();
@@ -120,12 +120,12 @@ sal_Int32 SwASC_AttrIter::SearchNext( sal_Int32 nStartPos )
 bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos )
 {
     bool bRet = false;
-    const SwpHints* pTxtAttrs = rNd.GetpSwpHints();
-    if( pTxtAttrs )
+    const SwpHints* pTextAttrs = rNd.GetpSwpHints();
+    if( pTextAttrs )
     {
-        for( size_t i = 0; i < pTxtAttrs->Count(); ++i )
+        for( size_t i = 0; i < pTextAttrs->Count(); ++i )
         {
-            const SwTxtAttr* pHt = (*pTxtAttrs)[i];
+            const SwTextAttr* pHt = (*pTextAttrs)[i];
             if ( ( pHt->HasDummyChar()
                    || pHt->HasContent() )
                  && nSwPos == pHt->GetStart() )
@@ -137,21 +137,21 @@ bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos )
                 case RES_TXTATR_FIELD:
                 case RES_TXTATR_ANNOTATION:
                 case RES_TXTATR_INPUTFIELD:
-                    sOut = static_txtattr_cast<SwTxtFld const*>(pHt)
-                            ->GetFmtFld().GetField()->ExpandField(true);
+                    sOut = static_txtattr_cast<SwTextField const*>(pHt)
+                            ->GetFormatField().GetField()->ExpandField(true);
                     break;
 
                 case RES_TXTATR_FTN:
                     {
-                        const SwFmtFtn& rFtn = pHt->GetFtn();
-                        if( !rFtn.GetNumStr().isEmpty() )
-                            sOut = rFtn.GetNumStr();
-                        else if( rFtn.IsEndNote() )
-                            sOut = rWrt.pDoc->GetEndNoteInfo().aFmt.
-                            GetNumStr( rFtn.GetNumber() );
+                        const SwFormatFootnote& rFootnote = pHt->GetFootnote();
+                        if( !rFootnote.GetNumStr().isEmpty() )
+                            sOut = rFootnote.GetNumStr();
+                        else if( rFootnote.IsEndNote() )
+                            sOut = rWrt.pDoc->GetEndNoteInfo().aFormat.
+                            GetNumStr( rFootnote.GetNumber() );
                         else
-                            sOut = rWrt.pDoc->GetFtnInfo().aFmt.
-                            GetNumStr( rFtn.GetNumber() );
+                            sOut = rWrt.pDoc->GetFootnoteInfo().aFormat.
+                            GetNumStr( rFootnote.GetNumber() );
                     }
                     break;
                 }
@@ -167,9 +167,9 @@ bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos )
 
 // Output of the node
 
-static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
+static Writer& OutASC_SwTextNode( Writer& rWrt, SwContentNode& rNode )
 {
-    const SwTxtNode& rNd = static_cast<SwTxtNode&>(rNode);
+    const SwTextNode& rNd = static_cast<SwTextNode&>(rNode);
 
     sal_Int32 nStrPos = rWrt.pCurPam->GetPoint()->nContent.GetIndex();
     const sal_Int32 nNodeEnd = rNd.Len();
@@ -190,7 +190,7 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
         }
     }
 
-    OUString aStr( rNd.GetTxt() );
+    OUString aStr( rNd.GetText() );
     if( rWrt.bASCII_ParaAsBlanc )
         aStr = aStr.replace(0x0A, ' ');
 
@@ -231,7 +231,7 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
  */
 
 SwNodeFnTab aASCNodeFnTab = {
-/* RES_TXTNODE  */                   OutASC_SwTxtNode,
+/* RES_TXTNODE  */                   OutASC_SwTextNode,
 /* RES_GRFNODE  */                   0,
 /* RES_OLENODE  */                   0
 };
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 6bc9f674d3f5..202bad3582af 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -144,23 +144,23 @@ sal_uLong SwASCIIParser::CallParser()
     ::StartProgress( STR_STATSTR_W4WREAD, 0, nFileSize, pDoc->GetDocShell() );
 
     SwPaM* pInsPam = 0;
-    sal_Int32 nSttCntnt = 0;
+    sal_Int32 nSttContent = 0;
     if (!bNewDoc)
     {
         const SwNodeIndex& rTmp = pPam->GetPoint()->nNode;
         pInsPam = new SwPaM( rTmp, rTmp, 0, -1 );
-        nSttCntnt = pPam->GetPoint()->nContent.GetIndex();
+        nSttContent = pPam->GetPoint()->nContent.GetIndex();
     }
 
-    SwTxtFmtColl *pColl = 0;
+    SwTextFormatColl *pColl = 0;
 
     if (bNewDoc)
     {
-        pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_HTML_PRE, false);
+        pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_HTML_PRE, false);
         if (!pColl)
-            pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD,false);
+            pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD,false);
         if (pColl)
-            pDoc->SetTxtFmtColl(*pPam, pColl);
+            pDoc->SetTextFormatColl(*pPam, pColl);
     }
 
     sal_uLong nError = ReadChars();
@@ -212,7 +212,7 @@ sal_uLong SwASCIIParser::CallParser()
                         if (SfxItemState::SET == pItemSet->GetItemState(*pWhichIds,
                             false, &pItem))
                         {
-                            pColl->SetFmtAttr( *pItem );
+                            pColl->SetFormatAttr( *pItem );
                             pItemSet->ClearItem( *pWhichIds );
                         }
                         ++pWhichIds;
@@ -227,7 +227,7 @@ sal_uLong SwASCIIParser::CallParser()
                 *pInsPam->GetMark() = *pPam->GetPoint();
                 ++pInsPam->GetPoint()->nNode;
                 pInsPam->GetPoint()->nContent.Assign(
-                                    pInsPam->GetCntntNode(), nSttCntnt );
+                                    pInsPam->GetContentNode(), nSttContent );
 
                 // !!!!!
                 OSL_ENSURE( false, "Have to change - hard attr. to para. style" );
@@ -428,7 +428,7 @@ sal_uLong SwASCIIParser::ReadChars()
                         }
                         pDoc->getIDocumentContentOperations().SplitNode( *pPam->GetPoint(), false );
                         pDoc->getIDocumentContentOperations().InsertPoolItem(
-                            *pPam, SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE, RES_BREAK ) );
+                            *pPam, SvxFormatBreakItem( SVX_BREAK_PAGE_BEFORE, RES_BREAK ) );
                         pLastStt = pStt;
                         nLineLen = 0;
                         bIns = false;
@@ -489,7 +489,7 @@ void SwASCIIParser::InsertText( const OUString& rStr )
 {
     pDoc->getIDocumentContentOperations().InsertString( *pPam, rStr );
     pDoc->UpdateRsid( *pPam, rStr.getLength() );
-    pDoc->UpdateParRsid( pPam->GetPoint()->nNode.GetNode().GetTxtNode() );
+    pDoc->UpdateParRsid( pPam->GetPoint()->nNode.GetNode().GetTextNode() );
 
     if( pItemSet && g_pBreakIt && nScript != ( SvtScriptType::LATIN |
                                              SvtScriptType::ASIAN |
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 66a671622c04..907ea407ffc9 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -118,15 +118,15 @@ sal_uLong SwASCWriter::WriteStream()
               (pCurPam->GetPoint()->nNode.GetIndex() == pCurPam->GetMark()->nNode.GetIndex() &&
                pCurPam->GetPoint()->nContent.GetIndex() <= pCurPam->GetMark()->nContent.GetIndex()) )
         {
-            SwTxtNode* pNd = pCurPam->GetPoint()->nNode.GetNode().GetTxtNode();
+            SwTextNode* pNd = pCurPam->GetPoint()->nNode.GetNode().GetTextNode();
             if( pNd )
             {
                 // Should we have frames only?
                 // That's possible, if we put a frame selection into the clipboard
                 if( bTstFly && bWriteAll &&
-                    pNd->GetTxt().isEmpty() &&
+                    pNd->GetText().isEmpty() &&
                     // Frame exists
-                    pDoc->GetSpzFrmFmts()->size() &&
+                    pDoc->GetSpzFrameFormats()->size() &&
                     // Only one node in the array
                     pDoc->GetNodes().GetEndOfExtras().GetIndex() + 3 ==
                     pDoc->GetNodes().GetEndOfContent().GetIndex() &&
@@ -136,8 +136,8 @@ sal_uLong SwASCWriter::WriteStream()
                 {
                     // Print the frame's content.
                     // It is always at position 0!
-                    const SwFrmFmt* pFmt = (*pDoc->GetSpzFrmFmts())[ 0 ];
-                    const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
+                    const SwFrameFormat* pFormat = (*pDoc->GetSpzFrameFormats())[ 0 ];
+                    const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx();
                     if( pIdx )
                     {
                         delete pCurPam;
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index e1da5d904eb7..0144e2c4fb3d 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -277,19 +277,19 @@ void StgReader::SetFltName( const OUString& rFltNm )
 
 SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, bool bNDoc )
 {
-    pNumRuleTbl = new SwNumRuleTbl();
-    pNumRuleTbl->reserve(8);
+    pNumRuleTable = new SwNumRuleTable();
+    pNumRuleTable->reserve(8);
     if( !bNDoc )
-        pNumRuleTbl->insert( pNumRuleTbl->begin(),
-            rDoc.GetNumRuleTbl().begin(), rDoc.GetNumRuleTbl().end() );
+        pNumRuleTable->insert( pNumRuleTable->begin(),
+            rDoc.GetNumRuleTable().begin(), rDoc.GetNumRuleTable().end() );
 }
 
 SwRelNumRuleSpaces::~SwRelNumRuleSpaces()
 {
-    if( pNumRuleTbl )
+    if( pNumRuleTable )
     {
-        pNumRuleTbl->clear();
-        delete pNumRuleTbl;
+        pNumRuleTable->clear();
+        delete pNumRuleTable;
     }
 }
 
@@ -298,39 +298,39 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
 {
     const SfxPoolItem* pItem = 0;
     if( SfxItemState::SET != rFlySet.GetItemState( RES_FRM_SIZE, true, &pItem ) ||
-            MINFLY > static_cast<const SwFmtFrmSize*>(pItem)->GetWidth() )
+            MINFLY > static_cast<const SwFormatFrmSize*>(pItem)->GetWidth() )
     {
-        SwFmtFrmSize aSz(static_cast<const SwFmtFrmSize&>(rFlySet.Get(RES_FRM_SIZE, true)));
+        SwFormatFrmSize aSz(static_cast<const SwFormatFrmSize&>(rFlySet.Get(RES_FRM_SIZE, true)));
         if (pItem)
-            aSz = static_cast<const SwFmtFrmSize&>(*pItem);
+            aSz = static_cast<const SwFormatFrmSize&>(*pItem);
 
         SwTwips nWidth;
         // determine the width; if there is a table use the width of the table;
         // otherwise use the width of the page
-        const SwTableNode* pTblNd = rAnchor.GetNode().FindTableNode();
-        if( pTblNd )
-            nWidth = pTblNd->GetTable().GetFrmFmt()->GetFrmSize().GetWidth();
+        const SwTableNode* pTableNd = rAnchor.GetNode().FindTableNode();
+        if( pTableNd )
+            nWidth = pTableNd->GetTable().GetFrameFormat()->GetFrmSize().GetWidth();
         else
             nWidth = nPageWidth;
 
-        const SwNodeIndex* pSttNd = static_cast<const SwFmtCntnt&>(rFlySet.Get( RES_CNTNT )).
-                                                                GetCntntIdx();
+        const SwNodeIndex* pSttNd = static_cast<const SwFormatContent&>(rFlySet.Get( RES_CNTNT )).
+                                                                GetContentIdx();
         if( pSttNd )
         {
             bool bOnlyOneNode = true;
             sal_uLong nMinFrm = 0;
             sal_uLong nMaxFrm = 0;
-            SwTxtNode* pFirstTxtNd = 0;
+            SwTextNode* pFirstTextNd = 0;
             SwNodeIndex aIdx( *pSttNd, 1 );
             SwNodeIndex aEnd( *pSttNd->GetNode().EndOfSectionNode() );
             while( aIdx < aEnd )
             {
-                SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
-                if( pTxtNd )
+                SwTextNode *pTextNd = aIdx.GetNode().GetTextNode();
+                if( pTextNd )
                 {
-                    if( !pFirstTxtNd )
-                        pFirstTxtNd = pTxtNd;
-                    else if( pFirstTxtNd != pTxtNd )
+                    if( !pFirstTextNd )
+                        pFirstTextNd = pTextNd;
+                    else if( pFirstTextNd != pTextNd )
                     {
                         // forget it
                         bOnlyOneNode = false;
@@ -338,24 +338,24 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
                     }
 
                     sal_uLong nAbsMinCnts;
-                    pTxtNd->GetMinMaxSize( aIdx.GetIndex(), nMinFrm, nMaxFrm, nAbsMinCnts );
+                    pTextNd->GetMinMaxSize( aIdx.GetIndex(), nMinFrm, nMaxFrm, nAbsMinCnts );
                 }
                 ++aIdx;
             }
 
             if( bOnlyOneNode )
             {
-                if( nMinFrm < MINLAY && pFirstTxtNd )
+                if( nMinFrm < MINLAY && pFirstTextNd )
                 {
                     // if the first node dont contained any content, then
                     // insert one char in it calc again and delete once again
-                    SwIndex aNdIdx( pFirstTxtNd );
-                    pFirstTxtNd->InsertText(OUString("MM"), aNdIdx);
+                    SwIndex aNdIdx( pFirstTextNd );
+                    pFirstTextNd->InsertText(OUString("MM"), aNdIdx);
                     sal_uLong nAbsMinCnts;
-                    pFirstTxtNd->GetMinMaxSize( pFirstTxtNd->GetIndex(),
+                    pFirstTextNd->GetMinMaxSize( pFirstTextNd->GetIndex(),
                                                                     nMinFrm, nMaxFrm, nAbsMinCnts );
                     aNdIdx -= 2;
-                    pFirstTxtNd->EraseText( aNdIdx, 2 );
+                    pFirstTextNd->EraseText( aNdIdx, 2 );
                 }
 
                 // consider border and distance to content
@@ -395,9 +395,9 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
             aSz.SetHeight( MINFLY );
         rFlySet.Put( aSz );
     }
-    else if( MINFLY > static_cast<const SwFmtFrmSize*>(pItem)->GetHeight() )
+    else if( MINFLY > static_cast<const SwFormatFrmSize*>(pItem)->GetHeight() )
     {
-        SwFmtFrmSize aSz( *static_cast<const SwFmtFrmSize*>(pItem) );
+        SwFormatFrmSize aSz( *static_cast<const SwFormatFrmSize*>(pItem) );
         aSz.SetHeight( MINFLY );
         rFlySet.Put( aSz );
     }
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index 7a72d158f724..be5d9ebc5e48 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -67,9 +67,9 @@
 
 using namespace com::sun::star;
 
-static SwCntntNode* GetCntntNode(SwDoc* pDoc, SwNodeIndex& rIdx, bool bNext)
+static SwContentNode* GetContentNode(SwDoc* pDoc, SwNodeIndex& rIdx, bool bNext)
 {
-    SwCntntNode * pCNd = rIdx.GetNode().GetCntntNode();
+    SwContentNode * pCNd = rIdx.GetNode().GetContentNode();
     if(!pCNd && 0 == (pCNd = bNext ? pDoc->GetNodes().GoNext(&rIdx)
                                      : SwNodes::GoPrevious(&rIdx)))
     {
@@ -120,28 +120,28 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck,
 
     // The only position of 0x0D will not be able to make region in the old logic
     // because it is beyond the length of para...need special consideration here.
-    SwCntntNode *const pCntntNode(
-        SwNodeIndex(rMkPos.m_nNode, +1).GetNode().GetCntntNode());
+    SwContentNode *const pContentNode(
+        SwNodeIndex(rMkPos.m_nNode, +1).GetNode().GetContentNode());
     if (rMkPos == rPtPos &&
-        ((0 != rPtPos.m_nCntnt) || (pCntntNode && (0 != pCntntNode->Len())))
+        ((0 != rPtPos.m_nContent) || (pContentNode && (0 != pContentNode->Len())))
         && ( RES_TXTATR_FIELD != nWhich
              && RES_TXTATR_ANNOTATION != nWhich
              && RES_TXTATR_INPUTFIELD != nWhich )
-        && !(bIsParaEnd && pCntntNode && pCntntNode->IsTxtNode() && 0 != pCntntNode->Len() ))
+        && !(bIsParaEnd && pContentNode && pContentNode->IsTextNode() && 0 != pContentNode->Len() ))
     {
         return false;
     }
     // The content indices always apply to the node!
     rRegion.GetPoint()->nNode = rMkPos.m_nNode.GetIndex() + 1;
-    SwCntntNode* pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, true);
-    rRegion.GetPoint()->nContent.Assign(pCNd, rMkPos.m_nCntnt);
+    SwContentNode* pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode, true);
+    rRegion.GetPoint()->nContent.Assign(pCNd, rMkPos.m_nContent);
     rRegion.SetMark();
     if (rMkPos.m_nNode != rPtPos.m_nNode)
     {
         rRegion.GetPoint()->nNode = rPtPos.m_nNode.GetIndex() + 1;
-        pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, false);
+        pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode, false);
     }
-    rRegion.GetPoint()->nContent.Assign(pCNd, rPtPos.m_nCntnt);
+    rRegion.GetPoint()->nContent.Assign(pCNd, rPtPos.m_nContent);
     OSL_ENSURE( CheckNodesRange( rRegion.Start()->nNode,
                              rRegion.End()->nNode, true ),
              "atttribute or similar crosses section-boundaries" );
@@ -186,22 +186,22 @@ void SwFltControlStack::MoveAttrs( const SwPosition& rPos )
         SwFltStackEntry& rEntry = maEntries[i];
         if (
             (rEntry.m_aMkPos.m_nNode.GetIndex()+1 == nPosNd) &&
-            (rEntry.m_aMkPos.m_nCntnt >= nPosCt)
+            (rEntry.m_aMkPos.m_nContent >= nPosCt)
            )
         {
-            rEntry.m_aMkPos.m_nCntnt++;
-            OSL_ENSURE( rEntry.m_aMkPos.m_nCntnt
-                <= pDoc->GetNodes()[nPosNd]->GetCntntNode()->Len(),
+            rEntry.m_aMkPos.m_nContent++;
+            OSL_ENSURE( rEntry.m_aMkPos.m_nContent
+                <= pDoc->GetNodes()[nPosNd]->GetContentNode()->Len(),
                     "Attribute ends after end of line" );
         }
         if (
             (rEntry.m_aPtPos.m_nNode.GetIndex()+1 == nPosNd) &&
-            (rEntry.m_aPtPos.m_nCntnt >= nPosCt)
+            (rEntry.m_aPtPos.m_nContent >= nPosCt)
            )
         {
-            rEntry.m_aPtPos.m_nCntnt++;
-            OSL_ENSURE( rEntry.m_aPtPos.m_nCntnt
-                <= pDoc->GetNodes()[nPosNd]->GetCntntNode()->Len(),
+            rEntry.m_aPtPos.m_nContent++;
+            OSL_ENSURE( rEntry.m_aPtPos.m_nContent
+                <= pDoc->GetNodes()[nPosNd]->GetContentNode()->Len(),
                     "Attribute ends after end of line" );
         }
     }
@@ -394,7 +394,7 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos,
             if (rEntry.m_aPtPos.m_nNode.GetIndex() == aFltPos.m_nNode.GetIndex())
             {
                 if (bLastEntry && nAttrId == rEntry.pAttr->Which() &&
-                    rEntry.m_aPtPos.m_nCntnt == aFltPos.m_nCntnt)
+                    rEntry.m_aPtPos.m_nContent == aFltPos.m_nContent)
                 {
                     //potential candidate for merging with an identical
                     //property beginning at rPos
@@ -420,8 +420,8 @@ static void MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
     // attribute's format needs to be set.
     rRegion.DeleteMark();
     rRegion.GetPoint()->nNode = rEntry.m_aMkPos.m_nNode.GetIndex() + 1;
-    SwCntntNode* pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, true);
-    rRegion.GetPoint()->nContent.Assign(pCNd, rEntry.m_aMkPos.m_nCntnt);
+    SwContentNode* pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode, true);
+    rRegion.GetPoint()->nContent.Assign(pCNd, rEntry.m_aMkPos.m_nContent);
 }
 
 // MakeBookRegionOrPoint() behaves like MakeRegionOrPoint, except that
@@ -456,12 +456,12 @@ static bool IterateNumrulePiece( const SwNodeIndex& rEnd,
                                 SwNodeIndex& rTmpStart, SwNodeIndex& rTmpEnd )
 {
     while( ( rTmpStart <= rEnd )
-           && !( rTmpStart.GetNode().IsTxtNode() ) )    // look for valid start
+           && !( rTmpStart.GetNode().IsTextNode() ) )    // look for valid start
         ++rTmpStart;
 
     rTmpEnd = rTmpStart;
     while( ( rTmpEnd <= rEnd )
-           && ( rTmpEnd.GetNode().IsTxtNode() ) )       // look for valid end + 1
+           && ( rTmpEnd.GetNode().IsTextNode() ) )       // look for valid end + 1
         ++rTmpEnd;
 
     --rTmpEnd;                                      // valid end
@@ -500,19 +500,19 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
     {
     case RES_FLTR_ANCHOR:
         {
-            SwFrmFmt* pFmt = static_cast<SwFltAnchor*>(rEntry.pAttr)->GetFrmFmt();
-            if (pFmt != NULL)
+            SwFrameFormat* pFormat = static_cast<SwFltAnchor*>(rEntry.pAttr)->GetFrameFormat();
+            if (pFormat != NULL)
             {
                 MakePoint(rEntry, pDoc, aRegion);
-                SwFmtAnchor aAnchor(pFmt->GetAnchor());
+                SwFormatAnchor aAnchor(pFormat->GetAnchor());
                 aAnchor.SetAnchor(aRegion.GetPoint());
-                pFmt->SetFmtAttr(aAnchor);
+                pFormat->SetFormatAttr(aAnchor);
                 // So the frames will be created when inserting into
                 // existing doc (after setting the anchor!):
                 if(pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()
-                   && (FLY_AT_PARA == pFmt->GetAnchor().GetAnchorId()))
+                   && (FLY_AT_PARA == pFormat->GetAnchor().GetAnchorId()))
                 {
-                    pFmt->MakeFrms();
+                    pFormat->MakeFrms();
                 }
             }
         }
@@ -561,16 +561,16 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
 
             if (IsFlagSet(BOOK_TO_VAR_REF))
             {
-                SwFieldType* pFT = pDoc->getIDocumentFieldsAccess().GetFldType(RES_SETEXPFLD, rName, false);
+                SwFieldType* pFT = pDoc->getIDocumentFieldsAccess().GetFieldType(RES_SETEXPFLD, rName, false);
                 if (!pFT)
                 {
                     SwSetExpFieldType aS(pDoc, rName, nsSwGetSetExpType::GSE_STRING);
-                    pFT = pDoc->getIDocumentFieldsAccess().InsertFldType(aS);
+                    pFT = pDoc->getIDocumentFieldsAccess().InsertFieldType(aS);
                 }
-                SwSetExpField aFld(static_cast<SwSetExpFieldType*>(pFT), pB->GetValSys());
-                aFld.SetSubType( nsSwExtendedSubType::SUB_INVISIBLE );
+                SwSetExpField aField(static_cast<SwSetExpFieldType*>(pFT), pB->GetValSys());
+                aField.SetSubType( nsSwExtendedSubType::SUB_INVISIBLE );
                 MakePoint(rEntry, pDoc, aRegion);
-                pDoc->getIDocumentContentOperations().InsertPoolItem(aRegion, SwFmtFld(aFld));
+                pDoc->getIDocumentContentOperations().InsertPoolItem(aRegion, SwFormatField(aField));
                 MoveAttrs( *(aRegion.GetPoint()) );
             }
             if ( ( !IsFlagSet(HYPO) || IsFlagSet(BOOK_AND_REF) ) &&
@@ -604,10 +604,10 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
             // test if on this node there had been a pagebreak BEFORE the
             //     tox attribute was put on the stack
             SfxItemSet aBkSet( pDoc->GetAttrPool(), RES_PAGEDESC, RES_BREAK );
-            SwCntntNode* pNd = 0;
+            SwContentNode* pNd = 0;
             if( !pTOXAttr->HadBreakItem() || !pTOXAttr->HadPageDescItem() )
             {
-                pNd = pPoint->nNode.GetNode().GetCntntNode();
+                pNd = pPoint->nNode.GetNode().GetContentNode();
                 if( pNd )
                 {
                     const SfxItemSet* pSet = pNd->GetpSwAttrSet();
@@ -709,7 +709,7 @@ bool SwFltControlStack::CheckSdOD(sal_Int32 /*nStart*/, sal_Int32 /*nEnd*/)
     return false;
 }
 
-SfxPoolItem* SwFltControlStack::GetFmtStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos)
+SfxPoolItem* SwFltControlStack::GetFormatStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos)
 {
     size_t nSize = maEntries.size();
 
@@ -768,11 +768,11 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
 
         bool bEntryStartAfterSelStart =
             (rEntry.m_aMkPos.m_nNode == aStartNode &&
-             rEntry.m_aMkPos.m_nCntnt >= nStartIdx);
+             rEntry.m_aMkPos.m_nContent >= nStartIdx);
 
         bool bEntryStartBeforeSelEnd =
             (rEntry.m_aMkPos.m_nNode == aEndNode &&
-             rEntry.m_aMkPos.m_nCntnt <= nEndIdx);
+             rEntry.m_aMkPos.m_nContent <= nEndIdx);
 
         bool bEntryEndAfterSelStart = false;
         bool bEntryEndBeforeSelEnd = false;
@@ -780,11 +780,11 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
         {
             bEntryEndAfterSelStart =
                 (rEntry.m_aPtPos.m_nNode == aStartNode &&
-                 rEntry.m_aPtPos.m_nCntnt >= nStartIdx);
+                 rEntry.m_aPtPos.m_nContent >= nStartIdx);
 
             bEntryEndBeforeSelEnd =
                 (rEntry.m_aPtPos.m_nNode == aEndNode &&
-                 rEntry.m_aPtPos.m_nCntnt <= nEndIdx);
+                 rEntry.m_aPtPos.m_nContent <= nEndIdx);
         }
 
         bool bTotallyContained = false;
@@ -803,7 +803,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
             continue;
         }
 
-        const sal_Int32 nCntntDiff = nEndIdx - nStartIdx;
+        const sal_Int32 nContentDiff = nEndIdx - nStartIdx;
 
         // to be adjusted
         if (bEntryStartAfterSelStart)
@@ -814,7 +814,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
                 rEntry.m_aMkPos.SetPos(aStartNode, nStartIdx);
             }
             else
-                rEntry.m_aMkPos.m_nCntnt -= nCntntDiff;
+                rEntry.m_aMkPos.m_nContent -= nContentDiff;
         }
 
         if (bEntryEndAfterSelStart)
@@ -822,28 +822,28 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
             if (bEntryEndBeforeSelEnd)
                 rEntry.m_aPtPos.SetPos(aStartNode, nStartIdx);
             else
-                rEntry.m_aPtPos.m_nCntnt -= nCntntDiff;
+                rEntry.m_aPtPos.m_nContent -= nContentDiff;
         }
 
-        //That's what Open is, end equal to start, and nPtCntnt is invalid
+        //That's what Open is, end equal to start, and nPtContent is invalid
         if (rEntry.bOpen)
             rEntry.m_aPtPos = rEntry.m_aMkPos;
     }
 }
 
 // methods of SwFltAnchor follow
-SwFltAnchor::SwFltAnchor(SwFrmFmt* pFmt) :
-    SfxPoolItem(RES_FLTR_ANCHOR), pFrmFmt(pFmt)
+SwFltAnchor::SwFltAnchor(SwFrameFormat* pFormat) :
+    SfxPoolItem(RES_FLTR_ANCHOR), pFrameFormat(pFormat)
 {
     pClient = new SwFltAnchorClient(this);
-    pFrmFmt->Add(pClient);
+    pFrameFormat->Add(pClient);
 }
 
 SwFltAnchor::SwFltAnchor(const SwFltAnchor& rCpy) :
-    SfxPoolItem(RES_FLTR_ANCHOR), pFrmFmt(rCpy.pFrmFmt)
+    SfxPoolItem(RES_FLTR_ANCHOR), pFrameFormat(rCpy.pFrameFormat)
 {
     pClient = new SwFltAnchorClient(this);
-    pFrmFmt->Add(pClient);
+    pFrameFormat->Add(pClient);
 }
 
 SwFltAnchor::~SwFltAnchor()
@@ -851,16 +851,16 @@ SwFltAnchor::~SwFltAnchor()
     delete pClient;
 }
 
-void SwFltAnchor::SetFrmFmt(SwFrmFmt * _pFrmFmt)
+void SwFltAnchor::SetFrameFormat(SwFrameFormat * _pFrameFormat)
 {
-    pFrmFmt = _pFrmFmt;
+    pFrameFormat = _pFrameFormat;
 }
 
 
 
 bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const
 {
-    return pFrmFmt == static_cast<const SwFltAnchor&>(rItem).pFrmFmt;
+    return pFrameFormat == static_cast<const SwFltAnchor&>(rItem).pFrameFormat;
 }
 
 SfxPoolItem* SwFltAnchor::Clone(SfxItemPool*) const
@@ -877,14 +877,14 @@ void  SwFltAnchorClient::Modify(const SfxPoolItem *, const SfxPoolItem * pNew)
 {
     if (pNew->Which() == RES_FMT_CHG)
     {
-        const SwFmtChg * pFmtChg = dynamic_cast<const SwFmtChg *> (pNew);
+        const SwFormatChg * pFormatChg = dynamic_cast<const SwFormatChg *> (pNew);
 
-        if (pFmtChg != NULL)
+        if (pFormatChg != NULL)
         {
-            SwFrmFmt * pFrmFmt = dynamic_cast<SwFrmFmt *> (pFmtChg->pChangedFmt);
+            SwFrameFormat * pFrameFormat = dynamic_cast<SwFrameFormat *> (pFormatChg->pChangedFormat);
 
-            if (pFrmFmt != NULL)
-                m_pFltAnchor->SetFrmFmt(pFrmFmt);
+            if (pFrameFormat != NULL)
+                m_pFltAnchor->SetFrameFormat(pFrameFormat);
         }
     }
 }
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 0263e5a5cf6b..543dd4b8c592 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -60,7 +60,7 @@ const OUString SwIoSystem::GetSubStorageName( const SfxFilter& rFltr )
     return OUString();
 }
 
-const SfxFilter* SwIoSystem::GetFilterOfFormat(const OUString& rFmtNm,
+const SfxFilter* SwIoSystem::GetFilterOfFormat(const OUString& rFormatNm,
     const SfxFilterContainer* pCnt)
 {
     SfxFilterContainer aCntSw( OUString(sSWRITER) );
@@ -75,7 +75,7 @@ const SfxFilter* SwIoSystem::GetFilterOfFormat(const OUString& rFmtNm,
             const SfxFilter* pFilter = aIter.First();
             while ( pFilter )
             {
-                if( pFilter->GetUserData().equals(rFmtNm) )
+                if( pFilter->GetUserData().equals(rFormatNm) )
                     return pFilter;
                 pFilter = aIter.Next();
             }
@@ -92,10 +92,10 @@ bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::s
     bool bRet = false;
     try
     {
-        SotClipboardFormatId nStgFmtId = SotStorage::GetFormatID( rStg );
+        SotClipboardFormatId nStgFormatId = SotStorage::GetFormatID( rStg );
         bRet = rStg->isStreamElement( OUString("content.xml") );
         if ( bRet )
-            bRet = ( nStgFmtId != SotClipboardFormatId::NONE && ( rFilter.GetFormat() == nStgFmtId ) );
+            bRet = ( nStgFormatId != SotClipboardFormatId::NONE && ( rFilter.GetFormat() == nStgFormatId ) );
     }
     catch (const com::sun::star::uno::Exception& )
     {
@@ -106,13 +106,13 @@ bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::s
 
 bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter)
 {
-    SotClipboardFormatId nStgFmtId = rStg.GetFormat();
+    SotClipboardFormatId nStgFormatId = rStg.GetFormat();
     /*#i8409# We cannot trust the clipboard id anymore :-(*/
     if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() == sWW6)
-        nStgFmtId = SotClipboardFormatId::NONE;
+        nStgFormatId = SotClipboardFormatId::NONE;
 
     bool bRet = SVSTREAM_OK == rStg.GetError() &&
-        ( nStgFmtId == SotClipboardFormatId::NONE || rFilter.GetFormat() == nStgFmtId ) &&
+        ( nStgFormatId == SotClipboardFormatId::NONE || rFilter.GetFormat() == nStgFormatId ) &&
         ( rStg.IsContained( SwIoSystem::GetSubStorageName( rFilter )) );
     if( bRet )
     {
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index b9348732e380..d42b0642a52c 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -137,9 +137,9 @@ sal_uLong SwReader::Read( const Reader& rOptions )
     RedlineMode_t ePostReadRedlineMode( nsRedlineMode_t::REDLINE_IGNORE );
 
     // Array of FlyFormats
-    SwFrmFmts aFlyFrmArr;
+    SwFrameFormats aFlyFrmArr;
     // only read templates? then ignore multi selection!
-    bool bFmtsOnly = po->aOpt.IsFmtsOnly();
+    bool bFormatsOnly = po->aOpt.IsFormatsOnly();
 
     while( true )
     {
@@ -159,15 +159,15 @@ sal_uLong SwReader::Read( const Reader& rOptions )
         // store for now all Fly's
         if( pCrsr )
         {
-            std::copy(pDoc->GetSpzFrmFmts()->begin(),
-                pDoc->GetSpzFrmFmts()->end(), std::back_inserter(aFlyFrmArr));
+            std::copy(pDoc->GetSpzFrameFormats()->begin(),
+                pDoc->GetSpzFrameFormats()->end(), std::back_inserter(aFlyFrmArr));
         }
 
-        const sal_Int32 nSttCntnt = pPam->GetPoint()->nContent.GetIndex();
+        const sal_Int32 nSttContent = pPam->GetPoint()->nContent.GetIndex();
 
         // make sure the End position is correct for all Readers
-        SwCntntNode* pCNd = pPam->GetCntntNode();
-        sal_Int32 nEndCntnt = pCNd ? pCNd->Len() - nSttCntnt : 0;
+        SwContentNode* pCNd = pPam->GetContentNode();
+        sal_Int32 nEndContent = pCNd ? pCNd->Len() - nSttContent : 0;
         SwNodeIndex aEndPos( pPam->GetPoint()->nNode, 1 );
 
         pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
@@ -182,25 +182,25 @@ sal_uLong SwReader::Read( const Reader& rOptions )
         if( !IsError( nError ))     // set the End position already
         {
             --aEndPos;
-            pCNd = aEndPos.GetNode().GetCntntNode();
+            pCNd = aEndPos.GetNode().GetContentNode();
             if( !pCNd && 0 == ( pCNd = SwNodes::GoPrevious( &aEndPos ) ))
                 pCNd = pDoc->GetNodes().GoNext( &aEndPos );
 
             pPam->GetPoint()->nNode = aEndPos;
             const sal_Int32 nLen = pCNd->Len();
-            if( nLen < nEndCntnt )
-                nEndCntnt = 0;
+            if( nLen < nEndContent )
+                nEndContent = 0;
             else
-                nEndCntnt = nLen - nEndCntnt;
-            pPam->GetPoint()->nContent.Assign( pCNd, nEndCntnt );
+                nEndContent = nLen - nEndContent;
+            pPam->GetPoint()->nContent.Assign( pCNd, nEndContent );
 
-            const SwStartNode* pTblBoxStart = pCNd->FindTableBoxStartNode();
-            if ( pTblBoxStart )
+            const SwStartNode* pTableBoxStart = pCNd->FindTableBoxStartNode();
+            if ( pTableBoxStart )
             {
-                SwTableBox* pBox = pTblBoxStart->GetTblBox();
+                SwTableBox* pBox = pTableBoxStart->GetTableBox();
                 if ( pBox )
                 {
-                    pDoc->ChkBoxNumFmt( *pBox, true );
+                    pDoc->ChkBoxNumFormat( *pBox, true );
                 }
             }
         }
@@ -210,9 +210,9 @@ sal_uLong SwReader::Read( const Reader& rOptions )
             *pUndoPam->GetMark() = *pPam->GetPoint();
             ++pUndoPam->GetPoint()->nNode;
             SwNode& rNd = pUndoPam->GetNode();
-            if( rNd.IsCntntNode() )
+            if( rNd.IsContentNode() )
                 pUndoPam->GetPoint()->nContent.Assign(
-                                    static_cast<SwCntntNode*>(&rNd), nSttCntnt );
+                                    static_cast<SwContentNode*>(&rNd), nSttContent );
             else
                 pUndoPam->GetPoint()->nContent.Assign( 0, 0 );
 
@@ -220,14 +220,14 @@ sal_uLong SwReader::Read( const Reader& rOptions )
                                    rNd.FindFooterStartNode();
 
             // search all new Fly's, and store them as individual Undo Objects
-            for( SwFrmFmts::size_type n = 0; n < pDoc->GetSpzFrmFmts()->size(); ++n )
+            for( SwFrameFormats::size_type n = 0; n < pDoc->GetSpzFrameFormats()->size(); ++n )
             {
-                SwFrmFmt* pFrmFmt = (*pDoc->GetSpzFrmFmts())[ n ];
-                const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-                if( !aFlyFrmArr.Contains( pFrmFmt) )
+                SwFrameFormat* pFrameFormat = (*pDoc->GetSpzFrameFormats())[ n ];
+                const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+                if( !aFlyFrmArr.Contains( pFrameFormat) )
                 {
                     SwPosition const*const pFrameAnchor(
-                            rAnchor.GetCntntAnchor());
+                            rAnchor.GetContentAnchor());
                     if  (   (FLY_AT_PAGE == rAnchor.GetAnchorId())
                         ||  (   pFrameAnchor
                             &&  (   (   (FLY_AT_PARA == rAnchor.GetAnchorId())
@@ -251,11 +251,11 @@ sal_uLong SwReader::Read( const Reader& rOptions )
                     {
                         if( bChkHeaderFooter &&
                             (FLY_AT_PARA == rAnchor.GetAnchorId()) &&
-                            RES_DRAWFRMFMT == pFrmFmt->Which() )
+                            RES_DRAWFRMFMT == pFrameFormat->Which() )
                         {
                             // DrawObjects are not allowed in Headers/Footers!
-                            pFrmFmt->DelFrms();
-                            pDoc->DelFrmFmt( pFrmFmt );
+                            pFrameFormat->DelFrms();
+                            pDoc->DelFrameFormat( pFrameFormat );
                             --n;
                         }
                         else
@@ -266,21 +266,21 @@ sal_uLong SwReader::Read( const Reader& rOptions )
                                 // UGLY: temp. enable undo
                                 pDoc->GetIDocumentUndoRedo().DoUndo(true);
                                 pDoc->GetIDocumentUndoRedo().AppendUndo(
-                                    new SwUndoInsLayFmt( pFrmFmt,0,0 ) );
+                                    new SwUndoInsLayFormat( pFrameFormat,0,0 ) );
                                 pDoc->GetIDocumentUndoRedo().DoUndo(false);
                                 pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE );
                             }
-                            if( pFrmFmt->HasWriterListeners() )
+                            if( pFrameFormat->HasWriterListeners() )
                             {
                                 // Draw-Objects create a Frame when being inserted; thus delete them
-                                pFrmFmt->DelFrms();
+                                pFrameFormat->DelFrms();
                             }
 
                             if (FLY_AT_PAGE == rAnchor.GetAnchorId())
                             {
-                                if( !rAnchor.GetCntntAnchor() )
+                                if( !rAnchor.GetContentAnchor() )
                                 {
-                                    pFrmFmt->MakeFrms();
+                                    pFrameFormat->MakeFrms();
                                 }
                                 else if( pCrsr )
                                 {
@@ -288,7 +288,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
                                 }
                             }
                             else
-                                pFrmFmt->MakeFrms();
+                                pFrameFormat->MakeFrms();
                         }
                     }
                 }
@@ -321,7 +321,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
             break;
 
         // only read templates? then ignore multi selection! Bug 68593
-        if( bFmtsOnly )
+        if( bFormatsOnly )
             break;
 
         /*
@@ -507,7 +507,7 @@ SwDoc* Reader::GetTemplateDoc()
                         // always FALSE
                         pTemplate->GetIDocumentUndoRedo().DoUndo( false );
                         pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::BROWSE_MODE, bTmplBrowseMode );
-                        pTemplate->RemoveAllFmtLanguageDependencies();
+                        pTemplate->RemoveAllFormatLanguageDependencies();
 
                         ReadXML->SetOrganizerMode( true );
                         SfxMedium aMedium( aFileName, StreamMode::NONE );
@@ -534,7 +534,7 @@ bool Reader::SetTemplate( SwDoc& rDoc )
     GetTemplateDoc();
     if( pTemplate )
     {
-        rDoc.RemoveAllFmtLanguageDependencies();
+        rDoc.RemoveAllFormatLanguageDependencies();
         rDoc.ReplaceStyles( *pTemplate );
         rDoc.getIDocumentFieldsAccess().SetFixFields(false, NULL);
         bRet = true;
@@ -569,7 +569,7 @@ void Reader::MakeHTMLDummyTemplateDoc()
     pTemplate->acquire();
     pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::BROWSE_MODE, bTmplBrowseMode );
     pTemplate->getIDocumentDeviceAccess().getPrinter( true );
-    pTemplate->RemoveAllFmtLanguageDependencies();
+    pTemplate->RemoveAllFormatLanguageDependencies();
     aChkDateTime = Date( 1, 1, 2300 );  // year 2300 should be sufficient
     aTemplateNm = "$$Dummy$$";
 }
@@ -616,25 +616,25 @@ void Reader::SetFltName( const OUString& )
 {
 }
 
-void Reader::ResetFrmFmtAttrs( SfxItemSet &rFrmSet )
+void Reader::ResetFrameFormatAttrs( SfxItemSet &rFrmSet )
 {
     rFrmSet.Put( SvxLRSpaceItem(RES_LR_SPACE) );
     rFrmSet.Put( SvxULSpaceItem(RES_UL_SPACE) );
     rFrmSet.Put( SvxBoxItem(RES_BOX) );
 }
 
-void Reader::ResetFrmFmts( SwDoc& rDoc )
+void Reader::ResetFrameFormats( SwDoc& rDoc )
 {
     sal_uInt16 const s_ids[3] = {
         RES_POOLFRM_FRAME, RES_POOLFRM_GRAPHIC, RES_POOLFRM_OLE
     };
     for (size_t i = 0; i < SAL_N_ELEMENTS(s_ids); ++i)
     {
-        SwFrmFmt *const pFrmFmt = rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( s_ids[i] );
+        SwFrameFormat *const pFrameFormat = rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( s_ids[i] );
 
-        pFrmFmt->ResetFmtAttr( RES_LR_SPACE );
-        pFrmFmt->ResetFmtAttr( RES_UL_SPACE );
-        pFrmFmt->ResetFmtAttr( RES_BOX );
+        pFrameFormat->ResetFormatAttr( RES_LR_SPACE );
+        pFrameFormat->ResetFormatAttr( RES_UL_SPACE );
+        pFrameFormat->ResetFormatAttr( RES_BOX );
     }
 }
 
@@ -756,13 +756,13 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
 
         // search the layout for cells
         SwSelBoxes aBoxes;
-        GetTblSel( *pShell, aBoxes );
-        const SwTableNode* pTblNd = static_cast<const SwTableNode*>(aBoxes[0]->GetSttNd()->StartOfSectionNode());
+        GetTableSel( *pShell, aBoxes );
+        const SwTableNode* pTableNd = static_cast<const SwTableNode*>(aBoxes[0]->GetSttNd()->StartOfSectionNode());
         SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 2 );
-        SwCntntNode *pNd = aIdx.GetNode().GetCntntNode();
+        SwContentNode *pNd = aIdx.GetNode().GetContentNode();
         OSL_ENSURE( pNd, "Node not found" );
         SwPosition aPos( aIdx, SwIndex( pNd ) );
-        pTblNd->GetTable().MakeCopy( pDoc, aPos, aBoxes );
+        pTableNd->GetTable().MakeCopy( pDoc, aPos, aBoxes );
     }
 
     if( !bWriteAll && ( pShell || pOutPam ))
@@ -832,17 +832,17 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
     {
         const SwPageDesc& rPgDsc = pOutDoc->GetPageDesc( 0 );
         //const SwPageDesc& rPgDsc = *pOutDoc->GetPageDescFromPool( RES_POOLPAGE_STANDARD );
-        const SwFmtFrmSize& rSz = rPgDsc.GetMaster().GetFrmSize();
+        const SwFormatFrmSize& rSz = rPgDsc.GetMaster().GetFrmSize();
         // Clipboard-Document is always created w/o printer; thus the
         // default PageDesc is always aug LONG_MAX !! Set then to DIN A4
         if( LONG_MAX == rSz.GetHeight() || LONG_MAX == rSz.GetWidth() )
         {
             SwPageDesc aNew( rPgDsc );
-            SwFmtFrmSize aNewSz( rSz );
+            SwFormatFrmSize aNewSz( rSz );
             Size a4(SvxPaperInfo::GetPaperSize( PAPER_A4 ));
             aNewSz.SetHeight( a4.Width() );
             aNewSz.SetWidth( a4.Height() );
-            aNew.GetMaster().SetFmtAttr( aNewSz );
+            aNew.GetMaster().SetFormatAttr( aNewSz );
             pOutDoc->ChgPageDesc( 0, aNew );
         }
     }
@@ -923,12 +923,12 @@ bool SetHTMLTemplate( SwDoc & rDoc )
 
     SwNodes& rNds = rDoc.GetNodes();
     SwNodeIndex aIdx( rNds.GetEndOfExtras(), 1 );
-    SwCntntNode* pCNd = rNds.GoNext( &aIdx );
+    SwContentNode* pCNd = rNds.GoNext( &aIdx );
     if( pCNd )
     {
         pCNd->SetAttr
-            ( SwFmtPageDesc(rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_HTML, false) ) );
-        pCNd->ChgFmtColl( rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT, false ));
+            ( SwFormatPageDesc(rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_HTML, false) ) );
+        pCNd->ChgFormatColl( rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT, false ));
     }
 
     return bRet;
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index fadc0722abf0..9f7bc09825e7 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -116,18 +116,18 @@ using editeng::SvxBorderLine;
 
 extern SwAttrFnTab aCSS1AttrFnTab;
 
-static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
+static Writer& OutCSS1_SwFormat( Writer& rWrt, const SwFormat& rFormat,
                               IDocumentStylePoolAccess /*SwDoc*/ *pDoc, SwDoc *pTemplate );
-static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rFmt,
+static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rFormat,
                                    IDocumentStylePoolAccess /*SwDoc*/ *pDoc, SwDoc *pTemplate,
                                    sal_uInt16 nRefPoolId, bool bExtRef,
                                    bool bPseudo=true );
-static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
+static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
                                   SwDoc *pDoc, sal_uInt16 nNotes, bool bEndNote );
-static void OutCSS1_SwFmtDropAttrs( SwHTMLWriter& rHWrt,
-                                    const SwFmtDrop& rDrop,
-                                     const SfxItemSet *pCharFmtItemSet=0 );
-static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
+static void OutCSS1_SwFormatDropAttrs( SwHTMLWriter& rHWrt,
+                                    const SwFormatDrop& rDrop,
+                                     const SfxItemSet *pCharFormatItemSet=0 );
+static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt,
                     const SvxUnderlineItem *pUItem,
                     const SvxOverlineItem *pOItem,
                     const SvxCrossedOutItem *pCOItem,
@@ -145,12 +145,12 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
 static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
                                  sal_uInt16 nMode );
 static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt );
-static Writer& OutCSS1_SwFmtFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
+static Writer& OutCSS1_SwFormatFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
                                      sal_uInt16 nMode );
-static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
+static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt,
                                         const SfxItemSet& rItemSet,
                                         bool bDeep );
-static Writer& OutCSS1_SwFmtLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt );
+static Writer& OutCSS1_SwFormatLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt );
 
 namespace
 {
@@ -503,12 +503,12 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet,
             pBlinkItem = static_cast<const SvxBlinkItem *>(pItem);
 
         if( pUnderlineItem || pOverlineItem || pCrossedOutItem || pBlinkItem )
-            OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( *this, pUnderlineItem,
+            OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( *this, pUnderlineItem,
                                                  pOverlineItem,
                                                  pCrossedOutItem,
                                                  pBlinkItem );
 
-        OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( *this, rItemSet, bDeep );
+        OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( *this, rItemSet, bDeep );
     }
 
     if( !bFirstCSS1Property )
@@ -553,9 +553,9 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
         // If other templates are used, only very simple cases are exported.
         const SwPageDesc *pPageDesc = &rPageDesc;
         const SwPageDesc *pFollow = rPageDesc.GetFollow();
-        if( RES_POOLPAGE_FIRST == pPageDesc->GetPoolFmtId() &&
+        if( RES_POOLPAGE_FIRST == pPageDesc->GetPoolFormatId() &&
             pFollow != pPageDesc &&
-            !IsPoolUserFmt( pFollow->GetPoolFmtId() ) )
+            !IsPoolUserFormat( pFollow->GetPoolFormatId() ) )
         {
             // the document has a first page
             pFirstPageDesc = pPageDesc;
@@ -570,12 +570,12 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
             // The attribute is exported relative to the HTML page template.
           OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, pTemplate,
                                 RES_POOLPAGE_HTML, true, false );
-            nFirstRefPoolId = pFollow->GetPoolFmtId();
+            nFirstRefPoolId = pFollow->GetPoolFormatId();
         }
-        else if( (RES_POOLPAGE_LEFT == pPageDesc->GetPoolFmtId() &&
-                  RES_POOLPAGE_RIGHT == pFollow->GetPoolFmtId()) ||
-                 (RES_POOLPAGE_RIGHT == pPageDesc->GetPoolFmtId() &&
-                  RES_POOLPAGE_LEFT == pFollow->GetPoolFmtId()) )
+        else if( (RES_POOLPAGE_LEFT == pPageDesc->GetPoolFormatId() &&
+                  RES_POOLPAGE_RIGHT == pFollow->GetPoolFormatId()) ||
+                 (RES_POOLPAGE_RIGHT == pPageDesc->GetPoolFormatId() &&
+                  RES_POOLPAGE_LEFT == pFollow->GetPoolFormatId()) )
         {
             // the document is double-sided
           OutCSS1_SwPageDesc( *this, *pPageDesc, pStylePoolAccess, pTemplate,
@@ -596,46 +596,46 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
     // The text body style has to be exported always (if it is changed compared
     // to the template), because it is used as reference for any style
     // that maps to <P>, and that's especially the standard style
-    getIDocumentStylePoolAccess()->GetTxtCollFromPool( RES_POOLCOLL_TEXT, false );
+    getIDocumentStylePoolAccess()->GetTextCollFromPool( RES_POOLCOLL_TEXT, false );
 
     // the Default-TextStyle is not also exported !!
     // 0-Style is the Default; is never exported !!
-    sal_uInt16 nArrLen = pDoc->GetTxtFmtColls()->size();
+    sal_uInt16 nArrLen = pDoc->GetTextFormatColls()->size();
     sal_uInt16 i;
 
     for( i = 1; i < nArrLen; i++ )
     {
-        const SwTxtFmtColl* pColl = (*pDoc->GetTxtFmtColls())[i];
-        sal_uInt16 nPoolId = pColl->GetPoolFmtId();
+        const SwTextFormatColl* pColl = (*pDoc->GetTextFormatColls())[i];
+        sal_uInt16 nPoolId = pColl->GetPoolFormatId();
         if( !bUsed || nPoolId == RES_POOLCOLL_TEXT ||
             pDoc->IsUsed( *pColl ) )
-            OutCSS1_SwFmt( *this, *pColl, &pDoc->getIDocumentStylePoolAccess(), pTemplate );
+            OutCSS1_SwFormat( *this, *pColl, &pDoc->getIDocumentStylePoolAccess(), pTemplate );
     }
 
     // the Default-TextStyle is not also exported !!
-    nArrLen = pDoc->GetCharFmts()->size();
+    nArrLen = pDoc->GetCharFormats()->size();
     for( i=1; i<nArrLen; i++ )
     {
-        const SwCharFmt *pCFmt = (*pDoc->GetCharFmts())[i];
-        sal_uInt16 nPoolId = pCFmt->GetPoolFmtId();
+        const SwCharFormat *pCFormat = (*pDoc->GetCharFormats())[i];
+        sal_uInt16 nPoolId = pCFormat->GetPoolFormatId();
         if( !bUsed || nPoolId == RES_POOLCHR_INET_NORMAL ||
             nPoolId == RES_POOLCHR_INET_VISIT ||
-            pDoc->IsUsed( *pCFmt ) )
-            OutCSS1_SwFmt( *this, *pCFmt, &pDoc->getIDocumentStylePoolAccess(), pTemplate );
+            pDoc->IsUsed( *pCFormat ) )
+            OutCSS1_SwFormat( *this, *pCFormat, &pDoc->getIDocumentStylePoolAccess(), pTemplate );
     }
 
-    const SwFtnIdxs& rIdxs = pDoc->GetFtnIdxs();
+    const SwFootnoteIdxs& rIdxs = pDoc->GetFootnoteIdxs();
     nArrLen = rIdxs.size();
-    sal_uInt16 nEnd = 0, nFtn = 0;
+    sal_uInt16 nEnd = 0, nFootnote = 0;
     for( i=0; i < nArrLen; i++ )
     {
-        if( rIdxs[i]->GetFtn().IsEndNote() )
+        if( rIdxs[i]->GetFootnote().IsEndNote() )
             nEnd++;
         else
-            nFtn++;
+            nFootnote++;
     }
-    OutCSS1_SwFtnInfo( *this, pDoc->GetFtnInfo(), pDoc, nFtn, false );
-    OutCSS1_SwFtnInfo( *this, pDoc->GetEndNoteInfo(), pDoc, nEnd, true );
+    OutCSS1_SwFootnoteInfo( *this, pDoc->GetFootnoteInfo(), pDoc, nFootnote, false );
+    OutCSS1_SwFootnoteInfo( *this, pDoc->GetEndNoteInfo(), pDoc, nEnd, true );
 
     if( !bFirstCSS1Rule )
     {
@@ -655,7 +655,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
 
 // if pPseudo is set, Styles-Sheets will be exported;
 // otherwise we only search for Token and Class for a Format
-sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
+sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFormat *pFormat, OString& rToken,
                                       OUString& rClass, sal_uInt16& rRefPoolId,
                                       OUString *pPseudo )
 {
@@ -666,40 +666,40 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
     if( pPseudo )
         pPseudo->clear();
 
-    bool bChrFmt = RES_CHRFMT==pFmt->Which();
+    bool bChrFormat = RES_CHRFMT==pFormat->Which();
 
     // search formats above for the nearest standard or HTML-Tag template
-    const SwFmt *pPFmt = pFmt;
-    while( pPFmt && !pPFmt->IsDefault() )
+    const SwFormat *pPFormat = pFormat;
+    while( pPFormat && !pPFormat->IsDefault() )
     {
         bool bStop = false;
-        sal_uInt16 nPoolId = pPFmt->GetPoolFmtId();
+        sal_uInt16 nPoolId = pPFormat->GetPoolFormatId();
         if( USER_FMT & nPoolId )
         {
             // user templates
-            const OUString aNm(pPFmt->GetName());
+            const OUString aNm(pPFormat->GetName());
 
-            if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_blockquote)
+            if (!bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_blockquote)
             {
                 rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_blockquote);
             }
-            else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_citiation)
+            else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_citiation)
             {
                 rRefPoolId = RES_POOLCHR_HTML_CITIATION;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_citiation);
             }
-            else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_code)
+            else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_code)
             {
                 rRefPoolId = RES_POOLCHR_HTML_CODE;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_code);
             }
-            else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_definstance)
+            else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_definstance)
             {
                 rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_definstance);
             }
-            else if (!bChrFmt && (aNm == OOO_STRING_SVTOOLS_HTML_dd ||
+            else if (!bChrFormat && (aNm == OOO_STRING_SVTOOLS_HTML_dd ||
                                   aNm == OOO_STRING_SVTOOLS_HTML_dt))
             {
                 sal_uInt16 nDefListLvl = GetDefListLvl(aNm, nPoolId);
@@ -724,54 +724,54 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
                     }
                 }
             }
-            else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_emphasis)
+            else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_emphasis)
             {
                 rRefPoolId = RES_POOLCHR_HTML_EMPHASIS;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_emphasis);
             }
-            else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_horzrule)
+            else if (!bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_horzrule)
             {
                 // do not export HR !
                 bStop = (nDeep==0);
             }
-            else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_keyboard)
+            else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_keyboard)
             {
                 rRefPoolId = RES_POOLCHR_HTML_KEYBOARD;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_keyboard);
             }
-            else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_listing)
+            else if (!bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_listing)
             {
                 // Export Listings as PRE or PRE-derived template
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
                 rRefPoolId = RES_POOLCOLL_HTML_PRE;
                 nDeep = CSS1_FMT_CMPREF;
             }
-            else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_preformtxt)
+            else if (!bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_preformtxt)
             {
                 rRefPoolId = RES_POOLCOLL_HTML_PRE;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
             }
-            else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_sample)
+            else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_sample)
             {
                 rRefPoolId = RES_POOLCHR_HTML_SAMPLE;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_sample);
             }
-            else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_strong)
+            else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_strong)
             {
                 rRefPoolId = RES_POOLCHR_HTML_STRONG;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_strong);
             }
-            else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_teletype)
+            else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_teletype)
             {
                 rRefPoolId = RES_POOLCHR_HTML_TELETYPE;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_teletype);
             }
-            else if (bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_variable)
+            else if (bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_variable)
             {
                 rRefPoolId = RES_POOLCHR_HTML_VARIABLE;
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_variable);
             }
-            else if (!bChrFmt && aNm == OOO_STRING_SVTOOLS_HTML_xmp)
+            else if (!bChrFormat && aNm == OOO_STRING_SVTOOLS_HTML_xmp)
             {
                 // export XMP as PRE (but not the template as Style)
                 rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
@@ -932,7 +932,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
         {
             // continue otherwise
             nDeep++;
-            pPFmt = pPFmt->DerivedFrom();
+            pPFormat = pPFormat->DerivedFrom();
         }
     }
 
@@ -953,7 +953,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
         // we export it as <TOKEN>.<CLASS>, otherwise as .<CLASS>.
         // <CLASS> is the name of the template after removing all characters
         // before and including the first '.'
-        rClass = pFmt->GetName();
+        rClass = pFormat->GetName();
         sal_Int32 nPos = rClass.indexOf( '.' );
         if( nPos >= 0 && rClass.getLength() > nPos+1 )
         {
@@ -969,14 +969,14 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
     return nDeep;
 }
 
-static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, OUString& rSelector,
+static sal_uInt16 GetCSS1Selector( const SwFormat *pFormat, OUString& rSelector,
                                sal_uInt16& rRefPoolId )
 {
     OString aToken;
     OUString aClass;
     OUString aPseudo;
 
-    sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFmt, aToken, aClass,
+    sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFormat, aToken, aClass,
                                                   rRefPoolId, &aPseudo );
     if( nDeep )
     {
@@ -994,41 +994,41 @@ static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, OUString& rSelector,
     return nDeep;
 }
 
-const SwFmt *SwHTMLWriter::GetTemplateFmt( sal_uInt16 nPoolFmtId,
+const SwFormat *SwHTMLWriter::GetTemplateFormat( sal_uInt16 nPoolFormatId,
                                            IDocumentStylePoolAccess* pTemplate /*SwDoc *pTemplate*/)
 {
-    const SwFmt *pRefFmt = 0;
+    const SwFormat *pRefFormat = 0;
 
     if( pTemplate )
     {
-        OSL_ENSURE( !(USER_FMT & nPoolFmtId),
+        OSL_ENSURE( !(USER_FMT & nPoolFormatId),
                 "No user templates found" );
-        if( POOLGRP_NOCOLLID & nPoolFmtId )
-            pRefFmt = pTemplate->GetCharFmtFromPool( nPoolFmtId );
+        if( POOLGRP_NOCOLLID & nPoolFormatId )
+            pRefFormat = pTemplate->GetCharFormatFromPool( nPoolFormatId );
         else
-            pRefFmt = pTemplate->GetTxtCollFromPool( nPoolFmtId, false );
+            pRefFormat = pTemplate->GetTextCollFromPool( nPoolFormatId, false );
     }
 
-    return pRefFmt;
+    return pRefFormat;
 }
 
-const SwFmt *SwHTMLWriter::GetParentFmt( const SwFmt& rFmt, sal_uInt16 nDeep )
+const SwFormat *SwHTMLWriter::GetParentFormat( const SwFormat& rFormat, sal_uInt16 nDeep )
 {
     OSL_ENSURE( nDeep != USHRT_MAX, "Called GetParent for HTML-template!" );
-    const SwFmt *pRefFmt = 0;
+    const SwFormat *pRefFormat = 0;
 
     if( nDeep > 0 )
     {
         // get the pointer for the HTML-Tag template, from which the template is derived
-        pRefFmt = &rFmt;
+        pRefFormat = &rFormat;
         for( sal_uInt16 i=nDeep; i>0; i-- )
-            pRefFmt = pRefFmt->DerivedFrom();
+            pRefFormat = pRefFormat->DerivedFrom();
 
-        if( pRefFmt && pRefFmt->IsDefault() )
-            pRefFmt = 0;
+        if( pRefFormat && pRefFormat->IsDefault() )
+            pRefFormat = 0;
     }
 
-    return pRefFmt;
+    return pRefFormat;
 }
 
 bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 )
@@ -1268,13 +1268,13 @@ bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
         SfxItemState::SET == rItemSet.GetItemState( RES_PARATR_DROP, true,
                 &pItem ) )
     {
-        const SwFmtDrop *pDrop = static_cast<const SwFmtDrop *>(pItem);
-        const SwCharFmt *pDCCharFmt = pDrop->GetCharFmt();
-        if( pDCCharFmt )
+        const SwFormatDrop *pDrop = static_cast<const SwFormatDrop *>(pItem);
+        const SwCharFormat *pDCCharFormat = pDrop->GetCharFormat();
+        if( pDCCharFormat )
         {
             //sequence of (start, end) property ranges we want to
             //query
-            SfxItemSet aTstItemSet( *pDCCharFmt->GetAttrSet().GetPool(),
+            SfxItemSet aTstItemSet( *pDCCharFormat->GetAttrSet().GetPool(),
                 RES_CHRATR_FONT,        RES_CHRATR_FONT,
                 RES_CHRATR_POSTURE,     RES_CHRATR_POSTURE,
                 RES_CHRATR_WEIGHT,      RES_CHRATR_WEIGHT,
@@ -1283,7 +1283,7 @@ bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
                 RES_CHRATR_CTL_FONT,    RES_CHRATR_CTL_FONT,
                 RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT,
                 0 );
-            aTstItemSet.Set( pDCCharFmt->GetAttrSet(), true );
+            aTstItemSet.Set( pDCCharFormat->GetAttrSet(), true );
             return HasScriptDependentItems( aTstItemSet, false );
         }
     }
@@ -1400,12 +1400,12 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
 
 static void OutCSS1DropCapRule(
                     SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
-                    const SwFmtDrop& rDrop, bool bHasClass,
+                    const SwFormatDrop& rDrop, bool bHasClass,
                      bool bHasScriptDependencies  )
 {
-    const SwCharFmt *pDCCharFmt = rDrop.GetCharFmt();
+    const SwCharFormat *pDCCharFormat = rDrop.GetCharFormat();
     if( (bHasScriptDependencies && bHasClass) ||
-         (pDCCharFmt && SwHTMLWriter::HasScriptDependentItems( pDCCharFmt->GetAttrSet(), false ) ) )
+         (pDCCharFormat && SwHTMLWriter::HasScriptDependentItems( pDCCharFormat->GetAttrSet(), false ) ) )
     {
         OUString aSelector( rSelector );
 
@@ -1425,7 +1425,7 @@ static void OutCSS1DropCapRule(
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_NO_SCRIPT|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
                                      true, &rSelector );
-                OutCSS1_SwFmtDropAttrs( rHTMLWrt, rDrop );
+                OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop );
             }
 
             SfxItemSet aScriptItemSet( rHTMLWrt.pDoc->GetAttrPool(),
@@ -1434,29 +1434,29 @@ static void OutCSS1DropCapRule(
                                        RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
                                        RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT,
                                        0 );
-            if( pDCCharFmt )
-                aScriptItemSet.Set( pDCCharFmt->GetAttrSet(), true );
+            if( pDCCharFormat )
+                aScriptItemSet.Set( pDCCharFormat->GetAttrSet(), true );
 
             OUString aNewSelector( aSelector );
             aNewSelector += ".western" + aPseudo;
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_WESTERN|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
                                      true, &aNewSelector );
-                OutCSS1_SwFmtDropAttrs(  rHTMLWrt, rDrop, &aScriptItemSet );
+                OutCSS1_SwFormatDropAttrs(  rHTMLWrt, rDrop, &aScriptItemSet );
             }
 
             aNewSelector = aSelector + ".cjk" + aPseudo;
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CJK|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
                                      true, &aNewSelector );
-                OutCSS1_SwFmtDropAttrs(  rHTMLWrt, rDrop, &aScriptItemSet );
+                OutCSS1_SwFormatDropAttrs(  rHTMLWrt, rDrop, &aScriptItemSet );
             }
 
             aNewSelector = aSelector + ".ctl" + aPseudo;
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CTL|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
                                      true, &aNewSelector );
-                OutCSS1_SwFmtDropAttrs(  rHTMLWrt, rDrop, &aScriptItemSet );
+                OutCSS1_SwFormatDropAttrs(  rHTMLWrt, rDrop, &aScriptItemSet );
             }
         }
         else
@@ -1469,21 +1469,21 @@ static void OutCSS1DropCapRule(
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_WESTERN|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
                                      true, &aNewSelector );
-                OutCSS1_SwFmtDropAttrs(  rHTMLWrt, rDrop );
+                OutCSS1_SwFormatDropAttrs(  rHTMLWrt, rDrop );
             }
 
             aNewSelector = aSelector + "-cjk" + aPseudo;
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CJK|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
                                      true, &aNewSelector );
-                OutCSS1_SwFmtDropAttrs(  rHTMLWrt, rDrop );
+                OutCSS1_SwFormatDropAttrs(  rHTMLWrt, rDrop );
             }
 
             aNewSelector = aSelector + "-ctl" + aPseudo;
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CTL|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
                                      true, &aNewSelector );
-                OutCSS1_SwFmtDropAttrs(  rHTMLWrt, rDrop );
+                OutCSS1_SwFormatDropAttrs(  rHTMLWrt, rDrop );
             }
         }
     }
@@ -1496,20 +1496,20 @@ static void OutCSS1DropCapRule(
         SwCSS1OutMode aMode( rHTMLWrt,
                 rHTMLWrt.nCSS1Script|CSS1_OUTMODE_RULE|CSS1_OUTMODE_DROPCAP,
                              true, &rSelector );
-                OutCSS1_SwFmtDropAttrs( rHTMLWrt, rDrop );
+                OutCSS1_SwFormatDropAttrs( rHTMLWrt, rDrop );
     }
 }
 
-static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
+static Writer& OutCSS1_SwFormat( Writer& rWrt, const SwFormat& rFormat,
                               IDocumentStylePoolAccess/*SwDoc*/ *pDoc, SwDoc *pTemplate )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    bool bCharFmt = false;
-    switch( rFmt.Which() )
+    bool bCharFormat = false;
+    switch( rFormat.Which() )
     {
     case RES_CHRFMT:
-        bCharFmt = true;
+        bCharFormat = true;
         break;
 
     case RES_TXTFMTCOLL:
@@ -1525,11 +1525,11 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     // determine Selector and the to-be-exported Attr-Set-depth
     OUString aSelector;
     sal_uInt16 nRefPoolId = 0;
-    sal_uInt16 nDeep = GetCSS1Selector( &rFmt, aSelector, nRefPoolId );
+    sal_uInt16 nDeep = GetCSS1Selector( &rFormat, aSelector, nRefPoolId );
     if( !nDeep )
         return rWrt;    // not derived from a HTML-template
 
-    sal_uInt16 nPoolFmtId = rFmt.GetPoolFmtId();
+    sal_uInt16 nPoolFormatId = rFormat.GetPoolFormatId();
 
     // Determine the to-be-exported Attr-Set. We have to distinguish 3 cases:
     // - HTML-Tag templates (nDeep==USHRT_MAX):
@@ -1545,58 +1545,58 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
     // create Item-Set with all Attributes from the template
     // (all but for nDeep==1)
-    const SfxItemSet& rFmtItemSet = rFmt.GetAttrSet();
-    SfxItemSet aItemSet( *rFmtItemSet.GetPool(), rFmtItemSet.GetRanges() );
-    aItemSet.Set( rFmtItemSet, true ); // Was nDeep!=1 that is not working
+    const SfxItemSet& rFormatItemSet = rFormat.GetAttrSet();
+    SfxItemSet aItemSet( *rFormatItemSet.GetPool(), rFormatItemSet.GetRanges() );
+    aItemSet.Set( rFormatItemSet, true ); // Was nDeep!=1 that is not working
                                        // for script dependent items buts should
                                        // not make a difference for any other
 
     bool bSetDefaults = true, bClearSame = true;
-    const SwFmt *pRefFmt = 0;
-    const SwFmt *pRefFmtScript = 0;
+    const SwFormat *pRefFormat = 0;
+    const SwFormat *pRefFormatScript = 0;
     switch( nDeep )
     {
     case CSS1_FMT_ISTAG:
-        pRefFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
+        pRefFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
         break;
     case CSS1_FMT_CMPREF:
-        pRefFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId, pDoc );
-        pRefFmtScript = SwHTMLWriter::GetTemplateFmt( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
+        pRefFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId, pDoc );
+        pRefFormatScript = SwHTMLWriter::GetTemplateFormat( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
         bClearSame = false;
         break;
     default:
-        pRefFmt = SwHTMLWriter::GetParentFmt( rFmt, nDeep );
-        pRefFmtScript = SwHTMLWriter::GetTemplateFmt( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
+        pRefFormat = SwHTMLWriter::GetParentFormat( rFormat, nDeep );
+        pRefFormatScript = SwHTMLWriter::GetTemplateFormat( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
         bSetDefaults = false;
         break;
     }
 
-    if( pRefFmt )
+    if( pRefFormat )
     {
         // subtract Item-Set of the Reference template (incl. its Parents)
-        SwHTMLWriter::SubtractItemSet( aItemSet, pRefFmt->GetAttrSet(),
+        SwHTMLWriter::SubtractItemSet( aItemSet, pRefFormat->GetAttrSet(),
                                        bSetDefaults, bClearSame,
-                                       pRefFmtScript
-                                               ? &pRefFmtScript->GetAttrSet()
+                                       pRefFormatScript
+                                               ? &pRefFormatScript->GetAttrSet()
                                             : 0  );
 
-        if( !bCharFmt )
+        if( !bCharFormat )
         {
-            const SvxULSpaceItem& rULItem = pRefFmt->GetULSpace();
+            const SvxULSpaceItem& rULItem = pRefFormat->GetULSpace();
             rHTMLWrt.nDfltTopMargin = rULItem.GetUpper();
             rHTMLWrt.nDfltBottomMargin = rULItem.GetLower();
         }
     }
-    else if( CSS1_FMT_ISTAG==nDeep && !bCharFmt )
+    else if( CSS1_FMT_ISTAG==nDeep && !bCharFormat )
     {
         // set Default-distance above and below (for the
         // case that there is no reference template)
         rHTMLWrt.nDfltTopMargin = 0;
         rHTMLWrt.nDfltBottomMargin = HTML_PARSPACE;
-        if( USER_FMT & nPoolFmtId )
+        if( USER_FMT & nPoolFormatId )
         {
             // user templates
-            const OUString aNm(rFmt.GetName());
+            const OUString aNm(rFormat.GetName());
 
             if (aNm == "DD 1" || aNm == "DT 1")
                 rHTMLWrt.nDfltBottomMargin = 0;
@@ -1610,7 +1610,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         else
         {
             // Pool templates
-            switch( nPoolFmtId )
+            switch( nPoolFormatId )
             {
             case RES_POOLCOLL_HEADLINE1:
             case RES_POOLCOLL_HEADLINE2:
@@ -1636,7 +1636,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
     // There is no support for script dependent hyperlinks by now.
     bool bCheckForPseudo = false;
-    if( bCharFmt &&
+    if( bCharFormat &&
         (RES_POOLCHR_INET_NORMAL==nRefPoolId ||
          RES_POOLCHR_INET_VISIT==nRefPoolId) )
         bCheckForPseudo = true;
@@ -1646,18 +1646,18 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, CSS1_FMT_ISTAG != nDeep,
                       bCheckForPseudo ) )
     {
-        if( bCharFmt )
-            rHTMLWrt.aScriptTextStyles.insert( rFmt.GetName() );
+        if( bCharFormat )
+            rHTMLWrt.aScriptTextStyles.insert( rFormat.GetName() );
         else
         {
-            if( nPoolFmtId==RES_POOLCOLL_TEXT )
-                rHTMLWrt.aScriptParaStyles.insert( pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false )->GetName() );
-            rHTMLWrt.aScriptParaStyles.insert( rFmt.GetName() );
+            if( nPoolFormatId==RES_POOLCOLL_TEXT )
+                rHTMLWrt.aScriptParaStyles.insert( pDoc->GetTextCollFromPool( RES_POOLCOLL_STANDARD, false )->GetName() );
+            rHTMLWrt.aScriptParaStyles.insert( rFormat.GetName() );
         }
         bHasScriptDependencies = true;
     }
 
-    if( nPoolFmtId==RES_POOLCOLL_TEXT && !rHTMLWrt.bFirstCSS1Property )
+    if( nPoolFormatId==RES_POOLCOLL_TEXT && !rHTMLWrt.bFirstCSS1Property )
         rHTMLWrt.bPoolCollTextModified = true;
 
     // export Drop-Caps
@@ -1666,7 +1666,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     {
         OUString sOut( aSelector );
         sOut += ":" + OStringToOUString( sCSS1_first_letter, RTL_TEXTENCODING_ASCII_US );
-        const SwFmtDrop *pDrop = static_cast<const SwFmtDrop *>(pItem);
+        const SwFormatDrop *pDrop = static_cast<const SwFormatDrop *>(pItem);
         OutCSS1DropCapRule( rHTMLWrt, sOut, *pDrop, CSS1_FMT_ISTAG != nDeep, bHasScriptDependencies );
     }
 
@@ -1691,7 +1691,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
     if( bPseudo )
     {
         const sal_Char *pPseudo = 0;
-        switch( rPageDesc.GetPoolFmtId() )
+        switch( rPageDesc.GetPoolFormatId() )
         {
         case RES_POOLPAGE_FIRST:    pPseudo = sCSS1_first;  break;
         case RES_POOLPAGE_LEFT:     pPseudo = sCSS1_left;   break;
@@ -1746,7 +1746,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
     }
 
     // Export the distance-Attributes as normally
-    const SwFrmFmt &rMaster = rPageDesc.GetMaster();
+    const SwFrameFormat &rMaster = rPageDesc.GetMaster();
     SfxItemSet aItemSet( *rMaster.GetAttrSet().GetPool(),
                          RES_LR_SPACE, RES_UL_SPACE );
     aItemSet.Set( rMaster.GetAttrSet(), true );
@@ -1777,7 +1777,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
     return rWrt;
 }
 
-static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
+static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
                                   SwDoc *pDoc, sal_uInt16 nNotes, bool bEndNote )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1796,12 +1796,12 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
         rHTMLWrt.Strm().WriteCharPtr( sCSS1_rule_end );
     }
 
-    const SwCharFmt *pSymCharFmt = rInfo.GetCharFmt( *pDoc );
-    if( pSymCharFmt )
+    const SwCharFormat *pSymCharFormat = rInfo.GetCharFormat( *pDoc );
+    if( pSymCharFormat )
     {
-        const SfxItemSet& rFmtItemSet = pSymCharFmt->GetAttrSet();
-        SfxItemSet aItemSet( *rFmtItemSet.GetPool(), rFmtItemSet.GetRanges() );
-        aItemSet.Set( rFmtItemSet, true );
+        const SfxItemSet& rFormatItemSet = pSymCharFormat->GetAttrSet();
+        SfxItemSet aItemSet( *rFormatItemSet.GetPool(), rFormatItemSet.GetRanges() );
+        aItemSet.Set( rFormatItemSet, true );
 
         // If there are footnotes or endnotes, then all Attributes have to be
         // exported, so that Netscape displays the document correctly.
@@ -1809,10 +1809,10 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
         // footnote and endnote template.
         if( nNotes == 0 && rHTMLWrt.pTemplate )
         {
-            SwFmt *pRefFmt = rHTMLWrt.pTemplate->getIDocumentStylePoolAccess().GetCharFmtFromPool(
+            SwFormat *pRefFormat = rHTMLWrt.pTemplate->getIDocumentStylePoolAccess().GetCharFormatFromPool(
                         static_cast< sal_uInt16 >(bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE) );
-            if( pRefFmt )
-                SwHTMLWriter::SubtractItemSet( aItemSet, pRefFmt->GetAttrSet(),
+            if( pRefFormat )
+                SwHTMLWriter::SubtractItemSet( aItemSet, pRefFormat->GetAttrSet(),
                                                true );
         }
         if( aItemSet.Count() )
@@ -1821,7 +1821,7 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
                         ( bEndNote ? OUString(OOO_STRING_SVTOOLS_HTML_sdendnote_sym)
                                    : OUString(OOO_STRING_SVTOOLS_HTML_sdfootnote_sym));
             if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, true, false ))
-                rHTMLWrt.aScriptTextStyles.insert( pSymCharFmt->GetName() );
+                rHTMLWrt.aScriptTextStyles.insert( pSymCharFormat->GetName() );
         }
     }
 
@@ -1928,16 +1928,16 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
     SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_STYLE_OPT |
                                    CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_PARA );
 
-    const SwNumFmt& rNumFmt = rNumRule.Get( nLevel );
+    const SwNumFormat& rNumFormat = rNumRule.Get( nLevel );
 
-    long nLSpace = rNumFmt.GetAbsLSpace();
-    long nFirstLineOffset = rNumFmt.GetFirstLineOffset();
+    long nLSpace = rNumFormat.GetAbsLSpace();
+    long nFirstLineOffset = rNumFormat.GetFirstLineOffset();
     long nDfltFirstLineOffset = HTML_NUMBUL_INDENT;
     if( nLevel > 0 )
     {
-        const SwNumFmt& rPrevNumFmt = rNumRule.Get( nLevel-1 );
-        nLSpace -= rPrevNumFmt.GetAbsLSpace();
-        nDfltFirstLineOffset = rPrevNumFmt.GetFirstLineOffset();
+        const SwNumFormat& rPrevNumFormat = rNumRule.Get( nLevel-1 );
+        nLSpace -= rPrevNumFormat.GetAbsLSpace();
+        nDfltFirstLineOffset = rPrevNumFormat.GetFirstLineOffset();
     }
 
     if( rHTMLWrt.IsHTMLMode(HTMLMODE_LSPACE_IN_NUMBUL) &&
@@ -1954,7 +1954,7 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
     return rWrt;
 }
 
-void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
+void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat,
                                           sal_uInt32 nFrmOpts,
                                           const SdrObject *pSdrObj,
                                           const SfxItemSet *pItemSet )
@@ -1963,12 +1963,12 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
                                 CSS1_OUTMODE_ENCODE|
                                 CSS1_OUTMODE_FRAME );
 
-    const SwFmtHoriOrient& rHoriOri = rFrmFmt.GetHoriOrient();
-    SvxLRSpaceItem aLRItem( rFrmFmt.GetLRSpace() );
-    SvxULSpaceItem aULItem( rFrmFmt.GetULSpace() );
+    const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient();
+    SvxLRSpaceItem aLRItem( rFrameFormat.GetLRSpace() );
+    SvxULSpaceItem aULItem( rFrameFormat.GetULSpace() );
     if( nFrmOpts & HTML_FRMOPT_S_ALIGN )
     {
-        const SwFmtAnchor& rAnchor = rFrmFmt.GetAnchor();
+        const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
         switch( rAnchor.GetAnchorId() )
         {
         case FLY_AT_PARA:
@@ -2002,11 +2002,11 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
                 // top
                 long nXPos=0, nYPos=0;
                 bool bOutXPos = false, bOutYPos = false;
-                if( RES_DRAWFRMFMT == rFrmFmt.Which() )
+                if( RES_DRAWFRMFMT == rFrameFormat.Which() )
                 {
                     OSL_ENSURE( pSdrObj, "Do not pass a SdrObject. Inefficient" );
                     if( !pSdrObj )
-                        pSdrObj = rFrmFmt.FindSdrObject();
+                        pSdrObj = rFrameFormat.FindSdrObject();
                     OSL_ENSURE( pSdrObj, "Where is the SdrObject" );
                     if( pSdrObj )
                     {
@@ -2022,7 +2022,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
                     nXPos = text::HoriOrientation::NONE == rHoriOri.GetHoriOrient()
                                 ? rHoriOri.GetPos() : 0;
 
-                    const SwFmtVertOrient& rVertOri = rFrmFmt.GetVertOrient();
+                    const SwFormatVertOrient& rVertOri = rFrameFormat.GetVertOrient();
                     bOutYPos = text::RelOrientation::CHAR != rVertOri.GetRelationOrient();
                     nYPos = text::VertOrientation::NONE == rVertOri.GetVertOrient()
                                  ? rVertOri.GetPos() : 0;
@@ -2069,11 +2069,11 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
     // width/height
     if( nFrmOpts & HTML_FRMOPT_S_SIZE )
     {
-        if( RES_DRAWFRMFMT == rFrmFmt.Which() )
+        if( RES_DRAWFRMFMT == rFrameFormat.Which() )
         {
             OSL_ENSURE( pSdrObj, "Do not pass a SdrObject. Inefficient" );
             if( !pSdrObj )
-                pSdrObj = rFrmFmt.FindSdrObject();
+                pSdrObj = rFrameFormat.FindSdrObject();
             OSL_ENSURE( pSdrObj, "Where is the SdrObject" );
             if( pSdrObj )
             {
@@ -2110,11 +2110,11 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
             if( nFrmOpts & HTML_FRMOPT_S_PIXSIZE )
                 nMode |= CSS1_FRMSIZE_PIXEL;
 
-            OutCSS1_SwFmtFrmSize( *this, rFrmFmt.GetFrmSize(), nMode );
+            OutCSS1_SwFormatFrmSize( *this, rFrameFormat.GetFrmSize(), nMode );
         }
     }
 
-    const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+    const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
     // margin-*
     if( (nFrmOpts & HTML_FRMOPT_S_SPACE) &&
         IsHTMLMode( HTMLMODE_FLY_MARGINS) )
@@ -2134,14 +2134,14 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
     {
         const SfxPoolItem* pItem;
         if( nFrmOpts & HTML_FRMOPT_S_NOBORDER )
-            OutCSS1_SvxBox( *this, rFrmFmt.GetBox() );
+            OutCSS1_SvxBox( *this, rFrameFormat.GetBox() );
         else if( SfxItemState::SET==rItemSet.GetItemState( RES_BOX, true, &pItem ) )
             OutCSS1_SvxBox( *this, *pItem );
     }
 
     // background (if, then the color must be set also)
     if( nFrmOpts & HTML_FRMOPT_S_BACKGROUND )
-        OutCSS1_FrmFmtBackground( rFrmFmt );
+        OutCSS1_FrameFormatBackground( rFrameFormat );
 
     if( pItemSet )
         OutCSS1_SfxItemSet( *pItemSet, false );
@@ -2150,46 +2150,46 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
         Strm().WriteChar( '\"' );
 }
 
-void SwHTMLWriter::OutCSS1_TableFrmFmtOptions( const SwFrmFmt& rFrmFmt )
+void SwHTMLWriter::OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameFormat )
 {
     SwCSS1OutMode aMode( *this, CSS1_OUTMODE_STYLE_OPT_ON |
                                 CSS1_OUTMODE_ENCODE|
                                 CSS1_OUTMODE_TABLE );
 
     const SfxPoolItem *pItem;
-    const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+    const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
     if( SfxItemState::SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
         OutCSS1_SvxBrush( *this, *pItem, CSS1_BACKGROUND_TABLE );
 
     if( IsHTMLMode( HTMLMODE_PRINT_EXT ) )
-        OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( *this, rItemSet, false );
+        OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( *this, rItemSet, false );
 
     if( SfxItemState::SET==rItemSet.GetItemState( RES_LAYOUT_SPLIT, false, &pItem ) )
-        OutCSS1_SwFmtLayoutSplit( *this, *pItem );
+        OutCSS1_SwFormatLayoutSplit( *this, *pItem );
 
     if( !bFirstCSS1Property )
         Strm().WriteChar( '\"' );
 }
 
-void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrmFmt const& rFrmFmt)
+void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrameFormat const& rFrameFormat)
 {
     SwCSS1OutMode const aMode( *this,
         CSS1_OUTMODE_STYLE_OPT_ON|CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_TABLEBOX );
-    OutCSS1_SvxBox(*this, rFrmFmt.GetBox());
+    OutCSS1_SvxBox(*this, rFrameFormat.GetBox());
     if (!bFirstCSS1Property)
     {
         this->Strm().WriteChar( cCSS1_style_opt_end );
     }
 }
 
-void SwHTMLWriter::OutCSS1_SectionFmtOptions( const SwFrmFmt& rFrmFmt, const SwFmtCol *pCol )
+void SwHTMLWriter::OutCSS1_SectionFormatOptions( const SwFrameFormat& rFrameFormat, const SwFormatCol *pCol )
 {
     SwCSS1OutMode aMode( *this, CSS1_OUTMODE_STYLE_OPT_ON |
                                 CSS1_OUTMODE_ENCODE|
                                 CSS1_OUTMODE_SECTION );
 
     const SfxPoolItem *pItem;
-    const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+    const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
     if( SfxItemState::SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
         OutCSS1_SvxBrush( *this, *pItem, CSS1_BACKGROUND_SECTION );
 
@@ -2203,7 +2203,7 @@ void SwHTMLWriter::OutCSS1_SectionFmtOptions( const SwFrmFmt& rFrmFmt, const SwF
         Strm().WriteChar( '\"' );
 }
 
-static bool OutCSS1_FrmFmtBrush( SwHTMLWriter& rWrt,
+static bool OutCSS1_FrameFormatBrush( SwHTMLWriter& rWrt,
                                  const SvxBrushItem& rBrushItem )
 {
     bool bWritten = false;
@@ -2219,25 +2219,25 @@ static bool OutCSS1_FrmFmtBrush( SwHTMLWriter& rWrt,
     return bWritten;
 }
 
-void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
+void SwHTMLWriter::OutCSS1_FrameFormatBackground( const SwFrameFormat& rFrameFormat )
 {
     // If the frame itself has a background, then export.
-    if( OutCSS1_FrmFmtBrush( *this, rFrmFmt.makeBackgroundBrushItem() ) )
+    if( OutCSS1_FrameFormatBrush( *this, rFrameFormat.makeBackgroundBrushItem() ) )
         return;
 
     // If the frame is not linked to a page, we use the background of the anchor.
-    const SwFmtAnchor& rAnchor = rFrmFmt.GetAnchor();
+    const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
     RndStdIds eAnchorId = rAnchor.GetAnchorId();
-    const SwPosition *pAnchorPos = rAnchor.GetCntntAnchor();
+    const SwPosition *pAnchorPos = rAnchor.GetContentAnchor();
     if (FLY_AT_PAGE != eAnchorId && pAnchorPos)
     {
         const SwNode& rNode = pAnchorPos->nNode.GetNode();
-        if( rNode.IsCntntNode() )
+        if( rNode.IsContentNode() )
         {
             // If the frame is linked to a content-node,
             // we take the background of the content-node, if it has one.
-            if( OutCSS1_FrmFmtBrush( *this,
-                    rNode.GetCntntNode()->GetSwAttrSet().GetBackground()) )
+            if( OutCSS1_FrameFormatBrush( *this,
+                    rNode.GetContentNode()->GetSwAttrSet().GetBackground()) )
                 return;
 
             // Otherwise we also could be in a table
@@ -2246,37 +2246,37 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
             {
                 const SwStartNode *pBoxSttNd = rNode.FindTableBoxStartNode();
                 const SwTableBox *pBox =
-                    pTableNd->GetTable().GetTblBox( pBoxSttNd->GetIndex() );
+                    pTableNd->GetTable().GetTableBox( pBoxSttNd->GetIndex() );
 
                 // If the box has a background, we take it.
-                if( OutCSS1_FrmFmtBrush( *this,
-                        pBox->GetFrmFmt()->makeBackgroundBrushItem() ) )
+                if( OutCSS1_FrameFormatBrush( *this,
+                        pBox->GetFrameFormat()->makeBackgroundBrushItem() ) )
                     return;
 
                 // Otherwise we use that of the lines
                 const SwTableLine *pLine = pBox->GetUpper();
                 while( pLine )
                 {
-                    if( OutCSS1_FrmFmtBrush( *this,
-                            pLine->GetFrmFmt()->makeBackgroundBrushItem() ) )
+                    if( OutCSS1_FrameFormatBrush( *this,
+                            pLine->GetFrameFormat()->makeBackgroundBrushItem() ) )
                         return;
                     pBox = pLine->GetUpper();
                     pLine = pBox ? pBox->GetUpper() : 0;
                 }
 
                 // If there was none either, we use the background of the table.
-                if( OutCSS1_FrmFmtBrush( *this,
-                        pTableNd->GetTable().GetFrmFmt()->makeBackgroundBrushItem() ) )
+                if( OutCSS1_FrameFormatBrush( *this,
+                        pTableNd->GetTable().GetFrameFormat()->makeBackgroundBrushItem() ) )
                     return;
             }
 
         }
 
         // If the anchor is again in a Fly-Frame, use the background of the Fly-Frame.
-        const SwFrmFmt *pFrmFmt = rNode.GetFlyFmt();
-        if( pFrmFmt )
+        const SwFrameFormat *pFrameFormat = rNode.GetFlyFormat();
+        if( pFrameFormat )
         {
-            OutCSS1_FrmFmtBackground( *pFrmFmt );
+            OutCSS1_FrameFormatBackground( *pFrameFormat );
             return;
         }
     }
@@ -2284,7 +2284,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
     // At last there is the background of the page, and as the final rescue
     // the value of the Config.
     OSL_ENSURE( pCurrPageDesc, "no page template found" );
-    if( !OutCSS1_FrmFmtBrush( *this,
+    if( !OutCSS1_FrameFormatBrush( *this,
                               pCurrPageDesc->GetMaster().makeBackgroundBrushItem() ) )
     {
         Color aColor( COL_WHITE );
@@ -2305,7 +2305,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
     }
 }
 
-static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
+static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt,
                     const SvxUnderlineItem *pUItem,
                     const SvxOverlineItem *pOItem,
                     const SvxCrossedOutItem *pCOItem,
@@ -2484,10 +2484,10 @@ static Writer& OutCSS1_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
 static Writer& OutCSS1_SvxCrossedOut( Writer& rWrt, const SfxPoolItem& rHt )
 {
     // This function only exports Hints!
-    // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly.
+    // Otherwise OutCSS1_SvxTextLn_SvxCrOut_SvxBlink() is called directly.
 
     if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) )
-        OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt,
+        OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( rWrt,
                 0, 0, static_cast<const SvxCrossedOutItem *>(&rHt), 0 );
 
     return rWrt;
@@ -2654,10 +2654,10 @@ static Writer& OutCSS1_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt )
 static Writer& OutCSS1_SvxUnderline( Writer& rWrt, const SfxPoolItem& rHt )
 {
     // This function only exports Hints!
-    // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly.
+    // Otherwise OutCSS1_SvxTextLn_SvxCrOut_SvxBlink() is called directly.
 
     if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) )
-        OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt,
+        OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( rWrt,
                 static_cast<const SvxUnderlineItem *>(&rHt), 0, 0, 0 );
 
     return rWrt;
@@ -2666,10 +2666,10 @@ static Writer& OutCSS1_SvxUnderline( Writer& rWrt, const SfxPoolItem& rHt )
 static Writer& OutCSS1_SvxOverline( Writer& rWrt, const SfxPoolItem& rHt )
 {
     // This function only exports Hints!
-    // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly.
+    // Otherwise OutCSS1_SvxTextLn_SvxCrOut_SvxBlink() is called directly.
 
     if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) )
-        OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt,
+        OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( rWrt,
                 0, static_cast<const SvxOverlineItem *>(&rHt), 0, 0 );
 
     return rWrt;
@@ -2730,10 +2730,10 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt )
 static Writer& OutCSS1_SvxBlink( Writer& rWrt, const SfxPoolItem& rHt )
 {
     // This function only exports Hints!
-    // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly.
+    // Otherwise OutCSS1_SvxTextLn_SvxCrOut_SvxBlink() is called directly.
 
     if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) )
-        OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt,
+        OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( rWrt,
                 0, 0, 0, static_cast<const SvxBlinkItem *>(&rHt) );
 
     return rWrt;
@@ -2819,11 +2819,11 @@ static Writer& OutCSS1_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
     return rWrt;
 }
 
-static Writer& OutCSS1_SvxFmtSplit( Writer& rWrt, const SfxPoolItem& rHt )
+static Writer& OutCSS1_SvxFormatSplit( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const sal_Char *pStr = static_cast<const SvxFmtSplitItem&>(rHt).GetValue()
+    const sal_Char *pStr = static_cast<const SvxFormatSplitItem&>(rHt).GetValue()
                             ? sCSS1_PV_auto
                             : sCSS1_PV_avoid;
     rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_page_break_inside, pStr );
@@ -2831,11 +2831,11 @@ static Writer& OutCSS1_SvxFmtSplit( Writer& rWrt, const SfxPoolItem& rHt )
     return rWrt;
 }
 
-static Writer& OutCSS1_SwFmtLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt )
+static Writer& OutCSS1_SwFormatLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const sal_Char *pStr = static_cast<const SwFmtLayoutSplit&>(rHt).GetValue()
+    const sal_Char *pStr = static_cast<const SwFormatLayoutSplit&>(rHt).GetValue()
                             ? sCSS1_PV_auto
                             : sCSS1_PV_avoid;
     rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_page_break_inside, pStr );
@@ -2863,9 +2863,9 @@ static Writer& OutCSS1_SvxOrphans( Writer& rWrt, const SfxPoolItem& rHt )
     return rWrt;
 }
 
-static void OutCSS1_SwFmtDropAttrs( SwHTMLWriter& rHWrt,
-                                    const SwFmtDrop& rDrop,
-                                     const SfxItemSet *pCharFmtItemSet )
+static void OutCSS1_SwFormatDropAttrs( SwHTMLWriter& rHWrt,
+                                    const SwFormatDrop& rDrop,
+                                     const SfxItemSet *pCharFormatItemSet )
 {
     // Text flows around on right side
     rHWrt.OutCSS1_PropertyAscii( sCSS1_P_float, sCSS1_PV_left );
@@ -2879,17 +2879,17 @@ static void OutCSS1_SwFmtDropAttrs( SwHTMLWriter& rHWrt,
     if( nDistance > 0 )
         rHWrt.OutCSS1_UnitProperty( sCSS1_P_margin_right, nDistance );
 
-    const SwCharFmt *pDCCharFmt = rDrop.GetCharFmt();
-    if( pCharFmtItemSet )
-        rHWrt.OutCSS1_SfxItemSet( *pCharFmtItemSet );
-    else if( pDCCharFmt )
-        rHWrt.OutCSS1_SfxItemSet( pDCCharFmt->GetAttrSet() );
+    const SwCharFormat *pDCCharFormat = rDrop.GetCharFormat();
+    if( pCharFormatItemSet )
+        rHWrt.OutCSS1_SfxItemSet( *pCharFormatItemSet );
+    else if( pDCCharFormat )
+        rHWrt.OutCSS1_SfxItemSet( pDCCharFormat->GetAttrSet() );
     else if( (rHWrt.nCSS1OutMode & CSS1_OUTMODE_ANY_OFF) == CSS1_OUTMODE_RULE_OFF )
         rHWrt.Strm().WriteCharPtr( sCSS1_rule_end );
 
 }
 
-static Writer& OutCSS1_SwFmtDrop( Writer& rWrt, const SfxPoolItem& rHt )
+static Writer& OutCSS1_SwFormatDrop( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
@@ -2903,7 +2903,7 @@ static Writer& OutCSS1_SwFmtDrop( Writer& rWrt, const SfxPoolItem& rHt )
                              rHTMLWrt.nCSS1Script|CSS1_OUTMODE_SPAN_TAG1_ON|CSS1_OUTMODE_ENCODE|
                              CSS1_OUTMODE_DROPCAP );
 
-        OutCSS1_SwFmtDropAttrs( rHTMLWrt, static_cast<const SwFmtDrop&>(rHt) );
+        OutCSS1_SwFormatDropAttrs( rHTMLWrt, static_cast<const SwFormatDrop&>(rHt) );
         // A "> is already printed by the calling OutCSS1_HintAsSpanTag.
     }
     else
@@ -2914,12 +2914,12 @@ static Writer& OutCSS1_SwFmtDrop( Writer& rWrt, const SfxPoolItem& rHt )
     return rWrt;
 }
 
-static Writer& OutCSS1_SwFmtFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
+static Writer& OutCSS1_SwFormatFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
                                      sal_uInt16 nMode )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const SwFmtFrmSize& rFSItem = static_cast<const SwFmtFrmSize&>(rHt);
+    const SwFormatFrmSize& rFSItem = static_cast<const SwFormatFrmSize&>(rHt);
 
     if( nMode & CSS1_FRMSIZE_WIDTH )
     {
@@ -2995,7 +2995,7 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt )
     // match that of the current template
 
     // A left margin can exist because of a list nearby
-    long nLeftMargin = (long)rLRItem.GetTxtLeft() - rHTMLWrt.nLeftMargin;
+    long nLeftMargin = (long)rLRItem.GetTextLeft() - rHTMLWrt.nLeftMargin;
     if( rHTMLWrt.nDfltLeftMargin != nLeftMargin )
     {
         rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_left, nLeftMargin );
@@ -3013,7 +3013,7 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt )
     }
 
     // The LineIndent of the first line might contain the room for numbering
-    long nFirstLineIndent = (long)rLRItem.GetTxtFirstLineOfst() -
+    long nFirstLineIndent = (long)rLRItem.GetTextFirstLineOfst() -
         rHTMLWrt.nFirstLineIndent;
     if( rHTMLWrt.nDfltFirstLineIndent != nFirstLineIndent )
     {
@@ -3092,10 +3092,10 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
     return rWrt;
 }
 
-static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
-                                        const SvxFmtBreakItem *pBreakItem,
-                                        const SwFmtPageDesc *pPDescItem,
-                                        const SvxFmtKeepItem *pKeepItem )
+static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt,
+                                        const SvxFormatBreakItem *pBreakItem,
+                                        const SwFormatPageDesc *pPDescItem,
+                                        const SvxFormatKeepItem *pKeepItem )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
@@ -3136,7 +3136,7 @@ static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
         const SwPageDesc *pPDesc = pPDescItem->GetPageDesc();
         if( pPDesc )
         {
-            switch( pPDesc->GetPoolFmtId() )
+            switch( pPDesc->GetPoolFormatId() )
             {
             case RES_POOLPAGE_LEFT:     pBreakBefore = sCSS1_PV_left;   break;
             case RES_POOLPAGE_RIGHT:    pBreakBefore = sCSS1_PV_right;  break;
@@ -3159,30 +3159,30 @@ static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
     return rWrt;
 }
 
-static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
+static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt,
                                         const SfxItemSet& rItemSet,
                                         bool bDeep )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
     const SfxPoolItem *pItem;
-    const SvxFmtBreakItem *pBreakItem = 0;
+    const SvxFormatBreakItem *pBreakItem = 0;
     if( SfxItemState::SET==rItemSet.GetItemState( RES_BREAK, bDeep, &pItem ))
-        pBreakItem = static_cast<const SvxFmtBreakItem *>(pItem);
+        pBreakItem = static_cast<const SvxFormatBreakItem *>(pItem);
 
-    const SwFmtPageDesc *pPDescItem = 0;
+    const SwFormatPageDesc *pPDescItem = 0;
     if( ( !rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) ||
           !rHTMLWrt.bCSS1IgnoreFirstPageDesc ||
           rHTMLWrt.pStartNdIdx->GetIndex() !=
                       rHTMLWrt.pCurPam->GetPoint()->nNode.GetIndex() ) &&
         SfxItemState::SET==rItemSet.GetItemState( RES_PAGEDESC, bDeep, &pItem ))
-        pPDescItem = static_cast<const SwFmtPageDesc*>(pItem);
+        pPDescItem = static_cast<const SwFormatPageDesc*>(pItem);
 
-    const SvxFmtKeepItem *pKeepItem = 0;
+    const SvxFormatKeepItem *pKeepItem = 0;
     if( SfxItemState::SET==rItemSet.GetItemState( RES_KEEP, bDeep, &pItem ))
-        pKeepItem = static_cast<const SvxFmtKeepItem *>(pItem);
+        pKeepItem = static_cast<const SvxFormatKeepItem *>(pItem);
 
     if( pBreakItem || pPDescItem || pKeepItem )
-        OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( rWrt, pBreakItem,
+        OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( rWrt, pBreakItem,
                                                    pPDescItem, pKeepItem );
 
     return rWrt;
@@ -3605,12 +3605,12 @@ SwAttrFnTab aCSS1AttrFnTab = {
 
 /* RES_PARATR_LINESPACING   */      OutCSS1_SvxLineSpacing,
 /* RES_PARATR_ADJUST    */          OutCSS1_SvxAdjust,
-/* RES_PARATR_SPLIT */              OutCSS1_SvxFmtSplit,
+/* RES_PARATR_SPLIT */              OutCSS1_SvxFormatSplit,
 /* RES_PARATR_ORPHANS   */          OutCSS1_SvxOrphans,
 /* RES_PARATR_WIDOWS    */          OutCSS1_SvxWidows,
 /* RES_PARATR_TABSTOP   */          0,
 /* RES_PARATR_HYPHENZONE*/          0,
-/* RES_PARATR_DROP */               OutCSS1_SwFmtDrop,
+/* RES_PARATR_DROP */               OutCSS1_SwFormatDrop,
 /* RES_PARATR_REGISTER */           0, // neu:  Registerhaltigkeit
 /* RES_PARATR_NUMRULE */            0,
 /* RES_PARATR_SCRIPTSPACE */        0,
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 5eb03147a750..879ac21a481e 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -122,7 +122,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
     if( nDefListLvl < nNewLvl )
     {
         // output </pre> for the previous(!) pararagraph, if required.
-        // Preferable, the <pre> is exported by OutHTML_SwFmtOff for the
+        // Preferable, the <pre> is exported by OutHTML_SwFormatOff for the
            // previous  paragraph already, but that's not possible, because a very
         // deep look at the next paragraph (this one) is required to figure
         // out that a def list starts here.
@@ -189,17 +189,17 @@ sal_uInt16 SwHTMLWriter::GetCSS1ScriptForScriptType( sal_uInt16 nScriptType )
  * Formate wie folgt ausgeben:
  * - fuer Formate, fuer die es entsprechende HTML-Tags gibt wird das
  *   Tag ausgegeben
- * - fuer alle anderen wird ein Absatz-Tag <P> ausgegeben und bUserFmt
+ * - fuer alle anderen wird ein Absatz-Tag <P> ausgegeben und bUserFormat
  *   gesetzt
  * - Wenn eine Absatz-Ausrichtung am uebergebenen Item-Set des Nodes
  *   oder im Item-Set des Format gesetzt ist, wird ein ALIGN=xxx ausgegeben,
  *   sofern HTML es zulaesst
  * - in jedem Fall wird harte Attributierung als STYLE-Option geschrieben.
- *   Wenn bUserFmt nicht gesetzt ist, wird nur der uebergebene Item-Set
+ *   Wenn bUserFormat nicht gesetzt ist, wird nur der uebergebene Item-Set
  *   betrachtet. Sonst werden auch Attribute des Formats ausgegeben.
  */
 
-struct SwHTMLTxtCollOutputInfo
+struct SwHTMLTextCollOutputInfo
 {
     OString aToken;        // auszugendens End-Token
     std::unique_ptr<SfxItemSet> pItemSet;       // harte Attributierung
@@ -209,29 +209,29 @@ struct SwHTMLTxtCollOutputInfo
     bool bOutPara;              // ein </P> soll ausgegeben werden
     bool bOutDiv;               // write a </DIV>
 
-    SwHTMLTxtCollOutputInfo() :
+    SwHTMLTextCollOutputInfo() :
         bInNumBulList( false ),
         bParaPossible( false ),
         bOutPara( false ),
         bOutDiv( false )
     {}
 
-    ~SwHTMLTxtCollOutputInfo();
+    ~SwHTMLTextCollOutputInfo();
 
     bool HasParaToken() const { return aToken.getLength()==1 && aToken[0]=='P'; }
     bool ShouldOutputToken() const { return bOutPara || !HasParaToken(); }
 };
 
-SwHTMLTxtCollOutputInfo::~SwHTMLTxtCollOutputInfo()
+SwHTMLTextCollOutputInfo::~SwHTMLTextCollOutputInfo()
 {
 }
 
-SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
+SwHTMLFormatInfo::SwHTMLFormatInfo( const SwFormat *pF, SwDoc *pDoc, SwDoc *pTemplate,
                               bool bOutStyles,
                               LanguageType eDfltLang,
                               sal_uInt16 nCSS1Script, bool bHardDrop )
-    : pFmt(pF)
-    , pRefFmt(0)
+    : pFormat(pF)
+    , pRefFormat(0)
     , pItemSet(0)
     , nLeftMargin(0)
     , nRightMargin(0)
@@ -242,17 +242,17 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
 {
     sal_uInt16 nRefPoolId = 0;
     // Den Selektor des Formats holen
-    sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFmt, aToken, aClass,
+    sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFormat, aToken, aClass,
                                                   nRefPoolId );
     OSL_ENSURE( nDeep ? !aToken.isEmpty() : aToken.isEmpty(),
             "Hier stimmt doch was mit dem Token nicht!" );
     OSL_ENSURE( nDeep ? nRefPoolId != 0 : nRefPoolId == 0,
             "Hier stimmt doch was mit der Vergleichs-Vorlage nicht!" );
 
-    bool bTxtColl = pFmt->Which() == RES_TXTFMTCOLL ||
-                    pFmt->Which() == RES_CONDTXTFMTCOLL;
+    bool bTextColl = pFormat->Which() == RES_TXTFMTCOLL ||
+                    pFormat->Which() == RES_CONDTXTFMTCOLL;
 
-    const SwFmt *pReferenceFmt = 0; // Vergleichs-Format
+    const SwFormat *pReferenceFormat = 0; // Vergleichs-Format
     bool bSetDefaults = true, bClearSame = true;
     if( nDeep != 0 )
     {
@@ -268,7 +268,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
             case CSS1_FMT_CMPREF:
                 // fuer HTML-Tag-Vorlagen die Unterscheide zum Original
                 // (sofern verfuegbar)
-                pReferenceFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId,
+                pReferenceFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId,
                                                         &pTemplate->getIDocumentStylePoolAccess() );
                 break;
 
@@ -276,38 +276,38 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
                 // sonst die zur HTML-Tag-Vorlage des Originals oder des
                 // aktuellen Doks, wenn die nicht verfuegbar ist
                 if( pTemplate )
-                    pReferenceFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId,
+                    pReferenceFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId,
                                                             &pTemplate->getIDocumentStylePoolAccess() );
                 else
-                    pReferenceFmt = SwHTMLWriter::GetParentFmt( *pFmt, nDeep );
+                    pReferenceFormat = SwHTMLWriter::GetParentFormat( *pFormat, nDeep );
                 break;
             }
         }
     }
-    else if( bTxtColl )
+    else if( bTextColl )
     {
         // Nicht von einer HTML-Tag-Vorlage abgeleitete Absatz-Vorlagen
         // muessen als harte Attributierung relativ zur Textkoerper-Volage
         // exportiert werden. Fuer Nicht-Styles-Export sollte die der
         // HTML-Vorlage als Referenz dienen
         if( !bOutStyles && pTemplate )
-            pReferenceFmt = pTemplate->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT, false );
+            pReferenceFormat = pTemplate->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT, false );
         else
-            pReferenceFmt = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT, false );
+            pReferenceFormat = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT, false );
     }
 
-    if( pReferenceFmt || nDeep==0 )
+    if( pReferenceFormat || nDeep==0 )
     {
-        pItemSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
-                                       pFmt->GetAttrSet().GetRanges() );
+        pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
+                                       pFormat->GetAttrSet().GetRanges() );
         // wenn Unterschiede zu einer anderen Vorlage geschrieben werden
         // sollen ist harte Attributierung noetig. Fuer Vorlagen, die
         // nicht von HTML-Tag-Vorlagen abgeleitet sind, gilt das immer
 
-        pItemSet->Set( pFmt->GetAttrSet(), true );
+        pItemSet->Set( pFormat->GetAttrSet(), true );
 
-        if( pReferenceFmt )
-            SwHTMLWriter::SubtractItemSet( *pItemSet, pReferenceFmt->GetAttrSet(),
+        if( pReferenceFormat )
+            SwHTMLWriter::SubtractItemSet( *pItemSet, pReferenceFormat->GetAttrSet(),
                                            bSetDefaults, bClearSame );
 
         // einen leeren Item-Set gleich loeschen, das spart speater
@@ -319,7 +319,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
         }
     }
 
-    if( bTxtColl )
+    if( bTextColl )
     {
         if( bOutStyles )
         {
@@ -357,15 +357,15 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
             }
             for( sal_uInt16 i=0; i<4; i++ )
             {
-                const SfxPoolItem& rRef = pFmt->GetFmtAttr( aWhichIds[nRef][i] );
+                const SfxPoolItem& rRef = pFormat->GetFormatAttr( aWhichIds[nRef][i] );
                 for( sal_uInt16 j=0; j<2; j++ )
                 {
-                    const SfxPoolItem& rSet = pFmt->GetFmtAttr( aWhichIds[aSets[j]][i] );
+                    const SfxPoolItem& rSet = pFormat->GetFormatAttr( aWhichIds[aSets[j]][i] );
                     if( rSet != rRef )
                     {
                         if( !pItemSet )
-                            pItemSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
-                                                       pFmt->GetAttrSet().GetRanges() );
+                            pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
+                                                       pFormat->GetAttrSet().GetRanges() );
                         pItemSet->Put( rSet );
                     }
                 }
@@ -376,24 +376,24 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
         if( bOutStyles && bHardDrop && nDeep != 0 )
         {
             const SfxPoolItem *pItem;
-            if( SfxItemState::SET==pFmt->GetAttrSet().GetItemState(
+            if( SfxItemState::SET==pFormat->GetAttrSet().GetItemState(
                                     RES_PARATR_DROP, true, &pItem ) )
             {
                 bool bPut = true;
                 if( pTemplate )
                 {
-                    pReferenceFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
+                    pReferenceFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId, &pTemplate->getIDocumentStylePoolAccess() );
                     const SfxPoolItem *pRefItem;
                     bool bRefItemSet =
-                        SfxItemState::SET==pReferenceFmt->GetAttrSet().GetItemState(
+                        SfxItemState::SET==pReferenceFormat->GetAttrSet().GetItemState(
                                         RES_PARATR_DROP, true, &pRefItem );
                     bPut = !bRefItemSet || *pItem!=*pRefItem;
                 }
                 if( bPut )
                 {
                     if( !pItemSet )
-                        pItemSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
-                                                   pFmt->GetAttrSet().GetRanges() );
+                        pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
+                                                   pFormat->GetAttrSet().GetRanges() );
                     pItemSet->Put( *pItem );
                 }
             }
@@ -402,13 +402,13 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
         // Die diversen default-Abstaende aus der Vorlage oder der
         // Vergleischs-Vorlage merken
         const SvxLRSpaceItem &rLRSpace =
-            (pReferenceFmt ? pReferenceFmt : pFmt)->GetLRSpace();
-        nLeftMargin = rLRSpace.GetTxtLeft();
+            (pReferenceFormat ? pReferenceFormat : pFormat)->GetLRSpace();
+        nLeftMargin = rLRSpace.GetTextLeft();
         nRightMargin = rLRSpace.GetRight();
-        nFirstLineIndent = rLRSpace.GetTxtFirstLineOfst();
+        nFirstLineIndent = rLRSpace.GetTextFirstLineOfst();
 
         const SvxULSpaceItem &rULSpace =
-            (pReferenceFmt ? pReferenceFmt : pFmt)->GetULSpace();
+            (pReferenceFormat ? pReferenceFormat : pFormat)->GetULSpace();
         nTopMargin = rULSpace.GetUpper();
         nBottomMargin = rULSpace.GetLower();
 
@@ -416,13 +416,13 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
         sal_uInt16 nWhichId =
             SwHTMLWriter::GetLangWhichIdFromScript( nCSS1Script );
         const SvxLanguageItem& rLang =
-            static_cast<const SvxLanguageItem&>(pFmt->GetFmtAttr( nWhichId ));
+            static_cast<const SvxLanguageItem&>(pFormat->GetFormatAttr( nWhichId ));
         LanguageType eLang = rLang.GetLanguage();
         if( eLang != eDfltLang )
         {
             if( !pItemSet )
-                pItemSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
-                                           pFmt->GetAttrSet().GetRanges() );
+                pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
+                                           pFormat->GetAttrSet().GetRanges() );
             pItemSet->Put( rLang );
         }
 
@@ -434,12 +434,12 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
             if( aWhichIds[i] != nWhichId )
             {
                 const SvxLanguageItem& rTmpLang =
-                    static_cast<const SvxLanguageItem&>(pFmt->GetFmtAttr(aWhichIds[i]));
+                    static_cast<const SvxLanguageItem&>(pFormat->GetFormatAttr(aWhichIds[i]));
                 if( rTmpLang.GetLanguage() != eLang )
                 {
                     if( !pItemSet )
-                        pItemSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
-                                                   pFmt->GetAttrSet().GetRanges() );
+                        pItemSet = new SfxItemSet( *pFormat->GetAttrSet().GetPool(),
+                                                   pFormat->GetAttrSet().GetRanges() );
                     pItemSet->Put( rTmpLang );
                 }
             }
@@ -447,16 +447,16 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
     }
 }
 
-SwHTMLFmtInfo::~SwHTMLFmtInfo()
+SwHTMLFormatInfo::~SwHTMLFormatInfo()
 {
     delete pItemSet;
 }
 
-void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
+void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
                     const SfxItemSet *pNodeItemSet,
-                    SwHTMLTxtCollOutputInfo& rInfo )
+                    SwHTMLTextCollOutputInfo& rInfo )
 {
-    OSL_ENSURE( RES_CONDTXTFMTCOLL==rFmt.Which() || RES_TXTFMTCOLL==rFmt.Which(),
+    OSL_ENSURE( RES_CONDTXTFMTCOLL==rFormat.Which() || RES_TXTFMTCOLL==rFormat.Which(),
             "keine Absatz-Vorlage" );
 
     SwHTMLWriter & rHWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -477,7 +477,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     sal_uInt8 nBulletGrfLvl = 255;      // Die auszugebende Bullet-Grafik
 
     // Sind wir in einer Aufzaehlungs- oder Numerierungliste?
-    const SwTxtNode* pTxtNd = rWrt.pCurPam->GetNode().GetTxtNode();
+    const SwTextNode* pTextNd = rWrt.pCurPam->GetNode().GetTextNode();
 
     SwHTMLNumRuleInfo aNumInfo;
     if( rHWrt.GetNextNumInfo() )
@@ -487,7 +487,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     }
     else
     {
-        aNumInfo.Set( *pTxtNd );
+        aNumInfo.Set( *pTextNd );
     }
 
     if( aNumInfo.GetNumRule() )
@@ -499,9 +499,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         bNumbered = aNumInfo.IsNumbered();
         sal_uInt8 nLvl = aNumInfo.GetLevel();
 
-        OSL_ENSURE( pTxtNd->GetActualListLevel() == nLvl,
+        OSL_ENSURE( pTextNd->GetActualListLevel() == nLvl,
                 "Gemerkter Num-Level ist falsch" );
-        OSL_ENSURE( bNumbered == pTxtNd->IsCountedInList(),
+        OSL_ENSURE( bNumbered == pTextNd->IsCountedInList(),
                 "Gemerkter Numerierungs-Zustand ist falsch" );
 
         if( bNumbered )
@@ -512,9 +512,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
             // - <nNumStart> has to contain the restart value, if the
             //   numbering is restarted at this text node. Value <USHRT_MAX>
             //   indicates, that no additional restart value has to be written.
-            if ( pTxtNd->IsListRestart() )
+            if ( pTextNd->IsListRestart() )
             {
-                nNumStart = static_cast< sal_uInt16 >(pTxtNd->GetActualListStartValue());
+                nNumStart = static_cast< sal_uInt16 >(pTextNd->GetActualListStartValue());
             }
             OSL_ENSURE( rHWrt.nLastParaToken == 0,
                 "<PRE> wurde nicht vor <LI> beendet." );
@@ -522,32 +522,32 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     }
 
     // Jetzt holen wir das Token und ggf. die Klasse
-    SwHTMLFmtInfo aFmtInfo( &rFmt );
-    SwHTMLFmtInfo *pFmtInfo;
-    SwHTMLFmtInfos::iterator it = rHWrt.aTxtCollInfos.find( aFmtInfo );
-    if( it != rHWrt.aTxtCollInfos.end() )
+    SwHTMLFormatInfo aFormatInfo( &rFormat );
+    SwHTMLFormatInfo *pFormatInfo;
+    SwHTMLFormatInfos::iterator it = rHWrt.aTextCollInfos.find( aFormatInfo );
+    if( it != rHWrt.aTextCollInfos.end() )
     {
-        pFmtInfo = &*it;
+        pFormatInfo = &*it;
     }
     else
     {
-        pFmtInfo = new SwHTMLFmtInfo( &rFmt, rWrt.pDoc, rHWrt.pTemplate,
+        pFormatInfo = new SwHTMLFormatInfo( &rFormat, rWrt.pDoc, rHWrt.pTemplate,
                                       rHWrt.bCfgOutStyles, rHWrt.eLang,
                                       rHWrt.nCSS1Script,
                                       false );
-        rHWrt.aTxtCollInfos.insert( pFmtInfo );
-        if( rHWrt.aScriptParaStyles.count( rFmt.GetName() ) )
-            pFmtInfo->bScriptDependent = true;
+        rHWrt.aTextCollInfos.insert( pFormatInfo );
+        if( rHWrt.aScriptParaStyles.count( rFormat.GetName() ) )
+            pFormatInfo->bScriptDependent = true;
     }
 
     // Jetzt wird festgelegt, was aufgrund des Tokens so moeglich ist
     sal_uInt16 nToken = 0;          // Token fuer Tag-Wechsel
     bool bOutNewLine = false;   // nur ein LF ausgeben?
-    if( !pFmtInfo->aToken.isEmpty() )
+    if( !pFormatInfo->aToken.isEmpty() )
     {
         // Es ist eine HTML-Tag-Vorlage oder die Vorlage ist von einer
         // solchen abgeleitet
-        rInfo.aToken = pFmtInfo->aToken;
+        rInfo.aToken = pFormatInfo->aToken;
 
         if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_address)
         {
@@ -594,10 +594,10 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     }
 
     // Falls noetig, die harte Attributierung der Vorlage uebernehmen
-    if( pFmtInfo->pItemSet )
+    if( pFormatInfo->pItemSet )
     {
         OSL_ENSURE( !rInfo.pItemSet.get(), "Wo kommt der Item-Set her?" );
-        rInfo.pItemSet.reset(new SfxItemSet( *pFmtInfo->pItemSet ));
+        rInfo.pItemSet.reset(new SfxItemSet( *pFormatInfo->pItemSet ));
     }
 
     // und noch die harte Attributierung des Absatzes dazunehmen
@@ -612,7 +612,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     // den unteren Absatz-Abstand brauchen wir noch
     const SvxULSpaceItem& rULSpace =
         pNodeItemSet ? static_cast<const SvxULSpaceItem &>(pNodeItemSet->Get(RES_UL_SPACE))
-                     : rFmt.GetULSpace();
+                     : rFormat.GetULSpace();
 
     if( (rHWrt.bOutHeader &&
          rWrt.pCurPam->GetPoint()->nNode.GetIndex() ==
@@ -629,7 +629,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
             if (!rInfo.pItemSet.get())
             {
-                rInfo.pItemSet.reset(new SfxItemSet(*rFmt.GetAttrSet().GetPool(), RES_UL_SPACE, RES_UL_SPACE));
+                rInfo.pItemSet.reset(new SfxItemSet(*rFormat.GetAttrSet().GetPool(), RES_UL_SPACE, RES_UL_SPACE));
             }
             rInfo.pItemSet->Put( aULSpaceItem );
         }
@@ -667,15 +667,15 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     // eine Definitions-Liste
     const SvxLRSpaceItem& rLRSpace =
         pNodeItemSet ? static_cast<const SvxLRSpaceItem &>(pNodeItemSet->Get(RES_LR_SPACE))
-                     : rFmt.GetLRSpace();
+                     : rFormat.GetLRSpace();
     if( (!rHWrt.bCfgOutStyles || bForceDL) && !rInfo.bInNumBulList )
     {
         sal_Int32 nLeftMargin;
         if( bForceDL )
-            nLeftMargin = rLRSpace.GetTxtLeft();
+            nLeftMargin = rLRSpace.GetTextLeft();
         else
-            nLeftMargin = rLRSpace.GetTxtLeft() > pFmtInfo->nLeftMargin
-                ? rLRSpace.GetTxtLeft() - pFmtInfo->nLeftMargin
+            nLeftMargin = rLRSpace.GetTextLeft() > pFormatInfo->nLeftMargin
+                ? rLRSpace.GetTextLeft() - pFormatInfo->nLeftMargin
                 : 0;
 
         if( nLeftMargin > 0 && rHWrt.nDefListMargin > 0 )
@@ -693,9 +693,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
             nNewDefListLvl = (bForceDL&& !bDT) ? 1 : 0;
         }
 
-        bool bIsNextTxtNode =
+        bool bIsNextTextNode =
             rWrt.pDoc->GetNodes()[rWrt.pCurPam->GetPoint()->nNode.GetIndex()+1]
-                     ->IsTxtNode();
+                     ->IsTextNode();
 
         if( bForceDL && bDT )
         {
@@ -705,7 +705,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         }
         else if( !nNewDefListLvl && !rHWrt.bCfgOutStyles && bPara &&
                  rULSpace.GetLower()==0 &&
-                 ((bUseParSpace && bIsNextTxtNode) || rHWrt.nDefListLvl==1) &&
+                 ((bUseParSpace && bIsNextTextNode) || rHWrt.nDefListLvl==1) &&
                  (!pAdjItem || SVX_ADJUST_LEFT==
                     static_cast<const SvxAdjustItem *>(pAdjItem)->GetAdjust()) )
         {
@@ -737,17 +737,17 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
     // Die Defaults aus der Vorlage merken, denn sie muessen nicht
     // exportiert werden
-    rHWrt.nDfltLeftMargin = pFmtInfo->nLeftMargin;
-    rHWrt.nDfltRightMargin = pFmtInfo->nRightMargin;
-    rHWrt.nDfltFirstLineIndent = pFmtInfo->nFirstLineIndent;
+    rHWrt.nDfltLeftMargin = pFormatInfo->nLeftMargin;
+    rHWrt.nDfltRightMargin = pFormatInfo->nRightMargin;
+    rHWrt.nDfltFirstLineIndent = pFormatInfo->nFirstLineIndent;
 
     if( rInfo.bInNumBulList )
     {
         if( !rHWrt.IsHTMLMode( HTMLMODE_LSPACE_IN_NUMBUL ) )
-            rHWrt.nDfltLeftMargin = rLRSpace.GetTxtLeft();
+            rHWrt.nDfltLeftMargin = rLRSpace.GetTextLeft();
 
         // In Numerierungs-Listen keinen Ertzeilen-Einzug ausgeben.
-        rHWrt.nFirstLineIndent = rLRSpace.GetTxtFirstLineOfst();
+        rHWrt.nFirstLineIndent = rLRSpace.GetTextFirstLineOfst();
     }
 
     if( rInfo.bInNumBulList && bNumbered && bPara && !rHWrt.bCfgOutStyles )
@@ -764,7 +764,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     }
     else
     {
-        rHWrt.nDfltTopMargin = pFmtInfo->nTopMargin;
+        rHWrt.nDfltTopMargin = pFormatInfo->nTopMargin;
         // Wenn im letzten Absatz einer Tabelle der
         // untere Absatz-Abstand veraendert wird, vertut sich
         // Netscape total. Deshalb exportieren wir hier erstmal
@@ -773,7 +773,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         if( rHWrt.bCfgNetscape4 && !bUseParSpace )
             rHWrt.nDfltBottomMargin = rULSpace.GetLower();
         else
-            rHWrt.nDfltBottomMargin = pFmtInfo->nBottomMargin;
+            rHWrt.nDfltBottomMargin = pFormatInfo->nBottomMargin;
     }
 
     if( rHWrt.nDefListLvl )
@@ -816,7 +816,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_division);
         rWrt.Strm().WriteOString( sOut );
 
-        rHWrt.bTxtAttr = false;
+        rHWrt.bTextAttr = false;
         rHWrt.bOutOpts = true;
         OutHTML_SvxAdjust( rWrt, *pAdjItem );
         rWrt.Strm().WriteChar( '>' );
@@ -868,7 +868,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     sal_uInt16 nDir = rHWrt.GetHTMLDirection(
             (pNodeItemSet ? static_cast < const SvxFrameDirectionItem& >(
                                     pNodeItemSet->Get( RES_FRAMEDIR ) )
-                          : rFmt.GetFrmDir() ).GetValue() );
+                          : rFormat.GetFrmDir() ).GetValue() );
 
     // Ein <P> wird nur geschrieben, wenn
     // - wir in keiner OL/UL/DL sind, oder
@@ -890,7 +890,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         rHWrt.bCfgOutStyles )
     {
         // jetzt werden Optionen ausgegeben
-        rHWrt.bTxtAttr = false;
+        rHWrt.bTextAttr = false;
         rHWrt.bOutOpts = true;
 
         OString sOut = "<" + aToken;
@@ -913,13 +913,13 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         }
 
         if( rHWrt.bCfgOutStyles &&
-            (!pFmtInfo->aClass.isEmpty() || pFmtInfo->bScriptDependent) )
+            (!pFormatInfo->aClass.isEmpty() || pFormatInfo->bScriptDependent) )
         {
             sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_class) + "=\"";
             rWrt.Strm().WriteOString( sOut );
             sOut = "";
-            OUString aClass( pFmtInfo->aClass );
-            if( pFmtInfo->bScriptDependent )
+            OUString aClass( pFormatInfo->aClass );
+            if( pFormatInfo->bScriptDependent )
             {
                 if( !aClass.isEmpty() )
                    aClass += "-";
@@ -948,7 +948,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
             OutHTML_SvxAdjust( rWrt, *pAdjItem );
 
         rHWrt.bParaDotLeaders = bPara && rHWrt.bCfgPrintLayout && rHWrt.indexOfDotLeaders(
-                pTxtNd->GetAnyFmtColl().GetPoolFmtId(), pTxtNd->GetTxt()) > -1;
+                pTextNd->GetAnyFormatColl().GetPoolFormatId(), pTextNd->GetText()) > -1;
 
         // und nun ggf. noch die STYLE-Option
         if( rHWrt.bCfgOutStyles && rInfo.pItemSet && !bNoStyle)
@@ -981,8 +981,8 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     {
         OSL_ENSURE( aNumInfo.GetNumRule(), "Wo ist die Numerierung geblieben???" );
         OSL_ENSURE( nBulletGrfLvl < MAXLEVEL, "So viele Ebenen gibt's nicht" );
-        const SwNumFmt& rNumFmt = aNumInfo.GetNumRule()->Get(nBulletGrfLvl);
-        OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, rNumFmt.GetBrush() );
+        const SwNumFormat& rNumFormat = aNumInfo.GetNumRule()->Get(nBulletGrfLvl);
+        OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, rNumFormat.GetBrush() );
     }
 
     rHWrt.GetNumInfo() = aNumInfo;
@@ -997,7 +997,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     rHWrt.nFirstLineIndent = 0;
 }
 
-void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
+void OutHTML_SwFormatOff( Writer& rWrt, const SwHTMLTextCollOutputInfo& rInfo )
 {
     SwHTMLWriter & rHWrt = static_cast<SwHTMLWriter&>(rWrt);
 
@@ -1116,7 +1116,7 @@ class HTMLEndPosLst
     SwDoc *pDoc;            // das aktuelle Dokument
     SwDoc* pTemplate;       // die HTML-Vorlage (oder 0)
     const Color* pDfltColor;// die Default-Vordergrund-Farbe
-    std::set<OUString>& rScriptTxtStyles;
+    std::set<OUString>& rScriptTextStyles;
 
     sal_uLong nHTMLMode;
     bool bOutStyles : 1;    // werden Styles exportiert
@@ -1155,11 +1155,11 @@ class HTMLEndPosLst
 
     // Insert without taking care of script
     void InsertNoScript( const SfxPoolItem& rItem, sal_Int32 nStart,
-                          sal_Int32 nEnd, SwHTMLFmtInfos& rFmtInfos,
+                          sal_Int32 nEnd, SwHTMLFormatInfos& rFormatInfos,
                          bool bParaAttrs=false );
 
-    const SwHTMLFmtInfo *GetFmtInfo( const SwFmt& rFmt,
-                                     SwHTMLFmtInfos& rFmtInfos );
+    const SwHTMLFormatInfo *GetFormatInfo( const SwFormat& rFormat,
+                                     SwHTMLFormatInfos& rFormatInfos );
 
 public:
 
@@ -1170,12 +1170,12 @@ public:
 
     // Ein Attribut einfuegen
     void Insert( const SfxPoolItem& rItem, sal_Int32 nStart,  sal_Int32 nEnd,
-                 SwHTMLFmtInfos& rFmtInfos, bool bParaAttrs=false );
+                 SwHTMLFormatInfos& rFormatInfos, bool bParaAttrs=false );
     void Insert( const SfxItemSet& rItemSet, sal_Int32 nStart, sal_Int32 nEnd,
-                 SwHTMLFmtInfos& rFmtInfos, bool bDeep,
+                 SwHTMLFormatInfos& rFormatInfos, bool bDeep,
                  bool bParaAttrs=false );
-    void Insert( const SwDrawFrmFmt& rFmt, sal_Int32 nPos,
-                 SwHTMLFmtInfos& rFmtInfos );
+    void Insert( const SwDrawFrameFormat& rFormat, sal_Int32 nPos,
+                 SwHTMLFormatInfos& rFormatInfos );
 
     sal_uInt16 GetScriptAtPos( sal_Int32 nPos,
                                sal_uInt16 nWeak=CSS1_OUTMODE_ANY_SCRIPT );
@@ -1611,26 +1611,26 @@ void HTMLEndPosLst::SplitItem( const SfxPoolItem& rItem, sal_Int32 nStart,
     }
 }
 
-const SwHTMLFmtInfo *HTMLEndPosLst::GetFmtInfo( const SwFmt& rFmt,
-                                                SwHTMLFmtInfos& rFmtInfos )
+const SwHTMLFormatInfo *HTMLEndPosLst::GetFormatInfo( const SwFormat& rFormat,
+                                                SwHTMLFormatInfos& rFormatInfos )
 {
-    SwHTMLFmtInfo *pFmtInfo;
-    const SwHTMLFmtInfo aFmtInfo( &rFmt );
-    SwHTMLFmtInfos::iterator it = rFmtInfos.find( aFmtInfo );
-    if( it != rFmtInfos.end() )
+    SwHTMLFormatInfo *pFormatInfo;
+    const SwHTMLFormatInfo aFormatInfo( &rFormat );
+    SwHTMLFormatInfos::iterator it = rFormatInfos.find( aFormatInfo );
+    if( it != rFormatInfos.end() )
     {
-        pFmtInfo = &*it;
+        pFormatInfo = &*it;
     }
     else
     {
-        pFmtInfo = new SwHTMLFmtInfo( &rFmt, pDoc, pTemplate,
+        pFormatInfo = new SwHTMLFormatInfo( &rFormat, pDoc, pTemplate,
                                       bOutStyles );
-        rFmtInfos.insert( pFmtInfo );
-        if ( rScriptTxtStyles.count( rFmt.GetName() ) )
-            pFmtInfo->bScriptDependent = true;
+        rFormatInfos.insert( pFormatInfo );
+        if ( rScriptTextStyles.count( rFormat.GetName() ) )
+            pFormatInfo->bScriptDependent = true;
     }
 
-    return pFmtInfo;
+    return pFormatInfo;
 }
 
 HTMLEndPosLst::HTMLEndPosLst( SwDoc *pD, SwDoc* pTempl,
@@ -1640,7 +1640,7 @@ HTMLEndPosLst::HTMLEndPosLst( SwDoc *pD, SwDoc* pTempl,
     pDoc( pD ),
     pTemplate( pTempl ),
     pDfltColor( pDfltCol ),
-    rScriptTxtStyles( rStyles ),
+    rScriptTextStyles( rStyles ),
     nHTMLMode( nMode ),
     bOutStyles( bStyles )
 {
@@ -1663,7 +1663,7 @@ HTMLEndPosLst::~HTMLEndPosLst()
 
 void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
                             sal_Int32 nStart, sal_Int32 nEnd,
-                            SwHTMLFmtInfos& rFmtInfos, bool bParaAttrs )
+                            SwHTMLFormatInfos& rFormatInfos, bool bParaAttrs )
 {
     // kein Bereich ?? dann nicht aufnehmen, wird nie wirksam !!
     if( nStart != nEnd )
@@ -1711,30 +1711,30 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
             {
                 OSL_ENSURE( RES_TXTATR_CHARFMT == rItem.Which(),
                         "Doch keine Zeichen-Vorlage" );
-                const SwFmtCharFmt& rChrFmt = static_cast<const SwFmtCharFmt&>(rItem);
-                const SwCharFmt* pFmt = rChrFmt.GetCharFmt();
+                const SwFormatCharFormat& rChrFormat = static_cast<const SwFormatCharFormat&>(rItem);
+                const SwCharFormat* pFormat = rChrFormat.GetCharFormat();
 
-                const SwHTMLFmtInfo *pFmtInfo = GetFmtInfo( *pFmt, rFmtInfos );
-                if( !pFmtInfo->aToken.isEmpty() )
+                const SwHTMLFormatInfo *pFormatInfo = GetFormatInfo( *pFormat, rFormatInfos );
+                if( !pFormatInfo->aToken.isEmpty() )
                 {
                     // das Zeichenvorlagen-Tag muss vor den harten
                     // Attributen ausgegeben werden
                     InsertItem( rItem, nStart, nEnd );
                 }
-                if( pFmtInfo->pItemSet )
+                if( pFormatInfo->pItemSet )
                 {
-                    Insert( *pFmtInfo->pItemSet, nStart, nEnd,
-                            rFmtInfos, true, bParaAttrs );
+                    Insert( *pFormatInfo->pItemSet, nStart, nEnd,
+                            rFormatInfos, true, bParaAttrs );
                 }
             }
             break;
 
         case HTML_AUTOFMT_VALUE:
             {
-                const SwFmtAutoFmt& rAutoFmt = static_cast<const SwFmtAutoFmt&>(rItem);
-                const std::shared_ptr<SfxItemSet> pSet = rAutoFmt.GetStyleHandle();
+                const SwFormatAutoFormat& rAutoFormat = static_cast<const SwFormatAutoFormat&>(rItem);
+                const std::shared_ptr<SfxItemSet> pSet = rAutoFormat.GetStyleHandle();
                 if( pSet.get() )
-                    Insert( *pSet.get(), nStart, nEnd, rFmtInfos, true, bParaAttrs );
+                    Insert( *pSet.get(), nStart, nEnd, rFormatInfos, true, bParaAttrs );
             }
             break;
 
@@ -1756,16 +1756,16 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
             {
                 OSL_ENSURE( RES_PARATR_DROP == rItem.Which(),
                         "Doch kein Drop-Cap" );
-                const SwFmtDrop& rDrop = static_cast<const SwFmtDrop&>(rItem);
+                const SwFormatDrop& rDrop = static_cast<const SwFormatDrop&>(rItem);
                 nEnd = nStart + rDrop.GetChars();
                 if( !bOutStyles )
                 {
                     // Zumindest die Attribute der Zeichenvorlage uebernehmen
-                    const SwCharFmt *pCharFmt = rDrop.GetCharFmt();
-                    if( pCharFmt )
+                    const SwCharFormat *pCharFormat = rDrop.GetCharFormat();
+                    if( pCharFormat )
                     {
-                        Insert( pCharFmt->GetAttrSet(), nStart, nEnd,
-                                rFmtInfos, true, bParaAttrs );
+                        Insert( pCharFormat->GetAttrSet(), nStart, nEnd,
+                                rFormatInfos, true, bParaAttrs );
                     }
                 }
                 else
@@ -1787,7 +1787,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
 
 void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
                             sal_Int32 nStart, sal_Int32 nEnd,
-                            SwHTMLFmtInfos& rFmtInfos, bool bParaAttrs )
+                            SwHTMLFormatInfos& rFormatInfos, bool bParaAttrs )
 {
     bool bDependsOnScript = false, bDependsOnAnyScript = false;
     sal_uInt16 nScript = i18n::ScriptType::LATIN;
@@ -1821,10 +1821,10 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
         break;
     case RES_TXTATR_CHARFMT:
         {
-            const SwFmtCharFmt& rChrFmt = static_cast<const SwFmtCharFmt&>(rItem);
-            const SwCharFmt* pFmt = rChrFmt.GetCharFmt();
-            const SwHTMLFmtInfo *pFmtInfo = GetFmtInfo( *pFmt, rFmtInfos );
-            if( pFmtInfo->bScriptDependent )
+            const SwFormatCharFormat& rChrFormat = static_cast<const SwFormatCharFormat&>(rItem);
+            const SwCharFormat* pFormat = rChrFormat.GetCharFormat();
+            const SwHTMLFormatInfo *pFormatInfo = GetFormatInfo( *pFormat, rFormatInfos );
+            if( pFormatInfo->bScriptDependent )
             {
                 bDependsOnScript = true;
                 bDependsOnAnyScript = true;
@@ -1833,10 +1833,10 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
         break;
     case RES_TXTATR_INETFMT:
         {
-            if( GetFmtInfo( *pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
-                     RES_POOLCHR_INET_NORMAL), rFmtInfos )->bScriptDependent ||
-                GetFmtInfo( *pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
-                     RES_POOLCHR_INET_VISIT), rFmtInfos )->bScriptDependent )
+            if( GetFormatInfo( *pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
+                     RES_POOLCHR_INET_NORMAL), rFormatInfos )->bScriptDependent ||
+                GetFormatInfo( *pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
+                     RES_POOLCHR_INET_VISIT), rFormatInfos )->bScriptDependent )
             {
                 bDependsOnScript = true;
                 bDependsOnAnyScript = true;
@@ -1863,7 +1863,7 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
                 // change, so we can insert it, but only if it belongs
                 // to the current script.
                 if( bDependsOnAnyScript || nScript == aScriptLst[i] )
-                    InsertNoScript( rItem, nPos, nEnd, rFmtInfos,
+                    InsertNoScript( rItem, nPos, nEnd, rFormatInfos,
                                     bParaAttrs );
                 break;
             }
@@ -1872,19 +1872,19 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
             // it, so we can insert a hint up to the next script change and
             // continue with the rest of the hint.
             if( bDependsOnAnyScript || nScript == aScriptLst[i] )
-                InsertNoScript( rItem, nPos, nChgPos, rFmtInfos, bParaAttrs );
+                InsertNoScript( rItem, nPos, nChgPos, rFormatInfos, bParaAttrs );
             nPos = nChgPos;
         }
     }
     else
     {
-        InsertNoScript( rItem, nStart, nEnd, rFmtInfos, bParaAttrs );
+        InsertNoScript( rItem, nStart, nEnd, rFormatInfos, bParaAttrs );
     }
 }
 
 void HTMLEndPosLst::Insert( const SfxItemSet& rItemSet,
                             sal_Int32 nStart, sal_Int32 nEnd,
-                            SwHTMLFmtInfos& rFmtInfos,
+                            SwHTMLFormatInfos& rFormatInfos,
                             bool bDeep, bool bParaAttrs )
 {
     SfxWhichIter aIter( rItemSet );
@@ -1895,30 +1895,30 @@ void HTMLEndPosLst::Insert( const SfxItemSet& rItemSet,
         const SfxPoolItem *pItem;
         if( SfxItemState::SET == rItemSet.GetItemState( nWhich, bDeep, &pItem ) )
         {
-            Insert( *pItem, nStart, nEnd, rFmtInfos, bParaAttrs );
+            Insert( *pItem, nStart, nEnd, rFormatInfos, bParaAttrs );
         }
 
         nWhich = aIter.NextWhich();
     }
 }
 
-void HTMLEndPosLst::Insert( const SwDrawFrmFmt& rFmt, sal_Int32 nPos,
-                            SwHTMLFmtInfos& rFmtInfos )
+void HTMLEndPosLst::Insert( const SwDrawFrameFormat& rFormat, sal_Int32 nPos,
+                            SwHTMLFormatInfos& rFormatInfos )
 {
-    const SdrObject* pTextObj = SwHTMLWriter::GetMarqueeTextObj( rFmt );
+    const SdrObject* pTextObj = SwHTMLWriter::GetMarqueeTextObj( rFormat );
 
     if( pTextObj )
     {
         // die Edit-Engine-Attribute des Objekts als SW-Attribute holen
         // und als Hints einsortieren. Wegen der Menge der Hints werden
         // Styles hierbei nicht beruecksichtigt!
-        const SfxItemSet& rFmtItemSet = rFmt.GetAttrSet();
-        SfxItemSet aItemSet( *rFmtItemSet.GetPool(), RES_CHRATR_BEGIN,
+        const SfxItemSet& rFormatItemSet = rFormat.GetAttrSet();
+        SfxItemSet aItemSet( *rFormatItemSet.GetPool(), RES_CHRATR_BEGIN,
                                                      RES_CHRATR_END );
         SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, pTextObj, true );
         bool bOutStylesOld = bOutStyles;
         bOutStyles = false;
-        Insert( aItemSet, nPos, nPos+1, rFmtInfos, false, false );
+        Insert( aItemSet, nPos, nPos+1, rFormatInfos, false, false );
         bOutStyles = bOutStylesOld;
     }
 }
@@ -2060,21 +2060,21 @@ void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
 }
 
 /* Ausgabe der Nodes */
-Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
+Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
 {
-    const SwTxtNode * pNd = &static_cast<const SwTxtNode&>(rNode);
+    const SwTextNode * pNd = &static_cast<const SwTextNode&>(rNode);
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const OUString& rStr = pNd->GetTxt();
+    const OUString& rStr = pNd->GetText();
     sal_Int32 nEnd = rStr.getLength();
 
     // Besonderheit: leere Node und HR-Vorlage (horizontaler Strich)
     //              nur ein <HR> ausgeben
-    sal_uInt16 nPoolId = pNd->GetAnyFmtColl().GetPoolFmtId();
+    sal_uInt16 nPoolId = pNd->GetAnyFormatColl().GetPoolFormatId();
 
     // Handle horizontal rule <hr>
     if (!nEnd &&
-        (RES_POOLCOLL_HTML_HR==nPoolId || pNd->GetAnyFmtColl().GetName() == OOO_STRING_SVTOOLS_HTML_horzrule))
+        (RES_POOLCOLL_HTML_HR==nPoolId || pNd->GetAnyFormatColl().GetName() == OOO_STRING_SVTOOLS_HTML_horzrule))
     {
         // dann die absatz-gebundenen Grafiken/OLE-Objekte im Absatz
         // MIB 8.7.97: Ein <PRE> spannen wir um die Linie auf. Dann stimmen
@@ -2106,25 +2106,25 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
             sal_Int32 nRight = static_cast<const SvxLRSpaceItem*>(pItem)->GetRight();
             if( nLeft || nRight )
             {
-                const SwFrmFmt& rPgFmt =
+                const SwFrameFormat& rPgFormat =
                     rHTMLWrt.pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool
                     ( RES_POOLPAGE_HTML, false )->GetMaster();
-                const SwFmtFrmSize& rSz   = rPgFmt.GetFrmSize();
-                const SvxLRSpaceItem& rLR = rPgFmt.GetLRSpace();
-                const SwFmtCol& rCol = rPgFmt.GetCol();
+                const SwFormatFrmSize& rSz   = rPgFormat.GetFrmSize();
+                const SvxLRSpaceItem& rLR = rPgFormat.GetLRSpace();
+                const SwFormatCol& rCol = rPgFormat.GetCol();
 
                 long nPageWidth = rSz.GetWidth() - rLR.GetLeft() - rLR.GetRight();
 
                 if( 1 < rCol.GetNumCols() )
                     nPageWidth /= rCol.GetNumCols();
 
-                const SwTableNode* pTblNd = pNd->FindTableNode();
-                if( pTblNd )
+                const SwTableNode* pTableNd = pNd->FindTableNode();
+                if( pTableNd )
                 {
-                    const SwTableBox* pBox = pTblNd->GetTable().GetTblBox(
+                    const SwTableBox* pBox = pTableNd->GetTable().GetTableBox(
                                     pNd->StartOfSectionIndex() );
                     if( pBox )
-                        nPageWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
+                        nPageWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
                 }
 
                 OString sWidth = OString::number(SwHTMLWriter::ToPixel(nPageWidth - nLeft - nRight, false));
@@ -2217,13 +2217,13 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
         if( pItemSet )
         {
             if( SfxItemState::SET == pItemSet->GetItemState( RES_PAGEDESC, true, &pItem ) &&
-                static_cast<const SwFmtPageDesc *>(pItem)->GetPageDesc() )
+                static_cast<const SwFormatPageDesc *>(pItem)->GetPageDesc() )
             {
                 bPageBreakBefore = true;
             }
             else if( SfxItemState::SET == pItemSet->GetItemState( RES_BREAK, true, &pItem ) )
             {
-                switch( static_cast<const SvxFmtBreakItem *>(pItem)->GetBreak() )
+                switch( static_cast<const SvxFormatBreakItem *>(pItem)->GetBreak() )
                 {
                 case SVX_BREAK_PAGE_BEFORE:
                     bPageBreakBefore = true;
@@ -2267,10 +2267,10 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
     rHTMLWrt.bTagOn = true;
 
     // jetzt das Tag des Absatzes ausgeben
-    const SwFmt& rFmt = pNd->GetAnyFmtColl();
-    SwHTMLTxtCollOutputInfo aFmtInfo;
+    const SwFormat& rFormat = pNd->GetAnyFormatColl();
+    SwHTMLTextCollOutputInfo aFormatInfo;
     bool bOldLFPossible = rHTMLWrt.bLFPossible;
-    OutHTML_SwFmt( rWrt, rFmt, pNd->GetpSwAttrSet(), aFmtInfo );
+    OutHTML_SwFormat( rWrt, rFormat, pNd->GetpSwAttrSet(), aFormatInfo );
 
     // Wenn vor dem Absatz-Tag keine neue Zeile aufgemacht wurde, dann
     // tun wir das jetzt
@@ -2293,7 +2293,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
 
     // Text, der aus einer Outline-Numerierung kommt ermitteln
     sal_Int32 nOffset = 0;
-    OUString aOutlineTxt;
+    OUString aOutlineText;
     OUString aFullText;
 
     // export numbering string as plain text only for the outline numbering,
@@ -2301,14 +2301,14 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
     if ( pNd->IsOutline() &&
          pNd->GetNumRule() == pNd->GetDoc()->GetOutlineNumRule() )
     {
-        aOutlineTxt = pNd->GetNumString();
-        nOffset = nOffset + aOutlineTxt.getLength();
-        aFullText = aOutlineTxt;
+        aOutlineText = pNd->GetNumString();
+        nOffset = nOffset + aOutlineText.getLength();
+        aFullText = aOutlineText;
     }
     OUString aFootEndNoteSym;
-    if( rHTMLWrt.pFmtFtn )
+    if( rHTMLWrt.pFormatFootnote )
     {
-        aFootEndNoteSym = rHTMLWrt.GetFootEndNoteSym( *rHTMLWrt.pFmtFtn );
+        aFootEndNoteSym = rHTMLWrt.GetFootEndNoteSym( *rHTMLWrt.pFormatFootnote );
         nOffset = nOffset + aFootEndNoteSym.getLength();
         aFullText += aFootEndNoteSym;
     }
@@ -2325,13 +2325,13 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                               rHTMLWrt.pDfltColor, rHTMLWrt.bCfgOutStyles,
                               rHTMLWrt.GetHTMLMode(), aFullText,
                                  rHTMLWrt.aScriptTextStyles );
-    if( aFmtInfo.pItemSet )
+    if( aFormatInfo.pItemSet )
     {
-        aEndPosLst.Insert( *aFmtInfo.pItemSet, 0, nEnd + nOffset,
-                           rHTMLWrt.aChrFmtInfos, false, true );
+        aEndPosLst.Insert( *aFormatInfo.pItemSet, 0, nEnd + nOffset,
+                           rHTMLWrt.aChrFormatInfos, false, true );
     }
 
-    if( !aOutlineTxt.isEmpty() || rHTMLWrt.pFmtFtn )
+    if( !aOutlineText.isEmpty() || rHTMLWrt.pFormatFootnote )
     {
         // Absatz-Attribute ausgeben, damit der Text die Attribute des
         // Absatzes bekommt.
@@ -2341,25 +2341,25 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
         // beachten. Da man die ueber die UI nicht setzen kann, ignorieren
         // wir sie erstmal.
 
-        if( !aOutlineTxt.isEmpty() )
-            HTMLOutFuncs::Out_String( rWrt.Strm(), aOutlineTxt,
+        if( !aOutlineText.isEmpty() )
+            HTMLOutFuncs::Out_String( rWrt.Strm(), aOutlineText,
                                          rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters);
 
-        if( rHTMLWrt.pFmtFtn )
+        if( rHTMLWrt.pFormatFootnote )
         {
-            rHTMLWrt.OutFootEndNoteSym( *rHTMLWrt.pFmtFtn, aFootEndNoteSym,
-                                        aEndPosLst.GetScriptAtPos( aOutlineTxt.getLength(), rHTMLWrt.nCSS1Script ) );
-            rHTMLWrt.pFmtFtn = 0;
+            rHTMLWrt.OutFootEndNoteSym( *rHTMLWrt.pFormatFootnote, aFootEndNoteSym,
+                                        aEndPosLst.GetScriptAtPos( aOutlineText.getLength(), rHTMLWrt.nCSS1Script ) );
+            rHTMLWrt.pFormatFootnote = 0;
         }
     }
 
     // erstmal den Start berichtigen. D.h. wird nur ein Teil vom Satz
     // ausgegeben, so muessen auch da die Attribute stimmen!!
-    rHTMLWrt.bTxtAttr = true;
+    rHTMLWrt.bTextAttr = true;
 
     size_t nAttrPos = 0;
     sal_Int32 nStrPos = rHTMLWrt.pCurPam->GetPoint()->nContent.GetIndex();
-    const SwTxtAttr * pHt = 0;
+    const SwTextAttr * pHt = 0;
     const size_t nCntAttr = pNd->HasHints() ? pNd->GetSwpHints().Count() : 0;
     if( nCntAttr && nStrPos > ( pHt = pNd->GetSwpHints()[ 0 ] )->GetStart() )
     {
@@ -2387,14 +2387,14 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                 if( rHTMLWrt.bWriteAll )
                     aEndPosLst.Insert( pHt->GetAttr(), nHtStt + nOffset,
                                        nHtEnd + nOffset,
-                                       rHTMLWrt.aChrFmtInfos );
+                                       rHTMLWrt.aChrFormatInfos );
                 else
                 {
                     sal_Int32 nTmpStt = nHtStt < nStrPos ? nStrPos : nHtStt;
                     sal_Int32 nTmpEnd = nHtEnd < nEnd ? nHtEnd : nEnd;
                     aEndPosLst.Insert( pHt->GetAttr(), nTmpStt + nOffset,
                                        nTmpEnd + nOffset,
-                                       rHTMLWrt.aChrFmtInfos );
+                                       rHTMLWrt.aChrFormatInfos );
                 }
                 continue;
                 // aber nicht ausgeben, das erfolgt spaeter !!
@@ -2428,7 +2428,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
             }
 
             bool bOutChar = true;
-            const SwTxtAttr * pTxtHt = 0;
+            const SwTextAttr * pTextHt = 0;
             if( nAttrPos < nCntAttr && pHt->GetStart() == nStrPos
                 && nStrPos != nEnd )
             {
@@ -2442,24 +2442,24 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                             // Bereich aufspannen werden ignoriert
                             aEndPosLst.Insert( pHt->GetAttr(), nStrPos + nOffset,
                                                *pHt->End() + nOffset,
-                                               rHTMLWrt.aChrFmtInfos );
+                                               rHTMLWrt.aChrFormatInfos );
                         }
                     }
                     else
                     {
                         // Hints ohne-Ende werden als letztes ausgebeben
-                        OSL_ENSURE( !pTxtHt, "Wieso gibt es da schon ein Attribut ohne Ende?" );
-                        if( rHTMLWrt.nTxtAttrsToIgnore>0 )
+                        OSL_ENSURE( !pTextHt, "Wieso gibt es da schon ein Attribut ohne Ende?" );
+                        if( rHTMLWrt.nTextAttrsToIgnore>0 )
                         {
-                            rHTMLWrt.nTxtAttrsToIgnore--;
+                            rHTMLWrt.nTextAttrsToIgnore--;
                         }
                         else
                         {
-                            pTxtHt = pHt;
-                            sal_uInt16 nFldWhich;
+                            pTextHt = pHt;
+                            sal_uInt16 nFieldWhich;
                             if( RES_TXTATR_FIELD != pHt->Which()
-                                || ( RES_POSTITFLD != (nFldWhich = static_cast<const SwFmtFld&>(pHt->GetAttr()).GetField()->Which())
-                                     && RES_SCRIPTFLD != nFldWhich ) )
+                                || ( RES_POSTITFLD != (nFieldWhich = static_cast<const SwFormatField&>(pHt->GetAttr()).GetField()->Which())
+                                     && RES_SCRIPTFLD != nFieldWhich ) )
                             {
                                 bWriteBreak = false;
                             }
@@ -2471,21 +2471,21 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
             }
 
             // Manche Draw-Formate koennen auch noch Attribute mitbringen
-            if( pTxtHt && RES_TXTATR_FLYCNT == pTxtHt->Which() )
+            if( pTextHt && RES_TXTATR_FLYCNT == pTextHt->Which() )
             {
-                const SwFrmFmt* pFrmFmt =
-                    static_cast<const SwFmtFlyCnt &>(pTxtHt->GetAttr()).GetFrmFmt();
+                const SwFrameFormat* pFrameFormat =
+                    static_cast<const SwFormatFlyCnt &>(pTextHt->GetAttr()).GetFrameFormat();
 
-                if( RES_DRAWFRMFMT == pFrmFmt->Which() )
-                    aEndPosLst.Insert( *static_cast<const SwDrawFrmFmt *>(pFrmFmt),
+                if( RES_DRAWFRMFMT == pFrameFormat->Which() )
+                    aEndPosLst.Insert( *static_cast<const SwDrawFrameFormat *>(pFrameFormat),
                                         nStrPos + nOffset,
-                                        rHTMLWrt.aChrFmtInfos );
+                                        rHTMLWrt.aChrFormatInfos );
             }
 
             aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset, &aContext );
             aEndPosLst.OutStartAttrs( rHTMLWrt, nStrPos + nOffset, &aContext );
 
-            if( pTxtHt )
+            if( pTextHt )
             {
                 rHTMLWrt.bLFPossible = !rHTMLWrt.nLastParaToken && nStrPos > 0 &&
                                        rStr[nStrPos-1] == ' ';
@@ -2493,7 +2493,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                 rHTMLWrt.nCSS1Script = aEndPosLst.GetScriptAtPos(
                                                 nStrPos + nOffset, nCSS1Script );
                 HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext );
-                Out( aHTMLAttrFnTab, pTxtHt->GetAttr(), rHTMLWrt );
+                Out( aHTMLAttrFnTab, pTextHt->GetAttr(), rHTMLWrt );
                 rHTMLWrt.nCSS1Script = nCSS1Script;
                 rHTMLWrt.bLFPossible = false;
             }
@@ -2586,7 +2586,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                                        nEnd, HTML_POS_INSIDE );
     OSL_ENSURE( !bFlysLeft, "Es wurden nicht alle Rahmen gespeichert!" );
 
-    rHTMLWrt.bTxtAttr = false;
+    rHTMLWrt.bTextAttr = false;
 
     if( bWriteBreak )
     {
@@ -2656,7 +2656,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
     }
 
     rHTMLWrt.bTagOn = false;
-    OutHTML_SwFmtOff( rWrt, aFmtInfo );
+    OutHTML_SwFormatOff( rWrt, aFormatInfo );
 
     // eventuell eine Form schliessen
     rHTMLWrt.OutForm( false );
@@ -2685,7 +2685,7 @@ static Writer& OutHTML_CSS1Attr( Writer& rWrt, const SfxPoolItem& rHt )
     // wenn gerade Hints geschrieben werden versuchen wir den Hint als
     // CSS1-Attribut zu schreiben
 
-    if( static_cast<SwHTMLWriter&>(rWrt).bCfgOutStyles && static_cast<SwHTMLWriter&>(rWrt).bTxtAttr )
+    if( static_cast<SwHTMLWriter&>(rWrt).bCfgOutStyles && static_cast<SwHTMLWriter&>(rWrt).bTextAttr )
         OutCSS1_HintSpanTag( rWrt, rHt );
 
     return rWrt;
@@ -2699,7 +2699,7 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
     if( rHTMLWrt.bOutOpts )
         return rWrt;
 
-    if( !rHTMLWrt.bTxtAttr && rHTMLWrt.bCfgOutStyles && rHTMLWrt.bCfgPreferStyles )
+    if( !rHTMLWrt.bTextAttr && rHTMLWrt.bCfgOutStyles && rHTMLWrt.bCfgPreferStyles )
     {
         // Font-Farbe nicht als Tag schreiben, wenn Styles normalen Tags
         // vorgezogen werden
@@ -2734,7 +2734,7 @@ static Writer& OutHTML_SwPosture( Writer& rWrt, const SfxPoolItem& rHt )
     {
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_italic, rHTMLWrt.bTagOn );
     }
-    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
     {
         // vielleicht als CSS1-Attribut ?
         OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2782,7 +2782,7 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt )
             OString::number(static_cast<sal_Int32>(nSize)) + "\"";
         rWrt.Strm().WriteOString( sOut );
 
-        if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+        if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
         {
             // always export font size as CSS option, too
             OutCSS1_HintStyleOpt( rWrt, rHt );
@@ -2832,7 +2832,7 @@ static Writer& OutHTML_SwWeight( Writer& rWrt, const SfxPoolItem& rHt )
     {
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_bold, rHTMLWrt.bTagOn );
     }
-    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
     {
         // vielleicht als CSS1-Attribut ?
         OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2853,7 +2853,7 @@ static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt )
     {
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_strike, rHTMLWrt.bTagOn );
     }
-    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
     {
         // vielleicht als CSS1-Attribut ?
         OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2883,7 +2883,7 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt )
     {
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, rHTMLWrt.bTagOn );
     }
-    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
     {
         // vielleicht als CSS1-Attribut ?
         OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2903,7 +2903,7 @@ static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt )
     {
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_underline, rHTMLWrt.bTagOn );
     }
-    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
     {
         // vielleicht als CSS1-Attribut ?
         OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2915,15 +2915,15 @@ static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt )
 static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
-    const SwFmtFlyCnt& rFlyCnt = static_cast<const SwFmtFlyCnt&>(rHt);
+    const SwFormatFlyCnt& rFlyCnt = static_cast<const SwFormatFlyCnt&>(rHt);
 
-    const SwFrmFmt& rFmt = *rFlyCnt.GetFrmFmt();
+    const SwFrameFormat& rFormat = *rFlyCnt.GetFrameFormat();
     const SdrObject *pSdrObj = 0;
 
     SwHTMLFrmType eType =
-        (SwHTMLFrmType)rHTMLWrt.GuessFrmType( rFmt, pSdrObj );
+        (SwHTMLFrmType)rHTMLWrt.GuessFrmType( rFormat, pSdrObj );
     sal_uInt8 nMode = aHTMLOutFrmAsCharTable[eType][rHTMLWrt.nExportMode];
-    rHTMLWrt.OutFrmFmt( nMode, rFmt, pSdrObj );
+    rHTMLWrt.OutFrameFormat( nMode, rFormat, pSdrObj );
     return rWrt;
 }
 
@@ -2939,7 +2939,7 @@ static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt )
     {
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_blink, rHTMLWrt.bTagOn );
     }
-    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
+    else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTextAttr )
     {
         // vielleicht als CSS1-Attribut ?
         OutCSS1_HintSpanTag( rWrt, rHt );
@@ -2948,16 +2948,16 @@ static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt )
     return rWrt;
 }
 
-Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, bool bOn )
+Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat, bool bOn )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    OUString aURL( rINetFmt.GetValue() );
-    const SvxMacroTableDtor *pMacTable = rINetFmt.GetMacroTbl();
+    OUString aURL( rINetFormat.GetValue() );
+    const SvxMacroTableDtor *pMacTable = rINetFormat.GetMacroTable();
     bool bEvents = pMacTable != 0 && !pMacTable->empty();
 
     // Anything to output at all?
-    if( aURL.isEmpty() && !bEvents && rINetFmt.GetName().isEmpty() )
+    if( aURL.isEmpty() && !bEvents && rINetFormat.GetName().isEmpty() )
         return rWrt;
 
     // bOn controls if we are writing the opening or closing tag
@@ -2971,22 +2971,22 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, bool bOn )
 
     bool bScriptDependent = false;
     {
-        const SwCharFmt* pFmt = rWrt.pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
+        const SwCharFormat* pFormat = rWrt.pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
                  RES_POOLCHR_INET_NORMAL );
-        SwHTMLFmtInfo aFmtInfo( pFmt );
-        SwHTMLFmtInfos::const_iterator it = rHTMLWrt.aChrFmtInfos.find( aFmtInfo );
-        if( it != rHTMLWrt.aChrFmtInfos.end() )
+        SwHTMLFormatInfo aFormatInfo( pFormat );
+        SwHTMLFormatInfos::const_iterator it = rHTMLWrt.aChrFormatInfos.find( aFormatInfo );
+        if( it != rHTMLWrt.aChrFormatInfos.end() )
         {
             bScriptDependent = it->bScriptDependent;
         }
     }
     if( !bScriptDependent )
     {
-        const SwCharFmt* pFmt = rWrt.pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool(
+        const SwCharFormat* pFormat = rWrt.pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
                  RES_POOLCHR_INET_VISIT );
-        SwHTMLFmtInfo aFmtInfo( pFmt );
-        SwHTMLFmtInfos::const_iterator it = rHTMLWrt.aChrFmtInfos.find( aFmtInfo );
-        if( it != rHTMLWrt.aChrFmtInfos.end() )
+        SwHTMLFormatInfo aFormatInfo( pFormat );
+        SwHTMLFormatInfos::const_iterator it = rHTMLWrt.aChrFormatInfos.find( aFormatInfo );
+        if( it != rHTMLWrt.aChrFormatInfos.end() )
         {
             bScriptDependent = it->bScriptDependent;
         }
@@ -3033,16 +3033,16 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, bool bOn )
         sOut = "\"";
     }
 
-    if( !rINetFmt.GetName().isEmpty() )
+    if( !rINetFormat.GetName().isEmpty() )
     {
         sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"";
         rWrt.Strm().WriteOString( sOut );
-        HTMLOutFuncs::Out_String( rWrt.Strm(), rINetFmt.GetName(),
+        HTMLOutFuncs::Out_String( rWrt.Strm(), rINetFormat.GetName(),
                                   rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
         sOut = "\"";
     }
 
-    const OUString& rTarget = rINetFmt.GetTargetFrame();
+    const OUString& rTarget = rINetFormat.GetTargetFrame();
     if( !rTarget.isEmpty() )
     {
         sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_target) + "=\"";
@@ -3066,95 +3066,95 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, bool bOn )
     return rWrt;
 }
 
-static Writer& OutHTML_SwFmtINetFmt( Writer& rWrt, const SfxPoolItem& rHt )
+static Writer& OutHTML_SwFormatINetFormat( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
     if( rHTMLWrt.bOutOpts )
         return rWrt;
 
-    const SwFmtINetFmt& rINetFmt = static_cast<const SwFmtINetFmt&>(rHt);
+    const SwFormatINetFormat& rINetFormat = static_cast<const SwFormatINetFormat&>(rHt);
 
     if( rHTMLWrt.bTagOn )
     {
         // ggf. ein noch offenes Attribut voruebergehend beenden
-        if( rHTMLWrt.aINetFmts.size() )
+        if( rHTMLWrt.aINetFormats.size() )
         {
-            SwFmtINetFmt *pINetFmt =
-                rHTMLWrt.aINetFmts.back();
-            OutHTML_INetFmt( rWrt, *pINetFmt, false );
+            SwFormatINetFormat *pINetFormat =
+                rHTMLWrt.aINetFormats.back();
+            OutHTML_INetFormat( rWrt, *pINetFormat, false );
         }
 
         // jetzt das neue aufmachen
-        OutHTML_INetFmt( rWrt, rINetFmt, true );
+        OutHTML_INetFormat( rWrt, rINetFormat, true );
 
         // und merken
-        SwFmtINetFmt *pINetFmt = new SwFmtINetFmt( rINetFmt );
-        rHTMLWrt.aINetFmts.push_back( pINetFmt );
+        SwFormatINetFormat *pINetFormat = new SwFormatINetFormat( rINetFormat );
+        rHTMLWrt.aINetFormats.push_back( pINetFormat );
     }
     else
     {
         // das
-        OutHTML_INetFmt( rWrt, rINetFmt, false );
+        OutHTML_INetFormat( rWrt, rINetFormat, false );
 
-        OSL_ENSURE( rHTMLWrt.aINetFmts.size(), "da fehlt doch ein URL-Attribut" );
-        if( rHTMLWrt.aINetFmts.size() )
+        OSL_ENSURE( rHTMLWrt.aINetFormats.size(), "da fehlt doch ein URL-Attribut" );
+        if( rHTMLWrt.aINetFormats.size() )
         {
             // das eigene Attribut vom Stack holen
-            SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back();
-            rHTMLWrt.aINetFmts.pop_back();
-            delete pINetFmt;
+            SwFormatINetFormat *pINetFormat = rHTMLWrt.aINetFormats.back();
+            rHTMLWrt.aINetFormats.pop_back();
+            delete pINetFormat;
         }
 
-        if( !rHTMLWrt.aINetFmts.empty() )
+        if( !rHTMLWrt.aINetFormats.empty() )
         {
             // es ist noch ein Attribut auf dem Stack, das wieder geoeffnet
             // werden muss
-            SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back();
-            OutHTML_INetFmt( rWrt, *pINetFmt, true );
+            SwFormatINetFormat *pINetFormat = rHTMLWrt.aINetFormats.back();
+            OutHTML_INetFormat( rWrt, *pINetFormat, true );
         }
     }
 
     return rWrt;
 }
 
-static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
+static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
     if( rHTMLWrt.bOutOpts )
         return rWrt;
 
-    const SwFmtCharFmt& rChrFmt = static_cast<const SwFmtCharFmt&>(rHt);
-    const SwCharFmt* pFmt = rChrFmt.GetCharFmt();
+    const SwFormatCharFormat& rChrFormat = static_cast<const SwFormatCharFormat&>(rHt);
+    const SwCharFormat* pFormat = rChrFormat.GetCharFormat();
 
-    if( !pFmt )
+    if( !pFormat )
     {
         return rWrt;
     }
 
-    SwHTMLFmtInfo aFmtInfo( pFmt );
-    SwHTMLFmtInfos::const_iterator it = rHTMLWrt.aChrFmtInfos.find( aFmtInfo );
-    if( it == rHTMLWrt.aChrFmtInfos.end())
+    SwHTMLFormatInfo aFormatInfo( pFormat );
+    SwHTMLFormatInfos::const_iterator it = rHTMLWrt.aChrFormatInfos.find( aFormatInfo );
+    if( it == rHTMLWrt.aChrFormatInfos.end())
         return rWrt;
 
-    const SwHTMLFmtInfo *pFmtInfo = &*it;
-    OSL_ENSURE( pFmtInfo, "Wieso gint es keine Infos ueber die Zeichenvorlage?" );
+    const SwHTMLFormatInfo *pFormatInfo = &*it;
+    OSL_ENSURE( pFormatInfo, "Wieso gint es keine Infos ueber die Zeichenvorlage?" );
 
     if( rHTMLWrt.bTagOn )
     {
         OString sOut = "<";
-        if( !pFmtInfo->aToken.isEmpty() )
-            sOut += pFmtInfo->aToken;
+        if( !pFormatInfo->aToken.isEmpty() )
+            sOut += pFormatInfo->aToken;
         else
             sOut += OString(OOO_STRING_SVTOOLS_HTML_span);
 
         if( rHTMLWrt.bCfgOutStyles &&
-            (!pFmtInfo->aClass.isEmpty() || pFmtInfo->bScriptDependent) )
+            (!pFormatInfo->aClass.isEmpty() || pFormatInfo->bScriptDependent) )
         {
             sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_class) + "=\"";
             rWrt.Strm().WriteOString( sOut );
-            OUString aClass( pFmtInfo->aClass );
-            if( pFmtInfo->bScriptDependent )
+            OUString aClass( pFormatInfo->aClass );
+            if( pFormatInfo->bScriptDependent )
             {
                 if( !aClass.isEmpty() )
                    aClass += "-";
@@ -3181,7 +3181,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
     else
     {
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
-                !pFmtInfo->aToken.isEmpty() ? pFmtInfo->aToken.getStr()
+                !pFormatInfo->aToken.isEmpty() ? pFormatInfo->aToken.getStr()
                                        : OOO_STRING_SVTOOLS_HTML_span,
                 false );
     }
@@ -3275,16 +3275,16 @@ SwAttrFnTab aHTMLAttrFnTab = {
 /* RES_TXTATR_META */               0,
 /* RES_TXTATR_METAFIELD */          0,
 /* RES_TXTATR_AUTOFMT */            0,
-/* RES_TXTATR_INETFMT */            OutHTML_SwFmtINetFmt,
-/* RES_TXTATR_CHARFMT */            OutHTML_SwTxtCharFmt,
+/* RES_TXTATR_INETFMT */            OutHTML_SwFormatINetFormat,
+/* RES_TXTATR_CHARFMT */            OutHTML_SwTextCharFormat,
 /* RES_TXTATR_CJK_RUBY */           0,
 /* RES_TXTATR_UNKNOWN_CONTAINER */  0,
-/* RES_TXTATR_INPUTFIELD */         OutHTML_SwFmtFld,
+/* RES_TXTATR_INPUTFIELD */         OutHTML_SwFormatField,
 
-/* RES_TXTATR_FIELD */              OutHTML_SwFmtFld,
+/* RES_TXTATR_FIELD */              OutHTML_SwFormatField,
 /* RES_TXTATR_FLYCNT */             OutHTML_SwFlyCnt,
-/* RES_TXTATR_FTN */                OutHTML_SwFmtFtn,
-/* RES_TXTATR_ANNOTATION */         OutHTML_SwFmtFld,
+/* RES_TXTATR_FTN */                OutHTML_SwFormatFootnote,
+/* RES_TXTATR_ANNOTATION */         OutHTML_SwFormatField,
 /* RES_TXTATR_DUMMY3 */             0,
 /* RES_TXTATR_DUMMY1 */             0, // Dummy:
 /* RES_TXTATR_DUMMY2 */             0, // Dummy:
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 51ebc2f276d7..ec4143e5d38e 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -73,7 +73,7 @@ void SwHTMLParser::NewScript()
 void SwHTMLParser::EndScript()
 {
     bool bInsIntoBasic = false,
-         bInsSrcIntoFld = false;
+         bInsSrcIntoField = false;
 
     switch( eScriptLang )
     {
@@ -81,7 +81,7 @@ void SwHTMLParser::EndScript()
         bInsIntoBasic = true;
         break;
     default:
-        bInsSrcIntoFld = true;
+        bInsSrcIntoField = true;
         break;
     }
 
@@ -90,15 +90,15 @@ void SwHTMLParser::EndScript()
 
     // Ausser StarBasic und unbenutzem JavaScript jedes Script oder den
     // Modulnamen in einem Feld merken merken
-    if( bInsSrcIntoFld && !bIgnoreHTMLComments )
+    if( bInsSrcIntoField && !bIgnoreHTMLComments )
     {
         SwScriptFieldType *pType =
-            static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_SCRIPTFLD ));
+            static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_SCRIPTFLD ));
 
-        SwScriptField aFld( pType, aScriptType,
+        SwScriptField aField( pType, aScriptType,
                             !aScriptURL.isEmpty() ? aScriptURL : aScriptSource,
                             !aScriptURL.isEmpty() );
-        InsertAttr( SwFmtFld( aFld ) );
+        InsertAttr( SwFormatField( aField ) );
     }
 
     SwDocShell *pDocSh = pDoc->GetDocShell();
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 487549411f20..a756cdcae417 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -69,19 +69,19 @@ using namespace ::com::sun::star;
 #define MAX_DROPCAP_LINES 9
 #define MAX_DROPCAP_CHARS 9
 
-static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc );
+static void lcl_swcss1_setEncoding( SwFormat& rFormat, rtl_TextEncoding eEnc );
 
 // Implementierung des SwCSS1Parsers (eigentlich swcss1.cxx)
 static struct SwCSS1ItemIds
 {
-    sal_uInt16 nFmtBreak;
-    sal_uInt16 nFmtPageDesc;
-    sal_uInt16 nFmtKeep;
+    sal_uInt16 nFormatBreak;
+    sal_uInt16 nFormatPageDesc;
+    sal_uInt16 nFormatKeep;
 
     SwCSS1ItemIds() :
-        nFmtBreak( RES_BREAK ),
-        nFmtPageDesc( RES_PAGEDESC ),
-        nFmtKeep( RES_KEEP )
+        nFormatBreak( RES_BREAK ),
+        nFormatPageDesc( RES_PAGEDESC ),
+        nFormatKeep( RES_KEEP )
     {}
 
 } aItemIds;
@@ -109,9 +109,9 @@ SwCSS1Parser::SwCSS1Parser( SwDoc *pD, sal_uInt32 aFHeights[7], const OUString&
     bBodyVLinkSet( false ),
     bSetFirstPageDesc( false ),
     bSetRightPageDesc( false ),
-    bTableHeaderTxtCollSet( false ),
-    bTableTxtCollSet( false ),
-    bLinkCharFmtsSet( false )
+    bTableHeaderTextCollSet( false ),
+    bTableTextCollSet( false ),
+    bLinkCharFormatsSet( false )
 {
     aFontHeights[0] = aFHeights[0];
     aFontHeights[1] = aFHeights[1];
@@ -127,7 +127,7 @@ SwCSS1Parser::~SwCSS1Parser()
 }
 
 // Feature: PrintExt
-bool SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet,
+bool SwCSS1Parser::SetFormatBreak( SfxItemSet& rItemSet,
                                 const SvxCSS1PropertyInfo& rPropInfo )
 {
     SvxBreak eBreak = SVX_BREAK_NONE;
@@ -174,17 +174,17 @@ bool SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet,
     }
 
     if( bSetBreak )
-        rItemSet.Put( SvxFmtBreakItem( eBreak, RES_BREAK ) );
+        rItemSet.Put( SvxFormatBreakItem( eBreak, RES_BREAK ) );
     if( bSetPageDesc )
-        rItemSet.Put( SwFmtPageDesc( pPageDesc ) );
+        rItemSet.Put( SwFormatPageDesc( pPageDesc ) );
     if( bSetKeep )
-        rItemSet.Put( SvxFmtKeepItem( bKeep, RES_KEEP ) );
+        rItemSet.Put( SvxFormatKeepItem( bKeep, RES_KEEP ) );
 
     return bSetBreak;
 }
 // /Feature: PrintExt
 
-static void SetCharFmtAttrs( SwCharFmt *pCharFmt, SfxItemSet& rItemSet )
+static void SetCharFormatAttrs( SwCharFormat *pCharFormat, SfxItemSet& rItemSet )
 {
     const SfxPoolItem *pItem;
     static const sal_uInt16 aWhichIds[3] = { RES_CHRATR_FONTSIZE,RES_CHRATR_CJK_FONTSIZE,
@@ -200,7 +200,7 @@ static void SetCharFmtAttrs( SwCharFmt *pCharFmt, SfxItemSet& rItemSet )
         }
     }
 
-    pCharFmt->SetFmtAttr( rItemSet );
+    pCharFormat->SetFormatAttr( rItemSet );
 
     if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
     {
@@ -209,35 +209,35 @@ static void SetCharFmtAttrs( SwCharFmt *pCharFmt, SfxItemSet& rItemSet )
 
         SvxBrushItem aBrushItem( *static_cast<const SvxBrushItem *>(pItem) );
         aBrushItem.SetWhich( RES_CHRATR_BACKGROUND );
-        pCharFmt->SetFmtAttr( aBrushItem );
+        pCharFormat->SetFormatAttr( aBrushItem );
     }
 
     if( SfxItemState::SET == rItemSet.GetItemState( RES_BOX, false, &pItem ) )
     {
         SvxBoxItem aBoxItem( *static_cast<const SvxBoxItem *>(pItem) );
         aBoxItem.SetWhich( RES_CHRATR_BOX );
-        pCharFmt->SetFmtAttr( aBoxItem );
+        pCharFormat->SetFormatAttr( aBoxItem );
     }
 }
 
-void SwCSS1Parser::SetLinkCharFmts()
+void SwCSS1Parser::SetLinkCharFormats()
 {
-    OSL_ENSURE( !bLinkCharFmtsSet, "Aufruf von SetLinkCharFmts unnoetig" );
+    OSL_ENSURE( !bLinkCharFormatsSet, "Aufruf von SetLinkCharFormats unnoetig" );
 
     SvxCSS1MapEntry *pStyleEntry =
         GetTag( OUString(OOO_STRING_SVTOOLS_HTML_anchor) );
-    SwCharFmt *pUnvisited = 0, *pVisited = 0;
+    SwCharFormat *pUnvisited = 0, *pVisited = 0;
     if( pStyleEntry )
     {
         SfxItemSet& rItemSet = pStyleEntry->GetItemSet();
         bool bColorSet = (SfxItemState::SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
                                                               false));
-        pUnvisited = GetCharFmtFromPool( RES_POOLCHR_INET_NORMAL );
-        SetCharFmtAttrs( pUnvisited, rItemSet );
+        pUnvisited = GetCharFormatFromPool( RES_POOLCHR_INET_NORMAL );
+        SetCharFormatAttrs( pUnvisited, rItemSet );
         bBodyLinkSet |= bColorSet;
 
-        pVisited = GetCharFmtFromPool( RES_POOLCHR_INET_VISIT );
-        SetCharFmtAttrs( pVisited, rItemSet );
+        pVisited = GetCharFormatFromPool( RES_POOLCHR_INET_VISIT );
+        SetCharFormatAttrs( pVisited, rItemSet );
         bBodyVLinkSet |= bColorSet;
     }
 
@@ -250,8 +250,8 @@ void SwCSS1Parser::SetLinkCharFmts()
         bool bColorSet = (SfxItemState::SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
                                                               false));
         if( !pUnvisited )
-            pUnvisited = GetCharFmtFromPool( RES_POOLCHR_INET_NORMAL );
-        SetCharFmtAttrs( pUnvisited, rItemSet );
+            pUnvisited = GetCharFormatFromPool( RES_POOLCHR_INET_NORMAL );
+        SetCharFormatAttrs( pUnvisited, rItemSet );
         bBodyLinkSet |= bColorSet;
     }
 
@@ -264,15 +264,15 @@ void SwCSS1Parser::SetLinkCharFmts()
         bool bColorSet = (SfxItemState::SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
                                                               false));
         if( !pVisited )
-            pVisited = GetCharFmtFromPool( RES_POOLCHR_INET_VISIT );
-        SetCharFmtAttrs( pVisited, rItemSet );
+            pVisited = GetCharFormatFromPool( RES_POOLCHR_INET_VISIT );
+        SetCharFormatAttrs( pVisited, rItemSet );
         bBodyVLinkSet |= bColorSet;
     }
 
-    bLinkCharFmtsSet = true;
+    bLinkCharFormatsSet = true;
 }
 
-static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet,
+static void SetTextCollAttrs( SwTextFormatColl *pColl, SfxItemSet& rItemSet,
                              SvxCSS1PropertyInfo& rPropInfo,
                              SwCSS1Parser *pCSS1Parser )
 {
@@ -291,11 +291,11 @@ static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet,
 
         SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem *>(pCollItem) );
         if( rPropInfo.bLeftMargin )
-            aLRItem.SetTxtLeft( pLRItem->GetTxtLeft() );
+            aLRItem.SetTextLeft( pLRItem->GetTextLeft() );
         if( rPropInfo.bRightMargin )
             aLRItem.SetRight( pLRItem->GetRight() );
         if( rPropInfo.bTextIndent )
-            aLRItem.SetTxtFirstLineOfst( pLRItem->GetTxtFirstLineOfst() );
+            aLRItem.SetTextFirstLineOfst( pLRItem->GetTextFirstLineOfst() );
 
         rItemSet.Put( aLRItem );
     }
@@ -332,16 +332,16 @@ static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet,
     }
 
 // Feature: PrintExt
-    pCSS1Parser->SetFmtBreak( rItemSet, rPropInfo );
+    pCSS1Parser->SetFormatBreak( rItemSet, rPropInfo );
 // /Feature: PrintExt
 
-    pColl->SetFmtAttr( rItemSet );
+    pColl->SetFormatAttr( rItemSet );
 }
 
-void SwCSS1Parser::SetTableTxtColl( bool bHeader )
+void SwCSS1Parser::SetTableTextColl( bool bHeader )
 {
-    OSL_ENSURE( !(bHeader ? bTableHeaderTxtCollSet : bTableTxtCollSet),
-            "Aufruf von SetTableTxtColl unnoetig" );
+    OSL_ENSURE( !(bHeader ? bTableHeaderTextCollSet : bTableTextCollSet),
+            "Aufruf von SetTableTextColl unnoetig" );
 
     sal_uInt16 nPoolId;
     OUString sTag;
@@ -356,14 +356,14 @@ void SwCSS1Parser::SetTableTxtColl( bool bHeader )
         sTag = OOO_STRING_SVTOOLS_HTML_tabledata;
     }
 
-    SwTxtFmtColl *pColl = 0;
+    SwTextFormatColl *pColl = 0;
 
     // The following entries will never be used again and may be changed.
     SvxCSS1MapEntry *pStyleEntry = GetTag( sTag );
     if( pStyleEntry )
     {
-        pColl = GetTxtFmtColl( nPoolId, aEmptyOUStr );
-        SetTxtCollAttrs( pColl, pStyleEntry->GetItemSet(),
+        pColl = GetTextFormatColl( nPoolId, aEmptyOUStr );
+        SetTextCollAttrs( pColl, pStyleEntry->GetItemSet(),
                          pStyleEntry->GetPropertyInfo(), this );
     }
 
@@ -372,15 +372,15 @@ void SwCSS1Parser::SetTableTxtColl( bool bHeader )
     if( pStyleEntry )
     {
         if( !pColl )
-            pColl = GetTxtFmtColl( nPoolId, aEmptyOUStr );
-        SetTxtCollAttrs( pColl, pStyleEntry->GetItemSet(),
+            pColl = GetTextFormatColl( nPoolId, aEmptyOUStr );
+        SetTextCollAttrs( pColl, pStyleEntry->GetItemSet(),
                          pStyleEntry->GetPropertyInfo(), this );
     }
 
     if( bHeader )
-        bTableHeaderTxtCollSet = true;
+        bTableHeaderTextCollSet = true;
     else
-        bTableTxtCollSet = true;
+        bTableTextCollSet = true;
 }
 
 void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
@@ -432,13 +432,13 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
             if( pPageDesc )
             {
                 SwPageDesc aNewPageDesc( *pPageDesc );
-                SwFrmFmt &rMaster = aNewPageDesc.GetMaster();
+                SwFrameFormat &rMaster = aNewPageDesc.GetMaster();
                 if( bSetBrush )
-                    rMaster.SetFmtAttr( aBrushItem );
+                    rMaster.SetFormatAttr( aBrushItem );
                 if( bSetBox )
-                    rMaster.SetFmtAttr( aBoxItem );
+                    rMaster.SetFormatAttr( aBoxItem );
                 if( bSetFrmDir )
-                    rMaster.SetFmtAttr( aFrmDirItem );
+                    rMaster.SetFormatAttr( aFrmDirItem );
 
                 ChgPageDesc( pPageDesc, aNewPageDesc );
             }
@@ -455,7 +455,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
         return;
 
     SwPageDesc aNewPageDesc( *pPageDesc );
-    SwFrmFmt &rMaster = aNewPageDesc.GetMaster();
+    SwFrameFormat &rMaster = aNewPageDesc.GetMaster();
     const SfxItemSet& rPageItemSet = rMaster.GetAttrSet();
     const SfxPoolItem *pPageItem, *pItem;
     bool bChanged = false;
@@ -476,11 +476,11 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
             if( rPropInfo.bRightMargin )
                 aLRItem.SetRight( pLRItem->GetRight() );
 
-            rMaster.SetFmtAttr( aLRItem );
+            rMaster.SetFormatAttr( aLRItem );
         }
         else
         {
-            rMaster.SetFmtAttr( *pItem );
+            rMaster.SetFormatAttr( *pItem );
         }
         bChanged = true;
     }
@@ -501,11 +501,11 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
             if( rPropInfo.bBottomMargin )
                 aULItem.SetLower( pULItem->GetLower() );
 
-            rMaster.SetFmtAttr( aULItem );
+            rMaster.SetFormatAttr( aULItem );
         }
         else
         {
-            rMaster.SetFmtAttr( *pItem );
+            rMaster.SetFormatAttr( *pItem );
         }
         bChanged = true;
     }
@@ -515,7 +515,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
     {
         if( rPropInfo.eSizeType == SVX_CSS1_STYPE_TWIP )
         {
-            rMaster.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, rPropInfo.nWidth,
+            rMaster.SetFormatAttr( SwFormatFrmSize( ATT_FIX_SIZE, rPropInfo.nWidth,
                                            rPropInfo.nHeight ) );
             bChanged = true;
         }
@@ -525,7 +525,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
             // Groesse der Vorlage erhalten. Bei "landscape" und "portrait"
             // wird das Landscape-Flag gesetzt und evtl. die Breite/Hoehe
             // vertauscht.
-            SwFmtFrmSize aFrmSz( rMaster.GetFrmSize() );
+            SwFormatFrmSize aFrmSz( rMaster.GetFrmSize() );
             bool bLandscape = aNewPageDesc.GetLandscape();
             if( ( bLandscape &&
                   rPropInfo.eSizeType == SVX_CSS1_STYPE_PORTRAIT ) ||
@@ -535,7 +535,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
                 SwTwips nTmp = aFrmSz.GetHeight();
                 aFrmSz.SetHeight( aFrmSz.GetWidth() );
                 aFrmSz.SetWidth( nTmp );
-                rMaster.SetFmtAttr( aFrmSz );
+                rMaster.SetFormatAttr( aFrmSz );
                 aNewPageDesc.SetLandscape( !bLandscape );
                 bChanged = true;
             }
@@ -546,7 +546,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
     if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
     {
         // eine Umrandung wird gesetzt
-        rMaster.SetFmtAttr( *pItem );
+        rMaster.SetFormatAttr( *pItem );
         rItemSet.ClearItem( RES_BACKGROUND );
         bChanged = true;
     }
@@ -835,8 +835,8 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                 // gesetzt werden und gelten dann automatisch als defaults
                 if( SfxItemState::SET==rItemSet.GetItemState(RES_CHRATR_COLOR,false) )
                     bBodyTextSet = true;
-                SetTxtCollAttrs(
-                    GetTxtCollFromPool( RES_POOLCOLL_STANDARD ),
+                SetTextCollAttrs(
+                    GetTextCollFromPool( RES_POOLCOLL_STANDARD ),
                     rItemSet, rPropInfo, this );
 
                 return false;
@@ -848,22 +848,22 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
              !pNext && aClass.getLength() >= 9 &&
              ('s' == aClass[0] || 'S' == aClass[0]) )
     {
-        sal_uInt16 nPoolFmtId = 0;
+        sal_uInt16 nPoolFormatId = 0;
         if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdendnote_sym) )
-            nPoolFmtId = RES_POOLCHR_ENDNOTE;
+            nPoolFormatId = RES_POOLCHR_ENDNOTE;
         else if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdfootnote_sym) )
-            nPoolFmtId = RES_POOLCHR_FOOTNOTE;
-        if( nPoolFmtId )
+            nPoolFormatId = RES_POOLCHR_FOOTNOTE;
+        if( nPoolFormatId )
         {
             if( CSS1_SCRIPT_ALL == nScript )
             {
-                SetCharFmtAttrs( GetCharFmtFromPool(nPoolFmtId), rItemSet );
+                SetCharFormatAttrs( GetCharFormatFromPool(nPoolFormatId), rItemSet );
             }
             else
             {
                 SfxItemSet aScriptItemSet( rItemSet );
                 RemoveScriptItems( aScriptItemSet, nScript );
-                SetCharFmtAttrs( GetCharFmtFromPool(nPoolFmtId),
+                SetCharFormatAttrs( GetCharFormatFromPool(nPoolFormatId),
                                  aScriptItemSet);
             }
             return false;
@@ -989,17 +989,17 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
             // ein X:first-line { float: left; ... }
 
             // Die Vorlage Suchen bzw. Anlegen
-            SwTxtFmtColl *pColl = GetTxtFmtColl( nPoolCollId, aEmptyOUStr );
-            SwTxtFmtColl* pParentColl = 0;
+            SwTextFormatColl *pColl = GetTextFormatColl( nPoolCollId, aEmptyOUStr );
+            SwTextFormatColl* pParentColl = 0;
             if( !aClass.isEmpty() )
             {
                 OUString aName( pColl->GetName() );
                 AddClassName( aName, aClass );
 
                 pParentColl = pColl;
-                pColl = pDoc->FindTxtFmtCollByName( aName );
+                pColl = pDoc->FindTextFormatCollByName( aName );
                 if( !pColl )
-                    pColl = pDoc->MakeTxtFmtColl( aName, pParentColl );
+                    pColl = pDoc->MakeTextFormatColl( aName, pParentColl );
             }
             if( !pNext )
             {
@@ -1012,20 +1012,20 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                 rPropInfo.SetBoxItem( rItemSet, MIN_BORDER_DIST, pBoxItem );
                 if( CSS1_SCRIPT_ALL == nScript && !pParentColl )
                 {
-                    SetTxtCollAttrs( pColl, rItemSet, rPropInfo, this );
+                    SetTextCollAttrs( pColl, rItemSet, rPropInfo, this );
                 }
                 else
                 {
                     SfxItemSet aScriptItemSet( rItemSet );
                     RemoveScriptItems( aScriptItemSet, nScript,
                                        pParentColl ? &pParentColl->GetAttrSet() : 0 );
-                    SetTxtCollAttrs( pColl, aScriptItemSet, rPropInfo, this );
+                    SetTextCollAttrs( pColl, aScriptItemSet, rPropInfo, this );
                 }
             }
             else
             {
                 // ein Drop-Cap-Attribut basteln
-                SwFmtDrop aDrop( pColl->GetDrop() );
+                SwFormatDrop aDrop( pColl->GetDrop() );
                 aDrop.GetChars() = 1;
 
                 // die Attribute in das DropCap-Attribut einfuegen
@@ -1070,7 +1070,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                     (SVX_ADJUST_LEFT == rPropInfo.eFloat  ||
                      CSS1_SCRIPT_ALL == nScript) )
                 {
-                    pColl->SetFmtAttr( aDrop );
+                    pColl->SetFormatAttr( aDrop );
                 }
             }
 
@@ -1085,34 +1085,34 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
     if( pNext )
         return true;
 
-    SwCharFmt *pCFmt = GetChrFmt( static_cast< sal_uInt16 >(nToken2), aEmptyOUStr );
-    if( pCFmt )
+    SwCharFormat *pCFormat = GetChrFormat( static_cast< sal_uInt16 >(nToken2), aEmptyOUStr );
+    if( pCFormat )
     {
-        SwCharFmt *pParentCFmt = 0;
+        SwCharFormat *pParentCFormat = 0;
         if( !aClass.isEmpty() )
         {
-            OUString aName( pCFmt->GetName() );
+            OUString aName( pCFormat->GetName() );
             AddClassName( aName, aClass );
-            pParentCFmt = pCFmt;
+            pParentCFormat = pCFormat;
 
-            pCFmt = pDoc->FindCharFmtByName( aName );
-            if( !pCFmt )
+            pCFormat = pDoc->FindCharFormatByName( aName );
+            if( !pCFormat )
             {
-                pCFmt = pDoc->MakeCharFmt( aName, pParentCFmt );
-                pCFmt->SetAuto( false );
+                pCFormat = pDoc->MakeCharFormat( aName, pParentCFormat );
+                pCFormat->SetAuto( false );
             }
         }
 
-        if( CSS1_SCRIPT_ALL == nScript && !pParentCFmt )
+        if( CSS1_SCRIPT_ALL == nScript && !pParentCFormat )
         {
-            SetCharFmtAttrs( pCFmt, rItemSet );
+            SetCharFormatAttrs( pCFormat, rItemSet );
         }
         else
         {
             SfxItemSet aScriptItemSet( rItemSet );
             RemoveScriptItems( aScriptItemSet, nScript,
-                               pParentCFmt ? &pParentCFmt->GetAttrSet() : 0 );
-            SetCharFmtAttrs( pCFmt, aScriptItemSet );
+                               pParentCFormat ? &pParentCFormat->GetAttrSet() : 0 );
+            SetCharFormatAttrs( pCFormat, aScriptItemSet );
         }
         return false;
     }
@@ -1140,7 +1140,7 @@ const FontList *SwCSS1Parser::GetFontList() const
     return pFList;
 }
 
-SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass ) const
+SwCharFormat* SwCSS1Parser::GetChrFormat( sal_uInt16 nToken2, const OUString& rClass ) const
 {
     // die entsprechende Vorlage suchen
     sal_uInt16 nPoolId = 0;
@@ -1172,23 +1172,23 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass )
         return 0;
 
     // Die Vorlage (ohne Class) suchen oder anlegen
-    SwCharFmt *pCFmt = 0;
+    SwCharFormat *pCFormat = 0;
     if( nPoolId )
     {
-        pCFmt = GetCharFmtFromPool( nPoolId );
+        pCFormat = GetCharFormatFromPool( nPoolId );
     }
     else
     {
         OUString sCName( OUString::createFromAscii(sName) );
-        pCFmt = pDoc->FindCharFmtByName( sCName );
-        if( !pCFmt )
+        pCFormat = pDoc->FindCharFormatByName( sCName );
+        if( !pCFormat )
         {
-            pCFmt = pDoc->MakeCharFmt( sCName, pDoc->GetDfltCharFmt() );
-            pCFmt->SetAuto( false );
+            pCFormat = pDoc->MakeCharFormat( sCName, pDoc->GetDfltCharFormat() );
+            pCFormat->SetAuto( false );
         }
     }
 
-    OSL_ENSURE( pCFmt, "Keine Zeichen-Vorlage???" );
+    OSL_ENSURE( pCFormat, "Keine Zeichen-Vorlage???" );
 
     // Wenn es eine Klasse gibt, die Klassen-Vorlage suchen aber nicht
     // neu anlegen.
@@ -1196,94 +1196,94 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass )
     GetScriptFromClass( aClass, false );
     if( !aClass.isEmpty() )
     {
-        OUString aTmp( pCFmt->GetName() );
+        OUString aTmp( pCFormat->GetName() );
         AddClassName( aTmp, aClass );
-        SwCharFmt *pClassCFmt = pDoc->FindCharFmtByName( aTmp );
-        if( pClassCFmt )
+        SwCharFormat *pClassCFormat = pDoc->FindCharFormatByName( aTmp );
+        if( pClassCFormat )
         {
-            pCFmt = pClassCFmt;
+            pCFormat = pClassCFormat;
         }
         else
         {
             const SvxCSS1MapEntry *pClass = GetClass( aClass );
             if( pClass )
             {
-                pCFmt = pDoc->MakeCharFmt( aTmp, pCFmt );
-                pCFmt->SetAuto( false );
+                pCFormat = pDoc->MakeCharFormat( aTmp, pCFormat );
+                pCFormat->SetAuto( false );
                 SfxItemSet aItemSet( pClass->GetItemSet() );
-                SetCharFmtAttrs( pCFmt, aItemSet );
+                SetCharFormatAttrs( pCFormat, aItemSet );
             }
         }
     }
 
-    return pCFmt;
+    return pCFormat;
 }
 
-SwTxtFmtColl *SwCSS1Parser::GetTxtCollFromPool( sal_uInt16 nPoolId ) const
+SwTextFormatColl *SwCSS1Parser::GetTextCollFromPool( sal_uInt16 nPoolId ) const
 {
-    sal_uInt16 nOldArrLen = pDoc->GetTxtFmtColls()->size();
+    sal_uInt16 nOldArrLen = pDoc->GetTextFormatColls()->size();
 
-    SwTxtFmtColl *pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nPoolId, false );
+    SwTextFormatColl *pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nPoolId, false );
 
     if( bIsNewDoc )
     {
-        sal_uInt16 nArrLen = pDoc->GetTxtFmtColls()->size();
+        sal_uInt16 nArrLen = pDoc->GetTextFormatColls()->size();
         for( sal_uInt16 i=nOldArrLen; i<nArrLen; i++ )
-            lcl_swcss1_setEncoding( *(*pDoc->GetTxtFmtColls())[i],
+            lcl_swcss1_setEncoding( *(*pDoc->GetTextFormatColls())[i],
                                     GetDfltEncoding() );
     }
 
     return pColl;
 }
 
-SwCharFmt *SwCSS1Parser::GetCharFmtFromPool( sal_uInt16 nPoolId ) const
+SwCharFormat *SwCSS1Parser::GetCharFormatFromPool( sal_uInt16 nPoolId ) const
 {
-    sal_uInt16 nOldArrLen = pDoc->GetCharFmts()->size();
+    sal_uInt16 nOldArrLen = pDoc->GetCharFormats()->size();
 
-    SwCharFmt *pCharFmt = pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( nPoolId );
+    SwCharFormat *pCharFormat = pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( nPoolId );
 
     if( bIsNewDoc )
     {
-        sal_uInt16 nArrLen = pDoc->GetCharFmts()->size();
+        sal_uInt16 nArrLen = pDoc->GetCharFormats()->size();
 
         for( sal_uInt16 i=nOldArrLen; i<nArrLen; i++ )
-            lcl_swcss1_setEncoding( *(*pDoc->GetCharFmts())[i],
+            lcl_swcss1_setEncoding( *(*pDoc->GetCharFormats())[i],
                                     GetDfltEncoding() );
     }
 
-    return pCharFmt;
+    return pCharFormat;
 }
 
-SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
+SwTextFormatColl *SwCSS1Parser::GetTextFormatColl( sal_uInt16 nTextColl,
                                            const OUString& rClass )
 {
-    SwTxtFmtColl* pColl = 0;
+    SwTextFormatColl* pColl = 0;
 
     OUString aClass( rClass );
     GetScriptFromClass( aClass, false );
-    if( RES_POOLCOLL_TEXT == nTxtColl && aClass.getLength() >= 9 &&
+    if( RES_POOLCOLL_TEXT == nTextColl && aClass.getLength() >= 9 &&
         ('s' == aClass[0] || 'S' == aClass[0] ) )
     {
         if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdendnote) )
         {
-            nTxtColl = RES_POOLCOLL_ENDNOTE;
+            nTextColl = RES_POOLCOLL_ENDNOTE;
             aClass = aEmptyOUStr;
         }
         else if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdfootnote) )
         {
-            nTxtColl = RES_POOLCOLL_FOOTNOTE;
+            nTextColl = RES_POOLCOLL_FOOTNOTE;
             aClass = aEmptyOUStr;
         }
     }
 
-    if( USER_FMT & nTxtColl )       // eine vom Reader angelegte
+    if( USER_FMT & nTextColl )       // eine vom Reader angelegte
     {
         OSL_ENSURE( false, "Wo kommt die Benutzer-Vorlage her?" );
-        pColl = GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
+        pColl = GetTextCollFromPool( RES_POOLCOLL_STANDARD );
     }
     else
     {
-        pColl = GetTxtCollFromPool( nTxtColl );
+        pColl = GetTextCollFromPool( nTextColl );
     }
 
     OSL_ENSURE( pColl, "Keine Absatz-Vorlage???" );
@@ -1291,20 +1291,20 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
     {
         OUString aTmp( pColl->GetName() );
         AddClassName( aTmp, aClass );
-        SwTxtFmtColl* pClassColl = pDoc->FindTxtFmtCollByName( aTmp );
+        SwTextFormatColl* pClassColl = pDoc->FindTextFormatCollByName( aTmp );
 
         if( !pClassColl &&
-            (nTxtColl==RES_POOLCOLL_TABLE ||
-             nTxtColl==RES_POOLCOLL_TABLE_HDLN) )
+            (nTextColl==RES_POOLCOLL_TABLE ||
+             nTextColl==RES_POOLCOLL_TABLE_HDLN) )
         {
             // Wenn dieser Fall eintritt, dann wurde ein <TD><P CLASS=foo>
             // gelesen, aber die TD.foo Vorlage nicht gefunden. Dann muessen
             // wir P.foo nehmen, wenn es sie gibt.
-            SwTxtFmtColl* pCollText =
-                GetTxtCollFromPool( RES_POOLCOLL_TEXT );
+            SwTextFormatColl* pCollText =
+                GetTextCollFromPool( RES_POOLCOLL_TEXT );
             aTmp = pCollText->GetName();
             AddClassName( aTmp, aClass );
-            pClassColl = pDoc->FindTxtFmtCollByName( aTmp );
+            pClassColl = pDoc->FindTextFormatCollByName( aTmp );
         }
 
         if( pClassColl )
@@ -1316,14 +1316,14 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
             const SvxCSS1MapEntry *pClass = GetClass( aClass );
             if( pClass )
             {
-                pColl = pDoc->MakeTxtFmtColl( aTmp, pColl );
+                pColl = pDoc->MakeTextFormatColl( aTmp, pColl );
                 SfxItemSet aItemSet( pClass->GetItemSet() );
                 SvxCSS1PropertyInfo aPropInfo( pClass->GetPropertyInfo() );
                 aPropInfo.SetBoxItem( aItemSet, MIN_BORDER_DIST );
                 bool bPositioned = MayBePositioned( pClass->GetPropertyInfo() );
                 if( bPositioned )
                     aItemSet.ClearItem( RES_BACKGROUND );
-                SetTxtCollAttrs( pColl, aItemSet, aPropInfo,
+                SetTextCollAttrs( pColl, aItemSet, aPropInfo,
                                  this );
             }
         }
@@ -1346,7 +1346,7 @@ static SwPageDesc *FindPageDesc(SwDoc *pDoc, sal_uInt16 nPoolId)
     size_t nPageDescs = pDoc->GetPageDescCnt();
     size_t nPage;
     for (nPage=0; nPage < nPageDescs &&
-         pDoc->GetPageDesc(nPage).GetPoolFmtId() != nPoolId; ++nPage)
+         pDoc->GetPageDesc(nPage).GetPoolFormatId() != nPoolId; ++nPage)
          ;
 
     return nPage < nPageDescs ? &pDoc->GetPageDesc(nPage) : 0;
@@ -1461,14 +1461,14 @@ bool SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
              SVX_CSS1_LTYPE_PERCENTAGE   == rPropInfo.eWidthType );
 }
 
-void SwCSS1Parser::AddClassName( OUString& rFmtName, const OUString& rClass )
+void SwCSS1Parser::AddClassName( OUString& rFormatName, const OUString& rClass )
 {
     OSL_ENSURE( !rClass.isEmpty(), "Style-Klasse ohne Laenge?" );
 
-    rFmtName += "." + rClass;
+    rFormatName += "." + rClass;
 }
 
-void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop,
+void SwCSS1Parser::FillDropCap( SwFormatDrop& rDrop,
                                 SfxItemSet& rItemSet,
                                 const OUString *pName )
 {
@@ -1513,13 +1513,13 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop,
     // Fuer alle anderen Attribute eine Zeichen-Vorlage anlegen
     if( rItemSet.Count() )
     {
-        SwCharFmt *pCFmt = 0;
+        SwCharFormat *pCFormat = 0;
         OUString aName;
         if( pName )
         {
             aName = *pName;
             AddFirstLetterExt( aName );
-            pCFmt = pDoc->FindCharFmtByName( aName );
+            pCFormat = pDoc->FindCharFormatByName( aName );
         }
         else
         {
@@ -1527,20 +1527,20 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop,
             {
                 aName = "first-letter " + OUString::number( (sal_Int32)(++nDropCapCnt) );
             }
-            while( pDoc->FindCharFmtByName(aName) );
+            while( pDoc->FindCharFormatByName(aName) );
         }
 
-        if( !pCFmt )
+        if( !pCFormat )
         {
-            pCFmt = pDoc->MakeCharFmt( aName, pDoc->GetDfltCharFmt() );
-            pCFmt->SetAuto( false );
+            pCFormat = pDoc->MakeCharFormat( aName, pDoc->GetDfltCharFormat() );
+            pCFormat->SetAuto( false );
         }
-        SetCharFmtAttrs( pCFmt, rItemSet );
+        SetCharFormatAttrs( pCFormat, rItemSet );
 
         // Die Zeichenvorlage braucht nur im Attribut gesetzt werden, wenn
         // auch das Attribut gesetzt wird.
         if( nLines > 1 )
-            rDrop.SetCharFmt( pCFmt );
+            rDrop.SetCharFormat( pCFormat );
     }
 }
 
@@ -1949,7 +1949,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
                                            const SvxCSS1PropertyInfo &rPropInfo,
                                            SfxItemSet &rFrmItemSet )
 {
-    SwFmtAnchor aAnchor;
+    SwFormatAnchor aAnchor;
 
     sal_Int16 eHoriOri = text::HoriOrientation::NONE;
     sal_Int16 eVertOri = text::VertOrientation::NONE;
@@ -2006,8 +2006,8 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
         // der Absatz noch leer ist und sonst auto-gebunden.
         // Auto-gebundene Rahmen werden zunaechst an der Position davor
         // eingefuegt und erst spaeter verschoben.
-        const sal_Int32 nCntnt = pPam->GetPoint()->nContent.GetIndex();
-        if( nCntnt )
+        const sal_Int32 nContent = pPam->GetPoint()->nContent.GetIndex();
+        if( nContent )
         {
             aAnchor.SetType( FLY_AT_CHAR );
             pPam->Move( fnMoveBackward );
@@ -2023,7 +2023,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
 
         aAnchor.SetAnchor( pPam->GetPoint() );
 
-        if( nCntnt )
+        if( nContent )
             pPam->Move( fnMoveForward );
 
         sal_uInt16 nLeftSpace = 0, nRightSpace = 0;
@@ -2046,9 +2046,9 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
     rFrmItemSet.Put( aAnchor );
 
     // Absolut Positioniert mit Durchlauf
-    rFrmItemSet.Put( SwFmtHoriOrient( nHoriPos, eHoriOri, eHoriRel ) );
-    rFrmItemSet.Put( SwFmtVertOrient( nVertPos, eVertOri, eVertRel ) );
-    rFrmItemSet.Put( SwFmtSurround( eSurround ) );
+    rFrmItemSet.Put( SwFormatHoriOrient( nHoriPos, eHoriOri, eHoriRel ) );
+    rFrmItemSet.Put( SwFormatVertOrient( nVertPos, eVertOri, eVertRel ) );
+    rFrmItemSet.Put( SwFormatSurround( eSurround ) );
 }
 
 void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
@@ -2086,13 +2086,13 @@ void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
         ;
     }
 
-    SwFmtFrmSize aFrmSize( eSize, nWidth, nHeight );
+    SwFormatFrmSize aFrmSize( eSize, nWidth, nHeight );
     aFrmSize.SetWidthPercent( nPrcWidth );
     aFrmSize.SetHeightPercent( nPrcHeight );
     rFrmItemSet.Put( aFrmSize );
 }
 
-void SwHTMLParser::SetFrmFmtAttrs( SfxItemSet &rItemSet,
+void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet,
                                    SvxCSS1PropertyInfo & /*rPropInfo*/,
                                    sal_uInt16 nFlags,
                                    SfxItemSet &rFrmItemSet )
@@ -2208,9 +2208,9 @@ bool SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft,
     {
         sal_uInt8 nLevel = (sal_uInt8)( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth()
                                                             : MAXLEVEL) - 1 );
-        const SwNumFmt& rNumFmt = rInfo.GetNumRule()->Get(nLevel);
-        nLeft = nLeft + rNumFmt.GetAbsLSpace();
-        nIndent = rNumFmt.GetFirstLineOffset();
+        const SwNumFormat& rNumFormat = rInfo.GetNumRule()->Get(nLevel);
+        nLeft = nLeft + rNumFormat.GetAbsLSpace();
+        nIndent = rNumFormat.GetFirstLineOffset();
     }
 
     return bRet;
@@ -2233,7 +2233,7 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper,
         }
         else if( !nDfltColl )
         {
-            nDfltColl = pCntxt->GetDfltTxtFmtColl();
+            nDfltColl = pCntxt->GetDfltTextFormatColl();
             if( nDfltColl )
                 aDfltClass = pCntxt->GetClass();
         }
@@ -2242,8 +2242,8 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper,
     if( !nDfltColl )
         nDfltColl = RES_POOLCOLL_TEXT;
 
-    const SwTxtFmtColl *pColl =
-        pCSS1Parser->GetTxtFmtColl( nDfltColl, aDfltClass );
+    const SwTextFormatColl *pColl =
+        pCSS1Parser->GetTextFormatColl( nDfltColl, aDfltClass );
     const SvxULSpaceItem& rULSpace = pColl->GetULSpace();
     nUpper = rULSpace.GetUpper();
     nLower = rULSpace.GetLower();
@@ -2266,7 +2266,7 @@ void SwHTMLParser::EndContextAttrs( _HTMLAttrContext *pContext, bool bRemove )
                 pAttr->Invalidate();
             else if( nChars > MAX_DROPCAP_CHARS )
                 nChars = MAX_DROPCAP_CHARS;
-            static_cast<SwFmtDrop&>(pAttr->GetItem()).GetChars() = (sal_uInt8)nChars;
+            static_cast<SwFormatDrop&>(pAttr->GetItem()).GetChars() = (sal_uInt8)nChars;
         }
 
         EndAttr( pAttr );
@@ -2302,12 +2302,12 @@ void SwHTMLParser::InsertParaAttrs( const SfxItemSet& rItemSet )
     }
 }
 
-static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc )
+static void lcl_swcss1_setEncoding( SwFormat& rFormat, rtl_TextEncoding eEnc )
 {
     if( RTL_TEXTENCODING_DONTKNOW == eEnc )
         return;
 
-    const SfxItemSet& rItemSet = rFmt.GetAttrSet();
+    const SfxItemSet& rItemSet = rFormat.GetAttrSet();
     static const sal_uInt16 aWhichIds[3] = { RES_CHRATR_FONT, RES_CHRATR_CJK_FONT,
                                    RES_CHRATR_CTL_FONT };
     const SfxPoolItem *pItem;
@@ -2321,7 +2321,7 @@ static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc )
                 SvxFontItem aFont( rFont.GetFamily(), rFont.GetFamilyName(),
                                    rFont.GetStyleName(), rFont.GetPitch(),
                                    eEnc, aWhichIds[i]);
-                rFmt.SetFmtAttr( aFont );
+                rFormat.SetFormatAttr( aFont );
             }
         }
     }
@@ -2350,14 +2350,14 @@ void SwCSS1Parser::SetDfltEncoding( rtl_TextEncoding eEnc )
             }
 
             // Change all paragraph styles that do specify a font.
-            sal_uInt16 nArrLen = pDoc->GetTxtFmtColls()->size();
+            sal_uInt16 nArrLen = pDoc->GetTextFormatColls()->size();
             for( i=1; i<nArrLen; i++ )
-                lcl_swcss1_setEncoding( *(*pDoc->GetTxtFmtColls())[i], eEnc );
+                lcl_swcss1_setEncoding( *(*pDoc->GetTextFormatColls())[i], eEnc );
 
             // Change all character styles that do specify a font.
-            nArrLen = pDoc->GetCharFmts()->size();
+            nArrLen = pDoc->GetCharFormats()->size();
             for( i=1; i<nArrLen; i++ )
-                lcl_swcss1_setEncoding( *(*pDoc->GetCharFmts())[i], eEnc );
+                lcl_swcss1_setEncoding( *(*pDoc->GetCharFormats())[i], eEnc );
         }
 
         SvxCSS1Parser::SetDfltEncoding( eEnc );
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 07b6a8db3b79..e3673e5c2359 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -210,8 +210,8 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
             // den Start des Attributs neu setzen
             pAttr->nSttPara = rNewSttPara;
             pAttr->nEndPara = rNewSttPara;
-            pAttr->nSttCntnt = nNewSttCnt;
-            pAttr->nEndCntnt = nNewSttCnt;
+            pAttr->nSttContent = nNewSttCnt;
+            pAttr->nEndContent = nNewSttCnt;
             pAttr->pPrev = 0;
 
             pAttr = pNext;
@@ -361,7 +361,7 @@ void SwHTMLParser::EndContext( _HTMLAttrContext *pContext )
     // Ggf. noch einen Ansatz-Umbruch einfuegen
     if( AM_NONE != pContext->GetAppendMode() &&
         pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( pContext->GetAppendMode() );
+        AppendTextNode( pContext->GetAppendMode() );
 
     // PRE-/LISTING- und XMP-Umgebungen wieder starten
     if( pContext->IsFinishPREListingXMP() )
@@ -426,7 +426,7 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
         SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
         if( !IsNewDoc() )
-            Reader::ResetFrmFmtAttrs(aFrmItemSet );
+            Reader::ResetFrameFormatAttrs(aFrmItemSet );
 
         // Ausrichtung setzen
         SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, rItemSet, rPropInfo,
@@ -439,7 +439,7 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
         SetSpace( Size(0,0), rItemSet, rPropInfo, aFrmItemSet );
 
         // Sonstige CSS1-Attribute Setzen
-        SetFrmFmtAttrs( rItemSet, rPropInfo,
+        SetFrameFormatAttrs( rItemSet, rPropInfo,
                         HTML_FF_BOX|HTML_FF_PADDING|HTML_FF_BACKGROUND|HTML_FF_DIRECTION,
                         aFrmItemSet );
 
@@ -465,7 +465,7 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass,
         // Container-Klasse
         SfxItemSet *pFrmItemSet = pContext->GetFrmItemSet( pDoc );
         if( !IsNewDoc() )
-            Reader::ResetFrmFmtAttrs( *pFrmItemSet );
+            Reader::ResetFrameFormatAttrs( *pFrmItemSet );
 
         SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE,
                                 rItemSet, rPropInfo, *pFrmItemSet );
@@ -473,7 +473,7 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass,
         SetFixSize( aDummy, aDummy, false, false, rItemSet, rPropInfo,
                     *pFrmItemSet );
         SetSpace( aDummy, rItemSet, rPropInfo, *pFrmItemSet );
-        SetFrmFmtAttrs( rItemSet, rPropInfo, HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_DIRECTION,
+        SetFrameFormatAttrs( rItemSet, rPropInfo, HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_DIRECTION,
                         *pFrmItemSet );
 
         bRet = true;
@@ -492,7 +492,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
     if( bCharLvl && !pPam->GetPoint()->nContent.GetIndex() &&
         SVX_ADJUST_LEFT == rPropInfo.eFloat )
     {
-        SwFmtDrop aDrop;
+        SwFormatDrop aDrop;
         aDrop.GetChars() = 1;
 
         pCSS1Parser->FillDropCap( aDrop, rItemSet );
@@ -512,7 +512,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
 
 // Feature: PrintExt
     if( !bCharLvl )
-        pCSS1Parser->SetFmtBreak( rItemSet, rPropInfo );
+        pCSS1Parser->SetFormatBreak( rItemSet, rPropInfo );
 // /Feature: PrintExt
 
     OSL_ENSURE(aContexts.size() <= nContextStAttrMin ||
@@ -532,7 +532,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
             {
                 // Absatz-Einzuege muessen addiert werden und werden immer
                 // nur absatzweise gesetzt (fuer den ersten Absatz hier,
-                // fuer alle folgenden in SetTxtCollAttrs)
+                // fuer alle folgenden in SetTextCollAttrs)
 
                 const SvxLRSpaceItem *pLRItem =
                     static_cast<const SvxLRSpaceItem *>(pItem);
@@ -560,7 +560,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
                 if( rPropInfo.bLeftMargin )
                 {
                     OSL_ENSURE( rPropInfo.nLeftMargin < 0 ||
-                            rPropInfo.nLeftMargin == pLRItem->GetTxtLeft(),
+                            rPropInfo.nLeftMargin == pLRItem->GetTextLeft(),
                             "linker Abstand stimmt nicht mit Item ueberein" );
                     if( rPropInfo.nLeftMargin < 0 &&
                         -rPropInfo.nLeftMargin > nOldLeft )
@@ -580,15 +580,15 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
                         nRight = nOldRight + static_cast< sal_uInt16 >(rPropInfo.nRightMargin);
                 }
                 if( rPropInfo.bTextIndent )
-                    nIndent = pLRItem->GetTxtFirstLineOfst();
+                    nIndent = pLRItem->GetTextFirstLineOfst();
 
                 // und die Werte fuer nachfolgende Absaetze merken
                 pContext->SetMargins( nLeft, nRight, nIndent );
 
                 // das Attribut noch am aktuellen Absatz setzen
                 SvxLRSpaceItem aLRItem( *pLRItem );
-                aLRItem.SetTxtFirstLineOfst( nIndent );
-                aLRItem.SetTxtLeft( nLeft );
+                aLRItem.SetTextFirstLineOfst( nIndent );
+                aLRItem.SetTextLeft( nLeft );
                 aLRItem.SetRight( nRight );
                 NewAttr( &aAttrTab.pLRSpace, aLRItem );
                 EndAttr( aAttrTab.pLRSpace, 0, false );
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index 2a29c7b454bf..73ca7cc619c2 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -86,7 +86,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
     SfxItemSet aFrmSet( pDoc->GetAttrPool(),
                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
     if( !IsNewDoc() )
-        Reader::ResetFrmFmtAttrs( aFrmSet );
+        Reader::ResetFrameFormatAttrs( aFrmSet );
 
     sal_uInt16 nLeftSpace = 0, nRightSpace = 0, nUpperSpace = 0, nLowerSpace = 0;
     if( (rPixSpace.Width() || rPixSpace.Height()) && Application::GetDefaultDevice() )
@@ -106,7 +106,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
         // Ggf. den Erstzeilen-Einzug noch plaetten
         const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
         SvxLRSpaceItem aLRItem( *pLRItem );
-        aLRItem.SetTxtFirstLineOfst( 0 );
+        aLRItem.SetTextFirstLineOfst( 0 );
         if( rCSS1PropInfo.bLeftMargin )
         {
             nLeftSpace = static_cast< sal_uInt16 >(aLRItem.GetLeft());
@@ -153,7 +153,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
         aFrmSet.Put( aULItem );
     }
 
-    SwFmtAnchor aAnchor( FLY_AS_CHAR );
+    SwFormatAnchor aAnchor( FLY_AS_CHAR );
     if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition &&
         SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eLeftType &&
         SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
@@ -174,20 +174,20 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
         // #i26791# - direct positioning for <SwDoc::Insert(..)>
         pNewDrawObj->SetRelativePos( Point(rCSS1PropInfo.nLeft + nLeftSpace,
                                            rCSS1PropInfo.nTop + nUpperSpace) );
-        aFrmSet.Put( SwFmtSurround(SURROUND_THROUGHT) );
+        aFrmSet.Put( SwFormatSurround(SURROUND_THROUGHT) );
     }
     else if( SVX_ADJUST_LEFT == rCSS1PropInfo.eFloat ||
              text::HoriOrientation::LEFT == eHoriOri )
     {
         aAnchor.SetType( FLY_AT_PARA );
-        aFrmSet.Put( SwFmtSurround(bHidden ? SURROUND_THROUGHT
+        aFrmSet.Put( SwFormatSurround(bHidden ? SURROUND_THROUGHT
                                              : SURROUND_RIGHT) );
         // #i26791# - direct positioning for <SwDoc::Insert(..)>
         pNewDrawObj->SetRelativePos( Point(nLeftSpace, nUpperSpace) );
     }
     else if( text::VertOrientation::NONE != eVertOri )
     {
-        aFrmSet.Put( SwFmtVertOrient( 0, eVertOri ) );
+        aFrmSet.Put( SwFormatVertOrient( 0, eVertOri ) );
     }
 
     if (FLY_AT_PAGE == aAnchor.GetAnchorId())
@@ -358,7 +358,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
         }
     }
 
-    // Ein DrawTxtobj anlegen
+    // Ein DrawTextobj anlegen
     // #i52858# - method name changed
     SwDrawModel* pModel = pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
     SdrPage* pPg = pModel->GetPage( 0 );
@@ -401,7 +401,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
     // die Default-Farbe (aus der Standard-Vorlage) setzen, damit ueberhaupt
     // eine sinnvolle Farbe gesetzt ist.
     const Color& rDfltColor =
-        pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD )
+        pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
             ->GetColor().GetValue();
     aItemSet.Put( SvxColorItem( rDfltColor, EE_CHAR_COLOR ) );
 
@@ -418,11 +418,11 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
         RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT,
         0
     };
-    SwTxtNode const*const pTxtNd =
-        pPam->GetPoint()->nNode.GetNode().GetTxtNode();
-    if( pTxtNd )
+    SwTextNode const*const pTextNd =
+        pPam->GetPoint()->nNode.GetNode().GetTextNode();
+    if( pTextNd )
     {
-        const SfxItemSet& rItemSet = pTxtNd->GetAnyFmtColl().GetAttrSet();
+        const SfxItemSet& rItemSet = pTextNd->GetAnyFormatColl().GetAttrSet();
         const SfxPoolItem *pItem;
         for( sal_uInt16 i=0; nWhichIds[i]; i++ )
         {
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index 74dd118e6927..17638a235bb0 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -63,9 +63,9 @@ const sal_uInt32 HTML_FRMOPTS_MARQUEE_CSS1  =
     HTML_FRMOPT_S_ALIGN |
     HTML_FRMOPT_S_SPACE;
 
-const SdrObject *SwHTMLWriter::GetMarqueeTextObj( const SwDrawFrmFmt& rFmt )
+const SdrObject *SwHTMLWriter::GetMarqueeTextObj( const SwDrawFrameFormat& rFormat )
 {
-    const SdrObject* pObj = rFmt.FindSdrObject();
+    const SdrObject* pObj = rFormat.FindSdrObject();
     return (pObj && ::IsMarqueeTextObj( *pObj )) ? pObj : 0;
 }
 
@@ -129,8 +129,8 @@ void SwHTMLWriter::GetEEAttrsFromDrwObj( SfxItemSet& rItemSet,
     }
 }
 
-Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
-                                     const SwDrawFrmFmt& rFmt,
+Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
+                                     const SwDrawFrameFormat& rFormat,
                                      const SdrObject& rSdrObject )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -286,9 +286,9 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
     sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
         nFrmFlags |= HTML_FRMOPTS_MARQUEE_CSS1;
-    OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyOUStr, nFrmFlags );
+    OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrmFlags );
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
-        rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, &rSdrObject );
+        rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrmFlags, &rSdrObject );
 
     rWrt.Strm().WriteChar( '>' );
 
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index a052f71feda3..6f12c4dbf327 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -37,13 +37,13 @@
 using namespace nsSwDocInfoSubType;
 using namespace ::com::sun::star;
 
-struct HTMLNumFmtTblEntry
+struct HTMLNumFormatTableEntry
 {
     const sal_Char *pName;
-    NfIndexTableOffset eFmt;
+    NfIndexTableOffset eFormat;
 };
 
-static HTMLOptionEnum aHTMLFldTypeTable[] =
+static HTMLOptionEnum aHTMLFieldTypeTable[] =
 {
     { OOO_STRING_SW_HTML_FT_author, RES_AUTHORFLD       },
     { OOO_STRING_SW_HTML_FT_sender, RES_EXTUSERFLD      },
@@ -57,7 +57,7 @@ static HTMLOptionEnum aHTMLFldTypeTable[] =
     { 0,                0                   }
 };
 
-static HTMLNumFmtTblEntry aHTMLDateFldFmtTable[] =
+static HTMLNumFormatTableEntry aHTMLDateFieldFormatTable[] =
 {
     { "SSYS",       NF_DATE_SYSTEM_SHORT    },
     { "LSYS",       NF_DATE_SYSTEM_LONG     },
@@ -79,7 +79,7 @@ static HTMLNumFmtTblEntry aHTMLDateFldFmtTable[] =
     { 0,                    NF_NUMERIC_START }
 };
 
-static HTMLNumFmtTblEntry aHTMLTimeFldFmtTable[] =
+static HTMLNumFormatTableEntry aHTMLTimeFieldFormatTable[] =
 {
     { "SYS",     NF_TIME_HHMMSS },
     { "SSMM24",      NF_TIME_HHMM },
@@ -87,7 +87,7 @@ static HTMLNumFmtTblEntry aHTMLTimeFldFmtTable[] =
     { 0,                 NF_NUMERIC_START }
 };
 
-static HTMLOptionEnum aHTMLPageNumFldFmtTable[] =
+static HTMLOptionEnum aHTMLPageNumFieldFormatTable[] =
 {
     { OOO_STRING_SW_HTML_FF_uletter,     SVX_NUM_CHARS_UPPER_LETTER },
     { OOO_STRING_SW_HTML_FF_lletter,     SVX_NUM_CHARS_LOWER_LETTER },
@@ -102,7 +102,7 @@ static HTMLOptionEnum aHTMLPageNumFldFmtTable[] =
     { 0,                     0 }
 };
 
-static HTMLOptionEnum aHTMLExtUsrFldSubTable[] =
+static HTMLOptionEnum aHTMLExtUsrFieldSubTable[] =
 {
     { OOO_STRING_SW_HTML_FS_company,         EU_COMPANY },
     { OOO_STRING_SW_HTML_FS_firstname,   EU_FIRSTNAME },
@@ -122,14 +122,14 @@ static HTMLOptionEnum aHTMLExtUsrFldSubTable[] =
     { 0,                     0 }
 };
 
-static HTMLOptionEnum aHTMLAuthorFldFmtTable[] =
+static HTMLOptionEnum aHTMLAuthorFieldFormatTable[] =
 {
     { OOO_STRING_SW_HTML_FF_name,        AF_NAME },
     { OOO_STRING_SW_HTML_FF_shortcut,    AF_SHORTCUT },
     { 0,                     0 }
 };
 
-static HTMLOptionEnum aHTMLPageNumFldSubTable[] =
+static HTMLOptionEnum aHTMLPageNumFieldSubTable[] =
 {
     { OOO_STRING_SW_HTML_FS_random,      PG_RANDOM },
     { OOO_STRING_SW_HTML_FS_next,        PG_NEXT },
@@ -145,7 +145,7 @@ static HTMLOptionEnum aHTMLPageNumFldSubTable[] =
     const SwDocInfoSubType DI_INFO3         =  DI_SUBTYPE_END + 3;
     const SwDocInfoSubType DI_INFO4         =  DI_SUBTYPE_END + 4;
 
-static HTMLOptionEnum aHTMLDocInfoFldSubTable[] =
+static HTMLOptionEnum aHTMLDocInfoFieldSubTable[] =
 {
     { OOO_STRING_SW_HTML_FS_title,   DI_TITEL },
     { OOO_STRING_SW_HTML_FS_theme,   DI_THEMA },
@@ -161,7 +161,7 @@ static HTMLOptionEnum aHTMLDocInfoFldSubTable[] =
     { 0,                 0 }
 };
 
-static HTMLOptionEnum aHTMLDocInfoFldFmtTable[] =
+static HTMLOptionEnum aHTMLDocInfoFieldFormatTable[] =
 {
     { OOO_STRING_SW_HTML_FF_author,      DI_SUB_AUTHOR },
     { OOO_STRING_SW_HTML_FF_time,    DI_SUB_TIME },
@@ -169,7 +169,7 @@ static HTMLOptionEnum aHTMLDocInfoFldFmtTable[] =
     { 0,                 0 }
 };
 
-static HTMLOptionEnum aHTMLDocStatFldSubTable[] =
+static HTMLOptionEnum aHTMLDocStatFieldSubTable[] =
 {
     { OOO_STRING_SW_HTML_FS_page,    DS_PAGE },
     { OOO_STRING_SW_HTML_FS_para,    DS_PARA },
@@ -181,7 +181,7 @@ static HTMLOptionEnum aHTMLDocStatFldSubTable[] =
     { 0,                 0 }
 };
 
-static HTMLOptionEnum aHTMLFileNameFldFmtTable[] =
+static HTMLOptionEnum aHTMLFileNameFieldFormatTable[] =
 {
     { OOO_STRING_SW_HTML_FF_name,       FF_NAME },
     { OOO_STRING_SW_HTML_FF_pathname,   FF_PATHNAME },
@@ -193,7 +193,7 @@ static HTMLOptionEnum aHTMLFileNameFldFmtTable[] =
 sal_uInt16 SwHTMLParser::GetNumType( const OUString& rStr, sal_uInt16 nDfltType )
 {
     sal_uInt16 nType = nDfltType;
-    const HTMLOptionEnum *pOptEnums = aHTMLPageNumFldFmtTable;
+    const HTMLOptionEnum *pOptEnums = aHTMLPageNumFieldFormatTable;
     while( pOptEnums->pName )
         if( !rStr.equalsIgnoreAsciiCaseAscii( pOptEnums->pName ) )
             pOptEnums++;
@@ -209,10 +209,10 @@ sal_uInt16 SwHTMLParser::GetNumType( const OUString& rStr, sal_uInt16 nDfltType
 void SwHTMLParser::NewField()
 {
     bool bKnownType = false, bFixed = false,
-         bHasNumFmt = false, bHasNumValue = false;
+         bHasNumFormat = false, bHasNumValue = false;
     sal_uInt16 nType = 0;
-    OUString aValue, aNumFmt, aNumValue, aName;
-    const HTMLOption *pSubOption=0, *pFmtOption=0;
+    OUString aValue, aNumFormat, aNumValue, aName;
+    const HTMLOption *pSubOption=0, *pFormatOption=0;
 
     const HTMLOptions& rHTMLOptions = GetOptions();
     size_t i;
@@ -223,13 +223,13 @@ void SwHTMLParser::NewField()
         switch( rOption.GetToken() )
         {
         case HTML_O_TYPE:
-            bKnownType = rOption.GetEnum( nType, aHTMLFldTypeTable );
+            bKnownType = rOption.GetEnum( nType, aHTMLFieldTypeTable );
             break;
         case HTML_O_SUBTYPE:
             pSubOption = &rOption;
             break;
         case HTML_O_FORMAT:
-            pFmtOption = &rOption;
+            pFormatOption = &rOption;
             break;
         case HTML_O_NAME:
             aName = rOption.GetString();
@@ -238,8 +238,8 @@ void SwHTMLParser::NewField()
             aValue = rOption.GetString();
             break;
         case HTML_O_SDNUM:
-            aNumFmt = rOption.GetString();
-            bHasNumFmt = true;
+            aNumFormat = rOption.GetString();
+            bHasNumFormat = true;
             break;
         case HTML_O_SDVAL:
             aNumValue = rOption.GetString();
@@ -284,7 +284,7 @@ void SwHTMLParser::NewField()
     if( RES_DATEFLD==nType || RES_TIMEFLD==nType )
         nWhich = RES_DATETIMEFLD;
 
-    SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetSysFldType( nWhich );
+    SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetSysFieldType( nWhich );
     SwField *pNewField = 0;
     bool bInsOnEndTag = false;
 
@@ -294,53 +294,53 @@ void SwHTMLParser::NewField()
         if( pSubOption )
         {
             sal_uInt16 nSub;
-            sal_uLong nFmt = 0;
+            sal_uLong nFormat = 0;
             if( bFixed )
             {
-                nFmt |= AF_FIXED;
+                nFormat |= AF_FIXED;
                 bInsOnEndTag = true;
             }
-            if( pSubOption->GetEnum( nSub, aHTMLExtUsrFldSubTable ) )
-                pNewField = new SwExtUserField(static_cast<SwExtUserFieldType*>(pType), nSub, nFmt);
+            if( pSubOption->GetEnum( nSub, aHTMLExtUsrFieldSubTable ) )
+                pNewField = new SwExtUserField(static_cast<SwExtUserFieldType*>(pType), nSub, nFormat);
         }
         break;
 
     case RES_AUTHORFLD:
         {
-            sal_uInt16 nFmt = AF_NAME;
-            if( pFmtOption )
-                pFmtOption->GetEnum( nFmt, aHTMLAuthorFldFmtTable );
+            sal_uInt16 nFormat = AF_NAME;
+            if( pFormatOption )
+                pFormatOption->GetEnum( nFormat, aHTMLAuthorFieldFormatTable );
             if( bFixed )
             {
-                nFmt |= AF_FIXED;
+                nFormat |= AF_FIXED;
                 bInsOnEndTag = true;
             }
 
-            pNewField = new SwAuthorField(static_cast<SwAuthorFieldType*>(pType), nFmt);
+            pNewField = new SwAuthorField(static_cast<SwAuthorFieldType*>(pType), nFormat);
         }
         break;
 
     case RES_DATEFLD:
     case RES_TIMEFLD:
         {
-            sal_uLong nNumFmt = 0;
+            sal_uLong nNumFormat = 0;
             sal_Int64 nTime = tools::Time( tools::Time::SYSTEM ).GetTime();
             sal_Int32 nDate = Date( Date::SYSTEM ).GetDate();
             sal_uInt16 nSub = 0;
-            bool bValidFmt = false;
-            HTMLNumFmtTblEntry * pFmtTbl;
+            bool bValidFormat = false;
+            HTMLNumFormatTableEntry * pFormatTable;
 
             if( RES_DATEFLD==nType )
             {
                 nSub = DATEFLD;
-                pFmtTbl = aHTMLDateFldFmtTable;
+                pFormatTable = aHTMLDateFieldFormatTable;
                 if( !aValue.isEmpty() )
                     nDate = aValue.toInt32();
             }
             else
             {
                 nSub = TIMEFLD;
-                pFmtTbl = aHTMLTimeFldFmtTable;
+                pFormatTable = aHTMLTimeFieldFormatTable;
                 if( !aValue.isEmpty() )
                     nTime = (sal_uLong)aValue.toInt32();
             }
@@ -348,25 +348,25 @@ void SwHTMLParser::NewField()
                 nSub |= FIXEDFLD;
 
             SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
-            if( pFmtOption )
+            if( pFormatOption )
             {
-                const OUString& rFmt = pFmtOption->GetString();
-                for( sal_uInt16 k = 0; pFmtTbl[k].pName; k++ )
+                const OUString& rFormat = pFormatOption->GetString();
+                for( sal_uInt16 k = 0; pFormatTable[k].pName; k++ )
                 {
-                    if( rFmt.equalsIgnoreAsciiCaseAscii( pFmtTbl[k].pName ) )
+                    if( rFormat.equalsIgnoreAsciiCaseAscii( pFormatTable[k].pName ) )
                     {
-                        nNumFmt = pFormatter->GetFormatIndex(
-                                        pFmtTbl[k].eFmt, LANGUAGE_SYSTEM);
-                        bValidFmt = true;
+                        nNumFormat = pFormatter->GetFormatIndex(
+                                        pFormatTable[k].eFormat, LANGUAGE_SYSTEM);
+                        bValidFormat = true;
                         break;
                     }
                 }
             }
-            if( !bValidFmt )
-                nNumFmt = pFormatter->GetFormatIndex( pFmtTbl[i].eFmt,
+            if( !bValidFormat )
+                nNumFormat = pFormatter->GetFormatIndex( pFormatTable[i].eFormat,
                                                       LANGUAGE_SYSTEM);
 
-            pNewField = new SwDateTimeField(static_cast<SwDateTimeFieldType *>(pType), nSub, nNumFmt);
+            pNewField = new SwDateTimeField(static_cast<SwDateTimeFieldType *>(pType), nSub, nNumFormat);
 
             if (nSub & FIXEDFLD)
                 static_cast<SwDateTimeField *>(pNewField)->SetDateTime(DateTime(Date(nDate), tools::Time(nTime)));
@@ -374,18 +374,18 @@ void SwHTMLParser::NewField()
         break;
 
     case RES_DATETIMEFLD:
-        if( bHasNumFmt )
+        if( bHasNumFormat )
         {
             sal_uInt16 nSub = 0;
 
             SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
-            sal_uInt32 nNumFmt;
+            sal_uInt32 nNumFormat;
             LanguageType eLang;
             double dValue = GetTableDataOptionsValNum(
-                                nNumFmt, eLang, aNumValue, aNumFmt,
+                                nNumFormat, eLang, aNumValue, aNumFormat,
                                 *pDoc->GetNumberFormatter() );
-            short nFmtType = pFormatter->GetType( nNumFmt );
-            switch( nFmtType )
+            short nFormatType = pFormatter->GetType( nNumFormat );
+            switch( nFormatType )
             {
             case css::util::NumberFormat::DATE: nSub = DATEFLD; break;
             case css::util::NumberFormat::TIME: nSub = TIMEFLD; break;
@@ -396,7 +396,7 @@ void SwHTMLParser::NewField()
                 if( bHasNumValue )
                     nSub |= FIXEDFLD;
 
-                pNewField = new SwDateTimeField(static_cast<SwDateTimeFieldType *>(pType), nSub, nNumFmt);
+                pNewField = new SwDateTimeField(static_cast<SwDateTimeFieldType *>(pType), nSub, nNumFormat);
                 if (bHasNumValue)
                     static_cast<SwDateTimeField *>(pNewField)->SetValue(dValue);
             }
@@ -407,27 +407,27 @@ void SwHTMLParser::NewField()
         if( pSubOption )
         {
             sal_uInt16 nSub;
-            if( pSubOption->GetEnum( nSub, aHTMLPageNumFldSubTable ) )
+            if( pSubOption->GetEnum( nSub, aHTMLPageNumFieldSubTable ) )
             {
-                sal_uInt16 nFmt = SVX_NUM_PAGEDESC;
-                if( pFmtOption )
-                    pFmtOption->GetEnum( nFmt, aHTMLPageNumFldFmtTable );
+                sal_uInt16 nFormat = SVX_NUM_PAGEDESC;
+                if( pFormatOption )
+                    pFormatOption->GetEnum( nFormat, aHTMLPageNumFieldFormatTable );
 
                 short nOff = 0;
 
-                if( (SvxExtNumType)nFmt!=SVX_NUM_CHAR_SPECIAL && !aValue.isEmpty() )
+                if( (SvxExtNumType)nFormat!=SVX_NUM_CHAR_SPECIAL && !aValue.isEmpty() )
                     nOff = (short)aValue.toInt32();
                 else if( (SwPageNumSubType)nSub == PG_NEXT  )
                     nOff = 1;
                 else if( (SwPageNumSubType)nSub == PG_PREV  )
                     nOff = -1;
 
-                if( (SvxExtNumType)nFmt==SVX_NUM_CHAR_SPECIAL &&
+                if( (SvxExtNumType)nFormat==SVX_NUM_CHAR_SPECIAL &&
                     (SwPageNumSubType)nSub==PG_RANDOM )
-                    nFmt = SVX_NUM_PAGEDESC;
+                    nFormat = SVX_NUM_PAGEDESC;
 
-                pNewField = new SwPageNumberField(static_cast<SwPageNumberFieldType*>(pType), nSub, nFmt, nOff);
-                if ((SvxExtNumType)nFmt == SVX_NUM_CHAR_SPECIAL)
+                pNewField = new SwPageNumberField(static_cast<SwPageNumberFieldType*>(pType), nSub, nFormat, nOff);
+                if ((SvxExtNumType)nFormat == SVX_NUM_CHAR_SPECIAL)
                     static_cast<SwPageNumberField *>(pNewField)->SetUserString(aValue);
             }
         }
@@ -437,25 +437,25 @@ void SwHTMLParser::NewField()
         if( pSubOption )
         {
             sal_uInt16 nSub;
-            if( pSubOption->GetEnum( nSub, aHTMLDocInfoFldSubTable ) )
+            if( pSubOption->GetEnum( nSub, aHTMLDocInfoFieldSubTable ) )
             {
                 sal_uInt16 nExtSub = 0;
                 if( DI_CREATE==(SwDocInfoSubType)nSub ||
                     DI_CHANGE==(SwDocInfoSubType)nSub )
                 {
                     nExtSub = DI_SUB_AUTHOR;
-                    if( pFmtOption )
-                        pFmtOption->GetEnum( nExtSub, aHTMLDocInfoFldFmtTable );
+                    if( pFormatOption )
+                        pFormatOption->GetEnum( nExtSub, aHTMLDocInfoFieldFormatTable );
                     nSub |= nExtSub;
                 }
 
-                sal_uInt32 nNumFmt = 0;
+                sal_uInt32 nNumFormat = 0;
                 double dValue = 0;
-                if( bHasNumFmt && (DI_SUB_DATE==nExtSub || DI_SUB_TIME==nExtSub) )
+                if( bHasNumFormat && (DI_SUB_DATE==nExtSub || DI_SUB_TIME==nExtSub) )
                 {
                     LanguageType eLang;
                     dValue = GetTableDataOptionsValNum(
-                                    nNumFmt, eLang, aNumValue, aNumFmt,
+                                    nNumFormat, eLang, aNumValue, aNumFormat,
                                     *pDoc->GetNumberFormatter() );
                     bFixed &= bHasNumValue;
                 }
@@ -476,7 +476,7 @@ void SwHTMLParser::NewField()
                     bInsOnEndTag = true;
                 }
 
-                pNewField = new SwDocInfoField(static_cast<SwDocInfoFieldType *>(pType), nSub, aName, nNumFmt);
+                pNewField = new SwDocInfoField(static_cast<SwDocInfoFieldType *>(pType), nSub, aName, nNumFormat);
                 if (bHasNumValue)
                     static_cast<SwDocInfoField*>(pNewField)->SetValue(dValue);
             }
@@ -487,29 +487,29 @@ void SwHTMLParser::NewField()
         if( pSubOption )
         {
             sal_uInt16 nSub;
-            if( pSubOption->GetEnum( nSub, aHTMLDocStatFldSubTable ) )
+            if( pSubOption->GetEnum( nSub, aHTMLDocStatFieldSubTable ) )
             {
-                sal_uInt16 nFmt = SVX_NUM_ARABIC;
-                if( pFmtOption )
-                    pFmtOption->GetEnum( nFmt, aHTMLPageNumFldFmtTable );
-                pNewField = new SwDocStatField(static_cast<SwDocStatFieldType*>(pType), nSub, nFmt);
-                bUpdateDocStat |= (DS_PAGE != nFmt);
+                sal_uInt16 nFormat = SVX_NUM_ARABIC;
+                if( pFormatOption )
+                    pFormatOption->GetEnum( nFormat, aHTMLPageNumFieldFormatTable );
+                pNewField = new SwDocStatField(static_cast<SwDocStatFieldType*>(pType), nSub, nFormat);
+                bUpdateDocStat |= (DS_PAGE != nFormat);
             }
         }
         break;
 
     case RES_FILENAMEFLD:
         {
-            sal_uInt16 nFmt = FF_NAME;
-            if( pFmtOption )
-                pFmtOption->GetEnum( nFmt, aHTMLFileNameFldFmtTable );
+            sal_uInt16 nFormat = FF_NAME;
+            if( pFormatOption )
+                pFormatOption->GetEnum( nFormat, aHTMLFileNameFieldFormatTable );
             if( bFixed )
             {
-                nFmt |= FF_FIXED;
+                nFormat |= FF_FIXED;
                 bInsOnEndTag = true;
             }
 
-            pNewField = new SwFileNameField(static_cast<SwFileNameFieldType*>(pType), nFmt);
+            pNewField = new SwFileNameField(static_cast<SwFileNameFieldType*>(pType), nFormat);
         }
         break;
     default:
@@ -524,7 +524,7 @@ void SwHTMLParser::NewField()
         }
         else
         {
-            pDoc->getIDocumentContentOperations().InsertPoolItem(*pPam, SwFmtFld(*pNewField));
+            pDoc->getIDocumentContentOperations().InsertPoolItem(*pPam, SwFormatField(*pNewField));
             delete pNewField;
         }
         bInField = true;
@@ -562,7 +562,7 @@ void SwHTMLParser::EndField()
             break;
         }
 
-        pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFmtFld(*pField) );
+        pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFormatField(*pField) );
         delete pField;
         pField = 0;
     }
@@ -608,9 +608,9 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
     // werden soll, fuegen wir es vor dem Space ein. Dann gibt es
     // weniger Probleme beim Formatieren (bug #40483#)
     const sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
-    SwTxtNode *pTxtNd = pPam->GetNode().GetTxtNode();
+    SwTextNode *pTextNd = pPam->GetNode().GetTextNode();
     bool bMoveFwd = false;
-    if (nPos>0 && pTxtNd && (' ' == pTxtNd->GetTxt()[nPos-1]))
+    if (nPos>0 && pTextNd && (' ' == pTextNd->GetText()[nPos-1]))
     {
         bMoveFwd = true;
 
@@ -624,7 +624,7 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
                 break;
 
             if( RES_TXTATR_FIELD == pAttr->pItem->Which() &&
-                RES_SCRIPTFLD == static_cast<const SwFmtFld *>(pAttr->pItem)->GetField()->GetTyp()->Which() )
+                RES_SCRIPTFLD == static_cast<const SwFormatField *>(pAttr->pItem)->GetField()->GetTyp()->Which() )
             {
                 bMoveFwd = false;
                 break;
@@ -635,10 +635,10 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
             pPam->Move( fnMoveBackward );
     }
 
-    SwPostItField aPostItFld(
-                    static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_POSTITFLD )),
+    SwPostItField aPostItField(
+                    static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )),
                     aEmptyOUStr, aComment, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
-    InsertAttr( SwFmtFld( aPostItFld ) );
+    InsertAttr( SwFormatField( aPostItField ) );
 
     if( bMoveFwd )
         pPam->Move( fnMoveForward );
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 9a2557d8c901..09501c173865 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -37,43 +37,43 @@
 
 using namespace nsSwDocInfoSubType;
 
-const sal_Char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFmt )
+const sal_Char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFormat )
 {
-    const sal_Char *pFmtStr = 0;
+    const sal_Char *pFormatStr = 0;
 
-    switch( (SvxExtNumType)nFmt )
+    switch( (SvxExtNumType)nFormat )
     {
-    case SVX_NUM_CHARS_UPPER_LETTER:    pFmtStr = OOO_STRING_SW_HTML_FF_uletter;    break;
-    case SVX_NUM_CHARS_LOWER_LETTER:    pFmtStr = OOO_STRING_SW_HTML_FF_lletter;    break;
-    case SVX_NUM_ROMAN_UPPER:           pFmtStr = OOO_STRING_SW_HTML_FF_uroman;         break;
-    case SVX_NUM_ROMAN_LOWER:           pFmtStr = OOO_STRING_SW_HTML_FF_lroman;         break;
-    case SVX_NUM_ARABIC:                pFmtStr = OOO_STRING_SW_HTML_FF_arabic;     break;
-    case SVX_NUM_NUMBER_NONE:           pFmtStr = OOO_STRING_SW_HTML_FF_none;       break;
-    case SVX_NUM_CHAR_SPECIAL:          pFmtStr = OOO_STRING_SW_HTML_FF_char;       break;
-    case SVX_NUM_PAGEDESC:              pFmtStr = OOO_STRING_SW_HTML_FF_page;       break;
-    case SVX_NUM_CHARS_UPPER_LETTER_N:  pFmtStr = OOO_STRING_SW_HTML_FF_ulettern;   break;
-    case SVX_NUM_CHARS_LOWER_LETTER_N:  pFmtStr = OOO_STRING_SW_HTML_FF_llettern;   break;
+    case SVX_NUM_CHARS_UPPER_LETTER:    pFormatStr = OOO_STRING_SW_HTML_FF_uletter;    break;
+    case SVX_NUM_CHARS_LOWER_LETTER:    pFormatStr = OOO_STRING_SW_HTML_FF_lletter;    break;
+    case SVX_NUM_ROMAN_UPPER:           pFormatStr = OOO_STRING_SW_HTML_FF_uroman;         break;
+    case SVX_NUM_ROMAN_LOWER:           pFormatStr = OOO_STRING_SW_HTML_FF_lroman;         break;
+    case SVX_NUM_ARABIC:                pFormatStr = OOO_STRING_SW_HTML_FF_arabic;     break;
+    case SVX_NUM_NUMBER_NONE:           pFormatStr = OOO_STRING_SW_HTML_FF_none;       break;
+    case SVX_NUM_CHAR_SPECIAL:          pFormatStr = OOO_STRING_SW_HTML_FF_char;       break;
+    case SVX_NUM_PAGEDESC:              pFormatStr = OOO_STRING_SW_HTML_FF_page;       break;
+    case SVX_NUM_CHARS_UPPER_LETTER_N:  pFormatStr = OOO_STRING_SW_HTML_FF_ulettern;   break;
+    case SVX_NUM_CHARS_LOWER_LETTER_N:  pFormatStr = OOO_STRING_SW_HTML_FF_llettern;   break;
     default:
         ;
     }
 
-    return pFmtStr;
+    return pFormatStr;
 }
 
-static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
-                                 const SwTxtNode& rTxtNd, sal_Int32 nFldPos )
+static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
+                                 const SwTextNode& rTextNd, sal_Int32 nFieldPos )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const SwFieldType* pFldTyp = pFld->GetTyp();
-    sal_uInt16 nField = pFldTyp->Which();
-    sal_uLong nFmt = pFld->GetFormat();
+    const SwFieldType* pFieldTyp = pField->GetTyp();
+    sal_uInt16 nField = pFieldTyp->Which();
+    sal_uLong nFormat = pField->GetFormat();
 
     const sal_Char *pTypeStr=0, // TYPE
                       *pSubStr=0,   // SUBTYPE
-                   *pFmtStr=0;  // FORMAT (SW)
+                   *pFormatStr=0;  // FORMAT (SW)
     OUString aValue;              // VALUE (SW)
-    bool bNumFmt=false;         // SDNUM (Number-Formatter-Format)
+    bool bNumFormat=false;         // SDNUM (Number-Formatter-Format)
     bool bNumValue=false;       // SDVAL (Number-Formatter-Value)
     double dNumValue = 0.0;     // SDVAL (Number-Formatter-Value)
     bool bFixed=false;          // SDFIXED
@@ -83,7 +83,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
     {
         case RES_EXTUSERFLD:
             pTypeStr = OOO_STRING_SW_HTML_FT_sender;
-            switch( (SwExtUserSubType)pFld->GetSubType() )
+            switch( (SwExtUserSubType)pField->GetSubType() )
             {
                 case EU_COMPANY:    pSubStr = OOO_STRING_SW_HTML_FS_company;        break;
                 case EU_FIRSTNAME:  pSubStr = OOO_STRING_SW_HTML_FS_firstname;  break;
@@ -104,34 +104,34 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                     ;
             }
             OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwExtUserField" );
-            bFixed = static_cast<const SwExtUserField*>(pFld)->IsFixed();
+            bFixed = static_cast<const SwExtUserField*>(pField)->IsFixed();
             break;
 
         case RES_AUTHORFLD:
             pTypeStr = OOO_STRING_SW_HTML_FT_author;
-            switch( (SwAuthorFormat)nFmt & 0xff)
+            switch( (SwAuthorFormat)nFormat & 0xff)
             {
-                case AF_NAME:     pFmtStr = OOO_STRING_SW_HTML_FF_name;     break;
-                case AF_SHORTCUT:  pFmtStr = OOO_STRING_SW_HTML_FF_shortcut;    break;
+                case AF_NAME:     pFormatStr = OOO_STRING_SW_HTML_FF_name;     break;
+                case AF_SHORTCUT:  pFormatStr = OOO_STRING_SW_HTML_FF_shortcut;    break;
             }
-            OSL_ENSURE( pFmtStr, "ubekanntes Format fuer SwAuthorField" );
-            bFixed = static_cast<const SwAuthorField*>(pFld)->IsFixed();
+            OSL_ENSURE( pFormatStr, "ubekanntes Format fuer SwAuthorField" );
+            bFixed = static_cast<const SwAuthorField*>(pField)->IsFixed();
             break;
 
         case RES_DATETIMEFLD:
             pTypeStr = OOO_STRING_SW_HTML_FT_datetime;
-            bNumFmt = true;
-            if( static_cast<const SwDateTimeField*>(pFld)->IsFixed() )
+            bNumFormat = true;
+            if( static_cast<const SwDateTimeField*>(pField)->IsFixed() )
             {
                 bNumValue = true;
-                dNumValue = static_cast<const SwDateTimeField*>(pFld)->GetValue();
+                dNumValue = static_cast<const SwDateTimeField*>(pField)->GetValue();
             }
             break;
 
         case RES_PAGENUMBERFLD:
             {
                 pTypeStr = OOO_STRING_SW_HTML_FT_page;
-                SwPageNumSubType eSubType = (SwPageNumSubType)pFld->GetSubType();
+                SwPageNumSubType eSubType = (SwPageNumSubType)pField->GetSubType();
                 switch( eSubType )
                 {
                     case PG_RANDOM:     pSubStr = OOO_STRING_SW_HTML_FS_random;     break;
@@ -139,15 +139,15 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                     case PG_PREV:       pSubStr = OOO_STRING_SW_HTML_FS_prev;       break;
                 }
                 OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwPageNumberField" );
-                pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) );
+                pFormatStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFormat) );
 
-                if( (SvxExtNumType)nFmt==SVX_NUM_CHAR_SPECIAL )
+                if( (SvxExtNumType)nFormat==SVX_NUM_CHAR_SPECIAL )
                 {
-                    aValue = static_cast<const SwPageNumberField *>(pFld)->GetUserString();
+                    aValue = static_cast<const SwPageNumberField *>(pField)->GetUserString();
                 }
                 else
                 {
-                    const OUString& rValue = pFld->GetPar2();
+                    const OUString& rValue = pField->GetPar2();
                     short nValue = (short)rValue.toInt32();
                     if( (eSubType == PG_NEXT && nValue!=1) ||
                         (eSubType == PG_PREV && nValue!=-1) ||
@@ -160,7 +160,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
             break;
         case RES_DOCINFOFLD:
             {
-                sal_uInt16 nSubType = pFld->GetSubType();
+                sal_uInt16 nSubType = pField->GetSubType();
                 pTypeStr = OOO_STRING_SW_HTML_FT_docinfo;
                 sal_uInt16 nExtSubType = nSubType & 0x0f00;
                 nSubType &= 0x00ff;
@@ -178,7 +178,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                 }
 
                 if( DI_CUSTOM == nSubType ) {
-                    aName = static_cast<const SwDocInfoField*>(pFld)->GetName();
+                    aName = static_cast<const SwDocInfoField*>(pField)->GetName();
                 }
 
                 if( DI_CREATE == nSubType || DI_CHANGE == nSubType )
@@ -186,34 +186,34 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                     switch( nExtSubType )
                     {
                         case DI_SUB_AUTHOR:
-                            pFmtStr = OOO_STRING_SW_HTML_FF_author;
+                            pFormatStr = OOO_STRING_SW_HTML_FF_author;
                             break;
                         case DI_SUB_TIME:
-                            pFmtStr = OOO_STRING_SW_HTML_FF_time;
-                            bNumFmt = true;
+                            pFormatStr = OOO_STRING_SW_HTML_FF_time;
+                            bNumFormat = true;
                             break;
                         case DI_SUB_DATE:
-                            pFmtStr = OOO_STRING_SW_HTML_FF_date;
-                            bNumFmt = true;
+                            pFormatStr = OOO_STRING_SW_HTML_FF_date;
+                            bNumFormat = true;
                             break;
                     }
                 }
-                bFixed = static_cast<const SwDocInfoField*>(pFld)->IsFixed();
-                if( bNumFmt )
+                bFixed = static_cast<const SwDocInfoField*>(pField)->IsFixed();
+                if( bNumFormat )
                 {
                     if( bFixed )
                     {
                         // Fuer ein fixes Feld och den Num-Value ausgeben.
                         // Fixe Felder ohne Zahlenformate sollte es
                         // eigentlich nicht geben. OSL_ENSURE(ist unten.
-                        dNumValue = static_cast<const SwDocInfoField*>(pFld)->GetValue();
+                        dNumValue = static_cast<const SwDocInfoField*>(pField)->GetValue();
                         bNumValue = true;
                     }
-                    else if( !nFmt  )
+                    else if( !nFormat  )
                     {
                         // Nicht fixe Felder muessen kein Zahlenformat haben,
                         // wenn sie aus 4.0-Dokumenten stammen.
-                        bNumFmt = false;
+                        bNumFormat = false;
                     }
                 }
             }
@@ -222,7 +222,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
         case RES_DOCSTATFLD:
             {
                 pTypeStr = OOO_STRING_SW_HTML_FT_docstat;
-                sal_uInt16 nSubType = pFld->GetSubType();
+                sal_uInt16 nSubType = pField->GetSubType();
                 switch( nSubType )
                 {
                     case DS_PAGE:       pSubStr = OOO_STRING_SW_HTML_FS_page;   break;
@@ -234,23 +234,23 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                     case DS_OLE:        pSubStr = OOO_STRING_SW_HTML_FS_ole;    break;
                     default:            pTypeStr = 0;               break;
                 }
-                pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) );
+                pFormatStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFormat) );
             }
             break;
 
         case RES_FILENAMEFLD:
             pTypeStr = OOO_STRING_SW_HTML_FT_filename;
-            switch( (SwFileNameFormat)(nFmt & ~FF_FIXED) )
+            switch( (SwFileNameFormat)(nFormat & ~FF_FIXED) )
             {
-                case FF_NAME:       pFmtStr = OOO_STRING_SW_HTML_FF_name;       break;
-                case FF_PATHNAME:   pFmtStr = OOO_STRING_SW_HTML_FF_pathname;   break;
-                case FF_PATH:       pFmtStr = OOO_STRING_SW_HTML_FF_path;       break;
-                case FF_NAME_NOEXT: pFmtStr = OOO_STRING_SW_HTML_FF_name_noext; break;
+                case FF_NAME:       pFormatStr = OOO_STRING_SW_HTML_FF_name;       break;
+                case FF_PATHNAME:   pFormatStr = OOO_STRING_SW_HTML_FF_pathname;   break;
+                case FF_PATH:       pFormatStr = OOO_STRING_SW_HTML_FF_path;       break;
+                case FF_NAME_NOEXT: pFormatStr = OOO_STRING_SW_HTML_FF_name_noext; break;
                 default:
                     ;
             }
-            bFixed = static_cast<const SwFileNameField*>(pFld)->IsFixed();
-            OSL_ENSURE( pFmtStr, "unbekanntes Format fuer SwFileNameField" );
+            bFixed = static_cast<const SwFileNameField*>(pField)->IsFixed();
+            OSL_ENSURE( pFormatStr, "unbekanntes Format fuer SwFileNameField" );
             break;
     }
 
@@ -267,10 +267,10 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_subtype).
                 append('=').append(pSubStr);
         }
-        if( pFmtStr )
+        if( pFormatStr )
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_format).
-                append('=').append(pFmtStr);
+                append('=').append(pFormatStr);
         }
         if( !aName.isEmpty() )
         {
@@ -288,11 +288,11 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
             HTMLOutFuncs::Out_String( rWrt.Strm(), aValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
             sOut.append('\"');
         }
-        if( bNumFmt )
+        if( bNumFormat )
         {
-            OSL_ENSURE( nFmt, "Zahlenformat ist 0" );
+            OSL_ENSURE( nFormat, "Zahlenformat ist 0" );
             sOut.append(HTMLOutFuncs::CreateTableDataOptionsValNum(
-                bNumValue, dNumValue, nFmt,
+                bNumValue, dNumValue, nFormat,
                 *rHTMLWrt.pDoc->GetNumberFormatter(), rHTMLWrt.eDestEnc,
                 &rHTMLWrt.aNonConvertableCharacters));
         }
@@ -305,7 +305,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
     }
 
     // Inhalt des Feldes ausgeben
-    OUString const sExpand( pFld->ExpandField(true) );
+    OUString const sExpand( pField->ExpandField(true) );
     bool bNeedsCJKProcessing = false;
     if( !sExpand.isEmpty() )
     {
@@ -331,7 +331,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                                    RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
                                    RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT,
                                    0 );
-        rTxtNd.GetAttr( aScriptItemSet, nFldPos, nFldPos+1 );
+        rTextNd.GetAttr( aScriptItemSet, nFieldPos, nFieldPos+1 );
 
         sal_uInt16 aWesternWhichIds[4] =
             { RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
@@ -431,34 +431,34 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
     return rWrt;
 }
 
-Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
+Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt )
 {
-    const SwFmtFld & rFld = static_cast<const SwFmtFld&>(rHt);
-    const SwField* pFld = rFld.GetField();
-    const SwFieldType* pFldTyp = pFld->GetTyp();
+    const SwFormatField & rField = static_cast<const SwFormatField&>(rHt);
+    const SwField* pField = rField.GetField();
+    const SwFieldType* pFieldTyp = pField->GetTyp();
 
-    if( RES_SETEXPFLD == pFldTyp->Which() &&
-        (nsSwGetSetExpType::GSE_STRING & pFld->GetSubType()) )
+    if( RES_SETEXPFLD == pFieldTyp->Which() &&
+        (nsSwGetSetExpType::GSE_STRING & pField->GetSubType()) )
     {
-        const bool bOn = pFldTyp->GetName() == "HTML_ON";
-        if (!bOn && pFldTyp->GetName() != "HTML_OFF")
+        const bool bOn = pFieldTyp->GetName() == "HTML_ON";
+        if (!bOn && pFieldTyp->GetName() != "HTML_OFF")
             return rWrt;
 
-        OUString rTxt(comphelper::string::strip(pFld->GetPar2(), ' '));
+        OUString rText(comphelper::string::strip(pField->GetPar2(), ' '));
         rWrt.Strm().WriteChar( '<' );
         if( !bOn )
             rWrt.Strm().WriteChar( '/' );
         // TODO: HTML-Tags are written without entitities, that for, characters
         // not contained in the destination encoding are lost!
-        OString sTmp(OUStringToOString(rTxt,
+        OString sTmp(OUStringToOString(rText,
             static_cast<SwHTMLWriter&>(rWrt).eDestEnc));
         rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteChar( '>' );
     }
-    else if( RES_POSTITFLD == pFldTyp->Which() )
+    else if( RES_POSTITFLD == pFieldTyp->Which() )
     {
         // Kommentare werden im ANSI-Zeichensetz, aber mit System-Zeilen-
         // Umbruechen gesschrieben.
-        const OUString& rComment = pFld->GetPar2();
+        const OUString& rComment = pField->GetPar2();
         bool bWritten = false;
 
         if( (rComment.getLength() >= 6 && rComment.startsWith("<") && rComment.endsWith(">") &&
@@ -506,19 +506,19 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
             rWrt.Strm().WriteCharPtr( sOut.getStr() );
         }
     }
-    else if( RES_SCRIPTFLD == pFldTyp->Which() )
+    else if( RES_SCRIPTFLD == pFieldTyp->Which() )
     {
         SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
         if( rHTMLWrt.bLFPossible )
             rHTMLWrt.OutNewLine( true );
 
-        bool bURL = static_cast<const SwScriptField *>(pFld)->IsCodeURL();
-        const OUString& rType = pFld->GetPar1();
+        bool bURL = static_cast<const SwScriptField *>(pField)->IsCodeURL();
+        const OUString& rType = pField->GetPar1();
         OUString aContents, aURL;
         if(bURL)
-            aURL = pFld->GetPar2();
+            aURL = pField->GetPar2();
         else
-            aContents = pFld->GetPar2();
+            aContents = pField->GetPar2();
 
         // sonst ist es der Script-Inhalt selbst. Da nur noh JavaScript
         // in Feldern landet, muss es sich um JavaSrript handeln ...:)
@@ -530,11 +530,11 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
     }
     else
     {
-        const SwTxtFld *pTxtFld = rFld.GetTxtFld();
-        OSL_ENSURE( pTxtFld, "Where is the txt fld?" );
-        if( pTxtFld )
-            OutHTML_SwField( rWrt, pFld, pTxtFld->GetTxtNode(),
-                             pTxtFld->GetStart()  );
+        const SwTextField *pTextField = rField.GetTextField();
+        OSL_ENSURE( pTextField, "Where is the txt fld?" );
+        if( pTextField )
+            OutHTML_SwField( rWrt, pField, pTextField->GetTextNode(),
+                             pTextField->GetStart()  );
     }
     return rWrt;
 }
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 15fcdb99b92c..d7320398f63d 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -38,32 +38,32 @@ using namespace css;
 SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly,
                                   const SdrObject *pSdrObj,
                                   sal_uInt8 nOutMode ) :
-    pFrmFmt( &rPosFly.GetFmt() ),
+    pFrameFormat( &rPosFly.GetFormat() ),
     pSdrObject( pSdrObj ),
     pNdIdx( new SwNodeIndex( rPosFly.GetNdIndex() ) ),
     nOrdNum( rPosFly.GetOrdNum() ),
-    nCntntIdx( 0 ),
+    nContentIdx( 0 ),
     nOutputMode( nOutMode )
 {
-    const SwFmtAnchor& rAnchor = rPosFly.GetFmt().GetAnchor();
+    const SwFormatAnchor& rAnchor = rPosFly.GetFormat().GetAnchor();
     if ((FLY_AT_CHAR == rAnchor.GetAnchorId()) &&
         HTML_POS_INSIDE == GetOutPos() )
     {
         // Auto-gebundene Rahmen werden ein Zeichen weiter hinten
         // ausgegeben, weil dann die Positionierung mit Netscape
         // uebereinstimmt.
-        OSL_ENSURE( rAnchor.GetCntntAnchor(), "Keine Anker-Position?" );
-        if( rAnchor.GetCntntAnchor() )
+        OSL_ENSURE( rAnchor.GetContentAnchor(), "Keine Anker-Position?" );
+        if( rAnchor.GetContentAnchor() )
         {
-            nCntntIdx = rAnchor.GetCntntAnchor()->nContent.GetIndex();
-            sal_Int16 eHoriRel = rPosFly.GetFmt().GetHoriOrient().
+            nContentIdx = rAnchor.GetContentAnchor()->nContent.GetIndex();
+            sal_Int16 eHoriRel = rPosFly.GetFormat().GetHoriOrient().
                                                 GetRelationOrient();
             if( text::RelOrientation::FRAME == eHoriRel || text::RelOrientation::PRINT_AREA == eHoriRel )
             {
-                const SwCntntNode *pCNd = pNdIdx->GetNode().GetCntntNode();
+                const SwContentNode *pCNd = pNdIdx->GetNode().GetContentNode();
                 OSL_ENSURE( pCNd, "Kein Content-Node an PaM-Position" );
-                if( pCNd && nCntntIdx < pCNd->Len() )
-                    nCntntIdx++;
+                if( pCNd && nContentIdx < pCNd->Len() )
+                    nContentIdx++;
             }
         }
     }
@@ -73,7 +73,7 @@ bool SwHTMLPosFlyFrm::operator<( const SwHTMLPosFlyFrm& rFrm ) const
 {
     if( pNdIdx->GetIndex() == rFrm.pNdIdx->GetIndex() )
     {
-        if( nCntntIdx == rFrm.nCntntIdx )
+        if( nContentIdx == rFrm.nContentIdx )
         {
             if( GetOutPos() == rFrm.GetOutPos() )
                 return nOrdNum < rFrm.nOrdNum;
@@ -81,7 +81,7 @@ bool SwHTMLPosFlyFrm::operator<( const SwHTMLPosFlyFrm& rFrm ) const
                 return GetOutPos() < rFrm.GetOutPos();
         }
         else
-            return nCntntIdx < rFrm.nCntntIdx;
+            return nContentIdx < rFrm.nContentIdx;
     }
     else
         return pNdIdx->GetIndex() < rFrm.pNdIdx->GetIndex();
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index 3cdee81cd1ca..d3bce6bbaa46 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -24,7 +24,7 @@
 #include <o3tl/sorted_vector.hxx>
 
 class SdrObject;
-class SwFrmFmt;
+class SwFrameFormat;
 class SwNodeIndex;
 class SwPosFlyFrm;
 
@@ -84,11 +84,11 @@ extern sal_uInt8 aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS];
 
 class SwHTMLPosFlyFrm
 {
-    const SwFrmFmt      *pFrmFmt;       // der Rahmen
+    const SwFrameFormat      *pFrameFormat;       // der Rahmen
     const SdrObject     *pSdrObject;    // ggf. Sdr-Objekt
     SwNodeIndex         *pNdIdx;        // Node-Index
     sal_uInt32              nOrdNum;        // Aus SwPosFlyFrm
-    sal_Int32          nCntntIdx;      // seine Position im Content
+    sal_Int32          nContentIdx;      // seine Position im Content
     sal_uInt8               nOutputMode;    // Ausgabe-Infos
 
 public:
@@ -99,12 +99,12 @@ public:
     bool operator==( const SwHTMLPosFlyFrm& ) const { return false; }
     bool operator<( const SwHTMLPosFlyFrm& ) const;
 
-    const SwFrmFmt& GetFmt() const { return *pFrmFmt; }
+    const SwFrameFormat& GetFormat() const { return *pFrameFormat; }
     const SdrObject *GetSdrObject() const { return pSdrObject; }
 
     const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
 
-    sal_Int32 GetCntntIndex() const    { return nCntntIdx; }
+    sal_Int32 GetContentIndex() const    { return nContentIdx; }
 
     sal_uInt8 GetOutMode() const { return nOutputMode; }
 
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index ff4104f4c253..fe05420c5b31 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -126,19 +126,19 @@ const sal_uLong HTML_FRMOPTS_CNTNR          =
     HTML_FRMOPT_ABSSIZE |
     HTML_FRMOPT_S_PIXSIZE;
 
-static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt );
-static Writer& OutHTML_FrmFmtAsMulticol( Writer& rWrt, const SwFrmFmt& rFmt,
+static Writer& OutHTML_FrameFormatTableNode( Writer& rWrt, const SwFrameFormat& rFrameFormat );
+static Writer& OutHTML_FrameFormatAsMulticol( Writer& rWrt, const SwFrameFormat& rFormat,
                                          bool bInCntnr );
-static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFmt );
-static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
-                                          const SwFrmFmt& rFrmFmt, bool bSpan );
-static Writer& OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFmt,
+static Writer& OutHTML_FrameFormatAsSpacer( Writer& rWrt, const SwFrameFormat& rFormat );
+static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
+                                          const SwFrameFormat& rFrameFormat, bool bSpan );
+static Writer& OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& rFormat,
                                       bool bInCntnr );
 
-static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFmt,
+static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rFormat,
                                       bool bInCntnr );
 
-static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+static Writer& OutHTML_FrameFormatAsMarquee( Writer& rWrt, const SwFrameFormat& rFrameFormat,
                                         const SdrObject& rSdrObj    );
 
 extern HTMLOutEvent aAnchorEventTable[];
@@ -158,18 +158,18 @@ static HTMLOutEvent aIMapEventTable[] =
     { 0,                        0,                      0                           }
 };
 
-sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
+sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat,
                                    const SdrObject*& rpSdrObj )
 {
     SwHTMLFrmType eType;
 
-    if( RES_DRAWFRMFMT == rFrmFmt.Which() )
+    if( RES_DRAWFRMFMT == rFrameFormat.Which() )
     {
         // Als Default irgendein Zeichen-Objekt
         eType = HTML_FRMTYPE_DRAW;
 
         const SdrObject *pObj =
-            SwHTMLWriter::GetMarqueeTextObj( static_cast<const SwDrawFrmFmt &>(rFrmFmt) );
+            SwHTMLWriter::GetMarqueeTextObj( static_cast<const SwDrawFrameFormat &>(rFrameFormat) );
         if( pObj )
         {
             // Laufschrift
@@ -178,7 +178,7 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
         }
         else
         {
-            pObj = GetHTMLControl( static_cast<const SwDrawFrmFmt &>(rFrmFmt) );
+            pObj = GetHTMLControl( static_cast<const SwDrawFrameFormat &>(rFrameFormat) );
 
             if( pObj )
             {
@@ -193,8 +193,8 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
         // Als Default ein Textrahmen
         eType = HTML_FRMTYPE_TEXT;
 
-        const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
-        sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
+        const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+        sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex()+1;
         const SwNode* pNd = pDoc->GetNodes()[ nStt ];
 
         if( pNd->IsGrfNode() )
@@ -212,36 +212,36 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
             sal_uLong nEnd = pDoc->GetNodes()[nStt-1]->EndOfSectionIndex();
 
             const SfxPoolItem* pItem;
-            const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+            const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
             if( SfxItemState::SET == rItemSet.GetItemState( RES_COL,
                                                        true, &pItem ) &&
-                static_cast<const SwFmtCol *>(pItem)->GetNumCols() > 1 )
+                static_cast<const SwFormatCol *>(pItem)->GetNumCols() > 1 )
             {
                 // spaltiger Rahmen
                 eType = HTML_FRMTYPE_MULTICOL;
             }
             else if( pNd->IsTableNode() )
             {
-                const SwTableNode *pTblNd = pNd->GetTableNode();
-                sal_uLong nTblEnd = pTblNd->EndOfSectionIndex();
+                const SwTableNode *pTableNd = pNd->GetTableNode();
+                sal_uLong nTableEnd = pTableNd->EndOfSectionIndex();
 
-                if( nTblEnd+1 == nEnd )
+                if( nTableEnd+1 == nEnd )
                 {
                     // Tabelle
                     eType = HTML_FRMTYPE_TABLE;
                 }
-                else if( nTblEnd+2 == nEnd )
+                else if( nTableEnd+2 == nEnd )
                 {
                     // Tabelle mit Unterschrft
                     eType = HTML_FRMTYPE_TABLE_CAP;
                 }
             }
-            else if( pNd->IsTxtNode() )
+            else if( pNd->IsTextNode() )
             {
-                const SwTxtNode *pTxtNd = pNd->GetTxtNode();
+                const SwTextNode *pTextNd = pNd->GetTextNode();
 
                 bool bEmpty = false;
-                if( nStt==nEnd-1 && !pTxtNd->Len() )
+                if( nStt==nEnd-1 && !pTextNd->Len() )
                 {
                     // leerer Rahmen? Nur wenn kein Rahmen am
                     // Text- oder Start-Node verankert ist.
@@ -260,7 +260,7 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
                 }
                 if( bEmpty )
                 {
-                    SvxBrushItem aBrush = rFrmFmt.makeBackgroundBrushItem();
+                    SvxBrushItem aBrush = rFrameFormat.makeBackgroundBrushItem();
                     /// background is not empty, if it has a background graphic
                     /// or its background color is not "no fill"/"auto fill".
                     if( GPOS_NONE != aBrush.GetGraphicPos() ||
@@ -274,9 +274,9 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
                 }
                 else if( pDoc->GetNodes()[nStt+1]->IsTableNode() )
                 {
-                    const SwTableNode *pTblNd =
+                    const SwTableNode *pTableNd =
                         pDoc->GetNodes()[nStt+1]->GetTableNode();
-                    if( pTblNd->EndOfSectionIndex()+1 == nEnd )
+                    if( pTableNd->EndOfSectionIndex()+1 == nEnd )
                     {
                         // Tabelle mit Ueberschrift
                         eType = HTML_FRMTYPE_TABLE_CAP;
@@ -294,19 +294,19 @@ void SwHTMLWriter::CollectFlyFrms()
     OSL_ENSURE( HTML_CFG_MAX+1 == MAX_BROWSERS,
             "number of browser configurations has changed" );
 
-    SwPosFlyFrms aFlyPos(pDoc->GetAllFlyFmts(bWriteAll ? 0 : pCurPam, true));
+    SwPosFlyFrms aFlyPos(pDoc->GetAllFlyFormats(bWriteAll ? 0 : pCurPam, true));
 
     for(SwPosFlyFrms::const_iterator aIter(aFlyPos.begin()); aIter != aFlyPos.end(); ++aIter)
     {
-        const SwFrmFmt& rFrmFmt = (*aIter)->GetFmt();
+        const SwFrameFormat& rFrameFormat = (*aIter)->GetFormat();
         const SdrObject *pSdrObj = 0;
         const SwPosition *pAPos;
-        const SwCntntNode *pACNd;
-        SwHTMLFrmType eType = (SwHTMLFrmType)GuessFrmType( rFrmFmt, pSdrObj );
+        const SwContentNode *pACNd;
+        SwHTMLFrmType eType = (SwHTMLFrmType)GuessFrmType( rFrameFormat, pSdrObj );
 
         sal_uInt8 nMode;
-        const SwFmtAnchor& rAnchor = rFrmFmt.GetAnchor();
-        sal_Int16 eHoriRel = rFrmFmt.GetHoriOrient().GetRelationOrient();
+        const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
+        sal_Int16 eHoriRel = rFrameFormat.GetHoriOrient().GetRelationOrient();
         switch( rAnchor.GetAnchorId() )
         {
         case FLY_AT_PAGE:
@@ -319,12 +319,12 @@ void SwHTMLWriter::CollectFlyFrms()
             // Absatz geschrieben, wenn der Absatz einen Abstand
             // hat.
             if( text::RelOrientation::FRAME == eHoriRel &&
-                (pAPos = rAnchor.GetCntntAnchor()) != 0 &&
-                (pACNd = pAPos->nNode.GetNode().GetCntntNode()) != 0 )
+                (pAPos = rAnchor.GetContentAnchor()) != 0 &&
+                (pACNd = pAPos->nNode.GetNode().GetContentNode()) != 0 )
             {
                 const SvxLRSpaceItem& rLRItem =
                     static_cast<const SvxLRSpaceItem&>(pACNd->GetAttr(RES_LR_SPACE));
-                if( rLRItem.GetTxtLeft() || rLRItem.GetRight() )
+                if( rLRItem.GetTextLeft() || rLRItem.GetRight() )
                 {
                     nMode = aHTMLOutFrmParaFrameTable[eType][nExportMode];
                     break;
@@ -353,7 +353,7 @@ void SwHTMLWriter::CollectFlyFrms()
     }
 }
 
-bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uInt8 nPos,
+bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8 nPos,
                               HTMLOutContext *pContext )
 {
     bool bFlysLeft = false; // Noch Flys an aktueller Node-Position da?
@@ -378,7 +378,7 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uInt8 n
             SwHTMLPosFlyFrm *pPosFly = (*pHTMLPosFlyFrms)[i];
             if( ( HTML_POS_ANY == nPos ||
                   pPosFly->GetOutPos() == nPos ) &&
-                pPosFly->GetCntntIndex() == nCntntIdx )
+                pPosFly->GetContentIndex() == nContentIdx )
             {
                 // Erst entfernen ist wichtig, weil in tieferen
                 // Rekursionen evtl. weitere Eintraege oder das
@@ -399,7 +399,7 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uInt8 n
                     pContext = 0; // one time only
                 }
 
-                OutFrmFmt( pPosFly->GetOutMode(), pPosFly->GetFmt(),
+                OutFrameFormat( pPosFly->GetOutMode(), pPosFly->GetFormat(),
                            pPosFly->GetSdrObject() );
                 switch( pPosFly->GetOutFn() )
                 {
@@ -422,7 +422,7 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uInt8 n
     return bFlysLeft;
 }
 
-void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
+void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameFormat,
                               const SdrObject *pSdrObject )
 {
     sal_uInt8 nCntnrMode = SwHTMLPosFlyFrm::GetOutCntnr( nMode );
@@ -452,7 +452,7 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
 
         if( IsHTMLMode( HTMLMODE_BORDER_NONE ) )
            nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
-        OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags, pSdrObject );
+        OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags, pSdrObject );
         Strm().WriteChar( '>' );
 
         if( HTML_CNTNR_DIV == nCntnrMode )
@@ -466,44 +466,44 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
     {
     case HTML_OUT_TBLNODE:      // OK
         OSL_ENSURE( !pCntnrStr, "Table: Container ist hier nicht vorgesehen" );
-        OutHTML_FrmFmtTableNode( *this, rFrmFmt );
+        OutHTML_FrameFormatTableNode( *this, rFrameFormat );
         break;
     case HTML_OUT_GRFNODE:      // OK
-        OutHTML_FrmFmtGrfNode( *this, rFrmFmt, pCntnrStr != 0 );
+        OutHTML_FrameFormatGrfNode( *this, rFrameFormat, pCntnrStr != 0 );
         break;
     case HTML_OUT_OLENODE:      // OK
-        OutHTML_FrmFmtOLENode( *this, rFrmFmt, pCntnrStr != 0 );
+        OutHTML_FrameFormatOLENode( *this, rFrameFormat, pCntnrStr != 0 );
         break;
     case HTML_OUT_OLEGRF:       // OK
-        OutHTML_FrmFmtOLENodeGrf( *this, rFrmFmt, pCntnrStr != 0 );
+        OutHTML_FrameFormatOLENodeGrf( *this, rFrameFormat, pCntnrStr != 0 );
         break;
     case HTML_OUT_DIV:
     case HTML_OUT_SPAN:
         OSL_ENSURE( !pCntnrStr, "Div: Container ist hier nicht vorgesehen" );
-        OutHTML_FrmFmtAsDivOrSpan( *this, rFrmFmt, HTML_OUT_SPAN==nOutMode );
+        OutHTML_FrameFormatAsDivOrSpan( *this, rFrameFormat, HTML_OUT_SPAN==nOutMode );
         break;
     case HTML_OUT_MULTICOL:     // OK
-        OutHTML_FrmFmtAsMulticol( *this, rFrmFmt, pCntnrStr != 0 );
+        OutHTML_FrameFormatAsMulticol( *this, rFrameFormat, pCntnrStr != 0 );
         break;
     case HTML_OUT_SPACER:       // OK
         OSL_ENSURE( !pCntnrStr, "Spacer: Container ist hier nicht vorgesehen" );
-        OutHTML_FrmFmtAsSpacer( *this, rFrmFmt );
+        OutHTML_FrameFormatAsSpacer( *this, rFrameFormat );
         break;
     case HTML_OUT_CONTROL:      // OK
-        OutHTML_DrawFrmFmtAsControl( *this,
-                                    static_cast<const SwDrawFrmFmt &>(rFrmFmt), dynamic_cast<const SdrUnoObj&>(*pSdrObject),
+        OutHTML_DrawFrameFormatAsControl( *this,
+                                    static_cast<const SwDrawFrameFormat &>(rFrameFormat), dynamic_cast<const SdrUnoObj&>(*pSdrObject),
                                     pCntnrStr != 0 );
         break;
     case HTML_OUT_AMARQUEE:
-        OutHTML_FrmFmtAsMarquee( *this, rFrmFmt, *pSdrObject );
+        OutHTML_FrameFormatAsMarquee( *this, rFrameFormat, *pSdrObject );
         break;
     case HTML_OUT_MARQUEE:
         OSL_ENSURE( !pCntnrStr, "Marquee: Container ist hier nicht vorgesehen" );
-        OutHTML_DrawFrmFmtAsMarquee( *this,
-                    static_cast<const SwDrawFrmFmt &>(rFrmFmt), *pSdrObject );
+        OutHTML_DrawFrameFormatAsMarquee( *this,
+                    static_cast<const SwDrawFrameFormat &>(rFrameFormat), *pSdrObject );
         break;
     case HTML_OUT_GRFFRM:
-        OutHTML_FrmFmtAsImage( *this, rFrmFmt, pCntnrStr != 0 );
+        OutHTML_FrameFormatAsImage( *this, rFrameFormat, pCntnrStr != 0 );
         break;
     }
 
@@ -519,26 +519,26 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
         HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, false );
 }
 
-OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
-                                     const OUString& rAlternateTxt,
+OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
+                                     const OUString& rAlternateText,
                                      sal_uInt32 nFrmOpts,
                                      const OString &rEndTags )
 {
     OString sRetEndTags(rEndTags);
     OStringBuffer sOut;
     const SfxPoolItem* pItem;
-    const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+    const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
 
     // Name
     if( (nFrmOpts & (HTML_FRMOPT_ID|HTML_FRMOPT_NAME)) &&
-        !rFrmFmt.GetName().isEmpty() )
+        !rFrameFormat.GetName().isEmpty() )
     {
         const sal_Char *pStr =
             (nFrmOpts & HTML_FRMOPT_ID) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name;
         sOut.append(' ').append(pStr).
             append("=\"");
         Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-        HTMLOutFuncs::Out_String( Strm(), rFrmFmt.GetName(), eDestEnc, &aNonConvertableCharacters );
+        HTMLOutFuncs::Out_String( Strm(), rFrameFormat.GetName(), eDestEnc, &aNonConvertableCharacters );
         sOut.append('\"');
     }
 
@@ -551,25 +551,25 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
     }
 
     // ALT
-    if( (nFrmOpts & HTML_FRMOPT_ALT) && !rAlternateTxt.isEmpty() )
+    if( (nFrmOpts & HTML_FRMOPT_ALT) && !rAlternateText.isEmpty() )
     {
         sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt).
             append("=\"");
         Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-        HTMLOutFuncs::Out_String( Strm(), rAlternateTxt, eDestEnc, &aNonConvertableCharacters );
+        HTMLOutFuncs::Out_String( Strm(), rAlternateText, eDestEnc, &aNonConvertableCharacters );
         sOut.append('\"');
     }
 
     // ALIGN
     const sal_Char *pStr = 0;
-    RndStdIds eAnchorId = rFrmFmt.GetAnchor().GetAnchorId();
+    RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId();
     if( (nFrmOpts & HTML_FRMOPT_ALIGN) &&
         ((FLY_AT_PARA == eAnchorId) || (FLY_AT_CHAR == eAnchorId)) )
     {
         // MIB 12.3.98: Ist es nicht schlauer, absatzgebundene
         // Rahmen notfalls links auszurichten als sie
         // zeichengebunden einzufuegen???
-        const SwFmtHoriOrient& rHoriOri = rFrmFmt.GetHoriOrient();
+        const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient();
         if( !(nFrmOpts & HTML_FRMOPT_S_ALIGN) ||
             text::RelOrientation::FRAME == rHoriOri.GetRelationOrient() ||
             text::RelOrientation::PRINT_AREA == rHoriOri.GetRelationOrient() )
@@ -584,7 +584,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
           (FLY_AS_CHAR == eAnchorId) ) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, true, &pItem ))
     {
-        switch( static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() )
+        switch( static_cast<const SwFormatVertOrient*>(pItem)->GetVertOrient() )
         {
         case text::VertOrientation::LINE_TOP:     pStr = OOO_STRING_SVTOOLS_HTML_VA_top;        break;
         case text::VertOrientation::CHAR_TOP:
@@ -677,9 +677,9 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
     if( (nFrmOpts & HTML_FRMOPT_SIZE) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ) &&
         ( (nFrmOpts & HTML_FRMOPT_ANYSIZE) ||
-          ATT_FIX_SIZE == static_cast<const SwFmtFrmSize *>(pItem)->GetHeightSizeType()) )
+          ATT_FIX_SIZE == static_cast<const SwFormatFrmSize *>(pItem)->GetHeightSizeType()) )
     {
-        const SwFmtFrmSize *pFSItem = static_cast<const SwFmtFrmSize *>(pItem);
+        const SwFormatFrmSize *pFSItem = static_cast<const SwFormatFrmSize *>(pItem);
         sal_uInt8 nPrcWidth = pFSItem->GetWidthPercent();
         sal_uInt8 nPrcHeight = pFSItem->GetHeightPercent();
 
@@ -740,12 +740,12 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
     // Umlauf fuer absatzgeb. Grafiken als <BR CLEAR=...> in den String
     // schreiben
     if( (nFrmOpts & HTML_FRMOPT_BRCLEAR) &&
-        ((FLY_AT_PARA == rFrmFmt.GetAnchor().GetAnchorId()) ||
-         (FLY_AT_CHAR == rFrmFmt.GetAnchor().GetAnchorId())) &&
+        ((FLY_AT_PARA == rFrameFormat.GetAnchor().GetAnchorId()) ||
+         (FLY_AT_CHAR == rFrameFormat.GetAnchor().GetAnchorId())) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_SURROUND, true, &pItem ))
     {
-        const SwFmtSurround* pSurround = static_cast<const SwFmtSurround*>(pItem);
-        sal_Int16 eHoriOri =    rFrmFmt.GetHoriOrient().GetHoriOrient();
+        const SwFormatSurround* pSurround = static_cast<const SwFormatSurround*>(pItem);
+        sal_Int16 eHoriOri =    rFrameFormat.GetHoriOrient().GetHoriOrient();
         pStr = 0;
         SwSurround eSurround = pSurround->GetSurround();
         bool bAnchorOnly = pSurround->IsAnchorOnly();
@@ -805,17 +805,17 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
     return sRetEndTags;
 }
 
-void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rFrmFmt, const OUString& rAlternateText, sal_uInt32 nFrameOptions)
+void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAlternateText, sal_uInt32 nFrameOptions)
 {
     const SfxPoolItem* pItem;
-    const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+    const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
 
     // Name
     if( (nFrameOptions & (HTML_FRMOPT_ID|HTML_FRMOPT_NAME)) &&
-        !rFrmFmt.GetName().isEmpty() )
+        !rFrameFormat.GetName().isEmpty() )
     {
         const sal_Char* pAttributeName = (nFrameOptions & HTML_FRMOPT_ID) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name;
-        aHtml.attribute(pAttributeName, rFrmFmt.GetName());
+        aHtml.attribute(pAttributeName, rFrameFormat.GetName());
     }
 
     // Name
@@ -834,11 +834,11 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
 
     // align
     const sal_Char* pAlignString = 0;
-    RndStdIds eAnchorId = rFrmFmt.GetAnchor().GetAnchorId();
+    RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId();
     if( (nFrameOptions & HTML_FRMOPT_ALIGN) &&
         ((FLY_AT_PARA == eAnchorId) || (FLY_AT_CHAR == eAnchorId)) )
     {
-        const SwFmtHoriOrient& rHoriOri = rFrmFmt.GetHoriOrient();
+        const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient();
         if( !(nFrameOptions & HTML_FRMOPT_S_ALIGN) ||
             text::RelOrientation::FRAME == rHoriOri.GetRelationOrient() ||
             text::RelOrientation::PRINT_AREA == rHoriOri.GetRelationOrient() )
@@ -853,7 +853,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
           (FLY_AS_CHAR == eAnchorId) ) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, true, &pItem ))
     {
-        switch( static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() )
+        switch( static_cast<const SwFormatVertOrient*>(pItem)->GetVertOrient() )
         {
         case text::VertOrientation::LINE_TOP:     pAlignString = OOO_STRING_SVTOOLS_HTML_VA_top;        break;
         case text::VertOrientation::CHAR_TOP:
@@ -943,9 +943,9 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
     if( (nFrameOptions & HTML_FRMOPT_SIZE) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ) &&
         ( (nFrameOptions & HTML_FRMOPT_ANYSIZE) ||
-          ATT_FIX_SIZE == static_cast<const SwFmtFrmSize *>(pItem)->GetHeightSizeType()) )
+          ATT_FIX_SIZE == static_cast<const SwFormatFrmSize *>(pItem)->GetHeightSizeType()) )
     {
-        const SwFmtFrmSize *pFSItem = static_cast<const SwFmtFrmSize *>(pItem);
+        const SwFormatFrmSize *pFSItem = static_cast<const SwFormatFrmSize *>(pItem);
         sal_uInt8 nPrcWidth = pFSItem->GetWidthPercent();
         sal_uInt8 nPrcHeight = pFSItem->GetHeightPercent();
 
@@ -1002,14 +1002,14 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
     // schreiben
 
     if( (nFrameOptions & HTML_FRMOPT_BRCLEAR) &&
-        ((FLY_AT_PARA == rFrmFmt.GetAnchor().GetAnchorId()) ||
-         (FLY_AT_CHAR == rFrmFmt.GetAnchor().GetAnchorId())) &&
+        ((FLY_AT_PARA == rFrameFormat.GetAnchor().GetAnchorId()) ||
+         (FLY_AT_CHAR == rFrameFormat.GetAnchor().GetAnchorId())) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_SURROUND, true, &pItem ))
     {
         const sal_Char* pSurroundString = 0;
 
-        const SwFmtSurround* pSurround = static_cast<const SwFmtSurround*>(pItem);
-        sal_Int16 eHoriOri = rFrmFmt.GetHoriOrient().GetHoriOrient();
+        const SwFormatSurround* pSurround = static_cast<const SwFormatSurround*>(pItem);
+        sal_Int16 eHoriOri = rFrameFormat.GetHoriOrient().GetHoriOrient();
         SwSurround eSurround = pSurround->GetSurround();
         bool bAnchorOnly = pSurround->IsAnchorOnly();
         switch( eHoriOri )
@@ -1067,8 +1067,8 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
 namespace
 {
 
-OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, const SwFrmFmt& rFrmFmt,
-                         const Size& rRealSize, const ImageMap* pAltImgMap, const SwFmtURL*& pURLItem)
+OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, const SwFrameFormat& rFrameFormat,
+                         const Size& rRealSize, const ImageMap* pAltImgMap, const SwFormatURL*& pURLItem)
 {
     OUString aIMapName;
 
@@ -1078,7 +1078,7 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
     // uebergeben wurde
     if (!pAltImgMap && SfxItemState::SET == rItemSet.GetItemState( RES_URL, true, &pItem))
     {
-        pURLItem = static_cast<const SwFmtURL*>( pItem);
+        pURLItem = static_cast<const SwFormatURL*>( pItem);
     }
 
     // Image-Map rausschreiben
@@ -1126,8 +1126,8 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
         Fraction aScaleX(1, 1);
         Fraction aScaleY(1, 1);
 
-        const SwFmtFrmSize& rFrmSize = rFrmFmt.GetFrmSize();
-        const SvxBoxItem& rBox = rFrmFmt.GetBox();
+        const SwFormatFrmSize& rFrmSize = rFrameFormat.GetFrmSize();
+        const SvxBoxItem& rBox = rFrameFormat.GetBox();
 
         if (!rFrmSize.GetWidthPercent() && rRealSize.Width())
         {
@@ -1202,8 +1202,8 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
 
 }
 
-Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
-                       Graphic& rGraphic, const OUString& rAlternateTxt,
+Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
+                       Graphic& rGraphic, const OUString& rAlternateText,
                        const Size &rRealSize, sal_uInt32 nFrmOpts,
                        const sal_Char *pMarkType,
                        const ImageMap *pAltImgMap )
@@ -1214,17 +1214,17 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
         return rHTMLWrt;
 
     // ggf. ein noch offenes Attribut voruebergehend beenden
-    if( !rHTMLWrt.aINetFmts.empty() )
+    if( !rHTMLWrt.aINetFormats.empty() )
     {
-        SwFmtINetFmt* pINetFmt = rHTMLWrt.aINetFmts.back();
-        OutHTML_INetFmt( rWrt, *pINetFmt, false );
+        SwFormatINetFormat* pINetFormat = rHTMLWrt.aINetFormats.back();
+        OutHTML_INetFormat( rWrt, *pINetFormat, false );
     }
 
     const SfxPoolItem* pItem;
-    const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+    const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
 
-    const SwFmtURL* pURLItem = 0;
-    OUString aIMapName = lclWriteOutImap(rHTMLWrt, rItemSet, rFrmFmt, rRealSize, pAltImgMap, pURLItem);
+    const SwFormatURL* pURLItem = 0;
+    OUString aIMapName = lclWriteOutImap(rHTMLWrt, rItemSet, rFrameFormat, rRealSize, pAltImgMap, pURLItem);
 
     // put img into new line
     if( rHTMLWrt.bLFPossible )
@@ -1233,9 +1233,9 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
     HtmlWriter aHtml(rWrt.Strm());
 
     // <a name=...></a>...<img ...>
-    if( pMarkType && !rFrmFmt.GetName().isEmpty() )
+    if( pMarkType && !rFrameFormat.GetName().isEmpty() )
     {
-        rHTMLWrt.OutImplicitMark( rFrmFmt.GetName(), pMarkType );
+        rHTMLWrt.OutImplicitMark( rFrameFormat.GetName(), pMarkType );
     }
 
     // URL -> <a>...<img ... >...</a>
@@ -1382,9 +1382,9 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
     }
 
     // alt, align, width, height, hspace, vspace
-    rHTMLWrt.writeFrameFormatOptions(aHtml, rFrmFmt, rAlternateTxt, nFrmOpts);
+    rHTMLWrt.writeFrameFormatOptions(aHtml, rFrameFormat, rAlternateText, nFrmOpts);
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) )
-        rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts );
+        rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmOpts );
 
     if( nFrmOpts & HTML_FRMOPT_BORDER )
     {
@@ -1403,12 +1403,12 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
 
     aHtml.flushStack();
 
-    if( !rHTMLWrt.aINetFmts.empty() )
+    if( !rHTMLWrt.aINetFormats.empty() )
     {
         // es ist noch ein Attribut auf dem Stack, das wieder geoeffnet
         // werden muss
-        SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back();
-        OutHTML_INetFmt( rWrt, *pINetFmt, true );
+        SwFormatINetFormat *pINetFormat = rHTMLWrt.aINetFormats.back();
+        OutHTML_INetFormat( rWrt, *pINetFormat, true );
     }
 
     return rHTMLWrt;
@@ -1453,12 +1453,12 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
     return rWrt;
 }
 
-static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
+static Writer& OutHTML_FrameFormatTableNode( Writer& rWrt, const SwFrameFormat& rFrameFormat )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
-    sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
+    const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+    sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex()+1;
     sal_uLong nEnd = rHTMLWrt.pDoc->GetNodes()[nStt-1]->EndOfSectionIndex();
 
     OUString aCaption;
@@ -1466,43 +1466,43 @@ static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
 
     // Nicht const, weil GetTable spater mal nicht const ist
     SwNode *pNd = rHTMLWrt.pDoc->GetNodes()[ nStt ];
-    SwTableNode *pTblNd = pNd->GetTableNode();
-    const SwTxtNode *pTxtNd = pNd->GetTxtNode();
-    if( !pTblNd && pTxtNd )
+    SwTableNode *pTableNd = pNd->GetTableNode();
+    const SwTextNode *pTextNd = pNd->GetTextNode();
+    if( !pTableNd && pTextNd )
     {
         // Tabelle mit Ueberschrift
         bTopCaption = true;
-        pTblNd = rHTMLWrt.pDoc->GetNodes()[nStt+1]->GetTableNode();
+        pTableNd = rHTMLWrt.pDoc->GetNodes()[nStt+1]->GetTableNode();
     }
-    OSL_ENSURE( pTblNd, "Rahmen enthaelt keine Tabelle" );
-    if( pTblNd )
+    OSL_ENSURE( pTableNd, "Rahmen enthaelt keine Tabelle" );
+    if( pTableNd )
     {
-        sal_uLong nTblEnd = pTblNd->EndOfSectionIndex();
-        OSL_ENSURE( nTblEnd == nEnd - 1 ||
-                (nTblEnd == nEnd - 2 && !bTopCaption),
+        sal_uLong nTableEnd = pTableNd->EndOfSectionIndex();
+        OSL_ENSURE( nTableEnd == nEnd - 1 ||
+                (nTableEnd == nEnd - 2 && !bTopCaption),
                 "Ungeuelter Rahmen-Inhalt fuer Tabelle" );
 
-        if( nTblEnd == nEnd - 2 )
-            pTxtNd = rHTMLWrt.pDoc->GetNodes()[nTblEnd+1]->GetTxtNode();
+        if( nTableEnd == nEnd - 2 )
+            pTextNd = rHTMLWrt.pDoc->GetNodes()[nTableEnd+1]->GetTextNode();
     }
-    if( pTxtNd )
-        aCaption = pTxtNd->GetTxt();
+    if( pTextNd )
+        aCaption = pTextNd->GetText();
 
-    if( pTblNd )
+    if( pTableNd )
     {
-        HTMLSaveData aSaveData( rHTMLWrt, pTblNd->GetIndex()+1,
-                                pTblNd->EndOfSectionIndex(),
-                                   true, &rFrmFmt );
+        HTMLSaveData aSaveData( rHTMLWrt, pTableNd->GetIndex()+1,
+                                pTableNd->EndOfSectionIndex(),
+                                   true, &rFrameFormat );
         rHTMLWrt.bOutFlyFrame = true;
-        OutHTML_SwTblNode( rHTMLWrt, *pTblNd, &rFrmFmt, &aCaption,
+        OutHTML_SwTableNode( rHTMLWrt, *pTableNd, &rFrameFormat, &aCaption,
                            bTopCaption );
     }
 
     return rWrt;
 }
 
-static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
-                                          const SwFrmFmt& rFrmFmt,
+static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt,
+                                          const SwFrameFormat& rFrameFormat,
                                           bool bInCntnr )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1519,10 +1519,10 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
     OStringBuffer sOut;
     sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_multicol);
 
-    const SwFmtCol& rFmtCol = rFrmFmt.GetCol();
+    const SwFormatCol& rFormatCol = rFrameFormat.GetCol();
 
     // die Anzahl der Spalten als COLS ausgeben
-    sal_uInt16 nCols = rFmtCol.GetNumCols();
+    sal_uInt16 nCols = rFormatCol.GetNumCols();
     if( nCols )
     {
         sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_cols).
@@ -1530,7 +1530,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
     }
 
     // die Gutter-Breite (Minimalwert) als GUTTER
-    sal_uInt16 nGutter = rFmtCol.GetGutterWidth( true );
+    sal_uInt16 nGutter = rFormatCol.GetGutterWidth( true );
     if( nGutter!=USHRT_MAX )
     {
         if( nGutter && Application::GetDefaultDevice() )
@@ -1550,17 +1550,17 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
                                 : HTML_FRMOPTS_MULTICOL;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
         nFrmFlags |= HTML_FRMOPTS_MULTICOL_CSS1;
-    rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, nFrmFlags );
+    rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrmFlags );
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
-        rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
+        rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags );
 
     rWrt.Strm().WriteChar( '>' );
 
     rHTMLWrt.bLFPossible = true;
     rHTMLWrt.IncIndentLevel();  // den Inhalt von Multicol einruecken;
 
-    const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
-    sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
+    const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+    sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex();
     const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
     OSL_ENSURE( pSttNd, "Wo ist der Start-Node" );
 
@@ -1569,7 +1569,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
         // wieder hergestellt wird.
         HTMLSaveData aSaveData( rHTMLWrt, nStt+1,
                                 pSttNd->EndOfSectionIndex(),
-                                   true, &rFrmFmt );
+                                   true, &rFrameFormat );
         rHTMLWrt.bOutFlyFrame = true;
         rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
     }
@@ -1583,7 +1583,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
     return rWrt;
 }
 
-static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
+static Writer& OutHTML_FrameFormatAsSpacer( Writer& rWrt, const SwFrameFormat& rFrameFormat )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
@@ -1598,7 +1598,7 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
     rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
     // ALIGN, WIDTH, HEIGHT
-    OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, HTML_FRMOPTS_SPACER );
+    OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, HTML_FRMOPTS_SPACER );
 
     rWrt.Strm().WriteChar( '>' );
     if( !aEndTags.isEmpty() )
@@ -1607,8 +1607,8 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
     return rWrt;
 }
 
-static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
-                                          const SwFrmFmt& rFrmFmt, bool bSpan)
+static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
+                                          const SwFrameFormat& rFrameFormat, bool bSpan)
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
@@ -1635,15 +1635,15 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
     sal_uLong nFrmFlags = HTML_FRMOPTS_DIV;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) )
        nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
-    OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, nFrmFlags );
-    rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
+    OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrmFlags );
+    rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags );
     rWrt.Strm().WriteChar( '>' );
 
     rHTMLWrt.IncIndentLevel();  // den Inhalt einruecken
     rHTMLWrt.bLFPossible = true;
 
-    const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
-    sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
+    const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+    sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex();
 
     // Am Start-Node verankerte Rahmen-gebundene Rahmen ausgeben
     rHTMLWrt.OutFlyFrm( nStt, 0, HTML_POS_ANY );
@@ -1656,7 +1656,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
         // wieder hergestellt wird.
         HTMLSaveData aSaveData( rHTMLWrt, nStt+1,
                                 pSttNd->EndOfSectionIndex(),
-                                   true, &rFrmFmt );
+                                   true, &rFrameFormat );
         rHTMLWrt.bOutFlyFrame = true;
         rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
     }
@@ -1672,7 +1672,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
     return rWrt;
 }
 
-static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+static Writer & OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& rFrameFormat,
                                        bool /*bInCntnr*/ )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1681,16 +1681,16 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         return rWrt;
 
     ImageMap aIMap;
-    Graphic aGraphic( ((SwFrmFmt &)rFrmFmt).MakeGraphic( &aIMap ) );
+    Graphic aGraphic( ((SwFrameFormat &)rFrameFormat).MakeGraphic( &aIMap ) );
     Size aSz( 0, 0 );
-    OutHTML_Image( rWrt, rFrmFmt, aGraphic, rFrmFmt.GetName(), aSz,
+    OutHTML_Image( rWrt, rFrameFormat, aGraphic, rFrameFormat.GetName(), aSz,
                     HTML_FRMOPTS_GENIMG, "frame",
                     aIMap.GetIMapObjectCount() ? &aIMap : 0 );
 
     return rWrt;
 }
 
-static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rFrameFormat,
                                       bool bInCntnr )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1698,8 +1698,8 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     if (rHTMLWrt.mbSkipImages)
         return rWrt;
 
-    const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
-    sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
+    const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+    sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex()+1;
     SwGrfNode *pGrfNd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetGrfNode();
     OSL_ENSURE( pGrfNd, "Grf-Node erwartet" );
     if( !pGrfNd )
@@ -1710,43 +1710,43 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
          nFrmFlags |= HTML_FRMOPTS_IMG_CSS1;
 
     Graphic aGraphic = pGrfNd->GetGraphic();
-    OutHTML_Image( rWrt, rFrmFmt, aGraphic, pGrfNd->GetTitle(),
+    OutHTML_Image( rWrt, rFrameFormat, aGraphic, pGrfNd->GetTitle(),
                   pGrfNd->GetTwipSize(), nFrmFlags, "graphic" );
 
     return rWrt;
 }
 
-static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+static Writer& OutHTML_FrameFormatAsMarquee( Writer& rWrt, const SwFrameFormat& rFrameFormat,
                                   const SdrObject& rSdrObj  )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
     // die Edit-Engine-Attribute des Objekts als SW-Attribute holen
     // und als Hints einsortieren
-    const SfxItemSet& rFmtItemSet = rFrmFmt.GetAttrSet();
-    SfxItemSet aItemSet( *rFmtItemSet.GetPool(), RES_CHRATR_BEGIN,
+    const SfxItemSet& rFormatItemSet = rFrameFormat.GetAttrSet();
+    SfxItemSet aItemSet( *rFormatItemSet.GetPool(), RES_CHRATR_BEGIN,
                                                  RES_CHRATR_END );
     SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, &rSdrObj, true );
     bool bCfgOutStylesOld = rHTMLWrt.bCfgOutStyles;
     rHTMLWrt.bCfgOutStyles = false;
-    rHTMLWrt.bTxtAttr = true;
+    rHTMLWrt.bTextAttr = true;
     rHTMLWrt.bTagOn = true;
     Out_SfxItemSet( aHTMLAttrFnTab, rWrt, aItemSet, false );
-    rHTMLWrt.bTxtAttr = false;
+    rHTMLWrt.bTextAttr = false;
 
-    OutHTML_DrawFrmFmtAsMarquee( rHTMLWrt,
-                                 static_cast<const SwDrawFrmFmt &>(rFrmFmt),
+    OutHTML_DrawFrameFormatAsMarquee( rHTMLWrt,
+                                 static_cast<const SwDrawFrameFormat &>(rFrameFormat),
                                  rSdrObj );
-    rHTMLWrt.bTxtAttr = true;
+    rHTMLWrt.bTextAttr = true;
     rHTMLWrt.bTagOn = false;
     Out_SfxItemSet( aHTMLAttrFnTab, rWrt, aItemSet, false );
-    rHTMLWrt.bTxtAttr = false;
+    rHTMLWrt.bTextAttr = false;
     rHTMLWrt.bCfgOutStyles = bCfgOutStylesOld;
 
     return rWrt;
 }
 
-Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat,
                               bool bHeader )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
@@ -1764,7 +1764,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     // Einen Spacer fuer den Absatnd zusammenbasteln. Da durch das
     // <DL> bzw. </DL> immer einer Absatz-Abstand entsteht, wird der
     // ggf. abgezogen.
-    const SvxULSpaceItem& rULSpace = rFrmFmt.GetULSpace();
+    const SvxULSpaceItem& rULSpace = rFrameFormat.GetULSpace();
     sal_uInt16 nSize = bHeader ? rULSpace.GetLower() : rULSpace.GetUpper();
     rHTMLWrt.nHeaderFooterSpace = nSize;
 
@@ -1784,8 +1784,8 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
             makeStringAndClear();
     }
 
-    const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
-    sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
+    const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+    sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex();
     const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
     OSL_ENSURE( pSttNd, "Wo ist der Start-Node" );
 
@@ -1797,7 +1797,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 
     {
         // in einem Block damit rechtzeitig vor dem Ende der alte Zustand
-        // wieder hergestellt wird. pFlyFmt braucht hier nicht gestzt zu
+        // wieder hergestellt wird. pFlyFormat braucht hier nicht gestzt zu
         // werden, denn PageDesc-Attribute koennen hier nicht vorkommen
         HTMLSaveData aSaveData( rHTMLWrt, nStt+1,
                                 pSttNd->EndOfSectionIndex() );
@@ -1911,29 +1911,29 @@ void SwHTMLWriter::AddLinkTarget( const OUString& rURL )
 
 void SwHTMLWriter::CollectLinkTargets()
 {
-    const SwFmtINetFmt* pINetFmt;
-    const SwTxtINetFmt* pTxtAttr;
+    const SwFormatINetFormat* pINetFormat;
+    const SwTextINetFormat* pTextAttr;
 
     sal_uInt32 n, nMaxItems = pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_INETFMT );
     for( n = 0; n < nMaxItems; ++n )
     {
-        const SwTxtNode* pTxtNd;
+        const SwTextNode* pTextNd;
 
-        if( 0 != (pINetFmt = static_cast<const SwFmtINetFmt*>(pDoc->GetAttrPool().GetItem2(
+        if( 0 != (pINetFormat = static_cast<const SwFormatINetFormat*>(pDoc->GetAttrPool().GetItem2(
             RES_TXTATR_INETFMT, n ) ) ) &&
-            0 != ( pTxtAttr = pINetFmt->GetTxtINetFmt()) &&
-            0 != ( pTxtNd = pTxtAttr->GetpTxtNode() ) &&
-            pTxtNd->GetNodes().IsDocNodes() )
+            0 != ( pTextAttr = pINetFormat->GetTextINetFormat()) &&
+            0 != ( pTextNd = pTextAttr->GetpTextNode() ) &&
+            pTextNd->GetNodes().IsDocNodes() )
         {
-            AddLinkTarget( pINetFmt->GetValue() );
+            AddLinkTarget( pINetFormat->GetValue() );
         }
     }
 
-    const SwFmtURL *pURL;
+    const SwFormatURL *pURL;
     nMaxItems = pDoc->GetAttrPool().GetItemCount2( RES_URL );
     for( n = 0; n < nMaxItems; ++n )
     {
-        if( 0 != (pURL = static_cast<const SwFmtURL*>(pDoc->GetAttrPool().GetItem2(
+        if( 0 != (pURL = static_cast<const SwFormatURL*>(pDoc->GetAttrPool().GetItem2(
             RES_URL, n ) ) ) )
         {
             AddLinkTarget( pURL->GetURL() );
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 13469b1569f1..1f5dd09da113 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -280,11 +280,11 @@ const uno::Reference< drawing::XDrawPage >& SwHTMLForm_Impl::GetDrawPage()
 {
     if( !xDrawPage.is() && pDocSh )
     {
-        uno::Reference< drawing::XDrawPageSupplier > xTxtDoc( pDocSh->GetBaseModel(),
+        uno::Reference< drawing::XDrawPageSupplier > xTextDoc( pDocSh->GetBaseModel(),
                                                          UNO_QUERY );
-        OSL_ENSURE( xTxtDoc.is(),
+        OSL_ENSURE( xTextDoc.is(),
                 "drawing::XDrawPageSupplier nicht vom XModel erhalten" );
-        xDrawPage = xTxtDoc->getDrawPage();
+        xDrawPage = xTextDoc->getDrawPage();
         OSL_ENSURE( xDrawPage.is(), "drawing::XDrawPage nicht erhalten" );
     }
     return xDrawPage;
@@ -517,19 +517,19 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
         OSL_ENSURE( pSwShape, "Wo ist das SW-Shape?" );
         if( pSwShape )
         {
-            SwFrmFmt *pFrmFmt = pSwShape->GetFrmFmt();
+            SwFrameFormat *pFrameFormat = pSwShape->GetFrameFormat();
 
-            const SwDoc *pDoc = pFrmFmt->GetDoc();
-            const SwPosition* pAPos = pFrmFmt->GetAnchor().GetCntntAnchor();
+            const SwDoc *pDoc = pFrameFormat->GetDoc();
+            const SwPosition* pAPos = pFrameFormat->GetAnchor().GetContentAnchor();
             SwNode *pANd;
-            SwTableNode *pTblNd;
+            SwTableNode *pTableNd;
             if( pAPos &&
                 0 != (pANd = & pAPos->nNode.GetNode()) &&
-                0 != (pTblNd = pANd->FindTableNode()) )
+                0 != (pTableNd = pANd->FindTableNode()) )
             {
-                const bool bLastGrf = !pTblNd->GetTable().DecGrfsThatResize();
+                const bool bLastGrf = !pTableNd->GetTable().DecGrfsThatResize();
                 SwHTMLTableLayout *pLayout =
-                    pTblNd->GetTable().GetHTMLTableLayout();
+                    pTableNd->GetTable().GetHTMLTableLayout();
                 if( pLayout )
                 {
                     const sal_uInt16 nBrowseWidth =
@@ -678,11 +678,11 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
     OSL_ENSURE( pSwShape, "Wo ist das SW-Shape?" );
 
     // es muss ein Draw-Format sein
-    SwFrmFmt *pFrmFmt = pSwShape ? pSwShape->GetFrmFmt() : NULL ;
-    OSL_ENSURE( pFrmFmt && RES_DRAWFRMFMT == pFrmFmt->Which(), "Kein DrawFrmFmt" );
+    SwFrameFormat *pFrameFormat = pSwShape ? pSwShape->GetFrameFormat() : NULL ;
+    OSL_ENSURE( pFrameFormat && RES_DRAWFRMFMT == pFrameFormat->Which(), "Kein DrawFrameFormat" );
 
     // Schauen, ob es ein SdrObject dafuer gibt
-    const SdrObject *pObj = pFrmFmt ? pFrmFmt->FindSdrObject() : NULL;
+    const SdrObject *pObj = pFrameFormat ? pFrameFormat->FindSdrObject() : NULL;
     OSL_ENSURE( pObj, "SdrObject nicht gefunden" );
     OSL_ENSURE( pObj && FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
 
@@ -755,9 +755,9 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
 
 static void lcl_html_setEvents(
         const uno::Reference< script::XEventAttacherManager > & rEvtMn,
-        sal_uInt32 nPos, const SvxMacroTableDtor& rMacroTbl,
-        const std::vector<OUString>& rUnoMacroTbl,
-        const std::vector<OUString>& rUnoMacroParamTbl,
+        sal_uInt32 nPos, const SvxMacroTableDtor& rMacroTable,
+        const std::vector<OUString>& rUnoMacroTable,
+        const std::vector<OUString>& rUnoMacroParamTable,
         const OUString& rType )
 {
     // Erstmal muss die Anzahl der Events ermittelt werden ...
@@ -766,15 +766,15 @@ static void lcl_html_setEvents(
 
     for( i = 0; HTML_ET_END != aEventTypeTable[i]; i++ )
     {
-        const SvxMacro *pMacro = rMacroTbl.Get( aEventTypeTable[i] );
+        const SvxMacro *pMacro = rMacroTable.Get( aEventTypeTable[i] );
         // Solange nicht alle Events implementiert sind, enthaelt die
         // Tabelle auch Leerstrings!
         if( pMacro && aEventListenerTable[i] )
             nEvents++;
     }
-    for( i=0; i< rUnoMacroTbl.size(); i++ )
+    for( i=0; i< rUnoMacroTable.size(); i++ )
     {
-        const OUString& rStr(rUnoMacroTbl[i]);
+        const OUString& rStr(rUnoMacroTable[i]);
         sal_Int32 nIndex = 0;
         if( rStr.getToken( 0, '-', nIndex ).isEmpty() || -1 == nIndex )
             continue;
@@ -793,7 +793,7 @@ static void lcl_html_setEvents(
 
     for( i=0; HTML_ET_END != aEventTypeTable[i]; i++ )
     {
-        const SvxMacro *pMacro = rMacroTbl.Get( aEventTypeTable[i] );
+        const SvxMacro *pMacro = rMacroTable.Get( aEventTypeTable[i] );
         if( pMacro && aEventListenerTable[i] )
         {
             script::ScriptEventDescriptor& rDesc = pDescs[nEvent++];
@@ -805,9 +805,9 @@ static void lcl_html_setEvents(
         }
     }
 
-    for( i=0; i< rUnoMacroTbl.size(); ++i )
+    for( i=0; i< rUnoMacroTable.size(); ++i )
     {
-        const OUString& rStr = rUnoMacroTbl[i];
+        const OUString& rStr = rUnoMacroTable[i];
         sal_Int32 nIndex = 0;
         OUString sListener( rStr.getToken( 0, '-', nIndex ) );
         if( sListener.isEmpty() || -1 == nIndex )
@@ -828,14 +828,14 @@ static void lcl_html_setEvents(
         rDesc.ScriptCode = sCode;
         rDesc.AddListenerParam.clear();
 
-        if(!rUnoMacroParamTbl.empty())
+        if(!rUnoMacroParamTable.empty())
         {
             OUString sSearch( sListener );
             sSearch += "-" +sMethod + "-";
             sal_Int32 nLen = sSearch.getLength();
-            for(size_t j = 0; j < rUnoMacroParamTbl.size(); ++j)
+            for(size_t j = 0; j < rUnoMacroParamTable.size(); ++j)
             {
-                const OUString& rParam = rUnoMacroParamTbl[j];
+                const OUString& rParam = rUnoMacroParamTable[j];
                 if( rParam.startsWith( sSearch ) && rParam.getLength() > nLen )
                 {
                     rDesc.AddListenerParam = rParam.copy(nLen);
@@ -848,20 +848,20 @@ static void lcl_html_setEvents(
 }
 
 static void lcl_html_getEvents( const OUString& rOption, const OUString& rValue,
-                                std::vector<OUString>& rUnoMacroTbl,
-                                std::vector<OUString>& rUnoMacroParamTbl )
+                                std::vector<OUString>& rUnoMacroTable,
+                                std::vector<OUString>& rUnoMacroParamTable )
 {
     if( rOption.startsWithIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_sdevent ) )
     {
         OUString aEvent( rOption.copy( strlen( OOO_STRING_SVTOOLS_HTML_O_sdevent ) ) );
         aEvent += "-" + rValue;
-        rUnoMacroTbl.push_back(aEvent);
+        rUnoMacroTable.push_back(aEvent);
     }
     else if( rOption.startsWithIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_sdaddparam ) )
     {
         OUString aParam( rOption.copy( strlen( OOO_STRING_SVTOOLS_HTML_O_sdaddparam ) ) );
         aParam += "-" + rValue;
-        rUnoMacroParamTbl.push_back(aParam);
+        rUnoMacroParamTable.push_back(aParam);
     }
 }
 
@@ -870,8 +870,8 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
         const uno::Reference< beans::XPropertySet > & rFCompPropSet,
         const Size& rSize, sal_Int16 eVertOri, sal_Int16 eHoriOri,
         SfxItemSet& rCSS1ItemSet, SvxCSS1PropertyInfo& rCSS1PropInfo,
-        const SvxMacroTableDtor& rMacroTbl, const std::vector<OUString>& rUnoMacroTbl,
-        const std::vector<OUString>& rUnoMacroParamTbl, bool bSetFCompPropSet,
+        const SvxMacroTableDtor& rMacroTable, const std::vector<OUString>& rUnoMacroTable,
+        const std::vector<OUString>& rUnoMacroParamTable, bool bSetFCompPropSet,
         bool bHidden )
 {
     uno::Reference< drawing::XShape >  xShape;
@@ -916,7 +916,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
             // Ggf. den Erstzeilen-Einzug noch plaetten
             const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
             SvxLRSpaceItem aLRItem( *pLRItem );
-            aLRItem.SetTxtFirstLineOfst( 0 );
+            aLRItem.SetTextFirstLineOfst( 0 );
             if( rCSS1PropInfo.bLeftMargin )
             {
                 nLeftSpace = static_cast< sal_uInt16 >(convertTwipToMm100( aLRItem.GetLeft() ));
@@ -1081,7 +1081,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
             rFCompPropSet->setPropertyValue( sPropName, aTmp );
         }
 
-        uno::Reference< text::XTextRange >  xTxtRg;
+        uno::Reference< text::XTextRange >  xTextRg;
         sal_Int16 nAnchorType = text::TextContentAnchorType_AS_CHARACTER;
         bool bSetPos = false, bSetSurround = false;
         sal_Int32 nXPos = 0, nYPos = 0;
@@ -1098,8 +1098,8 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
                 nAnchorType = text::TextContentAnchorType_AT_FRAME;
                 SwPaM aPaM( *pFlySttNd );
 
-                uno::Reference< text::XText >  xDummyTxtRef; // unsauber, aber laut OS geht das ...
-                xTxtRg = new SwXTextRange( aPaM, xDummyTxtRef );
+                uno::Reference< text::XText >  xDummyTextRef; // unsauber, aber laut OS geht das ...
+                xTextRg = new SwXTextRange( aPaM, xDummyTextRef );
             }
             else
             {
@@ -1173,13 +1173,13 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
         }
         else
         {
-            if( !xTxtRg.is() )
+            if( !xTextRg.is() )
             {
-                uno::Reference< text::XText >  xDummyTxtRef; // unsauber, aber laut OS geht das ...
-                xTxtRg = new SwXTextRange( *pPam, xDummyTxtRef );
+                uno::Reference< text::XText >  xDummyTextRef; // unsauber, aber laut OS geht das ...
+                xTextRg = new SwXTextRange( *pPam, xDummyTextRef );
             }
 
-            aTmp.setValue( &xTxtRg,
+            aTmp.setValue( &xTextRg,
                            cppu::UnoType<text::XTextRange>::get());
             xShapePropSet->setPropertyValue("TextRange", aTmp );
         }
@@ -1214,11 +1214,11 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
     // auch schon Fokus-Events verschickt. Damit die nicht evtl. schon
     // vorhendene JavaSCript-Eents rufen, werden die Events nachtraeglich
     // gesetzt.
-    if( !rMacroTbl.empty() || !rUnoMacroTbl.empty() )
+    if( !rMacroTable.empty() || !rUnoMacroTable.empty() )
     {
         lcl_html_setEvents( pFormImpl->GetControlEventManager(),
                             rFormComps->getCount() - 1,
-                            rMacroTbl, rUnoMacroTbl, rUnoMacroParamTbl,
+                            rMacroTable, rUnoMacroTable, rUnoMacroParamTable,
                             GetScriptTypeString(pFormImpl->GetHeaderAttrs()) );
     }
 
@@ -1239,7 +1239,7 @@ void SwHTMLParser::NewForm( bool bAppend )
     if( bAppend )
     {
         if( pPam->GetPoint()->nContent.GetIndex() )
-            AppendTxtNode( AM_SPACE );
+            AppendTextNode( AM_SPACE );
         else
             AddParSpace();
     }
@@ -1251,9 +1251,9 @@ void SwHTMLParser::NewForm( bool bAppend )
     OUString sName, sTarget;
     sal_uInt16 nEncType = FormSubmitEncoding_URL;
     sal_uInt16 nMethod = FormSubmitMethod_GET;
-    SvxMacroTableDtor aMacroTbl;
-    std::vector<OUString> aUnoMacroTbl;
-    std::vector<OUString> aUnoMacroParamTbl;
+    SvxMacroTableDtor aMacroTable;
+    std::vector<OUString> aUnoMacroTable;
+    std::vector<OUString> aUnoMacroParamTable;
     SvKeyValueIterator *pHeaderAttrs = pFormImpl->GetHeaderAttrs();
     ScriptType eDfltScriptType = GetScriptType( pHeaderAttrs );
     const OUString& rDfltScriptType = GetScriptTypeString( pHeaderAttrs );
@@ -1303,7 +1303,7 @@ void SwHTMLParser::NewForm( bool bAppend )
         default:
             lcl_html_getEvents( rOption.GetTokenString(),
                                 rOption.GetString(),
-                                aUnoMacroTbl, aUnoMacroParamTbl );
+                                aUnoMacroTable, aUnoMacroParamTable );
             break;
         }
 
@@ -1316,7 +1316,7 @@ void SwHTMLParser::NewForm( bool bAppend )
                 OUString aScriptType2;
                 if( EXTENDED_STYPE==eScriptType2 )
                     aScriptType2 = rDfltScriptType;
-                aMacroTbl.Insert( nEvent, SvxMacro( sEvent, aScriptType2, eScriptType2 ) );
+                aMacroTable.Insert( nEvent, SvxMacro( sEvent, aScriptType2, eScriptType2 ) );
             }
         }
     }
@@ -1376,10 +1376,10 @@ void SwHTMLParser::NewForm( bool bAppend )
         pFormImpl->GetForms();
     Any aAny( &xForm, cppu::UnoType<XForm>::get());
     rForms->insertByIndex( rForms->getCount(), aAny );
-    if( !aMacroTbl.empty() )
+    if( !aMacroTable.empty() )
         lcl_html_setEvents( pFormImpl->GetFormEventManager(),
                             rForms->getCount() - 1,
-                            aMacroTbl, aUnoMacroTbl, aUnoMacroParamTbl,
+                            aMacroTable, aUnoMacroTable, aUnoMacroParamTable,
                             rDfltScriptType );
 }
 
@@ -1390,7 +1390,7 @@ void SwHTMLParser::EndForm( bool bAppend )
         if( bAppend )
         {
             if( pPam->GetPoint()->nContent.GetIndex() )
-                AppendTxtNode( AM_SPACE );
+                AppendTextNode( AM_SPACE );
             else
                 AddParSpace();
         }
@@ -1408,9 +1408,9 @@ void SwHTMLParser::InsertInput()
 
     OUString sImgSrc, aId, aClass, aStyle, sName;
     OUString sText;
-    SvxMacroTableDtor aMacroTbl;
-    std::vector<OUString> aUnoMacroTbl;
-    std::vector<OUString> aUnoMacroParamTbl;
+    SvxMacroTableDtor aMacroTable;
+    std::vector<OUString> aUnoMacroTable;
+    std::vector<OUString> aUnoMacroParamTable;
     sal_uInt16 nSize = 0;
     sal_Int16 nMaxLen = 0;
     sal_Int16 nChecked = TRISTATE_FALSE;
@@ -1533,7 +1533,7 @@ void SwHTMLParser::InsertInput()
         default:
             lcl_html_getEvents( rOption.GetTokenString(),
                                 rOption.GetString(),
-                                aUnoMacroTbl, aUnoMacroParamTbl );
+                                aUnoMacroTable, aUnoMacroParamTable );
             break;
         }
 
@@ -1546,7 +1546,7 @@ void SwHTMLParser::InsertInput()
                 OUString aScriptType2;
                 if( EXTENDED_STYPE==eScriptType2 )
                     aScriptType2 = rDfltScriptType;
-                aMacroTbl.Insert( nEvent, SvxMacro( sEvent, aScriptType2, eScriptType2 ) );
+                aMacroTable.Insert( nEvent, SvxMacro( sEvent, aScriptType2, eScriptType2 ) );
             }
         }
     }
@@ -1680,11 +1680,11 @@ void SwHTMLParser::InsertInput()
                 xPropSet->setPropertyValue("DefaultState", aTmp );
             }
 
-            const SvxMacro* pMacro = aMacroTbl.Get( HTML_ET_ONCLICK );
+            const SvxMacro* pMacro = aMacroTable.Get( HTML_ET_ONCLICK );
             if( pMacro )
             {
-                aMacroTbl.Insert( HTML_ET_ONCLICK_ITEM, *pMacro );
-                aMacroTbl.Erase( HTML_ET_ONCLICK );
+                aMacroTable.Insert( HTML_ET_ONCLICK_ITEM, *pMacro );
+                aMacroTable.Erase( HTML_ET_ONCLICK );
             }
             // SIZE auszuwerten duerfte hier keinen Sinn machen???
             bMinWidth = bMinHeight = true;
@@ -1846,8 +1846,8 @@ void SwHTMLParser::InsertInput()
                                              xFComp, xPropSet, aSz,
                                              eVertOri, eHoriOri,
                                              aCSS1ItemSet, aCSS1PropInfo,
-                                             aMacroTbl, aUnoMacroTbl,
-                                             aUnoMacroParamTbl, false,
+                                             aMacroTable, aUnoMacroTable,
+                                             aUnoMacroParamTable, false,
                                              bHidden );
     if( aTextSz.Width() || aTextSz.Height() || bMinWidth || bMinHeight )
     {
@@ -1898,9 +1898,9 @@ void SwHTMLParser::NewTextArea()
     OUString aId, aClass, aStyle;
     OUString sName;
     sal_Int32 nTabIndex = TABINDEX_MAX + 1;
-    SvxMacroTableDtor aMacroTbl;
-    std::vector<OUString> aUnoMacroTbl;
-    std::vector<OUString> aUnoMacroParamTbl;
+    SvxMacroTableDtor aMacroTable;
+    std::vector<OUString> aUnoMacroTable;
+    std::vector<OUString> aUnoMacroParamTable;
     sal_uInt16 nRows = 0, nCols = 0;
     sal_uInt16 nWrap = HTML_WM_OFF;
     bool bDisabled = false;
@@ -1990,7 +1990,7 @@ void SwHTMLParser::NewTextArea()
         default:
             lcl_html_getEvents( rOption.GetTokenString(),
                                 rOption.GetString(),
-                                aUnoMacroTbl, aUnoMacroParamTbl );
+                                aUnoMacroTable, aUnoMacroParamTable );
             break;
         }
 
@@ -2002,7 +2002,7 @@ void SwHTMLParser::NewTextArea()
                 sEvent = convertLineEnd(sEvent, GetSystemLineEnd());
                 if( EXTENDED_STYPE==eScriptType2 )
                     aScriptType = rDfltScriptType;
-                aMacroTbl.Insert( nEvent, SvxMacro( sEvent, aScriptType, eScriptType2 ) );
+                aMacroTable.Insert( nEvent, SvxMacro( sEvent, aScriptType, eScriptType2 ) );
             }
         }
     }
@@ -2089,8 +2089,8 @@ void SwHTMLParser::NewTextArea()
     uno::Reference< drawing::XShape > xShape = InsertControl( xFComp, xPropSet, aSz,
                                       text::VertOrientation::TOP, text::HoriOrientation::NONE,
                                       aCSS1ItemSet, aCSS1PropInfo,
-                                      aMacroTbl, aUnoMacroTbl,
-                                      aUnoMacroParamTbl );
+                                      aMacroTable, aUnoMacroTable,
+                                      aUnoMacroParamTable );
     if( aTextSz.Width() || aTextSz.Height() )
         SetControlSize( xShape, aTextSz, false, false );
 
@@ -2177,9 +2177,9 @@ void SwHTMLParser::NewSelect()
     OUString aId, aClass, aStyle;
     OUString sName;
     sal_Int32 nTabIndex = TABINDEX_MAX + 1;
-    SvxMacroTableDtor aMacroTbl;
-    std::vector<OUString> aUnoMacroTbl;
-    std::vector<OUString> aUnoMacroParamTbl;
+    SvxMacroTableDtor aMacroTable;
+    std::vector<OUString> aUnoMacroTable;
+    std::vector<OUString> aUnoMacroParamTable;
     bool bMultiple = false;
     bool bDisabled = false;
     nSelectEntryCnt = 1;
@@ -2258,7 +2258,7 @@ void SwHTMLParser::NewSelect()
         default:
             lcl_html_getEvents( rOption.GetTokenString(),
                                 rOption.GetString(),
-                                aUnoMacroTbl, aUnoMacroParamTbl );
+                                aUnoMacroTable, aUnoMacroParamTable );
             break;
         }
 
@@ -2270,7 +2270,7 @@ void SwHTMLParser::NewSelect()
                 sEvent = convertLineEnd(sEvent, GetSystemLineEnd());
                 if( EXTENDED_STYPE==eScriptType2 )
                     aScriptType = rDfltScriptType;
-                aMacroTbl.Insert( nEvent, SvxMacro( sEvent, aScriptType, eScriptType2 ) );
+                aMacroTable.Insert( nEvent, SvxMacro( sEvent, aScriptType, eScriptType2 ) );
             }
         }
     }
@@ -2360,8 +2360,8 @@ void SwHTMLParser::NewSelect()
     uno::Reference< drawing::XShape >  xShape = InsertControl( xFComp, xPropSet, aSz,
                                       text::VertOrientation::TOP, text::HoriOrientation::NONE,
                                       aCSS1ItemSet, aCSS1PropInfo,
-                                      aMacroTbl, aUnoMacroTbl,
-                                      aUnoMacroParamTbl );
+                                      aMacroTable, aUnoMacroTable,
+                                      aUnoMacroParamTable );
     if( bFixSelectWidth )
         pFormImpl->SetShape( xShape );
     if( aTextSz.Height() || bMinWidth || bMinHeight )
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 6ae81f73e066..7d5a9aa667b0 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -630,14 +630,14 @@ void SwHTMLWriter::OutHiddenControls(
 
 // hier folgen die Ausgabe-Routinen, dadurch sind die form::Forms gebuendelt:
 
-const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt )
+const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrameFormat& rFormat )
 {
     // es muss ein Draw-Format sein
-    OSL_ENSURE( RES_DRAWFRMFMT == rFmt.Which(),
+    OSL_ENSURE( RES_DRAWFRMFMT == rFormat.Which(),
             "GetHTMLControl nuer fuer Draw-Formate erlaubt" );
 
     // Schauen, ob es ein SdrObject dafuer gibt
-    const SdrObject *pObj = rFmt.FindSdrObject();
+    const SdrObject *pObj = rFormat.FindSdrObject();
     if( !pObj || FmFormInventor != pObj->GetObjInventor() )
         return 0;
 
@@ -687,8 +687,8 @@ static void GetControlSize(const SdrUnoObj& rFormObj, Size& rSz, SwDoc *pDoc)
     rSz.Height() = nLines;
 }
 
-Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
-                                     const SwDrawFrmFmt& rFmt,
+Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
+                                     const SwDrawFrameFormat& rFormat,
                                      const SdrUnoObj& rFormObj,
                                      bool bInCntnr )
 {
@@ -1031,7 +1031,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
     }
     OString aEndTags;
     if( nFrmOpts != 0 )
-        aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyOUStr, nFrmOpts );
+        aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrmOpts );
 
     if( rHTMLWrt.bCfgOutStyles )
     {
@@ -1139,7 +1139,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
             }
         }
 
-        rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmOpts, &rFormObj,
+        rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrmOpts, &rFormObj,
                                         &aItemSet );
     }
 
@@ -1335,20 +1335,20 @@ void SwHTMLWriter::GetControls()
     }
 
     // und jetzt die in einem zeichengebundenen Rahmen
-    const SwFrmFmts* pSpzFrmFmts = pDoc->GetSpzFrmFmts();
-    for( size_t i=0; i<pSpzFrmFmts->size(); i++ )
+    const SwFrameFormats* pSpzFrameFormats = pDoc->GetSpzFrameFormats();
+    for( size_t i=0; i<pSpzFrameFormats->size(); i++ )
     {
-        const SwFrmFmt *pFrmFmt = (*pSpzFrmFmts)[i];
-        if( RES_DRAWFRMFMT != pFrmFmt->Which() )
+        const SwFrameFormat *pFrameFormat = (*pSpzFrameFormats)[i];
+        if( RES_DRAWFRMFMT != pFrameFormat->Which() )
             continue;
 
-        const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-        const SwPosition *pPos = rAnchor.GetCntntAnchor();
+        const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+        const SwPosition *pPos = rAnchor.GetContentAnchor();
         if ((FLY_AS_CHAR != rAnchor.GetAnchorId()) || !pPos)
             continue;
 
         const SdrObject *pSdrObj =
-            SwHTMLWriter::GetHTMLControl( *static_cast<const SwDrawFrmFmt*>(pFrmFmt) );
+            SwHTMLWriter::GetHTMLControl( *static_cast<const SwDrawFrameFormat*>(pFrameFormat) );
         if( !pSdrObj )
             continue;
 
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 975cb4216da1..e71d5372ab51 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -33,7 +33,7 @@
 
 struct SwHTMLFootEndNote_Impl
 {
-    SwHTMLTxtFtns aTxtFtns;
+    SwHTMLTextFootnotes aTextFootnotes;
     std::vector<OUString> aNames;
 
     OUString sName;
@@ -98,14 +98,14 @@ sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo,
         switch( nPart )
         {
         case 0:
-            rInfo.aFmt.SetNumberingType( static_cast< sal_Int16 >(bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC));
+            rInfo.aFormat.SetNumberingType( static_cast< sal_Int16 >(bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC));
             if( !aPart.isEmpty() )
-                rInfo.aFmt.SetNumberingType(SwHTMLParser::GetNumType( aPart,
-                                                             rInfo.aFmt.GetNumberingType() ));
+                rInfo.aFormat.SetNumberingType(SwHTMLParser::GetNumType( aPart,
+                                                             rInfo.aFormat.GetNumberingType() ));
             break;
 
         case 1:
-            rInfo.nFtnOffset = aPart.isEmpty() ? 0 : (sal_uInt16)aPart.toInt32();
+            rInfo.nFootnoteOffset = aPart.isEmpty() ? 0 : (sal_uInt16)aPart.toInt32();
             break;
 
         case 2:
@@ -130,7 +130,7 @@ void SwHTMLParser::FillEndNoteInfo( const OUString& rContent )
 
 void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
 {
-    SwFtnInfo aInfo( pDoc->GetFtnInfo() );
+    SwFootnoteInfo aInfo( pDoc->GetFootnoteInfo() );
 
     sal_Int32 nStrPos = lcl_html_getEndNoteInfo( aInfo, rContent, false );
 
@@ -177,7 +177,7 @@ void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
         }
     }
 
-    pDoc->SetFtnInfo( aInfo );
+    pDoc->SetFootnoteInfo( aInfo );
 }
 
 void SwHTMLParser::InsertFootEndNote( const OUString& rName, bool bEndNote,
@@ -200,18 +200,18 @@ void SwHTMLParser::FinishFootEndNote()
     if( !pFootEndNoteImpl )
         return;
 
-    SwFmtFtn aFtn( pFootEndNoteImpl->bEndNote );
+    SwFormatFootnote aFootnote( pFootEndNoteImpl->bEndNote );
     if( pFootEndNoteImpl->bFixed )
-        aFtn.SetNumStr( pFootEndNoteImpl->sContent );
+        aFootnote.SetNumStr( pFootEndNoteImpl->sContent );
 
-    pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, aFtn );
-    SwTxtFtn * const pTxtFtn = static_cast<SwTxtFtn *>(
-        pPam->GetNode().GetTxtNode()->GetTxtAttrForCharAt(
+    pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, aFootnote );
+    SwTextFootnote * const pTextFootnote = static_cast<SwTextFootnote *>(
+        pPam->GetNode().GetTextNode()->GetTextAttrForCharAt(
             pPam->GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_FTN ) );
     // In Kopf- und Fusszeilen duerfen keine Fussnoten eingefuegt werden.
-    if( pTxtFtn )
+    if( pTextFootnote )
     {
-        pFootEndNoteImpl->aTxtFtns.push_back( pTxtFtn );
+        pFootEndNoteImpl->aTextFootnotes.push_back( pTextFootnote );
         pFootEndNoteImpl->aNames.push_back(pFootEndNoteImpl->sName);
     }
     pFootEndNoteImpl->sName = aEmptyOUStr;
@@ -244,9 +244,9 @@ SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const OUString& rName )
         {
             if(pFootEndNoteImpl->aNames[i] == aName)
             {
-                pStartNodeIdx = pFootEndNoteImpl->aTxtFtns[i]->GetStartNode();
+                pStartNodeIdx = pFootEndNoteImpl->aTextFootnotes[i]->GetStartNode();
                 pFootEndNoteImpl->aNames.erase(pFootEndNoteImpl->aNames.begin() + i);
-                pFootEndNoteImpl->aTxtFtns.erase( pFootEndNoteImpl->aTxtFtns.begin() + i );
+                pFootEndNoteImpl->aTextFootnotes.erase( pFootEndNoteImpl->aTextFootnotes.begin() + i );
                 if(pFootEndNoteImpl->aNames.empty())
                 {
                     delete pFootEndNoteImpl;
@@ -261,35 +261,35 @@ SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const OUString& rName )
     return pStartNodeIdx;
 }
 
-Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
+Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    SwFmtFtn& rFmtFtn = const_cast<SwFmtFtn&>(static_cast<const SwFmtFtn&>(rHt));
-    SwTxtFtn *pTxtFtn = rFmtFtn.GetTxtFtn();
-    if( !pTxtFtn )
+    SwFormatFootnote& rFormatFootnote = const_cast<SwFormatFootnote&>(static_cast<const SwFormatFootnote&>(rHt));
+    SwTextFootnote *pTextFootnote = rFormatFootnote.GetTextFootnote();
+    if( !pTextFootnote )
         return rWrt;
 
-    OUString sFtnName, sClass;
+    OUString sFootnoteName, sClass;
     sal_uInt16 nPos;
-    if( rFmtFtn.IsEndNote() )
+    if( rFormatFootnote.IsEndNote() )
     {
         nPos = rHTMLWrt.pFootEndNotes ? rHTMLWrt.pFootEndNotes->size() : 0;
         OSL_ENSURE( nPos == rHTMLWrt.nFootNote + rHTMLWrt.nEndNote,
-                "OutHTML_SwFmtFtn: Position falsch" );
+                "OutHTML_SwFormatFootnote: Position falsch" );
         sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_anc;
-        sFtnName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( (sal_Int32)(++rHTMLWrt.nEndNote) );
+        sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( (sal_Int32)(++rHTMLWrt.nEndNote) );
     }
     else
     {
         nPos = rHTMLWrt.nFootNote;
         sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote_anc;
-        sFtnName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number( (sal_Int32)(++rHTMLWrt.nFootNote));
+        sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number( (sal_Int32)(++rHTMLWrt.nFootNote));
     }
 
     if( !rHTMLWrt.pFootEndNotes )
-        rHTMLWrt.pFootEndNotes = new SwHTMLTxtFtns;
-    rHTMLWrt.pFootEndNotes->insert( rHTMLWrt.pFootEndNotes->begin() + nPos, pTxtFtn );
+        rHTMLWrt.pFootEndNotes = new SwHTMLTextFootnotes;
+    rHTMLWrt.pFootEndNotes->insert( rHTMLWrt.pFootEndNotes->begin() + nPos, pTextFootnote );
 
     OStringBuffer sOut;
     sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
@@ -298,19 +298,19 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
     HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
     sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
     rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-    HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+    HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
     sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\" ")
         .append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#");
     rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-    HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
+    HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
     sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append('\"');
-    if( !rFmtFtn.GetNumStr().isEmpty() )
+    if( !rFormatFootnote.GetNumStr().isEmpty() )
         sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed);
     sOut.append('>');
     rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
     HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, true );
 
-    HTMLOutFuncs::Out_String( rWrt.Strm(), rFmtFtn.GetViewNumStr(*rWrt.pDoc),
+    HTMLOutFuncs::Out_String( rWrt.Strm(), rFormatFootnote.GetViewNumStr(*rWrt.pDoc),
                                  rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
     HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, false );
     HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_anchor, false );
@@ -326,27 +326,27 @@ void SwHTMLWriter::OutFootEndNotes()
         return;
 
 #if OSL_DEBUG_LEVEL > 0
-    sal_uInt16 nFtn = nFootNote, nEn = nEndNote;
+    sal_uInt16 nFootnote = nFootNote, nEn = nEndNote;
 #endif
     nFootNote = 0, nEndNote = 0;
 
     for( sal_uInt16 i=0; i<pFootEndNotes->size(); i++ )
     {
-        SwTxtFtn *pTxtFtn = (*pFootEndNotes)[i];
-        pFmtFtn = &pTxtFtn->GetFtn();
+        SwTextFootnote *pTextFootnote = (*pFootEndNotes)[i];
+        pFormatFootnote = &pTextFootnote->GetFootnote();
 
-        OUString sFtnName, sClass;
-        if( pFmtFtn->IsEndNote() )
+        OUString sFootnoteName, sClass;
+        if( pFormatFootnote->IsEndNote() )
         {
             sClass = OOO_STRING_SVTOOLS_HTML_sdendnote;
-            sFtnName = OOO_STRING_SVTOOLS_HTML_sdendnote;
-            sFtnName += OUString::number((sal_Int32)(++nEndNote));
+            sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote;
+            sFootnoteName += OUString::number((sal_Int32)(++nEndNote));
         }
         else
         {
             sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote;
-            sFtnName = OOO_STRING_SVTOOLS_HTML_sdfootnote;
-            sFtnName += OUString::number((sal_Int32)(++nFootNote));
+            sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote;
+            sFootnoteName += OUString::number((sal_Int32)(++nFootNote));
         }
 
         if( bLFPossible )
@@ -355,14 +355,14 @@ void SwHTMLWriter::OutFootEndNotes()
         sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division)
             .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id).append("=\"");
         Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-        HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
+        HTMLOutFuncs::Out_String( Strm(), sFootnoteName, eDestEnc, &aNonConvertableCharacters );
         Strm().WriteCharPtr( "\">" );
 
         bLFPossible = true;
         IncIndentLevel();   // Inhalt von <DIV> einruecken
 
-        OSL_ENSURE( pTxtFtn, "SwHTMLWriter::OutFootEndNotes: SwTxtFtn fehlt" );
-        SwNodeIndex *pSttNdIdx = pTxtFtn->GetStartNode();
+        OSL_ENSURE( pTextFootnote, "SwHTMLWriter::OutFootEndNotes: SwTextFootnote fehlt" );
+        SwNodeIndex *pSttNdIdx = pTextFootnote->GetStartNode();
         OSL_ENSURE( pSttNdIdx,
                 "SwHTMLWriter::OutFootEndNotes: StartNode-Index fehlt" );
         if( pSttNdIdx )
@@ -378,21 +378,21 @@ void SwHTMLWriter::OutFootEndNotes()
         HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
         bLFPossible = true;
 
-        OSL_ENSURE( !pFmtFtn,
-                "SwHTMLWriter::OutFootEndNotes: Ftn wurde nicht ausgegeben" );
-        if( pFmtFtn )
+        OSL_ENSURE( !pFormatFootnote,
+                "SwHTMLWriter::OutFootEndNotes: Footnote wurde nicht ausgegeben" );
+        if( pFormatFootnote )
         {
-            if( pFmtFtn->IsEndNote() )
+            if( pFormatFootnote->IsEndNote() )
                 nEndNote++;
             else
                 nFootNote++;
 
-            pFmtFtn = 0;
+            pFormatFootnote = 0;
         }
     }
 
 #if OSL_DEBUG_LEVEL > 0
-    OSL_ENSURE( nFtn == nFootNote,
+    OSL_ENSURE( nFootnote == nFootNote,
             "SwHTMLWriter::OutFootEndNotes: Anzahl Fussnoten stimmt nicht" );
     OSL_ENSURE( nEn == nEndNote,
             "SwHTMLWriter::OutFootEndNotes: Anzahl Endnoten stimmt nicht" );
@@ -403,47 +403,47 @@ void SwHTMLWriter::OutFootEndNotes()
     nFootNote = nEndNote = 0;
 }
 
-OUString SwHTMLWriter::GetFootEndNoteSym( const SwFmtFtn& rFmtFtn )
+OUString SwHTMLWriter::GetFootEndNoteSym( const SwFormatFootnote& rFormatFootnote )
 {
     const SwEndNoteInfo * pInfo = 0;
-    if( rFmtFtn.GetNumStr().isEmpty() )
-        pInfo = rFmtFtn.IsEndNote() ? &pDoc->GetEndNoteInfo()
-                                    : &pDoc->GetFtnInfo();
+    if( rFormatFootnote.GetNumStr().isEmpty() )
+        pInfo = rFormatFootnote.IsEndNote() ? &pDoc->GetEndNoteInfo()
+                                    : &pDoc->GetFootnoteInfo();
 
     OUString sRet;
     if( pInfo )
         sRet = pInfo->GetPrefix();
-    sRet += rFmtFtn.GetViewNumStr( *pDoc );
+    sRet += rFormatFootnote.GetViewNumStr( *pDoc );
     if( pInfo )
         sRet += pInfo->GetSuffix();
 
     return sRet;
 }
 
-void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn,
+void SwHTMLWriter::OutFootEndNoteSym( const SwFormatFootnote& rFormatFootnote,
                                          const OUString& rNum,
                                          sal_uInt16 nScript )
 {
     const SwEndNoteInfo *pInfo;
 
-    OUString sFtnName, sClass;
-    if( rFmtFtn.IsEndNote() )
+    OUString sFootnoteName, sClass;
+    if( rFormatFootnote.IsEndNote() )
     {
         sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_sym;
-        sFtnName = OOO_STRING_SVTOOLS_HTML_sdendnote;
-        sFtnName += OUString::number((sal_Int32)nEndNote);
+        sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote;
+        sFootnoteName += OUString::number((sal_Int32)nEndNote);
         pInfo = &pDoc->GetEndNoteInfo();
     }
     else
     {
         sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote_sym;
-        sFtnName = OOO_STRING_SVTOOLS_HTML_sdfootnote;
-        sFtnName += OUString::number((sal_Int32)nFootNote);
-        pInfo = &pDoc->GetFtnInfo();
+        sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote;
+        sFootnoteName += OUString::number((sal_Int32)nFootNote);
+        pInfo = &pDoc->GetFootnoteInfo();
     }
 
-    const SwCharFmt *pSymCharFmt = pInfo->GetCharFmt( *pDoc );
-    if( pSymCharFmt && 0 != aScriptTextStyles.count( pSymCharFmt->GetName() ) )
+    const SwCharFormat *pSymCharFormat = pInfo->GetCharFormat( *pDoc );
+    if( pSymCharFormat && 0 != aScriptTextStyles.count( pSymCharFormat->GetName() ) )
     {
         switch( nScript )
         {
@@ -466,11 +466,11 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn,
     HTMLOutFuncs::Out_String( Strm(), sClass, eDestEnc, &aNonConvertableCharacters );
     sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
     Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-    HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
+    HTMLOutFuncs::Out_String( Strm(), sFootnoteName, eDestEnc, &aNonConvertableCharacters );
     sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append("\" ")
         .append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#");
     Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-    HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
+    HTMLOutFuncs::Out_String( Strm(), sFootnoteName, eDestEnc, &aNonConvertableCharacters );
     sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\">");
     Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
@@ -483,19 +483,19 @@ static sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
                                  bool bEndNote  )
 {
     sal_uInt16 nParts = 0;
-    sal_Int16 eFmt = rInfo.aFmt.GetNumberingType();
-    if( (bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC) != eFmt )
+    sal_Int16 eFormat = rInfo.aFormat.GetNumberingType();
+    if( (bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC) != eFormat )
     {
-        const sal_Char *pStr = SwHTMLWriter::GetNumFormat( eFmt );
+        const sal_Char *pStr = SwHTMLWriter::GetNumFormat( eFormat );
         if( pStr )
         {
             pParts[0] = OUString::createFromAscii( pStr );
             nParts = 1;
         }
     }
-    if( rInfo.nFtnOffset > 0 )
+    if( rInfo.nFootnoteOffset > 0 )
     {
-        pParts[1] = OUString::number(rInfo.nFtnOffset);
+        pParts[1] = OUString::number(rInfo.nFootnoteOffset);
         nParts = 2;
     }
     if( !rInfo.GetPrefix().isEmpty() )
@@ -550,7 +550,7 @@ void SwHTMLWriter::OutFootEndNoteInfo()
     // Beginn
 
     {
-        const SwFtnInfo& rInfo = pDoc->GetFtnInfo();
+        const SwFootnoteInfo& rInfo = pDoc->GetFootnoteInfo();
         OUString aParts[8];
         sal_uInt16 nParts = lcl_html_fillEndNoteInfo( rInfo, aParts, false );
         if( rInfo.eNum != FTNNUM_DOC )
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 28117fdd5e33..ab51592c16d7 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -126,8 +126,8 @@ void SwHTMLParser::ConnectImageMaps()
         SwNode *pNd = rNds[nIdx + 1];
         if( 0 != (pGrfNd = pNd->GetGrfNode()) )
         {
-            SwFrmFmt *pFmt = pGrfNd->GetFlyFmt();
-            SwFmtURL aURL( pFmt->GetURL() );
+            SwFrameFormat *pFormat = pGrfNd->GetFlyFormat();
+            SwFormatURL aURL( pFormat->GetURL() );
             const ImageMap *pIMap = aURL.GetMap();
             if( pIMap && pIMap->GetIMapObjectCount()==0 )
             {
@@ -137,7 +137,7 @@ void SwHTMLParser::ConnectImageMaps()
                 ImageMap *pNewIMap =
                     FindImageMap( pIMap->GetName() );
                 aURL.SetMap( pNewIMap );
-                pFmt->SetFmtAttr( aURL );
+                pFormat->SetFormatAttr( aURL );
                 if( !pGrfNd->IsScaleImageMap() )
                 {
                     // die Grafikgroesse ist mitlerweile da oder dir
@@ -190,7 +190,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                            bool bDontAppend )
 {
     bool bMoveBackward = false;
-    SwFmtAnchor aAnchor( FLY_AS_CHAR );
+    SwFormatAnchor aAnchor( FLY_AS_CHAR );
     sal_Int16 eVertRel = text::RelOrientation::FRAME;
 
     if( text::HoriOrientation::NONE != eHoriOri )
@@ -235,7 +235,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
             GetULSpaceFromContext( nUpper, nLower );
             InsertAttr( SvxULSpaceItem( nUpper, 0, RES_UL_SPACE ), false, true );
 
-            AppendTxtNode( AM_NOSPACE );
+            AppendTextNode( AM_NOSPACE );
 
             if( nUpper )
             {
@@ -246,8 +246,8 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
         }
 
         // Vertikale Ausrichtung und Verankerung bestimmen.
-        const sal_Int32 nCntnt = pPam->GetPoint()->nContent.GetIndex();
-        if( nCntnt )
+        const sal_Int32 nContent = pPam->GetPoint()->nContent.GetIndex();
+        if( nContent )
         {
             aAnchor.SetType( FLY_AT_CHAR );
             bMoveBackward = true;
@@ -261,11 +261,11 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
             eVertRel = text::RelOrientation::PRINT_AREA;
         }
 
-        rFrmSet.Put( SwFmtHoriOrient( 0, eHoriOri, eHoriRel) );
+        rFrmSet.Put( SwFormatHoriOrient( 0, eHoriOri, eHoriRel) );
 
-        rFrmSet.Put( SwFmtSurround( eSurround ) );
+        rFrmSet.Put( SwFormatSurround( eSurround ) );
     }
-    rFrmSet.Put( SwFmtVertOrient( 0, eVertOri, eVertRel) );
+    rFrmSet.Put( SwFormatVertOrient( 0, eVertOri, eVertRel) );
 
     if( bMoveBackward )
         pPam->Move( fnMoveBackward );
@@ -278,15 +278,15 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
     rFrmSet.Put( aAnchor );
 }
 
-void SwHTMLParser::RegisterFlyFrm( SwFrmFmt *pFlyFmt )
+void SwHTMLParser::RegisterFlyFrm( SwFrameFormat *pFlyFormat )
 {
     // automatisch verankerte Rahmen muessen noch um eine Position
     // nach vorne verschoben werden.
-    if( RES_DRAWFRMFMT != pFlyFmt->Which() &&
-        (FLY_AT_PARA == pFlyFmt->GetAnchor().GetAnchorId()) &&
-        SURROUND_THROUGHT == pFlyFmt->GetSurround().GetSurround() )
+    if( RES_DRAWFRMFMT != pFlyFormat->Which() &&
+        (FLY_AT_PARA == pFlyFormat->GetAnchor().GetAnchorId()) &&
+        SURROUND_THROUGHT == pFlyFormat->GetSurround().GetSurround() )
     {
-        aMoveFlyFrms.push_back( pFlyFmt );
+        aMoveFlyFrms.push_back( pFlyFormat );
         aMoveFlyCnts.push_back( pPam->GetPoint()->nContent.GetIndex() );
     }
 }
@@ -316,7 +316,7 @@ void SwHTMLParser::InsertImage()
     long nWidth=0, nHeight=0;
     long nVSpace=0, nHSpace=0;
 
-    sal_uInt16 nBorder = (aAttrTab.pINetFmt ? 1 : 0);
+    sal_uInt16 nBorder = (aAttrTab.pINetFormat ? 1 : 0);
     bool bIsMap = false;
     bool bPrcWidth = false;
     bool bPrcHeight = false;
@@ -442,14 +442,14 @@ IMAGE_SETEVENT:
         !aBulletGrfs[GetNumInfo().GetDepth()-1].isEmpty() &&
         aBulletGrfs[GetNumInfo().GetDepth()-1]==sGrfNm )
     {
-        SwTxtNode* pTxtNode = pPam->GetNode().GetTxtNode();
+        SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
 
-        if( pTxtNode && ! pTxtNode->IsCountedInList())
+        if( pTextNode && ! pTextNode->IsCountedInList())
         {
-            OSL_ENSURE( pTxtNode->GetActualListLevel() == GetNumInfo().GetLevel(),
+            OSL_ENSURE( pTextNode->GetActualListLevel() == GetNumInfo().GetLevel(),
                     "Numerierungs-Ebene stimmt nicht" );
 
-            pTxtNode->SetCountedInList( true );
+            pTextNode->SetCountedInList( true );
 
             // Rule invalisieren ist noetig, weil zwischem dem einlesen
             // des LI und der Grafik ein EndAction gerufen worden sein kann.
@@ -458,7 +458,7 @@ IMAGE_SETEVENT:
 
             // Die Vorlage novh mal setzen. Ist noetig, damit der
             // Erstzeilen-Einzug stimmt.
-            SetTxtCollAttrs();
+            SetTextCollAttrs();
 
             return;
         }
@@ -503,7 +503,7 @@ IMAGE_SETEVENT:
     SfxItemSet aFrmSet( pDoc->GetAttrPool(),
                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
     if( !IsNewDoc() )
-        Reader::ResetFrmFmtAttrs( aFrmSet );
+        Reader::ResetFrameFormatAttrs( aFrmSet );
 
     // Umrandung setzen
     long nHBorderWidth = 0, nVBorderWidth = 0;
@@ -516,17 +516,17 @@ IMAGE_SETEVENT:
         ::editeng::SvxBorderLine aHBorderLine( NULL, nHBorderWidth );
         ::editeng::SvxBorderLine aVBorderLine( NULL, nVBorderWidth );
 
-        if( aAttrTab.pINetFmt )
+        if( aAttrTab.pINetFormat )
         {
             const OUString& rURL =
-                static_cast<const SwFmtINetFmt&>(aAttrTab.pINetFmt->GetItem()).GetValue();
+                static_cast<const SwFormatINetFormat&>(aAttrTab.pINetFormat->GetItem()).GetValue();
 
             pCSS1Parser->SetATagStyles();
             sal_uInt16 nPoolId =  static_cast< sal_uInt16 >(pDoc->IsVisitedURL( rURL )
                                     ? RES_POOLCHR_INET_VISIT
                                     : RES_POOLCHR_INET_NORMAL);
-            const SwCharFmt *pCharFmt = pCSS1Parser->GetCharFmtFromPool( nPoolId );
-            aHBorderLine.SetColor( pCharFmt->GetColor().GetValue() );
+            const SwCharFormat *pCharFormat = pCSS1Parser->GetCharFormatFromPool( nPoolId );
+            aHBorderLine.SetColor( pCharFormat->GetColor().GetValue() );
             aVBorderLine.SetColor( aHBorderLine.GetColor() );
         }
         else
@@ -553,7 +553,7 @@ IMAGE_SETEVENT:
     SetSpace( Size( nHSpace, nVSpace), aItemSet, aPropInfo, aFrmSet );
 
     // Sonstige CSS1-Attribute Setzen
-    SetFrmFmtAttrs( aItemSet, aPropInfo, HTML_FF_BOX, aFrmSet );
+    SetFrameFormatAttrs( aItemSet, aPropInfo, HTML_FF_BOX, aFrmSet );
 
     Size aTwipSz( bPrcWidth ? 0 : nWidth, bPrcHeight ? 0 : nHeight );
     if( (aTwipSz.Width() || aTwipSz.Height()) && Application::GetDefaultDevice() )
@@ -676,7 +676,7 @@ IMAGE_SETEVENT:
         ImageMap *pImgMap = FindImageMap( aName );
         if( pImgMap )
         {
-            SwFmtURL aURL; aURL.SetMap( pImgMap );//wird kopieiert
+            SwFormatURL aURL; aURL.SetMap( pImgMap );//wird kopieiert
 
             bSetScaleImageMap = !nPrcWidth || !nPrcHeight;
             aFrmSet.Put( aURL );
@@ -684,7 +684,7 @@ IMAGE_SETEVENT:
         else
         {
             ImageMap aEmptyImgMap( aName );
-            SwFmtURL aURL; aURL.SetMap( &aEmptyImgMap );//wird kopieiert
+            SwFormatURL aURL; aURL.SetMap( &aEmptyImgMap );//wird kopieiert
             aFrmSet.Put( aURL );
             nMissingImgMaps++;          // es fehlen noch Image-Maps
 
@@ -723,20 +723,20 @@ IMAGE_SETEVENT:
             aTwipSz.Height() = MINFLY;
     }
 
-    SwFmtFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
+    SwFormatFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
     aFrmSize.SetWidthPercent( nPrcWidth );
     aFrmSize.SetHeightPercent( nPrcHeight );
     aFrmSet.Put( aFrmSize );
 
     // passing empty sGrfNm here, means we don't want the graphic to be linked
-    SwFrmFmt *pFlyFmt = pDoc->getIDocumentContentOperations().Insert( *pPam, sGrfNm, aEmptyOUStr, &aGraphic,
+    SwFrameFormat *pFlyFormat = pDoc->getIDocumentContentOperations().Insert( *pPam, sGrfNm, aEmptyOUStr, &aGraphic,
                                       &aFrmSet, NULL, NULL );
-    SwGrfNode *pGrfNd = pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
+    SwGrfNode *pGrfNd = pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
                                   ->GetIndex()+1 ]->GetGrfNode();
 
     if( !sHTMLGrfName.isEmpty() )
     {
-        pFlyFmt->SetName( sHTMLGrfName );
+        pFlyFormat->SetName( sHTMLGrfName );
 
         // ggfs. eine Grafik anspringen
         if( JUMPTO_GRAPHIC == eJumpTo && sHTMLGrfName == sJmpMark )
@@ -760,17 +760,17 @@ IMAGE_SETEVENT:
             pGrfNd->SetScaleImageMap( true );
     }
 
-    if( aAttrTab.pINetFmt )
+    if( aAttrTab.pINetFormat )
     {
-        const SwFmtINetFmt &rINetFmt =
-            static_cast<const SwFmtINetFmt&>(aAttrTab.pINetFmt->GetItem());
+        const SwFormatINetFormat &rINetFormat =
+            static_cast<const SwFormatINetFormat&>(aAttrTab.pINetFormat->GetItem());
 
-        SwFmtURL aURL( pFlyFmt->GetURL() );
+        SwFormatURL aURL( pFlyFormat->GetURL() );
 
-        aURL.SetURL( rINetFmt.GetValue(), bIsMap );
-        aURL.SetTargetFrameName( rINetFmt.GetTargetFrame() );
-        aURL.SetName( rINetFmt.GetName() );
-        pFlyFmt->SetFmtAttr( aURL );
+        aURL.SetURL( rINetFormat.GetValue(), bIsMap );
+        aURL.SetTargetFrameName( rINetFormat.GetTargetFrame() );
+        aURL.SetName( rINetFormat.GetName() );
+        pFlyFormat->SetFormatAttr( aURL );
 
         {
             static const sal_uInt16 aEvents[] = {
@@ -781,29 +781,29 @@ IMAGE_SETEVENT:
 
             for( sal_uInt16 n = 0; aEvents[ n ]; ++n )
             {
-                const SvxMacro *pMacro = rINetFmt.GetMacro( aEvents[ n ] );
+                const SvxMacro *pMacro = rINetFormat.GetMacro( aEvents[ n ] );
                 if( 0 != pMacro )
                     aMacroItem.SetMacro( aEvents[ n ], *pMacro );
             }
         }
 
-        if ((FLY_AS_CHAR == pFlyFmt->GetAnchor().GetAnchorId()) &&
-            aAttrTab.pINetFmt->GetSttPara() ==
+        if ((FLY_AS_CHAR == pFlyFormat->GetAnchor().GetAnchorId()) &&
+            aAttrTab.pINetFormat->GetSttPara() ==
                         pPam->GetPoint()->nNode &&
-            aAttrTab.pINetFmt->GetSttCnt() ==
+            aAttrTab.pINetFormat->GetSttCnt() ==
                         pPam->GetPoint()->nContent.GetIndex() - 1 )
         {
             // das Attribut wurde unmitellbar vor einer zeichengeb.
             // Grafik eingefuegt, also verschieben wir es
-            aAttrTab.pINetFmt->SetStart( *pPam->GetPoint() );
+            aAttrTab.pINetFormat->SetStart( *pPam->GetPoint() );
 
             // Wenn das Attribut auch ein Sprungziel ist, fuegen
             // wir noch eine Bookmark vor der Grafik ein, weil das
-            // SwFmtURL kein Sprungziel ist.
-            if( !rINetFmt.GetName().isEmpty() )
+            // SwFormatURL kein Sprungziel ist.
+            if( !rINetFormat.GetName().isEmpty() )
             {
                 pPam->Move( fnMoveBackward );
-                InsertBookmark( rINetFmt.GetName() );
+                InsertBookmark( rINetFormat.GetName() );
                 pPam->Move( fnMoveForward );
             }
         }
@@ -811,7 +811,7 @@ IMAGE_SETEVENT:
     }
 
     if( !aMacroItem.GetMacroTable().empty() )
-        pFlyFmt->SetFmtAttr( aMacroItem );
+        pFlyFormat->SetFormatAttr( aMacroItem );
 
     // tdf#87083 If the graphic has not been loaded yet, then load it now.
     // Otherwise it may be loaded during the first paint of the object and it
@@ -823,7 +823,7 @@ IMAGE_SETEVENT:
     }
 
     // Ggf. Frames anlegen und Auto-gebundenen Rahmen registrieren
-    RegisterFlyFrm( pFlyFmt );
+    RegisterFlyFrm( pFlyFormat );
 
     if( !aId.isEmpty() )
         InsertBookmark( aId );
@@ -833,8 +833,8 @@ IMAGE_SETEVENT:
 
 void SwHTMLParser::InsertBodyOptions()
 {
-    pDoc->SetTxtFmtColl( *pPam,
-                         pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_TEXT ) );
+    pDoc->SetTextFormatColl( *pPam,
+                         pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TEXT ) );
 
     OUString aBackGround, aId, aStyle, aLang, aDir;
     Color aBGColor, aTextColor, aLinkColor, aVLinkColor;
@@ -937,8 +937,8 @@ void SwHTMLParser::InsertBodyOptions()
     if( bTextColor && !pCSS1Parser->IsBodyTextSet() )
     {
         // Die Textfarbe wird an der Standard-Vorlage gesetzt
-        pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD )
-            ->SetFmtAttr( SvxColorItem(aTextColor, RES_CHRATR_COLOR) );
+        pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
+            ->SetFormatAttr( SvxColorItem(aTextColor, RES_CHRATR_COLOR) );
         pCSS1Parser->SetBodyTextSet();
     }
 
@@ -1007,8 +1007,8 @@ void SwHTMLParser::InsertBodyOptions()
 
         // alle noch uebrigen Optionen koennen an der Standard-Vorlage
         // gesetzt werden und gelten dann automatisch als defaults
-        pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD )
-            ->SetFmtAttr( aItemSet );
+        pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
+            ->SetFormatAttr( aItemSet );
     }
     else if( bSetBrush )
     {
@@ -1017,16 +1017,16 @@ void SwHTMLParser::InsertBodyOptions()
 
     if( bLinkColor && !pCSS1Parser->IsBodyLinkSet() )
     {
-        SwCharFmt *pCharFmt =
-            pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_INET_NORMAL);
-        pCharFmt->SetFmtAttr( SvxColorItem(aLinkColor, RES_CHRATR_COLOR) );
+        SwCharFormat *pCharFormat =
+            pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_INET_NORMAL);
+        pCharFormat->SetFormatAttr( SvxColorItem(aLinkColor, RES_CHRATR_COLOR) );
         pCSS1Parser->SetBodyLinkSet();
     }
     if( bVLinkColor && !pCSS1Parser->IsBodyVLinkSet() )
     {
-        SwCharFmt *pCharFmt =
-            pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_INET_VISIT);
-        pCharFmt->SetFmtAttr( SvxColorItem(aVLinkColor, RES_CHRATR_COLOR) );
+        SwCharFormat *pCharFormat =
+            pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_INET_VISIT);
+        pCharFormat->SetFormatAttr( SvxColorItem(aVLinkColor, RES_CHRATR_COLOR) );
         pCSS1Parser->SetBodyVLinkSet();
     }
     if( !aLang.isEmpty() )
@@ -1074,7 +1074,7 @@ void SwHTMLParser::NewAnchor()
         delete pOldCntxt;
     }
 
-    SvxMacroTableDtor aMacroTbl;
+    SvxMacroTableDtor aMacroTable;
     OUString sHRef, aName, sTarget;
     OUString aId, aStyle, aClass, aLang, aDir;
     bool bHasHRef = false, bFixed = false;
@@ -1151,7 +1151,7 @@ ANCHOR_SETEVENT:
                         OUString sScriptType;
                         if( EXTENDED_STYPE == eScriptType2 )
                             sScriptType = sDfltScriptType;
-                        aMacroTbl.Insert( nEvent, SvxMacro( sTmp, sScriptType, eScriptType2 ));
+                        aMacroTable.Insert( nEvent, SvxMacro( sTmp, sScriptType, eScriptType2 ));
                     }
                 }
                 break;
@@ -1190,8 +1190,8 @@ ANCHOR_SETEVENT:
     // einen neuen Kontext anlegen
     _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_ANCHOR_ON );
 
-    bool bEnAnchor = false, bFtnAnchor = false, bFtnEnSymbol = false;
-    OUString aFtnName;
+    bool bEnAnchor = false, bFootnoteAnchor = false, bFootnoteEnSymbol = false;
+    OUString aFootnoteName;
     OUString aStrippedClass( aClass );
     SwCSS1Parser::GetScriptFromClass( aStrippedClass, false );
     if( aStrippedClass.getLength() >=9  && bHasHRef && sHRef.getLength() > 1 &&
@@ -1201,13 +1201,13 @@ ANCHOR_SETEVENT:
         if( aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdendnote_anc ) )
             bEnAnchor = true;
         else if( aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdfootnote_anc ) )
-            bFtnAnchor = true;
+            bFootnoteAnchor = true;
         else if( aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdendnote_sym ) ||
                  aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdfootnote_sym ) )
-            bFtnEnSymbol = true;
-        if( bEnAnchor || bFtnAnchor || bFtnEnSymbol )
+            bFootnoteEnSymbol = true;
+        if( bEnAnchor || bFootnoteAnchor || bFootnoteEnSymbol )
         {
-            aFtnName = sHRef.copy( 1 );
+            aFootnoteName = sHRef.copy( 1 );
             aClass = aStrippedClass = aName = aEmptyOUStr;
             bHasHRef = false;
         }
@@ -1240,26 +1240,26 @@ ANCHOR_SETEVENT:
         }
 
         pCSS1Parser->SetATagStyles();
-        SwFmtINetFmt aINetFmt( sHRef, sTarget );
-        aINetFmt.SetName( aName );
+        SwFormatINetFormat aINetFormat( sHRef, sTarget );
+        aINetFormat.SetName( aName );
 
-        if( !aMacroTbl.empty() )
-            aINetFmt.SetMacroTbl( &aMacroTbl );
+        if( !aMacroTable.empty() )
+            aINetFormat.SetMacroTable( &aMacroTable );
 
         // das Default-Attribut setzen
-        InsertAttr( &aAttrTab.pINetFmt, aINetFmt, pCntxt );
+        InsertAttr( &aAttrTab.pINetFormat, aINetFormat, pCntxt );
     }
     else if( !aName.isEmpty() )
     {
         InsertBookmark( aName );
     }
 
-    if( bEnAnchor || bFtnAnchor )
+    if( bEnAnchor || bFootnoteAnchor )
     {
-        InsertFootEndNote( aFtnName, bEnAnchor, bFixed );
+        InsertFootEndNote( aFootnoteName, bEnAnchor, bFixed );
         bInFootEndNoteAnchor = bCallNextToken = true;
     }
-    else if( bFtnEnSymbol )
+    else if( bFootnoteEnSymbol )
     {
         bInFootEndNoteSymbol = bCallNextToken = true;
     }
@@ -1344,7 +1344,7 @@ void SwHTMLParser::StripTrailingPara()
 {
     bool bSetSmallFont = false;
 
-    SwCntntNode* pCNd = pPam->GetCntntNode();
+    SwContentNode* pCNd = pPam->GetContentNode();
     if( !pPam->GetPoint()->nContent.GetIndex() )
     {
         if( pCNd && pCNd->StartOfSectionIndex()+2 <
@@ -1352,13 +1352,13 @@ void SwHTMLParser::StripTrailingPara()
         {
             sal_uLong nNodeIdx = pPam->GetPoint()->nNode.GetIndex();
 
-            const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
+            const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
 
-            for( sal_uInt16 i=0; i<rFrmFmtTbl.size(); i++ )
+            for( sal_uInt16 i=0; i<rFrameFormatTable.size(); i++ )
             {
-                SwFrmFmt const*const pFmt = rFrmFmtTbl[i];
-                SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-                SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+                SwFrameFormat const*const pFormat = rFrameFormatTable[i];
+                SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+                SwPosition const*const pAPos = pAnchor->GetContentAnchor();
                 if (pAPos &&
                     ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
                      (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
@@ -1372,15 +1372,15 @@ void SwHTMLParser::StripTrailingPara()
                                 // geloescht wird, weil sonst der
                                 // End-Index in die Botanik zeigt
 
-            if( pCNd->Len() && pCNd->IsTxtNode() )
+            if( pCNd->Len() && pCNd->IsTextNode() )
             {
                 // es wurden Felder in den Node eingefuegt, die muessen
                 // wir jetzt verschieben
-                SwTxtNode *pPrvNd = pDoc->GetNodes()[nNodeIdx-1]->GetTxtNode();
+                SwTextNode *pPrvNd = pDoc->GetNodes()[nNodeIdx-1]->GetTextNode();
                 if( pPrvNd )
                 {
                     SwIndex aSrc( pCNd, 0 );
-                    pCNd->GetTxtNode()->CutText( pPrvNd, aSrc, pCNd->Len() );
+                    pCNd->GetTextNode()->CutText( pPrvNd, aSrc, pCNd->Len() );
                 }
             }
 
@@ -1396,7 +1396,7 @@ void SwHTMLParser::StripTrailingPara()
                 if(nBookNdIdx==nNodeIdx)
                 {
                     SwNodeIndex nNewNdIdx(pPam->GetPoint()->nNode);
-                    SwCntntNode* pNd = SwNodes::GoPrevious(&nNewNdIdx);
+                    SwContentNode* pNd = SwNodes::GoPrevious(&nNewNdIdx);
                     if(!pNd)
                     {
                         OSL_ENSURE(false, "Hoppla, wo ist mein Vorgaenger-Node");
@@ -1421,7 +1421,7 @@ void SwHTMLParser::StripTrailingPara()
             pDoc->GetNodes().Delete( pPam->GetPoint()->nNode );
             pPam->Move( fnMoveBackward, fnGoNode );
         }
-        else if( pCNd && pCNd->IsTxtNode() && pTable )
+        else if( pCNd && pCNd->IsTextNode() && pTable )
         {
             // In leeren Zellen stellen wir einen kleinen Font ein, damit die
             // Zelle nicht hoeher wird als die Grafik bzw. so niedrig wie
@@ -1429,22 +1429,22 @@ void SwHTMLParser::StripTrailingPara()
             bSetSmallFont = true;
         }
     }
-    else if( pCNd && pCNd->IsTxtNode() && pTable &&
+    else if( pCNd && pCNd->IsTextNode() && pTable &&
              pCNd->StartOfSectionIndex()+2 ==
              pCNd->EndOfSectionIndex() )
     {
         // Wenn die Zelle nur zeichengebundene Grafiken/Rahmen enthaelt
         // stellen wir ebenfalls einen kleinen Font ein.
         bSetSmallFont = true;
-        SwTxtNode* pTxtNd = pCNd->GetTxtNode();
+        SwTextNode* pTextNd = pCNd->GetTextNode();
 
         sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
         while( bSetSmallFont && nPos>0 )
         {
             --nPos;
             bSetSmallFont =
-                (CH_TXTATR_BREAKWORD == pTxtNd->GetTxt()[nPos]) &&
-                (0 != pTxtNd->GetTxtAttrForCharAt( nPos, RES_TXTATR_FLYCNT ));
+                (CH_TXTATR_BREAKWORD == pTextNd->GetText()[nPos]) &&
+                (0 != pTextNd->GetTextAttrForCharAt( nPos, RES_TXTATR_FLYCNT ));
         }
     }
 
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 7580afb0b9cb..d4b566a73412 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -21,21 +21,21 @@
 #include <ndtxt.hxx>
 #include <doc.hxx>
 
-void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd )
+void SwHTMLNumRuleInfo::Set( const SwTextNode& rTextNd )
 {
-    const SwNumRule* pTxtNdNumRule( rTxtNd.GetNumRule() );
-    if ( pTxtNdNumRule &&
-         pTxtNdNumRule != rTxtNd.GetDoc()->GetOutlineNumRule() )
+    const SwNumRule* pTextNdNumRule( rTextNd.GetNumRule() );
+    if ( pTextNdNumRule &&
+         pTextNdNumRule != rTextNd.GetDoc()->GetOutlineNumRule() )
     {
-        pNumRule = const_cast<SwNumRule*>(pTxtNdNumRule);
-        nDeep = static_cast< sal_uInt16 >(pNumRule ? rTxtNd.GetActualListLevel() + 1 : 0);
-        bNumbered = rTxtNd.IsCountedInList();
+        pNumRule = const_cast<SwNumRule*>(pTextNdNumRule);
+        nDeep = static_cast< sal_uInt16 >(pNumRule ? rTextNd.GetActualListLevel() + 1 : 0);
+        bNumbered = rTextNd.IsCountedInList();
         // #i57919# - correction of refactoring done by cws swnumtree:
         // <bRestart> has to be set to <true>, if numbering is restarted at this
         // text node and the start value equals <USHRT_MAX>.
         // Start value <USHRT_MAX> indicates, that at this text node the numbering
         // is restarted with the value given at the corresponding level.
-        bRestart = rTxtNd.IsListRestart() && !rTxtNd.HasAttrListRestartValue();
+        bRestart = rTextNd.IsListRestart() && !rTextNd.HasAttrListRestartValue();
     }
     else
     {
diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx
index f67190f4aaf5..5b7d861a8c19 100644
--- a/sw/source/filter/html/htmlnum.hxx
+++ b/sw/source/filter/html/htmlnum.hxx
@@ -25,7 +25,7 @@
 #define HTML_NUMBUL_MARGINLEFT  (MM50*2 + MM50/2)
 #define HTML_NUMBUL_INDENT      (-MM50)
 
-class SwTxtNode;
+class SwTextNode;
 class SwNumRule;
 
 // TODO: Unicode: Are these characters the correct ones?
@@ -44,7 +44,7 @@ class SwHTMLNumRuleInfo
 public:
 
     inline void Set( const SwHTMLNumRuleInfo& rInf );
-    void Set( const SwTxtNode& rTxtNd );
+    void Set( const SwTextNode& rTextNd );
 
     SwHTMLNumRuleInfo() :
         pNumRule( 0 ), nDeep( 0 ),
@@ -60,7 +60,7 @@ public:
         memcpy( &aNumStarts, &rInf.aNumStarts, sizeof( aNumStarts ) );
     }
 
-    SwHTMLNumRuleInfo( const SwTxtNode& rTxtNd ) { Set( rTxtNd ); }
+    SwHTMLNumRuleInfo( const SwTextNode& rTextNd ) { Set( rTextNd ); }
     inline SwHTMLNumRuleInfo& operator=( const SwHTMLNumRuleInfo& rInf );
 
     inline void Clear();
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index 69a2c28868ce..dc1d49b846f1 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -59,7 +59,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
     // Erstmal einen neuen Absatz aufmachen
     bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 0;
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
+        AppendTextNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
     else if( bSpace )
         AddParSpace();
 
@@ -72,24 +72,24 @@ void SwHTMLParser::NewNumBulList( int nToken )
     if( !rInfo.GetNumRule() )
     {
         sal_uInt16 nPos = pDoc->MakeNumRule( pDoc->GetUniqueNumRuleName() );
-        rInfo.SetNumRule( pDoc->GetNumRuleTbl()[nPos] );
+        rInfo.SetNumRule( pDoc->GetNumRuleTable()[nPos] );
     }
 
     // das Format anpassen, falls es fuer den Level noch nicht
     // geschehen ist!
-    bool bNewNumFmt = rInfo.GetNumRule()->GetNumFmt( nLevel ) == 0;
-    bool bChangeNumFmt = false;
+    bool bNewNumFormat = rInfo.GetNumRule()->GetNumFormat( nLevel ) == 0;
+    bool bChangeNumFormat = false;
 
     // das default Numerierungsformat erstellen
-    SwNumFmt aNumFmt( rInfo.GetNumRule()->Get(nLevel) );
+    SwNumFormat aNumFormat( rInfo.GetNumRule()->Get(nLevel) );
     rInfo.SetNodeStartValue( nLevel );
-    if( bNewNumFmt )
+    if( bNewNumFormat )
     {
-        sal_uInt16 nChrFmtPoolId = 0;
+        sal_uInt16 nChrFormatPoolId = 0;
         if( HTML_ORDERLIST_ON == nToken )
         {
-            aNumFmt.SetNumberingType(SVX_NUM_ARABIC);
-            nChrFmtPoolId = RES_POOLCHR_NUM_LEVEL;
+            aNumFormat.SetNumberingType(SVX_NUM_ARABIC);
+            nChrFormatPoolId = RES_POOLCHR_NUM_LEVEL;
         }
         else
         {
@@ -100,11 +100,11 @@ void SwHTMLParser::NewNumBulList( int nToken )
             // #i63395# - Only apply user defined default bullet font
             if ( numfunc::IsDefBulletFontUserDefined() )
             {
-                aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+                aNumFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
             }
-            aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-            aNumFmt.SetBulletChar( cBulletChar );       // das Bulletzeichen !!
-            nChrFmtPoolId = RES_POOLCHR_BUL_LEVEL;
+            aNumFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+            aNumFormat.SetBulletChar( cBulletChar );       // das Bulletzeichen !!
+            nChrFormatPoolId = RES_POOLCHR_BUL_LEVEL;
         }
 
         sal_uInt16 nAbsLSpace = HTML_NUMBUL_MARGINLEFT;
@@ -112,17 +112,17 @@ void SwHTMLParser::NewNumBulList( int nToken )
         short nFirstLineIndent  = HTML_NUMBUL_INDENT;
         if( nLevel > 0 )
         {
-            const SwNumFmt& rPrevNumFmt = rInfo.GetNumRule()->Get( nLevel-1 );
-            nAbsLSpace = nAbsLSpace + rPrevNumFmt.GetAbsLSpace();
-            nFirstLineIndent = rPrevNumFmt.GetFirstLineOffset();
+            const SwNumFormat& rPrevNumFormat = rInfo.GetNumRule()->Get( nLevel-1 );
+            nAbsLSpace = nAbsLSpace + rPrevNumFormat.GetAbsLSpace();
+            nFirstLineIndent = rPrevNumFormat.GetFirstLineOffset();
         }
-        aNumFmt.SetAbsLSpace( nAbsLSpace );
-        aNumFmt.SetFirstLineOffset( nFirstLineIndent );
-        aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(nChrFmtPoolId) );
+        aNumFormat.SetAbsLSpace( nAbsLSpace );
+        aNumFormat.SetFirstLineOffset( nFirstLineIndent );
+        aNumFormat.SetCharFormat( pCSS1Parser->GetCharFormatFromPool(nChrFormatPoolId) );
 
-        bChangeNumFmt = true;
+        bChangeNumFormat = true;
     }
-    else if( 1 != aNumFmt.GetStart() )
+    else if( 1 != aNumFormat.GetStart() )
     {
         // Wenn die Ebene schon mal benutzt wurde, muss der Start-Wert
         // ggf. hart am Absatz gesetzt werden.
@@ -144,26 +144,26 @@ void SwHTMLParser::NewNumBulList( int nToken )
             aId = rOption.GetString();
             break;
         case HTML_O_TYPE:
-            if( bNewNumFmt && !rOption.GetString().isEmpty() )
+            if( bNewNumFormat && !rOption.GetString().isEmpty() )
             {
                 switch( nToken )
                 {
                 case HTML_ORDERLIST_ON:
-                    bChangeNumFmt = true;
+                    bChangeNumFormat = true;
                     switch( rOption.GetString()[0] )
                     {
-                    case 'A':   aNumFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER); break;
-                    case 'a':   aNumFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); break;
-                    case 'I':   aNumFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER);        break;
-                    case 'i':   aNumFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER);        break;
-                    default:    bChangeNumFmt = false;
+                    case 'A':   aNumFormat.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER); break;
+                    case 'a':   aNumFormat.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); break;
+                    case 'I':   aNumFormat.SetNumberingType(SVX_NUM_ROMAN_UPPER);        break;
+                    case 'i':   aNumFormat.SetNumberingType(SVX_NUM_ROMAN_LOWER);        break;
+                    default:    bChangeNumFormat = false;
                     }
                     break;
 
                 case HTML_UNORDERLIST_ON:
-                    aNumFmt.SetBulletChar( (sal_Unicode)rOption.GetEnum(
-                                    aHTMLULTypeTable,aNumFmt.GetBulletChar() ) );
-                    bChangeNumFmt = true;
+                    aNumFormat.SetBulletChar( (sal_Unicode)rOption.GetEnum(
+                                    aHTMLULTypeTable,aNumFormat.GetBulletChar() ) );
+                    bChangeNumFormat = true;
                     break;
                 }
             }
@@ -171,10 +171,10 @@ void SwHTMLParser::NewNumBulList( int nToken )
         case HTML_O_START:
             {
                 sal_uInt16 nStart = (sal_uInt16)rOption.GetNumber();
-                if( bNewNumFmt )
+                if( bNewNumFormat )
                 {
-                    aNumFmt.SetStart( nStart );
-                    bChangeNumFmt = true;
+                    aNumFormat.SetStart( nStart );
+                    bChangeNumFormat = true;
                 }
                 else
                 {
@@ -195,7 +195,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
             aDir = rOption.GetString();
             break;
         case HTML_O_SRC:
-            if( bNewNumFmt )
+            if( bNewNumFormat )
             {
                 aBulletSrc = rOption.GetString();
                 if( !InternalImgToPrivateURL(aBulletSrc) )
@@ -219,7 +219,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
     if( !aBulletSrc.isEmpty() )
     {
         // Eine Bullet-Liste mit Grafiken
-        aNumFmt.SetNumberingType(SVX_NUM_BITMAP);
+        aNumFormat.SetNumberingType(SVX_NUM_BITMAP);
 
         // Die Grafik als Brush anlegen
         SvxBrushItem aBrushItem( RES_BACKGROUND );
@@ -238,13 +238,13 @@ void SwHTMLParser::NewNumBulList( int nToken )
 
         // Die Ausrichtung auch nur beachten, wenn eine Ausrichtung
         // angegeben wurde
-        aNumFmt.SetGraphicBrush( &aBrushItem, pTwipSz,
+        aNumFormat.SetGraphicBrush( &aBrushItem, pTwipSz,
                             text::VertOrientation::NONE!=eVertOri ? &eVertOri : 0);
 
         // Und noch die Grafik merken, um sie in den Absaetzen nicht
         // einzufuegen
         aBulletGrfs[nLevel] = aBulletSrc;
-        bChangeNumFmt = true;
+        bChangeNumFormat = true;
     }
     else
         aBulletGrfs[nLevel].clear();
@@ -266,13 +266,13 @@ void SwHTMLParser::NewNumBulList( int nToken )
 
         if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
         {
-            if( bNewNumFmt )
+            if( bNewNumFormat )
             {
                 if( aPropInfo.bLeftMargin )
                 {
                     // Der Der Default-Einzug wurde schon eingefuegt.
                     sal_uInt16 nAbsLSpace =
-                        aNumFmt.GetAbsLSpace() - HTML_NUMBUL_MARGINLEFT;
+                        aNumFormat.GetAbsLSpace() - HTML_NUMBUL_MARGINLEFT;
                     if( aPropInfo.nLeftMargin < 0 &&
                         nAbsLSpace < -aPropInfo.nLeftMargin )
                         nAbsLSpace = 0U;
@@ -283,16 +283,16 @@ void SwHTMLParser::NewNumBulList( int nToken )
                     else
                         nAbsLSpace = nAbsLSpace + (sal_uInt16)aPropInfo.nLeftMargin;
 
-                    aNumFmt.SetAbsLSpace( nAbsLSpace );
-                    bChangeNumFmt = true;
+                    aNumFormat.SetAbsLSpace( nAbsLSpace );
+                    bChangeNumFormat = true;
                 }
                 if( aPropInfo.bTextIndent )
                 {
                     short nTextIndent =
                         static_cast<const SvxLRSpaceItem &>(aItemSet.Get( RES_LR_SPACE ))
-                                                        .GetTxtFirstLineOfst();
-                    aNumFmt.SetFirstLineOffset( nTextIndent );
-                    bChangeNumFmt = true;
+                                                        .GetTextFirstLineOfst();
+                    aNumFormat.SetFirstLineOffset( nTextIndent );
+                    bChangeNumFormat = true;
                 }
             }
             aPropInfo.bLeftMargin = aPropInfo.bTextIndent = false;
@@ -302,11 +302,11 @@ void SwHTMLParser::NewNumBulList( int nToken )
             // #i89812# - Perform change to list style before calling <DoPositioning(..)>,
             // because <DoPositioning(..)> may open a new context and thus may
             // clear the <SwHTMLNumRuleInfo> instance hold by local variable <rInfo>.
-            if( bChangeNumFmt )
+            if( bChangeNumFormat )
             {
-                rInfo.GetNumRule()->Set( nLevel, aNumFmt );
-                pDoc->ChgNumRuleFmts( *rInfo.GetNumRule() );
-                bChangeNumFmt = false;
+                rInfo.GetNumRule()->Set( nLevel, aNumFormat );
+                pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
+                bChangeNumFormat = false;
             }
 
             DoPositioning( aItemSet, aPropInfo, pCntxt );
@@ -315,16 +315,16 @@ void SwHTMLParser::NewNumBulList( int nToken )
         }
     }
 
-    if( bChangeNumFmt )
+    if( bChangeNumFormat )
     {
-        rInfo.GetNumRule()->Set( nLevel, aNumFmt );
-        pDoc->ChgNumRuleFmts( *rInfo.GetNumRule() );
+        rInfo.GetNumRule()->Set( nLevel, aNumFormat );
+        pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
     }
 
     PushContext( pCntxt );
 
     // die Attribute der neuen Vorlage setzen
-    SetTxtCollAttrs( pCntxt );
+    SetTextCollAttrs( pCntxt );
 }
 
 void SwHTMLParser::EndNumBulList( int nToken )
@@ -338,16 +338,16 @@ void SwHTMLParser::EndNumBulList( int nToken )
     bool bAppend = pPam->GetPoint()->nContent.GetIndex() > 0;
     if( !bAppend )
     {
-        SwTxtNode* pTxtNode = pPam->GetNode().GetTxtNode();
+        SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
 
-        bAppend = (pTxtNode && ! pTxtNode->IsOutline() && pTxtNode->IsCountedInList()) ||
+        bAppend = (pTextNode && ! pTextNode->IsOutline() && pTextNode->IsCountedInList()) ||
 
             HasCurrentParaFlys();
     }
 
     bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 1;
     if( bAppend )
-        AppendTxtNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
+        AppendTextNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
     else if( bSpace )
         AddParSpace();
 
@@ -363,43 +363,43 @@ void SwHTMLParser::EndNumBulList( int nToken )
         {
             // Die noch nicht angepassten Formate werden jetzt noch
             // angepasst, damit es sich besser Editieren laesst.
-            const SwNumFmt *pRefNumFmt = 0;
+            const SwNumFormat *pRefNumFormat = 0;
             bool bChanged = false;
             for( sal_uInt16 i=0; i<MAXLEVEL; i++ )
             {
-                const SwNumFmt *pNumFmt = rInfo.GetNumRule()->GetNumFmt(i);
-                if( pNumFmt )
+                const SwNumFormat *pNumFormat = rInfo.GetNumRule()->GetNumFormat(i);
+                if( pNumFormat )
                 {
-                    pRefNumFmt = pNumFmt;
+                    pRefNumFormat = pNumFormat;
                 }
-                else if( pRefNumFmt )
+                else if( pRefNumFormat )
                 {
-                    SwNumFmt aNumFmt( rInfo.GetNumRule()->Get(i) );
-                    aNumFmt.SetNumberingType(pRefNumFmt->GetNumberingType() != SVX_NUM_BITMAP
-                                        ? pRefNumFmt->GetNumberingType() : style::NumberingType::CHAR_SPECIAL);
-                    if( SVX_NUM_CHAR_SPECIAL == aNumFmt.GetNumberingType() )
+                    SwNumFormat aNumFormat( rInfo.GetNumRule()->Get(i) );
+                    aNumFormat.SetNumberingType(pRefNumFormat->GetNumberingType() != SVX_NUM_BITMAP
+                                        ? pRefNumFormat->GetNumberingType() : style::NumberingType::CHAR_SPECIAL);
+                    if( SVX_NUM_CHAR_SPECIAL == aNumFormat.GetNumberingType() )
                     {
                         // #i63395# - Only apply user defined default bullet font
                         if ( numfunc::IsDefBulletFontUserDefined() )
                         {
-                            aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+                            aNumFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
                         }
-                        aNumFmt.SetBulletChar( cBulletChar );
+                        aNumFormat.SetBulletChar( cBulletChar );
                     }
-                    aNumFmt.SetAbsLSpace( (i+1) * HTML_NUMBUL_MARGINLEFT );
-                    aNumFmt.SetFirstLineOffset( HTML_NUMBUL_INDENT );
-                    aNumFmt.SetCharFmt( pRefNumFmt->GetCharFmt() );
-                    rInfo.GetNumRule()->Set( i, aNumFmt );
+                    aNumFormat.SetAbsLSpace( (i+1) * HTML_NUMBUL_MARGINLEFT );
+                    aNumFormat.SetFirstLineOffset( HTML_NUMBUL_INDENT );
+                    aNumFormat.SetCharFormat( pRefNumFormat->GetCharFormat() );
+                    rInfo.GetNumRule()->Set( i, aNumFormat );
                     bChanged = true;
                 }
             }
             if( bChanged )
-                pDoc->ChgNumRuleFmts( *rInfo.GetNumRule() );
+                pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
 
             // Beim letzen Append wurde das NumRule-Item und das
             // NodeNum-Objekt mit kopiert. Beides muessen wir noch
             // loeschen. Das ResetAttr loescht das NodeNum-Objekt mit!
-            pPam->GetNode().GetTxtNode()->ResetAttr( RES_PARATR_NUMRULE );
+            pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE );
 
             rInfo.Clear();
         }
@@ -420,7 +420,7 @@ void SwHTMLParser::EndNumBulList( int nToken )
     }
 
     if( nToken )
-        SetTxtCollAttrs();
+        SetTextCollAttrs();
 
     if( bSetAttrs )
         SetAttr();  // Absatz-Atts wegen JavaScript moeglichst schnell setzen
@@ -466,7 +466,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
 
     // einen neuen Absatz aufmachen
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( AM_NOSPACE, false );
+        AppendTextNode( AM_NOSPACE, false );
     bNoParSpace = false;    // In <LI> wird kein Abstand eingefuegt!
 
     const bool bCountedInList = nToken != HTML_LISTHEADER_ON;
@@ -483,17 +483,17 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
         aNumRuleName = pDoc->GetUniqueNumRuleName();
         SwNumRule aNumRule( aNumRuleName,
                             SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
-        SwNumFmt aNumFmt( aNumRule.Get( 0 ) );
+        SwNumFormat aNumFormat( aNumRule.Get( 0 ) );
         // #i63395# - Only apply user defined default bullet font
         if ( numfunc::IsDefBulletFontUserDefined() )
         {
-            aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+            aNumFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
         }
-        aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-        aNumFmt.SetBulletChar( cBulletChar );   // das Bulletzeichen !!
-        aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_BUL_LEVEL) );
-        aNumFmt.SetFirstLineOffset( HTML_NUMBUL_INDENT );
-        aNumRule.Set( 0, aNumFmt );
+        aNumFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+        aNumFormat.SetBulletChar( cBulletChar );   // das Bulletzeichen !!
+        aNumFormat.SetCharFormat( pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_BUL_LEVEL) );
+        aNumFormat.SetFirstLineOffset( HTML_NUMBUL_INDENT );
+        aNumRule.Set( 0, aNumFormat );
 
         pDoc->MakeNumRule( aNumRuleName, &aNumRule );
 
@@ -501,18 +501,18 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
                 "Jetzt geht ein offenes Absatz-Element verloren" );
         // Wir tun so, als ob wir in einem Absatz sind. Dann wird
         // beim naechsten Absatz wenigstens die Numerierung
-        // weggeschmissen, die nach dem naechsten AppendTxtNode uebernommen
+        // weggeschmissen, die nach dem naechsten AppendTextNode uebernommen
         // wird.
         nOpenParaToken = static_cast< sal_uInt16 >(nToken);
     }
 
-    SwTxtNode* pTxtNode = pPam->GetNode().GetTxtNode();
-    ((SwCntntNode *)pTxtNode)->SetAttr( SwNumRuleItem(aNumRuleName) );
-    pTxtNode->SetAttrListLevel(nLevel);
+    SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
+    ((SwContentNode *)pTextNode)->SetAttr( SwNumRuleItem(aNumRuleName) );
+    pTextNode->SetAttrListLevel(nLevel);
     // #i57656# - <IsCounted()> state of text node has to be adjusted accordingly.
     if ( nLevel < MAXLEVEL )
     {
-        pTxtNode->SetCountedInList( bCountedInList );
+        pTextNode->SetCountedInList( bCountedInList );
     }
     // #i57919#
     // correction of refactoring done by cws swnumtree
@@ -521,8 +521,8 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
     //   restarted at this text node
     if ( nStart != USHRT_MAX )
     {
-        pTxtNode->SetListRestart( true );
-        pTxtNode->SetAttrListRestartValue( nStart );
+        pTextNode->SetListRestart( true );
+        pTextNode->SetAttrListRestartValue( nStart );
     }
 
     if( GetNumInfo().GetNumRule() )
@@ -544,7 +544,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
     PushContext( pCntxt );
 
     // die neue Vorlage setzen
-    SetTxtCollAttrs( pCntxt );
+    SetTextCollAttrs( pCntxt );
 
     // Laufbalkenanzeige aktualisieren
     ShowStatline();
@@ -555,7 +555,7 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
 {
     // einen neuen Absatz aufmachen
     if( !nToken && pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( AM_NOSPACE );
+        AppendTextNode( AM_NOSPACE );
 
     // Kontext zu dem Token suchen und vom Stack holen
     _HTMLAttrContext *pCntxt = 0;
@@ -594,20 +594,20 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
 
     // und die bisherige Vorlage setzen
     if( bSetColl )
-        SetTxtCollAttrs();
+        SetTextCollAttrs();
 }
 
 void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList )
 {
-    SwTxtNode* pTxtNode = pPam->GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNode, "Kein Text-Node an PaM-Position" );
+    SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
+    OSL_ENSURE( pTextNode, "Kein Text-Node an PaM-Position" );
 
     OSL_ENSURE( GetNumInfo().GetNumRule(), "Kein Numerierungs-Regel" );
     const OUString& rName = GetNumInfo().GetNumRule()->GetName();
-    ((SwCntntNode *)pTxtNode)->SetAttr( SwNumRuleItem(rName) );
+    ((SwContentNode *)pTextNode)->SetAttr( SwNumRuleItem(rName) );
 
-    pTxtNode->SetAttrListLevel( nLevel );
-    pTxtNode->SetCountedInList( bCountedInList );
+    pTextNode->SetAttrListLevel( nLevel );
+    pTextNode->SetCountedInList( bCountedInList );
 
     // NumRule invalidieren, weil sie durch ein EndAction bereits
     // auf valid geschaltet worden sein kann.
diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx
index 94c57e303e4f..127d08c22fc2 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -53,10 +53,10 @@ void SwHTMLWriter::FillNextNumInfo()
     do
     {
         const SwNode* pNd = pDoc->GetNodes()[nPos];
-        if( pNd->IsTxtNode() )
+        if( pNd->IsTextNode() )
         {
             // Der naechste wird als naechstes ausgegeben.
-            pNextNumRuleInfo = new SwHTMLNumRuleInfo( *pNd->GetTxtNode() );
+            pNextNumRuleInfo = new SwHTMLNumRuleInfo( *pNd->GetTextNode() );
 
             // Vor einer Tabelle behalten wir erst einmal die alte Ebene bei,
             // wenn die gleiche Numerierung hinter der Tabelle
@@ -126,19 +126,19 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
                     do
                     {
                         const SwNode* pNd = rWrt.pDoc->GetNodes()[nPos];
-                        if( pNd->IsTxtNode() )
+                        if( pNd->IsTextNode() )
                         {
-                            const SwTxtNode *pTxtNd = pNd->GetTxtNode();
-                            if( !pTxtNd->GetNumRule() )
+                            const SwTextNode *pTextNd = pNd->GetTextNode();
+                            if( !pTextNd->GetNumRule() )
                             {
                                 // node isn't numbered => check completed
                                 break;
                             }
 
-                            OSL_ENSURE(! pTxtNd->IsOutline(),
+                            OSL_ENSURE(! pTextNd->IsOutline(),
                                    "outline not expected");
 
-                            if( pTxtNd->GetActualListLevel() + 1 <
+                            if( pTextNd->GetActualListLevel() + 1 <
                                 rInfo.GetDepth() )
                             {
                                 // node is numbered, but level is lower
@@ -182,8 +182,8 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
         rWrt.aBulletGrfs[i].clear();
         OStringBuffer sOut;
         sOut.append('<');
-        const SwNumFmt& rNumFmt = rInfo.GetNumRule()->Get( i );
-        sal_Int16 eType = rNumFmt.GetNumberingType();
+        const SwNumFormat& rNumFormat = rInfo.GetNumRule()->Get( i );
+        sal_Int16 eType = rNumFormat.GetNumberingType();
         if( SVX_NUM_CHAR_SPECIAL == eType )
         {
             // Aufzaehlungs-Liste: <OL>
@@ -191,7 +191,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
 
             // den Typ ueber das Bullet-Zeichen bestimmen
             const sal_Char *pStr = 0;
-            switch( rNumFmt.GetBulletChar() )
+            switch( rNumFormat.GetBulletChar() )
             {
             case HTML_BULLETCHAR_DISC:
                 pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_disc;
@@ -217,7 +217,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
             rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
             OutHTML_BulletImage( rWrt,
                                     0,
-                                    rNumFmt.GetBrush() );
+                                    rNumFormat.GetBrush() );
         }
         else
         {
@@ -249,14 +249,14 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
                     append("=\"").append(cType).append("\"");
             }
 
-            sal_uInt16 nStartVal = rNumFmt.GetStart();
+            sal_uInt16 nStartVal = rNumFormat.GetStart();
             if( bStartValue && 1 == nStartVal && i == rInfo.GetDepth()-1 )
             {
                 // #i51089 - TUNING#
-                if ( rWrt.pCurPam->GetNode().GetTxtNode()->GetNum() )
+                if ( rWrt.pCurPam->GetNode().GetTextNode()->GetNum() )
                 {
                     nStartVal = static_cast< sal_uInt16 >( rWrt.pCurPam->GetNode()
-                                .GetTxtNode()->GetNumberVector()[i] );
+                                .GetTextNode()->GetNumberVector()[i] );
                 }
                 else
                 {
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 213b6b08a445..b9e14257454a 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -196,7 +196,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize,
     }
 
     // Size setzen
-    SwFmtFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
+    SwFormatFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
     aFrmSize.SetWidthPercent( nPrcWidth );
     aFrmSize.SetHeightPercent( nPrcHeight );
     rFlyItemSet.Put( aFrmSize );
@@ -226,7 +226,7 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
         // Ggf. den Erstzeilen-Einzug noch plaetten
         const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
         SvxLRSpaceItem aLRItem( *pLRItem );
-        aLRItem.SetTxtFirstLineOfst( 0 );
+        aLRItem.SetTextFirstLineOfst( 0 );
         if( rCSS1PropInfo.bLeftMargin )
         {
             nLeftSpace = aLRItem.GetLeft();
@@ -247,11 +247,11 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
         rFlyItemSet.Put( aLRItem );
         if( nLeftSpace )
         {
-            const SwFmtHoriOrient& rHoriOri =
-                static_cast<const SwFmtHoriOrient&>(rFlyItemSet.Get( RES_HORI_ORIENT ));
+            const SwFormatHoriOrient& rHoriOri =
+                static_cast<const SwFormatHoriOrient&>(rFlyItemSet.Get( RES_HORI_ORIENT ));
             if( text::HoriOrientation::NONE == rHoriOri.GetHoriOrient() )
             {
-                SwFmtHoriOrient aHoriOri( rHoriOri );
+                SwFormatHoriOrient aHoriOri( rHoriOri );
                 aHoriOri.SetPos( aHoriOri.GetPos() + nLeftSpace );
                 rFlyItemSet.Put( aHoriOri );
             }
@@ -283,11 +283,11 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
         rFlyItemSet.Put( aULItem );
         if( nUpperSpace )
         {
-            const SwFmtVertOrient& rVertOri =
-                static_cast<const SwFmtVertOrient&>(rFlyItemSet.Get( RES_VERT_ORIENT ));
+            const SwFormatVertOrient& rVertOri =
+                static_cast<const SwFormatVertOrient&>(rFlyItemSet.Get( RES_VERT_ORIENT ));
             if( text::VertOrientation::NONE == rVertOri.GetVertOrient() )
             {
-                SwFmtVertOrient aVertOri( rVertOri );
+                SwFormatVertOrient aVertOri( rVertOri );
                 aVertOri.SetPos( aVertOri.GetPos() + nUpperSpace );
                 rFlyItemSet.Put( aVertOri );
             }
@@ -440,7 +440,7 @@ void SwHTMLParser::InsertEmbed()
     SfxItemSet aFrmSet( pDoc->GetAttrPool(),
                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
     if( !IsNewDoc() )
-        Reader::ResetFrmFmtAttrs( aFrmSet );
+        Reader::ResetFrameFormatAttrs( aFrmSet );
 
     // den Anker setzen
     if( !bHidden )
@@ -449,12 +449,12 @@ void SwHTMLParser::InsertEmbed()
     }
     else
     {
-        SwFmtAnchor aAnchor( FLY_AT_PARA );
+        SwFormatAnchor aAnchor( FLY_AT_PARA );
         aAnchor.SetAnchor( pPam->GetPoint() );
         aFrmSet.Put( aAnchor );
-        aFrmSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME) );
-        aFrmSet.Put( SwFmtSurround( SURROUND_THROUGHT ) );
-        aFrmSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
+        aFrmSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME) );
+        aFrmSet.Put( SwFormatSurround( SURROUND_THROUGHT ) );
+        aFrmSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
     }
 
     // und noch die Groesse des Rahmens
@@ -464,18 +464,18 @@ void SwHTMLParser::InsertEmbed()
     SetSpace( aSpace, aItemSet, aPropInfo, aFrmSet );
 
     // und in das Dok einfuegen
-    SwFrmFmt* pFlyFmt =
+    SwFrameFormat* pFlyFormat =
         pDoc->getIDocumentContentOperations().Insert( *pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, NULL, NULL );
 
-    // Namen am FrmFmt setzen
+    // Namen am FrameFormat setzen
     if( !aName.isEmpty() )
-        pFlyFmt->SetName( aName );
+        pFlyFormat->SetName( aName );
 
     // den alternativen Text setzen
-    SwNoTxtNode *pNoTxtNd =
-        pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
-                          ->GetIndex()+1 ]->GetNoTxtNode();
-    pNoTxtNd->SetTitle( aAlt );
+    SwNoTextNode *pNoTextNd =
+        pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+                          ->GetIndex()+1 ]->GetNoTextNode();
+    pNoTextNd->SetTitle( aAlt );
 
     // Ggf Frames anlegen und auto-geb. Rahmen registrieren
     if( !bHidden )
@@ -483,7 +483,7 @@ void SwHTMLParser::InsertEmbed()
         // HIDDEN-Plugins sollen absatzgebunden bleiben. Da RegisterFlyFrm
         // absatzgebundene Rahmen mit DUrchlauf in am Zeichen gebundene
         // Rahmen umwandelt, muessen die Frames hier von Hand angelegt werden.
-        RegisterFlyFrm( pFlyFmt );
+        RegisterFlyFrm( pFlyFormat );
     }
 }
 
@@ -613,7 +613,7 @@ void SwHTMLParser::NewObject()
 
     SfxItemSet& rFrmSet = pAppletImpl->GetItemSet();
     if( !IsNewDoc() )
-        Reader::ResetFrmFmtAttrs( rFrmSet );
+        Reader::ResetFrameFormatAttrs( rFrmSet );
 
     // den Anker und die Ausrichtung setzen
     SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrmSet );
@@ -636,7 +636,7 @@ void SwHTMLParser::EndObject()
         pAppletImpl->FinishApplet();
 
         // und in das Dok einfuegen
-        SwFrmFmt* pFlyFmt =
+        SwFrameFormat* pFlyFormat =
             pDoc->getIDocumentContentOperations().Insert( *pPam,
                     ::svt::EmbeddedObjectRef( pAppletImpl->GetApplet(), embed::Aspects::MSOLE_CONTENT ),
                     &pAppletImpl->GetItemSet(),
@@ -644,13 +644,13 @@ void SwHTMLParser::EndObject()
                     NULL );
 
         // den alternativen Namen setzen
-        SwNoTxtNode *pNoTxtNd =
-            pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
-                              ->GetIndex()+1 ]->GetNoTxtNode();
-        pNoTxtNd->SetTitle( pAppletImpl->GetAltText() );
+        SwNoTextNode *pNoTextNd =
+            pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+                              ->GetIndex()+1 ]->GetNoTextNode();
+        pNoTextNd->SetTitle( pAppletImpl->GetAltText() );
 
         // Ggf Frames anlegen und auto-geb. Rahmen registrieren
-        RegisterFlyFrm( pFlyFmt );
+        RegisterFlyFrm( pFlyFormat );
 
         delete pAppletImpl;
         pAppletImpl = 0;
@@ -746,7 +746,7 @@ void SwHTMLParser::InsertApplet()
 
     SfxItemSet& rFrmSet = pAppletImpl->GetItemSet();
     if( !IsNewDoc() )
-        Reader::ResetFrmFmtAttrs( rFrmSet );
+        Reader::ResetFrameFormatAttrs( rFrmSet );
 
     // den Anker und die Ausrichtung setzen
     SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrmSet );
@@ -768,7 +768,7 @@ void SwHTMLParser::EndApplet()
     pAppletImpl->FinishApplet();
 
     // und in das Dok einfuegen
-    SwFrmFmt* pFlyFmt =
+    SwFrameFormat* pFlyFormat =
         pDoc->getIDocumentContentOperations().Insert( *pPam,
                     ::svt::EmbeddedObjectRef( pAppletImpl->GetApplet(), embed::Aspects::MSOLE_CONTENT ),
                     &pAppletImpl->GetItemSet(),
@@ -776,13 +776,13 @@ void SwHTMLParser::EndApplet()
                     NULL );
 
     // den alternativen Namen setzen
-    SwNoTxtNode *pNoTxtNd =
-        pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
-                          ->GetIndex()+1 ]->GetNoTxtNode();
-    pNoTxtNd->SetTitle( pAppletImpl->GetAltText() );
+    SwNoTextNode *pNoTextNd =
+        pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+                          ->GetIndex()+1 ]->GetNoTextNode();
+    pNoTextNd->SetTitle( pAppletImpl->GetAltText() );
 
     // Ggf Frames anlegen und auto-geb. Rahmen registrieren
-    RegisterFlyFrm( pFlyFmt );
+    RegisterFlyFrm( pFlyFormat );
 
     delete pAppletImpl;
     pAppletImpl = 0;
@@ -926,7 +926,7 @@ void SwHTMLParser::InsertFloatingFrame()
     SfxItemSet aFrmSet( pDoc->GetAttrPool(),
                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
     if( !IsNewDoc() )
-        Reader::ResetFrmFmtAttrs( aFrmSet );
+        Reader::ResetFrameFormatAttrs( aFrmSet );
 
     // den Anker und die Ausrichtung setzen
     SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrmSet );
@@ -938,17 +938,17 @@ void SwHTMLParser::InsertFloatingFrame()
     SetSpace( aSpace, aItemSet, aPropInfo, aFrmSet );
 
     // und in das Dok einfuegen
-    SwFrmFmt* pFlyFmt =
+    SwFrameFormat* pFlyFormat =
         pDoc->getIDocumentContentOperations().Insert( *pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, NULL, NULL );
 
     // den alternativen Namen setzen
-    SwNoTxtNode *pNoTxtNd =
-        pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
-                          ->GetIndex()+1 ]->GetNoTxtNode();
-    pNoTxtNd->SetTitle( aAlt );
+    SwNoTextNode *pNoTextNd =
+        pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
+                          ->GetIndex()+1 ]->GetNoTextNode();
+    pNoTextNd->SetTitle( aAlt );
 
     // Ggf Frames anlegen und auto-geb. Rahmen registrieren
-    RegisterFlyFrm( pFlyFmt );
+    RegisterFlyFrm( pFlyFormat );
 
     bInFloatingFrame = true;
 }
@@ -979,13 +979,13 @@ sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode )
     return static_cast< sal_uInt16 >(eType);
 }
 
-Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFormat,
                                bool bInCntnr )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
-    sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
+    const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+    sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex()+1;
     SwOLENode *pOLENd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetOLENode();
 
     OSL_ENSURE( pOLENd, "OLE-Node erwartet" );
@@ -1013,8 +1013,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     if( rHTMLWrt.bLFPossible )
         rHTMLWrt.OutNewLine( true );
 
-    if( !rFrmFmt.GetName().isEmpty() )
-        rHTMLWrt.OutImplicitMark( rFrmFmt.GetName(),
+    if( !rFrameFormat.GetName().isEmpty() )
+        rHTMLWrt.OutImplicitMark( rFrameFormat.GetName(),
                                   "ole" );
     uno::Any aAny;
     SvGlobalName aGlobName( xObj->getClassID() );
@@ -1054,8 +1054,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
             sOut.append('\"');
         }
 
-        if ((FLY_AT_PARA == rFrmFmt.GetAnchor().GetAnchorId()) &&
-            SURROUND_THROUGHT == rFrmFmt.GetSurround().GetSurround() )
+        if ((FLY_AT_PARA == rFrameFormat.GetAnchor().GetAnchorId()) &&
+            SURROUND_THROUGHT == rFrameFormat.GetSurround().GetSurround() )
         {
             // Das Plugin ist HIDDEN
             sOut.append(' ').append(OOO_STRING_SW_HTML_O_Hidden);
@@ -1143,9 +1143,9 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     // ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
         nFrmOpts |= HTML_FRMOPTS_OLE_CSS1;
-    OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, pOLENd->GetTitle(), nFrmOpts );
+    OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, pOLENd->GetTitle(), nFrmOpts );
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
-        rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts );
+        rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmOpts );
 
     if( aGlobName == SvGlobalName( SO3_APPLET_CLASSID ) )
     {
@@ -1248,13 +1248,13 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     return rWrt;
 }
 
-Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+Writer& OutHTML_FrameFormatOLENodeGrf( Writer& rWrt, const SwFrameFormat& rFrameFormat,
                                   bool bInCntnr )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
-    sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
+    const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+    sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex()+1;
     SwOLENode *pOLENd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetOLENode();
 
     OSL_ENSURE( pOLENd, "OLE-Node erwartet" );
@@ -1265,10 +1265,10 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     {
         // If we skip images, embedded objects would be completely lost.
         // Instead, try to use the HTML export of the embedded object.
-        uno::Reference<text::XTextContent> xTextContent = SwXTextEmbeddedObject::CreateXTextEmbeddedObject(*rHTMLWrt.pDoc, const_cast<SwFrmFmt*>(&rFrmFmt));
+        uno::Reference<text::XTextContent> xTextContent = SwXTextEmbeddedObject::CreateXTextEmbeddedObject(*rHTMLWrt.pDoc, const_cast<SwFrameFormat*>(&rFrameFormat));
         uno::Reference<document::XEmbeddedObjectSupplier2> xEmbeddedObjectSupplier(xTextContent, uno::UNO_QUERY);
         uno::Reference<frame::XStorable> xStorable(xEmbeddedObjectSupplier->getEmbeddedObject(), uno::UNO_QUERY);
-        SAL_WARN_IF(!xStorable.is(), "sw.html", "OutHTML_FrmFmtOLENodeGrf: no embedded object");
+        SAL_WARN_IF(!xStorable.is(), "sw.html", "OutHTML_FrameFormatOLENodeGrf: no embedded object");
 
         // Figure out what is the filter name of the embedded object.
         uno::Reference<lang::XServiceInfo> xServiceInfo(xStorable, uno::UNO_QUERY);
@@ -1310,7 +1310,7 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     Graphic aGraphic( *pOLENd->GetGraphic() );
     sal_uLong nFlags = bInCntnr ? HTML_FRMOPTS_GENIMG_CNTNR
         : HTML_FRMOPTS_GENIMG;
-    OutHTML_Image( rWrt, rFrmFmt, aGraphic,
+    OutHTML_Image( rWrt, rFrameFormat, aGraphic,
             pOLENd->GetTitle(), pOLENd->GetTwipSize(),
             nFlags, "ole" );
 
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 3c495d0f4c73..9b5325d8af4e 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -112,7 +112,7 @@ void SwHTMLParser::NewDivision( int nToken )
     bool bAppended = false;
     if( pPam->GetPoint()->nContent.GetIndex() )
     {
-        AppendTxtNode( bHeader||bFooter||!aId.isEmpty()|| !aHRef.isEmpty() ? AM_NORMAL
+        AppendTextNode( bHeader||bFooter||!aId.isEmpty()|| !aHRef.isEmpty() ? AM_NORMAL
                                                                 : AM_NOSPACE );
         bAppended = true;
     }
@@ -145,58 +145,58 @@ void SwHTMLParser::NewDivision( int nToken )
     if( !bPositioned && (bHeader || bFooter) && IsNewDoc() )
     {
         SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
-        SwFrmFmt& rPageFmt = pPageDesc->GetMaster();
+        SwFrameFormat& rPageFormat = pPageDesc->GetMaster();
 
-        SwFrmFmt *pHdFtFmt;
+        SwFrameFormat *pHdFtFormat;
         bool bNew = false;
         sal_uInt16 nFlags = CONTEXT_FLAGS_HDRFTR;
         if( bHeader )
         {
-            pHdFtFmt = const_cast<SwFrmFmt*>(rPageFmt.GetHeader().GetHeaderFmt());
-            if( !pHdFtFmt )
+            pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetHeader().GetHeaderFormat());
+            if( !pHdFtFormat )
             {
                 // noch keine Header, dann erzeuge einen.
-                rPageFmt.SetFmtAttr( SwFmtHeader( true ));
-                pHdFtFmt = const_cast<SwFrmFmt*>(rPageFmt.GetHeader().GetHeaderFmt());
+                rPageFormat.SetFormatAttr( SwFormatHeader( true ));
+                pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetHeader().GetHeaderFormat());
                 bNew = true;
             }
             nFlags |= HTML_CNTXT_HEADER_DIST;
         }
         else
         {
-            pHdFtFmt = const_cast<SwFrmFmt*>(rPageFmt.GetFooter().GetFooterFmt());
-            if( !pHdFtFmt )
+            pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetFooter().GetFooterFormat());
+            if( !pHdFtFormat )
             {
                 // noch keine Footer, dann erzeuge einen.
-                rPageFmt.SetFmtAttr( SwFmtFooter( true ));
-                pHdFtFmt = const_cast<SwFrmFmt*>(rPageFmt.GetFooter().GetFooterFmt());
+                rPageFormat.SetFormatAttr( SwFormatFooter( true ));
+                pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetFooter().GetFooterFormat());
                 bNew = true;
             }
             nFlags |= HTML_CNTXT_FOOTER_DIST;
         }
 
-        const SwFmtCntnt& rFlyCntnt = pHdFtFmt->GetCntnt();
-        const SwNodeIndex& rCntntStIdx = *rFlyCntnt.GetCntntIdx();
-        SwCntntNode *pCNd;
+        const SwFormatContent& rFlyContent = pHdFtFormat->GetContent();
+        const SwNodeIndex& rContentStIdx = *rFlyContent.GetContentIdx();
+        SwContentNode *pCNd;
 
         if( bNew )
         {
-            pCNd = pDoc->GetNodes()[rCntntStIdx.GetIndex()+1]
-                       ->GetCntntNode();
+            pCNd = pDoc->GetNodes()[rContentStIdx.GetIndex()+1]
+                       ->GetContentNode();
         }
         else
         {
             // Einen neuen Node zu Beginn der Section anlegen
-            SwNodeIndex aSttIdx( rCntntStIdx, 1 );
-            pCNd = pDoc->GetNodes().MakeTxtNode( aSttIdx,
-                            pCSS1Parser->GetTxtCollFromPool(RES_POOLCOLL_TEXT));
+            SwNodeIndex aSttIdx( rContentStIdx, 1 );
+            pCNd = pDoc->GetNodes().MakeTextNode( aSttIdx,
+                            pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_TEXT));
 
             // Den bisherigen Inhalt der Section loeschen
             SwPaM aDelPam( aSttIdx );
             aDelPam.SetMark();
 
             const SwStartNode *pStNd =
-                static_cast<const SwStartNode *>( &rCntntStIdx.GetNode() );
+                static_cast<const SwStartNode *>( &rContentStIdx.GetNode() );
             aDelPam.GetPoint()->nNode = pStNd->EndOfSectionIndex() - 1;
 
             pDoc->getIDocumentContentOperations().DelFullPara( aDelPam );
@@ -204,7 +204,7 @@ void SwHTMLParser::NewDivision( int nToken )
             // Die Seitenvorlage aktualisieren
             for( size_t i=0; i < pDoc->GetPageDescCnt(); i++ )
             {
-                if( RES_POOLPAGE_HTML == pDoc->GetPageDesc(i).GetPoolFmtId() )
+                if( RES_POOLPAGE_HTML == pDoc->GetPageDesc(i).GetPoolFormatId() )
                 {
                     pDoc->ChgPageDesc( i, *pPageDesc );
                     break;
@@ -212,7 +212,7 @@ void SwHTMLParser::NewDivision( int nToken )
             }
         }
 
-        SwPosition aNewPos( SwNodeIndex( rCntntStIdx, 1 ), SwIndex( pCNd, 0 ) );
+        SwPosition aNewPos( SwNodeIndex( rContentStIdx, 1 ), SwIndex( pCNd, 0 ) );
         SaveDocContext( pCntxt, nFlags, &aNewPos );
     }
     else if( !bPositioned && aId.getLength() > 9 &&
@@ -229,8 +229,8 @@ void SwHTMLParser::NewDivision( int nToken )
             SwNodeIndex *pStartNdIdx = GetFootEndNoteSection( aId );
             if( pStartNdIdx )
             {
-                SwCntntNode *pCNd =
-                    pDoc->GetNodes()[pStartNdIdx->GetIndex()+1]->GetCntntNode();
+                SwContentNode *pCNd =
+                    pDoc->GetNodes()[pStartNdIdx->GetIndex()+1]->GetContentNode();
                 SwNodeIndex aTmpSwNodeIndex = SwNodeIndex(*pCNd);
                 SwPosition aNewPos( aTmpSwNodeIndex, SwIndex( pCNd, 0 ) );
                 SaveDocContext( pCntxt, CONTEXT_FLAGS_FTN, &aNewPos );
@@ -255,7 +255,7 @@ void SwHTMLParser::NewDivision( int nToken )
             SwNodeIndex aPrvNdIdx( pPam->GetPoint()->nNode, -1 );
             if (aPrvNdIdx.GetNode().IsSectionNode())
             {
-                AppendTxtNode();
+                AppendTextNode();
                 bAppended = true;
             }
         }
@@ -316,7 +316,7 @@ void SwHTMLParser::NewDivision( int nToken )
         SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
         if( !IsNewDoc() )
-            Reader::ResetFrmFmtAttrs(aFrmItemSet );
+            Reader::ResetFrameFormatAttrs(aFrmItemSet );
 
         const SfxPoolItem *pItem;
         if( SfxItemState::SET == aItemSet.GetItemState( RES_BACKGROUND, false,
@@ -341,15 +341,15 @@ void SwHTMLParser::NewDivision( int nToken )
             eJumpTo = JUMPTO_NONE;
         }
 
-        SwTxtNode* pOldTxtNd =
-            (bAppended) ? 0 : pPam->GetPoint()->nNode.GetNode().GetTxtNode();
+        SwTextNode* pOldTextNd =
+            (bAppended) ? 0 : pPam->GetPoint()->nNode.GetNode().GetTextNode();
 
         pPam->Move( fnMoveBackward );
 
-        // PageDesc- und SwFmtBreak Attribute vom aktuellen Node in den
+        // PageDesc- und SwFormatBreak Attribute vom aktuellen Node in den
         // (ersten) Node des Bereich verschieben.
-        if( pOldTxtNd )
-            MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(),
+        if( pOldTextNd )
+            MovePageDescAttrs( pOldTextNd, pPam->GetPoint()->nNode.GetIndex(),
                                true  );
 
         if( pPostIts )
@@ -416,20 +416,20 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
                                             const SwPosition *pOldPos )
 {
     SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
-    SwFrmFmt& rPageFmt = pPageDesc->GetMaster();
+    SwFrameFormat& rPageFormat = pPageDesc->GetMaster();
 
-    SwFrmFmt *pHdFtFmt =
-        bHeader ? const_cast<SwFrmFmt*>(rPageFmt.GetHeader().GetHeaderFmt())
-                : const_cast<SwFrmFmt*>(rPageFmt.GetFooter().GetFooterFmt());
-    OSL_ENSURE( pHdFtFmt, "Doch keine Kopf- oder Fusszeile" );
+    SwFrameFormat *pHdFtFormat =
+        bHeader ? const_cast<SwFrameFormat*>(rPageFormat.GetHeader().GetHeaderFormat())
+                : const_cast<SwFrameFormat*>(rPageFormat.GetFooter().GetFooterFormat());
+    OSL_ENSURE( pHdFtFormat, "Doch keine Kopf- oder Fusszeile" );
 
-    const SwFmtCntnt& rFlyCntnt = pHdFtFmt->GetCntnt();
-    const SwNodeIndex& rCntntStIdx = *rFlyCntnt.GetCntntIdx();
+    const SwFormatContent& rFlyContent = pHdFtFormat->GetContent();
+    const SwNodeIndex& rContentStIdx = *rFlyContent.GetContentIdx();
 
     sal_uLong nPrvNxtIdx;
     if( bHeader )
     {
-        nPrvNxtIdx = rCntntStIdx.GetNode().EndOfSectionIndex()-1;
+        nPrvNxtIdx = rContentStIdx.GetNode().EndOfSectionIndex()-1;
     }
     else
     {
@@ -437,12 +437,12 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
     }
 
     sal_uInt16 nSpace = 0;
-    SwTxtNode *pTxtNode = pDoc->GetNodes()[nPrvNxtIdx]->GetTxtNode();
-    if( pTxtNode )
+    SwTextNode *pTextNode = pDoc->GetNodes()[nPrvNxtIdx]->GetTextNode();
+    if( pTextNode )
     {
         const SvxULSpaceItem& rULSpace =
-            static_cast<const SvxULSpaceItem&>(pTxtNode
-                ->SwCntntNode::GetAttr( RES_UL_SPACE ));
+            static_cast<const SvxULSpaceItem&>(pTextNode
+                ->SwContentNode::GetAttr( RES_UL_SPACE ));
 
         // Der untere Absatz-Abstand wird zum Abstand zur
         // Kopf- oder Fusszeile
@@ -451,11 +451,11 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
         // und anschliessend auf einen vernuenftigen Wert
         // gesetzt
         const SvxULSpaceItem& rCollULSpace =
-            pTxtNode->GetAnyFmtColl().GetULSpace();
+            pTextNode->GetAnyFormatColl().GetULSpace();
         if( rCollULSpace.GetUpper() == rULSpace.GetUpper() )
-            pTxtNode->ResetAttr( RES_UL_SPACE );
+            pTextNode->ResetAttr( RES_UL_SPACE );
         else
-            pTxtNode->SetAttr(
+            pTextNode->SetAttr(
                 SvxULSpaceItem( rULSpace.GetUpper(),
                                 rCollULSpace.GetLower(), RES_UL_SPACE ) );
     }
@@ -466,16 +466,16 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
     }
     else
     {
-        nPrvNxtIdx = rCntntStIdx.GetIndex() + 1;
+        nPrvNxtIdx = rContentStIdx.GetIndex() + 1;
     }
 
-    pTxtNode = pDoc->GetNodes()[nPrvNxtIdx]
-                    ->GetTxtNode();
-    if( pTxtNode )
+    pTextNode = pDoc->GetNodes()[nPrvNxtIdx]
+                    ->GetTextNode();
+    if( pTextNode )
     {
         const SvxULSpaceItem& rULSpace =
-            static_cast<const SvxULSpaceItem&>(pTxtNode
-                ->SwCntntNode::GetAttr( RES_UL_SPACE ));
+            static_cast<const SvxULSpaceItem&>(pTextNode
+                ->SwContentNode::GetAttr( RES_UL_SPACE ));
 
         // Der obere Absatz-Abstand wird zum Abstand zur
         // Kopf- oder Fusszeile, wenn er groesser ist als
@@ -485,11 +485,11 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
 
         // und anschliessend auf einen vernuenftigen Wert gesetzt
         const SvxULSpaceItem& rCollULSpace =
-            pTxtNode->GetAnyFmtColl().GetULSpace();
+            pTextNode->GetAnyFormatColl().GetULSpace();
         if( rCollULSpace.GetLower() == rULSpace.GetLower() )
-            pTxtNode->ResetAttr( RES_UL_SPACE );
+            pTextNode->ResetAttr( RES_UL_SPACE );
         else
-            pTxtNode->SetAttr(
+            pTextNode->SetAttr(
                 SvxULSpaceItem( rCollULSpace.GetUpper(),
                                 rULSpace.GetLower(), RES_UL_SPACE ) );
     }
@@ -500,7 +500,7 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
     else
         aULSpace.SetUpper( nSpace );
 
-    pHdFtFmt->SetFmtAttr( aULSpace );
+    pHdFtFormat->SetFormatAttr( aULSpace );
 }
 
 bool SwHTMLParser::EndSection( bool bLFStripped )
@@ -621,7 +621,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
         SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
         if( !IsNewDoc() )
-            Reader::ResetFrmFmtAttrs(aFrmItemSet );
+            Reader::ResetFrameFormatAttrs(aFrmItemSet );
 
         SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, aItemSet, aPropInfo,
                                 aFrmItemSet );
@@ -635,7 +635,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
         // Set some other frame attributes. If the background is set, its
         // it will be cleared here. That for, it won't be set at the section,
         // too.
-        SetFrmFmtAttrs( aItemSet, aPropInfo,
+        SetFrameFormatAttrs( aItemSet, aPropInfo,
                         HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_PADDING|HTML_FF_DIRECTION,
                         aFrmItemSet );
 
@@ -659,7 +659,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
     {
         if( pPam->GetPoint()->nContent.GetIndex() )
         {
-            AppendTxtNode( AM_SPACE );
+            AppendTextNode( AM_SPACE );
             bAppended = true;
         }
         else
@@ -679,7 +679,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
             SwNodeIndex aPrvNdIdx( pPam->GetPoint()->nNode, -1 );
             if (aPrvNdIdx.GetNode().IsSectionNode())
             {
-                AppendTxtNode();
+                AppendTextNode();
                 bAppended = true;
             }
         }
@@ -693,7 +693,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
         SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
         if( !IsNewDoc() )
-            Reader::ResetFrmFmtAttrs(aFrmItemSet );
+            Reader::ResetFrameFormatAttrs(aFrmItemSet );
 
         if( nGutter && Application::GetDefaultDevice() )
         {
@@ -702,11 +702,11 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
                                              MapMode(MAP_TWIP) ).Width();
         }
 
-        SwFmtCol aFmtCol;
+        SwFormatCol aFormatCol;
         nPrcWidth = 100;
 
-        aFmtCol.Init( nCols, nGutter, USHRT_MAX );
-        aFrmItemSet.Put( aFmtCol );
+        aFormatCol.Init( nCols, nGutter, USHRT_MAX );
+        aFrmItemSet.Put( aFormatCol );
 
         const SfxPoolItem *pItem;
         if( SfxItemState::SET == aItemSet.GetItemState( RES_BACKGROUND, false,
@@ -730,15 +730,15 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
             eJumpTo = JUMPTO_NONE;
         }
 
-        SwTxtNode* pOldTxtNd =
-            (bAppended) ? 0 : pPam->GetPoint()->nNode.GetNode().GetTxtNode();
+        SwTextNode* pOldTextNd =
+            (bAppended) ? 0 : pPam->GetPoint()->nNode.GetNode().GetTextNode();
 
         pPam->Move( fnMoveBackward );
 
-        // Move PageDesc and SwFmtBreak attributes of the current node
+        // Move PageDesc and SwFormatBreak attributes of the current node
         // to the section's first node.
-        if( pOldTxtNd )
-            MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(),
+        if( pOldTextNd )
+            MovePageDescAttrs( pOldTextNd, pPam->GetPoint()->nNode.GetIndex(),
                                true  );
 
         if( pPostIts )
@@ -769,21 +769,21 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
                                    sal_uInt16 nFlags )
 {
     RndStdIds eAnchorId =
-        static_cast<const SwFmtAnchor&>(rItemSet.Get( RES_ANCHOR )).GetAnchorId();
+        static_cast<const SwFormatAnchor&>(rItemSet.Get( RES_ANCHOR )).GetAnchorId();
 
     // Den Rahmen anlegen
-    SwFlyFrmFmt* pFlyFmt = pDoc->MakeFlySection( eAnchorId, pPam->GetPoint(),
+    SwFlyFrameFormat* pFlyFormat = pDoc->MakeFlySection( eAnchorId, pPam->GetPoint(),
                                                     &rItemSet );
     // Ggf. den Namen setzen
     if( !rName.isEmpty() )
-        pFlyFmt->SetName( rName );
+        pFlyFormat->SetName( rName );
 
-    RegisterFlyFrm( pFlyFmt );
+    RegisterFlyFrm( pFlyFormat );
 
-    const SwFmtCntnt& rFlyCntnt = pFlyFmt->GetCntnt();
-    const SwNodeIndex& rFlyCntIdx = *rFlyCntnt.GetCntntIdx();
-    SwCntntNode *pCNd = pDoc->GetNodes()[rFlyCntIdx.GetIndex()+1]
-                            ->GetCntntNode();
+    const SwFormatContent& rFlyContent = pFlyFormat->GetContent();
+    const SwNodeIndex& rFlyCntIdx = *rFlyContent.GetContentIdx();
+    SwContentNode *pCNd = pDoc->GetNodes()[rFlyCntIdx.GetIndex()+1]
+                            ->GetContentNode();
 
     SwPosition aNewPos( SwNodeIndex( rFlyCntIdx, 1 ), SwIndex( pCNd, 0 ) );
     SaveDocContext( pCntxt, nFlags, &aNewPos );
@@ -791,36 +791,36 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
 
 void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
                                       sal_uLong nDestIdx,
-                                      bool bFmtBreak )
+                                      bool bFormatBreak )
 {
-    SwCntntNode* pDestCntntNd =
-        pDoc->GetNodes()[nDestIdx]->GetCntntNode();
+    SwContentNode* pDestContentNd =
+        pDoc->GetNodes()[nDestIdx]->GetContentNode();
 
-    OSL_ENSURE( pDestCntntNd, "Wieso ist das Ziel kein Content-Node?" );
+    OSL_ENSURE( pDestContentNd, "Wieso ist das Ziel kein Content-Node?" );
 
-    if( pSrcNd->IsCntntNode() )
+    if( pSrcNd->IsContentNode() )
     {
-        SwCntntNode* pSrcCntntNd = pSrcNd->GetCntntNode();
+        SwContentNode* pSrcContentNd = pSrcNd->GetContentNode();
 
         const SfxPoolItem* pItem;
-        if( SfxItemState::SET == pSrcCntntNd->GetSwAttrSet()
+        if( SfxItemState::SET == pSrcContentNd->GetSwAttrSet()
                 .GetItemState( RES_PAGEDESC, false, &pItem ) &&
-            static_cast<const SwFmtPageDesc *>(pItem)->GetPageDesc() )
+            static_cast<const SwFormatPageDesc *>(pItem)->GetPageDesc() )
         {
-            pDestCntntNd->SetAttr( *pItem );
-            pSrcCntntNd->ResetAttr( RES_PAGEDESC );
+            pDestContentNd->SetAttr( *pItem );
+            pSrcContentNd->ResetAttr( RES_PAGEDESC );
         }
-        if( SfxItemState::SET == pSrcCntntNd->GetSwAttrSet()
+        if( SfxItemState::SET == pSrcContentNd->GetSwAttrSet()
                 .GetItemState( RES_BREAK, false, &pItem ) )
         {
-            switch( static_cast<const SvxFmtBreakItem *>(pItem)->GetBreak() )
+            switch( static_cast<const SvxFormatBreakItem *>(pItem)->GetBreak() )
             {
             case SVX_BREAK_PAGE_BEFORE:
             case SVX_BREAK_PAGE_AFTER:
             case SVX_BREAK_PAGE_BOTH:
-                if( bFmtBreak )
-                    pDestCntntNd->SetAttr( *pItem );
-                pSrcCntntNd->ResetAttr( RES_BREAK );
+                if( bFormatBreak )
+                    pDestContentNd->SetAttr( *pItem );
+                pSrcContentNd->ResetAttr( RES_BREAK );
             default:
                 ;
             }
@@ -828,14 +828,14 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
     }
     else if( pSrcNd->IsTableNode() )
     {
-        SwFrmFmt *pFrmFmt = pSrcNd->GetTableNode()->GetTable().GetFrmFmt();
+        SwFrameFormat *pFrameFormat = pSrcNd->GetTableNode()->GetTable().GetFrameFormat();
 
         const SfxPoolItem* pItem;
-        if( SfxItemState::SET == pFrmFmt->GetAttrSet().
+        if( SfxItemState::SET == pFrameFormat->GetAttrSet().
                 GetItemState( RES_PAGEDESC, false, &pItem ) )
         {
-            pDestCntntNd->SetAttr( *pItem );
-            pFrmFmt->ResetFmtAttr( RES_PAGEDESC );
+            pDestContentNd->SetAttr( *pItem );
+            pFrameFormat->ResetFormatAttr( RES_PAGEDESC );
         }
     }
 }
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index f99a616bb9fa..0b9e7e1aaef3 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -62,7 +62,7 @@
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
 
-static HTMLOptionEnum aHTMLTblVAlignTable[] =
+static HTMLOptionEnum aHTMLTableVAlignTable[] =
 {
     { OOO_STRING_SVTOOLS_HTML_VA_top,         text::VertOrientation::NONE       },
     { OOO_STRING_SVTOOLS_HTML_VA_middle,      text::VertOrientation::CENTER     },
@@ -104,8 +104,8 @@ class _HTMLTableContext
 {
     SwHTMLNumRuleInfo aNumRuleInfo; // Numbering valid before the table
 
-    SwTableNode *pTblNd;            // table node
-    SwFrmFmt *pFrmFmt;              // der Fly frame::Frame, containing the table
+    SwTableNode *pTableNd;            // table node
+    SwFrameFormat *pFrameFormat;              // der Fly frame::Frame, containing the table
     SwPosition *pPos;               // position behind the table
 
     sal_uInt16 nContextStAttrMin;
@@ -121,8 +121,8 @@ public:
 
     _HTMLTableContext( SwPosition *pPs, sal_uInt16 nCntxtStMin,
                        sal_uInt16 nCntxtStAttrMin ) :
-        pTblNd( 0 ),
-        pFrmFmt( 0 ),
+        pTableNd( 0 ),
+        pFrameFormat( 0 ),
         pPos( pPs ),
         nContextStAttrMin( nCntxtStAttrMin ),
         nContextStMin( nCntxtStMin ),
@@ -143,11 +143,11 @@ public:
 
     SwPosition *GetPos() const { return pPos; }
 
-    void SetTableNode( SwTableNode *pNd ) { pTblNd = pNd; }
-    SwTableNode *GetTableNode() const { return pTblNd; }
+    void SetTableNode( SwTableNode *pNd ) { pTableNd = pNd; }
+    SwTableNode *GetTableNode() const { return pTableNd; }
 
-    void SetFrmFmt( SwFrmFmt *pFmt ) { pFrmFmt = pFmt; }
-    SwFrmFmt *GetFrmFmt() const { return pFrmFmt; }
+    void SetFrameFormat( SwFrameFormat *pFormat ) { pFrameFormat = pFormat; }
+    SwFrameFormat *GetFrameFormat() const { return pFrameFormat; }
 
     sal_uInt16 GetContextStMin() const { return nContextStMin; }
     sal_uInt16 GetContextStAttrMin() const { return nContextStAttrMin; }
@@ -206,7 +206,7 @@ class HTMLTableCell
     // !!!ATTENTION!!!!!
     ::boost::shared_ptr<SvxBoxItem> m_pBoxItem;
 
-    sal_uInt32 nNumFmt;
+    sal_uInt32 nNumFormat;
     sal_uInt16 nRowSpan;                // cell ROWSPAN
     sal_uInt16 nColSpan;                // cell COLSPAN
     sal_uInt16 nWidth;                  // cell WIDTH
@@ -214,7 +214,7 @@ class HTMLTableCell
     sal_Int16 eVertOri;         // vertical alignment of the cell
     bool bProtected : 1;            // cell must not filled
     bool bRelWidth : 1;             // nWidth is given in %
-    bool bHasNumFmt : 1;
+    bool bHasNumFormat : 1;
     bool bHasValue : 1;
     bool bNoWrap : 1;
     bool mbCovered : 1;
@@ -229,7 +229,7 @@ public:
     void Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCSpan,
               sal_Int16 eVertOri, SvxBrushItem *pBGBrush,
               ::boost::shared_ptr<SvxBoxItem> const& rBoxItem,
-              bool bHasNumFmt, sal_uInt32 nNumFmt,
+              bool bHasNumFormat, sal_uInt32 nNumFormat,
               bool bHasValue, double nValue, bool bNoWrap, bool bCovered );
 
     // Protect an empty 1x1 cell
@@ -251,7 +251,7 @@ public:
     const SvxBrushItem *GetBGBrush() const { return pBGBrush; }
     ::boost::shared_ptr<SvxBoxItem> GetBoxItem() const { return m_pBoxItem; }
 
-    inline bool GetNumFmt( sal_uInt32& rNumFmt ) const;
+    inline bool GetNumFormat( sal_uInt32& rNumFormat ) const;
     inline bool GetValue( double& rValue ) const;
 
     sal_Int16 GetVertOri() const { return eVertOri; }
@@ -326,9 +326,9 @@ class HTMLTableColumn
     SvxAdjust eAdjust;
     sal_Int16 eVertOri;
 
-    SwFrmFmt *aFrmFmts[6];
+    SwFrameFormat *aFrameFormats[6];
 
-    static inline sal_uInt16 GetFrmFmtIdx( bool bBorderLine,
+    static inline sal_uInt16 GetFrameFormatIdx( bool bBorderLine,
                                 sal_Int16 eVertOri );
 
 public:
@@ -348,9 +348,9 @@ public:
     inline void SetEndOfGroup() { bIsEndOfGroup = true; }
     inline bool IsEndOfGroup() const { return bIsEndOfGroup; }
 
-    inline void SetFrmFmt( SwFrmFmt *pFmt, bool bBorderLine,
+    inline void SetFrameFormat( SwFrameFormat *pFormat, bool bBorderLine,
                            sal_Int16 eVertOri );
-    inline SwFrmFmt *GetFrmFmt( bool bBorderLine,
+    inline SwFrameFormat *GetFrameFormat( bool bBorderLine,
                                 sal_Int16 eVertOri ) const;
 
     SwHTMLTableLayoutColumn *CreateLayoutInfo();
@@ -396,9 +396,9 @@ class HTMLTable
     const SwStartNode *pPrevStNd;   // the Table-Node or the Start-Node of the section before
     const SwTable *pSwTable;        // SW-Table (only on Top-Level)
     SwTableBox *pBox1;              // TableBox, generated when the Top-Level-Table was build
-    SwTableBoxFmt *pBoxFmt;         // frame::Frame-Format from SwTableBox
-    SwTableLineFmt *pLineFmt;       // frame::Frame-Format from SwTableLine
-    SwTableLineFmt *pLineFrmFmtNoHeight;
+    SwTableBoxFormat *pBoxFormat;         // frame::Frame-Format from SwTableBox
+    SwTableLineFormat *pLineFormat;       // frame::Frame-Format from SwTableLine
+    SwTableLineFormat *pLineFrameFormatNoHeight;
     SvxBrushItem *pBGBrush;         // background of the table
     SvxBrushItem *pInhBGBrush;      // "inherited" background of the table
     const SwStartNode *pCaptionStartNode;   // Start-Node of the table-caption
@@ -465,10 +465,10 @@ class HTMLTable
                                bool bSwBorders=true ) const;
 
     // Conforming of the frame::Frame-Format of the box
-    void FixFrameFmt( SwTableBox *pBox, sal_uInt16 nRow, sal_uInt16 nCol,
+    void FixFrameFormat( SwTableBox *pBox, sal_uInt16 nRow, sal_uInt16 nCol,
                       sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
                       bool bFirstPara=true, bool bLastPara=true ) const;
-    void FixFillerFrameFmt( SwTableBox *pBox, bool bRight ) const;
+    void FixFillerFrameFormat( SwTableBox *pBox, bool bRight ) const;
 
     // Create a table with the content (lines/boxes)
     void _MakeTable( SwTableBox *pUpper=0 );
@@ -549,7 +549,7 @@ public:
                      sal_uInt16 nWidth, bool bRelWidth, sal_uInt16 nHeight,
                      sal_Int16 eVertOri, SvxBrushItem *pBGBrush,
                      boost::shared_ptr<SvxBoxItem> const& rBoxItem,
-                     bool bHasNumFmt, sal_uInt32 nNumFmt,
+                     bool bHasNumFormat, sal_uInt32 nNumFormat,
                      bool bHasValue, double nValue, bool bNoWrap );
 
     // announce the start/end of a new row
@@ -677,7 +677,7 @@ SwHTMLTableLayoutCnts *HTMLTableCnts::CreateLayoutInfo()
 HTMLTableCell::HTMLTableCell():
     pContents(0),
     pBGBrush(0),
-    nNumFmt(0),
+    nNumFormat(0),
     nRowSpan(1),
     nColSpan(1),
     nWidth( 0 ),
@@ -685,7 +685,7 @@ HTMLTableCell::HTMLTableCell():
     eVertOri( text::VertOrientation::NONE ),
     bProtected(false),
     bRelWidth( false ),
-    bHasNumFmt(false),
+    bHasNumFormat(false),
     bHasValue(false),
     bNoWrap(false),
     mbCovered(false)
@@ -716,9 +716,9 @@ void HTMLTableCell::Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCS
     pBGBrush = pBrush;
     m_pBoxItem = rBoxItem;
 
-    bHasNumFmt = bHasNF;
+    bHasNumFormat = bHasNF;
     bHasValue = bHasV;
-    nNumFmt = nNF;
+    nNumFormat = nNF;
     nValue = nVal;
 
     bNoWrap = bNWrap;
@@ -748,10 +748,10 @@ void HTMLTableCell::SetProtected()
     bProtected = true;
 }
 
-inline bool HTMLTableCell::GetNumFmt( sal_uInt32& rNumFmt ) const
+inline bool HTMLTableCell::GetNumFormat( sal_uInt32& rNumFormat ) const
 {
-    rNumFmt = nNumFmt;
-    return bHasNumFmt;
+    rNumFormat = nNumFormat;
+    return bHasNumFormat;
 }
 
 inline bool HTMLTableCell::GetValue( double& rValue ) const
@@ -873,7 +873,7 @@ HTMLTableColumn::HTMLTableColumn():
     bLeftBorder(false)
 {
     for( sal_uInt16 i=0; i<6; i++ )
-        aFrmFmts[i] = 0;
+        aFrameFormats[i] = 0;
 }
 
 inline void HTMLTableColumn::SetWidth( sal_uInt16 nWdth, bool bRelWdth )
@@ -893,7 +893,7 @@ inline SwHTMLTableLayoutColumn *HTMLTableColumn::CreateLayoutInfo()
     return new SwHTMLTableLayoutColumn( nWidth, bRelWidth, bLeftBorder );
 }
 
-inline sal_uInt16 HTMLTableColumn::GetFrmFmtIdx( bool bBorderLine,
+inline sal_uInt16 HTMLTableColumn::GetFrameFormatIdx( bool bBorderLine,
                                              sal_Int16 eVertOrient )
 {
     OSL_ENSURE( text::VertOrientation::TOP != eVertOrient, "Top ist nicht erlaubt" );
@@ -908,16 +908,16 @@ inline sal_uInt16 HTMLTableColumn::GetFrmFmtIdx( bool bBorderLine,
     return n;
 }
 
-inline void HTMLTableColumn::SetFrmFmt( SwFrmFmt *pFmt, bool bBorderLine,
+inline void HTMLTableColumn::SetFrameFormat( SwFrameFormat *pFormat, bool bBorderLine,
                                         sal_Int16 eVertOrient )
 {
-    aFrmFmts[GetFrmFmtIdx(bBorderLine,eVertOrient)] = pFmt;
+    aFrameFormats[GetFrameFormatIdx(bBorderLine,eVertOrient)] = pFormat;
 }
 
-inline SwFrmFmt *HTMLTableColumn::GetFrmFmt( bool bBorderLine,
+inline SwFrameFormat *HTMLTableColumn::GetFrameFormat( bool bBorderLine,
                                              sal_Int16 eVertOrient ) const
 {
-    return aFrmFmts[GetFrmFmtIdx(bBorderLine,eVertOrient)];
+    return aFrameFormats[GetFrameFormatIdx(bBorderLine,eVertOrient)];
 }
 
 void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
@@ -931,8 +931,8 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
     nCurRow = 0; nCurCol = 0;
 
     pBox1 = 0;
-    pBoxFmt = 0; pLineFmt = 0;
-    pLineFrmFmtNoHeight = 0;
+    pBoxFormat = 0; pLineFormat = 0;
+    pLineFrameFormatNoHeight = 0;
     pInhBGBrush = 0;
 
     pPrevStNd = 0;
@@ -1245,8 +1245,8 @@ static bool IsBoxEmpty( const SwTableBox *pBox )
     if( pSttNd &&
         pSttNd->GetIndex() + 2 == pSttNd->EndOfSectionIndex() )
     {
-        const SwCntntNode *pCNd =
-            pSttNd->GetNodes()[pSttNd->GetIndex()+1]->GetCntntNode();
+        const SwContentNode *pCNd =
+            pSttNd->GetNodes()[pSttNd->GetIndex()+1]->GetContentNode();
         if( pCNd && !pCNd->Len() )
             return true;
     }
@@ -1325,21 +1325,21 @@ sal_uInt16 HTMLTable::GetBottomCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
     return nSpace;
 }
 
-void HTMLTable::FixFrameFmt( SwTableBox *pBox,
+void HTMLTable::FixFrameFormat( SwTableBox *pBox,
                              sal_uInt16 nRow, sal_uInt16 nCol,
                              sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
                              bool bFirstPara, bool bLastPara ) const
 {
-    SwFrmFmt *pFrmFmt = 0;      // frame::Frame-Format
+    SwFrameFormat *pFrameFormat = 0;      // frame::Frame-Format
     sal_Int16 eVOri = text::VertOrientation::NONE;
     const SvxBrushItem *pBGBrushItem = 0;   // Hintergrund
     boost::shared_ptr<SvxBoxItem> pBoxItem;
     bool bTopLine = false, bBottomLine = false, bLastBottomLine = false;
     bool bReUsable = false;     // Format nochmals verwendbar?
     sal_uInt16 nEmptyRows = 0;
-    bool bHasNumFmt = false;
+    bool bHasNumFormat = false;
     bool bHasValue = false;
-    sal_uInt32 nNumFmt = 0;
+    sal_uInt32 nNumFormat = 0;
     double nValue = 0.0;
 
     HTMLTableColumn *pColumn = &(*pColumns)[nCol];
@@ -1382,21 +1382,21 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
         }
 
         eVOri = pCell->GetVertOri();
-        bHasNumFmt = pCell->GetNumFmt( nNumFmt );
-        if( bHasNumFmt )
+        bHasNumFormat = pCell->GetNumFormat( nNumFormat );
+        if( bHasNumFormat )
             bHasValue = pCell->GetValue( nValue );
 
         if( nColSpan==1 && !bTopLine && !bLastBottomLine && !nEmptyRows &&
-            !pBGBrushItem && !bHasNumFmt && !pBoxItem)
+            !pBGBrushItem && !bHasNumFormat && !pBoxItem)
         {
-            pFrmFmt = pColumn->GetFrmFmt( bBottomLine, eVOri );
-            bReUsable = !pFrmFmt;
+            pFrameFormat = pColumn->GetFrameFormat( bBottomLine, eVOri );
+            bReUsable = !pFrameFormat;
         }
     }
 
-    if( !pFrmFmt )
+    if( !pFrameFormat )
     {
-        pFrmFmt = pBox->ClaimFrmFmt();
+        pFrameFormat = pBox->ClaimFrameFormat();
 
         // die Breite der Box berechnen
         SwTwips nFrmWidth = (SwTwips)pLayoutInfo->GetColumn(nCol)
@@ -1464,7 +1464,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
 
             if (pBoxItem)
             {
-                pFrmFmt->SetFmtAttr( *pBoxItem );
+                pFrameFormat->SetFormatAttr( *pBoxItem );
             }
             else if (bSet)
             {
@@ -1477,32 +1477,32 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
                 // dann gibt es eine Umrandung, und wir muessen die Distanz
                 // setzen
                 aBoxItem.SetDistance( nBDist ? nBDist : MIN_BORDER_DIST );
-                pFrmFmt->SetFmtAttr( aBoxItem );
+                pFrameFormat->SetFormatAttr( aBoxItem );
             }
             else
-                pFrmFmt->ResetFmtAttr( RES_BOX );
+                pFrameFormat->ResetFormatAttr( RES_BOX );
 
             if( pBGBrushItem )
             {
-                pFrmFmt->SetFmtAttr( *pBGBrushItem );
+                pFrameFormat->SetFormatAttr( *pBGBrushItem );
             }
             else
-                pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
+                pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
 
             // Format nur setzten, wenn es auch einen Value gibt oder die Box leer ist.
-            if( bHasNumFmt && (bHasValue || IsBoxEmpty(pBox)) )
+            if( bHasNumFormat && (bHasValue || IsBoxEmpty(pBox)) )
             {
-                bool bLock = pFrmFmt->GetDoc()->GetNumberFormatter()
-                                     ->IsTextFormat( nNumFmt );
-                SfxItemSet aItemSet( *pFrmFmt->GetAttrSet().GetPool(),
+                bool bLock = pFrameFormat->GetDoc()->GetNumberFormatter()
+                                     ->IsTextFormat( nNumFormat );
+                SfxItemSet aItemSet( *pFrameFormat->GetAttrSet().GetPool(),
                                      RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
                 SvxAdjust eAdjust = SVX_ADJUST_END;
-                SwCntntNode *pCNd = 0;
+                SwContentNode *pCNd = 0;
                 if( !bLock )
                 {
                     const SwStartNode *pSttNd = pBox->GetSttNd();
                     pCNd = pSttNd->GetNodes()[pSttNd->GetIndex()+1]
-                                 ->GetCntntNode();
+                                 ->GetContentNode();
                     const SfxPoolItem *pItem;
                     if( pCNd && pCNd->HasSwAttrSet() &&
                         SfxItemState::SET==pCNd->GetpSwAttrSet()->GetItemState(
@@ -1512,15 +1512,15 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
                             ->GetAdjust();
                     }
                 }
-                aItemSet.Put( SwTblBoxNumFormat(nNumFmt) );
+                aItemSet.Put( SwTableBoxNumFormat(nNumFormat) );
                 if( bHasValue )
-                    aItemSet.Put( SwTblBoxValue(nValue) );
+                    aItemSet.Put( SwTableBoxValue(nValue) );
 
                 if( bLock )
-                    pFrmFmt->LockModify();
-                pFrmFmt->SetFmtAttr( aItemSet );
+                    pFrameFormat->LockModify();
+                pFrameFormat->SetFormatAttr( aItemSet );
                 if( bLock )
-                    pFrmFmt->UnlockModify();
+                    pFrameFormat->UnlockModify();
                 else if( pCNd && SVX_ADJUST_END != eAdjust )
                 {
                     SvxAdjustItem aAdjItem( eAdjust, RES_PARATR_ADJUST );
@@ -1528,41 +1528,41 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
                 }
             }
             else
-                pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
+                pFrameFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
 
             OSL_ENSURE( eVOri != text::VertOrientation::TOP, "text::VertOrientation::TOP ist nicht erlaubt!" );
             if( text::VertOrientation::NONE != eVOri )
             {
-                pFrmFmt->SetFmtAttr( SwFmtVertOrient( 0, eVOri ) );
+                pFrameFormat->SetFormatAttr( SwFormatVertOrient( 0, eVOri ) );
             }
             else
-                pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT );
+                pFrameFormat->ResetFormatAttr( RES_VERT_ORIENT );
 
             if( bReUsable )
-                pColumn->SetFrmFmt( pFrmFmt, bBottomLine, eVOri );
+                pColumn->SetFrameFormat( pFrameFormat, bBottomLine, eVOri );
         }
         else
         {
-            pFrmFmt->ResetFmtAttr( RES_BOX );
-            pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
-            pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT );
-            pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
+            pFrameFormat->ResetFormatAttr( RES_BOX );
+            pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
+            pFrameFormat->ResetFormatAttr( RES_VERT_ORIENT );
+            pFrameFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
         }
     }
     else
     {
         OSL_ENSURE( pBox->GetSttNd() ||
-                SfxItemState::SET!=pFrmFmt->GetAttrSet().GetItemState(
+                SfxItemState::SET!=pFrameFormat->GetAttrSet().GetItemState(
                                     RES_VERT_ORIENT, false ),
                 "Box ohne Inhalt hat vertikale Ausrichtung" );
-        pBox->ChgFrmFmt( static_cast<SwTableBoxFmt*>(pFrmFmt) );
+        pBox->ChgFrameFormat( static_cast<SwTableBoxFormat*>(pFrameFormat) );
     }
 
 }
 
-void HTMLTable::FixFillerFrameFmt( SwTableBox *pBox, bool bRight ) const
+void HTMLTable::FixFillerFrameFormat( SwTableBox *pBox, bool bRight ) const
 {
-    SwFrmFmt *pFrmFmt = pBox->ClaimFrmFmt();
+    SwFrameFormat *pFrameFormat = pBox->ClaimFrameFormat();
 
     if( bFillerTopBorder || bFillerBottomBorder ||
         (!bRight && bInhLeftBorder) || (bRight && bInhRightBorder) )
@@ -1577,20 +1577,20 @@ void HTMLTable::FixFillerFrameFmt( SwTableBox *pBox, bool bRight ) const
         if( bRight && bInhRightBorder )
             aBoxItem.SetLine( &aInhRightBorderLine, SvxBoxItemLine::RIGHT );
         aBoxItem.SetDistance( MIN_BORDER_DIST );
-        pFrmFmt->SetFmtAttr( aBoxItem );
+        pFrameFormat->SetFormatAttr( aBoxItem );
     }
     else
     {
-        pFrmFmt->ResetFmtAttr( RES_BOX );
+        pFrameFormat->ResetFormatAttr( RES_BOX );
     }
 
     if( GetInhBGBrush() )
-        pFrmFmt->SetFmtAttr( *GetInhBGBrush() );
+        pFrameFormat->SetFormatAttr( *GetInhBGBrush() );
     else
-        pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
+        pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
 
-    pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT );
-    pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
+    pFrameFormat->ResetFormatAttr( RES_VERT_ORIENT );
+    pFrameFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
 }
 
 SwTableBox *HTMLTable::NewTableBox( const SwStartNode *pStNd,
@@ -1608,16 +1608,16 @@ SwTableBox *HTMLTable::NewTableBox( const SwStartNode *pStNd,
         pTopTable->pBox1 = 0;
     }
     else
-        pBox = new SwTableBox( pBoxFmt, *pStNd, pUpper );
+        pBox = new SwTableBox( pBoxFormat, *pStNd, pUpper );
 
     return pBox;
 }
 
-static void ResetLineFrmFmtAttrs( SwFrmFmt *pFrmFmt )
+static void ResetLineFrameFormatAttrs( SwFrameFormat *pFrameFormat )
 {
-    pFrmFmt->ResetFmtAttr( RES_FRM_SIZE );
-    pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
-    OSL_ENSURE( SfxItemState::SET!=pFrmFmt->GetAttrSet().GetItemState(
+    pFrameFormat->ResetFormatAttr( RES_FRM_SIZE );
+    pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
+    OSL_ENSURE( SfxItemState::SET!=pFrameFormat->GetAttrSet().GetItemState(
                                 RES_VERT_ORIENT, false ),
             "Zeile hat vertikale Ausrichtung" );
 }
@@ -1631,8 +1631,8 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
     if( this==pTopTable && !pUpper && 0==nTopRow )
         pLine = (pSwTable->GetTabLines())[0];
     else
-        pLine = new SwTableLine( pLineFrmFmtNoHeight ? pLineFrmFmtNoHeight
-                                                     : pLineFmt,
+        pLine = new SwTableLine( pLineFrameFormatNoHeight ? pLineFrameFormatNoHeight
+                                                     : pLineFormat,
                                  0, pUpper );
 
     HTMLTableRow *pTopRow = &(*pRows)[nTopRow];
@@ -1657,8 +1657,8 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
     }
     if( nTopRow==nBottomRow-1 && (nRowHeight || pBGBrushItem) )
     {
-        SwTableLineFmt *pFrmFmt = static_cast<SwTableLineFmt*>(pLine->ClaimFrmFmt());
-        ResetLineFrmFmtAttrs( pFrmFmt );
+        SwTableLineFormat *pFrameFormat = static_cast<SwTableLineFormat*>(pLine->ClaimFrameFormat());
+        ResetLineFrameFormatAttrs( pFrameFormat );
 
         if( nRowHeight )
         {
@@ -1669,22 +1669,22 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
             nRowHeight += GetTopCellSpace( nTopRow, 1, false ) +
                        GetBottomCellSpace( nTopRow, 1, false );
 
-            pFrmFmt->SetFmtAttr( SwFmtFrmSize( ATT_MIN_SIZE, 0, nRowHeight ) );
+            pFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_MIN_SIZE, 0, nRowHeight ) );
         }
 
         if( pBGBrushItem )
         {
-            pFrmFmt->SetFmtAttr( *pBGBrushItem );
+            pFrameFormat->SetFormatAttr( *pBGBrushItem );
         }
 
     }
-    else if( !pLineFrmFmtNoHeight )
+    else if( !pLineFrameFormatNoHeight )
     {
         // sonst muessen wir die Hoehe aus dem Attribut entfernen
         // und koennen uns das Format merken
-        pLineFrmFmtNoHeight = static_cast<SwTableLineFmt*>(pLine->ClaimFrmFmt());
+        pLineFrameFormatNoHeight = static_cast<SwTableLineFormat*>(pLine->ClaimFrameFormat());
 
-        ResetLineFrmFmtAttrs( pLineFrmFmtNoHeight );
+        ResetLineFrameFormatAttrs( pLineFrameFormatNoHeight );
     }
 
     SwTableBoxes& rBoxes = pLine->GetTabBoxes();
@@ -1789,7 +1789,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
             // und die ist eine Tabelle: dann bauen wir eine neue
             // Box und fuegen die Zeilen der Tabelle in die Zeilen
             // der Box ein
-            pBox = new SwTableBox( pBoxFmt, 0, pUpper );
+            pBox = new SwTableBox( pBoxFormat, 0, pUpper );
             sal_uInt16 nAbs, nRel;
             pLayoutInfo->GetAvail( nLeftCol, nColSpan, nAbs, nRel );
             sal_uInt16 nLSpace = pLayoutInfo->GetLeftCellSpace( nLeftCol, nColSpan );
@@ -1802,7 +1802,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
     else
     {
         // mehrere Inhalts Sections: dann brauchen wir eine Box mit Zeilen
-        pBox = new SwTableBox( pBoxFmt, 0, pUpper );
+        pBox = new SwTableBox( pBoxFormat, 0, pUpper );
         SwTableLines& rLines = pBox->GetTabLines();
         bool bFirstPara = true;
 
@@ -1812,21 +1812,21 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
             {
                 // normale Absaetze werden zu einer Box in einer Zeile
                 SwTableLine *pLine =
-                    new SwTableLine( pLineFrmFmtNoHeight ? pLineFrmFmtNoHeight
-                                                         : pLineFmt, 0, pBox );
-                if( !pLineFrmFmtNoHeight )
+                    new SwTableLine( pLineFrameFormatNoHeight ? pLineFrameFormatNoHeight
+                                                         : pLineFormat, 0, pBox );
+                if( !pLineFrameFormatNoHeight )
                 {
                     // Wenn es noch kein Line-Format ohne Hoehe gibt, koennen
                     // wir uns dieses her als soleches merken
-                    pLineFrmFmtNoHeight = static_cast<SwTableLineFmt*>(pLine->ClaimFrmFmt());
+                    pLineFrameFormatNoHeight = static_cast<SwTableLineFormat*>(pLine->ClaimFrameFormat());
 
-                    ResetLineFrmFmtAttrs( pLineFrmFmtNoHeight );
+                    ResetLineFrameFormatAttrs( pLineFrameFormatNoHeight );
                 }
 
                 SwTableBox* pCntBox = NewTableBox( pCnts->GetStartNode(),
                                                    pLine );
                 pCnts->SetTableBox( pCntBox );
-                FixFrameFmt( pCntBox, nTopRow, nLeftCol, nRowSpan, nColSpan,
+                FixFrameFormat( pCntBox, nTopRow, nLeftCol, nRowSpan, nColSpan,
                              bFirstPara, 0==pCnts->Next() );
                 pLine->GetTabBoxes().push_back( pCntBox );
 
@@ -1853,7 +1853,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
         }
     }
 
-    FixFrameFmt( pBox, nTopRow, nLeftCol, nRowSpan, nColSpan );
+    FixFrameFormat( pBox, nTopRow, nLeftCol, nRowSpan, nColSpan );
 
     return pBox;
 }
@@ -2061,7 +2061,7 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
                             sal_uInt16 nCellWidth, bool bRelWidth, sal_uInt16 nCellHeight,
                             sal_Int16 eVertOrient, SvxBrushItem *pBGBrushItem,
                             boost::shared_ptr<SvxBoxItem> const& rBoxItem,
-                            bool bHasNumFmt, sal_uInt32 nNumFmt,
+                            bool bHasNumFormat, sal_uInt32 nNumFormat,
                             bool bHasValue, double nValue, bool bNoWrap )
 {
     if( !nRowSpan || (sal_uInt32)nCurRow + nRowSpan > USHRT_MAX )
@@ -2140,7 +2140,7 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
             const bool bCovered = i != nColSpan || j != nRowSpan;
             GetCell( nRowsReq-j, nColsReq-i )
                 ->Set( pCnts, j, i, eVertOrient, pBGBrushItem, rBoxItem,
-                       bHasNumFmt, nNumFmt, bHasValue, nValue, bNoWrap, bCovered );
+                       bHasNumFormat, nNumFormat, bHasValue, nValue, bNoWrap, bCovered );
         }
     }
 
@@ -2499,27 +2499,27 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
         }
 
         // das Tabellenform holen und anpassen
-        SwFrmFmt *pFrmFmt = pSwTable->GetFrmFmt();
-        pFrmFmt->SetFmtAttr( SwFmtHoriOrient(0,eHoriOri) );
+        SwFrameFormat *pFrameFormat = pSwTable->GetFrameFormat();
+        pFrameFormat->SetFormatAttr( SwFormatHoriOrient(0,eHoriOri) );
         if( text::HoriOrientation::LEFT_AND_WIDTH==eHoriOri )
         {
             OSL_ENSURE( nLeftMargin || nRightMargin,
                     "Da gibt's wohl noch Reste von relativen Breiten" );
 
             // The right margin will be ignored anyway.
-            SvxLRSpaceItem aLRItem( pSwTable->GetFrmFmt()->GetLRSpace() );
+            SvxLRSpaceItem aLRItem( pSwTable->GetFrameFormat()->GetLRSpace() );
             aLRItem.SetLeft( nLeftMargin );
             aLRItem.SetRight( nRightMargin );
-            pFrmFmt->SetFmtAttr( aLRItem );
+            pFrameFormat->SetFormatAttr( aLRItem );
         }
 
         if( bPrcWidth && text::HoriOrientation::FULL!=eHoriOri )
         {
-            pFrmFmt->LockModify();
-            SwFmtFrmSize aFrmSize( pFrmFmt->GetFrmSize() );
+            pFrameFormat->LockModify();
+            SwFormatFrmSize aFrmSize( pFrameFormat->GetFrmSize() );
             aFrmSize.SetWidthPercent( (sal_uInt8)nWidth );
-            pFrmFmt->SetFmtAttr( aFrmSize );
-            pFrmFmt->UnlockModify();
+            pFrameFormat->SetFormatAttr( aFrmSize );
+            pFrameFormat->UnlockModify();
         }
     }
 
@@ -2531,13 +2531,13 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
         pBox1 = (pLine1->GetTabBoxes())[0];
         pLine1->GetTabBoxes().erase(pLine1->GetTabBoxes().begin());
 
-        pLineFmt = static_cast<SwTableLineFmt*>(pLine1->GetFrmFmt());
-        pBoxFmt = static_cast<SwTableBoxFmt*>(pBox1->GetFrmFmt());
+        pLineFormat = static_cast<SwTableLineFormat*>(pLine1->GetFrameFormat());
+        pBoxFormat = static_cast<SwTableBoxFormat*>(pBox1->GetFrameFormat());
     }
     else
     {
-        pLineFmt = pTopTable->pLineFmt;
-        pBoxFmt = pTopTable->pBoxFmt;
+        pLineFormat = pTopTable->pLineFormat;
+        pBoxFormat = pTopTable->pBoxFormat;
     }
 
     // ggf. muessen fuer Tabellen in Tabellen "Filler"-Zellen eingefuegt
@@ -2552,18 +2552,18 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
 
         // dazu brauchen wir erstmal ein eine neue Table-Line in der Box
         SwTableLine *pLine =
-            new SwTableLine( pLineFrmFmtNoHeight ? pLineFrmFmtNoHeight
-                                                 : pLineFmt, 0, pBox );
+            new SwTableLine( pLineFrameFormatNoHeight ? pLineFrameFormatNoHeight
+                                                 : pLineFormat, 0, pBox );
         rLines.push_back( pLine );
 
         // Sicherstellen, dass wie ein Format ohne Hoehe erwischt haben
-        if( !pLineFrmFmtNoHeight )
+        if( !pLineFrameFormatNoHeight )
         {
             // sonst muessen wir die Hoehe aus dem Attribut entfernen
             // und koennen uns das Format merken
-            pLineFrmFmtNoHeight = static_cast<SwTableLineFmt*>(pLine->ClaimFrmFmt());
+            pLineFrameFormatNoHeight = static_cast<SwTableLineFormat*>(pLine->ClaimFrameFormat());
 
-            ResetLineFrmFmtAttrs( pLineFrmFmtNoHeight );
+            ResetLineFrameFormatAttrs( pLineFrameFormatNoHeight );
         }
 
         SwTableBoxes& rBoxes = pLine->GetTabBoxes();
@@ -2578,19 +2578,19 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
 
             pNewBox = NewTableBox( pPrevStNd, pLine );
             rBoxes.push_back( pNewBox );
-            FixFillerFrameFmt( pNewBox, false );
+            FixFillerFrameFormat( pNewBox, false );
             pLayoutInfo->SetLeftFillerBox( pNewBox );
         }
 
         // jetzt die Tabelle bearbeiten
-        pNewBox = new SwTableBox( pBoxFmt, 0, pLine );
+        pNewBox = new SwTableBox( pBoxFormat, 0, pLine );
         rBoxes.push_back( pNewBox );
 
-        SwFrmFmt *pFrmFmt = pNewBox->ClaimFrmFmt();
-        pFrmFmt->ResetFmtAttr( RES_BOX );
-        pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
-        pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT );
-        pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
+        SwFrameFormat *pFrameFormat = pNewBox->ClaimFrameFormat();
+        pFrameFormat->ResetFormatAttr( RES_BOX );
+        pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
+        pFrameFormat->ResetFormatAttr( RES_VERT_ORIENT );
+        pFrameFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
 
         _MakeTable( pNewBox );
 
@@ -2604,7 +2604,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
             pNewBox = NewTableBox( pStNd, pLine );
             rBoxes.push_back( pNewBox );
 
-            FixFillerFrameFmt( pNewBox, true );
+            FixFillerFrameFormat( pNewBox, true );
             pLayoutInfo->SetRightFillerBox( pNewBox );
         }
     }
@@ -2627,18 +2627,18 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
             if( nHeight < MINLAY )
                 nHeight = MINLAY;
 
-            (pSwTable->GetTabLines())[0]->ClaimFrmFmt();
-            (pSwTable->GetTabLines())[0]->GetFrmFmt()
-                ->SetFmtAttr( SwFmtFrmSize( ATT_MIN_SIZE, 0, nHeight ) );
+            (pSwTable->GetTabLines())[0]->ClaimFrameFormat();
+            (pSwTable->GetTabLines())[0]->GetFrameFormat()
+                ->SetFormatAttr( SwFormatFrmSize( ATT_MIN_SIZE, 0, nHeight ) );
         }
 
         if( GetBGBrush() )
-            pSwTable->GetFrmFmt()->SetFmtAttr( *GetBGBrush() );
+            pSwTable->GetFrameFormat()->SetFormatAttr( *GetBGBrush() );
 
         const_cast<SwTable *>(pSwTable)->SetRowsToRepeat( static_cast< sal_uInt16 >(nHeadlineRepeat) );
         const_cast<SwTable *>(pSwTable)->GCLines();
 
-        bool bIsInFlyFrame = pContext && pContext->GetFrmFmt();
+        bool bIsInFlyFrame = pContext && pContext->GetFrameFormat();
         if( bIsInFlyFrame && !nWidth )
         {
             SvxAdjust eAdjust = GetTableAdjust(false);
@@ -2653,9 +2653,9 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
                 sal_uInt32 nMin = pLayoutInfo->GetMin();
                 if( nMin > USHRT_MAX )
                     nMin = USHRT_MAX;
-                SwFmtFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY );
+                SwFormatFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY );
                 aFlyFrmSize.SetWidthPercent( 100 );
-                pContext->GetFrmFmt()->SetFmtAttr( aFlyFrmSize );
+                pContext->GetFrameFormat()->SetFormatAttr( aFlyFrmSize );
                 bIsInFlyFrame = false;
             }
             else
@@ -2664,14 +2664,14 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
                 // duerfen leider nicht in der Breite angepasst werden, denn
                 // sie wuerden nur schrumpfen aber nie wachsen.
                 pLayoutInfo->SetMustNotRecalc( true );
-                if( pContext->GetFrmFmt()->GetAnchor().GetCntntAnchor()
+                if( pContext->GetFrameFormat()->GetAnchor().GetContentAnchor()
                     ->nNode.GetNode().FindTableNode() )
                 {
                     sal_uInt32 nMax = pLayoutInfo->GetMax();
                     if( nMax > USHRT_MAX )
                         nMax = USHRT_MAX;
-                    SwFmtFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY );
-                    pContext->GetFrmFmt()->SetFmtAttr( aFlyFrmSize );
+                    SwFormatFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY );
+                    pContext->GetFrameFormat()->SetFormatAttr( aFlyFrmSize );
                     bIsInFlyFrame = false;
                 }
                 else
@@ -2787,13 +2787,13 @@ const SwStartNode *SwHTMLParser::InsertTableSection
     OSL_ENSURE( pPrevStNd, "Start-Node ist NULL" );
 
     pCSS1Parser->SetTDTagStyles();
-    SwTxtFmtColl *pColl = pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_TABLE );
+    SwTextFormatColl *pColl = pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TABLE );
 
     const SwStartNode *pStNd;
     if (pTable->bFirstCell )
     {
         SwNode *const pNd = & pPam->GetPoint()->nNode.GetNode();
-        pNd->GetTxtNode()->ChgFmtColl( pColl );
+        pNd->GetTextNode()->ChgFormatColl( pColl );
         pStNd = pNd->FindTableBoxStartNode();
         pTable->bFirstCell = false;
     }
@@ -2811,7 +2811,7 @@ const SwStartNode *SwHTMLParser::InsertTableSection
     }
 
     //Added defaults to CJK and CTL
-    SwCntntNode *pCNd = pDoc->GetNodes()[pStNd->GetIndex()+1] ->GetCntntNode();
+    SwContentNode *pCNd = pDoc->GetNodes()[pStNd->GetIndex()+1] ->GetContentNode();
     SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
     pCNd->SetAttr( aFontHeight );
     SvxFontHeightItem aFontHeightCJK( 40, 100, RES_CHRATR_CJK_FONTSIZE );
@@ -2834,35 +2834,35 @@ const SwStartNode *SwHTMLParser::InsertTableSection( sal_uInt16 nPoolId )
         break;
     }
 
-    SwTxtFmtColl *pColl = pCSS1Parser->GetTxtCollFromPool( nPoolId );
+    SwTextFormatColl *pColl = pCSS1Parser->GetTextCollFromPool( nPoolId );
 
     SwNode *const pNd = & pPam->GetPoint()->nNode.GetNode();
     const SwStartNode *pStNd;
     if (pTable->bFirstCell)
     {
-        pNd->GetTxtNode()->ChgFmtColl( pColl );
+        pNd->GetTextNode()->ChgFormatColl( pColl );
         pTable->bFirstCell = false;
         pStNd = pNd->FindTableBoxStartNode();
     }
     else
     {
-        SwTableNode *pTblNd = pNd->FindTableNode();
-        if( pTblNd->GetTable().GetHTMLTableLayout() )
+        SwTableNode *pTableNd = pNd->FindTableNode();
+        if( pTableNd->GetTable().GetHTMLTableLayout() )
         { // if there is already a HTMTableLayout, this table is already finished
           // and we have to look for the right table in the environment
-            SwTableNode *pOutTbl = pTblNd;
+            SwTableNode *pOutTable = pTableNd;
             do {
-                pTblNd = pOutTbl;
-                pOutTbl = pOutTbl->StartOfSectionNode()->FindTableNode();
-            } while( pOutTbl && pTblNd->GetTable().GetHTMLTableLayout() );
+                pTableNd = pOutTable;
+                pOutTable = pOutTable->StartOfSectionNode()->FindTableNode();
+            } while( pOutTable && pTableNd->GetTable().GetHTMLTableLayout() );
         }
-        SwNodeIndex aIdx( *pTblNd->EndOfSectionNode() );
+        SwNodeIndex aIdx( *pTableNd->EndOfSectionNode() );
         pStNd = pDoc->GetNodes().MakeTextSection( aIdx, SwTableBoxStartNode,
                                                   pColl );
 
         pPam->GetPoint()->nNode = pStNd->GetIndex() + 1;
-        SwTxtNode *pTxtNd = pPam->GetPoint()->nNode.GetNode().GetTxtNode();
-        pPam->GetPoint()->nContent.Assign( pTxtNd, 0 );
+        SwTextNode *pTextNd = pPam->GetPoint()->nNode.GetNode().GetTextNode();
+        pPam->GetPoint()->nContent.Assign( pTextNd, 0 );
         pTable->IncBoxCount();
     }
 
@@ -2871,14 +2871,14 @@ const SwStartNode *SwHTMLParser::InsertTableSection( sal_uInt16 nPoolId )
 
 SwStartNode *SwHTMLParser::InsertTempTableCaptionSection()
 {
-    SwTxtFmtColl *pColl = pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_TEXT );
+    SwTextFormatColl *pColl = pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_TEXT );
     SwNodeIndex& rIdx = pPam->GetPoint()->nNode;
     rIdx = pDoc->GetNodes().GetEndOfExtras();
     SwStartNode *pStNd = pDoc->GetNodes().MakeTextSection( rIdx,
                                           SwNormalStartNode, pColl );
 
     rIdx = pStNd->GetIndex() + 1;
-    pPam->GetPoint()->nContent.Assign( rIdx.GetNode().GetTxtNode(), 0 );
+    pPam->GetPoint()->nContent.Assign( rIdx.GetNode().GetTextNode(), 0 );
 
     return pStNd;
 }
@@ -2890,13 +2890,13 @@ sal_Int32 SwHTMLParser::StripTrailingLF()
     const sal_Int32 nLen = pPam->GetPoint()->nContent.GetIndex();
     if( nLen )
     {
-        SwTxtNode* pTxtNd = pPam->GetPoint()->nNode.GetNode().GetTxtNode();
+        SwTextNode* pTextNd = pPam->GetPoint()->nNode.GetNode().GetTextNode();
         // vorsicht, wenn Kommentare nicht uebrlesen werden!!!
-        if( pTxtNd )
+        if( pTextNd )
         {
             sal_Int32 nPos = nLen;
             sal_Int32 nLFCount = 0;
-            while (nPos && ('\x0a' == pTxtNd->GetTxt()[--nPos]))
+            while (nPos && ('\x0a' == pTextNd->GetText()[--nPos]))
                 nLFCount++;
 
             if( nLFCount )
@@ -2916,8 +2916,8 @@ sal_Int32 SwHTMLParser::StripTrailingLF()
                 }
 
                 nPos = nLen - nLFCount;
-                SwIndex nIdx( pTxtNd, nPos );
-                pTxtNd->EraseText( nIdx, nLFCount );
+                SwIndex nIdx( pTextNd, nPos );
+                pTextNd->EraseText( nIdx, nLFCount );
                 nStripped = nLFCount;
             }
         }
@@ -3073,17 +3073,17 @@ class _CellSaveStruct : public _SectionSaveStruct
 
     double nValue;
 
-    sal_uInt32 nNumFmt;
+    sal_uInt32 nNumFormat;
 
     sal_uInt16 nRowSpan, nColSpan, nWidth, nHeight;
-    sal_Int32 nNoBreakEndCntntPos;     // Zeichen-Index eines </NOBR>
+    sal_Int32 nNoBreakEndContentPos;     // Zeichen-Index eines </NOBR>
 
     SvxAdjust eAdjust;
     sal_Int16 eVertOri;
 
     bool bHead : 1;
     bool bPrcWidth : 1;
-    bool bHasNumFmt : 1;
+    bool bHasNumFormat : 1;
     bool bHasValue : 1;
     bool bBGColor : 1;
     bool bNoWrap : 1;       // NOWRAP-Option
@@ -3118,23 +3118,23 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
     pCurrCnts( 0 ),
     pNoBreakEndParaIdx( 0 ),
     nValue( 0.0 ),
-    nNumFmt( 0 ),
+    nNumFormat( 0 ),
     nRowSpan( 1 ),
     nColSpan( 1 ),
     nWidth( 0 ),
     nHeight( 0 ),
-    nNoBreakEndCntntPos( 0 ),
+    nNoBreakEndContentPos( 0 ),
     eAdjust( pCurTable->GetInheritedAdjust() ),
     eVertOri( pCurTable->GetInheritedVertOri() ),
     bHead( bHd ),
     bPrcWidth( false ),
-    bHasNumFmt( false ),
+    bHasNumFormat( false ),
     bHasValue( false ),
     bBGColor( false ),
     bNoWrap( false ),
     bNoBreak( false )
 {
-    OUString aNumFmt, aValue;
+    OUString aNumFormat, aValue;
 
     if( bReadOpt )
     {
@@ -3159,7 +3159,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
                 break;
             case HTML_O_VALIGN:
                 eVertOri = rOption.GetEnum(
-                                        aHTMLTblVAlignTable, eVertOri );
+                                        aHTMLTableVAlignTable, eVertOri );
                 break;
             case HTML_O_WIDTH:
                 nWidth = (sal_uInt16)rOption.GetNumber();   // nur fuer Netscape
@@ -3197,8 +3197,8 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
                 aDir = rOption.GetString();
                 break;
             case HTML_O_SDNUM:
-                aNumFmt = rOption.GetString();
-                bHasNumFmt = true;
+                aNumFormat = rOption.GetString();
+                bHasNumFormat = true;
                 break;
             case HTML_O_SDVAL:
                 bHasValue = true;
@@ -3214,11 +3214,11 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
             rParser.InsertBookmark( aId );
     }
 
-    if( bHasNumFmt )
+    if( bHasNumFormat )
     {
         LanguageType eLang;
         nValue = SfxHTMLParser::GetTableDataOptionsValNum(
-                            nNumFmt, eLang, aValue, aNumFmt,
+                            nNumFormat, eLang, aValue, aNumFormat,
                             *rParser.pDoc->GetNumberFormatter() );
     }
 
@@ -3252,7 +3252,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
         {
             SfxPoolItem const* pItem;
             if (SfxItemState::SET == aItemSet.GetItemState(RES_BOX, false, &pItem))
-            {   // fdo#41796: steal box item to set it in FixFrameFmt later!
+            {   // fdo#41796: steal box item to set it in FixFrameFormat later!
                 m_pBoxItem.reset(dynamic_cast<SvxBoxItem *>(pItem->Clone()));
                 aItemSet.ClearItem(RES_BOX);
             }
@@ -3301,12 +3301,12 @@ void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
 
     if( rParser.nContextStAttrMin == GetContextStAttrMin() )
     {
-        _HTMLAttr** pTbl = reinterpret_cast<_HTMLAttr**>(&rParser.aAttrTab);
+        _HTMLAttr** pTable = reinterpret_cast<_HTMLAttr**>(&rParser.aAttrTab);
 
         for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
-            nCnt--; ++pTbl )
+            nCnt--; ++pTable )
         {
-            OSL_ENSURE( !*pTbl, "Die Attribut-Tabelle ist nicht leer" );
+            OSL_ENSURE( !*pTable, "Die Attribut-Tabelle ist nicht leer" );
         }
     }
 #endif
@@ -3317,7 +3317,7 @@ void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
                                  aStyle, aId, aClass );
     pCurTable->InsertCell( pCnts, nRowSpan, nColSpan, nWidth,
                            bPrcWidth, nHeight, eVertOri, pBrushItem, m_pBoxItem,
-                           bHasNumFmt, nNumFmt, bHasValue, nValue,
+                           bHasNumFormat, nNumFormat, bHasValue, nValue,
                            bNoWrap );
     Restore( rParser );
 }
@@ -3340,7 +3340,7 @@ void _CellSaveStruct::EndNoBreak( const SwPosition& rPos )
     {
         delete pNoBreakEndParaIdx;
         pNoBreakEndParaIdx = new SwNodeIndex( rPos.nNode );
-        nNoBreakEndCntntPos = rPos.nContent.GetIndex();
+        nNoBreakEndContentPos = rPos.nContent.GetIndex();
         bNoBreak = false;
     }
 }
@@ -3357,18 +3357,18 @@ void _CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc * /*pDoc*/ )
         else if( pNoBreakEndParaIdx &&
                  pNoBreakEndParaIdx->GetIndex() == rPos.nNode.GetIndex() )
         {
-            if( nNoBreakEndCntntPos == rPos.nContent.GetIndex() )
+            if( nNoBreakEndContentPos == rPos.nContent.GetIndex() )
             {
                 // <NOBR> wurde unmittelbar vor dem Zellen-Ende beendet
                 pCnts->SetNoBreak();
             }
-            else if( nNoBreakEndCntntPos + 1 == rPos.nContent.GetIndex() )
+            else if( nNoBreakEndContentPos + 1 == rPos.nContent.GetIndex() )
             {
-                SwTxtNode const*const pTxtNd(rPos.nNode.GetNode().GetTxtNode());
-                if( pTxtNd )
+                SwTextNode const*const pTextNd(rPos.nNode.GetNode().GetTextNode());
+                if( pTextNd )
                 {
                     sal_Unicode const cLast =
-                            pTxtNd->GetTxt()[nNoBreakEndCntntPos];
+                            pTextNd->GetText()[nNoBreakEndContentPos];
                     if( ' '==cLast || '\x0a'==cLast )
                     {
                         // Zwischem dem </NOBR> und dem Zellen-Ende gibt es nur
@@ -3410,8 +3410,8 @@ HTMLTableCnts *SwHTMLParser::InsertTableContents(
             OSL_ENSURE( !pAttr->GetPrev(), "Attribut hat Previous-Liste" );
             pAttr->nSttPara = rSttPara;
             pAttr->nEndPara = rSttPara;
-            pAttr->nSttCntnt = nSttCnt;
-            pAttr->nEndCntnt = nSttCnt;
+            pAttr->nSttContent = nSttCnt;
+            pAttr->nEndContent = nSttCnt;
 
             pAttr = pAttr->GetNext();
         }
@@ -3502,7 +3502,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                                         RES_PARATR_SPLIT, false, &pItem ) )
                 {
                     aItemSet.Put(
-                        SwFmtLayoutSplit( static_cast<const SvxFmtSplitItem *>(pItem)
+                        SwFormatLayoutSplit( static_cast<const SvxFormatSplitItem *>(pItem)
                                                 ->GetValue() ) );
                     aItemSet.ClearItem( RES_PARATR_SPLIT );
                 }
@@ -3521,13 +3521,13 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
             bool bParentLFStripped = false;
             if( bTopTable )
             {
-                SvxAdjust eTblAdjust = pTable->GetTableAdjust(false);
+                SvxAdjust eTableAdjust = pTable->GetTableAdjust(false);
 
                 // Wenn die Tabelle links oder rechts ausgerivchtet ist,
                 // oder in einen Rahmen soll, dann kommt sie auch in einen
                 // solchen.
-                bForceFrame = eTblAdjust == SVX_ADJUST_LEFT ||
-                              eTblAdjust == SVX_ADJUST_RIGHT ||
+                bForceFrame = eTableAdjust == SVX_ADJUST_LEFT ||
+                              eTableAdjust == SVX_ADJUST_RIGHT ||
                               pCurTable->HasToFly();
 
                 // Entweder kommt die Tabelle in keinen Rahmen und befindet
@@ -3559,8 +3559,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                     if( !pPam->GetPoint()->nContent.GetIndex() )
                     {
                         //Set default to CJK and CTL
-                        pDoc->SetTxtFmtColl( *pPam,
-                            pCSS1Parser->GetTxtCollFromPool(RES_POOLCOLL_STANDARD) );
+                        pDoc->SetTextFormatColl( *pPam,
+                            pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_STANDARD) );
                         SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
 
                         _HTMLAttr* pTmp =
@@ -3583,7 +3583,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                                                         // vom Tabellenende vorher
                                                         // was gesetzt sein kann.
                     }
-                    AppendTxtNode( AM_NOSPACE );
+                    AppendTextNode( AM_NOSPACE );
                     bAppended = true;
                 }
                 else if( !aParaAttrs.empty() )
@@ -3665,7 +3665,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                     SfxItemSet aFrmSet( pDoc->GetAttrPool(),
                                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
                     if( !pCurTable->IsNewDoc() )
-                        Reader::ResetFrmFmtAttrs( aFrmSet );
+                        Reader::ResetFrameFormatAttrs( aFrmSet );
 
                     SwSurround eSurround = SURROUND_NONE;
                     sal_Int16 eHori;
@@ -3688,9 +3688,9 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                     }
                     SetAnchorAndAdjustment( text::VertOrientation::NONE, eHori, aFrmSet,
                                             true );
-                    aFrmSet.Put( SwFmtSurround(eSurround) );
+                    aFrmSet.Put( SwFormatSurround(eSurround) );
 
-                    SwFmtFrmSize aFrmSize( ATT_VAR_SIZE, 20*MM50, MINLAY );
+                    SwFormatFrmSize aFrmSize( ATT_VAR_SIZE, 20*MM50, MINLAY );
                     aFrmSize.SetWidthPercent( 100 );
                     aFrmSet.Put( aFrmSize );
 
@@ -3701,16 +3701,16 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                     if( nSpace )
                         aFrmSet.Put( SvxULSpaceItem(nSpace,nSpace, RES_UL_SPACE) );
 
-                    RndStdIds eAnchorId = static_cast<const SwFmtAnchor&>(aFrmSet.
+                    RndStdIds eAnchorId = static_cast<const SwFormatAnchor&>(aFrmSet.
                                                 Get( RES_ANCHOR )).
                                                 GetAnchorId();
-                    SwFrmFmt *pFrmFmt =  pDoc->MakeFlySection(
+                    SwFrameFormat *pFrameFormat =  pDoc->MakeFlySection(
                                 eAnchorId, pPam->GetPoint(), &aFrmSet );
 
-                    pTCntxt->SetFrmFmt( pFrmFmt );
-                    const SwFmtCntnt& rFlyCntnt = pFrmFmt->GetCntnt();
-                    pPam->GetPoint()->nNode = *rFlyCntnt.GetCntntIdx();
-                    SwCntntNode *pCNd =
+                    pTCntxt->SetFrameFormat( pFrameFormat );
+                    const SwFormatContent& rFlyContent = pFrameFormat->GetContent();
+                    pPam->GetPoint()->nNode = *rFlyContent.GetContentIdx();
+                    SwContentNode *pCNd =
                         pDoc->GetNodes().GoNext( &(pPam->GetPoint()->nNode) );
                     pPam->GetPoint()->nContent.Assign( pCNd, 0 );
 
@@ -3736,8 +3736,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                 {
                     if( bStyleParsed )
                     {
-                        pCSS1Parser->SetFmtBreak( aItemSet, aPropInfo );
-                        pSwTable->GetFrmFmt()->SetFmtAttr( aItemSet );
+                        pCSS1Parser->SetFormatBreak( aItemSet, aPropInfo );
+                        pSwTable->GetFrameFormat()->SetFormatAttr( aItemSet );
                     }
                     pPam->Move( fnMoveBackward );
                 }
@@ -3745,29 +3745,29 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                 SwNode const*const pNd = & pPam->GetPoint()->nNode.GetNode();
                 if( !bAppended && !bForceFrame )
                 {
-                    SwTxtNode *const pOldTxtNd =
-                        pSavePos->nNode.GetNode().GetTxtNode();
-                    OSL_ENSURE( pOldTxtNd, "Wieso stehen wir in keinem Txt-Node?" );
-                    SwFrmFmt *pFrmFmt = pSwTable->GetFrmFmt();
+                    SwTextNode *const pOldTextNd =
+                        pSavePos->nNode.GetNode().GetTextNode();
+                    OSL_ENSURE( pOldTextNd, "Wieso stehen wir in keinem Text-Node?" );
+                    SwFrameFormat *pFrameFormat = pSwTable->GetFrameFormat();
 
                     const SfxPoolItem* pItem2;
-                    if( SfxItemState::SET == pOldTxtNd->GetSwAttrSet()
+                    if( SfxItemState::SET == pOldTextNd->GetSwAttrSet()
                             .GetItemState( RES_PAGEDESC, false, &pItem2 ) &&
-                        static_cast<const SwFmtPageDesc *>(pItem2)->GetPageDesc() )
+                        static_cast<const SwFormatPageDesc *>(pItem2)->GetPageDesc() )
                     {
-                        pFrmFmt->SetFmtAttr( *pItem2 );
-                        pOldTxtNd->ResetAttr( RES_PAGEDESC );
+                        pFrameFormat->SetFormatAttr( *pItem2 );
+                        pOldTextNd->ResetAttr( RES_PAGEDESC );
                     }
-                    if( SfxItemState::SET == pOldTxtNd->GetSwAttrSet()
+                    if( SfxItemState::SET == pOldTextNd->GetSwAttrSet()
                             .GetItemState( RES_BREAK, true, &pItem2 ) )
                     {
-                        switch( static_cast<const SvxFmtBreakItem *>(pItem2)->GetBreak() )
+                        switch( static_cast<const SvxFormatBreakItem *>(pItem2)->GetBreak() )
                         {
                         case SVX_BREAK_PAGE_BEFORE:
                         case SVX_BREAK_PAGE_AFTER:
                         case SVX_BREAK_PAGE_BOTH:
-                            pFrmFmt->SetFmtAttr( *pItem2 );
-                            pOldTxtNd->ResetAttr( RES_BREAK );
+                            pFrameFormat->SetFormatAttr( *pItem2 );
+                            pOldTextNd->ResetAttr( RES_BREAK );
                         default:
                             ;
                         }
@@ -3957,7 +3957,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
 
                         if( pSubTable->GetContext() )
                         {
-                            OSL_ENSURE( !pSubTable->GetContext()->GetFrmFmt(),
+                            OSL_ENSURE( !pSubTable->GetContext()->GetFrameFormat(),
                                     "Tabelle steht im Rahmen" );
 
                             if( pCapStNd && pSubTable->IsTopCaption() )
@@ -4076,7 +4076,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                                         ? RES_POOLCOLL_TABLE_HDLN
                                         : RES_POOLCOLL_TABLE ));
         const SwEndNode *pEndNd = pStNd->EndOfSectionNode();
-        SwCntntNode *pCNd = pDoc->GetNodes()[pEndNd->GetIndex()-1] ->GetCntntNode();
+        SwContentNode *pCNd = pDoc->GetNodes()[pEndNd->GetIndex()-1] ->GetContentNode();
         //Added defaults to CJK and CTL
         SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
         pCNd->SetAttr( aFontHeight );
@@ -4198,7 +4198,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
                     break;
                 case HTML_O_VALIGN:
                     eVertOri = rOption.GetEnum(
-                                    aHTMLTblVAlignTable, eVertOri );
+                                    aHTMLTableVAlignTable, eVertOri );
                     break;
                 case HTML_O_BGCOLOR:
                     // Leere BGCOLOR bei <TABLE>, <TR> und <TD>/<TH> wie Netsc.
@@ -4399,7 +4399,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
                     break;
                 case HTML_O_VALIGN:
                     pSaveStruct->eVertOri =
-                        rOption.GetEnum( aHTMLTblVAlignTable,
+                        rOption.GetEnum( aHTMLTableVAlignTable,
                                           pSaveStruct->eVertOri );
                     break;
                 }
@@ -4515,7 +4515,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
     // now we stand (perhaps) in front of <TBODY>,... or </TABLE>
 }
 
-struct _TblColGrpSaveStruct : public SwPendingStackData
+struct _TableColGrpSaveStruct : public SwPendingStackData
 {
     sal_uInt16 nColGrpSpan;
     sal_uInt16 nColGrpWidth;
@@ -4523,18 +4523,18 @@ struct _TblColGrpSaveStruct : public SwPendingStackData
     SvxAdjust eColGrpAdjust;
     sal_Int16 eColGrpVertOri;
 
-    inline _TblColGrpSaveStruct();
+    inline _TableColGrpSaveStruct();
 
     inline void CloseColGroup( HTMLTable *pTable );
 };
 
-inline _TblColGrpSaveStruct::_TblColGrpSaveStruct() :
+inline _TableColGrpSaveStruct::_TableColGrpSaveStruct() :
     nColGrpSpan( 1 ), nColGrpWidth( 0 ),
     bRelColGrpWidth( false ), eColGrpAdjust( SVX_ADJUST_END ),
     eColGrpVertOri( text::VertOrientation::TOP )
 {}
 
-inline void _TblColGrpSaveStruct::CloseColGroup( HTMLTable *pTable )
+inline void _TableColGrpSaveStruct::CloseColGroup( HTMLTable *pTable )
 {
     pTable->CloseColGroup( nColGrpSpan, nColGrpWidth,
                             bRelColGrpWidth, eColGrpAdjust, eColGrpVertOri );
@@ -4550,11 +4550,11 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
 
     int nToken = 0;
     bool bPending = false;
-    _TblColGrpSaveStruct* pSaveStruct;
+    _TableColGrpSaveStruct* pSaveStruct;
 
     if( pPendStack )
     {
-        pSaveStruct = static_cast<_TblColGrpSaveStruct*>(pPendStack->pData);
+        pSaveStruct = static_cast<_TableColGrpSaveStruct*>(pPendStack->pData);
 
         SwPendingStack* pTmp = pPendStack->pNext;
         delete pPendStack;
@@ -4567,7 +4567,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
     else
     {
 
-        pSaveStruct = new _TblColGrpSaveStruct;
+        pSaveStruct = new _TableColGrpSaveStruct;
         if( bReadOptions )
         {
             const HTMLOptions& rColGrpOptions = GetOptions();
@@ -4594,7 +4594,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
                     break;
                 case HTML_O_VALIGN:
                     pSaveStruct->eColGrpVertOri =
-                        rOption.GetEnum( aHTMLTblVAlignTable,
+                        rOption.GetEnum( aHTMLTableVAlignTable,
                                                 pSaveStruct->eColGrpVertOri );
                     break;
                 }
@@ -4678,7 +4678,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
                         break;
                     case HTML_O_VALIGN:
                         eColVertOri =
-                            rOption.GetEnum( aHTMLTblVAlignTable,
+                            rOption.GetEnum( aHTMLTableVAlignTable,
                                                         eColVertOri );
                         break;
                     }
@@ -4932,7 +4932,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
         // Deshalb muss sich am Ende der Section immer ein leerer
         // Absatz befinden.
         if( pPam->GetPoint()->nContent.GetIndex() || bLFStripped )
-            AppendTxtNode( AM_NOSPACE );
+            AppendTextNode( AM_NOSPACE );
     }
     else
     {
@@ -4958,16 +4958,16 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
     delete pSaveStruct;
 }
 
-class _TblSaveStruct : public SwPendingStackData
+class _TableSaveStruct : public SwPendingStackData
 {
 public:
     HTMLTable *m_pCurrentTable;
 
-    _TblSaveStruct( HTMLTable *pCurTbl ) :
-        m_pCurrentTable( pCurTbl )
+    _TableSaveStruct( HTMLTable *pCurTable ) :
+        m_pCurrentTable( pCurTable )
     {}
 
-    virtual ~_TblSaveStruct();
+    virtual ~_TableSaveStruct();
 
     // Aufbau der Tabelle anstossen und die Tabelle ggf. in einen
     // Rahmen packen. Wenn true zurueckgegeben wird muss noch ein
@@ -4975,37 +4975,37 @@ public:
     void MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc );
 };
 
-_TblSaveStruct::~_TblSaveStruct()
+_TableSaveStruct::~_TableSaveStruct()
 {}
 
-void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc )
+void _TableSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc )
 {
     m_pCurrentTable->MakeTable(0, nWidth);
 
     _HTMLTableContext *pTCntxt = m_pCurrentTable->GetContext();
     OSL_ENSURE( pTCntxt, "Wo ist der Tabellen-Kontext" );
 
-    SwTableNode *pTblNd = pTCntxt->GetTableNode();
-    OSL_ENSURE( pTblNd, "Wo ist der Tabellen-Node" );
+    SwTableNode *pTableNd = pTCntxt->GetTableNode();
+    OSL_ENSURE( pTableNd, "Wo ist der Tabellen-Node" );
 
-    if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() && pTblNd )
+    if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() && pTableNd )
     {
         // Existiert schon ein Layout, dann muss an dieser Tabelle die
         // BoxFrames neu erzeugt werden.
 
-        if( pTCntxt->GetFrmFmt() )
+        if( pTCntxt->GetFrameFormat() )
         {
-            pTCntxt->GetFrmFmt()->DelFrms();
-            pTblNd->DelFrms();
-            pTCntxt->GetFrmFmt()->MakeFrms();
+            pTCntxt->GetFrameFormat()->DelFrms();
+            pTableNd->DelFrms();
+            pTCntxt->GetFrameFormat()->MakeFrms();
         }
         else
         {
-            pTblNd->DelFrms();
-            SwNodeIndex aIdx( *pTblNd->EndOfSectionNode(), 1 );
+            pTableNd->DelFrms();
+            SwNodeIndex aIdx( *pTableNd->EndOfSectionNode(), 1 );
             OSL_ENSURE( aIdx.GetIndex() <= pTCntxt->GetPos()->nNode.GetIndex(),
                     "unerwarteter Node fuer das Tabellen-Layout" );
-            pTblNd->MakeFrms( &aIdx );
+            pTableNd->MakeFrms( &aIdx );
         }
     }
 
@@ -5068,7 +5068,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
             }
             break;
         case HTML_O_VALIGN:
-            eVertOri = rOption.GetEnum( aHTMLTblVAlignTable, eVertOri );
+            eVertOri = rOption.GetEnum( aHTMLTableVAlignTable, eVertOri );
             break;
         case HTML_O_BORDER:
             // BORDER und BORDER=BORDER wie BORDER=1 behandeln
@@ -5157,11 +5157,11 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
 
     int nToken = 0;
     bool bPending = false;
-    _TblSaveStruct* pSaveStruct;
+    _TableSaveStruct* pSaveStruct;
 
     if( pPendStack )
     {
-        pSaveStruct = static_cast<_TblSaveStruct*>(pPendStack->pData);
+        pSaveStruct = static_cast<_TableSaveStruct*>(pPendStack->pData);
 
         SwPendingStack* pTmp = pPendStack->pNext;
         delete pPendStack;
@@ -5174,23 +5174,23 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
     else
     {
         pTable = 0;
-        HTMLTableOptions *pTblOptions =
+        HTMLTableOptions *pTableOptions =
             new HTMLTableOptions( GetOptions(), eParentAdjust );
 
-        if( !pTblOptions->aId.isEmpty() )
-            InsertBookmark( pTblOptions->aId );
+        if( !pTableOptions->aId.isEmpty() )
+            InsertBookmark( pTableOptions->aId );
 
         HTMLTable *pCurTable = new HTMLTable( this, pTable,
                                               bIsParentHead,
                                               bHasParentSection,
                                               bHasToFly,
-                                              pTblOptions );
+                                              pTableOptions );
         if( !pTable )
             pTable = pCurTable;
 
-        pSaveStruct = new _TblSaveStruct( pCurTable );
+        pSaveStruct = new _TableSaveStruct( pCurTable );
 
-        delete pTblOptions;
+        delete pTableOptions;
 
         // ist beim ersten GetNextToken schon pending, muss bei
         // wiederaufsetzen auf jedenfall neu gelesen werden!
@@ -5334,17 +5334,17 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
                                     *pCapStNd->EndOfSectionNode(), -1 );
 
                     bool bTop = pTable->IsTopCaption();
-                    SwStartNode *pTblStNd = pTCntxt->GetTableNode();
+                    SwStartNode *pTableStNd = pTCntxt->GetTableNode();
 
-                    OSL_ENSURE( pTblStNd, "Wo ist der Tabellen-Node" );
-                    OSL_ENSURE( pTblStNd==pPam->GetNode().FindTableNode(),
+                    OSL_ENSURE( pTableStNd, "Wo ist der Tabellen-Node" );
+                    OSL_ENSURE( pTableStNd==pPam->GetNode().FindTableNode(),
                             "Stehen wir in der falschen Tabelle?" );
 
                     SwNode* pNd;
                     if( bTop )
-                        pNd = pTblStNd;
+                        pNd = pTableStNd;
                     else
-                        pNd = pTblStNd->EndOfSectionNode();
+                        pNd = pTableStNd->EndOfSectionNode();
                     SwNodeIndex aDstIdx( *pNd, bTop ? 0 : 1 );
 
                     pDoc->getIDocumentContentOperations().MoveNodeRange( aSrcRg, aDstIdx,
@@ -5357,7 +5357,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
                     // Tabellen-Node zeigen noch verschoben werden.
                     if( bTop )
                     {
-                        MovePageDescAttrs( pTblStNd, aSrcRg.aStart.GetIndex(),
+                        MovePageDescAttrs( pTableStNd, aSrcRg.aStart.GetIndex(),
                                            false );
                     }
                 }
@@ -5382,14 +5382,14 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
         {
             // oberen Absatz-Abstand einstellen
             bUpperSpace = true;
-            SetTxtCollAttrs();
+            SetTextCollAttrs();
 
             nParaCnt = nParaCnt - std::min(nParaCnt,
                 pTCntxt->GetTableNode()->GetTable().GetTabSortBoxes().size());
 
             // ggfs. eine Tabelle anspringen
             if( JUMPTO_TABLE == eJumpTo && pTable->GetSwTable() &&
-                pTable->GetSwTable()->GetFrmFmt()->GetName() == sJmpMark )
+                pTable->GetSwTable()->GetFrameFormat()->GetName() == sJmpMark )
             {
                 bChkJumpMark = true;
                 eJumpTo = JUMPTO_NONE;
@@ -5427,10 +5427,10 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
         pTable = 0;
     }
 
-    HTMLTable* pRetTbl = pSaveStruct->m_pCurrentTable;
+    HTMLTable* pRetTable = pSaveStruct->m_pCurrentTable;
     delete pSaveStruct;
 
-    return pRetTbl;
+    return pRetTable;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 8e5bda56276c..9b1158257ffe 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -89,7 +89,7 @@ public:
     SwHTMLWrtTable( const SwHTMLTableLayout *pLayoutInfo );
 
     void Write( SwHTMLWriter& rWrt, sal_Int16 eAlign=text::HoriOrientation::NONE,
-                bool bTHead=false, const SwFrmFmt *pFrmFmt=0,
+                bool bTHead=false, const SwFrameFormat *pFrameFormat=0,
                 const OUString *pCaption=0, bool bTopCaption=false,
                 sal_uInt16 nHSpace=0, sal_uInt16 nVSpace=0 ) const;
 };
@@ -141,7 +141,7 @@ bool SwHTMLWrtTable::HasTabBackground( const SwTableBox& rBox,
     if( rBox.GetSttNd() )
     {
         SvxBrushItem aBrushItem =
-            rBox.GetFrmFmt()->makeBackgroundBrushItem();
+            rBox.GetFrameFormat()->makeBackgroundBrushItem();
 
         /// The table box has a background, if its background color is not "no fill"/
         /// "auto fill" or it has a background graphic.
@@ -171,7 +171,7 @@ bool SwHTMLWrtTable::HasTabBackground( const SwTableLine& rLine,
     OSL_ENSURE( bTop || bBottom || bLeft || bRight,
             "HasTabBackground: darf nicht aufgerufen werden" );
 
-    SvxBrushItem aBrushItem = rLine.GetFrmFmt()->makeBackgroundBrushItem();
+    SvxBrushItem aBrushItem = rLine.GetFrameFormat()->makeBackgroundBrushItem();
     /// The table line has a background, if its background color is not "no fill"/
     /// "auto fill" or it has a background graphic.
     bool bRet = aBrushItem.GetColor() != COL_TRANSPARENT ||
@@ -213,7 +213,7 @@ static bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, bool *pBorders )
     else
     {
         const SvxBoxItem& rBoxItem =
-            static_cast<const SvxBoxItem&>(pBox->GetFrmFmt()->GetFmtAttr( RES_BOX ));
+            static_cast<const SvxBoxItem&>(pBox->GetFrameFormat()->GetFormatAttr( RES_BOX ));
 
         *pBorders = rBoxItem.GetTop() || rBoxItem.GetBottom() ||
                     rBoxItem.GetLeft() || rBoxItem.GetRight();
@@ -282,22 +282,22 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
         SwNode* pNd;
         while( !( pNd = rWrt.pDoc->GetNodes()[nNdPos])->IsEndNode() )
         {
-            if( pNd->IsTxtNode() )
+            if( pNd->IsTextNode() )
             {
                 // nur Absaetzte betrachten, an denen man was erkennt
                 // Das ist der Fall, wenn die Vorlage eine der Tabellen-Vorlagen
                 // ist oder von einer der beiden abgelitten ist.
-                const SwFmt *pFmt = &static_cast<SwTxtNode*>(pNd)->GetAnyFmtColl();
-                sal_uInt16 nPoolId = pFmt->GetPoolFmtId();
-                while( !pFmt->IsDefault() &&
+                const SwFormat *pFormat = &static_cast<SwTextNode*>(pNd)->GetAnyFormatColl();
+                sal_uInt16 nPoolId = pFormat->GetPoolFormatId();
+                while( !pFormat->IsDefault() &&
                        RES_POOLCOLL_TABLE_HDLN!=nPoolId &&
                        RES_POOLCOLL_TABLE!=nPoolId )
                 {
-                    pFmt = pFmt->DerivedFrom();
-                    nPoolId = pFmt->GetPoolFmtId();
+                    pFormat = pFormat->DerivedFrom();
+                    nPoolId = pFormat->GetPoolFormatId();
                 }
 
-                if( !pFmt->IsDefault() )
+                if( !pFormat->IsDefault() )
                 {
                     bHead = (RES_POOLCOLL_TABLE_HDLN==nPoolId);
                     break;
@@ -391,7 +391,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
             .append("=\"").append(static_cast<sal_Int32>(aPixelSz.Height())).append("\"");
     }
 
-    const SfxItemSet& rItemSet = pBox->GetFrmFmt()->GetAttrSet();
+    const SfxItemSet& rItemSet = pBox->GetFrameFormat()->GetAttrSet();
     const SfxPoolItem *pItem;
 
     // ALIGN wird jetzt nur noch an den Absaetzen ausgegeben
@@ -412,7 +412,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
 
     rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
-    rWrt.bTxtAttr = false;
+    rWrt.bTextAttr = false;
     rWrt.bOutOpts = true;
     const SvxBrushItem *pBrushItem = 0;
     if( SfxItemState::SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
@@ -431,28 +431,28 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
             OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
     }
 
-    rWrt.OutCSS1_TableCellBorderHack(*pBox->GetFrmFmt());
+    rWrt.OutCSS1_TableCellBorderHack(*pBox->GetFrameFormat());
 
-    sal_uInt32 nNumFmt = 0;
+    sal_uInt32 nNumFormat = 0;
     double nValue = 0.0;
-    bool bNumFmt = false, bValue = false;
+    bool bNumFormat = false, bValue = false;
     if( SfxItemState::SET==rItemSet.GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
     {
-        nNumFmt = static_cast<const SwTblBoxNumFormat *>(pItem)->GetValue();
-        bNumFmt = true;
+        nNumFormat = static_cast<const SwTableBoxNumFormat *>(pItem)->GetValue();
+        bNumFormat = true;
     }
     if( SfxItemState::SET==rItemSet.GetItemState( RES_BOXATR_VALUE, false, &pItem ) )
     {
-        nValue = static_cast<const SwTblBoxValue *>(pItem)->GetValue();
+        nValue = static_cast<const SwTableBoxValue *>(pItem)->GetValue();
         bValue = true;
-        if( !bNumFmt )
-            nNumFmt = pBox->GetFrmFmt()->GetTblBoxNumFmt().GetValue();
+        if( !bNumFormat )
+            nNumFormat = pBox->GetFrameFormat()->GetTableBoxNumFormat().GetValue();
     }
 
-    if( bNumFmt || bValue )
+    if( bNumFormat || bValue )
     {
         sOut.append(HTMLOutFuncs::CreateTableDataOptionsValNum(bValue, nValue,
-            nNumFmt, *rWrt.pDoc->GetNumberFormatter(), rWrt.eDestEnc,
+            nNumFormat, *rWrt.pDoc->GetNumberFormatter(), rWrt.eDestEnc,
             &rWrt.aNonConvertableCharacters));
     }
     sOut.append('>');
@@ -534,7 +534,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
     {
         rWrt.OutBackground( pBrushItem, false );
 
-        rWrt.bTxtAttr = false;
+        rWrt.bTextAttr = false;
         rWrt.bOutOpts = true;
         if( rWrt.bCfgOutStyles )
             OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
@@ -563,7 +563,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
 }
 
 void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
-                            bool bTHead, const SwFrmFmt *pFrmFmt,
+                            bool bTHead, const SwFrameFormat *pFrameFormat,
                             const OUString *pCaption, bool bTopCaption,
                             sal_uInt16 nHSpace, sal_uInt16 nVSpace ) const
 {
@@ -628,8 +628,8 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
     sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_table);
 
     sal_uInt16 nOldDirection = rWrt.nDirection;
-    if( pFrmFmt )
-        rWrt.nDirection = rWrt.GetHTMLDirection( pFrmFmt->GetAttrSet() );
+    if( pFrameFormat )
+        rWrt.nDirection = rWrt.GetHTMLDirection( pFrameFormat->GetAttrSet() );
     if( rWrt.bOutFlyFrame || nOldDirection != rWrt.nDirection )
     {
         rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
@@ -711,12 +711,12 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
     rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
     // Hintergrund ausgeben
-    if( pFrmFmt )
+    if( pFrameFormat )
     {
-        rWrt.OutBackground( pFrmFmt->GetAttrSet(), false );
+        rWrt.OutBackground( pFrameFormat->GetAttrSet(), false );
 
-        if( rWrt.bCfgOutStyles && pFrmFmt )
-            rWrt.OutCSS1_TableFrmFmtOptions( *pFrmFmt );
+        if( rWrt.bCfgOutStyles && pFrameFormat )
+            rWrt.OutCSS1_TableFrameFormatOptions( *pFrameFormat );
     }
 
     sOut.append('>');
@@ -884,12 +884,12 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
     rWrt.nDirection = nOldDirection;
 }
 
-Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
-                           const SwFrmFmt *pFlyFrmFmt,
+Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
+                           const SwFrameFormat *pFlyFrameFormat,
                            const OUString *pCaption, bool bTopCaption )
 {
 
-    SwTable& rTbl = rNode.GetTable();
+    SwTable& rTable = rNode.GetTable();
 
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
     rHTMLWrt.bOutTable = true;
@@ -903,21 +903,21 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
     long nFlyWidth = 0;
     sal_uInt16 nFlyHSpace = 0;
     sal_uInt16 nFlyVSpace = 0;
-    if( pFlyFrmFmt )
+    if( pFlyFrameFormat )
     {
-        eSurround = pFlyFrmFmt->GetSurround().GetSurround();
-        const SwFmtFrmSize& rFrmSize = pFlyFrmFmt->GetFrmSize();
+        eSurround = pFlyFrameFormat->GetSurround().GetSurround();
+        const SwFormatFrmSize& rFrmSize = pFlyFrameFormat->GetFrmSize();
         nFlyPrcWidth = rFrmSize.GetWidthPercent();
         nFlyWidth = rFrmSize.GetSize().Width();
 
-        eFlyHoriOri = pFlyFrmFmt->GetHoriOrient().GetHoriOrient();
+        eFlyHoriOri = pFlyFrameFormat->GetHoriOrient().GetHoriOrient();
         if( text::HoriOrientation::NONE == eFlyHoriOri )
             eFlyHoriOri = text::HoriOrientation::LEFT;
 
-        const SvxLRSpaceItem& rLRSpace = pFlyFrmFmt->GetLRSpace();
+        const SvxLRSpaceItem& rLRSpace = pFlyFrameFormat->GetLRSpace();
         nFlyHSpace = static_cast< sal_uInt16 >((rLRSpace.GetLeft() + rLRSpace.GetRight()) / 2);
 
-        const SvxULSpaceItem& rULSpace = pFlyFrmFmt->GetULSpace();
+        const SvxULSpaceItem& rULSpace = pFlyFrameFormat->GetULSpace();
         nFlyVSpace = (rULSpace.GetUpper() + rULSpace.GetLower()) / 2;
     }
 
@@ -930,14 +930,14 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
         rHTMLWrt.bPreserveForm = bPreserveForm;
     }
 
-    SwFrmFmt *pFmt = rTbl.GetFrmFmt();
+    SwFrameFormat *pFormat = rTable.GetFrameFormat();
 
-    const SwFmtFrmSize& rFrmSize = pFmt->GetFrmSize();
+    const SwFormatFrmSize& rFrmSize = pFormat->GetFrmSize();
     long nWidth = rFrmSize.GetSize().Width();
     sal_uInt8 nPrcWidth = rFrmSize.GetWidthPercent();
     sal_uInt16 nBaseWidth = (sal_uInt16)nWidth;
 
-    sal_Int16 eTabHoriOri = pFmt->GetHoriOrient().GetHoriOrient();
+    sal_Int16 eTabHoriOri = pFormat->GetHoriOrient().GetHoriOrient();
 
     // text::HoriOrientation::NONE und text::HoriOrientation::FULL Tabellen benoetigen relative Breiten
     sal_uInt16 nNewDefListLvl = 0;
@@ -954,7 +954,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
         break;
     case text::HoriOrientation::NONE:
         {
-            const SvxLRSpaceItem& aLRItem = pFmt->GetLRSpace();
+            const SvxLRSpaceItem& aLRItem = pFormat->GetLRSpace();
             if( aLRItem.GetRight() )
             {
                 // Die Tabellenbreite wird anhand des linken und rechten
@@ -962,7 +962,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
                 // tatsaechliche Breite der Tabelle zu bestimmen. Wenn
                 // das nicht geht, machen wir eine 100% breite Tabelle
                 // draus.
-                nWidth = pFmt->FindLayoutRect(true).Width();
+                nWidth = pFormat->FindLayoutRect(true).Width();
                 if( !nWidth )
                 {
                     bRelWidths = true;
@@ -981,7 +981,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
                 // Ohne rechten Rand bleibt auch eine absolute Breite erhalten
                 // Wir versuchen aber trotzdem ueber das Layout die
                 // tatsachliche Breite zu ermitteln.
-                long nRealWidth = pFmt->FindLayoutRect(true).Width();
+                long nRealWidth = pFormat->FindLayoutRect(true).Width();
                 if( nRealWidth )
                     nWidth = nRealWidth;
             }
@@ -1008,7 +1008,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
         OSL_ENSURE( !rHTMLWrt.GetNumInfo().GetNumRule() ||
                 rHTMLWrt.GetNextNumInfo(),
                 "NumInfo fuer naechsten Absatz fehlt!" );
-        const SvxLRSpaceItem& aLRItem = pFmt->GetLRSpace();
+        const SvxLRSpaceItem& aLRItem = pFormat->GetLRSpace();
         if( aLRItem.GetLeft() > 0 && rHTMLWrt.nDefListMargin > 0 &&
             ( !rHTMLWrt.GetNumInfo().GetNumRule() ||
               ( rHTMLWrt.GetNextNumInfo() &&
@@ -1027,7 +1027,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
         }
     }
 
-    if( !pFlyFrmFmt && nNewDefListLvl != rHTMLWrt.nDefListLvl )
+    if( !pFlyFrameFormat && nNewDefListLvl != rHTMLWrt.nDefListLvl )
         rHTMLWrt.OutAndSetDefList( nNewDefListLvl );
 
     if( nNewDefListLvl )
@@ -1084,8 +1084,8 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
     if( text::HoriOrientation::NONE==eTabHoriOri )
         nFlyHSpace = nFlyVSpace = 0;
 
-    if( !pFmt->GetName().isEmpty() )
-        rHTMLWrt.OutImplicitMark( pFmt->GetName(), "table" );
+    if( !pFormat->GetName().isEmpty() )
+        rHTMLWrt.OutImplicitMark( pFormat->GetName(), "table" );
 
     if( text::HoriOrientation::NONE!=eDivHoriOri )
     {
@@ -1108,7 +1108,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
     if( text::HoriOrientation::NONE==eTabHoriOri )
         rHTMLWrt.bLFPossible = true;
 
-    const SwHTMLTableLayout *pLayout = rTbl.GetHTMLTableLayout();
+    const SwHTMLTableLayout *pLayout = rTable.GetHTMLTableLayout();
 
 #ifdef DBG_UTIL
     {
@@ -1121,16 +1121,16 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
     if( pLayout && pLayout->IsExportable() )
     {
         SwHTMLWrtTable aTableWrt( pLayout );
-        aTableWrt.Write( rHTMLWrt, eTabHoriOri, rTbl.GetRowsToRepeat() > 0,
-                         pFmt, pCaption, bTopCaption,
+        aTableWrt.Write( rHTMLWrt, eTabHoriOri, rTable.GetRowsToRepeat() > 0,
+                         pFormat, pCaption, bTopCaption,
                          nFlyHSpace, nFlyVSpace );
     }
     else
     {
-        SwHTMLWrtTable aTableWrt( rTbl.GetTabLines(), nWidth,
-                                  nBaseWidth, bRelWidths, 0, 0, rTbl.GetRowsToRepeat() );
-        aTableWrt.Write( rHTMLWrt, eTabHoriOri, rTbl.GetRowsToRepeat() > 0,
-                         pFmt, pCaption, bTopCaption,
+        SwHTMLWrtTable aTableWrt( rTable.GetTabLines(), nWidth,
+                                  nBaseWidth, bRelWidths, 0, 0, rTable.GetRowsToRepeat() );
+        aTableWrt.Write( rHTMLWrt, eTabHoriOri, rTable.GetRowsToRepeat() > 0,
+                         pFormat, pCaption, bTopCaption,
                          nFlyHSpace, nFlyVSpace );
     }
 
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 084289c1bbe9..3f5ec0c27726 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -253,7 +253,7 @@ struct SvxCSS1ItemIds
     sal_uInt16 nAdjust;
     sal_uInt16 nWidows;
     sal_uInt16 nOrphans;
-    sal_uInt16 nFmtSplit;
+    sal_uInt16 nFormatSplit;
 
     sal_uInt16 nLRSpace;
     sal_uInt16 nULSpace;
@@ -739,7 +739,7 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_
     aItemIds.nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, false );
     aItemIds.nWidows = rPool.GetTrueWhich( SID_ATTR_PARA_WIDOWS, false );
     aItemIds.nOrphans = rPool.GetTrueWhich( SID_ATTR_PARA_ORPHANS, false );
-    aItemIds.nFmtSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, false );
+    aItemIds.nFormatSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, false );
 
     aItemIds.nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, false );
     aItemIds.nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, false );
@@ -752,10 +752,10 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_
     aItemIds.nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, false );
 
     aWhichMap.insert( aWhichMap.begin(), 0 );
-    SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16 *>(&aItemIds),
+    SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16 *>(&aItemIds),
                              sizeof(aItemIds) / sizeof(sal_uInt16) );
     if( pWhichIds && nWhichIds )
-        SvParser::BuildWhichTbl( aWhichMap, pWhichIds, nWhichIds );
+        SvParser::BuildWhichTable( aWhichMap, pWhichIds, nWhichIds );
 
     pSheetItemSet = new SfxItemSet( rPool, &aWhichMap[0] );
     pSheetPropInfo = new SvxCSS1PropertyInfo;
@@ -970,7 +970,7 @@ void SvxCSS1Parser::MergeStyles( const SfxItemSet& rSrcSet,
             if( rSrcInfo.bRightMargin )
                 aLRSpace.SetRight( rNewLRSpace.GetRight() );
             if( rSrcInfo.bTextIndent )
-                aLRSpace.SetTxtFirstLineOfst( rNewLRSpace.GetTxtFirstLineOfst() );
+                aLRSpace.SetTextFirstLineOfst( rNewLRSpace.GetTextFirstLineOfst() );
 
             rTargetSet.Put( aLRSpace );
         }
@@ -2005,13 +2005,13 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr,
                                                    &pItem ) )
         {
             SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) );
-            aLRItem.SetTxtFirstLineOfst( nIndent );
+            aLRItem.SetTextFirstLineOfst( nIndent );
             rItemSet.Put( aLRItem );
         }
         else
         {
             SvxLRSpaceItem aLRItem( aItemIds.nLRSpace );
-            aLRItem.SetTxtFirstLineOfst( nIndent );
+            aLRItem.SetTextFirstLineOfst( nIndent );
             rItemSet.Put( aLRItem );
         }
         rPropInfo.bTextIndent = true;
@@ -2060,13 +2060,13 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr,
                                                    &pItem ) )
         {
             SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) );
-            aLRItem.SetTxtLeft( (sal_uInt16)nLeft );
+            aLRItem.SetTextLeft( (sal_uInt16)nLeft );
             rItemSet.Put( aLRItem );
         }
         else
         {
             SvxLRSpaceItem aLRItem( aItemIds.nLRSpace );
-            aLRItem.SetTxtLeft( (sal_uInt16)nLeft );
+            aLRItem.SetTextLeft( (sal_uInt16)nLeft );
             rItemSet.Put( aLRItem );
         }
         rPropInfo.bLeftMargin = true;
@@ -2998,7 +2998,7 @@ static void ParseCSS1_page_break_inside( const CSS1Expression *pExpr,
     }
 
     if( bSetSplit )
-        rItemSet.Put( SvxFmtSplitItem( bSplit, aItemIds.nFmtSplit ) );
+        rItemSet.Put( SvxFormatSplitItem( bSplit, aItemIds.nFormatSplit ) );
 }
 
 static void ParseCSS1_widows( const CSS1Expression *pExpr,
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index 5789844db5ce..9beac833570d 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -25,10 +25,10 @@
 #include "svxcss1.hxx"
 
 class SwDoc;
-class SwCharFmt;
-class SwTxtFmtColl;
+class SwCharFormat;
+class SwTextFormatColl;
 class SvxBrushItem;
-class SwFmtDrop;
+class SwFormatDrop;
 class SwPageDesc;
 
 // Dieser Header seiht zwar harmlos aus, included aber eben doch
@@ -54,18 +54,18 @@ class SwCSS1Parser : public SvxCSS1Parser
     bool bSetFirstPageDesc : 1;
     bool bSetRightPageDesc : 1;
 
-    bool bTableHeaderTxtCollSet : 1;
-    bool bTableTxtCollSet : 1;
+    bool bTableHeaderTextCollSet : 1;
+    bool bTableTextCollSet : 1;
 
-    bool bLinkCharFmtsSet : 1;
+    bool bLinkCharFormatsSet : 1;
 
     // die Vorlagen fuer DL anlegen
-    SwTxtFmtColl* GetDefListTxtFmtColl( sal_uInt16 nCollId, sal_uInt16 nDeep );
+    SwTextFormatColl* GetDefListTextFormatColl( sal_uInt16 nCollId, sal_uInt16 nDeep );
 
     const SwPageDesc* GetPageDesc( sal_uInt16 nPoolId, bool bCreate );
 
-    void SetTableTxtColl( bool bHeader );
-    void SetLinkCharFmts();
+    void SetTableTextColl( bool bHeader );
+    void SetLinkCharFormats();
 
 protected:
     virtual bool StyleParsed( const CSS1Selector *pSelector,
@@ -88,15 +88,15 @@ public:
 
     // das Zeichen-Format zu einem Token und einer ggf leeren Klasse
     // ermitteln
-    SwCharFmt* GetChrFmt( sal_uInt16 nToken, const OUString& rClass ) const;
+    SwCharFormat* GetChrFormat( sal_uInt16 nToken, const OUString& rClass ) const;
 
-    // eine TextFmtColl zu einer Pool-Id ermitteln
-    SwTxtFmtColl *GetTxtFmtColl( sal_uInt16 nTxtColl, const OUString& rClass );
+    // eine TextFormatColl zu einer Pool-Id ermitteln
+    SwTextFormatColl *GetTextFormatColl( sal_uInt16 nTextColl, const OUString& rClass );
 
     // This methods do the same as the one of SwDoc, but change the
     // encoding if required.
-    SwTxtFmtColl *GetTxtCollFromPool( sal_uInt16 nPoolId ) const;
-    SwCharFmt *GetCharFmtFromPool( sal_uInt16 nPoolId ) const;
+    SwTextFormatColl *GetTextCollFromPool( sal_uInt16 nPoolId ) const;
+    SwCharFormat *GetCharFormatFromPool( sal_uInt16 nPoolId ) const;
 
     // Die linke oder rechte Seiten-Vorlage holen. In Dokumenten mit nur
     // einer Vorlage gibt es nur eine rechtee Seite.
@@ -122,15 +122,15 @@ public:
                            const SvxCSS1PropertyInfo& rPropInfo );
 
     // Fuellen eines DropCap-Attributs
-    void FillDropCap( SwFmtDrop& rDrop, SfxItemSet& rItemSet,
+    void FillDropCap( SwFormatDrop& rDrop, SfxItemSet& rItemSet,
                       const OUString *pName=0 );
 
-    bool SetFmtBreak( SfxItemSet& rItemSet,
+    bool SetFormatBreak( SfxItemSet& rItemSet,
                       const SvxCSS1PropertyInfo& rPropInfo );
 
-    static void AddClassName( OUString& rFmtName, const OUString& rClass );
+    static void AddClassName( OUString& rFormatName, const OUString& rClass );
 
-    static inline void AddFirstLetterExt( OUString& rFmtName );
+    static inline void AddFirstLetterExt( OUString& rFormatName );
 
     static bool MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
                                  bool bAutoWidth=false );
@@ -163,9 +163,9 @@ public:
     virtual void SetDfltEncoding( rtl_TextEncoding eEnc ) SAL_OVERRIDE;
 };
 
-inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFmtName )
+inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFormatName )
 {
-    rFmtName += ".FL";   // first letter
+    rFormatName += ".FL";   // first letter
 }
 
 inline const SwPageDesc* SwCSS1Parser::GetFirstPageDesc( bool bCreate )
@@ -185,20 +185,20 @@ inline const SwPageDesc* SwCSS1Parser::GetLeftPageDesc( bool bCreate )
 
 inline void SwCSS1Parser::SetTHTagStyles()
 {
-    if( !bTableHeaderTxtCollSet )
-        SetTableTxtColl( true );
+    if( !bTableHeaderTextCollSet )
+        SetTableTextColl( true );
 }
 
 inline void SwCSS1Parser::SetTDTagStyles()
 {
-    if( !bTableTxtCollSet )
-        SetTableTxtColl( false );
+    if( !bTableTextCollSet )
+        SetTableTextColl( false );
 }
 
 inline void SwCSS1Parser::SetATagStyles()
 {
-    if( !bLinkCharFmtsSet )
-        SetLinkCharFmts();
+    if( !bLinkCharFormatsSet )
+        SetLinkCharFormats();
 }
 
 inline void SwCSS1Parser::SetDelayedStyles()
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 90ac4505f5c5..4ab6dee8fda1 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -197,13 +197,13 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam,
 
     if( !bInsertMode )
     {
-        Reader::ResetFrmFmts( rDoc );
+        Reader::ResetFrameFormats( rDoc );
 
         // Die HTML-Seitenvorlage setzen, wenn des kein HTML-Dokument ist,
         // sonst ist sie schon gesetzt.
         if( !rDoc.getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) )
         {
-            rDoc.getIDocumentContentOperations().InsertPoolItem( rPam, SwFmtPageDesc(
+            rDoc.getIDocumentContentOperations().InsertPoolItem( rPam, SwFormatPageDesc(
                 rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_HTML, false )) );
         }
     }
@@ -335,7 +335,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
 
         // #i18732# - adjust default of option 'FollowTextFlow'
         // TODO: not sure what the appropriate default for HTML should be?
-        pDoc->SetDefault( SwFmtFollowTextFlow(true) );
+        pDoc->SetDefault( SwFormatFollowTextFlow(true) );
     }
 
     // Waehrend des Imports in den HTML-Modus schalten, damit die
@@ -529,8 +529,8 @@ SvParserState SwHTMLParser::CallParser()
         aInsertionRangePam.Move( fnMoveBackward );
         pDoc->getIDocumentRedlineAccess().SplitRedline( aInsertionRangePam );
 
-        pDoc->SetTxtFmtColl( *pPam,
-                pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+        pDoc->SetTextFormatColl( *pPam,
+                pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
     }
 
     if( GetMedium() )
@@ -642,11 +642,11 @@ void SwHTMLParser::Continue( int nToken )
             if( !aScriptSource.isEmpty() )
             {
                 SwScriptFieldType *pType =
-                    static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_SCRIPTFLD ));
+                    static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_SCRIPTFLD ));
 
-                SwScriptField aFld( pType, aScriptType, aScriptSource,
+                SwScriptField aField( pType, aScriptType, aScriptSource,
                                     false );
-                InsertAttr( SwFmtFld( aFld ) );
+                InsertAttr( SwFormatField( aField ) );
             }
 
             if( pAppletImpl )
@@ -689,16 +689,16 @@ void SwHTMLParser::Continue( int nToken )
         // den Start wieder korrigieren
         if( !IsNewDoc() && pSttNdIdx->GetIndex() )
         {
-            SwTxtNode* pTxtNode = pSttNdIdx->GetNode().GetTxtNode();
+            SwTextNode* pTextNode = pSttNdIdx->GetNode().GetTextNode();
             SwNodeIndex aNxtIdx( *pSttNdIdx );
-            if( pTxtNode && pTxtNode->CanJoinNext( &aNxtIdx ))
+            if( pTextNode && pTextNode->CanJoinNext( &aNxtIdx ))
             {
-                const sal_Int32 nStt = pTxtNode->GetTxt().getLength();
+                const sal_Int32 nStt = pTextNode->GetText().getLength();
                 // wenn der Cursor noch in dem Node steht, dann setze in an das Ende
                 if( pPam->GetPoint()->nNode == aNxtIdx )
                 {
                     pPam->GetPoint()->nNode = *pSttNdIdx;
-                    pPam->GetPoint()->nContent.Assign( pTxtNode, nStt );
+                    pPam->GetPoint()->nContent.Assign( pTextNode, nStt );
                 }
 
 #if OSL_DEBUG_LEVEL > 0
@@ -711,23 +711,23 @@ OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( false ).nNode.GetIndex(),
 if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( true ).nNode.GetIndex() )
 {
     const sal_Int32 nCntPos = pPam->GetBound( true ).nContent.GetIndex();
-    pPam->GetBound( true ).nContent.Assign( pTxtNode,
-                    pTxtNode->GetTxt().getLength() + nCntPos );
+    pPam->GetBound( true ).nContent.Assign( pTextNode,
+                    pTextNode->GetText().getLength() + nCntPos );
 }
 if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
 {
     const sal_Int32 nCntPos = pPam->GetBound( false ).nContent.GetIndex();
-    pPam->GetBound( false ).nContent.Assign( pTxtNode,
-                    pTxtNode->GetTxt().getLength() + nCntPos );
+    pPam->GetBound( false ).nContent.Assign( pTextNode,
+                    pTextNode->GetText().getLength() + nCntPos );
 }
 #endif
                 // Zeichen Attribute beibehalten!
-                SwTxtNode* pDelNd = aNxtIdx.GetNode().GetTxtNode();
-                if (pTxtNode->GetTxt().getLength())
-                    pDelNd->FmtToTxtAttr( pTxtNode );
+                SwTextNode* pDelNd = aNxtIdx.GetNode().GetTextNode();
+                if (pTextNode->GetText().getLength())
+                    pDelNd->FormatToTextAttr( pTextNode );
                 else
-                    pTxtNode->ChgFmtColl( pDelNd->GetTxtColl() );
-                pTxtNode->JoinNext();
+                    pTextNode->ChgFormatColl( pDelNd->GetTextColl() );
+                pTextNode->JoinNext();
             }
         }
     }
@@ -745,7 +745,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
         SwPosition* pPos = pPam->GetPoint();
         if( !pPos->nContent.GetIndex() && !bLFStripped )
         {
-            SwTxtNode* pAktNd;
+            SwTextNode* pAktNd;
             sal_uLong nNodeIdx = pPos->nNode.GetIndex();
 
             bool bHasFlysOrMarks =
@@ -755,11 +755,11 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
             {
                 const SwNode *pPrev = pDoc->GetNodes()[nNodeIdx -1];
                 if( !pPam->GetPoint()->nContent.GetIndex() &&
-                    ( pPrev->IsCntntNode() ||
+                    ( pPrev->IsContentNode() ||
                       (pPrev->IsEndNode() &&
                       pPrev->StartOfSectionNode()->IsSectionNode()) ) )
                 {
-                    SwCntntNode* pCNd = pPam->GetCntntNode();
+                    SwContentNode* pCNd = pPam->GetContentNode();
                     if( pCNd && pCNd->StartOfSectionIndex()+2 <
                         pCNd->EndOfSectionIndex() && !bHasFlysOrMarks )
                     {
@@ -781,16 +781,16 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
                     }
                 }
             }
-            else if( 0 != ( pAktNd = pDoc->GetNodes()[ nNodeIdx ]->GetTxtNode()) && !bHasFlysOrMarks )
+            else if( 0 != ( pAktNd = pDoc->GetNodes()[ nNodeIdx ]->GetTextNode()) && !bHasFlysOrMarks )
             {
                 if( pAktNd->CanJoinNext( &pPos->nNode ))
                 {
-                    SwTxtNode* pNextNd = pPos->nNode.GetNode().GetTxtNode();
+                    SwTextNode* pNextNd = pPos->nNode.GetNode().GetTextNode();
                     pPos->nContent.Assign( pNextNd, 0 );
                     pPam->SetMark(); pPam->DeleteMark();
                     pNextNd->JoinPrev();
                 }
-                else if (pAktNd->GetTxt().isEmpty())
+                else if (pAktNd->GetText().isEmpty())
                 {
                     pPos->nContent.Assign( 0, 0 );
                     pPam->SetMark(); pPam->DeleteMark();
@@ -805,31 +805,31 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
         {
             if( pPos->nContent.GetIndex() )     // dann gabs am Ende kein <P>,
                 pPam->Move( fnMoveForward, fnGoNode );  // als zum naechsten Node
-            SwTxtNode* pTxtNode = pPos->nNode.GetNode().GetTxtNode();
+            SwTextNode* pTextNode = pPos->nNode.GetNode().GetTextNode();
             SwNodeIndex aPrvIdx( pPos->nNode );
-            if( pTxtNode && pTxtNode->CanJoinPrev( &aPrvIdx ) &&
+            if( pTextNode && pTextNode->CanJoinPrev( &aPrvIdx ) &&
                 *pSttNdIdx <= aPrvIdx )
             {
                 // eigentlich muss hier ein JoinNext erfolgen, aber alle Cursor
-                // usw. sind im pTxtNode angemeldet, so dass der bestehen
+                // usw. sind im pTextNode angemeldet, so dass der bestehen
                 // bleiben MUSS.
 
                 // Absatz in Zeichen-Attribute umwandeln, aus dem Prev die
                 // Absatzattribute und die Vorlage uebernehmen!
-                SwTxtNode* pPrev = aPrvIdx.GetNode().GetTxtNode();
-                pTxtNode->ChgFmtColl( pPrev->GetTxtColl() );
-                pTxtNode->FmtToTxtAttr( pPrev );
-                pTxtNode->ResetAllAttr();
+                SwTextNode* pPrev = aPrvIdx.GetNode().GetTextNode();
+                pTextNode->ChgFormatColl( pPrev->GetTextColl() );
+                pTextNode->FormatToTextAttr( pPrev );
+                pTextNode->ResetAllAttr();
 
                 if( pPrev->HasSwAttrSet() )
-                    pTxtNode->SetAttr( *pPrev->GetpSwAttrSet() );
+                    pTextNode->SetAttr( *pPrev->GetpSwAttrSet() );
 
                 if( &pPam->GetBound(true).nNode.GetNode() == pPrev )
-                    pPam->GetBound(true).nContent.Assign( pTxtNode, 0 );
+                    pPam->GetBound(true).nContent.Assign( pTextNode, 0 );
                 if( &pPam->GetBound(false).nNode.GetNode() == pPrev )
-                    pPam->GetBound(false).nContent.Assign( pTxtNode, 0 );
+                    pPam->GetBound(false).nContent.Assign( pTextNode, 0 );
 
-                pTxtNode->JoinPrev();
+                pTextNode->JoinPrev();
             }
         }
 
@@ -1274,7 +1274,7 @@ void SwHTMLParser::NextToken( int nToken )
 
             if( pPageDesc )
             {
-                pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFmtPageDesc( pPageDesc ) );
+                pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFormatPageDesc( pPageDesc ) );
             }
         }
         break;
@@ -1419,9 +1419,9 @@ void SwHTMLParser::NextToken( int nToken )
             if( HTML_NEWPARA==nToken ||
                 pPam->GetPoint()->nContent.GetIndex() )
             {
-                AppendTxtNode(); // there is no LF at this place
+                AppendTextNode(); // there is no LF at this place
                                  // therefore it will cause no problems
-                SetTxtCollAttrs();
+                SetTextCollAttrs();
             }
             // progress bar
             if( !GetMedium() || !GetMedium()->IsRemote() )
@@ -1439,10 +1439,10 @@ void SwHTMLParser::NextToken( int nToken )
 
     case HTML_LINEFEEDCHAR:
         if( pPam->GetPoint()->nContent.GetIndex() )
-            AppendTxtNode();
+            AppendTextNode();
         if( !pTable && !pDoc->IsInHeaderFooter( pPam->GetPoint()->nNode ) )
         {
-            NewAttr( &aAttrTab.pBreak, SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
+            NewAttr( &aAttrTab.pBreak, SvxFormatBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
             EndAttr( aAttrTab.pBreak, 0, false );
         }
         break;
@@ -1455,7 +1455,7 @@ void SwHTMLParser::NextToken( int nToken )
             if( nPos )
             {
                 const OUString& rText =
-                    pPam->GetPoint()->nNode.GetNode().GetTxtNode()->GetTxt();
+                    pPam->GetPoint()->nNode.GetNode().GetTextNode()->GetText();
                 sal_Unicode cLast = rText[--nPos];
                 if( ' ' == cLast || '\x0a' == cLast)
                     aToken = aToken.copy(1);
@@ -1605,27 +1605,27 @@ void SwHTMLParser::NextToken( int nToken )
     case HTML_ADDRESS_ON:
         if( nOpenParaToken )
             EndPara();
-        NewTxtFmtColl( HTML_ADDRESS_ON, RES_POOLCOLL_SENDADRESS );
+        NewTextFormatColl( HTML_ADDRESS_ON, RES_POOLCOLL_SENDADRESS );
         break;
 
     case HTML_ADDRESS_OFF:
         if( nOpenParaToken )
             EndPara();
-        EndTxtFmtColl( HTML_ADDRESS_OFF );
+        EndTextFormatColl( HTML_ADDRESS_OFF );
         break;
 
     case HTML_BLOCKQUOTE_ON:
     case HTML_BLOCKQUOTE30_ON:
         if( nOpenParaToken )
             EndPara();
-        NewTxtFmtColl( HTML_BLOCKQUOTE_ON, RES_POOLCOLL_HTML_BLOCKQUOTE );
+        NewTextFormatColl( HTML_BLOCKQUOTE_ON, RES_POOLCOLL_HTML_BLOCKQUOTE );
         break;
 
     case HTML_BLOCKQUOTE_OFF:
     case HTML_BLOCKQUOTE30_OFF:
         if( nOpenParaToken )
             EndPara();
-        EndTxtFmtColl( HTML_BLOCKQUOTE_ON );
+        EndTextFormatColl( HTML_BLOCKQUOTE_ON );
         break;
 
     case HTML_PREFORMTXT_ON:
@@ -1633,17 +1633,17 @@ void SwHTMLParser::NextToken( int nToken )
     case HTML_XMP_ON:
         if( nOpenParaToken )
             EndPara();
-        NewTxtFmtColl( nToken, RES_POOLCOLL_HTML_PRE );
+        NewTextFormatColl( nToken, RES_POOLCOLL_HTML_PRE );
         break;
 
     case HTML_PREFORMTXT_OFF:
         bNoParSpace = true; // the last PRE-paragraph gets a spacing
-        EndTxtFmtColl( HTML_PREFORMTXT_OFF );
+        EndTextFormatColl( HTML_PREFORMTXT_OFF );
         break;
 
     case HTML_LISTING_OFF:
     case HTML_XMP_OFF:
-        EndTxtFmtColl( nToken );
+        EndTextFormatColl( nToken );
         break;
 
     case HTML_HEAD1_ON:
@@ -1852,7 +1852,7 @@ void SwHTMLParser::NextToken( int nToken )
     case HTML_DELETEDTEXT_ON:
 
     case HTML_TELETYPE_ON:
-        NewCharFmt( nToken );
+        NewCharFormat( nToken );
         break;
 
     case HTML_SDFIELD_ON:
@@ -2086,7 +2086,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
     }
 }
 
-bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
+bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
 {
     // Ein harter Zeilen-Umbruch am Ende muss immer entfernt werden.
     // Einen zweiten ersetzen wir durch einen Absatz-Abstand.
@@ -2100,11 +2100,11 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
 
     if( AM_SPACE==eMode || AM_NOSPACE==eMode )
     {
-        SwTxtNode *pTxtNode =
-            pPam->GetPoint()->nNode.GetNode().GetTxtNode();
+        SwTextNode *pTextNode =
+            pPam->GetPoint()->nNode.GetNode().GetTextNode();
 
         const SvxULSpaceItem& rULSpace =
-            static_cast<const SvxULSpaceItem&>(pTxtNode->SwCntntNode::GetAttr( RES_UL_SPACE ));
+            static_cast<const SvxULSpaceItem&>(pTextNode->SwContentNode::GetAttr( RES_UL_SPACE ));
 
         bool bChange = AM_NOSPACE==eMode ? rULSpace.GetLower() > 0
                                          : rULSpace.GetLower() == 0;
@@ -2112,7 +2112,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
         if( bChange )
         {
             const SvxULSpaceItem& rCollULSpace =
-                pTxtNode->GetAnyFmtColl().GetULSpace();
+                pTextNode->GetAnyFormatColl().GetULSpace();
 
             bool bMayReset = AM_NOSPACE==eMode ? rCollULSpace.GetLower() == 0
                                                : rCollULSpace.GetLower() > 0;
@@ -2120,11 +2120,11 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
             if( bMayReset &&
                 rCollULSpace.GetUpper() == rULSpace.GetUpper() )
             {
-                pTxtNode->ResetAttr( RES_UL_SPACE );
+                pTextNode->ResetAttr( RES_UL_SPACE );
             }
             else
             {
-                pTxtNode->SetAttr(
+                pTextNode->SetAttr(
                     SvxULSpaceItem( rULSpace.GetUpper(),
                          AM_NOSPACE==eMode ? 0 : HTML_PARSPACE, RES_UL_SPACE ) );
             }
@@ -2134,7 +2134,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
 
     SwPosition aOldPos( *pPam->GetPoint() );
 
-    bool bRet = pDoc->getIDocumentContentOperations().AppendTxtNode( *pPam->GetPoint() );
+    bool bRet = pDoc->getIDocumentContentOperations().AppendTextNode( *pPam->GetPoint() );
 
     // Zeichen-Attribute aufspalten und ggf keine setzen, die ueber den
     // ganzen Absatz gesetzt sind
@@ -2162,7 +2162,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
                         pAttr->GetSttPara() == rEndIdx &&
                         pAttr->GetSttCnt() == 0;
 
-                    sal_Int32 nStt = pAttr->nSttCntnt;
+                    sal_Int32 nStt = pAttr->nSttContent;
                     bool bScript = false, bFont = false;
                     sal_uInt16 nScriptItem;
                     bool bInsert = true;
@@ -2171,24 +2171,24 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
                         // den besehrigen Teil setzen
                     if( bInsert && bScript )
                     {
-                        const SwTxtNode *pTxtNd =
-                            pAttr->GetSttPara().GetNode().GetTxtNode();
-                        OSL_ENSURE( pTxtNd, "No text node" );
-                        if( pTxtNd )
+                        const SwTextNode *pTextNd =
+                            pAttr->GetSttPara().GetNode().GetTextNode();
+                        OSL_ENSURE( pTextNd, "No text node" );
+                        if( pTextNd )
                         {
-                            const OUString& rText = pTxtNd->GetTxt();
-                            sal_uInt16 nScriptTxt =
+                            const OUString& rText = pTextNd->GetText();
+                            sal_uInt16 nScriptText =
                                 g_pBreakIt->GetBreakIter()->getScriptType(
                                             rText, pAttr->GetSttCnt() );
                             sal_Int32 nScriptEnd = g_pBreakIt->GetBreakIter()
-                                    ->endOfScript( rText, nStt, nScriptTxt );
+                                    ->endOfScript( rText, nStt, nScriptText );
                             while( nScriptEnd < nEndCnt )
                             {
-                                if( nScriptItem == nScriptTxt )
+                                if( nScriptItem == nScriptText )
                                 {
                                     _HTMLAttr *pSetAttr =
                                         pAttr->Clone( rEndIdx, nScriptEnd );
-                                    pSetAttr->nSttCntnt = nStt;
+                                    pSetAttr->nSttContent = nStt;
                                     pSetAttr->ClearPrev();
                                     if( !pNext || bWholePara )
                                     {
@@ -2201,19 +2201,19 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
                                         pNext->InsertPrev( pSetAttr );
                                 }
                                 nStt = nScriptEnd;
-                                nScriptTxt = g_pBreakIt->GetBreakIter()->getScriptType(
+                                nScriptText = g_pBreakIt->GetBreakIter()->getScriptType(
                                                 rText, nStt );
                                 nScriptEnd = g_pBreakIt->GetBreakIter()
-                                    ->endOfScript( rText, nStt, nScriptTxt );
+                                    ->endOfScript( rText, nStt, nScriptText );
                             }
-                            bInsert = nScriptItem == nScriptTxt;
+                            bInsert = nScriptItem == nScriptText;
                         }
                     }
                     if( bInsert )
                     {
                         _HTMLAttr *pSetAttr =
                             pAttr->Clone( rEndIdx, nEndCnt );
-                        pSetAttr->nSttCntnt = nStt;
+                        pSetAttr->nSttContent = nStt;
 
                         // Wenn das Attribut den gesamten Absatz umspannt, werden
                         // alle auesseren Attribute nicht mehr beachtet. Deshalb
@@ -2265,7 +2265,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
             SetNodeNum( nLvl, false );
         }
         else
-            pPam->GetNode().GetTxtNode()->ResetAttr( RES_PARATR_NUMRULE );
+            pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE );
     }
 
     // Attrubute im Absatz davor sollte man jetzt setzen (wegen JavaScript)
@@ -2273,10 +2273,10 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
 
     // Now it is time to get rid of all script dependent hints that are
     // equal to the settings in the style
-    SwTxtNode *pTxtNd = rEndIdx.GetNode().GetTxtNode();
-    OSL_ENSURE( pTxtNd, "There is the txt node" );
-    size_t nCntAttr = (pTxtNd  && pTxtNd->GetpSwpHints())
-                            ? pTxtNd->GetSwpHints().Count() : 0;
+    SwTextNode *pTextNd = rEndIdx.GetNode().GetTextNode();
+    OSL_ENSURE( pTextNd, "There is the txt node" );
+    size_t nCntAttr = (pTextNd  && pTextNd->GetpSwpHints())
+                            ? pTextNd->GetSwpHints().Count() : 0;
     if( nCntAttr )
     {
         // These are the end position of all script depenent hints.
@@ -2288,10 +2288,10 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
         // is remembered.
         sal_Int32 aEndPos[15] =
             { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        SwpHints& rHints = pTxtNd->GetSwpHints();
+        SwpHints& rHints = pTextNd->GetSwpHints();
         for( size_t i=0; i < nCntAttr; i++ )
         {
-            SwTxtAttr *pHt = rHints.GetTextHint( i );
+            SwTextAttr *pHt = rHints.GetTextHint( i );
             sal_uInt16 nWhich = pHt->Which();
             sal_Int16 nIdx = -1;
             //In 'hintids.hxx', the following five attributes don't follow
@@ -2347,7 +2347,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
                 {
                     bool bFont = (nIdx % 5) == 0;
                     const SfxPoolItem& rItem =
-                        static_cast<const SwCntntNode *>(pTxtNd)->GetAttr( nWhich );
+                        static_cast<const SwContentNode *>(pTextNd)->GetAttr( nWhich );
                     if( bFont ? swhtml_css1atr_equalFontItems(rItem,pHt->GetAttr())
                               : rItem == pHt->GetAttr() )
                     {
@@ -2357,7 +2357,7 @@ bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
                         // also delete the SwpHints!!! To avoid any trouble
                         // we leave the loop immediately if this is the last
                         // hint.
-                        pTxtNd->DeleteAttribute( pHt );
+                        pTextNd->DeleteAttribute( pHt );
                         if( 1 == nCntAttr )
                             break;
                         i--;
@@ -2397,20 +2397,20 @@ void SwHTMLParser::AddParSpace()
 
     sal_uLong nNdIdx = pPam->GetPoint()->nNode.GetIndex() - 1;
 
-    SwTxtNode *pTxtNode = pDoc->GetNodes()[nNdIdx]->GetTxtNode();
-    if( !pTxtNode )
+    SwTextNode *pTextNode = pDoc->GetNodes()[nNdIdx]->GetTextNode();
+    if( !pTextNode )
         return;
 
     SvxULSpaceItem rULSpace =
-        static_cast<const SvxULSpaceItem&>(pTxtNode->SwCntntNode::GetAttr( RES_UL_SPACE ));
+        static_cast<const SvxULSpaceItem&>(pTextNode->SwContentNode::GetAttr( RES_UL_SPACE ));
     if( !rULSpace.GetLower() )
     {
         const SvxULSpaceItem& rCollULSpace =
-            pTxtNode->GetAnyFmtColl().GetULSpace();
+            pTextNode->GetAnyFormatColl().GetULSpace();
         if( rCollULSpace.GetLower() &&
             rCollULSpace.GetUpper() == rULSpace.GetUpper() )
         {
-            pTxtNode->ResetAttr( RES_UL_SPACE );
+            pTextNode->ResetAttr( RES_UL_SPACE );
         }
         else
         {
@@ -2421,12 +2421,12 @@ void SwHTMLParser::AddParSpace()
             bool bIsCJK = false;
             bool bIsCTL = false;
 
-            const size_t nCntAttr = (pTxtNode  && pTxtNode->GetpSwpHints())
-                            ? pTxtNode->GetSwpHints().Count() : 0;
+            const size_t nCntAttr = (pTextNode  && pTextNode->GetpSwpHints())
+                            ? pTextNode->GetSwpHints().Count() : 0;
 
             for(size_t i = 0; i < nCntAttr; ++i)
             {
-                SwTxtAttr *const pHt = pTxtNode->GetSwpHints().GetTextHint(i);
+                SwTextAttr *const pHt = pTextNode->GetSwpHints().GetTextHint(i);
                 sal_uInt16 const nWhich = pHt->Which();
                 if (RES_CHRATR_CJK_FONT == nWhich ||
                     RES_CHRATR_CJK_FONTSIZE == nWhich ||
@@ -2450,15 +2450,15 @@ void SwHTMLParser::AddParSpace()
 
             if( bIsCTL )
             {
-                pTxtNode->SetAttr(
+                pTextNode->SetAttr(
                     SvxULSpaceItem( rULSpace.GetUpper(), HTML_CTL_PARSPACE, RES_UL_SPACE )  );
             }
             else if( bIsCJK )
             {
-                pTxtNode->SetAttr(
+                pTextNode->SetAttr(
                     SvxULSpaceItem( rULSpace.GetUpper(), HTML_CJK_PARSPACE, RES_UL_SPACE )  );
             } else {
-                pTxtNode->SetAttr(
+                pTextNode->SetAttr(
                     SvxULSpaceItem( rULSpace.GetUpper(), HTML_PARSPACE, RES_UL_SPACE )  );
             }
         }
@@ -2648,7 +2648,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
     const SwNodeIndex& rEndIdx = pPam->GetPoint()->nNode;
     const sal_Int32 nEndCnt = pPam->GetPoint()->nContent.GetIndex();
     _HTMLAttr* pAttr;
-    SwCntntNode* pCNd;
+    SwContentNode* pCNd;
     sal_uInt16 n;
 
     _HTMLAttrs aFields;
@@ -2716,7 +2716,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
                     continue;
                 }
 
-                pCNd = pAttr->nSttPara.GetNode().GetCntntNode();
+                pCNd = pAttr->nSttPara.GetNode().GetContentNode();
                 if( !pCNd )
                 {
                     // durch die elende Loescherei von Nodes kann auch mal
@@ -2733,7 +2733,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
                     }
                     pCNd = pDoc->GetNodes().GoNext( &(pAttr->nSttPara) );
                     if( pCNd )
-                        pAttr->nSttCntnt = 0;
+                        pAttr->nSttContent = 0;
                     else
                     {
                         OSL_ENSURE( false, "SetAttr: GoNext() failed!" );
@@ -2746,20 +2746,20 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
 
                 // durch das Loeschen von BRs kann der Start-Index
                 // auch mal hinter das Ende des Textes zeigen
-                if( pAttr->nSttCntnt > pCNd->Len() )
-                    pAttr->nSttCntnt = pCNd->Len();
-                pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nSttCntnt );
+                if( pAttr->nSttContent > pCNd->Len() )
+                    pAttr->nSttContent = pCNd->Len();
+                pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nSttContent );
 
                 pAttrPam->SetMark();
                 if ( (pAttr->GetSttPara() != pAttr->GetEndPara()) &&
                          !isTXTATR_NOEND(nWhich) )
                 {
-                    pCNd = pAttr->nEndPara.GetNode().GetCntntNode();
+                    pCNd = pAttr->nEndPara.GetNode().GetContentNode();
                     if( !pCNd )
                     {
                         pCNd = SwNodes::GoPrevious( &(pAttr->nEndPara) );
                         if( pCNd )
-                            pAttr->nEndCntnt = pCNd->Len();
+                            pAttr->nEndContent = pCNd->Len();
                         else
                         {
                             OSL_ENSURE( false, "SetAttr: GoPrevious() failed!" );
@@ -2774,15 +2774,15 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
                 }
                 else if( pAttr->IsLikePara() )
                 {
-                    pAttr->nEndCntnt = pCNd->Len();
+                    pAttr->nEndContent = pCNd->Len();
                 }
 
                 // durch das Loeschen von BRs kann der End-Index
                 // auch mal hinter das Ende des Textes zeigen
-                if( pAttr->nEndCntnt > pCNd->Len() )
-                    pAttr->nEndCntnt = pCNd->Len();
+                if( pAttr->nEndContent > pCNd->Len() )
+                    pAttr->nEndContent = pCNd->Len();
 
-                pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nEndCntnt );
+                pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nEndContent );
                 if( bBeforeTable &&
                     pAttrPam->GetPoint()->nNode.GetIndex() ==
                         rEndIdx.GetIndex() )
@@ -2839,12 +2839,12 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
                 case RES_TXTATR_ANNOTATION:
                 case RES_TXTATR_INPUTFIELD:
                     {
-                        sal_uInt16 nFldWhich =
+                        sal_uInt16 nFieldWhich =
                             pPostIts
-                            ? static_cast<const SwFmtFld *>(pAttr->pItem)->GetField()->GetTyp()->Which()
+                            ? static_cast<const SwFormatField *>(pAttr->pItem)->GetField()->GetTyp()->Which()
                             : 0;
-                        if( pPostIts && (RES_POSTITFLD == nFldWhich ||
-                                         RES_SCRIPTFLD == nFldWhich) )
+                        if( pPostIts && (RES_POSTITFLD == nFieldWhich ||
+                                         RES_SCRIPTFLD == nFieldWhich) )
                         {
                             pPostIts->push_front( pAttr );
                         }
@@ -2875,7 +2875,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
                     // ggfs. ein Bookmark anspringen
                     if( RES_TXTATR_INETFMT == nWhich &&
                         JUMPTO_MARK == eJumpTo &&
-                        sJmpMark == static_cast<SwFmtINetFmt*>(pAttr->pItem)->GetName() )
+                        sJmpMark == static_cast<SwFormatINetFormat*>(pAttr->pItem)->GetName() )
                     {
                         bChkJumpMark = true;
                         eJumpTo = JUMPTO_NONE;
@@ -2893,12 +2893,12 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
 
     for( n = aMoveFlyFrms.size(); n; )
     {
-        SwFrmFmt *pFrmFmt = aMoveFlyFrms[ --n ];
+        SwFrameFormat *pFrameFormat = aMoveFlyFrms[ --n ];
 
-        const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
+        const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
         OSL_ENSURE( FLY_AT_PARA == rAnchor.GetAnchorId(),
                 "Nur Auto-Rahmen brauchen eine Spezialbehandlung" );
-        const SwPosition *pFlyPos = rAnchor.GetCntntAnchor();
+        const SwPosition *pFlyPos = rAnchor.GetContentAnchor();
         sal_uLong nFlyParaIdx = pFlyPos->nNode.GetIndex();
         bool bMoveFly;
         if( bChkEnd )
@@ -2916,31 +2916,31 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
         }
         if( bMoveFly )
         {
-            pFrmFmt->DelFrms();
+            pFrameFormat->DelFrms();
             *pAttrPam->GetPoint() = *pFlyPos;
-            pAttrPam->GetPoint()->nContent.Assign( pAttrPam->GetCntntNode(),
+            pAttrPam->GetPoint()->nContent.Assign( pAttrPam->GetContentNode(),
                                                    aMoveFlyCnts[n] );
-            SwFmtAnchor aAnchor( rAnchor );
+            SwFormatAnchor aAnchor( rAnchor );
             aAnchor.SetType( FLY_AT_CHAR );
             aAnchor.SetAnchor( pAttrPam->GetPoint() );
-            pFrmFmt->SetFmtAttr( aAnchor );
+            pFrameFormat->SetFormatAttr( aAnchor );
 
-            const SwFmtHoriOrient& rHoriOri = pFrmFmt->GetHoriOrient();
+            const SwFormatHoriOrient& rHoriOri = pFrameFormat->GetHoriOrient();
             if( text::HoriOrientation::LEFT == rHoriOri.GetHoriOrient() )
             {
-                SwFmtHoriOrient aHoriOri( rHoriOri );
+                SwFormatHoriOrient aHoriOri( rHoriOri );
                 aHoriOri.SetRelationOrient( text::RelOrientation::CHAR );
-                pFrmFmt->SetFmtAttr( aHoriOri );
+                pFrameFormat->SetFormatAttr( aHoriOri );
             }
-            const SwFmtVertOrient& rVertOri = pFrmFmt->GetVertOrient();
+            const SwFormatVertOrient& rVertOri = pFrameFormat->GetVertOrient();
             if( text::VertOrientation::TOP == rVertOri.GetVertOrient() )
             {
-                SwFmtVertOrient aVertOri( rVertOri );
+                SwFormatVertOrient aVertOri( rVertOri );
                 aVertOri.SetRelationOrient( text::RelOrientation::CHAR );
-                pFrmFmt->SetFmtAttr( aVertOri );
+                pFrameFormat->SetFormatAttr( aVertOri );
             }
 
-            pFrmFmt->MakeFrms();
+            pFrameFormat->MakeFrms();
             aMoveFlyFrms.erase( aMoveFlyFrms.begin() + n );
             aMoveFlyCnts.erase( aMoveFlyCnts.begin() + n );
         }
@@ -2949,9 +2949,9 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
     {
         pAttr = aFields[0];
 
-        pCNd = pAttr->nSttPara.GetNode().GetCntntNode();
+        pCNd = pAttr->nSttPara.GetNode().GetContentNode();
         pAttrPam->GetPoint()->nNode = pAttr->nSttPara;
-        pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nSttCntnt );
+        pAttrPam->GetPoint()->nContent.Assign( pCNd, pAttr->nSttContent );
 
         if( bBeforeTable &&
             pAttrPam->GetPoint()->nNode.GetIndex() == rEndIdx.GetIndex() )
@@ -3027,7 +3027,7 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
     if( !nEndCnt && RES_PARATR_BEGIN <= nWhich &&
         *pEndIdx != pAttr->GetSttPara() )
     {
-        // dann eine Cntntnt Position zurueck!
+        // dann eine Contentnt Position zurueck!
         bMoveBack = pPam->Move( fnMoveBackward );
         nEndCnt = pPam->GetPoint()->nContent.GetIndex();
     }
@@ -3058,17 +3058,17 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
 
     if( bInsert && bScript )
     {
-        const SwTxtNode *pTxtNd = pAttr->GetSttPara().GetNode()
-                                            .GetTxtNode();
-        OSL_ENSURE( pTxtNd, "No text node" );
-        const OUString& rText = pTxtNd->GetTxt();
-        sal_uInt16 nScriptTxt = g_pBreakIt->GetBreakIter()->getScriptType(
+        const SwTextNode *pTextNd = pAttr->GetSttPara().GetNode()
+                                            .GetTextNode();
+        OSL_ENSURE( pTextNd, "No text node" );
+        const OUString& rText = pTextNd->GetText();
+        sal_uInt16 nScriptText = g_pBreakIt->GetBreakIter()->getScriptType(
                         rText, pAttr->GetSttCnt() );
         sal_Int32 nScriptEnd = g_pBreakIt->GetBreakIter()
-                    ->endOfScript( rText, pAttr->GetSttCnt(), nScriptTxt );
+                    ->endOfScript( rText, pAttr->GetSttCnt(), nScriptText );
         while (nScriptEnd < nEndCnt && nScriptEnd != -1)
         {
-            if( nScriptItem == nScriptTxt )
+            if( nScriptItem == nScriptText )
             {
                 _HTMLAttr *pSetAttr = pAttr->Clone( *pEndIdx, nScriptEnd );
                 pSetAttr->ClearPrev();
@@ -3082,18 +3082,18 @@ bool SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
                         aSetAttrTab.push_back( pSetAttr );
                 }
             }
-            pAttr->nSttCntnt = nScriptEnd;
-            nScriptTxt = g_pBreakIt->GetBreakIter()->getScriptType(
+            pAttr->nSttContent = nScriptEnd;
+            nScriptText = g_pBreakIt->GetBreakIter()->getScriptType(
                             rText, nScriptEnd );
             nScriptEnd = g_pBreakIt->GetBreakIter()
-                    ->endOfScript( rText, nScriptEnd, nScriptTxt );
+                    ->endOfScript( rText, nScriptEnd, nScriptText );
         }
-        bInsert = nScriptItem == nScriptTxt;
+        bInsert = nScriptItem == nScriptText;
     }
     if( bInsert )
     {
         pAttr->nEndPara = *pEndIdx;
-        pAttr->nEndCntnt = nEndCnt;
+        pAttr->nEndContent = nEndCnt;
         pAttr->bInsAtStart = RES_TXTATR_INETFMT != nWhich &&
                              RES_TXTATR_CHARFMT != nWhich;
 
@@ -3276,7 +3276,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
         {
             nTmpIdx = pDoc->GetNodes().GetEndOfInserts().GetIndex();
         }
-        SwCntntNode* pCNd = SwNodes::GoPrevious(&nEndIdx);
+        SwContentNode* pCNd = SwNodes::GoPrevious(&nEndIdx);
 
         // keine Attribute setzen, wenn der PaM aus dem Content-Bereich
         // herausgeschoben wurde.
@@ -3385,8 +3385,8 @@ void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab,
             {
                 pAttr->nSttPara = rSttPara;
                 pAttr->nEndPara = rSttPara;
-                pAttr->nSttCntnt = nSttCnt;
-                pAttr->nEndCntnt = nSttCnt;
+                pAttr->nSttContent = nSttCnt;
+                pAttr->nEndContent = nSttCnt;
             }
             pAttr = pAttr->GetNext();
         }
@@ -3718,7 +3718,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
 
         // in Ueberschriften bestimmt die aktuelle Ueberschrift
         // die Font-Hoehe und nicht BASEFONT
-        sal_uInt16 nPoolId = GetCurrFmtColl()->GetPoolFmtId();
+        sal_uInt16 nPoolId = GetCurrFormatColl()->GetPoolFormatId();
         if( (nPoolId>=RES_POOLCOLL_HEADLINE1 &&
              nPoolId<=RES_POOLCOLL_HEADLINE6) )
         {
@@ -3739,7 +3739,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
         // den Vorlagen geholt.
         if( nPoolId && nSize>=1 && nSize <=6 )
             nFontHeight =
-                pCSS1Parser->GetTxtCollFromPool(
+                pCSS1Parser->GetTextCollFromPool(
                     RES_POOLCOLL_HEADLINE1+6-nSize )->GetSize().GetHeight();
         else
             nFontHeight = aFontHeights[nSize-1];
@@ -3870,7 +3870,7 @@ void SwHTMLParser::EndFontAttr( int nToken )
 void SwHTMLParser::NewPara()
 {
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( AM_SPACE );
+        AppendTextNode( AM_SPACE );
     else
         AddParSpace();
 
@@ -3933,7 +3933,7 @@ void SwHTMLParser::NewPara()
     PushContext( pCntxt );
 
     // die aktuelle Vorlage oder deren Attribute setzen
-    SetTxtCollAttrs( !aClass.isEmpty() ? pCntxt : 0 );
+    SetTextCollAttrs( !aClass.isEmpty() ? pCntxt : 0 );
 
     // Laufbalkenanzeige
     ShowStatline();
@@ -3947,7 +3947,7 @@ void SwHTMLParser::EndPara( bool bReal )
     if( HTML_LI_ON==nOpenParaToken && pTable )
     {
 #if OSL_DEBUG_LEVEL > 0
-        const SwNumRule *pNumRule = pPam->GetNode().GetTxtNode()->GetNumRule();
+        const SwNumRule *pNumRule = pPam->GetNode().GetTextNode()->GetNumRule();
         OSL_ENSURE( pNumRule, "Wo ist die Numrule geblieben" );
 #endif
     }
@@ -3956,7 +3956,7 @@ void SwHTMLParser::EndPara( bool bReal )
     if( bReal )
     {
         if( pPam->GetPoint()->nContent.GetIndex() )
-            AppendTxtNode( AM_SPACE );
+            AppendTextNode( AM_SPACE );
         else
             AddParSpace();
     }
@@ -3985,7 +3985,7 @@ void SwHTMLParser::EndPara( bool bReal )
 
     // und die bisherige Vorlage neu setzen
     if( bReal )
-        SetTxtCollAttrs();
+        SetTextCollAttrs();
 
     nOpenParaToken = 0;
 }
@@ -4025,25 +4025,25 @@ void SwHTMLParser::NewHeading( int nToken )
 
     // einen neuen Absatz aufmachen
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( AM_SPACE );
+        AppendTextNode( AM_SPACE );
     else
         AddParSpace();
 
     // die passende Vorlage suchen
-    sal_uInt16 nTxtColl;
+    sal_uInt16 nTextColl;
     switch( nToken )
     {
-    case HTML_HEAD1_ON:         nTxtColl = RES_POOLCOLL_HEADLINE1;  break;
-    case HTML_HEAD2_ON:         nTxtColl = RES_POOLCOLL_HEADLINE2;  break;
-    case HTML_HEAD3_ON:         nTxtColl = RES_POOLCOLL_HEADLINE3;  break;
-    case HTML_HEAD4_ON:         nTxtColl = RES_POOLCOLL_HEADLINE4;  break;
-    case HTML_HEAD5_ON:         nTxtColl = RES_POOLCOLL_HEADLINE5;  break;
-    case HTML_HEAD6_ON:         nTxtColl = RES_POOLCOLL_HEADLINE6;  break;
-    default:                    nTxtColl = RES_POOLCOLL_STANDARD;   break;
+    case HTML_HEAD1_ON:         nTextColl = RES_POOLCOLL_HEADLINE1;  break;
+    case HTML_HEAD2_ON:         nTextColl = RES_POOLCOLL_HEADLINE2;  break;
+    case HTML_HEAD3_ON:         nTextColl = RES_POOLCOLL_HEADLINE3;  break;
+    case HTML_HEAD4_ON:         nTextColl = RES_POOLCOLL_HEADLINE4;  break;
+    case HTML_HEAD5_ON:         nTextColl = RES_POOLCOLL_HEADLINE5;  break;
+    case HTML_HEAD6_ON:         nTextColl = RES_POOLCOLL_HEADLINE6;  break;
+    default:                    nTextColl = RES_POOLCOLL_STANDARD;   break;
     }
 
     // den Kontext anlegen
-    _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken), nTxtColl, aClass );
+    _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken), nTextColl, aClass );
 
     // Styles parsen (zu Class siehe auch NewPara)
     if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
@@ -4067,7 +4067,7 @@ void SwHTMLParser::NewHeading( int nToken )
     PushContext( pCntxt );
 
     // und die Vorlage oder deren Attribute setzen
-    SetTxtCollAttrs( pCntxt );
+    SetTextCollAttrs( pCntxt );
 
     nFontStHeadStart = aFontStack.size();
 
@@ -4079,7 +4079,7 @@ void SwHTMLParser::EndHeading()
 {
     // einen neuen Absatz aufmachen
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( AM_SPACE );
+        AppendTextNode( AM_SPACE );
     else
         AddParSpace();
 
@@ -4111,12 +4111,12 @@ void SwHTMLParser::EndHeading()
     }
 
     // die bisherige Vorlage neu setzen
-    SetTxtCollAttrs();
+    SetTextCollAttrs();
 
     nFontStHeadStart = nFontStMin;
 }
 
-void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
+void SwHTMLParser::NewTextFormatColl( int nToken, sal_uInt16 nColl )
 {
     OUString aId, aStyle, aClass, aLang, aDir;
 
@@ -4172,7 +4172,7 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
         break;
     }
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( eMode );
+        AppendTextNode( eMode );
     else if( AM_SPACE==eMode )
         AddParSpace();
 
@@ -4197,13 +4197,13 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
     PushContext( pCntxt );
 
     // die neue Vorlage setzen
-    SetTxtCollAttrs( pCntxt );
+    SetTextCollAttrs( pCntxt );
 
     // Laufbalkenanzeige aktualisieren
     ShowStatline();
 }
 
-void SwHTMLParser::EndTxtFmtColl( int nToken )
+void SwHTMLParser::EndTextFormatColl( int nToken )
 {
     SwHTMLAppendMode eMode = AM_NORMAL;
     switch( nToken & ~1 )
@@ -4225,7 +4225,7 @@ void SwHTMLParser::EndTxtFmtColl( int nToken )
         break;
     }
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( eMode );
+        AppendTextNode( eMode );
     else if( AM_SPACE==eMode )
         AddParSpace();
 
@@ -4241,7 +4241,7 @@ void SwHTMLParser::EndTxtFmtColl( int nToken )
     }
 
     // und die bisherige Vorlage setzen
-    SetTxtCollAttrs();
+    SetTextCollAttrs();
 }
 
 void SwHTMLParser::NewDefList()
@@ -4275,7 +4275,7 @@ void SwHTMLParser::NewDefList()
     // einen neuen Absatz aufmachen
     bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 0;
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
+        AppendTextNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
     else if( bSpace )
         AddParSpace();
 
@@ -4319,9 +4319,9 @@ void SwHTMLParser::NewDefList()
 
         // und den der DT-Vorlage des aktuellen Levels
         SvxLRSpaceItem rLRSpace =
-            pCSS1Parser->GetTxtFmtColl( RES_POOLCOLL_HTML_DD, aEmptyOUStr )
+            pCSS1Parser->GetTextFormatColl( RES_POOLCOLL_HTML_DD, aEmptyOUStr )
                        ->GetLRSpace();
-        nLeft = nLeft + static_cast< sal_uInt16 >(rLRSpace.GetTxtLeft());
+        nLeft = nLeft + static_cast< sal_uInt16 >(rLRSpace.GetTextLeft());
     }
 
     pCntxt->SetMargins( nLeft, nRight, nIndent );
@@ -4343,14 +4343,14 @@ void SwHTMLParser::NewDefList()
 
     // die Attribute der neuen Vorlage setzen
     if( nDefListDeep > 1 )
-        SetTxtCollAttrs( pCntxt );
+        SetTextCollAttrs( pCntxt );
 }
 
 void SwHTMLParser::EndDefList()
 {
     bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 1;
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
+        AppendTextNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
     else if( bSpace )
         AddParSpace();
 
@@ -4370,7 +4370,7 @@ void SwHTMLParser::EndDefList()
     }
 
     // und Vorlage setzen
-    SetTxtCollAttrs();
+    SetTextCollAttrs();
 }
 
 void SwHTMLParser::NewDefListItem( int nToken )
@@ -4404,7 +4404,7 @@ void SwHTMLParser::NewDefListItem( int nToken )
         nOpenParaToken = static_cast< sal_uInt16 >(nToken);
     }
 
-    NewTxtFmtColl( nToken, static_cast< sal_uInt16 >(nToken==HTML_DD_ON ? RES_POOLCOLL_HTML_DD
+    NewTextFormatColl( nToken, static_cast< sal_uInt16 >(nToken==HTML_DD_ON ? RES_POOLCOLL_HTML_DD
                                               : RES_POOLCOLL_HTML_DT) );
 }
 
@@ -4413,7 +4413,7 @@ void SwHTMLParser::EndDefListItem( int nToken, bool bSetColl,
 {
     // einen neuen Absatz aufmachen
     if( !nToken && pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( AM_SOFTNOSPACE );
+        AppendTextNode( AM_SOFTNOSPACE );
 
     // Kontext zu dem Token suchen und vom Stack holen
     nToken &= ~1;
@@ -4454,7 +4454,7 @@ void SwHTMLParser::EndDefListItem( int nToken, bool bSetColl,
 
     // und die bisherige Vorlage setzen
     if( bSetColl )
-        SetTxtCollAttrs();
+        SetTextCollAttrs();
 }
 
 bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
@@ -4467,20 +4467,20 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
     // sonst:               Der Absatz enthaelt irgendeinen Rahmen
     SwNodeIndex& rNodeIdx = pPam->GetPoint()->nNode;
 
-    const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
+    const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
 
     bool bFound = false;
-    for ( sal_uInt16 i=0; i<rFrmFmtTbl.size(); i++ )
+    for ( sal_uInt16 i=0; i<rFrameFormatTable.size(); i++ )
     {
-        const SwFrmFmt *const pFmt = rFrmFmtTbl[i];
-        SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
+        const SwFrameFormat *const pFormat = rFrameFormatTable[i];
+        SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
         // Ein Rahmen wurde gefunden, wenn
         // - er absatzgebunden ist, und
         // - im aktuellen Absatz verankert ist, und
         //   - jeder absatzgebunene Rahmen zaehlt, oder
         //   - (nur Rahmen oder umlauf zaehlen und ) der Rahmen keinen
         //     Umlauf besitzt
-        SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+        SwPosition const*const pAPos = pAnchor->GetContentAnchor();
         if (pAPos &&
             ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
              (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
@@ -4497,7 +4497,7 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
                 // auch keine mit Durchlauf beachten. Dabei handelt es
                 // sich (noch) um HIDDEN-Controls, und denen weicht man
                 // besser auch nicht aus.
-                SwSurround eSurround = pFmt->GetSurround().GetSurround();
+                SwSurround eSurround = pFormat->GetSurround().GetSurround();
                 if( bNoSurroundOnly )
                 {
                     if( SURROUND_NONE==eSurround )
@@ -4529,17 +4529,17 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
 
 // die speziellen Methoden zum Einfuegen von Objecten
 
-const SwFmtColl *SwHTMLParser::GetCurrFmtColl() const
+const SwFormatColl *SwHTMLParser::GetCurrFormatColl() const
 {
-    const SwCntntNode* pCNd = pPam->GetCntntNode();
-    return &pCNd->GetAnyFmtColl();
+    const SwContentNode* pCNd = pPam->GetContentNode();
+    return &pCNd->GetAnyFormatColl();
 }
 
-void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
+void SwHTMLParser::SetTextCollAttrs( _HTMLAttrContext *pContext )
 {
-    SwTxtFmtColl *pCollToSet = 0;   // die zu setzende Vorlage
+    SwTextFormatColl *pCollToSet = 0;   // die zu setzende Vorlage
     SfxItemSet *pItemSet = 0;       // der Set fuer harte Attrs
-    sal_uInt16 nTopColl = pContext ? pContext->GetTxtFmtColl() : 0;
+    sal_uInt16 nTopColl = pContext ? pContext->GetTextFormatColl() : 0;
     const OUString& rTopClass = pContext ? pContext->GetClass() : aEmptyOUStr;
     sal_uInt16 nDfltColl = RES_POOLCOLL_TEXT;
 
@@ -4553,7 +4553,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
     {
         const _HTMLAttrContext *pCntxt = aContexts[i];
 
-        sal_uInt16 nColl = pCntxt->GetTxtFmtColl();
+        sal_uInt16 nColl = pCntxt->GetTextFormatColl();
         if( nColl )
         {
             // Es gibt eine Vorlage, die zu setzen ist. Dann
@@ -4581,8 +4581,8 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
                 break;
             }
 
-            SwTxtFmtColl *pNewColl =
-                pCSS1Parser->GetTxtFmtColl( nColl, pCntxt->GetClass() );
+            SwTextFormatColl *pNewColl =
+                pCSS1Parser->GetTextFormatColl( nColl, pCntxt->GetClass() );
 
             if( bSetThis )
             {
@@ -4630,7 +4630,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
         else
         {
             // vielliecht gibt es ja eine Default-Vorlage?
-            nColl = pCntxt->GetDfltTxtFmtColl();
+            nColl = pCntxt->GetDfltTextFormatColl();
             if( nColl )
                 nDfltColl = nColl;
         }
@@ -4656,8 +4656,8 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
              nDfltColl==RES_POOLCOLL_TABLE_HDLN) )
             nTopColl = nDfltColl;
 
-        const SwTxtFmtColl *pTopColl =
-            pCSS1Parser->GetTxtFmtColl( nTopColl, rTopClass );
+        const SwTextFormatColl *pTopColl =
+            pCSS1Parser->GetTextFormatColl( nTopColl, rTopClass );
         const SfxItemSet& rItemSet = pTopColl->GetAttrSet();
         const SfxPoolItem *pItem;
         if( SfxItemState::SET == rItemSet.GetItemState(RES_LR_SPACE,true, &pItem) )
@@ -4665,18 +4665,18 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
             const SvxLRSpaceItem *pLRItem =
                 static_cast<const SvxLRSpaceItem *>(pItem);
 
-            sal_Int32 nLeft = pLRItem->GetTxtLeft();
+            sal_Int32 nLeft = pLRItem->GetTextLeft();
             sal_Int32 nRight = pLRItem->GetRight();
-            nFirstLineIndent = pLRItem->GetTxtFirstLineOfst();
+            nFirstLineIndent = pLRItem->GetTextFirstLineOfst();
 
             // In Definitions-Listen enthalten die Abstaende auch die der
             // vorhergehenden Level
             if( RES_POOLCOLL_HTML_DD == nTopColl )
             {
                 const SvxLRSpaceItem& rDTLRSpace = pCSS1Parser
-                    ->GetTxtFmtColl( RES_POOLCOLL_HTML_DT, aEmptyOUStr )
+                    ->GetTextFormatColl( RES_POOLCOLL_HTML_DT, aEmptyOUStr )
                     ->GetLRSpace();
-                nLeft -= rDTLRSpace.GetTxtLeft();
+                nLeft -= rDTLRSpace.GetTextLeft();
                 nRight -= rDTLRSpace.GetRight();
             }
             else if( RES_POOLCOLL_HTML_DT == nTopColl )
@@ -4703,14 +4703,14 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
     // wenn gar keine Vorlage im Kontext gesetzt ist, Textkoerper nehmen
     if( !pCollToSet )
     {
-        pCollToSet = pCSS1Parser->GetTxtCollFromPool( nDfltColl );
+        pCollToSet = pCSS1Parser->GetTextCollFromPool( nDfltColl );
         const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace();
         if( !nLeftMargin )
-            nLeftMargin = static_cast< sal_uInt16 >(rLRItem.GetTxtLeft());
+            nLeftMargin = static_cast< sal_uInt16 >(rLRItem.GetTextLeft());
         if( !nRightMargin )
             nRightMargin = static_cast< sal_uInt16 >(rLRItem.GetRight());
         if( !nFirstLineIndent )
-            nFirstLineIndent = rLRItem.GetTxtFirstLineOfst();
+            nFirstLineIndent = rLRItem.GetTextFirstLineOfst();
     }
 
     // bisherige harte Attributierung des Absatzes entfernen
@@ -4723,22 +4723,22 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
     }
 
     // Die Vorlage setzen
-    pDoc->SetTxtFmtColl( *pPam, pCollToSet );
+    pDoc->SetTextFormatColl( *pPam, pCollToSet );
 
     // ggf. noch den Absatz-Einzug korrigieren
     const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace();
     bool bSetLRSpace;
 
-           bSetLRSpace = nLeftMargin != rLRItem.GetTxtLeft() ||
-                      nFirstLineIndent != rLRItem.GetTxtFirstLineOfst() ||
+           bSetLRSpace = nLeftMargin != rLRItem.GetTextLeft() ||
+                      nFirstLineIndent != rLRItem.GetTextFirstLineOfst() ||
                       nRightMargin != rLRItem.GetRight();
 
     if( bSetLRSpace )
     {
         SvxLRSpaceItem aLRItem( rLRItem );
-        aLRItem.SetTxtLeft( nLeftMargin );
+        aLRItem.SetTextLeft( nLeftMargin );
         aLRItem.SetRight( nRightMargin );
-        aLRItem.SetTxtFirstLineOfst( nFirstLineIndent );
+        aLRItem.SetTextFirstLineOfst( nFirstLineIndent );
         if( pItemSet )
             pItemSet->Put( aLRItem );
         else
@@ -4758,7 +4758,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
     }
 }
 
-void SwHTMLParser::NewCharFmt( int nToken )
+void SwHTMLParser::NewCharFormat( int nToken )
 {
     OUString aId, aStyle, aLang, aDir;
     OUString aClass;
@@ -4791,8 +4791,8 @@ void SwHTMLParser::NewCharFmt( int nToken )
     _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) );
 
     // die Vorlage setzen und im Kontext merken
-    SwCharFmt* pCFmt = pCSS1Parser->GetChrFmt( static_cast< sal_uInt16 >(nToken), aClass );
-    OSL_ENSURE( pCFmt, "keine Zeichenvorlage zu Token gefunden" );
+    SwCharFormat* pCFormat = pCSS1Parser->GetChrFormat( static_cast< sal_uInt16 >(nToken), aClass );
+    OSL_ENSURE( pCFormat, "keine Zeichenvorlage zu Token gefunden" );
 
     // Styles parsen (zu Class siehe auch NewPara)
     if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
@@ -4812,8 +4812,8 @@ void SwHTMLParser::NewCharFmt( int nToken )
     // Zeichen-Vorlagen werden in einem eigenen Stack gehalten und
     // koennen nie durch Styles eingefuegt werden. Das Attribut ist deshalb
     // auch gar nicht im CSS1-Which-Range enthalten
-    if( pCFmt )
-        InsertAttr( &aAttrTab.pCharFmts, SwFmtCharFmt( pCFmt ), pCntxt );
+    if( pCFormat )
+        InsertAttr( &aAttrTab.pCharFormats, SwFormatCharFormat( pCFormat ), pCntxt );
 
     // den Kontext merken
     PushContext( pCntxt );
@@ -4878,7 +4878,7 @@ void SwHTMLParser::InsertSpacer()
             SfxItemSet aFrmSet( pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
             if( !IsNewDoc() )
-                Reader::ResetFrmFmtAttrs( aFrmSet );
+                Reader::ResetFrameFormatAttrs( aFrmSet );
 
             // den Anker und die Ausrichtung setzen
             SetAnchorAndAdjustment( eVertOri, eHoriOri, aFrmSet );
@@ -4896,16 +4896,16 @@ void SwHTMLParser::InsertSpacer()
 
             // den Inhalt schuetzen
             SvxProtectItem aProtectItem( RES_PROTECT) ;
-            aProtectItem.SetCntntProtect( true );
+            aProtectItem.SetContentProtect( true );
             aFrmSet.Put( aProtectItem );
 
             // der Rahmen anlegen
             RndStdIds eAnchorId =
-                static_cast<const SwFmtAnchor &>(aFrmSet.Get(RES_ANCHOR)).GetAnchorId();
-            SwFrmFmt *pFlyFmt = pDoc->MakeFlySection( eAnchorId,
+                static_cast<const SwFormatAnchor &>(aFrmSet.Get(RES_ANCHOR)).GetAnchorId();
+            SwFrameFormat *pFlyFormat = pDoc->MakeFlySection( eAnchorId,
                                             pPam->GetPoint(), &aFrmSet );
             // Ggf Frames anlegen und auto-geb. Rahmen registrieren
-            RegisterFlyFrm( pFlyFmt );
+            RegisterFlyFrm( pFlyFormat );
         }
         break;
     case HTML_SPTYPE_VERT:
@@ -4919,7 +4919,7 @@ void SwHTMLParser::InsertSpacer()
             }
 
             // einen Absatz-Abstand setzen
-            SwTxtNode *pTxtNode = 0;
+            SwTextNode *pTextNode = 0;
             if( !pPam->GetPoint()->nContent.GetIndex() )
             {
                 // den unteren Absatz-Abstand des vorherigen Nodes aendern,
@@ -4927,29 +4927,29 @@ void SwHTMLParser::InsertSpacer()
 
                 SetAttr();  // noch offene Absatz-Attribute setzen
 
-                pTxtNode = pDoc->GetNodes()[pPam->GetPoint()->nNode.GetIndex()-1]
-                               ->GetTxtNode();
+                pTextNode = pDoc->GetNodes()[pPam->GetPoint()->nNode.GetIndex()-1]
+                               ->GetTextNode();
 
-                // Wenn der Abstz davor kein Txtenode ist, dann wird jetzt
+                // Wenn der Abstz davor kein Textenode ist, dann wird jetzt
                 // ein leere Absatz angelegt, der eh schon eine Zeilenhoehe
                 // Abstand erzeugt.
-                if( !pTxtNode )
+                if( !pTextNode )
                     nSize = nSize>HTML_PARSPACE ? nSize-HTML_PARSPACE : 0;
             }
 
-            if( pTxtNode )
+            if( pTextNode )
             {
-                SvxULSpaceItem aULSpace( static_cast<const SvxULSpaceItem&>(pTxtNode
-                    ->SwCntntNode::GetAttr( RES_UL_SPACE )) );
+                SvxULSpaceItem aULSpace( static_cast<const SvxULSpaceItem&>(pTextNode
+                    ->SwContentNode::GetAttr( RES_UL_SPACE )) );
                 aULSpace.SetLower( aULSpace.GetLower() + (sal_uInt16)nSize );
-                pTxtNode->SetAttr( aULSpace );
+                pTextNode->SetAttr( aULSpace );
             }
             else
             {
                 NewAttr( &aAttrTab.pULSpace, SvxULSpaceItem( 0, (sal_uInt16)nSize, RES_UL_SPACE ) );
                 EndAttr( aAttrTab.pULSpace, 0, false );
 
-                AppendTxtNode();    // nicht am Abstand drehen!
+                AppendTextNode();    // nicht am Abstand drehen!
             }
         }
         break;
@@ -4975,9 +4975,9 @@ void SwHTMLParser::InsertSpacer()
                 nIndent = nIndent + (short)nSize;
 
                 SvxLRSpaceItem aLRItem( RES_LR_SPACE );
-                aLRItem.SetTxtLeft( nLeft );
+                aLRItem.SetTextLeft( nLeft );
                 aLRItem.SetRight( nRight );
-                aLRItem.SetTxtFirstLineOfst( nIndent );
+                aLRItem.SetTextFirstLineOfst( nIndent );
 
                 NewAttr( &aAttrTab.pLRSpace, aLRItem );
                 EndAttr( aAttrTab.pLRSpace, 0, false );
@@ -5013,12 +5013,12 @@ SwTwips SwHTMLParser::GetCurrentBrowseWidth()
 
     if( !aHTMLPageSize.Width() )
     {
-        const SwFrmFmt& rPgFmt = pCSS1Parser->GetMasterPageDesc()->GetMaster();
+        const SwFrameFormat& rPgFormat = pCSS1Parser->GetMasterPageDesc()->GetMaster();
 
-        const SwFmtFrmSize& rSz   = rPgFmt.GetFrmSize();
-        const SvxLRSpaceItem& rLR = rPgFmt.GetLRSpace();
-        const SvxULSpaceItem& rUL = rPgFmt.GetULSpace();
-        const SwFmtCol& rCol = rPgFmt.GetCol();
+        const SwFormatFrmSize& rSz   = rPgFormat.GetFrmSize();
+        const SvxLRSpaceItem& rLR = rPgFormat.GetLRSpace();
+        const SvxULSpaceItem& rUL = rPgFormat.GetULSpace();
+        const SwFormatCol& rCol = rPgFormat.GetCol();
 
         aHTMLPageSize.Width() = rSz.GetWidth() - rLR.GetLeft() - rLR.GetRight();
         aHTMLPageSize.Height() = rSz.GetHeight() - rUL.GetUpper() - rUL.GetLower();
@@ -5107,25 +5107,25 @@ void SwHTMLParser::InsertLineBreak()
     if( bClearLeft || bClearRight )
     {
         SwNodeIndex& rNodeIdx = pPam->GetPoint()->nNode;
-        SwTxtNode* pTxtNd = rNodeIdx.GetNode().GetTxtNode();
-        if( pTxtNd )
+        SwTextNode* pTextNd = rNodeIdx.GetNode().GetTextNode();
+        if( pTextNd )
         {
-            const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
+            const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
 
-            for( sal_uInt16 i=0; i<rFrmFmtTbl.size(); i++ )
+            for( sal_uInt16 i=0; i<rFrameFormatTable.size(); i++ )
             {
-                SwFrmFmt *const pFmt = rFrmFmtTbl[i];
-                SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
-                SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+                SwFrameFormat *const pFormat = rFrameFormatTable[i];
+                SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+                SwPosition const*const pAPos = pAnchor->GetContentAnchor();
                 if (pAPos &&
                     ((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
                      (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
                     pAPos->nNode == rNodeIdx &&
-                    pFmt->GetSurround().GetSurround() != SURROUND_NONE )
+                    pFormat->GetSurround().GetSurround() != SURROUND_NONE )
                 {
-                    sal_Int16 eHori = RES_DRAWFRMFMT == pFmt->Which()
+                    sal_Int16 eHori = RES_DRAWFRMFMT == pFormat->Which()
                         ? text::HoriOrientation::LEFT
-                        : pFmt->GetHoriOrient().GetHoriOrient();
+                        : pFormat->GetHoriOrient().GetHoriOrient();
 
                     SwSurround eSurround = SURROUND_PARALLEL;
                     if( pPam->GetPoint()->nContent.GetIndex() )
@@ -5143,10 +5143,10 @@ void SwHTMLParser::InsertLineBreak()
 
                     if( SURROUND_PARALLEL != eSurround )
                     {
-                        SwFmtSurround aSurround( eSurround );
+                        SwFormatSurround aSurround( eSurround );
                         if( SURROUND_NONE != eSurround )
                             aSurround.SetAnchorOnly( true );
-                        pFmt->SetFmtAttr( aSurround );
+                        pFormat->SetFormatAttr( aSurround );
                         bCleared = true;
                     }
                 } // Anker ist nicht im Node
@@ -5155,7 +5155,7 @@ void SwHTMLParser::InsertLineBreak()
     } // kein CLEAR
 
     // Styles parsen
-    SvxFmtBreakItem aBreakItem( SVX_BREAK_NONE, RES_BREAK );
+    SvxFormatBreakItem aBreakItem( SVX_BREAK_NONE, RES_BREAK );
     bool bBreakItem = false;
     if( HasStyleOptions( aStyle, aId, aClass ) )
     {
@@ -5164,9 +5164,9 @@ void SwHTMLParser::InsertLineBreak()
 
         if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo ) )
         {
-            if( pCSS1Parser->SetFmtBreak( aItemSet, aPropInfo ) )
+            if( pCSS1Parser->SetFormatBreak( aItemSet, aPropInfo ) )
             {
-                aBreakItem = static_cast<const SvxFmtBreakItem &>(aItemSet.Get( RES_BREAK ));
+                aBreakItem = static_cast<const SvxFormatBreakItem &>(aItemSet.Get( RES_BREAK ));
                 bBreakItem = true;
             }
             if( !aPropInfo.aId.isEmpty() )
@@ -5194,7 +5194,7 @@ void SwHTMLParser::InsertLineBreak()
         // MIB 21.02.97: Eigentlich muesste man hier den unteren Absatz-
         // Absatnd auf 0 drehen. Das geht aber bei sowas wie <BR ..><P>
         // schief (>Netacpe). Deshalb lassen wir das erstmal.
-        AppendTxtNode( AM_NOSPACE );
+        AppendTextNode( AM_NOSPACE );
     }
     if( bBreakItem && SVX_BREAK_PAGE_BEFORE==aBreakItem.GetBreak() )
     {
@@ -5255,10 +5255,10 @@ void SwHTMLParser::InsertHorzRule()
     }
 
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( AM_NOSPACE );
+        AppendTextNode( AM_NOSPACE );
     if( nOpenParaToken )
         EndPara();
-    AppendTxtNode();
+    AppendTextNode();
     pPam->Move( fnMoveBackward );
 
     // ... und in einem Kontext merken
@@ -5268,7 +5268,7 @@ void SwHTMLParser::InsertHorzRule()
     PushContext( pCntxt );
 
     // die neue Vorlage setzen
-    SetTxtCollAttrs( pCntxt );
+    SetTextCollAttrs( pCntxt );
 
     // die harten Attribute an diesem Absatz werden nie mehr ungueltig
     if( !aParaAttrs.empty() )
@@ -5325,14 +5325,14 @@ void SwHTMLParser::InsertHorzRule()
 
             if( (long)nWidth < nBrowseWidth )
             {
-                const SwFmtColl *pColl = GetCurrFmtColl();
+                const SwFormatColl *pColl = GetCurrFormatColl();
                 SvxLRSpaceItem aLRItem( pColl->GetLRSpace() );
                 long nDist = nBrowseWidth - nWidth;
 
                 switch( eAdjust )
                 {
                 case SVX_ADJUST_RIGHT:
-                    aLRItem.SetTxtLeft( (sal_uInt16)nDist );
+                    aLRItem.SetTextLeft( (sal_uInt16)nDist );
                     break;
                 case SVX_ADJUST_LEFT:
                     aLRItem.SetRight( (sal_uInt16)nDist );
@@ -5340,7 +5340,7 @@ void SwHTMLParser::InsertHorzRule()
                 case SVX_ADJUST_CENTER:
                 default:
                     nDist /= 2;
-                    aLRItem.SetTxtLeft( (sal_uInt16)nDist );
+                    aLRItem.SetTextLeft( (sal_uInt16)nDist );
                     aLRItem.SetRight( (sal_uInt16)nDist );
                     break;
                 }
@@ -5363,7 +5363,7 @@ void SwHTMLParser::InsertHorzRule()
     pPam->Move( fnMoveForward );
 
     // und im Absatz danach die dort aktuelle Vorlage setzen
-    SetTxtCollAttrs();
+    SetTextCollAttrs();
 }
 
 void SwHTMLParser::ParseMoreMetaOptions()
@@ -5432,19 +5432,19 @@ void SwHTMLParser::ParseMoreMetaOptions()
     sText.append(aContent);
     sText.append("\">");
 
-    SwPostItField aPostItFld(
-        static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_POSTITFLD )),
+    SwPostItField aPostItField(
+        static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )),
         aEmptyOUStr, sText.makeStringAndClear(), aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
-    SwFmtFld aFmtFld( aPostItFld );
-    InsertAttr( aFmtFld );
+    SwFormatField aFormatField( aPostItField );
+    InsertAttr( aFormatField );
 }
 
 _HTMLAttr::_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem,
                       _HTMLAttr **ppHd ) :
     nSttPara( rPos.nNode ),
     nEndPara( rPos.nNode ),
-    nSttCntnt( rPos.nContent.GetIndex() ),
-    nEndCntnt(rPos.nContent.GetIndex() ),
+    nSttContent( rPos.nContent.GetIndex() ),
+    nEndContent(rPos.nContent.GetIndex() ),
     bInsAtStart( true ),
     bLikePara( false ),
     bValid( true ),
@@ -5460,8 +5460,8 @@ _HTMLAttr::_HTMLAttr( const _HTMLAttr &rAttr, const SwNodeIndex &rEndPara,
                       sal_Int32 nEndCnt, _HTMLAttr **ppHd ) :
     nSttPara( rAttr.nSttPara ),
     nEndPara( rEndPara ),
-    nSttCntnt( rAttr.nSttCntnt ),
-    nEndCntnt( nEndCnt ),
+    nSttContent( rAttr.nSttContent ),
+    nEndContent( nEndCnt ),
     bInsAtStart( rAttr.bInsAtStart ),
     bLikePara( rAttr.bLikePara ),
     bValid( rAttr.bValid ),
@@ -5494,9 +5494,9 @@ void _HTMLAttr::Reset(const SwNodeIndex& rSttPara, sal_Int32 nSttCnt,
 {
     // den Anfang (und das Ende) neu setzen
     nSttPara = rSttPara;
-    nSttCntnt = nSttCnt;
+    nSttContent = nSttCnt;
     nEndPara = rSttPara;
-    nEndCntnt = nSttCnt;
+    nEndContent = nSttCnt;
 
     // den Head korrigieren und die Verkettungen aufheben
     pNext = 0;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 7ac4f65700fd..cc7efaedb844 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -41,7 +41,7 @@ class SwDoc;
 class SwPaM;
 class SwViewShell;
 class SwStartNode;
-class SwFmtColl;
+class SwFormatColl;
 class SwField;
 class SwHTMLForm_Impl;
 class SwApplet_Impl;
@@ -74,7 +74,7 @@ class _HTMLAttr
     friend class _CellSaveStruct;
 
     SwNodeIndex nSttPara, nEndPara;
-    sal_Int32 nSttCntnt, nEndCntnt;
+    sal_Int32 nSttContent, nEndContent;
     bool bInsAtStart : 1;
     bool bLikePara : 1; // Attribut ueber dem gesamten Absatz setzen
     bool bValid : 1;    // ist das Attribut gueltig?
@@ -106,8 +106,8 @@ public:
     const SwNodeIndex& GetSttPara() const { return nSttPara; }
     const SwNodeIndex& GetEndPara() const { return nEndPara; }
 
-    sal_Int32 GetSttCnt() const { return nSttCntnt; }
-    sal_Int32 GetEndCnt() const { return nEndCntnt; }
+    sal_Int32 GetSttCnt() const { return nSttContent; }
+    sal_Int32 GetEndCnt() const { return nEndContent; }
 
     bool IsLikePara() const { return bLikePara; }
     void SetLikePara( bool bPara=true ) { bLikePara = bPara; }
@@ -154,8 +154,8 @@ struct _HTMLAttrTable
                 *pOrphans,
                 *pDirection,
 
-                *pCharFmts,     // Text-Attribute
-                *pINetFmt,
+                *pCharFormats,     // Text-Attribute
+                *pINetFormat,
 
                 *pBold,         // Zeichen-Attribute
                 *pBoldCJK,
@@ -205,7 +205,7 @@ class _HTMLAttrContext
 
     sal_uInt16  nToken;         // das Token, zu dem der Kontext gehoehrt
 
-    sal_uInt16  nTxtFmtColl;    // eine in dem Kontext begonnene Vorlage oder 0
+    sal_uInt16  nTextFormatColl;    // eine in dem Kontext begonnene Vorlage oder 0
 
     sal_uInt16  nLeftMargin;        // ein veraenderter linker Rand
     sal_uInt16  nRightMargin;       // ein veraenderter rechter Rand
@@ -218,7 +218,7 @@ class _HTMLAttrContext
 
     bool    bLRSpaceChanged : 1;// linker/rechtr Rand, Einzug veraendert?
     bool    bULSpaceChanged : 1;// oberer/unterer Rand veraendert?
-    bool    bDfltTxtFmtColl : 1;// nTxtFmtColl ist nur ein default
+    bool    bDfltTextFormatColl : 1;// nTextFormatColl ist nur ein default
     bool    bSpansSection : 1;  // Der Kontext spannt eine SwSection auf
     bool    bPopStack : 1;      // Oberhalb liegende Stack-Elemente entf.
     bool    bFinishPREListingXMP : 1;
@@ -235,7 +235,7 @@ public:
         pSaveDocContext( 0 ),
         pFrmItemSet( 0 ),
         nToken( nTokn ),
-        nTxtFmtColl( nPoolId ),
+        nTextFormatColl( nPoolId ),
         nLeftMargin( 0 ),
         nRightMargin( 0 ),
         nFirstLineIndent( 0 ),
@@ -244,7 +244,7 @@ public:
         eAppend( AM_NONE ),
         bLRSpaceChanged( false ),
         bULSpaceChanged( false ),
-        bDfltTxtFmtColl( bDfltColl ),
+        bDfltTextFormatColl( bDfltColl ),
         bSpansSection( false ),
         bPopStack( false ),
         bFinishPREListingXMP( false ),
@@ -257,7 +257,7 @@ public:
         pSaveDocContext( 0 ),
         pFrmItemSet( 0 ),
         nToken( nTokn ),
-        nTxtFmtColl( 0 ),
+        nTextFormatColl( 0 ),
         nLeftMargin( 0 ),
         nRightMargin( 0 ),
         nFirstLineIndent( 0 ),
@@ -266,7 +266,7 @@ public:
         eAppend( AM_NONE ),
         bLRSpaceChanged( false ),
         bULSpaceChanged( false ),
-        bDfltTxtFmtColl( false ),
+        bDfltTextFormatColl( false ),
         bSpansSection( false ),
         bPopStack( false ),
         bFinishPREListingXMP( false ),
@@ -279,8 +279,8 @@ public:
 
     sal_uInt16 GetToken() const { return nToken; }
 
-    sal_uInt16 GetTxtFmtColl() const { return bDfltTxtFmtColl ? 0 : nTxtFmtColl; }
-    sal_uInt16 GetDfltTxtFmtColl() const { return bDfltTxtFmtColl ? nTxtFmtColl : 0; }
+    sal_uInt16 GetTextFormatColl() const { return bDfltTextFormatColl ? 0 : nTextFormatColl; }
+    sal_uInt16 GetDfltTextFormatColl() const { return bDfltTextFormatColl ? nTextFormatColl : 0; }
 
     const OUString& GetClass() const { return aClass; }
 
@@ -333,7 +333,7 @@ class SwCSS1Parser;
 class SwHTMLNumRuleInfo;
 
 typedef boost::ptr_vector<ImageMap> ImageMaps;
-typedef std::vector<SwFrmFmt *> SwHTMLFrmFmts;
+typedef std::vector<SwFrameFormat *> SwHTMLFrameFormats;
 
 #define HTML_CNTXT_PROTECT_STACK    0x0001
 #define HTML_CNTXT_STRIP_PARA       0x0002
@@ -382,7 +382,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     _HTMLAttrs      aParaAttrs; // vorlauefige Absatz-Attribute
     _HTMLAttrTable  aAttrTab;   // "offene" Attribute
     _HTMLAttrContexts aContexts;// der aktuelle Attribut/Token-Kontext
-    SwHTMLFrmFmts   aMoveFlyFrms;// Fly-Frames, the anchor is moved
+    SwHTMLFrameFormats   aMoveFlyFrms;// Fly-Frames, the anchor is moved
     std::deque<sal_Int32> aMoveFlyCnts;// and the Content-Positions
 
     SwApplet_Impl *pAppletImpl; // das aktuelle Applet
@@ -502,7 +502,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     _HTMLAttr **GetAttrTabEntry( sal_uInt16 nWhich );
 
     // Einen neuen Textknoten an PaM-Position anlegen
-    bool AppendTxtNode( SwHTMLAppendMode eMode=AM_NORMAL, bool bUpdateNum=true );
+    bool AppendTextNode( SwHTMLAppendMode eMode=AM_NORMAL, bool bUpdateNum=true );
     void AddParSpace();
 
     // Ein Attribut beginnen/beenden
@@ -541,7 +541,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     void EndContext( _HTMLAttrContext *pContext );
     void ClearContext( _HTMLAttrContext *pContext );
 
-    const SwFmtColl *GetCurrFmtColl() const;
+    const SwFormatColl *GetCurrFormatColl() const;
 
     SwTwips GetCurrentBrowseWidth();
 
@@ -552,7 +552,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     // Verwalten von Absatz-Vorlagen
 
     // die Vorlagen auf dem Stack bzw. deren Attribute setzen
-    void SetTxtCollAttrs( _HTMLAttrContext *pContext = 0 );
+    void SetTextCollAttrs( _HTMLAttrContext *pContext = 0 );
 
     void InsertParaAttrs( const SfxItemSet& rItemSet );
 
@@ -574,7 +574,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
                                           short& nIndent ) const;
     void GetULSpaceFromContext( sal_uInt16 &rUpper, sal_uInt16 &rLower ) const;
 
-    void MovePageDescAttrs( SwNode *pSrcNd, sal_uLong nDestIdx, bool bFmtBreak );
+    void MovePageDescAttrs( SwNode *pSrcNd, sal_uLong nDestIdx, bool bFormatBreak );
 
     // Behandlung von Tags auf Absatz-Ebene
 
@@ -585,8 +585,8 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     void EndHeading();
 
     // <ADDRESS>, <BLOCKQUOTE> und <PRE>
-    void NewTxtFmtColl( int nToken, sal_uInt16 nPoolId );
-    void EndTxtFmtColl( int nToken );
+    void NewTextFormatColl( int nToken, sal_uInt16 nPoolId );
+    void EndTextFormatColl( int nToken );
 
     // <DIV> und <CENTER>
     void NewDivision( int nToken );
@@ -646,7 +646,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     void EndFontAttr( int nToken );
 
     // Tags, die durch Zeichenvorlagen realisiert werden
-    void NewCharFmt( int nToken );
+    void NewCharFormat( int nToken );
 
     // <SDFIELD>
 public:
@@ -680,11 +680,11 @@ private:
                                  const SvxCSS1PropertyInfo &rPropInfo,
                                  SfxItemSet &rFrmItemSet );
 
-    static void SetFrmFmtAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
+    static void SetFrameFormatAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
                          sal_uInt16 nFlags, SfxItemSet &rFrmItemSet );
 
     // Frames anlegen und Auto-gebundene Rahmen registrieren
-    void RegisterFlyFrm( SwFrmFmt *pFlyFrm );
+    void RegisterFlyFrm( SwFrameFormat *pFlyFrm );
 
     // Die Groesse des Fly-Frames an die Vorgaben und Gegebenheiten anpassen
     // (nicht fuer Grafiken, deshalb htmlplug.cxx)
@@ -784,9 +784,9 @@ private:
                         sal_Int16 eHoriOri,
                         SfxItemSet& rCSS1ItemSet,
                         SvxCSS1PropertyInfo& rCSS1PropInfo,
-                        const SvxMacroTableDtor& rMacroTbl,
-                        const std::vector<OUString>& rUnoMacroTbl,
-                        const std::vector<OUString>& rUnoMacroParamTbl,
+                        const SvxMacroTableDtor& rMacroTable,
+                        const std::vector<OUString>& rUnoMacroTable,
+                        const std::vector<OUString>& rUnoMacroParamTable,
                         bool bSetPropSet = true,
                         bool bHidden = false );
     void SetControlSize( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rShape, const Size& rTextSz,
@@ -928,9 +928,9 @@ struct SwPendingStack
 inline void _HTMLAttr::SetStart( const SwPosition& rPos )
 {
     nSttPara = rPos.nNode;
-    nSttCntnt = rPos.nContent.GetIndex();
+    nSttContent = rPos.nContent.GetIndex();
     nEndPara = nSttPara;
-    nEndCntnt = nSttCntnt;
+    nEndContent = nSttContent;
 }
 
 inline void _HTMLAttrContext::SetMargins( sal_uInt16 nLeft, sal_uInt16 nRight,
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 6cc813d68b5a..ad50a1440578 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -102,7 +102,7 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL )
     , pDfltColor(NULL)
     , pStartNdIdx(NULL)
     , pCurrPageDesc(NULL)
-    , pFmtFtn(NULL)
+    , pFormatFootnote(NULL)
     , nWarn(0)
     , nLastLFPos(0)
     , nLastParaToken(0)
@@ -123,7 +123,7 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL )
     , nDefListLvl(0)
     , nDefListMargin(0)
     , nHeaderFooterSpace(0)
-    , nTxtAttrsToIgnore(0)
+    , nTextAttrsToIgnore(0)
     , nExportMode(0)
     , nCSS1OutMode(0)
     , nCSS1Script(CSS1_OUTMODE_WESTERN)
@@ -137,7 +137,7 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL )
     , bCfgCpyLinkedGrfs( false )
     , bFirstLine(true)
     , bTagOn( false )
-    , bTxtAttr( false )
+    , bTextAttr( false )
     , bOutOpts( false )
     , bOutTable( false )
     , bOutHeader( false )
@@ -262,7 +262,7 @@ sal_uLong SwHTMLWriter::WriteStream()
 
     // die HTML-Vorlage holen
     bool bOldHTMLMode = false;
-    sal_uInt16 nOldTxtFmtCollCnt = 0, nOldCharFmtCnt = 0;
+    sal_uInt16 nOldTextFormatCollCnt = 0, nOldCharFormatCnt = 0;
 
     OSL_ENSURE( !pTemplate, "Wo kommt denn die HTML-Vorlage hier her?" );
     pTemplate = static_cast<HTMLReader*>(ReadHTML)->GetTemplateDoc();
@@ -272,8 +272,8 @@ sal_uLong SwHTMLWriter::WriteStream()
         bOldHTMLMode = pTemplate->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE);
         pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, true);
 
-        nOldTxtFmtCollCnt = pTemplate->GetTxtFmtColls()->size();
-        nOldCharFmtCnt = pTemplate->GetCharFmts()->size();
+        nOldTextFormatCollCnt = pTemplate->GetTextFormatColls()->size();
+        nOldCharFormatCnt = pTemplate->GetCharFormats()->size();
     }
 
     if( bShowProgress )
@@ -282,7 +282,7 @@ sal_uLong SwHTMLWriter::WriteStream()
 
     pDfltColor = 0;
     pFootEndNotes = 0;
-    pFmtFtn = 0;
+    pFormatFootnote = 0;
     bOutTable = bOutHeader = bOutFooter = bOutFlyFrame = false;
     pxFormComps = 0;
     nFormCntrlCnt = 0;
@@ -301,10 +301,10 @@ sal_uLong SwHTMLWriter::WriteStream()
     nLastLFPos = 0;
     nDefListLvl = 0;
     nDefListMargin = ((pTemplate && !bCfgOutStyles) ? pTemplate : pDoc)
-        ->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_HTML_DD, false )
-        ->GetLRSpace().GetTxtLeft();
+        ->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_HTML_DD, false )
+        ->GetLRSpace().GetTextLeft();
     nHeaderFooterSpace = 0;
-    nTxtAttrsToIgnore = 0;
+    nTextAttrsToIgnore = 0;
     nCSS1OutMode = 0;
     SvtScriptType nScript = SvtLanguageOptions::GetScriptTypeOfLanguage( GetAppLanguage() );
     switch( nScript )
@@ -401,15 +401,15 @@ sal_uLong SwHTMLWriter::WriteStream()
           !pDoc->getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE)) &&
         SfxItemState::SET == rPageItemSet.GetItemState( RES_HEADER, true, &pItem) )
     {
-        const SwFrmFmt *pHeaderFmt =
-            static_cast<const SwFmtHeader *>(pItem)->GetHeaderFmt();
-        if( pHeaderFmt )
-            OutHTML_HeaderFooter( *this, *pHeaderFmt, true );
+        const SwFrameFormat *pHeaderFormat =
+            static_cast<const SwFormatHeader *>(pItem)->GetHeaderFormat();
+        if( pHeaderFormat )
+            OutHTML_HeaderFooter( *this, *pHeaderFormat, true );
     }
 
-    nTxtAttrsToIgnore = nHeaderAttrs;
+    nTextAttrsToIgnore = nHeaderAttrs;
     Out_SwDoc( pOrigPam );
-    nTxtAttrsToIgnore = 0;
+    nTextAttrsToIgnore = 0;
 
     if( pxFormComps && pxFormComps->is() )
         OutForm( false, *pxFormComps );
@@ -421,10 +421,10 @@ sal_uLong SwHTMLWriter::WriteStream()
         (!pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) && !pDoc->getIDocumentSettingAccess().get(DocumentSettingId::BROWSE_MODE))  &&
         SfxItemState::SET == rPageItemSet.GetItemState( RES_FOOTER, true, &pItem) )
     {
-        const SwFrmFmt *pFooterFmt =
-            static_cast<const SwFmtFooter *>(pItem)->GetFooterFmt();
-        if( pFooterFmt )
-            OutHTML_HeaderFooter( *this, *pFooterFmt, false );
+        const SwFrameFormat *pFooterFormat =
+            static_cast<const SwFormatFooter *>(pItem)->GetFooterFormat();
+        if( pFooterFormat )
+            OutHTML_HeaderFooter( *this, *pFooterFormat, false );
     }
 
     if( bLFPossible )
@@ -448,11 +448,11 @@ sal_uLong SwHTMLWriter::WriteStream()
 
     aHTMLControls.DeleteAndDestroyAll();
 
-    if( !aChrFmtInfos.empty() )
-        aChrFmtInfos.clear();
+    if( !aChrFormatInfos.empty() )
+        aChrFormatInfos.clear();
 
-    if( !aTxtCollInfos.empty() )
-        aTxtCollInfos.clear();
+    if( !aTextCollInfos.empty() )
+        aTextCollInfos.clear();
 
     if(!aImgMapNames.empty())
         aImgMapNames.clear();
@@ -478,7 +478,7 @@ sal_uLong SwHTMLWriter::WriteStream()
     pxFormComps = 0;
 
     OSL_ENSURE( !pFootEndNotes,
-            "SwHTMLWriter::Write: Ftns nicht durch OutFootEndNotes geloescht" );
+            "SwHTMLWriter::Write: Footnotes nicht durch OutFootEndNotes geloescht" );
 
     pCurrPageDesc = 0;
 
@@ -496,17 +496,17 @@ sal_uLong SwHTMLWriter::WriteStream()
     {
         // Waehrend des Exports angelegte Zeichen- und Abastzvorlagen
         // loeschen
-        sal_uInt16 nTxtFmtCollCnt = pTemplate->GetTxtFmtColls()->size();
-        while( nTxtFmtCollCnt > nOldTxtFmtCollCnt )
-            pTemplate->DelTxtFmtColl( --nTxtFmtCollCnt );
-        OSL_ENSURE( pTemplate->GetTxtFmtColls()->size() == nOldTxtFmtCollCnt,
-                "falsche Anzahl TxtFmtColls geloescht" );
-
-        sal_uInt16 nCharFmtCnt = pTemplate->GetCharFmts()->size();
-        while( nCharFmtCnt > nOldCharFmtCnt )
-            pTemplate->DelCharFmt( --nCharFmtCnt );
-        OSL_ENSURE( pTemplate->GetCharFmts()->size() == nOldCharFmtCnt,
-                "falsche Anzahl CharFmts geloescht" );
+        sal_uInt16 nTextFormatCollCnt = pTemplate->GetTextFormatColls()->size();
+        while( nTextFormatCollCnt > nOldTextFormatCollCnt )
+            pTemplate->DelTextFormatColl( --nTextFormatCollCnt );
+        OSL_ENSURE( pTemplate->GetTextFormatColls()->size() == nOldTextFormatCollCnt,
+                "falsche Anzahl TextFormatColls geloescht" );
+
+        sal_uInt16 nCharFormatCnt = pTemplate->GetCharFormats()->size();
+        while( nCharFormatCnt > nOldCharFormatCnt )
+            pTemplate->DelCharFormat( --nCharFormatCnt );
+        OSL_ENSURE( pTemplate->GetCharFormats()->size() == nOldCharFormatCnt,
+                "falsche Anzahl CharFormats geloescht" );
 
         // HTML-Modus wieder restaurieren
         pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, bOldHTMLMode);
@@ -520,17 +520,17 @@ sal_uLong SwHTMLWriter::WriteStream()
     return nWarn;
 }
 
-static const SwFmtCol *lcl_html_GetFmtCol( const SwSection& rSection,
-                                       const SwSectionFmt& rFmt )
+static const SwFormatCol *lcl_html_GetFormatCol( const SwSection& rSection,
+                                       const SwSectionFormat& rFormat )
 {
-    const SwFmtCol *pCol = 0;
+    const SwFormatCol *pCol = 0;
 
     const SfxPoolItem* pItem;
     if( FILE_LINK_SECTION != rSection.GetType() &&
-        SfxItemState::SET == rFmt.GetAttrSet().GetItemState(RES_COL,false,&pItem) &&
-        static_cast<const SwFmtCol *>(pItem)->GetNumCols() > 1 )
+        SfxItemState::SET == rFormat.GetAttrSet().GetItemState(RES_COL,false,&pItem) &&
+        static_cast<const SwFormatCol *>(pItem)->GetNumCols() > 1 )
     {
-        pCol = static_cast<const SwFmtCol *>(pItem);
+        pCol = static_cast<const SwFormatCol *>(pItem);
     }
 
     return pCol;
@@ -544,8 +544,8 @@ static bool lcl_html_IsMultiColStart( const SwHTMLWriter& rHTMLWrt, sal_uLong nI
     if( pSectNd )
     {
         const SwSection& rSection = pSectNd->GetSection();
-        const SwSectionFmt *pFmt = rSection.GetFmt();
-        if( pFmt && lcl_html_GetFmtCol( rSection, *pFmt ) )
+        const SwSectionFormat *pFormat = rSection.GetFormat();
+        if( pFormat && lcl_html_GetFormatCol( rSection, *pFormat ) )
             bRet = true;
     }
 
@@ -565,8 +565,8 @@ static bool lcl_html_IsMultiColEnd( const SwHTMLWriter& rHTMLWrt, sal_uLong nInd
 
 static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
                                      const SwSection& rSection,
-                                     const SwSectionFmt& rFmt,
-                                  const SwFmtCol *pCol,
+                                     const SwSectionFormat& rFormat,
+                                  const SwFormatCol *pCol,
                                   bool bContinued=false )
 {
     OSL_ENSURE( pCol || !bContinued, "Continuation of DIV" );
@@ -586,7 +586,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
         sOut.append('\"');
     }
 
-    sal_uInt16 nDir = rHTMLWrt.GetHTMLDirection( rFmt.GetAttrSet() );
+    sal_uInt16 nDir = rHTMLWrt.GetHTMLDirection( rFormat.GetAttrSet() );
     rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
     rHTMLWrt.OutDirection( nDir );
 
@@ -650,7 +650,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
 
     rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
     if( rHTMLWrt.IsHTMLMode( rHTMLWrt.bCfgOutStyles ? HTMLMODE_ON : 0 ) )
-        rHTMLWrt.OutCSS1_SectionFmtOptions( rFmt, pCol );
+        rHTMLWrt.OutCSS1_SectionFormatOptions( rFormat, pCol );
 
     rHTMLWrt.Strm().WriteChar( '>' );
 
@@ -680,19 +680,19 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
     rHTMLWrt.OutAndSetDefList( 0 );
 
     const SwSection& rSection = rSectNd.GetSection();
-    const SwSectionFmt *pFmt = rSection.GetFmt();
-    OSL_ENSURE( pFmt, "Section without a format?" );
+    const SwSectionFormat *pFormat = rSection.GetFormat();
+    OSL_ENSURE( pFormat, "Section without a format?" );
 
     bool bStartTag = true;
     bool bEndTag = true;
-    const SwSectionFmt *pSurrFmt = 0;
+    const SwSectionFormat *pSurrFormat = 0;
     const SwSectionNode *pSurrSectNd = 0;
     const SwSection *pSurrSection = 0;
-    const SwFmtCol *pSurrCol = 0;
+    const SwFormatCol *pSurrCol = 0;
 
     sal_uInt32 nSectSttIdx = rSectNd.GetIndex();
     sal_uInt32 nSectEndIdx = rSectNd.EndOfSectionIndex();
-    const SwFmtCol *pCol = lcl_html_GetFmtCol( rSection, *pFmt );
+    const SwFormatCol *pCol = lcl_html_GetFormatCol( rSection, *pFormat );
     if( pCol )
     {
         // If the next node is a columned section node, too, don't export
@@ -716,10 +716,10 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
                     pBoxSttNd->GetIndex() < pSurrSectNd->GetIndex() )
                 {
                     pSurrSection = &pSurrSectNd->GetSection();
-                    pSurrFmt = pSurrSection->GetFmt();
-                    if( pSurrFmt )
-                        pSurrCol = lcl_html_GetFmtCol( *pSurrSection,
-                                                       *pSurrFmt );
+                    pSurrFormat = pSurrSection->GetFormat();
+                    if( pSurrFormat )
+                        pSurrCol = lcl_html_GetFormatCol( *pSurrSection,
+                                                       *pSurrFormat );
                 }
             }
         }
@@ -733,13 +733,13 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
         lcl_html_OutSectionEndTag( rHTMLWrt );
 
     if( bStartTag )
-        lcl_html_OutSectionStartTag( rHTMLWrt, rSection, *pFmt, pCol );
+        lcl_html_OutSectionStartTag( rHTMLWrt, rSection, *pFormat, pCol );
 
     {
         HTMLSaveData aSaveData( rHTMLWrt,
             rHTMLWrt.pCurPam->GetPoint()->nNode.GetIndex()+1,
             rSectNd.EndOfSectionIndex(),
-            false, pFmt );
+            false, pFormat );
         rHTMLWrt.Out_SwDoc( rHTMLWrt.pCurPam );
     }
 
@@ -753,7 +753,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
     if( pSurrCol &&
         pSurrSectNd->EndOfSectionIndex() - nSectEndIdx > 1 &&
         !lcl_html_IsMultiColStart( rHTMLWrt, nSectEndIdx+1 ) )
-        lcl_html_OutSectionStartTag( rHTMLWrt, *pSurrSection, *pSurrFmt,
+        lcl_html_OutSectionStartTag( rHTMLWrt, *pSurrSection, *pSurrFormat,
                                      pSurrCol, true );
 
     return rWrt;
@@ -782,18 +782,18 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
 
             OSL_ENSURE( !(rNd.IsGrfNode() || rNd.IsOLENode()),
                     "Grf- oder OLE-Node hier unerwartet" );
-            if( rNd.IsTxtNode() )
+            if( rNd.IsTextNode() )
             {
-                SwTxtNode* pTxtNd = rNd.GetTxtNode();
+                SwTextNode* pTextNd = rNd.GetTextNode();
 
                 if( !bFirstLine )
-                    pCurPam->GetPoint()->nContent.Assign( pTxtNd, 0 );
+                    pCurPam->GetPoint()->nContent.Assign( pTextNd, 0 );
 
-                OutHTML_SwTxtNode( *this, *pTxtNd );
+                OutHTML_SwTextNode( *this, *pTextNd );
             }
             else if( rNd.IsTableNode() )
             {
-                OutHTML_SwTblNode( *this, *rNd.GetTableNode(), 0 );
+                OutHTML_SwTableNode( *this, *rNd.GetTableNode(), 0 );
                 nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1;
             }
             else if( rNd.IsSectionNode() )
@@ -831,23 +831,23 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
 }
 
 // schreibe die StyleTabelle, algemeine Angaben,Header/Footer/Footnotes
-static void OutBodyColor( const sal_Char* pTag, const SwFmt *pFmt,
+static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat,
                           SwHTMLWriter& rHWrt )
 {
-    const SwFmt *pRefFmt = 0;
+    const SwFormat *pRefFormat = 0;
 
     if( rHWrt.pTemplate )
-        pRefFmt = SwHTMLWriter::GetTemplateFmt( pFmt->GetPoolFmtId(),
+        pRefFormat = SwHTMLWriter::GetTemplateFormat( pFormat->GetPoolFormatId(),
                                                 &rHWrt.pTemplate->getIDocumentStylePoolAccess() );
 
     const SvxColorItem *pColorItem = 0;
 
-    const SfxItemSet& rItemSet = pFmt->GetAttrSet();
+    const SfxItemSet& rItemSet = pFormat->GetAttrSet();
     const SfxPoolItem *pRefItem = 0, *pItem = 0;
     bool bItemSet = SfxItemState::SET == rItemSet.GetItemState( RES_CHRATR_COLOR,
                                                            true, &pItem);
-    bool bRefItemSet = pRefFmt &&
-        SfxItemState::SET == pRefFmt->GetAttrSet().GetItemState( RES_CHRATR_COLOR,
+    bool bRefItemSet = pRefFormat &&
+        SfxItemState::SET == pRefFormat->GetAttrSet().GetItemState( RES_CHRATR_COLOR,
                                                             true, &pRefItem);
     if( bItemSet )
     {
@@ -891,7 +891,7 @@ static void OutBodyColor( const sal_Char* pTag, const SwFmt *pFmt,
         if( COL_AUTO == aColor.GetColor() )
             aColor.SetColor( COL_BLACK );
         HTMLOutFuncs::Out_Color( rHWrt.Strm(), aColor, rHWrt.eDestEnc );
-        if( RES_POOLCOLL_STANDARD==pFmt->GetPoolFmtId() )
+        if( RES_POOLCOLL_STANDARD==pFormat->GetPoolFormatId() )
             rHWrt.pDfltColor = new Color( aColor );
     }
 }
@@ -901,21 +901,21 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs()
     sal_uLong nIdx = pCurPam->GetPoint()->nNode.GetIndex();
     sal_uLong nEndIdx = pCurPam->GetMark()->nNode.GetIndex();
 
-    SwTxtNode *pTxtNd = 0;
+    SwTextNode *pTextNd = 0;
     while( nIdx<=nEndIdx &&
-        0==(pTxtNd=pDoc->GetNodes()[nIdx]->GetTxtNode()) )
+        0==(pTextNd=pDoc->GetNodes()[nIdx]->GetTextNode()) )
         nIdx++;
 
-    OSL_ENSURE( pTxtNd, "Kein Text-Node gefunden" );
-    if( !pTxtNd || !pTxtNd->HasHints() )
+    OSL_ENSURE( pTextNd, "Kein Text-Node gefunden" );
+    if( !pTextNd || !pTextNd->HasHints() )
         return 0;
 
     sal_uInt16 nAttrs = 0;
-    const size_t nCntAttr = pTxtNd->GetSwpHints().Count();
+    const size_t nCntAttr = pTextNd->GetSwpHints().Count();
     sal_Int32 nOldPos = 0;
     for( size_t i=0; i<nCntAttr; ++i )
     {
-        const SwTxtAttr *pHt = pTxtNd->GetSwpHints()[i];
+        const SwTextAttr *pHt = pTextNd->GetSwpHints()[i];
         if( !pHt->End() )
         {
             sal_Int32 nPos = pHt->GetStart();
@@ -924,14 +924,14 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs()
                      && pHt->Which() != RES_TXTATR_ANNOTATION ) )
                 break;
 
-            const sal_uInt16 nFldWhich =
-                static_cast<const SwFmtFld&>(pHt->GetAttr()).GetField()->GetTyp()->Which();
-            if( RES_POSTITFLD!=nFldWhich &&
-                RES_SCRIPTFLD!=nFldWhich )
+            const sal_uInt16 nFieldWhich =
+                static_cast<const SwFormatField&>(pHt->GetAttr()).GetField()->GetTyp()->Which();
+            if( RES_POSTITFLD!=nFieldWhich &&
+                RES_SCRIPTFLD!=nFieldWhich )
                 break;
 
             OutNewLine();
-            OutHTML_SwFmtFld( *this, pHt->GetAttr() );
+            OutHTML_SwFormatField( *this, pHt->GetAttr() );
             nOldPos = nPos;
             OSL_ENSURE( nAttrs<SAL_MAX_UINT16, "Too many attributes" );
             nAttrs++;
@@ -990,15 +990,15 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
     while( nNodeIdx < pDoc->GetNodes().Count() )
     {
         SwNode *pNd = pDoc->GetNodes()[ nNodeIdx ];
-        if( pNd->IsCntntNode() )
+        if( pNd->IsContentNode() )
         {
-            pPageDesc = static_cast<const SwFmtPageDesc &>(pNd->GetCntntNode()
+            pPageDesc = static_cast<const SwFormatPageDesc &>(pNd->GetContentNode()
                 ->GetAttr(RES_PAGEDESC)).GetPageDesc();
             break;
         }
         else if( pNd->IsTableNode() )
         {
-            pPageDesc = pNd->GetTableNode()->GetTable().GetFrmFmt()
+            pPageDesc = pNd->GetTableNode()->GetTable().GetFrameFormat()
                            ->GetPageDesc().GetPageDesc();
             break;
         }
@@ -1036,15 +1036,15 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
         // Textfarbe ausgeben, wenn sie an der Standard-Vorlage gesetzt ist
         // und sich geaendert hat.
         OutBodyColor( OOO_STRING_SVTOOLS_HTML_O_text,
-                      pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false ),
+                      pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD, false ),
                       *this );
 
         // Farben fuer (un)besuchte Links
         OutBodyColor( OOO_STRING_SVTOOLS_HTML_O_link,
-                      pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( RES_POOLCHR_INET_NORMAL ),
+                      pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( RES_POOLCHR_INET_NORMAL ),
                       *this );
         OutBodyColor( OOO_STRING_SVTOOLS_HTML_O_vlink,
-                      pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( RES_POOLCHR_INET_VISIT ),
+                      pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( RES_POOLCHR_INET_VISIT ),
                       *this );
 
         const SfxItemSet& rItemSet = pPageDesc->GetMaster().GetAttrSet();
@@ -1407,7 +1407,7 @@ sal_Int32 SwHTMLWriter::indexOfDotLeaders( sal_uInt16 nPoolId, const OUString& r
 // einen anderen Dokument-Teil auszugeben, wie z.B. Header/Footer
 HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt,
                            sal_uLong nEnd, bool bSaveNum,
-                           const SwFrmFmt *pFrmFmt)
+                           const SwFrameFormat *pFrameFormat)
     : rWrt(rWriter)
     , pOldPam(rWrt.pCurPam)
     , pOldEnd(rWrt.GetEndPaM())
@@ -1418,7 +1418,7 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt,
     , bOldOutHeader(rWrt.bOutHeader)
     , bOldOutFooter(rWrt.bOutFooter)
     , bOldOutFlyFrame(rWrt.bOutFlyFrame)
-    , pOldFlyFmt(NULL)
+    , pOldFlyFormat(NULL)
 {
     bOldWriteAll = rWrt.bWriteAll;
 
@@ -1455,8 +1455,8 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt,
     // Die Numerierung wird in jedem Fall unterbrochen.
     rWrt.GetNumInfo().Clear();
 
-    if( pFrmFmt )
-        rWrt.nDirection = rWrt.GetHTMLDirection( pFrmFmt->GetAttrSet() );
+    if( pFrameFormat )
+        rWrt.nDirection = rWrt.GetHTMLDirection( pFrameFormat->GetAttrSet() );
 }
 
 HTMLSaveData::~HTMLSaveData()
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index b60d32e28c74..3cc109c49e4e 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -35,12 +35,12 @@
 
 // einige Forward Deklarationen
 class Color;
-class SwFrmFmt;
-class SwFlyFrmFmt;
-class SwDrawFrmFmt;
-class SwFmtINetFmt;
-class SwFmtVertOrient;
-class SwFmtFtn;
+class SwFrameFormat;
+class SwFlyFrameFormat;
+class SwDrawFrameFormat;
+class SwFormatINetFormat;
+class SwFormatVertOrient;
+class SwFormatFootnote;
 class SwStartNode;
 class SwTableNode;
 class SwPageDesc;
@@ -53,9 +53,9 @@ class SvxBrushItem;
 class SvxFontItem;
 class SwHTMLNumRuleInfo;
 class SwHTMLPosFlyFrms;
-class SwTxtFtn;
+class SwTextFootnote;
 
-typedef std::vector<SwTxtFtn*> SwHTMLTxtFtns;
+typedef std::vector<SwTextFootnote*> SwHTMLTextFootnotes;
 
 extern SwAttrFnTab aHTMLAttrFnTab;
 
@@ -208,12 +208,12 @@ public:
     ~HTMLControls() { DeleteAndDestroyAll(); }
 };
 
-typedef std::vector<SwFmtINetFmt*> INetFmts;
+typedef std::vector<SwFormatINetFormat*> INetFormats;
 
-struct SwHTMLFmtInfo
+struct SwHTMLFormatInfo
 {
-    const SwFmt *pFmt;      // das Format selbst
-    const SwFmt *pRefFmt;   // das Vergleichs-Format
+    const SwFormat *pFormat;      // das Format selbst
+    const SwFormat *pRefFormat;   // das Vergleichs-Format
 
     OString aToken;          // das auszugebende Token
     OUString aClass;          // die auszugebende Klasse
@@ -230,9 +230,9 @@ struct SwHTMLFmtInfo
     bool bScriptDependent;
 
     // Konstruktor fuer einen Dummy zum Suchen
-    SwHTMLFmtInfo( const SwFmt *pF ) :
-        pFmt( pF ),
-        pRefFmt(0),
+    SwHTMLFormatInfo( const SwFormat *pF ) :
+        pFormat( pF ),
+        pRefFormat(0),
         pItemSet( 0 ),
         nLeftMargin( 0 ),
         nRightMargin( 0 ),
@@ -243,27 +243,27 @@ struct SwHTMLFmtInfo
     {}
 
     // Konstruktor zum Erstellen der Format-Info
-    SwHTMLFmtInfo( const SwFmt *pFmt, SwDoc *pDoc, SwDoc *pTemlate,
+    SwHTMLFormatInfo( const SwFormat *pFormat, SwDoc *pDoc, SwDoc *pTemlate,
                    bool bOutStyles, LanguageType eDfltLang=LANGUAGE_DONTKNOW,
                    sal_uInt16 nScript=CSS1_OUTMODE_ANY_SCRIPT,
                    bool bHardDrop=false );
-    ~SwHTMLFmtInfo();
+    ~SwHTMLFormatInfo();
 
-    friend bool operator==( const SwHTMLFmtInfo& rInfo1,
-                            const SwHTMLFmtInfo& rInfo2 )
+    friend bool operator==( const SwHTMLFormatInfo& rInfo1,
+                            const SwHTMLFormatInfo& rInfo2 )
     {
-        return reinterpret_cast<sal_IntPtr>(rInfo1.pFmt) == reinterpret_cast<sal_IntPtr>(rInfo2.pFmt);
+        return reinterpret_cast<sal_IntPtr>(rInfo1.pFormat) == reinterpret_cast<sal_IntPtr>(rInfo2.pFormat);
     }
 
-    friend bool operator<( const SwHTMLFmtInfo& rInfo1,
-                            const SwHTMLFmtInfo& rInfo2 )
+    friend bool operator<( const SwHTMLFormatInfo& rInfo1,
+                            const SwHTMLFormatInfo& rInfo2 )
     {
-        return reinterpret_cast<sal_IntPtr>(rInfo1.pFmt) < reinterpret_cast<sal_IntPtr>(rInfo2.pFmt);
+        return reinterpret_cast<sal_IntPtr>(rInfo1.pFormat) < reinterpret_cast<sal_IntPtr>(rInfo2.pFormat);
     }
 
 };
 
-typedef boost::ptr_set<SwHTMLFmtInfo> SwHTMLFmtInfos;
+typedef boost::ptr_set<SwHTMLFormatInfo> SwHTMLFormatInfos;
 
 class IDocumentStylePoolAccess;
 
@@ -296,10 +296,10 @@ public:
     std::vector<OUString> aOutlineMarks;
     std::vector<sal_uInt32> aOutlineMarkPoss;
     HTMLControls aHTMLControls;     // die zu schreibenden Forms
-    SwHTMLFmtInfos aChrFmtInfos;
-    SwHTMLFmtInfos aTxtCollInfos;
-    INetFmts aINetFmts;             // die "offenen" INet-Attribute
-    SwHTMLTxtFtns *pFootEndNotes;
+    SwHTMLFormatInfos aChrFormatInfos;
+    SwHTMLFormatInfos aTextCollInfos;
+    INetFormats aINetFormats;             // die "offenen" INet-Attribute
+    SwHTMLTextFootnotes *pFootEndNotes;
 
     OUString aCSS1Selector;           // der Selektor eines Styles
     OUString aNonConvertableCharacters;
@@ -311,7 +311,7 @@ public:
     Color *pDfltColor;              // default Farbe
     SwNodeIndex *pStartNdIdx;       // Index des ersten Absatz
     const SwPageDesc *pCurrPageDesc;// Die aktuelle Seiten-Vorlage
-    const SwFmtFtn *pFmtFtn;
+    const SwFormatFootnote *pFormatFootnote;
 
     sal_uInt32 aFontHeights[7];         // die Font-Hoehen 1-7
 
@@ -336,7 +336,7 @@ public:
     sal_uInt16 nDefListLvl;             // welcher DL-Level existiert gerade
     sal_Int32  nDefListMargin;          // Wie weit wird in DL eingerueckt
     sal_uInt16 nHeaderFooterSpace;
-    sal_uInt16 nTxtAttrsToIgnore;
+    sal_uInt16 nTextAttrsToIgnore;
     sal_uInt16 nExportMode;
     sal_uInt16 nCSS1OutMode;
     sal_uInt16 nCSS1Script;         // contains default script (that's the one
@@ -360,14 +360,14 @@ public:
     bool bTagOn : 1;                // Tag an oder aus/Attr-Start oder -Ende
 
     // Die folgenden beiden Flags geben an, wir Attribute exportiert werden:
-    // bTxtAttr bOutOpts
+    // bTextAttr bOutOpts
     // 0        0           Style-Sheets
     // 1        0           Hints: Jedes Attribut wird als eignes Tag
     //                          geschrieben und es gibt ein End-Tag
     // 0        1           (Absatz-)Attribute: Das Attribut wird als Option
     //                          eines bereits geschrieben Tags exportiert. Es
     //                          gibt kein End-Tag.
-    bool bTxtAttr : 1;
+    bool bTextAttr : 1;
     // 8
     bool bOutOpts : 1;
 
@@ -423,9 +423,9 @@ public:
     void OutHyperlinkHRefValue( const OUString& rURL );
 
     // gebe die evt. an der akt. Position stehenden FlyFrame aus.
-    bool OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx,
+    bool OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx,
                         sal_uInt8 nPos, HTMLOutContext *pContext = 0 );
-    void OutFrmFmt( sal_uInt8 nType, const SwFrmFmt& rFmt,
+    void OutFrameFormat( sal_uInt8 nType, const SwFrameFormat& rFormat,
                     const SdrObject *pSdrObj );
 
     void OutForm( bool bTagOn=true, const SwStartNode *pStNd=0 );
@@ -439,8 +439,8 @@ public:
 
     void OutFootEndNoteInfo();
     void OutFootEndNotes();
-    OUString GetFootEndNoteSym( const SwFmtFtn& rFmtFtn );
-    void OutFootEndNoteSym( const SwFmtFtn& rFmtFtn, const OUString& rNum,
+    OUString GetFootEndNoteSym( const SwFormatFootnote& rFormatFootnote );
+    void OutFootEndNoteSym( const SwFormatFootnote& rFormatFootnote, const OUString& rNum,
                              sal_uInt16 nScript );
 
     void OutBasic();
@@ -476,18 +476,18 @@ public:
     // ALT/ALIGN/WIDTH/HEIGHT/HSPACE/VSPACE-Optionen des aktuellen
     // Frame-Formats ausgeben und ggf. ein <BR CLEAR=...> vorne an
     // rEndTags anhaengen
-    OString OutFrmFmtOptions( const SwFrmFmt& rFrmFmt, const OUString& rAltTxt,
+    OString OutFrameFormatOptions( const SwFrameFormat& rFrameFormat, const OUString& rAltText,
         sal_uInt32 nFrmOpts, const OString& rEndTags = OString() );
 
-    void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rFrmFmt, const OUString& rAltTxt, sal_uInt32 nFrmOpts);
+    void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAltText, sal_uInt32 nFrmOpts);
 
-    void OutCSS1_TableFrmFmtOptions( const SwFrmFmt& rFrmFmt );
-    void OutCSS1_TableCellBorderHack(const SwFrmFmt& rFrmFmt);
-    void OutCSS1_SectionFmtOptions( const SwFrmFmt& rFrmFmt, const SwFmtCol *pCol );
-    void OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt, sal_uInt32 nFrmOpts,
+    void OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameFormat );
+    void OutCSS1_TableCellBorderHack(const SwFrameFormat& rFrameFormat);
+    void OutCSS1_SectionFormatOptions( const SwFrameFormat& rFrameFormat, const SwFormatCol *pCol );
+    void OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat, sal_uInt32 nFrmOpts,
                                 const SdrObject *pSdrObj=0,
                                 const SfxItemSet *pItemSet=0 );
-    void OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt );
+    void OutCSS1_FrameFormatBackground( const SwFrameFormat& rFrameFormat );
 
     void ChangeParaToken( sal_uInt16 nNew );
 
@@ -513,7 +513,7 @@ public:
 
     static sal_uInt32 ToPixel( sal_uInt32 nVal, const bool bVert );
 
-    sal_uInt16 GuessFrmType( const SwFrmFmt& rFrmFmt,
+    sal_uInt16 GuessFrmType( const SwFrameFormat& rFrameFormat,
                          const SdrObject*& rpStrObj );
     static sal_uInt16 GuessOLENodeFrmType( const SwNode& rNd );
 
@@ -537,14 +537,14 @@ public:
     // Die Numerierungs-Information des naeschten Absatz loeschen.
     void ClearNextNumInfo();
 
-    static const SdrObject* GetHTMLControl( const SwDrawFrmFmt& rFmt );
-    static const SdrObject* GetMarqueeTextObj( const SwDrawFrmFmt& rFmt );
-    static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
+    static const SdrObject* GetHTMLControl( const SwDrawFrameFormat& rFormat );
+    static const SdrObject* GetMarqueeTextObj( const SwDrawFrameFormat& rFormat );
+    static sal_uInt16 GetCSS1Selector( const SwFormat *pFormat, OString& rToken,
                                    OUString& rClass, sal_uInt16& rRefPoolId,
                                    OUString *pPseudo=0 );
 
-    static const SwFmt *GetTemplateFmt( sal_uInt16 nPoolId, IDocumentStylePoolAccess* /*SwDoc*/ pTemplate );
-    static const SwFmt *GetParentFmt( const SwFmt& rFmt, sal_uInt16 nDeep );
+    static const SwFormat *GetTemplateFormat( sal_uInt16 nPoolId, IDocumentStylePoolAccess* /*SwDoc*/ pTemplate );
+    static const SwFormat *GetParentFormat( const SwFormat& rFormat, sal_uInt16 nDeep );
 
     static void SubtractItemSet( SfxItemSet& rItemSet,
                                  const SfxItemSet& rRefItemSet,
@@ -572,7 +572,7 @@ public:
     inline bool IsCSS1Source( sal_uInt16 n ) const;
     inline bool IsCSS1Script( sal_uInt16 n ) const;
 
-    static const sal_Char *GetNumFormat( sal_uInt16 nFmt );
+    static const sal_Char *GetNumFormat( sal_uInt16 nFormat );
     static void PrepareFontList( const SvxFontItem& rFontItem, OUString& rNames,
                                  sal_Unicode cQuote, bool bGeneric );
     static sal_uInt16 GetCSS1ScriptForScriptType( sal_uInt16 nScriptType );
@@ -580,7 +580,7 @@ public:
 
     FieldUnit GetCSS1Unit() const { return eCSS1Unit; }
 
-    sal_Int32 indexOfDotLeaders( sal_uInt16 nPoolId, const OUString& rTxt );
+    sal_Int32 indexOfDotLeaders( sal_uInt16 nPoolId, const OUString& rText );
 };
 
 inline bool SwHTMLWriter::IsCSS1Source( sal_uInt16 n ) const
@@ -631,34 +631,34 @@ struct HTMLSaveData
     bool bOldOutHeader : 1;
     bool bOldOutFooter : 1;
     bool bOldOutFlyFrame : 1;
-    const SwFlyFrmFmt* pOldFlyFmt;
+    const SwFlyFrameFormat* pOldFlyFormat;
 
     HTMLSaveData( SwHTMLWriter&, sal_uLong nStt, sal_uLong nEnd,
                   bool bSaveNum=true,
-                  const SwFrmFmt *pFrmFmt=0  );
+                  const SwFrameFormat *pFrameFormat=0  );
     ~HTMLSaveData();
 };
 
 // einige Funktions-Deklarationen
-Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFmt,
+Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFormat,
                                bool bInCntnr );
-Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFmt,
+Writer& OutHTML_FrameFormatOLENodeGrf( Writer& rWrt, const SwFrameFormat& rFormat,
                                   bool bInCntnr );
 
-Writer& OutHTML_SwTxtNode( Writer&, const SwCntntNode& );
-Writer& OutHTML_SwTblNode( Writer& , SwTableNode &, const SwFrmFmt *,
+Writer& OutHTML_SwTextNode( Writer&, const SwContentNode& );
+Writer& OutHTML_SwTableNode( Writer& , SwTableNode &, const SwFrameFormat *,
                            const OUString* pCaption=0, bool bTopCaption=false );
 
-Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, const SwDrawFrmFmt& rFmt,
+Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, const SwDrawFrameFormat& rFormat,
                                      const SdrUnoObj& rSdrObj, bool bInCntnr );
-Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, const SwDrawFrmFmt& rFmt,
+Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt, const SwDrawFrameFormat& rFormat,
                                      const SdrObject& rSdrObj );
 
-Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
+Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat,
                               bool bHeader );
 
-Writer& OutHTML_Image( Writer&, const SwFrmFmt& rFmt,
-                       Graphic& rGraphic, const OUString& rAlternateTxt,
+Writer& OutHTML_Image( Writer&, const SwFrameFormat& rFormat,
+                       Graphic& rGraphic, const OUString& rAlternateText,
                        const Size& rRealSize, sal_uInt32 nFrmOpts,
                        const sal_Char *pMarkType = 0,
                        const ImageMap *pGenImgMap = 0 );
@@ -666,9 +666,9 @@ Writer& OutHTML_Image( Writer&, const SwFrmFmt& rFmt,
 Writer& OutHTML_BulletImage( Writer& rWrt, const sal_Char *pTag,
                              const SvxBrushItem* pBrush );
 
-Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt );
-Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt );
-Writer& OutHTML_INetFmt( Writer&, const SwFmtINetFmt& rINetFmt, bool bOn );
+Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt );
+Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt );
+Writer& OutHTML_INetFormat( Writer&, const SwFormatINetFormat& rINetFormat, bool bOn );
 
 Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet );
 Writer& OutCSS1_ParaTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet );
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index f89c4f96aa12..26a63f81bfef 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -21,9 +21,9 @@
 
 #include <shellio.hxx>
 
-class SwNumRuleTbl;
+class SwNumRuleTable;
 class SwDoc;
-class SwTxtNode;
+class SwTextNode;
 class SwNumRule;
 class SwNodeIndex;
 
@@ -64,7 +64,7 @@ void GetWW8Writer( const OUString&, const OUString&, WriterRef& );
 // Absatz-Einzug abgezogen werden muss.
 class SW_DLLPUBLIC SwRelNumRuleSpaces
 {
-    SwNumRuleTbl* pNumRuleTbl;  // Liste aller benannten NumRules
+    SwNumRuleTable* pNumRuleTable;  // Liste aller benannten NumRules
 
 public:
     SwRelNumRuleSpaces( SwDoc& rDoc, bool bNewDoc );
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 94301c82bd8c..57fd9f5df436 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -58,40 +58,40 @@ struct SW_DLLPUBLIC SwFltPosition
 {
 public:
     SwNodeIndex m_nNode;
-    sal_Int32 m_nCntnt;
+    sal_Int32 m_nContent;
 public:
     SwFltPosition(const SwFltPosition &rOther)
         : m_nNode(rOther.m_nNode)
-        , m_nCntnt(rOther.m_nCntnt)
+        , m_nContent(rOther.m_nContent)
     {
     }
     SwFltPosition &operator=(const SwFltPosition &rOther)
     {
         m_nNode = rOther.m_nNode;
-        m_nCntnt = rOther.m_nCntnt;
+        m_nContent = rOther.m_nContent;
         return *this;
     }
     bool operator==(const SwFltPosition &rOther) const
     {
-        return (m_nCntnt == rOther.m_nCntnt &&
+        return (m_nContent == rOther.m_nContent &&
                 m_nNode == rOther.m_nNode);
     }
     void SetPos(SwNodeIndex &rNode, sal_uInt16 nIdx)
     {
         m_nNode = rNode;
-        m_nCntnt = nIdx;
+        m_nContent = nIdx;
     }
     //operators with SwPosition, where the node is hacked to the previous one,
     //and the offset to content is de-dynamic-ified
     SwFltPosition(const SwPosition &rPos)
         : m_nNode(rPos.nNode, -1)
-        , m_nCntnt(rPos.nContent.GetIndex())
+        , m_nContent(rPos.nContent.GetIndex())
     {
     }
     void SetPos(const SwPosition &rPos)
     {
         m_nNode = rPos.nNode.GetIndex()-1;
-        m_nCntnt = rPos.nContent.GetIndex();
+        m_nContent = rPos.nContent.GetIndex();
     }
 };
 
@@ -184,7 +184,7 @@ public:
     void StealAttr(const SwNodeIndex& rNode, sal_uInt16 nAttrId = 0);
     void MarkAllAttrsOld();
     void KillUnlockedAttrs(const SwPosition& pPos);
-    SfxPoolItem* GetFmtStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos = 0);
+    SfxPoolItem* GetFormatStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos = 0);
     const SfxPoolItem* GetOpenStackAttr(const SwPosition& rPos, sal_uInt16 nWhich);
     void Delete(const SwPaM &rPam);
 
@@ -199,20 +199,20 @@ class SwFltAnchorClient;
 
 class SW_DLLPUBLIC SwFltAnchor : public SfxPoolItem
 {
-    SwFrmFmt* pFrmFmt;
+    SwFrameFormat* pFrameFormat;
     SwFltAnchorClient * pClient;
 
 public:
-    SwFltAnchor(SwFrmFmt* pFlyFmt);
+    SwFltAnchor(SwFrameFormat* pFlyFormat);
     SwFltAnchor(const SwFltAnchor&);
     virtual ~SwFltAnchor();
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
     virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
-    void SetFrmFmt(SwFrmFmt * _pFrmFmt);
-    const SwFrmFmt* GetFrmFmt() const { return pFrmFmt;}
-          SwFrmFmt* GetFrmFmt() { return pFrmFmt;}
+    void SetFrameFormat(SwFrameFormat * _pFrameFormat);
+    const SwFrameFormat* GetFrameFormat() const { return pFrameFormat;}
+          SwFrameFormat* GetFrameFormat() { return pFrameFormat;}
 };
 
 class SwFltAnchorClient : public SwClient
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index dec1cc891b10..069e6b6ec1d6 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -39,8 +39,8 @@ class SwDoc;
 class SwPaM;
 class SwTableNode;
 class SwNodeIndex;
-class SwNoTxtNode;
-class SwTxtNode;
+class SwNoTextNode;
+class SwTextNode;
 class WW8TabDesc;
 
 namespace myImplHelpers
@@ -48,10 +48,10 @@ namespace myImplHelpers
 template<class C> class StyleMapperImpl;
 }
 
-class SwTxtFmtColl;
-class SwCharFmt;
-typedef myImplHelpers::StyleMapperImpl<SwTxtFmtColl> ParaMapper;
-typedef myImplHelpers::StyleMapperImpl<SwCharFmt> CharMapper;
+class SwTextFormatColl;
+class SwCharFormat;
+typedef myImplHelpers::StyleMapperImpl<SwTextFormatColl> ParaMapper;
+typedef myImplHelpers::StyleMapperImpl<SwCharFormat> CharMapper;
 
 namespace sw
 {
@@ -129,7 +129,7 @@ namespace sw
             @author
                 <a href="mailto:mmaher@openoffice.org">Martin Maher</a
         */
-        void SwapQuotesInField(OUString &rFmt);
+        void SwapQuotesInField(OUString &rFormat);
 
     }
 
@@ -191,7 +191,7 @@ namespace sw
                 StyleResult is a std::pair of a pointer to a style and a flag
                 which is true if the style existed previously in the document.
             */
-            typedef std::pair<SwTxtFmtColl*, bool> StyleResult;
+            typedef std::pair<SwTextFormatColl*, bool> StyleResult;
 
             /** Get the writer style which the word style should map to
 
@@ -251,7 +251,7 @@ namespace sw
                 StyleResult is a std::pair of a pointer to a style and a flag
                 which is true if the style existed previously in the document.
             */
-            typedef std::pair<SwCharFmt*, bool> StyleResult;
+            typedef std::pair<SwCharFormat*, bool> StyleResult;
 
             /** Get the writer style which the word style should map to
 
@@ -311,7 +311,7 @@ namespace sw
             their layout frms deleted and recalculated. This TableManager
             detects the necessity to do this, and all tables inserted into
             a document should be registered with this manager with
-            InsertTable, and before finialization DelAndMakeTblFrms should
+            InsertTable, and before finialization DelAndMakeTableFrms should
             be called.
 
             @author
@@ -322,14 +322,14 @@ namespace sw
         class InsertedTablesManager
         {
         public:
-            typedef std::map<InsertedTableClient *, SwNodeIndex *> TblMap;
-            typedef TblMap::iterator TblMapIter;
-            void DelAndMakeTblFrms();
+            typedef std::map<InsertedTableClient *, SwNodeIndex *> TableMap;
+            typedef TableMap::iterator TableMapIter;
+            void DelAndMakeTableFrms();
             void InsertTable(SwTableNode &rTableNode, SwPaM &rPaM);
             InsertedTablesManager(const SwDoc &rDoc);
         private:
             bool mbHasRoot;
-            TblMap maTables;
+            TableMap maTables;
         };
 
         /**
@@ -439,11 +439,11 @@ namespace sw
             So this function finds these ranges and returns a STL container
             of CharRuns
 
-            @param rTxtNd
+            @param rTextNd
                 The TextNode we want to ranges from
 
             @param nStart
-                The position in the TxtNode to start processing from
+                The position in the TextNode to start processing from
 
             @param bSplitOnCharSet
                 Set to true is we want to split on ranges of characters that
@@ -459,7 +459,7 @@ namespace sw
 
             @see #i22537# for example
         */
-        CharRuns GetPseudoCharRuns(const SwTxtNode& rTxtNd,
+        CharRuns GetPseudoCharRuns(const SwTextNode& rTextNd,
             sal_Int32 nStart = 0, bool bSplitOnCharSet = false);
     }
 }
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index 4a3ccf22fb31..828c4f99d965 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -22,7 +22,7 @@
 
 // einige Forward-Deklarationen
 class SwNode;
-class SwCntntNode;
+class SwContentNode;
 class Writer;
 class SfxPoolItem;
 class SfxItemSet;
@@ -46,7 +46,7 @@ RES_NODE_BEGIN = 0,
 RES_NODE_END
 };
 
-typedef Writer& (*FnNodeOut)( Writer&, SwCntntNode& );
+typedef Writer& (*FnNodeOut)( Writer&, SwContentNode& );
 typedef FnNodeOut SwNodeFnTab[ RES_NODE_END - RES_NODE_BEGIN ];
 
 SW_DLLPUBLIC Writer& Out( const SwNodeFnTab, SwNode&, Writer & rWrt );
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index fa50d3c03eb5..6af8e2edf6ed 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -235,7 +235,7 @@ protected:
 
     sal_uInt16 nBorder;             // Dicke der ausseren Umrandung
     sal_uInt16 nInnerBorder;        // Dicke der inneren Umrandung
-    sal_uInt32 nBaseWidth;            // Bezugsgroesse fur Breiten SwFmtFrmSize
+    sal_uInt32 nBaseWidth;            // Bezugsgroesse fur Breiten SwFormatFrmSize
 
     sal_uInt16 nHeadEndRow;         // letzte Zeile des Tabellen-Kopfes
 
diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx
index 01e9c1039674..efb11063fc02 100644
--- a/sw/source/filter/inc/wwstyles.hxx
+++ b/sw/source/filter/inc/wwstyles.hxx
@@ -61,7 +61,7 @@ namespace ww
         stiTocFirst = stiToc1,
         stiTocLast = stiToc9,
         stiNormIndent = 28,             // 0x001C
-        stiFtnText = 29,                // 0x001D
+        stiFootnoteText = 29,                // 0x001D
         stiAtnText = 30,                // 0x001E
         stiHeader = 31,                 // 0x001F
         stiFooter = 32,                 // 0x0020
@@ -70,7 +70,7 @@ namespace ww
         stiToCaption = 35,              // 0x0023
         stiEnvAddr = 36,                // 0x0024
         stiEnvRet = 37,                 // 0x0025
-        stiFtnRef = 38,                 // 0x0026  char style
+        stiFootnoteRef = 38,                 // 0x0026  char style
         stiAtnRef = 39,                 // 0x0027  char style
         stiLnn = 40,                    // 0x0028  char style
         stiPgn = 41,                    // 0x0029  char style
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 987fba83fefb..021cff725530 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -64,7 +64,7 @@ sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rP
 
     // Step 4: Insert all content into the new node
     rPam.Move(fnMoveBackward);
-    rDoc.SetTxtFmtColl(rPam, rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false));
+    rDoc.SetTextFormatColl(rPam, rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD, false));
 
     SwDocShell* pDocShell(rDoc.GetDocShell());
     uno::Reference<lang::XMultiServiceFactory> xMultiServiceFactory(comphelper::getProcessServiceFactory());
@@ -105,26 +105,26 @@ sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rP
         // If we are in insert mode, join the split node that is in front
         // of the new content with the first new node. Or in other words:
         // Revert the first split node.
-        SwTxtNode* pTxtNode = pSttNdIdx->GetNode().GetTxtNode();
+        SwTextNode* pTextNode = pSttNdIdx->GetNode().GetTextNode();
         SwNodeIndex aNxtIdx(*pSttNdIdx);
-        if (pTxtNode && pTxtNode->CanJoinNext(&aNxtIdx) && pSttNdIdx->GetIndex() + 1 == aNxtIdx.GetIndex())
+        if (pTextNode && pTextNode->CanJoinNext(&aNxtIdx) && pSttNdIdx->GetIndex() + 1 == aNxtIdx.GetIndex())
         {
             // If the PaM points to the first new node, move the PaM to the
             // end of the previous node.
             if (aPam.GetPoint()->nNode == aNxtIdx)
             {
                 aPam.GetPoint()->nNode = *pSttNdIdx;
-                aPam.GetPoint()->nContent.Assign(pTxtNode, pTxtNode->GetTxt().getLength());
+                aPam.GetPoint()->nContent.Assign(pTextNode, pTextNode->GetText().getLength());
             }
             // If the first new node isn't empty, convert  the node's text
             // attributes into hints. Otherwise, set the new node's
             // paragraph style at the previous (empty) node.
-            SwTxtNode* pDelNd = aNxtIdx.GetNode().GetTxtNode();
-            if (pTxtNode->GetTxt().getLength())
-                pDelNd->FmtToTxtAttr(pTxtNode);
+            SwTextNode* pDelNd = aNxtIdx.GetNode().GetTextNode();
+            if (pTextNode->GetText().getLength())
+                pDelNd->FormatToTextAttr(pTextNode);
             else
-                pTxtNode->ChgFmtColl(pDelNd->GetTxtColl());
-            pTxtNode->JoinNext();
+                pTextNode->ChgFormatColl(pDelNd->GetTextColl());
+            pTextNode->JoinNext();
         }
     }
 
@@ -133,19 +133,19 @@ sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rP
         // If we are in insert mode, join the split node that is after
         // the new content with the last new node. Or in other words:
         // Revert the second split node.
-        SwTxtNode* pTxtNode = pSttNdIdx2->GetNode().GetTxtNode();
+        SwTextNode* pTextNode = pSttNdIdx2->GetNode().GetTextNode();
         SwNodeIndex aPrevIdx(*pSttNdIdx2);
-        if (pTxtNode && pTxtNode->CanJoinPrev(&aPrevIdx) && pSttNdIdx2->GetIndex() - 1 == aPrevIdx.GetIndex())
+        if (pTextNode && pTextNode->CanJoinPrev(&aPrevIdx) && pSttNdIdx2->GetIndex() - 1 == aPrevIdx.GetIndex())
         {
             // If the last new node isn't empty, convert  the node's text
             // attributes into hints. Otherwise, set the new node's
             // paragraph style at the next (empty) node.
-            SwTxtNode* pDelNd = aPrevIdx.GetNode().GetTxtNode();
-            if (pTxtNode->GetTxt().getLength())
-                pDelNd->FmtToTxtAttr(pTxtNode);
+            SwTextNode* pDelNd = aPrevIdx.GetNode().GetTextNode();
+            if (pTextNode->GetText().getLength())
+                pDelNd->FormatToTextAttr(pTextNode);
             else
-                pTxtNode->ChgFmtColl(pDelNd->GetTxtColl());
-            pTxtNode->JoinPrev();
+                pTextNode->ChgFormatColl(pDelNd->GetTextColl());
+            pTextNode->JoinPrev();
         }
     }
 
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index a6ebb7b2fa13..be8088afaea8 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -198,7 +198,7 @@ Writer::NewSwPaM(SwDoc & rDoc, sal_uLong const nStartIdx, sal_uLong const nEndId
     SwNodes *const pNds = &rDoc.GetNodes();
 
     SwNodeIndex aStt( *pNds, nStartIdx );
-    SwCntntNode* pCNode = aStt.GetNode().GetCntntNode();
+    SwContentNode* pCNode = aStt.GetNode().GetContentNode();
     if( !pCNode && 0 == pNds->GoNext( &aStt ) )
     {
         OSL_FAIL( "No more ContentNode at StartPos" );
@@ -207,7 +207,7 @@ Writer::NewSwPaM(SwDoc & rDoc, sal_uLong const nStartIdx, sal_uLong const nEndId
     SwPaM* pNew = new SwPaM( aStt );
     pNew->SetMark();
     aStt = nEndIdx;
-    pCNode = aStt.GetNode().GetCntntNode();
+    pCNode = aStt.GetNode().GetContentNode();
     if (!pCNode)
         pCNode = SwNodes::GoPrevious(&aStt);
     assert(pCNode && "No more ContentNode at StartPos");
@@ -300,26 +300,26 @@ sal_uLong Writer::Write( SwPaM&, const uno::Reference < embed::XStorage >&, cons
     return ERR_SWG_WRITE_ERROR;
 }
 
-void Writer::PutNumFmtFontsInAttrPool()
+void Writer::PutNumFormatFontsInAttrPool()
 {
     // then there are a few fonts in the NumRules
     // These put into the Pool. After this does they have a RefCount > 1
     // it can be removed - it is already in the Pool
     SfxItemPool& rPool = pDoc->GetAttrPool();
-    const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
+    const SwNumRuleTable& rListTable = pDoc->GetNumRuleTable();
     const SwNumRule* pRule;
-    const SwNumFmt* pFmt;
+    const SwNumFormat* pFormat;
     const vcl::Font* pFont;
     const vcl::Font* pDefFont = &numfunc::GetDefBulletFont();
     bool bCheck = false;
 
-    for( size_t nGet = rListTbl.size(); nGet; )
-        if( SwDoc::IsUsed( *(pRule = rListTbl[ --nGet ] )))
+    for( size_t nGet = rListTable.size(); nGet; )
+        if( SwDoc::IsUsed( *(pRule = rListTable[ --nGet ] )))
             for( sal_uInt8 nLvl = 0; nLvl < MAXLEVEL; ++nLvl )
-                if( SVX_NUM_CHAR_SPECIAL == (pFmt = &pRule->Get( nLvl ))->GetNumberingType() ||
-                    SVX_NUM_BITMAP == pFmt->GetNumberingType() )
+                if( SVX_NUM_CHAR_SPECIAL == (pFormat = &pRule->Get( nLvl ))->GetNumberingType() ||
+                    SVX_NUM_BITMAP == pFormat->GetNumberingType() )
                 {
-                    if( 0 == ( pFont = pFmt->GetBulletFont() ) )
+                    if( 0 == ( pFont = pFormat->GetBulletFont() ) )
                         pFont = pDefFont;
 
                     if( bCheck )
@@ -386,7 +386,7 @@ void Writer::_AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont )
 
 // build a bookmark table, which is sort by the node position. The
 // OtherPos of the bookmarks also inserted.
-void Writer::CreateBookmarkTbl()
+void Writer::CreateBookmarkTable()
 {
     const IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
     for(IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->getBookmarksBegin();
@@ -398,7 +398,7 @@ void Writer::CreateBookmarkTbl()
 }
 
 // search alle Bookmarks in the range and return it in the Array
-bool Writer::GetBookmarks(const SwCntntNode& rNd, sal_Int32 nStt,
+bool Writer::GetBookmarks(const SwContentNode& rNd, sal_Int32 nStt,
     sal_Int32 nEnd, std::vector< const ::sw::mark::IMark* >& rArr)
 {
     OSL_ENSURE( rArr.empty(), "there are still entries available" );
@@ -418,17 +418,17 @@ bool Writer::GetBookmarks(const SwCntntNode& rNd, sal_Int32 nStt,
             for( SwBookmarkNodeTable::const_iterator it = aIterPair.first; it != aIterPair.second; ++it )
             {
                 const ::sw::mark::IMark& rBkmk = *(it->second);
-                sal_Int32 nCntnt;
+                sal_Int32 nContent;
                 if( rBkmk.GetMarkPos().nNode == nNd &&
-                    (nCntnt = rBkmk.GetMarkPos().nContent.GetIndex() ) >= nStt &&
-                    nCntnt < nEnd )
+                    (nContent = rBkmk.GetMarkPos().nContent.GetIndex() ) >= nStt &&
+                    nContent < nEnd )
                 {
                     rArr.push_back( &rBkmk );
                 }
                 else if( rBkmk.IsExpanded() && nNd ==
-                        rBkmk.GetOtherMarkPos().nNode.GetIndex() && (nCntnt =
+                        rBkmk.GetOtherMarkPos().nNode.GetIndex() && (nContent =
                         rBkmk.GetOtherMarkPos().nContent.GetIndex() ) >= nStt &&
-                        nCntnt < nEnd )
+                        nContent < nEnd )
                 {
                     rArr.push_back( &rBkmk );
                 }
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index 979a3cc1bfb9..de5a7c17e1bc 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -86,8 +86,8 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
 
 Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer & rWrt )
 {
-    // It must be a CntntNode!
-    SwCntntNode * pCNd = rNode.GetCntntNode();
+    // It must be a ContentNode!
+    SwContentNode * pCNd = rNode.GetContentNode();
     if( !pCNd )
         return rWrt;
 
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index ec8b945888f7..44595b7a9215 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -37,12 +37,12 @@ sal_Int16 SwWriteTableCell::GetVertOri() const
     sal_Int16 eCellVertOri = text::VertOrientation::TOP;
     if( pBox->GetSttNd() )
     {
-        const SfxItemSet& rItemSet = pBox->GetFrmFmt()->GetAttrSet();
+        const SfxItemSet& rItemSet = pBox->GetFrameFormat()->GetAttrSet();
         const SfxPoolItem *pItem;
         if( SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, false, &pItem ) )
         {
             sal_Int16 eBoxVertOri =
-                static_cast<const SwFmtVertOrient *>(pItem)->GetVertOrient();
+                static_cast<const SwFormatVertOrient *>(pItem)->GetVertOrient();
             if( text::VertOrientation::CENTER==eBoxVertOri || text::VertOrientation::BOTTOM==eBoxVertOri)
                 eCellVertOri = eBoxVertOri;
         }
@@ -80,9 +80,9 @@ SwWriteTableCol::SwWriteTableCol(sal_uInt32 nPosition)
 
 sal_uInt32 SwWriteTable::GetBoxWidth( const SwTableBox *pBox )
 {
-    const SwFrmFmt *pFmt = pBox->GetFrmFmt();
-    const SwFmtFrmSize& aFrmSize=
-        static_cast<const SwFmtFrmSize&>(pFmt->GetFmtAttr( RES_FRM_SIZE ));
+    const SwFrameFormat *pFormat = pBox->GetFrameFormat();
+    const SwFormatFrmSize& aFrmSize=
+        static_cast<const SwFormatFrmSize&>(pFormat->GetFormatAttr( RES_FRM_SIZE ));
 
     return sal::static_int_cast<sal_uInt32>(aFrmSize.GetSize().Width());
 }
@@ -148,13 +148,13 @@ long SwWriteTable::GetLineHeight( const SwTableBox *pBox )
     if( !pLine )
         return 0;
 
-    const SwFrmFmt *pLineFrmFmt = pLine->GetFrmFmt();
+    const SwFrameFormat *pLineFrameFormat = pLine->GetFrameFormat();
     const SfxPoolItem* pItem;
-    const SfxItemSet& rItemSet = pLineFrmFmt->GetAttrSet();
+    const SfxItemSet& rItemSet = pLineFrameFormat->GetAttrSet();
 
     long nHeight = 0;
     if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ))
-        nHeight = static_cast<const SwFmtFrmSize*>(pItem)->GetHeight();
+        nHeight = static_cast<const SwFormatFrmSize*>(pItem)->GetHeight();
 
     return nHeight;
 }
@@ -166,9 +166,9 @@ const SvxBrushItem *SwWriteTable::GetLineBrush( const SwTableBox *pBox,
 
     while( pLine )
     {
-        const SwFrmFmt *pLineFrmFmt = pLine->GetFrmFmt();
+        const SwFrameFormat *pLineFrameFormat = pLine->GetFrameFormat();
         const SfxPoolItem* pItem;
-        const SfxItemSet& rItemSet = pLineFrmFmt->GetAttrSet();
+        const SfxItemSet& rItemSet = pLineFrameFormat->GetAttrSet();
 
         if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false,
                                                    &pItem ) )
@@ -229,8 +229,8 @@ sal_uInt16 SwWriteTable::MergeBoxBorders( const SwTableBox *pBox,
 {
     sal_uInt16 nBorderMask = 0;
 
-    const SwFrmFmt *pFrmFmt = pBox->GetFrmFmt();
-    const SvxBoxItem& rBoxItem = static_cast<const SvxBoxItem&>(pFrmFmt->GetFmtAttr( RES_BOX ));
+    const SwFrameFormat *pFrameFormat = pBox->GetFrameFormat();
+    const SvxBoxItem& rBoxItem = static_cast<const SvxBoxItem&>(pFrameFormat->GetFormatAttr( RES_BOX ));
 
     if( rBoxItem.GetTop() )
     {
@@ -584,13 +584,13 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow,
 
         const SwTableBoxes& rBoxes = pLine->GetTabBoxes();
 
-        const SwFrmFmt *pLineFrmFmt = pLine->GetFrmFmt();
+        const SwFrameFormat *pLineFrameFormat = pLine->GetFrameFormat();
         const SfxPoolItem* pItem;
-        const SfxItemSet& rItemSet = pLineFrmFmt->GetAttrSet();
+        const SfxItemSet& rItemSet = pLineFrameFormat->GetAttrSet();
 
         long nHeight = 0;
         if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ))
-            nHeight = static_cast<const SwFmtFrmSize*>(pItem)->GetHeight();
+            nHeight = static_cast<const SwFormatFrmSize*>(pItem)->GetHeight();
 
         const SvxBrushItem *pBrushItem, *pLineBrush = pParentBrush;
         if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false,
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index c38d5161178a..1ff3298ee7fc 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -141,14 +141,14 @@ TableBoxVectorPtr WW8TableNodeInfoInner::getTableBoxesOfRow()
     if (pCellGrid.get() == NULL)
     {
         const SwTableLine * pTabLine = getTableBox()->GetUpper();
-        const SwTableBoxes & rTblBoxes = pTabLine->GetTabBoxes();
+        const SwTableBoxes & rTableBoxes = pTabLine->GetTabBoxes();
 
-        sal_uInt8 nBoxes = rTblBoxes.size();
+        sal_uInt8 nBoxes = rTableBoxes.size();
         if (nBoxes > MAXTABLECELLS)
             nBoxes = MAXTABLECELLS;
         for ( sal_uInt8 n = 0; n < nBoxes; n++ )
         {
-            pResult->push_back(rTblBoxes[n]);
+            pResult->push_back(rTableBoxes[n]);
         }
     }
     else
@@ -195,13 +195,13 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase,
         pWidths = getWidthsOfRow();
     }
 
-    const SwFrmFmt *pFmt = getTable()->GetFrmFmt();
-    OSL_ENSURE(pFmt,"Impossible");
-    if (!pFmt)
+    const SwFrameFormat *pFormat = getTable()->GetFrameFormat();
+    OSL_ENSURE(pFormat,"Impossible");
+    if (!pFormat)
         return pResult;
 
-    const SwFmtFrmSize &rSize = pFmt->GetFrmSize();
-    unsigned long nTblSz = static_cast<unsigned long>(rSize.GetWidth());
+    const SwFormatFrmSize &rSize = pFormat->GetFrmSize();
+    unsigned long nTableSz = static_cast<unsigned long>(rSize.GetWidth());
 
     long nPageSize = 0;
     bool bRelBoxSize = false;
@@ -217,7 +217,7 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase,
         nSz += *aIt;
         SwTwips nCalc = nSz;
         if ( bRelBoxSize )
-            nCalc = ( nCalc * nPageSize ) / nTblSz;
+            nCalc = ( nCalc * nPageSize ) / nTableSz;
 
         pResult->push_back( nCalc );
     }
@@ -252,8 +252,8 @@ WidthsPtr WW8TableNodeInfoInner::getColumnWidthsBasedOnAllRows()
             sal_uInt32 nSeparatorPosition = 0;
             for (size_t nBoxIndex = 0; nBoxIndex < nBoxes; ++nBoxIndex)
             {
-                const SwFrmFmt* pBoxFmt = rTabBoxes[ nBoxIndex ]->GetFrmFmt();
-                const SwFmtFrmSize& rLSz = pBoxFmt->GetFrmSize();
+                const SwFrameFormat* pBoxFormat = rTabBoxes[ nBoxIndex ]->GetFrameFormat();
+                const SwFormatFrmSize& rLSz = pBoxFormat->GetFrmSize();
                 nSeparatorPosition += rLSz.GetWidth();
                 pSeparators->push_back(nSeparatorPosition);
             }
@@ -305,8 +305,8 @@ WidthsPtr WW8TableNodeInfoInner::getWidthsOfRow()
 
         for (sal_uInt32 n = 0; n < nBoxes; n++)
         {
-            const SwFrmFmt* pBoxFmt = rTabBoxes[ n ]->GetFrmFmt();
-            const SwFmtFrmSize& rLSz = pBoxFmt->GetFrmSize();
+            const SwFrameFormat* pBoxFormat = rTabBoxes[ n ]->GetFrameFormat();
+            const SwFormatFrmSize& rLSz = pBoxFormat->GetFrmSize();
 
             pWidths->push_back(rLSz.GetWidth());
         }
@@ -630,7 +630,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable)
 
     WW8TableNodeInfo * pPrev = NULL;
 
-    if (pTable->IsTblComplex() && pTable->HasLayout())
+    if (pTable->IsTableComplex() && pTable->HasLayout())
     {
         pPrev = processSwTableByLayout(pTable);
 
@@ -793,7 +793,7 @@ WW8TableInfo::processTableBox(const SwTable * pTable,
 
             pPrev = pNodeInfo.get();
 
-            if (nDepthInsideCell == 1 && rNode.IsTxtNode())
+            if (nDepthInsideCell == 1 && rNode.IsTextNode())
                 pEndOfCellInfo = pNodeInfo;
 
             if (rNode.IsEndNode())
@@ -853,7 +853,7 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo
     pNodeInfo->setCell(nCell);
     pNodeInfo->setRow(nRow);
 
-    if (pNode->IsTxtNode())
+    if (pNode->IsTextNode())
     {
         FirstInTableMap_t::const_iterator aIt = mFirstInTableMap.find(pTable);
         if (aIt == mFirstInTableMap.end())
@@ -1077,12 +1077,12 @@ CellInfoMultiSet::const_iterator WW8TableCellGrid::getCellsEnd(long nTop)
 
 void WW8TableCellGrid::insert(const SwRect & rRect,
                               WW8TableNodeInfo * pNodeInfo,
-                              unsigned long * pFmtFrmWidth)
+                              unsigned long * pFormatFrmWidth)
 {
     CellInfo aCellInfo(rRect, pNodeInfo);
 
-    if (pFmtFrmWidth != NULL)
-        aCellInfo.setFmtFrmWidth(*pFmtFrmWidth);
+    if (pFormatFrmWidth != NULL)
+        aCellInfo.setFormatFrmWidth(*pFormatFrmWidth);
 
     WW8TableCellGridRow::Pointer_t pRow = getRow(rRect.Top());
     pRow->insert(aCellInfo);
@@ -1122,8 +1122,8 @@ void WW8TableCellGrid::addShadowCells()
                     *aRowSpanIt < aCellIt->bottom())
                 {
                     aRect.Top(*aRowSpanIt);
-                    unsigned long nFmtFrmWidth = aCellIt->getFmtFrmWidth();
-                    insert(aRect, NULL, &nFmtFrmWidth);
+                    unsigned long nFormatFrmWidth = aCellIt->getFormatFrmWidth();
+                    insert(aRect, NULL, &nFormatFrmWidth);
 
                     bVertMerge = true;
                 }
@@ -1198,7 +1198,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells()
                     pEndOfCellInfo = NULL;
                 }
 
-                if (nDepthInCell == 1 && pNode->IsTxtNode())
+                if (nDepthInCell == 1 && pNode->IsTextNode())
                     pEndOfCellInfo = pNodeInfo;
 
                 pNodeInfo->setShadowsBefore(nShadows);
@@ -1227,7 +1227,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells()
 
             if (bBeginningOfCell)
             {
-                pWidths->push_back(aCellIt->getFmtFrmWidth());
+                pWidths->push_back(aCellIt->getFormatFrmWidth());
 
                 if (pNodeInfo != NULL)
                     pTableBoxes->push_back(pNodeInfo->getTableBox());
@@ -1453,15 +1453,15 @@ void WW8TableCellGridRow::setRowSpans(RowSpansPtr pRowSpans)
 
 
 CellInfo::CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo)
-: m_aRect(aRect), m_pNodeInfo(pNodeInfo), m_nFmtFrmWidth(0)
+: m_aRect(aRect), m_pNodeInfo(pNodeInfo), m_nFormatFrmWidth(0)
 {
     if (pNodeInfo != NULL)
     {
         const SwTableBox * pBox = pNodeInfo->getTableBox();
-        const SwFrmFmt * pFrmFmt = pBox->GetFrmFmt();
-        const SwFmtFrmSize & rSize = pFrmFmt->GetFrmSize();
+        const SwFrameFormat * pFrameFormat = pBox->GetFrameFormat();
+        const SwFormatFrmSize & rSize = pFrameFormat->GetFrmSize();
 
-        m_nFmtFrmWidth = rSize.GetWidth();
+        m_nFormatFrmWidth = rSize.GetWidth();
     }
 }
 
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index ab5ff6c55132..8a3013a3738d 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -114,7 +114,7 @@ class CellInfo
 {
     SwRect m_aRect;
     WW8TableNodeInfo * m_pNodeInfo;
-    unsigned long m_nFmtFrmWidth;
+    unsigned long m_nFormatFrmWidth;
 
 public:
     CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo);
@@ -122,7 +122,7 @@ public:
     CellInfo(const CellInfo & aRectAndTableInfo)
         : m_aRect(aRectAndTableInfo.m_aRect),
           m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo),
-          m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth)
+          m_nFormatFrmWidth(aRectAndTableInfo.m_nFormatFrmWidth)
     {
     }
 
@@ -139,14 +139,14 @@ public:
     SwRect getRect() const { return m_aRect; }
     WW8TableNodeInfo * getTableNodeInfo() const
     { return m_pNodeInfo; }
-    unsigned long getFmtFrmWidth() const
+    unsigned long getFormatFrmWidth() const
     {
-        return m_nFmtFrmWidth;
+        return m_nFormatFrmWidth;
     }
 
-    void setFmtFrmWidth(unsigned long nFmtFrmWidth)
+    void setFormatFrmWidth(unsigned long nFormatFrmWidth)
     {
-        m_nFmtFrmWidth = nFmtFrmWidth;
+        m_nFormatFrmWidth = nFormatFrmWidth;
     }
 
 #ifdef DBG_UTIL
@@ -175,7 +175,7 @@ private:
 public:
     typedef boost::shared_ptr<WW8TableNodeInfo> Pointer_t;
 
-    WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTxtNode);
+    WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTextNode);
     virtual ~WW8TableNodeInfo();
 
     void setDepth(sal_uInt32 nDepth);
@@ -276,7 +276,7 @@ public:
     ~WW8TableCellGrid();
 
     void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo,
-                unsigned long * pFmtFrmWidth = NULL);
+                unsigned long * pFormatFrmWidth = NULL);
     void addShadowCells();
     WW8TableNodeInfo * connectCells();
 
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index a4aabc6a9af1..6d16f55623c0 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -72,14 +72,14 @@ class SvxCharScaleWidthItem;
 class SvxCharReliefItem;
 class SvxCharHiddenItem;
 class SvxBoxItem;
-class SwFmtINetFmt;
-class SwFmtCharFmt;
-class SwFmtFld;
-class SwFmtFlyCnt;
-class SwFmtFtn;
+class SwFormatINetFormat;
+class SwFormatCharFormat;
+class SwFormatField;
+class SwFormatFlyCnt;
+class SwFormatFootnote;
 class SvxLineSpacingItem;
 class SvxAdjustItem;
-class SvxFmtSplitItem;
+class SvxFormatSplitItem;
 class SvxWidowsItem;
 class SvxTabStopItem;
 class SvxHyphenZoneItem;
@@ -89,34 +89,34 @@ class SfxPoolItem;
 class SfxItemSet;
 class SvxParaVertAlignItem;
 class SvxParaGridItem;
-class SwFmtFrmSize;
+class SwFormatFrmSize;
 class SvxPaperBinItem;
 class SvxLRSpaceItem;
 class SvxULSpaceItem;
-class SwFmtPageDesc;
-class SvxFmtBreakItem;
-class SwFmtSurround;
-class SwFmtVertOrient;
-class SwFmtHoriOrient;
-class SwFmtAnchor;
+class SwFormatPageDesc;
+class SvxFormatBreakItem;
+class SwFormatSurround;
+class SwFormatVertOrient;
+class SwFormatHoriOrient;
+class SwFormatAnchor;
 class SvxBrushItem;
 class SvxBoxItem;
-class SwFmtCol;
-class SvxFmtKeepItem;
+class SwFormatCol;
+class SvxFormatKeepItem;
 class SwTextGridItem;
-class SwFmtLineNumber;
+class SwFormatLineNumber;
 class SvxFrameDirectionItem;
 class SfxGrabBagItem;
 class SfxUInt16Item;
-class SwFmtRuby;
-class SwTxtNode;
+class SwFormatRuby;
+class SwTextNode;
 class SwTOXMark;
 class SwRedlineData;
 class SwSection;
-class SwFmtDrop;
-class SwFrmFmt;
-class SwNumFmt;
-class SwFmt;
+class SwFormatDrop;
+class SwFrameFormat;
+class SwNumFormat;
+class SwFormat;
 struct WW8_SepInfo;
 class SwLineNumberInfo;
 class SwNumRule;
@@ -156,7 +156,7 @@ public:
     virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) = 0;
 
     /// Called in order to output section breaks.
-    virtual void SectionBreaks(const SwTxtNode& rNode) = 0;
+    virtual void SectionBreaks(const SwTextNode& rNode) = 0;
 
     /// Called before we start outputting the attributes.
     virtual void StartParagraphProperties() = 0;
@@ -195,7 +195,7 @@ public:
     virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) = 0;
 
     /// Output ruby start.
-    virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ) = 0;
+    virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) = 0;
 
     /// Output ruby end.
     virtual void EndRuby() = 0;
@@ -206,7 +206,7 @@ public:
     /// Output URL end.
     virtual bool EndURL(bool isAtEndOfParagraph) = 0;
 
-    virtual void FieldVanish( const OUString& rTxt, ww::eField eType ) = 0;
+    virtual void FieldVanish( const OUString& rText, ww::eField eType ) = 0;
 
     void StartTOX( const SwSection& rSect );
 
@@ -214,12 +214,12 @@ public:
 
     virtual void OnTOXEnding() {}
 
-    void TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAttr );
+    void TOXMark( const SwTextNode& rNode, const SwTOXMark& rAttr );
 
     /// Output redlining.
     virtual void Redline( const SwRedlineData* pRedline ) = 0;
 
-    virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) = 0;
+    virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) = 0;
 
     /// Output FKP (Formatted disK Page) - necessary for binary formats only.
     /// FIXME having it in AttributeOutputBase is probably a hack, it
@@ -285,7 +285,7 @@ public:
     virtual void EndStyleProperties( bool bParProp ) = 0;
 
     /// Numbering rule and Id.
-    virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt& rNFmt, const SwFmt& rFmt ) = 0;
+    virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat& rNFormat, const SwFormat& rFormat ) = 0;
 
     /// Page break
     /// As a paragraph property - the paragraph should be on the next page.
@@ -322,7 +322,7 @@ public:
     virtual void ResetFlyProcessingFlag(){};
 
     /// Description of the page borders.
-    virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) = 0;
+    virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) = 0;
 
     /// Columns populated from right/numbers on the right side?
     virtual void SectionBiDi( bool bBiDi ) = 0;
@@ -363,10 +363,10 @@ public:
 
 protected:
 
-    static void GetNumberPara( OUString& rStr, const SwField& rFld );
+    static void GetNumberPara( OUString& rStr, const SwField& rField );
 
     /// Output frames - the implementation.
-    virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) = 0;
+    virtual void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) = 0;
 
     /// Sfx item Sfx item RES_CHRATR_CASEMAP
     virtual void CharCaseMap( const SvxCaseMapItem& ) = 0;
@@ -479,25 +479,25 @@ protected:
     virtual void CharHighlight( const SvxBrushItem& ) = 0;
 
     /// Sfx item RES_TXTATR_INETFMT
-    virtual void TextINetFormat( const SwFmtINetFmt& ) = 0;
+    virtual void TextINetFormat( const SwFormatINetFormat& ) = 0;
 
     /// Sfx item RES_TXTATR_CHARFMT
-    virtual void TextCharFormat( const SwFmtCharFmt& ) = 0;
+    virtual void TextCharFormat( const SwFormatCharFormat& ) = 0;
 
     /// Sfx item RES_TXTATR_FIELD, RES_TXTATR_ANNOTATION and RES_TXTATR_INPUTFIELD
-    void TextField( const SwFmtFld& );
+    void TextField( const SwFormatField& );
 
     /// Sfx item RES_TXTATR_FLYCNT
-    void TextFlyContent( const SwFmtFlyCnt& );
+    void TextFlyContent( const SwFormatFlyCnt& );
 
     /// Sfx item RES_TXTATR_FTN
     ///
     /// This one is common for both WW8AttributeOutput as well as
     /// DocxAttributeOutput.
-    void TextFootnote( const SwFmtFtn& );
+    void TextFootnote( const SwFormatFootnote& );
 
     /// Sfx item RES_TXTATR_FTN
-    virtual void TextFootnote_Impl( const SwFmtFtn& ) = 0;
+    virtual void TextFootnote_Impl( const SwFormatFootnote& ) = 0;
 
     /// Sfx item RES_PARATR_LINESPACING
     void ParaLineSpacing( const SvxLineSpacingItem& );
@@ -509,7 +509,7 @@ protected:
     virtual void ParaAdjust( const SvxAdjustItem& ) = 0;
 
     /// Sfx item RES_PARATR_SPLIT
-    virtual void ParaSplit( const SvxFmtSplitItem& ) = 0;
+    virtual void ParaSplit( const SvxFormatSplitItem& ) = 0;
 
     /// Sfx item RES_PARATR_WIDOWS
     virtual void ParaWidows( const SvxWidowsItem& ) = 0;
@@ -524,7 +524,7 @@ protected:
     void ParaNumRule( const SwNumRuleItem& );
 
     /// Numbering - the implementation.
-    virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) = 0;
+    virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) = 0;
 
     /// Sfx item RES_PARATR_SCRIPTSPACE
     virtual void ParaScriptSpace( const SfxBoolItem& ) = 0;
@@ -542,7 +542,7 @@ protected:
     virtual void ParaSnapToGrid( const SvxParaGridItem& ) = 0;
 
     /// Sfx item RES_FRM_SIZE
-    virtual void FormatFrameSize( const SwFmtFrmSize& ) = 0;
+    virtual void FormatFrameSize( const SwFormatFrmSize& ) = 0;
 
     /// Sfx item RES_PAPER_BIN
     virtual void FormatPaperBin( const SvxPaperBinItem& ) = 0;
@@ -554,22 +554,22 @@ protected:
     virtual void FormatULSpace( const SvxULSpaceItem& ) = 0;
 
     /// Sfx item RES_PAGEDESC
-    void FormatPageDescription( const SwFmtPageDesc& );
+    void FormatPageDescription( const SwFormatPageDesc& );
 
     /// Sfx item RES_BREAK
-    void FormatBreak( const SvxFmtBreakItem& );
+    void FormatBreak( const SvxFormatBreakItem& );
 
     /// Sfx item RES_SURROUND
-    virtual void FormatSurround( const SwFmtSurround& ) = 0;
+    virtual void FormatSurround( const SwFormatSurround& ) = 0;
 
     /// Sfx item RES_VERT_ORIENT
-    virtual void FormatVertOrientation( const SwFmtVertOrient& ) = 0;
+    virtual void FormatVertOrientation( const SwFormatVertOrient& ) = 0;
 
     /// Sfx item RES_HORI_ORIENT
-    virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) = 0;
+    virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) = 0;
 
     /// Sfx item RES_ANCHOR
-    virtual void FormatAnchor( const SwFmtAnchor& ) = 0;
+    virtual void FormatAnchor( const SwFormatAnchor& ) = 0;
 
     /// Sfx item RES_BACKGROUND
     virtual void FormatBackground( const SvxBrushItem& ) = 0;
@@ -584,12 +584,12 @@ protected:
     virtual void FormatBox( const SvxBoxItem& ) = 0;
 
     /// Sfx item RES_COL
-    void FormatColumns( const SwFmtCol& );
+    void FormatColumns( const SwFormatCol& );
 
-    virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ) = 0;
+    virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) = 0;
 
     /// Sfx item RES_KEEP
-    virtual void FormatKeep( const SvxFmtKeepItem& ) = 0;
+    virtual void FormatKeep( const SvxFormatKeepItem& ) = 0;
 
     /// Compute the grid character pitch
     sal_uInt32 GridCharacterPitch( const SwTextGridItem& rGrid ) const;
@@ -598,7 +598,7 @@ protected:
     virtual void FormatTextGrid( const SwTextGridItem& ) = 0;
 
     /// Sfx item RES_LINENUMBER
-    virtual void FormatLineNumbering( const SwFmtLineNumber& ) = 0;
+    virtual void FormatLineNumbering( const SwFormatLineNumber& ) = 0;
 
     /// Sfx item RES_FRAMEDIR
     virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) = 0;
@@ -613,14 +613,14 @@ protected:
     virtual void ParaOutlineLevel( const SfxUInt16Item& ) = 0;
 
     /// Write the expanded field
-    virtual void WriteExpand( const SwField* pFld ) = 0;
+    virtual void WriteExpand( const SwField* pField ) = 0;
 
-    virtual void RefField( const SwField& rFld, const OUString& rRef ) = 0;
-    virtual void HiddenField( const SwField& rFld ) = 0;
-    virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) = 0;
-    virtual void PostitField( const SwField* pFld ) = 0;
-    virtual bool DropdownField( const SwField* pFld ) = 0;
-    virtual bool PlaceholderField( const SwField* pFld ) = 0;
+    virtual void RefField( const SwField& rField, const OUString& rRef ) = 0;
+    virtual void HiddenField( const SwField& rField ) = 0;
+    virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) = 0;
+    virtual void PostitField( const SwField* pField ) = 0;
+    virtual bool DropdownField( const SwField* pField ) = 0;
+    virtual bool PlaceholderField( const SwField* pField ) = 0;
 
     virtual bool AnalyzeURL( const OUString& rUrl, const OUString& rTarget, OUString* pLinkURL, OUString* pMark );
 
@@ -644,7 +644,7 @@ public:
     void OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep, bool bTestForDefault );
 
     /// Output frames.
-    void OutputFlyFrame( const sw::Frame& rFmt );
+    void OutputFlyFrame( const sw::Frame& rFormat );
 
     void GetTablePageSize
     ( ww8::WW8TableNodeInfoInner * pTableTextNodeInfoInner,
@@ -653,8 +653,8 @@ public:
     /// Exports the definition (image, size) of a single numbering picture bullet.
     virtual void BulletDefinition(int /*nId*/, const Graphic& /*rGraphic*/, Size /*aSize*/) {}
 
-    // Returns whether or not the 'SwTxtNode' has a paragraph marker inserted \ deleted (using 'track changes')
-    const SwRedlineData* GetParagraphMarkerRedline( const SwTxtNode& rNode, RedlineType_t aRedlineType );
+    // Returns whether or not the 'SwTextNode' has a paragraph marker inserted \ deleted (using 'track changes')
+    const SwRedlineData* GetParagraphMarkerRedline( const SwTextNode& rNode, RedlineType_t aRedlineType );
 };
 
 #endif // INCLUDED_SW_SOURCE_FILTER_WW8_ATTRIBUTEOUTPUTBASE_HXX
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 59027ee1c173..7ee225c852e6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -278,10 +278,10 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText
     // would normally arrive, it would be too late (would be after the
     // paragraph start has been written).
     bool bEndParaSdt = false;
-    SwTxtNode* pTxtNode = m_rExport.m_pCurPam->GetNode().GetTxtNode();
-    if (pTxtNode && pTxtNode->GetpSwAttrSet())
+    SwTextNode* pTextNode = m_rExport.m_pCurPam->GetNode().GetTextNode();
+    if (pTextNode && pTextNode->GetpSwAttrSet())
     {
-        const SfxItemSet* pSet = pTxtNode->GetpSwAttrSet();
+        const SfxItemSet* pSet = pTextNode->GetpSwAttrSet();
         if (const SfxPoolItem* pItem = pSet->GetItem(RES_PARATR_GRABBAG))
         {
             const SfxGrabBagItem& rParaGrabBag = static_cast<const SfxGrabBagItem&>(*pItem);
@@ -327,12 +327,12 @@ static void lcl_deleteAndResetTheLists( std::unique_ptr<sax_fastparser::FastAttr
         rSdtPrAlias.clear();
 }
 
-void DocxAttributeOutput::PopulateFrameProperties(const SwFrmFmt* pFrmFmt, const Size& rSize)
+void DocxAttributeOutput::PopulateFrameProperties(const SwFrameFormat* pFrameFormat, const Size& rSize)
 {
 
     sax_fastparser::FastAttributeList* attrList = FastSerializerHelper::createAttrList();
 
-    awt::Point aPos(pFrmFmt->GetHoriOrient().GetPos(), pFrmFmt->GetVertOrient().GetPos());
+    awt::Point aPos(pFrameFormat->GetHoriOrient().GetPos(), pFrameFormat->GetVertOrient().GetPos());
 
     attrList->add( FSNS( XML_w, XML_w), OString::number(rSize.Width()));
     attrList->add( FSNS( XML_w, XML_h), OString::number(rSize.Height()));
@@ -342,7 +342,7 @@ void DocxAttributeOutput::PopulateFrameProperties(const SwFrmFmt* pFrmFmt, const
 
     const char* relativeFromH;
     const char* relativeFromV;
-    switch (pFrmFmt->GetVertOrient().GetRelationOrient())
+    switch (pFrameFormat->GetVertOrient().GetRelationOrient())
     {
         case text::RelOrientation::PAGE_PRINT_AREA:
             relativeFromV = "margin";
@@ -357,7 +357,7 @@ void DocxAttributeOutput::PopulateFrameProperties(const SwFrmFmt* pFrmFmt, const
             break;
     }
 
-    switch (pFrmFmt->GetHoriOrient().GetRelationOrient())
+    switch (pFrameFormat->GetHoriOrient().GetRelationOrient())
     {
         case text::RelOrientation::PAGE_PRINT_AREA:
             relativeFromH = "margin";
@@ -373,7 +373,7 @@ void DocxAttributeOutput::PopulateFrameProperties(const SwFrmFmt* pFrmFmt, const
             break;
     }
 
-    switch (pFrmFmt->GetSurround().GetValue())
+    switch (pFrameFormat->GetSurround().GetValue())
     {
     case SURROUND_NONE:
         attrList->add( FSNS( XML_w, XML_wrap), "none");
@@ -397,10 +397,10 @@ void DocxAttributeOutput::PopulateFrameProperties(const SwFrmFmt* pFrmFmt, const
     m_pSerializer->singleElementNS( XML_w, XML_framePr, xAttrList );
 }
 
-bool DocxAttributeOutput::TextBoxIsFramePr(const SwFrmFmt& rFrmFmt)
+bool DocxAttributeOutput::TextBoxIsFramePr(const SwFrameFormat& rFrameFormat)
 {
     uno::Reference< drawing::XShape > xShape;
-    const SdrObject* pSdrObj = rFrmFmt.FindRealSdrObject();
+    const SdrObject* pSdrObj = rFrameFormat.FindRealSdrObject();
     if (pSdrObj)
         xShape = uno::Reference< drawing::XShape >(const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY);
     uno::Reference< beans::XPropertySet > xPropertySet(xShape, uno::UNO_QUERY);
@@ -445,9 +445,9 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
         {
             m_bParagraphFrameOpen = true;
             sw::Frame aFrame = m_aFramesOfParagraph[nIndex];
-            const SwFrmFmt& rFrmFmt = aFrame.GetFrmFmt();
+            const SwFrameFormat& rFrameFormat = aFrame.GetFrameFormat();
 
-            if (!TextBoxIsFramePr(rFrmFmt) || m_bWritingHeaderFooter)
+            if (!TextBoxIsFramePr(rFrameFormat) || m_bWritingHeaderFooter)
             {
                 if (m_bStartedCharSdt)
                 {
@@ -773,7 +773,7 @@ void DocxAttributeOutput::EmptyParagraph()
     m_pSerializer->singleElementNS( XML_w, XML_p, FSEND );
 }
 
-void DocxAttributeOutput::SectionBreaks(const SwTxtNode& rNode)
+void DocxAttributeOutput::SectionBreaks(const SwTextNode& rNode)
 {
     // output page/section breaks
     // Writer can have them at the beginning of a paragraph, or at the end, but
@@ -781,16 +781,16 @@ void DocxAttributeOutput::SectionBreaks(const SwTxtNode& rNode)
     // paragraph in a section.  To get it right, we have to switch to the next
     // paragraph, and detect the section breaks there.
     SwNodeIndex aNextIndex( rNode, 1 );
-    if ( aNextIndex.GetNode().IsTxtNode() )
+    if ( aNextIndex.GetNode().IsTextNode() )
     {
-        const SwTxtNode* pTxtNode = static_cast< SwTxtNode* >( &aNextIndex.GetNode() );
-        m_rExport.OutputSectionBreaks( pTxtNode->GetpSwAttrSet(), *pTxtNode, m_tableReference->m_bTableCellOpen, pTxtNode->GetTxt().isEmpty() );
+        const SwTextNode* pTextNode = static_cast< SwTextNode* >( &aNextIndex.GetNode() );
+        m_rExport.OutputSectionBreaks( pTextNode->GetpSwAttrSet(), *pTextNode, m_tableReference->m_bTableCellOpen, pTextNode->GetText().isEmpty() );
     }
     else if ( aNextIndex.GetNode().IsTableNode() )
     {
         const SwTableNode* pTableNode = static_cast< SwTableNode* >( &aNextIndex.GetNode() );
-        const SwFrmFmt *pFmt = pTableNode->GetTable().GetFrmFmt();
-        m_rExport.OutputSectionBreaks( &(pFmt->GetAttrSet()), *pTableNode );
+        const SwFrameFormat *pFormat = pTableNode->GetTable().GetFrameFormat();
+        m_rExport.OutputSectionBreaks( &(pFormat->GetAttrSet()), *pTableNode );
     }
 }
 
@@ -912,8 +912,8 @@ void lcl_writeParagraphMarkerProperties(DocxAttributeOutput& rAttributeOutput, c
             }
             else if (nWhichId == RES_TXTATR_AUTOFMT)
             {
-                const SwFmtAutoFmt* pAutoFmt = static_cast<const SwFmtAutoFmt*>(pItem);
-                lcl_writeParagraphMarkerProperties(rAttributeOutput, *pAutoFmt->GetStyleHandle());
+                const SwFormatAutoFormat* pAutoFormat = static_cast<const SwFormatAutoFormat*>(pItem);
+                lcl_writeParagraphMarkerProperties(rAttributeOutput, *pAutoFormat->GetStyleHandle());
             }
         }
         nWhichId = aIter.NextWhich();
@@ -977,11 +977,11 @@ void DocxAttributeOutput::EndParagraphProperties(const SfxItemSet& rParagraphMar
 
     if (!m_bWritingHeaderFooter && m_pCurrentFrame)
     {
-        const SwFrmFmt& rFrmFmt = m_pCurrentFrame->GetFrmFmt();
-        if (TextBoxIsFramePr(rFrmFmt))
+        const SwFrameFormat& rFrameFormat = m_pCurrentFrame->GetFrameFormat();
+        if (TextBoxIsFramePr(rFrameFormat))
         {
             const Size aSize = m_pCurrentFrame->GetSize();
-            PopulateFrameProperties(&rFrmFmt, aSize);
+            PopulateFrameProperties(&rFrameFormat, aSize);
         }
     }
 
@@ -1433,13 +1433,13 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, bool bWriteRun )
                     WriteFFData(  rInfos );
                 if ( rInfos.pField )
                 {
-                    const SwDropDownField& rFld2 = *static_cast<const SwDropDownField*>(rInfos.pField.get());
+                    const SwDropDownField& rField2 = *static_cast<const SwDropDownField*>(rInfos.pField.get());
                     uno::Sequence<OUString> aItems =
-                        rFld2.GetItemSequence();
-                    GetExport().DoComboBox(rFld2.GetName(),
-                               rFld2.GetHelp(),
-                               rFld2.GetToolTip(),
-                               rFld2.GetSelectedItem(), aItems);
+                        rField2.GetItemSequence();
+                    GetExport().DoComboBox(rField2.GetName(),
+                               rField2.GetHelp(),
+                               rField2.GetToolTip(),
+                               rField2.GetSelectedItem(), aItems);
                 }
                 m_pSerializer->endElementNS( XML_w, XML_fldChar );
 
@@ -2003,7 +2003,7 @@ void DocxAttributeOutput::WritePostponedGraphic()
     for( std::list< PostponedGraphic >::const_iterator it = m_pPostponedGraphic->begin();
          it != m_pPostponedGraphic->end();
          ++it )
-        FlyFrameGraphic( it->grfNode, it->size, it->mOLEFrmFmt, it->mOLENode, it->pSdrObj );
+        FlyFrameGraphic( it->grfNode, it->size, it->mOLEFrameFormat, it->mOLENode, it->pSdrObj );
     m_pPostponedGraphic.reset(0);
 }
 
@@ -2122,9 +2122,9 @@ void DocxAttributeOutput::RawText( const OUString& /*rText*/, bool /*bForceUnico
     OSL_TRACE("TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet )" );
 }
 
-void DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby )
+void DocxAttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby )
 {
-    OSL_TRACE("TODO DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, const SwFmtRuby& rRuby )" );
+    OSL_TRACE("TODO DocxAttributeOutput::StartRuby( const SwTextNode& rNode, const SwFormatRuby& rRuby )" );
     m_pSerializer->startElementNS( XML_w, XML_ruby, FSEND );
     m_pSerializer->startElementNS( XML_w, XML_rubyPr, FSEND );
     // hps
@@ -2169,7 +2169,7 @@ void DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, con
     SwWW8AttrIter aAttrIt( m_rExport, rNode );
     aAttrIt.OutAttr( nPos, true );
 
-    sal_uInt16 nStyle = m_rExport.GetId( rRuby.GetTxtRuby()->GetCharFmt() );
+    sal_uInt16 nStyle = m_rExport.GetId( rRuby.GetTextRuby()->GetCharFormat() );
     OString aStyleId(m_rExport.m_pStyles->GetStyleId(nStyle));
     m_pSerializer->singleElementNS( XML_w, XML_rStyle,
             FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
@@ -2290,9 +2290,9 @@ bool DocxAttributeOutput::EndURL(bool const)
     return true;
 }
 
-void DocxAttributeOutput::FieldVanish( const OUString& rTxt, ww::eField eType )
+void DocxAttributeOutput::FieldVanish( const OUString& rText, ww::eField eType )
 {
-    WriteField_Impl( NULL, eType, rTxt, WRITEFIELD_ALL );
+    WriteField_Impl( NULL, eType, rText, WRITEFIELD_ALL );
 }
 
 // The difference between 'Redline' and 'StartRedline'+'EndRedline' is that:
@@ -2491,9 +2491,9 @@ void DocxAttributeOutput::EndRedline( const SwRedlineData * pRedlineData )
     }
 }
 
-void DocxAttributeOutput::FormatDrop( const SwTxtNode& /*rNode*/, const SwFmtDrop& /*rSwFmtDrop*/, sal_uInt16 /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/, ww8::WW8TableNodeInfoInner::Pointer_t )
+void DocxAttributeOutput::FormatDrop( const SwTextNode& /*rNode*/, const SwFormatDrop& /*rSwFormatDrop*/, sal_uInt16 /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/, ww8::WW8TableNodeInfoInner::Pointer_t )
 {
-    OSL_TRACE( "TODO DocxAttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle )" );
+    OSL_TRACE( "TODO DocxAttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle )" );
 }
 
 void DocxAttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
@@ -2854,7 +2854,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point
 {
     m_pSerializer->startElementNS( XML_w, XML_tcPr, FSEND );
 
-    const SwTableBox *pTblBox = pTableTextNodeInfoInner->getTableBox( );
+    const SwTableBox *pTableBox = pTableTextNodeInfoInner->getTableBox( );
 
     bool bEcma = GetExport().GetFilter().getVersion( ) == oox::core::ECMA_DIALECT;
 
@@ -2900,7 +2900,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point
                 FSEND );
     }
 
-    if (const SfxGrabBagItem* pItem = sw::util::HasItem<SfxGrabBagItem>(pTblBox->GetFrmFmt()->GetAttrSet(), RES_FRMATR_GRABBAG))
+    if (const SfxGrabBagItem* pItem = sw::util::HasItem<SfxGrabBagItem>(pTableBox->GetFrameFormat()->GetAttrSet(), RES_FRMATR_GRABBAG))
     {
         const std::map<OUString, uno::Any>& rGrabBag = pItem->GetGrabBag();
         std::map<OUString, uno::Any>::const_iterator it = rGrabBag.find("CellCnfStyle");
@@ -2912,8 +2912,8 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point
     }
 
 
-    const SvxBoxItem& rBox = pTblBox->GetFrmFmt( )->GetBox( );
-    const SvxBoxItem& rDefaultBox = (*tableFirstCells.rbegin())->getTableBox( )->GetFrmFmt( )->GetBox( );
+    const SvxBoxItem& rBox = pTableBox->GetFrameFormat( )->GetBox( );
+    const SvxBoxItem& rDefaultBox = (*tableFirstCells.rbegin())->getTableBox( )->GetFrameFormat( )->GetBox( );
     {
         // The cell borders
         impl_borders( m_pSerializer, rBox, lcl_getTableCellBorderOptions(bEcma), NULL, m_aTableStyleConf );
@@ -2943,14 +2943,14 @@ void DocxAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t
     // Create the SwWriteTable instance to use col spans (and maybe other infos)
     GetTablePageSize( pTableTextNodeInfoInner.get(), nPageSize, bRelBoxSize );
 
-    const SwFrmFmt *pFmt = pTable->GetFrmFmt( );
-    const sal_uInt32 nTblSz = static_cast<sal_uInt32>(pFmt->GetFrmSize( ).GetWidth( ));
+    const SwFrameFormat *pFormat = pTable->GetFrameFormat( );
+    const sal_uInt32 nTableSz = static_cast<sal_uInt32>(pFormat->GetFrmSize( ).GetWidth( ));
 
     const SwHTMLTableLayout *pLayout = pTable->GetHTMLTableLayout();
     if( pLayout && pLayout->IsExportable() )
         m_xTableWrt.reset(new SwWriteTable(pTable, pLayout));
     else
-        m_xTableWrt.reset(new SwWriteTable(pTable, pTable->GetTabLines(), nPageSize, nTblSz, false));
+        m_xTableWrt.reset(new SwWriteTable(pTable, pTable->GetTabLines(), nPageSize, nTableSz, false));
 }
 
 void DocxAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
@@ -3011,7 +3011,7 @@ void DocxAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t p
 
     const SwTableBox *pTableBox = pTableTextNodeInfoInner->getTableBox();
     const SwTableLine* pTableLine = pTableBox->GetUpper();
-    if (const SfxGrabBagItem* pItem = sw::util::HasItem<SfxGrabBagItem>(pTableLine->GetFrmFmt()->GetAttrSet(), RES_FRMATR_GRABBAG))
+    if (const SfxGrabBagItem* pItem = sw::util::HasItem<SfxGrabBagItem>(pTableLine->GetFrameFormat()->GetAttrSet(), RES_FRMATR_GRABBAG))
     {
         const std::map<OUString, uno::Any>& rGrabBag = pItem->GetGrabBag();
         std::map<OUString, uno::Any>::const_iterator it = rGrabBag.find("RowCnfStyle");
@@ -3127,17 +3127,17 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
 
     // If actual width of table is relative it should export is as "pct".`
     const SwTable *pTable = pTableTextNodeInfoInner->getTable();
-    SwFrmFmt *pTblFmt = pTable->GetFrmFmt( );
-    const SwFmtFrmSize &rSize = pTblFmt->GetFrmSize();
+    SwFrameFormat *pTableFormat = pTable->GetFrameFormat( );
+    const SwFormatFrmSize &rSize = pTableFormat->GetFrmSize();
     int nWidthPercent = rSize.GetWidthPercent();
-    uno::Reference<beans::XPropertySet> xPropertySet(SwXTextTables::GetObject(const_cast<SwTableFmt&>(*pTable->GetFrmFmt( ))),uno::UNO_QUERY);
+    uno::Reference<beans::XPropertySet> xPropertySet(SwXTextTables::GetObject(const_cast<SwTableFormat&>(*pTable->GetFrameFormat( ))),uno::UNO_QUERY);
     bool isWidthRelative = false;
     xPropertySet->getPropertyValue("IsWidthRelative") >>= isWidthRelative;
 
     if(isWidthRelative)
     {
        /**
-       * As per ECMA Specification : ECMA-376, Second Edition, Part 1 - Fundamentals And Markup Language Reference [ 17.18.90 ST_TblWidth (Table Width Units)]
+       * As per ECMA Specification : ECMA-376, Second Edition, Part 1 - Fundamentals And Markup Language Reference [ 17.18.90 ST_TableWidth (Table Width Units)]
        * http://www.schemacentral.com/sc/ooxml/a-w_type-7.html
        *
        * Fiftieths of a Percent :
@@ -3166,7 +3166,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
 
     // Look for the table style property in the table grab bag
     std::map<OUString, com::sun::star::uno::Any> aGrabBag =
-            sw::util::HasItem<SfxGrabBagItem>( pTblFmt->GetAttrSet(), RES_FRMATR_GRABBAG )->GetGrabBag();
+            sw::util::HasItem<SfxGrabBagItem>( pTableFormat->GetAttrSet(), RES_FRMATR_GRABBAG )->GetGrabBag();
 
     // We should clear the TableStyle map. In case of Table inside multiple tables it contains the
     // table border style of the previous table.
@@ -3286,7 +3286,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
     // Output the table alignement
     const char* pJcVal;
     sal_Int32 nIndent = 0;
-    switch ( pTblFmt->GetHoriOrient( ).GetHoriOrient( ) )
+    switch ( pTableFormat->GetHoriOrient( ).GetHoriOrient( ) )
     {
         case text::HoriOrientation::CENTER:
             pJcVal = "center";
@@ -3305,7 +3305,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
                 pJcVal = "left";
             else
                 pJcVal = "start";
-            nIndent = sal_Int32( pTblFmt->GetLRSpace( ).GetLeft( ) );
+            nIndent = sal_Int32( pTableFormat->GetLRSpace( ).GetLeft( ) );
             // Table indentation has different meaning in Word, depending if the table is nested or not.
             // If nested, tblInd is added to parent table's left spacing and defines left edge position
             // If not nested, text position of left-most cell must be at absolute X = tblInd
@@ -3313,8 +3313,8 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
             if (m_tableReference->m_nTableDepth == 0)
             {
                 const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
-                const SwFrmFmt * pFrmFmt = pTabBox->GetFrmFmt();
-                nIndent += sal_Int32( pFrmFmt->GetBox( ).GetDistance( SvxBoxItemLine::LEFT ) );
+                const SwFrameFormat * pFrameFormat = pTabBox->GetFrameFormat();
+                nIndent += sal_Int32( pFrameFormat->GetBox( ).GetDistance( SvxBoxItemLine::LEFT ) );
             }
             break;
         }
@@ -3361,7 +3361,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
 void DocxAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
-    const SwFrmFmt * pFrmFmt = pTabBox->GetFrmFmt();
+    const SwFrameFormat * pFrameFormat = pTabBox->GetFrameFormat();
 
     bool bEcma = GetExport().GetFilter().getVersion( ) == oox::core::ECMA_DIALECT;
 
@@ -3369,15 +3369,15 @@ void DocxAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Point
     if (m_aTableStyleConf.empty())
     {
         // the defaults of the table are taken from the top-left cell
-        impl_borders(m_pSerializer, pFrmFmt->GetBox(), lcl_getTableDefaultBorderOptions(bEcma), NULL, m_aTableStyleConf);
+        impl_borders(m_pSerializer, pFrameFormat->GetBox(), lcl_getTableDefaultBorderOptions(bEcma), NULL, m_aTableStyleConf);
     }
 }
 
 void DocxAttributeOutput::TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
-    const SwFrmFmt * pFrmFmt = pTabBox->GetFrmFmt();
-    const SvxBoxItem& rBox = pFrmFmt->GetBox( );
+    const SwFrameFormat * pFrameFormat = pTabBox->GetFrameFormat();
+    const SvxBoxItem& rBox = pFrameFormat->GetBox( );
     const bool bEcma = GetExport().GetFilter().getVersion( ) == oox::core::ECMA_DIALECT;
 
     impl_cellMargins(m_pSerializer, rBox, XML_tblCellMar, !bEcma);
@@ -3385,15 +3385,15 @@ void DocxAttributeOutput::TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::P
 
 void DocxAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
-    const SwTableBox *pTblBox = pTableTextNodeInfoInner->getTableBox( );
-    const SwFrmFmt *pFmt = pTblBox->GetFrmFmt( );
+    const SwTableBox *pTableBox = pTableTextNodeInfoInner->getTableBox( );
+    const SwFrameFormat *pFormat = pTableBox->GetFrameFormat( );
 
-    const SvxBrushItem *aColorProp = sw::util::HasItem<SvxBrushItem>( pFmt->GetAttrSet(), RES_BACKGROUND );
+    const SvxBrushItem *aColorProp = sw::util::HasItem<SvxBrushItem>( pFormat->GetAttrSet(), RES_BACKGROUND );
     Color aColor = aColorProp ? aColorProp->GetColor() : COL_AUTO;
     OString sColor = msfilter::util::ConvertColor( aColor );
 
     std::map<OUString, com::sun::star::uno::Any> aGrabBag =
-            sw::util::HasItem<SfxGrabBagItem>( pFmt->GetAttrSet(), RES_FRMATR_GRABBAG )->GetGrabBag();
+            sw::util::HasItem<SfxGrabBagItem>( pFormat->GetAttrSet(), RES_FRMATR_GRABBAG )->GetGrabBag();
 
     OString sOriginalColor;
     std::map<OUString, com::sun::star::uno::Any>::iterator aGrabBagElement = aGrabBag.find("originalColor");
@@ -3447,10 +3447,10 @@ void DocxAttributeOutput::TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t
     const SwTableLine * pTabLine = pTabBox->GetUpper();
 
     // search next Redline
-    const SwExtraRedlineTbl& aExtraRedlineTbl = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetExtraRedlineTbl();
-    for(sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos < aExtraRedlineTbl.GetSize(); ++nCurRedlinePos )
+    const SwExtraRedlineTable& aExtraRedlineTable = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetExtraRedlineTable();
+    for(sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos < aExtraRedlineTable.GetSize(); ++nCurRedlinePos )
     {
-        SwExtraRedline* pExtraRedline = aExtraRedlineTbl.GetRedline(nCurRedlinePos);
+        SwExtraRedline* pExtraRedline = aExtraRedlineTable.GetRedline(nCurRedlinePos);
         const SwTableRowRedline* pTableRowRedline = dynamic_cast<const SwTableRowRedline*>(pExtraRedline);
         const SwTableLine *pRedTabLine = pTableRowRedline ? &pTableRowRedline->GetTableLine() : NULL;
         if (pRedTabLine == pTabLine)
@@ -3493,10 +3493,10 @@ void DocxAttributeOutput::TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
 
     // search next Redline
-    const SwExtraRedlineTbl& aExtraRedlineTbl = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetExtraRedlineTbl();
-    for(sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos < aExtraRedlineTbl.GetSize(); ++nCurRedlinePos )
+    const SwExtraRedlineTable& aExtraRedlineTable = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetExtraRedlineTable();
+    for(sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos < aExtraRedlineTable.GetSize(); ++nCurRedlinePos )
     {
-        SwExtraRedline* pExtraRedline = aExtraRedlineTbl.GetRedline(nCurRedlinePos);
+        SwExtraRedline* pExtraRedline = aExtraRedlineTable.GetRedline(nCurRedlinePos);
         const SwTableCellRedline* pTableCellRedline = dynamic_cast<const SwTableCellRedline*>(pExtraRedline);
         const SwTableBox *pRedTabBox = pTableCellRedline ? &pTableCellRedline->GetTableBox() : NULL;
         if (pRedTabBox == pTabBox)
@@ -3538,9 +3538,9 @@ void DocxAttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTa
 {
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
     const SwTableLine * pTabLine = pTabBox->GetUpper();
-    const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt();
+    const SwFrameFormat * pLineFormat = pTabLine->GetFrameFormat();
 
-    const SwFmtFrmSize& rLSz = pLineFmt->GetFrmSize();
+    const SwFormatFrmSize& rLSz = pLineFormat->GetFrmSize();
     if ( ATT_VAR_SIZE != rLSz.GetHeightSizeType() && rLSz.GetHeight() )
     {
         sal_Int32 nHeight = rLSz.GetHeight();
@@ -3565,9 +3565,9 @@ void DocxAttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t p
 {
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
     const SwTableLine * pTabLine = pTabBox->GetUpper();
-    const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt();
+    const SwFrameFormat * pLineFormat = pTabLine->GetFrameFormat();
 
-    const SwFmtRowSplit& rSplittable = pLineFmt->GetRowSplit( );
+    const SwFormatRowSplit& rSplittable = pLineFormat->GetRowSplit( );
     // if rSplittable is true then no need to write <w:cantSplit w:val="false"/>
     // as default row prop is allow row to break across page.
     if( !rSplittable.GetValue( ) )
@@ -3579,9 +3579,9 @@ void DocxAttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t p
 void DocxAttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
     const SwTable * pTable = pTableTextNodeInfoInner->getTable();
-    const SwFrmFmt * pFrmFmt = pTable->GetFrmFmt();
+    const SwFrameFormat * pFrameFormat = pTable->GetFrameFormat();
 
-    if ( m_rExport.TrueFrameDirection( *pFrmFmt ) == FRMDIR_HORI_RIGHT_TOP )
+    if ( m_rExport.TrueFrameDirection( *pFrameFormat ) == FRMDIR_HORI_RIGHT_TOP )
     {
         m_pSerializer->singleElementNS( XML_w, XML_bidiVisual,
                 FSNS( XML_w, XML_val ), "true",
@@ -3592,13 +3592,13 @@ void DocxAttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTabl
 void DocxAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
-    const SwFrmFmt *pFrmFmt = pTabBox->GetFrmFmt( );
+    const SwFrameFormat *pFrameFormat = pTabBox->GetFrameFormat( );
 
-    if ( FRMDIR_VERT_TOP_RIGHT == m_rExport.TrueFrameDirection( *pFrmFmt ) )
+    if ( FRMDIR_VERT_TOP_RIGHT == m_rExport.TrueFrameDirection( *pFrameFormat ) )
         m_pSerializer->singleElementNS( XML_w, XML_textDirection,
                FSNS( XML_w, XML_val ), "tbRl",
                FSEND );
-    else if ( FRMDIR_HORI_LEFT_TOP == m_rExport.TrueFrameDirection( *pFrmFmt ) )
+    else if ( FRMDIR_HORI_LEFT_TOP == m_rExport.TrueFrameDirection( *pFrameFormat ) )
     {
         // Undo the text direction mangling done by the btLr handler in writerfilter::dmapper::DomainMapperTableManager::sprm()
         const SwStartNode* pSttNd = pTabBox->GetSttNd();
@@ -3606,10 +3606,10 @@ void DocxAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer
         {
             SwPaM aPam(*pSttNd, 0);
             ++aPam.GetPoint()->nNode;
-            if (aPam.GetPoint()->nNode.GetNode().IsTxtNode())
+            if (aPam.GetPoint()->nNode.GetNode().IsTextNode())
             {
-                const SwTxtNode& rTxtNode = static_cast<const SwTxtNode&>(aPam.GetPoint()->nNode.GetNode());
-                if( const SwAttrSet* pAttrSet = rTxtNode.GetpSwAttrSet())
+                const SwTextNode& rTextNode = static_cast<const SwTextNode&>(aPam.GetPoint()->nNode.GetNode());
+                if( const SwAttrSet* pAttrSet = rTextNode.GetpSwAttrSet())
                 {
                     const SvxCharRotateItem& rCharRotate = pAttrSet->GetCharRotate();
                     if (rCharRotate.GetValue() == 900)
@@ -3776,7 +3776,7 @@ bool lcl_isDefaultFontSize(const SvxFontHeightItem& rFontHeight, SwDoc* pDoc)
 {
     bool bRet = rFontHeight.GetHeight() != 200; // see StyleSheetTable_Impl::StyleSheetTable_Impl() where we set this default
     // Additionally, if the default para style has the same font size, then don't write it here.
-    SwTxtFmtColl* pDefaultStyle = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
+    SwTextFormatColl* pDefaultStyle = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD);
     if (pDefaultStyle)
     {
         const SfxPoolItem* pItem = 0;
@@ -3921,7 +3921,7 @@ void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem& rHt)
             bMustWrite = static_cast< const SvxAdjustItem& >(rHt).GetAdjust() != SVX_ADJUST_LEFT;
             break;
         case RES_PARATR_SPLIT:
-            bMustWrite = !static_cast< const SvxFmtSplitItem& >(rHt).GetValue();
+            bMustWrite = !static_cast< const SvxFormatSplitItem& >(rHt).GetValue();
             break;
         case RES_PARATR_WIDOWS:
             bMustWrite = static_cast< const SvxWidowsItem& >(rHt).GetValue();
@@ -4062,15 +4062,15 @@ void DocxAttributeOutput::ClearRelIdCache()
     m_aRelIdCache.clear();
 }
 
-void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode, const SdrObject* pSdrObj )
+void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj )
 {
-    OSL_TRACE( "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode, const SdrObject* pSdrObj  ) - some stuff still missing" );
+    OSL_TRACE( "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj  ) - some stuff still missing" );
 
     GetSdtEndBefore(pSdrObj);
 
     // detect mis-use of the API
-    assert(pGrfNode || (pOLEFrmFmt && pOLENode));
-    const SwFrmFmt* pFrmFmt = pGrfNode ? pGrfNode->GetFlyFmt() : pOLEFrmFmt;
+    assert(pGrfNode || (pOLEFrameFormat && pOLENode));
+    const SwFrameFormat* pFrameFormat = pGrfNode ? pGrfNode->GetFlyFormat() : pOLEFrameFormat;
     // create the relation ID
     OString aRelId;
     sal_Int32 nImageType;
@@ -4117,21 +4117,21 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
     // In case there are any grab-bag items on the graphic frame, emit them now.
     // These are always character grab-bags, as graphics are at-char or as-char in Word.
     const SfxPoolItem* pItem = 0;
-    if (pFrmFmt->GetAttrSet().HasItem(RES_FRMATR_GRABBAG, &pItem))
+    if (pFrameFormat->GetAttrSet().HasItem(RES_FRMATR_GRABBAG, &pItem))
     {
         const SfxGrabBagItem* pGrabBag = static_cast<const SfxGrabBagItem*>(pItem);
         CharGrabBag(*pGrabBag);
     }
 
-    m_rExport.SdrExporter().startDMLAnchorInline(pFrmFmt, rSize);
+    m_rExport.SdrExporter().startDMLAnchorInline(pFrameFormat, rSize);
 
     // picture description (used for pic:cNvPr later too)
     ::sax_fastparser::FastAttributeList* docPrattrList = FastSerializerHelper::createAttrList();
     docPrattrList->add( XML_id, OString::number( m_anchorId++).getStr());
-    docPrattrList->add( XML_name, OUStringToOString( pFrmFmt->GetName(), RTL_TEXTENCODING_UTF8 ) );
-    docPrattrList->add( XML_descr, OUStringToOString( pGrfNode ? pGrfNode->GetDescription() : pOLEFrmFmt->GetObjDescription(), RTL_TEXTENCODING_UTF8 ).getStr());
+    docPrattrList->add( XML_name, OUStringToOString( pFrameFormat->GetName(), RTL_TEXTENCODING_UTF8 ) );
+    docPrattrList->add( XML_descr, OUStringToOString( pGrfNode ? pGrfNode->GetDescription() : pOLEFrameFormat->GetObjDescription(), RTL_TEXTENCODING_UTF8 ).getStr());
     if( GetExport().GetFilter().getVersion( ) != oox::core::ECMA_DIALECT )
-        docPrattrList->add( XML_title, OUStringToOString( pGrfNode ? pGrfNode->GetTitle() : pOLEFrmFmt->GetObjTitle(), RTL_TEXTENCODING_UTF8 ).getStr());
+        docPrattrList->add( XML_title, OUStringToOString( pGrfNode ? pGrfNode->GetTitle() : pOLEFrameFormat->GetObjTitle(), RTL_TEXTENCODING_UTF8 ).getStr());
     XFastAttributeListRef docPrAttrListRef( docPrattrList );
     m_pSerializer->startElementNS( XML_wp, XML_docPr, docPrAttrListRef );
     // TODO hyperlink
@@ -4248,7 +4248,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
             FSEND );
     m_pSerializer->endElementNS( XML_a, XML_prstGeom );
 
-    const SvxBoxItem& rBoxItem = pFrmFmt->GetBox();
+    const SvxBoxItem& rBoxItem = pFrameFormat->GetBox();
     const SvxBorderLine* pLeft = rBoxItem.GetLine(SvxBoxItemLine::LEFT);
     const SvxBorderLine* pRight = rBoxItem.GetLine(SvxBoxItemLine::RIGHT);
     const SvxBorderLine* pTop = rBoxItem.GetLine(SvxBoxItemLine::TOP);
@@ -4256,7 +4256,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
     if (pLeft || pRight || pTop || pBottom)
         m_rExport.SdrExporter().writeBoxItemLine(rBoxItem);
 
-    m_rExport.SdrExporter().writeDMLEffectLst(*pFrmFmt);
+    m_rExport.SdrExporter().writeDMLEffectLst(*pFrameFormat);
 
     m_pSerializer->endElementNS( XML_pic, XML_spPr );
 
@@ -4264,23 +4264,23 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
 
     m_pSerializer->endElementNS( XML_a, XML_graphicData );
     m_pSerializer->endElementNS( XML_a, XML_graphic );
-    m_rExport.SdrExporter().endDMLAnchorInline(pFrmFmt);
+    m_rExport.SdrExporter().endDMLAnchorInline(pFrameFormat);
 }
 
-void DocxAttributeOutput::WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rOLENode, const Size& rSize, const SwFlyFrmFmt* pFlyFrmFmt )
+void DocxAttributeOutput::WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rOLENode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat )
 {
     if( WriteOLEChart( pSdrObj, rSize ))
         return;
     if( WriteOLEMath( pSdrObj, rOLENode, rSize ))
         return;
-    if( PostponeOLE( pSdrObj, rOLENode, rSize, pFlyFrmFmt ))
+    if( PostponeOLE( pSdrObj, rOLENode, rSize, pFlyFrameFormat ))
         return;
     // Then we fall back to just export the object as a graphic.
     if( !m_pPostponedGraphic )
-        FlyFrameGraphic( 0, rSize, pFlyFrmFmt, &rOLENode );
+        FlyFrameGraphic( 0, rSize, pFlyFrameFormat, &rOLENode );
     else
         // w:drawing should not be inside w:rPr, so write it out later
-        m_pPostponedGraphic->push_back(PostponedGraphic(0, rSize, pFlyFrmFmt, &rOLENode, 0));
+        m_pPostponedGraphic->push_back(PostponedGraphic(0, rSize, pFlyFrameFormat, &rOLENode, 0));
 }
 
 bool DocxAttributeOutput::WriteOLEChart( const SdrObject* pSdrObj, const Size& rSize )
@@ -4577,13 +4577,13 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
     }
 }
 
-bool DocxAttributeOutput::PostponeOLE( const SdrObject*, SwOLENode& rNode, const Size& rSize, const SwFlyFrmFmt* pFlyFrmFmt )
+bool DocxAttributeOutput::PostponeOLE( const SdrObject*, SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat )
 {
     if( !m_pPostponedOLEs )
         //cannot be postponed, try to write now
-        WriteOLE( rNode, rSize, pFlyFrmFmt );
+        WriteOLE( rNode, rSize, pFlyFrameFormat );
     else
-        m_pPostponedOLEs->push_back( PostponedOLE( &rNode, rSize, pFlyFrmFmt ) );
+        m_pPostponedOLEs->push_back( PostponedOLE( &rNode, rSize, pFlyFrameFormat ) );
     return true;
 }
 
@@ -4606,7 +4606,7 @@ void DocxAttributeOutput::WritePostponedOLE()
     m_pPostponedOLEs.reset(0);
 }
 
-void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrmFmt* rFlyFrmFmt )
+void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* rFlyFrameFormat )
 {
     // get interoperability information about embedded objects
     uno::Reference< beans::XPropertySet > xPropSet( m_rExport.m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
@@ -4732,7 +4732,7 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S
     {
         // the embedded file could not be saved
         // fallback: save as an image
-        FlyFrameGraphic( 0, rSize, rFlyFrmFmt, &rNode );
+        FlyFrameGraphic( 0, rSize, rFlyFrameFormat, &rNode );
         return;
     }
 
@@ -4846,7 +4846,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
     {
         case sw::Frame::eGraphic:
             {
-                const SdrObject* pSdrObj = rFrame.GetFrmFmt().FindRealSdrObject();
+                const SdrObject* pSdrObj = rFrame.GetFrameFormat().FindRealSdrObject();
                 const SwNode *pNode = rFrame.GetContent();
                 const SwGrfNode *pGrfNode = pNode ? pNode->GetGrfNode() : 0;
                 if ( pGrfNode )
@@ -4866,7 +4866,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
             break;
         case sw::Frame::eDrawing:
             {
-                const SdrObject* pSdrObj = rFrame.GetFrmFmt().FindRealSdrObject();
+                const SdrObject* pSdrObj = rFrame.GetFrameFormat().FindRealSdrObject();
                 if ( pSdrObj )
                 {
                     if ( IsDiagram( pSdrObj ) )
@@ -4874,12 +4874,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
                         if ( !m_pPostponedDiagrams )
                         {
                             m_bPostponedProcessingFly = false ;
-                            m_rExport.SdrExporter().writeDiagram( pSdrObj, rFrame.GetFrmFmt(), m_anchorId++);
+                            m_rExport.SdrExporter().writeDiagram( pSdrObj, rFrame.GetFrameFormat(), m_anchorId++);
                         }
                         else // we are writing out attributes, but w:drawing should not be inside w:rPr,
                         {    // so write it out later
                             m_bPostponedProcessingFly = true ;
-                            m_pPostponedDiagrams->push_back( PostponedDiagram( pSdrObj, &(rFrame.GetFrmFmt()) ));
+                            m_pPostponedDiagrams->push_back( PostponedDiagram( pSdrObj, &(rFrame.GetFrameFormat()) ));
                         }
                     }
                     else
@@ -4891,12 +4891,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
                             {
                                 // Do not write w:drawing inside w:drawing. Instead Postpone the Inner Drawing.
                                 if( m_rExport.SdrExporter().IsDrawingOpen() )
-                                    m_pPostponedCustomShape->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrmFmt()), &rNdTopLeft));
+                                    m_pPostponedCustomShape->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrameFormat()), &rNdTopLeft));
                                 else
-                                    m_rExport.SdrExporter().writeDMLDrawing( pSdrObj, &rFrame.GetFrmFmt(), m_anchorId++);
+                                    m_rExport.SdrExporter().writeDMLDrawing( pSdrObj, &rFrame.GetFrameFormat(), m_anchorId++);
                             }
                             else
-                                m_rExport.SdrExporter().writeDMLAndVMLDrawing( pSdrObj, rFrame.GetFrmFmt(), rNdTopLeft, m_anchorId++);
+                                m_rExport.SdrExporter().writeDMLAndVMLDrawing( pSdrObj, rFrame.GetFrameFormat(), rNdTopLeft, m_anchorId++);
                             m_bStartedParaSdt = bStartedParaSdt;
 
                             m_bPostponedProcessingFly = false ;
@@ -4904,30 +4904,30 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
                         // IsAlternateContentChoiceOpen() : check is to ensure that only one object is getting added. Without this check, plus one obejct gets added
                         // m_bParagraphFrameOpen : Check if the frame is open.
                         else if (IsAlternateContentChoiceOpen() && m_bParagraphFrameOpen)
-                            m_pPostponedCustomShape->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrmFmt()), &rNdTopLeft));
+                            m_pPostponedCustomShape->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrameFormat()), &rNdTopLeft));
                         else
                         {
                             // we are writing out attributes, but w:drawing should not be inside w:rPr, so write it out later
                             m_bPostponedProcessingFly = true ;
-                            m_pPostponedDMLDrawings->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrmFmt()), &rNdTopLeft));
+                            m_pPostponedDMLDrawings->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrameFormat()), &rNdTopLeft));
                         }
                     }
                 }
             }
             break;
-        case sw::Frame::eTxtBox:
+        case sw::Frame::eTextBox:
             {
                 // If this is a TextBox of a shape, then ignore: it's handled in WriteTextBox().
-                if (m_rExport.SdrExporter().isTextBox(rFrame.GetFrmFmt()))
+                if (m_rExport.SdrExporter().isTextBox(rFrame.GetFrameFormat()))
                     break;
 
                 // The frame output is postponed to the end of the anchor paragraph
                 bool bDuplicate = false;
-                const OUString& rName = rFrame.GetFrmFmt().GetName();
+                const OUString& rName = rFrame.GetFrameFormat().GetName();
                 unsigned nSize = m_aFramesOfParagraph.size();
                 for( unsigned nIndex = 0; nIndex < nSize; ++nIndex )
                 {
-                    const OUString& rNameExisting = m_aFramesOfParagraph[nIndex].GetFrmFmt().GetName();
+                    const OUString& rNameExisting = m_aFramesOfParagraph[nIndex].GetFrameFormat().GetName();
 
                     if (!rName.isEmpty() && !rNameExisting.isEmpty())
                     {
@@ -4945,27 +4945,27 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
             break;
         case sw::Frame::eOle:
             {
-                const SwFrmFmt &rFrmFmt = rFrame.GetFrmFmt();
-                const SdrObject *pSdrObj = rFrmFmt.FindRealSdrObject();
+                const SwFrameFormat &rFrameFormat = rFrame.GetFrameFormat();
+                const SdrObject *pSdrObj = rFrameFormat.FindRealSdrObject();
                 if ( pSdrObj )
                 {
-                    SwNodeIndex aIdx(*rFrmFmt.GetCntnt().GetCntntIdx(), 1);
+                    SwNodeIndex aIdx(*rFrameFormat.GetContent().GetContentIdx(), 1);
                     SwOLENode& rOLENd = *aIdx.GetNode().GetOLENode();
-                    WriteOLE2Obj( pSdrObj, rOLENd, rFrame.GetLayoutSize(), dynamic_cast<const SwFlyFrmFmt*>( &rFrmFmt ));
+                    WriteOLE2Obj( pSdrObj, rOLENd, rFrame.GetLayoutSize(), dynamic_cast<const SwFlyFrameFormat*>( &rFrameFormat ));
                     m_bPostponedProcessingFly = false ;
                 }
             }
             break;
         case sw::Frame::eFormControl:
             {
-                const SdrObject* pObject = rFrame.GetFrmFmt().FindRealSdrObject();
+                const SdrObject* pObject = rFrame.GetFrameFormat().FindRealSdrObject();
                 m_aPostponedFormControls.push_back(pObject);
                 m_bPostponedProcessingFly = true ;
             }
             break;
         default:
             OSL_TRACE( "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Point& rNdTopLeft ) - frame type '%s'\n",
-                    rFrame.GetWriterType() == sw::Frame::eTxtBox? "eTxtBox":
+                    rFrame.GetWriterType() == sw::Frame::eTextBox? "eTextBox":
                     ( rFrame.GetWriterType() == sw::Frame::eOle? "eOle": "???" ) );
             break;
     }
@@ -5038,8 +5038,8 @@ void DocxAttributeOutput::WriteOutliner(const OutlinerParaObject& rParaObj)
             WriteCollectedRunProperties();
             m_pSerializer->endElementNS(XML_w, XML_rPr);
 
-            bool bTxtAtr = aAttrIter.IsTxtAttr( nAktPos );
-            if( !bTxtAtr )
+            bool bTextAtr = aAttrIter.IsTextAttr( nAktPos );
+            if( !bTextAtr )
             {
                 OUString aOut( aStr.copy( nAktPos, nNextAttr - nAktPos ) );
                 RunText(aOut);
@@ -5083,8 +5083,8 @@ void DocxAttributeOutput::WriteTextBox(uno::Reference<drawing::XShape> xShape)
     DocxTableExportContext aTableExportContext;
     pushToTableExportContext(aTableExportContext);
 
-    SwFrmFmt* pTextBox = SwTextBoxHelper::findTextBox(xShape);
-    const SwPosition* pAnchor = pTextBox->GetAnchor().GetCntntAnchor();
+    SwFrameFormat* pTextBox = SwTextBoxHelper::findTextBox(xShape);
+    const SwPosition* pAnchor = pTextBox->GetAnchor().GetContentAnchor();
     sw::Frame aFrame(*pTextBox, *pAnchor);
     m_rExport.SdrExporter().writeDMLTextFrame(&aFrame, m_anchorId++, /*bTextBoxOnly=*/true);
 
@@ -5096,8 +5096,8 @@ void DocxAttributeOutput::WriteVMLTextBox(uno::Reference<drawing::XShape> xShape
     DocxTableExportContext aTableExportContext;
     pushToTableExportContext(aTableExportContext);
 
-    SwFrmFmt* pTextBox = SwTextBoxHelper::findTextBox(xShape);
-    const SwPosition* pAnchor = pTextBox->GetAnchor().GetCntntAnchor();
+    SwFrameFormat* pTextBox = SwTextBoxHelper::findTextBox(xShape);
+    const SwPosition* pAnchor = pTextBox->GetAnchor().GetContentAnchor();
     sw::Frame aFrame(*pTextBox, *pAnchor);
     m_rExport.SdrExporter().writeVMLTextFrame(&aFrame, /*bTextBoxOnly=*/true);
 
@@ -5167,8 +5167,8 @@ void DocxAttributeOutput::StartStyle( const OUString& rName, StyleType eType,
     uno::Any aAny;
     if (eType == STYLE_TYPE_PARA || eType == STYLE_TYPE_CHAR)
     {
-        const SwFmt* pFmt = m_rExport.m_pStyles->GetSwFmt(nId);
-        pFmt->GetGrabBagItem(aAny);
+        const SwFormat* pFormat = m_rExport.m_pStyles->GetSwFormat(nId);
+        pFormat->GetGrabBagItem(aAny);
     }
     else
     {
@@ -5313,7 +5313,7 @@ void lcl_OutlineLevel(sax_fastparser::FSHelperPtr pSerializer, sal_uInt16 nLevel
             FSEND);
 }
 
-void DocxAttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt& /*rNFmt*/, const SwFmt& /*rFmt*/ )
+void DocxAttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat& /*rNFormat*/, const SwFormat& /*rFormat*/ )
 {
     lcl_OutlineLevel(m_pSerializer, nLvl);
 }
@@ -5477,11 +5477,11 @@ void DocxAttributeOutput::SectionTitlePage()
     m_pSerializer->singleElementNS( XML_w, XML_titlePg, FSEND );
 }
 
-void DocxAttributeOutput::SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* /*pFirstPageFmt*/ )
+void DocxAttributeOutput::SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* /*pFirstPageFormat*/ )
 {
     // Output the margins
 
-    const SvxBoxItem& rBox = pFmt->GetBox( );
+    const SvxBoxItem& rBox = pFormat->GetBox( );
 
     const SvxBorderLine* pLeft = rBox.GetLeft( );
     const SvxBorderLine* pTop = rBox.GetTop( );
@@ -5521,7 +5521,7 @@ void DocxAttributeOutput::SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmF
 
         // By top margin, impl_borders() means the distance between the top of the page and the header frame.
         PageMargins aMargins = m_pageMargins;
-        HdFtDistanceGlue aGlue(pFmt->GetAttrSet());
+        HdFtDistanceGlue aGlue(pFormat->GetAttrSet());
         if (aGlue.HasHeader())
             aMargins.nPageMarginTop = aGlue.dyaHdrTop;
         // Ditto for bottom margin.
@@ -5628,9 +5628,9 @@ void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::boo
        pAttr->add( FSNS( XML_w, XML_start ), OString::number( oPageRestartNumber.get() ) );
 
     // nNumType corresponds to w:fmt. See WW8Export::GetNumId() for more precisions
-    OString aFmt( impl_NumberingType( nNumType ) );
-    if ( !aFmt.isEmpty() )
-        pAttr->add( FSNS( XML_w, XML_fmt ), aFmt.getStr() );
+    OString aFormat( impl_NumberingType( nNumType ) );
+    if ( !aFormat.isEmpty() )
+        pAttr->add( FSNS( XML_w, XML_fmt ), aFormat.getStr() );
 
     XFastAttributeListRef xAttrs( pAttr );
     m_pSerializer->singleElementNS( XML_w, XML_pgNumType, xAttrs );
@@ -5918,11 +5918,11 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
     }
 
     // format
-    OString aFmt( impl_LevelNFC( nNumberingType ,pOutSet) );
+    OString aFormat( impl_LevelNFC( nNumberingType ,pOutSet) );
 
-    if ( !aFmt.isEmpty() )
+    if ( !aFormat.isEmpty() )
         m_pSerializer->singleElementNS( XML_w, XML_numFmt,
-                FSNS( XML_w, XML_val ), aFmt.getStr(),
+                FSNS( XML_w, XML_val ), aFormat.getStr(),
                 FSEND );
 
     // suffix
@@ -6470,47 +6470,47 @@ void DocxAttributeOutput::CharHighlight( const SvxBrushItem& rHighlight )
     }
 }
 
-void DocxAttributeOutput::TextINetFormat( const SwFmtINetFmt& rLink )
+void DocxAttributeOutput::TextINetFormat( const SwFormatINetFormat& rLink )
 {
-    const SwTxtINetFmt* pINetFmt = rLink.GetTxtINetFmt();
-    const SwCharFmt* pCharFmt = pINetFmt->GetCharFmt();
+    const SwTextINetFormat* pINetFormat = rLink.GetTextINetFormat();
+    const SwCharFormat* pCharFormat = pINetFormat->GetCharFormat();
 
-    OString aStyleId(m_rExport.m_pStyles->GetStyleId(m_rExport.GetId(pCharFmt)));
+    OString aStyleId(m_rExport.m_pStyles->GetStyleId(m_rExport.GetId(pCharFormat)));
 
     m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
 }
 
-void DocxAttributeOutput::TextCharFormat( const SwFmtCharFmt& rCharFmt )
+void DocxAttributeOutput::TextCharFormat( const SwFormatCharFormat& rCharFormat )
 {
-    OString aStyleId(m_rExport.m_pStyles->GetStyleId(m_rExport.GetId(rCharFmt.GetCharFmt())));
+    OString aStyleId(m_rExport.m_pStyles->GetStyleId(m_rExport.GetId(rCharFormat.GetCharFormat())));
 
     m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
 }
 
-void DocxAttributeOutput::RefField( const SwField&  rFld, const OUString& rRef )
+void DocxAttributeOutput::RefField( const SwField&  rField, const OUString& rRef )
 {
-    sal_uInt16 nType = rFld.GetTyp( )->Which( );
+    sal_uInt16 nType = rField.GetTyp( )->Which( );
     if ( nType == RES_GETEXPFLD )
     {
         OUString sCmd = FieldString( ww::eREF );
         sCmd += "\"" + rRef + "\" ";
 
-        m_rExport.OutputField( &rFld, ww::eREF, sCmd );
+        m_rExport.OutputField( &rField, ww::eREF, sCmd );
     }
 
     // There is nothing to do here for the set fields
 }
 
-void DocxAttributeOutput::HiddenField( const SwField& /*rFld*/ )
+void DocxAttributeOutput::HiddenField( const SwField& /*rField*/ )
 {
     OSL_TRACE( "TODO DocxAttributeOutput::HiddenField()" );
 }
 
-void DocxAttributeOutput::PostitField( const SwField* pFld )
+void DocxAttributeOutput::PostitField( const SwField* pField )
 {
-    assert( dynamic_cast< const SwPostItField* >( pFld ));
-    const SwPostItField* pPostItFld = static_cast<const SwPostItField*>(pFld);
-    OString aName = OUStringToOString(pPostItFld->GetName(), RTL_TEXTENCODING_UTF8);
+    assert( dynamic_cast< const SwPostItField* >( pField ));
+    const SwPostItField* pPostItField = static_cast<const SwPostItField*>(pField);
+    OString aName = OUStringToOString(pPostItField->GetName(), RTL_TEXTENCODING_UTF8);
     sal_Int32 nId = 0;
     std::map< OString, sal_uInt16 >::iterator it = m_rOpenedAnnotationMarksIds.find(aName);
     if (it != m_rOpenedAnnotationMarksIds.end())
@@ -6519,7 +6519,7 @@ void DocxAttributeOutput::PostitField( const SwField* pFld )
     else
         // Otherwise get a new one.
         nId = m_nNextAnnotationMarkId++;
-    m_postitFields.push_back(std::make_pair(pPostItFld, nId));
+    m_postitFields.push_back(std::make_pair(pPostItField, nId));
 }
 
 void DocxAttributeOutput::WritePostitFieldReference()
@@ -6551,7 +6551,7 @@ void DocxAttributeOutput::WritePostitFields()
             FSNS( XML_w, XML_date ), DateTimeToOString(f->GetDateTime()).getStr(),
             FSNS( XML_w, XML_initials ), OUStringToOString( f->GetInitials(), RTL_TEXTENCODING_UTF8 ).getStr(), FSEND );
         // Check for the text object existing, it seems that it can be NULL when saving a newly created
-        // comment without giving focus back to the main document. As GetTxt() is empty in that case as well,
+        // comment without giving focus back to the main document. As GetText() is empty in that case as well,
         // that is probably a bug in the Writer core.
         if( f->GetTextObject() != NULL )
             GetExport().WriteOutliner( *f->GetTextObject(), TXT_ATN );
@@ -6559,21 +6559,21 @@ void DocxAttributeOutput::WritePostitFields()
     }
 }
 
-bool DocxAttributeOutput::DropdownField( const SwField* pFld )
+bool DocxAttributeOutput::DropdownField( const SwField* pField )
 {
     bool bExpand = false;
 
     ww::eField eType = ww::eFORMDROPDOWN;
     OUString sCmd = FieldString( eType  );
-    GetExport( ).OutputField( pFld, eType, sCmd );
+    GetExport( ).OutputField( pField, eType, sCmd );
 
     return bExpand;
 }
 
-bool DocxAttributeOutput::PlaceholderField( const SwField* pFld )
+bool DocxAttributeOutput::PlaceholderField( const SwField* pField )
 {
     assert( pendingPlaceholder == NULL );
-    pendingPlaceholder = pFld;
+    pendingPlaceholder = pField;
     return false; // do not expand
 }
 
@@ -6581,63 +6581,63 @@ void DocxAttributeOutput::WritePendingPlaceholder()
 {
     if( pendingPlaceholder == NULL )
         return;
-    const SwField* pFld = pendingPlaceholder;
+    const SwField* pField = pendingPlaceholder;
     pendingPlaceholder = NULL;
     m_pSerializer->startElementNS( XML_w, XML_sdt, FSEND );
     m_pSerializer->startElementNS( XML_w, XML_sdtPr, FSEND );
-    if( !pFld->GetPar2().isEmpty())
+    if( !pField->GetPar2().isEmpty())
         m_pSerializer->singleElementNS( XML_w, XML_alias,
-            FSNS( XML_w, XML_val ), OUStringToOString( pFld->GetPar2(), RTL_TEXTENCODING_UTF8 ), FSEND );
+            FSNS( XML_w, XML_val ), OUStringToOString( pField->GetPar2(), RTL_TEXTENCODING_UTF8 ), FSEND );
     m_pSerializer->singleElementNS( XML_w, XML_temporary, FSEND );
     m_pSerializer->singleElementNS( XML_w, XML_showingPlcHdr, FSEND );
     m_pSerializer->singleElementNS( XML_w, XML_text, FSEND );
     m_pSerializer->endElementNS( XML_w, XML_sdtPr );
     m_pSerializer->startElementNS( XML_w, XML_sdtContent, FSEND );
     m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-    RunText( pFld->GetPar1());
+    RunText( pField->GetPar1());
     m_pSerializer->endElementNS( XML_w, XML_r );
     m_pSerializer->endElementNS( XML_w, XML_sdtContent );
     m_pSerializer->endElementNS( XML_w, XML_sdt );
 }
 
-void DocxAttributeOutput::SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd )
+void DocxAttributeOutput::SetField( const SwField& rField, ww::eField eType, const OUString& rCmd )
 {
     // field bookmarks are handled in the EndRun method
-    GetExport().OutputField(&rFld, eType, rCmd );
+    GetExport().OutputField(&rField, eType, rCmd );
 }
 
-void DocxAttributeOutput::WriteExpand( const SwField* pFld )
+void DocxAttributeOutput::WriteExpand( const SwField* pField )
 {
     // Will be written in the next End Run
     OUString sCmd;
-    m_rExport.OutputField( pFld, ww::eUNKNOWN, sCmd );
+    m_rExport.OutputField( pField, ww::eUNKNOWN, sCmd );
 }
 
-void DocxAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField eType, const OUString& rFldCmd, sal_uInt8 nMode )
+void DocxAttributeOutput::WriteField_Impl( const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode )
 {
     struct FieldInfos infos;
-    if (pFld)
-        infos.pField.reset(pFld->CopyField());
-    infos.sCmd = rFldCmd;
+    if (pField)
+        infos.pField.reset(pField->CopyField());
+    infos.sCmd = rFieldCmd;
     infos.eType = eType;
     infos.bClose = WRITEFIELD_CLOSE & nMode;
     infos.bOpen = WRITEFIELD_START & nMode;
     m_Fields.push_back( infos );
 
-    if ( pFld )
+    if ( pField )
     {
-        sal_uInt16 nType = pFld->GetTyp( )->Which( );
-        sal_uInt16 nSubType = pFld->GetSubType();
+        sal_uInt16 nType = pField->GetTyp( )->Which( );
+        sal_uInt16 nSubType = pField->GetSubType();
 
         // TODO Any other field types here ?
         if ( ( nType == RES_SETEXPFLD ) && ( nSubType & nsSwGetSetExpType::GSE_STRING ) )
         {
-            const SwSetExpField *pSet = static_cast<const SwSetExpField*>( pFld );
+            const SwSetExpField *pSet = static_cast<const SwSetExpField*>( pField );
             m_sFieldBkm = pSet->GetPar1( );
         }
         else if ( nType == RES_DROPDOWN )
         {
-            const SwDropDownField* pDropDown = static_cast<const SwDropDownField*>( pFld );
+            const SwDropDownField* pDropDown = static_cast<const SwDropDownField*>( pField );
             m_sFieldBkm = pDropDown->GetName( );
         }
     }
@@ -6685,15 +6685,15 @@ void DocxAttributeOutput::WriteAnnotationMarks_Impl( std::vector< OUString >& rS
     rEnds.clear();
 }
 
-void DocxAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote )
+void DocxAttributeOutput::TextFootnote_Impl( const SwFormatFootnote& rFootnote )
 {
     const SwEndNoteInfo& rInfo = rFootnote.IsEndNote()?
-        m_rExport.m_pDoc->GetEndNoteInfo(): m_rExport.m_pDoc->GetFtnInfo();
+        m_rExport.m_pDoc->GetEndNoteInfo(): m_rExport.m_pDoc->GetFootnoteInfo();
 
     // footnote/endnote run properties
-    const SwCharFmt* pCharFmt = rInfo.GetAnchorCharFmt( *m_rExport.m_pDoc );
+    const SwCharFormat* pCharFormat = rInfo.GetAnchorCharFormat( *m_rExport.m_pDoc );
 
-    OString aStyleId(m_rExport.m_pStyles->GetStyleId(m_rExport.GetId(pCharFmt)));
+    OString aStyleId(m_rExport.m_pStyles->GetStyleId(m_rExport.GetId(pCharFormat)));
 
     m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
 
@@ -6709,7 +6709,7 @@ void DocxAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote )
 void DocxAttributeOutput::FootnoteEndnoteReference()
 {
     sal_Int32 nId;
-    const SwFmtFtn *pFootnote = m_pFootnotesList->getCurrent( nId );
+    const SwFormatFootnote *pFootnote = m_pFootnotesList->getCurrent( nId );
 
     // both cannot be set at the same time - if they are, it's a bug
     if ( !pFootnote )
@@ -6763,9 +6763,9 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes )
     bool bSeparator = true;
     if (bFootnotes)
     {
-        const SwPageFtnInfo& rFtnInfo = m_rExport.m_pDoc->GetPageDesc(0).GetFtnInfo();
+        const SwPageFootnoteInfo& rFootnoteInfo = m_rExport.m_pDoc->GetPageDesc(0).GetFootnoteInfo();
         // Request a separator only in case the width is larger than zero.
-        bSeparator = double(rFtnInfo.GetWidth()) > 0;
+        bSeparator = double(rFootnoteInfo.GetWidth()) > 0;
     }
 
     if (bSeparator)
@@ -6795,7 +6795,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes )
                 FSNS( XML_w, XML_id ), OString::number( nIndex ).getStr(),
                 FSEND );
 
-        const SwNodeIndex* pIndex = (*i)->GetTxtFtn()->GetStartNode();
+        const SwNodeIndex* pIndex = (*i)->GetTextFootnote()->GetStartNode();
         // tag required at the start of each footnote/endnote
         m_footnoteEndnoteRefTag = bFootnotes ? XML_footnoteRef : XML_endnoteRef;
 
@@ -6815,7 +6815,7 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr
 {
     fs->startElementNS( XML_w, tag, FSEND );
     const char* fmt = NULL;
-    switch( info.aFmt.GetNumberingType())
+    switch( info.aFormat.GetNumberingType())
     {
         case SVX_NUM_CHARS_UPPER_LETTER_N: // fall through, map to upper letters
         case SVX_NUM_CHARS_UPPER_LETTER:
@@ -6847,9 +6847,9 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr
     }
     if( fmt != NULL )
         fs->singleElementNS( XML_w, XML_numFmt, FSNS( XML_w, XML_val ), fmt, FSEND );
-    if( info.nFtnOffset != 0 )
+    if( info.nFootnoteOffset != 0 )
         fs->singleElementNS( XML_w, XML_numStart, FSNS( XML_w, XML_val ),
-            OString::number( info.nFtnOffset + 1).getStr(), FSEND );
+            OString::number( info.nFootnoteOffset + 1).getStr(), FSEND );
     if( listtag != 0 ) // we are writing to settings.xml, write also special footnote/endnote list
     { // there are currently only two hardcoded ones ( see FootnotesEndnotes())
         fs->singleElementNS( XML_w, listtag, FSNS( XML_w, XML_id ), "0", FSEND );
@@ -6861,7 +6861,7 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr
 void DocxAttributeOutput::SectFootnoteEndnotePr()
 {
     if( HasFootnotes())
-        WriteFootnoteEndnotePr( m_pSerializer, XML_footnotePr, m_rExport.m_pDoc->GetFtnInfo(), 0 );
+        WriteFootnoteEndnotePr( m_pSerializer, XML_footnotePr, m_rExport.m_pDoc->GetFootnoteInfo(), 0 );
     if( HasEndnotes())
         WriteFootnoteEndnotePr( m_pSerializer, XML_endnotePr, m_rExport.m_pDoc->GetEndNoteInfo(), 0 );
 }
@@ -6948,7 +6948,7 @@ void DocxAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
     m_pSerializer->singleElementNS( XML_w, XML_jc, FSNS( XML_w, XML_val ), pAdjustString, FSEND );
 }
 
-void DocxAttributeOutput::ParaSplit( const SvxFmtSplitItem& rSplit )
+void DocxAttributeOutput::ParaSplit( const SvxFormatSplitItem& rSplit )
 {
     if (rSplit.GetValue())
         m_pSerializer->singleElementNS( XML_w, XML_keepLines, FSNS( XML_w, XML_val ), "false", FSEND );
@@ -7010,7 +7010,7 @@ static void impl_WriteTabElement( FSHelperPtr pSerializer,
 void DocxAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop )
 {
     const SfxPoolItem* pLR = m_rExport.HasItem( RES_LR_SPACE );
-    long nCurrentLeft = pLR ? static_cast<const SvxLRSpaceItem*>(pLR)->GetTxtLeft() : 0;
+    long nCurrentLeft = pLR ? static_cast<const SvxLRSpaceItem*>(pLR)->GetTextLeft() : 0;
 
     sal_uInt16 nCount = rTabStop.Count();
 
@@ -7043,7 +7043,7 @@ void DocxAttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem& rHyphenZone )
             FSEND );
 }
 
-void DocxAttributeOutput::ParaNumRule_Impl( const SwTxtNode* /*pTxtNd*/, sal_Int32 nLvl, sal_Int32 nNumId )
+void DocxAttributeOutput::ParaNumRule_Impl( const SwTextNode* /*pTextNd*/, sal_Int32 nLvl, sal_Int32 nNumId )
 {
     if ( USHRT_MAX != nNumId )
     {
@@ -7109,7 +7109,7 @@ void DocxAttributeOutput::ParaSnapToGrid( const SvxParaGridItem& rGrid )
             FSEND );
 }
 
-void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
+void DocxAttributeOutput::FormatFrameSize( const SwFormatFrmSize& rSize )
 {
     if (m_rExport.SdrExporter().getTextFrameSyntax() && m_rExport.SdrExporter().getFlyFrameSize())
     {
@@ -7199,15 +7199,15 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
     else
     {
         FastAttributeList *pLRSpaceAttrList = FastSerializerHelper::createAttrList();
-        if((0 != rLRSpace.GetTxtLeft()) || ((0 == rLRSpace.GetTxtLeft()) && rLRSpace.IsExplicitZeroMarginValLeft()))
+        if((0 != rLRSpace.GetTextLeft()) || ((0 == rLRSpace.GetTextLeft()) && rLRSpace.IsExplicitZeroMarginValLeft()))
         {
-            pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_left : XML_start ) ), OString::number(  rLRSpace.GetTxtLeft() ) );
+            pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_left : XML_start ) ), OString::number(  rLRSpace.GetTextLeft() ) );
         }
         if((0 != rLRSpace.GetRight()) || ((0 == rLRSpace.GetRight()) && rLRSpace.IsExplicitZeroMarginValRight()))
         {
             pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_right : XML_end ) ), OString::number(  rLRSpace.GetRight() ) );
         }
-        sal_Int32 nFirstLineAdjustment = rLRSpace.GetTxtFirstLineOfst();
+        sal_Int32 nFirstLineAdjustment = rLRSpace.GetTextFirstLineOfst();
         if (nFirstLineAdjustment > 0)
             pLRSpaceAttrList->add( FSNS( XML_w, XML_firstLine ), OString::number( nFirstLineAdjustment ) );
         else
@@ -7312,7 +7312,7 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
     }
 }
 
-void DocxAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
+void DocxAttributeOutput::FormatSurround( const SwFormatSurround& rSurround )
 {
     if (m_rExport.SdrExporter().getTextFrameSyntax())
     {
@@ -7377,7 +7377,7 @@ void DocxAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
     }
 }
 
-void DocxAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert )
+void DocxAttributeOutput::FormatVertOrientation( const SwFormatVertOrient& rFlyVert )
 {
     OString sAlign;
     switch( rFlyVert.GetVertOrient() )
@@ -7444,7 +7444,7 @@ void DocxAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert
     }
 }
 
-void DocxAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori )
+void DocxAttributeOutput::FormatHorizOrientation( const SwFormatHoriOrient& rFlyHori )
 {
     OString sAlign;
     switch( rFlyHori.GetHoriOrient() )
@@ -7504,7 +7504,7 @@ void DocxAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHor
     }
 }
 
-void DocxAttributeOutput::FormatAnchor( const SwFmtAnchor& )
+void DocxAttributeOutput::FormatAnchor( const SwFormatAnchor& )
 {
     // Fly frames: anchors here aren't matching the anchors in docx
 }
@@ -7653,8 +7653,8 @@ void DocxAttributeOutput::FormatFillGradient( const XFillGradientItem& rFillGrad
     }
     else if (m_oFillStyle && *m_oFillStyle == drawing::FillStyle_GRADIENT && m_rExport.SdrExporter().getDMLTextFrameSyntax())
     {
-        SwFrmFmt & rFormat(
-                const_cast<SwFrmFmt&>(m_rExport.m_pParentFrame->GetFrmFmt()));
+        SwFrameFormat & rFormat(
+                const_cast<SwFrameFormat&>(m_rExport.m_pParentFrame->GetFrameFormat()));
         uno::Reference<beans::XPropertySet> const xPropertySet(
             SwXTextFrame::CreateXTextFrame(*rFormat.GetDoc(), &rFormat),
             uno::UNO_QUERY);
@@ -7676,7 +7676,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
             FormatFillStyle(*pFillStyle);
             if (m_oFillStyle && *m_oFillStyle == drawing::FillStyle_BITMAP)
             {
-                const SdrObject* pSdrObj = m_rExport.m_pParentFrame->GetFrmFmt().FindRealSdrObject();
+                const SdrObject* pSdrObj = m_rExport.m_pParentFrame->GetFrameFormat().FindRealSdrObject();
                 if (pSdrObj)
                 {
                     uno::Reference< drawing::XShape > xShape( const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY );
@@ -7806,7 +7806,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
     }
 }
 
-void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& rCol, bool bEven, SwTwips nPageSize )
+void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol& rCol, bool bEven, SwTwips nPageSize )
 {
     // Get the columns attributes
     FastAttributeList *pColsAttrList = FastSerializerHelper::createAttrList();
@@ -7858,7 +7858,7 @@ void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol&
     m_pSerializer->endElementNS( XML_w, XML_cols );
 }
 
-void DocxAttributeOutput::FormatKeep( const SvxFmtKeepItem& )
+void DocxAttributeOutput::FormatKeep( const SvxFormatKeepItem& )
 {
     m_pSerializer->singleElementNS( XML_w, XML_keepNext, FSEND );
 }
@@ -7896,7 +7896,7 @@ void DocxAttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
     m_pSerializer->singleElementNS( XML_w, XML_docGrid, pGridAttrList );
 }
 
-void DocxAttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering )
+void DocxAttributeOutput::FormatLineNumbering( const SwFormatLineNumber& rNumbering )
 {
     if ( !rNumbering.IsCount( ) )
         m_pSerializer->singleElementNS( XML_w, XML_suppressLineNumbers, FSEND );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 8763530a6aff..b7ce59d29db5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -155,7 +155,7 @@ public:
     virtual void EmptyParagraph() SAL_OVERRIDE;
 
     /// Called in order to output section breaks.
-    virtual void SectionBreaks(const SwTxtNode& rNode) SAL_OVERRIDE;
+    virtual void SectionBreaks(const SwTextNode& rNode) SAL_OVERRIDE;
 
     /// Called before we start outputting the attributes.
     virtual void StartParagraphProperties() SAL_OVERRIDE;
@@ -188,7 +188,7 @@ public:
     virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
 
     /// Output ruby start.
-    virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ) SAL_OVERRIDE;
+    virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) SAL_OVERRIDE;
 
     /// Output ruby end.
     virtual void EndRuby() SAL_OVERRIDE;
@@ -199,7 +199,7 @@ public:
     /// Output URL end.
     virtual bool EndURL(bool) SAL_OVERRIDE;
 
-    virtual void FieldVanish( const OUString& rTxt, ww::eField eType ) SAL_OVERRIDE;
+    virtual void FieldVanish( const OUString& rText, ww::eField eType ) SAL_OVERRIDE;
 
     /// Output redlining.
     ///
@@ -222,7 +222,7 @@ public:
     virtual bool IsFlyProcessingPostponed() SAL_OVERRIDE;
     virtual void ResetFlyProcessingFlag() SAL_OVERRIDE;
 
-    virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
+    virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
 
     /// Output style.
     virtual void ParagraphStyle( sal_uInt16 nStyle ) SAL_OVERRIDE;
@@ -282,7 +282,7 @@ public:
     virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE;
 
     /// Numbering rule and Id.
-    virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ) SAL_OVERRIDE;
+    virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat &rNFormat, const SwFormat &rFormat ) SAL_OVERRIDE;
 
     /// Page break
     /// As a paragraph property - the paragraph should be on the next page.
@@ -308,7 +308,7 @@ public:
     virtual void SectionTitlePage() SAL_OVERRIDE;
 
     /// Description of the page borders.
-    virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) SAL_OVERRIDE;
+    virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) SAL_OVERRIDE;
 
     /// Columns populated from right/numbers on the right side?
     virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE;
@@ -365,7 +365,7 @@ public:
         const OUString &rNumberingString,
         const SvxBrushItem* pBrush = 0 ) SAL_OVERRIDE;
 
-    void WriteField_Impl( const SwField* pFld, ww::eField eType, const OUString& rFldCmd, sal_uInt8 nMode );
+    void WriteField_Impl( const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode );
     void WriteFormData_Impl( const ::sw::mark::IFieldmark& rFieldmark );
 
     void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds );
@@ -407,13 +407,13 @@ private:
     /// replacement graphics, set the first as 0, and pass the remaining three.
     ///
     /// @see WriteOLE2Obj()
-    void FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt = 0, SwOLENode* pOLENode = 0, const SdrObject* pSdrObj = 0);
+    void FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat = 0, SwOLENode* pOLENode = 0, const SdrObject* pSdrObj = 0);
     void WriteSrcRect( const SdrObject* pSdrObj );
-    void WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrmFmt* pFlyFrmFmt);
+    void WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat);
     bool WriteOLEChart( const SdrObject* pSdrObj, const Size& rSize );
     bool WriteOLEMath( const SdrObject* pSdrObj, const SwOLENode& rNode, const Size& rSize );
-    bool PostponeOLE( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrmFmt* pFlyFrmFmt );
-    void WriteOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrmFmt* rFlyFrmFmt );
+    bool PostponeOLE( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat );
+    void WriteOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* rFlyFrameFormat );
 
     /// checks whether the current component is a diagram
     static bool IsDiagram (const SdrObject* sdrObject);
@@ -427,8 +427,8 @@ private:
     void EndTableRow( );
     void EndTable();
     void SyncNodelessCells(ww8::WW8TableNodeInfoInner::Pointer_t pInner, sal_Int32 nCell, sal_uInt32 nRow);
-    void PopulateFrameProperties(const SwFrmFmt* pFrmFmt, const Size& rSize);
-    static bool TextBoxIsFramePr(const SwFrmFmt& rFrmFmt);
+    void PopulateFrameProperties(const SwFrameFormat* pFrameFormat, const Size& rSize);
+    static bool TextBoxIsFramePr(const SwFrameFormat& rFrameFormat);
     /// End cell, row, and even the entire table if necessary.
     void FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph = false );
 
@@ -449,7 +449,7 @@ private:
 protected:
 
     /// Output frames - the implementation.
-    virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) SAL_OVERRIDE;
+    virtual void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) SAL_OVERRIDE;
 
     /// Sfx item Sfx item RES_CHRATR_CASEMAP
     virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ) SAL_OVERRIDE;
@@ -560,13 +560,13 @@ protected:
     virtual void CharHighlight( const SvxBrushItem& rHighlight ) SAL_OVERRIDE;
 
     /// Sfx item RES_TXTATR_INETFMT
-    virtual void TextINetFormat( const SwFmtINetFmt& ) SAL_OVERRIDE;
+    virtual void TextINetFormat( const SwFormatINetFormat& ) SAL_OVERRIDE;
 
     /// Sfx item RES_TXTATR_CHARFMT
-    virtual void TextCharFormat( const SwFmtCharFmt& ) SAL_OVERRIDE;
+    virtual void TextCharFormat( const SwFormatCharFormat& ) SAL_OVERRIDE;
 
     /// Sfx item RES_TXTATR_FTN
-    virtual void TextFootnote_Impl( const SwFmtFtn& ) SAL_OVERRIDE;
+    virtual void TextFootnote_Impl( const SwFormatFootnote& ) SAL_OVERRIDE;
 
     /// Output the footnote/endnote reference (if there's one to output).
     void FootnoteEndnoteReference();
@@ -578,7 +578,7 @@ protected:
     virtual void ParaAdjust( const SvxAdjustItem& rAdjust ) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_SPLIT
-    virtual void ParaSplit( const SvxFmtSplitItem& rSplit ) SAL_OVERRIDE;
+    virtual void ParaSplit( const SvxFormatSplitItem& rSplit ) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_WIDOWS
     virtual void ParaWidows( const SvxWidowsItem& rWidows ) SAL_OVERRIDE;
@@ -590,7 +590,7 @@ protected:
     virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_NUMRULE
-    virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
+    virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_SCRIPTSPACE
     virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE;
@@ -608,7 +608,7 @@ protected:
     virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_FRM_SIZE
-    virtual void FormatFrameSize( const SwFmtFrmSize& ) SAL_OVERRIDE;
+    virtual void FormatFrameSize( const SwFormatFrmSize& ) SAL_OVERRIDE;
 
     /// Sfx item RES_PAPER_BIN
     virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE;
@@ -620,16 +620,16 @@ protected:
     virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ) SAL_OVERRIDE;
 
     /// Sfx item RES_SURROUND
-    virtual void FormatSurround( const SwFmtSurround& ) SAL_OVERRIDE;
+    virtual void FormatSurround( const SwFormatSurround& ) SAL_OVERRIDE;
 
     /// Sfx item RES_VERT_ORIENT
-    virtual void FormatVertOrientation( const SwFmtVertOrient& ) SAL_OVERRIDE;
+    virtual void FormatVertOrientation( const SwFormatVertOrient& ) SAL_OVERRIDE;
 
     /// Sfx item RES_HORI_ORIENT
-    virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) SAL_OVERRIDE;
+    virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) SAL_OVERRIDE;
 
     /// Sfx item RES_ANCHOR
-    virtual void FormatAnchor( const SwFmtAnchor& ) SAL_OVERRIDE;
+    virtual void FormatAnchor( const SwFormatAnchor& ) SAL_OVERRIDE;
 
     /// Sfx item RES_BACKGROUND
     virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE;
@@ -644,16 +644,16 @@ protected:
     virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_COL
-    virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
+    virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
 
     /// Sfx item RES_KEEP
-    virtual void FormatKeep( const SvxFmtKeepItem& ) SAL_OVERRIDE;
+    virtual void FormatKeep( const SvxFormatKeepItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_TEXTGRID
     virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_LINENUMBER
-    virtual void FormatLineNumbering( const SwFmtLineNumber& ) SAL_OVERRIDE;
+    virtual void FormatLineNumbering( const SwFormatLineNumber& ) SAL_OVERRIDE;
 
     /// Sfx item RES_FRAMEDIR
     virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE;
@@ -668,14 +668,14 @@ protected:
     virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE;
 
     /// Write the expanded field
-    virtual void WriteExpand( const SwField* pFld ) SAL_OVERRIDE;
+    virtual void WriteExpand( const SwField* pField ) SAL_OVERRIDE;
 
-    virtual void RefField( const SwField& rFld, const OUString& rRef ) SAL_OVERRIDE;
-    virtual void HiddenField( const SwField& rFld ) SAL_OVERRIDE;
-    virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
-    virtual void PostitField( const SwField* pFld ) SAL_OVERRIDE;
-    virtual bool DropdownField( const SwField* pFld ) SAL_OVERRIDE;
-    virtual bool PlaceholderField( const SwField* pFld ) SAL_OVERRIDE;
+    virtual void RefField( const SwField& rField, const OUString& rRef ) SAL_OVERRIDE;
+    virtual void HiddenField( const SwField& rField ) SAL_OVERRIDE;
+    virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
+    virtual void PostitField( const SwField* pField ) SAL_OVERRIDE;
+    virtual bool DropdownField( const SwField* pField ) SAL_OVERRIDE;
+    virtual bool PlaceholderField( const SwField* pField ) SAL_OVERRIDE;
 
     virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE;
 
@@ -822,29 +822,29 @@ private:
 
     struct PostponedGraphic
     {
-        PostponedGraphic( const SwGrfNode* n, Size s, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode, const SdrObject* sObj )
-            : grfNode( n ), size( s ), mOLEFrmFmt( pOLEFrmFmt ), mOLENode( pOLENode ), pSdrObj(sObj) {};
+        PostponedGraphic( const SwGrfNode* n, Size s, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* sObj )
+            : grfNode( n ), size( s ), mOLEFrameFormat( pOLEFrameFormat ), mOLENode( pOLENode ), pSdrObj(sObj) {};
 
         const SwGrfNode* grfNode;
         Size size;
-        const SwFlyFrmFmt* mOLEFrmFmt;
+        const SwFlyFrameFormat* mOLEFrameFormat;
         SwOLENode* mOLENode;
         const SdrObject* pSdrObj;
     };
     std::unique_ptr< std::list<PostponedGraphic> > m_pPostponedGraphic;
     struct PostponedDiagram
     {
-        PostponedDiagram( const SdrObject* o, const SwFrmFmt* frm ) : object( o ), frame( frm ) {};
+        PostponedDiagram( const SdrObject* o, const SwFrameFormat* frm ) : object( o ), frame( frm ) {};
         const SdrObject* object;
-        const SwFrmFmt* frame;
+        const SwFrameFormat* frame;
     };
     std::unique_ptr< std::list<PostponedDiagram> > m_pPostponedDiagrams;
 
     struct PostponedDrawing
     {
-        PostponedDrawing( const SdrObject* sdrObj, const SwFrmFmt* frm, const Point* pt ) : object( sdrObj ), frame( frm ), point( pt ) {};
+        PostponedDrawing( const SdrObject* sdrObj, const SwFrameFormat* frm, const Point* pt ) : object( sdrObj ), frame( frm ), point( pt ) {};
         const SdrObject* object;
-        const SwFrmFmt* frame;
+        const SwFrameFormat* frame;
         const Point* point;
     };
     std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedVMLDrawings;
@@ -853,10 +853,10 @@ private:
 
     struct PostponedOLE
     {
-        PostponedOLE( SwOLENode* rObject, const Size& rSize, const SwFlyFrmFmt* rFrame ) : object( rObject ), size( rSize ), frame( rFrame ) {};
+        PostponedOLE( SwOLENode* rObject, const Size& rSize, const SwFlyFrameFormat* rFrame ) : object( rObject ), size( rSize ), frame( rFrame ) {};
         SwOLENode* object;
         const Size size;
-        const SwFlyFrmFmt* frame;
+        const SwFlyFrameFormat* frame;
     };
     std::unique_ptr< std::list<PostponedOLE> > m_pPostponedOLEs;
 
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 320eddd68214..855be5730b10 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -133,7 +133,7 @@ bool DocxExport::CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich
     return true;
 }
 
-void DocxExport::AppendBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen )
+void DocxExport::AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen )
 {
     std::vector< OUString > aStarts;
     std::vector< OUString > aEnds;
@@ -171,7 +171,7 @@ void DocxExport::AppendBookmark( const OUString& rName, bool /*bSkip*/ )
     m_pAttrOutput->WriteBookmarks_Impl( aStarts, aEnds );
 }
 
-void DocxExport::AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen )
+void DocxExport::AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen )
 {
     std::vector< OUString > aStarts;
     std::vector< OUString > aEnds;
@@ -198,7 +198,7 @@ void DocxExport::AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPo
     m_pAttrOutput->WriteAnnotationMarks_Impl( aStarts, aEnds );
 }
 
-void DocxExport::ExportGrfBullet(const SwTxtNode&)
+void DocxExport::ExportGrfBullet(const SwTextNode&)
 {
     // Just collect the bullets for now, numbering.xml is not yet started.
     CollectGrfsOfBullets();
@@ -212,15 +212,15 @@ OString DocxExport::AddRelation( const OUString& rType, const OUString& rTarget
     return sId.toUtf8();
 }
 
-bool DocxExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt )
+bool DocxExport::DisallowInheritingOutlineNumbering( const SwFormat& rFormat )
 {
     bool bRet( false );
 
-    if (SfxItemState::SET != rFmt.GetItemState(RES_PARATR_NUMRULE, false))
+    if (SfxItemState::SET != rFormat.GetItemState(RES_PARATR_NUMRULE, false))
     {
-        if (const SwFmt *pParent = rFmt.DerivedFrom())
+        if (const SwFormat *pParent = rFormat.DerivedFrom())
         {
-            if (static_cast<const SwTxtFmtColl*>(pParent)->IsAssignedToListLevelOfOutlineStyle())
+            if (static_cast<const SwTextFormatColl*>(pParent)->IsAssignedToListLevelOfOutlineStyle())
             {
                 ::sax_fastparser::FSHelperPtr pSerializer = m_pAttrOutput->GetSerializer( );
                 // Level 9 disables the outline
@@ -237,7 +237,7 @@ bool DocxExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt )
 }
 
 void DocxExport::WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
-        const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 /*nBreakCode*/ )
+        const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 /*nBreakCode*/ )
 {
     m_nHeadersFootersInSection = 1;
     // Turn ON flag for 'Writing Headers \ Footers'
@@ -245,23 +245,23 @@ void DocxExport::WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
 
     // headers
     if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_EVEN )
-        WriteHeaderFooter( rLeftFmt, true, "even" );
+        WriteHeaderFooter( rLeftFormat, true, "even" );
 
     if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_ODD )
-        WriteHeaderFooter( rFmt, true, "default" );
+        WriteHeaderFooter( rFormat, true, "default" );
 
     if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_FIRST )
-        WriteHeaderFooter( rFirstPageFmt, true, "first" );
+        WriteHeaderFooter( rFirstPageFormat, true, "first" );
 
     // footers
     if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_EVEN )
-        WriteHeaderFooter( rLeftFmt, false, "even" );
+        WriteHeaderFooter( rLeftFormat, false, "even" );
 
     if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_ODD )
-        WriteHeaderFooter( rFmt, false, "default" );
+        WriteHeaderFooter( rFormat, false, "default" );
 
     if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_FIRST )
-        WriteHeaderFooter( rFirstPageFmt, false, "first" );
+        WriteHeaderFooter( rFirstPageFormat, false, "first" );
 
     if ( nHeadFootFlags & ( nsHdFtFlags::WW8_FOOTER_EVEN | nsHdFtFlags::WW8_HEADER_EVEN ))
         m_aSettings.evenAndOddHeaders = true;
@@ -273,9 +273,9 @@ void DocxExport::WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
 #endif
 }
 
-void DocxExport::OutputField( const SwField* pFld, ww::eField eFldType, const OUString& rFldCmd, sal_uInt8 nMode )
+void DocxExport::OutputField( const SwField* pField, ww::eField eFieldType, const OUString& rFieldCmd, sal_uInt8 nMode )
 {
-    m_pAttrOutput->WriteField_Impl( pFld, eFldType, rFldCmd, nMode );
+    m_pAttrOutput->WriteField_Impl( pField, eFieldType, rFieldCmd, nMode );
 }
 
 void DocxExport::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
@@ -345,7 +345,7 @@ void DocxExport::DoComboBox(const OUString& rName,
     m_pDocumentFS->endElementNS( XML_w, XML_ffData );
 }
 
-void DocxExport::DoFormText(const SwInputField* /*pFld*/)
+void DocxExport::DoFormText(const SwInputField* /*pField*/)
 {
     OSL_TRACE( "TODO DocxExport::ForFormText()" );
 }
@@ -457,17 +457,17 @@ void DocxExport::ExportDocument_Impl()
     delete m_pSections, m_pSections = NULL;
 }
 
-void DocxExport::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum )
+void DocxExport::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum )
 {
     AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo() );
-    m_pSections->AppendSection( pPageDesc, pFmt, nLnNum, m_pAttrOutput->IsFirstParagraph() );
+    m_pSections->AppendSection( pPageDesc, pFormat, nLnNum, m_pAttrOutput->IsFirstParagraph() );
 }
 
 void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
 {
     MSWordExportBase::OutputEndNode( rEndNode );
 
-    if ( TXT_MAINTEXT == m_nTxtTyp && rEndNode.StartOfSectionNode()->IsSectionNode() )
+    if ( TXT_MAINTEXT == m_nTextTyp && rEndNode.StartOfSectionNode()->IsSectionNode() )
     {
         // this originally comes from WW8Export::WriteText(), and looks like it
         // could have some code common with SectionNode()...
@@ -484,18 +484,18 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
         bool isInTable = IsInTable();
         if ( !rNd.IsSectionNode() && isInTable ) // No sections in table
         {
-            const SwSectionFmt* pParentFmt = rSect.GetFmt()->GetParent();
-            if( !pParentFmt )
-                pParentFmt = reinterpret_cast<SwSectionFmt*>(sal_IntPtr(-1));
+            const SwSectionFormat* pParentFormat = rSect.GetFormat()->GetParent();
+            if( !pParentFormat )
+                pParentFormat = reinterpret_cast<SwSectionFormat*>(sal_IntPtr(-1));
 
             sal_uLong nRstLnNum;
-            if( rNd.IsCntntNode() )
-                nRstLnNum = rNd.GetCntntNode()->GetSwAttrSet().GetLineNumber().GetStartValue();
+            if( rNd.IsContentNode() )
+                nRstLnNum = rNd.GetContentNode()->GetSwAttrSet().GetLineNumber().GetStartValue();
             else
                 nRstLnNum = 0;
 
             AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo( ) );
-            m_pSections->AppendSection( m_pAktPageDesc, pParentFmt, nRstLnNum );
+            m_pSections->AppendSection( m_pAktPageDesc, pParentFormat, nRstLnNum );
         }
     }
 }
@@ -523,25 +523,25 @@ sal_uLong DocxExport::ReplaceCr( sal_uInt8 )
 }
 
 void DocxExport::PrepareNewPageDesc( const SfxItemSet* pSet,
-        const SwNode& rNd, const SwFmtPageDesc* pNewPgDescFmt,
+        const SwNode& rNd, const SwFormatPageDesc* pNewPgDescFormat,
         const SwPageDesc* pNewPgDesc )
 {
     // tell the attribute output that we are ready to write the section
     // break [has to be output inside paragraph properties]
     AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo() );
 
-    const SwSectionFmt* pFmt = GetSectionFormat( rNd );
+    const SwSectionFormat* pFormat = GetSectionFormat( rNd );
     const sal_uLong nLnNm = GetSectionLineNo( pSet, rNd );
 
-    OSL_ENSURE( pNewPgDescFmt || pNewPgDesc, "Neither page desc format nor page desc provided." );
+    OSL_ENSURE( pNewPgDescFormat || pNewPgDesc, "Neither page desc format nor page desc provided." );
 
-    if ( pNewPgDescFmt )
+    if ( pNewPgDescFormat )
     {
-        m_pSections->AppendSection( *pNewPgDescFmt, rNd, pFmt, nLnNm );
+        m_pSections->AppendSection( *pNewPgDescFormat, rNd, pFormat, nLnNm );
     }
     else if ( pNewPgDesc )
     {
-        m_pSections->AppendSection( pNewPgDesc, rNd, pFmt, nLnNm );
+        m_pSections->AppendSection( pNewPgDesc, rNd, pFormat, nLnNm );
     }
 
 }
@@ -636,7 +636,7 @@ void DocxExport::WritePostitFields()
 
 void DocxExport::WriteNumbering()
 {
-    if ( !m_pUsedNumTbl )
+    if ( !m_pUsedNumTable )
         return; // no numbering is used
 
     m_pFilter->addRelation( m_pDocumentFS->getOutputStream(),
@@ -668,7 +668,7 @@ void DocxExport::WriteNumbering()
     m_pAttrOutput->SetSerializer( m_pDocumentFS );
 }
 
-void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* pType )
+void DocxExport::WriteHeaderFooter( const SwFormat& rFormat, bool bHeader, const char* pType )
 {
     // setup the xml stream
     OUString aRelId;
@@ -711,7 +711,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char*
     DocxTableExportContext aTableExportContext;
     m_pAttrOutput->pushToTableExportContext(aTableExportContext);
     // do the work
-    WriteHeaderFooterText( rFmt, bHeader );
+    WriteHeaderFooterText( rFormat, bHeader );
     m_pAttrOutput->popFromTableExportContext(aTableExportContext);
     m_pAttrOutput->EndParaSdtBlock();
 
@@ -843,7 +843,7 @@ void DocxExport::WriteSettings()
 
     // Automatic hyphenation: it's a global setting in Word, it's a paragraph setting in Writer.
     // Use the setting from the default style.
-    SwTxtFmtColl* pColl = m_pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, /*bRegardLanguage=*/false);
+    SwTextFormatColl* pColl = m_pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD, /*bRegardLanguage=*/false);
     const SfxPoolItem* pItem;
     if (pColl && SfxItemState::SET == pColl->GetItemState(RES_PARATR_HYPHENZONE, false, &pItem))
     {
@@ -858,7 +858,7 @@ void DocxExport::WriteSettings()
 
     // Has Footnotes
     if( m_pAttrOutput->HasFootnotes())
-        DocxAttributeOutput::WriteFootnoteEndnotePr( pFS, XML_footnotePr, m_pDoc->GetFtnInfo(), XML_footnote );
+        DocxAttributeOutput::WriteFootnoteEndnotePr( pFS, XML_footnotePr, m_pDoc->GetFootnoteInfo(), XML_footnote );
 
     // Has Endnotes
     if( m_pAttrOutput->HasEndnotes())
@@ -1296,9 +1296,9 @@ bool DocxExport::isMirroredMargin()
 boost::optional<SvxBrushItem> DocxExport::getBackground()
 {
     boost::optional<SvxBrushItem> oRet;
-    const SwFrmFmt &rFmt = m_pDoc->GetPageDesc(0).GetMaster();
+    const SwFrameFormat &rFormat = m_pDoc->GetPageDesc(0).GetMaster();
     SvxBrushItem aBrush(RES_BACKGROUND);
-    SfxItemState eState = rFmt.GetBackgroundState(aBrush);
+    SfxItemState eState = rFormat.GetBackgroundState(aBrush);
 
     if (SfxItemState::SET == eState)
     {
@@ -1390,8 +1390,8 @@ void DocxExport::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTy
             const sal_Int32 nNextAttr = std::min(aAttrIter.WhereNext(), nEnd);
             rtl_TextEncoding eNextChrSet = aAttrIter.GetNextCharSet();
 
-            bool bTxtAtr = aAttrIter.IsTxtAttr( nAktPos );
-            if( !bTxtAtr )
+            bool bTextAtr = aAttrIter.IsTextAttr( nAktPos );
+            if( !bTextAtr )
             {
                 if( nAktPos == 0 && nNextAttr - nAktPos == aStr.getLength())
                     AttrOutput().RunText( aStr, eChrSet );
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index f3fe41399841..ef8ba4c5d153 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -36,7 +36,7 @@ class DocxExportFilter;
 class SwNode;
 class SwEndNode;
 class SwTableNode;
-class SwTxtNode;
+class SwTextNode;
 class SwGrfNode;
 class SwOLENode;
 class DocxSdrExport;
@@ -132,13 +132,13 @@ public:
     /// Guess the script (asian/western).
     virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE;
 
-    virtual void AppendBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
+    virtual void AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
 
     virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE;
 
-    virtual void AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
+    virtual void AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
 
-    virtual void ExportGrfBullet(const SwTxtNode&) SAL_OVERRIDE;
+    virtual void ExportGrfBullet(const SwTextNode&) SAL_OVERRIDE;
 
     /// Returns the relationd id
     OString AddRelation( const OUString& rType, const OUString& rTarget );
@@ -147,15 +147,15 @@ public:
     virtual void WriteChar( sal_Unicode ) SAL_OVERRIDE { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); }
 
     /// Return value indicates if an inherited outline numbering is suppressed.
-    virtual bool DisallowInheritingOutlineNumbering( const SwFmt &rFmt ) SAL_OVERRIDE;
+    virtual bool DisallowInheritingOutlineNumbering( const SwFormat &rFormat ) SAL_OVERRIDE;
 
     /// Output the actual headers and footers.
     virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
-            const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode ) SAL_OVERRIDE;
+            const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode ) SAL_OVERRIDE;
 
     /// Write the field
-    virtual void OutputField( const SwField* pFld, ww::eField eFldType,
-            const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE;
+    virtual void OutputField( const SwField* pField, ww::eField eFieldType,
+            const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE;
 
     /// Write the data of the form field
     virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
@@ -167,7 +167,7 @@ public:
                     const OUString &rSelected,
                     com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE;
 
-    virtual void DoFormText(const SwInputField * pFld) SAL_OVERRIDE;
+    virtual void DoFormText(const SwInputField * pField) SAL_OVERRIDE;
 
     virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_OVERRIDE;
 
@@ -196,14 +196,14 @@ protected:
 
     virtual void OutputLinkedOLE( const OUString& ) SAL_OVERRIDE;
 
-    virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) SAL_OVERRIDE;
+    virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) SAL_OVERRIDE;
 
-    virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) SAL_OVERRIDE {}
+    virtual void SectionBreaksAndFrames( const SwTextNode& /*rNode*/ ) SAL_OVERRIDE {}
 
     /// Get ready for a new section.
     virtual void PrepareNewPageDesc( const SfxItemSet* pSet,
                                      const SwNode& rNd,
-                                     const SwFmtPageDesc* pNewPgDescFmt = 0,
+                                     const SwFormatPageDesc* pNewPgDescFormat = 0,
                                      const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE;
 
 private:
@@ -220,7 +220,7 @@ private:
     virtual void WriteNumbering() SAL_OVERRIDE;
 
     /// Write reference to a header/foorter + the actual xml containing the text.
-    void WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* pType );
+    void WriteHeaderFooter( const SwFormat& rFormat, bool bHeader, const char* pType );
 
     /// Write word/fontTable.xml.
     void WriteFonts();
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index ae28005df6b2..6f46915793a6 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -43,11 +43,11 @@ bool DocxExportFilter::exportDocument()
 
     // get SwDoc*
     uno::Reference< uno::XInterface > xIfc( getModel(), uno::UNO_QUERY );
-    SwXTextDocument *pTxtDoc = dynamic_cast< SwXTextDocument * >( xIfc.get() );
-    if ( !pTxtDoc )
+    SwXTextDocument *pTextDoc = dynamic_cast< SwXTextDocument * >( xIfc.get() );
+    if ( !pTextDoc )
         return false;
 
-    SwDoc *pDoc = pTxtDoc->GetDocShell()->GetDoc();
+    SwDoc *pDoc = pTextDoc->GetDocShell()->GetDoc();
     if ( !pDoc )
         return false;
 
diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx
index 157f95a38d2a..79697383c0d4 100644
--- a/sw/source/filter/ww8/docxfootnotes.hxx
+++ b/sw/source/filter/ww8/docxfootnotes.hxx
@@ -22,11 +22,11 @@
 
 #include <vector>
 
-class SwFmtFtn;
+class SwFormatFootnote;
 
 namespace docx {
 
-typedef ::std::vector< const SwFmtFtn* > FootnotesVector;
+typedef ::std::vector< const SwFormatFootnote* > FootnotesVector;
 
 /** Remember footnotes/endnotes so that we can dump them in one go.
 
@@ -43,14 +43,14 @@ class FootnotesList {
 public:
     FootnotesList() : m_nCurrent( -1 ) {}
 
-    void add( const SwFmtFtn& rFootnote )
+    void add( const SwFormatFootnote& rFootnote )
     {
         m_aFootnotes.push_back( &rFootnote );
         m_nCurrent = m_aFootnotes.size() - 1;
     }
 
     /// Return the current footnote/endnote and clear the 'current' state.
-    const SwFmtFtn* getCurrent( sal_Int32& rId )
+    const SwFormatFootnote* getCurrent( sal_Int32& rId )
     {
         // anything to write at all?
         if ( m_nCurrent < 0 )
@@ -63,7 +63,7 @@ public:
         // continuationSeparator
         rId = m_nCurrent + 2;
 
-        const SwFmtFtn *pFootnote = m_aFootnotes[m_nCurrent];
+        const SwFormatFootnote *pFootnote = m_aFootnotes[m_nCurrent];
         m_nCurrent = -1;
 
         return pFootnote;
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index f7f88831fa66..13c7bd0ab1e4 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -148,7 +148,7 @@ struct DocxSdrExport::Impl
     sal_Int32 m_nSeq ;
     bool m_bDMLAndVMLDrawingOpen;
     /// List of TextBoxes in this document: they are exported as part of their shape, never alone.
-    std::set<const SwFrmFmt*> m_aTextBoxes;
+    std::set<const SwFrameFormat*> m_aTextBoxes;
     /// Preserved rotation for TextFrames.
     sal_Int32 m_nDMLandVMLTextFrameRotation;
 
@@ -181,7 +181,7 @@ struct DocxSdrExport::Impl
 
     /// Writes wp wrapper code around an SdrObject, which itself is written using drawingML syntax.
 
-    void textFrameShadow(const SwFrmFmt& rFrmFmt);
+    void textFrameShadow(const SwFrameFormat& rFrameFormat);
     static bool isSupportedDMLShape(uno::Reference<drawing::XShape> xShape);
     /// Undo the text direction mangling done by the frame btLr handler in writerfilter::dmapper::DomainMapper::lcl_startCharacterGroup()
     bool checkFrameBtlr(SwNode* pStartNode, bool bDML);
@@ -286,14 +286,14 @@ void DocxSdrExport::setFlyWrapAttrList(sax_fastparser::FastAttributeList* pAttrL
     m_pImpl->m_pFlyWrapAttrList = pAttrList;
 }
 
-void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rSize)
+void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, const Size& rSize)
 {
     m_pImpl->m_bDrawingOpen = true;
     m_pImpl->m_bParagraphHasDrawing = true;
     m_pImpl->m_pSerializer->startElementNS(XML_w, XML_drawing, FSEND);
 
-    const SvxLRSpaceItem pLRSpaceItem = pFrmFmt->GetLRSpace(false);
-    const SvxULSpaceItem pULSpaceItem = pFrmFmt->GetULSpace(false);
+    const SvxLRSpaceItem pLRSpaceItem = pFrameFormat->GetLRSpace(false);
+    const SvxULSpaceItem pULSpaceItem = pFrameFormat->GetULSpace(false);
 
     bool isAnchor;
 
@@ -303,11 +303,11 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
     }
     else
     {
-        isAnchor = pFrmFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR;
+        isAnchor = pFrameFormat->GetAnchor().GetAnchorId() != FLY_AS_CHAR;
     }
 
     // Count effectExtent values, their value is needed before dist{T,B,L,R} is written.
-    SvxShadowItem aShadowItem = pFrmFmt->GetShadow();
+    SvxShadowItem aShadowItem = pFrameFormat->GetShadow();
     sal_Int32 nLeftExt = 0, nRightExt = 0, nTopExt = 0, nBottomExt = 0;
     if (aShadowItem.GetLocation() != SVX_SHADOW_NONE)
     {
@@ -331,7 +331,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
             break;
         }
     }
-    else if (const SdrObject* pObject = pFrmFmt->FindRealSdrObject())
+    else if (const SdrObject* pObject = pFrameFormat->FindRealSdrObject())
     {
         // No shadow, but we have an idea what was the original effectExtent.
         uno::Any aAny;
@@ -358,13 +358,13 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
     if (isAnchor)
     {
         sax_fastparser::FastAttributeList* attrList = sax_fastparser::FastSerializerHelper::createAttrList();
-        bool bOpaque = pFrmFmt->GetOpaque().GetValue();
-        awt::Point aPos(pFrmFmt->GetHoriOrient().GetPos(), pFrmFmt->GetVertOrient().GetPos());
-        const SdrObject* pObj = pFrmFmt->FindRealSdrObject();
+        bool bOpaque = pFrameFormat->GetOpaque().GetValue();
+        awt::Point aPos(pFrameFormat->GetHoriOrient().GetPos(), pFrameFormat->GetVertOrient().GetPos());
+        const SdrObject* pObj = pFrameFormat->FindRealSdrObject();
         if (pObj != NULL)
         {
             // SdrObjects know their layer, consider that instead of the frame format.
-            bOpaque = pObj->GetLayer() != pFrmFmt->GetDoc()->getIDocumentDrawModelAccess().GetHellId() && pObj->GetLayer() != pFrmFmt->GetDoc()->getIDocumentDrawModelAccess().GetInvisibleHellId();
+            bOpaque = pObj->GetLayer() != pFrameFormat->GetDoc()->getIDocumentDrawModelAccess().GetHellId() && pObj->GetLayer() != pFrameFormat->GetDoc()->getIDocumentDrawModelAccess().GetInvisibleHellId();
 
             lclMovePositionWithRotation(aPos, rSize, pObj->GetRotateAngle());
         }
@@ -396,7 +396,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
         const char* relativeFromV;
         const char* alignH = NULL;
         const char* alignV = NULL;
-        switch (pFrmFmt->GetVertOrient().GetRelationOrient())
+        switch (pFrameFormat->GetVertOrient().GetRelationOrient())
         {
         case text::RelOrientation::PAGE_PRINT_AREA:
             relativeFromV = "margin";
@@ -412,12 +412,12 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
             relativeFromV = "line";
             break;
         }
-        switch (pFrmFmt->GetVertOrient().GetVertOrient())
+        switch (pFrameFormat->GetVertOrient().GetVertOrient())
         {
         case text::VertOrientation::TOP:
         case text::VertOrientation::CHAR_TOP:
         case text::VertOrientation::LINE_TOP:
-            if (pFrmFmt->GetVertOrient().GetRelationOrient() == text::RelOrientation::TEXT_LINE)
+            if (pFrameFormat->GetVertOrient().GetRelationOrient() == text::RelOrientation::TEXT_LINE)
                 alignV = "bottom";
             else
                 alignV = "top";
@@ -425,7 +425,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
         case text::VertOrientation::BOTTOM:
         case text::VertOrientation::CHAR_BOTTOM:
         case text::VertOrientation::LINE_BOTTOM:
-            if (pFrmFmt->GetVertOrient().GetRelationOrient() == text::RelOrientation::TEXT_LINE)
+            if (pFrameFormat->GetVertOrient().GetRelationOrient() == text::RelOrientation::TEXT_LINE)
                 alignV = "top";
             else
                 alignV = "bottom";
@@ -438,7 +438,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
         default:
             break;
         }
-        switch (pFrmFmt->GetHoriOrient().GetRelationOrient())
+        switch (pFrameFormat->GetHoriOrient().GetRelationOrient())
         {
         case text::RelOrientation::PAGE_PRINT_AREA:
             relativeFromH = "margin";
@@ -458,7 +458,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
             relativeFromH = "column";
             break;
         }
-        switch (pFrmFmt->GetHoriOrient().GetHoriOrient())
+        switch (pFrameFormat->GetHoriOrient().GetHoriOrient())
         {
         case text::HoriOrientation::LEFT:
             alignH = "left";
@@ -551,7 +551,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
         aAttrList->add(XML_distB, OString::number(TwipsToEMU(pULSpaceItem.GetLower())).getStr());
         aAttrList->add(XML_distL, OString::number(TwipsToEMU(pLRSpaceItem.GetLeft())).getStr());
         aAttrList->add(XML_distR, OString::number(TwipsToEMU(pLRSpaceItem.GetRight())).getStr());
-        const SdrObject* pObj = pFrmFmt->FindRealSdrObject();
+        const SdrObject* pObj = pFrameFormat->FindRealSdrObject();
         if (pObj != NULL)
         {
             OUString sAnchorId = lclGetAnchorIdFromGrabBag(pObj);
@@ -632,7 +632,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
 
     // See if we know the exact wrap type from grab-bag.
     sal_Int32 nWrapToken = 0;
-    if (const SdrObject* pObject = pFrmFmt->FindRealSdrObject())
+    if (const SdrObject* pObject = pFrameFormat->FindRealSdrObject())
     {
         uno::Any aAny;
         pObject->GetGrabBagItem(aAny);
@@ -675,9 +675,9 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
     }
 
     // Or if we have a contour.
-    if (!nWrapToken && pFrmFmt->GetSurround().IsContour())
+    if (!nWrapToken && pFrameFormat->GetSurround().IsContour())
     {
-        if (const SwNoTxtNode* pNd = sw::util::GetNoTxtNodeFromSwFrmFmt(*pFrmFmt))
+        if (const SwNoTextNode* pNd = sw::util::GetNoTextNodeFromSwFrameFormat(*pFrameFormat))
         {
             const tools::PolyPolygon* pPolyPoly = pNd->HasContour();
             if (pPolyPoly && pPolyPoly->Count())
@@ -705,7 +705,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
     // No? Then just approximate based on what we have.
     if (isAnchor && !nWrapToken)
     {
-        switch (pFrmFmt->GetSurround().GetValue())
+        switch (pFrameFormat->GetSurround().GetValue())
         {
         case SURROUND_NONE:
             m_pImpl->m_pSerializer->singleElementNS(XML_wp, XML_wrapTopAndBottom, FSEND);
@@ -726,7 +726,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
     }
 }
 
-void DocxSdrExport::endDMLAnchorInline(const SwFrmFmt* pFrmFmt)
+void DocxSdrExport::endDMLAnchorInline(const SwFrameFormat* pFrameFormat)
 {
     bool isAnchor;
     if (m_pImpl->m_bFlyFrameGraphic)
@@ -735,7 +735,7 @@ void DocxSdrExport::endDMLAnchorInline(const SwFrmFmt* pFrmFmt)
     }
     else
     {
-        isAnchor = pFrmFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR;
+        isAnchor = pFrameFormat->GetAnchor().GetAnchorId() != FLY_AS_CHAR;
     }
     m_pImpl->m_pSerializer->endElementNS(XML_wp, isAnchor ? XML_anchor : XML_inline);
 
@@ -743,7 +743,7 @@ void DocxSdrExport::endDMLAnchorInline(const SwFrmFmt* pFrmFmt)
     m_pImpl->m_bDrawingOpen = false;
 }
 
-void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrmFmt& rFrmFmt,const Point& rNdTopLeft)
+void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft)
 {
     bool bSwapInPage = false;
     if (!(sdrObj)->GetPage())
@@ -762,8 +762,8 @@ void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrmFmt& rFr
     m_pImpl->m_pDrawingML->SetFS(m_pImpl->m_pSerializer);
     // See WinwordAnchoring::SetAnchoring(), these are not part of the SdrObject, have to be passed around manually.
 
-    SwFmtHoriOrient rHoriOri = (rFrmFmt).GetHoriOrient();
-    SwFmtVertOrient rVertOri = (rFrmFmt).GetVertOrient();
+    SwFormatHoriOrient rHoriOri = (rFrameFormat).GetHoriOrient();
+    SwFormatVertOrient rVertOri = (rFrameFormat).GetVertOrient();
     m_pImpl->m_rExport.VMLExporter().AddSdrObject(*(sdrObj),
             rHoriOri.GetHoriOrient(), rVertOri.GetVertOrient(),
             rHoriOri.GetRelationOrient(),
@@ -795,7 +795,7 @@ bool lcl_isLockedCanvas(uno::Reference<drawing::XShape> xShape)
     return bRet;
 }
 
-void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrmFmt* pFrmFmt, int nAnchorId)
+void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrameFormat* pFrameFormat, int nAnchorId)
 {
     uno::Reference<drawing::XShape> xShape(const_cast<SdrObject*>(pSdrObject)->getUnoShape(), uno::UNO_QUERY_THROW);
     if (!Impl::isSupportedDMLShape(xShape))
@@ -805,7 +805,7 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrmFmt*
 
     sax_fastparser::FSHelperPtr pFS = m_pImpl->m_pSerializer;
     Size aSize(pSdrObject->GetLogicRect().GetWidth(), pSdrObject->GetLogicRect().GetHeight());
-    startDMLAnchorInline(pFrmFmt, aSize);
+    startDMLAnchorInline(pFrameFormat, aSize);
 
     sax_fastparser::FastAttributeList* pDocPrAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
     pDocPrAttrList->add(XML_id, OString::number(nAnchorId).getStr());
@@ -866,12 +866,12 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrmFmt*
         pFS->endElementNS(XML_wp14, XML_sizeRelV);
     }
 
-    endDMLAnchorInline(pFrmFmt);
+    endDMLAnchorInline(pFrameFormat);
 }
 
-void DocxSdrExport::Impl::textFrameShadow(const SwFrmFmt& rFrmFmt)
+void DocxSdrExport::Impl::textFrameShadow(const SwFrameFormat& rFrameFormat)
 {
-    SvxShadowItem aShadowItem = rFrmFmt.GetShadow();
+    SvxShadowItem aShadowItem = rFrameFormat.GetShadow();
     if (aShadowItem.GetLocation() == SVX_SHADOW_NONE)
         return;
 
@@ -917,7 +917,7 @@ bool DocxSdrExport::Impl::isSupportedDMLShape(uno::Reference<drawing::XShape> xS
     return supported;
 }
 
-void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrmFmt& rFrmFmt,const Point& rNdTopLeft, int nAnchorId)
+void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft, int nAnchorId)
 {
     bool bDMLAndVMLDrawingOpen = m_pImpl->m_bDMLAndVMLDrawingOpen;
     m_pImpl->m_bDMLAndVMLDrawingOpen = true;
@@ -943,17 +943,17 @@ void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrmFm
         m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Choice,
                                                XML_Requires, (pObjGroup ? "wpg" : "wps"),
                                                FSEND);
-        writeDMLDrawing(sdrObj, &rFrmFmt, nAnchorId);
+        writeDMLDrawing(sdrObj, &rFrameFormat, nAnchorId);
         m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Choice);
 
         m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Fallback, FSEND);
-        writeVMLDrawing(sdrObj, rFrmFmt, rNdTopLeft);
+        writeVMLDrawing(sdrObj, rFrameFormat, rNdTopLeft);
         m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Fallback);
 
         m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_AlternateContent);
     }
     else
-        writeVMLDrawing(sdrObj, rFrmFmt, rNdTopLeft);
+        writeVMLDrawing(sdrObj, rFrameFormat, rNdTopLeft);
 
     m_pImpl->m_bDMLAndVMLDrawingOpen = false;
 }
@@ -970,9 +970,9 @@ OString lcl_ConvertTransparency(const Color& rColor)
         return OString("");
 }
 
-void DocxSdrExport::writeDMLEffectLst(const SwFrmFmt& rFrmFmt)
+void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat)
 {
-    SvxShadowItem aShadowItem = rFrmFmt.GetShadow();
+    SvxShadowItem aShadowItem = rFrameFormat.GetShadow();
 
     // Output effects
     if (aShadowItem.GetLocation() != SVX_SHADOW_NONE)
@@ -1096,7 +1096,7 @@ void DocxSdrExport::writeDiagramRels(uno::Reference<xml::dom::XDocument> xDom,
     }
 }
 
-void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFrmFmt,  int nAnchorId)
+void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrameFormat& rFrameFormat,  int nAnchorId)
 {
     sax_fastparser::FSHelperPtr pFS = m_pImpl->m_pSerializer;
     uno::Reference< drawing::XShape > xShape(const_cast<SdrObject*>(sdrObject)->getUnoShape(), uno::UNO_QUERY);
@@ -1141,7 +1141,7 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFr
 
     // write necessary tags to document.xml
     Size aSize(sdrObject->GetSnapRect().GetWidth(), sdrObject->GetSnapRect().GetHeight());
-    startDMLAnchorInline(&rFrmFmt, aSize);
+    startDMLAnchorInline(&rFrameFormat, aSize);
 
     // generate an unique id
     sax_fastparser::FastAttributeList* pDocPrAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
@@ -1228,7 +1228,7 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFr
 
     pFS->endElementNS(XML_a, XML_graphicData);
     pFS->endElementNS(XML_a, XML_graphic);
-    endDMLAnchorInline(&rFrmFmt);
+    endDMLAnchorInline(&rFrameFormat);
 
     uno::Reference< xml::sax::XSAXSerializable > serializer;
     uno::Reference< xml::sax::XWriter > writer = xml::sax::Writer::create(comphelper::getProcessComponentContext());
@@ -1285,8 +1285,8 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFr
 
 void DocxSdrExport::writeOnlyTextOfFrame(sw::Frame* pParentFrame)
 {
-    const SwFrmFmt& rFrmFmt = pParentFrame->GetFrmFmt();
-    const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
+    const SwFrameFormat& rFrameFormat = pParentFrame->GetFrameFormat();
+    const SwNodeIndex* pNodeIndex = rFrameFormat.GetContent().GetContentIdx();
     sax_fastparser::FSHelperPtr pFS = m_pImpl->m_pSerializer;
 
     sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1                  : 0;
@@ -1355,8 +1355,8 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
     m_pImpl->m_bDMLAndVMLDrawingOpen = true;
 
     sax_fastparser::FSHelperPtr pFS = m_pImpl->m_pSerializer;
-    const SwFrmFmt& rFrmFmt = pParentFrame->GetFrmFmt();
-    const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
+    const SwFrameFormat& rFrameFormat = pParentFrame->GetFrameFormat();
+    const SwNodeIndex* pNodeIndex = rFrameFormat.GetContent().GetContentIdx();
 
     sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1                  : 0;
     sal_uLong nEnd = pNodeIndex ? pNodeIndex->GetNode().EndOfSectionIndex() : 0;
@@ -1369,7 +1369,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
     const Size aSize = pParentFrame->GetSize();
 
     uno::Reference< drawing::XShape > xShape;
-    const SdrObject* pSdrObj = rFrmFmt.FindRealSdrObject();
+    const SdrObject* pSdrObj = rFrameFormat.FindRealSdrObject();
     if (pSdrObj)
         xShape = uno::Reference< drawing::XShape >(const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY);
     uno::Reference< beans::XPropertySet > xPropertySet(xShape, uno::UNO_QUERY);
@@ -1387,11 +1387,11 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
 
     if (!bTextBoxOnly)
     {
-        startDMLAnchorInline(&rFrmFmt, aSize);
+        startDMLAnchorInline(&rFrameFormat, aSize);
 
         sax_fastparser::FastAttributeList* pDocPrAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
         pDocPrAttrList->add(XML_id, OString::number(nAnchorId).getStr());
-        pDocPrAttrList->add(XML_name, OUStringToOString(rFrmFmt.GetName(), RTL_TEXTENCODING_UTF8).getStr());
+        pDocPrAttrList->add(XML_name, OUStringToOString(rFrameFormat.GetName(), RTL_TEXTENCODING_UTF8).getStr());
         sax_fastparser::XFastAttributeListRef xDocPrAttrListRef(pDocPrAttrList);
         pFS->singleElementNS(XML_wp, XML_docPr, xDocPrAttrListRef);
 
@@ -1470,9 +1470,9 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
                              XML_prst, OUStringToOString(shapeType, RTL_TEXTENCODING_UTF8).getStr(),
                              FSEND);
         m_pImpl->m_bDMLTextFrameSyntax = true;
-        m_pImpl->m_rExport.OutputFormat(pParentFrame->GetFrmFmt(), false, false, true);
+        m_pImpl->m_rExport.OutputFormat(pParentFrame->GetFrameFormat(), false, false, true);
         m_pImpl->m_bDMLTextFrameSyntax = false;
-        writeDMLEffectLst(rFrmFmt);
+        writeDMLEffectLst(rFrameFormat);
         pFS->endElementNS(XML_wps, XML_spPr);
     }
 
@@ -1550,7 +1550,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
     {
         pFS->startElementNS(XML_wps, XML_bodyPr, xBodyPrAttrList);
         // AutoSize of the Text Frame.
-        const SwFmtFrmSize& rSize = rFrmFmt.GetFrmSize();
+        const SwFormatFrmSize& rSize = rFrameFormat.GetFrmSize();
         pFS->singleElementNS(XML_a, (rSize.GetHeightSizeType() == ATT_VAR_SIZE ? XML_spAutoFit : XML_noAutofit), FSEND);
         pFS->endElementNS(XML_wps, XML_bodyPr);
 
@@ -1580,7 +1580,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
             pFS->endElementNS(XML_wp14, XML_sizeRelV);
         }
 
-        endDMLAnchorInline(&rFrmFmt);
+        endDMLAnchorInline(&rFrameFormat);
     }
     m_pImpl->m_bDMLAndVMLDrawingOpen = bDMLAndVMLDrawingOpen;
 }
@@ -1591,8 +1591,8 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame* pParentFrame, bool bTextBoxOnly
     m_pImpl->m_bDMLAndVMLDrawingOpen = true;
 
     sax_fastparser::FSHelperPtr pFS = m_pImpl->m_pSerializer;
-    const SwFrmFmt& rFrmFmt = pParentFrame->GetFrmFmt();
-    const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
+    const SwFrameFormat& rFrameFormat = pParentFrame->GetFrameFormat();
+    const SwNodeIndex* pNodeIndex = rFrameFormat.GetContent().GetContentIdx();
 
     sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1                  : 0;
     sal_uLong nEnd = pNodeIndex ? pNodeIndex->GetNode().EndOfSectionIndex() : 0;
@@ -1614,10 +1614,10 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame* pParentFrame, bool bTextBoxOnly
         OString sRotation(OString::number(m_pImpl->m_nDMLandVMLTextFrameRotation / -100));
         m_pImpl->m_rExport.SdrExporter().getTextFrameStyle().append(";rotation:").append(sRotation);
     }
-    m_pImpl->m_rExport.OutputFormat(pParentFrame->GetFrmFmt(), false, false, true);
+    m_pImpl->m_rExport.OutputFormat(pParentFrame->GetFrameFormat(), false, false, true);
     m_pImpl->m_pFlyAttrList->add(XML_style, m_pImpl->m_aTextFrameStyle.makeStringAndClear());
 
-    const SdrObject* pObject = pParentFrame->GetFrmFmt().FindRealSdrObject();
+    const SdrObject* pObject = pParentFrame->GetFrameFormat().FindRealSdrObject();
     if (pObject != NULL)
     {
         OUString sAnchorId = lclGetAnchorIdFromGrabBag(pObject);
@@ -1635,7 +1635,7 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame* pParentFrame, bool bTextBoxOnly
     {
         pFS->startElementNS(XML_w, XML_pict, FSEND);
         pFS->startElementNS(XML_v, XML_rect, xFlyAttrList);
-        m_pImpl->textFrameShadow(rFrmFmt);
+        m_pImpl->textFrameShadow(rFrameFormat);
         if (m_pImpl->m_pFlyFillAttrList)
         {
             sax_fastparser::XFastAttributeListRef xFlyFillAttrList(m_pImpl->m_pFlyFillAttrList.release());
@@ -1685,30 +1685,30 @@ bool DocxSdrExport::Impl::checkFrameBtlr(SwNode* pStartNode, bool bDML)
     else
         assert(m_pTextboxAttrList);
 
-    if (!pStartNode->IsTxtNode())
+    if (!pStartNode->IsTextNode())
         return false;
 
-    SwTxtNode* pTxtNode = pStartNode->GetTxtNode();
+    SwTextNode* pTextNode = pStartNode->GetTextNode();
 
     const SfxPoolItem* pItem = 0; // explicitly init to avoid warnings
     bool bItemSet = false;
-    if (pTxtNode->HasSwAttrSet())
+    if (pTextNode->HasSwAttrSet())
     {
-        const SwAttrSet& rAttrSet = pTxtNode->GetSwAttrSet();
+        const SwAttrSet& rAttrSet = pTextNode->GetSwAttrSet();
         bItemSet = rAttrSet.GetItemState(RES_CHRATR_ROTATE, true, &pItem) == SfxItemState::SET;
     }
 
     if (!bItemSet)
     {
-        if (!pTxtNode->HasHints())
+        if (!pTextNode->HasHints())
             return false;
 
-        SwTxtAttr* pTxtAttr = pTxtNode->GetTxtAttrAt(0, RES_TXTATR_AUTOFMT);
+        SwTextAttr* pTextAttr = pTextNode->GetTextAttrAt(0, RES_TXTATR_AUTOFMT);
 
-        if (!pTxtAttr || pTxtAttr->Which() != RES_TXTATR_AUTOFMT)
+        if (!pTextAttr || pTextAttr->Which() != RES_TXTATR_AUTOFMT)
             return false;
 
-        std::shared_ptr<SfxItemSet> pItemSet = pTxtAttr->GetAutoFmt().GetStyleHandle();
+        std::shared_ptr<SfxItemSet> pItemSet = pTextAttr->GetAutoFormat().GetStyleHandle();
         bItemSet = pItemSet->GetItemState(RES_CHRATR_ROTATE, true, &pItem) == SfxItemState::SET;
     }
 
@@ -1727,9 +1727,9 @@ bool DocxSdrExport::Impl::checkFrameBtlr(SwNode* pStartNode, bool bDML)
     return false;
 }
 
-bool DocxSdrExport::isTextBox(const SwFrmFmt& rFrmFmt)
+bool DocxSdrExport::isTextBox(const SwFrameFormat& rFrameFormat)
 {
-    return m_pImpl->m_aTextBoxes.find(&rFrmFmt) != m_pImpl->m_aTextBoxes.end();
+    return m_pImpl->m_aTextBoxes.find(&rFrameFormat) != m_pImpl->m_aTextBoxes.end();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx
index b99b235b3890..dd98d716afb1 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -33,7 +33,7 @@ namespace sw
 {
 class Frame;
 }
-class SwFrmFmt;
+class SwFrameFormat;
 class SwNode;
 
 class DocxExport;
@@ -83,18 +83,18 @@ public:
     sax_fastparser::FastAttributeList* getBodyPrAttrList();
     std::unique_ptr<sax_fastparser::FastAttributeList>& getDashLineStyle();
 
-    void startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rSize);
-    void endDMLAnchorInline(const SwFrmFmt* pFrmFmt);
+    void startDMLAnchorInline(const SwFrameFormat* pFrameFormat, const Size& rSize);
+    void endDMLAnchorInline(const SwFrameFormat* pFrameFormat);
     /// Writes a drawing as VML data.
-    void writeVMLDrawing(const SdrObject* sdrObj, const SwFrmFmt& rFrmFmt,const Point& rNdTopLeft);
+    void writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft);
     /// Writes a drawing as DML.
-    void writeDMLDrawing(const SdrObject* pSdrObj, const SwFrmFmt* pFrmFmt, int nAnchorId);
+    void writeDMLDrawing(const SdrObject* pSdrObj, const SwFrameFormat* pFrameFormat, int nAnchorId);
     /// Writes shape in both DML and VML format.
-    void writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrmFmt& rFrmFmt,const Point& rNdTopLeft, int nAnchorId);
+    void writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft, int nAnchorId);
     /// Write <a:effectLst>, the effect list.
-    void writeDMLEffectLst(const SwFrmFmt& rFrmFmt);
+    void writeDMLEffectLst(const SwFrameFormat& rFrameFormat);
     /// Writes a diagram (smartart).
-    void writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFrmFmt, int nAnchorId);
+    void writeDiagram(const SdrObject* sdrObject, const SwFrameFormat& rFrameFormat, int nAnchorId);
     void writeDiagramRels(css::uno::Reference<css::xml::dom::XDocument> xDom,
                           const css::uno::Sequence< css::uno::Sequence<css::uno::Any> >& xRelSeq,
                           css::uno::Reference<css::io::XOutputStream> xOutStream, const OUString& sGrabBagProperyName,
@@ -104,7 +104,7 @@ public:
     /// Writes text frame in VML format.
     void writeVMLTextFrame(sw::Frame* pParentFrame, bool bTextBoxOnly = false);
     /// Is this a standalone TextFrame, or used as a TextBox of a shape?
-    bool isTextBox(const SwFrmFmt& rFrmFmt);
+    bool isTextBox(const SwFrameFormat& rFrameFormat);
     /// Writes text from Textbox for <w:framePr>
     void writeOnlyTextOfFrame(sw::Frame* pParentFrame);
     /// Writes the drawingML <a:ln> markup of a box item.
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 985d3c223bce..6a1a947fb292 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -31,7 +31,7 @@ struct DocxTableStyleExport::Impl
     /// Export of w:pPr.
     void tableStylePPr(uno::Sequence<beans::PropertyValue>& rPPr);
     /// Export of w:tblStylePr.
-    void tableStyleTblStylePr(uno::Sequence<beans::PropertyValue>& rTblStylePr);
+    void tableStyleTableStylePr(uno::Sequence<beans::PropertyValue>& rTableStylePr);
     /// Export of w:rPr.
     void tableStyleRPr(uno::Sequence<beans::PropertyValue>& rRPr);
     /// Export of w:rFonts.
@@ -43,15 +43,15 @@ struct DocxTableStyleExport::Impl
     /// Export of w:spacing.
     void tableStylePSpacing(uno::Sequence<beans::PropertyValue>& rSpacing);
     /// Export of w:tblPr.
-    void tableStyleTblPr(uno::Sequence<beans::PropertyValue>& rTblPr);
+    void tableStyleTablePr(uno::Sequence<beans::PropertyValue>& rTablePr);
     /// Export of w:tcPr.
     void tableStyleTcPr(uno::Sequence<beans::PropertyValue>& rTcPr);
     /// Export of w:tcBorders (and w:tblBorders).
     void tableStyleTcBorders(uno::Sequence<beans::PropertyValue>& rTcBorders, sal_Int32 nToken = XML_tcBorders);
     /// Export of w:tblInd.
-    void tableStyleTblInd(uno::Sequence<beans::PropertyValue>& rTblInd);
+    void tableStyleTableInd(uno::Sequence<beans::PropertyValue>& rTableInd);
     /// Export of w:tblCellMar (and w:tcMar).
-    void tableStyleTblCellMar(uno::Sequence<beans::PropertyValue>& rTblCellMar, sal_Int32 nType = XML_tblCellMar);
+    void tableStyleTableCellMar(uno::Sequence<beans::PropertyValue>& rTableCellMar, sal_Int32 nType = XML_tblCellMar);
     /// Export of a given table cell border type.
     void tableStyleTcBorder(sal_Int32 nToken, const uno::Sequence<beans::PropertyValue>& rTcBorder);
     /// Export of w:shd.
@@ -130,9 +130,9 @@ void DocxTableStyleExport::TableStyles(sal_Int32 nCountStylesToWrite)
     }
 }
 
-void DocxTableStyleExport::Impl::tableStyleTblCellMar(uno::Sequence<beans::PropertyValue>& rTblCellMar, sal_Int32 nType)
+void DocxTableStyleExport::Impl::tableStyleTableCellMar(uno::Sequence<beans::PropertyValue>& rTableCellMar, sal_Int32 nType)
 {
-    static DocxStringTokenMap const aTblCellMarTokens[] =
+    static DocxStringTokenMap const aTableCellMarTokens[] =
     {
         {"left", XML_left},
         {"right", XML_right},
@@ -143,15 +143,15 @@ void DocxTableStyleExport::Impl::tableStyleTblCellMar(uno::Sequence<beans::Prope
         {0, 0}
     };
 
-    if (!rTblCellMar.hasElements())
+    if (!rTableCellMar.hasElements())
         return;
 
     m_pSerializer->startElementNS(XML_w, nType, FSEND);
-    for (sal_Int32 i = 0; i < rTblCellMar.getLength(); ++i)
+    for (sal_Int32 i = 0; i < rTableCellMar.getLength(); ++i)
     {
-        if (sal_Int32 nToken = DocxStringGetToken(aTblCellMarTokens, rTblCellMar[i].Name))
+        if (sal_Int32 nToken = DocxStringGetToken(aTableCellMarTokens, rTableCellMar[i].Name))
         {
-            comphelper::SequenceAsHashMap aMap(rTblCellMar[i].Value.get< uno::Sequence<beans::PropertyValue> >());
+            comphelper::SequenceAsHashMap aMap(rTableCellMar[i].Value.get< uno::Sequence<beans::PropertyValue> >());
             m_pSerializer->singleElementNS(XML_w, nToken,
                                            FSNS(XML_w, XML_w), OString::number(aMap["w"].get<sal_Int32>()),
                                            FSNS(XML_w, XML_type), aMap["type"].get<OUString>().toUtf8(),
@@ -347,18 +347,18 @@ void DocxTableStyleExport::Impl::tableStylePInd(uno::Sequence<beans::PropertyVal
     m_pSerializer->singleElementNS(XML_w, XML_ind, xAttributeList);
 }
 
-void DocxTableStyleExport::Impl::tableStyleTblInd(uno::Sequence<beans::PropertyValue>& rTblInd)
+void DocxTableStyleExport::Impl::tableStyleTableInd(uno::Sequence<beans::PropertyValue>& rTableInd)
 {
-    if (!rTblInd.hasElements())
+    if (!rTableInd.hasElements())
         return;
 
     sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
-    for (sal_Int32 i = 0; i < rTblInd.getLength(); ++i)
+    for (sal_Int32 i = 0; i < rTableInd.getLength(); ++i)
     {
-        if (rTblInd[i].Name == "w")
-            pAttributeList->add(FSNS(XML_w, XML_w), OString::number(rTblInd[i].Value.get<sal_Int32>()));
-        else if (rTblInd[i].Name == "type")
-            pAttributeList->add(FSNS(XML_w, XML_type), rTblInd[i].Value.get<OUString>().toUtf8());
+        if (rTableInd[i].Name == "w")
+            pAttributeList->add(FSNS(XML_w, XML_w), OString::number(rTableInd[i].Value.get<sal_Int32>()));
+        else if (rTableInd[i].Name == "type")
+            pAttributeList->add(FSNS(XML_w, XML_type), rTableInd[i].Value.get<OUString>().toUtf8());
     }
     sax_fastparser::XFastAttributeListRef xAttributeList(pAttributeList);
     m_pSerializer->singleElementNS(XML_w, XML_tblInd, xAttributeList);
@@ -486,39 +486,39 @@ void DocxTableStyleExport::Impl::tableStylePPr(uno::Sequence<beans::PropertyValu
     m_pSerializer->endElementNS(XML_w, XML_pPr);
 }
 
-void DocxTableStyleExport::Impl::tableStyleTblPr(uno::Sequence<beans::PropertyValue>& rTblPr)
+void DocxTableStyleExport::Impl::tableStyleTablePr(uno::Sequence<beans::PropertyValue>& rTablePr)
 {
-    if (!rTblPr.hasElements())
+    if (!rTablePr.hasElements())
         return;
 
     m_pSerializer->startElementNS(XML_w, XML_tblPr, FSEND);
 
-    uno::Sequence<beans::PropertyValue> aTblInd, aTblBorders, aTblCellMar;
-    boost::optional<sal_Int32> oTblStyleRowBandSize, oTblStyleColBandSize;
-    for (sal_Int32 i = 0; i < rTblPr.getLength(); ++i)
+    uno::Sequence<beans::PropertyValue> aTableInd, aTableBorders, aTableCellMar;
+    boost::optional<sal_Int32> oTableStyleRowBandSize, oTableStyleColBandSize;
+    for (sal_Int32 i = 0; i < rTablePr.getLength(); ++i)
     {
-        if (rTblPr[i].Name == "tblStyleRowBandSize")
-            oTblStyleRowBandSize = rTblPr[i].Value.get<sal_Int32>();
-        else if (rTblPr[i].Name == "tblStyleColBandSize")
-            oTblStyleColBandSize = rTblPr[i].Value.get<sal_Int32>();
-        else if (rTblPr[i].Name == "tblInd")
-            aTblInd = rTblPr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
-        else if (rTblPr[i].Name == "tblBorders")
-            aTblBorders = rTblPr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
-        else if (rTblPr[i].Name == "tblCellMar")
-            aTblCellMar = rTblPr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
+        if (rTablePr[i].Name == "tblStyleRowBandSize")
+            oTableStyleRowBandSize = rTablePr[i].Value.get<sal_Int32>();
+        else if (rTablePr[i].Name == "tblStyleColBandSize")
+            oTableStyleColBandSize = rTablePr[i].Value.get<sal_Int32>();
+        else if (rTablePr[i].Name == "tblInd")
+            aTableInd = rTablePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
+        else if (rTablePr[i].Name == "tblBorders")
+            aTableBorders = rTablePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
+        else if (rTablePr[i].Name == "tblCellMar")
+            aTableCellMar = rTablePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
     }
-    if (oTblStyleRowBandSize)
+    if (oTableStyleRowBandSize)
         m_pSerializer->singleElementNS(XML_w, XML_tblStyleRowBandSize,
-                                       FSNS(XML_w, XML_val), OString::number(oTblStyleRowBandSize.get()),
+                                       FSNS(XML_w, XML_val), OString::number(oTableStyleRowBandSize.get()),
                                        FSEND);
-    if (oTblStyleColBandSize)
+    if (oTableStyleColBandSize)
         m_pSerializer->singleElementNS(XML_w, XML_tblStyleColBandSize,
-                                       FSNS(XML_w, XML_val), OString::number(oTblStyleColBandSize.get()),
+                                       FSNS(XML_w, XML_val), OString::number(oTableStyleColBandSize.get()),
                                        FSEND);
-    tableStyleTblInd(aTblInd);
-    tableStyleTcBorders(aTblBorders, XML_tblBorders);
-    tableStyleTblCellMar(aTblCellMar);
+    tableStyleTableInd(aTableInd);
+    tableStyleTcBorders(aTableBorders, XML_tblBorders);
+    tableStyleTableCellMar(aTableCellMar);
 
     m_pSerializer->endElementNS(XML_w, XML_tblPr);
 }
@@ -544,7 +544,7 @@ void DocxTableStyleExport::Impl::tableStyleTcPr(uno::Sequence<beans::PropertyVal
             aVAlign = rTcPr[i].Value.get<OUString>();
     }
     tableStyleTcBorders(aTcBorders);
-    tableStyleTblCellMar(aTcMar, XML_tcMar);
+    tableStyleTableCellMar(aTcMar, XML_tcMar);
     tableStyleShd(aShd);
     if (!aVAlign.isEmpty())
         m_pSerializer->singleElementNS(XML_w, XML_vAlign,
@@ -554,25 +554,25 @@ void DocxTableStyleExport::Impl::tableStyleTcPr(uno::Sequence<beans::PropertyVal
     m_pSerializer->endElementNS(XML_w, XML_tcPr);
 }
 
-void DocxTableStyleExport::Impl::tableStyleTblStylePr(uno::Sequence<beans::PropertyValue>& rTblStylePr)
+void DocxTableStyleExport::Impl::tableStyleTableStylePr(uno::Sequence<beans::PropertyValue>& rTableStylePr)
 {
-    if (!rTblStylePr.hasElements())
+    if (!rTableStylePr.hasElements())
         return;
 
     OUString aType;
-    uno::Sequence<beans::PropertyValue> aPPr, aRPr, aTblPr, aTcPr;
-    for (sal_Int32 i = 0; i < rTblStylePr.getLength(); ++i)
+    uno::Sequence<beans::PropertyValue> aPPr, aRPr, aTablePr, aTcPr;
+    for (sal_Int32 i = 0; i < rTableStylePr.getLength(); ++i)
     {
-        if (rTblStylePr[i].Name == "type")
-            aType = rTblStylePr[i].Value.get<OUString>();
-        else if (rTblStylePr[i].Name == "pPr")
-            aPPr = rTblStylePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
-        else if (rTblStylePr[i].Name == "rPr")
-            aRPr = rTblStylePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
-        else if (rTblStylePr[i].Name == "tblPr")
-            aTblPr = rTblStylePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
-        else if (rTblStylePr[i].Name == "tcPr")
-            aTcPr = rTblStylePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
+        if (rTableStylePr[i].Name == "type")
+            aType = rTableStylePr[i].Value.get<OUString>();
+        else if (rTableStylePr[i].Name == "pPr")
+            aPPr = rTableStylePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
+        else if (rTableStylePr[i].Name == "rPr")
+            aRPr = rTableStylePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
+        else if (rTableStylePr[i].Name == "tblPr")
+            aTablePr = rTableStylePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
+        else if (rTableStylePr[i].Name == "tcPr")
+            aTcPr = rTableStylePr[i].Value.get< uno::Sequence<beans::PropertyValue> >();
     }
 
     m_pSerializer->startElementNS(XML_w, XML_tblStylePr,
@@ -581,8 +581,8 @@ void DocxTableStyleExport::Impl::tableStyleTblStylePr(uno::Sequence<beans::Prope
 
     tableStylePPr(aPPr);
     tableStyleRPr(aRPr);
-    if (aTblPr.hasElements())
-        tableStyleTblPr(aTblPr);
+    if (aTablePr.hasElements())
+        tableStyleTablePr(aTablePr);
     else
     {
         // Even if we have an empty container, write it out, as Word does.
@@ -597,8 +597,8 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>&
 {
     bool bDefault = false, bCustomStyle = false, bQFormat = false, bSemiHidden = false, bUnhideWhenUsed = false;
     OUString aStyleId, aName, aBasedOn, aRsid, aUiPriority;
-    uno::Sequence<beans::PropertyValue> aPPr, aRPr, aTblPr, aTcPr;
-    std::vector< uno::Sequence<beans::PropertyValue> > aTblStylePrs;
+    uno::Sequence<beans::PropertyValue> aPPr, aRPr, aTablePr, aTcPr;
+    std::vector< uno::Sequence<beans::PropertyValue> > aTableStylePrs;
     for (sal_Int32 i = 0; i < rStyle.getLength(); ++i)
     {
         if (rStyle[i].Name == "default")
@@ -626,11 +626,11 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>&
         else if (rStyle[i].Name == "rPr")
             aRPr = rStyle[i].Value.get< uno::Sequence<beans::PropertyValue> >();
         else if (rStyle[i].Name == "tblPr")
-            aTblPr = rStyle[i].Value.get< uno::Sequence<beans::PropertyValue> >();
+            aTablePr = rStyle[i].Value.get< uno::Sequence<beans::PropertyValue> >();
         else if (rStyle[i].Name == "tcPr")
             aTcPr = rStyle[i].Value.get< uno::Sequence<beans::PropertyValue> >();
         else if (rStyle[i].Name == "tblStylePr")
-            aTblStylePrs.push_back(rStyle[i].Value.get< uno::Sequence<beans::PropertyValue> >());
+            aTableStylePrs.push_back(rStyle[i].Value.get< uno::Sequence<beans::PropertyValue> >());
     }
 
     sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
@@ -668,10 +668,10 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>&
 
     tableStylePPr(aPPr);
     tableStyleRPr(aRPr);
-    tableStyleTblPr(aTblPr);
+    tableStyleTablePr(aTablePr);
     tableStyleTcPr(aTcPr);
-    for (size_t i = 0; i < aTblStylePrs.size(); ++i)
-        tableStyleTblStylePr(aTblStylePrs[i]);
+    for (size_t i = 0; i < aTableStylePrs.size(); ++i)
+        tableStyleTableStylePr(aTableStylePrs[i]);
 
     m_pSerializer->endElementNS(XML_w, XML_style);
 }
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index e2899709dbdb..c1e4427dda47 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -23,16 +23,16 @@
 #include <filter/msfilter/escherex.hxx>
 
 const sal_uInt32 nInlineHack = 0x00010001;
-class SwFrmFmt;
+class SwFrameFormat;
 // #i30669#
-class SwFmtHoriOrient;
-class SwFmtVertOrient;
+class SwFormatHoriOrient;
+class SwFormatVertOrient;
 
 class WinwordAnchoring : public EscherExClientRecord_Base
 {
 public:
     void WriteData(EscherEx& rEx) const SAL_OVERRIDE;
-    void SetAnchoring(const SwFrmFmt& rFmt);
+    void SetAnchoring(const SwFrameFormat& rFormat);
 
     /** method to perform conversion of positioning attributes with the help
         of corresponding layout information
@@ -55,14 +55,14 @@ public:
         input/output parameter - containing the current vertical position
         attributes, which are converted by this method.
 
-        @param _rFrmFmt
+        @param _rFrameFormat
         input parameter - frame format of the anchored object
 
         @return boolean, indicating, if a conversion has been performed.
     */
-    static bool ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
-                                 SwFmtVertOrient& _iorVertOri,
-                                 const SwFrmFmt& _rFrmFmt );
+    static bool ConvertPosition( SwFormatHoriOrient& _iorHoriOri,
+                                 SwFormatVertOrient& _iorVertOri,
+                                 const SwFrameFormat& _rFrameFormat );
 
 private:
     bool mbInline;
@@ -96,14 +96,14 @@ protected:
     SvStream* pEscherStrm;
     long mnEmuMul, mnEmuDiv;
 
-    virtual sal_Int32 WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType,
+    virtual sal_Int32 WriteFlyFrameAttr(const SwFrameFormat& rFormat, MSO_SPT eShapeType,
         EscherPropertyContainer& rPropOpt);
     void WriteBrushAttr(const SvxBrushItem &rBrush,
         EscherPropertyContainer& rPropOpt);
     void WriteOLEPicture(EscherPropertyContainer &rPropOpt,
         sal_uInt32 nShapeFlags, const Graphic &rGraphic, const SdrObject &rObj,
         sal_uInt32 nShapeId, const com::sun::star::awt::Rectangle* pVisArea );
-    static void WriteGrfAttr(const SwNoTxtNode& rNd,EscherPropertyContainer& rPropOpt);
+    static void WriteGrfAttr(const SwNoTextNode& rNd,EscherPropertyContainer& rPropOpt);
 
     sal_Int32 DrawModelToEmu(sal_Int32 nVal) const
         { return BigMulDiv(nVal, mnEmuMul, mnEmuDiv); }
@@ -115,20 +115,20 @@ protected:
 
 public:
     SwBasicEscherEx(SvStream* pStrm, WW8Export& rWrt);
-    sal_Int32 WriteGrfFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShapeId);
+    sal_Int32 WriteGrfFlyFrame(const SwFrameFormat& rFormat, sal_uInt32 nShapeId);
     //For i120928,to export graphic of bullet
     sal_Int32 WriteGrfBullet(const Graphic&);
-    sal_Int32 WriteOLEFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShapeId);
-    void WriteEmptyFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShapeId);
-    virtual void WriteFrmExtraData(const SwFrmFmt&);
+    sal_Int32 WriteOLEFlyFrame(const SwFrameFormat& rFormat, sal_uInt32 nShapeId);
+    void WriteEmptyFlyFrame(const SwFrameFormat& rFormat, sal_uInt32 nShapeId);
+    virtual void WriteFrmExtraData(const SwFrameFormat&);
     virtual void WritePictures();
     virtual ~SwBasicEscherEx();
     //i120927,this function is added to export hyperlink info,such as graphic/frame/OLE
     bool IsRelUrl();
     OUString GetBasePath();
     OUString BuildFileName(sal_uInt16& rnLevel, bool& rbRel, const OUString& rUrl);
-    void WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFmtURL* pINetFmtArg);
-    void PreWriteHyperlinkWithinFly(const SwFrmFmt& rFmt,EscherPropertyContainer& rPropOpt);
+    void WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFormatURL* pINetFormatArg);
+    void PreWriteHyperlinkWithinFly(const SwFrameFormat& rFormat,EscherPropertyContainer& rPropOpt);
 
 private:
     SwBasicEscherEx(const SwBasicEscherEx&) SAL_DELETED_FUNCTION;
@@ -141,19 +141,19 @@ private:
     std::vector<sal_uLong> aFollowShpIds;
     EscherExHostAppData aHostData;
     WinwordAnchoring aWinwordAnchoring;
-    WW8_WrPlcTxtBoxes *pTxtBxs;
+    WW8_WrPlcTextBoxes *pTextBxs;
 
-    sal_uInt32 GetFlyShapeId(const SwFrmFmt& rFmt,
+    sal_uInt32 GetFlyShapeId(const SwFrameFormat& rFormat,
         unsigned int nHdFtIndex, DrawObjPointerVector &rPVec);
     void MakeZOrderArrAndFollowIds(std::vector<DrawObj>& rSrcArr,
         DrawObjPointerVector& rDstArr);
 
     sal_Int32 WriteFlyFrm(const DrawObj &rObj, sal_uInt32 &rShapeId,
         DrawObjPointerVector &rPVec);
-    sal_Int32 WriteTxtFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId,
-        sal_uInt32 nTxtBox, DrawObjPointerVector &rPVec);
-    void WriteOCXControl(const SwFrmFmt& rFmt,sal_uInt32 nShapeId);
-    virtual sal_Int32 WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType,
+    sal_Int32 WriteTextFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId,
+        sal_uInt32 nTextBox, DrawObjPointerVector &rPVec);
+    void WriteOCXControl(const SwFrameFormat& rFormat,sal_uInt32 nShapeId);
+    virtual sal_Int32 WriteFlyFrameAttr(const SwFrameFormat& rFormat, MSO_SPT eShapeType,
         EscherPropertyContainer& rPropOpt) SAL_OVERRIDE;
 
     virtual sal_uInt32 QueryTextID(
@@ -167,7 +167,7 @@ public:
     void FinishEscher();
     virtual void WritePictures() SAL_OVERRIDE;
 
-    virtual void WriteFrmExtraData(const SwFrmFmt& rFmt) SAL_OVERRIDE;
+    virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) SAL_OVERRIDE;
 
     EscherExHostAppData* StartShape(const com::sun::star::uno::Reference<
         com::sun::star::drawing::XShape > &, const Rectangle*) SAL_OVERRIDE {return &aHostData;}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index a3bbd2448d26..a3dab5c94875 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -269,7 +269,7 @@ void RtfAttributeOutput::StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNo
 void RtfAttributeOutput::EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner)
 {
     bool bLastPara = false;
-    if (m_rExport.m_nTxtTyp == TXT_FTN || m_rExport.m_nTxtTyp == TXT_EDN)
+    if (m_rExport.m_nTextTyp == TXT_FTN || m_rExport.m_nTextTyp == TXT_EDN)
     {
         // We're ending a paragraph that is the last paragraph of a footnote or endnote.
         bLastPara = m_rExport.m_nCurrentNodeIndex && m_rExport.m_nCurrentNodeIndex == m_rExport.m_pCurPam->End()->nNode.GetIndex();
@@ -281,8 +281,8 @@ void RtfAttributeOutput::EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t pTex
 
     aParagraph.appendAndClear(m_aRun);
     aParagraph->append(m_aAfterRuns.makeStringAndClear());
-    if (m_bTblAfterCell)
-        m_bTblAfterCell = false;
+    if (m_bTableAfterCell)
+        m_bTableAfterCell = false;
     else
     {
         aParagraph->append(SAL_NEWLINE_STRING);
@@ -310,7 +310,7 @@ void RtfAttributeOutput::EmptyParagraph()
     m_rExport.Strm().WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PAR).WriteChar(' ');
 }
 
-void RtfAttributeOutput::SectionBreaks(const SwTxtNode& rNode)
+void RtfAttributeOutput::SectionBreaks(const SwTextNode& rNode)
 {
     OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty");
 
@@ -323,18 +323,18 @@ void RtfAttributeOutput::SectionBreaks(const SwTxtNode& rNode)
     if (!m_bBufferSectionHeaders)
         m_rExport.Strm().WriteCharPtr(m_aSectionHeaders.makeStringAndClear().getStr());
 
-    if (aNextIndex.GetNode().IsTxtNode())
+    if (aNextIndex.GetNode().IsTextNode())
     {
-        const SwTxtNode* pTxtNode = static_cast< SwTxtNode* >(&aNextIndex.GetNode());
-        m_rExport.OutputSectionBreaks(pTxtNode->GetpSwAttrSet(), *pTxtNode);
+        const SwTextNode* pTextNode = static_cast< SwTextNode* >(&aNextIndex.GetNode());
+        m_rExport.OutputSectionBreaks(pTextNode->GetpSwAttrSet(), *pTextNode);
         // Save the current page description for now, so later we will be able to access the previous one.
-        m_pPrevPageDesc = pTxtNode->FindPageDesc(false);
+        m_pPrevPageDesc = pTextNode->FindPageDesc(false);
     }
     else if (aNextIndex.GetNode().IsTableNode())
     {
         const SwTableNode* pTableNode = static_cast< SwTableNode* >(&aNextIndex.GetNode());
-        const SwFrmFmt* pFmt = pTableNode->GetTable().GetFrmFmt();
-        m_rExport.OutputSectionBreaks(&(pFmt->GetAttrSet()), *pTableNode);
+        const SwFrameFormat* pFormat = pTableNode->GetTable().GetFrameFormat();
+        m_rExport.OutputSectionBreaks(&(pFormat->GetAttrSet()), *pTableNode);
     }
     m_bBufferSectionBreaks = false;
 }
@@ -411,7 +411,7 @@ void RtfAttributeOutput::RawText(const OUString& rText, bool /*bForceUnicode*/,
     m_aRunText->append(msfilter::rtfutil::OutString(rText, eCharSet));
 }
 
-void RtfAttributeOutput::StartRuby(const SwTxtNode& /*rNode*/, sal_Int32 /*nPos*/, const SwFmtRuby& /*rRuby*/)
+void RtfAttributeOutput::StartRuby(const SwTextNode& /*rNode*/, sal_Int32 /*nPos*/, const SwFormatRuby& /*rRuby*/)
 {
     SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
 }
@@ -479,7 +479,7 @@ bool RtfAttributeOutput::EndURL(bool const isAtEndOfParagraph)
     return true;
 }
 
-void RtfAttributeOutput::FieldVanish(const OUString& /*rTxt*/, ww::eField /*eType*/)
+void RtfAttributeOutput::FieldVanish(const OUString& /*rText*/, ww::eField /*eType*/)
 {
     SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
 }
@@ -507,7 +507,7 @@ void RtfAttributeOutput::Redline(const SwRedlineData* pRedline)
     m_aRun->append(' ');
 }
 
-void RtfAttributeOutput::FormatDrop(const SwTxtNode& /*rNode*/, const SwFmtDrop& /*rSwFmtDrop*/, sal_uInt16 /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/, ww8::WW8TableNodeInfoInner::Pointer_t /*pTextNodeInfoInner*/)
+void RtfAttributeOutput::FormatDrop(const SwTextNode& /*rNode*/, const SwFormatDrop& /*rSwFormatDrop*/, sal_uInt16 /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/, ww8::WW8TableNodeInfoInner::Pointer_t /*pTextNodeInfoInner*/)
 {
     SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
 }
@@ -546,8 +546,8 @@ void RtfAttributeOutput::TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t p
 {
     InitTableHelper(pTableTextNodeInfoInner);
 
-    const SwTable* pTbl = pTableTextNodeInfoInner->getTable();
-    SwFrmFmt* pFmt = pTbl->GetFrmFmt();
+    const SwTable* pTable = pTableTextNodeInfoInner->getTable();
+    SwFrameFormat* pFormat = pTable->GetFrameFormat();
 
     m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_TROWD);
     TableOrientation(pTableTextNodeInfoInner);
@@ -556,7 +556,7 @@ void RtfAttributeOutput::TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t p
     TableCanSplit(pTableTextNodeInfoInner);
 
     // Cell margins
-    const SvxBoxItem& rBox = pFmt->GetBox();
+    const SvxBoxItem& rBox = pFormat->GetBox();
     static const SvxBoxItemLine aBorders[] =
     {
         SvxBoxItemLine::TOP, SvxBoxItemLine::LEFT, SvxBoxItemLine::BOTTOM, SvxBoxItemLine::RIGHT
@@ -585,40 +585,40 @@ void RtfAttributeOutput::TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t p
     SwWriteTableRow* pRow = aRows[ pTableTextNodeInfoInner->getRow() ];
     SwTwips nSz = 0;
     Point aPt;
-    SwRect aRect(pFmt->FindLayoutRect(false, &aPt));
+    SwRect aRect(pFormat->FindLayoutRect(false, &aPt));
     SwTwips nPageSize = aRect.Width();
 
     // Handle the page size when not rendered
     if (0 == nPageSize)
     {
         const SwNode* pNode = pTableTextNodeInfoInner->getNode();
-        const SwFrmFmt* pFrmFmt = GetExport().m_pParentFrame ? &GetExport().m_pParentFrame->GetFrmFmt() :
-                                  GetExport().m_pDoc->GetPageDesc(0).GetPageFmtOfNode(*pNode, false);
+        const SwFrameFormat* pFrameFormat = GetExport().m_pParentFrame ? &GetExport().m_pParentFrame->GetFrameFormat() :
+                                  GetExport().m_pDoc->GetPageDesc(0).GetPageFormatOfNode(*pNode, false);
 
-        const SvxLRSpaceItem& rLR = pFrmFmt->GetLRSpace();
-        nPageSize = pFrmFmt->GetFrmSize().GetWidth() -
+        const SvxLRSpaceItem& rLR = pFrameFormat->GetLRSpace();
+        nPageSize = pFrameFormat->GetFrmSize().GetWidth() -
                     rLR.GetLeft() - rLR.GetRight();
     }
-    SwTwips nTblSz = pFmt->GetFrmSize().GetWidth();
+    SwTwips nTableSz = pFormat->GetFrmSize().GetWidth();
     // Not using m_nTableDepth, which is not yet incremented here.
     sal_uInt32 nCurrentDepth = pTableTextNodeInfoInner->getDepth();
     m_aCells[nCurrentDepth] = pRow->GetCells().size();
     for (sal_uInt16 i = 0; i < m_aCells[nCurrentDepth]; i++)
     {
         const SwWriteTableCell* pCell = &pRow->GetCells()[ i ];
-        const SwFrmFmt* pCellFmt = pCell->GetBox()->GetFrmFmt();
+        const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat();
 
         pTableTextNodeInfoInner->setCell(i);
         TableCellProperties(pTableTextNodeInfoInner);
 
         // Right boundary: this can't be in TableCellProperties as the old
         // value of nSz is needed.
-        nSz += pCellFmt->GetFrmSize().GetWidth();
+        nSz += pCellFormat->GetFrmSize().GetWidth();
         m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CELLX);
         SwTwips nCalc = nSz;
         nCalc *= nPageSize;
-        nCalc /= nTblSz;
-        m_aRowDefs.append((sal_Int32)(pFmt->GetLRSpace().GetLeft() + nCalc));
+        nCalc /= nTableSz;
+        m_aRowDefs.append((sal_Int32)(pFormat->GetLRSpace().GetLeft() + nCalc));
     }
 }
 
@@ -631,15 +631,15 @@ void RtfAttributeOutput::TableDefaultBorders(ww8::WW8TableNodeInfoInner::Pointer
      * called for each cell.
      */
 
-    const SwTableBox* pTblBox = pTableTextNodeInfoInner->getTableBox();
-    SwFrmFmt* pFmt = pTblBox->GetFrmFmt();
-    const SvxBoxItem& rDefault = pFmt->GetBox();
+    const SwTableBox* pTableBox = pTableTextNodeInfoInner->getTableBox();
+    SwFrameFormat* pFormat = pTableBox->GetFrameFormat();
+    const SvxBoxItem& rDefault = pFormat->GetBox();
     const SwWriteTableRows& aRows = m_pTableWrt->GetRows();
     SwWriteTableRow* pRow = aRows[ pTableTextNodeInfoInner->getRow() ];
     const SwWriteTableCell* pCell = &pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ];
-    const SwFrmFmt* pCellFmt = pCell->GetBox()->GetFrmFmt();
+    const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat();
     const SfxPoolItem* pItem;
-    if (pCellFmt->GetAttrSet().HasItem(RES_BOX, &pItem))
+    if (pCellFormat->GetAttrSet().HasItem(RES_BOX, &pItem))
     {
         const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(*pItem);
         static const SvxBoxItemLine aBorders[] =
@@ -681,9 +681,9 @@ void RtfAttributeOutput::TableBackgrounds(ww8::WW8TableNodeInfoInner::Pointer_t
     const SwWriteTableRows& aRows = m_pTableWrt->GetRows();
     SwWriteTableRow* pRow = aRows[ pTableTextNodeInfoInner->getRow() ];
     const SwWriteTableCell* pCell = &pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ];
-    const SwFrmFmt* pCellFmt = pCell->GetBox()->GetFrmFmt();
+    const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat();
     const SfxPoolItem* pItem;
-    if (pCellFmt->GetAttrSet().HasItem(RES_BACKGROUND, &pItem))
+    if (pCellFormat->GetAttrSet().HasItem(RES_BACKGROUND, &pItem))
     {
         const SvxBrushItem& rBack = static_cast<const SvxBrushItem&>(*pItem);
         if (!rBack.GetColor().GetTransparency())
@@ -706,8 +706,8 @@ void RtfAttributeOutput::TableHeight(ww8::WW8TableNodeInfoInner::Pointer_t pTabl
 {
     const SwTableBox* pTabBox = pTableTextNodeInfoInner->getTableBox();
     const SwTableLine* pTabLine = pTabBox->GetUpper();
-    const SwFrmFmt* pLineFmt = pTabLine->GetFrmFmt();
-    const SwFmtFrmSize& rLSz = pLineFmt->GetFrmSize();
+    const SwFrameFormat* pLineFormat = pTabLine->GetFrameFormat();
+    const SwFormatFrmSize& rLSz = pLineFormat->GetFrmSize();
 
     if (ATT_VAR_SIZE != rLSz.GetHeightSizeType() && rLSz.GetHeight())
     {
@@ -737,8 +737,8 @@ void RtfAttributeOutput::TableCanSplit(ww8::WW8TableNodeInfoInner::Pointer_t pTa
 {
     const SwTableBox* pTabBox = pTableTextNodeInfoInner->getTableBox();
     const SwTableLine* pTabLine = pTabBox->GetUpper();
-    const SwFrmFmt* pLineFmt = pTabLine->GetFrmFmt();
-    const SwFmtRowSplit& rSplittable = pLineFmt->GetRowSplit();
+    const SwFrameFormat* pLineFormat = pTabLine->GetFrameFormat();
+    const SwFormatRowSplit& rSplittable = pLineFormat->GetRowSplit();
 
     // The rtf default is to allow a row to break
     if (!rSplittable.GetValue())
@@ -748,9 +748,9 @@ void RtfAttributeOutput::TableCanSplit(ww8::WW8TableNodeInfoInner::Pointer_t pTa
 void RtfAttributeOutput::TableBidi(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner)
 {
     const SwTable* pTable = pTableTextNodeInfoInner->getTable();
-    const SwFrmFmt* pFrmFmt = pTable->GetFrmFmt();
+    const SwFrameFormat* pFrameFormat = pTable->GetFrameFormat();
 
-    if (m_rExport.TrueFrameDirection(*pFrmFmt) != FRMDIR_HORI_RIGHT_TOP)
+    if (m_rExport.TrueFrameDirection(*pFrameFormat) != FRMDIR_HORI_RIGHT_TOP)
         m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_LTRROW);
     else
         m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_RTLROW);
@@ -761,7 +761,7 @@ void RtfAttributeOutput::TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t
     const SwWriteTableRows& aRows = m_pTableWrt->GetRows();
     SwWriteTableRow* pRow = aRows[ pTableTextNodeInfoInner->getRow() ];
     const SwWriteTableCell* pCell = &pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ];
-    const SwFrmFmt* pCellFmt = pCell->GetBox()->GetFrmFmt();
+    const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat();
     const SfxPoolItem* pItem;
 
     // vertical merges
@@ -771,8 +771,8 @@ void RtfAttributeOutput::TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t
         m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CLVMRG);
 
     // vertical alignment
-    if (pCellFmt->GetAttrSet().HasItem(RES_VERT_ORIENT, &pItem))
-        switch (static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient())
+    if (pCellFormat->GetAttrSet().HasItem(RES_VERT_ORIENT, &pItem))
+        switch (static_cast<const SwFormatVertOrient*>(pItem)->GetVertOrient())
         {
         case text::VertOrientation::CENTER:
             m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CLVERTALC);
@@ -803,29 +803,29 @@ void RtfAttributeOutput::TableNodeInfoInner(ww8::WW8TableNodeInfoInner::Pointer_
 void RtfAttributeOutput::TableOrientation(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner)
 {
     const SwTable* pTable = pTableTextNodeInfoInner->getTable();
-    SwFrmFmt* pFmt = pTable->GetFrmFmt();
+    SwFrameFormat* pFormat = pTable->GetFrameFormat();
 
-    OStringBuffer aTblAdjust(OOO_STRING_SVTOOLS_RTF_TRQL);
-    switch (pFmt->GetHoriOrient().GetHoriOrient())
+    OStringBuffer aTableAdjust(OOO_STRING_SVTOOLS_RTF_TRQL);
+    switch (pFormat->GetHoriOrient().GetHoriOrient())
     {
     case text::HoriOrientation::CENTER:
-        aTblAdjust.setLength(0);
-        aTblAdjust.append(OOO_STRING_SVTOOLS_RTF_TRQC);
+        aTableAdjust.setLength(0);
+        aTableAdjust.append(OOO_STRING_SVTOOLS_RTF_TRQC);
         break;
     case text::HoriOrientation::RIGHT:
-        aTblAdjust.setLength(0);
-        aTblAdjust.append(OOO_STRING_SVTOOLS_RTF_TRQR);
+        aTableAdjust.setLength(0);
+        aTableAdjust.append(OOO_STRING_SVTOOLS_RTF_TRQR);
         break;
     case text::HoriOrientation::NONE:
     case text::HoriOrientation::LEFT_AND_WIDTH:
-        aTblAdjust.append(OOO_STRING_SVTOOLS_RTF_TRLEFT);
-        aTblAdjust.append((sal_Int32)pFmt->GetLRSpace().GetLeft());
+        aTableAdjust.append(OOO_STRING_SVTOOLS_RTF_TRLEFT);
+        aTableAdjust.append((sal_Int32)pFormat->GetLRSpace().GetLeft());
         break;
     default:
         break;
     }
 
-    m_aRowDefs.append(aTblAdjust.makeStringAndClear());
+    m_aRowDefs.append(aTableAdjust.makeStringAndClear());
 }
 
 void RtfAttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/)
@@ -854,14 +854,14 @@ void RtfAttributeOutput::InitTableHelper(ww8::WW8TableNodeInfoInner::Pointer_t p
     // Create the SwWriteTable instance to use col spans
     GetTablePageSize(pTableTextNodeInfoInner.get(), nPageSize, bRelBoxSize);
 
-    const SwFrmFmt* pFmt = pTable->GetFrmFmt();
-    const sal_uInt32 nTblSz = static_cast<sal_uInt32>(pFmt->GetFrmSize().GetWidth());
+    const SwFrameFormat* pFormat = pTable->GetFrameFormat();
+    const sal_uInt32 nTableSz = static_cast<sal_uInt32>(pFormat->GetFrmSize().GetWidth());
 
     const SwHTMLTableLayout* pLayout = pTable->GetHTMLTableLayout();
     if (pLayout && pLayout->IsExportable())
         m_pTableWrt.reset(new SwWriteTable(pTable, pLayout));
     else
-        m_pTableWrt.reset(new SwWriteTable(pTable, pTable->GetTabLines(), nPageSize, nTblSz, false));
+        m_pTableWrt.reset(new SwWriteTable(pTable, pTable->GetTabLines(), nPageSize, nTableSz, false));
 }
 
 void RtfAttributeOutput::StartTable(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/)
@@ -918,7 +918,7 @@ void RtfAttributeOutput::EndTableCell()
         m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_CELL);
 
     m_bTableCellOpen = false;
-    m_bTblAfterCell = true;
+    m_bTableAfterCell = true;
     m_bWroteCellInfo = false;
     if (m_aCells[m_nTableDepth] > 0)
         m_aCells[m_nTableDepth]--;
@@ -1069,7 +1069,7 @@ void RtfAttributeOutput::EndStyleProperties(bool /*bParProp*/)
     /* noop */
 }
 
-void RtfAttributeOutput::OutlineNumbering(sal_uInt8 nLvl, const SwNumFmt& /*rNFmt*/, const SwFmt& /*rFmt*/)
+void RtfAttributeOutput::OutlineNumbering(sal_uInt8 nLvl, const SwNumFormat& /*rNFormat*/, const SwFormat& /*rFormat*/)
 {
     if (nLvl >= WW8ListManager::nMaxLevel)
         nLvl = WW8ListManager::nMaxLevel - 1;
@@ -1140,9 +1140,9 @@ void RtfAttributeOutput::SectionTitlePage()
      */
 }
 
-void RtfAttributeOutput::SectionPageBorders(const SwFrmFmt* pFmt, const SwFrmFmt* /*pFirstPageFmt*/)
+void RtfAttributeOutput::SectionPageBorders(const SwFrameFormat* pFormat, const SwFrameFormat* /*pFirstPageFormat*/)
 {
-    const SvxBoxItem& rBox = pFmt->GetBox();
+    const SvxBoxItem& rBox = pFormat->GetBox();
     const editeng::SvxBorderLine* pLine = rBox.GetTop();
     if (pLine)
         m_aSectionBreaks.append(OutBorderLine(m_rExport, pLine,
@@ -1451,19 +1451,19 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel,
         m_rExport.Strm().WriteChar('}');
 }
 
-void RtfAttributeOutput::WriteField_Impl(const SwField* pFld, ww::eField /*eType*/, const OUString& rFldCmd, sal_uInt8 /*nMode*/)
+void RtfAttributeOutput::WriteField_Impl(const SwField* pField, ww::eField /*eType*/, const OUString& rFieldCmd, sal_uInt8 /*nMode*/)
 {
     // If there are no field instructions, don't export it as a field.
-    bool bHasInstructions = !rFldCmd.isEmpty();
+    bool bHasInstructions = !rFieldCmd.isEmpty();
     if (bHasInstructions)
     {
         m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_FIELD);
         m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST " ");
-        m_aRunText->append(msfilter::rtfutil::OutString(rFldCmd, m_rExport.eCurrentEncoding));
+        m_aRunText->append(msfilter::rtfutil::OutString(rFieldCmd, m_rExport.eCurrentEncoding));
         m_aRunText->append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
     }
-    if (pFld)
-        m_aRunText->append(msfilter::rtfutil::OutString(pFld->ExpandField(true), m_rExport.eDefaultEncoding));
+    if (pField)
+        m_aRunText->append(msfilter::rtfutil::OutString(pField->ExpandField(true), m_rExport.eDefaultEncoding));
     if (bHasInstructions)
         m_aRunText->append("}}");
 }
@@ -1529,7 +1529,7 @@ void RtfAttributeOutput::WriteAnnotationMarks_Impl(std::vector< OUString >& rSta
     rEnds.clear();
 }
 
-void RtfAttributeOutput::WriteHeaderFooter_Impl(const SwFrmFmt& rFmt, bool bHeader, const sal_Char* pStr, bool bTitlepg)
+void RtfAttributeOutput::WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bool bHeader, const sal_Char* pStr, bool bTitlepg)
 {
     OStringBuffer aSectionBreaks = m_aSectionBreaks;
     m_aSectionBreaks.setLength(0);
@@ -1543,7 +1543,7 @@ void RtfAttributeOutput::WriteHeaderFooter_Impl(const SwFrmFmt& rFmt, bool bHead
     m_aSectionHeaders.append('{');
     m_aSectionHeaders.append(pStr);
     m_bBufferSectionHeaders = true;
-    m_rExport.WriteHeaderFooterText(rFmt, bHeader);
+    m_rExport.WriteHeaderFooterText(rFormat, bHeader);
     m_bBufferSectionHeaders = false;
     m_aSectionHeaders.append('}');
 
@@ -1551,9 +1551,9 @@ void RtfAttributeOutput::WriteHeaderFooter_Impl(const SwFrmFmt& rFmt, bool bHead
     m_aRun = aRun;
 }
 
-void lcl_TextFrameShadow(std::vector< std::pair<OString, OString> >& rFlyProperties, const SwFrmFmt& rFrmFmt)
+void lcl_TextFrameShadow(std::vector< std::pair<OString, OString> >& rFlyProperties, const SwFrameFormat& rFrameFormat)
 {
-    SvxShadowItem aShadowItem = rFrmFmt.GetShadow();
+    SvxShadowItem aShadowItem = rFrameFormat.GetShadow();
     if (aShadowItem.GetLocation() == SVX_SHADOW_NONE)
         return;
 
@@ -1595,9 +1595,9 @@ void lcl_TextFrameShadow(std::vector< std::pair<OString, OString> >& rFlyPropert
         rFlyProperties.push_back(std::make_pair<OString, OString>("shadowOffsetY", OString(aOffsetY)));
 }
 
-void lcl_TextFrameRelativeSize(std::vector< std::pair<OString, OString> >& rFlyProperties, const SwFrmFmt& rFrmFmt)
+void lcl_TextFrameRelativeSize(std::vector< std::pair<OString, OString> >& rFlyProperties, const SwFrameFormat& rFrameFormat)
 {
-    const SwFmtFrmSize& rSize = rFrmFmt.GetFrmSize();
+    const SwFormatFrmSize& rSize = rFrameFormat.GetFrmSize();
 
     // Relative size of the Text Frame.
     if (rSize.GetWidthPercent())
@@ -1667,8 +1667,8 @@ void RtfAttributeOutput::writeTextFrame(const sw::Frame& rFrame, bool bTextBox)
         m_bSingleEmptyRun = false;
         m_rExport.bRTFFlySyntax = true;
 
-        const SwFrmFmt& rFrmFmt = rFrame.GetFrmFmt();
-        const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
+        const SwFrameFormat& rFrameFormat = rFrame.GetFrameFormat();
+        const SwNodeIndex* pNodeIndex = rFrameFormat.GetContent().GetContentIdx();
         sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1                  : 0;
         sal_uLong nEnd = pNodeIndex ? pNodeIndex->GetNode().EndOfSectionIndex() : 0;
         m_rExport.SaveData(nStt, nEnd);
@@ -1708,10 +1708,10 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const sw::Frame& rFrame, const Poin
 
     switch (rFrame.GetWriterType())
     {
-    case sw::Frame::eTxtBox:
+    case sw::Frame::eTextBox:
     {
         // If this is a TextBox of a shape, then ignore: it's handled in RtfSdrExport::StartShape().
-        if (m_rExport.SdrExporter().isTextBox(rFrame.GetFrmFmt()))
+        if (m_rExport.SdrExporter().isTextBox(rFrame.GetFrameFormat()))
             break;
 
         OSL_ENSURE(m_aRunText.getLength() == 0, "m_aRunText is not empty");
@@ -1729,15 +1729,15 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const sw::Frame& rFrame, const Poin
         m_pFlyFrameSize = &aSize;
 
         m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = true;
-        m_rExport.OutputFormat(rFrame.GetFrmFmt(), false, false, true);
+        m_rExport.OutputFormat(rFrame.GetFrameFormat(), false, false, true);
         m_rExport.Strm().WriteCharPtr(m_aRunText.makeStringAndClear().getStr());
         m_rExport.Strm().WriteCharPtr(m_aStyles.makeStringAndClear().getStr());
         m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = false;
         m_pFlyFrameSize = 0;
 
-        const SwFrmFmt& rFrmFmt = rFrame.GetFrmFmt();
-        lcl_TextFrameShadow(m_aFlyProperties, rFrmFmt);
-        lcl_TextFrameRelativeSize(m_aFlyProperties, rFrmFmt);
+        const SwFrameFormat& rFrameFormat = rFrame.GetFrameFormat();
+        lcl_TextFrameShadow(m_aFlyProperties, rFrameFormat);
+        lcl_TextFrameRelativeSize(m_aFlyProperties, rFrameFormat);
 
         for (size_t i = 0; i < m_aFlyProperties.size(); ++i)
         {
@@ -1763,20 +1763,20 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const sw::Frame& rFrame, const Poin
         {
             m_rExport.m_pParentFrame = &rFrame;
             m_rExport.bRTFFlySyntax = true;
-            m_rExport.OutputFormat(rFrame.GetFrmFmt(), false, false, true);
+            m_rExport.OutputFormat(rFrame.GetFrameFormat(), false, false, true);
             m_rExport.bRTFFlySyntax = false;
             m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE);
-            m_rExport.OutputFormat(rFrame.GetFrmFmt(), false, false, true);
+            m_rExport.OutputFormat(rFrame.GetFrameFormat(), false, false, true);
             m_aRunText->append('}');
             m_rExport.m_pParentFrame = NULL;
         }
 
         if (pGrfNode)
-            m_aRunText.append(dynamic_cast<const SwFlyFrmFmt*>(&rFrame.GetFrmFmt()), pGrfNode);
+            m_aRunText.append(dynamic_cast<const SwFlyFrameFormat*>(&rFrame.GetFrameFormat()), pGrfNode);
         break;
     case sw::Frame::eDrawing:
     {
-        const SdrObject* pSdrObj = rFrame.GetFrmFmt().FindRealSdrObject();
+        const SdrObject* pSdrObj = rFrame.GetFrameFormat().FindRealSdrObject();
         if (pSdrObj)
         {
             bool bSwapInPage = false;
@@ -1810,8 +1810,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const sw::Frame& rFrame, const Poin
     break;
     case sw::Frame::eFormControl:
     {
-        const SwFrmFmt& rFrmFmt = rFrame.GetFrmFmt();
-        const SdrObject* pObject = rFrmFmt.FindRealSdrObject();
+        const SwFrameFormat& rFrameFormat = rFrame.GetFrameFormat();
+        const SdrObject* pObject = rFrameFormat.FindRealSdrObject();
 
         m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_FIELD);
         m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST);
@@ -2010,13 +2010,13 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const sw::Frame& rFrame, const Poin
     break;
     case sw::Frame::eOle:
     {
-        const SwFrmFmt& rFrmFmt = rFrame.GetFrmFmt();
-        const SdrObject* pSdrObj = rFrmFmt.FindRealSdrObject();
+        const SwFrameFormat& rFrameFormat = rFrame.GetFrameFormat();
+        const SdrObject* pSdrObj = rFrameFormat.FindRealSdrObject();
         if (pSdrObj)
         {
-            SwNodeIndex aIdx(*rFrmFmt.GetCntnt().GetCntntIdx(), 1);
+            SwNodeIndex aIdx(*rFrameFormat.GetContent().GetContentIdx(), 1);
             SwOLENode& rOLENd = *aIdx.GetNode().GetOLENode();
-            FlyFrameOLE(dynamic_cast<const SwFlyFrmFmt*>(&rFrmFmt), rOLENd, rFrame.GetLayoutSize());
+            FlyFrameOLE(dynamic_cast<const SwFlyFrameFormat*>(&rFrameFormat), rOLENd, rFrame.GetLayoutSize());
         }
     }
     break;
@@ -2484,16 +2484,16 @@ void RtfAttributeOutput::CharHighlight(const SvxBrushItem& rBrush)
     }
 }
 
-void RtfAttributeOutput::TextINetFormat(const SwFmtINetFmt& rURL)
+void RtfAttributeOutput::TextINetFormat(const SwFormatINetFormat& rURL)
 {
     if (!rURL.GetValue().isEmpty())
     {
-        const SwCharFmt* pFmt;
-        const SwTxtINetFmt* pTxtAtr = rURL.GetTxtINetFmt();
+        const SwCharFormat* pFormat;
+        const SwTextINetFormat* pTextAtr = rURL.GetTextINetFormat();
 
-        if (pTxtAtr && 0 != (pFmt = pTxtAtr->GetCharFmt()))
+        if (pTextAtr && 0 != (pFormat = pTextAtr->GetCharFormat()))
         {
-            sal_uInt16 nStyle = m_rExport.GetId(pFmt);
+            sal_uInt16 nStyle = m_rExport.GetId(pFormat);
             OString* pString = m_rExport.GetStyle(nStyle);
             if (pString)
                 m_aStyles.append(*pString);
@@ -2501,9 +2501,9 @@ void RtfAttributeOutput::TextINetFormat(const SwFmtINetFmt& rURL)
     }
 }
 
-void RtfAttributeOutput::TextCharFormat(const SwFmtCharFmt& rCharFmt)
+void RtfAttributeOutput::TextCharFormat(const SwFormatCharFormat& rCharFormat)
 {
-    sal_uInt16 nStyle = m_rExport.GetId(rCharFmt.GetCharFmt());
+    sal_uInt16 nStyle = m_rExport.GetId(rCharFormat.GetCharFormat());
     m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CS);
     m_aStyles.append((sal_Int32)nStyle);
     OString* pString = m_rExport.GetStyle(nStyle);
@@ -2511,7 +2511,7 @@ void RtfAttributeOutput::TextCharFormat(const SwFmtCharFmt& rCharFmt)
         m_aStyles.append(*pString);
 }
 
-void RtfAttributeOutput::WriteTextFootnoteNumStr(const SwFmtFtn& rFootnote)
+void RtfAttributeOutput::WriteTextFootnoteNumStr(const SwFormatFootnote& rFootnote)
 {
     if (rFootnote.GetNumStr().isEmpty())
         m_aRun->append(OOO_STRING_SVTOOLS_RTF_CHFTN);
@@ -2519,7 +2519,7 @@ void RtfAttributeOutput::WriteTextFootnoteNumStr(const SwFmtFtn& rFootnote)
         m_aRun->append(msfilter::rtfutil::OutString(rFootnote.GetNumStr(), m_rExport.eCurrentEncoding));
 }
 
-void RtfAttributeOutput::TextFootnote_Impl(const SwFmtFtn& rFootnote)
+void RtfAttributeOutput::TextFootnote_Impl(const SwFormatFootnote& rFootnote)
 {
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
 
@@ -2536,7 +2536,7 @@ void RtfAttributeOutput::TextFootnote_Impl(const SwFmtFtn& rFootnote)
      * 1) Reset, then later restore the contents of our run buffer and run state.
      * 2) Buffer the output of the whole paragraph, as we do so for section headers already.
      */
-    const SwNodeIndex* pIndex = rFootnote.GetTxtFtn()->GetStartNode();
+    const SwNodeIndex* pIndex = rFootnote.GetTextFootnote()->GetStartNode();
     RtfStringBuffer aRun = m_aRun;
     m_aRun.clear();
     bool bInRunOrig = m_bInRun;
@@ -2590,7 +2590,7 @@ void RtfAttributeOutput::ParaAdjust(const SvxAdjustItem& rAdjust)
     }
 }
 
-void RtfAttributeOutput::ParaSplit(const SvxFmtSplitItem& rSplit)
+void RtfAttributeOutput::ParaSplit(const SvxFormatSplitItem& rSplit)
 {
     if (!rSplit.GetValue())
         m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KEEP);
@@ -2606,7 +2606,7 @@ void RtfAttributeOutput::ParaWidows(const SvxWidowsItem& rWidows)
 
 void RtfAttributeOutput::ParaTabStop(const SvxTabStopItem& rTabStop)
 {
-    long nOffset = static_cast<const SvxLRSpaceItem&>(m_rExport.GetItem(RES_LR_SPACE)).GetTxtLeft();
+    long nOffset = static_cast<const SvxLRSpaceItem&>(m_rExport.GetItem(RES_LR_SPACE)).GetTextLeft();
     for (sal_uInt16 n = 0; n < rTabStop.Count(); n++)
     {
         const SvxTabStop& rTS = rTabStop[ n ];
@@ -2670,22 +2670,22 @@ void RtfAttributeOutput::ParaHyphenZone(const SvxHyphenZoneItem& rHyphenZone)
     m_aStyles.append(sal_Int32(rHyphenZone.IsHyphen()));
 }
 
-void RtfAttributeOutput::ParaNumRule_Impl(const SwTxtNode* pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId)
+void RtfAttributeOutput::ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId)
 {
-    if (USHRT_MAX == nNumId || 0 == nNumId || 0 == pTxtNd)
+    if (USHRT_MAX == nNumId || 0 == nNumId || 0 == pTextNd)
         return;
 
-    const SwNumRule* pRule = pTxtNd->GetNumRule();
+    const SwNumRule* pRule = pTextNd->GetNumRule();
 
-    if (pRule && pTxtNd->IsInList())
+    if (pRule && pTextNd->IsInList())
     {
-        SAL_WARN_IF(pTxtNd->GetActualListLevel() < 0 || pTxtNd->GetActualListLevel() >= MAXLEVEL, "sw.rtf", "text node does not have valid list level");
+        SAL_WARN_IF(pTextNd->GetActualListLevel() < 0 || pTextNd->GetActualListLevel() >= MAXLEVEL, "sw.rtf", "text node does not have valid list level");
 
-        const SwNumFmt* pFmt = pRule->GetNumFmt(nLvl);
-        if (!pFmt)
-            pFmt = &pRule->Get(nLvl);
+        const SwNumFormat* pFormat = pRule->GetNumFormat(nLvl);
+        if (!pFormat)
+            pFormat = &pRule->Get(nLvl);
 
-        const SfxItemSet& rNdSet = pTxtNd->GetSwAttrSet();
+        const SfxItemSet& rNdSet = pTextNd->GetSwAttrSet();
 
         m_aStyles.append('{');
         m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LISTTEXT);
@@ -2694,30 +2694,30 @@ void RtfAttributeOutput::ParaNumRule_Impl(const SwTxtNode* pTxtNd, sal_Int32 nLv
         m_aStyles.append(' ');
 
         SvxLRSpaceItem aLR(static_cast<const SvxLRSpaceItem&>(rNdSet.Get(RES_LR_SPACE)));
-        aLR.SetTxtLeft(aLR.GetTxtLeft() + pFmt->GetIndentAt());
-        aLR.SetTxtFirstLineOfst(pFmt->GetFirstLineOffset());
+        aLR.SetTextLeft(aLR.GetTextLeft() + pFormat->GetIndentAt());
+        aLR.SetTextFirstLineOfst(pFormat->GetFirstLineOffset());
 
-        sal_uInt16 nStyle = m_rExport.GetId(pFmt->GetCharFmt());
+        sal_uInt16 nStyle = m_rExport.GetId(pFormat->GetCharFormat());
         OString* pString = m_rExport.GetStyle(nStyle);
         if (pString)
             m_aStyles.append(*pString);
 
         {
-            OUString sTxt;
-            if (SVX_NUM_CHAR_SPECIAL == pFmt->GetNumberingType() || SVX_NUM_BITMAP == pFmt->GetNumberingType())
-                sTxt = OUString(pFmt->GetBulletChar());
+            OUString sText;
+            if (SVX_NUM_CHAR_SPECIAL == pFormat->GetNumberingType() || SVX_NUM_BITMAP == pFormat->GetNumberingType())
+                sText = OUString(pFormat->GetBulletChar());
             else
-                sTxt = pTxtNd->GetNumString();
+                sText = pTextNd->GetNumString();
 
-            if (!sTxt.isEmpty())
+            if (!sText.isEmpty())
             {
                 m_aStyles.append(' ');
-                m_aStyles.append(msfilter::rtfutil::OutString(sTxt, m_rExport.eDefaultEncoding));
+                m_aStyles.append(msfilter::rtfutil::OutString(sText, m_rExport.eDefaultEncoding));
             }
 
             if (OUTLINE_RULE != pRule->GetRuleType())
             {
-                if (!sTxt.isEmpty())
+                if (!sText.isEmpty())
                     m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB);
                 m_aStyles.append('}');
                 m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL);
@@ -2789,7 +2789,7 @@ void RtfAttributeOutput::ParaSnapToGrid(const SvxParaGridItem& /*rGrid*/)
     SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
 }
 
-void RtfAttributeOutput::FormatFrameSize(const SwFmtFrmSize& rSize)
+void RtfAttributeOutput::FormatFrameSize(const SwFormatFrmSize& rSize)
 {
     if (m_rExport.m_bOutPageDescs)
     {
@@ -2829,15 +2829,15 @@ void RtfAttributeOutput::FormatLRSpace(const SvxLRSpaceItem& rLRSpace)
         else
         {
             m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LI);
-            m_aStyles.append((sal_Int32) rLRSpace.GetTxtLeft());
+            m_aStyles.append((sal_Int32) rLRSpace.GetTextLeft());
             m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RI);
             m_aStyles.append((sal_Int32) rLRSpace.GetRight());
             m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LIN);
-            m_aStyles.append((sal_Int32) rLRSpace.GetTxtLeft());
+            m_aStyles.append((sal_Int32) rLRSpace.GetTextLeft());
             m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RIN);
             m_aStyles.append((sal_Int32) rLRSpace.GetRight());
             m_aStyles.append(OOO_STRING_SVTOOLS_RTF_FI);
-            m_aStyles.append((sal_Int32) rLRSpace.GetTxtFirstLineOfst());
+            m_aStyles.append((sal_Int32) rLRSpace.GetTextFirstLineOfst());
         }
     }
     else if (m_rExport.bRTFFlySyntax)
@@ -2902,7 +2902,7 @@ void RtfAttributeOutput::FormatULSpace(const SvxULSpaceItem& rULSpace)
     }
 }
 
-void RtfAttributeOutput::FormatSurround(const SwFmtSurround& rSurround)
+void RtfAttributeOutput::FormatSurround(const SwFormatSurround& rSurround)
 {
     if (m_rExport.m_bOutFlyFrmAttrs && !m_rExport.bRTFFlySyntax)
     {
@@ -2916,7 +2916,7 @@ void RtfAttributeOutput::FormatSurround(const SwFmtSurround& rSurround)
     }
     else if (m_rExport.m_bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax)
     {
-        // See DocxSdrExport::startDMLAnchorInline() for SwFmtSurround -> WR / WRK mappings.
+        // See DocxSdrExport::startDMLAnchorInline() for SwFormatSurround -> WR / WRK mappings.
         sal_Int32 nWr = -1;
         boost::optional<sal_Int32> oWrk;
         switch (rSurround.GetValue())
@@ -2951,7 +2951,7 @@ void RtfAttributeOutput::FormatSurround(const SwFmtSurround& rSurround)
     }
 }
 
-void RtfAttributeOutput::FormatVertOrientation(const SwFmtVertOrient& rFlyVert)
+void RtfAttributeOutput::FormatVertOrientation(const SwFormatVertOrient& rFlyVert)
 {
     if (m_rExport.m_bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax)
     {
@@ -2994,7 +2994,7 @@ void RtfAttributeOutput::FormatVertOrientation(const SwFmtVertOrient& rFlyVert)
     }
 }
 
-void RtfAttributeOutput::FormatHorizOrientation(const SwFmtHoriOrient& rFlyHori)
+void RtfAttributeOutput::FormatHorizOrientation(const SwFormatHoriOrient& rFlyHori)
 {
     if (m_rExport.m_bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax)
     {
@@ -3034,7 +3034,7 @@ void RtfAttributeOutput::FormatHorizOrientation(const SwFmtHoriOrient& rFlyHori)
     }
 }
 
-void RtfAttributeOutput::FormatAnchor(const SwFmtAnchor& rAnchor)
+void RtfAttributeOutput::FormatAnchor(const SwFormatAnchor& rAnchor)
 {
     if (!m_rExport.bRTFFlySyntax)
     {
@@ -3186,7 +3186,7 @@ void RtfAttributeOutput::FormatBox(const SvxBoxItem& rBox)
         m_aStyles.append(m_aSectionBreaks.makeStringAndClear());
 }
 
-void RtfAttributeOutput::FormatColumns_Impl(sal_uInt16 nCols, const SwFmtCol& rCol, bool bEven, SwTwips nPageSize)
+void RtfAttributeOutput::FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol, bool bEven, SwTwips nPageSize)
 {
     m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_COLS);
     m_rExport.OutLong(nCols);
@@ -3217,7 +3217,7 @@ void RtfAttributeOutput::FormatColumns_Impl(sal_uInt16 nCols, const SwFmtCol& rC
     }
 }
 
-void RtfAttributeOutput::FormatKeep(const SvxFmtKeepItem& rItem)
+void RtfAttributeOutput::FormatKeep(const SvxFormatKeepItem& rItem)
 {
     if (rItem.GetValue())
         m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KEEPN);
@@ -3228,7 +3228,7 @@ void RtfAttributeOutput::FormatTextGrid(const SwTextGridItem& /*rGrid*/)
     SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
 }
 
-void RtfAttributeOutput::FormatLineNumbering(const SwFmtLineNumber& rNumbering)
+void RtfAttributeOutput::FormatLineNumbering(const SwFormatLineNumber& rNumbering)
 {
     if (!rNumbering.IsCount())
         m_aStyles.append(OOO_STRING_SVTOOLS_RTF_NOLINE);
@@ -3257,59 +3257,59 @@ void RtfAttributeOutput::ParaOutlineLevel(const SfxUInt16Item& /*rItem*/)
 {
 }
 
-void RtfAttributeOutput::WriteExpand(const SwField* pFld)
+void RtfAttributeOutput::WriteExpand(const SwField* pField)
 {
     OUString sCmd;        // for optional Parameters
-    switch (pFld->GetTyp()->Which())
+    switch (pField->GetTyp()->Which())
     {
     //#i119803# Export user field and DB field for RTF filter
     case RES_DBFLD:
         sCmd = FieldString(ww::eMERGEFIELD);
     // no break !!
     case RES_USERFLD:
-        sCmd += pFld->GetTyp()->GetName();
-        m_rExport.OutputField(pFld, ww::eNONE, sCmd);
+        sCmd += pField->GetTyp()->GetName();
+        m_rExport.OutputField(pField, ww::eNONE, sCmd);
         break;
     default:
-        m_rExport.OutputField(pFld, ww::eUNKNOWN, sCmd);
+        m_rExport.OutputField(pField, ww::eUNKNOWN, sCmd);
         break;
     }
 }
 
-void RtfAttributeOutput::RefField(const SwField& /*rFld*/, const OUString& /*rRef*/)
+void RtfAttributeOutput::RefField(const SwField& /*rField*/, const OUString& /*rRef*/)
 {
     SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
 }
 
-void RtfAttributeOutput::HiddenField(const SwField& /*rFld*/)
+void RtfAttributeOutput::HiddenField(const SwField& /*rField*/)
 {
     SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
 }
 
-void RtfAttributeOutput::SetField(const SwField& /*rFld*/, ww::eField /*eType*/, const OUString& /*rCmd*/)
+void RtfAttributeOutput::SetField(const SwField& /*rField*/, ww::eField /*eType*/, const OUString& /*rCmd*/)
 {
     SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
 }
 
-void RtfAttributeOutput::PostitField(const SwField* pFld)
+void RtfAttributeOutput::PostitField(const SwField* pField)
 {
-    const SwPostItField& rPFld = *static_cast<const SwPostItField*>(pFld);
+    const SwPostItField& rPField = *static_cast<const SwPostItField*>(pField);
 
-    OString aName = OUStringToOString(rPFld.GetName(), RTL_TEXTENCODING_UTF8);
+    OString aName = OUStringToOString(rPField.GetName(), RTL_TEXTENCODING_UTF8);
     std::map<OString, sal_uInt16>::iterator it = m_rOpenedAnnotationMarksIds.find(aName);
     if (it != m_rOpenedAnnotationMarksIds.end())
     {
         // In case this field is inside annotation marks, we want to write the
         // annotation itself after the annotation mark is closed, not here.
-        m_aPostitFields[it->second] = &rPFld;
+        m_aPostitFields[it->second] = &rPField;
         return;
     }
 
     m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_ATNID " ");
-    m_aRunText->append(OUStringToOString(OUString(rPFld.GetInitials()), m_rExport.eCurrentEncoding));
+    m_aRunText->append(OUStringToOString(OUString(rPField.GetInitials()), m_rExport.eCurrentEncoding));
     m_aRunText->append("}");
     m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_ATNAUTHOR " ");
-    m_aRunText->append(OUStringToOString(OUString(rPFld.GetPar1()), m_rExport.eCurrentEncoding));
+    m_aRunText->append(OUStringToOString(OUString(rPField.GetPar1()), m_rExport.eCurrentEncoding));
     m_aRunText->append("}");
     m_aRunText->append(OOO_STRING_SVTOOLS_RTF_CHATN);
 
@@ -3322,13 +3322,13 @@ void RtfAttributeOutput::PostitField(const SwField* pFld)
         m_aRunText->append('}');
     }
     m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_ATNDATE " ");
-    m_aRunText->append((sal_Int32)sw::ms::DateTime2DTTM(rPFld.GetDateTime()));
+    m_aRunText->append((sal_Int32)sw::ms::DateTime2DTTM(rPField.GetDateTime()));
     m_aRunText->append('}');
-    m_aRunText->append(OUStringToOString(OUString(rPFld.GetTxt()), m_rExport.eCurrentEncoding));
+    m_aRunText->append(OUStringToOString(OUString(rPField.GetText()), m_rExport.eCurrentEncoding));
     m_aRunText->append('}');
 }
 
-bool RtfAttributeOutput::DropdownField(const SwField* /*pFld*/)
+bool RtfAttributeOutput::DropdownField(const SwField* /*pField*/)
 {
     // this is handled in OutputFlyFrame_Impl()
     return true;
@@ -3351,7 +3351,7 @@ RtfAttributeOutput::RtfAttributeOutput(RtfExport& rExport)
       m_nCurrentAnnotationMarkId(-1),
       m_bTableCellOpen(false),
       m_nTableDepth(0),
-      m_bTblAfterCell(false),
+      m_bTableAfterCell(false),
       m_nColBreakNeeded(false),
       m_bBufferSectionBreaks(false),
       m_bBufferSectionHeaders(false),
@@ -3536,7 +3536,7 @@ static void lcl_AppendSP(OStringBuffer& rBuffer,
     rBuffer.append("}}");
 }
 
-static OString ExportPICT(const SwFlyFrmFmt* pFlyFrmFmt, const Size& rOrig, const Size& rRendered, const Size& rMapped,
+static OString ExportPICT(const SwFlyFrameFormat* pFlyFrameFormat, const Size& rOrig, const Size& rRendered, const Size& rMapped,
                           const SwCropGrf& rCr, const char* pBLIPType, const sal_uInt8* pGraphicAry,
                           unsigned long nSize, const RtfExport& rExport, SvStream* pStream = 0, bool bWritePicProp = true)
 {
@@ -3547,14 +3547,14 @@ static OString ExportPICT(const SwFlyFrmFmt* pFlyFrmFmt, const Size& rOrig, cons
 
         aRet.append("{" OOO_STRING_SVTOOLS_RTF_PICT);
 
-        if (pFlyFrmFmt && bWritePicProp)
+        if (pFlyFrameFormat && bWritePicProp)
         {
-            OUString sDescription = pFlyFrmFmt->GetObjDescription();
+            OUString sDescription = pFlyFrameFormat->GetObjDescription();
             //write picture properties - wzDescription at first
             //looks like: "{\*\picprop{\sp{\sn PropertyName}{\sv PropertyValue}}}"
             aRet.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_PICPROP);  //"{\*\picprop
             lcl_AppendSP(aRet, "wzDescription", sDescription, rExport);
-            OUString sName = pFlyFrmFmt->GetObjTitle();
+            OUString sName = pFlyFrameFormat->GetObjTitle();
             lcl_AppendSP(aRet, "wzName", sName, rExport);
             aRet.append("}");   //"}"
         }
@@ -3614,7 +3614,7 @@ static OString ExportPICT(const SwFlyFrmFmt* pFlyFrmFmt, const Size& rOrig, cons
     return aRet.makeStringAndClear();
 }
 
-void RtfAttributeOutput::FlyFrameOLEReplacement(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize)
+void RtfAttributeOutput::FlyFrameOLEReplacement(const SwFlyFrameFormat* pFlyFrameFormat, SwOLENode& rOLENode, const Size& rSize)
 {
     m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPPICT);
     Size aSize(rOLENode.GetTwipSize());
@@ -3632,7 +3632,7 @@ void RtfAttributeOutput::FlyFrameOLEReplacement(const SwFlyFrmFmt* pFlyFrmFmt, S
     aStream.Seek(STREAM_SEEK_TO_END);
     sal_uInt32 nSize = aStream.Tell();
     pGraphicAry = static_cast<sal_uInt8 const*>(aStream.GetData());
-    m_aRunText->append(ExportPICT(pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport));
+    m_aRunText->append(ExportPICT(pFlyFrameFormat, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport));
     m_aRunText->append("}"); // shppict
     m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_NONSHPPICT);
     pBLIPType = OOO_STRING_SVTOOLS_RTF_WMETAFILE;
@@ -3642,11 +3642,11 @@ void RtfAttributeOutput::FlyFrameOLEReplacement(const SwFlyFrmFmt* pFlyFrmFmt, S
     aWmfStream.Seek(STREAM_SEEK_TO_END);
     nSize = aWmfStream.Tell();
     pGraphicAry = static_cast<sal_uInt8 const*>(aWmfStream.GetData());
-    m_aRunText->append(ExportPICT(pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport));
+    m_aRunText->append(ExportPICT(pFlyFrameFormat, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport));
     m_aRunText->append("}"); // nonshppict
 }
 
-bool RtfAttributeOutput::FlyFrameOLEMath(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize)
+bool RtfAttributeOutput::FlyFrameOLEMath(const SwFlyFrameFormat* pFlyFrameFormat, SwOLENode& rOLENode, const Size& rSize)
 {
     uno::Reference <embed::XEmbeddedObject> xObj(const_cast<SwOLENode&>(rOLENode).GetOLEObj().GetOleRef());
     sal_Int64 nAspect = rOLENode.GetAspect();
@@ -3671,22 +3671,22 @@ bool RtfAttributeOutput::FlyFrameOLEMath(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENod
     m_aRunText->append(aBuf.makeStringAndClear());
     // Replacement graphic.
     m_aRunText->append("{" LO_STRING_SVTOOLS_RTF_MMATHPICT " ");
-    FlyFrameOLEReplacement(pFlyFrmFmt, rOLENode, rSize);
+    FlyFrameOLEReplacement(pFlyFrameFormat, rOLENode, rSize);
     m_aRunText->append("}"); // mmathPict
     m_aRunText->append("}"); // mmath
 
     return true;
 }
 
-void RtfAttributeOutput::FlyFrameOLE(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize)
+void RtfAttributeOutput::FlyFrameOLE(const SwFlyFrameFormat* pFlyFrameFormat, SwOLENode& rOLENode, const Size& rSize)
 {
-    if (FlyFrameOLEMath(pFlyFrmFmt, rOLENode, rSize))
+    if (FlyFrameOLEMath(pFlyFrameFormat, rOLENode, rSize))
         return;
 
-    FlyFrameOLEReplacement(pFlyFrmFmt, rOLENode, rSize);
+    FlyFrameOLEReplacement(pFlyFrameFormat, rOLENode, rSize);
 }
 
-void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode* pGrfNode)
+void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat, const SwGrfNode* pGrfNode)
 {
     SvMemoryStream aStream;
     const sal_uInt8* pGraphicAry = 0;
@@ -3757,14 +3757,14 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw
     Size aSize(pGrfNode->GetTwipSize());
     Size aRendered(aSize);
 
-    const SwFmtFrmSize& rS = pFlyFrmFmt->GetFrmSize();
+    const SwFormatFrmSize& rS = pFlyFrameFormat->GetFrmSize();
     aRendered.Width() = rS.GetWidth();
     aRendered.Height() = rS.GetHeight();
 
     sw::Frame* pFrame = 0;
     for (sw::FrameIter it = m_rExport.m_aFrames.begin(); it != m_rExport.m_aFrames.end(); ++it)
     {
-        if (pFlyFrmFmt == &it->GetFrmFmt())
+        if (pFlyFrameFormat == &it->GetFrameFormat())
         {
             pFrame = &(*it);
             break;
@@ -3789,20 +3789,20 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw
         m_pFlyFrameSize = &aRendered;
         m_rExport.m_pParentFrame = pFrame;
         m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = true;
-        m_rExport.OutputFormat(pFrame->GetFrmFmt(), false, false, true);
+        m_rExport.OutputFormat(pFrame->GetFrameFormat(), false, false, true);
         m_rExport.m_bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = false;
         m_rExport.m_pParentFrame = NULL;
         m_pFlyFrameSize = 0;
 
         std::vector< std::pair<OString, OString> > aFlyProperties;
         aFlyProperties.push_back(std::make_pair<OString, OString>("shapeType", OString::number(ESCHER_ShpInst_PictureFrame)));
-        aFlyProperties.push_back(std::make_pair<OString, OString>("wzDescription", msfilter::rtfutil::OutString(pFlyFrmFmt->GetObjDescription(), m_rExport.eCurrentEncoding)));
-        aFlyProperties.push_back(std::make_pair<OString, OString>("wzName", msfilter::rtfutil::OutString(pFlyFrmFmt->GetObjTitle(), m_rExport.eCurrentEncoding)));
+        aFlyProperties.push_back(std::make_pair<OString, OString>("wzDescription", msfilter::rtfutil::OutString(pFlyFrameFormat->GetObjDescription(), m_rExport.eCurrentEncoding)));
+        aFlyProperties.push_back(std::make_pair<OString, OString>("wzName", msfilter::rtfutil::OutString(pFlyFrameFormat->GetObjTitle(), m_rExport.eCurrentEncoding)));
 
         // If we have a wrap polygon, then handle that here.
-        if (pFlyFrmFmt->GetSurround().IsContour())
+        if (pFlyFrameFormat->GetSurround().IsContour())
         {
-            if (const SwNoTxtNode* pNd = sw::util::GetNoTxtNodeFromSwFrmFmt(*pFlyFrmFmt))
+            if (const SwNoTextNode* pNd = sw::util::GetNoTextNodeFromSwFrameFormat(*pFlyFrameFormat))
             {
                 const tools::PolyPolygon* pPolyPoly = pNd->HasContour();
                 if (pPolyPoly && pPolyPoly->Count())
@@ -3817,7 +3817,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw
         }
 
         // Below text, behind document, opaque: they all refer to the same thing.
-        if (!pFlyFrmFmt->GetOpaque().GetValue())
+        if (!pFlyFrameFormat->GetOpaque().GetValue())
             aFlyProperties.push_back(std::make_pair<OString, OString>("fBehindDocument", "1"));
 
         for (size_t i = 0; i < aFlyProperties.size(); ++i)
@@ -3834,7 +3834,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw
 
     bool bWritePicProp = !pFrame || pFrame->IsInline();
     if (pBLIPType)
-        ExportPICT(pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport, &m_rExport.Strm(), bWritePicProp);
+        ExportPICT(pFlyFrameFormat, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport, &m_rExport.Strm(), bWritePicProp);
     else
     {
         aStream.Seek(0);
@@ -3845,7 +3845,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw
         nSize = aStream.Tell();
         pGraphicAry = static_cast<sal_uInt8 const*>(aStream.GetData());
 
-        ExportPICT(pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport, &m_rExport.Strm(), bWritePicProp);
+        ExportPICT(pFlyFrameFormat, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport, &m_rExport.Strm(), bWritePicProp);
     }
 
     if (!pFrame || pFrame->IsInline())
@@ -3862,7 +3862,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw
             nSize = aStream.Tell();
             pGraphicAry = static_cast<sal_uInt8 const*>(aStream.GetData());
 
-            ExportPICT(pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport, &m_rExport.Strm());
+            ExportPICT(pFlyFrameFormat, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport, &m_rExport.Strm());
 
             m_rExport.Strm().WriteChar('}');
         }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index df92c2248009..d58b2caeb70a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -33,7 +33,7 @@
 
 class SwGrfNode;
 class SwOLENode;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
 
 /// The class that has handlers for various resource types when exporting as RTF
 class RtfAttributeOutput : public AttributeOutputBase
@@ -53,7 +53,7 @@ public:
     virtual void EmptyParagraph() SAL_OVERRIDE;
 
     /// Called in order to output section breaks.
-    virtual void SectionBreaks(const SwTxtNode& rNode) SAL_OVERRIDE;
+    virtual void SectionBreaks(const SwTextNode& rNode) SAL_OVERRIDE;
 
     /// Called before we start outputting the attributes.
     virtual void StartParagraphProperties() SAL_OVERRIDE;
@@ -87,7 +87,7 @@ public:
     virtual void RawText(const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet) SAL_OVERRIDE;
 
     /// Output ruby start.
-    virtual void StartRuby(const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby) SAL_OVERRIDE;
+    virtual void StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby) SAL_OVERRIDE;
 
     /// Output ruby end.
     virtual void EndRuby() SAL_OVERRIDE;
@@ -98,14 +98,14 @@ public:
     /// Output URL end.
     virtual bool EndURL(bool isAtEndOfParagraph) SAL_OVERRIDE;
 
-    virtual void FieldVanish(const OUString& rTxt, ww::eField eType) SAL_OVERRIDE;
+    virtual void FieldVanish(const OUString& rText, ww::eField eType) SAL_OVERRIDE;
 
     /// Output redlining.
     ///
     /// The common attribute that can be among the run properties.
     virtual void Redline(const SwRedlineData* pRedline) SAL_OVERRIDE;
 
-    virtual void FormatDrop(const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) SAL_OVERRIDE;
+    virtual void FormatDrop(const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) SAL_OVERRIDE;
 
     /// Output style.
     virtual void ParagraphStyle(sal_uInt16 nStyle) SAL_OVERRIDE;
@@ -151,7 +151,7 @@ public:
     virtual void EndStyleProperties(bool bParProp) SAL_OVERRIDE;
 
     /// Numbering rule and Id.
-    virtual void OutlineNumbering(sal_uInt8 nLvl, const SwNumFmt& rNFmt, const SwFmt& rFmt) SAL_OVERRIDE;
+    virtual void OutlineNumbering(sal_uInt8 nLvl, const SwNumFormat& rNFormat, const SwFormat& rFormat) SAL_OVERRIDE;
 
     /// Page break
     /// As a paragraph property - the paragraph should be on the next page.
@@ -177,7 +177,7 @@ public:
     virtual void SectionTitlePage() SAL_OVERRIDE;
 
     /// Description of the page borders.
-    virtual void SectionPageBorders(const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt) SAL_OVERRIDE;
+    virtual void SectionPageBorders(const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat) SAL_OVERRIDE;
 
     /// Columns populated from right/numbers on the right side?
     virtual void SectionBiDi(bool bBiDi) SAL_OVERRIDE;
@@ -213,14 +213,14 @@ public:
                                 const OUString& rNumberingString,
                                 const SvxBrushItem* pBrush = 0) SAL_OVERRIDE;//For i120928,to export graphic of bullet
 
-    void WriteField_Impl(const SwField* pFld, ww::eField eType, const OUString& rFldCmd, sal_uInt8 nMode);
+    void WriteField_Impl(const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode);
     void WriteBookmarks_Impl(std::vector< OUString >& rStarts, std::vector< OUString >& rEnds);
     void WriteAnnotationMarks_Impl(std::vector< OUString >& rStarts, std::vector< OUString >& rEnds);
-    void WriteHeaderFooter_Impl(const SwFrmFmt& rFmt, bool bHeader, const sal_Char* pStr, bool bTitlepg);
+    void WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bool bHeader, const sal_Char* pStr, bool bTitlepg);
 
 protected:
     /// Output frames - the implementation.
-    virtual void OutputFlyFrame_Impl(const sw::Frame& rFmt, const Point& rNdTopLeft) SAL_OVERRIDE;
+    virtual void OutputFlyFrame_Impl(const sw::Frame& rFormat, const Point& rNdTopLeft) SAL_OVERRIDE;
 
     /// Sfx item Sfx item RES_CHRATR_CASEMAP
     virtual void CharCaseMap(const SvxCaseMapItem& rCaseMap) SAL_OVERRIDE;
@@ -331,13 +331,13 @@ protected:
     virtual void CharHighlight(const SvxBrushItem&) SAL_OVERRIDE;
 
     /// Sfx item RES_TXTATR_INETFMT
-    virtual void TextINetFormat(const SwFmtINetFmt&) SAL_OVERRIDE;
+    virtual void TextINetFormat(const SwFormatINetFormat&) SAL_OVERRIDE;
 
     /// Sfx item RES_TXTATR_CHARFMT
-    virtual void TextCharFormat(const SwFmtCharFmt&) SAL_OVERRIDE;
+    virtual void TextCharFormat(const SwFormatCharFormat&) SAL_OVERRIDE;
 
     /// Sfx item RES_TXTATR_FTN
-    virtual void TextFootnote_Impl(const SwFmtFtn&) SAL_OVERRIDE;
+    virtual void TextFootnote_Impl(const SwFormatFootnote&) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_LINESPACING
     virtual void ParaLineSpacing_Impl(short nSpace, short nMulti) SAL_OVERRIDE;
@@ -346,7 +346,7 @@ protected:
     virtual void ParaAdjust(const SvxAdjustItem& rAdjust) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_SPLIT
-    virtual void ParaSplit(const SvxFmtSplitItem& rSplit) SAL_OVERRIDE;
+    virtual void ParaSplit(const SvxFormatSplitItem& rSplit) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_WIDOWS
     virtual void ParaWidows(const SvxWidowsItem& rWidows) SAL_OVERRIDE;
@@ -358,7 +358,7 @@ protected:
     virtual void ParaHyphenZone(const SvxHyphenZoneItem&) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_NUMRULE
-    virtual void ParaNumRule_Impl(const SwTxtNode* pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId) SAL_OVERRIDE;
+    virtual void ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_SCRIPTSPACE
     virtual void ParaScriptSpace(const SfxBoolItem&) SAL_OVERRIDE;
@@ -376,7 +376,7 @@ protected:
     virtual void ParaSnapToGrid(const SvxParaGridItem&) SAL_OVERRIDE;
 
     /// Sfx item RES_FRM_SIZE
-    virtual void FormatFrameSize(const SwFmtFrmSize&) SAL_OVERRIDE;
+    virtual void FormatFrameSize(const SwFormatFrmSize&) SAL_OVERRIDE;
 
     /// Sfx item RES_PAPER_BIN
     virtual void FormatPaperBin(const SvxPaperBinItem&) SAL_OVERRIDE;
@@ -388,16 +388,16 @@ protected:
     virtual void FormatULSpace(const SvxULSpaceItem& rULSpace) SAL_OVERRIDE;
 
     /// Sfx item RES_SURROUND
-    virtual void FormatSurround(const SwFmtSurround&) SAL_OVERRIDE;
+    virtual void FormatSurround(const SwFormatSurround&) SAL_OVERRIDE;
 
     /// Sfx item RES_VERT_ORIENT
-    virtual void FormatVertOrientation(const SwFmtVertOrient&) SAL_OVERRIDE;
+    virtual void FormatVertOrientation(const SwFormatVertOrient&) SAL_OVERRIDE;
 
     /// Sfx item RES_HORI_ORIENT
-    virtual void FormatHorizOrientation(const SwFmtHoriOrient&) SAL_OVERRIDE;
+    virtual void FormatHorizOrientation(const SwFormatHoriOrient&) SAL_OVERRIDE;
 
     /// Sfx item RES_ANCHOR
-    virtual void FormatAnchor(const SwFmtAnchor&) SAL_OVERRIDE;
+    virtual void FormatAnchor(const SwFormatAnchor&) SAL_OVERRIDE;
 
     /// Sfx item RES_BACKGROUND
     virtual void FormatBackground(const SvxBrushItem&) SAL_OVERRIDE;
@@ -412,16 +412,16 @@ protected:
     virtual void FormatBox(const SvxBoxItem&) SAL_OVERRIDE;
 
     /// Sfx item RES_COL
-    virtual void FormatColumns_Impl(sal_uInt16 nCols, const SwFmtCol& rCol, bool bEven, SwTwips nPageSize) SAL_OVERRIDE;
+    virtual void FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol, bool bEven, SwTwips nPageSize) SAL_OVERRIDE;
 
     /// Sfx item RES_KEEP
-    virtual void FormatKeep(const SvxFmtKeepItem&) SAL_OVERRIDE;
+    virtual void FormatKeep(const SvxFormatKeepItem&) SAL_OVERRIDE;
 
     /// Sfx item RES_TEXTGRID
     virtual void FormatTextGrid(const SwTextGridItem&) SAL_OVERRIDE;
 
     /// Sfx item RES_LINENUMBER
-    virtual void FormatLineNumbering(const SwFmtLineNumber&) SAL_OVERRIDE;
+    virtual void FormatLineNumbering(const SwFormatLineNumber&) SAL_OVERRIDE;
 
     /// Sfx item RES_FRAMEDIR
     virtual void FormatFrameDirection(const SvxFrameDirectionItem&) SAL_OVERRIDE;
@@ -436,14 +436,14 @@ protected:
     virtual void ParaOutlineLevel(const SfxUInt16Item&) SAL_OVERRIDE;
 
     /// Write the expanded field
-    virtual void WriteExpand(const SwField* pFld) SAL_OVERRIDE;
+    virtual void WriteExpand(const SwField* pField) SAL_OVERRIDE;
 
-    virtual void RefField(const SwField& rFld, const OUString& rRef) SAL_OVERRIDE;
-    virtual void HiddenField(const SwField& rFld) SAL_OVERRIDE;
-    virtual void SetField(const SwField& rFld, ww::eField eType, const OUString& rCmd) SAL_OVERRIDE;
-    virtual void PostitField(const SwField* pFld) SAL_OVERRIDE;
-    virtual bool DropdownField(const SwField* pFld) SAL_OVERRIDE;
-    virtual bool PlaceholderField(const SwField* pFld) SAL_OVERRIDE;
+    virtual void RefField(const SwField& rField, const OUString& rRef) SAL_OVERRIDE;
+    virtual void HiddenField(const SwField& rField) SAL_OVERRIDE;
+    virtual void SetField(const SwField& rField, ww::eField eType, const OUString& rCmd) SAL_OVERRIDE;
+    virtual void PostitField(const SwField* pField) SAL_OVERRIDE;
+    virtual bool DropdownField(const SwField* pField) SAL_OVERRIDE;
+    virtual bool PlaceholderField(const SwField* pField) SAL_OVERRIDE;
 
     /// Reference to the export, where to get the data from
     RtfExport& m_rExport;
@@ -451,11 +451,11 @@ protected:
 private:
 
     /// Output graphic fly frames.
-    void FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode* pGrfNode);
-    void FlyFrameOLE(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize);
-    void FlyFrameOLEReplacement(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize);
+    void FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat, const SwGrfNode* pGrfNode);
+    void FlyFrameOLE(const SwFlyFrameFormat* pFlyFrameFormat, SwOLENode& rOLENode, const Size& rSize);
+    void FlyFrameOLEReplacement(const SwFlyFrameFormat* pFlyFrameFormat, SwOLENode& rOLENode, const Size& rSize);
     /// Math export.
-    bool FlyFrameOLEMath(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize);
+    bool FlyFrameOLEMath(const SwFlyFrameFormat* pFlyFrameFormat, SwOLENode& rOLENode, const Size& rSize);
 
     /*
      * Table methods.
@@ -472,7 +472,7 @@ private:
     /// End cell, row, and even the entire table if necessary.
     void FinishTableRowCell(ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph = false);
 
-    void WriteTextFootnoteNumStr(const SwFmtFtn& rFootnote);
+    void WriteTextFootnoteNumStr(const SwFormatFootnote& rFootnote);
 
     /*
      * Current style name and its ID.
@@ -535,7 +535,7 @@ private:
     /*
      * Remember if we wrote a \cell or not.
      */
-    bool m_bTblAfterCell;
+    bool m_bTableAfterCell;
 
     /*
      * For late output of row definitions.
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 30f28648dafe..6c7da6aac393 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -103,7 +103,7 @@ bool RtfExport::CollapseScriptsforWordOk(sal_uInt16 nScript, sal_uInt16 nWhich)
     return true;
 }
 
-void RtfExport::AppendBookmarks(const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen)
+void RtfExport::AppendBookmarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen)
 {
     std::vector< OUString > aStarts;
     std::vector< OUString > aEnds;
@@ -140,7 +140,7 @@ void RtfExport::AppendBookmark(const OUString& rName, bool /*bSkip*/)
     m_pAttrOutput->WriteBookmarks_Impl(aStarts, aEnds);
 }
 
-void RtfExport::AppendAnnotationMarks(const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen)
+void RtfExport::AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen)
 {
     std::vector< OUString > aStarts;
     std::vector< OUString > aEnds;
@@ -167,7 +167,7 @@ void RtfExport::AppendAnnotationMarks(const SwTxtNode& rNode, sal_Int32 nAktPos,
 }
 
 //For i120928,to export graphic of bullet for RTF filter
-void RtfExport::ExportGrfBullet(const SwTxtNode&)
+void RtfExport::ExportGrfBullet(const SwTextNode&)
 {
     // Noop, would be too late, see WriteNumbering() instead.
 }
@@ -180,7 +180,7 @@ void RtfExport::WriteChar(sal_Unicode)
 static bool IsExportNumRule(const SwNumRule& rRule, sal_uInt8* pEnd = 0)
 {
     sal_uInt8 nEnd = MAXLEVEL;
-    while (nEnd-- && !rRule.GetNumFmt(nEnd))
+    while (nEnd-- && !rRule.GetNumFormat(nEnd))
         ;
     ++nEnd;
 
@@ -188,10 +188,10 @@ static bool IsExportNumRule(const SwNumRule& rRule, sal_uInt8* pEnd = 0)
 
     for (nLvl = 0; nLvl < nEnd; ++nLvl)
     {
-        const SwNumFmt* pNFmt = &rRule.Get(nLvl);
-        if (SVX_NUM_NUMBER_NONE != pNFmt->GetNumberingType() ||
-                !pNFmt->GetPrefix().isEmpty() ||
-                (!pNFmt->GetSuffix().isEmpty() && pNFmt->GetSuffix() != "."))
+        const SwNumFormat* pNFormat = &rRule.Get(nLvl);
+        if (SVX_NUM_NUMBER_NONE != pNFormat->GetNumberingType() ||
+                !pNFormat->GetPrefix().isEmpty() ||
+                (!pNFormat->GetSuffix().isEmpty() && pNFormat->GetSuffix() != "."))
             break;
     }
 
@@ -202,17 +202,17 @@ static bool IsExportNumRule(const SwNumRule& rRule, sal_uInt8* pEnd = 0)
 
 void RtfExport::BuildNumbering()
 {
-    const SwNumRuleTbl& rListTbl = m_pDoc->GetNumRuleTbl();
+    const SwNumRuleTable& rListTable = m_pDoc->GetNumRuleTable();
 
-    for (sal_uInt16 n = rListTbl.size()+1; n;)
+    for (sal_uInt16 n = rListTable.size()+1; n;)
     {
         SwNumRule* pRule;
         --n;
-        if (n == rListTbl.size())
+        if (n == rListTable.size())
             pRule = m_pDoc->GetOutlineNumRule();
         else
         {
-            pRule = rListTbl[ n ];
+            pRule = rListTable[ n ];
             if (!SwDoc::IsUsed(*pRule))
                 continue;
         }
@@ -226,7 +226,7 @@ void RtfExport::WriteNumbering()
 {
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
 
-    if (!m_pUsedNumTbl)
+    if (!m_pUsedNumTable)
         return; // no numbering is used
 
     Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LISTTABLE);
@@ -250,7 +250,7 @@ void RtfExport::WriteNumbering()
 
 void RtfExport::WriteRevTab()
 {
-    int nRevAuthors = m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
+    int nRevAuthors = m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size();
 
     if (nRevAuthors < 1)
         return;
@@ -258,16 +258,16 @@ void RtfExport::WriteRevTab()
     // RTF always seems to use Unknown as the default first entry
     GetRedline(OUString("Unknown"));
 
-    for (sal_uInt16 i = 0; i < m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); ++i)
+    for (sal_uInt16 i = 0; i < m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++i)
     {
-        const SwRangeRedline* pRedl = m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ i ];
+        const SwRangeRedline* pRedl = m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ i ];
 
         GetRedline(SW_MOD()->GetRedlineAuthor(pRedl->GetAuthor()));
     }
 
     // Now write the table
     Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_REVTBL).WriteChar(' ');
-    for (sal_uInt16 i = 0; i < m_aRedlineTbl.size(); ++i)
+    for (sal_uInt16 i = 0; i < m_aRedlineTable.size(); ++i)
     {
         const OUString* pAuthor = GetRedline(i);
         Strm().WriteChar('{');
@@ -279,32 +279,32 @@ void RtfExport::WriteRevTab()
 }
 
 void RtfExport::WriteHeadersFooters(sal_uInt8 nHeadFootFlags,
-                                    const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 /*nBreakCode*/)
+                                    const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 /*nBreakCode*/)
 {
     // headers
     if (nHeadFootFlags & nsHdFtFlags::WW8_HEADER_EVEN)
-        WriteHeaderFooter(rLeftFmt, true, OOO_STRING_SVTOOLS_RTF_HEADERL);
+        WriteHeaderFooter(rLeftFormat, true, OOO_STRING_SVTOOLS_RTF_HEADERL);
 
     if (nHeadFootFlags & nsHdFtFlags::WW8_HEADER_ODD)
-        WriteHeaderFooter(rFmt, true, OOO_STRING_SVTOOLS_RTF_HEADER);
+        WriteHeaderFooter(rFormat, true, OOO_STRING_SVTOOLS_RTF_HEADER);
 
     if (nHeadFootFlags & nsHdFtFlags::WW8_HEADER_FIRST)
-        WriteHeaderFooter(rFirstPageFmt, true, OOO_STRING_SVTOOLS_RTF_HEADERF, true);
+        WriteHeaderFooter(rFirstPageFormat, true, OOO_STRING_SVTOOLS_RTF_HEADERF, true);
 
     // footers
     if (nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_EVEN)
-        WriteHeaderFooter(rLeftFmt, false, OOO_STRING_SVTOOLS_RTF_FOOTERL);
+        WriteHeaderFooter(rLeftFormat, false, OOO_STRING_SVTOOLS_RTF_FOOTERL);
 
     if (nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_ODD)
-        WriteHeaderFooter(rFmt, false, OOO_STRING_SVTOOLS_RTF_FOOTER);
+        WriteHeaderFooter(rFormat, false, OOO_STRING_SVTOOLS_RTF_FOOTER);
 
     if (nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_FIRST)
-        WriteHeaderFooter(rFirstPageFmt, false, OOO_STRING_SVTOOLS_RTF_FOOTERF, true);
+        WriteHeaderFooter(rFirstPageFormat, false, OOO_STRING_SVTOOLS_RTF_FOOTERF, true);
 }
 
-void RtfExport::OutputField(const SwField* pFld, ww::eField eFldType, const OUString& rFldCmd, sal_uInt8 nMode)
+void RtfExport::OutputField(const SwField* pField, ww::eField eFieldType, const OUString& rFieldCmd, sal_uInt8 nMode)
 {
-    m_pAttrOutput->WriteField_Impl(pFld, eFldType, rFldCmd, nMode);
+    m_pAttrOutput->WriteField_Impl(pField, eFieldType, rFieldCmd, nMode);
 }
 
 void RtfExport::WriteFormData(const ::sw::mark::IFieldmark& /*rFieldmark*/)
@@ -326,12 +326,12 @@ void RtfExport::DoComboBox(const OUString& /*rName*/,
     // this is handled in RtfAttributeOutput::OutputFlyFrame_Impl
 }
 
-void RtfExport::DoFormText(const SwInputField* pFld)
+void RtfExport::DoFormText(const SwInputField* pField)
 {
-    OUString sResult = pFld->ExpandField(true);
-    OUString sHelp(pFld->GetHelp());
-    OUString sName = pFld->GetPar2();
-    OUString sStatus = pFld->GetToolTip();
+    OUString sResult = pField->ExpandField(true);
+    OUString sHelp(pField->GetHelp());
+    OUString sName = pField->GetPar2();
+    OUString sStatus = pField->GetToolTip();
     m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_FIELD "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST "{ FORMTEXT }");
     m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FORMFIELD " {" OOO_STRING_SVTOOLS_RTF_FFTYPE "0");
     if (!sHelp.isEmpty())
@@ -375,9 +375,9 @@ void RtfExport::WriteStyles()
 
 void RtfExport::WriteFootnoteSettings()
 {
-    const SwPageFtnInfo& rFtnInfo = m_pDoc->GetPageDesc(0).GetFtnInfo();
+    const SwPageFootnoteInfo& rFootnoteInfo = m_pDoc->GetPageDesc(0).GetFootnoteInfo();
     // Request a separator only in case the width is larger than zero.
-    bool bSeparator = double(rFtnInfo.GetWidth()) > 0;
+    bool bSeparator = double(rFootnoteInfo.GetWidth()) > 0;
 
     Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FTNSEP);
     if (bSeparator)
@@ -507,9 +507,9 @@ void RtfExport::ExportDocument_Impl()
 
     // Automatic hyphenation: it's a global setting in Word, it's a paragraph setting in Writer.
     // Use the setting from the default style.
-    SwTxtFmtColl* pTxtFmtColl = m_pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, /*bRegardLanguage=*/false);
+    SwTextFormatColl* pTextFormatColl = m_pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD, /*bRegardLanguage=*/false);
     const SfxPoolItem* pItem;
-    if (pTxtFmtColl && pTxtFmtColl->GetItemState(RES_PARATR_HYPHENZONE, false, &pItem) == SfxItemState::SET)
+    if (pTextFormatColl && pTextFormatColl->GetItemState(RES_PARATR_HYPHENZONE, false, &pItem) == SfxItemState::SET)
     {
         Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_HYPHAUTO);
         OutULong(int(static_cast<const SvxHyphenZoneItem*>(pItem)->IsHyphen()));
@@ -544,7 +544,7 @@ void RtfExport::ExportDocument_Impl()
         for (sal_uInt32 n = 0; n < nMaxItem; ++n)
         {
             const SvxProtectItem* pProtect = static_cast<const SvxProtectItem*>(rPool.GetItem2(RES_PROTECT, n));
-            if (pProtect && pProtect->IsCntntProtected())
+            if (pProtect && pProtect->IsContentProtected())
             {
                 Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FORMPROT);
                 break;
@@ -558,27 +558,27 @@ void RtfExport::ExportDocument_Impl()
     // size and empty margins of the page
     if (m_pDoc->GetPageDescCnt())
     {
-        // Seeking the first SwFmtPageDesc. If no set, the default is valid
-        const SwFmtPageDesc* pSttPgDsc = 0;
+        // Seeking the first SwFormatPageDesc. If no set, the default is valid
+        const SwFormatPageDesc* pSttPgDsc = 0;
         {
             const SwNode& rSttNd = *m_pDoc->GetNodes()[
                                        m_pDoc->GetNodes().GetEndOfExtras().GetIndex() + 2 ];
             const SfxItemSet* pSet = 0;
 
-            if (rSttNd.IsCntntNode())
-                pSet = &rSttNd.GetCntntNode()->GetSwAttrSet();
+            if (rSttNd.IsContentNode())
+                pSet = &rSttNd.GetContentNode()->GetSwAttrSet();
             else if (rSttNd.IsTableNode())
                 pSet = &rSttNd.GetTableNode()->GetTable().
-                       GetFrmFmt()->GetAttrSet();
+                       GetFrameFormat()->GetAttrSet();
 
             else if (rSttNd.IsSectionNode())
                 pSet = &rSttNd.GetSectionNode()->GetSection().
-                       GetFmt()->GetAttrSet();
+                       GetFormat()->GetAttrSet();
 
             if (pSet)
             {
                 size_t nPosInDoc;
-                pSttPgDsc = static_cast<const SwFmtPageDesc*>(&pSet->Get(RES_PAGEDESC));
+                pSttPgDsc = static_cast<const SwFormatPageDesc*>(&pSet->Get(RES_PAGEDESC));
                 if (!pSttPgDsc->GetPageDesc())
                     pSttPgDsc = 0;
                 else if (m_pDoc->FindPageDesc(pSttPgDsc->GetPageDesc()->GetName(), &nPosInDoc))
@@ -590,13 +590,13 @@ void RtfExport::ExportDocument_Impl()
         }
         const SwPageDesc& rPageDesc = pSttPgDsc ? *pSttPgDsc->GetPageDesc()
                                       : m_pDoc->GetPageDesc(0);
-        const SwFrmFmt& rFmtPage = rPageDesc.GetMaster();
+        const SwFrameFormat& rFormatPage = rPageDesc.GetMaster();
 
         {
             if (rPageDesc.GetLandscape())
                 Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LANDSCAPE);
 
-            const SwFmtFrmSize& rSz = rFmtPage.GetFrmSize();
+            const SwFormatFrmSize& rSz = rFormatPage.GetFrmSize();
             // Clipboard document is always created without a printer, then
             // the size will be always LONG_MAX! Solution then is to use A4
             if (LONG_MAX == rSz.GetHeight() || LONG_MAX == rSz.GetWidth())
@@ -615,14 +615,14 @@ void RtfExport::ExportDocument_Impl()
         }
 
         {
-            const SvxLRSpaceItem& rLR = rFmtPage.GetLRSpace();
+            const SvxLRSpaceItem& rLR = rFormatPage.GetLRSpace();
             Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGL);
             OutLong(rLR.GetLeft()).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGR);
             OutLong(rLR.GetRight());
         }
 
         {
-            const SvxULSpaceItem& rUL = rFmtPage.GetULSpace();
+            const SvxULSpaceItem& rUL = rFormatPage.GetULSpace();
             Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGT);
             OutLong(rUL.GetUpper()).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGB);
             OutLong(rUL.GetLower());
@@ -647,15 +647,15 @@ void RtfExport::ExportDocument_Impl()
 
     {
         // write the footnotes and endnotes-out Info
-        const SwFtnInfo& rFtnInfo = m_pDoc->GetFtnInfo();
+        const SwFootnoteInfo& rFootnoteInfo = m_pDoc->GetFootnoteInfo();
 
-        const char* pOut = FTNPOS_CHAPTER == rFtnInfo.ePos
+        const char* pOut = FTNPOS_CHAPTER == rFootnoteInfo.ePos
                            ? OOO_STRING_SVTOOLS_RTF_ENDDOC
                            : OOO_STRING_SVTOOLS_RTF_FTNBJ;
         Strm().WriteCharPtr(pOut).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FTNSTART);
-        OutLong(rFtnInfo.nFtnOffset + 1);
+        OutLong(rFootnoteInfo.nFootnoteOffset + 1);
 
-        switch (rFtnInfo.eNum)
+        switch (rFootnoteInfo.eNum)
         {
         case FTNNUM_PAGE:
             pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG;
@@ -669,7 +669,7 @@ void RtfExport::ExportDocument_Impl()
         }
         Strm().WriteCharPtr(pOut);
 
-        switch (rFtnInfo.aFmt.GetNumberingType())
+        switch (rFootnoteInfo.aFormat.GetNumberingType())
         {
         case SVX_NUM_CHARS_LOWER_LETTER:
         case SVX_NUM_CHARS_LOWER_LETTER_N:
@@ -698,9 +698,9 @@ void RtfExport::ExportDocument_Impl()
 
         Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AENDDOC).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT)
         .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AFTNSTART);
-        OutLong(rEndNoteInfo.nFtnOffset + 1);
+        OutLong(rEndNoteInfo.nFootnoteOffset + 1);
 
-        switch (rEndNoteInfo.aFmt.GetNumberingType())
+        switch (rEndNoteInfo.aFormat.GetNumberingType())
         {
         case SVX_NUM_CHARS_LOWER_LETTER:
         case SVX_NUM_CHARS_LOWER_LETTER_N:
@@ -736,33 +736,33 @@ void RtfExport::ExportDocument_Impl()
 }
 
 void RtfExport::PrepareNewPageDesc(const SfxItemSet* pSet,
-                                   const SwNode& rNd, const SwFmtPageDesc* pNewPgDescFmt,
+                                   const SwNode& rNd, const SwFormatPageDesc* pNewPgDescFormat,
                                    const SwPageDesc* pNewPgDesc)
 {
-    const SwSectionFmt* pFmt = GetSectionFormat(rNd);
+    const SwSectionFormat* pFormat = GetSectionFormat(rNd);
     const sal_uLong nLnNm = GetSectionLineNo(pSet, rNd);
 
-    OSL_ENSURE(pNewPgDescFmt || pNewPgDesc, "Neither page desc format nor page desc provided.");
+    OSL_ENSURE(pNewPgDescFormat || pNewPgDesc, "Neither page desc format nor page desc provided.");
 
-    if (pNewPgDescFmt)
-        m_pSections->AppendSection(*pNewPgDescFmt, rNd, pFmt, nLnNm);
+    if (pNewPgDescFormat)
+        m_pSections->AppendSection(*pNewPgDescFormat, rNd, pFormat, nLnNm);
     else if (pNewPgDesc)
-        m_pSections->AppendSection(pNewPgDesc, rNd, pFmt, nLnNm);
+        m_pSections->AppendSection(pNewPgDesc, rNd, pFormat, nLnNm);
 
     // Don't insert a page break, when we're changing page style just because the next page has to be a different one.
     if (!m_pAttrOutput->m_pPrevPageDesc || m_pAttrOutput->m_pPrevPageDesc->GetFollow() != pNewPgDesc)
         AttrOutput().SectionBreak(msword::PageBreak, m_pSections->CurrentSectionInfo());
 }
 
-bool RtfExport::DisallowInheritingOutlineNumbering(const SwFmt& rFmt)
+bool RtfExport::DisallowInheritingOutlineNumbering(const SwFormat& rFormat)
 {
     bool bRet(false);
 
-    if (SfxItemState::SET != rFmt.GetItemState(RES_PARATR_NUMRULE, false))
+    if (SfxItemState::SET != rFormat.GetItemState(RES_PARATR_NUMRULE, false))
     {
-        if (const SwFmt* pParent = rFmt.DerivedFrom())
+        if (const SwFormat* pParent = rFormat.DerivedFrom())
         {
-            if (static_cast<const SwTxtFmtColl*>(pParent)->IsAssignedToListLevelOfOutlineStyle())
+            if (static_cast<const SwTextFormatColl*>(pParent)->IsAssignedToListLevelOfOutlineStyle())
             {
                 // Level 9 disables the outline
                 Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVEL).WriteInt32(9);
@@ -789,7 +789,7 @@ void RtfExport::OutputLinkedOLE(const OUString&)
 {
 }
 
-void RtfExport::OutputTextNode(const SwTxtNode& rNode)
+void RtfExport::OutputTextNode(const SwTextNode& rNode)
 {
     m_nCurrentNodeIndex = rNode.GetIndex();
     if (!m_bOutOutlineOnly || rNode.IsOutline())
@@ -797,9 +797,9 @@ void RtfExport::OutputTextNode(const SwTxtNode& rNode)
     m_nCurrentNodeIndex = 0;
 }
 
-void RtfExport::AppendSection(const SwPageDesc* pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum)
+void RtfExport::AppendSection(const SwPageDesc* pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum)
 {
-    m_pSections->AppendSection(pPageDesc, pFmt, nLnNum);
+    m_pSections->AppendSection(pPageDesc, pFormat, nLnNum);
     AttrOutput().SectionBreak(msword::PageBreak, m_pSections->CurrentSectionInfo());
 }
 
@@ -899,13 +899,13 @@ void RtfExport::OutDateTime(const sal_Char* pStr, const util::DateTime& rDT)
 
 sal_uInt16 RtfExport::GetColor(const Color& rColor) const
 {
-    for (RtfColorTbl::const_iterator it=m_aColTbl.begin() ; it != m_aColTbl.end(); ++it)
+    for (RtfColorTable::const_iterator it=m_aColTable.begin() ; it != m_aColTable.end(); ++it)
         if ((*it).second == rColor)
         {
             SAL_INFO("sw.rtf", OSL_THIS_FUNC << " returning " << (*it).first << " (" << rColor.GetRed() << "," << rColor.GetGreen() << "," << rColor.GetBlue() << ")");
             return (*it).first;
         }
-    OSL_FAIL("No such Color in m_aColTbl!");
+    OSL_FAIL("No such Color in m_aColTable!");
     return 0;
 }
 
@@ -913,7 +913,7 @@ void RtfExport::InsColor(const Color& rCol)
 {
     sal_uInt16 n;
     bool bAutoColorInTable = false;
-    for (RtfColorTbl::iterator it=m_aColTbl.begin() ; it != m_aColTbl.end(); ++it)
+    for (RtfColorTable::iterator it=m_aColTable.begin() ; it != m_aColTable.end(); ++it)
         if ((*it).second == rCol)
             return; // Already in the table
         else if ((*it).second == COL_AUTO)
@@ -924,12 +924,12 @@ void RtfExport::InsColor(const Color& rCol)
     else
     {
         // other colors get values >0
-        n = m_aColTbl.size();
+        n = m_aColTable.size();
         if (!bAutoColorInTable)
             // reserve value "0" for COL_AUTO (if COL_AUTO wasn't inserted until now)
             n++;
     }
-    m_aColTbl.insert(std::pair<sal_uInt16,Color>(n, rCol));
+    m_aColTable.insert(std::pair<sal_uInt16,Color>(n, rCol));
 }
 
 void RtfExport::InsColorLine(const SvxBoxItem& rBox)
@@ -1081,9 +1081,9 @@ void RtfExport::OutColorTable()
             InsColor(pItem->GetColorValue());
     }
 
-    for (size_t n = 0; n < m_aColTbl.size(); ++n)
+    for (size_t n = 0; n < m_aColTable.size(); ++n)
     {
-        const Color& rCol = m_aColTbl[ n ];
+        const Color& rCol = m_aColTable[ n ];
         if (n || COL_AUTO != rCol.GetColor())
         {
             Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_RED);
@@ -1097,33 +1097,33 @@ void RtfExport::OutColorTable()
 
 void RtfExport::InsStyle(sal_uInt16 nId, const OString& rStyle)
 {
-    m_aStyTbl.insert(std::pair<sal_uInt16,OString>(nId, rStyle));
+    m_aStyTable.insert(std::pair<sal_uInt16,OString>(nId, rStyle));
 }
 
 OString* RtfExport::GetStyle(sal_uInt16 nId)
 {
-    std::map<sal_uInt16,OString>::iterator i = m_aStyTbl.find(nId);
-    if (i != m_aStyTbl.end())
+    std::map<sal_uInt16,OString>::iterator i = m_aStyTable.find(nId);
+    if (i != m_aStyTable.end())
         return &i->second;
     return NULL;
 }
 
 sal_uInt16 RtfExport::GetRedline(const OUString& rAuthor)
 {
-    std::map<OUString,sal_uInt16>::iterator i = m_aRedlineTbl.find(rAuthor);
-    if (i != m_aRedlineTbl.end())
+    std::map<OUString,sal_uInt16>::iterator i = m_aRedlineTable.find(rAuthor);
+    if (i != m_aRedlineTable.end())
         return i->second;
     else
     {
-        int nId = m_aRedlineTbl.size();
-        m_aRedlineTbl.insert(std::pair<OUString,sal_uInt16>(rAuthor,nId));
+        int nId = m_aRedlineTable.size();
+        m_aRedlineTable.insert(std::pair<OUString,sal_uInt16>(rAuthor,nId));
         return nId;
     }
 }
 
 const OUString* RtfExport::GetRedline(sal_uInt16 nId)
 {
-    for (std::map<OUString,sal_uInt16>::iterator aIter = m_aRedlineTbl.begin(); aIter != m_aRedlineTbl.end(); ++aIter)
+    for (std::map<OUString,sal_uInt16>::iterator aIter = m_aRedlineTable.begin(); aIter != m_aRedlineTable.end(); ++aIter)
         if ((*aIter).second == nId)
             return &(*aIter).first;
     return NULL;
@@ -1150,9 +1150,9 @@ void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bWriteReset, b
     if (m_pAktPageDesc->GetLandscape())
         Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LNDSCPSXN);
 
-    const SwFmt* pFmt = &m_pAktPageDesc->GetMaster(); //GetLeft();
+    const SwFormat* pFormat = &m_pAktPageDesc->GetMaster(); //GetLeft();
     m_bOutPageDescs = true;
-    OutputFormat(*pFmt, true, false);
+    OutputFormat(*pFormat, true, false);
     m_bOutPageDescs = false;
 
     // normal header / footer (without a style)
@@ -1188,13 +1188,13 @@ void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader)
 {
     if (bHeader)
     {
-        const SwFmtHeader& rHeader = static_cast<const SwFmtHeader&>(rItem);
+        const SwFormatHeader& rHeader = static_cast<const SwFormatHeader&>(rItem);
         if (!rHeader.IsActive())
             return;
     }
     else
     {
-        const SwFmtFooter& rFooter = static_cast<const SwFmtFooter&>(rItem);
+        const SwFormatFooter& rFooter = static_cast<const SwFormatFooter&>(rItem);
         if (!rFooter.IsActive())
             return;
     }
@@ -1215,11 +1215,11 @@ void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader)
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end");
 }
 
-void RtfExport::WriteHeaderFooter(const SwFrmFmt& rFmt, bool bHeader, const sal_Char* pStr, bool bTitlepg)
+void RtfExport::WriteHeaderFooter(const SwFrameFormat& rFormat, bool bHeader, const sal_Char* pStr, bool bTitlepg)
 {
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
 
-    m_pAttrOutput->WriteHeaderFooter_Impl(rFmt, bHeader, pStr, bTitlepg);
+    m_pAttrOutput->WriteHeaderFooter_Impl(rFormat, bHeader, pStr, bTitlepg);
 
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end");
 }
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index 7d2f065be266..866d0e155bee 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -26,11 +26,11 @@
 class RtfAttributeOutput;
 class RtfExportFilter;
 class RtfSdrExport;
-typedef std::map<sal_uInt16,Color> RtfColorTbl;
-typedef std::map<sal_uInt16,OString> RtfStyleTbl;
-typedef std::map<OUString,sal_uInt16> RtfRedlineTbl;
+typedef std::map<sal_uInt16,Color> RtfColorTable;
+typedef std::map<sal_uInt16,OString> RtfStyleTable;
+typedef std::map<OUString,sal_uInt16> RtfRedlineTable;
 class SwNode;
-class SwTxtNode;
+class SwTextNode;
 class SwGrfNode;
 class SwOLENode;
 
@@ -89,14 +89,14 @@ public:
     /// Guess the script (asian/western).
     virtual bool CollapseScriptsforWordOk(sal_uInt16 nScript, sal_uInt16 nWhich) SAL_OVERRIDE;
 
-    virtual void AppendBookmarks(const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) SAL_OVERRIDE;
+    virtual void AppendBookmarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) SAL_OVERRIDE;
 
     virtual void AppendBookmark(const OUString& rName, bool bSkip = false) SAL_OVERRIDE;
 
-    virtual void AppendAnnotationMarks(const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) SAL_OVERRIDE;
+    virtual void AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) SAL_OVERRIDE;
 
     //For i120928,add an interface to export graphic of bullet
-    virtual void ExportGrfBullet(const SwTxtNode& rNd) SAL_OVERRIDE;
+    virtual void ExportGrfBullet(const SwTextNode& rNd) SAL_OVERRIDE;
 
     virtual void WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/) SAL_OVERRIDE { /* no-op for rtf, most probably should not even be in MSWordExportBase */ }
     virtual void WriteChar(sal_Unicode) SAL_OVERRIDE;
@@ -109,11 +109,11 @@ public:
 
     /// Output the actual headers and footers.
     virtual void WriteHeadersFooters(sal_uInt8 nHeadFootFlags,
-                                     const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode) SAL_OVERRIDE;
+                                     const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode) SAL_OVERRIDE;
 
     /// Write the field
-    virtual void OutputField(const SwField* pFld, ww::eField eFldType,
-                             const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL) SAL_OVERRIDE;
+    virtual void OutputField(const SwField* pField, ww::eField eFieldType,
+                             const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL) SAL_OVERRIDE;
 
     /// Write the data of the form field
     virtual void WriteFormData(const ::sw::mark::IFieldmark& rFieldmark) SAL_OVERRIDE;
@@ -125,7 +125,7 @@ public:
                             const OUString& rSelected,
                             css::uno::Sequence<OUString>& rListItems) SAL_OVERRIDE;
 
-    virtual void DoFormText(const SwInputField* pFld) SAL_OVERRIDE;
+    virtual void DoFormText(const SwInputField* pField) SAL_OVERRIDE;
 
     virtual sal_uLong ReplaceCr(sal_uInt8 nChar) SAL_OVERRIDE;
 
@@ -133,19 +133,19 @@ protected:
     /// Format-dependent part of the actual export.
     virtual void ExportDocument_Impl() SAL_OVERRIDE;
 
-    virtual void SectionBreaksAndFrames(const SwTxtNode& /*rNode*/) SAL_OVERRIDE {}
+    virtual void SectionBreaksAndFrames(const SwTextNode& /*rNode*/) SAL_OVERRIDE {}
 
     /// Get ready for a new section.
     virtual void PrepareNewPageDesc(const SfxItemSet* pSet,
                                     const SwNode& rNd,
-                                    const SwFmtPageDesc* pNewPgDescFmt = 0,
+                                    const SwFormatPageDesc* pNewPgDescFormat = 0,
                                     const SwPageDesc* pNewPgDesc = 0) SAL_OVERRIDE;
 
     /// Return value indicates if an inherited outline numbering is suppressed.
-    virtual bool DisallowInheritingOutlineNumbering(const SwFmt& rFmt) SAL_OVERRIDE;
+    virtual bool DisallowInheritingOutlineNumbering(const SwFormat& rFormat) SAL_OVERRIDE;
 
-    /// Output SwTxtNode is depending on outline export mode
-    virtual void OutputTextNode(const SwTxtNode&) SAL_OVERRIDE;
+    /// Output SwTextNode is depending on outline export mode
+    virtual void OutputTextNode(const SwTextNode&) SAL_OVERRIDE;
 
     /// Output SwGrfNode
     virtual void OutputGrfNode(const SwGrfNode&) SAL_OVERRIDE;
@@ -155,7 +155,7 @@ protected:
 
     virtual void OutputLinkedOLE(const OUString&) SAL_OVERRIDE;
 
-    virtual void AppendSection(const SwPageDesc* pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum) SAL_OVERRIDE;
+    virtual void AppendSection(const SwPageDesc* pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum) SAL_OVERRIDE;
 
 public:
     /// Pass the pDocument, pCurrentPam and pOriginalPam to the base class.
@@ -170,7 +170,7 @@ public:
     rtl_TextEncoding eCurrentEncoding;
     /// This is used by OutputFlyFrame_Impl() to control the written syntax
     bool bRTFFlySyntax;
-    /// Index of the current SwTxtNode, if any.
+    /// Index of the current SwTextNode, if any.
     sal_uLong m_nCurrentNodeIndex;
 
     SvStream& Strm();
@@ -211,11 +211,11 @@ private:
     /// This is necessary to have the numbering table ready before the main text is being processed.
     void BuildNumbering();
     void WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader);
-    void WriteHeaderFooter(const SwFrmFmt& rFmt, bool bHeader, const sal_Char* pStr, bool bTitlepg = false);
+    void WriteHeaderFooter(const SwFrameFormat& rFormat, bool bHeader, const sal_Char* pStr, bool bTitlepg = false);
 
-    RtfColorTbl m_aColTbl;
-    RtfStyleTbl m_aStyTbl;
-    RtfRedlineTbl m_aRedlineTbl;
+    RtfColorTable m_aColTable;
+    RtfStyleTable m_aStyTable;
+    RtfRedlineTable m_aRedlineTable;
     /// If set, then Strm() returns this tream, instead of m_pWriter's stream.
     std::unique_ptr<SvMemoryStream> m_pStream;
 };
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index 91923e3a3202..43f61ddef9ea 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -48,13 +48,13 @@ sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& aD
 
     // get SwDoc*
     uno::Reference< uno::XInterface > xIfc(m_xSrcDoc, uno::UNO_QUERY);
-    SwXTextDocument* pTxtDoc = dynamic_cast< SwXTextDocument* >(xIfc.get());
-    if (!pTxtDoc)
+    SwXTextDocument* pTextDoc = dynamic_cast< SwXTextDocument* >(xIfc.get());
+    if (!pTextDoc)
     {
         return sal_False;
     }
 
-    SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+    SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
     if (!pDoc)
     {
         return sal_False;
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index eeee50a409df..da441f5d5e8c 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -496,15 +496,15 @@ sal_Int32 RtfSdrExport::StartShape()
     lcl_AppendSP(m_rAttrOutput.RunText(), "wzName", msfilter::rtfutil::OutString(m_pSdrObject->GetTitle(), m_rExport.eCurrentEncoding));
 
     // now check if we have some text
-    const SwFrmFmt* pShape = FindFrmFmt(m_pSdrObject);
+    const SwFrameFormat* pShape = FindFrameFormat(m_pSdrObject);
     if (pShape)
     {
-        if (SwFrmFmt* pTextBox = SwTextBoxHelper::findTextBox(pShape))
+        if (SwFrameFormat* pTextBox = SwTextBoxHelper::findTextBox(pShape))
         {
             sw::Frame* pFrame = 0;
             for (sw::FrameIter it = m_rExport.m_aFrames.begin(); it != m_rExport.m_aFrames.end(); ++it)
             {
-                if (pTextBox == &it->GetFrmFmt())
+                if (pTextBox == &it->GetFrameFormat())
                 {
                     pFrame = &(*it);
                     break;
@@ -517,8 +517,8 @@ sal_Int32 RtfSdrExport::StartShape()
         }
     }
 
-    const SdrTextObj* pTxtObj = dynamic_cast<const SdrTextObj*>(m_pSdrObject);
-    if (pTxtObj)
+    const SdrTextObj* pTextObj = dynamic_cast<const SdrTextObj*>(m_pSdrObject);
+    if (pTextObj)
     {
         const OutlinerParaObject* pParaObj = 0;
         std::unique_ptr<const OutlinerParaObject> pOwnedParaObj;
@@ -528,14 +528,14 @@ sal_Int32 RtfSdrExport::StartShape()
         When the object is actively being edited, that text is not set into
         the objects normal text object, but lives in a separate object.
         */
-        if (pTxtObj->IsTextEditActive())
+        if (pTextObj->IsTextEditActive())
         {
-            pOwnedParaObj.reset(pTxtObj->GetEditOutlinerParaObject());
+            pOwnedParaObj.reset(pTextObj->GetEditOutlinerParaObject());
             pParaObj = pOwnedParaObj.get();
         }
         else
         {
-            pParaObj = pTxtObj->GetOutlinerParaObject();
+            pParaObj = pTextObj->GetOutlinerParaObject();
         }
 
         if (pParaObj)
@@ -579,8 +579,8 @@ void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj)
 
             aAttrIter.OutAttr(nAktPos);
             m_rAttrOutput.RunText().append('{').append(m_rAttrOutput.Styles().makeStringAndClear()).append(SAL_NEWLINE_STRING);
-            bool bTxtAtr = aAttrIter.IsTxtAttr(nAktPos);
-            if (!bTxtAtr)
+            bool bTextAtr = aAttrIter.IsTextAttr(nAktPos);
+            if (!bTextAtr)
             {
                 OUString aOut(aStr.copy(nAktPos, nNextAttr - nAktPos));
                 m_rAttrOutput.RunText().append(msfilter::rtfutil::OutString(aOut, eChrSet));
@@ -614,9 +614,9 @@ sal_uInt32 RtfSdrExport::AddSdrObject(const SdrObject& rObj)
     return EscherEx::AddSdrObject(rObj);
 }
 
-bool RtfSdrExport::isTextBox(const SwFrmFmt& rFrmFmt)
+bool RtfSdrExport::isTextBox(const SwFrameFormat& rFrameFormat)
 {
-    return m_aTextBoxes.find(&rFrmFmt) != m_aTextBoxes.end();
+    return m_aTextBoxes.find(&rFrameFormat) != m_aTextBoxes.end();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx
index 59395647b9b7..0f12cb0c9259 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -29,7 +29,7 @@
 
 class RtfExport;
 class RtfAttributeOutput;
-class SwFrmFmt;
+class SwFrameFormat;
 
 /// Handles export of drawings using RTF markup
 class RtfSdrExport : public EscherEx
@@ -55,7 +55,7 @@ class RtfSdrExport : public EscherEx
     bool* m_pShapeTypeWritten;
 
     /// List of TextBoxes in this document: they are exported as part of their shape, never alone.
-    std::set<const SwFrmFmt*> m_aTextBoxes;
+    std::set<const SwFrameFormat*> m_aTextBoxes;
 
 public:
     RtfSdrExport(RtfExport& rExport);
@@ -67,7 +67,7 @@ public:
     sal_uInt32 AddSdrObject(const SdrObject& rObj);
 
     /// Is this a standalone TextFrame, or used as a TextBox of a shape?
-    bool isTextBox(const SwFrmFmt& rFrmFmt);
+    bool isTextBox(const SwFrameFormat& rFrameFormat);
 
 protected:
     /// Start the shape for which we just collected the information.
diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx b/sw/source/filter/ww8/rtfstringbuffer.cxx
index aa7db28a1e08..44f0340b38c4 100644
--- a/sw/source/filter/ww8/rtfstringbuffer.cxx
+++ b/sw/source/filter/ww8/rtfstringbuffer.cxx
@@ -11,14 +11,14 @@
 
 RtfStringBufferValue::RtfStringBufferValue()
     : m_aBuffer(),
-      m_pFlyFrmFmt(0),
+      m_pFlyFrameFormat(0),
       m_pGrfNode(0)
 {
 }
 
-RtfStringBufferValue::RtfStringBufferValue(const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode* pGrfNode)
+RtfStringBufferValue::RtfStringBufferValue(const SwFlyFrameFormat* pFlyFrameFormat, const SwGrfNode* pGrfNode)
     : m_aBuffer(),
-      m_pFlyFrmFmt(pFlyFrmFmt),
+      m_pFlyFrameFormat(pFlyFrameFormat),
       m_pGrfNode(pGrfNode)
 {
 }
@@ -28,7 +28,7 @@ void RtfStringBufferValue::makeStringAndClear(RtfAttributeOutput* pAttributeOutp
     if (!isGraphic())
         pAttributeOutput->m_rExport.Strm().WriteCharPtr(m_aBuffer.makeStringAndClear().getStr());
     else
-        pAttributeOutput->FlyFrameGraphic(m_pFlyFrmFmt, m_pGrfNode);
+        pAttributeOutput->FlyFrameGraphic(m_pFlyFrameFormat, m_pGrfNode);
 }
 
 OString RtfStringBufferValue::makeStringAndClear()
@@ -38,7 +38,7 @@ OString RtfStringBufferValue::makeStringAndClear()
 
 bool RtfStringBufferValue::isGraphic() const
 {
-    return m_pFlyFrmFmt != 0 && m_pGrfNode != 0;
+    return m_pFlyFrameFormat != 0 && m_pGrfNode != 0;
 }
 
 RtfStringBuffer::RtfStringBuffer()
@@ -87,9 +87,9 @@ void RtfStringBuffer::clear()
     m_aValues.clear();
 }
 
-void RtfStringBuffer::append(const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode* pGrfNode)
+void RtfStringBuffer::append(const SwFlyFrameFormat* pFlyFrameFormat, const SwGrfNode* pGrfNode)
 {
-    m_aValues.push_back(RtfStringBufferValue(pFlyFrmFmt, pGrfNode));
+    m_aValues.push_back(RtfStringBufferValue(pFlyFrameFormat, pGrfNode));
 }
 
 void RtfStringBuffer::appendAndClear(RtfStringBuffer& rBuf)
diff --git a/sw/source/filter/ww8/rtfstringbuffer.hxx b/sw/source/filter/ww8/rtfstringbuffer.hxx
index fbf4423fb11d..f917347d8872 100644
--- a/sw/source/filter/ww8/rtfstringbuffer.hxx
+++ b/sw/source/filter/ww8/rtfstringbuffer.hxx
@@ -13,7 +13,7 @@
 #include <vector>
 
 class SwGrfNode;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
 class RtfAttributeOutput;
 
 /// Contains a buffered string or graphic during RTF export.
@@ -23,7 +23,7 @@ public:
     /// Constructor for a string buffering.
     RtfStringBufferValue();
     /// Constructor for graphic buffering.
-    RtfStringBufferValue(const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode* pGrfNode);
+    RtfStringBufferValue(const SwFlyFrameFormat* pFlyFrameFormat, const SwGrfNode* pGrfNode);
     /// This version handles graphics.
     void makeStringAndClear(RtfAttributeOutput* pAttributeOutput);
     /// This one doesn't.
@@ -31,7 +31,7 @@ public:
     bool isGraphic() const;
 
     OStringBuffer m_aBuffer;
-    const SwFlyFrmFmt* m_pFlyFrmFmt;
+    const SwFlyFrameFormat* m_pFlyFrameFormat;
     const SwGrfNode* m_pGrfNode;
 };
 
@@ -52,7 +52,7 @@ public:
     /// Similar to ->setLength(0), but for all buffers.
     void clear();
     /// Same as ->append(), but for graphics and without expanding contents to save memory.
-    void append(const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode* pGrfNode);
+    void append(const SwFlyFrameFormat* pFlyFrameFormat, const SwGrfNode* pGrfNode);
     /// Append all contained buffers and clear the argument.
     void appendAndClear(RtfStringBuffer& rBuf);
 private:
diff --git a/sw/source/filter/ww8/sprmids.hxx b/sw/source/filter/ww8/sprmids.hxx
index 3e1d3a231295..dcc55e642deb 100644
--- a/sw/source/filter/ww8/sprmids.hxx
+++ b/sw/source/filter/ww8/sprmids.hxx
@@ -97,7 +97,7 @@ const sal_uInt16 LN_PFUsePgsuSettings = 0x2447;
 const sal_uInt16 LN_PFAdjustRight = 0x2448;
 const sal_uInt16 LN_CFRMarkDel = 0x0800;
 const sal_uInt16 LN_CFRMark = 0x0801;
-const sal_uInt16 LN_CFFldVanish = 0x0802;
+const sal_uInt16 LN_CFFieldVanish = 0x0802;
 const sal_uInt16 LN_CPicLocation = 0x6a03;
 const sal_uInt16 LN_CIbstRMark = 0x4804;
 const sal_uInt16 LN_CDttmRMark = 0x6805;
@@ -165,7 +165,7 @@ const sal_uInt16 LN_CFtcBi = 0x4a5e;
 const sal_uInt16 LN_CLidBi = 0x485f;
 const sal_uInt16 LN_CIcoBi = 0x4a60;
 const sal_uInt16 LN_CHpsBi = 0x4a61;
-const sal_uInt16 LN_CDispFldRMark = 0xca62;
+const sal_uInt16 LN_CDispFieldRMark = 0xca62;
 const sal_uInt16 LN_CIbstRMarkDel = 0x4863;
 const sal_uInt16 LN_CDttmRMarkDel = 0x6864;
 const sal_uInt16 LN_CBrc80 = 0x6865;
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index a837f0350cfd..2297c1bd490f 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -144,7 +144,7 @@ namespace ww
     {
         switch (eSti)
         {
-            case stiFtnRef:
+            case stiFootnoteRef:
             case stiAtnRef:
             case stiLnn:
             case stiPgn:
@@ -170,7 +170,7 @@ namespace ww
                 stiToc5, stiToc4, stiToc3, stiToc2, stiToc1, stiIndex7,
                 stiIndex6, stiIndex5, stiIndex4, stiIndex3, stiIndex2,
                 stiIndex1, stiLnn, stiIndexHeading, stiFooter, stiHeader,
-                stiFtnRef, stiFtnText, stiLev9, stiLev8, stiLev7, stiLev6,
+                stiFootnoteRef, stiFootnoteText, stiLev9, stiLev8, stiLev7, stiLev6,
                 stiLev5, stiLev4, stiLev3, stiLev2, stiLev1, stiNormIndent
             };
             return aMapping[stc-222];
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index c2ff78d49758..9a0846612ba0 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -74,12 +74,12 @@ namespace
     }
 
     // #i98791# - adjust sorting
-    // Utility to sort SwTxtFmtColl's by their assigned outline style list level
+    // Utility to sort SwTextFormatColl's by their assigned outline style list level
     class outlinecmp : public
-        std::binary_function<const SwTxtFmtColl*, const SwTxtFmtColl*, bool>
+        std::binary_function<const SwTextFormatColl*, const SwTextFormatColl*, bool>
     {
     public:
-        bool operator()(const SwTxtFmtColl *pA, const SwTxtFmtColl *pB) const
+        bool operator()(const SwTextFormatColl *pA, const SwTextFormatColl *pB) const
         {
             // #i98791#
             bool bResult( false );
@@ -122,9 +122,9 @@ namespace
 
         for(SwPosFlyFrms::const_iterator aIter(rFlys.begin()); aIter != rFlys.end(); ++aIter)
         {
-            const SwFrmFmt &rEntry = (*aIter)->GetFmt();
+            const SwFrameFormat &rEntry = (*aIter)->GetFormat();
 
-            if (const SwPosition* pAnchor = rEntry.GetAnchor().GetCntntAnchor())
+            if (const SwPosition* pAnchor = rEntry.GetAnchor().GetContentAnchor())
             {
                 aRet.push_back(sw::Frame(rEntry, *pAnchor));
             }
@@ -132,9 +132,9 @@ namespace
             {
                 SwPosition aPos((*aIter)->GetNdIndex());
 
-                if (SwTxtNode* pTxtNd = aPos.nNode.GetNode().GetTxtNode())
+                if (SwTextNode* pTextNd = aPos.nNode.GetNode().GetTextNode())
                 {
-                    aPos.nContent.Assign(pTxtNd, 0);
+                    aPos.nContent.Assign(pTextNd, 0);
                 }
 
                 aRet.push_back(sw::Frame(rEntry, aPos));
@@ -185,35 +185,35 @@ namespace sw
         maLayoutSize = maSize;
     }
 
-    Frame::Frame(const SwFrmFmt &rFmt, const SwPosition &rPos)
-        : mpFlyFrm(&rFmt)
+    Frame::Frame(const SwFrameFormat &rFormat, const SwPosition &rPos)
+        : mpFlyFrm(&rFormat)
         , maPos(rPos)
         , maSize()
         , maLayoutSize() // #i43447#
-        , meWriterType(eTxtBox)
+        , meWriterType(eTextBox)
         , mpStartFrameContent(0)
         // #i43447# - move to initialization list
-        , mbIsInline( (rFmt.GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
+        , mbIsInline( (rFormat.GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
         // #i120928# - handle graphic of bullet within existing implementation
         , mbForBullet(false)
         , maGrf()
     {
-        switch (rFmt.Which())
+        switch (rFormat.Which())
         {
             case RES_FLYFRMFMT:
-                if (const SwNodeIndex* pIdx = rFmt.GetCntnt().GetCntntIdx())
+                if (const SwNodeIndex* pIdx = rFormat.GetContent().GetContentIdx())
                 {
                     SwNodeIndex aIdx(*pIdx, 1);
                     const SwNode &rNd = aIdx.GetNode();
                     // #i43447# - determine layout size
                     {
-                        SwRect aLayRect( rFmt.FindLayoutRect() );
+                        SwRect aLayRect( rFormat.FindLayoutRect() );
                         Rectangle aRect( aLayRect.SVRect() );
                         // The Object is not rendered (e.g. something in unused
                         // header/footer) - thus, get the values from the format.
                         if ( aLayRect.IsEmpty() )
                         {
-                            aRect.SetSize( rFmt.GetFrmSize().GetSize() );
+                            aRect.SetSize( rFormat.GetFrmSize().GetSize() );
                         }
                         maLayoutSize = aRect.GetSize();
                     }
@@ -221,14 +221,14 @@ namespace sw
                     {
                         case ND_GRFNODE:
                             meWriterType = eGraphic;
-                            maSize = rNd.GetNoTxtNode()->GetTwipSize();
+                            maSize = rNd.GetNoTextNode()->GetTwipSize();
                             break;
                         case ND_OLENODE:
                             meWriterType = eOle;
-                            maSize = rNd.GetNoTxtNode()->GetTwipSize();
+                            maSize = rNd.GetNoTextNode()->GetTwipSize();
                             break;
                         default:
-                            meWriterType = eTxtBox;
+                            meWriterType = eTextBox;
                             // #i43447# - Size equals layout size for text boxes
                             maSize = maLayoutSize;
                             break;
@@ -238,11 +238,11 @@ namespace sw
                 else
                 {
                     OSL_ENSURE(false, "Impossible");
-                    meWriterType = eTxtBox;
+                    meWriterType = eTextBox;
                 }
                 break;
             default:
-                if (const SdrObject* pObj = rFmt.FindRealSdrObject())
+                if (const SdrObject* pObj = rFormat.FindRealSdrObject())
                 {
                     if (pObj->GetObjInventor() == FmFormInventor)
                         meWriterType = eFormControl;
@@ -448,13 +448,13 @@ namespace sw
             return 0;
         }
 
-        void ClearOverridesFromSet(const SwFmtCharFmt &rFmt, SfxItemSet &rSet)
+        void ClearOverridesFromSet(const SwFormatCharFormat &rFormat, SfxItemSet &rSet)
         {
-            if (const SwCharFmt* pCharFmt = rFmt.GetCharFmt())
+            if (const SwCharFormat* pCharFormat = rFormat.GetCharFormat())
             {
-                if (pCharFmt->GetAttrSet().Count())
+                if (pCharFormat->GetAttrSet().Count())
                 {
-                    SfxItemIter aIter(pCharFmt->GetAttrSet());
+                    SfxItemIter aIter(pCharFormat->GetAttrSet());
                     const SfxPoolItem *pItem = aIter.GetCurItem();
                     do
                         rSet.ClearItem(pItem->Which());
@@ -468,7 +468,7 @@ namespace sw
             ParaStyles aStyles;
             typedef ParaStyles::size_type mysizet;
 
-            const SwTxtFmtColls *pColls = rDoc.GetTxtFmtColls();
+            const SwTextFormatColls *pColls = rDoc.GetTextFormatColls();
             mysizet nCount = pColls ? pColls->size() : 0;
             aStyles.reserve(nCount);
             for (mysizet nI = 0; nI < nCount; ++nI)
@@ -476,33 +476,33 @@ namespace sw
             return aStyles;
         }
 
-        SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const OUString& rName)
+        SwTextFormatColl* GetParaStyle(SwDoc &rDoc, const OUString& rName)
         {
             // Search first in the Doc-Styles
-            SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName(rName);
+            SwTextFormatColl* pColl = rDoc.FindTextFormatCollByName(rName);
             if (!pColl)
             {
                 // Collection not found, try in Pool ?
                 sal_uInt16 n = SwStyleNameMapper::GetPoolIdFromUIName(rName,
                     nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
                 if (n != SAL_MAX_UINT16)       // found or standard
-                    pColl = rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(n, false);
+                    pColl = rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(n, false);
             }
             return pColl;
         }
 
-        SwCharFmt* GetCharStyle(SwDoc &rDoc, const OUString& rName)
+        SwCharFormat* GetCharStyle(SwDoc &rDoc, const OUString& rName)
         {
-            SwCharFmt *pFmt = rDoc.FindCharFmtByName(rName);
-            if (!pFmt)
+            SwCharFormat *pFormat = rDoc.FindCharFormatByName(rName);
+            if (!pFormat)
             {
                 // Collection not found, try in Pool ?
                 sal_uInt16 n = SwStyleNameMapper::GetPoolIdFromUIName(rName,
                     nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
                 if (n != SAL_MAX_UINT16)       // found or standard
-                    pFmt = rDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool(n);
+                    pFormat = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool(n);
             }
-            return pFmt;
+            return pFormat;
         }
 
         // #i98791# - adjust sorting algorithm
@@ -517,7 +517,7 @@ namespace sw
            */
         Frames GetFrames(const SwDoc &rDoc, SwPaM *pPaM /*, bool bAll*/)
         {
-            SwPosFlyFrms aFlys(rDoc.GetAllFlyFmts(pPaM, true));
+            SwPosFlyFrms aFlys(rDoc.GetAllFlyFormats(pPaM, true));
             sw::Frames aRet(SwPosFlyFrmsToFrames(aFlys));
             return aRet;
         }
@@ -530,7 +530,7 @@ namespace sw
             return aRet;
         }
 
-        const SwNumFmt* GetNumFmtFromSwNumRuleLevel(const SwNumRule &rRule,
+        const SwNumFormat* GetNumFormatFromSwNumRuleLevel(const SwNumRule &rRule,
             int nLevel)
         {
             if (nLevel < 0 || nLevel >= MAXLEVEL)
@@ -541,46 +541,46 @@ namespace sw
             return &(rRule.Get( static_cast< sal_uInt16 >(nLevel) ));
         }
 
-        const SwNumFmt* GetNumFmtFromTxtNode(const SwTxtNode &rTxtNode)
+        const SwNumFormat* GetNumFormatFromTextNode(const SwTextNode &rTextNode)
         {
             const SwNumRule *pRule = 0;
             if (
-                rTxtNode.IsNumbered() && rTxtNode.IsCountedInList() &&
-                0 != (pRule = rTxtNode.GetNumRule())
+                rTextNode.IsNumbered() && rTextNode.IsCountedInList() &&
+                0 != (pRule = rTextNode.GetNumRule())
                 )
             {
-                return GetNumFmtFromSwNumRuleLevel(*pRule,
-                    rTxtNode.GetActualListLevel());
+                return GetNumFormatFromSwNumRuleLevel(*pRule,
+                    rTextNode.GetActualListLevel());
             }
 
-            OSL_ENSURE(rTxtNode.GetDoc(), "No document for node?, suspicious");
-            if (!rTxtNode.GetDoc())
+            OSL_ENSURE(rTextNode.GetDoc(), "No document for node?, suspicious");
+            if (!rTextNode.GetDoc())
                 return 0;
 
             if (
-                rTxtNode.IsNumbered() && rTxtNode.IsCountedInList() &&
-                0 != (pRule = rTxtNode.GetDoc()->GetOutlineNumRule())
+                rTextNode.IsNumbered() && rTextNode.IsCountedInList() &&
+                0 != (pRule = rTextNode.GetDoc()->GetOutlineNumRule())
                 )
             {
-                return GetNumFmtFromSwNumRuleLevel(*pRule,
-                    rTxtNode.GetActualListLevel());
+                return GetNumFormatFromSwNumRuleLevel(*pRule,
+                    rTextNode.GetActualListLevel());
             }
 
             return 0;
         }
 
-        const SwNumRule* GetNumRuleFromTxtNode(const SwTxtNode &rTxtNode)
+        const SwNumRule* GetNumRuleFromTextNode(const SwTextNode &rTextNode)
         {
-            return GetNormalNumRuleFromTxtNode(rTxtNode);
+            return GetNormalNumRuleFromTextNode(rTextNode);
         }
 
-        const SwNumRule* GetNormalNumRuleFromTxtNode(const SwTxtNode &rTxtNode)
+        const SwNumRule* GetNormalNumRuleFromTextNode(const SwTextNode &rTextNode)
         {
             const SwNumRule *pRule = 0;
 
             if (
-                rTxtNode.IsNumbered() && rTxtNode.IsCountedInList() &&
-                0 != (pRule = rTxtNode.GetNumRule())
+                rTextNode.IsNumbered() && rTextNode.IsCountedInList() &&
+                0 != (pRule = rTextNode.GetNumRule())
                )
             {
                 return pRule;
@@ -588,29 +588,29 @@ namespace sw
             return 0;
         }
 
-        SwNoTxtNode *GetNoTxtNodeFromSwFrmFmt(const SwFrmFmt &rFmt)
+        SwNoTextNode *GetNoTextNodeFromSwFrameFormat(const SwFrameFormat &rFormat)
         {
-            const SwNodeIndex *pIndex = rFmt.GetCntnt().GetCntntIdx();
-            OSL_ENSURE(pIndex, "No NodeIndex in SwFrmFmt ?, suspicious");
+            const SwNodeIndex *pIndex = rFormat.GetContent().GetContentIdx();
+            OSL_ENSURE(pIndex, "No NodeIndex in SwFrameFormat ?, suspicious");
             if (!pIndex)
                 return 0;
             SwNodeIndex aIdx(*pIndex, 1);
-            return aIdx.GetNode().GetNoTxtNode();
+            return aIdx.GetNode().GetNoTextNode();
         }
 
         bool HasPageBreak(const SwNode &rNd)
         {
-            const SvxFmtBreakItem *pBreak = 0;
+            const SvxFormatBreakItem *pBreak = 0;
             if (rNd.IsTableNode() && rNd.GetTableNode())
             {
                 const SwTable& rTable = rNd.GetTableNode()->GetTable();
-                const SwFrmFmt* pApply = rTable.GetFrmFmt();
+                const SwFrameFormat* pApply = rTable.GetFrameFormat();
                 OSL_ENSURE(pApply, "impossible");
                 if (pApply)
-                    pBreak = &(ItemGet<SvxFmtBreakItem>(*pApply, RES_BREAK));
+                    pBreak = &(ItemGet<SvxFormatBreakItem>(*pApply, RES_BREAK));
             }
-            else if (const SwCntntNode *pNd = rNd.GetCntntNode())
-                pBreak = &(ItemGet<SvxFmtBreakItem>(*pNd, RES_BREAK));
+            else if (const SwContentNode *pNd = rNd.GetContentNode())
+                pBreak = &(ItemGet<SvxFormatBreakItem>(*pNd, RES_BREAK));
 
             if (pBreak && pBreak->GetBreak() == SVX_BREAK_PAGE_BEFORE)
                 return true;
@@ -660,7 +660,7 @@ namespace sw
             }
         }
 
-        Polygon CorrectWordWrapPolygonForExport(const tools::PolyPolygon& rPolyPoly, const SwNoTxtNode* pNd)
+        Polygon CorrectWordWrapPolygonForExport(const tools::PolyPolygon& rPolyPoly, const SwNoTextNode* pNd)
         {
             Polygon aPoly(PolygonFromPolyPolygon(rPolyPoly));
             const Size &rOrigSize = pNd->GetGraphic().GetPrefSize();
@@ -821,12 +821,12 @@ namespace sw
         {
         }
 
-        void InsertedTablesManager::DelAndMakeTblFrms()
+        void InsertedTablesManager::DelAndMakeTableFrms()
         {
             if (!mbHasRoot)
                 return;
-            TblMapIter aEnd = maTables.end();
-            for (TblMapIter aIter = maTables.begin(); aIter != aEnd; ++aIter)
+            TableMapIter aEnd = maTables.end();
+            for (TableMapIter aIter = maTables.begin(); aIter != aEnd; ++aIter)
             {
                 // exitiert schon ein Layout, dann muss an dieser Tabelle die BoxFrames
                 // neu erzeugt
@@ -834,9 +834,9 @@ namespace sw
                 OSL_ENSURE(pTable, "Why no expected table");
                 if (pTable)
                 {
-                    SwFrmFmt * pFrmFmt = pTable->GetTable().GetFrmFmt();
+                    SwFrameFormat * pFrameFormat = pTable->GetTable().GetFrameFormat();
 
-                    if (pFrmFmt != NULL)
+                    if (pFrameFormat != NULL)
                     {
                         SwNodeIndex *pIndex = aIter->second;
                         pTable->DelFrms();
@@ -855,7 +855,7 @@ namespace sw
 
             InsertedTableClient * pClient = new InsertedTableClient(rTableNode);
 
-            maTables.insert(TblMap::value_type(pClient, &(rPaM.GetPoint()->nNode)));
+            maTables.insert(TableMap::value_type(pClient, &(rPaM.GetPoint()->nNode)));
         }
     }
 
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index f3865a484b03..dbd033e42ab5 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -35,15 +35,15 @@
 #include <tools/poly.hxx>
 #include <doc.hxx>
 
-class SwTxtFmtColl;
-class SwCharFmt;
+class SwTextFormatColl;
+class SwCharFormat;
 class SdrObject;
 class SdrOle2Obj;
 class OutlinerParaObject;
-class SwNumFmt;
-class SwTxtNode;
-class SwNoTxtNode;
-class SwFmtCharFmt;
+class SwNumFormat;
+class SwTextNode;
+class SwNoTextNode;
+class SwFormatCharFormat;
 class Graphic;
 class SwDoc;
 class SwNumRule;
@@ -63,8 +63,8 @@ namespace sw
 
 namespace sw
 {
-    /// STL container of Paragraph Styles (SwTxtFmtColl)
-    typedef std::vector<SwTxtFmtColl *> ParaStyles;
+    /// STL container of Paragraph Styles (SwTextFormatColl)
+    typedef std::vector<SwTextFormatColl *> ParaStyles;
     /// STL iterator for ParaStyles
     typedef ParaStyles::iterator ParaStyleIter;
     /// STL container of SfxPoolItems (Attributes)
@@ -94,9 +94,9 @@ namespace sw
     class Frame
     {
     public:
-        enum WriterSource {eTxtBox, eGraphic, eOle, eDrawing, eFormControl,eBulletGrf};
+        enum WriterSource {eTextBox, eGraphic, eOle, eDrawing, eFormControl,eBulletGrf};
     private:
-        const SwFrmFmt* mpFlyFrm;
+        const SwFrameFormat* mpFlyFrm;
         SwPosition maPos;
         Size maSize;
         // #i43447# - Size of the frame in the layout.
@@ -110,15 +110,15 @@ namespace sw
         bool mbForBullet:1;
         Graphic maGrf;
     public:
-        Frame(const SwFrmFmt &rFlyFrm, const SwPosition &rPos);
+        Frame(const SwFrameFormat &rFlyFrm, const SwPosition &rPos);
         Frame(const Graphic&, const SwPosition &);
 
-        /** Get the writer SwFrmFmt that this object describes
+        /** Get the writer SwFrameFormat that this object describes
 
             @return
-            The wrapped SwFrmFmt
+            The wrapped SwFrameFormat
         */
-        const SwFrmFmt &GetFrmFmt() const { return *mpFlyFrm; }
+        const SwFrameFormat &GetFrameFormat() const { return *mpFlyFrm; }
 
         /** Get the position this frame is anchored at
 
@@ -130,10 +130,10 @@ namespace sw
         /** Get the node this frame is anchored into
 
             @return
-            The SwTxtNode this frame is anchored inside
+            The SwTextNode this frame is anchored inside
         */
-        const SwCntntNode *GetCntntNode() const
-            { return maPos.nNode.GetNode().GetCntntNode(); }
+        const SwContentNode *GetContentNode() const
+            { return maPos.nNode.GetNode().GetContentNode(); }
 
         /** Get the type of frame that this wraps
 
@@ -265,7 +265,7 @@ namespace sw
             return static_cast<const T *>(pItem);
         }
 
-        /** Extract a SfxPoolItem derived property from a SwCntntNode
+        /** Extract a SfxPoolItem derived property from a SwContentNode
 
             Writer's attributes are retrieved by passing a numeric identifier
             and receiving a SfxPoolItem reference which must then typically be
@@ -275,7 +275,7 @@ namespace sw
             retrieved property is of the type that the developer thinks it is.
 
             @param rNode
-            The SwCntntNode to retrieve the property from
+            The SwContentNode to retrieve the property from
 
             @param eType
             The numeric identifier of the property to be retrieved
@@ -290,13 +290,13 @@ namespace sw
             @author
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
-        template<class T> const T & ItemGet(const SwCntntNode &rNode,
+        template<class T> const T & ItemGet(const SwContentNode &rNode,
             sal_uInt16 eType) throw(std::bad_cast)
         {
             return item_cast<T>(rNode.GetAttr(eType));
         }
 
-        /** Extract a SfxPoolItem derived property from a SwFmt
+        /** Extract a SfxPoolItem derived property from a SwFormat
 
             Writer's attributes are retrieved by passing a numeric identifier
             and receiving a SfxPoolItem reference which must then typically be
@@ -305,8 +305,8 @@ namespace sw
             ItemGet uses item_cast () on the retrieved reference to test that the
             retrieved property is of the type that the developer thinks it is.
 
-            @param rFmt
-            The SwFmt to retrieve the property from
+            @param rFormat
+            The SwFormat to retrieve the property from
 
             @param eType
             The numeric identifier of the property to be retrieved
@@ -319,10 +319,10 @@ namespace sw
             @author
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
-        template<class T> const T & ItemGet(const SwFmt &rFmt,
+        template<class T> const T & ItemGet(const SwFormat &rFormat,
             sal_uInt16 eType) throw(std::bad_cast, css::uno::RuntimeException)
         {
-            return item_cast<T>(rFmt.GetFmtAttr(eType));
+            return item_cast<T>(rFormat.GetFormatAttr(eType));
         }
 
         /** Extract a SfxPoolItem derived property from a SfxItemSet
@@ -462,20 +462,20 @@ namespace sw
         }
 
         /** Return a pointer to a SfxPoolItem derived class if it exists in an
-            SwFmt
+            SwFormat
 
             Writer's attributes are retrieved by passing a numeric identifier
             and receiving a SfxPoolItem reference which must then typically be
             cast back to its original type which is both tedious and verbose.
 
             HasItem returns a pointer to the requested SfxPoolItem for a given
-            property id if it exists in the SwFmt e.g. fontsize
+            property id if it exists in the SwFormat e.g. fontsize
 
             HasItem uses item_cast () on the retrieved pointer to test that the
             retrieved property is of the type that the developer thinks it is.
 
             @param rSet
-            The SwFmt whose property we want
+            The SwFormat whose property we want
 
             @param eType
             The numeric identifier of the default property to be retrieved
@@ -488,10 +488,10 @@ namespace sw
             @author
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
-        template<class T> const T* HasItem(const SwFmt &rFmt,
+        template<class T> const T* HasItem(const SwFormat &rFormat,
             sal_uInt16 eType)
         {
-            return HasItem<T>(rFmt.GetAttrSet(), eType);
+            return HasItem<T>(rFormat.GetAttrSet(), eType);
         }
 
         /** Get the Paragraph Styles of a SwDoc
@@ -526,7 +526,7 @@ namespace sw
             @author
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
-        SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const OUString& rName);
+        SwTextFormatColl* GetParaStyle(SwDoc &rDoc, const OUString& rName);
 
         /** Get a Character Style which fits a given name
 
@@ -544,7 +544,7 @@ namespace sw
             @author
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
-        SwCharFmt* GetCharStyle(SwDoc &rDoc, const OUString& rName);
+        SwCharFormat* GetCharStyle(SwDoc &rDoc, const OUString& rName);
 
         /** Sort sequence of Paragraph Styles by assigned outline style list level
 
@@ -589,31 +589,31 @@ namespace sw
             return item_cast<T>(SearchPoolItems(rItems, eType));
         }
 
-        /** Remove properties from an SfxItemSet which a SwFmtCharFmt overrides
+        /** Remove properties from an SfxItemSet which a SwFormatCharFormat overrides
 
-            Given an SfxItemSet and a SwFmtCharFmt remove from the rSet all the
-            properties which the SwFmtCharFmt would override. An SfxItemSet
-            contains attributes, and a SwFmtCharFmt is a "Character Style",
+            Given an SfxItemSet and a SwFormatCharFormat remove from the rSet all the
+            properties which the SwFormatCharFormat would override. An SfxItemSet
+            contains attributes, and a SwFormatCharFormat is a "Character Style",
             so if the SfxItemSet contains bold and so does the character style
             then delete bold from the SfxItemSet
 
             @param
-            rFmt the SwFmtCharFmt which describes the Character Style
+            rFormat the SwFormatCharFormat which describes the Character Style
 
             @param
             rSet the SfxItemSet from which we want to remove any properties
-            which the rFmt would override
+            which the rFormat would override
 
             @author
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
 
             @see #i24291# for examples
         */
-        void ClearOverridesFromSet(const SwFmtCharFmt &rFmt, SfxItemSet &rSet);
+        void ClearOverridesFromSet(const SwFormatCharFormat &rFormat, SfxItemSet &rSet);
 
         /** Get the Floating elements in a SwDoc
 
-            Writer's FrmFmts may or may not be anchored to some text content,
+            Writer's FrameFormats may or may not be anchored to some text content,
             e.g. Page Anchored elements will not be. For the winword export we
             need them to have something to be anchored to. So this method
             returns all the floating elements in a document as a STL container
@@ -655,20 +655,20 @@ namespace sw
             There are two differing types of numbering formats that may be on a
             paragraph, normal and outline. The outline is that numbering you
             see in tools->outline numbering. Theres no difference in the
-            numbering itself, just how you get it from the SwTxtNode. Needless
+            numbering itself, just how you get it from the SwTextNode. Needless
             to say the filter generally couldn't care less what type of
             numbering is in use.
 
-            @param rTxtNode
-            The SwTxtNode that is the paragraph
+            @param rTextNode
+            The SwTextNode that is the paragraph
 
-            @return A SwNumFmt pointer that describes the numbering level
+            @return A SwNumFormat pointer that describes the numbering level
             on this paragraph, or 0 if there is none.
 
             @author
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
-        const SwNumFmt* GetNumFmtFromTxtNode(const SwTxtNode &rTxtNode);
+        const SwNumFormat* GetNumFormatFromTextNode(const SwTextNode &rTextNode);
 
         /** Get the Numbering Format for a given level from a numbering rule
 
@@ -678,37 +678,37 @@ namespace sw
             @param nLevel
             The numbering level
 
-            @return A SwNumFmt pointer that describes the numbering level
+            @return A SwNumFormat pointer that describes the numbering level
             or 0 if the nLevel is out of range
 
             @author
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
-        const SwNumFmt* GetNumFmtFromSwNumRuleLevel(const SwNumRule &rRule,
+        const SwNumFormat* GetNumFormatFromSwNumRuleLevel(const SwNumRule &rRule,
             int nLevel);
 
-        const SwNumRule* GetNumRuleFromTxtNode(const SwTxtNode &rTxtNd);
-        const SwNumRule* GetNormalNumRuleFromTxtNode(const SwTxtNode &rTxtNd);
+        const SwNumRule* GetNumRuleFromTextNode(const SwTextNode &rTextNd);
+        const SwNumRule* GetNormalNumRuleFromTextNode(const SwTextNode &rTextNd);
 
-        /** Get the SwNoTxtNode associated with a SwFrmFmt if here is one
+        /** Get the SwNoTextNode associated with a SwFrameFormat if here is one
 
             There are two differing types of numbering formats that may be on a
             paragraph, normal and outline. The outline is that numbering you
             see in tools->outline numbering. Theres no difference in the
-            numbering itself, just how you get it from the SwTxtNode. Needless
+            numbering itself, just how you get it from the SwTextNode. Needless
             to say the filter generally couldn't care less what type of
             numbering is in use.
 
-            @param rFmt
-            The SwFrmFmt that may describe a graphic
+            @param rFormat
+            The SwFrameFormat that may describe a graphic
 
-            @return A SwNoTxtNode pointer that describes the graphic of this
+            @return A SwNoTextNode pointer that describes the graphic of this
             frame if there is one, or 0 if there is none.
 
             @author
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
-        SwNoTxtNode *GetNoTxtNodeFromSwFrmFmt(const SwFrmFmt &rFmt);
+        SwNoTextNode *GetNoTextNodeFromSwFrameFormat(const SwFrameFormat &rFormat);
 
         /** Does a node have a "page break before" applied
 
@@ -742,7 +742,7 @@ namespace sw
         Polygon PolygonFromPolyPolygon(const tools::PolyPolygon &rPolyPoly);
 
         /// Undo all scaling / move tricks of the wrap polygon done during import.
-        Polygon CorrectWordWrapPolygonForExport(const tools::PolyPolygon& rPolyPoly, const SwNoTxtNode* pNd);
+        Polygon CorrectWordWrapPolygonForExport(const tools::PolyPolygon& rPolyPoly, const SwNoTextNode* pNd);
 
         /** Make setting a drawing object's layer in a Writer document easy
 
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 876e2d90ddfb..0fa3905c3174 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -53,7 +53,7 @@ using namespace css;
 
 namespace myImplHelpers
 {
-    SwTwips CalcHdFtDist(const SwFrmFmt& rFmt, sal_uInt16 nSpacing)
+    SwTwips CalcHdFtDist(const SwFrameFormat& rFormat, sal_uInt16 nSpacing)
     {
         /*
         The normal case for reexporting word docs is to have dynamic spacing,
@@ -66,21 +66,21 @@ namespace myImplHelpers
         height, which is totally nonoptimum, but the best we can do.
         */
         long nDist=0;
-        const SwFmtFrmSize& rSz = rFmt.GetFrmSize();
+        const SwFormatFrmSize& rSz = rFormat.GetFrmSize();
 
         const SwHeaderAndFooterEatSpacingItem &rSpacingCtrl =
             sw::util::ItemGet<SwHeaderAndFooterEatSpacingItem>
-            (rFmt, RES_HEADER_FOOTER_EAT_SPACING);
+            (rFormat, RES_HEADER_FOOTER_EAT_SPACING);
         if (rSpacingCtrl.GetValue())
             nDist += rSz.GetHeight();
         else
         {
-            SwRect aRect(rFmt.FindLayoutRect(false));
+            SwRect aRect(rFormat.FindLayoutRect(false));
             if (aRect.Height())
                 nDist += aRect.Height();
             else
             {
-                const SwFmtFrmSize& rSize = rFmt.GetFrmSize();
+                const SwFormatFrmSize& rSize = rFormat.GetFrmSize();
                 if (ATT_VAR_SIZE != rSize.GetHeightSizeType())
                     nDist += rSize.GetHeight();
                 else
@@ -93,18 +93,18 @@ namespace myImplHelpers
         return nDist;
     }
 
-    SwTwips CalcHdDist(const SwFrmFmt& rFmt)
+    SwTwips CalcHdDist(const SwFrameFormat& rFormat)
     {
-        return CalcHdFtDist(rFmt, rFmt.GetULSpace().GetUpper());
+        return CalcHdFtDist(rFormat, rFormat.GetULSpace().GetUpper());
     }
 
-    SwTwips CalcFtDist(const SwFrmFmt& rFmt)
+    SwTwips CalcFtDist(const SwFrameFormat& rFormat)
     {
-        return CalcHdFtDist(rFmt, rFmt.GetULSpace().GetLower());
+        return CalcHdFtDist(rFormat, rFormat.GetULSpace().GetLower());
     }
 
     /*
-     SwTxtFmtColl and SwCharFmt are quite distinct types and how they are
+     SwTextFormatColl and SwCharFormat are quite distinct types and how they are
      gotten is also distinct, but the algorithm to match word's eqivalents into
      them is the same, so we put the different stuff into two separate helper
      implementations and a core template that uses the helpers that uses the
@@ -113,18 +113,18 @@ namespace myImplHelpers
      to use from a simple argument to the algorithm class
     */
     template <class C> class MapperImpl;
-    template<> class MapperImpl<SwTxtFmtColl>
+    template<> class MapperImpl<SwTextFormatColl>
     {
     private:
         SwDoc &mrDoc;
     public:
         MapperImpl(SwDoc &rDoc) : mrDoc(rDoc) {}
-        SwTxtFmtColl* GetBuiltInStyle(ww::sti eSti);
-        SwTxtFmtColl* GetStyle(const OUString &rName);
-        SwTxtFmtColl* MakeStyle(const OUString &rName);
+        SwTextFormatColl* GetBuiltInStyle(ww::sti eSti);
+        SwTextFormatColl* GetStyle(const OUString &rName);
+        SwTextFormatColl* MakeStyle(const OUString &rName);
     };
 
-    SwTxtFmtColl* MapperImpl<SwTxtFmtColl>::GetBuiltInStyle(ww::sti eSti)
+    SwTextFormatColl* MapperImpl<SwTextFormatColl>::GetBuiltInStyle(ww::sti eSti)
     {
         const RES_POOL_COLLFMT_TYPE RES_NONE  = RES_POOLCOLL_DOC_END;
         static const RES_POOL_COLLFMT_TYPE aArr[]=
@@ -156,43 +156,43 @@ namespace myImplHelpers
 
         OSL_ENSURE(SAL_N_ELEMENTS(aArr) == 75, "Style Array has false size");
 
-        SwTxtFmtColl* pRet = 0;
+        SwTextFormatColl* pRet = 0;
         //If this is a built-in word style that has a built-in writer
         //equivalent, then map it to one of our built in styles regardless
         //of its name
         if (sal::static_int_cast< size_t >(eSti) < SAL_N_ELEMENTS(aArr) && aArr[eSti] != RES_NONE)
-            pRet = mrDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( static_cast< sal_uInt16 >(aArr[eSti]), false);
+            pRet = mrDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( static_cast< sal_uInt16 >(aArr[eSti]), false);
         return pRet;
     }
 
-    SwTxtFmtColl* MapperImpl<SwTxtFmtColl>::GetStyle(const OUString &rName)
+    SwTextFormatColl* MapperImpl<SwTextFormatColl>::GetStyle(const OUString &rName)
     {
         return sw::util::GetParaStyle(mrDoc, rName);
     }
 
-    SwTxtFmtColl* MapperImpl<SwTxtFmtColl>::MakeStyle(const OUString &rName)
+    SwTextFormatColl* MapperImpl<SwTextFormatColl>::MakeStyle(const OUString &rName)
     {
-        return mrDoc.MakeTxtFmtColl(rName,
-            const_cast<SwTxtFmtColl *>(mrDoc.GetDfltTxtFmtColl()));
+        return mrDoc.MakeTextFormatColl(rName,
+            const_cast<SwTextFormatColl *>(mrDoc.GetDfltTextFormatColl()));
     }
 
-    template<> class MapperImpl<SwCharFmt>
+    template<> class MapperImpl<SwCharFormat>
     {
     private:
         SwDoc &mrDoc;
     public:
         MapperImpl(SwDoc &rDoc) : mrDoc(rDoc) {}
-        SwCharFmt* GetBuiltInStyle(ww::sti eSti);
-        SwCharFmt* GetStyle(const OUString &rName);
-        SwCharFmt* MakeStyle(const OUString &rName);
+        SwCharFormat* GetBuiltInStyle(ww::sti eSti);
+        SwCharFormat* GetStyle(const OUString &rName);
+        SwCharFormat* MakeStyle(const OUString &rName);
     };
 
-    SwCharFmt* MapperImpl<SwCharFmt>::GetBuiltInStyle(ww::sti eSti)
+    SwCharFormat* MapperImpl<SwCharFormat>::GetBuiltInStyle(ww::sti eSti)
     {
         RES_POOL_CHRFMT_TYPE eLookup = RES_POOLCHR_NORMAL_END;
         switch (eSti)
         {
-            case ww::stiFtnRef:
+            case ww::stiFootnoteRef:
                 eLookup = RES_POOLCHR_FOOTNOTE;
                 break;
             case ww::stiLnn:
@@ -220,20 +220,20 @@ namespace myImplHelpers
                 eLookup = RES_POOLCHR_NORMAL_END;
                 break;
         }
-        SwCharFmt *pRet = 0;
+        SwCharFormat *pRet = 0;
         if (eLookup != RES_POOLCHR_NORMAL_END)
-            pRet = mrDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool( static_cast< sal_uInt16 >(eLookup) );
+            pRet = mrDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( static_cast< sal_uInt16 >(eLookup) );
         return pRet;
     }
 
-    SwCharFmt* MapperImpl<SwCharFmt>::GetStyle(const OUString &rName)
+    SwCharFormat* MapperImpl<SwCharFormat>::GetStyle(const OUString &rName)
     {
         return sw::util::GetCharStyle(mrDoc, rName);
     }
 
-    SwCharFmt* MapperImpl<SwCharFmt>::MakeStyle(const OUString &rName)
+    SwCharFormat* MapperImpl<SwCharFormat>::MakeStyle(const OUString &rName)
     {
-        return mrDoc.MakeCharFmt(rName, mrDoc.GetDfltCharFmt());
+        return mrDoc.MakeCharFormat(rName, mrDoc.GetDfltCharFormat());
     }
 
     template<class C> class StyleMapperImpl
@@ -336,10 +336,10 @@ namespace myImplHelpers
 }
 
 /// Count what Word calls left/right margin from a format's LRSpace + Box.
-static SvxLRSpaceItem lcl_getWordLRSpace(const SwFrmFmt& rFmt)
+static SvxLRSpaceItem lcl_getWordLRSpace(const SwFrameFormat& rFormat)
 {
-    SvxLRSpaceItem aLR(rFmt.GetLRSpace());
-    const SvxBoxItem& rBox = rFmt.GetBox();
+    SvxLRSpaceItem aLR(rFormat.GetLRSpace());
+    const SvxBoxItem& rBox = rFormat.GetBox();
 
     aLR.SetLeft(aLR.GetLeft() + rBox.GetDistance(SvxBoxItemLine::LEFT));
     if (const editeng::SvxBorderLine* pLeft = rBox.GetLeft())
@@ -357,18 +357,18 @@ namespace sw
     namespace util
     {
 
-        bool IsPlausableSingleWordSection(const SwFrmFmt &rTitleFmt, const SwFrmFmt &rFollowFmt)
+        bool IsPlausableSingleWordSection(const SwFrameFormat &rTitleFormat, const SwFrameFormat &rFollowFormat)
         {
             bool bPlausableSingleWordSection = true;
 
-            const SwFmtCol& rFirstCols = rTitleFmt.GetCol();
-            const SwFmtCol& rFollowCols = rFollowFmt.GetCol();
+            const SwFormatCol& rFirstCols = rTitleFormat.GetCol();
+            const SwFormatCol& rFollowCols = rFollowFormat.GetCol();
             const SwColumns& rFirstColumns = rFirstCols.GetColumns();
             const SwColumns& rFollowColumns = rFollowCols.GetColumns();
-            SvxLRSpaceItem aOneLR = lcl_getWordLRSpace(rTitleFmt);
-            SvxLRSpaceItem aTwoLR = lcl_getWordLRSpace(rFollowFmt);
-            const SwFmtFrmSize& rFirstFrmSize = rTitleFmt.GetFrmSize();
-            const SwFmtFrmSize& rFollowFrmSize = rFollowFmt.GetFrmSize();
+            SvxLRSpaceItem aOneLR = lcl_getWordLRSpace(rTitleFormat);
+            SvxLRSpaceItem aTwoLR = lcl_getWordLRSpace(rFollowFormat);
+            const SwFormatFrmSize& rFirstFrmSize = rTitleFormat.GetFrmSize();
+            const SwFormatFrmSize& rFollowFrmSize = rFollowFormat.GetFrmSize();
 
             if (rFirstColumns.size() != rFollowColumns.size())
             {
@@ -381,8 +381,8 @@ namespace sw
                 bPlausableSingleWordSection = false;
             else
             {
-                HdFtDistanceGlue aOne(rTitleFmt.GetAttrSet());
-                HdFtDistanceGlue aTwo(rFollowFmt.GetAttrSet());
+                HdFtDistanceGlue aOne(rTitleFormat.GetAttrSet());
+                HdFtDistanceGlue aTwo(rFollowFormat.GetAttrSet());
                 //e.g. #i14509#
                 if (!aOne.StrictEqualTopBottom(aTwo))
                     bPlausableSingleWordSection = false;
@@ -410,20 +410,20 @@ namespace sw
             dyaTop = dyaHdrTop;
             dyaBottom = dyaHdrBottom;
 
-            const SwFmtHeader *pHd = HasItem<SwFmtHeader>(rPage, RES_HEADER);
-            if (pHd && pHd->IsActive() && pHd->GetHeaderFmt())
+            const SwFormatHeader *pHd = HasItem<SwFormatHeader>(rPage, RES_HEADER);
+            if (pHd && pHd->IsActive() && pHd->GetHeaderFormat())
             {
                 mbHasHeader = true;
-                dyaTop = dyaTop + static_cast< sal_uInt16 >( (myImplHelpers::CalcHdDist(*(pHd->GetHeaderFmt()))) );
+                dyaTop = dyaTop + static_cast< sal_uInt16 >( (myImplHelpers::CalcHdDist(*(pHd->GetHeaderFormat()))) );
             }
             else
                 mbHasHeader = false;
 
-            const SwFmtFooter *pFt = HasItem<SwFmtFooter>(rPage, RES_FOOTER);
-            if (pFt && pFt->IsActive() && pFt->GetFooterFmt())
+            const SwFormatFooter *pFt = HasItem<SwFormatFooter>(rPage, RES_FOOTER);
+            if (pFt && pFt->IsActive() && pFt->GetFooterFormat())
             {
                 mbHasFooter = true;
-                dyaBottom = dyaBottom + static_cast< sal_uInt16 >( (myImplHelpers::CalcFtDist(*(pFt->GetFooterFmt()))) );
+                dyaBottom = dyaBottom + static_cast< sal_uInt16 >( (myImplHelpers::CalcFtDist(*(pFt->GetFooterFormat()))) );
             }
             else
                 mbHasFooter = false;
@@ -454,7 +454,7 @@ namespace sw
         }
 
         ParaStyleMapper::ParaStyleMapper(SwDoc &rDoc)
-            : mpImpl(new myImplHelpers::StyleMapperImpl<SwTxtFmtColl>(rDoc))
+            : mpImpl(new myImplHelpers::StyleMapperImpl<SwTextFormatColl>(rDoc))
         {
         }
 
@@ -470,7 +470,7 @@ namespace sw
         }
 
         CharStyleMapper::CharStyleMapper(SwDoc &rDoc)
-            : mpImpl(new myImplHelpers::StyleMapperImpl<SwCharFmt>(rDoc))
+            : mpImpl(new myImplHelpers::StyleMapperImpl<SwCharFormat>(rDoc))
         {
         }
 
@@ -517,17 +517,17 @@ namespace sw
             return nA < nB;
         }
 
-        CharRuns GetPseudoCharRuns(const SwTxtNode& rTxtNd,
-            sal_Int32 nTxtStart, bool bSplitOnCharSet)
+        CharRuns GetPseudoCharRuns(const SwTextNode& rTextNd,
+            sal_Int32 nTextStart, bool bSplitOnCharSet)
         {
-            const OUString &rTxt = rTxtNd.GetTxt();
+            const OUString &rText = rTextNd.GetText();
 
             bool bParaIsRTL = false;
-            OSL_ENSURE(rTxtNd.GetDoc(), "No document for node?, suspicious");
-            if (rTxtNd.GetDoc())
+            OSL_ENSURE(rTextNd.GetDoc(), "No document for node?, suspicious");
+            if (rTextNd.GetDoc())
             {
                 if (FRMDIR_HORI_RIGHT_TOP ==
-                    rTxtNd.GetDoc()->GetTextDirection(SwPosition(rTxtNd)))
+                    rTextNd.GetDoc()->GetTextDirection(SwPosition(rTextNd)))
                 {
                     bParaIsRTL = true;
                 }
@@ -536,16 +536,16 @@ namespace sw
             using namespace ::com::sun::star::i18n;
 
             sal_uInt16 nScript = i18n::ScriptType::LATIN;
-            if (!rTxt.isEmpty() && g_pBreakIt && g_pBreakIt->GetBreakIter().is())
-                nScript = g_pBreakIt->GetBreakIter()->getScriptType(rTxt, 0);
+            if (!rText.isEmpty() && g_pBreakIt && g_pBreakIt->GetBreakIter().is())
+                nScript = g_pBreakIt->GetBreakIter()->getScriptType(rText, 0);
 
-            rtl_TextEncoding eChrSet = ItemGet<SvxFontItem>(rTxtNd,
+            rtl_TextEncoding eChrSet = ItemGet<SvxFontItem>(rTextNd,
                 GetWhichOfScript(RES_CHRATR_FONT, nScript)).GetCharSet();
             eChrSet = GetExtendedTextEncoding(eChrSet);
 
             CharRuns aRunChanges;
 
-            if (rTxt.isEmpty())
+            if (rText.isEmpty())
             {
                 aRunChanges.push_back(CharRunEntry(0, nScript, eChrSet,
                     bParaIsRTL));
@@ -570,8 +570,8 @@ namespace sw
 
             UBiDiDirection eDefaultDir = bParaIsRTL ? UBIDI_RTL : UBIDI_LTR;
             UErrorCode nError = U_ZERO_ERROR;
-            UBiDi* pBidi = ubidi_openSized(rTxt.getLength(), 0, &nError);
-            ubidi_setPara(pBidi, reinterpret_cast<const UChar *>(rTxt.getStr()), rTxt.getLength(),
+            UBiDi* pBidi = ubidi_openSized(rText.getLength(), 0, &nError);
+            ubidi_setPara(pBidi, reinterpret_cast<const UChar *>(rText.getStr()), rText.getLength(),
                     static_cast< UBiDiLevel >(eDefaultDir), 0, &nError);
 
             sal_Int32 nCount = ubidi_countRuns(pBidi, &nError);
@@ -603,15 +603,15 @@ namespace sw
             {
                 //Split unicode text into plausible 8bit ranges for export to
                 //older non unicode aware format
-                sal_Int32 nLen = rTxt.getLength();
+                sal_Int32 nLen = rText.getLength();
                 sal_Int32 nPos = 0;
                 while (nPos != nLen)
                 {
                     rtl_TextEncoding ScriptType =
-                        getBestMSEncodingByChar(rTxt[nPos++]);
+                        getBestMSEncodingByChar(rText[nPos++]);
                     while (
                             (nPos != nLen) &&
-                            (ScriptType == getBestMSEncodingByChar(rTxt[nPos]))
+                            (ScriptType == getBestMSEncodingByChar(rText[nPos]))
                           )
                     {
                         ++nPos;
@@ -625,17 +625,17 @@ namespace sw
 
             if (g_pBreakIt && g_pBreakIt->GetBreakIter().is())
             {
-                sal_Int32 nLen = rTxt.getLength();
+                sal_Int32 nLen = rText.getLength();
                 sal_Int32 nPos = 0;
                 while (nPos < nLen)
                 {
-                    sal_Int32 nEnd2 = g_pBreakIt->GetBreakIter()->endOfScript(rTxt, nPos,
+                    sal_Int32 nEnd2 = g_pBreakIt->GetBreakIter()->endOfScript(rText, nPos,
                         nScript);
                     if (nEnd2 < 0)
                         break;
                     nPos = nEnd2;
                     aScripts.push_back(ScriptEntry(nPos, nScript));
-                    nScript = g_pBreakIt->GetBreakIter()->getScriptType(rTxt, nPos);
+                    nScript = g_pBreakIt->GetBreakIter()->getScriptType(rText, nPos);
                 }
             }
 
@@ -655,7 +655,7 @@ namespace sw
                     aScriptIter != aScriptEnd
                   )
             {
-                sal_Int32 nMinPos = rTxt.getLength();
+                sal_Int32 nMinPos = rText.getLength();
 
                 if (aBiDiIter != aBiDiEnd)
                 {
@@ -701,7 +701,7 @@ namespace sw
             }
 
             aRunChanges.erase(std::remove_if(aRunChanges.begin(),
-                aRunChanges.end(), myImplHelpers::IfBeforeStart(nTxtStart)), aRunChanges.end());
+                aRunChanges.end(), myImplHelpers::IfBeforeStart(nTextStart)), aRunChanges.end());
 
             return aRunChanges;
         }
@@ -1123,18 +1123,18 @@ namespace sw
             return nPos>=rParams.getLength() || (rParams[nPos]!='M' && rParams[nPos]!='m');
         }
 
-        void SwapQuotesInField(OUString &rFmt)
+        void SwapQuotesInField(OUString &rFormat)
         {
             //Swap unescaped " and ' with ' and "
-            const sal_Int32 nLen = rFmt.getLength();
+            const sal_Int32 nLen = rFormat.getLength();
             for (sal_Int32 nI = 0; nI < nLen; ++nI)
             {
-                if (!nI || rFmt[nI-1]!='\\')
+                if (!nI || rFormat[nI-1]!='\\')
                 {
-                    if (rFmt[nI]=='\"')
-                        rFmt = rFmt.replaceAt(nI, 1, "\'");
-                    else if (rFmt[nI]=='\'')
-                        rFmt = rFmt.replaceAt(nI, 1, "\"");
+                    if (rFormat[nI]=='\"')
+                        rFormat = rFormat.replaceAt(nI, 1, "\'");
+                    else if (rFormat[nI]=='\'')
+                        rFormat = rFormat.replaceAt(nI, 1, "\"");
                 }
             }
         }
diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx
index 27e71e6dfd5b..8d4debcb1727 100644
--- a/sw/source/filter/ww8/writerwordglue.hxx
+++ b/sw/source/filter/ww8/writerwordglue.hxx
@@ -23,7 +23,7 @@
 #include "needed_cast.hxx"
 #include "types.hxx"
 
-class SwFrmFmt;
+class SwFrameFormat;
 class SfxItemSet;
 
 namespace sw
@@ -97,7 +97,7 @@ namespace sw
             follow frame and the title frame are the same from word persecptive
             except for the content of their headers.
 
-            @return true if the rTitleFmt followed by rFollowFmt could be
+            @return true if the rTitleFormat followed by rFollowFormat could be
             expressed in word as a single word Section with different title
             page enabled.
 
@@ -106,8 +106,8 @@ namespace sw
 
             @see #i4320#/#i14509#/#i11717# for examples
         */
-        bool IsPlausableSingleWordSection(const SwFrmFmt &rTitleFmt,
-            const SwFrmFmt &rFollowFmt);
+        bool IsPlausableSingleWordSection(const SwFrameFormat &rTitleFormat,
+            const SwFrameFormat &rFollowFormat);
 
         /** Make export a word section top/bottom values easy
 
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 10f2559bc410..b2b601d7e733 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -174,9 +174,9 @@ OUString SwBasicEscherEx::BuildFileName(sal_uInt16& rnLevel, bool& rbRel, const
     return aDosName;
 }
 
-void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFmtURL* pINetFmtArg)
+void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFormatURL* pINetFormatArg)
 {
-    if ( !pINetFmtArg ) return;
+    if ( !pINetFormatArg ) return;
 
     sal_uInt8 maGuidStdLink[ 16 ] ={
         0xD0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B };
@@ -200,8 +200,8 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm
     SvMemoryStream tmpStrm;
     OUString tmpTextMark;
 
-    OUString rUrl = pINetFmtArg->GetURL();
-    OUString rTarFrm = pINetFmtArg->GetTargetFrameName();
+    OUString rUrl = pINetFormatArg->GetURL();
+    OUString rTarFrm = pINetFormatArg->GetTargetFrameName();
     sal_uInt32          mnFlags = 0;
 
     INetURLObject aUrlObj( rUrl );
@@ -283,22 +283,22 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm
         delete[] pBuffer;
     }
 }
-void SwBasicEscherEx::PreWriteHyperlinkWithinFly(const SwFrmFmt& rFmt,EscherPropertyContainer& rPropOpt)
+void SwBasicEscherEx::PreWriteHyperlinkWithinFly(const SwFrameFormat& rFormat,EscherPropertyContainer& rPropOpt)
 {
     const SfxPoolItem* pItem;
-    const SwAttrSet& rAttrSet = rFmt.GetAttrSet();
+    const SwAttrSet& rAttrSet = rFormat.GetAttrSet();
     if (SfxItemState::SET == rAttrSet.GetItemState(RES_URL, true, &pItem))
     {
-        const SwFmtURL *pINetFmt = dynamic_cast<const SwFmtURL*>(pItem);
-        if (pINetFmt && !pINetFmt->GetURL().isEmpty())
+        const SwFormatURL *pINetFormat = dynamic_cast<const SwFormatURL*>(pItem);
+        if (pINetFormat && !pINetFormat->GetURL().isEmpty())
         {
             SvMemoryStream *rStrm = new SvMemoryStream ;
-            WriteHyperlinkWithinFly( *rStrm, pINetFmt );
+            WriteHyperlinkWithinFly( *rStrm, pINetFormat );
             sal_uInt8 const * pBuf = static_cast<sal_uInt8 const *>(rStrm->GetData());
             sal_uInt32 nSize = rStrm->Seek( STREAM_SEEK_TO_END );
             rPropOpt.AddOpt( ESCHER_Prop_pihlShape, true, nSize, const_cast<sal_uInt8 *>(pBuf), nSize );
             sal_uInt32 nValue;
-            OUString aNamestr = pINetFmt->GetName();
+            OUString aNamestr = pINetFormat->GetName();
             if (!aNamestr.isEmpty())
             {
                 rPropOpt.AddOpt(ESCHER_Prop_wzName, aNamestr );
@@ -322,7 +322,7 @@ namespace
     /// @returns The ordering number.
     static sal_uLong lcl_getSdrOrderNumber(const WW8Export& rWrt, DrawObj *pObj)
     {
-        return rWrt.GetSdrOrdNum(pObj->maCntnt.GetFrmFmt());
+        return rWrt.GetSdrOrdNum(pObj->maContent.GetFrameFormat());
     };
 
     /// A function object to act as a predicate comparing the ordering numbers
@@ -362,12 +362,12 @@ namespace
 }
 
 // get a part fix for this type of element
-bool WW8Export::MiserableFormFieldExportHack(const SwFrmFmt& rFrmFmt)
+bool WW8Export::MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat)
 {
     OSL_ENSURE(bWrtWW8, "Not allowed");
     if (!bWrtWW8)
         return false;
-    const SdrObject *pObject = rFrmFmt.FindRealSdrObject();
+    const SdrObject *pObject = rFrameFormat.FindRealSdrObject();
     if (!pObject || pObject->GetObjInventor() != FmFormInventor)
         return false;
 
@@ -467,7 +467,7 @@ void WW8Export::DoComboBox(const OUString &rName,
         0x03, 0x6a, 0,0,0,0,    // sprmCPicLocation
         0x06, 0x08, 0x01,       // sprmCFData
         0x55, 0x08, 0x01,       // sprmCFSpec
-        0x02, 0x08, 0x01        // sprmCFFldVanish
+        0x02, 0x08, 0x01        // sprmCFFieldVanish
     };
     sal_uInt8* pDataAdr = aArr1 + 2;
     Set_UInt32( pDataAdr, nDataStt );
@@ -513,7 +513,7 @@ void WW8Export::DoCheckBox(uno::Reference<beans::XPropertySet> xPropSet)
 
         0x06, 0x08, 0x01,       // sprmCFData
         0x55, 0x08, 0x01,       // sprmCFSpec
-        0x02, 0x08, 0x01        // sprmCFFldVanish
+        0x02, 0x08, 0x01        // sprmCFFieldVanish
     };
     sal_uInt8* pDataAdr = aArr1 + 2;
     Set_UInt32( pDataAdr, nDataStt );
@@ -559,7 +559,7 @@ void WW8Export::DoCheckBox(uno::Reference<beans::XPropertySet> xPropSet)
     OutputField(0, ww::eFORMCHECKBOX, OUString(), WRITEFIELD_CLOSE);
 }
 
-void WW8Export::DoFormText(const SwInputField * pFld)
+void WW8Export::DoFormText(const SwInputField * pField)
 {
     OutputField(0, ww::eFORMTEXT, FieldString(ww::eFORMTEXT),
         WRITEFIELD_START | WRITEFIELD_CMD_START);
@@ -569,7 +569,7 @@ void WW8Export::DoFormText(const SwInputField * pFld)
 
     WriteChar( 0x01 );
     static sal_uInt8 aArr1[] = {
-        0x02, 0x08, 0x81,        // sprmCFFldVanish
+        0x02, 0x08, 0x81,        // sprmCFFieldVanish
         0x03, 0x6a, 0,0,0,0,    // sprmCPicLocation
 
         0x06, 0x08, 0x01,       // sprmCFData
@@ -584,14 +584,14 @@ void WW8Export::DoFormText(const SwInputField * pFld)
     ::sw::WW8FFData aFFData;
 
     aFFData.setType(0);
-    aFFData.setName(pFld->GetPar2());
-    aFFData.setHelp(pFld->GetHelp());
-    aFFData.setStatus(pFld->GetToolTip());
+    aFFData.setName(pField->GetPar2());
+    aFFData.setHelp(pField->GetHelp());
+    aFFData.setStatus(pField->GetToolTip());
     aFFData.Write(pDataStrm);
 
     OutputField(0, ww::eFORMTEXT, OUString(), WRITEFIELD_CMD_END);
 
-    const OUString fieldStr( pFld->ExpandField(true) );
+    const OUString fieldStr( pField->ExpandField(true) );
     SwWW8Writer::WriteString16(Strm(), fieldStr, false);
 
     static sal_uInt8 aArr2[] = {
@@ -667,21 +667,21 @@ bool RTLDrawingsHack(long &rLeft, long /*nWidth*/,
     return bRet;
 }
 
-bool WW8Export::MiserableRTLFrmFmtHack(SwTwips &rLeft, SwTwips &rRight,
-    const sw::Frame &rFrmFmt)
+bool WW8Export::MiserableRTLFrameFormatHack(SwTwips &rLeft, SwTwips &rRight,
+    const sw::Frame &rFrameFormat)
 {
     //Require nasty bidi swap
-    if (FRMDIR_HORI_RIGHT_TOP != m_pDoc->GetTextDirection(rFrmFmt.GetPosition()))
+    if (FRMDIR_HORI_RIGHT_TOP != m_pDoc->GetTextDirection(rFrameFormat.GetPosition()))
         return false;
 
     SwTwips nWidth = rRight - rLeft;
     SwTwips nPageLeft, nPageRight;
     SwTwips nPageSize = CurrentPageWidth(nPageLeft, nPageRight);
 
-    const SwFmtHoriOrient& rHOr = rFrmFmt.GetFrmFmt().GetHoriOrient();
+    const SwFormatHoriOrient& rHOr = rFrameFormat.GetFrameFormat().GetHoriOrient();
 
     bool bRet = false;
-    sw::Frame::WriterSource eSource = rFrmFmt.GetWriterType();
+    sw::Frame::WriterSource eSource = rFrameFormat.GetWriterType();
     if (eSource == sw::Frame::eDrawing || eSource == sw::Frame::eFormControl)
     {
         if (RTLDrawingsHack(rLeft, nWidth, rHOr.GetHoriOrient(),
@@ -722,38 +722,38 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
         for (aIter = maDrawObjs.begin(); aIter < aEnd; ++aIter)
             SwWW8Writer::WriteLong(*rWrt.pTableStrm, aIter->mnCp - nCpOffs);
 
-        SwWW8Writer::WriteLong(*rWrt.pTableStrm, rFib.ccpText + rFib.ccpFtn +
+        SwWW8Writer::WriteLong(*rWrt.pTableStrm, rFib.ccpText + rFib.ccpFootnote +
             rFib.ccpHdr + rFib.ccpEdn + rFib.ccpTxbx + rFib.ccpHdrTxbx + 1);
 
         for (aIter = maDrawObjs.begin(); aIter < aEnd; ++aIter)
         {
             // write the fspa-struct
-            const sw::Frame &rFrmFmt = aIter->maCntnt;
-            const SwFrmFmt &rFmt = rFrmFmt.GetFrmFmt();
-            const SdrObject* pObj = rFmt.FindRealSdrObject();
+            const sw::Frame &rFrameFormat = aIter->maContent;
+            const SwFrameFormat &rFormat = rFrameFormat.GetFrameFormat();
+            const SdrObject* pObj = rFormat.FindRealSdrObject();
 
             Rectangle aRect;
-            SwFmtVertOrient rVOr = rFmt.GetVertOrient();
-            SwFmtHoriOrient rHOr = rFmt.GetHoriOrient();
+            SwFormatVertOrient rVOr = rFormat.GetVertOrient();
+            SwFormatHoriOrient rHOr = rFormat.GetHoriOrient();
             // #i30669# - convert the positioning attributes.
             // Most positions are converted, if layout information exists.
             const bool bPosConverted =
-                WinwordAnchoring::ConvertPosition( rHOr, rVOr, rFmt );
+                WinwordAnchoring::ConvertPosition( rHOr, rVOr, rFormat );
 
             Point aObjPos;
-            if (RES_FLYFRMFMT == rFmt.Which())
+            if (RES_FLYFRMFMT == rFormat.Which())
             {
-                SwRect aLayRect(rFmt.FindLayoutRect(false, &aObjPos));
+                SwRect aLayRect(rFormat.FindLayoutRect(false, &aObjPos));
                 // the Object is not visible - so get the values from
                 // the format. The Position may not be correct.
                 if( aLayRect.IsEmpty() )
-                    aRect.SetSize( rFmt.GetFrmSize().GetSize() );
+                    aRect.SetSize( rFormat.GetFrmSize().GetSize() );
                 else
                 {
                     // #i56090# Do not only consider the first client
                     // Note that we actually would have to find the maximum size of the
                     // frame format clients. However, this already should work in most cases.
-                    const SwRect aSizeRect(rFmt.FindLayoutRect());
+                    const SwRect aSizeRect(rFormat.FindLayoutRect());
                     if ( aSizeRect.Width() > aLayRect.Width() )
                         aLayRect.Width( aSizeRect.Width() );
 
@@ -798,7 +798,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
 
             //If we are being exported as an inline hack, set
             //corner to 0 and forget about border thickness for positioning
-            if (rFrmFmt.IsInline())
+            if (rFrameFormat.IsInline())
             {
                 aRect.SetPos(Point(0,0));
                 nThick = 0;
@@ -811,7 +811,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
             SwTwips nRight = aRect.Right() - nThick;
 
             //Nasty swap for bidi if necessary
-            rWrt.MiserableRTLFrmFmtHack(nLeft, nRight, rFrmFmt);
+            rWrt.MiserableRTLFrameFormatHack(nLeft, nRight, rFrameFormat);
 
             //xaLeft/yaTop/xaRight/yaBottom - rel. to anchor
             //(most of) the border is outside the graphic is word, so
@@ -824,12 +824,12 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
             //fHdr/bx/by/wr/wrk/fRcaSimple/fBelowText/fAnchorLock
             sal_uInt16 nFlags=0;
             //If nFlags isn't 0x14 its overridden by the escher properties
-            if (FLY_AT_PAGE == rFmt.GetAnchor().GetAnchorId())
+            if (FLY_AT_PAGE == rFormat.GetAnchor().GetAnchorId())
                 nFlags = 0x0000;
             else
                 nFlags = 0x0014;        // x-rel to text,  y-rel to text
 
-            const SwFmtSurround& rSurr = rFmt.GetSurround();
+            const SwFormatSurround& rSurr = rFormat.GetSurround();
             sal_uInt16 nContour = rSurr.IsContour() ? 0x0080 : 0x0040;
             SwSurround eSurround = rSurr.GetSurround();
 
@@ -839,7 +839,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
              the shape field hack are required to be wrap through so as to flow
              over the following dummy 0x01 graphic
             */
-            if (rFrmFmt.IsInline())
+            if (rFrameFormat.IsInline())
                 eSurround = SURROUND_THROUGHT;
 
             switch (eSurround)
@@ -876,7 +876,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
              #i3958# Required to make this inline stuff work in WordXP, not
              needed for 2003 interestingly
              */
-            if (rFrmFmt.IsInline())
+            if (rFrameFormat.IsInline())
                 nFlags |= 0x8000;
 
             SwWW8Writer::WriteShort(*rWrt.pTableStrm, nFlags);
@@ -889,14 +889,14 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
     }
 }
 
-void MainTxtPlcDrawObj::RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart,
+void MainTextPlcDrawObj::RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart,
     sal_uInt32 nLen) const
 {
     rFib.fcPlcfspaMom = nStart;
     rFib.lcbPlcfspaMom = nLen;
 }
 
-WW8_CP MainTxtPlcDrawObj::GetCpOffset(const WW8Fib &) const
+WW8_CP MainTextPlcDrawObj::GetCpOffset(const WW8Fib &) const
 {
     return 0;
 }
@@ -910,14 +910,14 @@ void HdFtPlcDrawObj::RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart,
 
 WW8_CP HdFtPlcDrawObj::GetCpOffset(const WW8Fib &rFib) const
 {
-    return rFib.ccpText + rFib.ccpFtn;
+    return rFib.ccpText + rFib.ccpFootnote;
 }
 
 DrawObj& DrawObj::operator=(const DrawObj& rOther)
 {
     mnCp = rOther.mnCp;
     mnShapeId = rOther.mnShapeId;
-    maCntnt = rOther.maCntnt;
+    maContent = rOther.maContent;
     maParentPos = rOther.maParentPos;
     mnThick = rOther.mnThick;
     mnDirection = rOther.mnDirection;
@@ -925,17 +925,17 @@ DrawObj& DrawObj::operator=(const DrawObj& rOther)
     return *this;
 }
 
-bool PlcDrawObj::Append( WW8Export& rWrt, WW8_CP nCp, const sw::Frame& rFmt,
+bool PlcDrawObj::Append( WW8Export& rWrt, WW8_CP nCp, const sw::Frame& rFormat,
     const Point& rNdTopLeft )
 {
     bool bRet = false;
-    const SwFrmFmt &rFrameFormat = rFmt.GetFrmFmt();
-    if (TXT_HDFT == rWrt.m_nTxtTyp || TXT_MAINTEXT == rWrt.m_nTxtTyp)
+    const SwFrameFormat &rFrameFormat = rFormat.GetFrameFormat();
+    if (TXT_HDFT == rWrt.m_nTextTyp || TXT_MAINTEXT == rWrt.m_nTextTyp)
     {
         if (RES_FLYFRMFMT == rFrameFormat.Which())
         {
             // check for textflyframe and if it is the first in a Chain
-            if (rFrameFormat.GetCntnt().GetCntntIdx())
+            if (rFrameFormat.GetContent().GetContentIdx())
                 bRet = true;
         }
         else
@@ -944,7 +944,7 @@ bool PlcDrawObj::Append( WW8Export& rWrt, WW8_CP nCp, const sw::Frame& rFmt,
 
     if (bRet)
     {
-        DrawObj aObj(rFmt, nCp, rNdTopLeft, rWrt.TrueFrameDirection(rFrameFormat),
+        DrawObj aObj(rFormat, nCp, rNdTopLeft, rWrt.TrueFrameDirection(rFrameFormat),
             rWrt.GetHdFtIndex());
         maDrawObjs.push_back(aObj);
     }
@@ -957,57 +957,57 @@ void DrawObj::SetShapeDetails(sal_uInt32 nId, sal_Int32 nThick)
     mnThick = nThick;
 }
 
-bool WW8_WrPlcTxtBoxes::WriteTxt( WW8Export& rWrt )
+bool WW8_WrPlcTextBoxes::WriteText( WW8Export& rWrt )
 {
     rWrt.m_bInWriteEscher = true;
     WW8_CP& rccp=TXT_TXTBOX == nTyp ? rWrt.pFib->ccpTxbx : rWrt.pFib->ccpHdrTxbx;
 
-    bool bRet = WriteGenericTxt( rWrt, nTyp, rccp );
+    bool bRet = WriteGenericText( rWrt, nTyp, rccp );
 
     WW8_CP nCP = rWrt.Fc2Cp( rWrt.Strm().Tell() );
     WW8Fib& rFib = *rWrt.pFib;
-    WW8_CP nMyOffset = rFib.ccpText + rFib.ccpFtn + rFib.ccpHdr + rFib.ccpAtn
+    WW8_CP nMyOffset = rFib.ccpText + rFib.ccpFootnote + rFib.ccpHdr + rFib.ccpAtn
                             + rFib.ccpEdn;
     if( TXT_TXTBOX == nTyp )
-        rWrt.m_pFldTxtBxs->Finish( nCP, nMyOffset );
+        rWrt.m_pFieldTextBxs->Finish( nCP, nMyOffset );
     else
-        rWrt.m_pFldHFTxtBxs->Finish( nCP, nMyOffset + rFib.ccpTxbx );
+        rWrt.m_pFieldHFTextBxs->Finish( nCP, nMyOffset + rFib.ccpTxbx );
     rWrt.m_bInWriteEscher = false;
     return bRet;
 }
 
-void WW8_WrPlcTxtBoxes::Append( const SdrObject& rObj, sal_uInt32 nShapeId )
+void WW8_WrPlcTextBoxes::Append( const SdrObject& rObj, sal_uInt32 nShapeId )
 {
-    aCntnt.push_back( &rObj );
+    aContent.push_back( &rObj );
     aShapeIds.push_back( nShapeId );
     //save NULL, if we have an actual SdrObject
-    aSpareFmts.push_back(NULL);
+    aSpareFormats.push_back(NULL);
 }
 
-void WW8_WrPlcTxtBoxes::Append( const SwFrmFmt* pFmt, sal_uInt32 nShapeId )
+void WW8_WrPlcTextBoxes::Append( const SwFrameFormat* pFormat, sal_uInt32 nShapeId )
 {
-    //no sdr object, we insert a NULL in the aCntnt and save the real fmt in aSpareFmts.
-    aCntnt.push_back( NULL );
+    //no sdr object, we insert a NULL in the aContent and save the real fmt in aSpareFormats.
+    aContent.push_back( NULL );
     aShapeIds.push_back( nShapeId );
-    aSpareFmts.push_back(pFmt);
+    aSpareFormats.push_back(pFormat);
 }
 
-const std::vector<sal_uInt32>* WW8_WrPlcTxtBoxes::GetShapeIdArr() const
+const std::vector<sal_uInt32>* WW8_WrPlcTextBoxes::GetShapeIdArr() const
 {
     return &aShapeIds;
 }
 
-sal_uInt32 WW8Export::GetSdrOrdNum( const SwFrmFmt& rFmt ) const
+sal_uInt32 WW8Export::GetSdrOrdNum( const SwFrameFormat& rFormat ) const
 {
     sal_uInt32 nOrdNum;
-    const SdrObject* pObj = rFmt.FindRealSdrObject();
+    const SdrObject* pObj = rFormat.FindRealSdrObject();
     if( pObj )
         nOrdNum = pObj->GetOrdNum();
     else
     {
         // no Layout for this format, then recalc the ordnum
-        SwFrmFmt* pFmt = const_cast<SwFrmFmt*>(&rFmt);
-        nOrdNum = static_cast<sal_uInt32>(m_pDoc->GetSpzFrmFmts()->GetPos( pFmt ));
+        SwFrameFormat* pFormat = const_cast<SwFrameFormat*>(&rFormat);
+        nOrdNum = static_cast<sal_uInt32>(m_pDoc->GetSpzFrameFormats()->GetPos( pFormat ));
 
         const SwDrawModel* pModel = m_pDoc->getIDocumentDrawModelAccess().GetDrawModel();
         if( pModel )
@@ -1016,7 +1016,7 @@ sal_uInt32 WW8Export::GetSdrOrdNum( const SwFrmFmt& rFmt ) const
     return nOrdNum;
 }
 
-void WW8Export::AppendFlyInFlys(const sw::Frame& rFrmFmt,
+void WW8Export::AppendFlyInFlys(const sw::Frame& rFrameFormat,
     const Point& rNdTopLeft)
 {
     OSL_ENSURE(bWrtWW8, "this has gone horribly wrong");
@@ -1024,19 +1024,19 @@ void WW8Export::AppendFlyInFlys(const sw::Frame& rFrmFmt,
     if (m_pEscher)
         return ;
     PlcDrawObj *pDrwO;
-    if (TXT_HDFT == m_nTxtTyp)
+    if (TXT_HDFT == m_nTextTyp)
         pDrwO = m_pHFSdrObjs;
     else
         pDrwO = m_pSdrObjs;
 
-    if (rFrmFmt.IsInline())
+    if (rFrameFormat.IsInline())
     {
         OutputField(0, ww::eSHAPE, FieldString(ww::eSHAPE),
             WRITEFIELD_START | WRITEFIELD_CMD_START | WRITEFIELD_CMD_END);
     }
 
     WW8_CP nCP = Fc2Cp(Strm().Tell());
-    bool bSuccess = pDrwO->Append(*this, nCP, rFrmFmt, rNdTopLeft);
+    bool bSuccess = pDrwO->Append(*this, nCP, rFrameFormat, rNdTopLeft);
     OSL_ENSURE(bSuccess, "Couldn't export a graphical element!");
 
     if (bSuccess)
@@ -1054,11 +1054,11 @@ void WW8Export::AppendFlyInFlys(const sw::Frame& rFrmFmt,
         m_pChpPlc->AppendFkpEntry( Strm().Tell(), sizeof( aSpec8 ), aSpec8 );
 
         //Need dummy picture frame
-        if (rFrmFmt.IsInline())
-            OutGrf(rFrmFmt);
+        if (rFrameFormat.IsInline())
+            OutGrf(rFrameFormat);
     }
 
-    if (rFrmFmt.IsInline())
+    if (rFrameFormat.IsInline())
         OutputField(0, ww::eSHAPE, OUString(), WRITEFIELD_CLOSE);
 }
 
@@ -1075,7 +1075,7 @@ void MSWord_SdrAttrIter::NextPara( sal_Int32 nPar )
     // Attributwechsel an Pos 0 wird ignoriert, da davon ausgegangen
     // wird, dass am Absatzanfang sowieso die Attribute neu ausgegeben
     // werden.
-    aChrTxtAtrArr.clear();
+    aChrTextAtrArr.clear();
     aChrSetArr.clear();
     nAktSwPos = nTmpSwPos = 0;
 
@@ -1088,7 +1088,7 @@ void MSWord_SdrAttrIter::NextPara( sal_Int32 nPar )
     else
         nScript = i18n::ScriptType::LATIN;
 
-    pEditObj->GetCharAttribs( nPara, aTxtAtrArr );
+    pEditObj->GetCharAttribs( nPara, aTextAtrArr );
     nAktSwPos = SearchNext( 1 );
 }
 
@@ -1099,11 +1099,11 @@ rtl_TextEncoding MSWord_SdrAttrIter::GetNextCharSet() const
     return eNdChrSet;
 }
 
-// der erste Parameter in SearchNext() liefert zurueck, ob es ein TxtAtr ist.
+// der erste Parameter in SearchNext() liefert zurueck, ob es ein TextAtr ist.
 sal_Int32 MSWord_SdrAttrIter::SearchNext( sal_Int32 nStartPos )
 {
     sal_Int32 nMinPos = SAL_MAX_INT32;
-    for(std::vector<EECharAttrib>::const_iterator i = aTxtAtrArr.begin(); i < aTxtAtrArr.end(); ++i)
+    for(std::vector<EECharAttrib>::const_iterator i = aTextAtrArr.begin(); i < aTextAtrArr.end(); ++i)
     {
         sal_Int32 nPos = i->nStart; // gibt erstes Attr-Zeichen
         if( nPos >= nStartPos && nPos <= nMinPos )
@@ -1134,16 +1134,16 @@ void MSWord_SdrAttrIter::SetCharSet(const EECharAttrib& rAttr, bool bStart)
     {
         rtl_TextEncoding eChrSet = static_cast<const SvxFontItem&>(rItem).GetCharSet();
         aChrSetArr.push_back( eChrSet );
-        aChrTxtAtrArr.push_back( &rAttr );
+        aChrTextAtrArr.push_back( &rAttr );
     }
     else
     {
         std::vector<const EECharAttrib*>::iterator it =
-           std::find( aChrTxtAtrArr.begin(), aChrTxtAtrArr.end(), &rAttr );
-        if ( it != aChrTxtAtrArr.end() )
+           std::find( aChrTextAtrArr.begin(), aChrTextAtrArr.end(), &rAttr );
+        if ( it != aChrTextAtrArr.end() )
         {
-            aChrSetArr.erase( aChrSetArr.begin() + (it - aChrTxtAtrArr.begin()) );
-            aChrTxtAtrArr.erase( it );
+            aChrSetArr.erase( aChrSetArr.begin() + (it - aChrTextAtrArr.begin()) );
+            aChrTextAtrArr.erase( it );
         }
     }
 }
@@ -1151,19 +1151,19 @@ void MSWord_SdrAttrIter::SetCharSet(const EECharAttrib& rAttr, bool bStart)
 void MSWord_SdrAttrIter::OutEEField(const SfxPoolItem& rHt)
 {
     const SvxFieldItem &rField = static_cast<const SvxFieldItem &>(rHt);
-    const SvxFieldData *pFld = rField.GetField();
-    if (pFld && pFld->ISA(SvxURLField))
+    const SvxFieldData *pField = rField.GetField();
+    if (pField && pField->ISA(SvxURLField))
     {
-        sal_uInt8 nOldTxtTyp = m_rExport.m_nTxtTyp;
-        m_rExport.m_nTxtTyp = mnTyp;
-        const SvxURLField *pURL = static_cast<const SvxURLField *>(pFld);
+        sal_uInt8 nOldTextTyp = m_rExport.m_nTextTyp;
+        m_rExport.m_nTextTyp = mnTyp;
+        const SvxURLField *pURL = static_cast<const SvxURLField *>(pField);
         m_rExport.AttrOutput().StartURL( pURL->GetURL(), pURL->GetTargetFrame() );
 
         const OUString &rStr = pURL->GetRepresentation();
         m_rExport.AttrOutput().RawText( rStr, true, GetNodeCharSet() ); // FIXME kendy: is the 'true' actually correct here?  It was here before, but... ;-)
 
         m_rExport.AttrOutput().EndURL(false);
-        m_rExport.m_nTxtTyp = nOldTxtTyp;
+        m_rExport.m_nTextTyp = nOldTextTyp;
     }
 }
 
@@ -1175,9 +1175,9 @@ void MSWord_SdrAttrIter::OutAttr( sal_Int32 nSwPos )
     //duplicate attributes in docx export. Doesn't matter in doc
     //export as later props just override earlier ones.
     std::set<sal_uInt16> aUsedRunWhichs;
-    if (!aTxtAtrArr.empty())
+    if (!aTextAtrArr.empty())
     {
-        for(std::vector<EECharAttrib>::const_iterator i = aTxtAtrArr.begin(); i < aTxtAtrArr.end(); ++i)
+        for(std::vector<EECharAttrib>::const_iterator i = aTextAtrArr.begin(); i < aTextAtrArr.end(); ++i)
         {
             if (nSwPos >= i->nStart && nSwPos < i->nEnd)
             {
@@ -1192,10 +1192,10 @@ void MSWord_SdrAttrIter::OutAttr( sal_Int32 nSwPos )
 
     OutParaAttr(true, &aUsedRunWhichs);
 
-    if (!aTxtAtrArr.empty())
+    if (!aTextAtrArr.empty())
     {
-        const SwModify* pOldMod = m_rExport.m_pOutFmtNode;
-        m_rExport.m_pOutFmtNode = 0;
+        const SwModify* pOldMod = m_rExport.m_pOutFormatNode;
+        m_rExport.m_pOutFormatNode = 0;
 
         const SfxItemPool* pSrcPool = pEditPool;
         const SfxItemPool& rDstPool = m_rExport.m_pDoc->GetAttrPool();
@@ -1203,7 +1203,7 @@ void MSWord_SdrAttrIter::OutAttr( sal_Int32 nSwPos )
         nTmpSwPos = nSwPos;
         // Did we already produce a <w:sz> element?
         m_rExport.m_bFontSizeWritten = false;
-        for(std::vector<EECharAttrib>::const_iterator i = aTxtAtrArr.begin(); i < aTxtAtrArr.end(); ++i)
+        for(std::vector<EECharAttrib>::const_iterator i = aTextAtrArr.begin(); i < aTextAtrArr.end(); ++i)
         {
             if (nSwPos >= i->nStart && nSwPos < i->nEnd)
             {
@@ -1247,13 +1247,13 @@ void MSWord_SdrAttrIter::OutAttr( sal_Int32 nSwPos )
         m_rExport.m_bFontSizeWritten = false;
 
         nTmpSwPos = 0;      // HasTextItem nur in dem obigen Bereich erlaubt
-        m_rExport.m_pOutFmtNode = pOldMod;
+        m_rExport.m_pOutFormatNode = pOldMod;
     }
 }
 
-bool MSWord_SdrAttrIter::IsTxtAttr(sal_Int32 nSwPos)
+bool MSWord_SdrAttrIter::IsTextAttr(sal_Int32 nSwPos)
 {
-    for (std::vector<EECharAttrib>::const_iterator i = aTxtAtrArr.begin(); i < aTxtAtrArr.end(); ++i)
+    for (std::vector<EECharAttrib>::const_iterator i = aTextAtrArr.begin(); i < aTextAtrArr.end(); ++i)
     {
         if (nSwPos >= i->nStart && nSwPos < i->nEnd)
         {
@@ -1277,7 +1277,7 @@ const SfxPoolItem* MSWord_SdrAttrIter::HasTextItem(sal_uInt16 nWhich) const
         m_rExport.m_pDoc->GetAttrPool(), nWhich);
     if (nWhich)
     {
-        for (std::vector<EECharAttrib>::const_iterator i = aTxtAtrArr.begin(); i < aTxtAtrArr.end(); ++i)
+        for (std::vector<EECharAttrib>::const_iterator i = aTextAtrArr.begin(); i < aTextAtrArr.end(); ++i)
         {
             if (nWhich == i->pAttr->Which() && nTmpSwPos >= i->nStart && nTmpSwPos < i->nEnd)
                 return i->pAttr;    // Found
@@ -1343,7 +1343,7 @@ void MSWord_SdrAttrIter::OutParaAttr(bool bCharAttr, const std::set<sal_uInt16>*
     }
 }
 
-void WW8Export::WriteSdrTextObj(const SdrTextObj& rTxtObj, sal_uInt8 nTyp)
+void WW8Export::WriteSdrTextObj(const SdrTextObj& rTextObj, sal_uInt8 nTyp)
 {
     const OutlinerParaObject* pParaObj = 0;
     bool bOwnParaObj = false;
@@ -1353,14 +1353,14 @@ void WW8Export::WriteSdrTextObj(const SdrTextObj& rTxtObj, sal_uInt8 nTyp)
     When the object is actively being edited, that text is not set into
     the objects normal text object, but lives in a separate object.
     */
-    if (rTxtObj.IsTextEditActive())
+    if (rTextObj.IsTextEditActive())
     {
-        pParaObj = rTxtObj.GetEditOutlinerParaObject();
+        pParaObj = rTextObj.GetEditOutlinerParaObject();
         bOwnParaObj = true;
     }
     else
     {
-        pParaObj = rTxtObj.GetOutlinerParaObject();
+        pParaObj = rTextObj.GetOutlinerParaObject();
     }
 
     if( pParaObj )
@@ -1395,14 +1395,14 @@ void WW8Export::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTyp
             const sal_Int32 nNextAttr = std::min(aAttrIter.WhereNext(), nEnd);
             rtl_TextEncoding eNextChrSet = aAttrIter.GetNextCharSet();
 
-            bool bTxtAtr = aAttrIter.IsTxtAttr( nAktPos );
-            if( !bTxtAtr )
+            bool bTextAtr = aAttrIter.IsTextAttr( nAktPos );
+            if( !bTextAtr )
                 OutSwString( aStr, nAktPos, nNextAttr - nAktPos,
                                 true, eChrSet );
 
                         // Am Zeilenende werden die Attribute bis ueber das CR
                         // aufgezogen. Ausnahme: Fussnoten am Zeilenende
-            if( nNextAttr == nEnd && !bTxtAtr )
+            if( nNextAttr == nEnd && !bTextAtr )
                 WriteCR();              // CR danach
 
                                             // Ausgabe der Zeichenattribute
@@ -1412,7 +1412,7 @@ void WW8Export::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTyp
             pO->clear();
 
                         // Ausnahme: Fussnoten am Zeilenende
-            if( nNextAttr == nEnd && bTxtAtr )
+            if( nNextAttr == nEnd && bTextAtr )
                 WriteCR();              // CR danach
             nAktPos = nNextAttr;
             eChrSet = eNextChrSet;
@@ -1537,18 +1537,18 @@ SwBasicEscherEx::~SwBasicEscherEx()
 {
 }
 
-void SwBasicEscherEx::WriteFrmExtraData(const SwFrmFmt&)
+void SwBasicEscherEx::WriteFrmExtraData(const SwFrameFormat&)
 {
     AddAtom(4, ESCHER_ClientAnchor);
     GetStream().WriteUInt32( 0x80000000 );
 }
 
-void SwBasicEscherEx::WriteEmptyFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShapeId)
+void SwBasicEscherEx::WriteEmptyFlyFrame(const SwFrameFormat& rFormat, sal_uInt32 nShapeId)
 {
     OpenContainer(ESCHER_SpContainer);
     AddShape(ESCHER_ShpInst_PictureFrame, 0xa00, nShapeId);
     // store anchor attribute
-    WriteFrmExtraData(rFmt);
+    WriteFrmExtraData(rFormat);
 
     AddAtom(6, DFF_msofbtUDefProp, 3, 1); //Prop id is 0xF122
     GetStream().WriteUInt16( 0x053F ).WriteUInt32( nInlineHack );
@@ -1629,10 +1629,10 @@ sal_Int32 SwBasicEscherEx::WriteGrfBullet(const Graphic& rGrf)
     return 0;
 }
 
-sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShapeId)
+sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrameFormat& rFormat, sal_uInt32 nShapeId)
 {
     sal_Int32 nBorderThick=0;
-    SwNoTxtNode *pNd = GetNoTxtNodeFromSwFrmFmt(rFmt);
+    SwNoTextNode *pNd = GetNoTextNodeFromSwFrameFormat(rFormat);
     SwGrfNode *pGrfNd = pNd ? pNd->GetGrfNode() : 0;
     OSL_ENSURE(pGrfNd, "No SwGrfNode ?, suspicious");
     if (!pGrfNd)
@@ -1698,19 +1698,19 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nSh
     }
 
     aPropOpt.AddOpt( ESCHER_Prop_pibFlags, nFlags );
-    nBorderThick = WriteFlyFrameAttr(rFmt,mso_sptPictureFrame,aPropOpt);
+    nBorderThick = WriteFlyFrameAttr(rFormat,mso_sptPictureFrame,aPropOpt);
     WriteGrfAttr(*pGrfNd, aPropOpt);
 
     aPropOpt.Commit( GetStream() );
 
     // store anchor attribute
-    WriteFrmExtraData( rFmt );
+    WriteFrmExtraData( rFormat );
 
     CloseContainer();   // ESCHER_SpContainer
     return nBorderThick;
 }
 
-void SwBasicEscherEx::WriteGrfAttr(const SwNoTxtNode& rNd,
+void SwBasicEscherEx::WriteGrfAttr(const SwNoTextNode& rNd,
     EscherPropertyContainer& rPropOpt)
 {
     const SfxPoolItem* pItem;
@@ -1805,18 +1805,18 @@ void SwBasicEscherEx::SetPicId(const SdrObject &, sal_uInt32,
 void SwEscherEx::SetPicId(const SdrObject &rSdrObj, sal_uInt32 nShapeId,
     EscherPropertyContainer &rPropOpt)
 {
-    pTxtBxs->Append(rSdrObj, nShapeId);
-    sal_uInt32 nPicId = pTxtBxs->Count();
+    pTextBxs->Append(rSdrObj, nShapeId);
+    sal_uInt32 nPicId = pTextBxs->Count();
     nPicId *= 0x10000;
     rPropOpt.AddOpt( ESCHER_Prop_pictureId, nPicId );
 }
 
-sal_Int32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShapeId)
+sal_Int32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrameFormat& rFormat, sal_uInt32 nShapeId)
 {
     sal_Int32 nBorderThick = 0;
-    if (const SdrObject* pSdrObj = rFmt.FindRealSdrObject())
+    if (const SdrObject* pSdrObj = rFormat.FindRealSdrObject())
     {
-        SwNodeIndex aIdx(*rFmt.GetCntnt().GetCntntIdx(), 1);
+        SwNodeIndex aIdx(*rFormat.GetContent().GetContentIdx(), 1);
         SwOLENode& rOLENd = *aIdx.GetNode().GetOLENode();
         sal_Int64 nAspect = rOLENd.GetAspect();
 
@@ -1857,12 +1857,12 @@ sal_Int32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nSh
         WriteOLEPicture(aPropOpt, AddMirrorFlags(0xa00 | SHAPEFLAG_OLESHAPE,
             rMirror), pGraphic ? *pGraphic : Graphic(), *pSdrObj, nShapeId, bRectIsSet ? &aRect : NULL );
 
-        nBorderThick = WriteFlyFrameAttr(rFmt, mso_sptPictureFrame, aPropOpt);
+        nBorderThick = WriteFlyFrameAttr(rFormat, mso_sptPictureFrame, aPropOpt);
         WriteGrfAttr(rOLENd, aPropOpt);
         aPropOpt.Commit(GetStream());
 
         // store anchor attribute
-        WriteFrmExtraData( rFmt );
+        WriteFrmExtraData( rFormat );
 
         CloseContainer();   // ESCHER_SpContainer
     }
@@ -1928,13 +1928,13 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush,
     }
 }
 
-sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
+sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrameFormat& rFormat,
     MSO_SPT eShapeType, EscherPropertyContainer& rPropOpt)
 {
     sal_Int32 nLineWidth=0;
     const SfxPoolItem* pItem;
     bool bFirstLine = true;
-    if (SfxItemState::SET == rFmt.GetItemState(RES_BOX, true, &pItem))
+    if (SfxItemState::SET == rFormat.GetItemState(RES_BOX, true, &pItem))
     {
         static const o3tl::enumarray<SvxBoxItemLine, sal_uInt16> aExhperProp =
         {
@@ -2013,7 +2013,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
         rPropOpt.AddOpt( ESCHER_Prop_dxTextLeft, 0 );
         rPropOpt.AddOpt( ESCHER_Prop_dxTextRight, 0 );
     }
-    const SwAttrSet& rAttrSet = rFmt.GetAttrSet();
+    const SwAttrSet& rAttrSet = rFormat.GetAttrSet();
     if (SfxItemState::SET == rAttrSet.GetItemState(RES_BOX, false, &pItem))
     {
         const SvxBoxItem* pBox = static_cast<const SvxBoxItem*>(pItem);
@@ -2071,21 +2071,21 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
 
     // SwWW8ImplReader::Read_GrafLayer() imports these as opaque
     // unconditionally, so if both are true, don't export the property.
-    bool bIsInHeader = IsFlyFrmFmtInHeader(rFmt);
-    bool bIsThrought = rFmt.GetSurround().GetValue() == SURROUND_THROUGHT;
+    bool bIsInHeader = IsFlyFrameFormatInHeader(rFormat);
+    bool bIsThrought = rFormat.GetSurround().GetValue() == SURROUND_THROUGHT;
 
     if (bIsInHeader)
     {
-        SvxBrushItem aBrush(rFmt.makeBackgroundBrushItem());
+        SvxBrushItem aBrush(rFormat.makeBackgroundBrushItem());
         WriteBrushAttr(aBrush, rPropOpt);
     }
     else
     {
-        SvxBrushItem aBrush(rWrt.TrueFrameBgBrush(rFmt));
+        SvxBrushItem aBrush(rWrt.TrueFrameBgBrush(rFormat));
         WriteBrushAttr(aBrush, rPropOpt);
     }
 
-    const SdrObject* pObj = rFmt.FindRealSdrObject();
+    const SdrObject* pObj = rFormat.FindRealSdrObject();
 
     if( pObj && (pObj->GetLayer() == GetHellLayerId() ||
         pObj->GetLayer() == GetInvisibleHellId() ) && !(bIsInHeader && bIsThrought))
@@ -2093,15 +2093,15 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
         rPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x200020 );
     }
 
-    PreWriteHyperlinkWithinFly(rFmt,rPropOpt);
+    PreWriteHyperlinkWithinFly(rFormat,rPropOpt);
 
     return nLineWidth;
 }
 
-sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType,
+sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrameFormat& rFormat, MSO_SPT eShapeType,
     EscherPropertyContainer& rPropOpt)
 {
-    sal_Int32 nLineWidth = SwBasicEscherEx::WriteFlyFrameAttr(rFmt, eShapeType,
+    sal_Int32 nLineWidth = SwBasicEscherEx::WriteFlyFrameAttr(rFormat, eShapeType,
         rPropOpt);
 
     /*
@@ -2111,7 +2111,7 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType
      are exporting!
      */
     const SfxPoolItem* pItem;
-    if (SfxItemState::SET == rFmt.GetItemState(RES_LR_SPACE, true, &pItem))
+    if (SfxItemState::SET == rFormat.GetItemState(RES_LR_SPACE, true, &pItem))
     {
         rPropOpt.AddOpt( ESCHER_Prop_dxWrapDistLeft,
                 DrawModelToEmu( static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft() ) );
@@ -2124,7 +2124,7 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType
         rPropOpt.AddOpt( ESCHER_Prop_dxWrapDistRight, 0 );
     }
 
-    if (SfxItemState::SET == rFmt.GetItemState(RES_UL_SPACE, true, &pItem))
+    if (SfxItemState::SET == rFormat.GetItemState(RES_UL_SPACE, true, &pItem))
     {
         rPropOpt.AddOpt( ESCHER_Prop_dyWrapDistTop,
                 DrawModelToEmu( static_cast<const SvxULSpaceItem*>(pItem)->GetUpper() ) );
@@ -2132,9 +2132,9 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType
                 DrawModelToEmu( static_cast<const SvxULSpaceItem*>(pItem)->GetLower() ) );
     }
 
-    if (rFmt.GetSurround().IsContour())
+    if (rFormat.GetSurround().IsContour())
     {
-        if (const SwNoTxtNode *pNd = GetNoTxtNodeFromSwFrmFmt(rFmt))
+        if (const SwNoTextNode *pNd = GetNoTextNodeFromSwFrameFormat(rFormat))
         {
             const tools::PolyPolygon *pPolyPoly = pNd->HasContour();
             if (pPolyPoly && pPolyPoly->Count())
@@ -2163,7 +2163,7 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType
         }
     }
 
-    PreWriteHyperlinkWithinFly(rFmt,rPropOpt);
+    PreWriteHyperlinkWithinFly(rFormat,rPropOpt);
 
     return nLineWidth;
 }
@@ -2231,7 +2231,7 @@ void SwBasicEscherEx::WritePictures()
 
 SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
     : SwBasicEscherEx(pStrm, rWW8Wrt),
-    pTxtBxs(0)
+    pTextBxs(0)
 {
     aHostData.SetClientData(&aWinwordAnchoring);
     OpenContainer( ESCHER_DggContainer );
@@ -2249,17 +2249,17 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
 
     sal_uInt8 i = 2;     // for header/footer and the other
     PlcDrawObj *pSdrObjs = rWrt.m_pHFSdrObjs;
-    pTxtBxs = rWrt.m_pHFTxtBxs;
+    pTextBxs = rWrt.m_pHFTextBxs;
 
     // if no header/footer -> skip over
     if (!pSdrObjs->size())
     {
         --i;
         pSdrObjs = rWrt.m_pSdrObjs;
-        pTxtBxs = rWrt.m_pTxtBxs;
+        pTextBxs = rWrt.m_pTextBxs;
     }
 
-    for( ; i--; pSdrObjs = rWrt.m_pSdrObjs, pTxtBxs = rWrt.m_pTxtBxs )
+    for( ; i--; pSdrObjs = rWrt.m_pSdrObjs, pTextBxs = rWrt.m_pTextBxs )
     {
         // "dummy char" (or any Count ?) - why? Only Microsoft knows it.
         GetStream().WriteChar( i );
@@ -2283,23 +2283,23 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
             OSL_ENSURE(pObj, "impossible");
             if (!pObj)
                 continue;
-            const sw::Frame &rFrame = pObj->maCntnt;
-            const SwFrmFmt& rFmt = rFrame.GetFrmFmt();
+            const sw::Frame &rFrame = pObj->maContent;
+            const SwFrameFormat& rFormat = rFrame.GetFrameFormat();
 
             switch (rFrame.GetWriterType())
             {
-                case sw::Frame::eTxtBox:
+                case sw::Frame::eTextBox:
                 case sw::Frame::eOle:
                 case sw::Frame::eGraphic:
                     nBorderThick = WriteFlyFrm(*pObj, nShapeId, aSorted);
                     break;
                 case sw::Frame::eFormControl:
-                    WriteOCXControl(rFmt, nShapeId = GenerateShapeId());
+                    WriteOCXControl(rFormat, nShapeId = GenerateShapeId());
                     break;
                 case sw::Frame::eDrawing:
                 {
-                    aWinwordAnchoring.SetAnchoring(rFmt);
-                    const SdrObject* pSdrObj = rFmt.FindRealSdrObject();
+                    aWinwordAnchoring.SetAnchoring(rFormat);
+                    const SdrObject* pSdrObj = rFormat.FindRealSdrObject();
                     if (pSdrObj)
                     {
                         bool bSwapInPage = false;
@@ -2347,9 +2347,9 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
             AddShape( ESCHER_ShpInst_Rectangle, 0xe00, nSecondShapeId );
 
             EscherPropertyContainer aPropOpt;
-            const SwFrmFmt &rFmt = rWrt.m_pDoc->GetPageDesc(0).GetMaster();
+            const SwFrameFormat &rFormat = rWrt.m_pDoc->GetPageDesc(0).GetMaster();
             const SfxPoolItem* pItem = 0;
-            SfxItemState eState = rFmt.GetItemState(RES_BACKGROUND, true,
+            SfxItemState eState = rFormat.GetItemState(RES_BACKGROUND, true,
                 &pItem);
             if (SfxItemState::SET == eState && pItem)
             {
@@ -2412,16 +2412,16 @@ void SwEscherEx::FinishEscher()
     input/output parameter - containing the current vertical position
     attributes, which are converted by this method.
 
-    @param _rFrmFmt
+    @param _rFrameFormat
     input parameter - frame format of the anchored object
 
     @return boolean, indicating, if a conversion has been performed.
 */
-bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
-                                         SwFmtVertOrient& _iorVertOri,
-                                         const SwFrmFmt& _rFrmFmt )
+bool WinwordAnchoring::ConvertPosition( SwFormatHoriOrient& _iorHoriOri,
+                                         SwFormatVertOrient& _iorVertOri,
+                                         const SwFrameFormat& _rFrameFormat )
 {
-    const RndStdIds eAnchor = _rFrmFmt.GetAnchor().GetAnchorId();
+    const RndStdIds eAnchor = _rFrameFormat.GetAnchor().GetAnchorId();
 
     if ( (FLY_AS_CHAR == eAnchor) || (FLY_AT_FLY == eAnchor) )
     {
@@ -2432,7 +2432,7 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
     // determine anchored object
     SwAnchoredObject* pAnchoredObj( 0L );
     {
-        const SwContact* pContact = _rFrmFmt.FindContactObj();
+        const SwContact* pContact = _rFrameFormat.FindContactObj();
         if ( pContact )
         {
             std::list<SwAnchoredObject*> aAnchoredObjs;
@@ -2463,19 +2463,19 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
 
     // determine value of attribute 'Follow text flow', because positions aligned
     // at page areas have to be converted, if it's set.
-    const bool bFollowTextFlow = _rFrmFmt.GetFollowTextFlow().GetValue();
+    const bool bFollowTextFlow = _rFrameFormat.GetFollowTextFlow().GetValue();
 
     // check, if horizontal and vertical position have to be converted due to
     // the fact, that the object is anchored at a paragraph, which has a "column
     // break before" attribute
     bool bConvDueToAnchoredAtColBreakPara( false );
     if ( ( (eAnchor == FLY_AT_PARA) || (eAnchor == FLY_AT_CHAR) ) &&
-         _rFrmFmt.GetAnchor().GetCntntAnchor() &&
-         _rFrmFmt.GetAnchor().GetCntntAnchor()->nNode.GetNode().IsTxtNode() )
+         _rFrameFormat.GetAnchor().GetContentAnchor() &&
+         _rFrameFormat.GetAnchor().GetContentAnchor()->nNode.GetNode().IsTextNode() )
     {
-        SwTxtNode& rAnchorTxtNode =
-            dynamic_cast<SwTxtNode&>(_rFrmFmt.GetAnchor().GetCntntAnchor()->nNode.GetNode());
-        const SvxFmtBreakItem* pBreak = &(ItemGet<SvxFmtBreakItem>(rAnchorTxtNode, RES_BREAK));
+        SwTextNode& rAnchorTextNode =
+            dynamic_cast<SwTextNode&>(_rFrameFormat.GetAnchor().GetContentAnchor()->nNode.GetNode());
+        const SvxFormatBreakItem* pBreak = &(ItemGet<SvxFormatBreakItem>(rAnchorTextNode, RES_BREAK));
         if ( pBreak &&
              pBreak->GetBreak() == SVX_BREAK_COLUMN_BEFORE )
         {
@@ -2701,17 +2701,17 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
     return bConverted;
 }
 
-void WinwordAnchoring::SetAnchoring(const SwFrmFmt& rFmt)
+void WinwordAnchoring::SetAnchoring(const SwFrameFormat& rFormat)
 {
-    const RndStdIds eAnchor = rFmt.GetAnchor().GetAnchorId();
+    const RndStdIds eAnchor = rFormat.GetAnchor().GetAnchorId();
     mbInline = (eAnchor == FLY_AS_CHAR);
 
-    SwFmtHoriOrient rHoriOri = rFmt.GetHoriOrient();
-    SwFmtVertOrient rVertOri = rFmt.GetVertOrient();
+    SwFormatHoriOrient rHoriOri = rFormat.GetHoriOrient();
+    SwFormatVertOrient rVertOri = rFormat.GetVertOrient();
 
     // #i30669# - convert the positioning attributes.
     // Most positions are converted, if layout information exists.
-    const bool bPosConverted = ConvertPosition( rHoriOri, rVertOri, rFmt );
+    const bool bPosConverted = ConvertPosition( rHoriOri, rVertOri, rFormat );
 
     const sal_Int16 eHOri = rHoriOri.GetHoriOrient();
     const sal_Int16 eVOri = rVertOri.GetVertOrient(); // #i22673#
@@ -2836,9 +2836,9 @@ void WinwordAnchoring::SetAnchoring(const SwFrmFmt& rFmt)
     }
 }
 
-void SwEscherEx::WriteFrmExtraData( const SwFrmFmt& rFmt )
+void SwEscherEx::WriteFrmExtraData( const SwFrameFormat& rFormat )
 {
-    aWinwordAnchoring.SetAnchoring(rFmt);
+    aWinwordAnchoring.SetAnchoring(rFormat);
     aWinwordAnchoring.WriteData(*this);
 
     AddAtom(4, ESCHER_ClientAnchor);
@@ -2851,81 +2851,81 @@ void SwEscherEx::WriteFrmExtraData( const SwFrmFmt& rFmt )
 sal_Int32 SwEscherEx::WriteFlyFrm(const DrawObj &rObj, sal_uInt32 &rShapeId,
     DrawObjPointerVector &rPVec)
 {
-    const SwFrmFmt &rFmt = rObj.maCntnt.GetFrmFmt();
+    const SwFrameFormat &rFormat = rObj.maContent.GetFrameFormat();
 
     // check for textflyframe and if it is the first in a Chain
     sal_Int32 nBorderThick = 0;
-    const SwNodeIndex* pNdIdx = rFmt.GetCntnt().GetCntntIdx();
+    const SwNodeIndex* pNdIdx = rFormat.GetContent().GetContentIdx();
     if( pNdIdx )
     {
         SwNodeIndex aIdx( *pNdIdx, 1 );
         switch( aIdx.GetNode().GetNodeType() )
         {
         case ND_GRFNODE:
-            nBorderThick = WriteGrfFlyFrame( rFmt, rShapeId = GenerateShapeId() );
+            nBorderThick = WriteGrfFlyFrame( rFormat, rShapeId = GenerateShapeId() );
             break;
         case ND_OLENODE:
-            nBorderThick = WriteOLEFlyFrame( rFmt, rShapeId = GenerateShapeId() );
+            nBorderThick = WriteOLEFlyFrame( rFormat, rShapeId = GenerateShapeId() );
             break;
         default:
-            if (const SdrObject* pObj = rFmt.FindRealSdrObject())
+            if (const SdrObject* pObj = rFormat.FindRealSdrObject())
             {
                 // check for the first in a Chain
-                sal_uInt32 nTxtId;
+                sal_uInt32 nTextId;
                 sal_uInt16 nOff = 0;
-                const SwFrmFmt* pFmt = &rFmt, *pPrev;
-                while( 0 != ( pPrev = pFmt->GetChain().GetPrev() ))
+                const SwFrameFormat* pFormat = &rFormat, *pPrev;
+                while( 0 != ( pPrev = pFormat->GetChain().GetPrev() ))
                 {
                     ++nOff;
-                    pFmt = pPrev;
+                    pFormat = pPrev;
                 }
 
-                rShapeId = GetFlyShapeId(rFmt, rObj.mnHdFtIndex, rPVec);
+                rShapeId = GetFlyShapeId(rFormat, rObj.mnHdFtIndex, rPVec);
                 if( !nOff )
                 {
-                    nTxtId = pTxtBxs->GetPos( pObj );
-                    if( USHRT_MAX == nTxtId )
+                    nTextId = pTextBxs->GetPos( pObj );
+                    if( USHRT_MAX == nTextId )
                     {
-                        pTxtBxs->Append( *pObj, rShapeId );
-                        nTxtId = pTxtBxs->Count();
+                        pTextBxs->Append( *pObj, rShapeId );
+                        nTextId = pTextBxs->Count();
                     }
                     else
-                        ++nTxtId;
+                        ++nTextId;
                 }
                 else
                 {
-                    const SdrObject* pPrevObj = pFmt->FindRealSdrObject();
-                    nTxtId = pTxtBxs->GetPos( pPrevObj );
-                    if( USHRT_MAX == nTxtId )
+                    const SdrObject* pPrevObj = pFormat->FindRealSdrObject();
+                    nTextId = pTextBxs->GetPos( pPrevObj );
+                    if( USHRT_MAX == nTextId )
                     {
                         sal_uInt32 nPrevShapeId =
-                            GetFlyShapeId(*pFmt, rObj.mnHdFtIndex, rPVec);
-                        pTxtBxs->Append( *pPrevObj, nPrevShapeId );
-                        nTxtId = pTxtBxs->Count();
+                            GetFlyShapeId(*pFormat, rObj.mnHdFtIndex, rPVec);
+                        pTextBxs->Append( *pPrevObj, nPrevShapeId );
+                        nTextId = pTextBxs->Count();
                     }
                     else
-                        ++nTxtId;
+                        ++nTextId;
                 }
-                nTxtId *= 0x10000;
-                nTxtId += nOff;
+                nTextId *= 0x10000;
+                nTextId += nOff;
 
-                nBorderThick = WriteTxtFlyFrame(rObj, rShapeId, nTxtId, rPVec);
+                nBorderThick = WriteTextFlyFrame(rObj, rShapeId, nTextId, rPVec);
             }
 
             //In browse mode the sdr object doesn't always exist. For example, the
             //object is in the hidden header/footer. We save the fmt directly
             //in such cases; we copy most of the logic from the block above
-            const bool bBrowseMode = (rFmt.getIDocumentSettingAccess())->get(DocumentSettingId::BROWSE_MODE);
-            if( bBrowseMode && rFmt.GetDoc())
+            const bool bBrowseMode = (rFormat.getIDocumentSettingAccess())->get(DocumentSettingId::BROWSE_MODE);
+            if( bBrowseMode && rFormat.GetDoc())
             {
-                if( !rFmt.GetChain().GetPrev() )//obj in header/footer?
+                if( !rFormat.GetChain().GetPrev() )//obj in header/footer?
                 {
-                    rShapeId = GetFlyShapeId(rFmt, rObj.mnHdFtIndex, rPVec);
-                    pTxtBxs->Append( &rFmt, rShapeId );
-                    sal_uInt32 nTxtId = pTxtBxs->Count();
+                    rShapeId = GetFlyShapeId(rFormat, rObj.mnHdFtIndex, rPVec);
+                    pTextBxs->Append( &rFormat, rShapeId );
+                    sal_uInt32 nTextId = pTextBxs->Count();
 
-                    nTxtId *= 0x10000;
-                    nBorderThick = WriteTxtFlyFrame(rObj, rShapeId, nTxtId, rPVec);
+                    nTextId *= 0x10000;
+                    nBorderThick = WriteTextFlyFrame(rObj, rShapeId, nTextId, rPVec);
                 }
             }
 
@@ -2934,7 +2934,7 @@ sal_Int32 SwEscherEx::WriteFlyFrm(const DrawObj &rObj, sal_uInt32 &rShapeId,
     return nBorderThick;
 }
 
-sal_uInt16 FindPos(const SwFrmFmt &rFmt, unsigned int nHdFtIndex,
+sal_uInt16 FindPos(const SwFrameFormat &rFormat, unsigned int nHdFtIndex,
     DrawObjPointerVector &rPVec)
 {
     DrawObjPointerIter aEnd = rPVec.end();
@@ -2946,7 +2946,7 @@ sal_uInt16 FindPos(const SwFrmFmt &rFmt, unsigned int nHdFtIndex,
             continue;
         if (
              nHdFtIndex == pObj->mnHdFtIndex &&
-             &rFmt == (&pObj->maCntnt.GetFrmFmt())
+             &rFormat == (&pObj->maContent.GetFrameFormat())
            )
         {
             return static_cast< sal_uInt16 >(aIter - rPVec.begin());
@@ -2955,10 +2955,10 @@ sal_uInt16 FindPos(const SwFrmFmt &rFmt, unsigned int nHdFtIndex,
     return USHRT_MAX;
 }
 
-sal_Int32 SwEscherEx::WriteTxtFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId,
-    sal_uInt32 nTxtBox, DrawObjPointerVector &rPVec)
+sal_Int32 SwEscherEx::WriteTextFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId,
+    sal_uInt32 nTextBox, DrawObjPointerVector &rPVec)
 {
-    const SwFrmFmt &rFmt = rObj.maCntnt.GetFrmFmt();
+    const SwFrameFormat &rFormat = rObj.maContent.GetFrameFormat();
     short nDirection = rObj.mnDirection;
 
     sal_Int32 nBorderThick=0;
@@ -2966,14 +2966,14 @@ sal_Int32 SwEscherEx::WriteTxtFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId,
 
     AddShape( ESCHER_ShpInst_TextBox, 0xa00, nShapeId );
     EscherPropertyContainer aPropOpt;
-    aPropOpt.AddOpt(ESCHER_Prop_lTxid, nTxtBox);
-    if (const SwFrmFmt *pNext = rFmt.GetChain().GetNext())
+    aPropOpt.AddOpt(ESCHER_Prop_lTxid, nTextBox);
+    if (const SwFrameFormat *pNext = rFormat.GetChain().GetNext())
     {
         sal_uInt16 nPos = FindPos(*pNext, rObj.mnHdFtIndex, rPVec);
         if (USHRT_MAX != nPos && aFollowShpIds[nPos])
             aPropOpt.AddOpt(ESCHER_Prop_hspNext, aFollowShpIds[nPos]);
     }
-    nBorderThick = WriteFlyFrameAttr( rFmt, mso_sptTextBox, aPropOpt );
+    nBorderThick = WriteFlyFrameAttr( rFormat, mso_sptTextBox, aPropOpt );
 
     MSO_TextFlow nFlow;
 
@@ -2998,9 +2998,9 @@ sal_Int32 SwEscherEx::WriteTxtFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId,
     aPropOpt.Commit( GetStream() );
 
     // store anchor attribute
-    WriteFrmExtraData( rFmt );
+    WriteFrmExtraData( rFormat );
 
-    AddAtom( 4, ESCHER_ClientTextbox ); GetStream().WriteUInt32( nTxtBox );
+    AddAtom( 4, ESCHER_ClientTextbox ); GetStream().WriteUInt32( nTextBox );
 
     CloseContainer();   // ESCHER_SpContainer
     return nBorderThick;
@@ -3031,9 +3031,9 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt,
     rPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0x10000 );
 }
 
-void SwEscherEx::WriteOCXControl( const SwFrmFmt& rFmt, sal_uInt32 nShapeId )
+void SwEscherEx::WriteOCXControl( const SwFrameFormat& rFormat, sal_uInt32 nShapeId )
 {
-    if (const SdrObject* pSdrObj = rFmt.FindRealSdrObject())
+    if (const SdrObject* pSdrObj = rFormat.FindRealSdrObject())
     {
         OpenContainer( ESCHER_SpContainer );
 
@@ -3051,11 +3051,11 @@ void SwEscherEx::WriteOCXControl( const SwFrmFmt& rFmt, sal_uInt32 nShapeId )
         WriteOLEPicture(aPropOpt, 0xa00 | SHAPEFLAG_OLESHAPE, aGraphic,
             *pSdrObj, nShapeId, NULL );
 
-        WriteFlyFrameAttr( rFmt, mso_sptPictureFrame , aPropOpt );
+        WriteFlyFrameAttr( rFormat, mso_sptPictureFrame , aPropOpt );
         aPropOpt.Commit( GetStream() );
 
         // store anchor attribute
-        WriteFrmExtraData( rFmt );
+        WriteFrmExtraData( rFormat );
 
         CloseContainer();   // ESCHER_SpContainer
     }
@@ -3071,12 +3071,12 @@ void SwEscherEx::MakeZOrderArrAndFollowIds(
 
     for (size_t n = 0; n < rDstArr.size(); ++n)
     {
-        const SwFrmFmt &rFmt = rDstArr[n]->maCntnt.GetFrmFmt();
+        const SwFrameFormat &rFormat = rDstArr[n]->maContent.GetFrameFormat();
         bool bNeedsShapeId = false;
 
-        if (RES_FLYFRMFMT == rFmt.Which())
+        if (RES_FLYFRMFMT == rFormat.Which())
         {
-            const SwFmtChain &rChain = rFmt.GetChain();
+            const SwFormatChain &rChain = rFormat.GetChain();
             if (rChain.GetPrev() || rChain.GetNext())
                 bNeedsShapeId = true;
         }
@@ -3087,10 +3087,10 @@ void SwEscherEx::MakeZOrderArrAndFollowIds(
     }
 }
 
-sal_uInt32 SwEscherEx::GetFlyShapeId(const SwFrmFmt& rFmt,
+sal_uInt32 SwEscherEx::GetFlyShapeId(const SwFrameFormat& rFormat,
     unsigned int nHdFtIndex, DrawObjPointerVector &rpVec)
 {
-    sal_uInt16 nPos = FindPos(rFmt, nHdFtIndex, rpVec);
+    sal_uInt16 nPos = FindPos(rFormat, nHdFtIndex, rpVec);
     sal_uInt32 nShapeId;
     if (USHRT_MAX != nPos)
     {
@@ -3111,8 +3111,8 @@ sal_uInt32 SwEscherEx::QueryTextID(
     sal_uInt32 nId = 0;
     if (SdrObject* pObj = GetSdrObjectFromXShape(xXShapeRef))
     {
-        pTxtBxs->Append( *pObj, nShapeId );
-        nId = pTxtBxs->Count();
+        pTextBxs->Append( *pObj, nShapeId );
+        nId = pTextBxs->Count();
         nId *= 0x10000;
     }
     return nId;
@@ -3188,9 +3188,9 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo
     sal_uInt8 *pData = aSpecOLE+2;
     Set_UInt32(pData,nObjId );
 
-    OUString sFld = FieldString(ww::eCONTROL) + "Forms." + sUName + ".1 \\s ";
+    OUString sField = FieldString(ww::eCONTROL) + "Forms." + sUName + ".1 \\s ";
 
-    rWW8Wrt.OutputField(0, ww::eCONTROL, sFld,
+    rWW8Wrt.OutputField(0, ww::eCONTROL, sField,
         WRITEFIELD_START|WRITEFIELD_CMD_START|WRITEFIELD_CMD_END);
 
     rWW8Wrt.m_pChpPlc->AppendFkpEntry(rWW8Wrt.Strm().Tell(),sizeof(aSpecOLE),
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 2cc8ea741b6b..64919a112ab9 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -176,17 +176,17 @@ void SwWW8AttrIter::IterToCurrent()
     mbCharIsRTL = maCharRunIter->mbRTL;
 }
 
-SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const SwTxtNode& rTxtNd) :
+SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const SwTextNode& rTextNd) :
     MSWordAttrIter(rWr),
-    rNd(rTxtNd),
-    maCharRuns(GetPseudoCharRuns(rTxtNd, 0, !rWr.SupportsUnicode())),
+    rNd(rTextNd),
+    maCharRuns(GetPseudoCharRuns(rTextNd, 0, !rWr.SupportsUnicode())),
     pCurRedline(0),
     nAktSwPos(0),
     nCurRedlinePos(USHRT_MAX),
-    mrSwFmtDrop(rTxtNd.GetSwAttrSet().GetDrop())
+    mrSwFormatDrop(rTextNd.GetSwAttrSet().GetDrop())
 {
 
-    SwPosition aPos(rTxtNd);
+    SwPosition aPos(rTextNd);
     if (FRMDIR_HORI_RIGHT_TOP == rWr.m_pDoc->GetTextDirection(aPos))
         mbParaIsRTL = true;
     else
@@ -216,9 +216,9 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const SwTxtNode& rTxtNd) :
 
     maFlyIter = maFlyFrms.begin();
 
-    if ( !m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if ( !m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
-        SwPosition aPosition( rNd, SwIndex( const_cast<SwTxtNode*>(&rNd) ) );
+        SwPosition aPosition( rNd, SwIndex( const_cast<SwTextNode*>(&rNd) ) );
         pCurRedline = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedline( aPosition, &nCurRedlinePos );
     }
 
@@ -239,10 +239,10 @@ sal_Int32 lcl_getMinPos( sal_Int32 pos1, sal_Int32 pos2 )
 
 sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos )
 {
-    const OUString aTxt = rNd.GetTxt();
-    sal_Int32 fieldEndPos = aTxt.indexOf(CH_TXT_ATR_FIELDEND, nStartPos);
-    sal_Int32 fieldStartPos = aTxt.indexOf(CH_TXT_ATR_FIELDSTART, nStartPos);
-    sal_Int32 formElementPos = aTxt.indexOf(CH_TXT_ATR_FORMELEMENT, nStartPos);
+    const OUString aText = rNd.GetText();
+    sal_Int32 fieldEndPos = aText.indexOf(CH_TXT_ATR_FIELDEND, nStartPos);
+    sal_Int32 fieldStartPos = aText.indexOf(CH_TXT_ATR_FIELDSTART, nStartPos);
+    sal_Int32 formElementPos = aText.indexOf(CH_TXT_ATR_FORMELEMENT, nStartPos);
 
     const sal_Int32 pos = lcl_getMinPos(
         lcl_getMinPos( fieldEndPos, fieldStartPos ),
@@ -264,16 +264,16 @@ sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos )
         }
     }
 
-    if ( nCurRedlinePos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() )
+    if ( nCurRedlinePos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() )
     {
         // nCurRedlinePos point to the next redline
         sal_uInt16 nRedLinePos = nCurRedlinePos;
         if( pCurRedline )
             ++nRedLinePos;
 
-        for ( ; nRedLinePos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); ++nRedLinePos )
+        for ( ; nRedLinePos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++nRedLinePos )
         {
-            const SwRangeRedline* pRedl = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nRedLinePos ];
+            const SwRangeRedline* pRedl = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ nRedLinePos ];
 
             const SwPosition* pStt = pRedl->Start();
             const SwPosition* pEnd = pStt == pRedl->GetPoint()
@@ -300,19 +300,19 @@ sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos )
         }
     }
 
-    if (mrSwFmtDrop.GetWholeWord() && nStartPos <= rNd.GetDropLen(0))
+    if (mrSwFormatDrop.GetWholeWord() && nStartPos <= rNd.GetDropLen(0))
         nMinPos = rNd.GetDropLen(0);
-    else if(nStartPos <= mrSwFmtDrop.GetChars())
-        nMinPos = mrSwFmtDrop.GetChars();
+    else if(nStartPos <= mrSwFormatDrop.GetChars())
+        nMinPos = mrSwFormatDrop.GetChars();
 
-    if(const SwpHints* pTxtAttrs = rNd.GetpSwpHints())
+    if(const SwpHints* pTextAttrs = rNd.GetpSwpHints())
     {
 
-// can be optimized if we consider that the TxtAttrs are sorted by start position.
+// can be optimized if we consider that the TextAttrs are sorted by start position.
 // but then we'd have to save 2 indices
-        for( size_t i = 0; i < pTxtAttrs->Count(); ++i )
+        for( size_t i = 0; i < pTextAttrs->Count(); ++i )
         {
-            const SwTxtAttr* pHt = (*pTxtAttrs)[i];
+            const SwTextAttr* pHt = (*pTextAttrs)[i];
             sal_Int32 nPos = pHt->GetStart();    // first Attr characters
             if( nPos >= nStartPos && nPos <= nMinPos )
                 nMinPos = nPos;
@@ -355,7 +355,7 @@ sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos )
         if (nPos >= nStartPos && nPos <= nMinPos)
             nMinPos = nPos;
 
-        if (maFlyIter->GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AT_CHAR)
+        if (maFlyIter->GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AT_CHAR)
         {
             ++nPos;
             if (nPos >= nStartPos && nPos <= nMinPos)
@@ -393,7 +393,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
     sal_uInt16 nFontId = GetWhichOfScript( RES_CHRATR_FONT, GetScript() );
 
     const SvxFontItem &rParentFont = ItemGet<SvxFontItem>(
-        static_cast<const SwTxtFmtColl&>(rNd.GetAnyFmtColl()), nFontId);
+        static_cast<const SwTextFormatColl&>(rNd.GetAnyFormatColl()), nFontId);
     const SvxFontItem *pFont = &rParentFont;
     const SfxPoolItem *pGrabBag = 0;
 
@@ -415,11 +415,11 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
     //The additional hard formatting properties that affect this range in the
     //paragraph
     sw::PoolItems aRangeItems;
-    if (const SwpHints* pTxtAttrs = rNd.GetpSwpHints())
+    if (const SwpHints* pTextAttrs = rNd.GetpSwpHints())
     {
-        for( size_t i = 0; i < pTxtAttrs->Count(); ++i )
+        for( size_t i = 0; i < pTextAttrs->Count(); ++i )
         {
-            const SwTxtAttr* pHt = (*pTxtAttrs)[i];
+            const SwTextAttr* pHt = (*pTextAttrs)[i];
             const sal_Int32* pEnd = pHt->End();
 
             if (pEnd ? ( nSwPos >= pHt->GetStart() && nSwPos < *pEnd)
@@ -428,8 +428,8 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
                 sal_uInt16 nWhich = pHt->GetAttr().Which();
                 if (nWhich == RES_TXTATR_AUTOFMT)
                 {
-                    const SwFmtAutoFmt& rAutoFmt = static_cast<const SwFmtAutoFmt&>(pHt->GetAttr());
-                    const std::shared_ptr<SfxItemSet> pSet = rAutoFmt.GetStyleHandle();
+                    const SwFormatAutoFormat& rAutoFormat = static_cast<const SwFormatAutoFormat&>(pHt->GetAttr());
+                    const std::shared_ptr<SfxItemSet> pSet = rAutoFormat.GetStyleHandle();
                     SfxWhichIter aIter( *pSet );
                     const SfxPoolItem* pItem;
                     sal_uInt16 nWhichId = aIter.FirstWhich();
@@ -457,13 +457,13 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
 
     /*
      For #i24291# we need to explicitly remove any properties from the
-     aExportSet which a SwCharFmt would override, we can't rely on word doing
+     aExportSet which a SwCharFormat would override, we can't rely on word doing
      this for us like writer does
     */
-    const SwFmtCharFmt *pCharFmtItem =
-        HasItem< SwFmtCharFmt >( aRangeItems, RES_TXTATR_CHARFMT );
-    if ( pCharFmtItem )
-        ClearOverridesFromSet( *pCharFmtItem, aExportSet );
+    const SwFormatCharFormat *pCharFormatItem =
+        HasItem< SwFormatCharFormat >( aRangeItems, RES_TXTATR_CHARFMT );
+    if ( pCharFormatItem )
+        ClearOverridesFromSet( *pCharFormatItem, aExportSet );
 
     sw::PoolItems aExportItems;
     GetPoolItems( aExportSet, aExportItems, false );
@@ -480,15 +480,15 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
 
     if ( !aExportItems.empty() )
     {
-        const SwModify* pOldMod = m_rExport.m_pOutFmtNode;
-        m_rExport.m_pOutFmtNode = &rNd;
+        const SwModify* pOldMod = m_rExport.m_pOutFormatNode;
+        m_rExport.m_pOutFormatNode = &rNd;
         m_rExport.m_aCurrentCharPropStarts.push( nSwPos );
 
         m_rExport.ExportPoolItemsToCHP( aExportItems, GetScript() );
 
         // HasTextItem only allowed in the above range
         m_rExport.m_aCurrentCharPropStarts.pop();
-        m_rExport.m_pOutFmtNode = pOldMod;
+        m_rExport.m_pOutFormatNode = pOldMod;
     }
 
     if( rNd.GetpSwpHints() == 0 )
@@ -528,7 +528,7 @@ bool SwWW8AttrIter::IsWatermarkFrame()
 
     while ( maFlyIter != maFlyFrms.end() )
     {
-        const SdrObject* pSdrObj = maFlyIter->GetFrmFmt().FindRealSdrObject();
+        const SdrObject* pSdrObj = maFlyIter->GetFrameFormat().FindRealSdrObject();
 
         if (pSdrObj)
         {
@@ -575,14 +575,14 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos)
         if ( nPos != nSwPos )
             return FLY_NOT_PROCESSED ; //We havent processed the fly
 
-        const SdrObject* pSdrObj = maFlyIter->GetFrmFmt().FindRealSdrObject();
+        const SdrObject* pSdrObj = maFlyIter->GetFrameFormat().FindRealSdrObject();
 
         if (pSdrObj)
         {
             if (VMLExport::IsWaterMarkShape(pSdrObj->GetName()))
             {
                  // This is a watermark object. Should be written ONLY in the header
-                 if(m_rExport.m_nTxtTyp == TXT_HDFT)
+                 if(m_rExport.m_nTextTyp == TXT_HDFT)
                  {
                        // Should write a watermark in the header
                        m_rExport.AttrOutput().OutputFlyFrame( *maFlyIter );
@@ -608,14 +608,14 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos)
     return ( m_rExport.AttrOutput().IsFlyProcessingPostponed() ? FLY_POSTPONED : FLY_PROCESSED ) ;
 }
 
-bool SwWW8AttrIter::IsTxtAttr( sal_Int32 nSwPos )
+bool SwWW8AttrIter::IsTextAttr( sal_Int32 nSwPos )
 {
     // search for attrs with dummy character or content
-    if (const SwpHints* pTxtAttrs = rNd.GetpSwpHints())
+    if (const SwpHints* pTextAttrs = rNd.GetpSwpHints())
     {
-        for (size_t i = 0; i < pTxtAttrs->Count(); ++i)
+        for (size_t i = 0; i < pTextAttrs->Count(); ++i)
         {
-            const SwTxtAttr* pHt = (*pTxtAttrs)[i];
+            const SwTextAttr* pHt = (*pTextAttrs)[i];
             if ( ( pHt->HasDummyChar() || pHt->HasContent() )
                  && (pHt->GetStart() == nSwPos) )
             {
@@ -630,8 +630,8 @@ bool SwWW8AttrIter::IsTxtAttr( sal_Int32 nSwPos )
 bool SwWW8AttrIter::IsDropCap( int nSwPos )
 {
     // see if the current position falls on a DropCap
-    int nDropChars = mrSwFmtDrop.GetChars();
-    bool bWholeWord = mrSwFmtDrop.GetWholeWord();
+    int nDropChars = mrSwFormatDrop.GetChars();
+    bool bWholeWord = mrSwFormatDrop.GetWholeWord();
     if (bWholeWord)
     {
         const sal_Int32 nWordLen = rNd.GetDropLen(0);
@@ -666,13 +666,13 @@ bool SwWW8AttrIter::RequiresImplicitBookmark()
 const SfxPoolItem* SwWW8AttrIter::HasTextItem( sal_uInt16 nWhich ) const
 {
     const SfxPoolItem* pRet = 0;
-    const SwpHints* pTxtAttrs = rNd.GetpSwpHints();
-    if (pTxtAttrs && !m_rExport.m_aCurrentCharPropStarts.empty())
+    const SwpHints* pTextAttrs = rNd.GetpSwpHints();
+    if (pTextAttrs && !m_rExport.m_aCurrentCharPropStarts.empty())
     {
         const sal_Int32 nTmpSwPos = m_rExport.m_aCurrentCharPropStarts.top();
-        for (size_t i = 0; i < pTxtAttrs->Count(); ++i)
+        for (size_t i = 0; i < pTextAttrs->Count(); ++i)
         {
-            const SwTxtAttr* pHt = (*pTxtAttrs)[i];
+            const SwTextAttr* pHt = (*pTextAttrs)[i];
             const SfxPoolItem* pItem = &pHt->GetAttr();
             const sal_Int32 * pAtrEnd = 0;
             if( 0 != ( pAtrEnd = pHt->End() ) &&        // only Attr with an end
@@ -687,7 +687,7 @@ const SfxPoolItem* SwWW8AttrIter::HasTextItem( sal_uInt16 nWhich ) const
                          RES_TXTATR_CHARFMT == pHt->Which() ||
                          RES_TXTATR_AUTOFMT == pHt->Which() )
                 {
-                    const SfxItemSet* pSet = CharFmt::GetItemSet( pHt->GetAttr() );
+                    const SfxItemSet* pSet = CharFormat::GetItemSet( pHt->GetAttr() );
                     const SfxPoolItem* pCharItem;
                     if ( pSet &&
                          SfxItemState::SET == pSet->GetItemState( nWhich, pHt->Which() != RES_TXTATR_AUTOFMT, &pCharItem ) )
@@ -712,10 +712,10 @@ void WW8Export::GetCurrentItems(ww::bytes &rItems) const
 const SfxPoolItem& SwWW8AttrIter::GetItem(sal_uInt16 nWhich) const
 {
     const SfxPoolItem* pRet = HasTextItem(nWhich);
-    return pRet ? *pRet : rNd.SwCntntNode::GetAttr(nWhich);
+    return pRet ? *pRet : rNd.SwContentNode::GetAttr(nWhich);
 }
 
-void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, sal_Int32 /*nPos*/, const SwFmtRuby& rRuby )
+void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/, const SwFormatRuby& rRuby )
 {
     OUString aStr( FieldString( ww::eEQ ) );
     aStr += "\\* jc";
@@ -761,17 +761,17 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, sal_Int32 /*nPos*/,
     else
         nRubyScript = i18n::ScriptType::ASIAN;
 
-    const SwTxtRuby* pRubyTxt = rRuby.GetTxtRuby();
-    const SwCharFmt* pFmt = pRubyTxt ? pRubyTxt->GetCharFmt() : 0;
+    const SwTextRuby* pRubyText = rRuby.GetTextRuby();
+    const SwCharFormat* pFormat = pRubyText ? pRubyText->GetCharFormat() : 0;
     OUString sFamilyName;
     long nHeight;
-    if ( pFmt )
+    if ( pFormat )
     {
-        const SvxFontItem &rFont = ItemGet< SvxFontItem >( *pFmt,
+        const SvxFontItem &rFont = ItemGet< SvxFontItem >( *pFormat,
                 GetWhichOfScript(RES_CHRATR_FONT,nRubyScript) );
         sFamilyName = rFont.GetFamilyName();
 
-        const SvxFontHeightItem &rHeight = ItemGet< SvxFontHeightItem >( *pFmt,
+        const SvxFontHeightItem &rHeight = ItemGet< SvxFontHeightItem >( *pFormat,
                 GetWhichOfScript( RES_CHRATR_FONTSIZE, nRubyScript ) );
         nHeight = rHeight.GetHeight();
     }
@@ -804,8 +804,8 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, sal_Int32 /*nPos*/,
     aStr += "(\\s\\up ";
 
     if ( g_pBreakIt->GetBreakIter().is() )
-        nRubyScript = g_pBreakIt->GetBreakIter()->getScriptType( rNode.GetTxt(),
-                pRubyTxt->GetStart() );
+        nRubyScript = g_pBreakIt->GetBreakIter()->getScriptType( rNode.GetText(),
+                pRubyText->GetStart() );
     else
         nRubyScript = i18n::ScriptType::ASIAN;
 
@@ -941,7 +941,7 @@ bool WW8AttributeOutput::StartURL( const OUString &rUrl, const OUString &rTarget
 
         0x06, 0x08, 0x01,       // sprmCFData
         0x55, 0x08, 0x01,       // sprmCFSpec
-        0x02, 0x08, 0x01        // sprmCFFldVanish
+        0x02, 0x08, 0x01        // sprmCFFieldVanish
     };
     sal_uInt8* pDataAdr = aArr1 + 2;
     Set_UInt32( pDataAdr, nDataStt );
@@ -1096,21 +1096,21 @@ OUString BookmarkToWriter(const OUString &rBookmark)
         INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_ASCII_US);
 }
 
-void SwWW8AttrIter::OutSwFmtRefMark(const SwFmtRefMark& rAttr, bool)
+void SwWW8AttrIter::OutSwFormatRefMark(const SwFormatRefMark& rAttr, bool)
 {
     if ( m_rExport.HasRefToObject( REF_SETREFATTR, &rAttr.GetRefName(), 0 ) )
         m_rExport.AppendBookmark( MSWordExportBase::GetBookmarkName( REF_SETREFATTR,
                                             &rAttr.GetRefName(), 0 ));
 }
 
-void WW8AttributeOutput::FieldVanish( const OUString& rTxt, ww::eField /*eType*/ )
+void WW8AttributeOutput::FieldVanish( const OUString& rText, ww::eField /*eType*/ )
 {
     ww::bytes aItems;
     m_rWW8Export.GetCurrentItems( aItems );
 
-    // sprmCFFldVanish
+    // sprmCFFieldVanish
     if ( m_rWW8Export.bWrtWW8 )
-        SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CFFldVanish );
+        SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CFFieldVanish );
     else
         aItems.push_back( 67 );
     aItems.push_back( 1 );
@@ -1127,7 +1127,7 @@ void WW8AttributeOutput::FieldVanish( const OUString& rTxt, ww::eField /*eType*/
     m_rWW8Export.WriteChar( '\x13' );
     m_rWW8Export.m_pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), aItems.size(),
                                     aItems.data() );
-    m_rWW8Export.OutSwString( rTxt, 0, rTxt.getLength(), m_rWW8Export.IsUnicode(),
+    m_rWW8Export.OutSwString( rText, 0, rText.getLength(), m_rWW8Export.IsUnicode(),
                         RTL_TEXTENCODING_MS_1252 );
     m_rWW8Export.m_pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), nStt_sprmCFSpec,
                                     aItems.data() );
@@ -1136,21 +1136,21 @@ void WW8AttributeOutput::FieldVanish( const OUString& rTxt, ww::eField /*eType*/
                                     aItems.data() );
 }
 
-void AttributeOutputBase::TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAttr )
+void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAttr )
 {
     // it's a field; so get the Text form the Node and build the field
-    OUString sTxt;
+    OUString sText;
     ww::eField eType = ww::eNONE;
 
-    const SwTxtTOXMark& rTxtTOXMark = *rAttr.GetTxtTOXMark();
-    const sal_Int32* pTxtEnd = rTxtTOXMark.End();
-    if ( pTxtEnd ) // has range?
+    const SwTextTOXMark& rTextTOXMark = *rAttr.GetTextTOXMark();
+    const sal_Int32* pTextEnd = rTextTOXMark.End();
+    if ( pTextEnd ) // has range?
     {
-        sTxt = rNode.GetExpandTxt( rTxtTOXMark.GetStart(),
-                                   *pTxtEnd - rTxtTOXMark.GetStart() );
+        sText = rNode.GetExpandText( rTextTOXMark.GetStart(),
+                                   *pTextEnd - rTextTOXMark.GetStart() );
     }
     else
-        sTxt = rAttr.GetAlternativeText();
+        sText = rAttr.GetAlternativeText();
 
     switch ( rAttr.GetTOXType()->GetType() )
     {
@@ -1160,26 +1160,26 @@ void AttributeOutputBase::TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAtt
             {
                 if ( !rAttr.GetSecondaryKey().isEmpty() )
                 {
-                    sTxt = rAttr.GetSecondaryKey() + ":" + sTxt;
+                    sText = rAttr.GetSecondaryKey() + ":" + sText;
                 }
 
-                sTxt = rAttr.GetPrimaryKey() + ":" + sTxt;
+                sText = rAttr.GetPrimaryKey() + ":" + sText;
             }
-            sTxt = " XE \"" + sTxt + "\" ";
+            sText = " XE \"" + sText + "\" ";
             break;
 
         case TOX_USER:
-            sTxt += "\" \\f \"" + OUString((sal_Char)( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) ));
+            sText += "\" \\f \"" + OUString((sal_Char)( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) ));
             // fall through - no break;
         case TOX_CONTENT:
             {
                 eType = ww::eTC;
-                sTxt = " TC \"" + sTxt;
+                sText = " TC \"" + sText;
                 sal_uInt16 nLvl = rAttr.GetLevel();
                 if (nLvl > WW8ListManager::nMaxLevel)
                     nLvl = WW8ListManager::nMaxLevel;
 
-                sTxt += "\" \\l " + OUString::number(nLvl) + " ";
+                sText += "\" \\l " + OUString::number(nLvl) + " ";
             }
             break;
         default:
@@ -1187,27 +1187,27 @@ void AttributeOutputBase::TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAtt
             break;
     }
 
-    if (!sTxt.isEmpty())
-        FieldVanish( sTxt, eType );
+    if (!sText.isEmpty())
+        FieldVanish( sText, eType );
 }
 
 int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
 {
     int nRet = 0;
-    if ( const SwpHints* pTxtAttrs = rNd.GetpSwpHints() )
+    if ( const SwpHints* pTextAttrs = rNd.GetpSwpHints() )
     {
         m_rExport.m_aCurrentCharPropStarts.push( nPos );
         const sal_Int32* pEnd;
-        for ( size_t i = 0; i < pTxtAttrs->Count(); ++i )
+        for ( size_t i = 0; i < pTextAttrs->Count(); ++i )
         {
-            const SwTxtAttr* pHt = (*pTxtAttrs)[i];
+            const SwTextAttr* pHt = (*pTextAttrs)[i];
             const SfxPoolItem* pItem = &pHt->GetAttr();
             switch ( pItem->Which() )
             {
                 case RES_TXTATR_INETFMT:
                     if ( nPos == pHt->GetStart() )
                     {
-                        const SwFmtINetFmt *rINet = static_cast< const SwFmtINetFmt* >( pItem );
+                        const SwFormatINetFormat *rINet = static_cast< const SwFormatINetFormat* >( pItem );
                         if ( m_rExport.AttrOutput().StartURL( rINet->GetValue(), rINet->GetTargetFrame() ) )
                             ++nRet;
                     }
@@ -1220,12 +1220,12 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
                 case RES_TXTATR_REFMARK:
                     if ( nPos == pHt->GetStart() )
                     {
-                        OutSwFmtRefMark( *static_cast< const SwFmtRefMark* >( pItem ), true );
+                        OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ), true );
                         ++nRet;
                     }
                     if ( 0 != ( pEnd = pHt->End() ) && nPos == *pEnd )
                     {
-                        OutSwFmtRefMark( *static_cast< const SwFmtRefMark* >( pItem ), false );
+                        OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ), false );
                         --nRet;
                     }
                     break;
@@ -1236,7 +1236,7 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
                 case RES_TXTATR_CJK_RUBY:
                     if ( nPos == pHt->GetStart() )
                     {
-                        m_rExport.AttrOutput().StartRuby( rNd, nPos, *static_cast< const SwFmtRuby* >( pItem ) );
+                        m_rExport.AttrOutput().StartRuby( rNd, nPos, *static_cast< const SwFormatRuby* >( pItem ) );
                         ++nRet;
                     }
                     if ( 0 != ( pEnd = pHt->End() ) && nPos == *pEnd )
@@ -1256,9 +1256,9 @@ bool SwWW8AttrIter::IncludeEndOfParaCRInRedlineProperties( sal_Int32 nEnd ) cons
 {
     // search next Redline
     for( sal_uInt16 nPos = nCurRedlinePos;
-        nPos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); ++nPos )
+        nPos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++nPos )
     {
-        const SwRangeRedline *pRange = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[nPos];
+        const SwRangeRedline *pRange = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[nPos];
         const SwPosition* pEnd = pRange->End();
         const SwPosition* pStart = pRange->Start();
         bool bBreak = true;
@@ -1313,9 +1313,9 @@ const SwRedlineData* SwWW8AttrIter::GetParagraphLevelRedline( )
     pCurRedline = NULL;
 
     // ToDo : this is not the most ideal ... should start maybe from 'nCurRedlinePos'
-    for( sal_uInt16 nRedlinePos = 0; nRedlinePos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); ++nRedlinePos )
+    for( sal_uInt16 nRedlinePos = 0; nRedlinePos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++nRedlinePos )
     {
-        const SwRangeRedline* pRedl = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlinePos ];
+        const SwRangeRedline* pRedl = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ nRedlinePos ];
 
         const SwPosition* pCheckedStt = pRedl->Start();
 
@@ -1367,10 +1367,10 @@ const SwRedlineData* SwWW8AttrIter::GetRunLevelRedline( sal_Int32 nPos )
     if( !pCurRedline )
     {
         // search next Redline
-        for( ; nCurRedlinePos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
+        for( ; nCurRedlinePos < m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size();
                 ++nCurRedlinePos )
         {
-            const SwRangeRedline* pRedl = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nCurRedlinePos ];
+            const SwRangeRedline* pRedl = m_rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ nCurRedlinePos ];
 
             const SwPosition* pStt = pRedl->Start();
             const SwPosition* pEnd = pStt == pRedl->GetPoint()
@@ -1417,10 +1417,10 @@ const SwRedlineData* SwWW8AttrIter::GetRunLevelRedline( sal_Int32 nPos )
 
 short MSWordExportBase::GetCurrentPageDirection() const
 {
-    const SwFrmFmt &rFmt = m_pAktPageDesc
+    const SwFrameFormat &rFormat = m_pAktPageDesc
                     ? m_pAktPageDesc->GetMaster()
                     : m_pDoc->GetPageDesc( 0 ).GetMaster();
-    return rFmt.GetFrmDir().GetValue();
+    return rFormat.GetFrmDir().GetValue();
 }
 
 short MSWordExportBase::GetDefaultFrameDirection( ) const
@@ -1429,19 +1429,19 @@ short MSWordExportBase::GetDefaultFrameDirection( ) const
 
     if ( m_bOutPageDescs )
         nDir = GetCurrentPageDirection(  );
-    else if ( m_pOutFmtNode )
+    else if ( m_pOutFormatNode )
     {
         if ( m_bOutFlyFrmAttrs ) //frame
         {
-            nDir = TrueFrameDirection( *static_cast< const SwFrmFmt * >(m_pOutFmtNode) );
+            nDir = TrueFrameDirection( *static_cast< const SwFrameFormat * >(m_pOutFormatNode) );
         }
-        else if ( m_pOutFmtNode->ISA( SwCntntNode ) )    //pagagraph
+        else if ( m_pOutFormatNode->ISA( SwContentNode ) )    //pagagraph
         {
-            const SwCntntNode *pNd = static_cast<const SwCntntNode *>(m_pOutFmtNode);
+            const SwContentNode *pNd = static_cast<const SwContentNode *>(m_pOutFormatNode);
             SwPosition aPos( *pNd );
             nDir = m_pDoc->GetTextDirection( aPos );
         }
-        else if ( m_pOutFmtNode->ISA( SwTxtFmtColl ) )
+        else if ( m_pOutFormatNode->ISA( SwTextFormatColl ) )
         {
             if ( MsLangId::isRightToLeft( static_cast<LanguageType>(GetAppLanguage())) )
                 nDir = FRMDIR_HORI_RIGHT_TOP;
@@ -1462,27 +1462,27 @@ short MSWordExportBase::GetDefaultFrameDirection( ) const
     return nDir;
 }
 
-short MSWordExportBase::TrueFrameDirection( const SwFrmFmt &rFlyFmt ) const
+short MSWordExportBase::TrueFrameDirection( const SwFrameFormat &rFlyFormat ) const
 {
-    const SwFrmFmt *pFlyFmt = &rFlyFmt;
+    const SwFrameFormat *pFlyFormat = &rFlyFormat;
     const SvxFrameDirectionItem* pItem = 0;
-    while ( pFlyFmt )
+    while ( pFlyFormat )
     {
-        pItem = &pFlyFmt->GetFrmDir();
+        pItem = &pFlyFormat->GetFrmDir();
         if ( FRMDIR_ENVIRONMENT == pItem->GetValue() )
         {
             pItem = 0;
-            const SwFmtAnchor* pAnchor = &pFlyFmt->GetAnchor();
+            const SwFormatAnchor* pAnchor = &pFlyFormat->GetAnchor();
             if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) &&
-                pAnchor->GetCntntAnchor() )
+                pAnchor->GetContentAnchor() )
             {
-                pFlyFmt = pAnchor->GetCntntAnchor()->nNode.GetNode().GetFlyFmt();
+                pFlyFormat = pAnchor->GetContentAnchor()->nNode.GetNode().GetFlyFormat();
             }
             else
-                pFlyFmt = 0;
+                pFlyFormat = 0;
         }
         else
-            pFlyFmt = 0;
+            pFlyFormat = 0;
     }
 
     short nRet;
@@ -1497,13 +1497,13 @@ short MSWordExportBase::TrueFrameDirection( const SwFrmFmt &rFlyFmt ) const
 
 const SvxBrushItem* WW8Export::GetCurrentPageBgBrush() const
 {
-    const SwFrmFmt  &rFmt = m_pAktPageDesc
+    const SwFrameFormat  &rFormat = m_pAktPageDesc
                     ? m_pAktPageDesc->GetMaster()
                     : m_pDoc->GetPageDesc(0).GetMaster();
 
     const SfxPoolItem* pItem = 0;
     //If not set, or "no fill", get real bg
-    SfxItemState eState = rFmt.GetItemState(RES_BACKGROUND, true, &pItem);
+    SfxItemState eState = rFormat.GetItemState(RES_BACKGROUND, true, &pItem);
 
     const SvxBrushItem* pRet = static_cast<const SvxBrushItem*>(pItem);
     if (SfxItemState::SET != eState || !pRet || (!pRet->GetGraphic() &&
@@ -1514,34 +1514,34 @@ const SvxBrushItem* WW8Export::GetCurrentPageBgBrush() const
     return pRet;
 }
 
-SvxBrushItem WW8Export::TrueFrameBgBrush(const SwFrmFmt &rFlyFmt) const
+SvxBrushItem WW8Export::TrueFrameBgBrush(const SwFrameFormat &rFlyFormat) const
 {
-    const SwFrmFmt *pFlyFmt = &rFlyFmt;
+    const SwFrameFormat *pFlyFormat = &rFlyFormat;
     const SvxBrushItem* pRet = 0;
 
-    while (pFlyFmt)
+    while (pFlyFormat)
     {
         //If not set, or "no fill", get real bg
         const SfxPoolItem* pItem = 0;
         SfxItemState eState =
-            pFlyFmt->GetItemState(RES_BACKGROUND, true, &pItem);
+            pFlyFormat->GetItemState(RES_BACKGROUND, true, &pItem);
         pRet = static_cast<const SvxBrushItem*>(pItem);
         if (SfxItemState::SET != eState || !pRet || (!pRet->GetGraphic() &&
             pRet->GetColor() == COL_TRANSPARENT))
         {
             pRet = 0;
-            const SwFmtAnchor* pAnchor = &pFlyFmt->GetAnchor();
+            const SwFormatAnchor* pAnchor = &pFlyFormat->GetAnchor();
             if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) &&
-                pAnchor->GetCntntAnchor())
+                pAnchor->GetContentAnchor())
             {
-                pFlyFmt =
-                    pAnchor->GetCntntAnchor()->nNode.GetNode().GetFlyFmt();
+                pFlyFormat =
+                    pAnchor->GetContentAnchor()->nNode.GetNode().GetFlyFormat();
             }
             else
-                pFlyFmt = 0;
+                pFlyFormat = 0;
         }
         else
-            pFlyFmt = 0;
+            pFlyFormat = 0;
     }
 
     if (!pRet)
@@ -1624,35 +1624,35 @@ OUString SwWW8AttrIter::GetSnippet(const OUString &rStr, sal_Int32 nAktPos,
     the track changes have to be analysed. A deletion, starting in paragraph A
     with style A, ending in paragraph B with style B, needs a hack.
 */
-static SwTxtFmtColl& lcl_getFormatCollection( MSWordExportBase& rExport, const SwTxtNode* pTxtNode )
+static SwTextFormatColl& lcl_getFormatCollection( MSWordExportBase& rExport, const SwTextNode* pTextNode )
 {
     sal_uInt16 nPos = 0;
-    sal_uInt16 nMax = rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size();
+    sal_uInt16 nMax = rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size();
     while( nPos < nMax )
     {
-        const SwRangeRedline* pRedl = rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nPos++ ];
+        const SwRangeRedline* pRedl = rExport.m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ nPos++ ];
         const SwPosition* pStt = pRedl->Start();
         const SwPosition* pEnd = pStt == pRedl->GetPoint()
                                     ? pRedl->GetMark()
                                     : pRedl->GetPoint();
-        // Looking for deletions, which ends in current pTxtNode
+        // Looking for deletions, which ends in current pTextNode
         if( nsRedlineType_t::REDLINE_DELETE == pRedl->GetRedlineData().GetType() &&
-            pEnd->nNode == *pTxtNode && pStt->nNode != *pTxtNode &&
-            pStt->nNode.GetNode().IsTxtNode() )
+            pEnd->nNode == *pTextNode && pStt->nNode != *pTextNode &&
+            pStt->nNode.GetNode().IsTextNode() )
         {
-            pTxtNode = pStt->nNode.GetNode().GetTxtNode();
+            pTextNode = pStt->nNode.GetNode().GetTextNode();
             nMax = nPos;
             nPos = 0;
         }
     }
-    return static_cast<SwTxtFmtColl&>( pTxtNode->GetAnyFmtColl() );
+    return static_cast<SwTextFormatColl&>( pTextNode->GetAnyFormatColl() );
 }
 
-void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rSwFmtDrop, sal_uInt16 nStyle,
+void WW8AttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop &rSwFormatDrop, sal_uInt16 nStyle,
         ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner )
 {
-    short nDropLines = rSwFmtDrop.GetLines();
-    short nDistance = rSwFmtDrop.GetDistance();
+    short nDropLines = rSwFormatDrop.GetLines();
+    short nDistance = rSwFormatDrop.GetDistance();
     int rFontHeight, rDropHeight, rDropDescent;
 
     SVBT16 nSty;
@@ -1721,11 +1721,11 @@ void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rS
     {
         if ( m_rWW8Export.bWrtWW8 )
         {
-            const SwCharFmt *pSwCharFmt = rSwFmtDrop.GetCharFmt();
-            if ( pSwCharFmt )
+            const SwCharFormat *pSwCharFormat = rSwFormatDrop.GetCharFormat();
+            if ( pSwCharFormat )
             {
                 m_rWW8Export.InsUInt16( NS_sprm::LN_CIstd );
-                m_rWW8Export.InsUInt16( m_rWW8Export.GetId( pSwCharFmt ) );
+                m_rWW8Export.InsUInt16( m_rWW8Export.GetId( pSwCharFormat ) );
             }
 
             m_rWW8Export.InsUInt16( NS_sprm::LN_CHpsPos );            // Lower the chars
@@ -1736,11 +1736,11 @@ void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rS
         }
         else
         {
-            const SwCharFmt *pSwCharFmt = rSwFmtDrop.GetCharFmt();
-            if ( pSwCharFmt )
+            const SwCharFormat *pSwCharFormat = rSwFormatDrop.GetCharFormat();
+            if ( pSwCharFormat )
             {
                 m_rWW8Export.InsUInt16( 80 );
-                m_rWW8Export.InsUInt16( m_rWW8Export.GetId( pSwCharFmt ) );
+                m_rWW8Export.InsUInt16( m_rWW8Export.GetId( pSwCharFormat ) );
             }
 
             m_rWW8Export.pO->push_back( 101 );      // Lower the chars
@@ -1755,7 +1755,7 @@ void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rS
     m_rWW8Export.pO->clear();
 }
 
-sal_Int32 MSWordExportBase::GetNextPos( SwWW8AttrIter* aAttrIter, const SwTxtNode& rNode, sal_Int32 nAktPos )
+sal_Int32 MSWordExportBase::GetNextPos( SwWW8AttrIter* aAttrIter, const SwTextNode& rNode, sal_Int32 nAktPos )
 {
     // Get the bookmarks for the normal run
     const sal_Int32 nNextPos = aAttrIter->WhereNext();
@@ -1784,7 +1784,7 @@ void MSWordExportBase::UpdatePosition( SwWW8AttrIter* aAttrIter, sal_Int32 nAktP
         aAttrIter->NextPos();
 }
 
-bool MSWordExportBase::GetBookmarks( const SwTxtNode& rNd, sal_Int32 nStt,
+bool MSWordExportBase::GetBookmarks( const SwTextNode& rNd, sal_Int32 nStt,
                     sal_Int32 nEnd, IMarkVector& rArr )
 {
     IDocumentMarkAccess* const pMarkAccess = m_pDoc->getIDocumentMarkAccess();
@@ -1820,7 +1820,7 @@ bool MSWordExportBase::GetBookmarks( const SwTxtNode& rNd, sal_Int32 nStt,
     return ( rArr.size() > 0 );
 }
 
-bool MSWordExportBase::GetAnnotationMarks( const SwTxtNode& rNd, sal_Int32 nStt,
+bool MSWordExportBase::GetAnnotationMarks( const SwTextNode& rNd, sal_Int32 nStt,
                     sal_Int32 nEnd, IMarkVector& rArr )
 {
     IDocumentMarkAccess* const pMarkAccess = m_pDoc->getIDocumentMarkAccess();
@@ -1932,7 +1932,7 @@ bool MSWordExportBase::NearestAnnotationMark( sal_Int32& rNearest, const sal_Int
     return bHasAnnotationMark;
 }
 
-void MSWordExportBase::GetSortedAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen )
+void MSWordExportBase::GetSortedAnnotationMarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen )
 {
     IMarkVector aMarksStart;
     if ( GetAnnotationMarks( rNode, nAktPos, nAktPos + nLen, aMarksStart ) )
@@ -1968,7 +1968,7 @@ void MSWordExportBase::GetSortedAnnotationMarks( const SwTxtNode& rNode, sal_Int
     }
 }
 
-void MSWordExportBase::GetSortedBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen )
+void MSWordExportBase::GetSortedBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen )
 {
     IMarkVector aMarksStart;
     if ( GetBookmarks( rNode, nAktPos, nAktPos + nLen, aMarksStart ) )
@@ -2004,9 +2004,9 @@ void MSWordExportBase::GetSortedBookmarks( const SwTxtNode& rNode, sal_Int32 nAk
     }
 }
 
-void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
+void MSWordExportBase::OutputTextNode( const SwTextNode& rNode )
 {
-    SAL_INFO( "sw.ww8", "<OutWW8_SwTxtNode>" );
+    SAL_INFO( "sw.ww8", "<OutWW8_SwTextNode>" );
 
     ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo( m_pTableInfo->getTableNodeInfo( &rNode ) );
 
@@ -2020,10 +2020,10 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             bLastCR = true;
     }
 
-    // In order to make sure watermark is stored in 'header.xml', check nTxtTyp.
+    // In order to make sure watermark is stored in 'header.xml', check nTextTyp.
     // if it is document.xml, don't write the tags (watermark should be only in the 'header')
     SwWW8AttrIter aWatermarkAttrIter( *this, rNode );
-    if (( TXT_HDFT != m_nTxtTyp) && aWatermarkAttrIter.IsWatermarkFrame())
+    if (( TXT_HDFT != m_nTextTyp) && aWatermarkAttrIter.IsWatermarkFrame())
     {
        return;
     }
@@ -2058,7 +2058,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
     {
         // check for end of TOX
         SwNodeIndex aIdx( rNode, 1 );
-        if( !aIdx.GetNode().IsTxtNode() )
+        if( !aIdx.GetNode().IsTextNode() )
         {
             const SwSectionNode* pTOXSectNd = rNode.FindSectionNode();
             if ( pTOXSectNd )
@@ -2078,7 +2078,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         AppendWordBookmark( sBkmkName );
     }
 
-    OUString aStr( rNode.GetTxt() );
+    OUString aStr( rNode.GetText() );
 
     sal_Int32 nAktPos = 0;
     sal_Int32 const nEnd = aStr.getLength();
@@ -2101,7 +2101,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         bool bSingleEmptyRun = nAktPos == 0 && nNextAttr == 0;
         AttrOutput().StartRun( pRedlineData, bSingleEmptyRun );
 
-        if( m_nTxtTyp == TXT_FTN || m_nTxtTyp == TXT_EDN )
+        if( m_nTextTyp == TXT_FTN || m_nTextTyp == TXT_EDN )
             AttrOutput().FootnoteEndnoteRefTag();
 
         if( nNextAttr > nEnd )
@@ -2113,8 +2113,8 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             2) Ensure that it is a text node and not in a fly.
             3) If the anchor is associated with a text node with empty text then we ignore.
         */
-        if ( rNode.IsTxtNode() && aStr != aStringForImage && !aStr.isEmpty() &&
-            !rNode.GetFlyFmt() && aAttrIter.IsAnchorLinkedToThisNode(rNode.GetIndex()))
+        if ( rNode.IsTextNode() && aStr != aStringForImage && !aStr.isEmpty() &&
+            !rNode.GetFlyFormat() && aAttrIter.IsAnchorLinkedToThisNode(rNode.GetIndex()))
             bPostponeWritingText = true ;
 
         nStateOfFlyFrame = aAttrIter.OutFlys( nAktPos );
@@ -2124,11 +2124,11 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         // position of this range
         AppendBookmarks( rNode, nAktPos, nNextAttr - nAktPos );
         AppendAnnotationMarks( rNode, nAktPos, nNextAttr - nAktPos );
-        bool bTxtAtr = aAttrIter.IsTxtAttr( nAktPos );
+        bool bTextAtr = aAttrIter.IsTextAttr( nAktPos );
         nOpenAttrWithRange += aAttrIter.OutAttrWithRange(nAktPos);
 
         sal_Int32 nLen = nNextAttr - nAktPos;
-        if ( !bTxtAtr && nLen )
+        if ( !bTextAtr && nLen )
         {
             sal_Unicode ch = aStr[nAktPos];
             const sal_Int32 ofs = ( ch == CH_TXT_ATR_FIELDSTART || ch == CH_TXT_ATR_FIELDEND || ch == CH_TXT_ATR_FORMELEMENT? 1 : 0 );
@@ -2136,7 +2136,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             IDocumentMarkAccess* const pMarkAccess = m_pDoc->getIDocumentMarkAccess();
             if ( ch == CH_TXT_ATR_FIELDSTART )
             {
-                SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos ) );
+                SwPosition aPosition( rNode, SwIndex( const_cast< SwTextNode* >( &rNode ), nAktPos ) );
                 ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
                 OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
 
@@ -2185,7 +2185,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             }
             else if ( ch == CH_TXT_ATR_FIELDEND )
             {
-                SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos ) );
+                SwPosition aPosition( rNode, SwIndex( const_cast< SwTextNode* >( &rNode ), nAktPos ) );
                 ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
 
                 OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDEND??" );
@@ -2209,7 +2209,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             }
             else if ( ch == CH_TXT_ATR_FORMELEMENT )
             {
-                SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos ) );
+                SwPosition aPosition( rNode, SwIndex( const_cast< SwTextNode* >( &rNode ), nAktPos ) );
                 ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
                 OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
 
@@ -2230,7 +2230,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             nLen -= ofs;
 
             OUString aSnippet( aAttrIter.GetSnippet( aStr, nAktPos + ofs, nLen ) );
-            if ( ( m_nTxtTyp == TXT_EDN || m_nTxtTyp == TXT_FTN ) && nAktPos == 0 && nLen > 0 )
+            if ( ( m_nTextTyp == TXT_EDN || m_nTextTyp == TXT_FTN ) && nAktPos == 0 && nLen > 0 )
             {
                 // Insert tab for aesthetic purposes #i24762#
                 if ( aSnippet[0] != 0x09 )
@@ -2250,7 +2250,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         }
 
         if ( aAttrIter.IsDropCap( nNextAttr ) )
-            AttrOutput().FormatDrop( rNode, aAttrIter.GetSwFmtDrop(), nStyle, pTextNodeInfo, pTextNodeInfoInner );
+            AttrOutput().FormatDrop( rNode, aAttrIter.GetSwFormatDrop(), nStyle, pTextNodeInfo, pTextNodeInfoInner );
 
         // Only output character attributes if this is not a postponed text run.
         if (0 != nEnd && !(bPostponeWritingText && FLY_PROCESSED == nStateOfFlyFrame))
@@ -2267,7 +2267,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         if ( nNextAttr == nEnd )
         {
             OSL_ENSURE( nOpenAttrWithRange >= 0, "odd to see this happening, expected >= 0" );
-            if ( !bTxtAtr && nOpenAttrWithRange <= 0 )
+            if ( !bTextAtr && nOpenAttrWithRange <= 0 )
             {
                 if ( aAttrIter.IncludeEndOfParaCRInRedlineProperties( nEnd ) )
                     bIncludeEndOfParaCRInRedlineProperties = true;
@@ -2320,7 +2320,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
 
             AttrOutput().OutputFKP();
 
-            if (bTxtAtr || bAttrWithRange || bIncludeEndOfParaCRInRedlineProperties)
+            if (bTextAtr || bAttrWithRange || bIncludeEndOfParaCRInRedlineProperties)
             {
                 // insert final graphic anchors if any before CR
                 nStateOfFlyFrame = aAttrIter.OutFlys( nEnd );
@@ -2393,7 +2393,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
     AttrOutput().ParagraphStyle( nStyle );
 
     if ( m_pParentFrame && IsInTable() )    // Fly-Attrs
-        OutputFormat( m_pParentFrame->GetFrmFmt(), false, false, true );
+        OutputFormat( m_pParentFrame->GetFrameFormat(), false, false, true );
 
     if ( pTextNodeInfo.get() != NULL )
     {
@@ -2406,10 +2406,10 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         {
             const SwTable * pTable = pTextNodeInfoInner->getTable();
 
-            const SwTableFmt* pTabFmt = pTable->GetFrmFmt();
-            if (pTabFmt != NULL)
+            const SwTableFormat* pTabFormat = pTable->GetFrameFormat();
+            if (pTabFormat != NULL)
             {
-                if (pTabFmt->GetBreak().GetBreak() == SVX_BREAK_PAGE_BEFORE)
+                if (pTabFormat->GetBreak().GetBreak() == SVX_BREAK_PAGE_BEFORE)
                     AttrOutput().PageBreakBefore(true);
             }
         }
@@ -2457,31 +2457,31 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         {
             const SwNumRule* pRule = rNode.GetNumRule();
             sal_uInt8 nLvl = static_cast< sal_uInt8 >(nNumberLevel);
-            const SwNumFmt* pFmt = pRule->GetNumFmt( nLvl );
-            if( !pFmt )
-                pFmt = &pRule->Get( nLvl );
+            const SwNumFormat* pFormat = pRule->GetNumFormat( nLvl );
+            if( !pFormat )
+                pFormat = &pRule->Get( nLvl );
 
             if( !pTmpSet )
                 pTmpSet = new SfxItemSet( rNode.GetSwAttrSet() );
 
             SvxLRSpaceItem aLR(ItemGet<SvxLRSpaceItem>(*pTmpSet, RES_LR_SPACE));
             // #i86652#
-            if ( pFmt->GetPositionAndSpaceMode() ==
+            if ( pFormat->GetPositionAndSpaceMode() ==
                                     SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt->GetAbsLSpace() );
+                aLR.SetTextLeft( aLR.GetTextLeft() + pFormat->GetAbsLSpace() );
             }
 
             if( rNode.IsNumbered() && rNode.IsCountedInList() )
             {
                 // #i86652#
-                if ( pFmt->GetPositionAndSpaceMode() ==
+                if ( pFormat->GetPositionAndSpaceMode() ==
                                         SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
                     if (bParaRTL)
-                        aLR.SetTxtFirstLineOfstValue(pFmt->GetAbsLSpace() - pFmt->GetFirstLineOffset());
+                        aLR.SetTextFirstLineOfstValue(pFormat->GetAbsLSpace() - pFormat->GetFirstLineOffset());
                     else
-                        aLR.SetTxtFirstLineOfst(GetWordFirstLineOffset(*pFmt));
+                        aLR.SetTextFirstLineOfst(GetWordFirstLineOffset(*pFormat));
                 }
 
                 // correct fix for issue i94187
@@ -2496,7 +2496,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                     // Put indent values into the itemset in case that the list
                     // style is applied via paragraph style and the list level
                     // indent values are not applicable.
-                    if ( pFmt->GetPositionAndSpaceMode() ==
+                    if ( pFormat->GetPositionAndSpaceMode() ==
                                             SvxNumberFormat::LABEL_ALIGNMENT &&
                          !rNode.AreListLevelIndentsApplicable() )
                     {
@@ -2508,7 +2508,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                 pTmpSet->ClearItem(RES_PARATR_NUMRULE);
 
             // #i86652#
-            if ( pFmt->GetPositionAndSpaceMode() ==
+            if ( pFormat->GetPositionAndSpaceMode() ==
                                     SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
                 pTmpSet->Put(aLR);
@@ -2516,11 +2516,11 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                 //#i21847#
                 SvxTabStopItem aItem(
                     ItemGet<SvxTabStopItem>(*pTmpSet, RES_PARATR_TABSTOP));
-                SvxTabStop aTabStop(pFmt->GetAbsLSpace());
+                SvxTabStop aTabStop(pFormat->GetAbsLSpace());
                 aItem.Insert(aTabStop);
                 pTmpSet->Put(aItem);
 
-                MSWordExportBase::CorrectTabStopInSet(*pTmpSet, pFmt->GetAbsLSpace());
+                MSWordExportBase::CorrectTabStopInSet(*pTmpSet, pFormat->GetAbsLSpace());
             }
         }
 
@@ -2577,18 +2577,18 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             if (nLevel >= MAXLEVEL)
                 nLevel = MAXLEVEL - 1;
 
-            const SwNumFmt& rNumFmt = pRule->Get( static_cast< sal_uInt16 >(nLevel) );
+            const SwNumFormat& rNumFormat = pRule->Get( static_cast< sal_uInt16 >(nLevel) );
 
             // #i86652#
-            if ( rNumFmt.GetPositionAndSpaceMode() ==
+            if ( rNumFormat.GetPositionAndSpaceMode() ==
                                     SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aLRSpace.SetTxtLeft( aLRSpace.GetLeft() + rNumFmt.GetAbsLSpace() );
+                aLRSpace.SetTextLeft( aLRSpace.GetLeft() + rNumFormat.GetAbsLSpace() );
 
                 // new first line indent = 0
                 // (first line indent is ignored for NO_NUMLEVEL)
                 if (!bParaRTL)
-                    aLRSpace.SetTxtFirstLineOfst( 0 );
+                    aLRSpace.SetTextFirstLineOfst( 0 );
 
                 // put back the new item
                 pTmpSet->Put( aLRSpace );
@@ -2608,8 +2608,8 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         if ( !rNode.GetpSwAttrSet() ||
              SfxItemState::SET != rNode.GetpSwAttrSet()->GetItemState(RES_BREAK, false) )
         {
-            const SvxFmtBreakItem* pBreakAtParaStyle =
-                &(ItemGet<SvxFmtBreakItem>(rNode.GetSwAttrSet(), RES_BREAK));
+            const SvxFormatBreakItem* pBreakAtParaStyle =
+                &(ItemGet<SvxFormatBreakItem>(rNode.GetSwAttrSet(), RES_BREAK));
             if ( pBreakAtParaStyle &&
                  pBreakAtParaStyle->GetBreak() == SVX_BREAK_PAGE_AFTER )
             {
@@ -2622,8 +2622,8 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             else if( pTmpSet )
             {   // Even a pagedesc item is set, the break item can be set 'NONE',
                 // this has to be overruled.
-                const SwFmtPageDesc& rPageDescAtParaStyle =
-                    ItemGet<SwFmtPageDesc>( rNode, RES_PAGEDESC );
+                const SwFormatPageDesc& rPageDescAtParaStyle =
+                    ItemGet<SwFormatPageDesc>( rNode, RES_PAGEDESC );
                 if( rPageDescAtParaStyle.KnowsPageDesc() )
                     pTmpSet->ClearItem( RES_BREAK );
             }
@@ -2637,17 +2637,17 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             if ( pTableNode )
             {
                 const SwTable& rTable = pTableNode->GetTable();
-                const SvxFmtKeepItem& rKeep = rTable.GetFrmFmt()->GetKeep();
+                const SvxFormatKeepItem& rKeep = rTable.GetFrameFormat()->GetKeep();
                 const bool bKeep = rKeep.GetValue();
                 const bool bDontSplit = !(bKeep ||
-                                          rTable.GetFrmFmt()->GetLayoutSplit().GetValue());
+                                          rTable.GetFrameFormat()->GetLayoutSplit().GetValue());
 
                 if ( bKeep || bDontSplit )
                 {
                     // bKeep: set keep at first paragraphs in all lines
                     // bDontSplit : set keep at first paragraphs in all lines except from last line
                     // but only for non-complex tables
-                    const SwTableBox* pBox = rNode.GetTblBox();
+                    const SwTableBox* pBox = rNode.GetTableBox();
                     const SwTableLine* pLine = pBox ? pBox->GetUpper() : 0;
 
                     if ( pLine && !pLine->GetUpper() )
@@ -2673,7 +2673,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                                     if ( !pTmpSet )
                                         pTmpSet = new SfxItemSet(rNode.GetSwAttrSet());
 
-                                    const SvxFmtKeepItem aKeepItem( true, RES_KEEP );
+                                    const SvxFormatKeepItem aKeepItem( true, RES_KEEP );
                                     pTmpSet->Put( aKeepItem );
                                 }
                             }
@@ -2686,16 +2686,16 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         const SfxItemSet* pNewSet = pTmpSet ? pTmpSet : rNode.GetpSwAttrSet();
         if( pNewSet )
         {                                               // Para-Attrs
-            m_pStyAttr = &rNode.GetAnyFmtColl().GetAttrSet();
+            m_pStyAttr = &rNode.GetAnyFormatColl().GetAttrSet();
 
-            const SwModify* pOldMod = m_pOutFmtNode;
-            m_pOutFmtNode = &rNode;
+            const SwModify* pOldMod = m_pOutFormatNode;
+            m_pOutFormatNode = &rNode;
 
             // Pap-Attrs, so script is not necessary
             OutputItemSet( *pNewSet, true, false, i18n::ScriptType::LATIN, false);
 
             m_pStyAttr = 0;
-            m_pOutFmtNode = pOldMod;
+            m_pOutFormatNode = pOldMod;
 
             if( pNewSet != rNode.GetpSwAttrSet() )
                 delete pNewSet;
@@ -2712,17 +2712,17 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
     // set as a hint.
     SfxItemSet aParagraphMarkerProperties(m_pDoc->GetAttrPool(), RES_CHRATR_BEGIN, RES_TXTATR_END);
     bool bCharFormatOnly = true;
-    if(const SwpHints* pTxtAttrs = rNode.GetpSwpHints())
+    if(const SwpHints* pTextAttrs = rNode.GetpSwpHints())
     {
-        for( size_t i = 0; i < pTxtAttrs->Count(); ++i )
+        for( size_t i = 0; i < pTextAttrs->Count(); ++i )
         {
-            const SwTxtAttr* pHt = (*pTxtAttrs)[i];
+            const SwTextAttr* pHt = (*pTextAttrs)[i];
             const sal_Int32 startPos = pHt->GetStart();    // first Attr characters
             const sal_Int32* endPos = pHt->End();    // end Attr characters
             // Check if these attributes are for the last character in the paragraph
             // - which means the paragraph marker. If a paragraph has 7 characters,
             // then properties on character 8 are for the paragraph marker
-            if( (endPos) && (startPos == *endPos ) && (*endPos == rNode.GetTxt().getLength()) )
+            if( (endPos) && (startPos == *endPos ) && (*endPos == rNode.GetText().getLength()) )
             {
                 SAL_INFO( "sw.ww8", startPos << "startPos == endPos" << *endPos);
                 sal_uInt16 nWhich = pHt->GetAttr().Which();
@@ -2745,7 +2745,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
 
     AttrOutput().EndParagraph( pTextNodeInfoInner );
 
-    SAL_INFO( "sw.ww8", "</OutWW8_SwTxtNode>" );
+    SAL_INFO( "sw.ww8", "</OutWW8_SwTextNode>" );
 }
 
 void WW8AttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo )
@@ -2792,7 +2792,7 @@ bool MSWordExportBase::NoPageBreakSection( const SfxItemSet* pSet )
     {
         bool bNoPageBreak = false;
         if ( SfxItemState::SET != pSet->GetItemState(RES_PAGEDESC, true, &pI)
-            || 0 == static_cast<const SwFmtPageDesc*>(pI)->GetPageDesc() )
+            || 0 == static_cast<const SwFormatPageDesc*>(pI)->GetPageDesc() )
         {
             bNoPageBreak = true;
         }
@@ -2803,7 +2803,7 @@ bool MSWordExportBase::NoPageBreakSection( const SfxItemSet* pSet )
                 bNoPageBreak = true;
             else
             {
-                SvxBreak eBreak = static_cast<const SvxFmtBreakItem*>(pI)->GetBreak();
+                SvxBreak eBreak = static_cast<const SvxFormatBreakItem*>(pI)->GetBreak();
                 switch (eBreak)
                 {
                     case SVX_BREAK_PAGE_BEFORE:
@@ -2835,11 +2835,11 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
         sal_uLong nRstLnNum = 0;
         const SfxItemSet* pSet;
         if ( rNd.IsTableNode() )
-            pSet = &rNd.GetTableNode()->GetTable().GetFrmFmt()->GetAttrSet();
-        else if ( rNd.IsCntntNode() )
+            pSet = &rNd.GetTableNode()->GetTable().GetFrameFormat()->GetAttrSet();
+        else if ( rNd.IsContentNode() )
         {
-            pSet = &rNd.GetCntntNode()->GetSwAttrSet();
-            nRstLnNum = static_cast<const SwFmtLineNumber&>(pSet->Get(
+            pSet = &rNd.GetContentNode()->GetSwAttrSet();
+            nRstLnNum = static_cast<const SwFormatLineNumber&>(pSet->Get(
                             RES_LINENUMBER )).GetStartValue();
         }
         else
@@ -2852,7 +2852,7 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
         {
             // new Section with no own PageDesc/-Break
             //  -> write follow section break;
-            const SwSectionFmt& rFmt = *rSection.GetFmt();
+            const SwSectionFormat& rFormat = *rSection.GetFormat();
             ReplaceCr( msword::PageBreak ); // Indikator fuer Page/Section-Break
 
             // Get the page in use at the top of this section
@@ -2862,49 +2862,49 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
             if (!pCurrent)
                 pCurrent = m_pAktPageDesc;
 
-            AppendSection( pCurrent, &rFmt, nRstLnNum );
+            AppendSection( pCurrent, &rFormat, nRstLnNum );
         }
     }
     if ( TOX_CONTENT_SECTION == rSection.GetType() )
         m_bStartTOX = true;
 }
 
-void WW8Export::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum )
+void WW8Export::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum )
 {
-    pSepx->AppendSep(Fc2Cp(Strm().Tell()), pPageDesc, pFmt, nLnNum);
+    pSepx->AppendSep(Fc2Cp(Strm().Tell()), pPageDesc, pFormat, nLnNum);
 }
 
 // Flys
 
-void WW8Export::OutWW6FlyFrmsInCntnt( const SwTxtNode& rNd )
+void WW8Export::OutWW6FlyFrmsInContent( const SwTextNode& rNd )
 {
     OSL_ENSURE(!bWrtWW8, "I shouldn't be needed for Word >=8");
     if ( bWrtWW8 )
         return;
 
-    if (const SwpHints* pTxtAttrs = rNd.GetpSwpHints())
+    if (const SwpHints* pTextAttrs = rNd.GetpSwpHints())
     {
-        for( size_t n=0; n < pTxtAttrs->Count(); ++n )
+        for( size_t n=0; n < pTextAttrs->Count(); ++n )
         {
-            const SwTxtAttr* pAttr = (*pTxtAttrs)[ n ];
+            const SwTextAttr* pAttr = (*pTextAttrs)[ n ];
             if( RES_TXTATR_FLYCNT == pAttr->Which() )
             {
                 // attribute bound to a character
-                const SwFmtFlyCnt& rFlyCntnt = pAttr->GetFlyCnt();
-                const SwFlyFrmFmt& rFlyFrmFmt = *static_cast<SwFlyFrmFmt*>(rFlyCntnt.GetFrmFmt());
-                const SwNodeIndex* pNodeIndex = rFlyFrmFmt.GetCntnt().GetCntntIdx();
+                const SwFormatFlyCnt& rFlyContent = pAttr->GetFlyCnt();
+                const SwFlyFrameFormat& rFlyFrameFormat = *static_cast<SwFlyFrameFormat*>(rFlyContent.GetFrameFormat());
+                const SwNodeIndex* pNodeIndex = rFlyFrameFormat.GetContent().GetContentIdx();
 
                 if( pNodeIndex )
                 {
                     sal_uLong nStt = pNodeIndex->GetIndex()+1,
                           nEnd = pNodeIndex->GetNode().EndOfSectionIndex();
 
-                    if( (nStt < nEnd) && !m_pDoc->GetNodes()[ nStt ]->IsNoTxtNode() )
+                    if( (nStt < nEnd) && !m_pDoc->GetNodes()[ nStt ]->IsNoTextNode() )
                     {
                         Point aOffset;
                         // get rectangle (bounding box?) of Fly and paragraph
                         SwRect aParentRect(rNd.FindLayoutRect(false, &aOffset)),
-                               aFlyRect(rFlyFrmFmt.FindLayoutRect(false, &aOffset ) );
+                               aFlyRect(rFlyFrameFormat.FindLayoutRect(false, &aOffset ) );
 
                         aOffset = aFlyRect.Pos() - aParentRect.Pos();
 
@@ -2913,8 +2913,8 @@ void WW8Export::OutWW6FlyFrmsInCntnt( const SwTxtNode& rNd )
 
                         // is analysed in OutputFormat()
                         m_pFlyOffset = &aOffset;
-                        m_eNewAnchorType = rFlyFrmFmt.GetAnchor().GetAnchorId();
-                        sw::Frame aFrm(rFlyFrmFmt, SwPosition(rNd));
+                        m_eNewAnchorType = rFlyFrameFormat.GetAnchor().GetAnchorId();
+                        sw::Frame aFrm(rFlyFrameFormat, SwPosition(rNd));
                         m_pParentFrame = &aFrm;
                         // Ok, write it out:
                         WriteText();
@@ -2927,16 +2927,16 @@ void WW8Export::OutWW6FlyFrmsInCntnt( const SwTxtNode& rNd )
     }
 }
 
-void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft )
+void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft )
 {
-    const SwFrmFmt &rFrmFmt = rFmt.GetFrmFmt();
-    const SwFmtAnchor& rAnch = rFrmFmt.GetAnchor();
+    const SwFrameFormat &rFrameFormat = rFormat.GetFrameFormat();
+    const SwFormatAnchor& rAnch = rFrameFormat.GetAnchor();
 
     bool bUseEscher = m_rWW8Export.bWrtWW8;
 
-    if ( m_rWW8Export.bWrtWW8 && rFmt.IsInline() )
+    if ( m_rWW8Export.bWrtWW8 && rFormat.IsInline() )
     {
-        sw::Frame::WriterSource eType = rFmt.GetWriterType();
+        sw::Frame::WriterSource eType = rFormat.GetWriterType();
         if ((eType == sw::Frame::eGraphic) || (eType == sw::Frame::eOle))
             bUseEscher = false;
         else
@@ -2948,7 +2948,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
         */
         if (bUseEscher && (eType == sw::Frame::eFormControl))
         {
-            if ( m_rWW8Export.MiserableFormFieldExportHack( rFrmFmt ) )
+            if ( m_rWW8Export.MiserableFormFieldExportHack( rFrameFormat ) )
                 return ;
         }
     }
@@ -2957,14 +2957,14 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
     {
         OSL_ENSURE( m_rWW8Export.bWrtWW8, "this has gone horribly wrong" );
         // write as escher
-        m_rWW8Export.AppendFlyInFlys(rFmt, rNdTopLeft);
+        m_rWW8Export.AppendFlyInFlys(rFormat, rNdTopLeft);
     }
     else
     {
         bool bDone = false;
 
         // Hole vom Node und vom letzten Node die Position in der Section
-        const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
+        const SwNodeIndex* pNodeIndex = rFrameFormat.GetContent().GetContentIdx();
 
         sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1                  : 0;
         sal_uLong nEnd = pNodeIndex ? pNodeIndex->GetNode().EndOfSectionIndex() : 0;
@@ -2972,11 +2972,11 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
         if( nStt >= nEnd )      // no range, hence no valid node
             return;
 
-        if ( !m_rWW8Export.IsInTable() && rFmt.IsInline() )
+        if ( !m_rWW8Export.IsInTable() && rFormat.IsInline() )
         {
             //Test to see if this textbox contains only a single graphic/ole
-            SwTxtNode* pParTxtNode = rAnch.GetCntntAnchor()->nNode.GetNode().GetTxtNode();
-            if ( pParTxtNode && !m_rWW8Export.m_pDoc->GetNodes()[ nStt ]->IsNoTxtNode() )
+            SwTextNode* pParTextNode = rAnch.GetContentAnchor()->nNode.GetNode().GetTextNode();
+            if ( pParTextNode && !m_rWW8Export.m_pDoc->GetNodes()[ nStt ]->IsNoTextNode() )
                 bDone = true;
         }
         if( !bDone )
@@ -2988,28 +2988,28 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
             if ( m_rWW8Export.m_pParentFrame )
             {
                 /* Munge flys in fly into absolutely positioned elements for word 6 */
-                const SwTxtNode* pParTxtNode = rAnch.GetCntntAnchor()->nNode.GetNode().GetTxtNode();
-                const SwRect aPageRect = pParTxtNode->FindPageFrmRect( false, 0, false );
+                const SwTextNode* pParTextNode = rAnch.GetContentAnchor()->nNode.GetNode().GetTextNode();
+                const SwRect aPageRect = pParTextNode->FindPageFrmRect( false, 0, false );
 
-                aOffset = rFrmFmt.FindLayoutRect().Pos();
+                aOffset = rFrameFormat.FindLayoutRect().Pos();
                 aOffset -= aPageRect.Pos();
 
                 m_rWW8Export.m_pFlyOffset = &aOffset;
                 m_rWW8Export.m_eNewAnchorType = FLY_AT_PAGE;
             }
 
-            m_rWW8Export.m_pParentFrame = &rFmt;
+            m_rWW8Export.m_pParentFrame = &rFormat;
             if (
                 m_rWW8Export.IsInTable() &&
                  (FLY_AT_PAGE != rAnch.GetAnchorId()) &&
-                 !m_rWW8Export.m_pDoc->GetNodes()[ nStt ]->IsNoTxtNode()
+                 !m_rWW8Export.m_pDoc->GetNodes()[ nStt ]->IsNoTextNode()
                )
             {
                 // note: set Flag  bOutTable again,
                 // because we deliver the normal content of the table cell, and no border
                 // ( Flag was deleted above in aSaveData() )
                 m_rWW8Export.m_bOutTable = true;
-                const OUString aName = rFrmFmt.GetName();
+                const OUString aName = rFrameFormat.GetName();
                 m_rWW8Export.StartCommentOutput(aName);
                 m_rWW8Export.WriteText();
                 m_rWW8Export.EndCommentOutput(aName);
@@ -3022,21 +3022,21 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
     }
 }
 
-void AttributeOutputBase::OutputFlyFrame( const sw::Frame& rFmt )
+void AttributeOutputBase::OutputFlyFrame( const sw::Frame& rFormat )
 {
-    if ( !rFmt.GetCntntNode() )
+    if ( !rFormat.GetContentNode() )
         return;
 
-    const SwCntntNode &rNode = *rFmt.GetCntntNode();
+    const SwContentNode &rNode = *rFormat.GetContentNode();
     Point aLayPos;
 
     // get the Layout Node-Position
-    if (FLY_AT_PAGE == rFmt.GetFrmFmt().GetAnchor().GetAnchorId())
+    if (FLY_AT_PAGE == rFormat.GetFrameFormat().GetAnchor().GetAnchorId())
         aLayPos = rNode.FindPageFrmRect().Pos();
     else
         aLayPos = rNode.FindLayoutRect().Pos();
 
-    OutputFlyFrame_Impl( rFmt, aLayPos );
+    OutputFlyFrame_Impl( rFormat, aLayPos );
 }
 
 // write data of any redline
@@ -3109,13 +3109,13 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline )
     }
 }
 
-void MSWordExportBase::OutputContentNode( const SwCntntNode& rNode )
+void MSWordExportBase::OutputContentNode( const SwContentNode& rNode )
 {
     switch ( rNode.GetNodeType() )
     {
         case ND_TEXTNODE:
         {
-            const SwTxtNode& rTextNode = *rNode.GetTxtNode();
+            const SwTextNode& rTextNode = *rNode.GetTextNode();
             if( !m_bOutOutlineOnly || rTextNode.IsOutline() )
                 OutputTextNode( rTextNode );
         }
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index b1b9c36e16ef..6ffaf31f9b9a 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -50,17 +50,17 @@ sal_uInt16 MSWordExportBase::DuplicateNumRule( const SwNumRule *pRule, sal_uInt8
     SwNumRule* pMyNumRule =
             new SwNumRule( m_pDoc->GetUniqueNumRuleName( &sPrefix ),
                            SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
-    m_pUsedNumTbl->push_back( pMyNumRule );
+    m_pUsedNumTable->push_back( pMyNumRule );
 
     for ( sal_uInt16 i = 0; i < MAXLEVEL; i++ )
     {
-        const SwNumFmt& rSubRule = pRule->Get(i);
+        const SwNumFormat& rSubRule = pRule->Get(i);
         pMyNumRule->Set( i, rSubRule );
     }
 
-    SwNumFmt aNumFmt( pMyNumRule->Get( nLevel ) );
-    aNumFmt.SetStart( nVal );
-    pMyNumRule->Set( nLevel, aNumFmt );
+    SwNumFormat aNumFormat( pMyNumRule->Get( nLevel ) );
+    aNumFormat.SetStart( nVal );
+    pMyNumRule->Set( nLevel, aNumFormat );
 
     nNumId = GetId( *pMyNumRule );
 
@@ -72,19 +72,19 @@ sal_uInt16 MSWordExportBase::DuplicateNumRule( const SwNumRule *pRule, sal_uInt8
 
 sal_uInt16 MSWordExportBase::GetId( const SwNumRule& rNumRule )
 {
-    if ( !m_pUsedNumTbl )
+    if ( !m_pUsedNumTable )
     {
-        m_pUsedNumTbl = new SwNumRuleTbl;
-        m_pUsedNumTbl->insert( m_pUsedNumTbl->begin(), m_pDoc->GetNumRuleTbl().begin(), m_pDoc->GetNumRuleTbl().end() );
-        // Check, if the outline rule is already inserted into <pUsedNumTbl>.
+        m_pUsedNumTable = new SwNumRuleTable;
+        m_pUsedNumTable->insert( m_pUsedNumTable->begin(), m_pDoc->GetNumRuleTable().begin(), m_pDoc->GetNumRuleTable().end() );
+        // Check, if the outline rule is already inserted into <pUsedNumTable>.
         // If yes, do not insert it again.
         bool bOutlineRuleAdded( false );
-        for ( sal_uInt16 n = m_pUsedNumTbl->size(); n; )
+        for ( sal_uInt16 n = m_pUsedNumTable->size(); n; )
         {
-            const SwNumRule& rRule = *(*m_pUsedNumTbl)[ --n ];
+            const SwNumRule& rRule = *(*m_pUsedNumTable)[ --n ];
             if ( !SwDoc::IsUsed( rRule ) )
             {
-                m_pUsedNumTbl->erase( m_pUsedNumTbl->begin() + n );
+                m_pUsedNumTable->erase( m_pUsedNumTable->begin() + n );
             }
             else if ( &rRule == m_pDoc->GetOutlineNumRule() )
             {
@@ -96,11 +96,11 @@ sal_uInt16 MSWordExportBase::GetId( const SwNumRule& rNumRule )
         {
             // still need to paste the OutlineRule
             SwNumRule* pR = m_pDoc->GetOutlineNumRule();
-            m_pUsedNumTbl->push_back( pR );
+            m_pUsedNumTable->push_back( pR );
         }
     }
     SwNumRule* p = const_cast<SwNumRule*>(&rNumRule);
-    sal_uInt16 nRet = static_cast<sal_uInt16>(m_pUsedNumTbl->GetPos(p));
+    sal_uInt16 nRet = static_cast<sal_uInt16>(m_pUsedNumTable->GetPos(p));
 
     // Is this list now duplicated into a new list which we should use
     // #i77812# - perform 'deep' search in duplication map
@@ -118,27 +118,27 @@ sal_uInt16 MSWordExportBase::GetId( const SwNumRule& rNumRule )
 
 // GetFirstLineOffset should problem never appear unadorned apart from
 // here in the ww export filter
-sal_Int16 GetWordFirstLineOffset(const SwNumFmt &rFmt)
+sal_Int16 GetWordFirstLineOffset(const SwNumFormat &rFormat)
 {
-    OSL_ENSURE( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
+    OSL_ENSURE( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
             "<GetWordFirstLineOffset> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION" );
 
     short nFirstLineOffset;
-    if (rFmt.GetNumAdjust() == SVX_ADJUST_RIGHT)
-        nFirstLineOffset = -rFmt.GetCharTextDistance();
+    if (rFormat.GetNumAdjust() == SVX_ADJUST_RIGHT)
+        nFirstLineOffset = -rFormat.GetCharTextDistance();
     else
-        nFirstLineOffset = rFmt.GetFirstLineOffset();
+        nFirstLineOffset = rFormat.GetFirstLineOffset();
     return nFirstLineOffset;
 }
 
 void WW8Export::WriteNumbering()
 {
-    if ( !m_pUsedNumTbl )
+    if ( !m_pUsedNumTable )
         return; // no numbering is used
 
     // list formats - LSTF
     pFib->fcPlcfLst = pTableStrm->Tell();
-    SwWW8Writer::WriteShort( *pTableStrm, m_pUsedNumTbl->size() );
+    SwWW8Writer::WriteShort( *pTableStrm, m_pUsedNumTable->size() );
     NumberingDefinitions();
     // set len to FIB
     pFib->lcbPlcfLst = pTableStrm->Tell() - pFib->fcPlcfLst;
@@ -171,15 +171,15 @@ void WW8AttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &r
 
 void MSWordExportBase::NumberingDefinitions()
 {
-    if ( !m_pUsedNumTbl )
+    if ( !m_pUsedNumTable )
         return; // no numbering is used
 
-    sal_uInt16 nCount = m_pUsedNumTbl->size();
+    sal_uInt16 nCount = m_pUsedNumTable->size();
 
     // Write static data of SwNumRule - LSTF
     for ( sal_uInt16 n = 0; n < nCount; ++n )
     {
-        const SwNumRule& rRule = *(*m_pUsedNumTbl)[ n ];
+        const SwNumRule& rRule = *(*m_pUsedNumTable)[ n ];
 
         AttrOutput().NumberingDefinition( n + 1, rRule );
     }
@@ -351,7 +351,7 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/,
 
 void MSWordExportBase::AbstractNumberingDefinitions()
 {
-    sal_uInt16 nCount = m_pUsedNumTbl->size();
+    sal_uInt16 nCount = m_pUsedNumTable->size();
     sal_uInt16 n;
 
     // prepare the NodeNum to generate the NumString
@@ -363,37 +363,37 @@ void MSWordExportBase::AbstractNumberingDefinitions()
     {
         AttrOutput().StartAbstractNumbering( n + 1 );
 
-        const SwNumRule& rRule = *(*m_pUsedNumTbl)[ n ];
+        const SwNumRule& rRule = *(*m_pUsedNumTable)[ n ];
         sal_uInt8 nLvl;
         sal_uInt8 nLevels = static_cast< sal_uInt8 >(rRule.IsContinusNum() ?
             WW8ListManager::nMinLevel : WW8ListManager::nMaxLevel);
         for( nLvl = 0; nLvl < nLevels; ++nLvl )
         {
-            // write the static data of the SwNumFmt of this level
+            // write the static data of the SwNumFormat of this level
             sal_uInt8 aNumLvlPos[WW8ListManager::nMaxLevel] = { 0,0,0,0,0,0,0,0,0 };
 
-            const SwNumFmt& rFmt = rRule.Get( nLvl );
+            const SwNumFormat& rFormat = rRule.Get( nLvl );
 
             sal_uInt8 nFollow = 0;
             // #i86652#
-            if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+            if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
                 nFollow = 2;     // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
             }
-            else if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+            else if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                switch ( rFmt.GetLabelFollowedBy() )
+                switch ( rFormat.GetLabelFollowedBy() )
                 {
                     case SvxNumberFormat::LISTTAB:
                     {
             // 0 (tab) unless there would be no content before the tab, in which case 2 (nothing)
-            nFollow = (SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType()) ? 0 : 2;
+            nFollow = (SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType()) ? 0 : 2;
                     }
                     break;
                     case SvxNumberFormat::SPACE:
                     {
             // 1 (space) unless there would be no content before the space in which case 2 (nothing)
-            nFollow = (SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType()) ? 1 : 2;
+            nFollow = (SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType()) ? 1 : 2;
                     }
                     break;
                     case SvxNumberFormat::NOTHING:
@@ -416,13 +416,13 @@ void MSWordExportBase::AbstractNumberingDefinitions()
             const vcl::Font* pBulletFont=0;
             rtl_TextEncoding eChrSet=0;
             FontFamily eFamily=FAMILY_DECORATIVE;
-            if( SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType() ||
-                SVX_NUM_BITMAP == rFmt.GetNumberingType() )
+            if( SVX_NUM_CHAR_SPECIAL == rFormat.GetNumberingType() ||
+                SVX_NUM_BITMAP == rFormat.GetNumberingType() )
             {
-                sNumStr = OUString(rFmt.GetBulletChar());
+                sNumStr = OUString(rFormat.GetBulletChar());
                 bWriteBullet = true;
 
-                pBulletFont = rFmt.GetBulletFont();
+                pBulletFont = rFormat.GetBulletFont();
                 if (!pBulletFont)
                 {
                     pBulletFont = &numfunc::GetDefBulletFont();
@@ -436,19 +436,19 @@ void MSWordExportBase::AbstractNumberingDefinitions()
                     SubstituteBullet( sNumStr, eChrSet, sFontName );
 
                 // #i86652#
-                if ( rFmt.GetPositionAndSpaceMode() ==
+                if ( rFormat.GetPositionAndSpaceMode() ==
                                         SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                 {
                     // <nFollow = 2>, if minimum label width equals 0 and
                     // minimum distance between label and text equals 0
-                    nFollow = ( rFmt.GetFirstLineOffset() == 0 &&
-                                rFmt.GetCharTextDistance() == 0 )
+                    nFollow = ( rFormat.GetFirstLineOffset() == 0 &&
+                                rFormat.GetCharTextDistance() == 0 )
                               ? 2 : 0;     // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
                 }
             }
             else
             {
-                if (SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType())
+                if (SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType())
                 {
                     sal_uInt8* pLvlPos = aNumLvlPos;
                     // the numbering string has to be restrict
@@ -462,26 +462,26 @@ void MSWordExportBase::AbstractNumberingDefinitions()
                         sal_Int32 nFnd = sNumStr.indexOf( sSrch );
                         if( -1 != nFnd )
                         {
-                            *pLvlPos = (sal_uInt8)(nFnd + rFmt.GetPrefix().getLength() + 1 );
+                            *pLvlPos = (sal_uInt8)(nFnd + rFormat.GetPrefix().getLength() + 1 );
                             ++pLvlPos;
                             sNumStr = sNumStr.replaceAt( nFnd, 1, OUString((char)i) );
                         }
                     }
                     // #i86652#
-                    if ( rFmt.GetPositionAndSpaceMode() ==
+                    if ( rFormat.GetPositionAndSpaceMode() ==
                                             SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
                     {
                         // <nFollow = 2>, if minimum label width equals 0 and
                         // minimum distance between label and text equals 0
-                        nFollow = ( rFmt.GetFirstLineOffset() == 0 &&
-                                    rFmt.GetCharTextDistance() == 0 )
+                        nFollow = ( rFormat.GetFirstLineOffset() == 0 &&
+                                    rFormat.GetCharTextDistance() == 0 )
                                   ? 2 : 0;     // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
                     }
                 }
 
-                if( !rFmt.GetPrefix().isEmpty() )
-                    sNumStr = rFmt.GetPrefix() + sNumStr;
-                sNumStr += rFmt.GetSuffix();
+                if( !rFormat.GetPrefix().isEmpty() )
+                    sNumStr = rFormat.GetPrefix() + sNumStr;
+                sNumStr += rFormat.GetSuffix();
             }
 
             // Attributes of the numbering
@@ -491,14 +491,14 @@ void MSWordExportBase::AbstractNumberingDefinitions()
             // cbGrpprlChpx
             SfxItemSet aSet( m_pDoc->GetAttrPool(), RES_CHRATR_BEGIN,
                                                   RES_CHRATR_END );
-            if ( rFmt.GetCharFmt() || bWriteBullet )
+            if ( rFormat.GetCharFormat() || bWriteBullet )
             {
                 if ( bWriteBullet )
                 {
                     pOutSet = &aSet;
 
-                    if ( rFmt.GetCharFmt() )
-                        aSet.Put( rFmt.GetCharFmt()->GetAttrSet() );
+                    if ( rFormat.GetCharFormat() )
+                        aSet.Put( rFormat.GetCharFormat()->GetAttrSet() );
                     aSet.ClearItem( RES_CHRATR_CJK_FONT );
                     aSet.ClearItem( RES_CHRATR_FONT );
 
@@ -509,7 +509,7 @@ void MSWordExportBase::AbstractNumberingDefinitions()
                         eFamily, eChrSet, SupportsUnicode() );
                 }
                 else
-                    pOutSet = &rFmt.GetCharFmt()->GetAttrSet();
+                    pOutSet = &rFormat.GetCharFormat()->GetAttrSet();
             }
 
             sal_Int16 nIndentAt = 0;
@@ -517,29 +517,29 @@ void MSWordExportBase::AbstractNumberingDefinitions()
             sal_Int16 nListTabPos = 0;
 
             // #i86652#
-            if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+            if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                nIndentAt = nListTabPos = rFmt.GetAbsLSpace();
-                nFirstLineIndex = GetWordFirstLineOffset(rFmt);
+                nIndentAt = nListTabPos = rFormat.GetAbsLSpace();
+                nFirstLineIndex = GetWordFirstLineOffset(rFormat);
             }
-            else if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+            else if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                nIndentAt = static_cast<sal_Int16>(rFmt.GetIndentAt());
-                nFirstLineIndex = static_cast<sal_Int16>(rFmt.GetFirstLineIndent());
-                nListTabPos = rFmt.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB?
-                              static_cast<sal_Int16>( rFmt.GetListtabPos() ) : 0;
+                nIndentAt = static_cast<sal_Int16>(rFormat.GetIndentAt());
+                nFirstLineIndex = static_cast<sal_Int16>(rFormat.GetFirstLineIndent());
+                nListTabPos = rFormat.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB?
+                              static_cast<sal_Int16>( rFormat.GetListtabPos() ) : 0;
             }
 
             AttrOutput().NumberingLevel( nLvl,
-                    rFmt.GetStart(),
-                    rFmt.GetNumberingType(),
-                    rFmt.GetNumAdjust(),
+                    rFormat.GetStart(),
+                    rFormat.GetNumberingType(),
+                    rFormat.GetNumAdjust(),
                     aNumLvlPos,
                     nFollow,
                     pPseudoFont, pOutSet,
                     nIndentAt, nFirstLineIndex, nListTabPos,
                     sNumStr,
-                    rFmt.GetNumberingType()==SVX_NUM_BITMAP ? rFmt.GetBrush():0);
+                    rFormat.GetNumberingType()==SVX_NUM_BITMAP ? rFormat.GetBrush():0);
 
             delete pPseudoFont;
         }
@@ -549,11 +549,11 @@ void MSWordExportBase::AbstractNumberingDefinitions()
 
 void WW8Export::OutOverrideListTab()
 {
-    if( !m_pUsedNumTbl )
+    if( !m_pUsedNumTable )
         return ;            // no numbering is used
 
     // write the "list format override" - LFO
-    sal_uInt16 nCount = m_pUsedNumTbl->size();
+    sal_uInt16 nCount = m_pUsedNumTable->size();
     sal_uInt16 n;
 
     pFib->fcPlfLfo = pTableStrm->Tell();
@@ -573,11 +573,11 @@ void WW8Export::OutOverrideListTab()
 
 void WW8Export::OutListNamesTab()
 {
-    if( !m_pUsedNumTbl )
+    if( !m_pUsedNumTable )
         return ;            // no numbering is used
 
     // write the "list format override" - LFO
-    sal_uInt16 nNms = 0, nCount = m_pUsedNumTbl->size();
+    sal_uInt16 nNms = 0, nCount = m_pUsedNumTable->size();
 
     pFib->fcSttbListNames = pTableStrm->Tell();
     SwWW8Writer::WriteShort( *pTableStrm, -1 );
@@ -585,7 +585,7 @@ void WW8Export::OutListNamesTab()
 
     for( ; nNms < nCount; ++nNms )
     {
-        const SwNumRule& rRule = *(*m_pUsedNumTbl)[ nNms ];
+        const SwNumRule& rRule = *(*m_pUsedNumTable)[ nNms ];
         OUString sNm;
         if( !rRule.IsAutoRule() )
             sNm = rRule.GetName();
@@ -625,10 +625,10 @@ void WW8Export::OutputOlst( const SwNumRule& rRule )
     {
         memcpy( &aOlst.rganlv[j], aAnlvBase, sizeof( WW8_ANLV ) );  // Defaults
 
-        const SwNumFmt* pFmt = rRule.GetNumFmt( j );
-        if( pFmt )
+        const SwNumFormat* pFormat = rRule.GetNumFormat( j );
+        if( pFormat )
             BuildAnlvBase( aOlst.rganlv[j], pChars, nCharLen, rRule,
-                            *pFmt, (sal_uInt8)j );
+                            *pFormat, (sal_uInt8)j );
     }
 
     pO->insert( pO->end(), reinterpret_cast<sal_uInt8*>(&aOlst), reinterpret_cast<sal_uInt8*>(&aOlst)+sizeof( aOlst ) );
@@ -647,12 +647,12 @@ void WW8Export::Out_SwNumLvl( sal_uInt8 nSwLevel )
 }
 
 void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
-    sal_uInt16& rCharLen, const SwNumFmt& rFmt)
+    sal_uInt16& rCharLen, const SwNumFormat& rFormat)
 {
     rAnlv.nfc = 11;
 
     sal_uInt8 nb = 0;                                // type of number
-    switch (rFmt.GetNumAdjust())
+    switch (rFormat.GetNumAdjust())
     {
         case SVX_ADJUST_RIGHT:
             nb = 2;
@@ -670,19 +670,19 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
     }
 
     // #i86652#
-    if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+    if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
-        if (GetWordFirstLineOffset(rFmt) < 0)
+        if (GetWordFirstLineOffset(rFormat) < 0)
             nb |= 0x8;          // number will be displayed using a hanging indent
     }
     rAnlv.aBits1 = nb;
 
     if (1 < rCharLen)
     {
-        const vcl::Font& rFont = rFmt.GetBulletFont()
-                            ? *rFmt.GetBulletFont()
+        const vcl::Font& rFont = rFormat.GetBulletFont()
+                            ? *rFormat.GetBulletFont()
                             : numfunc::GetDefBulletFont();
-        OUString sNumStr = OUString(rFmt.GetBulletChar());
+        OUString sNumStr = OUString(rFormat.GetBulletChar());
         rtl_TextEncoding eChrSet = rFont.GetCharSet();
         OUString sFontName = rFont.GetName();
 
@@ -726,10 +726,10 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
         rAnlv.cbTextBefore = 1;
     }
     // #i86652#
-    if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+    if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
-        ShortToSVBT16( -GetWordFirstLineOffset(rFmt), rAnlv.dxaIndent );
-        ShortToSVBT16( rFmt.GetCharTextDistance(), rAnlv.dxaSpace );
+        ShortToSVBT16( -GetWordFirstLineOffset(rFormat), rAnlv.dxaIndent );
+        ShortToSVBT16( rFormat.GetCharTextDistance(), rAnlv.dxaSpace );
     }
     else
     {
@@ -773,16 +773,16 @@ static void SwWw8_InsertAnlText( const OUString& rStr, sal_uInt8*& rpCh,
 }
 
 void WW8Export::BuildAnlvBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
-    sal_uInt16& rCharLen, const SwNumRule& rRul, const SwNumFmt& rFmt,
+    sal_uInt16& rCharLen, const SwNumRule& rRul, const SwNumFormat& rFormat,
     sal_uInt8 nSwLevel)
 {
     const SfxItemSet *pOutSet = NULL;
-    if (rFmt.GetCharFmt())
-        pOutSet = &rFmt.GetCharFmt()->GetAttrSet();
-    rAnlv.nfc = GetLevelNFC(rFmt.GetNumberingType(),pOutSet );
+    if (rFormat.GetCharFormat())
+        pOutSet = &rFormat.GetCharFormat()->GetAttrSet();
+    rAnlv.nfc = GetLevelNFC(rFormat.GetNumberingType(),pOutSet );
 
     sal_uInt8 nb = 0;
-    switch (rFmt.GetNumAdjust())
+    switch (rFormat.GetNumAdjust())
     {
         case SVX_ADJUST_RIGHT:
             nb = 2;
@@ -799,11 +799,11 @@ void WW8Export::BuildAnlvBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
             break;
     }
 
-    bool bInclUpper = rFmt.GetIncludeUpperLevels() > 0;
+    bool bInclUpper = rFormat.GetIncludeUpperLevels() > 0;
     if( bInclUpper )
         nb |= 0x4;          // include previous levels
 
-    if (GetWordFirstLineOffset(rFmt) < 0)
+    if (GetWordFirstLineOffset(rFormat) < 0)
         nb |= 0x8;          // number will be displayed using a hanging indent
     rAnlv.aBits1 = nb;
 
@@ -811,9 +811,9 @@ void WW8Export::BuildAnlvBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
     {
         if( (nSwLevel >= WW8ListManager::nMinLevel )
             && (nSwLevel<= WW8ListManager::nMaxLevel )
-            && (rFmt.GetNumberingType() != SVX_NUM_NUMBER_NONE ) )  // UEberhaupt Nummerierung ?
+            && (rFormat.GetNumberingType() != SVX_NUM_NUMBER_NONE ) )  // UEberhaupt Nummerierung ?
         {                                               // -> suche, ob noch Zahlen davor
-            sal_uInt8 nUpper = rFmt.GetIncludeUpperLevels();
+            sal_uInt8 nUpper = rFormat.GetIncludeUpperLevels();
             if( (nUpper <= WW8ListManager::nMaxLevel) &&
                 (rRul.Get(nUpper).GetNumberingType() != SVX_NUM_NUMBER_NONE ) ) // Nummerierung drueber ?
             {
@@ -826,18 +826,18 @@ void WW8Export::BuildAnlvBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
     }
     else
     {
-        SwWw8_InsertAnlText( rFmt.GetPrefix(), rpCh, rCharLen,
+        SwWw8_InsertAnlText( rFormat.GetPrefix(), rpCh, rCharLen,
                              rAnlv.cbTextBefore );
-        SwWw8_InsertAnlText( rFmt.GetSuffix(), rpCh, rCharLen,
+        SwWw8_InsertAnlText( rFormat.GetSuffix(), rpCh, rCharLen,
                              rAnlv.cbTextAfter );
     }
 
-    ShortToSVBT16( rFmt.GetStart(), rAnlv.iStartAt );
+    ShortToSVBT16( rFormat.GetStart(), rAnlv.iStartAt );
     // #i86652#
-    if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+    if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
-        ShortToSVBT16( -GetWordFirstLineOffset(rFmt), rAnlv.dxaIndent );
-        ShortToSVBT16( rFmt.GetCharTextDistance(), rAnlv.dxaSpace );
+        ShortToSVBT16( -GetWordFirstLineOffset(rFormat), rAnlv.dxaIndent );
+        ShortToSVBT16( rFormat.GetCharTextDistance(), rAnlv.dxaSpace );
     }
     else
     {
@@ -846,7 +846,7 @@ void WW8Export::BuildAnlvBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
     }
 }
 
-void WW8Export::Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt,
+void WW8Export::Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFormat& rFormat,
                                    sal_uInt8 nSwLevel )
 {
     static const sal_uInt8 aSprmAnldDefault[54] = {
@@ -864,16 +864,16 @@ void WW8Export::Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt,
     sal_uInt16 nCharLen = 31;
 
     if( nSwLevel == 11 )
-        BuildAnlvBulletBase( pA->eAnlv, pChars, nCharLen, rFmt );
+        BuildAnlvBulletBase( pA->eAnlv, pChars, nCharLen, rFormat );
     else
-        BuildAnlvBase( pA->eAnlv, pChars, nCharLen, rRul, rFmt, nSwLevel );
+        BuildAnlvBase( pA->eAnlv, pChars, nCharLen, rRul, rFormat, nSwLevel );
 
     // ... spit it out
     OutSprmBytes( reinterpret_cast<sal_uInt8*>(&aSprmAnld), sizeof( aSprmAnld ) );
 }
 
 // Return: is it an outline?
-bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
+bool WW8Export::Out_SwNum(const SwTextNode* pNd)
 {
     int nLevel = pNd->GetActualListLevel();
 
@@ -892,22 +892,22 @@ bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
 
     bool bRet = true;
 
-    SwNumFmt aFmt(pRul->Get(nSwLevel));
+    SwNumFormat aFormat(pRul->Get(nSwLevel));
     // #i86652#
-    if ( aFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+    if ( aFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
         const SvxLRSpaceItem& rLR = ItemGet<SvxLRSpaceItem>(*pNd, RES_LR_SPACE);
-        aFmt.SetAbsLSpace(writer_cast<short>(aFmt.GetAbsLSpace() + rLR.GetLeft()));
+        aFormat.SetAbsLSpace(writer_cast<short>(aFormat.GetAbsLSpace() + rLR.GetLeft()));
     }
 
     if (
-         aFmt.GetNumberingType() == SVX_NUM_NUMBER_NONE ||
-         aFmt.GetNumberingType() == SVX_NUM_CHAR_SPECIAL ||
-         aFmt.GetNumberingType() == SVX_NUM_BITMAP
+         aFormat.GetNumberingType() == SVX_NUM_NUMBER_NONE ||
+         aFormat.GetNumberingType() == SVX_NUM_CHAR_SPECIAL ||
+         aFormat.GetNumberingType() == SVX_NUM_BITMAP
        )
     {
         Out_WwNumLvl(11);
-        Out_NumRuleAnld(*pRul, aFmt, 11);
+        Out_NumRuleAnld(*pRul, aFormat, 11);
         bRet = false;
     }
     else if (
@@ -916,13 +916,13 @@ bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
             )
     {
         Out_WwNumLvl(10);
-        Out_NumRuleAnld(*pRul, aFmt, 10);
+        Out_NumRuleAnld(*pRul, aFormat, 10);
         bRet = false;
     }
     else
     {
         Out_SwNumLvl(nSwLevel);
-        Out_NumRuleAnld(*pRul, aFmt, nSwLevel);
+        Out_NumRuleAnld(*pRul, aFormat, nSwLevel);
     }
     return bRet;
 }
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 32d781e8ac0f..cee294a2b4dd 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -117,43 +117,43 @@ public:
 
 #define WW8_RESERVED_SLOTS 15
 
-// GetId( SwCharFmt ) for use in text -> zero is not allowed,
+// GetId( SwCharFormat ) for use in text -> zero is not allowed,
 // use "Default Char Style" instead
-sal_uInt16 MSWordExportBase::GetId( const SwCharFmt* pFmt ) const
+sal_uInt16 MSWordExportBase::GetId( const SwCharFormat* pFormat ) const
 {
-    sal_uInt16 nRet = m_pStyles->GetSlot( pFmt );
+    sal_uInt16 nRet = m_pStyles->GetSlot( pFormat );
     return ( nRet != 0x0fff ) ? nRet : 10;      // Default Char Style
 }
 
-// GetId( SwTxtFmtColl ) for use in TextNodes -> zero is not allowed,
+// GetId( SwTextFormatColl ) for use in TextNodes -> zero is not allowed,
 // "Standard" instead
-sal_uInt16 MSWordExportBase::GetId( const SwTxtFmtColl& rColl ) const
+sal_uInt16 MSWordExportBase::GetId( const SwTextFormatColl& rColl ) const
 {
     sal_uInt16 nRet = m_pStyles->GetSlot( &rColl );
-    return ( nRet != 0xfff ) ? nRet : 0;        // Default TxtFmtColl
+    return ( nRet != 0xfff ) ? nRet : 0;        // Default TextFormatColl
 }
 
-//typedef pFmtT
+//typedef pFormatT
 MSWordStyles::MSWordStyles( MSWordExportBase& rExport, bool bListStyles )
     : m_rExport( rExport ),
     m_bListStyles(bListStyles)
 {
     // if exist any Foot-/End-Notes then get from the EndNoteInfo struct
     // the CharFormats. They will create it!
-    if ( !m_rExport.m_pDoc->GetFtnIdxs().empty() )
+    if ( !m_rExport.m_pDoc->GetFootnoteIdxs().empty() )
     {
-        m_rExport.m_pDoc->GetEndNoteInfo().GetAnchorCharFmt( *m_rExport.m_pDoc );
-        m_rExport.m_pDoc->GetEndNoteInfo().GetCharFmt( *m_rExport.m_pDoc );
-        m_rExport.m_pDoc->GetFtnInfo().GetAnchorCharFmt( *m_rExport.m_pDoc );
-        m_rExport.m_pDoc->GetFtnInfo().GetCharFmt( *m_rExport.m_pDoc );
+        m_rExport.m_pDoc->GetEndNoteInfo().GetAnchorCharFormat( *m_rExport.m_pDoc );
+        m_rExport.m_pDoc->GetEndNoteInfo().GetCharFormat( *m_rExport.m_pDoc );
+        m_rExport.m_pDoc->GetFootnoteInfo().GetAnchorCharFormat( *m_rExport.m_pDoc );
+        m_rExport.m_pDoc->GetFootnoteInfo().GetCharFormat( *m_rExport.m_pDoc );
     }
-    sal_uInt16 nAlloc = WW8_RESERVED_SLOTS + m_rExport.m_pDoc->GetCharFmts()->size() - 1 +
-                                         m_rExport.m_pDoc->GetTxtFmtColls()->size() - 1 +
-                                         (bListStyles ? m_rExport.m_pDoc->GetNumRuleTbl().size() - 1 : 0);
+    sal_uInt16 nAlloc = WW8_RESERVED_SLOTS + m_rExport.m_pDoc->GetCharFormats()->size() - 1 +
+                                         m_rExport.m_pDoc->GetTextFormatColls()->size() - 1 +
+                                         (bListStyles ? m_rExport.m_pDoc->GetNumRuleTable().size() - 1 : 0);
 
     // somewhat generous ( free for up to 15 )
-    m_pFmtA = new SwFmt*[ nAlloc ];
-    memset( m_pFmtA, 0, nAlloc * sizeof( SwFmt* ) );
+    m_pFormatA = new SwFormat*[ nAlloc ];
+    memset( m_pFormatA, 0, nAlloc * sizeof( SwFormat* ) );
 
     BuildStylesTable();
     BuildStyleIds();
@@ -161,23 +161,23 @@ MSWordStyles::MSWordStyles( MSWordExportBase& rExport, bool bListStyles )
 
 MSWordStyles::~MSWordStyles()
 {
-    delete[] m_pFmtA;
+    delete[] m_pFormatA;
 }
 
 // Sty_SetWWSlot() dependencies for the styles -> zero is allowed
-sal_uInt16 MSWordStyles::GetSlot( const SwFmt* pFmt ) const
+sal_uInt16 MSWordStyles::GetSlot( const SwFormat* pFormat ) const
 {
     sal_uInt16 n;
     for ( n = 0; n < m_nUsedSlots; n++ )
-        if ( m_pFmtA[n] == pFmt )
+        if ( m_pFormatA[n] == pFormat )
             return n;
     return 0xfff;                   // 0xfff: WW: zero
 }
 
-sal_uInt16 MSWordStyles::BuildGetSlot( const SwFmt& rFmt )
+sal_uInt16 MSWordStyles::BuildGetSlot( const SwFormat& rFormat )
 {
     sal_uInt16 nRet;
-    switch ( nRet = rFmt.GetPoolFmtId() )
+    switch ( nRet = rFormat.GetPoolFormatId() )
     {
         case RES_POOLCOLL_STANDARD:
             nRet = 0;
@@ -203,10 +203,10 @@ sal_uInt16 MSWordStyles::BuildGetSlot( const SwFmt& rFmt )
 }
 
 
-sal_uInt16 MSWordStyles::GetWWId( const SwFmt& rFmt )
+sal_uInt16 MSWordStyles::GetWWId( const SwFormat& rFormat )
 {
     sal_uInt16 nRet = ww::stiUser;    // User-Style als default
-    sal_uInt16 nPoolId = rFmt.GetPoolFmtId();
+    sal_uInt16 nPoolId = rFormat.GetPoolFormatId();
     if( nPoolId == RES_POOLCOLL_STANDARD )
         nRet = 0;
     else if( nPoolId >= RES_POOLCOLL_HEADLINE1 &&
@@ -276,29 +276,29 @@ void MSWordStyles::BuildStylesTable()
 {
     m_nUsedSlots = WW8_RESERVED_SLOTS;    // soviele sind reserviert fuer
                                         // Standard und HeadingX u.a.
-    const SwCharFmts& rArr = *m_rExport.m_pDoc->GetCharFmts();       // first CharFmt
+    const SwCharFormats& rArr = *m_rExport.m_pDoc->GetCharFormats();       // first CharFormat
     // das Default-ZeichenStyle ( 0 ) wird nicht mit ausgegeben !
     for( sal_uInt16 n = 1; n < rArr.size(); n++ )
     {
-        SwCharFmt* pFmt = rArr[n];
-        m_pFmtA[ BuildGetSlot( *pFmt ) ] = pFmt;
+        SwCharFormat* pFormat = rArr[n];
+        m_pFormatA[ BuildGetSlot( *pFormat ) ] = pFormat;
     }
 
-    const SwTxtFmtColls& rArr2 = *m_rExport.m_pDoc->GetTxtFmtColls();   // then TxtFmtColls
+    const SwTextFormatColls& rArr2 = *m_rExport.m_pDoc->GetTextFormatColls();   // then TextFormatColls
     // das Default-TextStyle ( 0 ) wird nicht mit ausgegeben !
     for( sal_uInt16 n = 1; n < rArr2.size(); n++ )
     {
-        SwTxtFmtColl* pFmt = rArr2[n];
-        m_pFmtA[ BuildGetSlot( *pFmt ) ] = pFmt;
+        SwTextFormatColl* pFormat = rArr2[n];
+        m_pFormatA[ BuildGetSlot( *pFormat ) ] = pFormat;
     }
 
     if (!m_bListStyles)
         return;
 
-    const SwNumRuleTbl& rNumRuleTbl = m_rExport.m_pDoc->GetNumRuleTbl();
-    for (size_t i = 0; i < rNumRuleTbl.size(); ++i)
+    const SwNumRuleTable& rNumRuleTable = m_rExport.m_pDoc->GetNumRuleTable();
+    for (size_t i = 0; i < rNumRuleTable.size(); ++i)
     {
-        const SwNumRule* pNumRule = rNumRuleTbl[i];
+        const SwNumRule* pNumRule = rNumRuleTable[i];
         if (pNumRule->IsAutoRule() || pNumRule->GetName().startsWith("WWNum"))
             continue;
         sal_uInt16 nSlot = BuildGetSlot(*pNumRule);
@@ -316,8 +316,8 @@ void MSWordStyles::BuildStyleIds()
     for (sal_uInt16 n = 1; n < m_nUsedSlots; ++n)
     {
         OUString aName;
-        if(m_pFmtA[n])
-            aName = m_pFmtA[n]->GetName();
+        if(m_pFormatA[n])
+            aName = m_pFormatA[n]->GetName();
         else if (m_aNumRules.find(n) != m_aNumRules.end())
             aName = m_aNumRules[n]->GetName();
         OStringBuffer aStyleIdBuf(aName.getLength());
@@ -441,10 +441,10 @@ void WW8AttributeOutput::StartStyle( const OUString& rName, StyleType eType, sal
     m_rWW8Export.pO->push_back( (sal_uInt8)0 );             // Trotz P-String 0 am Ende!
 }
 
-void MSWordStyles::SetStyleDefaults( const SwFmt& rFmt, bool bPap )
+void MSWordStyles::SetStyleDefaults( const SwFormat& rFormat, bool bPap )
 {
-    const SwModify* pOldMod = m_rExport.m_pOutFmtNode;
-    m_rExport.m_pOutFmtNode = &rFmt;
+    const SwModify* pOldMod = m_rExport.m_pOutFormatNode;
+    m_rExport.m_pOutFormatNode = &rFormat;
     bool aFlags[ static_cast< sal_uInt16 >(RES_FRMATR_END) - RES_CHRATR_BEGIN ];
     sal_uInt16 nStt, nEnd, n;
     if( bPap )
@@ -453,7 +453,7 @@ void MSWordStyles::SetStyleDefaults( const SwFmt& rFmt, bool bPap )
        nStt = RES_CHRATR_BEGIN, nEnd = RES_TXTATR_END;
 
     // dynamic defaults
-    const SfxItemPool& rPool = *rFmt.GetAttrSet().GetPool();
+    const SfxItemPool& rPool = *rFormat.GetAttrSet().GetPool();
     for( n = nStt; n < nEnd; ++n )
         aFlags[ n - RES_CHRATR_BEGIN ] = 0 != rPool.GetPoolDefaultItem( n );
 
@@ -470,13 +470,13 @@ void MSWordStyles::SetStyleDefaults( const SwFmt& rFmt, bool bPap )
     }
 
     const SfxItemSet* pOldI = m_rExport.GetCurItemSet();
-    m_rExport.SetCurItemSet( &rFmt.GetAttrSet() );
+    m_rExport.SetCurItemSet( &rFormat.GetAttrSet() );
 
     const bool* pFlags = aFlags + ( nStt - RES_CHRATR_BEGIN );
     for ( n = nStt; n < nEnd; ++n, ++pFlags )
     {
         if ( *pFlags && !m_rExport.ignoreAttributeForStyleDefaults( n )
-            && SfxItemState::SET != rFmt.GetItemState(n, false))
+            && SfxItemState::SET != rFormat.GetItemState(n, false))
         {
             //If we are a character property then see if it is one of the
             //western/asian ones that must be collapsed together for export to
@@ -484,13 +484,13 @@ void MSWordStyles::SetStyleDefaults( const SwFmt& rFmt, bool bPap )
             if ( bPap || m_rExport.CollapseScriptsforWordOk(
                 i18n::ScriptType::LATIN, n) )
             {
-                m_rExport.AttrOutput().OutputItem( rFmt.GetFmtAttr( n, true ) );
+                m_rExport.AttrOutput().OutputItem( rFormat.GetFormatAttr( n, true ) );
             }
         }
     }
 
     m_rExport.SetCurItemSet( pOldI );
-    m_rExport.m_pOutFmtNode = pOldMod;
+    m_rExport.m_pOutFormatNode = pOldMod;
 }
 
 void WW8AttributeOutput::StartStyleProperties( bool bParProp, sal_uInt16 nStyle )
@@ -510,22 +510,22 @@ void WW8AttributeOutput::StartStyleProperties( bool bParProp, sal_uInt16 nStyle
         SwWW8Writer::InsUInt16( *m_rWW8Export.pO, nStyle );     // Style-Nummer
 }
 
-void MSWordStyles::WriteProperties( const SwFmt* pFmt, bool bParProp, sal_uInt16 nPos,
+void MSWordStyles::WriteProperties( const SwFormat* pFormat, bool bParProp, sal_uInt16 nPos,
     bool bInsDefCharSiz )
 {
     m_rExport.AttrOutput().StartStyleProperties( bParProp, nPos );
 
     OSL_ENSURE( m_rExport.m_pCurrentStyle == NULL, "Current style not NULL" ); // set current style before calling out
-    m_rExport.m_pCurrentStyle = pFmt;
+    m_rExport.m_pCurrentStyle = pFormat;
 
-    m_rExport.OutputFormat( *pFmt, bParProp, !bParProp );
+    m_rExport.OutputFormat( *pFormat, bParProp, !bParProp );
 
-    OSL_ENSURE( m_rExport.m_pCurrentStyle == pFmt, "current style was changed" );
+    OSL_ENSURE( m_rExport.m_pCurrentStyle == pFormat, "current style was changed" );
     // reset current style...
     m_rExport.m_pCurrentStyle = NULL;
 
     if ( bInsDefCharSiz  )                   // not derived from other Style
-        SetStyleDefaults( *pFmt, bParProp );
+        SetStyleDefaults( *pFormat, bParProp );
 
     m_rExport.AttrOutput().EndStyleProperties( bParProp );
 }
@@ -537,22 +537,22 @@ void WW8AttributeOutput::EndStyleProperties( bool /*bParProp*/ )
     ShortToSVBT16( nLen, pUpxLen );                 // add default length
 }
 
-void MSWordStyles::GetStyleData( SwFmt* pFmt, bool& bFmtColl, sal_uInt16& nBase, sal_uInt16& nNext )
+void MSWordStyles::GetStyleData( SwFormat* pFormat, bool& bFormatColl, sal_uInt16& nBase, sal_uInt16& nNext )
 {
-    bFmtColl = pFmt->Which() == RES_TXTFMTCOLL || pFmt->Which() == RES_CONDTXTFMTCOLL;
+    bFormatColl = pFormat->Which() == RES_TXTFMTCOLL || pFormat->Which() == RES_CONDTXTFMTCOLL;
 
     // Default: none
     nBase = 0xfff;
 
     // Derived from?
-    if ( !pFmt->IsDefault() )
-        nBase = GetSlot( pFmt->DerivedFrom() );
+    if ( !pFormat->IsDefault() )
+        nBase = GetSlot( pFormat->DerivedFrom() );
 
-    SwFmt* pNext;
-    if ( bFmtColl )
-        pNext = &static_cast<SwTxtFmtColl*>(pFmt)->GetNextTxtFmtColl();
+    SwFormat* pNext;
+    if ( bFormatColl )
+        pNext = &static_cast<SwTextFormatColl*>(pFormat)->GetNextTextFormatColl();
     else
-        pNext = pFmt; // CharFmt: next CharFmt == self
+        pNext = pFormat; // CharFormat: next CharFormat == self
 
     nNext = GetSlot( pNext );
 }
@@ -589,30 +589,30 @@ void MSWordStyles::OutputStyle(const SwNumRule* pNumRule, sal_uInt16 nPos)
 {
     m_rExport.AttrOutput().StartStyle( pNumRule->GetName(), STYLE_TYPE_LIST,
             /*nBase =*/ 0, /*nWwNext =*/ 0, /*nWWId =*/ 0, nPos,
-            /*bAutoUpdateFmt =*/ false );
+            /*bAutoUpdateFormat =*/ false );
 
     m_rExport.AttrOutput().EndStyle();
 }
 
-// OutputStyle applies for TxtFmtColls and CharFmts
-void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos )
+// OutputStyle applies for TextFormatColls and CharFormats
+void MSWordStyles::OutputStyle( SwFormat* pFormat, sal_uInt16 nPos )
 {
-    if ( !pFmt )
+    if ( !pFormat )
         m_rExport.AttrOutput().DefaultStyle( nPos );
     else
     {
-        bool bFmtColl;
+        bool bFormatColl;
         sal_uInt16 nBase, nWwNext;
 
-        GetStyleData( pFmt, bFmtColl, nBase, nWwNext );
+        GetStyleData( pFormat, bFormatColl, nBase, nWwNext );
 
-        OUString aName = pFmt->GetName();
+        OUString aName = pFormat->GetName();
         // We want to map LO's default style to Word's "Normal" style.
         // Word looks for this specific style name when reading docx files.
         // (It must be the English word regardless of language settings)
         if ( nPos == 0 )
         {
-            assert( pFmt->GetPoolFmtId() == RES_POOLCOLL_STANDARD );
+            assert( pFormat->GetPoolFormatId() == RES_POOLCOLL_STANDARD );
             aName = "Normal";
         }
         else if (aName.equalsIgnoreAsciiCase("Normal"))
@@ -624,8 +624,8 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos )
             for ( int nSuffix = 0; ; ++nSuffix ) {
                 bool clash=false;
                 for ( sal_uInt16 n = 1; n < m_nUsedSlots; ++n )
-                    if ( m_pFmtA[n] &&
-                         m_pFmtA[n]->GetName().equalsIgnoreAsciiCase(aName) )
+                    if ( m_pFormatA[n] &&
+                         m_pFormatA[n]->GetName().equalsIgnoreAsciiCase(aName) )
                     {
                         clash = true;
                         break;
@@ -637,14 +637,14 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos )
             }
         }
 
-        m_rExport.AttrOutput().StartStyle( aName, (bFmtColl ? STYLE_TYPE_PARA : STYLE_TYPE_CHAR),
-                nBase, nWwNext, GetWWId( *pFmt ), nPos,
-                pFmt->IsAutoUpdateFmt() );
+        m_rExport.AttrOutput().StartStyle( aName, (bFormatColl ? STYLE_TYPE_PARA : STYLE_TYPE_CHAR),
+                nBase, nWwNext, GetWWId( *pFormat ), nPos,
+                pFormat->IsAutoUpdateFormat() );
 
-        if ( bFmtColl )
-            WriteProperties( pFmt, true, nPos, nBase==0xfff );           // UPX.papx
+        if ( bFormatColl )
+            WriteProperties( pFormat, true, nPos, nBase==0xfff );           // UPX.papx
 
-        WriteProperties( pFmt, false, nPos, bFmtColl && nBase==0xfff );  // UPX.chpx
+        WriteProperties( pFormat, false, nPos, bFormatColl && nBase==0xfff );  // UPX.chpx
 
         m_rExport.AttrOutput().EndStyle();
     }
@@ -711,7 +711,7 @@ void MSWordStyles::OutputStylesTable()
         if (m_aNumRules.find(n) != m_aNumRules.end())
             OutputStyle(m_aNumRules[n], n);
         else
-            OutputStyle( m_pFmtA[n], n );
+            OutputStyle( m_pFormatA[n], n );
     }
 
     m_rExport.AttrOutput().EndStyles( m_nUsedSlots );
@@ -1040,21 +1040,21 @@ void WW8_WrPlc0::Write( SvStream& rStrm )
 MSWordSections::MSWordSections( MSWordExportBase& rExport )
     : mbDocumentIsProtected( false )
 {
-    const SwSectionFmt *pFmt = 0;
+    const SwSectionFormat *pFormat = 0;
     rExport.m_pAktPageDesc = &rExport.m_pDoc->GetPageDesc( 0 );
 
     const SfxPoolItem* pI;
-    const SwNode* pNd = rExport.m_pCurPam->GetCntntNode();
-    const SfxItemSet* pSet = pNd ? &static_cast<const SwCntntNode*>(pNd)->GetSwAttrSet() : 0;
+    const SwNode* pNd = rExport.m_pCurPam->GetContentNode();
+    const SfxItemSet* pSet = pNd ? &static_cast<const SwContentNode*>(pNd)->GetSwAttrSet() : 0;
 
-    sal_uLong nRstLnNum =  pSet ? static_cast<const SwFmtLineNumber&>(pSet->Get( RES_LINENUMBER )).GetStartValue() : 0;
+    sal_uLong nRstLnNum =  pSet ? static_cast<const SwFormatLineNumber&>(pSet->Get( RES_LINENUMBER )).GetStartValue() : 0;
 
-    const SwTableNode* pTblNd = rExport.m_pCurPam->GetNode().FindTableNode();
+    const SwTableNode* pTableNd = rExport.m_pCurPam->GetNode().FindTableNode();
     const SwSectionNode* pSectNd;
-    if ( pTblNd )
+    if ( pTableNd )
     {
-        pSet = &pTblNd->GetTable().GetFrmFmt()->GetAttrSet();
-        pNd = pTblNd;
+        pSet = &pTableNd->GetTable().GetFrameFormat()->GetAttrSet();
+        pNd = pTableNd;
     }
     else if (pNd && 0 != ( pSectNd = pNd->FindSectionNode() ))
     {
@@ -1071,24 +1071,24 @@ MSWordSections::MSWordSections( MSWordExportBase& rExport )
         }
 
         if ( CONTENT_SECTION == pSectNd->GetSection().GetType() )
-            pFmt = pSectNd->GetSection().GetFmt();
+            pFormat = pSectNd->GetSection().GetFormat();
     }
 
     // Hole evtl. Pagedesc des 1. Nodes
     if ( pSet &&
          SfxItemState::SET == pSet->GetItemState( RES_PAGEDESC, true, &pI ) &&
-         static_cast<const SwFmtPageDesc*>(pI)->GetPageDesc() )
+         static_cast<const SwFormatPageDesc*>(pI)->GetPageDesc() )
     {
-        AppendSection( *static_cast<const SwFmtPageDesc*>(pI), *pNd, pFmt, nRstLnNum );
+        AppendSection( *static_cast<const SwFormatPageDesc*>(pI), *pNd, pFormat, nRstLnNum );
     }
     else
-        AppendSection( rExport.m_pAktPageDesc, pFmt, nRstLnNum );
+        AppendSection( rExport.m_pAktPageDesc, pFormat, nRstLnNum );
 }
 
 WW8_WrPlcSepx::WW8_WrPlcSepx( MSWordExportBase& rExport )
     : MSWordSections( rExport )
     , m_bHeaderFooterWritten( false )
-    , pTxtPos( 0 )
+    , pTextPos( 0 )
 {
     // to be in sync with the AppendSection() call in the MSWordSections
     // constructor
@@ -1101,7 +1101,7 @@ MSWordSections::~MSWordSections()
 
 WW8_WrPlcSepx::~WW8_WrPlcSepx()
 {
-    delete pTxtPos;
+    delete pTextPos;
 }
 
 bool MSWordSections::HeaderFooterWritten()
@@ -1140,10 +1140,10 @@ sal_uInt16 MSWordSections::NumberOfColumns( const SwDoc &rDoc, const WW8_SepInfo
     aSet.SetParent( &rSet );
 
     //0xffffffff, what the hell is going on with that!, fixme most terribly
-    if ( rInfo.pSectionFmt && reinterpret_cast<SwSectionFmt*>(sal_IntPtr(-1)) != rInfo.pSectionFmt )
-        aSet.Put( rInfo.pSectionFmt->GetFmtAttr( RES_COL ) );
+    if ( rInfo.pSectionFormat && reinterpret_cast<SwSectionFormat*>(sal_IntPtr(-1)) != rInfo.pSectionFormat )
+        aSet.Put( rInfo.pSectionFormat->GetFormatAttr( RES_COL ) );
 
-    const SwFmtCol& rCol = static_cast<const SwFmtCol&>(aSet.Get( RES_COL ));
+    const SwFormatCol& rCol = static_cast<const SwFormatCol&>(aSet.Get( RES_COL ));
     const SwColumns& rColumns = rCol.GetColumns();
     return rColumns.size();
 }
@@ -1157,63 +1157,63 @@ const WW8_SepInfo* MSWordSections::CurrentSectionInfo()
 }
 
 void MSWordSections::AppendSection( const SwPageDesc* pPd,
-    const SwSectionFmt* pSectionFmt, sal_uLong nLnNumRestartNo, bool bIsFirstParagraph )
+    const SwSectionFormat* pSectionFormat, sal_uLong nLnNumRestartNo, bool bIsFirstParagraph )
 {
     if (HeaderFooterWritten()) {
         return; // #i117955# prevent new sections in endnotes
     }
-    aSects.push_back( WW8_SepInfo( pPd, pSectionFmt, nLnNumRestartNo, boost::none, NULL, bIsFirstParagraph ) );
+    aSects.push_back( WW8_SepInfo( pPd, pSectionFormat, nLnNumRestartNo, boost::none, NULL, bIsFirstParagraph ) );
     NeedsDocumentProtected( aSects.back() );
 }
 
 void WW8_WrPlcSepx::AppendSep( WW8_CP nStartCp, const SwPageDesc* pPd,
-    const SwSectionFmt* pSectionFmt, sal_uLong nLnNumRestartNo )
+    const SwSectionFormat* pSectionFormat, sal_uLong nLnNumRestartNo )
 {
     if (HeaderFooterWritten()) {
         return; // #i117955# prevent new sections in endnotes
     }
     aCps.push_back( nStartCp );
-    AppendSection( pPd, pSectionFmt, nLnNumRestartNo );
+    AppendSection( pPd, pSectionFormat, nLnNumRestartNo );
 }
 
-void MSWordSections::AppendSection( const SwFmtPageDesc& rPD,
-    const SwNode& rNd, const SwSectionFmt* pSectionFmt, sal_uLong nLnNumRestartNo )
+void MSWordSections::AppendSection( const SwFormatPageDesc& rPD,
+    const SwNode& rNd, const SwSectionFormat* pSectionFormat, sal_uLong nLnNumRestartNo )
 {
     if (HeaderFooterWritten()) {
         return; // #i117955# prevent new sections in endnotes
     }
 
-    WW8_SepInfo aI( rPD.GetPageDesc(), pSectionFmt, nLnNumRestartNo, rPD.GetNumOffset(), &rNd );
+    WW8_SepInfo aI( rPD.GetPageDesc(), pSectionFormat, nLnNumRestartNo, rPD.GetNumOffset(), &rNd );
 
     aSects.push_back( aI );
     NeedsDocumentProtected( aI );
 }
 
-void WW8_WrPlcSepx::AppendSep( WW8_CP nStartCp, const SwFmtPageDesc& rPD,
-    const SwNode& rNd, const SwSectionFmt* pSectionFmt, sal_uLong nLnNumRestartNo )
+void WW8_WrPlcSepx::AppendSep( WW8_CP nStartCp, const SwFormatPageDesc& rPD,
+    const SwNode& rNd, const SwSectionFormat* pSectionFormat, sal_uLong nLnNumRestartNo )
 {
     if (HeaderFooterWritten()) {
         return; // #i117955# prevent new sections in endnotes
     }
     aCps.push_back( nStartCp );
-    AppendSection( rPD, rNd, pSectionFmt, nLnNumRestartNo );
+    AppendSection( rPD, rNd, pSectionFormat, nLnNumRestartNo );
 }
 
 // MSWordSections::SetNum() sets in each section the Num-pointers for the first call.
 // All subsequent calls will be ignored.
 // Thus, the first list of the section will be adopted.
 
-void MSWordSections::SetNum( const SwTxtNode* pNumNd )
+void MSWordSections::SetNum( const SwTextNode* pNumNd )
 {
     WW8_SepInfo& rInfo = aSects.back();
     if ( !rInfo.pNumNd ) // not yet assigned
         rInfo.pNumNd = pNumNd;
 }
 
-void WW8_WrPlcSepx::WriteFtnEndTxt( WW8Export& rWrt, sal_uLong nCpStt )
+void WW8_WrPlcSepx::WriteFootnoteEndText( WW8Export& rWrt, sal_uLong nCpStt )
 {
     sal_uInt8 nInfoFlags = 0;
-    const SwFtnInfo& rInfo = rWrt.m_pDoc->GetFtnInfo();
+    const SwFootnoteInfo& rInfo = rWrt.m_pDoc->GetFootnoteInfo();
     if( !rInfo.aErgoSum.isEmpty() )  nInfoFlags |= 0x02;
     if( !rInfo.aQuoVadis.isEmpty() ) nInfoFlags |= 0x04;
 
@@ -1221,27 +1221,27 @@ void WW8_WrPlcSepx::WriteFtnEndTxt( WW8Export& rWrt, sal_uLong nCpStt )
     if( nInfoFlags )
     {
         if( rWrt.bWrtWW8 )
-            pTxtPos->Append( nCpStt );  // empty footnote separator
+            pTextPos->Append( nCpStt );  // empty footnote separator
 
         if( 0x02 & nInfoFlags )         // Footnote continuation separator
         {
-            pTxtPos->Append( nCpStt );
+            pTextPos->Append( nCpStt );
             rWrt.WriteStringAsPara( rInfo.aErgoSum );
             rWrt.WriteStringAsPara( OUString() );
             nCpStt = rWrt.Fc2Cp( rWrt.Strm().Tell() );
         }
         else if( rWrt.bWrtWW8 )
-            pTxtPos->Append( nCpStt );
+            pTextPos->Append( nCpStt );
 
         if( 0x04 & nInfoFlags )         // Footnote continuation notice
         {
-            pTxtPos->Append( nCpStt );
+            pTextPos->Append( nCpStt );
             rWrt.WriteStringAsPara( rInfo.aQuoVadis );
             rWrt.WriteStringAsPara( OUString() );
             nCpStt = rWrt.Fc2Cp( rWrt.Strm().Tell() );
         }
         else if( rWrt.bWrtWW8 )
-            pTxtPos->Append( nCpStt );
+            pTextPos->Append( nCpStt );
 
         if( rWrt.bWrtWW8 )
             nEmptyStt = 3;
@@ -1250,63 +1250,63 @@ void WW8_WrPlcSepx::WriteFtnEndTxt( WW8Export& rWrt, sal_uLong nCpStt )
     }
 
     while( 6 > nEmptyStt++ )
-        pTxtPos->Append( nCpStt );
+        pTextPos->Append( nCpStt );
 
     // gleich die Flags am Dop setzen
     WW8Dop& rDop = *rWrt.pDop;
     // Footnote Info
     switch( rInfo.eNum )
     {
-    case FTNNUM_PAGE:       rDop.rncFtn = 2; break;
-    case FTNNUM_CHAPTER:    rDop.rncFtn  = 1; break;
-    default: rDop.rncFtn  = 0; break;
-    }                                   // rncFtn
-    rDop.nfcFtnRef = WW8Export::GetNumId( rInfo.aFmt.GetNumberingType() );
-    rDop.nFtn = rInfo.nFtnOffset + 1;
-    rDop.fpc = rWrt.m_bFtnAtTxtEnd ? 2 : 1;
+    case FTNNUM_PAGE:       rDop.rncFootnote = 2; break;
+    case FTNNUM_CHAPTER:    rDop.rncFootnote  = 1; break;
+    default: rDop.rncFootnote  = 0; break;
+    }                                   // rncFootnote
+    rDop.nfcFootnoteRef = WW8Export::GetNumId( rInfo.aFormat.GetNumberingType() );
+    rDop.nFootnote = rInfo.nFootnoteOffset + 1;
+    rDop.fpc = rWrt.m_bFootnoteAtTextEnd ? 2 : 1;
 
     // Endnote Info
     rDop.rncEdn = 0;                        // rncEdn: Don't Restart
     const SwEndNoteInfo& rEndInfo = rWrt.m_pDoc->GetEndNoteInfo();
-    rDop.nfcEdnRef = WW8Export::GetNumId( rEndInfo.aFmt.GetNumberingType() );
-    rDop.nEdn = rEndInfo.nFtnOffset + 1;
-    rDop.epc = rWrt.m_bEndAtTxtEnd ? 3 : 0;
+    rDop.nfcEdnRef = WW8Export::GetNumId( rEndInfo.aFormat.GetNumberingType() );
+    rDop.nEdn = rEndInfo.nFootnoteOffset + 1;
+    rDop.epc = rWrt.m_bEndAtTextEnd ? 3 : 0;
 }
 
-void MSWordSections::SetHeaderFlag( sal_uInt8& rHeadFootFlags, const SwFmt& rFmt,
+void MSWordSections::SetHeaderFlag( sal_uInt8& rHeadFootFlags, const SwFormat& rFormat,
     sal_uInt8 nFlag )
 {
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET == rFmt.GetItemState(RES_HEADER, true, &pItem)
-        && static_cast<const SwFmtHeader*>(pItem)->IsActive() &&
-        static_cast<const SwFmtHeader*>(pItem)->GetHeaderFmt() )
+    if( SfxItemState::SET == rFormat.GetItemState(RES_HEADER, true, &pItem)
+        && static_cast<const SwFormatHeader*>(pItem)->IsActive() &&
+        static_cast<const SwFormatHeader*>(pItem)->GetHeaderFormat() )
         rHeadFootFlags |= nFlag;
 }
 
-void MSWordSections::SetFooterFlag( sal_uInt8& rHeadFootFlags, const SwFmt& rFmt,
+void MSWordSections::SetFooterFlag( sal_uInt8& rHeadFootFlags, const SwFormat& rFormat,
     sal_uInt8 nFlag )
 {
     const SfxPoolItem* pItem;
-    if( SfxItemState::SET == rFmt.GetItemState(RES_FOOTER, true, &pItem)
-        && static_cast<const SwFmtFooter*>(pItem)->IsActive() &&
-        static_cast<const SwFmtFooter*>(pItem)->GetFooterFmt() )
+    if( SfxItemState::SET == rFormat.GetItemState(RES_FOOTER, true, &pItem)
+        && static_cast<const SwFormatFooter*>(pItem)->IsActive() &&
+        static_cast<const SwFormatFooter*>(pItem)->GetFooterFormat() )
         rHeadFootFlags |= nFlag;
 }
 
 void WW8_WrPlcSepx::OutHeaderFooter( WW8Export& rWrt, bool bHeader,
-                     const SwFmt& rFmt, sal_uLong& rCpPos, sal_uInt8 nHFFlags,
+                     const SwFormat& rFormat, sal_uLong& rCpPos, sal_uInt8 nHFFlags,
                      sal_uInt8 nFlag,  sal_uInt8 nBreakCode)
 {
     if ( nFlag & nHFFlags )
     {
-        pTxtPos->Append( rCpPos );
-        rWrt.WriteHeaderFooterText( rFmt, bHeader);
+        pTextPos->Append( rCpPos );
+        rWrt.WriteHeaderFooterText( rFormat, bHeader);
         rWrt.WriteStringAsPara( OUString() ); // CR ans Ende ( sonst mault WW )
         rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() );
     }
     else if ( rWrt.bWrtWW8 )
     {
-        pTxtPos->Append( rCpPos );
+        pTextPos->Append( rCpPos );
         if ((bHeader? rWrt.m_bHasHdr : rWrt.m_bHasFtr) && nBreakCode!=0)
         {
             rWrt.WriteStringAsPara( OUString() ); // Empty paragraph for empty header/footer
@@ -1326,11 +1326,11 @@ bool WW8_SepInfo::IsProtected() const
 {
     bool bRet = false;
     if (
-         pSectionFmt &&
-         (reinterpret_cast<SwSectionFmt*>(sal_IntPtr(-1)) != pSectionFmt)
+         pSectionFormat &&
+         (reinterpret_cast<SwSectionFormat*>(sal_IntPtr(-1)) != pSectionFormat)
        )
     {
-        const SwSection *pSection = pSectionFmt->GetSection();
+        const SwSection *pSection = pSectionFormat->GetSection();
         if (pSection && pSection->IsProtect())
         {
             bRet = true;
@@ -1348,7 +1348,7 @@ void MSWordSections::CheckForFacinPg( WW8Export& rWrt ) const
     for( sal_uInt16 nEnde = 0; iter != aSects.end(); ++iter )
     {
         const WW8_SepInfo& rSepInfo = *iter;
-        if( !rSepInfo.pSectionFmt )
+        if( !rSepInfo.pSectionFormat )
         {
             const SwPageDesc* pPd = rSepInfo.pPageDesc;
             if( pPd->GetFollow() && pPd != pPd->GetFollow() &&
@@ -1392,10 +1392,10 @@ void MSWordSections::CheckForFacinPg( WW8Export& rWrt ) const
     }
 }
 
-bool MSWordSections::HasBorderItem( const SwFmt& rFmt )
+bool MSWordSections::HasBorderItem( const SwFormat& rFormat )
 {
     const SfxPoolItem* pItem;
-    return SfxItemState::SET == rFmt.GetItemState(RES_BOX, true, &pItem) &&
+    return SfxItemState::SET == rFormat.GetItemState(RES_BOX, true, &pItem) &&
             (   static_cast<const SvxBoxItem*>(pItem)->GetTop() ||
                 static_cast<const SvxBoxItem*>(pItem)->GetBottom()  ||
                 static_cast<const SvxBoxItem*>(pItem)->GetLeft()  ||
@@ -1468,21 +1468,21 @@ void WW8AttributeOutput::SectionTitlePage()
     m_rWW8Export.pO->push_back( 1 );
 }
 
-void WW8AttributeOutput::SectionPageBorders( const SwFrmFmt* pPdFmt, const SwFrmFmt* pPdFirstPgFmt )
+void WW8AttributeOutput::SectionPageBorders( const SwFrameFormat* pPdFormat, const SwFrameFormat* pPdFirstPgFormat )
 {
     if ( m_rWW8Export.bWrtWW8 )              // write border of page
     {
-        sal_uInt16 nPgBorder = MSWordSections::HasBorderItem( *pPdFmt ) ? 0 : USHRT_MAX;
-        if ( pPdFmt != pPdFirstPgFmt )
+        sal_uInt16 nPgBorder = MSWordSections::HasBorderItem( *pPdFormat ) ? 0 : USHRT_MAX;
+        if ( pPdFormat != pPdFirstPgFormat )
         {
-            if ( MSWordSections::HasBorderItem( *pPdFirstPgFmt ) )
+            if ( MSWordSections::HasBorderItem( *pPdFirstPgFormat ) )
             {
                 if ( USHRT_MAX == nPgBorder )
                 {
                     nPgBorder = 1;
                     // only the first page outlined -> Get the BoxItem from the correct format
-                    m_rWW8Export.m_pISet = &pPdFirstPgFmt->GetAttrSet();
-                    OutputItem( pPdFirstPgFmt->GetFmtAttr( RES_BOX ) );
+                    m_rWW8Export.m_pISet = &pPdFirstPgFormat->GetAttrSet();
+                    OutputItem( pPdFirstPgFormat->GetFormatAttr( RES_BOX ) );
                 }
             }
             else if ( !nPgBorder )
@@ -1588,38 +1588,38 @@ void WW8Export::SetupSectionPositions( WW8_PdAttrDesc* pA )
 }
 
 void WW8Export::WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
-        const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode )
+        const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode )
 {
     sal_uLong nCpPos = Fc2Cp( Strm().Tell() );
 
     IncrementHdFtIndex();
     if ( !(nHeadFootFlags & WW8_HEADER_EVEN) && pDop->fFacingPages )
-        pSepx->OutHeaderFooter( *this, true, rFmt, nCpPos, nHeadFootFlags, WW8_HEADER_ODD, nBreakCode );
+        pSepx->OutHeaderFooter( *this, true, rFormat, nCpPos, nHeadFootFlags, WW8_HEADER_ODD, nBreakCode );
     else
-        pSepx->OutHeaderFooter( *this, true, rLeftFmt, nCpPos, nHeadFootFlags, WW8_HEADER_EVEN, nBreakCode );
+        pSepx->OutHeaderFooter( *this, true, rLeftFormat, nCpPos, nHeadFootFlags, WW8_HEADER_EVEN, nBreakCode );
     IncrementHdFtIndex();
-    pSepx->OutHeaderFooter( *this, true, rFmt, nCpPos, nHeadFootFlags, WW8_HEADER_ODD, nBreakCode );
+    pSepx->OutHeaderFooter( *this, true, rFormat, nCpPos, nHeadFootFlags, WW8_HEADER_ODD, nBreakCode );
 
     IncrementHdFtIndex();
     if ( !(nHeadFootFlags & WW8_FOOTER_EVEN) && pDop->fFacingPages )
-        pSepx->OutHeaderFooter( *this, false, rFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_ODD, nBreakCode );
+        pSepx->OutHeaderFooter( *this, false, rFormat, nCpPos, nHeadFootFlags, WW8_FOOTER_ODD, nBreakCode );
     else
-        pSepx->OutHeaderFooter( *this, false, rLeftFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_EVEN, nBreakCode );
+        pSepx->OutHeaderFooter( *this, false, rLeftFormat, nCpPos, nHeadFootFlags, WW8_FOOTER_EVEN, nBreakCode );
     IncrementHdFtIndex();
-    pSepx->OutHeaderFooter( *this, false, rFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_ODD, nBreakCode );
+    pSepx->OutHeaderFooter( *this, false, rFormat, nCpPos, nHeadFootFlags, WW8_FOOTER_ODD, nBreakCode );
 
     //#i24344# Drawing objects cannot be directly shared between main hd/ft
     //and title hd/ft so we need to differenciate them
     IncrementHdFtIndex();
-    pSepx->OutHeaderFooter( *this, true, rFirstPageFmt, nCpPos, nHeadFootFlags, WW8_HEADER_FIRST, nBreakCode );
-    pSepx->OutHeaderFooter( *this, false, rFirstPageFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_FIRST, nBreakCode );
+    pSepx->OutHeaderFooter( *this, true, rFirstPageFormat, nCpPos, nHeadFootFlags, WW8_HEADER_FIRST, nBreakCode );
+    pSepx->OutHeaderFooter( *this, false, rFirstPageFormat, nCpPos, nHeadFootFlags, WW8_FOOTER_FIRST, nBreakCode );
 }
 
 void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAttrDesc* pA )
 {
     const SwPageDesc* pPd = rSepInfo.pPageDesc;
 
-    if ( rSepInfo.pSectionFmt && !pPd )
+    if ( rSepInfo.pSectionFormat && !pPd )
         pPd = &m_pDoc->GetPageDesc( 0 );
 
     m_pAktPageDesc = pPd;
@@ -1647,23 +1647,23 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
         */
     sal_uInt8 nBreakCode = 2;            // default neue Seite beginnen
     bool bOutPgDscSet = true, bLeftRightPgChain = false, bOutputStyleItemSet = false;
-    const SwFrmFmt* pPdFmt = &pPd->GetMaster();
-    if ( rSepInfo.pSectionFmt )
+    const SwFrameFormat* pPdFormat = &pPd->GetMaster();
+    if ( rSepInfo.pSectionFormat )
     {
-        // if pSectionFmt is set, then there is a SectionNode
+        // if pSectionFormat is set, then there is a SectionNode
         //  valid pointer -> start Section ,
         //  0xfff -> Section terminated
         nBreakCode = 0;         // fortlaufender Abschnitt
 
-        if ( rSepInfo.pPDNd && rSepInfo.pPDNd->IsCntntNode() )
+        if ( rSepInfo.pPDNd && rSepInfo.pPDNd->IsContentNode() )
         {
-            if ( !NoPageBreakSection( &rSepInfo.pPDNd->GetCntntNode()->GetSwAttrSet() ) )
+            if ( !NoPageBreakSection( &rSepInfo.pPDNd->GetContentNode()->GetSwAttrSet() ) )
             {
                 nBreakCode = 2;
             }
         }
 
-        if ( reinterpret_cast<SwSectionFmt*>(sal_IntPtr(-1)) != rSepInfo.pSectionFmt )
+        if ( reinterpret_cast<SwSectionFormat*>(sal_IntPtr(-1)) != rSepInfo.pSectionFormat )
         {
             if ( nBreakCode == 0 )
                 bOutPgDscSet = false;
@@ -1671,7 +1671,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
             // produce Itemset, which inherits PgDesk-Attr-Set:
             // als Nachkomme wird bei 'deep'-OutputItemSet
             // auch der Vorfahr abgeklappert
-            const SfxItemSet* pPdSet = &pPdFmt->GetAttrSet();
+            const SfxItemSet* pPdSet = &pPdFormat->GetAttrSet();
             SfxItemSet aSet( *pPdSet->GetPool(), pPdSet->GetRanges() );
             aSet.SetParent( pPdSet );
 
@@ -1679,9 +1679,9 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
             // umsetzen
 
             const SvxLRSpaceItem &rSectionLR =
-                ItemGet<SvxLRSpaceItem>( *(rSepInfo.pSectionFmt), RES_LR_SPACE );
+                ItemGet<SvxLRSpaceItem>( *(rSepInfo.pSectionFormat), RES_LR_SPACE );
             const SvxLRSpaceItem &rPageLR =
-                ItemGet<SvxLRSpaceItem>( *pPdFmt, RES_LR_SPACE );
+                ItemGet<SvxLRSpaceItem>( *pPdFormat, RES_LR_SPACE );
 
             SvxLRSpaceItem aResultLR( rPageLR.GetLeft() +
                     rSectionLR.GetLeft(), rPageLR.GetRight() +
@@ -1689,13 +1689,13 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
             //i120133: The Section width should consider section indent value.
             if (rSectionLR.GetLeft()+rSectionLR.GetRight()!=0)
             {
-                const SwFmtCol& rCol = dynamic_cast<const SwFmtCol&>(rSepInfo.pSectionFmt->GetFmtAttr(RES_COL));
-                SwFmtCol aCol(rCol);
+                const SwFormatCol& rCol = dynamic_cast<const SwFormatCol&>(rSepInfo.pSectionFormat->GetFormatAttr(RES_COL));
+                SwFormatCol aCol(rCol);
                 aCol.SetAdjustValue(rSectionLR.GetLeft()+rSectionLR.GetRight());
                 aSet.Put(aCol);
             }
             else
-                aSet.Put(rSepInfo.pSectionFmt->GetFmtAttr(RES_COL));
+                aSet.Put(rSepInfo.pSectionFormat->GetFormatAttr(RES_COL));
 
             aSet.Put( aResultLR );
 
@@ -1710,7 +1710,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
 
             //Cannot export as normal page framedir, as continuous sections
             //cannot contain any grid settings like proper sections
-            AttrOutput().SectionBiDi( FRMDIR_HORI_RIGHT_TOP == TrueFrameDirection( *rSepInfo.pSectionFmt ) );
+            AttrOutput().SectionBiDi( FRMDIR_HORI_RIGHT_TOP == TrueFrameDirection( *rSepInfo.pSectionFormat ) );
 
             m_pISet = pOldI;
         }
@@ -1723,7 +1723,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
     // The latter method was previously used by the doc/docx import filter.
     // In both of these cases, we emit a single Word section with different
     // first page header/footer.
-    const SwFrmFmt* pPdFirstPgFmt = &pPd->GetFirstMaster();
+    const SwFrameFormat* pPdFirstPgFormat = &pPd->GetFirstMaster();
     bool titlePage = !pPd->IsFirstShared();
     if ( bOutPgDscSet )
     {
@@ -1739,16 +1739,16 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
              ( !rSepInfo.pPDNd || pPd->IsFollowNextPageOfNode( *rSepInfo.pPDNd ) ) )
         {
             const SwPageDesc *pFollow = pPd->GetFollow();
-            const SwFrmFmt& rFollowFmt = pFollow->GetMaster();
-            if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt, rFollowFmt ) || titlePage )
+            const SwFrameFormat& rFollowFormat = pFollow->GetMaster();
+            if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFormat, rFollowFormat ) || titlePage )
             {
                 if (rSepInfo.pPDNd)
-                    pPdFirstPgFmt = pPd->GetPageFmtOfNode( *rSepInfo.pPDNd );
+                    pPdFirstPgFormat = pPd->GetPageFormatOfNode( *rSepInfo.pPDNd );
                 else
-                    pPdFirstPgFmt = &pPd->GetMaster();
+                    pPdFirstPgFormat = &pPd->GetMaster();
 
                 m_pAktPageDesc = pPd = pFollow;
-                pPdFmt = &rFollowFmt;
+                pPdFormat = &rFollowFormat;
 
                 // has different headers/footers for the title page
                 titlePage = true;
@@ -1762,9 +1762,9 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
 
         const SfxPoolItem* pItem;
         if ( titlePage && SfxItemState::SET ==
-                pPdFirstPgFmt->GetItemState( RES_PAPER_BIN, true, &pItem ) )
+                pPdFirstPgFormat->GetItemState( RES_PAPER_BIN, true, &pItem ) )
         {
-            m_pISet = &pPdFirstPgFmt->GetAttrSet();
+            m_pISet = &pPdFirstPgFormat->GetAttrSet();
             m_bOutFirstPage = true;
             AttrOutput().OutputItem( *pItem );
             m_bOutFirstPage = false;
@@ -1786,16 +1786,16 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
             {
                 nBreakCode = 3;
                 pPd = pPd->GetFollow();
-                pPdFmt = &pPd->GetMaster();
+                pPdFormat = &pPd->GetMaster();
             }
             else
                 nBreakCode = 4;
         }
 
-        m_pISet = &pPdFmt->GetAttrSet();
+        m_pISet = &pPdFormat->GetAttrSet();
         if (!bOutputStyleItemSet)
-            AttrOutput().OutputStyleItemSet( pPdFmt->GetAttrSet(), true, false );
-        AttrOutput().SectionPageBorders( pPdFmt, pPdFirstPgFmt );
+            AttrOutput().OutputStyleItemSet( pPdFormat->GetAttrSet(), true, false );
+        AttrOutput().SectionPageBorders( pPdFormat, pPdFirstPgFormat );
         m_pISet = pOldI;
 
         // then the rest of the settings from PageDesc
@@ -1813,7 +1813,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
 
     AttrOutput().SectionType( nBreakCode );
 
-    const SwTxtNode* pNd = rSepInfo.pNumNd;
+    const SwTextNode* pNd = rSepInfo.pNumNd;
     if ( pNd )
     {
         const SwNumRule* pRule = pNd->GetNumRule();
@@ -1824,27 +1824,27 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
     // Header or Footer
     sal_uInt8 nHeadFootFlags = 0;
 
-    const SwFrmFmt* pPdLeftFmt = bLeftRightPgChain
+    const SwFrameFormat* pPdLeftFormat = bLeftRightPgChain
         ? &pPd->GetFollow()->GetMaster()
         : &pPd->GetLeft();
 
     // Ensure that headers are written if section is first paragraph
-    if ( nBreakCode != 0 || ( rSepInfo.pSectionFmt && rSepInfo.bIsFirstParagraph ))
+    if ( nBreakCode != 0 || ( rSepInfo.pSectionFormat && rSepInfo.bIsFirstParagraph ))
     {
         if ( titlePage )
         {
             // there is a First Page:
-            MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_HEADER_FIRST );
-            MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_FOOTER_FIRST );
+            MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFirstPgFormat, WW8_HEADER_FIRST );
+            MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFirstPgFormat, WW8_FOOTER_FIRST );
         }
-        MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFmt, WW8_HEADER_ODD );
-        MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFmt, WW8_FOOTER_ODD );
+        MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFormat, WW8_HEADER_ODD );
+        MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFormat, WW8_FOOTER_ODD );
 
         if ( !pPd->IsHeaderShared() || bLeftRightPgChain )
-            MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdLeftFmt, WW8_HEADER_EVEN );
+            MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdLeftFormat, WW8_HEADER_EVEN );
 
         if ( !pPd->IsFooterShared() || bLeftRightPgChain )
-            MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdLeftFmt, WW8_FOOTER_EVEN );
+            MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdLeftFormat, WW8_FOOTER_EVEN );
         AttrOutput().SectionWW6HeaderFooterFlags( nHeadFootFlags );
     }
 
@@ -1856,19 +1856,19 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
     // Umrandungen an Kopf- und Fusstexten muessten etwa so gehen:
     // Dabei muss etwas wie pOut eingebaut werden,
     // das bei jeder Spezialtext-Zeile wiederholt wird.
-    const SwFrmFmt* pFFmt = rFt.GetFooterFmt();
-    const SvxBoxItem& rBox = pFFmt->GetBox(false);
-    OutWW8_SwFmtBox1( m_rWW8Export.pOut, rBox, false);
+    const SwFrameFormat* pFFormat = rFt.GetFooterFormat();
+    const SvxBoxItem& rBox = pFFormat->GetBox(false);
+    OutWW8_SwFormatBox1( m_rWW8Export.pOut, rBox, false);
     !!!!!!!!!!!
     You can turn this into paragraph attributes, which are then observed in each paragraph.
     Applies to background / border.
     !!!!!!!!!!!
     */
 
-    const SwTxtNode *pOldPageRoot = GetHdFtPageRoot();
-    SetHdFtPageRoot( rSepInfo.pPDNd ? rSepInfo.pPDNd->GetTxtNode() : 0 );
+    const SwTextNode *pOldPageRoot = GetHdFtPageRoot();
+    SetHdFtPageRoot( rSepInfo.pPDNd ? rSepInfo.pPDNd->GetTextNode() : 0 );
 
-    WriteHeadersFooters( nHeadFootFlags, *pPdFmt, *pPdLeftFmt, *pPdFirstPgFmt, nBreakCode );
+    WriteHeadersFooters( nHeadFootFlags, *pPdFormat, *pPdLeftFormat, *pPdFirstPgFormat, nBreakCode );
 
     SetHdFtPageRoot( pOldPageRoot );
 
@@ -1878,14 +1878,14 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
     m_bOutPageDescs = bOldPg;
 }
 
-bool WW8_WrPlcSepx::WriteKFTxt( WW8Export& rWrt )
+bool WW8_WrPlcSepx::WriteKFText( WW8Export& rWrt )
 {
     sal_uLong nCpStart = rWrt.Fc2Cp( rWrt.Strm().Tell() );
 
-    OSL_ENSURE( !pTxtPos, "who set the pointer?" );
-    pTxtPos = new WW8_WrPlc0( nCpStart );
+    OSL_ENSURE( !pTextPos, "who set the pointer?" );
+    pTextPos = new WW8_WrPlc0( nCpStart );
 
-    WriteFtnEndTxt( rWrt, nCpStart );
+    WriteFootnoteEndText( rWrt, nCpStart );
     CheckForFacinPg( rWrt );
 
     unsigned int nOldIndex = rWrt.GetHdFtIndex();
@@ -1906,24 +1906,24 @@ bool WW8_WrPlcSepx::WriteKFTxt( WW8Export& rWrt )
     }
     rWrt.SetHdFtIndex( nOldIndex ); //0
 
-    if ( pTxtPos->Count() )
+    if ( pTextPos->Count() )
     {
         // HdFt available?
         sal_uLong nCpEnd = rWrt.Fc2Cp( rWrt.Strm().Tell() );
-        pTxtPos->Append( nCpEnd );  // End of last Header/Footer for PlcfHdd
+        pTextPos->Append( nCpEnd );  // End of last Header/Footer for PlcfHdd
 
         if ( nCpEnd > nCpStart )
         {
             ++nCpEnd;
-            pTxtPos->Append( nCpEnd + 1 );  // End of last Header/Footer for PlcfHdd
+            pTextPos->Append( nCpEnd + 1 );  // End of last Header/Footer for PlcfHdd
 
             rWrt.WriteStringAsPara( OUString() ); // CR ans Ende ( sonst mault WW )
         }
-        rWrt.m_pFldHdFt->Finish( nCpEnd, rWrt.pFib->ccpText + rWrt.pFib->ccpFtn );
+        rWrt.m_pFieldHdFt->Finish( nCpEnd, rWrt.pFib->ccpText + rWrt.pFib->ccpFootnote );
         rWrt.pFib->ccpHdr = nCpEnd - nCpStart;
     }
     else
-        delete pTxtPos, pTxtPos = 0;
+        delete pTextPos, pTextPos = 0;
 
     return rWrt.pFib->ccpHdr != 0;
 }
@@ -1977,34 +1977,34 @@ void WW8_WrPlcSepx::WritePlcSed( WW8Export& rWrt ) const
 void WW8_WrPlcSepx::WritePlcHdd( WW8Export& rWrt ) const
 {
     // Don't write out the PlcfHdd if ccpHdd is 0: it's a validation failure case.
-    if( rWrt.pFib->ccpHdr != 0 && pTxtPos && pTxtPos->Count() )
+    if( rWrt.pFib->ccpHdr != 0 && pTextPos && pTextPos->Count() )
     {
         rWrt.pFib->fcPlcfhdd = rWrt.pTableStrm->Tell();
-        pTxtPos->Write( *rWrt.pTableStrm );             // Plc0
+        pTextPos->Write( *rWrt.pTableStrm );             // Plc0
         rWrt.pFib->lcbPlcfhdd = rWrt.pTableStrm->Tell() -
                                 rWrt.pFib->fcPlcfhdd;
     }
 }
 
-void MSWordExportBase::WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader )
+void MSWordExportBase::WriteHeaderFooterText( const SwFormat& rFormat, bool bHeader )
 {
-    const SwFmtCntnt *pCntnt;
+    const SwFormatContent *pContent;
     if ( bHeader )
     {
         m_bHasHdr = true;
-        const SwFmtHeader& rHd = rFmt.GetHeader();
-        OSL_ENSURE( rHd.GetHeaderFmt(), "Header text is not here" );
-        pCntnt = &rHd.GetHeaderFmt()->GetCntnt();
+        const SwFormatHeader& rHd = rFormat.GetHeader();
+        OSL_ENSURE( rHd.GetHeaderFormat(), "Header text is not here" );
+        pContent = &rHd.GetHeaderFormat()->GetContent();
     }
     else
     {
         m_bHasFtr = true;
-        const SwFmtFooter& rFt = rFmt.GetFooter();
-        OSL_ENSURE( rFt.GetFooterFmt(), "Footer text is not here" );
-        pCntnt = &rFt.GetFooterFmt()->GetCntnt();
+        const SwFormatFooter& rFt = rFormat.GetFooter();
+        OSL_ENSURE( rFt.GetFooterFormat(), "Footer text is not here" );
+        pContent = &rFt.GetFooterFormat()->GetContent();
     }
 
-    const SwNodeIndex* pSttIdx = pCntnt->GetCntntIdx();
+    const SwNodeIndex* pSttIdx = pContent->GetContentIdx();
 
     if ( pSttIdx )
     {
@@ -2033,24 +2033,24 @@ void MSWordExportBase::WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader )
     }
 }
 
-// class WW8_WrPlcFtnEdn : Collect the Footnotes and Endnotes and output their text
+// class WW8_WrPlcFootnoteEdn : Collect the Footnotes and Endnotes and output their text
 // and Plcs at the end of the document.
-// WW8_WrPlcFtnEdn is the class for Footnotes and Endnotes
+// WW8_WrPlcFootnoteEdn is the class for Footnotes and Endnotes
 
 WW8_WrPlcSubDoc::WW8_WrPlcSubDoc()
-    : pTxtPos( 0 )
+    : pTextPos( 0 )
 {
 }
 
 WW8_WrPlcSubDoc::~WW8_WrPlcSubDoc()
 {
-    delete pTxtPos;
+    delete pTextPos;
 }
 
-void WW8_WrPlcFtnEdn::Append( WW8_CP nCp, const SwFmtFtn& rFtn )
+void WW8_WrPlcFootnoteEdn::Append( WW8_CP nCp, const SwFormatFootnote& rFootnote )
 {
     aCps.push_back( nCp );
-    aCntnt.push_back( &rFtn );
+    aContent.push_back( &rFootnote );
 }
 
 WW8_Annotation::WW8_Annotation(const SwPostItField* pPostIt, WW8_CP nRangeStart, WW8_CP nRangeEnd)
@@ -2061,7 +2061,7 @@ WW8_Annotation::WW8_Annotation(const SwPostItField* pPostIt, WW8_CP nRangeStart,
 {
     mpRichText = pPostIt->GetTextObject();
     if (!mpRichText)
-        msSimpleText = pPostIt->GetTxt();
+        msSimpleText = pPostIt->GetText();
     msOwner = pPostIt->GetPar1();
     m_sInitials = pPostIt->GetInitials();
     maDateTime = DateTime(pPostIt->GetDate(), pPostIt->GetTime());
@@ -2097,7 +2097,7 @@ void WW8_WrPlcAnnotations::Append( WW8_CP nCp, const SwPostItField *pPostIt )
     {
         p = new WW8_Annotation(pPostIt, nCp, nCp);
     }
-    aCntnt.push_back( p );
+    aContent.push_back( p );
 }
 
 void WW8_WrPlcAnnotations::Append( WW8_CP nCp, const SwRedlineData *pRedline )
@@ -2105,7 +2105,7 @@ void WW8_WrPlcAnnotations::Append( WW8_CP nCp, const SwRedlineData *pRedline )
     maProcessedRedlines.insert(pRedline);
     aCps.push_back( nCp );
     WW8_Annotation* p = new WW8_Annotation(pRedline);
-    aCntnt.push_back( p );
+    aContent.push_back( p );
 }
 
 bool WW8_WrPlcAnnotations::IsNewRedlineComment( const SwRedlineData *pRedline )
@@ -2115,19 +2115,19 @@ bool WW8_WrPlcAnnotations::IsNewRedlineComment( const SwRedlineData *pRedline )
 
 WW8_WrPlcAnnotations::~WW8_WrPlcAnnotations()
 {
-    for( sal_uInt16 n=0; n < aCntnt.size(); n++ )
-        delete static_cast<WW8_Annotation const *>(aCntnt[n]);
+    for( sal_uInt16 n=0; n < aContent.size(); n++ )
+        delete static_cast<WW8_Annotation const *>(aContent[n]);
 }
 
-bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
+bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp,
     WW8_CP& rCount )
 {
-    sal_uInt16 nLen = aCntnt.size();
+    sal_uInt16 nLen = aContent.size();
     if ( !nLen )
         return false;
 
     sal_uLong nCpStart = rWrt.Fc2Cp( rWrt.Strm().Tell() );
-    pTxtPos = new WW8_WrPlc0( nCpStart );
+    pTextPos = new WW8_WrPlc0( nCpStart );
     sal_uInt16 i;
 
     switch ( nTTyp )
@@ -2135,17 +2135,17 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
         case TXT_ATN:
             for ( i = 0; i < nLen; i++ )
             {
-                // beginning for PlcfAtnTxt
-                pTxtPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
+                // beginning for PlcfAtnText
+                pTextPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
 
                 rWrt.WritePostItBegin();
-                const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aCntnt[i]);
+                const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aContent[i]);
                 if (rAtn.mpRichText)
                     rWrt.WriteOutliner(*rAtn.mpRichText, nTTyp);
                 else
                 {
-                    OUString sTxt(rAtn.msSimpleText);
-                    rWrt.WriteStringAsPara(sTxt.replace(0x0A, 0x0B));
+                    OUString sText(rAtn.msSimpleText);
+                    rWrt.WriteStringAsPara(sText.replace(0x0A, 0x0B));
                 }
             }
             break;
@@ -2157,27 +2157,27 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
                 // textbox content
                 WW8_CP nCP = rWrt.Fc2Cp( rWrt.Strm().Tell() );
                 aCps.insert( aCps.begin()+i, nCP );
-                pTxtPos->Append( nCP );
+                pTextPos->Append( nCP );
 
-                if( aCntnt[ i ] != NULL )
+                if( aContent[ i ] != NULL )
                 {
                     // is it an writer or sdr - textbox?
-                    const SdrObject& rObj = *static_cast<SdrObject const *>(aCntnt[ i ]);
+                    const SdrObject& rObj = *static_cast<SdrObject const *>(aContent[ i ]);
                     if (rObj.GetObjInventor() == FmFormInventor)
                     {
-                        sal_uInt8 nOldTyp = rWrt.m_nTxtTyp;
-                        rWrt.m_nTxtTyp = nTTyp;
+                        sal_uInt8 nOldTyp = rWrt.m_nTextTyp;
+                        rWrt.m_nTextTyp = nTTyp;
                         rWrt.GetOCXExp().ExportControl(rWrt, dynamic_cast<const SdrUnoObj&>(rObj));
-                        rWrt.m_nTxtTyp = nOldTyp;
+                        rWrt.m_nTextTyp = nOldTyp;
                     }
                     else if( rObj.ISA( SdrTextObj ) )
                         rWrt.WriteSdrTextObj(dynamic_cast<const SdrTextObj&>(rObj), nTTyp);
                     else
                     {
-                        const SwFrmFmt* pFmt = ::FindFrmFmt( &rObj );
-                        OSL_ENSURE( pFmt, "where is the format?" );
+                        const SwFrameFormat* pFormat = ::FindFrameFormat( &rObj );
+                        OSL_ENSURE( pFormat, "where is the format?" );
 
-                        const SwNodeIndex* pNdIdx = pFmt->GetCntnt().GetCntntIdx();
+                        const SwNodeIndex* pNdIdx = pFormat->GetContent().GetContentIdx();
                         OSL_ENSURE( pNdIdx, "where is the StartNode of the Textbox?" );
                         rWrt.WriteSpecialText( pNdIdx->GetIndex() + 1,
                                                pNdIdx->GetNode().EndOfSectionIndex(),
@@ -2208,10 +2208,10 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
                         }
                     }
                 }
-                else if (i < aSpareFmts.size() && aSpareFmts[i])
+                else if (i < aSpareFormats.size() && aSpareFormats[i])
                 {
-                    const SwFrmFmt& rFmt = *aSpareFmts[i];
-                    const SwNodeIndex* pNdIdx = rFmt.GetCntnt().GetCntntIdx();
+                    const SwFrameFormat& rFormat = *aSpareFormats[i];
+                    const SwNodeIndex* pNdIdx = rFormat.GetContent().GetContentIdx();
                     rWrt.WriteSpecialText( pNdIdx->GetIndex() + 1,
                                pNdIdx->GetNode().EndOfSectionIndex(), nTTyp );
                 }
@@ -2225,13 +2225,13 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
         case TXT_FTN:
             for ( i = 0; i < nLen; i++ )
             {
-                // beginning for PlcfFtnTxt/PlcfEdnTxt
-                pTxtPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
+                // beginning for PlcfFootnoteText/PlcfEdnText
+                pTextPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
 
                 // Note content
-                const SwFmtFtn* pFtn = static_cast<SwFmtFtn const *>(aCntnt[ i ]);
-                rWrt.WriteFtnBegin( *pFtn );
-                const SwNodeIndex* pIdx = pFtn->GetTxtFtn()->GetStartNode();
+                const SwFormatFootnote* pFootnote = static_cast<SwFormatFootnote const *>(aContent[ i ]);
+                rWrt.WriteFootnoteBegin( *pFootnote );
+                const SwNodeIndex* pIdx = pFootnote->GetTextFootnote()->GetStartNode();
                 OSL_ENSURE( pIdx, "wo ist der StartNode der Fuss-/EndNote?" );
                 rWrt.WriteSpecialText( pIdx->GetIndex() + 1,
                                        pIdx->GetNode().EndOfSectionIndex(),
@@ -2243,12 +2243,12 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
             OSL_ENSURE( false, "was ist das fuer ein SubDocType?" );
     }
 
-    pTxtPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
+    pTextPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
     // CR ans Ende ( sonst mault WW )
     rWrt.WriteStringAsPara( OUString() );
 
     WW8_CP nCpEnd = rWrt.Fc2Cp( rWrt.Strm().Tell() );
-    pTxtPos->Append( nCpEnd );
+    pTextPos->Append( nCpEnd );
     rCount = nCpEnd - nCpStart;
 
     return ( rCount != 0 );
@@ -2265,7 +2265,7 @@ static bool lcl_PosComp( const std::pair<WW8_CP, int>& aFirst, const std::pair<W
 }
 
 void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
-    WW8_FC& rTxtStart, sal_Int32& rTxtCount, WW8_FC& rRefStart, sal_Int32& rRefCount ) const
+    WW8_FC& rTextStart, sal_Int32& rTextCount, WW8_FC& rRefStart, sal_Int32& rRefCount ) const
 {
 
     sal_uLong nFcStart = rWrt.pTableStrm->Tell();
@@ -2273,7 +2273,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
     if ( !nLen )
         return;
 
-    OSL_ENSURE( aCps.size() + 2 == pTxtPos->Count(), "WritePlc: DeSync" );
+    OSL_ENSURE( aCps.size() + 2 == pTextPos->Count(), "WritePlc: DeSync" );
 
     ::std::vector<std::pair<OUString,OUString> > aStrArr;
     typedef ::std::vector<std::pair<OUString,OUString> >::iterator myiter;
@@ -2294,7 +2294,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
                 int nIdx = 0;
                 for ( i = 0; i < nLen; ++i )
                 {
-                    const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aCntnt[i]);
+                    const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aContent[i]);
                     aStrArr.push_back(std::pair<OUString,OUString>(rAtn.msOwner,rAtn.m_sInitials));
                     // record start and end positions for ranges
                     if( rAtn.m_nRangeStart != rAtn.m_nRangeEnd )
@@ -2408,7 +2408,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
                 {
                     for( i = 0; i < nLen; ++i )
                     {
-                        const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aCntnt[i]);
+                        const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aContent[i]);
 
                         sal_uInt32 nDTTM = sw::ms::DateTime2DTTM(rAtn.maDateTime);
 
@@ -2430,7 +2430,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
         case TXT_TXTBOX:
         case TXT_HFTXTBOX:
             {
-                pTxtPos->Write( *rWrt.pTableStrm );
+                pTextPos->Write( *rWrt.pTableStrm );
                 const std::vector<sal_uInt32>* pShapeIds = GetShapeIdArr();
                 OSL_ENSURE( pShapeIds, "Where are the ShapeIds?" );
 
@@ -2438,14 +2438,14 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
                 {
                     // write textbox story - FTXBXS
                     // is it an writer or sdr - textbox?
-                    const SdrObject* pObj = static_cast<SdrObject const *>(aCntnt[ i ]);
+                    const SdrObject* pObj = static_cast<SdrObject const *>(aContent[ i ]);
                     sal_Int32 nCnt = 1;
                     if (pObj && !pObj->ISA( SdrTextObj ) )
                     {
                         // find the "highest" SdrObject of this
-                        const SwFrmFmt& rFmt = *::FindFrmFmt( pObj );
+                        const SwFrameFormat& rFormat = *::FindFrameFormat( pObj );
 
-                        const SwFmtChain* pChn = &rFmt.GetChain();
+                        const SwFormatChain* pChn = &rFormat.GetChain();
                         while ( pChn->GetNext() )
                         {
                             // has a chain?
@@ -2456,11 +2456,11 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
                     }
                     if( NULL == pObj )
                     {
-                        if (i < aSpareFmts.size() && aSpareFmts[i])
+                        if (i < aSpareFormats.size() && aSpareFormats[i])
                         {
-                            const SwFrmFmt& rFmt = *aSpareFmts[i];
+                            const SwFrameFormat& rFormat = *aSpareFormats[i];
 
-                            const SwFmtChain* pChn = &rFmt.GetChain();
+                            const SwFormatChain* pChn = &rFormat.GetChain();
                             while( pChn->GetNext() )
                             {
                                 // has a chain?
@@ -2498,7 +2498,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
 
         // n+1-th CP-Pos according to the manual
         SwWW8Writer::WriteLong( *rWrt.pTableStrm,
-                rFib.ccpText + rFib.ccpFtn + rFib.ccpHdr + rFib.ccpEdn +
+                rFib.ccpText + rFib.ccpFootnote + rFib.ccpHdr + rFib.ccpEdn +
                 rFib.ccpTxbx + rFib.ccpHdrTxbx + 1 );
 
         if ( TXT_ATN == nTTyp )
@@ -2506,7 +2506,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
             sal_uInt16 nlTag = 0;
             for ( i = 0; i < nLen; ++i )
             {
-                const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aCntnt[i]);
+                const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aContent[i]);
 
                 //aStrArr is sorted
                 myiter aIter = ::std::lower_bound(aStrArr.begin(),
@@ -2566,9 +2566,9 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
             sal_uInt16 nNo = 0;
             for ( i = 0; i < nLen; ++i )             // write Flags
             {
-                const SwFmtFtn* pFtn = static_cast<SwFmtFtn const *>(aCntnt[ i ]);
+                const SwFormatFootnote* pFootnote = static_cast<SwFormatFootnote const *>(aContent[ i ]);
                 SwWW8Writer::WriteShort( *rWrt.pTableStrm,
-                        !pFtn->GetNumStr().isEmpty() ? 0 : ++nNo );
+                        !pFootnote->GetNumStr().isEmpty() ? 0 : ++nNo );
             }
         }
     }
@@ -2576,7 +2576,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
     nFcStart = rWrt.pTableStrm->Tell();
     rRefCount = nFcStart - rRefStart;
 
-    pTxtPos->Write( *rWrt.pTableStrm );
+    pTextPos->Write( *rWrt.pTableStrm );
 
     switch ( nTTyp )
     {
@@ -2597,8 +2597,8 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
             break;
     }
 
-    rTxtStart = nFcStart;
-    rTxtCount = rWrt.pTableStrm->Tell() - nFcStart;
+    rTextStart = nFcStart;
+    rTextCount = rWrt.pTableStrm->Tell() - nFcStart;
 }
 
 const std::vector<sal_uInt32>* WW8_WrPlcSubDoc::GetShapeIdArr() const
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 09184f03cd10..c7883a6f6fa0 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -351,7 +351,7 @@ static void WriteDop( WW8Export& rWrt )
 
     // Werte aus der DocStatistik (werden aufjedenfall fuer die
     // DocStat-Felder benoetigt!)
-    rDop.fWCFtnEdn = true; // because they are included in StarWriter
+    rDop.fWCFootnoteEdn = true; // because they are included in StarWriter
 
     const SwDocStat& rDStat = rWrt.m_pDoc->getIDocumentStatistics().GetDocStat();
     rDop.cWords = rDStat.nWord;
@@ -405,11 +405,11 @@ static void WriteDop( WW8Export& rWrt )
     // ( we do not have this fields! )
 
     // and also for the Headers and Footers
-    rDop.cWordsFtnEnd   = rDStat.nWord;
-    rDop.cChFtnEdn      = rDStat.nChar;
-    rDop.cPgFtnEdn      = (sal_Int16)rDStat.nPage;
-    rDop.cParasFtnEdn   = rDStat.nPara;
-    rDop.cLinesFtnEdn   = rDStat.nPara;
+    rDop.cWordsFootnoteEnd   = rDStat.nWord;
+    rDop.cChFootnoteEdn      = rDStat.nChar;
+    rDop.cPgFootnoteEdn      = (sal_Int16)rDStat.nPage;
+    rDop.cParasFootnoteEdn   = rDStat.nPara;
+    rDop.cLinesFootnoteEdn   = rDStat.nPara;
 
     rDop.fDontUseHTMLAutoSpacing = rWrt.m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::PARA_SPACE_MAX);
 
@@ -739,16 +739,16 @@ void WW8_WrPlc1::Write( SvStream& rStrm )
         rStrm.Write( pData, (i-1) * nStructSiz );
 }
 
-// Class WW8_WrPlcFld for fields
+// Class WW8_WrPlcField for fields
 
-bool WW8_WrPlcFld::Write( WW8Export& rWrt )
+bool WW8_WrPlcField::Write( WW8Export& rWrt )
 {
     if( WW8_WrPlc1::Count() <= 1 )
         return false;
 
     WW8_FC *pfc;
     sal_Int32 *plc;
-    switch (nTxtTyp)
+    switch (nTextTyp)
     {
         case TXT_MAINTEXT:
             pfc = &rWrt.pFib->fcPlcffldMom;
@@ -760,8 +760,8 @@ bool WW8_WrPlcFld::Write( WW8Export& rWrt )
             break;
 
         case TXT_FTN:
-            pfc = &rWrt.pFib->fcPlcffldFtn;
-            plc = &rWrt.pFib->lcbPlcffldFtn;
+            pfc = &rWrt.pFib->fcPlcffldFootnote;
+            plc = &rWrt.pFib->lcbPlcffldFootnote;
             break;
 
         case TXT_EDN:
@@ -1325,10 +1325,10 @@ WW8_CP WW8_WrPct::Fc2Cp( sal_uLong nFc ) const
     return nFc + aPcts.back().GetStartCp();
 }
 
-void WW8Export::AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen )
+void WW8Export::AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen )
 {
     std::vector< const ::sw::mark::IMark* > aArr;
-    sal_uInt16 nCntnt;
+    sal_uInt16 nContent;
     const sal_Int32 nAktEnd = nAktPos + nLen;
     if( GetWriter().GetBookmarks( rNd, nAktPos, nAktEnd, aArr ))
     {
@@ -1351,15 +1351,15 @@ void WW8Export::AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_In
             }
 
             if( !pOPos || ( nNd == pPos->nNode.GetIndex() &&
-                ( nCntnt = pPos->nContent.GetIndex() ) >= nAktPos &&
-                nCntnt < nAktEnd ) )
+                ( nContent = pPos->nContent.GetIndex() ) >= nAktPos &&
+                nContent < nAktEnd ) )
             {
                 sal_uLong nCp = nSttCP + pPos->nContent.GetIndex() - nAktPos;
                 m_pBkmks->Append(nCp, BookmarkToWord(rBkmk.GetName()), &rBkmk);
             }
             if( pOPos && nNd == pOPos->nNode.GetIndex() &&
-                ( nCntnt = pOPos->nContent.GetIndex() ) >= nAktPos &&
-                nCntnt < nAktEnd )
+                ( nContent = pOPos->nContent.GetIndex() ) >= nAktPos &&
+                nContent < nAktEnd )
             {
                 sal_uLong nCp = nSttCP + pOPos->nContent.GetIndex() - nAktPos;
                 m_pBkmks->Append(nCp, BookmarkToWord(rBkmk.GetName()), &rBkmk);
@@ -1368,7 +1368,7 @@ void WW8Export::AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_In
     }
 }
 
-void WW8Export::AppendAnnotationMarks(const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen)
+void WW8Export::AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen)
 {
     IMarkVector aMarks;
     if (GetAnnotationMarks(rNode, nAktPos, nAktPos + nLen, aMarks))
@@ -1403,19 +1403,19 @@ int MSWordExportBase::CollectGrfsOfBullets()
 
     if ( m_pDoc )
     {
-        size_t nCountRule = m_pDoc->GetNumRuleTbl().size();
+        size_t nCountRule = m_pDoc->GetNumRuleTable().size();
         for (size_t n = 0; n < nCountRule; ++n)
         {
-            const SwNumRule &rRule = *( m_pDoc->GetNumRuleTbl().at(n) );
+            const SwNumRule &rRule = *( m_pDoc->GetNumRuleTable().at(n) );
             sal_uInt16 nLevels = rRule.IsContinusNum() ? 1 : 9;
             for (sal_uInt16 nLvl = 0; nLvl < nLevels; ++nLvl)
             {
-                const SwNumFmt &rFmt = rRule.Get(nLvl);
-                if (SVX_NUM_BITMAP != rFmt.GetNumberingType())
+                const SwNumFormat &rFormat = rRule.Get(nLvl);
+                if (SVX_NUM_BITMAP != rFormat.GetNumberingType())
                 {
                     continue;
                 }
-                const Graphic *pGraf = rFmt.GetBrush()? rFmt.GetBrush()->GetGraphic():0;
+                const Graphic *pGraf = rFormat.GetBrush()? rFormat.GetBrush()->GetGraphic():0;
                 if ( pGraf )
                 {
                     bool bHas = false;
@@ -1459,7 +1459,7 @@ void MSWordExportBase::BulletDefinitions()
 }
 
 //Export Graphic of Bullets
-void WW8Export::ExportGrfBullet(const SwTxtNode& rNd)
+void WW8Export::ExportGrfBullet(const SwTextNode& rNd)
 {
     int nCount = CollectGrfsOfBullets();
     if (nCount > 0)
@@ -1692,10 +1692,10 @@ void SwWW8Writer::WriteString8(SvStream& rStrm, const OUString& rStr,
         rStrm.Write(&aBytes[0], aBytes.size());
 }
 
-void WW8Export::WriteStringAsPara( const OUString& rTxt, sal_uInt16 nStyleId )
+void WW8Export::WriteStringAsPara( const OUString& rText, sal_uInt16 nStyleId )
 {
-    if( !rTxt.isEmpty() )
-        OutSwString( rTxt, 0, rTxt.getLength(), IsUnicode(), RTL_TEXTENCODING_MS_1252 );
+    if( !rText.isEmpty() )
+        OutSwString( rText, 0, rText.getLength(), IsUnicode(), RTL_TEXTENCODING_MS_1252 );
     WriteCR();              // CR thereafter
 
     ww::bytes aArr;
@@ -1717,8 +1717,8 @@ void WW8Export::WriteStringAsPara( const OUString& rTxt, sal_uInt16 nStyleId )
 
 void MSWordExportBase::WriteSpecialText( sal_uLong nStart, sal_uLong nEnd, sal_uInt8 nTTyp )
 {
-    sal_uInt8 nOldTyp = m_nTxtTyp;
-    m_nTxtTyp = nTTyp;
+    sal_uInt8 nOldTyp = m_nTextTyp;
+    m_nTextTyp = nTTyp;
     SwPaM* pOldPam = m_pCurPam;       //!! Simply shifting the PaM without restoring should do the job too
     SwPaM* pOldEnd = m_pOrigPam;
     bool bOldPageDescs = m_bOutPageDescs;
@@ -1742,7 +1742,7 @@ void MSWordExportBase::WriteSpecialText( sal_uLong nStart, sal_uLong nEnd, sal_u
     delete m_pCurPam;                    // delete Pam
     m_pCurPam = pOldPam;
     m_pOrigPam = pOldEnd;
-    m_nTxtTyp = nOldTyp;
+    m_nTextTyp = nOldTyp;
 }
 
 void WW8Export::OutSwString(const OUString& rStr, sal_Int32 nStt,
@@ -1809,7 +1809,7 @@ void MSWordExportBase::SaveData( sal_uLong nStt, sal_uLong nEnd )
     // Common stuff
     aData.pOldPam = m_pCurPam;
     aData.pOldEnd = m_pOrigPam;
-    aData.pOldFlyFmt = m_pParentFrame;
+    aData.pOldFlyFormat = m_pParentFrame;
     aData.pOldPageDesc = m_pAktPageDesc;
 
     aData.pOldFlyOffset = m_pFlyOffset;
@@ -1854,7 +1854,7 @@ void MSWordExportBase::RestoreData()
     m_bStartTOX = rData.bOldStartTOX;
     m_bInWriteTOX = rData.bOldInWriteTOX;
 
-    m_pParentFrame = rData.pOldFlyFmt;
+    m_pParentFrame = rData.pOldFlyFormat;
     m_pAktPageDesc = rData.pOldPageDesc;
 
     m_eNewAnchorType = rData.eOldAnchorType;
@@ -1971,8 +1971,8 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR
 
     if (pBox != NULL)
     {
-        const SwFrmFmt * pFmt = pBox->GetFrmFmt();
-        switch (pFmt->GetVertOrient().GetVertOrient())
+        const SwFrameFormat * pFormat = pBox->GetFrameFormat();
+        switch (pFormat->GetVertOrient().GetVertOrient())
         {
             case text::VertOrientation::CENTER:
                 nFlags |= (1 << 7);
@@ -1987,11 +1987,11 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR
         if(pSttNd)
         {
             SwNodeIndex aIdx( *pSttNd );
-            const SwCntntNode * pCNd = pSttNd->GetNodes().GoNext( &aIdx );
-            if( pCNd && pCNd->IsTxtNode())
+            const SwContentNode * pCNd = pSttNd->GetNodes().GoNext( &aIdx );
+            if( pCNd && pCNd->IsTextNode())
             {
                 SfxItemSet aCoreSet(rDoc.GetAttrPool(), RES_CHRATR_ROTATE, RES_CHRATR_ROTATE);
-                static_cast<const SwTxtNode*>(pCNd)->GetAttr( aCoreSet, 0, static_cast<const SwTxtNode*>(pCNd)->GetTxt().getLength());
+                static_cast<const SwTextNode*>(pCNd)->GetAttr( aCoreSet, 0, static_cast<const SwTextNode*>(pCNd)->GetText().getLength());
                 const SfxPoolItem * pRotItem;
                 if ( SfxItemState::SET == aCoreSet.GetItemState(RES_CHRATR_ROTATE, true, &pRotItem))
                 {
@@ -2016,15 +2016,15 @@ void WW8AttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_
 {
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
     const SwTableLine * pTabLine = pTabBox->GetUpper();
-    const SwTableBoxes & rTblBoxes = pTabLine->GetTabBoxes();
+    const SwTableBoxes & rTableBoxes = pTabLine->GetTabBoxes();
 
-    sal_uInt8 nBoxes = rTblBoxes.size();
+    sal_uInt8 nBoxes = rTableBoxes.size();
     for ( sal_uInt8 n = 0; n < nBoxes; n++ )
     {
-        const SwTableBox * pTabBox1 = rTblBoxes[n];
-        const SwFrmFmt * pFrmFmt = pTabBox1->GetFrmFmt();
+        const SwTableBox * pTabBox1 = rTableBoxes[n];
+        const SwFrameFormat * pFrameFormat = pTabBox1->GetFrameFormat();
 
-        if ( FRMDIR_VERT_TOP_RIGHT == m_rWW8Export.TrueFrameDirection( *pFrmFmt ) )
+        if ( FRMDIR_VERT_TOP_RIGHT == m_rWW8Export.TrueFrameDirection( *pFrameFormat ) )
         {
             m_rWW8Export.InsUInt16( NS_sprm::LN_TTextFlow );
             m_rWW8Export.pO->push_back( sal_uInt8(n) );        //start range
@@ -2038,7 +2038,7 @@ void WW8AttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pT
 {
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
     const SwTableLine * pTabLine = pTabBox->GetUpper();
-    const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt();
+    const SwFrameFormat * pLineFormat = pTabLine->GetFrameFormat();
 
     /*
      By default the row can be split in word, and now in writer we have a
@@ -2046,7 +2046,7 @@ void WW8AttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pT
      cannot be split, we set true if we can split it. An example is #i4569#
      */
 
-    const SwFmtRowSplit& rSplittable = pLineFmt->GetRowSplit();
+    const SwFormatRowSplit& rSplittable = pLineFormat->GetRowSplit();
     sal_uInt8 nCantSplit = (!rSplittable.GetValue()) ? 1 : 0;
     if ( m_rWW8Export.bWrtWW8 )
     {
@@ -2064,11 +2064,11 @@ void WW8AttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pT
 void WW8AttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
     const SwTable * pTable = pTableTextNodeInfoInner->getTable();
-    const SwFrmFmt * pFrmFmt = pTable->GetFrmFmt();
+    const SwFrameFormat * pFrameFormat = pTable->GetFrameFormat();
 
     if ( m_rWW8Export.bWrtWW8 )
     {
-        if ( m_rWW8Export.TrueFrameDirection(*pFrmFmt) == FRMDIR_HORI_RIGHT_TOP )
+        if ( m_rWW8Export.TrueFrameDirection(*pFrameFormat) == FRMDIR_HORI_RIGHT_TOP )
         {
             m_rWW8Export.InsUInt16( NS_sprm::LN_TFBiDi );
             m_rWW8Export.InsUInt16( 1 );
@@ -2088,11 +2088,11 @@ void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTab
 {
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
     const SwTableLine * pTabLine = pTabBox->GetUpper();
-    const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt();
+    const SwFrameFormat * pLineFormat = pTabLine->GetFrameFormat();
 
     // Zeilenhoehe ausgeben   sprmTDyaRowHeight
     long nHeight = 0;
-    const SwFmtFrmSize& rLSz = pLineFmt->GetFrmSize();
+    const SwFormatFrmSize& rLSz = pLineFormat->GetFrmSize();
     if ( ATT_VAR_SIZE != rLSz.GetHeightSizeType() && rLSz.GetHeight() )
     {
         if ( ATT_MIN_SIZE == rLSz.GetHeightSizeType() )
@@ -2116,13 +2116,13 @@ void WW8AttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t
 {
     const SwTable * pTable = pTableTextNodeInfoInner->getTable();
 
-    const SwFrmFmt *pFmt = pTable->GetFrmFmt();
-    OSL_ENSURE(pFmt,"Impossible");
-    if (!pFmt)
+    const SwFrameFormat *pFormat = pTable->GetFrameFormat();
+    OSL_ENSURE(pFormat,"Impossible");
+    if (!pFormat)
         return;
 
-    const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient();
-    const SwFmtVertOrient &rVert = pFmt->GetVertOrient();
+    const SwFormatHoriOrient &rHori = pFormat->GetHoriOrient();
+    const SwFormatVertOrient &rVert = pFormat->GetVertOrient();
 
     if (
         (text::RelOrientation::PRINT_AREA == rHori.GetRelationOrient() ||
@@ -2152,14 +2152,14 @@ void WW8AttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t
 void WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner)
 {
     const SwTable * pTable = pTableTextNodeInfoInner->getTable();
-    const SwTableFmt* pTableFmt = pTable->GetFrmFmt();
+    const SwTableFormat* pTableFormat = pTable->GetFrameFormat();
 
 
     // Writing these SPRM's will make the table a floating one, so only write
     // them in case the table is already inside a frame.
-    if (pTableFmt != NULL && pTable->GetTableNode()->GetFlyFmt())
+    if (pTableFormat != NULL && pTable->GetTableNode()->GetFlyFormat())
     {
-        const SvxULSpaceItem & rUL = pTableFmt->GetULSpace();
+        const SvxULSpaceItem & rUL = pTableFormat->GetULSpace();
 
         if (rUL.GetUpper() > 0)
         {
@@ -2216,21 +2216,21 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
 
     /* cellxs */
     /*
-     ALWAYS relative when text::HoriOrientation::NONE (nPageSize + ( nPageSize / 10 )) < nTblSz,
+     ALWAYS relative when text::HoriOrientation::NONE (nPageSize + ( nPageSize / 10 )) < nTableSz,
      in that case the cell width's and table width's are not real. The table
      width is maxed and cells relative, so we need the frame (generally page)
      width that the table is in to work out the true widths.
      */
-    //const bool bNewTableModel = pTbl->IsNewModel();
-    const SwFrmFmt *pFmt = pTable->GetFrmFmt();
-    OSL_ENSURE(pFmt,"Impossible");
-    if (!pFmt)
+    //const bool bNewTableModel = pTable->IsNewModel();
+    const SwFrameFormat *pFormat = pTable->GetFrameFormat();
+    OSL_ENSURE(pFormat,"Impossible");
+    if (!pFormat)
         return;
 
-    const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient();
-    const SwFmtVertOrient &rVert = pFmt->GetVertOrient();
+    const SwFormatHoriOrient &rHori = pFormat->GetHoriOrient();
+    const SwFormatVertOrient &rVert = pFormat->GetVertOrient();
 
-    sal_uInt16 nTblOffset = 0;
+    sal_uInt16 nTableOffset = 0;
 
     if (
         (text::RelOrientation::PRINT_AREA == rHori.GetRelationOrient() ||
@@ -2248,20 +2248,20 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
                 break;
 
             default:
-                nTblOffset = rHori.GetPos();
-                const SvxLRSpaceItem& rLRSp = pFmt->GetLRSpace();
-                nTblOffset += rLRSp.GetLeft();
+                nTableOffset = rHori.GetPos();
+                const SvxLRSpaceItem& rLRSp = pFormat->GetLRSpace();
+                nTableOffset += rLRSp.GetLeft();
                 break;
         }
     }
 
-     m_rWW8Export.InsUInt16( nTblOffset );
+     m_rWW8Export.InsUInt16( nTableOffset );
 
     ww8::GridColsPtr pGridCols = GetGridCols( pTableTextNodeInfoInner );
     for ( ww8::GridCols::const_iterator it = pGridCols->begin(),
               end = pGridCols->end(); it != end; ++it )
      {
-         m_rWW8Export.InsUInt16( static_cast<sal_uInt16>( *it ) + nTblOffset );
+         m_rWW8Export.InsUInt16( static_cast<sal_uInt16>( *it ) + nTableOffset );
      }
 
      /* TCs */
@@ -2275,9 +2275,9 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
         sal_uInt16 npOCount = m_rWW8Export.pO->size();
 
         const SwTableBox * pTabBox1 = *aIt;
-        const SwFrmFmt * pBoxFmt = NULL;
+        const SwFrameFormat * pBoxFormat = NULL;
         if (pTabBox1 != NULL)
-            pBoxFmt = pTabBox1->GetFrmFmt();
+            pBoxFormat = pTabBox1->GetFrameFormat();
 
         if ( m_rWW8Export.bWrtWW8 )
         {
@@ -2289,14 +2289,14 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
         static sal_uInt8 aNullBytes[] = { 0x0, 0x0 };
 
         m_rWW8Export.pO->insert( m_rWW8Export.pO->end(), aNullBytes, aNullBytes+2 );   // dummy
-        if (pBoxFmt != NULL)
+        if (pBoxFormat != NULL)
         {
-            const SvxBoxItem & rBoxItem = pBoxFmt->GetBox();
+            const SvxBoxItem & rBoxItem = pBoxFormat->GetBox();
 
-            m_rWW8Export.Out_SwFmtTableBox( *m_rWW8Export.pO, &rBoxItem ); // 8/16 Byte
+            m_rWW8Export.Out_SwFormatTableBox( *m_rWW8Export.pO, &rBoxItem ); // 8/16 Byte
         }
         else
-            m_rWW8Export.Out_SwFmtTableBox( *m_rWW8Export.pO, NULL); // 8/16 Byte
+            m_rWW8Export.Out_SwFormatTableBox( *m_rWW8Export.pO, NULL); // 8/16 Byte
 
         SAL_INFO( "sw.ww8.level2", "<tclength>" << ( m_rWW8Export.pO->size() - npOCount ) << "</tclength>" );
     }
@@ -2317,22 +2317,22 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT
 {
     long nPageSize = 0;
 
-    const SwNode *pTxtNd = pTableTextNodeInfoInner->getNode( );
+    const SwNode *pTextNd = pTableTextNodeInfoInner->getNode( );
     const SwTable *pTable = pTableTextNodeInfoInner->getTable( );
 
-    const SwFrmFmt *pFmt = pTable->GetFrmFmt();
-    OSL_ENSURE(pFmt,"Impossible");
-    if (!pFmt)
+    const SwFrameFormat *pFormat = pTable->GetFrameFormat();
+    OSL_ENSURE(pFormat,"Impossible");
+    if (!pFormat)
         return;
 
-    const SwFmtFrmSize &rSize = pFmt->GetFrmSize();
+    const SwFormatFrmSize &rSize = pFormat->GetFrmSize();
     int nWidthPercent = rSize.GetWidthPercent();
-    bool bManualAligned = pFmt->GetHoriOrient().GetHoriOrient() == text::HoriOrientation::NONE;
-    if ( (pFmt->GetHoriOrient().GetHoriOrient() == text::HoriOrientation::FULL) || bManualAligned )
+    bool bManualAligned = pFormat->GetHoriOrient().GetHoriOrient() == text::HoriOrientation::NONE;
+    if ( (pFormat->GetHoriOrient().GetHoriOrient() == text::HoriOrientation::FULL) || bManualAligned )
         nWidthPercent = 100;
     bool bRelBoxSize = nWidthPercent != 0;
-    unsigned long nTblSz = static_cast<unsigned long>(rSize.GetWidth());
-    if (nTblSz > USHRT_MAX/2 && !bRelBoxSize)
+    unsigned long nTableSz = static_cast<unsigned long>(rSize.GetWidth());
+    if (nTableSz > USHRT_MAX/2 && !bRelBoxSize)
     {
         OSL_ENSURE(bRelBoxSize, "huge table width but not relative, suspicious");
         bRelBoxSize = true;
@@ -2341,19 +2341,19 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT
     if ( bRelBoxSize )
     {
         Point aPt;
-        SwRect aRect( pFmt->FindLayoutRect( false, &aPt ) );
+        SwRect aRect( pFormat->FindLayoutRect( false, &aPt ) );
         if ( aRect.IsEmpty() )
         {
             // dann besorge mal die Seitenbreite ohne Raender !!
-            const SwFrmFmt* pParentFmt =
+            const SwFrameFormat* pParentFormat =
                 GetExport().m_pParentFrame ?
-                &(GetExport().m_pParentFrame->GetFrmFmt()) :
-                    GetExport().m_pDoc->GetPageDesc(0).GetPageFmtOfNode(*pTxtNd, false);
-            aRect = pParentFmt->FindLayoutRect(true);
+                &(GetExport().m_pParentFrame->GetFrameFormat()) :
+                    GetExport().m_pDoc->GetPageDesc(0).GetPageFormatOfNode(*pTextNd, false);
+            aRect = pParentFormat->FindLayoutRect(true);
             if ( 0 == ( nPageSize = aRect.Width() ) )
             {
-                const SvxLRSpaceItem& rLR = pParentFmt->GetLRSpace();
-                nPageSize = pParentFmt->GetFrmSize().GetWidth() - rLR.GetLeft()
+                const SvxLRSpaceItem& rLR = pParentFormat->GetLRSpace();
+                nPageSize = pParentFormat->GetFrmSize().GetWidth() - rLR.GetLeft()
                 - rLR.GetRight();
             }
         }
@@ -2363,7 +2363,7 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT
             if ( bManualAligned )
             {
                 // #i37571# For manually aligned tables
-                const SvxLRSpaceItem &rLR = pFmt->GetLRSpace();
+                const SvxLRSpaceItem &rLR = pFormat->GetLRSpace();
                 nPageSize -= (rLR.GetLeft() + rLR.GetRight());
             }
 
@@ -2379,7 +2379,7 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT
     else
     {
         // As the table width is not relative, the TablePageSize equals its width
-        nPageSize = nTblSz;
+        nPageSize = nTableSz;
     }
 
     rPageSize = nPageSize;
@@ -2389,7 +2389,7 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT
 void WW8AttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
-    const SwFrmFmt * pFrmFmt = pTabBox->GetFrmFmt();
+    const SwFrameFormat * pFrameFormat = pTabBox->GetFrameFormat();
 
     //Set Default, just taken from the first cell of the first
     //row
@@ -2409,7 +2409,7 @@ void WW8AttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe
         m_rWW8Export.pO->push_back( sal_uInt8(3) );
 
         SwWW8Writer::InsUInt16( *m_rWW8Export.pO,
-                pFrmFmt->GetBox().GetDistance( aBorders[i] ) );
+                pFrameFormat->GetBox().GetDistance( aBorders[i] ) );
     }
 }
 
@@ -2431,7 +2431,7 @@ void WW8AttributeOutput::TableCellBorders(
     for ( unsigned n = 0; n <= nBoxes; ++n )
     {
         const SvxBoxItem * pBox = (n == nBoxes) ? 0 :
-            &rTabBoxes[n]->GetFrmFmt()->GetBox();
+            &rTabBoxes[n]->GetFrameFormat()->GetBox();
         if( !pLastBox )
             pLastBox = pBox;
         else if( !pBox || *pLastBox != *pBox )
@@ -2461,11 +2461,11 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
     for ( sal_uInt8 n = 0; n < nBoxes; n++ )
     {
         const SwTableBox * pBox1 = rTabBoxes[n];
-        const SwFrmFmt * pFrmFmt = pBox1->GetFrmFmt();
+        const SwFrameFormat * pFrameFormat = pBox1->GetFrameFormat();
         const SfxPoolItem * pI = NULL;
         Color aColor;
 
-        if ( SfxItemState::SET == pFrmFmt->GetAttrSet().GetItemState( RES_BACKGROUND, false, &pI ) )
+        if ( SfxItemState::SET == pFrameFormat->GetAttrSet().GetItemState( RES_BACKGROUND, false, &pI ) )
         {
             aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor();
         }
@@ -2493,12 +2493,12 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
         for ( sal_uInt8 n = 0; n < nBoxes0; n++ )
         {
             const SwTableBox * pBox1 = rTabBoxes[n];
-            const SwFrmFmt * pFrmFmt = pBox1->GetFrmFmt();
+            const SwFrameFormat * pFrameFormat = pBox1->GetFrameFormat();
             const SfxPoolItem * pI = NULL;
             Color aColor;
 
                 if ( SfxItemState::SET ==
-                         pFrmFmt->GetAttrSet().
+                         pFrameFormat->GetAttrSet().
                          GetItemState( RES_BACKGROUND, false, &pI ) )
             {
                 aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor();
@@ -2521,14 +2521,14 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
     }
 }
 
-void WW8Export::SectionBreaksAndFrames( const SwTxtNode& rNode )
+void WW8Export::SectionBreaksAndFrames( const SwTextNode& rNode )
 {
     // output page/section breaks
     OutputSectionBreaks( rNode.GetpSwAttrSet(), rNode );
 
     // all textframes anchored as character for the winword 7- format
     if ( !bWrtWW8 && !IsInTable() )
-        OutWW6FlyFrmsInCntnt( rNode );
+        OutWW6FlyFrmsInContent( rNode );
 }
 
 void MSWordExportBase::WriteText()
@@ -2539,13 +2539,13 @@ void MSWordExportBase::WriteText()
     {
         SwNode& rNd = m_pCurPam->GetNode();
 
-        if ( rNd.IsTxtNode() )
-            SectionBreaksAndFrames( *rNd.GetTxtNode() );
+        if ( rNd.IsTextNode() )
+            SectionBreaksAndFrames( *rNd.GetTextNode() );
 
         // output the various types of nodes
-        if ( rNd.IsCntntNode() )
+        if ( rNd.IsContentNode() )
         {
-            SwCntntNode* pCNd = static_cast<SwCntntNode*>(&rNd);
+            SwContentNode* pCNd = static_cast<SwContentNode*>(&rNd);
 
             const SwPageDesc* pTemp = rNd.FindPageDesc(false);
             if ( pTemp )
@@ -2558,9 +2558,9 @@ void MSWordExportBase::WriteText()
         {
             m_pTableInfo->processSwTable( &rNd.GetTableNode()->GetTable() );
         }
-        else if ( rNd.IsSectionNode() && TXT_MAINTEXT == m_nTxtTyp )
+        else if ( rNd.IsSectionNode() && TXT_MAINTEXT == m_nTextTyp )
             OutputSectionNode( *rNd.GetSectionNode() );
-        else if ( TXT_MAINTEXT == m_nTxtTyp && rNd.IsEndNode() &&
+        else if ( TXT_MAINTEXT == m_nTextTyp && rNd.IsEndNode() &&
                   rNd.StartOfSectionNode()->IsSectionNode() )
         {
             const SwSection& rSect = rNd.StartOfSectionNode()->GetSectionNode()
@@ -2578,14 +2578,14 @@ void MSWordExportBase::WriteText()
             {
                 //#120140# Do not need to insert a page/section break after a section end. Check this case first
                 bool bNeedExportBreakHere = true;
-                if ( aIdx.GetNode().IsTxtNode() )
+                if ( aIdx.GetNode().IsTextNode() )
                 {
-                    SwTxtNode *pTempNext = aIdx.GetNode().GetTxtNode();
+                    SwTextNode *pTempNext = aIdx.GetNode().GetTextNode();
                     if ( pTempNext )
                     {
                         const SfxPoolItem * pTempItem = NULL;
                         if (pTempNext->GetpSwAttrSet() && SfxItemState::SET == pTempNext->GetpSwAttrSet()->GetItemState(RES_PAGEDESC, false, &pTempItem)
-                            && pTempItem && static_cast<const SwFmtPageDesc*>(pTempItem)->GetRegisteredIn())
+                            && pTempItem && static_cast<const SwFormatPageDesc*>(pTempItem)->GetRegisteredIn())
                         {
                             //Next node has a new page style which means this node is a section end. Do not insert another page/section break here
                             bNeedExportBreakHere = false;
@@ -2595,10 +2595,10 @@ void MSWordExportBase::WriteText()
                 else
                 {
                     /* Do not export Section Break in case DOCX containing MultiColumn and
-                     * aIdx.GetNode().IsTxtNode() is False i.e. Text node is NULL.
+                     * aIdx.GetNode().IsTextNode() is False i.e. Text node is NULL.
                      */
-                    const SwFrmFmt* pPgFmt = rSect.GetFmt();
-                    const SwFmtCol& rCol = pPgFmt->GetCol();
+                    const SwFrameFormat* pPgFormat = rSect.GetFormat();
+                    const SwFormatCol& rCol = pPgFormat->GetCol();
                     sal_uInt16 nColumnCount = rCol.GetNumCols();
                     if(nColumnCount > 1)
                     {
@@ -2610,18 +2610,18 @@ void MSWordExportBase::WriteText()
                 {
                     ReplaceCr( (char)0xc ); // indicator for Page/Section-Break
 
-                    const SwSectionFmt* pParentFmt = rSect.GetFmt()->GetParent();
-                    if ( !pParentFmt )
-                        pParentFmt = reinterpret_cast<SwSectionFmt*>(sal_IntPtr(-1));
+                    const SwSectionFormat* pParentFormat = rSect.GetFormat()->GetParent();
+                    if ( !pParentFormat )
+                        pParentFormat = reinterpret_cast<SwSectionFormat*>(sal_IntPtr(-1));
 
                     sal_uLong nRstLnNum;
-                    if ( aIdx.GetNode().IsCntntNode() )
-                        nRstLnNum = static_cast<SwCntntNode&>(aIdx.GetNode()).GetSwAttrSet().
+                    if ( aIdx.GetNode().IsContentNode() )
+                        nRstLnNum = static_cast<SwContentNode&>(aIdx.GetNode()).GetSwAttrSet().
                                                 GetLineNumber().GetStartValue();
                     else
                         nRstLnNum = 0;
 
-                    AppendSection( m_pAktPageDesc, pParentFmt, nRstLnNum );
+                    AppendSection( m_pAktPageDesc, pParentFormat, nRstLnNum );
                 }
             }
         }
@@ -2672,16 +2672,16 @@ void WW8Export::WriteMainText()
         WriteCR();                  // then CR at the end ( otherwise WW will complain )
 
     pFib->ccpText = Fc2Cp( Strm().Tell() );
-    m_pFldMain->Finish( pFib->ccpText, 0 );
+    m_pFieldMain->Finish( pFib->ccpText, 0 );
 
                     // ccpText includes Footnote and KF-text
                     // therefore pFib->ccpText may get updated as well
     // save the StyleId of the last paragraph. Because WW97 take the style
     // from the last CR, that will be written after footer/Header/footnotes/
     // annotation usw.
-    const SwTxtNode* pLastNd = m_pCurPam->GetMark()->nNode.GetNode().GetTxtNode();
+    const SwTextNode* pLastNd = m_pCurPam->GetMark()->nNode.GetNode().GetTextNode();
     if( pLastNd )
-        m_nLastFmtId = GetId( static_cast<SwTxtFmtColl&>(pLastNd->GetAnyFmtColl()) );
+        m_nLastFormatId = GetId( static_cast<SwTextFormatColl&>(pLastNd->GetAnyFormatColl()) );
 
     SAL_INFO( "sw.ww8.level2", "</WriteMainText>" );
 }
@@ -2727,7 +2727,7 @@ void WW8Export::WriteFkpPlcUsw()
         m_pChpPlc->WriteFkps();                   // Fkp.Chpx
         m_pPapPlc->WriteFkps();                   // Fkp.Papx
         m_pStyles->OutputStylesTable();           // Styles
-        pFtn->WritePlc( *this );                // Footnote-Ref & Text Plc
+        pFootnote->WritePlc( *this );                // Footnote-Ref & Text Plc
         pEdn->WritePlc( *this );                // Endnote-Ref & Text Plc
         m_pAtn->WritePlc( *this );                // Annotation-Ref & Text Plc
         pSepx->WritePlcSed( *this );            // Slcx.PlcSed
@@ -2737,11 +2737,11 @@ void WW8Export::WriteFkpPlcUsw()
         m_aFontHelper.WriteFontTable(pTableStrm, *pFib); // FFNs
         if( m_pRedlAuthors )
             m_pRedlAuthors->Write( GetWriter() );       // sttbfRMark (RedlineAuthors)
-        m_pFldMain->Write( *this );               // Fields ( Main Text )
-        m_pFldHdFt->Write( *this );               // Fields ( Header/Footer )
-        m_pFldFtn->Write( *this );                // Fields ( FootNotes )
-        m_pFldEdn->Write( *this );                // Fields ( EndNotes )
-        m_pFldAtn->Write( *this );                // Fields ( Annotations )
+        m_pFieldMain->Write( *this );               // Fields ( Main Text )
+        m_pFieldHdFt->Write( *this );               // Fields ( Header/Footer )
+        m_pFieldFootnote->Write( *this );                // Fields ( FootNotes )
+        m_pFieldEdn->Write( *this );                // Fields ( EndNotes )
+        m_pFieldAtn->Write( *this );                // Fields ( Annotations )
         m_pBkmks->Write( *this );                 // Bookmarks - sttbfBkmk/
                                                 // plcfBkmkf/plcfBkmkl
         WriteDop( *this );                      // Document-Properties
@@ -2759,10 +2759,10 @@ void WW8Export::WriteFkpPlcUsw()
 
         // Ausagbe in Table-Stream
         m_pStyles->OutputStylesTable();           // for WW8 StyleTab
-        pFtn->WritePlc( *this );                // Footnote-Ref & Text Plc
+        pFootnote->WritePlc( *this );                // Footnote-Ref & Text Plc
         pEdn->WritePlc( *this );                // Endnote-Ref & Text Plc
-        m_pTxtBxs->WritePlc( *this );             // Textbox Text Plc
-        m_pHFTxtBxs->WritePlc( *this );           // Head/Foot-Textbox Text Plc
+        m_pTextBxs->WritePlc( *this );             // Textbox Text Plc
+        m_pHFTextBxs->WritePlc( *this );           // Head/Foot-Textbox Text Plc
         m_pAtn->WritePlc( *this );                // Annotation-Ref & Text Plc
 
         pSepx->WritePlcSed( *this );            // Slcx.PlcSed
@@ -2773,13 +2773,13 @@ void WW8Export::WriteFkpPlcUsw()
 
         if( m_pRedlAuthors )
             m_pRedlAuthors->Write( GetWriter() );       // sttbfRMark (RedlineAuthors)
-        m_pFldMain->Write( *this );               // Fields ( Main Text )
-        m_pFldHdFt->Write( *this );               // Fields ( Header/Footer )
-        m_pFldFtn->Write( *this );                // Fields ( FootNotes )
-        m_pFldEdn->Write( *this );                // Fields ( EndNotes )
-        m_pFldAtn->Write( *this );                // Fields ( Annotations )
-        m_pFldTxtBxs->Write( *this );             // Fields ( Textboxes )
-        m_pFldHFTxtBxs->Write( *this );           // Fields ( Head/Foot-Textboxes )
+        m_pFieldMain->Write( *this );               // Fields ( Main Text )
+        m_pFieldHdFt->Write( *this );               // Fields ( Header/Footer )
+        m_pFieldFootnote->Write( *this );                // Fields ( FootNotes )
+        m_pFieldEdn->Write( *this );                // Fields ( EndNotes )
+        m_pFieldAtn->Write( *this );                // Fields ( Annotations )
+        m_pFieldTextBxs->Write( *this );             // Fields ( Textboxes )
+        m_pFieldHFTextBxs->Write( *this );           // Fields ( Head/Foot-Textboxes )
 
         if (m_pEscher || m_pDoc->ContainsMSVBasic())
         {
@@ -2876,17 +2876,17 @@ void WW8Export::StoreDoc1()
     sal_uInt8 nSprmsLen;
     sal_uInt8 *pLastSprms = m_pPapPlc->CopyLastSprms(nSprmsLen);
 
-    bNeedsFinalPara |= pFtn->WriteTxt( *this );         // Footnote-Text
-    bNeedsFinalPara |= pSepx->WriteKFTxt( *this );          // K/F-Text
-    bNeedsFinalPara |= m_pAtn->WriteTxt( *this );         // Annotation-Text
-    bNeedsFinalPara |= pEdn->WriteTxt( *this );         // EndNote-Text
+    bNeedsFinalPara |= pFootnote->WriteText( *this );         // Footnote-Text
+    bNeedsFinalPara |= pSepx->WriteKFText( *this );          // K/F-Text
+    bNeedsFinalPara |= m_pAtn->WriteText( *this );         // Annotation-Text
+    bNeedsFinalPara |= pEdn->WriteText( *this );         // EndNote-Text
 
     // create the escher streams
     if( bWrtWW8 )
         CreateEscher();
 
-    bNeedsFinalPara |= m_pTxtBxs->WriteTxt( *this );  //Textbox Text Plc
-    bNeedsFinalPara |= m_pHFTxtBxs->WriteTxt( *this );//Head/Foot-Textbox Text Plc
+    bNeedsFinalPara |= m_pTextBxs->WriteText( *this );  //Textbox Text Plc
+    bNeedsFinalPara |= m_pHFTextBxs->WriteText( *this );//Head/Foot-Textbox Text Plc
 
     if (bNeedsFinalPara)
     {
@@ -2895,7 +2895,7 @@ void WW8Export::StoreDoc1()
     }
     delete[] pLastSprms;
 
-    pSepx->Finish( Fc2Cp( Strm().Tell() ));// Text + Ftn + HdFt als Section-Ende
+    pSepx->Finish( Fc2Cp( Strm().Tell() ));// Text + Footnote + HdFt als Section-Ende
     m_pMagicTable->Finish( Fc2Cp( Strm().Tell() ),0);
 
     pFib->fcMac = Strm().Tell();        // End of all texts
@@ -2943,28 +2943,28 @@ void MSWordExportBase::CollectOutlineBookmarks(const SwDoc &rDoc)
     sal_uInt32 nMaxItems = rDoc.GetAttrPool().GetItemCount2(RES_TXTATR_INETFMT);
     for (sal_uInt32 n = 0; n < nMaxItems; ++n)
     {
-        const SwFmtINetFmt* pINetFmt = static_cast<const SwFmtINetFmt*>(rDoc.GetAttrPool().GetItem2(RES_TXTATR_INETFMT, n));
-        if (!pINetFmt)
+        const SwFormatINetFormat* pINetFormat = static_cast<const SwFormatINetFormat*>(rDoc.GetAttrPool().GetItem2(RES_TXTATR_INETFMT, n));
+        if (!pINetFormat)
             continue;
 
-        const SwTxtINetFmt* pTxtAttr = pINetFmt->GetTxtINetFmt();
-        if (!pTxtAttr)
+        const SwTextINetFormat* pTextAttr = pINetFormat->GetTextINetFormat();
+        if (!pTextAttr)
             continue;
 
-        const SwTxtNode* pTxtNd = pTxtAttr->GetpTxtNode();
-        if (!pTxtNd)
+        const SwTextNode* pTextNd = pTextAttr->GetpTextNode();
+        if (!pTextNd)
             continue;
 
-        if (!pTxtNd->GetNodes().IsDocNodes())
+        if (!pTextNd->GetNodes().IsDocNodes())
             continue;
 
-        AddLinkTarget( pINetFmt->GetValue() );
+        AddLinkTarget( pINetFormat->GetValue() );
     }
 
     nMaxItems = rDoc.GetAttrPool().GetItemCount2( RES_URL );
     for (sal_uInt32 n = 0; n < nMaxItems; ++n)
     {
-        const SwFmtURL *pURL = static_cast<const SwFmtURL*>(rDoc.GetAttrPool().GetItem2(RES_URL, n));
+        const SwFormatURL *pURL = static_cast<const SwFormatURL*>(rDoc.GetAttrPool().GetItem2(RES_URL, n));
         if (!pURL)
             continue;
 
@@ -3007,24 +3007,24 @@ namespace
 
 void MSWordExportBase::ExportDocument( bool bWriteAll )
 {
-    m_nCharFmtStart = ANZ_DEFAULT_STYLES;
-    m_nFmtCollStart = m_nCharFmtStart + m_pDoc->GetCharFmts()->size() - 1;
+    m_nCharFormatStart = ANZ_DEFAULT_STYLES;
+    m_nFormatCollStart = m_nCharFormatStart + m_pDoc->GetCharFormats()->size() - 1;
 
     m_bStyDef = m_bBreakBefore = m_bOutKF =
         m_bOutFlyFrmAttrs = m_bOutPageDescs = m_bOutTable = m_bOutFirstPage =
         m_bOutGrf = m_bInWriteEscher = m_bStartTOX =
         m_bInWriteTOX = false;
 
-    m_bFtnAtTxtEnd = m_bEndAtTxtEnd = true;
+    m_bFootnoteAtTextEnd = m_bEndAtTextEnd = true;
 
     m_pParentFrame = 0;
     m_pFlyOffset = 0;
     m_eNewAnchorType = FLY_AT_PAGE;
-    m_nTxtTyp = TXT_MAINTEXT;
-    m_nStyleBeforeFly = m_nLastFmtId = 0;
+    m_nTextTyp = TXT_MAINTEXT;
+    m_nStyleBeforeFly = m_nLastFormatId = 0;
     m_pStyAttr = 0;
     m_pCurrentStyle = NULL;
-    m_pOutFmtNode = 0;
+    m_pOutFormatNode = 0;
     m_pEscher = 0;
     m_pRedlAuthors = 0;
     m_aTOXArr.clear();
@@ -3052,7 +3052,7 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
     m_aFrames = GetFrames( *m_pDoc, bWriteAll? NULL : m_pOrigPam );
 
     m_nOrigRedlineMode = m_pDoc->getIDocumentRedlineAccess().GetRedlineMode();
-    if ( !m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+    if ( !m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
     {
         //restored to original state by SwWriter::Write
         m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(m_nOrigRedlineMode |
@@ -3136,7 +3136,7 @@ void WW8Export::ExportDocument_Impl()
 
     if( bWrtWW8 )
     {
-        pFib->fWhichTblStm = true;
+        pFib->fWhichTableStm = true;
         xTableStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::a1Table),
             STREAM_STD_WRITE );
         xDataStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::aData),
@@ -3180,29 +3180,29 @@ void WW8Export::ExportDocument_Impl()
     // Default: "Standard"
     pSepx = new WW8_WrPlcSepx( *this );                         // Sections/headers/footers
 
-    pFtn = new WW8_WrPlcFtnEdn( TXT_FTN );                      // Footnotes
-    pEdn = new WW8_WrPlcFtnEdn( TXT_EDN );                      // Endnotes
+    pFootnote = new WW8_WrPlcFootnoteEdn( TXT_FTN );                      // Footnotes
+    pEdn = new WW8_WrPlcFootnoteEdn( TXT_EDN );                      // Endnotes
     m_pAtn = new WW8_WrPlcAnnotations;                                 // PostIts
-    m_pTxtBxs = new WW8_WrPlcTxtBoxes( TXT_TXTBOX );
-    m_pHFTxtBxs = new WW8_WrPlcTxtBoxes( TXT_HFTXTBOX );
+    m_pTextBxs = new WW8_WrPlcTextBoxes( TXT_TXTBOX );
+    m_pHFTextBxs = new WW8_WrPlcTextBoxes( TXT_HFTXTBOX );
 
-    m_pSdrObjs = new MainTxtPlcDrawObj;   // Draw-/Fly-Objects for main text
+    m_pSdrObjs = new MainTextPlcDrawObj;   // Draw-/Fly-Objects for main text
     m_pHFSdrObjs = new HdFtPlcDrawObj;    // Draw-/Fly-Objects for header/footer
 
     m_pBkmks = new WW8_WrtBookmarks;                          // Bookmarks
-    GetWriter().CreateBookmarkTbl();
+    GetWriter().CreateBookmarkTable();
 
     m_pPapPlc = new WW8_WrPlcPn( *this, PAP, pFib->fcMin );
     m_pChpPlc = new WW8_WrPlcPn( *this, CHP, pFib->fcMin );
     pO = new ww::bytes();
     m_pStyles = new MSWordStyles( *this );
-    m_pFldMain = new WW8_WrPlcFld( 2, TXT_MAINTEXT );
-    m_pFldHdFt = new WW8_WrPlcFld( 2, TXT_HDFT );
-    m_pFldFtn = new WW8_WrPlcFld( 2, TXT_FTN );
-    m_pFldEdn = new WW8_WrPlcFld( 2, TXT_EDN );
-    m_pFldAtn = new WW8_WrPlcFld( 2, TXT_ATN );
-    m_pFldTxtBxs = new WW8_WrPlcFld( 2, TXT_TXTBOX );
-    m_pFldHFTxtBxs = new WW8_WrPlcFld( 2, TXT_HFTXTBOX );
+    m_pFieldMain = new WW8_WrPlcField( 2, TXT_MAINTEXT );
+    m_pFieldHdFt = new WW8_WrPlcField( 2, TXT_HDFT );
+    m_pFieldFootnote = new WW8_WrPlcField( 2, TXT_FTN );
+    m_pFieldEdn = new WW8_WrPlcField( 2, TXT_EDN );
+    m_pFieldAtn = new WW8_WrPlcField( 2, TXT_ATN );
+    m_pFieldTextBxs = new WW8_WrPlcField( 2, TXT_TXTBOX );
+    m_pFieldHFTextBxs = new WW8_WrPlcField( 2, TXT_HFTXTBOX );
 
     m_pMagicTable = new WW8_WrMagicTable;
 
@@ -3216,9 +3216,9 @@ void WW8Export::ExportDocument_Impl()
 
     // set AutoHyphenation flag if found in default para style
     const SfxPoolItem* pItem;
-    SwTxtFmtColl* pStdTxtFmtColl =
-        m_pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false);
-    if (pStdTxtFmtColl && SfxItemState::SET == pStdTxtFmtColl->GetItemState(
+    SwTextFormatColl* pStdTextFormatColl =
+        m_pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD, false);
+    if (pStdTextFormatColl && SfxItemState::SET == pStdTextFormatColl->GetItemState(
         RES_PARATR_HYPHENZONE, false, &pItem))
     {
         pDop->fAutoHyphen = static_cast<const SvxHyphenZoneItem*>(pItem)->IsHyphen();
@@ -3267,24 +3267,24 @@ void WW8Export::ExportDocument_Impl()
         pFib->WriteHeader( *pStrmTemp );
     }
 
-    if (m_pUsedNumTbl)           // all used NumRules
+    if (m_pUsedNumTable)           // all used NumRules
     {
         // clear the part of the list array that was copied from the document
         // - it's an auto delete array, so the rest of the array which are
         // duplicated lists that were added during the export will be deleted.
-        m_pUsedNumTbl->erase(m_pUsedNumTbl->begin(), m_pUsedNumTbl->begin() + m_pUsedNumTbl->size() - m_nUniqueList);
-        delete m_pUsedNumTbl;
+        m_pUsedNumTable->erase(m_pUsedNumTable->begin(), m_pUsedNumTable->begin() + m_pUsedNumTable->size() - m_nUniqueList);
+        delete m_pUsedNumTable;
     }
 
     DELETEZ( m_pGrf );
     DELETEZ( m_pMagicTable );
-    DELETEZ( m_pFldFtn );
-    DELETEZ( m_pFldTxtBxs );
-    DELETEZ( m_pFldHFTxtBxs );
-    DELETEZ( m_pFldAtn );
-    DELETEZ( m_pFldEdn );
-    DELETEZ( m_pFldHdFt );
-    DELETEZ( m_pFldMain );
+    DELETEZ( m_pFieldFootnote );
+    DELETEZ( m_pFieldTextBxs );
+    DELETEZ( m_pFieldHFTextBxs );
+    DELETEZ( m_pFieldAtn );
+    DELETEZ( m_pFieldEdn );
+    DELETEZ( m_pFieldHdFt );
+    DELETEZ( m_pFieldMain );
     DELETEZ( m_pStyles );
     DELETEZ( pO );
     DELETEZ( m_pChpPlc );
@@ -3294,11 +3294,11 @@ void WW8Export::ExportDocument_Impl()
     delete m_pRedlAuthors;
     delete m_pSdrObjs;
     delete m_pHFSdrObjs;
-    delete m_pTxtBxs;
-    delete m_pHFTxtBxs;
+    delete m_pTextBxs;
+    delete m_pHFTextBxs;
     delete m_pAtn;
     delete pEdn;
-    delete pFtn;
+    delete pFootnote;
     delete m_pBkmks;
     delete m_pPiece;
     delete pDop;
@@ -3459,17 +3459,17 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM
     : m_aMainStg(sMainStream)
     , m_pISet(0)
     , m_pPiece(NULL)
-    , m_pUsedNumTbl(0)
+    , m_pUsedNumTable(0)
     , m_pTopNodeOfHdFtPage(0)
     , m_pBkmks(0)
     , m_pRedlAuthors(0)
     , m_pOLEExp(0)
     , m_pOCXExp(0)
     , m_pTableInfo(new ww8::WW8TableInfo())
-    , m_nCharFmtStart(0)
-    , m_nFmtCollStart(0)
+    , m_nCharFormatStart(0)
+    , m_nFormatCollStart(0)
     , m_nStyleBeforeFly(0)
-    , m_nLastFmtId(0)
+    , m_nLastFormatId(0)
     , m_nUniqueList(0)
     , m_nHdFtIndex(0)
     , m_nOrigRedlineMode(0)
@@ -3480,27 +3480,27 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM
     , m_pChpIter(0)
     , m_pStyles(NULL)
     , m_pAtn(0)
-    , m_pTxtBxs(0)
-    , m_pHFTxtBxs(0)
+    , m_pTextBxs(0)
+    , m_pHFTextBxs(0)
     , m_pParentFrame(0)
     , m_pFlyOffset(0)
     , m_eNewAnchorType(FLY_AS_CHAR)
-    , m_pFldMain(0)
-    , m_pFldHdFt(0)
-    , m_pFldFtn(0)
-    , m_pFldEdn(0)
-    , m_pFldAtn(0)
-    , m_pFldTxtBxs(0)
-    , m_pFldHFTxtBxs(0)
+    , m_pFieldMain(0)
+    , m_pFieldHdFt(0)
+    , m_pFieldFootnote(0)
+    , m_pFieldEdn(0)
+    , m_pFieldAtn(0)
+    , m_pFieldTextBxs(0)
+    , m_pFieldHFTextBxs(0)
     , m_pMagicTable(0)
     , m_pGrf(0)
     , m_pStyAttr(0)
-    , m_pOutFmtNode(0)
+    , m_pOutFormatNode(0)
     , m_pCurrentStyle(0)
     , m_pSdrObjs(0)
     , m_pHFSdrObjs(0)
     , m_pEscher(0)
-    , m_nTxtTyp(0)
+    , m_nTextTyp(0)
     , m_bStyDef(false)
     , m_bBreakBefore(false)
     , m_bOutKF(false)
@@ -3512,8 +3512,8 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM
     , m_bInWriteEscher(false)
     , m_bStartTOX(false)
     , m_bInWriteTOX(false)
-    , m_bFtnAtTxtEnd(false)
-    , m_bEndAtTxtEnd(false)
+    , m_bFootnoteAtTextEnd(false)
+    , m_bEndAtTextEnd(false)
     , m_bHasHdr(false)
     , m_bHasFtr(false)
     , m_bSubstituteBullets(true)
@@ -3543,7 +3543,7 @@ WW8Export::WW8Export( SwWW8Writer *pWriter,
     , pDataStrm(NULL)
     , pFib(NULL)
     , pDop(NULL)
-    , pFtn(NULL)
+    , pFootnote(NULL)
     , pEdn(NULL)
     , pSepx(NULL)
     , bWrtWW8(bIsWW8)
@@ -3597,70 +3597,70 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_uLong SAL_CALL GetSaveWarningOfMSVBAStorage_
     return SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( rDocS );
 }
 
-bool WW8_WrPlcFtnEdn::WriteTxt( WW8Export& rWrt )
+bool WW8_WrPlcFootnoteEdn::WriteText( WW8Export& rWrt )
 {
     bool bRet = false;
     if (TXT_FTN == nTyp)
     {
-        bRet = WriteGenericTxt( rWrt, TXT_FTN, rWrt.pFib->ccpFtn );
-        rWrt.m_pFldFtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
+        bRet = WriteGenericText( rWrt, TXT_FTN, rWrt.pFib->ccpFootnote );
+        rWrt.m_pFieldFootnote->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
                             rWrt.pFib->ccpText );
     }
     else
     {
-        bRet = WriteGenericTxt( rWrt, TXT_EDN, rWrt.pFib->ccpEdn );
-        rWrt.m_pFldEdn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
-                            rWrt.pFib->ccpText + rWrt.pFib->ccpFtn
+        bRet = WriteGenericText( rWrt, TXT_EDN, rWrt.pFib->ccpEdn );
+        rWrt.m_pFieldEdn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
+                            rWrt.pFib->ccpText + rWrt.pFib->ccpFootnote
                             + rWrt.pFib->ccpHdr + rWrt.pFib->ccpAtn );
     }
     return bRet;
 }
 
-void WW8_WrPlcFtnEdn::WritePlc( WW8Export& rWrt ) const
+void WW8_WrPlcFootnoteEdn::WritePlc( WW8Export& rWrt ) const
 {
     if( TXT_FTN == nTyp )
     {
-        WriteGenericPlc( rWrt, TXT_FTN, rWrt.pFib->fcPlcffndTxt,
-            rWrt.pFib->lcbPlcffndTxt, rWrt.pFib->fcPlcffndRef,
+        WriteGenericPlc( rWrt, TXT_FTN, rWrt.pFib->fcPlcffndText,
+            rWrt.pFib->lcbPlcffndText, rWrt.pFib->fcPlcffndRef,
             rWrt.pFib->lcbPlcffndRef );
     }
     else
     {
-        WriteGenericPlc( rWrt, TXT_EDN, rWrt.pFib->fcPlcfendTxt,
-            rWrt.pFib->lcbPlcfendTxt, rWrt.pFib->fcPlcfendRef,
+        WriteGenericPlc( rWrt, TXT_EDN, rWrt.pFib->fcPlcfendText,
+            rWrt.pFib->lcbPlcfendText, rWrt.pFib->fcPlcfendRef,
             rWrt.pFib->lcbPlcfendRef );
     }
 }
 
-bool WW8_WrPlcAnnotations::WriteTxt( WW8Export& rWrt )
+bool WW8_WrPlcAnnotations::WriteText( WW8Export& rWrt )
 {
-    bool bRet = WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
-    rWrt.m_pFldAtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
-                        rWrt.pFib->ccpText + rWrt.pFib->ccpFtn
+    bool bRet = WriteGenericText( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
+    rWrt.m_pFieldAtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
+                        rWrt.pFib->ccpText + rWrt.pFib->ccpFootnote
                         + rWrt.pFib->ccpHdr );
     return bRet;
 }
 
 void WW8_WrPlcAnnotations::WritePlc( WW8Export& rWrt ) const
 {
-    WriteGenericPlc( rWrt, TXT_ATN, rWrt.pFib->fcPlcfandTxt,
-        rWrt.pFib->lcbPlcfandTxt, rWrt.pFib->fcPlcfandRef,
+    WriteGenericPlc( rWrt, TXT_ATN, rWrt.pFib->fcPlcfandText,
+        rWrt.pFib->lcbPlcfandText, rWrt.pFib->fcPlcfandRef,
         rWrt.pFib->lcbPlcfandRef );
 }
 
-void WW8_WrPlcTxtBoxes::WritePlc( WW8Export& rWrt ) const
+void WW8_WrPlcTextBoxes::WritePlc( WW8Export& rWrt ) const
 {
     if( TXT_TXTBOX == nTyp )
     {
         WriteGenericPlc( rWrt, nTyp, rWrt.pFib->fcPlcftxbxBkd,
-            rWrt.pFib->lcbPlcftxbxBkd, rWrt.pFib->fcPlcftxbxTxt,
-            rWrt.pFib->lcbPlcftxbxTxt );
+            rWrt.pFib->lcbPlcftxbxBkd, rWrt.pFib->fcPlcftxbxText,
+            rWrt.pFib->lcbPlcftxbxText );
     }
     else
     {
         WriteGenericPlc( rWrt, nTyp, rWrt.pFib->fcPlcfHdrtxbxBkd,
-            rWrt.pFib->lcbPlcfHdrtxbxBkd, rWrt.pFib->fcPlcfHdrtxbxTxt,
-            rWrt.pFib->lcbPlcfHdrtxbxTxt );
+            rWrt.pFib->lcbPlcfHdrtxbxBkd, rWrt.pFib->fcPlcfHdrtxbxText,
+            rWrt.pFib->lcbPlcfHdrtxbxText );
     }
 }
 
@@ -3744,7 +3744,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
 
         0x06, 0x08, 0x01,       // sprmCFData
         0x55, 0x08, 0x01,       // sprmCFSpec
-        0x02, 0x08, 0x01        // sprmCFFldVanish
+        0x02, 0x08, 0x01        // sprmCFFieldVanish
     };
     sal_uInt8* pDataAdr = aArr1 + 2;
     Set_UInt32(pDataAdr, nDataStt);
@@ -3760,8 +3760,8 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
         FFDataHeader() : version( 0xFFFFFFFF ), bits(0), cch(0), hps(0) {}
     };
 
-    FFDataHeader aFldHeader;
-    aFldHeader.bits |= (type & 0x03);
+    FFDataHeader aFieldHeader;
+    aFieldHeader.bits |= (type & 0x03);
 
     sal_Int32 ffres = 0; // rFieldmark.GetFFRes();
     if ( pAsCheckbox && pAsCheckbox->IsChecked() )
@@ -3774,7 +3774,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
         else
             ffres = 0;
     }
-    aFldHeader.bits |= ( (ffres<<2) & 0x7C );
+    aFieldHeader.bits |= ( (ffres<<2) & 0x7C );
     if (type == 0) // iTypeText
     {
         sw::mark::IFieldmark::parameter_map_t::const_iterator pParameter = rFieldmark.GetParameters()->find("MaxLength");
@@ -3782,14 +3782,14 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
         {
             OUString aLength;
             pParameter->second >>= aLength;
-            aFldHeader.cch = aLength.toUInt32();
+            aFieldHeader.cch = aLength.toUInt32();
         }
     }
 
     std::vector< OUString > aListItems;
     if (type==2)
     {
-        aFldHeader.bits |= 0x8000; // ffhaslistbox
+        aFieldHeader.bits |= 0x8000; // ffhaslistbox
         const ::sw::mark::IFieldmark::parameter_map_t* const pParameters = rFieldmark.GetParameters();
         ::sw::mark::IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(ODF_FORMDROPDOWN_LISTENTRY);
         if(pListEntries != pParameters->end())
@@ -3807,7 +3807,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
     const OUString ffentrymcr;
     const OUString ffexitmcr;
 
-    const sal_uInt8 aFldData[] =
+    const sal_uInt8 aFieldData[] =
     {
         0x44,0,         // the start of "next" data
         0,0,0,0,0,0,0,0,0,0,                // PIC-Structure!  /10
@@ -3817,8 +3817,8 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
         0,0,0,0,                            // /               /4
     };
    sal_uInt32 slen = sizeof(sal_uInt32)
-        + sizeof(aFldData)
-        + sizeof( aFldHeader.version ) + sizeof( aFldHeader.bits ) + sizeof( aFldHeader.cch ) + sizeof( aFldHeader.hps )
+        + sizeof(aFieldData)
+        + sizeof( aFieldHeader.version ) + sizeof( aFieldHeader.bits ) + sizeof( aFieldHeader.cch ) + sizeof( aFieldHeader.hps )
         + 2*ffname.getLength() + 4
         + 2*ffformat.getLength() + 4
         + 2*ffhelptext.getLength() + 4
@@ -3841,11 +3841,11 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
 
     pDataStrm->WriteUInt32( slen );
 
-    int len = sizeof( aFldData );
-    OSL_ENSURE( len == 0x44-sizeof(sal_uInt32), "SwWW8Writer::WriteFormData(..) - wrong aFldData length" );
-    pDataStrm->Write( aFldData, len );
+    int len = sizeof( aFieldData );
+    OSL_ENSURE( len == 0x44-sizeof(sal_uInt32), "SwWW8Writer::WriteFormData(..) - wrong aFieldData length" );
+    pDataStrm->Write( aFieldData, len );
 
-    pDataStrm->WriteUInt32( aFldHeader.version ).WriteUInt16( aFldHeader.bits ).WriteUInt16( aFldHeader.cch ).WriteUInt16( aFldHeader.hps );
+    pDataStrm->WriteUInt32( aFieldHeader.version ).WriteUInt16( aFieldHeader.bits ).WriteUInt16( aFieldHeader.cch ).WriteUInt16( aFieldHeader.hps );
 
     SwWW8Writer::WriteString_xstz( *pDataStrm, ffname, true ); // Form field name
 
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index b5ac30d395b4..2b7cdff248a6 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -67,29 +67,29 @@ class SvStream;
 class SvxFontItem;
 class SvxBoxItem;
 class SwAttrSet;
-class SwCharFmt;
-class SwCntntNode;
+class SwCharFormat;
+class SwContentNode;
 class SwField;
-class SwFmt;
-class SwFmtCntnt;
-class SwFmtFtn;
-class SwFrmFmt;
+class SwFormat;
+class SwFormatContent;
+class SwFormatFootnote;
+class SwFrameFormat;
 class SwGrfNode;
 class SwModify;
-class SwNumFmt;
+class SwNumFormat;
 class SwNumRule;
-class SwNumRuleTbl;
+class SwNumRuleTable;
 class SwPageDesc;
-class SwFmtPageDesc;
+class SwFormatPageDesc;
 class SwOLENode;
 class SwPostItField;
 class SwRedlineData;
-class SwSectionFmt;
+class SwSectionFormat;
 class SwSectionNode;
 class SwTableNode;
 class SwTOXType;
-class SwTxtFmtColl;
-class SwTxtNode;
+class SwTextFormatColl;
+class SwTextNode;
 class SwWW8WrGrf;
 class SwWW8Writer;
 class MSWordStyles;
@@ -99,13 +99,13 @@ class MSWordAttrIter;
 class WW8_WrFkp;
 class WW8_WrPlc0;
 class WW8_WrPlc1;
-class WW8_WrPlcFld;
+class WW8_WrPlcField;
 class WW8_WrMagicTable;
-class WW8_WrPlcFtnEdn;
+class WW8_WrPlcFootnoteEdn;
 class WW8_WrPlcPn;
 class WW8_WrPlcAnnotations;
 class MSWordSections;
-class WW8_WrPlcTxtBoxes;
+class WW8_WrPlcTextBoxes;
 class WW8_WrPct;            // Verwaltung
 class WW8_WrtBookmarks;
 class WW8_WrtRedlineAuthor;
@@ -140,7 +140,7 @@ namespace nsFieldFlags // for InsertField- Method
     const FieldFlags WRITEFIELD_ALL         = 0xFF;
 }
 
-enum TxtTypes  //enums for TextTypes
+enum TextTypes  //enums for TextTypes
 {
     TXT_MAINTEXT = 0, /*TXT_FTNEDN = 1,*/ TXT_HDFT = 2, TXT_FTN = 3,
     TXT_EDN = 4, TXT_ATN = 5, TXT_TXTBOX = 6, TXT_HFTXTBOX= 7
@@ -159,22 +159,22 @@ enum FlyProcessingState
 struct WW8_SepInfo
 {
     const SwPageDesc* pPageDesc;
-    const SwSectionFmt* pSectionFmt;
+    const SwSectionFormat* pSectionFormat;
     const SwNode* pPDNd;
-    const SwTxtNode* pNumNd;
+    const SwTextNode* pNumNd;
     sal_uLong  nLnNumRestartNo;
     ::boost::optional<sal_uInt16> oPgRestartNo;
     bool bIsFirstParagraph;
 
     WW8_SepInfo()
-        : pPageDesc(0), pSectionFmt(0), pPDNd(0), pNumNd(0), nLnNumRestartNo(0), bIsFirstParagraph(false)
+        : pPageDesc(0), pSectionFormat(0), pPDNd(0), pNumNd(0), nLnNumRestartNo(0), bIsFirstParagraph(false)
 
     {}
 
-    WW8_SepInfo( const SwPageDesc* pPD, const SwSectionFmt* pFmt,
+    WW8_SepInfo( const SwPageDesc* pPD, const SwSectionFormat* pFormat,
                  sal_uLong nLnRestart, ::boost::optional<sal_uInt16> oPgRestart = boost::none,
                  const SwNode* pNd = NULL, bool bIsFirstPara = false )
-        : pPageDesc( pPD ), pSectionFmt( pFmt ), pPDNd( pNd ), pNumNd( 0 ),
+        : pPageDesc( pPD ), pSectionFormat( pFormat ), pPDNd( pNd ), pNumNd( 0 ),
           nLnNumRestartNo( nLnRestart ), oPgRestartNo( oPgRestart ),
           bIsFirstParagraph( bIsFirstPara )
     {}
@@ -204,14 +204,14 @@ public:
     virtual bool HeaderFooterWritten();
 
     void AppendSection( const SwPageDesc* pPd,
-                    const SwSectionFmt* pSectionFmt = 0,
+                    const SwSectionFormat* pSectionFormat = 0,
                     sal_uLong nLnNumRestartNo = 0,
                     bool bIsFirstParagraph = false );
-    void AppendSection( const SwFmtPageDesc& rPd,
+    void AppendSection( const SwFormatPageDesc& rPd,
                     const SwNode& rNd,
-                    const SwSectionFmt* pSectionFmt,
+                    const SwSectionFormat* pSectionFormat,
                     sal_uLong nLnNumRestartNo );
-    void SetNum( const SwTxtNode* pNumNd );
+    void SetNum( const SwTextNode* pNumNd );
 
     /// Number of columns based on the most recent WW8_SepInfo.
     sal_uInt16 CurrentNumberOfColumns( const SwDoc &rDoc ) const;
@@ -224,13 +224,13 @@ public:
     /// The most recent WW8_SepInfo.
     const WW8_SepInfo* CurrentSectionInfo();
 
-    static void SetHeaderFlag( sal_uInt8& rHeadFootFlags, const SwFmt& rFmt,
+    static void SetHeaderFlag( sal_uInt8& rHeadFootFlags, const SwFormat& rFormat,
                                   sal_uInt8 nFlag );
-    static void SetFooterFlag( sal_uInt8& rHeadFootFlags, const SwFmt& rFmt,
+    static void SetFooterFlag( sal_uInt8& rHeadFootFlags, const SwFormat& rFormat,
                                    sal_uInt8 nFlag );
 
     /// Should we output borders?
-    static bool HasBorderItem( const SwFmt& rFmt );
+    static bool HasBorderItem( const SwFormat& rFormat );
 };
 
 class WW8_WrPlcSepx : public MSWordSections
@@ -239,7 +239,7 @@ class WW8_WrPlcSepx : public MSWordSections
     ::std::vector< ::boost::shared_ptr<WW8_PdAttrDesc> > m_SectionAttributes;
     // hack to prevent adding sections in endnotes
     bool m_bHeaderFooterWritten;
-    WW8_WrPlc0* pTxtPos;        // Pos der einzelnen Header / Footer
+    WW8_WrPlc0* pTextPos;        // Pos der einzelnen Header / Footer
 
     WW8_WrPlcSepx( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION;
     WW8_WrPlcSepx& operator=( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION;
@@ -252,24 +252,24 @@ public:
 
     void AppendSep( WW8_CP nStartCp,
                     const SwPageDesc* pPd,
-                    const SwSectionFmt* pSectionFmt = 0,
+                    const SwSectionFormat* pSectionFormat = 0,
                     sal_uLong nLnNumRestartNo = 0 );
-    void AppendSep( WW8_CP nStartCp, const SwFmtPageDesc& rPd,
+    void AppendSep( WW8_CP nStartCp, const SwFormatPageDesc& rPd,
                     const SwNode& rNd,
-                    const SwSectionFmt* pSectionFmt,
+                    const SwSectionFormat* pSectionFormat,
                     sal_uLong nLnNumRestartNo );
     void Finish( WW8_CP nEndCp ) { aCps.push_back( nEndCp ); }
 
-    bool WriteKFTxt( WW8Export& rWrt );
+    bool WriteKFText( WW8Export& rWrt );
     void WriteSepx( SvStream& rStrm ) const;
     void WritePlcSed( WW8Export& rWrt ) const;
     void WritePlcHdd( WW8Export& rWrt ) const;
 
 private:
-    void WriteFtnEndTxt( WW8Export& rWrt, sal_uLong nCpStt );
+    void WriteFootnoteEndText( WW8Export& rWrt, sal_uLong nCpStt );
 public:
     void OutHeaderFooter(WW8Export& rWrt, bool bHeader,
-            const SwFmt& rFmt, sal_uLong& rCpPos, sal_uInt8 nHFFlags, sal_uInt8 nFlag,  sal_uInt8 nBreakCode);
+            const SwFormat& rFormat, sal_uLong& rCpPos, sal_uInt8 nHFFlags, sal_uInt8 nFlag,  sal_uInt8 nBreakCode);
 };
 
 // class WW8_WrPct to construct the piece table
@@ -341,17 +341,17 @@ class DrawObj
 {
 public:
     WW8_CP mnCp;                // CP-Pos of references
-    sal_uInt32 mnShapeId;       // ShapeId for the SwFrmFmts
-    sw::Frame maCntnt;          // the frame itself
+    sal_uInt32 mnShapeId;       // ShapeId for the SwFrameFormats
+    sw::Frame maContent;          // the frame itself
     Point maParentPos;          // Points
     sal_Int32 mnThick;          // Border Thicknesses
     short mnDirection;          // If BiDi or not
     unsigned int mnHdFtIndex;   // 0 for main text, +1 for each subsequent
                                 // msword hd/ft
 
-    DrawObj(const sw::Frame &rCntnt, WW8_CP nCp, Point aParentPos, short nDir,
+    DrawObj(const sw::Frame &rContent, WW8_CP nCp, Point aParentPos, short nDir,
             unsigned int nHdFtIndex)
-        : mnCp(nCp), mnShapeId(0), maCntnt(rCntnt), maParentPos(aParentPos),
+        : mnCp(nCp), mnShapeId(0), maContent(rContent), maParentPos(aParentPos),
         mnThick(0), mnDirection(nDir), mnHdFtIndex(nHdFtIndex) {}
     void SetShapeDetails(sal_uInt32 nId, sal_Int32 nThick);
     DrawObj& operator=(const DrawObj &rOther);
@@ -374,7 +374,7 @@ protected:
 public:
     PlcDrawObj() {}
     void WritePlc( WW8Export& rWrt ) const;
-    bool Append( WW8Export&, WW8_CP nCp, const sw::Frame& rFmt,
+    bool Append( WW8Export&, WW8_CP nCp, const sw::Frame& rFormat,
         const Point& rNdTopLeft );
     int size() { return maDrawObjs.size(); };
     DrawObjVector &GetObjArr() { return maDrawObjs; }
@@ -384,17 +384,17 @@ private:
     PlcDrawObj& operator=(const PlcDrawObj&) SAL_DELETED_FUNCTION;
 };
 
-class MainTxtPlcDrawObj : public PlcDrawObj
+class MainTextPlcDrawObj : public PlcDrawObj
 {
 public:
-    MainTxtPlcDrawObj() {}
+    MainTextPlcDrawObj() {}
 private:
     virtual void RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart,
         sal_uInt32 nLen) const SAL_OVERRIDE;
     virtual WW8_CP GetCpOffset(const WW8Fib &) const SAL_OVERRIDE;
 private:
-    MainTxtPlcDrawObj(const MainTxtPlcDrawObj&) SAL_DELETED_FUNCTION;
-    MainTxtPlcDrawObj& operator=(const MainTxtPlcDrawObj&) SAL_DELETED_FUNCTION;
+    MainTextPlcDrawObj(const MainTextPlcDrawObj&) SAL_DELETED_FUNCTION;
+    MainTextPlcDrawObj& operator=(const MainTextPlcDrawObj&) SAL_DELETED_FUNCTION;
 };
 
 class HdFtPlcDrawObj : public PlcDrawObj
@@ -437,7 +437,7 @@ struct MSWordSaveData
     RndStdIds eOldAnchorType;
     ww::bytes* pOOld;                ///< WW8Export only
     SwPaM* pOldPam, *pOldEnd;
-    const sw::Frame* pOldFlyFmt;
+    const sw::Frame* pOldFlyFormat;
     const SwPageDesc* pOldPageDesc;
 
     bool bOldWriteAll : 1;          ///< WW8Export only
@@ -461,8 +461,8 @@ public:
     std::vector<const SwTOXType*> m_aTOXArr;
     const SfxItemSet* m_pISet;    // fuer Doppel-Attribute
     WW8_WrPct*  m_pPiece;         // Pointer auf Piece-Table
-    SwNumRuleTbl* m_pUsedNumTbl;  // alle used NumRules
-    const SwTxtNode *m_pTopNodeOfHdFtPage; ///< Top node of host page when in hd/ft
+    SwNumRuleTable* m_pUsedNumTable;  // alle used NumRules
+    const SwTextNode *m_pTopNodeOfHdFtPage; ///< Top node of host page when in hd/ft
     std::map< sal_uInt16, sal_uInt16 > m_aRuleDuplicates; //map to Duplicated numrules
     std::stack< sal_Int32 > m_aCurrentCharPropStarts; ///< To remember the position in a run.
     WW8_WrtBookmarks* m_pBkmks;
@@ -473,11 +473,11 @@ public:
     WW8OleMap m_aOleMap;    // To remember all already exported ole objects
     ww8::WW8TableInfo::Pointer_t m_pTableInfo;
 
-    sal_uInt16 m_nCharFmtStart;
-    sal_uInt16 m_nFmtCollStart;
+    sal_uInt16 m_nCharFormatStart;
+    sal_uInt16 m_nFormatCollStart;
     sal_uInt16 m_nStyleBeforeFly;     ///< Style-Nummer des Nodes,
                                 ///<       in/an dem ein Fly verankert ist
-    sal_uInt16 m_nLastFmtId;          ///< Style of last TxtNode in normal range
+    sal_uInt16 m_nLastFormatId;          ///< Style of last TextNode in normal range
     sal_uInt16 m_nUniqueList;         ///< current number for creating unique list names
     unsigned int m_nHdFtIndex;
 
@@ -494,7 +494,7 @@ public:
     MSWordAttrIter* m_pChpIter;
     MSWordStyles* m_pStyles;
     WW8_WrPlcAnnotations* m_pAtn;
-    WW8_WrPlcTxtBoxes *m_pTxtBxs, *m_pHFTxtBxs;
+    WW8_WrPlcTextBoxes *m_pTextBxs, *m_pHFTextBxs;
 
     const sw::Frame *m_pParentFrame; // If set we are exporting content inside
                                     // a frame, e.g. a graphic node
@@ -503,30 +503,30 @@ public:
     RndStdIds m_eNewAnchorType;       // Zeichen gebundenen Flys, der im WW
                                     // Absatzgebunden wird.
 
-    WW8_WrPlcFld* m_pFldMain;         // fields in MainText
-    WW8_WrPlcFld* m_pFldHdFt;         // fields in Header/Footer
-    WW8_WrPlcFld* m_pFldFtn;          // fields in FootNotes
-    WW8_WrPlcFld* m_pFldEdn;          // fields in EndNotes
-    WW8_WrPlcFld* m_pFldAtn;          // fields in Annotations
-    WW8_WrPlcFld* m_pFldTxtBxs;       // fields in textboxes
-    WW8_WrPlcFld* m_pFldHFTxtBxs;     // fields in header/footer textboxes
+    WW8_WrPlcField* m_pFieldMain;         // fields in MainText
+    WW8_WrPlcField* m_pFieldHdFt;         // fields in Header/Footer
+    WW8_WrPlcField* m_pFieldFootnote;          // fields in FootNotes
+    WW8_WrPlcField* m_pFieldEdn;          // fields in EndNotes
+    WW8_WrPlcField* m_pFieldAtn;          // fields in Annotations
+    WW8_WrPlcField* m_pFieldTextBxs;       // fields in textboxes
+    WW8_WrPlcField* m_pFieldHFTextBxs;     // fields in header/footer textboxes
     WW8_WrMagicTable *m_pMagicTable;  // keeps track of table cell positions, and
                                     // marks those that contain graphics,
                                     // which is required to make word display
                                     // graphics inside tables
     SwWW8WrGrf* m_pGrf;
     const SwAttrSet* m_pStyAttr;      // StyleAttr for Tabs
-    const SwModify* m_pOutFmtNode;    // write Format or Node
-    const SwFmt *m_pCurrentStyle;     // iff bStyDef=true, then this store the current style
+    const SwModify* m_pOutFormatNode;    // write Format or Node
+    const SwFormat *m_pCurrentStyle;     // iff bStyDef=true, then this store the current style
 
-    MainTxtPlcDrawObj *m_pSdrObjs;   // Draw-/Fly-Objects
+    MainTextPlcDrawObj *m_pSdrObjs;   // Draw-/Fly-Objects
     HdFtPlcDrawObj *m_pHFSdrObjs;     // Draw-/Fly-Objects in header or footer
 
     SwEscherEx* m_pEscher;            // escher export class
     // #i43447# - removed
 //    SwTwips nFlyWidth, nFlyHeight;  // Fuer Anpassung Graphic
 
-    sal_uInt8 m_nTxtTyp;
+    sal_uInt8 m_nTextTyp;
 
     bool m_bStyDef : 1;           // should Style be written?
     bool m_bBreakBefore : 1;      // Breaks are being written 2 times
@@ -540,8 +540,8 @@ public:
     bool m_bInWriteEscher : 1;    // in write textboxes
     bool m_bStartTOX : 1;         // true: a TOX is startet
     bool m_bInWriteTOX : 1;       // true: all content are in a TOX
-    bool m_bFtnAtTxtEnd : 1;      // true: all FTN at Textend
-    bool m_bEndAtTxtEnd : 1;      // true: all END at Textend
+    bool m_bFootnoteAtTextEnd : 1;      // true: all FTN at Textend
+    bool m_bEndAtTextEnd : 1;      // true: all END at Textend
     bool m_bHasHdr : 1;
     bool m_bHasFtr : 1;
     bool m_bSubstituteBullets : 1; // true: SubstituteBullet() gets called
@@ -588,10 +588,10 @@ public:
     sal_uInt16 GetId( const SwNumRule& rNumRule );
 
     /// Return the numeric id of the style.
-    sal_uInt16 GetId( const SwTxtFmtColl& rColl ) const;
+    sal_uInt16 GetId( const SwTextFormatColl& rColl ) const;
 
     /// Return the numeric id of the style.
-    sal_uInt16 GetId( const SwCharFmt* pFmt ) const;
+    sal_uInt16 GetId( const SwCharFormat* pFormat ) const;
 
     sal_uInt16 GetId( const SwTOXType& rTOXType );
 
@@ -618,12 +618,12 @@ public:
     void AppendWordBookmark( const OUString& rName );
 
     /// Use OutputItem() on an item set according to the parameters.
-    void OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool bChpFmt, sal_uInt16 nScript, bool bExportParentItemSet );
+    void OutputItemSet( const SfxItemSet& rSet, bool bPapFormat, bool bChpFormat, sal_uInt16 nScript, bool bExportParentItemSet );
 
     short GetDefaultFrameDirection( ) const;
 
     /// Right to left?
-    short TrueFrameDirection( const SwFrmFmt& rFlyFmt ) const;
+    short TrueFrameDirection( const SwFrameFormat& rFlyFormat ) const;
 
     /// Right to left?
     short GetCurrentPageDirection() const;
@@ -671,14 +671,14 @@ public:
     /// has two
     virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) = 0;
 
-    virtual void AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) = 0;
+    virtual void AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) = 0;
 
     virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) = 0;
 
-    virtual void AppendAnnotationMarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) = 0;
+    virtual void AppendAnnotationMarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) = 0;
 
     //For i120928,add this interface to export graphic of bullet
-    virtual void ExportGrfBullet(const SwTxtNode& rNd) = 0;
+    virtual void ExportGrfBullet(const SwTextNode& rNd) = 0;
 
     // FIXME probably a hack...
     virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() ) = 0;
@@ -688,7 +688,7 @@ public:
     virtual void WriteChar( sal_Unicode c ) = 0;
 
     /// Output attributes.
-    void OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpFmt, bool bFlyFmt = false );
+    void OutputFormat( const SwFormat& rFormat, bool bPapFormat, bool bChpFormat, bool bFlyFormat = false );
 
     /// Getter for pISet.
     const SfxItemSet* GetCurItemSet() const { return m_pISet; }
@@ -704,13 +704,13 @@ public:
 
     /// The return value indicates, if a follow page desc is written.
     bool OutputFollowPageDesc( const SfxItemSet* pSet,
-                               const SwTxtNode* pNd );
+                               const SwTextNode* pNd );
 
     /// Write header/footer text.
-    void WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader);
+    void WriteHeaderFooterText( const SwFormat& rFormat, bool bHeader);
 
     /// Format of the section.
-    static const SwSectionFmt* GetSectionFormat( const SwNode& rNd );
+    static const SwSectionFormat* GetSectionFormat( const SwNode& rNd );
 
     /// Line number of the section start.
     static sal_uLong GetSectionLineNo( const SfxItemSet* pSet, const SwNode& rNd );
@@ -743,19 +743,19 @@ public:
     virtual void SetupSectionPositions( WW8_PdAttrDesc* /*pA*/ ) {}
 
     /// Top node of host page when in header/footer.
-    void SetHdFtPageRoot( const SwTxtNode *pNd ) { m_pTopNodeOfHdFtPage = pNd; }
+    void SetHdFtPageRoot( const SwTextNode *pNd ) { m_pTopNodeOfHdFtPage = pNd; }
 
     /// Top node of host page when in header/footer.
-    const SwTxtNode *GetHdFtPageRoot() const { return m_pTopNodeOfHdFtPage; }
+    const SwTextNode *GetHdFtPageRoot() const { return m_pTopNodeOfHdFtPage; }
 
     /// Output the actual headers and footers.
     virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
-            const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt,
+            const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat,
         sal_uInt8 nBreakCode) = 0;
 
     /// Write the field
-    virtual void OutputField( const SwField* pFld, ww::eField eFldType,
-            const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) = 0;
+    virtual void OutputField( const SwField* pField, ww::eField eFieldType,
+            const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) = 0;
 
     /// Write the data of the form field
     virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) = 0;
@@ -767,12 +767,12 @@ public:
                     const OUString &rSelected,
                     com::sun::star::uno::Sequence<OUString> &rListItems) = 0;
 
-    virtual void DoFormText(const SwInputField * pFld) = 0;
+    virtual void DoFormText(const SwInputField * pField) = 0;
 
     static bool NoPageBreakSection( const SfxItemSet *pSet );
 
     // Compute the number format for WW dates
-    bool GetNumberFmt(const SwField& rFld, OUString& rStr);
+    bool GetNumberFormat(const SwField& rField, OUString& rStr);
 
     virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) = 0;
 
@@ -786,13 +786,13 @@ protected:
     virtual void ExportDocument_Impl() = 0;
 
     /// Get the next position in the text node to output
-    sal_Int32 GetNextPos( SwWW8AttrIter* pAttrIter, const SwTxtNode& rNode, sal_Int32 nAktPos );
+    sal_Int32 GetNextPos( SwWW8AttrIter* pAttrIter, const SwTextNode& rNode, sal_Int32 nAktPos );
 
     /// Update the information for GetNextPos().
     void UpdatePosition( SwWW8AttrIter* pAttrIter, sal_Int32 nAktPos, sal_Int32 nEnd );
 
-    /// Output SwTxtNode
-    virtual void OutputTextNode( const SwTxtNode& );
+    /// Output SwTextNode
+    virtual void OutputTextNode( const SwTextNode& );
 
     /// Setup the chapter fields (maChapterFieldLocs).
     void GatherChapterFields();
@@ -801,18 +801,18 @@ protected:
     void CollectOutlineBookmarks( const SwDoc &rDoc );
 
     bool SetAktPageDescFromNode(const SwNode &rNd);
-    bool CntntContainsChapterField(const SwFmtCntnt &rCntnt) const;
-    bool FmtHdFtContainsChapterField(const SwFrmFmt &rFmt) const;
+    bool ContentContainsChapterField(const SwFormatContent &rContent) const;
+    bool FormatHdFtContainsChapterField(const SwFrameFormat &rFormat) const;
 
-    virtual void SectionBreaksAndFrames( const SwTxtNode& rNode ) = 0;
+    virtual void SectionBreaksAndFrames( const SwTextNode& rNode ) = 0;
 
     virtual void PrepareNewPageDesc( const SfxItemSet* pSet,
                                      const SwNode& rNd,
-                                     const SwFmtPageDesc* pNewPgDescFmt = 0,
+                                     const SwFormatPageDesc* pNewPgDescFormat = 0,
                                      const SwPageDesc* pNewPgDesc = 0 ) = 0;
 
     /// Return value indicates if an inherited outline numbering is suppressed.
-    virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt) = 0;
+    virtual bool DisallowInheritingOutlineNumbering(const SwFormat &rFormat) = 0;
 
     /// Output SwStartNode
     void OutputStartNode( const SwStartNode& );
@@ -831,21 +831,21 @@ protected:
     /// Output SwSectionNode
     void OutputSectionNode( const SwSectionNode& );
 
-    virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) = 0;
+    virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) = 0;
 
     /// Call the right (virtual) function according to the type of the item.
     ///
     /// One of OutputTextNode(), OutputGrfNode(), or OutputOLENode()
-    void OutputContentNode( const SwCntntNode& );
+    void OutputContentNode( const SwContentNode& );
 
     /// Find the nearest bookmark from the current position.
     ///
     /// Returns false when there is no bookmark.
     bool NearestBookmark( sal_Int32& rNearest, const sal_Int32 nAktPos, bool bNextPositionOnly );
 
-    void GetSortedBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen );
+    void GetSortedBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen );
 
-    bool GetBookmarks( const SwTxtNode& rNd, sal_Int32 nStt, sal_Int32 nEnd,
+    bool GetBookmarks( const SwTextNode& rNd, sal_Int32 nStt, sal_Int32 nEnd,
             IMarkVector& rArr );
 
     /// Find the nearest annotation mark from the current position.
@@ -853,9 +853,9 @@ protected:
     /// Returns false when there is no annotation mark.
     bool NearestAnnotationMark( sal_Int32& rNearest, const sal_Int32 nAktPos, bool bNextPositionOnly );
 
-    void GetSortedAnnotationMarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen );
+    void GetSortedAnnotationMarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen );
 
-    bool GetAnnotationMarks( const SwTxtNode& rNd, sal_Int32 nStt, sal_Int32 nEnd,
+    bool GetAnnotationMarks( const SwTextNode& rNd, sal_Int32 nStt, sal_Int32 nEnd,
             IMarkVector& rArr );
 
     const NfKeywordTable & GetNfKeywordTable();
@@ -947,8 +947,8 @@ public:
 
     WW8Fib* pFib;                       ///< File Information Block
     WW8Dop* pDop;                       ///< DOcument Properties
-    WW8_WrPlcFtnEdn *pFtn;              ///< Footnotes - structure to remember them, and output
-    WW8_WrPlcFtnEdn *pEdn;              ///< Endnotes - structure to remember them, and output
+    WW8_WrPlcFootnoteEdn *pFootnote;              ///< Footnotes - structure to remember them, and output
+    WW8_WrPlcFootnoteEdn *pEdn;              ///< Endnotes - structure to remember them, and output
     WW8_WrPlcSepx* pSepx;               ///< Sections/headers/footers
 
     bool bWrtWW8 : 1;                   ///< Write WW95 (false) or WW97 (true) file format
@@ -988,9 +988,9 @@ private:
     void StoreDoc1();
     void Out_WwNumLvl( sal_uInt8 nWwLevel );
     void BuildAnlvBulletBase( WW8_ANLV& rAnlv, sal_uInt8*& rpCh, sal_uInt16& rCharLen,
-                              const SwNumFmt& rFmt );
+                              const SwNumFormat& rFormat );
     static void BuildAnlvBase( WW8_ANLV& rAnlv, sal_uInt8*& rpCh, sal_uInt16& rCharLen,
-                   const SwNumRule& rRul, const SwNumFmt& rFmt, sal_uInt8 nSwLevel );
+                   const SwNumRule& rRul, const SwNumFormat& rFormat, sal_uInt8 nSwLevel );
 
     /// Output the numbering table.
     virtual void WriteNumbering() SAL_OVERRIDE;
@@ -1012,10 +1012,10 @@ public:
     virtual void SetupSectionPositions( WW8_PdAttrDesc* pA ) SAL_OVERRIDE;
 
     void Out_SwNumLvl( sal_uInt8 nSwLevel );
-    void Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt,
+    void Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFormat& rFormat,
                           sal_uInt8 nSwLevel );
 
-    bool MiserableFormFieldExportHack(const SwFrmFmt& rFrmFmt);
+    bool MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat);
 
     SvxMSExportOLEObjects& GetOLEExp()      { return *m_pOLEExp; }
     SwMSConvertControls& GetOCXExp()        { return *m_pOCXExp; }
@@ -1024,27 +1024,27 @@ public:
 
     sal_uInt16 AddRedlineAuthor( sal_uInt16 nId );
 
-    void WriteFtnBegin( const SwFmtFtn& rFtn, ww::bytes* pO = 0 );
+    void WriteFootnoteBegin( const SwFormatFootnote& rFootnote, ww::bytes* pO = 0 );
     void WritePostItBegin( ww::bytes* pO = 0 );
     const SvxBrushItem* GetCurrentPageBgBrush() const;
-    SvxBrushItem TrueFrameBgBrush(const SwFrmFmt &rFlyFmt) const;
+    SvxBrushItem TrueFrameBgBrush(const SwFrameFormat &rFlyFormat) const;
 
     /// Output all textframes anchored as character for the winword 7- format.
-    void OutWW6FlyFrmsInCntnt( const SwTxtNode& rNd );
+    void OutWW6FlyFrmsInContent( const SwTextNode& rNd );
 
-    void AppendFlyInFlys(const sw::Frame& rFrmFmt, const Point& rNdTopLeft);
+    void AppendFlyInFlys(const sw::Frame& rFrameFormat, const Point& rNdTopLeft);
     void WriteOutliner(const OutlinerParaObject& rOutliner, sal_uInt8 nTyp);
     void WriteSdrTextObj(const SdrTextObj& rObj, sal_uInt8 nTyp);
 
-    sal_uInt32 GetSdrOrdNum( const SwFrmFmt& rFmt ) const;
+    sal_uInt32 GetSdrOrdNum( const SwFrameFormat& rFormat ) const;
     void CreateEscher();
     void WriteEscher();
 
-    bool Out_SwNum(const SwTxtNode* pNd);
+    bool Out_SwNum(const SwTextNode* pNd);
 
     /// Write the field
-    virtual void OutputField( const SwField* pFld, ww::eField eFldType,
-            const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE;
+    virtual void OutputField( const SwField* pField, ww::eField eFieldType,
+            const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE;
 
     void StartCommentOutput( const OUString& rName );
     void EndCommentOutput(   const OUString& rName );
@@ -1052,12 +1052,12 @@ public:
     bool TestOleNeedsGraphic(const SwAttrSet& rSet, tools::SvRef<SotStorage> xOleStg,
         tools::SvRef<SotStorage> xObjStg, OUString &rStorageName, SwOLENode *pOLENd);
 
-    virtual void AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
+    virtual void AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
     virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE;
 
-    virtual void AppendAnnotationMarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
+    virtual void AppendAnnotationMarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
 
-    virtual void ExportGrfBullet(const SwTxtNode& rNd) SAL_OVERRIDE;
+    virtual void ExportGrfBullet(const SwTextNode& rNd) SAL_OVERRIDE;
     void OutGrfBullets(const sw::Frame &rFrame);
 
     void MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo);
@@ -1082,21 +1082,21 @@ public:
 
     inline bool IsUnicode() const           { return m_pPiece->IsUnicode(); }
 
-    virtual void SectionBreaksAndFrames( const SwTxtNode& rNode ) SAL_OVERRIDE;
+    virtual void SectionBreaksAndFrames( const SwTextNode& rNode ) SAL_OVERRIDE;
 
     /// Helper method for OutputSectionBreaks() and OutputFollowPageDesc().
     // #i76300#
     virtual void PrepareNewPageDesc( const SfxItemSet* pSet,
                                      const SwNode& rNd,
-                                     const SwFmtPageDesc* pNewPgDescFmt = 0,
+                                     const SwFormatPageDesc* pNewPgDescFormat = 0,
                                      const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE;
 
     void Out_BorderLine(ww::bytes& rO, const ::editeng::SvxBorderLine* pLine,
         sal_uInt16 nDist, sal_uInt16 nSprmNo, sal_uInt16 nSprmNoVer9,
         bool bShadow);
 
-    void Out_SwFmtBox(const SvxBoxItem& rBox, bool bShadow);
-    void Out_SwFmtTableBox( ww::bytes& rO, const SvxBoxItem * rBox );
+    void Out_SwFormatBox(const SvxBoxItem& rBox, bool bShadow);
+    void Out_SwFormatTableBox( ww::bytes& rO, const SvxBoxItem * rBox );
     void Out_CellRangeBorders(const SvxBoxItem * pBox, sal_uInt8 nStart,
         sal_uInt8 nLimit);
     bool TransBrush(const Color& rCol, WW8_SHD& rShd);
@@ -1104,7 +1104,7 @@ public:
         sal_uInt16 nDist, bool bShadow);
 
     // #i77805# - new return value indicates, if an inherited outline numbering is suppressed
-    virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt) SAL_OVERRIDE;
+    virtual bool DisallowInheritingOutlineNumbering(const SwFormat &rFormat) SAL_OVERRIDE;
 
     unsigned int GetHdFtIndex() const { return m_nHdFtIndex; }
     void SetHdFtIndex(unsigned int nHdFtIndex) { m_nHdFtIndex = nHdFtIndex; }
@@ -1123,8 +1123,8 @@ public:
     SwTwips CurrentPageWidth(SwTwips &rLeft, SwTwips &rRight) const;
 
     /// Nasty swap for bidi if necessary
-    bool MiserableRTLFrmFmtHack(SwTwips &rLeft, SwTwips &rRight,
-        const sw::Frame &rFrmFmt);
+    bool MiserableRTLFrameFormatHack(SwTwips &rLeft, SwTwips &rRight,
+        const sw::Frame &rFrameFormat);
 
     void InsUInt16( sal_uInt16 n )      { SwWW8Writer::InsUInt16( *pO, n ); }
     void InsUInt32( sal_uInt32 n )      { SwWW8Writer::InsUInt32( *pO, n ); }
@@ -1132,7 +1132,7 @@ public:
                         { SwWW8Writer::InsAsString16( *pO, rStr ); }
     void InsAsString8( const OUString& rStr, rtl_TextEncoding eCodeSet )
                         { SwWW8Writer::InsAsString8( *pO, rStr, eCodeSet ); }
-    void WriteStringAsPara( const OUString& rTxt, sal_uInt16 nStyleId = 0 );
+    void WriteStringAsPara( const OUString& rText, sal_uInt16 nStyleId = 0 );
 
     /// Setup the exporter.
     WW8Export( SwWW8Writer *pWriter,
@@ -1146,7 +1146,7 @@ public:
                     const OUString &rSelected,
                     com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE;
 
-    virtual void DoFormText(const SwInputField * pFld) SAL_OVERRIDE;
+    virtual void DoFormText(const SwInputField * pField) SAL_OVERRIDE;
 
     void GetCurrentItems(ww::bytes &rItems) const;
 
@@ -1155,7 +1155,7 @@ public:
     virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
 
     /// Fields.
-    WW8_WrPlcFld* CurrentFieldPlc() const;
+    WW8_WrPlcField* CurrentFieldPlc() const;
 
     SwWW8Writer& GetWriter() const { return *m_pWriter; }
     SvStream& Strm() const { return m_pWriter->Strm(); }
@@ -1168,7 +1168,7 @@ public:
 
     /// Output the actual headers and footers.
     virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
-            const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt,
+            const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat,
         sal_uInt8 nBreakCode) SAL_OVERRIDE;
 
 protected:
@@ -1180,7 +1180,7 @@ protected:
 
     virtual void OutputLinkedOLE( const OUString& ) SAL_OVERRIDE;
 
-    virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) SAL_OVERRIDE;
+    virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) SAL_OVERRIDE;
 
 private:
     WW8Export(const WW8Export&) SAL_DELETED_FUNCTION;
@@ -1194,35 +1194,35 @@ private:
     WW8_WrPlcSubDoc& operator=(const WW8_WrPlcSubDoc&) SAL_DELETED_FUNCTION;
 protected:
     std::vector<WW8_CP> aCps;
-    std::vector<const void*> aCntnt;                // PTRARR of SwFmtFtn/PostIts/..
-    std::vector<const SwFrmFmt*> aSpareFmts;        //a backup for aCntnt: if there's no SdrObject, stores the fmt directly here
-    WW8_WrPlc0* pTxtPos;            // positions of the individual texts
+    std::vector<const void*> aContent;                // PTRARR of SwFormatFootnote/PostIts/..
+    std::vector<const SwFrameFormat*> aSpareFormats;        //a backup for aContent: if there's no SdrObject, stores the fmt directly here
+    WW8_WrPlc0* pTextPos;            // positions of the individual texts
 
     WW8_WrPlcSubDoc();
     virtual ~WW8_WrPlcSubDoc();
 
-    bool WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp, WW8_CP& rCount );
-    void WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, WW8_FC& rTxtStt,
-        sal_Int32& rTxtCnt, WW8_FC& rRefStt, sal_Int32& rRefCnt ) const;
+    bool WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp, WW8_CP& rCount );
+    void WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, WW8_FC& rTextStt,
+        sal_Int32& rTextCnt, WW8_FC& rRefStt, sal_Int32& rRefCnt ) const;
 
     virtual const std::vector<sal_uInt32>* GetShapeIdArr() const;
 };
 
 // double Plc for Footnotes/Endnotes
-class WW8_WrPlcFtnEdn : public WW8_WrPlcSubDoc
+class WW8_WrPlcFootnoteEdn : public WW8_WrPlcSubDoc
 {
 private:
     sal_uInt8 nTyp;
 
-    WW8_WrPlcFtnEdn(const WW8_WrPlcFtnEdn&) SAL_DELETED_FUNCTION;
-    WW8_WrPlcFtnEdn& operator=(WW8_WrPlcFtnEdn &) SAL_DELETED_FUNCTION;
+    WW8_WrPlcFootnoteEdn(const WW8_WrPlcFootnoteEdn&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcFootnoteEdn& operator=(WW8_WrPlcFootnoteEdn &) SAL_DELETED_FUNCTION;
 public:
-    WW8_WrPlcFtnEdn( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {}
+    WW8_WrPlcFootnoteEdn( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {}
 
-    bool WriteTxt( WW8Export& rWrt );
+    bool WriteText( WW8Export& rWrt );
     void WritePlc( WW8Export& rWrt ) const;
 
-    void Append( WW8_CP nCp, const SwFmtFtn& rFtn );
+    void Append( WW8_CP nCp, const SwFormatFootnote& rFootnote );
 };
 
 struct WW8_Annotation
@@ -1253,32 +1253,32 @@ public:
     void Append( WW8_CP nCp, const SwPostItField* pPostIt );
     void Append( WW8_CP nCp, const SwRedlineData* pRedLine );
     bool IsNewRedlineComment( const SwRedlineData* pRedLine );
-    bool WriteTxt( WW8Export& rWrt );
+    bool WriteText( WW8Export& rWrt );
     void WritePlc( WW8Export& rWrt ) const;
 };
 
-class WW8_WrPlcTxtBoxes : public WW8_WrPlcSubDoc // double Plc for Textboxes
+class WW8_WrPlcTextBoxes : public WW8_WrPlcSubDoc // double Plc for Textboxes
 {                        // Frame/DrawTextboxes!
 private:
     sal_uInt8 nTyp;
-    std::vector<sal_uInt32> aShapeIds;        // VARARR of ShapeIds for the SwFrmFmts
+    std::vector<sal_uInt32> aShapeIds;        // VARARR of ShapeIds for the SwFrameFormats
     virtual const std::vector<sal_uInt32>* GetShapeIdArr() const SAL_OVERRIDE;
 
-    WW8_WrPlcTxtBoxes(const WW8_WrPlcTxtBoxes&) SAL_DELETED_FUNCTION;
-    WW8_WrPlcTxtBoxes& operator=(WW8_WrPlcTxtBoxes&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcTextBoxes(const WW8_WrPlcTextBoxes&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcTextBoxes& operator=(WW8_WrPlcTextBoxes&) SAL_DELETED_FUNCTION;
 public:
-    WW8_WrPlcTxtBoxes( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {}
+    WW8_WrPlcTextBoxes( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {}
 
-    bool WriteTxt( WW8Export& rWrt );
+    bool WriteText( WW8Export& rWrt );
     void WritePlc( WW8Export& rWrt ) const;
     void Append( const SdrObject& rObj, sal_uInt32 nShapeId );
-    void Append( const SwFrmFmt* pFmt, sal_uInt32 nShapeId );
-    sal_uInt16 Count() const { return aCntnt.size(); }
+    void Append( const SwFrameFormat* pFormat, sal_uInt32 nShapeId );
+    sal_uInt16 Count() const { return aContent.size(); }
     sal_uInt16 GetPos( const void* p ) const
     {
         std::vector<const void*>::const_iterator it
-            = std::find( aCntnt.begin(), aCntnt.end(), p );
-        return it == aCntnt.end() ? USHRT_MAX : it - aCntnt.begin();
+            = std::find( aContent.begin(), aContent.end(), p );
+        return it == aContent.end() ? USHRT_MAX : it - aContent.begin();
     }
 };
 
@@ -1326,18 +1326,18 @@ public:
     void Finish( sal_uLong nLastCp, sal_uLong nStartCp );
 };
 
-// class WW8_WrPlcFld is for fields
-class WW8_WrPlcFld : public WW8_WrPlc1
+// class WW8_WrPlcField is for fields
+class WW8_WrPlcField : public WW8_WrPlc1
 {
 private:
-    sal_uInt8 nTxtTyp;
+    sal_uInt8 nTextTyp;
     sal_uInt16 nResults;
 
-    WW8_WrPlcFld(const WW8_WrPlcFld&) SAL_DELETED_FUNCTION;
-    WW8_WrPlcFld& operator=(const WW8_WrPlcFld&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcField(const WW8_WrPlcField&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcField& operator=(const WW8_WrPlcField&) SAL_DELETED_FUNCTION;
 public:
-    WW8_WrPlcFld( sal_uInt16 nStructSz, sal_uInt8 nTTyp )
-        : WW8_WrPlc1( nStructSz ), nTxtTyp( nTTyp ), nResults(0)
+    WW8_WrPlcField( sal_uInt16 nStructSz, sal_uInt8 nTTyp )
+        : WW8_WrPlc1( nStructSz ), nTextTyp( nTTyp ), nResults(0)
     {}
     bool Write( WW8Export& rWrt );
     void ResultAdded() { ++nResults; }
@@ -1409,7 +1409,7 @@ public:
 };
 
 /** The class MSWordAttrIter is a helper class to build the Fkp.chpx.
-    This is a base class to output the SwTxtAttrs and the EditEngineTxtAttrs.
+    This is a base class to output the SwTextAttrs and the EditEngineTextAttrs.
 */
 class MSWordAttrIter
 {
@@ -1433,8 +1433,8 @@ class MSWord_SdrAttrIter : public MSWordAttrIter
 private:
     const EditTextObject* pEditObj;
     const SfxItemPool* pEditPool;
-    std::vector<EECharAttrib> aTxtAtrArr;
-    std::vector<const EECharAttrib*> aChrTxtAtrArr;
+    std::vector<EECharAttrib> aTextAtrArr;
+    std::vector<const EECharAttrib*> aChrTextAtrArr;
     std::vector<rtl_TextEncoding> aChrSetArr;
     sal_Int32 nPara;
     sal_Int32 nAktSwPos;
@@ -1444,7 +1444,7 @@ private:
     sal_uInt8 mnTyp;
 
     sal_Int32 SearchNext( sal_Int32 nStartPos );
-    void SetCharSet(const EECharAttrib& rTxtAttr, bool bStart);
+    void SetCharSet(const EECharAttrib& rTextAttr, bool bStart);
 
     MSWord_SdrAttrIter(const MSWord_SdrAttrIter&) SAL_DELETED_FUNCTION;
     MSWord_SdrAttrIter& operator=(const MSWord_SdrAttrIter&) SAL_DELETED_FUNCTION;
@@ -1455,7 +1455,7 @@ public:
     void OutParaAttr(bool bCharAttr, const std::set<sal_uInt16>* pWhichsToIgnore = NULL);
     void OutEEField(const SfxPoolItem& rHt);
 
-    bool IsTxtAttr(sal_Int32 nSwPos);
+    bool IsTextAttr(sal_Int32 nSwPos);
 
     void NextPos() { if ( nAktSwPos < SAL_MAX_INT32 ) nAktSwPos = SearchNext( nAktSwPos + 1 ); }
 
@@ -1472,14 +1472,14 @@ public:
 // Only character attributes are considered; paragraph attributes do not need this treatment.
 // Die Absatz- und Textattribute des Writers kommen rein, und es wird
 // mit Where() die naechste Position geliefert, an der sich die Attribute
-// aendern. IsTxtAtr() sagt, ob sich an der mit Where() gelieferten Position
+// aendern. IsTextAtr() sagt, ob sich an der mit Where() gelieferten Position
 // ein Attribut ohne Ende und mit \xff im Text befindet.
 // Mit OutAttr() werden die Attribute an der angegebenen SwPos
 // ausgegeben.
 class SwWW8AttrIter : public MSWordAttrIter
 {
 private:
-    const SwTxtNode& rNd;
+    const SwTextNode& rNd;
 
     sw::util::CharRuns maCharRuns;
     sw::util::cCharRunIter maCharRunIter;
@@ -1494,24 +1494,24 @@ private:
 
     bool mbParaIsRTL;
 
-    const SwFmtDrop &mrSwFmtDrop;
+    const SwFormatDrop &mrSwFormatDrop;
 
     sw::Frames maFlyFrms;     // #i2916#
     sw::FrameIter maFlyIter;
 
     sal_Int32 SearchNext( sal_Int32 nStartPos );
-    void FieldVanish( const OUString& rTxt );
+    void FieldVanish( const OUString& rText );
 
-    void OutSwFmtRefMark(const SwFmtRefMark& rAttr, bool bStart);
+    void OutSwFormatRefMark(const SwFormatRefMark& rAttr, bool bStart);
 
     void IterToCurrent();
 
     SwWW8AttrIter(const SwWW8AttrIter&) SAL_DELETED_FUNCTION;
     SwWW8AttrIter& operator=(const SwWW8AttrIter&) SAL_DELETED_FUNCTION;
 public:
-    SwWW8AttrIter( MSWordExportBase& rWr, const SwTxtNode& rNd );
+    SwWW8AttrIter( MSWordExportBase& rWr, const SwTextNode& rNd );
 
-    bool IsTxtAttr( sal_Int32 nSwPos );
+    bool IsTextAttr( sal_Int32 nSwPos );
     bool IncludeEndOfParaCRInRedlineProperties(sal_Int32 nPos) const;
     bool IsDropCap( int nSwPos );
     bool RequiresImplicitBookmark();
@@ -1533,7 +1533,7 @@ public:
     rtl_TextEncoding GetCharSet() const { return meChrSet; }
     OUString GetSnippet(const OUString &rStr, sal_Int32 nAktPos,
         sal_Int32 nLen) const;
-    const SwFmtDrop& GetSwFmtDrop() const { return mrSwFmtDrop; }
+    const SwFormatDrop& GetSwFormatDrop() const { return mrSwFormatDrop; }
 
     bool IsWatermarkFrame();
     bool IsAnchorLinkedToThisNode( sal_uLong nNodePos );
@@ -1543,7 +1543,7 @@ public:
 class MSWordStyles
 {
     MSWordExportBase& m_rExport;
-    SwFmt** m_pFmtA; ///< Slot <-> Character and paragraph style array (0 for list styles).
+    SwFormat** m_pFormatA; ///< Slot <-> Character and paragraph style array (0 for list styles).
     sal_uInt16 m_nUsedSlots;
     bool m_bListStyles; ///< If list styles are requested to be exported as well.
     std::map<sal_uInt16, const SwNumRule*> m_aNumRules; ///< Slot <-> List style map.
@@ -1554,25 +1554,25 @@ class MSWordStyles
     /// Create the style table, called from the constructor.
     void BuildStylesTable();
 
-    /// Based on pFmtA, fill in m_aStyleIds with unique, MS-like names.
+    /// Based on pFormatA, fill in m_aStyleIds with unique, MS-like names.
     void BuildStyleIds();
 
     /// Get slot number during building the style table.
-    sal_uInt16 BuildGetSlot( const SwFmt& rFmt );
+    sal_uInt16 BuildGetSlot( const SwFormat& rFormat );
     sal_uInt16 BuildGetSlot( const SwNumRule& /*rNumRule*/ ) { return m_nUsedSlots++;}
 
     /// Return information about one style.
-    void GetStyleData( SwFmt* pFmt, bool& bFmtColl, sal_uInt16& nBase, sal_uInt16& nNext );
+    void GetStyleData( SwFormat* pFormat, bool& bFormatColl, sal_uInt16& nBase, sal_uInt16& nNext );
 
     /// Outputs attributes of one style.
-    void WriteProperties( const SwFmt* pFmt, bool bPap, sal_uInt16 nPos, bool bInsDefCharSiz );
+    void WriteProperties( const SwFormat* pFormat, bool bPap, sal_uInt16 nPos, bool bInsDefCharSiz );
 
-    static sal_uInt16 GetWWId( const SwFmt& rFmt );
+    static sal_uInt16 GetWWId( const SwFormat& rFormat );
 
-    void SetStyleDefaults( const SwFmt& rFmt, bool bPap );
+    void SetStyleDefaults( const SwFormat& rFormat, bool bPap );
 
     /// Outputs one style - called (in a loop) from OutputStylesTable().
-    void OutputStyle( SwFmt* pFmt, sal_uInt16 nPos );
+    void OutputStyle( SwFormat* pFormat, sal_uInt16 nPos );
     void OutputStyle( const SwNumRule* pNumRule, sal_uInt16 nPos );
 
     MSWordStyles( const MSWordStyles& ) SAL_DELETED_FUNCTION;
@@ -1585,20 +1585,20 @@ public:
     /// Output the styles table.
     void OutputStylesTable();
 
-    /// Get id of the style (rFmt).
-    sal_uInt16 GetSlot( const SwFmt* pFmt ) const;
+    /// Get id of the style (rFormat).
+    sal_uInt16 GetSlot( const SwFormat* pFormat ) const;
 
-    /// Get styleId of the nId-th style (nId is its position in pFmtA).
+    /// Get styleId of the nId-th style (nId is its position in pFormatA).
     OString GetStyleId(sal_uInt16 nId) const;
 
-    const SwFmt* GetSwFmt(sal_uInt16 nId) const { return m_pFmtA[nId]; }
+    const SwFormat* GetSwFormat(sal_uInt16 nId) const { return m_pFormatA[nId]; }
     /// Get numbering rule of the nId-th style
     const SwNumRule* GetSwNumRule(sal_uInt16 nId) const;
 };
 
 #define MSWORD_MAX_STYLES_LIMIT 4091
 
-sal_Int16 GetWordFirstLineOffset(const SwNumFmt &rFmt);
+sal_Int16 GetWordFirstLineOffset(const SwNumFormat &rFormat);
 // A bit of a bag on the side for now
 OUString FieldString(ww::eField eIndex);
 OUString BookmarkToWord(const OUString &rBookmark);
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index cf14ca976f3b..dcd32771a12b 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -303,7 +303,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
                     if (m_pParentFrame->IsInline())
                     {
                         const SwAttrSet& rSet =
-                            m_pParentFrame->GetFrmFmt().GetAttrSet();
+                            m_pParentFrame->GetFrameFormat().GetAttrSet();
                         bEndCR = false;
                         bGraphicNeeded = TestOleNeedsGraphic(rSet,
                             xOleStg, xObjStg, sStorageName, const_cast<SwOLENode*>(&rOLENode));
@@ -379,7 +379,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
 {
     //Added for i120568,the hyperlink info within a graphic whose anchor type is "As character"
     //will be exported to ensure the fidelity
-    const SwFmtURL& rURL = rFrame.GetFrmFmt().GetAttrSet().GetURL();
+    const SwFormatURL& rURL = rFrame.GetFrameFormat().GetAttrSet().GetURL();
     bool bURLStarted = false;
     if( !rURL.GetURL().isEmpty() && rFrame.GetWriterType() == sw::Frame::eGraphic)
     {
@@ -420,25 +420,25 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
     sal_uInt8 aArr[ 18 ];
     sal_uInt8* pArr = aArr;
 
-    const SwFrmFmt &rFlyFmt = rFrame.GetFrmFmt();
-    const RndStdIds eAn = rFlyFmt.GetAttrSet().GetAnchor(false).GetAnchorId();
+    const SwFrameFormat &rFlyFormat = rFrame.GetFrameFormat();
+    const RndStdIds eAn = rFlyFormat.GetAttrSet().GetAnchor(false).GetAnchorId();
     if (eAn == FLY_AS_CHAR)
     {
-        sal_Int16 eVert = rFlyFmt.GetVertOrient().GetVertOrient();
+        sal_Int16 eVert = rFlyFormat.GetVertOrient().GetVertOrient();
         if ((eVert == text::VertOrientation::CHAR_CENTER) || (eVert == text::VertOrientation::LINE_CENTER))
         {
             bool bVert = false;
             //The default for word in vertical text mode is to center,
             //otherwise a sub/super script hack is employed
-            if (m_pOutFmtNode && m_pOutFmtNode->ISA(SwCntntNode) )
+            if (m_pOutFormatNode && m_pOutFormatNode->ISA(SwContentNode) )
             {
-                const SwTxtNode* pTxtNd = static_cast<const SwTxtNode*>(m_pOutFmtNode);
-                SwPosition aPos(*pTxtNd);
+                const SwTextNode* pTextNd = static_cast<const SwTextNode*>(m_pOutFormatNode);
+                SwPosition aPos(*pTextNd);
                 bVert = m_pDoc->IsInVerticalText(aPos);
             }
             if (!bVert)
             {
-                SwTwips nHeight = rFlyFmt.GetFrmSize().GetHeight();
+                SwTwips nHeight = rFlyFormat.GetFrmSize().GetHeight();
                 nHeight/=20; //nHeight was in twips, want it in half points, but
                              //then half of total height.
                 long nFontHeight = static_cast<const SvxFontHeightItem&>(
@@ -492,7 +492,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
         bool bOldGrf = m_bOutGrf;
         m_bOutGrf = true;
 
-        OutputFormat( rFrame.GetFrmFmt(), false, false, true ); // Fly-Attrs
+        OutputFormat( rFrame.GetFrameFormat(), false, false, true ); // Fly-Attrs
 
         m_bOutGrf = bOldGrf;
         m_pPapPlc->AppendFkpEntry( Strm().Tell(), pO->size(), pO->data() );
@@ -555,7 +555,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly,
 
     sal_uInt8* pArr = aArr + 0x2E;  // Do borders first
 
-    const SwAttrSet& rAttrSet = rFly.GetFrmFmt().GetAttrSet();
+    const SwAttrSet& rAttrSet = rFly.GetFrameFormat().GetAttrSet();
     if (SfxItemState::SET == rAttrSet.GetItemState(RES_BOX, false, &pItem))
     {
         const SvxBoxItem* pBox = static_cast<const SvxBoxItem*>(pItem);
@@ -709,7 +709,7 @@ void SwWW8WrGrf::WriteGrfFromGrfNode(SvStream& rStrm, const SwGrfNode &rGrfNd,
             WritePICFHeader(rStrm, rFly, 0x64, nWidth, nHeight,
                 rGrfNd.GetpSwAttrSet());
             SwBasicEscherEx aInlineEscher(&rStrm, rWrt);
-            aInlineEscher.WriteGrfFlyFrame(rFly.GetFrmFmt(), 0x401);
+            aInlineEscher.WriteGrfFlyFrame(rFly.GetFrameFormat(), 0x401);
             aInlineEscher.WritePictures();
         }
         else
@@ -945,7 +945,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
                     WritePICFHeader(rStrm, rFly, 0x64, nWidth, nHeight,
                         pNd->GetpSwAttrSet());
                     SwBasicEscherEx aInlineEscher(&rStrm, rWrt);
-                    aInlineEscher.WriteOLEFlyFrame(rFly.GetFrmFmt(), 0x401);
+                    aInlineEscher.WriteOLEFlyFrame(rFly.GetFrameFormat(), 0x401);
                     aInlineEscher.WritePictures();
                 }
 #else
@@ -975,7 +975,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
         }
         break;
         case sw::Frame::eDrawing:
-        case sw::Frame::eTxtBox:
+        case sw::Frame::eTextBox:
         case sw::Frame::eFormControl:
             OSL_ENSURE(rWrt.bWrtWW8,
                 "You can't try and export these in WW8 format, a filter bug");
@@ -990,7 +990,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
             {
                 WritePICFHeader(rStrm, rFly, 0x64, nWidth, nHeight);
                 SwBasicEscherEx aInlineEscher(&rStrm, rWrt);
-                aInlineEscher.WriteEmptyFlyFrame(rFly.GetFrmFmt(), 0x401);
+                aInlineEscher.WriteEmptyFlyFrame(rFly.GetFrameFormat(), 0x401);
             }
             break;
         default:
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index a5f249e65da3..42e0a42e90ea 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -254,7 +254,7 @@ void MSWordExportBase::ExportPoolItemsToCHP( sw::PoolItems &rItems, sal_uInt16 n
  *      - gebe die Attribute aus; ohne Parents!
  */
 
-void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool bChpFmt, sal_uInt16 nScript,
+void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFormat, bool bChpFormat, sal_uInt16 nScript,
                                       bool bExportParentItemSet )
 {
     if( bExportParentItemSet || rSet.Count() )
@@ -263,7 +263,7 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool
         m_pISet = &rSet;                  // fuer Doppel-Attribute
 
         // If frame dir is set, but not adjust, then force adjust as well
-        if ( bPapFmt && SfxItemState::SET == rSet.GetItemState( RES_FRAMEDIR, bExportParentItemSet ) )
+        if ( bPapFormat && SfxItemState::SET == rSet.GetItemState( RES_FRAMEDIR, bExportParentItemSet ) )
         {
             // No explicit adjust set ?
             if ( SfxItemState::SET != rSet.GetItemState( RES_PARATR_ADJUST, bExportParentItemSet ) )
@@ -276,7 +276,7 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool
             }
         }
 
-        if ( bPapFmt && SfxItemState::SET == rSet.GetItemState( RES_PARATR_NUMRULE, bExportParentItemSet, &pItem ) )
+        if ( bPapFormat && SfxItemState::SET == rSet.GetItemState( RES_PARATR_NUMRULE, bExportParentItemSet, &pItem ) )
         {
             AttrOutput().OutputItem( *pItem );
 
@@ -292,9 +292,9 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool
 
         sw::PoolItems aItems;
         GetPoolItems( rSet, aItems, bExportParentItemSet );
-        if ( bChpFmt )
+        if ( bChpFormat )
             ExportPoolItemsToCHP(aItems, nScript);
-        if ( bPapFmt )
+        if ( bPapFormat )
         {
             sw::cPoolItemIter aEnd = aItems.end();
             for ( sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI )
@@ -324,22 +324,22 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool
 void MSWordExportBase::GatherChapterFields()
 {
     //If the header/footer contains a chapter field
-    SwFieldType* pType = m_pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_CHAPTERFLD );
-    SwIterator<SwFmtFld,SwFieldType> aFmtFlds( *pType );
-    for ( SwFmtFld* pFld = aFmtFlds.First(); pFld; pFld = aFmtFlds.Next() )
+    SwFieldType* pType = m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_CHAPTERFLD );
+    SwIterator<SwFormatField,SwFieldType> aFormatFields( *pType );
+    for ( SwFormatField* pField = aFormatFields.First(); pField; pField = aFormatFields.Next() )
     {
-        if (const SwTxtFld *pTxtFld = pFld->GetTxtFld())
+        if (const SwTextField *pTextField = pField->GetTextField())
         {
-            const SwTxtNode &rTxtNode = pTxtFld->GetTxtNode();
-            m_aChapterFieldLocs.push_back(rTxtNode.GetIndex());
+            const SwTextNode &rTextNode = pTextField->GetTextNode();
+            m_aChapterFieldLocs.push_back(rTextNode.GetIndex());
         }
     }
 }
 
-bool MSWordExportBase::CntntContainsChapterField(const SwFmtCntnt &rCntnt) const
+bool MSWordExportBase::ContentContainsChapterField(const SwFormatContent &rContent) const
 {
     bool bRet = false;
-    if ( const SwNodeIndex* pSttIdx = rCntnt.GetCntntIdx() )
+    if ( const SwNodeIndex* pSttIdx = rContent.GetContentIdx() )
     {
         SwNodeIndex aIdx( *pSttIdx, 1 );
         SwNodeIndex aEnd( *pSttIdx->GetNode().EndOfSectionNode() );
@@ -359,19 +359,19 @@ bool MSWordExportBase::CntntContainsChapterField(const SwFmtCntnt &rCntnt) const
     return bRet;
 }
 
-bool MSWordExportBase::FmtHdFtContainsChapterField(const SwFrmFmt &rFmt) const
+bool MSWordExportBase::FormatHdFtContainsChapterField(const SwFrameFormat &rFormat) const
 {
     if ( m_aChapterFieldLocs.empty() )
         return false;
 
-    const SwFrmFmt *pFmt = 0;
+    const SwFrameFormat *pFormat = 0;
 
-    pFmt = rFmt.GetHeader().GetHeaderFmt();
-    if ( pFmt && CntntContainsChapterField( pFmt->GetCntnt() ) )
+    pFormat = rFormat.GetHeader().GetHeaderFormat();
+    if ( pFormat && ContentContainsChapterField( pFormat->GetContent() ) )
         return true;
 
-    pFmt = rFmt.GetFooter().GetFooterFmt();
-    if ( pFmt && CntntContainsChapterField( pFmt->GetCntnt() ) )
+    pFormat = rFormat.GetFooter().GetFooterFormat();
+    if ( pFormat && ContentContainsChapterField( pFormat->GetContent() ) )
         return true;
 
     return false;
@@ -390,18 +390,18 @@ bool MSWordExportBase::SetAktPageDescFromNode(const SwNode &rNd)
                 bNewPageDesc = true;
             else
             {
-                const SwFrmFmt& rTitleFmt = m_pAktPageDesc->GetFirstMaster();
-                const SwFrmFmt& rFollowFmt = pCurrent->GetMaster();
+                const SwFrameFormat& rTitleFormat = m_pAktPageDesc->GetFirstMaster();
+                const SwFrameFormat& rFollowFormat = pCurrent->GetMaster();
 
-                bNewPageDesc = !IsPlausableSingleWordSection(rTitleFmt,
-                    rFollowFmt);
+                bNewPageDesc = !IsPlausableSingleWordSection(rTitleFormat,
+                    rFollowFormat);
             }
             m_pAktPageDesc = pCurrent;
         }
         else
         {
-            const SwFrmFmt &rFmt = pCurrent->GetMaster();
-            bNewPageDesc = FmtHdFtContainsChapterField(rFmt);
+            const SwFrameFormat &rFormat = pCurrent->GetMaster();
+            bNewPageDesc = FormatHdFtContainsChapterField(rFormat);
         }
     }
     return bNewPageDesc;
@@ -422,7 +422,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
     m_bBreakBefore = true;
     bool bNewPageDesc = false;
     const SfxPoolItem* pItem=0;
-    const SwFmtPageDesc *pPgDesc=0;
+    const SwFormatPageDesc *pPgDesc=0;
 
     //Output a sectionbreak if theres a new pagedesciptor.  otherwise output a
     //pagebreak if there is a pagebreak here, unless the new page (follow
@@ -466,11 +466,11 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
     if ( pSet && pSet->Count() )
     {
         if ( SfxItemState::SET == pSet->GetItemState( RES_PAGEDESC, false, &pItem ) &&
-             static_cast<const SwFmtPageDesc*>(pItem)->GetRegisteredIn() != NULL)
+             static_cast<const SwFormatPageDesc*>(pItem)->GetRegisteredIn() != NULL)
         {
             bBreakSet = true;
             bNewPageDesc = true;
-            pPgDesc = static_cast<const SwFmtPageDesc*>(pItem);
+            pPgDesc = static_cast<const SwFormatPageDesc*>(pItem);
             m_pAktPageDesc = pPgDesc->GetPageDesc();
         }
         else if ( SfxItemState::SET == pSet->GetItemState( RES_BREAK, false, &pItem ) )
@@ -482,7 +482,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
                 const SwTableNode* pTableNode = rNd.FindTableNode();
                 if ( pTableNode )
                 {
-                    const SwTableBox* pBox = rNd.GetTblBox();
+                    const SwTableBox* pBox = rNd.GetTableBox();
                     const SwTableLine* pLine = pBox ? pBox->GetUpper() : 0;
                     // but only for non-complex tables
                     if ( pLine && !pLine->GetUpper() )
@@ -512,7 +512,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
                 if ( m_pAktPageDesc )
                 {
                     // #i76301# - assure that there is a page break before set at the node.
-                    const SvxFmtBreakItem* pBreak = dynamic_cast<const SvxFmtBreakItem*>(pItem);
+                    const SvxFormatBreakItem* pBreak = dynamic_cast<const SvxFormatBreakItem*>(pItem);
                     if ( pBreak &&
                          pBreak->GetBreak() == SVX_BREAK_PAGE_BEFORE )
                     {
@@ -537,17 +537,17 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
     bool bHackInBreak = false;
     if ( !bBreakSet )
     {
-        if ( const SwCntntNode *pNd = rNd.GetCntntNode() )
+        if ( const SwContentNode *pNd = rNd.GetContentNode() )
         {
-            const SvxFmtBreakItem &rBreak =
-                ItemGet<SvxFmtBreakItem>( *pNd, RES_BREAK );
+            const SvxFormatBreakItem &rBreak =
+                ItemGet<SvxFormatBreakItem>( *pNd, RES_BREAK );
             if ( rBreak.GetBreak() == SVX_BREAK_PAGE_BEFORE )
                 bHackInBreak = true;
             else
             {   // Even a pagedesc item is set, the break item can be set 'NONE',
                 // but a pagedesc item is an implicit page break before...
-                const SwFmtPageDesc &rPageDesc =
-                    ItemGet<SwFmtPageDesc>( *pNd, RES_PAGEDESC );
+                const SwFormatPageDesc &rPageDesc =
+                    ItemGet<SwFormatPageDesc>( *pNd, RES_PAGEDESC );
                 if ( rPageDesc.KnowsPageDesc() )
                     bHackInBreak = true;
             }
@@ -570,7 +570,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
 }
 
 // #i76300#
-bool MSWordExportBase::OutputFollowPageDesc( const SfxItemSet* pSet, const SwTxtNode* pNd )
+bool MSWordExportBase::OutputFollowPageDesc( const SfxItemSet* pSet, const SwTextNode* pNd )
 {
     bool bRet = false;
 
@@ -585,29 +585,29 @@ bool MSWordExportBase::OutputFollowPageDesc( const SfxItemSet* pSet, const SwTxt
     return bRet;
 }
 
-const SwSectionFmt* MSWordExportBase::GetSectionFormat( const SwNode& rNd )
+const SwSectionFormat* MSWordExportBase::GetSectionFormat( const SwNode& rNd )
 {
-    const SwSectionFmt* pFmt = NULL;
+    const SwSectionFormat* pFormat = NULL;
     const SwSectionNode* pSect = rNd.FindSectionNode();
     if ( pSect &&
          CONTENT_SECTION == pSect->GetSection().GetType() )
     {
-        pFmt = pSect->GetSection().GetFmt();
+        pFormat = pSect->GetSection().GetFormat();
     }
 
-    return pFmt;
+    return pFormat;
 }
 
 sal_uLong MSWordExportBase::GetSectionLineNo( const SfxItemSet* pSet, const SwNode& rNd )
 {
-    const SwFmtLineNumber* pNItem = 0;
+    const SwFormatLineNumber* pNItem = 0;
     if ( pSet )
     {
-        pNItem = &( ItemGet<SwFmtLineNumber>( *pSet, RES_LINENUMBER ) );
+        pNItem = &( ItemGet<SwFormatLineNumber>( *pSet, RES_LINENUMBER ) );
     }
-    else if ( const SwCntntNode *pNd = rNd.GetCntntNode() )
+    else if ( const SwContentNode *pNd = rNd.GetContentNode() )
     {
-        pNItem = &( ItemGet<SwFmtLineNumber>( *pNd, RES_LINENUMBER ) );
+        pNItem = &( ItemGet<SwFormatLineNumber>( *pNd, RES_LINENUMBER ) );
     }
 
     return pNItem? pNItem->GetStartValue() : 0;
@@ -615,7 +615,7 @@ sal_uLong MSWordExportBase::GetSectionLineNo( const SfxItemSet* pSet, const SwNo
 
 void WW8Export::PrepareNewPageDesc( const SfxItemSet*pSet,
                                       const SwNode& rNd,
-                                      const SwFmtPageDesc* pNewPgDescFmt,
+                                      const SwFormatPageDesc* pNewPgDescFormat,
                                       const SwPageDesc* pNewPgDesc )
 {
     // Die PageDescs werden beim Auftreten von PageDesc-Attributen nur in
@@ -630,18 +630,18 @@ void WW8Export::PrepareNewPageDesc( const SfxItemSet*pSet,
     if ( !nFcPos )
         return;
 
-    const SwSectionFmt* pFmt = GetSectionFormat( rNd );
+    const SwSectionFormat* pFormat = GetSectionFormat( rNd );
     const sal_uLong nLnNm = GetSectionLineNo( pSet, rNd );
 
-    OSL_ENSURE( pNewPgDescFmt || pNewPgDesc, "Neither page desc format nor page desc provided." );
+    OSL_ENSURE( pNewPgDescFormat || pNewPgDesc, "Neither page desc format nor page desc provided." );
 
-    if ( pNewPgDescFmt )
+    if ( pNewPgDescFormat )
     {
-        pSepx->AppendSep( Fc2Cp( nFcPos ), *pNewPgDescFmt, rNd, pFmt, nLnNm );
+        pSepx->AppendSep( Fc2Cp( nFcPos ), *pNewPgDescFormat, rNd, pFormat, nLnNm );
     }
     else if ( pNewPgDesc )
     {
-        pSepx->AppendSep( Fc2Cp( nFcPos ), pNewPgDesc, rNd, pFmt, nLnNm );
+        pSepx->AppendSep( Fc2Cp( nFcPos ), pNewPgDesc, rNd, pFormat, nLnNm );
     }
 }
 
@@ -693,7 +693,7 @@ sal_uInt8 WW8Export::GetNumId( sal_uInt16 eNumType )
     return nRet;
 }
 
-void WW8AttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt )
+void WW8AttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat &rNFormat, const SwFormat &rFormat )
 {
     if ( nLvl >= WW8ListManager::nMaxLevel )
         nLvl = WW8ListManager::nMaxLevel-1;
@@ -712,29 +712,29 @@ void WW8AttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt
     else
     {
         m_rWW8Export.Out_SwNumLvl( nLvl );
-        if ( rNFmt.GetPositionAndSpaceMode() ==
+        if ( rNFormat.GetPositionAndSpaceMode() ==
                                    SvxNumberFormat::LABEL_WIDTH_AND_POSITION  &&
-             rNFmt.GetAbsLSpace() )
+             rNFormat.GetAbsLSpace() )
         {
-            SwNumFmt aNumFmt( rNFmt );
+            SwNumFormat aNumFormat( rNFormat );
             const SvxLRSpaceItem& rLR =
-                ItemGet<SvxLRSpaceItem>( rFmt, RES_LR_SPACE );
+                ItemGet<SvxLRSpaceItem>( rFormat, RES_LR_SPACE );
 
-            aNumFmt.SetAbsLSpace( writer_cast<short>(
-                    aNumFmt.GetAbsLSpace() + rLR.GetLeft() ) );
+            aNumFormat.SetAbsLSpace( writer_cast<short>(
+                    aNumFormat.GetAbsLSpace() + rLR.GetLeft() ) );
             m_rWW8Export.Out_NumRuleAnld(
                     *m_rWW8Export.m_pDoc->GetOutlineNumRule(),
-                    aNumFmt, nLvl );
+                    aNumFormat, nLvl );
         }
         else
             m_rWW8Export.Out_NumRuleAnld(
                     *m_rWW8Export.m_pDoc->GetOutlineNumRule(),
-                    rNFmt, nLvl );
+                    rNFormat, nLvl );
     }
 }
 
 // #i77805#
-bool WW8Export::DisallowInheritingOutlineNumbering(const SwFmt &rFmt)
+bool WW8Export::DisallowInheritingOutlineNumbering(const SwFormat &rFormat)
 {
     bool bRet( false );
 
@@ -742,11 +742,11 @@ bool WW8Export::DisallowInheritingOutlineNumbering(const SwFmt &rFmt)
     //numbered, then in writer this is no inheritied, but in word it would
     //be, so we must export "no numbering" and "body level" to make word
     //behave like writer (see #i25755)
-    if (SfxItemState::SET != rFmt.GetItemState(RES_PARATR_NUMRULE, false))
+    if (SfxItemState::SET != rFormat.GetItemState(RES_PARATR_NUMRULE, false))
     {
-        if (const SwFmt *pParent = rFmt.DerivedFrom())
+        if (const SwFormat *pParent = rFormat.DerivedFrom())
         {
-            if (static_cast<const SwTxtFmtColl*>(pParent)->IsAssignedToListLevelOfOutlineStyle())
+            if (static_cast<const SwTextFormatColl*>(pParent)->IsAssignedToListLevelOfOutlineStyle())
             {
                 if (bWrtWW8)
                 {
@@ -765,45 +765,45 @@ bool WW8Export::DisallowInheritingOutlineNumbering(const SwFmt &rFmt)
     return bRet;
 }
 
-void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpFmt, bool bFlyFmt )
+void MSWordExportBase::OutputFormat( const SwFormat& rFormat, bool bPapFormat, bool bChpFormat, bool bFlyFormat )
 {
     bool bCallOutSet = true;
-    const SwModify* pOldMod = m_pOutFmtNode;
-    m_pOutFmtNode = &rFmt;
+    const SwModify* pOldMod = m_pOutFormatNode;
+    m_pOutFormatNode = &rFormat;
 
-    switch( rFmt.Which() )
+    switch( rFormat.Which() )
     {
     case RES_CONDTXTFMTCOLL:
     case RES_TXTFMTCOLL:
-        if( bPapFmt )
+        if( bPapFormat )
         {
             int nLvl = MAXLEVEL;
 
-            if (static_cast<const SwTxtFmtColl&>(rFmt).IsAssignedToListLevelOfOutlineStyle())
-                nLvl = static_cast<const SwTxtFmtColl&>(rFmt).GetAssignedOutlineStyleLevel();
+            if (static_cast<const SwTextFormatColl&>(rFormat).IsAssignedToListLevelOfOutlineStyle())
+                nLvl = static_cast<const SwTextFormatColl&>(rFormat).GetAssignedOutlineStyleLevel();
 
             if (nLvl >= 0 && nLvl < MAXLEVEL)
             {
                 //if outline numbered
                 // if Write StyleDefinition then write the OutlineRule
-                const SwNumFmt& rNFmt = m_pDoc->GetOutlineNumRule()->Get( static_cast<sal_uInt16>( nLvl ) );
+                const SwNumFormat& rNFormat = m_pDoc->GetOutlineNumRule()->Get( static_cast<sal_uInt16>( nLvl ) );
                 if ( m_bStyDef )
-                    AttrOutput().OutlineNumbering( static_cast< sal_uInt8 >( nLvl ), rNFmt, rFmt );
+                    AttrOutput().OutlineNumbering( static_cast< sal_uInt8 >( nLvl ), rNFormat, rFormat );
 
-                if ( rNFmt.GetPositionAndSpaceMode() ==
+                if ( rNFormat.GetPositionAndSpaceMode() ==
                                            SvxNumberFormat::LABEL_WIDTH_AND_POSITION  &&
-                     rNFmt.GetAbsLSpace() )
+                     rNFormat.GetAbsLSpace() )
                 {
-                    SfxItemSet aSet( rFmt.GetAttrSet() );
+                    SfxItemSet aSet( rFormat.GetAttrSet() );
                     SvxLRSpaceItem aLR(
                         ItemGet<SvxLRSpaceItem>(aSet, RES_LR_SPACE));
 
-                    aLR.SetTxtLeft( aLR.GetTxtLeft() + rNFmt.GetAbsLSpace() );
-                    aLR.SetTxtFirstLineOfst( GetWordFirstLineOffset(rNFmt));
+                    aLR.SetTextLeft( aLR.GetTextLeft() + rNFormat.GetAbsLSpace() );
+                    aLR.SetTextFirstLineOfst( GetWordFirstLineOffset(rNFormat));
 
                     aSet.Put( aLR );
-                    CorrectTabStopInSet( aSet, rNFmt.GetAbsLSpace() );
-                    OutputItemSet( aSet, bPapFmt, bChpFmt,
+                    CorrectTabStopInSet( aSet, rNFormat.GetAbsLSpace() );
+                    OutputItemSet( aSet, bPapFormat, bChpFormat,
                         i18n::ScriptType::LATIN, m_bExportModeRTF);
                     bCallOutSet = false;
                 }
@@ -815,13 +815,13 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
                 // #i77805#
                 // If inherited outline numbering is suppress, the left/right
                 // margins has to be exported explicitly.
-                if ( m_bStyDef && DisallowInheritingOutlineNumbering(rFmt) )
+                if ( m_bStyDef && DisallowInheritingOutlineNumbering(rFormat) )
                 {
-                    SfxItemSet aSet( rFmt.GetAttrSet() );
+                    SfxItemSet aSet( rFormat.GetAttrSet() );
                     SvxLRSpaceItem aLR(
                         ItemGet<SvxLRSpaceItem>(aSet, RES_LR_SPACE));
                     aSet.Put( aLR );
-                    OutputItemSet( aSet, bPapFmt, bChpFmt,
+                    OutputItemSet( aSet, bPapFormat, bChpFormat,
                         com::sun::star::i18n::ScriptType::LATIN, m_bExportModeRTF);
                     bCallOutSet = false;
                 }
@@ -832,35 +832,35 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
     case RES_CHRFMT:
         break;
     case RES_FLYFRMFMT:
-        if (bFlyFmt)
+        if (bFlyFormat)
         {
             OSL_ENSURE(m_pParentFrame, "No parent frame, all broken");
 
             if (m_pParentFrame)
             {
-                const SwFrmFmt &rFrmFmt = m_pParentFrame->GetFrmFmt();
+                const SwFrameFormat &rFrameFormat = m_pParentFrame->GetFrameFormat();
 
                 SfxItemSet aSet(m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
                     RES_FRMATR_END-1,
                     XATTR_FILL_FIRST, XATTR_FILL_LAST,
                     0);
-                aSet.Set(rFrmFmt.GetAttrSet());
+                aSet.Set(rFrameFormat.GetAttrSet());
 
                 // Fly als Zeichen werden bei uns zu Absatz-gebundenen
                 // jetzt den Abstand vom Absatz-Rand setzen
                 if (m_pFlyOffset)
                 {
-                    aSet.Put(SwFmtHoriOrient(m_pFlyOffset->X()));
-                    aSet.Put(SwFmtVertOrient(m_pFlyOffset->Y()));
-                    SwFmtAnchor aAnchor(rFrmFmt.GetAnchor());
+                    aSet.Put(SwFormatHoriOrient(m_pFlyOffset->X()));
+                    aSet.Put(SwFormatVertOrient(m_pFlyOffset->Y()));
+                    SwFormatAnchor aAnchor(rFrameFormat.GetAnchor());
                     aAnchor.SetType(m_eNewAnchorType);
                     aSet.Put(aAnchor);
                 }
 
                 if (SfxItemState::SET != aSet.GetItemState(RES_SURROUND))
-                    aSet.Put(SwFmtSurround(SURROUND_NONE));
+                    aSet.Put(SwFormatSurround(SURROUND_NONE));
 
-                const XFillStyleItem* pXFillStyleItem(static_cast< const XFillStyleItem*  >(rFrmFmt.GetAttrSet().GetItem(XATTR_FILLSTYLE)));
+                const XFillStyleItem* pXFillStyleItem(static_cast< const XFillStyleItem*  >(rFrameFormat.GetAttrSet().GetItem(XATTR_FILLSTYLE)));
                 if (pXFillStyleItem)
                 {
                     switch (pXFillStyleItem->GetValue())
@@ -870,7 +870,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
                     case drawing::FillStyle_SOLID:
                     {
                         // Construct an SvxBrushItem, as expected by the exporters.
-                        aSet.Put(getSvxBrushItemFromSourceSet(rFrmFmt.GetAttrSet(), RES_BACKGROUND));
+                        aSet.Put(getSvxBrushItemFromSourceSet(rFrameFormat.GetAttrSet(), RES_BACKGROUND));
                         break;
                     }
                     default:
@@ -896,33 +896,33 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
     }
 
     if( bCallOutSet )
-        OutputItemSet( rFmt.GetAttrSet(), bPapFmt, bChpFmt,
+        OutputItemSet( rFormat.GetAttrSet(), bPapFormat, bChpFormat,
             i18n::ScriptType::LATIN, m_bExportModeRTF);
-    m_pOutFmtNode = pOldMod;
+    m_pOutFormatNode = pOldMod;
 }
 
 bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo )
 {
 
-    SwFieldType* pType = m_pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD );
-    SwIterator<SwFmtFld, SwFieldType> aFmtFlds( *pType );
-    for ( SwFmtFld* pFmtFld = aFmtFlds.First(); pFmtFld; pFmtFld = aFmtFlds.Next() )
+    SwFieldType* pType = m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_GETREFFLD );
+    SwIterator<SwFormatField, SwFieldType> aFormatFields( *pType );
+    for ( SwFormatField* pFormatField = aFormatFields.First(); pFormatField; pFormatField = aFormatFields.Next() )
     {
-        const SwTxtNode* pNd = pFmtFld->GetTxtFld()->GetpTxtNode();
-        if ( pFmtFld->GetTxtFld() && nTyp == pFmtFld->GetField()->GetSubType() &&
+        const SwTextNode* pNd = pFormatField->GetTextField()->GetpTextNode();
+        if ( pFormatField->GetTextField() && nTyp == pFormatField->GetField()->GetSubType() &&
              0 != pNd && pNd->GetNodes().IsDocNodes() )
         {
-            const SwGetRefField& rRFld = *static_cast< SwGetRefField* >( pFmtFld->GetField() );
+            const SwGetRefField& rRField = *static_cast< SwGetRefField* >( pFormatField->GetField() );
             switch ( nTyp )
             {
                 case REF_BOOKMARK:
                 case REF_SETREFATTR:
-                    if ( pName && *pName == rRFld.GetSetRefName() )
+                    if ( pName && *pName == rRField.GetSetRefName() )
                         return true;
                     break;
                 case REF_FOOTNOTE:
                 case REF_ENDNOTE:
-                    if ( nSeqNo == rRFld.GetSeqNo() )
+                    if ( nSeqNo == rRField.GetSeqNo() )
                         return true;
                     break;
                 case REF_SEQUENCEFLD:
@@ -1015,7 +1015,7 @@ void WW8AttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTe
 
 void WW8AttributeOutput::StartRunProperties()
 {
-    WW8_WrPlcFld* pCurrentFields = m_rWW8Export.CurrentFieldPlc();
+    WW8_WrPlcField* pCurrentFields = m_rWW8Export.CurrentFieldPlc();
     m_nFieldResults = pCurrentFields ? pCurrentFields->ResultCount() : 0;
 }
 
@@ -1025,7 +1025,7 @@ void WW8AttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool /*bSi
     {
         const OUString &rComment = pRedlineData->GetComment();
         //Only possible to export to main text
-        if (!rComment.isEmpty() && (m_rWW8Export.m_nTxtTyp == TXT_MAINTEXT))
+        if (!rComment.isEmpty() && (m_rWW8Export.m_nTextTyp == TXT_MAINTEXT))
         {
             if (m_rWW8Export.m_pAtn->IsNewRedlineComment(pRedlineData))
             {
@@ -1045,7 +1045,7 @@ void WW8AttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData )
 {
     Redline( pRedlineData );
 
-    WW8_WrPlcFld* pCurrentFields = m_rWW8Export.CurrentFieldPlc();
+    WW8_WrPlcField* pCurrentFields = m_rWW8Export.CurrentFieldPlc();
     sal_uInt16 nNewFieldResults = pCurrentFields ? pCurrentFields->ResultCount() : 0;
 
     bool bExportedFieldResult = ( m_nFieldResults != nNewFieldResults );
@@ -1670,27 +1670,27 @@ void WW8AttributeOutput::CharBackground( const SvxBrushItem& rBrush )
     }
 }
 
-void WW8AttributeOutput::TextINetFormat( const SwFmtINetFmt& rINet )
+void WW8AttributeOutput::TextINetFormat( const SwFormatINetFormat& rINet )
 {
     if ( !rINet.GetValue().isEmpty() )
     {
-        const sal_uInt16 nId = rINet.GetINetFmtId();
-        const OUString& rStr = rINet.GetINetFmt();
+        const sal_uInt16 nId = rINet.GetINetFormatId();
+        const OUString& rStr = rINet.GetINetFormat();
         if (rStr.isEmpty())
         {
             OSL_ENSURE( false, "WW8AttributeOutput::TextINetFormat(..) - missing unvisited character format at hyperlink attribute" );
         }
 
-        const SwCharFmt* pFmt = IsPoolUserFmt( nId )
-                        ? m_rWW8Export.m_pDoc->FindCharFmtByName( rStr )
-                        : m_rWW8Export.m_pDoc->getIDocumentStylePoolAccess().GetCharFmtFromPool( nId );
+        const SwCharFormat* pFormat = IsPoolUserFormat( nId )
+                        ? m_rWW8Export.m_pDoc->FindCharFormatByName( rStr )
+                        : m_rWW8Export.m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( nId );
 
         if ( m_rWW8Export.bWrtWW8 )
             m_rWW8Export.InsUInt16( NS_sprm::LN_CIstd );
         else
             m_rWW8Export.pO->push_back( 80 );
 
-        m_rWW8Export.InsUInt16( m_rWW8Export.GetId( pFmt ) );
+        m_rWW8Export.InsUInt16( m_rWW8Export.GetId( pFormat ) );
     }
 }
 
@@ -1758,7 +1758,7 @@ static void InsertSpecialChar( WW8Export& rWrt, sal_uInt8 c,
         rStrm.Seek( nCurrPos );
 
         // write attributes of hyperlink character 0x01
-        SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CFFldVanish );
+        SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CFFieldVanish );
         aItems.push_back( (sal_uInt8)0x81 );
         SwWW8Writer::InsUInt16( aItems, NS_sprm::LN_CPicLocation );
         SwWW8Writer::InsUInt32( aItems, nLinkPosInDataStrm );
@@ -1785,81 +1785,81 @@ static void InsertSpecialChar( WW8Export& rWrt, sal_uInt8 c,
     rWrt.m_pChpPlc->AppendFkpEntry(rWrt.Strm().Tell(), aItems.size(), aItems.data());
 }
 
-static OUString lcl_GetExpandedField(const SwField &rFld)
+static OUString lcl_GetExpandedField(const SwField &rField)
 {
-    OUString sRet(rFld.ExpandField(true));
+    OUString sRet(rField.ExpandField(true));
 
     //replace LF 0x0A with VT 0x0B
     return sRet.replace(0x0A, 0x0B);
 }
 
-WW8_WrPlcFld* WW8Export::CurrentFieldPlc() const
+WW8_WrPlcField* WW8Export::CurrentFieldPlc() const
 {
-    WW8_WrPlcFld* pFldP = NULL;
-    switch (m_nTxtTyp)
+    WW8_WrPlcField* pFieldP = NULL;
+    switch (m_nTextTyp)
     {
         case TXT_MAINTEXT:
-            pFldP = m_pFldMain;
+            pFieldP = m_pFieldMain;
             break;
         case TXT_HDFT:
-            pFldP = m_pFldHdFt;
+            pFieldP = m_pFieldHdFt;
             break;
         case TXT_FTN:
-            pFldP = m_pFldFtn;
+            pFieldP = m_pFieldFootnote;
             break;
         case TXT_EDN:
-            pFldP = m_pFldEdn;
+            pFieldP = m_pFieldEdn;
             break;
         case TXT_ATN:
-            pFldP = m_pFldAtn;
+            pFieldP = m_pFieldAtn;
             break;
         case TXT_TXTBOX:
-            pFldP = m_pFldTxtBxs;
+            pFieldP = m_pFieldTextBxs;
             break;
         case TXT_HFTXTBOX:
-            pFldP = m_pFldHFTxtBxs;
+            pFieldP = m_pFieldHFTextBxs;
             break;
         default:
             OSL_ENSURE( false, "was ist das fuer ein SubDoc-Type?" );
     }
-    return pFldP;
+    return pFieldP;
 }
 
-void WW8Export::OutputField( const SwField* pFld, ww::eField eFldType,
-    const OUString& rFldCmd, sal_uInt8 nMode )
+void WW8Export::OutputField( const SwField* pField, ww::eField eFieldType,
+    const OUString& rFieldCmd, sal_uInt8 nMode )
 {
     bool bUnicode = IsUnicode();
-    WW8_WrPlcFld* pFldP = CurrentFieldPlc();
+    WW8_WrPlcField* pFieldP = CurrentFieldPlc();
 
-    const bool bIncludeEmptyPicLocation = ( eFldType == ww::ePAGE );
+    const bool bIncludeEmptyPicLocation = ( eFieldType == ww::ePAGE );
     if (WRITEFIELD_START & nMode)
     {
-        sal_uInt8 aFld13[2] = { 0x13, 0x00 };  // will change
+        sal_uInt8 aField13[2] = { 0x13, 0x00 };  // will change
         //#i3958#, Needed to make this field work correctly in Word 2000
-        if (eFldType == ww::eSHAPE)
-            aFld13[0] |= 0x80;
-        aFld13[1] = static_cast< sal_uInt8 >(eFldType);  // Typ nachtragen
-        pFldP->Append( Fc2Cp( Strm().Tell() ), aFld13 );
+        if (eFieldType == ww::eSHAPE)
+            aField13[0] |= 0x80;
+        aField13[1] = static_cast< sal_uInt8 >(eFieldType);  // Typ nachtragen
+        pFieldP->Append( Fc2Cp( Strm().Tell() ), aField13 );
         InsertSpecialChar( *this, 0x13, 0, bIncludeEmptyPicLocation );
     }
     if (WRITEFIELD_CMD_START & nMode)
     {
         if (bUnicode)
-            SwWW8Writer::WriteString16(Strm(), rFldCmd, false);
+            SwWW8Writer::WriteString16(Strm(), rFieldCmd, false);
         else
         {
-            SwWW8Writer::WriteString8(Strm(), rFldCmd, false,
+            SwWW8Writer::WriteString8(Strm(), rFieldCmd, false,
                 RTL_TEXTENCODING_MS_1252);
         }
         // #i43956# - write hyperlink character including
         // attributes and corresponding binary data for certain reference fields.
         bool bHandleBookmark = false;
 
-        if (pFld)
+        if (pField)
         {
-            if (pFld->GetTyp()->Which() == RES_GETREFFLD &&
-                ( eFldType == ww::ePAGEREF || eFldType == ww::eREF ||
-                  eFldType == ww::eNOTEREF || eFldType == ww::eFOOTREF ))
+            if (pField->GetTyp()->Which() == RES_GETREFFLD &&
+                ( eFieldType == ww::ePAGEREF || eFieldType == ww::eREF ||
+                  eFieldType == ww::eNOTEREF || eFieldType == ww::eFOOTREF ))
                 bHandleBookmark = true;
         }
 
@@ -1867,22 +1867,22 @@ void WW8Export::OutputField( const SwField* pFld, ww::eField eFldType,
         {
             // retrieve reference destination - the name of the bookmark
             OUString aLinkStr;
-            const sal_uInt16 nSubType = pFld->GetSubType();
-            const SwGetRefField& rRFld = *(static_cast<const SwGetRefField*>(pFld));
+            const sal_uInt16 nSubType = pField->GetSubType();
+            const SwGetRefField& rRField = *(static_cast<const SwGetRefField*>(pField));
             if ( nSubType == REF_SETREFATTR ||
                  nSubType == REF_BOOKMARK )
             {
-                const OUString aRefName(rRFld.GetSetRefName());
+                const OUString aRefName(rRField.GetSetRefName());
                 aLinkStr = GetBookmarkName( nSubType, &aRefName, 0 );
             }
             else if ( nSubType == REF_FOOTNOTE ||
                       nSubType == REF_ENDNOTE )
             {
-                aLinkStr = GetBookmarkName( nSubType, 0, rRFld.GetSeqNo() );
+                aLinkStr = GetBookmarkName( nSubType, 0, rRField.GetSeqNo() );
             }
             else if ( nSubType == REF_SEQUENCEFLD )
             {
-                aLinkStr = pFld->GetPar2();
+                aLinkStr = pField->GetPar2();
             }
             // insert hyperlink character including attributes and data.
             InsertSpecialChar( *this, 0x01, &aLinkStr );
@@ -1890,18 +1890,18 @@ void WW8Export::OutputField( const SwField* pFld, ww::eField eFldType,
     }
     if (WRITEFIELD_CMD_END & nMode)
     {
-        static const sal_uInt8 aFld14[2] = { 0x14, 0xff };
-        pFldP->Append( Fc2Cp( Strm().Tell() ), aFld14 );
-        pFldP->ResultAdded();
+        static const sal_uInt8 aField14[2] = { 0x14, 0xff };
+        pFieldP->Append( Fc2Cp( Strm().Tell() ), aField14 );
+        pFieldP->ResultAdded();
         InsertSpecialChar( *this, 0x14, 0, bIncludeEmptyPicLocation );
     }
     if (WRITEFIELD_END & nMode)
     {
         OUString sOut;
-        if( pFld )
-            sOut = lcl_GetExpandedField(*pFld);
+        if( pField )
+            sOut = lcl_GetExpandedField(*pField);
         else
-            sOut = rFldCmd;
+            sOut = rFieldCmd;
         if( !sOut.isEmpty() )
         {
             if( bUnicode )
@@ -1912,10 +1912,10 @@ void WW8Export::OutputField( const SwField* pFld, ww::eField eFldType,
                     RTL_TEXTENCODING_MS_1252);
             }
 
-            if (pFld)
+            if (pField)
             {
-                if (pFld->GetTyp()->Which() == RES_INPUTFLD &&
-                    eFldType == ww::eFORMTEXT)
+                if (pField->GetTyp()->Which() == RES_INPUTFLD &&
+                    eFieldType == ww::eFORMTEXT)
                 {
                     sal_uInt8 aArr[12];
                     sal_uInt8 *pArr = aArr;
@@ -1946,21 +1946,21 @@ void WW8Export::OutputField( const SwField* pFld, ww::eField eFldType,
     }
     if (WRITEFIELD_CLOSE & nMode)
     {
-        sal_uInt8 aFld15[2] = { 0x15, 0x80 };
+        sal_uInt8 aField15[2] = { 0x15, 0x80 };
 
-        if (pFld)
+        if (pField)
         {
-            if (pFld->GetTyp()->Which() == RES_INPUTFLD &&
-                eFldType == ww::eFORMTEXT)
+            if (pField->GetTyp()->Which() == RES_INPUTFLD &&
+                eFieldType == ww::eFORMTEXT)
             {
-                sal_uInt16 nSubType = pFld->GetSubType();
+                sal_uInt16 nSubType = pField->GetSubType();
 
                 if (nSubType == REF_SEQUENCEFLD)
-                    aFld15[0] |= (0x4 << 5);
+                    aField15[0] |= (0x4 << 5);
             }
         }
 
-        pFldP->Append( Fc2Cp( Strm().Tell() ), aFld15 );
+        pFieldP->Append( Fc2Cp( Strm().Tell() ), aField15 );
         InsertSpecialChar( *this, 0x15, 0, bIncludeEmptyPicLocation );
     }
 }
@@ -1994,7 +1994,7 @@ sal_uInt16 MSWordExportBase::GetId( const SwTOXType& rTOXType )
 
 // return values:  1 - no PageNum,
 //                 2 - TabStop before PageNum,
-//                 3 - Text before PageNum - rTxt hold the text
+//                 3 - Text before PageNum - rText hold the text
 //                 4 - no Text and no TabStop before PageNum
 static int lcl_CheckForm( const SwForm& rForm, sal_uInt8 nLvl, OUString& rText )
 {
@@ -2099,7 +2099,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                 sStr = FieldString(eCode);
 
                 {
-                    const SwFmtCol& rCol = static_cast<const SwFmtCol&>( rSect.GetFmt()->GetFmtAttr( RES_COL ) );
+                    const SwFormatCol& rCol = static_cast<const SwFormatCol&>( rSect.GetFormat()->GetFormatAttr( RES_COL ) );
                     const SwColumns& rColumns = rCol.GetColumns();
                     sal_Int32 nCol = rColumns.size();
 
@@ -2111,7 +2111,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                             sal_uLong nRstLnNum = 0;
                             SwSection *pParent = rSect.GetParent();
                             WW8_SepInfo rInfo(&GetExport( ).m_pDoc->GetPageDesc(0),
-                                pParent ? pParent->GetFmt() : NULL, nRstLnNum);
+                                pParent ? pParent->GetFormat() : NULL, nRstLnNum);
                             GetExport( ).AttrOutput().SectionBreak( msword::PageBreak, &rInfo );
                         }
 
@@ -2139,21 +2139,21 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                 if (!pTOX->GetTOXForm().IsCommaSeparated())
                 {
                     // In case of Run-in style no separators are added.
-                    OUString aFillTxt;
+                    OUString aFillText;
                     for (sal_uInt8 n = 1; n <= 3; ++n)
                     {
-                        OUString aTxt;
-                        int nRet = ::lcl_CheckForm(pTOX->GetTOXForm(), n, aTxt);
+                        OUString aText;
+                        int nRet = ::lcl_CheckForm(pTOX->GetTOXForm(), n, aText);
 
                         if( 3 == nRet )
-                            aFillTxt = aTxt;
+                            aFillText = aText;
                         else if ((4 == nRet) || (2 == nRet)) //#109414#
-                            aFillTxt = "\t";
+                            aFillText = "\t";
                         else
-                            aFillTxt.clear();
+                            aFillText.clear();
                     }
                     sStr += "\\e \"";
-                    sStr += aFillTxt;
+                    sStr += aFillText;
                     sStr += sEntryEnd;
                 }
                 break;
@@ -2173,14 +2173,14 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                         sStr += seqName;
                         sStr += sEntryEnd;
                     }
-                    OUString aTxt;
-                    int nRet = ::lcl_CheckForm( pTOX->GetTOXForm(), 1, aTxt );
+                    OUString aText;
+                    int nRet = ::lcl_CheckForm( pTOX->GetTOXForm(), 1, aText );
                     if (1 == nRet)
                         sStr += "\\n ";
                     else if( 3 == nRet || 4 == nRet )
                     {
                         sStr += "\\p \"";
-                        sStr += aTxt;
+                        sStr += aText;
                         sStr += sEntryEnd;
                     }
                 }
@@ -2257,11 +2257,11 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                         // non-standard style for that level, i.e. ignore headline
                         // styles 1-9 and find the lowest valid outline level
                         sal_uInt8 nPosOfLowestNonStandardLvl = MAXLEVEL;
-                        const SwTxtFmtColls& rColls = *GetExport().m_pDoc->GetTxtFmtColls();
+                        const SwTextFormatColls& rColls = *GetExport().m_pDoc->GetTextFormatColls();
                         for( n = rColls.size(); n; )
                         {
-                            const SwTxtFmtColl* pColl = rColls[ --n ];
-                            sal_uInt16 nPoolId = pColl->GetPoolFmtId();
+                            const SwTextFormatColl* pColl = rColls[ --n ];
+                            sal_uInt16 nPoolId = pColl->GetPoolFormatId();
                             if (
                                 //Is a Non-Standard Outline Style
                                 (RES_POOLCOLL_HEADLINE1 > nPoolId || RES_POOLCOLL_HEADLINE9 < nPoolId) &&
@@ -2296,7 +2296,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                             // collect this templates into the \t otion
                             for( n = rColls.size(); n;)
                             {
-                                const SwTxtFmtColl* pColl = rColls[ --n ];
+                                const SwTextFormatColl* pColl = rColls[ --n ];
                                 if (!pColl->IsAssignedToListLevelOfOutlineStyle())
                                     continue;
                                 sal_uInt8 nTestLvl =  ::sal::static_int_cast<sal_uInt8>(pColl->GetAssignedOutlineStyleLevel());
@@ -2330,7 +2330,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                                         OUString sStyle( rStyles.getToken( 0, TOX_STYLE_DELIMITER, nPos ));
                                         if( !sStyle.isEmpty() )
                                         {
-                                            SwTxtFmtColl* pColl = GetExport().m_pDoc->FindTxtFmtCollByName(sStyle);
+                                            SwTextFormatColl* pColl = GetExport().m_pDoc->FindTextFormatCollByName(sStyle);
                                             if (pColl)
                                             {
                                                 if (!pColl->IsAssignedToListLevelOfOutlineStyle() || pColl->GetAssignedOutlineStyleLevel() < nTOXLvl)
@@ -2348,14 +2348,14 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
 
                     // No 'else' branch; why the below snippet is a block I have no idea.
                     {
-                        OUString aFillTxt;
+                        OUString aFillText;
                         sal_uInt8 nNoPgStt = MAXLEVEL, nNoPgEnd = MAXLEVEL;
-                        bool bFirstFillTxt = true, bOnlyText = true;
+                        bool bFirstFillText = true, bOnlyText = true;
                         for( n = 0; n < nTOXLvl; ++n )
                         {
-                            OUString aTxt;
+                            OUString aText;
                             int nRet = ::lcl_CheckForm( pTOX->GetTOXForm(),
-                                static_cast< sal_uInt8 >(n+1), aTxt );
+                                static_cast< sal_uInt8 >(n+1), aText );
                             if( 1 == nRet )
                             {
                                 bOnlyText = false;
@@ -2371,11 +2371,11 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                                 bOnlyText = bOnlyText && 3 == nRet;
                                 if( 3 == nRet || 4 == nRet )
                                 {
-                                    if( bFirstFillTxt )
-                                        aFillTxt = aTxt;
-                                    else if( aFillTxt != aTxt )
-                                        aFillTxt.clear();
-                                    bFirstFillTxt = false;
+                                    if( bFirstFillText )
+                                        aFillText = aText;
+                                    else if( aFillText != aText )
+                                        aFillText.clear();
+                                    bFirstFillText = false;
                                 }
                             }
                         }
@@ -2392,7 +2392,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                         if( bOnlyText )
                         {
                             sStr += "\\p \"";
-                            sStr += aFillTxt;
+                            sStr += aFillText;
                             sStr += sEntryEnd;
                         }
                     }
@@ -2432,14 +2432,14 @@ void AttributeOutputBase::EndTOX( const SwSection& rSect,bool bCareEnd )
 
         if ( pTOX->GetType() == TOX_INDEX && GetExport().AddSectionBreaksForTOX() )
         {
-            const SwFmtCol& rCol = static_cast<const SwFmtCol&>( rSect.GetFmt()->GetFmtAttr( RES_COL ) );
+            const SwFormatCol& rCol = static_cast<const SwFormatCol&>( rSect.GetFormat()->GetFormatAttr( RES_COL ) );
             const SwColumns& rColumns = rCol.GetColumns();
             sal_Int32 nCol = rColumns.size();
 
             if ( 0 < nCol )
             {
                 sal_uLong nRstLnNum = 0;
-                WW8_SepInfo rInfo( &GetExport( ).m_pDoc->GetPageDesc( 0 ), rSect.GetFmt() , nRstLnNum );
+                WW8_SepInfo rInfo( &GetExport( ).m_pDoc->GetPageDesc( 0 ), rSect.GetFormat() , nRstLnNum );
                 GetExport( ).AttrOutput().SectionBreak( msword::PageBreak, &rInfo );
             }
         }
@@ -2449,36 +2449,36 @@ void AttributeOutputBase::EndTOX( const SwSection& rSect,bool bCareEnd )
         OnTOXEnding();
 }
 
-bool MSWordExportBase::GetNumberFmt(const SwField& rFld, OUString& rStr)
+bool MSWordExportBase::GetNumberFormat(const SwField& rField, OUString& rStr)
 {
     // Returns a date or time format string by using the US NfKeywordTable
-    bool bHasFmt = false;
-    SvNumberFormatter* pNFmtr = m_pDoc->GetNumberFormatter();
-    sal_uInt32 nFmtIdx = rFld.GetFormat();
-    const SvNumberformat* pNumFmt = pNFmtr->GetEntry( nFmtIdx );
-    if( pNumFmt )
-    {
-        sal_uInt16 nLng = rFld.GetLanguage();
-        LocaleDataWrapper aLocDat(pNFmtr->GetComponentContext(),
+    bool bHasFormat = false;
+    SvNumberFormatter* pNFormatr = m_pDoc->GetNumberFormatter();
+    sal_uInt32 nFormatIdx = rField.GetFormat();
+    const SvNumberformat* pNumFormat = pNFormatr->GetEntry( nFormatIdx );
+    if( pNumFormat )
+    {
+        sal_uInt16 nLng = rField.GetLanguage();
+        LocaleDataWrapper aLocDat(pNFormatr->GetComponentContext(),
                                   LanguageTag(nLng));
 
-        OUString sFmt(pNumFmt->GetMappedFormatstring(GetNfKeywordTable(),
+        OUString sFormat(pNumFormat->GetMappedFormatstring(GetNfKeywordTable(),
             aLocDat));
 
-        if (!sFmt.isEmpty())
+        if (!sFormat.isEmpty())
         {
-            sw::ms::SwapQuotesInField(sFmt);
+            sw::ms::SwapQuotesInField(sFormat);
 
-            rStr = "\\@\"" + sFmt + "\" " ;
-            bHasFmt = true;
+            rStr = "\\@\"" + sFormat + "\" " ;
+            bHasFormat = true;
         }
     }
-    return bHasFmt;
+    return bHasFormat;
 }
 
-void AttributeOutputBase::GetNumberPara( OUString& rStr, const SwField& rFld )
+void AttributeOutputBase::GetNumberPara( OUString& rStr, const SwField& rField )
 {
-    switch(rFld.GetFormat())
+    switch(rField.GetFormat())
     {
         case SVX_NUM_CHARS_UPPER_LETTER:
         case SVX_NUM_CHARS_UPPER_LETTER_N:
@@ -2495,7 +2495,7 @@ void AttributeOutputBase::GetNumberPara( OUString& rStr, const SwField& rFld )
             rStr += "\\* roman ";
             break;
         default:
-            OSL_ENSURE(rFld.GetFormat() == SVX_NUM_ARABIC,
+            OSL_ENSURE(rField.GetFormat() == SVX_NUM_ARABIC,
                 "Unknown numbering type exported as default of Arabic\n");
             //fallthrough
         case SVX_NUM_ARABIC:
@@ -2535,9 +2535,9 @@ OUString FieldString(ww::eField eIndex)
     return OUString("  ");
 }
 
-void WW8AttributeOutput::HiddenField( const SwField& rFld )
+void WW8AttributeOutput::HiddenField( const SwField& rField )
 {
-    OUString sExpand(rFld.GetPar2());
+    OUString sExpand(rField.GetPar2());
 
     //replace LF 0x0A with VT 0x0B
     sExpand = sExpand.replace(0x0A, 0x0B);
@@ -2563,14 +2563,14 @@ void WW8AttributeOutput::HiddenField( const SwField& rFld )
     }
 }
 
-void WW8AttributeOutput::SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd )
+void WW8AttributeOutput::SetField( const SwField& rField, ww::eField eType, const OUString& rCmd )
 {
-    const SwSetExpField* pSet = static_cast<const SwSetExpField*>(&rFld);
+    const SwSetExpField* pSet = static_cast<const SwSetExpField*>(&rField);
     const OUString &rVar = pSet->GetPar2();
 
     sal_uLong nFrom = m_rWW8Export.Fc2Cp(m_rWW8Export.Strm().Tell());
 
-    GetExport().OutputField(&rFld, eType, rCmd, WRITEFIELD_START |
+    GetExport().OutputField(&rField, eType, rCmd, WRITEFIELD_START |
         WRITEFIELD_CMD_START | WRITEFIELD_CMD_END);
 
     /*
@@ -2593,28 +2593,28 @@ void WW8AttributeOutput::SetField( const SwField& rFld, ww::eField eType, const
                 RTL_TEXTENCODING_MS_1252);
         }
     }
-    GetExport().OutputField(&rFld, eType, rCmd, WRITEFIELD_CLOSE);
+    GetExport().OutputField(&rField, eType, rCmd, WRITEFIELD_CLOSE);
 }
 
-void WW8AttributeOutput::PostitField( const SwField* pFld )
+void WW8AttributeOutput::PostitField( const SwField* pField )
 {
-    const SwPostItField *pPFld = static_cast<const SwPostItField*>(pFld);
-    m_rWW8Export.m_pAtn->Append( m_rWW8Export.Fc2Cp( m_rWW8Export.Strm().Tell() ), pPFld );
+    const SwPostItField *pPField = static_cast<const SwPostItField*>(pField);
+    m_rWW8Export.m_pAtn->Append( m_rWW8Export.Fc2Cp( m_rWW8Export.Strm().Tell() ), pPField );
     m_rWW8Export.WritePostItBegin( m_rWW8Export.pO );
 }
 
-bool WW8AttributeOutput::DropdownField( const SwField* pFld )
+bool WW8AttributeOutput::DropdownField( const SwField* pField )
 {
     bool bExpand = true;
     if ( m_rWW8Export.bWrtWW8 )
     {
-        const SwDropDownField& rFld2 = *static_cast<const SwDropDownField*>(pFld);
+        const SwDropDownField& rField2 = *static_cast<const SwDropDownField*>(pField);
         uno::Sequence<OUString> aItems =
-            rFld2.GetItemSequence();
-        GetExport().DoComboBox(rFld2.GetName(),
-                           rFld2.GetHelp(),
-                           rFld2.GetToolTip(),
-                           rFld2.GetSelectedItem(), aItems);
+            rField2.GetItemSequence();
+        GetExport().DoComboBox(rField2.GetName(),
+                           rField2.GetHelp(),
+                           rField2.GetToolTip(),
+                           rField2.GetSelectedItem(), aItems);
         bExpand = false;
     }
     return bExpand;
@@ -2625,13 +2625,13 @@ bool WW8AttributeOutput::PlaceholderField( const SwField* )
     return true; // expand to text?
 }
 
-void WW8AttributeOutput::RefField( const SwField &rFld, const OUString &rRef)
+void WW8AttributeOutput::RefField( const SwField &rField, const OUString &rRef)
 {
     OUString sStr( FieldString( ww::eREF ) );
     sStr += "\"" + rRef + "\" ";
-    m_rWW8Export.OutputField( &rFld, ww::eREF, sStr, WRITEFIELD_START |
+    m_rWW8Export.OutputField( &rField, ww::eREF, sStr, WRITEFIELD_START |
         WRITEFIELD_CMD_START | WRITEFIELD_CMD_END );
-    OUString sVar = lcl_GetExpandedField( rFld );
+    OUString sVar = lcl_GetExpandedField( rField );
     if ( !sVar.isEmpty() )
     {
         if ( m_rWW8Export.IsUnicode() )
@@ -2642,12 +2642,12 @@ void WW8AttributeOutput::RefField( const SwField &rFld, const OUString &rRef)
                 RTL_TEXTENCODING_MS_1252 );
         }
     }
-    m_rWW8Export.OutputField( &rFld, ww::eREF, sStr, WRITEFIELD_CLOSE );
+    m_rWW8Export.OutputField( &rField, ww::eREF, sStr, WRITEFIELD_CLOSE );
 }
 
-void WW8AttributeOutput::WriteExpand( const SwField* pFld )
+void WW8AttributeOutput::WriteExpand( const SwField* pField )
 {
-    OUString sExpand( lcl_GetExpandedField( *pFld ) );
+    OUString sExpand( lcl_GetExpandedField( *pField ) );
     if ( m_rWW8Export.IsUnicode() )
         SwWW8Writer::WriteString16( m_rWW8Export.Strm(), sExpand, false );
     else
@@ -2657,18 +2657,18 @@ void WW8AttributeOutput::WriteExpand( const SwField* pFld )
     }
 }
 
-void AttributeOutputBase::TextField( const SwFmtFld& rField )
+void AttributeOutputBase::TextField( const SwFormatField& rField )
 {
-    const SwField* pFld = rField.GetField();
+    const SwField* pField = rField.GetField();
     bool bWriteExpand = false;
-    const sal_uInt16 nSubType = pFld->GetSubType();
+    const sal_uInt16 nSubType = pField->GetSubType();
 
-    switch (pFld->GetTyp()->Which())
+    switch (pField->GetTyp()->Which())
     {
     case RES_GETEXPFLD:
         if (nSubType == nsSwGetSetExpType::GSE_STRING)
         {
-            const SwGetExpField *pGet = static_cast<const SwGetExpField*>(pFld);
+            const SwGetExpField *pGet = static_cast<const SwGetExpField*>(pField);
             RefField( *pGet, pGet->GetFormula() );
         }
         else
@@ -2679,17 +2679,17 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
         {
             OUString sStr;
             if (GetExport().FieldsQuoted())
-                sStr = FieldString(ww::eSEQ) +  pFld->GetTyp()->GetName() + " ";
+                sStr = FieldString(ww::eSEQ) +  pField->GetTyp()->GetName() + " ";
             else
-                sStr = FieldString(ww::eSEQ) + "\"" + pFld->GetTyp()->GetName() +"\" ";
-            GetNumberPara( sStr, *pFld );
-            GetExport().OutputField(pFld, ww::eSEQ, sStr);
+                sStr = FieldString(ww::eSEQ) + "\"" + pField->GetTyp()->GetName() +"\" ";
+            GetNumberPara( sStr, *pField );
+            GetExport().OutputField(pField, ww::eSEQ, sStr);
         }
         else if (nSubType & nsSwGetSetExpType::GSE_STRING)
         {
             bool bShowAsWell = false;
             ww::eField eFieldNo;
-            const SwSetExpField *pSet = static_cast<const SwSetExpField*>(pFld);
+            const SwSetExpField *pSet = static_cast<const SwSetExpField*>(pField);
             const OUString sVar = pSet->GetPar2();
             OUString sStr;
             if (pSet->GetInputFlag())
@@ -2709,7 +2709,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
                 bShowAsWell = (nSubType & nsSwExtendedSubType::SUB_INVISIBLE) == 0;
             }
 
-            SetField( *pFld, eFieldNo, sStr );
+            SetField( *pField, eFieldNo, sStr );
 
             if (bShowAsWell)
                 RefField( *pSet, pSet->GetPar1() );
@@ -2720,16 +2720,16 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
     case RES_PAGENUMBERFLD:
         {
             OUString sStr = FieldString(ww::ePAGE);
-            GetNumberPara(sStr, *pFld);
-            GetExport().OutputField(pFld, ww::ePAGE, sStr);
+            GetNumberPara(sStr, *pField);
+            GetExport().OutputField(pField, ww::ePAGE, sStr);
         }
         break;
     case RES_FILENAMEFLD:
         {
             OUString sStr = FieldString(ww::eFILENAME);
-            if (pFld->GetFormat() == FF_PATHNAME)
+            if (pField->GetFormat() == FF_PATHNAME)
                 sStr += "\\p ";
-            GetExport().OutputField(pFld, ww::eFILENAME, sStr);
+            GetExport().OutputField(pField, ww::eFILENAME, sStr);
         }
         break;
     case RES_DBNAMEFLD:
@@ -2739,18 +2739,18 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
                 + aData.sDataSource
                 + OUString(DB_DELIM)
                 + aData.sCommand;
-            GetExport().OutputField(pFld, ww::eDATABASE, sStr);
+            GetExport().OutputField(pField, ww::eDATABASE, sStr);
         }
         break;
     case RES_AUTHORFLD:
         {
-            ww::eField eFld =
-                (AF_SHORTCUT & pFld->GetFormat() ? ww::eUSERINITIALS : ww::eUSERNAME);
-            GetExport().OutputField(pFld, eFld, FieldString(eFld));
+            ww::eField eField =
+                (AF_SHORTCUT & pField->GetFormat() ? ww::eUSERINITIALS : ww::eUSERNAME);
+            GetExport().OutputField(pField, eField, FieldString(eField));
         }
         break;
     case RES_TEMPLNAMEFLD:
-        GetExport().OutputField(pFld, ww::eTEMPLATE, FieldString(ww::eTEMPLATE));
+        GetExport().OutputField(pField, ww::eTEMPLATE, FieldString(ww::eTEMPLATE));
         break;
     case RES_DOCINFOFLD:    // Last printed, last edited,...
         if( DI_SUB_FIXED & nSubType )
@@ -2758,56 +2758,56 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
         else
         {
             OUString sStr;
-            ww::eField eFld(ww::eNONE);
+            ww::eField eField(ww::eNONE);
             switch (0xff & nSubType)
             {
                 case DI_TITEL:
-                    eFld = ww::eTITLE;
+                    eField = ww::eTITLE;
                     break;
                 case DI_THEMA:
-                    eFld = ww::eSUBJECT;
+                    eField = ww::eSUBJECT;
                     break;
                 case DI_KEYS:
-                    eFld = ww::eKEYWORDS;
+                    eField = ww::eKEYWORDS;
                     break;
                 case DI_COMMENT:
-                    eFld = ww::eCOMMENTS;
+                    eField = ww::eCOMMENTS;
                     break;
                 case DI_DOCNO:
-                    eFld = ww::eREVNUM;
+                    eField = ww::eREVNUM;
                     break;
                 case DI_CREATE:
                     if (DI_SUB_AUTHOR == (nSubType & DI_SUB_MASK))
-                        eFld = ww::eAUTHOR;
-                    else if (GetExport().GetNumberFmt(*pFld, sStr))
-                        eFld = ww::eCREATEDATE;
+                        eField = ww::eAUTHOR;
+                    else if (GetExport().GetNumberFormat(*pField, sStr))
+                        eField = ww::eCREATEDATE;
                     break;
 
                 case DI_CHANGE:
                     if (DI_SUB_AUTHOR == (nSubType & DI_SUB_MASK))
-                        eFld = ww::eLASTSAVEDBY;
-                    else if (GetExport().GetNumberFmt(*pFld, sStr))
-                        eFld = ww::eSAVEDATE;
+                        eField = ww::eLASTSAVEDBY;
+                    else if (GetExport().GetNumberFormat(*pField, sStr))
+                        eField = ww::eSAVEDATE;
                     break;
 
                 case DI_PRINT:
                     if (DI_SUB_AUTHOR != (nSubType & DI_SUB_MASK) &&
-                        GetExport().GetNumberFmt(*pFld, sStr))
-                        eFld = ww::ePRINTDATE;
+                        GetExport().GetNumberFormat(*pField, sStr))
+                        eField = ww::ePRINTDATE;
                     break;
                 case DI_EDIT:
                     if( DI_SUB_AUTHOR != (nSubType & DI_SUB_MASK ) &&
-                        GetExport().GetNumberFmt( *pFld, sStr ))
-                        eFld = ww::eSAVEDATE;
+                        GetExport().GetNumberFormat( *pField, sStr ))
+                        eField = ww::eSAVEDATE;
                     else
-                        eFld = ww::eEDITTIME;
+                        eField = ww::eEDITTIME;
                     break;
                 case DI_CUSTOM:
-                    eFld = ww::eDOCPROPERTY;
+                    eField = ww::eDOCPROPERTY;
                     {
                         OUString sQuotes('\"');
                         const SwDocInfoField * pDocInfoField =
-                        dynamic_cast<const SwDocInfoField *> (pFld);
+                        dynamic_cast<const SwDocInfoField *> (pField);
 
                         if (pDocInfoField != NULL)
                         {
@@ -2825,9 +2825,9 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
                     break;
             }
 
-            if (eFld != ww::eNONE)
+            if (eField != ww::eNONE)
             {
-                GetExport().OutputField(pFld, eFld, FieldString(eFld) + sStr);
+                GetExport().OutputField(pField, eField, FieldString(eField) + sStr);
             }
             else
                 bWriteExpand = true;
@@ -2836,37 +2836,37 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
     case RES_DATETIMEFLD:
         {
             OUString sStr;
-            if (!GetExport().GetNumberFmt(*pFld, sStr))
+            if (!GetExport().GetNumberFormat(*pField, sStr))
                 bWriteExpand = true;
             else
             {
-                ww::eField eFld = (DATEFLD & nSubType) ? ww::eDATE : ww::eTIME;
-                GetExport().OutputField(pFld, eFld, FieldString(eFld) + sStr);
+                ww::eField eField = (DATEFLD & nSubType) ? ww::eDATE : ww::eTIME;
+                GetExport().OutputField(pField, eField, FieldString(eField) + sStr);
             }
         }
         break;
     case RES_DOCSTATFLD:
         {
-            ww::eField eFld = ww::eNONE;
+            ww::eField eField = ww::eNONE;
 
             switch (nSubType)
             {
                 case DS_PAGE:
-                    eFld = ww::eNUMPAGE;
+                    eField = ww::eNUMPAGE;
                     break;
                 case DS_WORD:
-                    eFld = ww::eNUMWORDS;
+                    eField = ww::eNUMWORDS;
                     break;
                 case DS_CHAR:
-                    eFld = ww::eNUMCHARS;
+                    eField = ww::eNUMCHARS;
                     break;
             }
 
-            if (eFld != ww::eNONE)
+            if (eField != ww::eNONE)
             {
-                OUString sStr = FieldString(eFld);
-                GetNumberPara(sStr, *pFld);
-                GetExport().OutputField(pFld, eFld, sStr);
+                OUString sStr = FieldString(eField);
+                GetNumberPara(sStr, *pField);
+                GetExport().OutputField(pField, eField, sStr);
             }
             else
                 bWriteExpand = true;
@@ -2874,27 +2874,27 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
         break;
     case RES_EXTUSERFLD:
         {
-            ww::eField eFld = ww::eNONE;
+            ww::eField eField = ww::eNONE;
             switch (0xFF & nSubType)
             {
                 case EU_FIRSTNAME:
                 case EU_NAME:
-                    eFld = ww::eUSERNAME;
+                    eField = ww::eUSERNAME;
                     break;
                 case EU_SHORTCUT:
-                    eFld = ww::eUSERINITIALS;
+                    eField = ww::eUSERINITIALS;
                     break;
                 case EU_STREET:
                 case EU_COUNTRY:
                 case EU_ZIP:
                 case EU_CITY:
-                    eFld = ww::eUSERADDRESS;
+                    eField = ww::eUSERADDRESS;
                     break;
             }
 
-            if (eFld != ww::eNONE)
+            if (eField != ww::eNONE)
             {
-                GetExport().OutputField(pFld, eFld, FieldString(eFld));
+                GetExport().OutputField(pField, eField, FieldString(eField));
             }
             else
                 bWriteExpand = true;
@@ -2902,57 +2902,57 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
         break;
     case RES_AUTHORITY:
     {
-        OUString sRet(pFld->ExpandCitation(AUTH_FIELD_IDENTIFIER));
-        GetExport().OutputField( pFld, ww::eCITATION, sRet );
+        OUString sRet(pField->ExpandCitation(AUTH_FIELD_IDENTIFIER));
+        GetExport().OutputField( pField, ww::eCITATION, sRet );
     }
     break;
     case RES_POSTITFLD:
         //Sadly only possible for word in main document text
-        if (GetExport().m_nTxtTyp == TXT_MAINTEXT)
+        if (GetExport().m_nTextTyp == TXT_MAINTEXT)
         {
-            PostitField( pFld );
+            PostitField( pField );
         }
         break;
     case RES_INPUTFLD:
         {
-            const SwInputField * pInputField = dynamic_cast<const SwInputField *>(pFld);
+            const SwInputField * pInputField = dynamic_cast<const SwInputField *>(pField);
 
             if (pInputField && pInputField->isFormField())
                 GetExport().DoFormText(pInputField);
             else
             {
                 const OUString sStr = FieldString(ww::eFILLIN) + "\""
-                    + pFld->GetPar2() + "\"";
+                    + pField->GetPar2() + "\"";
 
-                GetExport().OutputField(pFld, ww::eFILLIN, sStr);
+                GetExport().OutputField(pField, ww::eFILLIN, sStr);
             }
         }
         break;
     case RES_GETREFFLD:
         {
-            ww::eField eFld = ww::eNONE;
+            ww::eField eField = ww::eNONE;
             OUString sStr;
-            const SwGetRefField& rRFld = *static_cast<const SwGetRefField*>(pFld);
+            const SwGetRefField& rRField = *static_cast<const SwGetRefField*>(pField);
             switch (nSubType)
             {
                 case REF_SETREFATTR:
                 case REF_BOOKMARK:
-                    switch (pFld->GetFormat())
+                    switch (pField->GetFormat())
                     {
                         case REF_PAGE_PGDESC:
                         case REF_PAGE:
-                            eFld = ww::ePAGEREF;
+                            eField = ww::ePAGEREF;
                             break;
                         default:
-                            eFld = ww::eREF;
+                            eField = ww::eREF;
                             break;
                     }
                     {
-                        const OUString aRefName(rRFld.GetSetRefName());
-                        sStr = FieldString(eFld)
+                        const OUString aRefName(rRField.GetSetRefName());
+                        sStr = FieldString(eField)
                             + MSWordExportBase::GetBookmarkName(nSubType, &aRefName, 0);
                     }
-                    switch (pFld->GetFormat())
+                    switch (pField->GetFormat())
                     {
                         case REF_NUMBER:
                             sStr += " \\r";
@@ -2967,28 +2967,28 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
                     break;
                 case REF_FOOTNOTE:
                 case REF_ENDNOTE:
-                    switch (pFld->GetFormat())
+                    switch (pField->GetFormat())
                     {
                         case REF_PAGE_PGDESC:
                         case REF_PAGE:
-                            eFld = ww::ePAGEREF;
+                            eField = ww::ePAGEREF;
                             break;
                         case REF_UPDOWN:
-                            eFld = ww::eREF;
+                            eField = ww::eREF;
                             break;
                         default:
-                            eFld =
+                            eField =
                                 REF_ENDNOTE == nSubType ? ww::eNOTEREF : ww::eFOOTREF;
                             break;
                     }
-                    sStr = FieldString(eFld)
-                        + MSWordExportBase::GetBookmarkName(nSubType, 0, rRFld.GetSeqNo());
+                    sStr = FieldString(eField)
+                        + MSWordExportBase::GetBookmarkName(nSubType, 0, rRField.GetSeqNo());
                     break;
             }
 
-            if (eFld != ww::eNONE)
+            if (eField != ww::eNONE)
             {
-                switch (pFld->GetFormat())
+                switch (pField->GetFormat())
                 {
                     case REF_UPDOWN:
                         sStr += " \\p \\h ";   // with hyperlink
@@ -3000,7 +3000,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
                         sStr += " \\h ";       // insert hyperlink
                         break;
                 }
-                GetExport().OutputField(pFld, eFld, sStr);
+                GetExport().OutputField(pField, eField, sStr);
             }
             else
                 bWriteExpand = true;
@@ -3023,7 +3023,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
         */
         sal_uInt16 nScript;
         if( g_pBreakIt->GetBreakIter().is() )
-            nScript = g_pBreakIt->GetBreakIter()->getScriptType( pFld->GetPar1(), 0);
+            nScript = g_pBreakIt->GetBreakIter()->getScriptType( pField->GetPar1(), 0);
         else
             nScript = i18n::ScriptType::ASIAN;
 
@@ -3037,37 +3037,37 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
         font size and fill in the defaults as up == half the font size and
         down == a fifth the font size
         */
-        const sal_Int32 nAbove = (pFld->GetPar1().getLength()+1)/2;
+        const sal_Int32 nAbove = (pField->GetPar1().getLength()+1)/2;
         const OUString sStr = FieldString(ww::eEQ)
             + "\\o (\\s\\up "
             + OUString::number(nHeight/2)
             + "("
-            + pFld->GetPar1().copy(0, nAbove)
+            + pField->GetPar1().copy(0, nAbove)
             + "), \\s\\do "
             + OUString::number(nHeight/5)
             + "("
-            + pFld->GetPar1().copy(nAbove)
+            + pField->GetPar1().copy(nAbove)
             + "))";
-        GetExport().OutputField(pFld, ww::eEQ, sStr);
+        GetExport().OutputField(pField, ww::eEQ, sStr);
         }
         break;
     case RES_DROPDOWN:
-        bWriteExpand = DropdownField( pFld );
+        bWriteExpand = DropdownField( pField );
         break;
     case RES_CHAPTERFLD:
         bWriteExpand = true;
-        if (GetExport().m_bOutKF && rField.GetTxtFld())
+        if (GetExport().m_bOutKF && rField.GetTextField())
         {
-            const SwTxtNode *pTxtNd = GetExport().GetHdFtPageRoot();
-            if (!pTxtNd)
+            const SwTextNode *pTextNd = GetExport().GetHdFtPageRoot();
+            if (!pTextNd)
             {
-                pTxtNd = GetExport().m_pCurPam->GetNode().GetTxtNode();
+                pTextNd = GetExport().m_pCurPam->GetNode().GetTextNode();
             }
 
-            if (pTxtNd)
+            if (pTextNd)
             {
-                SwChapterField aCopy(*static_cast<const SwChapterField*>(pFld));
-                aCopy.ChangeExpansion(*pTxtNd, false);
+                SwChapterField aCopy(*static_cast<const SwChapterField*>(pField));
+                aCopy.ChangeExpansion(*pTextNd, false);
                 WriteExpand( &aCopy );
                 bWriteExpand = false;
             }
@@ -3075,23 +3075,23 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
         break;
     case RES_HIDDENTXTFLD:
         {
-            OUString sExpand(pFld->GetPar2());
+            OUString sExpand(pField->GetPar2());
             if (!sExpand.isEmpty())
             {
-                HiddenField( *pFld );
+                HiddenField( *pField );
             }
         }
         break;
     case RES_JUMPEDITFLD:
-        bWriteExpand = PlaceholderField( pFld );
+        bWriteExpand = PlaceholderField( pField );
         break;
     case RES_MACROFLD:
         {
             const OUString sStr = " MACROBUTTON"
-                + pFld->GetPar1().replaceFirst("StarOffice.Standard.Modul1.", " ")
+                + pField->GetPar1().replaceFirst("StarOffice.Standard.Modul1.", " ")
                 + " "
-                + lcl_GetExpandedField(*pFld);
-            GetExport().OutputField( pFld, ww::eMACROBUTTON, sStr );
+                + lcl_GetExpandedField(*pField);
+            GetExport().OutputField( pField, ww::eMACROBUTTON, sStr );
         }
         break;
     default:
@@ -3100,20 +3100,20 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
     }
 
     if (bWriteExpand)
-        WriteExpand( pFld );
+        WriteExpand( pField );
 }
 
-void AttributeOutputBase::TextFlyContent( const SwFmtFlyCnt& rFlyContent )
+void AttributeOutputBase::TextFlyContent( const SwFormatFlyCnt& rFlyContent )
 {
-    if ( GetExport().m_pOutFmtNode && GetExport().m_pOutFmtNode->ISA( SwCntntNode ) )
+    if ( GetExport().m_pOutFormatNode && GetExport().m_pOutFormatNode->ISA( SwContentNode ) )
     {
-        const SwTxtNode* pTxtNd = static_cast<const SwTxtNode*>(GetExport().m_pOutFmtNode);
+        const SwTextNode* pTextNd = static_cast<const SwTextNode*>(GetExport().m_pOutFormatNode);
 
         Point aLayPos;
-        aLayPos = pTxtNd->FindLayoutRect( false, &aLayPos ).Pos();
+        aLayPos = pTextNd->FindLayoutRect( false, &aLayPos ).Pos();
 
-        SwPosition aPos( *pTxtNd );
-        sw::Frame aFrm( *rFlyContent.GetFrmFmt(), aPos );
+        SwPosition aPos( *pTextNd );
+        sw::Frame aFrm( *rFlyContent.GetFrameFormat(), aPos );
 
         OutputFlyFrame_Impl( aFrm, aLayPos );
     }
@@ -3215,10 +3215,10 @@ void WW8AttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
 
 // RefMark, NoLineBreakHere  fehlen noch
 
-void WW8Export::WriteFtnBegin( const SwFmtFtn& rFtn, ww::bytes* pOutArr )
+void WW8Export::WriteFootnoteBegin( const SwFormatFootnote& rFootnote, ww::bytes* pOutArr )
 {
     ww::bytes aAttrArr;
-    const bool bAutoNum = rFtn.GetNumStr().isEmpty();    // Auto-Nummer
+    const bool bAutoNum = rFootnote.GetNumStr().isEmpty();    // Auto-Nummer
     if( bAutoNum )
     {
         if( bWrtWW8 )
@@ -3245,18 +3245,18 @@ void WW8Export::WriteFtnBegin( const SwFmtFtn& rFtn, ww::bytes* pOutArr )
 
     // sprmCIstd
     const SwEndNoteInfo* pInfo;
-    if( rFtn.IsEndNote() )
+    if( rFootnote.IsEndNote() )
         pInfo = &m_pDoc->GetEndNoteInfo();
     else
-        pInfo = &m_pDoc->GetFtnInfo();
-    const SwCharFmt* pCFmt = pOutArr
-                                ? pInfo->GetAnchorCharFmt( *m_pDoc )
-                                : pInfo->GetCharFmt( *m_pDoc );
+        pInfo = &m_pDoc->GetFootnoteInfo();
+    const SwCharFormat* pCFormat = pOutArr
+                                ? pInfo->GetAnchorCharFormat( *m_pDoc )
+                                : pInfo->GetCharFormat( *m_pDoc );
     if( bWrtWW8 )
         SwWW8Writer::InsUInt16( aAttrArr, NS_sprm::LN_CIstd );
     else
         aAttrArr.push_back( 80 );
-    SwWW8Writer::InsUInt16( aAttrArr, GetId( pCFmt ) );
+    SwWW8Writer::InsUInt16( aAttrArr, GetId( pCFormat ) );
 
                                                 // fSpec-Attribut true
                             // Fuer Auto-Nummer muss ein Spezial-Zeichen
@@ -3266,7 +3266,7 @@ void WW8Export::WriteFtnBegin( const SwFmtFtn& rFtn, ww::bytes* pOutArr )
         WriteChar( 0x02 );              // Auto-Nummer-Zeichen
     else
         // User-Nummerierung
-        OutSwString( rFtn.GetNumStr(), 0, rFtn.GetNumStr().getLength(),
+        OutSwString( rFootnote.GetNumStr(), 0, rFootnote.GetNumStr().getLength(),
                         IsUnicode(), RTL_TEXTENCODING_MS_1252 );
 
     if( pOutArr )
@@ -3284,19 +3284,19 @@ void WW8Export::WriteFtnBegin( const SwFmtFtn& rFtn, ww::bytes* pOutArr )
         aOutArr.insert( aOutArr.begin(), aAttrArr.begin(), aAttrArr.end() );
 
         // write for the ftn number in the content, the font of the anchor
-        const SwTxtFtn* pTxtFtn = rFtn.GetTxtFtn();
-        if( pTxtFtn )
+        const SwTextFootnote* pTextFootnote = rFootnote.GetTextFootnote();
+        if( pTextFootnote )
         {
             ww::bytes* pOld = pO;
             pO = &aOutArr;
             SfxItemSet aSet( m_pDoc->GetAttrPool(), RES_CHRATR_FONT,
                                                   RES_CHRATR_FONT );
 
-            pCFmt = pInfo->GetCharFmt( *m_pDoc );
-            aSet.Set( pCFmt->GetAttrSet() );
+            pCFormat = pInfo->GetCharFormat( *m_pDoc );
+            aSet.Set( pCFormat->GetAttrSet() );
 
-            pTxtFtn->GetTxtNode().GetAttr( aSet, pTxtFtn->GetStart(),
-                                            (pTxtFtn->GetStart()) + 1 );
+            pTextFootnote->GetTextNode().GetAttr( aSet, pTextFootnote->GetStart(),
+                                            (pTextFootnote->GetStart()) + 1 );
             m_pAttrOutput->OutputItem( aSet.Get( RES_CHRATR_FONT ) );
             pO = pOld;
         }
@@ -3305,18 +3305,18 @@ void WW8Export::WriteFtnBegin( const SwFmtFtn& rFtn, ww::bytes* pOutArr )
     }
 }
 
-static bool lcl_IsAtTxtEnd(const SwFmtFtn& rFtn)
+static bool lcl_IsAtTextEnd(const SwFormatFootnote& rFootnote)
 {
     bool bRet = true;
-    if( rFtn.GetTxtFtn() )
+    if( rFootnote.GetTextFootnote() )
     {
-        sal_uInt16 nWh = static_cast< sal_uInt16 >(rFtn.IsEndNote() ? RES_END_AT_TXTEND
+        sal_uInt16 nWh = static_cast< sal_uInt16 >(rFootnote.IsEndNote() ? RES_END_AT_TXTEND
                                       : RES_FTN_AT_TXTEND);
-        const SwSectionNode* pSectNd = rFtn.GetTxtFtn()->GetTxtNode().
+        const SwSectionNode* pSectNd = rFootnote.GetTextFootnote()->GetTextNode().
                                                         FindSectionNode();
         while( pSectNd && FTNEND_ATPGORDOCEND ==
-                static_cast<const SwFmtFtnEndAtTxtEnd&>(pSectNd->GetSection().GetFmt()->
-                GetFmtAttr( nWh, true)).GetValue() )
+                static_cast<const SwFormatFootnoteEndAtTextEnd&>(pSectNd->GetSection().GetFormat()->
+                GetFormatAttr( nWh, true)).GetValue() )
             pSectNd = pSectNd->StartOfSectionNode()->FindSectionNode();
 
         if (!pSectNd)
@@ -3325,60 +3325,60 @@ static bool lcl_IsAtTxtEnd(const SwFmtFtn& rFtn)
     return bRet;
 }
 
-void AttributeOutputBase::TextFootnote( const SwFmtFtn& rFtn )
+void AttributeOutputBase::TextFootnote( const SwFormatFootnote& rFootnote )
 {
     sal_uInt16 nTyp;
-    if ( rFtn.IsEndNote() )
+    if ( rFootnote.IsEndNote() )
     {
         nTyp = REF_ENDNOTE;
-        if ( GetExport().m_bEndAtTxtEnd )
-            GetExport().m_bEndAtTxtEnd = lcl_IsAtTxtEnd( rFtn );
+        if ( GetExport().m_bEndAtTextEnd )
+            GetExport().m_bEndAtTextEnd = lcl_IsAtTextEnd( rFootnote );
     }
     else
     {
         nTyp = REF_FOOTNOTE;
-        if ( GetExport().m_bFtnAtTxtEnd )
-            GetExport().m_bFtnAtTxtEnd = lcl_IsAtTxtEnd( rFtn );
+        if ( GetExport().m_bFootnoteAtTextEnd )
+            GetExport().m_bFootnoteAtTextEnd = lcl_IsAtTextEnd( rFootnote );
     }
 
     // if any reference to this footnote/endnote then insert an internal
     // Bookmark.
     OUString sBkmkNm;
-    if ( GetExport().HasRefToObject( nTyp, 0, rFtn.GetTxtFtn()->GetSeqRefNo() ))
+    if ( GetExport().HasRefToObject( nTyp, 0, rFootnote.GetTextFootnote()->GetSeqRefNo() ))
     {
         sBkmkNm = MSWordExportBase::GetBookmarkName( nTyp, 0,
-                                    rFtn.GetTxtFtn()->GetSeqRefNo() );
+                                    rFootnote.GetTextFootnote()->GetSeqRefNo() );
         GetExport().AppendBookmark( sBkmkNm );
     }
 
-    TextFootnote_Impl( rFtn );
+    TextFootnote_Impl( rFootnote );
 
     if ( !sBkmkNm.isEmpty() )
         GetExport().AppendBookmark( sBkmkNm ); // FIXME: Why is it added twice?  Shouldn't this one go to WW8AttributeOuput::TextFootnote_Impl()?
 }
 
-void WW8AttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFtn )
+void WW8AttributeOutput::TextFootnote_Impl( const SwFormatFootnote& rFootnote )
 {
-    WW8_WrPlcFtnEdn* pFtnEnd;
-    if ( rFtn.IsEndNote() )
-        pFtnEnd = m_rWW8Export.pEdn;
+    WW8_WrPlcFootnoteEdn* pFootnoteEnd;
+    if ( rFootnote.IsEndNote() )
+        pFootnoteEnd = m_rWW8Export.pEdn;
     else
-        pFtnEnd = m_rWW8Export.pFtn;
+        pFootnoteEnd = m_rWW8Export.pFootnote;
 
-    pFtnEnd->Append( m_rWW8Export.Fc2Cp( m_rWW8Export.Strm().Tell() ), rFtn );
-    m_rWW8Export.WriteFtnBegin( rFtn, m_rWW8Export.pO );
+    pFootnoteEnd->Append( m_rWW8Export.Fc2Cp( m_rWW8Export.Strm().Tell() ), rFootnote );
+    m_rWW8Export.WriteFootnoteBegin( rFootnote, m_rWW8Export.pO );
 }
 
-void WW8AttributeOutput::TextCharFormat( const SwFmtCharFmt& rCharFmt )
+void WW8AttributeOutput::TextCharFormat( const SwFormatCharFormat& rCharFormat )
 {
-    if( rCharFmt.GetCharFmt() )
+    if( rCharFormat.GetCharFormat() )
     {
         if( m_rWW8Export.bWrtWW8 )
             m_rWW8Export.InsUInt16( NS_sprm::LN_CIstd );
         else
             m_rWW8Export.pO->push_back( 80 );
 
-        m_rWW8Export.InsUInt16( m_rWW8Export.GetId( rCharFmt.GetCharFmt() ) );
+        m_rWW8Export.InsUInt16( m_rWW8Export.GetId( rCharFormat.GetCharFormat() ) );
     }
 }
 
@@ -3434,7 +3434,7 @@ void WW8AttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines )
 
 void AttributeOutputBase::ParaNumRule( const SwNumRuleItem& rNumRule )
 {
-    const SwTxtNode* pTxtNd = 0;
+    const SwTextNode* pTextNd = 0;
     sal_uInt16 nNumId;
     sal_uInt8 nLvl = 0;
     if (!rNumRule.GetValue().isEmpty())
@@ -3444,15 +3444,15 @@ void AttributeOutputBase::ParaNumRule( const SwNumRuleItem& rNumRule )
         if ( pRule && USHRT_MAX != ( nNumId = GetExport().GetId( *pRule ) ) )
         {
             ++nNumId;
-            if ( GetExport().m_pOutFmtNode )
+            if ( GetExport().m_pOutFormatNode )
             {
-                if ( GetExport().m_pOutFmtNode->ISA( SwCntntNode ) )
+                if ( GetExport().m_pOutFormatNode->ISA( SwContentNode ) )
                 {
-                    pTxtNd = static_cast<const SwTxtNode*>(GetExport().m_pOutFmtNode);
+                    pTextNd = static_cast<const SwTextNode*>(GetExport().m_pOutFormatNode);
 
-                    if( pTxtNd->IsCountedInList())
+                    if( pTextNd->IsCountedInList())
                     {
-                        int nLevel = pTxtNd->GetActualListLevel();
+                        int nLevel = pTextNd->GetActualListLevel();
 
                         if (nLevel < 0)
                             nLevel = 0;
@@ -3462,9 +3462,9 @@ void AttributeOutputBase::ParaNumRule( const SwNumRuleItem& rNumRule )
 
                         nLvl = static_cast< sal_uInt8 >(nLevel);
 
-                        if ( pTxtNd->IsListRestart() )
+                        if ( pTextNd->IsListRestart() )
                         {
-                            sal_uInt16 nStartWith = static_cast< sal_uInt16 >( pTxtNd->GetActualListStartValue() );
+                            sal_uInt16 nStartWith = static_cast< sal_uInt16 >( pTextNd->GetActualListStartValue() );
                             nNumId = GetExport().DuplicateNumRule( pRule, nLvl, nStartWith );
                             if ( USHRT_MAX != nNumId )
                                 ++nNumId;
@@ -3479,9 +3479,9 @@ void AttributeOutputBase::ParaNumRule( const SwNumRuleItem& rNumRule )
                         nNumId = 0;
                     }
                 }
-                else if ( GetExport().m_pOutFmtNode->ISA( SwTxtFmtColl ) )
+                else if ( GetExport().m_pOutFormatNode->ISA( SwTextFormatColl ) )
                 {
-                    const SwTxtFmtColl* pC = static_cast<const SwTxtFmtColl*>(GetExport().m_pOutFmtNode);
+                    const SwTextFormatColl* pC = static_cast<const SwTextFormatColl*>(GetExport().m_pOutFormatNode);
                     if ( pC && pC->IsAssignedToListLevelOfOutlineStyle() )
                         nLvl = static_cast< sal_uInt8 >( pC->GetAssignedOutlineStyleLevel() );
                 }
@@ -3498,11 +3498,11 @@ void AttributeOutputBase::ParaNumRule( const SwNumRuleItem& rNumRule )
         if ( nLvl >= WW8ListManager::nMaxLevel )
             nLvl = WW8ListManager::nMaxLevel - 1;
 
-        ParaNumRule_Impl( pTxtNd, nLvl, nNumId );
+        ParaNumRule_Impl( pTextNd, nLvl, nNumId );
     }
 }
 
-void WW8AttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId )
+void WW8AttributeOutput::ParaNumRule_Impl( const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId )
 {
     if ( m_rWW8Export.bWrtWW8 )
     {
@@ -3512,13 +3512,13 @@ void WW8AttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL
         SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_PIlfo );
         SwWW8Writer::InsUInt16( *m_rWW8Export.pO, ::sal::static_int_cast<sal_uInt16>(nNumId) );
     }
-    else if ( pTxtNd && m_rWW8Export.Out_SwNum( pTxtNd ) )                // NumRules
-        m_rWW8Export.pSepx->SetNum( pTxtNd );
+    else if ( pTextNd && m_rWW8Export.Out_SwNum( pTextNd ) )                // NumRules
+        m_rWW8Export.pSepx->SetNum( pTextNd );
 }
 
 /* File FRMATR.HXX */
 
-void WW8AttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
+void WW8AttributeOutput::FormatFrameSize( const SwFormatFrmSize& rSize )
 {
     if( m_rWW8Export.m_bOutFlyFrmAttrs )                   // Flys
     {
@@ -3678,13 +3678,13 @@ void WW8AttributeOutput::TableRowEnd(sal_uInt32 nDepth)
     //pMagicTable->Append(Fc2Cp(Strm().Tell()),0x1B6);
 }
 
-void AttributeOutputBase::FormatPageDescription( const SwFmtPageDesc& rPageDesc )
+void AttributeOutputBase::FormatPageDescription( const SwFormatPageDesc& rPageDesc )
 {
-    if ( GetExport().m_bStyDef && GetExport().m_pOutFmtNode && GetExport().m_pOutFmtNode->ISA( SwTxtFmtColl ) )
+    if ( GetExport().m_bStyDef && GetExport().m_pOutFormatNode && GetExport().m_pOutFormatNode->ISA( SwTextFormatColl ) )
     {
-        const SwTxtFmtColl* pC = static_cast<const SwTxtFmtColl*>(GetExport().m_pOutFmtNode);
+        const SwTextFormatColl* pC = static_cast<const SwTextFormatColl*>(GetExport().m_pOutFormatNode);
         if ( (SfxItemState::SET != pC->GetItemState( RES_BREAK, false ) ) && rPageDesc.KnowsPageDesc() )
-            FormatBreak( SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE, RES_BREAK ) );
+            FormatBreak( SvxFormatBreakItem( SVX_BREAK_PAGE_BEFORE, RES_BREAK ) );
     }
 }
 
@@ -3702,7 +3702,7 @@ void WW8AttributeOutput::PageBreakBefore( bool bBreak )
 // Breaks schreiben nichts in das Ausgabe-Feld rWrt.pO,
 // sondern nur in den Text-Stream ( Bedingung dafuer, dass sie von Out_Break...
 // gerufen werden duerfen )
-void AttributeOutputBase::FormatBreak( const SvxFmtBreakItem& rBreak )
+void AttributeOutputBase::FormatBreak( const SvxFormatBreakItem& rBreak )
 {
     if ( GetExport().m_bStyDef )
     {
@@ -3758,7 +3758,7 @@ void AttributeOutputBase::FormatBreak( const SvxFmtBreakItem& rBreak )
                 nC = msword::PageBreak;
                 // #i76300# - check for follow page description,
                 // if current writing attributes of a paragraph.
-                if ( dynamic_cast< const SwTxtNode* >( GetExport().m_pOutFmtNode ) &&
+                if ( dynamic_cast< const SwTextNode* >( GetExport().m_pOutFormatNode ) &&
                      GetExport().GetCurItemSet() )
                 {
                     bCheckForFollowPageDesc = true;
@@ -3778,7 +3778,7 @@ void AttributeOutputBase::FormatBreak( const SvxFmtBreakItem& rBreak )
             {
                 bFollowPageDescWritten =
                     GetExport().OutputFollowPageDesc( GetExport().GetCurItemSet(),
-                            dynamic_cast<const SwTxtNode*>( GetExport().m_pOutFmtNode ) );
+                            dynamic_cast<const SwTextNode*>( GetExport().m_pOutFormatNode ) );
             }
             if ( !bFollowPageDescWritten )
             {
@@ -3796,14 +3796,14 @@ void WW8AttributeOutput::SectionBreak( sal_uInt8 nC, const WW8_SepInfo* /*pSecti
 sal_uInt32 AttributeOutputBase::GridCharacterPitch( const SwTextGridItem& rGrid ) const
 {
     MSWordStyles * pStyles = GetExport().m_pStyles;
-    const SwFmt * pSwFmt = pStyles->GetSwFmt(0);
+    const SwFormat * pSwFormat = pStyles->GetSwFormat(0);
 
     sal_uInt32 nPageCharSize = 0;
 
-    if (pSwFmt != NULL)
+    if (pSwFormat != NULL)
     {
         nPageCharSize = ItemGet<SvxFontHeightItem>
-            (*pSwFmt, RES_CHRATR_FONTSIZE).GetHeight();
+            (*pSwFormat, RES_CHRATR_FONTSIZE).GetHeight();
     }
     sal_uInt16 nPitch = rGrid.IsSquaredMode() ? rGrid.GetBaseHeight() :
         rGrid.GetBaseWidth( );
@@ -3932,12 +3932,12 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR )
         if( m_rWW8Export.bWrtWW8 )
         {
             m_rWW8Export.InsUInt16( 0x845E );        //asian version ?
-            m_rWW8Export.InsUInt16( (sal_uInt16)rLR.GetTxtLeft() );
+            m_rWW8Export.InsUInt16( (sal_uInt16)rLR.GetTextLeft() );
         }
         else
         {
             m_rWW8Export.pO->push_back( 17 );
-            m_rWW8Export.InsUInt16( (sal_uInt16)rLR.GetTxtLeft() );
+            m_rWW8Export.InsUInt16( (sal_uInt16)rLR.GetTextLeft() );
         }
 
         // sprmPDxaRight
@@ -3956,12 +3956,12 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR )
         if( m_rWW8Export.bWrtWW8 )
         {
             m_rWW8Export.InsUInt16( 0x8460 );        //asian version ?
-            m_rWW8Export.InsUInt16( rLR.GetTxtFirstLineOfst() );
+            m_rWW8Export.InsUInt16( rLR.GetTextFirstLineOfst() );
         }
         else
         {
             m_rWW8Export.pO->push_back( 19 );
-            m_rWW8Export.InsUInt16( rLR.GetTxtFirstLineOfst() );
+            m_rWW8Export.InsUInt16( rLR.GetTextFirstLineOfst() );
         }
     }
 }
@@ -4047,7 +4047,7 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL )
 
 // Print, Opaque, Protect fehlen noch
 
-void WW8AttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
+void WW8AttributeOutput::FormatSurround( const SwFormatSurround& rSurround )
 {
     if ( m_rWW8Export.m_bOutFlyFrmAttrs )
     {
@@ -4061,7 +4061,7 @@ void WW8AttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
     }
 }
 
-void WW8AttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert )
+void WW8AttributeOutput::FormatVertOrientation( const SwFormatVertOrient& rFlyVert )
 {
 //!!!! Ankertyp und entsprechende Umrechnung fehlt noch
 
@@ -4097,7 +4097,7 @@ void WW8AttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert
     }
 }
 
-void WW8AttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori )
+void WW8AttributeOutput::FormatHorizOrientation( const SwFormatHoriOrient& rFlyHori )
 {
     if ( !m_rWW8Export.m_pParentFrame )
     {
@@ -4138,7 +4138,7 @@ void WW8AttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori
     }
 }
 
-void WW8AttributeOutput::FormatAnchor( const SwFmtAnchor& rAnchor )
+void WW8AttributeOutput::FormatAnchor( const SwFormatAnchor& rAnchor )
 {
     OSL_ENSURE( m_rWW8Export.m_pParentFrame, "Anchor without mpParentFrame !!" );
 
@@ -4372,7 +4372,7 @@ void WW8Export::Out_BorderLine(ww::bytes& rO, const SvxBorderLine* pLine,
 
 // FormatBox1() ist fuer alle Boxen ausser in Tabellen.
 // es wird pO des WW8Writers genommen
-void WW8Export::Out_SwFmtBox(const SvxBoxItem& rBox, bool bShadow)
+void WW8Export::Out_SwFormatBox(const SvxBoxItem& rBox, bool bShadow)
 {
     if ( m_bOutPageDescs && !bWrtWW8 )
         return; // no page ouline in WW6
@@ -4434,7 +4434,7 @@ void WW8Export::Out_SwFmtBox(const SvxBoxItem& rBox, bool bShadow)
 // ( Tabellenumrandungen fransen sonst aus )
 // Ein WW8Bytes-Ptr wird als Ausgabe-Parameter uebergeben
 
-void WW8Export::Out_SwFmtTableBox( ww::bytes& rO, const SvxBoxItem * pBox )
+void WW8Export::Out_SwFormatTableBox( ww::bytes& rO, const SvxBoxItem * pBox )
 {
     // moeglich und vielleicht besser waere 0xffff
     static const SvxBorderLine aBorderLine;
@@ -4492,23 +4492,23 @@ void WW8AttributeOutput::FormatBox( const SvxBoxItem& rBox )
                       && ( p->GetWidth() != 0 );
         }
 
-        m_rWW8Export.Out_SwFmtBox( rBox, bShadow );
+        m_rWW8Export.Out_SwFormatBox( rBox, bShadow );
     }
 }
 
 SwTwips WW8Export::CurrentPageWidth(SwTwips &rLeft, SwTwips &rRight) const
 {
-    const SwFrmFmt* pFmt = m_pAktPageDesc ? &m_pAktPageDesc->GetMaster()
+    const SwFrameFormat* pFormat = m_pAktPageDesc ? &m_pAktPageDesc->GetMaster()
         : &m_pDoc->GetPageDesc(0).GetMaster();
 
-    const SvxLRSpaceItem& rLR = pFmt->GetLRSpace();
-    SwTwips nPageSize = pFmt->GetFrmSize().GetWidth();
+    const SvxLRSpaceItem& rLR = pFormat->GetLRSpace();
+    SwTwips nPageSize = pFormat->GetFrmSize().GetWidth();
     rLeft = rLR.GetLeft();
     rRight = rLR.GetRight();
     return nPageSize;
 }
 
-void WW8AttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize )
+void WW8AttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize )
 {
     // CColumns
     if ( m_rWW8Export.bWrtWW8 )
@@ -4569,7 +4569,7 @@ void WW8AttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol &
     }
 }
 
-void AttributeOutputBase::FormatColumns( const SwFmtCol& rCol )
+void AttributeOutputBase::FormatColumns( const SwFormatCol& rCol )
 {
     const SwColumns& rColumns = rCol.GetColumns();
 
@@ -4578,38 +4578,38 @@ void AttributeOutputBase::FormatColumns( const SwFmtCol& rCol )
     {
         // dann besorge mal die Seitenbreite ohne Raender !!
 
-        const SwFrmFmt* pFmt = GetExport( ).m_pAktPageDesc ? &GetExport( ).m_pAktPageDesc->GetMaster() : &const_cast<const SwDoc *>(GetExport( ).m_pDoc)->GetPageDesc(0).GetMaster();
-        const SvxFrameDirectionItem &frameDirection = pFmt->GetFrmDir();
+        const SwFrameFormat* pFormat = GetExport( ).m_pAktPageDesc ? &GetExport( ).m_pAktPageDesc->GetMaster() : &const_cast<const SwDoc *>(GetExport( ).m_pDoc)->GetPageDesc(0).GetMaster();
+        const SvxFrameDirectionItem &frameDirection = pFormat->GetFrmDir();
         SwTwips nPageSize;
         if ( frameDirection.GetValue() == FRMDIR_VERT_TOP_RIGHT || frameDirection.GetValue() == FRMDIR_VERT_TOP_LEFT )
         {
-            const SvxULSpaceItem &rUL = pFmt->GetULSpace();
-            nPageSize = pFmt->GetFrmSize().GetHeight();
+            const SvxULSpaceItem &rUL = pFormat->GetULSpace();
+            nPageSize = pFormat->GetFrmSize().GetHeight();
             nPageSize -= rUL.GetUpper() + rUL.GetLower();
 
-            const SwFmtHeader *header = dynamic_cast<const SwFmtHeader *>(pFmt->GetAttrSet().GetItem(RES_HEADER));
+            const SwFormatHeader *header = dynamic_cast<const SwFormatHeader *>(pFormat->GetAttrSet().GetItem(RES_HEADER));
             if ( header )
             {
-                const SwFrmFmt *headerFmt = header->GetHeaderFmt();
-                if (headerFmt)
+                const SwFrameFormat *headerFormat = header->GetHeaderFormat();
+                if (headerFormat)
                 {
-                    nPageSize -= headerFmt->GetFrmSize().GetHeight();
+                    nPageSize -= headerFormat->GetFrmSize().GetHeight();
                 }
             }
-            const SwFmtFooter *footer = dynamic_cast<const SwFmtFooter *>(pFmt->GetAttrSet().GetItem(RES_FOOTER));
+            const SwFormatFooter *footer = dynamic_cast<const SwFormatFooter *>(pFormat->GetAttrSet().GetItem(RES_FOOTER));
             if ( footer )
             {
-                const SwFrmFmt *footerFmt = footer->GetFooterFmt();
-                if ( footerFmt )
+                const SwFrameFormat *footerFormat = footer->GetFooterFormat();
+                if ( footerFormat )
                 {
-                    nPageSize -= footerFmt->GetFrmSize().GetHeight();
+                    nPageSize -= footerFormat->GetFrmSize().GetHeight();
                 }
             }
         }
         else
         {
-            const SvxLRSpaceItem &rLR = pFmt->GetLRSpace();
-            nPageSize = pFmt->GetFrmSize().GetWidth();
+            const SvxLRSpaceItem &rLR = pFormat->GetLRSpace();
+            nPageSize = pFormat->GetFrmSize().GetWidth();
             nPageSize -= rLR.GetLeft() + rLR.GetRight();
             //i120133: The Section width should consider page indent value.
             nPageSize -= rCol.GetAdjustValue();
@@ -4637,7 +4637,7 @@ void AttributeOutputBase::FormatColumns( const SwFmtCol& rCol )
 }
 
 // "Paragraphs together"
-void WW8AttributeOutput::FormatKeep( const SvxFmtKeepItem& rKeep )
+void WW8AttributeOutput::FormatKeep( const SvxFormatKeepItem& rKeep )
 {
     // sprmFKeepFollow
     if ( m_rWW8Export.bWrtWW8 )
@@ -4649,7 +4649,7 @@ void WW8AttributeOutput::FormatKeep( const SvxFmtKeepItem& rKeep )
 }
 
 // exclude a paragraph from Line Numbering
-void WW8AttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering )
+void WW8AttributeOutput::FormatLineNumbering( const SwFormatLineNumber& rNumbering )
 {
     // sprmPFNoLineNumb
     if( m_rWW8Export.bWrtWW8 )
@@ -4698,19 +4698,19 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing )
                 sal_uInt16 nScript =
                     i18n::ScriptType::LATIN;
                 const SwAttrSet *pSet = 0;
-                if ( GetExport().m_pOutFmtNode && GetExport().m_pOutFmtNode->ISA( SwFmt ) )
+                if ( GetExport().m_pOutFormatNode && GetExport().m_pOutFormatNode->ISA( SwFormat ) )
                 {
-                    const SwFmt *pFmt = static_cast<const SwFmt*>( GetExport().m_pOutFmtNode );
-                    pSet = &pFmt->GetAttrSet();
+                    const SwFormat *pFormat = static_cast<const SwFormat*>( GetExport().m_pOutFormatNode );
+                    pSet = &pFormat->GetAttrSet();
                 }
-                else if ( GetExport().m_pOutFmtNode && GetExport().m_pOutFmtNode->ISA( SwTxtNode ) )
+                else if ( GetExport().m_pOutFormatNode && GetExport().m_pOutFormatNode->ISA( SwTextNode ) )
                 {
-                    const SwTxtNode* pNd = static_cast<const SwTxtNode*>(GetExport().m_pOutFmtNode);
+                    const SwTextNode* pNd = static_cast<const SwTextNode*>(GetExport().m_pOutFormatNode);
                     pSet = &pNd->GetSwAttrSet();
                     if ( g_pBreakIt->GetBreakIter().is() )
                     {
                         nScript = g_pBreakIt->GetBreakIter()->
-                            getScriptType(pNd->GetTxt(), 0);
+                            getScriptType(pNd->GetText(), 0);
                     }
                 }
                 OSL_ENSURE( pSet, "No attrset for lineheight :-(" );
@@ -4775,18 +4775,18 @@ void WW8AttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
             */
             m_rWW8Export.InsUInt16( NS_sprm::LN_PJcExtra ); //bidi version ?
             bool bBiDiSwap = false;
-            if ( m_rWW8Export.m_pOutFmtNode )
+            if ( m_rWW8Export.m_pOutFormatNode )
             {
                 short nDirection = FRMDIR_HORI_LEFT_TOP;
-                if ( m_rWW8Export.m_pOutFmtNode->ISA( SwTxtNode ) )
+                if ( m_rWW8Export.m_pOutFormatNode->ISA( SwTextNode ) )
                 {
-                    SwPosition aPos(*static_cast<const SwCntntNode*>(m_rWW8Export.m_pOutFmtNode));
+                    SwPosition aPos(*static_cast<const SwContentNode*>(m_rWW8Export.m_pOutFormatNode));
                     nDirection = m_rWW8Export.m_pDoc->GetTextDirection(aPos);
                 }
-                else if ( m_rWW8Export.m_pOutFmtNode->ISA( SwTxtFmtColl ) )
+                else if ( m_rWW8Export.m_pOutFormatNode->ISA( SwTextFormatColl ) )
                 {
-                    const SwTxtFmtColl* pC =
-                        static_cast<const SwTxtFmtColl*>(m_rWW8Export.m_pOutFmtNode);
+                    const SwTextFormatColl* pC =
+                        static_cast<const SwTextFormatColl*>(m_rWW8Export.m_pOutFormatNode);
                     const SvxFrameDirectionItem &rItem =
                         ItemGet<SvxFrameDirectionItem>(*pC, RES_FRAMEDIR);
                     nDirection = rItem.GetValue();
@@ -4824,21 +4824,21 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir
     {
         if ( m_rWW8Export.m_bOutPageDescs )
             nDir = m_rWW8Export.GetCurrentPageDirection();
-        else if ( m_rWW8Export.m_pOutFmtNode )
+        else if ( m_rWW8Export.m_pOutFormatNode )
         {
             if ( m_rWW8Export.m_bOutFlyFrmAttrs )  //frame
             {
                 nDir = m_rWW8Export.TrueFrameDirection(
-                    *static_cast<const SwFrmFmt*>(m_rWW8Export.m_pOutFmtNode) );
+                    *static_cast<const SwFrameFormat*>(m_rWW8Export.m_pOutFormatNode) );
             }
-            else if ( m_rWW8Export.m_pOutFmtNode->ISA( SwCntntNode ) )   //pagagraph
+            else if ( m_rWW8Export.m_pOutFormatNode->ISA( SwContentNode ) )   //pagagraph
             {
-                const SwCntntNode* pNd =
-                    static_cast<const SwCntntNode*>(m_rWW8Export.m_pOutFmtNode);
+                const SwContentNode* pNd =
+                    static_cast<const SwContentNode*>(m_rWW8Export.m_pOutFormatNode);
                 SwPosition aPos( *pNd );
                 nDir = m_rWW8Export.m_pDoc->GetTextDirection( aPos );
             }
-            else if ( m_rWW8Export.m_pOutFmtNode->ISA( SwTxtFmtColl ) )
+            else if ( m_rWW8Export.m_pOutFormatNode->ISA( SwTextFormatColl ) )
                 nDir = FRMDIR_HORI_LEFT_TOP;    //what else can we do :-(
         }
 
@@ -4892,7 +4892,7 @@ void WW8AttributeOutput::ParaOutlineLevel(const SfxUInt16Item& /*rItem*/)
 }
 
 // "Separate paragraphs"
-void WW8AttributeOutput::ParaSplit( const SvxFmtSplitItem& rSplit )
+void WW8AttributeOutput::ParaSplit( const SvxFormatSplitItem& rSplit )
 {
     // sprmPFKeep
     if ( m_rWW8Export.bWrtWW8 )
@@ -5152,7 +5152,7 @@ void WW8AttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStops )
         const SfxPoolItem* pLR = m_rWW8Export.HasItem( RES_LR_SPACE );
 
         if ( pLR != NULL )
-            nCurrentLeft = static_cast<const SvxLRSpaceItem*>(pLR)->GetTxtLeft();
+            nCurrentLeft = static_cast<const SvxLRSpaceItem*>(pLR)->GetTextLeft();
     }
 
     // #i100264#
@@ -5161,7 +5161,7 @@ void WW8AttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStops )
          m_rWW8Export.m_pCurrentStyle->DerivedFrom() != NULL )
     {
         SvxTabStopItem aParentTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
-        const SwFmt *pParentStyle = m_rWW8Export.m_pCurrentStyle->DerivedFrom();
+        const SwFormat *pParentStyle = m_rWW8Export.m_pCurrentStyle->DerivedFrom();
         {
             const SvxTabStopItem* pParentTabs = HasItem<SvxTabStopItem>( pParentStyle->GetAttrSet(), RES_PARATR_TABSTOP );
             if ( pParentTabs )
@@ -5175,7 +5175,7 @@ void WW8AttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStops )
         if ( bTabsRelativeToIndex )
         {
             const SvxLRSpaceItem &rStyleLR = ItemGet<SvxLRSpaceItem>( pParentStyle->GetAttrSet(), RES_LR_SPACE );
-            nParentLeft = rStyleLR.GetTxtLeft();
+            nParentLeft = rStyleLR.GetTextLeft();
         }
 
         ParaTabStopDelAdd( m_rWW8Export, aParentTabs, nParentLeft, rTabStops, nCurrentLeft );
@@ -5198,7 +5198,7 @@ void WW8AttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStops )
         if ( bTabsRelativeToIndex )
         {
             const SvxLRSpaceItem &rStyleLR = ItemGet<SvxLRSpaceItem>(*m_rWW8Export.m_pStyAttr, RES_LR_SPACE);
-            nStyleLeft = rStyleLR.GetTxtLeft();
+            nStyleLeft = rStyleLR.GetTextLeft();
         }
 
         ParaTabStopDelAdd( m_rWW8Export,
@@ -5324,23 +5324,23 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
             CharIdctHint( static_cast< const SfxPoolItem& >( rHt ) );
             break;
         case RES_TXTATR_INETFMT:
-            TextINetFormat( static_cast< const SwFmtINetFmt& >( rHt ) );
+            TextINetFormat( static_cast< const SwFormatINetFormat& >( rHt ) );
             break;
         case RES_TXTATR_CHARFMT:
-            TextCharFormat( static_cast< const SwFmtCharFmt& >( rHt ) );
+            TextCharFormat( static_cast< const SwFormatCharFormat& >( rHt ) );
             break;
 
         case RES_TXTATR_FIELD:
         case RES_TXTATR_ANNOTATION:
         case RES_TXTATR_INPUTFIELD:
-            TextField( static_cast< const SwFmtFld& >( rHt ) );
+            TextField( static_cast< const SwFormatField& >( rHt ) );
             break;
 
         case RES_TXTATR_FLYCNT:
-            TextFlyContent( static_cast< const SwFmtFlyCnt& >( rHt ) );
+            TextFlyContent( static_cast< const SwFormatFlyCnt& >( rHt ) );
             break;
         case RES_TXTATR_FTN:
-            TextFootnote( static_cast< const SwFmtFtn& >( rHt ) );
+            TextFootnote( static_cast< const SwFormatFootnote& >( rHt ) );
             break;
 
         case RES_PARATR_LINESPACING:
@@ -5350,7 +5350,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
             ParaAdjust( static_cast< const SvxAdjustItem& >( rHt ) );
             break;
         case RES_PARATR_SPLIT:
-            ParaSplit( static_cast< const SvxFmtSplitItem& >( rHt ) );
+            ParaSplit( static_cast< const SvxFormatSplitItem& >( rHt ) );
             break;
         case RES_PARATR_WIDOWS:
             ParaWidows( static_cast< const SvxWidowsItem& >( rHt ) );
@@ -5381,7 +5381,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
             break;
 
         case RES_FRM_SIZE:
-            FormatFrameSize( static_cast< const SwFmtFrmSize& >( rHt ) );
+            FormatFrameSize( static_cast< const SwFormatFrmSize& >( rHt ) );
             break;
         case RES_PAPER_BIN:
             FormatPaperBin( static_cast< const SvxPaperBinItem& >( rHt ) );
@@ -5393,22 +5393,22 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
             FormatULSpace( static_cast< const SvxULSpaceItem& >( rHt ) );
             break;
         case RES_PAGEDESC:
-            FormatPageDescription( static_cast< const SwFmtPageDesc& >( rHt ) );
+            FormatPageDescription( static_cast< const SwFormatPageDesc& >( rHt ) );
             break;
         case RES_BREAK:
-            FormatBreak( static_cast< const SvxFmtBreakItem& >( rHt ) );
+            FormatBreak( static_cast< const SvxFormatBreakItem& >( rHt ) );
             break;
         case RES_SURROUND:
-            FormatSurround( static_cast< const SwFmtSurround& >( rHt ) );
+            FormatSurround( static_cast< const SwFormatSurround& >( rHt ) );
             break;
         case RES_VERT_ORIENT:
-            FormatVertOrientation( static_cast< const SwFmtVertOrient& >( rHt ) );
+            FormatVertOrientation( static_cast< const SwFormatVertOrient& >( rHt ) );
             break;
         case RES_HORI_ORIENT:
-            FormatHorizOrientation( static_cast< const SwFmtHoriOrient& >( rHt ) );
+            FormatHorizOrientation( static_cast< const SwFormatHoriOrient& >( rHt ) );
             break;
         case RES_ANCHOR:
-            FormatAnchor( static_cast< const SwFmtAnchor& >( rHt ) );
+            FormatAnchor( static_cast< const SwFormatAnchor& >( rHt ) );
             break;
         case RES_BACKGROUND:
             FormatBackground( static_cast< const SvxBrushItem& >( rHt ) );
@@ -5423,16 +5423,16 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
             FormatBox( static_cast< const SvxBoxItem& >( rHt ) );
             break;
         case RES_COL:
-            FormatColumns( static_cast< const SwFmtCol& >( rHt ) );
+            FormatColumns( static_cast< const SwFormatCol& >( rHt ) );
             break;
         case RES_KEEP:
-            FormatKeep( static_cast< const SvxFmtKeepItem& >( rHt ) );
+            FormatKeep( static_cast< const SvxFormatKeepItem& >( rHt ) );
             break;
         case RES_TEXTGRID:
             FormatTextGrid( static_cast< const SwTextGridItem& >( rHt ) );
             break;
         case RES_LINENUMBER:
-            FormatLineNumbering( static_cast< const SwFmtLineNumber& >( rHt ) );
+            FormatLineNumbering( static_cast< const SwFormatLineNumber& >( rHt ) );
             break;
         case RES_FRAMEDIR:
             FormatFrameDirection( static_cast< const SvxFrameDirectionItem& >( rHt ) );
@@ -5538,18 +5538,18 @@ void AttributeOutputBase::FormatCharBorder( const SvxBoxItem& rBox )
 }
 
 /*
- * This function is used to check if the current SwTxtNode (paragraph) has a redline object
+ * This function is used to check if the current SwTextNode (paragraph) has a redline object
  * that is attached to the paragraph marker.
  * This is done by checking if the range (SwPaM) of the redline is :
  * - Start = the last character of the current paragraph
  * - End = the first character of the next paragraph
  */
-const SwRedlineData* AttributeOutputBase::GetParagraphMarkerRedline( const SwTxtNode& rNode, RedlineType_t aRedlineType)
+const SwRedlineData* AttributeOutputBase::GetParagraphMarkerRedline( const SwTextNode& rNode, RedlineType_t aRedlineType)
 {
     // ToDo : this is not the most ideal ... should start maybe from 'nCurRedlinePos'
-    for( sal_uInt16 nRedlinePos = 0; nRedlinePos < GetExport().m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size(); ++nRedlinePos )
+    for( sal_uInt16 nRedlinePos = 0; nRedlinePos < GetExport().m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++nRedlinePos )
     {
-        const SwRangeRedline* pRedl = GetExport().m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlinePos ];
+        const SwRangeRedline* pRedl = GetExport().m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ nRedlinePos ];
 
         // Only check redlines that are of type 'Delete'
         if ( pRedl->GetRedlineData().GetType() != aRedlineType )
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index eb3c64f0f1a7..903e6da50c47 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -36,7 +36,7 @@ public:
     virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
 
     /// Called in order to output section breaks.
-    virtual void SectionBreaks(const SwTxtNode& /*rNode*/) SAL_OVERRIDE {}
+    virtual void SectionBreaks(const SwTextNode& /*rNode*/) SAL_OVERRIDE {}
 
     /// Called before we start outputting the attributes.
     virtual void StartParagraphProperties() SAL_OVERRIDE {}
@@ -71,7 +71,7 @@ public:
     virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
 
     /// Output ruby start.
-    virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ) SAL_OVERRIDE;
+    virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) SAL_OVERRIDE;
 
     /// Output ruby end.
     virtual void EndRuby() SAL_OVERRIDE;
@@ -82,12 +82,12 @@ public:
     /// Output URL end.
     virtual bool EndURL(bool) SAL_OVERRIDE;
 
-    virtual void FieldVanish( const OUString& rTxt, ww::eField eType ) SAL_OVERRIDE;
+    virtual void FieldVanish( const OUString& rText, ww::eField eType ) SAL_OVERRIDE;
 
     /// Output redlining.
     virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE;
 
-    virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
+    virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop &rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
 
     /// Output FKP (Formatted disK Page) - necessary for binary formats only.
     /// FIXME having it in AttributeOutputBase is probably a hack, it
@@ -138,7 +138,7 @@ public:
     virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE;
 
     /// Numbering rule and Id.
-    virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ) SAL_OVERRIDE;
+    virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat &rNFormat, const SwFormat &rFormat ) SAL_OVERRIDE;
 
     /// Page break
     /// As a paragraph property - the paragraph should be on the next page.
@@ -166,7 +166,7 @@ public:
     virtual void SectionTitlePage() SAL_OVERRIDE;
 
     /// Description of the page borders.
-    virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) SAL_OVERRIDE;
+    virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) SAL_OVERRIDE;
 
     /// Columns populated from right/numbers on the right side?
     virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE;
@@ -201,7 +201,7 @@ public:
 
 protected:
     /// Output frames - the implementation.
-    void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) SAL_OVERRIDE;
+    void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) SAL_OVERRIDE;
 
     /// Sfx item Sfx item RES_CHRATR_CASEMAP
     virtual void CharCaseMap( const SvxCaseMapItem& ) SAL_OVERRIDE;
@@ -312,13 +312,13 @@ protected:
     virtual void CharHighlight( const SvxBrushItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_TXTATR_INETFMT
-    virtual void TextINetFormat( const SwFmtINetFmt& ) SAL_OVERRIDE;
+    virtual void TextINetFormat( const SwFormatINetFormat& ) SAL_OVERRIDE;
 
     /// Sfx item RES_TXTATR_CHARFMT
-    virtual void TextCharFormat( const SwFmtCharFmt& ) SAL_OVERRIDE;
+    virtual void TextCharFormat( const SwFormatCharFormat& ) SAL_OVERRIDE;
 
     /// Sfx item RES_TXTATR_FTN
-    virtual void TextFootnote_Impl( const SwFmtFtn& ) SAL_OVERRIDE;
+    virtual void TextFootnote_Impl( const SwFormatFootnote& ) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_LINESPACING
     virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE;
@@ -327,7 +327,7 @@ protected:
     virtual void ParaAdjust( const SvxAdjustItem& rHt ) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_SPLIT
-    virtual void ParaSplit( const SvxFmtSplitItem& ) SAL_OVERRIDE;
+    virtual void ParaSplit( const SvxFormatSplitItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_WIDOWS
     virtual void ParaWidows( const SvxWidowsItem& rHt ) SAL_OVERRIDE;
@@ -339,7 +339,7 @@ protected:
     virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_NUMRULE
-    virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
+    virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
 
     /// Sfx item RES_PARATR_SCRIPTSPACE
     virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE;
@@ -357,7 +357,7 @@ protected:
     virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_FRM_SIZE
-    virtual void FormatFrameSize( const SwFmtFrmSize& ) SAL_OVERRIDE;
+    virtual void FormatFrameSize( const SwFormatFrmSize& ) SAL_OVERRIDE;
 
     /// Sfx item RES_PAPER_BIN
     virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE;
@@ -369,16 +369,16 @@ protected:
     virtual void FormatULSpace( const SvxULSpaceItem& rHt ) SAL_OVERRIDE;
 
     /// Sfx item RES_SURROUND
-    virtual void FormatSurround( const SwFmtSurround& ) SAL_OVERRIDE;
+    virtual void FormatSurround( const SwFormatSurround& ) SAL_OVERRIDE;
 
     /// Sfx item RES_VERT_ORIENT
-    virtual void FormatVertOrientation( const SwFmtVertOrient& ) SAL_OVERRIDE;
+    virtual void FormatVertOrientation( const SwFormatVertOrient& ) SAL_OVERRIDE;
 
     /// Sfx item RES_HORI_ORIENT
-    virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) SAL_OVERRIDE;
+    virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) SAL_OVERRIDE;
 
     /// Sfx item RES_ANCHOR
-    virtual void FormatAnchor( const SwFmtAnchor& ) SAL_OVERRIDE;
+    virtual void FormatAnchor( const SwFormatAnchor& ) SAL_OVERRIDE;
 
     /// Sfx item RES_BACKGROUND
     virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE;
@@ -393,16 +393,16 @@ protected:
     virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_COL
-    virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
+    virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
 
     /// Sfx item RES_KEEP
-    virtual void FormatKeep( const SvxFmtKeepItem& ) SAL_OVERRIDE;
+    virtual void FormatKeep( const SvxFormatKeepItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_TEXTGRID
     virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE;
 
     /// Sfx item RES_LINENUMBER
-    virtual void FormatLineNumbering( const SwFmtLineNumber& ) SAL_OVERRIDE;
+    virtual void FormatLineNumbering( const SwFormatLineNumber& ) SAL_OVERRIDE;
 
     /// Sfx item RES_FRAMEDIR
     virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE;
@@ -417,14 +417,14 @@ protected:
     virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE;
 
     /// Write the expanded field
-    virtual void WriteExpand( const SwField* pFld ) SAL_OVERRIDE;
-
-    virtual void RefField ( const SwField& rFld, const OUString& rRef ) SAL_OVERRIDE;
-    virtual void HiddenField( const SwField& rFld ) SAL_OVERRIDE;
-    virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
-    virtual void PostitField( const SwField* pFld ) SAL_OVERRIDE;
-    virtual bool DropdownField( const SwField* pFld ) SAL_OVERRIDE;
-    virtual bool PlaceholderField( const SwField* pFld ) SAL_OVERRIDE;
+    virtual void WriteExpand( const SwField* pField ) SAL_OVERRIDE;
+
+    virtual void RefField ( const SwField& rField, const OUString& rRef ) SAL_OVERRIDE;
+    virtual void HiddenField( const SwField& rField ) SAL_OVERRIDE;
+    virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
+    virtual void PostitField( const SwField* pField ) SAL_OVERRIDE;
+    virtual bool DropdownField( const SwField* pField ) SAL_OVERRIDE;
+    virtual bool PlaceholderField( const SwField* pField ) SAL_OVERRIDE;
 
     virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE;
 
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 2b7d3de7f49e..7a8d0f4f10a4 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -43,7 +43,7 @@ WW8Glossary::WW8Glossary(tools::SvRef<SotStorageStream> &refStrm, sal_uInt8 nVer
     if (aWwFib.nFibBack >= 0x6A)   //Word97
     {
         xTableStream = pStg->OpenSotStream(OUString::createFromAscii(
-            aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
+            aWwFib.fWhichTableStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
 
         if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
         {
@@ -57,14 +57,14 @@ WW8Glossary::WW8Glossary(tools::SvRef<SotStorageStream> &refStrm, sal_uInt8 nVer
 bool WW8Glossary::HasBareGraphicEnd(SwDoc *pDoc,SwNodeIndex &rIdx)
 {
     bool bRet=false;
-    for( sal_uInt16 nCnt = pDoc->GetSpzFrmFmts()->size(); nCnt; )
+    for( sal_uInt16 nCnt = pDoc->GetSpzFrameFormats()->size(); nCnt; )
     {
-        const SwFrmFmt* pFrmFmt = (*pDoc->GetSpzFrmFmts())[ --nCnt ];
-        if ( RES_FLYFRMFMT != pFrmFmt->Which() &&
-            RES_DRAWFRMFMT != pFrmFmt->Which() )
+        const SwFrameFormat* pFrameFormat = (*pDoc->GetSpzFrameFormats())[ --nCnt ];
+        if ( RES_FLYFRMFMT != pFrameFormat->Which() &&
+            RES_DRAWFRMFMT != pFrameFormat->Which() )
                 continue;
-        const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-        SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+        const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+        SwPosition const*const pAPos = rAnchor.GetContentAnchor();
         if (pAPos &&
             ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
              (FLY_AT_CHAR == rAnchor.GetAnchorId())) &&
@@ -106,18 +106,18 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
 
     if( aStart < aDocEnd )
     {
-        SwTxtFmtColl* pColl = pD->getIDocumentStylePoolAccess().GetTxtCollFromPool
+        SwTextFormatColl* pColl = pD->getIDocumentStylePoolAccess().GetTextCollFromPool
             (RES_POOLCOLL_STANDARD, false);
         sal_uInt16 nGlosEntry = 0;
-        SwCntntNode* pCNd = 0;
+        SwContentNode* pCNd = 0;
         do {
             SwPaM aPam( aStart );
             {
                 SwNodeIndex& rIdx = aPam.GetPoint()->nNode;
                 ++rIdx;
-                if( 0 == ( pCNd = rIdx.GetNode().GetTxtNode() ) )
+                if( 0 == ( pCNd = rIdx.GetNode().GetTextNode() ) )
                 {
-                    pCNd = pD->GetNodes().MakeTxtNode( rIdx, pColl );
+                    pCNd = pD->GetNodes().MakeTextNode( rIdx, pColl );
                     rIdx = *pCNd;
                 }
             }
@@ -126,11 +126,11 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
             {
                 SwNodeIndex& rIdx = aPam.GetPoint()->nNode;
                 rIdx = aStart.GetNode().EndOfSectionIndex() - 1;
-                if(( 0 == ( pCNd = rIdx.GetNode().GetCntntNode() ) )
+                if(( 0 == ( pCNd = rIdx.GetNode().GetContentNode() ) )
                         || HasBareGraphicEnd(pD,rIdx))
                 {
                     ++rIdx;
-                    pCNd = pD->GetNodes().MakeTxtNode( rIdx, pColl );
+                    pCNd = pD->GetNodes().MakeTextNode( rIdx, pColl );
                     rIdx = *pCNd;
                 }
             }
@@ -167,7 +167,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
                     SwDoc* pGlDoc = rBlocks.GetDoc();
                     SwNodeIndex aIdx( pGlDoc->GetNodes().GetEndOfContent(),
                         -1 );
-                    pCNd = aIdx.GetNode().GetCntntNode();
+                    pCNd = aIdx.GetNode().GetContentNode();
                     SwPosition aPos(aIdx, SwIndex(pCNd, (pCNd) ? pCNd->Len() : 0));
                     pD->getIDocumentContentOperations().CopyRange( aPam, aPos, /*bCopyAll=*/false, /*bCheckPos=*/true );
                     rBlocks.PutDoc();
@@ -215,13 +215,13 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
 
                 SwNodeIndex aIdx(
                     *pD->GetNodes().GetEndOfContent().StartOfSectionNode(), 1);
-                if( !aIdx.GetNode().IsTxtNode() )
+                if( !aIdx.GetNode().IsTextNode() )
                 {
                     OSL_ENSURE( false, "wo ist der TextNode?" );
                     pD->GetNodes().GoNext( &aIdx );
                 }
                 SwPaM aPamo( aIdx );
-                aPamo.GetPoint()->nContent.Assign(aIdx.GetNode().GetCntntNode(),
+                aPamo.GetPoint()->nContent.Assign(aIdx.GetNode().GetContentNode(),
                     0);
                 pRdr->LoadDoc(aPamo,this);
 
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 57bbed68912d..de2c3d0236a0 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -154,12 +154,12 @@ Color WW8TransCol(SVBT32 nWC)
     return Color(nWC[0], nWC[1], nWC[2]);
 }
 
-void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const OUString &rFixed)
+void wwFrameNamer::SetUniqueGraphName(SwFrameFormat *pFrameFormat, const OUString &rFixed)
 {
     if (mbIsDisabled || rFixed.isEmpty())
         return;
 
-    pFrmFmt->SetName(msSeed+OUString::number(++mnImportedGraphicsCount) + ": " + rFixed);
+    pFrameFormat->SetName(msSeed+OUString::number(++mnImportedGraphicsCount) + ": " + rFixed);
 }
 
 // ReadGrafStart liest die ObjektDaten ein und erzeugt falls noetig einen Anker
@@ -178,7 +178,7 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
     if (!bCouldRead)
         return false;
 
-    SwFmtAnchor aAnchor( FLY_AT_CHAR );
+    SwFormatAnchor aAnchor( FLY_AT_CHAR );
     aAnchor.SetAnchor( m_pPaM->GetPoint() );
     rSet.Put( aAnchor );
 
@@ -478,14 +478,14 @@ ESelection SwWW8ImplReader::GetESelection( long nCpStart, long nCpEnd )
 void SwWW8ImplReader::InsertTxbxStyAttrs( SfxItemSet& rS, sal_uInt16 nColl )
 {
     SwWW8StyInf * pStyInf = GetStyle(nColl);
-    if( pStyInf != NULL && pStyInf->pFmt && pStyInf->bColl )
+    if( pStyInf != NULL && pStyInf->pFormat && pStyInf->bColl )
     {
         const SfxPoolItem* pItem;
         for( sal_uInt16 i = POOLATTR_BEGIN; i < POOLATTR_END; i++ )
         {
             // If we are set in the source and not set in the destination
             // then add it in.
-            if ( SfxItemState::SET == pStyInf->pFmt->GetItemState(
+            if ( SfxItemState::SET == pStyInf->pFormat->GetItemState(
                 i, true, &pItem ) )
             {
                 SfxItemPool *pEditPool = rS.GetPool();
@@ -596,9 +596,9 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
     {
         // nStart is the beginning of the attributes for this range, and
         // may be before the text itself. So watch out for that
-        WW8_CP nTxtStart = nStart;
-        if (nTxtStart < nStartCp)
-            nTxtStart = nStartCp;
+        WW8_CP nTextStart = nStart;
+        if (nTextStart < nStartCp)
+            nTextStart = nStartCp;
 
         // get position of next SPRM
         bool bStartAttr = m_pPlcxMan->Get(&aRes);
@@ -627,7 +627,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
                     if (!bDoingSymbol && m_bSymbol)
                     {
                         bDoingSymbol = true;
-                        nStartReplace = nTxtStart;
+                        nStartReplace = nTextStart;
                         cReplaceSymbol = m_cSymbol;
                     }
                 }
@@ -639,10 +639,10 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
                         bDoingSymbol = false;
                         OUStringBuffer sTemp;
                         comphelper::string::padToLength(sTemp,
-                            nTxtStart - nStartReplace, cReplaceSymbol);
+                            nTextStart - nStartReplace, cReplaceSymbol);
                         m_pDrawEditEngine->QuickInsertText(sTemp.makeStringAndClear(),
                             GetESelection(nStartReplace - nStartCp,
-                            nTxtStart - nStartCp ) );
+                            nTextStart - nStartCp ) );
                     }
                 }
             }
@@ -660,8 +660,8 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
                             sal_uInt16 nWhich = pItem->Which();
                             if (nWhich == RES_TXTATR_INETFMT)
                             {
-                                const SwFmtINetFmt *pURL =
-                                    static_cast<const SwFmtINetFmt *>(pItem);
+                                const SwFormatINetFormat *pURL =
+                                    static_cast<const SwFormatINetFormat *>(pItem);
                                 sURL = pURL->GetValue();
                             }
                             m_pCtrlStck->DeleteAndDestroy(nI-1);
@@ -718,7 +718,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
             if( pS->Count() )
             {
                 m_pDrawEditEngine->QuickSetAttribs( *pS,
-                    GetESelection( nTxtStart - nStartCp, nEnd - nStartCp ) );
+                    GetESelection( nTextStart - nStartCp, nEnd - nStartCp ) );
                 delete pS;
                 pS = new SfxItemSet(m_pDrawEditEngine->GetEmptyItemSet());
             }
@@ -934,13 +934,13 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP
 
 // InsertTxbxText() fuegt fuer TextBoxen und CaptionBoxen den Text
 // und die Attribute ein
-SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
+SwFrameFormat* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
     Size* pObjSiz, sal_uInt16 nTxBxS, sal_uInt16 nSequence, long nPosCp,
-    SwFrmFmt* pOldFlyFmt, bool bMakeSdrGrafObj, bool& rbEraseTextObj,
+    SwFrameFormat* pOldFlyFormat, bool bMakeSdrGrafObj, bool& rbEraseTextObj,
     bool* pbTestTxbxContainsText, long* pnStartCp, long* pnEndCp,
     bool* pbContainsGraphics, SvxMSDffImportRec* pRecord)
 {
-    SwFrmFmt* pFlyFmt = 0;
+    SwFrameFormat* pFlyFormat = 0;
     sal_uLong nOld = m_pStrm->Tell();
 
     ManTypes eType = m_pPlcxMan->GetManType() == MAN_HDFT ? MAN_TXBX_HDFT : MAN_TXBX;
@@ -1051,21 +1051,21 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
                                     ReplaceObject(pNew, pTextObj->GetOrdNum());
                             }
                             else
-                                pFlyFmt = ImportOle();
+                                pFlyFormat = ImportOle();
                             m_bObj = false;
                         }
                         else
                         {
                             InsertAttrsAsDrawingAttrs(nNewStartCp, nNewStartCp+1,
                                 eType, true);
-                            pFlyFmt = ImportGraf(bMakeSdrGrafObj ? pTextObj : 0,
-                                pOldFlyFmt);
+                            pFlyFormat = ImportGraf(bMakeSdrGrafObj ? pTextObj : 0,
+                                pOldFlyFormat);
                         }
                     }
                     break;
                 case 0x8:
                     if ( (!pbTestTxbxContainsText) && (!m_bObj) )
-                        pFlyFmt = Read_GrafLayer( nPosCp );
+                        pFlyFormat = Read_GrafLayer( nPosCp );
                     break;
                 default:
                     bDone = false;
@@ -1074,7 +1074,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
 
             if( bDone )
             {
-                if( pFlyFmt )
+                if( pFlyFormat )
                 {
                     if( pRecord )
                     {
@@ -1092,13 +1092,13 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
                                                  pRecord->eShapeType,
                                                  aInnerDist );
 
-                        pFlyFmt->SetFmtAttr( aFlySet );
+                        pFlyFormat->SetFormatAttr( aFlySet );
 
-                        MapWrapIntoFlyFmt(pRecord, pFlyFmt);
+                        MapWrapIntoFlyFormat(pRecord, pFlyFormat);
                     }
                 }
                 aString.clear();
-                rbEraseTextObj = (0 != pFlyFmt);
+                rbEraseTextObj = (0 != pFlyFormat);
             }
         }
     }
@@ -1140,7 +1140,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
     m_pStrm->Seek( nOld );
     if (pbContainsGraphics)
         *pbContainsGraphics = bContainsGraphics;
-    return pFlyFmt;
+    return pFlyFormat;
 }
 
 bool SwWW8ImplReader::TxbxChainContainsRealText(sal_uInt16 nTxBxS, long& rStartCp,
@@ -1153,12 +1153,12 @@ bool SwWW8ImplReader::TxbxChainContainsRealText(sal_uInt16 nTxBxS, long& rStartC
 }
 
 // TextBoxes only for Ver67 !!
-SdrObject* SwWW8ImplReader::ReadTxtBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
+SdrObject* SwWW8ImplReader::ReadTextBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
 {
     bool bDummy;
-    WW8_DP_TXTBOX aTxtB;
+    WW8_DP_TXTBOX aTextB;
 
-    if( !ReadGrafStart( (void*)&aTxtB, sizeof( aTxtB ), pHd, rSet ) )
+    if( !ReadGrafStart( (void*)&aTextB, sizeof( aTextB ), pHd, rSet ) )
         return 0;
 
     Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2,
@@ -1178,8 +1178,8 @@ SdrObject* SwWW8ImplReader::ReadTxtBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
     InsertTxbxText(dynamic_cast<SdrTextObj*>(pObj), &aSize, 0, 0, 0, 0, false,
         bDummy,0,&nStartCpFly,&nEndCpFly,&bContainsGraphics);
 
-    SetStdAttr( rSet, aTxtB.aLnt, aTxtB.aShd );
-    SetFill( rSet, aTxtB.aFill );
+    SetStdAttr( rSet, aTextB.aLnt, aTextB.aShd );
+    SetFill( rSet, aTextB.aFill );
 
     rSet.Put( SdrTextFitToSizeTypeItem( SDRTEXTFIT_NONE ) );
     rSet.Put( makeSdrTextAutoGrowWidthItem(false));
@@ -1301,7 +1301,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive(short& rLeft, SfxAllItemSet &rSet)
 
     if( rLeft >= SVBT16ToShort(aHd.cb) )    // Vorsichtsmassmahme
     {
-        rSet.Put(SwFmtSurround(SURROUND_THROUGHT));
+        rSet.Put(SwFormatSurround(SURROUND_THROUGHT));
         switch (SVBT16ToShort(aHd.dpk) & 0xff )
         {
             case 0:
@@ -1311,7 +1311,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive(short& rLeft, SfxAllItemSet &rSet)
                 pRet = ReadLine(&aHd, rSet);
                 break;
             case 2:
-                pRet = ReadTxtBox(&aHd, rSet);
+                pRet = ReadTextBox(&aHd, rSet);
                 break;
             case 3:
                 pRet = ReadRect(&aHd, rSet);
@@ -1401,17 +1401,17 @@ void SwWW8ImplReader::ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp )
             const int nXAlign = aDo.bx < nCntRelTo ? aDo.bx : 0;
             const int nYAlign = aDo.by < nCntRelTo ? aDo.by : 0;
 
-            aSet.Put(SwFmtHoriOrient(aRect.Left(), text::HoriOrientation::NONE,
+            aSet.Put(SwFormatHoriOrient(aRect.Left(), text::HoriOrientation::NONE,
                 aHoriRelOriTab[ nXAlign ]));
-            aSet.Put(SwFmtVertOrient(aRect.Top(), text::VertOrientation::NONE,
+            aSet.Put(SwFormatVertOrient(aRect.Top(), text::VertOrientation::NONE,
                 aVertRelOriTab[ nYAlign ]));
 
-            SwFrmFmt *pFrm = m_rDoc.getIDocumentContentOperations().InsertDrawObj( *m_pPaM, *pObject, aSet );
+            SwFrameFormat *pFrm = m_rDoc.getIDocumentContentOperations().InsertDrawObj( *m_pPaM, *pObject, aSet );
             pObject->SetMergedItemSet(aSet);
 
-            if (pFrm->ISA(SwDrawFrmFmt))
+            if (pFrm->ISA(SwDrawFrameFormat))
             {
-                static_cast<SwDrawFrmFmt*>(pFrm)->PosAttrSet();
+                static_cast<SwDrawFrameFormat*>(pFrm)->PosAttrSet();
             }
 
             AddAutoAnchor(pFrm);
@@ -1571,14 +1571,14 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
 /*
     am Rahmen zu setzende Frame-Attribute
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    SwFmtFrmSize            falls noch nicht gesetzt, hier setzen
+    SwFormatFrmSize            falls noch nicht gesetzt, hier setzen
     SvxLRSpaceItem          hier setzen
     SvxULSpaceItem          hier setzen
     SvxOpaqueItem           (Derzeit bei Rahmen nicht moeglich! khz 10.2.1999)
-    SwFmtSurround           bereits gesetzt
-    SwFmtVertOrient         bereits gesetzt
-    SwFmtHoriOrient         bereits gesetzt
-    SwFmtAnchor             bereits gesetzt
+    SwFormatSurround           bereits gesetzt
+    SwFormatVertOrient         bereits gesetzt
+    SwFormatHoriOrient         bereits gesetzt
+    SwFormatAnchor             bereits gesetzt
     SvxBoxItem              hier setzen
     SvxBrushItem            hier setzen
     SvxShadowItem           hier setzen
@@ -1669,21 +1669,21 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
     bool bFixSize = !(WW8ITEMVALUE(rOldSet, SDRATTR_TEXT_AUTOGROWHEIGHT,
         SdrOnOffItem));
 
-    // Size: SwFmtFrmSize
+    // Size: SwFormatFrmSize
     if( SfxItemState::SET != rFlySet.GetItemState(RES_FRM_SIZE, false) )
     {
         const Rectangle& rSnapRect = pSdrObj->GetSnapRect();
         // if necessary adapt width and position of the framework: The
         // recorded interior is to remain equally large despite thick edges.
-        rFlySet.Put( SwFmtFrmSize(bFixSize ? ATT_FIX_SIZE : ATT_VAR_SIZE,
+        rFlySet.Put( SwFormatFrmSize(bFixSize ? ATT_FIX_SIZE : ATT_VAR_SIZE,
             rSnapRect.GetWidth()  + 2*nOutside,
             rSnapRect.GetHeight() + 2*nOutside) );
     }
     else // If a size is set, adjust it to consider border thickness
     {
-        SwFmtFrmSize aSize = static_cast<const SwFmtFrmSize &>(rFlySet.Get(RES_FRM_SIZE));
+        SwFormatFrmSize aSize = static_cast<const SwFormatFrmSize &>(rFlySet.Get(RES_FRM_SIZE));
 
-        SwFmtFrmSize aNewSize = SwFmtFrmSize(bFixSize ? ATT_FIX_SIZE : ATT_VAR_SIZE,
+        SwFormatFrmSize aNewSize = SwFormatFrmSize(bFixSize ? ATT_FIX_SIZE : ATT_VAR_SIZE,
             aSize.GetWidth()  + 2*nOutside,
             aSize.GetHeight() + 2*nOutside);
         aNewSize.SetWidthSizeType(aSize.GetWidthSizeType());
@@ -1694,12 +1694,12 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
     // graphic in relation to the top left inside the border. We don't
     if (nOutside)
     {
-        SwFmtHoriOrient aHori = static_cast<const SwFmtHoriOrient &>(rFlySet.Get(
+        SwFormatHoriOrient aHori = static_cast<const SwFormatHoriOrient &>(rFlySet.Get(
             RES_HORI_ORIENT));
         aHori.SetPos(MakeSafePositioningValue(aHori.GetPos()-nOutside));
         rFlySet.Put(aHori);
 
-        SwFmtVertOrient aVert = static_cast<const SwFmtVertOrient &>(rFlySet.Get(
+        SwFormatVertOrient aVert = static_cast<const SwFormatVertOrient &>(rFlySet.Get(
             RES_VERT_ORIENT));
         aVert.SetPos(aVert.GetPos()-nOutside);
         rFlySet.Put(aVert);
@@ -1885,10 +1885,10 @@ void SwWW8ImplReader::AdjustULWrapForWordMargins(
         rUL.SetUpper((sal_uInt16)0);
 }
 
-void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord,
-    SwFrmFmt* pFlyFmt)
+void SwWW8ImplReader::MapWrapIntoFlyFormat(SvxMSDffImportRec* pRecord,
+    SwFrameFormat* pFlyFormat)
 {
-    if (!pRecord || !pFlyFmt)
+    if (!pRecord || !pFlyFormat)
         return;
 
     if (pRecord->nDxWrapDistLeft || pRecord->nDxWrapDistRight)
@@ -1896,20 +1896,20 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord,
         SvxLRSpaceItem aLR(writer_cast<sal_uInt16>(pRecord->nDxWrapDistLeft),
             writer_cast<sal_uInt16>(pRecord->nDxWrapDistRight), 0, 0, RES_LR_SPACE);
         AdjustLRWrapForWordMargins(*pRecord, aLR);
-        pFlyFmt->SetFmtAttr(aLR);
+        pFlyFormat->SetFormatAttr(aLR);
     }
     if (pRecord->nDyWrapDistTop || pRecord->nDyWrapDistBottom)
     {
         SvxULSpaceItem aUL(writer_cast<sal_uInt16>(pRecord->nDyWrapDistTop),
             writer_cast<sal_uInt16>(pRecord->nDyWrapDistBottom), RES_UL_SPACE);
         AdjustULWrapForWordMargins(*pRecord, aUL);
-        pFlyFmt->SetFmtAttr(aUL);
+        pFlyFormat->SetFormatAttr(aUL);
     }
 
     // If we are contoured and have a custom polygon...
-    if (pRecord->pWrapPolygon && pFlyFmt->GetSurround().IsContour())
+    if (pRecord->pWrapPolygon && pFlyFormat->GetSurround().IsContour())
     {
-        if (SwNoTxtNode *pNd = GetNoTxtNodeFromSwFrmFmt(*pFlyFmt))
+        if (SwNoTextNode *pNd = GetNoTextNodeFromSwFrameFormat(*pFlyFormat))
         {
 
             /*
@@ -2003,9 +2003,9 @@ static sal_Int32 lcl_ConvertCrop(sal_uInt32 const nCrop, sal_Int32 const nSize)
 
 void
 SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec const*const pRecord,
-    SwFrmFmt *pFlyFmt, WW8_FSPA *pF )
+    SwFrameFormat *pFlyFormat, WW8_FSPA *pF )
 {
-    const SwNodeIndex* pIdx = pFlyFmt->GetCntnt(false).GetCntntIdx();
+    const SwNodeIndex* pIdx = pFlyFormat->GetContent(false).GetContentIdx();
     SwGrfNode* pGrfNd;
     if( pIdx && 0 != (pGrfNd = m_rDoc.GetNodes()[pIdx->GetIndex() + 1]->GetGrfNode() ))
     {
@@ -2084,17 +2084,17 @@ SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec const*const pRecord,
     }
 }
 
-SdrObject* SwWW8ImplReader::CreateContactObject(SwFrmFmt* pFlyFmt)
+SdrObject* SwWW8ImplReader::CreateContactObject(SwFrameFormat* pFlyFormat)
 {
-    if (pFlyFmt)
+    if (pFlyFormat)
     {
-        SdrObject* pNewObject = m_bNewDoc ? 0 : pFlyFmt->FindRealSdrObject();
+        SdrObject* pNewObject = m_bNewDoc ? 0 : pFlyFormat->FindRealSdrObject();
         if (!pNewObject)
-            pNewObject = pFlyFmt->FindSdrObject();
-        if (!pNewObject && pFlyFmt->ISA(SwFlyFrmFmt))
+            pNewObject = pFlyFormat->FindSdrObject();
+        if (!pNewObject && pFlyFormat->ISA(SwFlyFrameFormat))
         {
             SwFlyDrawContact* pContactObject
-                = new SwFlyDrawContact(static_cast<SwFlyFrmFmt*>(pFlyFmt),
+                = new SwFlyDrawContact(static_cast<SwFlyFrameFormat*>(pFlyFormat),
                 m_pDrawModel);
             pNewObject = pContactObject->GetMaster();
         }
@@ -2174,7 +2174,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
 
     RndStdIds eAnchor = IsInlineEscherHack() ? FLY_AS_CHAR : FLY_AT_CHAR; // #i43718#
 
-    SwFmtAnchor aAnchor( eAnchor );
+    SwFormatAnchor aAnchor( eAnchor );
     aAnchor.SetAnchor( m_pPaM->GetPoint() );
     rFlySet.Put( aAnchor );
 
@@ -2318,14 +2318,14 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
         if ((eVertRel == text::RelOrientation::TEXT_LINE) && (eVertOri == text::VertOrientation::NONE))
             nYPos = -nYPos;
 
-        SwFmtHoriOrient aHoriOri(MakeSafePositioningValue(  bCurSectionVertical ? nYPos : pFSPA->nXaLeft ),
+        SwFormatHoriOrient aHoriOri(MakeSafePositioningValue(  bCurSectionVertical ? nYPos : pFSPA->nXaLeft ),
                                                             bCurSectionVertical ? eVertOri : eHoriOri,
                                                             bCurSectionVertical ? eVertRel : eHoriRel);
         if( 4 <= nXAlign )
             aHoriOri.SetPosToggle(true);
         rFlySet.Put( aHoriOri );
 
-        rFlySet.Put(SwFmtVertOrient(MakeSafePositioningValue( !bCurSectionVertical ? nYPos : -pFSPA->nXaRight ),
+        rFlySet.Put(SwFormatVertOrient(MakeSafePositioningValue( !bCurSectionVertical ? nYPos : -pFSPA->nXaRight ),
                                                                 !bCurSectionVertical ? eVertOri : eHoriOri,
                                                                 !bCurSectionVertical ? eVertRel : eHoriRel ));
     }
@@ -2382,7 +2382,7 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTable
     return bIsObjectLayoutInTableCell;
 }
 
-SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
+SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
 {
     if( m_nIniFlags & WW8FL_NO_GRAFLAYER )
         return 0;
@@ -2524,7 +2524,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
         }
     }
 
-    SwFmtSurround aSur( eSurround );
+    SwFormatSurround aSur( eSurround );
     aSur.SetContour( bContour );
     aSur.SetOutside(true); // Winword kann nur Aussen-Konturen
     aFlySet.Put( aSur );
@@ -2564,7 +2564,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     // inside table cell and its wrapping isn't 'SURROUND_THROUGH'
     if (bLayoutInTableCell && eSurround != SURROUND_THROUGHT)
     {
-        SwFmtFollowTextFlow aFollowTextFlow( true );
+        SwFormatFollowTextFlow aFollowTextFlow( true );
         aFlySet.Put( aFollowTextFlow );
     }
 
@@ -2597,14 +2597,14 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
                 }
             }
         }
-        SwFmtURL* pFmtURL = new SwFmtURL();
-        pFmtURL->SetURL( lnName, false );
+        SwFormatURL* pFormatURL = new SwFormatURL();
+        pFormatURL->SetURL( lnName, false );
         if (!aObjName.isEmpty())
-            pFmtURL->SetName(aObjName);
+            pFormatURL->SetName(aObjName);
         if (!aTarFrm.isEmpty())
-            pFmtURL->SetTargetFrameName(aTarFrm);
-        pFmtURL->SetMap(0);
-        aFlySet.Put(*pFmtURL);
+            pFormatURL->SetTargetFrameName(aTarFrm);
+        pFormatURL->SetMap(0);
+        aFlySet.Put(*pFormatURL);
     }
 
     // If we are to be "below text" then we are not to be opaque
@@ -2620,11 +2620,11 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
 
     OUString aObjName = pObject->GetName();
 
-    SwFrmFmt* pRetFrmFmt = 0;
+    SwFrameFormat* pRetFrameFormat = 0;
     if (bReplaceable)
     {
         // Single graphics or ole objects
-        pRetFrmFmt = ImportReplaceableDrawables(pObject, pOurNewObject, pRecord,
+        pRetFrameFormat = ImportReplaceableDrawables(pObject, pOurNewObject, pRecord,
             pF, aFlySet);
     }
     else
@@ -2642,9 +2642,9 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
         // Should we, and is it possible to make this into a writer textbox
         if ((!(m_nIniFlags1 & WW8FL_NO_FLY_FOR_TXBX)) && pRecord->bReplaceByFly)
         {
-            pRetFrmFmt = ConvertDrawTextToFly(pObject, pOurNewObject, pRecord,
+            pRetFrameFormat = ConvertDrawTextToFly(pObject, pOurNewObject, pRecord,
                 eAnchor, pF, aFlySet);
-            if (pRetFrmFmt)
+            if (pRetFrameFormat)
                 bDone = true;
         }
 
@@ -2668,9 +2668,9 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
                 m_pWWZOrder->InsertTextLayerObject(pObject);
             }
 
-            pRetFrmFmt = m_rDoc.getIDocumentContentOperations().InsertDrawObj(*m_pPaM, *pObject, aFlySet );
+            pRetFrameFormat = m_rDoc.getIDocumentContentOperations().InsertDrawObj(*m_pPaM, *pObject, aFlySet );
 
-            OSL_ENSURE(pRetFrmFmt->GetAnchor().GetAnchorId() ==
+            OSL_ENSURE(pRetFrameFormat->GetAnchor().GetAnchorId() ==
                 eAnchor, "Not the anchor type requested!");
 
             /*
@@ -2683,9 +2683,9 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
                 {
                     pRecord = &const_cast<SvxMSDffImportRec&>(*it);
                     if (pRecord->pObj && pRecord->aTextId.nTxBxS)
-                    { // #i52825# pRetFrmFmt can be NULL
-                        pRetFrmFmt = MungeTextIntoDrawBox(pRecord->pObj,
-                            pRecord, nGrafAnchorCp, pRetFrmFmt);
+                    { // #i52825# pRetFrameFormat can be NULL
+                        pRetFrameFormat = MungeTextIntoDrawBox(pRecord->pObj,
+                            pRecord, nGrafAnchorCp, pRetFrameFormat);
                     }
                 }
             }
@@ -2693,20 +2693,20 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     }
 
     // #i44344#, #i44681# - positioning attributes already set
-    if ( pRetFrmFmt /*#i52825# */ && pRetFrmFmt->ISA(SwDrawFrmFmt) )
+    if ( pRetFrameFormat /*#i52825# */ && pRetFrameFormat->ISA(SwDrawFrameFormat) )
     {
-        static_cast<SwDrawFrmFmt*>(pRetFrmFmt)->PosAttrSet();
+        static_cast<SwDrawFrameFormat*>(pRetFrameFormat)->PosAttrSet();
     }
     if (!IsInlineEscherHack())
-        MapWrapIntoFlyFmt(pRecord, pRetFrmFmt);
+        MapWrapIntoFlyFormat(pRecord, pRetFrameFormat);
 
     // Set frame name with object name
-    if( pRetFrmFmt /*#i52825# */ && !aObjName.isEmpty() )
-        pRetFrmFmt->SetName( aObjName );
-    return AddAutoAnchor(pRetFrmFmt);
+    if( pRetFrameFormat /*#i52825# */ && !aObjName.isEmpty() )
+        pRetFrameFormat->SetName( aObjName );
+    return AddAutoAnchor(pRetFrameFormat);
 }
 
-SwFrmFmt *SwWW8ImplReader::AddAutoAnchor(SwFrmFmt *pFmt)
+SwFrameFormat *SwWW8ImplReader::AddAutoAnchor(SwFrameFormat *pFormat)
 {
     /*
      * anchored to character at the current position will move along the
@@ -2714,15 +2714,15 @@ SwFrmFmt *SwWW8ImplReader::AddAutoAnchor(SwFrmFmt *pFmt)
      *
      * Leave to later and set the correct location then.
      */
-    if ((pFmt) && (pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR))
+    if ((pFormat) && (pFormat->GetAnchor().GetAnchorId() != FLY_AS_CHAR))
     {
-        m_pAnchorStck->AddAnchor(*m_pPaM->GetPoint(), pFmt);
+        m_pAnchorStck->AddAnchor(*m_pPaM->GetPoint(), pFormat);
     }
-    return pFmt;
+    return pFormat;
 }
 
-SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
-    SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrmFmt* pRetFrmFmt)
+SwFrameFormat* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
+    SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrameFormat* pRetFrameFormat)
 {
     SdrTextObj* pSdrTextObj;
 
@@ -2766,7 +2766,7 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
         const size_t nOrdNum = pSdrTextObj->GetOrdNum();
         bool bEraseThisObject;
         InsertTxbxText( pSdrTextObj, &aObjSize, pRecord->aTextId.nTxBxS,
-            pRecord->aTextId.nSequence, nGrafAnchorCp, pRetFrmFmt,
+            pRecord->aTextId.nSequence, nGrafAnchorCp, pRetFrameFormat,
             (pSdrTextObj != pTrueObject) || (0 != pGroupObject),
             bEraseThisObject, 0, 0, 0, 0, pRecord);
 
@@ -2799,8 +2799,8 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
                     m_pDrawPg->RemoveObject( pSdrTextObj->GetOrdNum() );
                 // und FrameFormat entfernen, da durch Grafik ersetzt (dies
                 // loescht auch das Objekt)
-                m_rDoc.DelFrmFmt( pRetFrmFmt );
-                pRetFrmFmt = 0;
+                m_rDoc.DelFrameFormat( pRetFrameFormat );
+                pRetFrameFormat = 0;
                 // auch den Objektmerker loeschen
                 pRecord->pObj = 0;
             }
@@ -2817,14 +2817,14 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
             pSdrTextObj->SetMergedItemSetAndBroadcast(aItemSet);
         }
     }
-    return pRetFrmFmt;
+    return pRetFrameFormat;
 }
 
-SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
+SwFlyFrameFormat* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
     SdrObject* &rpOurNewObject, SvxMSDffImportRec* pRecord, RndStdIds eAnchor,
     WW8_FSPA *pF, SfxItemSet &rFlySet)
 {
-    SwFlyFrmFmt* pRetFrmFmt = 0;
+    SwFlyFrameFormat* pRetFrameFormat = 0;
     long nStartCp;
     long nEndCp;
 
@@ -2840,7 +2840,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
         Rectangle aInnerDist(pRecord->nDxTextLeft, pRecord->nDyTextTop,
             pRecord->nDxTextRight, pRecord->nDyTextBottom);
 
-        SwFmtFrmSize aFrmSize(ATT_FIX_SIZE, pF->nXaRight - pF->nXaLeft, pF->nYaBottom - pF->nYaTop);
+        SwFormatFrmSize aFrmSize(ATT_FIX_SIZE, pF->nXaRight - pF->nXaLeft, pF->nYaBottom - pF->nYaTop);
         aFrmSize.SetWidthSizeType(pRecord->bAutoWidth ? ATT_VAR_SIZE : ATT_FIX_SIZE);
         rFlySet.Put(aFrmSize);
 
@@ -2851,13 +2851,13 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
         if (pSdrTextObj && pSdrTextObj->IsVerticalWriting())
             rFlySet.Put(SvxFrameDirectionItem(FRMDIR_VERT_TOP_RIGHT, RES_FRAMEDIR));
 
-        pRetFrmFmt = m_rDoc.MakeFlySection(eAnchor, m_pPaM->GetPoint(), &rFlySet);
-        OSL_ENSURE(pRetFrmFmt->GetAnchor().GetAnchorId() == eAnchor,
+        pRetFrameFormat = m_rDoc.MakeFlySection(eAnchor, m_pPaM->GetPoint(), &rFlySet);
+        OSL_ENSURE(pRetFrameFormat->GetAnchor().GetAnchorId() == eAnchor,
             "Not the anchor type requested!");
 
         // if everything is OK, find pointer on new object and correct
         // Z-order list (oder delete entry)
-        rpOurNewObject = CreateContactObject(pRetFrmFmt);
+        rpOurNewObject = CreateContactObject(pRetFrameFormat);
 
         // remove old object from the Z-Order list
         m_pMSDffManager->RemoveFromShapeOrder( rpObject );
@@ -2872,18 +2872,18 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
         {
             /*
             We do not store our rpOutNewObject in the ShapeOrder because we
-            have a FrmFmt from which we can regenerate the contact object when
+            have a FrameFormat from which we can regenerate the contact object when
             we need it. Because, we can have frames anchored to paragraphs in
             header/footers and we can copy header/footers, if we do copy a
             header/footer with a nonpage anchored frame in it then the contact
-            objects are invalidated. Under this condition the FrmFmt will be
+            objects are invalidated. Under this condition the FrameFormat will be
             updated to reflect this change and can be used to get a new
             contact object, while a raw rpOutNewObject stored here becomes
             deleted and useless.
             */
             m_pMSDffManager->StoreShapeOrder(pF->nSpId,
                 (((sal_uLong)pRecord->aTextId.nTxBxS) << 16) +
-                pRecord->aTextId.nSequence, 0, pRetFrmFmt);
+                pRecord->aTextId.nSequence, 0, pRetFrameFormat);
 
             // The Contact object has to be inserted into the draw page, so
             // SwWW8ImplReader::LoadDoc1() can determine the z-order.
@@ -2901,7 +2901,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
             // save flags etc and reset them
             WW8ReaderSave aSave( this );
 
-            MoveInsideFly(pRetFrmFmt);
+            MoveInsideFly(pRetFrameFormat);
 
             SwNodeIndex aStart(m_pPaM->GetPoint()->nNode);
 
@@ -2915,15 +2915,15 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
 
             m_pWWZOrder->OutsideEscher();
 
-            MoveOutsideFly(pRetFrmFmt, aSave.GetStartPos(),!bJoined);
+            MoveOutsideFly(pRetFrameFormat, aSave.GetStartPos(),!bJoined);
 
             aSave.Restore( this );
 
-            StripNegativeAfterIndent(pRetFrmFmt);
+            StripNegativeAfterIndent(pRetFrameFormat);
         }
 
     }
-    return pRetFrmFmt;
+    return pRetFrameFormat;
 }
 
 void MatchEscherMirrorIntoFlySet(const SvxMSDffImportRec &rRecord,
@@ -2942,11 +2942,11 @@ void MatchEscherMirrorIntoFlySet(const SvxMSDffImportRec &rRecord,
     }
 }
 
-SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
+SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
     SdrObject* &rpOurNewObject, SvxMSDffImportRec* pRecord, WW8_FSPA *pF,
     SfxItemSet &rFlySet )
 {
-    SwFlyFrmFmt* pRetFrmFmt = 0;
+    SwFlyFrameFormat* pRetFrameFormat = 0;
     long nWidthTw  = pF->nXaRight - pF->nXaLeft;
     if (0 > nWidthTw)
         nWidthTw = 0;
@@ -2956,7 +2956,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
 
     ProcessEscherAlign(pRecord, pF, rFlySet, true);
 
-    rFlySet.Put(SwFmtFrmSize(ATT_FIX_SIZE, nWidthTw, nHeightTw));
+    rFlySet.Put(SwFormatFrmSize(ATT_FIX_SIZE, nWidthTw, nHeightTw));
 
     SfxItemSet aGrSet(m_rDoc.GetAttrPool(), RES_GRFATR_BEGIN, RES_GRFATR_END-1);
 
@@ -2974,7 +2974,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
 
     OUString aObjectName(rpObject->GetName());
     if (OBJ_OLE2 == SdrObjKind(rpObject->GetObjIdentifier()))
-        pRetFrmFmt = InsertOle(*static_cast<SdrOle2Obj*>(rpObject), rFlySet, aGrSet);
+        pRetFrameFormat = InsertOle(*static_cast<SdrOle2Obj*>(rpObject), rFlySet, aGrSet);
     else
     {
         const SdrGrafObj *pGrf = static_cast<const SdrGrafObj*>(rpObject);
@@ -2991,7 +2991,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
             // as a linked graphic -
             if (GRAPHIC_NONE == eType || CanUseRemoteLink(aGrfName))
             {
-                pRetFrmFmt = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, aGrfName, OUString(), 0,
+                pRetFrameFormat = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, aGrfName, OUString(), 0,
                     &rFlySet, &aGrSet, NULL);
                 bDone = true;
             }
@@ -2999,24 +2999,24 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
         if (!bDone)
         {
             const Graphic& rGraph = pGrf->GetGraphic();
-            pRetFrmFmt = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, OUString(), OUString(), &rGraph,
+            pRetFrameFormat = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, OUString(), OUString(), &rGraph,
                 &rFlySet, &aGrSet, NULL);
         }
     }
 
-    if (pRetFrmFmt)
+    if (pRetFrameFormat)
     {
         if( pRecord )
         {
             if( OBJ_OLE2 != SdrObjKind(rpObject->GetObjIdentifier()) )
-                SetAttributesAtGrfNode( pRecord, pRetFrmFmt, pF );
+                SetAttributesAtGrfNode( pRecord, pRetFrameFormat, pF );
         }
         // mehrfaches Auftreten gleicher Grafik-Namen vermeiden
-        m_aGrfNameGenerator.SetUniqueGraphName(pRetFrmFmt, aObjectName);
+        m_aGrfNameGenerator.SetUniqueGraphName(pRetFrameFormat, aObjectName);
     }
     // falls alles Ok, Zeiger auf neues Objekt ermitteln und Z-Order-Liste
     // entsprechend korrigieren (oder Eintrag loeschen)
-    rpOurNewObject = CreateContactObject(pRetFrmFmt);
+    rpOurNewObject = CreateContactObject(pRetFrameFormat);
 
     // altes Objekt aus der Z-Order-Liste entfernen
     m_pMSDffManager->RemoveFromShapeOrder( rpObject );
@@ -3033,7 +3033,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
     // Kontakt-Objekt in die Z-Order-Liste und die Page aufnehmen
     if (rpOurNewObject)
     {
-        if (!m_bHdFtFtnEdn)
+        if (!m_bHdFtFootnoteEdn)
             m_pMSDffManager->StoreShapeOrder(pF->nSpId, 0, rpOurNewObject, 0 );
 
         // Das Kontakt-Objekt MUSS in die Draw-Page gesetzt werden, damit in
@@ -3045,7 +3045,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
                                            m_bIsHeader || m_bIsFooter );
         }
     }
-    return pRetFrmFmt;
+    return pRetFrameFormat;
 }
 
 void SwWW8ImplReader::GrafikCtor()  // Fuer SVDraw und VCControls und Escher
@@ -3076,11 +3076,11 @@ void SwWW8ImplReader::GrafikDtor()
     DELETEZ(m_pWWZOrder);       // dito
 }
 
-void SwWW8FltAnchorStack::AddAnchor(const SwPosition& rPos, SwFrmFmt *pFmt)
+void SwWW8FltAnchorStack::AddAnchor(const SwPosition& rPos, SwFrameFormat *pFormat)
 {
-    OSL_ENSURE(pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR,
+    OSL_ENSURE(pFormat->GetAnchor().GetAnchorId() != FLY_AS_CHAR,
         "Don't use fltanchors with inline frames, slap!");
-    NewAttr(rPos, SwFltAnchor(pFmt));
+    NewAttr(rPos, SwFltAnchor(pFormat));
 }
 
 void SwWW8FltAnchorStack::Flush()
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 6c5efc2bc0fd..e06a210663b2 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -344,9 +344,9 @@ void SwWW8ImplReader::ReplaceObj(const SdrObject &rReplaceObj,
     }
 }
 
-// MakeGrafNotInCntnt setzt eine nicht-Zeichengebundene Grafik
+// MakeGrafNotInContent setzt eine nicht-Zeichengebundene Grafik
 // ( bGrafApo == true)
-SwFlyFrmFmt* SwWW8ImplReader::MakeGrafNotInCntnt(const WW8PicDesc& rPD,
+SwFlyFrameFormat* SwWW8ImplReader::MakeGrafNotInContent(const WW8PicDesc& rPD,
     const Graphic* pGraph, const OUString& rFileName, const SfxItemSet& rGrfSet)
 {
 
@@ -361,40 +361,40 @@ SwFlyFrmFmt* SwWW8ImplReader::MakeGrafNotInCntnt(const WW8PicDesc& rPD,
 
     WW8FlySet aFlySet(*this, m_pWFlyPara, m_pSFlyPara, true);
 
-    SwFmtAnchor aAnchor(m_pSFlyPara->eAnchor);
+    SwFormatAnchor aAnchor(m_pSFlyPara->eAnchor);
     aAnchor.SetAnchor(m_pPaM->GetPoint());
     aFlySet.Put(aAnchor);
 
-    aFlySet.Put( SwFmtFrmSize( ATT_FIX_SIZE, nWidth, nHeight ) );
+    aFlySet.Put( SwFormatFrmSize( ATT_FIX_SIZE, nWidth, nHeight ) );
 
-    SwFlyFrmFmt* pFlyFmt = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, rFileName, OUString(), pGraph,
+    SwFlyFrameFormat* pFlyFormat = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, rFileName, OUString(), pGraph,
         &aFlySet, &rGrfSet, NULL);
 
     // Damit die Frames bei Einfuegen in existierendes Doc erzeugt werden:
     if (m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() &&
-        (FLY_AT_PARA == pFlyFmt->GetAnchor().GetAnchorId()))
+        (FLY_AT_PARA == pFlyFormat->GetAnchor().GetAnchorId()))
     {
-        pFlyFmt->MakeFrms();
+        pFlyFormat->MakeFrms();
     }
-    return pFlyFmt;
+    return pFlyFormat;
 }
 
-// MakeGrafInCntnt fuegt zeichengebundene Grafiken ein
-SwFrmFmt* SwWW8ImplReader::MakeGrafInCntnt(const WW8_PIC& rPic,
+// MakeGrafInContent fuegt zeichengebundene Grafiken ein
+SwFrameFormat* SwWW8ImplReader::MakeGrafInContent(const WW8_PIC& rPic,
     const WW8PicDesc& rPD, const Graphic* pGraph, const OUString& rFileName,
     const SfxItemSet& rGrfSet)
 {
     WW8FlySet aFlySet(*this, m_pPaM, rPic, rPD.nWidth, rPD.nHeight);
 
-    SwFrmFmt* pFlyFmt = 0;
+    SwFrameFormat* pFlyFormat = 0;
 
     if (rFileName.isEmpty() && m_nObjLocFc)      // dann sollte ists ein OLE-Object
-        pFlyFmt = ImportOle(pGraph, &aFlySet, &rGrfSet);
+        pFlyFormat = ImportOle(pGraph, &aFlySet, &rGrfSet);
 
-    if( !pFlyFmt )                          // dann eben als Graphic
+    if( !pFlyFormat )                          // dann eben als Graphic
     {
 
-        pFlyFmt = m_rDoc.getIDocumentContentOperations().Insert( *m_pPaM, rFileName, OUString(), pGraph, &aFlySet,
+        pFlyFormat = m_rDoc.getIDocumentContentOperations().Insert( *m_pPaM, rFileName, OUString(), pGraph, &aFlySet,
             &rGrfSet, NULL);
     }
 
@@ -402,13 +402,13 @@ SwFrmFmt* SwWW8ImplReader::MakeGrafInCntnt(const WW8_PIC& rPic,
     //  ( nur wenn Auto-Breite )
     if( m_pSFlyPara )
         m_pSFlyPara->BoxUpWidth( rPD.nWidth );
-    return pFlyFmt;
+    return pFlyFormat;
 }
 
-SwFrmFmt* SwWW8ImplReader::ImportGraf1(WW8_PIC& rPic, SvStream* pSt,
+SwFrameFormat* SwWW8ImplReader::ImportGraf1(WW8_PIC& rPic, SvStream* pSt,
     sal_uLong nFilePos )
 {
-    SwFrmFmt* pRet = 0;
+    SwFrameFormat* pRet = 0;
     if( pSt->IsEof() || rPic.fError || rPic.MFP.mm == 99 )
         return 0;
 
@@ -433,9 +433,9 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf1(WW8_PIC& rPic, SvStream* pSt,
     }
 
     if( m_pWFlyPara && m_pWFlyPara->bGrafApo )
-        pRet = MakeGrafNotInCntnt(aPD,pGraph,aFileName,aGrfSet);
+        pRet = MakeGrafNotInContent(aPD,pGraph,aFileName,aGrfSet);
     else
-        pRet = MakeGrafInCntnt(rPic,aPD,pGraph,aFileName,aGrfSet);
+        pRet = MakeGrafInContent(rPic,aPD,pGraph,aFileName,aGrfSet);
     delete pGraph;
     return pRet;
 }
@@ -455,10 +455,10 @@ void SwWW8ImplReader::PicRead(SvStream *pDataStream, WW8_PIC *pPic,
         pDataStream->SeekRel(2);  //cProps
 }
 
-SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
-    SwFrmFmt* pOldFlyFmt)
+SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
+    SwFrameFormat* pOldFlyFormat)
 {
-    SwFrmFmt* pRet = 0;
+    SwFrameFormat* pRet = 0;
     if (
         ((m_pStrm == m_pDataStream ) && !m_nPicLocFc) ||
         (m_nIniFlags & WW8FL_NO_GRAF)
@@ -486,7 +486,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
         // Feld-Result ein WMF-aehnliches Struct vorkommt.
     if ((aPic.lcb >= 58) && !m_pDataStream->GetError())
     {
-        if( m_pFlyFmtOfJustInsertedGraphic )
+        if( m_pFlyFormatOfJustInsertedGraphic )
         {
             // Soeben haben wir einen Grafik-Link ins Doc inserted.
             // Wir muessen ihn jetzt noch Positioniern und Skalieren.
@@ -499,14 +499,14 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
             // is after the position if it is anchored in content; because this anchor add
             // a character into the textnode. #i2806#
             if (FLY_AS_CHAR ==
-                m_pFlyFmtOfJustInsertedGraphic->GetAnchor().GetAnchorId() )
+                m_pFlyFormatOfJustInsertedGraphic->GetAnchor().GetAnchorId() )
             {
                 aFlySet.ClearItem( RES_ANCHOR );
             }
 
-            m_pFlyFmtOfJustInsertedGraphic->SetFmtAttr( aFlySet );
+            m_pFlyFormatOfJustInsertedGraphic->SetFormatAttr( aFlySet );
 
-            m_pFlyFmtOfJustInsertedGraphic = 0;
+            m_pFlyFormatOfJustInsertedGraphic = 0;
         }
         else if((0x64 == aPic.MFP.mm) || (0x66 == aPic.MFP.mm))
         {
@@ -579,7 +579,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
                     {
                         WW8FlySet aFlySet(*this, m_pWFlyPara, m_pSFlyPara, true);
 
-                        SwFmtAnchor aAnchor(m_pSFlyPara->eAnchor);
+                        SwFormatAnchor aAnchor(m_pSFlyPara->eAnchor);
                         aAnchor.SetAnchor(m_pPaM->GetPoint());
                         aFlySet.Put(aAnchor);
 
@@ -601,7 +601,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
 
                     //Groesse aus der WinWord PIC-Struktur als
                     //Grafik-Groesse nehmen
-                    aAttrSet.Put( SwFmtFrmSize( ATT_FIX_SIZE, aPD.nWidth,
+                    aAttrSet.Put( SwFormatFrmSize( ATT_FIX_SIZE, aPD.nWidth,
                         aPD.nHeight ) );
                 }
 
@@ -620,19 +620,19 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
 
                 // ggfs. altes AttrSet uebernehmen und
                 // horiz. Positionierungs-Relation korrigieren
-                if( pOldFlyFmt )
+                if( pOldFlyFormat )
                 {
-                    aAttrSet.Put( pOldFlyFmt->GetAttrSet() );
-                    const SwFmtHoriOrient &rHori = pOldFlyFmt->GetHoriOrient();
+                    aAttrSet.Put( pOldFlyFormat->GetAttrSet() );
+                    const SwFormatHoriOrient &rHori = pOldFlyFormat->GetHoriOrient();
                     if( text::RelOrientation::FRAME == rHori.GetRelationOrient() )
                     {
-                        aAttrSet.Put( SwFmtHoriOrient( rHori.GetPos(),
+                        aAttrSet.Put( SwFormatHoriOrient( rHori.GetPos(),
                             text::HoriOrientation::NONE, text::RelOrientation::PAGE_PRINT_AREA ) );
                     }
                 }
 
                 bool bTextObjWasGrouped = false;
-                if (pOldFlyFmt && pTextObj && pTextObj->GetUpGroup())
+                if (pOldFlyFormat && pTextObj && pTextObj->GetUpGroup())
                     bTextObjWasGrouped = true;
 
                 if (bTextObjWasGrouped)
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index a216ed4b9d0e..04a1d7699735 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1201,7 +1201,7 @@ void SwWW8ImplReader::Read_StyleCode( sal_uInt16, const sal_uInt8* pData, short
         nColl = SVBT16ToShort(pData);
     if (nColl < m_vColl.size())
     {
-        SetTxtFmtCollAndListLevel( *m_pPaM, m_vColl[nColl] );
+        SetTextFormatCollAndListLevel( *m_pPaM, m_vColl[nColl] );
         m_bCpxStyle = true;
     }
 }
@@ -1255,34 +1255,34 @@ SwFltStackEntry* SwWW8FltControlStack::SetAttr(const SwPosition& rPos, sal_uInt1
     return pRet;
 }
 
-long GetListFirstLineIndent(const SwNumFmt &rFmt)
+long GetListFirstLineIndent(const SwNumFormat &rFormat)
 {
-    OSL_ENSURE( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
+    OSL_ENSURE( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
             "<GetListFirstLineIndent> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION" );
 
-    SvxAdjust eAdj = rFmt.GetNumAdjust();
+    SvxAdjust eAdj = rFormat.GetNumAdjust();
     long nReverseListIndented;
     if (eAdj == SVX_ADJUST_RIGHT)
-        nReverseListIndented = -rFmt.GetCharTextDistance();
+        nReverseListIndented = -rFormat.GetCharTextDistance();
     else if (eAdj == SVX_ADJUST_CENTER)
-        nReverseListIndented = rFmt.GetFirstLineOffset()/2;
+        nReverseListIndented = rFormat.GetFirstLineOffset()/2;
     else
-        nReverseListIndented = rFmt.GetFirstLineOffset();
+        nReverseListIndented = rFormat.GetFirstLineOffset();
     return nReverseListIndented;
 }
 
-static long lcl_GetTrueMargin(const SvxLRSpaceItem &rLR, const SwNumFmt &rFmt,
+static long lcl_GetTrueMargin(const SvxLRSpaceItem &rLR, const SwNumFormat &rFormat,
     long &rFirstLinePos)
 {
-    OSL_ENSURE( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
+    OSL_ENSURE( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
             "<lcl_GetTrueMargin> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION" );
 
-    const long nBodyIndent = rLR.GetTxtLeft();
-    const long nFirstLineDiff = rLR.GetTxtFirstLineOfst();
+    const long nBodyIndent = rLR.GetTextLeft();
+    const long nFirstLineDiff = rLR.GetTextFirstLineOfst();
     rFirstLinePos = nBodyIndent + nFirstLineDiff;
 
-    const long nPseudoListBodyIndent = rFmt.GetAbsLSpace();
-    const long nReverseListIndented = GetListFirstLineIndent(rFmt);
+    const long nPseudoListBodyIndent = rFormat.GetAbsLSpace();
+    const long nReverseListIndented = GetListFirstLineIndent(rFormat);
     long nExtraListIndent = nPseudoListBodyIndent + nReverseListIndented;
 
     return nExtraListIndent > 0 ? nExtraListIndent : 0;
@@ -1291,56 +1291,56 @@ static long lcl_GetTrueMargin(const SvxLRSpaceItem &rLR, const SwNumFmt &rFmt,
 // #i103711#
 // #i105414#
 void SyncIndentWithList( SvxLRSpaceItem &rLR,
-                         const SwNumFmt &rFmt,
+                         const SwNumFormat &rFormat,
                          const bool bFirstLineOfstSet,
                          const bool bLeftIndentSet )
 {
-    if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+    if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
         long nWantedFirstLinePos;
-        long nExtraListIndent = lcl_GetTrueMargin(rLR, rFmt, nWantedFirstLinePos);
-        rLR.SetTxtLeft(nWantedFirstLinePos - nExtraListIndent);
-        rLR.SetTxtFirstLineOfst(0);
+        long nExtraListIndent = lcl_GetTrueMargin(rLR, rFormat, nWantedFirstLinePos);
+        rLR.SetTextLeft(nWantedFirstLinePos - nExtraListIndent);
+        rLR.SetTextFirstLineOfst(0);
     }
-    else if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+    else if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
     {
         if ( !bFirstLineOfstSet && bLeftIndentSet &&
-             rFmt.GetFirstLineIndent() != 0 )
+             rFormat.GetFirstLineIndent() != 0 )
         {
-            rLR.SetTxtFirstLineOfst( rFmt.GetFirstLineIndent() );
+            rLR.SetTextFirstLineOfst( rFormat.GetFirstLineIndent() );
         }
         else if ( bFirstLineOfstSet && !bLeftIndentSet &&
-                  rFmt.GetIndentAt() != 0 )
+                  rFormat.GetIndentAt() != 0 )
         {
-            rLR.SetTxtLeft( rFmt.GetIndentAt() );
+            rLR.SetTextLeft( rFormat.GetIndentAt() );
         }
         else if (!bFirstLineOfstSet && !bLeftIndentSet )
         {
-            if ( rFmt.GetFirstLineIndent() != 0 )
+            if ( rFormat.GetFirstLineIndent() != 0 )
             {
-                rLR.SetTxtFirstLineOfst( rFmt.GetFirstLineIndent() );
+                rLR.SetTextFirstLineOfst( rFormat.GetFirstLineIndent() );
             }
-            if ( rFmt.GetIndentAt() != 0 )
+            if ( rFormat.GetIndentAt() != 0 )
             {
-                rLR.SetTxtLeft( rFmt.GetIndentAt() );
+                rLR.SetTextLeft( rFormat.GetIndentAt() );
             }
         }
     }
 }
 
-const SwNumFmt* SwWW8FltControlStack::GetNumFmtFromStack(const SwPosition &rPos,
-    const SwTxtNode &rTxtNode)
+const SwNumFormat* SwWW8FltControlStack::GetNumFormatFromStack(const SwPosition &rPos,
+    const SwTextNode &rTextNode)
 {
-    const SwNumFmt *pRet = 0;
+    const SwNumFormat *pRet = 0;
     const SfxPoolItem *pItem = GetStackAttr(rPos, RES_FLTR_NUMRULE);
-    if (pItem && rTxtNode.GetNumRule())
+    if (pItem && rTextNode.GetNumRule())
     {
-        if (rTxtNode.IsCountedInList())
+        if (rTextNode.IsCountedInList())
         {
             OUString sName(static_cast<const SfxStringItem*>(pItem)->GetValue());
             const SwNumRule *pRule = pDoc->FindNumRulePtr(sName);
             if (pRule)
-                pRet = GetNumFmtFromSwNumRuleLevel(*pRule, rTxtNode.GetActualListLevel());
+                pRet = GetNumFormatFromSwNumRuleLevel(*pRule, rTextNode.GetActualListLevel());
         }
     }
     return pRet;
@@ -1431,31 +1431,31 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
                     for(; nStart <= nEnd; ++nStart)
                     {
                         SwNode* pNode = pDoc->GetNodes()[ nStart ];
-                        if (!pNode || !pNode->IsTxtNode())
+                        if (!pNode || !pNode->IsTextNode())
                             continue;
 
-                        SwCntntNode* pNd = static_cast<SwCntntNode*>(pNode);
+                        SwContentNode* pNd = static_cast<SwContentNode*>(pNode);
                         SvxLRSpaceItem aOldLR = static_cast<const SvxLRSpaceItem&>(pNd->GetAttr(RES_LR_SPACE));
 
-                        SwTxtNode *pTxtNode = static_cast<SwTxtNode*>(pNode);
+                        SwTextNode *pTextNode = static_cast<SwTextNode*>(pNode);
 
-                        const SwNumFmt *pNum = 0;
-                        pNum = GetNumFmtFromStack( *aRegion.GetPoint(), *pTxtNode );
+                        const SwNumFormat *pNum = 0;
+                        pNum = GetNumFormatFromStack( *aRegion.GetPoint(), *pTextNode );
                         if (!pNum)
                         {
-                            pNum = GetNumFmtFromTxtNode(*pTxtNode);
+                            pNum = GetNumFormatFromTextNode(*pTextNode);
                         }
 
                         if ( pNum )
                         {
                             // #i103711#
                             const bool bFirstLineIndentSet =
-                                ( rReader.m_aTxtNodesHavingFirstLineOfstSet.end() !=
-                                    rReader.m_aTxtNodesHavingFirstLineOfstSet.find( pNode ) );
+                                ( rReader.m_aTextNodesHavingFirstLineOfstSet.end() !=
+                                    rReader.m_aTextNodesHavingFirstLineOfstSet.find( pNode ) );
                             // #i105414#
                             const bool bLeftIndentSet =
-                                (  rReader.m_aTxtNodesHavingLeftIndentSet.end() !=
-                                    rReader.m_aTxtNodesHavingLeftIndentSet.find( pNode ) );
+                                (  rReader.m_aTextNodesHavingLeftIndentSet.end() !=
+                                    rReader.m_aTextNodesHavingLeftIndentSet.find( pNode ) );
                             SyncIndentWithList( aNewLR, *pNum,
                                                 bFirstLineIndentSet,
                                                 bLeftIndentSet );
@@ -1491,18 +1491,18 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
                 SwPaM aRegion(rTmpPos);
                 if (rEntry.MakeRegion(pDoc, aRegion, false))
                 {
-                    SwFrmFmt *pFrm;
+                    SwFrameFormat *pFrm;
                     // If we have just one single inline graphic then
                     // don't insert a field for the single frame, set
                     // the frames hyperlink field attribute directly.
                     if (0 != (pFrm = SwWW8ImplReader::ContainsSingleInlineGraphic(aRegion)))
                     {
-                        const SwFmtINetFmt *pAttr = static_cast<const SwFmtINetFmt *>(
+                        const SwFormatINetFormat *pAttr = static_cast<const SwFormatINetFormat *>(
                             rEntry.pAttr);
-                        SwFmtURL aURL;
+                        SwFormatURL aURL;
                         aURL.SetURL(pAttr->GetValue(), false);
                         aURL.SetTargetFrameName(pAttr->GetTargetFrame());
-                        pFrm->SetFmtAttr(aURL);
+                        pFrm->SetFormatAttr(aURL);
                     }
                     else
                     {
@@ -1517,13 +1517,13 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
     }
 }
 
-const SfxPoolItem* SwWW8FltControlStack::GetFmtAttr(const SwPosition& rPos,
+const SfxPoolItem* SwWW8FltControlStack::GetFormatAttr(const SwPosition& rPos,
     sal_uInt16 nWhich)
 {
     const SfxPoolItem *pItem = GetStackAttr(rPos, nWhich);
     if (!pItem)
     {
-        SwCntntNode const*const pNd = rPos.nNode.GetNode().GetCntntNode();
+        SwContentNode const*const pNd = rPos.nNode.GetNode().GetContentNode();
         if (!pNd)
             pItem = &pDoc->GetAttrPool().GetDefaultItem(nWhich);
         else
@@ -1547,11 +1547,11 @@ const SfxPoolItem* SwWW8FltControlStack::GetFmtAttr(const SwPosition& rPos,
             If we're hunting for a character property, try and exact position
             within the text node for lookup
             */
-            if (pNd->IsTxtNode())
+            if (pNd->IsTextNode())
             {
                 const sal_Int32 nPos = rPos.nContent.GetIndex();
                 SfxItemSet aSet(pDoc->GetAttrPool(), nWhich, nWhich);
-                if (pNd->GetTxtNode()->GetAttr(aSet, nPos, nPos))
+                if (pNd->GetTextNode()->GetAttr(aSet, nPos, nPos))
                     pItem = aSet.GetItem(nWhich);
             }
 
@@ -1577,8 +1577,8 @@ const SfxPoolItem* SwWW8FltControlStack::GetStackAttr(const SwPosition& rPos,
                  (
                   (rEntry.m_aMkPos.m_nNode <= aFltPos.m_nNode) &&
                   (rEntry.m_aPtPos.m_nNode >= aFltPos.m_nNode) &&
-                  (rEntry.m_aMkPos.m_nCntnt <= aFltPos.m_nCntnt) &&
-                  (rEntry.m_aPtPos.m_nCntnt > aFltPos.m_nCntnt)
+                  (rEntry.m_aMkPos.m_nContent <= aFltPos.m_nContent) &&
+                  (rEntry.m_aPtPos.m_nContent > aFltPos.m_nContent)
                  )
                )
                 /*
@@ -1593,19 +1593,19 @@ const SfxPoolItem* SwWW8FltControlStack::GetStackAttr(const SwPosition& rPos,
     return 0;
 }
 
-bool SwWW8FltRefStack::IsFtnEdnBkmField(
-    const SwFmtFld& rFmtFld,
+bool SwWW8FltRefStack::IsFootnoteEdnBkmField(
+    const SwFormatField& rFormatField,
     sal_uInt16& rBkmNo)
 {
-    const SwField* pFld = rFmtFld.GetField();
+    const SwField* pField = rFormatField.GetField();
     sal_uInt16 nSubType;
-    if(pFld && (RES_GETREFFLD == pFld->Which())
-        && ((REF_FOOTNOTE == (nSubType = pFld->GetSubType())) || (REF_ENDNOTE  == nSubType))
-        && !static_cast<const SwGetRefField*>(pFld)->GetSetRefName().isEmpty())
+    if(pField && (RES_GETREFFLD == pField->Which())
+        && ((REF_FOOTNOTE == (nSubType = pField->GetSubType())) || (REF_ENDNOTE  == nSubType))
+        && !static_cast<const SwGetRefField*>(pField)->GetSetRefName().isEmpty())
     {
         const IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
         IDocumentMarkAccess::const_iterator_t ppBkmk =
-            pMarkAccess->findMark( static_cast<const SwGetRefField*>(pFld)->GetSetRefName() );
+            pMarkAccess->findMark( static_cast<const SwGetRefField*>(pField)->GetSetRefName() );
         if(ppBkmk != pMarkAccess->getAllMarksEnd())
         {
             // find Sequence No of corresponding Foot-/Endnote
@@ -1631,33 +1631,33 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition& rTmpPos,
         case RES_TXTATR_INPUTFIELD:
         {
             SwNodeIndex aIdx(rEntry.m_aMkPos.m_nNode, 1);
-            SwPaM aPaM(aIdx, rEntry.m_aMkPos.m_nCntnt);
+            SwPaM aPaM(aIdx, rEntry.m_aMkPos.m_nContent);
 
-            SwFmtFld& rFmtFld   = *static_cast<SwFmtFld*>(rEntry.pAttr);
-            SwField* pFld = rFmtFld.GetField();
+            SwFormatField& rFormatField   = *static_cast<SwFormatField*>(rEntry.pAttr);
+            SwField* pField = rFormatField.GetField();
 
-            if (!RefToVar(pFld, rEntry))
+            if (!RefToVar(pField, rEntry))
             {
                 sal_uInt16 nBkmNo;
-                if( IsFtnEdnBkmField(rFmtFld, nBkmNo) )
+                if( IsFootnoteEdnBkmField(rFormatField, nBkmNo) )
                 {
                     ::sw::mark::IMark const * const pMark = (pDoc->getIDocumentMarkAccess()->getAllMarksBegin() + nBkmNo)->get();
 
                     const SwPosition& rBkMrkPos = pMark->GetMarkPos();
 
-                    SwTxtNode* pTxt = rBkMrkPos.nNode.GetNode().GetTxtNode();
-                    if( pTxt && rBkMrkPos.nContent.GetIndex() )
+                    SwTextNode* pText = rBkMrkPos.nNode.GetNode().GetTextNode();
+                    if( pText && rBkMrkPos.nContent.GetIndex() )
                     {
-                        SwTxtAttr* const pFtn = pTxt->GetTxtAttrForCharAt(
+                        SwTextAttr* const pFootnote = pText->GetTextAttrForCharAt(
                             rBkMrkPos.nContent.GetIndex()-1, RES_TXTATR_FTN );
-                        if( pFtn )
+                        if( pFootnote )
                         {
-                            sal_uInt16 nRefNo = static_cast<SwTxtFtn*>(pFtn)->GetSeqRefNo();
+                            sal_uInt16 nRefNo = static_cast<SwTextFootnote*>(pFootnote)->GetSeqRefNo();
 
-                            static_cast<SwGetRefField*>(pFld)->SetSeqNo( nRefNo );
+                            static_cast<SwGetRefField*>(pField)->SetSeqNo( nRefNo );
 
-                            if( pFtn->GetFtn().IsEndNote() )
-                                static_cast<SwGetRefField*>(pFld)->SetSubType(REF_ENDNOTE);
+                            if( pFootnote->GetFootnote().IsEndNote() )
+                                static_cast<SwGetRefField*>(pField)->SetSubType(REF_ENDNOTE);
                         }
                     }
                 }
@@ -1715,19 +1715,19 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
 
     SvxTabStopItem aAttr(0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP);
 
-    const SwTxtFmtColl* pSty = 0;
+    const SwTextFormatColl* pSty = 0;
     sal_uInt16 nTabBase;
     if (m_pAktColl && m_nAktColl < m_vColl.size()) // StyleDef
     {
         nTabBase = m_vColl[m_nAktColl].nBase;
         if (nTabBase < m_vColl.size())  // Based On
-            pSty = static_cast<const SwTxtFmtColl*>(m_vColl[nTabBase].pFmt);
+            pSty = static_cast<const SwTextFormatColl*>(m_vColl[nTabBase].pFormat);
     }
     else
     { // Text
         nTabBase = m_nAktColl;
         if (m_nAktColl < m_vColl.size())
-            pSty = static_cast<const SwTxtFmtColl*>(m_vColl[m_nAktColl].pFmt);
+            pSty = static_cast<const SwTextFormatColl*>(m_vColl[m_nAktColl].pFormat);
         //TODO: figure out else here
     }
 
@@ -1757,7 +1757,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
                 // current one (prevent loop)
                 aLoopWatch.insert(reinterpret_cast<size_t>(pSty));
                 if (nTabBase < m_vColl.size())
-                    pSty = static_cast<const SwTxtFmtColl*>(m_vColl[nTabBase].pFmt);
+                    pSty = static_cast<const SwTextFormatColl*>(m_vColl[nTabBase].pFormat);
                 //TODO figure out the else branch
 
                 if (aLoopWatch.find(reinterpret_cast<size_t>(pSty)) !=
@@ -2048,7 +2048,7 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) :
     mcSymbol(pRdr->m_cSymbol),
     mbIgnoreText(pRdr->m_bIgnoreText),
     mbSymbol(pRdr->m_bSymbol),
-    mbHdFtFtnEdn(pRdr->m_bHdFtFtnEdn),
+    mbHdFtFootnoteEdn(pRdr->m_bHdFtFootnoteEdn),
     mbTxbxFlySection(pRdr->m_bTxbxFlySection),
     mbAnl(pRdr->m_bAnl),
     mbInHyperlink(pRdr->m_bInHyperlink),
@@ -2058,7 +2058,7 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) :
     mbFirstPara(pRdr->m_bFirstPara)
 {
     pRdr->m_bSymbol = false;
-    pRdr->m_bHdFtFtnEdn = true;
+    pRdr->m_bHdFtFootnoteEdn = true;
     pRdr->m_bTxbxFlySection = pRdr->m_bAnl = pRdr->m_bPgSecBreak = pRdr->m_bWasParaEnd
         = pRdr->m_bHasBorder = false;
     pRdr->m_bFirstPara = true;
@@ -2103,7 +2103,7 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
     pRdr->m_cSymbol = mcSymbol;
     pRdr->m_bSymbol = mbSymbol;
     pRdr->m_bIgnoreText = mbIgnoreText;
-    pRdr->m_bHdFtFtnEdn = mbHdFtFtnEdn;
+    pRdr->m_bHdFtFootnoteEdn = mbHdFtFootnoteEdn;
     pRdr->m_bTxbxFlySection = mbTxbxFlySection;
     pRdr->m_nInTable = mnInTable;
     pRdr->m_bAnl = mbAnl;
@@ -2138,14 +2138,14 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
     pRdr->m_aFieldStack.swap(maOldFieldStack);
 }
 
-void SwWW8ImplReader::Read_HdFtFtnText( const SwNodeIndex* pSttIdx,
+void SwWW8ImplReader::Read_HdFtFootnoteText( const SwNodeIndex* pSttIdx,
     long nStartCp, long nLen, ManTypes nType )
 {
     // Saves Flags (amongst other things) and resets them
     WW8ReaderSave aSave( this );
 
     m_pPaM->GetPoint()->nNode = pSttIdx->GetIndex() + 1;
-    m_pPaM->GetPoint()->nContent.Assign( m_pPaM->GetCntntNode(), 0 );
+    m_pPaM->GetPoint()->nContent.Assign( m_pPaM->GetContentNode(), 0 );
 
     // Read Text for Header, Footer or Footnote
     ReadText( nStartCp, nLen, nType ); // Ignore Sepx when doing so
@@ -2203,19 +2203,19 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 
     DateTime aDate = msfilter::util::DTTM2DateTime(nDateTime);
 
-    OUString sTxt;
-    OutlinerParaObject *pOutliner = ImportAsOutliner( sTxt, pRes->nCp2OrIdx,
+    OUString sText;
+    OutlinerParaObject *pOutliner = ImportAsOutliner( sText, pRes->nCp2OrIdx,
         pRes->nCp2OrIdx + pRes->nMemLen, MAN_AND );
 
-    m_pFmtOfJustInsertedApo = 0;
+    m_pFormatOfJustInsertedApo = 0;
     SwPostItField aPostIt(
-        static_cast<SwPostItFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD)), sAuthor,
-        sTxt, sInitials, OUString(), aDate );
+        static_cast<SwPostItFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_POSTITFLD)), sAuthor,
+        sText, sInitials, OUString(), aDate );
     aPostIt.SetTextObject(pOutliner);
 
     SwPaM aEnd(*m_pPaM->End(), *m_pPaM->End());
     m_pCtrlStck->NewAttr(*aEnd.GetPoint(), SvxCharHiddenItem(false, RES_CHRATR_HIDDEN));
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem(aEnd, SwFmtFld(aPostIt));
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem(aEnd, SwFormatField(aPostIt));
     m_pCtrlStck->SetAttr(*aEnd.GetPoint(), RES_CHRATR_HIDDEN);
     // If this is a range, make sure that it ends after the just inserted character, not before it.
     m_pReffedStck->MoveAttrs(*aEnd.GetPoint());
@@ -2224,9 +2224,9 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 }
 
 void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(long nStart, long nLen,
-    SwFrmFmt &rHdFtFmt, sal_uInt16 nPageWidth)
+    SwFrameFormat &rHdFtFormat, sal_uInt16 nPageWidth)
 {
-    const SwNodeIndex* pSttIdx = rHdFtFmt.GetCntnt().GetCntntIdx();
+    const SwNodeIndex* pSttIdx = rHdFtFormat.GetContent().GetContentIdx();
     OSL_ENSURE(pSttIdx, "impossible");
     if (!pSttIdx)
         return;
@@ -2234,23 +2234,23 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(long nStart, long nLen,
     SwPosition aTmpPos(*m_pPaM->GetPoint());
 
     m_pPaM->GetPoint()->nNode = pSttIdx->GetIndex() + 1;
-    m_pPaM->GetPoint()->nContent.Assign(m_pPaM->GetCntntNode(), 0);
+    m_pPaM->GetPoint()->nContent.Assign(m_pPaM->GetContentNode(), 0);
 
-    SwFlyFrmFmt *pFrame = m_rDoc.MakeFlySection(FLY_AT_PARA, m_pPaM->GetPoint());
+    SwFlyFrameFormat *pFrame = m_rDoc.MakeFlySection(FLY_AT_PARA, m_pPaM->GetPoint());
 
-    SwFmtAnchor aAnch( pFrame->GetAnchor() );
+    SwFormatAnchor aAnch( pFrame->GetAnchor() );
     aAnch.SetType( FLY_AT_PARA );
-    pFrame->SetFmtAttr( aAnch );
-    SwFmtFrmSize aSz(ATT_MIN_SIZE, nPageWidth, MINLAY);
+    pFrame->SetFormatAttr( aAnch );
+    SwFormatFrmSize aSz(ATT_MIN_SIZE, nPageWidth, MINLAY);
     SwFrmSize eFrmSize = ATT_MIN_SIZE;
     if( eFrmSize != aSz.GetWidthSizeType() )
         aSz.SetWidthSizeType( eFrmSize );
-    pFrame->SetFmtAttr(aSz);
-    pFrame->SetFmtAttr(SwFmtSurround(SURROUND_THROUGHT));
-    pFrame->SetFmtAttr(SwFmtHoriOrient(0, text::HoriOrientation::LEFT)); //iFOO
+    pFrame->SetFormatAttr(aSz);
+    pFrame->SetFormatAttr(SwFormatSurround(SURROUND_THROUGHT));
+    pFrame->SetFormatAttr(SwFormatHoriOrient(0, text::HoriOrientation::LEFT)); //iFOO
 
     // #i43427# - send frame for header/footer into background.
-    pFrame->SetFmtAttr( SvxOpaqueItem( RES_OPAQUE, false ) );
+    pFrame->SetFormatAttr( SvxOpaqueItem( RES_OPAQUE, false ) );
     SdrObject* pFrmObj = CreateContactObject( pFrame );
     OSL_ENSURE( pFrmObj,
             "<SwWW8ImplReader::Read_HdFtTextAsHackedFrame(..)> - missing SdrObject instance" );
@@ -2260,22 +2260,22 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(long nStart, long nLen,
     }
     MoveInsideFly(pFrame);
 
-    const SwNodeIndex* pHackIdx = pFrame->GetCntnt().GetCntntIdx();
+    const SwNodeIndex* pHackIdx = pFrame->GetContent().GetContentIdx();
 
-    Read_HdFtFtnText(pHackIdx, nStart, nLen - 1, MAN_HDFT);
+    Read_HdFtFootnoteText(pHackIdx, nStart, nLen - 1, MAN_HDFT);
 
     MoveOutsideFly(pFrame, aTmpPos);
 }
 
-void SwWW8ImplReader::Read_HdFtText(long nStart, long nLen, SwFrmFmt* pHdFtFmt)
+void SwWW8ImplReader::Read_HdFtText(long nStart, long nLen, SwFrameFormat* pHdFtFormat)
 {
-    const SwNodeIndex* pSttIdx = pHdFtFmt->GetCntnt().GetCntntIdx();
+    const SwNodeIndex* pSttIdx = pHdFtFormat->GetContent().GetContentIdx();
     if (!pSttIdx)
         return;
 
     SwPosition aTmpPos( *m_pPaM->GetPoint() ); // Remember old cursor position
 
-    Read_HdFtFtnText(pSttIdx, nStart, nLen - 1, MAN_HDFT);
+    Read_HdFtFootnoteText(pSttIdx, nStart, nLen - 1, MAN_HDFT);
 
     *m_pPaM->GetPoint() = aTmpPos;
 }
@@ -2357,11 +2357,11 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
                 bool bFooter
                     = (nI & ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD | WW8_FOOTER_FIRST )) != 0;
 
-                SwFrmFmt& rFmt = bUseLeft ? pPD->GetLeft()
+                SwFrameFormat& rFormat = bUseLeft ? pPD->GetLeft()
                     : bUseFirst ? pPD->GetFirstMaster()
                     : pPD->GetMaster();
 
-                SwFrmFmt* pHdFtFmt;
+                SwFrameFormat* pHdFtFormat;
                 // If we have empty first page header and footer.
                 bool bNoFirst = !(grpfIhdt & WW8_HEADER_FIRST) && !(grpfIhdt & WW8_FOOTER_FIRST);
                 if (bFooter)
@@ -2369,26 +2369,26 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
                     m_bIsFooter = true;
                     //#i17196# Cannot have left without right
                     if (!bDisabledFirst
-                            && !pPD->GetMaster().GetFooter().GetFooterFmt())
-                        pPD->GetMaster().SetFmtAttr(SwFmtFooter(true));
+                            && !pPD->GetMaster().GetFooter().GetFooterFormat())
+                        pPD->GetMaster().SetFormatAttr(SwFormatFooter(true));
                     if (bUseLeft)
-                        pPD->GetLeft().SetFmtAttr(SwFmtFooter(true));
+                        pPD->GetLeft().SetFormatAttr(SwFormatFooter(true));
                     if (bUseFirst || (rSection.maSep.fTitlePage && bNoFirst))
-                        pPD->GetFirstMaster().SetFmtAttr(SwFmtFooter(true));
-                    pHdFtFmt = const_cast<SwFrmFmt*>(rFmt.GetFooter().GetFooterFmt());
+                        pPD->GetFirstMaster().SetFormatAttr(SwFormatFooter(true));
+                    pHdFtFormat = const_cast<SwFrameFormat*>(rFormat.GetFooter().GetFooterFormat());
                 }
                 else
                 {
                     m_bIsHeader = true;
                     //#i17196# Cannot have left without right
                     if (!bDisabledFirst
-                            && !pPD->GetMaster().GetHeader().GetHeaderFmt())
-                        pPD->GetMaster().SetFmtAttr(SwFmtHeader(true));
+                            && !pPD->GetMaster().GetHeader().GetHeaderFormat())
+                        pPD->GetMaster().SetFormatAttr(SwFormatHeader(true));
                     if (bUseLeft)
-                        pPD->GetLeft().SetFmtAttr(SwFmtHeader(true));
+                        pPD->GetLeft().SetFormatAttr(SwFormatHeader(true));
                     if (bUseFirst || (rSection.maSep.fTitlePage && bNoFirst))
-                        pPD->GetFirstMaster().SetFmtAttr(SwFmtHeader(true));
-                    pHdFtFmt = const_cast<SwFrmFmt*>(rFmt.GetHeader().GetHeaderFmt());
+                        pPD->GetFirstMaster().SetFormatAttr(SwFormatHeader(true));
+                    pHdFtFormat = const_cast<SwFrameFormat*>(rFormat.GetHeader().GetHeaderFormat());
                 }
 
                 if (bOk)
@@ -2401,11 +2401,11 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
 
                     if (bHackRequired)
                     {
-                        Read_HdFtTextAsHackedFrame(start, nLen, *pHdFtFmt,
+                        Read_HdFtTextAsHackedFrame(start, nLen, *pHdFtFormat,
                             static_cast< sal_uInt16 >(rSection.GetTextAreaWidth()) );
                     }
                     else
-                        Read_HdFtText(start, nLen, pHdFtFmt);
+                        Read_HdFtText(start, nLen, pHdFtFormat);
                 }
                 else if (!bOk && pPrev)
                     CopyPageDescHdFt(pPrev, pPD, nI);
@@ -2442,14 +2442,14 @@ void wwSectionManager::SetHdFt(wwSection &rSection, int nSect,
 
 }
 
-void SwWW8ImplReader::AppendTxtNode(SwPosition& rPos)
+void SwWW8ImplReader::AppendTextNode(SwPosition& rPos)
 {
-    SwTxtNode* pTxt = m_pPaM->GetNode().GetTxtNode();
+    SwTextNode* pText = m_pPaM->GetNode().GetTextNode();
 
     const SwNumRule* pRule = NULL;
 
-    if (pTxt != NULL)
-        pRule = sw::util::GetNumRuleFromTxtNode(*pTxt);
+    if (pText != NULL)
+        pRule = sw::util::GetNumRuleFromTextNode(*pText);
 
     if (
          pRule && !m_pWDop->fDontUseHTMLAutoSpacing &&
@@ -2501,7 +2501,7 @@ void SwWW8ImplReader::AppendTxtNode(SwPosition& rPos)
 
     m_bFirstPara = false;
 
-    m_rDoc.getIDocumentContentOperations().AppendTxtNode(rPos);
+    m_rDoc.getIDocumentContentOperations().AppendTextNode(rPos);
 
     // We can flush all anchored graphics at the end of a paragraph.
     m_pAnchorStck->Flush();
@@ -2512,7 +2512,7 @@ bool SwWW8ImplReader::SetSpacing(SwPaM &rMyPam, int nSpace, bool bIsUpper )
         bool bRet = false;
         const SwPosition* pSpacingPos = rMyPam.GetPoint();
 
-        const SvxULSpaceItem* pULSpaceItem = static_cast<const SvxULSpaceItem*>(m_pCtrlStck->GetFmtAttr(*pSpacingPos, RES_UL_SPACE));
+        const SvxULSpaceItem* pULSpaceItem = static_cast<const SvxULSpaceItem*>(m_pCtrlStck->GetFormatAttr(*pSpacingPos, RES_UL_SPACE));
 
         if(pULSpaceItem != 0)
         {
@@ -2524,9 +2524,9 @@ bool SwWW8ImplReader::SetSpacing(SwPaM &rMyPam, int nSpace, bool bIsUpper )
                 aUL.SetLower( static_cast< sal_uInt16 >(nSpace) );
 
             const sal_Int32 nEnd = pSpacingPos->nContent.GetIndex();
-            rMyPam.GetPoint()->nContent.Assign(rMyPam.GetCntntNode(), 0);
+            rMyPam.GetPoint()->nContent.Assign(rMyPam.GetContentNode(), 0);
             m_pCtrlStck->NewAttr(*pSpacingPos, aUL);
-            rMyPam.GetPoint()->nContent.Assign(rMyPam.GetCntntNode(), nEnd);
+            rMyPam.GetPoint()->nContent.Assign(rMyPam.GetContentNode(), nEnd);
             m_pCtrlStck->SetAttr(*pSpacingPos, RES_UL_SPACE);
             bRet = true;
         }
@@ -2652,9 +2652,9 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
         ApoTestResults aApo = TestApo(nCellLevel, bTableRowEnd, pTabPos);
 
         // Look to see if we are in a Table, but Table in foot/end note not allowed
-        bool bStartTab = (m_nInTable < nCellLevel) && !m_bFtnEdn;
+        bool bStartTab = (m_nInTable < nCellLevel) && !m_bFootnoteEdn;
 
-        bool bStopTab = m_bWasTabRowEnd && (m_nInTable > nCellLevel) && !m_bFtnEdn;
+        bool bStopTab = m_bWasTabRowEnd && (m_nInTable > nCellLevel) && !m_bFootnoteEdn;
 
         m_bWasTabRowEnd = false;  // must be deactivated right here to prevent next
                                 // WW8TabDesc::TableCellEnd() from making nonsense
@@ -2734,7 +2734,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
                 m_pPlcxMan->GetPap()->Restore( aSave );
             }
         }
-    } while (!m_bFtnEdn && (m_nInTable < nCellLevel));
+    } while (!m_bFootnoteEdn && (m_nInTable < nCellLevel));
     return bTableRowEnd;
 }
 
@@ -2750,7 +2750,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCharSetFromLanguage()
      correctly set in the character runs involved, so its hard to reproduce
      documents that require this to be sure of the process involved.
     */
-    const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFmtAttr(RES_CHRATR_LANGUAGE));
+    const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFormatAttr(RES_CHRATR_LANGUAGE));
     LanguageType eLang = pLang ? pLang->GetLanguage() : LANGUAGE_SYSTEM;
     ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(eLang));
     return msfilter::util::getBestTextEncodingFromLocale(aLocale);
@@ -2768,7 +2768,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCJKCharSetFromLanguage()
      correctly set in the character runs involved, so its hard to reproduce
      documents that require this to be sure of the process involved.
     */
-    const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFmtAttr(RES_CHRATR_CJK_LANGUAGE));
+    const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFormatAttr(RES_CHRATR_CJK_LANGUAGE));
     LanguageType eLang = pLang ? pLang->GetLanguage() : LANGUAGE_SYSTEM;
     ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(eLang));
     return msfilter::util::getBestTextEncodingFromLocale(aLocale);
@@ -2787,8 +2787,8 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet()
     {
         if (!m_aFontSrcCharSets.empty())
             eSrcCharSet = m_aFontSrcCharSets.top();
-        if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFmt >= 0 && (size_t)m_nCharFmt < m_vColl.size() )
-            eSrcCharSet = m_vColl[m_nCharFmt].GetCharSet();
+        if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && (size_t)m_nCharFormat < m_vColl.size() )
+            eSrcCharSet = m_vColl[m_nCharFormat].GetCharSet();
         if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && StyleExists(m_nAktColl) && m_nAktColl < m_vColl.size())
             eSrcCharSet = m_vColl[m_nAktColl].GetCharSet();
         if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
@@ -2811,8 +2811,8 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCJKCharSet()
     {
         if (!m_aFontSrcCJKCharSets.empty())
             eSrcCharSet = m_aFontSrcCJKCharSets.top();
-        if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFmt >= 0 && (size_t)m_nCharFmt < m_vColl.size() )
-            eSrcCharSet = m_vColl[m_nCharFmt].GetCJKCharSet();
+        if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && (size_t)m_nCharFormat < m_vColl.size() )
+            eSrcCharSet = m_vColl[m_nCharFormat].GetCJKCharSet();
         if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW && StyleExists(m_nAktColl) && m_nAktColl < m_vColl.size())
             eSrcCharSet = m_vColl[m_nAktColl].GetCJKCharSet();
         if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
@@ -3022,7 +3022,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
         the language is not Japanese
         */
 
-        const SfxPoolItem * pItem = GetFmtAttr(RES_CHRATR_CJK_LANGUAGE);
+        const SfxPoolItem * pItem = GetFormatAttr(RES_CHRATR_CJK_LANGUAGE);
         if (pItem != NULL && LANGUAGE_JAPANESE != static_cast<const SvxLanguageItem *>(pItem)->GetLanguage())
         {
             SAL_WARN("sw.ww8", "discarding word95 RTL_TEXTENCODING_MS_932 encoding");
@@ -3051,7 +3051,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, sal_Int32 nEnd, sal_Int32 nCp
     sal_uInt16 nUCode;
 
     sal_uInt16 nCTLLang = 0;
-    const SfxPoolItem * pItem = GetFmtAttr(RES_CHRATR_CTL_LANGUAGE);
+    const SfxPoolItem * pItem = GetFormatAttr(RES_CHRATR_CTL_LANGUAGE);
     if (pItem != NULL)
         nCTLLang = static_cast<const SvxLanguageItem *>(pItem)->GetLanguage();
 
@@ -3243,10 +3243,10 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString
     sal_Int32 nLen = rAddString.getLength();
 
     OUString sParagraphText;
-    const SwCntntNode *pCntNd = m_pPaM->GetCntntNode();
-    const SwTxtNode* pNd = pCntNd ? pCntNd->GetTxtNode() : NULL;
+    const SwContentNode *pCntNd = m_pPaM->GetContentNode();
+    const SwTextNode* pNd = pCntNd ? pCntNd->GetTextNode() : NULL;
     if (pNd)
-        sParagraphText = pNd->GetTxt();
+        sParagraphText = pNd->GetText();
     sal_Int32 nParaOffset = sParagraphText.getLength();
     sParagraphText = sParagraphText + rAddString;
 
@@ -3309,9 +3309,9 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString
                 }
                 else
                 {
-                    const SvxFontItem *pSourceFont = static_cast<const SvxFontItem*>(GetFmtAttr(nForceFromFontId));
+                    const SvxFontItem *pSourceFont = static_cast<const SvxFontItem*>(GetFormatAttr(nForceFromFontId));
                     sal_uInt16 nDestId = aIds[nWriterScript-1];
-                    const SvxFontItem *pDestFont = static_cast<const SvxFontItem*>(GetFmtAttr(nDestId));
+                    const SvxFontItem *pDestFont = static_cast<const SvxFontItem*>(GetFormatAttr(nDestId));
                     bWriterWillUseSameFontAsWordAutomatically = sameFontIgnoringIrrelevantFields(*pSourceFont, *pDestFont);
                 }
             }
@@ -3319,11 +3319,11 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString
             // Writer won't use the same font as word, so force the issue
             if (!bWriterWillUseSameFontAsWordAutomatically)
             {
-                const SvxFontItem *pSourceFont = static_cast<const SvxFontItem*>(GetFmtAttr(nForceFromFontId));
+                const SvxFontItem *pSourceFont = static_cast<const SvxFontItem*>(GetFormatAttr(nForceFromFontId));
 
                 for (size_t i = 0; i < SAL_N_ELEMENTS(aIds); ++i)
                 {
-                    const SvxFontItem *pDestFont = static_cast<const SvxFontItem*>(GetFmtAttr(aIds[i]));
+                    const SvxFontItem *pDestFont = static_cast<const SvxFontItem*>(GetFormatAttr(aIds[i]));
                     aForced[i] = aIds[i] != nForceFromFontId && *pSourceFont != *pDestFont;
                     if (aForced[i])
                     {
@@ -3368,15 +3368,15 @@ void SwWW8ImplReader::simpleAddTextToParagraph(const OUString& rAddString)
         }
 #endif
 
-    const SwCntntNode *pCntNd = m_pPaM->GetCntntNode();
-    const SwTxtNode* pNd = pCntNd ? pCntNd->GetTxtNode() : NULL;
+    const SwContentNode *pCntNd = m_pPaM->GetContentNode();
+    const SwTextNode* pNd = pCntNd ? pCntNd->GetTextNode() : NULL;
 
     OSL_ENSURE(pNd, "What the hell, where's my text node");
 
     if (!pNd)
         return;
 
-    const sal_Int32 nCharsLeft = SAL_MAX_INT32 - pNd->GetTxt().getLength();
+    const sal_Int32 nCharsLeft = SAL_MAX_INT32 - pNd->GetText().getLength();
     if (nCharsLeft > 0)
     {
         if (rAddString.getLength() <= nCharsLeft)
@@ -3386,13 +3386,13 @@ void SwWW8ImplReader::simpleAddTextToParagraph(const OUString& rAddString)
         else
         {
             m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, rAddString.copy(0, nCharsLeft));
-            AppendTxtNode(*m_pPaM->GetPoint());
+            AppendTextNode(*m_pPaM->GetPoint());
             m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, rAddString.copy(nCharsLeft));
         }
     }
     else
     {
-        AppendTxtNode(*m_pPaM->GetPoint());
+        AppendTextNode(*m_pPaM->GetPoint());
         m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, rAddString);
     }
 
@@ -3444,12 +3444,12 @@ bool SwWW8ImplReader::HandlePageBreakChar()
     if (!m_nInTable)
     {
         bool IsTemp=true;
-        SwTxtNode* pTemp = m_pPaM->GetNode().GetTxtNode();
-        if (pTemp && pTemp->GetTxt().isEmpty()
+        SwTextNode* pTemp = m_pPaM->GetNode().GetTextNode();
+        if (pTemp && pTemp->GetText().isEmpty()
                 && (m_bFirstPara || m_bFirstParaOfPage))
         {
             IsTemp = false;
-            AppendTxtNode(*m_pPaM->GetPoint());
+            AppendTextNode(*m_pPaM->GetPoint());
             pTemp->SetAttr(*GetDfltAttr(RES_PARATR_NUMRULE));
         }
 
@@ -3465,9 +3465,9 @@ bool SwWW8ImplReader::HandlePageBreakChar()
             bParaEndAdded = true;
             if (0 >= m_pPaM->GetPoint()->nContent.GetIndex())
             {
-                if (SwTxtNode* pTxtNode = m_pPaM->GetNode().GetTxtNode())
+                if (SwTextNode* pTextNode = m_pPaM->GetNode().GetTextNode())
                 {
-                    pTxtNode->SetAttr(
+                    pTextNode->SetAttr(
                         *GetDfltAttr(RES_PARATR_NUMRULE));
                 }
             }
@@ -3507,10 +3507,10 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
         case 0:
             {
                 // Page number
-                SwPageNumberField aFld(
-                    static_cast<SwPageNumberFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType(
+                SwPageNumberField aField(
+                    static_cast<SwPageNumberFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(
                     RES_PAGENUMBERFLD )), PG_RANDOM, SVX_NUM_ARABIC);
-                m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
+                m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField(aField));
             }
             break;
         case 0xe:
@@ -3520,10 +3520,10 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
             else if (!m_nInTable)
             {
                 // Always insert a txtnode for a column break, e.g. ##
-                SwCntntNode *pCntNd=m_pPaM->GetCntntNode();
+                SwContentNode *pCntNd=m_pPaM->GetContentNode();
                 if (pCntNd!=NULL && pCntNd->Len()>0) // if par is empty not break is needed
-                    AppendTxtNode(*m_pPaM->GetPoint());
-                m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
+                    AppendTextNode(*m_pPaM->GetPoint());
+                m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SvxFormatBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
             }
             break;
         case 0x7:
@@ -3600,7 +3600,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
                 }
                 if( !bReadObj )
                 {
-                    SwFrmFmt *pResult = 0;
+                    SwFrameFormat *pResult = 0;
                     if (m_bObj)
                         pResult = ImportOle();
                     else if (m_bSpec)
@@ -3666,8 +3666,8 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
         case 0x5:               // Annotation reference
         case 0x13:
             break;
-        case 0x2:               // TODO: Auto-Footnote-Number, should be replaced by SwWW8ImplReader::End_Ftn later
-            if (!m_aFtnStack.empty())
+        case 0x2:               // TODO: Auto-Footnote-Number, should be replaced by SwWW8ImplReader::End_Footnote later
+            if (!m_aFootnoteStack.empty())
                 cInsert = 0x2;
             break;
         default:
@@ -3692,7 +3692,7 @@ void SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes,
     m_nAktColl = m_pPlcxMan->GetColl();
 
     // Invalid Style-Id
-    if (m_nAktColl >= m_vColl.size() || !m_vColl[m_nAktColl].pFmt || !m_vColl[m_nAktColl].bColl)
+    if (m_nAktColl >= m_vColl.size() || !m_vColl[m_nAktColl].pFormat || !m_vColl[m_nAktColl].bColl)
     {
         m_nAktColl = 0;
         m_bParaAutoBefore = false;
@@ -3719,32 +3719,32 @@ void SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes,
 
     if (!bTabRowEnd && StyleExists(m_nAktColl))
     {
-        SetTxtFmtCollAndListLevel( *m_pPaM, m_vColl[ m_nAktColl ]);
+        SetTextFormatCollAndListLevel( *m_pPaM, m_vColl[ m_nAktColl ]);
         ChkToggleAttr(m_vColl[ nOldColl ].n81Flags, m_vColl[ m_nAktColl ].n81Flags);
         ChkToggleBiDiAttr(m_vColl[nOldColl].n81BiDiFlags,
             m_vColl[m_nAktColl].n81BiDiFlags);
     }
 }
 
-long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine)
+long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, bool& rbStartLine)
 {
     long nSkipChars = 0;
     WW8PLCFManResult aRes;
 
-    OSL_ENSURE(m_pPaM->GetNode().GetTxtNode(), "Missing txtnode");
+    OSL_ENSURE(m_pPaM->GetNode().GetTextNode(), "Missing txtnode");
     bool bStartAttr = m_pPlcxMan->Get(&aRes); // Get Attribute position again
-    aRes.nAktCp = rTxtPos;                  // Current Cp position
+    aRes.nAktCp = rTextPos;                  // Current Cp position
 
     bool bNewSection = (aRes.nFlags & MAN_MASK_NEW_SEP) && !m_bIgnoreText;
     if ( bNewSection ) // New Section
     {
-        OSL_ENSURE(m_pPaM->GetNode().GetTxtNode(), "Missing txtnode");
+        OSL_ENSURE(m_pPaM->GetNode().GetTextNode(), "Missing txtnode");
         // Create PageDesc and fill it
-        m_aSectionManager.CreateSep(rTxtPos, m_bPgSecBreak);
+        m_aSectionManager.CreateSep(rTextPos, m_bPgSecBreak);
         // -> 0xc was a Sectionbreak, but not a Pagebreak;
         // Create PageDesc and fill it
         m_bPgSecBreak = false;
-        OSL_ENSURE(m_pPaM->GetNode().GetTxtNode(), "Missing txtnode");
+        OSL_ENSURE(m_pPaM->GetNode().GetTextNode(), "Missing txtnode");
     }
 
     // New paragraph over Plcx.Fkp.papx
@@ -3781,9 +3781,9 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine)
                     (aRes.nSprmId == eFLD) || (aRes.nSprmId == eAND)
                    )
                 {
-                    // Skip Field/Ftn-/End-Note here
-                    rTxtPos += nSkipChars;
-                    nSkipPos = rTxtPos-1;
+                    // Skip Field/Footnote-/End-Note here
+                    rTextPos += nSkipChars;
+                    nSkipPos = rTextPos-1;
                 }
             }
             else
@@ -3791,7 +3791,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine)
         }
     }
 
-    m_pStrm->Seek(m_pSBase->WW8Cp2Fc( m_pPlcxMan->GetCpOfs() + rTxtPos, &m_bIsUnicode));
+    m_pStrm->Seek(m_pSBase->WW8Cp2Fc( m_pPlcxMan->GetCpOfs() + rTextPos, &m_bIsUnicode));
 
     // Find next Attr position (and Skip attributes of field contents if needed)
     if (nSkipChars && !m_bIgnoreText)
@@ -3815,7 +3815,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine)
 
         if( (0 <= nNext) && (nSkipPos >= nNext) )
         {
-            nNext = ReadTextAttr( rTxtPos, rbStartLine );
+            nNext = ReadTextAttr( rTextPos, rbStartLine );
             bDoPlcxManPlusPLus = false;
             m_bIgnoreText = true;
         }
@@ -3866,17 +3866,17 @@ void SwWW8ImplReader::ClearParaEndPosition()
         m_aEndParaPos.clear();
 }
 
-void SwWW8ImplReader::ReadAttrs(WW8_CP& rNext, WW8_CP& rTxtPos, bool& rbStartLine)
+void SwWW8ImplReader::ReadAttrs(WW8_CP& rNext, WW8_CP& rTextPos, bool& rbStartLine)
 {
     // Dow we have attributes?
-    if( rTxtPos >= rNext )
+    if( rTextPos >= rNext )
     {
         do
         {
-            m_aCurrAttrCP = rTxtPos;
-            rNext = ReadTextAttr( rTxtPos, rbStartLine );
+            m_aCurrAttrCP = rTextPos;
+            rNext = ReadTextAttr( rTextPos, rbStartLine );
         }
-        while( rTxtPos >= rNext );
+        while( rTextPos >= rNext );
 
     }
     else if ( rbStartLine )
@@ -3888,7 +3888,7 @@ void SwWW8ImplReader::ReadAttrs(WW8_CP& rNext, WW8_CP& rTxtPos, bool& rbStartLin
      * Due to this we need to set the template here as a kind of special treatment.
      */
     if (!m_bCpxStyle && m_nAktColl < m_vColl.size())
-            SetTxtFmtCollAndListLevel(*m_pPaM, m_vColl[m_nAktColl]);
+            SetTextFormatCollAndListLevel(*m_pPaM, m_vColl[m_nAktColl]);
         rbStartLine = false;
     }
 }
@@ -3927,7 +3927,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
     m_bWasParaEnd = false;
     m_nAktColl    =  0;
     m_pAktItemSet =  0;
-    m_nCharFmt    = -1;
+    m_nCharFormat    = -1;
     m_bSpec = false;
     m_bPgSecBreak = false;
 
@@ -3935,17 +3935,17 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
     long nCpOfs = m_pPlcxMan->GetCpOfs(); // Offset for Header/Footer, Footnote
 
     WW8_CP nNext = m_pPlcxMan->Where();
-    SwTxtNode* pPreviousNode = 0;
+    SwTextNode* pPreviousNode = 0;
     sal_uInt8 nDropLines = 0;
-    SwCharFmt* pNewSwCharFmt = 0;
-    const SwCharFmt* pFmt = 0;
+    SwCharFormat* pNewSwCharFormat = 0;
+    const SwCharFormat* pFormat = 0;
     m_pStrm->Seek( m_pSBase->WW8Cp2Fc( nStartCp + nCpOfs, &m_bIsUnicode ) );
 
     WW8_CP l = nStartCp;
     while ( l<nStartCp+nTextLen )
     {
         ReadAttrs( nNext, l, bStartLine );// Takes SectionBreaks into account, too
-        OSL_ENSURE(m_pPaM->GetNode().GetTxtNode(), "Missing txtnode");
+        OSL_ENSURE(m_pPaM->GetNode().GetTextNode(), "Missing txtnode");
 
         if (m_pPostProcessAttrsInfo != NULL)
             PostProcessAttrs();
@@ -3963,13 +3963,13 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
             if (m_bCareFirstParaEndInToc)
             {
                 m_bCareFirstParaEndInToc = false;
-                if (m_pPaM->End() && m_pPaM->End()->nNode.GetNode().GetTxtNode() &&  m_pPaM->End()->nNode.GetNode().GetTxtNode()->Len() == 0)
+                if (m_pPaM->End() && m_pPaM->End()->nNode.GetNode().GetTextNode() &&  m_pPaM->End()->nNode.GetNode().GetTextNode()->Len() == 0)
                     bSplit = false;
             }
             if (m_bCareLastParaEndInToc)
             {
                 m_bCareLastParaEndInToc = false;
-                if (m_pPaM->End() && m_pPaM->End()->nNode.GetNode().GetTxtNode() &&  m_pPaM->End()->nNode.GetNode().GetTxtNode()->Len() == 0)
+                if (m_pPaM->End() && m_pPaM->End()->nNode.GetNode().GetTextNode() &&  m_pPaM->End()->nNode.GetNode().GetTextNode()->Len() == 0)
                     bSplit = false;
             }
             if (bSplit)
@@ -3977,14 +3977,14 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
                 // We will record the CP of a paragraph end ('0x0D'), if current loading contents is from main stream;
                 if (m_bOnLoadingMain)
                     m_aEndParaPos.push_back(l-1);
-                AppendTxtNode(*m_pPaM->GetPoint());
+                AppendTextNode(*m_pPaM->GetPoint());
             }
         }
 
         if (pPreviousNode && bStartLine)
         {
-            SwTxtNode* pEndNd = m_pPaM->GetNode().GetTxtNode();
-            const sal_Int32 nDropCapLen = pPreviousNode->GetTxt().getLength();
+            SwTextNode* pEndNd = m_pPaM->GetNode().GetTextNode();
+            const sal_Int32 nDropCapLen = pPreviousNode->GetText().getLength();
 
             // Need to reset the font size and text position for the dropcap
             {
@@ -3993,9 +3993,9 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
             }
 
             // Get the default document dropcap which we can use as our template
-            const SwFmtDrop* defaultDrop =
-                static_cast<const SwFmtDrop*>( GetFmtAttr(RES_PARATR_DROP));
-            SwFmtDrop aDrop(*defaultDrop);
+            const SwFormatDrop* defaultDrop =
+                static_cast<const SwFormatDrop*>( GetFormatAttr(RES_PARATR_DROP));
+            SwFormatDrop aDrop(*defaultDrop);
 
             aDrop.GetLines() = nDropLines;
             aDrop.GetDistance() = nDistance;
@@ -4003,10 +4003,10 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
             // Word has no concept of a "whole word dropcap"
             aDrop.GetWholeWord() = false;
 
-            if (pFmt)
-                aDrop.SetCharFmt(const_cast<SwCharFmt*>(pFmt));
-            else if(pNewSwCharFmt)
-                aDrop.SetCharFmt(const_cast<SwCharFmt*>(pNewSwCharFmt));
+            if (pFormat)
+                aDrop.SetCharFormat(const_cast<SwCharFormat*>(pFormat));
+            else if(pNewSwCharFormat)
+                aDrop.SetCharFormat(const_cast<SwCharFormat*>(pNewSwCharFormat));
 
             SwPosition aStart(*pEndNd);
             m_pCtrlStck->NewAttr(aStart, aDrop);
@@ -4016,7 +4016,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
         else if (m_bDropCap)
         {
             // If we have found a dropcap store the textnode
-            pPreviousNode = m_pPaM->GetNode().GetTxtNode();
+            pPreviousNode = m_pPaM->GetNode().GetTextNode();
 
             const sal_uInt8 *pDCS;
 
@@ -4035,20 +4035,20 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
             else
                 nDistance = 0;
 
-            const SwFmtCharFmt *pSwFmtCharFmt = 0;
+            const SwFormatCharFormat *pSwFormatCharFormat = 0;
 
             if(m_pAktItemSet)
-                pSwFmtCharFmt = &(ItemGet<SwFmtCharFmt>(*m_pAktItemSet, RES_TXTATR_CHARFMT));
+                pSwFormatCharFormat = &(ItemGet<SwFormatCharFormat>(*m_pAktItemSet, RES_TXTATR_CHARFMT));
 
-            if(pSwFmtCharFmt)
-                pFmt = pSwFmtCharFmt->GetCharFmt();
+            if(pSwFormatCharFormat)
+                pFormat = pSwFormatCharFormat->GetCharFormat();
 
-            if(m_pAktItemSet && !pFmt)
+            if(m_pAktItemSet && !pFormat)
             {
                 OUString sPrefix(OUStringBuffer("WW8Dropcap").append(m_nDropCap++).makeStringAndClear());
-                pNewSwCharFmt = m_rDoc.MakeCharFmt(sPrefix, m_rDoc.GetDfltCharFmt());
+                pNewSwCharFormat = m_rDoc.MakeCharFormat(sPrefix, m_rDoc.GetDfltCharFormat());
                  m_pAktItemSet->ClearItem(RES_CHRATR_ESCAPEMENT);
-                pNewSwCharFmt->SetFmtAttr( *m_pAktItemSet );
+                pNewSwCharFormat->SetFormatAttr( *m_pAktItemSet );
             }
 
             delete m_pAktItemSet;
@@ -4087,10 +4087,10 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
                 // to insert a text node.
                 if (!bStartLine && !m_pAnchorStck->empty())
                 {
-                    AppendTxtNode(*m_pPaM->GetPoint());
+                    AppendTextNode(*m_pPaM->GetPoint());
                 }
                 m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM,
-                    SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK));
+                    SvxFormatBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK));
                 m_bFirstParaOfPage = true;
                 m_bPgSecBreak = false;
             }
@@ -4098,7 +4098,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
     }
 
     if (m_pPaM->GetPoint()->nContent.GetIndex())
-        AppendTxtNode(*m_pPaM->GetPoint());
+        AppendTextNode(*m_pPaM->GetPoint());
 
     if (!m_bInHyperlink)
         bJoined = JoinNode(*m_pPaM);
@@ -4132,8 +4132,8 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
     , m_aParaStyleMapper(rD)
     , m_aCharStyleMapper(rD)
     , m_pFormImpl(0)
-    , m_pFlyFmtOfJustInsertedGraphic(0)
-    , m_pFmtOfJustInsertedApo(0)
+    , m_pFlyFormatOfJustInsertedGraphic(0)
+    , m_pFormatOfJustInsertedApo(0)
     , m_pPreviousNumPaM(0)
     , m_pPrevNumRule(0)
     , m_pPostProcessAttrsInfo(0)
@@ -4143,13 +4143,13 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
     , m_pLstManager(0)
     , m_pSBase(0)
     , m_pPlcxMan(0)
-    , m_aTxtNodesHavingFirstLineOfstSet()
-    , m_aTxtNodesHavingLeftIndentSet()
+    , m_aTextNodesHavingFirstLineOfstSet()
+    , m_aTextNodesHavingLeftIndentSet()
     , m_pStyles(0)
     , m_pAktColl(0)
     , m_pAktItemSet(0)
-    , m_pDfltTxtFmtColl(0)
-    , m_pStandardFmtColl(0)
+    , m_pDfltTextFormatColl(0)
+    , m_pStandardFormatColl(0)
     , m_pHdFt(0)
     , m_pWFlyPara(0)
     , m_pSFlyPara(0)
@@ -4160,7 +4160,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
     , m_pDrawPg(0)
     , m_pDrawEditEngine(0)
     , m_pWWZOrder(0)
-    , m_pNumFldType(0)
+    , m_pNumFieldType(0)
     , m_pMSDffManager(0)
     , m_pAtnNames(0)
     , m_sBaseURL(rBaseURL)
@@ -4178,9 +4178,9 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
     , m_eHardCharSet(RTL_TEXTENCODING_DONTKNOW)
     , m_nProgress(0)
     , m_nAktColl(0)
-    , m_nFldNum(0)
+    , m_nFieldNum(0)
     , m_nLFOPosition(USHRT_MAX)
-    , m_nCharFmt(0)
+    , m_nCharFormat(0)
     , m_nDrawXOfs(0)
     , m_nDrawYOfs(0)
     , m_nDrawXOfs2(0)
@@ -4194,7 +4194,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
     , m_nPgChpLevel(0)
     , m_bNewDoc(bNewDoc)
     , m_bSkipImages(bSkipImages)
-    , m_bReadNoTbl(false)
+    , m_bReadNoTable(false)
     , m_bPgSecBreak(false)
     , m_bSpec(false)
     , m_bObj(false)
@@ -4206,8 +4206,8 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
     , m_bWasTabRowEnd(false)
     , m_bWasTabCellEnd(false)
     , m_bAnl(false)
-    , m_bHdFtFtnEdn(false)
-    , m_bFtnEdn(false)
+    , m_bHdFtFootnoteEdn(false)
+    , m_bFootnoteEdn(false)
     , m_bIsHeader(false)
     , m_bIsFooter(false)
     , m_bIsUnicode(false)
@@ -4268,7 +4268,7 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection,
 
     SetNumberingType(rSection, rPage);
 
-    SwFrmFmt &rFmt = rPage.GetMaster();
+    SwFrameFormat &rFormat = rPage.GetMaster();
 
     if(mrReader.m_pWDop->fUseBackGroundInAllmodes) // #i56806# Make sure mrReader is initialized
         mrReader.GrafikCtor();
@@ -4283,26 +4283,26 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection,
             // Only handle shape if it is a background shape
             if ((aData.begin()->nFlags & 0x400) != 0)
             {
-                SfxItemSet aSet(rFmt.GetAttrSet());
+                SfxItemSet aSet(rFormat.GetAttrSet());
                 mrReader.MatchSdrItemsIntoFlySet(pObject, aSet, mso_lineSimple,
                                                  mso_lineSolid, mso_sptRectangle, aRect);
-                rFmt.SetFmtAttr(aSet.Get(RES_BACKGROUND));
+                rFormat.SetFormatAttr(aSet.Get(RES_BACKGROUND));
             }
         }
         SdrObject::Free(pObject);
     }
     wwULSpaceData aULData;
     GetPageULData(rSection, aULData);
-    SetPageULSpaceItems(rFmt, aULData, rSection);
+    SetPageULSpaceItems(rFormat, aULData, rSection);
 
-    SetPage(rPage, rFmt, rSection, bIgnoreCols);
+    SetPage(rPage, rFormat, rSection, bIgnoreCols);
 
     if (!(rSection.maSep.pgbApplyTo & 1))
-        SwWW8ImplReader::SetPageBorder(rFmt, rSection);
+        SwWW8ImplReader::SetPageBorder(rFormat, rSection);
     if (!(rSection.maSep.pgbApplyTo & 2))
         SwWW8ImplReader::SetPageBorder(rPage.GetFirstMaster(), rSection);
 
-    mrReader.SetDocumentGrid(rFmt, rSection);
+    mrReader.SetDocumentGrid(rFormat, rSection);
 }
 
 void wwSectionManager::SetUseOn(wwSection &rSection)
@@ -4326,7 +4326,7 @@ void wwSectionManager::SetUseOn(wwSection &rSection)
  * Set the page descriptor on this node, handle the different cases for a text
  * node or a table
  */
-void GiveNodePageDesc(SwNodeIndex &rIdx, const SwFmtPageDesc &rPgDesc,
+void GiveNodePageDesc(SwNodeIndex &rIdx, const SwFormatPageDesc &rPgDesc,
     SwDoc &rDoc)
 {
     /*
@@ -4338,16 +4338,16 @@ void GiveNodePageDesc(SwNodeIndex &rIdx, const SwFmtPageDesc &rPgDesc,
     {
         SwTable& rTable =
             rIdx.GetNode().GetTableNode()->GetTable();
-        SwFrmFmt* pApply = rTable.GetFrmFmt();
+        SwFrameFormat* pApply = rTable.GetFrameFormat();
         OSL_ENSURE(pApply, "impossible");
         if (pApply)
-            pApply->SetFmtAttr(rPgDesc);
+            pApply->SetFormatAttr(rPgDesc);
     }
     else
     {
         SwPosition aPamStart(rIdx);
         aPamStart.nContent.Assign(
-            rIdx.GetNode().GetCntntNode(), 0);
+            rIdx.GetNode().GetContentNode(), 0);
         SwPaM aPage(aPamStart);
 
         rDoc.getIDocumentContentOperations().InsertPoolItem(aPage, rPgDesc);
@@ -4357,7 +4357,7 @@ void GiveNodePageDesc(SwNodeIndex &rIdx, const SwFmtPageDesc &rPgDesc,
 /**
  * Map a word section to a writer page descriptor
  */
-SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
+SwFormatPageDesc wwSectionManager::SetSwFormatPageDesc(mySegIter &rIter,
     mySegIter &rStart, bool bIgnoreCols)
 {
     if (IsNewDoc() && rIter == rStart)
@@ -4373,7 +4373,7 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
     }
     OSL_ENSURE(rIter->mpPage, "no page!");
     if (!rIter->mpPage)
-        return SwFmtPageDesc();
+        return SwFormatPageDesc();
 
     // Set page before hd/ft
     const wwSection *pPrevious = 0;
@@ -4385,7 +4385,7 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
     // Set hd/ft after set page
     SetSegmentToPageDesc(*rIter, bIgnoreCols);
 
-    SwFmtPageDesc aRet(rIter->mpPage);
+    SwFormatPageDesc aRet(rIter->mpPage);
 
     rIter->mpPage->SetFollow(rIter->mpPage);
 
@@ -4415,7 +4415,7 @@ void wwSectionManager::InsertSegments()
         if ( aIter->maSep.bkc == 1 && aIter->maSep.ccolM1 > 0 )
         {
             SwPaM start( aIter->maStart );
-            mrReader.m_rDoc.getIDocumentContentOperations().InsertPoolItem( start, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
+            mrReader.m_rDoc.getIDocumentContentOperations().InsertPoolItem( start, SvxFormatBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
             continue;
         }
 
@@ -4465,7 +4465,7 @@ void wwSectionManager::InsertSegments()
                     bInsertSection = true;
             }
 
-            SwFmtPageDesc aDesc(SetSwFmtPageDesc(aIter, aStart, bIgnoreCols));
+            SwFormatPageDesc aDesc(SetSwFormatPageDesc(aIter, aStart, bIgnoreCols));
             if (!aDesc.GetPageDesc())
                 continue;
 
@@ -4476,15 +4476,15 @@ void wwSectionManager::InsertSegments()
             // c) create a new style to follow the break page style
             if ( aIter->maSep.bkc == 3 || aIter->maSep.bkc == 4 )
             {
-                // SetSwFmtPageDesc calls some methods that could
+                // SetSwFormatPageDesc calls some methods that could
                 // modify aIter (e.g. wwSection ).
-                // Since  we call SetSwFmtPageDesc below to generate the
+                // Since  we call SetSwFormatPageDesc below to generate the
                 // 'Following' style of the Break style, it is safer
                 // to take  a copy of the contents of aIter.
                 wwSection aTmpSection = *aIter;
                 // create a new following page style
-                SwFmtPageDesc aFollow(SetSwFmtPageDesc(aIter, aStart, bIgnoreCols));
-                // restore any contents of aIter trashed by SetSwFmtPageDesc
+                SwFormatPageDesc aFollow(SetSwFormatPageDesc(aIter, aStart, bIgnoreCols));
+                // restore any contents of aIter trashed by SetSwFormatPageDesc
                 *aIter = aTmpSection;
 
                 // Handle the section break
@@ -4499,7 +4499,7 @@ void wwSectionManager::InsertSegments()
             GiveNodePageDesc(aIter->maStart, aDesc, mrReader.m_rDoc);
         }
 
-        SwTxtNode* pTxtNd = 0;
+        SwTextNode* pTextNd = 0;
         if (bInsertSection)
         {
             // Start getting the bounds of this section
@@ -4510,29 +4510,29 @@ void wwSectionManager::InsertSegments()
                 aAnchor = aNext->maStart;
                 aSectPaM.GetPoint()->nNode = aAnchor;
                 aSectPaM.GetPoint()->nContent.Assign(
-                    aNext->maStart.GetNode().GetCntntNode(), 0);
+                    aNext->maStart.GetNode().GetContentNode(), 0);
                 aSectPaM.Move(fnMoveBackward);
             }
 
             const SwPosition* pPos  = aSectPaM.GetPoint();
-            SwTxtNode const*const pSttNd = pPos->nNode.GetNode().GetTxtNode();
+            SwTextNode const*const pSttNd = pPos->nNode.GetNode().GetTextNode();
             const SwTableNode* pTableNd = pSttNd ? pSttNd->FindTableNode() : 0;
             if (pTableNd)
             {
-                pTxtNd =
-                    mrReader.m_rDoc.GetNodes().MakeTxtNode(aAnchor,
-                    mrReader.m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
+                pTextNd =
+                    mrReader.m_rDoc.GetNodes().MakeTextNode(aAnchor,
+                    mrReader.m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ));
 
-                aSectPaM.GetPoint()->nNode = SwNodeIndex(*pTxtNd);
+                aSectPaM.GetPoint()->nNode = SwNodeIndex(*pTextNd);
                 aSectPaM.GetPoint()->nContent.Assign(
-                    aSectPaM.GetCntntNode(), 0);
+                    aSectPaM.GetContentNode(), 0);
             }
 
             aSectPaM.SetMark();
 
             aSectPaM.GetPoint()->nNode = aIter->maStart;
             aSectPaM.GetPoint()->nContent.Assign(
-                aSectPaM.GetCntntNode(), 0);
+                aSectPaM.GetContentNode(), 0);
 
             bool bHasOwnHdFt = false;
             /*
@@ -4555,7 +4555,7 @@ void wwSectionManager::InsertSegments()
                 // no page break in the section
                 SwPageDesc *pOrig = aIter->mpPage;
                 bool bFailed = true;
-                SwFmtPageDesc aDesc(SetSwFmtPageDesc(aIter, aStart, true));
+                SwFormatPageDesc aDesc(SetSwFormatPageDesc(aIter, aStart, true));
                 if (aDesc.GetPageDesc())
                 {
                     sal_uLong nStart = aSectPaM.Start()->nNode.GetIndex();
@@ -4581,46 +4581,46 @@ void wwSectionManager::InsertSegments()
             }
 
             // End getting the bounds of this section, quite a job eh?
-            SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter);
+            SwSectionFormat *pRet = InsertSection(aSectPaM, *aIter);
             // The last section if continuous is always unbalanced
             if (pRet)
             {
                 // Set the columns to be UnBalanced if that compatibility option is set
                 if (mrReader.m_pWDop->fNoColumnBalance)
-                    pRet->SetFmtAttr(SwFmtNoBalancedColumns(true));
+                    pRet->SetFormatAttr(SwFormatNoBalancedColumns(true));
                 else
                 {
                     // Otherwise set to unbalanced if the following section is
                     // not continuous, (which also means that the last section
                     // is unbalanced)
                     if (aNext == aEnd || !aNext->IsContinuous())
-                        pRet->SetFmtAttr(SwFmtNoBalancedColumns(true));
+                        pRet->SetFormatAttr(SwFormatNoBalancedColumns(true));
                 }
             }
         }
 
-        if (pTxtNd)
+        if (pTextNd)
         {
-            SwNodeIndex aIdx(*pTxtNd);
+            SwNodeIndex aIdx(*pTextNd);
             SwPaM aTest(aIdx);
             mrReader.m_rDoc.getIDocumentContentOperations().DelFullPara(aTest);
-            pTxtNd = 0;
+            pTextNd = 0;
         }
     }
 }
 
 void wwExtraneousParas::delete_all_from_doc()
 {
-    typedef std::vector<SwTxtNode*>::iterator myParaIter;
-    myParaIter aEnd = m_aTxtNodes.end();
-    for (myParaIter aI = m_aTxtNodes.begin(); aI != aEnd; ++aI)
+    typedef std::vector<SwTextNode*>::iterator myParaIter;
+    myParaIter aEnd = m_aTextNodes.end();
+    for (myParaIter aI = m_aTextNodes.begin(); aI != aEnd; ++aI)
     {
-        SwTxtNode *pTxtNode = *aI;
-        SwNodeIndex aIdx(*pTxtNode);
+        SwTextNode *pTextNode = *aI;
+        SwNodeIndex aIdx(*pTextNode);
         SwPaM aTest(aIdx);
         m_rDoc.getIDocumentContentOperations().DelFullPara(aTest);
     }
-    m_aTxtNodes.clear();
+    m_aTextNodes.clear();
 }
 
 void SwWW8ImplReader::StoreMacroCmds()
@@ -4852,7 +4852,7 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom,
         tools::SvRef<SotStorageStream> refMainStream = rRoot->OpenSotStream( OUString( "WordDocument" ));
         refMainStream->SetEndian(SvStreamEndian::LITTLE);
         WW8Fib aWwFib( *refMainStream, 8 );
-        tools::SvRef<SotStorageStream> xTableStream = rRoot->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
+        tools::SvRef<SotStorageStream> xTableStream = rRoot->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTableStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
 
         if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
         {
@@ -4907,7 +4907,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
     m_pRedlineStack = new sw::util::RedlineStack(m_rDoc);
 
     /*
-        RefFldStck: Keeps track of bookmarks which may be inserted as
+        RefFieldStck: Keeps track of bookmarks which may be inserted as
         variables intstead.
     */
     m_pReffedStck = new SwWW8ReferencedFltEndStack(&m_rDoc, m_nFieldFlags);
@@ -5016,30 +5016,30 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
 
     if (m_pSBase->AreThereFootnotes())
     {
-        static const SwFtnNum eNumA[4] =
+        static const SwFootnoteNum eNumA[4] =
         {
             FTNNUM_DOC, FTNNUM_CHAPTER, FTNNUM_PAGE, FTNNUM_DOC
         };
 
-        SwFtnInfo aInfo;
-        aInfo = m_rDoc.GetFtnInfo(); // Copy-Ctor private
+        SwFootnoteInfo aInfo;
+        aInfo = m_rDoc.GetFootnoteInfo(); // Copy-Ctor private
 
         aInfo.ePos = FTNPOS_PAGE;
-        aInfo.eNum = eNumA[m_pWDop->rncFtn];
-        sal_uInt16 nfcFtnRef = m_pWDop->nfcFtnRef & 0xF;
-        aInfo.aFmt.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[nfcFtnRef]) );
-        if( m_pWDop->nFtn )
-            aInfo.nFtnOffset = m_pWDop->nFtn - 1;
-        m_rDoc.SetFtnInfo( aInfo );
+        aInfo.eNum = eNumA[m_pWDop->rncFootnote];
+        sal_uInt16 nfcFootnoteRef = m_pWDop->nfcFootnoteRef & 0xF;
+        aInfo.aFormat.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[nfcFootnoteRef]) );
+        if( m_pWDop->nFootnote )
+            aInfo.nFootnoteOffset = m_pWDop->nFootnote - 1;
+        m_rDoc.SetFootnoteInfo( aInfo );
     }
     if( m_pSBase->AreThereEndnotes() )
     {
         SwEndNoteInfo aInfo;
-        aInfo = m_rDoc.GetEndNoteInfo(); // Same as for Ftn
+        aInfo = m_rDoc.GetEndNoteInfo(); // Same as for Footnote
         sal_uInt16 nfcEdnRef = m_pWDop->nfcEdnRef & 0xF;
-        aInfo.aFmt.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[nfcEdnRef]) );
+        aInfo.aFormat.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[nfcEdnRef]) );
         if( m_pWDop->nEdn )
-            aInfo.nFtnOffset = m_pWDop->nEdn - 1;
+            aInfo.nFootnoteOffset = m_pWDop->nEdn - 1;
         m_rDoc.SetEndNoteInfo( aInfo );
     }
 
@@ -5057,8 +5057,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
         m_rDoc.getIDocumentContentOperations().SplitNode( *pPos, false );
 
         // another split, if insertion position was not at the end of the current paragraph.
-        SwTxtNode const*const pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-        if ( pTxtNd->GetTxt().getLength() )
+        SwTextNode const*const pTextNd = pPos->nNode.GetNode().GetTextNode();
+        if ( pTextNd->GetText().getLength() )
         {
             m_rDoc.getIDocumentContentOperations().SplitNode( *pPos, false );
             // move PaM back to the newly empty paragraph
@@ -5067,7 +5067,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
 
         // suppress insertion of tables inside footnotes.
         const sal_uLong nNd = pPos->nNode.GetIndex();
-        m_bReadNoTbl = ( nNd < m_rDoc.GetNodes().GetEndOfInserts().GetIndex() &&
+        m_bReadNoTable = ( nNd < m_rDoc.GetNodes().GetEndOfInserts().GetIndex() &&
                        m_rDoc.GetNodes().GetEndOfInserts().StartOfSectionIndex() < nNd );
     }
 
@@ -5084,14 +5084,14 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
         for (int i = 0; i < pGloss->GetNoStrings(); ++i, aPlc.advance())
         {
             SwNodeIndex aIdx( m_rDoc.GetNodes().GetEndOfContent());
-            SwTxtFmtColl* pColl =
-                m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD,
+            SwTextFormatColl* pColl =
+                m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD,
                 false);
             SwStartNode *pNode =
                 m_rDoc.GetNodes().MakeTextSection(aIdx,
                 SwNormalStartNode,pColl);
             m_pPaM->GetPoint()->nNode = pNode->GetIndex()+1;
-            m_pPaM->GetPoint()->nContent.Assign(m_pPaM->GetCntntNode(),0);
+            m_pPaM->GetPoint()->nContent.Assign(m_pPaM->GetContentNode(),0);
             aPlc.Get( nStart, nEnd, pDummy );
             ReadText(nStart,nEnd-nStart-1,MAN_MAINTEXT);
         }
@@ -5154,7 +5154,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
 
     if (m_pDrawPg && m_pMSDffManager && m_pMSDffManager->GetShapeOrders())
     {
-        // Helper array to chain the inserted frames (instead of SdrTxtObj)
+        // Helper array to chain the inserted frames (instead of SdrTextObj)
         SvxMSDffShapeTxBxSort aTxBxSort;
 
         // Ensure correct z-order of read Escher objects
@@ -5171,15 +5171,15 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
         // Chain Frames
         if( !aTxBxSort.empty() )
         {
-            SwFmtChain aChain;
+            SwFormatChain aChain;
             for( SvxMSDffShapeTxBxSort::iterator it = aTxBxSort.begin(); it != aTxBxSort.end(); ++it )
             {
                 SvxMSDffShapeOrder *pOrder = *it;
 
                 // Initialize FlyFrame Formats
-                SwFlyFrmFmt* pFlyFmt     = pOrder->pFly;
-                SwFlyFrmFmt* pNextFlyFmt = 0;
-                SwFlyFrmFmt* pPrevFlyFmt = 0;
+                SwFlyFrameFormat* pFlyFormat     = pOrder->pFly;
+                SwFlyFrameFormat* pNextFlyFormat = 0;
+                SwFlyFrameFormat* pPrevFlyFormat = 0;
 
                 // Determine successor, if we can
                 SvxMSDffShapeTxBxSort::iterator tmpIter1 = it;
@@ -5189,7 +5189,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
                     SvxMSDffShapeOrder *pNextOrder = *tmpIter1;
                     if ((0xFFFF0000 & pOrder->nTxBxComp)
                            == (0xFFFF0000 & pNextOrder->nTxBxComp))
-                        pNextFlyFmt = pNextOrder->pFly;
+                        pNextFlyFormat = pNextOrder->pFly;
                 }
                 // Determine precessor, if we can
                 if( it != aTxBxSort.begin() )
@@ -5199,15 +5199,15 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
                     SvxMSDffShapeOrder *pPrevOrder = *tmpIter2;
                     if ((0xFFFF0000 & pOrder->nTxBxComp)
                            == (0xFFFF0000 & pPrevOrder->nTxBxComp))
-                        pPrevFlyFmt = pPrevOrder->pFly;
+                        pPrevFlyFormat = pPrevOrder->pFly;
                 }
                 // If successor or predecessor present, insert the
                 // chain at the FlyFrame Format
-                if (pNextFlyFmt || pPrevFlyFmt)
+                if (pNextFlyFormat || pPrevFlyFormat)
                 {
-                    aChain.SetNext( pNextFlyFmt );
-                    aChain.SetPrev( pPrevFlyFmt );
-                    pFlyFmt->SetFmtAttr( aChain );
+                    aChain.SetNext( pNextFlyFormat );
+                    aChain.SetPrev( pPrevFlyFormat );
+                    pFlyFormat->SetFormatAttr( aChain );
                 }
             }
         }
@@ -5221,7 +5221,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
             eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE;
     }
 
-    m_aInsertedTables.DelAndMakeTblFrms();
+    m_aInsertedTables.DelAndMakeTableFrms();
     m_aSectionManager.InsertSegments();
 
     m_vColl.clear();
@@ -5252,7 +5252,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
     // For i120928,achieve the graphics from the special bookmark with is for graphic bullet
     {
         std::vector<const SwGrfNode*> vecBulletGrf;
-        std::vector<SwFrmFmt*> vecFrmFmt;
+        std::vector<SwFrameFormat*> vecFrameFormat;
 
         IDocumentMarkAccess* const pMarkAccess = m_rDoc.getIDocumentMarkAccess();
         if ( pMarkAccess )
@@ -5261,22 +5261,22 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
             if ( ppBkmk != pMarkAccess->getBookmarksEnd() &&
                        IDocumentMarkAccess::GetType( *(ppBkmk->get()) ) == IDocumentMarkAccess::MarkType::BOOKMARK )
             {
-                SwTxtNode* pTxtNode = ppBkmk->get()->GetMarkStart().nNode.GetNode().GetTxtNode();
+                SwTextNode* pTextNode = ppBkmk->get()->GetMarkStart().nNode.GetNode().GetTextNode();
 
-                if ( pTxtNode )
+                if ( pTextNode )
                 {
-                    const SwpHints* pHints = pTxtNode->GetpSwpHints();
+                    const SwpHints* pHints = pTextNode->GetpSwpHints();
                     for( size_t nHintPos = 0; pHints && nHintPos < pHints->Count(); ++nHintPos)
                     {
-                        const SwTxtAttr *pHt = (*pHints)[nHintPos];
+                        const SwTextAttr *pHt = (*pHints)[nHintPos];
                         const sal_Int32 st = pHt->GetStart();
                         if( pHt
                             && pHt->Which() == RES_TXTATR_FLYCNT
                             && (st >= ppBkmk->get()->GetMarkStart().nContent.GetIndex()) )
                         {
-                            SwFrmFmt* pFrmFmt = pHt->GetFlyCnt().GetFrmFmt();
-                            vecFrmFmt.push_back(pFrmFmt);
-                            const SwNodeIndex* pNdIdx = pFrmFmt->GetCntnt().GetCntntIdx();
+                            SwFrameFormat* pFrameFormat = pHt->GetFlyCnt().GetFrameFormat();
+                            vecFrameFormat.push_back(pFrameFormat);
+                            const SwNodeIndex* pNdIdx = pFrameFormat->GetContent().GetContentIdx();
                             const SwNodes* pNodesArray = (pNdIdx != NULL)
                                                          ? &(pNdIdx->GetNodes())
                                                          : NULL;
@@ -5293,9 +5293,9 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
                         SwNumRule* pRule = m_pLstManager->GetNumRule(i);
                         for (sal_uInt16 j = 0; j < MAXLEVEL; ++j)
                         {
-                            SwNumFmt aNumFmt(pRule->Get(j));
-                            const sal_Int16 nType = aNumFmt.GetNumberingType();
-                            const sal_uInt16 nGrfBulletCP = aNumFmt.GetGrfBulletCP();
+                            SwNumFormat aNumFormat(pRule->Get(j));
+                            const sal_Int16 nType = aNumFormat.GetNumberingType();
+                            const sal_uInt16 nGrfBulletCP = aNumFormat.GetGrfBulletCP();
                             if ( nType == SVX_NUM_BITMAP
                                  && vecBulletGrf.size() > nGrfBulletCP
                                  && vecBulletGrf[nGrfBulletCP] != NULL )
@@ -5309,21 +5309,21 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
                                 {
                                     int nWidth = (nHeight * aPrefSize.Width()) / aPrefSize.Height();
                                     Size aSize(nWidth, nHeight);
-                                    aNumFmt.SetGraphicBrush(&aBrush, &aSize);
+                                    aNumFormat.SetGraphicBrush(&aBrush, &aSize);
                                 }
                                 else
                                 {
-                                    aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-                                    aNumFmt.SetBulletChar(0x2190);
+                                    aNumFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+                                    aNumFormat.SetBulletChar(0x2190);
                                 }
-                                pRule->Set( j, aNumFmt );
+                                pRule->Set( j, aNumFormat );
                             }
                         }
                     }
                     // Remove additional pictures
-                    for (sal_uInt16 i = 0; i < vecFrmFmt.size(); ++i)
+                    for (sal_uInt16 i = 0; i < vecFrameFormat.size(); ++i)
                     {
-                        m_rDoc.getIDocumentLayoutAccess().DelLayoutFmt(vecFrmFmt[i]);
+                        m_rDoc.getIDocumentLayoutAccess().DelLayoutFormat(vecFrameFormat[i]);
                     }
                 }
             }
@@ -5373,7 +5373,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(tools::SvRef<SotStorageStream> &rTableS
             }
 
             rTableStream = m_pStg->OpenSotStream( OUString::createFromAscii(
-                m_pWwFib->fWhichTblStm ? SL::a1Table : SL::a0Table),
+                m_pWwFib->fWhichTableStm ? SL::a1Table : SL::a0Table),
                 STREAM_STD_READ);
 
             m_pTableStream = &rTableStream;
@@ -5858,7 +5858,7 @@ void SwWW8ImplReader::SetOutlineStyles()
         if (pChosenWW8ListStyle != NULL && pStyleInf->mnWW8OutlineLevel
                                            == pStyleInf->nListLevel)
         {
-            const SwNumFmt& rRule
+            const SwNumFormat& rRule
                 = pChosenWW8ListStyle->Get(pStyleInf->mnWW8OutlineLevel);
             aOutlineRule.Set(pStyleInf->mnWW8OutlineLevel, rRule);
             bAppliedChangedOutlineStyle = true;
@@ -5868,7 +5868,7 @@ void SwWW8ImplReader::SetOutlineStyles()
         nOutlineStyleListLevelWithAssignment
             |= nOutlineStyleListLevelOfWW8BuiltInHeadingStyle;
 
-        SwTxtFmtColl* pTxtFmtColl = static_cast<SwTxtFmtColl*>(pStyleInf->pFmt);
+        SwTextFormatColl* pTextFormatColl = static_cast<SwTextFormatColl*>(pStyleInf->pFormat);
         if (pStyleInf->GetOutlineNumrule() != pChosenWW8ListStyle
             || (pStyleInf->nListLevel < WW8ListManager::nMaxLevel
                 && pStyleInf->mnWW8OutlineLevel != pStyleInf->nListLevel))
@@ -5876,24 +5876,24 @@ void SwWW8ImplReader::SetOutlineStyles()
             // WW8 Built-In Heading Style does not apply the chosen one.
             // --> delete assignment to OutlineStyle, but keep its current
             // outline level
-            pTxtFmtColl->DeleteAssignmentToListLevelOfOutlineStyle(false);
+            pTextFormatColl->DeleteAssignmentToListLevelOfOutlineStyle(false);
             // Apply existing WW8 list style a normal list style at the
             // Paragraph Style
             if (pStyleInf->GetOutlineNumrule() != NULL)
             {
-                pTxtFmtColl->SetFmtAttr(
+                pTextFormatColl->SetFormatAttr(
                     SwNumRuleItem(pStyleInf->GetOutlineNumrule()->GetName()));
             }
             // apply default outline level of WW8 Built-in Heading Style
             const sal_uInt8 nOutlineLevel
                 = SwWW8StyInf::WW8OutlineLevelToOutlinelevel(
                     pStyleInf->mnWW8OutlineLevel);
-            pTxtFmtColl->SetFmtAttr(
+            pTextFormatColl->SetFormatAttr(
                 SfxUInt16Item(RES_PARATR_OUTLINELEVEL, nOutlineLevel));
         }
         else
         {
-            pTxtFmtColl->AssignToListLevelOfOutlineStyle(
+            pTextFormatColl->AssignToListLevelOfOutlineStyle(
                 pStyleInf->mnWW8OutlineLevel);
         }
     }
@@ -6094,7 +6094,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam, co
         if (bNew)
         {
             // Remove Frame and offsets from Frame Template
-            Reader::ResetFrmFmts( rDoc );
+            Reader::ResetFrameFormats( rDoc );
         }
         SwWW8ImplReader* pRdr = new SwWW8ImplReader(nVersion, pStg, pIn, rDoc,
             rBaseURL, bNew, bSkipImages);
@@ -6276,19 +6276,19 @@ namespace sw
     namespace hack
     {
         Position::Position(const SwPosition &rPos)
-            : maPtNode(rPos.nNode), mnPtCntnt(rPos.nContent.GetIndex())
+            : maPtNode(rPos.nNode), mnPtContent(rPos.nContent.GetIndex())
         {
         }
 
         Position::Position(const Position &rPos)
-            : maPtNode(rPos.maPtNode), mnPtCntnt(rPos.mnPtCntnt)
+            : maPtNode(rPos.maPtNode), mnPtContent(rPos.mnPtContent)
         {
         }
 
         Position::operator SwPosition() const
         {
             SwPosition aRet(maPtNode);
-            aRet.nContent.Assign(maPtNode.GetNode().GetCntntNode(), mnPtCntnt);
+            aRet.nContent.Assign(maPtNode.GetNode().GetContentNode(), mnPtContent);
             return aRet;
         }
     }
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index d50b5a0bc660..afe7125c39f9 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -56,17 +56,17 @@
 class SwDoc;
 class SwPaM;
 class SfxPoolItem;
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwPageDesc;
 class SvxBoxItem;
-class SwFmt;
+class SwFormat;
 class SwNodeIndex;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
 class SwAttrSet;
 class SwNumRule;
-class SwFrmFmt;
+class SwFrameFormat;
 class Writer;
-class SwFmtFld;
+class SwFormatField;
 class WW8Fib;
 class WW8PLCFMan;
 struct WW8PLCFManResult;
@@ -79,7 +79,7 @@ struct WW8_PIC;
 class WW8TabDesc;
 struct WW8_SHD;
 struct WW8_OLST;
-class SwNumFmt;
+class SwNumFormat;
 struct WW8_ANLD;
 struct WW8_ANLV;
 struct WW8_DO;
@@ -149,7 +149,7 @@ public:
     //the rParaSprms returns back the original word paragraph indent
     //sprms which were attached to the original numbering format
     SwNumRule* GetNumRuleForActivation(sal_uInt16 nLFOPosition, const sal_uInt8 nLevel,
-        std::vector<sal_uInt8> &rParaSprms, SwTxtNode *pNode=0);
+        std::vector<sal_uInt8> &rParaSprms, SwTextNode *pNode=0);
     SwNumRule* CreateNextRule(bool bSimple);
     ~WW8ListManager();
     SwNumRule* GetNumRule(size_t i);
@@ -167,17 +167,17 @@ private:
     WW8LSTInfo* GetLSTByListId(    sal_uInt32  nIdLst     ) const;
     //the rParaSprms returns back the original word paragraph indent
     //sprms which are attached to this numbering level
-    bool ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet, sal_uInt16 nLevelStyle,
+    bool ReadLVL(SwNumFormat& rNumFormat, SfxItemSet*& rpItemSet, sal_uInt16 nLevelStyle,
         bool bSetStartNo, std::deque<bool> &rNotReallyThere, sal_uInt16 nLevel,
         ww::bytes &rParaSprms);
 
     // Zeichenattribute aus GrpprlChpx
     typedef SfxItemSet* WW8aISet[nMaxLevel];
     // Zeichen Style Pointer
-    typedef SwCharFmt* WW8aCFmt[nMaxLevel];
+    typedef SwCharFormat* WW8aCFormat[nMaxLevel];
 
     void AdjustLVL(sal_uInt8 nLevel, SwNumRule& rNumRule, WW8aISet& rListItemSet,
-        WW8aCFmt& aCharFmt, bool& bNewCharFmtCreated,
+        WW8aCFormat& aCharFormat, bool& bNewCharFormatCreated,
         const OUString& aPrefix = OUString());
 
     WW8ListManager(const WW8ListManager&) SAL_DELETED_FUNCTION;
@@ -219,7 +219,7 @@ public:
     rtl_TextEncoding eLTRFontSrcCharSet;    // rtl_TextEncoding fuer den Font
     rtl_TextEncoding eRTLFontSrcCharSet;    // rtl_TextEncoding fuer den Font
     rtl_TextEncoding eCJKFontSrcCharSet;    // rtl_TextEncoding fuer den Font
-    SwFmt*      pFmt;
+    SwFormat*      pFormat;
     WW8FlyPara* pWWFly;
     SwNumRule*  pOutlineNumrule;
     long        nFilePos;
@@ -241,13 +241,13 @@ public:
     SvxLRSpaceItem maWordLR;
     bool bValid;            // leer oder Valid
     bool bImported;         // fuers rekursive Importieren
-    bool bColl;             // true-> pFmt ist SwTxtFmtColl
+    bool bColl;             // true-> pFormat ist SwTextFormatColl
     bool bImportSkipped;    // nur true bei !bNewDoc && vorh. Style
     bool bHasStyNumRule;    // true-> Benannter NumRule in Style
     bool bHasBrokenWW6List; // true-> WW8+ style has a WW7- list
     bool bListReleventIndentSet; //true if this style's indent has
                                  //been explicitly set, it's set to the value
-                                 //of pFmt->GetItemState(RES_LR_SPACE, false)
+                                 //of pFormat->GetItemState(RES_LR_SPACE, false)
                                  //if it was possible to get the ItemState
                                  //for L of the LR space independently
     bool bParaAutoBefore;   // For Auto spacing before a paragraph
@@ -259,7 +259,7 @@ public:
         eLTRFontSrcCharSet(0),
         eRTLFontSrcCharSet(0),
         eCJKFontSrcCharSet(0),
-        pFmt( 0 ),
+        pFormat( 0 ),
         pWWFly( 0 ),
         pOutlineNumrule( 0 ),
         nFilePos( 0 ),
@@ -307,7 +307,7 @@ public:
 
     bool HasWW8OutlineLevel() const
     {
-        return (pFmt != NULL && (MAXLEVEL > mnWW8OutlineLevel));
+        return (pFormat != NULL && (MAXLEVEL > mnWW8OutlineLevel));
     }
 
     bool IsOutlineNumbered() const
@@ -366,8 +366,8 @@ private:
     sal_uInt16 nToggleBiDiAttrFlags;
     SwWW8FltControlStack(const SwWW8FltControlStack&) SAL_DELETED_FUNCTION;
     SwWW8FltControlStack& operator=(const SwWW8FltControlStack&) SAL_DELETED_FUNCTION;
-    const SwNumFmt* GetNumFmtFromStack(const SwPosition &rPos,
-        const SwTxtNode &rTxtNode);
+    const SwNumFormat* GetNumFormatFromStack(const SwPosition &rPos,
+        const SwTextNode &rTextNode);
 protected:
     virtual void SetAttrInDoc(const SwPosition& rTmpPos,
         SwFltStackEntry& rEntry) SAL_OVERRIDE;
@@ -410,7 +410,7 @@ public:
     void SetToggleAttrFlags(sal_uInt16 nFlags) { nToggleAttrFlags = nFlags; }
     void SetToggleBiDiAttrFlags(sal_uInt16 nFlags) {nToggleBiDiAttrFlags = nFlags;}
 
-    const SfxPoolItem* GetFmtAttr(const SwPosition& rPos, sal_uInt16 nWhich);
+    const SfxPoolItem* GetFormatAttr(const SwPosition& rPos, sal_uInt16 nWhich);
     const SfxPoolItem* GetStackAttr(const SwPosition& rPos, sal_uInt16 nWhich);
 };
 
@@ -422,7 +422,7 @@ class SwWW8FltAnchorStack : public SwFltControlStack
 public:
     SwWW8FltAnchorStack(SwDoc* pDo, sal_uLong nFieldFl)
         : SwFltControlStack( pDo, nFieldFl ) {}
-    void AddAnchor(const SwPosition& rPos,SwFrmFmt *pFmt);
+    void AddAnchor(const SwPosition& rPos,SwFrameFormat *pFormat);
     void Flush();
 private:
     SwWW8FltAnchorStack(const SwWW8FltAnchorStack&) SAL_DELETED_FUNCTION;
@@ -436,8 +436,8 @@ class Position
 public:
     SwNodeIndex maMkNode;
     SwNodeIndex maPtNode;
-    sal_Int32 mnMkCntnt;
-    sal_Int32 mnPtCntnt;
+    sal_Int32 mnMkContent;
+    sal_Int32 mnPtContent;
     Position(const SwPaM &rPaM);
     Position(const Position &rEntry);
 private:
@@ -478,14 +478,14 @@ public:
         : SwFltEndStack( pDo, nFieldFl )
         , aFieldVarNames()
     {}
-    bool IsFtnEdnBkmField(const SwFmtFld& rFmtFld, sal_uInt16& rBkmNo);
+    bool IsFootnoteEdnBkmField(const SwFormatField& rFormatField, sal_uInt16& rBkmNo);
 
     //Keep track of variable names created with fields, and the bookmark
     //mapped to their position, hopefully the same, but very possibly
     //an additional pseudo bookmark
     std::map<OUString, OUString, SwWW8::ltstr> aFieldVarNames;
 protected:
-    SwFltStackEntry *RefToVar(const SwField* pFld,SwFltStackEntry& rEntry);
+    SwFltStackEntry *RefToVar(const SwField* pField,SwFltStackEntry& rEntry);
     virtual void SetAttrInDoc(const SwPosition& rTmpPos,
         SwFltStackEntry& rEntry) SAL_OVERRIDE;
 private:
@@ -543,13 +543,13 @@ namespace sw
         {
         private:
             SwNodeIndex maPtNode;
-            sal_Int32 mnPtCntnt;
+            sal_Int32 mnPtContent;
         public:
             Position(const SwPosition &rPos);
             Position(const Position &rPos);
             operator SwPosition() const;
             SwNodeIndex GetPtNode() { return maPtNode; };
-            sal_Int32 GetPtCntnt() { return mnPtCntnt; };
+            sal_Int32 GetPtContent() { return mnPtContent; };
         };
     }
 }
@@ -572,7 +572,7 @@ class WW8FieldEntry
         void Swap(WW8FieldEntry &rOther) throw();
 
         SwNodeIndex GetPtNode() { return maStartPos.GetPtNode(); };
-        sal_Int32 GetPtCntnt() { return maStartPos.GetPtCntnt(); };
+        sal_Int32 GetPtContent() { return maStartPos.GetPtContent(); };
 
         OUString GetBookmarkName() { return msBookmarkName;}
         OUString GetBookmarkCode() { return msMarkCode;}
@@ -605,7 +605,7 @@ private:
     sal_Unicode mcSymbol;
     bool mbIgnoreText;
     bool mbSymbol;
-    bool mbHdFtFtnEdn;
+    bool mbHdFtFootnoteEdn;
     bool mbTxbxFlySection;
     bool mbAnl;
     bool mbInHyperlink;
@@ -859,10 +859,10 @@ private:
 
     void GetPageULData(const wwSection &rNewSection,
         wwULSpaceData& rData) const;
-    static void SetPageULSpaceItems(SwFrmFmt &rFmt, wwULSpaceData& rData,
+    static void SetPageULSpaceItems(SwFrameFormat &rFormat, wwULSpaceData& rData,
         const wwSection &rSection);
 
-    static void SetPage(SwPageDesc &rPageDesc, SwFrmFmt &rFmt,
+    static void SetPage(SwPageDesc &rPageDesc, SwFrameFormat &rFormat,
         const wwSection &rSection, bool bIgnoreCols);
 
     static void SetNumberingType(const wwSection &rNewSection, SwPageDesc &rPageDesc);
@@ -870,8 +870,8 @@ private:
     void SetUseOn(wwSection &rSection);
     void SetHdFt(wwSection &rSection, int nSect, const wwSection *pPrevious);
 
-    SwSectionFmt *InsertSection(SwPaM& rMyPaM, wwSection &rSection);
-    static bool SetCols(SwFrmFmt &rFmt, const wwSection &rSection,
+    SwSectionFormat *InsertSection(SwPaM& rMyPaM, wwSection &rSection);
+    static bool SetCols(SwFrameFormat &rFormat, const wwSection &rSection,
         sal_uInt32 nNetWidth);
     bool SectionIsProtected(const wwSection &rSection) const;
     void SetLeftRight(wwSection &rSection);
@@ -881,7 +881,7 @@ private:
      nodeindex of where we want the page break to (normally the segments start
      position
     */
-    SwFmtPageDesc SetSwFmtPageDesc(mySegIter &rIter, mySegIter &rStart,
+    SwFormatPageDesc SetSwFormatPageDesc(mySegIter &rIter, mySegIter &rStart,
         bool bIgnoreCols);
 
     wwSectionManager(const wwSectionManager&) SAL_DELETED_FUNCTION;
@@ -895,7 +895,7 @@ public:
     void PrependedInlineNode(const SwPosition &rPos, const SwNode &rNode);
     sal_uInt16 CurrentSectionColCount() const;
     bool WillHavePageDescHere(const SwNodeIndex& rIdx) const;
-    void CreateSep(const long nTxtPos, bool bMustHaveBreak);
+    void CreateSep(const long nTextPos, bool bMustHaveBreak);
     void InsertSegments();
     void JoinNode(const SwPosition &rPos, const SwNode &rNode);
     sal_uInt32 GetPageLeft() const;
@@ -915,21 +915,21 @@ public:
 //addressed by property entries in a SwFltControlStack which have not yet been
 //committed to the document.
 
-//Safest thing is to not delete SwTxtNodes from a document during import, and
+//Safest thing is to not delete SwTextNodes from a document during import, and
 //remove these extraneous paragraphs at the end after all SwFltControlStack are
 //destroyed.
 class wwExtraneousParas : private ::boost::noncopyable
 {
 private:
     /*
-    A vector of SwTxtNodes to erase from a document after import is complete
+    A vector of SwTextNodes to erase from a document after import is complete
     */
-    std::vector<SwTxtNode*> m_aTxtNodes;
+    std::vector<SwTextNode*> m_aTextNodes;
     SwDoc& m_rDoc;
 public:
     wwExtraneousParas(SwDoc &rDoc) : m_rDoc(rDoc) {}
     ~wwExtraneousParas() { delete_all_from_doc(); }
-    void push_back(SwTxtNode *pTxtNode) { m_aTxtNodes.push_back(pTxtNode); }
+    void push_back(SwTextNode *pTextNode) { m_aTextNodes.push_back(pTextNode); }
     void delete_all_from_doc();
 };
 
@@ -940,7 +940,7 @@ private:
     sal_Int32 mnImportedGraphicsCount;
     bool mbIsDisabled;
 public:
-    void SetUniqueGraphName(SwFrmFmt *pFrmFmt, const OUString &rFixedPart);
+    void SetUniqueGraphName(SwFrameFormat *pFrameFormat, const OUString &rFixedPart);
     wwFrameNamer(bool bIsDisabled, const OUString &rSeed)
         : msSeed(rSeed), mnImportedGraphicsCount(0), mbIsDisabled(bIsDisabled)
     {
@@ -962,7 +962,7 @@ public:
         { }
 };
 
-class FtnDescriptor
+class FootnoteDescriptor
 {
 public:
     ManTypes meType;
@@ -1143,7 +1143,7 @@ private:
     /*
     A stack of open footnotes. Should only be one in it at any time.
     */
-    std::deque<FtnDescriptor> m_aFtnStack;
+    std::deque<FootnoteDescriptor> m_aFootnoteStack;
 
     /*
     A queue of the ms sections in the document
@@ -1192,8 +1192,8 @@ private:
 
     SwMSConvertControls *m_pFormImpl; // Control-Implementierung
 
-    SwFlyFrmFmt* m_pFlyFmtOfJustInsertedGraphic;
-    SwFrmFmt* m_pFmtOfJustInsertedApo;
+    SwFlyFrameFormat* m_pFlyFormatOfJustInsertedGraphic;
+    SwFrameFormat* m_pFormatOfJustInsertedApo;
     SwPaM* m_pPreviousNumPaM;
     const SwNumRule* m_pPrevNumRule;
 
@@ -1204,7 +1204,7 @@ private:
     Keep track of generated Ruby character formats we can minimize the
     number of character formats created
     */
-    std::vector<const SwCharFmt*> m_aRubyCharFmts;
+    std::vector<const SwCharFormat*> m_aRubyCharFormats;
 
     WW8PostProcessAttrsInfo * m_pPostProcessAttrsInfo;
 
@@ -1216,17 +1216,17 @@ private:
     WW8PLCFMan* m_pPlcxMan;
     std::map<short, OUString> m_aLinkStringMap;
 
-    std::set<const SwNode*> m_aTxtNodesHavingFirstLineOfstSet; // #i103711#
-    std::set<const SwNode*> m_aTxtNodesHavingLeftIndentSet; // #i105414#
+    std::set<const SwNode*> m_aTextNodesHavingFirstLineOfstSet; // #i103711#
+    std::set<const SwNode*> m_aTextNodesHavingLeftIndentSet; // #i105414#
 
     WW8RStyle* m_pStyles;     // Pointer auf die Style-Einleseklasse
-    SwFmt* m_pAktColl;        // gerade zu erzeugende Collection
+    SwFormat* m_pAktColl;        // gerade zu erzeugende Collection
                             // ( ist ausserhalb einer Style-Def immer 0 )
     SfxItemSet* m_pAktItemSet;// gerade einzulesende Zeichenattribute
                             // (ausserhalb des WW8ListManager Ctor's immer 0)
     std::vector<SwWW8StyInf> m_vColl;
-    const SwTxtFmtColl* m_pDfltTxtFmtColl;    // Default
-    SwFmt* m_pStandardFmtColl;// "Standard"
+    const SwTextFormatColl* m_pDfltTextFormatColl;    // Default
+    SwFormat* m_pStandardFormatColl;// "Standard"
 
     WW8PLCF_HdFt* m_pHdFt;        // Pointer auf Header / Footer - Scannerklasse
 
@@ -1247,7 +1247,7 @@ private:
     EditEngine* m_pDrawEditEngine;
     wwZOrderer *m_pWWZOrder;
 
-    SwFieldType* m_pNumFldType;   // fuer Nummernkreis
+    SwFieldType* m_pNumFieldType;   // fuer Nummernkreis
 
     SwMSDffManager* m_pMSDffManager;
 
@@ -1280,10 +1280,10 @@ private:
     rtl_TextEncoding m_eHardCharSet;    // Hard rtl_TextEncoding-Attribute
     sal_uInt16 m_nProgress;           // %-Angabe fuer Progressbar
     sal_uInt16 m_nAktColl;            // gemaess WW-Zaehlung
-    sal_uInt16 m_nFldNum;             // laufende Nummer dafuer
+    sal_uInt16 m_nFieldNum;             // laufende Nummer dafuer
     sal_uInt16 m_nLFOPosition;
 
-    short m_nCharFmt;             // gemaess WW-Zaehlung, <0 fuer keine
+    short m_nCharFormat;             // gemaess WW-Zaehlung, <0 fuer keine
 
     short m_nDrawXOfs, m_nDrawYOfs;
     short m_nDrawXOfs2, m_nDrawYOfs2;
@@ -1302,7 +1302,7 @@ private:
 
     bool m_bNewDoc;          // Neues Dokument ?
     bool m_bSkipImages;      // skip images for text extraction/indexing
-    bool m_bReadNoTbl;        // Keine Tabellen
+    bool m_bReadNoTable;        // Keine Tabellen
     bool m_bPgSecBreak;       // Page- oder Sectionbreak ist noch einzufuegen
     bool m_bSpec;             // Special-Char im Text folgt
     bool m_bObj;              // Obj im Text
@@ -1317,8 +1317,8 @@ private:
     bool m_bAnl;              // Nummerierung in Bearbeitung
                                 // Anl heisst Autonumber level
 
-    bool m_bHdFtFtnEdn;       // Spezialtext: Kopf- Fuss- usw.
-    bool m_bFtnEdn;           // Fussnote oder Endnote
+    bool m_bHdFtFootnoteEdn;       // Spezialtext: Kopf- Fuss- usw.
+    bool m_bFootnoteEdn;           // Fussnote oder Endnote
     bool m_bIsHeader;         // Text aus Header wird gelesen ( Zeilenhoehe )
     bool m_bIsFooter;         // Text aus Footer wird gelesen ( Zeilenhoehe )
 
@@ -1380,13 +1380,13 @@ private:
 
     bool StyleExists(unsigned int nColl) const { return (nColl < m_vColl.size()); }
     SwWW8StyInf *GetStyle(sal_uInt16 nColl) const;
-    void AppendTxtNode(SwPosition& rPos);
+    void AppendTextNode(SwPosition& rPos);
 
     void Read_HdFt(int nSect, const SwPageDesc *pPrev,
         const wwSection &rSection);
-    void Read_HdFtText(long nStartCp, long nLen, SwFrmFmt* pHdFtFmt);
+    void Read_HdFtText(long nStartCp, long nLen, SwFrameFormat* pHdFtFormat);
     void Read_HdFtTextAsHackedFrame(long nStart, long nLen,
-        SwFrmFmt &rHdFtFmt, sal_uInt16 nPageWidth);
+        SwFrameFormat &rHdFtFormat, sal_uInt16 nPageWidth);
 
     bool isValid_HdFt_CP(WW8_CP nHeaderCP) const;
 
@@ -1416,22 +1416,22 @@ private:
     static bool LangUsesHindiNumbers(sal_uInt16 nLang);
     static sal_Unicode TranslateToHindiNumbers(sal_Unicode);
 
-    void SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection);
+    void SetDocumentGrid(SwFrameFormat &rFormat, const wwSection &rSection);
 
     void ProcessAktCollChange(WW8PLCFManResult& rRes, bool* pStartAttr,
         bool bCallProcessSpecial);
-    long ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine);
-    void ReadAttrs(WW8_CP& rNext, WW8_CP& rTxtPos, bool& rbStartLine);
+    long ReadTextAttr(WW8_CP& rTextPos, bool& rbStartLine);
+    void ReadAttrs(WW8_CP& rNext, WW8_CP& rTextPos, bool& rbStartLine);
     void CloseAttrEnds();
     bool ReadText(long nStartCp, long nTextLen, ManTypes nType);
 
-    void ReadRevMarkAuthorStrTabl( SvStream& rStrm, sal_Int32 nTblPos,
-        sal_Int32 nTblSiz, SwDoc& rDoc );
+    void ReadRevMarkAuthorStrTabl( SvStream& rStrm, sal_Int32 nTablePos,
+        sal_Int32 nTableSiz, SwDoc& rDoc );
 
-    void Read_HdFtFtnText( const SwNodeIndex* pSttIdx, long nStartCp,
+    void Read_HdFtFootnoteText( const SwNodeIndex* pSttIdx, long nStartCp,
                            long nLen, ManTypes nType );
 
-    void ImportTox( int nFldId, const OUString& aStr );
+    void ImportTox( int nFieldId, const OUString& aStr );
 
     void EndSprm( sal_uInt16 nId );
     // #i103711#
@@ -1446,7 +1446,7 @@ private:
     void ResetCharSetVars();
     void ResetCJKCharSetVars();
 
-    const SfxPoolItem* GetFmtAttr( sal_uInt16 nWhich );
+    const SfxPoolItem* GetFormatAttr( sal_uInt16 nWhich );
     bool JoinNode(SwPaM &rPam, bool bStealAttr = false);
 
     static bool IsBorder(const WW8_BRCVer9* pbrc, bool bChkBtwn = false);
@@ -1468,7 +1468,7 @@ private:
     //returns true is a shadow was set
     static bool SetFlyBordersShadow(SfxItemSet& rFlySet, const WW8_BRCVer9 *pbrc,
         short *SizeArray=0);
-    static void SetPageBorder(SwFrmFmt &rFmt, const wwSection &rSection);
+    static void SetPageBorder(SwFrameFormat &rFormat, const wwSection &rSection);
 
     static sal_Int32 MatchSdrBoxIntoFlyBoxItem( const Color& rLineColor,
         MSO_LineStyle eLineStyle, MSO_LineDashing eDashing, MSO_SPT eShapeType, sal_Int32 &rLineWidth,
@@ -1479,10 +1479,10 @@ private:
         SvxLRSpaceItem &rLR);
     static void AdjustULWrapForWordMargins(const SvxMSDffImportRec &rRecord,
         SvxULSpaceItem &rUL);
-    static void MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord, SwFrmFmt* pFlyFmt);
+    static void MapWrapIntoFlyFormat(SvxMSDffImportRec* pRecord, SwFrameFormat* pFlyFormat);
 
     void SetAttributesAtGrfNode(SvxMSDffImportRec const* pRecord,
-            SwFrmFmt *pFlyFmt, WW8_FSPA *pF);
+            SwFrameFormat *pFlyFormat, WW8_FSPA *pF);
 
     bool IsDropCap();
     bool IsListOrDropcap() { return (!m_pAktItemSet  || m_bDropCap); };
@@ -1495,7 +1495,7 @@ private:
     bool TestSameApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos);
     ApoTestResults TestApo(int nCellLevel, bool bTableRowEnd,
         const WW8_TablePos *pTabPos);
-    static void StripNegativeAfterIndent(SwFrmFmt *pFlyFmt);
+    static void StripNegativeAfterIndent(SwFrameFormat *pFlyFormat);
 
     void EndSpecial();
     bool ProcessSpecial(bool &rbReSync, WW8_CP nStartCp);
@@ -1507,24 +1507,24 @@ private:
     static void ReplaceObj(const SdrObject &rReplaceTextObj,
         SdrObject &rSubObj);
 
-    SwFlyFrmFmt* MakeGrafNotInCntnt(const WW8PicDesc& rPD,
+    SwFlyFrameFormat* MakeGrafNotInContent(const WW8PicDesc& rPD,
         const Graphic* pGraph, const OUString& rFileName,
         const SfxItemSet& rGrfSet);
 
-    SwFrmFmt* MakeGrafInCntnt(const WW8_PIC& rPic, const WW8PicDesc& rPD,
+    SwFrameFormat* MakeGrafInContent(const WW8_PIC& rPic, const WW8PicDesc& rPD,
         const Graphic* pGraph, const OUString& rFileName,
         const SfxItemSet& rGrfSet);
 
-    SwFrmFmt *AddAutoAnchor(SwFrmFmt *pFmt);
-    SwFrmFmt* ImportGraf1(WW8_PIC& rPic, SvStream* pSt, sal_uLong nFilePos);
-    SwFrmFmt* ImportGraf(SdrTextObj* pTextObj = 0, SwFrmFmt* pFlyFmt = 0);
+    SwFrameFormat *AddAutoAnchor(SwFrameFormat *pFormat);
+    SwFrameFormat* ImportGraf1(WW8_PIC& rPic, SvStream* pSt, sal_uLong nFilePos);
+    SwFrameFormat* ImportGraf(SdrTextObj* pTextObj = 0, SwFrameFormat* pFlyFormat = 0);
 
     SdrObject* ImportOleBase( Graphic& rGraph, const Graphic* pGrf=0,
         const SfxItemSet* pFlySet=0, const Rectangle& aVisArea = Rectangle() );
 
-    SwFrmFmt* ImportOle( const Graphic* = 0, const SfxItemSet* pFlySet = 0,
+    SwFrameFormat* ImportOle( const Graphic* = 0, const SfxItemSet* pFlySet = 0,
         const SfxItemSet* pGrfSet = 0, const Rectangle& aVisArea = Rectangle() );
-    SwFlyFrmFmt* InsertOle(SdrOle2Obj &rObject, const SfxItemSet &rFlySet,
+    SwFlyFrameFormat* InsertOle(SdrOle2Obj &rObject, const SfxItemSet &rFlySet,
         const SfxItemSet &rGrfSet);
 
     bool ImportFormulaControl(WW8FormulaControl &rBox,WW8_CP nStart,
@@ -1559,7 +1559,7 @@ private:
 // verwaltet werden: rglst, hpllfo und hsttbListNames
 // die Strukturen hierfuer sind: LSTF, LVLF, LFO LFOLVL
 
-    void SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV const &rAV, const sal_uInt8* pTxt,
+    void SetAnlvStrings(SwNumFormat &rNum, WW8_ANLV const &rAV, const sal_uInt8* pText,
         bool bOutline);
     void SetAnld(SwNumRule* pNumR, WW8_ANLD const * pAD, sal_uInt8 nSwLevel, bool bOutLine);
     void SetNumOlst( SwNumRule* pNumR, WW8_OLST* pO, sal_uInt8 nSwLevel );
@@ -1587,8 +1587,8 @@ private:
         sal_uInt16 nSequence);
     bool GetRangeAsDrawingString(OUString& rString, long StartCp, long nEndCp, ManTypes eType);
     OutlinerParaObject* ImportAsOutliner(OUString &rString, WW8_CP nStartCp, WW8_CP nEndCp, ManTypes eType);
-    SwFrmFmt* InsertTxbxText(SdrTextObj* pTextObj, Size* pObjSiz,
-        sal_uInt16 nTxBxS, sal_uInt16 nSequence, long nPosCp, SwFrmFmt* pFlyFmt,
+    SwFrameFormat* InsertTxbxText(SdrTextObj* pTextObj, Size* pObjSiz,
+        sal_uInt16 nTxBxS, sal_uInt16 nSequence, long nPosCp, SwFrameFormat* pFlyFormat,
         bool bMakeSdrGrafObj, bool& rbEraseTextObj,
         bool* pbTestTxbxContainsText = 0, long* pnStartCp = 0,
         long* pnEndCp = 0, bool* pbContainsGraphics = 0,
@@ -1596,25 +1596,25 @@ private:
     bool TxbxChainContainsRealText( sal_uInt16 nTxBxS,
                                     long&  rStartCp,
                                     long&  rEndCp );
-    SdrObject *ReadTxtBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
+    SdrObject *ReadTextBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
     SdrObject *ReadCaptionBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
     SdrObject *ReadGroup(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
     SdrObject *ReadGrafPrimitive(short& rLeft, SfxAllItemSet &rSet);
     void ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp );
-    SdrObject* CreateContactObject(SwFrmFmt* pFlyFmt);
+    SdrObject* CreateContactObject(SwFrameFormat* pFlyFormat);
     RndStdIds ProcessEscherAlign(SvxMSDffImportRec* pRecord, WW8_FSPA *pFSPA,
         SfxItemSet &rFlySet, bool bOrgObjectWasReplace);
     bool MiserableRTLGraphicsHack(SwTwips &rLeft, SwTwips nWidth,
         sal_Int16 eHoriOri, sal_Int16 eHoriRel);
-    SwFrmFmt* Read_GrafLayer( long nGrafAnchorCp );
-    SwFlyFrmFmt* ImportReplaceableDrawables( SdrObject* &rpObject,
+    SwFrameFormat* Read_GrafLayer( long nGrafAnchorCp );
+    SwFlyFrameFormat* ImportReplaceableDrawables( SdrObject* &rpObject,
         SdrObject* &rpOurNewObject, SvxMSDffImportRec* pRecord, WW8_FSPA *pF,
         SfxItemSet &rFlySet );
-    SwFlyFrmFmt *ConvertDrawTextToFly( SdrObject* &rpObject,
+    SwFlyFrameFormat *ConvertDrawTextToFly( SdrObject* &rpObject,
         SdrObject* &rpOurNewObject, SvxMSDffImportRec* pRecord,
         RndStdIds eAnchor, WW8_FSPA *pF, SfxItemSet &rFlySet );
-    SwFrmFmt* MungeTextIntoDrawBox(SdrObject* pTrueObject,
-        SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrmFmt *pRetFrmFmt);
+    SwFrameFormat* MungeTextIntoDrawBox(SdrObject* pTrueObject,
+        SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrameFormat *pRetFrameFormat);
 
     void GrafikCtor();
     void GrafikDtor();
@@ -1632,13 +1632,13 @@ private:
 
 // Ver8-Listen
 
-    void RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO, sal_uInt8 nActLevel,
+    void RegisterNumFormatOnTextNode(sal_uInt16 nActLFO, sal_uInt8 nActLevel,
                                  const bool bSetAttr = true);
 
-    void RegisterNumFmtOnStyle(sal_uInt16 nStyle);
+    void RegisterNumFormatOnStyle(sal_uInt16 nStyle);
     void SetStylesList(sal_uInt16 nStyle, sal_uInt16 nActLFO,
         sal_uInt8 nActLevel);
-    void RegisterNumFmt(sal_uInt16 nActLFO, sal_uInt8 nActLevel);
+    void RegisterNumFormat(sal_uInt16 nActLFO, sal_uInt8 nActLevel);
 
 // spaeter zu ersetzen durch Aufruf in entsprechend erweiterten SvxMSDffManager
 
@@ -1666,8 +1666,8 @@ private:
     }
 
     void PopTableDesc();
-    void MoveInsideFly(const SwFrmFmt *pFlyFmt);
-    SwTwips MoveOutsideFly(SwFrmFmt *pFlyFmt, const SwPosition &rPos,
+    void MoveInsideFly(const SwFrameFormat *pFlyFormat);
+    SwTwips MoveOutsideFly(SwFrameFormat *pFlyFormat, const SwPosition &rPos,
         bool bTableJoin = true);
 
     void SetOutlineStyles();
@@ -1697,8 +1697,8 @@ public:     // eigentlich private, geht aber leider nur public
     //Clear the para end position recorded in reader intermittently for the least impact on loading performance
     void ClearParaEndPosition();
 
-    long Read_Ftn(WW8PLCFManResult* pRes);
-    sal_uInt16 End_Ftn();
+    long Read_Footnote(WW8PLCFManResult* pRes);
+    sal_uInt16 End_Footnote();
     long Read_Field(WW8PLCFManResult* pRes);
     sal_uInt16 End_Field();
     long Read_Book(WW8PLCFManResult*);
@@ -1715,10 +1715,10 @@ public:     // eigentlich private, geht aber leider nur public
     void Read_BoldBiDiUsw(sal_uInt16 nId, const sal_uInt8*, short nLen);
     void Read_SubSuper(         sal_uInt16, const sal_uInt8*, short nLen );
     bool ConvertSubToGraphicPlacement();
-    static SwFrmFmt *ContainsSingleInlineGraphic(const SwPaM &rRegion);
+    static SwFrameFormat *ContainsSingleInlineGraphic(const SwPaM &rRegion);
     void Read_SubSuperProp(     sal_uInt16, const sal_uInt8*, short nLen );
     void Read_Underline(        sal_uInt16, const sal_uInt8*, short nLen );
-    void Read_TxtColor(         sal_uInt16, const sal_uInt8*, short nLen );
+    void Read_TextColor(         sal_uInt16, const sal_uInt8*, short nLen );
     void openFont(sal_uInt16 nFCode, sal_uInt16 nId);
     void closeFont(sal_uInt16 nId);
     void Read_FontCode(         sal_uInt16, const sal_uInt8*, short nLen );
@@ -1731,7 +1731,7 @@ public:     // eigentlich private, geht aber leider nur public
     void Read_Emphasis(         sal_uInt16, const sal_uInt8* pData, short nLen );
     void Read_ScaleWidth(       sal_uInt16, const sal_uInt8* pData, short nLen );
     void Read_Relief(           sal_uInt16, const sal_uInt8* pData, short nLen);
-    void Read_TxtAnim(      sal_uInt16, const sal_uInt8* pData, short nLen);
+    void Read_TextAnim(      sal_uInt16, const sal_uInt8* pData, short nLen);
 
     void Read_NoLineNumb(       sal_uInt16 nId, const sal_uInt8* pData, short nLen );
 
@@ -1761,7 +1761,7 @@ public:     // eigentlich private, geht aber leider nur public
     void Read_CharBorder(sal_uInt16 nId, const sal_uInt8* pData, short nLen );
     void Read_Tab(              sal_uInt16 nId, const sal_uInt8* pData, short nLen );
     void Read_Symbol(sal_uInt16, const sal_uInt8* pData, short nLen);
-    void Read_FldVanish(        sal_uInt16 nId, const sal_uInt8* pData, short nLen );
+    void Read_FieldVanish(        sal_uInt16 nId, const sal_uInt8* pData, short nLen );
 
     // Revision Marks ( == Redlining )
 
@@ -1801,14 +1801,14 @@ public:     // eigentlich private, geht aber leider nur public
      *                  -1 to indicate the actual level is finished.
      */
     void Read_LFOPosition(      sal_uInt16 nId, const sal_uInt8* pData, short nLen);
-    bool SetTxtFmtCollAndListLevel(const SwPaM& rRg, SwWW8StyInf& rStyleInfo);
+    bool SetTextFormatCollAndListLevel(const SwPaM& rRg, SwWW8StyInf& rStyleInfo);
 
     void Read_StyleCode(sal_uInt16, const sal_uInt8* pData, short nLen);
     void Read_Majority(sal_uInt16, const sal_uInt8* , short );
     void Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pDATA, short nLen);
 
-    void Read_TxtForeColor(sal_uInt16, const sal_uInt8* pData, short nLen);
-    void Read_TxtBackColor(sal_uInt16, const sal_uInt8* pData, short nLen);
+    void Read_TextForeColor(sal_uInt16, const sal_uInt8* pData, short nLen);
+    void Read_TextBackColor(sal_uInt16, const sal_uInt8* pData, short nLen);
     void Read_ParaBackColor(sal_uInt16, const sal_uInt8* pData, short nLen);
     void Read_ParaBiDi(sal_uInt16, const sal_uInt8* pData, short nLen);
     static sal_uInt32 ExtractColour(const sal_uInt8* &rpData, bool bVer67);
@@ -1827,7 +1827,7 @@ public:     // eigentlich private, geht aber leider nur public
     eF_ResT Read_F_TemplName( WW8FieldDesc*, OUString& );
     short GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat, sal_uInt16 &rLang,
         int nWhichDefault, bool bHijri = false);
-    bool ForceFieldLanguage(SwField &rFld, sal_uInt16 nLang);
+    bool ForceFieldLanguage(SwField &rField, sal_uInt16 nLang);
     eF_ResT Read_F_DateTime( WW8FieldDesc*, OUString& rStr );
     eF_ResT Read_F_FileName( WW8FieldDesc*, OUString& rStr);
     eF_ResT Read_F_Anz( WW8FieldDesc* pF, OUString& );
@@ -1875,7 +1875,7 @@ public:     // eigentlich private, geht aber leider nur public
     void SetNAktColl( sal_uInt16 nColl ) { m_nAktColl = nColl;    }
     void SetAktItemSet( SfxItemSet* pItemSet ) { m_pAktItemSet = pItemSet; }
     sal_uInt16 StyleUsingLFO( sal_uInt16 nLFOIndex ) const ;
-    const SwFmt* GetStyleWithOrgWWName( OUString& rName ) const ;
+    const SwFormat* GetStyleWithOrgWWName( OUString& rName ) const ;
 
     static bool GetPictGrafFromStream(Graphic& rGraphic, SvStream& rSrc);
     static void PicRead( SvStream *pDataStream, WW8_PIC *pPic, bool bVer67);
@@ -1900,15 +1900,15 @@ public:     // eigentlich private, geht aber leider nur public
 };
 
 bool CanUseRemoteLink(const OUString &rGrfName);
-void UseListIndent(SwWW8StyInf &rStyle, const SwNumFmt &rFmt);
-void SetStyleIndent(SwWW8StyInf &rStyleInfo, const SwNumFmt &rFmt);
+void UseListIndent(SwWW8StyInf &rStyle, const SwNumFormat &rFormat);
+void SetStyleIndent(SwWW8StyInf &rStyleInfo, const SwNumFormat &rFormat);
 // #i103711#
 // #i105414#
 void SyncIndentWithList( SvxLRSpaceItem &rLR,
-                         const SwNumFmt &rFmt,
+                         const SwNumFormat &rFormat,
                          const bool bFirstLineOfStSet,
                          const bool bLeftIndentSet );
-long GetListFirstLineIndent(const SwNumFmt &rFmt);
+long GetListFirstLineIndent(const SwNumFormat &rFormat);
 OUString BookmarkToWriter(const OUString &rBookmark);
 bool RTLGraphicsHack(SwTwips &rLeft, SwTwips nWidth,
     sal_Int16 eHoriOri, sal_Int16 eHoriRel, SwTwips nPageLeft,
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index b70c7896ed02..8929c44432b0 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -116,7 +116,7 @@ class WW8TabDesc: private boost::noncopyable
 
     SwPosition* pTmpPos;
 
-    SwTableNode* pTblNd;            // table node
+    SwTableNode* pTableNd;            // table node
     const SwTableLines* pTabLines;  // row array of node
     SwTableLine* pTabLine;          // current row
     SwTableBoxes* pTabBoxes;        // boxes array in current row
@@ -137,7 +137,7 @@ class WW8TabDesc: private boost::noncopyable
     short nOrgDxaLeft;
 
     bool bOk;
-    bool bClaimLineFmt;
+    bool bClaimLineFormat;
     sal_Int16 eOri;
     bool bIsBiDi;
                                 // 2. common admin info
@@ -172,7 +172,7 @@ class WW8TabDesc: private boost::noncopyable
 public:
     const SwTable* pTable;          // table
     SwPosition* pParentPos;
-    SwFlyFrmFmt* pFlyFmt;
+    SwFlyFrameFormat* pFlyFormat;
     SfxItemSet aItemSet;
     bool IsValidCell(short nCol) const;
     bool InFirstParaInCell() const;
@@ -181,7 +181,7 @@ public:
     bool Ok() const { return bOk; }
     void CreateSwTable(SvxULSpaceItem* pULSpaceItem = 0);
     void UseSwTable();
-    void SetSizePosition(SwFrmFmt* pFrmFmt);
+    void SetSizePosition(SwFrameFormat* pFrameFormat);
     void TableCellEnd();
     void MoveOutsideTable();
     void ParkPaM();
@@ -267,7 +267,7 @@ sal_uInt32 wwSectionManager::GetWWPageTopMargin() const
     return !maSegments.empty() ? maSegments.back().maSep.dyaTop : 0;
 }
 
-sal_uInt16 SwWW8ImplReader::End_Ftn()
+sal_uInt16 SwWW8ImplReader::End_Footnote()
 {
     /*
     Ignoring Footnote outside of the normal Text. People will put footnotes
@@ -279,30 +279,30 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
         return 0;
     }
 
-    OSL_ENSURE(!m_aFtnStack.empty(), "footnote end without start");
-    if (m_aFtnStack.empty())
+    OSL_ENSURE(!m_aFootnoteStack.empty(), "footnote end without start");
+    if (m_aFootnoteStack.empty())
         return 0;
 
     bool bFtEdOk = false;
-    const FtnDescriptor &rDesc = m_aFtnStack.back();
+    const FootnoteDescriptor &rDesc = m_aFootnoteStack.back();
 
     //Get the footnote character and remove it from the txtnode. We'll
     //replace it with the footnote
-    SwTxtNode* pTxt = m_pPaM->GetNode().GetTxtNode();
+    SwTextNode* pText = m_pPaM->GetNode().GetTextNode();
     sal_Int32 nPos = m_pPaM->GetPoint()->nContent.GetIndex();
 
     OUString sChar;
-    SwTxtAttr* pFN = 0;
+    SwTextAttr* pFN = 0;
     //There should have been a footnote char, we will replace this.
-    if (pTxt && nPos)
+    if (pText && nPos)
     {
-        sChar += OUString(pTxt->GetTxt()[--nPos]);
+        sChar += OUString(pText->GetText()[--nPos]);
         m_pPaM->SetMark();
         --m_pPaM->GetMark()->nContent;
         m_rDoc.getIDocumentContentOperations().DeleteRange( *m_pPaM );
         m_pPaM->DeleteMark();
-        SwFmtFtn aFtn(rDesc.meType == MAN_EDN);
-        pFN = pTxt->InsertItem(aFtn, nPos, nPos);
+        SwFormatFootnote aFootnote(rDesc.meType == MAN_EDN);
+        pFN = pText->InsertItem(aFootnote, nPos, nPos);
     }
     OSL_ENSURE(pFN, "Probleme beim Anlegen des Fussnoten-Textes");
     if (pFN)
@@ -313,18 +313,18 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
         m_pPlcxMan->SaveAllPLCFx( aSave );
         WW8PLCFMan* pOldPlcxMan = m_pPlcxMan;
 
-        const SwNodeIndex* pSttIdx = static_cast<SwTxtFtn*>(pFN)->GetStartNode();
+        const SwNodeIndex* pSttIdx = static_cast<SwTextFootnote*>(pFN)->GetStartNode();
         OSL_ENSURE(pSttIdx, "Probleme beim Anlegen des Fussnoten-Textes");
 
-        static_cast<SwTxtFtn*>(pFN)->SetSeqNo( m_rDoc.GetFtnIdxs().size() );
+        static_cast<SwTextFootnote*>(pFN)->SetSeqNo( m_rDoc.GetFootnoteIdxs().size() );
 
-        bool bOld = m_bFtnEdn;
-        m_bFtnEdn = true;
+        bool bOld = m_bFootnoteEdn;
+        m_bFootnoteEdn = true;
 
         // read content of Ft-/End-Note
-        Read_HdFtFtnText( pSttIdx, rDesc.mnStartCp, rDesc.mnLen, rDesc.meType);
+        Read_HdFtFootnoteText( pSttIdx, rDesc.mnStartCp, rDesc.mnLen, rDesc.meType);
         bFtEdOk = true;
-        m_bFtnEdn = bOld;
+        m_bFootnoteEdn = bOld;
 
         OSL_ENSURE(sChar.getLength()==1 && ((rDesc.mbAutoNum == (sChar[0] == 2))),
          "footnote autonumbering must be 0x02, and everything else must not be");
@@ -332,7 +332,7 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
         // If no automatic numbering use the following char from the main text
         // as the footnote number
         if (!rDesc.mbAutoNum)
-            static_cast<SwTxtFtn*>(pFN)->SetNumber(0, sChar);
+            static_cast<SwTextFootnote*>(pFN)->SetNumber(0, sChar);
 
         /*
             Delete the footnote char from the footnote if its at the beginning
@@ -341,16 +341,16 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
         */
         SwNodeIndex& rNIdx = m_pPaM->GetPoint()->nNode;
         rNIdx = pSttIdx->GetIndex() + 1;
-        SwTxtNode* pTNd = rNIdx.GetNode().GetTxtNode();
-        if (pTNd && !pTNd->GetTxt().isEmpty() && !sChar.isEmpty())
+        SwTextNode* pTNd = rNIdx.GetNode().GetTextNode();
+        if (pTNd && !pTNd->GetText().isEmpty() && !sChar.isEmpty())
         {
-            const OUString &rTxt = pTNd->GetTxt();
-            if (rTxt[0] == sChar[0])
+            const OUString &rText = pTNd->GetText();
+            if (rText[0] == sChar[0])
             {
                 m_pPaM->GetPoint()->nContent.Assign( pTNd, 0 );
                 m_pPaM->SetMark();
                 // Strip out tabs we may have inserted on export #i24762#
-                if (rTxt.getLength() > 1 && rTxt[1] == 0x09)
+                if (rText.getLength() > 1 && rText[1] == 0x09)
                     ++m_pPaM->GetMark()->nContent;
                 ++m_pPaM->GetMark()->nContent;
                 m_pReffingStck->Delete(*m_pPaM);
@@ -368,11 +368,11 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
     if (bFtEdOk)
         m_aSectionManager.SetCurrentSectionHasFootnote();
 
-    m_aFtnStack.pop_back();
+    m_aFootnoteStack.pop_back();
     return 0;
 }
 
-long SwWW8ImplReader::Read_Ftn(WW8PLCFManResult* pRes)
+long SwWW8ImplReader::Read_Footnote(WW8PLCFManResult* pRes)
 {
     /*
     Ignoring Footnote outside of the normal Text. People will put footnotes
@@ -384,7 +384,7 @@ long SwWW8ImplReader::Read_Ftn(WW8PLCFManResult* pRes)
         return 0;
     }
 
-    FtnDescriptor aDesc;
+    FootnoteDescriptor aDesc;
     aDesc.mbAutoNum = true;
     if (eEDN == pRes->nSprmId)
     {
@@ -395,14 +395,14 @@ long SwWW8ImplReader::Read_Ftn(WW8PLCFManResult* pRes)
     else
     {
         aDesc.meType = MAN_FTN;
-        if (m_pPlcxMan->GetFtn())
-            aDesc.mbAutoNum = 0 != *static_cast<short const *>(m_pPlcxMan->GetFtn()->GetData());
+        if (m_pPlcxMan->GetFootnote())
+            aDesc.mbAutoNum = 0 != *static_cast<short const *>(m_pPlcxMan->GetFootnote()->GetData());
     }
 
     aDesc.mnStartCp = pRes->nCp2OrIdx;
     aDesc.mnLen = pRes->nMemLen;
 
-    m_aFtnStack.push_back(aDesc);
+    m_aFootnoteStack.push_back(aDesc);
 
     return 0;
 }
@@ -556,7 +556,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
 
 // helper methods for outline, numbering and bullets
 
-static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLevel )
+static void SetBaseAnlv(SwNumFormat &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLevel )
 {
     static const SvxExtNumType eNumA[8] = { SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
         SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N, SVX_NUM_ARABIC,
@@ -623,8 +623,8 @@ static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLevel
     }
 }
 
-void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV const &rAV,
-    const sal_uInt8* pTxt, bool bOutline)
+void SwWW8ImplReader::SetAnlvStrings(SwNumFormat &rNum, WW8_ANLV const &rAV,
+    const sal_uInt8* pText, bool bOutline)
 {
     bool bInsert = false;                       // Default
     rtl_TextEncoding eCharSet = m_eStructCharSet;
@@ -632,16 +632,16 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV const &rAV,
     const WW8_FFN* pF = m_pFonts->GetFont(SVBT16ToShort(rAV.ftc)); // FontInfo
     bool bListSymbol = pF && ( pF->chs == 2 );      // Symbol/WingDings/...
 
-    OUString sTxt;
+    OUString sText;
     if (m_bVer67)
     {
-        sTxt = OUString(reinterpret_cast<char const *>(pTxt), rAV.cbTextBefore + rAV.cbTextAfter, eCharSet);
+        sText = OUString(reinterpret_cast<char const *>(pText), rAV.cbTextBefore + rAV.cbTextAfter, eCharSet);
     }
     else
     {
-        for(sal_Int32 i = 0; i < rAV.cbTextBefore + rAV.cbTextAfter; ++i, pTxt += 2)
+        for(sal_Int32 i = 0; i < rAV.cbTextBefore + rAV.cbTextAfter; ++i, pText += 2)
         {
-            sTxt += OUString(SVBT16ToShort(*reinterpret_cast<SVBT16 const *>(pTxt)));
+            sText += OUString(SVBT16ToShort(*reinterpret_cast<SVBT16 const *>(pText)));
         }
     }
 
@@ -660,7 +660,7 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV const &rAV,
                 OUStringBuffer aBuf;
                 comphelper::string::padToLength(aBuf, rAV.cbTextBefore
                     + rAV.cbTextAfter, cBulletChar);
-                sTxt = aBuf.makeStringAndClear();
+                sText = aBuf.makeStringAndClear();
             }
         }
     }
@@ -687,7 +687,7 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV const &rAV,
 
                 // take only the very first character
                 if (rAV.cbTextBefore || rAV.cbTextAfter)
-                    rNum.SetBulletChar( sTxt[ 0 ] );
+                    rNum.SetBulletChar( sText[ 0 ] );
                 else
                     rNum.SetBulletChar( 0x2190 );
             }
@@ -697,13 +697,13 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV const &rAV,
     {
         if (rAV.cbTextBefore)
         {
-            OUString sP( sTxt.copy( 0, rAV.cbTextBefore ) );
+            OUString sP( sText.copy( 0, rAV.cbTextBefore ) );
             rNum.SetPrefix( sP );
         }
         if( rAV.cbTextAfter )
         {
             OUString sP( rNum.GetSuffix() );
-            sP += sTxt.copy( rAV.cbTextBefore, rAV.cbTextAfter);
+            sP += sText.copy( rAV.cbTextBefore, rAV.cbTextAfter);
             rNum.SetSuffix( sP );
         }
 // The characters before and after multipe digits do not apply because
@@ -718,7 +718,7 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV const &rAV,
 void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD const * pAD, sal_uInt8 nSwLevel,
     bool bOutLine)
 {
-    SwNumFmt aNF;
+    SwNumFormat aNF;
     if (pAD)
     {                                                       // there is a Anld-Sprm
         m_bAktAND_fNumberAcross = 0 != pAD->fNumberAcross;
@@ -745,7 +745,7 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
     // #i86652#
     sal_uInt16 nRul = m_rDoc.MakeNumRule( aName, 0, false,
                                     SvxNumberFormat::LABEL_ALIGNMENT );
-    m_pStyles->pStyRule = m_rDoc.GetNumRuleTbl()[nRul];
+    m_pStyles->pStyRule = m_rDoc.GetNumRuleTable()[nRul];
     // Auto == false-> Nummerierungsvorlage
     m_pStyles->pStyRule->SetAutoRule(false);
 
@@ -763,7 +763,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short
     // StyleDef ?
     if( m_pAktColl )
     {
-        // only for SwTxtFmtColl, not CharFmt
+        // only for SwTextFormatColl, not CharFormat
         // WW: 0 = no Numbering
         SwWW8StyInf * pColl = GetStyle(m_nAktColl);
         if (pColl != NULL && pColl->bColl && *pData)
@@ -774,7 +774,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short
             {
                 m_nSwNumLevel = *pData - 1;
                 if (!m_bNoAttrImport)
-                    static_cast<SwTxtFmtColl*>(m_pAktColl)->AssignToListLevelOfOutlineStyle( m_nSwNumLevel );
+                    static_cast<SwTextFormatColl*>(m_pAktColl)->AssignToListLevelOfOutlineStyle( m_nSwNumLevel );
                     // For WW-NoNumbering also NO_NUMBERING could be used.
                     // ( For normal numberierung NO_NUM has to be used:
                     //   NO_NUM : pauses numbering,
@@ -801,7 +801,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
 {
     SwWW8StyInf * pStyInf = GetStyle(m_nAktColl);
     if( !m_pAktColl || nLen <= 0                       // only for Styledef
-        || (pStyInf && !pStyInf->bColl)              // ignore  CharFmt ->
+        || (pStyInf && !pStyInf->bColl)              // ignore  CharFormat ->
         || ( m_nIniFlags & WW8FL_NO_OUTLINE ) )
     {
         m_nSwNumLevel = 0xff;
@@ -812,7 +812,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
         && m_nSwNumLevel <= 9 ){          // No Bullets or Numbering
 
         // If NumRuleItems were set, either directly or through inheritance, disable them now
-        m_pAktColl->SetFmtAttr( SwNumRuleItem() );
+        m_pAktColl->SetFormatAttr( SwNumRuleItem() );
 
         const OUString aName("Outline");
         SwNumRule aNR( m_rDoc.GetUniqueNumRuleName( &aName ),
@@ -827,7 +827,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
     }else if( m_pStyles->nWwNumLevel == 10 || m_pStyles->nWwNumLevel == 11 ){
         SwNumRule* pNR = GetStyRule();
         SetAnld(pNR, reinterpret_cast<WW8_ANLD const *>(pData), 0, false);
-        m_pAktColl->SetFmtAttr( SwNumRuleItem( pNR->GetName() ) );
+        m_pAktColl->SetFormatAttr( SwNumRuleItem( pNR->GetName() ) );
 
         pStyInf = GetStyle(m_nAktColl);
         if (pStyInf != NULL)
@@ -837,24 +837,24 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
 
 // Numbering / Bullets
 
-// SetNumOlst() carries the Numrules for this cell to SwNumFmt.
+// SetNumOlst() carries the Numrules for this cell to SwNumFormat.
 // For this the info is fetched from OLST and not from ANLD ( see later )
 // ( only for outline inside text; Bullets / numbering use ANLDs )
 void SwWW8ImplReader::SetNumOlst(SwNumRule* pNumR, WW8_OLST* pO, sal_uInt8 nSwLevel)
 {
-    SwNumFmt aNF;
+    SwNumFormat aNF;
     WW8_ANLV &rAV = pO->rganlv[nSwLevel];
     SetBaseAnlv(aNF, rAV, nSwLevel);
                                             // ... and then the Strings
-    int nTxtOfs = 0;
+    int nTextOfs = 0;
     sal_uInt8 i;
     WW8_ANLV* pAV1;                 // search String-Positions
     for (i = 0, pAV1 = pO->rganlv; i < nSwLevel; ++i, ++pAV1)
-        nTxtOfs += pAV1->cbTextBefore + pAV1->cbTextAfter;
+        nTextOfs += pAV1->cbTextBefore + pAV1->cbTextAfter;
 
     if (!m_bVer67)
-        nTxtOfs *= 2;
-    SetAnlvStrings(aNF, rAV, pO->rgch + nTxtOfs, true); // and apply
+        nTextOfs *= 2;
+    SetAnlvStrings(aNF, rAV, pO->rgch + nTextOfs, true); // and apply
     pNumR->Set(nSwLevel, aNF);
 }
 
@@ -941,7 +941,7 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
     SwWW8StyInf * pStyInf = GetStyle(m_nAktColl);
     if (sNumRule.isEmpty() && pStyInf != NULL &&  pStyInf->bHasStyNumRule)
     {
-        sNumRule = pStyInf->pFmt->GetNumRule().GetValue();
+        sNumRule = pStyInf->pFormat->GetNumRule().GetValue();
         pNumRule = m_rDoc.FindNumRulePtr(sNumRule);
         if (!pNumRule)
             sNumRule.clear();
@@ -952,7 +952,7 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
         if (!pNumRule)
         {
             // #i86652#
-            pNumRule = m_rDoc.GetNumRuleTbl()[
+            pNumRule = m_rDoc.GetNumRuleTable()[
                             m_rDoc.MakeNumRule( sNumRule, 0, false,
                                               SvxNumberFormat::LABEL_ALIGNMENT ) ];
         }
@@ -991,7 +991,7 @@ void SwWW8ImplReader::NextAnlLine(const sal_uInt8* pSprm13)
     if (*pSprm13 == 10 || *pSprm13 == 11)
     {
         m_nSwNumLevel = 0;
-        if (!pNumRule->GetNumFmt(m_nSwNumLevel))
+        if (!pNumRule->GetNumFormat(m_nSwNumLevel))
         {
             // not defined yet
             // sprmAnld o. 0
@@ -1003,14 +1003,14 @@ void SwWW8ImplReader::NextAnlLine(const sal_uInt8* pSprm13)
     {
         m_nSwNumLevel = *pSprm13 - 1;             // outline
         // undefined
-        if (!pNumRule->GetNumFmt(m_nSwNumLevel))
+        if (!pNumRule->GetNumFormat(m_nSwNumLevel))
         {
             if (m_pNumOlst)                       // there was a OLST
             {
                 //Assure upper levels are set, #i9556#
                 for (sal_uInt8 nI = 0; nI < m_nSwNumLevel; ++nI)
                 {
-                    if (!pNumRule->GetNumFmt(nI))
+                    if (!pNumRule->GetNumFormat(nI))
                         SetNumOlst(pNumRule, m_pNumOlst, nI);
                 }
 
@@ -1027,7 +1027,7 @@ void SwWW8ImplReader::NextAnlLine(const sal_uInt8* pSprm13)
     else
         m_nSwNumLevel = 0xff;                 // no number
 
-    SwTxtNode* pNd = m_pPaM->GetNode().GetTxtNode();
+    SwTextNode* pNd = m_pPaM->GetNode().GetTextNode();
     if (m_nSwNumLevel < MAXLEVEL)
         pNd->SetAttrListLevel( m_nSwNumLevel );
     else
@@ -1049,7 +1049,7 @@ void SwWW8ImplReader::StopAnlToRestart(sal_uInt8 nNewType, bool bGoBack)
     if (bGoBack)
     {
         SwPosition aTmpPos(*m_pPaM->GetPoint());
-        m_pPaM->Move(fnMoveBackward, fnGoCntnt);
+        m_pPaM->Move(fnMoveBackward, fnGoContent);
         m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_FLTR_NUMRULE);
         *m_pPaM->GetPoint() = aTmpPos;
     }
@@ -1706,7 +1706,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
     pFirstBand(0),
     pActBand(0),
     pTmpPos(0),
-    pTblNd(0),
+    pTableNd(0),
     pTabLines(0),
     pTabLine(0),
     pTabBoxes(0),
@@ -1722,7 +1722,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
     nPreferredWidth(0),
     nOrgDxaLeft(0),
     bOk(true),
-    bClaimLineFmt(false),
+    bClaimLineFormat(false),
     eOri(text::HoriOrientation::NONE),
     bIsBiDi(false),
     nAktRow(0),
@@ -1731,7 +1731,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
     nRowsToRepeat(0),
     pTable(0),
     pParentPos(0),
-    pFlyFmt(0),
+    pFlyFormat(0),
     aItemSet(pIo->m_rDoc.GetAttrPool(),RES_FRMATR_BEGIN,RES_FRMATR_END-1)
 {
     pIo->m_bAktAND_fNumberAcross = false;
@@ -1804,7 +1804,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
                         break;
                     case sprmTFCantSplit:
                         pNewBand->bCantSplit = *pParams;
-                        bClaimLineFmt = true;
+                        bClaimLineFormat = true;
                         break;
                     case sprmTTableBorders:
                         pTableBorders = pParams; // process at end
@@ -1832,7 +1832,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
                         break;
                     case sprmTDyaRowHeight:
                         pNewBand->nLineHeight = (sal_Int16)SVBT16ToShort( pParams );
-                        bClaimLineFmt = true;
+                        bClaimLineFormat = true;
                         break;
                     case sprmTDefTable:
                         pNewBand->ReadDef(bOldVer, pParams);
@@ -2282,20 +2282,20 @@ void WW8TabDesc::CalcDefaults()
     OSL_ENSURE( pActBand, "pActBand ist 0" );
 }
 
-void WW8TabDesc::SetSizePosition(SwFrmFmt* pFrmFmt)
+void WW8TabDesc::SetSizePosition(SwFrameFormat* pFrameFormat)
 {
-    SwFrmFmt* pApply = pFrmFmt;
+    SwFrameFormat* pApply = pFrameFormat;
     if (!pApply )
-        pApply = pTable->GetFrmFmt();
+        pApply = pTable->GetFrameFormat();
     OSL_ENSURE(pApply,"No frame");
-    pApply->SetFmtAttr(aItemSet);
-    if (pFrmFmt)
+    pApply->SetFormatAttr(aItemSet);
+    if (pFrameFormat)
     {
-        SwFmtFrmSize aSize = pFrmFmt->GetFrmSize();
+        SwFormatFrmSize aSize = pFrameFormat->GetFrmSize();
         aSize.SetHeightSizeType(ATT_MIN_SIZE);
         aSize.SetHeight(MINLAY);
-        pFrmFmt->SetFmtAttr(aSize);
-        pTable->GetFrmFmt()->SetFmtAttr(SwFmtHoriOrient(0,text::HoriOrientation::FULL));
+        pFrameFormat->SetFormatAttr(aSize);
+        pTable->GetFrameFormat()->SetFormatAttr(SwFormatHoriOrient(0,text::HoriOrientation::FULL));
     }
 }
 
@@ -2323,18 +2323,18 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
      Set fly anchor to its anchor pos, so that if a table starts immediately
      at this position a new node will be inserted before inserting the table.
     */
-    if (!bInsNode && pIo->m_pFmtOfJustInsertedApo)
+    if (!bInsNode && pIo->m_pFormatOfJustInsertedApo)
     {
         const SwPosition* pAPos =
-            pIo->m_pFmtOfJustInsertedApo->GetAnchor().GetCntntAnchor();
+            pIo->m_pFormatOfJustInsertedApo->GetAnchor().GetContentAnchor();
         if (pAPos && &pAPos->nNode.GetNode() == &pPoint->nNode.GetNode())
         {
             bInsNode = true;
             bSetMinHeight = true;
 
-            SwFmtSurround aSur(pIo->m_pFmtOfJustInsertedApo->GetSurround());
+            SwFormatSurround aSur(pIo->m_pFormatOfJustInsertedApo->GetSurround());
             aSur.SetAnchorOnly(true);
-            pIo->m_pFmtOfJustInsertedApo->SetFmtAttr(aSur);
+            pIo->m_pFormatOfJustInsertedApo->SetFormatAttr(aSur);
         }
     }
 
@@ -2348,7 +2348,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
     }
 
     if (bInsNode)
-        pIo->AppendTxtNode(*pPoint);
+        pIo->AppendTextNode(*pPoint);
 
     pTmpPos = new SwPosition( *pIo->m_pPaM->GetPoint() );
 
@@ -2360,8 +2360,8 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
             SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 0 ),
             *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0, false, true );
 
-    OSL_ENSURE(pTable && pTable->GetFrmFmt(), "insert table failed");
-    if (!pTable || !pTable->GetFrmFmt())
+    OSL_ENSURE(pTable && pTable->GetFrameFormat(), "insert table failed");
+    if (!pTable || !pTable->GetFrameFormat())
         return;
 
     if (pULSpaceItem && pULSpaceItem->GetUpper() != 0)
@@ -2379,7 +2379,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
     // contains a Pagedesc. If so that Pagedesc would be moved to the
     // row after the table, whats wrong. So delete and
     // set later to the table format.
-    if (SwTxtNode *const pNd = pTmpPos->nNode.GetNode().GetTxtNode())
+    if (SwTextNode *const pNd = pTmpPos->nNode.GetNode().GetTextNode())
     {
         if (const SfxItemSet* pSet = pNd->GetpSwAttrSet())
         {
@@ -2387,7 +2387,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
             const SfxPoolItem* pItem;
             if (SfxItemState::SET == pSet->GetItemState(RES_BREAK, false, &pItem))
             {
-                pSetAttr = new SvxFmtBreakItem( *static_cast<const SvxFmtBreakItem*>(pItem) );
+                pSetAttr = new SvxFormatBreakItem( *static_cast<const SvxFormatBreakItem*>(pItem) );
                 pNd->ResetAttr( RES_BREAK );
             }
 
@@ -2403,23 +2403,23 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
     // total width of table
     if( nMaxRight - nMinLeft > MINLAY * nDefaultSwCols )
     {
-        pTable->GetFrmFmt()->SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE, nSwWidth));
-        aItemSet.Put(SwFmtFrmSize(ATT_FIX_SIZE, nSwWidth));
+        pTable->GetFrameFormat()->SetFormatAttr(SwFormatFrmSize(ATT_FIX_SIZE, nSwWidth));
+        aItemSet.Put(SwFormatFrmSize(ATT_FIX_SIZE, nSwWidth));
     }
 
     SvxFrameDirectionItem aDirection(
         bIsBiDi ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR );
-    pTable->GetFrmFmt()->SetFmtAttr(aDirection);
+    pTable->GetFrameFormat()->SetFormatAttr(aDirection);
 
     if (text::HoriOrientation::LEFT_AND_WIDTH == eOri)
     {
-        if (!pIo->m_nInTable && pIo->InLocalApo() && pIo->m_pSFlyPara->pFlyFmt &&
+        if (!pIo->m_nInTable && pIo->InLocalApo() && pIo->m_pSFlyPara->pFlyFormat &&
             GetMinLeft())
         {
             //If we are inside a frame and we have a border, the frames
             //placement does not consider the tables border, which word
             //displays outside the frame, so adjust here.
-            SwFmtHoriOrient aHori(pIo->m_pSFlyPara->pFlyFmt->GetHoriOrient());
+            SwFormatHoriOrient aHori(pIo->m_pSFlyPara->pFlyFormat->GetHoriOrient());
             sal_Int16 eHori = aHori.GetHoriOrient();
             if ((eHori == text::HoriOrientation::NONE) || (eHori == text::HoriOrientation::LEFT) ||
                 (eHori == text::HoriOrientation::LEFT_AND_WIDTH))
@@ -2428,7 +2428,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
                 //the maximum is what word does ?
                 aHori.SetPos(pIo->m_pSFlyPara->nXPos + GetMinLeft());
                 aHori.SetHoriOrient(text::HoriOrientation::NONE);
-                pIo->m_pSFlyPara->pFlyFmt->SetFmtAttr(aHori);
+                pIo->m_pSFlyPara->pFlyFormat->SetFormatAttr(aHori);
             }
         }
         else
@@ -2471,15 +2471,15 @@ void WW8TabDesc::UseSwTable()
     pTabLines = &pTable->GetTabLines();
     nAktRow = nAktCol = nAktBandRow = 0;
 
-    pTblNd  = const_cast<SwTableNode*>((*pTabLines)[0]->GetTabBoxes()[0]->
+    pTableNd  = const_cast<SwTableNode*>((*pTabLines)[0]->GetTabBoxes()[0]->
         GetSttNd()->FindTableNode());
-    OSL_ENSURE( pTblNd, "wo ist mein TabellenNode" );
+    OSL_ENSURE( pTableNd, "wo ist mein TabellenNode" );
 
     // #i69519# - Restrict rows to repeat to a decent value
     if ( nRowsToRepeat == static_cast<sal_uInt16>(nRows) )
         nRowsToRepeat = 1;
 
-    pTblNd->GetTable().SetRowsToRepeat( nRowsToRepeat );
+    pTableNd->GetTable().SetRowsToRepeat( nRowsToRepeat );
     // insert extra cells if needed and something like this
     AdjustNewBand();
 
@@ -2644,8 +2644,8 @@ void WW8TabDesc::ParkPaM()
         }
         while (pIo->m_pPaM->GetNode().GetNodeType() != ND_TEXTNODE && ++nSttNd < nEndNd);
 
-        pIo->m_pPaM->GetPoint()->nContent.Assign(pIo->m_pPaM->GetCntntNode(), 0);
-        pIo->m_rDoc.SetTxtFmtColl(*pIo->m_pPaM, const_cast<SwTxtFmtColl*>(pIo->m_pDfltTxtFmtColl));
+        pIo->m_pPaM->GetPoint()->nContent.Assign(pIo->m_pPaM->GetContentNode(), 0);
+        pIo->m_rDoc.SetTextFormatColl(*pIo->m_pPaM, const_cast<SwTextFormatColl*>(pIo->m_pDfltTextFormatColl));
     }
 }
 
@@ -2674,7 +2674,7 @@ void WW8TabDesc::FinishSwTable()
     pIo->m_bWasTabRowEnd = false;
     pIo->m_bWasTabCellEnd = false;
 
-    pIo->m_aInsertedTables.InsertTable(*pTblNd, *pIo->m_pPaM);
+    pIo->m_aInsertedTables.InsertTable(*pTableNd, *pIo->m_pPaM);
 
     MergeCells();
 
@@ -2702,7 +2702,7 @@ void WW8TabDesc::FinishSwTable()
                 }
             }
         }
-        pIo->m_pFmtOfJustInsertedApo = 0;
+        pIo->m_pFormatOfJustInsertedApo = 0;
         aMergeGroups.clear();
     }
 }
@@ -2884,18 +2884,18 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
                 pIo->m_pPaM->GetPoint()->nNode = nSttNd;
             }
             while (pIo->m_pPaM->GetNode().GetNodeType() != ND_TEXTNODE && ++nSttNd < nEndNd);
-            pIo->m_pPaM->GetPoint()->nContent.Assign(pIo->m_pPaM->GetCntntNode(), 0);
+            pIo->m_pPaM->GetPoint()->nContent.Assign(pIo->m_pPaM->GetContentNode(), 0);
             // Precautionally set now, otherwise the style is not set for cells
             // that are inserted for margin balancing.
-            pIo->m_rDoc.SetTxtFmtColl(*pIo->m_pPaM, const_cast<SwTxtFmtColl*>(pIo->m_pDfltTxtFmtColl));
+            pIo->m_rDoc.SetTextFormatColl(*pIo->m_pPaM, const_cast<SwTextFormatColl*>(pIo->m_pDfltTextFormatColl));
             // because this cells are invisible helper constructions only to simulate
-            // the frayed view of WW-tables we do NOT need SetTxtFmtCollAndListLevel()
+            // the frayed view of WW-tables we do NOT need SetTextFormatCollAndListLevel()
         }
 
         // Better to turn Snap to Grid off for all paragraphs in tables
-        if(SwTxtNode *pNd = pIo->m_pPaM->GetNode().GetTxtNode())
+        if(SwTextNode *pNd = pIo->m_pPaM->GetNode().GetTextNode())
         {
-            const SfxPoolItem &rItm = pNd->SwCntntNode::GetAttr(RES_PARATR_SNAPTOGRID);
+            const SfxPoolItem &rItm = pNd->SwContentNode::GetAttr(RES_PARATR_SNAPTOGRID);
             const SvxParaGridItem &rSnapToGrid = static_cast<const SvxParaGridItem&>(rItm);
 
             if(rSnapToGrid.GetValue())
@@ -2906,9 +2906,9 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
                 SwPosition* pGridPos = pIo->m_pPaM->GetPoint();
 
                 const sal_Int32 nEnd = pGridPos->nContent.GetIndex();
-                pGridPos->nContent.Assign(pIo->m_pPaM->GetCntntNode(), 0);
+                pGridPos->nContent.Assign(pIo->m_pPaM->GetContentNode(), 0);
                 pIo->m_pCtrlStck->NewAttr(*pGridPos, aGridItem);
-                pGridPos->nContent.Assign(pIo->m_pPaM->GetCntntNode(), nEnd);
+                pGridPos->nContent.Assign(pIo->m_pPaM->GetContentNode(), nEnd);
                 pIo->m_pCtrlStck->SetAttr(*pGridPos, RES_PARATR_SNAPTOGRID);
             }
         }
@@ -2924,10 +2924,10 @@ void WW8TabDesc::InsertCells( short nIns )
     pTabBoxes = &pTabLine->GetTabBoxes();
     pTabBox = (*pTabBoxes)[0];
 
-    pIo->m_rDoc.GetNodes().InsBoxen( pTblNd, pTabLine, static_cast<SwTableBoxFmt*>(pTabBox->GetFrmFmt()),
-                            const_cast<SwTxtFmtColl*>(pIo->m_pDfltTxtFmtColl), 0, pTabBoxes->size(), nIns );
-    // The third parameter contains the FrmFmt of the boxes.
-    // Here it is possible to optimize to save (reduce) FrmFmts.
+    pIo->m_rDoc.GetNodes().InsBoxen( pTableNd, pTabLine, static_cast<SwTableBoxFormat*>(pTabBox->GetFrameFormat()),
+                            const_cast<SwTextFormatColl*>(pIo->m_pDfltTextFormatColl), 0, pTabBoxes->size(), nIns );
+    // The third parameter contains the FrameFormat of the boxes.
+    // Here it is possible to optimize to save (reduce) FrameFormats.
 }
 
 void WW8TabDesc::SetTabBorders(SwTableBox* pBox, short nWwIdx)
@@ -2935,30 +2935,30 @@ void WW8TabDesc::SetTabBorders(SwTableBox* pBox, short nWwIdx)
     if( nWwIdx < 0 || nWwIdx >= pActBand->nWwCols )
         return;                 // faked cells -> no border
 
-    SvxBoxItem aFmtBox( RES_BOX );
+    SvxBoxItem aFormatBox( RES_BOX );
     if (pActBand->pTCs)     // neither Cell Border nor Default Border defined ?
     {
         WW8_TCell* pT = &pActBand->pTCs[nWwIdx];
         if (SwWW8ImplReader::IsBorder(pT->rgbrc))
-            SwWW8ImplReader::SetBorder(aFmtBox, pT->rgbrc);
+            SwWW8ImplReader::SetBorder(aFormatBox, pT->rgbrc);
     }
 
     if (pActBand->nOverrideSpacing[nWwIdx] & (1 << WW8TabBandDesc::wwTOP))
     {
-        aFmtBox.SetDistance(
+        aFormatBox.SetDistance(
             pActBand->nOverrideValues[nWwIdx][WW8TabBandDesc::wwTOP],
             SvxBoxItemLine::TOP);
     }
     else
-        aFmtBox.SetDistance(pActBand->mnDefaultTop, SvxBoxItemLine::TOP);
+        aFormatBox.SetDistance(pActBand->mnDefaultTop, SvxBoxItemLine::TOP);
     if (pActBand->nOverrideSpacing[nWwIdx] & (1 << WW8TabBandDesc::wwBOTTOM))
     {
-        aFmtBox.SetDistance(
+        aFormatBox.SetDistance(
             pActBand->nOverrideValues[nWwIdx][WW8TabBandDesc::wwBOTTOM],
             SvxBoxItemLine::BOTTOM);
     }
     else
-        aFmtBox.SetDistance(pActBand->mnDefaultBottom,SvxBoxItemLine::BOTTOM);
+        aFormatBox.SetDistance(pActBand->mnDefaultBottom,SvxBoxItemLine::BOTTOM);
 
     // nGapHalf for WW is a *horizontal* gap between table cell and content.
     short nLeftDist =
@@ -2967,22 +2967,22 @@ void WW8TabDesc::SetTabBorders(SwTableBox* pBox, short nWwIdx)
         pActBand->mbHasSpacing ? pActBand->mnDefaultRight : pActBand->nGapHalf;
     if (pActBand->nOverrideSpacing[nWwIdx] & (1 << WW8TabBandDesc::wwLEFT))
     {
-        aFmtBox.SetDistance(
+        aFormatBox.SetDistance(
             pActBand->nOverrideValues[nWwIdx][WW8TabBandDesc::wwLEFT],
             SvxBoxItemLine::LEFT);
     }
     else
-        aFmtBox.SetDistance(nLeftDist, SvxBoxItemLine::LEFT);
+        aFormatBox.SetDistance(nLeftDist, SvxBoxItemLine::LEFT);
     if (pActBand->nOverrideSpacing[nWwIdx] & (1 << WW8TabBandDesc::wwRIGHT))
     {
-        aFmtBox.SetDistance(
+        aFormatBox.SetDistance(
             pActBand->nOverrideValues[nWwIdx][WW8TabBandDesc::wwRIGHT],
             SvxBoxItemLine::RIGHT);
     }
     else
-        aFmtBox.SetDistance(nRightDist,SvxBoxItemLine::RIGHT);
+        aFormatBox.SetDistance(nRightDist,SvxBoxItemLine::RIGHT);
 
-    pBox->GetFrmFmt()->SetFmtAttr(aFmtBox);
+    pBox->GetFrameFormat()->SetFormatAttr(aFormatBox);
 }
 
 void WW8TabDesc::SetTabShades( SwTableBox* pBox, short nWwIdx )
@@ -2994,7 +2994,7 @@ void WW8TabDesc::SetTabShades( SwTableBox* pBox, short nWwIdx )
     if (pActBand->pNewSHDs && pActBand->pNewSHDs[nWwIdx] != COL_AUTO)
     {
         Color aColor(pActBand->pNewSHDs[nWwIdx]);
-        pBox->GetFrmFmt()->SetFmtAttr(SvxBrushItem(aColor, RES_BACKGROUND));
+        pBox->GetFrameFormat()->SetFormatAttr(SvxBrushItem(aColor, RES_BACKGROUND));
         bFound = true;
     }
 
@@ -3006,7 +3006,7 @@ void WW8TabDesc::SetTabShades( SwTableBox* pBox, short nWwIdx )
             return;
 
         SwWW8Shade aSh( pIo->m_bVer67, rSHD );
-        pBox->GetFrmFmt()->SetFmtAttr(SvxBrushItem(aSh.aColor, RES_BACKGROUND));
+        pBox->GetFrameFormat()->SetFormatAttr(SvxBrushItem(aSh.aColor, RES_BACKGROUND));
     }
 }
 
@@ -3043,7 +3043,7 @@ void WW8TabDesc::SetTabDirection(SwTableBox* pBox, short nWwIdx)
     if (nWwIdx < 0 || nWwIdx >= pActBand->nWwCols)
         return;
     SvxFrameDirectionItem aItem(MakeDirection(pActBand->maDirections[nWwIdx], bIsBiDi), RES_FRAMEDIR);
-    pBox->GetFrmFmt()->SetFmtAttr(aItem);
+    pBox->GetFrameFormat()->SetFormatAttr(aItem);
 }
 
 void WW8TabDesc::SetTabVertAlign( SwTableBox* pBox, short nWwIdx )
@@ -3071,7 +3071,7 @@ void WW8TabDesc::SetTabVertAlign( SwTableBox* pBox, short nWwIdx )
         }
     }
 
-    pBox->GetFrmFmt()->SetFmtAttr( SwFmtVertOrient(0,eVertOri) );
+    pBox->GetFrameFormat()->SetFormatAttr( SwFormatVertOrient(0,eVertOri) );
 }
 
 void WW8TabDesc::AdjustNewBand()
@@ -3083,10 +3083,10 @@ void WW8TabDesc::AdjustNewBand()
     OSL_ENSURE( pTabBoxes && pTabBoxes->size() == (sal_uInt16)pActBand->nSwCols,
         "Falsche Spaltenzahl in Tabelle" );
 
-    if( bClaimLineFmt )
+    if( bClaimLineFormat )
     {
-        pTabLine->ClaimFrmFmt();            // necessary because of cell height
-        SwFmtFrmSize aF( ATT_MIN_SIZE, 0, 0 );  // default
+        pTabLine->ClaimFrameFormat();            // necessary because of cell height
+        SwFormatFrmSize aF( ATT_MIN_SIZE, 0, 0 );  // default
 
         if (pActBand->nLineHeight == 0)    // 0 = Auto
             aF.SetHeightSizeType( ATT_VAR_SIZE );
@@ -3102,18 +3102,18 @@ void WW8TabDesc::AdjustNewBand()
 
             aF.SetHeight(pActBand->nLineHeight);// set min/exact height
         }
-        pTabLine->GetFrmFmt()->SetFmtAttr(aF);
+        pTabLine->GetFrameFormat()->SetFormatAttr(aF);
     }
 
     //Word stores 1 for bCantSplit if the row cannot be split, we set true if
     //we can split the row
     bool bSetCantSplit = pActBand->bCantSplit;
-    pTabLine->GetFrmFmt()->SetFmtAttr(SwFmtRowSplit(!bSetCantSplit));
+    pTabLine->GetFrameFormat()->SetFormatAttr(SwFormatRowSplit(!bSetCantSplit));
 
     short i;    // SW-Index
     short j;    // WW-Index
     short nW;   // Width
-    SwFmtFrmSize aFS( ATT_FIX_SIZE );
+    SwFormatFrmSize aFS( ATT_FIX_SIZE );
     j = pActBand->bLEmptyCol ? -1 : 0;
 
     for( i = 0; i < pActBand->nSwCols; i++ )
@@ -3135,15 +3135,15 @@ void WW8TabDesc::AdjustNewBand()
         }
 
         SwTableBox* pBox = (*pTabBoxes)[i];
-        // could be reduced further by intelligent moving of FrmFmts
-        pBox->ClaimFrmFmt();
+        // could be reduced further by intelligent moving of FrameFormats
+        pBox->ClaimFrameFormat();
 
         SetTabBorders(pBox, j);
 
         // #i18128# word has only one line between adjoining vertical cells
         // we have to mimick this in the filter by picking the larger of the
         // sides and using that one on one side of the line (right)
-        SvxBoxItem aCurrentBox(sw::util::ItemGet<SvxBoxItem>(*(pBox->GetFrmFmt()), RES_BOX));
+        SvxBoxItem aCurrentBox(sw::util::ItemGet<SvxBoxItem>(*(pBox->GetFrameFormat()), RES_BOX));
         const ::editeng::SvxBorderLine *pLeftLine = aCurrentBox.GetLine(SvxBoxItemLine::LEFT);
         int nCurrentRightLineWidth = 0;
         if(pLeftLine)
@@ -3152,7 +3152,7 @@ void WW8TabDesc::AdjustNewBand()
         if (i != 0)
         {
             SwTableBox* pBox2 = (*pTabBoxes)[i-1];
-            SvxBoxItem aOldBox(sw::util::ItemGet<SvxBoxItem>(*(pBox2->GetFrmFmt()), RES_BOX));
+            SvxBoxItem aOldBox(sw::util::ItemGet<SvxBoxItem>(*(pBox2->GetFrameFormat()), RES_BOX));
             const ::editeng::SvxBorderLine *pRightLine = aOldBox.GetLine(SvxBoxItemLine::RIGHT);
             int nOldBoxRightLineWidth = 0;
             if(pRightLine)
@@ -3162,10 +3162,10 @@ void WW8TabDesc::AdjustNewBand()
                 aCurrentBox.SetLine(aOldBox.GetLine(SvxBoxItemLine::RIGHT), SvxBoxItemLine::LEFT);
 
             aOldBox.SetLine(0, SvxBoxItemLine::RIGHT);
-            pBox2->GetFrmFmt()->SetFmtAttr(aOldBox);
+            pBox2->GetFrameFormat()->SetFormatAttr(aOldBox);
         }
 
-        pBox->GetFrmFmt()->SetFmtAttr(aCurrentBox);
+        pBox->GetFrameFormat()->SetFormatAttr(aCurrentBox);
 
         SetTabVertAlign(pBox, j);
         SetTabDirection(pBox, j);
@@ -3174,7 +3174,7 @@ void WW8TabDesc::AdjustNewBand()
         j++;
 
         aFS.SetWidth( nW );
-        pBox->GetFrmFmt()->SetFmtAttr( aFS );
+        pBox->GetFrameFormat()->SetFormatAttr( aFS );
 
         // skip non existing cells
         while( ( j < pActBand->nWwCols ) && !pActBand->bExist[j] )
@@ -3319,7 +3319,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem)
     m_bFirstPara = true;
     // keine rekursiven Tabellen Nicht bei EinfuegenDatei in Tabelle oder
     // Fussnote
-    if (m_bReadNoTbl)
+    if (m_bReadNoTable)
         return false;
 
     if (m_pTableDesc)
@@ -3380,39 +3380,39 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem)
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1);
             // #i33818# - anchor the Writer fly frame for the nested table at-character.
             // #i45301#
-            SwFmtAnchor aAnchor( eAnchor );
+            SwFormatAnchor aAnchor( eAnchor );
             aAnchor.SetAnchor( m_pTableDesc->pParentPos );
             aItemSet.Put( aAnchor );
-            m_pTableDesc->pFlyFmt = m_rDoc.MakeFlySection( eAnchor,
+            m_pTableDesc->pFlyFormat = m_rDoc.MakeFlySection( eAnchor,
                                                       m_pTableDesc->pParentPos, &aItemSet);
-            OSL_ENSURE( m_pTableDesc->pFlyFmt->GetAnchor().GetAnchorId() == eAnchor,
+            OSL_ENSURE( m_pTableDesc->pFlyFormat->GetAnchor().GetAnchorId() == eAnchor,
                    "Not the anchor type requested!" );
-            MoveInsideFly(m_pTableDesc->pFlyFmt);
+            MoveInsideFly(m_pTableDesc->pFlyFormat);
         }
         m_pTableDesc->CreateSwTable(pULSpaceItem);
-        if (m_pTableDesc->pFlyFmt)
+        if (m_pTableDesc->pFlyFormat)
         {
-            m_pTableDesc->SetSizePosition(m_pTableDesc->pFlyFmt);
+            m_pTableDesc->SetSizePosition(m_pTableDesc->pFlyFormat);
             // #i33818# - Use absolute position object attributes,
             // if existing, and apply them to the created Writer fly frame.
             if ( pTableWFlyPara && pTableSFlyPara )
             {
                 WW8FlySet aFlySet( *this, pTableWFlyPara, pTableSFlyPara, false );
-                SwFmtAnchor aAnchor( FLY_AT_CHAR );
+                SwFormatAnchor aAnchor( FLY_AT_CHAR );
                 aAnchor.SetAnchor( m_pTableDesc->pParentPos );
                 aFlySet.Put( aAnchor );
-                m_pTableDesc->pFlyFmt->SetFmtAttr( aFlySet );
+                m_pTableDesc->pFlyFormat->SetFormatAttr( aFlySet );
             }
             else
             {
-                SwFmtHoriOrient aHori =
-                            m_pTableDesc->pTable->GetFrmFmt()->GetHoriOrient();
-                m_pTableDesc->pFlyFmt->SetFmtAttr(aHori);
-                m_pTableDesc->pFlyFmt->SetFmtAttr( SwFmtSurround( SURROUND_NONE ) );
+                SwFormatHoriOrient aHori =
+                            m_pTableDesc->pTable->GetFrameFormat()->GetHoriOrient();
+                m_pTableDesc->pFlyFormat->SetFormatAttr(aHori);
+                m_pTableDesc->pFlyFormat->SetFormatAttr( SwFormatSurround( SURROUND_NONE ) );
             }
             // #i33818# - The nested table doesn't have to leave
             // the table cell. Thus, the Writer fly frame has to follow the text flow.
-            m_pTableDesc->pFlyFmt->SetFmtAttr( SwFmtFollowTextFlow( true ) );
+            m_pTableDesc->pFlyFormat->SetFormatAttr( SwFormatFollowTextFlow( true ) );
         }
         else
             m_pTableDesc->SetSizePosition(0);
@@ -3452,9 +3452,9 @@ void SwWW8ImplReader::Read_TabRowEnd( sal_uInt16, const sal_uInt8* pData, short
 
 void SwWW8ImplReader::PopTableDesc()
 {
-    if (m_pTableDesc && m_pTableDesc->pFlyFmt)
+    if (m_pTableDesc && m_pTableDesc->pFlyFormat)
     {
-        MoveOutsideFly(m_pTableDesc->pFlyFmt,*m_pTableDesc->pParentPos);
+        MoveOutsideFly(m_pTableDesc->pFlyFormat,*m_pTableDesc->pParentPos);
     }
 
     delete m_pTableDesc;
@@ -3520,16 +3520,16 @@ sal_uInt16 SwWW8ImplReader::StyleUsingLFO( sal_uInt16 nLFOIndex ) const
     return nRes;
 }
 
-const SwFmt* SwWW8ImplReader::GetStyleWithOrgWWName( OUString& rName ) const
+const SwFormat* SwWW8ImplReader::GetStyleWithOrgWWName( OUString& rName ) const
 {
-    SwFmt* pRet = 0;
+    SwFormat* pRet = 0;
     if( !m_vColl.empty() )
     {
         for(sal_uInt16 nI = 0; nI < m_pStyles->GetCount(); nI++ )
             if(    m_vColl[ nI ].bValid
                 && (rName.equals( m_vColl[ nI ].GetOrgWWName())) )
             {
-                pRet = m_vColl[ nI ].pFmt;
+                pRet = m_vColl[ nI ].pFormat;
                 break;
             }
     }
@@ -3669,7 +3669,7 @@ WW8RStyle::WW8RStyle(WW8Fib& _rFib, SwWW8ImplReader* pI)
     , pParaSprms(0)
     , nSprmsLen(0)
     , nWwNumLevel(0)
-    , bTxtColChanged(false)
+    , bTextColChanged(false)
     , bFontChanged(false)
     , bCJKFontChanged(false)
     , bCTLFontChanged(false)
@@ -3696,16 +3696,16 @@ void WW8RStyle::Set1StyleDefaults()
     if( !pIo->m_bNoAttrImport )
     {
         // Style has no text color set, winword default is auto
-        if ( !bTxtColChanged )
-            pIo->m_pAktColl->SetFmtAttr(SvxColorItem(Color(COL_AUTO), RES_CHRATR_COLOR));
+        if ( !bTextColChanged )
+            pIo->m_pAktColl->SetFormatAttr(SvxColorItem(Color(COL_AUTO), RES_CHRATR_COLOR));
 
         // Style has no FontSize ? WinWord Default is 10pt for western and asian
         if( !bFSizeChanged )
         {
             SvxFontHeightItem aAttr(200, 100, RES_CHRATR_FONTSIZE);
-            pIo->m_pAktColl->SetFmtAttr(aAttr);
+            pIo->m_pAktColl->SetFormatAttr(aAttr);
             aAttr.SetWhich(RES_CHRATR_CJK_FONTSIZE);
-            pIo->m_pAktColl->SetFmtAttr(aAttr);
+            pIo->m_pAktColl->SetFormatAttr(aAttr);
         }
 
         // Style has no FontSize ? WinWord Default is 10pt for western and asian
@@ -3713,20 +3713,20 @@ void WW8RStyle::Set1StyleDefaults()
         {
             SvxFontHeightItem aAttr(200, 100, RES_CHRATR_FONTSIZE);
             aAttr.SetWhich(RES_CHRATR_CTL_FONTSIZE);
-            pIo->m_pAktColl->SetFmtAttr(aAttr);
+            pIo->m_pAktColl->SetFormatAttr(aAttr);
         }
 
         if( !bWidowsChanged )  // Widows ?
         {
-            pIo->m_pAktColl->SetFmtAttr( SvxWidowsItem( 2, RES_PARATR_WIDOWS ) );
-            pIo->m_pAktColl->SetFmtAttr( SvxOrphansItem( 2, RES_PARATR_ORPHANS ) );
+            pIo->m_pAktColl->SetFormatAttr( SvxWidowsItem( 2, RES_PARATR_WIDOWS ) );
+            pIo->m_pAktColl->SetFormatAttr( SvxOrphansItem( 2, RES_PARATR_ORPHANS ) );
         }
     }
 }
 
 bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisStyle, sal_uInt16 nNextStyle)
 {
-    SwFmt* pColl;
+    SwFormat* pColl;
     bool bStyExist;
 
     if (rSI.bColl)
@@ -3761,12 +3761,12 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
     {
         if (bStyExist)
         {
-            pColl->ResetAllFmtAttr(); // #i73790# - method renamed
+            pColl->ResetAllFormatAttr(); // #i73790# - method renamed
         }
         pColl->SetAuto(false);          // suggested by JP
     }                                   // but changes the UI
     pIo->m_pAktColl = pColl;
-    rSI.pFmt = pColl;                  // remember translation WW->SW
+    rSI.pFormat = pColl;                  // remember translation WW->SW
     rSI.bImportSkipped = !bImport;
 
     // Set Based on style
@@ -3774,9 +3774,9 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
     if (j != nThisStyle && j < cstd )
     {
         SwWW8StyInf* pj = &pIo->m_vColl[j];
-        if (rSI.pFmt && pj->pFmt && rSI.bColl == pj->bColl)
+        if (rSI.pFormat && pj->pFormat && rSI.bColl == pj->bColl)
         {
-            rSI.pFmt->SetDerivedFrom( pj->pFmt );  // ok, set Based on
+            rSI.pFormat->SetDerivedFrom( pj->pFormat );  // ok, set Based on
             rSI.eLTRFontSrcCharSet = pj->eLTRFontSrcCharSet;
             rSI.eRTLFontSrcCharSet = pj->eRTLFontSrcCharSet;
             rSI.eCJKFontSrcCharSet = pj->eCJKFontSrcCharSet;
@@ -3794,12 +3794,12 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
         }
     }
     else if( pIo->m_bNewDoc && bStyExist )
-        rSI.pFmt->SetDerivedFrom(0);
+        rSI.pFormat->SetDerivedFrom(0);
 
     rSI.nFollow = nNextStyle;       // remember Follow
 
     pStyRule = 0;                   // recreate if necessary
-    bTxtColChanged = bFontChanged = bCJKFontChanged = bCTLFontChanged =
+    bTextColChanged = bFontChanged = bCJKFontChanged = bCTLFontChanged =
         bFSizeChanged = bFCTLSizeChanged = bWidowsChanged = false;
     pIo->SetNAktColl( nThisStyle );
     pIo->m_bStyNormal = nThisStyle == 0;
@@ -3811,7 +3811,7 @@ void WW8RStyle::PostStyle(SwWW8StyInf &rSI, bool bOldNoImp)
     // Reset attribute flags, because there are no style-ends.
 
     pIo->m_bHasBorder = pIo->m_bSpec = pIo->m_bObj = pIo->m_bSymbol = false;
-    pIo->m_nCharFmt = -1;
+    pIo->m_nCharFormat = -1;
 
     // If Style basiert auf Nichts oder Basis ignoriert
     if ((rSI.nBase >= cstd || pIo->m_vColl[rSI.nBase].bImportSkipped) && rSI.bColl)
@@ -3898,7 +3898,7 @@ void WW8RStyle::RecursiveReg(sal_uInt16 nNr)
     if( rSI.nBase < cstd && !pIo->m_vColl[rSI.nBase].bImported )
         RecursiveReg(rSI.nBase);
 
-    pIo->RegisterNumFmtOnStyle(nNr);
+    pIo->RegisterNumFormatOnStyle(nNr);
 
 }
 
@@ -4093,7 +4093,7 @@ Word2CHPX ReadWord2Chpx(SvStream &rSt, sal_Size nOffset, sal_uInt8 nSize)
         aChpx.fItalic = (nFlags8 & 0x02) >> 1;
         aChpx.fRMarkDel = (nFlags8 & 0x04) >> 2;
         aChpx.fOutline = (nFlags8 & 0x08) >> 3;
-        aChpx.fFldVanish = (nFlags8 & 0x10) >> 4;
+        aChpx.fFieldVanish = (nFlags8 & 0x10) >> 4;
         aChpx.fSmallCaps = (nFlags8 & 0x20) >> 5;
         aChpx.fCaps = (nFlags8 & 0x40) >> 6;
         aChpx.fVanish = (nFlags8 & 0x80) >> 7;
@@ -4416,9 +4416,9 @@ void WW8RStyle::ImportStyles()
 
 void WW8RStyle::Import()
 {
-    pIo->m_pDfltTxtFmtColl  = pIo->m_rDoc.GetDfltTxtFmtColl();
-    pIo->m_pStandardFmtColl =
-        pIo->m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false);
+    pIo->m_pDfltTextFormatColl  = pIo->m_rDoc.GetDfltTextFormatColl();
+    pIo->m_pStandardFormatColl =
+        pIo->m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD, false);
 
     if( pIo->m_nIniFlags & WW8FL_NO_STYLES )
         return;
@@ -4434,12 +4434,12 @@ void WW8RStyle::Import()
         {
             SwWW8StyInf* pj = &pIo->m_vColl[j];
             if ( j != i                             // rational Index ?
-                 && pi->pFmt                        // Format ok ?
-                 && pj->pFmt                        // Derived-Format ok ?
+                 && pi->pFormat                        // Format ok ?
+                 && pj->pFormat                        // Derived-Format ok ?
                  && pi->bColl                       // only possible for paragraph templates (WW)
                  && pj->bColl ){                    // identical Typ ?
-                    static_cast<SwTxtFmtColl*>(pi->pFmt)->SetNextTxtFmtColl(
-                     *static_cast<SwTxtFmtColl*>(pj->pFmt) );    // ok, register
+                    static_cast<SwTextFormatColl*>(pi->pFormat)->SetNextTextFormatColl(
+                     *static_cast<SwTextFormatColl*>(pj->pFormat) );    // ok, register
             }
         }
     }
@@ -4449,21 +4449,21 @@ void WW8RStyle::Import()
     // That is empty by default ( WW6 dt and US ) and not changeable
     // via WW-UI so this does not matter.
     // This could be done by:
-    //  if( bNew ) rDoc.SetDefault( pDefCharFmt->GetAttrSet() );
+    //  if( bNew ) rDoc.SetDefault( pDefCharFormat->GetAttrSet() );
 
     // for e.g. tables an always valid Std-Style is necessary
 
     if( pIo->StyleExists(0) && !pIo->m_vColl.empty() &&
-        pIo->m_vColl[0].pFmt && pIo->m_vColl[0].bColl && pIo->m_vColl[0].bValid )
-        pIo->m_pDfltTxtFmtColl = static_cast<SwTxtFmtColl*>(pIo->m_vColl[0].pFmt);
+        pIo->m_vColl[0].pFormat && pIo->m_vColl[0].bColl && pIo->m_vColl[0].bValid )
+        pIo->m_pDfltTextFormatColl = static_cast<SwTextFormatColl*>(pIo->m_vColl[0].pFormat);
     else
-        pIo->m_pDfltTxtFmtColl = pIo->m_rDoc.GetDfltTxtFmtColl();
+        pIo->m_pDfltTextFormatColl = pIo->m_rDoc.GetDfltTextFormatColl();
 
     // set Hyphenation flag on BASIC para-style
-    if (pIo->m_bNewDoc && pIo->m_pStandardFmtColl)
+    if (pIo->m_bNewDoc && pIo->m_pStandardFormatColl)
     {
         if (pIo->m_pWDop->fAutoHyphen
-            && SfxItemState::SET != pIo->m_pStandardFmtColl->GetItemState(
+            && SfxItemState::SET != pIo->m_pStandardFormatColl->GetItemState(
                                             RES_PARATR_HYPHENZONE, false) )
         {
             SvxHyphenZoneItem aAttr(true, RES_PARATR_HYPHENZONE);
@@ -4471,7 +4471,7 @@ void WW8RStyle::Import()
             aAttr.GetMinTrail()   = 2;
             aAttr.GetMaxHyphens() = 0;
 
-            pIo->m_pStandardFmtColl->SetFmtAttr( aAttr );
+            pIo->m_pStandardFormatColl->SetFormatAttr( aAttr );
         }
 
         /*
@@ -4479,10 +4479,10 @@ void WW8RStyle::Import()
         the page/sections rtl setting the standard style lack of rtl still
         means ltr
         */
-        if (SfxItemState::SET != pIo->m_pStandardFmtColl->GetItemState(RES_FRAMEDIR,
+        if (SfxItemState::SET != pIo->m_pStandardFormatColl->GetItemState(RES_FRAMEDIR,
             false))
         {
-           pIo->m_pStandardFmtColl->SetFmtAttr(
+           pIo->m_pStandardFormatColl->SetFormatAttr(
                 SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR));
         }
     }
@@ -4493,14 +4493,14 @@ void WW8RStyle::Import()
 
 rtl_TextEncoding SwWW8StyInf::GetCharSet() const
 {
-    if ((pFmt) && (pFmt->GetFrmDir().GetValue() == FRMDIR_HORI_RIGHT_TOP))
+    if ((pFormat) && (pFormat->GetFrmDir().GetValue() == FRMDIR_HORI_RIGHT_TOP))
         return eRTLFontSrcCharSet;
     return eLTRFontSrcCharSet;
 }
 
 rtl_TextEncoding SwWW8StyInf::GetCJKCharSet() const
 {
-    if ((pFmt) && (pFmt->GetFrmDir().GetValue() == FRMDIR_HORI_RIGHT_TOP))
+    if ((pFormat) && (pFormat->GetFrmDir().GetValue() == FRMDIR_HORI_RIGHT_TOP))
         return eRTLFontSrcCharSet;
     return eCJKFontSrcCharSet;
 }
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 1108b69d93c6..453dfb3de1e8 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -45,7 +45,7 @@ private:
 
 struct WW8SwFlyPara
 {
-    SwFlyFrmFmt* pFlyFmt;
+    SwFlyFrameFormat* pFlyFormat;
 
                 // 1. Teil: daraus abgeleitete Sw-Attribute
     sal_Int16 nXPos, nYPos;         // Position
@@ -99,7 +99,7 @@ friend class SwWW8ImplReader;
 
     sal_uInt8 nWwNumLevel;           // fuer Bullets und Aufzaehlungen in Styles
 
-    bool bTxtColChanged;
+    bool bTextColChanged;
     bool bFontChanged;      // For Simulating Default-Font
     bool bCJKFontChanged;   // For Simulating Default-CJK Font
     bool bCTLFontChanged;   // For Simulating Default-CTL Font
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 8d4251ce50ff..c87815cccbdd 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -124,16 +124,16 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr )
     {
         aFormula.msDefault = GetFieldResult(pF);
 
-        SwInputField aFld(
-            static_cast<SwInputFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )),
+        SwInputField aField(
+            static_cast<SwInputFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_INPUTFLD )),
             aFormula.msDefault,
             aFormula.msTitle,
             INP_TXT,
             0 );
-        aFld.SetHelp(aFormula.msHelp);
-        aFld.SetToolTip(aFormula.msToolTip);
+        aField.SetHelp(aFormula.msHelp);
+        aField.SetToolTip(aFormula.msToolTip);
 
-        m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
+        m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField(aField));
         return FLD_OK;
     }
     else
@@ -242,20 +242,20 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr)
 
     if (!bUseEnhFields)
     {
-        SwDropDownField aFld(static_cast<SwDropDownFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DROPDOWN)));
+        SwDropDownField aField(static_cast<SwDropDownFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_DROPDOWN)));
 
-        aFld.SetName(aFormula.msTitle);
-        aFld.SetHelp(aFormula.msHelp);
-        aFld.SetToolTip(aFormula.msToolTip);
+        aField.SetName(aFormula.msTitle);
+        aField.SetHelp(aFormula.msHelp);
+        aField.SetToolTip(aFormula.msToolTip);
 
         if (!aFormula.maListEntries.empty())
         {
-            aFld.SetItems(aFormula.maListEntries);
+            aField.SetItems(aFormula.maListEntries);
             int nIndex = aFormula.mfDropdownIndex  < aFormula.maListEntries.size() ? aFormula.mfDropdownIndex : 0;
-            aFld.SetSelectedItem(aFormula.maListEntries[nIndex]);
+            aField.SetSelectedItem(aFormula.maListEntries[nIndex]);
         }
 
-        m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
+        m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField(aField));
         return FLD_OK;
     }
     else
@@ -323,7 +323,7 @@ typedef sal_uInt16 WW8aIdSty[WW8ListManager::nMaxLevel];
 // Zeichenattribute aus GrpprlChpx
 typedef SfxItemSet* WW8aISet[WW8ListManager::nMaxLevel];
 // Zeichen Style Pointer
-typedef SwCharFmt* WW8aCFmt[WW8ListManager::nMaxLevel];
+typedef SwCharFormat* WW8aCFormat[WW8ListManager::nMaxLevel];
 
 struct WW8LST   // nur DIE Eintraege, die WIR benoetigen!
 {
@@ -393,7 +393,7 @@ struct WW8LSTInfo   // sortiert nach nIdLst (in WW8 verwendete Listen-Id)
     std::vector<ww::bytes> maParaSprms;
     WW8aIdSty   aIdSty;          // Style Id's for each level
     WW8aISet    aItemSet;        // Zeichenattribute aus GrpprlChpx
-    WW8aCFmt    aCharFmt;        // Zeichen Style Pointer
+    WW8aCFormat    aCharFormat;        // Zeichen Style Pointer
 
     SwNumRule*  pNumRule;        // Zeiger auf entsprechende Listenvorlage im Writer
     sal_uInt32      nIdLst;          // WW8Id dieser Liste
@@ -407,7 +407,7 @@ struct WW8LSTInfo   // sortiert nach nIdLst (in WW8 verwendete Listen-Id)
     {
         memcpy( aIdSty, aLST.aIdSty, sizeof( aIdSty   ));
         memset(&aItemSet, 0,  sizeof( aItemSet ));
-        memset(&aCharFmt, 0,  sizeof( aCharFmt ));
+        memset(&aCharFormat, 0,  sizeof( aCharFormat ));
     }
 
 };
@@ -518,7 +518,7 @@ OUString sanitizeString(const OUString& rString)
     return rString;
 }
 
-bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
+bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, SfxItemSet*& rpItemSet,
     sal_uInt16 nLevelStyle, bool bSetStartNo,
     std::deque<bool> &rNotReallyThere, sal_uInt16 nLevel,
     ww::bytes &rParaSprms)
@@ -628,7 +628,7 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
                 "of unexpected configuration");
             (void)bDone;
         }
-        if ( rNumFmt.GetPositionAndSpaceMode() ==
+        if ( rNumFormat.GetPositionAndSpaceMode() ==
                                   SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
         {
             // If there is a tab setting with a larger value, then use that.
@@ -705,7 +705,7 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
         rReader.SetNAktColl( nNewColl );
 
         // Nun den GrpprlChpx einfach durchnudeln: die Read_xy() Methoden
-        // in WW8PAR6.CXX rufen ganz normal ihr NewAttr() oder GetFmtAttr()
+        // in WW8PAR6.CXX rufen ganz normal ihr NewAttr() oder GetFormatAttr()
         // und diese merken am besetzten Reader-ItemSet-Pointer, dass dieser
         // spezielle ItemSet relevant ist - und nicht ein Stack oder Style!
         sal_uInt16 nOldFlags1 = rReader.GetToggleAttrFlags();
@@ -918,58 +918,58 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
             break;
     }
 
-    // 6. entsprechendes NumFmt konfigurieren
+    // 6. entsprechendes NumFormat konfigurieren
     if( bSetStartNo )
-        rNumFmt.SetStart( nStartNo );
-    rNumFmt.SetNumberingType( nType );
-    rNumFmt.SetNumAdjust( eAdj );
+        rNumFormat.SetStart( nStartNo );
+    rNumFormat.SetNumberingType( nType );
+    rNumFormat.SetNumAdjust( eAdj );
 
     if( style::NumberingType::CHAR_SPECIAL == nType )
     {
         // first character of the Prefix-Text is the Bullet
-        rNumFmt.SetBulletChar(cBullet);
+        rNumFormat.SetBulletChar(cBullet);
         // Don't forget: unten, nach dem Bauen eventueller Styles auch noch
         // SetBulletFont() rufen !!!
     }
     //For i120928,position index info
     else if (style::NumberingType::BITMAP == nType)
     {
-        rNumFmt.SetGrfBulletCP(cGrfBulletCP);
+        rNumFormat.SetGrfBulletCP(cGrfBulletCP);
     }
     else
     {
         // reminder: Garnix ist default Prefix
         if( !sPrefix.isEmpty() )
-            rNumFmt.SetPrefix( sPrefix );
+            rNumFormat.SetPrefix( sPrefix );
         // reminder: Point is default Postfix
-        rNumFmt.SetSuffix( sPostfix );
-        rNumFmt.SetIncludeUpperLevels( nUpperLevel );
+        rNumFormat.SetSuffix( sPostfix );
+        rNumFormat.SetIncludeUpperLevels( nUpperLevel );
     }
 
     // #i89181#
-    if ( rNumFmt.GetPositionAndSpaceMode() ==
+    if ( rNumFormat.GetPositionAndSpaceMode() ==
                               SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
         if (eAdj == SVX_ADJUST_RIGHT)
         {
-            rNumFmt.SetAbsLSpace(aLVL.nDxaLeft);
-            rNumFmt.SetFirstLineOffset(-aLVL.nDxaLeft);
-            rNumFmt.SetCharTextDistance(-aLVL.nDxaLeft1);
+            rNumFormat.SetAbsLSpace(aLVL.nDxaLeft);
+            rNumFormat.SetFirstLineOffset(-aLVL.nDxaLeft);
+            rNumFormat.SetCharTextDistance(-aLVL.nDxaLeft1);
         }
         else
         {
-            rNumFmt.SetAbsLSpace( aLVL.nDxaLeft );
-            rNumFmt.SetFirstLineOffset(aLVL.nDxaLeft1);
+            rNumFormat.SetAbsLSpace( aLVL.nDxaLeft );
+            rNumFormat.SetFirstLineOffset(aLVL.nDxaLeft1);
         }
     }
     else
     {
-        rNumFmt.SetIndentAt( aLVL.nDxaLeft );
-        rNumFmt.SetFirstLineIndent(aLVL.nDxaLeft1);
+        rNumFormat.SetIndentAt( aLVL.nDxaLeft );
+        rNumFormat.SetFirstLineIndent(aLVL.nDxaLeft1);
         if ( !aLVL.bV6 )
-            rNumFmt.SetListtabPos( nTabPos );
+            rNumFormat.SetListtabPos( nTabPos );
         else
-            rNumFmt.SetListtabPos( aLVL.nV6Indent );
+            rNumFormat.SetListtabPos( aLVL.nV6Indent );
         SvxNumberFormat::LabelFollowedBy eNumLabelFollowedBy = SvxNumberFormat::LISTTAB;
         switch ( ixchFollow )
         {
@@ -989,22 +989,22 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
             }
             break;
         }
-        rNumFmt.SetLabelFollowedBy( eNumLabelFollowedBy );
+        rNumFormat.SetLabelFollowedBy( eNumLabelFollowedBy );
     }
 
     return true;
 }
 
 void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
-    WW8aISet& rListItemSet, WW8aCFmt& rCharFmt, bool& bNewCharFmtCreated,
+    WW8aISet& rListItemSet, WW8aCFormat& rCharFormat, bool& bNewCharFormatCreated,
     const OUString& sPrefix )
 {
-    bNewCharFmtCreated = false;
+    bNewCharFormatCreated = false;
     SfxItemSet* pThisLevelItemSet;
     sal_uInt8 nIdenticalItemSetLevel;
     const SfxPoolItem* pItem;
 
-    SwNumFmt aNumFmt  = rNumRule.Get( nLevel );
+    SwNumFormat aNumFormat  = rNumRule.Get( nLevel );
 
     pThisLevelItemSet = rListItemSet[ nLevel ];
 
@@ -1043,7 +1043,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
             }
         }
 
-        SwCharFmt* pFmt;
+        SwCharFormat* pFormat;
         if (nMaxLevel == nIdenticalItemSetLevel)
         {
             // Style definieren
@@ -1051,65 +1051,65 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
                                   + "z" + OUString::number( nLevel ) );
 
             // const Wegcasten
-            pFmt = rDoc.MakeCharFmt(aName, rDoc.GetDfltCharFmt());
-            bNewCharFmtCreated = true;
+            pFormat = rDoc.MakeCharFormat(aName, rDoc.GetDfltCharFormat());
+            bNewCharFormatCreated = true;
             // Attribute reinsetzen
-            pFmt->SetFmtAttr( *pThisLevelItemSet );
+            pFormat->SetFormatAttr( *pThisLevelItemSet );
         }
         else
         {
             // passenden Style hier anhaengen
-            pFmt = rCharFmt[ nIdenticalItemSetLevel ];
+            pFormat = rCharFormat[ nIdenticalItemSetLevel ];
         }
 
         // merken
-        rCharFmt[ nLevel ] = pFmt;
+        rCharFormat[ nLevel ] = pFormat;
 
         // Style an das NumFormat haengen
 
-        aNumFmt.SetCharFmt( pFmt );
+        aNumFormat.SetCharFormat( pFormat );
     }
     //Ensure the default char fmt is initialized for any level of num ruler if no customized attr
     else
     {
-        SwCharFmt* pFmt = aNumFmt.GetCharFmt();
-        if ( !pFmt)
+        SwCharFormat* pFormat = aNumFormat.GetCharFormat();
+        if ( !pFormat)
         {
             const OUString aName( (!sPrefix.isEmpty() ? sPrefix : rNumRule.GetName())
                                   + "z" + OUString::number( nLevel ) );
 
-            pFmt = rDoc.MakeCharFmt(aName, rDoc.GetDfltCharFmt());
-            bNewCharFmtCreated = true;
-            rCharFmt[ nLevel ] = pFmt;
-            aNumFmt.SetCharFmt( pFmt );
+            pFormat = rDoc.MakeCharFormat(aName, rDoc.GetDfltCharFormat());
+            bNewCharFormatCreated = true;
+            rCharFormat[ nLevel ] = pFormat;
+            aNumFormat.SetCharFormat( pFormat );
         }
     }
 
     // ggfs. Bullet Font an das NumFormat haengen
 
-    if( SVX_NUM_CHAR_SPECIAL == aNumFmt.GetNumberingType() )
+    if( SVX_NUM_CHAR_SPECIAL == aNumFormat.GetNumberingType() )
     {
-        SwCharFmt* pFmt = aNumFmt.GetCharFmt();
+        SwCharFormat* pFormat = aNumFormat.GetCharFormat();
         vcl::Font aFont;
-        if( !pFmt )
+        if( !pFormat )
         {
             aFont = numfunc::GetDefBulletFont();
         }
         else
         {
-            const SvxFontItem& rFontItem = pFmt->GetFont();
+            const SvxFontItem& rFontItem = pFormat->GetFont();
             aFont.SetFamily(    rFontItem.GetFamily()     );
             aFont.SetName(      rFontItem.GetFamilyName() );
             aFont.SetStyleName( rFontItem.GetStyleName()  );
             aFont.SetPitch(     rFontItem.GetPitch()      );
             aFont.SetCharSet(   rFontItem.GetCharSet()    );
         }
-        aNumFmt.SetBulletFont( &aFont );
+        aNumFormat.SetBulletFont( &aFont );
     }
 
     // und wieder rein in die NumRule
 
-    rNumRule.Set(nLevel, aNumFmt);
+    rNumRule.Set(nLevel, aNumFormat);
 }
 
 SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
@@ -1120,7 +1120,7 @@ SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
     sal_uInt16 nRul =
             rDoc.MakeNumRule( rDoc.GetUniqueNumRuleName(&sPrefix), 0, false,
                               SvxNumberFormat::LABEL_ALIGNMENT );
-    SwNumRule* pMyNumRule = rDoc.GetNumRuleTbl()[nRul];
+    SwNumRule* pMyNumRule = rDoc.GetNumRuleTable()[nRul];
     pMyNumRule->SetAutoRule(false);
     pMyNumRule->SetContinusNum(bSimple);
     return pMyNumRule;
@@ -1248,15 +1248,15 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
         pListInfo->maParaSprms.resize(nMaxLevel);
         for (sal_uInt8 nLevel = 0; nLevel < nLvlCount; ++nLevel)
         {
-            SwNumFmt aNumFmt( rMyNumRule.Get( nLevel ) );
+            SwNumFormat aNumFormat( rMyNumRule.Get( nLevel ) );
             // LVLF einlesen
-            bLVLOk = ReadLVL( aNumFmt, pListInfo->aItemSet[nLevel],
+            bLVLOk = ReadLVL( aNumFormat, pListInfo->aItemSet[nLevel],
                 pListInfo->aIdSty[nLevel], true, aNotReallyThere, nLevel,
                 pListInfo->maParaSprms[nLevel]);
             if( !bLVLOk )
                 break;
             // und in die rMyNumRule aufnehmen
-            rMyNumRule.Set( nLevel, aNumFmt );
+            rMyNumRule.Set( nLevel, aNumFormat );
         }
         if( !bLVLOk )
             break;
@@ -1268,7 +1268,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
         {
             bool bDummy;
             AdjustLVL( nLevel, rMyNumRule, pListInfo->aItemSet,
-                                           pListInfo->aCharFmt, bDummy );
+                                           pListInfo->aCharFormat, bDummy );
         }
 
         // 1.2.3 ItemPools leeren und loeschen
@@ -1370,14 +1370,14 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
                 {
                     sal_uInt16 nRul = rDoc.MakeNumRule(
                         rDoc.GetUniqueNumRuleName( &sPrefix ), pParentNumRule);
-                    rLFOInfo.pNumRule = rDoc.GetNumRuleTbl()[ nRul ];
+                    rLFOInfo.pNumRule = rDoc.GetNumRuleTable()[ nRul ];
                     rLFOInfo.pNumRule->SetAutoRule(false);
                 }
                 else
                 {
                     sal_uInt16 nRul = rDoc.MakeNumRule(
                         rDoc.GetUniqueNumRuleName(), pParentNumRule);
-                    rLFOInfo.pNumRule = rDoc.GetNumRuleTbl()[ nRul ];
+                    rLFOInfo.pNumRule = rDoc.GetNumRuleTable()[ nRul ];
                     rLFOInfo.pNumRule->SetAutoRule(true);  // = default
                 }
 
@@ -1385,9 +1385,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
                 // einlesen
 
                 WW8aISet aItemSet;       // Zeichenattribute aus GrpprlChpx
-                WW8aCFmt aCharFmt;       // Zeichen Style Pointer
+                WW8aCFormat aCharFormat;       // Zeichen Style Pointer
                 memset(&aItemSet, 0,  sizeof( aItemSet ));
-                memset(&aCharFmt, 0,  sizeof( aCharFmt ));
+                memset(&aCharFormat, 0,  sizeof( aCharFormat ));
 
                 //2.2.2.0 skip inter-group of override header ?
                 //See #i25438# for why I moved this here, compare
@@ -1438,7 +1438,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
 
                         // 2.2.2.2 eventuell auch den zugehoerigen LVL einlesen
 
-                        SwNumFmt aNumFmt(
+                        SwNumFormat aNumFormat(
                             rLFOInfo.pNumRule->Get(aLFOLVL.nLevel));
                         if (aBits1 & 0x20)
                         {
@@ -1446,7 +1446,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
                             // falls bStartup true, hier den Startup-Level
                             // durch den im LVL vermerkten ersetzen LVLF
                             // einlesen
-                            bLVLOk = ReadLVL(aNumFmt, aItemSet[nLevel],
+                            bLVLOk = ReadLVL(aNumFormat, aItemSet[nLevel],
                                 pParentListInfo->aIdSty[nLevel],
                                 aLFOLVL.bStartAt, aNotReallyThere, nLevel,
                                 rLFOInfo.maParaSprms[nLevel]);
@@ -1456,13 +1456,13 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
                         }
                         else if (aLFOLVL.bStartAt)
                         {
-                            aNumFmt.SetStart(
+                            aNumFormat.SetStart(
                                 writer_cast<sal_uInt16>(aLFOLVL.nStartAt));
                         }
 
-                        // 2.2.2.3 das NumFmt in die NumRule aufnehmen
+                        // 2.2.2.3 das NumFormat in die NumRule aufnehmen
 
-                        rLFOInfo.pNumRule->Set(aLFOLVL.nLevel, aNumFmt);
+                        rLFOInfo.pNumRule->Set(aLFOLVL.nLevel, aNumFormat);
                     }
                     bLVLOk = true;
 
@@ -1474,14 +1474,14 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
 
                 // 2.2.3 die LVL der neuen NumRule anpassen
 
-                sal_uInt16 aFlagsNewCharFmt = 0;
-                bool bNewCharFmtCreated = false;
+                sal_uInt16 aFlagsNewCharFormat = 0;
+                bool bNewCharFormatCreated = false;
                 for (sal_uInt8 nLevel = 0; nLevel < rLFOInfo.nLfoLvl; ++nLevel)
                 {
-                    AdjustLVL( nLevel, *rLFOInfo.pNumRule, aItemSet, aCharFmt,
-                        bNewCharFmtCreated, sPrefix );
-                    if( bNewCharFmtCreated )
-                        aFlagsNewCharFmt += (1 << nLevel);
+                    AdjustLVL( nLevel, *rLFOInfo.pNumRule, aItemSet, aCharFormat,
+                        bNewCharFormatCreated, sPrefix );
+                    if( bNewCharFormatCreated )
+                        aFlagsNewCharFormat += (1 << nLevel);
                 }
 
                 // 2.2.4 ItemPools leeren und loeschen
@@ -1533,7 +1533,7 @@ bool IsEqualFormatting(const SwNumRule &rOne, const SwNumRule &rTwo)
           rOne.GetRuleType() == rTwo.GetRuleType() &&
           rOne.IsContinusNum() == rTwo.IsContinusNum() &&
           rOne.IsAbsSpaces() == rTwo.IsAbsSpaces() &&
-          rOne.GetPoolFmtId() == rTwo.GetPoolFmtId() &&
+          rOne.GetPoolFormatId() == rTwo.GetPoolFormatId() &&
           rOne.GetPoolHelpId() == rTwo.GetPoolHelpId() &&
           rOne.GetPoolHlpFileId() == rTwo.GetPoolHlpFileId()
         );
@@ -1542,7 +1542,7 @@ bool IsEqualFormatting(const SwNumRule &rOne, const SwNumRule &rTwo)
     {
         for (sal_uInt8 n = 0; n < MAXLEVEL; ++n )
         {
-            //The SvxNumberFormat compare, not the SwNumFmt compare
+            //The SvxNumberFormat compare, not the SwNumFormat compare
             const SvxNumberFormat &rO = rOne.Get(n);
             const SvxNumberFormat &rT = rTwo.Get(n);
             if (!(rO == rT))
@@ -1556,7 +1556,7 @@ bool IsEqualFormatting(const SwNumRule &rOne, const SwNumRule &rTwo)
 }
 
 SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
-    const sal_uInt8 nLevel, std::vector<sal_uInt8> &rParaSprms, SwTxtNode *pNode)
+    const sal_uInt8 nLevel, std::vector<sal_uInt8> &rParaSprms, SwTextNode *pNode)
 {
     if (pLFOInfos.size() <= nLFOPosition)
         return 0;
@@ -1571,14 +1571,14 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
 
     // #i25545#
     // #i100132# - a number format does not have to exist on given list level
-    SwNumFmt pFmt(rLFOInfo.pNumRule->Get(nLevel));
+    SwNumFormat pFormat(rLFOInfo.pNumRule->Get(nLevel));
 
     if (rReader.IsRightToLeft() && nLastLFOPosition != nLFOPosition) {
-        if ( pFmt.GetNumAdjust() == SVX_ADJUST_RIGHT)
-            pFmt.SetNumAdjust(SVX_ADJUST_LEFT);
-        else if ( pFmt.GetNumAdjust() == SVX_ADJUST_LEFT)
-            pFmt.SetNumAdjust(SVX_ADJUST_RIGHT);
-        rLFOInfo.pNumRule->Set(nLevel, pFmt);
+        if ( pFormat.GetNumAdjust() == SVX_ADJUST_RIGHT)
+            pFormat.SetNumAdjust(SVX_ADJUST_LEFT);
+        else if ( pFormat.GetNumAdjust() == SVX_ADJUST_LEFT)
+            pFormat.SetNumAdjust(SVX_ADJUST_RIGHT);
+        rLFOInfo.pNumRule->Set(nLevel, pFormat);
     }
     nLastLFOPosition = nLFOPosition;
     /*
@@ -1638,10 +1638,10 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
                 {
                     if (rOverride.bStartAt)
                     {
-                        const SwNumFmt &rFmt =
+                        const SwNumFormat &rFormat =
                             pParentListInfo->pNumRule->Get(nLevel);
                         if (
-                             rFmt.GetStart() ==
+                             rFormat.GetStart() ==
                              rLFOInfo.maOverrides[nLevel].nStartAt
                            )
                         {
@@ -1675,71 +1675,71 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
 
 //          SwWW8ImplReader:  anhaengen einer Liste an einen Style oder Absatz
 
-bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg,
+bool SwWW8ImplReader::SetTextFormatCollAndListLevel(const SwPaM& rRg,
     SwWW8StyInf& rStyleInfo)
 {
     bool bRes = true;
-    if( rStyleInfo.pFmt && rStyleInfo.bColl )
+    if( rStyleInfo.pFormat && rStyleInfo.bColl )
     {
-        bRes = m_rDoc.SetTxtFmtColl(rRg, static_cast<SwTxtFmtColl*>(rStyleInfo.pFmt));
-        SwTxtNode* pTxtNode = m_pPaM->GetNode().GetTxtNode();
-        OSL_ENSURE( pTxtNode, "No Text-Node at PaM-Position" );
-        if ( !pTxtNode )
+        bRes = m_rDoc.SetTextFormatColl(rRg, static_cast<SwTextFormatColl*>(rStyleInfo.pFormat));
+        SwTextNode* pTextNode = m_pPaM->GetNode().GetTextNode();
+        OSL_ENSURE( pTextNode, "No Text-Node at PaM-Position" );
+        if ( !pTextNode )
         {
             // make code robust
             return bRes;
         }
 
-        const SwNumRule * pNumRule = pTxtNode->GetNumRule(); // #i27610#
+        const SwNumRule * pNumRule = pTextNode->GetNumRule(); // #i27610#
 
         if( !IsInvalidOrToBeMergedTabCell() &&
             ! (pNumRule && pNumRule->IsOutlineRule()) ) // #i27610#
         {
-            pTxtNode->ResetAttr( RES_PARATR_NUMRULE );
+            pTextNode->ResetAttr( RES_PARATR_NUMRULE );
         }
 
         if (USHRT_MAX > rStyleInfo.nLFOIndex && WW8ListManager::nMaxLevel
                                                 > rStyleInfo.nListLevel)
         {
             const bool bApplyListStyle = false;
-            RegisterNumFmtOnTxtNode(rStyleInfo.nLFOIndex, rStyleInfo.nListLevel,
+            RegisterNumFormatOnTextNode(rStyleInfo.nLFOIndex, rStyleInfo.nListLevel,
                                     bApplyListStyle);
         }
     }
     return bRes;
 }
 
-void UseListIndent(SwWW8StyInf &rStyle, const SwNumFmt &rFmt)
+void UseListIndent(SwWW8StyInf &rStyle, const SwNumFormat &rFormat)
 {
     // #i86652#
-    if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+    if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
-        const long nAbsLSpace = rFmt.GetAbsLSpace();
-        const long nListFirstLineIndent = GetListFirstLineIndent(rFmt);
-        SvxLRSpaceItem aLR(ItemGet<SvxLRSpaceItem>(*rStyle.pFmt, RES_LR_SPACE));
-        aLR.SetTxtLeft(nAbsLSpace);
-        aLR.SetTxtFirstLineOfst(writer_cast<short>(nListFirstLineIndent));
-        rStyle.pFmt->SetFmtAttr(aLR);
+        const long nAbsLSpace = rFormat.GetAbsLSpace();
+        const long nListFirstLineIndent = GetListFirstLineIndent(rFormat);
+        SvxLRSpaceItem aLR(ItemGet<SvxLRSpaceItem>(*rStyle.pFormat, RES_LR_SPACE));
+        aLR.SetTextLeft(nAbsLSpace);
+        aLR.SetTextFirstLineOfst(writer_cast<short>(nListFirstLineIndent));
+        rStyle.pFormat->SetFormatAttr(aLR);
         rStyle.bListReleventIndentSet = true;
     }
 }
 
-void SetStyleIndent(SwWW8StyInf &rStyle, const SwNumFmt &rFmt)
+void SetStyleIndent(SwWW8StyInf &rStyle, const SwNumFormat &rFormat)
 {
-    if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) // #i86652#
+    if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) // #i86652#
     {
-        SvxLRSpaceItem aLR(ItemGet<SvxLRSpaceItem>(*rStyle.pFmt, RES_LR_SPACE));
+        SvxLRSpaceItem aLR(ItemGet<SvxLRSpaceItem>(*rStyle.pFormat, RES_LR_SPACE));
         if (rStyle.bListReleventIndentSet)
         {
 
-            SyncIndentWithList( aLR, rFmt, false, false ); // #i103711#, #i105414#
+            SyncIndentWithList( aLR, rFormat, false, false ); // #i103711#, #i105414#
         }
         else
         {
-            aLR.SetTxtLeft(0);
-            aLR.SetTxtFirstLineOfst(0);
+            aLR.SetTextLeft(0);
+            aLR.SetTextFirstLineOfst(0);
         }
-        rStyle.pFmt->SetFmtAttr(aLR);
+        rStyle.pFormat->SetFormatAttr(aLR);
     }
 }
 
@@ -1783,18 +1783,18 @@ void SwWW8ImplReader::SetStylesList(sal_uInt16 nStyle, sal_uInt16 nActLFO,
     }
 }
 
-void SwWW8ImplReader::RegisterNumFmtOnStyle(sal_uInt16 nStyle)
+void SwWW8ImplReader::RegisterNumFormatOnStyle(sal_uInt16 nStyle)
 {
 
     if (nStyle >= m_vColl.size())
         return;
 
     SwWW8StyInf &rStyleInf = m_vColl[nStyle];
-    if (rStyleInf.bValid && rStyleInf.pFmt)
+    if (rStyleInf.bValid && rStyleInf.pFormat)
     {
         //Save old pre-list modified indent, which are the word indent values
         rStyleInf.maWordLR =
-            ItemGet<SvxLRSpaceItem>(*rStyleInf.pFmt, RES_LR_SPACE);
+            ItemGet<SvxLRSpaceItem>(*rStyleInf.pFormat, RES_LR_SPACE);
 
         // Phase 2: aktualisieren der StyleDef nach einlesen aller Listen
         SwNumRule* pNmRule = 0;
@@ -1818,7 +1818,7 @@ void SwWW8ImplReader::RegisterNumFmtOnStyle(sal_uInt16 nStyle)
                 }
                 else
                 {
-                    rStyleInf.pFmt->SetFmtAttr(
+                    rStyleInf.pFormat->SetFormatAttr(
                         SwNumRuleItem(pNmRule->GetName()));
                     rStyleInf.bHasStyNumRule = true;
                 }
@@ -1830,7 +1830,7 @@ void SwWW8ImplReader::RegisterNumFmtOnStyle(sal_uInt16 nStyle)
     }
 }
 
-void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
+void SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nActLFO,
                                               sal_uInt8 nActLevel,
                                               const bool bSetAttr)
 {
@@ -1841,29 +1841,29 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
 
     if (m_pLstManager) // sind die Listendeklarationen gelesen?
     {
-        SwTxtNode* pTxtNd = m_pPaM->GetNode().GetTxtNode();
-        OSL_ENSURE(pTxtNd, "No Text-Node at PaM-Position");
-        if (!pTxtNd)
+        SwTextNode* pTextNd = m_pPaM->GetNode().GetTextNode();
+        OSL_ENSURE(pTextNd, "No Text-Node at PaM-Position");
+        if (!pTextNd)
             return;
 
         std::vector<sal_uInt8> aParaSprms;
         const SwNumRule* pRule = bSetAttr ?
             m_pLstManager->GetNumRuleForActivation( nActLFO, nActLevel,
-                aParaSprms, pTxtNd) : 0;
+                aParaSprms, pTextNd) : 0;
 
         if (pRule != NULL || !bSetAttr)
         {
-            if (bSetAttr && pTxtNd->GetNumRule() != pRule
-                && pTxtNd->GetNumRule() != m_rDoc.GetOutlineNumRule())
+            if (bSetAttr && pTextNd->GetNumRule() != pRule
+                && pTextNd->GetNumRule() != m_rDoc.GetOutlineNumRule())
             {
-                pTxtNd->SetAttr(SwNumRuleItem(pRule->GetName()));
+                pTextNd->SetAttr(SwNumRuleItem(pRule->GetName()));
             }
-            pTxtNd->SetAttrListLevel(nActLevel);
+            pTextNd->SetAttrListLevel(nActLevel);
 
             // <IsCounted()> state of text node has to be adjusted accordingly.
             if ( /*nActLevel >= 0 &&*/ nActLevel < MAXLEVEL )
             {
-                pTxtNd->SetCountedInList( true );
+                pTextNd->SetCountedInList( true );
             }
 
             // #i99822#
@@ -1871,10 +1871,10 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
             // needed for list levels of mode LABEL_ALIGNMENT
             bool bApplyListLevelIndentDirectlyAtPara(true);
             {
-                if (pTxtNd->GetNumRule() && nActLevel < MAXLEVEL)
+                if (pTextNd->GetNumRule() && nActLevel < MAXLEVEL)
                 {
-                    const SwNumFmt& rFmt = pTxtNd->GetNumRule()->Get(nActLevel);
-                    if (rFmt.GetPositionAndSpaceMode()
+                    const SwNumFormat& rFormat = pTextNd->GetNumRule()->Get(nActLevel);
+                    if (rFormat.GetPositionAndSpaceMode()
                         == SvxNumberFormat::LABEL_ALIGNMENT)
                     {
                         bApplyListLevelIndentDirectlyAtPara = false;
@@ -1887,7 +1887,7 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
                 SfxItemSet aListIndent(m_rDoc.GetAttrPool(), RES_LR_SPACE,
                         RES_LR_SPACE);
                 const SvxLRSpaceItem *pItem = static_cast<const SvxLRSpaceItem*>(
-                    GetFmtAttr(RES_LR_SPACE));
+                    GetFormatAttr(RES_LR_SPACE));
                 OSL_ENSURE(pItem, "impossible");
                 if (pItem)
                     aListIndent.Put(*pItem);
@@ -1926,13 +1926,13 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
     }
 }
 
-void SwWW8ImplReader::RegisterNumFmt(sal_uInt16 nActLFO, sal_uInt8 nActLevel)
+void SwWW8ImplReader::RegisterNumFormat(sal_uInt16 nActLFO, sal_uInt8 nActLevel)
 {
     // sind wir erst beim Einlesen der StyleDef ?
     if (m_pAktColl)
         SetStylesList( m_nAktColl , nActLFO, nActLevel);
     else
-        RegisterNumFmtOnTxtNode(nActLFO, nActLevel);
+        RegisterNumFormatOnTextNode(nActLFO, nActLevel);
 }
 
 void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const sal_uInt8* pData,
@@ -1976,7 +1976,7 @@ void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const sal_uInt8* pData,
              (WW8ListManager::nMaxLevel > m_nListLevel)
            )
         {
-            RegisterNumFmt(m_nLFOPosition, m_nListLevel);
+            RegisterNumFormat(m_nLFOPosition, m_nListLevel);
             m_nLFOPosition = USHRT_MAX;
             m_nListLevel  = WW8ListManager::nMaxLevel;
         }
@@ -2021,33 +2021,33 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
                 // here a "named" style is being configured
 
                 // disable the numbering/list in the style currently configured
-                m_pAktColl->SetFmtAttr(*GetDfltAttr(RES_PARATR_NUMRULE));
+                m_pAktColl->SetFormatAttr(*GetDfltAttr(RES_PARATR_NUMRULE));
 
                 // reset/blank the indent
-                m_pAktColl->SetFmtAttr(SvxLRSpaceItem(RES_LR_SPACE));
+                m_pAktColl->SetFormatAttr(SvxLRSpaceItem(RES_LR_SPACE));
             }
-            else if (SwTxtNode* pTxtNode = m_pPaM->GetNode().GetTxtNode())
+            else if (SwTextNode* pTextNode = m_pPaM->GetNode().GetTextNode())
             {
                 // here a paragraph is being directly formatted
 
                 // empty the numbering/list style applied to the current paragraph
                 SwNumRuleItem aEmptyRule( aEmptyOUStr );
-                pTxtNode->SetAttr( aEmptyRule );
+                pTextNode->SetAttr( aEmptyRule );
 
                 // create an empty SvxLRSpaceItem
                 SvxLRSpaceItem aLR( RES_LR_SPACE );
 
                 // replace it with the one of the current node if it exist
-                const SfxPoolItem* pLR = GetFmtAttr(RES_LR_SPACE);
+                const SfxPoolItem* pLR = GetFormatAttr(RES_LR_SPACE);
                 if( pLR )
                     aLR = *static_cast<const SvxLRSpaceItem*>(pLR);
 
                 // reset/blank the left indent (and only the left)
-                aLR.SetTxtLeft(0);
-                aLR.SetTxtFirstLineOfst(0);
+                aLR.SetTextLeft(0);
+                aLR.SetTextFirstLineOfst(0);
 
                 // apply the modified SvxLRSpaceItem to the current paragraph
-                pTxtNode->SetAttr( aLR );
+                pTextNode->SetAttr( aLR );
             }
 
             m_nLFOPosition = USHRT_MAX;
@@ -2074,7 +2074,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
                         m_nListLevel = 0;
                     if (WW8ListManager::nMaxLevel > m_nListLevel)
                     {
-                        RegisterNumFmt(m_nLFOPosition, m_nListLevel);
+                        RegisterNumFormat(m_nLFOPosition, m_nListLevel);
                         m_nLFOPosition = USHRT_MAX;
                         m_nListLevel = WW8ListManager::nMaxLevel;
                     }
@@ -2319,7 +2319,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString,
     for (const CtrlFontMapEntry* pMap = aMapTable; pMap->nWhichId; ++pMap)
     {
         bool bSet = true;
-        const SfxPoolItem* pItem = GetFmtAttr( pMap->nWhichId );
+        const SfxPoolItem* pItem = GetFormatAttr( pMap->nWhichId );
         OSL_ENSURE(pItem, "Impossible");
         if (!pItem)
             continue;
@@ -2604,11 +2604,11 @@ bool SwMSConvertControls::InsertControl(
     aTmp <<= nTemp;
     xShapePropSet->setPropertyValue("VertOrient", aTmp );
 
-    uno::Reference< text::XText >  xDummyTxtRef;
-    uno::Reference< text::XTextRange >  xTxtRg =
-        new SwXTextRange( *pPaM, xDummyTxtRef );
+    uno::Reference< text::XText >  xDummyTextRef;
+    uno::Reference< text::XTextRange >  xTextRg =
+        new SwXTextRange( *pPaM, xDummyTextRef );
 
-    aTmp.setValue(&xTxtRg, cppu::UnoType<text::XTextRange>::get());
+    aTmp.setValue(&xTextRg, cppu::UnoType<text::XTextRange>::get());
     xShapePropSet->setPropertyValue("TextRange", aTmp );
 
     // Das Control-Model am Control-Shape setzen
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index cc6b92af8571..03b0278f4a8c 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -197,7 +197,7 @@ static bool SwWw6ReadMacPICTStream(Graphic& rGraph, tools::SvRef<SotStorage>& rS
     return SwWW8ImplReader::GetPictGrafFromStream(rGraph, *pStp);
 }
 
-SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject,
+SwFlyFrameFormat* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject,
     const SfxItemSet &rFlySet, const SfxItemSet &rGrfSet)
 {
     SfxObjectShell *pPersist = m_rDoc.GetPersist();
@@ -205,7 +205,7 @@ SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject,
     if (!pPersist)
         return 0;
 
-    SwFlyFrmFmt *pRet = 0;
+    SwFlyFrameFormat *pRet = 0;
 
     SfxItemSet *pMathFlySet = 0;
     uno::Reference < embed::XClassifiedObject > xClass( rObject.GetObjRef(), uno::UNO_QUERY );
@@ -244,11 +244,11 @@ SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject,
     return pRet;
 }
 
-SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
+SwFrameFormat* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
     const SfxItemSet* pFlySet, const SfxItemSet *pGrfSet, const Rectangle& aVisArea )
 {
     ::SetProgressState(m_nProgress, m_pDocShell);     // Update
-    SwFrmFmt* pFmt = 0;
+    SwFrameFormat* pFormat = 0;
 
     GrafikCtor();
 
@@ -266,18 +266,18 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
 
         // Abstand/Umrandung raus
         if (!m_bNewDoc)
-            Reader::ResetFrmFmtAttrs( *pTempSet );
+            Reader::ResetFrameFormatAttrs( *pTempSet );
 
-        SwFmtAnchor aAnchor( FLY_AS_CHAR );
+        SwFormatAnchor aAnchor( FLY_AS_CHAR );
         aAnchor.SetAnchor( m_pPaM->GetPoint() );
         pTempSet->Put( aAnchor );
 
         const Size aSizeTwip = OutputDevice::LogicToLogic(
             aGraph.GetPrefSize(), aGraph.GetPrefMapMode(), MAP_TWIP );
 
-        pTempSet->Put( SwFmtFrmSize( ATT_FIX_SIZE, aSizeTwip.Width(),
+        pTempSet->Put( SwFormatFrmSize( ATT_FIX_SIZE, aSizeTwip.Width(),
             aSizeTwip.Height() ) );
-        pTempSet->Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
+        pTempSet->Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
 
         if( m_pSFlyPara )
         {
@@ -291,22 +291,22 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
     {
         if (pRet->ISA(SdrOle2Obj))
         {
-            pFmt = InsertOle(*static_cast<SdrOle2Obj*>(pRet), *pFlySet, *pGrfSet);
+            pFormat = InsertOle(*static_cast<SdrOle2Obj*>(pRet), *pFlySet, *pGrfSet);
             SdrObject::Free( pRet );        // das brauchen wir nicht mehr
         }
         else
-            pFmt = m_rDoc.getIDocumentContentOperations().InsertDrawObj(*m_pPaM, *pRet, *pFlySet );
+            pFormat = m_rDoc.getIDocumentContentOperations().InsertDrawObj(*m_pPaM, *pRet, *pFlySet );
     }
     else if (
                 GRAPHIC_GDIMETAFILE == aGraph.GetType() ||
                 GRAPHIC_BITMAP == aGraph.GetType()
             )
     {
-        pFmt = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, OUString(), OUString(), &aGraph, pFlySet,
+        pFormat = m_rDoc.getIDocumentContentOperations().Insert(*m_pPaM, OUString(), OUString(), &aGraph, pFlySet,
             pGrfSet, NULL);
     }
     delete pTempSet;
-    return pFmt;
+    return pFormat;
 }
 
 bool SwWW8ImplReader::ImportOleWMF(tools::SvRef<SotStorage> xSrc1,GDIMetaFile &rWMF,
@@ -383,8 +383,8 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
 
     if (pFlySet)
     {
-        if (const SwFmtFrmSize* pSize =
-            static_cast<const SwFmtFrmSize*>(pFlySet->GetItem(RES_FRM_SIZE, false)))
+        if (const SwFormatFrmSize* pSize =
+            static_cast<const SwFormatFrmSize*>(pFlySet->GetItem(RES_FRM_SIZE, false)))
         {
             aRect.SetSize(pSize->GetSize());
         }
@@ -446,10 +446,10 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
 }
 
 void SwWW8ImplReader::ReadRevMarkAuthorStrTabl( SvStream& rStrm,
-    sal_Int32 nTblPos, sal_Int32 nTblSiz, SwDoc& rDocOut )
+    sal_Int32 nTablePos, sal_Int32 nTableSiz, SwDoc& rDocOut )
 {
     ::std::vector<OUString> aAuthorNames;
-    WW8ReadSTTBF( !m_bVer67, rStrm, nTblPos, nTblSiz, m_bVer67 ? 2 : 0,
+    WW8ReadSTTBF( !m_bVer67, rStrm, nTablePos, nTableSiz, m_bVer67 ? 2 : 0,
         m_eStructCharSet, aAuthorNames );
 
     sal_uInt16 nCount = static_cast< sal_uInt16 >(aAuthorNames.size());
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index a01a99e8ba0b..0d62c9a106ed 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -367,19 +367,19 @@ static SvxExtNumType GetNumberPara(const OUString& rStr, bool bAllowPageDesc = f
     return aType;
 }
 
-bool SwWW8ImplReader::ForceFieldLanguage(SwField &rFld, sal_uInt16 nLang)
+bool SwWW8ImplReader::ForceFieldLanguage(SwField &rField, sal_uInt16 nLang)
 {
     bool bRet(false);
 
     const SvxLanguageItem *pLang =
-        static_cast<const SvxLanguageItem*>(GetFmtAttr(RES_CHRATR_LANGUAGE));
+        static_cast<const SvxLanguageItem*>(GetFormatAttr(RES_CHRATR_LANGUAGE));
     OSL_ENSURE(pLang, "impossible");
     sal_uInt16 nDefault =  pLang ? pLang->GetValue() : LANGUAGE_ENGLISH_US;
 
     if (nLang != nDefault)
     {
-        rFld.SetAutomaticLanguage(false);
-        rFld.SetLanguage(nLang);
+        rField.SetAutomaticLanguage(false);
+        rField.SetLanguage(nLang);
         bRet = true;
     }
 
@@ -420,7 +420,7 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat,
             bRTL = true;
     }
     RES_CHRATR eLang = bRTL ? RES_CHRATR_CTL_LANGUAGE : RES_CHRATR_LANGUAGE;
-    const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFmtAttr( static_cast< sal_uInt16 >(eLang)));
+    const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFormatAttr( static_cast< sal_uInt16 >(eLang)));
     OSL_ENSURE(pLang, "impossible");
     rLang = pLang ? pLang->GetValue() : LANGUAGE_ENGLISH_US;
 
@@ -462,15 +462,15 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat,
         return bHasTime ? css::util::NumberFormat::DATETIME : css::util::NumberFormat::DATE;
     }
 
-    sal_uLong nFmtIdx =
+    sal_uLong nFormatIdx =
         sw::ms::MSDateTimeFormatToSwFormat(sParams, pFormatter, rLang, bHijri,
                 GetFib().lid);
-    short nNumFmtType = css::util::NumberFormat::UNDEFINED;
-    if (nFmtIdx)
-        nNumFmtType = pFormatter->GetType(nFmtIdx);
-    rFormat = nFmtIdx;
+    short nNumFormatType = css::util::NumberFormat::UNDEFINED;
+    if (nFormatIdx)
+        nNumFormatType = pFormatter->GetType(nFormatIdx);
+    rFormat = nFormatIdx;
 
-    return nNumFmtType;
+    return nNumFormatType;
 }
 
 //              Felder
@@ -478,14 +478,14 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat,
 // Am Ende des Einlesens entsprechende Felder updaten ( z.Zt. die Referenzen )
 void SwWW8ImplReader::UpdateFields()
 {
-    m_rDoc.getIDocumentState().SetUpdateExpFldStat(true);                 // JP: neu fuer alles wichtige
+    m_rDoc.getIDocumentState().SetUpdateExpFieldStat(true);                 // JP: neu fuer alles wichtige
     m_rDoc.SetInitDBFields(true);             // Datenbank-Felder auch
 }
 
 sal_uInt16 SwWW8ImplReader::End_Field()
 {
     sal_uInt16 nRet = 0;
-    WW8PLCFx_FLD* pF = m_pPlcxMan->GetFld();
+    WW8PLCFx_FLD* pF = m_pPlcxMan->GetField();
     OSL_ENSURE(pF, "WW8PLCFx_FLD - Pointer nicht da");
     WW8_CP nCP = 0;
     if (!pF || !pF->EndPosIsFieldEnd(nCP))
@@ -508,10 +508,10 @@ sal_uInt16 SwWW8ImplReader::End_Field()
         case 70:
         if (bUseEnhFields && m_pPaM!=NULL && m_pPaM->GetPoint()!=NULL) {
             SwPosition aEndPos = *m_pPaM->GetPoint();
-            SwPaM aFldPam( m_aFieldStack.back().GetPtNode(), m_aFieldStack.back().GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
+            SwPaM aFieldPam( m_aFieldStack.back().GetPtNode(), m_aFieldStack.back().GetPtContent(), aEndPos.nNode, aEndPos.nContent.GetIndex());
             IDocumentMarkAccess* pMarksAccess = m_rDoc.getIDocumentMarkAccess( );
             IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeFieldBookmark(
-                        aFldPam, m_aFieldStack.back().GetBookmarkName(), ODF_FORMTEXT ) );
+                        aFieldPam, m_aFieldStack.back().GetBookmarkName(), ODF_FORMTEXT ) );
             OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
             if (pFieldmark!=NULL) {
                 const IFieldmark::parameter_map_t& pParametersToAdd = m_aFieldStack.back().getParameters();
@@ -534,8 +534,8 @@ sal_uInt16 SwWW8ImplReader::End_Field()
                         m_aTOXEndCps.insert(nCP);
                         m_bLoadingTOXCache = false;
                         if ( m_pPaM->End() &&
-                             m_pPaM->End()->nNode.GetNode().GetTxtNode() &&
-                             m_pPaM->End()->nNode.GetNode().GetTxtNode()->Len() == 0 )
+                             m_pPaM->End()->nNode.GetNode().GetTextNode() &&
+                             m_pPaM->End()->nNode.GetNode().GetTextNode()->Len() == 0 )
                         {
                             JoinNode(*m_pPaM);
                         }
@@ -575,14 +575,14 @@ sal_uInt16 SwWW8ImplReader::End_Field()
                 {
                     // Unhandled field with stored code
                     SwPosition aEndPos = *m_pPaM->GetPoint();
-                    SwPaM aFldPam(
-                            m_aFieldStack.back().GetPtNode(), m_aFieldStack.back().GetPtCntnt(),
+                    SwPaM aFieldPam(
+                            m_aFieldStack.back().GetPtNode(), m_aFieldStack.back().GetPtContent(),
                             aEndPos.nNode, aEndPos.nContent.GetIndex());
 
                     IDocumentMarkAccess* pMarksAccess = m_rDoc.getIDocumentMarkAccess( );
 
                     IFieldmark* pFieldmark = pMarksAccess->makeFieldBookmark(
-                                aFldPam,
+                                aFieldPam,
                                 m_aFieldStack.back().GetBookmarkName(),
                                 ODF_UNHANDLED );
                     if ( pFieldmark )
@@ -816,7 +816,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
     OSL_ENSURE( ( sizeof( aWW8FieldTab ) / sizeof( *aWW8FieldTab ) == eMax+1 ),
             "FeldFunc-Tabelle stimmt nicht" );
 
-    WW8PLCFx_FLD* pF = m_pPlcxMan->GetFld();
+    WW8PLCFx_FLD* pF = m_pPlcxMan->GetField();
     OSL_ENSURE(pF, "WW8PLCFx_FLD - Pointer nicht da");
 
     if (!pF || !pF->StartPosIsFieldStart())
@@ -1050,20 +1050,20 @@ void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const OUString& rTag
 
     if( SwFltGetFlag(m_nFieldFlags, SwFltControlStack::TAGS_IN_TEXT))
     {
-        aName += rTagText;      // als Txt taggen
+        aName += rTagText;      // als Text taggen
         m_rDoc.getIDocumentContentOperations().InsertString(*m_pPaM, aName,
                 SwInsertFlags::NOHINTEXPAND);
     }
     else
     {                                                   // normal tagggen
 
-        SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFldType(
+        SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFieldType(
                                 SwSetExpFieldType( &m_rDoc, aName, nsSwGetSetExpType::GSE_STRING ) );
-        SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pFT), rTagText );                            // SUB_INVISIBLE
+        SwSetExpField aField( static_cast<SwSetExpFieldType*>(pFT), rTagText );                            // SUB_INVISIBLE
         sal_uInt16 nSubType = ( SwFltGetFlag( m_nFieldFlags, SwFltControlStack::TAGS_VISIBLE ) ) ? 0 : nsSwExtendedSubType::SUB_INVISIBLE;
-        aFld.SetSubType(nSubType | nsSwGetSetExpType::GSE_STRING);
+        aField.SetSubType(nSubType | nsSwGetSetExpType::GSE_STRING);
 
-        m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+        m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
     }
 }
 
@@ -1076,12 +1076,12 @@ long SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF )
     if( nL > MAX_FIELDLEN )
         nL = MAX_FIELDLEN;                  // MaxLaenge, durch Quoten
                                             // max. 4* so gross
-    OUString sFTxt;
-    nL = m_pSBase->WW8ReadString( *m_pStrm, sFTxt,
+    OUString sFText;
+    nL = m_pSBase->WW8ReadString( *m_pStrm, sFText,
                                 m_pPlcxMan->GetCpOfs() + nStart, nL, m_eStructCharSet);
 
     OUString aTagText;
-    MakeTagString( aTagText, sFTxt );
+    MakeTagString( aTagText, sFText );
     InsertTagField( pF->nId, aTagText );
 
     m_pStrm->Seek( nOldPos );
@@ -1118,9 +1118,9 @@ eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, OUString& rStr )
 
     if ( pF->nId != 0x01 ) // 0x01 fields have no result
     {
-        SwInputField aFld( static_cast<SwInputFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )),
+        SwInputField aField( static_cast<SwInputFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_INPUTFLD )),
                             aDef, aQ, INP_TXT, 0, false );
-        m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+        m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
     }
 
     return FLD_OK;
@@ -1229,23 +1229,23 @@ can be left as references, because a bookmark is also inserted at the position
 of a set or ask field, either by word, or in some special cases by the import
 filter itself.
 */
-SwFltStackEntry *SwWW8FltRefStack::RefToVar(const SwField* pFld,
+SwFltStackEntry *SwWW8FltRefStack::RefToVar(const SwField* pField,
     SwFltStackEntry &rEntry)
 {
     SwFltStackEntry *pRet=0;
-    if (pFld && RES_GETREFFLD == pFld->Which())
+    if (pField && RES_GETREFFLD == pField->Which())
     {
         //Get the name of the ref field, and see if actually a variable
-        const OUString sName = pFld->GetPar1();
+        const OUString sName = pField->GetPar1();
         ::std::map<OUString, OUString, SwWW8::ltstr>::const_iterator
             aResult = aFieldVarNames.find(sName);
 
         if (aResult != aFieldVarNames.end())
         {
-            SwGetExpField aFld( static_cast<SwGetExpFieldType*>(
-                pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_GETEXPFLD)), sName, nsSwGetSetExpType::GSE_STRING, 0);
+            SwGetExpField aField( static_cast<SwGetExpFieldType*>(
+                pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_GETEXPFLD)), sName, nsSwGetSetExpType::GSE_STRING, 0);
             delete rEntry.pAttr;
-            SwFmtFld aTmp(aFld);
+            SwFormatField aTmp(aField);
             rEntry.pAttr = aTmp.Clone();
             pRet = &rEntry;
         }
@@ -1311,14 +1311,14 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, OUString& rStr )
 
     const long nNo = MapBookmarkVariables(pF, sOrigName, aResult);
 
-    SwSetExpFieldType* pFT = static_cast<SwSetExpFieldType*>(m_rDoc.getIDocumentFieldsAccess().InsertFldType(
+    SwSetExpFieldType* pFT = static_cast<SwSetExpFieldType*>(m_rDoc.getIDocumentFieldsAccess().InsertFieldType(
         SwSetExpFieldType(&m_rDoc, sOrigName, nsSwGetSetExpType::GSE_STRING)));
-    SwSetExpField aFld(pFT, aResult);
-    aFld.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE | nsSwGetSetExpType::GSE_STRING);
-    aFld.SetInputFlag(true);
-    aFld.SetPromptText( aQ );
+    SwSetExpField aField(pFT, aResult);
+    aField.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE | nsSwGetSetExpType::GSE_STRING);
+    aField.SetInputFlag(true);
+    aField.SetPromptText( aQ );
 
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
 
     m_pReffedStck->SetAttr(*m_pPaM->GetPoint(), RES_FLTR_BOOKMARK, true, nNo);
     return FLD_OK;
@@ -1327,14 +1327,14 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, OUString& rStr )
 // "AUTONR"
 eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, OUString& rStr )
 {
-    if( !m_pNumFldType ){     // 1. Mal
+    if( !m_pNumFieldType ){     // 1. Mal
         SwSetExpFieldType aT( &m_rDoc, OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ );
-        m_pNumFldType = m_rDoc.getIDocumentFieldsAccess().InsertFldType( aT );
+        m_pNumFieldType = m_rDoc.getIDocumentFieldsAccess().InsertFieldType( aT );
     }
-    SwSetExpField aFld( static_cast<SwSetExpFieldType*>(m_pNumFldType), OUString(),
+    SwSetExpField aField( static_cast<SwSetExpFieldType*>(m_pNumFieldType), OUString(),
                         GetNumberPara( rStr ) );
-    aFld.SetValue( ++m_nFldNum );
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+    aField.SetValue( ++m_nFieldNum );
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
     return FLD_OK;
 }
 
@@ -1398,20 +1398,20 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, OUString& rStr )
     if (aSequenceName.isEmpty() && aBook.isEmpty())
         return FLD_TAGIGN;
 
-    SwSetExpFieldType* pFT = static_cast<SwSetExpFieldType*>(m_rDoc.getIDocumentFieldsAccess().InsertFldType(
+    SwSetExpFieldType* pFT = static_cast<SwSetExpFieldType*>(m_rDoc.getIDocumentFieldsAccess().InsertFieldType(
                         SwSetExpFieldType( &m_rDoc, aSequenceName, nsSwGetSetExpType::GSE_SEQ ) ) );
-    SwSetExpField aFld( pFT, OUString(), eNumFormat );
+    SwSetExpField aField( pFT, OUString(), eNumFormat );
 
     //#i120654# Add bHidden for /h flag (/h: Hide the field result.)
     if (bHidden)
-        aFld.SetSubType(aFld.GetSubType() | nsSwExtendedSubType::SUB_INVISIBLE);
+        aField.SetSubType(aField.GetSubType() | nsSwExtendedSubType::SUB_INVISIBLE);
 
     if (!sStart.isEmpty())
-        aFld.SetFormula( ( aSequenceName += "=" ) += sStart );
+        aField.SetFormula( ( aSequenceName += "=" ) += sStart );
     else if (!bCountOn)
-        aFld.SetFormula(aSequenceName);
+        aField.SetFormula(aSequenceName);
 
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField(aField));
     return FLD_OK;
 }
 
@@ -1499,12 +1499,12 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
             = "REVISIONNUMBER";
         static const sal_Char* aName54 // Spanish
             = "SNUBBEL BUBBEL";
-        static const sal_uInt16 nFldCnt  = 5;
+        static const sal_uInt16 nFieldCnt  = 5;
 
         // additional fields are to be coded soon!   :-)
 
         static const sal_uInt16 nLangCnt = 4;
-        static const sal_Char *aNameSet_26[nFldCnt][nLangCnt+1] =
+        static const sal_Char *aNameSet_26[nFieldCnt][nLangCnt+1] =
         {
             {aName10, aName11, aName12, aName13, aName14},
             {aName20, aName21, aName22, aName23, aName24},
@@ -1513,26 +1513,26 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
             {aName50, aName51, aName52, aName53, aName54}
         };
 
-        bool bFldFound= false;
+        bool bFieldFound= false;
         sal_uInt16 nFIdx;
-        for(sal_uInt16 nLIdx=1; !bFldFound && (nLangCnt > nLIdx); ++nLIdx)
+        for(sal_uInt16 nLIdx=1; !bFieldFound && (nLangCnt > nLIdx); ++nLIdx)
         {
-            for(nFIdx = 0;  !bFldFound && (nFldCnt  > nFIdx); ++nFIdx)
+            for(nFIdx = 0;  !bFieldFound && (nFieldCnt  > nFIdx); ++nFIdx)
             {
                 if( aDocProperty == OUString( aNameSet_26[nFIdx][nLIdx], strlen(aNameSet_26[nFIdx][nLIdx]),
                                               RTL_TEXTENCODING_MS_1252 ) )
                 {
-                    bFldFound = true;
+                    bFieldFound = true;
                     pF->nId   = aNameSet_26[nFIdx][0][0];
                 }
             }
         }
 
-        if( !bFldFound )
+        if( !bFieldFound )
         {
-            SwDocInfoField aFld( static_cast<SwDocInfoFieldType*>(
-                m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )), DI_CUSTOM|nReg, aDocProperty, GetFieldResult( pF ) );
-            m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
+            SwDocInfoField aField( static_cast<SwDocInfoFieldType*>(
+                m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_DOCINFOFLD )), DI_CUSTOM|nReg, aDocProperty, GetFieldResult( pF ) );
+            m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField(aField));
 
             return FLD_OK;
         }
@@ -1637,11 +1637,11 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
         aData = comphelper::string::remove(aData, '"');
     }
 
-    SwDocInfoField aFld( static_cast<SwDocInfoFieldType*>(
-        m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )), nSub|nReg, aData, nFormat );
+    SwDocInfoField aField( static_cast<SwDocInfoFieldType*>(
+        m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_DOCINFOFLD )), nSub|nReg, aData, nFormat );
     if (bDateTime)
-        ForceFieldLanguage(aFld, nLang);
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
+        ForceFieldLanguage(aField, nLang);
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField(aField));
 
     return FLD_OK;
 }
@@ -1650,18 +1650,18 @@ eF_ResT SwWW8ImplReader::Read_F_Author( WW8FieldDesc*, OUString& )
 {
         // SH: Das SwAuthorField bezeichnet nicht den urspruenglichen
         // Autor, sondern den aktuellen Benutzer, also besser ueber DocInfo
-    SwDocInfoField aFld( static_cast<SwDocInfoFieldType*>(
-                     m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )),
+    SwDocInfoField aField( static_cast<SwDocInfoFieldType*>(
+                     m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_DOCINFOFLD )),
                      DI_CREATE|DI_SUB_AUTHOR, OUString() );
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
     return FLD_OK;
 }
 
 eF_ResT SwWW8ImplReader::Read_F_TemplName( WW8FieldDesc*, OUString& )
 {
-    SwTemplNameField aFld( static_cast<SwTemplNameFieldType*>(
-                     m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_TEMPLNAMEFLD )), FF_NAME );
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+    SwTemplNameField aField( static_cast<SwTemplNameFieldType*>(
+                     m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_TEMPLNAMEFLD )), FF_NAME );
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
     return FLD_OK;
 }
 
@@ -1714,17 +1714,17 @@ eF_ResT SwWW8ImplReader::Read_F_DateTime( WW8FieldDesc*pF, OUString& rStr )
 
     if (nDT & css::util::NumberFormat::DATE)
     {
-        SwDateTimeField aFld(static_cast<SwDateTimeFieldType*>(
-            m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD )), DATEFLD, nFormat);
-        ForceFieldLanguage(aFld, nLang);
-        m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+        SwDateTimeField aField(static_cast<SwDateTimeFieldType*>(
+            m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_DATETIMEFLD )), DATEFLD, nFormat);
+        ForceFieldLanguage(aField, nLang);
+        m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
     }
     else if (nDT == css::util::NumberFormat::TIME)
     {
-        SwDateTimeField aFld(static_cast<SwDateTimeFieldType*>(
-            m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD)), TIMEFLD, nFormat);
-        ForceFieldLanguage(aFld, nLang);
-        m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+        SwDateTimeField aField(static_cast<SwDateTimeFieldType*>(
+            m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_DATETIMEFLD)), TIMEFLD, nFormat);
+        ForceFieldLanguage(aField, nLang);
+        m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
     }
 
     return FLD_OK;
@@ -1754,9 +1754,9 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, OUString &rStr)
         }
     }
 
-    SwFileNameField aFld(
-        static_cast<SwFileNameFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_FILENAMEFLD)), eType);
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
+    SwFileNameField aField(
+        static_cast<SwFileNameFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_FILENAMEFLD)), eType);
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField(aField));
     return FLD_OK;
 }
 
@@ -1767,21 +1767,21 @@ eF_ResT SwWW8ImplReader::Read_F_Anz( WW8FieldDesc* pF, OUString& rStr )
         case 27: nSub = DS_WORD; break;         // number of words
         case 28: nSub = DS_CHAR; break;         // number of characters
     }
-    SwDocStatField aFld( static_cast<SwDocStatFieldType*>(
-                         m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCSTATFLD )), nSub,
+    SwDocStatField aField( static_cast<SwDocStatFieldType*>(
+                         m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_DOCSTATFLD )), nSub,
                          GetNumberPara( rStr ) );
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
     return FLD_OK;
 }
 
 eF_ResT SwWW8ImplReader::Read_F_CurPage( WW8FieldDesc*, OUString& rStr )
 {
     // page number
-    SwPageNumberField aFld( static_cast<SwPageNumberFieldType*>(
-        m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_PAGENUMBERFLD )), PG_RANDOM,
+    SwPageNumberField aField( static_cast<SwPageNumberFieldType*>(
+        m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_PAGENUMBERFLD )), PG_RANDOM,
         GetNumberPara(rStr, true));
 
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
     return FLD_OK;
 }
 
@@ -1905,12 +1905,12 @@ eF_ResT SwWW8ImplReader::Read_F_Set( WW8FieldDesc* pF, OUString& rStr )
 
     const long nNo = MapBookmarkVariables(pF, sOrigName, sVal);
 
-    SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFldType( SwSetExpFieldType( &m_rDoc, sOrigName,
+    SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFieldType( SwSetExpFieldType( &m_rDoc, sOrigName,
         nsSwGetSetExpType::GSE_STRING ) );
-    SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pFT), sVal, ULONG_MAX );
-    aFld.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE | nsSwGetSetExpType::GSE_STRING);
+    SwSetExpField aField( static_cast<SwSetExpFieldType*>(pFT), sVal, ULONG_MAX );
+    aField.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE | nsSwGetSetExpType::GSE_STRING);
 
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
 
     m_pReffedStck->SetAttr(*m_pPaM->GetPoint(), RES_FLTR_BOOKMARK, true, nNo);
 
@@ -1978,8 +1978,8 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*, OUString& rStr )
         m_pReffedStck->aReferencedTOCBookmarks.insert( sBkmName );
     }
 
-    SwGetRefField aFld(
-        static_cast<SwGetRefFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )),
+    SwGetRefField aField(
+        static_cast<SwGetRefFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_GETREFFLD )),
         sBkmName,REF_BOOKMARK,0,eFormat);
 
     if (eFormat == REF_CONTENT)
@@ -1990,12 +1990,12 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*, OUString& rStr )
         must store it until the end of the document to see if it was,
         in which case we'll turn it into a show variable
         */
-        m_pReffingStck->NewAttr( *m_pPaM->GetPoint(), SwFmtFld(aFld) );
+        m_pReffingStck->NewAttr( *m_pPaM->GetPoint(), SwFormatField(aField) );
         m_pReffingStck->SetAttr( *m_pPaM->GetPoint(), RES_TXTATR_FIELD);
     }
     else
     {
-        m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
+        m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField(aField));
     }
     return FLD_OK;
 }
@@ -2034,17 +2034,17 @@ eF_ResT SwWW8ImplReader::Read_F_NoteReference( WW8FieldDesc*, OUString& rStr )
 
     // set Sequence No of corresponding Foot-/Endnote to Zero
     // (will be corrected in
-    SwGetRefField aFld( static_cast<SwGetRefFieldType*>(
-        m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )), aBkmName, REF_FOOTNOTE, 0,
+    SwGetRefField aField( static_cast<SwGetRefFieldType*>(
+        m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_GETREFFLD )), aBkmName, REF_FOOTNOTE, 0,
         REF_ONLYNUMBER );
-    m_pReffingStck->NewAttr(*m_pPaM->GetPoint(), SwFmtFld(aFld));
+    m_pReffingStck->NewAttr(*m_pPaM->GetPoint(), SwFormatField(aField));
     m_pReffingStck->SetAttr(*m_pPaM->GetPoint(), RES_TXTATR_FIELD);
     if (bAboveBelow)
     {
-        SwGetRefField aFld2( static_cast<SwGetRefFieldType*>(
-            m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )),aBkmName, REF_FOOTNOTE, 0,
+        SwGetRefField aField2( static_cast<SwGetRefFieldType*>(
+            m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_GETREFFLD )),aBkmName, REF_FOOTNOTE, 0,
             REF_UPDOWN );
-        m_pReffingStck->NewAttr(*m_pPaM->GetPoint(), SwFmtFld(aFld2));
+        m_pReffingStck->NewAttr(*m_pPaM->GetPoint(), SwFormatField(aField2));
         m_pReffingStck->SetAttr(*m_pPaM->GetPoint(), RES_TXTATR_FIELD);
     }
     return FLD_OK;
@@ -2091,12 +2091,12 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr )
             }
             OUString sURL = "#" + sBookmarkName;
             const OUString sTarget;
-            SwFmtINetFmt aURL( sURL, sTarget );
+            SwFormatINetFormat aURL( sURL, sTarget );
             const OUString sLinkStyle("Index Link");
             const sal_uInt16 nPoolId =
                 SwStyleNameMapper::GetPoolIdFromUIName( sLinkStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
-            aURL.SetVisitedFmtAndId( sLinkStyle, nPoolId);
-            aURL.SetINetFmtAndId( sLinkStyle, nPoolId );
+            aURL.SetVisitedFormatAndId( sLinkStyle, nPoolId);
+            aURL.SetINetFormatAndId( sLinkStyle, nPoolId );
             m_pCtrlStck->NewAttr( *m_pPaM->GetPoint(), aURL );
         }
         return FLD_TEXT;
@@ -2115,9 +2115,9 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr )
     {
         sPageRefBookmarkName = sName;
     }
-    SwGetRefField aFld( static_cast<SwGetRefFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )),
+    SwGetRefField aField( static_cast<SwGetRefFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_GETREFFLD )),
                         sPageRefBookmarkName, REF_BOOKMARK, 0, REF_PAGE );
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
 
     return FLD_OK;
 }
@@ -2194,13 +2194,13 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr)
     bool bApplyWingdings = ConvertMacroSymbol( aName, aVText );
     aName = "StarOffice.Standard.Modul1." + aName;
 
-    SwMacroField aFld( static_cast<SwMacroFieldType*>(
-                    m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_MACROFLD )), aName, aVText );
+    SwMacroField aField( static_cast<SwMacroFieldType*>(
+                    m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_MACROFLD )), aName, aVText );
 
     if( !bApplyWingdings )
     {
 
-        m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+        m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
         WW8_CP nOldCp = m_pPlcxMan->Where();
         WW8_CP nCp = nOldCp + nOffset;
 
@@ -2232,7 +2232,7 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr)
         {
 
             SetNewFontAttr( i, true, RES_CHRATR_FONT );
-            m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+            m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
             m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_FONT );
             ResetCharSetVars();
         }
@@ -2309,7 +2309,7 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, OUString& rStr )
         /*
             Besonderheit:
 
-            Wir setzen jetzt den Link ins Doc und merken uns den SwFlyFrmFmt.
+            Wir setzen jetzt den Link ins Doc und merken uns den SwFlyFrameFormat.
             Da wir ja unten auf jjeden Fall mit Return-Wert FLD_READ_FSPA enden,
             wird der Skip-Wert so bemessen, dass das folgende Char-1 eingelesen
             wird.
@@ -2319,15 +2319,15 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, OUString& rStr )
         */
         SfxItemSet aFlySet( m_rDoc.GetAttrPool(), RES_FRMATR_BEGIN,
             RES_FRMATR_END-1 );
-        aFlySet.Put( SwFmtAnchor( FLY_AS_CHAR ) );
-        aFlySet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
-        m_pFlyFmtOfJustInsertedGraphic = m_rDoc.getIDocumentContentOperations().Insert( *m_pPaM,
+        aFlySet.Put( SwFormatAnchor( FLY_AS_CHAR ) );
+        aFlySet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
+        m_pFlyFormatOfJustInsertedGraphic = m_rDoc.getIDocumentContentOperations().Insert( *m_pPaM,
                                                     aGrfName,
                                                     OUString(),
                                                     0,          // Graphic*
                                                     &aFlySet,
-                                                    0, 0);         // SwFrmFmt*
-        m_aGrfNameGenerator.SetUniqueGraphName(m_pFlyFmtOfJustInsertedGraphic,
+                                                    0, 0);         // SwFrameFormat*
+        m_aGrfNameGenerator.SetUniqueGraphName(m_pFlyFormatOfJustInsertedGraphic,
             INetURLObject(aGrfName).GetBase());
     }
     return FLD_READ_FSPA;
@@ -2393,13 +2393,13 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* /*pF*/, OUString& rSt
     OSL_ENSURE(pSection, "no section inserted");
     if (!pSection)
         return FLD_TEXT;
-    const SwSectionNode* pSectionNode = pSection->GetFmt()->GetSectionNode();
+    const SwSectionNode* pSectionNode = pSection->GetFormat()->GetSectionNode();
     OSL_ENSURE(pSectionNode, "no section node!");
     if (!pSectionNode)
         return FLD_TEXT;
 
     m_pPaM->GetPoint()->nNode = pSectionNode->GetIndex()+1;
-    m_pPaM->GetPoint()->nContent.Assign(m_pPaM->GetCntntNode(), 0 );
+    m_pPaM->GetPoint()->nContent.Assign(m_pPaM->GetContentNode(), 0 );
 
     //we have inserted a section before this point, so adjust pos
     //for future page/section segment insertion
@@ -2432,9 +2432,9 @@ eF_ResT SwWW8ImplReader::Read_F_DBField( WW8FieldDesc* pF, OUString& rStr )
     }
     SwDBFieldType aD( &m_rDoc, aName, SwDBData() );   // Datenbank: Nichts
 
-    SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFldType( aD );
-    SwDBField aFld( static_cast<SwDBFieldType*>(pFT) );
-    aFld.SetFieldCode( rStr );
+    SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFieldType( aD );
+    SwDBField aField( static_cast<SwDBFieldType*>(pFT) );
+    aField.SetFieldCode( rStr );
 
     OUString aResult;
     m_pSBase->WW8ReadString( *m_pStrm, aResult, m_pPlcxMan->GetCpOfs()+
@@ -2442,9 +2442,9 @@ eF_ResT SwWW8ImplReader::Read_F_DBField( WW8FieldDesc* pF, OUString& rStr )
 
     aResult = aResult.replace( '\xb', '\n' );
 
-    aFld.InitContent(aResult);
+    aField.InitContent(aResult);
 
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld( aFld ));
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField( aField ));
 #endif
     return FLD_OK;
 }
@@ -2454,10 +2454,10 @@ eF_ResT SwWW8ImplReader::Read_F_DBNext( WW8FieldDesc*, OUString& )
 {
 #if HAVE_FEATURE_DBCONNECTIVITY
     SwDBNextSetFieldType aN;
-    SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFldType( aN );
-    SwDBNextSetField aFld( static_cast<SwDBNextSetFieldType*>(pFT), OUString(), OUString(),
+    SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFieldType( aN );
+    SwDBNextSetField aField( static_cast<SwDBNextSetFieldType*>(pFT), OUString(), OUString(),
                             SwDBData() );       // Datenbank: Nichts
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
 #endif
     return FLD_OK;
 }
@@ -2467,10 +2467,10 @@ eF_ResT SwWW8ImplReader::Read_F_DBNum( WW8FieldDesc*, OUString& )
 {
 #if HAVE_FEATURE_DBCONNECTIVITY
     SwDBSetNumberFieldType aN;
-    SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFldType( aN );
-    SwDBSetNumberField aFld( static_cast<SwDBSetNumberFieldType*>(pFT),
+    SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFieldType( aN );
+    SwDBSetNumberField aField( static_cast<SwDBSetNumberFieldType*>(pFT),
                            SwDBData() );            // Datenbank: Nichts
-    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) );
+    m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
 #endif
     return FLD_OK;
 }
@@ -2494,15 +2494,15 @@ eF_ResT SwWW8ImplReader::Read_F_Equation( WW8FieldDesc*, OUString& rStr )
 
         if (aResult.sType == "Input")
         {
-            SwInputField aFld( static_cast<SwInputFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_INPUTFLD )),
+            SwInputField aField( static_cast<SwInputFieldType*>(m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_INPUTFLD )),
                 aResult.sResult, aResult.sResult, INP_TXT, 0 );
-            m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFmtFld( aFld ) ); // insert input field
+            m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) ); // insert input field
         }
         else if (aResult.sType == "CombinedCharacters")
         {
-            SwCombinedCharField aFld(static_cast<SwCombinedCharFieldType*>(
-                m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_COMBINED_CHARS)), aResult.sType);
-            m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFmtFld(aFld));
+            SwCombinedCharField aField(static_cast<SwCombinedCharFieldType*>(
+                m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_COMBINED_CHARS)), aResult.sType);
+            m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField(aField));
         }
     }
     else if ('*' == cChar)
@@ -2616,8 +2616,8 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
                 break;
         }
 
-        SwFmtRuby aRuby(sRuby);
-        const SwCharFmt *pCharFmt=0;
+        SwFormatRuby aRuby(sRuby);
+        const SwCharFormat *pCharFormat=0;
         //Make a guess at which of asian of western we should be setting
         sal_uInt16 nScript;
         if (g_pBreakIt->GetBreakIter().is())
@@ -2626,10 +2626,10 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
             nScript = i18n::ScriptType::ASIAN;
 
         //Check to see if we already have a ruby charstyle that this fits
-        std::vector<const SwCharFmt*>::const_iterator aEnd =
-            m_aRubyCharFmts.end();
-        for(std::vector<const SwCharFmt*>::const_iterator aIter
-            = m_aRubyCharFmts.begin(); aIter != aEnd; ++aIter)
+        std::vector<const SwCharFormat*>::const_iterator aEnd =
+            m_aRubyCharFormats.end();
+        for(std::vector<const SwCharFormat*>::const_iterator aIter
+            = m_aRubyCharFormats.begin(); aIter != aEnd; ++aIter)
         {
             const SvxFontHeightItem &rFH =
                 ItemGet<SvxFontHeightItem>(*(*aIter),
@@ -2640,35 +2640,35 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
                     GetWhichOfScript(RES_CHRATR_FONT,nScript));
                 if (rF.GetFamilyName().equals(sFontName))
                 {
-                    pCharFmt=*aIter;
+                    pCharFormat=*aIter;
                     break;
                 }
             }
         }
 
         //Create a new char style if necessary
-        if (!pCharFmt)
+        if (!pCharFormat)
         {
-            SwCharFmt *pFmt=0;
+            SwCharFormat *pFormat=0;
             OUString aNm;
             //Take this as the base name
             SwStyleNameMapper::FillUIName(RES_POOLCHR_RUBYTEXT,aNm);
-            aNm+=OUString::number(m_aRubyCharFmts.size()+1);
-            pFmt = m_rDoc.MakeCharFmt(aNm, m_rDoc.GetDfltCharFmt());
+            aNm+=OUString::number(m_aRubyCharFormats.size()+1);
+            pFormat = m_rDoc.MakeCharFormat(aNm, m_rDoc.GetDfltCharFormat());
             SvxFontHeightItem aHeightItem(nFontSize*10, 100, RES_CHRATR_FONTSIZE);
             SvxFontItem aFontItem(FAMILY_DONTKNOW,sFontName,
                 OUString(), PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT);
             aHeightItem.SetWhich(GetWhichOfScript(RES_CHRATR_FONTSIZE,nScript));
             aFontItem.SetWhich(GetWhichOfScript(RES_CHRATR_FONT,nScript));
-            pFmt->SetFmtAttr(aHeightItem);
-            pFmt->SetFmtAttr(aFontItem);
-            m_aRubyCharFmts.push_back(pFmt);
-            pCharFmt = pFmt;
+            pFormat->SetFormatAttr(aHeightItem);
+            pFormat->SetFormatAttr(aFontItem);
+            m_aRubyCharFormats.push_back(pFormat);
+            pCharFormat = pFormat;
         }
 
         //Set the charstyle and justification
-        aRuby.SetCharFmtName(pCharFmt->GetName());
-        aRuby.SetCharFmtId(pCharFmt->GetPoolFmtId());
+        aRuby.SetCharFormatName(pCharFormat->GetName());
+        aRuby.SetCharFormatId(pCharFormat->GetPoolFormatId());
         aRuby.SetAdjustment(nJustificationCode);
 
         NewAttr(aRuby);
@@ -2738,7 +2738,7 @@ static void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase,
             }
             if( -1 == nIndex )
             {
-                const SwFmt* pStyle = rReader.GetStyleWithOrgWWName(sTemplate);
+                const SwFormat* pStyle = rReader.GetStyleWithOrgWWName(sTemplate);
                 if( pStyle )
                     sTemplate = pStyle->GetName();
                 // Store Style for Level 0 into TOXBase
@@ -2760,7 +2760,7 @@ static void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase,
                 {
                     nLevel--;
                     // Store Style and Level into TOXBase
-                    const SwFmt* pStyle
+                    const SwFormat* pStyle
                             = rReader.GetStyleWithOrgWWName( sTemplate );
 
                     if( pStyle )
@@ -3190,8 +3190,8 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
                                 if (rSI.IsOutlineNumbered())
                                 {
                                     sal_uInt16 nStyleLevel = rSI.mnWW8OutlineLevel;
-                                    const SwNumFmt& rFmt = rSI.GetOutlineNumrule()->Get( nStyleLevel );
-                                    if ( SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType() )
+                                    const SwNumFormat& rFormat = rSI.GetOutlineNumrule()->Get( nStyleLevel );
+                                    if ( SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType() )
                                     {
                                         ++nStyleLevel;
 
@@ -3276,21 +3276,21 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
 
     //#i10028# inserting a toc implicltly acts like a parabreak in word and writer
     if ( m_pPaM->End() &&
-         m_pPaM->End()->nNode.GetNode().GetTxtNode() &&
-         m_pPaM->End()->nNode.GetNode().GetTxtNode()->Len() != 0 )
+         m_pPaM->End()->nNode.GetNode().GetTextNode() &&
+         m_pPaM->End()->nNode.GetNode().GetTextNode()->Len() != 0 )
     {
         m_bCareFirstParaEndInToc = true;
     }
 
     if (m_pPaM->GetPoint()->nContent.GetIndex())
-        AppendTxtNode(*m_pPaM->GetPoint());
+        AppendTextNode(*m_pPaM->GetPoint());
 
     const SwPosition* pPos = m_pPaM->GetPoint();
 
     SwFltTOX aFltTOX( pBase, nIndexCols );
 
     // test if there is already a break item on this node
-    if(SwCntntNode* pNd = pPos->nNode.GetNode().GetCntntNode())
+    if(SwContentNode* pNd = pPos->nNode.GetNode().GetContentNode())
     {
         const SfxItemSet* pSet = pNd->GetpSwAttrSet();
         if( pSet )
@@ -3331,7 +3331,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
         {
             // Set the column number for index
             SfxItemSet aSet( m_rDoc.GetAttrPool(), RES_COL, RES_COL );
-            SwFmtCol aCol;
+            SwFormatCol aCol;
             aCol.Init( nIndexCols, 708, USHRT_MAX );
             aSet.Put( aCol );
             pBase2->SetAttrSet( aSet );
@@ -3438,15 +3438,15 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, OUString& rStr
     if( !sMark.isEmpty() )
         ( sURL += "#" ) += sMark;
 
-    SwFmtINetFmt aURL(sURL, sTarget);
+    SwFormatINetFormat aURL(sURL, sTarget);
     // If on loading TOC field, change the default style into the "index link"
     if (m_bLoadingTOXCache)
     {
         OUString sLinkStyle("Index Link");
         sal_uInt16 nPoolId =
             SwStyleNameMapper::GetPoolIdFromUIName( sLinkStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
-        aURL.SetVisitedFmtAndId( sLinkStyle, nPoolId );
-        aURL.SetINetFmtAndId( sLinkStyle, nPoolId );
+        aURL.SetVisitedFormatAndId( sLinkStyle, nPoolId );
+        aURL.SetINetFormatAndId( sLinkStyle, nPoolId );
     }
 
     //As an attribute this needs to be closed, and that'll happen from
@@ -3463,7 +3463,7 @@ static void lcl_ImportTox(SwDoc &rDoc, SwPaM &rPaM, const OUString &rStr, bool b
 
     sal_uInt16 nLevel = 1;
 
-    OUString sFldTxt;
+    OUString sFieldText;
     WW8ReadFieldParams aReadParam(rStr);
     for (;;)
     {
@@ -3473,10 +3473,10 @@ static void lcl_ImportTox(SwDoc &rDoc, SwPaM &rPaM, const OUString &rStr, bool b
         switch( nRet )
         {
         case -2:
-            if( sFldTxt.isEmpty() )
+            if( sFieldText.isEmpty() )
             {
                 // PrimaryKey ohne ":", 2nd dahinter
-                sFldTxt = aReadParam.GetResult();
+                sFieldText = aReadParam.GetResult();
             }
             break;
 
@@ -3512,23 +3512,23 @@ static void lcl_ImportTox(SwDoc &rDoc, SwPaM &rPaM, const OUString &rStr, bool b
         aM.SetLevel( nLevel );
     else
     {
-        sal_Int32 nFnd = sFldTxt.indexOf( WW8_TOX_LEVEL_DELIM );
+        sal_Int32 nFnd = sFieldText.indexOf( WW8_TOX_LEVEL_DELIM );
         if( -1 != nFnd )  // it exist levels
         {
-            aM.SetPrimaryKey( sFldTxt.copy( 0, nFnd ) );
-            sal_Int32 nScndFnd = sFldTxt.indexOf( WW8_TOX_LEVEL_DELIM, nFnd+1 );
+            aM.SetPrimaryKey( sFieldText.copy( 0, nFnd ) );
+            sal_Int32 nScndFnd = sFieldText.indexOf( WW8_TOX_LEVEL_DELIM, nFnd+1 );
             if( -1 != nScndFnd )
             {
-                aM.SetSecondaryKey(  sFldTxt.copy( nFnd+1, nScndFnd - nFnd - 1 ));
+                aM.SetSecondaryKey(  sFieldText.copy( nFnd+1, nScndFnd - nFnd - 1 ));
                 nFnd = nScndFnd;
             }
-            sFldTxt = sFldTxt.copy( nFnd+1 );
+            sFieldText = sFieldText.copy( nFnd+1 );
         }
     }
 
-    if (!sFldTxt.isEmpty())
+    if (!sFieldText.isEmpty())
     {
-        aM.SetAlternativeText( sFldTxt );
+        aM.SetAlternativeText( sFieldText );
         rDoc.getIDocumentContentOperations().InsertPoolItem( rPaM, aM );
     }
 }
@@ -3538,13 +3538,13 @@ void sw::ms::ImportXE(SwDoc &rDoc, SwPaM &rPaM, const OUString &rStr)
     lcl_ImportTox(rDoc, rPaM, rStr, true);
 }
 
-void SwWW8ImplReader::ImportTox( int nFldId, const OUString& aStr )
+void SwWW8ImplReader::ImportTox( int nFieldId, const OUString& aStr )
 {
-    bool bIdx = (nFldId != 9);
+    bool bIdx = (nFieldId != 9);
     lcl_ImportTox(m_rDoc, *m_pPaM, aStr, bIdx);
 }
 
-void SwWW8ImplReader::Read_FldVanish( sal_uInt16, const sal_uInt8*, short nLen )
+void SwWW8ImplReader::Read_FieldVanish( sal_uInt16, const sal_uInt8*, short nLen )
 {
     //Meaningless in a style
     if (m_pAktColl || !m_pPlcxMan)
@@ -3553,9 +3553,9 @@ void SwWW8ImplReader::Read_FldVanish( sal_uInt16, const sal_uInt8*, short nLen )
     const int nChunk = 64;  //number of characters to read at one time
 
     // Vorsicht: Bei Feldnamen mit Umlauten geht das MEMICMP nicht!
-    const static sal_Char *aFldNames[] = {  "\x06""INHALT", "\x02""XE", // dt.
+    const static sal_Char *aFieldNames[] = {  "\x06""INHALT", "\x02""XE", // dt.
                                             "\x02""TC"  };              // us
-    const static sal_uInt8  aFldId[] = { 9, 4, 9 };
+    const static sal_uInt8  aFieldId[] = { 9, 4, 9 };
 
     if( nLen < 0 )
     {
@@ -3623,11 +3623,11 @@ void SwWW8ImplReader::Read_FldVanish( sal_uInt16, const sal_uInt8*, short nLen )
 
     for( int i = 0; i < 3; i++ )
     {
-        const sal_Char* pName = aFldNames[i];
+        const sal_Char* pName = aFieldNames[i];
         const sal_Int32 nNameLen = static_cast<sal_Int32>(*pName++);
         if( sFieldName.matchIgnoreAsciiCaseAsciiL( pName, nNameLen, nC ) )
         {
-            ImportTox( aFldId[i], sFieldName.copy( nC + nNameLen ) );
+            ImportTox( aFieldId[i], sFieldName.copy( nC + nNameLen ) );
             break;                  // keine Mehrfachnennungen moeglich
         }
     }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 8863e0a4cf51..267cd7909a00 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -208,20 +208,20 @@ bool wwSection::IsVertical() const
   ruby stuff, and the elements are rectangles. By misusing the ruby row I can
   handle distortions in one direction, but its all a bit of a mess:
 */
-void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
+void SwWW8ImplReader::SetDocumentGrid(SwFrameFormat &rFormat, const wwSection &rSection)
 {
     if (m_bVer67)
         return;
 
-    rFmt.SetFmtAttr(SvxFrameDirectionItem(rSection.meDir, RES_FRAMEDIR));
+    rFormat.SetFormatAttr(SvxFrameDirectionItem(rSection.meDir, RES_FRAMEDIR));
 
-    SwTwips nTextareaHeight = rFmt.GetFrmSize().GetHeight();
-    const SvxULSpaceItem &rUL = ItemGet<SvxULSpaceItem>(rFmt, RES_UL_SPACE);
+    SwTwips nTextareaHeight = rFormat.GetFrmSize().GetHeight();
+    const SvxULSpaceItem &rUL = ItemGet<SvxULSpaceItem>(rFormat, RES_UL_SPACE);
     nTextareaHeight -= rUL.GetUpper();
     nTextareaHeight -= rUL.GetLower();
 
-    SwTwips nTextareaWidth = rFmt.GetFrmSize().GetWidth();
-    const SvxLRSpaceItem &rLR = ItemGet<SvxLRSpaceItem>(rFmt, RES_LR_SPACE);
+    SwTwips nTextareaWidth = rFormat.GetFrmSize().GetWidth();
+    const SvxLRSpaceItem &rLR = ItemGet<SvxLRSpaceItem>(rFormat, RES_LR_SPACE);
     nTextareaWidth -= rLR.GetLeft();
     nTextareaWidth -= rLR.GetRight();
 
@@ -270,10 +270,10 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
     sal_uInt32 nCharWidth=240;
     for (sal_uInt16 nI = 0; nI < m_pStyles->GetCount(); ++nI)
     {
-        if (m_vColl[nI].bValid && m_vColl[nI].pFmt &&
+        if (m_vColl[nI].bValid && m_vColl[nI].pFormat &&
             m_vColl[nI].IsWW8BuiltInDefaultStyle())
         {
-            nCharWidth = ItemGet<SvxFontHeightItem>(*(m_vColl[nI].pFmt),
+            nCharWidth = ItemGet<SvxFontHeightItem>(*(m_vColl[nI].pFormat),
                 RES_CHRATR_CJK_FONTSIZE).GetHeight();
             break;
         }
@@ -306,7 +306,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
     sal_Int32 nRubyHeight = 0;
     aGrid.SetRubyHeight(writer_cast<sal_uInt16>(nRubyHeight));
 
-    rFmt.SetFmtAttr(aGrid);
+    rFormat.SetFormatAttr(aGrid);
 }
 
 void SwWW8ImplReader::Read_ParaBiDi(sal_uInt16, const sal_uInt8* pData, short nLen)
@@ -321,7 +321,7 @@ void SwWW8ImplReader::Read_ParaBiDi(sal_uInt16, const sal_uInt8* pData, short nL
     }
 }
 
-bool wwSectionManager::SetCols(SwFrmFmt &rFmt, const wwSection &rSection,
+bool wwSectionManager::SetCols(SwFrameFormat &rFormat, const wwSection &rSection,
     sal_uInt32 nNetWidth)
 {
     //sprmSCcolumns - number of columns - 1
@@ -330,7 +330,7 @@ bool wwSectionManager::SetCols(SwFrmFmt &rFmt, const wwSection &rSection,
     if (nCols < 2)          //check for no columns or other weird state
         return false;
 
-    SwFmtCol aCol;                      // Create SwFmtCol
+    SwFormatCol aCol;                      // Create SwFormatCol
 
     //sprmSDxaColumns   - Default distance is 1.25 cm
     sal_Int32 nColSpace = rSection.StandardColSeparation();
@@ -367,7 +367,7 @@ bool wwSectionManager::SetCols(SwFrmFmt &rFmt, const wwSection &rSection,
         }
         aCol.SetWishWidth(writer_cast<sal_uInt16>(nNetWidth));
     }
-    rFmt.SetFmtAttr(aCol);
+    rFormat.SetFormatAttr(aCol);
     return true;
 }
 
@@ -411,23 +411,23 @@ void wwSectionManager::SetLeftRight(wwSection &rSection)
     rSection.nPgRight = nWWRi;
 }
 
-void wwSectionManager::SetPage(SwPageDesc &rInPageDesc, SwFrmFmt &rFmt,
+void wwSectionManager::SetPage(SwPageDesc &rInPageDesc, SwFrameFormat &rFormat,
     const wwSection &rSection, bool bIgnoreCols)
 {
     // 1. Orientierung
     rInPageDesc.SetLandscape(rSection.IsLandScape());
 
     // 2. Papiergroesse
-    SwFmtFrmSize aSz( rFmt.GetFrmSize() );
+    SwFormatFrmSize aSz( rFormat.GetFrmSize() );
     aSz.SetWidth(rSection.GetPageWidth());
     aSz.SetHeight(SvxPaperInfo::GetSloppyPaperDimension(rSection.GetPageHeight()));
-    rFmt.SetFmtAttr(aSz);
+    rFormat.SetFormatAttr(aSz);
 
-    rFmt.SetFmtAttr(
+    rFormat.SetFormatAttr(
         SvxLRSpaceItem(rSection.GetPageLeft(), rSection.GetPageRight(), 0, 0, RES_LR_SPACE));
 
     if (!bIgnoreCols)
-        SetCols(rFmt, rSection, rSection.GetTextAreaWidth());
+        SetCols(rFormat, rSection, rSection.GetTextAreaWidth());
 }
 
 static sal_uInt16 lcl_MakeSafeNegativeSpacing(sal_uInt16 nIn)
@@ -437,12 +437,12 @@ static sal_uInt16 lcl_MakeSafeNegativeSpacing(sal_uInt16 nIn)
     return nIn;
 }
 
-void SwWW8ImplReader::SetPageBorder(SwFrmFmt &rFmt, const wwSection &rSection)
+void SwWW8ImplReader::SetPageBorder(SwFrameFormat &rFormat, const wwSection &rSection)
 {
     if (!IsBorder(rSection.brc))
         return;
 
-    SfxItemSet aSet(rFmt.GetAttrSet());
+    SfxItemSet aSet(rFormat.GetAttrSet());
     short aSizeArray[5]={0};
     SetFlyBordersShadow(aSet, rSection.brc, &aSizeArray[0]);
     SvxLRSpaceItem aLR(ItemGet<SvxLRSpaceItem>(aSet, RES_LR_SPACE));
@@ -508,7 +508,7 @@ void SwWW8ImplReader::SetPageBorder(SwFrmFmt &rFmt, const wwSection &rSection)
 
     aSet.Put(aLR);
     aSet.Put(aUL);
-    rFmt.SetFmtAttr(aSet);
+    rFormat.SetFormatAttr(aSet);
 }
 
 void wwSectionManager::GetPageULData(const wwSection &rSection,
@@ -578,85 +578,85 @@ void wwSectionManager::GetPageULData(const wwSection &rSection,
         rData.nSwLo = std::abs(nWWLo);
 }
 
-void wwSectionManager::SetPageULSpaceItems(SwFrmFmt &rFmt,
+void wwSectionManager::SetPageULSpaceItems(SwFrameFormat &rFormat,
     wwSectionManager::wwULSpaceData& rData, const wwSection &rSection)
 {
     if (rData.bHasHeader)               // ... und Header-Lower setzen
     {
         //Kopfzeilenhoehe minimal sezten
-        if (SwFrmFmt* pHdFmt = const_cast<SwFrmFmt*>(rFmt.GetHeader().GetHeaderFmt()))
+        if (SwFrameFormat* pHdFormat = const_cast<SwFrameFormat*>(rFormat.GetHeader().GetHeaderFormat()))
         {
-            SvxULSpaceItem aHdUL(pHdFmt->GetULSpace());
+            SvxULSpaceItem aHdUL(pHdFormat->GetULSpace());
             if (!rSection.IsFixedHeightHeader())    //normal
             {
-                pHdFmt->SetFmtAttr(SwFmtFrmSize(ATT_MIN_SIZE, 0, rData.nSwHLo));
+                pHdFormat->SetFormatAttr(SwFormatFrmSize(ATT_MIN_SIZE, 0, rData.nSwHLo));
                 // #i19922# - minimum page header height is now 1mm
                 // use new constant <cMinHdFtHeight>
                 aHdUL.SetLower( writer_cast<sal_uInt16>(rData.nSwHLo - cMinHdFtHeight) );
-                pHdFmt->SetFmtAttr(SwHeaderAndFooterEatSpacingItem(
+                pHdFormat->SetFormatAttr(SwHeaderAndFooterEatSpacingItem(
                     RES_HEADER_FOOTER_EAT_SPACING, true));
             }
             else
             {
                 // #i48832# - set correct spacing between header and body.
                 const SwTwips nHdLowerSpace( std::abs(rSection.maSep.dyaTop) - rData.nSwUp - rData.nSwHLo );
-                pHdFmt->SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE, 0, rData.nSwHLo + nHdLowerSpace));
+                pHdFormat->SetFormatAttr(SwFormatFrmSize(ATT_FIX_SIZE, 0, rData.nSwHLo + nHdLowerSpace));
                 aHdUL.SetLower( static_cast< sal_uInt16 >(nHdLowerSpace) );
-                pHdFmt->SetFmtAttr(SwHeaderAndFooterEatSpacingItem(
+                pHdFormat->SetFormatAttr(SwHeaderAndFooterEatSpacingItem(
                     RES_HEADER_FOOTER_EAT_SPACING, false));
             }
-            pHdFmt->SetFmtAttr(aHdUL);
+            pHdFormat->SetFormatAttr(aHdUL);
         }
     }
 
     if (rData.bHasFooter)               // ... und Footer-Upper setzen
     {
-        if (SwFrmFmt* pFtFmt = const_cast<SwFrmFmt*>(rFmt.GetFooter().GetFooterFmt()))
+        if (SwFrameFormat* pFtFormat = const_cast<SwFrameFormat*>(rFormat.GetFooter().GetFooterFormat()))
         {
-            SvxULSpaceItem aFtUL(pFtFmt->GetULSpace());
+            SvxULSpaceItem aFtUL(pFtFormat->GetULSpace());
             if (!rSection.IsFixedHeightFooter())    //normal
             {
-                pFtFmt->SetFmtAttr(SwFmtFrmSize(ATT_MIN_SIZE, 0, rData.nSwFUp));
+                pFtFormat->SetFormatAttr(SwFormatFrmSize(ATT_MIN_SIZE, 0, rData.nSwFUp));
                 // #i19922# - minimum page header height is now 1mm
                 // use new constant <cMinHdFtHeight>
                 aFtUL.SetUpper( writer_cast<sal_uInt16>(rData.nSwFUp - cMinHdFtHeight) );
-                pFtFmt->SetFmtAttr(SwHeaderAndFooterEatSpacingItem(
+                pFtFormat->SetFormatAttr(SwHeaderAndFooterEatSpacingItem(
                     RES_HEADER_FOOTER_EAT_SPACING, true));
             }
             else
             {
                 // #i48832# - set correct spacing between footer and body.
                 const SwTwips nFtUpperSpace( std::abs(rSection.maSep.dyaBottom) - rData.nSwLo - rData.nSwFUp );
-                pFtFmt->SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE, 0, rData.nSwFUp + nFtUpperSpace));
+                pFtFormat->SetFormatAttr(SwFormatFrmSize(ATT_FIX_SIZE, 0, rData.nSwFUp + nFtUpperSpace));
                 aFtUL.SetUpper( static_cast< sal_uInt16 >(nFtUpperSpace) );
-                pFtFmt->SetFmtAttr(SwHeaderAndFooterEatSpacingItem(
+                pFtFormat->SetFormatAttr(SwHeaderAndFooterEatSpacingItem(
                     RES_HEADER_FOOTER_EAT_SPACING, false));
             }
-            pFtFmt->SetFmtAttr(aFtUL);
+            pFtFormat->SetFormatAttr(aFtUL);
         }
     }
 
     SvxULSpaceItem aUL(writer_cast<sal_uInt16>(rData.nSwUp),
         writer_cast<sal_uInt16>(rData.nSwLo), RES_UL_SPACE);
-    rFmt.SetFmtAttr(aUL);
+    rFormat.SetFormatAttr(aUL);
 }
 
-SwSectionFmt *wwSectionManager::InsertSection(
+SwSectionFormat *wwSectionManager::InsertSection(
     SwPaM& rMyPaM, wwSection &rSection)
 {
     SwSectionData aSection( CONTENT_SECTION,
             mrReader.m_rDoc.GetUniqueSectionName() );
 
-    SfxItemSet aSet( mrReader.m_rDoc.GetAttrPool(), aFrmFmtSetRange );
+    SfxItemSet aSet( mrReader.m_rDoc.GetAttrPool(), aFrameFormatSetRange );
 
     bool nRTLPgn = !maSegments.empty() && maSegments.back().IsBiDi();
     aSet.Put(SvxFrameDirectionItem(
         nRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR));
 
     if (2 == mrReader.m_pWDop->fpc)
-        aSet.Put( SwFmtFtnAtTxtEnd(FTNEND_ATTXTEND));
+        aSet.Put( SwFormatFootnoteAtTextEnd(FTNEND_ATTXTEND));
     if (0 == mrReader.m_pWDop->epc)
-        aSet.Put( SwFmtEndAtTxtEnd(FTNEND_ATTXTEND));
+        aSet.Put( SwFormatEndAtTextEnd(FTNEND_ATTXTEND));
 
     aSection.SetProtectFlag(SectionIsProtected(rSection));
 
@@ -682,13 +682,13 @@ SwSectionFmt *wwSectionManager::InsertSection(
     if (!pPage)
         return 0;
 
-    SwSectionFmt *pFmt = rSection.mpSection->GetFmt();
-    OSL_ENSURE(pFmt, "impossible");
-    if (!pFmt)
+    SwSectionFormat *pFormat = rSection.mpSection->GetFormat();
+    OSL_ENSURE(pFormat, "impossible");
+    if (!pFormat)
         return 0;
 
-    SwFrmFmt& rFmt = pPage->GetMaster();
-    const SvxLRSpaceItem& rLR = rFmt.GetLRSpace();
+    SwFrameFormat& rFormat = pPage->GetMaster();
+    const SvxLRSpaceItem& rLR = rFormat.GetLRSpace();
     long nPageLeft  = rLR.GetLeft();
     long nPageRight = rLR.GetRight();
     long nSectionLeft = rSection.GetPageLeft() - nPageLeft;
@@ -696,11 +696,11 @@ SwSectionFmt *wwSectionManager::InsertSection(
     if ((nSectionLeft != 0) || (nSectionRight != 0))
     {
         SvxLRSpaceItem aLR(nSectionLeft, nSectionRight, 0, 0, RES_LR_SPACE);
-        pFmt->SetFmtAttr(aLR);
+        pFormat->SetFormatAttr(aLR);
     }
 
-    SetCols(*pFmt, rSection, rSection.GetTextAreaWidth());
-    return pFmt;
+    SetCols(*pFormat, rSection, rSection.GetTextAreaWidth());
+    return pFormat;
 }
 
 void SwWW8ImplReader::HandleLineNumbering(const wwSection &rSection)
@@ -740,9 +740,9 @@ void SwWW8ImplReader::HandleLineNumbering(const wwSection &rSection)
             (bRestartLnNumPerSection && !m_bNoLnNumYet)
            )
         {
-            SwFmtLineNumber aLN;
-            if (const SwFmtLineNumber* pLN
-                = static_cast<const SwFmtLineNumber*>(GetFmtAttr(RES_LINENUMBER)))
+            SwFormatLineNumber aLN;
+            if (const SwFormatLineNumber* pLN
+                = static_cast<const SwFormatLineNumber*>(GetFormatAttr(RES_LINENUMBER)))
             {
                 aLN.SetCountLines( pLN->IsCount() );
             }
@@ -781,7 +781,7 @@ void wwSectionManager::SetNumberingType(const wwSection &rNewSection,
 // mit Attributen un KF-Texten fuellt.
 // Dieses Vorgehen ist noetig geworden, da die UEbersetzung der verschiedenen
 // Seiten-Attribute zu stark verflochten ist.
-void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
+void wwSectionManager::CreateSep(const long nTextPos, bool /*bMustHaveBreak*/)
 {
     /*
     #i1909# section/page breaks should not occur in tables or subpage
@@ -801,11 +801,11 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
         bool insert = true;
         SwPaM pam( *mrReader.m_pLastAnchorPos );
         if( pam.Move(fnMoveBackward, fnGoNode))
-            if( SwTxtNode* txtNode = pam.GetPoint()->nNode.GetNode().GetTxtNode())
+            if( SwTextNode* txtNode = pam.GetPoint()->nNode.GetNode().GetTextNode())
                 if( txtNode->Len() == 0 )
                     insert = false;
         if( insert )
-            mrReader.AppendTxtNode(*mrReader.m_pPaM->GetPoint());
+            mrReader.AppendTextNode(*mrReader.m_pPaM->GetPoint());
     }
 
     ww::WordVersion eVer = mrReader.GetFib().GetFIBVersion();
@@ -813,8 +813,8 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
     // M.M. Create a linked section if the WkbPLCF
     // has an entry for one at this cp
     WW8PLCFspecial* pWkb = mrReader.m_pPlcxMan->GetWkbPLCF();
-    if (pWkb && pWkb->SeekPosExact(nTxtPos) &&
-            pWkb->Where() == nTxtPos)
+    if (pWkb && pWkb->SeekPosExact(nTextPos) &&
+            pWkb->Where() == nTextPos)
     {
         void* pData;
         WW8_CP nTest;
@@ -1625,12 +1625,12 @@ void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29, SwWW8ImplReader* pIo)
         bGrafApo = false;
 
         do{             // Block zum rausspringen
-            sal_uInt8 nTxt[2];
+            sal_uInt8 nText[2];
 
-            if (!checkRead(*pIoStrm, nTxt, 2)) // lies Text
+            if (!checkRead(*pIoStrm, nText, 2)) // lies Text
                 break;
 
-            if( nTxt[0] != 0x01 || nTxt[1] != 0x0d )// nur Grafik + CR ?
+            if( nText[0] != 0x01 || nText[1] != 0x0d )// nur Grafik + CR ?
                 break;                              // Nein
 
             pPap->advance();                        // Naechste Zeile
@@ -2012,7 +2012,7 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
     : SfxItemSet(rReader.m_rDoc.GetAttrPool(),RES_FRMATR_BEGIN,RES_FRMATR_END-1)
 {
     if (!rReader.m_bNewDoc)
-        Reader::ResetFrmFmtAttrs(*this);    // Abstand/Umrandung raus
+        Reader::ResetFrameFormatAttrs(*this);    // Abstand/Umrandung raus
                                             // Position
     Put(SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR));
 
@@ -2021,8 +2021,8 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
     sal_Int16 eHRel = pFS->eHRel;
     rReader.MiserableRTLGraphicsHack(nXPos, pFS->nWidth, pFS->eHAlign, eHRel);
 /*Above can all go when we have from left in rtl mode*/
-    Put( SwFmtHoriOrient(nXPos, pFS->eHAlign, pFS->eHRel, pFS->bToggelPos ));
-    Put( SwFmtVertOrient( pFS->nYPos, pFS->eVAlign, pFS->eVRel ) );
+    Put( SwFormatHoriOrient(nXPos, pFS->eHAlign, pFS->eHRel, pFS->bToggelPos ));
+    Put( SwFormatVertOrient( pFS->nYPos, pFS->eVAlign, pFS->eVRel ) );
 
     if (pFS->nLeMgn || pFS->nRiMgn)     // Raender setzen
         Put(SvxLRSpaceItem(pFS->nLeMgn, pFS->nRiMgn, 0, 0, RES_LR_SPACE));
@@ -2031,7 +2031,7 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
         Put(SvxULSpaceItem(pFS->nUpMgn, pFS->nLoMgn, RES_UL_SPACE));
 
     //we no longer need to hack around the header/footer problems
-    SwFmtSurround aSurround(pFS->eSurround);
+    SwFormatSurround aSurround(pFS->eSurround);
     if ( pFS->eSurround == SURROUND_IDEAL )
         aSurround.SetAnchorOnly( true );
     Put( aSurround );
@@ -2043,12 +2043,12 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
 
     // #i27767#
     // #i35017# - constant name has changed
-    Put( SwFmtWrapInfluenceOnObjPos(
+    Put( SwFormatWrapInfluenceOnObjPos(
                 text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ) );
 
     if( !bGraf )
     {
-        Put( SwFmtAnchor(pFS->eAnchor) );
+        Put( SwFormatAnchor(pFS->eAnchor) );
         // Groesse einstellen
 
         //Ordinarily with frames, the border width and spacing is
@@ -2056,7 +2056,7 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
         //types of frames, the left right thickness and space makes
         //it wider, but the top bottom spacing and border thickness
         //is placed inside.
-        Put( SwFmtFrmSize( pFS->eHeightFix, pFS->nWidth +
+        Put( SwFormatFrmSize( pFS->eHeightFix, pFS->nWidth +
             aSizeArray[WW8_LEFT] + aSizeArray[WW8_RIGHT],
             pFS->nHeight));
     }
@@ -2092,7 +2092,7 @@ WW8FlySet::WW8FlySet( SwWW8ImplReader& rReader, const SwPaM* pPaM,
         aSizeArray[WW8_BOT]*=2;
     }
 
-    Put( SwFmtFrmSize( ATT_FIX_SIZE, nWidth+aSizeArray[WW8_LEFT]+
+    Put( SwFormatFrmSize( ATT_FIX_SIZE, nWidth+aSizeArray[WW8_LEFT]+
         aSizeArray[WW8_RIGHT], nHeight+aSizeArray[WW8_TOP]
         + aSizeArray[WW8_BOT]) );
 }
@@ -2100,10 +2100,10 @@ WW8FlySet::WW8FlySet( SwWW8ImplReader& rReader, const SwPaM* pPaM,
 void WW8FlySet::Init(const SwWW8ImplReader& rReader, const SwPaM* pPaM)
 {
     if (!rReader.m_bNewDoc)
-        Reader::ResetFrmFmtAttrs(*this);  // Abstand/Umrandung raus
+        Reader::ResetFrameFormatAttrs(*this);  // Abstand/Umrandung raus
 
     Put(SvxLRSpaceItem(RES_LR_SPACE)); //inline writer ole2 objects start with 0.2cm l/r
-    SwFmtAnchor aAnchor(FLY_AS_CHAR);
+    SwFormatAnchor aAnchor(FLY_AS_CHAR);
 
     aAnchor.SetAnchor(pPaM->GetPoint());
     Put(aAnchor);
@@ -2111,9 +2111,9 @@ void WW8FlySet::Init(const SwWW8ImplReader& rReader, const SwPaM* pPaM)
     //The horizontal default is on the baseline, the vertical is centered
     //around the character center it appears
     if (rReader.m_aSectionManager.CurrentSectionIsVertical())
-        Put(SwFmtVertOrient(0, text::VertOrientation::CHAR_CENTER,text::RelOrientation::CHAR));
+        Put(SwFormatVertOrient(0, text::VertOrientation::CHAR_CENTER,text::RelOrientation::CHAR));
     else
-        Put(SwFmtVertOrient(0, text::VertOrientation::TOP, text::RelOrientation::FRAME));
+        Put(SwFormatVertOrient(0, text::VertOrientation::TOP, text::RelOrientation::FRAME));
 }
 
 WW8DupProperties::WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStk)
@@ -2162,26 +2162,26 @@ void WW8DupProperties::Insert(const SwPosition &rPos)
     }
 }
 
-void SwWW8ImplReader::MoveInsideFly(const SwFrmFmt *pFlyFmt)
+void SwWW8ImplReader::MoveInsideFly(const SwFrameFormat *pFlyFormat)
 {
     WW8DupProperties aDup(m_rDoc,m_pCtrlStck);
 
     m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), 0, false);
 
     // Setze Pam in den FlyFrame
-    const SwFmtCntnt& rCntnt = pFlyFmt->GetCntnt();
-    OSL_ENSURE( rCntnt.GetCntntIdx(), "Kein Inhalt vorbereitet." );
-    m_pPaM->GetPoint()->nNode = rCntnt.GetCntntIdx()->GetIndex() + 1;
-    m_pPaM->GetPoint()->nContent.Assign( m_pPaM->GetCntntNode(), 0 );
+    const SwFormatContent& rContent = pFlyFormat->GetContent();
+    OSL_ENSURE( rContent.GetContentIdx(), "Kein Inhalt vorbereitet." );
+    m_pPaM->GetPoint()->nNode = rContent.GetContentIdx()->GetIndex() + 1;
+    m_pPaM->GetPoint()->nContent.Assign( m_pPaM->GetContentNode(), 0 );
 
     aDup.Insert(*m_pPaM->GetPoint());
 }
 
-SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
+SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrameFormat *pFlyFormat,
     const SwPosition &rPos, bool bTableJoin)
 {
     SwTwips nRetWidth = 0;
-    if (!pFlyFmt)
+    if (!pFlyFormat)
         return nRetWidth;
     // Alle Attribute schliessen, da sonst Attribute entstehen koennen,
     // die aus Flys rausragen
@@ -2197,8 +2197,8 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
     */
     if (bTableJoin)
     {
-        const SwNodeIndex* pNodeIndex = pFlyFmt->GetCntnt().
-            GetCntntIdx();
+        const SwNodeIndex* pNodeIndex = pFlyFormat->GetContent().
+            GetContentIdx();
         if (pNodeIndex)
         {
             SwNodeIndex aIdx( *pNodeIndex, 1 ),
@@ -2211,11 +2211,11 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
                     SwTableNode *pTable = aIdx.GetNode().GetTableNode();
                     aIdx = *aIdx.GetNode().EndOfSectionNode();
                     ++aIdx;
-                    if ( (aIdx < aEnd) && aIdx.GetNode().IsTxtNode() )
+                    if ( (aIdx < aEnd) && aIdx.GetNode().IsTextNode() )
                     {
-                        SwTxtNode *pNd = aIdx.GetNode().GetTxtNode();
+                        SwTextNode *pNd = aIdx.GetNode().GetTextNode();
                         ++aIdx;
-                        if (aIdx == aEnd && pNd && pNd->GetTxt().isEmpty())
+                        if (aIdx == aEnd && pNd && pNd->GetText().isEmpty())
                         {
                             //An extra pre-created by writer unused paragraph
 
@@ -2225,22 +2225,22 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
                             m_aExtraneousParas.push_back(pNd);
 
                             SwTable& rTable = pTable->GetTable();
-                            SwFrmFmt* pTblFmt = rTable.GetFrmFmt();
+                            SwFrameFormat* pTableFormat = rTable.GetFrameFormat();
 
-                            if (pTblFmt)
+                            if (pTableFormat)
                             {
-                                SwFmtFrmSize aSize = pTblFmt->GetFrmSize();
+                                SwFormatFrmSize aSize = pTableFormat->GetFrmSize();
                                 aSize.SetHeightSizeType(ATT_MIN_SIZE);
                                 aSize.SetHeight(MINLAY);
-                                pFlyFmt->SetFmtAttr(aSize);
-                                SwFmtHoriOrient aHori = pTblFmt->GetHoriOrient();
+                                pFlyFormat->SetFormatAttr(aSize);
+                                SwFormatHoriOrient aHori = pTableFormat->GetHoriOrient();
                                 // passing the table orientaion of
                                 // LEFT_AND_WIDTH to the frame seems to
                                 // work better than FULL, especially if the
                                 // table width exceeds the page width, however
                                 // I am not brave enough to set it in all
                                 // instances
-                                pTblFmt->SetFmtAttr( SwFmtHoriOrient(0, ( aHori.GetHoriOrient() == text::HoriOrientation::LEFT_AND_WIDTH ) ? ::text::HoriOrientation::LEFT_AND_WIDTH : text::HoriOrientation::FULL ) );
+                                pTableFormat->SetFormatAttr( SwFormatHoriOrient(0, ( aHori.GetHoriOrient() == text::HoriOrientation::LEFT_AND_WIDTH ) ? ::text::HoriOrientation::LEFT_AND_WIDTH : text::HoriOrientation::FULL ) );
                                 nRetWidth = aSize.GetWidth();
                             }
                         }
@@ -2340,7 +2340,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
 
         if (pTabPos && pTabPos->bNoFly)
         {
-            m_pSFlyPara->pFlyFmt = 0;
+            m_pSFlyPara->pFlyFormat = 0;
             if (pULSpaceItem)
             {
                 // Word positioned tables can have a position (like a
@@ -2351,7 +2351,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
                 const SfxPoolItem* pItem = 0;
                 if (aFlySet.HasItem(RES_VERT_ORIENT, &pItem))
                 {
-                    const SwFmtVertOrient* pOrient = static_cast<const SwFmtVertOrient*>(pItem);
+                    const SwFormatVertOrient* pOrient = static_cast<const SwFormatVertOrient*>(pItem);
                     if (pOrient->GetPos() != 0)
                         pULSpaceItem->SetUpper(pOrient->GetPos());
                 }
@@ -2359,24 +2359,24 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
         }
         else
         {
-            m_pSFlyPara->pFlyFmt = m_rDoc.MakeFlySection( m_pSFlyPara->eAnchor,
+            m_pSFlyPara->pFlyFormat = m_rDoc.MakeFlySection( m_pSFlyPara->eAnchor,
                     m_pPaM->GetPoint(), &aFlySet );
-            OSL_ENSURE(m_pSFlyPara->pFlyFmt->GetAnchor().GetAnchorId() ==
+            OSL_ENSURE(m_pSFlyPara->pFlyFormat->GetAnchor().GetAnchorId() ==
                     m_pSFlyPara->eAnchor, "Not the anchor type requested!");
         }
 
-        if (m_pSFlyPara->pFlyFmt)
+        if (m_pSFlyPara->pFlyFormat)
         {
             if (!m_pDrawModel)
                 GrafikCtor();
 
-            SdrObject* pOurNewObject = CreateContactObject(m_pSFlyPara->pFlyFmt);
+            SdrObject* pOurNewObject = CreateContactObject(m_pSFlyPara->pFlyFormat);
             m_pWWZOrder->InsertTextLayerObject(pOurNewObject);
         }
 
-        if (FLY_AS_CHAR != m_pSFlyPara->eAnchor && m_pSFlyPara->pFlyFmt)
+        if (FLY_AS_CHAR != m_pSFlyPara->eAnchor && m_pSFlyPara->pFlyFormat)
         {
-            m_pAnchorStck->AddAnchor(*m_pPaM->GetPoint(),m_pSFlyPara->pFlyFmt);
+            m_pAnchorStck->AddAnchor(*m_pPaM->GetPoint(),m_pSFlyPara->pFlyFormat);
         }
 
         // remember Pos in body text
@@ -2388,8 +2388,8 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
         m_pSFlyPara->pOldAnchorStck = m_pAnchorStck;
         m_pAnchorStck = new SwWW8FltAnchorStack(&m_rDoc, m_nFieldFlags);
 
-        if (m_pSFlyPara->pFlyFmt)
-            MoveInsideFly(m_pSFlyPara->pFlyFmt);
+        if (m_pSFlyPara->pFlyFormat)
+            MoveInsideFly(m_pSFlyPara->pFlyFormat);
 
         // 1) ReadText() is not called recursively because the length of
         //    the Apo is unknown at that  time, and ReadText() needs it.
@@ -2415,11 +2415,11 @@ bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr)
 
     SwNodeIndex aPref(rPam.GetPoint()->nNode, -1);
 
-    if (SwTxtNode* pNode = aPref.GetNode().GetTxtNode())
+    if (SwTextNode* pNode = aPref.GetNode().GetTextNode())
     {
         m_aSectionManager.JoinNode(*rPam.GetPoint(), aPref.GetNode());
         rPam.GetPoint()->nNode = aPref;
-        rPam.GetPoint()->nContent.Assign(pNode, pNode->GetTxt().getLength());
+        rPam.GetPoint()->nContent.Assign(pNode, pNode->GetText().getLength());
         if (bStealAttr)
             m_pCtrlStck->StealAttr(rPam.GetPoint()->nNode);
 
@@ -2431,9 +2431,9 @@ bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr)
 }
 
 //In auto-width word frames negative after-indent values are ignored
-void SwWW8ImplReader::StripNegativeAfterIndent(SwFrmFmt *pFlyFmt)
+void SwWW8ImplReader::StripNegativeAfterIndent(SwFrameFormat *pFlyFormat)
 {
-    const SwNodeIndex* pSttNd = pFlyFmt->GetCntnt().GetCntntIdx();
+    const SwNodeIndex* pSttNd = pFlyFormat->GetContent().GetContentIdx();
     if (!pSttNd)
         return;
 
@@ -2441,7 +2441,7 @@ void SwWW8ImplReader::StripNegativeAfterIndent(SwFrmFmt *pFlyFmt)
     SwNodeIndex aEnd(*pSttNd->GetNode().EndOfSectionNode());
     while (aIdx < aEnd)
     {
-        SwTxtNode *pNd = aIdx.GetNode().GetTxtNode();
+        SwTextNode *pNd = aIdx.GetNode().GetTextNode();
         if (pNd)
         {
             const SvxLRSpaceItem& rLR = ItemGet<SvxLRSpaceItem>(*pNd, RES_LR_SPACE);
@@ -2493,14 +2493,14 @@ void SwWW8ImplReader::StopApo()
         SwNodeIndex aPref(m_pPaM->GetPoint()->nNode, -1);
 
         SwTwips nNewWidth =
-            MoveOutsideFly(m_pSFlyPara->pFlyFmt, *m_pSFlyPara->pMainTextPos);
+            MoveOutsideFly(m_pSFlyPara->pFlyFormat, *m_pSFlyPara->pMainTextPos);
         if (nNewWidth)
             m_pSFlyPara->BoxUpWidth(nNewWidth);
 
         Color aBg(0xFE, 0xFF, 0xFF, 0xFF);  //Transparent by default
 
-        SwTxtNode* pNd = aPref.GetNode().GetTxtNode();
-        if (pNd && m_pSFlyPara->pFlyFmt)
+        SwTextNode* pNd = aPref.GetNode().GetTextNode();
+        if (pNd && m_pSFlyPara->pFlyFormat)
         {
             /*
             #i582#
@@ -2508,7 +2508,7 @@ void SwWW8ImplReader::StopApo()
             it.  Otherwise, make it transparent, this appears to be how MSWord
             works
             */
-            const SfxPoolItem &rItm = pNd->SwCntntNode::GetAttr(RES_BACKGROUND);
+            const SfxPoolItem &rItm = pNd->SwContentNode::GetAttr(RES_BACKGROUND);
             const SvxBrushItem &rBrush = static_cast<const SvxBrushItem&>(rItm);
             if (rBrush.GetColor().GetColor() != COL_AUTO)
                 aBg = rBrush.GetColor();
@@ -2517,8 +2517,8 @@ void SwWW8ImplReader::StopApo()
             pNd->JoinNext();
         }
 
-        if (m_pSFlyPara->pFlyFmt)
-            m_pSFlyPara->pFlyFmt->SetFmtAttr(SvxBrushItem(aBg, RES_BACKGROUND));
+        if (m_pSFlyPara->pFlyFormat)
+            m_pSFlyPara->pFlyFormat->SetFormatAttr(SvxBrushItem(aBg, RES_BACKGROUND));
 
         DeleteAnchorStk();
         m_pAnchorStck = m_pSFlyPara->pOldAnchorStck;
@@ -2527,12 +2527,12 @@ void SwWW8ImplReader::StopApo()
         // function, the extension of the SW-fly has to be set
         // manually as the SW fly has no auto function to adjust the
         // frame´s size.
-        if(m_pSFlyPara->nNewNetWidth > MINFLY && m_pSFlyPara->pFlyFmt)    // BoxUpWidth ?
+        if(m_pSFlyPara->nNewNetWidth > MINFLY && m_pSFlyPara->pFlyFormat)    // BoxUpWidth ?
         {
             long nW = m_pSFlyPara->nNewNetWidth;
             nW += m_pSFlyPara->nWidth - m_pSFlyPara->nNetWidth;   // Rand dazu
-            m_pSFlyPara->pFlyFmt->SetFmtAttr(
-                SwFmtFrmSize( m_pSFlyPara->eHeightFix, nW, m_pSFlyPara->nHeight ) );
+            m_pSFlyPara->pFlyFormat->SetFormatAttr(
+                SwFormatFrmSize( m_pSFlyPara->eHeightFix, nW, m_pSFlyPara->nHeight ) );
         }
         /*
         Word set *no* width meaning its an automatic width. The
@@ -2542,24 +2542,24 @@ void SwWW8ImplReader::StopApo()
         #i27204# Added AutoWidth setting. Left the old CalculateFlySize in place
         so that if the user unselects autowidth, the width doesn't max out
         */
-        else if( !m_pWFlyPara->nSp28 && m_pSFlyPara->pFlyFmt)
+        else if( !m_pWFlyPara->nSp28 && m_pSFlyPara->pFlyFormat)
         {
             using namespace sw::util;
-            SfxItemSet aFlySet( m_pSFlyPara->pFlyFmt->GetAttrSet() );
+            SfxItemSet aFlySet( m_pSFlyPara->pFlyFormat->GetAttrSet() );
 
-            SwFmtFrmSize aSize(ItemGet<SwFmtFrmSize>(aFlySet, RES_FRM_SIZE));
+            SwFormatFrmSize aSize(ItemGet<SwFormatFrmSize>(aFlySet, RES_FRM_SIZE));
 
             aFlySet.ClearItem(RES_FRM_SIZE);
 
             CalculateFlySize(aFlySet, m_pSFlyPara->pMainTextPos->nNode,
                 m_pSFlyPara->nWidth);
 
-            nNewWidth = ItemGet<SwFmtFrmSize>(aFlySet, RES_FRM_SIZE).GetWidth();
+            nNewWidth = ItemGet<SwFormatFrmSize>(aFlySet, RES_FRM_SIZE).GetWidth();
 
             aSize.SetWidth(nNewWidth);
             aSize.SetWidthSizeType(ATT_VAR_SIZE);
 
-            m_pSFlyPara->pFlyFmt->SetFmtAttr(aSize);
+            m_pSFlyPara->pFlyFormat->SetFormatAttr(aSize);
         }
 
         delete m_pSFlyPara->pMainTextPos, m_pSFlyPara->pMainTextPos = 0;
@@ -2569,8 +2569,8 @@ void SwWW8ImplReader::StopApo()
     }
 
     //#i8062#
-    if (m_pSFlyPara && m_pSFlyPara->pFlyFmt)
-        m_pFmtOfJustInsertedApo = m_pSFlyPara->pFlyFmt;
+    if (m_pSFlyPara && m_pSFlyPara->pFlyFormat)
+        m_pFormatOfJustInsertedApo = m_pSFlyPara->pFlyFormat;
 
     DELETEZ( m_pSFlyPara );
     DELETEZ( m_pWFlyPara );
@@ -2610,7 +2610,7 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
         if (m_pAktColl)
         {
             OSL_ENSURE(rAttr.Which() != RES_FLTR_REDLINE, "redline in style!");
-            m_pAktColl->SetFmtAttr(rAttr);
+            m_pAktColl->SetFormatAttr(rAttr);
         }
         else if (m_pAktItemSet)
         {
@@ -2627,13 +2627,13 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
             if ( bFirstLineOfStSet )
             {
                 const SwNode* pNd = &(m_pPaM->GetPoint()->nNode.GetNode());
-                m_aTxtNodesHavingFirstLineOfstSet.insert( pNd );
+                m_aTextNodesHavingFirstLineOfstSet.insert( pNd );
             }
             // #i105414#
             if ( bLeftIndentSet )
             {
                 const SwNode* pNd = &(m_pPaM->GetPoint()->nNode.GetNode());
-                m_aTxtNodesHavingLeftIndentSet.insert( pNd );
+                m_aTextNodesHavingLeftIndentSet.insert( pNd );
             }
         }
 
@@ -2642,17 +2642,17 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
     }
 }
 
-// holt Attribut aus der FmtColl / Stack / Doc
-const SfxPoolItem* SwWW8ImplReader::GetFmtAttr( sal_uInt16 nWhich )
+// holt Attribut aus der FormatColl / Stack / Doc
+const SfxPoolItem* SwWW8ImplReader::GetFormatAttr( sal_uInt16 nWhich )
 {
     const SfxPoolItem* pRet = 0;
     if (m_pAktColl)
-        pRet = &(m_pAktColl->GetFmtAttr(nWhich));
+        pRet = &(m_pAktColl->GetFormatAttr(nWhich));
     else if (m_pAktItemSet)
     {
         pRet = m_pAktItemSet->GetItem(nWhich);
         if (!pRet)
-            pRet = m_pStandardFmtColl ? &(m_pStandardFmtColl->GetFmtAttr(nWhich)) : 0;
+            pRet = m_pStandardFormatColl ? &(m_pStandardFormatColl->GetFormatAttr(nWhich)) : 0;
         if (!pRet)
             pRet = &m_rDoc.GetAttrPool().GetDefaultItem(nWhich);
     }
@@ -2661,19 +2661,19 @@ const SfxPoolItem* SwWW8ImplReader::GetFmtAttr( sal_uInt16 nWhich )
         pRet = m_pCtrlStck->GetStackAttr(*m_pPaM->GetPoint(), nWhich);
         if (!pRet)
         {
-            if (m_nAktColl < m_vColl.size() && m_vColl[m_nAktColl].pFmt &&
+            if (m_nAktColl < m_vColl.size() && m_vColl[m_nAktColl].pFormat &&
                 m_vColl[m_nAktColl].bColl)
             {
-                pRet = &(m_vColl[m_nAktColl].pFmt->GetFmtAttr(nWhich));
+                pRet = &(m_vColl[m_nAktColl].pFormat->GetFormatAttr(nWhich));
             }
         }
         if (!pRet)
-            pRet = m_pStandardFmtColl ? &(m_pStandardFmtColl->GetFmtAttr(nWhich)) : 0;
+            pRet = m_pStandardFormatColl ? &(m_pStandardFormatColl->GetFormatAttr(nWhich)) : 0;
         if (!pRet)
             pRet = &m_rDoc.GetAttrPool().GetDefaultItem(nWhich);
     }
     else
-        pRet = m_pCtrlStck->GetFmtAttr(*m_pPaM->GetPoint(), nWhich);
+        pRet = m_pCtrlStck->GetFormatAttr(*m_pPaM->GetPoint(), nWhich);
     return pRet;
 }
 
@@ -3140,7 +3140,7 @@ void SwWW8ImplReader::Read_SubSuper( sal_uInt16, const sal_uInt8* pData, short n
     NewAttr( SvxEscapementItem( nEs, nProp, RES_CHRATR_ESCAPEMENT ) );
 }
 
-SwFrmFmt *SwWW8ImplReader::ContainsSingleInlineGraphic(const SwPaM &rRegion)
+SwFrameFormat *SwWW8ImplReader::ContainsSingleInlineGraphic(const SwPaM &rRegion)
 {
     /*
     For inline graphics and objects word has a hacked in feature to use
@@ -3149,25 +3149,25 @@ SwFrmFmt *SwWW8ImplReader::ContainsSingleInlineGraphic(const SwPaM &rRegion)
     contains only a single graphic, and if that graphic is anchored as
     FLY_AS_CHAR and then we can change its anchoring to centered in the line.
     */
-    SwFrmFmt *pRet=0;
+    SwFrameFormat *pRet=0;
     SwNodeIndex aBegin(rRegion.Start()->nNode);
     const sal_Int32 nBegin(rRegion.Start()->nContent.GetIndex());
     SwNodeIndex aEnd(rRegion.End()->nNode);
     const sal_Int32 nEnd(rRegion.End()->nContent.GetIndex());
-    const SwTxtNode* pTNd;
-    const SwTxtAttr* pTFlyAttr;
+    const SwTextNode* pTNd;
+    const SwTextAttr* pTFlyAttr;
     if (
          aBegin == aEnd && nBegin == nEnd - 1 &&
-         0 != (pTNd = aBegin.GetNode().GetTxtNode()) &&
-         0 != (pTFlyAttr = pTNd->GetTxtAttrForCharAt(nBegin, RES_TXTATR_FLYCNT))
+         0 != (pTNd = aBegin.GetNode().GetTextNode()) &&
+         0 != (pTFlyAttr = pTNd->GetTextAttrForCharAt(nBegin, RES_TXTATR_FLYCNT))
        )
     {
-        const SwFmtFlyCnt& rFly = pTFlyAttr->GetFlyCnt();
-        SwFrmFmt *pFlyFmt = rFly.GetFrmFmt();
-        if (pFlyFmt &&
-            (FLY_AS_CHAR == pFlyFmt->GetAnchor().GetAnchorId()))
+        const SwFormatFlyCnt& rFly = pTFlyAttr->GetFlyCnt();
+        SwFrameFormat *pFlyFormat = rFly.GetFrameFormat();
+        if (pFlyFormat &&
+            (FLY_AS_CHAR == pFlyFormat->GetAnchor().GetAnchorId()))
         {
-            pRet = pFlyFmt;
+            pRet = pFlyFormat;
         }
     }
     return pRet;
@@ -3184,21 +3184,21 @@ bool SwWW8ImplReader::ConvertSubToGraphicPlacement()
     */
     bool bIsGraphicPlacementHack = false;
     sal_uInt16 nPos;
-    if (m_pCtrlStck->GetFmtStackAttr(RES_CHRATR_ESCAPEMENT, &nPos))
+    if (m_pCtrlStck->GetFormatStackAttr(RES_CHRATR_ESCAPEMENT, &nPos))
     {
         SwPaM aRegion(*m_pPaM->GetPoint());
 
         SwFltPosition aMkPos((*m_pCtrlStck)[nPos].m_aMkPos);
         SwFltPosition aPtPos(*m_pPaM->GetPoint());
 
-        SwFrmFmt *pFlyFmt = 0;
+        SwFrameFormat *pFlyFormat = 0;
         if (
              SwFltStackEntry::MakeRegion(&m_rDoc,aRegion,false,aMkPos,aPtPos) &&
-             0 != (pFlyFmt = ContainsSingleInlineGraphic(aRegion))
+             0 != (pFlyFormat = ContainsSingleInlineGraphic(aRegion))
            )
         {
             m_pCtrlStck->DeleteAndDestroy(nPos);
-            pFlyFmt->SetFmtAttr(SwFmtVertOrient(0, text::VertOrientation::CHAR_CENTER, text::RelOrientation::CHAR));
+            pFlyFormat->SetFormatAttr(SwFormatVertOrient(0, text::VertOrientation::CHAR_CENTER, text::RelOrientation::CHAR));
             bIsGraphicPlacementHack = true;
         }
     }
@@ -3220,7 +3220,7 @@ void SwWW8ImplReader::Read_SubSuperProp( sal_uInt16, const sal_uInt8* pData, sho
     short nPos = eVersion <= ww::eWW2 ? static_cast< sal_Int8 >( *pData ) : SVBT16ToShort( pData );
     sal_Int32 nPos2 = nPos * ( 10 * 100 );      // HalfPoints in 100 * tw
     const SvxFontHeightItem* pF
-        = static_cast<const SvxFontHeightItem*>(GetFmtAttr(RES_CHRATR_FONTSIZE));
+        = static_cast<const SvxFontHeightItem*>(GetFormatAttr(RES_CHRATR_FONTSIZE));
     OSL_ENSURE(pF, "Expected to have the fontheight available here");
 
     // #i59022: Check ensure nHeight != 0. Div by zero otherwise.
@@ -3326,7 +3326,7 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData
     }
 }
 
-void SwWW8ImplReader::Read_TxtColor( sal_uInt16, const sal_uInt8* pData, short nLen )
+void SwWW8ImplReader::Read_TextColor( sal_uInt16, const sal_uInt8* pData, short nLen )
 {
     //Has newer colour variant, ignore this old variant
     if (!m_bVer67 && m_pPlcxMan && m_pPlcxMan->GetChpPLCF()->HasSprm(NS_sprm::LN_CCv))
@@ -3343,11 +3343,11 @@ void SwWW8ImplReader::Read_TxtColor( sal_uInt16, const sal_uInt8* pData, short n
 
         NewAttr( SvxColorItem(Color(GetCol(b)), RES_CHRATR_COLOR));
         if (m_pAktColl && m_pStyles)
-            m_pStyles->bTxtColChanged = true;
+            m_pStyles->bTextColChanged = true;
     }
 }
 
-void SwWW8ImplReader::Read_TxtForeColor(sal_uInt16, const sal_uInt8* pData, short nLen)
+void SwWW8ImplReader::Read_TextForeColor(sal_uInt16, const sal_uInt8* pData, short nLen)
 {
     if( nLen < 0 )
         m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_COLOR );
@@ -3356,7 +3356,7 @@ void SwWW8ImplReader::Read_TxtForeColor(sal_uInt16, const sal_uInt8* pData, shor
         Color aColor(msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)));
         NewAttr(SvxColorItem(aColor, RES_CHRATR_COLOR));
         if (m_pAktColl && m_pStyles)
-            m_pStyles->bTxtColChanged = true;
+            m_pStyles->bTextColChanged = true;
     }
 }
 
@@ -3381,7 +3381,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh
                     = static_cast<SvxUnderlineItem *>(aSet.Get( RES_CHRATR_UNDERLINE, false ).Clone());
                 if(pUnderline){
                     pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) );
-                    m_pAktColl->SetFmtAttr( *pUnderline );
+                    m_pAktColl->SetFormatAttr( *pUnderline );
                     delete pUnderline;
                 }
             }
@@ -3766,12 +3766,12 @@ void SwWW8ImplReader::Read_CColl( sal_uInt16, const sal_uInt8* pData, short nLen
 {
     if( nLen < 0 ){                 // Ende des Attributes
         m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_TXTATR_CHARFMT );
-        m_nCharFmt = -1;
+        m_nCharFormat = -1;
         return;
     }
     sal_uInt16 nId = SVBT16ToShort( pData );    // Style-Id (NICHT Sprm-Id!)
 
-    if( nId >= m_vColl.size() || !m_vColl[nId].pFmt  // ungueltige Id ?
+    if( nId >= m_vColl.size() || !m_vColl[nId].pFormat  // ungueltige Id ?
         || m_vColl[nId].bColl )              // oder Para-Style ?
         return;                             // dann ignorieren
 
@@ -3784,8 +3784,8 @@ void SwWW8ImplReader::Read_CColl( sal_uInt16, const sal_uInt8* pData, short nLen
         return;
     }
 
-    NewAttr( SwFmtCharFmt( static_cast<SwCharFmt*>(m_vColl[nId].pFmt) ) );
-    m_nCharFmt = (short) nId;
+    NewAttr( SwFormatCharFormat( static_cast<SwCharFormat*>(m_vColl[nId].pFormat) ) );
+    m_nCharFormat = (short) nId;
 }
 
 /*
@@ -3828,14 +3828,14 @@ void SwWW8ImplReader::Read_CharShadow(  sal_uInt16, const sal_uInt8* pData, shor
         NewAttr( SvxBrushItem( aSh.aColor, RES_CHRATR_BACKGROUND ));
 
         // Add a marker to the grabbag indicating that character background was imported from MSO shading
-        SfxGrabBagItem aGrabBag = *(static_cast<const SfxGrabBagItem*>(GetFmtAttr(RES_CHRATR_GRABBAG)));
+        SfxGrabBagItem aGrabBag = *(static_cast<const SfxGrabBagItem*>(GetFormatAttr(RES_CHRATR_GRABBAG)));
         std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
         rMap.insert(std::pair<OUString, com::sun::star::uno::Any>("CharShadingMarker",uno::makeAny(true)));
         NewAttr(aGrabBag);
     }
 }
 
-void SwWW8ImplReader::Read_TxtBackColor(sal_uInt16, const sal_uInt8* pData, short nLen )
+void SwWW8ImplReader::Read_TextBackColor(sal_uInt16, const sal_uInt8* pData, short nLen )
 {
     if( nLen <= 0 )
     {
@@ -3850,7 +3850,7 @@ void SwWW8ImplReader::Read_TxtBackColor(sal_uInt16, const sal_uInt8* pData, shor
         NewAttr(SvxBrushItem(aColour, RES_CHRATR_BACKGROUND));
 
         // Add a marker to the grabbag indicating that character background was imported from MSO shading
-        SfxGrabBagItem aGrabBag = *(static_cast<const SfxGrabBagItem*>(GetFmtAttr(RES_CHRATR_GRABBAG)));
+        SfxGrabBagItem aGrabBag = *(static_cast<const SfxGrabBagItem*>(GetFormatAttr(RES_CHRATR_GRABBAG)));
         std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
         rMap.insert(std::pair<OUString, com::sun::star::uno::Any>("CharShadingMarker",uno::makeAny(true)));
         NewAttr(aGrabBag);
@@ -3882,9 +3882,9 @@ void SwWW8ImplReader::Read_NoLineNumb(sal_uInt16 , const sal_uInt8* pData, short
         m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_LINENUMBER );
         return;
     }
-    SwFmtLineNumber aLN;
-    if (const SwFmtLineNumber* pLN
-        = static_cast<const SwFmtLineNumber*>(GetFmtAttr(RES_LINENUMBER)))
+    SwFormatLineNumber aLN;
+    if (const SwFormatLineNumber* pLN
+        = static_cast<const SwFormatLineNumber*>(GetFormatAttr(RES_LINENUMBER)))
     {
         aLN.SetStartValue( pLN->GetStartValue() );
     }
@@ -3917,29 +3917,29 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
     short nPara = SVBT16ToShort( pData );
 
     SvxLRSpaceItem aLR( RES_LR_SPACE );
-    const SfxPoolItem* pLR = GetFmtAttr(RES_LR_SPACE);
+    const SfxPoolItem* pLR = GetFormatAttr(RES_LR_SPACE);
     if( pLR )
         aLR = *static_cast<const SvxLRSpaceItem*>(pLR);
 
     // Fix the regression issue: #i99822#: Discussion?
     // Since the list level formatting doesn't apply into paragraph style
     // for list levels of mode LABEL_ALIGNMENT.(see ww8par3.cxx
-    // W8ImplReader::RegisterNumFmtOnTxtNode).
+    // W8ImplReader::RegisterNumFormatOnTextNode).
     // Need to apply the list format to the paragraph here.
-    SwTxtNode* pTxtNode = m_pPaM->GetNode().GetTxtNode();
-    if( pTxtNode && pTxtNode->AreListLevelIndentsApplicable() )
+    SwTextNode* pTextNode = m_pPaM->GetNode().GetTextNode();
+    if( pTextNode && pTextNode->AreListLevelIndentsApplicable() )
     {
-        SwNumRule * pNumRule = pTxtNode->GetNumRule();
+        SwNumRule * pNumRule = pTextNode->GetNumRule();
         if( pNumRule )
         {
-            sal_uInt8 nLvl = static_cast< sal_uInt8 >(pTxtNode->GetActualListLevel());
-            const SwNumFmt* pFmt = pNumRule->GetNumFmt( nLvl );
-            if ( pFmt && pFmt->GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+            sal_uInt8 nLvl = static_cast< sal_uInt8 >(pTextNode->GetActualListLevel());
+            const SwNumFormat* pFormat = pNumRule->GetNumFormat( nLvl );
+            if ( pFormat && pFormat->GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aLR.SetTxtLeft( pFmt->GetIndentAt() );
-                aLR.SetTxtFirstLineOfst( static_cast<short>(pFmt->GetFirstLineIndent()) );
+                aLR.SetTextLeft( pFormat->GetIndentAt() );
+                aLR.SetTextFirstLineOfst( static_cast<short>(pFormat->GetFirstLineIndent()) );
                 // make paragraph have hard-set indent attributes
-                pTxtNode->SetAttr( aLR );
+                pTextNode->SetAttr( aLR );
             }
         }
     }
@@ -3979,7 +3979,7 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
         case     17:
         case 0x840F:
         case 0x845E:
-            aLR.SetTxtLeft( nPara );
+            aLR.SetTextLeft( nPara );
             if (m_pAktColl && m_nAktColl < m_vColl.size())
             {
                 m_vColl[m_nAktColl].bListReleventIndentSet = true;
@@ -4007,28 +4007,28 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
                 if (pIsZeroed && *pIsZeroed == 0)
                 {
                     const SvxLRSpaceItem &rLR =
-                        ItemGet<SvxLRSpaceItem>(*(m_vColl[m_nAktColl].pFmt),
+                        ItemGet<SvxLRSpaceItem>(*(m_vColl[m_nAktColl].pFormat),
                         RES_LR_SPACE);
-                    nPara = nPara - rLR.GetTxtFirstLineOfst();
+                    nPara = nPara - rLR.GetTextFirstLineOfst();
                 }
             }
 
-            aLR.SetTxtFirstLineOfst(nPara);
+            aLR.SetTextFirstLineOfst(nPara);
 
             if (!m_pAktColl)
             {
-                if (const SwTxtNode* pNode = m_pPaM->GetNode().GetTxtNode())
+                if (const SwTextNode* pNode = m_pPaM->GetNode().GetTextNode())
                 {
-                    if ( const SwNumFmt *pNumFmt = GetNumFmtFromTxtNode(*pNode) )
+                    if ( const SwNumFormat *pNumFormat = GetNumFormatFromTextNode(*pNode) )
                     {
                         if (!lcl_HasExplicitLeft(m_pPlcxMan, m_bVer67))
                         {
-                            aLR.SetTxtLeft(pNumFmt->GetIndentAt());
+                            aLR.SetTextLeft(pNumFormat->GetIndentAt());
 
                             // If have not explicit left, set number format list tab position is doc default tab
                             const SvxTabStopItem *pDefaultStopItem = static_cast<const SvxTabStopItem *>(m_rDoc.GetAttrPool().GetPoolDefaultItem(RES_PARATR_TABSTOP));
                             if ( pDefaultStopItem &&  pDefaultStopItem->Count() > 0 )
-                                const_cast<SwNumFmt*>(pNumFmt)->SetListtabPos( ((SvxTabStop&)(*pDefaultStopItem)[0]).GetTabPos() );
+                                const_cast<SwNumFormat*>(pNumFormat)->SetListtabPos( ((SvxTabStop&)(*pDefaultStopItem)[0]).GetTabPos() );
                         }
                     }
                 }
@@ -4102,7 +4102,7 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short
         if( n>200 ) n = 200;        // SW_UI-Maximum
         aLSpc.SetPropLineSpace( (const sal_uInt8)n );
         const SvxFontHeightItem* pH = static_cast<const SvxFontHeightItem*>(
-            GetFmtAttr( RES_CHRATR_FONTSIZE ));
+            GetFormatAttr( RES_CHRATR_FONTSIZE ));
         nSpaceTw = (sal_uInt16)( n * pH->GetHeight() / 100 );
     }
     else                            // Fixed / Minimum
@@ -4136,7 +4136,7 @@ void SwWW8ImplReader::Read_ParaAutoBefore(sal_uInt16, const sal_uInt8 *pData, sh
 
     if (*pData)
     {
-        SvxULSpaceItem aUL(*static_cast<const SvxULSpaceItem*>(GetFmtAttr(RES_UL_SPACE)));
+        SvxULSpaceItem aUL(*static_cast<const SvxULSpaceItem*>(GetFormatAttr(RES_UL_SPACE)));
         aUL.SetUpper(GetParagraphAutoSpace(m_pWDop->fDontUseHTMLAutoSpacing));
         NewAttr(aUL);
         if (m_pAktColl && m_nAktColl < m_vColl.size())
@@ -4163,7 +4163,7 @@ void SwWW8ImplReader::Read_ParaAutoAfter(sal_uInt16, const sal_uInt8 *pData, sho
 
     if (*pData)
     {
-        SvxULSpaceItem aUL(*static_cast<const SvxULSpaceItem*>(GetFmtAttr(RES_UL_SPACE)));
+        SvxULSpaceItem aUL(*static_cast<const SvxULSpaceItem*>(GetFormatAttr(RES_UL_SPACE)));
         aUL.SetLower(GetParagraphAutoSpace(m_pWDop->fDontUseHTMLAutoSpacing));
         NewAttr(aUL);
         if (m_pAktColl && m_nAktColl < m_vColl.size())
@@ -4205,7 +4205,7 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const sal_uInt8* pData, short nLe
     if( nPara < 0 )
         nPara = -nPara;
 
-    SvxULSpaceItem aUL( *static_cast<const SvxULSpaceItem*>(GetFmtAttr( RES_UL_SPACE )));
+    SvxULSpaceItem aUL( *static_cast<const SvxULSpaceItem*>(GetFormatAttr( RES_UL_SPACE )));
 
     switch( nId )
     {
@@ -4233,7 +4233,7 @@ void SwWW8ImplReader::Read_ParaContextualSpacing( sal_uInt16, const sal_uInt8* p
         m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_UL_SPACE );
         return;
     }
-    SvxULSpaceItem aUL( *static_cast<const SvxULSpaceItem*>(GetFmtAttr( RES_UL_SPACE )));
+    SvxULSpaceItem aUL( *static_cast<const SvxULSpaceItem*>(GetFormatAttr( RES_UL_SPACE )));
     aUL.SetContextValue(*pData);
     NewAttr( aUL );
 }
@@ -4302,7 +4302,7 @@ bool SwWW8ImplReader::IsRightToLeft()
     else
     {
         const SvxFrameDirectionItem* pItem=
-            static_cast<const SvxFrameDirectionItem*>(GetFmtAttr(RES_FRAMEDIR));
+            static_cast<const SvxFrameDirectionItem*>(GetFormatAttr(RES_FRAMEDIR));
         if (pItem && (pItem->GetValue() == FRMDIR_HORI_RIGHT_TOP))
             bRTL = true;
     }
@@ -4400,7 +4400,7 @@ void SwWW8ImplReader::Read_Emphasis( sal_uInt16, const sal_uInt8* pData, short n
         else
         {
             nLang = static_cast<const SvxLanguageItem *>(
-                GetFmtAttr(RES_CHRATR_CJK_LANGUAGE))->GetLanguage();
+                GetFormatAttr(RES_CHRATR_CJK_LANGUAGE))->GetLanguage();
         }
 
         sal_uInt16 nVal;
@@ -4465,7 +4465,7 @@ void SwWW8ImplReader::Read_Relief( sal_uInt16 nId, const sal_uInt8* pData, short
 // the actual value must be searched over the stack / template
 
             const SvxCharReliefItem* pOld = static_cast<const SvxCharReliefItem*>(
-                                            GetFmtAttr( RES_CHRATR_RELIEF ));
+                                            GetFormatAttr( RES_CHRATR_RELIEF ));
             FontRelief nNewValue = 0x854 == nId ? RELIEF_ENGRAVED
                                         : ( 0x858 == nId ? RELIEF_EMBOSSED
                                                          : RELIEF_NONE );
@@ -4479,7 +4479,7 @@ void SwWW8ImplReader::Read_Relief( sal_uInt16 nId, const sal_uInt8* pData, short
     }
 }
 
-void SwWW8ImplReader::Read_TxtAnim(sal_uInt16 /*nId*/, const sal_uInt8* pData, short nLen)
+void SwWW8ImplReader::Read_TextAnim(sal_uInt16 /*nId*/, const sal_uInt8* pData, short nLen)
 {
     if (nLen < 0)
         m_pCtrlStck->SetAttr(*m_pPaM->GetPoint(), RES_CHRATR_BLINK);
@@ -4735,7 +4735,7 @@ void SwWW8ImplReader::Read_Border(sal_uInt16 , const sal_uInt8*, short nLen)
                 // werden, sonst ist kein hartes Ausschalten von Style-Attrs
                 // moeglich
                 const SvxBoxItem* pBox
-                    = static_cast<const SvxBoxItem*>(GetFmtAttr( RES_BOX ));
+                    = static_cast<const SvxBoxItem*>(GetFormatAttr( RES_BOX ));
                 SvxBoxItem aBox(RES_BOX);
                 if (pBox)
                     aBox = *pBox;
@@ -4782,7 +4782,7 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 nId, const sal_uInt8* pData, sh
     else
     {
         const SvxBoxItem* pBox
-            = static_cast<const SvxBoxItem*>(GetFmtAttr( RES_CHRATR_BOX ));
+            = static_cast<const SvxBoxItem*>(GetFormatAttr( RES_CHRATR_BOX ));
         if( pBox )
         {
             SvxBoxItem aBoxItem(RES_CHRATR_BOX);
@@ -4819,7 +4819,7 @@ void SwWW8ImplReader::Read_Hyphenation( sal_uInt16, const sal_uInt8* pData, shor
     else
     {
         SvxHyphenZoneItem aAttr(
-            *static_cast<const SvxHyphenZoneItem*>(GetFmtAttr( RES_PARATR_HYPHENZONE ) ));
+            *static_cast<const SvxHyphenZoneItem*>(GetFormatAttr( RES_PARATR_HYPHENZONE ) ));
 
         aAttr.SetHyphen( 0 == *pData ); // sic !
 
@@ -4905,7 +4905,7 @@ void SwWW8ImplReader::Read_KeepLines( sal_uInt16, const sal_uInt8* pData, short
     if( nLen <= 0 )
         m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_PARATR_SPLIT );
     else
-        NewAttr( SvxFmtSplitItem( ( *pData & 1 ) == 0, RES_PARATR_SPLIT ) );
+        NewAttr( SvxFormatSplitItem( ( *pData & 1 ) == 0, RES_PARATR_SPLIT ) );
 }
 
 void SwWW8ImplReader::Read_KeepParas( sal_uInt16, const sal_uInt8* pData, short nLen )
@@ -4913,7 +4913,7 @@ void SwWW8ImplReader::Read_KeepParas( sal_uInt16, const sal_uInt8* pData, short
     if( nLen <= 0 )
         m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_KEEP );
     else
-        NewAttr( SvxFmtKeepItem( ( *pData & 1 ) != 0 , RES_KEEP) );
+        NewAttr( SvxFormatKeepItem( ( *pData & 1 ) != 0 , RES_KEEP) );
 }
 
 void SwWW8ImplReader::Read_BreakBefore( sal_uInt16, const sal_uInt8* pData, short nLen )
@@ -4921,7 +4921,7 @@ void SwWW8ImplReader::Read_BreakBefore( sal_uInt16, const sal_uInt8* pData, shor
     if( nLen <= 0 )
         m_pCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_BREAK );
     else
-        NewAttr( SvxFmtBreakItem(
+        NewAttr( SvxFormatBreakItem(
                 ( *pData & 1 ) ? SVX_BREAK_PAGE_BEFORE : SVX_BREAK_NONE, RES_BREAK ) );
 }
 
@@ -4986,8 +4986,8 @@ long SwWW8ImplReader::ImportExtSprm(WW8PLCFManResult* pRes)
 
     static const FNReadRecordExt aWwSprmTab[] =
     {
-        /* 0 (256) */   &SwWW8ImplReader::Read_Ftn,     // FootNote
-        /* 1 (257) */   &SwWW8ImplReader::Read_Ftn,     // EndNote
+        /* 0 (256) */   &SwWW8ImplReader::Read_Footnote,     // FootNote
+        /* 1 (257) */   &SwWW8ImplReader::Read_Footnote,     // EndNote
         /* 2 (258) */   &SwWW8ImplReader::Read_Field,  // Feld
         /* 3 (259) */   &SwWW8ImplReader::Read_Book,   // Bookmark
         /* 4 (260) */   &SwWW8ImplReader::Read_And,     // Annotation
@@ -5013,8 +5013,8 @@ void SwWW8ImplReader::EndExtSprm(sal_uInt16 nSprmId)
 
     static const FNReadRecordExt aWwSprmTab[] =
     {
-        /* 0 (256) */   &SwWW8ImplReader::End_Ftn,      // FootNote
-        /* 1 (257) */   &SwWW8ImplReader::End_Ftn,      // EndNote
+        /* 0 (256) */   &SwWW8ImplReader::End_Footnote,      // FootNote
+        /* 1 (257) */   &SwWW8ImplReader::End_Footnote,      // EndNote
         /* 2 (258) */   &SwWW8ImplReader::End_Field,  // Feld
         /* 3 (259) */   0,   // Bookmark
         /* 4 (260) */   0     // Annotation
@@ -5165,7 +5165,7 @@ const wwSprmDispatcher *GetWW2SprmDispatcher()
          {71, &SwWW8ImplReader::Read_Kern},          //"sprmCDxaSpace",
                                                      //chp.dxaSpace dxa word
          {72, &SwWW8ImplReader::Read_Language},      //"sprmCLid", chp.lid LID word
-         {73, &SwWW8ImplReader::Read_TxtColor},      //"sprmCIco", chp.ico ico byte
+         {73, &SwWW8ImplReader::Read_TextColor},      //"sprmCIco", chp.ico ico byte
          {74, &SwWW8ImplReader::Read_FontSize},      //"sprmCHps", chp.hps hps word!
          {75, 0},                                    //"sprmCHpsInc", chp.hps byte
          {76, &SwWW8ImplReader::Read_SubSuperProp},  //"sprmCHpsPos", chp.hpsPos
@@ -5178,7 +5178,7 @@ const wwSprmDispatcher *GetWW2SprmDispatcher()
          {81, &SwWW8ImplReader::Read_BoldBiDiUsw},   //sprmCFItalicBi
          {82, &SwWW8ImplReader::Read_FontCode},      //sprmCFtcBi
          {83, &SwWW8ImplReader::Read_Language},      //sprmClidBi
-         {84, &SwWW8ImplReader::Read_TxtColor},      //sprmCIcoBi
+         {84, &SwWW8ImplReader::Read_TextColor},      //sprmCIcoBi
          {85, &SwWW8ImplReader::Read_FontSize},      //sprmCHpsBi
          {86, 0},                                    //sprmCFBiDi
          {87, 0},                                    //sprmCFDiacColor
@@ -5305,8 +5305,8 @@ const wwSprmDispatcher *GetWW6SprmDispatcher()
                                                      //chp.fRMarkDel 1 or 0 bit
          {66, &SwWW8ImplReader::Read_CFRMark},       //"sprmCFRMark", chp.fRMark
                                                      //1 or 0 bit
-         {67, &SwWW8ImplReader::Read_FldVanish},     //"sprmCFFldVanish",
-                                                     //chp.fFldVanish 1 or 0 bit
+         {67, &SwWW8ImplReader::Read_FieldVanish},     //"sprmCFFieldVanish",
+                                                     //chp.fFieldVanish 1 or 0 bit
          {68, &SwWW8ImplReader::Read_PicLoc},        //"sprmCPicLocation",
                                                      //chp.fcPic and chp.fSpec
          {69, 0},                                    //"sprmCIbstRMark",
@@ -5363,7 +5363,7 @@ const wwSprmDispatcher *GetWW6SprmDispatcher()
          {96, &SwWW8ImplReader::Read_Kern},          //"sprmCDxaSpace",
                                                      //chp.dxaSpace dxa word
          {97, &SwWW8ImplReader::Read_Language},      //"sprmCLid", chp.lid LID word
-         {98, &SwWW8ImplReader::Read_TxtColor},      //"sprmCIco", chp.ico ico byte
+         {98, &SwWW8ImplReader::Read_TextColor},      //"sprmCIco", chp.ico ico byte
          {99, &SwWW8ImplReader::Read_FontSize},      //"sprmCHps", chp.hps hps word!
         {100, 0},                                    //"sprmCHpsInc", chp.hps byte
         {101, &SwWW8ImplReader::Read_SubSuperProp},  //"sprmCHpsPos", chp.hpsPos
@@ -5392,7 +5392,7 @@ const wwSprmDispatcher *GetWW6SprmDispatcher()
         {112, &SwWW8ImplReader::Read_FontCode},      //ww7 CJK font
         {113, &SwWW8ImplReader::Read_FontCode},      //ww7 rtl font
         {114, &SwWW8ImplReader::Read_Language},      //ww7 lid
-        {115, &SwWW8ImplReader::Read_TxtColor},      //ww7 rtl colour ?
+        {115, &SwWW8ImplReader::Read_TextColor},      //ww7 rtl colour ?
         {116, &SwWW8ImplReader::Read_FontSize},
         {117, &SwWW8ImplReader::Read_Special},       //"sprmCFSpec", chp.fSpec 1
                                                      //or 0 bit
@@ -5727,8 +5727,8 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
                                                      //chp.fRMarkDel;1 or 0;bit;
         {0x0801, &SwWW8ImplReader::Read_CFRMark},    //"sprmCFRMark" chp.fRMark;1
                                                      //or 0;bit;
-        {0x0802, &SwWW8ImplReader::Read_FldVanish},  //"sprmCFFldVanish"
-                                                     //chp.fFldVanish;1 or 0;bit;
+        {0x0802, &SwWW8ImplReader::Read_FieldVanish},  //"sprmCFFieldVanish"
+                                                     //chp.fFieldVanish;1 or 0;bit;
         {0x6A03, &SwWW8ImplReader::Read_PicLoc},     //"sprmCPicLocation" chp.fcPic
                                                      //and chp.fSpec;variable
                                                      //length, length recorded is
@@ -5800,7 +5800,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
                                                      //dxa;word;
         {0x4A41, &SwWW8ImplReader::Read_Language},   //"sprmCLid" ;only used
                                                      //internally never stored;word;
-        {0x2A42, &SwWW8ImplReader::Read_TxtColor},   //"sprmCIco" chp.ico;ico;byte;
+        {0x2A42, &SwWW8ImplReader::Read_TextColor},   //"sprmCIco" chp.ico;ico;byte;
         {0x4A43, &SwWW8ImplReader::Read_FontSize},   //"sprmCHps" chp.hps;hps;byte;
         {0x2A44, 0},                                 //"sprmCHpsInc" chp.hps;byte;
         {0x4845, &SwWW8ImplReader::Read_SubSuperProp},//"sprmCHpsPos" chp.hpsPos;
@@ -5860,7 +5860,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
                                                      //recorded as 7 bytes;
         {0x0858, &SwWW8ImplReader::Read_Relief},     //"sprmCFEmboss" chp.fEmboss;
                                                      //1 or 0;bit;
-        {0x2859, &SwWW8ImplReader::Read_TxtAnim},    //"sprmCSfxText" chp.sfxtText;
+        {0x2859, &SwWW8ImplReader::Read_TextAnim},    //"sprmCSfxText" chp.sfxtText;
                                                      //text animation;byte;
         {0x085A, &SwWW8ImplReader::Read_Bidi},                                 //"sprmCFBiDi"
         {0x085B, 0},                                 //"sprmCFDiacColor"
@@ -5870,10 +5870,10 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
         {0x485F, &SwWW8ImplReader::Read_Language},   //"sprmCLidBi"
       //0x4A60, ? ? ?,                               //"sprmCIcoBi",
         {0x4A61, &SwWW8ImplReader::Read_FontSize},   //"sprmCHpsBi"
-        {0xCA62, 0},                                 //"sprmCDispFldRMark"
-                                                     //chp.fDispFldRMark,
-                                                     //chp.ibstDispFldRMark,
-                                                     //chp.dttmDispFldRMark ;
+        {0xCA62, 0},                                 //"sprmCDispFieldRMark"
+                                                     //chp.fDispFieldRMark,
+                                                     //chp.ibstDispFieldRMark,
+                                                     //chp.dttmDispFieldRMark ;
                                                      //Complex;variable length
                                                      //always recorded as 39 bytes;
         {0x4863, 0},                                 //"sprmCIbstRMarkDel"
@@ -6136,14 +6136,14 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
                                                      // subtable "sprmPFTtp"
         {0x6815, 0},                                 //undocumented
         {0x6816, 0},                                 //undocumented
-        {NS_sprm::LN_CCv, &SwWW8ImplReader::Read_TxtForeColor},
+        {NS_sprm::LN_CCv, &SwWW8ImplReader::Read_TextForeColor},
         {0x6877, &SwWW8ImplReader::Read_UnderlineColor},
         {0xC64D, &SwWW8ImplReader::Read_ParaBackColor},
         {0x6467, 0},                                 //undocumented
         {0xF617, 0},                                 //undocumented
         {0xD660, 0},                                 //undocumented
         {0xD670, 0},                                 //undocumented
-        {0xCA71, &SwWW8ImplReader::Read_TxtBackColor},//"sprmCShd"
+        {0xCA71, &SwWW8ImplReader::Read_TextBackColor},//"sprmCShd"
         {0x303C, 0},                                 //undocumented
         {0x245B, &SwWW8ImplReader::Read_ParaAutoBefore},//undocumented, para
         {0x245C, &SwWW8ImplReader::Read_ParaAutoAfter},//undocumented, para
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 0afbef8749c1..0446bfc69aea 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -167,7 +167,7 @@ const wwSprmSearcher *wwSprmParser::GetWW2SprmSearcher()
         { 52, { 0, L_FIX} }, // "?sprmPRuler 52"
         { 53, { 1, L_FIX} }, // "sprmCFStrikeRM" chp.fRMarkDel 1 or 0 bit
         { 54, { 1, L_FIX} }, // "sprmCFRMark" chp.fRMark 1 or 0 bit
-        { 55, { 1, L_FIX} }, // "sprmCFFldVanish" chp.fFldVanish 1 or 0 bit
+        { 55, { 1, L_FIX} }, // "sprmCFFieldVanish" chp.fFieldVanish 1 or 0 bit
         { 57, { 0, L_VAR} }, // "sprmCDefault" whole CHP
         { 58, { 0, L_FIX} }, // "sprmCPlain" whole CHP
         { 60, { 1, L_FIX} }, // "sprmCFBold" chp.fBold 0,1, 128, or 129
@@ -319,7 +319,7 @@ const wwSprmSearcher *wwSprmParser::GetWW6SprmSearcher()
         { 64, { 0, L_VAR} }, // rtl property ?
         { 65, { 1, L_FIX} }, // "sprmCFStrikeRM" chp.fRMarkDel 1 or 0 bit
         { 66, { 1, L_FIX} }, // "sprmCFRMark" chp.fRMark 1 or 0 bit
-        { 67, { 1, L_FIX} }, // "sprmCFFldVanish" chp.fFldVanish 1 or 0 bit
+        { 67, { 1, L_FIX} }, // "sprmCFFieldVanish" chp.fFieldVanish 1 or 0 bit
         { 68, { 0, L_VAR} }, // "sprmCPicLocation" chp.fcPic and chp.fSpec
         { 69, { 2, L_FIX} }, // "sprmCIbstRMark" chp.ibstRMark index into sttbRMark
         { 70, { 4, L_FIX} }, // "sprmCDttmRMark" chp.dttm DTTM long
@@ -534,7 +534,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
         {0x2448, { 1, L_FIX} }, // "sprmPFAdjustRight" pap.fAdjustRight;1 or 0;byte;
         {0x0800, { 1, L_FIX} }, // "sprmCFRMarkDel" chp.fRMarkDel;1 or 0;bit;
         {0x0801, { 1, L_FIX} }, // "sprmCFRMark" chp.fRMark;1 or 0;bit;
-        {0x0802, { 1, L_FIX} }, // "sprmCFFldVanish" chp.fFldVanish;1 or 0;bit;
+        {0x0802, { 1, L_FIX} }, // "sprmCFFieldVanish" chp.fFieldVanish;1 or 0;bit;
         {0x6A03, { 4, L_FIX} }, // "sprmCPicLocation" chp.fcPic and chp.fSpec;
         {0x4804, { 2, L_FIX} }, // "sprmCIbstRMark" chp.ibstRMark;index into
                             // sttbRMark
@@ -613,8 +613,8 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
         {0x485F, { 2, L_FIX} }, // "sprmCLidBi" ;;;
         {0x4A60, { 1, L_FIX} }, // "sprmCIcoBi" ;;;
         {0x4A61, { 2, L_FIX} }, // "sprmCHpsBi" ;;;
-        {0xCA62, { 0, L_VAR} }, // "sprmCDispFldRMark" chp.fDispFldRMark,
-                            // chp.ibstDispFldRMark, chp.dttmDispFldRMark ;
+        {0xCA62, { 0, L_VAR} }, // "sprmCDispFieldRMark" chp.fDispFieldRMark,
+                            // chp.ibstDispFieldRMark, chp.dttmDispFieldRMark ;
         {0x4863, { 2, L_FIX} }, // "sprmCIbstRMarkDel" chp.ibstRMarkDel;index into
                             // sttbRMark;short;
         {NS_sprm::LN_CDttmRMarkDel, { 4, L_FIX} }, // chp.dttmRMarkDel;DTTM;long;
@@ -1069,7 +1069,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p)
                     0x2436,0x2437,0x2438,0x0000,
                     // sprmNoop, sprmPISnapBaseLine, sprmNoop, sprmNoop
                     0x0000,0x243B,0x000,0x0000,
-                    // sprmNoop, sprmCFStrikeRM, sprmCFRMark, sprmCFFldVanish
+                    // sprmNoop, sprmCFStrikeRM, sprmCFRMark, sprmCFFieldVanish
                     0x0000,0x0800,0x0801,0x0802,
                     // sprmNoop, sprmNoop, sprmNoop, sprmCFData
                     0x0000,0x0000,0x0000,0x0806,
@@ -1612,13 +1612,13 @@ void WW8ScannerBase::DeletePieceTable()
     }
 }
 
-WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
+WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTableSt,
     SvStream* pDataSt, WW8Fib* pWwFib )
     : pWw8Fib(pWwFib), pMainFdoa(0), pHdFtFdoa(0), pMainTxbx(0),
     pMainTxbxBkd(0), pHdFtTxbx(0), pHdFtTxbxBkd(0), pMagicTables(0),
     pSubdocs(0), pExtendedAtrds(0), pPieceGrpprls(0)
 {
-    pPiecePLCF = OpenPieceTable( pTblSt, pWw8Fib );             // Complex
+    pPiecePLCF = OpenPieceTable( pTableSt, pWw8Fib );             // Complex
     if( pPiecePLCF )
     {
         pPieceIter = new WW8PLCFpcd_Iter( *pPiecePLCF );
@@ -1635,38 +1635,38 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
     }
 
     // pChpPLCF and pPapPLCF may NOT be created before pPLCFx_PCD !!
-    pChpPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, CHP ); // CHPX
-    pPapPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, PAP ); // PAPX
+    pChpPLCF = new WW8PLCFx_Cp_FKP( pSt, pTableSt, pDataSt, *this, CHP ); // CHPX
+    pPapPLCF = new WW8PLCFx_Cp_FKP( pSt, pTableSt, pDataSt, *this, PAP ); // PAPX
 
-    pSepPLCF = new WW8PLCFx_SEPX(   pSt, pTblSt, *pWwFib, 0 );          // SEPX
+    pSepPLCF = new WW8PLCFx_SEPX(   pSt, pTableSt, *pWwFib, 0 );          // SEPX
 
     // Footnotes
-    pFtnPLCF = new WW8PLCFx_SubDoc( pTblSt, pWwFib->GetFIBVersion(), 0,
-        pWwFib->fcPlcffndRef, pWwFib->lcbPlcffndRef, pWwFib->fcPlcffndTxt,
-        pWwFib->lcbPlcffndTxt, 2 );
+    pFootnotePLCF = new WW8PLCFx_SubDoc( pTableSt, pWwFib->GetFIBVersion(), 0,
+        pWwFib->fcPlcffndRef, pWwFib->lcbPlcffndRef, pWwFib->fcPlcffndText,
+        pWwFib->lcbPlcffndText, 2 );
     // Endnotes
-    pEdnPLCF = new WW8PLCFx_SubDoc( pTblSt, pWwFib->GetFIBVersion(), 0,
-        pWwFib->fcPlcfendRef, pWwFib->lcbPlcfendRef, pWwFib->fcPlcfendTxt,
-        pWwFib->lcbPlcfendTxt, 2 );
+    pEdnPLCF = new WW8PLCFx_SubDoc( pTableSt, pWwFib->GetFIBVersion(), 0,
+        pWwFib->fcPlcfendRef, pWwFib->lcbPlcfendRef, pWwFib->fcPlcfendText,
+        pWwFib->lcbPlcfendText, 2 );
     // Comments
-    pAndPLCF = new WW8PLCFx_SubDoc( pTblSt, pWwFib->GetFIBVersion(), 0,
-        pWwFib->fcPlcfandRef, pWwFib->lcbPlcfandRef, pWwFib->fcPlcfandTxt,
-        pWwFib->lcbPlcfandTxt, IsSevenMinus(pWwFib->GetFIBVersion()) ? 20 : 30);
+    pAndPLCF = new WW8PLCFx_SubDoc( pTableSt, pWwFib->GetFIBVersion(), 0,
+        pWwFib->fcPlcfandRef, pWwFib->lcbPlcfandRef, pWwFib->fcPlcfandText,
+        pWwFib->lcbPlcfandText, IsSevenMinus(pWwFib->GetFIBVersion()) ? 20 : 30);
 
     // Fields Main Text
-    pFldPLCF    = new WW8PLCFx_FLD(pTblSt, *pWwFib, MAN_MAINTEXT);
+    pFieldPLCF    = new WW8PLCFx_FLD(pTableSt, *pWwFib, MAN_MAINTEXT);
     // Fields Header / Footer
-    pFldHdFtPLCF= new WW8PLCFx_FLD(pTblSt, *pWwFib, MAN_HDFT);
+    pFieldHdFtPLCF= new WW8PLCFx_FLD(pTableSt, *pWwFib, MAN_HDFT);
     // Fields Footnote
-    pFldFtnPLCF = new WW8PLCFx_FLD(pTblSt, *pWwFib, MAN_FTN);
+    pFieldFootnotePLCF = new WW8PLCFx_FLD(pTableSt, *pWwFib, MAN_FTN);
     // Fields Endnote
-    pFldEdnPLCF = new WW8PLCFx_FLD(pTblSt, *pWwFib, MAN_EDN);
+    pFieldEdnPLCF = new WW8PLCFx_FLD(pTableSt, *pWwFib, MAN_EDN);
     // Fields Comments
-    pFldAndPLCF = new WW8PLCFx_FLD(pTblSt, *pWwFib, MAN_AND);
+    pFieldAndPLCF = new WW8PLCFx_FLD(pTableSt, *pWwFib, MAN_AND);
     // Fields in Textboxes in Main Text
-    pFldTxbxPLCF= new WW8PLCFx_FLD(pTblSt, *pWwFib, MAN_TXBX);
+    pFieldTxbxPLCF= new WW8PLCFx_FLD(pTableSt, *pWwFib, MAN_TXBX);
     // Fields in Textboxes in Header / Footer
-    pFldTxbxHdFtPLCF = new WW8PLCFx_FLD(pTblSt,*pWwFib,MAN_TXBX_HDFT);
+    pFieldTxbxHdFtPLCF = new WW8PLCFx_FLD(pTableSt,*pWwFib,MAN_TXBX_HDFT);
 
     // Note: 6 stands for "6 OR 7",  7 stands for "ONLY 7"
     switch( pWw8Fib->nVersion )
@@ -1675,62 +1675,62 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
         case 7:
             if( pWwFib->fcPlcfdoaMom && pWwFib->lcbPlcfdoaMom )
             {
-                pMainFdoa = new WW8PLCFspecial( pTblSt, pWwFib->fcPlcfdoaMom,
+                pMainFdoa = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcfdoaMom,
                     pWwFib->lcbPlcfdoaMom, 6 );
             }
             if( pWwFib->fcPlcfdoaHdr && pWwFib->lcbPlcfdoaHdr )
             {
-                pHdFtFdoa = new WW8PLCFspecial( pTblSt, pWwFib->fcPlcfdoaHdr,
+                pHdFtFdoa = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcfdoaHdr,
                 pWwFib->lcbPlcfdoaHdr, 6 );
             }
             break;
         case 8:
             if( pWwFib->fcPlcfspaMom && pWwFib->lcbPlcfspaMom )
             {
-                pMainFdoa = new WW8PLCFspecial( pTblSt, pWwFib->fcPlcfspaMom,
+                pMainFdoa = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcfspaMom,
                     pWwFib->lcbPlcfspaMom, 26 );
             }
             if( pWwFib->fcPlcfspaHdr && pWwFib->lcbPlcfspaHdr )
             {
-                pHdFtFdoa = new WW8PLCFspecial( pTblSt, pWwFib->fcPlcfspaHdr,
+                pHdFtFdoa = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcfspaHdr,
                     pWwFib->lcbPlcfspaHdr, 26 );
             }
             // PLCF for TextBox break-descriptors in the main text
             if( pWwFib->fcPlcftxbxBkd && pWwFib->lcbPlcftxbxBkd )
             {
-                pMainTxbxBkd = new WW8PLCFspecial( pTblSt,
+                pMainTxbxBkd = new WW8PLCFspecial( pTableSt,
                     pWwFib->fcPlcftxbxBkd, pWwFib->lcbPlcftxbxBkd, 0);
             }
             // PLCF for TextBox break-descriptors in Header/Footer range
             if( pWwFib->fcPlcfHdrtxbxBkd && pWwFib->lcbPlcfHdrtxbxBkd )
             {
-                pHdFtTxbxBkd = new WW8PLCFspecial( pTblSt,
+                pHdFtTxbxBkd = new WW8PLCFspecial( pTableSt,
                     pWwFib->fcPlcfHdrtxbxBkd, pWwFib->lcbPlcfHdrtxbxBkd, 0);
             }
             // Sub table cp positions
             if (pWwFib->fcPlcfTch && pWwFib->lcbPlcfTch)
             {
-                pMagicTables = new WW8PLCFspecial( pTblSt,
+                pMagicTables = new WW8PLCFspecial( pTableSt,
                     pWwFib->fcPlcfTch, pWwFib->lcbPlcfTch, 4);
             }
             // Sub document cp positions
             if (pWwFib->fcPlcfwkb && pWwFib->lcbPlcfwkb)
             {
-                pSubdocs = new WW8PLCFspecial( pTblSt,
+                pSubdocs = new WW8PLCFspecial( pTableSt,
                     pWwFib->fcPlcfwkb, pWwFib->lcbPlcfwkb, 12);
             }
             // Extended ATRD
             if (pWwFib->fcAtrdExtra && pWwFib->lcbAtrdExtra)
             {
-                sal_Size nOldPos = pTblSt->Tell();
-                if (checkSeek(*pTblSt, pWwFib->fcAtrdExtra) && (pTblSt->remainingSize() >= pWwFib->lcbAtrdExtra))
+                sal_Size nOldPos = pTableSt->Tell();
+                if (checkSeek(*pTableSt, pWwFib->fcAtrdExtra) && (pTableSt->remainingSize() >= pWwFib->lcbAtrdExtra))
                 {
                     pExtendedAtrds = new sal_uInt8[pWwFib->lcbAtrdExtra];
-                    pWwFib->lcbAtrdExtra = pTblSt->Read(pExtendedAtrds, pWwFib->lcbAtrdExtra);
+                    pWwFib->lcbAtrdExtra = pTableSt->Read(pExtendedAtrds, pWwFib->lcbAtrdExtra);
                 }
                 else
                     pWwFib->lcbAtrdExtra = 0;
-                pTblSt->Seek(nOldPos);
+                pTableSt->Seek(nOldPos);
             }
 
             break;
@@ -1741,21 +1741,21 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
 
     // PLCF for TextBox stories in main text
     sal_uInt32 nLenTxBxS = (8 > pWw8Fib->nVersion) ? 0 : 22;
-    if( pWwFib->fcPlcftxbxTxt && pWwFib->lcbPlcftxbxTxt )
+    if( pWwFib->fcPlcftxbxText && pWwFib->lcbPlcftxbxText )
     {
-        pMainTxbx = new WW8PLCFspecial( pTblSt, pWwFib->fcPlcftxbxTxt,
-            pWwFib->lcbPlcftxbxTxt, nLenTxBxS );
+        pMainTxbx = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcftxbxText,
+            pWwFib->lcbPlcftxbxText, nLenTxBxS );
     }
 
     // PLCF for TextBox stories in Header/Footer range
-    if( pWwFib->fcPlcfHdrtxbxTxt && pWwFib->lcbPlcfHdrtxbxTxt )
+    if( pWwFib->fcPlcfHdrtxbxText && pWwFib->lcbPlcfHdrtxbxText )
     {
-        pHdFtTxbx = new WW8PLCFspecial( pTblSt, pWwFib->fcPlcfHdrtxbxTxt,
-            pWwFib->lcbPlcfHdrtxbxTxt, nLenTxBxS );
+        pHdFtTxbx = new WW8PLCFspecial( pTableSt, pWwFib->fcPlcfHdrtxbxText,
+            pWwFib->lcbPlcfHdrtxbxText, nLenTxBxS );
     }
 
-    pBook = new WW8PLCFx_Book(pTblSt, *pWwFib);
-    pAtnBook = new WW8PLCFx_AtnBook(pTblSt, *pWwFib);
+    pBook = new WW8PLCFx_Book(pTableSt, *pWwFib);
+    pAtnBook = new WW8PLCFx_AtnBook(pTableSt, *pWwFib);
 }
 
 WW8ScannerBase::~WW8ScannerBase()
@@ -1767,15 +1767,15 @@ WW8ScannerBase::~WW8ScannerBase()
     delete pPiecePLCF;
     delete pAtnBook;
     delete pBook;
-    delete pFldEdnPLCF;
-    delete pFldFtnPLCF;
-    delete pFldAndPLCF;
-    delete pFldHdFtPLCF;
-    delete pFldPLCF;
-    delete pFldTxbxPLCF;
-    delete pFldTxbxHdFtPLCF;
+    delete pFieldEdnPLCF;
+    delete pFieldFootnotePLCF;
+    delete pFieldAndPLCF;
+    delete pFieldHdFtPLCF;
+    delete pFieldPLCF;
+    delete pFieldTxbxPLCF;
+    delete pFieldTxbxHdFtPLCF;
     delete pEdnPLCF;
-    delete pFtnPLCF;
+    delete pFootnotePLCF;
     delete pAndPLCF;
     delete pSepPLCF;
     delete pPapPLCF;
@@ -1902,7 +1902,7 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF)
     if((static_cast<sal_uInt8*>(pData)[0] & 0x1f ) == 0x15 )
     {
         // Field end ?
-        // INDEX-Fld has set Bit7?
+        // INDEX-Field has set Bit7?
         rF.nOpt = static_cast<sal_uInt8*>(pData)[1];                // yes -> copy flags
     }else{
         rF.nId = 0;                                      // no -> Field invalid
@@ -2905,7 +2905,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
     return true;
 }
 
-WW8PLCFx_Fc_FKP::WW8PLCFx_Fc_FKP(SvStream* pSt, SvStream* pTblSt,
+WW8PLCFx_Fc_FKP::WW8PLCFx_Fc_FKP(SvStream* pSt, SvStream* pTableSt,
     SvStream* pDataSt, const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL)
     : WW8PLCFx(rFib.GetFIBVersion(), true), pFKPStrm(pSt), pDataStrm(pDataSt),
     pFkp(0), ePLCF(ePl), pPCDAttrs(0)
@@ -2914,12 +2914,12 @@ WW8PLCFx_Fc_FKP::WW8PLCFx_Fc_FKP(SvStream* pSt, SvStream* pTblSt,
     long nLenStruct = (8 > rFib.nVersion) ? 2 : 4;
     if (ePl == CHP)
     {
-        pPLCF = new WW8PLCF(*pTblSt, rFib.fcPlcfbteChpx, rFib.lcbPlcfbteChpx,
+        pPLCF = new WW8PLCF(*pTableSt, rFib.fcPlcfbteChpx, rFib.lcbPlcfbteChpx,
             nLenStruct, GetStartFc(), rFib.pnChpFirst, rFib.cpnBteChp);
     }
     else
     {
-        pPLCF = new WW8PLCF(*pTblSt, rFib.fcPlcfbtePapx, rFib.lcbPlcfbtePapx,
+        pPLCF = new WW8PLCF(*pTableSt, rFib.fcPlcfbtePapx, rFib.lcbPlcfbtePapx,
             nLenStruct, GetStartFc(), rFib.pnPapFirst, rFib.cpnBtePap);
     }
 }
@@ -3117,9 +3117,9 @@ bool WW8PLCFx_Fc_FKP::HasSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rR
     return !rResult.empty();
 }
 
-WW8PLCFx_Cp_FKP::WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt,
+WW8PLCFx_Cp_FKP::WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTableSt,
     SvStream* pDataSt, const WW8ScannerBase& rBase, ePLCFT ePl )
-    : WW8PLCFx_Fc_FKP(pSt, pTblSt, pDataSt, *rBase.pWw8Fib, ePl,
+    : WW8PLCFx_Fc_FKP(pSt, pTableSt, pDataSt, *rBase.pWw8Fib, ePl,
     rBase.WW8Cp2Fc(0)), rSBase(rBase), nAttrStart(-1), nAttrEnd(-1),
     bLineEnd(false),
     bComplex( (7 < rBase.pWw8Fib->nVersion) || rBase.pWw8Fib->fComplex )
@@ -3405,13 +3405,13 @@ void WW8PLCFx_Cp_FKP::advance()
     bLineEnd = (ePLCF == PAP);
 }
 
-WW8PLCFx_SEPX::WW8PLCFx_SEPX(SvStream* pSt, SvStream* pTblSt,
+WW8PLCFx_SEPX::WW8PLCFx_SEPX(SvStream* pSt, SvStream* pTableSt,
     const WW8Fib& rFib, WW8_CP nStartCp)
     : WW8PLCFx(rFib.GetFIBVersion(), true), maSprmParser(rFib.GetFIBVersion()),
     pStrm(pSt), nArrMax(256), nSprmSiz(0)
 {
     pPLCF =   rFib.lcbPlcfsed
-            ? new WW8PLCF(*pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed,
+            ? new WW8PLCF(*pTableSt, rFib.fcPlcfsed, rFib.lcbPlcfsed,
               GetFIBVersion() <= ww::eWW2 ? 6 : 12, nStartCp)
             : 0;
 
@@ -3589,28 +3589,28 @@ const sal_uInt8* WW8PLCFx_SEPX::HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const
 }
 
 WW8PLCFx_SubDoc::WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion,
-    WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcTxt, long nLenTxt,
+    WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcText, long nLenText,
     long nStruct)
-    : WW8PLCFx(eVersion, true), pRef(0), pTxt(0)
+    : WW8PLCFx(eVersion, true), pRef(0), pText(0)
 {
-    if( nLenRef && nLenTxt )
+    if( nLenRef && nLenText )
     {
         pRef = new WW8PLCF(*pSt, nFcRef, nLenRef, nStruct, nStartCp);
-        pTxt = new WW8PLCF(*pSt, nFcTxt, nLenTxt, 0, nStartCp);
+        pText = new WW8PLCF(*pSt, nFcText, nLenText, 0, nStartCp);
     }
 }
 
 WW8PLCFx_SubDoc::~WW8PLCFx_SubDoc()
 {
     delete pRef;
-    delete pTxt;
+    delete pText;
 }
 
 sal_uInt32 WW8PLCFx_SubDoc::GetIdx() const
 {
-    // Probably pTxt ... no need for it
+    // Probably pText ... no need for it
     if( pRef )
-        return ( pRef->GetIdx() << 16 | pTxt->GetIdx() );
+        return ( pRef->GetIdx() << 16 | pText->GetIdx() );
     return 0;
 }
 
@@ -3619,8 +3619,8 @@ void WW8PLCFx_SubDoc::SetIdx( sal_uLong nIdx )
     if( pRef )
     {
         pRef->SetIdx( nIdx >> 16 );
-        // Probably pTxt ... no need for it
-        pTxt->SetIdx( nIdx & 0xFFFF );
+        // Probably pText ... no need for it
+        pText->SetIdx( nIdx & 0xFFFF );
     }
 }
 
@@ -3656,12 +3656,12 @@ void WW8PLCFx_SubDoc::GetSprms(WW8PLCFxDesc* p)
 
     p->nEndPos = p->nStartPos + 1;
 
-    if (!pTxt)
+    if (!pText)
         return;
 
-    pTxt->SetIdx(nNr);
+    pText->SetIdx(nNr);
 
-    if (!pTxt->Get(p->nCp2OrIdx, p->nSprmsLen, pData))
+    if (!pText->Get(p->nCp2OrIdx, p->nSprmsLen, pData))
     {
         p->nEndPos = p->nStartPos = WW8_CP_MAX;
         p->nSprmsLen = 0;
@@ -3673,10 +3673,10 @@ void WW8PLCFx_SubDoc::GetSprms(WW8PLCFxDesc* p)
 
 void WW8PLCFx_SubDoc::advance()
 {
-    if (pRef && pTxt)
+    if (pRef && pText)
     {
         pRef->advance();
-        pTxt->advance();
+        pText->advance();
     }
 }
 
@@ -3693,8 +3693,8 @@ WW8PLCFx_FLD::WW8PLCFx_FLD( SvStream* pSt, const WW8Fib& rMyFib, short nType)
         nLen = rFib.lcbPlcffldHdr;
         break;
     case MAN_FTN:
-        nFc = rFib.fcPlcffldFtn;
-        nLen = rFib.lcbPlcffldFtn;
+        nFc = rFib.fcPlcffldFootnote;
+        nLen = rFib.lcbPlcffldFootnote;
         break;
     case MAN_EDN:
         nFc = rFib.fcPlcffldEdn;
@@ -3983,7 +3983,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen
     rStrm.Seek(nOldPos);
 }
 
-WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTblSt, const WW8Fib& rFib)
+WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTableSt, const WW8Fib& rFib)
     : WW8PLCFx(rFib.GetFIBVersion(), false), pStatus(0), nIsEnd(0), nBookmarkId(1)
 {
     if( !rFib.fcPlcfbkf || !rFib.lcbPlcfbkf || !rFib.fcPlcfbkl ||
@@ -3994,13 +3994,13 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTblSt, const WW8Fib& rFib)
     }
     else
     {
-        pBook[0] = new WW8PLCFspecial(pTblSt,rFib.fcPlcfbkf,rFib.lcbPlcfbkf,4);
+        pBook[0] = new WW8PLCFspecial(pTableSt,rFib.fcPlcfbkf,rFib.lcbPlcfbkf,4);
 
-        pBook[1] = new WW8PLCFspecial(pTblSt,rFib.fcPlcfbkl,rFib.lcbPlcfbkl,0);
+        pBook[1] = new WW8PLCFspecial(pTableSt,rFib.fcPlcfbkl,rFib.lcbPlcfbkl,0);
 
         rtl_TextEncoding eStructChrSet = WW8Fib::GetFIBCharset(rFib.chseTables, rFib.lid);
 
-        WW8ReadSTTBF( (7 < rFib.nVersion), *pTblSt, rFib.fcSttbfbkmk,
+        WW8ReadSTTBF( (7 < rFib.nVersion), *pTableSt, rFib.fcSttbfbkmk,
             rFib.lcbSttbfbkmk, 0, eStructChrSet, aBookNames );
 
         nIMax = aBookNames.size();
@@ -4248,7 +4248,7 @@ const OUString* WW8PLCFx_Book::GetName() const
     return pRet;
 }
 
-WW8PLCFx_AtnBook::WW8PLCFx_AtnBook(SvStream* pTblSt, const WW8Fib& rFib)
+WW8PLCFx_AtnBook::WW8PLCFx_AtnBook(SvStream* pTableSt, const WW8Fib& rFib)
     : WW8PLCFx(rFib.GetFIBVersion(), /*bSprm=*/false),
     m_bIsEnd(false)
 {
@@ -4259,8 +4259,8 @@ WW8PLCFx_AtnBook::WW8PLCFx_AtnBook(SvStream* pTblSt, const WW8Fib& rFib)
     }
     else
     {
-        m_pBook[0] = new WW8PLCFspecial(pTblSt, rFib.fcPlcfAtnbkf, rFib.lcbPlcfAtnbkf, 4);
-        m_pBook[1] = new WW8PLCFspecial(pTblSt, rFib.fcPlcfAtnbkl, rFib.lcbPlcfAtnbkl, 0);
+        m_pBook[0] = new WW8PLCFspecial(pTableSt, rFib.fcPlcfAtnbkf, rFib.lcbPlcfAtnbkf, 4);
+        m_pBook[1] = new WW8PLCFspecial(pTableSt, rFib.fcPlcfAtnbkl, rFib.lcbPlcfAtnbkl, 0);
 
         nIMax = m_pBook[0]->GetIMax();
         if (m_pBook[1]->GetIMax() < nIMax)
@@ -4477,9 +4477,9 @@ sal_uInt16 WW8PLCFMan::GetId(const WW8PLCFxDesc* p) const
 {
     sal_uInt16 nId = 0;        // Id = 0 for empty attributes
 
-    if (p == pFld)
+    if (p == pField)
         nId = eFLD;
-    else if (p == pFtn)
+    else if (p == pFootnote)
         nId = eFTN;
     else if (p == pEdn)
         nId = eEDN;
@@ -4507,10 +4507,10 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
     {
         // Suchreihenfolge der Attribute
         nPLCF = MAN_ANZ_PLCF;
-        pFld = &aD[0];
+        pField = &aD[0];
         pBkm = &aD[1];
         pEdn = &aD[2];
-        pFtn = &aD[3];
+        pFootnote = &aD[3];
         pAnd = &aD[4];
 
         pPcd = ( pBase->pPLCFx_PCD ) ? &aD[5] : 0;
@@ -4523,7 +4523,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
         pAtnBkm = &aD[10];
 
         pSep->pPLCFx = pBase->pSepPLCF;
-        pFtn->pPLCFx = pBase->pFtnPLCF;
+        pFootnote->pPLCFx = pBase->pFootnotePLCF;
         pEdn->pPLCFx = pBase->pEdnPLCF;
         pBkm->pPLCFx = pBase->pBook;
         pAnd->pPLCFx = pBase->pAndPLCF;
@@ -4534,7 +4534,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
     {
         // Suchreihenfolge der Attribute
         nPLCF = 7;
-        pFld = &aD[0];
+        pField = &aD[0];
         pBkm = ( pBase->pBook ) ? &aD[1] : 0;
 
         pPcd = ( pBase->pPLCFx_PCD ) ? &aD[2] : 0;
@@ -4545,7 +4545,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
         pPap = &aD[5];
         pSep = &aD[6]; // Dummy
 
-        pAnd = pAtnBkm = pFtn = pEdn = 0;     // unbenutzt bei SpezText
+        pAnd = pAtnBkm = pFootnote = pEdn = 0;     // unbenutzt bei SpezText
     }
 
     pChp->pPLCFx = pBase->pChpPLCF;
@@ -4564,37 +4564,37 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
     switch( nType )                 // Feld-Initialisierung
     {
         case MAN_HDFT:
-            pFld->pPLCFx = pBase->pFldHdFtPLCF;
+            pField->pPLCFx = pBase->pFieldHdFtPLCF;
             pFdoa = pBase->pHdFtFdoa;
             pTxbx = pBase->pHdFtTxbx;
             pTxbxBkd = pBase->pHdFtTxbxBkd;
             break;
         case MAN_FTN:
-            pFld->pPLCFx = pBase->pFldFtnPLCF;
+            pField->pPLCFx = pBase->pFieldFootnotePLCF;
             pFdoa = pTxbx = pTxbxBkd = 0;
             break;
         case MAN_EDN:
-            pFld->pPLCFx = pBase->pFldEdnPLCF;
+            pField->pPLCFx = pBase->pFieldEdnPLCF;
             pFdoa = pTxbx = pTxbxBkd = 0;
             break;
         case MAN_AND:
-            pFld->pPLCFx = pBase->pFldAndPLCF;
+            pField->pPLCFx = pBase->pFieldAndPLCF;
             pFdoa = pTxbx = pTxbxBkd = 0;
             break;
         case MAN_TXBX:
-            pFld->pPLCFx = pBase->pFldTxbxPLCF;
+            pField->pPLCFx = pBase->pFieldTxbxPLCF;
             pTxbx = pBase->pMainTxbx;
             pTxbxBkd = pBase->pMainTxbxBkd;
             pFdoa = 0;
             break;
         case MAN_TXBX_HDFT:
-            pFld->pPLCFx = pBase->pFldTxbxHdFtPLCF;
+            pField->pPLCFx = pBase->pFieldTxbxHdFtPLCF;
             pTxbx = pBase->pHdFtTxbx;
             pTxbxBkd = pBase->pHdFtTxbxBkd;
             pFdoa = 0;
             break;
         default:
-            pFld->pPLCFx = pBase->pFldPLCF;
+            pField->pPLCFx = pBase->pFieldPLCF;
             pFdoa = pBase->pMainFdoa;
             pTxbx = pBase->pMainTxbx;
             pTxbxBkd = pBase->pMainTxbxBkd;
@@ -4728,7 +4728,7 @@ void WW8PLCFMan::SeekPos( long nNewCp )
 {
     pChp->pPLCFx->SeekPos( nNewCp + nCpO ); // Attribute neu
     pPap->pPLCFx->SeekPos( nNewCp + nCpO ); // aufsetzen
-    pFld->pPLCFx->SeekPos( nNewCp );
+    pField->pPLCFx->SeekPos( nNewCp );
     if( pPcd )
         pPcd->pPLCFx->SeekPos( nNewCp + nCpO );
     if( pBkm )
@@ -4782,7 +4782,7 @@ void WW8PLCFMan::GetSprmStart( short nIdx, WW8PLCFManResult* pRes ) const
     pRes->pMemPos = p->pMemPos;
     pRes->nSprmId = GetId(p);
     pRes->nCp2OrIdx = p->nCp2OrIdx;
-    if ((p == pFtn) || (p == pEdn) || (p == pAnd))
+    if ((p == pFootnote) || (p == pEdn) || (p == pAnd))
         pRes->nMemLen = p->nSprmsLen;
     else if (p->nSprmsLen >= maSprmParser.MinSprmLen()) //Normal
     {
@@ -4814,9 +4814,9 @@ void WW8PLCFMan::GetNoSprmStart( short nIdx, WW8PLCFManResult* pRes ) const
     pRes->nMemLen = p->nSprmsLen;
     pRes->nCp2OrIdx = p->nCp2OrIdx;
 
-    if( p == pFld )
+    if( p == pField )
         pRes->nSprmId = eFLD;
-    else if( p == pFtn )
+    else if( p == pFootnote )
         pRes->nSprmId = eFTN;
     else if( p == pEdn )
         pRes->nSprmId = eEDN;
@@ -5108,9 +5108,9 @@ sal_uInt16 WW8PLCFMan::GetColl() const
     }
 }
 
-WW8PLCFx_FLD* WW8PLCFMan::GetFld() const
+WW8PLCFx_FLD* WW8PLCFMan::GetField() const
 {
-    return static_cast<WW8PLCFx_FLD*>(pFld->pPLCFx);
+    return static_cast<WW8PLCFx_FLD*>(pField->pPLCFx);
 }
 
 const sal_uInt8* WW8PLCFMan::HasParaSprm( sal_uInt16 nId ) const
@@ -5254,7 +5254,7 @@ WW8_CP WW8Fib::GetBaseCp(ManTypes nType) const
             nOffset = ccpText;
             break;
         case MAN_HDFT:
-            nOffset = ccpText + ccpFtn;
+            nOffset = ccpText + ccpFootnote;
             break;
         /*
          A subdocument of this kind (MAN_MACRO) probably exists in some defunct
@@ -5262,21 +5262,21 @@ WW8_CP WW8Fib::GetBaseCp(ManTypes nType) const
          uses this comes to light, this is the likely calculation required
 
         case MAN_MACRO:
-            nOffset = ccpText + ccpFtn + ccpHdr;
+            nOffset = ccpText + ccpFootnote + ccpHdr;
             break;
 
         */
         case MAN_AND:
-            nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr;
+            nOffset = ccpText + ccpFootnote + ccpHdr + ccpMcr;
             break;
         case MAN_EDN:
-            nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn;
+            nOffset = ccpText + ccpFootnote + ccpHdr + ccpMcr + ccpAtn;
             break;
         case MAN_TXBX:
-            nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn;
+            nOffset = ccpText + ccpFootnote + ccpHdr + ccpMcr + ccpAtn + ccpEdn;
             break;
         case MAN_TXBX_HDFT:
-            nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn +
+            nOffset = ccpText + ccpFootnote + ccpHdr + ccpMcr + ccpAtn + ccpEdn +
                 ccpTxbx;
             break;
     }
@@ -5452,7 +5452,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
         rSt.SeekRel( 2 * sizeof( sal_Int32) );
 
     rSt.ReadInt32( ccpText );
-    rSt.ReadInt32( ccpFtn );
+    rSt.ReadInt32( ccpFootnote );
     rSt.ReadInt32( ccpHdr );
     rSt.ReadInt32( ccpMcr );
     rSt.ReadInt32( ccpAtn );
@@ -5489,12 +5489,12 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
     lcbStshf = Readcb(rSt, eVer);
     rSt.ReadInt32( fcPlcffndRef );
     lcbPlcffndRef = Readcb(rSt, eVer);
-    rSt.ReadInt32( fcPlcffndTxt );
-    lcbPlcffndTxt = Readcb(rSt, eVer);
+    rSt.ReadInt32( fcPlcffndText );
+    lcbPlcffndText = Readcb(rSt, eVer);
     rSt.ReadInt32( fcPlcfandRef );
     lcbPlcfandRef = Readcb(rSt, eVer);
-    rSt.ReadInt32( fcPlcfandTxt );
-    lcbPlcfandTxt = Readcb(rSt, eVer);
+    rSt.ReadInt32( fcPlcfandText );
+    lcbPlcfandText = Readcb(rSt, eVer);
     rSt.ReadInt32( fcPlcfsed );
     lcbPlcfsed = Readcb(rSt, eVer);
     rSt.ReadInt32( fcPlcfpad );
@@ -5519,8 +5519,8 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
     lcbPlcffldMom = Readcb(rSt, eVer);
     rSt.ReadInt32( fcPlcffldHdr );
     lcbPlcffldHdr = Readcb(rSt, eVer);
-    rSt.ReadInt32( fcPlcffldFtn );
-    lcbPlcffldFtn = Readcb(rSt, eVer);
+    rSt.ReadInt32( fcPlcffldFootnote );
+    lcbPlcffldFootnote = Readcb(rSt, eVer);
     rSt.ReadInt32( fcPlcffldAtn );
     lcbPlcffldAtn = Readcb(rSt, eVer);
     rSt.ReadInt32( fcPlcffldMcr );
@@ -5559,8 +5559,8 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
     lcbSttbfAssoc = Readcb(rSt, eVer);
     rSt.ReadInt32( fcClx );
     lcbClx = Readcb(rSt, eVer);
-    rSt.ReadInt32( fcPlcfpgdFtn );
-    lcbPlcfpgdFtn = Readcb(rSt, eVer);
+    rSt.ReadInt32( fcPlcfpgdFootnote );
+    lcbPlcfpgdFootnote = Readcb(rSt, eVer);
     rSt.ReadInt32( fcAutosaveSource );
     lcbAutosaveSource = Readcb(rSt, eVer);
     rSt.ReadInt32( fcGrpStAtnOwners );
@@ -5601,12 +5601,12 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
         rSt.ReadInt32( lcbPlcfAtnbkl );
         rSt.ReadInt32( fcPms );
         rSt.ReadInt32( lcbPMS );
-        rSt.ReadInt32( fcFormFldSttbf );
-        rSt.ReadInt32( lcbFormFldSttbf );
+        rSt.ReadInt32( fcFormFieldSttbf );
+        rSt.ReadInt32( lcbFormFieldSttbf );
         rSt.ReadInt32( fcPlcfendRef );
         rSt.ReadInt32( lcbPlcfendRef );
-        rSt.ReadInt32( fcPlcfendTxt );
-        rSt.ReadInt32( lcbPlcfendTxt );
+        rSt.ReadInt32( fcPlcfendText );
+        rSt.ReadInt32( lcbPlcfendText );
         rSt.ReadInt32( fcPlcffldEdn );
         rSt.ReadInt32( lcbPlcffldEdn );
         rSt.ReadInt32( fcPlcfpgdEdn );
@@ -5623,12 +5623,12 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
         rSt.ReadInt32( lcbPlcfwkb );
         rSt.ReadInt32( fcPlcfspl );
         rSt.ReadInt32( lcbPlcfspl );
-        rSt.ReadInt32( fcPlcftxbxTxt );
-        rSt.ReadInt32( lcbPlcftxbxTxt );
+        rSt.ReadInt32( fcPlcftxbxText );
+        rSt.ReadInt32( lcbPlcftxbxText );
         rSt.ReadInt32( fcPlcffldTxbx );
         rSt.ReadInt32( lcbPlcffldTxbx );
-        rSt.ReadInt32( fcPlcfHdrtxbxTxt );
-        rSt.ReadInt32( lcbPlcfHdrtxbxTxt );
+        rSt.ReadInt32( fcPlcfHdrtxbxText );
+        rSt.ReadInt32( lcbPlcfHdrtxbxText );
         rSt.ReadInt32( fcPlcffldHdrTxbx );
         rSt.ReadInt32( lcbPlcffldHdrTxbx );
         rSt.ReadInt32( fcStwUser );
@@ -5646,7 +5646,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
         fHasPic     = ( aBits1 & 0x08 ) >> 3;
         cQuickSaves = ( aBits1 & 0xf0 ) >> 4;
         fEncrypted  =   aBits2 & 0x01       ;
-        fWhichTblStm= ( aBits2 & 0x02 ) >> 1;
+        fWhichTableStm= ( aBits2 & 0x02 ) >> 1;
         fReadOnlyRecommended = (aBits2 & 0x4) >> 2;
         fWriteReservation = (aBits2 & 0x8) >> 3;
         fExtChar    = ( aBits2 & 0x10 ) >> 4;
@@ -5808,7 +5808,7 @@ bool WW8Fib::WriteHeader(SvStream& rStrm)
     if( fHasPic )       nBits16 |= 0x0008;
     nBits16 |= (0xf0 & ( cQuickSaves << 4 ));
     if( fEncrypted )    nBits16 |= 0x0100;
-    if( fWhichTblStm )  nBits16 |= 0x0200;
+    if( fWhichTableStm )  nBits16 |= 0x0200;
 
     if (fReadOnlyRecommended)
         nBits16 |= 0x0400;
@@ -5892,7 +5892,7 @@ bool WW8Fib::Write(SvStream& rStrm)
         pData += 2 * sizeof( sal_Int32);
 
     Set_UInt32( pData, ccpText );
-    Set_UInt32( pData, ccpFtn );
+    Set_UInt32( pData, ccpFootnote );
     Set_UInt32( pData, ccpHdr );
     Set_UInt32( pData, ccpMcr );
     Set_UInt32( pData, ccpAtn );
@@ -5929,12 +5929,12 @@ bool WW8Fib::Write(SvStream& rStrm)
     Set_UInt32( pData, lcbStshf );
     Set_UInt32( pData, fcPlcffndRef );
     Set_UInt32( pData, lcbPlcffndRef );
-    Set_UInt32( pData, fcPlcffndTxt );
-    Set_UInt32( pData, lcbPlcffndTxt );
+    Set_UInt32( pData, fcPlcffndText );
+    Set_UInt32( pData, lcbPlcffndText );
     Set_UInt32( pData, fcPlcfandRef );
     Set_UInt32( pData, lcbPlcfandRef );
-    Set_UInt32( pData, fcPlcfandTxt );
-    Set_UInt32( pData, lcbPlcfandTxt );
+    Set_UInt32( pData, fcPlcfandText );
+    Set_UInt32( pData, lcbPlcfandText );
     Set_UInt32( pData, fcPlcfsed );
     Set_UInt32( pData, lcbPlcfsed );
     Set_UInt32( pData, fcPlcfpad );
@@ -5959,8 +5959,8 @@ bool WW8Fib::Write(SvStream& rStrm)
     Set_UInt32( pData, lcbPlcffldMom );
     Set_UInt32( pData, fcPlcffldHdr );
     Set_UInt32( pData, lcbPlcffldHdr );
-    Set_UInt32( pData, fcPlcffldFtn );
-    Set_UInt32( pData, lcbPlcffldFtn );
+    Set_UInt32( pData, fcPlcffldFootnote );
+    Set_UInt32( pData, lcbPlcffldFootnote );
     Set_UInt32( pData, fcPlcffldAtn );
     Set_UInt32( pData, lcbPlcffldAtn );
     Set_UInt32( pData, fcPlcffldMcr );
@@ -5991,8 +5991,8 @@ bool WW8Fib::Write(SvStream& rStrm)
     Set_UInt32( pData, lcbSttbfAssoc );
     Set_UInt32( pData, fcClx );
     Set_UInt32( pData, lcbClx );
-    Set_UInt32( pData, fcPlcfpgdFtn );
-    Set_UInt32( pData, lcbPlcfpgdFtn );
+    Set_UInt32( pData, fcPlcfpgdFootnote );
+    Set_UInt32( pData, lcbPlcfpgdFootnote );
     Set_UInt32( pData, fcAutosaveSource );
     Set_UInt32( pData, lcbAutosaveSource );
     Set_UInt32( pData, fcGrpStAtnOwners );
@@ -6026,12 +6026,12 @@ bool WW8Fib::Write(SvStream& rStrm)
     Set_UInt32( pData, lcbPlcfAtnbkl );
     Set_UInt32( pData, fcPms );
     Set_UInt32( pData, lcbPMS );
-    Set_UInt32( pData, fcFormFldSttbf );
-    Set_UInt32( pData, lcbFormFldSttbf );
+    Set_UInt32( pData, fcFormFieldSttbf );
+    Set_UInt32( pData, lcbFormFieldSttbf );
     Set_UInt32( pData, fcPlcfendRef );
     Set_UInt32( pData, lcbPlcfendRef );
-    Set_UInt32( pData, fcPlcfendTxt );
-    Set_UInt32( pData, lcbPlcfendTxt );
+    Set_UInt32( pData, fcPlcfendText );
+    Set_UInt32( pData, lcbPlcfendText );
     Set_UInt32( pData, fcPlcffldEdn );
     Set_UInt32( pData, lcbPlcffldEdn );
     Set_UInt32( pData, fcPlcfpgdEdn );
@@ -6048,12 +6048,12 @@ bool WW8Fib::Write(SvStream& rStrm)
     Set_UInt32( pData, lcbPlcfwkb );
     Set_UInt32( pData, fcPlcfspl ); // in Ver67 leere Reserve
     Set_UInt32( pData, lcbPlcfspl ); // in Ver67 leere Reserve
-    Set_UInt32( pData, fcPlcftxbxTxt );
-    Set_UInt32( pData, lcbPlcftxbxTxt );
+    Set_UInt32( pData, fcPlcftxbxText );
+    Set_UInt32( pData, lcbPlcftxbxText );
     Set_UInt32( pData, fcPlcffldTxbx );
     Set_UInt32( pData, lcbPlcffldTxbx );
-    Set_UInt32( pData, fcPlcfHdrtxbxTxt );
-    Set_UInt32( pData, lcbPlcfHdrtxbxTxt );
+    Set_UInt32( pData, fcPlcfHdrtxbxText );
+    Set_UInt32( pData, lcbPlcfHdrtxbxText );
     Set_UInt32( pData, fcPlcffldHdrTxbx );
     Set_UInt32( pData, lcbPlcffldHdrTxbx );
 
@@ -6672,7 +6672,7 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop )
         if( nI & rDop.grpfIhdt )                // Bit gesetzt ?
             nIdxOffset++;
 
-    nTextOfs = rFib.ccpText + rFib.ccpFtn;  // Groesse des Haupttextes
+    nTextOfs = rFib.ccpText + rFib.ccpFootnote;  // Groesse des Haupttextes
                                             // und der Fussnoten
 }
 
@@ -6754,8 +6754,8 @@ WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize)
         grpfIhdt            =      ( a16Bit  &  0xff00 ) >> 8;
 
         a16Bit = Get_UShort( pData );        // 2 0x02
-        rncFtn              =   a16Bit  &  0x0003        ;
-        nFtn                = ( a16Bit  & ~0x0003 ) >> 2 ;
+        rncFootnote              =   a16Bit  &  0x0003        ;
+        nFootnote                = ( a16Bit  & ~0x0003 ) >> 2 ;
 
         a8Bit = Get_Byte( pData );           // 4 0x04
         fOutlineDirtySave      = 0 != ( a8Bit  &  0x01   );
@@ -6783,7 +6783,7 @@ WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize)
         a8Bit = Get_Byte( pData );           // 7 0x07
         fPagSuppressTopSpacing = 0 != ( a8Bit  &  0x01   );
         fProtEnabled           = 0 != ( a8Bit  &  0x02   );
-        fDispFormFldSel        = 0 != ( a8Bit  &  0x04   );
+        fDispFormFieldSel        = 0 != ( a8Bit  &  0x04   );
         fRMView                = 0 != ( a8Bit  &  0x08   );
         fRMPrint               = 0 != ( a8Bit  &  0x10   );
         fWriteReservation      = 0 != ( a8Bit  &  0x20   );
@@ -6828,19 +6828,19 @@ WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize)
 
         a16Bit = Get_UShort( pData );        // 54 0x36
         epc            =   a16Bit &  0x0003       ;
-        nfcFtnRef      = ( a16Bit &  0x003c ) >> 2;
+        nfcFootnoteRef      = ( a16Bit &  0x003c ) >> 2;
         nfcEdnRef      = ( a16Bit &  0x03c0 ) >> 6;
         fPrintFormData = 0 != ( a16Bit &  0x0400 );
         fSaveFormData  = 0 != ( a16Bit &  0x0800 );
         fShadeFormData = 0 != ( a16Bit &  0x1000 );
-        fWCFtnEdn      = 0 != ( a16Bit &  0x8000 );
+        fWCFootnoteEdn      = 0 != ( a16Bit &  0x8000 );
 
         cLines = Get_Long( pData );          // 56 0x38
-        cWordsFtnEnd = Get_Long( pData );    // 60 0x3c
-        cChFtnEdn = Get_Long( pData );       // 64 0x40
-        cPgFtnEdn = Get_Short( pData );      // 68 0x44
-        cParasFtnEdn = Get_Long( pData );    // 70 0x46
-        cLinesFtnEdn = Get_Long( pData );    // 74 0x4a
+        cWordsFootnoteEnd = Get_Long( pData );    // 60 0x3c
+        cChFootnoteEdn = Get_Long( pData );       // 64 0x40
+        cPgFootnoteEdn = Get_Short( pData );      // 68 0x44
+        cParasFootnoteEdn = Get_Long( pData );    // 70 0x46
+        cLinesFootnoteEdn = Get_Long( pData );    // 74 0x4a
         lKeyProtDoc = Get_Long( pData );     // 78 0x4e
 
         a16Bit = Get_UShort( pData );        // 82 0x52
@@ -6890,17 +6890,17 @@ WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize)
             pData += 12;                         // 414 0x19e
 
             cChWS = Get_Long( pData );           // 426 0x1aa
-            cChWSFtnEdn = Get_Long( pData );     // 430 0x1ae
+            cChWSFootnoteEdn = Get_Long( pData );     // 430 0x1ae
             grfDocEvents = Get_Long( pData );    // 434 0x1b2
 
             pData += 4+30+8;  // 438 0x1b6; 442 0x1ba; 472 0x1d8; 476 0x1dc
 
             cDBC = Get_Long( pData );            // 480 0x1e0
-            cDBCFtnEdn = Get_Long( pData );      // 484 0x1e4
+            cDBCFootnoteEdn = Get_Long( pData );      // 484 0x1e4
 
             pData += 1 * sizeof( sal_Int32);         // 488 0x1e8
 
-            nfcFtnRef = Get_Short( pData );      // 492 0x1ec
+            nfcFootnoteRef = Get_Short( pData );      // 492 0x1ec
             nfcEdnRef = Get_Short( pData );      // 494 0x1ee
             hpsZoonFontPag = Get_Short( pData ); // 496 0x1f0
             dywDispPag = Get_Short( pData );     // 498 0x1f2
@@ -6953,7 +6953,7 @@ WW8Dop::WW8Dop()
 
     fWidowControl = true;
     fpc = 1;
-    nFtn = 1;
+    nFootnote = 1;
     fOutlineDirtySave = true;
     fHyphCapitals = true;
     fBackup = true;
@@ -6989,10 +6989,10 @@ WW8Dop::WW8Dop()
     fIncludeFooter = true;
 
     cChWS = /**!!**/ 0;
-    cChWSFtnEdn = /**!!**/ 0;
+    cChWSFootnoteEdn = /**!!**/ 0;
 
     cDBC = /**!!**/ 0;
-    cDBCFtnEdn = /**!!**/ 0;
+    cDBCFootnoteEdn = /**!!**/ 0;
 
     fAcetateShowAtn = true;
 }
@@ -7179,8 +7179,8 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
     Set_UInt16( pData, a16Bit );
 
     a16Bit = 0;                         // 2 0x02
-    a16Bit |= ( 0x0003 & rncFtn );
-    a16Bit |= ( ~0x0003 & (nFtn << 2));
+    a16Bit |= ( 0x0003 & rncFootnote );
+    a16Bit |= ( ~0x0003 & (nFootnote << 2));
     Set_UInt16( pData, a16Bit );
 
     a8Bit = 0;                          // 4 0x04
@@ -7212,7 +7212,7 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
     a8Bit = 0;                          // 7 0x07
     if( fPagSuppressTopSpacing )    a8Bit |= 0x01;
     if( fProtEnabled )              a8Bit |= 0x02;
-    if( fDispFormFldSel )           a8Bit |= 0x04;
+    if( fDispFormFieldSel )           a8Bit |= 0x04;
     if( fRMView )                   a8Bit |= 0x08;
     if( fRMPrint )                  a8Bit |= 0x10;
     if( fWriteReservation )         a8Bit |= 0x20;
@@ -7261,20 +7261,20 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
 
     a16Bit = 0;                         // 54 0x36
     a16Bit |= (0x0003 & epc );
-    a16Bit |= (0x003c & (nfcFtnRef << 2));
+    a16Bit |= (0x003c & (nfcFootnoteRef << 2));
     a16Bit |= (0x03c0 & (nfcEdnRef << 6));
     if( fPrintFormData )    a16Bit |= 0x0400;
     if( fSaveFormData )     a16Bit |= 0x0800;
     if( fShadeFormData )    a16Bit |= 0x1000;
-    if( fWCFtnEdn )         a16Bit |= 0x8000;
+    if( fWCFootnoteEdn )         a16Bit |= 0x8000;
     Set_UInt16( pData, a16Bit );
 
     Set_UInt32( pData, cLines );        // 56 0x38
-    Set_UInt32( pData, cWordsFtnEnd );  // 60 0x3c
-    Set_UInt32( pData, cChFtnEdn );     // 64 0x40
-    Set_UInt16( pData, cPgFtnEdn );     // 68 0x44
-    Set_UInt32( pData, cParasFtnEdn );  // 70 0x46
-    Set_UInt32( pData, cLinesFtnEdn );  // 74 0x4a
+    Set_UInt32( pData, cWordsFootnoteEnd );  // 60 0x3c
+    Set_UInt32( pData, cChFootnoteEdn );     // 64 0x40
+    Set_UInt16( pData, cPgFootnoteEdn );     // 68 0x44
+    Set_UInt32( pData, cParasFootnoteEdn );  // 70 0x46
+    Set_UInt32( pData, cLinesFootnoteEdn );  // 74 0x4a
     Set_UInt32( pData, lKeyProtDoc );   // 78 0x4e
 
     a16Bit = 0;                         // 82 0x52
@@ -7312,17 +7312,17 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
         pData += 12;                                   // 414 0x19e
 
         Set_UInt32( pData, cChWS );                    // 426 0x1aa
-        Set_UInt32( pData, cChWSFtnEdn );              // 430 0x1ae
+        Set_UInt32( pData, cChWSFootnoteEdn );              // 430 0x1ae
         Set_UInt32( pData, grfDocEvents );             // 434 0x1b2
 
         pData += 4+30+8;  // 438 0x1b6; 442 0x1ba; 472 0x1d8; 476 0x1dc
 
         Set_UInt32( pData, cDBC );                     // 480 0x1e0
-        Set_UInt32( pData, cDBCFtnEdn );               // 484 0x1e4
+        Set_UInt32( pData, cDBCFootnoteEdn );               // 484 0x1e4
 
         pData += 1 * sizeof( sal_Int32);                   // 488 0x1e8
 
-        Set_UInt16( pData, nfcFtnRef );                // 492 0x1ec
+        Set_UInt16( pData, nfcFootnoteRef );                // 492 0x1ec
         Set_UInt16( pData, nfcEdnRef );                // 494 0x1ee
         Set_UInt16( pData, hpsZoonFontPag );           // 496 0x1f0
         Set_UInt16( pData, dywDispPag );               // 498 0x1f2
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 02ebf3bc19cf..678482f85e9c 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -581,7 +581,7 @@ protected:
     WW8PLCFx_PCDAttrs* pPCDAttrs;
 
 public:
-    WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt,
+    WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt,
         const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL );
     virtual ~WW8PLCFx_Fc_FKP();
     virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
@@ -612,7 +612,7 @@ private:
     WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&) SAL_DELETED_FUNCTION;
 
 public:
-    WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt,
+    WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt,
         const WW8ScannerBase& rBase,  ePLCFT ePl );
     virtual ~WW8PLCFx_Cp_FKP();
     void ResetAttrStartEnd();
@@ -644,7 +644,7 @@ private:
     WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&) SAL_DELETED_FUNCTION;
 
 public:
-    WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib,
+    WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTablexySt, const WW8Fib& rFib,
         WW8_CP nStartCp );
     virtual ~WW8PLCFx_SEPX();
     virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
@@ -667,14 +667,14 @@ class WW8PLCFx_SubDoc : public WW8PLCFx
 {
 private:
     WW8PLCF* pRef;
-    WW8PLCF* pTxt;
+    WW8PLCF* pText;
 
     WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&) SAL_DELETED_FUNCTION;
     WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp,
-    long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruc = 0);
+    long nFcRef, long nLenRef, long nFcText, long nLenText, long nStruc = 0);
     virtual ~WW8PLCFx_SubDoc();
     virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
     virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE;
@@ -734,7 +734,7 @@ private:
     WW8PLCFx_Book& operator=(const WW8PLCFx_Book&) SAL_DELETED_FUNCTION;
 
 public:
-    WW8PLCFx_Book(SvStream* pTblSt,const WW8Fib& rFib);
+    WW8PLCFx_Book(SvStream* pTableSt,const WW8Fib& rFib);
     virtual ~WW8PLCFx_Book();
     long GetIMax() const { return nIMax; }
     virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
@@ -772,7 +772,7 @@ private:
     WW8PLCFx_AtnBook& operator=(const WW8PLCFx_AtnBook&) SAL_DELETED_FUNCTION;
 
 public:
-    WW8PLCFx_AtnBook(SvStream* pTblSt,const WW8Fib& rFib);
+    WW8PLCFx_AtnBook(SvStream* pTableSt,const WW8Fib& rFib);
     virtual ~WW8PLCFx_AtnBook();
     virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
     virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE;
@@ -892,7 +892,7 @@ private:
                                     //drawboxes we want the true offsets
 
     WW8PLCFxDesc aD[MAN_ANZ_PLCF];
-    WW8PLCFxDesc *pChp, *pPap, *pSep, *pFld, *pFtn, *pEdn, *pBkm, *pPcd,
+    WW8PLCFxDesc *pChp, *pPap, *pSep, *pField, *pFootnote, *pEdn, *pBkm, *pPcd,
         *pPcdA, *pAnd, *pAtnBkm;
     WW8PLCFspecial *pFdoa, *pTxbx, *pTxbxBkd,*pMagicTables, *pSubdocs;
     sal_uInt8* pExtendedAtrds;
@@ -925,9 +925,9 @@ public:
     bool Get(WW8PLCFManResult* pResult) const;
     void advance();
     sal_uInt16 GetColl() const; // index of actual Style
-    WW8PLCFx_FLD* GetFld() const;
+    WW8PLCFx_FLD* GetField() const;
     WW8PLCFx_SubDoc* GetEdn() const { return static_cast<WW8PLCFx_SubDoc*>(pEdn->pPLCFx); }
-    WW8PLCFx_SubDoc* GetFtn() const { return static_cast<WW8PLCFx_SubDoc*>(pFtn->pPLCFx); }
+    WW8PLCFx_SubDoc* GetFootnote() const { return static_cast<WW8PLCFx_SubDoc*>(pFootnote->pPLCFx); }
     WW8PLCFx_SubDoc* GetAtn() const { return static_cast<WW8PLCFx_SubDoc*>(pAnd->pPLCFx); }
     WW8PLCFx_Book* GetBook() const { return static_cast<WW8PLCFx_Book*>(pBkm->pPLCFx); }
     WW8PLCFx_AtnBook* GetAtnBook() const { return static_cast<WW8PLCFx_AtnBook*>(pAtnBkm->pPLCFx); }
@@ -989,16 +989,16 @@ private:
     WW8PLCFx_Cp_FKP*  pChpPLCF;         // Character-Attrs
     WW8PLCFx_Cp_FKP*  pPapPLCF;         // Para-Attrs
     WW8PLCFx_SEPX*    pSepPLCF;         // Section-Attrs
-    WW8PLCFx_SubDoc*  pFtnPLCF;         // Footnotes
+    WW8PLCFx_SubDoc*  pFootnotePLCF;         // Footnotes
     WW8PLCFx_SubDoc*  pEdnPLCF;         // EndNotes
     WW8PLCFx_SubDoc*  pAndPLCF;         // Anmerkungen
-    WW8PLCFx_FLD*     pFldPLCF;         // Fields in Main Text
-    WW8PLCFx_FLD*     pFldHdFtPLCF;     // Fields in Header / Footer
-    WW8PLCFx_FLD*     pFldTxbxPLCF;     // Fields in Textboxes in Main Text
-    WW8PLCFx_FLD*     pFldTxbxHdFtPLCF; // Fields in Textboxes in Header / Footer
-    WW8PLCFx_FLD*     pFldFtnPLCF;      // Fields in Footnotes
-    WW8PLCFx_FLD*     pFldEdnPLCF;      // Fields in Endnotes
-    WW8PLCFx_FLD*     pFldAndPLCF;      // Fields in Anmerkungen
+    WW8PLCFx_FLD*     pFieldPLCF;         // Fields in Main Text
+    WW8PLCFx_FLD*     pFieldHdFtPLCF;     // Fields in Header / Footer
+    WW8PLCFx_FLD*     pFieldTxbxPLCF;     // Fields in Textboxes in Main Text
+    WW8PLCFx_FLD*     pFieldTxbxHdFtPLCF; // Fields in Textboxes in Header / Footer
+    WW8PLCFx_FLD*     pFieldFootnotePLCF;      // Fields in Footnotes
+    WW8PLCFx_FLD*     pFieldEdnPLCF;      // Fields in Endnotes
+    WW8PLCFx_FLD*     pFieldAndPLCF;      // Fields in Anmerkungen
     WW8PLCFspecial*   pMainFdoa;        // Graphic Primitives in Main Text
     WW8PLCFspecial*   pHdFtFdoa;        // Graphic Primitives in Header / Footer
     WW8PLCFspecial*   pMainTxbx;        // Textboxen in Main Text
@@ -1022,10 +1022,10 @@ private:
     void DeletePieceTable();
 
 public:
-    WW8ScannerBase( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt,
+    WW8ScannerBase( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt,
         WW8Fib* pWwF );
     ~WW8ScannerBase();
-    bool AreThereFootnotes() const { return pFtnPLCF->Count() > 0; };
+    bool AreThereFootnotes() const { return pFootnotePLCF->Count() > 0; };
     bool AreThereEndnotes()  const { return pEdnPLCF->Count() > 0; };
 
     //If you use WW8Fc2Cp you are almost certainly doing the wrong thing
@@ -1096,7 +1096,7 @@ public:
     bool fHasPic :1;  // 0008 file contains 1 or more pictures
     sal_uInt16 cQuickSaves :4; // 00F0 count of times file was quicksaved
     bool fEncrypted :1; //0100 1 if file is encrypted, 0 if not
-    bool fWhichTblStm :1; //0200 When 0, this fib refers to the table stream
+    bool fWhichTableStm :1; //0200 When 0, this fib refers to the table stream
     bool fReadOnlyRecommended :1;
     bool fWriteReservation :1;
                                                     // named "0Table", when 1, this fib refers to the
@@ -1153,7 +1153,7 @@ public:
 
     // WW8_FC u4[4];        // 0x24
     WW8_CP ccpText;         // 0x34 length of main document text stream
-    WW8_CP ccpFtn;          // 0x38 length of footnote subdocument text stream
+    WW8_CP ccpFootnote;          // 0x38 length of footnote subdocument text stream
     WW8_CP ccpHdr;          // 0x3c length of header subdocument text stream
     WW8_CP ccpMcr;          // 0x40 length of macro subdocument text stream
     WW8_CP ccpAtn;          // 0x44 length of annotation subdocument text stream
@@ -1197,15 +1197,15 @@ public:
     sal_Int32 lcbPlcffndRef;    // 0x6c count of bytes of footnote reference PLCF
                         //      == 0 if no footnotes defined in document.
 
-    WW8_FC fcPlcffndTxt;    // 0x70 file offset of footnote text PLCF.
-    sal_Int32 lcbPlcffndTxt;    // 0x74 count of bytes of footnote text PLCF.
+    WW8_FC fcPlcffndText;    // 0x70 file offset of footnote text PLCF.
+    sal_Int32 lcbPlcffndText;    // 0x74 count of bytes of footnote text PLCF.
                         //      == 0 if no footnotes defined in document
 
     WW8_FC fcPlcfandRef;    // 0x78 file offset of annotation reference PLCF.
     sal_Int32 lcbPlcfandRef;    // 0x7c count of bytes of annotation reference PLCF.
 
-    WW8_FC fcPlcfandTxt;    // 0x80 file offset of annotation text PLCF.
-    sal_Int32 lcbPlcfandTxt;    // 0x84 count of bytes of the annotation text PLCF
+    WW8_FC fcPlcfandText;    // 0x80 file offset of annotation text PLCF.
+    sal_Int32 lcbPlcfandText;    // 0x84 count of bytes of the annotation text PLCF
 
     WW8_FC fcPlcfsed;       // 8x88 file offset of section descriptor PLCF.
     sal_Int32 lcbPlcfsed;   // 0x8c count of bytes of section descriptor PLCF.
@@ -1251,8 +1251,8 @@ public:
     WW8_FC fcPlcffldHdr;    // 0xe0 offset in doc stream to the PLCF of field positions in the header subdocument.
     sal_Int32 lcbPlcffldHdr;    // 0xe4
 
-    WW8_FC fcPlcffldFtn;    // 0xe8 offset in doc stream to the PLCF of field positions in the footnote subdocument.
-    sal_Int32 lcbPlcffldFtn;    // 0xec
+    WW8_FC fcPlcffldFootnote;    // 0xe8 offset in doc stream to the PLCF of field positions in the footnote subdocument.
+    sal_Int32 lcbPlcffldFootnote;    // 0xec
 
     WW8_FC fcPlcffldAtn;    // 0xf0 offset in doc stream to the PLCF of field positions in the annotation subdocument.
     sal_Int32 lcbPlcffldAtn;    // 0xf4
@@ -1300,8 +1300,8 @@ public:
     WW8_FC fcClx;           // 0x160 file  offset of beginning of information for complex files.
     sal_Int32 lcbClx;       // 0x164 count of bytes of complex file information. 0 if file is non-complex.
 
-    WW8_FC fcPlcfpgdFtn;    // 0x168 file offset of page descriptor PLCF for footnote subdocument.
-    sal_Int32 lcbPlcfpgdFtn;    // 0x16C count of bytes of page descriptor PLCF for footnote subdocument.
+    WW8_FC fcPlcfpgdFootnote;    // 0x168 file offset of page descriptor PLCF for footnote subdocument.
+    sal_Int32 lcbPlcfpgdFootnote;    // 0x16C count of bytes of page descriptor PLCF for footnote subdocument.
                         //  ==0 if document has not been paginated. The length of the PGD is 8 bytes.
 
     WW8_FC fcAutosaveSource;    // 0x170 file offset of the name of the original file.
@@ -1346,15 +1346,15 @@ public:
     WW8_FC fcPms;       // 0x1C2 file offset of PMS (Print Merge State) information block
     sal_Int32 lcbPMS;       // 0x1C6 length in bytes of PMS
 
-    WW8_FC fcFormFldSttbf;  // 0x1CA file offset of form field Sttbf which contains strings used in form field dropdown controls
-    sal_Int32 lcbFormFldSttbf;  // 0x1CE length in bytes of form field Sttbf
+    WW8_FC fcFormFieldSttbf;  // 0x1CA file offset of form field Sttbf which contains strings used in form field dropdown controls
+    sal_Int32 lcbFormFieldSttbf;  // 0x1CE length in bytes of form field Sttbf
 
     WW8_FC fcPlcfendRef;    // 0x1D2 file offset of PLCFendRef which points to endnote references in the main document stream
     sal_Int32 lcbPlcfendRef;    // 0x1D6
 
-    WW8_FC fcPlcfendTxt;    // 0x1DA file offset of PLCFendRef which points to endnote text  in the endnote document
+    WW8_FC fcPlcfendText;    // 0x1DA file offset of PLCFendRef which points to endnote text  in the endnote document
                         //       stream which corresponds with the PLCFendRef
-    sal_Int32 lcbPlcfendTxt;    // 0x1DE
+    sal_Int32 lcbPlcfendText;    // 0x1DE
 
     WW8_FC fcPlcffldEdn;    // 0x1E2 offset to PLCF of field positions in the endnote subdoc
     sal_Int32 lcbPlcffldEdn;    // 0x1E6
@@ -1383,12 +1383,12 @@ public:
                                                         // war in Ver67 nur leere Reserve
     sal_Int32 lcbPlcfspl;                   // war in Ver67 nur leere Reserve
 
-    WW8_FC fcPlcftxbxTxt;   // 0x222 ...PLCF of beginning CP in the text box subdoc
-    sal_Int32 lcbPlcftxbxTxt;   // 0x226
+    WW8_FC fcPlcftxbxText;   // 0x222 ...PLCF of beginning CP in the text box subdoc
+    sal_Int32 lcbPlcftxbxText;   // 0x226
     WW8_FC fcPlcffldTxbx;   // 0x22a ...PLCF of field boundaries recorded in the textbox subdoc.
     sal_Int32 lcbPlcffldTxbx;   // 0x22e
-    WW8_FC fcPlcfHdrtxbxTxt;// 0x232 ...PLCF of beginning CP in the header text box subdoc
-    sal_Int32 lcbPlcfHdrtxbxTxt;// 0x236
+    WW8_FC fcPlcfHdrtxbxText;// 0x232 ...PLCF of beginning CP in the header text box subdoc
+    sal_Int32 lcbPlcfHdrtxbxText;// 0x236
     WW8_FC fcPlcffldHdrTxbx;// 0x23a ...PLCF of field boundaries recorded in the header textbox subdoc.
     sal_Int32 lcbPlcffldHdrTxbx;// 0x23e
     WW8_FC fcStwUser;
@@ -1541,8 +1541,8 @@ public:
 
     sal_uInt16  grpfIhdt : 8;           // 0 specification of document headers and footers. See explanation under Headers and Footers topic.
 
-    sal_uInt16  rncFtn : 2;         // 0 restart index for footnotes, 0 don't restart note numbering, 1 section, 2 page
-    sal_uInt16  nFtn : 14;          // 1 initial footnote number for document
+    sal_uInt16  rncFootnote : 2;         // 0 restart index for footnotes, 0 don't restart note numbering, 1 section, 2 page
+    sal_uInt16  nFootnote : 14;          // 1 initial footnote number for document
     bool        fOutlineDirtySave : 1; // when 1, indicates that information in the hPLCFpad should be refreshed since outline has been dirtied
     sal_uInt16  : 7;                //   reserved
     bool        fOnlyMacPics : 1;   //   when 1, Word believes all pictures recorded in the document were created on a Macintosh
@@ -1563,7 +1563,7 @@ public:
     bool        fDfltTrueType : 1;  //   when 1, use TrueType fonts by default (flag obeyed only when doc was created by WinWord 2.x)
     bool        fPagSuppressTopSpacing : 1;//when 1, file created with SUPPRESSTOPSPACING=YES in win.ini. (flag obeyed only when doc was created by WinWord 2.x).
     bool        fProtEnabled : 1;   //   when 1, document is protected from edit operations
-    bool        fDispFormFldSel : 1;//   when 1, restrict selections to occur only within form fields
+    bool        fDispFormFieldSel : 1;//   when 1, restrict selections to occur only within form fields
     bool        fRMView : 1;        //   when 1, show revision markings on screen
     bool        fRMPrint : 1;       //   when 1, print revision marks when document is printed
     bool        fWriteReservation : 1;
@@ -1606,13 +1606,13 @@ public:
     bool       fSaveFormData : 1;   //      only save document data that is inside of a form field.
     bool       fShadeFormData : 1;  //      shade form fields
     sal_uInt16 : 2;                 //      reserved
-    bool       fWCFtnEdn : 1;       //      when 1, include footnotes and endnotes in word count
+    bool       fWCFootnoteEdn : 1;       //      when 1, include footnotes and endnotes in word count
     sal_Int32   cLines;             //      count of lines tallied by last Word Count operation
-    sal_Int32   cWordsFtnEnd;       //      count of words in footnotes and endnotes tallied by last Word Count operation
-    sal_Int32   cChFtnEdn;          //      count of characters in footnotes and endnotes tallied by last Word Count operation
-    sal_Int16   cPgFtnEdn;          //      count of pages in footnotes and endnotes tallied by last Word Count operation
-    sal_Int32   cParasFtnEdn;       //      count of paragraphs in footnotes and endnotes tallied by last Word Count operation
-    sal_Int32   cLinesFtnEdn;       //      count of paragraphs in footnotes and endnotes tallied by last Word Count operation
+    sal_Int32   cWordsFootnoteEnd;       //      count of words in footnotes and endnotes tallied by last Word Count operation
+    sal_Int32   cChFootnoteEdn;          //      count of characters in footnotes and endnotes tallied by last Word Count operation
+    sal_Int16   cPgFootnoteEdn;          //      count of pages in footnotes and endnotes tallied by last Word Count operation
+    sal_Int32   cParasFootnoteEdn;       //      count of paragraphs in footnotes and endnotes tallied by last Word Count operation
+    sal_Int32   cLinesFootnoteEdn;       //      count of paragraphs in footnotes and endnotes tallied by last Word Count operation
     sal_Int32   lKeyProtDoc;        //      document protection password key, only valid if dop.fProtEnabled, dop.fLockAtn or dop.fLockRev are 1.
     sal_uInt16  wvkSaved : 3;       //      document view kind: 0 Normal view, 1 Outline view, 2 Page View
     sal_uInt16  wScaleSaved : 9;    ///< Specifies the zoom percentage that was in use when the document was saved.
@@ -1685,13 +1685,13 @@ public:
     sal_uInt16 : 14;                  // reserved
     // Skip 12 Bytes here: ASUMI
     sal_Int32 cChWS;
-    sal_Int32 cChWSFtnEdn;
+    sal_Int32 cChWSFootnoteEdn;
     sal_Int32 grfDocEvents;
     // Skip 4+30+8 Bytes here
     sal_Int32 cDBC;
-    sal_Int32 cDBCFtnEdn;
+    sal_Int32 cDBCFootnoteEdn;
     // Skip 4 Bytes here
-    sal_Int16 nfcFtnRef;
+    sal_Int16 nfcFootnoteRef;
     sal_Int16 nfcEdnRef;
     sal_Int16 hpsZoonFontPag;
     sal_Int16 dywDispPag;
@@ -1777,7 +1777,7 @@ public:
     void UpdateIndex( sal_uInt8 grpfIhdt );
 };
 
-void SwapQuotesInField(OUString &rFmt);
+void SwapQuotesInField(OUString &rFormat);
 
 Word2CHPX ReadWord2Chpx(SvStream &rSt, sal_Size nOffset, sal_uInt8 nSize);
 std::vector<sal_uInt8> ChpxToSprms(const Word2CHPX &rChpx);
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 38a4d1ba6fd4..08d80c77558b 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -56,7 +56,7 @@ struct Word2CHPX
     sal_uInt16 fItalic:1;
     sal_uInt16 fRMarkDel:1;
     sal_uInt16 fOutline:1;
-    sal_uInt16 fFldVanish:1;
+    sal_uInt16 fFieldVanish:1;
     sal_uInt16 fSmallCaps:1;
     sal_uInt16 fCaps:1;
     sal_uInt16 fVanish:1;
@@ -101,7 +101,7 @@ struct Word2CHPX
         fItalic = 0;
         fRMarkDel = 0;
         fOutline = 0;
-        fFldVanish = 0;
+        fFieldVanish = 0;
         fSmallCaps = 0;
         fCaps = 0;
         fVanish = 0;
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 5534068aeb3d..b864bf936379 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -172,7 +172,7 @@ XTextRangeOrNodeIndexPosition::CopyPositionInto(SwPosition& rPos, SwDoc & rDoc)
     {
         rPos.nNode = *pIndex;
         rPos.nNode++;           // pIndex points to previous index !!!
-        rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(), 0 );
+        rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(), 0 );
     }
 }
 
@@ -467,7 +467,7 @@ Reference<XTextCursor> XMLRedlineImportHelper::CreateRedlineTextSection(
         }
 
         // create text section for redline
-        SwTxtFmtColl *pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool
+        SwTextFormatColl *pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool
             (RES_POOLCOLL_STANDARD, false );
         SwStartNode* pRedlineNode = pDoc->GetNodes().MakeTextSection(
             pDoc->GetNodes().GetEndOfRedlines(),
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index bcdb63b16d0c..db7c647115ab 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -85,18 +85,18 @@ using namespace ::com::sun::star::lang;
 
 static void lcl_EnsureValidPam( SwPaM& rPam )
 {
-    if( rPam.GetCntntNode() != NULL )
+    if( rPam.GetContentNode() != NULL )
     {
         // set proper point content
-        if( rPam.GetCntntNode() != rPam.GetPoint()->nContent.GetIdxReg() )
+        if( rPam.GetContentNode() != rPam.GetPoint()->nContent.GetIdxReg() )
         {
-            rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), 0 );
+            rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), 0 );
         }
         // else: point was already valid
 
         // if mark is invalid, we delete it
-        if( ( rPam.GetCntntNode( false ) == NULL ) ||
-            ( rPam.GetCntntNode( false ) != rPam.GetMark()->nContent.GetIdxReg() ) )
+        if( ( rPam.GetContentNode( false ) == NULL ) ||
+            ( rPam.GetContentNode( false ) != rPam.GetMark()->nContent.GetIdxReg() ) )
         {
             rPam.DeleteMark();
         }
@@ -108,7 +108,7 @@ static void lcl_EnsureValidPam( SwPaM& rPam )
         rPam.GetPoint()->nNode =
             *rPam.GetDoc()->GetNodes().GetEndOfContent().StartOfSectionNode();
         ++ rPam.GetPoint()->nNode;
-        rPam.Move( fnMoveForward, fnGoCntnt ); // go into content
+        rPam.Move( fnMoveForward, fnGoContent ); // go into content
     }
 }
 
@@ -392,7 +392,7 @@ static void lcl_AdjustOutlineStylesForOOo(SwDoc& _rDoc)
     // array indicating, which outline level already has a style assigned.
     bool aOutlineLevelAssigned[ MAXLEVEL ];
     // array of the default outline styles, which are created for the document.
-    SwTxtFmtColl* aCreatedDefaultOutlineStyles[ MAXLEVEL ];
+    SwTextFormatColl* aCreatedDefaultOutlineStyles[ MAXLEVEL ];
 
     {
         for ( sal_uInt8 i = 0; i < MAXLEVEL; ++i )
@@ -404,10 +404,10 @@ static void lcl_AdjustOutlineStylesForOOo(SwDoc& _rDoc)
 
     // determine, which outline level has already a style assigned and
     // which of the default outline styles is created.
-    const SwTxtFmtColls& rColls = *(_rDoc.GetTxtFmtColls());
+    const SwTextFormatColls& rColls = *(_rDoc.GetTextFormatColls());
     for ( size_t n = 1; n < rColls.size(); ++n )
     {
-        SwTxtFmtColl* pColl = rColls[ n ];
+        SwTextFormatColl* pColl = rColls[ n ];
         if ( pColl->IsAssignedToListLevelOfOutlineStyle() )
         {
             aOutlineLevelAssigned[ pColl->GetAssignedOutlineStyleLevel() ] = true;
@@ -441,11 +441,11 @@ static void lcl_AdjustOutlineStylesForOOo(SwDoc& _rDoc)
 
             // apply outline numbering rule, if none is set.
             const SfxPoolItem& rItem =
-                aCreatedDefaultOutlineStyles[ i ]->GetFmtAttr( RES_PARATR_NUMRULE, false );
+                aCreatedDefaultOutlineStyles[ i ]->GetFormatAttr( RES_PARATR_NUMRULE, false );
             if ( static_cast<const SwNumRuleItem&>(rItem).GetValue().isEmpty() )
             {
                 SwNumRuleItem aItem( pOutlineRule->GetName() );
-                aCreatedDefaultOutlineStyles[ i ]->SetFmtAttr( aItem );
+                aCreatedDefaultOutlineStyles[ i ]->SetFormatAttr( aItem );
             }
         }
     }
@@ -687,23 +687,23 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
     *pArgs++ <<= xStatusIndicator;
 
     // prepare for special modes
-    if( aOpt.IsFmtsOnly() )
+    if( aOpt.IsFormatsOnly() )
     {
         sal_Int32 nCount =
-            (aOpt.IsFrmFmts() ? 1 : 0) +
+            (aOpt.IsFrameFormats() ? 1 : 0) +
             (aOpt.IsPageDescs() ? 1 : 0) +
-            (aOpt.IsTxtFmts() ? 2 : 0) +
+            (aOpt.IsTextFormats() ? 2 : 0) +
             (aOpt.IsNumRules() ? 1 : 0);
 
         Sequence< OUString> aFamiliesSeq( nCount );
         OUString *pSeq = aFamiliesSeq.getArray();
-        if( aOpt.IsFrmFmts() )
+        if( aOpt.IsFrameFormats() )
             // SFX_STYLE_FAMILY_FRAME;
             *pSeq++ = "FrameStyles";
         if( aOpt.IsPageDescs() )
             // SFX_STYLE_FAMILY_PAGE;
             *pSeq++ = "PageStyles";
-        if( aOpt.IsTxtFmts() )
+        if( aOpt.IsTextFormats() )
         {
             // (SFX_STYLE_FAMILY_CHAR|SFX_STYLE_FAMILY_PARA);
             *pSeq++ = "CharacterStyles";
@@ -803,7 +803,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
     }
 
     sal_uInt32 nWarnRDF = 0;
-    if ( !(IsOrganizerMode() || IsBlockMode() || aOpt.IsFmtsOnly() ||
+    if ( !(IsOrganizerMode() || IsBlockMode() || aOpt.IsFormatsOnly() ||
            bInsertMode) )
     {
         // RDF metadata - must be read before styles/content
@@ -847,7 +847,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
         aEmptyArgs, rName, false );
 
     sal_uInt32 nWarn2 = 0;
-    if( !(IsOrganizerMode() || IsBlockMode() || aOpt.IsFmtsOnly() ||
+    if( !(IsOrganizerMode() || IsBlockMode() || aOpt.IsFormatsOnly() ||
           bInsertMode) )
     {
         nWarn2 = ReadThroughComponent(
@@ -863,7 +863,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
                 : "com.sun.star.comp.Writer.XMLStylesImporter"),
         aFilterArgs, rName, true );
 
-    if( !nRet && !(IsOrganizerMode() || aOpt.IsFmtsOnly()) )
+    if( !nRet && !(IsOrganizerMode() || aOpt.IsFormatsOnly()) )
         nRet = ReadThroughComponent(
            xStorage, xModelComp, "content.xml", "Content.xml", xContext,
             (bOASIS ? "com.sun.star.comp.Writer.XMLOasisContentImporter"
@@ -871,7 +871,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
            aFilterArgs, rName, true );
 
     if( !(IsOrganizerMode() || IsBlockMode() || bInsertMode ||
-          aOpt.IsFmtsOnly() ) )
+          aOpt.IsFormatsOnly() ) )
     {
         try
         {
@@ -894,7 +894,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
 
     nRet = nRet ? nRet : (nWarn ? nWarn : (nWarn2 ? nWarn2 : nWarnRDF ) );
 
-    aOpt.ResetAllFmtsOnly();
+    aOpt.ResetAllFormatsOnly();
 
     // redline password
     Any aAny = xInfoSet->getPropertyValue( sRedlineProtectionKey );
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 6e6edcad8ece..91f336ce970b 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -253,7 +253,7 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >&
     if( !xModelComp.is() )
         return ERR_SWG_WRITE_ERROR;
 
-    PutNumFmtFontsInAttrPool();
+    PutNumFormatFontsInAttrPool();
     PutEditEngFontsInAttrPool();
 
     // properties
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 6841331b23f8..f167e98fda25 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -220,9 +220,9 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
             // The styles in pDoc also count the default style that never
             // gets exported -> subtract one.
             sal_Int32 nRef = 1; // meta.xml
-            nRef += pDoc->GetCharFmts()->size() - 1;
-            nRef += pDoc->GetFrmFmts()->size() - 1;
-            nRef += pDoc->GetTxtFmtColls()->size() - 1;
+            nRef += pDoc->GetCharFormats()->size() - 1;
+            nRef += pDoc->GetFrameFormats()->size() - 1;
+            nRef += pDoc->GetTextFormatColls()->size() - 1;
             nRef *= 2; // for the above styles, xmloff will increment by 2!
             // #i93174#: count all paragraphs for the progress bar
             nRef += pDoc->getIDocumentStatistics().GetUpdatedDocStat( false, true ).nAllPara; // 1: only content, no autostyle
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index a16aeca00f32..108d00b1bcfa 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -26,8 +26,8 @@
 #include <vector>
 
 class SwDoc;
-class SwFmt;
-class SwFrmFmt;
+class SwFormat;
+class SwFrameFormat;
 class SvXMLUnitConverter;
 class SvXMLExportItemMapper;
 class SvXMLAutoStylePoolP;
@@ -37,7 +37,7 @@ class SwTableBox;
 class SwXMLTableColumn_Impl;
 class SwXMLTableLines_Impl;
 class SwXMLTableColumnsSortByWidth_Impl;
-class SwXMLTableFrmFmtsSort_Impl;
+class SwXMLTableFrameFormatsSort_Impl;
 class SwXMLTableInfo_Impl;
 class SwTableNode;
 class XMLPropertySetMapper;
@@ -69,22 +69,22 @@ class SwXMLExport : public SvXMLExport
                                  sal_uInt32 nBaseWidth,
                                  const OUString& rNamePrefix,
                                  SwXMLTableColumnsSortByWidth_Impl& rExpCols,
-                                 SwXMLTableFrmFmtsSort_Impl& rExpRows,
-                                 SwXMLTableFrmFmtsSort_Impl& rExpCells,
-                                 SwXMLTableInfo_Impl& rTblInfo,
+                                 SwXMLTableFrameFormatsSort_Impl& rExpRows,
+                                 SwXMLTableFrameFormatsSort_Impl& rExpCells,
+                                 SwXMLTableInfo_Impl& rTableInfo,
                                  bool bTop=false );
 
-    void ExportFmt( const SwFmt& rFmt,  enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID );
-    void ExportTableFmt( const SwFrmFmt& rFmt, sal_uInt32 nAbsWidth );
+    void ExportFormat( const SwFormat& rFormat,  enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID );
+    void ExportTableFormat( const SwFrameFormat& rFormat, sal_uInt32 nAbsWidth );
 
     void ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol );
     void ExportTableBox( const SwTableBox& rBox, sal_uInt32 nColSpan, sal_uInt32 nRowSpan,
-                         SwXMLTableInfo_Impl& rTblInfo );
+                         SwXMLTableInfo_Impl& rTableInfo );
     void ExportTableLine( const SwTableLine& rLine,
                           const SwXMLTableLines_Impl& rLines,
-                          SwXMLTableInfo_Impl& rTblInfo );
+                          SwXMLTableInfo_Impl& rTableInfo );
     void ExportTableLines( const SwTableLines& rLines,
-                           SwXMLTableInfo_Impl& rTblInfo,
+                           SwXMLTableInfo_Impl& rTableInfo,
                            sal_uInt32 nHeaderRows = 0 );
 
     virtual void _ExportMeta() SAL_OVERRIDE;
@@ -125,8 +125,8 @@ public:
 
     inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
 
-    void ExportTableAutoStyles( const SwTableNode& rTblNd );
-    void ExportTable( const SwTableNode& rTblNd );
+    void ExportTableAutoStyles( const SwTableNode& rTableNd );
+    void ExportTable( const SwTableNode& rTableNd );
 
     SvXMLExportItemMapper& GetTableItemMapper() { return *pTableItemMapper; }
     const rtl::Reference < XMLPropertySetMapper >& GetParaPropMapper()
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index f842d5a75992..af971b8e412b 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -117,7 +117,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport,
 {
     if( 0 != (rEntry.nMemberId & MID_SW_FLAG_SPECIAL_ITEM_EXPORT) )
     {
-        if( rItem.ISA( SwFmtRowSplit ) )
+        if( rItem.ISA( SwFormatRowSplit ) )
         {
             OUString aValue;
             bool bAddAttribute = true;
@@ -429,15 +429,15 @@ bool SvXMLExportItemMapper::QueryXMLValue(
                 case  MID_FIRST_LINE_INDENT:
                     if( !pLRSpace->IsAutoFirst() )
                     {
-                        if(pLRSpace->GetPropTxtFirstLineOfst() != 100)
+                        if(pLRSpace->GetPropTextFirstLineOfst() != 100)
                         {
                             ::sax::Converter::convertPercent(
-                                aOut, pLRSpace->GetPropTxtFirstLineOfst() );
+                                aOut, pLRSpace->GetPropTextFirstLineOfst() );
                         }
                         else
                         {
                             rUnitConverter.convertMeasureToXML(
-                                    aOut, pLRSpace->GetTxtFirstLineOfst() );
+                                    aOut, pLRSpace->GetTextFirstLineOfst() );
                         }
                     }
                     else
@@ -827,15 +827,15 @@ bool SvXMLExportItemMapper::QueryXMLValue(
 
         case RES_BREAK:
         {
-            const SvxFmtBreakItem* pFmtBreak = PTR_CAST(SvxFmtBreakItem, &rItem);
-            OSL_ENSURE( pFmtBreak != NULL, "Wrong Which-ID" );
+            const SvxFormatBreakItem* pFormatBreak = PTR_CAST(SvxFormatBreakItem, &rItem);
+            OSL_ENSURE( pFormatBreak != NULL, "Wrong Which-ID" );
 
             unsigned int eEnum = 0;
 
             switch( nMemberId )
             {
             case MID_BREAK_BEFORE:
-                switch( pFmtBreak->GetValue() )
+                switch( pFormatBreak->GetValue() )
                 {
                     case SVX_BREAK_COLUMN_BEFORE:
                         eEnum = 1;
@@ -851,7 +851,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
                 }
                 break;
             case MID_BREAK_AFTER:
-                switch( pFmtBreak->GetValue() )
+                switch( pFormatBreak->GetValue() )
                 {
                     case SVX_BREAK_COLUMN_AFTER:
                         eEnum = 1;
@@ -874,11 +874,11 @@ bool SvXMLExportItemMapper::QueryXMLValue(
 
         case RES_KEEP:
         {
-            const SvxFmtKeepItem* pFmtKeep = PTR_CAST(SvxFmtKeepItem, &rItem);
-            assert(pFmtKeep && "Wrong Which-ID");
-            if (pFmtKeep)
+            const SvxFormatKeepItem* pFormatKeep = PTR_CAST(SvxFormatKeepItem, &rItem);
+            assert(pFormatKeep && "Wrong Which-ID");
+            if (pFormatKeep)
             {
-                aOut.append( pFmtKeep->GetValue()
+                aOut.append( pFormatKeep->GetValue()
                              ? GetXMLToken( XML_ALWAYS )
                              : GetXMLToken( XML_AUTO ) );
                 bOk = true;
@@ -1002,7 +1002,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
 
         case RES_PAGEDESC:
         {
-            const SwFmtPageDesc* pPageDesc = PTR_CAST(SwFmtPageDesc, &rItem);
+            const SwFormatPageDesc* pPageDesc = PTR_CAST(SwFormatPageDesc, &rItem);
             OSL_ENSURE( pPageDesc != NULL, "Wrong Which-ID" );
 
             if( MID_PAGEDESC_PAGENUMOFFSET==nMemberId )
@@ -1038,7 +1038,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
 
         case RES_HORI_ORIENT:
         {
-            const SwFmtHoriOrient* pHoriOrient = PTR_CAST(SwFmtHoriOrient, &rItem);
+            const SwFormatHoriOrient* pHoriOrient = PTR_CAST(SwFormatHoriOrient, &rItem);
             assert(pHoriOrient && "Wrong Which-ID");
             if (pHoriOrient)
             {
@@ -1051,7 +1051,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
 
         case RES_VERT_ORIENT:
         {
-            const SwFmtVertOrient* pVertOrient = PTR_CAST(SwFmtVertOrient, &rItem);
+            const SwFormatVertOrient* pVertOrient = PTR_CAST(SwFormatVertOrient, &rItem);
             assert(pVertOrient && "Wrong Which-ID");
 
             SvXMLUnitConverter::convertEnum( aOut, pVertOrient->GetVertOrient(),
@@ -1062,7 +1062,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
 
         case RES_FRM_SIZE:
         {
-            const SwFmtFrmSize* pFrmSize = PTR_CAST(SwFmtFrmSize, &rItem);
+            const SwFormatFrmSize* pFrmSize = PTR_CAST(SwFormatFrmSize, &rItem);
             OSL_ENSURE( pFrmSize != NULL, "Wrong Which-ID" );
 
             bool bOutHeight = false;
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index b4f243b13657..f9281cf8117b 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -386,7 +386,7 @@ void SwXMLTextStyleContext_Impl::Finish( bool bOverwrite )
 
     const SwDoc *pDoc = pStyle->GetDoc();
 
-    SwTxtFmtColl *pColl = pDoc->FindTxtFmtCollByName( pStyle->GetStyleName() );
+    SwTextFormatColl *pColl = pDoc->FindTextFormatCollByName( pStyle->GetStyleName() );
     OSL_ENSURE( pColl, "Text collection not found" );
     if( !pColl || RES_CONDTXTFMTCOLL != pColl->Which() )
         return;
@@ -403,14 +403,14 @@ void SwXMLTextStyleContext_Impl::Finish( bool bOverwrite )
                                       sName,
                                       nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL,
                                       true);
-        SwTxtFmtColl* pCondColl = pDoc->FindTxtFmtCollByName( sName );
+        SwTextFormatColl* pCondColl = pDoc->FindTextFormatCollByName( sName );
         OSL_ENSURE( pCondColl,
             "SwXMLItemSetStyleContext_Impl::ConnectConditions: cond coll missing" );
         if( pCondColl )
         {
             SwCollCondition aCond( pCondColl, pCond->GetCondition(),
                                               pCond->GetSubCondition() );
-            static_cast<SwConditionTxtFmtColl*>(pColl)->InsertCondition( aCond );
+            static_cast<SwConditionTextFormatColl*>(pColl)->InsertCondition( aCond );
         }
     }
 }
@@ -653,21 +653,21 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc()
     }
 
     const SfxPoolItem *pItem;
-    SwFmtPageDesc *pFmtPageDesc = 0;
+    SwFormatPageDesc *pFormatPageDesc = 0;
     if( SfxItemState::SET == pItemSet->GetItemState( RES_PAGEDESC, false,
                                                 &pItem ) )
     {
-         if( static_cast<const SwFmtPageDesc *>(pItem)->GetPageDesc() != pPageDesc )
-            pFmtPageDesc = new SwFmtPageDesc( *static_cast<const SwFmtPageDesc *>(pItem) );
+         if( static_cast<const SwFormatPageDesc *>(pItem)->GetPageDesc() != pPageDesc )
+            pFormatPageDesc = new SwFormatPageDesc( *static_cast<const SwFormatPageDesc *>(pItem) );
     }
     else
-        pFmtPageDesc = new SwFmtPageDesc();
+        pFormatPageDesc = new SwFormatPageDesc();
 
-    if( pFmtPageDesc )
+    if( pFormatPageDesc )
     {
-        pFmtPageDesc->RegisterToPageDesc( *pPageDesc );
-        pItemSet->Put( *pFmtPageDesc );
-        delete pFmtPageDesc;
+        pFormatPageDesc->RegisterToPageDesc( *pPageDesc );
+        pItemSet->Put( *pFormatPageDesc );
+        delete pFormatPageDesc;
     }
 }
 
@@ -690,7 +690,7 @@ bool SwXMLItemSetStyleContext_Impl::ResolveDataStyleName()
                 SfxItemPool& rItemPool = pDoc->GetAttrPool();
                 pItemSet = new SfxItemSet( rItemPool, aTableBoxSetRange );
             }
-            SwTblBoxNumFormat aNumFormatItem(nFormat);
+            SwTableBoxNumFormat aNumFormatItem(nFormat);
             pItemSet->Put(aNumFormatItem);
         }
 
@@ -998,20 +998,20 @@ void SwXMLImport::FinishStyles()
         GetStyles()->FinishStyles( !IsInsertMode() );
 }
 
-void SwXMLImport::UpdateTxtCollConditions( SwDoc *pDoc )
+void SwXMLImport::UpdateTextCollConditions( SwDoc *pDoc )
 {
     if( !pDoc )
         pDoc = SwImport::GetDocFromXMLImport( *this );
 
-    const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls();
+    const SwTextFormatColls& rColls = *pDoc->GetTextFormatColls();
     const size_t nCount = rColls.size();
     for( size_t i=0; i < nCount; ++i )
     {
-        SwTxtFmtColl *pColl = rColls[i];
+        SwTextFormatColl *pColl = rColls[i];
         if( pColl && RES_CONDTXTFMTCOLL == pColl->Which() )
         {
-            const SwFmtCollConditions& rConditions =
-                static_cast<const SwConditionTxtFmtColl *>(pColl)->GetCondColls();
+            const SwFormatCollConditions& rConditions =
+                static_cast<const SwConditionTextFormatColl *>(pColl)->GetCondColls();
             bool bSendModify = false;
             for( size_t j=0; j < rConditions.size() && !bSendModify; ++j )
             {
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index ec0594b0f402..b966c22a4d2a 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -46,48 +46,48 @@ using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::lang;
 using namespace ::xmloff::token;
 
-void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
+void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFamily )
 {
     // <style:style ...>
     CheckAttrList();
 
     // style:family="..."
-    OSL_ENSURE( RES_FRMFMT==rFmt.Which(), "frame format expected" );
-    if( RES_FRMFMT != rFmt.Which() )
+    OSL_ENSURE( RES_FRMFMT==rFormat.Which(), "frame format expected" );
+    if( RES_FRMFMT != rFormat.Which() )
         return;
     OSL_ENSURE( eFamily != XML_TOKEN_INVALID, "family must be specified" );
     // style:name="..."
     bool bEncoded = false;
     AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, EncodeStyleName(
-                    rFmt.GetName(), &bEncoded ) );
+                    rFormat.GetName(), &bEncoded ) );
     if( bEncoded )
-        AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY_NAME, rFmt.GetName() );
+        AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY_NAME, rFormat.GetName() );
 
     if( eFamily != XML_TOKEN_INVALID )
         AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, eFamily );
 
 #if OSL_DEBUG_LEVEL > 0
     // style:parent-style-name="..." (if its not the default only)
-    const SwFmt* pParent = rFmt.DerivedFrom();
+    const SwFormat* pParent = rFormat.DerivedFrom();
     // Parent-Namen nur uebernehmen, wenn kein Default
     OSL_ENSURE( !pParent || pParent->IsDefault(), "unexpected parent" );
 
-    OSL_ENSURE( USHRT_MAX == rFmt.GetPoolFmtId(), "pool ids arent'supported" );
-    OSL_ENSURE( USHRT_MAX == rFmt.GetPoolHelpId(), "help ids arent'supported" );
-    OSL_ENSURE( USHRT_MAX == rFmt.GetPoolHelpId() ||
-            UCHAR_MAX == rFmt.GetPoolHlpFileId(), "help file ids aren't supported" );
+    OSL_ENSURE( USHRT_MAX == rFormat.GetPoolFormatId(), "pool ids arent'supported" );
+    OSL_ENSURE( USHRT_MAX == rFormat.GetPoolHelpId(), "help ids arent'supported" );
+    OSL_ENSURE( USHRT_MAX == rFormat.GetPoolHelpId() ||
+            UCHAR_MAX == rFormat.GetPoolHlpFileId(), "help file ids aren't supported" );
 #endif
 
     // style:master-page-name
-    if( RES_FRMFMT == rFmt.Which() && XML_TABLE == eFamily )
+    if( RES_FRMFMT == rFormat.Which() && XML_TABLE == eFamily )
     {
         const SfxPoolItem *pItem;
-        if( SfxItemState::SET == rFmt.GetAttrSet().GetItemState( RES_PAGEDESC,
+        if( SfxItemState::SET == rFormat.GetAttrSet().GetItemState( RES_PAGEDESC,
                                                             false, &pItem ) )
         {
             OUString sName;
             const SwPageDesc *pPageDesc =
-                static_cast<const SwFmtPageDesc *>(pItem)->GetPageDesc();
+                static_cast<const SwFormatPageDesc *>(pItem)->GetPageDesc();
             if( pPageDesc )
                 SwStyleNameMapper::FillProgName(
                                     pPageDesc->GetName(),
@@ -101,15 +101,15 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
 
     if( XML_TABLE_CELL == eFamily )
     {
-        OSL_ENSURE(RES_FRMFMT == rFmt.Which(), "only frame format");
+        OSL_ENSURE(RES_FRMFMT == rFormat.Which(), "only frame format");
 
         const SfxPoolItem *pItem;
         if( SfxItemState::SET ==
-            rFmt.GetAttrSet().GetItemState( RES_BOXATR_FORMAT,
+            rFormat.GetAttrSet().GetItemState( RES_BOXATR_FORMAT,
                                             false, &pItem ) )
         {
             sal_Int32 nFormat = (sal_Int32)
-                static_cast<const SwTblBoxNumFormat *>(pItem)->GetValue();
+                static_cast<const SwTableBoxNumFormat *>(pItem)->GetValue();
 
             if ( (nFormat != -1) && (nFormat != css::util::NumberFormat::TEXT) )
             {
@@ -152,7 +152,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
             rItemMapper.setMapEntries( xItemMap );
 
             GetTableItemMapper().exportXML( *this,
-                                           rFmt.GetAttrSet(),
+                                           rFormat.GetAttrSet(),
                                            GetTwipUnitConverter(),
                                            ePropToken,
                                            SvXmlExportFlags::IGN_WS );
@@ -228,7 +228,7 @@ void SwXMLExport::_ExportAutoStyles()
         GetPageExport()->exportAutoStyles();
 
     // we rely on data styles being written after cell styles in the
-    // ExportFmt() method; so be careful when changing order.
+    // ExportFormat() method; so be careful when changing order.
     exportAutoDataStyles();
 
     SvXMLExportFlags nContentAutostyles = SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 08ab57c90ebb..a9d264554f8d 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -492,10 +492,10 @@ static OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCurso
     OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
     if( !xCrsrTunnel.is() )
         return 0;
-    OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper *>(
+    OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper *>(
             sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething(  OTextCursorHelper::getUnoTunnelId() )));
-    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
-    return pTxtCrsr;
+    OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
+    return pTextCrsr;
 }
 
 void SwXMLImport::startDocument()
@@ -596,7 +596,7 @@ void SwXMLImport::startDocument()
     // We also might change into the insert mode later, so we have to make
     // sure to first set the insert mode and then create the text import
     // helper. Otherwise it won't have the insert flag set!
-    OTextCursorHelper *pTxtCrsr = 0;
+    OTextCursorHelper *pTextCrsr = 0;
     Reference < XTextCursor > xTextCursor;
     if( HasTextImport() )
            xTextCursor = GetTextImport()->GetCursor();
@@ -609,12 +609,12 @@ void SwXMLImport::startDocument()
         SwDoc *pDoc = 0;
         if( SvXMLImportFlags::ALL == getImportFlags() )
         {
-            pTxtCrsr = lcl_xml_GetSwXTextCursor( xTextCursor );
-            OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
-            if( !pTxtCrsr )
+            pTextCrsr = lcl_xml_GetSwXTextCursor( xTextCursor );
+            OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
+            if( !pTextCrsr )
                 return;
 
-            pDoc = pTxtCrsr->GetDoc();
+            pDoc = pTextCrsr->GetDoc();
             OSL_ENSURE( pDoc, "SwDoc missing" );
             if( !pDoc )
                 return;
@@ -632,7 +632,7 @@ void SwXMLImport::startDocument()
                     *pDoc, *pCrsrSh->GetCrsr()->GetPoint(), 0 ) );
             setTextInsertMode( xInsertTextRange );
             xTextCursor = GetTextImport()->GetCursor();
-            pTxtCrsr = 0;
+            pTextCrsr = 0;
         }
         else
             GetTextImport()->SetCursor( xTextCursor );
@@ -641,13 +641,13 @@ void SwXMLImport::startDocument()
     if( (!(getImportFlags() & (SvXMLImportFlags::CONTENT|SvXMLImportFlags::MASTERSTYLES))))
         return;
 
-    if( !pTxtCrsr  )
-        pTxtCrsr = lcl_xml_GetSwXTextCursor( xTextCursor );
-    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
-    if( !pTxtCrsr )
+    if( !pTextCrsr  )
+        pTextCrsr = lcl_xml_GetSwXTextCursor( xTextCursor );
+    OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
+    if( !pTextCrsr )
         return;
 
-    SwDoc *pDoc = pTxtCrsr->GetDoc();
+    SwDoc *pDoc = pTextCrsr->GetDoc();
     OSL_ENSURE( pDoc, "SwDoc missing" );
     if( !pDoc )
         return;
@@ -657,7 +657,7 @@ void SwXMLImport::startDocument()
         pSttNdIdx = new SwNodeIndex( pDoc->GetNodes() );
         if( IsInsertMode() )
         {
-            SwPaM *pPaM = pTxtCrsr->GetPaM();
+            SwPaM *pPaM = pTextCrsr->GetPaM();
             const SwPosition* pPos = pPaM->GetPoint();
 
             // Split once and remember the node that has been splitted.
@@ -669,8 +669,8 @@ void SwXMLImport::startDocument()
 
             // Insert all content into the new node
             pPaM->Move( fnMoveBackward );
-            pDoc->SetTxtFmtColl
-                ( *pPaM, pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false ) );
+            pDoc->SetTextFormatColl
+                ( *pPaM, pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD, false ) );
         }
     }
 
@@ -729,18 +729,18 @@ void SwXMLImport::endDocument()
         Reference<XUnoTunnel> xCrsrTunnel( GetTextImport()->GetCursor(),
                                               UNO_QUERY);
         assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
-        OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper *>(
+        OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper *>(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-        assert(pTxtCrsr && "SwXTextCursor missing");
-        SwPaM *pPaM = pTxtCrsr->GetPaM();
+        assert(pTextCrsr && "SwXTextCursor missing");
+        SwPaM *pPaM = pTextCrsr->GetPaM();
         if( IsInsertMode() && pSttNdIdx->GetIndex() )
         {
             // If we are in insert mode, join the splitted node that is in front
             // of the new content with the first new node. Or in other words:
             // Revert the first split node.
-            SwTxtNode* pTxtNode = pSttNdIdx->GetNode().GetTxtNode();
+            SwTextNode* pTextNode = pSttNdIdx->GetNode().GetTextNode();
             SwNodeIndex aNxtIdx( *pSttNdIdx );
-            if( pTxtNode && pTxtNode->CanJoinNext( &aNxtIdx ) &&
+            if( pTextNode && pTextNode->CanJoinNext( &aNxtIdx ) &&
                 pSttNdIdx->GetIndex() + 1 == aNxtIdx.GetIndex() )
             {
                 // If the PaM points to the first new node, move the PaM to the
@@ -748,8 +748,8 @@ void SwXMLImport::endDocument()
                 if( pPaM->GetPoint()->nNode == aNxtIdx )
                 {
                     pPaM->GetPoint()->nNode = *pSttNdIdx;
-                    pPaM->GetPoint()->nContent.Assign( pTxtNode,
-                                            pTxtNode->GetTxt().getLength());
+                    pPaM->GetPoint()->nContent.Assign( pTextNode,
+                                            pTextNode->GetText().getLength());
                 }
 
 #if OSL_DEBUG_LEVEL > 0
@@ -766,27 +766,27 @@ void SwXMLImport::endDocument()
                 {
                     const sal_Int32 nCntPos =
                             pPaM->GetBound( true ).nContent.GetIndex();
-                    pPaM->GetBound( true ).nContent.Assign( pTxtNode,
-                            pTxtNode->GetTxt().getLength() + nCntPos );
+                    pPaM->GetBound( true ).nContent.Assign( pTextNode,
+                            pTextNode->GetText().getLength() + nCntPos );
                 }
                 if( pSttNdIdx->GetIndex()+1 ==
                                 pPaM->GetBound( false ).nNode.GetIndex() )
                 {
                     const sal_Int32 nCntPos =
                             pPaM->GetBound( false ).nContent.GetIndex();
-                    pPaM->GetBound( false ).nContent.Assign( pTxtNode,
-                            pTxtNode->GetTxt().getLength() + nCntPos );
+                    pPaM->GetBound( false ).nContent.Assign( pTextNode,
+                            pTextNode->GetText().getLength() + nCntPos );
                 }
 #endif
                 // If the first new node isn't empty, convert  the node's text
                 // attributes into hints. Otherwise, set the new node's
                 // paragraph style at the previous (empty) node.
-                SwTxtNode* pDelNd = aNxtIdx.GetNode().GetTxtNode();
-                if (!pTxtNode->GetTxt().isEmpty())
-                    pDelNd->FmtToTxtAttr( pTxtNode );
+                SwTextNode* pDelNd = aNxtIdx.GetNode().GetTextNode();
+                if (!pTextNode->GetText().isEmpty())
+                    pDelNd->FormatToTextAttr( pTextNode );
                 else
-                    pTxtNode->ChgFmtColl( pDelNd->GetTxtColl() );
-                pTxtNode->JoinNext();
+                    pTextNode->ChgFormatColl( pDelNd->GetTextColl() );
+                pTextNode->JoinNext();
             }
         }
 
@@ -794,21 +794,21 @@ void SwXMLImport::endDocument()
         OSL_ENSURE( !pPos->nContent.GetIndex(), "last paragraph isn't empty" );
         if( !pPos->nContent.GetIndex() )
         {
-            SwTxtNode* pCurrNd;
+            SwTextNode* pCurrNd;
             sal_uLong nNodeIdx = pPos->nNode.GetIndex();
             pDoc = pPaM->GetDoc();
 
-            OSL_ENSURE( pPos->nNode.GetNode().IsCntntNode(),
+            OSL_ENSURE( pPos->nNode.GetNode().IsContentNode(),
                         "insert position is not a content node" );
             if( !IsInsertMode() )
             {
                 // If we're not in insert mode, the last node is deleted.
                 const SwNode *pPrev = pDoc->GetNodes()[nNodeIdx -1];
-                if( pPrev->IsCntntNode() ||
+                if( pPrev->IsContentNode() ||
                      ( pPrev->IsEndNode() &&
                       pPrev->StartOfSectionNode()->IsSectionNode() ) )
                 {
-                    SwCntntNode* pCNd = pPaM->GetCntntNode();
+                    SwContentNode* pCNd = pPaM->GetContentNode();
                     if( pCNd && pCNd->StartOfSectionIndex()+2 <
                         pCNd->EndOfSectionIndex() )
                     {
@@ -818,13 +818,13 @@ void SwXMLImport::endDocument()
                     }
                 }
             }
-            else if( 0 != (pCurrNd = pDoc->GetNodes()[nNodeIdx]->GetTxtNode()) )
+            else if( 0 != (pCurrNd = pDoc->GetNodes()[nNodeIdx]->GetTextNode()) )
             {
                 // Id we're in insert mode, the empty node is joined with
                 // the next and the previous one.
                 if( pCurrNd->CanJoinNext( &pPos->nNode ))
                 {
-                    SwTxtNode* pNextNd = pPos->nNode.GetNode().GetTxtNode();
+                    SwTextNode* pNextNd = pPos->nNode.GetNode().GetTextNode();
                     pPos->nContent.Assign( pNextNd, 0 );
                     pPaM->SetMark(); pPaM->DeleteMark();
                     pNextNd->JoinPrev();
@@ -837,7 +837,7 @@ void SwXMLImport::endDocument()
                         pNextNd->JoinPrev();
                     }
                 }
-                else if (pCurrNd->GetTxt().isEmpty())
+                else if (pCurrNd->GetText().isEmpty())
                 {
                     pPos->nContent.Assign( 0, 0 );
                     pPaM->SetMark(); pPaM->DeleteMark();
@@ -855,9 +855,9 @@ void SwXMLImport::endDocument()
     if( (getImportFlags() & SvXMLImportFlags::CONTENT) ||
         ((getImportFlags() & SvXMLImportFlags::MASTERSTYLES) && IsStylesOnlyMode()) )
     {
-        // pDoc might be 0. In this case UpdateTxtCollCondition is looking
+        // pDoc might be 0. In this case UpdateTextCollCondition is looking
         // for it itself.
-        UpdateTxtCollConditions( pDoc );
+        UpdateTextCollConditions( pDoc );
     }
 
     GetTextImport()->ResetCursor();
@@ -1503,11 +1503,11 @@ void SwXMLImport::initialize(
 SwDoc* SwImport::GetDocFromXMLImport( SvXMLImport& rImport )
 {
     uno::Reference<lang::XUnoTunnel> xModelTunnel( rImport.GetModel(), uno::UNO_QUERY );
-    SwXTextDocument *pTxtDoc = reinterpret_cast< SwXTextDocument *>(
+    SwXTextDocument *pTextDoc = reinterpret_cast< SwXTextDocument *>(
             sal::static_int_cast< sal_IntPtr >(  xModelTunnel->getSomething(SwXTextDocument::getUnoTunnelId() )));
-    assert( pTxtDoc );
-    assert( pTxtDoc->GetDocShell() );
-    SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+    assert( pTextDoc );
+    assert( pTextDoc->GetDocShell() );
+    SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
     OSL_ENSURE( pDoc, "Where is my document?" );
     return pDoc;
 }
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index e6006f12b6d3..7fae001383c5 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -83,7 +83,7 @@ class SwXMLImport: public SvXMLImport
 
     void                    _InitItemImport();
     void                    _FinitItemImport();
-    void                    UpdateTxtCollConditions( SwDoc *pDoc );
+    void                    UpdateTextCollConditions( SwDoc *pDoc );
 
     void         setTextInsertMode(
                      const ::com::sun::star::uno::Reference<
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 7bd9541f659a..7774d194de86 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -283,7 +283,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
                         switch( nMemberId )
                         {
                             case MID_L_MARGIN:
-                                pLRSpace->SetTxtLeft( (sal_Int32)nAbs, (sal_uInt16)nProp );
+                                pLRSpace->SetTextLeft( (sal_Int32)nAbs, (sal_uInt16)nProp );
                                 break;
                             case MID_R_MARGIN:
                                 pLRSpace->SetRight( (sal_Int32)nAbs, (sal_uInt16)nProp );
@@ -304,7 +304,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
                         bOk = rUnitConverter.convertMeasureToCore(nAbs, rValue,
                                                              -0x7fff, 0x7fff );
 
-                    pLRSpace->SetTxtFirstLineOfst( (short)nAbs, (sal_uInt16)nProp );
+                    pLRSpace->SetTextFirstLineOfst( (short)nAbs, (sal_uInt16)nProp );
                 }
                 break;
 
@@ -589,8 +589,8 @@ bool SvXMLImportItemMapper::PutXMLValue(
 
         case RES_BREAK:
         {
-            SvxFmtBreakItem* pFmtBreak = PTR_CAST(SvxFmtBreakItem, &rItem);
-            OSL_ENSURE( pFmtBreak != NULL, "Wrong Which-ID" );
+            SvxFormatBreakItem* pFormatBreak = PTR_CAST(SvxFormatBreakItem, &rItem);
+            OSL_ENSURE( pFormatBreak != NULL, "Wrong Which-ID" );
 
             sal_uInt16 eEnum;
 
@@ -599,7 +599,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
 
             if( eEnum == 0 )
             {
-                pFmtBreak->SetValue( SVX_BREAK_NONE );
+                pFormatBreak->SetValue( SVX_BREAK_NONE );
                 bOk = true;
             }
             else
@@ -607,12 +607,12 @@ bool SvXMLImportItemMapper::PutXMLValue(
                 switch( nMemberId )
                 {
                     case MID_BREAK_BEFORE:
-                        pFmtBreak->SetValue( static_cast< sal_uInt16 >((eEnum == 1) ?
+                        pFormatBreak->SetValue( static_cast< sal_uInt16 >((eEnum == 1) ?
                                              SVX_BREAK_COLUMN_BEFORE :
                                              SVX_BREAK_PAGE_BEFORE) );
                         break;
                     case MID_BREAK_AFTER:
-                        pFmtBreak->SetValue( static_cast< sal_uInt16 >((eEnum == 1) ?
+                        pFormatBreak->SetValue( static_cast< sal_uInt16 >((eEnum == 1) ?
                                              SVX_BREAK_COLUMN_AFTER :
                                              SVX_BREAK_PAGE_AFTER) );
                         break;
@@ -624,19 +624,19 @@ bool SvXMLImportItemMapper::PutXMLValue(
 
         case RES_KEEP:
         {
-            SvxFmtKeepItem* pFmtKeep = PTR_CAST(SvxFmtKeepItem, &rItem);
-            OSL_ENSURE( pFmtKeep != NULL, "Wrong Which-ID" );
+            SvxFormatKeepItem* pFormatKeep = PTR_CAST(SvxFormatKeepItem, &rItem);
+            OSL_ENSURE( pFormatKeep != NULL, "Wrong Which-ID" );
 
             if( IsXMLToken( rValue, XML_ALWAYS ) ||
                  IsXMLToken( rValue, XML_TRUE ) )
             {
-                pFmtKeep->SetValue( true );
+                pFormatKeep->SetValue( true );
                 bOk = true;
             }
             else if( IsXMLToken( rValue, XML_AUTO ) ||
                      IsXMLToken( rValue, XML_FALSE ) )
             {
-                pFmtKeep->SetValue( false );
+                pFormatKeep->SetValue( false );
                 bOk = true;
             }
         }
@@ -787,7 +787,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
 
         case RES_PAGEDESC:
         {
-            SwFmtPageDesc* pPageDesc = PTR_CAST(SwFmtPageDesc, &rItem);
+            SwFormatPageDesc* pPageDesc = PTR_CAST(SwFormatPageDesc, &rItem);
             OSL_ENSURE( pPageDesc != NULL, "Wrong Which-ID" );
 
             if( MID_PAGEDESC_PAGENUMOFFSET==nMemberId )
@@ -824,7 +824,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
 
         case RES_HORI_ORIENT:
         {
-            SwFmtHoriOrient* pHoriOrient = PTR_CAST(SwFmtHoriOrient, &rItem);
+            SwFormatHoriOrient* pHoriOrient = PTR_CAST(SwFormatHoriOrient, &rItem);
             OSL_ENSURE( pHoriOrient != NULL, "Wrong Which-ID" );
 
             sal_uInt16 nValue;
@@ -837,7 +837,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
 
         case RES_VERT_ORIENT:
         {
-            SwFmtVertOrient* pVertOrient = PTR_CAST(SwFmtVertOrient, &rItem);
+            SwFormatVertOrient* pVertOrient = PTR_CAST(SwFormatVertOrient, &rItem);
             OSL_ENSURE( pVertOrient != NULL, "Wrong Which-ID" );
 
             sal_uInt16 nValue;
@@ -856,7 +856,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
 
         case RES_FRM_SIZE:
         {
-            SwFmtFrmSize* pFrmSize = PTR_CAST(SwFmtFrmSize, &rItem);
+            SwFormatFrmSize* pFrmSize = PTR_CAST(SwFormatFrmSize, &rItem);
             OSL_ENSURE( pFrmSize != NULL, "Wrong Which-ID" );
 
             bool bSetHeight = false;
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index 614ba83ea162..536dc949e43e 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -130,7 +130,7 @@ void SwXMLTableItemMapper_Impl::handleSpecialItem(
                                                     &pItem ) )
             {
                 sal_Int16 eHoriOrient =
-                    static_cast<const SwFmtHoriOrient *>(pItem)->GetHoriOrient();
+                    static_cast<const SwFormatHoriOrient *>(pItem)->GetHoriOrient();
                 bool bExport = false;
                 sal_uInt16 nMemberId =
                     static_cast<sal_uInt16>( rEntry.nMemberId & MID_SW_FLAG_MASK );
@@ -232,11 +232,11 @@ void SwXMLExport::_FinitItemExport()
     delete pTwipUnitConv;
 }
 
-void SwXMLExport::ExportTableFmt( const SwFrmFmt& rFmt, sal_uInt32 nAbsWidth )
+void SwXMLExport::ExportTableFormat( const SwFrameFormat& rFormat, sal_uInt32 nAbsWidth )
 {
     static_cast<SwXMLTableItemMapper_Impl *>(pTableItemMapper)
         ->SetAbsWidth( nAbsWidth );
-    ExportFmt( rFmt, XML_TABLE );
+    ExportFormat( rFormat, XML_TABLE );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index ef4d17cf5010..9a201702688f 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -94,7 +94,7 @@ struct statistic {
 };
 
 static const struct statistic s_stats [] = {
-    { XML_TOK_META_STAT_TABLE, "TableCount",     &SwDocStat::nTbl, 0  },
+    { XML_TOK_META_STAT_TABLE, "TableCount",     &SwDocStat::nTable, 0  },
     { XML_TOK_META_STAT_IMAGE, "ImageCount",     &SwDocStat::nGrf, 0  },
     { XML_TOK_META_STAT_OLE,   "ObjectCount",    &SwDocStat::nOLE, 0  },
     { XML_TOK_META_STAT_PAGE,  "PageCount",      0, &SwDocStat::nPage },
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 0716e6154571..d9dd57abe32d 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -175,33 +175,33 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
     }
 }
 
-typedef vector< SwFrmFmt* > SwXMLFrmFmts_Impl;
+typedef vector< SwFrameFormat* > SwXMLFrameFormats_Impl;
 
-class SwXMLTableFrmFmtsSort_Impl
+class SwXMLTableFrameFormatsSort_Impl
 {
 private:
-    SwXMLFrmFmts_Impl aFormatList;
+    SwXMLFrameFormats_Impl aFormatList;
 public:
-    bool AddRow( SwFrmFmt& rFrmFmt, const OUString& rNamePrefix, sal_uInt32 nLine );
-    bool AddCell( SwFrmFmt& rFrmFmt, const OUString& rNamePrefix,
+    bool AddRow( SwFrameFormat& rFrameFormat, const OUString& rNamePrefix, sal_uInt32 nLine );
+    bool AddCell( SwFrameFormat& rFrameFormat, const OUString& rNamePrefix,
                   sal_uInt32 nCol, sal_uInt32 nRow, bool bTop );
 };
 
-bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
+bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat,
                                          const OUString& rNamePrefix,
                                             sal_uInt32 nLine )
 {
-    const SwFmtFrmSize *pFrmSize = 0;
-    const SwFmtRowSplit* pRowSplit = 0;
+    const SwFormatFrmSize *pFrmSize = 0;
+    const SwFormatRowSplit* pRowSplit = 0;
     const SvxBrushItem *pBrush = 0;
 
-    const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+    const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
     const SfxPoolItem *pItem;
     if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, false, &pItem ) )
-        pFrmSize = static_cast<const SwFmtFrmSize *>(pItem);
+        pFrmSize = static_cast<const SwFormatFrmSize *>(pItem);
 
     if( SfxItemState::SET == rItemSet.GetItemState( RES_ROW_SPLIT, false, &pItem ) )
-        pRowSplit = static_cast<const SwFmtRowSplit *>(pItem);
+        pRowSplit = static_cast<const SwFormatRowSplit *>(pItem);
 
     if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
         pBrush = static_cast<const SvxBrushItem *>(pItem);
@@ -212,21 +212,21 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
 
     // order is: -/brush, size/-, size/brush
     bool bInsert = true;
-    SwXMLFrmFmts_Impl::iterator i;
+    SwXMLFrameFormats_Impl::iterator i;
     for( i = aFormatList.begin(); i < aFormatList.end(); ++i )
     {
-        const SwFmtFrmSize *pTestFrmSize = 0;
-        const SwFmtRowSplit* pTestRowSplit = 0;
+        const SwFormatFrmSize *pTestFrmSize = 0;
+        const SwFormatRowSplit* pTestRowSplit = 0;
         const SvxBrushItem *pTestBrush = 0;
-        const SwFrmFmt *pTestFmt = *i;
-        const SfxItemSet& rTestSet = pTestFmt->GetAttrSet();
+        const SwFrameFormat *pTestFormat = *i;
+        const SfxItemSet& rTestSet = pTestFormat->GetAttrSet();
         if( SfxItemState::SET == rTestSet.GetItemState( RES_FRM_SIZE, false,
                                                   &pItem ) )
         {
             if( !pFrmSize )
                 break;
 
-            pTestFrmSize = static_cast<const SwFmtFrmSize *>(pItem);
+            pTestFrmSize = static_cast<const SwFormatFrmSize *>(pItem);
         }
         else
         {
@@ -254,7 +254,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
             if( !pRowSplit )
                 break;
 
-            pTestRowSplit = static_cast<const SwFmtRowSplit *>(pItem);
+            pTestRowSplit = static_cast<const SwFormatRowSplit *>(pItem);
         }
         else
         {
@@ -274,16 +274,16 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
             continue;
 
         // found!
-        rFrmFmt.SetName( pTestFmt->GetName() );
+        rFrameFormat.SetName( pTestFormat->GetName() );
         bInsert = false;
         break;
     }
 
     if( bInsert )
     {
-        rFrmFmt.SetName( rNamePrefix + "." + OUString::number(nLine+1UL) );
+        rFrameFormat.SetName( rNamePrefix + "." + OUString::number(nLine+1UL) );
         if ( i != aFormatList.end() ) ++i;
-        aFormatList.insert( i, &rFrmFmt );
+        aFormatList.insert( i, &rFrameFormat );
     }
 
     return bInsert;
@@ -295,7 +295,7 @@ static OUString lcl_xmltble_appendBoxPrefix(const OUString& rNamePrefix,
     if( bTop )
     {
         OUString sTmp;
-        sw_GetTblBoxColStr( (sal_uInt16)nCol, sTmp );
+        sw_GetTableBoxColStr( (sal_uInt16)nCol, sTmp );
         return rNamePrefix + "." + sTmp + OUString::number(nRow + 1);
     }
     return rNamePrefix
@@ -303,21 +303,21 @@ static OUString lcl_xmltble_appendBoxPrefix(const OUString& rNamePrefix,
         + "." + OUString::number(nRow + 1);
 }
 
-bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
+bool SwXMLTableFrameFormatsSort_Impl::AddCell( SwFrameFormat& rFrameFormat,
                                          const OUString& rNamePrefix,
                                             sal_uInt32 nCol, sal_uInt32 nRow, bool bTop )
 {
-    const SwFmtVertOrient *pVertOrient = 0;
+    const SwFormatVertOrient *pVertOrient = 0;
     const SvxBrushItem *pBrush = 0;
     const SvxBoxItem *pBox = 0;
-    const SwTblBoxNumFormat *pNumFmt = 0;
+    const SwTableBoxNumFormat *pNumFormat = 0;
     const SvxFrameDirectionItem *pFrameDir = 0;
 
-    const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
+    const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
     const SfxPoolItem *pItem;
     if( SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, false,
                                                &pItem ) )
-        pVertOrient = static_cast<const SwFmtVertOrient *>(pItem);
+        pVertOrient = static_cast<const SwFormatVertOrient *>(pItem);
 
     if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
         pBrush = static_cast<const SvxBrushItem *>(pItem);
@@ -327,13 +327,13 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
 
     if ( SfxItemState::SET == rItemSet.GetItemState( RES_BOXATR_FORMAT,
                                                 false, &pItem ) )
-        pNumFmt = static_cast<const SwTblBoxNumFormat *>(pItem);
+        pNumFormat = static_cast<const SwTableBoxNumFormat *>(pItem);
     if ( SfxItemState::SET == rItemSet.GetItemState( RES_FRAMEDIR,
                                                 false, &pItem ) )
         pFrameDir = static_cast<const SvxFrameDirectionItem *>(pItem);
 
     // empty styles have not to be exported
-    if( !pVertOrient && !pBrush && !pBox && !pNumFmt && !pFrameDir )
+    if( !pVertOrient && !pBrush && !pBox && !pNumFormat && !pFrameDir )
         return false;
 
     // order is: -/-/-/num,
@@ -343,23 +343,23 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
     //           vert/brush/-/-, vert/brush/-/num, vert/brush/box/-,
     //           vert/brush/box/num
     bool bInsert = true;
-    SwXMLFrmFmts_Impl::iterator i;
+    SwXMLFrameFormats_Impl::iterator i;
     for( i = aFormatList.begin(); i < aFormatList.end(); ++i )
     {
-        const SwFmtVertOrient *pTestVertOrient = 0;
+        const SwFormatVertOrient *pTestVertOrient = 0;
         const SvxBrushItem *pTestBrush = 0;
         const SvxBoxItem *pTestBox = 0;
-        const SwTblBoxNumFormat *pTestNumFmt = 0;
+        const SwTableBoxNumFormat *pTestNumFormat = 0;
         const SvxFrameDirectionItem *pTestFrameDir = 0;
-        const SwFrmFmt* pTestFmt = *i;
-        const SfxItemSet& rTestSet = pTestFmt->GetAttrSet();
+        const SwFrameFormat* pTestFormat = *i;
+        const SfxItemSet& rTestSet = pTestFormat->GetAttrSet();
         if( SfxItemState::SET == rTestSet.GetItemState( RES_VERT_ORIENT, false,
                                                   &pItem ) )
         {
             if( !pVertOrient )
                 break;
 
-            pTestVertOrient = static_cast<const SwFmtVertOrient *>(pItem);
+            pTestVertOrient = static_cast<const SwFormatVertOrient *>(pItem);
         }
         else
         {
@@ -397,14 +397,14 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
         if ( SfxItemState::SET == rTestSet.GetItemState( RES_BOXATR_FORMAT,
                                                 false, &pItem ) )
         {
-            if( !pNumFmt )
+            if( !pNumFormat )
                 break;
 
-            pTestNumFmt = static_cast<const SwTblBoxNumFormat *>(pItem);
+            pTestNumFormat = static_cast<const SwTableBoxNumFormat *>(pItem);
         }
         else
         {
-            if( pNumFmt )
+            if( pNumFormat )
                 continue;
 
         }
@@ -434,23 +434,23 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
         if( pBox && ( *pBox != *pTestBox ) )
             continue;
 
-        if( pNumFmt && pNumFmt->GetValue() != pTestNumFmt->GetValue() )
+        if( pNumFormat && pNumFormat->GetValue() != pTestNumFormat->GetValue() )
             continue;
 
         if( pFrameDir && pFrameDir->GetValue() != pTestFrameDir->GetValue() )
             continue;
 
         // found!
-        rFrmFmt.SetName( pTestFmt->GetName() );
+        rFrameFormat.SetName( pTestFormat->GetName() );
         bInsert = false;
         break;
     }
 
     if( bInsert )
     {
-        rFrmFmt.SetName( lcl_xmltble_appendBoxPrefix( rNamePrefix, nCol, nRow, bTop ) );
+        rFrameFormat.SetName( lcl_xmltble_appendBoxPrefix( rNamePrefix, nCol, nRow, bTop ) );
         if ( i != aFormatList.end() ) ++i;
-        aFormatList.insert( i, &rFrmFmt );
+        aFormatList.insert( i, &rFrameFormat );
     }
 
     return bInsert;
@@ -465,10 +465,10 @@ class SwXMLTableInfo_Impl
 
 public:
 
-    inline SwXMLTableInfo_Impl( const SwTable *pTbl, sal_uInt16 nPrefix );
+    inline SwXMLTableInfo_Impl( const SwTable *pTable, sal_uInt16 nPrefix );
 
     const SwTable *GetTable() const { return m_pTable; }
-    const SwFrmFmt *GetTblFmt() const { return m_pTable->GetFrmFmt(); }
+    const SwFrameFormat *GetTableFormat() const { return m_pTable->GetFrameFormat(); }
 
     bool IsBaseSectionValid() const { return m_bBaseSectionValid; }
     const Reference<XTextSection>& GetBaseSection() const { return m_xBaseSection; }
@@ -537,9 +537,9 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
                                     sal_uInt32 nAbsWidth, sal_uInt32 nBaseWidth,
                                     const OUString& rNamePrefix,
                                     SwXMLTableColumnsSortByWidth_Impl& rExpCols,
-                                    SwXMLTableFrmFmtsSort_Impl& rExpRows,
-                                    SwXMLTableFrmFmtsSort_Impl& rExpCells,
-                                    SwXMLTableInfo_Impl& rTblInfo,
+                                    SwXMLTableFrameFormatsSort_Impl& rExpRows,
+                                    SwXMLTableFrameFormatsSort_Impl& rExpCells,
+                                    SwXMLTableInfo_Impl& rTableInfo,
                                     bool bTop )
 {
     // pass 1: calculate columns
@@ -597,7 +597,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
                 if( bTop )
                 {
                     OUString sTmp;
-                    sw_GetTblBoxColStr( nColumn, sTmp );
+                    sw_GetTableBoxColStr( nColumn, sTmp );
                     pColumn->SetStyleName( rNamePrefix + "." + sTmp );
                 }
                 else
@@ -616,9 +616,9 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
     {
         SwTableLine *pLine = rLines[nLine];
 
-        SwFrmFmt *pFrmFmt = pLine->GetFrmFmt();
-        if( rExpRows.AddRow( *pFrmFmt, rNamePrefix, nLine ) )
-            ExportFmt( *pFrmFmt, XML_TABLE_ROW );
+        SwFrameFormat *pFrameFormat = pLine->GetFrameFormat();
+        if( rExpRows.AddRow( *pFrameFormat, rNamePrefix, nLine ) )
+            ExportFormat( *pFrameFormat, XML_TABLE_ROW );
 
         const SwTableBoxes& rBoxes = pLine->GetTabBoxes();
         const size_t nBoxes = rBoxes.size();
@@ -644,26 +644,26 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
             const SwStartNode *pBoxSttNd = pBox->GetSttNd();
             if( pBoxSttNd )
             {
-                SwFrmFmt *pFrmFmt2 = pBox->GetFrmFmt();
-                if( rExpCells.AddCell( *pFrmFmt2, rNamePrefix, nOldCol, nLine,
+                SwFrameFormat *pFrameFormat2 = pBox->GetFrameFormat();
+                if( rExpCells.AddCell( *pFrameFormat2, rNamePrefix, nOldCol, nLine,
                                        bTop) )
-                    ExportFmt( *pFrmFmt2, XML_TABLE_CELL );
+                    ExportFormat( *pFrameFormat2, XML_TABLE_CELL );
 
                 Reference < XCell > xCell = SwXCell::CreateXCell(
-                                                const_cast<SwFrmFmt *>(rTblInfo.GetTblFmt()),
+                                                const_cast<SwFrameFormat *>(rTableInfo.GetTableFormat()),
                                                   pBox,
-                                                 const_cast<SwTable *>(rTblInfo.GetTable()) );
+                                                 const_cast<SwTable *>(rTableInfo.GetTable()) );
                 if (xCell.is())
                 {
                     Reference < XText > xText( xCell, UNO_QUERY );
-                    if( !rTblInfo.IsBaseSectionValid() )
+                    if( !rTableInfo.IsBaseSectionValid() )
                     {
                         Reference<XPropertySet> xCellPropertySet( xCell,
                                                                  UNO_QUERY );
                         Any aAny = xCellPropertySet->getPropertyValue("TextSection");
                         Reference < XTextSection > xTextSection;
                         aAny >>= xTextSection;
-                        rTblInfo.SetBaseSection( xTextSection );
+                        rTableInfo.SetBaseSection( xTextSection );
                     }
 
                     const bool bExportContent = bool(getExportFlags() & SvXMLExportFlags::CONTENT );
@@ -671,7 +671,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
                     {
                         // AUTOSTYLES - not needed anymore if we are currently exporting content.xml
                         GetTextParagraphExport()->collectTextAutoStyles(
-                            xText, rTblInfo.GetBaseSection(), IsShowProgress() );
+                            xText, rTableInfo.GetBaseSection(), IsShowProgress() );
                     }
                 }
                 else {
@@ -685,7 +685,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
                                             lcl_xmltble_appendBoxPrefix( rNamePrefix,
                                                                          nOldCol, nLine, bTop ),
                                             rExpCols, rExpRows, rExpCells,
-                                            rTblInfo );
+                                            rTableInfo );
             }
 
             nCol++;
@@ -693,15 +693,15 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
     }
 }
 
-void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTblNd )
+void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTableNd )
 {
-    const SwTable& rTbl = rTblNd.GetTable();
-    const SwFrmFmt *pTblFmt = rTbl.GetFrmFmt();
+    const SwTable& rTable = rTableNd.GetTable();
+    const SwFrameFormat *pTableFormat = rTable.GetFrameFormat();
 
-    if( pTblFmt )
+    if( pTableFormat )
     {
-        sal_Int16 eTabHoriOri = pTblFmt->GetHoriOrient().GetHoriOrient();
-        const SwFmtFrmSize& rFrmSize = pTblFmt->GetFrmSize();
+        sal_Int16 eTabHoriOri = pTableFormat->GetHoriOrient().GetHoriOrient();
+        const SwFormatFrmSize& rFrmSize = pTableFormat->GetFrmSize();
 
         sal_uInt32 nAbsWidth = rFrmSize.GetSize().Width();
         sal_uInt32 nBaseWidth = 0UL;
@@ -712,36 +712,36 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTblNd )
         if( bFixAbsWidth )
         {
             nBaseWidth = nAbsWidth;
-            nAbsWidth = pTblFmt->FindLayoutRect(true).Width();
+            nAbsWidth = pTableFormat->FindLayoutRect(true).Width();
             if( !nAbsWidth )
             {
                 // TODO?
             }
         }
-        ExportTableFmt( *pTblFmt, nAbsWidth );
+        ExportTableFormat( *pTableFormat, nAbsWidth );
 
         SwXMLTableColumnsSortByWidth_Impl aExpCols;
-        SwXMLTableFrmFmtsSort_Impl aExpRows;
-        SwXMLTableFrmFmtsSort_Impl aExpCells;
-        SwXMLTableInfo_Impl aTblInfo( &rTbl, XML_NAMESPACE_TABLE );
-        ExportTableLinesAutoStyles( rTbl.GetTabLines(), nAbsWidth, nBaseWidth,
-                                    pTblFmt->GetName(), aExpCols, aExpRows, aExpCells,
-                                    aTblInfo, true);
+        SwXMLTableFrameFormatsSort_Impl aExpRows;
+        SwXMLTableFrameFormatsSort_Impl aExpCells;
+        SwXMLTableInfo_Impl aTableInfo( &rTable, XML_NAMESPACE_TABLE );
+        ExportTableLinesAutoStyles( rTable.GetTabLines(), nAbsWidth, nBaseWidth,
+                                    pTableFormat->GetName(), aExpCols, aExpRows, aExpCells,
+                                    aTableInfo, true);
     }
 }
 
 void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
                                   sal_uInt32 nColSpan,
                                   sal_uInt32 nRowSpan,
-                                  SwXMLTableInfo_Impl& rTblInfo )
+                                  SwXMLTableInfo_Impl& rTableInfo )
 {
     const SwStartNode *pBoxSttNd = rBox.GetSttNd();
     if( pBoxSttNd )
     {
-        const SwFrmFmt *pFrmFmt = rBox.GetFrmFmt();
-        if( pFrmFmt )
+        const SwFrameFormat *pFrameFormat = rBox.GetFrameFormat();
+        if( pFrameFormat )
         {
-            const OUString sName = pFrmFmt->GetName();
+            const OUString sName = pFrameFormat->GetName();
             if( !sName.isEmpty() )
             {
                 AddAttribute( XML_NAMESPACE_TABLE, XML_STYLE_NAME, EncodeStyleName(sName) );
@@ -766,9 +766,9 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
         {
             // start node -> normal cell
             // get cell range for table
-            Reference<XCell> xCell = SwXCell::CreateXCell( const_cast<SwFrmFmt *>(rTblInfo.GetTblFmt()),
+            Reference<XCell> xCell = SwXCell::CreateXCell( const_cast<SwFrameFormat *>(rTableInfo.GetTableFormat()),
                                                             const_cast<SwTableBox *>(&rBox),
-                                                            const_cast<SwTable *>(rTblInfo.GetTable()) );
+                                                            const_cast<SwTable *>(rTableInfo.GetTable()) );
 
             if (xCell.is())
             {
@@ -822,22 +822,22 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
                                         XML_TRUE );
                     }
 
-                    if( !rTblInfo.IsBaseSectionValid() )
+                    if( !rTableInfo.IsBaseSectionValid() )
                     {
                         aAny = xCellPropertySet->getPropertyValue("TextSection");
                         Reference < XTextSection > xTextSection;
                         aAny >>= xTextSection;
-                        rTblInfo.SetBaseSection( xTextSection );
+                        rTableInfo.SetBaseSection( xTextSection );
                     }
                 }
 
                 // export cell element
-                SvXMLElementExport aElem( *this, rTblInfo.GetPrefix(),
+                SvXMLElementExport aElem( *this, rTableInfo.GetPrefix(),
                                         XML_TABLE_CELL, true, true );
 
                 // export cell content
                 GetTextParagraphExport()->exportText( xText,
-                                                    rTblInfo.GetBaseSection(),
+                                                    rTableInfo.GetBaseSection(),
                                                     IsShowProgress() );
             }
             else
@@ -857,7 +857,7 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
 
                 SvXMLElementExport aElemExport( *this, XML_NAMESPACE_TABLE,
                                           XML_TABLE, true, true );
-                ExportTableLines( rBox.GetTabLines(), rTblInfo );
+                ExportTableLines( rBox.GetTabLines(), rTableInfo );
             }
         }
     }
@@ -865,17 +865,17 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
 
 void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
                                    const SwXMLTableLines_Impl& rLines,
-                                   SwXMLTableInfo_Impl& rTblInfo )
+                                   SwXMLTableInfo_Impl& rTableInfo )
 {
     if( rLine.hasSoftPageBreak() )
     {
         SvXMLElementExport aElem( *this, XML_NAMESPACE_TEXT,
                                   XML_SOFT_PAGE_BREAK, true, true );
     }
-    const SwFrmFmt *pFrmFmt = rLine.GetFrmFmt();
-    if( pFrmFmt )
+    const SwFrameFormat *pFrameFormat = rLine.GetFrameFormat();
+    if( pFrameFormat )
     {
-        const OUString sName = pFrmFmt->GetName();
+        const OUString sName = pFrameFormat->GetName();
         if( !sName.isEmpty() )
         {
             AddAttribute( XML_NAMESPACE_TABLE, XML_STYLE_NAME, EncodeStyleName(sName) );
@@ -883,7 +883,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
     }
 
     {
-        SvXMLElementExport aElem( *this, rTblInfo.GetPrefix(), XML_TABLE_ROW, true, true );
+        SvXMLElementExport aElem( *this, rTableInfo.GetPrefix(), XML_TABLE_ROW, true, true );
         const SwTableBoxes& rBoxes = rLine.GetTabBoxes();
         const size_t nBoxes = rBoxes.size();
 
@@ -897,7 +897,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
             const long nRowSpan = pBox->getRowSpan();
             if( nRowSpan < 1 )
             {
-                SvXMLElementExport aElem2( *this, rTblInfo.GetPrefix(),
+                SvXMLElementExport aElem2( *this, rTableInfo.GetPrefix(),
                                           XML_COVERED_TABLE_CELL, true,
                                           false );
             }
@@ -926,11 +926,11 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
             const sal_uInt32 nColSpan = nCol - nOldCol + 1U;
 
             if ( nRowSpan >= 1 )
-                ExportTableBox( *pBox, nColSpan, static_cast< sal_uInt32 >(nRowSpan), rTblInfo );
+                ExportTableBox( *pBox, nColSpan, static_cast< sal_uInt32 >(nRowSpan), rTableInfo );
 
             for( size_t i=nOldCol; i<nCol; ++i )
             {
-                SvXMLElementExport aElemExport( *this, rTblInfo.GetPrefix(),
+                SvXMLElementExport aElemExport( *this, rTableInfo.GetPrefix(),
                                           XML_COVERED_TABLE_CELL, true,
                                           false );
             }
@@ -941,7 +941,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
 }
 
 void SwXMLExport::ExportTableLines( const SwTableLines& rLines,
-                                    SwXMLTableInfo_Impl& rTblInfo,
+                                    SwXMLTableInfo_Impl& rTableInfo,
                                     sal_uInt32 nHeaderRows )
 {
     OSL_ENSURE( pTableLines && !pTableLines->empty(),
@@ -1004,7 +1004,7 @@ void SwXMLExport::ExportTableLines( const SwTableLines& rLines,
             }
 
             {
-                SvXMLElementExport aElem( *this, rTblInfo.GetPrefix(), XML_TABLE_COLUMN, true, true );
+                SvXMLElementExport aElem( *this, rTableInfo.GetPrefix(), XML_TABLE_COLUMN, true, true );
             }
 
             nColRep = 1;
@@ -1022,12 +1022,12 @@ void SwXMLExport::ExportTableLines( const SwTableLines& rLines,
 
         OSL_ENSURE( nHeaderRows <= nLines, "more headers then lines?" );
         for( size_t nLine = 0U; nLine < nHeaderRows; ++nLine )
-            ExportTableLine( *(rLines[nLine]), *pLines, rTblInfo );
+            ExportTableLine( *(rLines[nLine]), *pLines, rTableInfo );
     }
     // export remaining rows
     for( size_t nLine = nHeaderRows; nLine < nLines; ++nLine )
     {
-        ExportTableLine( *(rLines[nLine]), *pLines, rTblInfo );
+        ExportTableLine( *(rLines[nLine]), *pLines, rTableInfo );
     }
 
     delete pLines;
@@ -1044,9 +1044,9 @@ static void lcl_xmltble_ClearName_Box( SwTableBox* pBox )
     }
     else
     {
-        SwFrmFmt *pFrmFmt = pBox->GetFrmFmt();
-        if( pFrmFmt && !pFrmFmt->GetName().isEmpty() )
-            pFrmFmt->SetName( OUString() );
+        SwFrameFormat *pFrameFormat = pBox->GetFrameFormat();
+        if( pFrameFormat && !pFrameFormat->GetName().isEmpty() )
+            pFrameFormat->SetName( OUString() );
     }
 }
 
@@ -1056,21 +1056,21 @@ void lcl_xmltble_ClearName_Line( SwTableLine* pLine )
         lcl_xmltble_ClearName_Box( pBox );
 }
 
-void SwXMLExport::ExportTable( const SwTableNode& rTblNd )
+void SwXMLExport::ExportTable( const SwTableNode& rTableNd )
 {
-    const SwTable& rTbl = rTblNd.GetTable();
-    const SwFrmFmt *pTblFmt = rTbl.GetFrmFmt();
-    if( pTblFmt && !pTblFmt->GetName().isEmpty() )
+    const SwTable& rTable = rTableNd.GetTable();
+    const SwFrameFormat *pTableFormat = rTable.GetFrameFormat();
+    if( pTableFormat && !pTableFormat->GetName().isEmpty() )
     {
-        AddAttribute( XML_NAMESPACE_TABLE, XML_NAME, pTblFmt->GetName() );
+        AddAttribute( XML_NAMESPACE_TABLE, XML_NAME, pTableFormat->GetName() );
         AddAttribute( XML_NAMESPACE_TABLE, XML_STYLE_NAME,
-                      EncodeStyleName( pTblFmt->GetName() ) );
+                      EncodeStyleName( pTableFormat->GetName() ) );
     }
 
     sal_uInt16 nPrefix = XML_NAMESPACE_TABLE;
-    if (const SwFrmFmt* pFlyFormat = rTblNd.GetFlyFmt())
+    if (const SwFrameFormat* pFlyFormat = rTableNd.GetFlyFormat())
     {
-        std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(rTblNd.GetDoc());
+        std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(rTableNd.GetDoc());
         if (aTextBoxes.find(pFlyFormat) != aTextBoxes.end())
             nPrefix = XML_NAMESPACE_LO_EXT;
     }
@@ -1079,18 +1079,18 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd )
         SvXMLElementExport aElem( *this, nPrefix, XML_TABLE, true, true );
 
         // export DDE source (if this is a DDE table)
-        if ( rTbl.ISA(SwDDETable) )
+        if ( rTable.ISA(SwDDETable) )
         {
             // get DDE Field Type (contains the DDE connection)
-            const SwDDEFieldType* pDDEFldType =
-                static_cast<const SwDDETable&>(rTbl).GetDDEFldType();
+            const SwDDEFieldType* pDDEFieldType =
+                static_cast<const SwDDETable&>(rTable).GetDDEFieldType();
 
             // connection name
             AddAttribute( XML_NAMESPACE_OFFICE, XML_NAME,
-                          pDDEFldType->GetName() );
+                          pDDEFieldType->GetName() );
 
             // DDE command
-            const OUString sCmd = pDDEFldType->GetCmd();
+            const OUString sCmd = pDDEFieldType->GetCmd();
             AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION,
                           sCmd.getToken(0, sfx2::cTokenSeparator) );
             AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_ITEM,
@@ -1099,7 +1099,7 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd )
                           sCmd.getToken(2, sfx2::cTokenSeparator) );
 
             // auto update
-            if (pDDEFldType->GetType() == SfxLinkUpdateMode::ALWAYS)
+            if (pDDEFieldType->GetType() == SfxLinkUpdateMode::ALWAYS)
             {
                 AddAttribute( XML_NAMESPACE_OFFICE,
                               XML_AUTOMATIC_UPDATE, XML_TRUE );
@@ -1110,10 +1110,10 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd )
                                        XML_DDE_SOURCE, true, false);
         }
 
-        SwXMLTableInfo_Impl aTblInfo( &rTbl, nPrefix );
-        ExportTableLines( rTbl.GetTabLines(), aTblInfo, rTbl.GetRowsToRepeat() );
+        SwXMLTableInfo_Impl aTableInfo( &rTable, nPrefix );
+        ExportTableLines( rTable.GetTabLines(), aTableInfo, rTable.GetRowsToRepeat() );
 
-        for( SwTableLine *pLine : ((SwTable &)rTbl).GetTabLines() )
+        for( SwTableLine *pLine : ((SwTable &)rTable).GetTabLines() )
             lcl_xmltble_ClearName_Line( pLine );
     }
 }
@@ -1125,9 +1125,9 @@ void SwXMLTextParagraphExport::exportTable(
     bool bOldShowProgress = static_cast<SwXMLExport&>(GetExport()).IsShowProgress();
     static_cast<SwXMLExport&>(GetExport()).SetShowProgress( _bProgress );
 
-    Reference < XTextTable > xTxtTbl( rTextContent, UNO_QUERY );
-    OSL_ENSURE( xTxtTbl.is(), "text table missing" );
-    if( xTxtTbl.is() )
+    Reference < XTextTable > xTextTable( rTextContent, UNO_QUERY );
+    OSL_ENSURE( xTextTable.is(), "text table missing" );
+    if( xTextTable.is() )
     {
         const SwXTextTable *pXTable = 0;
         Reference<XUnoTunnel> xTableTunnel( rTextContent, UNO_QUERY);
@@ -1139,27 +1139,27 @@ void SwXMLTextParagraphExport::exportTable(
         }
         if( pXTable )
         {
-            SwFrmFmt *pFmt = pXTable->GetFrmFmt();
-            OSL_ENSURE( pFmt, "table format missing" );
-            const SwTable *pTbl = SwTable::FindTable( pFmt );
-            OSL_ENSURE( pTbl, "table missing" );
-            const SwTableNode *pTblNd = pTbl->GetTableNode();
-            OSL_ENSURE( pTblNd, "table node missing" );
+            SwFrameFormat *pFormat = pXTable->GetFrameFormat();
+            OSL_ENSURE( pFormat, "table format missing" );
+            const SwTable *pTable = SwTable::FindTable( pFormat );
+            OSL_ENSURE( pTable, "table missing" );
+            const SwTableNode *pTableNd = pTable->GetTableNode();
+            OSL_ENSURE( pTableNd, "table node missing" );
             if( bAutoStyles )
             {
-                SwNodeIndex aIdx( *pTblNd );
+                SwNodeIndex aIdx( *pTableNd );
                 // AUTOSTYLES: Optimization: Do not export table autostyle if
                 // we are currently exporting the content.xml stuff and
                 // the table is located in header/footer:
                 // During the flat XML export (used e.g. by .sdw-export)
                 // ALL flags are set at the same time.
                 const bool bExportStyles = bool( GetExport().getExportFlags() & SvXMLExportFlags::STYLES );
-                if ( bExportStyles || !pFmt->GetDoc()->IsInHeaderFooter( aIdx ) )
-                    static_cast<SwXMLExport&>(GetExport()).ExportTableAutoStyles( *pTblNd );
+                if ( bExportStyles || !pFormat->GetDoc()->IsInHeaderFooter( aIdx ) )
+                    static_cast<SwXMLExport&>(GetExport()).ExportTableAutoStyles( *pTableNd );
             }
             else
             {
-                static_cast<SwXMLExport&>(GetExport()).ExportTable( *pTblNd );
+                static_cast<SwXMLExport&>(GetExport()).ExportTable( *pTableNd );
             }
         }
     }
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 42b9437aa075..a478cb726ee2 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -643,12 +643,12 @@ SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext(
     {
         if( !HasContent() )
         {
-            SwXMLTableContext *pTblContext =
+            SwXMLTableContext *pTableContext =
                 new SwXMLTableContext( GetSwImport(), nPrefix, rLocalName,
                                        xAttrList, GetTable() );
-            pContext = pTblContext;
+            pContext = pTableContext;
             if( GetTable()->IsValid() )
-                InsertContent( pTblContext );
+                InsertContent( pTableContext );
 
             GetTable()->SetHasSubTables( true );
         }
@@ -683,18 +683,18 @@ void SwXMLTableCellContext_Impl::EndElement()
             {
                 // The original text is invalid after deleting the last
                 // paragraph
-                Reference < XTextCursor > xSrcTxtCursor =
+                Reference < XTextCursor > xSrcTextCursor =
                     GetImport().GetTextImport()->GetText()->createTextCursor();
-                xSrcTxtCursor->gotoEnd( sal_True );
+                xSrcTextCursor->gotoEnd( sal_True );
 
                 // Until we have an API for copying we have to use the core.
-                Reference<XUnoTunnel> xSrcCrsrTunnel( xSrcTxtCursor, UNO_QUERY);
+                Reference<XUnoTunnel> xSrcCrsrTunnel( xSrcTextCursor, UNO_QUERY);
                 assert(xSrcCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
-                OTextCursorHelper *pSrcTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
+                OTextCursorHelper *pSrcTextCrsr = reinterpret_cast< OTextCursorHelper * >(
                         sal::static_int_cast< sal_IntPtr >( xSrcCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-                assert(pSrcTxtCrsr && "SwXTextCursor missing");
-                SwDoc *pDoc = pSrcTxtCrsr->GetDoc();
-                const SwPaM *pSrcPaM = pSrcTxtCrsr->GetPaM();
+                assert(pSrcTextCrsr && "SwXTextCursor missing");
+                SwDoc *pDoc = pSrcTextCrsr->GetDoc();
+                const SwPaM *pSrcPaM = pSrcTextCrsr->GetPaM();
 
                 while( nColRepeat > 1 && GetTable()->IsInsertCellPossible() )
                 {
@@ -703,11 +703,11 @@ void SwXMLTableCellContext_Impl::EndElement()
                     Reference<XUnoTunnel> xDstCrsrTunnel(
                         GetImport().GetTextImport()->GetCursor(), UNO_QUERY);
                     assert(xDstCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
-                    OTextCursorHelper *pDstTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
+                    OTextCursorHelper *pDstTextCrsr = reinterpret_cast< OTextCursorHelper * >(
                             sal::static_int_cast< sal_IntPtr >( xDstCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )) );
-                    assert(pDstTxtCrsr && "SwXTextCursor missing");
+                    assert(pDstTextCrsr && "SwXTextCursor missing");
                     SwPaM aSrcPaM(*pSrcPaM->GetMark(), *pSrcPaM->GetPoint());
-                    SwPosition aDstPos( *pDstTxtCrsr->GetPaM()->GetPoint() );
+                    SwPosition aDstPos( *pDstTextCrsr->GetPaM()->GetPoint() );
                     pDoc->getIDocumentContentOperations().CopyRange( aSrcPaM, aDstPos, /*bCopyAll=*/false, /*bCheckPos=*/true );
 
                     nColRepeat--;
@@ -798,7 +798,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
             SfxItemState::SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, false,
                                                         &pItem ) )
         {
-            const SwFmtFrmSize *pSize = static_cast<const SwFmtFrmSize *>(pItem);
+            const SwFormatFrmSize *pSize = static_cast<const SwFormatFrmSize *>(pItem);
             nWidth = pSize->GetWidth();
             bRelWidth = ATT_VAR_SIZE == pSize->GetHeightSizeType();
         }
@@ -1144,7 +1144,7 @@ void SwXMLDDETableContext_Impl::StartElement(
 }
 
 // generate a new name for DDE field type (called by lcl_GetDDEFieldType below)
-static OUString lcl_GenerateFldTypeName(const OUString& sPrefix, SwTableNode* pTableNode)
+static OUString lcl_GenerateFieldTypeName(const OUString& sPrefix, SwTableNode* pTableNode)
 {
     const OUString sPrefixStr(sPrefix.isEmpty() ? OUString("_") : sPrefix);
 
@@ -1160,7 +1160,7 @@ static OUString lcl_GenerateFldTypeName(const OUString& sPrefix, SwTableNode* pT
         ++nCount;
         sName = sPrefixStr + OUString::number(nCount);
     }
-    while (NULL != pTableNode->GetDoc()->getIDocumentFieldsAccess().GetFldType(RES_DDEFLD, sName, false));
+    while (NULL != pTableNode->GetDoc()->getIDocumentFieldsAccess().GetFieldType(RES_DDEFLD, sName, false));
 
     return sName;
 }
@@ -1188,13 +1188,13 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext,
     // valid name?
     if (sName.isEmpty())
     {
-        sName = lcl_GenerateFldTypeName(pContext->GetDDEApplication(),
+        sName = lcl_GenerateFieldTypeName(pContext->GetDDEApplication(),
                                         pTableNode);
     }
     else
     {
         // check for existing DDE field type with the same name
-        SwDDEFieldType* pOldType = static_cast<SwDDEFieldType*>(pTableNode->GetDoc()->getIDocumentFieldsAccess().GetFldType(RES_DDEFLD, sName, false));
+        SwDDEFieldType* pOldType = static_cast<SwDDEFieldType*>(pTableNode->GetDoc()->getIDocumentFieldsAccess().GetFieldType(RES_DDEFLD, sName, false));
         if (NULL != pOldType)
         {
             // same values -> return old type
@@ -1207,7 +1207,7 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext,
             else
             {
                 // same name, different values -> think of new name
-                sName = lcl_GenerateFldTypeName(pContext->GetDDEApplication(),
+                sName = lcl_GenerateFieldTypeName(pContext->GetDDEApplication(),
                                                 pTableNode);
             }
         }
@@ -1220,7 +1220,7 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext,
         // create new field type and return
         SwDDEFieldType aDDEFieldType(sName, sCommand, nType);
         pType = static_cast<SwDDEFieldType*>(pTableNode->
-            GetDoc()->getIDocumentFieldsAccess().InsertFldType(aDDEFieldType));
+            GetDoc()->getIDocumentFieldsAccess().InsertFieldType(aDDEFieldType));
     }
 
     OSL_ENSURE(NULL != pType, "We really want a SwDDEFieldType here!");
@@ -1284,8 +1284,8 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
     pTableNode( 0 ),
     pBox1( 0 ),
     pSttNd1( 0 ),
-    pBoxFmt( 0 ),
-    pLineFmt( 0 ),
+    pBoxFormat( 0 ),
+    pLineFormat( 0 ),
     pSharedBoxFormats(NULL),
     pDDESource(NULL),
     bFirstSection( true ),
@@ -1330,18 +1330,18 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
 
     SwDoc *pDoc = SwImport::GetDocFromXMLImport( GetSwImport() );
 
-    OUString sTblName;
+    OUString sTableName;
     if( !aName.isEmpty() )
     {
-        const SwTableFmt *pTblFmt = pDoc->FindTblFmtByName( aName );
-        if( !pTblFmt )
-            sTblName = aName;
+        const SwTableFormat *pTableFormat = pDoc->FindTableFormatByName( aName );
+        if( !pTableFormat )
+            sTableName = aName;
     }
-    if( sTblName.isEmpty() )
+    if( sTableName.isEmpty() )
     {
-        sTblName = pDoc->GetUniqueTblName();
+        sTableName = pDoc->GetUniqueTableName();
         GetImport().GetTextImport()
-            ->GetRenameMap().Add( XML_TEXT_RENAME_TYPE_TABLE, aName, sTblName );
+            ->GetRenameMap().Add( XML_TEXT_RENAME_TYPE_TABLE, aName, sTableName );
     }
 
     Reference< XTextTable > xTable;
@@ -1398,14 +1398,14 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
     }
     if( pXTable )
     {
-        SwFrmFmt *pTblFrmFmt = pXTable->GetFrmFmt();
-        OSL_ENSURE( pTblFrmFmt, "table format missing" );
-        SwTable *pTbl = SwTable::FindTable( pTblFrmFmt );
-        OSL_ENSURE( pTbl, "table missing" );
-        pTableNode = pTbl->GetTableNode();
+        SwFrameFormat *pTableFrameFormat = pXTable->GetFrameFormat();
+        OSL_ENSURE( pTableFrameFormat, "table format missing" );
+        SwTable *pTable = SwTable::FindTable( pTableFrameFormat );
+        OSL_ENSURE( pTable, "table missing" );
+        pTableNode = pTable->GetTableNode();
         OSL_ENSURE( pTableNode, "table node missing" );
 
-        pTblFrmFmt->SetName( sTblName );
+        pTableFrameFormat->SetName( sTableName );
 
         SwTableLine *pLine1 = pTableNode->GetTable().GetTabLines()[0U];
         pBox1 = pLine1->GetTabBoxes()[0U];
@@ -1424,8 +1424,8 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
     pTableNode( pTable->pTableNode ),
     pBox1( 0 ),
     pSttNd1( 0 ),
-    pBoxFmt( 0 ),
-    pLineFmt( 0 ),
+    pBoxFormat( 0 ),
+    pLineFormat( 0 ),
     pSharedBoxFormats(NULL),
     xParentTable( pTable ),
     pDDESource(NULL),
@@ -1844,12 +1844,12 @@ SwTableBox *SwXMLTableContext::NewTableBox( const SwStartNode *pStNd,
         pBox1 = 0;
     }
     else
-        pBox = new SwTableBox( pBoxFmt, *pStNd, pUpper );
+        pBox = new SwTableBox( pBoxFormat, *pStNd, pUpper );
 
     return pBox;
 }
 
-SwTableBoxFmt* SwXMLTableContext::GetSharedBoxFormat(
+SwTableBoxFormat* SwXMLTableContext::GetSharedBoxFormat(
     SwTableBox* pBox,
     const OUString& rStyleName,
     sal_Int32 nColumnWidth,
@@ -1859,48 +1859,48 @@ SwTableBoxFmt* SwXMLTableContext::GetSharedBoxFormat(
     bool* pModifyLocked )
 {
     if ( pSharedBoxFormats == NULL )
-        pSharedBoxFormats = new map_BoxFmt();
+        pSharedBoxFormats = new map_BoxFormat();
 
-    SwTableBoxFmt* pBoxFmt2;
+    SwTableBoxFormat* pBoxFormat2;
 
     TableBoxIndex aKey( rStyleName, nColumnWidth, bProtected );
-    map_BoxFmt::iterator aIter = pSharedBoxFormats->find( aKey );
+    map_BoxFormat::iterator aIter = pSharedBoxFormats->find( aKey );
     if ( aIter == pSharedBoxFormats->end() )
     {
         // unknown format so far -> construct a new one
 
         // get the old format, and reset all attributes
         // (but preserve FillOrder)
-        pBoxFmt2 = static_cast<SwTableBoxFmt*>(pBox->ClaimFrmFmt());
-        SwFmtFillOrder aFillOrder( pBoxFmt2->GetFillOrder() );
-        pBoxFmt2->ResetAllFmtAttr(); // #i73790# - method renamed
-        pBoxFmt2->SetFmtAttr( aFillOrder );
+        pBoxFormat2 = static_cast<SwTableBoxFormat*>(pBox->ClaimFrameFormat());
+        SwFormatFillOrder aFillOrder( pBoxFormat2->GetFillOrder() );
+        pBoxFormat2->ResetAllFormatAttr(); // #i73790# - method renamed
+        pBoxFormat2->SetFormatAttr( aFillOrder );
         bNew = true;    // it's a new format now
 
         // share this format, if allowed
         if ( bMayShare )
-            (*pSharedBoxFormats)[ aKey ] = pBoxFmt2;
+            (*pSharedBoxFormats)[ aKey ] = pBoxFormat2;
     }
     else
     {
         // set the shared format
-        pBoxFmt2 = aIter->second;
-        pBox->ChgFrmFmt( pBoxFmt2 );
+        pBoxFormat2 = aIter->second;
+        pBox->ChgFrameFormat( pBoxFormat2 );
         bNew = false;   // copied from an existing format
 
         // claim it, if we are not allowed to share
         if ( !bMayShare )
-            pBoxFmt2 = static_cast<SwTableBoxFmt*>(pBox->ClaimFrmFmt());
+            pBoxFormat2 = static_cast<SwTableBoxFormat*>(pBox->ClaimFrameFormat());
     }
 
     // lock format (if so desired)
     if ( pModifyLocked != NULL )
     {
-        (*pModifyLocked) = pBoxFmt2->IsModifyLocked();
-        pBoxFmt2->LockModify();
+        (*pModifyLocked) = pBoxFormat2->IsModifyLocked();
+        pBoxFormat2->LockModify();
     }
 
-    return pBoxFmt2;
+    return pBoxFormat2;
 }
 
 SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
@@ -1910,18 +1910,18 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
                                              sal_uInt32 nRightCol )
 {
     //FIXME: here would be a great place to handle XmlId for cell
-    SwTableBox *pBox = new SwTableBox( pBoxFmt, 0, pUpper );
+    SwTableBox *pBox = new SwTableBox( pBoxFormat, 0, pUpper );
 
     sal_uInt32 nColSpan = nRightCol - nLeftCol;
     sal_Int32 nColWidth = GetColumnWidth( nLeftCol, nColSpan );
 
     // TODO: Share formats!
-    SwFrmFmt *pFrmFmt = pBox->ClaimFrmFmt();
-    SwFmtFillOrder aFillOrder( pFrmFmt->GetFillOrder() );
-    pFrmFmt->ResetAllFmtAttr(); // #i73790# - method renamed
-    pFrmFmt->SetFmtAttr( aFillOrder );
+    SwFrameFormat *pFrameFormat = pBox->ClaimFrameFormat();
+    SwFormatFillOrder aFillOrder( pFrameFormat->GetFillOrder() );
+    pFrameFormat->ResetAllFormatAttr(); // #i73790# - method renamed
+    pFrameFormat->SetFormatAttr( aFillOrder );
 
-    pFrmFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nColWidth ) );
+    pFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nColWidth ) );
 
     SwTableLines& rLines = pBox->GetTabLines();
     bool bSplitted = false;
@@ -2018,7 +2018,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
     {
         // and it is a table: therefore we build a new box and
         // put the rows of the table into the rows of the box
-        pBox = new SwTableBox( pBoxFmt, 0, pUpper );
+        pBox = new SwTableBox( pBoxFormat, 0, pUpper );
         pCell->GetSubTable()->MakeTable( pBox, nColWidth );
     }
 
@@ -2026,7 +2026,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
     const OUString sStyleName = pCell->GetStyleName();
     bool bModifyLocked;
     bool bNew;
-    SwTableBoxFmt *pBoxFmt2 = GetSharedBoxFormat(
+    SwTableBoxFormat *pBoxFormat2 = GetSharedBoxFormat(
         pBox, sStyleName, nColWidth, pCell->IsProtected(),
         pCell->GetStartNode() && pCell->GetFormula().isEmpty() &&
             ! pCell->HasValue(),
@@ -2042,7 +2042,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
                 XML_STYLE_FAMILY_TABLE_CELL, sStyleName, &pAutoItemSet ) )
         {
             if( pAutoItemSet )
-                pBoxFmt2->SetFmtAttr( *pAutoItemSet );
+                pBoxFormat2->SetFormatAttr( *pAutoItemSet );
         }
     }
 
@@ -2051,14 +2051,14 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
         if (pCell->HasStringValue())
         {
             SwNodeIndex const aNodeIndex(*(pCell->GetStartNode()), 1);
-            SwTxtNode *const pTxtNode(aNodeIndex.GetNode().GetTxtNode());
-            SAL_WARN_IF(!pTxtNode, "sw", "Should have a text node in cell?");
-            if (pTxtNode)
+            SwTextNode *const pTextNode(aNodeIndex.GetNode().GetTextNode());
+            SAL_WARN_IF(!pTextNode, "sw", "Should have a text node in cell?");
+            if (pTextNode)
             {
-                SAL_WARN_IF(!pTxtNode->GetTxt().isEmpty(), "sw",
+                SAL_WARN_IF(!pTextNode->GetText().isEmpty(), "sw",
                         "why text here?");
-                pTxtNode->InsertText(*pCell->GetStringValue(),
-                        SwIndex(pTxtNode, 0));
+                pTextNode->InsertText(*pCell->GetStringValue(),
+                        SwIndex(pTextNode, 0));
             }
         }
 
@@ -2076,11 +2076,11 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
         {
             // default num format?
             const SfxPoolItem* pItem = NULL;
-            if( pBoxFmt2->GetItemState( RES_BOXATR_FORMAT, false, &pItem )
+            if( pBoxFormat2->GetItemState( RES_BOXATR_FORMAT, false, &pItem )
                             == SfxItemState::SET )
             {
-                const SwTblBoxNumFormat* pNumFormat =
-                    static_cast<const SwTblBoxNumFormat*>( pItem );
+                const SwTableBoxNumFormat* pNumFormat =
+                    static_cast<const SwTableBoxNumFormat*>( pItem );
                 if( ( pNumFormat != NULL ) && ( pNumFormat->GetValue() == 0 ) )
                 {
                     // only one text node?
@@ -2088,11 +2088,11 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
                     if( ( aNodeIndex.GetNode().EndOfSectionIndex() -
                           aNodeIndex.GetNode().StartOfSectionIndex() ) == 2 )
                     {
-                        SwTxtNode* pTxtNode= aNodeIndex.GetNode().GetTxtNode();
-                        if( pTxtNode != NULL )
+                        SwTextNode* pTextNode= aNodeIndex.GetNode().GetTextNode();
+                        if( pTextNode != NULL )
                         {
                             // check text: does it look like some form of 0.0?
-                            const OUString& rText = pTxtNode->GetTxt();
+                            const OUString& rText = pTextNode->GetText();
                             if( ( rText.getLength() > 10 ) ||
                                 ( rText.indexOf( '0' ) == -1 ) )
                             {
@@ -2109,9 +2109,9 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
         if( bSuppressNumericContent )
         {
             // suppress numeric content? Then reset number format!
-            pBoxFmt2->ResetFmtAttr( RES_BOXATR_FORMULA );
-            pBoxFmt2->ResetFmtAttr( RES_BOXATR_FORMAT );
-            pBoxFmt2->ResetFmtAttr( RES_BOXATR_VALUE );
+            pBoxFormat2->ResetFormatAttr( RES_BOXATR_FORMULA );
+            pBoxFormat2->ResetFormatAttr( RES_BOXATR_FORMAT );
+            pBoxFormat2->ResetFormatAttr( RES_BOXATR_VALUE );
         }
         else
         {
@@ -2121,8 +2121,8 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
             if (!rFormula.isEmpty())
             {
                 // formula cell: insert formula if valid
-                SwTblBoxFormula aFormulaItem( rFormula );
-                pBoxFmt2->SetFmtAttr( aFormulaItem );
+                SwTableBoxFormula aFormulaItem( rFormula );
+                pBoxFormat2->SetFormatAttr( aFormulaItem );
             }
             else if (!pCell->HasValue() && pCell->HasStringValue())
             {
@@ -2131,24 +2131,24 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
                 // Solution: the number format will be removed,
                 // the cell gets the default text format.
                 const SfxPoolItem* pItem = NULL;
-                if( pBoxFmt->GetItemState( RES_BOXATR_FORMAT, false, &pItem )
+                if( pBoxFormat->GetItemState( RES_BOXATR_FORMAT, false, &pItem )
                     == SfxItemState::SET )
                 {
-                    const SwDoc* pDoc = pBoxFmt->GetDoc();
+                    const SwDoc* pDoc = pBoxFormat->GetDoc();
                     const SvNumberFormatter* pNumberFormatter = pDoc ?
                         pDoc->GetNumberFormatter() : 0;
-                    const SwTblBoxNumFormat* pNumFormat =
-                        static_cast<const SwTblBoxNumFormat*>( pItem );
+                    const SwTableBoxNumFormat* pNumFormat =
+                        static_cast<const SwTableBoxNumFormat*>( pItem );
                     if( pNumFormat != NULL && pNumberFormatter &&
                         !pNumberFormatter->GetEntry( pNumFormat->GetValue() )->IsTextFormat() )
-                        pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
+                        pBoxFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
                 }
             }
             // always insert value, even if default
             if( pCell->HasValue() )
             {
-                SwTblBoxValue aValueItem( pCell->GetValue() );
-                pBoxFmt2->SetFmtAttr( aValueItem );
+                SwTableBoxValue aValueItem( pCell->GetValue() );
+                pBoxFormat2->SetFormatAttr( aValueItem );
             }
         }
 
@@ -2160,15 +2160,15 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
     if( pCell->IsProtected() )
     {
         SvxProtectItem aProtectItem( RES_PROTECT );
-        aProtectItem.SetCntntProtect( true );
-        pBoxFmt2->SetFmtAttr( aProtectItem );
+        aProtectItem.SetContentProtect( true );
+        pBoxFormat2->SetFormatAttr( aProtectItem );
     }
 
     // restore old modify-lock state
     if (! bModifyLocked)
-        pBoxFmt2->UnlockModify();
+        pBoxFormat2->UnlockModify();
 
-    pBoxFmt2->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nColWidth ) );
+    pBoxFormat2->SetFormatAttr( SwFormatFrmSize( ATT_VAR_SIZE, nColWidth ) );
 
     return pBox;
 }
@@ -2187,14 +2187,14 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
     }
     else
     {
-        pLine = new SwTableLine( pLineFmt, 0, pUpper );
+        pLine = new SwTableLine( pLineFormat, 0, pUpper );
     }
 
     // TODO: Share formats!
-    SwFrmFmt *pFrmFmt = pLine->ClaimFrmFmt();
-    SwFmtFillOrder aFillOrder( pFrmFmt->GetFillOrder() );
-    pFrmFmt->ResetAllFmtAttr(); // #i73790# - method renamed
-    pFrmFmt->SetFmtAttr( aFillOrder );
+    SwFrameFormat *pFrameFormat = pLine->ClaimFrameFormat();
+    SwFormatFillOrder aFillOrder( pFrameFormat->GetFillOrder() );
+    pFrameFormat->ResetAllFormatAttr(); // #i73790# - method renamed
+    pFrameFormat->SetFormatAttr( aFillOrder );
 
     const SfxItemSet *pAutoItemSet = 0;
     const OUString& rStyleName = (*pRows)[nTopRow].GetStyleName();
@@ -2204,7 +2204,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
             XML_STYLE_FAMILY_TABLE_ROW, rStyleName, &pAutoItemSet ) )
     {
         if( pAutoItemSet )
-            pFrmFmt->SetFmtAttr( *pAutoItemSet );
+            pFrameFormat->SetFormatAttr( *pAutoItemSet );
     }
 
     SwTableBoxes& rBoxes = pLine->GetTabBoxes();
@@ -2651,7 +2651,7 @@ void SwXMLTableContext::MakeTable()
 
     SwXMLImport& rSwImport = GetSwImport();
 
-    SwFrmFmt *pFrmFmt = pTableNode->GetTable().GetFrmFmt();
+    SwFrameFormat *pFrameFormat = pTableNode->GetTable().GetFrameFormat();
 
     sal_Int16 eHoriOrient = text::HoriOrientation::FULL;
     bool bSetHoriOrient = false;
@@ -2676,7 +2676,7 @@ void SwXMLTableContext::MakeTable()
         if( SfxItemState::SET == pAutoItemSet->GetItemState( RES_HORI_ORIENT, false,
                                                         &pItem ) )
         {
-            eHoriOrient = static_cast<const SwFmtHoriOrient *>(pItem)->GetHoriOrient();
+            eHoriOrient = static_cast<const SwFormatHoriOrient *>(pItem)->GetHoriOrient();
             switch( eHoriOrient )
             {
             case text::HoriOrientation::FULL:
@@ -2702,10 +2702,10 @@ void SwXMLTableContext::MakeTable()
             bSetHoriOrient = true;
         }
 
-        const SwFmtFrmSize *pSize = 0;
+        const SwFormatFrmSize *pSize = 0;
         if( SfxItemState::SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, false,
                                                         &pItem ) )
-            pSize = static_cast<const SwFmtFrmSize *>(pItem);
+            pSize = static_cast<const SwFormatFrmSize *>(pItem);
 
         switch( eHoriOrient )
         {
@@ -2751,7 +2751,7 @@ void SwXMLTableContext::MakeTable()
             break;
         }
 
-        pFrmFmt->SetFmtAttr( *pAutoItemSet );
+        pFrameFormat->SetFormatAttr( *pAutoItemSet );
     }
     else
     {
@@ -2765,21 +2765,21 @@ void SwXMLTableContext::MakeTable()
     pBox1->pSttNd = pSttNd1;
     pLine1->GetTabBoxes().erase( pLine1->GetTabBoxes().begin() );
 
-    pLineFmt = static_cast<SwTableLineFmt*>(pLine1->GetFrmFmt());
-    pBoxFmt = static_cast<SwTableBoxFmt*>(pBox1->GetFrmFmt());
+    pLineFormat = static_cast<SwTableLineFormat*>(pLine1->GetFrameFormat());
+    pBoxFormat = static_cast<SwTableBoxFormat*>(pBox1->GetFrameFormat());
 
     _MakeTable( 0 );
 
     if( bSetHoriOrient )
-        pFrmFmt->SetFmtAttr( SwFmtHoriOrient( 0, eHoriOrient ) );
+        pFrameFormat->SetFormatAttr( SwFormatHoriOrient( 0, eHoriOrient ) );
 
     // This must be after the call to _MakeTable, because nWidth might be
     // changed there.
-    pFrmFmt->LockModify();
-    SwFmtFrmSize aSize( ATT_VAR_SIZE, nWidth );
+    pFrameFormat->LockModify();
+    SwFormatFrmSize aSize( ATT_VAR_SIZE, nWidth );
     aSize.SetWidthPercent( nPrcWidth );
-    pFrmFmt->SetFmtAttr( aSize );
-    pFrmFmt->UnlockModify();
+    pFrameFormat->SetFormatAttr( aSize );
+    pFrameFormat->UnlockModify();
 
     for( size_t i=0; i<pRows->size(); i++ )
         (*pRows)[i].Dispose();
@@ -2789,7 +2789,7 @@ void SwXMLTableContext::MakeTable()
     {
         // change existing table into DDE table:
         // 1) Get DDE field type (get data from dde-source context),
-        SwDDEFieldType* pFldType = lcl_GetDDEFieldType( pDDESource,
+        SwDDEFieldType* pFieldType = lcl_GetDDEFieldType( pDDESource,
                                                         pTableNode );
 
         // 2) release the DDE source context,
@@ -2797,7 +2797,7 @@ void SwXMLTableContext::MakeTable()
 
         // 3) create new DDE table, and
         SwDDETable* pDDETable = new SwDDETable( pTableNode->GetTable(),
-                                                pFldType, false );
+                                                pFieldType, false );
 
         // 4) set new (DDE)table at node.
         pTableNode->SetNewTable(pDDETable, false);
@@ -2815,8 +2815,8 @@ void SwXMLTableContext::MakeTable()
 void SwXMLTableContext::MakeTable( SwTableBox *pBox, sal_Int32 nW )
 {
     //FIXME: here would be a great place to handle XmlId for subtable
-    pLineFmt = GetParentTable()->pLineFmt;
-    pBoxFmt = GetParentTable()->pBoxFmt;
+    pLineFormat = GetParentTable()->pLineFormat;
+    pBoxFormat = GetParentTable()->pBoxFormat;
     nWidth = nW;
     bRelWidth = GetParentTable()->bRelWidth;
 
@@ -2840,14 +2840,14 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
     Reference<XUnoTunnel> xCrsrTunnel( GetImport().GetTextImport()->GetCursor(),
                                        UNO_QUERY);
     OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
-    OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
+    OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
             sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
 
     if( bFirstSection )
     {
         // The Cursor already is in the first section
-        pStNd = pTxtCrsr->GetPaM()->GetNode().FindTableBoxStartNode();
+        pStNd = pTextCrsr->GetPaM()->GetNode().FindTableBoxStartNode();
         bFirstSection = false;
         GetImport().GetTextImport()->SetStyleAndAttrs( GetImport(),
             GetImport().GetTextImport()->GetCursor(), "Standard", true );
@@ -2865,8 +2865,8 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
         }
         sal_uInt32 nOffset = pPrevSttNd ? 1UL : 0UL;
         SwNodeIndex aIdx( *pEndNd, nOffset );
-        SwTxtFmtColl *pColl =
-            pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false );
+        SwTextFormatColl *pColl =
+            pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD, false );
         pStNd = pDoc->GetNodes().MakeTextSection( aIdx, SwTableBoxStartNode,
                                                  pColl );
         // Consider the case that a table is defined without a row.
@@ -2874,8 +2874,8 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
 
         {
             pBox1->pSttNd = pStNd;
-            SwCntntNode *pCNd = pDoc->GetNodes()[ pStNd->GetIndex() + 1 ]
-                                                            ->GetCntntNode();
+            SwContentNode *pCNd = pDoc->GetNodes()[ pStNd->GetIndex() + 1 ]
+                                                            ->GetContentNode();
             SwPosition aPos( *pCNd );
             aPos.nContent.Assign( pCNd, 0U );
 
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index f5017fbaf909..2882cb41fad3 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -32,8 +32,8 @@ class SwTableNode;
 class SwTableBox;
 class SwTableLine;
 class SwStartNode;
-class SwTableBoxFmt;
-class SwTableLineFmt;
+class SwTableBoxFormat;
+class SwTableLineFormat;
 class SwXMLTableCell_Impl;
 class SwXMLTableRow_Impl;
 typedef boost::ptr_vector<SwXMLTableRow_Impl> SwXMLTableRows_Impl;
@@ -71,14 +71,14 @@ class SwXMLTableContext : public XMLTextTableContext
     SwTableBox          *pBox1;
     const SwStartNode   *pSttNd1;
 
-    SwTableBoxFmt       *pBoxFmt;
-    SwTableLineFmt      *pLineFmt;
+    SwTableBoxFormat       *pBoxFormat;
+    SwTableLineFormat      *pLineFormat;
 
     // hash map of shared format, indexed by the (XML) style name,
     // the column width, and protection flag
-    typedef std::unordered_map<TableBoxIndex,SwTableBoxFmt*,
-                          TableBoxIndexHasher> map_BoxFmt;
-    map_BoxFmt* pSharedBoxFormats;
+    typedef std::unordered_map<TableBoxIndex,SwTableBoxFormat*,
+                          TableBoxIndexHasher> map_BoxFormat;
+    map_BoxFormat* pSharedBoxFormats;
 
     SvXMLImportContextRef   xParentTable;   // if table is a sub table
 
@@ -118,8 +118,8 @@ class SwXMLTableContext : public XMLTextTableContext
     void FixRowSpan( sal_uInt32 nRow, sal_uInt32 nCol, sal_uInt32 nColSpan );
     void ReplaceWithEmptyCell( sal_uInt32 nRow, sal_uInt32 nCol, bool bRows );
 
-    /** sets the appropriate SwTblBoxFmt at pBox. */
-    SwTableBoxFmt* GetSharedBoxFormat(
+    /** sets the appropriate SwTableBoxFormat at pBox. */
+    SwTableBoxFormat* GetSharedBoxFormat(
         SwTableBox* pBox,   /// the table box
         const OUString& rStyleName, /// XML style name
         sal_Int32 nColumnWidth,     /// width of column
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 0fb0538b8520..aaae93503da0 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -65,7 +65,7 @@ enum SvEmbeddedObjectTypes
     SV_EMBEDDED_FRAME
 };
 
-SwNoTxtNode *SwXMLTextParagraphExport::GetNoTxtNode(
+SwNoTextNode *SwXMLTextParagraphExport::GetNoTextNode(
     const Reference < XPropertySet >& rPropSet )
 {
     Reference<XUnoTunnel> xCrsrTunnel( rPropSet, UNO_QUERY );
@@ -73,10 +73,10 @@ SwNoTxtNode *SwXMLTextParagraphExport::GetNoTxtNode(
     SwXFrame *pFrame = reinterpret_cast< SwXFrame * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( SwXFrame::getUnoTunnelId() )));
     assert(pFrame && "SwXFrame missing");
-    SwFrmFmt *pFrmFmt = pFrame->GetFrmFmt();
-    const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-    const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
-    return  pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTxtNode();
+    SwFrameFormat *pFrameFormat = pFrame->GetFrameFormat();
+    const SwFormatContent& rContent = pFrameFormat->GetContent();
+    const SwNodeIndex *pNdIdx = rContent.GetContentIdx();
+    return  pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTextNode();
 }
 
 void SwXMLTextParagraphExport::exportStyleContent(
@@ -93,13 +93,13 @@ void SwXMLTextParagraphExport::exportStyleContent(
     if( pStyle && SFX_STYLE_FAMILY_PARA == pStyle->GetFamily() )
     {
         const SwDoc *pDoc = pStyle->GetDoc();
-        const SwTxtFmtColl *pColl =
-            pDoc->FindTxtFmtCollByName( pStyle->GetStyleName() );
+        const SwTextFormatColl *pColl =
+            pDoc->FindTextFormatCollByName( pStyle->GetStyleName() );
         OSL_ENSURE( pColl, "There is the text collection?" );
         if( pColl && RES_CONDTXTFMTCOLL == pColl->Which() )
         {
-            const SwFmtCollConditions& rConditions =
-                static_cast<const SwConditionTxtFmtColl *>(pColl)->GetCondColls();
+            const SwFormatCollConditions& rConditions =
+                static_cast<const SwConditionTextFormatColl *>(pColl)->GetCondColls();
             for( size_t i=0; i < rConditions.size(); ++i )
             {
                 const SwCollCondition& rCond = rConditions[i];
@@ -142,7 +142,7 @@ void SwXMLTextParagraphExport::exportStyleContent(
                     break;
                 }
                 OSL_ENSURE( eFunc != XML_TOKEN_INVALID,
-                            "SwXMLExport::ExportFmt: unknown condition" );
+                            "SwXMLExport::ExportFormat: unknown condition" );
                 if( eFunc != XML_TOKEN_INVALID )
                 {
                     OUString sCond = GetXMLToken(eFunc) + "()";
@@ -155,7 +155,7 @@ void SwXMLTextParagraphExport::exportStyleContent(
                                 XML_CONDITION, sCond );
                     OUString aString;
                     SwStyleNameMapper::FillProgName(
-                                    rCond.GetTxtFmtColl()->GetName(),
+                                    rCond.GetTextFormatColl()->GetName(),
                                     aString,
                                     nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL,
                                     true);
@@ -324,7 +324,7 @@ static void lcl_addFrameProperties(
 void SwXMLTextParagraphExport::_collectTextEmbeddedAutoStyles(
         const Reference < XPropertySet > & rPropSet )
 {
-    SwOLENode *pOLENd = GetNoTxtNode( rPropSet )->GetOLENode();
+    SwOLENode *pOLENd = GetNoTextNode( rPropSet )->GetOLENode();
     svt::EmbeddedObjectRef& rObjRef = pOLENd->GetOLEObj().GetObject();
     if( !rObjRef.is() )
         return;
@@ -360,7 +360,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
         const Reference < XPropertySet > & rPropSet,
         const Reference < XPropertySetInfo > & rPropSetInfo )
 {
-    SwOLENode *pOLENd = GetNoTxtNode( rPropSet )->GetOLENode();
+    SwOLENode *pOLENd = GetNoTextNode( rPropSet )->GetOLENode();
     SwOLEObj& rOLEObj = pOLENd->GetOLEObj();
     svt::EmbeddedObjectRef& rObjRef = rOLEObj.GetObject();
     if( !rObjRef.is() )
@@ -465,9 +465,9 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
             sURL = GetExport().AddEmbeddedObject( sURL );
             lcl_addURL( rXMLExport, sURL, false );
         }
-        if( SV_EMBEDDED_OWN == nType && !pOLENd->GetChartTblName().isEmpty() )
+        if( SV_EMBEDDED_OWN == nType && !pOLENd->GetChartTableName().isEmpty() )
         {
-            OUString sRange( pOLENd->GetChartTblName() );
+            OUString sRange( pOLENd->GetChartTableName() );
             OUStringBuffer aBuffer( sRange.getLength() + 2 );
             for( sal_Int32 i=0; i < sRange.getLength(); i++ )
             {
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 98fe1fbf47cb..0131f1d414b1 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -25,7 +25,7 @@
 
 class SwXMLExport;
 class SvXMLAutoStylePoolP;
-class SwNoTxtNode;
+class SwNoTextNode;
 
 namespace com { namespace sun { namespace star { namespace style {
                 class XStyle; } } } }
@@ -41,7 +41,7 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport
     const SvGlobalName aIFrameClassId;
     const SvGlobalName aOutplaceClassId;
 
-    static SwNoTxtNode *GetNoTxtNode(
+    static SwNoTextNode *GetNoTextNode(
         const ::com::sun::star::uno::Reference <
                 ::com::sun::star::beans::XPropertySet >& rPropSet );
 
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 5a70eb307cc9..1b3f08d787c0 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -105,10 +105,10 @@ static void lcl_putHeightAndWidth ( SfxItemSet &rItemSet,
         nHeight = convertMm100ToTwip( nHeight );
         if( nHeight < MINFLY )
             nHeight = MINFLY;
-        rItemSet.Put( SwFmtFrmSize( ATT_FIX_SIZE, nWidth, nHeight ) );
+        rItemSet.Put( SwFormatFrmSize( ATT_FIX_SIZE, nWidth, nHeight ) );
     }
 
-    SwFmtAnchor aAnchor( FLY_AT_CHAR );
+    SwFormatAnchor aAnchor( FLY_AT_CHAR );
     rItemSet.Put( aAnchor );
 
     if( pTwipWidth )
@@ -186,21 +186,21 @@ bool SwXMLTextImportHelper::IsInHeaderFooter() const
     uno::Reference<XUnoTunnel> xCrsrTunnel(
             const_cast<SwXMLTextImportHelper *>(this)->GetCursor(), UNO_QUERY );
     assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
-    OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
+    OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    SAL_WARN_IF(!pTxtCrsr, "sw.uno", "SwXTextCursor missing");
-    SwDoc *pDoc = pTxtCrsr ? pTxtCrsr->GetDoc() : NULL;
+    SAL_WARN_IF(!pTextCrsr, "sw.uno", "SwXTextCursor missing");
+    SwDoc *pDoc = pTextCrsr ? pTextCrsr->GetDoc() : NULL;
 
-    return pDoc && pDoc->IsInHeaderFooter( pTxtCrsr->GetPaM()->GetPoint()->nNode );
+    return pDoc && pDoc->IsInHeaderFooter( pTextCrsr->GetPaM()->GetPoint()->nNode );
 }
 
-static SwOLENode *lcl_GetOLENode( const SwFrmFmt *pFrmFmt )
+static SwOLENode *lcl_GetOLENode( const SwFrameFormat *pFrameFormat )
 {
     SwOLENode *pOLENd = 0;
-    if( pFrmFmt )
+    if( pFrameFormat )
     {
-        const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-        const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
+        const SwFormatContent& rContent = pFrameFormat->GetContent();
+        const SwNodeIndex *pNdIdx = rContent.GetContentIdx();
         pOLENd = pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetOLENode();
     }
     OSL_ENSURE( pOLENd, "Where is the OLE node" );
@@ -211,7 +211,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
         SvXMLImport& rImport,
         const OUString& rHRef,
         const OUString& rStyleName,
-        const OUString& rTblName,
+        const OUString& rTableName,
         sal_Int32 nWidth, sal_Int32 nHeight )
 {
     // this method will modify the document directly -> lock SolarMutex
@@ -230,9 +230,9 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
 
     uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
     assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
-    OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
+    OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    SAL_WARN_IF(!pTxtCrsr, "sw.uno", "SwXTextCursor missing");
+    SAL_WARN_IF(!pTextCrsr, "sw.uno", "SwXTextCursor missing");
     SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport );
 
     SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -242,7 +242,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
     lcl_putHeightAndWidth( aItemSet, nHeight, nWidth,
                            &aTwipSize.Height(), &aTwipSize.Width() );
 
-    SwFrmFmt *pFrmFmt = 0;
+    SwFrameFormat *pFrameFormat = 0;
     SwOLENode *pOLENd = 0;
     if( rHRef.copy( 0, nPos ) == "vnd.sun.star.ServiceName" )
     {
@@ -286,14 +286,14 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
                     lcl_setObjectVisualArea( xObj, nAspect, aTwipSize, MAP_TWIP );
                 }
 
-                if( pTxtCrsr )
+                if( pTextCrsr )
                 {
-                    pFrmFmt = pDoc->getIDocumentContentOperations().Insert( *pTxtCrsr->GetPaM(),
+                    pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(),
                                             ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
                                             &aItemSet,
                                             NULL,
                                             NULL );
-                    pOLENd = lcl_GetOLENode( pFrmFmt );
+                    pOLENd = lcl_GetOLENode( pFrameFormat );
                 }
 
                 if( pOLENd )
@@ -308,8 +308,8 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
     {
         // check whether an object with this name already exists in the document
         OUString aName;
-        SwIterator<SwCntntNode,SwFmtColl> aIter( *pDoc->GetDfltGrfFmtColl() );
-        for( SwCntntNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
+        SwIterator<SwContentNode,SwFormatColl> aIter( *pDoc->GetDfltGrfFormatColl() );
+        for( SwContentNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
         {
             SwOLENode* pExistingOLENd = pNd->GetOLENode();
             if( pExistingOLENd )
@@ -342,47 +342,47 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
 
         // the correct aspect will be set later
         // TODO/LATER: Actually it should be set here
-        if( pTxtCrsr )
+        if( pTextCrsr )
         {
-            pFrmFmt = pDoc->getIDocumentContentOperations().InsertOLE( *pTxtCrsr->GetPaM(), aName, embed::Aspects::MSOLE_CONTENT, &aItemSet, NULL, NULL );
-            pOLENd = lcl_GetOLENode( pFrmFmt );
+            pFrameFormat = pDoc->getIDocumentContentOperations().InsertOLE( *pTextCrsr->GetPaM(), aName, embed::Aspects::MSOLE_CONTENT, &aItemSet, NULL, NULL );
+            pOLENd = lcl_GetOLENode( pFrameFormat );
         }
         aObjName = aName;
     }
 
-    if( !pFrmFmt )
+    if( !pFrameFormat )
         return xPropSet;
 
     if( IsInsertMode() )
     {
         if( !pOLENd )
-            pOLENd = lcl_GetOLENode( pFrmFmt );
+            pOLENd = lcl_GetOLENode( pFrameFormat );
         if( pOLENd )
             pOLENd->SetOLESizeInvalid( true );
     }
 
     xPropSet.set(SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
-                *pDoc, pFrmFmt), uno::UNO_QUERY);
+                *pDoc, pFrameFormat), uno::UNO_QUERY);
     if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
     {
         // req for z-order
-        SwXFrame::GetOrCreateSdrObject(*static_cast<SwFlyFrmFmt*>(pFrmFmt));
+        SwXFrame::GetOrCreateSdrObject(*static_cast<SwFlyFrameFormat*>(pFrameFormat));
     }
-    if( !rTblName.isEmpty() )
+    if( !rTableName.isEmpty() )
     {
-        const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-        const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
+        const SwFormatContent& rContent = pFrameFormat->GetContent();
+        const SwNodeIndex *pNdIdx = rContent.GetContentIdx();
         SwOLENode *pOLENode = pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetOLENode();
         OSL_ENSURE( pOLENode, "Where is the OLE node" );
 
-        OUStringBuffer aBuffer( rTblName.getLength() );
+        OUStringBuffer aBuffer( rTableName.getLength() );
         bool bQuoted = false;
         bool bEscape = false;
         bool bError = false;
-        for( sal_Int32 i=0; i < rTblName.getLength(); i++ )
+        for( sal_Int32 i=0; i < rTableName.getLength(); i++ )
         {
             bool bEndOfNameFound = false;
-            sal_Unicode c = rTblName[i];
+            sal_Unicode c = rTableName[i];
             switch( c )
             {
             case '\'':
@@ -439,8 +439,8 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
         }
         if( !bError )
         {
-            OUString sTblName( aBuffer.makeStringAndClear() );
-            pOLENode->SetChartTblName( GetRenameMap().Get( XML_TEXT_RENAME_TYPE_TABLE, sTblName ) );
+            OUString sTableName( aBuffer.makeStringAndClear() );
+            pOLENode->SetChartTableName( GetRenameMap().Get( XML_TEXT_RENAME_TYPE_TABLE, sTableName ) );
         }
     }
 
@@ -534,7 +534,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
         SvXMLImport& rImport,
         const OUString& rHRef,
         const OUString& /*rStyleName*/,
-        const OUString& /*rTblName*/,
+        const OUString& /*rTableName*/,
         sal_Int32 nWidth, sal_Int32 nHeight )
 {
     // this method will modify the document directly -> lock SolarMutex
@@ -544,9 +544,9 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
 
     uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
     assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
-    OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
+    OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
     SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport );
 
     SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -593,7 +593,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
             uno::UNO_QUERY_THROW );
 
         {
-            SwFrmFmt *pFrmFmt = pDoc->getIDocumentContentOperations().Insert( *pTxtCrsr->GetPaM(),
+            SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(),
                                             ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
                                             &aItemSet,
                                             NULL,
@@ -602,11 +602,11 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
             // TODO/LATER: in future may need a way to set replacement image url to the link ( may be even to the object ), needs oasis cws???
 
             xPropSet.set(SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
-                            *pDoc, pFrmFmt), uno::UNO_QUERY);
+                            *pDoc, pFrameFormat), uno::UNO_QUERY);
             if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
             {
                 SwXFrame::GetOrCreateSdrObject(*
-                        static_cast<SwFlyFrmFmt*>(pFrmFmt)); // req for z-order
+                        static_cast<SwFlyFrameFormat*>(pFrameFormat)); // req for z-order
             }
         }
     }
@@ -614,7 +614,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
     {
     }
 
-    // TODO/LATER: should the rStyleName and rTblName be handled as for usual embedded object?
+    // TODO/LATER: should the rStyleName and rTableName be handled as for usual embedded object?
 
     return xPropSet;
 }
@@ -632,10 +632,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
     uno::Reference < XPropertySet > xPropSet;
     uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
     assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
-    OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
+    OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
-    SwDoc *pDoc = pTxtCrsr->GetDoc();
+    OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
+    SwDoc *pDoc = pTextCrsr->GetDoc();
 
     SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
                          RES_FRMATR_END );
@@ -655,17 +655,17 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
                             Size( nWidth, nHeight ),
                             MAP_100TH_MM );
 
-    SwFrmFmt *pFrmFmt = pDoc->getIDocumentContentOperations().Insert( *pTxtCrsr->GetPaM(),
+    SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(),
                                        ::svt::EmbeddedObjectRef( aAppletImpl.GetApplet(), embed::Aspects::MSOLE_CONTENT ),
                                        &aAppletImpl.GetItemSet(),
                                        NULL,
                                        NULL);
     xPropSet.set(SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
-                *pDoc, pFrmFmt), uno::UNO_QUERY);
+                *pDoc, pFrameFormat), uno::UNO_QUERY);
     if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
     {
         // req for z-order
-        SwXFrame::GetOrCreateSdrObject(*static_cast<SwFlyFrmFmt*>(pFrmFmt));
+        SwXFrame::GetOrCreateSdrObject(*static_cast<SwFlyFrameFormat*>(pFrameFormat));
     }
 
     return xPropSet;
@@ -679,10 +679,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
     uno::Reference < XPropertySet > xPropSet;
     uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
     assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
-    OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
+    OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
             sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
-    SwDoc *pDoc = pTxtCrsr->GetDoc();
+    OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
+    SwDoc *pDoc = pTextCrsr->GetDoc();
 
     SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
                          RES_FRMATR_END );
@@ -730,17 +730,17 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
                         makeAny( OUString( rMimeType ) ) );
             }
 
-            SwFrmFmt *pFrmFmt = pDoc->getIDocumentContentOperations().Insert( *pTxtCrsr->GetPaM(),
+            SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(),
                                             ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
                                             &aItemSet,
                                             NULL,
                                             NULL);
             xPropSet.set(SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
-                            *pDoc, pFrmFmt), uno::UNO_QUERY);
+                            *pDoc, pFrameFormat), uno::UNO_QUERY);
             if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
             {
                 SwXFrame::GetOrCreateSdrObject(*
-                        static_cast<SwFlyFrmFmt*>(pFrmFmt)); // req for z-order
+                        static_cast<SwFlyFrameFormat*>(pFrameFormat)); // req for z-order
             }
         }
     }
@@ -762,10 +762,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
     uno::Reference < XPropertySet > xPropSet;
     uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
     assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
-    OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
+    OTextCursorHelper *pTextCrsr = reinterpret_cast< OTextCursorHelper * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
-    SwDoc *pDoc = pTxtCrsr->GetDoc();
+    OSL_ENSURE( pTextCrsr, "SwXTextCursor missing" );
+    SwDoc *pDoc = pTextCrsr->GetDoc();
 
     SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
                          RES_FRMATR_END );
@@ -883,18 +883,18 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
                     makeAny( sal_Int32( aMargin.Height() ) ) );
             }
 
-            SwFrmFmt *pFrmFmt = pDoc->getIDocumentContentOperations().Insert( *pTxtCrsr->GetPaM(),
+            SwFrameFormat *pFrameFormat = pDoc->getIDocumentContentOperations().Insert( *pTextCrsr->GetPaM(),
                                             ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
                                             &aItemSet,
                                             NULL,
                                             NULL);
             xPropSet.set(SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
-                            *pDoc, pFrmFmt), uno::UNO_QUERY);
+                            *pDoc, pFrameFormat), uno::UNO_QUERY);
             if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
             {
                 // req for z-order
                 SwXFrame::GetOrCreateSdrObject(*
-                        static_cast<SwFlyFrmFmt*>(pFrmFmt));
+                        static_cast<SwFlyFrameFormat*>(pFrameFormat));
             }
         }
     }
@@ -917,10 +917,10 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
     SwXFrame *pFrame = reinterpret_cast< SwXFrame * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( SwXFrame::getUnoTunnelId() )));
     OSL_ENSURE( pFrame, "SwXFrame missing" );
-    SwFrmFmt *pFrmFmt = pFrame->GetFrmFmt();
-    const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-    const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
-    SwOLENode *pOLENd = pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTxtNode()->GetOLENode();
+    SwFrameFormat *pFrameFormat = pFrame->GetFrameFormat();
+    const SwFormatContent& rContent = pFrameFormat->GetContent();
+    const SwNodeIndex *pNdIdx = rContent.GetContentIdx();
+    SwOLENode *pOLENd = pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTextNode()->GetOLENode();
     SwOLEObj& rOLEObj = pOLENd->GetOLEObj();
 
     uno::Reference < embed::XEmbeddedObject > xEmbObj( rOLEObj.GetOleRef() );
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 83868b11b984..23e4051eab23 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -52,14 +52,14 @@ public:
             createAndInsertOLEObject( SvXMLImport& rImport,
                                       const OUString& rHRef,
                                       const OUString& rStyleName,
-                                      const OUString& rTblName,
+                                      const OUString& rTableName,
                                          sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet>
             createAndInsertOOoLink( SvXMLImport& rImport,
                                       const OUString& rHRef,
                                       const OUString& rStyleName,
-                                      const OUString& rTblName,
+                                      const OUString& rTableName,
                                          sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet>
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index a4ae9e945a4f..66becc79d534 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -155,17 +155,17 @@ SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS )
         ::InsertStringSorted(rPageDesc.GetName(), *m_pPageCollBox, 1 );
     }
 
-    OUString aFmtName;
+    OUString aFormatName;
     for(sal_uInt16 i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i)
     {
-        aFmtName = SwStyleNameMapper::GetUIName( i, aFmtName );
-        if(LISTBOX_ENTRY_NOTFOUND == m_pPageCollBox->GetEntryPos(aFmtName))
-            ::InsertStringSorted(aFmtName, *m_pPageCollBox, 1 );
+        aFormatName = SwStyleNameMapper::GetUIName( i, aFormatName );
+        if(LISTBOX_ENTRY_NOTFOUND == m_pPageCollBox->GetEntryPos(aFormatName))
+            ::InsertStringSorted(aFormatName, *m_pPageCollBox, 1 );
     }
     //add landscape page
-    aFmtName = SwStyleNameMapper::GetUIName( RES_POOLPAGE_LANDSCAPE, aFmtName );
-    if(LISTBOX_ENTRY_NOTFOUND == m_pPageCollBox->GetEntryPos(aFmtName))
-            ::InsertStringSorted(aFmtName, *m_pPageCollBox, 1 );
+    aFormatName = SwStyleNameMapper::GetUIName( RES_POOLPAGE_LANDSCAPE, aFormatName );
+    if(LISTBOX_ENTRY_NOTFOUND == m_pPageCollBox->GetEntryPos(aFormatName))
+            ::InsertStringSorted(aFormatName, *m_pPageCollBox, 1 );
     CheckEnable();
     m_pPageNumEdit->SetText(OUString());
 }
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index da7c147b8e9c..b20dfdc2bc3f 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -209,14 +209,14 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet)
     const SfxPoolItem* pItem;
     if ( SfxItemState::SET == rSet->GetItemState( RES_TXTATR_INETFMT, false, &pItem ) )
     {
-        const SwFmtINetFmt* pINetFmt = static_cast<const SwFmtINetFmt*>( pItem);
-        m_pURLED->SetText(INetURLObject::decode(pINetFmt->GetValue(),
+        const SwFormatINetFormat* pINetFormat = static_cast<const SwFormatINetFormat*>( pItem);
+        m_pURLED->SetText(INetURLObject::decode(pINetFormat->GetValue(),
             INetURLObject::DECODE_UNAMBIGUOUS,
             RTL_TEXTENCODING_UTF8));
         m_pURLED->SaveValue();
-        m_pURLED->SetText(pINetFmt->GetName());
+        m_pURLED->SetText(pINetFormat->GetName());
 
-        OUString sEntry = pINetFmt->GetVisitedFmt();
+        OUString sEntry = pINetFormat->GetVisitedFormat();
         if (sEntry.isEmpty())
         {
             OSL_ENSURE( false, "<SwCharURLPage::Reset(..)> - missing visited character format at hyperlink attribute" );
@@ -224,7 +224,7 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet)
         }
         m_pVisitedLB->SelectEntry( sEntry );
 
-        sEntry = pINetFmt->GetINetFmt();
+        sEntry = pINetFormat->GetINetFormat();
         if (sEntry.isEmpty())
         {
             OSL_ENSURE( false, "<SwCharURLPage::Reset(..)> - missing unvisited character format at hyperlink attribute" );
@@ -232,14 +232,14 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet)
         }
         m_pNotVisitedLB->SelectEntry(sEntry);
 
-        m_pTargetFrmLB->SetText(pINetFmt->GetTargetFrame());
+        m_pTargetFrmLB->SetText(pINetFormat->GetTargetFrame());
         m_pVisitedLB->   SaveValue();
         m_pNotVisitedLB->SaveValue();
         m_pTargetFrmLB-> SaveValue();
         pINetItem = new SvxMacroItem(FN_INET_FIELD_MACRO);
 
-        if( pINetFmt->GetMacroTbl() )
-            pINetItem->SetMacroTable( *pINetFmt->GetMacroTbl() );
+        if( pINetFormat->GetMacroTable() )
+            pINetItem->SetMacroTable( *pINetFormat->GetMacroTable() );
     }
     if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_SELECTION, false, &pItem))
     {
@@ -260,8 +260,8 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
             sURL = URIHelper::simpleNormalizedMakeRelative(OUString(), sURL);
     }
 
-    SwFmtINetFmt aINetFmt(sURL, m_pTargetFrmLB->GetText());
-    aINetFmt.SetName(m_pNameED->GetText());
+    SwFormatINetFormat aINetFormat(sURL, m_pTargetFrmLB->GetText());
+    aINetFormat.SetName(m_pNameED->GetText());
     bool bURLModified = m_pURLED->IsValueChangedFromSaved();
     bool bNameModified = m_pNameED->IsModified();
     bool bTargetModified = m_pTargetFrmLB->IsValueChangedFromSaved();
@@ -270,14 +270,14 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
     // set valid settings first
     OUString sEntry = m_pVisitedLB->GetSelectEntry();
     sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( sEntry, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
-    aINetFmt.SetVisitedFmtAndId( sEntry, nId );
+    aINetFormat.SetVisitedFormatAndId( sEntry, nId );
 
     sEntry = m_pNotVisitedLB->GetSelectEntry();
     nId = SwStyleNameMapper::GetPoolIdFromUIName( sEntry, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
-    aINetFmt.SetINetFmtAndId( sEntry, nId );
+    aINetFormat.SetINetFormatAndId( sEntry, nId );
 
     if( pINetItem && !pINetItem->GetMacroTable().empty() )
-        aINetFmt.SetMacroTbl( &pINetItem->GetMacroTable() );
+        aINetFormat.SetMacroTable( &pINetItem->GetMacroTable() );
 
     if(m_pVisitedLB->IsValueChangedFromSaved())
         bModified = true;
@@ -291,7 +291,7 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
         rSet->Put(SfxStringItem(FN_PARAM_SELECTION, m_pTextED->GetText()));
     }
     if(bModified)
-        rSet->Put(aINetFmt);
+        rSet->Put(aINetFormat);
     return bModified;
 }
 
@@ -314,7 +314,7 @@ IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl)
 
 IMPL_LINK_NOARG(SwCharURLPage, EventHdl)
 {
-    bModified |= SwMacroAssignDlg::INetFmtDlg( this,
+    bModified |= SwMacroAssignDlg::INetFormatDlg( this,
                     ::GetActiveView()->GetWrtShell(), pINetItem );
     return 0;
 }
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 6d0ac7216e7d..a18073102e68 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -254,12 +254,12 @@ void SwDropCapsPict::GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _
 {
     SfxItemSet aSet( _rPage.rSh.GetAttrPool(), _nWhich, _nWhich);
     _rPage.rSh.GetCurAttr(aSet);
-    SvxFontItem aFmtFont(static_cast<const SvxFontItem &>( aSet.Get(_nWhich)));
+    SvxFontItem aFormatFont(static_cast<const SvxFontItem &>( aSet.Get(_nWhich)));
 
-    _rFont.SetFamily (aFmtFont.GetFamily());
-    _rFont.SetName   (aFmtFont.GetFamilyName());
-    _rFont.SetPitch  (aFmtFont.GetPitch());
-    _rFont.SetCharSet(aFmtFont.GetCharSet());
+    _rFont.SetFamily (aFormatFont.GetFamily());
+    _rFont.SetName   (aFormatFont.GetFamilyName());
+    _rFont.SetPitch  (aFormatFont.GetPitch());
+    _rFont.SetCharSet(aFormatFont.GetCharSet());
 }
 
 void SwDropCapsPict::UpdatePaintSettings()
@@ -298,16 +298,16 @@ void SwDropCapsPict::UpdatePaintSettings()
         else
         {
             // query Font at character template
-            SwCharFmt *pFmt = mpPage->rSh.GetCharStyle(
+            SwCharFormat *pFormat = mpPage->rSh.GetCharStyle(
                                     mpPage->m_pTemplateBox->GetSelectEntry(),
                                     SwWrtShell::GETSTYLE_CREATEANY );
-            OSL_ENSURE(pFmt, "character style doesn't exist!");
-            const SvxFontItem &rFmtFont = pFmt->GetFont();
+            OSL_ENSURE(pFormat, "character style doesn't exist!");
+            const SvxFontItem &rFormatFont = pFormat->GetFont();
 
-            aFont.SetFamily (rFmtFont.GetFamily());
-            aFont.SetName   (rFmtFont.GetFamilyName());
-            aFont.SetPitch  (rFmtFont.GetPitch());
-            aFont.SetCharSet(rFmtFont.GetCharSet());
+            aFont.SetFamily (rFormatFont.GetFamily());
+            aFont.SetName   (rFormatFont.GetFamilyName());
+            aFont.SetPitch  (rFormatFont.GetPitch());
+            aFont.SetCharSet(rFormatFont.GetCharSet());
         }
     }
 
@@ -462,7 +462,7 @@ Size SwDropCapsPict::CalcTextSize()
     sal_Int32 nStart;
     sal_Int32 nEnd;
     GetFirstScriptSegment(nStart, nEnd, nScript);
-    long nTxtWidth = 0;
+    long nTextWidth = 0;
     long nCJKHeight = 0;
     long nCTLHeight = 0;
     long nHeight = 0;
@@ -477,11 +477,11 @@ Size SwDropCapsPict::CalcTextSize()
                                     ? maCTLFont
                                     : maFont);
 
-        sal_uLong nWidth = rFnt.GetTxtSize(mpPrinter, maText, nStart, nEnd-nStart ).Width();
+        sal_uLong nWidth = rFnt.GetTextSize(mpPrinter, maText, nStart, nEnd-nStart ).Width();
 
         if (nIdx < maScriptChanges.size())
             maScriptChanges[nIdx].textWidth = nWidth;
-        nTxtWidth += nWidth;
+        nTextWidth += nWidth;
         switch(nScript)
         {
             case css::i18n::ScriptType::ASIAN:
@@ -512,8 +512,8 @@ Size SwDropCapsPict::CalcTextSize()
         nAscent = nCTLAscent;
     nHeight += nAscent;
 
-    Size aTxtSize(nTxtWidth, nHeight);
-    return aTxtSize;
+    Size aTextSize(nTextWidth, nHeight);
+    return aTextSize;
 }
 
 void SwDropCapsPict::_InitPrinter()
@@ -634,13 +634,13 @@ bool  SwDropCapsPage::FillItemSet(SfxItemSet *rSet)
 void  SwDropCapsPage::Reset(const SfxItemSet *rSet)
 {
     // Characters, lines, gap and text
-    SwFmtDrop aFmtDrop(static_cast<const SwFmtDrop &>( rSet->Get(RES_PARATR_DROP)));
-    if (aFmtDrop.GetLines() > 1)
+    SwFormatDrop aFormatDrop(static_cast<const SwFormatDrop &>( rSet->Get(RES_PARATR_DROP)));
+    if (aFormatDrop.GetLines() > 1)
     {
-        m_pDropCapsField->SetValue(aFmtDrop.GetChars());
-        m_pLinesField->SetValue(aFmtDrop.GetLines());
-        m_pDistanceField->SetValue(m_pDistanceField->Normalize(aFmtDrop.GetDistance()), FUNIT_TWIP);
-        m_pWholeWordCB->Check(aFmtDrop.GetWholeWord());
+        m_pDropCapsField->SetValue(aFormatDrop.GetChars());
+        m_pLinesField->SetValue(aFormatDrop.GetLines());
+        m_pDistanceField->SetValue(m_pDistanceField->Normalize(aFormatDrop.GetDistance()), FUNIT_TWIP);
+        m_pWholeWordCB->Check(aFormatDrop.GetWholeWord());
     }
     else
     {
@@ -655,17 +655,17 @@ void  SwDropCapsPage::Reset(const SfxItemSet *rSet)
 
     // Reset format
     m_pTemplateBox->SelectEntryPos(0);
-    if (aFmtDrop.GetCharFmt())
-        m_pTemplateBox->SelectEntry(aFmtDrop.GetCharFmt()->GetName());
+    if (aFormatDrop.GetCharFormat())
+        m_pTemplateBox->SelectEntry(aFormatDrop.GetCharFormat()->GetName());
 
     // Enable controls
-    m_pDropCapsBox->Check(aFmtDrop.GetLines() > 1);
+    m_pDropCapsBox->Check(aFormatDrop.GetLines() > 1);
     const sal_Int32 nVal = static_cast<sal_Int32>(m_pDropCapsField->GetValue());
     if (bFormat)
         m_pTextEdit->SetText(GetDefaultString(nVal));
     else
     {
-        m_pTextEdit->SetText(rSh.GetDropTxt(nVal));
+        m_pTextEdit->SetText(rSh.GetDropText(nVal));
         m_pTextEdit->Enable();
         m_pTextText->Enable();
     }
@@ -733,12 +733,12 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
             : 0;
         bool bSetText = false;
 
-        if (bFormat || rSh.GetDropTxt(1).isEmpty())
+        if (bFormat || rSh.GetDropText(1).isEmpty())
             sPreview = GetDefaultString(nVal);
         else
         {
             bSetText = true;
-            sPreview = rSh.GetDropTxt(nVal);
+            sPreview = rSh.GetDropText(nVal);
         }
 
         OUString sEdit(m_pTextEdit->GetText());
@@ -783,32 +783,32 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet )
 {
     if(bModified)
     {
-        SwFmtDrop aFmt;
+        SwFormatDrop aFormat;
 
         bool bOn = m_pDropCapsBox->IsChecked();
         if(bOn)
         {
             // quantity, lines, gap
-            aFmt.GetChars()     = (sal_uInt8) m_pDropCapsField->GetValue();
-            aFmt.GetLines()     = (sal_uInt8) m_pLinesField->GetValue();
-            aFmt.GetDistance()  = (sal_uInt16) m_pDistanceField->Denormalize(m_pDistanceField->GetValue(FUNIT_TWIP));
-            aFmt.GetWholeWord() = m_pWholeWordCB->IsChecked();
+            aFormat.GetChars()     = (sal_uInt8) m_pDropCapsField->GetValue();
+            aFormat.GetLines()     = (sal_uInt8) m_pLinesField->GetValue();
+            aFormat.GetDistance()  = (sal_uInt16) m_pDistanceField->Denormalize(m_pDistanceField->GetValue(FUNIT_TWIP));
+            aFormat.GetWholeWord() = m_pWholeWordCB->IsChecked();
 
             // template
             if (m_pTemplateBox->GetSelectEntryPos())
-                aFmt.SetCharFmt(rSh.GetCharStyle(m_pTemplateBox->GetSelectEntry()));
+                aFormat.SetCharFormat(rSh.GetCharStyle(m_pTemplateBox->GetSelectEntry()));
         }
         else
         {
-            aFmt.GetChars()    = 1;
-            aFmt.GetLines()    = 1;
-            aFmt.GetDistance() = 0;
+            aFormat.GetChars()    = 1;
+            aFormat.GetLines()    = 1;
+            aFormat.GetDistance() = 0;
         }
 
         // set attributes
         const SfxPoolItem* pOldItem;
-        if (0 == (pOldItem = GetOldItem(rSet, FN_FORMAT_DROPCAPS)) || aFmt != *pOldItem)
-            rSet.Put(aFmt);
+        if (0 == (pOldItem = GetOldItem(rSet, FN_FORMAT_DROPCAPS)) || aFormat != *pOldItem)
+            rSet.Put(aFormat);
 
         // hard text formatting
         // Bug 24974: in designer/template catalog this doesn't make sense!!
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 659ad559640e..26b8a210b31f 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -177,11 +177,11 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet )
        m_pRestartParaCountCB->IsValueChangedFromSaved() ||
        m_pRestartNF->IsValueChangedFromSaved() )
     {
-        SwFmtLineNumber aFmt;
-        aFmt.SetStartValue( static_cast< sal_uLong >(m_pRestartParaCountCB->GetState() == TRISTATE_TRUE ?
+        SwFormatLineNumber aFormat;
+        aFormat.SetStartValue( static_cast< sal_uLong >(m_pRestartParaCountCB->GetState() == TRISTATE_TRUE ?
                                 m_pRestartNF->GetValue() : 0 ));
-        aFmt.SetCountLines( m_pCountParaCB->IsChecked() );
-        rSet->Put(aFmt);
+        aFormat.SetCountLines( m_pCountParaCB->IsChecked() );
+        rSet->Put(aFormat);
         bModified = true;
     }
     return bModified;
@@ -264,7 +264,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
     StyleHdl_Impl(m_pNumberStyleLB);
     if( SfxItemState::DEFAULT <= rSet->GetItemState(RES_LINENUMBER))
     {
-        const SwFmtLineNumber& rNum = static_cast<const SwFmtLineNumber&>(rSet->Get(RES_LINENUMBER));
+        const SwFormatLineNumber& rNum = static_cast<const SwFormatLineNumber&>(rSet->Get(RES_LINENUMBER));
         sal_uLong nStartValue = rNum.GetStartValue();
         bool bCount = rNum.IsCount();
         m_pCountParaCB->SetState( bCount ? TRISTATE_TRUE : TRISTATE_FALSE );
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 1601db38d557..c9bd552b6c2f 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -238,7 +238,7 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
     }
     else if( m_nParaNumPara == nId)
     {
-        SwTxtFmtColl* pTmpColl = rSh.GetCurTxtFmtColl();
+        SwTextFormatColl* pTmpColl = rSh.GetCurTextFormatColl();
         if( pTmpColl && pTmpColl->IsAssignedToListLevelOfOutlineStyle() )
         {
             static_cast<SwParagraphNumTabPage&>(rPage).DisableOutline() ;
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 4b8f894a86b1..7b813250e690 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -56,7 +56,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet)
     ,
     m_rSh(::GetActiveView()->GetWrtShell()),
     m_pCmds( SwCondCollItem::GetCmds() ),
-    m_pFmt(0),
+    m_pFormat(0),
 
     m_bNewTemplate(false)
 {
@@ -176,7 +176,7 @@ void SwCondCollPage::Reset(const SfxItemSet *)
 {
     if(m_bNewTemplate)
         m_pConditionCB->Enable();
-    if(RES_CONDTXTFMTCOLL == m_pFmt->Which())
+    if(RES_CONDTXTFMTCOLL == m_pFormat->Which())
         m_pConditionCB->Check();
     OnOffHdl(m_pConditionCB);
 
@@ -188,7 +188,7 @@ void SwCondCollPage::Reset(const SfxItemSet *)
     const SfxStyleSheetBase* pBase = pPool->First();
     while( pBase )
     {
-        if(!m_pFmt || pBase->GetName() != m_pFmt->GetName())
+        if(!m_pFormat || pBase->GetName() != m_pFormat->GetName())
             m_pStyleLB->InsertEntry(pBase->GetName());
         pBase = pPool->Next();
     }
@@ -199,12 +199,12 @@ void SwCondCollPage::Reset(const SfxItemSet *)
         OUString aEntry( m_aStrArr[n] + "\t" );
 
         const SwCollCondition* pCond = 0;
-        if( m_pFmt && RES_CONDTXTFMTCOLL == m_pFmt->Which() &&
-            0 != ( pCond = static_cast<SwConditionTxtFmtColl*>(m_pFmt)->
+        if( m_pFormat && RES_CONDTXTFMTCOLL == m_pFormat->Which() &&
+            0 != ( pCond = static_cast<SwConditionTextFormatColl*>(m_pFormat)->
             HasCondition( SwCollCondition( 0, m_pCmds[n].nCnd, m_pCmds[n].nSubCond ) ) )
-            && pCond->GetTxtFmtColl() )
+            && pCond->GetTextFormatColl() )
         {
-            aEntry += pCond->GetTxtFmtColl()->GetName();
+            aEntry += pCond->GetTextFormatColl()->GetName();
         }
 
         SvTreeListEntry* pE = m_pTbLinks->InsertEntryToColumn( aEntry, n );
@@ -271,7 +271,7 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
 
         while( pBase )
         {
-            if(!m_pFmt || pBase->GetName() != m_pFmt->GetName())
+            if(!m_pFormat || pBase->GetName() != m_pFormat->GetName())
                 m_pStyleLB->InsertEntry(pBase->GetName());
             pBase = pPool->Next();
         }
@@ -295,9 +295,9 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
     return 0;
 }
 
-void SwCondCollPage::SetCollection(SwFmt* pFormat, bool bNew)
+void SwCondCollPage::SetCollection(SwFormat* pFormat, bool bNew)
 {
-    m_pFmt = pFormat;
+    m_pFormat = pFormat;
     m_bNewTemplate = bNew;
 }
 
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index e3244f3320a0..108b6b3eb19c 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -29,7 +29,7 @@
 #include <svl/itemset.hxx>
 #include <sfx2/tabdlg.hxx>
 
-SwNumFmtDlg::SwNumFmtDlg(vcl::Window* pParent, const SfxItemSet& rSet)
+SwNumFormatDlg::SwNumFormatDlg(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxSingleTabDialog(pParent, rSet, "FormatNumberDialog",
         "cui/ui/formatnumberdialog.ui")
 {
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 3a046a402f25..336395c7631f 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -171,16 +171,16 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet )
     else if (m_pRequestRB->IsChecked())
         nNewLinkMode = MANUAL;
 
-    SwFldUpdateFlags eFldFlags = m_pAutoUpdateFields->IsChecked() ?
+    SwFieldUpdateFlags eFieldFlags = m_pAutoUpdateFields->IsChecked() ?
         m_pAutoUpdateCharts->IsChecked() ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : AUTOUPD_OFF;
 
     if(m_pAutoUpdateFields->IsValueChangedFromSaved() ||
        m_pAutoUpdateCharts->IsValueChangedFromSaved())
     {
-        pMod->ApplyFldUpdateFlags(eFldFlags);
+        pMod->ApplyFieldUpdateFlags(eFieldFlags);
         if(m_pWrtShell)
         {
-            m_pWrtShell->SetFldUpdateFlags(eFldFlags);
+            m_pWrtShell->SetFieldUpdateFlags(eFieldFlags);
             m_pWrtShell->SetModified();
         }
     }
@@ -277,20 +277,20 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet)
     if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_WRTSHELL, false, &pItem))
         m_pWrtShell = static_cast<SwWrtShell*>(static_cast<const SwPtrItem*>(pItem)->GetValue());
 
-    SwFldUpdateFlags eFldFlags = AUTOUPD_GLOBALSETTING;
+    SwFieldUpdateFlags eFieldFlags = AUTOUPD_GLOBALSETTING;
     m_nOldLinkMode = GLOBALSETTING;
     if (m_pWrtShell)
     {
-        eFldFlags = m_pWrtShell->GetFldUpdateFlags(true);
+        eFieldFlags = m_pWrtShell->GetFieldUpdateFlags(true);
         m_nOldLinkMode = m_pWrtShell->GetLinkUpdMode(true);
     }
     if(GLOBALSETTING == m_nOldLinkMode)
         m_nOldLinkMode = pUsrPref->GetUpdateLinkMode();
-    if(AUTOUPD_GLOBALSETTING == eFldFlags)
-        eFldFlags = pUsrPref->GetFldUpdateFlags();
+    if(AUTOUPD_GLOBALSETTING == eFieldFlags)
+        eFieldFlags = pUsrPref->GetFieldUpdateFlags();
 
-    m_pAutoUpdateFields->Check(eFldFlags != AUTOUPD_OFF);
-    m_pAutoUpdateCharts->Check(eFldFlags == AUTOUPD_FIELD_AND_CHARTS);
+    m_pAutoUpdateFields->Check(eFieldFlags != AUTOUPD_OFF);
+    m_pAutoUpdateCharts->Check(eFieldFlags == AUTOUPD_FIELD_AND_CHARTS);
 
     switch (m_nOldLinkMode)
     {
@@ -453,7 +453,7 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
     , m_sAbove(SW_RESSTR(STR_CAPTION_ABOVE))
     , m_sBelow(SW_RESSTR(STR_CAPTION_BELOW))
     , m_sNone(SW_RESSTR(SW_STR_NONE))
-    , pMgr(new SwFldMgr())
+    , pMgr(new SwFieldMgr())
     , bHTMLMode(false)
 {
     get(m_pCheckLB, "objects");
@@ -483,15 +483,15 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
     SwWrtShell* pSh = ::GetActiveWrtShell();
 
     // m_pFormatBox
-    sal_uInt16 nSelFmt = SVX_NUM_ARABIC;
+    sal_uInt16 nSelFormat = SVX_NUM_ARABIC;
     if (pSh)
     {
-        for ( sal_uInt16 i = pMgr->GetFldTypeCount(); i; )
+        for ( sal_uInt16 i = pMgr->GetFieldTypeCount(); i; )
         {
-            SwFieldType* pFldType = pMgr->GetFldType(USHRT_MAX, --i);
-            if (pFldType->GetName().equals(m_pCategoryBox->GetText()))
+            SwFieldType* pFieldType = pMgr->GetFieldType(USHRT_MAX, --i);
+            if (pFieldType->GetName().equals(m_pCategoryBox->GetText()))
             {
-                nSelFmt = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFldType)->GetSeqFormat();
+                nSelFormat = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFieldType)->GetSeqFormat();
                 break;
             }
         }
@@ -503,9 +503,9 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
     for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         m_pFormatBox->InsertEntry( pMgr->GetFormatStr(TYP_SEQFLD, i) );
-        const sal_uInt16 nFmtId = pMgr->GetFormatId(TYP_SEQFLD, i);
-        m_pFormatBox->SetEntryData( i, reinterpret_cast<void*>(nFmtId) );
-        if( nFmtId == nSelFmt )
+        const sal_uInt16 nFormatId = pMgr->GetFormatId(TYP_SEQFLD, i);
+        m_pFormatBox->SetEntryData( i, reinterpret_cast<void*>(nFormatId) );
+        if( nFormatId == nSelFormat )
             m_pFormatBox->SelectEntryPos( i );
     }
 
@@ -517,12 +517,12 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
     if (pSh)
     {
-        SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(pMgr->GetFldType(
+        SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(pMgr->GetFieldType(
                                             RES_SETEXPFLD, m_pCategoryBox->GetText() ));
-        if( pFldType )
+        if( pFieldType )
         {
-            sDelim = pFldType->GetDelimiter();
-            nLvl = pFldType->GetOutlineLvl();
+            sDelim = pFieldType->GetDelimiter();
+            nLvl = pFieldType->GetOutlineLvl();
         }
     }
 
@@ -706,11 +706,11 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl)
         m_pCategoryBox->InsertEntry(m_sNone);
         if (pSh)
         {
-            const sal_uInt16 nCount = pMgr->GetFldTypeCount();
+            const sal_uInt16 nCount = pMgr->GetFieldTypeCount();
 
             for (sal_uInt16 i = 0; i < nCount; i++)
             {
-                SwFieldType *pType = pMgr->GetFldType( USHRT_MAX, i );
+                SwFieldType *pType = pMgr->GetFieldType( USHRT_MAX, i );
                 if( pType->Which() == RES_SETEXPFLD &&
                     static_cast<SwSetExpFieldType *>( pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
                     m_pCategoryBox->InsertSwEntry(SwBoxEntry(pType->GetName()));
@@ -832,13 +832,13 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry)
 
 IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl)
 {
-    const OUString sFldTypeName = m_pCategoryBox->GetText();
+    const OUString sFieldTypeName = m_pCategoryBox->GetText();
 
     SfxSingleTabDialog *pDlg = dynamic_cast<SfxSingleTabDialog*>(GetParentDialog());
     PushButton *pBtn = pDlg ? pDlg->GetOKButton() : NULL;
     if (pBtn)
-        pBtn->Enable(!sFldTypeName.isEmpty());
-    bool bEnable = m_pCategoryBox->IsEnabled() && sFldTypeName != m_sNone;
+        pBtn->Enable(!sFieldTypeName.isEmpty());
+    bool bEnable = m_pCategoryBox->IsEnabled() && sFieldTypeName != m_sNone;
 
     m_pFormatText->Enable(bEnable);
     m_pFormatBox->Enable(bEnable);
@@ -881,9 +881,9 @@ void SwCaptionOptPage::InvalidatePreview()
         //#i61007# order of captions
         bool bOrderNumberingFirst = m_pLbCaptionOrder->GetSelectEntryPos() == 1;
         // number
-        const sal_uInt16 nNumFmt = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetEntryData(
+        const sal_uInt16 nNumFormat = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetEntryData(
                                         m_pFormatBox->GetSelectEntryPos() ));
-        if( SVX_NUM_NUMBER_NONE != nNumFmt )
+        if( SVX_NUM_NUMBER_NONE != nNumFormat )
         {
             //#i61007# order of captions
             if( !bOrderNumberingFirst )
@@ -895,11 +895,11 @@ void SwCaptionOptPage::InvalidatePreview()
             SwWrtShell *pSh = ::GetActiveWrtShell();
             if (pSh)
             {
-                SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(pMgr->GetFldType(
+                SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(pMgr->GetFieldType(
                                                 RES_SETEXPFLD, m_pCategoryBox->GetText() ));
-                if( pFldType && pFldType->GetOutlineLvl() < MAXLEVEL )
+                if( pFieldType && pFieldType->GetOutlineLvl() < MAXLEVEL )
                 {
-                    sal_uInt8 nLvl = pFldType->GetOutlineLvl();
+                    sal_uInt8 nLvl = pFieldType->GetOutlineLvl();
                     SwNumberTree::tNumberVector aNumVector;
                     for( sal_uInt8 i = 0; i <= nLvl; ++i )
                         aNumVector.push_back(1);
@@ -907,11 +907,11 @@ void SwCaptionOptPage::InvalidatePreview()
                     const OUString sNumber( pSh->GetOutlineNumRule()->MakeNumString(
                                                             aNumVector, false ));
                     if( !sNumber.isEmpty() )
-                        aStr += sNumber + pFldType->GetDelimiter();
+                        aStr += sNumber + pFieldType->GetDelimiter();
                 }
             }
 
-            switch( nNumFmt )
+            switch( nNumFormat )
             {
                 case SVX_NUM_CHARS_UPPER_LETTER:    aStr += "A"; break;
                 case SVX_NUM_CHARS_UPPER_LETTER_N:  aStr += "A"; break;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 271a91be0fda..86da07785385 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -101,9 +101,9 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent,
     get (m_pSmoothCBox, "smoothscroll");
 
     get (m_pGrfCB, "graphics");
-    get (m_pTblCB, "tables");
+    get (m_pTableCB, "tables");
     get (m_pDrwCB, "drawings");
-    get (m_pFldNameCB, "fieldcodes");
+    get (m_pFieldNameCB, "fieldcodes");
     get (m_pPostItCB, "comments");
 
     get (m_pSettingsFrame, "settingsframe");
@@ -184,9 +184,9 @@ void SwContentOptPage::dispose()
     m_pVMetric.clear();
     m_pSmoothCBox.clear();
     m_pGrfCB.clear();
-    m_pTblCB.clear();
+    m_pTableCB.clear();
     m_pDrwCB.clear();
-    m_pFldNameCB.clear();
+    m_pFieldNameCB.clear();
     m_pPostItCB.clear();
     m_pSettingsFrame.clear();
     m_pSettingsLabel.clear();
@@ -228,10 +228,10 @@ void SwContentOptPage::Reset(const SfxItemSet* rSet)
                                     reinterpret_cast<const SfxPoolItem**>(&pElemAttr) );
     if(pElemAttr)
     {
-        m_pTblCB->Check (pElemAttr->bTable);
+        m_pTableCB->Check (pElemAttr->bTable);
         m_pGrfCB->Check (pElemAttr->bGraphic);
         m_pDrwCB->Check (pElemAttr->bDrawing);
-        m_pFldNameCB->Check (pElemAttr->bFieldName);
+        m_pFieldNameCB->Check (pElemAttr->bFieldName);
         m_pPostItCB->Check (pElemAttr->bNotes);
         m_pCrossCB->Check (pElemAttr->bCrosshair);
         m_pHScrollBox->Check (pElemAttr->bHorzScrollbar);
@@ -257,10 +257,10 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet)
     SwElemItem aElem;
     if(pOldAttr)
         aElem = *pOldAttr;
-    aElem.bTable                = m_pTblCB->IsChecked();
+    aElem.bTable                = m_pTableCB->IsChecked();
     aElem.bGraphic              = m_pGrfCB->IsChecked();
     aElem.bDrawing              = m_pDrwCB->IsChecked();
-    aElem.bFieldName            = m_pFldNameCB->IsChecked();
+    aElem.bFieldName            = m_pFieldNameCB->IsChecked();
     aElem.bNotes                = m_pPostItCB->IsChecked();
     aElem.bCrosshair            = m_pCrossCB->IsChecked();
     aElem.bHorzScrollbar        = m_pHScrollBox->IsChecked();
@@ -331,7 +331,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent,
     , bPreview(false)
 {
     get(m_pGrfCB, "graphics");
-    get(m_pCtrlFldCB, "formcontrols");
+    get(m_pCtrlFieldCB, "formcontrols");
     get(m_pBackgroundCB, "background");
     get(m_pBlackFontCB, "inblack");
     get(m_pPrintHiddenTextCB, "hiddentext");
@@ -357,7 +357,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent,
     m_pGrfCB->SetClickHdl( aLk );
     m_pRightPageCB->SetClickHdl( aLk );
     m_pLeftPageCB->SetClickHdl( aLk );
-    m_pCtrlFldCB->SetClickHdl( aLk );
+    m_pCtrlFieldCB->SetClickHdl( aLk );
     m_pBackgroundCB->SetClickHdl( aLk );
     m_pBlackFontCB->SetClickHdl( aLk );
     m_pPrintHiddenTextCB->SetClickHdl( aLk );
@@ -398,7 +398,7 @@ SwAddPrinterTabPage::~SwAddPrinterTabPage()
 void SwAddPrinterTabPage::dispose()
 {
     m_pGrfCB.clear();
-    m_pCtrlFldCB.clear();
+    m_pCtrlFieldCB.clear();
     m_pBackgroundCB.clear();
     m_pBlackFontCB.clear();
     m_pPrintHiddenTextCB.clear();
@@ -442,7 +442,7 @@ bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
         aAddPrinterAttr.bPrintGraphic   = m_pGrfCB->IsChecked();
         aAddPrinterAttr.bPrintTable     = true; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
         aAddPrinterAttr.bPrintDraw      = m_pGrfCB->IsChecked(); // UI merged with m_pGrfCB in CWS printerpullgpages
-        aAddPrinterAttr.bPrintControl   = m_pCtrlFldCB->IsChecked();
+        aAddPrinterAttr.bPrintControl   = m_pCtrlFieldCB->IsChecked();
         aAddPrinterAttr.bPrintPageBackground = m_pBackgroundCB->IsChecked();
         aAddPrinterAttr.bPrintBlackFont = m_pBlackFontCB->IsChecked();
         aAddPrinterAttr.bPrintHiddenText = m_pPrintHiddenTextCB->IsChecked();
@@ -484,7 +484,7 @@ void    SwAddPrinterTabPage::Reset( const SfxItemSet*  )
                                     reinterpret_cast<const SfxPoolItem**>(&pAddPrinterAttr) ))
     {
         m_pGrfCB->Check(pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw);
-        m_pCtrlFldCB->Check(       pAddPrinterAttr->bPrintControl);
+        m_pCtrlFieldCB->Check(       pAddPrinterAttr->bPrintControl);
         m_pBackgroundCB->Check(    pAddPrinterAttr->bPrintPageBackground);
         m_pBlackFontCB->Check(     pAddPrinterAttr->bPrintBlackFont);
         m_pPrintHiddenTextCB->Check( pAddPrinterAttr->bPrintHiddenText);
@@ -678,8 +678,8 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
     vcl::Font aFont( rStyle, Size( 0, 10 ) );
     if( pPrt )
         aFont = pPrt->GetFontMetric( aFont );
-    SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(nType);
-    pColl->SetFmtAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(),
+    SwTextFormatColl *pColl = pWrtShell->GetTextCollFromPool(nType);
+    pColl->SetFormatAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(),
                 aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
 }
 
@@ -688,8 +688,8 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
 {
     float fSize = (float)nHeight / 10;
     nHeight = CalcToUnit( fSize, SFX_MAPUNIT_TWIP );
-    SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(nType);
-    pColl->SetFmtAttr(SvxFontHeightItem(nHeight, 100, nFontHeightWhich));
+    SwTextFormatColl *pColl = pWrtShell->GetTextCollFromPool(nType);
+    pColl->SetFormatAttr(SvxFontHeightItem(nHeight, 100, nFontHeightWhich));
 }
 
 bool SwStdFontTabPage::FillItemSet( SfxItemSet* )
@@ -759,16 +759,16 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* )
                 aFont = pPrinter->GetFontMetric( aFont );
             pWrtShell->SetDefault(SvxFontItem(aFont.GetFamily(), aFont.GetName(),
                                   aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
-            SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
-            pColl->ResetFmtAttr(nFontWhich);
+            SwTextFormatColl *pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD);
+            pColl->ResetFormatAttr(nFontWhich);
             bMod = true;
         }
         if(bStandardHeightChanged)
         {
             float fSize = (float)pStandardHeightLB->GetValue() / 10;
             pWrtShell->SetDefault(SvxFontHeightItem( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), 100, nFontHeightWhich ) );
-            SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
-            pColl->ResetFmtAttr(nFontHeightWhich);
+            SwTextFormatColl *pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD);
+            pColl->ResetFormatAttr(nFontHeightWhich);
             bMod = true;
         }
 
@@ -930,7 +930,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
     }
     else
     {
-        SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
+        SwTextFormatColl *pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD);
         const SvxFontItem& rFont = !nFontGroup ? pColl->GetFont() :
                 FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont();
         sShellStd = sStdBackup =  rFont.GetFamilyName();
@@ -938,45 +938,45 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
         const sal_uInt16 nFontHeightWhich = sal::static_int_cast< sal_uInt16, RES_CHRATR >(
             nFontGroup == FONT_GROUP_DEFAULT  ? RES_CHRATR_FONTSIZE :
             FONT_GROUP_CJK == nFontGroup ? RES_CHRATR_CJK_FONTSIZE : RES_CHRATR_CTL_FONTSIZE );
-        const SvxFontHeightItem& rFontHeightStandard = static_cast<const SvxFontHeightItem& >(pColl->GetFmtAttr(nFontHeightWhich));
+        const SvxFontHeightItem& rFontHeightStandard = static_cast<const SvxFontHeightItem& >(pColl->GetFormatAttr(nFontHeightWhich));
         nStandardHeight = (sal_Int32)rFontHeightStandard.GetHeight();
 
-        pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_HEADLINE_BASE);
+        pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_HEADLINE_BASE);
         const SvxFontItem& rFontHL = !nFontGroup ? pColl->GetFont() :
                 FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont();
         sShellTitle = sOutBackup = rFontHL.GetFamilyName();
 
-        const SvxFontHeightItem& rFontHeightTitle = static_cast<const SvxFontHeightItem&>(pColl->GetFmtAttr( nFontHeightWhich, true ));
+        const SvxFontHeightItem& rFontHeightTitle = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr( nFontHeightWhich, true ));
         nTitleHeight = (sal_Int32)rFontHeightTitle.GetHeight();
 
         const sal_uInt16 nFontWhich = sal::static_int_cast< sal_uInt16, RES_CHRATR >(
             nFontGroup == FONT_GROUP_DEFAULT  ? RES_CHRATR_FONT :
             FONT_GROUP_CJK == nFontGroup ? RES_CHRATR_CJK_FONT : RES_CHRATR_CTL_FONT);
-        pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_NUMBUL_BASE);
+        pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_NUMBUL_BASE);
         const SvxFontItem& rFontLS = !nFontGroup ? pColl->GetFont() :
                 FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont();
         bListDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false);
         sShellList = sListBackup = rFontLS.GetFamilyName();
 
-        const SvxFontHeightItem& rFontHeightList = static_cast<const SvxFontHeightItem&>(pColl->GetFmtAttr(nFontHeightWhich, true));
+        const SvxFontHeightItem& rFontHeightList = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich, true));
         nListHeight = (sal_Int32)rFontHeightList.GetHeight();
         bListHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false);
 
-        pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_LABEL);
+        pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_LABEL);
         bLabelDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false);
         const SvxFontItem& rFontCP = !nFontGroup ? pColl->GetFont() :
                 FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont();
         sShellLabel = sCapBackup = rFontCP.GetFamilyName();
-        const SvxFontHeightItem& rFontHeightLabel = static_cast<const SvxFontHeightItem&>(pColl->GetFmtAttr(nFontHeightWhich, true));
+        const SvxFontHeightItem& rFontHeightLabel = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich, true));
         nLabelHeight = (sal_Int32)rFontHeightLabel.GetHeight();
         bLabelHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false);
 
-        pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_REGISTER_BASE);
+        pColl = pWrtShell->GetTextCollFromPool(RES_POOLCOLL_REGISTER_BASE);
         bIdxDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false);
         const SvxFontItem& rFontIDX = !nFontGroup ? pColl->GetFont() :
                 FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont();
         sShellIndex = sIdxBackup = rFontIDX.GetFamilyName();
-        const SvxFontHeightItem& rFontHeightIndex = static_cast<const SvxFontHeightItem&>(pColl->GetFmtAttr(nFontHeightWhich, true));
+        const SvxFontHeightItem& rFontHeightIndex = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich, true));
         nIndexHeight = (sal_Int32)rFontHeightIndex.GetHeight();
         bIndexHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false);
     }
@@ -1149,7 +1149,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxIte
     get(pDontSplitCB,"dontsplit");
     get(pBorderCB,"border");
     get(pNumFormattingCB,"numformatting");
-    get(pNumFmtFormattingCB,"numfmtformatting");
+    get(pNumFormatFormattingCB,"numfmtformatting");
     get(pNumAlignmentCB,"numalignment");
     get(pRowMoveMF,"rowmove");
     get(pColMoveMF,"colmove");
@@ -1161,7 +1161,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxIte
 
     Link<> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl));
     pNumFormattingCB->SetClickHdl(aLnk);
-    pNumFmtFormattingCB->SetClickHdl(aLnk);
+    pNumFormatFormattingCB->SetClickHdl(aLnk);
     pHeaderCB->SetClickHdl(aLnk);
 }
 
@@ -1177,7 +1177,7 @@ void SwTableOptionsTabPage::dispose()
     pDontSplitCB.clear();
     pBorderCB.clear();
     pNumFormattingCB.clear();
-    pNumFmtFormattingCB.clear();
+    pNumFormatFormattingCB.clear();
     pNumAlignmentCB.clear();
     pRowMoveMF.clear();
     pColMoveMF.clear();
@@ -1202,32 +1202,32 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* )
     SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
     if(pRowMoveMF->IsModified())
-        pModOpt->SetTblHMove( (sal_uInt16)pRowMoveMF->Denormalize( pRowMoveMF->GetValue(FUNIT_TWIP)));
+        pModOpt->SetTableHMove( (sal_uInt16)pRowMoveMF->Denormalize( pRowMoveMF->GetValue(FUNIT_TWIP)));
 
     if(pColMoveMF->IsModified())
-        pModOpt->SetTblVMove( (sal_uInt16)pColMoveMF->Denormalize( pColMoveMF->GetValue(FUNIT_TWIP)));
+        pModOpt->SetTableVMove( (sal_uInt16)pColMoveMF->Denormalize( pColMoveMF->GetValue(FUNIT_TWIP)));
 
     if(pRowInsertMF->IsModified())
-        pModOpt->SetTblHInsert((sal_uInt16)pRowInsertMF->Denormalize( pRowInsertMF->GetValue(FUNIT_TWIP)));
+        pModOpt->SetTableHInsert((sal_uInt16)pRowInsertMF->Denormalize( pRowInsertMF->GetValue(FUNIT_TWIP)));
 
     if(pColInsertMF->IsModified())
-        pModOpt->SetTblVInsert((sal_uInt16)pColInsertMF->Denormalize( pColInsertMF->GetValue(FUNIT_TWIP)));
+        pModOpt->SetTableVInsert((sal_uInt16)pColInsertMF->Denormalize( pColInsertMF->GetValue(FUNIT_TWIP)));
 
-    TblChgMode eMode;
+    TableChgMode eMode;
     if(pFixRB->IsChecked())
         eMode = TBLFIX_CHGABS;
     else if(pFixPropRB->IsChecked())
         eMode = TBLFIX_CHGPROP;
     else
         eMode = TBLVAR_CHGABS;
-    if(eMode != pModOpt->GetTblMode())
+    if(eMode != pModOpt->GetTableMode())
     {
-        pModOpt->SetTblMode(eMode);
+        pModOpt->SetTableMode(eMode);
         // the table-keyboard-mode has changed, now the current
         // table should know about that too.
         if(pWrtShell && nsSelectionType::SEL_TBL & pWrtShell->GetSelectionType())
         {
-            pWrtShell->SetTblChgMode(eMode);
+            pWrtShell->SetTableChgMode(eMode);
             static sal_uInt16 aInva[] =
                                 {   FN_TABLE_MODE_FIX,
                                     FN_TABLE_MODE_FIX_PROP,
@@ -1259,24 +1259,24 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* )
         pDontSplitCB->IsValueChangedFromSaved() ||
         pBorderCB->IsValueChangedFromSaved())
     {
-        pModOpt->SetInsTblFlags(bHTMLMode, aInsOpts);
+        pModOpt->SetInsTableFlags(bHTMLMode, aInsOpts);
     }
 
     if (pNumFormattingCB->IsValueChangedFromSaved())
     {
-        pModOpt->SetInsTblFormatNum(bHTMLMode, pNumFormattingCB->IsChecked());
+        pModOpt->SetInsTableFormatNum(bHTMLMode, pNumFormattingCB->IsChecked());
         bRet = true;
     }
 
-    if (pNumFmtFormattingCB->IsValueChangedFromSaved())
+    if (pNumFormatFormattingCB->IsValueChangedFromSaved())
     {
-        pModOpt->SetInsTblChangeNumFormat(bHTMLMode, pNumFmtFormattingCB->IsChecked());
+        pModOpt->SetInsTableChangeNumFormat(bHTMLMode, pNumFormatFormattingCB->IsChecked());
         bRet = true;
     }
 
     if (pNumAlignmentCB->IsValueChangedFromSaved())
     {
-        pModOpt->SetInsTblAlignNum(bHTMLMode, pNumAlignmentCB->IsChecked());
+        pModOpt->SetInsTableAlignNum(bHTMLMode, pNumAlignmentCB->IsChecked());
         bRet = true;
     }
 
@@ -1296,12 +1296,12 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet)
         ::SetFieldUnit( *pColInsertMF, eFieldUnit );
     }
 
-    pRowMoveMF->SetValue(pRowMoveMF->Normalize(pModOpt->GetTblHMove()), FUNIT_TWIP);
-    pColMoveMF->SetValue(pColMoveMF->Normalize(pModOpt->GetTblVMove()), FUNIT_TWIP);
-    pRowInsertMF->SetValue(pRowInsertMF->Normalize(pModOpt->GetTblHInsert()), FUNIT_TWIP);
-    pColInsertMF->SetValue(pColInsertMF->Normalize(pModOpt->GetTblVInsert()), FUNIT_TWIP);
+    pRowMoveMF->SetValue(pRowMoveMF->Normalize(pModOpt->GetTableHMove()), FUNIT_TWIP);
+    pColMoveMF->SetValue(pColMoveMF->Normalize(pModOpt->GetTableVMove()), FUNIT_TWIP);
+    pRowInsertMF->SetValue(pRowInsertMF->Normalize(pModOpt->GetTableHInsert()), FUNIT_TWIP);
+    pColInsertMF->SetValue(pColInsertMF->Normalize(pModOpt->GetTableVInsert()), FUNIT_TWIP);
 
-    switch(pModOpt->GetTblMode())
+    switch(pModOpt->GetTableMode())
     {
         case TBLFIX_CHGABS:     pFixRB->Check();     break;
         case TBLFIX_CHGPROP:    pFixPropRB->Check(); break;
@@ -1320,24 +1320,24 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet)
         pDontSplitCB->Hide();
     }
 
-    SwInsertTableOptions aInsOpts = pModOpt->GetInsTblFlags(bHTMLMode);
-    const sal_uInt16 nInsTblFlags = aInsOpts.mnInsMode;
+    SwInsertTableOptions aInsOpts = pModOpt->GetInsTableFlags(bHTMLMode);
+    const sal_uInt16 nInsTableFlags = aInsOpts.mnInsMode;
 
-    pHeaderCB->Check(0 != (nInsTblFlags & tabopts::HEADLINE));
+    pHeaderCB->Check(0 != (nInsTableFlags & tabopts::HEADLINE));
     pRepeatHeaderCB->Check((!bHTMLMode) && (aInsOpts.mnRowsToRepeat > 0));
-    pDontSplitCB->Check(!(nInsTblFlags & tabopts::SPLIT_LAYOUT));
-    pBorderCB->Check(0 != (nInsTblFlags & tabopts::DEFAULT_BORDER));
+    pDontSplitCB->Check(!(nInsTableFlags & tabopts::SPLIT_LAYOUT));
+    pBorderCB->Check(0 != (nInsTableFlags & tabopts::DEFAULT_BORDER));
 
-    pNumFormattingCB->Check(pModOpt->IsInsTblFormatNum(bHTMLMode));
-    pNumFmtFormattingCB->Check(pModOpt->IsInsTblChangeNumFormat(bHTMLMode));
-    pNumAlignmentCB->Check(pModOpt->IsInsTblAlignNum(bHTMLMode));
+    pNumFormattingCB->Check(pModOpt->IsInsTableFormatNum(bHTMLMode));
+    pNumFormatFormattingCB->Check(pModOpt->IsInsTableChangeNumFormat(bHTMLMode));
+    pNumAlignmentCB->Check(pModOpt->IsInsTableAlignNum(bHTMLMode));
 
     pHeaderCB->SaveValue();
     pRepeatHeaderCB->SaveValue();
     pDontSplitCB->SaveValue();
     pBorderCB->SaveValue();
     pNumFormattingCB->SaveValue();
-    pNumFmtFormattingCB->SaveValue();
+    pNumFormatFormattingCB->SaveValue();
     pNumAlignmentCB->SaveValue();
 
     CheckBoxHdl(0);
@@ -1345,7 +1345,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet)
 
 IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl)
 {
-    pNumFmtFormattingCB->Enable(pNumFormattingCB->IsChecked());
+    pNumFormatFormattingCB->Enable(pNumFormattingCB->IsChecked());
     pNumAlignmentCB->Enable(pNumFormattingCB->IsChecked());
     pRepeatHeaderCB->Enable(pHeaderCB->IsChecked());
     return 0;
@@ -1371,8 +1371,8 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( vcl::Window* pParent,
     get(m_pTabCB, "tabs");
     get(m_pBreakCB, "break");
     get(m_pCharHiddenCB, "hiddentext");
-    get(m_pFldHiddenCB, "hiddentextfield");
-    get(m_pFldHiddenParaCB, "hiddenparafield");
+    get(m_pFieldHiddenCB, "hiddentextfield");
+    get(m_pFieldHiddenParaCB, "hiddenparafield");
 
     get(m_pDirectCursorFrame, "directcrsrframe");
     get(m_pOnOffCB, "cursoronoff");
@@ -1406,8 +1406,8 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( vcl::Window* pParent,
     {
         m_pTabCB->Hide();
         m_pCharHiddenCB->Hide();
-        m_pFldHiddenCB->Hide();
-        m_pFldHiddenParaCB->Hide();
+        m_pFieldHiddenCB->Hide();
+        m_pFieldHiddenParaCB->Hide();
 
         m_pDirectCursorFrame->Hide();
         m_pOnOffCB->Hide();
@@ -1436,8 +1436,8 @@ void SwShdwCrsrOptionsTabPage::dispose()
     m_pTabCB.clear();
     m_pBreakCB.clear();
     m_pCharHiddenCB.clear();
-    m_pFldHiddenCB.clear();
-    m_pFldHiddenParaCB.clear();
+    m_pFieldHiddenCB.clear();
+    m_pFieldHiddenParaCB.clear();
     m_pDirectCursorFrame.clear();
     m_pOnOffCB.clear();
     m_pFillMarginRB.clear();
@@ -1518,9 +1518,9 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet* rSet )
     aDisp.bSpace                = m_pSpacesCB->IsChecked();
     aDisp.bNonbreakingSpace     = m_pHSpacesCB->IsChecked();
     aDisp.bSoftHyphen           = m_pSHyphCB->IsChecked();
-    aDisp.bFldHiddenText        = m_pFldHiddenCB->IsChecked();
+    aDisp.bFieldHiddenText        = m_pFieldHiddenCB->IsChecked();
     aDisp.bCharHiddenText       = m_pCharHiddenCB->IsChecked();
-    aDisp.bShowHiddenPara       = m_pFldHiddenParaCB->IsChecked();
+    aDisp.bShowHiddenPara       = m_pFieldHiddenParaCB->IsChecked();
     aDisp.bManualBreak          = m_pBreakCB->IsChecked();
 
     bRet |= (!pOldAttr || aDisp != *pOldAttr);
@@ -1572,8 +1572,8 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet* rSet )
         m_pHSpacesCB->Check  ( pDocDisplayAttr->bNonbreakingSpace );
         m_pSHyphCB->Check  ( pDocDisplayAttr->bSoftHyphen );
         m_pCharHiddenCB->Check ( pDocDisplayAttr->bCharHiddenText );
-        m_pFldHiddenCB->Check  ( pDocDisplayAttr->bFldHiddenText );
-        m_pFldHiddenParaCB->Check ( pDocDisplayAttr->bShowHiddenPara );
+        m_pFieldHiddenCB->Check  ( pDocDisplayAttr->bFieldHiddenText );
+        m_pFieldHiddenParaCB->Check ( pDocDisplayAttr->bShowHiddenPara );
         m_pBreakCB->Check  ( pDocDisplayAttr->bManualBreak );
     }
 }
@@ -1642,8 +1642,8 @@ void SwMarkPreview::InitColors()
     bool bHC = rSettings.GetHighContrastMode();
     m_aLineCol = bHC? SwViewOption::GetFontColor() : Color( COL_BLACK );
     m_aShadowCol = bHC? m_aBgCol : rSettings.GetShadowColor();
-    m_aTxtCol = bHC? SwViewOption::GetFontColor() : Color( COL_GRAY );
-    m_aPrintAreaCol = m_aTxtCol;
+    m_aTextCol = bHC? SwViewOption::GetFontColor() : Color( COL_GRAY );
+    m_aPrintAreaCol = m_aTextCol;
 }
 
 void SwMarkPreview::DataChanged( const DataChangedEvent& rDCEvt )
@@ -1730,15 +1730,15 @@ void SwMarkPreview::PaintPage(vcl::RenderContext& rRenderContext, const Rectangl
     drawRect(rRenderContext, rRect, m_aTransCol, m_aPrintAreaCol);
 
     // draw Testparagraph
-    sal_uLong nLTxtBorder = 4;
-    sal_uLong nRTxtBorder = 4;
-    sal_uLong nTTxtBorder = 4;
+    sal_uLong nLTextBorder = 4;
+    sal_uLong nRTextBorder = 4;
+    sal_uLong nTTextBorder = 4;
 
     Rectangle aTextLine = rRect;
     aTextLine.SetSize(Size(aTextLine.GetWidth(), 2));
-    aTextLine.Left()    += nLTxtBorder;
-    aTextLine.Right()   -= nRTxtBorder;
-    aTextLine.Move(0, nTTxtBorder);
+    aTextLine.Left()    += nLTextBorder;
+    aTextLine.Right()   -= nRTextBorder;
+    aTextLine.Move(0, nTTextBorder);
 
     const long nStep = aTextLine.GetHeight() + 2;
     const long nLines = rRect.GetHeight() / (aTextLine.GetHeight() + 2) - 1;
@@ -1750,7 +1750,7 @@ void SwMarkPreview::PaintPage(vcl::RenderContext& rRenderContext, const Rectangl
             aTextLine.SetSize(Size(aTextLine.GetWidth() / 2, aTextLine.GetHeight()));
 
         if (aPage.IsInside(aTextLine))
-            drawRect(rRenderContext, aTextLine, m_aTxtCol, m_aTransCol);
+            drawRect(rRenderContext, aTextLine, m_aTextCol, m_aTransCol);
 
         aTextLine.Move(0, nStep);
     }
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 72a88f1a1c33..550b626e5bf8 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -563,8 +563,8 @@ void SwAddressListDialog::DetectTablesAndQueries(
             uno::Reference<XTablesSupplier> xTSupplier(pUserData->xConnection, UNO_QUERY);
             if(xTSupplier.is())
             {
-                uno::Reference<XNameAccess> xTbls = xTSupplier->getTables();
-                aTables = xTbls->getElementNames();
+                uno::Reference<XNameAccess> xTables = xTSupplier->getTables();
+                aTables = xTables->getElementNames();
                 nTables += aTables.getLength();
             }
             uno::Reference<XQueriesSupplier> xQSupplier(pUserData->xConnection, UNO_QUERY);
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 51f0e9745fc8..ddfed15db9cc 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -104,8 +104,8 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::uno;
 
-const char cDBFldStart  = '<';
-const char cDBFldEnd    = '>';
+const char cDBFieldStart  = '<';
+const char cDBFieldEnd    = '>';
 
 // Helper structure for adding database rows as fields or text
 struct _DB_Column
@@ -126,10 +126,10 @@ struct _DB_Column
         eColType = DB_SPLITPARA;
     }
 
-    _DB_Column( const OUString& rTxt )
+    _DB_Column( const OUString& rText )
     {
         pColInfo = 0;
-        DB_ColumnData.pText = new OUString( rTxt );
+        DB_ColumnData.pText = new OUString( rText );
         eColType = DB_FILLTEXT;
     }
 
@@ -140,10 +140,10 @@ struct _DB_Column
         eColType = DB_COL_TEXT;
     }
 
-    _DB_Column( const SwInsDBColumn& rInfo, SwDBField& rFld )
+    _DB_Column( const SwInsDBColumn& rInfo, SwDBField& rField )
     {
         pColInfo = &rInfo;
-        DB_ColumnData.pField = &rFld;
+        DB_ColumnData.pField = &rField;
         eColType = DB_COL_FIELD;
     }
 
@@ -162,9 +162,9 @@ struct _DB_ColumnConfigData: private boost::noncopyable
     OUString sSource;
     OUString sTable;
     OUString sEdit;
-    OUString sTblList;
+    OUString sTableList;
     OUString sTmplNm;
-    OUString sTAutoFmtNm;
+    OUString sTAutoFormatNm;
     bool bIsTable : 1,
          bIsField : 1,
          bIsHeadlineOn : 1,
@@ -195,23 +195,23 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
     , aDBData(rData)
     , sNoTmpl(SW_RESSTR(SW_STR_NONE))
     , pView(&rView)
-    , pTAutoFmt(0)
-    , pTblSet(0)
+    , pTAutoFormat(0)
+    , pTableSet(0)
     , pRep(0)
 {
     get(m_pRbAsTable, "astable");
     get(m_pRbAsField, "asfields");
     get(m_pRbAsText, "astext");
     get(m_pHeadFrame, "dbframe");
-    get(m_pLbTblDbColumn, "tabledbcols");
-    get(m_pLbTxtDbColumn, "tabletxtcols");
-    m_pLbTblDbColumn->SetDropDownLineCount(8);
-    m_pLbTxtDbColumn->SetDropDownLineCount(8);
+    get(m_pLbTableDbColumn, "tabledbcols");
+    get(m_pLbTextDbColumn, "tabletxtcols");
+    m_pLbTableDbColumn->SetDropDownLineCount(8);
+    m_pLbTextDbColumn->SetDropDownLineCount(8);
     get(m_pFormatFrame, "formatframe");
-    get(m_pRbDbFmtFromDb, "fromdatabase");
-    get(m_pRbDbFmtFromUsr, "userdefined");
-    get(m_pLbDbFmtFromUsr, "numformat");
-    aOldNumFmtLnk = m_pLbDbFmtFromUsr->GetSelectHdl();
+    get(m_pRbDbFormatFromDb, "fromdatabase");
+    get(m_pRbDbFormatFromUsr, "userdefined");
+    get(m_pLbDbFormatFromUsr, "numformat");
+    aOldNumFormatLnk = m_pLbDbFormatFromUsr->GetSelectHdl();
     get(m_pIbDbcolToEdit, "toedit");
     get(m_pEdDbText, "textview");
     m_pEdDbText->set_width_request(m_pEdDbText->approximate_char_width() * 46);
@@ -228,18 +228,18 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
     get(m_pCbTableHeadon, "tableheading");
     get(m_pRbHeadlColnms, "columnname");
     get(m_pRbHeadlEmpty, "rowonly");
-    get(m_pPbTblFormat, "tableformat");
-    get(m_pPbTblAutofmt, "autoformat");
+    get(m_pPbTableFormat, "tableformat");
+    get(m_pPbTableAutofmt, "autoformat");
 
-    nGBFmtLen = m_pFormatFrame->get_label().getLength();
+    nGBFormatLen = m_pFormatFrame->get_label().getLength();
 
     if(xColSupp.is())
     {
         SwWrtShell& rSh = pView->GetWrtShell();
-        SvNumberFormatter* pNumFmtr = rSh.GetNumberFormatter();
-        SvNumberFormatsSupplierObj* pNumFmt = new SvNumberFormatsSupplierObj( pNumFmtr );
-        Reference< util::XNumberFormatsSupplier >  xDocNumFmtsSupplier = pNumFmt;
-        Reference< util::XNumberFormats > xDocNumberFormats = xDocNumFmtsSupplier->getNumberFormats();
+        SvNumberFormatter* pNumFormatr = rSh.GetNumberFormatter();
+        SvNumberFormatsSupplierObj* pNumFormat = new SvNumberFormatsSupplierObj( pNumFormatr );
+        Reference< util::XNumberFormatsSupplier >  xDocNumFormatsSupplier = pNumFormat;
+        Reference< util::XNumberFormats > xDocNumberFormats = xDocNumFormatsSupplier->getNumberFormats();
         Reference< util::XNumberFormatTypes > xDocNumberFormatTypes(xDocNumberFormats, UNO_QUERY);
 
         Reference<XPropertySet> xSourceProps(xDataSource, UNO_QUERY);
@@ -287,17 +287,17 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
                 case DataType::TIME:
                 case DataType::TIMESTAMP:
                 {
-                    pNew->bHasFmt = true;
+                    pNew->bHasFormat = true;
                     Any aFormat = xCol->getPropertyValue("FormatKey");
                     if(aFormat.hasValue())
                     {
-                        sal_Int32 nFmt = 0;
-                        aFormat >>= nFmt;
+                        sal_Int32 nFormat = 0;
+                        aFormat >>= nFormat;
                         if(xNumberFormats.is())
                         {
                             try
                             {
-                                Reference<XPropertySet> xNumProps = xNumberFormats->getByKey( nFmt );
+                                Reference<XPropertySet> xNumProps = xNumberFormats->getByKey( nFormat );
                                 Any aFormatVal = xNumProps->getPropertyValue("FormatString");
                                 Any aLocale = xNumProps->getPropertyValue("Locale");
                                 OUString sFormat;
@@ -309,7 +309,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
                                 {
                                     nKey = xDocNumberFormats->addNew( sFormat, aLoc );
                                 }
-                                pNew->nDBNumFmt = nKey;
+                                pNew->nDBNumFormat = nKey;
                             }
                             catch (const Exception&)
                             {
@@ -319,7 +319,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
                     }
                     else
                     {
-                        pNew->nDBNumFmt = getDefaultNumberFormat(xCol,
+                        pNew->nDBNumFormat = getDefaultNumberFormat(xCol,
                                 xDocNumberFormatTypes, LanguageTag( rSh.GetCurLang() ).getLocale());
                     }
 
@@ -350,16 +350,16 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
     }
 
     // when the cursor is inside of a table, table must NEVER be selectable
-    if( pView->GetWrtShell().GetTableFmt() )
+    if( pView->GetWrtShell().GetTableFormat() )
     {
         m_pRbAsTable->Enable( false );
         m_pRbAsField->Check( true );
-        m_pRbDbFmtFromDb->Check( true );
+        m_pRbDbFormatFromDb->Check( true );
     }
     else
     {
         m_pRbAsTable->Check( true );
-        m_pRbDbFmtFromDb->Check( true );
+        m_pRbDbFormatFromDb->Check( true );
         m_pIbDbcolOneFrom->Enable( false );
         m_pIbDbcolAllFrom->Enable( false );
     }
@@ -368,39 +368,39 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
     m_pRbAsField->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, PageHdl ));
     m_pRbAsText->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, PageHdl ));
 
-    m_pRbDbFmtFromDb->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, DBFormatHdl ));
-    m_pRbDbFmtFromUsr->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, DBFormatHdl ));
+    m_pRbDbFormatFromDb->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, DBFormatHdl ));
+    m_pRbDbFormatFromUsr->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, DBFormatHdl ));
 
-    m_pPbTblFormat->SetClickHdl(LINK(this, SwInsertDBColAutoPilot, TblFmtHdl ));
-    m_pPbTblAutofmt->SetClickHdl(LINK(this, SwInsertDBColAutoPilot, AutoFmtHdl ));
+    m_pPbTableFormat->SetClickHdl(LINK(this, SwInsertDBColAutoPilot, TableFormatHdl ));
+    m_pPbTableAutofmt->SetClickHdl(LINK(this, SwInsertDBColAutoPilot, AutoFormatHdl ));
 
-    m_pIbDbcolAllTo->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
-    m_pIbDbcolOneTo->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
-    m_pIbDbcolOneFrom->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
-    m_pIbDbcolAllFrom->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
-    m_pIbDbcolToEdit->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+    m_pIbDbcolAllTo->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TableToFromHdl ));
+    m_pIbDbcolOneTo->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TableToFromHdl ));
+    m_pIbDbcolOneFrom->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TableToFromHdl ));
+    m_pIbDbcolAllFrom->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TableToFromHdl ));
+    m_pIbDbcolToEdit->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TableToFromHdl ));
 
     m_pCbTableHeadon->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
     m_pRbHeadlColnms->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
     m_pRbHeadlEmpty->SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
 
-    m_pLbTxtDbColumn->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
-    m_pLbTblDbColumn->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
-    m_pLbDbFmtFromUsr->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
+    m_pLbTextDbColumn->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
+    m_pLbTableDbColumn->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
+    m_pLbDbFormatFromUsr->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
     m_pLbTableCol->SetSelectHdl( LINK( this, SwInsertDBColAutoPilot, SelectHdl ));
 
-    m_pLbTxtDbColumn->SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
-    m_pLbTblDbColumn->SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
+    m_pLbTextDbColumn->SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
+    m_pLbTableDbColumn->SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
     m_pLbTableCol->SetDoubleClickHdl( LINK( this, SwInsertDBColAutoPilot, DblClickHdl ));
 
     for( size_t n = 0; n < aDBColumns.size(); ++n )
     {
         const OUString& rS = aDBColumns[ n ]->sColumn;
-        m_pLbTblDbColumn->InsertEntry( rS, static_cast<sal_Int32>(n) );
-        m_pLbTxtDbColumn->InsertEntry( rS, static_cast<sal_Int32>(n) );
+        m_pLbTableDbColumn->InsertEntry( rS, static_cast<sal_Int32>(n) );
+        m_pLbTextDbColumn->InsertEntry( rS, static_cast<sal_Int32>(n) );
     }
-    m_pLbTxtDbColumn->SelectEntryPos( 0 );
-    m_pLbTblDbColumn->SelectEntryPos( 0 );
+    m_pLbTextDbColumn->SelectEntryPos( 0 );
+    m_pLbTableDbColumn->SelectEntryPos( 0 );
 
     // read configuration
     Load();
@@ -418,20 +418,20 @@ SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot()
 
 void SwInsertDBColAutoPilot::dispose()
 {
-    delete pTblSet;
+    delete pTableSet;
     delete pRep;
 
-    delete pTAutoFmt;
+    delete pTAutoFormat;
     m_pRbAsTable.clear();
     m_pRbAsField.clear();
     m_pRbAsText.clear();
     m_pHeadFrame.clear();
-    m_pLbTblDbColumn.clear();
-    m_pLbTxtDbColumn.clear();
+    m_pLbTableDbColumn.clear();
+    m_pLbTextDbColumn.clear();
     m_pFormatFrame.clear();
-    m_pRbDbFmtFromDb.clear();
-    m_pRbDbFmtFromUsr.clear();
-    m_pLbDbFmtFromUsr.clear();
+    m_pRbDbFormatFromDb.clear();
+    m_pRbDbFormatFromUsr.clear();
+    m_pLbDbFormatFromUsr.clear();
     m_pIbDbcolToEdit.clear();
     m_pEdDbText.clear();
     m_pFtDbParaColl.clear();
@@ -445,40 +445,40 @@ void SwInsertDBColAutoPilot::dispose()
     m_pCbTableHeadon.clear();
     m_pRbHeadlColnms.clear();
     m_pRbHeadlEmpty.clear();
-    m_pPbTblFormat.clear();
-    m_pPbTblAutofmt.clear();
+    m_pPbTableFormat.clear();
+    m_pPbTableAutofmt.clear();
     SfxModalDialog::dispose();
 }
 
 IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, Button*, pButton )
 {
-    bool bShowTbl = pButton == m_pRbAsTable;
+    bool bShowTable = pButton == m_pRbAsTable;
 
     m_pHeadFrame->set_label(MnemonicGenerator::EraseAllMnemonicChars(pButton->GetText()));
 
-    m_pLbTxtDbColumn->Show( !bShowTbl );
-    m_pIbDbcolToEdit->Show( !bShowTbl );
-    m_pEdDbText->Show( !bShowTbl );
-    m_pFtDbParaColl->Show( !bShowTbl );
-    m_pLbDbParaColl->Show( !bShowTbl );
-
-    m_pLbTblDbColumn->Show( bShowTbl );
-    m_pIbDbcolAllTo->Show( bShowTbl );
-    m_pIbDbcolOneTo->Show( bShowTbl );
-    m_pIbDbcolOneFrom->Show( bShowTbl );
-    m_pIbDbcolAllFrom->Show( bShowTbl );
-    m_pFtTableCol->Show( bShowTbl );
-    m_pLbTableCol->Show( bShowTbl );
-    m_pCbTableHeadon->Show( bShowTbl );
-    m_pRbHeadlColnms->Show( bShowTbl );
-    m_pRbHeadlEmpty->Show( bShowTbl );
-    m_pPbTblFormat->Show( bShowTbl );
-    m_pPbTblAutofmt->Show( bShowTbl );
-
-    if( bShowTbl )
-        m_pPbTblFormat->Enable( 0 != m_pLbTableCol->GetEntryCount() );
-
-    SelectHdl( bShowTbl ? m_pLbTblDbColumn : m_pLbTxtDbColumn );
+    m_pLbTextDbColumn->Show( !bShowTable );
+    m_pIbDbcolToEdit->Show( !bShowTable );
+    m_pEdDbText->Show( !bShowTable );
+    m_pFtDbParaColl->Show( !bShowTable );
+    m_pLbDbParaColl->Show( !bShowTable );
+
+    m_pLbTableDbColumn->Show( bShowTable );
+    m_pIbDbcolAllTo->Show( bShowTable );
+    m_pIbDbcolOneTo->Show( bShowTable );
+    m_pIbDbcolOneFrom->Show( bShowTable );
+    m_pIbDbcolAllFrom->Show( bShowTable );
+    m_pFtTableCol->Show( bShowTable );
+    m_pLbTableCol->Show( bShowTable );
+    m_pCbTableHeadon->Show( bShowTable );
+    m_pRbHeadlColnms->Show( bShowTable );
+    m_pRbHeadlEmpty->Show( bShowTable );
+    m_pPbTableFormat->Show( bShowTable );
+    m_pPbTableAutofmt->Show( bShowTable );
+
+    if( bShowTable )
+        m_pPbTableFormat->Enable( 0 != m_pLbTableCol->GetEntryCount() );
+
+    SelectHdl( bShowTable ? m_pLbTableDbColumn : m_pLbTextDbColumn );
 
     return 0;
 }
@@ -487,24 +487,24 @@ IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton )
 {
     ListBox& rBox = m_pRbAsTable->IsChecked()
                         ? ( 0 == m_pLbTableCol->GetEntryData( 0 )
-                            ? *m_pLbTblDbColumn
+                            ? *m_pLbTableDbColumn
                             : *m_pLbTableCol )
-                        : *m_pLbTxtDbColumn;
+                        : *m_pLbTextDbColumn;
 
     SwInsDBColumn aSrch( rBox.GetSelectEntry(), 0 );
     SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
 
-    bool bFromDB = m_pRbDbFmtFromDb == pButton;
-    (*it)->bIsDBFmt = bFromDB;
-    m_pLbDbFmtFromUsr->Enable( !bFromDB );
+    bool bFromDB = m_pRbDbFormatFromDb == pButton;
+    (*it)->bIsDBFormat = bFromDB;
+    m_pLbDbFormatFromUsr->Enable( !bFromDB );
 
     return 0;
 }
 
-IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
+IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton )
 {
     bool bChgEnable = true, bEnableTo = true, bEnableFrom = true;
-    m_pLbTblDbColumn->SetUpdateMode( false );
+    m_pLbTableDbColumn->SetUpdateMode( false );
     m_pLbTableCol->SetUpdateMode( false );
 
     if( pButton == m_pIbDbcolAllTo )
@@ -512,34 +512,34 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
         bEnableTo = false;
 
         sal_Int32 n, nInsPos = m_pLbTableCol->GetSelectEntryPos(),
-               nCnt = m_pLbTblDbColumn->GetEntryCount();
+               nCnt = m_pLbTableDbColumn->GetEntryCount();
         if( LISTBOX_APPEND == nInsPos )
             for( n = 0; n < nCnt; ++n )
-                m_pLbTableCol->InsertEntry( m_pLbTblDbColumn->GetEntry( n ),
+                m_pLbTableCol->InsertEntry( m_pLbTableDbColumn->GetEntry( n ),
                                             LISTBOX_APPEND );
         else
             for( n = 0; n < nCnt; ++n, ++nInsPos )
-                m_pLbTableCol->InsertEntry( m_pLbTblDbColumn->GetEntry( n ), nInsPos );
-        m_pLbTblDbColumn->Clear();
+                m_pLbTableCol->InsertEntry( m_pLbTableDbColumn->GetEntry( n ), nInsPos );
+        m_pLbTableDbColumn->Clear();
         m_pLbTableCol->SelectEntryPos( nInsPos );
-        m_pLbTblDbColumn->SelectEntryPos( LISTBOX_APPEND );
+        m_pLbTableDbColumn->SelectEntryPos( LISTBOX_APPEND );
     }
     else if( pButton == m_pIbDbcolOneTo &&
-            LISTBOX_ENTRY_NOTFOUND != m_pLbTblDbColumn->GetSelectEntryPos() )
+            LISTBOX_ENTRY_NOTFOUND != m_pLbTableDbColumn->GetSelectEntryPos() )
     {
         sal_Int32 nInsPos = m_pLbTableCol->GetSelectEntryPos(),
-               nDelPos = m_pLbTblDbColumn->GetSelectEntryPos(),
-               nTopPos = m_pLbTblDbColumn->GetTopEntry();
-        m_pLbTableCol->InsertEntry( m_pLbTblDbColumn->GetEntry( nDelPos ), nInsPos );
-        m_pLbTblDbColumn->RemoveEntry( nDelPos );
+               nDelPos = m_pLbTableDbColumn->GetSelectEntryPos(),
+               nTopPos = m_pLbTableDbColumn->GetTopEntry();
+        m_pLbTableCol->InsertEntry( m_pLbTableDbColumn->GetEntry( nDelPos ), nInsPos );
+        m_pLbTableDbColumn->RemoveEntry( nDelPos );
 
         m_pLbTableCol->SelectEntryPos( nInsPos );
-        if( nDelPos >= m_pLbTblDbColumn->GetEntryCount() )
-            nDelPos = m_pLbTblDbColumn->GetEntryCount() - 1;
-        m_pLbTblDbColumn->SelectEntryPos( nDelPos );
-        m_pLbTblDbColumn->SetTopEntry( nTopPos );
+        if( nDelPos >= m_pLbTableDbColumn->GetEntryCount() )
+            nDelPos = m_pLbTableDbColumn->GetEntryCount() - 1;
+        m_pLbTableDbColumn->SelectEntryPos( nDelPos );
+        m_pLbTableDbColumn->SetTopEntry( nTopPos );
 
-        bEnableTo = 0 != m_pLbTblDbColumn->GetEntryCount();
+        bEnableTo = 0 != m_pLbTableDbColumn->GetEntryCount();
     }
     else if( pButton == m_pIbDbcolOneFrom )
     {
@@ -558,17 +558,17 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
             {
                 nInsPos = LISTBOX_ENTRY_NOTFOUND;
                 while( ++it != aDBColumns.end() &&
-                        LISTBOX_ENTRY_NOTFOUND == (nInsPos = m_pLbTblDbColumn->
+                        LISTBOX_ENTRY_NOTFOUND == (nInsPos = m_pLbTableDbColumn->
                         GetEntryPos( (*it)->sColumn )) )
                     ;
             }
 
-            m_pLbTblDbColumn->InsertEntry( aSrch.sColumn, nInsPos );
+            m_pLbTableDbColumn->InsertEntry( aSrch.sColumn, nInsPos );
             m_pLbTableCol->RemoveEntry( nDelPos );
 
-            if( nInsPos >= m_pLbTblDbColumn->GetEntryCount() )
-                nInsPos = m_pLbTblDbColumn->GetEntryCount() - 1;
-            m_pLbTblDbColumn->SelectEntryPos( nInsPos );
+            if( nInsPos >= m_pLbTableDbColumn->GetEntryCount() )
+                nInsPos = m_pLbTableDbColumn->GetEntryCount() - 1;
+            m_pLbTableDbColumn->SelectEntryPos( nInsPos );
 
             if( nDelPos >= m_pLbTableCol->GetEntryCount() )
                 nDelPos = m_pLbTableCol->GetEntryCount() - 1;
@@ -576,7 +576,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
             m_pLbTableCol->SetTopEntry( nTopPos );
         }
         else
-            bEnableTo = 0 != m_pLbTblDbColumn->GetEntryCount();
+            bEnableTo = 0 != m_pLbTableDbColumn->GetEntryCount();
 
         bEnableFrom = 0 != m_pLbTableCol->GetEntryCount();
     }
@@ -584,19 +584,19 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
     {
         bEnableFrom = false;
 
-        m_pLbTblDbColumn->Clear();
+        m_pLbTableDbColumn->Clear();
         m_pLbTableCol->Clear();
         for( size_t n = 0; n < aDBColumns.size(); ++n )
-            m_pLbTblDbColumn->InsertEntry( aDBColumns[ n ]->sColumn,
+            m_pLbTableDbColumn->InsertEntry( aDBColumns[ n ]->sColumn,
                                            static_cast<sal_Int32>(n) );
-        m_pLbTblDbColumn->SelectEntryPos( 0 );
+        m_pLbTableDbColumn->SelectEntryPos( 0 );
     }
     else if( pButton == m_pIbDbcolToEdit )
     {
         bChgEnable = false;
         // move data to Edit:
-        OUString aFld( m_pLbTxtDbColumn->GetSelectEntry() );
-        if( !aFld.isEmpty() )
+        OUString aField( m_pLbTextDbColumn->GetSelectEntry() );
+        if( !aField.isEmpty() )
         {
             OUString aStr( m_pEdDbText->GetText() );
             sal_Int32 nPos = static_cast<sal_Int32>(m_pEdDbText->GetSelection().Min());
@@ -605,25 +605,25 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
                 // first delete the existing selection
                 aStr = aStr.replaceAt( nPos, nSel, "" );
 
-            aFld = OUStringLiteral1<cDBFldStart>() + aFld + OUStringLiteral1<cDBFldEnd>();
+            aField = OUStringLiteral1<cDBFieldStart>() + aField + OUStringLiteral1<cDBFieldEnd>();
             if( !aStr.isEmpty() )
             {
                 if( nPos )                          // one blank in front
                 {
                     sal_Unicode c = aStr[ nPos-1 ];
                     if( '\n' != c && '\r' != c )
-                        aFld = " " + aFld;
+                        aField = " " + aField;
                 }
                 if( nPos < aStr.getLength() )             // one blank behind
                 {
                     sal_Unicode c = aStr[ nPos ];
                     if( '\n' != c && '\r' != c )
-                        aFld += " ";
+                        aField += " ";
                 }
             }
 
-            m_pEdDbText->SetText( aStr.replaceAt( nPos, 0, aFld ) );
-            nPos += aFld.getLength();
+            m_pEdDbText->SetText( aStr.replaceAt( nPos, 0, aField ) );
+            nPos += aField.getLength();
             m_pEdDbText->SetSelection( Selection( nPos ));
         }
     }
@@ -635,13 +635,13 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
         m_pIbDbcolOneFrom->Enable( bEnableFrom );
         m_pIbDbcolAllFrom->Enable( bEnableFrom );
 
-        m_pRbDbFmtFromDb->Enable( false );
-        m_pRbDbFmtFromUsr->Enable( false );
-        m_pLbDbFmtFromUsr->Enable( false );
+        m_pRbDbFormatFromDb->Enable( false );
+        m_pRbDbFormatFromUsr->Enable( false );
+        m_pLbDbFormatFromUsr->Enable( false );
 
-        m_pPbTblFormat->Enable( bEnableFrom );
+        m_pPbTableFormat->Enable( bEnableFrom );
     }
-    m_pLbTblDbColumn->SetUpdateMode( true );
+    m_pLbTableDbColumn->SetUpdateMode( true );
     m_pLbTableCol->SetUpdateMode( true );
 
     return 0;
@@ -650,39 +650,39 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
 IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox*, pBox )
 {
     Button* pButton = 0;
-    if( pBox == m_pLbTxtDbColumn )
+    if( pBox == m_pLbTextDbColumn )
         pButton = m_pIbDbcolToEdit;
-    else if( pBox == m_pLbTblDbColumn && m_pIbDbcolOneTo->IsEnabled() )
+    else if( pBox == m_pLbTableDbColumn && m_pIbDbcolOneTo->IsEnabled() )
         pButton = m_pIbDbcolOneTo;
     else if( pBox == m_pLbTableCol && m_pIbDbcolOneFrom->IsEnabled() )
         pButton = m_pIbDbcolOneFrom;
 
     if( pButton )
-        TblToFromHdl( pButton );
+        TableToFromHdl( pButton );
 
     return 0;
 }
 
-IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
+IMPL_LINK( SwInsertDBColAutoPilot, TableFormatHdl, PushButton*, pButton )
 {
     SwWrtShell& rSh = pView->GetWrtShell();
     bool bNewSet = false;
-    if( !pTblSet )
+    if( !pTableSet )
     {
         bNewSet = true;
-        pTblSet = new SfxItemSet( rSh.GetAttrPool(), SwuiGetUITableAttrRange() );
+        pTableSet = new SfxItemSet( rSh.GetAttrPool(), SwuiGetUITableAttrRange() );
 
         // At first acquire the simple attributes
-        pTblSet->Put( SfxStringItem( FN_PARAM_TABLE_NAME, rSh.GetUniqueTblName() ));
-        pTblSet->Put( SfxUInt16Item( FN_PARAM_TABLE_HEADLINE, 1 ) );
+        pTableSet->Put( SfxStringItem( FN_PARAM_TABLE_NAME, rSh.GetUniqueTableName() ));
+        pTableSet->Put( SfxUInt16Item( FN_PARAM_TABLE_HEADLINE, 1 ) );
 
-        pTblSet->Put( SfxUInt16Item( SID_BACKGRND_DESTINATION,
-                                    rSh.GetViewOptions()->GetTblDest() ));
+        pTableSet->Put( SfxUInt16Item( SID_BACKGRND_DESTINATION,
+                                    rSh.GetViewOptions()->GetTableDest() ));
 
         SvxBrushItem aBrush( RES_BACKGROUND );
-        pTblSet->Put( aBrush );
-        pTblSet->Put( aBrush, SID_ATTR_BRUSH_ROW );
-        pTblSet->Put( aBrush, SID_ATTR_BRUSH_TABLE );
+        pTableSet->Put( aBrush );
+        pTableSet->Put( aBrush, SID_ATTR_BRUSH_ROW );
+        pTableSet->Put( aBrush, SID_ATTR_BRUSH_TABLE );
 
         SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
             // table variant, when multiple table cells are selected
@@ -695,7 +695,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
         aBoxInfo.SetDefDist( MIN_BORDER_DIST );
             // Single lines can have DontCare-status only in tables
         aBoxInfo.SetValid( SvxBoxInfoItemValidFlags::DISABLE, true );
-        pTblSet->Put( aBoxInfo );
+        pTableSet->Put( aBoxInfo );
 
         SwGetCurColNumPara aPara;
         const sal_uInt16 nNum = rSh.GetCurColNum( &aPara );
@@ -704,7 +704,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
         if( nNum )
         {
             nWidth = aPara.pPrtRect->Width();
-            const SwFmtCol& rCol = aPara.pFrmFmt->GetCol();
+            const SwFormatCol& rCol = aPara.pFrameFormat->GetCol();
             const SwColumns& rCols = rCol.GetColumns();
 
             // initialise nStart und nEnd for nNum == 0
@@ -735,9 +735,9 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
         pRep->SetSpace( nWidth );
         pRep->SetWidth( nWidth );
         pRep->SetWidthPercent( 100 );
-        pTblSet->Put( SwPtrItem( FN_TABLE_REP, pRep ));
+        pTableSet->Put( SwPtrItem( FN_TABLE_REP, pRep ));
 
-        pTblSet->Put( SfxUInt16Item( SID_HTML_MODE,
+        pTableSet->Put( SfxUInt16Item( SID_HTML_MODE,
                     ::GetHtmlMode( pView->GetDocShell() )));
     }
 
@@ -763,89 +763,89 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
         pRep->SetSpace( nWidth );
         pRep->SetWidth( nWidth );
         pRep->SetWidthPercent( 100 );
-        pTblSet->Put( SwPtrItem( FN_TABLE_REP, pRep ));
+        pTableSet->Put( SwPtrItem( FN_TABLE_REP, pRep ));
     }
 
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTableTabDlg(pButton, rSh.GetAttrPool(), pTblSet, &rSh));
+    boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTableTabDlg(pButton, rSh.GetAttrPool(), pTableSet, &rSh));
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     if( RET_OK == pDlg->Execute() )
-        pTblSet->Put( *pDlg->GetOutputItemSet() );
+        pTableSet->Put( *pDlg->GetOutputItemSet() );
     else if( bNewSet )
     {
-        delete pTblSet, pTblSet = 0;
+        delete pTableSet, pTableSet = 0;
         delete pRep, pRep = 0;
     }
 
     return 0;
 }
 
-IMPL_LINK( SwInsertDBColAutoPilot, AutoFmtHdl, PushButton*, pButton )
+IMPL_LINK( SwInsertDBColAutoPilot, AutoFormatHdl, PushButton*, pButton )
 {
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pView->GetWrtShellPtr(), false, pTAutoFmt));
+    boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pView->GetWrtShellPtr(), false, pTAutoFormat));
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     if( RET_OK == pDlg->Execute())
-        pDlg->FillAutoFmtOfIndex( pTAutoFmt );
+        pDlg->FillAutoFormatOfIndex( pTAutoFormat );
     return 0;
 }
 
 IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
 {
-    ListBox* pGetBox = pBox == m_pLbDbFmtFromUsr
+    ListBox* pGetBox = pBox == m_pLbDbFormatFromUsr
                             ? ( m_pRbAsTable->IsChecked()
                                     ? ( 0 == m_pLbTableCol->GetEntryData( 0 )
-                                        ? m_pLbTblDbColumn.get()
+                                        ? m_pLbTableDbColumn.get()
                                         : m_pLbTableCol.get() )
-                                    : m_pLbTxtDbColumn.get() )
+                                    : m_pLbTextDbColumn.get() )
                             : pBox;
 
     SwInsDBColumn aSrch( pGetBox->GetSelectEntry(), 0 );
     SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
 
-    if( pBox == m_pLbDbFmtFromUsr )
+    if( pBox == m_pLbDbFormatFromUsr )
     {
         if( !aSrch.sColumn.isEmpty() )
         {
-            aOldNumFmtLnk.Call( pBox );
-            (*it)->nUsrNumFmt = m_pLbDbFmtFromUsr->GetFormat();
+            aOldNumFormatLnk.Call( pBox );
+            (*it)->nUsrNumFormat = m_pLbDbFormatFromUsr->GetFormat();
         }
     }
     else
     {
         // set the selected FieldName at the FormatGroupBox, so that
         // it's clear what field is configured by the format!
-        OUString sTxt( m_pFormatFrame->get_label().copy( 0, nGBFmtLen ));
+        OUString sText( m_pFormatFrame->get_label().copy( 0, nGBFormatLen ));
         if( aSrch.sColumn.isEmpty() )
         {
-            m_pRbDbFmtFromDb->Enable( false );
-            m_pRbDbFmtFromUsr->Enable( false );
-            m_pLbDbFmtFromUsr->Enable( false );
+            m_pRbDbFormatFromDb->Enable( false );
+            m_pRbDbFormatFromUsr->Enable( false );
+            m_pLbDbFormatFromUsr->Enable( false );
         }
         else
         {
-            bool bEnableFmt = (*it)->bHasFmt;
-            m_pRbDbFmtFromDb->Enable( bEnableFmt );
-            m_pRbDbFmtFromUsr->Enable( bEnableFmt );
+            bool bEnableFormat = (*it)->bHasFormat;
+            m_pRbDbFormatFromDb->Enable( bEnableFormat );
+            m_pRbDbFormatFromUsr->Enable( bEnableFormat );
 
-            if( bEnableFmt )
+            if( bEnableFormat )
             {
-                sTxt += " ("  + aSrch.sColumn + ")";
+                sText += " ("  + aSrch.sColumn + ")";
             }
 
-            bool bIsDBFmt = (*it)->bIsDBFmt;
-            m_pRbDbFmtFromDb->Check( bIsDBFmt );
-            m_pRbDbFmtFromUsr->Check( !bIsDBFmt );
-            m_pLbDbFmtFromUsr->Enable( !bIsDBFmt );
-            if( !bIsDBFmt )
-                m_pLbDbFmtFromUsr->SetDefFormat( (*it)->nUsrNumFmt );
+            bool bIsDBFormat = (*it)->bIsDBFormat;
+            m_pRbDbFormatFromDb->Check( bIsDBFormat );
+            m_pRbDbFormatFromUsr->Check( !bIsDBFormat );
+            m_pLbDbFormatFromUsr->Enable( !bIsDBFormat );
+            if( !bIsDBFormat )
+                m_pLbDbFormatFromUsr->SetDefFormat( (*it)->nUsrNumFormat );
         }
 
-        m_pFormatFrame->set_label(sTxt);
+        m_pFormatFrame->set_label(sText);
 
         // to know later on, what ListBox was the "active", a Flag
         // is remembered in the 1st entry
@@ -867,45 +867,45 @@ IMPL_LINK( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton )
     return 0;
 }
 
-static void lcl_InsTextInArr( const OUString& rTxt, _DB_Columns& rColArr )
+static void lcl_InsTextInArr( const OUString& rText, _DB_Columns& rColArr )
 {
     _DB_Column* pNew;
     sal_Int32 nSttPos = 0, nFndPos;
-    while( -1 != ( nFndPos = rTxt.indexOf( '\x0A', nSttPos )) )
+    while( -1 != ( nFndPos = rText.indexOf( '\x0A', nSttPos )) )
     {
         if( 1 < nFndPos )
         {
-            pNew = new _DB_Column( rTxt.copy( nSttPos, nFndPos -1 ) );
+            pNew = new _DB_Column( rText.copy( nSttPos, nFndPos -1 ) );
             rColArr.push_back( pNew );
         }
         pNew = new _DB_Column;
         rColArr.push_back( pNew );
         nSttPos = nFndPos + 1;
     }
-    if( nSttPos < rTxt.getLength() )
+    if( nSttPos < rText.getLength() )
     {
-        pNew = new _DB_Column( rTxt.copy( nSttPos ) );
+        pNew = new _DB_Column( rText.copy( nSttPos ) );
         rColArr.push_back( pNew );
     }
 }
 
-bool SwInsertDBColAutoPilot::SplitTextToColArr( const OUString& rTxt,
+bool SwInsertDBColAutoPilot::SplitTextToColArr( const OUString& rText,
                                 _DB_Columns& rColArr,
                                 bool bInsField )
 {
     // create each of the database columns from the text again
     // and then save in an array
     // database columns are in <> and must be present in the columns' array:
-    OUString sTxt( rTxt );
+    OUString sText( rText );
     sal_Int32 nFndPos, nEndPos, nSttPos = 0;
 
-    while( -1 != ( nFndPos = sTxt.indexOf( cDBFldStart, nSttPos )))
+    while( -1 != ( nFndPos = sText.indexOf( cDBFieldStart, nSttPos )))
     {
         nSttPos = nFndPos + 1;
-        if( -1 != ( nEndPos = sTxt.indexOf( cDBFldEnd, nSttPos+1 )))
+        if( -1 != ( nEndPos = sText.indexOf( cDBFieldEnd, nSttPos+1 )))
         {
             // Text in <> brackets found: what is it:
-            SwInsDBColumn aSrch( sTxt.copy( nSttPos, nEndPos - nSttPos ), 0);
+            SwInsDBColumn aSrch( sText.copy( nSttPos, nEndPos - nSttPos ), 0);
             SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
             if( it != aDBColumns.end() )
             {
@@ -917,22 +917,22 @@ bool SwInsertDBColAutoPilot::SplitTextToColArr( const OUString& rTxt,
 
                 if( 1 < nSttPos )
                 {
-                    ::lcl_InsTextInArr( sTxt.copy( 0, nSttPos-1 ), rColArr );
-                    sTxt = sTxt.copy( nSttPos-1 );
+                    ::lcl_InsTextInArr( sText.copy( 0, nSttPos-1 ), rColArr );
+                    sText = sText.copy( nSttPos-1 );
                 }
 
-                sTxt = sTxt.copy( rFndCol.sColumn.getLength() + 2 );
+                sText = sText.copy( rFndCol.sColumn.getLength() + 2 );
                 nSttPos = 0;
 
                 sal_uInt16 nSubType = 0;
                 sal_uLong nFormat;
-                if( rFndCol.bHasFmt )
+                if( rFndCol.bHasFormat )
                 {
-                    if( rFndCol.bIsDBFmt )
-                        nFormat =  rFndCol.nDBNumFmt;
+                    if( rFndCol.bIsDBFormat )
+                        nFormat =  rFndCol.nDBNumFormat;
                     else
                     {
-                        nFormat = rFndCol.nUsrNumFmt;
+                        nFormat = rFndCol.nUsrNumFormat;
                         nSubType = nsSwExtendedSubType::SUB_OWN_FMT;
                     }
                 }
@@ -942,10 +942,10 @@ bool SwInsertDBColAutoPilot::SplitTextToColArr( const OUString& rTxt,
                 if( bInsField )
                 {
                     SwWrtShell& rSh = pView->GetWrtShell();
-                    SwDBFieldType aFldType( rSh.GetDoc(), aSrch.sColumn,
+                    SwDBFieldType aFieldType( rSh.GetDoc(), aSrch.sColumn,
                                             aDBData );
                     pNew = new _DB_Column( rFndCol, *new SwDBField(
-                            static_cast<SwDBFieldType*>(rSh.InsertFldType( aFldType )),
+                            static_cast<SwDBFieldType*>(rSh.InsertFieldType( aFieldType )),
                                                             nFormat ) );
                     if( nSubType )
                         pNew->DB_ColumnData.pField->SetSubType( nSubType );
@@ -959,8 +959,8 @@ bool SwInsertDBColAutoPilot::SplitTextToColArr( const OUString& rTxt,
     }
 
     // don't forget the last text
-    if( !sTxt.isEmpty() )
-        ::lcl_InsTextInArr( sTxt, rColArr );
+    if( !sText.isEmpty() )
+        ::lcl_InsTextInArr( sText, rColArr );
 
     return !rColArr.empty();
 }
@@ -992,7 +992,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
         rSh.StartUndo( UNDO_EMPTY );
 
     bool bAsTable = m_pRbAsTable->IsChecked();
-    SvNumberFormatter& rNumFmtr = *rSh.GetNumberFormatter();
+    SvNumberFormatter& rNumFormatr = *rSh.GetNumberFormatter();
 
     if( rSh.HasSelection() )
         rSh.DelRight();
@@ -1018,22 +1018,22 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
             ++nRows;
 
         // prepare the array for the selected columns
-        std::vector<SwInsDBColumn*> aColFlds;
+        std::vector<SwInsDBColumn*> aColFields;
         for( sal_Int32 n = 0; n < nCols; ++n )
         {
             SwInsDBColumn aSrch( m_pLbTableCol->GetEntry( n ), 0 );
             SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
             if (it != aDBColumns.end())
-                aColFlds.push_back(*it);
+                aColFields.push_back(*it);
             else {
                 OSL_ENSURE( false, "database column not found" );
             }
         }
 
-        if( static_cast<size_t>(nCols) != aColFlds.size() )
+        if( static_cast<size_t>(nCols) != aColFields.size() )
         {
             OSL_ENSURE( false, "not all database columns found" );
-            nCols = static_cast<sal_Int32>(aColFlds.size());
+            nCols = static_cast<sal_Int32>(aColFields.size());
         }
 
         if(!nRows || !nCols)
@@ -1046,14 +1046,14 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
 
         bool bHTML = 0 != (::GetHtmlMode( pView->GetDocShell() ) & HTMLMODE_ON);
         rSh.InsertTable(
-            pModOpt->GetInsTblFlags(bHTML),
-            nRows, nCols, text::HoriOrientation::FULL, (pSelection ? pTAutoFmt : 0) );
+            pModOpt->GetInsTableFlags(bHTML),
+            nRows, nCols, text::HoriOrientation::FULL, (pSelection ? pTAutoFormat : 0) );
         rSh.MoveTable( GetfnTablePrev(), GetfnTableStart() );
 
-        if( pSelection && pTblSet )
+        if( pSelection && pTableSet )
             SetTabSet();
 
-        SfxItemSet aTblSet( rSh.GetAttrPool(), RES_BOXATR_FORMAT,
+        SfxItemSet aTableSet( rSh.GetAttrPool(), RES_BOXATR_FORMAT,
                                                 RES_BOXATR_VALUE );
         bool bIsAutoUpdateCells = rSh.IsAutoUpdateCells();
         rSh.SetAutoUpdateCells( false );
@@ -1064,7 +1064,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
             {
                 if( m_pRbHeadlColnms->IsChecked() )
                 {
-                    rSh.SwEditShell::Insert2( aColFlds[ n ]->sColumn );
+                    rSh.SwEditShell::Insert2( aColFields[ n ]->sColumn );
                 }
                 rSh.GoNextCell();
             }
@@ -1101,7 +1101,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                 if( i || n )
                     rSh.GoNextCell();
 
-                const SwInsDBColumn* pEntry = aColFlds[ n ];
+                const SwInsDBColumn* pEntry = aColFields[ n ];
 
                 Reference< XColumn > xColumn;
                 xCols->getByName(pEntry->sColumn) >>= xColumn;
@@ -1114,31 +1114,31 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                 }
                 try
                 {
-                    if( pEntry->bHasFmt )
+                    if( pEntry->bHasFormat )
                     {
-                        SwTblBoxNumFormat aNumFmt(
-                                        pEntry->bIsDBFmt ? pEntry->nDBNumFmt
-                                                         : pEntry->nUsrNumFmt );
-                        aTblSet.Put(aNumFmt);
+                        SwTableBoxNumFormat aNumFormat(
+                                        pEntry->bIsDBFormat ? pEntry->nDBNumFormat
+                                                         : pEntry->nUsrNumFormat );
+                        aTableSet.Put(aNumFormat);
                         if( xColumn.is() )
                         {
                             double fVal = xColumn->getDouble();
                             if( xColumn->wasNull() )
-                                aTblSet.ClearItem( RES_BOXATR_VALUE );
+                                aTableSet.ClearItem( RES_BOXATR_VALUE );
                             else
                             {
-                                if(rNumFmtr.GetType(aNumFmt.GetValue()) & css::util::NumberFormat::DATE)
+                                if(rNumFormatr.GetType(aNumFormat.GetValue()) & css::util::NumberFormat::DATE)
                                 {
                                     ::Date aStandard(1,1,1900);
-                                    if (*rNumFmtr.GetNullDate() != aStandard)
-                                        fVal += (aStandard - *rNumFmtr.GetNullDate());
+                                    if (*rNumFormatr.GetNullDate() != aStandard)
+                                        fVal += (aStandard - *rNumFormatr.GetNullDate());
                                 }
-                                aTblSet.Put( SwTblBoxValue( fVal ));
+                                aTableSet.Put( SwTableBoxValue( fVal ));
                             }
                         }
                         else
-                            aTblSet.ClearItem( RES_BOXATR_VALUE );
-                        rSh.SetTblBoxFormulaAttrs( aTblSet );
+                            aTableSet.ClearItem( RES_BOXATR_VALUE );
+                        rSh.SetTableBoxFormulaAttrs( aTableSet );
                     }
                     //#i60207# don't insert binary data as string - creates a loop
                     else if( DataType::BINARY       == eDataType ||
@@ -1186,13 +1186,13 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
         }
 
         rSh.MoveTable( GetfnTableCurr(), GetfnTableStart() );
-        if( !pSelection && ( pTblSet || pTAutoFmt ))
+        if( !pSelection && ( pTableSet || pTAutoFormat ))
         {
-            if( pTblSet )
+            if( pTableSet )
                 SetTabSet();
 
-            if( pTAutoFmt )
-                rSh.SetTableAutoFmt( *pTAutoFmt );
+            if( pTAutoFormat )
+                rSh.SetTableAutoFormat( *pTAutoFormat );
         }
         rSh.SetAutoUpdateCells( bIsAutoUpdateCells );
     }
@@ -1214,22 +1214,22 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
 
             rSh.DoUndo( false );
 
-            SwTxtFmtColl* pColl = 0;
+            SwTextFormatColl* pColl = 0;
             {
                 const OUString sTmplNm( m_pLbDbParaColl->GetSelectEntry() );
                 if( sNoTmpl != sTmplNm )
                 {
-                    pColl = rSh.FindTxtFmtCollByName( sTmplNm );
+                    pColl = rSh.FindTextFormatCollByName( sTmplNm );
                     if( !pColl )
                     {
                         const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(
                             sTmplNm, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
                         if( USHRT_MAX != nId )
-                            pColl = rSh.GetTxtCollFromPool( nId );
+                            pColl = rSh.GetTextCollFromPool( nId );
                         else
-                            pColl = rSh.MakeTxtFmtColl( sTmplNm );
+                            pColl = rSh.MakeTextFormatColl( sTmplNm );
                     }
-                    rSh.SetTxtFmtColl( pColl );
+                    rSh.SetTextFormatColl( pColl );
                 }
             }
 
@@ -1258,8 +1258,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
               }
             }
             aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang() ).getLocale();
-            SwDBNextSetField aNxtDBFld( static_cast<SwDBNextSetFieldType*>(rSh.
-                                            GetFldType( 0, RES_DBNEXTSETFLD )),
+            SwDBNextSetField aNxtDBField( static_cast<SwDBNextSetFieldType*>(rSh.
+                                            GetFieldType( 0, RES_DBNEXTSETFLD )),
                                         "1", "", aDBData );
 
             bool bSetCrsr = true;
@@ -1301,20 +1301,20 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                         rSh.SplitNode();
                         // when the template is not the same as the follow template,
                         // the selected has to be set newly
-                        if( pColl && &pColl->GetNextTxtFmtColl() != pColl )
-                            rSh.SetTxtFmtColl( pColl );
+                        if( pColl && &pColl->GetNextTextFormatColl() != pColl )
+                            rSh.SetTextFormatColl( pColl );
                         break;
 
                     case _DB_Column::DB_COL_FIELD:
                         {
-                            boost::scoped_ptr<SwDBField> pFld(static_cast<SwDBField *>(
+                            boost::scoped_ptr<SwDBField> pField(static_cast<SwDBField *>(
                                 pDBCol->DB_ColumnData.pField->CopyField()));
                             double nValue = DBL_MAX;
 
                             Reference< XPropertySet > xColumnProps;
                             xCols->getByName(pDBCol->pColInfo->sColumn) >>= xColumnProps;
 
-                            pFld->SetExpansion( SwDBManager::GetDBField(
+                            pField->SetExpansion( SwDBManager::GetDBField(
                                                 xColumnProps,
                                                 aDBFormatData,
                                                 &nValue ) );
@@ -1334,11 +1334,11 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                                     if(aStandard != aCompare)
                                         nValue += (aStandard - aCompare);
                                 }
-                                pFld->ChgValue( nValue, true );
+                                pField->ChgValue( nValue, true );
                             }
-                            pFld->SetInitialized();
+                            pField->SetInitialized();
 
-                            rSh.Insert( *pFld );
+                            rSh.Insert( *pField );
                         }
                         break;
 
@@ -1355,13 +1355,13 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                                 DBL_MAX != nValue )
                             {
                                 Color* pCol;
-                                if(rNumFmtr.GetType(pDBCol->DB_ColumnData.nFormat) & css::util::NumberFormat::DATE)
+                                if(rNumFormatr.GetType(pDBCol->DB_ColumnData.nFormat) & css::util::NumberFormat::DATE)
                                 {
                                     ::Date aStandard(1,1,1900);
-                                    if (*rNumFmtr.GetNullDate() != aStandard)
-                                        nValue += (aStandard - *rNumFmtr.GetNullDate());
+                                    if (*rNumFormatr.GetNullDate() != aStandard)
+                                        nValue += (aStandard - *rNumFormatr.GetNullDate());
                                 }
-                                rNumFmtr.GetOutputString( nValue,
+                                rNumFormatr.GetOutputString( nValue,
                                             pDBCol->DB_ColumnData.nFormat,
                                             sIns, &pCol );
                             }
@@ -1402,7 +1402,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                     break;
 
                 if( m_pRbAsField->IsChecked() )
-                    rSh.Insert( aNxtDBFld );
+                    rSh.Insert( aNxtDBField );
 
                 if( !rSh.IsSttPara() )
                     rSh.SwEditShell::SplitNode();
@@ -1442,19 +1442,19 @@ void SwInsertDBColAutoPilot::SetTabSet()
     SwWrtShell& rSh = pView->GetWrtShell();
     const SfxPoolItem* pItem;
 
-    if( pTAutoFmt )
+    if( pTAutoFormat )
     {
-        if( pTAutoFmt->IsFrame() )
+        if( pTAutoFormat->IsFrame() )
         {
             // border is from AutoFormat
-            pTblSet->ClearItem( RES_BOX );
-            pTblSet->ClearItem( SID_ATTR_BORDER_INNER );
+            pTableSet->ClearItem( RES_BOX );
+            pTableSet->ClearItem( SID_ATTR_BORDER_INNER );
         }
-        if( pTAutoFmt->IsBackground() )
+        if( pTAutoFormat->IsBackground() )
         {
-            pTblSet->ClearItem( RES_BACKGROUND );
-            pTblSet->ClearItem( SID_ATTR_BRUSH_ROW );
-            pTblSet->ClearItem( SID_ATTR_BRUSH_TABLE );
+            pTableSet->ClearItem( RES_BACKGROUND );
+            pTableSet->ClearItem( SID_ATTR_BRUSH_ROW );
+            pTableSet->ClearItem( SID_ATTR_BRUSH_TABLE );
         }
     }
     else
@@ -1464,21 +1464,21 @@ void SwInsertDBColAutoPilot::SetTabSet()
         static const sal_uInt16 aIds[3] =
             { RES_BACKGROUND, SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE };
         for( int i = 0; i < 3; ++i )
-            if( SfxItemState::SET == pTblSet->GetItemState( aIds[ i ],
+            if( SfxItemState::SET == pTableSet->GetItemState( aIds[ i ],
                 false, &pItem ) && *pItem == aBrush )
-                pTblSet->ClearItem( aIds[ i ] );
+                pTableSet->ClearItem( aIds[ i ] );
     }
 
-    if( SfxItemState::SET == pTblSet->GetItemState( FN_PARAM_TABLE_NAME, false,
+    if( SfxItemState::SET == pTableSet->GetItemState( FN_PARAM_TABLE_NAME, false,
         &pItem ) && static_cast<const SfxStringItem*>(pItem)->GetValue() ==
-                    rSh.GetTableFmt()->GetName() )
-        pTblSet->ClearItem( FN_PARAM_TABLE_NAME );
+                    rSh.GetTableFormat()->GetName() )
+        pTableSet->ClearItem( FN_PARAM_TABLE_NAME );
 
     rSh.MoveTable( GetfnTableCurr(), GetfnTableStart() );
     rSh.SetMark();
     rSh.MoveTable( GetfnTableCurr(), GetfnTableEnd() );
 
-    ItemSetToTableParam( *pTblSet, rSh );
+    ItemSetToTableParam( *pTableSet, rSh );
 
     rSh.ClearMark();
     rSh.MoveTable( GetfnTableCurr(), GetfnTableStart() );
@@ -1588,8 +1588,8 @@ void SwInsertDBColAutoPilot::ImplCommit()
     if( sNoTmpl != (sTmp = m_pLbDbParaColl->GetSelectEntry()) )
         pValues[5].Value <<= sTmp;
 
-    if( pTAutoFmt )
-        pValues[6].Value <<= pTAutoFmt->GetName();
+    if( pTAutoFormat )
+        pValues[6].Value <<= pTAutoFormat->GetName();
 
     pValues[7].Value <<= m_pRbAsTable->IsChecked();
     pValues[8].Value <<= m_pRbAsField->IsChecked();
@@ -1602,7 +1602,7 @@ void SwInsertDBColAutoPilot::ImplCommit()
 
     LanguageType ePrevLang = (LanguageType)-1;
 
-    SvNumberFormatter& rNFmtr = *pView->GetWrtShell().GetNumberFormatter();
+    SvNumberFormatter& rNFormatr = *pView->GetWrtShell().GetNumberFormatter();
     for(size_t nCol = 0; nCol < aDBColumns.size(); nCol++)
     {
         SwInsDBColumn* pColumn = aDBColumns[nCol];
@@ -1623,11 +1623,11 @@ void SwInsertDBColAutoPilot::ImplCommit()
             pSubValues[i].Name = pSubNodeNames[i];
         pSubValues[0].Value <<= pColumn->sColumn;
         pSubValues[1].Value <<= i;
-        pSubValues[2].Value <<= pColumn->bHasFmt;
-        pSubValues[3].Value <<= pColumn->bIsDBFmt;
+        pSubValues[2].Value <<= pColumn->bHasFormat;
+        pSubValues[3].Value <<= pColumn->bIsDBFormat;
 
         SwStyleNameMapper::FillUIName( RES_POOLCOLL_STANDARD, sTmp );
-        const SvNumberformat* pNF = rNFmtr.GetEntry( pColumn->nUsrNumFmt );
+        const SvNumberformat* pNF = rNFormatr.GetEntry( pColumn->nUsrNumFormat );
         LanguageType eLang;
         if( pNF )
         {
@@ -1656,7 +1656,7 @@ void SwInsertDBColAutoPilot::Load()
 {
     Sequence <OUString> aNames = GetNodeNames(OUString());
     const OUString* pNames = aNames.getArray();
-    SvNumberFormatter& rNFmtr = *pView->GetWrtShell().GetNumberFormatter();
+    SvNumberFormatter& rNFormatr = *pView->GetWrtShell().GetNumberFormatter();
     for(sal_Int32 nNode = 0; nNode < aNames.getLength(); nNode++)
     {
         //search for entries with the appropriate data source and table
@@ -1676,9 +1676,9 @@ void SwInsertDBColAutoPilot::Load()
             pNewData->sTable = sCommand;
 
             pDataSourceProps[3] >>= pNewData->sEdit;
-            pDataSourceProps[4] >>= pNewData->sTblList;
+            pDataSourceProps[4] >>= pNewData->sTableList;
             pDataSourceProps[5] >>= pNewData->sTmplNm;
-            pDataSourceProps[6] >>= pNewData->sTAutoFmtNm;
+            pDataSourceProps[6] >>= pNewData->sTAutoFormatNm;
             if(pDataSourceProps[7].hasValue())
                 pNewData->bIsTable = *static_cast<sal_Bool const *>(pDataSourceProps[7].getValue());
             if(pDataSourceProps[8].hasValue())
@@ -1716,11 +1716,11 @@ void SwInsertDBColAutoPilot::Load()
                 pSubProps[1] >>= nIndex;
                 SwInsDBColumn* pInsDBColumn = new SwInsDBColumn(sColumn, nIndex);
                 if(pSubProps[2].hasValue())
-                    pInsDBColumn->bHasFmt = *static_cast<sal_Bool const *>(pSubProps[2].getValue());
+                    pInsDBColumn->bHasFormat = *static_cast<sal_Bool const *>(pSubProps[2].getValue());
                 if(pSubProps[3].hasValue())
-                    pInsDBColumn->bIsDBFmt = *static_cast<sal_Bool const *>(pSubProps[3].getValue());
+                    pInsDBColumn->bIsDBFormat = *static_cast<sal_Bool const *>(pSubProps[3].getValue());
 
-                pSubProps[4] >>= pInsDBColumn->sUsrNumFmt;
+                pSubProps[4] >>= pInsDBColumn->sUsrNumFormat;
                 OUString sNumberFormatLocale;
                 pSubProps[5] >>= sNumberFormatLocale;
 
@@ -1732,28 +1732,28 @@ void SwInsertDBColAutoPilot::Load()
                  * case-insensitive equal language/country combos that may have
                  * worked, for all others not. FIXME if you need to read old
                  * data that you were never able to read before. */
-                pInsDBColumn->eUsrNumFmtLng = LanguageTag::convertToLanguageType( sNumberFormatLocale );
+                pInsDBColumn->eUsrNumFormatLng = LanguageTag::convertToLanguageType( sNumberFormatLocale );
 
-                pInsDBColumn->nUsrNumFmt = rNFmtr.GetEntryKey( pInsDBColumn->sUsrNumFmt,
-                                                        pInsDBColumn->eUsrNumFmtLng );
+                pInsDBColumn->nUsrNumFormat = rNFormatr.GetEntryKey( pInsDBColumn->sUsrNumFormat,
+                                                        pInsDBColumn->eUsrNumFormatLng );
 
                 pNewData->aDBColumns.insert(pInsDBColumn);
             }
-            OUString sTmp( pNewData->sTblList );
+            OUString sTmp( pNewData->sTableList );
             if( !sTmp.isEmpty() )
             {
                 sal_Int32 n = 0;
                 do {
                     const OUString sEntry( sTmp.getToken( 0, '\x0a', n ) );
                     //preselect column - if they still exist!
-                    if(m_pLbTblDbColumn->GetEntryPos(sEntry) != LISTBOX_ENTRY_NOTFOUND)
+                    if(m_pLbTableDbColumn->GetEntryPos(sEntry) != LISTBOX_ENTRY_NOTFOUND)
                     {
                         m_pLbTableCol->InsertEntry( sEntry );
-                        m_pLbTblDbColumn->RemoveEntry( sEntry );
+                        m_pLbTableDbColumn->RemoveEntry( sEntry );
                     }
                 } while( n>=0 );
 
-                if( !m_pLbTblDbColumn->GetEntryCount() )
+                if( !m_pLbTableDbColumn->GetEntryCount() )
                 {
                     m_pIbDbcolAllTo->Enable( false );
                     m_pIbDbcolOneTo->Enable( false );
@@ -1769,17 +1769,17 @@ void SwInsertDBColAutoPilot::Load()
             else
                 m_pLbDbParaColl->SelectEntryPos( 0 );
 
-            delete pTAutoFmt, pTAutoFmt = 0;
-            sTmp = pNewData->sTAutoFmtNm;
+            delete pTAutoFormat, pTAutoFormat = 0;
+            sTmp = pNewData->sTAutoFormatNm;
             if( !sTmp.isEmpty() )
             {
-                // then load the AutoFmt file and look for Autoformat first
-                SwTableAutoFmtTbl aAutoFmtTbl;
-                aAutoFmtTbl.Load();
-                for( size_t nAutoFmt = aAutoFmtTbl.size(); nAutoFmt; )
-                    if( sTmp == aAutoFmtTbl[ --nAutoFmt ].GetName() )
+                // then load the AutoFormat file and look for Autoformat first
+                SwTableAutoFormatTable aAutoFormatTable;
+                aAutoFormatTable.Load();
+                for( size_t nAutoFormat = aAutoFormatTable.size(); nAutoFormat; )
+                    if( sTmp == aAutoFormatTable[ --nAutoFormat ].GetName() )
                     {
-                        pTAutoFmt = new SwTableAutoFmt( aAutoFmtTbl[ nAutoFmt ] );
+                        pTAutoFormat = new SwTableAutoFormat( aAutoFormatTable[ nAutoFormat ] );
                         break;
                     }
             }
@@ -1803,17 +1803,17 @@ void SwInsertDBColAutoPilot::Load()
                     SwInsDBColumn& rGet = *pNewData->aDBColumns[ m ];
                     if(rGet.sColumn == rSet.sColumn)
                     {
-                        if( rGet.bHasFmt && !rGet.bIsDBFmt )
+                        if( rGet.bHasFormat && !rGet.bIsDBFormat )
                         {
-                            rSet.bIsDBFmt = false;
-                            rSet.nUsrNumFmt = rNFmtr.GetEntryKey( rGet.sUsrNumFmt,
-                                                                    rGet.eUsrNumFmtLng );
-                            if( NUMBERFORMAT_ENTRY_NOT_FOUND == rSet.nUsrNumFmt )
+                            rSet.bIsDBFormat = false;
+                            rSet.nUsrNumFormat = rNFormatr.GetEntryKey( rGet.sUsrNumFormat,
+                                                                    rGet.eUsrNumFormatLng );
+                            if( NUMBERFORMAT_ENTRY_NOT_FOUND == rSet.nUsrNumFormat )
                             {
                                 sal_Int32 nCheckPos;
                                 short nType;
-                                rNFmtr.PutEntry( rGet.sUsrNumFmt, nCheckPos, nType,
-                                                rSet.nUsrNumFmt, rGet.eUsrNumFmtLng );
+                                rNFormatr.PutEntry( rGet.sUsrNumFormat, nCheckPos, nType,
+                                                rSet.nUsrNumFormat, rGet.eUsrNumFormatLng );
                             }
                         }
                         break;
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index a0f99e956e59..f13ccb01ea71 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -246,12 +246,12 @@ bool SwMailMergeLayoutPage::commitPage( ::svt::WizardTypes::CommitPageReason _eR
     return true;
 }
 
-SwFrmFmt*  SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
+SwFrameFormat*  SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
         SwMailMergeConfigItem& rConfigItem,
         const Point& rAddressPosition,
         bool bAlignToBody)
 {
-    SwFrmFmt* pAddressBlockFormat = 0;
+    SwFrameFormat* pAddressBlockFormat = 0;
     pView->GetWrtShell().StartUndo(UNDO_INSERT);
     if(rConfigItem.IsAddressBlock() && !rConfigItem.IsAddressInserted())
     {
@@ -274,7 +274,7 @@ SwFrmFmt*  SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
     return pAddressBlockFormat;
 }
 
-SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
+SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
         SwWrtShell& rShell,
         SwMailMergeConfigItem& rConfigItem,
         const Point& rDestination,
@@ -289,20 +289,20 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
                         RES_FRM_SIZE, RES_FRM_SIZE,
                         RES_SURROUND, RES_SURROUND,
                         0 );
-    aSet.Put(SwFmtAnchor(FLY_AT_PAGE, 1));
+    aSet.Put(SwFormatAnchor(FLY_AT_PAGE, 1));
     if(bAlignLeft)
-        aSet.Put(SwFmtHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::PAGE_PRINT_AREA ));
+        aSet.Put(SwFormatHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::PAGE_PRINT_AREA ));
     else
-        aSet.Put(SwFmtHoriOrient( rDestination.X(), text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-    aSet.Put(SwFmtVertOrient( rDestination.Y(), text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-    aSet.Put(SwFmtFrmSize( ATT_MIN_SIZE, DEFAULT_ADDRESS_WIDTH, DEFAULT_ADDRESS_HEIGHT ));
+        aSet.Put(SwFormatHoriOrient( rDestination.X(), text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
+    aSet.Put(SwFormatVertOrient( rDestination.Y(), text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
+    aSet.Put(SwFormatFrmSize( ATT_MIN_SIZE, DEFAULT_ADDRESS_WIDTH, DEFAULT_ADDRESS_HEIGHT ));
     // the example gets a border around the frame, the real document doesn't get one
     if(!bExample)
         aSet.Put(SvxBoxItem( RES_BOX ));
-    aSet.Put(SwFmtSurround( SURROUND_NONE ));
+    aSet.Put(SwFormatSurround( SURROUND_NONE ));
 
     rShell.NewFlyFrm(aSet, true );
-    SwFrmFmt* pRet = rShell.GetFlyFrmFmt();
+    SwFrameFormat* pRet = rShell.GetFlyFrameFormat();
     OSL_ENSURE( pRet, "Fly not inserted" );
 
     rShell.UnSelectFrm();
@@ -314,7 +314,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
     else
     {
         //the placeholders should be replaced by the appropriate fields
-        SwFldMgr aFldMgr(&rShell);
+        SwFieldMgr aFieldMgr(&rShell);
         //create a database string source.command.commandtype.column
         const SwDBData& rData = rConfigItem.GetCurrentDBData();
         OUString sDBName(rData.sDataSource + OUString(DB_DELIM)
@@ -372,22 +372,22 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
                     if( !rExcludeCountry.isEmpty() )
                     {
                         const OUString sExpression("[" + sDatabaseConditionPrefix + sCountryColumn + "]");
-                        SwInsertFld_Data aData(TYP_CONDTXTFLD, 0,
+                        SwInsertField_Data aData(TYP_CONDTXTFLD, 0,
                                                sExpression + " != \"" + rExcludeCountry + "\"",
                                                sExpression,
                                                0, &rShell );
-                        aFldMgr.InsertFld( aData );
+                        aFieldMgr.InsertField( aData );
                     }
                     else
                     {
-                        SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, "", "", 0, &rShell );
-                        aFldMgr.InsertFld( aData );
+                        SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, "", "", 0, &rShell );
+                        aFieldMgr.InsertField( aData );
                     }
                 }
                 else
                 {
-                    SwInsertFld_Data aData(TYP_DBFLD, 0, sDB, aEmptyOUStr, 0, &rShell );
-                    aFldMgr.InsertFld( aData );
+                    SwInsertField_Data aData(TYP_DBFLD, 0, sDB, aEmptyOUStr, 0, &rShell );
+                    aFieldMgr.InsertField( aData );
                 }
             }
             else if(!aItem.bIsReturn)
@@ -398,8 +398,8 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
             {
                 if(bHideEmptyParagraphs)
                 {
-                    SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell );
-                    aFldMgr.InsertFld( aData );
+                    SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell );
+                    aFieldMgr.InsertField( aData );
                 }
                 sHideParagraphsExpression.clear();
                 //now add a new paragraph
@@ -408,8 +408,8 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
         }
         if(bHideEmptyParagraphs && !sHideParagraphsExpression.isEmpty())
         {
-            SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell );
-            aFldMgr.InsertFld( aData );
+            SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell );
+            aFieldMgr.InsertField( aData );
         }
     }
     return pRet;
@@ -440,7 +440,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
         //text needs to be appended
         while(nYPos < GREETING_TOP_DISTANCE)
         {
-            if(!rShell.AppendTxtNode())
+            if(!rShell.AppendTextNode())
                 break;
             nYPos = rShell.GetCharRect().Top();
         }
@@ -475,7 +475,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
     if(bIndividual)
     {
         //lock expression fields - prevents hiding of the paragraph to insert into
-        rShell.LockExpFlds();
+        rShell.LockExpFields();
         if(bExample)
         {
             for(sal_Int8 eGender = SwMailMergeConfigItem::FEMALE;
@@ -494,7 +494,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
         }
         else
         {
-            SwFldMgr aFldMgr(&rShell);
+            SwFieldMgr aFieldMgr(&rShell);
             //three paragraphs, each with an appropriate hidden paragraph field
             //are to be inserted
 
@@ -548,13 +548,13 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
                     if(bHideEmptyParagraphs && !sHideParagraphsExpression.isEmpty())
                     {
                         OUString sComplete = "(" + sCondition + ") OR (" + sHideParagraphsExpression + ")";
-                        SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sComplete, aEmptyOUStr, 0, &rShell );
-                        aFldMgr.InsertFld( aData );
+                        SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sComplete, aEmptyOUStr, 0, &rShell );
+                        aFieldMgr.InsertField( aData );
                     }
                     else
                     {
-                        SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sCondition, aEmptyOUStr, 0, &rShell );
-                        aFldMgr.InsertFld( aData );
+                        SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sCondition, aEmptyOUStr, 0, &rShell );
+                        aFieldMgr.InsertField( aData );
                     }
                     //now the text has to be inserted
                     const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders();
@@ -580,10 +580,10 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
                                     break;
                                 }
                             }
-                            SwInsertFld_Data aData(TYP_DBFLD, 0,
+                            SwInsertField_Data aData(TYP_DBFLD, 0,
                                 sDBName + sConvertedColumn,
                                 aEmptyOUStr, 0, &rShell );
-                            aFldMgr.InsertFld( aData );
+                            aFieldMgr.InsertField( aData );
                         }
                         else
                         {
@@ -596,7 +596,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
             }
 
         }
-        rShell.UnlockExpFlds();
+        rShell.UnlockExpFields();
     }
     else
     {
@@ -616,7 +616,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
     //put the cursor to the start of the paragraph
     rShell.SttPara();
 
-    OSL_ENSURE(0 == rShell.GetTableFmt(), "What to do with a table here?");
+    OSL_ENSURE(0 == rShell.GetTableFormat(), "What to do with a table here?");
 }
 
 IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)
@@ -653,7 +653,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)
     aZoom <<= (sal_Int16)DocumentZoomType::ENTIRE_PAGE;
     m_xViewProperties->setPropertyValue(UNO_NAME_ZOOM_TYPE, aZoom);
 
-    const SwFmtFrmSize& rPageSize = m_pExampleWrtShell->GetPageDesc(
+    const SwFormatFrmSize& rPageSize = m_pExampleWrtShell->GetPageDesc(
                                      m_pExampleWrtShell->GetCurPageDesc()).GetMaster().GetFrmSize();
     m_pLeftMF->SetMax(rPageSize.GetWidth() - DEFAULT_LEFT_DISTANCE);
     m_pTopMF->SetMax(rPageSize.GetHeight() - DEFAULT_TOP_DISTANCE);
@@ -695,10 +695,10 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl)
                             RES_HORI_ORIENT, RES_HORI_ORIENT,
                             0 );
         if(m_pAlignToBodyCB->IsChecked())
-            aSet.Put(SwFmtHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::PAGE_PRINT_AREA ));
+            aSet.Put(SwFormatHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::PAGE_PRINT_AREA ));
         else
-            aSet.Put(SwFmtHoriOrient( nLeft, text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
-        aSet.Put(SwFmtVertOrient( nTop, text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
+            aSet.Put(SwFormatHoriOrient( nLeft, text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
+        aSet.Put(SwFormatVertOrient( nTop, text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
         m_pExampleWrtShell->GetDoc()->SetFlyFrmAttr( *m_pAddressBlockFormat, aSet );
     }
     return 0;
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 5b9f9a8c3cc1..a5558103dadb 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/uno/Reference.h>
 
 class SwMailMergeWizard;
-class SwFrmFmt;
+class SwFrameFormat;
 class SwOneExampleFrame;
 class SwWrtShell;
 class SwView;
@@ -57,7 +57,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
     SwWrtShell*         m_pExampleWrtShell;
 
     OUString            m_sExampleURL;
-    SwFrmFmt*           m_pAddressBlockFormat;
+    SwFrameFormat*           m_pAddressBlockFormat;
 
     bool                m_bIsGreetingInserted;
 
@@ -71,7 +71,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
     DECL_LINK(GreetingsHdl_Impl, PushButton*);
     DECL_LINK(AlignToTextHdl_Impl, CheckBox*);
 
-    static SwFrmFmt*        InsertAddressFrame(
+    static SwFrameFormat*        InsertAddressFrame(
                             SwWrtShell& rShell,
                             SwMailMergeConfigItem& rConfigItem,
                             const Point& rDestination,
@@ -86,7 +86,7 @@ public:
         virtual ~SwMailMergeLayoutPage();
     virtual void            dispose() SAL_OVERRIDE;
 
-    static SwFrmFmt*        InsertAddressAndGreeting(SwView* pView,
+    static SwFrameFormat*        InsertAddressAndGreeting(SwView* pView,
                                             SwMailMergeConfigItem& rConfigItem,
                                             const Point& rAddressPos,
                                             bool bAlignToBody);
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index db1b8e6fab00..249de7c41d3e 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -761,8 +761,8 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
             SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() );
             pTargetView->GetWrtShell().StartAction();
             SwgReaderOption aOpt;
-            aOpt.SetTxtFmts( true );
-            aOpt.SetFrmFmts( true );
+            aOpt.SetTextFormats( true );
+            aOpt.SetFrameFormats( true );
             aOpt.SetPageDescs( true );
             aOpt.SetNumRules( true );
             aOpt.SetMerge( false );
@@ -1166,8 +1166,8 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
         SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() );
         pTargetView->GetWrtShell().StartAction();
         SwgReaderOption aOpt;
-        aOpt.SetTxtFmts( true );
-        aOpt.SetFrmFmts( true );
+        aOpt.SetTextFormats( true );
+        aOpt.SetFrameFormats( true );
         aOpt.SetPageDescs( true );
         aOpt.SetNumRules( true );
         aOpt.SetMerge( false );
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 1db947e9f3d4..e81e72a214be 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -116,12 +116,12 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent,
     Reference<XTablesSupplier> xTSupplier(m_xConnection, UNO_QUERY);
     if (xTSupplier.is())
     {
-        Reference<XNameAccess> xTbls = xTSupplier->getTables();
-        Sequence<OUString> aTbls = xTbls->getElementNames();
-        const OUString* pTbls = aTbls.getConstArray();
-        for(long i = 0; i < aTbls.getLength(); i++)
+        Reference<XNameAccess> xTables = xTSupplier->getTables();
+        Sequence<OUString> aTables = xTables->getElementNames();
+        const OUString* pTables = aTables.getConstArray();
+        for(long i = 0; i < aTables.getLength(); i++)
         {
-            OUString sEntry = pTbls[i];
+            OUString sEntry = pTables[i];
             sEntry += "\t";
             sEntry += m_sTable;
             SvTreeListEntry* pEntry = m_pTable->InsertEntry(sEntry);
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index 6e2e045bd5fa..70909751a46e 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -107,7 +107,7 @@ void  SwDocStatPage::Reset(const SfxItemSet *)
 void SwDocStatPage::SetData(const SwDocStat &rStat)
 {
     const LocaleDataWrapper& rLocaleData = GetSettings().GetUILocaleDataWrapper();
-    m_pTableNo->SetText(rLocaleData.getNum(rStat.nTbl, 0));
+    m_pTableNo->SetText(rLocaleData.getNum(rStat.nTable, 0));
     m_pGrfNo->SetText(rLocaleData.getNum(rStat.nGrf, 0));
     m_pOLENo->SetText(rLocaleData.getNum(rStat.nOLE, 0));
     m_pPageNo->SetText(rLocaleData.getNum(rStat.nPage, 0));
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 9bbd471bface..5eadf9a3f2e8 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -91,7 +91,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
                                 SW_EVENT_OBJECT_SELECT );
         }
         // no break;
-    case MACASSGN_INETFMT:          // INetFmt-Attributes
+    case MACASSGN_INETFMT:          // INetFormat-Attributes
         {
             aItem.AddEvent( OUString( SW_RES(STR_EVENT_MOUSEOVER_OBJECT) ), OUString(),
                                 SFX_EVENT_MOUSEOVER_OBJECT );
@@ -106,7 +106,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
     return aItem;
 }
 
-bool SwMacroAssignDlg::INetFmtDlg( vcl::Window* pParent, SwWrtShell& rSh,
+bool SwMacroAssignDlg::INetFormatDlg( vcl::Window* pParent, SwWrtShell& rSh,
                                     SvxMacroItem*& rpINetItem )
 {
     bool bRet = false;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 28d8bbd25233..cd993247d8a2 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -108,11 +108,11 @@ IMPL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractSwLabDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractSwFldDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwFieldDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractFldInputDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractFieldInputDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractInsTableDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl);
@@ -224,10 +224,10 @@ sal_uInt16 AbstractSwBreakDlg_Impl:: GetKind()
     return pDlg->GetPageNumber();
 }
 
-void AbstractSwConvertTableDlg_Impl::GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTblFlags,
-                                                SwTableAutoFmt const*& prTAFmt)
+void AbstractSwConvertTableDlg_Impl::GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTableFlags,
+                                                SwTableAutoFormat const*& prTAFormat)
 {
-    pDlg->GetValues(rDelim,rInsTblFlags, prTAFmt);
+    pDlg->GetValues(rDelim,rInsTableFlags, prTAFormat);
 }
 
 void AbstractSwInsertDBColAutoPilot_Impl::DataToDoc( const uno::Sequence< uno::Any >& rSelection,
@@ -308,72 +308,72 @@ void AbstractSwSelGlossaryDlg_Impl::SelectEntryPos(sal_Int32 nIdx)
     pDlg->SelectEntryPos( nIdx );
 }
 
-void AbstractSwAutoFormatDlg_Impl::FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const
+void AbstractSwAutoFormatDlg_Impl::FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const
 {
-    pDlg->FillAutoFmtOfIndex(rToFill);
+    pDlg->FillAutoFormatOfIndex(rToFill);
 }
 
-void AbstractSwFldDlg_Impl::SetCurPageId( sal_uInt16 nId )
+void AbstractSwFieldDlg_Impl::SetCurPageId( sal_uInt16 nId )
 {
     pDlg->SetCurPageId( nId );
 }
 
-void AbstractSwFldDlg_Impl::SetCurPageId( const OString &rName )
+void AbstractSwFieldDlg_Impl::SetCurPageId( const OString &rName )
 {
     pDlg->SetCurPageId( rName );
 }
 
-const SfxItemSet* AbstractSwFldDlg_Impl::GetOutputItemSet() const
+const SfxItemSet* AbstractSwFieldDlg_Impl::GetOutputItemSet() const
 {
     return pDlg->GetOutputItemSet();
 }
 
-const sal_uInt16* AbstractSwFldDlg_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractSwFieldDlg_Impl::GetInputRanges(const SfxItemPool& pItem )
 {
     return pDlg->GetInputRanges( pItem );
 }
 
-void AbstractSwFldDlg_Impl::SetInputSet( const SfxItemSet* pInSet )
+void AbstractSwFieldDlg_Impl::SetInputSet( const SfxItemSet* pInSet )
 {
      pDlg->SetInputSet( pInSet );
 }
 
-void AbstractSwFldDlg_Impl::SetText( const OUString& rStr )
+void AbstractSwFieldDlg_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
 
-OUString AbstractSwFldDlg_Impl::GetText() const
+OUString AbstractSwFieldDlg_Impl::GetText() const
 {
     return pDlg->GetText();
 }
 
-void AbstractSwFldDlg_Impl::Start( bool bShowl )
+void AbstractSwFieldDlg_Impl::Start( bool bShowl )
 {
     pDlg->Start( bShowl );
 }
 
-void AbstractSwFldDlg_Impl::Initialize(SfxChildWinInfo *pInfo)
+void AbstractSwFieldDlg_Impl::Initialize(SfxChildWinInfo *pInfo)
 {
     pDlg->Initialize( pInfo );
 }
 
-void AbstractSwFldDlg_Impl::ReInitDlg()
+void AbstractSwFieldDlg_Impl::ReInitDlg()
 {
     pDlg->ReInitDlg();
 }
 
-void AbstractSwFldDlg_Impl::ActivateDatabasePage()
+void AbstractSwFieldDlg_Impl::ActivateDatabasePage()
 {
     pDlg->ActivateDatabasePage();
 }
 
-vcl::Window* AbstractSwFldDlg_Impl::GetWindow()
+vcl::Window* AbstractSwFieldDlg_Impl::GetWindow()
 {
     return (vcl::Window*)pDlg;
 }
 
-void AbstractSwFldDlg_Impl::ShowReferencePage()
+void AbstractSwFieldDlg_Impl::ShowReferencePage()
 {
     pDlg->ShowReferencePage();
 }
@@ -405,17 +405,17 @@ OUString AbstractGlossaryDlg_Impl::GetCurrShortName() const
     return pDlg->GetCurrShortName();
 }
 
-void AbstractFldInputDlg_Impl::SetWindowState( const OString& rStr )
+void AbstractFieldInputDlg_Impl::SetWindowState( const OString& rStr )
 {
     pDlg->SetWindowState( rStr );
 }
 
-OString AbstractFldInputDlg_Impl::GetWindowState( sal_uLong nMask ) const
+OString AbstractFieldInputDlg_Impl::GetWindowState( sal_uLong nMask ) const
 {
     return pDlg->GetWindowState( nMask );
 }
 
-void AbstractFldInputDlg_Impl::EndDialog(long n)
+void AbstractFieldInputDlg_Impl::EndDialog(long n)
 {
     pDlg->EndDialog(n);
 }
@@ -446,10 +446,10 @@ void AbstractInsFootNoteDlg_Impl::SetText( const OUString& rStr )
 }
 
 void AbstractInsTableDlg_Impl::GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                                SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName,
-                                SwTableAutoFmt *& prTAFmt )
+                                SwInsertTableOptions& rInsTableFlags, OUString& rTableAutoFormatName,
+                                SwTableAutoFormat *& prTAFormat )
 {
-    pDlg->GetValues( rName, rRow, rCol, rInsTblFlags, rTableAutoFmtName, prTAFmt);
+    pDlg->GetValues( rName, rRow, rCol, rInsTableFlags, rTableAutoFormatName, prTAFormat);
 }
 
 OUString AbstractJavaEditDialog_Impl::GetScriptText() const
@@ -666,7 +666,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* p
             pDlg = VclPtr<SwBackgroundDlg>::Create( pParent, rSet );
             break;
         case RC_DLG_SWNUMFMTDLG :
-            pDlg = VclPtr<SwNumFmtDlg>::Create( pParent, rSet );
+            pDlg = VclPtr<SwNumFormatDlg>::Create( pParent, rSet );
             break;
         default:
             break;
@@ -720,9 +720,9 @@ VclAbstractDialog   * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg(SwView&
 }
 
 SfxAbstractTabDialog *  SwAbstractDialogFactory_Impl::CreateSwCharDlg(vcl::Window* pParent, SwView& pVw,
-    const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr)
+    const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFormatStr)
 {
-    VclPtr<SfxTabDialog> pDlg = VclPtr<SwCharDlg>::Create(pParent, pVw, rCoreSet, nDialogMode, pFmtStr);
+    VclPtr<SfxTabDialog> pDlg = VclPtr<SwCharDlg>::Create(pParent, pVw, rCoreSet, nDialogMode, pFormatStr);
     return new AbstractTabDialog_Impl(pDlg);
 }
 
@@ -829,9 +829,9 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclAbstractDialog ( vcl:
     return 0;
 }
 
-AbstractSplitTableDialog * SwAbstractDialogFactory_Impl::CreateSplitTblDialog ( vcl::Window *pParent, SwWrtShell &rSh )
+AbstractSplitTableDialog * SwAbstractDialogFactory_Impl::CreateSplitTableDialog ( vcl::Window *pParent, SwWrtShell &rSh )
 {
-    return new AbstractSplitTableDialog_Impl( VclPtr<SwSplitTblDlg>::Create( pParent, rSh) );
+    return new AbstractSplitTableDialog_Impl( VclPtr<SwSplitTableDlg>::Create( pParent, rSh) );
 }
 
 AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName)
@@ -841,9 +841,9 @@ AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(
 }
 
 AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(vcl::Window* pParent,
-    SwWrtShell* pShell, bool bSetAutoFmt, const SwTableAutoFmt* pSelFmt)
+    SwWrtShell* pShell, bool bSetAutoFormat, const SwTableAutoFormat* pSelFormat)
 {
-    VclPtr<SwAutoFormatDlg> pDlg = VclPtr<SwAutoFormatDlg>::Create(pParent, pShell, bSetAutoFmt, pSelFmt);
+    VclPtr<SwAutoFormatDlg> pDlg = VclPtr<SwAutoFormatDlg>::Create(pParent, pShell, bSetAutoFormat, pSelFormat);
     return new AbstractSwAutoFormatDlg_Impl(pDlg);
 }
 
@@ -894,19 +894,19 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(vcl::Win
     return new AbstractTabDialog_Impl(pDlg);
 }
 
-AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent)
+AbstractSwFieldDlg * SwAbstractDialogFactory_Impl::CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent)
 {
-    VclPtr<SwFldDlg> pDlg = VclPtr<SwFldDlg>::Create(pB, pCW, pParent);
-    return new AbstractSwFldDlg_Impl(pDlg);
+    VclPtr<SwFieldDlg> pDlg = VclPtr<SwFieldDlg>::Create(pB, pCW, pParent);
+    return new AbstractSwFieldDlg_Impl(pDlg);
 }
 
-SfxAbstractDialog*   SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& rVw, int nResId )
+SfxAbstractDialog*   SwAbstractDialogFactory_Impl::CreateSwFieldEditDlg ( SwView& rVw, int nResId )
 {
     VclPtr<SfxModalDialog> pDlg;
     switch ( nResId )
     {
         case RC_DLG_SWFLDEDITDLG :
-            pDlg = VclPtr<SwFldEditDlg>::Create( rVw );
+            pDlg = VclPtr<SwFieldEditDlg>::Create( rVw );
             break;
         default:
             break;
@@ -931,9 +931,9 @@ AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRed
     return new AbstractSwModalRedlineAcceptDlg_Impl( pDlg );
 }
 
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(vcl::Window* pParent, bool& rWithPrev)
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTableMergeDialog(vcl::Window* pParent, bool& rWithPrev)
 {
-    VclPtr<Dialog> pDlg = VclPtr<SwMergeTblDlg>::Create( pParent, rWithPrev );
+    VclPtr<Dialog> pDlg = VclPtr<SwMergeTableDlg>::Create( pParent, rWithPrev );
     return new VclAbstractDialog_Impl( pDlg );
 }
 
@@ -941,11 +941,11 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog(const OUS
                                                 SfxViewFrame *pFrame, vcl::Window *pParent,
                                                 const SfxItemSet& rCoreSet,
                                                 bool        bNewFrm,
-                                                bool        bFmt,
+                                                bool        bFormat,
                                                 const OString&  sDefPage,
-                                                const OUString* pFmtStr )
+                                                const OUString* pFormatStr )
 {
-    VclPtr<SfxTabDialog> pDlg = VclPtr<SwFrmDlg>::Create(pFrame, pParent, rCoreSet, bNewFrm, rDialogType, bFmt, sDefPage, pFmtStr);
+    VclPtr<SfxTabDialog> pDlg = VclPtr<SwFrmDlg>::Create(pFrame, pParent, rCoreSet, bNewFrm, rDialogType, bFormat, sDefPage, pFormatStr);
     return new AbstractTabDialog_Impl(pDlg);
 }
 
@@ -969,11 +969,11 @@ AbstractGlossaryDlg* SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFram
     return new AbstractGlossaryDlg_Impl( pDlg );
 }
 
-AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(vcl::Window *pParent,
+AbstractFieldInputDlg* SwAbstractDialogFactory_Impl::CreateFieldInputDlg(vcl::Window *pParent,
     SwWrtShell &rSh, SwField* pField, bool bNextButton)
 {
-    VclPtr<SwFldInputDlg> pDlg = VclPtr<SwFldInputDlg>::Create( pParent, rSh, pField, bNextButton );
-    return new AbstractFldInputDlg_Impl( pDlg );
+    VclPtr<SwFieldInputDlg> pDlg = VclPtr<SwFieldInputDlg>::Create( pParent, rSh, pField, bNextButton );
+    return new AbstractFieldInputDlg_Impl( pDlg );
 }
 
 AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg(
@@ -1011,7 +1011,7 @@ AbstractJavaEditDialog * SwAbstractDialogFactory_Impl::CreateJavaEditDialog(
 AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nResId,
                                                 vcl::Window* pParent, SwWrtShell& rSh,
                                                 const OUString& rSourceName,
-                                                const OUString& rTblName,
+                                                const OUString& rTableName,
                                                 sal_Int32 nCommandType,
                                                 const uno::Reference< sdbc::XConnection>& xConnection,
                                                 uno::Sequence< uno::Any >* pSelection )
@@ -1020,7 +1020,7 @@ AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nRe
     switch ( nResId )
     {
         case DLG_MAILMERGE :
-            pDlg = VclPtr<SwMailMergeDlg>::Create( pParent, rSh, rSourceName, rTblName, nCommandType, xConnection, pSelection );
+            pDlg = VclPtr<SwMailMergeDlg>::Create( pParent, rSh, rSourceName, rTableName, nCommandType, xConnection, pSelection );
             break;
         default:
             break;
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 7ef801594e14..8ff7d381390b 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -31,11 +31,11 @@ class SwInsertDBColAutoPilot;
 class SwLabDlg;
 class SwSelGlossaryDlg;
 class SwAutoFormatDlg;
-class SwFldDlg;
+class SwFieldDlg;
 class SwRenameXNamedDlg;
 class SwModalRedlineAcceptDlg;
 class SwTOXMark;
-class SwSplitTblDlg;
+class SwSplitTableDlg;
 
 #include "itabenum.hxx"
 
@@ -111,7 +111,7 @@ class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
 };
 class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
 {
-    DECL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl, SwSplitTblDlg)
+    DECL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl, SwSplitTableDlg)
     virtual sal_uInt16 GetSplitMode() SAL_OVERRIDE;
 };
 
@@ -144,8 +144,8 @@ private:
 class AbstractSwConvertTableDlg_Impl :  public AbstractSwConvertTableDlg
 {
     DECL_ABSTDLG_BASE( AbstractSwConvertTableDlg_Impl,SwConvertTableDlg)
-    virtual void GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTblFlags,
-                    SwTableAutoFmt const*& prTAFmt) SAL_OVERRIDE;
+    virtual void GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTableFlags,
+                    SwTableAutoFormat const*& prTAFormat) SAL_OVERRIDE;
 };
 
 class AbstractSwInsertDBColAutoPilot_Impl :  public AbstractSwInsertDBColAutoPilot
@@ -190,12 +190,12 @@ class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
 class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl,SwAutoFormatDlg )
-    virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const SAL_OVERRIDE;
+    virtual void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const SAL_OVERRIDE;
 };
 
-class AbstractSwFldDlg_Impl : public AbstractSwFldDlg
+class AbstractSwFieldDlg_Impl : public AbstractSwFieldDlg
 {
-    DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg )
+    DECL_ABSTDLG_BASE(AbstractSwFieldDlg_Impl,SwFieldDlg )
     virtual void                SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
     virtual void                SetCurPageId( const OString &rName ) SAL_OVERRIDE;
     virtual const SfxItemSet*   GetOutputItemSet() const SAL_OVERRIDE;
@@ -235,10 +235,10 @@ class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg
     virtual OUString        GetCurrShortName() const SAL_OVERRIDE;
 };
 
-class SwFldInputDlg;
-class AbstractFldInputDlg_Impl : public AbstractFldInputDlg
+class SwFieldInputDlg;
+class AbstractFieldInputDlg_Impl : public AbstractFieldInputDlg
 {
-    DECL_ABSTDLG_BASE(AbstractFldInputDlg_Impl,SwFldInputDlg)
+    DECL_ABSTDLG_BASE(AbstractFieldInputDlg_Impl,SwFieldInputDlg)
     //from class SalFrame
     virtual void         SetWindowState( const OString & rStr ) SAL_OVERRIDE ;
     virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const SAL_OVERRIDE ;
@@ -262,8 +262,8 @@ class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
 {
     DECL_ABSTDLG_BASE(AbstractInsTableDlg_Impl,SwInsTableDlg)
     virtual void            GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                                SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName,
-                                SwTableAutoFmt *& prTAFmt ) SAL_OVERRIDE;
+                                SwInsertTableOptions& rInsTableFlags, OUString& rTableAutoFormatName,
+                                SwTableAutoFormat *& prTAFormat ) SAL_OVERRIDE;
 };
 
 class SwJavaEditDialog;
@@ -388,7 +388,7 @@ public:
     virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE;
     virtual VclAbstractDialog   * CreateSwChangeDBDlg(SwView& rVw) SAL_OVERRIDE;
     virtual SfxAbstractTabDialog *  CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
-        sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) SAL_OVERRIDE;
+        sal_uInt8 nDialogMode, const OUString* pFormatStr = 0) SAL_OVERRIDE;
     virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) SAL_OVERRIDE;
     virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) SAL_OVERRIDE;
 
@@ -415,32 +415,32 @@ public:
 
     virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) SAL_OVERRIDE;
     virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) SAL_OVERRIDE;
-    virtual AbstractSplitTableDialog * CreateSplitTblDialog ( vcl::Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE;
+    virtual AbstractSplitTableDialog * CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE;
 
     virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell,
-                                                            bool bSetAutoFmt = true,
-                                                            const SwTableAutoFmt* pSelFmt = 0 ) SAL_OVERRIDE;
+                                                            bool bSetAutoFormat = true,
+                                                            const SwTableAutoFormat* pSelFormat = 0 ) SAL_OVERRIDE;
     virtual SfxAbstractDialog * CreateSwBorderDlg (vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) SAL_OVERRIDE;
 
     virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) SAL_OVERRIDE;
     virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) SAL_OVERRIDE;
     virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool,
         const SfxItemSet* pItemSet, SwWrtShell* pSh) SAL_OVERRIDE;
-    virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) SAL_OVERRIDE;
-    virtual SfxAbstractDialog*   CreateSwFldEditDlg ( SwView& rVw, int nResId ) SAL_OVERRIDE;
+    virtual AbstractSwFieldDlg * CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) SAL_OVERRIDE;
+    virtual SfxAbstractDialog*   CreateSwFieldEditDlg ( SwView& rVw, int nResId ) SAL_OVERRIDE;
     virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) SAL_OVERRIDE;
     virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) SAL_OVERRIDE;
 
-    virtual VclAbstractDialog*          CreateTblMergeDialog(vcl::Window* pParent, bool& rWithPrev) SAL_OVERRIDE;
+    virtual VclAbstractDialog*          CreateTableMergeDialog(vcl::Window* pParent, bool& rWithPrev) SAL_OVERRIDE;
     virtual SfxAbstractTabDialog*       CreateFrmTabDialog( const OUString &rDialogType,
                                                 SfxViewFrame *pFrame, vcl::Window *pParent,
                                                 const SfxItemSet& rCoreSet,
                                                 bool bNewFrm  = true,
-                                                bool bFmt     = false,
+                                                bool bFormat     = false,
                                                 const OString& sDefPage = OString(),
-                                                const OUString*   pFmtStr  = 0) SAL_OVERRIDE;
+                                                const OUString*   pFormatStr  = 0) SAL_OVERRIDE;
     virtual SfxAbstractApplyTabDialog*  CreateTemplateDialog(
                                                 vcl::Window*             pParent,
                                                 SfxStyleSheetBase&  rBase,
@@ -451,7 +451,7 @@ public:
     virtual AbstractGlossaryDlg*        CreateGlossaryDlg(SfxViewFrame* pViewFrame,
                                                 SwGlossaryHdl* pGlosHdl,
                                                 SwWrtShell *pWrtShell) SAL_OVERRIDE;
-    virtual AbstractFldInputDlg*        CreateFldInputDlg(vcl::Window *pParent,
+    virtual AbstractFieldInputDlg*        CreateFieldInputDlg(vcl::Window *pParent,
         SwWrtShell &rSh, SwField* pField, bool bNextButton = false) SAL_OVERRIDE;
     virtual AbstractInsFootNoteDlg*     CreateInsFootNoteDlg(
         vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false) SAL_OVERRIDE;
@@ -463,7 +463,7 @@ public:
     virtual AbstractMailMergeDlg*       CreateMailMergeDlg( int nResId,
                                                 vcl::Window* pParent, SwWrtShell& rSh,
                                                 const OUString& rSourceName,
-                                                const OUString& rTblName,
+                                                const OUString& rTableName,
                                                 sal_Int32 nCommandType,
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
                                                 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) SAL_OVERRIDE;
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 2ffb988b9c86..b2bc81e08cbd 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -69,47 +69,47 @@ using namespace ::com::sun::star;
 
 static void   lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox );
 
-static void lcl_FillList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pAvailNames, const SwSectionFmt* pNewFmt )
+static void lcl_FillList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pAvailNames, const SwSectionFormat* pNewFormat )
 {
-    if( !pNewFmt )
+    if( !pNewFormat )
     {
-        const size_t nCount = rSh.GetSectionFmtCount();
+        const size_t nCount = rSh.GetSectionFormatCount();
         for (size_t i = 0; i<nCount; i++)
         {
             SectionType eTmpType;
-            const SwSectionFmt* pFmt = &rSh.GetSectionFmt(i);
-            if( !pFmt->GetParent() &&
-                    pFmt->IsInNodesArr() &&
-                    (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+            const SwSectionFormat* pFormat = &rSh.GetSectionFormat(i);
+            if( !pFormat->GetParent() &&
+                    pFormat->IsInNodesArr() &&
+                    (eTmpType = pFormat->GetSection()->GetType()) != TOX_CONTENT_SECTION
                     && TOX_HEADER_SECTION != eTmpType )
             {
-                    const OUString sString(pFmt->GetSection()->GetSectionName());
+                    const OUString sString(pFormat->GetSection()->GetSectionName());
                     if(pAvailNames)
                         pAvailNames->InsertEntry(sString);
                     rSubRegions.InsertEntry(sString);
-                    lcl_FillList( rSh, rSubRegions, pAvailNames, pFmt );
+                    lcl_FillList( rSh, rSubRegions, pAvailNames, pFormat );
             }
         }
     }
     else
     {
         SwSections aTmpArr;
-        pNewFmt->GetChildSections(aTmpArr, SORTSECT_POS);
+        pNewFormat->GetChildSections(aTmpArr, SORTSECT_POS);
         if( !aTmpArr.empty() )
         {
             SectionType eTmpType;
             for( const auto pSect : aTmpArr )
             {
-                const SwSectionFmt* pFmt = pSect->GetFmt();
-                if( pFmt->IsInNodesArr()&&
-                    (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+                const SwSectionFormat* pFormat = pSect->GetFormat();
+                if( pFormat->IsInNodesArr()&&
+                    (eTmpType = pFormat->GetSection()->GetType()) != TOX_CONTENT_SECTION
                     && TOX_HEADER_SECTION != eTmpType )
                 {
-                    const OUString sString(pFmt->GetSection()->GetSectionName());
+                    const OUString sString(pFormat->GetSection()->GetSectionName());
                     if(pAvailNames)
                         pAvailNames->InsertEntry(sString);
                     rSubRegions.InsertEntry(sString);
-                    lcl_FillList( rSh, rSubRegions, pAvailNames, pFmt );
+                    lcl_FillList( rSh, rSubRegions, pAvailNames, pFormat );
                 }
             }
         }
@@ -135,11 +135,11 @@ class SectRepr
 {
 private:
     SwSectionData           m_SectionData;
-    SwFmtCol                m_Col;
+    SwFormatCol                m_Col;
     SvxBrushItem            m_Brush;
-    SwFmtFtnAtTxtEnd        m_FtnNtAtEnd;
-    SwFmtEndAtTxtEnd        m_EndNtAtEnd;
-    SwFmtNoBalancedColumns  m_Balance;
+    SwFormatFootnoteAtTextEnd        m_FootnoteNtAtEnd;
+    SwFormatEndAtTextEnd        m_EndNtAtEnd;
+    SwFormatNoBalancedColumns  m_Balance;
     SvxFrameDirectionItem   m_FrmDirItem;
     SvxLRSpaceItem          m_LRSpaceItem;
     size_t                  m_nArrPos;
@@ -156,11 +156,11 @@ public:
             { return m_nArrPos <  rSectRef.GetArrPos(); }
 
     SwSectionData &     GetSectionData()        { return m_SectionData; }
-    SwFmtCol&               GetCol()            { return m_Col; }
+    SwFormatCol&               GetCol()            { return m_Col; }
     SvxBrushItem&           GetBackground()     { return m_Brush; }
-    SwFmtFtnAtTxtEnd&       GetFtnNtAtEnd()     { return m_FtnNtAtEnd; }
-    SwFmtEndAtTxtEnd&       GetEndNtAtEnd()     { return m_EndNtAtEnd; }
-    SwFmtNoBalancedColumns& GetBalance()        { return m_Balance; }
+    SwFormatFootnoteAtTextEnd&       GetFootnoteNtAtEnd()     { return m_FootnoteNtAtEnd; }
+    SwFormatEndAtTextEnd&       GetEndNtAtEnd()     { return m_EndNtAtEnd; }
+    SwFormatNoBalancedColumns& GetBalance()        { return m_Balance; }
     SvxFrameDirectionItem&  GetFrmDir()         { return m_FrmDirItem; }
     SvxLRSpaceItem&         GetLRSpace()        { return m_LRSpaceItem; }
 
@@ -191,16 +191,16 @@ SectRepr::SectRepr( size_t nPos, SwSection& rSect )
     , m_bContent(m_SectionData.GetLinkFileName().isEmpty())
     , m_bSelected(false)
 {
-    SwSectionFmt *pFmt = rSect.GetFmt();
-    if( pFmt )
+    SwSectionFormat *pFormat = rSect.GetFormat();
+    if( pFormat )
     {
-        m_Col = pFmt->GetCol();
-        m_Brush = pFmt->makeBackgroundBrushItem();
-        m_FtnNtAtEnd = pFmt->GetFtnAtTxtEnd();
-        m_EndNtAtEnd = pFmt->GetEndAtTxtEnd();
-        m_Balance.SetValue(pFmt->GetBalancedColumns().GetValue());
-        m_FrmDirItem = pFmt->GetFrmDir();
-        m_LRSpaceItem = pFmt->GetLRSpace();
+        m_Col = pFormat->GetCol();
+        m_Brush = pFormat->makeBackgroundBrushItem();
+        m_FootnoteNtAtEnd = pFormat->GetFootnoteAtTextEnd();
+        m_EndNtAtEnd = pFormat->GetEndAtTextEnd();
+        m_Balance.SetValue(pFormat->GetBalancedColumns().GetValue());
+        m_FrmDirItem = pFormat->GetFrmDir();
+        m_LRSpaceItem = pFormat->GetLRSpace();
     }
 }
 
@@ -438,26 +438,26 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
 }
 
 // recursively look for child-sections
-void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry )
+void SwEditRegionDlg::RecurseList( const SwSectionFormat* pFormat, SvTreeListEntry* pEntry )
 {
     SvTreeListEntry* pSelEntry = 0;
-    if (!pFmt)
+    if (!pFormat)
     {
-        const size_t nCount=rSh.GetSectionFmtCount();
+        const size_t nCount=rSh.GetSectionFormatCount();
         for ( size_t n = 0; n < nCount; n++ )
         {
             SectionType eTmpType;
-            if( !( pFmt = &rSh.GetSectionFmt(n))->GetParent() &&
-                pFmt->IsInNodesArr() &&
-                (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+            if( !( pFormat = &rSh.GetSectionFormat(n))->GetParent() &&
+                pFormat->IsInNodesArr() &&
+                (eTmpType = pFormat->GetSection()->GetType()) != TOX_CONTENT_SECTION
                 && TOX_HEADER_SECTION != eTmpType )
             {
-                SwSection *pSect = pFmt->GetSection();
+                SwSection *pSect = pFormat->GetSection();
                 SectRepr* pSectRepr = new SectRepr( n, *pSect );
                 Image aImg = BuildBitmap( pSect->IsProtect(),pSect->IsHidden());
                 pEntry = m_pTree->InsertEntry(pSect->GetSectionName(), aImg, aImg);
                 pEntry->SetUserData(pSectRepr);
-                RecurseList( pFmt, pEntry );
+                RecurseList( pFormat, pEntry );
                 if (pEntry->HasChildren())
                     m_pTree->Expand(pEntry);
                 if (pCurrSect==pSect)
@@ -469,25 +469,25 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pE
     {
         SwSections aTmpArr;
         SvTreeListEntry* pNEntry;
-        pFmt->GetChildSections(aTmpArr, SORTSECT_POS);
+        pFormat->GetChildSections(aTmpArr, SORTSECT_POS);
         if( !aTmpArr.empty() )
         {
             for( const auto pSect : aTmpArr )
             {
                 SectionType eTmpType;
-                pFmt = pSect->GetFmt();
-                if( pFmt->IsInNodesArr() &&
-                    (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+                pFormat = pSect->GetFormat();
+                if( pFormat->IsInNodesArr() &&
+                    (eTmpType = pFormat->GetSection()->GetType()) != TOX_CONTENT_SECTION
                     && TOX_HEADER_SECTION != eTmpType )
                 {
                     SectRepr* pSectRepr=new SectRepr(
-                                    FindArrPos( pSect->GetFmt() ), *pSect );
+                                    FindArrPos( pSect->GetFormat() ), *pSect );
                     Image aImage = BuildBitmap( pSect->IsProtect(),
                                             pSect->IsHidden());
                     pNEntry = m_pTree->InsertEntry(
                         pSect->GetSectionName(), aImage, aImage, pEntry);
                     pNEntry->SetUserData(pSectRepr);
-                    RecurseList( pSect->GetFmt(), pNEntry );
+                    RecurseList( pSect->GetFormat(), pNEntry );
                     if( pNEntry->HasChildren())
                         m_pTree->Expand(pNEntry);
                     if (pCurrSect==pSect)
@@ -503,11 +503,11 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pE
     }
 }
 
-size_t SwEditRegionDlg::FindArrPos(const SwSectionFmt* pFmt )
+size_t SwEditRegionDlg::FindArrPos(const SwSectionFormat* pFormat )
 {
-    const size_t nCount=rSh.GetSectionFmtCount();
+    const size_t nCount=rSh.GetSectionFormatCount();
     for ( size_t i = 0; i < nCount; i++ )
-        if ( pFmt == &rSh.GetSectionFmt(i) )
+        if ( pFormat == &rSh.GetSectionFormat(i) )
             return i;
 
     OSL_FAIL("SectionFormat not on the list" );
@@ -768,8 +768,8 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
     // StartUndo must certainly also happen not before the formats
     // are copied (ClearRedo!)
 
-    const SwSectionFmts& rDocFmts = rSh.GetDoc()->GetSections();
-    SwSectionFmts aOrigArray(rDocFmts);
+    const SwSectionFormats& rDocFormats = rSh.GetDoc()->GetSections();
+    SwSectionFormats aOrigArray(rDocFormats);
 
     rSh.StartAllAction();
     rSh.StartUndo();
@@ -779,35 +779,35 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
     while( pEntry )
     {
         SectReprPtr pRepr = static_cast<SectReprPtr>(pEntry->GetUserData());
-        SwSectionFmt* pFmt = aOrigArray[ pRepr->GetArrPos() ];
+        SwSectionFormat* pFormat = aOrigArray[ pRepr->GetArrPos() ];
         if (!pRepr->GetSectionData().IsProtectFlag())
         {
             pRepr->GetSectionData().SetPassword(uno::Sequence<sal_Int8 >());
         }
-        size_t nNewPos = rDocFmts.GetPos(pFmt);
+        size_t nNewPos = rDocFormats.GetPos(pFormat);
         if ( SIZE_MAX != nNewPos )
         {
-            boost::scoped_ptr<SfxItemSet> pSet(pFmt->GetAttrSet().Clone( false ));
-            if( pFmt->GetCol() != pRepr->GetCol() )
+            boost::scoped_ptr<SfxItemSet> pSet(pFormat->GetAttrSet().Clone( false ));
+            if( pFormat->GetCol() != pRepr->GetCol() )
                 pSet->Put( pRepr->GetCol() );
 
-            SvxBrushItem aBrush(pFmt->makeBackgroundBrushItem(false));
+            SvxBrushItem aBrush(pFormat->makeBackgroundBrushItem(false));
             if( aBrush != pRepr->GetBackground() )
                 pSet->Put( pRepr->GetBackground() );
 
-            if( pFmt->GetFtnAtTxtEnd(false) != pRepr->GetFtnNtAtEnd() )
-                pSet->Put( pRepr->GetFtnNtAtEnd() );
+            if( pFormat->GetFootnoteAtTextEnd(false) != pRepr->GetFootnoteNtAtEnd() )
+                pSet->Put( pRepr->GetFootnoteNtAtEnd() );
 
-            if( pFmt->GetEndAtTxtEnd(false) != pRepr->GetEndNtAtEnd() )
+            if( pFormat->GetEndAtTextEnd(false) != pRepr->GetEndNtAtEnd() )
                 pSet->Put( pRepr->GetEndNtAtEnd() );
 
-            if( pFmt->GetBalancedColumns() != pRepr->GetBalance() )
+            if( pFormat->GetBalancedColumns() != pRepr->GetBalance() )
                 pSet->Put( pRepr->GetBalance() );
 
-            if( pFmt->GetFrmDir() != pRepr->GetFrmDir() )
+            if( pFormat->GetFrmDir() != pRepr->GetFrmDir() )
                 pSet->Put( pRepr->GetFrmDir() );
 
-            if( pFmt->GetLRSpace() != pRepr->GetLRSpace())
+            if( pFormat->GetLRSpace() != pRepr->GetLRSpace())
                 pSet->Put( pRepr->GetLRSpace());
 
             rSh.UpdateSection( nNewPos, pRepr->GetSectionData(),
@@ -818,10 +818,10 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
 
     for (SectReprArr::reverse_iterator aI = aSectReprArr.rbegin(), aEnd = aSectReprArr.rend(); aI != aEnd; ++aI)
     {
-        SwSectionFmt* pFmt = aOrigArray[ aI->GetArrPos() ];
-        const size_t nNewPos = rDocFmts.GetPos( pFmt );
+        SwSectionFormat* pFormat = aOrigArray[ aI->GetArrPos() ];
+        const size_t nNewPos = rDocFormats.GetPos( pFormat );
         if( SIZE_MAX != nNewPos )
-            rSh.DelSectionFmt( nNewPos );
+            rSh.DelSectionFormat( nNewPos );
     }
 
     aOrigArray.clear();
@@ -1063,22 +1063,22 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl)
 
         aSet.Put( pSectRepr->GetCol() );
         aSet.Put( pSectRepr->GetBackground() );
-        aSet.Put( pSectRepr->GetFtnNtAtEnd() );
+        aSet.Put( pSectRepr->GetFootnoteNtAtEnd() );
         aSet.Put( pSectRepr->GetEndNtAtEnd() );
         aSet.Put( pSectRepr->GetBalance() );
         aSet.Put( pSectRepr->GetFrmDir() );
         aSet.Put( pSectRepr->GetLRSpace() );
 
-        const SwSectionFmts& rDocFmts = rSh.GetDoc()->GetSections();
-        SwSectionFmts aOrigArray(rDocFmts);
+        const SwSectionFormats& rDocFormats = rSh.GetDoc()->GetSections();
+        SwSectionFormats aOrigArray(rDocFormats);
 
-        SwSectionFmt* pFmt = aOrigArray[pSectRepr->GetArrPos()];
-        long nWidth = rSh.GetSectionWidth(*pFmt);
+        SwSectionFormat* pFormat = aOrigArray[pSectRepr->GetArrPos()];
+        long nWidth = rSh.GetSectionWidth(*pFormat);
         aOrigArray.clear();
         if (!nWidth)
             nWidth = USHRT_MAX;
 
-        aSet.Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
+        aSet.Put(SwFormatFrmSize(ATT_VAR_SIZE, nWidth));
         aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
 
         ScopedVclPtrInstance< SwSectionPropertyTabDialog > aTabDlg(this, aSet, rSh);
@@ -1088,14 +1088,14 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl)
             if( pOutSet && pOutSet->Count() )
             {
                 const SfxPoolItem *pColItem, *pBrushItem,
-                                  *pFtnItem, *pEndItem, *pBalanceItem,
+                                  *pFootnoteItem, *pEndItem, *pBalanceItem,
                                   *pFrmDirItem, *pLRSpaceItem;
                 SfxItemState eColState = pOutSet->GetItemState(
                                         RES_COL, false, &pColItem );
                 SfxItemState eBrushState = pOutSet->GetItemState(
                                         RES_BACKGROUND, false, &pBrushItem );
-                SfxItemState eFtnState = pOutSet->GetItemState(
-                                        RES_FTN_AT_TXTEND, false, &pFtnItem );
+                SfxItemState eFootnoteState = pOutSet->GetItemState(
+                                        RES_FTN_AT_TXTEND, false, &pFootnoteItem );
                 SfxItemState eEndState = pOutSet->GetItemState(
                                         RES_END_AT_TXTEND, false, &pEndItem );
                 SfxItemState eBalanceState = pOutSet->GetItemState(
@@ -1107,7 +1107,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl)
 
                 if( SfxItemState::SET == eColState ||
                     SfxItemState::SET == eBrushState ||
-                    SfxItemState::SET == eFtnState ||
+                    SfxItemState::SET == eFootnoteState ||
                     SfxItemState::SET == eEndState ||
                     SfxItemState::SET == eBalanceState||
                     SfxItemState::SET == eFrmDirState||
@@ -1118,15 +1118,15 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl)
                     {
                         SectReprPtr pRepr = static_cast<SectReprPtr>(pSelEntry->GetUserData());
                         if( SfxItemState::SET == eColState )
-                            pRepr->GetCol() = *static_cast<const SwFmtCol*>(pColItem);
+                            pRepr->GetCol() = *static_cast<const SwFormatCol*>(pColItem);
                         if( SfxItemState::SET == eBrushState )
                             pRepr->GetBackground() = *static_cast<const SvxBrushItem*>(pBrushItem);
-                        if( SfxItemState::SET == eFtnState )
-                            pRepr->GetFtnNtAtEnd() = *static_cast<const SwFmtFtnAtTxtEnd*>(pFtnItem);
+                        if( SfxItemState::SET == eFootnoteState )
+                            pRepr->GetFootnoteNtAtEnd() = *static_cast<const SwFormatFootnoteAtTextEnd*>(pFootnoteItem);
                         if( SfxItemState::SET == eEndState )
-                            pRepr->GetEndNtAtEnd() = *static_cast<const SwFmtEndAtTxtEnd*>(pEndItem);
+                            pRepr->GetEndNtAtEnd() = *static_cast<const SwFormatEndAtTextEnd*>(pEndItem);
                         if( SfxItemState::SET == eBalanceState )
-                            pRepr->GetBalance().SetValue(static_cast<const SwFmtNoBalancedColumns*>(pBalanceItem)->GetValue());
+                            pRepr->GetBalance().SetValue(static_cast<const SwFormatNoBalancedColumns*>(pBalanceItem)->GetValue());
                         if( SfxItemState::SET == eFrmDirState )
                             pRepr->GetFrmDir().SetValue(static_cast<const SvxFrameDirectionItem*>(pFrmDirItem)->GetValue());
                         if( SfxItemState::SET == eLRState )
@@ -1428,7 +1428,7 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog(
     m_nSectionPageId = AddTabPage("section", SwInsertSectionTabPage::Create, 0);
     m_nColumnPageId = AddTabPage("columns",   SwColumnPage::Create,    0);
     m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0);
-    m_nNotePageId = AddTabPage("notes", SwSectionFtnEndTabPage::Create, 0);
+    m_nNotePageId = AddTabPage("notes", SwSectionFootnoteEndTabPage::Create, 0);
     m_nIndentPage = AddTabPage("indents", SwSectionIndentTabPage::Create, 0);
 
     SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
@@ -1461,7 +1461,7 @@ void SwInsertSectionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     }
     else if (nId == m_nColumnPageId)
     {
-        const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(GetInputSetImpl()->Get(RES_FRM_SIZE));
+        const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>(GetInputSetImpl()->Get(RES_FRM_SIZE));
         static_cast<SwColumnPage&>(rPage).SetPageWidth(rSize.GetWidth());
         static_cast<SwColumnPage&>(rPage).ShowBalance(true);
         static_cast<SwColumnPage&>(rPage).SetInSection(true);
@@ -1492,7 +1492,7 @@ short   SwInsertSectionTabDialog::Ok()
         if(SfxItemState::SET == pOutputItemSet->GetItemState(RES_COL, false, &pCol))
         {
             aRequest.AppendItem(SfxUInt16Item(SID_ATTR_COLUMNS,
-                static_cast<const SwFmtCol*>(pCol)->GetColumns().size()));
+                static_cast<const SwFormatCol*>(pCol)->GetColumns().size()));
         }
         aRequest.AppendItem(SfxStringItem( FN_PARAM_REGION_NAME,
                     m_pSectionData->GetSectionName()));
@@ -1844,68 +1844,68 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
     return 0;
 }
 
-SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( vcl::Window *pParent,
+SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage( vcl::Window *pParent,
                                                 const SfxItemSet &rAttrSet)
     : SfxTabPage( pParent, "FootnotesEndnotesTabPage", "modules/swriter/ui/footnotesendnotestabpage.ui", &rAttrSet )
 
 {
-    get(pFtnNtAtTextEndCB,"ftnntattextend");
+    get(pFootnoteNtAtTextEndCB,"ftnntattextend");
 
-    get(pFtnNtNumCB,"ftnntnum");
-    get(pFtnOffsetLbl,"ftnoffset_label");
-    get(pFtnOffsetFld,"ftnoffset");
+    get(pFootnoteNtNumCB,"ftnntnum");
+    get(pFootnoteOffsetLbl,"ftnoffset_label");
+    get(pFootnoteOffsetField,"ftnoffset");
 
-    get(pFtnNtNumFmtCB,"ftnntnumfmt");
-    get(pFtnPrefixFT,"ftnprefix_label");
-    get(pFtnPrefixED,"ftnprefix");
-    get(pFtnNumViewBox,"ftnnumviewbox");
-    get(pFtnSuffixFT,"ftnsuffix_label");
-    get(pFtnSuffixED,"ftnsuffix");
+    get(pFootnoteNtNumFormatCB,"ftnntnumfmt");
+    get(pFootnotePrefixFT,"ftnprefix_label");
+    get(pFootnotePrefixED,"ftnprefix");
+    get(pFootnoteNumViewBox,"ftnnumviewbox");
+    get(pFootnoteSuffixFT,"ftnsuffix_label");
+    get(pFootnoteSuffixED,"ftnsuffix");
 
     get(pEndNtAtTextEndCB,"endntattextend");
 
     get(pEndNtNumCB,"endntnum");
     get(pEndOffsetLbl,"endoffset_label");
-    get(pEndOffsetFld,"endoffset");
+    get(pEndOffsetField,"endoffset");
 
-    get(pEndNtNumFmtCB,"endntnumfmt");
+    get(pEndNtNumFormatCB,"endntnumfmt");
     get(pEndPrefixFT,"endprefix_label");
     get(pEndPrefixED,"endprefix");
     get(pEndNumViewBox,"endnumviewbox");
     get(pEndSuffixFT,"endsuffix_label");
     get(pEndSuffixED,"endsuffix");
 
-    Link<> aLk( LINK( this, SwSectionFtnEndTabPage, FootEndHdl));
-    pFtnNtAtTextEndCB->SetClickHdl( aLk );
-    pFtnNtNumCB->SetClickHdl( aLk );
+    Link<> aLk( LINK( this, SwSectionFootnoteEndTabPage, FootEndHdl));
+    pFootnoteNtAtTextEndCB->SetClickHdl( aLk );
+    pFootnoteNtNumCB->SetClickHdl( aLk );
     pEndNtAtTextEndCB->SetClickHdl( aLk );
     pEndNtNumCB->SetClickHdl( aLk );
-    pFtnNtNumFmtCB->SetClickHdl( aLk );
-    pEndNtNumFmtCB->SetClickHdl( aLk );
+    pFootnoteNtNumFormatCB->SetClickHdl( aLk );
+    pEndNtNumFormatCB->SetClickHdl( aLk );
 }
 
-SwSectionFtnEndTabPage::~SwSectionFtnEndTabPage()
+SwSectionFootnoteEndTabPage::~SwSectionFootnoteEndTabPage()
 {
     disposeOnce();
 }
 
-void SwSectionFtnEndTabPage::dispose()
+void SwSectionFootnoteEndTabPage::dispose()
 {
-    pFtnNtAtTextEndCB.clear();
-    pFtnNtNumCB.clear();
-    pFtnOffsetLbl.clear();
-    pFtnOffsetFld.clear();
-    pFtnNtNumFmtCB.clear();
-    pFtnPrefixFT.clear();
-    pFtnPrefixED.clear();
-    pFtnNumViewBox.clear();
-    pFtnSuffixFT.clear();
-    pFtnSuffixED.clear();
+    pFootnoteNtAtTextEndCB.clear();
+    pFootnoteNtNumCB.clear();
+    pFootnoteOffsetLbl.clear();
+    pFootnoteOffsetField.clear();
+    pFootnoteNtNumFormatCB.clear();
+    pFootnotePrefixFT.clear();
+    pFootnotePrefixED.clear();
+    pFootnoteNumViewBox.clear();
+    pFootnoteSuffixFT.clear();
+    pFootnoteSuffixED.clear();
     pEndNtAtTextEndCB.clear();
     pEndNtNumCB.clear();
     pEndOffsetLbl.clear();
-    pEndOffsetFld.clear();
-    pEndNtNumFmtCB.clear();
+    pEndOffsetField.clear();
+    pEndNtNumFormatCB.clear();
     pEndPrefixFT.clear();
     pEndPrefixED.clear();
     pEndNumViewBox.clear();
@@ -1914,32 +1914,32 @@ void SwSectionFtnEndTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet* rSet )
+bool SwSectionFootnoteEndTabPage::FillItemSet( SfxItemSet* rSet )
 {
-    SwFmtFtnAtTxtEnd aFtn( pFtnNtAtTextEndCB->IsChecked()
-                            ? ( pFtnNtNumCB->IsChecked()
-                                ? ( pFtnNtNumFmtCB->IsChecked()
+    SwFormatFootnoteAtTextEnd aFootnote( pFootnoteNtAtTextEndCB->IsChecked()
+                            ? ( pFootnoteNtNumCB->IsChecked()
+                                ? ( pFootnoteNtNumFormatCB->IsChecked()
                                     ? FTNEND_ATTXTEND_OWNNUMANDFMT
                                     : FTNEND_ATTXTEND_OWNNUMSEQ )
                                 : FTNEND_ATTXTEND )
                             : FTNEND_ATPGORDOCEND );
 
-    switch( aFtn.GetValue() )
+    switch( aFootnote.GetValue() )
     {
     case FTNEND_ATTXTEND_OWNNUMANDFMT:
-        aFtn.SetNumType( pFtnNumViewBox->GetSelectedNumberingType() );
-        aFtn.SetPrefix( pFtnPrefixED->GetText().replaceAll("\\t", "\t") ); // fdo#65666
-        aFtn.SetSuffix( pFtnSuffixED->GetText().replaceAll("\\t", "\t") );
+        aFootnote.SetNumType( pFootnoteNumViewBox->GetSelectedNumberingType() );
+        aFootnote.SetPrefix( pFootnotePrefixED->GetText().replaceAll("\\t", "\t") ); // fdo#65666
+        aFootnote.SetSuffix( pFootnoteSuffixED->GetText().replaceAll("\\t", "\t") );
         // no break;
 
     case FTNEND_ATTXTEND_OWNNUMSEQ:
-        aFtn.SetOffset( static_cast< sal_uInt16 >( pFtnOffsetFld->GetValue()-1 ) );
+        aFootnote.SetOffset( static_cast< sal_uInt16 >( pFootnoteOffsetField->GetValue()-1 ) );
         // no break;
     }
 
-    SwFmtEndAtTxtEnd aEnd( pEndNtAtTextEndCB->IsChecked()
+    SwFormatEndAtTextEnd aEnd( pEndNtAtTextEndCB->IsChecked()
                             ? ( pEndNtNumCB->IsChecked()
-                                ? ( pEndNtNumFmtCB->IsChecked()
+                                ? ( pEndNtNumFormatCB->IsChecked()
                                     ? FTNEND_ATTXTEND_OWNNUMANDFMT
                                     : FTNEND_ATTXTEND_OWNNUMSEQ )
                                 : FTNEND_ATTXTEND )
@@ -1954,58 +1954,58 @@ bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet* rSet )
         // no break;
 
     case FTNEND_ATTXTEND_OWNNUMSEQ:
-        aEnd.SetOffset( static_cast< sal_uInt16 >( pEndOffsetFld->GetValue()-1 ) );
+        aEnd.SetOffset( static_cast< sal_uInt16 >( pEndOffsetField->GetValue()-1 ) );
         // no break;
     }
 
-    rSet->Put( aFtn );
+    rSet->Put( aFootnote );
     rSet->Put( aEnd );
 
     return true;
 }
 
-void SwSectionFtnEndTabPage::ResetState( bool bFtn,
-                                         const SwFmtFtnEndAtTxtEnd& rAttr )
+void SwSectionFootnoteEndTabPage::ResetState( bool bFootnote,
+                                         const SwFormatFootnoteEndAtTextEnd& rAttr )
 {
-    CheckBox *pNtAtTextEndCB, *pNtNumCB, *pNtNumFmtCB;
+    CheckBox *pNtAtTextEndCB, *pNtNumCB, *pNtNumFormatCB;
     FixedText*pPrefixFT, *pSuffixFT;
     Edit *pPrefixED, *pSuffixED;
     SwNumberingTypeListBox *pNumViewBox;
-    FixedText* pOffsetTxt;
-    NumericField *pOffsetFld;
-
-    if( bFtn )
-    {
-        pNtAtTextEndCB = pFtnNtAtTextEndCB;
-        pNtNumCB = pFtnNtNumCB;
-        pNtNumFmtCB = pFtnNtNumFmtCB;
-        pPrefixFT = pFtnPrefixFT;
-        pPrefixED = pFtnPrefixED;
-        pSuffixFT = pFtnSuffixFT;
-        pSuffixED = pFtnSuffixED;
-        pNumViewBox = pFtnNumViewBox;
-        pOffsetTxt = pFtnOffsetLbl;
-        pOffsetFld = pFtnOffsetFld;
+    FixedText* pOffsetText;
+    NumericField *pOffsetField;
+
+    if( bFootnote )
+    {
+        pNtAtTextEndCB = pFootnoteNtAtTextEndCB;
+        pNtNumCB = pFootnoteNtNumCB;
+        pNtNumFormatCB = pFootnoteNtNumFormatCB;
+        pPrefixFT = pFootnotePrefixFT;
+        pPrefixED = pFootnotePrefixED;
+        pSuffixFT = pFootnoteSuffixFT;
+        pSuffixED = pFootnoteSuffixED;
+        pNumViewBox = pFootnoteNumViewBox;
+        pOffsetText = pFootnoteOffsetLbl;
+        pOffsetField = pFootnoteOffsetField;
     }
     else
     {
         pNtAtTextEndCB = pEndNtAtTextEndCB;
         pNtNumCB = pEndNtNumCB;
-        pNtNumFmtCB = pEndNtNumFmtCB;
+        pNtNumFormatCB = pEndNtNumFormatCB;
         pPrefixFT = pEndPrefixFT;
         pPrefixED = pEndPrefixED;
         pSuffixFT = pEndSuffixFT;
         pSuffixED = pEndSuffixED;
         pNumViewBox = pEndNumViewBox;
-        pOffsetTxt = pEndOffsetLbl;
-        pOffsetFld = pEndOffsetFld;
+        pOffsetText = pEndOffsetLbl;
+        pOffsetField = pEndOffsetField;
     }
 
     const sal_uInt16 eState = rAttr.GetValue();
     switch( eState )
     {
     case FTNEND_ATTXTEND_OWNNUMANDFMT:
-        pNtNumFmtCB->SetState( TRISTATE_TRUE );
+        pNtNumFormatCB->SetState( TRISTATE_TRUE );
         // no break;
 
     case FTNEND_ATTXTEND_OWNNUMSEQ:
@@ -2018,7 +2018,7 @@ void SwSectionFtnEndTabPage::ResetState( bool bFtn,
     }
 
     pNumViewBox->SelectNumberingType( rAttr.GetNumType() );
-    pOffsetFld->SetValue( rAttr.GetOffset() + 1 );
+    pOffsetField->SetValue( rAttr.GetOffset() + 1 );
     pPrefixED->SetText( rAttr.GetPrefix().replaceAll("\t", "\\t") );
     pSuffixED->SetText( rAttr.GetSuffix().replaceAll("\t", "\\t") );
 
@@ -2029,9 +2029,9 @@ void SwSectionFtnEndTabPage::ResetState( bool bFtn,
         // no break;
 
     case FTNEND_ATTXTEND:
-        pNtNumFmtCB->Enable( false );
-        pOffsetFld->Enable( false );
-        pOffsetTxt->Enable( false );
+        pNtNumFormatCB->Enable( false );
+        pOffsetField->Enable( false );
+        pOffsetText->Enable( false );
         // no break;
 
     case FTNEND_ATTXTEND_OWNNUMSEQ:
@@ -2044,53 +2044,53 @@ void SwSectionFtnEndTabPage::ResetState( bool bFtn,
     }
 }
 
-void SwSectionFtnEndTabPage::Reset( const SfxItemSet* rSet )
+void SwSectionFootnoteEndTabPage::Reset( const SfxItemSet* rSet )
 {
-    ResetState( true, static_cast<const SwFmtFtnAtTxtEnd&>(rSet->Get(
+    ResetState( true, static_cast<const SwFormatFootnoteAtTextEnd&>(rSet->Get(
                                     RES_FTN_AT_TXTEND, false )));
-    ResetState( false, static_cast<const SwFmtEndAtTxtEnd&>(rSet->Get(
+    ResetState( false, static_cast<const SwFormatEndAtTextEnd&>(rSet->Get(
                                     RES_END_AT_TXTEND, false )));
 }
 
-VclPtr<SfxTabPage> SwSectionFtnEndTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( vcl::Window* pParent,
                                                    const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwSectionFtnEndTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwSectionFootnoteEndTabPage>::Create(pParent, *rAttrSet);
 }
 
-IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox )
+IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, CheckBox *, pBox )
 {
-    bool bFoot = pFtnNtAtTextEndCB == pBox || pFtnNtNumCB == pBox ||
-                    pFtnNtNumFmtCB == pBox ;
+    bool bFoot = pFootnoteNtAtTextEndCB == pBox || pFootnoteNtNumCB == pBox ||
+                    pFootnoteNtNumFormatCB == pBox ;
 
-    CheckBox *pNumBox, *pNumFmtBox, *pEndBox;
+    CheckBox *pNumBox, *pNumFormatBox, *pEndBox;
     SwNumberingTypeListBox* pNumViewBox;
-    FixedText* pOffsetTxt;
-    NumericField *pOffsetFld;
+    FixedText* pOffsetText;
+    NumericField *pOffsetField;
     FixedText*pPrefixFT, *pSuffixFT;
     Edit *pPrefixED, *pSuffixED;
 
     if( bFoot )
     {
-        pEndBox = pFtnNtAtTextEndCB;
-        pNumBox = pFtnNtNumCB;
-        pNumFmtBox = pFtnNtNumFmtCB;
-        pNumViewBox = pFtnNumViewBox;
-        pOffsetTxt = pFtnOffsetLbl;
-        pOffsetFld = pFtnOffsetFld;
-        pPrefixFT = pFtnPrefixFT;
-        pSuffixFT = pFtnSuffixFT;
-        pPrefixED = pFtnPrefixED;
-        pSuffixED = pFtnSuffixED;
+        pEndBox = pFootnoteNtAtTextEndCB;
+        pNumBox = pFootnoteNtNumCB;
+        pNumFormatBox = pFootnoteNtNumFormatCB;
+        pNumViewBox = pFootnoteNumViewBox;
+        pOffsetText = pFootnoteOffsetLbl;
+        pOffsetField = pFootnoteOffsetField;
+        pPrefixFT = pFootnotePrefixFT;
+        pSuffixFT = pFootnoteSuffixFT;
+        pPrefixED = pFootnotePrefixED;
+        pSuffixED = pFootnoteSuffixED;
     }
     else
     {
         pEndBox = pEndNtAtTextEndCB;
         pNumBox = pEndNtNumCB;
-        pNumFmtBox = pEndNtNumFmtCB;
+        pNumFormatBox = pEndNtNumFormatCB;
         pNumViewBox = pEndNumViewBox;
-        pOffsetTxt = pEndOffsetLbl;
-        pOffsetFld = pEndOffsetFld;
+        pOffsetText = pEndOffsetLbl;
+        pOffsetField = pEndOffsetField;
         pPrefixFT = pEndPrefixFT;
         pSuffixFT = pEndSuffixFT;
         pPrefixED = pEndPrefixED;
@@ -2099,17 +2099,17 @@ IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox )
 
     bool bEnableAtEnd = TRISTATE_TRUE == pEndBox->GetState();
     bool bEnableNum = bEnableAtEnd && TRISTATE_TRUE == pNumBox->GetState();
-    bool bEnableNumFmt = bEnableNum && TRISTATE_TRUE == pNumFmtBox->GetState();
+    bool bEnableNumFormat = bEnableNum && TRISTATE_TRUE == pNumFormatBox->GetState();
 
     pNumBox->Enable( bEnableAtEnd );
-    pOffsetTxt->Enable( bEnableNum );
-    pOffsetFld->Enable( bEnableNum );
-    pNumFmtBox->Enable( bEnableNum );
-    pNumViewBox->Enable( bEnableNumFmt );
-    pPrefixED->Enable( bEnableNumFmt );
-    pSuffixED->Enable( bEnableNumFmt );
-    pPrefixFT->Enable( bEnableNumFmt );
-    pSuffixFT->Enable( bEnableNumFmt );
+    pOffsetText->Enable( bEnableNum );
+    pOffsetField->Enable( bEnableNum );
+    pNumFormatBox->Enable( bEnableNum );
+    pNumViewBox->Enable( bEnableNumFormat );
+    pPrefixED->Enable( bEnableNumFormat );
+    pSuffixED->Enable( bEnableNumFormat );
+    pPrefixFT->Enable( bEnableNumFormat );
+    pSuffixFT->Enable( bEnableNumFormat );
 
     return 0;
 }
@@ -2124,7 +2124,7 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog(
     OSL_ENSURE(pFact, "Dialog creation failed!");
     m_nColumnPageId = AddTabPage("columns",   SwColumnPage::Create,    0);
     m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
-    m_nNotePageId = AddTabPage("notes", SwSectionFtnEndTabPage::Create, 0);
+    m_nNotePageId = AddTabPage("notes", SwSectionFootnoteEndTabPage::Create, 0);
     m_nIndentPage = AddTabPage("indents", SwSectionIndentTabPage::Create, 0);
 
     SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 2073dd5b35d0..3a9f6b4c76ce 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -116,7 +116,7 @@ namespace {
 static long lUserW = 5669; // 10 cm
 static long lUserH = 5669; // 10 cm
 
-SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)
+SwEnvFormatPage::SwEnvFormatPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "EnvFormatPage",
         "modules/swriter/ui/envformatpage.ui", &rSet)
 {
@@ -142,7 +142,7 @@ SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)
     SetMetric(*m_pSizeHeightField, aMetric);
 
     // Install handlers
-    Link<> aLk = LINK(this, SwEnvFmtPage, ModifyHdl);
+    Link<> aLk = LINK(this, SwEnvFormatPage, ModifyHdl);
     m_pAddrLeftField->SetUpHdl( aLk );
     m_pAddrTopField->SetUpHdl( aLk );
     m_pSendLeftField->SetUpHdl( aLk );
@@ -164,13 +164,13 @@ SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)
     m_pSizeWidthField->SetLoseFocusHdl( aLk );
     m_pSizeHeightField->SetLoseFocusHdl( aLk );
 
-    Link<MenuButton *, void> aLk2 = LINK(this, SwEnvFmtPage, EditHdl );
+    Link<MenuButton *, void> aLk2 = LINK(this, SwEnvFormatPage, EditHdl );
     m_pAddrEditButton->SetSelectHdl( aLk2 );
     m_pSendEditButton->SetSelectHdl( aLk2 );
 
     m_pPreview->SetBorderStyle( WindowBorderStyle::MONO );
 
-    m_pSizeFormatBox->SetSelectHdl(LINK(this, SwEnvFmtPage, FormatHdl));
+    m_pSizeFormatBox->SetSelectHdl(LINK(this, SwEnvFormatPage, FormatHdl));
 
     // m_pSizeFormatBox
     for (sal_uInt16 i = PAPER_A3; i <= PAPER_KAI32BIG; i++)
@@ -197,12 +197,12 @@ SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
 }
 
-SwEnvFmtPage::~SwEnvFmtPage()
+SwEnvFormatPage::~SwEnvFormatPage()
 {
     disposeOnce();
 }
 
-void SwEnvFmtPage::dispose()
+void SwEnvFormatPage::dispose()
 {
     m_pAddrLeftField.clear();
     m_pAddrTopField.clear();
@@ -218,10 +218,10 @@ void SwEnvFmtPage::dispose()
 }
 
 
-IMPL_LINK( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
+IMPL_LINK( SwEnvFormatPage, ModifyHdl, Edit *, pEdit )
 {
-    long lWVal = static_cast< long >(GetFldVal(*m_pSizeWidthField ));
-    long lHVal = static_cast< long >(GetFldVal(*m_pSizeHeightField));
+    long lWVal = static_cast< long >(GetFieldVal(*m_pSizeWidthField ));
+    long lHVal = static_cast< long >(GetFieldVal(*m_pSizeHeightField));
 
     long lWidth  = std::max(lWVal, lHVal);
     long lHeight = std::min(lWVal, lHVal);
@@ -254,7 +254,7 @@ IMPL_LINK( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
     return 0;
 }
 
-IMPL_LINK_TYPED( SwEnvFmtPage, EditHdl, MenuButton *, pButton, void )
+IMPL_LINK_TYPED( SwEnvFormatPage, EditHdl, MenuButton *, pButton, void )
 {
     SwWrtShell* pSh = GetParentSwEnvDlg()->pSh;
     OSL_ENSURE(pSh, "Shell missing");
@@ -262,7 +262,7 @@ IMPL_LINK_TYPED( SwEnvFmtPage, EditHdl, MenuButton *, pButton, void )
     // determine collection-ptr
     bool bSender = pButton != m_pAddrEditButton;
 
-    SwTxtFmtColl* pColl = pSh->GetTxtCollFromPool( static_cast< sal_uInt16 >(
+    SwTextFormatColl* pColl = pSh->GetTextCollFromPool( static_cast< sal_uInt16 >(
         bSender ? RES_POOLCOLL_SENDADRESS : RES_POOLCOLL_JAKETADRESS));
     OSL_ENSURE(pColl, "Text collection missing");
 
@@ -279,8 +279,8 @@ IMPL_LINK_TYPED( SwEnvFmtPage, EditHdl, MenuButton *, pButton, void )
         SwAbstractDialogFactory* pFact = swui::GetFactory();
         OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-        const OUString sFmtStr = pColl->GetName();
-        boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_CHAR_ENV, &sFmtStr));
+        const OUString sFormatStr = pColl->GetName();
+        boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_CHAR_ENV, &sFormatStr));
         OSL_ENSURE(pDlg, "Dialog creation failed!");
         if (pDlg->Execute() == RET_OK)
         {
@@ -310,15 +310,15 @@ IMPL_LINK_TYPED( SwEnvFmtPage, EditHdl, MenuButton *, pButton, void )
 
         // left border as offset
         const long nOff = static_cast<const SvxLRSpaceItem&>(aTmpSet.Get( RES_LR_SPACE )).
-                                                            GetTxtLeft();
+                                                            GetTextLeft();
         SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff );
         aTmpSet.Put( aOff );
 
         // set BoxInfo
         ::PrepareBoxInfo( aTmpSet, *pSh );
 
-        const OUString sFmtStr = pColl->GetName();
-        VclPtrInstance< SwParaDlg > pDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &sFmtStr);
+        const OUString sFormatStr = pColl->GetName();
+        VclPtrInstance< SwParaDlg > pDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &sFormatStr);
 
         if ( pDlg->Execute() == RET_OK )
         {
@@ -345,7 +345,7 @@ IMPL_LINK_TYPED( SwEnvFmtPage, EditHdl, MenuButton *, pButton, void )
 }
 
 // A temporary Itemset that gets discarded at abort
-SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, bool bSender)
+SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl* pColl, bool bSender)
 {
     SfxItemSet *&pAddrSet = bSender ? GetParentSwEnvDlg()->pSenderSet : GetParentSwEnvDlg()->pAddresseeSet;
     if (!pAddrSet)
@@ -380,7 +380,7 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, bool bSender)
     return pAddrSet;
 }
 
-IMPL_LINK_NOARG(SwEnvFmtPage, FormatHdl)
+IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl)
 {
     long lWidth;
     long lHeight;
@@ -407,13 +407,13 @@ IMPL_LINK_NOARG(SwEnvFmtPage, FormatHdl)
     lAddrFromLeft = lWidth  / 2;
     lAddrFromTop  = lHeight / 2;
 
-    SetFldVal(*m_pAddrLeftField, lAddrFromLeft);
-    SetFldVal(*m_pAddrTopField , lAddrFromTop );
-    SetFldVal(*m_pSendLeftField, lSendFromLeft);
-    SetFldVal(*m_pSendTopField , lSendFromTop );
+    SetFieldVal(*m_pAddrLeftField, lAddrFromLeft);
+    SetFieldVal(*m_pAddrTopField , lAddrFromTop );
+    SetFieldVal(*m_pSendLeftField, lSendFromLeft);
+    SetFieldVal(*m_pSendTopField , lSendFromTop );
 
-    SetFldVal(*m_pSizeWidthField , lWidth );
-    SetFldVal(*m_pSizeHeightField, lHeight);
+    SetFieldVal(*m_pSizeWidthField , lWidth );
+    SetFieldVal(*m_pSizeHeightField, lHeight);
 
     SetMinMax();
 
@@ -422,23 +422,23 @@ IMPL_LINK_NOARG(SwEnvFmtPage, FormatHdl)
     return 0;
 }
 
-void SwEnvFmtPage::SetMinMax()
+void SwEnvFormatPage::SetMinMax()
 {
-    long lWVal = static_cast< long >(GetFldVal(*m_pSizeWidthField ));
-    long lHVal = static_cast< long >(GetFldVal(*m_pSizeHeightField));
+    long lWVal = static_cast< long >(GetFieldVal(*m_pSizeWidthField ));
+    long lHVal = static_cast< long >(GetFieldVal(*m_pSizeHeightField));
 
     long lWidth  = std::max(lWVal, lHVal),
          lHeight = std::min(lWVal, lHVal);
 
     // Min and Max
-    m_pAddrLeftField->SetMin((long) 100 * (GetFldVal(*m_pSendLeftField) + 566), FUNIT_TWIP);
+    m_pAddrLeftField->SetMin((long) 100 * (GetFieldVal(*m_pSendLeftField) + 566), FUNIT_TWIP);
     m_pAddrLeftField->SetMax((long) 100 * (lWidth  - 2 * 566), FUNIT_TWIP);
-    m_pAddrTopField->SetMin((long) 100 * (GetFldVal(*m_pSendTopField ) + 2 * 566), FUNIT_TWIP);
+    m_pAddrTopField->SetMin((long) 100 * (GetFieldVal(*m_pSendTopField ) + 2 * 566), FUNIT_TWIP);
     m_pAddrTopField->SetMax((long) 100 * (lHeight - 2 * 566), FUNIT_TWIP);
     m_pSendLeftField->SetMin((long) 100 * (566), FUNIT_TWIP);
-    m_pSendLeftField->SetMax((long) 100 * (GetFldVal(*m_pAddrLeftField) - 566), FUNIT_TWIP);
+    m_pSendLeftField->SetMax((long) 100 * (GetFieldVal(*m_pAddrLeftField) - 566), FUNIT_TWIP);
     m_pSendTopField->SetMin((long) 100 * (566), FUNIT_TWIP);
-    m_pSendTopField->SetMax((long) 100 * (GetFldVal(*m_pAddrTopField ) - 2 * 566), FUNIT_TWIP);
+    m_pSendTopField->SetMax((long) 100 * (GetFieldVal(*m_pAddrTopField ) - 2 * 566), FUNIT_TWIP);
 
     // First and last
     m_pAddrLeftField->SetFirst(m_pAddrLeftField->GetMin());
@@ -459,37 +459,37 @@ void SwEnvFmtPage::SetMinMax()
     m_pSizeHeightField->Reformat();
 }
 
-VclPtr<SfxTabPage> SwEnvFmtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwEnvFormatPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SfxTabPage>(new SwEnvFmtPage(pParent, *rSet), SAL_NO_ACQUIRE);
+    return VclPtr<SfxTabPage>(new SwEnvFormatPage(pParent, *rSet), SAL_NO_ACQUIRE);
 }
 
-void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet)
+void SwEnvFormatPage::ActivatePage(const SfxItemSet& rSet)
 {
     SfxItemSet aSet(rSet);
     aSet.Put(GetParentSwEnvDlg()->aEnvItem);
     Reset(&aSet);
 }
 
-SfxTabPage::sfxpg SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet)
+SfxTabPage::sfxpg SwEnvFormatPage::DeactivatePage(SfxItemSet* _pSet)
 {
     if( _pSet )
         FillItemSet(_pSet);
     return SfxTabPage::LEAVE_PAGE;
 }
 
-void SwEnvFmtPage::FillItem(SwEnvItem& rItem)
+void SwEnvFormatPage::FillItem(SwEnvItem& rItem)
 {
-    rItem.lAddrFromLeft = static_cast< sal_Int32 >(GetFldVal(*m_pAddrLeftField));
-    rItem.lAddrFromTop  = static_cast< sal_Int32 >(GetFldVal(*m_pAddrTopField ));
-    rItem.lSendFromLeft = static_cast< sal_Int32 >(GetFldVal(*m_pSendLeftField));
-    rItem.lSendFromTop  = static_cast< sal_Int32 >(GetFldVal(*m_pSendTopField ));
+    rItem.lAddrFromLeft = static_cast< sal_Int32 >(GetFieldVal(*m_pAddrLeftField));
+    rItem.lAddrFromTop  = static_cast< sal_Int32 >(GetFieldVal(*m_pAddrTopField ));
+    rItem.lSendFromLeft = static_cast< sal_Int32 >(GetFieldVal(*m_pSendLeftField));
+    rItem.lSendFromTop  = static_cast< sal_Int32 >(GetFieldVal(*m_pSendTopField ));
 
     const sal_uInt16 nPaper = aIDs[m_pSizeFormatBox->GetSelectEntryPos()];
     if (nPaper == (sal_uInt16)PAPER_USER)
     {
-        long lWVal = static_cast< long >(GetFldVal(*m_pSizeWidthField ));
-        long lHVal = static_cast< long >(GetFldVal(*m_pSizeHeightField));
+        long lWVal = static_cast< long >(GetFieldVal(*m_pSizeWidthField ));
+        long lHVal = static_cast< long >(GetFieldVal(*m_pSizeHeightField));
         rItem.lWidth  = std::max(lWVal, lHVal);
         rItem.lHeight = std::min(lWVal, lHVal);
     }
@@ -502,14 +502,14 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem)
     }
 }
 
-bool SwEnvFmtPage::FillItemSet(SfxItemSet* rSet)
+bool SwEnvFormatPage::FillItemSet(SfxItemSet* rSet)
 {
     FillItem(GetParentSwEnvDlg()->aEnvItem);
     rSet->Put(GetParentSwEnvDlg()->aEnvItem);
     return true;
 }
 
-void SwEnvFmtPage::Reset(const SfxItemSet* rSet)
+void SwEnvFormatPage::Reset(const SfxItemSet* rSet)
 {
     const SwEnvItem& rItem = static_cast<const SwEnvItem&>( rSet->Get(FN_ENVELOP));
 
@@ -521,12 +521,12 @@ void SwEnvFmtPage::Reset(const SfxItemSet* rSet)
             m_pSizeFormatBox->SelectEntryPos(static_cast<sal_Int32>(i));
 
     // Metric fields
-    SetFldVal(*m_pAddrLeftField, rItem.lAddrFromLeft);
-    SetFldVal(*m_pAddrTopField, rItem.lAddrFromTop );
-    SetFldVal(*m_pSendLeftField, rItem.lSendFromLeft);
-    SetFldVal(*m_pSendTopField, rItem.lSendFromTop );
-    SetFldVal(*m_pSizeWidthField  , std::max(rItem.lWidth, rItem.lHeight));
-    SetFldVal(*m_pSizeHeightField , std::min(rItem.lWidth, rItem.lHeight));
+    SetFieldVal(*m_pAddrLeftField, rItem.lAddrFromLeft);
+    SetFieldVal(*m_pAddrTopField, rItem.lAddrFromTop );
+    SetFieldVal(*m_pSendLeftField, rItem.lSendFromLeft);
+    SetFieldVal(*m_pSendTopField, rItem.lSendFromTop );
+    SetFieldVal(*m_pSizeWidthField  , std::max(rItem.lWidth, rItem.lHeight));
+    SetFieldVal(*m_pSizeHeightField , std::min(rItem.lWidth, rItem.lHeight));
     SetMinMax();
 
     DELETEZ(GetParentSwEnvDlg()->pSenderSet);
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index f028d285e6c0..ced01862a050 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -26,9 +26,9 @@
 
 #include "envlop.hxx"
 
-class SwTxtFmtColl;
+class SwTextFormatColl;
 
-class SwEnvFmtPage : public SfxTabPage
+class SwEnvFormatPage : public SfxTabPage
 {
     VclPtr<MetricField>  m_pAddrLeftField;
     VclPtr<MetricField>  m_pAddrTopField;
@@ -49,7 +49,7 @@ class SwEnvFmtPage : public SfxTabPage
 
     void SetMinMax();
 
-    SfxItemSet  *GetCollItemSet(SwTxtFmtColl* pColl, bool bSender);
+    SfxItemSet  *GetCollItemSet(SwTextFormatColl* pColl, bool bSender);
 
     SwEnvDlg    *GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>(GetParentDialog());}
 
@@ -57,8 +57,8 @@ class SwEnvFmtPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
 public:
-    SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    virtual ~SwEnvFmtPage();
+    SwEnvFormatPage(vcl::Window* pParent, const SfxItemSet& rSet);
+    virtual ~SwEnvFormatPage();
     virtual void dispose() SAL_OVERRIDE;
 
     static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 1599d99eb462..be34f66b3bdf 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -143,7 +143,7 @@ SwEnvDlg::SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet,
     }
 
     AddTabPage("envelope", SwEnvPage   ::Create, 0);
-    AddTabPage("format", SwEnvFmtPage::Create, 0);
+    AddTabPage("format", SwEnvFormatPage::Create, 0);
     m_nEnvPrintId = AddTabPage("printer", SwEnvPrtPage::Create, 0);
 }
 
@@ -175,13 +175,13 @@ short SwEnvDlg::Ok()
     {
         if (pAddresseeSet)
         {
-            SwTxtFmtColl* pColl = pSh->GetTxtCollFromPool(RES_POOLCOLL_JAKETADRESS);
-            pColl->SetFmtAttr(*pAddresseeSet);
+            SwTextFormatColl* pColl = pSh->GetTextCollFromPool(RES_POOLCOLL_JAKETADRESS);
+            pColl->SetFormatAttr(*pAddresseeSet);
         }
         if (pSenderSet)
         {
-            SwTxtFmtColl* pColl = pSh->GetTxtCollFromPool(RES_POOLCOLL_SENDADRESS);
-            pColl->SetFmtAttr(*pSenderSet);
+            SwTextFormatColl* pColl = pSh->GetTextCollFromPool(RES_POOLCOLL_SENDADRESS);
+            pColl->SetFormatAttr(*pSenderSet);
         }
     }
 
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 2b4379d97895..b256af9cdb2d 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -175,8 +175,8 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem)
 
     rItem.eAlign          = (SwEnvAlign) (nOrient);
     rItem.bPrintFromAbove = m_pTopButton->IsChecked();
-    rItem.lShiftRight     = static_cast< sal_Int32 >(GetFldVal(*m_pRightField));
-    rItem.lShiftDown      = static_cast< sal_Int32 >(GetFldVal(*m_pDownField ));
+    rItem.lShiftRight     = static_cast< sal_Int32 >(GetFieldVal(*m_pRightField));
+    rItem.lShiftDown      = static_cast< sal_Int32 >(GetFieldVal(*m_pDownField ));
 }
 
 bool SwEnvPrtPage::FillItemSet(SfxItemSet* rSet)
@@ -197,8 +197,8 @@ void SwEnvPrtPage::Reset(const SfxItemSet* rSet)
     else
         m_pBottomButton->Check();
 
-    SetFldVal(*m_pRightField, rItem.lShiftRight);
-    SetFldVal(*m_pDownField , rItem.lShiftDown );
+    SetFieldVal(*m_pRightField, rItem.lShiftRight);
+    SetFieldVal(*m_pDownField , rItem.lShiftDown );
 
     ActivatePage(*rSet);
     ClickHdl(m_pTopButton);
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 267186efe9c4..dfffd5dbe369 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -107,7 +107,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
 {
     WaitObject aWait( pParent );
 
-    m_nFormatId = AddTabPage("format", SwLabFmtPage::Create, 0);
+    m_nFormatId = AddTabPage("format", SwLabFormatPage::Create, 0);
     m_nOptionsId = AddTabPage("options", SwLabPrtPage::Create, 0);
     m_nCardsId = AddTabPage("cards", SwVisitingCardPage::Create, 0);
     m_sBusinessCardDlg = GetPageText(m_nCardsId);
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index d1d4d27ca74a..b5a9c92eeb43 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -169,8 +169,8 @@ void SwVisitingCardPage::UpdateFields()
 
 void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, const SwLabItem& rItem)
 {
-    uno::Reference< text::XTextFieldsSupplier >  xFlds(xModel, uno::UNO_QUERY);
-    uno::Reference< container::XNameAccess >  xFldMasters = xFlds->getTextFieldMasters();
+    uno::Reference< text::XTextFieldsSupplier >  xFields(xModel, uno::UNO_QUERY);
+    uno::Reference< container::XNameAccess >  xFieldMasters = xFields->getTextFieldMasters();
 
     static const struct _SwLabItemMap {
         const char* pName;
@@ -215,17 +215,17 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
     {
         for( const _SwLabItemMap* p = aArr; p->pName; ++p )
         {
-            OUString uFldName(
+            OUString uFieldName(
                 "com.sun.star.text.FieldMaster.User."
                 + OUString::createFromAscii(p->pName));
-            if( xFldMasters->hasByName( uFldName ))
+            if( xFieldMasters->hasByName( uFieldName ))
             {
-                uno::Any aFirstName = xFldMasters->getByName( uFldName );
-                uno::Reference< beans::XPropertySet >  xFld;
-                aFirstName >>= xFld;
+                uno::Any aFirstName = xFieldMasters->getByName( uFieldName );
+                uno::Reference< beans::XPropertySet >  xField;
+                aFirstName >>= xField;
                 uno::Any aContent;
                 aContent <<= rItem.*p->pValue;
-                xFld->setPropertyValue( UNO_NAME_CONTENT, aContent );
+                xField->setPropertyValue( UNO_NAME_CONTENT, aContent );
             }
         }
     }
@@ -234,8 +234,8 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
 
     }
 
-    uno::Reference< container::XEnumerationAccess >  xFldAcc = xFlds->getTextFields();
-    uno::Reference< util::XRefreshable >  xRefresh(xFldAcc, uno::UNO_QUERY);
+    uno::Reference< container::XEnumerationAccess >  xFieldAcc = xFields->getTextFields();
+    uno::Reference< util::XRefreshable >  xRefresh(xFieldAcc, uno::UNO_QUERY);
     xRefresh->refresh();
 }
 
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 5f8f72d59746..aa81e11ef13b 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -292,7 +292,7 @@ void SwLabPreview::UpdateItem(const SwLabItem& rItem)
     Invalidate();
 }
 
-SwLabFmtPage::SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)
+SwLabFormatPage::SwLabFormatPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "LabelFormatPage",
         "modules/swriter/ui/labelformatpage.ui", &rSet)
     , bModified(false)
@@ -327,7 +327,7 @@ SwLabFmtPage::SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)
     SetMetric(*m_pPHeightField, aMetric);
 
     // Install handlers
-    Link<> aLk = LINK(this, SwLabFmtPage, ModifyHdl);
+    Link<> aLk = LINK(this, SwLabFormatPage, ModifyHdl);
     m_pHDistField->SetModifyHdl( aLk );
     m_pVDistField->SetModifyHdl( aLk );
     m_pWidthField->SetModifyHdl( aLk );
@@ -339,7 +339,7 @@ SwLabFmtPage::SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)
     m_pPWidthField->SetModifyHdl( aLk );
     m_pPHeightField->SetModifyHdl( aLk );
 
-    aLk = LINK(this, SwLabFmtPage, LoseFocusHdl);
+    aLk = LINK(this, SwLabFormatPage, LoseFocusHdl);
     m_pHDistField->SetLoseFocusHdl( aLk );
     m_pVDistField->SetLoseFocusHdl( aLk );
     m_pWidthField->SetLoseFocusHdl( aLk );
@@ -351,18 +351,18 @@ SwLabFmtPage::SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet)
     m_pPWidthField->SetLoseFocusHdl( aLk );
     m_pPHeightField->SetLoseFocusHdl( aLk );
 
-    m_pSavePB->SetClickHdl( LINK (this, SwLabFmtPage, SaveHdl));
+    m_pSavePB->SetClickHdl( LINK (this, SwLabFormatPage, SaveHdl));
     // Set timer
     aPreviewIdle.SetPriority(SchedulerPriority::LOWEST);
-    aPreviewIdle.SetIdleHdl(LINK(this, SwLabFmtPage, PreviewHdl));
+    aPreviewIdle.SetIdleHdl(LINK(this, SwLabFormatPage, PreviewHdl));
 }
 
-SwLabFmtPage::~SwLabFmtPage()
+SwLabFormatPage::~SwLabFormatPage()
 {
     disposeOnce();
 }
 
-void SwLabFmtPage::dispose()
+void SwLabFormatPage::dispose()
 {
     m_pMakeFI.clear();
     m_pTypeFI.clear();
@@ -383,7 +383,7 @@ void SwLabFmtPage::dispose()
 
 
 // Modify-handler of MetricFields. start preview timer
-IMPL_LINK_NOARG(SwLabFmtPage, ModifyHdl)
+IMPL_LINK_NOARG(SwLabFormatPage, ModifyHdl)
 {
     bModified = true;
     aPreviewIdle.Start();
@@ -391,7 +391,7 @@ IMPL_LINK_NOARG(SwLabFmtPage, ModifyHdl)
 }
 
 // Invalidate preview
-IMPL_LINK_NOARG_TYPED(SwLabFmtPage, PreviewHdl, Idle *, void)
+IMPL_LINK_NOARG_TYPED(SwLabFormatPage, PreviewHdl, Idle *, void)
 {
     aPreviewIdle.Stop();
     ChangeMinMax();
@@ -400,14 +400,14 @@ IMPL_LINK_NOARG_TYPED(SwLabFmtPage, PreviewHdl, Idle *, void)
 }
 
 // LoseFocus-Handler: Update on change
-IMPL_LINK( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
+IMPL_LINK( SwLabFormatPage, LoseFocusHdl, Control *, pControl )
 {
     if (static_cast<Edit*>( pControl)->IsModified())
         PreviewHdl(0);
     return 0;
 }
 
-void SwLabFmtPage::ChangeMinMax()
+void SwLabFormatPage::ChangeMinMax()
 {
     long lMax = 31748; // 56 cm
     long nMinSize = 10; // 0,1cm
@@ -486,18 +486,18 @@ void SwLabFmtPage::ChangeMinMax()
     m_pPHeightField->Reformat();
 }
 
-VclPtr<SfxTabPage> SwLabFmtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwLabFormatPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SfxTabPage>(new SwLabFmtPage(pParent, *rSet), SAL_NO_ACQUIRE);
+    return VclPtr<SfxTabPage>(new SwLabFormatPage(pParent, *rSet), SAL_NO_ACQUIRE);
 }
 
-void SwLabFmtPage::ActivatePage(const SfxItemSet& rSet)
+void SwLabFormatPage::ActivatePage(const SfxItemSet& rSet)
 {
     SfxItemSet aSet(rSet);
     Reset(&aSet);
 }
 
-SfxTabPage::sfxpg SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet)
+SfxTabPage::sfxpg SwLabFormatPage::DeactivatePage(SfxItemSet* _pSet)
 {
     if (_pSet)
         FillItemSet(_pSet);
@@ -505,7 +505,7 @@ SfxTabPage::sfxpg SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet)
     return LEAVE_PAGE;
 }
 
-void SwLabFmtPage::FillItem(SwLabItem& rItem)
+void SwLabFormatPage::FillItem(SwLabItem& rItem)
 {
     if (bModified)
     {
@@ -525,7 +525,7 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem)
     }
 }
 
-bool SwLabFmtPage::FillItemSet(SfxItemSet* rSet)
+bool SwLabFormatPage::FillItemSet(SfxItemSet* rSet)
 {
     FillItem(aItem);
     rSet->Put(aItem);
@@ -533,7 +533,7 @@ bool SwLabFmtPage::FillItemSet(SfxItemSet* rSet)
     return true;
 }
 
-void SwLabFmtPage::Reset(const SfxItemSet* )
+void SwLabFormatPage::Reset(const SfxItemSet* )
 {
     // Initialise fields
     GetParentSwLabDlg()->GetLabItem(aItem);
@@ -566,7 +566,7 @@ void SwLabFmtPage::Reset(const SfxItemSet* )
     PreviewHdl(0);
 }
 
-IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl)
+IMPL_LINK_NOARG(SwLabFormatPage, SaveHdl)
 {
     SwLabRec aRec;
     aRec.lHDist  = static_cast< long >(GETFLDVAL(*m_pHDistField));
@@ -598,7 +598,7 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl)
     return 0;
 }
 
-SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec)
+SwSaveLabelDlg::SwSaveLabelDlg(SwLabFormatPage* pParent, SwLabRec& rRec)
     : ModalDialog(pParent, "SaveLabelDialog",
         "modules/swriter/ui/savelabeldialog.ui")
     , bSuccess(false)
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index db9826a0c429..9959db71a6a0 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -23,7 +23,7 @@
 #include "labimg.hxx"
 #include <vcl/msgbox.hxx>
 #include <vcl/idle.hxx>
-class SwLabFmtPage;
+class SwLabFormatPage;
 
 class SwLabPreview : public vcl::Window
 {
@@ -65,7 +65,7 @@ public:
     void UpdateItem(const SwLabItem& rItem);
 };
 
-class SwLabFmtPage : public SfxTabPage
+class SwLabFormatPage : public SfxTabPage
 {
     VclPtr<FixedText>    m_pMakeFI;
     VclPtr<FixedText>    m_pTypeFI;
@@ -98,8 +98,8 @@ class SwLabFmtPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
 public:
-    SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    virtual ~SwLabFmtPage();
+    SwLabFormatPage(vcl::Window* pParent, const SfxItemSet& rSet);
+    virtual ~SwLabFormatPage();
     virtual void dispose() SAL_OVERRIDE;
 
     static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
@@ -120,14 +120,14 @@ class SwSaveLabelDlg : public ModalDialog
     VclPtr<OKButton>   m_pOKPB;
 
     bool        bSuccess;
-    VclPtr<SwLabFmtPage>   pLabPage;
+    VclPtr<SwLabFormatPage>   pLabPage;
     SwLabRec&       rLabRec;
 
     DECL_LINK(OkHdl, void *);
     DECL_LINK(ModifyHdl, void *);
 
 public:
-    SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec);
+    SwSaveLabelDlg(SwLabFormatPage* pParent, SwLabRec& rRec);
     virtual ~SwSaveLabelDlg();
     virtual void dispose() SAL_OVERRIDE;
 
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 636ba4babb56..8b68dddb984e 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -129,7 +129,7 @@ void SwXSelChgLstnr_Impl::disposing( const EventObject&  ) throw (RuntimeExcepti
 
 SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
         const OUString& rSourceName,
-        const OUString& rTblName,
+        const OUString& rTableName,
         sal_Int32 nCommandType,
         const uno::Reference< XConnection>& _xConnection,
         Sequence< Any >* pSelection) :
@@ -170,7 +170,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
     get(m_pFilterFT, "fileformatlabel");
     get(m_pFilterLB, "fileformat");
 
-    get(m_pAddressFldLB, "address");
+    get(m_pAddressFieldLB, "address");
     get(m_pSubjectFT, "subjectlabel");
     get(m_pSubjectED, "subject");
     get(m_pFormatFT, "mailformatlabel");
@@ -233,7 +233,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
                 pProperties[0].Name = "DataSourceName";
                 pProperties[0].Value <<= rSourceName;
                 pProperties[1].Name = "Command";
-                pProperties[1].Value <<= rTblName;
+                pProperties[1].Value <<= rTableName;
                 pProperties[2].Name = "CommandType";
                 pProperties[2].Value <<= nCommandType;
                 xD->dispatch(aURL, aProperties);
@@ -256,10 +256,10 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
 
     pModOpt = SW_MOD()->GetModuleConfig();
 
-    MailTxtFormats nMailingMode(pModOpt->GetMailingFormats());
-    m_pFormatSwCB->Check(bool(nMailingMode & MailTxtFormats::OFFICE));
-    m_pFormatHtmlCB->Check(bool(nMailingMode & MailTxtFormats::HTML));
-    m_pFormatRtfCB->Check(bool(nMailingMode & MailTxtFormats::RTF));
+    MailTextFormats nMailingMode(pModOpt->GetMailingFormats());
+    m_pFormatSwCB->Check(bool(nMailingMode & MailTextFormats::OFFICE));
+    m_pFormatHtmlCB->Check(bool(nMailingMode & MailTextFormats::HTML));
+    m_pFormatRtfCB->Check(bool(nMailingMode & MailTextFormats::RTF));
 
     m_pAllRB->Check(true);
 
@@ -299,13 +299,13 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
 
     SwDBManager* pDBManager = rSh.GetDBManager();
     if(_xConnection.is())
-        SwDBManager::GetColumnNames(m_pAddressFldLB, _xConnection, rTblName);
+        SwDBManager::GetColumnNames(m_pAddressFieldLB, _xConnection, rTableName);
     else
-        pDBManager->GetColumnNames(m_pAddressFldLB, rSourceName, rTblName);
-    for(sal_Int32 nEntry = 0; nEntry < m_pAddressFldLB->GetEntryCount(); ++nEntry)
-        m_pColumnLB->InsertEntry(m_pAddressFldLB->GetEntry(nEntry));
+        pDBManager->GetColumnNames(m_pAddressFieldLB, rSourceName, rTableName);
+    for(sal_Int32 nEntry = 0; nEntry < m_pAddressFieldLB->GetEntryCount(); ++nEntry)
+        m_pColumnLB->InsertEntry(m_pAddressFieldLB->GetEntry(nEntry));
 
-    m_pAddressFldLB->SelectEntry("EMAIL");
+    m_pAddressFieldLB->SelectEntry("EMAIL");
 
     OUString sPath(pModOpt->GetMailingPath());
     if(sPath.isEmpty())
@@ -326,8 +326,8 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
     else
         m_pColumnLB->SelectEntry(pModOpt->GetNameFromColumn());
 
-    if (m_pAddressFldLB->GetSelectEntryCount() == 0)
-        m_pAddressFldLB->SelectEntryPos(0);
+    if (m_pAddressFieldLB->GetSelectEntryCount() == 0)
+        m_pAddressFieldLB->SelectEntryPos(0);
     if (m_pColumnLB->GetSelectEntryCount() == 0)
         m_pColumnLB->SelectEntryPos(0);
 
@@ -427,7 +427,7 @@ void SwMailMergeDlg::dispose()
     m_pPathPB.clear();
     m_pFilterFT.clear();
     m_pFilterLB.clear();
-    m_pAddressFldLB.clear();
+    m_pAddressFieldLB.clear();
     m_pSubjectFT.clear();
     m_pSubjectED.clear();
     m_pFormatFT.clear();
@@ -616,14 +616,14 @@ bool SwMailMergeDlg::ExecQryShell()
 
     pModOpt->SetSinglePrintJob(m_pSingleJobsCB->IsChecked());
 
-    MailTxtFormats nMailingMode = MailTxtFormats::NONE;
+    MailTextFormats nMailingMode = MailTextFormats::NONE;
 
     if (m_pFormatSwCB->IsChecked())
-        nMailingMode |= MailTxtFormats::OFFICE;
+        nMailingMode |= MailTextFormats::OFFICE;
     if (m_pFormatHtmlCB->IsChecked())
-        nMailingMode |= MailTxtFormats::HTML;
+        nMailingMode |= MailTextFormats::HTML;
     if (m_pFormatRtfCB->IsChecked())
-        nMailingMode |= MailTxtFormats::RTF;
+        nMailingMode |= MailTextFormats::RTF;
     pModOpt->SetMailingFormats(nMailingMode);
     return true;
 }
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index f7deb4c63f95..6263190669aa 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -98,7 +98,7 @@ void sw::DropDownFieldDialog::Apply()
                 static_cast<SwDropDownField *>( pDropField->CopyField() ) );
 
             pCopy->SetPar1(sSelect);
-            rSh.SwEditShell::UpdateFlds(*pCopy);
+            rSh.SwEditShell::UpdateFields(*pCopy);
 
             rSh.SetUndoNoResetModified();
             rSh.EndAllAction();
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx
index 00d308eda173..976230e86f30 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.cxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx
@@ -23,21 +23,21 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/help.hxx>
 
-SwFldRefTreeListBox::SwFldRefTreeListBox(vcl::Window* pParent, WinBits nStyle)
+SwFieldRefTreeListBox::SwFieldRefTreeListBox(vcl::Window* pParent, WinBits nStyle)
     : SvTreeListBox(pParent, nStyle)
 {
 }
 
-VCL_BUILDER_DECL_FACTORY(SwFldRefTreeListBox)
+VCL_BUILDER_DECL_FACTORY(SwFieldRefTreeListBox)
 {
     WinBits nWinStyle = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
     if (!sBorder.isEmpty())
         nWinStyle |= WB_BORDER;
-    rRet = VclPtr<SwFldRefTreeListBox>::Create(pParent, nWinStyle);
+    rRet = VclPtr<SwFieldRefTreeListBox>::Create(pParent, nWinStyle);
 }
 
-void SwFldRefTreeListBox::RequestHelp( const HelpEvent& rHEvt )
+void SwFieldRefTreeListBox::RequestHelp( const HelpEvent& rHEvt )
 {
     bool bCallBase( true );
     if ( rHEvt.GetMode() & HelpEventMode::QUICK )
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx
index 216d32ae7392..42e5e568bed1 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.hxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx
@@ -21,13 +21,13 @@
 
 #include <svtools/treelistbox.hxx>
 
-class SwFldRefTreeListBox : public SvTreeListBox
+class SwFieldRefTreeListBox : public SvTreeListBox
 {
 protected:
     virtual void    RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
 
 public:
-    SwFldRefTreeListBox(vcl::Window* pParent, WinBits nStyle);
+    SwFieldRefTreeListBox(vcl::Window* pParent, WinBits nStyle);
 };
 #endif
 
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 3f4c1d9f48bb..a5f61470f534 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -56,7 +56,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
         "modules/swriter/ui/exchangedatabases.ui")
     , aImageList(SW_RES(ILIST_DB_DLG))
     , pSh(rVw.GetWrtShellPtr())
-    , pMgr( new SwFldMgr() )
+    , pMgr( new SwFieldMgr() )
 {
     get(m_pUsedDBTLB, "inuselb");
     get(m_pAvailDBTLB, "availablelb");
@@ -181,9 +181,9 @@ void SwChangeDBDlg::dispose()
 // close
 void SwChangeDBDlg::Apply()
 {
-    UpdateFlds();
+    UpdateFields();
 }
-void SwChangeDBDlg::UpdateFlds()
+void SwChangeDBDlg::UpdateFields()
 {
     std::vector<OUString> aDBNames;
     aDBNames.reserve(m_pUsedDBTLB->GetSelectionCount());
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index be5e04189987..96ceb81cd274 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -33,8 +33,8 @@
 #define USER_DATA_VERSION_1     "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
-SwFldDBPage::SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
-    : SwFldPage(pParent, "FldDbPage",
+SwFieldDBPage::SwFieldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
+    : SwFieldPage(pParent, "FieldDbPage",
         "modules/swriter/ui/flddbpage.ui", rCoreSet)
     , m_nOldFormat(0)
     , m_nOldSubType(0)
@@ -64,20 +64,20 @@ SwFldDBPage::SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
 
     m_aOldNumSelectHdl = m_pNumFormatLB->GetSelectHdl();
 
-    m_pNumFormatLB->SetSelectHdl(LINK(this, SwFldDBPage, NumSelectHdl));
-    m_pDatabaseTLB->SetSelectHdl(LINK(this, SwFldDBPage, TreeSelectHdl));
-    m_pDatabaseTLB->SetDoubleClickHdl(LINK(this, SwFldDBPage, InsertHdl));
+    m_pNumFormatLB->SetSelectHdl(LINK(this, SwFieldDBPage, NumSelectHdl));
+    m_pDatabaseTLB->SetSelectHdl(LINK(this, SwFieldDBPage, TreeSelectHdl));
+    m_pDatabaseTLB->SetDoubleClickHdl(LINK(this, SwFieldDBPage, InsertHdl));
 
-    m_pValueED->SetModifyHdl(LINK(this, SwFldDBPage, ModifyHdl));
-    m_pAddDBPB->SetClickHdl(LINK(this, SwFldDBPage, AddDBHdl));
+    m_pValueED->SetModifyHdl(LINK(this, SwFieldDBPage, ModifyHdl));
+    m_pAddDBPB->SetClickHdl(LINK(this, SwFieldDBPage, AddDBHdl));
 }
 
-SwFldDBPage::~SwFldDBPage()
+SwFieldDBPage::~SwFieldDBPage()
 {
     disposeOnce();
 }
 
-void SwFldDBPage::dispose()
+void SwFieldDBPage::dispose()
 {
     m_pTypeLB.clear();
     m_pDatabaseTLB.clear();
@@ -91,11 +91,11 @@ void SwFldDBPage::dispose()
     m_pNumFormatLB.clear();
     m_pFormatLB.clear();
     m_pFormat.clear();
-    SwFldPage::dispose();
+    SwFieldPage::dispose();
 }
 
 // initialise TabPage
-void SwFldDBPage::Reset(const SfxItemSet*)
+void SwFieldDBPage::Reset(const SfxItemSet*)
 {
     Init(); // Allgemeine initialisierung
 
@@ -105,15 +105,15 @@ void SwFldDBPage::Reset(const SfxItemSet*)
 
     m_pTypeLB->Clear();
 
-    if (!IsFldEdit())
+    if (!IsFieldEdit())
     {
         // initialise TypeListBox
-        const SwFldGroupRgn& rRg = SwFldMgr::GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
+        const SwFieldGroupRgn& rRg = SwFieldMgr::GetGroupRange(IsFieldDlgHtmlMode(), GetGroup());
 
         for(sal_uInt16 i = rRg.nStart; i < rRg.nEnd; ++i)
         {
-            const sal_uInt16 nTypeId = SwFldMgr::GetTypeId(i);
-            const sal_Int32 nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(i));
+            const sal_uInt16 nTypeId = SwFieldMgr::GetTypeId(i);
+            const sal_Int32 nPos = m_pTypeLB->InsertEntry(SwFieldMgr::GetTypeStr(i));
             m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
         }
     }
@@ -121,7 +121,7 @@ void SwFldDBPage::Reset(const SfxItemSet*)
     {
         const sal_uInt16 nTypeId = GetCurField()->GetTypeId();
         const sal_Int32 nPos = m_pTypeLB->InsertEntry(
-            SwFldMgr::GetTypeStr(SwFldMgr::GetPos(nTypeId)));
+            SwFieldMgr::GetTypeStr(SwFieldMgr::GetPos(nTypeId)));
         m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
     }
 
@@ -131,17 +131,17 @@ void SwFldDBPage::Reset(const SfxItemSet*)
 
     m_pFormatLB->Clear();
 
-    const sal_uInt16 nSize = GetFldMgr().GetFormatCount(TYP_DBSETNUMBERFLD, false, IsFldDlgHtmlMode());
+    const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(TYP_DBSETNUMBERFLD, false, IsFieldDlgHtmlMode());
     for( sal_uInt16 i = 0; i < nSize; ++i )
     {
-        const sal_Int32 nEntryPos = m_pFormatLB->InsertEntry(GetFldMgr().GetFormatStr(TYP_DBSETNUMBERFLD, i));
-        const sal_uInt16 nFmtId = GetFldMgr().GetFormatId( TYP_DBSETNUMBERFLD, i );
-        m_pFormatLB->SetEntryData( nEntryPos, reinterpret_cast<void*>(nFmtId) );
-        if( SVX_NUM_ARABIC == nFmtId )
+        const sal_Int32 nEntryPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr(TYP_DBSETNUMBERFLD, i));
+        const sal_uInt16 nFormatId = GetFieldMgr().GetFormatId( TYP_DBSETNUMBERFLD, i );
+        m_pFormatLB->SetEntryData( nEntryPos, reinterpret_cast<void*>(nFormatId) );
+        if( SVX_NUM_ARABIC == nFormatId )
             m_pFormatLB->SelectEntryPos( nEntryPos );
     }
 
-    if (!IsFldEdit())
+    if (!IsFieldEdit())
     {
         if (nOldPos != LISTBOX_ENTRY_NOTFOUND)
             m_pTypeLB->SelectEntryPos(nOldPos);
@@ -183,10 +183,10 @@ void SwFldDBPage::Reset(const SfxItemSet*)
     TypeHdl(0);
 
     m_pTypeLB->SetUpdateMode(true);
-    m_pTypeLB->SetSelectHdl(LINK(this, SwFldDBPage, TypeHdl));
-    m_pTypeLB->SetDoubleClickHdl(LINK(this, SwFldDBPage, InsertHdl));
+    m_pTypeLB->SetSelectHdl(LINK(this, SwFieldDBPage, TypeHdl));
+    m_pTypeLB->SetDoubleClickHdl(LINK(this, SwFieldDBPage, InsertHdl));
 
-    if (IsFldEdit())
+    if (IsFieldEdit())
     {
         m_pConditionED->SaveValue();
         m_pValueED->SaveValue();
@@ -196,7 +196,7 @@ void SwFldDBPage::Reset(const SfxItemSet*)
     }
 }
 
-bool SwFldDBPage::FillItemSet(SfxItemSet* )
+bool SwFieldDBPage::FillItemSet(SfxItemSet* )
 {
     OUString sTableName;
     OUString sColumnName;
@@ -251,31 +251,31 @@ bool SwFldDBPage::FillItemSet(SfxItemSet* )
         OUString sTempDBName = m_pDatabaseTLB->GetDBName(sTempTableName, sTempColumnName);
         bool bDBListBoxChanged = m_sOldDBName != sTempDBName ||
             m_sOldTableName != sTempTableName || m_sOldColumnName != sTempColumnName;
-        if (!IsFldEdit() ||
+        if (!IsFieldEdit() ||
             m_pConditionED->IsValueChangedFromSaved() ||
             m_pValueED->GetSavedValue() != aVal ||
              bDBListBoxChanged ||
              m_nOldFormat != nFormat || m_nOldSubType != nSubType)
         {
-            InsertFld( nTypeId, nSubType, aName, aVal, nFormat);
+            InsertField( nTypeId, nSubType, aName, aVal, nFormat);
         }
     }
 
     return false;
 }
 
-VclPtr<SfxTabPage> SwFldDBPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldDBPage::Create( vcl::Window* pParent,
                                         const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwFldDBPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwFieldDBPage>::Create( pParent, *rAttrSet );
 }
 
-sal_uInt16 SwFldDBPage::GetGroup()
+sal_uInt16 SwFieldDBPage::GetGroup()
 {
     return GRP_DB;
 }
 
-IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
+IMPL_LINK( SwFieldDBPage, TypeHdl, ListBox *, pBox )
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
@@ -299,7 +299,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
 
         m_pDatabaseTLB->ShowColumns(nTypeId == TYP_DBFLD);
 
-        if (IsFldEdit())
+        if (IsFieldEdit())
         {
             SwDBData aData;
             OUString sColumnName;
@@ -326,7 +326,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
                 if (pBox)   // type was changed by user
                     m_pDBFormatRB->Check();
 
-                if (IsFldEdit())
+                if (IsFieldEdit())
                 {
                     if (GetCurField()->GetFormat() != 0 && GetCurField()->GetFormat() != SAL_MAX_UINT32)
                         m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat());
@@ -343,7 +343,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
                 // no break!
             case TYP_DBNEXTSETFLD:
                 bCond = true;
-                if (IsFldEdit())
+                if (IsFieldEdit())
                 {
                     m_pConditionED->SetText(GetCurField()->GetPar1());
                     m_pValueED->SetText(GetCurField()->GetPar2());
@@ -358,7 +358,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
                 m_pNewFormatRB->Check();
                 m_pNumFormatLB->Hide();
                 m_pFormatLB->Show();
-                if( IsFldEdit() )
+                if( IsFieldEdit() )
                 {
                     for( sal_Int32 nI = m_pFormatLB->GetEntryCount(); nI; )
                         if( GetCurField()->GetFormat() == reinterpret_cast<sal_uLong>(
@@ -382,7 +382,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
         }
         m_pFormat->Enable(bDBFormat || bFormat);
 
-        if (!IsFldEdit())
+        if (!IsFieldEdit())
         {
             m_pValueED->SetText(aEmptyOUStr);
             if (bCond)
@@ -397,7 +397,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
     return 0;
 }
 
-IMPL_LINK( SwFldDBPage, NumSelectHdl, NumFormatListBox *, pLB )
+IMPL_LINK( SwFieldDBPage, NumSelectHdl, NumFormatListBox *, pLB )
 {
     m_pNewFormatRB->Check();
     m_aOldNumSelectHdl.Call(pLB);
@@ -405,7 +405,7 @@ IMPL_LINK( SwFldDBPage, NumSelectHdl, NumFormatListBox *, pLB )
     return 0;
 }
 
-void SwFldDBPage::CheckInsert()
+void SwFieldDBPage::CheckInsert()
 {
     bool bInsert = true;
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
@@ -434,7 +434,7 @@ void SwFldDBPage::CheckInsert()
     EnableInsert(bInsert);
 }
 
-IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
+IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
 {
     SvTreeListEntry* pEntry = pBox->GetCurEntry();
     if (pEntry)
@@ -458,11 +458,11 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
                 OUString sColumnName;
                 sal_Bool bIsTable;
                 OUString sDBName = m_pDatabaseTLB->GetDBName(sTableName, sColumnName, &bIsTable);
-                bNumFormat = GetFldMgr().IsDBNumeric(sDBName,
+                bNumFormat = GetFieldMgr().IsDBNumeric(sDBName,
                             sTableName,
                             bIsTable,
                             sColumnName);
-                if (!IsFldEdit())
+                if (!IsFieldEdit())
                     m_pDBFormatRB->Check();
             }
 
@@ -475,7 +475,7 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
     return 0;
 }
 
-IMPL_LINK_NOARG(SwFldDBPage, AddDBHdl)
+IMPL_LINK_NOARG(SwFieldDBPage, AddDBHdl)
 {
     OUString sNewDB = SwDBManager::LoadAndRegisterDataSource();
     if(!sNewDB.isEmpty())
@@ -486,13 +486,13 @@ IMPL_LINK_NOARG(SwFldDBPage, AddDBHdl)
 }
 
 // Modify
-IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl)
+IMPL_LINK_NOARG(SwFieldDBPage, ModifyHdl)
 {
     CheckInsert();
     return 0;
 }
 
-void    SwFldDBPage::FillUserData()
+void    SwFieldDBPage::FillUserData()
 {
     const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos();
     const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos )
@@ -500,7 +500,7 @@ void    SwFldDBPage::FillUserData()
     SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel ));
 }
 
-void SwFldDBPage::ActivateMailMergeAddress()
+void SwFieldDBPage::ActivateMailMergeAddress()
 {
     sal_uLong nData = TYP_DBFLD;
     m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos( reinterpret_cast<const void*>( nData ) ));
@@ -509,7 +509,7 @@ void SwFldDBPage::ActivateMailMergeAddress()
     m_pDatabaseTLB->Select(rData.sDataSource, rData.sCommand, aEmptyOUStr);
 }
 
-void SwFldDBPage::SetWrtShell(SwWrtShell& rSh)
+void SwFieldDBPage::SetWrtShell(SwWrtShell& rSh)
 {
     m_pDatabaseTLB->SetWrtShell(rSh);
 }
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index c8328c445b03..0ac7f4c37768 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -30,7 +30,7 @@
 
 #include "fldpage.hxx"
 
-class SwFldDBPage : public SwFldPage
+class SwFieldDBPage : public SwFieldPage
 {
     VclPtr<ListBox>            m_pTypeLB;
     VclPtr<SwDBTreeList>       m_pDatabaseTLB;
@@ -62,15 +62,15 @@ class SwFldDBPage : public SwFldPage
 
     void                CheckInsert();
 
-    using SwFldPage::SetWrtShell;
+    using SwFieldPage::SetWrtShell;
 
 protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rSet);
+                        SwFieldDBPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
-                        virtual ~SwFldDBPage();
+                        virtual ~SwFieldDBPage();
     virtual void        dispose() SAL_OVERRIDE;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 8814ceb3c3f9..fe8e4feb0e93 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -47,8 +47,8 @@
 using namespace nsSwDocInfoSubType;
 using namespace com::sun::star;
 
-SwFldDokInfPage::SwFldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
-    :  SwFldPage(pParent, "FldDocInfoPage",
+SwFieldDokInfPage::SwFieldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
+    :  SwFieldPage(pParent, "FieldDocInfoPage",
         "modules/swriter/ui/flddocinfopage.ui", rCoreSet)
     , pSelEntry(0)
     , nOldSel(0)
@@ -87,12 +87,12 @@ SwFldDokInfPage::SwFldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCoreSe
         pItem->GetValue() >>= xCustomPropertySet;
 }
 
-SwFldDokInfPage::~SwFldDokInfPage()
+SwFieldDokInfPage::~SwFieldDokInfPage()
 {
     disposeOnce();
 }
 
-void SwFldDokInfPage::dispose()
+void SwFieldDokInfPage::dispose()
 {
     m_pTypeTLB.clear();
     m_pSelection.clear();
@@ -100,10 +100,10 @@ void SwFldDokInfPage::dispose()
     m_pFormat.clear();
     m_pFormatLB.clear();
     m_pFixedCB.clear();
-    SwFldPage::dispose();
+    SwFieldPage::dispose();
 }
 
-void SwFldDokInfPage::Reset(const SfxItemSet* )
+void SwFieldDokInfPage::Reset(const SfxItemSet* )
 {
     Init(); // general initialisation
 
@@ -118,7 +118,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet* )
     SvTreeListEntry* pInfo = 0;
 
     sal_uInt16 nSubType = USHRT_MAX;
-    if (IsFldEdit())
+    if (IsFieldEdit())
     {
         const SwField* pCurField = GetCurField();
         nSubType = static_cast<const SwDocInfoField*>(pCurField)->GetSubType() & 0xff;
@@ -144,10 +144,10 @@ void SwFldDokInfPage::Reset(const SfxItemSet* )
     }
 
     std::vector<OUString> aLst;
-    GetFldMgr().GetSubTypes(TYP_DOCINFOFLD, aLst);
+    GetFieldMgr().GetSubTypes(TYP_DOCINFOFLD, aLst);
     for(size_t i = 0; i < aLst.size(); ++i)
     {
-        if (!IsFldEdit() || nSubType == i)
+        if (!IsFieldEdit() || nSubType == i)
         {
             if (DI_CUSTOM == i)
             {
@@ -177,7 +177,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet* )
             }
             else
             {
-                if (!(IsFldDlgHtmlMode() && (i == DI_EDIT || i == DI_THEMA || i == DI_PRINT)))
+                if (!(IsFieldDlgHtmlMode() && (i == DI_EDIT || i == DI_THEMA || i == DI_PRINT)))
                 {
                     pEntry = m_pTypeTLB->InsertEntry(aLst[i]);
                     pEntry->SetUserData(reinterpret_cast<void*>(i));
@@ -205,13 +205,13 @@ void SwFldDokInfPage::Reset(const SfxItemSet* )
         TypeHdl();
 
     m_pTypeTLB->SetUpdateMode(true);
-    m_pTypeTLB->SetSelectHdl(LINK(this, SwFldDokInfPage, TypeHdl));
-    m_pTypeTLB->SetDoubleClickHdl(LINK(this, SwFldDokInfPage, InsertHdl));
-    m_pSelectionLB->SetSelectHdl(LINK(this, SwFldDokInfPage, SubTypeHdl));
-    m_pSelectionLB->SetDoubleClickHdl(LINK(this, SwFldDokInfPage, InsertHdl));
-    m_pFormatLB->SetDoubleClickHdl(LINK(this, SwFldDokInfPage, InsertHdl));
+    m_pTypeTLB->SetSelectHdl(LINK(this, SwFieldDokInfPage, TypeHdl));
+    m_pTypeTLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, InsertHdl));
+    m_pSelectionLB->SetSelectHdl(LINK(this, SwFieldDokInfPage, SubTypeHdl));
+    m_pSelectionLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, InsertHdl));
+    m_pFormatLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, InsertHdl));
 
-    if (IsFldEdit())
+    if (IsFieldEdit())
     {
         nOldSel = m_pSelectionLB->GetSelectEntryPos();
         nOldFormat = GetCurField()->GetFormat();
@@ -219,7 +219,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet* )
     }
 }
 
-IMPL_LINK_NOARG(SwFldDokInfPage, TypeHdl)
+IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl)
 {
     // save old ListBoxPos
     SvTreeListEntry* pOldEntry = pSelEntry;
@@ -240,7 +240,7 @@ IMPL_LINK_NOARG(SwFldDokInfPage, TypeHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl)
+IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl)
 {
     sal_uInt16 nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData());
     sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
@@ -327,11 +327,11 @@ IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl)
         bEnable = true;
     }
 
-    sal_uLong nFormat = IsFldEdit() ? static_cast<SwDocInfoField*>(GetCurField())->GetFormat() : 0;
+    sal_uLong nFormat = IsFieldEdit() ? static_cast<SwDocInfoField*>(GetCurField())->GetFormat() : 0;
 
-    sal_uInt16 nOldSubType = IsFldEdit() ? (static_cast<SwDocInfoField*>(GetCurField())->GetSubType() & 0xff00) : 0;
+    sal_uInt16 nOldSubType = IsFieldEdit() ? (static_cast<SwDocInfoField*>(GetCurField())->GetSubType() & 0xff00) : 0;
 
-    if (IsFldEdit())
+    if (IsFieldEdit())
     {
         nPos = m_pSelectionLB->GetSelectEntryPos();
         if (nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -373,7 +373,7 @@ IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl)
     return 0;
 }
 
-sal_Int32 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
+sal_Int32 SwFieldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
 {
     // fill Format-Listbox
     sal_uInt16 nTypeId = TYP_DOCINFOFLD;
@@ -387,9 +387,9 @@ sal_Int32 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
 
     sal_uInt16 nSize = 0;
     sal_Int32 nSelPos = LISTBOX_ENTRY_NOTFOUND;
-    sal_uInt16 nExtSubType = IsFldEdit() ? (static_cast<SwDocInfoField*>(GetCurField())->GetSubType() & 0xff00) : 0;
+    sal_uInt16 nExtSubType = IsFieldEdit() ? (static_cast<SwDocInfoField*>(GetCurField())->GetSubType() & 0xff00) : 0;
 
-    if (IsFldEdit())
+    if (IsFieldEdit())
     {
         m_pFixedCB->Check((nExtSubType & DI_SUB_FIXED) != 0);
         nExtSubType = ((nExtSubType & ~DI_SUB_FIXED) >> 8) - 1;
@@ -401,12 +401,12 @@ sal_Int32 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
     }
     else
     {
-        nSize = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
+        nSize = GetFieldMgr().GetFormatCount(nTypeId, false, IsFieldDlgHtmlMode());
         for (sal_uInt16 i = 0; i < nSize; i++)
         {
-            sal_Int32 nPos = m_pSelectionLB->InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i));
-            m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId(nTypeId, i)));
-            if (IsFldEdit() && i == nExtSubType)
+            sal_Int32 nPos = m_pSelectionLB->InsertEntry(GetFieldMgr().GetFormatStr(nTypeId, i));
+            m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId(nTypeId, i)));
+            if (IsFieldEdit() && i == nExtSubType)
                 nSelPos = nPos;
         }
     }
@@ -426,7 +426,7 @@ sal_Int32 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
     return nSize;
 }
 
-bool SwFldDokInfPage::FillItemSet(SfxItemSet* )
+bool SwFieldDokInfPage::FillItemSet(SfxItemSet* )
 {
     if (!pSelEntry || (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()) == USHRT_MAX)
         return false;
@@ -451,29 +451,29 @@ bool SwFldDokInfPage::FillItemSet(SfxItemSet* )
     if(nPos != LISTBOX_ENTRY_NOTFOUND)
         nFormat = m_pFormatLB->GetFormat();
 
-    if (!IsFldEdit() || nOldSel != m_pSelectionLB->GetSelectEntryPos() ||
+    if (!IsFieldEdit() || nOldSel != m_pSelectionLB->GetSelectEntryPos() ||
         nOldFormat != nFormat || m_pFixedCB->IsValueChangedFromSaved()
         || (DI_CUSTOM == nSubType && aName != m_sOldCustomFieldName ))
     {
-        InsertFld(TYP_DOCINFOFLD, nSubType, aName, aEmptyOUStr, nFormat,
+        InsertField(TYP_DOCINFOFLD, nSubType, aName, aEmptyOUStr, nFormat,
                 ' ', m_pFormatLB->IsAutomaticLanguage());
     }
 
     return false;
 }
 
-VclPtr<SfxTabPage> SwFldDokInfPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldDokInfPage::Create( vcl::Window* pParent,
                                             const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwFldDokInfPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwFieldDokInfPage>::Create( pParent, *rAttrSet );
 }
 
-sal_uInt16 SwFldDokInfPage::GetGroup()
+sal_uInt16 SwFieldDokInfPage::GetGroup()
 {
     return GRP_REG;
 }
 
-void    SwFldDokInfPage::FillUserData()
+void    SwFieldDokInfPage::FillUserData()
 {
     SvTreeListEntry* pEntry = m_pTypeTLB->FirstSelected();
     sal_uInt16 nTypeSel = pEntry ? sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(pEntry->GetUserData())) : USHRT_MAX;
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index fc9452075b4a..7a1ea48df165 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -34,7 +34,7 @@ namespace com{namespace sun{ namespace star{ namespace beans{
     class XPropertySet;
 }}}}
 
-class SwFldDokInfPage : public SwFldPage
+class SwFieldDokInfPage : public SwFieldPage
 {
     VclPtr<SvTreeListBox>      m_pTypeTLB;
     VclPtr<VclContainer>       m_pSelection;
@@ -59,9 +59,9 @@ protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldDokInfPage(vcl::Window* pWindow, const SfxItemSet& rSet);
+                        SwFieldDokInfPage(vcl::Window* pWindow, const SfxItemSet& rSet);
 
-                        virtual ~SwFldDokInfPage();
+                        virtual ~SwFieldDokInfPage();
     virtual void        dispose() SAL_OVERRIDE;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 4a54d14bc10c..780b49deb570 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -34,8 +34,8 @@
 #define USER_DATA_VERSION_1 "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
-SwFldDokPage::SwFldDokPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
-    : SwFldPage(pParent, "FldDocumentPage",
+SwFieldDokPage::SwFieldDokPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
+    : SwFieldPage(pParent, "FieldDocumentPage",
         "modules/swriter/ui/flddocumentpage.ui", rCoreSet)
     , nOldSel(0)
     , nOldFormat(0)
@@ -67,9 +67,9 @@ SwFldDokPage::SwFldDokPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
     m_pSelectionLB->set_width_request(nWidth);
     m_pFormatLB->set_width_request(nWidth);
 
-    m_pSelectionLB->SetDoubleClickHdl(LINK(this, SwFldDokPage, InsertHdl));
-    m_pFormatLB->SetDoubleClickHdl(LINK(this, SwFldDokPage, InsertHdl));
-    m_pNumFormatLB->SetDoubleClickHdl(LINK(this, SwFldDokPage, NumFormatHdl));
+    m_pSelectionLB->SetDoubleClickHdl(LINK(this, SwFieldDokPage, InsertHdl));
+    m_pFormatLB->SetDoubleClickHdl(LINK(this, SwFieldDokPage, InsertHdl));
+    m_pNumFormatLB->SetDoubleClickHdl(LINK(this, SwFieldDokPage, NumFormatHdl));
 
     m_pLevelED->SetMax(MAXLEVEL);
     m_pDateOffsetED->SetMin(LONG_MIN);
@@ -78,12 +78,12 @@ SwFldDokPage::SwFldDokPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
     m_pNumFormatLB->SetShowLanguageControl(true);
 }
 
-SwFldDokPage::~SwFldDokPage()
+SwFieldDokPage::~SwFieldDokPage()
 {
     disposeOnce();
 }
 
-void SwFldDokPage::dispose()
+void SwFieldDokPage::dispose()
 {
     m_pTypeLB.clear();
     m_pSelection.clear();
@@ -99,30 +99,30 @@ void SwFldDokPage::dispose()
     m_pFormatLB.clear();
     m_pNumFormatLB.clear();
     m_pFixedCB.clear();
-    SwFldPage::dispose();
+    SwFieldPage::dispose();
 }
 
 
-void SwFldDokPage::Reset(const SfxItemSet* )
+void SwFieldDokPage::Reset(const SfxItemSet* )
 {
     SavePos(m_pTypeLB);
     Init(); // general initialisation
 
     // initialise TypeListBox
-    const SwFldGroupRgn& rRg = SwFldMgr::GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
+    const SwFieldGroupRgn& rRg = SwFieldMgr::GetGroupRange(IsFieldDlgHtmlMode(), GetGroup());
 
     m_pTypeLB->SetUpdateMode(false);
     m_pTypeLB->Clear();
 
     sal_Int32 nPos;
 
-    if (!IsFldEdit())
+    if (!IsFieldEdit())
     {
         bool bPage = false;
         // fill Type-Listbox
         for(sal_uInt16 i = rRg.nStart; i < rRg.nEnd; ++i)
         {
-            const sal_uInt16 nTypeId = SwFldMgr::GetTypeId(i);
+            const sal_uInt16 nTypeId = SwFieldMgr::GetTypeId(i);
 
             switch (nTypeId)
             {
@@ -138,7 +138,7 @@ void SwFldDokPage::Reset(const SfxItemSet* )
                     break;
 
                 default:
-                    nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(i));
+                    nPos = m_pTypeLB->InsertEntry(SwFieldMgr::GetTypeStr(i));
                     m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
                     break;
             }
@@ -152,7 +152,7 @@ void SwFldDokPage::Reset(const SfxItemSet* )
             nTypeId = TYP_DATEFLD;
         if (nTypeId == TYP_FIXTIMEFLD)
             nTypeId = TYP_TIMEFLD;
-        nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(SwFldMgr::GetPos(nTypeId)));
+        nPos = m_pTypeLB->InsertEntry(SwFieldMgr::GetTypeStr(SwFieldMgr::GetPos(nTypeId)));
         m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
         m_pNumFormatLB->SetAutomaticLanguage(pCurField->IsAutomaticLanguage());
         SwWrtShell *pSh = GetWrtShell();
@@ -170,9 +170,9 @@ void SwFldDokPage::Reset(const SfxItemSet* )
     RestorePos(m_pTypeLB);
 
     m_pTypeLB->SetUpdateMode(true);
-    m_pTypeLB->SetDoubleClickHdl(LINK(this, SwFldDokPage, InsertHdl));
-    m_pTypeLB->SetSelectHdl(LINK(this, SwFldDokPage, TypeHdl));
-    m_pFormatLB->SetSelectHdl(LINK(this, SwFldDokPage, FormatHdl));
+    m_pTypeLB->SetDoubleClickHdl(LINK(this, SwFieldDokPage, InsertHdl));
+    m_pTypeLB->SetSelectHdl(LINK(this, SwFieldDokPage, TypeHdl));
+    m_pFormatLB->SetSelectHdl(LINK(this, SwFieldDokPage, FormatHdl));
 
     if( !IsRefresh() )
     {
@@ -194,7 +194,7 @@ void SwFldDokPage::Reset(const SfxItemSet* )
     }
     TypeHdl(0);
 
-    if (IsFldEdit())
+    if (IsFieldEdit())
     {
         nOldSel = m_pSelectionLB->GetSelectEntryPos();
         nOldFormat = GetCurField()->GetFormat();
@@ -205,7 +205,7 @@ void SwFldDokPage::Reset(const SfxItemSet* )
     }
 }
 
-IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
+IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl)
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
@@ -234,23 +234,23 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
         if (nTypeId != USHRT_MAX)
         {
             std::vector<OUString> aLst;
-            GetFldMgr().GetSubTypes(nTypeId, aLst);
+            GetFieldMgr().GetSubTypes(nTypeId, aLst);
 
             if (nTypeId != TYP_AUTHORFLD)
                 nCount = aLst.size();
             else
-                nCount = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
+                nCount = GetFieldMgr().GetFormatCount(nTypeId, false, IsFieldDlgHtmlMode());
 
             size_t nPos;
 
             for(size_t i = 0; i < nCount; ++i)
             {
-                if (!IsFldEdit())
+                if (!IsFieldEdit())
                 {
                     if (nTypeId != TYP_AUTHORFLD)
                         nPos = m_pSelectionLB->InsertEntry(aLst[i]);
                     else
-                        nPos = m_pSelectionLB->InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i));
+                        nPos = m_pSelectionLB->InsertEntry(GetFieldMgr().GetFormatStr(nTypeId, i));
 
                     m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(i));
                 }
@@ -280,10 +280,10 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
 
                         case TYP_AUTHORFLD:
                         {
-                            const OUString sFmt(GetFldMgr().GetFormatStr(nTypeId, i));
-                            nPos = m_pSelectionLB->InsertEntry(sFmt);
+                            const OUString sFormat(GetFieldMgr().GetFormatStr(nTypeId, i));
+                            nPos = m_pSelectionLB->InsertEntry(sFormat);
                             m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(i));
-                            m_pSelectionLB->SelectEntry(GetFldMgr().GetFormatStr(nTypeId, GetCurField()->GetFormat()));
+                            m_pSelectionLB->SelectEntry(GetFieldMgr().GetFormatStr(nTypeId, GetCurField()->GetFormat()));
                             break;
                         }
 
@@ -309,7 +309,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
             AddSubType(TYP_NEXTPAGEFLD);
             nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(0));
             nCount = 3;
-            m_pSelectionLB->SetSelectHdl(LINK(this, SwFldDokPage, SubTypeHdl));
+            m_pSelectionLB->SetSelectHdl(LINK(this, SwFieldDokPage, SubTypeHdl));
         }
 
         bool bEnable = nCount != 0;
@@ -322,45 +322,45 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
         // fill Format-Listbox
         sal_Int32 nSize = FillFormatLB(nTypeId);
 
-        bool bValue = false, bLevel = false, bNumFmt = false, bOffset = false;
+        bool bValue = false, bLevel = false, bNumFormat = false, bOffset = false;
         bool bFormat = nSize != 0;
         bool bOneArea = false;
         bool bFixed = false;
-        sal_uInt16 nFmtType = 0;
+        sal_uInt16 nFormatType = 0;
 
         switch (nTypeId)
         {
             case TYP_DATEFLD:
-                bFormat = bNumFmt = bOneArea = bOffset = true;
+                bFormat = bNumFormat = bOneArea = bOffset = true;
 
-                nFmtType = css::util::NumberFormat::DATE;
+                nFormatType = css::util::NumberFormat::DATE;
 
                 m_pDateFT->Show();
 
                 m_pDateOffsetED->SetFirst(-31);    // one month
                 m_pDateOffsetED->SetLast(31);
 
-                if (IsFldEdit())
+                if (IsFieldEdit())
                     m_pDateOffsetED->SetValue( static_cast<SwDateTimeField*>(GetCurField())->GetOffset() / 24 / 60);
                 break;
 
             case TYP_TIMEFLD:
-                bFormat = bNumFmt = bOneArea = bOffset = true;
+                bFormat = bNumFormat = bOneArea = bOffset = true;
 
-                nFmtType = css::util::NumberFormat::TIME;
+                nFormatType = css::util::NumberFormat::TIME;
 
                 m_pTimeFT->Show();
 
                 m_pDateOffsetED->SetFirst(-1440);  // one day
                 m_pDateOffsetED->SetLast(1440);
 
-                if (IsFldEdit())
+                if (IsFieldEdit())
                     m_pDateOffsetED->SetValue( static_cast<SwDateTimeField*>(GetCurField())->GetOffset() );
                 break;
 
             case TYP_PREVPAGEFLD:
             case TYP_NEXTPAGEFLD:
-                if (IsFldEdit())
+                if (IsFieldEdit())
                 {
                     const sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
                                             m_pFormatLB->GetSelectEntryPos() ));
@@ -385,14 +385,14 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
 
             case TYP_CHAPTERFLD:
                 m_pValueFT->SetText(SW_RESSTR(STR_LEVEL));
-                if (IsFldEdit())
+                if (IsFieldEdit())
                     m_pLevelED->SetText(OUString::number(static_cast<SwChapterField*>(GetCurField())->GetLevel() + 1));
                 bLevel = true;
                 break;
 
             case TYP_PAGENUMBERFLD:
                 m_pValueFT->SetText( SW_RESSTR( STR_OFFSET ));
-                if (IsFldEdit())
+                if (IsFieldEdit())
                     m_pValueED->SetText(GetCurField()->GetPar2());
                 bValue = true;
                 break;
@@ -407,9 +407,9 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
                 break;
         }
 
-        if (bNumFmt)
+        if (bNumFormat)
         {
-            if (IsFldEdit())
+            if (IsFieldEdit())
             {
                 m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat());
 
@@ -418,19 +418,19 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
                     // always set Format-Type because otherwise when date/time formats are combined,
                     // both formats would be displayed at the same time
                     m_pNumFormatLB->SetFormatType(0);
-                    m_pNumFormatLB->SetFormatType(nFmtType);
+                    m_pNumFormatLB->SetFormatType(nFormatType);
                     // set correct format once again
                     m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat());
                 }
             }
             else
-                m_pNumFormatLB->SetFormatType(nFmtType);
+                m_pNumFormatLB->SetFormatType(nFormatType);
 
             m_pNumFormatLB->SetOneArea(bOneArea);
         }
 
-        m_pFormatLB->Show(!bNumFmt);
-        m_pNumFormatLB->Show(bNumFmt);
+        m_pFormatLB->Show(!bNumFormat);
+        m_pNumFormatLB->Show(bNumFormat);
 
         m_pValueFT->Show(bValue);
         m_pValueED->Show(bValue);
@@ -442,7 +442,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
         m_pFormat->Enable(bFormat);
         m_pFixedCB->Enable(bFixed);
 
-        if (IsFldEdit())
+        if (IsFieldEdit())
             m_pFixedCB->Check( (GetCurField()->GetFormat() & AF_FIXED) != 0 && bFixed );
 
         if (m_pNumFormatLB->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND)
@@ -454,13 +454,13 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
     return 0;
 }
 
-void SwFldDokPage::AddSubType(sal_uInt16 nTypeId)
+void SwFieldDokPage::AddSubType(sal_uInt16 nTypeId)
 {
     const sal_Int32 nPos = m_pSelectionLB->InsertEntry(SwFieldType::GetTypeStr(nTypeId));
     m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
 }
 
-IMPL_LINK_NOARG(SwFldDokPage, SubTypeHdl)
+IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl)
 {
     sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
     if(nPos == LISTBOX_ENTRY_NOTFOUND)
@@ -494,7 +494,7 @@ IMPL_LINK_NOARG(SwFldDokPage, SubTypeHdl)
     return 0;
 }
 
-sal_Int32 SwFldDokPage::FillFormatLB(sal_uInt16 nTypeId)
+sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId)
 {
     // fill Format-Listbox
     m_pFormatLB->Clear();
@@ -502,14 +502,14 @@ sal_Int32 SwFldDokPage::FillFormatLB(sal_uInt16 nTypeId)
     if (nTypeId == TYP_AUTHORFLD)
         return m_pFormatLB->GetEntryCount();
 
-    const sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
+    const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(nTypeId, false, IsFieldDlgHtmlMode());
 
     for( sal_uInt16 i = 0; i < nSize; ++i )
     {
-        const sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i));
-        const sal_uInt16 nFmtId = GetFldMgr().GetFormatId( nTypeId, i );
-        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>( nFmtId ));
-        if (IsFldEdit() && nFmtId == (GetCurField()->GetFormat() & ~AF_FIXED))
+        const sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr(nTypeId, i));
+        const sal_uInt16 nFormatId = GetFieldMgr().GetFormatId( nTypeId, i );
+        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>( nFormatId ));
+        if (IsFieldEdit() && nFormatId == (GetCurField()->GetFormat() & ~AF_FIXED))
             m_pFormatLB->SelectEntryPos( nPos );
     }
 
@@ -529,7 +529,7 @@ sal_Int32 SwFldDokPage::FillFormatLB(sal_uInt16 nTypeId)
     return nSize;
 }
 
-IMPL_LINK_NOARG(SwFldDokPage, FormatHdl)
+IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl)
 {
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
@@ -547,21 +547,21 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl)
         // Prev/Next - PageNumFields special treatment:
         sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
                                         m_pFormatLB->GetSelectEntryPos() ));
-        const OUString sOldTxt( m_pValueFT->GetText() );
-        const OUString sNewTxt( SW_RES( SVX_NUM_CHAR_SPECIAL == nTmp  ? STR_VALUE
+        const OUString sOldText( m_pValueFT->GetText() );
+        const OUString sNewText( SW_RES( SVX_NUM_CHAR_SPECIAL == nTmp  ? STR_VALUE
                                                          : STR_OFFSET ));
 
-        if( sOldTxt != sNewTxt )
-            m_pValueFT->SetText( sNewTxt );
+        if( sOldText != sNewText )
+            m_pValueFT->SetText( sNewText );
 
-        if (sOldTxt != m_pValueFT->GetText())
+        if (sOldText != m_pValueFT->GetText())
             m_pValueED->SetText( aEmptyOUStr );
     }
 
     return 0;
 }
 
-bool SwFldDokPage::FillItemSet(SfxItemSet* )
+bool SwFieldDokPage::FillItemSet(SfxItemSet* )
 {
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
@@ -639,7 +639,7 @@ bool SwFldDokPage::FillItemSet(SfxItemSet* )
             break;
     }
 
-    if (!IsFldEdit() ||
+    if (!IsFieldEdit() ||
         nOldSel != m_pSelectionLB->GetSelectEntryPos() ||
         nOldFormat != nFormat ||
         m_pFixedCB->IsValueChangedFromSaved() ||
@@ -647,24 +647,24 @@ bool SwFldDokPage::FillItemSet(SfxItemSet* )
         m_pLevelED->IsValueChangedFromSaved() ||
         m_pDateOffsetED->IsValueChangedFromSaved())
     {
-        InsertFld( nTypeId, nSubType, aEmptyOUStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() );
+        InsertField( nTypeId, nSubType, aEmptyOUStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() );
     }
 
     return false;
 }
 
-VclPtr<SfxTabPage> SwFldDokPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldDokPage::Create( vcl::Window* pParent,
                                          const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwFldDokPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwFieldDokPage>::Create( pParent, *rAttrSet );
 }
 
-sal_uInt16 SwFldDokPage::GetGroup()
+sal_uInt16 SwFieldDokPage::GetGroup()
 {
     return GRP_DOC;
 }
 
-void    SwFldDokPage::FillUserData()
+void    SwFieldDokPage::FillUserData()
 {
     const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos();
     const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos )
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 3beb6a7c0a1b..d3035ea5e969 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -30,7 +30,7 @@
 #include "numfmtlb.hxx"
 #include "fldpage.hxx"
 
-class SwFldDokPage : public SwFldPage
+class SwFieldDokPage : public SwFieldPage
 {
     VclPtr<ListBox>            m_pTypeLB;
     VclPtr<VclContainer>       m_pSelection;
@@ -61,9 +61,9 @@ protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldDokPage(vcl::Window* pWindow, const SfxItemSet& rSet);
+                        SwFieldDokPage(vcl::Window* pWindow, const SfxItemSet& rSet);
 
-                        virtual ~SwFldDokPage();
+                        virtual ~SwFieldDokPage();
     virtual void        dispose() SAL_OVERRIDE;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 17e805442d54..e95edece3efc 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -49,15 +49,15 @@
 #include <boost/scoped_ptr.hpp>
 #include <swuiexp.hxx>
 
-void SwFldEditDlg::EnsureSelection(SwField *pCurFld, SwFldMgr &rMgr)
+void SwFieldEditDlg::EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr)
 {
-    if (pSh->CrsrInsideInputFld())
+    if (pSh->CrsrInsideInputField())
     {
         // move cursor to start of Input Field
-        SwInputField* pInputFld = dynamic_cast<SwInputField*>(pCurFld);
-        if (pInputFld && pInputFld->GetFmtFld())
+        SwInputField* pInputField = dynamic_cast<SwInputField*>(pCurField);
+        if (pInputField && pInputField->GetFormatField())
         {
-            pSh->GotoField( *(pInputFld->GetFmtFld()) );
+            pSh->GotoField( *(pInputField->GetFormatField()) );
         }
     }
 
@@ -68,14 +68,14 @@ void SwFldEditDlg::EnsureSelection(SwField *pCurFld, SwFldMgr &rMgr)
         SwShellCrsr* pCrsr = pSh->getShellCrsr(true);
         SwPosition aOrigPos(*pCrsr->GetPoint());
 
-        //After this attempt it is possible that rMgr.GetCurFld() != pCurFld if
+        //After this attempt it is possible that rMgr.GetCurField() != pCurField if
         //the field was in e.g. a zero height portion and so invisible in which
         //case it will be skipped over
         pSh->Right(CRSR_SKIP_CHARS, true, 1, false );
         //So (fdo#50640) if it didn't work then reposition back to the original
         //location where the field was
-        SwField *pRealCurFld = rMgr.GetCurFld();
-        bool bSelectionFailed = pCurFld != pRealCurFld;
+        SwField *pRealCurField = rMgr.GetCurField();
+        bool bSelectionFailed = pCurField != pRealCurField;
         if (bSelectionFailed)
         {
             pCrsr->DeleteMark();
@@ -85,10 +85,10 @@ void SwFldEditDlg::EnsureSelection(SwField *pCurFld, SwFldMgr &rMgr)
 
     pSh->NormalizePam();
 
-    assert(pCurFld == rMgr.GetCurFld());
+    assert(pCurField == rMgr.GetCurField());
 }
 
-SwFldEditDlg::SwFldEditDlg(SwView& rVw)
+SwFieldEditDlg::SwFieldEditDlg(SwView& rVw)
     : SfxSingleTabDialog(&rVw.GetViewFrame()->GetWindow(), 0,
         "EditFieldDialog", "modules/swriter/ui/editfielddialog.ui")
     , pSh(rVw.GetWrtShellPtr())
@@ -97,42 +97,42 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw)
     get(m_pNextBT, "next");
     get(m_pAddressBT, "edit");
 
-    SwFldMgr aMgr(pSh);
+    SwFieldMgr aMgr(pSh);
 
-    SwField *pCurFld = aMgr.GetCurFld();
-    if (!pCurFld)
+    SwField *pCurField = aMgr.GetCurField();
+    if (!pCurField)
         return;
 
     SwViewShell::SetCareWin(this);
 
-    EnsureSelection(pCurFld, aMgr);
+    EnsureSelection(pCurField, aMgr);
 
-    sal_uInt16 nGroup = SwFldMgr::GetGroup(false, pCurFld->GetTypeId(), pCurFld->GetSubType());
+    sal_uInt16 nGroup = SwFieldMgr::GetGroup(false, pCurField->GetTypeId(), pCurField->GetSubType());
 
     CreatePage(nGroup);
 
-    GetOKButton()->SetClickHdl(LINK(this, SwFldEditDlg, OKHdl));
+    GetOKButton()->SetClickHdl(LINK(this, SwFieldEditDlg, OKHdl));
 
-    m_pPrevBT->SetClickHdl(LINK(this, SwFldEditDlg, NextPrevHdl));
-    m_pNextBT->SetClickHdl(LINK(this, SwFldEditDlg, NextPrevHdl));
+    m_pPrevBT->SetClickHdl(LINK(this, SwFieldEditDlg, NextPrevHdl));
+    m_pNextBT->SetClickHdl(LINK(this, SwFieldEditDlg, NextPrevHdl));
 
-    m_pAddressBT->SetClickHdl(LINK(this, SwFldEditDlg, AddressHdl));
+    m_pAddressBT->SetClickHdl(LINK(this, SwFieldEditDlg, AddressHdl));
 
     Init();
 }
 
 // initialise controls
-void SwFldEditDlg::Init()
+void SwFieldEditDlg::Init()
 {
-    VclPtr<SwFldPage> pTabPage = static_cast<SwFldPage*>(GetTabPage());
+    VclPtr<SwFieldPage> pTabPage = static_cast<SwFieldPage*>(GetTabPage());
 
     if( pTabPage )
     {
-        SwFldMgr& rMgr = pTabPage->GetFldMgr();
+        SwFieldMgr& rMgr = pTabPage->GetFieldMgr();
 
-        SwField *pCurFld = rMgr.GetCurFld();
+        SwField *pCurField = rMgr.GetCurField();
 
-        if(!pCurFld)
+        if(!pCurField)
             return;
 
         // Traveling only when more than one field
@@ -148,7 +148,7 @@ void SwFldEditDlg::Init()
             rMgr.GoNext();
         m_pPrevBT->Enable( bMove );
 
-        if (pCurFld->GetTypeId() == TYP_EXTUSERFLD)
+        if (pCurField->GetTypeId() == TYP_EXTUSERFLD)
             m_pAddressBT->Show();
 
         pSh->DestroyCrsr();
@@ -159,7 +159,7 @@ void SwFldEditDlg::Init()
                            !pSh->HasReadonlySel() );
 }
 
-VclPtr<SfxTabPage> SwFldEditDlg::CreatePage(sal_uInt16 nGroup)
+VclPtr<SfxTabPage> SwFieldEditDlg::CreatePage(sal_uInt16 nGroup)
 {
     // create TabPage
     VclPtr<SfxTabPage> pTabPage;
@@ -167,13 +167,13 @@ VclPtr<SfxTabPage> SwFldEditDlg::CreatePage(sal_uInt16 nGroup)
     switch (nGroup)
     {
         case GRP_DOC:
-            pTabPage = SwFldDokPage::Create(get_content_area(), 0);
+            pTabPage = SwFieldDokPage::Create(get_content_area(), 0);
             break;
         case GRP_FKT:
-            pTabPage = SwFldFuncPage::Create(get_content_area(), 0);
+            pTabPage = SwFieldFuncPage::Create(get_content_area(), 0);
             break;
         case GRP_REF:
-            pTabPage = SwFldRefPage::Create(get_content_area(), 0);
+            pTabPage = SwFieldRefPage::Create(get_content_area(), 0);
             break;
         case GRP_REG:
             {
@@ -188,15 +188,15 @@ VclPtr<SfxTabPage> SwFldEditDlg::CreatePage(sal_uInt16 nGroup)
                     xDocProps->getUserDefinedProperties(),
                     uno::UNO_QUERY_THROW);
                 pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
-                pTabPage = SwFldDokInfPage::Create(get_content_area(), pSet);
+                pTabPage = SwFieldDokInfPage::Create(get_content_area(), pSet);
                 break;
             }
         case GRP_DB:
-            pTabPage = SwFldDBPage::Create(get_content_area(), 0);
-            static_cast<SwFldDBPage*>(pTabPage.get())->SetWrtShell(*pSh);
+            pTabPage = SwFieldDBPage::Create(get_content_area(), 0);
+            static_cast<SwFieldDBPage*>(pTabPage.get())->SetWrtShell(*pSh);
             break;
         case GRP_VAR:
-            pTabPage = SwFldVarPage::Create(get_content_area(), 0);
+            pTabPage = SwFieldVarPage::Create(get_content_area(), 0);
             break;
 
     }
@@ -205,19 +205,19 @@ VclPtr<SfxTabPage> SwFldEditDlg::CreatePage(sal_uInt16 nGroup)
 
     if (pTabPage)
     {
-        static_cast<SwFldPage*>(pTabPage.get())->SetWrtShell(pSh);
+        static_cast<SwFieldPage*>(pTabPage.get())->SetWrtShell(pSh);
         SetTabPage(pTabPage);
     }
 
     return pTabPage;
 }
 
-SwFldEditDlg::~SwFldEditDlg()
+SwFieldEditDlg::~SwFieldEditDlg()
 {
     disposeOnce();
 }
 
-void SwFldEditDlg::dispose()
+void SwFieldEditDlg::dispose()
 {
     SwViewShell::SetCareWin(NULL);
     pSh->EnterStdMode();
@@ -227,20 +227,20 @@ void SwFldEditDlg::dispose()
     SfxSingleTabDialog::dispose();
 }
 
-void SwFldEditDlg::EnableInsert(bool bEnable)
+void SwFieldEditDlg::EnableInsert(bool bEnable)
 {
     if( bEnable && pSh->IsReadOnlyAvailable() && pSh->HasReadonlySel() )
         bEnable = false;
     GetOKButton()->Enable( bEnable );
 }
 
-void SwFldEditDlg::InsertHdl()
+void SwFieldEditDlg::InsertHdl()
 {
     GetOKButton()->Click();
 }
 
 // kick off changing of the field
-IMPL_LINK_NOARG(SwFldEditDlg, OKHdl)
+IMPL_LINK_NOARG(SwFieldEditDlg, OKHdl)
 {
     if (GetOKButton()->IsEnabled())
     {
@@ -253,41 +253,41 @@ IMPL_LINK_NOARG(SwFldEditDlg, OKHdl)
     return 0;
 }
 
-short SwFldEditDlg::Execute()
+short SwFieldEditDlg::Execute()
 {
     // without TabPage no dialog
     return GetTabPage() ? Dialog::Execute() : static_cast<short>(RET_CANCEL);
 }
 
 // Traveling between fields of the same type
-IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton )
+IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton )
 {
     bool bNext = pButton == m_pNextBT;
 
     pSh->EnterStdMode();
 
     SwFieldType *pOldTyp = 0;
-    VclPtr<SwFldPage> pTabPage = static_cast<SwFldPage*>(GetTabPage());
+    VclPtr<SwFieldPage> pTabPage = static_cast<SwFieldPage*>(GetTabPage());
 
     //#112462# FillItemSet may delete the current field
     //that's why it has to be called before accessing the current field
     if( GetOKButton()->IsEnabled() )
         pTabPage->FillItemSet(0);
 
-    SwFldMgr& rMgr = pTabPage->GetFldMgr();
-    SwField *pCurFld = rMgr.GetCurFld();
-    if (pCurFld->GetTypeId() == TYP_DBFLD)
-        pOldTyp = static_cast<SwDBFieldType*>(pCurFld->GetTyp());
+    SwFieldMgr& rMgr = pTabPage->GetFieldMgr();
+    SwField *pCurField = rMgr.GetCurField();
+    if (pCurField->GetTypeId() == TYP_DBFLD)
+        pOldTyp = static_cast<SwDBFieldType*>(pCurField->GetTyp());
 
     rMgr.GoNextPrev( bNext, pOldTyp );
-    pCurFld = rMgr.GetCurFld();
+    pCurField = rMgr.GetCurField();
 
-    EnsureSelection(pCurFld, rMgr);
+    EnsureSelection(pCurField, rMgr);
 
-    sal_uInt16 nGroup = SwFldMgr::GetGroup(false, pCurFld->GetTypeId(), pCurFld->GetSubType());
+    sal_uInt16 nGroup = SwFieldMgr::GetGroup(false, pCurField->GetTypeId(), pCurField->GetSubType());
 
     if (nGroup != pTabPage->GetGroup())
-        pTabPage = static_cast<SwFldPage*>(CreatePage(nGroup).get());
+        pTabPage = static_cast<SwFieldPage*>(CreatePage(nGroup).get());
 
     pTabPage->EditNewField();
 
@@ -296,11 +296,11 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton )
     return 0;
 }
 
-IMPL_LINK_NOARG(SwFldEditDlg, AddressHdl)
+IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl)
 {
-    SwFldPage* pTabPage = static_cast<SwFldPage*>(GetTabPage());
-    SwFldMgr& rMgr = pTabPage->GetFldMgr();
-    SwField *pCurFld = rMgr.GetCurFld();
+    SwFieldPage* pTabPage = static_cast<SwFieldPage*>(GetTabPage());
+    SwFieldMgr& rMgr = pTabPage->GetFieldMgr();
+    SwField *pCurField = rMgr.GetCurField();
 
     SfxItemSet aSet( pSh->GetAttrPool(),
                         SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS,
@@ -308,7 +308,7 @@ IMPL_LINK_NOARG(SwFldEditDlg, AddressHdl)
 
     EditPosition nEditPos = EditPosition::UNKNOWN;
 
-    switch(pCurFld->GetSubType())
+    switch(pCurField->GetSubType())
     {
         case EU_FIRSTNAME:  nEditPos = EditPosition::FIRSTNAME;  break;
         case EU_NAME:       nEditPos = EditPosition::LASTNAME;   break;
@@ -339,7 +339,7 @@ IMPL_LINK_NOARG(SwFldEditDlg, AddressHdl)
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     if(RET_OK == pDlg->Execute())
     {
-        pSh->UpdateFlds( *pCurFld );
+        pSh->UpdateFields( *pCurField );
     }
     return 0;
 }
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 1be9660cbb3c..dd4e8e64ce2f 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -37,8 +37,8 @@
 
 using namespace ::com::sun::star;
 
-SwFldFuncPage::SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
-    : SwFldPage(pParent, "FldFuncPage",
+SwFieldFuncPage::SwFieldFuncPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
+    : SwFieldPage(pParent, "FieldFuncPage",
         "modules/swriter/ui/fldfuncpage.ui", rCoreSet)
     , nOldFormat(0)
     , bDropDownLBChanged(false)
@@ -80,7 +80,7 @@ SwFldFuncPage::SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
     m_pTypeLB->set_width_request(nWidth);
     m_pFormatLB->set_width_request(nWidth);
 
-    m_pNameED->SetModifyHdl(LINK(this, SwFldFuncPage, ModifyHdl));
+    m_pNameED->SetModifyHdl(LINK(this, SwFieldFuncPage, ModifyHdl));
 
     m_sOldValueFT = m_pValueFT->GetText();
     m_sOldNameFT = m_pNameFT->GetText();
@@ -89,12 +89,12 @@ SwFldFuncPage::SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
     m_pCond2ED->ShowBrackets(false);
 }
 
-SwFldFuncPage::~SwFldFuncPage()
+SwFieldFuncPage::~SwFieldFuncPage()
 {
     disposeOnce();
 }
 
-void SwFldFuncPage::dispose()
+void SwFieldFuncPage::dispose()
 {
     m_pTypeLB.clear();
     m_pSelectionLB.clear();
@@ -121,10 +121,10 @@ void SwFldFuncPage::dispose()
     m_pListDownPB.clear();
     m_pListNameFT.clear();
     m_pListNameED.clear();
-    SwFldPage::dispose();
+    SwFieldPage::dispose();
 }
 
-void SwFldFuncPage::Reset(const SfxItemSet* )
+void SwFieldFuncPage::Reset(const SfxItemSet* )
 {
     SavePos(m_pTypeLB);
     Init(); // general initialisation
@@ -134,47 +134,47 @@ void SwFldFuncPage::Reset(const SfxItemSet* )
 
     sal_Int32 nPos;
 
-    if (!IsFldEdit())
+    if (!IsFieldEdit())
     {
         // initialise TypeListBox
-        const SwFldGroupRgn& rRg = SwFldMgr::GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
+        const SwFieldGroupRgn& rRg = SwFieldMgr::GetGroupRange(IsFieldDlgHtmlMode(), GetGroup());
 
         // fill Typ-Listbox
         for(sal_uInt16 i = rRg.nStart; i < rRg.nEnd; ++i)
         {
-            const sal_uInt16 nTypeId = SwFldMgr::GetTypeId(i);
-            nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(i));
+            const sal_uInt16 nTypeId = SwFieldMgr::GetTypeId(i);
+            nPos = m_pTypeLB->InsertEntry(SwFieldMgr::GetTypeStr(i));
             m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
         }
     }
     else
     {
         const sal_uInt16 nTypeId = GetCurField()->GetTypeId();
-        nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(SwFldMgr::GetPos(nTypeId)));
+        nPos = m_pTypeLB->InsertEntry(SwFieldMgr::GetTypeStr(SwFieldMgr::GetPos(nTypeId)));
         m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
 
         if (nTypeId == TYP_MACROFLD)
         {
-            GetFldMgr().SetMacroPath(GetCurField()->GetPar1());
+            GetFieldMgr().SetMacroPath(GetCurField()->GetPar1());
         }
     }
 
     // select old Pos
     RestorePos(m_pTypeLB);
 
-    m_pTypeLB->SetDoubleClickHdl       (LINK(this, SwFldFuncPage, InsertHdl));
-    m_pTypeLB->SetSelectHdl            (LINK(this, SwFldFuncPage, TypeHdl));
-    m_pSelectionLB->SetSelectHdl       (LINK(this, SwFldFuncPage, SelectHdl));
-    m_pSelectionLB->SetDoubleClickHdl  (LINK(this, SwFldFuncPage, InsertMacroHdl));
-    m_pFormatLB->SetDoubleClickHdl     (LINK(this, SwFldFuncPage, InsertHdl));
-    m_pMacroBT->SetClickHdl            (LINK(this, SwFldFuncPage, MacroHdl));
-    Link<> aListModifyLk( LINK(this, SwFldFuncPage, ListModifyHdl));
+    m_pTypeLB->SetDoubleClickHdl       (LINK(this, SwFieldFuncPage, InsertHdl));
+    m_pTypeLB->SetSelectHdl            (LINK(this, SwFieldFuncPage, TypeHdl));
+    m_pSelectionLB->SetSelectHdl       (LINK(this, SwFieldFuncPage, SelectHdl));
+    m_pSelectionLB->SetDoubleClickHdl  (LINK(this, SwFieldFuncPage, InsertMacroHdl));
+    m_pFormatLB->SetDoubleClickHdl     (LINK(this, SwFieldFuncPage, InsertHdl));
+    m_pMacroBT->SetClickHdl            (LINK(this, SwFieldFuncPage, MacroHdl));
+    Link<> aListModifyLk( LINK(this, SwFieldFuncPage, ListModifyHdl));
     m_pListAddPB->SetClickHdl(aListModifyLk);
     m_pListRemovePB->SetClickHdl(aListModifyLk);
     m_pListUpPB->SetClickHdl(aListModifyLk);
     m_pListDownPB->SetClickHdl(aListModifyLk);
     m_pListItemED->SetReturnActionLink(aListModifyLk);
-    Link<> aListEnableLk = LINK(this, SwFldFuncPage, ListEnableHdl);
+    Link<> aListEnableLk = LINK(this, SwFieldFuncPage, ListEnableHdl);
     m_pListItemED->SetModifyHdl(aListEnableLk);
     m_pListItemsLB->SetSelectHdl(aListEnableLk);
 
@@ -200,7 +200,7 @@ void SwFldFuncPage::Reset(const SfxItemSet* )
 
     m_pTypeLB->SetUpdateMode(true);
 
-    if (IsFldEdit())
+    if (IsFieldEdit())
     {
         m_pNameED->SaveValue();
         m_pValueED->SaveValue();
@@ -210,7 +210,7 @@ void SwFldFuncPage::Reset(const SfxItemSet* )
     }
 }
 
-IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
+IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl)
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
@@ -234,17 +234,17 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
         // fill Format-Listbox
         m_pFormatLB->Clear();
 
-        const sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
+        const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(nTypeId, false, IsFieldDlgHtmlMode());
 
         for (sal_uInt16 i = 0; i < nSize; i++)
         {
-            sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i));
-            m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, i )) );
+            sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr(nTypeId, i));
+            m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, i )) );
         }
 
         if (nSize)
         {
-            if (IsFldEdit() && nTypeId == TYP_JUMPEDITFLD)
+            if (IsFieldEdit() && nTypeId == TYP_JUMPEDITFLD)
                 m_pFormatLB->SelectEntry(SW_RESSTR(FMT_MARK_BEGIN + GetCurField()->GetFormat()));
 
             if (!m_pFormatLB->GetSelectEntryCount())
@@ -256,13 +256,13 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
 
         // two controls for conditional text
         bool bDropDown = TYP_DROPDOWN == nTypeId;
-        bool bCondTxtFld = TYP_CONDTXTFLD == nTypeId;
+        bool bCondTextField = TYP_CONDTXTFLD == nTypeId;
 
-        m_pCond1FT->Show(!bDropDown && bCondTxtFld);
-        m_pCond1ED->Show(!bDropDown && bCondTxtFld);
-        m_pCond2FT->Show(!bDropDown && bCondTxtFld);
-        m_pCond2ED->Show(!bDropDown && bCondTxtFld);
-        m_pValueGroup->Show(!bDropDown && !bCondTxtFld);
+        m_pCond1FT->Show(!bDropDown && bCondTextField);
+        m_pCond1ED->Show(!bDropDown && bCondTextField);
+        m_pCond2FT->Show(!bDropDown && bCondTextField);
+        m_pCond2ED->Show(!bDropDown && bCondTextField);
+        m_pValueGroup->Show(!bDropDown && !bCondTextField);
         m_pMacroBT->Show(!bDropDown);
         m_pNameED->Show(!bDropDown);
         m_pNameFT->Show(!bDropDown);
@@ -271,7 +271,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
 
         m_pNameED->SetDropEnable(false);
 
-        if (IsFldEdit())
+        if (IsFieldEdit())
         {
             if(bDropDown)
             {
@@ -309,14 +309,14 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
         {
             case TYP_MACROFLD:
                 bMacro = true;
-                if (!GetFldMgr().GetMacroPath().isEmpty())
+                if (!GetFieldMgr().GetMacroPath().isEmpty())
                     bValue = true;
                 else
                     bInsert = false;
 
                 m_pNameFT->SetText(SW_RESSTR(STR_MACNAME));
                 m_pValueFT->SetText(SW_RESSTR(STR_PROMPT));
-                m_pNameED->SetText(GetFldMgr().GetMacroName());
+                m_pNameED->SetText(GetFieldMgr().GetMacroName());
                 m_pNameED->SetAccessibleName(m_pNameFT->GetText());
                 m_pValueED->SetAccessibleName(m_pValueFT->GetText());
                 break;
@@ -335,8 +335,8 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
                 m_pNameED->SetDropEnable(true);
                 m_pValueFT->SetText(SW_RESSTR(STR_INSTEXT));
                 SwWrtShell* pSh = GetActiveWrtShell();
-                if (!IsFldEdit() && pSh )
-                    m_pValueED->SetText(pSh->GetSelTxt());
+                if (!IsFieldEdit() && pSh )
+                    m_pValueED->SetText(pSh->GetSelText());
                 bName = bValue = true;
                 m_pNameED->SetAccessibleName(m_pNameFT->GetText());
                 m_pValueED->SetAccessibleName(m_pValueFT->GetText());
@@ -346,7 +346,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
             case TYP_CONDTXTFLD:
                 m_pNameFT->SetText(SW_RESSTR(STR_COND));
                 m_pNameED->SetDropEnable(true);
-                if (IsFldEdit())
+                if (IsFieldEdit())
                 {
                     m_pCond1ED->SetText(GetCurField()->GetPar2().getToken(0, '|'));
                     m_pCond2ED->SetText(GetCurField()->GetPar2().getToken(1, '|'));
@@ -405,7 +405,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwFldFuncPage, SelectHdl)
+IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl)
 {
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
@@ -415,7 +415,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, SelectHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwFldFuncPage, InsertMacroHdl)
+IMPL_LINK_NOARG(SwFieldFuncPage, InsertMacroHdl)
 {
     SelectHdl();
     InsertHdl();
@@ -423,7 +423,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, InsertMacroHdl)
     return 0;
 }
 
-IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl)
+IMPL_LINK( SwFieldFuncPage, ListModifyHdl, Control*, pControl)
 {
     m_pListItemsLB->SetUpdateMode(false);
     if(pControl == m_pListAddPB ||
@@ -470,7 +470,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwFldFuncPage, ListEnableHdl)
+IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl)
 {
     //enable "Add" button when text is in the Edit that's not already member of the box
     m_pListAddPB->Enable(!m_pListItemED->GetText().isEmpty() &&
@@ -485,7 +485,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, ListEnableHdl)
 }
 
 // renew types in SelectionBox
-void SwFldFuncPage::UpdateSubType()
+void SwFieldFuncPage::UpdateSubType()
 {
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
@@ -494,7 +494,7 @@ void SwFldFuncPage::UpdateSubType()
     m_pSelectionLB->Clear();
 
     std::vector<OUString> aLst;
-    GetFldMgr().GetSubTypes(nTypeId, aLst);
+    GetFieldMgr().GetSubTypes(nTypeId, aLst);
     const size_t nCount = aLst.size();
 
     for(size_t i = 0; i < nCount; ++i)
@@ -514,11 +514,11 @@ void SwFldFuncPage::UpdateSubType()
 
     if (nTypeId == TYP_MACROFLD)
     {
-        const bool bHasMacro = !GetFldMgr().GetMacroPath().isEmpty();
+        const bool bHasMacro = !GetFieldMgr().GetMacroPath().isEmpty();
 
         if (bHasMacro)
         {
-            m_pNameED->SetText(GetFldMgr().GetMacroName());
+            m_pNameED->SetText(GetFieldMgr().GetMacroName());
             m_pValueGroup->Enable();
         }
         EnableInsert(bHasMacro);
@@ -528,12 +528,12 @@ void SwFldFuncPage::UpdateSubType()
 }
 
 // call MacroBrowser, fill Listbox with Macros
-IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn )
+IMPL_LINK( SwFieldFuncPage, MacroHdl, Button *, pBtn )
 {
     vcl::Window* pDefModalDlgParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( pBtn );
     const OUString sMacro(TurnMacroString(m_pNameED->GetText()).replaceAll(".", ";"));
-    if (GetFldMgr().ChooseMacro(sMacro))
+    if (GetFieldMgr().ChooseMacro(sMacro))
         UpdateSubType();
 
     Application::SetDefDialogParent( pDefModalDlgParent );
@@ -541,7 +541,7 @@ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn )
     return 0;
 }
 
-bool SwFldFuncPage::FillItemSet(SfxItemSet* )
+bool SwFieldFuncPage::FillItemSet(SfxItemSet* )
 {
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
@@ -559,14 +559,14 @@ bool SwFldFuncPage::FillItemSet(SfxItemSet* )
         case TYP_INPUTFLD:
             nSubType = INP_TXT;
             // to prevent removal of CR/LF restore old content
-            if(!m_pNameED->IsModified() && IsFldEdit())
+            if(!m_pNameED->IsModified() && IsFieldEdit())
                 aName = GetCurField()->GetPar1();
 
             break;
 
         case TYP_MACROFLD:
             // use the full script URL, not the name in the Edit control
-            aName = GetFldMgr().GetMacroPath();
+            aName = GetFieldMgr().GetMacroPath();
             break;
 
         case TYP_CONDTXTFLD:
@@ -587,7 +587,7 @@ bool SwFldFuncPage::FillItemSet(SfxItemSet* )
             break;
     }
 
-    if (!IsFldEdit() ||
+    if (!IsFieldEdit() ||
         m_pNameED->IsValueChangedFromSaved() ||
         m_pValueED->IsValueChangedFromSaved() ||
         m_pCond1ED->IsValueChangedFromSaved() ||
@@ -596,7 +596,7 @@ bool SwFldFuncPage::FillItemSet(SfxItemSet* )
         bDropDownLBChanged ||
         nOldFormat != nFormat)
     {
-        InsertFld( nTypeId, nSubType, aName, aVal, nFormat );
+        InsertField( nTypeId, nSubType, aName, aVal, nFormat );
     }
 
     ModifyHdl();    // enable/disable Insert if applicable
@@ -604,7 +604,7 @@ bool SwFldFuncPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro)
+OUString SwFieldFuncPage::TurnMacroString(const OUString &rMacro)
 {
     if (!rMacro.isEmpty())
     {
@@ -628,18 +628,18 @@ OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro)
     return rMacro;
 }
 
-VclPtr<SfxTabPage> SwFldFuncPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldFuncPage::Create( vcl::Window* pParent,
                                           const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwFldFuncPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwFieldFuncPage>::Create( pParent, *rAttrSet );
 }
 
-sal_uInt16 SwFldFuncPage::GetGroup()
+sal_uInt16 SwFieldFuncPage::GetGroup()
 {
     return GRP_FKT;
 }
 
-void    SwFldFuncPage::FillUserData()
+void    SwFieldFuncPage::FillUserData()
 {
     const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos();
     const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos )
@@ -649,7 +649,7 @@ void    SwFldFuncPage::FillUserData()
     SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel ));
 }
 
-IMPL_LINK_NOARG(SwFldFuncPage, ModifyHdl)
+IMPL_LINK_NOARG(SwFieldFuncPage, ModifyHdl)
 {
     const sal_Int32 nLen = m_pNameED->GetText().getLength();
 
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 01963e2ed2be..468f5fdf0bd8 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -30,7 +30,7 @@
 #include "fldpage.hxx"
 #include <actctrl.hxx>
 
-class SwFldFuncPage : public SwFldPage
+class SwFieldFuncPage : public SwFieldPage
 {
     VclPtr<ListBox>        m_pTypeLB;
     VclPtr<ListBox>        m_pSelectionLB;
@@ -83,9 +83,9 @@ protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rSet);
+                        SwFieldFuncPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
-                        virtual ~SwFldFuncPage();
+                        virtual ~SwFieldFuncPage();
     virtual void        dispose() SAL_OVERRIDE;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 20b665182b0d..9db03bdcae0c 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -41,43 +41,43 @@
 
 using namespace ::com::sun::star;
 
-SwFldPage::SwFldPage(vcl::Window *pParent, const OString& rID,
+SwFieldPage::SwFieldPage(vcl::Window *pParent, const OString& rID,
     const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet)
     : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet)
-    , m_pCurFld(0)
+    , m_pCurField(0)
     , m_pWrtShell(0)
     , m_nTypeSel(LISTBOX_ENTRY_NOTFOUND)
     , m_nSelectionSel(LISTBOX_ENTRY_NOTFOUND)
-    , m_bFldEdit(false)
+    , m_bFieldEdit(false)
     , m_bInsert(true)
-    , m_bFldDlgHtmlMode(false)
+    , m_bFieldDlgHtmlMode(false)
     , m_bRefresh(false)
     , m_bFirstHTMLInit(true)
 {
 }
 
-SwFldPage::~SwFldPage()
+SwFieldPage::~SwFieldPage()
 {
 }
 
 // initialise TabPage
-void SwFldPage::Init()
+void SwFieldPage::Init()
 {
     SwDocShell* pDocSh = static_cast<SwDocShell*>(SfxObjectShell::Current());
     bool bNewMode = 0 != (::GetHtmlMode(pDocSh) & HTMLMODE_ON);
 
-    m_bFldEdit = 0 == GetTabDialog();
+    m_bFieldEdit = 0 == GetTabDialog();
 
     // newly initialise FieldManager. important for
     // Dok-Switch (fldtdlg:ReInitTabPage)
-    m_pCurFld = m_aMgr.GetCurFld();
+    m_pCurField = m_aMgr.GetCurField();
 
-    if( bNewMode != m_bFldDlgHtmlMode )
+    if( bNewMode != m_bFieldDlgHtmlMode )
     {
-        m_bFldDlgHtmlMode = bNewMode;
+        m_bFieldDlgHtmlMode = bNewMode;
 
         // initialise Rangelistbox
-        if( m_bFldDlgHtmlMode && m_bFirstHTMLInit )
+        if( m_bFieldDlgHtmlMode && m_bFirstHTMLInit )
         {
             m_bFirstHTMLInit = false;
             SwWrtShell *pSh = m_pWrtShell;
@@ -86,9 +86,9 @@ void SwFldPage::Init()
             if(pSh)
             {
                 SwDoc* pDoc = pSh->GetDoc();
-                pSh->InsertFldType( SwSetExpFieldType( pDoc,
+                pSh->InsertFieldType( SwSetExpFieldType( pDoc,
                                     OUString("HTML_ON"), 1));
-                pSh->InsertFldType( SwSetExpFieldType(pDoc,
+                pSh->InsertFieldType( SwSetExpFieldType(pDoc,
                                     OUString("HTML_OFF"), 1));
             }
         }
@@ -96,13 +96,13 @@ void SwFldPage::Init()
 }
 
 // newly initialise page
-void SwFldPage::ActivatePage()
+void SwFieldPage::ActivatePage()
 {
     EnableInsert(m_bInsert);
 }
 
 // complete reset; edit new field
-void SwFldPage::EditNewField( bool bOnlyActivate )
+void SwFieldPage::EditNewField( bool bOnlyActivate )
 {
     if( !bOnlyActivate )
     {
@@ -115,7 +115,7 @@ void SwFldPage::EditNewField( bool bOnlyActivate )
 }
 
 // insert field
-bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUString& rPar1,
+bool SwFieldPage::InsertField(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUString& rPar1,
                             const OUString& rPar2, sal_uLong nFormatId,
                             sal_Unicode cSeparator, bool bIsAutomaticLanguage)
 {
@@ -123,12 +123,12 @@ bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUStrin
     SwView* pView = GetActiveView();
     SwWrtShell *pSh = m_pWrtShell ? m_pWrtShell : pView->GetWrtShellPtr();
 
-    if (!IsFldEdit())   // insert new field
+    if (!IsFieldEdit())   // insert new field
     {
-        SwInsertFld_Data aData(nTypeId, nSubType, rPar1, rPar2, nFormatId, 0, cSeparator, bIsAutomaticLanguage );
-        //#i26566# provide parent for SwWrtShell::StartInputFldDlg
+        SwInsertField_Data aData(nTypeId, nSubType, rPar1, rPar2, nFormatId, 0, cSeparator, bIsAutomaticLanguage );
+        //#i26566# provide parent for SwWrtShell::StartInputFieldDlg
         aData.m_pParent = &GetTabDialog()->GetOKButton();
-        bRet = m_aMgr.InsertFld( aData );
+        bRet = m_aMgr.InsertField( aData );
 
         uno::Reference< frame::XDispatchRecorder > xRecorder =
                 pView->GetViewFrame()->GetBindings().GetRecorder();
@@ -169,7 +169,7 @@ bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUStrin
     }
     else    // change field
     {
-        SwField *const pTmpFld = m_pCurFld->CopyField();
+        SwField *const pTmpField = m_pCurField->CopyField();
 
         OUString sPar1(rPar1);
         OUString sPar2(rPar2);
@@ -194,7 +194,7 @@ bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUStrin
                 aData.nCommandType = rPar1.getToken(0, DB_DELIM, nPos).toInt32();
                 sPar1 = rPar1.copy(nPos);
 
-                static_cast<SwDBNameInfField*>(pTmpFld)->SetDBData(aData);
+                static_cast<SwDBNameInfField*>(pTmpField)->SetDBData(aData);
             }
             break;
 
@@ -206,18 +206,18 @@ bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUStrin
                 aData.nCommandType = rPar1.getToken(2, DB_DELIM).toInt32();
                 OUString sColumn = rPar1.getToken(3, DB_DELIM);
 
-                SwDBFieldType* pOldTyp = static_cast<SwDBFieldType*>(pTmpFld->GetTyp());
-                SwDBFieldType* pTyp = static_cast<SwDBFieldType*>(pSh->InsertFldType(
+                SwDBFieldType* pOldTyp = static_cast<SwDBFieldType*>(pTmpField->GetTyp());
+                SwDBFieldType* pTyp = static_cast<SwDBFieldType*>(pSh->InsertFieldType(
                         SwDBFieldType(pSh->GetDoc(), sColumn, aData)));
 
-                SwIterator<SwFmtFld,SwFieldType> aIter( *pOldTyp );
+                SwIterator<SwFormatField,SwFieldType> aIter( *pOldTyp );
 
-                for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+                for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
                 {
-                    if( pFmtFld->GetField() == m_pCurFld)
+                    if( pFormatField->GetField() == m_pCurField)
                     {
-                        pFmtFld->RegisterToFieldType(*pTyp);
-                        pTmpFld->ChgTyp(pTyp);
+                        pFormatField->RegisterToFieldType(*pTyp);
+                        pTmpField->ChgTyp(pTyp);
                         break;
                     }
                 }
@@ -226,7 +226,7 @@ bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUStrin
 
         case TYP_SEQFLD:
             {
-                SwSetExpFieldType* pTyp = static_cast<SwSetExpFieldType*>(pTmpFld->GetTyp());
+                SwSetExpFieldType* pTyp = static_cast<SwSetExpFieldType*>(pTmpField->GetTyp());
                 pTyp->SetOutlineLvl( static_cast< sal_uInt8 >(nSubType & 0xff));
                 pTyp->SetDelimiter(OUString(cSeparator));
 
@@ -237,12 +237,12 @@ bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUStrin
         case TYP_INPUTFLD:
             {
                 // User- or SetField ?
-                if (m_aMgr.GetFldType(RES_USERFLD, sPar1) == 0 &&
-                !(pTmpFld->GetSubType() & INP_TXT)) // SETEXPFLD
+                if (m_aMgr.GetFieldType(RES_USERFLD, sPar1) == 0 &&
+                !(pTmpField->GetSubType() & INP_TXT)) // SETEXPFLD
                 {
-                    SwSetExpField* pFld = static_cast<SwSetExpField*>(pTmpFld);
-                    pFld->SetPromptText(sPar2);
-                    sPar2 = pFld->GetPar2();
+                    SwSetExpField* pField = static_cast<SwSetExpField*>(pTmpField);
+                    pField->SetPromptText(sPar2);
+                    sPar2 = pField->GetPar2();
                 }
             }
             break;
@@ -250,7 +250,7 @@ bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUStrin
             {
                 if( nSubType == nsSwDocInfoSubType::DI_CUSTOM )
                 {
-                    SwDocInfoField* pDocInfo = static_cast<SwDocInfoField*>( pTmpFld );
+                    SwDocInfoField* pDocInfo = static_cast<SwDocInfoField*>( pTmpField );
                     pDocInfo->SetName( rPar1 );
                 }
             }
@@ -259,18 +259,18 @@ bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUStrin
 
         pSh->StartAllAction();
 
-        pTmpFld->SetSubType(nSubType);
-        pTmpFld->SetAutomaticLanguage(bIsAutomaticLanguage);
+        pTmpField->SetSubType(nSubType);
+        pTmpField->SetAutomaticLanguage(bIsAutomaticLanguage);
 
-        m_aMgr.UpdateCurFld( nFormatId, sPar1, sPar2, pTmpFld );
+        m_aMgr.UpdateCurField( nFormatId, sPar1, sPar2, pTmpField );
 
-        m_pCurFld = m_aMgr.GetCurFld();
+        m_pCurField = m_aMgr.GetCurField();
 
         switch (nTypeId)
         {
             case TYP_HIDDENTXTFLD:
             case TYP_HIDDENPARAFLD:
-                m_aMgr.EvalExpFlds(pSh);
+                m_aMgr.EvalExpFields(pSh);
                 break;
         }
 
@@ -281,7 +281,7 @@ bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUStrin
     return bRet;
 }
 
-void SwFldPage::SavePos( const ListBox* pLst1, const ListBox* pLst2,
+void SwFieldPage::SavePos( const ListBox* pLst1, const ListBox* pLst2,
                          const ListBox* pLst3 )
 {
     const ListBox* aLBArr [ coLBCount ] = { pLst1, pLst2, pLst3 };
@@ -294,7 +294,7 @@ void SwFldPage::SavePos( const ListBox* pLst1, const ListBox* pLst2,
             m_aLstStrArr[ i ].clear();
 }
 
-void SwFldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3)
+void SwFieldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3)
 {
     sal_Int32 nPos = 0;
     ListBox* aLBArr [ coLBCount ] = { pLst1, pLst2, pLst3 };
@@ -307,9 +307,9 @@ void SwFldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3)
 }
 
 // Insert new fields
-IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
+IMPL_LINK( SwFieldPage, InsertHdl, Button *, pBtn )
 {
-    SwFldDlg *pDlg = static_cast<SwFldDlg*>(GetTabDialog());
+    SwFieldDlg *pDlg = static_cast<SwFieldDlg*>(GetTabDialog());
     if (pDlg)
     {
         pDlg->InsertHdl();
@@ -319,7 +319,7 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
     }
     else
     {
-        SwFldEditDlg *pEditDlg = static_cast<SwFldEditDlg *>(GetParentDialog());
+        SwFieldEditDlg *pEditDlg = static_cast<SwFieldEditDlg *>(GetParentDialog());
         pEditDlg->InsertHdl();
     }
 
@@ -327,9 +327,9 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
 }
 
 // enable/disable "Insert"-Button
-void SwFldPage::EnableInsert(bool bEnable)
+void SwFieldPage::EnableInsert(bool bEnable)
 {
-    SwFldDlg *pDlg = static_cast<SwFldDlg*>(GetTabDialog());
+    SwFieldDlg *pDlg = static_cast<SwFieldDlg*>(GetTabDialog());
     if (pDlg)
     {
         if (pDlg->GetCurTabPage() == this)
@@ -337,21 +337,21 @@ void SwFldPage::EnableInsert(bool bEnable)
     }
     else
     {
-        SwFldEditDlg *pEditDlg = static_cast<SwFldEditDlg *>(GetParentDialog());
+        SwFieldEditDlg *pEditDlg = static_cast<SwFieldEditDlg *>(GetParentDialog());
         pEditDlg->EnableInsert(bEnable);
     }
 
     m_bInsert = bEnable;
 }
 
-IMPL_LINK_NOARG(SwFldPage, NumFormatHdl)
+IMPL_LINK_NOARG(SwFieldPage, NumFormatHdl)
 {
     InsertHdl();
 
     return 0;
 }
 
-void SwFldPage::SetWrtShell( SwWrtShell* pShell )
+void SwFieldPage::SetWrtShell( SwWrtShell* pShell )
 {
     m_pWrtShell = pShell;
     m_aMgr.SetWrtShell( pShell );
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 3416e97361ac..15c063dd0bc3 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -28,17 +28,17 @@ class ListBox;
 
 const int coLBCount = 3;
 
-class SwFldPage : public SfxTabPage
+class SwFieldPage : public SfxTabPage
 {
     OUString            m_aLstStrArr[ coLBCount ];
-    SwFldMgr            m_aMgr;
-    SwField             *m_pCurFld;
+    SwFieldMgr            m_aMgr;
+    SwField             *m_pCurField;
     SwWrtShell*         m_pWrtShell;
     sal_Int32           m_nTypeSel;
     sal_Int32           m_nSelectionSel;
-    bool                m_bFldEdit;
+    bool                m_bFieldEdit;
     bool                m_bInsert;
-    bool                m_bFldDlgHtmlMode;
+    bool                m_bFieldDlgHtmlMode;
     bool                m_bRefresh;
     bool                m_bFirstHTMLInit;
 
@@ -48,9 +48,9 @@ protected:
     void                SetTypeSel(sal_Int32  nSet)     { m_nTypeSel = nSet;}
     sal_Int32           GetSelectionSel() const     { return m_nSelectionSel;}
     void                SetSelectionSel(sal_Int32  nSet){ m_nSelectionSel = nSet;}
-    bool                IsFldDlgHtmlMode() const    { return m_bFldDlgHtmlMode;}
+    bool                IsFieldDlgHtmlMode() const    { return m_bFieldDlgHtmlMode;}
     bool                IsRefresh() const           { return m_bRefresh;}
-    SwField*            GetCurField()               { return m_pCurFld;}
+    SwField*            GetCurField()               { return m_pCurField;}
     SwWrtShell*         GetWrtShell() { return m_pWrtShell;}
 
     DECL_LINK( InsertHdl, Button *pBtn = 0 );
@@ -63,10 +63,10 @@ protected:
     void                RestorePos( ListBox* pLst1, ListBox* pLst2 = 0,
                                     ListBox* pLst3 = 0 );
     void                EnableInsert(bool bEnable = true);
-    inline bool         IsFldEdit() const   { return m_bFldEdit; }
+    inline bool         IsFieldEdit() const   { return m_bFieldEdit; }
 
     // insert field
-    bool                InsertFld(  sal_uInt16 nTypeId,
+    bool                InsertField(  sal_uInt16 nTypeId,
                                     sal_uInt16 nSubType,
                                     const OUString& rPar1,
                                     const OUString& rPar2,
@@ -77,14 +77,14 @@ protected:
     using SfxTabPage::ActivatePage;
 
 public:
-    SwFldPage(vcl::Window *pParent, const OString& rID,
+    SwFieldPage(vcl::Window *pParent, const OString& rID,
         const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet);
 
-    virtual ~SwFldPage();
+    virtual ~SwFieldPage();
 
     virtual void        ActivatePage() SAL_OVERRIDE;
 
-    inline SwFldMgr&    GetFldMgr()         { return m_aMgr; }
+    inline SwFieldMgr&    GetFieldMgr()         { return m_aMgr; }
     void                SetWrtShell( SwWrtShell* m_pWrtShell );
     void                EditNewField( bool bOnlyActivate = false );
     virtual sal_uInt16      GetGroup() = 0;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index e03f5db0d3b3..cef199107340 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -42,17 +42,17 @@
 #define REFFLDFLAG_HEADING  0x7100
 #define REFFLDFLAG_NUMITEM  0x7200
 
-static sal_uInt16 nFldDlgFmtSel = 0;
+static sal_uInt16 nFieldDlgFormatSel = 0;
 
 #define USER_DATA_VERSION_1 "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
-SwFldRefPage::SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
-    : SwFldPage(pParent, "FldRefPage",
+SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
+    : SwFieldPage(pParent, "FieldRefPage",
         "modules/swriter/ui/fldrefpage.ui", rCoreSet)
     , maOutlineNodes()
     , maNumItems()
-    , mpSavedSelectedTxtNode(0)
+    , mpSavedSelectedTextNode(0)
     , mnSavedSelectedPos(0)
 {
     get(m_pTypeLB, "type");
@@ -67,12 +67,12 @@ SwFldRefPage::SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
     get(m_pNameED, "name");
     get(m_pValueED, "value");
 
-    sBookmarkTxt = m_pTypeLB->GetEntry(0);
-    sFootnoteTxt = m_pTypeLB->GetEntry(1);
-    sEndnoteTxt = m_pTypeLB->GetEntry(2);
+    sBookmarkText = m_pTypeLB->GetEntry(0);
+    sFootnoteText = m_pTypeLB->GetEntry(1);
+    sEndnoteText = m_pTypeLB->GetEntry(2);
     // #i83479#
-    sHeadingTxt = m_pTypeLB->GetEntry(3);
-    sNumItemTxt = m_pTypeLB->GetEntry(4);
+    sHeadingText = m_pTypeLB->GetEntry(3);
+    sNumItemText = m_pTypeLB->GetEntry(4);
     m_pTypeLB->Clear();
 
     long nHeight = m_pTypeLB->GetTextHeight() * 20;
@@ -89,28 +89,28 @@ SwFldRefPage::SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
     m_pSelection->set_width_request(nWidth*2);
     m_pSelectionToolTipLB->set_width_request(nWidth*2);
 
-    m_pNameED->SetModifyHdl(LINK(this, SwFldRefPage, ModifyHdl));
+    m_pNameED->SetModifyHdl(LINK(this, SwFieldRefPage, ModifyHdl));
 
-    m_pTypeLB->SetDoubleClickHdl       (LINK(this, SwFldRefPage, InsertHdl));
-    m_pTypeLB->SetSelectHdl            (LINK(this, SwFldRefPage, TypeHdl));
-    m_pSelectionLB->SetSelectHdl       (LINK(this, SwFldRefPage, SubTypeHdl));
-    m_pSelectionLB->SetDoubleClickHdl  (LINK(this, SwFldRefPage, InsertHdl));
-    m_pFormatLB->SetDoubleClickHdl     (LINK(this, SwFldRefPage, InsertHdl));
+    m_pTypeLB->SetDoubleClickHdl       (LINK(this, SwFieldRefPage, InsertHdl));
+    m_pTypeLB->SetSelectHdl            (LINK(this, SwFieldRefPage, TypeHdl));
+    m_pSelectionLB->SetSelectHdl       (LINK(this, SwFieldRefPage, SubTypeHdl));
+    m_pSelectionLB->SetDoubleClickHdl  (LINK(this, SwFieldRefPage, InsertHdl));
+    m_pFormatLB->SetDoubleClickHdl     (LINK(this, SwFieldRefPage, InsertHdl));
 
     // #i83479#
-    m_pSelectionToolTipLB->SetSelectHdl( LINK(this, SwFldRefPage, SubTypeHdl) );
-    m_pSelectionToolTipLB->SetDoubleClickHdl( LINK(this, SwFldRefPage, InsertHdl) );
+    m_pSelectionToolTipLB->SetSelectHdl( LINK(this, SwFieldRefPage, SubTypeHdl) );
+    m_pSelectionToolTipLB->SetDoubleClickHdl( LINK(this, SwFieldRefPage, InsertHdl) );
     m_pSelectionToolTipLB->SetStyle( m_pSelectionToolTipLB->GetStyle() | WB_HSCROLL );
     m_pSelectionToolTipLB->SetSpaceBetweenEntries(1);
     m_pSelectionToolTipLB->SetHighlightRange();
 }
 
-SwFldRefPage::~SwFldRefPage()
+SwFieldRefPage::~SwFieldRefPage()
 {
     disposeOnce();
 }
 
-void SwFldRefPage::dispose()
+void SwFieldRefPage::dispose()
 {
     m_pTypeLB.clear();
     m_pSelection.clear();
@@ -121,13 +121,13 @@ void SwFldRefPage::dispose()
     m_pNameFT.clear();
     m_pNameED.clear();
     m_pValueED.clear();
-    SwFldPage::dispose();
+    SwFieldPage::dispose();
 }
 
 // #i83479#
-void SwFldRefPage::SaveSelectedTxtNode()
+void SwFieldRefPage::SaveSelectedTextNode()
 {
-    mpSavedSelectedTxtNode = 0;
+    mpSavedSelectedTextNode = 0;
     mnSavedSelectedPos = 0;
     if ( m_pSelectionToolTipLB->IsVisible() )
     {
@@ -141,7 +141,7 @@ void SwFldRefPage::SaveSelectedTxtNode()
                 mnSavedSelectedPos = static_cast<size_t>(reinterpret_cast<sal_uLong>(pEntry->GetUserData()));
                 if ( mnSavedSelectedPos < maOutlineNodes.size() )
                 {
-                    mpSavedSelectedTxtNode = maOutlineNodes[mnSavedSelectedPos];
+                    mpSavedSelectedTextNode = maOutlineNodes[mnSavedSelectedPos];
                 }
             }
             else if ( nTypeId == REFFLDFLAG_NUMITEM )
@@ -149,20 +149,20 @@ void SwFldRefPage::SaveSelectedTxtNode()
                 mnSavedSelectedPos = static_cast<size_t>(reinterpret_cast<sal_uLong>(pEntry->GetUserData()));
                 if ( mnSavedSelectedPos < maNumItems.size() )
                 {
-                    mpSavedSelectedTxtNode = maNumItems[mnSavedSelectedPos]->GetTxtNode();
+                    mpSavedSelectedTextNode = maNumItems[mnSavedSelectedPos]->GetTextNode();
                 }
             }
         }
     }
 }
 
-void SwFldRefPage::Reset(const SfxItemSet* )
+void SwFieldRefPage::Reset(const SfxItemSet* )
 {
-    if (!IsFldEdit())
+    if (!IsFieldEdit())
     {
         SavePos(m_pTypeLB);
         // #i83479#
-        SaveSelectedTxtNode();
+        SaveSelectedTextNode();
     }
     SetSelectionSel(LISTBOX_ENTRY_NOTFOUND);
     SetTypeSel(LISTBOX_ENTRY_NOTFOUND);
@@ -176,24 +176,24 @@ void SwFldRefPage::Reset(const SfxItemSet* )
 
     sal_Int32 nPos;
     // set/insert reference
-    const SwFldGroupRgn& rRg = SwFldMgr::GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
+    const SwFieldGroupRgn& rRg = SwFieldMgr::GetGroupRange(IsFieldDlgHtmlMode(), GetGroup());
 
     for (short i = rRg.nStart; i < rRg.nEnd; ++i)
     {
-        const sal_uInt16 nTypeId = SwFldMgr::GetTypeId(i);
+        const sal_uInt16 nTypeId = SwFieldMgr::GetTypeId(i);
 
-        if (!IsFldEdit() || nTypeId != TYP_SETREFFLD)
+        if (!IsFieldEdit() || nTypeId != TYP_SETREFFLD)
         {
-            nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(i), i - rRg.nStart);
+            nPos = m_pTypeLB->InsertEntry(SwFieldMgr::GetTypeStr(i), i - rRg.nStart);
             m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
         }
     }
 
     // #i83479#
     // entries for headings and numbered items
-    nPos = m_pTypeLB->InsertEntry(sHeadingTxt);
+    nPos = m_pTypeLB->InsertEntry(sHeadingText);
     m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(REFFLDFLAG_HEADING));
-    nPos = m_pTypeLB->InsertEntry(sNumItemTxt);
+    nPos = m_pTypeLB->InsertEntry(sNumItemText);
     m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(REFFLDFLAG_NUMITEM));
 
     // fill up with the sequence types
@@ -201,11 +201,11 @@ void SwFldRefPage::Reset(const SfxItemSet* )
     if(!pSh)
         pSh = ::GetActiveWrtShell();
 
-    const sal_uInt16 nFldTypeCnt = pSh->GetFldTypeCount(RES_SETEXPFLD);
+    const sal_uInt16 nFieldTypeCnt = pSh->GetFieldTypeCount(RES_SETEXPFLD);
 
-    for (sal_uInt16 n = 0; n < nFldTypeCnt; ++n)
+    for (sal_uInt16 n = 0; n < nFieldTypeCnt; ++n)
     {
-        SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFldType(n, RES_SETEXPFLD));
+        SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFieldType(n, RES_SETEXPFLD));
 
         if ((nsSwGetSetExpType::GSE_SEQ & pType->GetType()) && pType->HasWriterListeners() && pSh->IsUsed(*pType))
         {
@@ -215,30 +215,30 @@ void SwFldRefPage::Reset(const SfxItemSet* )
     }
 
     // text marks - now always (because of globaldocuments)
-    nPos = m_pTypeLB->InsertEntry(sBookmarkTxt);
+    nPos = m_pTypeLB->InsertEntry(sBookmarkText);
     m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(REFFLDFLAG_BOOKMARK));
 
     // footnotes:
-    if( pSh->HasFtns() )
+    if( pSh->HasFootnotes() )
     {
-        nPos = m_pTypeLB->InsertEntry(sFootnoteTxt);
+        nPos = m_pTypeLB->InsertEntry(sFootnoteText);
         m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(REFFLDFLAG_FOOTNOTE));
     }
 
     // endnotes:
-    if ( pSh->HasFtns(true) )
+    if ( pSh->HasFootnotes(true) )
     {
-        nPos = m_pTypeLB->InsertEntry(sEndnoteTxt);
+        nPos = m_pTypeLB->InsertEntry(sEndnoteText);
         m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(REFFLDFLAG_ENDNOTE));
     }
 
     // select old Pos
-    if (!IsFldEdit())
+    if (!IsFieldEdit())
         RestorePos(m_pTypeLB);
 
     m_pTypeLB->SetUpdateMode(true);
 
-    nFldDlgFmtSel = 0;
+    nFieldDlgFormatSel = 0;
 
     if( !IsRefresh() )
     {
@@ -261,7 +261,7 @@ void SwFldRefPage::Reset(const SfxItemSet* )
     }
     TypeHdl(0);
 
-    if (IsFldEdit())
+    if (IsFieldEdit())
     {
         m_pTypeLB->SaveValue();
         m_pSelectionLB->SaveValue();
@@ -271,7 +271,7 @@ void SwFldRefPage::Reset(const SfxItemSet* )
     }
 }
 
-IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
+IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl)
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
@@ -281,7 +281,7 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
 
     if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
     {
-        if (IsFldEdit())
+        if (IsFieldEdit())
         {
             // select positions
             OUString sName;
@@ -292,34 +292,34 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
                 case REF_BOOKMARK:
                 {
                     // #i83479#
-                    SwGetRefField* pRefFld = dynamic_cast<SwGetRefField*>(GetCurField());
-                    if ( pRefFld &&
-                         pRefFld->IsRefToHeadingCrossRefBookmark() )
+                    SwGetRefField* pRefField = dynamic_cast<SwGetRefField*>(GetCurField());
+                    if ( pRefField &&
+                         pRefField->IsRefToHeadingCrossRefBookmark() )
                     {
-                        sName = sHeadingTxt;
+                        sName = sHeadingText;
                         nFlag = REFFLDFLAG_HEADING;
                     }
-                    else if ( pRefFld &&
-                              pRefFld->IsRefToNumItemCrossRefBookmark() )
+                    else if ( pRefField &&
+                              pRefField->IsRefToNumItemCrossRefBookmark() )
                     {
-                        sName = sNumItemTxt;
+                        sName = sNumItemText;
                         nFlag = REFFLDFLAG_NUMITEM;
                     }
                     else
                     {
-                        sName = sBookmarkTxt;
+                        sName = sBookmarkText;
                         nFlag = REFFLDFLAG_BOOKMARK;
                     }
                 }
                 break;
 
                 case REF_FOOTNOTE:
-                    sName = sFootnoteTxt;
+                    sName = sFootnoteText;
                     nFlag = REFFLDFLAG_FOOTNOTE;
                     break;
 
                 case REF_ENDNOTE:
-                    sName = sEndnoteTxt;
+                    sName = sEndnoteText;
                     nFlag = REFFLDFLAG_ENDNOTE;
                     break;
 
@@ -358,9 +358,9 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
         UpdateSubType();
 
         bool bName = false;
-        nFldDlgFmtSel = 0;
+        nFieldDlgFormatSel = 0;
 
-        if ( ( !IsFldEdit() || m_pSelectionLB->GetEntryCount() ) &&
+        if ( ( !IsFieldEdit() || m_pSelectionLB->GetEntryCount() ) &&
              nOld != LISTBOX_ENTRY_NOTFOUND )
         {
             m_pNameED->SetText(aEmptyOUStr);
@@ -372,7 +372,7 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
             case TYP_GETREFFLD:
                 if (REFFLDFLAG & (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(nOld)))
                     // the old one stays
-                    nFldDlgFmtSel = m_pFormatLB->GetSelectEntryPos();
+                    nFieldDlgFormatSel = m_pFormatLB->GetSelectEntryPos();
                 bName = true;
                 break;
 
@@ -389,7 +389,7 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
                     const sal_uInt16 nOldId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(nOld));
                     if( nOldId & REFFLDFLAG || nOldId == TYP_GETREFFLD )
                         // then the old one stays
-                        nFldDlgFmtSel = m_pFormatLB->GetSelectEntryPos();
+                        nFieldDlgFormatSel = m_pFormatLB->GetSelectEntryPos();
                 }
                 break;
         }
@@ -409,14 +409,14 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwFldRefPage, SubTypeHdl)
+IMPL_LINK_NOARG(SwFieldRefPage, SubTypeHdl)
 {
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
     switch(nTypeId)
     {
         case TYP_GETREFFLD:
-            if (!IsFldEdit() || m_pSelectionLB->GetSelectEntryCount())
+            if (!IsFieldEdit() || m_pSelectionLB->GetSelectEntryCount())
             {
                 m_pNameED->SetText(m_pSelectionLB->GetSelectEntry());
                 ModifyHdl(m_pNameED);
@@ -430,7 +430,7 @@ IMPL_LINK_NOARG(SwFldRefPage, SubTypeHdl)
                 pSh = ::GetActiveWrtShell();
             if(pSh)
             {
-                m_pValueED->SetText(pSh->GetSelTxt());
+                m_pValueED->SetText(pSh->GetSelText());
             }
 
         }
@@ -448,7 +448,7 @@ IMPL_LINK_NOARG(SwFldRefPage, SubTypeHdl)
         break;
 
         default:
-            if (!IsFldEdit() || m_pSelectionLB->GetSelectEntryCount())
+            if (!IsFieldEdit() || m_pSelectionLB->GetSelectEntryCount())
                 m_pNameED->SetText(m_pSelectionLB->GetSelectEntry());
             break;
     }
@@ -457,12 +457,12 @@ IMPL_LINK_NOARG(SwFldRefPage, SubTypeHdl)
 }
 
 // renew types in SelectionLB
-void SwFldRefPage::UpdateSubType()
+void SwFieldRefPage::UpdateSubType()
 {
     SwWrtShell *pSh = GetWrtShell();
     if(!pSh)
         pSh = ::GetActiveWrtShell();
-    SwGetRefField* pRefFld = static_cast<SwGetRefField*>(GetCurField());
+    SwGetRefField* pRefField = static_cast<SwGetRefField*>(GetCurField());
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
     OUString sOldSel;
@@ -475,8 +475,8 @@ void SwFldRefPage::UpdateSubType()
             sOldSel = m_pSelectionLB->GetEntry(nSelectionSel);
         }
     }
-    if (IsFldEdit() && sOldSel.isEmpty())
-        sOldSel = OUString::number( pRefFld->GetSeqNo() + 1 );
+    if (IsFieldEdit() && sOldSel.isEmpty())
+        sOldSel = OUString::number( pRefField->GetSeqNo() + 1 );
 
     m_pSelectionLB->SetUpdateMode(false);
     m_pSelectionLB->Clear();
@@ -500,32 +500,32 @@ void SwFldRefPage::UpdateSubType()
                 if(IDocumentMarkAccess::MarkType::BOOKMARK == IDocumentMarkAccess::GetType(*pBkmk))
                     m_pSelectionLB->InsertEntry( pBkmk->GetName() );
             }
-            if (IsFldEdit())
-                sOldSel = pRefFld->GetSetRefName();
+            if (IsFieldEdit())
+                sOldSel = pRefField->GetSetRefName();
         }
         else if (nTypeId == REFFLDFLAG_FOOTNOTE)
         {
             m_pSelectionLB->SetStyle(m_pSelectionLB->GetStyle() & ~WB_SORT);
-            SwSeqFldList aArr;
-            const size_t nCnt = pSh->GetSeqFtnList( aArr );
+            SwSeqFieldList aArr;
+            const size_t nCnt = pSh->GetSeqFootnoteList( aArr );
 
             for( size_t n = 0; n < nCnt; ++n )
             {
                 m_pSelectionLB->InsertEntry( aArr[ n ]->sDlgEntry );
-                if (IsFldEdit() && pRefFld->GetSeqNo() == aArr[ n ]->nSeqNo)
+                if (IsFieldEdit() && pRefField->GetSeqNo() == aArr[ n ]->nSeqNo)
                     sOldSel = aArr[n]->sDlgEntry;
             }
         }
         else if (nTypeId == REFFLDFLAG_ENDNOTE)
         {
             m_pSelectionLB->SetStyle(m_pSelectionLB->GetStyle() & ~WB_SORT);
-            SwSeqFldList aArr;
-            const size_t nCnt = pSh->GetSeqFtnList( aArr, true );
+            SwSeqFieldList aArr;
+            const size_t nCnt = pSh->GetSeqFootnoteList( aArr, true );
 
             for( size_t n = 0; n < nCnt; ++n )
             {
                 m_pSelectionLB->InsertEntry( aArr[ n ]->sDlgEntry );
-                if (IsFldEdit() && pRefFld->GetSeqNo() == aArr[ n ]->nSeqNo)
+                if (IsFieldEdit() && pRefField->GetSeqNo() == aArr[ n ]->nSeqNo)
                     sOldSel = aArr[n]->sDlgEntry;
             }
         }
@@ -536,21 +536,21 @@ void SwFldRefPage::UpdateSubType()
 
             const IDocumentOutlineNodes* pIDoc( pSh->getIDocumentOutlineNodesAccess() );
             pIDoc->getOutlineNodes( maOutlineNodes );
-            bool bCertainTxtNodeSelected( false );
+            bool bCertainTextNodeSelected( false );
             for ( size_t nOutlIdx = 0; nOutlIdx < maOutlineNodes.size(); ++nOutlIdx )
             {
                 SvTreeListEntry* pEntry = m_pSelectionToolTipLB->InsertEntry(
                                 pIDoc->getOutlineText( nOutlIdx, true, true, false ) );
                 pEntry->SetUserData( reinterpret_cast<void*>(nOutlIdx) );
-                if ( ( IsFldEdit() &&
-                       pRefFld->GetReferencedTxtNode() == maOutlineNodes[nOutlIdx] ) ||
-                     mpSavedSelectedTxtNode == maOutlineNodes[nOutlIdx] )
+                if ( ( IsFieldEdit() &&
+                       pRefField->GetReferencedTextNode() == maOutlineNodes[nOutlIdx] ) ||
+                     mpSavedSelectedTextNode == maOutlineNodes[nOutlIdx] )
                 {
                     m_pSelectionToolTipLB->Select( pEntry );
                     sOldSel.clear();
-                    bCertainTxtNodeSelected = true;
+                    bCertainTextNodeSelected = true;
                 }
-                else if ( !bCertainTxtNodeSelected && mnSavedSelectedPos == nOutlIdx )
+                else if ( !bCertainTextNodeSelected && mnSavedSelectedPos == nOutlIdx )
                 {
                     m_pSelectionToolTipLB->Select( pEntry );
                     sOldSel.clear();
@@ -563,21 +563,21 @@ void SwFldRefPage::UpdateSubType()
 
             const IDocumentListItems* pIDoc( pSh->getIDocumentListItemsAccess() );
             pIDoc->getNumItems( maNumItems );
-            bool bCertainTxtNodeSelected( false );
+            bool bCertainTextNodeSelected( false );
             for ( size_t nNumItemIdx = 0; nNumItemIdx < maNumItems.size(); ++nNumItemIdx )
             {
                 SvTreeListEntry* pEntry = m_pSelectionToolTipLB->InsertEntry(
                             pIDoc->getListItemText( *maNumItems[nNumItemIdx], true, true ) );
                 pEntry->SetUserData( reinterpret_cast<void*>(nNumItemIdx) );
-                if ( ( IsFldEdit() &&
-                       pRefFld->GetReferencedTxtNode() == maNumItems[nNumItemIdx]->GetTxtNode() ) ||
-                     mpSavedSelectedTxtNode == maNumItems[nNumItemIdx]->GetTxtNode() )
+                if ( ( IsFieldEdit() &&
+                       pRefField->GetReferencedTextNode() == maNumItems[nNumItemIdx]->GetTextNode() ) ||
+                     mpSavedSelectedTextNode == maNumItems[nNumItemIdx]->GetTextNode() )
                 {
                     m_pSelectionToolTipLB->Select( pEntry );
                     sOldSel.clear();
-                    bCertainTxtNodeSelected = true;
+                    bCertainTextNodeSelected = true;
                 }
-                else if ( !bCertainTxtNodeSelected && mnSavedSelectedPos == nNumItemIdx )
+                else if ( !bCertainTextNodeSelected && mnSavedSelectedPos == nNumItemIdx )
                 {
                     m_pSelectionToolTipLB->Select( pEntry );
                     sOldSel.clear();
@@ -589,38 +589,38 @@ void SwFldRefPage::UpdateSubType()
             m_pSelectionLB->SetStyle(m_pSelectionLB->GetStyle()|WB_SORT);
             // get the fields to Seq-FieldType:
 
-            SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFldType(
+            SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFieldType(
                                 nTypeId & ~REFFLDFLAG, RES_SETEXPFLD ));
             if( pType )
             {
-                SwSeqFldList aArr;
+                SwSeqFieldList aArr;
                 // old selection should be kept in non-edit mode
-                if(IsFldEdit())
+                if(IsFieldEdit())
                     sOldSel.clear();
 
-                const size_t nCnt = pType->GetSeqFldList( aArr );
+                const size_t nCnt = pType->GetSeqFieldList( aArr );
                 for( size_t n = 0; n < nCnt; ++n )
                 {
                     m_pSelectionLB->InsertEntry( aArr[ n ]->sDlgEntry );
-                    if (IsFldEdit() && sOldSel.isEmpty() &&
-                        aArr[ n ]->nSeqNo == pRefFld->GetSeqNo())
+                    if (IsFieldEdit() && sOldSel.isEmpty() &&
+                        aArr[ n ]->nSeqNo == pRefField->GetSeqNo())
                         sOldSel = aArr[ n ]->sDlgEntry;
                 }
 
-                if (IsFldEdit() && sOldSel.isEmpty())
-                    sOldSel = OUString::number( pRefFld->GetSeqNo() + 1);
+                if (IsFieldEdit() && sOldSel.isEmpty())
+                    sOldSel = OUString::number( pRefField->GetSeqNo() + 1);
             }
         }
     }
     else
     {
         std::vector<OUString> aLst;
-        GetFldMgr().GetSubTypes(nTypeId, aLst);
+        GetFieldMgr().GetSubTypes(nTypeId, aLst);
         for(size_t i = 0; i < aLst.size(); ++i)
             m_pSelectionLB->InsertEntry(aLst[i]);
 
-        if (IsFldEdit())
-            sOldSel = pRefFld->GetSetRefName();
+        if (IsFieldEdit())
+            sOldSel = pRefField->GetSetRefName();
     }
 
     // #i83479#
@@ -638,7 +638,7 @@ void SwFldRefPage::UpdateSubType()
             m_pSelectionToolTipLB->MakeVisible( m_pSelectionToolTipLB->GetCurEntry() );
         }
 
-        if ( IsFldEdit() && m_pSelectionToolTipLB->GetCurEntry() == 0 )
+        if ( IsFieldEdit() && m_pSelectionToolTipLB->GetCurEntry() == 0 )
         {
             m_pNameED->SetText(sOldSel);
         }
@@ -654,16 +654,16 @@ void SwFldRefPage::UpdateSubType()
         if ( bEnable )
         {
             m_pSelectionLB->SelectEntry(sOldSel);
-            if (!m_pSelectionLB->GetSelectEntryCount() && !IsFldEdit())
+            if (!m_pSelectionLB->GetSelectEntryCount() && !IsFieldEdit())
                 m_pSelectionLB->SelectEntryPos(0);
         }
 
-        if (IsFldEdit() && !m_pSelectionLB->GetSelectEntryCount()) // in case the reference was already deleted...
+        if (IsFieldEdit() && !m_pSelectionLB->GetSelectEntryCount()) // in case the reference was already deleted...
             m_pNameED->SetText(sOldSel);
     }
 }
 
-sal_Int32 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
+sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
 {
     OUString sOldSel;
 
@@ -701,7 +701,7 @@ sal_Int32 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
             }
             else
             {
-                nSize = GetFldMgr().GetFormatCount( nTypeId, false, IsFldDlgHtmlMode() );
+                nSize = GetFieldMgr().GetFormatCount( nTypeId, false, IsFieldDlgHtmlMode() );
             }
             break;
     }
@@ -711,35 +711,35 @@ sal_Int32 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
 
     for (sal_uInt16 i = 0; i < nSize; i++)
     {
-        sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFldMgr().GetFormatStr( nTypeId, i ));
-        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, i )));
+        sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, i ));
+        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, i )));
     }
     // #i83479#
     if ( bAddCrossRefFormats )
     {
         sal_uInt16 nFormat = FMT_REF_NUMBER - FMT_REF_BEGIN;
-        sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFldMgr().GetFormatStr( nTypeId, nFormat ));
-        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, nFormat )));
+        sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat ));
+        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat )));
         nFormat = FMT_REF_NUMBER_NO_CONTEXT - FMT_REF_BEGIN;
-        nPos = m_pFormatLB->InsertEntry(GetFldMgr().GetFormatStr( nTypeId, nFormat ));
-        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, nFormat )));
+        nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat ));
+        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat )));
         nFormat = FMT_REF_NUMBER_FULL_CONTEXT - FMT_REF_BEGIN;
-        nPos = m_pFormatLB->InsertEntry(GetFldMgr().GetFormatStr( nTypeId, nFormat ));
-        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, nFormat )));
+        nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat ));
+        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat )));
         nSize += 3;
     }
 
     // select a certain entry
     if (nSize)
     {
-        if (!IsFldEdit())
+        if (!IsFieldEdit())
             m_pFormatLB->SelectEntry(sOldSel);
         else
             m_pFormatLB->SelectEntry(SW_RESSTR(FMT_REF_BEGIN + GetCurField()->GetFormat()));
 
         if (!m_pFormatLB->GetSelectEntryCount())
         {
-            m_pFormatLB->SelectEntryPos(nFldDlgFmtSel);
+            m_pFormatLB->SelectEntryPos(nFieldDlgFormatSel);
             if (!m_pFormatLB->GetSelectEntryCount())
                 m_pFormatLB->SelectEntryPos(0);
         }
@@ -749,7 +749,7 @@ sal_Int32 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
 }
 
 // Modify
-IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl)
+IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl)
 {
     OUString aName(m_pNameED->GetText());
     const bool bEmptyName = aName.isEmpty();
@@ -757,7 +757,7 @@ IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl)
     bool bEnable = true;
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
-    if ((nTypeId == TYP_SETREFFLD && !GetFldMgr().CanInsertRefMark(aName)) ||
+    if ((nTypeId == TYP_SETREFFLD && !GetFieldMgr().CanInsertRefMark(aName)) ||
         (bEmptyName && (nTypeId == TYP_GETREFFLD || nTypeId == TYP_SETREFFLD ||
                        nTypeId == REFFLDFLAG_BOOKMARK)))
         bEnable = false;
@@ -769,7 +769,7 @@ IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl)
     return 0;
 }
 
-bool SwFldRefPage::FillItemSet(SfxItemSet* )
+bool SwFieldRefPage::FillItemSet(SfxItemSet* )
 {
     bool bModified = false;
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
@@ -790,7 +790,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
 
         case TYP_SETREFFLD:
         {
-            SwFieldType* pType = GetFldMgr().GetFldType(RES_SETEXPFLD, aName);
+            SwFieldType* pType = GetFieldMgr().GetFieldType(RES_SETEXPFLD, aName);
 
             if(!pType)  // Only insert when the name doesn't exist yet
             {
@@ -801,7 +801,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
         }
     }
 
-    SwGetRefField* pRefFld = static_cast<SwGetRefField*>(GetCurField());
+    SwGetRefField* pRefField = static_cast<SwGetRefField*>(GetCurField());
 
     if (REFFLDFLAG & nTypeId)
     {
@@ -818,8 +818,8 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
         }
         else if (REFFLDFLAG_FOOTNOTE == nTypeId)        // footnotes
         {
-            SwSeqFldList aArr;
-            _SeqFldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
+            SwSeqFieldList aArr;
+            _SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
 
             size_t nPos = 0;
 
@@ -827,20 +827,20 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
             nSubType = REF_FOOTNOTE;
             aName.clear();
 
-            if (pSh->GetSeqFtnList(aArr) && aArr.SeekEntry(aElem, &nPos))
+            if (pSh->GetSeqFootnoteList(aArr) && aArr.SeekEntry(aElem, &nPos))
             {
                 aVal = OUString::number( aArr[nPos]->nSeqNo );
 
-                if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
+                if (IsFieldEdit() && aArr[nPos]->nSeqNo == pRefField->GetSeqNo())
                     bModified = true; // can happen with fields of which the references were deleted
             }
-            else if (IsFldEdit())
-                aVal = OUString::number( pRefFld->GetSeqNo() );
+            else if (IsFieldEdit())
+                aVal = OUString::number( pRefField->GetSeqNo() );
         }
         else if (REFFLDFLAG_ENDNOTE == nTypeId)         // endnotes
         {
-            SwSeqFldList aArr;
-            _SeqFldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
+            SwSeqFieldList aArr;
+            _SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
 
             size_t nPos = 0;
 
@@ -848,22 +848,22 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
             nSubType = REF_ENDNOTE;
             aName.clear();
 
-            if (pSh->GetSeqFtnList(aArr, true) && aArr.SeekEntry(aElem, &nPos))
+            if (pSh->GetSeqFootnoteList(aArr, true) && aArr.SeekEntry(aElem, &nPos))
             {
                 aVal = OUString::number( aArr[nPos]->nSeqNo );
 
-                if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
+                if (IsFieldEdit() && aArr[nPos]->nSeqNo == pRefField->GetSeqNo())
                     bModified = true; // can happen with fields of which the reference was deleted
             }
-            else if (IsFldEdit())
-                aVal = OUString::number( pRefFld->GetSeqNo() );
+            else if (IsFieldEdit())
+                aVal = OUString::number( pRefField->GetSeqNo() );
         }
         // #i83479#
         else if ( nTypeId == REFFLDFLAG_HEADING )
         {
             SvTreeListEntry* pEntry = m_pSelectionToolTipLB->GetCurEntry();
             OSL_ENSURE( pEntry,
-                    "<SwFldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" );
+                    "<SwFieldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" );
             if ( pEntry )
             {
                 const size_t nOutlIdx( static_cast<size_t>
@@ -871,7 +871,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
                 pSh->getIDocumentOutlineNodesAccess()->getOutlineNodes( maOutlineNodes );
                 if ( nOutlIdx < maOutlineNodes.size() )
                 {
-                    ::sw::mark::IMark const * const pMark = pSh->getIDocumentMarkAccess()->getMarkForTxtNode(
+                    ::sw::mark::IMark const * const pMark = pSh->getIDocumentMarkAccess()->getMarkForTextNode(
                         *(maOutlineNodes[nOutlIdx]),
                         IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK);
                     aName = pMark->GetName();
@@ -884,7 +884,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
         {
             SvTreeListEntry* pEntry = m_pSelectionToolTipLB->GetCurEntry();
             OSL_ENSURE( pEntry,
-                    "<SwFldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" );
+                    "<SwFieldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" );
             if ( pEntry )
             {
                 const size_t nNumItemIdx( static_cast<size_t>
@@ -892,8 +892,8 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
                 pSh->getIDocumentListItemsAccess()->getNumItems( maNumItems );
                 if ( nNumItemIdx < maNumItems.size() )
                 {
-                    ::sw::mark::IMark const * const pMark = pSh->getIDocumentMarkAccess()->getMarkForTxtNode(
-                        *(maNumItems[nNumItemIdx]->GetTxtNode()),
+                    ::sw::mark::IMark const * const pMark = pSh->getIDocumentMarkAccess()->getMarkForTextNode(
+                        *(maNumItems[nNumItemIdx]->GetTextNode()),
                         IDocumentMarkAccess::MarkType::CROSSREF_NUMITEM_BOOKMARK);
                     aName = pMark->GetName();
                     nTypeId = TYP_GETREFFLD;
@@ -904,12 +904,12 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
         else                                // SeqenceFields
         {
             // get fields for Seq-FeldType:
-            SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFldType(
+            SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFieldType(
                                     nTypeId & ~REFFLDFLAG, RES_SETEXPFLD ));
             if( pType )
             {
-                SwSeqFldList aArr;
-                _SeqFldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
+                SwSeqFieldList aArr;
+                _SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
 
                 size_t nPos = 0;
 
@@ -917,32 +917,32 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
                 nSubType = REF_SEQUENCEFLD;
                 aName = pType->GetName();
 
-                if (pType->GetSeqFldList(aArr) && aArr.SeekEntry(aElem, &nPos))
+                if (pType->GetSeqFieldList(aArr) && aArr.SeekEntry(aElem, &nPos))
                 {
                     aVal = OUString::number( aArr[nPos]->nSeqNo );
 
-                    if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
+                    if (IsFieldEdit() && aArr[nPos]->nSeqNo == pRefField->GetSeqNo())
                         bModified = true; // can happen with fields of which the reference was deleted
                 }
-                else if (IsFldEdit())
-                    aVal = OUString::number( pRefFld->GetSeqNo() );
+                else if (IsFieldEdit())
+                    aVal = OUString::number( pRefField->GetSeqNo() );
             }
         }
     }
 
-    if (IsFldEdit() && nTypeId == TYP_GETREFFLD)
+    if (IsFieldEdit() && nTypeId == TYP_GETREFFLD)
     {
         aVal = OUString::number(nSubType) + "|" + aVal;
     }
 
-    if (!IsFldEdit() || bModified ||
+    if (!IsFieldEdit() || bModified ||
         m_pNameED->IsValueChangedFromSaved() ||
         m_pValueED->IsValueChangedFromSaved() ||
         m_pTypeLB->IsValueChangedFromSaved() ||
         m_pSelectionLB->IsValueChangedFromSaved() ||
         m_pFormatLB->IsValueChangedFromSaved())
     {
-        InsertFld( nTypeId, nSubType, aName, aVal, nFormat );
+        InsertField( nTypeId, nSubType, aName, aVal, nFormat );
     }
 
     ModifyHdl();    // enable/disable insert if applicable
@@ -950,18 +950,18 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-VclPtr<SfxTabPage> SwFldRefPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldRefPage::Create( vcl::Window* pParent,
                                          const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwFldRefPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwFieldRefPage>::Create( pParent, *rAttrSet );
 }
 
-sal_uInt16 SwFldRefPage::GetGroup()
+sal_uInt16 SwFieldRefPage::GetGroup()
 {
     return GRP_REF;
 }
 
-void    SwFldRefPage::FillUserData()
+void    SwFieldRefPage::FillUserData()
 {
     const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos();
     const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos )
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 24c540f181f7..bb1f683d7b5e 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -30,33 +30,33 @@
 #include <IDocumentOutlineNodes.hxx>
 #include <IDocumentListItems.hxx>
 #include <FldRefTreeListBox.hxx>
-class SwTxtNode;
+class SwTextNode;
 
-class SwFldRefPage : public SwFldPage
+class SwFieldRefPage : public SwFieldPage
 {
     VclPtr<ListBox>        m_pTypeLB;
     VclPtr<VclContainer>   m_pSelection;
     VclPtr<ListBox>        m_pSelectionLB;
     // #i83479#
-    VclPtr<SwFldRefTreeListBox> m_pSelectionToolTipLB;
+    VclPtr<SwFieldRefTreeListBox> m_pSelectionToolTipLB;
     VclPtr<VclContainer>   m_pFormat;
     VclPtr<ListBox>        m_pFormatLB;
     VclPtr<FixedText>      m_pNameFT;
     VclPtr<Edit>           m_pNameED;
     VclPtr<Edit>           m_pValueED;
-    OUString    sBookmarkTxt;
-    OUString    sFootnoteTxt;
-    OUString    sEndnoteTxt;
+    OUString    sBookmarkText;
+    OUString    sFootnoteText;
+    OUString    sEndnoteText;
     // #i83479#
-    OUString    sHeadingTxt;
-    OUString    sNumItemTxt;
+    OUString    sHeadingText;
+    OUString    sNumItemText;
 
     IDocumentOutlineNodes::tSortedOutlineNodeList maOutlineNodes;
     IDocumentListItems::tSortedNodeNumList maNumItems;
 
     // selected text node in the listbox for headings and numbered items
     // in order to restore selection after update of selection listbox
-    const SwTxtNode* mpSavedSelectedTxtNode;
+    const SwTextNode* mpSavedSelectedTextNode;
     // fallback, if previously selected text node doesn't exist anymore
     size_t mnSavedSelectedPos;
 
@@ -68,15 +68,15 @@ class SwFldRefPage : public SwFldPage
     sal_Int32               FillFormatLB(sal_uInt16 nTypeId);
 
     // #i83479#
-    void SaveSelectedTxtNode();
+    void SaveSelectedTextNode();
 
 protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rSet);
+                        SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
-                        virtual ~SwFldRefPage();
+                        virtual ~SwFieldRefPage();
     virtual void        dispose() SAL_OVERRIDE;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 00cb076de723..06ddf5f9a973 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
 // carrier of the dialog
-SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent)
+SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent)
     : SfxTabDialog(pParent, "FieldDialog", "modules/swriter/ui/fielddialog.ui")
     , m_pChildWin(pCW)
     , m_pBindings(pB)
@@ -62,18 +62,18 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent
     SetStyle(GetStyle()|WB_STDMODELESS);
     m_bHtmlMode = (::GetHtmlMode(static_cast<SwDocShell*>(SfxObjectShell::Current())) & HTMLMODE_ON) != 0;
 
-    GetCancelButton().SetClickHdl(LINK(this, SwFldDlg, CancelHdl));
+    GetCancelButton().SetClickHdl(LINK(this, SwFieldDlg, CancelHdl));
 
-    GetOKButton().SetClickHdl(LINK(this, SwFldDlg, OKHdl));
+    GetOKButton().SetClickHdl(LINK(this, SwFieldDlg, OKHdl));
 
-    m_nDokId = AddTabPage("document", SwFldDokPage::Create, 0);
-    m_nVarId = AddTabPage("variables", SwFldVarPage::Create, 0);
-    m_nDokInf = AddTabPage("docinfo", SwFldDokInfPage::Create, 0);
+    m_nDokId = AddTabPage("document", SwFieldDokPage::Create, 0);
+    m_nVarId = AddTabPage("variables", SwFieldVarPage::Create, 0);
+    m_nDokInf = AddTabPage("docinfo", SwFieldDokInfPage::Create, 0);
 
     if (!m_bHtmlMode)
     {
-        m_nRefId = AddTabPage("ref", SwFldRefPage::Create, 0);
-        m_nFuncId = AddTabPage("functions", SwFldFuncPage::Create, 0);
+        m_nRefId = AddTabPage("ref", SwFieldRefPage::Create, 0);
+        m_nFuncId = AddTabPage("functions", SwFieldFuncPage::Create, 0);
 
         utl::OConfigurationTreeRoot aCfgRoot
             = utl::OConfigurationTreeRoot::createWithComponentContext(
@@ -88,7 +88,7 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent
             OUString("DatabaseFields")) >>= bDatabaseFields;
 
         if (bDatabaseFields)
-            m_nDbId = AddTabPage("database", SwFldDBPage::Create, 0);
+            m_nDbId = AddTabPage("database", SwFieldDBPage::Create, 0);
         else
             RemoveTabPage("database");
     }
@@ -100,11 +100,11 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent
     }
 }
 
-SwFldDlg::~SwFldDlg()
+SwFieldDlg::~SwFieldDlg()
 {
 }
 
-bool SwFldDlg::Close()
+bool SwFieldDlg::Close()
 {
     m_pBindings->GetDispatcher()->
         Execute(m_bDataBaseMode ? FN_INSERT_FIELD_DATA_ONLY : FN_INSERT_FIELD,
@@ -112,7 +112,7 @@ bool SwFldDlg::Close()
     return true;
 }
 
-void SwFldDlg::Initialize(SfxChildWinInfo *pInfo)
+void SwFieldDlg::Initialize(SfxChildWinInfo *pInfo)
 {
     Point aPos;
     Size aSize;
@@ -158,7 +158,7 @@ void SwFldDlg::Initialize(SfxChildWinInfo *pInfo)
     SetPosPixel( aPos );
 }
 
-SfxItemSet* SwFldDlg::CreateInputItemSet( sal_uInt16 nID  )
+SfxItemSet* SwFieldDlg::CreateInputItemSet( sal_uInt16 nID  )
 {
     if ( nID == m_nDokInf )
     {
@@ -180,7 +180,7 @@ SfxItemSet* SwFldDlg::CreateInputItemSet( sal_uInt16 nID  )
 }
 
 // kick off inserting of new fields
-IMPL_LINK_NOARG(SwFldDlg, OKHdl)
+IMPL_LINK_NOARG(SwFieldDlg, OKHdl)
 {
     if (GetOKButton().IsEnabled())
     {
@@ -193,14 +193,14 @@ IMPL_LINK_NOARG(SwFldDlg, OKHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwFldDlg, CancelHdl)
+IMPL_LINK_NOARG(SwFieldDlg, CancelHdl)
 {
     Close();
     return 0;
 }
 
 // newly initialise dialog after Doc-Switch
-void SwFldDlg::ReInitDlg()
+void SwFieldDlg::ReInitDlg()
 {
     SwDocShell* pDocSh = static_cast<SwDocShell*>(SfxObjectShell::Current());
     bool bNewMode = (::GetHtmlMode(pDocSh) & HTMLMODE_ON) != 0;
@@ -234,15 +234,15 @@ void SwFldDlg::ReInitDlg()
 }
 
 // newly initialise TabPage after Doc-Switch
-void SwFldDlg::ReInitTabPage( sal_uInt16 nPageId, bool bOnlyActivate )
+void SwFieldDlg::ReInitTabPage( sal_uInt16 nPageId, bool bOnlyActivate )
 {
-    SwFldPage* pPage = static_cast<SwFldPage* >(GetTabPage(nPageId));
+    SwFieldPage* pPage = static_cast<SwFieldPage* >(GetTabPage(nPageId));
     if ( pPage )
         pPage->EditNewField( bOnlyActivate );   // newly initialise TabPage
 }
 
 // newly initialise after activation of a few TabPages
-void SwFldDlg::Activate()
+void SwFieldDlg::Activate()
 {
     SwView* pView = ::GetActiveView();
     if( pView )
@@ -262,7 +262,7 @@ void SwFldDlg::Activate()
     }
 }
 
-void SwFldDlg::EnableInsert(bool bEnable)
+void SwFieldDlg::EnableInsert(bool bEnable)
 {
     if( bEnable )
     {
@@ -276,19 +276,19 @@ void SwFldDlg::EnableInsert(bool bEnable)
     GetOKButton().Enable(bEnable);
 }
 
-void SwFldDlg::InsertHdl()
+void SwFieldDlg::InsertHdl()
 {
     GetOKButton().Click();
 }
 
-void SwFldDlg::ActivateDatabasePage()
+void SwFieldDlg::ActivateDatabasePage()
 {
     m_bDataBaseMode = true;
     ShowPage(m_nDbId);
     SfxTabPage* pDBPage = GetTabPage(m_nDbId);
     if( pDBPage )
     {
-        static_cast<SwFldDBPage*>(pDBPage)->ActivateMailMergeAddress();
+        static_cast<SwFieldDBPage*>(pDBPage)->ActivateMailMergeAddress();
     }
     //remove all other pages
     RemoveTabPage("document");
@@ -298,12 +298,12 @@ void SwFldDlg::ActivateDatabasePage()
     RemoveTabPage("functions");
 }
 
-void SwFldDlg::ShowReferencePage()
+void SwFieldDlg::ShowReferencePage()
 {
     ShowPage(m_nRefId);
 }
 
-void SwFldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
+void SwFieldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
 {
     if (nId == m_nDbId)
     {
@@ -318,7 +318,7 @@ void SwFldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
                 pViewShell = SfxViewShell::GetNext( *pViewShell, &aSwViewTypeId );
             }
             if(pViewShell)
-                static_cast<SwFldDBPage&>(rPage).SetWrtShell(static_cast<SwView*>(pViewShell)->GetWrtShell());
+                static_cast<SwFieldDBPage&>(rPage).SetWrtShell(static_cast<SwView*>(pViewShell)->GetWrtShell());
         }
     }
 }
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 72bfdcf4b4a3..95c737f0ea7a 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -39,8 +39,8 @@
 #define USER_DATA_VERSION_1 "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
-SwFldVarPage::SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
-    : SwFldPage(pParent, "FldVarPage",
+SwFieldVarPage::SwFieldVarPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
+    : SwFieldPage(pParent, "FieldVarPage",
         "modules/swriter/ui/fldvarpage.ui", rCoreSet)
     , nOldFormat(0)
     , bInit(true)
@@ -86,12 +86,12 @@ SwFldVarPage::SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
     m_pNumFormatLB->SetShowLanguageControl(true);
 }
 
-SwFldVarPage::~SwFldVarPage()
+SwFieldVarPage::~SwFieldVarPage()
 {
     disposeOnce();
 }
 
-void SwFldVarPage::dispose()
+void SwFieldVarPage::dispose()
 {
     m_pTypeLB.clear();
     m_pSelection.clear();
@@ -109,10 +109,10 @@ void SwFldVarPage::dispose()
     m_pSeparatorFT.clear();
     m_pSeparatorED.clear();
     m_pNewDelTBX.clear();
-    SwFldPage::dispose();
+    SwFieldPage::dispose();
 }
 
-void SwFldVarPage::Reset(const SfxItemSet* )
+void SwFieldVarPage::Reset(const SfxItemSet* )
 {
     SavePos(m_pTypeLB);
 
@@ -124,26 +124,26 @@ void SwFldVarPage::Reset(const SfxItemSet* )
     sal_Int32 nPos;
     sal_uInt16 nTypeId;
 
-    if (!IsFldEdit())
+    if (!IsFieldEdit())
     {
         // initialise TypeListBox
-        const SwFldGroupRgn& rRg = SwFldMgr::GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
+        const SwFieldGroupRgn& rRg = SwFieldMgr::GetGroupRange(IsFieldDlgHtmlMode(), GetGroup());
 
         for (short i = rRg.nStart; i < rRg.nEnd; ++i)
         {
-            nTypeId = SwFldMgr::GetTypeId(i);
-            nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(i));
+            nTypeId = SwFieldMgr::GetTypeId(i);
+            nPos = m_pTypeLB->InsertEntry(SwFieldMgr::GetTypeStr(i));
             m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
         }
     }
     else
     {
         const SwField* pCurField = GetCurField();
-        assert(pCurField && "<SwFldVarPage::Reset(..)> - <SwField> instance missing!");
+        assert(pCurField && "<SwFieldVarPage::Reset(..)> - <SwField> instance missing!");
         nTypeId = pCurField->GetTypeId();
         if (nTypeId == TYP_SETINPFLD)
             nTypeId = TYP_INPUTFLD;
-        nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(SwFldMgr::GetPos(nTypeId)));
+        nPos = m_pTypeLB->InsertEntry(SwFieldMgr::GetTypeStr(SwFieldMgr::GetPos(nTypeId)));
         m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
         m_pNumFormatLB->SetAutomaticLanguage(pCurField->IsAutomaticLanguage());
         SwWrtShell *pSh = GetWrtShell();
@@ -160,17 +160,17 @@ void SwFldVarPage::Reset(const SfxItemSet* )
     // select old Pos
     RestorePos(m_pTypeLB);
 
-    m_pTypeLB->SetDoubleClickHdl       (LINK(this, SwFldVarPage, InsertHdl));
-    m_pTypeLB->SetSelectHdl            (LINK(this, SwFldVarPage, TypeHdl));
-    m_pSelectionLB->SetSelectHdl       (LINK(this, SwFldVarPage, SubTypeHdl));
-    m_pSelectionLB->SetDoubleClickHdl  (LINK(this, SwFldVarPage, InsertHdl));
-    m_pFormatLB->SetDoubleClickHdl     (LINK(this, SwFldVarPage, InsertHdl));
-    m_pNumFormatLB->SetDoubleClickHdl  (LINK(this, SwFldVarPage, InsertHdl));
-    m_pNameED->SetModifyHdl            (LINK(this, SwFldVarPage, ModifyHdl));
-    m_pValueED->SetModifyHdl           (LINK(this, SwFldVarPage, ModifyHdl));
-    m_pNewDelTBX->SetClickHdl          (LINK(this, SwFldVarPage, TBClickHdl));
-    m_pChapterLevelLB->SetSelectHdl    (LINK(this, SwFldVarPage, ChapterHdl));
-    m_pSeparatorED->SetModifyHdl       (LINK(this, SwFldVarPage, SeparatorHdl));
+    m_pTypeLB->SetDoubleClickHdl       (LINK(this, SwFieldVarPage, InsertHdl));
+    m_pTypeLB->SetSelectHdl            (LINK(this, SwFieldVarPage, TypeHdl));
+    m_pSelectionLB->SetSelectHdl       (LINK(this, SwFieldVarPage, SubTypeHdl));
+    m_pSelectionLB->SetDoubleClickHdl  (LINK(this, SwFieldVarPage, InsertHdl));
+    m_pFormatLB->SetDoubleClickHdl     (LINK(this, SwFieldVarPage, InsertHdl));
+    m_pNumFormatLB->SetDoubleClickHdl  (LINK(this, SwFieldVarPage, InsertHdl));
+    m_pNameED->SetModifyHdl            (LINK(this, SwFieldVarPage, ModifyHdl));
+    m_pValueED->SetModifyHdl           (LINK(this, SwFieldVarPage, ModifyHdl));
+    m_pNewDelTBX->SetClickHdl          (LINK(this, SwFieldVarPage, TBClickHdl));
+    m_pChapterLevelLB->SetSelectHdl    (LINK(this, SwFieldVarPage, ChapterHdl));
+    m_pSeparatorED->SetModifyHdl       (LINK(this, SwFieldVarPage, SeparatorHdl));
 
     if( !IsRefresh() )
     {
@@ -194,7 +194,7 @@ void SwFldVarPage::Reset(const SfxItemSet* )
 
     m_pTypeLB->SetUpdateMode(true);
 
-    if (IsFldEdit())
+    if (IsFieldEdit())
     {
         m_pSelectionLB->SaveValue();
         m_pFormatLB->SaveValue();
@@ -207,7 +207,7 @@ void SwFldVarPage::Reset(const SfxItemSet* )
     }
 }
 
-IMPL_LINK_NOARG(SwFldVarPage, TypeHdl)
+IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl)
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
@@ -239,7 +239,7 @@ IMPL_LINK_NOARG(SwFldVarPage, TypeHdl)
     return 0;
 }
 
-IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
+IMPL_LINK( SwFieldVarPage, SubTypeHdl, ListBox *, pBox )
 {
     sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
     sal_Int32 nSelPos = m_pSelectionLB->GetSelectEntryPos();
@@ -248,12 +248,12 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
     if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
         nSelData = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nSelPos));
 
-    if (IsFldEdit() && (!pBox || bInit))
+    if (IsFieldEdit() && (!pBox || bInit))
     {
         if (nTypeId != TYP_FORMELFLD)
-            m_pNameED->SetText(GetFldMgr().GetCurFldPar1());
+            m_pNameED->SetText(GetFieldMgr().GetCurFieldPar1());
 
-        m_pValueED->SetText(GetFldMgr().GetCurFldPar2());
+        m_pValueED->SetText(GetFieldMgr().GetCurFieldPar2());
     }
 
     if (m_pNameFT->GetText() != OUString(sOldNameFT))
@@ -267,7 +267,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
     sal_Int32 nSize = m_pFormatLB->GetEntryCount();
 
-    bool bValue = false, bName = false, bNumFmt = false,
+    bool bValue = false, bName = false, bNumFormat = false,
             bInvisible = false, bShowChapterFrame = false;
     bool bFormat = nSize != 0;
 
@@ -277,11 +277,11 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
         {
             // change or create user type
             SwUserFieldType* pType = static_cast<SwUserFieldType*>(
-                GetFldMgr().GetFldType(RES_USERFLD, nSelData));
+                GetFieldMgr().GetFieldType(RES_USERFLD, nSelData));
 
             if (pType)
             {
-                if (!IsFldEdit())
+                if (!IsFieldEdit())
                 {
                     if (pBox || (bInit && !IsRefresh()))    // only when interacting via mouse
                     {
@@ -307,7 +307,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                     m_pValueED->SetText(OUString());
                 }
             }
-            bValue = bName = bNumFmt = bInvisible = true;
+            bValue = bName = bNumFormat = bInvisible = true;
 
             m_pValueED->SetDropEnable(true);
             break;
@@ -316,9 +316,9 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
         case TYP_SETFLD:
             bValue = true;
 
-            bNumFmt = bInvisible = true;
+            bNumFormat = bInvisible = true;
 
-            if (!IsFldDlgHtmlMode())
+            if (!IsFieldDlgHtmlMode())
                 bName = true;
             else
             {
@@ -328,14 +328,14 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                 m_pNumFormatLB->SelectEntryPos(0);
             }
             // is there a corresponding SetField
-            if (IsFldEdit() || pBox)    // only when interacting via mouse
+            if (IsFieldEdit() || pBox)    // only when interacting via mouse
             {
                 if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
                 {
                     OUString sName(m_pSelectionLB->GetSelectEntry());
                     m_pNameED->SetText(sName);
 
-                    if (!IsFldDlgHtmlMode())
+                    if (!IsFieldDlgHtmlMode())
                     {
                         SwWrtShell *pSh = GetWrtShell();
                         if(!pSh)
@@ -343,7 +343,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                         if(pSh)
                         {
                             SwSetExpFieldType* pSetTyp = static_cast<SwSetExpFieldType*>(
-                                    pSh->GetFldType(RES_SETEXPFLD, sName));
+                                    pSh->GetFieldType(RES_SETEXPFLD, sName));
 
                             if (pSetTyp && pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING)
                                 m_pNumFormatLB->SelectEntryPos(0); // textual
@@ -351,7 +351,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                     }
                 }
             }
-            if (GetCurField() != NULL && IsFldEdit())
+            if (GetCurField() != NULL && IsFieldEdit())
             {
                 // GetFormula leads to problems with date formats because
                 // only the numeric value without formatting is returned.
@@ -366,7 +366,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
         case TYP_FORMELFLD:
             {
                 bValue = true;
-                bNumFmt = true;
+                bNumFormat = true;
                 m_pValueFT->SetText(SW_RESSTR(STR_FORMULA));
                 m_pValueED->SetDropEnable(true);
             }
@@ -374,7 +374,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
         case TYP_GETFLD:
             {
-                if (!IsFldEdit())
+                if (!IsFieldEdit())
                 {
                     m_pNameED->SetText(OUString());
                     m_pValueED->SetText(OUString());
@@ -383,7 +383,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                 if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
                 {
                     OUString sName(m_pSelectionLB->GetSelectEntry());
-                    if (!IsFldEdit())
+                    if (!IsFieldEdit())
                         m_pNameED->SetText(sName);
 
                     // is there a corresponding SetField
@@ -393,21 +393,21 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                     if(pSh)
                     {
                         SwSetExpFieldType* pSetTyp = static_cast<SwSetExpFieldType*>(
-                                pSh->GetFldType(RES_SETEXPFLD, sName));
+                                pSh->GetFieldType(RES_SETEXPFLD, sName));
 
                         if(pSetTyp)
                         {
                             if (pSetTyp->GetType() & nsSwGetSetExpType::GSE_STRING)    // textual?
                                 bFormat = true;
                             else                    // numeric
-                                bNumFmt = true;
+                                bNumFormat = true;
                         }
                     }
                 }
                 else
                     bFormat = false;
 
-                EnableInsert(bFormat || bNumFmt);
+                EnableInsert(bFormat || bNumFormat);
             }
             break;
 
@@ -416,7 +416,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
             if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
             {
-                bValue = bNumFmt = true;
+                bValue = bNumFormat = true;
 
                 OUString sName;
 
@@ -425,13 +425,13 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
                 // User- or SetField ?
                 const sal_uInt16 nInpType = static_cast< sal_uInt16 >
-                    (GetFldMgr().GetFldType(RES_USERFLD, sName) ? 0 : TYP_SETINPFLD);
+                    (GetFieldMgr().GetFieldType(RES_USERFLD, sName) ? 0 : TYP_SETINPFLD);
 
                 if (nInpType)   // SETEXPFLD
                 {
                     // is there a corresponding SetField
                     SwSetExpFieldType* pSetTyp = static_cast<SwSetExpFieldType*>(
-                                GetFldMgr().GetFldType(RES_SETEXPFLD, sName));
+                                GetFieldMgr().GetFieldType(RES_SETEXPFLD, sName));
 
                     if(pSetTyp)
                     {
@@ -444,23 +444,23 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                             m_pNumFormatLB->SelectEntryPos(0);
                         }
                     }
-                    if (GetCurField() && IsFldEdit() && (!pBox || bInit) )
+                    if (GetCurField() && IsFieldEdit() && (!pBox || bInit) )
                         m_pValueED->SetText(static_cast<SwSetExpField*>(GetCurField())->GetPromptText());
                 }
                 else    // USERFLD
-                    bFormat = bNumFmt = false;
+                    bFormat = bNumFormat = false;
             }
             break;
 
         case TYP_DDEFLD:
             m_pValueFT->SetText(SW_RESSTR(STR_DDE_CMD));
 
-            if (IsFldEdit() || pBox)    // only when interacting via mouse
+            if (IsFieldEdit() || pBox)    // only when interacting via mouse
             {
                 if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
                 {
                     SwDDEFieldType* pType =
-                        static_cast<SwDDEFieldType*>( GetFldMgr().GetFldType(RES_DDEFLD, nSelData) );
+                        static_cast<SwDDEFieldType*>( GetFieldMgr().GetFieldType(RES_DDEFLD, nSelData) );
 
                     if(pType)
                     {
@@ -485,34 +485,34 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
             {
                 bName = bValue = bShowChapterFrame = true;
 
-                SwFieldType* pFldTyp;
-                if( GetCurField() && IsFldEdit() )
-                    pFldTyp = GetCurField()->GetTyp();
+                SwFieldType* pFieldTyp;
+                if( GetCurField() && IsFieldEdit() )
+                    pFieldTyp = GetCurField()->GetTyp();
                 else
                 {
-                    OUString sFldTypeName( m_pSelectionLB->GetEntry( nSelPos ));
-                    if( !sFldTypeName.isEmpty() )
-                        pFldTyp = GetFldMgr().GetFldType( RES_SETEXPFLD,
-                                                          sFldTypeName );
+                    OUString sFieldTypeName( m_pSelectionLB->GetEntry( nSelPos ));
+                    if( !sFieldTypeName.isEmpty() )
+                        pFieldTyp = GetFieldMgr().GetFieldType( RES_SETEXPFLD,
+                                                          sFieldTypeName );
                     else
-                        pFldTyp = 0;
+                        pFieldTyp = 0;
                 }
 
-                if( GetCurField() && IsFldEdit() )
+                if( GetCurField() && IsFieldEdit() )
                     m_pValueED->SetText( static_cast<SwSetExpField*>(GetCurField())->
                                         GetFormula() );
 
-                if( IsFldEdit() || pBox )   // only when interacting via mouse
+                if( IsFieldEdit() || pBox )   // only when interacting via mouse
                     m_pNameED->SetText( m_pSelectionLB->GetSelectEntry() );
 
-                if( pFldTyp )
+                if( pFieldTyp )
                 {
-                    sal_uInt8 nLevel = static_cast<SwSetExpFieldType*>(pFldTyp)->GetOutlineLvl();
+                    sal_uInt8 nLevel = static_cast<SwSetExpFieldType*>(pFieldTyp)->GetOutlineLvl();
                     if( 0x7f == nLevel )
                         m_pChapterLevelLB->SelectEntryPos( 0 );
                     else
                         m_pChapterLevelLB->SelectEntryPos( nLevel + 1 );
-                    OUString sDelim = static_cast<SwSetExpFieldType*>(pFldTyp)->GetDelimiter();
+                    OUString sDelim = static_cast<SwSetExpFieldType*>(pFieldTyp)->GetDelimiter();
                     m_pSeparatorED->SetText( sDelim );
                     ChapterHdl();
                 }
@@ -524,13 +524,13 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                 bValue = false;
                 m_pValueFT->SetText( SW_RESSTR( STR_OFFSET ));
 
-                if (IsFldEdit() || pBox)    // only when interacting via mouse
+                if (IsFieldEdit() || pBox)    // only when interacting via mouse
                     m_pNameED->SetText(OUString());
 
                 if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND)
                 {
                     bValue = true;      // SubType OFF - knows no Offset
-                    if (GetCurField() && IsFldEdit())
+                    if (GetCurField() && IsFieldEdit())
                         m_pValueED->SetText(OUString::number(static_cast<SwRefPageSetField*>(GetCurField())->GetOffset()));
                 }
             }
@@ -542,13 +542,13 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
             break;
     }
 
-    m_pNumFormatLB->Show(bNumFmt);
-    m_pFormatLB->Show(!bNumFmt);
+    m_pNumFormatLB->Show(bNumFormat);
+    m_pFormatLB->Show(!bNumFormat);
 
-    if (IsFldEdit())
+    if (IsFieldEdit())
         bName = false;
 
-    m_pFormat->Enable(bFormat || bNumFmt);
+    m_pFormat->Enable(bFormat || bNumFormat);
     m_pNameFT->Enable(bName);
     m_pNameED->Enable(bName);
     m_pValueFT->Enable(bValue);
@@ -592,7 +592,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 }
 
 // renew types in SelectionBox
-void SwFldVarPage::UpdateSubType()
+void SwFieldVarPage::UpdateSubType()
 {
     SetSelectionSel(m_pSelectionLB->GetSelectEntryPos());
 
@@ -606,13 +606,13 @@ void SwFldVarPage::UpdateSubType()
 
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
     std::vector<OUString> aList;
-    GetFldMgr().GetSubTypes(nTypeId, aList);
+    GetFieldMgr().GetSubTypes(nTypeId, aList);
     const size_t nCount = aList.size();
     for (size_t i = 0; i < nCount; ++i)
     {
         if (nTypeId != TYP_INPUTFLD || i)
         {
-            if (!IsFldEdit())
+            if (!IsFieldEdit())
             {
                 const size_t nPos = m_pSelectionLB->InsertEntry(aList[i]);
                 m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(i));
@@ -699,7 +699,7 @@ void SwFldVarPage::UpdateSubType()
     m_pSelectionLB->SetUpdateMode(true);
 }
 
-sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
+sal_Int32 SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 {
     OUString sOldSel;
     const sal_Int32 nFormatSel = m_pFormatLB->GetSelectEntryPos();
@@ -718,15 +718,15 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
     // fill Format-Listbox
     m_pFormatLB->Clear();
     m_pNumFormatLB->Clear();
-    bool bSpecialFmt = false;
+    bool bSpecialFormat = false;
 
     if( TYP_GETREFPAGEFLD != nTypeId )
     {
-        if (GetCurField() != NULL && IsFldEdit())
+        if (GetCurField() != NULL && IsFieldEdit())
         {
-            bSpecialFmt = GetCurField()->GetFormat() == SAL_MAX_UINT32;
+            bSpecialFormat = GetCurField()->GetFormat() == SAL_MAX_UINT32;
 
-            if (!bSpecialFmt)
+            if (!bSpecialFormat)
             {
                 m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat());
                 sOldNumSel.clear();
@@ -749,7 +749,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
     {
         case TYP_USERFLD:
         {
-            if (!IsFldEdit() || bSpecialFmt)
+            if (!IsFieldEdit() || bSpecialFormat)
             {
                 sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_MARK_TEXT), 0);
                 m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX));
@@ -761,7 +761,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 
         case TYP_SETFLD:
         {
-            if (!IsFldEdit() || bSpecialFmt)
+            if (!IsFieldEdit() || bSpecialFormat)
             {
                 sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_SETVAR_TEXT), 0);
                 m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX));
@@ -784,7 +784,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
         break;
     }
 
-    if (IsFldEdit() && bSpecialFmt)
+    if (IsFieldEdit() && bSpecialFormat)
     {
         if (nTypeId == TYP_USERFLD && (GetCurField()->GetSubType() & nsSwExtendedSubType::SUB_CMD))
             m_pNumFormatLB->SelectEntryPos(1);
@@ -799,18 +799,18 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
             m_pNumFormatLB->SelectEntry(sOldSel);
     }
 
-    const sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
+    const sal_uInt16 nSize = GetFieldMgr().GetFormatCount(nTypeId, false, IsFieldDlgHtmlMode());
 
     for (sal_uInt16 i = 0; i < nSize; i++)
     {
-        const sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i));
-        const sal_uInt16 nFldId = GetFldMgr().GetFormatId( nTypeId, i );
-        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(nFldId) );
-        if (IsFldEdit() && GetCurField() && nFldId == GetCurField()->GetFormat())
+        const sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr(nTypeId, i));
+        const sal_uInt16 nFieldId = GetFieldMgr().GetFormatId( nTypeId, i );
+        m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(nFieldId) );
+        if (IsFieldEdit() && GetCurField() && nFieldId == GetCurField()->GetFormat())
             m_pFormatLB->SelectEntryPos( nPos );
     }
 
-    if (nSize && (!IsFldEdit() || !m_pFormatLB->GetSelectEntryCount()))
+    if (nSize && (!IsFieldEdit() || !m_pFormatLB->GetSelectEntryCount()))
     {
         m_pFormatLB->SelectEntry(sOldSel);
 
@@ -830,7 +830,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 }
 
 // Modify
-IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
+IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl)
 {
     OUString sValue(m_pValueED->GetText());
     bool bHasValue = !sValue.isEmpty();
@@ -866,7 +866,7 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
             // is there already a corrensponding type
             bInsert = bApply = true;
 
-            SwFieldType* pType = GetFldMgr().GetFldType(RES_DDEFLD, sName);
+            SwFieldType* pType = GetFieldMgr().GetFieldType(RES_DDEFLD, sName);
 
             SwWrtShell *pSh = GetWrtShell();
             if(!pSh)
@@ -880,7 +880,7 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
         if( nLen )
         {
             // is there already a corresponding type
-            SwFieldType* pType = GetFldMgr().GetFldType(RES_USERFLD, sName);
+            SwFieldType* pType = GetFieldMgr().GetFieldType(RES_USERFLD, sName);
 
             SwWrtShell *pSh = GetWrtShell();
             if(!pSh)
@@ -888,7 +888,7 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
             if(pSh && pType)
                 bDelete = !pSh->IsUsed( *pType );
 
-            pType = GetFldMgr().GetFldType(RES_SETEXPFLD, sName);
+            pType = GetFieldMgr().GetFieldType(RES_SETEXPFLD, sName);
             if (!pType) // no name conflict with variables
             {
                 // user fields can also be inserted without content!
@@ -903,10 +903,10 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
 
         if (nTypeId == TYP_SETFLD || nTypeId == TYP_SEQFLD)
         {
-            SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(
-                GetFldMgr().GetFldType(RES_SETEXPFLD, sName));
+            SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(
+                GetFieldMgr().GetFieldType(RES_SETEXPFLD, sName));
 
-            if (pFldType)
+            if (pFieldType)
             {
 
                 SwWrtShell *pSh = GetWrtShell();
@@ -914,32 +914,32 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
                     pSh = ::GetActiveWrtShell();
                 if(pSh)
                 {
-                    const SwFldTypes* p = pSh->GetDoc()->getIDocumentFieldsAccess().GetFldTypes();
+                    const SwFieldTypes* p = pSh->GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
                     sal_uInt16 i;
 
                     for (i = 0; i < INIT_FLDTYPES; i++)
                     {
                         SwFieldType* pType = (*p)[ i ];
-                        if (pType == pFldType)
+                        if (pType == pFieldType)
                             break;
                     }
 
-                    if (i >= INIT_FLDTYPES && !pSh->IsUsed(*pFldType))
+                    if (i >= INIT_FLDTYPES && !pSh->IsUsed(*pFieldType))
                         bDelete = true;
 
-                    if (nTypeId == TYP_SEQFLD && !(pFldType->GetType() & nsSwGetSetExpType::GSE_SEQ))
+                    if (nTypeId == TYP_SEQFLD && !(pFieldType->GetType() & nsSwGetSetExpType::GSE_SEQ))
                         bInsert = false;
 
-                    if (nTypeId == TYP_SETFLD && (pFldType->GetType() & nsSwGetSetExpType::GSE_SEQ))
+                    if (nTypeId == TYP_SETFLD && (pFieldType->GetType() & nsSwGetSetExpType::GSE_SEQ))
                         bInsert = false;
                 }
             }
-            if (GetFldMgr().GetFldType(RES_USERFLD, sName))
+            if (GetFieldMgr().GetFieldType(RES_USERFLD, sName))
                 bInsert = false;
         }
 
         if( !nLen && ( nTypeId == TYP_SETFLD ||
-                        (!IsFldEdit() && nTypeId == TYP_GETFLD ) ) )
+                        (!IsFieldEdit() && nTypeId == TYP_GETFLD ) ) )
             bInsert = false;
 
         if( (nTypeId == TYP_SETFLD || nTypeId == TYP_FORMELFLD) &&
@@ -955,7 +955,7 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
     return 0;
 }
 
-IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, pBox, void )
+IMPL_LINK_TYPED( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
 {
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
@@ -964,7 +964,7 @@ IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, pBox, void )
     if (nCurId == m_nDeleteId)
     {
         if( nTypeId == TYP_USERFLD )
-            GetFldMgr().RemoveFldType(RES_USERFLD, m_pSelectionLB->GetSelectEntry());
+            GetFieldMgr().RemoveFieldType(RES_USERFLD, m_pSelectionLB->GetSelectEntry());
         else
         {
             sal_uInt16 nWhich;
@@ -980,7 +980,7 @@ IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, pBox, void )
                     break;
             }
 
-            GetFldMgr().RemoveFldType(nWhich, m_pSelectionLB->GetSelectEntry());
+            GetFieldMgr().RemoveFieldType(nWhich, m_pSelectionLB->GetSelectEntry());
         }
 
         UpdateSubType();
@@ -1005,7 +1005,7 @@ IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, pBox, void )
             case TYP_DDEFLD:    nId = RES_DDEFLD;   break;
             case TYP_SETFLD:    nId = RES_SETEXPFLD;break;
         }
-        pType = GetFldMgr().GetFldType(nId, sName);
+        pType = GetFieldMgr().GetFieldType(nId, sName);
 
         sal_uLong nFormat = m_pFormatLB->GetSelectEntryPos();
         if (nFormat != LISTBOX_ENTRY_NOTFOUND)
@@ -1049,7 +1049,7 @@ IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, pBox, void )
                         static_cast<SwDDEFieldType*>(pType)->SetType(static_cast<SfxLinkUpdateMode>(nFormat));
                     }
                 }
-                pType->UpdateFlds();
+                pType->UpdateFields();
 
                 pSh->EndAllAction();
             }
@@ -1071,7 +1071,7 @@ IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, pBox, void )
                         aType.SetContent( sValue, nNumFormatPos == 0 ? 0 : m_pNumFormatLB->GetFormat() );
                         m_pSelectionLB->InsertEntry(sName);
                         m_pSelectionLB->SelectEntry(sName);
-                        GetFldMgr().InsertFldType( aType ); // Userfld new
+                        GetFieldMgr().InsertFieldType( aType ); // Userfld new
                     }
                 }
             }
@@ -1088,18 +1088,18 @@ IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, pBox, void )
                     SwDDEFieldType aType(sName, sValue, static_cast<SfxLinkUpdateMode>(nFormat));
                     m_pSelectionLB->InsertEntry(sName);
                     m_pSelectionLB->SelectEntry(sName);
-                    GetFldMgr().InsertFldType(aType);   // DDE-Field new
+                    GetFieldMgr().InsertFieldType(aType);   // DDE-Field new
                 }
             }
         }
-        if (IsFldEdit())
-            GetFldMgr().GetCurFld();    // update FieldManager
+        if (IsFieldEdit())
+            GetFieldMgr().GetCurField();    // update FieldManager
 
         UpdateSubType();
     }
 }
 
-IMPL_LINK_NOARG(SwFldVarPage, ChapterHdl)
+IMPL_LINK_NOARG(SwFieldVarPage, ChapterHdl)
 {
     bool bEnable = m_pChapterLevelLB->GetSelectEntryPos() != 0;
 
@@ -1110,7 +1110,7 @@ IMPL_LINK_NOARG(SwFldVarPage, ChapterHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl)
+IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl)
 {
     bool bEnable = !m_pSeparatorED->GetText().isEmpty() ||
                     m_pChapterLevelLB->GetSelectEntryPos() == 0;
@@ -1119,7 +1119,7 @@ IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl)
     return 0;
 }
 
-bool SwFldVarPage::FillItemSet(SfxItemSet* )
+bool SwFieldVarPage::FillItemSet(SfxItemSet* )
 {
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
 
@@ -1189,14 +1189,14 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* )
         }
         case TYP_INPUTFLD:
         {
-            SwFieldType* pType = GetFldMgr().GetFldType(RES_USERFLD, aName);
+            SwFieldType* pType = GetFieldMgr().GetFieldType(RES_USERFLD, aName);
             nSubType = static_cast< sal_uInt16 >((nSubType & 0xff00) | ((pType) ? INP_USR : INP_VAR));
             break;
         }
 
         case TYP_SETFLD:
         {
-            if (IsFldDlgHtmlMode())
+            if (IsFieldDlgHtmlMode())
             {
                 nSubType = 0x0100;
                 nSubType = (nSubType & 0xff00) | nsSwGetSetExpType::GSE_STRING;
@@ -1227,7 +1227,7 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* )
             break;
     }
 
-    if (!IsFldEdit() ||
+    if (!IsFieldEdit() ||
         m_pNameED->IsValueChangedFromSaved() ||
         m_pValueED->IsValueChangedFromSaved() ||
         m_pSelectionLB->IsValueChangedFromSaved() ||
@@ -1237,7 +1237,7 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* )
         m_pChapterLevelLB->IsValueChangedFromSaved() ||
         m_pSeparatorED->IsValueChangedFromSaved())
     {
-        InsertFld( nTypeId, nSubType, aName, aVal, nFormat,
+        InsertField( nTypeId, nSubType, aName, aVal, nFormat,
                     cSeparator, m_pNumFormatLB->IsAutomaticLanguage() );
     }
 
@@ -1246,13 +1246,13 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-VclPtr<SfxTabPage> SwFldVarPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldVarPage::Create( vcl::Window* pParent,
                                          const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwFldVarPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwFieldVarPage>::Create( pParent, *rAttrSet );
 }
 
-sal_uInt16 SwFldVarPage::GetGroup()
+sal_uInt16 SwFieldVarPage::GetGroup()
 {
     return GRP_VAR;
 }
@@ -1303,7 +1303,7 @@ bool SelectionListBox::PreNotify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-void SwFldVarPage::FillUserData()
+void SwFieldVarPage::FillUserData()
 {
     OUString sData(USER_DATA_VERSION);
     sData += ";";
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index a7bf3f0163ac..13ed1e5c69a7 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -31,7 +31,7 @@
 #include "condedit.hxx"
 #include "numfmtlb.hxx"
 
-class SwFldVarPage;
+class SwFieldVarPage;
 
 class SelectionListBox : public ListBox
 {
@@ -47,7 +47,7 @@ public:
     void            ResetCallAddSelection() {bCallAddSelection = false;}
 };
 
-class SwFldVarPage : public SwFldPage
+class SwFieldVarPage : public SwFieldPage
 {
     friend class SelectionListBox;
 
@@ -90,9 +90,9 @@ protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rSet);
+                        SwFieldVarPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
-                        virtual ~SwFldVarPage();
+                        virtual ~SwFieldVarPage();
     virtual void        dispose() SAL_OVERRIDE;
 
     static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 6a7c663d6437..c225195c8029 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -31,13 +31,13 @@
 #include <fldui.hrc>
 
 // edit field-insert
-SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
+SwFieldInputDlg::SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
                               SwField* pField, bool bNextButton )
     : SvxStandardDialog( pParent, "InputFieldDialog",
         "modules/swriter/ui/inputfielddialog.ui")
     , rSh( rS )
-    , pInpFld(0)
-    , pSetFld(0)
+    , pInpField(0)
+    , pSetField(0)
     , pUsrType(0)
 {
     get(m_pLabelED, "name");
@@ -53,7 +53,7 @@ SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
     if( bNextButton )
     {
         m_pNextBT->Show();
-        m_pNextBT->SetClickHdl(LINK(this, SwFldInputDlg, NextHdl));
+        m_pNextBT->SetClickHdl(LINK(this, SwFieldInputDlg, NextHdl));
     }
 
     // evaluation here
@@ -61,20 +61,20 @@ SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
     if( RES_INPUTFLD == pField->GetTyp()->Which() )
     {   // it is an input field
 
-        pInpFld = static_cast<SwInputField*>(pField);
-        m_pLabelED->SetText( pInpFld->GetPar2() );
-        sal_uInt16 nSubType = pInpFld->GetSubType();
+        pInpField = static_cast<SwInputField*>(pField);
+        m_pLabelED->SetText( pInpField->GetPar2() );
+        sal_uInt16 nSubType = pInpField->GetSubType();
 
         switch(nSubType & 0xff)
         {
             case INP_TXT:
-                aStr = pInpFld->GetPar1();
+                aStr = pInpField->GetPar1();
                 break;
 
             case INP_USR:
                 // user field
-                if( 0 != ( pUsrType = static_cast<SwUserFieldType*>(rSh.GetFldType(
-                            RES_USERFLD, pInpFld->GetPar1() ) )  ) )
+                if( 0 != ( pUsrType = static_cast<SwUserFieldType*>(rSh.GetFieldType(
+                            RES_USERFLD, pInpField->GetPar1() ) )  ) )
                     aStr = pUsrType->GetContent();
                 break;
         }
@@ -82,17 +82,17 @@ SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
     else
     {
         // it is a SetExpression
-        pSetFld = static_cast<SwSetExpField*>(pField);
-        OUString sFormula(pSetFld->GetFormula());
+        pSetField = static_cast<SwSetExpField*>(pField);
+        OUString sFormula(pSetField->GetFormula());
         //values are formatted - formulas are not
-        CharClass aCC( LanguageTag( pSetFld->GetLanguage() ));
+        CharClass aCC( LanguageTag( pSetField->GetLanguage() ));
         if( aCC.isNumeric( sFormula ))
         {
-            aStr = pSetFld->ExpandField(true);
+            aStr = pSetField->ExpandField(true);
         }
         else
             aStr = sFormula;
-        m_pLabelED->SetText( pSetFld->GetPromptText() );
+        m_pLabelED->SetText( pSetField->GetPromptText() );
     }
 
     // JP 31.3.00: Inputfields in readonly regions must be allowed to
@@ -106,12 +106,12 @@ SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
         m_pEditED->SetText(convertLineEnd(aStr, GetSystemLineEnd()));
 }
 
-SwFldInputDlg::~SwFldInputDlg()
+SwFieldInputDlg::~SwFieldInputDlg()
 {
     disposeOnce();
 }
 
-void SwFldInputDlg::dispose()
+void SwFieldInputDlg::dispose()
 {
     m_pLabelED.clear();
     m_pEditED.clear();
@@ -120,7 +120,7 @@ void SwFldInputDlg::dispose()
     SvxStandardDialog::dispose();
 }
 
-void SwFldInputDlg::StateChanged( StateChangedType nType )
+void SwFieldInputDlg::StateChanged( StateChangedType nType )
 {
     if ( nType == StateChangedType::InitShow )
         m_pEditED->GrabFocus();
@@ -128,33 +128,33 @@ void SwFldInputDlg::StateChanged( StateChangedType nType )
 }
 
 // Close
-void SwFldInputDlg::Apply()
+void SwFieldInputDlg::Apply()
 {
     OUString aTmp(comphelper::string::remove(m_pEditED->GetText(), '\r'));
     rSh.StartAllAction();
     bool bModified = false;
-    if(pInpFld)
+    if(pInpField)
     {
         if(pUsrType)
         {
             if( !aTmp.equals(pUsrType->GetContent()) )
             {
                 pUsrType->SetContent(aTmp);
-                pUsrType->UpdateFlds();
+                pUsrType->UpdateFields();
                 bModified = true;
             }
         }
-        else if( !aTmp.equals(pInpFld->GetPar1()) )
+        else if( !aTmp.equals(pInpField->GetPar1()) )
         {
-            pInpFld->SetPar1(aTmp);
-            rSh.SwEditShell::UpdateFlds(*pInpFld);
+            pInpField->SetPar1(aTmp);
+            rSh.SwEditShell::UpdateFields(*pInpField);
             bModified = true;
         }
     }
-    else if( !aTmp.equals(pSetFld->GetPar2()) )
+    else if( !aTmp.equals(pSetField->GetPar2()) )
     {
-        pSetFld->SetPar2(aTmp);
-        rSh.SwEditShell::UpdateFlds(*pSetFld);
+        pSetField->SetPar2(aTmp);
+        rSh.SwEditShell::UpdateFields(*pSetField);
         bModified = true;
     }
 
@@ -164,7 +164,7 @@ void SwFldInputDlg::Apply()
     rSh.EndAllAction();
 }
 
-IMPL_LINK_NOARG(SwFldInputDlg, NextHdl)
+IMPL_LINK_NOARG(SwFieldInputDlg, NextHdl)
 {
     EndDialog(RET_OK);
     return 0;
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 2b073110aa7d..ae304ee4194a 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -73,10 +73,10 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) :
     aFont.SetWeight( WEIGHT_LIGHT );
     m_pEditED->SetFont( aFont );
 
-    pMgr = new SwFldMgr(pSh);
-    pFld = static_cast<SwScriptField*>(pMgr->GetCurFld());
+    pMgr = new SwFieldMgr(pSh);
+    pField = static_cast<SwScriptField*>(pMgr->GetCurField());
 
-    bNew = !(pFld && pFld->GetTyp()->Which() == RES_SCRIPTFLD);
+    bNew = !(pField && pField->GetTyp()->Which() == RES_SCRIPTFLD);
 
     CheckTravel();
 
@@ -114,9 +114,9 @@ IMPL_LINK_NOARG(SwJavaEditDialog, PrevHdl)
 {
     pSh->EnterStdMode();
 
-    SetFld();
+    SetField();
     pMgr->GoPrev();
-    pFld = static_cast<SwScriptField*>(pMgr->GetCurFld());
+    pField = static_cast<SwScriptField*>(pMgr->GetCurField());
     CheckTravel();
     RadioButtonHdl(NULL);
 
@@ -127,9 +127,9 @@ IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl)
 {
     pSh->EnterStdMode();
 
-    SetFld();
+    SetField();
     pMgr->GoNext();
-    pFld = static_cast<SwScriptField*>(pMgr->GetCurFld());
+    pField = static_cast<SwScriptField*>(pMgr->GetCurField());
     CheckTravel();
     RadioButtonHdl(NULL);
 
@@ -138,7 +138,7 @@ IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl)
 
 IMPL_LINK_NOARG(SwJavaEditDialog, OKHdl)
 {
-    SetFld();
+    SetField();
     EndDialog( RET_OK );
     return 0;
 }
@@ -169,9 +169,9 @@ void SwJavaEditDialog::CheckTravel()
         pSh->DestroyCrsr();
         pSh->EndAction();
 
-        if (pFld->IsCodeURL())
+        if (pField->IsCodeURL())
         {
-            OUString sURL(pFld->GetPar2());
+            OUString sURL(pField->GetPar2());
             if(!sURL.isEmpty())
             {
                 INetURLObject aINetURL(sURL);
@@ -184,11 +184,11 @@ void SwJavaEditDialog::CheckTravel()
         }
         else
         {
-            m_pEditED->SetText(pFld->GetPar2());
+            m_pEditED->SetText(pField->GetPar2());
             m_pUrlED->SetText(OUString());
             m_pEditRB->Check();
         }
-        m_pTypeED->SetText(pFld->GetPar1());
+        m_pTypeED->SetText(pField->GetPar1());
     }
 
     if ( !bTravel )
@@ -203,7 +203,7 @@ void SwJavaEditDialog::CheckTravel()
     }
 }
 
-void SwJavaEditDialog::SetFld()
+void SwJavaEditDialog::SetField()
 {
     if( !m_pOKBtn->IsEnabled() )
         return ;
@@ -234,7 +234,7 @@ void SwJavaEditDialog::SetFld()
 
 bool SwJavaEditDialog::IsUpdate() const
 {
-    return pFld && ( sal_uInt32(bIsUrl ? 1 : 0) != pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText );
+    return pField && ( sal_uInt32(bIsUrl ? 1 : 0) != pField->GetFormat() || pField->GetPar2() != aType || pField->GetPar1() != aText );
 }
 
 IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl)
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index d8276160da0c..0f3381760725 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -373,9 +373,9 @@ void SwTemplateDlg::RefreshInputSet()
 void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
     // set style's and metric's names
-    OUString sNumCharFmt, sBulletCharFmt;
-    SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL, sNumCharFmt);
-    SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFmt);
+    OUString sNumCharFormat, sBulletCharFormat;
+    SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL, sNumCharFormat);
+    SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFormat);
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 
     if (nId == m_nFontId)
@@ -431,7 +431,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     else if (nId == m_nOutlineId)
     {
         //  handle if the current paragraph style is assigned to a list level of outline style,
-        SwTxtFmtColl* pTmpColl = pWrtShell->FindTxtFmtCollByName( GetStyleSheet().GetName() );
+        SwTextFormatColl* pTmpColl = pWrtShell->FindTextFormatCollByName( GetStyleSheet().GetName() );
         if( pTmpColl && pTmpColl->IsAssignedToListLevelOfOutlineStyle() )
         {
             static_cast<SwParagraphNumTabPage&>(rPage).DisableOutline() ;
@@ -530,25 +530,25 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     }
     else if (nId == m_nNumId)
     {
-        aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
-        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+        aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFormat));
+        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFormat));
         rPage.PageCreated(aSet);
     }
     else if (nId == m_nNumOptId)
     {
 
-        aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
-        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+        aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFormat));
+        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFormat));
         // collect character styles
-        ScopedVclPtrInstance< ListBox > rCharFmtLB(this);
-        rCharFmtLB->Clear();
-        rCharFmtLB->InsertEntry( SwViewShell::GetShellRes()->aStrNone );
+        ScopedVclPtrInstance< ListBox > rCharFormatLB(this);
+        rCharFormatLB->Clear();
+        rCharFormatLB->InsertEntry( SwViewShell::GetShellRes()->aStrNone );
         SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell();
-        ::FillCharStyleListBox(*rCharFmtLB.get(),  pDocShell);
+        ::FillCharStyleListBox(*rCharFormatLB.get(),  pDocShell);
 
         std::vector<OUString> aList;
-        for(sal_Int32 j = 0; j < rCharFmtLB->GetEntryCount(); j++)
-             aList.push_back( rCharFmtLB->GetEntry(j) );
+        for(sal_Int32 j = 0; j < rCharFormatLB->GetEntryCount(); j++)
+             aList.push_back( rCharFormatLB->GetEntry(j) );
 
         aSet.Put( SfxStringListItem( SID_CHAR_FMT_LIST_BOX,&aList ) ) ;
         FieldUnit eMetric = ::GetDfltMetric(pDocShell->ISA(SwWebDocShell));
@@ -565,7 +565,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     }
     else if (nId == m_nBulletId)
     {
-        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFormat));
         rPage.PageCreated(aSet);
     }
     else if (nId == m_nHeaderId)
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 1d0c7beaeeaa..43766da0bcb6 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -115,11 +115,11 @@ SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh)
     const sal_uInt16 nFullSectCnt = rWrtShell.GetFullSelectedSectionCount();
     if( pCurrSection && ( !rWrtShell.HasSelection() || 0 != nFullSectCnt ))
     {
-        nSelectionWidth = rSh.GetSectionWidth(*pCurrSection->GetFmt());
+        nSelectionWidth = rSh.GetSectionWidth(*pCurrSection->GetFormat());
         if ( !nSelectionWidth )
             nSelectionWidth = USHRT_MAX;
         pSectionSet = new SfxItemSet( rWrtShell.GetAttrPool(), aSectIds );
-        pSectionSet->Put( pCurrSection->GetFmt()->GetAttrSet() );
+        pSectionSet->Put( pCurrSection->GetFormat()->GetAttrSet() );
         pColPgSet = pSectionSet;
     }
 
@@ -131,12 +131,12 @@ SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh)
         pColPgSet = pSelectionSet;
     }
 
-    if( rWrtShell.GetFlyFrmFmt() )
+    if( rWrtShell.GetFlyFrameFormat() )
     {
-        const SwFrmFmt* pFmt = rSh.GetFlyFrmFmt() ;
+        const SwFrameFormat* pFormat = rSh.GetFlyFrameFormat() ;
         pFrameSet = new SfxItemSet(rWrtShell.GetAttrPool(), aSectIds );
-        pFrameSet->Put(pFmt->GetFrmSize());
-        pFrameSet->Put(pFmt->GetCol());
+        pFrameSet->Put(pFormat->GetFrmSize());
+        pFrameSet->Put(pFormat->GetCol());
         pColPgSet = pFrameSet;
     }
 
@@ -149,15 +149,15 @@ SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh)
                                     RES_LR_SPACE, RES_LR_SPACE,
                                     0 );
 
-        const SwFrmFmt &rFmt = pPageDesc->GetMaster();
-        nPageWidth = rFmt.GetFrmSize().GetSize().Width();
+        const SwFrameFormat &rFormat = pPageDesc->GetMaster();
+        nPageWidth = rFormat.GetFrmSize().GetSize().Width();
 
-        const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&)rFmt.GetLRSpace();
-        const SvxBoxItem& rBox = (const SvxBoxItem&) rFmt.GetBox();
+        const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&)rFormat.GetLRSpace();
+        const SvxBoxItem& rBox = (const SvxBoxItem&) rFormat.GetBox();
         nPageWidth -= rLRSpace.GetLeft() + rLRSpace.GetRight() + rBox.GetDistance();
 
-        pPageSet->Put(rFmt.GetCol());
-        pPageSet->Put(rFmt.GetLRSpace());
+        pPageSet->Put(rFormat.GetCol());
+        pPageSet->Put(rFormat.GetLRSpace());
         pColPgSet = pPageSet;
     }
 
@@ -187,7 +187,7 @@ SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh)
             IsMarkInSameSection( rWrtShell, pCurrSection ) ))))
         m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>((sal_IntPtr)LISTBOX_SELECTION) ));
 
-    if (!rWrtShell.GetFlyFrmFmt())
+    if (!rWrtShell.GetFlyFrameFormat())
         m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>(LISTBOX_FRAME) ));
 
     const sal_Int32 nPagePos = m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>(LISTBOX_PAGE) );
@@ -266,17 +266,17 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
         case LISTBOX_SELECTION  :
             pSet = pSelectionSet;
             if( pSelectionSet )
-                pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
+                pSet->Put(SwFormatFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
         break;
         case LISTBOX_SECTION    :
         case LISTBOX_SECTIONS   :
             pSet = pSectionSet;
-            pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
+            pSet->Put(SwFormatFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
         break;
         case LISTBOX_PAGE       :
             nWidth = nPageWidth;
             pSet = pPageSet;
-            pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
+            pSet->Put(SwFormatFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
         break;
         case LISTBOX_FRAME:
             pSet = pFrameSet;
@@ -324,7 +324,7 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl)
     if(pSelectionSet && SfxItemState::SET == pSelectionSet->GetItemState(RES_COL))
     {
         //insert region with columns
-        const SwFmtCol& rColItem = static_cast<const SwFmtCol&>(pSelectionSet->Get(RES_COL));
+        const SwFormatCol& rColItem = static_cast<const SwFormatCol&>(pSelectionSet->Get(RES_COL));
         //only if there actually are columns!
         if(rColItem.GetNumCols() > 1)
             rWrtShell.GetView().GetViewFrame()->GetDispatcher()->Execute(
@@ -334,8 +334,8 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl)
     if(pSectionSet && pSectionSet->Count() && bSectionChanged )
     {
         const SwSection* pCurrSection = rWrtShell.GetCurrSection();
-        const SwSectionFmt* pFmt = pCurrSection->GetFmt();
-        const size_t nNewPos = rWrtShell.GetSectionFmtPos( *pFmt );
+        const SwSectionFormat* pFormat = pCurrSection->GetFormat();
+        const size_t nNewPos = rWrtShell.GetSectionFormatPos( *pFormat );
         SwSectionData aData(*pCurrSection);
         rWrtShell.UpdateSection( nNewPos, aData, pSectionSet );
     }
@@ -350,8 +350,8 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl)
         // deterine current PageDescriptor and fill the Set with it
         const size_t nCurIdx = rWrtShell.GetCurPageDesc();
         SwPageDesc aPageDesc(rWrtShell.GetPageDesc(nCurIdx));
-        SwFrmFmt &rFmt = aPageDesc.GetMaster();
-        rFmt.SetFmtAttr(pPageSet->Get(RES_COL));
+        SwFrameFormat &rFormat = aPageDesc.GetMaster();
+        rFormat.SetFormatAttr(pPageSet->Get(RES_COL));
         rWrtShell.ChgPageDesc(nCurIdx, aPageDesc);
     }
     if(pFrameSet && SfxItemState::SET == pFrameSet->GetItemState(RES_COL) && bFrameChanged)
@@ -597,10 +597,10 @@ void SwColumnPage::SetPageWidth(long nPageWidth)
 
 void SwColumnPage::connectPercentField(PercentField &rWrap, const OString &rName)
 {
-    MetricField *pFld = get<MetricField>(rName);
-    assert(pFld);
-    rWrap.set(pFld);
-    m_aPercentFieldsMap[pFld] = &rWrap;
+    MetricField *pField = get<MetricField>(rName);
+    assert(pField);
+    rWrap.set(pField);
+    m_aPercentFieldsMap[pField] = &rWrap;
 }
 
 void SwColumnPage::Reset(const SfxItemSet *rSet)
@@ -631,7 +631,7 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
             pColMgr->SetActualWidth(FRAME_FORMAT_WIDTH);
         else
         {
-            const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(rSet->Get(RES_FRM_SIZE));
+            const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>(rSet->Get(RES_FRM_SIZE));
             const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(rSet->Get(RES_BOX));
             pColMgr->SetActualWidth((sal_uInt16)rSize.GetSize().Width() - rBox.GetDistance());
         }
@@ -640,7 +640,7 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
     {
         const SfxPoolItem* pItem;
         if( SfxItemState::SET == rSet->GetItemState( RES_COLUMNBALANCE, false, &pItem ))
-            m_pBalanceColsCB->Check(!static_cast<const SwFmtNoBalancedColumns*>(pItem)->GetValue());
+            m_pBalanceColsCB->Check(!static_cast<const SwFormatNoBalancedColumns*>(pItem)->GetValue());
         else
             m_pBalanceColsCB->Check( true );
     }
@@ -674,14 +674,14 @@ bool SwColumnPage::FillItemSet(SfxItemSet *rSet)
     // the current settings are already present
 
     const SfxPoolItem* pOldItem;
-    const SwFmtCol& rCol = pColMgr->GetColumns();
+    const SwFormatCol& rCol = pColMgr->GetColumns();
     if(0 == (pOldItem = GetOldItem( *rSet, RES_COL )) ||
                 rCol != *pOldItem )
         rSet->Put(rCol);
 
     if(m_pBalanceColsCB->IsVisible() )
     {
-        rSet->Put(SwFmtNoBalancedColumns(!m_pBalanceColsCB->IsChecked() ));
+        rSet->Put(SwFormatNoBalancedColumns(!m_pBalanceColsCB->IsChecked() ));
     }
     if( m_pTextDirectionLB->IsVisible())
     {
@@ -998,13 +998,13 @@ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF )
  * width the automatic calculation of the column width is overruled; only an
  * alteration of the column number leads back to that default.
  */
-IMPL_LINK( SwColumnPage, GapModify, MetricField*, pMetricFld )
+IMPL_LINK( SwColumnPage, GapModify, MetricField*, pMetricField )
 {
     if (nCols < 2)
         return 0;
-    PercentField *pFld = m_aPercentFieldsMap[pMetricFld];
-    assert(pFld);
-    long nActValue = static_cast< long >(pFld->DenormalizePercent(pFld->GetValue(FUNIT_TWIP)));
+    PercentField *pField = m_aPercentFieldsMap[pMetricField];
+    assert(pField);
+    long nActValue = static_cast< long >(pField->DenormalizePercent(pField->GetValue(FUNIT_TWIP)));
     if(m_pAutoWidthBox->IsChecked())
     {
         const long nMaxGap = static_cast< long >
@@ -1023,7 +1023,7 @@ IMPL_LINK( SwColumnPage, GapModify, MetricField*, pMetricFld )
     }
     else
     {
-        const sal_uInt16 nVis = nFirstVis + ((pFld == &aDistEd2) ? 1 : 0);
+        const sal_uInt16 nVis = nFirstVis + ((pField == &aDistEd2) ? 1 : 0);
         long nDiff = nActValue - nColDist[nVis];
         if(nDiff)
         {
@@ -1061,13 +1061,13 @@ IMPL_LINK( SwColumnPage, GapModify, MetricField*, pMetricFld )
         }
 
     }
-    Update(pMetricFld);
+    Update(pMetricField);
     return 0;
 }
 
-IMPL_LINK( SwColumnPage, EdModify, MetricField *, pMetricFld )
+IMPL_LINK( SwColumnPage, EdModify, MetricField *, pMetricField )
 {
-    PercentField *pField = m_aPercentFieldsMap[pMetricFld];
+    PercentField *pField = m_aPercentFieldsMap[pMetricField];
     assert(pField);
     pModifiedField = pField;
     Timeout();
@@ -1250,7 +1250,7 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
         m_pFrmExampleWN->Show();
 
         // Size
-        const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(rSet.Get(RES_FRM_SIZE));
+        const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>(rSet.Get(RES_FRM_SIZE));
         const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>( rSet.Get(RES_BOX));
 
         long nDistance = rBox.GetDistance();
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 374265889c87..bdf1e56ed867 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -61,11 +61,11 @@ class SwSequenceOptionDialog : public SvxStandardDialog
     VclPtr<ListBox>        m_pLbCaptionOrder;
 
     SwView&         rView;
-    OUString        aFldTypeName;
+    OUString        aFieldTypeName;
 
 public:
     SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV,
-                            const OUString& rSeqFldType );
+                            const OUString& rSeqFieldType );
     virtual ~SwSequenceOptionDialog();
     virtual void dispose() SAL_OVERRIDE;
     virtual void Apply() SAL_OVERRIDE;
@@ -97,7 +97,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
     m_sNone( SW_RESSTR(SW_STR_NONE) ),
     m_aTextFilter(m_sNone),
     rView( rV ),
-    pMgr( new SwFldMgr(rView.GetWrtShellPtr()) ),
+    pMgr( new SwFieldMgr(rView.GetWrtShellPtr()) ),
     bCopyAttributes( false ),
     bOrderNumberingFirst( SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst() )
 {
@@ -143,10 +143,10 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
     m_pAutoCaptionButton->SetClickHdl(LINK(this, SwCaptionDialog, CaptionHdl));
 
     m_pCategoryBox->InsertEntry( m_sNone );
-    sal_uInt16 nCount = pMgr->GetFldTypeCount();
+    sal_uInt16 nCount = pMgr->GetFieldTypeCount();
     for (sal_uInt16 i = 0; i < nCount; i++)
     {
-        SwFieldType *pType = pMgr->GetFldType( USHRT_MAX, i );
+        SwFieldType *pType = pMgr->GetFieldType( USHRT_MAX, i );
         if( pType->Which() == RES_SETEXPFLD &&
             static_cast<SwSetExpFieldType *>( pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
             m_pCategoryBox->InsertEntry(pType->GetName());
@@ -174,7 +174,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
         sString = ::GetOldTabCat();
         uno::Reference< text::XTextTablesSupplier >  xTables(xModel, uno::UNO_QUERY);
         xNameAccess = xTables->getTextTables();
-        sObjectName = rSh.GetTableFmt()->GetName();
+        sObjectName = rSh.GetTableFormat()->GetName();
     }
     else if( eType & nsSelectionType::SEL_FRM )
     {
@@ -204,14 +204,14 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
     }
 
     // aFormatBox
-    sal_uInt16 nSelFmt = SVX_NUM_ARABIC;
-    nCount = pMgr->GetFldTypeCount();
+    sal_uInt16 nSelFormat = SVX_NUM_ARABIC;
+    nCount = pMgr->GetFieldTypeCount();
     for ( sal_uInt16 i = nCount; i; )
     {
-        SwFieldType* pFldType = pMgr->GetFldType(USHRT_MAX, --i);
-        if( pFldType->GetName().equals(m_pCategoryBox->GetText()) )
+        SwFieldType* pFieldType = pMgr->GetFieldType(USHRT_MAX, --i);
+        if( pFieldType->GetName().equals(m_pCategoryBox->GetText()) )
         {
-            nSelFmt = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFldType)->GetSeqFormat();
+            nSelFormat = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFieldType)->GetSeqFormat();
             break;
         }
     }
@@ -220,9 +220,9 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
     for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         m_pFormatBox->InsertEntry( pMgr->GetFormatStr(TYP_SEQFLD, i) );
-        const sal_uInt16 nFmtId = pMgr->GetFormatId(TYP_SEQFLD, i);
-        m_pFormatBox->SetEntryData( i, reinterpret_cast<void*>( nFmtId ) );
-        if( nFmtId == nSelFmt )
+        const sal_uInt16 nFormatId = pMgr->GetFormatId(TYP_SEQFLD, i);
+        m_pFormatBox->SetEntryData( i, reinterpret_cast<void*>( nFormatId ) );
+        if( nFormatId == nSelFormat )
             m_pFormatBox->SelectEntryPos( i );
     }
 
@@ -282,10 +282,10 @@ void SwCaptionDialog::Apply()
 
 IMPL_LINK( SwCaptionDialog, OptionHdl, Button*, pButton )
 {
-    OUString sFldTypeName = m_pCategoryBox->GetText();
-    if(sFldTypeName == m_sNone)
-        sFldTypeName.clear();
-    ScopedVclPtrInstance< SwSequenceOptionDialog > aDlg( pButton, rView, sFldTypeName );
+    OUString sFieldTypeName = m_pCategoryBox->GetText();
+    if(sFieldTypeName == m_sNone)
+        sFieldTypeName.clear();
+    ScopedVclPtrInstance< SwSequenceOptionDialog > aDlg( pButton, rView, sFieldTypeName );
     aDlg->SetApplyBorderAndShadow(bCopyAttributes);
     aDlg->SetCharacterStyle( sCharacterStyle );
     aDlg->SetOrderNumberingFirst( bOrderNumberingFirst );
@@ -312,15 +312,15 @@ IMPL_LINK_NOARG(SwCaptionDialog, SelectHdl)
 IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl)
 {
     SwWrtShell &rSh = rView.GetWrtShell();
-    OUString sFldTypeName = m_pCategoryBox->GetText();
-    bool bCorrectFldName = !sFldTypeName.isEmpty();
-    bool bNone = sFldTypeName == m_sNone;
-    SwFieldType* pType = (bCorrectFldName && !bNone)
-                    ? rSh.GetFldType( RES_SETEXPFLD, sFldTypeName )
+    OUString sFieldTypeName = m_pCategoryBox->GetText();
+    bool bCorrectFieldName = !sFieldTypeName.isEmpty();
+    bool bNone = sFieldTypeName == m_sNone;
+    SwFieldType* pType = (bCorrectFieldName && !bNone)
+                    ? rSh.GetFieldType( RES_SETEXPFLD, sFieldTypeName )
                     : 0;
     fprintf(stderr, "pType is %p\n", pType);
-    fprintf(stderr, "bCorrectFldName is %d\n", bCorrectFldName);
-    m_pOKButton->Enable( bCorrectFldName &&
+    fprintf(stderr, "bCorrectFieldName is %d\n", bCorrectFieldName);
+    m_pOKButton->Enable( bCorrectFieldName &&
                         (!pType ||
                             static_cast<SwSetExpFieldType*>(pType)->GetType() == nsSwGetSetExpType::GSE_SEQ) );
     m_pOptionButton->Enable( m_pOKButton->IsEnabled() && !bNone );
@@ -349,28 +349,28 @@ void SwCaptionDialog::DrawSample()
     OUString sCaption = m_pTextEdit->GetText();
 
     // number
-    OUString sFldTypeName = m_pCategoryBox->GetText();
-    bool bNone = sFldTypeName == m_sNone;
+    OUString sFieldTypeName = m_pCategoryBox->GetText();
+    bool bNone = sFieldTypeName == m_sNone;
     if( !bNone )
     {
-        const sal_uInt16 nNumFmt = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectEntryData());
-        if( SVX_NUM_NUMBER_NONE != nNumFmt )
+        const sal_uInt16 nNumFormat = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectEntryData());
+        if( SVX_NUM_NUMBER_NONE != nNumFormat )
         {
             // category
             //#i61007# order of captions
             if( !bOrderNumberingFirst )
             {
-                aStr = sFldTypeName;
+                aStr = sFieldTypeName;
                 if ( !aStr.isEmpty() )
                     aStr += " ";
             }
 
             SwWrtShell &rSh = rView.GetWrtShell();
-            SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(rSh.GetFldType(
-                                            RES_SETEXPFLD, sFldTypeName ));
-            if( pFldType && pFldType->GetOutlineLvl() < MAXLEVEL )
+            SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(rSh.GetFieldType(
+                                            RES_SETEXPFLD, sFieldTypeName ));
+            if( pFieldType && pFieldType->GetOutlineLvl() < MAXLEVEL )
             {
-                sal_Int8 nLvl = pFldType->GetOutlineLvl();
+                sal_Int8 nLvl = pFieldType->GetOutlineLvl();
                 SwNumberTree::tNumberVector aNumVector;
                 for( sal_Int8 i = 0; i <= nLvl; ++i )
                     aNumVector.push_back(1);
@@ -378,10 +378,10 @@ void SwCaptionDialog::DrawSample()
                 OUString sNumber( rSh.GetOutlineNumRule()->
                                 MakeNumString(aNumVector, false ));
                 if( !sNumber.isEmpty() )
-                    aStr += sNumber + pFldType->GetDelimiter();
+                    aStr += sNumber + pFieldType->GetDelimiter();
             }
 
-            switch( nNumFmt )
+            switch( nNumFormat )
             {
             case SVX_NUM_CHARS_UPPER_LETTER:    aStr += "A"; break;
             case SVX_NUM_CHARS_UPPER_LETTER_N:  aStr += "A"; break;
@@ -394,7 +394,7 @@ void SwCaptionDialog::DrawSample()
             //#i61007# order of captions
             if( bOrderNumberingFirst )
             {
-                aStr += m_pNumberingSeparatorED->GetText() + sFldTypeName;
+                aStr += m_pNumberingSeparatorED->GetText() + sFieldTypeName;
             }
 
         }
@@ -434,10 +434,10 @@ void SwCaptionDialog::dispose()
 }
 
 SwSequenceOptionDialog::SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV,
-                                            const OUString& rSeqFldType )
+                                            const OUString& rSeqFieldType )
     : SvxStandardDialog( pParent, "CaptionOptionsDialog", "modules/swriter/ui/captionoptions.ui" ),
     rView( rV ),
-    aFldTypeName( rSeqFldType )
+    aFieldTypeName( rSeqFieldType )
 {
     get(m_pLbLevel, "level");
     get(m_pEdDelim, "separator");
@@ -453,15 +453,15 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
         m_pLbLevel->InsertEntry( OUString::number(n+1) );
 
-    SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(rSh.GetFldType(
-                                        RES_SETEXPFLD, aFldTypeName ));
+    SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(rSh.GetFieldType(
+                                        RES_SETEXPFLD, aFieldTypeName ));
 
     sal_Unicode nLvl = MAXLEVEL;
     OUString sDelim(": ");
-    if( pFldType )
+    if( pFieldType )
     {
-        sDelim = pFldType->GetDelimiter();
-        nLvl = pFldType->GetOutlineLvl();
+        sDelim = pFieldType->GetDelimiter();
+        nLvl = pFieldType->GetOutlineLvl();
     }
 
     m_pLbLevel->SelectEntryPos( nLvl < MAXLEVEL ? nLvl + 1 : 0 );
@@ -491,31 +491,31 @@ void SwSequenceOptionDialog::dispose()
 void SwSequenceOptionDialog::Apply()
 {
     SwWrtShell &rSh = rView.GetWrtShell();
-    SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(rSh.GetFldType(
-                                        RES_SETEXPFLD, aFldTypeName ));
+    SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(rSh.GetFieldType(
+                                        RES_SETEXPFLD, aFieldTypeName ));
 
     sal_Int8 nLvl = (sal_Int8)( m_pLbLevel->GetSelectEntryPos() - 1);
     sal_Unicode cDelim = m_pEdDelim->GetText()[0];
 
     bool bUpdate = true;
-    if( pFldType )
+    if( pFieldType )
     {
-        pFldType->SetDelimiter( OUString(cDelim) );
-        pFldType->SetOutlineLvl( nLvl );
+        pFieldType->SetDelimiter( OUString(cDelim) );
+        pFieldType->SetOutlineLvl( nLvl );
     }
-    else if( !aFldTypeName.isEmpty() && nLvl < MAXLEVEL )
+    else if( !aFieldTypeName.isEmpty() && nLvl < MAXLEVEL )
     {
         // then we have to insert that
-        SwSetExpFieldType aFldType( rSh.GetDoc(), aFldTypeName, nsSwGetSetExpType::GSE_SEQ );
-        aFldType.SetDelimiter( OUString(cDelim) );
-        aFldType.SetOutlineLvl( nLvl );
-        rSh.InsertFldType( aFldType );
+        SwSetExpFieldType aFieldType( rSh.GetDoc(), aFieldTypeName, nsSwGetSetExpType::GSE_SEQ );
+        aFieldType.SetDelimiter( OUString(cDelim) );
+        aFieldType.SetOutlineLvl( nLvl );
+        rSh.InsertFieldType( aFieldType );
     }
     else
         bUpdate = false;
 
     if( bUpdate )
-        rSh.UpdateExpFlds();
+        rSh.UpdateExpFields();
 }
 
 OUString  SwSequenceOptionDialog::GetCharacterStyle() const
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index df93bfbe0bde..84b88ae6638a 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -168,7 +168,7 @@ void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
         static_cast<SwColumnPage&>(rPage).SetFrmMode(true);
         static_cast<SwColumnPage&>(rPage).SetFormatUsed(m_bFormat);
 
-        const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(
+        const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>(
                                             m_rSet.Get( RES_FRM_SIZE ));
         static_cast<SwColumnPage&>(rPage).SetPageWidth( rSize.GetWidth() );
     }
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 1186b66518a3..f756ad9c32ed 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -614,7 +614,7 @@ SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet)
     nUpperBorder(0),
     nLowerBorder(0),
     fWidthHeightRatio(1.0),
-    mpToCharCntntPos( NULL ),
+    mpToCharContentPos( NULL ),
 
     nOldH(text::HoriOrientation::CENTER),
     nOldHRel(text::RelOrientation::FRAME),
@@ -901,7 +901,7 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
     SetMetric( *m_pAtVertPosED, aMetric );
 
     const SfxPoolItem* pItem = NULL;
-    const SwFmtAnchor& rAnchor = static_cast<const SwFmtAnchor&>(rSet->Get(RES_ANCHOR));
+    const SwFormatAnchor& rAnchor = static_cast<const SwFormatAnchor&>(rSet->Get(RES_ANCHOR));
 
     if (SfxItemState::SET == rSet->GetItemState(FN_OLE_IS_MATH, false, &pItem))
         m_bIsMathOLE = static_cast<const SfxBoolItem*>(pItem)->GetValue();
@@ -956,7 +956,7 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
     }
     else
     {
-        aGrfSize = static_cast<const SwFmtFrmSize&>(rSet->Get(RES_FRM_SIZE)).GetSize();
+        aGrfSize = static_cast<const SwFormatFrmSize&>(rSet->Get(RES_FRM_SIZE)).GetSize();
     }
 
     // entering procent value made possible
@@ -965,7 +965,7 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
     //the available space is not yet known so the RefValue has to be calculated from size and relative size values
     //this is needed only if relative values are already set
 
-    const SwFmtFrmSize& rFrmSize = static_cast<const SwFmtFrmSize&>(rSet->Get(RES_FRM_SIZE));
+    const SwFormatFrmSize& rFrmSize = static_cast<const SwFormatFrmSize&>(rSet->Get(RES_FRM_SIZE));
 
     m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::FRAME));
     m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::REL_PG_FRAME));
@@ -1006,12 +1006,12 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
 
     // i#22341 - determine content position of character
     // Note: content position can be NULL
-    mpToCharCntntPos = rAnchor.GetCntntAnchor();
+    mpToCharContentPos = rAnchor.GetContentAnchor();
 
     // i#18732 - init checkbox value
     {
         const bool bFollowTextFlow =
-            static_cast<const SwFmtFollowTextFlow&>(rSet->Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
+            static_cast<const SwFormatFollowTextFlow&>(rSet->Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
         m_pFollowTextFlowCB->Check( bFollowTextFlow );
     }
 
@@ -1074,16 +1074,16 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
     if ( !bFormat )
     {
         pOldItem = GetOldItem(*rSet, RES_ANCHOR);
-        if (bNew || !pOldItem || eAnchorId != static_cast<const SwFmtAnchor*>(pOldItem)->GetAnchorId())
+        if (bNew || !pOldItem || eAnchorId != static_cast<const SwFormatAnchor*>(pOldItem)->GetAnchorId())
         {
-            SwFmtAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
+            SwFormatAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
             bRet = 0 != rSet->Put( aAnc );
         }
     }
 
     if ( pHMap )
     {
-        SwFmtHoriOrient aHoriOrient( static_cast<const SwFmtHoriOrient&>(
+        SwFormatHoriOrient aHoriOrient( static_cast<const SwFormatHoriOrient&>(
                                                 rOldSet.Get(RES_HORI_ORIENT)) );
 
         const sal_Int32 nMapPos = GetMapPos(pHMap, *m_pHorizontalDLB);
@@ -1108,7 +1108,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
         bool bSame = false;
         if ((bNew == bFormat) && pOldItem)
         {
-             bSame = aHoriOrient == static_cast<const SwFmtHoriOrient&>(*pOldItem);
+             bSame = aHoriOrient == static_cast<const SwFormatHoriOrient&>(*pOldItem);
         }
         if ((bNew && !bFormat) || ((bAtHorzPosModified || bMod) && !bSame))
         {
@@ -1119,7 +1119,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
     if ( pVMap )
     {
         // alignment vertical
-        SwFmtVertOrient aVertOrient( static_cast<const SwFmtVertOrient&>(
+        SwFormatVertOrient aVertOrient( static_cast<const SwFormatVertOrient&>(
                                                 rOldSet.Get(RES_VERT_ORIENT)) );
 
         const sal_Int32 nMapPos = GetMapPos(pVMap, *m_pVerticalDLB);
@@ -1148,10 +1148,10 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
         if((bNew == bFormat) && pOldItem)
         {
              bSame = bFormat ?
-                      aVertOrient.GetVertOrient() == static_cast<const SwFmtVertOrient*>(pOldItem)->GetVertOrient() &&
-                      aVertOrient.GetRelationOrient() == static_cast<const SwFmtVertOrient*>(pOldItem)->GetRelationOrient() &&
-                      aVertOrient.GetPos() == static_cast<const SwFmtVertOrient*>(pOldItem)->GetPos()
-                    : aVertOrient == static_cast<const SwFmtVertOrient&>(*pOldItem);
+                      aVertOrient.GetVertOrient() == static_cast<const SwFormatVertOrient*>(pOldItem)->GetVertOrient() &&
+                      aVertOrient.GetRelationOrient() == static_cast<const SwFormatVertOrient*>(pOldItem)->GetRelationOrient() &&
+                      aVertOrient.GetPos() == static_cast<const SwFormatVertOrient*>(pOldItem)->GetPos()
+                    : aVertOrient == static_cast<const SwFormatVertOrient&>(*pOldItem);
         }
         if( ( bNew && !bFormat ) || ((bAtVertPosModified || bMod) && !bSame ))
         {
@@ -1164,8 +1164,8 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
     // for a graphic that isn't even loaded, are set. Then no SetSize
     // is done here when the size settings were not changed by the
     // user.
-    const SwFmtFrmSize& rOldSize = static_cast<const SwFmtFrmSize& >(rOldSet.Get(RES_FRM_SIZE));
-    SwFmtFrmSize aSz( rOldSize );
+    const SwFormatFrmSize& rOldSize = static_cast<const SwFormatFrmSize& >(rOldSet.Get(RES_FRM_SIZE));
+    SwFormatFrmSize aSz( rOldSize );
 
     sal_Int32 nRelWidthRelation = m_pRelWidthRelationLB->GetSelectEntryPos();
     if (nRelWidthRelation != LISTBOX_ENTRY_NOTFOUND)
@@ -1250,7 +1250,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
     }
     if(m_pFollowTextFlowCB->IsValueChangedFromSaved())
     {
-        bRet |= 0 != rSet->Put(SwFmtFollowTextFlow(m_pFollowTextFlowCB->IsChecked()));
+        bRet |= 0 != rSet->Put(SwFormatFollowTextFlow(m_pFollowTextFlowCB->IsChecked()));
     }
     return bRet;
 }
@@ -1753,7 +1753,7 @@ SfxTabPage::sfxpg SwFrmPage::DeactivatePage(SfxItemSet * _pSet)
         SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell()
                             : getFrmDlgParentShell();
         RndStdIds eAnchorId = (RndStdIds)GetAnchor();
-        SwFmtAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
+        SwFormatAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
         _pSet->Put( aAnc );
     }
 
@@ -1842,7 +1842,7 @@ IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl)
     aVal.nHPos = nAtHorzPosVal;
     aVal.nVPos = nAtVertPosVal;
 
-    aMgr.ValidateMetrics(aVal, mpToCharCntntPos, true);   // one time, to get reference values for percental values
+    aMgr.ValidateMetrics(aVal, mpToCharContentPos, true);   // one time, to get reference values for percental values
 
     // set reference values for percental values (100%) ...
     m_aWidthED.SetRefValue(aVal.aPercentSize.Width());
@@ -1854,13 +1854,13 @@ IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl)
     aVal.nWidth  = nWidth;
     aVal.nHeight = nHeight;
 
-    aMgr.ValidateMetrics(aVal, mpToCharCntntPos);    // one more time, to determine all remaining values with correct width and height.
+    aMgr.ValidateMetrics(aVal, mpToCharContentPos);    // one more time, to determine all remaining values with correct width and height.
 
     // all columns have to be correct
     if(GetTabDialog()->GetExampleSet() &&
             SfxItemState::DEFAULT <= GetTabDialog()->GetExampleSet()->GetItemState(RES_COL))
     {
-        const SwFmtCol& rCol = static_cast<const SwFmtCol&>(GetTabDialog()->GetExampleSet()->Get(RES_COL));
+        const SwFormatCol& rCol = static_cast<const SwFormatCol&>(GetTabDialog()->GetExampleSet()->Get(RES_COL));
         if ( rCol.GetColumns().size() > 1 )
         {
             for ( size_t i = 0; i < rCol.GetColumns().size(); ++i )
@@ -2207,7 +2207,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
         }
     }
 
-    const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(rSet.Get(RES_FRM_SIZE));
+    const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>(rSet.Get(RES_FRM_SIZE));
     sal_Int64 nWidth  = m_aWidthED.NormalizePercent(rSize.GetWidth());
     sal_Int64 nHeight = m_aHeightED.NormalizePercent(rSize.GetHeight());
 
@@ -2254,8 +2254,8 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
         if ( !bFormat )
         {
             SwWrtShell* pSh = getFrmDlgParentShell();
-            const SwFrmFmt* pFmt = pSh->GetFlyFrmFmt();
-            if( pFmt && pFmt->GetChain().GetNext() )
+            const SwFrameFormat* pFormat = pSh->GetFlyFrameFormat();
+            if( pFormat && pFormat->GetChain().GetNext() )
                 m_pAutoHeightCB->Enable( false );
         }
     }
@@ -2274,7 +2274,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
     }
 
     // columns
-    SwFmtCol aCol( static_cast<const SwFmtCol&>(rSet.Get(RES_COL)) );
+    SwFormatCol aCol( static_cast<const SwFormatCol&>(rSet.Get(RES_COL)) );
     ::FitToActualSize( aCol, (sal_uInt16)rSize.GetWidth() );
 
     RndStdIds eAnchorId = (RndStdIds)GetAnchor();
@@ -2283,8 +2283,8 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
         InitPos(eAnchorId, -1, 0, -1, 0, LONG_MAX, LONG_MAX);
     else
     {
-        const SwFmtHoriOrient& rHori = static_cast<const SwFmtHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
-        const SwFmtVertOrient& rVert = static_cast<const SwFmtVertOrient&>(rSet.Get(RES_VERT_ORIENT));
+        const SwFormatHoriOrient& rHori = static_cast<const SwFormatHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
+        const SwFormatVertOrient& rVert = static_cast<const SwFormatVertOrient&>(rSet.Get(RES_VERT_ORIENT));
         nOldH    = rHori.GetHoriOrient();
         nOldHRel = rHori.GetRelationOrient();
         nOldV    = rVert.GetVertOrient(),
@@ -2316,7 +2316,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
 
     // transparent for example
     // circulation for example
-    const SwFmtSurround& rSurround = static_cast<const SwFmtSurround&>(rSet.Get(RES_SURROUND));
+    const SwFormatSurround& rSurround = static_cast<const SwFormatSurround&>(rSet.Get(RES_SURROUND));
     m_pExampleWN->SetWrap ( static_cast< sal_uInt16 >(rSurround.GetSurround()) );
 
     if ( rSurround.GetSurround() == SURROUND_THROUGHT )
@@ -2445,14 +2445,14 @@ void SwGrfExtPage::Reset(const SfxItemSet *rSet)
 void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
 {
     const SvxProtectItem& rProt = static_cast<const SvxProtectItem& >(rSet.Get(RES_PROTECT));
-    bool bProtCntnt = rProt.IsCntntProtected();
+    bool bProtContent = rProt.IsContentProtected();
 
     const SfxPoolItem* pItem = 0;
     bool bEnable = false;
     bool bEnableMirrorRB = false;
 
     SfxItemState eState = rSet.GetItemState(RES_GRFATR_MIRRORGRF, true, &pItem);
-    if( SfxItemState::UNKNOWN != eState && !bProtCntnt && !bHtmlMode )
+    if( SfxItemState::UNKNOWN != eState && !bProtContent && !bHtmlMode )
     {
         if( SfxItemState::SET != eState )
             pItem = &rSet.Get( RES_GRFATR_MIRRORGRF );
@@ -2790,17 +2790,17 @@ void SwFrmURLPage::Reset( const SfxItemSet *rSet )
 
     if ( SfxItemState::SET == rSet->GetItemState( RES_URL, true, &pItem ) )
     {
-        const SwFmtURL* pFmtURL = static_cast<const SwFmtURL*>(pItem);
-        pURLED->SetText( INetURLObject::decode( pFmtURL->GetURL(),
+        const SwFormatURL* pFormatURL = static_cast<const SwFormatURL*>(pItem);
+        pURLED->SetText( INetURLObject::decode( pFormatURL->GetURL(),
                                            INetURLObject::DECODE_UNAMBIGUOUS,
                                         RTL_TEXTENCODING_UTF8 ));
-        pNameED->SetText( pFmtURL->GetName());
+        pNameED->SetText( pFormatURL->GetName());
 
-        pClientCB->Enable( pFmtURL->GetMap() != 0 );
-        pClientCB->Check ( pFmtURL->GetMap() != 0 );
-        pServerCB->Check ( pFmtURL->IsServerMap() );
+        pClientCB->Enable( pFormatURL->GetMap() != 0 );
+        pClientCB->Check ( pFormatURL->GetMap() != 0 );
+        pServerCB->Check ( pFormatURL->IsServerMap() );
 
-        pFrameCB->SetText(pFmtURL->GetTargetFrameName());
+        pFrameCB->SetText(pFormatURL->GetTargetFrameName());
         pFrameCB->SaveValue();
     }
     else
@@ -2813,38 +2813,38 @@ void SwFrmURLPage::Reset( const SfxItemSet *rSet )
 bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet)
 {
     bool bModified = false;
-    const SwFmtURL* pOldURL = static_cast<const SwFmtURL*>(GetOldItem(*rSet, RES_URL));
-    boost::scoped_ptr<SwFmtURL> pFmtURL;
+    const SwFormatURL* pOldURL = static_cast<const SwFormatURL*>(GetOldItem(*rSet, RES_URL));
+    boost::scoped_ptr<SwFormatURL> pFormatURL;
     if(pOldURL)
-        pFmtURL.reset(static_cast<SwFmtURL*>(pOldURL->Clone()));
+        pFormatURL.reset(static_cast<SwFormatURL*>(pOldURL->Clone()));
     else
-        pFmtURL.reset(new SwFmtURL());
+        pFormatURL.reset(new SwFormatURL());
 
     {
         const OUString sText = pURLED->GetText();
 
-        if( pFmtURL->GetURL() != sText ||
-            pFmtURL->GetName() != pNameED->GetText() ||
-            pServerCB->IsChecked() != pFmtURL->IsServerMap() )
+        if( pFormatURL->GetURL() != sText ||
+            pFormatURL->GetName() != pNameED->GetText() ||
+            pServerCB->IsChecked() != pFormatURL->IsServerMap() )
         {
-            pFmtURL->SetURL( sText, pServerCB->IsChecked() );
-            pFmtURL->SetName( pNameED->GetText() );
+            pFormatURL->SetURL( sText, pServerCB->IsChecked() );
+            pFormatURL->SetName( pNameED->GetText() );
             bModified = true;
         }
     }
 
-    if(!pClientCB->IsChecked() && pFmtURL->GetMap() != 0)
+    if(!pClientCB->IsChecked() && pFormatURL->GetMap() != 0)
     {
-        pFmtURL->SetMap(0);
+        pFormatURL->SetMap(0);
         bModified = true;
     }
 
-    if(pFmtURL->GetTargetFrameName() != pFrameCB->GetText())
+    if(pFormatURL->GetTargetFrameName() != pFrameCB->GetText())
     {
-        pFmtURL->SetTargetFrameName(pFrameCB->GetText());
+        pFormatURL->SetTargetFrameName(pFrameCB->GetText());
         bModified = true;
     }
-    rSet->Put(*pFmtURL);
+    rSet->Put(*pFormatURL);
     return bModified;
 }
 
@@ -3017,28 +3017,28 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
 
     if (!bNew)
     {
-        SwFrmFmt* pFmt = pWrtSh->GetFlyFrmFmt();
+        SwFrameFormat* pFormat = pWrtSh->GetFlyFrameFormat();
 
-        if (pFmt)
+        if (pFormat)
         {
-            const SwFmtChain &rChain = pFmt->GetChain();
-            const SwFlyFrmFmt* pFlyFmt;
+            const SwFormatChain &rChain = pFormat->GetChain();
+            const SwFlyFrameFormat* pFlyFormat;
             OUString sNextChain, sPrevChain;
-            if ((pFlyFmt = rChain.GetPrev()) != 0)
+            if ((pFlyFormat = rChain.GetPrev()) != 0)
             {
-                sPrevChain = pFlyFmt->GetName();
+                sPrevChain = pFlyFormat->GetName();
             }
 
-            if ((pFlyFmt = rChain.GetNext()) != 0)
+            if ((pFlyFormat = rChain.GetNext()) != 0)
             {
-                sNextChain = pFlyFmt->GetName();
+                sNextChain = pFlyFormat->GetName();
             }
             //determine chainable frames
             ::std::vector< OUString > aPrevPageFrames;
             ::std::vector< OUString > aThisPageFrames;
             ::std::vector< OUString > aNextPageFrames;
             ::std::vector< OUString > aRemainFrames;
-            pWrtSh->GetConnectableFrmFmts(*pFmt, sNextChain, false,
+            pWrtSh->GetConnectableFrameFormats(*pFormat, sNextChain, false,
                             aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames );
             lcl_InsertVectors(*pPrevLB, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames);
             if(!sPrevChain.isEmpty())
@@ -3054,7 +3054,7 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
             aThisPageFrames.erase(aThisPageFrames.begin(), aThisPageFrames.end());
             aRemainFrames.erase(aRemainFrames.begin(), aRemainFrames.end());
 
-            pWrtSh->GetConnectableFrmFmts(*pFmt, sPrevChain, true,
+            pWrtSh->GetConnectableFrameFormats(*pFormat, sPrevChain, true,
                             aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames );
             lcl_InsertVectors(*pNextLB, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames);
             if(!sNextChain.isEmpty())
@@ -3073,10 +3073,10 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
     // Pos Protected
     const SvxProtectItem& rProt = static_cast<const SvxProtectItem& >(rSet->Get(RES_PROTECT));
     pProtectFrameCB->Check(rProt.IsPosProtected());
-    pProtectContentCB->Check(rProt.IsCntntProtected());
+    pProtectContentCB->Check(rProt.IsContentProtected());
     pProtectSizeCB->Check(rProt.IsSizeProtected());
 
-    const SwFmtEditInReadonly& rEdit = static_cast<const SwFmtEditInReadonly& >(rSet->Get(RES_EDIT_IN_READONLY));
+    const SwFormatEditInReadonly& rEdit = static_cast<const SwFormatEditInReadonly& >(rSet->Get(RES_EDIT_IN_READONLY));
     pEditInReadonlyCB->Check(rEdit.GetValue());          pEditInReadonlyCB->SaveValue();
 
     // print
@@ -3140,7 +3140,7 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet)
 
     const SfxPoolItem* pOldItem;
     SvxProtectItem aProt ( static_cast<const SvxProtectItem& >(GetItemSet().Get(RES_PROTECT)) );
-    aProt.SetCntntProtect( pProtectContentCB->IsChecked() );
+    aProt.SetContentProtect( pProtectContentCB->IsChecked() );
     aProt.SetSizeProtect ( pProtectSizeCB->IsChecked() );
     aProt.SetPosProtect  ( pProtectFrameCB->IsChecked() );
     if ( 0 == (pOldItem = GetOldItem(*rSet, FN_SET_PROTECT)) ||
@@ -3148,7 +3148,7 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet)
         bRet |= 0 != rSet->Put( aProt);
 
     if ( pEditInReadonlyCB->IsValueChangedFromSaved() )
-        bRet |= 0 != rSet->Put( SwFmtEditInReadonly( RES_EDIT_IN_READONLY, pEditInReadonlyCB->IsChecked()));
+        bRet |= 0 != rSet->Put( SwFormatEditInReadonly( RES_EDIT_IN_READONLY, pEditInReadonlyCB->IsChecked()));
 
     if ( pPrintFrameCB->IsValueChangedFromSaved() )
         bRet |= 0 != rSet->Put( SvxPrintItem( RES_PRINT, pPrintFrameCB->IsChecked()));
@@ -3166,22 +3166,22 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet)
     }
     if(pWrtSh)
     {
-        const SwFrmFmt* pFmt = pWrtSh->GetFlyFrmFmt();
-        if (pFmt)
+        const SwFrameFormat* pFormat = pWrtSh->GetFlyFrameFormat();
+        if (pFormat)
         {
             OUString sCurrentPrevChain, sCurrentNextChain;
             if(pPrevLB->GetSelectEntryPos())
                 sCurrentPrevChain = pPrevLB->GetSelectEntry();
             if(pNextLB->GetSelectEntryPos())
                 sCurrentNextChain = pNextLB->GetSelectEntry();
-            const SwFmtChain &rChain = pFmt->GetChain();
-            const SwFlyFrmFmt* pFlyFmt;
+            const SwFormatChain &rChain = pFormat->GetChain();
+            const SwFlyFrameFormat* pFlyFormat;
             OUString sNextChain, sPrevChain;
-            if ((pFlyFmt = rChain.GetPrev()) != 0)
-                sPrevChain = pFlyFmt->GetName();
+            if ((pFlyFormat = rChain.GetPrev()) != 0)
+                sPrevChain = pFlyFormat->GetName();
 
-            if ((pFlyFmt = rChain.GetNext()) != 0)
-                sNextChain = pFlyFmt->GetName();
+            if ((pFlyFormat = rChain.GetNext()) != 0)
+                sNextChain = pFlyFormat->GetName();
             if(sPrevChain != sCurrentPrevChain)
                 bRet |= 0 != rSet->Put(SfxStringItem(FN_PARAM_CHAIN_PREVIOUS, sCurrentPrevChain));
             if(sNextChain != sCurrentNextChain)
@@ -3230,8 +3230,8 @@ IMPL_LINK(SwFrmAddPage, ChainModifyHdl, ListBox*, pBox)
         sCurrentPrevChain = pPrevLB->GetSelectEntry();
     if(pNextLB->GetSelectEntryPos())
         sCurrentNextChain = pNextLB->GetSelectEntry();
-    SwFrmFmt* pFmt = pWrtSh->GetFlyFrmFmt();
-    if (pFmt)
+    SwFrameFormat* pFormat = pWrtSh->GetFlyFrameFormat();
+    if (pFormat)
     {
         bool bNextBox = pNextLB == pBox;
         ListBox& rChangeLB = bNextBox ? *pPrevLB : *pNextLB;
@@ -3242,7 +3242,7 @@ IMPL_LINK(SwFrmAddPage, ChainModifyHdl, ListBox*, pBox)
         ::std::vector< OUString > aThisPageFrames;
         ::std::vector< OUString > aNextPageFrames;
         ::std::vector< OUString > aRemainFrames;
-        pWrtSh->GetConnectableFrmFmts(*pFmt, bNextBox ? sCurrentNextChain : sCurrentPrevChain, !bNextBox,
+        pWrtSh->GetConnectableFrameFormats(*pFormat, bNextBox ? sCurrentNextChain : sCurrentPrevChain, !bNextBox,
                         aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames );
         lcl_InsertVectors(rChangeLB,
                 aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames);
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index df2a7378ddaa..54ccf0402731 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -199,10 +199,10 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
     SetMetric(*m_pTopMarginED, aMetric);
     SetMetric(*m_pBottomMarginED, aMetric);
 
-    const SwFmtSurround& rSurround = static_cast<const SwFmtSurround&>(rSet->Get(RES_SURROUND));
+    const SwFormatSurround& rSurround = static_cast<const SwFormatSurround&>(rSet->Get(RES_SURROUND));
 
     SwSurround nSur = rSurround.GetSurround();
-    const SwFmtAnchor &rAnch = static_cast<const SwFmtAnchor&>(rSet->Get(RES_ANCHOR));
+    const SwFormatAnchor &rAnch = static_cast<const SwFormatAnchor&>(rSet->Get(RES_ANCHOR));
     nAnchorId = rAnch.GetAnchorId();
 
     if (((nAnchorId == FLY_AT_PARA) || (nAnchorId == FLY_AT_CHAR))
@@ -294,8 +294,8 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet)
 {
     bool bModified = false;
     const SfxPoolItem* pOldItem;
-    const SwFmtSurround& rOldSur = static_cast<const SwFmtSurround&>(GetItemSet().Get(RES_SURROUND));
-    SwFmtSurround aSur( rOldSur );
+    const SwFormatSurround& rOldSur = static_cast<const SwFormatSurround&>(GetItemSet().Get(RES_SURROUND));
+    SwFormatSurround aSur( rOldSur );
 
     SvxOpaqueItem aOp( RES_OPAQUE);
 
@@ -395,7 +395,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet)
 void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
 {
     // anchor
-    const SwFmtAnchor &rAnch = static_cast<const SwFmtAnchor&>(rSet.Get(RES_ANCHOR));
+    const SwFormatAnchor &rAnch = static_cast<const SwFormatAnchor&>(rSet.Get(RES_ANCHOR));
     nAnchorId = rAnch.GetAnchorId();
     bool bEnable = (nAnchorId != FLY_AS_CHAR);
 
@@ -406,7 +406,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
         SvxSwFrameValidation aVal;
 
         // size
-        const SwFmtFrmSize& rFrmSize = static_cast<const SwFmtFrmSize&>(rSet.Get(RES_FRM_SIZE));
+        const SwFormatFrmSize& rFrmSize = static_cast<const SwFormatFrmSize&>(rSet.Get(RES_FRM_SIZE));
         Size aSize = rFrmSize.GetSize();
 
         // margin
@@ -418,8 +418,8 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
         nOldLowerMargin = static_cast< sal_uInt16 >(rUL.GetLower());
 
         // position
-        const SwFmtHoriOrient& rHori = static_cast<const SwFmtHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
-        const SwFmtVertOrient& rVert = static_cast<const SwFmtVertOrient&>(rSet.Get(RES_VERT_ORIENT));
+        const SwFormatHoriOrient& rHori = static_cast<const SwFormatHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
+        const SwFormatVertOrient& rVert = static_cast<const SwFormatVertOrient&>(rSet.Get(RES_VERT_ORIENT));
 
         aVal.nAnchorType = static_cast< sal_Int16 >(nAnchorId);
         aVal.bAutoHeight = rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE;
@@ -427,7 +427,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
         aVal.bMirror = rHori.IsPosToggle();
         // #i18732#
         aVal.bFollowTextFlow =
-            static_cast<const SwFmtFollowTextFlow&>(rSet.Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
+            static_cast<const SwFormatFollowTextFlow&>(rSet.Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
 
         aVal.nHoriOrient = (short)rHori.GetHoriOrient();
         aVal.nVertOrient = (short)rVert.GetVertOrient();
@@ -494,13 +494,13 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
         RangeModifyHdl(m_pTopMarginED);
     }
 
-    const SwFmtSurround& rSurround = static_cast<const SwFmtSurround&>(rSet.Get(RES_SURROUND));
+    const SwFormatSurround& rSurround = static_cast<const SwFormatSurround&>(rSet.Get(RES_SURROUND));
     SwSurround nSur = rSurround.GetSurround();
 
     m_pWrapTransparentCB->Enable( bEnable && !bHtmlMode && nSur == SURROUND_THROUGHT );
     if(bHtmlMode)
     {
-        const SwFmtHoriOrient& rHori = static_cast<const SwFmtHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
+        const SwFormatHoriOrient& rHori = static_cast<const SwFormatHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
         sal_Int16 eHOrient = rHori.GetHoriOrient();
         sal_Int16 eHRelOrient = rHori.GetRelationOrient();
         m_pWrapOutlineCB->Hide();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index fe40ea44873e..a0c803642668 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -279,7 +279,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet&
             if(TOX_AUTHORITIES == eCurrentTOXType.eType)
             {
                 const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
-                                                rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr));
+                                                rSh.GetFieldType(RES_AUTHORITY, aEmptyOUStr));
                 if(pFType)
                 {
                     OUString sBrackets;
@@ -360,7 +360,7 @@ void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     }
     else if(nId == m_nColumnId)
     {
-        const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(GetInputSetImpl()->Get(RES_FRM_SIZE));
+        const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>(GetInputSetImpl()->Get(RES_FRM_SIZE));
 
         static_cast<SwColumnPage&>(rPage).SetPageWidth(rSize.GetWidth());
     }
@@ -428,7 +428,7 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
         if(TOX_AUTHORITIES == eType.eType)
         {
             const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
-                                            rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr));
+                                            rSh.GetFieldType(RES_AUTHORITY, aEmptyOUStr));
             if(pFType)
             {
                 pDescArr[nIndex]->SetAuthBrackets(OUString(pFType->GetPrefix()) +
@@ -521,14 +521,14 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl )
 
 bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const OUString& rName)
 {
-    SwTxtFmtColl* pColl = rSh.GetParaStyle(rName);
+    SwTextFormatColl* pColl = rSh.GetParaStyle(rName);
     if(pColl && ! pColl->IsAssignedToListLevelOfOutlineStyle())
         return true;
 
     const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(
         rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
     if(nId != USHRT_MAX &&
-        ! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle())
+        ! rSh.GetTextCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle())
         return true;
 
     return false;
@@ -691,12 +691,12 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent,
     }
     // now the other styles
 
-    const SwTxtFmtColl *pColl   = 0;
-    const sal_uInt16 nSz = rWrtSh.GetTxtFmtCollCount();
+    const SwTextFormatColl *pColl   = 0;
+    const sal_uInt16 nSz = rWrtSh.GetTextFormatCollCount();
 
     for ( sal_uInt16 j = 0;j < nSz; ++j )
     {
-        pColl = &rWrtSh.GetTxtFmtColl(j);
+        pColl = &rWrtSh.GetTextFormatColl(j);
         if(pColl->IsDefault())
             continue;
 
@@ -1274,10 +1274,10 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet* )
     m_pFromFileCB->Check( !sAutoMarkURL.isEmpty() );
 
     m_pCaptionSequenceLB->Clear();
-    const sal_uInt16 nCount = rSh.GetFldTypeCount(RES_SETEXPFLD);
+    const sal_uInt16 nCount = rSh.GetFieldTypeCount(RES_SETEXPFLD);
     for (sal_uInt16 i = 0; i < nCount; i++)
     {
-        SwFieldType *pType = rSh.GetFldType( i, RES_SETEXPFLD );
+        SwFieldType *pType = rSh.GetFieldType( i, RES_SETEXPFLD );
         if( pType->Which() == RES_SETEXPFLD &&
             static_cast<SwSetExpFieldType *>( pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
             m_pCaptionSequenceLB->InsertEntry(pType->GetName());
@@ -2095,7 +2095,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
         {
             SwWrtShell& rSh = pTOXDlg->GetWrtShell();
             const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
-                                    rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr));
+                                    rSh.GetFieldType(RES_AUTHORITY, aEmptyOUStr));
             if(pFType)
             {
                 if(pFType->IsSortByDocument())
@@ -2311,7 +2311,7 @@ IMPL_LINK(SwTOXEntryTabPage, InsertTokenHdl, PushButton*, pBtn)
     {
         if( TOX_CONTENT == m_pCurrentForm->GetTOXType() )
         {
-            sText = SwForm::GetFormEntryTxt();
+            sText = SwForm::GetFormEntryText();
             eTokenType = TOKEN_ENTRY_TEXT;
         }
         else
@@ -2832,7 +2832,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
                 switch( aToken.eTokenType )
                 {
                 case TOKEN_ENTRY_NO:     sForm = SwForm::GetFormEntryNum(); break;
-                case TOKEN_ENTRY_TEXT:   sForm = SwForm::GetFormEntryTxt(); break;
+                case TOKEN_ENTRY_TEXT:   sForm = SwForm::GetFormEntryText(); break;
                 case TOKEN_ENTRY:        sForm = SwForm::GetFormEntry(); break;
                 case TOKEN_TAB_STOP:     sForm = SwForm::GetFormTab(); break;
                 case TOKEN_PAGE_NUMS:    sForm = SwForm::GetFormPageNums(); break;
@@ -3722,11 +3722,11 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
 
     // initialise templates
     SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell();
-    const sal_uInt16 nSz = rSh.GetTxtFmtCollCount();
+    const sal_uInt16 nSz = rSh.GetTextFormatCollCount();
 
     for( sal_uInt16 i = 0; i < nSz; ++i )
     {
-        const SwTxtFmtColl *pColl = &rSh.GetTxtFmtColl( i );
+        const SwTextFormatColl *pColl = &rSh.GetTextFormatColl( i );
         if( !pColl->IsDefault() )
             m_pParaLayLB->InsertEntry( pColl->GetName() );
     }
@@ -4065,19 +4065,19 @@ bool SwEntryBrowseBox::SaveModified()
 void SwEntryBrowseBox::InitController(
                 ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol)
 {
-    const OUString rTxt = GetCellText( nRow, nCol );
+    const OUString rText = GetCellText( nRow, nCol );
     if(nCol < ITEM_CASE)
     {
         rController = xController;
         ::svt::CellController* pController = xController;
-        static_cast< ::svt::EditCellController*>(pController)->GetEditImplementation()->SetText( rTxt );
+        static_cast< ::svt::EditCellController*>(pController)->GetEditImplementation()->SetText( rText );
     }
     else
     {
         rController = xCheckController;
         ::svt::CellController* pController = xCheckController;
         static_cast< ::svt::CheckBoxCellController*>(pController)->GetCheckBox().Check(
-                                                            rTxt == sYes );
+                                                            rText == sYes );
      }
 }
 
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 9fb0662c407b..8af83aac7d3a 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -306,16 +306,16 @@ void    SwIndexMarkPane::UpdateLanguageDependenciesForPhoneticReading()
         OSL_ENSURE(pMark, "need current SwTOXMark");
         if(!pMark)
             return;
-        SwTxtTOXMark* pTxtTOXMark = pMark->GetTxtTOXMark();
-        OSL_ENSURE(pTxtTOXMark, "need current SwTxtTOXMark");
-        if(!pTxtTOXMark)
+        SwTextTOXMark* pTextTOXMark = pMark->GetTextTOXMark();
+        OSL_ENSURE(pTextTOXMark, "need current SwTextTOXMark");
+        if(!pTextTOXMark)
             return;
-        const SwTxtNode* pTxtNode = pTxtTOXMark->GetpTxtNd();
-        OSL_ENSURE(pTxtNode, "need current SwTxtNode");
-        if(!pTxtNode)
+        const SwTextNode* pTextNode = pTextTOXMark->GetpTextNd();
+        OSL_ENSURE(pTextNode, "need current SwTextNode");
+        if(!pTextNode)
             return;
-        sal_Int32 nTextIndex = pTxtTOXMark->GetStart();
-        nLangForPhoneticReading = pTxtNode->GetLang( nTextIndex );
+        sal_Int32 nTextIndex = pTextTOXMark->GetStart();
+        nLangForPhoneticReading = pTextNode->GetLang( nTextIndex );
     }
     else //if dialog is opened to create a new mark
     {
@@ -419,7 +419,7 @@ static void lcl_SelectSameStrings(SwWrtShell& rSh, bool bWordOnly, bool bCaseSen
     SearchOptions aSearchOpt(
                         SearchAlgorithms_ABSOLUTE,
                         ( bWordOnly ? SearchFlags::NORM_WORD_ONLY : 0 ),
-                        rSh.GetSelTxt(), OUString(),
+                        rSh.GetSelText(), OUString(),
                         GetAppLanguageTag().getLocale(),
                         0, 0, 0,
                         (bCaseSensitive
@@ -846,7 +846,7 @@ void SwIndexMarkPane::UpdateDialog()
     m_pKey1DCB->SetReadOnly( !bEnable );
     m_pKey2DCB->SetReadOnly( !bEnable );
 
-    pSh->SelectTxtAttr( RES_TXTATR_TOXMARK, pMark->GetTxtTOXMark() );
+    pSh->SelectTextAttr( RES_TXTATR_TOXMARK, pMark->GetTextTOXMark() );
     // we need the point at the start of the attribute
     pSh->SwapPam();
 
@@ -1167,7 +1167,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox)
         if(!sEntry.isEmpty())
         {
             const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
-                                        pSh->GetFldType(RES_AUTHORITY, OUString()));
+                                        pSh->GetFieldType(RES_AUTHORITY, OUString()));
             const SwAuthEntry*  pEntry = pFType ? pFType->GetEntryByIdentifier(sEntry) : 0;
             for(int i = 0; i < AUTH_FIELD_END; i++)
                 m_sFields[i] = pEntry ?
@@ -1194,7 +1194,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl)
         OSL_ENSURE(!m_sFields[AUTH_FIELD_AUTHORITY_TYPE].isEmpty() , "No authority type is set!");
         //check if the entry already exists with different content
         const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
-                                        pSh->GetFldType(RES_AUTHORITY, OUString()));
+                                        pSh->GetFieldType(RES_AUTHORITY, OUString()));
         const SwAuthEntry*  pEntry = pFType ?
                 pFType->GetEntryByIdentifier( m_sFields[AUTH_FIELD_IDENTIFIER])
                 : 0;
@@ -1210,7 +1210,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl)
             }
         }
 
-        SwFldMgr aMgr(pSh);
+        SwFieldMgr aMgr(pSh);
         OUString sFields;
         for(int i = 0; i < AUTH_FIELD_END; i++)
         {
@@ -1225,12 +1225,12 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl)
                     aNewData.SetAuthorField((ToxAuthorityField)i, m_sFields[i]);
                 pSh->ChangeAuthorityData(&aNewData);
             }
-            SwInsertFld_Data aData(TYP_AUTHORITY, 0, sFields, OUString(), 0 );
-            aMgr.InsertFld( aData );
+            SwInsertField_Data aData(TYP_AUTHORITY, 0, sFields, OUString(), 0 );
+            aMgr.InsertField( aData );
         }
-        else if(aMgr.GetCurFld())
+        else if(aMgr.GetCurField())
         {
-            aMgr.UpdateCurFld(0, sFields, OUString());
+            aMgr.UpdateCurField(0, sFields, OUString());
         }
     }
     if(!bNewEntry)
@@ -1329,7 +1329,7 @@ IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton)
     else
     {
         const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
-                                    pSh->GetFldType(RES_AUTHORITY, OUString()));
+                                    pSh->GetFieldType(RES_AUTHORITY, OUString()));
         if(pFType)
         {
             std::vector<OUString> aIds;
@@ -1370,7 +1370,7 @@ IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit)
         else if(bIsFromComponent)
         {
             const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
-                                        pSh->GetFldType(RES_AUTHORITY, OUString()));
+                                        pSh->GetFieldType(RES_AUTHORITY, OUString()));
             bAllowed = !pFType || !pFType->GetEntryByIdentifier(sEntry);
         }
         else
@@ -1384,7 +1384,7 @@ IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit)
 void SwAuthorMarkPane::InitControls()
 {
     OSL_ENSURE(pSh, "no shell?");
-    SwField* pField = pSh->GetCurFld();
+    SwField* pField = pSh->GetCurField();
     OSL_ENSURE(bNewEntry || pField, "no current marker");
     if(bNewEntry)
     {
@@ -1474,7 +1474,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
                                     SwCreateAuthEntryDlg_Impl, IdentifierHdl));
 
             const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
-                                        rSh.GetFldType(RES_AUTHORITY, OUString()));
+                                        rSh.GetFieldType(RES_AUTHORITY, OUString()));
             if(pFType)
             {
                 std::vector<OUString> aIds;
@@ -1568,7 +1568,7 @@ OUString  SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons
 IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox*, pBox)
 {
     const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
-                                rWrtSh.GetFldType(RES_AUTHORITY, OUString()));
+                                rWrtSh.GetFieldType(RES_AUTHORITY, OUString()));
     if(pFType)
     {
         const SwAuthEntry* pEntry = pFType->GetEntryByIdentifier(
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 76cad1a47ac5..5703e6d7b354 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -87,7 +87,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN,
 {
     get(m_pNumViewBox, "numberinglb");
     get(m_pOffsetLbl, "offset");
-    get(m_pOffsetFld, "offsetnf");
+    get(m_pOffsetField, "offsetnf");
     get(m_pPrefixED, "prefix");
     get(m_pSuffixED, "suffix");
 
@@ -113,8 +113,8 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN,
     get(m_pParaTemplBox, "parastylelb");
     get(m_pPageTemplLbl, "pagestyleft");
     get(m_pPageTemplBox, "pagestylelb");
-    get(m_pFtnCharAnchorTemplBox, "charanchorstylelb");
-    get(m_pFtnCharTextTemplBox, "charstylelb");
+    get(m_pFootnoteCharAnchorTemplBox, "charanchorstylelb");
+    get(m_pFootnoteCharTextTemplBox, "charstylelb");
 }
 
 SwEndNoteOptionPage::~SwEndNoteOptionPage()
@@ -126,7 +126,7 @@ void SwEndNoteOptionPage::dispose()
 {
     m_pNumViewBox.clear();
     m_pOffsetLbl.clear();
-    m_pOffsetFld.clear();
+    m_pOffsetField.clear();
     m_pNumCountBox.clear();
     m_pPrefixED.clear();
     m_pSuffixED.clear();
@@ -137,8 +137,8 @@ void SwEndNoteOptionPage::dispose()
     m_pParaTemplBox.clear();
     m_pPageTemplLbl.clear();
     m_pPageTemplBox.clear();
-    m_pFtnCharAnchorTemplBox.clear();
-    m_pFtnCharTextTemplBox.clear();
+    m_pFootnoteCharAnchorTemplBox.clear();
+    m_pFootnoteCharTextTemplBox.clear();
     m_pContEdit.clear();
     m_pContFromEdit.clear();
     SfxTabPage::dispose();
@@ -147,7 +147,7 @@ void SwEndNoteOptionPage::dispose()
 void SwEndNoteOptionPage::Reset( const SfxItemSet* )
 {
     boost::scoped_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo( pSh->GetEndNoteInfo() )
-                                          : new SwFtnInfo( pSh->GetFtnInfo() ));
+                                          : new SwFootnoteInfo( pSh->GetFootnoteInfo() ));
     SfxObjectShell * pDocSh = SfxObjectShell::Current();
 
     if (PTR_CAST(SwWebDocShell, pDocSh))
@@ -159,7 +159,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
     }
     else
     {
-        const SwFtnInfo &rInf = pSh->GetFtnInfo();
+        const SwFootnoteInfo &rInf = pSh->GetFootnoteInfo();
         // set position (page, chapter)
         if ( rInf.ePos == FTNPOS_PAGE )
         {
@@ -184,19 +184,19 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
 
         // numbering
         // art
-    m_pNumViewBox->SelectNumberingType( pInf->aFmt.GetNumberingType());
-    m_pOffsetFld->SetValue(pInf->nFtnOffset + 1);
+    m_pNumViewBox->SelectNumberingType( pInf->aFormat.GetNumberingType());
+    m_pOffsetField->SetValue(pInf->nFootnoteOffset + 1);
     m_pPrefixED->SetText(pInf->GetPrefix().replaceAll("\t", "\\t")); // fdo#65666
     m_pSuffixED->SetText(pInf->GetSuffix().replaceAll("\t", "\\t"));
 
-    const SwCharFmt* pCharFmt = pInf->GetCharFmt(
+    const SwCharFormat* pCharFormat = pInf->GetCharFormat(
                         *pSh->GetView().GetDocShell()->GetDoc());
-    m_pFtnCharTextTemplBox->SelectEntry(pCharFmt->GetName());
-    m_pFtnCharTextTemplBox->SaveValue();
+    m_pFootnoteCharTextTemplBox->SelectEntry(pCharFormat->GetName());
+    m_pFootnoteCharTextTemplBox->SaveValue();
 
-    pCharFmt = pInf->GetAnchorCharFmt( *pSh->GetDoc() );
-    m_pFtnCharAnchorTemplBox->SelectEntry( pCharFmt->GetName() );
-    m_pFtnCharAnchorTemplBox->SaveValue();
+    pCharFormat = pInf->GetAnchorCharFormat( *pSh->GetDoc() );
+    m_pFootnoteCharAnchorTemplBox->SelectEntry( pCharFormat->GetName() );
+    m_pFootnoteCharAnchorTemplBox->SaveValue();
 
         // styles   special regions
         // paragraph
@@ -215,7 +215,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
     if(LISTBOX_ENTRY_NOTFOUND == m_pParaTemplBox->GetEntryPos( sStr ) )
         m_pParaTemplBox->InsertEntry( sStr );
 
-    SwTxtFmtColl* pColl = pInf->GetFtnTxtColl();
+    SwTextFormatColl* pColl = pInf->GetFootnoteTextColl();
     if( !pColl )
         m_pParaTemplBox->SelectEntry( sStr );      // Default
     else
@@ -286,12 +286,12 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
 {
     pSh = &rShell;
     // collect character templates
-    m_pFtnCharTextTemplBox->Clear();
-    m_pFtnCharAnchorTemplBox->Clear();
-    ::FillCharStyleListBox(*m_pFtnCharTextTemplBox,
+    m_pFootnoteCharTextTemplBox->Clear();
+    m_pFootnoteCharAnchorTemplBox->Clear();
+    ::FillCharStyleListBox(*m_pFootnoteCharTextTemplBox,
                         pSh->GetView().GetDocShell());
 
-    ::FillCharStyleListBox(*m_pFtnCharAnchorTemplBox,
+    ::FillCharStyleListBox(*m_pFootnoteCharAnchorTemplBox,
                         pSh->GetView().GetDocShell());
 }
 
@@ -299,7 +299,7 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
 // all kinds of numbering can be used.
 IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl)
 {
-    const SwFtnNum eNum = (const SwFtnNum)GetNumbering();
+    const SwFootnoteNum eNum = (const SwFootnoteNum)GetNumbering();
     bPosDoc = false;
     if(LISTBOX_ENTRY_NOTFOUND == m_pNumCountBox->GetEntryPos(aNumPage))
     {
@@ -319,10 +319,10 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl)
     if( m_pNumCountBox->GetEntryCount() - 1 != m_pNumCountBox->GetSelectEntryPos() )
     {
         bEnable = false;
-        m_pOffsetFld->SetValue(1);
+        m_pOffsetField->SetValue(1);
     }
     m_pOffsetLbl->Enable(bEnable);
-    m_pOffsetFld->Enable(bEnable);
+    m_pOffsetField->Enable(bEnable);
     return 0;
 }
 
@@ -341,53 +341,53 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, PosChapterHdl)
     return 0;
 }
 
-static SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFmtName )
+static SwCharFormat* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFormatName )
 {
-    SwCharFmt* pFmt = 0;
-    const sal_uInt16 nChCount = pSh->GetCharFmtCount();
+    SwCharFormat* pFormat = 0;
+    const sal_uInt16 nChCount = pSh->GetCharFormatCount();
     for(sal_uInt16 i = 0; i< nChCount; i++)
     {
-        SwCharFmt& rChFmt = pSh->GetCharFmt(i);
-        if(rChFmt.GetName() == rCharFmtName )
+        SwCharFormat& rChFormat = pSh->GetCharFormat(i);
+        if(rChFormat.GetName() == rCharFormatName )
         {
-            pFmt = &rChFmt;
+            pFormat = &rChFormat;
             break;
         }
     }
-    if(!pFmt)
+    if(!pFormat)
     {
         SfxStyleSheetBasePool* pPool = pSh->GetView().GetDocShell()->GetStyleSheetPool();
         SfxStyleSheetBase* pBase;
-        pBase = pPool->Find(rCharFmtName, SFX_STYLE_FAMILY_CHAR);
+        pBase = pPool->Find(rCharFormatName, SFX_STYLE_FAMILY_CHAR);
         if(!pBase)
-            pBase = &pPool->Make(rCharFmtName, SFX_STYLE_FAMILY_CHAR);
-        pFmt = static_cast<SwDocStyleSheet*>(pBase)->GetCharFmt();
+            pBase = &pPool->Make(rCharFormatName, SFX_STYLE_FAMILY_CHAR);
+        pFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat();
     }
-    return pFmt;
+    return pFormat;
 }
 
 bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * )
 {
-    boost::scoped_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFtnInfo());
+    boost::scoped_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFootnoteInfo());
 
-    pInf->nFtnOffset = static_cast< sal_uInt16 >(m_pOffsetFld->GetValue() -1);
-    pInf->aFmt.SetNumberingType(m_pNumViewBox->GetSelectedNumberingType() );
+    pInf->nFootnoteOffset = static_cast< sal_uInt16 >(m_pOffsetField->GetValue() -1);
+    pInf->aFormat.SetNumberingType(m_pNumViewBox->GetSelectedNumberingType() );
     pInf->SetPrefix(m_pPrefixED->GetText().replaceAll("\\t", "\t"));
     pInf->SetSuffix(m_pSuffixED->GetText().replaceAll("\\t", "\t"));
 
-    pInf->SetCharFmt( lcl_GetCharFormat( pSh,
-                        m_pFtnCharTextTemplBox->GetSelectEntry() ) );
-    pInf->SetAnchorCharFmt( lcl_GetCharFormat( pSh,
-                        m_pFtnCharAnchorTemplBox->GetSelectEntry() ) );
+    pInf->SetCharFormat( lcl_GetCharFormat( pSh,
+                        m_pFootnoteCharTextTemplBox->GetSelectEntry() ) );
+    pInf->SetAnchorCharFormat( lcl_GetCharFormat( pSh,
+                        m_pFootnoteCharAnchorTemplBox->GetSelectEntry() ) );
 
     // paragraph template
     sal_Int32 nPos = m_pParaTemplBox->GetSelectEntryPos();
     if(LISTBOX_ENTRY_NOTFOUND != nPos)
     {
-        const OUString aFmtName( m_pParaTemplBox->GetSelectEntry() );
-        SwTxtFmtColl *pColl = pSh->GetParaStyle(aFmtName, SwWrtShell::GETSTYLE_CREATEANY);
+        const OUString aFormatName( m_pParaTemplBox->GetSelectEntry() );
+        SwTextFormatColl *pColl = pSh->GetParaStyle(aFormatName, SwWrtShell::GETSTYLE_CREATEANY);
         OSL_ENSURE(pColl, "paragraph style not found");
-        pInf->SetFtnTxtColl(*pColl);
+        pInf->SetFootnoteTextColl(*pColl);
     }
 
     // page template
@@ -401,13 +401,13 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * )
     }
     else
     {
-        SwFtnInfo *pI = static_cast<SwFtnInfo*>(pInf.get());
+        SwFootnoteInfo *pI = static_cast<SwFootnoteInfo*>(pInf.get());
         pI->ePos = m_pPosPageBox->IsChecked() ? FTNPOS_PAGE : FTNPOS_CHAPTER;
-        pI->eNum = (SwFtnNum)GetNumbering();
+        pI->eNum = (SwFootnoteNum)GetNumbering();
         pI->aQuoVadis = m_pContEdit->GetText();
         pI->aErgoSum = m_pContFromEdit->GetText();
-        if ( !(*pI == pSh->GetFtnInfo()) )
-            pSh->SetFtnInfo( *pI );
+        if ( !(*pI == pSh->GetFootnoteInfo()) )
+            pSh->SetFootnoteInfo( *pI );
     }
     return true;
 }
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index d00a14a2aa9e..d82a5c11e397 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -565,10 +565,10 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
         if ( pMacroDlg && pMacroDlg->Execute() == RET_OK &&
             SfxItemState::SET == pMacroDlg->GetOutputItemSet()->GetItemState( RES_FRMMACRO, false, &pItem ) )
         {
-            const SvxMacroTableDtor& rTbl = static_cast<const SvxMacroItem*>(pItem)->GetMacroTable();
+            const SvxMacroTableDtor& rTable = static_cast<const SvxMacroItem*>(pItem)->GetMacroTable();
             pGlossaryHdl->SetMacros( m_pShortNameEdit->GetText(),
-                                        rTbl.Get( SW_EVENT_START_INS_GLOSSARY ),
-                                        rTbl.Get( SW_EVENT_END_INS_GLOSSARY ) );
+                                        rTable.Get( SW_EVENT_START_INS_GLOSSARY ),
+                                        rTable.Get( SW_EVENT_END_INS_GLOSSARY ) );
         }
     }
     else if (sItemIdent == "import")
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 31b5f8a920d0..8d291d0c6794 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -32,7 +32,7 @@ class SwEndNoteOptionPage : public SfxTabPage
 {
     VclPtr<SwNumberingTypeListBox> m_pNumViewBox;
     VclPtr<FixedText> m_pOffsetLbl;
-    VclPtr<NumericField> m_pOffsetFld;
+    VclPtr<NumericField> m_pOffsetField;
     VclPtr<ListBox> m_pNumCountBox;
     VclPtr<Edit> m_pPrefixED;
     VclPtr<Edit> m_pSuffixED;
@@ -46,8 +46,8 @@ class SwEndNoteOptionPage : public SfxTabPage
     VclPtr<FixedText> m_pPageTemplLbl;
     VclPtr<ListBox> m_pPageTemplBox;
 
-    VclPtr<ListBox> m_pFtnCharAnchorTemplBox;
-    VclPtr<ListBox> m_pFtnCharTextTemplBox;
+    VclPtr<ListBox> m_pFootnoteCharAnchorTemplBox;
+    VclPtr<ListBox> m_pFootnoteCharTextTemplBox;
 
     VclPtr<Edit> m_pContEdit;
     VclPtr<Edit> m_pContFromEdit;
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index d3f3c086fddb..e105ca13355d 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -54,10 +54,10 @@ void SwInsFootNoteDlg::Apply()
         rSh.StartAction();
         rSh.Left(CRSR_SKIP_CHARS, false, 1, false );
         rSh.StartUndo( UNDO_START );
-        SwFmtFtn aNote( m_pEndNoteBtn->IsChecked() );
+        SwFormatFootnote aNote( m_pEndNoteBtn->IsChecked() );
         aNote.SetNumStr( aStr );
 
-        if( rSh.SetCurFtn( aNote ) && bExtCharAvailable )
+        if( rSh.SetCurFootnote( aNote ) && bExtCharAvailable )
         {
             rSh.Right(CRSR_SKIP_CHARS, true, 1, false );
             SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
@@ -79,7 +79,7 @@ void SwInsFootNoteDlg::Apply()
 
     }
 
-    bFootnote = m_pFtnBtn->IsChecked();
+    bFootnote = m_pFootnoteBtn->IsChecked();
 }
 
 IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberCharHdl)
@@ -151,9 +151,9 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn )
     // go to the next foot/endnote here
     rSh.ResetSelect(0, false);
     if (pBtn == m_pNextBT)
-        rSh.GotoNextFtnAnchor();
+        rSh.GotoNextFootnoteAnchor();
     else
-        rSh.GotoPrevFtnAnchor();
+        rSh.GotoPrevFootnoteAnchor();
 
     Init();
 
@@ -172,7 +172,7 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(vcl::Window *pParent, SwWrtShell &rShell, boo
     get(m_pNumberCharBtn, "character");
     get(m_pNumberCharEdit, "characterentry");
     get(m_pNumberExtChar, "choosecharacter");
-    get(m_pFtnBtn, "footnote");
+    get(m_pFootnoteBtn, "footnote");
     get(m_pEndNoteBtn, "endnote");
     get(m_pOkBtn, "ok");
     get(m_pPrevBT, "prev");
@@ -216,7 +216,7 @@ void SwInsFootNoteDlg::dispose()
     m_pNumberCharBtn.clear();
     m_pNumberCharEdit.clear();
     m_pNumberExtChar.clear();
-    m_pFtnBtn.clear();
+    m_pFootnoteBtn.clear();
     m_pEndNoteBtn.clear();
     m_pOkBtn.clear();
     m_pPrevBT.clear();
@@ -226,18 +226,18 @@ void SwInsFootNoteDlg::dispose()
 
 void SwInsFootNoteDlg::Init()
 {
-    SwFmtFtn aFtnNote;
+    SwFormatFootnote aFootnoteNote;
     OUString sNumStr;
     vcl::Font aFont;
     bExtCharAvailable = false;
 
     rSh.StartAction();
 
-    if( rSh.GetCurFtn( &aFtnNote ))
+    if( rSh.GetCurFootnote( &aFootnoteNote ))
     {
-        if (!aFtnNote.GetNumStr().isEmpty())
+        if (!aFootnoteNote.GetNumStr().isEmpty())
         {
-            sNumStr = aFtnNote.GetNumStr();
+            sNumStr = aFootnoteNote.GetNumStr();
 
             rSh.Right(CRSR_SKIP_CHARS, true, 1, false );
             SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
@@ -252,7 +252,7 @@ void SwInsFootNoteDlg::Init()
             bExtCharAvailable = true;
             rSh.Left( CRSR_SKIP_CHARS, false, 1, false );
         }
-        bFootnote = !aFtnNote.IsEndNote();
+        bFootnote = !aFootnoteNote.IsEndNote();
     }
     m_pNumberCharEdit->SetFont(aFont);
 
@@ -265,19 +265,19 @@ void SwInsFootNoteDlg::Init()
         m_pNumberCharEdit->GrabFocus();
 
     if (bFootnote)
-        m_pFtnBtn->Check();
+        m_pFootnoteBtn->Check();
     else
         m_pEndNoteBtn->Check();
 
-    bool bNext = rSh.GotoNextFtnAnchor();
+    bool bNext = rSh.GotoNextFootnoteAnchor();
 
     if (bNext)
-        rSh.GotoPrevFtnAnchor();
+        rSh.GotoPrevFootnoteAnchor();
 
-    bool bPrev = rSh.GotoPrevFtnAnchor();
+    bool bPrev = rSh.GotoPrevFootnoteAnchor();
 
     if (bPrev)
-        rSh.GotoNextFtnAnchor();
+        rSh.GotoNextFootnoteAnchor();
 
     m_pPrevBT->Enable(bPrev);
     m_pNextBT->Enable(bNext);
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index b14903c9e170..7523cac8d503 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -53,9 +53,9 @@ static void lcl_setLineNumbering(const OUString& rName, SwWrtShell* pSh, bool bL
     if(!xStyleSheet.is())
         return;
     SfxItemSet& rSet = xStyleSheet->GetItemSet();
-    SwFmtLineNumber aFmt;
-    aFmt.SetCountLines(bLineNumber);
-    rSet.Put(aFmt);
+    SwFormatLineNumber aFormat;
+    aFormat.SetCountLines(bLineNumber);
+    rSet.Put(aFormat);
     xStyleSheet->MergeIndentAttrsOfListStyle( rSet );
     xStyleSheet->SetItemSet(rSet, false);
 }
@@ -101,7 +101,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
     const SwLineNumberInfo &rInf = pSh->GetLineNumberInfo();
     IDocumentStylePoolAccess* pIDSPA = pSh->getIDocumentStylePoolAccess();
 
-    OUString sStyleName(rInf.GetCharFmt( *pIDSPA )->GetName());
+    OUString sStyleName(rInf.GetCharFormat( *pIDSPA )->GetName());
     const sal_Int32 nPos = m_pCharStyleLB->GetEntryPos(sStyleName);
 
     if (nPos != LISTBOX_ENTRY_NOTFOUND)
@@ -116,9 +116,9 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
     }
 
     // format
-    sal_uInt16 nSelFmt = rInf.GetNumType().GetNumberingType();
+    sal_uInt16 nSelFormat = rInf.GetNumType().GetNumberingType();
 
-    m_pFormatLB->SelectNumberingType(nSelFmt);
+    m_pFormatLB->SelectNumberingType(nSelFormat);
 
     // position
     m_pPosLB->SelectEntryPos((sal_Int32)rInf.GetPos());
@@ -151,8 +151,8 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
     if(xStyleSheet.is())
     {
         SfxItemSet& rSet = xStyleSheet->GetItemSet();
-        const SwFmtLineNumber &aFmt = static_cast<const SwFmtLineNumber&>(rSet.Get(RES_LINENUMBER));
-        if(aFmt.IsCount())
+        const SwFormatLineNumber &aFormat = static_cast<const SwFormatLineNumber&>(rSet.Get(RES_LINENUMBER));
+        if(aFormat.IsCount())
             m_pNumberingOnFooterHeader->SetState(TRISTATE_TRUE);
         else
             m_pNumberingOnFooterHeader->SetState(TRISTATE_FALSE);
@@ -198,21 +198,21 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl)
     SwLineNumberInfo aInf(pSh->GetLineNumberInfo());
 
     // char styles
-    OUString sCharFmtName(m_pCharStyleLB->GetSelectEntry());
-    SwCharFmt *pCharFmt = pSh->FindCharFmtByName(sCharFmtName);
+    OUString sCharFormatName(m_pCharStyleLB->GetSelectEntry());
+    SwCharFormat *pCharFormat = pSh->FindCharFormatByName(sCharFormatName);
 
-    if (!pCharFmt)
+    if (!pCharFormat)
     {
         SfxStyleSheetBasePool* pPool = pSh->GetView().GetDocShell()->GetStyleSheetPool();
         SfxStyleSheetBase* pBase;
-        pBase = pPool->Find(sCharFmtName, SFX_STYLE_FAMILY_CHAR);
+        pBase = pPool->Find(sCharFormatName, SFX_STYLE_FAMILY_CHAR);
         if(!pBase)
-            pBase = &pPool->Make(sCharFmtName, SFX_STYLE_FAMILY_CHAR);
-        pCharFmt = static_cast<SwDocStyleSheet*>(pBase)->GetCharFmt();
+            pBase = &pPool->Make(sCharFormatName, SFX_STYLE_FAMILY_CHAR);
+        pCharFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat();
     }
 
-    if (pCharFmt)
-        aInf.SetCharFmt(pCharFmt);
+    if (pCharFormat)
+        aInf.SetCharFormat(pCharFormat);
 
     // format
     SvxNumberType aType;
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 0cd2f805018c..783cdf2bdf8e 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -220,13 +220,13 @@ void SwNumPositionTabPage::InitControls()
     bool bSameAlignAt = bLabelAlignmentPosAndSpaceModeActive;
     bool bSameIndentAt = bLabelAlignmentPosAndSpaceModeActive;
 
-    const SwNumFmt* aNumFmtArr[MAXLEVEL];
+    const SwNumFormat* aNumFormatArr[MAXLEVEL];
     sal_uInt16 nMask = 1;
     sal_uInt16 nLvl = USHRT_MAX;
     long nFirstBorderTextRelative = -1;
     for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
     {
-        aNumFmtArr[i] = &pActNum->Get(i);
+        aNumFormatArr[i] = &pActNum->Get(i);
         if(nActNumLvl & nMask)
         {
             if(USHRT_MAX == nLvl)
@@ -236,14 +236,14 @@ void SwNumPositionTabPage::InitControls()
 
             if( i > nLvl)
             {
-                bSameAdjust &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust();
+                bSameAdjust &= aNumFormatArr[i]->GetNumAdjust() == aNumFormatArr[nLvl]->GetNumAdjust();
                 if ( !bLabelAlignmentPosAndSpaceModeActive )
                 {
                     if(bRelative)
                     {
                         const long nBorderTextRelative =
-                            aNumFmtArr[i]->GetAbsLSpace() + aNumFmtArr[i]->GetFirstLineOffset() -
-                            aNumFmtArr[i - 1]->GetAbsLSpace() + aNumFmtArr[i - 1]->GetFirstLineOffset();
+                            aNumFormatArr[i]->GetAbsLSpace() + aNumFormatArr[i]->GetFirstLineOffset() -
+                            aNumFormatArr[i - 1]->GetAbsLSpace() + aNumFormatArr[i - 1]->GetFirstLineOffset();
                         if (nFirstBorderTextRelative == -1)
                             nFirstBorderTextRelative = nBorderTextRelative;
                         else
@@ -252,24 +252,24 @@ void SwNumPositionTabPage::InitControls()
                     else
                     {
                         bSameDistBorderNum &=
-                        aNumFmtArr[i]->GetAbsLSpace() - aNumFmtArr[i]->GetFirstLineOffset() ==
-                        aNumFmtArr[i - 1]->GetAbsLSpace() - aNumFmtArr[i - 1]->GetFirstLineOffset();
+                        aNumFormatArr[i]->GetAbsLSpace() - aNumFormatArr[i]->GetFirstLineOffset() ==
+                        aNumFormatArr[i - 1]->GetAbsLSpace() - aNumFormatArr[i - 1]->GetFirstLineOffset();
                     }
 
-                    bSameDist       &= aNumFmtArr[i]->GetCharTextDistance() == aNumFmtArr[nLvl]->GetCharTextDistance();
-                    bSameIndent     &= aNumFmtArr[i]->GetFirstLineOffset() == aNumFmtArr[nLvl]->GetFirstLineOffset();
+                    bSameDist       &= aNumFormatArr[i]->GetCharTextDistance() == aNumFormatArr[nLvl]->GetCharTextDistance();
+                    bSameIndent     &= aNumFormatArr[i]->GetFirstLineOffset() == aNumFormatArr[nLvl]->GetFirstLineOffset();
                 }
                 else
                 {
                     bSameLabelFollowedBy &=
-                        aNumFmtArr[i]->GetLabelFollowedBy() == aNumFmtArr[nLvl]->GetLabelFollowedBy();
+                        aNumFormatArr[i]->GetLabelFollowedBy() == aNumFormatArr[nLvl]->GetLabelFollowedBy();
                     bSameListtab &=
-                        aNumFmtArr[i]->GetListtabPos() == aNumFmtArr[nLvl]->GetListtabPos();
+                        aNumFormatArr[i]->GetListtabPos() == aNumFormatArr[nLvl]->GetListtabPos();
                     bSameAlignAt &=
-                        ( ( aNumFmtArr[i]->GetIndentAt() + aNumFmtArr[i]->GetFirstLineIndent() )
-                            == ( aNumFmtArr[nLvl]->GetIndentAt() + aNumFmtArr[nLvl]->GetFirstLineIndent() ) );
+                        ( ( aNumFormatArr[i]->GetIndentAt() + aNumFormatArr[i]->GetFirstLineIndent() )
+                            == ( aNumFormatArr[nLvl]->GetIndentAt() + aNumFormatArr[nLvl]->GetFirstLineIndent() ) );
                     bSameIndentAt &=
-                        aNumFmtArr[i]->GetIndentAt() == aNumFmtArr[nLvl]->GetIndentAt();
+                        aNumFormatArr[i]->GetIndentAt() == aNumFormatArr[nLvl]->GetIndentAt();
                 }
             }
         }
@@ -286,13 +286,13 @@ void SwNumPositionTabPage::InitControls()
         long nDistBorderNum;
         if(bRelative)
         {
-            nDistBorderNum = (long)aNumFmtArr[nLvl]->GetAbsLSpace()+ aNumFmtArr[nLvl]->GetFirstLineOffset();
+            nDistBorderNum = (long)aNumFormatArr[nLvl]->GetAbsLSpace()+ aNumFormatArr[nLvl]->GetFirstLineOffset();
             if(nLvl)
-                nDistBorderNum -= (long)aNumFmtArr[nLvl - 1]->GetAbsLSpace()+ aNumFmtArr[nLvl - 1]->GetFirstLineOffset();
+                nDistBorderNum -= (long)aNumFormatArr[nLvl - 1]->GetAbsLSpace()+ aNumFormatArr[nLvl - 1]->GetFirstLineOffset();
         }
         else
         {
-            nDistBorderNum = (long)aNumFmtArr[nLvl]->GetAbsLSpace()+ aNumFmtArr[nLvl]->GetFirstLineOffset();
+            nDistBorderNum = (long)aNumFormatArr[nLvl]->GetAbsLSpace()+ aNumFormatArr[nLvl]->GetFirstLineOffset();
         }
         m_pDistBorderMF->SetValue(m_pDistBorderMF->Normalize(nDistBorderNum),FUNIT_TWIP);
     }
@@ -300,20 +300,20 @@ void SwNumPositionTabPage::InitControls()
         bSetDistEmpty = true;
 
     if(bSameDist)
-        m_pDistNumMF->SetValue(m_pDistNumMF->Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP);
+        m_pDistNumMF->SetValue(m_pDistNumMF->Normalize(aNumFormatArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP);
     else
         m_pDistNumMF->SetText(aEmptyOUStr);
     if(bSameIndent)
-        m_pIndentMF->SetValue(m_pIndentMF->Normalize(-aNumFmtArr[nLvl]->GetFirstLineOffset()), FUNIT_TWIP);
+        m_pIndentMF->SetValue(m_pIndentMF->Normalize(-aNumFormatArr[nLvl]->GetFirstLineOffset()), FUNIT_TWIP);
     else
         m_pIndentMF->SetText(aEmptyOUStr);
 
     if(bSameAdjust)
     {
         sal_Int32 nPos = 1; // centered
-        if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_LEFT)
+        if(aNumFormatArr[nLvl]->GetNumAdjust() == SVX_ADJUST_LEFT)
             nPos = 0;
-        else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
+        else if(aNumFormatArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
             nPos = 2;
         m_pAlignLB->SelectEntryPos(nPos);
         m_pAlign2LB->SelectEntryPos( nPos );
@@ -327,11 +327,11 @@ void SwNumPositionTabPage::InitControls()
     if ( bSameLabelFollowedBy )
     {
         sal_Int32 nPos = 0; // LISTTAB
-        if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::SPACE )
+        if ( aNumFormatArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::SPACE )
         {
             nPos = 1;
         }
-        else if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::NOTHING )
+        else if ( aNumFormatArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::NOTHING )
         {
             nPos = 2;
         }
@@ -342,13 +342,13 @@ void SwNumPositionTabPage::InitControls()
         m_pLabelFollowedByLB->SetNoSelection();
     }
 
-    if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
+    if ( aNumFormatArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
     {
         m_pListtabFT->Enable( true );
         m_pListtabMF->Enable( true );
         if ( bSameListtab )
         {
-            m_pListtabMF->SetValue(m_pListtabMF->Normalize(aNumFmtArr[nLvl]->GetListtabPos()),FUNIT_TWIP);
+            m_pListtabMF->SetValue(m_pListtabMF->Normalize(aNumFormatArr[nLvl]->GetListtabPos()),FUNIT_TWIP);
         }
         else
         {
@@ -365,8 +365,8 @@ void SwNumPositionTabPage::InitControls()
     if ( bSameAlignAt )
     {
         m_pAlignedAtMF->SetValue(
-            m_pAlignedAtMF->Normalize( aNumFmtArr[nLvl]->GetIndentAt() +
-                                    aNumFmtArr[nLvl]->GetFirstLineIndent()),
+            m_pAlignedAtMF->Normalize( aNumFormatArr[nLvl]->GetIndentAt() +
+                                    aNumFormatArr[nLvl]->GetFirstLineIndent()),
             FUNIT_TWIP );
     }
     else
@@ -377,7 +377,7 @@ void SwNumPositionTabPage::InitControls()
     if ( bSameIndentAt )
     {
         m_pIndentAtMF->SetValue(
-            m_pIndentAtMF->Normalize( aNumFmtArr[nLvl]->GetIndentAt()), FUNIT_TWIP );
+            m_pIndentAtMF->Normalize( aNumFormatArr[nLvl]->GetIndentAt()), FUNIT_TWIP );
     }
     else
     {
@@ -400,7 +400,7 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& )
     {
         bPreset = static_cast<const SfxBoolItem*>(pItem)->GetValue();
     }
-    bModified = (!pActNum->GetNumFmt( 0 ) || bPreset);
+    bModified = (!pActNum->GetNumFormat( 0 ) || bPreset);
     if(*pActNum != *pSaveNum ||
         nActNumLvl != nTmpNumLvl )
     {
@@ -504,8 +504,8 @@ void SwNumPositionTabPage::InitPosAndSpaceMode()
     {
         if(nActNumLvl & nMask)
         {
-            SvxNumberFormat aNumFmt( pActNum->Get(i) );
-            ePosAndSpaceMode = aNumFmt.GetPositionAndSpaceMode();
+            SvxNumberFormat aNumFormat( pActNum->Get(i) );
+            ePosAndSpaceMode = aNumFormat.GetPositionAndSpaceMode();
             if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
             {
                 break;
@@ -595,7 +595,7 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl)
     {
         if(nActNumLvl & nMask)
         {
-            SwNumFmt aNumFmt(pActNum->Get(i));
+            SwNumFormat aNumFormat(pActNum->Get(i));
 
             const sal_Int32 nPos = m_pAlignLB->IsVisible()
                                 ? m_pAlignLB->GetSelectEntryPos()
@@ -605,8 +605,8 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl)
                 eAdjust = SVX_ADJUST_LEFT;
             else if(nPos == 2)
                 eAdjust = SVX_ADJUST_RIGHT;
-            aNumFmt.SetNumAdjust( eAdjust );
-            pActNum->Set(i, aNumFmt);
+            aNumFormat.SetNumAdjust( eAdjust );
+            pActNum->Set(i, aNumFormat);
         }
         nMask <<= 1;
     }
@@ -660,26 +660,26 @@ IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox *, pBox )
     return 0;
 }
 
-IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
+IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pField )
 {
     if(bInInintControl)
         return 0;
-    long nValue = static_cast< long >(pFld->Denormalize(pFld->GetValue(FUNIT_TWIP)));
+    long nValue = static_cast< long >(pField->Denormalize(pField->GetValue(FUNIT_TWIP)));
     sal_uInt16 nMask = 1;
     for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
     {
         if(nActNumLvl & nMask)
         {
-            SwNumFmt aNumFmt( pActNum->Get( i ) );
-            if(pFld == m_pDistBorderMF)
+            SwNumFormat aNumFormat( pActNum->Get( i ) );
+            if(pField == m_pDistBorderMF)
             {
 
                 if(m_pRelativeCB->IsChecked() && m_pRelativeCB->IsEnabled())
                 {
                     if(0 == i)
                     {
-                        long nTmp = aNumFmt.GetFirstLineOffset();
-                        aNumFmt.SetAbsLSpace( nValue - nTmp );
+                        long nTmp = aNumFormat.GetFirstLineOffset();
+                        aNumFormat.SetAbsLSpace( nValue - nTmp );
                     }
                     else
                     {
@@ -687,28 +687,28 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
                                     pActNum->Get( i - 1 ).GetFirstLineOffset() -
                                     pActNum->Get( i ).GetFirstLineOffset();
 
-                        aNumFmt.SetAbsLSpace( nValue + nTmp );
+                        aNumFormat.SetAbsLSpace( nValue + nTmp );
                     }
                 }
                 else
                 {
-                    aNumFmt.SetAbsLSpace( (short)nValue - aNumFmt.GetFirstLineOffset());
+                    aNumFormat.SetAbsLSpace( (short)nValue - aNumFormat.GetFirstLineOffset());
                 }
             }
-            else if (pFld == m_pDistNumMF)
+            else if (pField == m_pDistNumMF)
             {
-                aNumFmt.SetCharTextDistance( nValue );
+                aNumFormat.SetCharTextDistance( nValue );
             }
-            else if (pFld == m_pIndentMF)
+            else if (pField == m_pIndentMF)
             {
                 // now AbsLSpace also has to be modified by FirstLineOffset
-                long nDiff = nValue + aNumFmt.GetFirstLineOffset();
-                long nAbsLSpace = aNumFmt.GetAbsLSpace();
-                aNumFmt.SetAbsLSpace( nAbsLSpace + nDiff );
-                aNumFmt.SetFirstLineOffset( -nValue );
+                long nDiff = nValue + aNumFormat.GetFirstLineOffset();
+                long nAbsLSpace = aNumFormat.GetAbsLSpace();
+                aNumFormat.SetAbsLSpace( nAbsLSpace + nDiff );
+                aNumFormat.SetFirstLineOffset( -nValue );
             }
 
-            pActNum->Set( i, aNumFmt );
+            pActNum->Set( i, aNumFormat );
         }
         nMask <<= 1;
     }
@@ -735,15 +735,15 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
         {
             if(nActNumLvl & nMask)
             {
-                const SwNumFmt &rNumFmt = pActNum->Get(i);
+                const SwNumFormat &rNumFormat = pActNum->Get(i);
                 if(bFirst)
                 {
-                    nValue = rNumFmt.GetAbsLSpace();
+                    nValue = rNumFormat.GetAbsLSpace();
                     if(bOn && i)
                         nValue -= pActNum->Get(i - 1).GetAbsLSpace();
                 }
                 else
-                    bSetValue = nValue == rNumFmt.GetAbsLSpace() - pActNum->Get(i - 1).GetAbsLSpace();
+                    bSetValue = nValue == rNumFormat.GetAbsLSpace() - pActNum->Get(i - 1).GetAbsLSpace();
                 bFirst = false;
             }
             nMask <<= 1;
@@ -783,9 +783,9 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl)
     {
         if ( nActNumLvl & nMask )
         {
-            SwNumFmt aNumFmt( pActNum->Get(i) );
-            aNumFmt.SetLabelFollowedBy( eLabelFollowedBy );
-            pActNum->Set( i, aNumFmt );
+            SwNumFormat aNumFormat( pActNum->Get(i) );
+            aNumFormat.SetLabelFollowedBy( eLabelFollowedBy );
+            pActNum->Set( i, aNumFormat );
 
             if ( nFirstLvl == USHRT_MAX )
             {
@@ -793,7 +793,7 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl)
             }
             else
             {
-                bSameListtabPos &= aNumFmt.GetListtabPos() ==
+                bSameListtabPos &= aNumFormat.GetListtabPos() ==
                         pActNum->Get( nFirstLvl ).GetListtabPos();
             }
         }
@@ -820,10 +820,10 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl)
     return 0;
 }
 
-IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld )
+IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pField )
 {
     // determine value to be set at the chosen list levels
-    const long nValue = static_cast< long >(pFld->Denormalize(pFld->GetValue(FUNIT_TWIP)));
+    const long nValue = static_cast< long >(pField->Denormalize(pField->GetValue(FUNIT_TWIP)));
 
     // set value at the chosen list levels
     sal_uInt16 nMask = 1;
@@ -831,9 +831,9 @@ IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld )
     {
         if ( nActNumLvl & nMask )
         {
-            SwNumFmt aNumFmt( pActNum->Get(i) );
-            aNumFmt.SetListtabPos( nValue );
-            pActNum->Set( i, aNumFmt );
+            SwNumFormat aNumFormat( pActNum->Get(i) );
+            aNumFormat.SetListtabPos( nValue );
+            pActNum->Set( i, aNumFormat );
         }
         nMask <<= 1;
     }
@@ -843,10 +843,10 @@ IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld )
     return 0;
 }
 
-IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld )
+IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pField )
 {
     // determine value to be set at the chosen list levels
-    const long nValue = static_cast< long >(pFld->Denormalize(pFld->GetValue(FUNIT_TWIP)));
+    const long nValue = static_cast< long >(pField->Denormalize(pField->GetValue(FUNIT_TWIP)));
 
     // set value at the chosen list levels
     sal_uInt16 nMask = 1;
@@ -854,10 +854,10 @@ IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld )
     {
         if ( nActNumLvl & nMask )
         {
-            SwNumFmt aNumFmt( pActNum->Get(i) );
-            const long nFirstLineIndent = nValue - aNumFmt.GetIndentAt();
-            aNumFmt.SetFirstLineIndent( nFirstLineIndent );
-            pActNum->Set( i, aNumFmt );
+            SwNumFormat aNumFormat( pActNum->Get(i) );
+            const long nFirstLineIndent = nValue - aNumFormat.GetIndentAt();
+            aNumFormat.SetFirstLineIndent( nFirstLineIndent );
+            pActNum->Set( i, aNumFormat );
         }
         nMask <<= 1;
     }
@@ -867,10 +867,10 @@ IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld )
     return 0;
 }
 
-IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld )
+IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pField )
 {
     // determine value to be set at the chosen list levels
-    const long nValue = static_cast< long >(pFld->Denormalize(pFld->GetValue(FUNIT_TWIP)));
+    const long nValue = static_cast< long >(pField->Denormalize(pField->GetValue(FUNIT_TWIP)));
 
     // set value at the chosen list levels
     sal_uInt16 nMask = 1;
@@ -878,13 +878,13 @@ IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld )
     {
         if ( nActNumLvl & nMask )
         {
-            SwNumFmt aNumFmt( pActNum->Get(i) );
-            const long nAlignedAt = aNumFmt.GetIndentAt() +
-                                    aNumFmt.GetFirstLineIndent();
-            aNumFmt.SetIndentAt( nValue );
+            SwNumFormat aNumFormat( pActNum->Get(i) );
+            const long nAlignedAt = aNumFormat.GetIndentAt() +
+                                    aNumFormat.GetFirstLineIndent();
+            aNumFormat.SetIndentAt( nValue );
             const long nNewFirstLineIndent = nAlignedAt - nValue;
-            aNumFmt.SetFirstLineIndent( nNewFirstLineIndent );
-            pActNum->Set( i, aNumFmt );
+            aNumFormat.SetFirstLineIndent( nNewFirstLineIndent );
+            pActNum->Set( i, aNumFormat );
         }
         nMask <<= 1;
     }
@@ -901,27 +901,27 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, StandardHdl)
     {
         if(nActNumLvl & nMask)
         {
-            SwNumFmt aNumFmt( pActNum->Get( i ) );
+            SwNumFormat aNumFormat( pActNum->Get( i ) );
             SwNumRule aTmpNumRule( pWrtSh->GetUniqueNumRuleName(),
-                                   aNumFmt.GetPositionAndSpaceMode(),
+                                   aNumFormat.GetPositionAndSpaceMode(),
                                    pOutlineDlg ? OUTLINE_RULE : NUM_RULE );
-            SwNumFmt aTempFmt(aTmpNumRule.Get( i ));
-            aNumFmt.SetPositionAndSpaceMode( aTempFmt.GetPositionAndSpaceMode() );
-            if ( aTempFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
+            SwNumFormat aTempFormat(aTmpNumRule.Get( i ));
+            aNumFormat.SetPositionAndSpaceMode( aTempFormat.GetPositionAndSpaceMode() );
+            if ( aTempFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
-                aNumFmt.SetAbsLSpace( aTempFmt.GetAbsLSpace());
-                aNumFmt.SetCharTextDistance( aTempFmt.GetCharTextDistance() );
-                aNumFmt.SetFirstLineOffset( aTempFmt.GetFirstLineOffset() );
+                aNumFormat.SetAbsLSpace( aTempFormat.GetAbsLSpace());
+                aNumFormat.SetCharTextDistance( aTempFormat.GetCharTextDistance() );
+                aNumFormat.SetFirstLineOffset( aTempFormat.GetFirstLineOffset() );
             }
-            else if ( aTempFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+            else if ( aTempFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
             {
-                aNumFmt.SetNumAdjust( aTempFmt.GetNumAdjust() );
-                aNumFmt.SetLabelFollowedBy( aTempFmt.GetLabelFollowedBy() );
-                aNumFmt.SetListtabPos( aTempFmt.GetListtabPos() );
-                aNumFmt.SetFirstLineIndent( aTempFmt.GetFirstLineIndent() );
-                aNumFmt.SetIndentAt( aTempFmt.GetIndentAt() );
+                aNumFormat.SetNumAdjust( aTempFormat.GetNumAdjust() );
+                aNumFormat.SetLabelFollowedBy( aTempFormat.GetLabelFollowedBy() );
+                aNumFormat.SetListtabPos( aTempFormat.GetListtabPos() );
+                aNumFormat.SetFirstLineIndent( aTempFormat.GetFirstLineIndent() );
+                aNumFormat.SetIndentAt( aTempFormat.GetIndentAt() );
             }
-            pActNum->Set( i, aNumFmt );
+            pActNum->Set( i, aNumFormat );
         }
         nMask <<= 1;
     }
@@ -967,38 +967,38 @@ SwSvxNumBulletTabDialog::~SwSvxNumBulletTabDialog()
 void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage)
 {
     // set styles' names and metric
-    OUString sNumCharFmt, sBulletCharFmt;
-    SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL, sNumCharFmt );
-    SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFmt );
+    OUString sNumCharFormat, sBulletCharFormat;
+    SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL, sNumCharFormat );
+    SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFormat );
 
     if (nPageId == m_nSingleNumPageId)
     {
         SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
-        aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
-        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+        aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFormat));
+        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFormat));
         rPage.PageCreated(aSet);
     }
     else if (nPageId == m_nBulletPageId)
     {
         SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
-        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFormat));
         rPage.PageCreated(aSet);
     }
     else if (nPageId == m_nOptionsPageId)
     {
         SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
-        aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
-        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+        aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFormat));
+        aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFormat));
         // collect char styles
-        ScopedVclPtrInstance< ListBox > rCharFmtLB(this);
-        rCharFmtLB->Clear();
-        rCharFmtLB->InsertEntry( SwViewShell::GetShellRes()->aStrNone );
+        ScopedVclPtrInstance< ListBox > rCharFormatLB(this);
+        rCharFormatLB->Clear();
+        rCharFormatLB->InsertEntry( SwViewShell::GetShellRes()->aStrNone );
         SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell();
-        ::FillCharStyleListBox(*rCharFmtLB.get(),  pDocShell);
+        ::FillCharStyleListBox(*rCharFormatLB.get(),  pDocShell);
 
         std::vector<OUString> aList;
-        for(sal_Int32 j = 0; j < rCharFmtLB->GetEntryCount(); j++)
-             aList.push_back( rCharFmtLB->GetEntry(j) );
+        for(sal_Int32 j = 0; j < rCharFormatLB->GetEntryCount(); j++)
+             aList.push_back( rCharFormatLB->GetEntry(j) );
 
         aSet.Put( SfxStringListItem( SID_CHAR_FMT_LIST_BOX,&aList ) ) ;
 
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 3b58a69de47d..59749f98a7c2 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -190,16 +190,16 @@ SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* p
     }
 
     // query the text templates' outlining levels
-    const sal_uInt16 nCount = rWrtSh.GetTxtFmtCollCount();
+    const sal_uInt16 nCount = rWrtSh.GetTextFormatCollCount();
     for(i = 0; i < nCount; ++i )
     {
-        SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i);
-        if(!rTxtColl.IsDefault())
+        SwTextFormatColl &rTextColl = rWrtSh.GetTextFormatColl(i);
+        if(!rTextColl.IsDefault())
         {
-            if(rTxtColl.IsAssignedToListLevelOfOutlineStyle())
+            if(rTextColl.IsAssignedToListLevelOfOutlineStyle())
             {
-                int nOutLevel = rTxtColl.GetAssignedOutlineStyleLevel();
-                aCollNames[ nOutLevel ] = rTxtColl.GetName();
+                int nOutLevel = rTextColl.GetAssignedOutlineStyleLevel();
+                aCollNames[ nOutLevel ] = rTextColl.GetName();
             }
         }
     }
@@ -325,11 +325,11 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu )
     return 0;
 }
 
-sal_uInt16  SwOutlineTabDialog::GetLevel(const OUString &rFmtName) const
+sal_uInt16  SwOutlineTabDialog::GetLevel(const OUString &rFormatName) const
 {
     for(sal_uInt16 i = 0; i < MAXLEVEL; ++i)
     {
-        if(aCollNames[i] == rFmtName)
+        if(aCollNames[i] == rFormatName)
             return i;
     }
     return MAXLEVEL;
@@ -348,36 +348,36 @@ short SwOutlineTabDialog::Ok()
 
     const SwNumRule * pOutlineRule = rWrtSh.GetOutlineNumRule();
 
-    sal_uInt16 i, nCount = rWrtSh.GetTxtFmtCollCount();
+    sal_uInt16 i, nCount = rWrtSh.GetTextFormatCollCount();
     for( i = 0; i < nCount; ++i )
     {
-        SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i);
-        if( !rTxtColl.IsDefault() )
+        SwTextFormatColl &rTextColl = rWrtSh.GetTextFormatColl(i);
+        if( !rTextColl.IsDefault() )
         {
             const SfxPoolItem & rItem =
-                rTxtColl.GetFmtAttr(RES_PARATR_NUMRULE, false);
+                rTextColl.GetFormatAttr(RES_PARATR_NUMRULE, false);
 
-           if ((sal_uInt8)GetLevel(rTxtColl.GetName()) == MAXLEVEL)
+           if ((sal_uInt8)GetLevel(rTextColl.GetName()) == MAXLEVEL)
             {
-                if(rTxtColl.IsAssignedToListLevelOfOutlineStyle())
+                if(rTextColl.IsAssignedToListLevelOfOutlineStyle())
                 {
-                    rTxtColl.DeleteAssignmentToListLevelOfOutlineStyle();
+                    rTextColl.DeleteAssignmentToListLevelOfOutlineStyle();
                 }
                 if (static_cast<const SwNumRuleItem &>(rItem).GetValue() ==
                     pOutlineRule->GetName())
                 {
-                    rTxtColl.ResetFmtAttr(RES_PARATR_NUMRULE);
+                    rTextColl.ResetFormatAttr(RES_PARATR_NUMRULE);
                 }
             }
             else
             {
-                rTxtColl.AssignToListLevelOfOutlineStyle(GetLevel(rTxtColl.GetName()));
+                rTextColl.AssignToListLevelOfOutlineStyle(GetLevel(rTextColl.GetName()));
 
                 if (static_cast<const SwNumRuleItem &>(rItem).GetValue() !=
                     pOutlineRule->GetName())
                 {
                     SwNumRuleItem aItem(pOutlineRule->GetName());
-                    rTxtColl.SetFmtAttr(aItem);
+                    rTextColl.SetFormatAttr(aItem);
                 }
             }
         }
@@ -388,25 +388,25 @@ short SwOutlineTabDialog::Ok()
         OUString sHeadline;
         ::SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i),
                                          sHeadline );
-        SwTxtFmtColl* pColl = rWrtSh.FindTxtFmtCollByName( sHeadline );
+        SwTextFormatColl* pColl = rWrtSh.FindTextFormatCollByName( sHeadline );
         if( !pColl )
         {
             if(aCollNames[i] != sHeadline)
             {
-                SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool(
+                SwTextFormatColl* pTextColl = rWrtSh.GetTextCollFromPool(
                     static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i) );
-                pTxtColl->DeleteAssignmentToListLevelOfOutlineStyle();
-                pTxtColl->ResetFmtAttr(RES_PARATR_NUMRULE);
+                pTextColl->DeleteAssignmentToListLevelOfOutlineStyle();
+                pTextColl->ResetFormatAttr(RES_PARATR_NUMRULE);
 
                 if( !aCollNames[i].isEmpty() )
                 {
-                    pTxtColl = rWrtSh.GetParaStyle(
+                    pTextColl = rWrtSh.GetParaStyle(
                                 aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME);
-                    if(pTxtColl)
+                    if(pTextColl)
                     {
-                        pTxtColl->AssignToListLevelOfOutlineStyle(i);
+                        pTextColl->AssignToListLevelOfOutlineStyle(i);
                         SwNumRuleItem aItem(pOutlineRule->GetName());
-                        pTxtColl->SetFmtAttr(aItem);
+                        pTextColl->SetFormatAttr(aItem);
                     }
                 }
             }
@@ -425,7 +425,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(vcl::Window* pParent,
     const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OutlineNumberingPage",
         "modules/swriter/ui/outlinenumberingpage.ui", &rSet)
-    , aNoFmtName(SW_RESSTR(SW_STR_NONE))
+    , aNoFormatName(SW_RESSTR(SW_STR_NONE))
     , pSh(NULL)
     , pNumRule(NULL)
     , pCollNames(NULL)
@@ -435,7 +435,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(vcl::Window* pParent,
     get(m_pCollBox, "style");
     m_pCollBox->SetStyle(m_pCollBox->GetStyle()|WB_SORT);
     get(m_pNumberBox, "numbering");
-    get(m_pCharFmtLB, "charstyle");
+    get(m_pCharFormatLB, "charstyle");
     get(m_pAllLevelFT, "sublevelsft");
     get(m_pAllLevelNF, "sublevelsnf");
     get(m_pPrefixED, "prefix");
@@ -445,7 +445,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(vcl::Window* pParent,
 
     SetExchangeSupport();
 
-    m_pCollBox->InsertEntry(aNoFmtName);
+    m_pCollBox->InsertEntry(aNoFormatName);
     m_pLevelLB->SetSelectHdl(LINK(this,    SwOutlineSettingsTabPage, LevelHdl));
     m_pAllLevelNF->SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, ToggleComplete));
     m_pCollBox->SetSelectHdl(LINK(this,    SwOutlineSettingsTabPage, CollSelect));
@@ -454,7 +454,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(vcl::Window* pParent,
     m_pPrefixED->SetModifyHdl(LINK(this,   SwOutlineSettingsTabPage, DelimModify));
     m_pSuffixED->SetModifyHdl(LINK(this,   SwOutlineSettingsTabPage, DelimModify));
     m_pStartEdit->SetModifyHdl(LINK(this,  SwOutlineSettingsTabPage, StartModified));
-    m_pCharFmtLB->SetSelectHdl(LINK(this,  SwOutlineSettingsTabPage, CharFmtHdl));
+    m_pCharFormatLB->SetSelectHdl(LINK(this,  SwOutlineSettingsTabPage, CharFormatHdl));
 }
 
 void    SwOutlineSettingsTabPage::Update()
@@ -468,63 +468,63 @@ void    SwOutlineSettingsTabPage::Update()
         bool bSameType = true;
         bool bSameComplete = true;
         bool bSameStart = true;
-        bool bSameCharFmt = true;
+        bool bSameCharFormat = true;
 
-        const SwNumFmt* aNumFmtArr[MAXLEVEL];
-        const SwCharFmt* pFirstFmt = 0;
+        const SwNumFormat* aNumFormatArr[MAXLEVEL];
+        const SwCharFormat* pFirstFormat = 0;
 
         for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
         {
 
-            aNumFmtArr[ i ] = &pNumRule->Get(i);
+            aNumFormatArr[ i ] = &pNumRule->Get(i);
             if(i == 0)
-                pFirstFmt = aNumFmtArr[i]->GetCharFmt();
+                pFirstFormat = aNumFormatArr[i]->GetCharFormat();
             else
             {
-                bSameType   &= aNumFmtArr[i]->GetNumberingType() == aNumFmtArr[0]->GetNumberingType();
-                bSameStart  &= aNumFmtArr[i]->GetStart() == aNumFmtArr[0]->GetStart();
-                bSamePrefix &= aNumFmtArr[i]->GetPrefix() == aNumFmtArr[0]->GetPrefix();
-                bSameSuffix &= aNumFmtArr[i]->GetSuffix() == aNumFmtArr[0]->GetSuffix();
-                bSameComplete &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[0]->GetIncludeUpperLevels();
-                const SwCharFmt* pFmt = aNumFmtArr[i]->GetCharFmt();
-                bSameCharFmt &=     (!pFirstFmt && !pFmt)
-                                    || (pFirstFmt && pFmt && pFmt->GetName() == pFirstFmt->GetName());
+                bSameType   &= aNumFormatArr[i]->GetNumberingType() == aNumFormatArr[0]->GetNumberingType();
+                bSameStart  &= aNumFormatArr[i]->GetStart() == aNumFormatArr[0]->GetStart();
+                bSamePrefix &= aNumFormatArr[i]->GetPrefix() == aNumFormatArr[0]->GetPrefix();
+                bSameSuffix &= aNumFormatArr[i]->GetSuffix() == aNumFormatArr[0]->GetSuffix();
+                bSameComplete &= aNumFormatArr[i]->GetIncludeUpperLevels() == aNumFormatArr[0]->GetIncludeUpperLevels();
+                const SwCharFormat* pFormat = aNumFormatArr[i]->GetCharFormat();
+                bSameCharFormat &=     (!pFirstFormat && !pFormat)
+                                    || (pFirstFormat && pFormat && pFormat->GetName() == pFirstFormat->GetName());
             }
         }
-        CheckForStartValue_Impl(aNumFmtArr[0]->GetNumberingType());
+        CheckForStartValue_Impl(aNumFormatArr[0]->GetNumberingType());
         if(bSameType)
-            m_pNumberBox->SelectNumberingType( aNumFmtArr[0]->GetNumberingType() );
+            m_pNumberBox->SelectNumberingType( aNumFormatArr[0]->GetNumberingType() );
         else
             m_pNumberBox->SetNoSelection();
         if(bSameStart)
-            m_pStartEdit->SetValue(aNumFmtArr[0]->GetStart());
+            m_pStartEdit->SetValue(aNumFormatArr[0]->GetStart());
         else
             m_pStartEdit->SetText(OUString());
         if(bSamePrefix)
-            m_pPrefixED->SetText(aNumFmtArr[0]->GetPrefix());
+            m_pPrefixED->SetText(aNumFormatArr[0]->GetPrefix());
         else
             m_pPrefixED->SetText(OUString());
         if(bSameSuffix)
-            m_pSuffixED->SetText(aNumFmtArr[0]->GetSuffix());
+            m_pSuffixED->SetText(aNumFormatArr[0]->GetSuffix());
         else
             m_pSuffixED->SetText(OUString());
 
-        if(bSameCharFmt)
+        if(bSameCharFormat)
         {
-            if(pFirstFmt)
-                m_pCharFmtLB->SelectEntry(pFirstFmt->GetName());
+            if(pFirstFormat)
+                m_pCharFormatLB->SelectEntry(pFirstFormat->GetName());
             else
-                m_pCharFmtLB->SelectEntry( SwViewShell::GetShellRes()->aStrNone );
+                m_pCharFormatLB->SelectEntry( SwViewShell::GetShellRes()->aStrNone );
         }
         else
-            m_pCharFmtLB->SetNoSelection();
+            m_pCharFormatLB->SetNoSelection();
 
         m_pAllLevelFT->Enable(true);
         m_pAllLevelNF->Enable(true);
         m_pAllLevelNF->SetMax(MAXLEVEL);
         if(bSameComplete)
         {
-            m_pAllLevelNF->SetValue(aNumFmtArr[0]->GetIncludeUpperLevels());
+            m_pAllLevelNF->SetValue(aNumFormatArr[0]->GetIncludeUpperLevels());
         }
         else
         {
@@ -538,24 +538,24 @@ void    SwOutlineSettingsTabPage::Update()
         if(!aColl.isEmpty())
             m_pCollBox->SelectEntry(aColl);
         else
-            m_pCollBox->SelectEntry(aNoFmtName);
-        const SwNumFmt &rFmt = pNumRule->Get(nTmpLevel);
-
-        m_pNumberBox->SelectNumberingType( rFmt.GetNumberingType() );
-        m_pPrefixED->SetText(rFmt.GetPrefix());
-        m_pSuffixED->SetText(rFmt.GetSuffix());
-        const SwCharFmt* pFmt = rFmt.GetCharFmt();
-        if(pFmt)
-            m_pCharFmtLB->SelectEntry(pFmt->GetName());
+            m_pCollBox->SelectEntry(aNoFormatName);
+        const SwNumFormat &rFormat = pNumRule->Get(nTmpLevel);
+
+        m_pNumberBox->SelectNumberingType( rFormat.GetNumberingType() );
+        m_pPrefixED->SetText(rFormat.GetPrefix());
+        m_pSuffixED->SetText(rFormat.GetSuffix());
+        const SwCharFormat* pFormat = rFormat.GetCharFormat();
+        if(pFormat)
+            m_pCharFormatLB->SelectEntry(pFormat->GetName());
         else
-            m_pCharFmtLB->SelectEntry( SwViewShell::GetShellRes()->aStrNone );
+            m_pCharFormatLB->SelectEntry( SwViewShell::GetShellRes()->aStrNone );
 
         if(nTmpLevel)
         {
             m_pAllLevelFT->Enable(true);
             m_pAllLevelNF->Enable(true);
             m_pAllLevelNF->SetMax(nTmpLevel + 1);
-            m_pAllLevelNF->SetValue(rFmt.GetIncludeUpperLevels());
+            m_pAllLevelNF->SetValue(rFormat.GetIncludeUpperLevels());
         }
         else
         {
@@ -563,8 +563,8 @@ void    SwOutlineSettingsTabPage::Update()
             m_pAllLevelNF->Enable(false);
             m_pAllLevelFT->Enable(false);
         }
-        CheckForStartValue_Impl(rFmt.GetNumberingType());
-        m_pStartEdit->SetValue( rFmt.GetStart() );
+        CheckForStartValue_Impl(rFormat.GetNumberingType());
+        m_pStartEdit->SetValue( rFormat.GetStart() );
     }
     SetModified();
 }
@@ -590,17 +590,17 @@ IMPL_LINK( SwOutlineSettingsTabPage, LevelHdl, ListBox *, pBox )
     return 0;
 }
 
-IMPL_LINK( SwOutlineSettingsTabPage, ToggleComplete, NumericField *, pFld )
+IMPL_LINK( SwOutlineSettingsTabPage, ToggleComplete, NumericField *, pField )
 {
     sal_uInt16 nMask = 1;
     for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
     {
         if(nActLevel & nMask)
         {
-            SwNumFmt aNumFmt(pNumRule->Get(i));
-            aNumFmt.SetIncludeUpperLevels( std::min( (sal_uInt8)pFld->GetValue(),
+            SwNumFormat aNumFormat(pNumRule->Get(i));
+            aNumFormat.SetIncludeUpperLevels( std::min( (sal_uInt8)pField->GetValue(),
                                                 (sal_uInt8)(i + 1)) );
-            pNumRule->Set(i, aNumFmt);
+            pNumRule->Set(i, aNumFormat);
         }
         nMask <<= 1;
     }
@@ -620,7 +620,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox )
     for( i = 0; i < MAXLEVEL; ++i)
         pCollNames[i] = aSaveCollNames[i];
 
-    if(aCollName == aNoFmtName)
+    if(aCollName == aNoFormatName)
         pCollNames[nTmpLevel].clear();
     else
     {
@@ -666,9 +666,9 @@ IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, SwNumberingTypeListBox *, pBo
     {
         if(nActLevel & nMask)
         {
-            SwNumFmt aNumFmt(pNumRule->Get(i));
-            aNumFmt.SetNumberingType(nNumberType);
-            pNumRule->Set(i, aNumFmt);
+            SwNumFormat aNumFormat(pNumRule->Get(i));
+            aNumFormat.SetNumberingType(nNumberType);
+            pNumRule->Set(i, aNumFormat);
             CheckForStartValue_Impl(nNumberType);
         }
         nMask <<= 1;
@@ -684,10 +684,10 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, DelimModify)
     {
         if(nActLevel & nMask)
         {
-            SwNumFmt aNumFmt(pNumRule->Get(i));
-            aNumFmt.SetPrefix( m_pPrefixED->GetText() );
-            aNumFmt.SetSuffix( m_pSuffixED->GetText() );
-            pNumRule->Set(i, aNumFmt);
+            SwNumFormat aNumFormat(pNumRule->Get(i));
+            aNumFormat.SetPrefix( m_pPrefixED->GetText() );
+            aNumFormat.SetSuffix( m_pSuffixED->GetText() );
+            pNumRule->Set(i, aNumFormat);
         }
         nMask <<= 1;
     }
@@ -695,16 +695,16 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, DelimModify)
     return 0;
 }
 
-IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld )
+IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pField )
 {
     sal_uInt16 nMask = 1;
     for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
     {
         if(nActLevel & nMask)
         {
-            SwNumFmt aNumFmt(pNumRule->Get(i));
-            aNumFmt.SetStart( (sal_uInt16)pFld->GetValue() );
-            pNumRule->Set(i, aNumFmt);
+            SwNumFormat aNumFormat(pNumRule->Get(i));
+            aNumFormat.SetStart( (sal_uInt16)pField->GetValue() );
+            pNumRule->Set(i, aNumFormat);
         }
         nMask <<= 1;
     }
@@ -712,32 +712,32 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld )
     return 0;
 }
 
-IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFmtHdl)
+IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFormatHdl)
 {
-    OUString sEntry = m_pCharFmtLB->GetSelectEntry();
+    OUString sEntry = m_pCharFormatLB->GetSelectEntry();
     sal_uInt16 nMask = 1;
     bool bFormatNone = sEntry == SwViewShell::GetShellRes()->aStrNone;
-    SwCharFmt* pFmt = 0;
+    SwCharFormat* pFormat = 0;
     if(!bFormatNone)
     {
-        sal_uInt16 nChCount = pSh->GetCharFmtCount();
+        sal_uInt16 nChCount = pSh->GetCharFormatCount();
         for(sal_uInt16 i = 0; i < nChCount; i++)
         {
-            SwCharFmt& rChFmt = pSh->GetCharFmt(i);
-            if(rChFmt.GetName() == sEntry)
+            SwCharFormat& rChFormat = pSh->GetCharFormat(i);
+            if(rChFormat.GetName() == sEntry)
             {
-                pFmt = &rChFmt;
+                pFormat = &rChFormat;
                 break;
             }
         }
-        if(!pFmt)
+        if(!pFormat)
         {
             SfxStyleSheetBasePool* pPool = pSh->GetView().GetDocShell()->GetStyleSheetPool();
             SfxStyleSheetBase* pBase;
             pBase = pPool->Find(sEntry, SFX_STYLE_FAMILY_CHAR);
             if(!pBase)
                 pBase = &pPool->Make(sEntry, SFX_STYLE_FAMILY_PAGE);
-            pFmt = static_cast<SwDocStyleSheet*>(pBase)->GetCharFmt();
+            pFormat = static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat();
 
         }
     }
@@ -746,12 +746,12 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFmtHdl)
     {
         if(nActLevel & nMask)
         {
-            SwNumFmt aNumFmt(pNumRule->Get(i));
+            SwNumFormat aNumFormat(pNumRule->Get(i));
             if(bFormatNone)
-                aNumFmt.SetCharFmt(0);
+                aNumFormat.SetCharFormat(0);
             else
-                aNumFmt.SetCharFmt(pFmt);
-            pNumRule->Set(i, aNumFmt);
+                aNumFormat.SetCharFormat(pFormat);
+            pNumRule->Set(i, aNumFormat);
         }
         nMask <<= 1;
     }
@@ -768,7 +768,7 @@ void SwOutlineSettingsTabPage::dispose()
     m_pLevelLB.clear();
     m_pCollBox.clear();
     m_pNumberBox.clear();
-    m_pCharFmtLB.clear();
+    m_pCharFormatLB.clear();
     m_pAllLevelFT.clear();
     m_pAllLevelNF.clear();
     m_pPrefixED.clear();
@@ -790,8 +790,8 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
     m_pPreviewWIN->SetOutlineNames(pCollNames);
     // set start value - nActLevel must be 1 here
     sal_uInt16 nTmpLevel = lcl_BitToLevel(nActLevel);
-    const SwNumFmt& rNumFmt = pNumRule->Get( nTmpLevel );
-    m_pStartEdit->SetValue( rNumFmt.GetStart() );
+    const SwNumFormat& rNumFormat = pNumRule->Get( nTmpLevel );
+    m_pStartEdit->SetValue( rNumFormat.GetStart() );
 
     // create pool formats for headlines
     sal_uInt16 i;
@@ -806,19 +806,19 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
     m_pLevelLB->InsertEntry( sStr );
 
     // query the texttemplates' outlining levels
-    const sal_uInt16 nCount = pSh->GetTxtFmtCollCount();
+    const sal_uInt16 nCount = pSh->GetTextFormatCollCount();
     for( i = 0; i < nCount; ++i )
     {
-        SwTxtFmtColl &rTxtColl = pSh->GetTxtFmtColl(i);
-        if(!rTxtColl.IsDefault())
+        SwTextFormatColl &rTextColl = pSh->GetTextFormatColl(i);
+        if(!rTextColl.IsDefault())
         {
-            sStr = rTxtColl.GetName();
+            sStr = rTextColl.GetName();
             if(LISTBOX_ENTRY_NOTFOUND == m_pCollBox->GetEntryPos( sStr ))
                 m_pCollBox->InsertEntry( sStr );
         }
     }
 
-    m_pNumberBox->SelectNumberingType(rNumFmt.GetNumberingType());
+    m_pNumberBox->SelectNumberingType(rNumFormat.GetNumberingType());
     sal_uInt16 nOutlinePos = pSh->GetOutlinePos(MAXLEVEL);
     sal_uInt16 nTmp = 0;
     if(nOutlinePos != USHRT_MAX)
@@ -828,11 +828,11 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
     m_pLevelLB->SelectEntryPos(nTmp-1);
 
     // collect char styles
-    m_pCharFmtLB->Clear();
-    m_pCharFmtLB->InsertEntry( SwViewShell::GetShellRes()->aStrNone );
+    m_pCharFormatLB->Clear();
+    m_pCharFormatLB->InsertEntry( SwViewShell::GetShellRes()->aStrNone );
 
     // char styles
-    ::FillCharStyleListBox(*m_pCharFmtLB,
+    ::FillCharStyleListBox(*m_pCharFormatLB,
                         pSh->GetView().GetDocShell());
     Update();
 }
@@ -880,15 +880,15 @@ void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType
         m_pStartEdit->GetModifyHdl().Call(m_pStartEdit);
 }
 
-static long lcl_DrawBullet(vcl::RenderContext* pVDev, const SwNumFmt& rFmt, long nXStart, long nYStart, const Size& rSize)
+static long lcl_DrawBullet(vcl::RenderContext* pVDev, const SwNumFormat& rFormat, long nXStart, long nYStart, const Size& rSize)
 {
     vcl::Font aTmpFont(pVDev->GetFont());
 
-    vcl::Font aFont(*rFmt.GetBulletFont());
+    vcl::Font aFont(*rFormat.GetBulletFont());
     aFont.SetSize(rSize);
     aFont.SetTransparent(true);
     pVDev->SetFont(aFont);
-    OUString aText(rFmt.GetBulletChar());
+    OUString aText(rFormat.GetBulletChar());
     pVDev->DrawText(Point(nXStart, nYStart), aText);
     const long nRet = pVDev->GetTextWidth(aText);
 
@@ -896,16 +896,16 @@ static long lcl_DrawBullet(vcl::RenderContext* pVDev, const SwNumFmt& rFmt, long
     return nRet;
 }
 
-static long lcl_DrawGraphic(vcl::RenderContext* pVDev, const SwNumFmt &rFmt, long nXStart, long nYStart, long nDivision)
+static long lcl_DrawGraphic(vcl::RenderContext* pVDev, const SwNumFormat &rFormat, long nXStart, long nYStart, long nDivision)
 {
-    const SvxBrushItem* pBrushItem = rFmt.GetBrush();
+    const SvxBrushItem* pBrushItem = rFormat.GetBrush();
     long nRet = 0;
     if (pBrushItem)
     {
         const Graphic* pGraphic = pBrushItem->GetGraphic();
         if (pGraphic)
         {
-            Size aGSize( rFmt.GetGraphicSize());
+            Size aGSize( rFormat.GetGraphicSize());
             aGSize.Width() /= nDivision;
             nRet = aGSize.Width();
             aGSize.Height() /= nDivision;
@@ -972,39 +972,39 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle
             sal_uInt8 nEnd = std::min(sal_uInt8(nStart + 3), MAXLEVEL);
             for (sal_uInt8 nLevel = nStart; nLevel < nEnd; ++nLevel)
             {
-                const SwNumFmt &rFmt = pActNum->Get(nLevel);
-                aNumVector.push_back(rFmt.GetStart());
+                const SwNumFormat &rFormat = pActNum->Get(nLevel);
+                aNumVector.push_back(rFormat.GetStart());
 
                 long nXStart( 0 );
                 long nTextOffset( 0 );
                 long nNumberXPos( 0 );
-                if (rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
+                if (rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
                 {
-                    nXStart = rFmt.GetAbsLSpace() / nWidthRelation;
-                    nTextOffset = rFmt.GetCharTextDistance() / nWidthRelation;
+                    nXStart = rFormat.GetAbsLSpace() / nWidthRelation;
+                    nTextOffset = rFormat.GetCharTextDistance() / nWidthRelation;
                     nNumberXPos = nXStart;
-                    const long nFirstLineOffset = (-rFmt.GetFirstLineOffset()) / nWidthRelation;
+                    const long nFirstLineOffset = (-rFormat.GetFirstLineOffset()) / nWidthRelation;
 
                     if(nFirstLineOffset <= nNumberXPos)
                         nNumberXPos -= nFirstLineOffset;
                     else
                         nNumberXPos = 0;
                 }
-                else if (rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT)
+                else if (rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT)
                 {
-                    const long nTmpNumberXPos((rFmt.GetIndentAt() + rFmt.GetFirstLineIndent()) / nWidthRelation);
+                    const long nTmpNumberXPos((rFormat.GetIndentAt() + rFormat.GetFirstLineIndent()) / nWidthRelation);
                     nNumberXPos = (nTmpNumberXPos < 0) ? 0 : nTmpNumberXPos;
                 }
 
                 long nBulletWidth = 0;
-                if (SVX_NUM_BITMAP == rFmt.GetNumberingType())
+                if (SVX_NUM_BITMAP == rFormat.GetNumberingType())
                 {
-                    nBulletWidth = lcl_DrawGraphic(pVDev.get(), rFmt, nNumberXPos,
+                    nBulletWidth = lcl_DrawGraphic(pVDev.get(), rFormat, nNumberXPos,
                                                    nYStart, nWidthRelation);
                 }
-                else if (SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType())
+                else if (SVX_NUM_CHAR_SPECIAL == rFormat.GetNumberingType())
                 {
-                    nBulletWidth = lcl_DrawBullet(pVDev.get(), rFmt, nNumberXPos,
+                    nBulletWidth = lcl_DrawBullet(pVDev.get(), rFormat, nNumberXPos,
                                                   nYStart, aStdFont.GetSize());
                 }
                 else
@@ -1018,8 +1018,8 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle
                     nBulletWidth = pVDev->GetTextWidth(aText);
                     nPreNum++;
                 }
-                if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT &&
-                     rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE )
+                if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT &&
+                     rFormat.GetLabelFollowedBy() == SvxNumberFormat::SPACE )
                 {
                     pVDev->SetFont(aStdFont);
                     OUString aText(' ');
@@ -1028,7 +1028,7 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle
                 }
 
                 long nTextXPos(0);
-                if (rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
+                if (rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
                 {
                     nTextXPos = nXStart;
                     if (nTextOffset < 0)
@@ -1036,13 +1036,13 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle
                     if (nNumberXPos + nBulletWidth + nTextOffset > nTextXPos)
                         nTextXPos = nNumberXPos + nBulletWidth + nTextOffset;
                 }
-                else if (rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT)
+                else if (rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT)
                 {
-                    switch (rFmt.GetLabelFollowedBy())
+                    switch (rFormat.GetLabelFollowedBy())
                     {
                         case SvxNumberFormat::LISTTAB:
                         {
-                            nTextXPos = rFmt.GetListtabPos() / nWidthRelation;
+                            nTextXPos = rFormat.GetListtabPos() / nWidthRelation;
                             if (nTextXPos < nNumberXPos + nBulletWidth)
                             {
                                 nTextXPos = nNumberXPos + nBulletWidth;
@@ -1057,7 +1057,7 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle
                         break;
                     }
 
-                    nXStart = rFmt.GetIndentAt() / nWidthRelation;
+                    nXStart = rFormat.GetIndentAt() / nWidthRelation;
                 }
 
                 Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2));
@@ -1075,29 +1075,29 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle
             const long nLineHeight = nFontHeight * 3 / 2;
             for (sal_uInt8 nLevel = 0; nLevel < MAXLEVEL; ++nLevel, nYStart = nYStart + nYStep)
             {
-                const SwNumFmt &rFmt = pActNum->Get(nLevel);
-                aNumVector.push_back(rFmt.GetStart());
+                const SwNumFormat &rFormat = pActNum->Get(nLevel);
+                aNumVector.push_back(rFormat.GetStart());
                 long nXStart(0);
-                if (rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
+                if (rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
                 {
-                    nXStart = rFmt.GetAbsLSpace() / nWidthRelation;
+                    nXStart = rFormat.GetAbsLSpace() / nWidthRelation;
                 }
-                else if (rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT)
+                else if (rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT)
                 {
-                    const long nTmpXStart((rFmt.GetIndentAt() + rFmt.GetFirstLineIndent() ) / nWidthRelation);
+                    const long nTmpXStart((rFormat.GetIndentAt() + rFormat.GetFirstLineIndent() ) / nWidthRelation);
                     nXStart = (nTmpXStart < 0) ? 0 : nTmpXStart;
                 }
                 nXStart /= 2;
                 nXStart += 2;
                 long nTextOffset;
-                if (SVX_NUM_BITMAP == rFmt.GetNumberingType())
+                if (SVX_NUM_BITMAP == rFormat.GetNumberingType())
                 {
-                    lcl_DrawGraphic(pVDev.get(), rFmt, nXStart, nYStart, nWidthRelation);
+                    lcl_DrawGraphic(pVDev.get(), rFormat, nXStart, nYStart, nWidthRelation);
                     nTextOffset = nLineHeight + nXStep;
                 }
-                else if (SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType())
+                else if (SVX_NUM_CHAR_SPECIAL == rFormat.GetNumberingType())
                 {
-                    nTextOffset =  lcl_DrawBullet(pVDev.get(), rFmt, nXStart, nYStart, aStdFont.GetSize());
+                    nTextOffset =  lcl_DrawBullet(pVDev.get(), rFormat, nXStart, nYStart, aStdFont.GetSize());
                     nTextOffset += nXStep;
                 }
                 else
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 6a2b42a12f58..49ac9ab8964a 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -159,22 +159,22 @@ VclPtr<SfxTabPage> SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet
 void SwFootNotePage::Reset(const SfxItemSet *rSet)
 {
     // if no example exists, otherwise Init here in Activate
-    boost::scoped_ptr<SwPageFtnInfo> pDefFtnInfo;
-    const SwPageFtnInfo* pFtnInfo;
+    boost::scoped_ptr<SwPageFootnoteInfo> pDefFootnoteInfo;
+    const SwPageFootnoteInfo* pFootnoteInfo;
     const SfxPoolItem* pItem = SfxTabPage::GetItem(*rSet, FN_PARAM_FTN_INFO);
     if( pItem )
     {
-        pFtnInfo = &static_cast<const SwPageFtnInfoItem*>(pItem)->GetPageFtnInfo();
+        pFootnoteInfo = &static_cast<const SwPageFootnoteInfoItem*>(pItem)->GetPageFootnoteInfo();
     }
     else
     {
         // when "standard" is being activated the footnote item is deleted,
         // that's why a footnote structure has to be created here
-        pDefFtnInfo.reset(new SwPageFtnInfo());
-        pFtnInfo = pDefFtnInfo.get();
+        pDefFootnoteInfo.reset(new SwPageFootnoteInfo());
+        pFootnoteInfo = pDefFootnoteInfo.get();
     }
         // footnote area's height
-    SwTwips lHeight = pFtnInfo->GetHeight();
+    SwTwips lHeight = pFootnoteInfo->GetHeight();
     if(lHeight)
     {
         m_pMaxHeightEdit->SetValue(m_pMaxHeightEdit->Normalize(lHeight),FUNIT_TWIP);
@@ -196,7 +196,7 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet)
     m_pLineWidthEdit->SetModifyHdl( LINK( this, SwFootNotePage, LineWidthChanged_Impl ) );
 
     sal_Int64 nWidthPt = static_cast<sal_Int64>(MetricField::ConvertDoubleValue(
-            sal_Int64( pFtnInfo->GetLineWidth() ), m_pLineWidthEdit->GetDecimalDigits(),
+            sal_Int64( pFootnoteInfo->GetLineWidth() ), m_pLineWidthEdit->GetDecimalDigits(),
             MAP_TWIP, m_pLineWidthEdit->GetUnit( ) ));
     m_pLineWidthEdit->SetValue( nWidthPt );
 
@@ -213,8 +213,8 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet)
     m_pLineTypeBox->InsertEntry(
         ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::DASHED),
         table::BorderLineStyle::DASHED );
-    m_pLineTypeBox->SetWidth( pFtnInfo->GetLineWidth( ) );
-    m_pLineTypeBox->SelectEntry( pFtnInfo->GetLineStyle() );
+    m_pLineTypeBox->SetWidth( pFootnoteInfo->GetLineWidth( ) );
+    m_pLineTypeBox->SelectEntry( pFootnoteInfo->GetLineStyle() );
 
     // Separator Color
     SfxObjectShell*     pDocSh      = SfxObjectShell::Current();
@@ -244,69 +244,69 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet)
     }
 
     // select color in the list or add it as a user color
-    sal_Int32 nSelPos = m_pLineColorBox->GetEntryPos( pFtnInfo->GetLineColor() );
+    sal_Int32 nSelPos = m_pLineColorBox->GetEntryPos( pFootnoteInfo->GetLineColor() );
     if( nSelPos == LISTBOX_ENTRY_NOTFOUND )
-        nSelPos = m_pLineColorBox->InsertEntry( pFtnInfo->GetLineColor(),
+        nSelPos = m_pLineColorBox->InsertEntry( pFootnoteInfo->GetLineColor(),
                 SVX_RESSTR(RID_SVXSTR_COLOR_USER) );
 
     m_pLineColorBox->SetSelectHdl( LINK( this, SwFootNotePage, LineColorSelected_Impl ) );
     m_pLineColorBox->SelectEntryPos( nSelPos );
-    m_pLineTypeBox->SetColor( pFtnInfo->GetLineColor() );
+    m_pLineTypeBox->SetColor( pFootnoteInfo->GetLineColor() );
 
     // position
-    m_pLinePosBox->SelectEntryPos( static_cast< sal_Int32 >(pFtnInfo->GetAdj()) );
+    m_pLinePosBox->SelectEntryPos( static_cast< sal_Int32 >(pFootnoteInfo->GetAdj()) );
 
         // width
     Fraction aTmp( 100, 1 );
-    aTmp *= pFtnInfo->GetWidth();
+    aTmp *= pFootnoteInfo->GetWidth();
     m_pLineLengthEdit->SetValue( static_cast<long>(aTmp) );
 
         // gap footnote area
-    m_pDistEdit->SetValue(m_pDistEdit->Normalize(pFtnInfo->GetTopDist()),FUNIT_TWIP);
+    m_pDistEdit->SetValue(m_pDistEdit->Normalize(pFootnoteInfo->GetTopDist()),FUNIT_TWIP);
     m_pLineDistEdit->SetValue(
-        m_pLineDistEdit->Normalize(pFtnInfo->GetBottomDist()), FUNIT_TWIP);
+        m_pLineDistEdit->Normalize(pFootnoteInfo->GetBottomDist()), FUNIT_TWIP);
     ActivatePage( *rSet );
 }
 
 // stuff attributes into the set, when OK
 bool SwFootNotePage::FillItemSet(SfxItemSet *rSet)
 {
-    SwPageFtnInfoItem aItem(static_cast<const SwPageFtnInfoItem&>(GetItemSet().Get(FN_PARAM_FTN_INFO)));
+    SwPageFootnoteInfoItem aItem(static_cast<const SwPageFootnoteInfoItem&>(GetItemSet().Get(FN_PARAM_FTN_INFO)));
 
     // that's the original
-    SwPageFtnInfo &rFtnInfo = aItem.GetPageFtnInfo();
+    SwPageFootnoteInfo &rFootnoteInfo = aItem.GetPageFootnoteInfo();
 
         // footnote area's height
     if(m_pMaxHeightBtn->IsChecked())
-        rFtnInfo.SetHeight( static_cast< SwTwips >(
+        rFootnoteInfo.SetHeight( static_cast< SwTwips >(
                 m_pMaxHeightEdit->Denormalize(m_pMaxHeightEdit->GetValue(FUNIT_TWIP))));
     else
-        rFtnInfo.SetHeight(0);
+        rFootnoteInfo.SetHeight(0);
 
         // gap footnote area
-    rFtnInfo.SetTopDist(  static_cast< SwTwips >(
+    rFootnoteInfo.SetTopDist(  static_cast< SwTwips >(
             m_pDistEdit->Denormalize(m_pDistEdit->GetValue(FUNIT_TWIP))));
-    rFtnInfo.SetBottomDist(  static_cast< SwTwips >(
+    rFootnoteInfo.SetBottomDist(  static_cast< SwTwips >(
             m_pLineDistEdit->Denormalize(m_pLineDistEdit->GetValue(FUNIT_TWIP))));
 
     // Separator style
-    rFtnInfo.SetLineStyle( ::editeng::SvxBorderStyle( m_pLineTypeBox->GetSelectEntryStyle() ) );
+    rFootnoteInfo.SetLineStyle( ::editeng::SvxBorderStyle( m_pLineTypeBox->GetSelectEntryStyle() ) );
 
     // Separator width
     long nWidth = static_cast<long>(MetricField::ConvertDoubleValue(
                    m_pLineWidthEdit->GetValue( ),
                    m_pLineWidthEdit->GetDecimalDigits( ),
                    m_pLineWidthEdit->GetUnit(), MAP_TWIP ));
-    rFtnInfo.SetLineWidth( nWidth );
+    rFootnoteInfo.SetLineWidth( nWidth );
 
     // Separator color
-    rFtnInfo.SetLineColor( m_pLineColorBox->GetSelectEntryColor() );
+    rFootnoteInfo.SetLineColor( m_pLineColorBox->GetSelectEntryColor() );
 
         // Position
-    rFtnInfo.SetAdj((SwFtnAdj)m_pLinePosBox->GetSelectEntryPos());
+    rFootnoteInfo.SetAdj((SwFootnoteAdj)m_pLinePosBox->GetSelectEntryPos());
 
         // Breite
-    rFtnInfo.SetWidth(Fraction( static_cast< long >(m_pLineLengthEdit->GetValue()), 100));
+    rFootnoteInfo.SetWidth(Fraction( static_cast< long >(m_pLineLengthEdit->GetValue()), 100));
 
     const SfxPoolItem* pOldItem;
     if(0 == (pOldItem = GetOldItem( *rSet, FN_PARAM_FTN_INFO )) ||
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 298dd171c313..37b42cd0a06f 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -81,10 +81,10 @@ static void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox )
 }
 
 // determine lines and columns for table selection
-static bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
+static bool lcl_GetSelTable( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
 {
-    const SwTableNode* pTblNd = rSh.IsCrsrInTbl();
-    if( !pTblNd )
+    const SwTableNode* pTableNd = rSh.IsCrsrInTable();
+    if( !pTableNd )
         return false;
 
     _FndBox aFndBox( 0, 0 );
@@ -92,10 +92,10 @@ static bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
     // look for all boxes / lines
     {
         SwSelBoxes aSelBoxes;
-        ::GetTblSel( rSh, aSelBoxes );
+        ::GetTableSel( rSh, aSelBoxes );
         _FndPara aPara( aSelBoxes, &aFndBox );
-        const SwTable& rTbl = pTblNd->GetTable();
-        ForEach_FndLineCopyCol( (SwTableLines&)rTbl.GetTabLines(), &aPara );
+        const SwTable& rTable = pTableNd->GetTable();
+        ForEach_FndLineCopyCol( (SwTableLines&)rTable.GetTabLines(), &aPara );
     }
     rX = aFndBox.GetLines().size();
     if( !rX )
@@ -108,9 +108,9 @@ static bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
 // init list
 SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell)
     : SvxStandardDialog(pParent, "SortDialog", "modules/swriter/ui/sortdialog.ui")
-    , aColTxt(SW_RES(STR_COL))
-    , aRowTxt(SW_RES(STR_ROW))
-    , aNumericTxt(SW_RES(STR_NUMERIC))
+    , aColText(SW_RES(STR_COL))
+    , aRowText(SW_RES(STR_ROW))
+    , aNumericText(SW_RES(STR_NUMERIC))
     , rSh(rShell)
     , pColRes(0)
     , nX(99)
@@ -166,7 +166,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell)
             (nsSelectionType::SEL_TBL|nsSelectionType::SEL_TBL_CELLS) )
     {
         m_pColumnRB->Check(bCol);
-        m_pColLbl->SetText(bCol ? aRowTxt : aColTxt);
+        m_pColLbl->SetText(bCol ? aRowText : aColText);
         m_pRowRB->Check(!bCol);
         m_pDelimTabRB->Enable(false);
         m_pDelimFreeRB->Enable(false);
@@ -176,7 +176,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell)
     {
         m_pColumnRB->Enable(false);
         m_pRowRB->Check(true);
-        m_pColLbl->SetText(aColTxt);
+        m_pColLbl->SetText(aColText);
     }
 
     // initialise
@@ -230,7 +230,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell)
     else
         DelimHdl(m_pDelimTabRB);
 
-    if( ::lcl_GetSelTbl( rSh, nX, nY) )
+    if( ::lcl_GetSelTable( rSh, nX, nY) )
     {
         sal_uInt16 nMax = m_pRowRB->IsChecked()? nY : nX;
         m_pColEdt1->SetMax(nMax);
@@ -330,7 +330,7 @@ void SwSortDlg::Apply()
     if( bCheck1 )
     {
         OUString sEntry( m_pTypDLB1->GetSelectEntry() );
-        if( sEntry == aNumericTxt )
+        if( sEntry == aNumericText )
             sEntry.clear();
         else if( 0 != (pUserData = m_pTypDLB1->GetSelectEntryData()) )
             sEntry = *static_cast<OUString*>(pUserData);
@@ -343,7 +343,7 @@ void SwSortDlg::Apply()
     if( bCheck2 )
     {
         OUString sEntry( m_pTypDLB2->GetSelectEntry() );
-        if( sEntry == aNumericTxt )
+        if( sEntry == aNumericText )
             sEntry.clear();
         else if( 0 != (pUserData = m_pTypDLB2->GetSelectEntryData()) )
             sEntry = *static_cast<OUString*>(pUserData);
@@ -356,7 +356,7 @@ void SwSortDlg::Apply()
     if( bCheck3 )
     {
         OUString sEntry( m_pTypDLB3->GetSelectEntry() );
-        if( sEntry == aNumericTxt )
+        if( sEntry == aNumericText )
             sEntry.clear();
         else if( 0 != (pUserData = m_pTypDLB3->GetSelectEntryData()) )
             sEntry = *static_cast<OUString*>(pUserData);
@@ -416,25 +416,25 @@ IMPL_LINK( SwSortDlg, CheckHdl, void *, pControl )
 {
     if( pControl == m_pRowRB.get())
     {
-        m_pColLbl->SetText(aColTxt);
+        m_pColLbl->SetText(aColText);
         m_pColEdt1->SetMax(nY);
         m_pColEdt2->SetMax(nY);
         m_pColEdt3->SetMax(nY);
 
-        m_pColEdt1->SetAccessibleName(aColTxt);
-        m_pColEdt2->SetAccessibleName(aColTxt);
-        m_pColEdt3->SetAccessibleName(aColTxt);
+        m_pColEdt1->SetAccessibleName(aColText);
+        m_pColEdt2->SetAccessibleName(aColText);
+        m_pColEdt3->SetAccessibleName(aColText);
     }
     else if( pControl == m_pColumnRB.get())
     {
-        m_pColLbl->SetText(aRowTxt);
+        m_pColLbl->SetText(aRowText);
         m_pColEdt1->SetMax(nX);
         m_pColEdt2->SetMax(nX);
         m_pColEdt3->SetMax(nX);
 
-        m_pColEdt1->SetAccessibleName(aRowTxt);
-        m_pColEdt2->SetAccessibleName(aRowTxt);
-        m_pColEdt3->SetAccessibleName(aRowTxt);
+        m_pColEdt1->SetAccessibleName(aRowText);
+        m_pColEdt2->SetAccessibleName(aRowText);
+        m_pColEdt3->SetAccessibleName(aRowText);
     }
     else if(!m_pKeyCB1->IsChecked() &&
                 !m_pKeyCB2->IsChecked() &&
@@ -472,7 +472,7 @@ IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox )
         if( nCnt < nEnd )
             sUINm = pColRes->GetTranslation( sAlg = aSeq[ nCnt ] );
         else
-            sUINm = sAlg = aNumericTxt;
+            sUINm = sAlg = aNumericText;
 
         for( int n = 0; n < nLstBoxCnt; ++n )
         {
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 8af9afeacf98..59980d53005a 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -29,7 +29,7 @@
 
 namespace
 {
-    bool lcl_GetPageDesc(SwWrtShell *pSh, sal_uInt16 &rPageNo, const SwFmtPageDesc **ppPageFmtDesc)
+    bool lcl_GetPageDesc(SwWrtShell *pSh, sal_uInt16 &rPageNo, const SwFormatPageDesc **ppPageFormatDesc)
     {
         bool bRet = false;
         SfxItemSet aSet( pSh->GetAttrPool(), RES_PAGEDESC, RES_PAGEDESC );
@@ -38,11 +38,11 @@ namespace
             const SfxPoolItem* pItem(0);
             if (SfxItemState::SET == aSet.GetItemState( RES_PAGEDESC, true, &pItem ) && pItem)
             {
-                ::boost::optional<sal_uInt16> oNumOffset = static_cast<const SwFmtPageDesc *>(pItem)->GetNumOffset();
+                ::boost::optional<sal_uInt16> oNumOffset = static_cast<const SwFormatPageDesc *>(pItem)->GetNumOffset();
                 if (oNumOffset)
                     rPageNo = oNumOffset.get();
-                if (ppPageFmtDesc)
-                    (*ppPageFmtDesc) = static_cast<const SwFmtPageDesc *>(pItem->Clone());
+                if (ppPageFormatDesc)
+                    (*ppPageFormatDesc) = static_cast<const SwFormatPageDesc *>(pItem->Clone());
                 bRet = true;
             }
         }
@@ -55,9 +55,9 @@ namespace
         const size_t nCurIdx = pSh->GetCurPageDesc();
         const SwPageDesc &rCurrentDesc = pSh->GetPageDesc( nCurIdx );
 
-        const SwFmtPageDesc *pPageFmtDesc(0);
+        const SwFormatPageDesc *pPageFormatDesc(0);
         sal_uInt16 nDontCare;
-        lcl_GetPageDesc(pSh, nDontCare, &pPageFmtDesc);
+        lcl_GetPageDesc(pSh, nDontCare, &pPageFormatDesc);
 
         // If we want a new number then set it, otherwise reuse the existing one
         sal_uInt16 nPgNo;
@@ -67,9 +67,9 @@ namespace
         }
         else
         {
-            if (pPageFmtDesc)
+            if (pPageFormatDesc)
             {
-                ::boost::optional<sal_uInt16> oNumOffset = pPageFmtDesc->GetNumOffset();
+                ::boost::optional<sal_uInt16> oNumOffset = pPageFormatDesc->GetNumOffset();
                 if (oNumOffset)
                 {
                     nPgNo = oNumOffset.get();
@@ -88,18 +88,18 @@ namespace
         // If we want a new descriptior then set it, otherwise reuse the existing one
         if (!pNewDesc)
         {
-            SwFmtPageDesc aPageFmtDesc(pPageFmtDesc ? *pPageFmtDesc : &rCurrentDesc);
-            if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
-            pSh->SetAttrItem(aPageFmtDesc);
+            SwFormatPageDesc aPageFormatDesc(pPageFormatDesc ? *pPageFormatDesc : &rCurrentDesc);
+            if (nPgNo) aPageFormatDesc.SetNumOffset(nPgNo);
+            pSh->SetAttrItem(aPageFormatDesc);
         }
         else
         {
-            SwFmtPageDesc aPageFmtDesc(pNewDesc);
-            if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
-            pSh->SetAttrItem(aPageFmtDesc);
+            SwFormatPageDesc aPageFormatDesc(pNewDesc);
+            if (nPgNo) aPageFormatDesc.SetNumOffset(nPgNo);
+            pSh->SetAttrItem(aPageFormatDesc);
         }
 
-        delete pPageFmtDesc;
+        delete pPageFormatDesc;
     }
 
     void lcl_PushCursor(SwWrtShell *pSh)
@@ -152,7 +152,7 @@ sal_uInt16 SwTitlePageDlg::GetInsertPosition() const
 
 SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) :
     SfxModalDialog( pParent, "DLG_TITLEPAGE", "modules/swriter/ui/titlepage.ui"),
-    mpPageFmtDesc(0)
+    mpPageFormatDesc(0)
 {
     get(m_pUseExistingPagesRB, "RB_USE_EXISTING_PAGES");
     get(m_pPageCountNF, "NF_PAGE_COUNT");
@@ -187,9 +187,9 @@ SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) :
     mpNormalDesc = mpSh->GetPageDescFromPool(RES_POOLPAGE_STANDARD);
 
     mpSh->SttDoc();
-    if (lcl_GetPageDesc( mpSh, nSetPage, &mpPageFmtDesc ))
+    if (lcl_GetPageDesc( mpSh, nSetPage, &mpPageFormatDesc ))
     {
-        if (mpPageFmtDesc->GetPageDesc() == mpTitleDesc)
+        if (mpPageFormatDesc->GetPageDesc() == mpTitleDesc)
         {
             while (mpSh->SttNxtPg())
             {
@@ -275,7 +275,7 @@ SwTitlePageDlg::~SwTitlePageDlg()
 
 void SwTitlePageDlg::dispose()
 {
-    delete mpPageFmtDesc;
+    delete mpPageFormatDesc;
     m_pUseExistingPagesRB.clear();
     m_pPageCountNF.clear();
     m_pDocumentStartRB.clear();
@@ -306,12 +306,12 @@ IMPL_LINK_NOARG(SwTitlePageDlg, OKHdl)
 
     mpSh->StartUndo();
 
-    SwFmtPageDesc aTitleDesc(mpTitleDesc);
+    SwFormatPageDesc aTitleDesc(mpTitleDesc);
 
     if (m_pSetPageNumberCB->IsChecked())
         aTitleDesc.SetNumOffset(m_pSetPageNumberNF->GetValue());
-    else if (mpPageFmtDesc)
-        aTitleDesc.SetNumOffset(mpPageFmtDesc->GetNumOffset());
+    else if (mpPageFormatDesc)
+        aTitleDesc.SetNumOffset(mpPageFormatDesc->GetNumOffset());
 
     sal_uInt16 nNoPages = m_pPageCountNF->GetValue();
     if (!m_pUseExistingPagesRB->IsChecked())
@@ -333,8 +333,8 @@ IMPL_LINK_NOARG(SwTitlePageDlg, OKHdl)
 
     if (nNoPages > 1 && mpSh->GotoPage(GetInsertPosition() + nNoPages, false))
     {
-        SwFmtPageDesc aPageFmtDesc(mpNormalDesc);
-        mpSh->SetAttrItem(aPageFmtDesc);
+        SwFormatPageDesc aPageFormatDesc(mpNormalDesc);
+        mpSh->SetAttrItem(aPageFormatDesc);
     }
 
     if (m_pRestartNumberingCB->IsChecked() || nNoPages > 1)
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 20e3cb9b28f0..be75802e7a94 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -43,8 +43,8 @@ static bool bIsKeepColumn = true;
 static sal_Unicode uOther = ',';
 
 void SwConvertTableDlg::GetValues(  sal_Unicode& rDelim,
-                                    SwInsertTableOptions& rInsTblOpts,
-                                    SwTableAutoFmt const*& prTAFmt )
+                                    SwInsertTableOptions& rInsTableOpts,
+                                    SwTableAutoFormat const*& prTAFormat )
 {
     if( mpTabBtn->IsChecked() )
     {
@@ -81,22 +81,22 @@ void SwConvertTableDlg::GetValues(  sal_Unicode& rDelim,
     if (mpHeaderCB->IsChecked())
         nInsMode |= tabopts::HEADLINE;
     if (mpRepeatHeaderCB->IsEnabled() && mpRepeatHeaderCB->IsChecked())
-        rInsTblOpts.mnRowsToRepeat = sal_uInt16( mpRepeatHeaderNF->GetValue() );
+        rInsTableOpts.mnRowsToRepeat = sal_uInt16( mpRepeatHeaderNF->GetValue() );
     else
-        rInsTblOpts.mnRowsToRepeat = 0;
+        rInsTableOpts.mnRowsToRepeat = 0;
     if (!mpDontSplitCB->IsChecked())
         nInsMode |= tabopts::SPLIT_LAYOUT;
 
-    if( pTAutoFmt )
-        prTAFmt = new SwTableAutoFmt( *pTAutoFmt );
+    if( pTAutoFormat )
+        prTAFormat = new SwTableAutoFormat( *pTAutoFormat );
 
-    rInsTblOpts.mnInsMode = nInsMode;
+    rInsTableOpts.mnInsMode = nInsMode;
 }
 
 SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
     : SfxModalDialog(&rView.GetViewFrame()->GetWindow(), "ConvertTextTableDialog", "modules/swriter/ui/converttexttable.ui" )
     , sConvertTextTable(SW_RES(STR_CONVERT_TEXT_TABLE))
-    , pTAutoFmt(0)
+    , pTAutoFormat(0)
     , pShell(&rView.GetWrtShell())
 {
     get(mpTabBtn, "tabs");
@@ -112,7 +112,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
     get(mpRepeatHeaderNF, "repeatheadersb");
     get(mpDontSplitCB, "dontsplitcb");
     get(mpBorderCB, "bordercb");
-    get(mpAutoFmtBtn, "autofmt");
+    get(mpAutoFormatBtn, "autofmt");
 
     if(nSaveButtonState > -1)
     {
@@ -135,8 +135,8 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
     if( bToTable )
     {
         SetText( sConvertTextTable );
-        mpAutoFmtBtn->SetClickHdl(LINK(this, SwConvertTableDlg, AutoFmtHdl));
-        mpAutoFmtBtn->Show();
+        mpAutoFormatBtn->SetClickHdl(LINK(this, SwConvertTableDlg, AutoFormatHdl));
+        mpAutoFormatBtn->Show();
         mpKeepColumn->Show();
         mpKeepColumn->Enable( mpTabBtn->IsChecked() );
     }
@@ -158,13 +158,13 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
 
     bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON);
 
-    SwInsertTableOptions aInsOpts = pModOpt->GetInsTblFlags(bHTMLMode);
-    sal_uInt16 nInsTblFlags = aInsOpts.mnInsMode;
+    SwInsertTableOptions aInsOpts = pModOpt->GetInsTableFlags(bHTMLMode);
+    sal_uInt16 nInsTableFlags = aInsOpts.mnInsMode;
 
-    mpHeaderCB->Check( 0 != (nInsTblFlags & tabopts::HEADLINE) );
+    mpHeaderCB->Check( 0 != (nInsTableFlags & tabopts::HEADLINE) );
     mpRepeatHeaderCB->Check(aInsOpts.mnRowsToRepeat > 0);
-    mpDontSplitCB->Check( 0 == (nInsTblFlags & tabopts::SPLIT_LAYOUT));
-    mpBorderCB->Check( 0!= (nInsTblFlags & tabopts::DEFAULT_BORDER) );
+    mpDontSplitCB->Check( 0 == (nInsTableFlags & tabopts::SPLIT_LAYOUT));
+    mpBorderCB->Check( 0!= (nInsTableFlags & tabopts::DEFAULT_BORDER) );
 
     mpHeaderCB->SetClickHdl(LINK(this, SwConvertTableDlg, CheckBoxHdl));
     mpRepeatHeaderCB->SetClickHdl(LINK(this, SwConvertTableDlg, ReapeatHeaderCheckBoxHdl));
@@ -179,7 +179,7 @@ SwConvertTableDlg:: ~SwConvertTableDlg()
 
 void SwConvertTableDlg::dispose()
 {
-    delete pTAutoFmt;
+    delete pTAutoFormat;
     mpTabBtn.clear();
     mpSemiBtn.clear();
     mpParaBtn.clear();
@@ -193,19 +193,19 @@ void SwConvertTableDlg::dispose()
     mpRepeatHeaderNF.clear();
     mpDontSplitCB.clear();
     mpBorderCB.clear();
-    mpAutoFmtBtn.clear();
+    mpAutoFormatBtn.clear();
     SfxModalDialog::dispose();
 }
 
-IMPL_LINK( SwConvertTableDlg, AutoFmtHdl, PushButton*, pButton )
+IMPL_LINK( SwConvertTableDlg, AutoFormatHdl, PushButton*, pButton )
 {
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pShell, false, pTAutoFmt));
+    boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pShell, false, pTAutoFormat));
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     if( RET_OK == pDlg->Execute())
-        pDlg->FillAutoFmtOfIndex( pTAutoFmt );
+        pDlg->FillAutoFormatOfIndex( pTAutoFormat );
     return 0;
 }
 
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 0a24fe53619f..e471c9cf5d59 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -38,8 +38,8 @@
 #define ROW_COL_PROD 16384
 
 void SwInsTableDlg::GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                                SwInsertTableOptions& rInsTblOpts, OUString& rAutoName,
-                                SwTableAutoFmt *& prTAFmt )
+                                SwInsertTableOptions& rInsTableOpts, OUString& rAutoName,
+                                SwTableAutoFormat *& prTAFormat )
 {
     sal_uInt16 nInsMode = 0;
     rName = m_pNameEdit->GetText();
@@ -51,25 +51,25 @@ void SwInsTableDlg::GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rC
     if (m_pHeaderCB->IsChecked())
         nInsMode |= tabopts::HEADLINE;
     if (m_pRepeatHeaderCB->IsEnabled() && m_pRepeatHeaderCB->IsChecked())
-        rInsTblOpts.mnRowsToRepeat = sal_uInt16( m_pRepeatHeaderNF->GetValue() );
+        rInsTableOpts.mnRowsToRepeat = sal_uInt16( m_pRepeatHeaderNF->GetValue() );
     else
-        rInsTblOpts.mnRowsToRepeat = 0;
+        rInsTableOpts.mnRowsToRepeat = 0;
     if (!m_pDontSplitCB->IsChecked())
         nInsMode |= tabopts::SPLIT_LAYOUT;
-    if( pTAutoFmt )
+    if( pTAutoFormat )
     {
-        prTAFmt = new SwTableAutoFmt( *pTAutoFmt );
-        rAutoName = prTAFmt->GetName();
+        prTAFormat = new SwTableAutoFormat( *pTAutoFormat );
+        rAutoName = prTAFormat->GetName();
     }
 
-    rInsTblOpts.mnInsMode = nInsMode;
+    rInsTableOpts.mnInsMode = nInsMode;
 }
 
 SwInsTableDlg::SwInsTableDlg( SwView& rView )
     : SfxModalDialog(rView.GetWindow(), "InsertTableDialog", "modules/swriter/ui/inserttable.ui")
     , m_aTextFilter(" .<>")
     , pShell(&rView.GetWrtShell())
-    , pTAutoFmt(0)
+    , pTAutoFormat(0)
     , nEnteredValRepeatHeaderNF(-1)
 {
     get(m_pNameEdit, "nameedit");
@@ -80,29 +80,29 @@ SwInsTableDlg::SwInsTableDlg( SwView& rView )
     get(m_pRepeatHeaderCB, "repeatcb");
     get(m_pDontSplitCB, "dontsplitcb");
     get(m_pBorderCB, "bordercb");
-    get(m_pAutoFmtBtn, "autoformat");
+    get(m_pAutoFormatBtn, "autoformat");
     get(m_pInsertBtn, "ok");
     get(m_pRepeatGroup, "repeatgroup");
     get(m_pRepeatHeaderNF, "repeatheaderspin");
 
-    m_pNameEdit->SetText(pShell->GetUniqueTblName());
+    m_pNameEdit->SetText(pShell->GetUniqueTableName());
     m_pNameEdit->SetModifyHdl(LINK(this, SwInsTableDlg, ModifyName));
     m_pColNF->SetModifyHdl(LINK(this, SwInsTableDlg, ModifyRowCol));
     m_pRowNF->SetModifyHdl(LINK(this, SwInsTableDlg, ModifyRowCol));
 
     m_pRowNF->SetMax(ROW_COL_PROD/m_pColNF->GetValue());
     m_pColNF->SetMax(ROW_COL_PROD/m_pRowNF->GetValue());
-    m_pAutoFmtBtn->SetClickHdl(LINK(this, SwInsTableDlg, AutoFmtHdl));
+    m_pAutoFormatBtn->SetClickHdl(LINK(this, SwInsTableDlg, AutoFormatHdl));
 
     m_pInsertBtn->SetClickHdl(LINK(this, SwInsTableDlg, OKHdl));
 
     bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON);
     const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
-    SwInsertTableOptions aInsOpts = pModOpt->GetInsTblFlags(bHTMLMode);
-    sal_uInt16 nInsTblFlags = aInsOpts.mnInsMode;
+    SwInsertTableOptions aInsOpts = pModOpt->GetInsTableFlags(bHTMLMode);
+    sal_uInt16 nInsTableFlags = aInsOpts.mnInsMode;
 
-    m_pHeaderCB->Check( 0 != (nInsTblFlags & tabopts::HEADLINE) );
+    m_pHeaderCB->Check( 0 != (nInsTableFlags & tabopts::HEADLINE) );
     m_pRepeatHeaderCB->Check(aInsOpts.mnRowsToRepeat > 0);
     if(bHTMLMode)
     {
@@ -111,9 +111,9 @@ SwInsTableDlg::SwInsTableDlg( SwView& rView )
     }
     else
     {
-        m_pDontSplitCB->Check( 0 == (nInsTblFlags & tabopts::SPLIT_LAYOUT) );
+        m_pDontSplitCB->Check( 0 == (nInsTableFlags & tabopts::SPLIT_LAYOUT) );
     }
-    m_pBorderCB->Check( 0 != (nInsTblFlags & tabopts::DEFAULT_BORDER) );
+    m_pBorderCB->Check( 0 != (nInsTableFlags & tabopts::DEFAULT_BORDER) );
 
     m_pRepeatHeaderNF->SetModifyHdl( LINK( this, SwInsTableDlg, ModifyRepeatHeaderNF_Hdl ) );
     m_pHeaderCB->SetClickHdl(LINK(this, SwInsTableDlg, CheckBoxHdl));
@@ -142,7 +142,7 @@ SwInsTableDlg::~SwInsTableDlg()
 
 void SwInsTableDlg::dispose()
 {
-    delete pTAutoFmt;
+    delete pTAutoFormat;
     m_pNameEdit.clear();
     m_pColNF.clear();
     m_pRowNF.clear();
@@ -153,20 +153,20 @@ void SwInsTableDlg::dispose()
     m_pDontSplitCB.clear();
     m_pBorderCB.clear();
     m_pInsertBtn.clear();
-    m_pAutoFmtBtn.clear();
+    m_pAutoFormatBtn.clear();
     SfxModalDialog::dispose();
 }
 
 IMPL_LINK( SwInsTableDlg, ModifyName, Edit *, pEdit )
 {
-    OUString sTblName = pEdit->GetText();
-    if (sTblName.indexOf(' ') != -1)
+    OUString sTableName = pEdit->GetText();
+    if (sTableName.indexOf(' ') != -1)
     {
-        sTblName = sTblName.replaceAll(" ", "");
-        pEdit->SetText(sTblName);
+        sTableName = sTableName.replaceAll(" ", "");
+        pEdit->SetText(sTableName);
     }
 
-    m_pInsertBtn->Enable(pShell->GetTblStyle( sTblName ) == 0);
+    m_pInsertBtn->Enable(pShell->GetTableStyle( sTableName ) == 0);
     return 0;
 }
 
@@ -200,15 +200,15 @@ IMPL_LINK( SwInsTableDlg, ModifyRowCol, NumericField *, pField )
     return 0;
 }
 
-IMPL_LINK( SwInsTableDlg, AutoFmtHdl, PushButton*, pButton )
+IMPL_LINK( SwInsTableDlg, AutoFormatHdl, PushButton*, pButton )
 {
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton,pShell, false, pTAutoFmt));
+    boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton,pShell, false, pTAutoFormat));
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     if( RET_OK == pDlg->Execute())
-        pDlg->FillAutoFmtOfIndex( pTAutoFmt );
+        pDlg->FillAutoFormatOfIndex( pTAutoFormat );
     return 0;
 }
 
diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx
index 1206a8b04842..b00fca6ca93e 100644
--- a/sw/source/ui/table/mergetbl.cxx
+++ b/sw/source/ui/table/mergetbl.cxx
@@ -20,7 +20,7 @@
 #include <swtypes.hxx>
 #include <mergetbl.hxx>
 
-SwMergeTblDlg::SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev )
+SwMergeTableDlg::SwMergeTableDlg( vcl::Window *pParent, bool& rWithPrev )
     : SvxStandardDialog(pParent, "MergeTableDialog", "modules/swriter/ui/mergetabledialog.ui")
     , m_rMergePrev(rWithPrev)
 {
@@ -28,19 +28,19 @@ SwMergeTblDlg::SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev )
     m_pMergePrevRB->Check();
 }
 
-SwMergeTblDlg::~SwMergeTblDlg()
+SwMergeTableDlg::~SwMergeTableDlg()
 {
     disposeOnce();
 }
 
-void SwMergeTblDlg::dispose()
+void SwMergeTableDlg::dispose()
 {
     m_pMergePrevRB.clear();
     SvxStandardDialog::dispose();
 }
 
 
-void SwMergeTblDlg::Apply()
+void SwMergeTableDlg::Apply()
 {
     m_rMergePrev = m_pMergePrevRB->IsChecked();
 }
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index 6c8bdb49b0c0..0dddb91636a0 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -38,7 +38,7 @@
 void SwTableHeightDlg::Apply()
 {
     SwTwips nHeight = static_cast< SwTwips >(m_pHeightEdit->Denormalize(m_pHeightEdit->GetValue(FUNIT_TWIP)));
-    SwFmtFrmSize aSz(ATT_FIX_SIZE, 0, nHeight);
+    SwFormatFrmSize aSz(ATT_FIX_SIZE, 0, nHeight);
 
     SwFrmSize eFrmSize = m_pAutoHeightCB->IsChecked() ?
         ATT_MIN_SIZE : ATT_FIX_SIZE;
@@ -63,7 +63,7 @@ SwTableHeightDlg::SwTableHeightDlg(vcl::Window *pParent, SwWrtShell &rS)
     m_pHeightEdit->SetMin(MINLAY, FUNIT_TWIP);
     if(!m_pHeightEdit->GetMin())
         m_pHeightEdit->SetMin(1);
-    SwFmtFrmSize *pSz;
+    SwFormatFrmSize *pSz;
     rSh.GetRowHeight( pSz );
     if ( pSz )
     {
diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx
index c1d00489c519..3411b7740de0 100644
--- a/sw/source/ui/table/splittbl.cxx
+++ b/sw/source/ui/table/splittbl.cxx
@@ -22,32 +22,32 @@
 #include <table.hrc>
 #include <tblenum.hxx>
 
-SwSplitTblDlg::SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh )
+SwSplitTableDlg::SwSplitTableDlg( vcl::Window *pParent, SwWrtShell &rSh )
     : SvxStandardDialog( pParent, "SplitTableDialog", "modules/swriter/ui/splittable.ui" )
     , rShell(rSh)
     , m_nSplit(HEADLINE_CNTNTCOPY)
 {
-    get(mpCntntCopyRB, "copyheading");
+    get(mpContentCopyRB, "copyheading");
     get(mpBoxAttrCopyWithParaRB, "customheadingapplystyle");
     get(mpBoxAttrCopyNoParaRB, "customheading");
     get(mpBorderCopyRB, "noheading");
 }
 
-SwSplitTblDlg::~SwSplitTblDlg()
+SwSplitTableDlg::~SwSplitTableDlg()
 {
     disposeOnce();
 }
 
-void SwSplitTblDlg::dispose()
+void SwSplitTableDlg::dispose()
 {
-    mpCntntCopyRB.clear();
+    mpContentCopyRB.clear();
     mpBoxAttrCopyWithParaRB.clear();
     mpBoxAttrCopyNoParaRB.clear();
     mpBorderCopyRB.clear();
     SvxStandardDialog::dispose();
 }
 
-void SwSplitTblDlg::Apply()
+void SwSplitTableDlg::Apply()
 {
     m_nSplit = HEADLINE_CNTNTCOPY;
     if(mpBoxAttrCopyWithParaRB->IsChecked())
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 2796753c4f72..e757f3d02903 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -66,7 +66,7 @@ using namespace ::com::sun::star;
 SwFormatTablePage::SwFormatTablePage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", &rSet)
     , m_aTextFilter(" .<>")
-    , pTblData(0)
+    , pTableData(0)
     , nSaveWidth(0)
     , nMinTableWidth(MINLAY)
     , bModified(false)
@@ -169,7 +169,7 @@ void  SwFormatTablePage::Init()
 
 IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
 {
-    OSL_ENSURE(pTblData, "table data not available?");
+    OSL_ENSURE(pTableData, "table data not available?");
     bool bIsChecked = pBtn->IsChecked();
     sal_Int64 nLeft  = m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue(FUNIT_TWIP ));
     sal_Int64 nRight = m_aRightMF.DenormalizePercent(m_aRightMF.GetValue(FUNIT_TWIP ));
@@ -179,9 +179,9 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
 
     if (bIsChecked)
     {
-        m_aWidthMF.SetRefValue(pTblData->GetSpace());
-        m_aLeftMF.SetRefValue(pTblData->GetSpace());
-        m_aRightMF.SetRefValue(pTblData->GetSpace());
+        m_aWidthMF.SetRefValue(pTableData->GetSpace());
+        m_aLeftMF.SetRefValue(pTableData->GetSpace());
+        m_aRightMF.SetRefValue(pTableData->GetSpace());
         m_aLeftMF.SetMetricFieldMin(0); //will be overwritten by the Percentfield
         m_aRightMF.SetMetricFieldMin(0); //dito
         m_aLeftMF.SetMetricFieldMax(99);
@@ -215,7 +215,7 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, void *, pControl )
         m_aLeftMF.SetPrcntValue(0);
         m_aRightMF.SetPrcntValue(0);
         nSaveWidth = static_cast< SwTwips >(m_aWidthMF.DenormalizePercent(m_aWidthMF.GetValue(FUNIT_TWIP )));
-        m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(pTblData->GetSpace() ), FUNIT_TWIP );
+        m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(pTableData->GetSpace() ), FUNIT_TWIP );
         bFull = true;
         bRestore = false;
     }
@@ -306,7 +306,7 @@ void  SwFormatTablePage::ModifyHdl(const Edit * pEdit)
     {
         if( nCurWidth < MINLAY )
             nCurWidth = MINLAY;
-        nDiff = nRight + nLeft + nCurWidth - pTblData->GetSpace() ;
+        nDiff = nRight + nLeft + nCurWidth - pTableData->GetSpace() ;
         //right aligned: only change the left margin
         if(m_pRightBtn->IsChecked())
             nLeft -= nDiff;
@@ -328,7 +328,7 @@ void  SwFormatTablePage::ModifyHdl(const Edit * pEdit)
                 {
                     nRight += nLeft - nDiff;
                     nLeft = 0;
-                    nCurWidth = pTblData->GetSpace();
+                    nCurWidth = pTableData->GetSpace();
                 }
 
             }
@@ -358,10 +358,10 @@ void  SwFormatTablePage::ModifyHdl(const Edit * pEdit)
     if (pEdit == m_aRightMF.get())
     {
 
-        if( nRight + nLeft > pTblData->GetSpace() - MINLAY )
-            nRight = pTblData->GetSpace() -nLeft - MINLAY;
+        if( nRight + nLeft > pTableData->GetSpace() - MINLAY )
+            nRight = pTableData->GetSpace() -nLeft - MINLAY;
 
-        nCurWidth = pTblData->GetSpace() - nLeft - nRight;
+        nCurWidth = pTableData->GetSpace() - nLeft - nRight;
     }
     if (pEdit == m_aLeftMF.get())
     {
@@ -370,22 +370,22 @@ void  SwFormatTablePage::ModifyHdl(const Edit * pEdit)
             bool bCenter = m_pCenterBtn->IsChecked();
             if( bCenter )
                 nRight = nLeft;
-            if(nRight + nLeft > pTblData->GetSpace() - MINLAY )
+            if(nRight + nLeft > pTableData->GetSpace() - MINLAY )
             {
-                nLeft  = bCenter ?  (pTblData->GetSpace() - MINLAY) /2 :
-                                    (pTblData->GetSpace() - MINLAY) - nRight;
-                nRight = bCenter ?  (pTblData->GetSpace() - MINLAY) /2 : nRight;
+                nLeft  = bCenter ?  (pTableData->GetSpace() - MINLAY) /2 :
+                                    (pTableData->GetSpace() - MINLAY) - nRight;
+                nRight = bCenter ?  (pTableData->GetSpace() - MINLAY) /2 : nRight;
             }
-            nCurWidth = pTblData->GetSpace() - nLeft - nRight;
+            nCurWidth = pTableData->GetSpace() - nLeft - nRight;
         }
         else
         {
             //Upon changes on the left side the right margin will be changed at first,
             //thereafter the width.
-            nDiff = nRight + nLeft + nCurWidth - pTblData->GetSpace() ;
+            nDiff = nRight + nLeft + nCurWidth - pTableData->GetSpace() ;
 
             nRight -= nDiff;
-            nCurWidth = pTblData->GetSpace() - nLeft - nRight;
+            nCurWidth = pTableData->GetSpace() - nLeft - nRight;
         }
     }
     if (nCurWidth != nPrevWidth )
@@ -478,14 +478,14 @@ void  SwFormatTablePage::Reset( const SfxItemSet* )
 
     if(SfxItemState::SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem ))
     {
-        pTblData = static_cast<SwTableRep*>(static_cast<const SwPtrItem*>( pItem)->GetValue());
-        nMinTableWidth = pTblData->GetColCount() * MINLAY;
+        pTableData = static_cast<SwTableRep*>(static_cast<const SwPtrItem*>( pItem)->GetValue());
+        nMinTableWidth = pTableData->GetColCount() * MINLAY;
 
-        if(pTblData->GetWidthPercent())
+        if(pTableData->GetWidthPercent())
         {
             m_pRelWidthCB->Check(true);
             RelWidthClickHdl(m_pRelWidthCB);
-            m_aWidthMF.SetPrcntValue(pTblData->GetWidthPercent(), FUNIT_CUSTOM);
+            m_aWidthMF.SetPrcntValue(pTableData->GetWidthPercent(), FUNIT_CUSTOM);
 
             m_aWidthMF.SaveValue();
             nSaveWidth = static_cast< SwTwips >(m_aWidthMF.GetValue(FUNIT_CUSTOM));
@@ -493,26 +493,26 @@ void  SwFormatTablePage::Reset( const SfxItemSet* )
         else
         {
             m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(
-                    pTblData->GetWidth()), FUNIT_TWIP);
+                    pTableData->GetWidth()), FUNIT_TWIP);
             m_aWidthMF.SaveValue();
-            nSaveWidth = pTblData->GetWidth();
+            nSaveWidth = pTableData->GetWidth();
             nMinTableWidth = std::min( nSaveWidth, nMinTableWidth );
         }
 
-        m_aWidthMF.SetRefValue(pTblData->GetSpace());
-        m_aWidthMF.SetLast(m_aWidthMF.NormalizePercent( pTblData->GetSpace() ));
-        m_aLeftMF.SetLast(m_aLeftMF.NormalizePercent( pTblData->GetSpace() ));
-        m_aRightMF.SetLast(m_aRightMF.NormalizePercent( pTblData->GetSpace() ));
+        m_aWidthMF.SetRefValue(pTableData->GetSpace());
+        m_aWidthMF.SetLast(m_aWidthMF.NormalizePercent( pTableData->GetSpace() ));
+        m_aLeftMF.SetLast(m_aLeftMF.NormalizePercent( pTableData->GetSpace() ));
+        m_aRightMF.SetLast(m_aRightMF.NormalizePercent( pTableData->GetSpace() ));
 
         m_aLeftMF.SetPrcntValue(m_aLeftMF.NormalizePercent(
-                    pTblData->GetLeftSpace()), FUNIT_TWIP);
+                    pTableData->GetLeftSpace()), FUNIT_TWIP);
         m_aRightMF.SetPrcntValue(m_aRightMF.NormalizePercent(
-                    pTblData->GetRightSpace()), FUNIT_TWIP);
+                    pTableData->GetRightSpace()), FUNIT_TWIP);
         m_aLeftMF.SaveValue();
         m_aRightMF.SaveValue();
 
         bool bSetRight = false, bSetLeft = false;
-        switch( pTblData->GetAlign() )
+        switch( pTableData->GetAlign() )
         {
             case text::HoriOrientation::NONE:
                 m_pFreeBtn->Check();
@@ -586,22 +586,22 @@ void  SwFormatTablePage::Reset( const SfxItemSet* )
         m_pTextDirectionLB->SaveValue();
     }
 
-    m_aWidthMF.SetMax( 2*m_aWidthMF.NormalizePercent( pTblData->GetSpace() ), FUNIT_TWIP );
-    m_aRightMF.SetMax( m_aRightMF.NormalizePercent( pTblData->GetSpace() ), FUNIT_TWIP );
-    m_aLeftMF.SetMax( m_aLeftMF.NormalizePercent( pTblData->GetSpace() ), FUNIT_TWIP );
+    m_aWidthMF.SetMax( 2*m_aWidthMF.NormalizePercent( pTableData->GetSpace() ), FUNIT_TWIP );
+    m_aRightMF.SetMax( m_aRightMF.NormalizePercent( pTableData->GetSpace() ), FUNIT_TWIP );
+    m_aLeftMF.SetMax( m_aLeftMF.NormalizePercent( pTableData->GetSpace() ), FUNIT_TWIP );
     m_aWidthMF.SetMin( m_aWidthMF.NormalizePercent( nMinTableWidth ), FUNIT_TWIP );
 
 }
 
 void    SwFormatTablePage::ActivatePage( const SfxItemSet& rSet )
 {
-    OSL_ENSURE(pTblData, "table data not available?");
+    OSL_ENSURE(pTableData, "table data not available?");
     if(SfxItemState::SET == rSet.GetItemState( FN_TABLE_REP ))
     {
-        SwTwips nCurWidth = text::HoriOrientation::FULL != pTblData->GetAlign() ?
-                                        pTblData->GetWidth() :
-                                            pTblData->GetSpace();
-        if(pTblData->GetWidthPercent() == 0 &&
+        SwTwips nCurWidth = text::HoriOrientation::FULL != pTableData->GetAlign() ?
+                                        pTableData->GetWidth() :
+                                            pTableData->GetSpace();
+        if(pTableData->GetWidthPercent() == 0 &&
                 nCurWidth != m_aWidthMF.DenormalizePercent(m_aWidthMF.GetValue(FUNIT_TWIP )))
         {
             m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(
@@ -609,10 +609,10 @@ void    SwFormatTablePage::ActivatePage( const SfxItemSet& rSet )
             m_aWidthMF.SaveValue();
             nSaveWidth = nCurWidth;
             m_aLeftMF.SetPrcntValue(m_aLeftMF.NormalizePercent(
-                            pTblData->GetLeftSpace()), FUNIT_TWIP);
+                            pTableData->GetLeftSpace()), FUNIT_TWIP);
             m_aLeftMF.SaveValue();
             m_aRightMF.SetPrcntValue(m_aRightMF.NormalizePercent(
-                            pTblData->GetRightSpace()), FUNIT_TWIP);
+                            pTableData->GetRightSpace()), FUNIT_TWIP);
             m_aRightMF.SaveValue();
         }
     }
@@ -625,8 +625,8 @@ SfxTabPage::sfxpg SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
     //in the dialog lose the focus
     m_pNameED->GrabFocus();
     //test the table name for spaces
-    OUString sTblName = m_pNameED->GetText();
-    if(sTblName.indexOf(' ') != -1)
+    OUString sTableName = m_pNameED->GetText();
+    if(sTableName.indexOf(' ') != -1)
     {
         MessageDialog(this, SW_RES(STR_WRONG_TABLENAME), VCL_MESSAGE_INFO).Execute();
         m_pNameED->GrabFocus();
@@ -643,55 +643,55 @@ SfxTabPage::sfxpg SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
             if( m_aLeftMF.GetText() != m_aLeftMF.GetSavedValue() ||
                 m_aRightMF.GetText() != m_aRightMF.GetSavedValue() )
             {
-                pTblData->SetWidthChanged();
-                pTblData->SetLeftSpace( lLeft);
-                pTblData->SetRightSpace( lRight);
+                pTableData->SetWidthChanged();
+                pTableData->SetLeftSpace( lLeft);
+                pTableData->SetRightSpace( lRight);
             }
 
             SwTwips lWidth;
             if (m_pRelWidthCB->IsChecked() && m_pRelWidthCB->IsEnabled())
             {
-                lWidth = pTblData->GetSpace() - lRight - lLeft;
+                lWidth = pTableData->GetSpace() - lRight - lLeft;
                 const sal_uInt16 nPercentWidth = m_aWidthMF.GetValue(FUNIT_CUSTOM);
-                if(pTblData->GetWidthPercent() != nPercentWidth)
+                if(pTableData->GetWidthPercent() != nPercentWidth)
                 {
-                    pTblData->SetWidthPercent(nPercentWidth);
-                    pTblData->SetWidthChanged();
+                    pTableData->SetWidthPercent(nPercentWidth);
+                    pTableData->SetWidthChanged();
                 }
             }
             else
             {
-                pTblData->SetWidthPercent(0);
+                pTableData->SetWidthPercent(0);
                 lWidth = static_cast< SwTwips >(m_aWidthMF.DenormalizePercent(m_aWidthMF.GetValue( FUNIT_TWIP )));
             }
-            pTblData->SetWidth(lWidth);
+            pTableData->SetWidth(lWidth);
 
             SwTwips nColSum = 0;
 
-            for( sal_uInt16 i = 0; i < pTblData->GetColCount(); i++)
+            for( sal_uInt16 i = 0; i < pTableData->GetColCount(); i++)
             {
-                nColSum += pTblData->GetColumns()[i].nWidth;
+                nColSum += pTableData->GetColumns()[i].nWidth;
             }
-            if(nColSum != pTblData->GetWidth())
+            if(nColSum != pTableData->GetWidth())
             {
                 SwTwips nMinWidth = std::min( (long)MINLAY,
-                                    (long) (pTblData->GetWidth() /
-                                            pTblData->GetColCount() - 1));
-                SwTwips nDiff = nColSum - pTblData->GetWidth();
-                while ( std::abs(nDiff) > pTblData->GetColCount() + 1 )
+                                    (long) (pTableData->GetWidth() /
+                                            pTableData->GetColCount() - 1));
+                SwTwips nDiff = nColSum - pTableData->GetWidth();
+                while ( std::abs(nDiff) > pTableData->GetColCount() + 1 )
                 {
-                    SwTwips nSub = nDiff / pTblData->GetColCount();
-                    for( sal_uInt16 i = 0; i < pTblData->GetColCount(); i++)
+                    SwTwips nSub = nDiff / pTableData->GetColCount();
+                    for( sal_uInt16 i = 0; i < pTableData->GetColCount(); i++)
                     {
-                        if(pTblData->GetColumns()[i].nWidth - nMinWidth > nSub)
+                        if(pTableData->GetColumns()[i].nWidth - nMinWidth > nSub)
                         {
-                            pTblData->GetColumns()[i].nWidth -= nSub;
+                            pTableData->GetColumns()[i].nWidth -= nSub;
                             nDiff -= nSub;
                         }
                         else
                         {
-                            nDiff -= pTblData->GetColumns()[i].nWidth - nMinWidth;
-                            pTblData->GetColumns()[i].nWidth = nMinWidth;
+                            nDiff -= pTableData->GetColumns()[i].nWidth - nMinWidth;
+                            pTableData->GetColumns()[i].nWidth = nMinWidth;
                         }
 
                     }
@@ -714,20 +714,20 @@ SfxTabPage::sfxpg SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
                 nAlign = text::HoriOrientation::FULL;
                 lWidth = lAutoWidth;
             }
-            if(nAlign != pTblData->GetAlign())
+            if(nAlign != pTableData->GetAlign())
             {
-                pTblData->SetWidthChanged();
-                pTblData->SetAlign(nAlign);
+                pTableData->SetWidthChanged();
+                pTableData->SetAlign(nAlign);
             }
 
-            if(pTblData->GetWidth() != lWidth )
+            if(pTableData->GetWidth() != lWidth )
             {
-                pTblData->SetWidthChanged();
-                pTblData->SetWidth(
-                    nAlign == text::HoriOrientation::FULL ? pTblData->GetSpace() : lWidth );
+                pTableData->SetWidthChanged();
+                pTableData->SetWidth(
+                    nAlign == text::HoriOrientation::FULL ? pTableData->GetSpace() : lWidth );
             }
-            if(pTblData->HasWidthChanged())
-                _pSet->Put(SwPtrItem(FN_TABLE_REP, pTblData));
+            if(pTableData->HasWidthChanged())
+                _pSet->Put(SwPtrItem(FN_TABLE_REP, pTableData));
         }
     }
     return LEAVE_PAGE;
@@ -737,13 +737,13 @@ SfxTabPage::sfxpg SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
 SwTableColumnPage::SwTableColumnPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "TableColumnPage",
         "modules/swriter/ui/tablecolumnpage.ui", &rSet)
-    , pTblData(0)
+    , pTableData(0)
     , nTableWidth(0)
     , nMinWidth(MINLAY)
     , nNoOfCols(0)
     , nNoOfVisibleCols(0)
     , bModified(false)
-    , bModifyTbl(false)
+    , bModifyTable(false)
     , bPercentMode(false)
 {
     get(m_pModifyTableCB, "adaptwidth");
@@ -805,17 +805,17 @@ void  SwTableColumnPage::Reset( const SfxItemSet* )
     const SfxPoolItem* pItem;
     if(SfxItemState::SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem ))
     {
-        pTblData = static_cast<SwTableRep*>(static_cast<const SwPtrItem*>( pItem)->GetValue());
-        nNoOfVisibleCols = pTblData->GetColCount();
-        nNoOfCols = pTblData->GetAllColCount();
-        nTableWidth = pTblData->GetAlign() != text::HoriOrientation::FULL &&
-                            pTblData->GetAlign() != text::HoriOrientation::LEFT_AND_WIDTH?
-                        pTblData->GetWidth() : pTblData->GetSpace();
+        pTableData = static_cast<SwTableRep*>(static_cast<const SwPtrItem*>( pItem)->GetValue());
+        nNoOfVisibleCols = pTableData->GetColCount();
+        nNoOfCols = pTableData->GetAllColCount();
+        nTableWidth = pTableData->GetAlign() != text::HoriOrientation::FULL &&
+                            pTableData->GetAlign() != text::HoriOrientation::LEFT_AND_WIDTH?
+                        pTableData->GetWidth() : pTableData->GetSpace();
 
         for( sal_uInt16 i = 0; i < nNoOfCols; i++ )
         {
-            if( pTblData->GetColumns()[i].nWidth  < nMinWidth )
-                    nMinWidth = pTblData->GetColumns()[i].nWidth;
+            if( pTableData->GetColumns()[i].nWidth  < nMinWidth )
+                    nMinWidth = pTableData->GetColumns()[i].nWidth;
         }
         sal_Int64 nMinTwips = m_aFieldArr[0].NormalizePercent( nMinWidth );
         sal_Int64 nMaxTwips = m_aFieldArr[0].NormalizePercent( nTableWidth );
@@ -850,7 +850,7 @@ void  SwTableColumnPage::Init(bool bWeb)
     Link<> aLkLF = LINK( this, SwTableColumnPage, LoseFocusHdl );
     for( sal_uInt16 i = 0; i < MET_FIELDS; i++ )
     {
-        aValueTbl[i] = i;
+        aValueTable[i] = i;
         m_aFieldArr[i].SetMetric(aMetric);
         m_aFieldArr[i].SetUpHdl( aLkUp );
         m_aFieldArr[i].SetDownHdl( aLkDown );
@@ -872,24 +872,24 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, void *, pControl )
     //move display window
     if(pControl == m_pDownBtn.get())
     {
-        if(aValueTbl[0] > 0)
+        if(aValueTable[0] > 0)
         {
             for( sal_uInt16 i=0; i < MET_FIELDS; i++ )
-                aValueTbl[i] -= 1;
+                aValueTable[i] -= 1;
         }
     }
     if (pControl == m_pUpBtn.get())
     {
-        if( aValueTbl[ MET_FIELDS -1 ] < nNoOfVisibleCols -1  )
+        if( aValueTable[ MET_FIELDS -1 ] < nNoOfVisibleCols -1  )
         {
             for(sal_uInt16 i=0;i < MET_FIELDS;i++)
-                aValueTbl[i] += 1;
+                aValueTable[i] += 1;
         }
     }
     for( sal_uInt16 i = 0; (i < nNoOfVisibleCols ) && ( i < MET_FIELDS); i++ )
     {
         OUString sEntry('~');
-        OUString sIndex = OUString::number( aValueTbl[i] + 1 );
+        OUString sIndex = OUString::number( aValueTable[i] + 1 );
         sEntry += sIndex;
         m_pTextArr[i]->SetText( sEntry );
 
@@ -899,8 +899,8 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, void *, pControl )
         m_aFieldArr[i].SetAccessibleName( sColumnWidth );
     }
 
-    m_pDownBtn->Enable(aValueTbl[0] > 0);
-    m_pUpBtn->Enable(aValueTbl[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 );
+    m_pDownBtn->Enable(aValueTable[0] > 0);
+    m_pUpBtn->Enable(aValueTable[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 );
     UpdateCols(0);
     return 0;
 }
@@ -936,7 +936,7 @@ IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox )
     {
         if(bCheck)
             m_pModifyTableCB->Check();
-        m_pModifyTableCB->Enable(!bCheck && bModifyTbl);
+        m_pModifyTableCB->Enable(!bCheck && bModifyTable);
     }
     return 0;
 }
@@ -954,7 +954,7 @@ bool  SwTableColumnPage::FillItemSet( SfxItemSet* )
 
     if(bModified)
     {
-        pTblData->SetColsChanged();
+        pTableData->SetColsChanged();
     }
     return bModified;
 }
@@ -979,9 +979,9 @@ void   SwTableColumnPage::ModifyHdl( MetricField* pField )
             return;
         }
 
-        SetVisibleWidth(aValueTbl[i], static_cast< SwTwips >(pEdit->DenormalizePercent(pEdit->GetValue( FUNIT_TWIP ))) );
+        SetVisibleWidth(aValueTable[i], static_cast< SwTwips >(pEdit->DenormalizePercent(pEdit->GetValue( FUNIT_TWIP ))) );
 
-        UpdateCols( aValueTbl[i] );
+        UpdateCols( aValueTable[i] );
 }
 
 void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
@@ -990,7 +990,7 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
 
     for( sal_uInt16 i = 0; i < nNoOfCols; i++ )
     {
-        nSum += (pTblData->GetColumns())[i].nWidth;
+        nSum += (pTableData->GetColumns())[i].nWidth;
     }
     SwTwips nDiff = nSum - nTableWidth;
 
@@ -1041,11 +1041,11 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
     {
         //Difference is balanced by the width of the table,
         //other columns remain unchanged.
-        OSL_ENSURE(nDiff <= pTblData->GetSpace() - nTableWidth, "wrong maximum" );
-        SwTwips nActSpace = pTblData->GetSpace() - nTableWidth;
+        OSL_ENSURE(nDiff <= pTableData->GetSpace() - nTableWidth, "wrong maximum" );
+        SwTwips nActSpace = pTableData->GetSpace() - nTableWidth;
         if(nDiff > nActSpace)
         {
-            nTableWidth = pTblData->GetSpace();
+            nTableWidth = pTableData->GetSpace();
             SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) - nDiff + nActSpace );
         }
         else
@@ -1057,11 +1057,11 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
     {
         //All columns will be changed proportionally with,
         //the table width is adjusted accordingly.
-        OSL_ENSURE(nDiff * nNoOfVisibleCols <= pTblData->GetSpace() - nTableWidth, "wrong maximum" );
+        OSL_ENSURE(nDiff * nNoOfVisibleCols <= pTableData->GetSpace() - nTableWidth, "wrong maximum" );
         long nAdd = nDiff;
-        if(nDiff * nNoOfVisibleCols > pTblData->GetSpace() - nTableWidth)
+        if(nDiff * nNoOfVisibleCols > pTableData->GetSpace() - nTableWidth)
         {
-            nAdd = (pTblData->GetSpace() - nTableWidth) / nNoOfVisibleCols;
+            nAdd = (pTableData->GetSpace() - nTableWidth) / nNoOfVisibleCols;
             SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) - nDiff + nAdd );
             nDiff = nAdd;
         }
@@ -1087,56 +1087,56 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
     }
 
     if(!bPercentMode)
-        m_pSpaceED->SetValue(m_pSpaceED->Normalize( pTblData->GetSpace() - nTableWidth) , FUNIT_TWIP);
+        m_pSpaceED->SetValue(m_pSpaceED->Normalize( pTableData->GetSpace() - nTableWidth) , FUNIT_TWIP);
 
     for( sal_uInt16 i = 0; ( i < nNoOfVisibleCols ) && ( i < MET_FIELDS ); i++)
     {
         m_aFieldArr[i].SetPrcntValue(m_aFieldArr[i].NormalizePercent(
-                        GetVisibleWidth(aValueTbl[i]) ), FUNIT_TWIP);
+                        GetVisibleWidth(aValueTable[i]) ), FUNIT_TWIP);
         m_aFieldArr[i].ClearModifyFlag();
     }
 }
 
 void    SwTableColumnPage::ActivatePage( const SfxItemSet& )
 {
-    bPercentMode = pTblData->GetWidthPercent() != 0;
+    bPercentMode = pTableData->GetWidthPercent() != 0;
     for( sal_uInt16 i = 0; (i < MET_FIELDS) && (i < nNoOfVisibleCols); i++ )
     {
-        m_aFieldArr[i].SetRefValue(pTblData->GetWidth());
+        m_aFieldArr[i].SetRefValue(pTableData->GetWidth());
         m_aFieldArr[i].ShowPercent( bPercentMode );
     }
 
-    const sal_uInt16 nTblAlign = pTblData->GetAlign();
-    if((text::HoriOrientation::FULL != nTblAlign && nTableWidth != pTblData->GetWidth()) ||
-    (text::HoriOrientation::FULL == nTblAlign && nTableWidth != pTblData->GetSpace()))
+    const sal_uInt16 nTableAlign = pTableData->GetAlign();
+    if((text::HoriOrientation::FULL != nTableAlign && nTableWidth != pTableData->GetWidth()) ||
+    (text::HoriOrientation::FULL == nTableAlign && nTableWidth != pTableData->GetSpace()))
     {
-        nTableWidth = text::HoriOrientation::FULL == nTblAlign ?
-                                    pTblData->GetSpace() :
-                                        pTblData->GetWidth();
+        nTableWidth = text::HoriOrientation::FULL == nTableAlign ?
+                                    pTableData->GetSpace() :
+                                        pTableData->GetWidth();
         UpdateCols(0);
     }
-    bModifyTbl = true;
-    if(pTblData->GetWidthPercent() ||
-                text::HoriOrientation::FULL == nTblAlign ||
-                        pTblData->IsLineSelected()  )
-        bModifyTbl = false;
+    bModifyTable = true;
+    if(pTableData->GetWidthPercent() ||
+                text::HoriOrientation::FULL == nTableAlign ||
+                        pTableData->IsLineSelected()  )
+        bModifyTable = false;
     if(bPercentMode)
     {
         m_pModifyTableCB->Check(false);
         m_pProportionalCB->Check(false);
     }
-    else if( !bModifyTbl )
+    else if( !bModifyTable )
     {
         m_pProportionalCB->Check(false);
         m_pModifyTableCB->Check(false);
     }
     m_pSpaceFT->Enable(!bPercentMode);
     m_pSpaceED->Enable(!bPercentMode);
-    m_pModifyTableCB->Enable( !bPercentMode && bModifyTbl );
-    m_pProportionalCB->Enable(!bPercentMode && bModifyTbl );
+    m_pModifyTableCB->Enable( !bPercentMode && bModifyTable );
+    m_pProportionalCB->Enable(!bPercentMode && bModifyTable );
 
     m_pSpaceED->SetValue(m_pSpaceED->Normalize(
-                pTblData->GetSpace() - nTableWidth) , FUNIT_TWIP);
+                pTableData->GetSpace() - nTableWidth) , FUNIT_TWIP);
 
 }
 
@@ -1145,59 +1145,59 @@ SfxTabPage::sfxpg SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet )
     if(_pSet)
     {
         FillItemSet(_pSet);
-        if(text::HoriOrientation::FULL != pTblData->GetAlign() && pTblData->GetWidth() != nTableWidth)
+        if(text::HoriOrientation::FULL != pTableData->GetAlign() && pTableData->GetWidth() != nTableWidth)
         {
-            pTblData->SetWidth(nTableWidth);
-            SwTwips nDiff = pTblData->GetSpace() - pTblData->GetWidth() -
-                            pTblData->GetLeftSpace() - pTblData->GetRightSpace();
-            switch( pTblData->GetAlign()  )
+            pTableData->SetWidth(nTableWidth);
+            SwTwips nDiff = pTableData->GetSpace() - pTableData->GetWidth() -
+                            pTableData->GetLeftSpace() - pTableData->GetRightSpace();
+            switch( pTableData->GetAlign()  )
             {
                 case text::HoriOrientation::RIGHT:
-                    pTblData->SetLeftSpace(pTblData->GetLeftSpace() + nDiff);
+                    pTableData->SetLeftSpace(pTableData->GetLeftSpace() + nDiff);
                 break;
                 case text::HoriOrientation::LEFT:
-                    pTblData->SetRightSpace(pTblData->GetRightSpace() + nDiff);
+                    pTableData->SetRightSpace(pTableData->GetRightSpace() + nDiff);
                 break;
                 case text::HoriOrientation::NONE:
                 {
                     SwTwips nDiff2 = nDiff/2;
                     if( nDiff > 0 ||
-                        (-nDiff2 < pTblData->GetRightSpace() && - nDiff2 < pTblData->GetLeftSpace()))
+                        (-nDiff2 < pTableData->GetRightSpace() && - nDiff2 < pTableData->GetLeftSpace()))
                     {
-                        pTblData->SetRightSpace(pTblData->GetRightSpace() + nDiff2);
-                        pTblData->SetLeftSpace(pTblData->GetLeftSpace() + nDiff2);
+                        pTableData->SetRightSpace(pTableData->GetRightSpace() + nDiff2);
+                        pTableData->SetLeftSpace(pTableData->GetLeftSpace() + nDiff2);
                     }
                     else
                     {
-                        if(pTblData->GetRightSpace() > pTblData->GetLeftSpace())
+                        if(pTableData->GetRightSpace() > pTableData->GetLeftSpace())
                         {
-                            pTblData->SetLeftSpace(0);
-                            pTblData->SetRightSpace(pTblData->GetSpace() - pTblData->GetWidth());
+                            pTableData->SetLeftSpace(0);
+                            pTableData->SetRightSpace(pTableData->GetSpace() - pTableData->GetWidth());
                         }
                         else
                         {
-                            pTblData->SetRightSpace(0);
-                            pTblData->SetLeftSpace(pTblData->GetSpace() - pTblData->GetWidth());
+                            pTableData->SetRightSpace(0);
+                            pTableData->SetLeftSpace(pTableData->GetSpace() - pTableData->GetWidth());
                         }
                     }
                 }
                 break;
                 case text::HoriOrientation::CENTER:
-                    pTblData->SetRightSpace(pTblData->GetRightSpace() + nDiff/2);
-                    pTblData->SetLeftSpace(pTblData->GetLeftSpace() + nDiff/2);
+                    pTableData->SetRightSpace(pTableData->GetRightSpace() + nDiff/2);
+                    pTableData->SetLeftSpace(pTableData->GetLeftSpace() + nDiff/2);
                 break;
                 case text::HoriOrientation::LEFT_AND_WIDTH :
-                    if(nDiff > pTblData->GetRightSpace())
+                    if(nDiff > pTableData->GetRightSpace())
                     {
-                        pTblData->SetLeftSpace(pTblData->GetSpace() - pTblData->GetWidth());
+                        pTableData->SetLeftSpace(pTableData->GetSpace() - pTableData->GetWidth());
                     }
-                    pTblData->SetRightSpace(
-                        pTblData->GetSpace() - pTblData->GetWidth() - pTblData->GetLeftSpace());
+                    pTableData->SetRightSpace(
+                        pTableData->GetSpace() - pTableData->GetWidth() - pTableData->GetLeftSpace());
                 break;
             }
-            pTblData->SetWidthChanged();
+            pTableData->SetWidthChanged();
         }
-        _pSet->Put(SwPtrItem( FN_TABLE_REP, pTblData ));
+        _pSet->Put(SwPtrItem( FN_TABLE_REP, pTableData ));
     }
     return LEAVE_PAGE;
 }
@@ -1208,14 +1208,14 @@ SwTwips  SwTableColumnPage::GetVisibleWidth(sal_uInt16 nPos)
 
     while( nPos )
     {
-        if(pTblData->GetColumns()[i].bVisible && nPos)
+        if(pTableData->GetColumns()[i].bVisible && nPos)
             nPos--;
         i++;
     }
-    SwTwips nReturn = pTblData->GetColumns()[i].nWidth;
+    SwTwips nReturn = pTableData->GetColumns()[i].nWidth;
     OSL_ENSURE(i < nNoOfCols, "Array index out of range");
-    while(!pTblData->GetColumns()[i].bVisible && (i + 1) < nNoOfCols)
-        nReturn += pTblData->GetColumns()[++i].nWidth;
+    while(!pTableData->GetColumns()[i].bVisible && (i + 1) < nNoOfCols)
+        nReturn += pTableData->GetColumns()[++i].nWidth;
 
     return nReturn;
 }
@@ -1225,14 +1225,14 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth)
     sal_uInt16 i=0;
     while( nPos )
     {
-        if(pTblData->GetColumns()[i].bVisible && nPos)
+        if(pTableData->GetColumns()[i].bVisible && nPos)
             nPos--;
         i++;
     }
     OSL_ENSURE(i < nNoOfCols, "Array index out of range");
-    pTblData->GetColumns()[i].nWidth = nNewWidth;
-    while(!pTblData->GetColumns()[i].bVisible && (i + 1) < nNoOfCols)
-        pTblData->GetColumns()[++i].nWidth = 0;
+    pTableData->GetColumns()[i].nWidth = nNewWidth;
+    while(!pTableData->GetColumns()[i].bVisible && (i + 1) < nNoOfCols)
+        pTableData->GetColumns()[++i].nWidth = 0;
 
 }
 
@@ -1387,16 +1387,16 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
             SfxUInt16Item(FN_PARAM_TABLE_HEADLINE, m_pHeadLineCB->IsChecked()? sal_uInt16(m_pRepeatHeaderNF->GetValue()) : 0 ));
     }
     if(m_pKeepCB->IsValueChangedFromSaved())
-        bModified |= 0 != rSet->Put( SvxFmtKeepItem( m_pKeepCB->IsChecked(), RES_KEEP));
+        bModified |= 0 != rSet->Put( SvxFormatKeepItem( m_pKeepCB->IsChecked(), RES_KEEP));
 
     if(m_pSplitCB->IsValueChangedFromSaved())
-        bModified |= 0 != rSet->Put( SwFmtLayoutSplit( m_pSplitCB->IsChecked()));
+        bModified |= 0 != rSet->Put( SwFormatLayoutSplit( m_pSplitCB->IsChecked()));
 
     if(m_pSplitRowCB->IsValueChangedFromSaved())
-        bModified |= 0 != rSet->Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked()));
+        bModified |= 0 != rSet->Put( SwFormatRowSplit( m_pSplitRowCB->IsChecked()));
 
-    const SvxFmtBreakItem* pBreak = static_cast<const SvxFmtBreakItem*>(GetOldItem( *rSet, RES_BREAK ));
-    const SwFmtPageDesc* pDesc = static_cast<const SwFmtPageDesc*>(GetOldItem( *rSet, RES_PAGEDESC ));
+    const SvxFormatBreakItem* pBreak = static_cast<const SvxFormatBreakItem*>(GetOldItem( *rSet, RES_BREAK ));
+    const SwFormatPageDesc* pDesc = static_cast<const SwFormatPageDesc*>(GetOldItem( *rSet, RES_PAGEDESC ));
 
     bool bState = m_pPageCollCB->IsChecked();
 
@@ -1418,9 +1418,9 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
             ( pDesc->GetPageDesc() && ((pDesc->GetPageDesc()->GetName() != sPage) ||
                     !comphelper::string::equals(m_pPageNoNF->GetSavedValue(), nPgNum))))
         {
-            SwFmtPageDesc aFmt( pShell->FindPageDescByName( sPage, true ) );
-            aFmt.SetNumOffset(bState ? nPgNum : 0);
-            bModified |= 0 != rSet->Put( aFmt );
+            SwFormatPageDesc aFormat( pShell->FindPageDescByName( sPage, true ) );
+            aFormat.SetNumOffset(bState ? nPgNum : 0);
+            bModified |= 0 != rSet->Put( aFormat );
             bPageItemPut = bState;
         }
     }
@@ -1431,8 +1431,8 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
             m_pPgBrkBeforeRB->IsValueChangedFromSaved()    ||
             m_pPgBrkRB->IsValueChangedFromSaved() ))
     {
-        SvxFmtBreakItem aBreak(
-            static_cast<const SvxFmtBreakItem&>(GetItemSet().Get( RES_BREAK )) );
+        SvxFormatBreakItem aBreak(
+            static_cast<const SvxFormatBreakItem&>(GetItemSet().Get( RES_BREAK )) );
 
         if(bIsChecked)
         {
@@ -1505,20 +1505,20 @@ void   SwTextFlowPage::Reset( const SfxItemSet* rSet )
             m_pPageCollLB->InsertEntry(rPageDesc.GetName());
         }
 
-        OUString aFmtName;
+        OUString aFormatName;
         for(sal_uInt16 i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i)
             if( LISTBOX_ENTRY_NOTFOUND == m_pPageCollLB->GetEntryPos(
-                    aFmtName = SwStyleNameMapper::GetUIName( i, aFmtName ) ))
-                m_pPageCollLB->InsertEntry( aFmtName );
+                    aFormatName = SwStyleNameMapper::GetUIName( i, aFormatName ) ))
+                m_pPageCollLB->InsertEntry( aFormatName );
 
         if(SfxItemState::SET == rSet->GetItemState( RES_KEEP, false, &pItem ))
         {
-            m_pKeepCB->Check( static_cast<const SvxFmtKeepItem*>(pItem)->GetValue() );
+            m_pKeepCB->Check( static_cast<const SvxFormatKeepItem*>(pItem)->GetValue() );
             m_pKeepCB->SaveValue();
         }
         if(SfxItemState::SET == rSet->GetItemState( RES_LAYOUT_SPLIT, false, &pItem ))
         {
-            m_pSplitCB->Check( static_cast<const SwFmtLayoutSplit*>(pItem)->GetValue() );
+            m_pSplitCB->Check( static_cast<const SwFormatLayoutSplit*>(pItem)->GetValue() );
         }
         else
             m_pSplitCB->Check();
@@ -1528,7 +1528,7 @@ void   SwTextFlowPage::Reset( const SfxItemSet* rSet )
 
         if(SfxItemState::SET == rSet->GetItemState( RES_ROW_SPLIT, false, &pItem ))
         {
-            m_pSplitRowCB->Check( static_cast<const SwFmtRowSplit*>(pItem)->GetValue() );
+            m_pSplitRowCB->Check( static_cast<const SwFormatRowSplit*>(pItem)->GetValue() );
         }
         else
             m_pSplitRowCB->SetState(TRISTATE_INDET);
@@ -1539,10 +1539,10 @@ void   SwTextFlowPage::Reset( const SfxItemSet* rSet )
             if(SfxItemState::SET == rSet->GetItemState( RES_PAGEDESC, false, &pItem ))
             {
                 OUString sPageDesc;
-                const SwPageDesc* pDesc = static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc();
+                const SwPageDesc* pDesc = static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc();
 
-                //m_pPageNoNF->SetValue(static_cast<const SwFmtPageDesc*>(pItem)->GetNumOffset());
-                ::boost::optional<sal_uInt16> oNumOffset = static_cast<const SwFmtPageDesc*>(pItem)->GetNumOffset();
+                //m_pPageNoNF->SetValue(static_cast<const SwFormatPageDesc*>(pItem)->GetNumOffset());
+                ::boost::optional<sal_uInt16> oNumOffset = static_cast<const SwFormatPageDesc*>(pItem)->GetNumOffset();
                 if (oNumOffset)
                     m_pPageNoNF->SetValue(oNumOffset.get());
                 else
@@ -1578,7 +1578,7 @@ void   SwTextFlowPage::Reset( const SfxItemSet* rSet )
 
             if(SfxItemState::SET == rSet->GetItemState( RES_BREAK, false, &pItem ))
             {
-                const SvxFmtBreakItem* pPageBreak = static_cast<const SvxFmtBreakItem*>(pItem);
+                const SvxFormatBreakItem* pPageBreak = static_cast<const SvxFormatBreakItem*>(pItem);
                 SvxBreak eBreak = (SvxBreak)pPageBreak->GetValue();
 
                 if ( eBreak != SVX_BREAK_NONE )
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index ddb2aa03e877..1d7cf89f7d28 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -45,14 +45,14 @@ using namespace com::sun::star;
 
 #define FRAME_OFFSET 4
 
-class AutoFmtPreview : public vcl::Window
+class AutoFormatPreview : public vcl::Window
 {
 public:
-    AutoFmtPreview(vcl::Window* pParent, WinBits nStyle);
-    virtual ~AutoFmtPreview();
+    AutoFormatPreview(vcl::Window* pParent, WinBits nStyle);
+    virtual ~AutoFormatPreview();
     virtual void dispose() SAL_OVERRIDE;
 
-    void NotifyChange( const SwTableAutoFmt& rNewData );
+    void NotifyChange( const SwTableAutoFormat& rNewData );
 
     void DetectRTL(SwWrtShell* pWrtShell);
 
@@ -61,7 +61,7 @@ protected:
     virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
 
 private:
-    SwTableAutoFmt          aCurData;
+    SwTableAutoFormat          aCurData;
     ScopedVclPtr<VirtualDevice> aVD;
     svx::frame::Array       maArray;            /// Implementation to draw the frame borders.
     bool                    bFitWidth;
@@ -78,7 +78,7 @@ private:
     const OUString          aStrMid;
     const OUString          aStrSouth;
     const OUString          aStrSum;
-    SvNumberFormatter*      pNumFmt;
+    SvNumberFormatter*      pNumFormat;
 
     uno::Reference<i18n::XBreakIterator> m_xBreak;
 
@@ -142,7 +142,7 @@ void SwStringInputDlg::dispose()
 // AutoFormat-Dialogue:
 
 SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell,
-                    bool bAutoFormat, const SwTableAutoFmt* pSelFmt )
+                    bool bAutoFormat, const SwTableAutoFormat* pSelFormat )
     : SfxModalDialog(pParent, "AutoFormatTableDialog", "modules/swriter/ui/autoformattable.ui")
     , aStrTitle(SW_RES(STR_ADD_AUTOFORMAT_TITLE))
     , aStrLabel(SW_RES(STR_ADD_AUTOFORMAT_LABEL))
@@ -150,12 +150,12 @@ SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell,
     , aStrDelTitle(SW_RES(STR_DEL_AUTOFORMAT_TITLE))
     , aStrDelMsg(SW_RES(STR_DEL_AUTOFORMAT_MSG))
     , aStrRenameTitle(SW_RES(STR_RENAME_AUTOFORMAT_TITLE))
-    , aStrInvalidFmt(SW_RES(STR_INVALID_AUTOFORMAT_NAME))
+    , aStrInvalidFormat(SW_RES(STR_INVALID_AUTOFORMAT_NAME))
     , pShell(pWrtShell)
     , nIndex(0)
     , nDfltStylePos(0)
     , bCoreDataChanged(false)
-    , bSetAutoFmt(bAutoFormat)
+    , bSetAutoFormat(bAutoFormat)
 {
     get(m_pLbFormat, "formatlb");
     get(m_pFormatting, "formatting");
@@ -173,10 +173,10 @@ SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell,
 
     m_pWndPreview->DetectRTL(pWrtShell);
 
-    pTableTbl = new SwTableAutoFmtTbl;
-    pTableTbl->Load();
+    pTableTable = new SwTableAutoFormatTable;
+    pTableTable->Load();
 
-    Init(pSelFmt);
+    Init(pSelFormat);
 }
 
 SwAutoFormatDlg::~SwAutoFormatDlg()
@@ -187,8 +187,8 @@ SwAutoFormatDlg::~SwAutoFormatDlg()
 void SwAutoFormatDlg::dispose()
 {
     if (bCoreDataChanged)
-        pTableTbl->Save();
-    delete pTableTbl;
+        pTableTable->Save();
+    delete pTableTable;
     m_pLbFormat.clear();
     m_pFormatting.clear();
     m_pBtnNumFormat.clear();
@@ -205,7 +205,7 @@ void SwAutoFormatDlg::dispose()
     SfxModalDialog::dispose();
 }
 
-void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt )
+void SwAutoFormatDlg::Init( const SwTableAutoFormat* pSelFormat )
 {
     Link<> aLk( LINK( this, SwAutoFormatDlg, CheckHdl ) );
     m_pBtnBorder->SetClickHdl( aLk );
@@ -218,12 +218,12 @@ void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt )
     m_pBtnRemove->SetClickHdl ( LINK( this, SwAutoFormatDlg, RemoveHdl ) );
     m_pBtnRename->SetClickHdl ( LINK( this, SwAutoFormatDlg, RenameHdl ) );
     m_pBtnOk->SetClickHdl ( LINK( this, SwAutoFormatDlg, OkHdl ) );
-    m_pLbFormat->SetSelectHdl( LINK( this, SwAutoFormatDlg, SelFmtHdl ) );
+    m_pLbFormat->SetSelectHdl( LINK( this, SwAutoFormatDlg, SelFormatHdl ) );
 
-    m_pBtnAdd->Enable( bSetAutoFmt );
+    m_pBtnAdd->Enable( bSetAutoFormat );
 
     nIndex = 0;
-    if( !bSetAutoFmt )
+    if( !bSetAutoFormat )
     {
         // Then the list to be expanded by the entry "- none -".
         m_pLbFormat->InsertEntry( SwViewShell::GetShellRes()->aStrNone );
@@ -231,45 +231,45 @@ void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt )
         nIndex = 255;
     }
 
-    for (sal_uInt8 i = 0, nCount = static_cast<sal_uInt8>(pTableTbl->size());
+    for (sal_uInt8 i = 0, nCount = static_cast<sal_uInt8>(pTableTable->size());
             i < nCount; i++)
     {
-        SwTableAutoFmt const& rFmt = (*pTableTbl)[ i ];
-        m_pLbFormat->InsertEntry(rFmt.GetName());
-        if (pSelFmt && rFmt.GetName() == pSelFmt->GetName())
+        SwTableAutoFormat const& rFormat = (*pTableTable)[ i ];
+        m_pLbFormat->InsertEntry(rFormat.GetName());
+        if (pSelFormat && rFormat.GetName() == pSelFormat->GetName())
             nIndex = i;
     }
 
     m_pLbFormat->SelectEntryPos( 255 != nIndex ? (nDfltStylePos + nIndex) : 0 );
-    SelFmtHdl( 0 );
+    SelFormatHdl( 0 );
 }
 
-void SwAutoFormatDlg::UpdateChecks( const SwTableAutoFmt& rFmt, bool bEnable )
+void SwAutoFormatDlg::UpdateChecks( const SwTableAutoFormat& rFormat, bool bEnable )
 {
     m_pBtnNumFormat->Enable( bEnable );
-    m_pBtnNumFormat->Check( rFmt.IsValueFormat() );
+    m_pBtnNumFormat->Check( rFormat.IsValueFormat() );
 
     m_pBtnBorder->Enable( bEnable );
-    m_pBtnBorder->Check( rFmt.IsFrame() );
+    m_pBtnBorder->Check( rFormat.IsFrame() );
 
     m_pBtnFont->Enable( bEnable );
-    m_pBtnFont->Check( rFmt.IsFont() );
+    m_pBtnFont->Check( rFormat.IsFont() );
 
     m_pBtnPattern->Enable( bEnable );
-    m_pBtnPattern->Check( rFmt.IsBackground() );
+    m_pBtnPattern->Check( rFormat.IsBackground() );
 
     m_pBtnAlignment->Enable( bEnable );
-    m_pBtnAlignment->Check( rFmt.IsJustify() );
+    m_pBtnAlignment->Check( rFormat.IsJustify() );
 }
 
-void SwAutoFormatDlg::FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const
+void SwAutoFormatDlg::FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const
 {
     if( 255 != nIndex )
     {
         if( rToFill )
-            *rToFill = (*pTableTbl)[ nIndex ];
+            *rToFill = (*pTableTable)[ nIndex ];
         else
-            rToFill = new SwTableAutoFmt( (*pTableTbl)[ nIndex ] );
+            rToFill = new SwTableAutoFormat( (*pTableTable)[ nIndex ] );
     }
     else
         delete rToFill, rToFill = 0;
@@ -279,7 +279,7 @@ void SwAutoFormatDlg::FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const
 
 IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn )
 {
-    SwTableAutoFmt* pData  = &(*pTableTbl)[nIndex];
+    SwTableAutoFormat* pData  = &(*pTableTable)[nIndex];
     bool bCheck = static_cast<CheckBox*>(pBtn)->IsChecked(), bDataChgd = true;
 
     if( pBtn == m_pBtnNumFormat )
@@ -310,7 +310,7 @@ IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn )
 
 IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl)
 {
-    bool bOk = false, bFmtInserted = false;
+    bool bOk = false, bFormatInserted = false;
     while( !bOk )
     {
         VclPtrInstance<SwStringInputDlg> pDlg( this, aStrTitle,
@@ -322,26 +322,26 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl)
             if ( !aFormatName.isEmpty() )
             {
                 size_t n;
-                for( n = 0; n < pTableTbl->size(); ++n )
-                    if( (*pTableTbl)[n].GetName() == aFormatName )
+                for( n = 0; n < pTableTable->size(); ++n )
+                    if( (*pTableTable)[n].GetName() == aFormatName )
                         break;
 
-                if( n >= pTableTbl->size() )
+                if( n >= pTableTable->size() )
                 {
                     // Format with the name does not already exist, so take up.
-                    SwTableAutoFmt* pNewData = new
-                                        SwTableAutoFmt( aFormatName );
-                    pShell->GetTableAutoFmt( *pNewData );
+                    SwTableAutoFormat* pNewData = new
+                                        SwTableAutoFormat( aFormatName );
+                    pShell->GetTableAutoFormat( *pNewData );
 
                     // Insert sorted!!
-                    for( n = 1; n < pTableTbl->size(); ++n )
-                        if( (*pTableTbl)[ n ].GetName() > aFormatName )
+                    for( n = 1; n < pTableTable->size(); ++n )
+                        if( (*pTableTable)[ n ].GetName() > aFormatName )
                             break;
 
-                    pTableTbl->InsertAutoFmt(n, pNewData);
+                    pTableTable->InsertAutoFormat(n, pNewData);
                     m_pLbFormat->InsertEntry( aFormatName, nDfltStylePos + n );
                     m_pLbFormat->SelectEntryPos( nDfltStylePos + n );
-                    bFmtInserted = true;
+                    bFormatInserted = true;
                     m_pBtnAdd->Enable( false );
                     if ( !bCoreDataChanged )
                     {
@@ -349,14 +349,14 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl)
                         bCoreDataChanged = true;
                     }
 
-                    SelFmtHdl( 0 );
+                    SelFormatHdl( 0 );
                     bOk = true;
                 }
             }
 
-            if( !bFmtInserted )
+            if( !bFormatInserted )
             {
-                bOk = RET_CANCEL == MessageDialog(this, aStrInvalidFmt, VCL_MESSAGE_ERROR, VCL_BUTTONS_OK_CANCEL)
+                bOk = RET_CANCEL == MessageDialog(this, aStrInvalidFormat, VCL_MESSAGE_ERROR, VCL_BUTTONS_OK_CANCEL)
                                     .Execute();
             }
         }
@@ -381,7 +381,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl)
         m_pLbFormat->RemoveEntry( nDfltStylePos + nIndex );
         m_pLbFormat->SelectEntryPos( nDfltStylePos + nIndex-1 );
 
-        pTableTbl->EraseAutoFmt(nIndex);
+        pTableTable->EraseAutoFormat(nIndex);
         nIndex--;
 
         if( !nIndex )
@@ -398,7 +398,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl)
     }
     pBox.reset();
 
-    SelFmtHdl( 0 );
+    SelFormatHdl( 0 );
 
     return 0;
 }
@@ -413,32 +413,32 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
                                                OUString() );
         if( pDlg->Execute() == RET_OK )
         {
-            bool bFmtRenamed = false;
+            bool bFormatRenamed = false;
             const OUString aFormatName( pDlg->GetInputString() );
 
             if ( !aFormatName.isEmpty() )
             {
                 size_t n;
-                for( n = 0; n < pTableTbl->size(); ++n )
-                    if ((*pTableTbl)[n].GetName() == aFormatName)
+                for( n = 0; n < pTableTable->size(); ++n )
+                    if ((*pTableTable)[n].GetName() == aFormatName)
                         break;
 
-                if( n >= pTableTbl->size() )
+                if( n >= pTableTable->size() )
                 {
                     // no format with this name exists, so rename it
                     m_pLbFormat->RemoveEntry( nDfltStylePos + nIndex );
-                    SwTableAutoFmt* p = pTableTbl->ReleaseAutoFmt( nIndex );
+                    SwTableAutoFormat* p = pTableTable->ReleaseAutoFormat( nIndex );
 
                     p->SetName( aFormatName );
 
                     // keep all arrays sorted!
-                    for( n = 1; n < pTableTbl->size(); ++n )
-                        if ((*pTableTbl)[n].GetName() > aFormatName)
+                    for( n = 1; n < pTableTable->size(); ++n )
+                        if ((*pTableTable)[n].GetName() > aFormatName)
                         {
                             break;
                         }
 
-                    pTableTbl->InsertAutoFmt( n, p );
+                    pTableTable->InsertAutoFormat( n, p );
                     m_pLbFormat->InsertEntry( aFormatName, nDfltStylePos + n );
                     m_pLbFormat->SelectEntryPos( nDfltStylePos + n );
 
@@ -448,15 +448,15 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
                         bCoreDataChanged = true;
                     }
 
-                    SelFmtHdl( 0 );
+                    SelFormatHdl( 0 );
                     bOk = true;
-                    bFmtRenamed = true;
+                    bFormatRenamed = true;
                 }
             }
 
-            if( !bFmtRenamed )
+            if( !bFormatRenamed )
             {
-                bOk = RET_CANCEL == MessageDialog(this, aStrInvalidFmt, VCL_MESSAGE_ERROR, VCL_BUTTONS_OK_CANCEL)
+                bOk = RET_CANCEL == MessageDialog(this, aStrInvalidFormat, VCL_MESSAGE_ERROR, VCL_BUTTONS_OK_CANCEL)
                                     .Execute();
             }
         }
@@ -466,22 +466,22 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl)
+IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl)
 {
     bool bBtnEnable = false;
     sal_uInt8 nSelPos = (sal_uInt8) m_pLbFormat->GetSelectEntryPos(), nOldIdx = nIndex;
     if( nSelPos >= nDfltStylePos )
     {
         nIndex = nSelPos - nDfltStylePos;
-        m_pWndPreview->NotifyChange( (*pTableTbl)[nIndex] );
+        m_pWndPreview->NotifyChange( (*pTableTable)[nIndex] );
         bBtnEnable = 0 != nIndex;
-        UpdateChecks( (*pTableTbl)[nIndex], true );
+        UpdateChecks( (*pTableTable)[nIndex], true );
     }
     else
     {
         nIndex = 255;
 
-        SwTableAutoFmt aTmp( SwViewShell::GetShellRes()->aStrNone );
+        SwTableAutoFormat aTmp( SwViewShell::GetShellRes()->aStrNone );
         aTmp.SetFont( false );
         aTmp.SetJustify( false );
         aTmp.SetFrame( false );
@@ -502,13 +502,13 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl)
 
 IMPL_LINK_NOARG(SwAutoFormatDlg, OkHdl)
 {
-    if( bSetAutoFmt )
-        pShell->SetTableAutoFmt( (*pTableTbl)[ nIndex ] );
+    if( bSetAutoFormat )
+        pShell->SetTableAutoFormat( (*pTableTable)[ nIndex ] );
     EndDialog( RET_OK );
     return sal_IntPtr(true);
 }
 
-AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) :
+AutoFormatPreview::AutoFormatPreview(vcl::Window* pParent, WinBits nStyle) :
         Window          ( pParent, nStyle ),
         aCurData        ( OUString() ),
         aVD             ( VclPtr<VirtualDevice>::Create(*this) ),
@@ -524,21 +524,21 @@ AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) :
 {
     uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
     m_xBreak = i18n::BreakIterator::create(xContext);
-    pNumFmt = new SvNumberFormatter( xContext, LANGUAGE_SYSTEM );
+    pNumFormat = new SvNumberFormatter( xContext, LANGUAGE_SYSTEM );
 
     Init();
 }
 
-VCL_BUILDER_DECL_FACTORY(AutoFmtPreview)
+VCL_BUILDER_DECL_FACTORY(AutoFormatPreview)
 {
     WinBits nWinStyle = 0;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
     if (!sBorder.isEmpty())
         nWinStyle |= WB_BORDER;
-    rRet = VclPtr<AutoFmtPreview>::Create(pParent, nWinStyle);
+    rRet = VclPtr<AutoFormatPreview>::Create(pParent, nWinStyle);
 }
 
-void AutoFmtPreview::Resize()
+void AutoFormatPreview::Resize()
 {
     aPrvSize = Size(GetSizePixel().Width() - 6, GetSizePixel().Height() - 30);
     nLabelColWidth = (aPrvSize.Width() - 4) / 4 - 12;
@@ -548,22 +548,22 @@ void AutoFmtPreview::Resize()
     NotifyChange(aCurData);
 }
 
-void AutoFmtPreview::DetectRTL(SwWrtShell* pWrtShell)
+void AutoFormatPreview::DetectRTL(SwWrtShell* pWrtShell)
 {
-    if (!pWrtShell->IsCrsrInTbl()) // We haven't created the table yet
+    if (!pWrtShell->IsCrsrInTable()) // We haven't created the table yet
         mbRTL = AllSettings::GetLayoutRTL();
     else
         mbRTL = pWrtShell->IsTableRightToLeft();
 }
 
-AutoFmtPreview::~AutoFmtPreview()
+AutoFormatPreview::~AutoFormatPreview()
 {
     disposeOnce();
 }
 
-void AutoFmtPreview::dispose()
+void AutoFormatPreview::dispose()
 {
-    delete pNumFmt;
+    delete pNumFormat;
     vcl::Window::dispose();
 }
 
@@ -587,30 +587,30 @@ rFont.MethodName( Value );                                  \
 rCJKFont.MethodName( Value );                               \
 rCTLFont.MethodName( Value );
 
-void AutoFmtPreview::MakeFonts( sal_uInt8 nIndex, vcl::Font& rFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont )
+void AutoFormatPreview::MakeFonts( sal_uInt8 nIndex, vcl::Font& rFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont )
 {
-    const SwBoxAutoFmt& rBoxFmt = aCurData.GetBoxFmt( nIndex );
+    const SwBoxAutoFormat& rBoxFormat = aCurData.GetBoxFormat( nIndex );
 
     rFont = rCJKFont = rCTLFont = GetFont();
     Size aFontSize( rFont.GetSize().Width(), 10 * GetDPIScaleFactor() );
 
-    lcl_SetFontProperties( rFont, rBoxFmt.GetFont(), rBoxFmt.GetWeight(), rBoxFmt.GetPosture() );
-    lcl_SetFontProperties( rCJKFont, rBoxFmt.GetCJKFont(), rBoxFmt.GetCJKWeight(), rBoxFmt.GetCJKPosture() );
-    lcl_SetFontProperties( rCTLFont, rBoxFmt.GetCTLFont(), rBoxFmt.GetCTLWeight(), rBoxFmt.GetCTLPosture() );
+    lcl_SetFontProperties( rFont, rBoxFormat.GetFont(), rBoxFormat.GetWeight(), rBoxFormat.GetPosture() );
+    lcl_SetFontProperties( rCJKFont, rBoxFormat.GetCJKFont(), rBoxFormat.GetCJKWeight(), rBoxFormat.GetCJKPosture() );
+    lcl_SetFontProperties( rCTLFont, rBoxFormat.GetCTLFont(), rBoxFormat.GetCTLWeight(), rBoxFormat.GetCTLPosture() );
 
-    SETONALLFONTS( SetUnderline,    (FontUnderline)rBoxFmt.GetUnderline().GetValue() );
-    SETONALLFONTS( SetOverline,     (FontUnderline)rBoxFmt.GetOverline().GetValue() );
-    SETONALLFONTS( SetStrikeout,    (FontStrikeout)rBoxFmt.GetCrossedOut().GetValue() );
-    SETONALLFONTS( SetOutline,      rBoxFmt.GetContour().GetValue() );
-    SETONALLFONTS( SetShadow,       rBoxFmt.GetShadowed().GetValue() );
-    SETONALLFONTS( SetColor,        rBoxFmt.GetColor().GetValue() );
+    SETONALLFONTS( SetUnderline,    (FontUnderline)rBoxFormat.GetUnderline().GetValue() );
+    SETONALLFONTS( SetOverline,     (FontUnderline)rBoxFormat.GetOverline().GetValue() );
+    SETONALLFONTS( SetStrikeout,    (FontStrikeout)rBoxFormat.GetCrossedOut().GetValue() );
+    SETONALLFONTS( SetOutline,      rBoxFormat.GetContour().GetValue() );
+    SETONALLFONTS( SetShadow,       rBoxFormat.GetShadowed().GetValue() );
+    SETONALLFONTS( SetColor,        rBoxFormat.GetColor().GetValue() );
     SETONALLFONTS( SetSize,         aFontSize );
     SETONALLFONTS( SetTransparent,  true );
 }
 
-sal_uInt8 AutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const
+sal_uInt8 AutoFormatPreview::GetFormatIndex( size_t nCol, size_t nRow ) const
 {
-    static const sal_uInt8 pnFmtMap[] =
+    static const sal_uInt8 pnFormatMap[] =
     {
         0,  1,  2,  1,  3,
         4,  5,  6,  5,  7,
@@ -618,15 +618,15 @@ sal_uInt8 AutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const
         4,  5,  6,  5,  7,
         12, 13, 14, 13, 15
     };
-    return pnFmtMap[ maArray.GetCellIndex( nCol, nRow, mbRTL ) ];
+    return pnFormatMap[ maArray.GetCellIndex( nCol, nRow, mbRTL ) ];
 }
 
-const SvxBoxItem& AutoFmtPreview::GetBoxItem( size_t nCol, size_t nRow ) const
+const SvxBoxItem& AutoFormatPreview::GetBoxItem( size_t nCol, size_t nRow ) const
 {
-    return aCurData.GetBoxFmt( GetFormatIndex( nCol, nRow ) ).GetBox();
+    return aCurData.GetBoxFormat( GetFormatIndex( nCol, nRow ) ).GetBox();
 }
 
-void AutoFmtPreview::DrawString(vcl::RenderContext& rRenderContext, size_t nCol, size_t nRow)
+void AutoFormatPreview::DrawString(vcl::RenderContext& rRenderContext, size_t nCol, size_t nRow)
 {
     // Output of the cell text:
     sal_uLong nNum;
@@ -701,17 +701,17 @@ void AutoFmtPreview::DrawString(vcl::RenderContext& rRenderContext, size_t nCol,
 MAKENUMSTR:
         if (aCurData.IsValueFormat())
         {
-            OUString sFmt;
+            OUString sFormat;
             LanguageType eLng, eSys;
-            aCurData.GetBoxFmt(sal_uInt8(nNum)).GetValueFormat(sFmt, eLng, eSys);
+            aCurData.GetBoxFormat(sal_uInt8(nNum)).GetValueFormat(sFormat, eLng, eSys);
 
             short nType;
             bool bNew;
             sal_Int32 nCheckPos;
-            sal_uInt32 nKey = pNumFmt->GetIndexPuttingAndConverting(sFmt, eLng,
+            sal_uInt32 nKey = pNumFormat->GetIndexPuttingAndConverting(sFormat, eLng,
                                                                     eSys, nType, bNew, nCheckPos);
             Color* pDummy;
-            pNumFmt->GetOutputString(nVal, nKey, cellString, &pDummy);
+            pNumFormat->GetOutputString(nVal, nKey, cellString, &pDummy);
         }
         else
             cellString = OUString::number(sal_Int32(nVal));
@@ -723,7 +723,7 @@ MAKENUMSTR:
     {
         SvtScriptedTextHelper aScriptedText(rRenderContext);
         Size aStrSize;
-        sal_uInt8 nFmtIndex = GetFormatIndex( nCol, nRow );
+        sal_uInt8 nFormatIndex = GetFormatIndex( nCol, nRow );
         Rectangle cellRect = maArray.GetCellRect( nCol, nRow );
         Point aPos = cellRect.TopLeft();
         long nRightX = 0;
@@ -733,7 +733,7 @@ MAKENUMSTR:
         if (aCurData.IsFont())
         {
             vcl::Font aFont, aCJKFont, aCTLFont;
-            MakeFonts(nFmtIndex, aFont, aCJKFont, aCTLFont);
+            MakeFonts(nFormatIndex, aFont, aCJKFont, aCTLFont);
             aScriptedText.SetFonts(&aFont, &aCJKFont, &aCTLFont);
         }
         else
@@ -770,7 +770,7 @@ MAKENUMSTR:
             aPos.X() += nRightX;
         else if (aCurData.IsJustify())
         {
-            const SvxAdjustItem& rAdj = aCurData.GetBoxFmt(nFmtIndex).GetAdjust();
+            const SvxAdjustItem& rAdj = aCurData.GetBoxFormat(nFormatIndex).GetAdjust();
             switch (rAdj.GetAdjust())
             {
                 case SVX_ADJUST_LEFT:
@@ -805,20 +805,20 @@ MAKENUMSTR:
 
 #undef FRAME_OFFSET
 
-void AutoFmtPreview::DrawStrings(vcl::RenderContext& rRenderContext)
+void AutoFormatPreview::DrawStrings(vcl::RenderContext& rRenderContext)
 {
     for (size_t nRow = 0; nRow < 5; ++nRow)
         for (size_t nCol = 0; nCol < 5; ++nCol)
             DrawString(rRenderContext, nCol, nRow);
 }
 
-void AutoFmtPreview::DrawBackground(vcl::RenderContext& rRenderContext)
+void AutoFormatPreview::DrawBackground(vcl::RenderContext& rRenderContext)
 {
     for (size_t nRow = 0; nRow < 5; ++nRow)
     {
         for (size_t nCol = 0; nCol < 5; ++nCol)
         {
-            SvxBrushItem aBrushItem(aCurData.GetBoxFmt(GetFormatIndex(nCol, nRow)).GetBackground());
+            SvxBrushItem aBrushItem(aCurData.GetBoxFormat(GetFormatIndex(nCol, nRow)).GetBackground());
 
             rRenderContext.Push(PushFlags::LINECOLOR | PushFlags::FILLCOLOR);
             rRenderContext.SetLineColor();
@@ -829,7 +829,7 @@ void AutoFmtPreview::DrawBackground(vcl::RenderContext& rRenderContext)
     }
 }
 
-void AutoFmtPreview::PaintCells(vcl::RenderContext& rRenderContext)
+void AutoFormatPreview::PaintCells(vcl::RenderContext& rRenderContext)
 {
     // 1) background
     if (aCurData.IsBackground())
@@ -843,7 +843,7 @@ void AutoFmtPreview::PaintCells(vcl::RenderContext& rRenderContext)
         maArray.DrawArray(rRenderContext);
 }
 
-void AutoFmtPreview::Init()
+void AutoFormatPreview::Init()
 {
     SetBorderStyle( GetBorderStyle() | WindowBorderStyle::MONO );
     maArray.Initialize( 5, 5 );
@@ -852,7 +852,7 @@ void AutoFmtPreview::Init()
     CalcLineMap();
 }
 
-void AutoFmtPreview::CalcCellArray( bool _bFitWidth )
+void AutoFormatPreview::CalcCellArray( bool _bFitWidth )
 {
     maArray.SetXOffset( 2 );
     maArray.SetAllColWidths( _bFitWidth ? nDataColWidth2 : nDataColWidth1 );
@@ -871,7 +871,7 @@ inline void lclSetStyleFromBorder( svx::frame::Style& rStyle, const ::editeng::S
     rStyle.Set( pBorder, 0.05, 5 );
 }
 
-void AutoFmtPreview::CalcLineMap()
+void AutoFormatPreview::CalcLineMap()
 {
     for( size_t nRow = 0; nRow < 5; ++nRow )
     {
@@ -898,7 +898,7 @@ void AutoFmtPreview::CalcLineMap()
     }
 }
 
-void AutoFmtPreview::NotifyChange( const SwTableAutoFmt& rNewData )
+void AutoFormatPreview::NotifyChange( const SwTableAutoFormat& rNewData )
 {
     aCurData  = rNewData;
     bFitWidth = aCurData.IsJustify();  // true;  //???
@@ -907,7 +907,7 @@ void AutoFmtPreview::NotifyChange( const SwTableAutoFmt& rNewData )
     Invalidate(Rectangle(Point(0,0), GetSizePixel()));
 }
 
-void AutoFmtPreview::DoPaint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
+void AutoFormatPreview::DoPaint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
 {
     DrawModeFlags nOldDrawMode = aVD->GetDrawMode();
     if (rRenderContext.GetSettings().GetStyleSettings().GetHighContrastMode())
@@ -953,7 +953,7 @@ void AutoFmtPreview::DoPaint(vcl::RenderContext& rRenderContext, const Rectangle
     aVD->SetDrawMode(nOldDrawMode);
 }
 
-void AutoFmtPreview::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect )
+void AutoFormatPreview::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect )
 {
     DoPaint(rRenderContext, rRect);
 }
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 10240811336a..23074c8093ee 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -798,8 +798,8 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException, s
     if( xTextTable.is() )
     {
             uno::Reference< css::text::XTextDocument > xTextDoc( mxModel, uno::UNO_QUERY_THROW );
-            uno::Reference< word::XTable > xVBATbl = new SwVbaTable( mxParent, mxContext, xTextDoc, xTextTable );
-            aRet <<= xVBATbl;
+            uno::Reference< word::XTable > xVBATable = new SwVbaTable( mxParent, mxContext, xTextDoc, xTextTable );
+            aRet <<= xVBATable;
             return aRet;
     }
 
@@ -812,13 +812,13 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException, s
     SwXTextTableCursor* pTTCursor = dynamic_cast< SwXTextTableCursor* >( xTextTableCursor.get() );
     if ( pTTCursor )
     {
-        SwFrmFmt* pFmt = pTTCursor->GetFrmFmt();
-        if ( pFmt )
+        SwFrameFormat* pFormat = pTTCursor->GetFrameFormat();
+        if ( pFormat )
         {
-            uno::Reference< text::XTextTable > xTbl = SwXTextTables::GetObject(*pFmt);
+            uno::Reference< text::XTextTable > xTable = SwXTextTables::GetObject(*pFormat);
             uno::Reference< css::text::XTextDocument > xTextDoc( mxModel, uno::UNO_QUERY_THROW );
-            uno::Reference< word::XTable > xVBATbl = new SwVbaTable( mxParent, mxContext, xTextDoc, xTbl );
-            aRet <<= xVBATbl;
+            uno::Reference< word::XTable > xVBATable = new SwVbaTable( mxParent, mxContext, xTextDoc, xTable );
+            aRet <<= xVBATable;
         }
     }
     return aRet;
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index bb174d1ede0b..755ecd899b87 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -38,18 +38,18 @@ SwTable* SwVbaTableHelper::GetSwTable( const uno::Reference< text::XTextTable >&
     if( !pXTextTable )
         throw uno::RuntimeException();
 
-    SwFrmFmt* pFrmFmt = pXTextTable->GetFrmFmt();
-    if( !pFrmFmt )
+    SwFrameFormat* pFrameFormat = pXTextTable->GetFrameFormat();
+    if( !pFrameFormat )
         throw uno::RuntimeException();
 
-    SwTable* pTable = SwTable::FindTable( pFrmFmt );
+    SwTable* pTable = SwTable::FindTable( pFrameFormat );
     return pTable;
 }
 
 sal_Int32 SwVbaTableHelper::getTabColumnsCount( sal_Int32 nRowIndex ) throw (uno::RuntimeException)
 {
     sal_Int32 nRet = 0;
-    if(!pTable->IsTblComplex())
+    if(!pTable->IsTableComplex())
     {
         SwTableLines& rLines = pTable->GetTabLines();
         SwTableLine* pLine = rLines[ nRowIndex ];
@@ -76,7 +76,7 @@ sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& CellName ) throw (un
 {
     sal_Int32 nRet = 0;
     OUString sCellName(CellName);
-    SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTblBox( sCellName ));
+    SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTableBox( sCellName ));
     if( !pBox )
         throw uno::RuntimeException();
 
@@ -91,7 +91,7 @@ sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& CellName ) throw (un
 {
     sal_Int32 nRet = 0;
     OUString sCellName(CellName);
-    const SwTableBox* pBox = pTable->GetTblBox( sCellName );
+    const SwTableBox* pBox = pTable->GetTableBox( sCellName );
     if( !pBox )
         throw uno::RuntimeException();
     const SwTableBoxes* pBoxes = &pBox->GetUpper()->GetTabBoxes();
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index e56ea2684059..1820d88a46e0 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -75,7 +75,7 @@
 #define ENV_INSERT      RET_USER
 
 // Function used for labels and envelopes in applab.cxx and appenv.cxx
-OUString InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const OUString& rText )
+OUString InsertLabEnvText( SwWrtShell& rSh, SwFieldMgr& rFieldMgr, const OUString& rText )
 {
     OUString sRet;
     OUString aText(comphelper::string::remove(rText, '\r'));
@@ -115,8 +115,8 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const OUString& r
                     if (nCnt >= 3)
                     {
                         sDBName = ::ReplacePoint(sDBName, true);
-                        SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyOUStr, 0, &rSh );
-                        rFldMgr.InsertFld( aData );
+                        SwInsertField_Data aData(TYP_DBFLD, 0, sDBName, aEmptyOUStr, 0, &rSh );
+                        rFieldMgr.InsertField( aData );
                         sRet = sDBName;
                         bField = true;
                     }
@@ -134,12 +134,12 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const OUString& r
 
 static void lcl_CopyCollAttr(SwWrtShell* pOldSh, SwWrtShell* pNewSh, sal_uInt16 nCollId)
 {
-    sal_uInt16 nCollCnt = pOldSh->GetTxtFmtCollCount();
+    sal_uInt16 nCollCnt = pOldSh->GetTextFormatCollCount();
     for( sal_uInt16 nCnt = 0; nCnt < nCollCnt; ++nCnt )
     {
-        SwTxtFmtColl* pColl = &pOldSh->GetTxtFmtColl(nCnt);
-        if(nCollId == pColl->GetPoolFmtId())
-            pNewSh->GetTxtCollFromPool(nCollId)->SetFmtAttr(pColl->GetAttrSet());
+        SwTextFormatColl* pColl = &pOldSh->GetTextFormatColl(nCnt);
+        if(nCollId == pColl->GetPoolFormatId())
+            pNewSh->GetTextCollFromPool(nCollId)->SetFormatAttr(pColl->GetAttrSet());
     }
 }
 
@@ -245,13 +245,13 @@ void SwModule::InsertEnv( SfxRequest& rReq )
             OSL_ENSURE(pOldSh, "No document - wasn't 'Insert' disabled???");
             SvxPaperBinItem aItem( RES_PAPER_BIN );
             aItem.SetValue((sal_uInt8)pSh->getIDocumentDeviceAccess()->getPrinter(true)->GetPaperBin());
-            pOldSh->GetPageDescFromPool(RES_POOLPAGE_JAKET)->GetMaster().SetFmtAttr(aItem);
+            pOldSh->GetPageDescFromPool(RES_POOLPAGE_JAKET)->GetMaster().SetFormatAttr(aItem);
         }
 
         SwWrtShell *pTmp = nMode == ENV_INSERT ? pOldSh : pSh;
         const SwPageDesc* pFollow = 0;
-        SwTxtFmtColl *pSend = pTmp->GetTxtCollFromPool( RES_POOLCOLL_SENDADRESS ),
-                     *pAddr = pTmp->GetTxtCollFromPool( RES_POOLCOLL_JAKETADRESS);
+        SwTextFormatColl *pSend = pTmp->GetTextCollFromPool( RES_POOLCOLL_SENDADRESS ),
+                     *pAddr = pTmp->GetTextCollFromPool( RES_POOLCOLL_JAKETADRESS);
         const OUString sSendMark = pSend->GetName();
         const OUString sAddrMark = pAddr->GetName();
 
@@ -298,13 +298,13 @@ void SwModule::InsertEnv( SfxRequest& rReq )
                 pFollow = &pSh->GetPageDesc(pSh->GetCurPageDesc());
 
             // Insert page break
-            if ( pSh->IsCrsrInTbl() )
+            if ( pSh->IsCrsrInTable() )
             {
                 pSh->SplitNode();
                 pSh->Right( CRSR_SKIP_CHARS, false, 1, false );
                 SfxItemSet aBreakSet( pSh->GetAttrPool(), RES_BREAK, RES_BREAK, 0 );
-                aBreakSet.Put( SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
-                pSh->SetTblAttr( aBreakSet );
+                aBreakSet.Put( SvxFormatBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
+                pSh->SetTableAttr( aBreakSet );
             }
             else
                 pSh->InsertPageBreak(0, boost::none);
@@ -330,13 +330,13 @@ void SwModule::InsertEnv( SfxRequest& rReq )
         pSh->SetNewDoc();   // Avoid performance problems
 
         // Remember Flys of this site
-        std::vector<SwFrmFmt*> aFlyArr;
+        std::vector<SwFrameFormat*> aFlyArr;
         if( ENV_NEWDOC != nMode && !bEnvChange )
             pSh->GetPageObjs( aFlyArr );
 
         // Get page description
         SwPageDesc* pDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_JAKET);
-        SwFrmFmt&   rFmt  = pDesc->GetMaster();
+        SwFrameFormat&   rFormat  = pDesc->GetMaster();
 
         Printer *pPrt = pSh->getIDocumentDeviceAccess()->getPrinter( true );
 
@@ -373,20 +373,20 @@ void SwModule::InsertEnv( SfxRequest& rReq )
         aULMargin.SetUpper((sal_uInt16) lUpper);
         aLRMargin.SetRight(0);
         aULMargin.SetLower(0);
-        rFmt.SetFmtAttr(aLRMargin);
-        rFmt.SetFmtAttr(aULMargin);
+        rFormat.SetFormatAttr(aLRMargin);
+        rFormat.SetFormatAttr(aULMargin);
 
         // Header and footer
-        rFmt.SetFmtAttr(SwFmtHeader(false));
+        rFormat.SetFormatAttr(SwFormatHeader(false));
         pDesc->ChgHeaderShare(false);
-        rFmt.SetFmtAttr(SwFmtFooter(false));
+        rFormat.SetFormatAttr(SwFormatFooter(false));
         pDesc->ChgFooterShare(false);
 
         // Page numbering
         pDesc->SetUseOn(nsUseOnPage::PD_ALL);
 
         // Page size
-        rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
+        rFormat.SetFormatAttr(SwFormatFrmSize(ATT_FIX_SIZE,
                                             nPageW + lLeft, nPageH + lUpper));
 
         // Set type of page numbering
@@ -414,7 +414,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
 
         // Insert Frame
         SwFlyFrmAttrMgr aMgr(false, pSh, FRMMGR_TYPE_ENVELP);
-        SwFldMgr aFldMgr;
+        SwFieldMgr aFieldMgr;
         aMgr.SetHeightSizeType(ATT_VAR_SIZE);
 
         // Overwrite defaults!
@@ -434,8 +434,8 @@ void SwModule::InsertEnv( SfxRequest& rReq )
             pSh->SetFlyName(sSendMark);
             pSh->UnSelectFrm();
             pSh->LeaveSelFrmMode();
-            pSh->SetTxtFmtColl( pSend );
-            InsertLabEnvText( *pSh, aFldMgr, rItem.aSendText );
+            pSh->SetTextFormatColl( pSend );
+            InsertLabEnvText( *pSh, aFieldMgr, rItem.aSendText );
             aMgr.UpdateAttrMgr();
         }
 
@@ -449,8 +449,8 @@ void SwModule::InsertEnv( SfxRequest& rReq )
         pSh->SetFlyName(sAddrMark);
         pSh->UnSelectFrm();
         pSh->LeaveSelFrmMode();
-        pSh->SetTxtFmtColl( pAddr );
-        InsertLabEnvText(*pSh, aFldMgr, rItem.aAddrText);
+        pSh->SetTextFormatColl( pAddr );
+        InsertLabEnvText(*pSh, aFieldMgr, rItem.aAddrText);
 
         // Move Flys to the "old" pages
         if (!aFlyArr.empty())
diff --git a/sw/source/uibase/app/appenv.hxx b/sw/source/uibase/app/appenv.hxx
index f319178132f2..1e58efccfc8a 100644
--- a/sw/source/uibase/app/appenv.hxx
+++ b/sw/source/uibase/app/appenv.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_APP_APPENV_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_APP_APPENV_HXX
 
-OUString InsertLabEnvText( SwWrtShell& , SwFldMgr& , const OUString& );
+OUString InsertLabEnvText( SwWrtShell& , SwFieldMgr& , const OUString& );
 
 
 #endif
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 9b32ae77e7d0..e3dd39a8e1bc 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -198,7 +198,7 @@ void SwModule::StateOther(SfxItemSet &rSet)
             break;
             case FN_SET_MODOPT_TBLNUMFMT:
                 rSet.Put( SfxBoolItem( nWhich, pModuleConfig->
-                                            IsInsTblFormatNum( bWebView )));
+                                            IsInsTableFormatNum( bWebView )));
             break;
             default:
                 OSL_FAIL("::StateOther: default");
@@ -679,9 +679,9 @@ void SwModule::ExecOther(SfxRequest& rReq)
                         nWhich, false, &pItem ))
                     bSet = static_cast<const SfxBoolItem*>(pItem)->GetValue();
                 else
-                    bSet = !pModuleConfig->IsInsTblFormatNum( bWebView );
+                    bSet = !pModuleConfig->IsInsTableFormatNum( bWebView );
 
-                pModuleConfig->SetInsTblFormatNum( bWebView, bSet );
+                pModuleConfig->SetInsTableFormatNum( bWebView, bSet );
             }
             break;
 #if HAVE_FEATURE_DBCONNECTIVITY
@@ -734,7 +734,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
                         bUpdateFields = false;
                     if(bUpdateFields)
                     {
-                        pWrtSh->UpdateInputFlds();
+                        pWrtSh->UpdateInputFields();
 
                         // Are database fields contained?
                         // Get all used databases for the first time
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 3a30ca4db42c..f324eb0b08ce 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -81,8 +81,8 @@ using namespace ::com::sun::star;
 
 const char MASTER_LABEL[] = "MasterLabel";
 
-static const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem,
-                        SwFrmFmt &rFmt,
+static const SwFrameFormat *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem,
+                        SwFrameFormat &rFormat,
                         sal_uInt16 nCol, sal_uInt16 nRow )
 {
     SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR,
@@ -91,17 +91,17 @@ static const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem
     rSh.GetPageNum( nPhyPageNum, nVirtPageNum );
 
     //anchor frame to page
-    aSet.Put( SwFmtAnchor( FLY_AT_PAGE, nPhyPageNum ) );
-    aSet.Put( SwFmtHoriOrient( rItem.lLeft + static_cast<SwTwips>(nCol) * rItem.lHDist,
+    aSet.Put( SwFormatAnchor( FLY_AT_PAGE, nPhyPageNum ) );
+    aSet.Put( SwFormatHoriOrient( rItem.lLeft + static_cast<SwTwips>(nCol) * rItem.lHDist,
                                text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ) );
-    aSet.Put( SwFmtVertOrient( rItem.lUpper + static_cast<SwTwips>(nRow) * rItem.lVDist,
+    aSet.Put( SwFormatVertOrient( rItem.lUpper + static_cast<SwTwips>(nRow) * rItem.lVDist,
                                text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ) );
-    const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, true,  &rFmt );  // Insert Fly
-    OSL_ENSURE( pFmt, "Fly not inserted" );
+    const SwFrameFormat *pFormat = rSh.NewFlyFrm(aSet, true,  &rFormat );  // Insert Fly
+    OSL_ENSURE( pFormat, "Fly not inserted" );
 
     rSh.UnSelectFrm();  //Frame was selected automatically
 
-    rSh.SetTxtFmtColl( rSh.GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
+    rSh.SetTextFormatColl( rSh.GetTextCollFromPool( RES_POOLCOLL_STANDARD ) );
 
     if(!rItem.bSynchron || !(nCol|nRow))
     {
@@ -115,11 +115,11 @@ static const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem
         pGlosHdl->InsertGlossary( rItem.sGlossaryBlockName );
     }
 
-    return pFmt;
+    return pFormat;
 }
 
-static const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem,
-                        SwFrmFmt &rFmt, SwFldMgr& rFldMgr,
+static const SwFrameFormat *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem,
+                        SwFrameFormat &rFormat, SwFieldMgr& rFieldMgr,
                         sal_uInt16 nCol, sal_uInt16 nRow, bool bLast )
 {
     SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR,
@@ -128,28 +128,28 @@ static const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rIte
     rSh.GetPageNum( nPhyPageNum, nVirtPageNum );
 
     //anchor frame to page
-    aSet.Put( SwFmtAnchor( FLY_AT_PAGE, nPhyPageNum ) );
-    aSet.Put( SwFmtHoriOrient( rItem.lLeft + static_cast<SwTwips>(nCol) * rItem.lHDist,
+    aSet.Put( SwFormatAnchor( FLY_AT_PAGE, nPhyPageNum ) );
+    aSet.Put( SwFormatHoriOrient( rItem.lLeft + static_cast<SwTwips>(nCol) * rItem.lHDist,
                                text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ) );
-    aSet.Put( SwFmtVertOrient( rItem.lUpper + static_cast<SwTwips>(nRow) * rItem.lVDist,
+    aSet.Put( SwFormatVertOrient( rItem.lUpper + static_cast<SwTwips>(nRow) * rItem.lVDist,
                                text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ) );
-    const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, true,  &rFmt );  // Insert Fly
-    OSL_ENSURE( pFmt, "Fly not inserted" );
+    const SwFrameFormat *pFormat = rSh.NewFlyFrm(aSet, true,  &rFormat );  // Insert Fly
+    OSL_ENSURE( pFormat, "Fly not inserted" );
 
     rSh.UnSelectFrm();  //Frame was selected automatically
 
-    rSh.SetTxtFmtColl( rSh.GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
+    rSh.SetTextFormatColl( rSh.GetTextCollFromPool( RES_POOLCOLL_STANDARD ) );
 
     // If applicable "next dataset"
     OUString sDBName;
-    if( (!rItem.bSynchron || !(nCol|nRow)) && !(sDBName = InsertLabEnvText( rSh, rFldMgr, rItem.aWriting )).isEmpty() && !bLast )
+    if( (!rItem.bSynchron || !(nCol|nRow)) && !(sDBName = InsertLabEnvText( rSh, rFieldMgr, rItem.aWriting )).isEmpty() && !bLast )
     {
         sDBName = comphelper::string::setToken(sDBName, 3, DB_DELIM, "True");
-        SwInsertFld_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyOUStr, 0, &rSh );
-        rFldMgr.InsertFld( aData );
+        SwInsertField_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyOUStr, 0, &rSh );
+        rFieldMgr.InsertField( aData );
     }
 
-    return pFmt;
+    return pFormat;
 }
 
 void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
@@ -238,7 +238,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
             pSh->SetNewDoc();       // Avoid performance problems
 
             SwPageDesc aDesc = pSh->GetPageDesc( 0 );
-            SwFrmFmt&  rFmt  = aDesc.GetMaster();
+            SwFrameFormat&  rFormat  = aDesc.GetMaster();
 
             // Borders
             SvxLRSpaceItem aLRMargin( RES_LR_SPACE );
@@ -247,13 +247,13 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
             aULMargin.SetUpper((sal_uInt16) rItem.lUpper);
             aLRMargin.SetRight( 0 );
             aULMargin.SetLower( 0 );
-            rFmt.SetFmtAttr(aLRMargin);
-            rFmt.SetFmtAttr(aULMargin);
+            rFormat.SetFormatAttr(aLRMargin);
+            rFormat.SetFormatAttr(aULMargin);
 
             // Header and footer
-            rFmt.SetFmtAttr(SwFmtHeader(false));
+            rFormat.SetFormatAttr(SwFormatHeader(false));
             aDesc.ChgHeaderShare(false);
-            rFmt.SetFmtAttr(SwFmtFooter(false));
+            rFormat.SetFormatAttr(SwFormatFooter(false));
             aDesc.ChgFooterShare(false);
 
             aDesc.SetUseOn(nsUseOnPage::PD_ALL);                // Site numbering
@@ -262,7 +262,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
             long lPgWidth, lPgHeight;
             lPgWidth  = (rItem.lPWidth > MINLAY ? rItem.lPWidth : MINLAY);
             lPgHeight = (rItem.lPHeight > MINLAY ? rItem.lPHeight : MINLAY);
-            rFmt.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, lPgWidth, lPgHeight ));
+            rFormat.SetFormatAttr( SwFormatFrmSize( ATT_FIX_SIZE, lPgWidth, lPgHeight ));
             // Numbering type
             SvxNumberType aType;
             aType.SetNumberingType(SVX_NUM_NUMBER_NONE);
@@ -275,7 +275,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
             pPrt = pSh->getIDocumentDeviceAccess()->getPrinter( true );
             SvxPaperBinItem aItem( RES_PAPER_BIN );
             aItem.SetValue((sal_Int8)pPrt->GetPaperBin());
-            rFmt.SetFmtAttr(aItem);
+            rFormat.SetFormatAttr(aItem);
 
             // Determine orientation of the resulting page
             aDesc.SetLandscape(rItem.lPWidth > rItem.lPHeight);
@@ -283,43 +283,43 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
             pSh->ChgPageDesc( 0, aDesc );
 
             // Insert frame
-            boost::scoped_ptr<SwFldMgr> pFldMgr(new SwFldMgr);
-            pFldMgr->SetEvalExpFlds(false);
+            boost::scoped_ptr<SwFieldMgr> pFieldMgr(new SwFieldMgr);
+            pFieldMgr->SetEvalExpFields(false);
 
             // Prepare border template
-            SwFrmFmt* pFmt = pSh->GetFrmFmtFromPool( RES_POOLFRM_LABEL );
+            SwFrameFormat* pFormat = pSh->GetFrameFormatFromPool( RES_POOLFRM_LABEL );
             sal_Int32 iResultWidth = rItem.lLeft + (rItem.nCols - 1) * rItem.lHDist + rItem.lWidth - rItem.lPWidth;
             sal_Int32 iResultHeight = rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + rItem.lHeight - rItem.lPHeight;
             sal_Int32 iWidth = (iResultWidth > 0 ? rItem.lWidth - (iResultWidth / rItem.nCols) - 1 : rItem.lWidth);
             sal_Int32 iHeight = (iResultHeight > 0 ? rItem.lHeight - (iResultHeight / rItem.nRows) - 1 : rItem.lHeight);
-            SwFmtFrmSize aFrmSize(  ATT_FIX_SIZE, iWidth, iHeight );
-            pFmt->SetFmtAttr( aFrmSize );
+            SwFormatFrmSize aFrmSize(  ATT_FIX_SIZE, iWidth, iHeight );
+            pFormat->SetFormatAttr( aFrmSize );
 
             //frame represents label itself, no border space
             SvxULSpaceItem aFrmNoULSpace( 0, 0, RES_UL_SPACE );
             SvxLRSpaceItem aFrmNoLRSpace( 0, 0, 0, 0, RES_LR_SPACE );
-            pFmt->SetFmtAttr( aFrmNoULSpace );
-            pFmt->SetFmtAttr( aFrmNoLRSpace );
+            pFormat->SetFormatAttr( aFrmNoULSpace );
+            pFormat->SetFormatAttr( aFrmNoLRSpace );
 
-            const SwFrmFmt *pFirstFlyFmt = 0;
+            const SwFrameFormat *pFirstFlyFormat = 0;
             if ( rItem.bPage )
             {
-                SwFmtVertOrient aFrmVertOrient( pFmt->GetVertOrient() );
+                SwFormatVertOrient aFrmVertOrient( pFormat->GetVertOrient() );
                 aFrmVertOrient.SetVertOrient( text::VertOrientation::TOP );
-                pFmt->SetFmtAttr(aFrmVertOrient);
+                pFormat->SetFormatAttr(aFrmVertOrient);
 
                 for ( sal_uInt16 i = 0; i < rItem.nRows; ++i )
                 {
                     for ( sal_uInt16 j = 0; j < rItem.nCols; ++j )
                     {
                         pSh->Push();
-                        const SwFrmFmt *pTmp = ( bLabel ?
-                                                 lcl_InsertLabText( *pSh, rItem, *pFmt, *pFldMgr, j, i,
+                        const SwFrameFormat *pTmp = ( bLabel ?
+                                                 lcl_InsertLabText( *pSh, rItem, *pFormat, *pFieldMgr, j, i,
                                                    i == rItem.nRows - 1 && j == rItem.nCols - 1 ) :
-                                                 lcl_InsertBCText( *pSh, rItem, *pFmt, j, i ) );
+                                                 lcl_InsertBCText( *pSh, rItem, *pFormat, j, i ) );
                         if (!(i|j))
                         {
-                            pFirstFlyFmt = pTmp;
+                            pFirstFlyFormat = pTmp;
 
                             if (rItem.bSynchron)
                             {
@@ -362,11 +362,11 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
             }
             else
             {
-                pFirstFlyFmt = bLabel ?
-                    lcl_InsertLabText( *pSh, rItem, *pFmt, *pFldMgr,
+                pFirstFlyFormat = bLabel ?
+                    lcl_InsertLabText( *pSh, rItem, *pFormat, *pFieldMgr,
                             static_cast< sal_uInt16 >(rItem.nCol - 1),
                             static_cast< sal_uInt16 >(rItem.nRow - 1), true ) :
-                    lcl_InsertBCText(*pSh, rItem, *pFmt,
+                    lcl_InsertBCText(*pSh, rItem, *pFormat,
                             static_cast< sal_uInt16 >(rItem.nCol - 1),
                             static_cast< sal_uInt16 >(rItem.nRow - 1));
             }
@@ -380,13 +380,13 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
                 SwLabDlgUpdateFieldInformation(xModel, rItem);
             }
 
-            pFldMgr->SetEvalExpFlds(true);
-            pFldMgr->EvalExpFlds(pSh);
+            pFieldMgr->SetEvalExpFields(true);
+            pFieldMgr->EvalExpFields(pSh);
 
-            pFldMgr.reset();
+            pFieldMgr.reset();
 
-            if (pFirstFlyFmt)
-                pSh->GotoFly(pFirstFlyFmt->GetName(), FLYCNTTYPE_ALL, false);
+            if (pFirstFlyFormat)
+                pSh->GotoFly(pFirstFlyFormat->GetName(), FLYCNTTYPE_ALL, false);
 
             pSh->EndAllAction();
             pSh->DoUndo( true );
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 4d4af5cf1b2a..00b93f30e036 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -208,11 +208,11 @@ SfxItemSet*  SwModule::CreateItemSet( sal_uInt16 nId )
     aGridItem.SetGridVisible( aViewOpt.IsGridVisible());
 
     const Size& rSnapSize = aViewOpt.GetSnapSize();
-    aGridItem.SetFldDrawX( (sal_uInt16) (rSnapSize.Width() ));
-    aGridItem.SetFldDrawY( (sal_uInt16) (rSnapSize.Height()));
+    aGridItem.SetFieldDrawX( (sal_uInt16) (rSnapSize.Width() ));
+    aGridItem.SetFieldDrawY( (sal_uInt16) (rSnapSize.Height()));
 
-    aGridItem.SetFldDivisionX( aViewOpt.GetDivisionX());
-    aGridItem.SetFldDivisionY( aViewOpt.GetDivisionY());
+    aGridItem.SetFieldDivisionX( aViewOpt.GetDivisionX());
+    aGridItem.SetFieldDivisionY( aViewOpt.GetDivisionY());
 
     pRet->Put(aGridItem);
 
@@ -355,14 +355,14 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
         aViewOpt.SetSynchronize(pGridItem->GetSynchronize());
         if( aViewOpt.IsGridVisible() != pGridItem->GetGridVisible() )
             aViewOpt.SetGridVisible( pGridItem->GetGridVisible());
-        Size aSize = Size( pGridItem->GetFldDrawX()  ,
-                            pGridItem->GetFldDrawY()  );
+        Size aSize = Size( pGridItem->GetFieldDrawX()  ,
+                            pGridItem->GetFieldDrawY()  );
         if( aViewOpt.GetSnapSize() != aSize )
             aViewOpt.SetSnapSize( aSize );
-        short nDiv = (short)pGridItem->GetFldDivisionX() ;
+        short nDiv = (short)pGridItem->GetFieldDivisionX() ;
         if( aViewOpt.GetDivisionX() != nDiv  )
             aViewOpt.SetDivisionX( nDiv );
-        nDiv = (short)pGridItem->GetFldDivisionY();
+        nDiv = (short)pGridItem->GetFieldDivisionY();
         if( aViewOpt.GetDivisionY() != nDiv  )
             aViewOpt.SetDivisionY( nDiv  );
 
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index f674064d54d1..a614c854a7af 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -250,7 +250,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
     pRdr->GetDoc()->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, ISA(SwWebDocShell));
 
     // Restore the pool default if reading a saved document.
-    m_pDoc->RemoveAllFmtLanguageDependencies();
+    m_pDoc->RemoveAllFormatLanguageDependencies();
 
     sal_uLong nErr = pRdr->Read( *pRead );
 
@@ -342,7 +342,7 @@ bool SwDocShell::Save()
 
                 // End TableBox Edit!
                 if (m_pWrtShell)
-                    m_pWrtShell->EndAllTblBoxEdit();
+                    m_pWrtShell->EndAllTableBoxEdit();
 
                 WriterRef xWrt;
                 ::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt );
@@ -454,7 +454,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
 
         // End TableBox Edit!
         if (m_pWrtShell)
-            m_pWrtShell->EndAllTblBoxEdit();
+            m_pWrtShell->EndAllTableBoxEdit();
 
         // Remember and preserve Modified-Flag without calling the Link
         // (for OLE; after Statement from MM)
@@ -558,7 +558,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
 
     // End TableBox Edit!
     if (m_pWrtShell)
-        m_pWrtShell->EndAllTblBoxEdit();
+        m_pWrtShell->EndAllTableBoxEdit();
 
     if( pFlt->GetUserData() == "HTML" )
     {
@@ -851,7 +851,7 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const
     {
         // Preview: set VisArea to the first page.
         SwNodeIndex aIdx( m_pDoc->GetNodes().GetEndOfExtras(), 1 );
-        SwCntntNode* pNd = m_pDoc->GetNodes().GoNext( &aIdx );
+        SwContentNode* pNd = m_pDoc->GetNodes().GoNext( &aIdx );
 
         const SwRect aPageRect = pNd->FindPageFrmRect( false, 0, false );
         return aPageRect.SVRect();
@@ -890,7 +890,7 @@ HiddenInformation SwDocShell::GetHiddenInformationState( HiddenInformation nStat
 
     if ( nStates & HiddenInformation::RECORDEDCHANGES )
     {
-        if ( !GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+        if ( !GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().empty() )
             nState |= HiddenInformation::RECORDEDCHANGES;
     }
     if ( nStates & HiddenInformation::NOTES )
@@ -898,12 +898,12 @@ HiddenInformation SwDocShell::GetHiddenInformationState( HiddenInformation nStat
         OSL_ENSURE( GetWrtShell(), "No SwWrtShell, no information" );
         if ( GetWrtShell() )
         {
-            SwFieldType* pType = GetWrtShell()->GetFldType( RES_POSTITFLD, aEmptyOUStr );
-            SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-            SwFmtFld* pFirst = aIter.First();
+            SwFieldType* pType = GetWrtShell()->GetFieldType( RES_POSTITFLD, aEmptyOUStr );
+            SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+            SwFormatField* pFirst = aIter.First();
             while( pFirst )
             {
-                if( pFirst->GetTxtFld() && pFirst->IsFldInDoc() )
+                if( pFirst->GetTextField() && pFirst->IsFieldInDoc() )
                 {
                     nState |= HiddenInformation::NOTES;
                     break;
@@ -1009,10 +1009,10 @@ void SwDocShell::GetState(SfxItemSet& rSet)
 
         case SID_ATTR_YEAR2000:
             {
-                const SvNumberFormatter* pFmtr = m_pDoc->GetNumberFormatter(false);
+                const SvNumberFormatter* pFormatr = m_pDoc->GetNumberFormatter(false);
                 rSet.Put( SfxUInt16Item( nWhich,
                         static_cast< sal_uInt16 >(
-                        pFmtr ? pFmtr->GetYear2000()
+                        pFormatr ? pFormatr->GetYear2000()
                               : ::utl::MiscCfg().GetYear2000() )));
             }
             break;
@@ -1024,7 +1024,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
         case SID_MAIL_PREPAREEXPORT:
         {
             //check if linked content or possibly hidden content is available
-            //m_pDoc->UpdateFlds( NULL, false );
+            //m_pDoc->UpdateFields( NULL, false );
             sfx2::LinkManager& rLnkMgr = m_pDoc->getIDocumentLinksAdministration().GetLinkManager();
             const ::sfx2::SvBaseLinks& rLnks = rLnkMgr.GetLinks();
             bool bRet = false;
@@ -1134,8 +1134,8 @@ SwFEShell* SwDocShell::GetFEShell()
 
 void SwDocShell::RemoveOLEObjects()
 {
-    SwIterator<SwCntntNode,SwFmtColl> aIter( *m_pDoc->GetDfltGrfFmtColl() );
-    for( SwCntntNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
+    SwIterator<SwContentNode,SwFormatColl> aIter( *m_pDoc->GetDfltGrfFormatColl() );
+    for( SwContentNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
     {
         SwOLENode* pOLENd = pNd->GetOLENode();
         if( pOLENd && ( pOLENd->IsOLEObjectDeleted() ||
@@ -1162,8 +1162,8 @@ void SwDocShell::CalcLayoutForOLEObjects()
     if (!m_pWrtShell)
         return;
 
-    SwIterator<SwCntntNode,SwFmtColl> aIter( *m_pDoc->GetDfltGrfFmtColl() );
-    for( SwCntntNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
+    SwIterator<SwContentNode,SwFormatColl> aIter( *m_pDoc->GetDfltGrfFormatColl() );
+    for( SwContentNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
     {
         SwOLENode* pOLENd = pNd->GetOLENode();
         if( pOLENd && pOLENd->IsOLESizeInvalid() )
@@ -1181,9 +1181,9 @@ void SwDocShell::UpdateLinks()
 {
     GetDoc()->getIDocumentLinksAdministration().UpdateLinks(true);
     // #i50703# Update footnote numbers
-    SwTxtFtn::SetUniqueSeqRefNo( *GetDoc() );
+    SwTextFootnote::SetUniqueSeqRefNo( *GetDoc() );
     SwNodeIndex aTmp( GetDoc()->GetNodes() );
-    GetDoc()->GetFtnIdxs().UpdateFtn( aTmp );
+    GetDoc()->GetFootnoteIdxs().UpdateFootnote( aTmp );
 }
 
 uno::Reference< frame::XController >
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 9b0f6cf242c7..60b8c0e3c769 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -167,7 +167,7 @@ void SwDocShell::ToggleBrowserMode(bool bSet, SwView* _pView )
         pTempView->GetViewFrame()->GetBindings().Invalidate(FN_SHADOWCURSOR);
         if( !GetDoc()->getIDocumentDeviceAccess().getPrinter( false ) )
             pTempView->SetPrinter( GetDoc()->getIDocumentDeviceAccess().getPrinter( false ), SfxPrinterChangeFlags::PRINTER | SfxPrinterChangeFlags::JOBSETUP );
-        GetDoc()->CheckDefaultPageFmt();
+        GetDoc()->CheckDefaultPageFormat();
         SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, false);
         while (pTmpFrm)
         {
@@ -282,7 +282,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
         switch( nAction )
         {
         case 2:
-            m_pDoc->getIDocumentFieldsAccess().GetSysFldType( RES_FILENAMEFLD )->UpdateFlds();
+            m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_FILENAMEFLD )->UpdateFields();
             break;
         // #i38126# - own action for event LOADFINISHED
         // in order to avoid a modified document.
@@ -349,7 +349,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
     {
         case SID_AUTO_CORRECT_DLG:
         {
-            SvxSwAutoFmtFlags* pAFlags = &SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
+            SvxSwAutoFormatFlags* pAFlags = &SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
             SwAutoCompleteWord& rACW = SwDoc::GetAutoCompleteWords();
 
             bool bOldLocked = rACW.IsLockWordLstLocked(),
@@ -381,7 +381,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
 
             rACW.SetLockWordLstLocked( bOldLocked );
 
-            SwEditShell::SetAutoFmtFlags( pAFlags );
+            SwEditShell::SetAutoFormatFlags( pAFlags );
             rACW.SetMinWordLen( pAFlags->nAutoCmpltWordLen );
             rACW.SetMaxCount( pAFlags->nAutoCmpltListLen );
             if (pAFlags->m_pAutoCompleteList)  // any changes?
@@ -570,8 +570,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
                 if( !aFileName.isEmpty() )
                 {
                     SwgReaderOption aOpt;
-                    aOpt.SetTxtFmts(    bText  = bool(nFlags & SfxTemplateFlags::LOAD_TEXT_STYLES ));
-                    aOpt.SetFrmFmts(    bFrame = bool(nFlags & SfxTemplateFlags::LOAD_FRAME_STYLES));
+                    aOpt.SetTextFormats(    bText  = bool(nFlags & SfxTemplateFlags::LOAD_TEXT_STYLES ));
+                    aOpt.SetFrameFormats(    bFrame = bool(nFlags & SfxTemplateFlags::LOAD_FRAME_STYLES));
                     aOpt.SetPageDescs(  bPage  = bool(nFlags & SfxTemplateFlags::LOAD_PAGE_STYLES ));
                     aOpt.SetNumRules(   bNum   = bool(nFlags & SfxTemplateFlags::LOAD_NUM_STYLES  ));
                     //different meaning between SFX_MERGE_STYLES and aOpt.SetMerge!
@@ -839,7 +839,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
             //pWrtShell is not set in page preview
             if (m_pWrtShell)
                 m_pWrtShell->StartAllAction();
-            m_pDoc->getIDocumentFieldsAccess().UpdateFlds( NULL, false );
+            m_pDoc->getIDocumentFieldsAccess().UpdateFields( NULL, false );
             m_pDoc->getIDocumentLinksAdministration().EmbedAllLinks();
             m_IsRemovedInvisibleContent
                 = officecfg::Office::Security::HiddenContent::RemoveHiddenContent::get();
@@ -966,7 +966,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         {
                             for(sal_uInt16 n = 0; n < rOutlNds.size(); ++n )
                             {
-                                const int nLevel = rOutlNds[n]->GetTxtNode()->GetAttrOutlineLevel();
+                                const int nLevel = rOutlNds[n]->GetTextNode()->GetAttrOutlineLevel();
                                 if( nLevel > 0 && ! bOutline[nLevel-1] )
                                 {
                                     bOutline[nLevel-1] = true;
@@ -974,7 +974,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                             }
                         }
 
-                        const sal_uInt16 nStyleCount = m_pDoc->GetTxtFmtColls()->size();
+                        const sal_uInt16 nStyleCount = m_pDoc->GetTextFormatColls()->size();
                         Sequence<OUString> aListBoxEntries( MAXLEVEL + nStyleCount);
                         OUString* pEntries = aListBoxEntries.getArray();
                         sal_Int32   nIdx = 0 ;
@@ -989,10 +989,10 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         OUString    sStyle( SW_RESSTR(STR_FDLG_STYLE) );
                         for(sal_uInt16 i = 0; i < nStyleCount; ++i)
                         {
-                            SwTxtFmtColl &rTxtColl = *(*m_pDoc->GetTxtFmtColls())[ i ];
-                            if( !rTxtColl.IsDefault() && rTxtColl.IsAtDocNodeSet() )
+                            SwTextFormatColl &rTextColl = *(*m_pDoc->GetTextFormatColls())[ i ];
+                            if( !rTextColl.IsDefault() && rTextColl.IsAtDocNodeSet() )
                             {
-                                pEntries[nIdx++] = sStyle + rTxtColl.GetName();
+                                pEntries[nIdx++] = sStyle + rTextColl.GetName();
                             }
                         }
 
@@ -1064,9 +1064,9 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         }
                         else
                         {
-                            const SwTxtFmtColl* pSplitColl = 0;
+                            const SwTextFormatColl* pSplitColl = 0;
                             if ( !aTemplateName.isEmpty() )
-                                pSplitColl = m_pDoc->FindTxtFmtCollByName(aTemplateName);
+                                pSplitColl = m_pDoc->FindTextFormatCollByName(aTemplateName);
                             bDone = bCreateHtml
                                 ? m_pDoc->GenerateHTMLDoc( aFileName, pSplitColl )
                                 : m_pDoc->GenerateGlobalDoc( aFileName, pSplitColl );
@@ -1241,12 +1241,12 @@ void SwDocShell::SetModified( bool bSet )
 
 void SwDocShell::UpdateChildWindows()
 {
-    // if necessary newly initialize Flddlg (i.e. for TYP_SETVAR)
+    // if necessary newly initialize Fielddlg (i.e. for TYP_SETVAR)
     if(!GetView())
         return;
     SfxViewFrame* pVFrame = GetView()->GetViewFrame();
-    SwFldDlgWrapper *pWrp = static_cast<SwFldDlgWrapper*>(pVFrame->
-            GetChildWindow( SwFldDlgWrapper::GetChildWindowId() ));
+    SwFieldDlgWrapper *pWrp = static_cast<SwFieldDlgWrapper*>(pVFrame->
+            GetChildWindow( SwFieldDlgWrapper::GetChildWindowId() ));
     if( pWrp )
         pWrp->ReInitDlg( this );
 
@@ -1440,8 +1440,8 @@ sal_uLong SwDocShell::LoadStylesFromFile( const OUString& rURL,
             pReader.reset(new SwReader( aMed, rURL, *m_pWrtShell->GetCrsr() ));
         }
 
-        pRead->GetReaderOpt().SetTxtFmts( rOpt.IsTxtFmts() );
-        pRead->GetReaderOpt().SetFrmFmts( rOpt.IsFrmFmts() );
+        pRead->GetReaderOpt().SetTextFormats( rOpt.IsTextFormats() );
+        pRead->GetReaderOpt().SetFrameFormats( rOpt.IsFrameFormats() );
         pRead->GetReaderOpt().SetPageDescs( rOpt.IsPageDescs() );
         pRead->GetReaderOpt().SetNumRules( rOpt.IsNumRules() );
         pRead->GetReaderOpt().SetMerge( rOpt.IsMerge() );
@@ -1480,9 +1480,9 @@ SfxInPlaceClient* SwDocShell::GetIPClient( const ::svt::EmbeddedObjectRef& xObjR
 
 static bool lcl_MergePortions(SwNode *const& pNode, void *)
 {
-    if (pNode->IsTxtNode())
+    if (pNode->IsTextNode())
     {
-        pNode->GetTxtNode()->FileLoadedInitHints();
+        pNode->GetTextNode()->FileLoadedInitHints();
     }
     return true;
 }
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index dcd203d423c3..fca4e2e44657 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -213,8 +213,8 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
             m_pDoc->SetDefault(*pFontItem);
             if( !bHTMLTemplSet )
             {
-                SwTxtFmtColl *pColl = m_pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
-                pColl->ResetFmtAttr(nFontWhich);
+                SwTextFormatColl *pColl = m_pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD);
+                pColl->ResetFormatAttr(nFontWhich);
             }
             pFontItem.reset();
             sal_Int32 nFontHeight = pStdFont->GetFontHeight( FONT_STANDARD, i, eLanguage );
@@ -223,8 +223,8 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
             m_pDoc->SetDefault(SvxFontHeightItem( nFontHeight, 100, aFontHeightWhich[i] ));
             if( !bHTMLTemplSet )
             {
-                SwTxtFmtColl *pColl = m_pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
-                pColl->ResetFmtAttr(aFontHeightWhich[i]);
+                SwTextFormatColl *pColl = m_pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD);
+                pColl->ResetFormatAttr(aFontHeightWhich[i]);
             }
 
         }
@@ -261,7 +261,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
                 nFontHeightWhich = RES_CHRATR_CTL_FONTSIZE;
                 eLanguage = static_cast<const SvxLanguageItem&>(m_pDoc->GetDefault( RES_CHRATR_CTL_LANGUAGE )).GetLanguage();
             }
-            SwTxtFmtColl *pColl = 0;
+            SwTextFormatColl *pColl = 0;
             if(!pStdFont->IsFontDefault(aFontIdPoolId[nIdx]))
             {
                 sEntry = pStdFont->GetFontFor(aFontIdPoolId[nIdx]);
@@ -270,12 +270,12 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
                 if( pPrt )
                     aFont = pPrt->GetFontMetric( aFont );
 
-                pColl = m_pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(aFontIdPoolId[nIdx + 1]);
+                pColl = m_pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(aFontIdPoolId[nIdx + 1]);
                 if( !bHTMLTemplSet ||
                     SfxItemState::SET != pColl->GetAttrSet().GetItemState(
                                                     nFontWhich, false ) )
                 {
-                    pColl->SetFmtAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(),
+                    pColl->SetFormatAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(),
                                                   aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
                 }
             }
@@ -283,12 +283,12 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
             if(nFontHeight <= 0)
                 nFontHeight = SwStdFontConfig::GetDefaultHeightFor( aFontIdPoolId[nIdx], eLanguage );
             if(!pColl)
-                pColl = m_pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(aFontIdPoolId[nIdx + 1]);
-            SvxFontHeightItem aFontHeight( static_cast<const SvxFontHeightItem&>(pColl->GetFmtAttr( nFontHeightWhich, true )));
+                pColl = m_pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(aFontIdPoolId[nIdx + 1]);
+            SvxFontHeightItem aFontHeight( static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr( nFontHeightWhich, true )));
             if(aFontHeight.GetHeight() != sal::static_int_cast<sal_uInt32, sal_Int32>(nFontHeight))
             {
                 aFontHeight.SetHeight(nFontHeight);
-                pColl->SetFmtAttr( aFontHeight );
+                pColl->SetFormatAttr( aFontHeight );
             }
         }
 
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index f58e99e504d0..77e79afc13a8 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -129,13 +129,13 @@ void  SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
              // so that this family is being showed
                 if(pShell->IsFrmSelected())
                 {
-                    SwFrmFmt* pFmt = pShell->GetCurFrmFmt();
-                    if( pFmt )
-                        aName = pFmt->GetName();
+                    SwFrameFormat* pFormat = pShell->GetCurFrameFormat();
+                    if( pFormat )
+                        aName = pFormat->GetName();
                 }
                 else
                 {
-                    SwTxtFmtColl* pColl = pShell->GetCurTxtFmtColl();
+                    SwTextFormatColl* pColl = pShell->GetCurTextFormatColl();
                     if(pColl)
                         aName = pColl->GetName();
                 }
@@ -145,9 +145,9 @@ void  SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
             case SID_STYLE_FAMILY1:
                 if( !pShell->IsFrmSelected() )
                 {
-                    SwCharFmt* pFmt = pShell->GetCurCharFmt();
-                    if(pFmt)
-                        aName = pFmt->GetName();
+                    SwCharFormat* pFormat = pShell->GetCurCharFormat();
+                    if(pFormat)
+                        aName = pFormat->GetName();
                     else
                         aName = SwStyleNameMapper::GetTextUINameArray()[
                             RES_POOLCOLL_STANDARD - RES_POOLCOLL_TEXT_BEGIN ];
@@ -158,7 +158,7 @@ void  SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
             case SID_STYLE_FAMILY2:
                 if(!pShell->IsFrmSelected())
                 {
-                    SwTxtFmtColl* pColl = pShell->GetCurTxtFmtColl();
+                    SwTextFormatColl* pColl = pShell->GetCurTextFormatColl();
                     if(pColl)
                         aName = pColl->GetName();
 
@@ -195,10 +195,10 @@ void  SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
                     rSet.DisableItem( nWhich );
                 else
                 {
-                    SwFrmFmt* pFmt = pShell->GetCurFrmFmt();
-                    if(pFmt && pShell->IsFrmSelected())
+                    SwFrameFormat* pFormat = pShell->GetCurFrameFormat();
+                    if(pFormat && pShell->IsFrmSelected())
                     {
-                        aName = pFmt->GetName();
+                        aName = pFormat->GetName();
                         rSet.Put(SfxTemplateItem(nWhich, aName));
                     }
                 }
@@ -368,7 +368,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
                     case SID_STYLE_UPDATE_BY_EXAMPLE:
                     case SID_STYLE_EDIT:
                     {
-                        SwTxtFmtColl* pColl = GetWrtShell()->GetCurTxtFmtColl();
+                        SwTextFormatColl* pColl = GetWrtShell()->GetCurTextFormatColl();
                         if(pColl)
                         {
                             aParam = pColl->GetName();
@@ -422,21 +422,21 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
                     {
                         case SFX_STYLE_FAMILY_PARA:
                         {
-                            SwTxtFmtColl* pColl = pShell->GetCurTxtFmtColl();
+                            SwTextFormatColl* pColl = pShell->GetCurTextFormatColl();
                             if(pColl)
                                 aParam = pColl->GetName();
                         }
                         break;
                         case SFX_STYLE_FAMILY_FRAME:
                         {
-                            SwFrmFmt* pFrm = m_pWrtShell->GetCurFrmFmt();
+                            SwFrameFormat* pFrm = m_pWrtShell->GetCurFrameFormat();
                             if( pFrm )
                                 aParam = pFrm->GetName();
                         }
                         break;
                         case SFX_STYLE_FAMILY_CHAR:
                         {
-                            SwCharFmt* pChar = m_pWrtShell->GetCurCharFmt();
+                            SwCharFormat* pChar = m_pWrtShell->GetCurCharFormat();
                             if( pChar )
                                 aParam = pChar->GetName();
                         }
@@ -657,12 +657,12 @@ sal_uInt16 SwDocShell::Edit(
             {
                 if(!rParent.isEmpty())
                 {
-                    SwTxtFmtColl* pColl = m_pWrtShell->FindTxtFmtCollByName( rParent );
+                    SwTextFormatColl* pColl = m_pWrtShell->FindTextFormatCollByName( rParent );
                     if(!pColl)
                     {
                         sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rParent, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
                         if(USHRT_MAX != nId)
-                            pColl = m_pWrtShell->GetTxtCollFromPool( nId );
+                            pColl = m_pWrtShell->GetTextCollFromPool( nId );
                     }
                     pDStyle->GetCollection()->SetDerivedFrom( pColl );
                     pDStyle->PresetParent( rParent );
@@ -674,13 +674,13 @@ sal_uInt16 SwDocShell::Edit(
                     if (pColl && pColl->IsAssignedToListLevelOfOutlineStyle())
                     {
                         SwNumRuleItem aItem(aEmptyOUStr);
-                        pDStyle->GetCollection()->SetFmtAttr( aItem );
+                        pDStyle->GetCollection()->SetFormatAttr( aItem );
                         pDStyle->GetCollection()->SetAttrOutlineLevel( 0 );
                     }
                 }
                 else
                 {
-                    SwTxtFmtColl* pColl = m_pWrtShell->GetCurTxtFmtColl();
+                    SwTextFormatColl* pColl = m_pWrtShell->GetCurTextFormatColl();
                     pDStyle->GetCollection()->SetDerivedFrom( pColl );
                     if( pColl )
                         pDStyle->PresetParent( pColl->GetName() );
@@ -691,23 +691,23 @@ sal_uInt16 SwDocShell::Edit(
             {
                 if(!rParent.isEmpty())
                 {
-                    SwCharFmt* pCFmt = m_pWrtShell->FindCharFmtByName(rParent);
-                    if(!pCFmt)
+                    SwCharFormat* pCFormat = m_pWrtShell->FindCharFormatByName(rParent);
+                    if(!pCFormat)
                     {
                         sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rParent, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
                         if(USHRT_MAX != nId)
-                            pCFmt = m_pWrtShell->GetCharFmtFromPool( nId );
+                            pCFormat = m_pWrtShell->GetCharFormatFromPool( nId );
                     }
 
-                    pDStyle->GetCharFmt()->SetDerivedFrom( pCFmt );
+                    pDStyle->GetCharFormat()->SetDerivedFrom( pCFormat );
                     pDStyle->PresetParent( rParent );
                 }
                 else
                 {
-                    SwCharFmt* pCFmt = m_pWrtShell->GetCurCharFmt();
-                    pDStyle->GetCharFmt()->SetDerivedFrom( pCFmt );
-                        if( pCFmt )
-                            pDStyle->PresetParent( pCFmt->GetName() );
+                    SwCharFormat* pCFormat = m_pWrtShell->GetCurCharFormat();
+                    pDStyle->GetCharFormat()->SetDerivedFrom( pCFormat );
+                        if( pCFormat )
+                            pDStyle->PresetParent( pCFormat->GetName() );
                 }
             }
             break;
@@ -715,14 +715,14 @@ sal_uInt16 SwDocShell::Edit(
             {
                 if(!rParent.isEmpty())
                 {
-                    SwFrmFmt* pFFmt = m_pWrtShell->GetDoc()->FindFrmFmtByName( rParent );
-                    if(!pFFmt)
+                    SwFrameFormat* pFFormat = m_pWrtShell->GetDoc()->FindFrameFormatByName( rParent );
+                    if(!pFFormat)
                     {
                         sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rParent, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT);
                         if(USHRT_MAX != nId)
-                            pFFmt = m_pWrtShell->GetFrmFmtFromPool( nId );
+                            pFFormat = m_pWrtShell->GetFrameFormatFromPool( nId );
                     }
-                    pDStyle->GetFrmFmt()->SetDerivedFrom( pFFmt );
+                    pDStyle->GetFrameFormat()->SetDerivedFrom( pFFormat );
                     pDStyle->PresetParent( rParent );
                 }
             }
@@ -925,8 +925,8 @@ sal_uInt16 SwDocShell::ApplyStyles(const OUString &rName, sal_uInt16 nFamily,
     {
         case SFX_STYLE_FAMILY_CHAR:
         {
-            SwFmtCharFmt aFmt(pStyle->GetCharFmt());
-            pSh->SetAttrItem( aFmt, (nMode & KEY_SHIFT) ?
+            SwFormatCharFormat aFormat(pStyle->GetCharFormat());
+            pSh->SetAttrItem( aFormat, (nMode & KEY_SHIFT) ?
                 SetAttrMode::DONTREPLACE : SetAttrMode::DEFAULT );
             break;
         }
@@ -935,13 +935,13 @@ sal_uInt16 SwDocShell::ApplyStyles(const OUString &rName, sal_uInt16 nFamily,
             // #i62675#
             // clear also list attributes at affected text nodes, if paragraph
             // style has the list style attribute set.
-            pSh->SetTxtFmtColl( pStyle->GetCollection(), true );
+            pSh->SetTextFormatColl( pStyle->GetCollection(), true );
             break;
         }
         case SFX_STYLE_FAMILY_FRAME:
         {
             if ( pSh->IsFrmSelected() )
-                pSh->SetFrmFmt( pStyle->GetFrmFmt() );
+                pSh->SetFrameFormat( pStyle->GetFrameFormat() );
             break;
         }
         case SFX_STYLE_FAMILY_PAGE:
@@ -993,13 +993,13 @@ sal_uInt16 SwDocShell::DoWaterCan(const OUString &rName, sal_uInt16 nFamily)
         switch(nFamily)
         {
             case SFX_STYLE_FAMILY_CHAR:
-                aTemplate.aColl.pCharFmt = pStyle->GetCharFmt();
+                aTemplate.aColl.pCharFormat = pStyle->GetCharFormat();
                 break;
             case SFX_STYLE_FAMILY_PARA:
-                aTemplate.aColl.pTxtColl = pStyle->GetCollection();
+                aTemplate.aColl.pTextColl = pStyle->GetCollection();
                 break;
             case SFX_STYLE_FAMILY_FRAME:
-                aTemplate.aColl.pFrmFmt = pStyle->GetFrmFmt();
+                aTemplate.aColl.pFrameFormat = pStyle->GetFrameFormat();
                 break;
             case SFX_STYLE_FAMILY_PAGE:
                 aTemplate.aColl.pPageDesc = const_cast<SwPageDesc*>(pStyle->GetPageDesc());
@@ -1036,7 +1036,7 @@ sal_uInt16 SwDocShell::UpdateStyle(const OUString &rName, sal_uInt16 nFamily, Sw
     {
         case SFX_STYLE_FAMILY_PARA:
         {
-            SwTxtFmtColl* pColl = pStyle->GetCollection();
+            SwTextFormatColl* pColl = pStyle->GetCollection();
             if(pColl && !pColl->IsDefault())
             {
                 GetWrtShell()->StartAllAction();
@@ -1047,7 +1047,7 @@ sal_uInt16 SwDocShell::UpdateStyle(const OUString &rName, sal_uInt16 nFamily, Sw
                 GetWrtShell()->StartUndo(UNDO_INSFMTATTR, &aRewriter);
                 GetWrtShell()->FillByEx(pColl);
                     // also apply template to remove hard set attributes
-                GetWrtShell()->SetTxtFmtColl( pColl );
+                GetWrtShell()->SetTextFormatColl( pColl );
                 GetWrtShell()->EndUndo();
                 GetWrtShell()->EndAllAction();
             }
@@ -1055,10 +1055,10 @@ sal_uInt16 SwDocShell::UpdateStyle(const OUString &rName, sal_uInt16 nFamily, Sw
         }
         case SFX_STYLE_FAMILY_FRAME:
         {
-            SwFrmFmt* pFrm = pStyle->GetFrmFmt();
+            SwFrameFormat* pFrm = pStyle->GetFrameFormat();
             if( pCurrWrtShell->IsFrmSelected() && pFrm && !pFrm->IsDefault() )
             {
-                SfxItemSet aSet( GetPool(), aFrmFmtSetRange );
+                SfxItemSet aSet( GetPool(), aFrameFormatSetRange );
                 pCurrWrtShell->StartAllAction();
                 pCurrWrtShell->GetFlyFrmAttr( aSet );
 
@@ -1066,17 +1066,17 @@ sal_uInt16 SwDocShell::UpdateStyle(const OUString &rName, sal_uInt16 nFamily, Sw
                 // no update of anchor attribute
                 aSet.ClearItem( RES_ANCHOR );
 
-                pFrm->SetFmtAttr( aSet );
+                pFrm->SetFormatAttr( aSet );
 
                     // also apply template to remove hard set attributes
-                pCurrWrtShell->SetFrmFmt( pFrm, true );
+                pCurrWrtShell->SetFrameFormat( pFrm, true );
                 pCurrWrtShell->EndAllAction();
             }
         }
         break;
         case SFX_STYLE_FAMILY_CHAR:
         {
-            SwCharFmt* pChar = pStyle->GetCharFmt();
+            SwCharFormat* pChar = pStyle->GetCharFormat();
             if( pChar && !pChar->IsDefault() )
             {
                 pCurrWrtShell->StartAllAction();
@@ -1097,7 +1097,7 @@ sal_uInt16 SwDocShell::UpdateStyle(const OUString &rName, sal_uInt16 nFamily, Sw
                 // #i91400#
                 aRule.SetName( pStyle->GetNumRule()->GetName(),
                                pCurrWrtShell->GetDoc()->getIDocumentListsAccess() );
-                pCurrWrtShell->ChgNumRuleFmts( aRule );
+                pCurrWrtShell->ChgNumRuleFormats( aRule );
             }
         }
         break;
@@ -1129,16 +1129,16 @@ sal_uInt16 SwDocShell::MakeByExample( const OUString &rName, sal_uInt16 nFamily,
     {
         case  SFX_STYLE_FAMILY_PARA:
         {
-            SwTxtFmtColl* pColl = pStyle->GetCollection();
+            SwTextFormatColl* pColl = pStyle->GetCollection();
             if(pColl && !pColl->IsDefault())
             {
                 pCurrWrtShell->StartAllAction();
                 pCurrWrtShell->FillByEx(pColl);
                     // also apply template to remove hard set attributes
-                pColl->SetDerivedFrom(pCurrWrtShell->GetCurTxtFmtColl());
+                pColl->SetDerivedFrom(pCurrWrtShell->GetCurTextFormatColl());
 
                     // set the mask at the Collection:
-                sal_uInt16 nId = pColl->GetPoolFmtId() & 0x87ff;
+                sal_uInt16 nId = pColl->GetPoolFormatId() & 0x87ff;
                 switch( nMask & 0x0fff )
                 {
                     case SWSTYLEBIT_TEXT:
@@ -1160,43 +1160,43 @@ sal_uInt16 SwDocShell::MakeByExample( const OUString &rName, sal_uInt16 nFamily,
                         nId |= COLL_HTML_BITS;
                         break;
                 }
-                pColl->SetPoolFmtId(nId);
+                pColl->SetPoolFormatId(nId);
 
-                pCurrWrtShell->SetTxtFmtColl(pColl);
+                pCurrWrtShell->SetTextFormatColl(pColl);
                 pCurrWrtShell->EndAllAction();
             }
         }
         break;
         case SFX_STYLE_FAMILY_FRAME:
         {
-            SwFrmFmt* pFrm = pStyle->GetFrmFmt();
+            SwFrameFormat* pFrm = pStyle->GetFrameFormat();
             if(pCurrWrtShell->IsFrmSelected() && pFrm && !pFrm->IsDefault())
             {
                 pCurrWrtShell->StartAllAction();
 
-                SfxItemSet aSet(GetPool(), aFrmFmtSetRange );
+                SfxItemSet aSet(GetPool(), aFrameFormatSetRange );
                 pCurrWrtShell->GetFlyFrmAttr( aSet );
 
-                SwFrmFmt* pFFmt = pCurrWrtShell->GetCurFrmFmt();
-                pFrm->SetDerivedFrom( pFFmt );
+                SwFrameFormat* pFFormat = pCurrWrtShell->GetCurFrameFormat();
+                pFrm->SetDerivedFrom( pFFormat );
 
-                pFrm->SetFmtAttr( aSet );
+                pFrm->SetFormatAttr( aSet );
                     // also apply template to remove hard set attributes
-                pCurrWrtShell->SetFrmFmt( pFrm );
+                pCurrWrtShell->SetFrameFormat( pFrm );
                 pCurrWrtShell->EndAllAction();
             }
         }
         break;
         case SFX_STYLE_FAMILY_CHAR:
         {
-            SwCharFmt* pChar = pStyle->GetCharFmt();
+            SwCharFormat* pChar = pStyle->GetCharFormat();
             if(pChar && !pChar->IsDefault())
             {
                 pCurrWrtShell->StartAllAction();
                 pCurrWrtShell->FillByEx( pChar );
-                pChar->SetDerivedFrom( pCurrWrtShell->GetCurCharFmt() );
-                SwFmtCharFmt aFmt( pChar );
-                pCurrWrtShell->SetAttrItem( aFmt );
+                pChar->SetDerivedFrom( pCurrWrtShell->GetCurCharFormat() );
+                SwFormatCharFormat aFormat( pChar );
+                pCurrWrtShell->SetAttrItem( aFormat );
                 pCurrWrtShell->EndAllAction();
             }
         }
@@ -1209,14 +1209,14 @@ sal_uInt16 SwDocShell::MakeByExample( const OUString &rName, sal_uInt16 nFamily,
             SwPageDesc& rSrc = (SwPageDesc&)pCurrWrtShell->GetPageDesc( nPgDsc );
             SwPageDesc& rDest = *const_cast<SwPageDesc*>(pStyle->GetPageDesc());
 
-            sal_uInt16 nPoolId = rDest.GetPoolFmtId();
+            sal_uInt16 nPoolId = rDest.GetPoolFormatId();
             sal_uInt16 nHId = rDest.GetPoolHelpId();
             sal_uInt8 nHFId = rDest.GetPoolHlpFileId();
 
             pCurrWrtShell->GetDoc()->CopyPageDesc( rSrc, rDest );
 
             // PoolId must NEVER be copied!
-            rDest.SetPoolFmtId( nPoolId );
+            rDest.SetPoolFormatId( nPoolId );
             rDest.SetPoolHelpId( nHId );
             rDest.SetPoolHlpFileId( nHFId );
 
@@ -1240,7 +1240,7 @@ sal_uInt16 SwDocShell::MakeByExample( const OUString &rName, sal_uInt16 nFamily,
                 // #i91400#
                 aRule.SetName( pStyle->GetNumRule()->GetName(),
                                pCurrWrtShell->GetDoc()->getIDocumentListsAccess() );
-                pCurrWrtShell->ChgNumRuleFmts( aRule );
+                pCurrWrtShell->ChgNumRuleFormats( aRule );
 
                 pCurrWrtShell->ReplaceNumRule( sOrigRule, aRule.GetName() );
 
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 8260a1c46c49..bb0f62f0b6a7 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -115,35 +115,35 @@ SwImplShellAction::~SwImplShellAction()
 
 // find/create SwCharFormate
 // possibly fill Style
-static SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
+static SwCharFormat* lcl_FindCharFormat( SwDoc& rDoc,
                             const OUString& rName,
                             SwDocStyleSheet* pStyle = 0,
                             bool bCreate = true )
 {
-    SwCharFmt*  pFmt = 0;
+    SwCharFormat*  pFormat = 0;
     if (!rName.isEmpty())
     {
-        pFmt = rDoc.FindCharFmtByName( rName );
-        if( !pFmt && rName == SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD -
+        pFormat = rDoc.FindCharFormatByName( rName );
+        if( !pFormat && rName == SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD -
                                                 RES_POOLCOLL_TEXT_BEGIN ] )
         {
             // Standard-Character template
-            pFmt = rDoc.GetDfltCharFmt();
+            pFormat = rDoc.GetDfltCharFormat();
         }
 
-        if( !pFmt && bCreate )
+        if( !pFormat && bCreate )
         {   // explore Pool
             const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
             if(nId != USHRT_MAX)
-                pFmt = rDoc.getIDocumentStylePoolAccess().GetCharFmtFromPool(nId);
+                pFormat = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool(nId);
         }
     }
     if(pStyle)
     {
-        if(pFmt)
+        if(pFormat)
         {
             pStyle->SetPhysical(true);
-            SwFmt* p = pFmt->DerivedFrom();
+            SwFormat* p = pFormat->DerivedFrom();
             if( p && !p->IsDefault() )
                 pStyle->PresetParent( p->GetName() );
             else
@@ -152,26 +152,26 @@ static SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
         else
             pStyle->SetPhysical(false);
     }
-    return pFmt;
+    return pFormat;
 }
 
 // find/create ParaFormats
 // fill Style
-static SwTxtFmtColl* lcl_FindParaFmt(  SwDoc& rDoc,
+static SwTextFormatColl* lcl_FindParaFormat(  SwDoc& rDoc,
                                 const OUString& rName,
                                 SwDocStyleSheet* pStyle = 0,
                                 bool bCreate = true )
 {
-    SwTxtFmtColl*   pColl = 0;
+    SwTextFormatColl*   pColl = 0;
 
     if (!rName.isEmpty())
     {
-        pColl = rDoc.FindTxtFmtCollByName( rName );
+        pColl = rDoc.FindTextFormatCollByName( rName );
         if( !pColl && bCreate )
         {   // explore Pool
             const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
             if(nId != USHRT_MAX)
-                pColl = rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(nId);
+                pColl = rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(nId);
         }
     }
 
@@ -185,7 +185,7 @@ static SwTxtFmtColl* lcl_FindParaFmt(  SwDoc& rDoc,
             else
                 pStyle->PresetParent( OUString() );
 
-            SwTxtFmtColl& rNext = pColl->GetNextTxtFmtColl();
+            SwTextFormatColl& rNext = pColl->GetNextTextFormatColl();
             pStyle->PresetFollow(rNext.GetName());
         }
         else
@@ -195,37 +195,37 @@ static SwTxtFmtColl* lcl_FindParaFmt(  SwDoc& rDoc,
 }
 
 // Border formats
-static SwFrmFmt* lcl_FindFrmFmt(   SwDoc& rDoc,
+static SwFrameFormat* lcl_FindFrameFormat(   SwDoc& rDoc,
                             const OUString& rName,
                             SwDocStyleSheet* pStyle = 0,
                             bool bCreate = true )
 {
-    SwFrmFmt* pFmt = 0;
+    SwFrameFormat* pFormat = 0;
     if( !rName.isEmpty() )
     {
-        pFmt = rDoc.FindFrmFmtByName( rName );
-        if( !pFmt && bCreate )
+        pFormat = rDoc.FindFrameFormatByName( rName );
+        if( !pFormat && bCreate )
         {   // explore Pool
             const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT);
             if(nId != USHRT_MAX)
-                pFmt = rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool(nId);
+                pFormat = rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool(nId);
         }
     }
 
     if(pStyle)
     {
-        if(pFmt)
+        if(pFormat)
         {
             pStyle->SetPhysical(true);
-            if( pFmt->DerivedFrom() && !pFmt->DerivedFrom()->IsDefault() )
-                pStyle->PresetParent( pFmt->DerivedFrom()->GetName() );
+            if( pFormat->DerivedFrom() && !pFormat->DerivedFrom()->IsDefault() )
+                pStyle->PresetParent( pFormat->DerivedFrom()->GetName() );
             else
                 pStyle->PresetParent( OUString() );
         }
         else
             pStyle->SetPhysical(false);
     }
-    return pFmt;
+    return pFormat;
 }
 
 // Page descriptors
@@ -294,7 +294,7 @@ static const SwNumRule* lcl_FindNumRule(   SwDoc&  rDoc,
     return pRule;
 }
 
-sal_uInt32 SwStyleSheetIterator::SwPoolFmtList::FindName(SfxStyleFamily eFam,
+sal_uInt32 SwStyleSheetIterator::SwPoolFormatList::FindName(SfxStyleFamily eFam,
                                                          const OUString &rName)
 {
     if(!maImpl.empty())
@@ -335,7 +335,7 @@ sal_uInt32 SwStyleSheetIterator::SwPoolFmtList::FindName(SfxStyleFamily eFam,
     return SAL_MAX_UINT32;
 }
 
-void SwStyleSheetIterator::SwPoolFmtList::rehash()
+void SwStyleSheetIterator::SwPoolFormatList::rehash()
 {
     maUnique.clear();
     for (size_t i = 0; i < maImpl.size(); i++)
@@ -343,7 +343,7 @@ void SwStyleSheetIterator::SwPoolFmtList::rehash()
     assert (maImpl.size() == maUnique.size());
 }
 
-void SwStyleSheetIterator::SwPoolFmtList::RemoveName(SfxStyleFamily eFam,
+void SwStyleSheetIterator::SwPoolFormatList::RemoveName(SfxStyleFamily eFam,
                                                      const OUString &rName)
 {
     sal_uInt32 nTmpPos = FindName( eFam, rName );
@@ -356,7 +356,7 @@ void SwStyleSheetIterator::SwPoolFmtList::RemoveName(SfxStyleFamily eFam,
 }
 
 // Add Strings to the list of templates
-void SwStyleSheetIterator::SwPoolFmtList::Append( char cChar, const OUString& rStr )
+void SwStyleSheetIterator::SwPoolFormatList::Append( char cChar, const OUString& rStr )
 {
     const OUString aStr = OUString(cChar) + rStr;
 
@@ -377,9 +377,9 @@ SwDocStyleSheet::SwDocStyleSheet(   SwDoc&          rDocument,
                                     sal_uInt16                  _nMask) :
 
     SfxStyleSheetBase( rName, _rPool, eFam, _nMask ),
-    pCharFmt(0),
+    pCharFormat(0),
     pColl(0),
-    pFrmFmt(0),
+    pFrameFormat(0),
     pDesc(0),
     pNumRule(0),
 
@@ -420,9 +420,9 @@ SwDocStyleSheet::SwDocStyleSheet(   SwDoc&          rDocument,
 
 SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) :
     SfxStyleSheetBase(rOrg),
-    pCharFmt(rOrg.pCharFmt),
+    pCharFormat(rOrg.pCharFormat),
     pColl(rOrg.pColl),
-    pFrmFmt(rOrg.pFrmFmt),
+    pFrameFormat(rOrg.pFrameFormat),
     pDesc(rOrg.pDesc),
     pNumRule(rOrg.pNumRule),
     rDoc(rOrg.rDoc),
@@ -449,22 +449,22 @@ void SwDocStyleSheet::SetGrabBagItem(const uno::Any& rVal)
     if (!bPhysical)
         FillStyleSheet(FillPhysical);
 
-    SwFmt* pFmt = 0;
+    SwFormat* pFormat = 0;
     switch (nFamily)
     {
         case SFX_STYLE_FAMILY_CHAR:
-            pFmt = rDoc.FindCharFmtByName(aName);
-            if (pFmt)
+            pFormat = rDoc.FindCharFormatByName(aName);
+            if (pFormat)
             {
-                pFmt->SetGrabBagItem(rVal);
+                pFormat->SetGrabBagItem(rVal);
                 bChg = true;
             }
             break;
         case SFX_STYLE_FAMILY_PARA:
-            pFmt = rDoc.FindTxtFmtCollByName(aName);
-            if (pFmt)
+            pFormat = rDoc.FindTextFormatCollByName(aName);
+            if (pFormat)
             {
-                pFmt->SetGrabBagItem(rVal);
+                pFormat->SetGrabBagItem(rVal);
                 bChg = true;
             }
             break;
@@ -494,18 +494,18 @@ void SwDocStyleSheet::SetGrabBagItem(const uno::Any& rVal)
 
 void SwDocStyleSheet::GetGrabBagItem(uno::Any& rVal) const
 {
-    SwFmt* pFmt = 0;
+    SwFormat* pFormat = 0;
     switch (nFamily)
     {
         case SFX_STYLE_FAMILY_CHAR:
-            pFmt = rDoc.FindCharFmtByName(aName);
-            if (pFmt)
-                pFmt->GetGrabBagItem(rVal);
+            pFormat = rDoc.FindCharFormatByName(aName);
+            if (pFormat)
+                pFormat->GetGrabBagItem(rVal);
             break;
         case SFX_STYLE_FAMILY_PARA:
-            pFmt = rDoc.FindTxtFmtCollByName(aName);
-            if (pFmt)
-                pFmt->GetGrabBagItem(rVal);
+            pFormat = rDoc.FindTextFormatCollByName(aName);
+            if (pFormat)
+                pFormat->GetGrabBagItem(rVal);
             break;
         case SFX_STYLE_FAMILY_PSEUDO:
             {
@@ -525,32 +525,32 @@ void SwDocStyleSheet::SetHidden( bool bValue )
     if(!bPhysical)
         FillStyleSheet( FillPhysical );
 
-    SwFmt* pFmt = 0;
+    SwFormat* pFormat = 0;
     switch(nFamily)
     {
         case SFX_STYLE_FAMILY_CHAR:
-            pFmt = rDoc.FindCharFmtByName( aName );
-            if ( pFmt )
+            pFormat = rDoc.FindCharFormatByName( aName );
+            if ( pFormat )
             {
-                pFmt->SetHidden( bValue );
+                pFormat->SetHidden( bValue );
                 bChg = true;
             }
             break;
 
         case SFX_STYLE_FAMILY_PARA:
-            pFmt = rDoc.FindTxtFmtCollByName( aName );
-            if ( pFmt )
+            pFormat = rDoc.FindTextFormatCollByName( aName );
+            if ( pFormat )
             {
-                pFmt->SetHidden( bValue );
+                pFormat->SetHidden( bValue );
                 bChg = true;
             }
             break;
 
         case SFX_STYLE_FAMILY_FRAME:
-            pFmt = rDoc.FindFrmFmtByName( aName );
-            if ( pFmt )
+            pFormat = rDoc.FindFrameFormatByName( aName );
+            if ( pFormat )
             {
-                pFmt->SetHidden( bValue );
+                pFormat->SetHidden( bValue );
                 bChg = true;
             }
             break;
@@ -593,22 +593,22 @@ bool SwDocStyleSheet::IsHidden( ) const
 {
     bool bRet = false;
 
-    SwFmt* pFmt = 0;
+    SwFormat* pFormat = 0;
     switch(nFamily)
     {
         case SFX_STYLE_FAMILY_CHAR:
-            pFmt = rDoc.FindCharFmtByName( aName );
-            bRet = pFmt && pFmt->IsHidden( );
+            pFormat = rDoc.FindCharFormatByName( aName );
+            bRet = pFormat && pFormat->IsHidden( );
             break;
 
         case SFX_STYLE_FAMILY_PARA:
-            pFmt = rDoc.FindTxtFmtCollByName( aName );
-            bRet = pFmt && pFmt->IsHidden( );
+            pFormat = rDoc.FindTextFormatCollByName( aName );
+            bRet = pFormat && pFormat->IsHidden( );
             break;
 
         case SFX_STYLE_FAMILY_FRAME:
-            pFmt = rDoc.FindFrmFmtByName( aName );
-            bRet = pFmt && pFmt->IsHidden( );
+            pFormat = rDoc.FindFrameFormatByName( aName );
+            bRet = pFormat && pFormat->IsHidden( );
             break;
 
         case SFX_STYLE_FAMILY_PAGE:
@@ -633,22 +633,22 @@ const OUString&  SwDocStyleSheet::GetParent() const
     if( !bPhysical )
     {
         // check if it's already in document
-        SwFmt* pFmt = 0;
+        SwFormat* pFormat = 0;
         SwGetPoolIdFromName eGetType;
         switch(nFamily)
         {
         case SFX_STYLE_FAMILY_CHAR:
-            pFmt = rDoc.FindCharFmtByName( aName );
+            pFormat = rDoc.FindCharFormatByName( aName );
             eGetType = nsSwGetPoolIdFromName::GET_POOLID_CHRFMT;
             break;
 
         case SFX_STYLE_FAMILY_PARA:
-            pFmt = rDoc.FindTxtFmtCollByName( aName );
+            pFormat = rDoc.FindTextFormatCollByName( aName );
             eGetType = nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL;
             break;
 
         case SFX_STYLE_FAMILY_FRAME:
-            pFmt = rDoc.FindFrmFmtByName( aName );
+            pFormat = rDoc.FindFrameFormatByName( aName );
             eGetType = nsSwGetPoolIdFromName::GET_POOLID_FRMFMT;
             break;
 
@@ -659,7 +659,7 @@ const OUString&  SwDocStyleSheet::GetParent() const
         }
 
         OUString sTmp;
-        if( !pFmt )         // not yet there, so default Parent
+        if( !pFormat )         // not yet there, so default Parent
         {
             sal_uInt16 i = SwStyleNameMapper::GetPoolIdFromUIName( aName, eGetType );
             i = ::GetPoolParent( i );
@@ -668,7 +668,7 @@ const OUString&  SwDocStyleSheet::GetParent() const
         }
         else
         {
-            SwFmt* p = pFmt->DerivedFrom();
+            SwFormat* p = pFormat->DerivedFrom();
             if( p && !p->IsDefault() )
                 sTmp = p->GetName();
         }
@@ -960,13 +960,13 @@ bool  SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow)
     {
         case SFX_STYLE_FAMILY_CHAR :
         {
-            OSL_ENSURE(pCharFmt, "SwCharFormat missing!");
-            if( pCharFmt && pCharFmt->GetName() != rStr )
+            OSL_ENSURE(pCharFormat, "SwCharFormat missing!");
+            if( pCharFormat && pCharFormat->GetName() != rStr )
             {
-                if (!pCharFmt->GetName().isEmpty())
-                    rDoc.RenameFmt(*pCharFmt, rStr);
+                if (!pCharFormat->GetName().isEmpty())
+                    rDoc.RenameFormat(*pCharFormat, rStr);
                 else
-                    pCharFmt->SetName(rStr);
+                    pCharFormat->SetName(rStr);
 
                 bChg = true;
             }
@@ -978,7 +978,7 @@ bool  SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow)
             if( pColl && pColl->GetName() != rStr )
             {
                 if (!pColl->GetName().isEmpty())
-                    rDoc.RenameFmt(*pColl, rStr);
+                    rDoc.RenameFormat(*pColl, rStr);
                 else
                     pColl->SetName(rStr);
 
@@ -988,13 +988,13 @@ bool  SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow)
         }
         case SFX_STYLE_FAMILY_FRAME:
         {
-            OSL_ENSURE(pFrmFmt, "FrmFmt missing!");
-            if( pFrmFmt && pFrmFmt->GetName() != rStr )
+            OSL_ENSURE(pFrameFormat, "FrameFormat missing!");
+            if( pFrameFormat && pFrameFormat->GetName() != rStr )
             {
-                if (!pFrmFmt->GetName().isEmpty())
-                    rDoc.RenameFmt(*pFrmFmt, rStr);
+                if (!pFrameFormat->GetName().isEmpty())
+                    rDoc.RenameFormat(*pFrameFormat, rStr);
                 else
-                    pFrmFmt->SetName( rStr );
+                    pFrameFormat->SetName( rStr );
 
                 bChg = true;
             }
@@ -1069,25 +1069,25 @@ bool  SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow)
 // hierarchy of deduction
 bool   SwDocStyleSheet::SetParent( const OUString& rStr)
 {
-    SwFmt* pFmt = 0, *pParent = 0;
+    SwFormat* pFormat = 0, *pParent = 0;
     switch(nFamily)
     {
         case SFX_STYLE_FAMILY_CHAR :
-            OSL_ENSURE( pCharFmt, "SwCharFormat missing!" );
-            if( 0 != ( pFmt = pCharFmt ) && !rStr.isEmpty() )
-                pParent = lcl_FindCharFmt(rDoc, rStr);
+            OSL_ENSURE( pCharFormat, "SwCharFormat missing!" );
+            if( 0 != ( pFormat = pCharFormat ) && !rStr.isEmpty() )
+                pParent = lcl_FindCharFormat(rDoc, rStr);
             break;
 
         case SFX_STYLE_FAMILY_PARA :
             OSL_ENSURE( pColl, "Collektion missing!");
-            if( 0 != ( pFmt = pColl ) && !rStr.isEmpty() )
-                pParent = lcl_FindParaFmt( rDoc, rStr );
+            if( 0 != ( pFormat = pColl ) && !rStr.isEmpty() )
+                pParent = lcl_FindParaFormat( rDoc, rStr );
             break;
 
         case SFX_STYLE_FAMILY_FRAME:
-            OSL_ENSURE(pFrmFmt, "FrameFormat missing!");
-            if( 0 != ( pFmt = pFrmFmt ) && !rStr.isEmpty() )
-                pParent = lcl_FindFrmFmt( rDoc, rStr );
+            OSL_ENSURE(pFrameFormat, "FrameFormat missing!");
+            if( 0 != ( pFormat = pFrameFormat ) && !rStr.isEmpty() )
+                pParent = lcl_FindFrameFormat( rDoc, rStr );
             break;
 
         case SFX_STYLE_FAMILY_PAGE:
@@ -1098,12 +1098,12 @@ bool   SwDocStyleSheet::SetParent( const OUString& rStr)
     }
 
     bool bRet = false;
-    if( pFmt && pFmt->DerivedFrom() &&
-        pFmt->DerivedFrom()->GetName() != rStr )
+    if( pFormat && pFormat->DerivedFrom() &&
+        pFormat->DerivedFrom()->GetName() != rStr )
     {
         {
             SwImplShellAction aTmp( rDoc );
-            bRet = pFmt->SetDerivedFrom( pParent );
+            bRet = pFormat->SetDerivedFrom( pParent );
         }
 
         if( bRet )
@@ -1131,11 +1131,11 @@ bool   SwDocStyleSheet::SetFollow( const OUString& rStr)
         OSL_ENSURE(pColl, "Collection missing!");
         if( pColl )
         {
-            SwTxtFmtColl* pFollow = pColl;
-            if( !rStr.isEmpty() && 0 == (pFollow = lcl_FindParaFmt(rDoc, rStr) ))
+            SwTextFormatColl* pFollow = pColl;
+            if( !rStr.isEmpty() && 0 == (pFollow = lcl_FindParaFormat(rDoc, rStr) ))
                 pFollow = pColl;
 
-            pColl->SetNextTxtFmtColl(*pFollow);
+            pColl->SetNextTextFormatColl(*pFollow);
         }
         break;
     }
@@ -1192,32 +1192,32 @@ SfxItemSet&   SwDocStyleSheet::GetItemSet()
 
                 if( nFamily == SFX_STYLE_FAMILY_CHAR )
                 {
-                    SAL_WARN_IF(!pCharFmt, "sw.ui", "Where's SwCharFmt");
-                    aCoreSet.Put(pCharFmt->GetAttrSet());
+                    SAL_WARN_IF(!pCharFormat, "sw.ui", "Where's SwCharFormat");
+                    aCoreSet.Put(pCharFormat->GetAttrSet());
                     aCoreSet.Put( aBoxInfo );
 
-                    if(pCharFmt->DerivedFrom())
-                        aCoreSet.SetParent(&pCharFmt->DerivedFrom()->GetAttrSet());
+                    if(pCharFormat->DerivedFrom())
+                        aCoreSet.SetParent(&pCharFormat->DerivedFrom()->GetAttrSet());
                 }
                 else if ( nFamily == SFX_STYLE_FAMILY_PARA )
                 {
                     OSL_ENSURE(pColl, "Where's Collection");
                     aCoreSet.Put(pColl->GetAttrSet());
                     aCoreSet.Put( aBoxInfo );
-                    aCoreSet.Put(SfxBoolItem(SID_ATTR_AUTO_STYLE_UPDATE, pColl->IsAutoUpdateFmt()));
+                    aCoreSet.Put(SfxBoolItem(SID_ATTR_AUTO_STYLE_UPDATE, pColl->IsAutoUpdateFormat()));
 
                     if(pColl->DerivedFrom())
                         aCoreSet.SetParent(&pColl->DerivedFrom()->GetAttrSet());
                 }
                 else
                 {
-                    OSL_ENSURE(pFrmFmt, "Where's FrmFmt");
-                    aCoreSet.Put(pFrmFmt->GetAttrSet());
+                    OSL_ENSURE(pFrameFormat, "Where's FrameFormat");
+                    aCoreSet.Put(pFrameFormat->GetAttrSet());
                     aCoreSet.Put( aBoxInfo );
-                    aCoreSet.Put(SfxBoolItem(SID_ATTR_AUTO_STYLE_UPDATE, pFrmFmt->IsAutoUpdateFmt()));
+                    aCoreSet.Put(SfxBoolItem(SID_ATTR_AUTO_STYLE_UPDATE, pFrameFormat->IsAutoUpdateFormat()));
 
-                    if(pFrmFmt->DerivedFrom())
-                        aCoreSet.SetParent(&pFrmFmt->DerivedFrom()->GetAttrSet());
+                    if(pFrameFormat->DerivedFrom())
+                        aCoreSet.SetParent(&pFrameFormat->DerivedFrom()->GetAttrSet());
 
                     //UUUU create needed items for XPropertyList entries from the DrawModel so that
                     // the Area TabPage can access them
@@ -1236,7 +1236,7 @@ SfxItemSet&   SwDocStyleSheet::GetItemSet()
                 //UUUU set correct parent to get the drawing::FillStyle_NONE FillStyle as needed
                 if(!aCoreSet.GetParent())
                 {
-                    aCoreSet.SetParent(&rDoc.GetDfltFrmFmt()->GetAttrSet());
+                    aCoreSet.SetParent(&rDoc.GetDfltFrameFormat()->GetAttrSet());
                 }
 
                 OSL_ENSURE(pDesc, "No PageDescriptor");
@@ -1279,12 +1279,12 @@ void SwDocStyleSheet::MergeIndentAttrsOfListStyle( SfxItemSet& rSet )
             const SwNumRule* pRule = rDoc.FindNumRulePtr( sNumRule );
             if( pRule )
             {
-                const SwNumFmt& rFmt = pRule->Get( 0 );
-                if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+                const SwNumFormat& rFormat = pRule->Get( 0 );
+                if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
                     SvxLRSpaceItem aLR( RES_LR_SPACE );
-                    aLR.SetTxtLeft( rFmt.GetIndentAt() );
-                    aLR.SetTxtFirstLineOfst( static_cast<short>(rFmt.GetFirstLineIndent()) );
+                    aLR.SetTextLeft( rFormat.GetIndentAt() );
+                    aLR.SetTextFirstLineOfst( static_cast<short>(rFormat.GetFirstLineIndent()) );
                     rSet.Put( aLR );
                 }
             }
@@ -1311,7 +1311,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
         rDoc.GetIDocumentUndoRedo().StartUndo( UNDO_INSFMTATTR, &aRewriter );
     }
 
-    SwFmt* pFmt = 0;
+    SwFormat* pFormat = 0;
     SwPageDesc* pNewDsc = 0;
     size_t nPgDscPos = 0;
 
@@ -1319,8 +1319,8 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
     {
         case SFX_STYLE_FAMILY_CHAR :
             {
-                OSL_ENSURE(pCharFmt, "Where's CharFormat");
-                pFmt = pCharFmt;
+                OSL_ENSURE(pCharFormat, "Where's CharFormat");
+                pFormat = pCharFormat;
             }
             break;
 
@@ -1330,7 +1330,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
             const SfxPoolItem* pAutoUpdate;
             if(SfxItemState::SET == rSet.GetItemState(SID_ATTR_AUTO_STYLE_UPDATE,false, &pAutoUpdate ))
             {
-                pColl->SetAutoUpdateFmt(static_cast<const SfxBoolItem*>(pAutoUpdate)->GetValue());
+                pColl->SetAutoUpdateFormat(static_cast<const SfxBoolItem*>(pAutoUpdate)->GetValue());
             }
 
             const SwCondCollItem* pCondItem;
@@ -1344,15 +1344,15 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                 for(sal_uInt16 i = 0; i < COND_COMMAND_COUNT; i++)
                 {
                     SwCollCondition aCond( 0, pCmds[ i ].nCnd, pCmds[ i ].nSubCond );
-                    static_cast<SwConditionTxtFmtColl*>(pColl)->RemoveCondition( aCond );
+                    static_cast<SwConditionTextFormatColl*>(pColl)->RemoveCondition( aCond );
                     const OUString sStyle = pCondItem->GetStyle( i );
                     if (sStyle.isEmpty())
                         continue;
-                    SwFmt *const pFindFmt = lcl_FindParaFmt( rDoc, sStyle, 0, true );
-                    if (pFindFmt)
+                    SwFormat *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0, true );
+                    if (pFindFormat)
                     {
-                        aCond.RegisterToFormat( *pFindFmt );
-                        static_cast<SwConditionTxtFmtColl*>(pColl)->InsertCondition( aCond );
+                        aCond.RegisterToFormat( *pFindFormat );
+                        static_cast<SwConditionTextFormatColl*>(pColl)->InsertCondition( aCond );
                     }
                 }
 
@@ -1364,10 +1364,10 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
             {
                 // no conditional template, then first create and adopt
                 // all important values
-                SwConditionTxtFmtColl* pCColl = rDoc.MakeCondTxtFmtColl(
-                        pColl->GetName(), static_cast<SwTxtFmtColl*>(pColl->DerivedFrom()) );
-                if( pColl != &pColl->GetNextTxtFmtColl() )
-                    pCColl->SetNextTxtFmtColl( pColl->GetNextTxtFmtColl() );
+                SwConditionTextFormatColl* pCColl = rDoc.MakeCondTextFormatColl(
+                        pColl->GetName(), static_cast<SwTextFormatColl*>(pColl->DerivedFrom()) );
+                if( pColl != &pColl->GetNextTextFormatColl() )
+                    pCColl->SetNextTextFormatColl( pColl->GetNextTextFormatColl() );
 
                 if( pColl->IsAssignedToListLevelOfOutlineStyle())
                     pCColl->AssignToListLevelOfOutlineStyle(pColl->GetAssignedOutlineStyleLevel());
@@ -1380,15 +1380,15 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                     const OUString sStyle = pCondItem->GetStyle( i );
                     if (sStyle.isEmpty())
                         continue;
-                    SwTxtFmtColl *const pFindFmt = lcl_FindParaFmt( rDoc, sStyle, 0, true );
-                    if (pFindFmt)
+                    SwTextFormatColl *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0, true );
+                    if (pFindFormat)
                     {
-                        pCColl->InsertCondition( SwCollCondition( pFindFmt,
+                        pCColl->InsertCondition( SwCollCondition( pFindFormat,
                                     pCmds[ i ].nCnd, pCmds[ i ].nSubCond ) );
                     }
                 }
 
-                rDoc.DelTxtFmtColl( pColl );
+                rDoc.DelTextFormatColl( pColl );
                 pColl = pCColl;
             }
             if ( bResetIndentAttrsAtParagraphStyle &&
@@ -1421,9 +1421,9 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                 }
             }
 
-            pFmt = pColl;
+            pFormat = pColl;
 
-            sal_uInt16 nId = pColl->GetPoolFmtId() &
+            sal_uInt16 nId = pColl->GetPoolFormatId() &
                             ~ ( COLL_GET_RANGE_BITS | POOLGRP_NOCOLLID );
             switch( GetMask() & ( 0x0fff & ~SWSTYLEBIT_CONDCOLL ) )
             {
@@ -1446,18 +1446,18 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                     nId |= COLL_HTML_BITS;
                     break;
             }
-            pColl->SetPoolFmtId( nId );
+            pColl->SetPoolFormatId( nId );
             break;
         }
         case SFX_STYLE_FAMILY_FRAME:
         {
-            OSL_ENSURE(pFrmFmt, "Where's FrmFmt");
+            OSL_ENSURE(pFrameFormat, "Where's FrameFormat");
             const SfxPoolItem* pAutoUpdate;
             if(SfxItemState::SET == rSet.GetItemState(SID_ATTR_AUTO_STYLE_UPDATE,false, &pAutoUpdate ))
             {
-                pFrmFmt->SetAutoUpdateFmt(static_cast<const SfxBoolItem*>(pAutoUpdate)->GetValue());
+                pFrameFormat->SetAutoUpdateFormat(static_cast<const SfxBoolItem*>(pAutoUpdate)->GetValue());
             }
-            pFmt = pFrmFmt;
+            pFormat = pFrameFormat;
         }
         break;
 
@@ -1473,7 +1473,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                     ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
                     rDoc.CopyPageDesc(*pDesc, *pNewDsc); // #i7983#
 
-                    pFmt = &pNewDsc->GetMaster();
+                    pFormat = &pNewDsc->GetMaster();
                 }
             }
             break;
@@ -1494,7 +1494,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                     pSetRule->UnLinkGraphics();
                     SwNumRule aSetRule(*pNumRule);
                     aSetRule.SetSvxRule(*pSetRule, &rDoc);
-                    rDoc.ChgNumRuleFmts( aSetRule );
+                    rDoc.ChgNumRuleFormats( aSetRule );
                 }
                 break;
                 case SfxItemState::DONTCARE:
@@ -1504,7 +1504,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                     SwNumRule aRule( pNumRule->GetName(),
                                      // #i89178#
                                      numfunc::GetDefaultPositionAndSpaceMode() );
-                    rDoc.ChgNumRuleFmts( aRule );
+                    rDoc.ChgNumRuleFormats( aRule );
                 }
                 break;
                 default: break;
@@ -1516,7 +1516,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
             OSL_ENSURE(false, "unknown style family");
     }
 
-    if( pFmt && rSet.Count())
+    if( pFormat && rSet.Count())
     {
         SfxItemIter aIter( rSet );
         const SfxPoolItem* pItem = aIter.GetCurItem();
@@ -1527,7 +1527,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                 // use method <SwDoc::ResetAttrAtFormat(..)> in order to
                 // create an Undo object for the attribute reset.
                 rDoc.ResetAttrAtFormat( rSet.GetWhichByPos(aIter.GetCurPos()),
-                                        *pFmt );
+                                        *pFormat );
             }
 
             if( aIter.IsAtEnd() )
@@ -1556,7 +1556,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
             delete pNewDsc;
         }
         else
-            rDoc.ChgFmt(*pFmt, aSet);       // put all that is set
+            rDoc.ChgFormat(*pFormat, aSet);       // put all that is set
     }
     else
     {
@@ -1580,28 +1580,28 @@ static void lcl_SaveStyles( sal_uInt16 nFamily, std::vector<void*>& rArr, SwDoc&
     {
     case SFX_STYLE_FAMILY_CHAR:
         {
-            const SwCharFmts& rTbl = *rDoc.GetCharFmts();
-            for( size_t n = 0, nCnt = rTbl.size(); n < nCnt; ++n )
+            const SwCharFormats& rTable = *rDoc.GetCharFormats();
+            for( size_t n = 0, nCnt = rTable.size(); n < nCnt; ++n )
             {
-                rArr.push_back( rTbl[ n ] );
+                rArr.push_back( rTable[ n ] );
             }
         }
         break;
     case SFX_STYLE_FAMILY_PARA:
         {
-            const SwTxtFmtColls& rTbl = *rDoc.GetTxtFmtColls();
-            for( size_t n = 0, nCnt = rTbl.size(); n < nCnt; ++n )
+            const SwTextFormatColls& rTable = *rDoc.GetTextFormatColls();
+            for( size_t n = 0, nCnt = rTable.size(); n < nCnt; ++n )
             {
-                rArr.push_back( rTbl[ n ] );
+                rArr.push_back( rTable[ n ] );
             }
         }
         break;
     case SFX_STYLE_FAMILY_FRAME:
         {
-            const SwFrmFmts& rTbl = *rDoc.GetFrmFmts();
-            for( size_t n = 0, nCnt = rTbl.size(); n < nCnt; ++n )
+            const SwFrameFormats& rTable = *rDoc.GetFrameFormats();
+            for( size_t n = 0, nCnt = rTable.size(); n < nCnt; ++n )
             {
-                rArr.push_back( rTbl[ n ] );
+                rArr.push_back( rTable[ n ] );
             }
         }
         break;
@@ -1617,10 +1617,10 @@ static void lcl_SaveStyles( sal_uInt16 nFamily, std::vector<void*>& rArr, SwDoc&
 
     case SFX_STYLE_FAMILY_PSEUDO:
         {
-            const SwNumRuleTbl& rTbl = rDoc.GetNumRuleTbl();
-            for( size_t n = 0, nCnt = rTbl.size(); n < nCnt; ++n )
+            const SwNumRuleTable& rTable = rDoc.GetNumRuleTable();
+            for( size_t n = 0, nCnt = rTable.size(); n < nCnt; ++n )
             {
-                rArr.push_back( rTbl[ n ] );
+                rArr.push_back( rTable[ n ] );
             }
         }
         break;
@@ -1640,42 +1640,42 @@ static void lcl_DeleteInfoStyles( sal_uInt16 nFamily, std::vector<void*>& rArr,
     case SFX_STYLE_FAMILY_CHAR:
         {
             std::deque<sal_uInt16> aDelArr;
-            const SwCharFmts& rTbl = *rDoc.GetCharFmts();
-            for( n = 0, nCnt = rTbl.size(); n < nCnt; ++n )
+            const SwCharFormats& rTable = *rDoc.GetCharFormats();
+            for( n = 0, nCnt = rTable.size(); n < nCnt; ++n )
             {
-                if( !lcl_Contains( rArr, rTbl[ n ] ))
+                if( !lcl_Contains( rArr, rTable[ n ] ))
                     aDelArr.push_front( n );
             }
             for( n = 0, nCnt = aDelArr.size(); n < nCnt; ++n )
-                rDoc.DelCharFmt( aDelArr[ n ] );
+                rDoc.DelCharFormat( aDelArr[ n ] );
         }
         break;
 
     case SFX_STYLE_FAMILY_PARA :
         {
             std::deque<sal_uInt16> aDelArr;
-            const SwTxtFmtColls& rTbl = *rDoc.GetTxtFmtColls();
-            for( n = 0, nCnt = rTbl.size(); n < nCnt; ++n )
+            const SwTextFormatColls& rTable = *rDoc.GetTextFormatColls();
+            for( n = 0, nCnt = rTable.size(); n < nCnt; ++n )
             {
-                if( !lcl_Contains( rArr, rTbl[ n ] ))
+                if( !lcl_Contains( rArr, rTable[ n ] ))
                     aDelArr.push_front( n );
             }
             for( n = 0, nCnt = aDelArr.size(); n < nCnt; ++n )
-                rDoc.DelTxtFmtColl( aDelArr[ n ] );
+                rDoc.DelTextFormatColl( aDelArr[ n ] );
         }
         break;
 
     case SFX_STYLE_FAMILY_FRAME:
         {
-            std::deque<SwFrmFmt*> aDelArr;
-            const SwFrmFmts& rTbl = *rDoc.GetFrmFmts();
-            for( n = 0, nCnt = rTbl.size(); n < nCnt; ++n )
+            std::deque<SwFrameFormat*> aDelArr;
+            const SwFrameFormats& rTable = *rDoc.GetFrameFormats();
+            for( n = 0, nCnt = rTable.size(); n < nCnt; ++n )
             {
-                if( !lcl_Contains( rArr, rTbl[ n ] ))
-                    aDelArr.push_front( rTbl[ n ] );
+                if( !lcl_Contains( rArr, rTable[ n ] ))
+                    aDelArr.push_front( rTable[ n ] );
             }
             for( n = 0, nCnt = aDelArr.size(); n < nCnt; ++n )
-                rDoc.DelFrmFmt( aDelArr[ n ] );
+                rDoc.DelFrameFormat( aDelArr[ n ] );
         }
         break;
 
@@ -1695,11 +1695,11 @@ static void lcl_DeleteInfoStyles( sal_uInt16 nFamily, std::vector<void*>& rArr,
     case SFX_STYLE_FAMILY_PSEUDO:
         {
             std::deque<SwNumRule*> aDelArr;
-            const SwNumRuleTbl& rTbl = rDoc.GetNumRuleTbl();
-            for( n = 0, nCnt = rTbl.size(); n < nCnt; ++n )
+            const SwNumRuleTable& rTable = rDoc.GetNumRuleTable();
+            for( n = 0, nCnt = rTable.size(); n < nCnt; ++n )
             {
-                if( !lcl_Contains( rArr, rTbl[ n ] ))
-                    aDelArr.push_front( rTbl[ n ] );
+                if( !lcl_Contains( rArr, rTable[ n ] ))
+                    aDelArr.push_front( rTable[ n ] );
             }
             for( n = 0, nCnt = aDelArr.size(); n < nCnt; ++n )
                 rDoc.DelNumRule( aDelArr[ n ]->GetName() );
@@ -1713,7 +1713,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
 {
     bool bRet = false;
     sal_uInt16 nPoolId = USHRT_MAX;
-    SwFmt* pFmt = 0;
+    SwFormat* pFormat = 0;
 
     bool bCreate = FillPhysical == eFType;
     bool bDeleteInfo = false;
@@ -1723,17 +1723,17 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
     switch(nFamily)
     {
     case SFX_STYLE_FAMILY_CHAR:
-        pCharFmt = lcl_FindCharFmt(rDoc, aName, this, bCreate );
-        bPhysical = 0 != pCharFmt;
+        pCharFormat = lcl_FindCharFormat(rDoc, aName, this, bCreate );
+        bPhysical = 0 != pCharFormat;
         if( bFillOnlyInfo && !bPhysical )
         {
             bDeleteInfo = true;
             ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc );
-            pCharFmt = lcl_FindCharFmt(rDoc, aName, this, true );
+            pCharFormat = lcl_FindCharFormat(rDoc, aName, this, true );
         }
 
-        pFmt = pCharFmt;
-        if( !bCreate && !pFmt )
+        pFormat = pCharFormat;
+        if( !bCreate && !pFormat )
         {
             if( aName == SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD -
                                             RES_POOLCOLL_TEXT_BEGIN ] )
@@ -1742,26 +1742,26 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
                 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( aName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
         }
 
-        bRet = 0 != pCharFmt || USHRT_MAX != nPoolId;
+        bRet = 0 != pCharFormat || USHRT_MAX != nPoolId;
 
         if( bDeleteInfo )
-            pCharFmt = 0;
+            pCharFormat = 0;
         break;
 
     case SFX_STYLE_FAMILY_PARA:
         {
-            pColl = lcl_FindParaFmt(rDoc, aName, this, bCreate);
+            pColl = lcl_FindParaFormat(rDoc, aName, this, bCreate);
             bPhysical = 0 != pColl;
             if( bFillOnlyInfo && !bPhysical )
             {
                 bDeleteInfo = true;
                 ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc );
-                pColl = lcl_FindParaFmt(rDoc, aName, this, true );
+                pColl = lcl_FindParaFormat(rDoc, aName, this, true );
             }
 
-            pFmt = pColl;
+            pFormat = pColl;
             if( pColl )
-                PresetFollow( pColl->GetNextTxtFmtColl().GetName() );
+                PresetFollow( pColl->GetNextTextFormatColl().GetName() );
             else if( !bCreate )
                 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( aName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
 
@@ -1773,22 +1773,22 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
         break;
 
     case SFX_STYLE_FAMILY_FRAME:
-        pFrmFmt = lcl_FindFrmFmt(rDoc,  aName, this, bCreate);
-        bPhysical = 0 != pFrmFmt;
+        pFrameFormat = lcl_FindFrameFormat(rDoc,  aName, this, bCreate);
+        bPhysical = 0 != pFrameFormat;
         if( bFillOnlyInfo && bPhysical )
         {
             bDeleteInfo = true;
             ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc );
-            pFrmFmt = lcl_FindFrmFmt(rDoc, aName, this, true );
+            pFrameFormat = lcl_FindFrameFormat(rDoc, aName, this, true );
         }
-        pFmt = pFrmFmt;
-        if( !bCreate && !pFmt )
+        pFormat = pFrameFormat;
+        if( !bCreate && !pFormat )
             nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( aName, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT );
 
-        bRet = 0 != pFrmFmt || USHRT_MAX != nPoolId;
+        bRet = 0 != pFrameFormat || USHRT_MAX != nPoolId;
 
         if( bDeleteInfo )
-            pFrmFmt = 0;
+            pFrameFormat = 0;
         break;
 
     case SFX_STYLE_FAMILY_PAGE:
@@ -1803,7 +1803,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
 
         if( pDesc )
         {
-            nPoolId = pDesc->GetPoolFmtId();
+            nPoolId = pDesc->GetPoolFormatId();
             nHelpId = pDesc->GetPoolHelpId();
             if( pDesc->GetPoolHlpFileId() != UCHAR_MAX )
                 aHelpFile = *rDoc.GetDocPattern( pDesc->GetPoolHlpFileId() );
@@ -1831,7 +1831,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
 
         if( pNumRule )
         {
-            nPoolId = pNumRule->GetPoolFmtId();
+            nPoolId = pNumRule->GetPoolFormatId();
             nHelpId = pNumRule->GetPoolHelpId();
             if( pNumRule->GetPoolHlpFileId() != UCHAR_MAX )
                 aHelpFile = *rDoc.GetDocPattern( pNumRule->GetPoolHlpFileId() );
@@ -1854,11 +1854,11 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
         SFX_STYLE_FAMILY_PARA == nFamily ||
         SFX_STYLE_FAMILY_FRAME == nFamily )
     {
-        if( pFmt )
-            nPoolId = pFmt->GetPoolFmtId();
+        if( pFormat )
+            nPoolId = pFormat->GetPoolFormatId();
 
         sal_uInt16 _nMask = 0;
-        if( pFmt == rDoc.GetDfltCharFmt() )
+        if( pFormat == rDoc.GetDfltCharFormat() )
             _nMask |= SFXSTYLEBIT_READONLY;
         else if( USER_FMT & nPoolId )
             _nMask |= SFXSTYLEBIT_USERDEF;
@@ -1873,17 +1873,17 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
         case COLL_HTML_BITS:     _nMask |= SWSTYLEBIT_HTML;   break;
         }
 
-        if( pFmt )
+        if( pFormat )
         {
             OSL_ENSURE( bPhysical, "Format not found" );
 
-            nHelpId = pFmt->GetPoolHelpId();
-            if( pFmt->GetPoolHlpFileId() != UCHAR_MAX )
-                aHelpFile = *rDoc.GetDocPattern( pFmt->GetPoolHlpFileId() );
+            nHelpId = pFormat->GetPoolHelpId();
+            if( pFormat->GetPoolHlpFileId() != UCHAR_MAX )
+                aHelpFile = *rDoc.GetDocPattern( pFormat->GetPoolHlpFileId() );
             else
                 aHelpFile.clear();
 
-            if( RES_CONDTXTFMTCOLL == pFmt->Which() )
+            if( RES_CONDTXTFMTCOLL == pFormat->Which() )
                 _nMask |= SWSTYLEBIT_CONDCOLL;
         }
 
@@ -1900,29 +1900,29 @@ void SwDocStyleSheet::Create()
     switch(nFamily)
     {
         case SFX_STYLE_FAMILY_CHAR :
-            pCharFmt = lcl_FindCharFmt( rDoc, aName );
-            if( !pCharFmt )
-                pCharFmt = rDoc.MakeCharFmt(aName,
-                                            rDoc.GetDfltCharFmt());
-            pCharFmt->SetAuto( false );
+            pCharFormat = lcl_FindCharFormat( rDoc, aName );
+            if( !pCharFormat )
+                pCharFormat = rDoc.MakeCharFormat(aName,
+                                            rDoc.GetDfltCharFormat());
+            pCharFormat->SetAuto( false );
             break;
 
         case SFX_STYLE_FAMILY_PARA :
-            pColl = lcl_FindParaFmt( rDoc, aName );
+            pColl = lcl_FindParaFormat( rDoc, aName );
             if( !pColl )
             {
-                SwTxtFmtColl *pPar = (*rDoc.GetTxtFmtColls())[0];
+                SwTextFormatColl *pPar = (*rDoc.GetTextFormatColls())[0];
                 if( nMask & SWSTYLEBIT_CONDCOLL )
-                    pColl = rDoc.MakeCondTxtFmtColl( aName, pPar );
+                    pColl = rDoc.MakeCondTextFormatColl( aName, pPar );
                 else
-                    pColl = rDoc.MakeTxtFmtColl( aName, pPar );
+                    pColl = rDoc.MakeTextFormatColl( aName, pPar );
             }
             break;
 
         case SFX_STYLE_FAMILY_FRAME:
-            pFrmFmt = lcl_FindFrmFmt( rDoc, aName );
-            if( !pFrmFmt )
-                pFrmFmt = rDoc.MakeFrmFmt(aName, rDoc.GetDfltFrmFmt(), false, false);
+            pFrameFormat = lcl_FindFrameFormat( rDoc, aName );
+            if( !pFrameFormat )
+                pFrameFormat = rDoc.MakeFrameFormat(aName, rDoc.GetDfltFrameFormat(), false, false);
 
             break;
 
@@ -1939,7 +1939,7 @@ void SwDocStyleSheet::Create()
             if( !pNumRule )
             {
                 const OUString sTmpNm( aName.isEmpty() ? rDoc.GetUniqueNumRuleName() : aName );
-                SwNumRule* pRule = rDoc.GetNumRuleTbl()[
+                SwNumRule* pRule = rDoc.GetNumRuleTable()[
                     rDoc.MakeNumRule( sTmpNm, 0, false,
                                       // #i89178#
                                       numfunc::GetDefaultPositionAndSpaceMode() ) ];
@@ -1958,14 +1958,14 @@ void SwDocStyleSheet::Create()
     aCoreSet.ClearItem();
 }
 
-SwCharFmt* SwDocStyleSheet::GetCharFmt()
+SwCharFormat* SwDocStyleSheet::GetCharFormat()
 {
     if(!bPhysical)
         FillStyleSheet( FillPhysical );
-    return pCharFmt;
+    return pCharFormat;
 }
 
-SwTxtFmtColl* SwDocStyleSheet::GetCollection()
+SwTextFormatColl* SwDocStyleSheet::GetCollection()
 {
     if(!bPhysical)
         FillStyleSheet( FillPhysical );
@@ -1989,7 +1989,7 @@ const SwNumRule * SwDocStyleSheet::GetNumRule()
 void SwDocStyleSheet::SetNumRule(const SwNumRule& rRule)
 {
     OSL_ENSURE(pNumRule, "Wo ist die NumRule");
-    rDoc.ChgNumRuleFmts( rRule );
+    rDoc.ChgNumRuleFormats( rRule );
 }
 
 // re-generate Name AND Family from String
@@ -2015,18 +2015,18 @@ void SwDocStyleSheet::SetPhysical(bool bPhys)
 
     if(!bPhys)
     {
-        pCharFmt = 0;
+        pCharFormat = 0;
         pColl    = 0;
-        pFrmFmt  = 0;
+        pFrameFormat  = 0;
         pDesc    = 0;
     }
 }
 
-SwFrmFmt* SwDocStyleSheet::GetFrmFmt()
+SwFrameFormat* SwDocStyleSheet::GetFrameFormat()
 {
     if(!bPhysical)
         FillStyleSheet( FillPhysical );
-    return pFrmFmt;
+    return pFrameFormat;
 }
 
 bool  SwDocStyleSheet::IsUsed() const
@@ -2043,9 +2043,9 @@ bool  SwDocStyleSheet::IsUsed() const
     const SwModify* pMod;
     switch( nFamily )
     {
-    case SFX_STYLE_FAMILY_CHAR : pMod = pCharFmt;   break;
+    case SFX_STYLE_FAMILY_CHAR : pMod = pCharFormat;   break;
     case SFX_STYLE_FAMILY_PARA : pMod = pColl;      break;
-    case SFX_STYLE_FAMILY_FRAME: pMod = pFrmFmt;    break;
+    case SFX_STYLE_FAMILY_FRAME: pMod = pFrameFormat;    break;
     case SFX_STYLE_FAMILY_PAGE : pMod = pDesc;      break;
 
     case SFX_STYLE_FAMILY_PSEUDO:
@@ -2066,37 +2066,37 @@ sal_uLong  SwDocStyleSheet::GetHelpId( OUString& rFile )
 
     rFile = "swrhlppi.hlp";
 
-    const SwFmt* pTmpFmt = 0;
+    const SwFormat* pTmpFormat = 0;
     switch( nFamily )
     {
     case SFX_STYLE_FAMILY_CHAR :
-        if( !pCharFmt &&
-            0 == (pCharFmt = lcl_FindCharFmt( rDoc, aName, 0, false )) )
+        if( !pCharFormat &&
+            0 == (pCharFormat = lcl_FindCharFormat( rDoc, aName, 0, false )) )
         {
             nId = SwStyleNameMapper::GetPoolIdFromUIName( aName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
             return USHRT_MAX == nId ? 0 : nId;
         }
-        pTmpFmt = pCharFmt;
+        pTmpFormat = pCharFormat;
         break;
 
     case SFX_STYLE_FAMILY_PARA:
         if( !pColl &&
-            0 == ( pColl = lcl_FindParaFmt( rDoc, aName, 0, false )) )
+            0 == ( pColl = lcl_FindParaFormat( rDoc, aName, 0, false )) )
         {
             nId = SwStyleNameMapper::GetPoolIdFromUIName( aName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
             return USHRT_MAX == nId ? 0 : nId;
         }
-        pTmpFmt = pColl;
+        pTmpFormat = pColl;
         break;
 
     case SFX_STYLE_FAMILY_FRAME:
-        if( !pFrmFmt &&
-            0 == ( pFrmFmt = lcl_FindFrmFmt( rDoc, aName, 0, false ) ) )
+        if( !pFrameFormat &&
+            0 == ( pFrameFormat = lcl_FindFrameFormat( rDoc, aName, 0, false ) ) )
         {
             nId = SwStyleNameMapper::GetPoolIdFromUIName( aName, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT );
             return USHRT_MAX == nId ? 0 : nId;
         }
-        pTmpFmt = pFrmFmt;
+        pTmpFormat = pFrameFormat;
         break;
 
     case SFX_STYLE_FAMILY_PAGE:
@@ -2109,7 +2109,7 @@ sal_uLong  SwDocStyleSheet::GetHelpId( OUString& rFile )
 
         nId = pDesc->GetPoolHelpId();
         nFileId = pDesc->GetPoolHlpFileId();
-        nPoolId = pDesc->GetPoolFmtId();
+        nPoolId = pDesc->GetPoolFormatId();
         break;
 
     case SFX_STYLE_FAMILY_PSEUDO:
@@ -2122,7 +2122,7 @@ sal_uLong  SwDocStyleSheet::GetHelpId( OUString& rFile )
 
         nId = pNumRule->GetPoolHelpId();
         nFileId = pNumRule->GetPoolHlpFileId();
-        nPoolId = pNumRule->GetPoolFmtId();
+        nPoolId = pNumRule->GetPoolFormatId();
         break;
 
     default:
@@ -2130,11 +2130,11 @@ sal_uLong  SwDocStyleSheet::GetHelpId( OUString& rFile )
         return 0;
     }
 
-    if( pTmpFmt )
+    if( pTmpFormat )
     {
-        nId = pTmpFmt->GetPoolHelpId();
-        nFileId = pTmpFmt->GetPoolHlpFileId();
-        nPoolId = pTmpFmt->GetPoolFmtId();
+        nId = pTmpFormat->GetPoolHelpId();
+        nFileId = pTmpFormat->GetPoolHlpFileId();
+        nPoolId = pTmpFormat->GetPoolFormatId();
     }
 
     if( UCHAR_MAX != nFileId )
@@ -2145,7 +2145,7 @@ sal_uLong  SwDocStyleSheet::GetHelpId( OUString& rFile )
             rFile = *pTemplate;
         }
     }
-    else if( !IsPoolUserFmt( nPoolId ) )
+    else if( !IsPoolUserFormat( nPoolId ) )
     {
         nId = nPoolId;
     }
@@ -2162,12 +2162,12 @@ void  SwDocStyleSheet::SetHelpId( const OUString& r, sal_uLong nId )
     sal_uInt8 nFileId = static_cast< sal_uInt8 >(rDoc.SetDocPattern( r ));
     sal_uInt16 nHId = static_cast< sal_uInt16 >(nId); //!! SFX changed over to ULONG arbitrarily!
 
-    SwFmt* pTmpFmt = 0;
+    SwFormat* pTmpFormat = 0;
     switch( nFamily )
     {
-    case SFX_STYLE_FAMILY_CHAR : pTmpFmt = pCharFmt;    break;
-    case SFX_STYLE_FAMILY_PARA : pTmpFmt = pColl;       break;
-    case SFX_STYLE_FAMILY_FRAME: pTmpFmt = pFrmFmt;     break;
+    case SFX_STYLE_FAMILY_CHAR : pTmpFormat = pCharFormat;    break;
+    case SFX_STYLE_FAMILY_PARA : pTmpFormat = pColl;       break;
+    case SFX_STYLE_FAMILY_FRAME: pTmpFormat = pFrameFormat;     break;
     case SFX_STYLE_FAMILY_PAGE :
         const_cast<SwPageDesc*>(pDesc)->SetPoolHelpId( nHId );
         const_cast<SwPageDesc*>(pDesc)->SetPoolHlpFileId( nFileId );
@@ -2182,10 +2182,10 @@ void  SwDocStyleSheet::SetHelpId( const OUString& r, sal_uLong nId )
         OSL_ENSURE(false, "unknown style family");
         return ;
     }
-    if( pTmpFmt )
+    if( pTmpFormat )
     {
-        pTmpFmt->SetPoolHelpId( nHId );
-        pTmpFmt->SetPoolHlpFileId( nFileId );
+        pTmpFormat->SetPoolHelpId( nHId );
+        pTmpFormat->SetPoolHlpFileId( nFileId );
     }
 }
 
@@ -2279,25 +2279,25 @@ void  SwDocStyleSheetPool::Replace( SfxStyleSheetBase& rSource,
     }
     else
     {
-        const SwFmt *pSourceFmt = 0;
-        SwFmt *pTargetFmt = 0;
+        const SwFormat *pSourceFormat = 0;
+        SwFormat *pTargetFormat = 0;
         size_t nPgDscPos = SIZE_MAX;
         switch( eFamily )
         {
         case SFX_STYLE_FAMILY_CHAR :
             if( bSwSrcPool )
-                pSourceFmt = static_cast<SwDocStyleSheet&>(rSource).GetCharFmt();
-            pTargetFmt = static_cast<SwDocStyleSheet&>(rTarget).GetCharFmt();
+                pSourceFormat = static_cast<SwDocStyleSheet&>(rSource).GetCharFormat();
+            pTargetFormat = static_cast<SwDocStyleSheet&>(rTarget).GetCharFormat();
             break;
         case SFX_STYLE_FAMILY_PARA :
             if( bSwSrcPool )
-                pSourceFmt = static_cast<SwDocStyleSheet&>(rSource).GetCollection();
-            pTargetFmt = static_cast<SwDocStyleSheet&>(rTarget).GetCollection();
+                pSourceFormat = static_cast<SwDocStyleSheet&>(rSource).GetCollection();
+            pTargetFormat = static_cast<SwDocStyleSheet&>(rTarget).GetCollection();
             break;
         case SFX_STYLE_FAMILY_FRAME:
             if( bSwSrcPool )
-                pSourceFmt = static_cast<SwDocStyleSheet&>(rSource).GetFrmFmt();
-            pTargetFmt = static_cast<SwDocStyleSheet&>(rTarget).GetFrmFmt();
+                pSourceFormat = static_cast<SwDocStyleSheet&>(rSource).GetFrameFormat();
+            pTargetFormat = static_cast<SwDocStyleSheet&>(rTarget).GetFrameFormat();
             break;
         case SFX_STYLE_FAMILY_PAGE:
             {
@@ -2306,7 +2306,7 @@ void  SwDocStyleSheetPool::Replace( SfxStyleSheetBase& rSource,
                     &nPgDscPos );
 
                 if( pDesc )
-                    pTargetFmt = &pDesc->GetMaster();
+                    pTargetFormat = &pDesc->GetMaster();
             }
             break;
         case SFX_STYLE_FAMILY_PSEUDO:
@@ -2315,16 +2315,16 @@ void  SwDocStyleSheetPool::Replace( SfxStyleSheetBase& rSource,
             break;
         default:; //prevent warning
         }
-        if( pTargetFmt )
+        if( pTargetFormat )
         {
-            if( pSourceFmt )
-                pTargetFmt->DelDiffs( *pSourceFmt );
+            if( pSourceFormat )
+                pTargetFormat->DelDiffs( *pSourceFormat );
             else if( SIZE_MAX != nPgDscPos )
-                pTargetFmt->ResetFmtAttr( RES_PAGEDESC, RES_FRMATR_END-1 );
+                pTargetFormat->ResetFormatAttr( RES_PAGEDESC, RES_FRMATR_END-1 );
             else
             {
                 // #i73790# - method renamed
-                pTargetFmt->ResetAllFmtAttr();
+                pTargetFormat->ResetAllFormatAttr();
             }
             if( SIZE_MAX != nPgDscPos )
                 rDoc.ChgPageDesc( nPgDscPos,
@@ -2356,23 +2356,23 @@ void SwDocStyleSheetPool::Remove( SfxStyleSheetBase* pStyle)
     {
     case SFX_STYLE_FAMILY_CHAR:
         {
-            SwCharFmt* pFmt = lcl_FindCharFmt(rDoc, sName, 0, false );
-            if(pFmt)
-                rDoc.DelCharFmt(pFmt);
+            SwCharFormat* pFormat = lcl_FindCharFormat(rDoc, sName, 0, false );
+            if(pFormat)
+                rDoc.DelCharFormat(pFormat);
         }
         break;
     case SFX_STYLE_FAMILY_PARA:
         {
-            SwTxtFmtColl* pColl = lcl_FindParaFmt(rDoc, sName, 0, false );
+            SwTextFormatColl* pColl = lcl_FindParaFormat(rDoc, sName, 0, false );
             if(pColl)
-                rDoc.DelTxtFmtColl(pColl);
+                rDoc.DelTextFormatColl(pColl);
         }
         break;
     case SFX_STYLE_FAMILY_FRAME:
         {
-            SwFrmFmt* pFmt = lcl_FindFrmFmt(rDoc, sName, 0, false );
-            if(pFmt)
-                rDoc.DelFrmFmt(pFmt);
+            SwFrameFormat* pFormat = lcl_FindFrameFormat(rDoc, sName, 0, false );
+            if(pFormat)
+                rDoc.DelFrameFormat(pFormat);
         }
         break;
     case SFX_STYLE_FAMILY_PAGE :
@@ -2401,22 +2401,22 @@ void SwDocStyleSheetPool::Remove( SfxStyleSheetBase* pStyle)
 bool  SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
                                       const OUString &rStyle, const OUString &rParent )
 {
-    SwFmt* pFmt = 0, *pParent = 0;
+    SwFormat* pFormat = 0, *pParent = 0;
     switch( eFam )
     {
     case SFX_STYLE_FAMILY_CHAR :
-        if( 0 != ( pFmt = lcl_FindCharFmt( rDoc, rStyle ) ) && !rParent.isEmpty() )
-            pParent = lcl_FindCharFmt(rDoc, rParent );
+        if( 0 != ( pFormat = lcl_FindCharFormat( rDoc, rStyle ) ) && !rParent.isEmpty() )
+            pParent = lcl_FindCharFormat(rDoc, rParent );
         break;
 
     case SFX_STYLE_FAMILY_PARA :
-        if( 0 != ( pFmt = lcl_FindParaFmt( rDoc, rStyle ) ) && !rParent.isEmpty() )
-            pParent = lcl_FindParaFmt( rDoc, rParent );
+        if( 0 != ( pFormat = lcl_FindParaFormat( rDoc, rStyle ) ) && !rParent.isEmpty() )
+            pParent = lcl_FindParaFormat( rDoc, rParent );
         break;
 
     case SFX_STYLE_FAMILY_FRAME:
-        if( 0 != ( pFmt = lcl_FindFrmFmt( rDoc, rStyle ) ) && !rParent.isEmpty() )
-            pParent = lcl_FindFrmFmt( rDoc, rParent );
+        if( 0 != ( pFormat = lcl_FindFrameFormat( rDoc, rStyle ) ) && !rParent.isEmpty() )
+            pParent = lcl_FindFrameFormat( rDoc, rParent );
         break;
 
     case SFX_STYLE_FAMILY_PAGE:
@@ -2428,12 +2428,12 @@ bool  SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
     }
 
     bool bRet = false;
-    if( pFmt && pFmt->DerivedFrom() &&
-        pFmt->DerivedFrom()->GetName() != rParent )
+    if( pFormat && pFormat->DerivedFrom() &&
+        pFormat->DerivedFrom()->GetName() != rParent )
     {
         {
             SwImplShellAction aTmpSh( rDoc );
-            bRet = pFmt->SetDerivedFrom( pParent );
+            bRet = pFormat->SetDerivedFrom( pParent );
         }
 
         if( bRet )
@@ -2442,8 +2442,8 @@ bool  SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
             mxStyleSheet->PresetName( rStyle );
             mxStyleSheet->PresetParent( rParent );
             if( SFX_STYLE_FAMILY_PARA == eFam )
-                mxStyleSheet->PresetFollow( static_cast<SwTxtFmtColl*>(pFmt)->
-                        GetNextTxtFmtColl().GetName() );
+                mxStyleSheet->PresetFollow( static_cast<SwTextFormatColl*>(pFormat)->
+                        GetNextTextFormatColl().GetName() );
             else
                 mxStyleSheet->PresetFollow( OUString() );
 
@@ -2484,7 +2484,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName,
         switch( eFam )
         {
         case SFX_STYLE_FAMILY_CHAR:
-            pMod = mxStyleSheet->GetCharFmt();
+            pMod = mxStyleSheet->GetCharFormat();
             break;
 
         case SFX_STYLE_FAMILY_PARA:
@@ -2492,7 +2492,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName,
             break;
 
         case SFX_STYLE_FAMILY_FRAME:
-            pMod = mxStyleSheet->GetFrmFmt();
+            pMod = mxStyleSheet->GetFrameFormat();
             break;
 
         case SFX_STYLE_FAMILY_PAGE:
@@ -2505,7 +2505,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName,
                 if( pRule &&
                     !bSearchUsed &&
                     (( nSMask & ~SFXSTYLEBIT_USED) == SFXSTYLEBIT_USERDEF
-                            ? !(pRule->GetPoolFmtId() & USER_FMT)
+                            ? !(pRule->GetPoolFormatId() & USER_FMT)
                                 // searched for used and found none
                             : bSearchUsed ))
                     bFnd = false;
@@ -2521,8 +2521,8 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName,
     if( pMod && !bSearchUsed )
     {
         const sal_uInt16 nId = SFX_STYLE_FAMILY_PAGE == eFam
-                        ? static_cast<const SwPageDesc*>(pMod)->GetPoolFmtId()
-                        : static_cast<const SwFmt*>(pMod)->GetPoolFmtId();
+                        ? static_cast<const SwPageDesc*>(pMod)->GetPoolFormatId()
+                        : static_cast<const SwFormat*>(pMod)->GetPoolFormatId();
 
         if( ( nSMask & ~SFXSTYLEBIT_USED) == SFXSTYLEBIT_USERDEF
             ? !(nId & USER_FMT)
@@ -2592,24 +2592,24 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
     if( nSearchFamily == SFX_STYLE_FAMILY_CHAR
      || nSearchFamily == SFX_STYLE_FAMILY_ALL )
     {
-        const size_t nArrLen = rDoc.GetCharFmts()->size();
+        const size_t nArrLen = rDoc.GetCharFormats()->size();
         for( size_t i = 0; i < nArrLen; i++ )
         {
-            SwCharFmt* pFmt = (*rDoc.GetCharFmts())[ i ];
+            SwCharFormat* pFormat = (*rDoc.GetCharFormats())[ i ];
 
-            const bool bUsed = bIsSearchUsed && (bOrganizer || rDoc.IsUsed(*pFmt));
-            if( ( !bSearchHidden && pFmt->IsHidden() && !bUsed ) || ( pFmt->IsDefault() && pFmt != rDoc.GetDfltCharFmt() ) )
+            const bool bUsed = bIsSearchUsed && (bOrganizer || rDoc.IsUsed(*pFormat));
+            if( ( !bSearchHidden && pFormat->IsHidden() && !bUsed ) || ( pFormat->IsDefault() && pFormat != rDoc.GetDfltCharFormat() ) )
                 continue;
 
-            if ( nSrchMask == SFXSTYLEBIT_HIDDEN && !pFmt->IsHidden( ) )
+            if ( nSrchMask == SFXSTYLEBIT_HIDDEN && !pFormat->IsHidden( ) )
                 continue;
 
             if( !bUsed )
             {
                 // Standard is no User template
-                const sal_uInt16 nId = rDoc.GetDfltCharFmt() == pFmt ?
+                const sal_uInt16 nId = rDoc.GetDfltCharFormat() == pFormat ?
                         sal_uInt16( RES_POOLCHR_INET_NORMAL ):
-                                pFmt->GetPoolFmtId();
+                                pFormat->GetPoolFormatId();
                 if( (nSrchMask & ~SFXSTYLEBIT_USED) == SFXSTYLEBIT_USERDEF
                     ? !(nId & USER_FMT)
                         // searched for used and found none
@@ -2628,31 +2628,31 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
                     continue;
             }
 
-            aLst.Append( cCHAR, pFmt == rDoc.GetDfltCharFmt()
+            aLst.Append( cCHAR, pFormat == rDoc.GetDfltCharFormat()
                         ? SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD -
                                                 RES_POOLCOLL_TEXT_BEGIN ]
-                        : pFmt->GetName() );
+                        : pFormat->GetName() );
         }
 
         // PoolFormate
         if( bAll )
         {
             if( ! rDoc.getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) )
-                AppendStyleList(SwStyleNameMapper::GetChrFmtUINameArray(),
+                AppendStyleList(SwStyleNameMapper::GetChrFormatUINameArray(),
                                 bIsSearchUsed, bSearchHidden, bOnlyHidden,
                                 nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR);
             else
             {
-                aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[
+                aLst.Append( cCHAR, SwStyleNameMapper::GetChrFormatUINameArray()[
                         RES_POOLCHR_INET_NORMAL - RES_POOLCHR_BEGIN ] );
-                aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[
+                aLst.Append( cCHAR, SwStyleNameMapper::GetChrFormatUINameArray()[
                         RES_POOLCHR_INET_VISIT - RES_POOLCHR_BEGIN ] );
-                aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[
+                aLst.Append( cCHAR, SwStyleNameMapper::GetChrFormatUINameArray()[
                         RES_POOLCHR_ENDNOTE - RES_POOLCHR_BEGIN ] );
-                aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[
+                aLst.Append( cCHAR, SwStyleNameMapper::GetChrFormatUINameArray()[
                         RES_POOLCHR_FOOTNOTE - RES_POOLCHR_BEGIN ] );
             }
-            AppendStyleList(SwStyleNameMapper::GetHTMLChrFmtUINameArray(),
+            AppendStyleList(SwStyleNameMapper::GetHTMLChrFormatUINameArray(),
                                 bIsSearchUsed, bSearchHidden, bOnlyHidden,
                                 nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR);
         }
@@ -2675,10 +2675,10 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
                 nSMask = SWSTYLEBIT_HTML;
         }
 
-        const size_t nArrLen = rDoc.GetTxtFmtColls()->size();
+        const size_t nArrLen = rDoc.GetTextFormatColls()->size();
         for( size_t i = 0; i < nArrLen; i++ )
         {
-            SwTxtFmtColl* pColl = (*rDoc.GetTxtFmtColls())[ i ];
+            SwTextFormatColl* pColl = (*rDoc.GetTextFormatColls())[ i ];
 
             const bool bUsed = bOrganizer || rDoc.IsUsed(*pColl);
             if ( ( !bSearchHidden && pColl->IsHidden( ) && !bUsed ) || pColl->IsDefault() )
@@ -2689,11 +2689,11 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
 
             if( !(bIsSearchUsed && bUsed ))
             {
-                const sal_uInt16 nId = pColl->GetPoolFmtId();
+                const sal_uInt16 nId = pColl->GetPoolFormatId();
                 switch ( (nSMask & ~SFXSTYLEBIT_USED) )
                 {
                 case SFXSTYLEBIT_USERDEF:
-                    if(!IsPoolUserFmt(nId)) continue;
+                    if(!IsPoolUserFormat(nId)) continue;
                     break;
                 case SWSTYLEBIT_TEXT:
                     if((nId & COLL_GET_RANGE_BITS) != COLL_TEXT_BITS) continue;
@@ -2711,7 +2711,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
                     if((nId  & COLL_GET_RANGE_BITS) != COLL_EXTRA_BITS) continue;
                     break;
                 case SWSTYLEBIT_HTML | SFXSTYLEBIT_USERDEF:
-                    if(IsPoolUserFmt(nId))
+                    if(IsPoolUserFormat(nId))
                         break;
                     // otherwise move on
                 case SWSTYLEBIT_HTML:
@@ -2773,7 +2773,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
         if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CONDCOLL )
         {
             if( !bIsSearchUsed ||
-                rDoc.getIDocumentStylePoolAccess().IsPoolTxtCollUsed( RES_POOLCOLL_TEXT ))
+                rDoc.getIDocumentStylePoolAccess().IsPoolTextCollUsed( RES_POOLCOLL_TEXT ))
                 aLst.Append( cPARA, SwStyleNameMapper::GetTextUINameArray()[
                         RES_POOLCOLL_TEXT - RES_POOLCOLL_TEXT_BEGIN ] );
         }
@@ -2809,7 +2809,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
                 OUString s;
                 while( *pPoolIds )
                 {
-                    if( !bIsSearchUsed || rDoc.getIDocumentStylePoolAccess().IsPoolTxtCollUsed( *pPoolIds ) )
+                    if( !bIsSearchUsed || rDoc.getIDocumentStylePoolAccess().IsPoolTextCollUsed( *pPoolIds ) )
                         aLst.Append( cPARA,
                             s = SwStyleNameMapper::GetUIName( *pPoolIds, s ));
                     ++pPoolIds;
@@ -2821,19 +2821,19 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
     if( nSearchFamily == SFX_STYLE_FAMILY_FRAME ||
         nSearchFamily == SFX_STYLE_FAMILY_ALL )
     {
-        const size_t nArrLen = rDoc.GetFrmFmts()->size();
+        const size_t nArrLen = rDoc.GetFrameFormats()->size();
         for( size_t i = 0; i < nArrLen; i++ )
         {
-            const SwFrmFmt* pFmt = (*rDoc.GetFrmFmts())[ i ];
+            const SwFrameFormat* pFormat = (*rDoc.GetFrameFormats())[ i ];
 
-            bool bUsed = bIsSearchUsed && ( bOrganizer || rDoc.IsUsed(*pFmt));
-            if( ( !bSearchHidden && pFmt->IsHidden( ) && !bUsed ) || pFmt->IsDefault() || pFmt->IsAuto() )
+            bool bUsed = bIsSearchUsed && ( bOrganizer || rDoc.IsUsed(*pFormat));
+            if( ( !bSearchHidden && pFormat->IsHidden( ) && !bUsed ) || pFormat->IsDefault() || pFormat->IsAuto() )
                 continue;
 
-            if ( nSrchMask == SFXSTYLEBIT_HIDDEN && !pFmt->IsHidden( ) )
+            if ( nSrchMask == SFXSTYLEBIT_HIDDEN && !pFormat->IsHidden( ) )
                 continue;
 
-            const sal_uInt16 nId = pFmt->GetPoolFmtId();
+            const sal_uInt16 nId = pFormat->GetPoolFormatId();
             if( !bUsed )
             {
                 if( (nSrchMask & ~SFXSTYLEBIT_USED) == SFXSTYLEBIT_USERDEF
@@ -2845,12 +2845,12 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
                 }
             }
 
-            aLst.Append( cFRAME, pFmt->GetName() );
+            aLst.Append( cFRAME, pFormat->GetName() );
         }
 
         // PoolFormate
         if ( bAll )
-            AppendStyleList(SwStyleNameMapper::GetFrmFmtUINameArray(),
+            AppendStyleList(SwStyleNameMapper::GetFrameFormatUINameArray(),
                                     bIsSearchUsed, bSearchHidden, bOnlyHidden, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, cFRAME);
     }
 
@@ -2861,7 +2861,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
         for(size_t i = 0; i < nCount; ++i)
         {
             const SwPageDesc& rDesc = rDoc.GetPageDesc(i);
-            const sal_uInt16 nId = rDesc.GetPoolFmtId();
+            const sal_uInt16 nId = rDesc.GetPoolFormatId();
             bool bUsed = bIsSearchUsed && ( bOrganizer || rDoc.IsUsed(rDesc));
             if( !bUsed )
             {
@@ -2886,10 +2886,10 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
     if( nSearchFamily == SFX_STYLE_FAMILY_PSEUDO ||
         nSearchFamily == SFX_STYLE_FAMILY_ALL )
     {
-        const SwNumRuleTbl& rNumTbl = rDoc.GetNumRuleTbl();
-        for(sal_uInt16 i = 0; i < rNumTbl.size(); ++i)
+        const SwNumRuleTable& rNumTable = rDoc.GetNumRuleTable();
+        for(sal_uInt16 i = 0; i < rNumTable.size(); ++i)
         {
-            const SwNumRule& rRule = *rNumTbl[ i ];
+            const SwNumRule& rRule = *rNumTable[ i ];
             if( !rRule.IsAutoRule() )
             {
                 if ( nSrchMask == SFXSTYLEBIT_HIDDEN && !rRule.IsHidden( ) )
@@ -2900,7 +2900,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
                 {
                     if( ( !bSearchHidden && rRule.IsHidden() ) ||
                            ( (nSrchMask & ~SFXSTYLEBIT_USED) == SFXSTYLEBIT_USERDEF
-                        ? !(rRule.GetPoolFmtId() & USER_FMT)
+                        ? !(rRule.GetPoolFormatId() & USER_FMT)
                         // searched for used and found none
                         : bIsSearchUsed ) )
                         continue;
@@ -2976,23 +2976,23 @@ void SwStyleSheetIterator::AppendStyleList(const ::std::vector<OUString>& rList,
         {
             case nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL:
                 {
-                    bUsed = rDoc.getIDocumentStylePoolAccess().IsPoolTxtCollUsed( nId );
-                    SwFmt* pFmt = rDoc.FindTxtFmtCollByName( rList[i] );
-                    bHidden = pFmt && pFmt->IsHidden( );
+                    bUsed = rDoc.getIDocumentStylePoolAccess().IsPoolTextCollUsed( nId );
+                    SwFormat* pFormat = rDoc.FindTextFormatCollByName( rList[i] );
+                    bHidden = pFormat && pFormat->IsHidden( );
                 }
                 break;
             case nsSwGetPoolIdFromName::GET_POOLID_CHRFMT:
                 {
-                    bUsed = rDoc.getIDocumentStylePoolAccess().IsPoolFmtUsed( nId );
-                    SwFmt* pFmt = rDoc.FindCharFmtByName( rList[i] );
-                    bHidden = pFmt && pFmt->IsHidden( );
+                    bUsed = rDoc.getIDocumentStylePoolAccess().IsPoolFormatUsed( nId );
+                    SwFormat* pFormat = rDoc.FindCharFormatByName( rList[i] );
+                    bHidden = pFormat && pFormat->IsHidden( );
                 }
                 break;
             case nsSwGetPoolIdFromName::GET_POOLID_FRMFMT:
                 {
-                    bUsed = rDoc.getIDocumentStylePoolAccess().IsPoolFmtUsed( nId );
-                    SwFmt* pFmt = rDoc.FindFrmFmtByName( rList[i] );
-                    bHidden = pFmt && pFmt->IsHidden( );
+                    bUsed = rDoc.getIDocumentStylePoolAccess().IsPoolFormatUsed( nId );
+                    SwFormat* pFormat = rDoc.FindFrameFormatByName( rList[i] );
+                    bHidden = pFormat && pFormat->IsHidden( );
                 }
                 break;
             case nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC:
@@ -3010,7 +3010,7 @@ void SwStyleSheetIterator::AppendStyleList(const ::std::vector<OUString>& rList,
                 }
                 break;
             default:
-                OSL_ENSURE( false, "unknown PoolFmt-Id" );
+                OSL_ENSURE( false, "unknown PoolFormat-Id" );
         }
 
         bool bMatchHidden = ( bTestHidden && ( bHidden || !bOnlyHidden ) ) || ( !bTestHidden && ( !bHidden || bUsed ) );
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index a0763d3894a8..1dc1d29285c3 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -527,19 +527,19 @@ sal_uInt16 SwModule::GetRedlineMarkPos()
     return pModuleConfig->GetMarkAlignMode();
 }
 
-bool SwModule::IsInsTblFormatNum(bool bHTML) const
+bool SwModule::IsInsTableFormatNum(bool bHTML) const
 {
-    return pModuleConfig->IsInsTblFormatNum(bHTML);
+    return pModuleConfig->IsInsTableFormatNum(bHTML);
 }
 
-bool SwModule::IsInsTblChangeNumFormat(bool bHTML) const
+bool SwModule::IsInsTableChangeNumFormat(bool bHTML) const
 {
-    return pModuleConfig->IsInsTblChangeNumFormat(bHTML);
+    return pModuleConfig->IsInsTableChangeNumFormat(bHTML);
 }
 
-bool SwModule::IsInsTblAlignNum(bool bHTML) const
+bool SwModule::IsInsTableAlignNum(bool bHTML) const
 {
-    return pModuleConfig->IsInsTblAlignNum(bHTML);
+    return pModuleConfig->IsInsTableAlignNum(bHTML);
 }
 
 const Color &SwModule::GetRedlineMarkColor()
@@ -584,18 +584,18 @@ sal_uInt16 SwModule::GetLinkUpdMode( bool ) const
     return (sal_uInt16)pUsrPref->GetUpdateLinkMode();
 }
 
-SwFldUpdateFlags SwModule::GetFldUpdateFlags( bool ) const
+SwFieldUpdateFlags SwModule::GetFieldUpdateFlags( bool ) const
 {
     if(!pUsrPref)
         GetUsrPref(false);
-    return pUsrPref->GetFldUpdateFlags();
+    return pUsrPref->GetFieldUpdateFlags();
 }
 
-void SwModule::ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags)
+void SwModule::ApplyFieldUpdateFlags(SwFieldUpdateFlags eFieldFlags)
 {
     if(!pUsrPref)
         GetUsrPref(false);
-    pUsrPref->SetFldUpdateFlags(eFldFlags);
+    pUsrPref->SetFieldUpdateFlags(eFieldFlags);
 }
 
 void SwModule::ApplyLinkMode(sal_Int32 nNewLinkMode)
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index a9af46e8696e..f945531e79c0 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -358,8 +358,8 @@ void SwDLL::RegisterControls()
     SvxSearchDialogWrapper::RegisterChildWindow( false, pMod );
     SvxHlinkDlgWrapper::RegisterChildWindow( false, pMod );
     SvxFontWorkChildWindow::RegisterChildWindow( false, pMod );
-    SwFldDlgWrapper::RegisterChildWindow( false, pMod );
-    SwFldDataOnlyDlgWrapper::RegisterChildWindow( false, pMod );
+    SwFieldDlgWrapper::RegisterChildWindow( false, pMod );
+    SwFieldDataOnlyDlgWrapper::RegisterChildWindow( false, pMod );
     SvxContourDlgChildWindow::RegisterChildWindow( false, pMod );
     SwNavigationChild::RegisterChildWindowContext( pMod );
     SwInputChild::RegisterChildWindow( false, pMod, SfxChildWindowFlags::FORCEDOCK );
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index df5388cd4966..4fb902dd6503 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -124,18 +124,18 @@ public:
         {
             return uno::Any();
         }
-        SwNumFmt const* pNumFmt(0);
+        SwNumFormat const* pNumFormat(0);
         OUString const* pCharStyleName(0);
-        pRules->GetNumFmt(nIndex, pNumFmt, pCharStyleName);
-        if (!pNumFmt)
+        pRules->GetNumFormat(nIndex, pNumFormat, pCharStyleName);
+        if (!pNumFormat)
         {   // the dialog only fills in those levels that are non-default
             return uno::Any(); // the export will ignore this level, yay
         }
         assert(pCharStyleName);
         OUString dummy; // pass in empty HeadingStyleName - can't import anyway
         uno::Sequence<beans::PropertyValue> const ret(
-            SwXNumberingRules::GetPropertiesForNumFmt(
-                *pNumFmt, *pCharStyleName, &dummy));
+            SwXNumberingRules::GetPropertiesForNumFormat(
+                *pNumFormat, *pCharStyleName, &dummy));
         return uno::makeAny(ret);
     }
 
@@ -154,15 +154,15 @@ public:
                     static_cast< ::cppu::OWeakObject*>(this), 1);
 
         SolarMutexGuard g;
-        SwNumFmt aNumberFormat;
+        SwNumFormat aNumberFormat;
         OUString charStyleName;
-        SwXNumberingRules::SetPropertiesToNumFmt(
+        SwXNumberingRules::SetPropertiesToNumFormat(
             aNumberFormat,
             charStyleName,
             0, 0, 0, 0, 0,
             props);
         SwNumRulesWithName *const pRules(GetOrCreateRules());
-        pRules->SetNumFmt(nIndex, aNumberFormat, charStyleName);
+        pRules->SetNumFormat(nIndex, aNumberFormat, charStyleName);
     }
 };
 
@@ -438,9 +438,9 @@ void ExportStoredChapterNumberingRules(SwChapterNumRules & rRules,
         {
             for (size_t j = 0; j < MAXLEVEL; ++j)
             {
-                SwNumFmt const* pDummy(0);
+                SwNumFormat const* pDummy(0);
                 OUString const* pCharStyleName(0);
-                pRule->GetNumFmt(j, pDummy, pCharStyleName);
+                pRule->GetNumFormat(j, pDummy, pCharStyleName);
                 if (pCharStyleName && !pCharStyleName->isEmpty())
                 {
                     charStyles.insert(*pCharStyleName);
diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx
index 44eddb23a983..c0cd60f49886 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -43,7 +43,7 @@ SwDocDisplayItem::SwDocDisplayItem( sal_uInt16 _nWhich ) :
     bSpace              =
     bNonbreakingSpace   =
     bSoftHyphen         =
-    bFldHiddenText      =
+    bFieldHiddenText      =
     bCharHiddenText     =
     bManualBreak        =
     bShowHiddenPara     = false;
@@ -66,7 +66,7 @@ SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt, sal_uInt16 _nWhich
     bNonbreakingSpace   = rVOpt.IsHardBlank();
     bSoftHyphen         = rVOpt.IsSoftHyph();
     bCharHiddenText     = rVOpt.IsShowHiddenChar(true);
-    bFldHiddenText      = rVOpt.IsShowHiddenField();
+    bFieldHiddenText      = rVOpt.IsShowHiddenField();
     bManualBreak        = rVOpt.IsLineBreak(true);
     bShowHiddenPara     = rVOpt.IsShowHiddenPara();
 }
@@ -88,7 +88,7 @@ bool SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const
               bNonbreakingSpace     == rItem.bNonbreakingSpace   &&
               bSoftHyphen           == rItem.bSoftHyphen         &&
               bCharHiddenText       == rItem.bCharHiddenText         &&
-              bFldHiddenText        == rItem.bFldHiddenText         &&
+              bFieldHiddenText        == rItem.bFieldHiddenText         &&
               bManualBreak          == rItem.bManualBreak        &&
               bShowHiddenPara       == rItem.bShowHiddenPara );
 }
@@ -101,7 +101,7 @@ void  SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem)
     bNonbreakingSpace   = rDocDisplayItem.bNonbreakingSpace     ;
     bSoftHyphen         = rDocDisplayItem.bSoftHyphen           ;
     bCharHiddenText     = rDocDisplayItem.bCharHiddenText           ;
-    bFldHiddenText      = rDocDisplayItem.bFldHiddenText           ;
+    bFieldHiddenText      = rDocDisplayItem.bFieldHiddenText           ;
     bManualBreak        = rDocDisplayItem.bManualBreak          ;
     bShowHiddenPara     = rDocDisplayItem.bShowHiddenPara       ;
 }
@@ -114,7 +114,7 @@ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const
     rVOpt.SetHardBlank  (bNonbreakingSpace  );
     rVOpt.SetSoftHyph   (bSoftHyphen        );
     rVOpt.SetShowHiddenChar(bCharHiddenText );
-    rVOpt.SetShowHiddenField(bFldHiddenText        );
+    rVOpt.SetShowHiddenField(bFieldHiddenText        );
     rVOpt.SetLineBreak  (bManualBreak       );
     rVOpt.SetShowHiddenPara(bShowHiddenPara );
 }
@@ -157,7 +157,7 @@ SwElemItem::SwElemItem(const SwViewOption& rVOpt, sal_uInt16 _nWhich) :
     bTable              = rVOpt.IsTable();
     bGraphic            = rVOpt.IsGraphic();
     bDrawing            = rVOpt.IsDraw() && rVOpt.IsControl();
-    bFieldName          = rVOpt.IsFldName();
+    bFieldName          = rVOpt.IsFieldName();
     bNotes              = rVOpt.IsPostIts();
 
 }
@@ -219,7 +219,7 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
     rVOpt.SetGraphic    (bGraphic           );
     rVOpt.SetDraw       (bDrawing           );
     rVOpt.SetControl    (bDrawing           );
-    rVOpt.SetFldName    (bFieldName         );
+    rVOpt.SetFieldName    (bFieldName         );
     rVOpt.SetPostIts    (bNotes             );
 }
 
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index e695c3247530..fcefb8ff4a76 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -591,7 +591,7 @@ SwInsertConfig::SwInsertConfig(bool bWeb) :
     pOLEMiscOpt(0),
     bInsWithCaption( false ),
     bCaptionOrderNumberingFirst( false ),
-    aInsTblOpts(0,0),
+    aInsTableOpts(0,0),
     bIsWeb(bWeb)
 {
     aGlobalNames[GLOB_NAME_CALC   ] = SvGlobalName(SO3_SC_CLASSID);
@@ -660,16 +660,16 @@ void SwInsertConfig::ImplCommit()
         switch(nProp)
         {
             case INS_PROP_TABLE_HEADER:
-                pValues[nProp] <<= 0 != (aInsTblOpts.mnInsMode & tabopts::HEADLINE);
+                pValues[nProp] <<= 0 != (aInsTableOpts.mnInsMode & tabopts::HEADLINE);
             break;//"Table/Header",
             case INS_PROP_TABLE_REPEATHEADER:
-                pValues[nProp] <<= aInsTblOpts.mnRowsToRepeat > 0;
+                pValues[nProp] <<= aInsTableOpts.mnRowsToRepeat > 0;
             break;//"Table/RepeatHeader",
             case INS_PROP_TABLE_BORDER:
-                pValues[nProp] <<= 0 != (aInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER );
+                pValues[nProp] <<= 0 != (aInsTableOpts.mnInsMode & tabopts::DEFAULT_BORDER );
             break;//"Table/Border",
             case INS_PROP_TABLE_SPLIT:
-                pValues[nProp] <<= 0 != (aInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT);
+                pValues[nProp] <<= 0 != (aInsTableOpts.mnInsMode & tabopts::SPLIT_LAYOUT);
             break;//"Table/Split",
             case INS_PROP_CAP_AUTOMATIC:
                 pValues[nProp] <<= bInsWithCaption;
@@ -894,7 +894,7 @@ void SwInsertConfig::Load()
     else if (!bIsWeb)
         return;
 
-    sal_uInt16 nInsTblFlags = 0;
+    sal_uInt16 nInsTableFlags = 0;
     for (sal_Int32 nProp = 0; nProp < aNames.getLength(); ++nProp)
     {
         if (pValues[nProp].hasValue())
@@ -905,25 +905,25 @@ void SwInsertConfig::Load()
                 case INS_PROP_TABLE_HEADER:
                 {
                     if(bBool)
-                        nInsTblFlags|= tabopts::HEADLINE;
+                        nInsTableFlags|= tabopts::HEADLINE;
                 }
                 break;//"Table/Header",
                 case INS_PROP_TABLE_REPEATHEADER:
                 {
-                    aInsTblOpts.mnRowsToRepeat = bBool? 1 : 0;
+                    aInsTableOpts.mnRowsToRepeat = bBool? 1 : 0;
 
                 }
                 break;//"Table/RepeatHeader",
                 case INS_PROP_TABLE_BORDER:
                 {
                     if(bBool)
-                        nInsTblFlags|= tabopts::DEFAULT_BORDER;
+                        nInsTableFlags|= tabopts::DEFAULT_BORDER;
                 }
                 break;//"Table/Border",
                 case INS_PROP_TABLE_SPLIT:
                 {
                     if(bBool)
-                        nInsTblFlags|= tabopts::SPLIT_LAYOUT;
+                        nInsTableFlags|= tabopts::SPLIT_LAYOUT;
                 }
                 break;//"Table/Split",
                 case INS_PROP_CAP_AUTOMATIC:
@@ -1091,7 +1091,7 @@ void SwInsertConfig::Load()
         }
 
     }
-    aInsTblOpts.mnInsMode = nInsTblFlags;
+    aInsTableOpts.mnInsMode = nInsTableFlags;
 }
 
 const Sequence<OUString>& SwTableConfig::GetPropertyNames()
@@ -1138,14 +1138,14 @@ void SwTableConfig::ImplCommit()
     {
         switch(nProp)
         {
-            case 0 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTblHMove); break;   //"Shift/Row",
-            case 1 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTblVMove); break;     //"Shift/Column",
-            case 2 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTblHInsert); break;   //"Insert/Row",
-            case 3 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTblVInsert); break;   //"Insert/Column",
-            case 4 : pValues[nProp] <<= (sal_Int32)eTblChgMode; break;   //"Change/Effect",
-            case 5 : pValues[nProp] <<= bInsTblFormatNum; break;  //"Input/NumberRecognition",
-            case 6 : pValues[nProp] <<= bInsTblChangeNumFormat; break;  //"Input/NumberFormatRecognition",
-            case 7 : pValues[nProp] <<= bInsTblAlignNum; break;  //"Input/Alignment"
+            case 0 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableHMove); break;   //"Shift/Row",
+            case 1 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableVMove); break;     //"Shift/Column",
+            case 2 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableHInsert); break;   //"Insert/Row",
+            case 3 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableVInsert); break;   //"Insert/Column",
+            case 4 : pValues[nProp] <<= (sal_Int32)eTableChgMode; break;   //"Change/Effect",
+            case 5 : pValues[nProp] <<= bInsTableFormatNum; break;  //"Input/NumberRecognition",
+            case 6 : pValues[nProp] <<= bInsTableChangeNumFormat; break;  //"Input/NumberFormatRecognition",
+            case 7 : pValues[nProp] <<= bInsTableAlignNum; break;  //"Input/Alignment"
         }
     }
     PutProperties(aNames, aValues);
@@ -1164,14 +1164,14 @@ void SwTableConfig::Load()
             sal_Int32 nTemp = 0;
             switch (nProp)
             {
-                case 0 : pValues[nProp] >>= nTemp; nTblHMove = (sal_uInt16)convertMm100ToTwip(nTemp); break;  //"Shift/Row",
-                case 1 : pValues[nProp] >>= nTemp; nTblVMove = (sal_uInt16)convertMm100ToTwip(nTemp); break;     //"Shift/Column",
-                case 2 : pValues[nProp] >>= nTemp; nTblHInsert = (sal_uInt16)convertMm100ToTwip(nTemp); break;   //"Insert/Row",
-                case 3 : pValues[nProp] >>= nTemp; nTblVInsert = (sal_uInt16)convertMm100ToTwip(nTemp); break;   //"Insert/Column",
-                case 4 : pValues[nProp] >>= nTemp; eTblChgMode = (TblChgMode)nTemp; break;   //"Change/Effect",
-                case 5 : bInsTblFormatNum = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;  //"Input/NumberRecognition",
-                case 6 : bInsTblChangeNumFormat = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;  //"Input/NumberFormatRecognition",
-                case 7 : bInsTblAlignNum = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;  //"Input/Alignment"
+                case 0 : pValues[nProp] >>= nTemp; nTableHMove = (sal_uInt16)convertMm100ToTwip(nTemp); break;  //"Shift/Row",
+                case 1 : pValues[nProp] >>= nTemp; nTableVMove = (sal_uInt16)convertMm100ToTwip(nTemp); break;     //"Shift/Column",
+                case 2 : pValues[nProp] >>= nTemp; nTableHInsert = (sal_uInt16)convertMm100ToTwip(nTemp); break;   //"Insert/Row",
+                case 3 : pValues[nProp] >>= nTemp; nTableVInsert = (sal_uInt16)convertMm100ToTwip(nTemp); break;   //"Insert/Column",
+                case 4 : pValues[nProp] >>= nTemp; eTableChgMode = (TableChgMode)nTemp; break;   //"Change/Effect",
+                case 5 : bInsTableFormatNum = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;  //"Input/NumberRecognition",
+                case 6 : bInsTableChangeNumFormat = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;  //"Input/NumberFormatRecognition",
+                case 7 : bInsTableAlignNum = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;  //"Input/Alignment"
             }
         }
     }
@@ -1187,7 +1187,7 @@ SwMiscConfig::SwMiscConfig() :
     bSinglePrintJob(false),
     bIsNameFromColumn(true),
     bAskForMailMergeInPrint(true),
-    nMailingFormats(MailTxtFormats::NONE)
+    nMailingFormats(MailTextFormats::NONE)
 {
     Load();
 }
@@ -1278,7 +1278,7 @@ void SwMiscConfig::Load()
                 case 3 : bGrfToGalleryAsLnk = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;
                 case 4 : bNumAlignSize = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;
                 case 5 : bSinglePrintJob = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;
-                case 6 : nMailingFormats = static_cast<MailTxtFormats>(*static_cast<sal_uInt8 const *>(pValues[nProp].getValue())); break;
+                case 6 : nMailingFormats = static_cast<MailTextFormats>(*static_cast<sal_uInt8 const *>(pValues[nProp].getValue())); break;
                 case 7 : pValues[nProp] >>= sTmp; sNameFromColumn = sTmp; break;
                 case 8 : pValues[nProp] >>= sTmp; sMailingPath = sTmp;  break;
                 case 9 : pValues[nProp] >>= sTmp; sMailName = sTmp;     break;
diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx
index 1f00241779c7..7ac29152690f 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -115,29 +115,29 @@ SwNumRulesWithName::SwNumRulesWithName( const SwNumRule &rCopy,
 {
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
-        const SwNumFmt* pFmt = rCopy.GetNumFmt( n );
-        if( pFmt )
-            aFmts[ n ] = new _SwNumFmtGlobal( *pFmt );
+        const SwNumFormat* pFormat = rCopy.GetNumFormat( n );
+        if( pFormat )
+            aFormats[ n ] = new _SwNumFormatGlobal( *pFormat );
         else
-            aFmts[ n ] = 0;
+            aFormats[ n ] = 0;
     }
 }
 
 SwNumRulesWithName::SwNumRulesWithName()
 {
-    memset(aFmts, 0, sizeof(aFmts));
+    memset(aFormats, 0, sizeof(aFormats));
 }
 
 SwNumRulesWithName::SwNumRulesWithName( const SwNumRulesWithName& rCopy )
 {
-    memset( aFmts, 0, sizeof( aFmts ));
+    memset( aFormats, 0, sizeof( aFormats ));
     *this = rCopy;
 }
 
 SwNumRulesWithName::~SwNumRulesWithName()
 {
     for( int n = 0; n < MAXLEVEL; ++n )
-        delete aFmts[ n ];
+        delete aFormats[ n ];
 }
 
 const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName &rCopy)
@@ -147,13 +147,13 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName
         maName = rCopy.maName;
         for( int n = 0; n < MAXLEVEL; ++n )
         {
-            delete aFmts[ n ];
+            delete aFormats[ n ];
 
-            _SwNumFmtGlobal* pFmt = rCopy.aFmts[ n ];
-            if( pFmt )
-                aFmts[ n ] = new _SwNumFmtGlobal( *pFmt );
+            _SwNumFormatGlobal* pFormat = rCopy.aFormats[ n ];
+            if( pFormat )
+                aFormats[ n ] = new _SwNumFormatGlobal( *pFormat );
             else
-                aFmts[ n ] = 0;
+                aFormats[ n ] = 0;
         }
     }
     return *this;
@@ -166,46 +166,46 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const
     rChg.SetAutoRule( false );
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
-        _SwNumFmtGlobal* pFmt = aFmts[ n ];
-        if( 0 != pFmt)
+        _SwNumFormatGlobal* pFormat = aFormats[ n ];
+        if( 0 != pFormat)
         {
-            SwNumFmt aNew;
-            pFmt->ChgNumFmt( rSh, aNew );
+            SwNumFormat aNew;
+            pFormat->ChgNumFormat( rSh, aNew );
             rChg.Set( n, aNew );
         }
     }
 }
 
-void SwNumRulesWithName::GetNumFmt(
-    size_t const nIndex, SwNumFmt const*& rpNumFmt, OUString const*& rpName) const
+void SwNumRulesWithName::GetNumFormat(
+    size_t const nIndex, SwNumFormat const*& rpNumFormat, OUString const*& rpName) const
 {
-    rpNumFmt = (aFmts[nIndex]) ? &aFmts[nIndex]->aFmt : 0;
-    rpName = (aFmts[nIndex]) ? &aFmts[nIndex]->sCharFmtName : 0;
+    rpNumFormat = (aFormats[nIndex]) ? &aFormats[nIndex]->aFormat : 0;
+    rpName = (aFormats[nIndex]) ? &aFormats[nIndex]->sCharFormatName : 0;
 }
 
-void SwNumRulesWithName::SetNumFmt(
-        size_t const nIndex, SwNumFmt const& rNumFmt, OUString const& rName)
+void SwNumRulesWithName::SetNumFormat(
+        size_t const nIndex, SwNumFormat const& rNumFormat, OUString const& rName)
 {
-    delete aFmts[nIndex];
-    aFmts[nIndex] = new _SwNumFmtGlobal(rNumFmt);
-    aFmts[nIndex]->sCharFmtName = rName;
-    aFmts[nIndex]->nCharPoolId = USHRT_MAX;
-    aFmts[nIndex]->aItems.clear();
+    delete aFormats[nIndex];
+    aFormats[nIndex] = new _SwNumFormatGlobal(rNumFormat);
+    aFormats[nIndex]->sCharFormatName = rName;
+    aFormats[nIndex]->nCharPoolId = USHRT_MAX;
+    aFormats[nIndex]->aItems.clear();
 }
 
-SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const SwNumFmt& rFmt )
-    : aFmt( rFmt ), nCharPoolId( USHRT_MAX )
+SwNumRulesWithName::_SwNumFormatGlobal::_SwNumFormatGlobal( const SwNumFormat& rFormat )
+    : aFormat( rFormat ), nCharPoolId( USHRT_MAX )
 {
     // relative gaps?????
 
-    SwCharFmt* pFmt = rFmt.GetCharFmt();
-    if( pFmt )
+    SwCharFormat* pFormat = rFormat.GetCharFormat();
+    if( pFormat )
     {
-        sCharFmtName = pFmt->GetName();
-        nCharPoolId = pFmt->GetPoolFmtId();
-        if( pFmt->GetAttrSet().Count() )
+        sCharFormatName = pFormat->GetName();
+        nCharPoolId = pFormat->GetPoolFormatId();
+        if( pFormat->GetAttrSet().Count() )
         {
-            SfxItemIter aIter( pFmt->GetAttrSet() );
+            SfxItemIter aIter( pFormat->GetAttrSet() );
             const SfxPoolItem *pCurr = aIter.GetCurItem();
             while( true )
             {
@@ -216,60 +216,60 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const SwNumFmt& rFmt )
             }
         }
 
-        aFmt.SetCharFmt( 0 );
+        aFormat.SetCharFormat( 0 );
     }
 }
 
-SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const _SwNumFmtGlobal& rFmt )
+SwNumRulesWithName::_SwNumFormatGlobal::_SwNumFormatGlobal( const _SwNumFormatGlobal& rFormat )
     :
-    aFmt( rFmt.aFmt ),
-    sCharFmtName( rFmt.sCharFmtName ),
-    nCharPoolId( rFmt.nCharPoolId )
+    aFormat( rFormat.aFormat ),
+    sCharFormatName( rFormat.sCharFormatName ),
+    nCharPoolId( rFormat.nCharPoolId )
 {
-    for( sal_uInt16 n = rFmt.aItems.size(); n; )
-        aItems.push_back( rFmt.aItems[ --n ].Clone() );
+    for( sal_uInt16 n = rFormat.aItems.size(); n; )
+        aItems.push_back( rFormat.aItems[ --n ].Clone() );
 }
 
-SwNumRulesWithName::_SwNumFmtGlobal::~_SwNumFmtGlobal()
+SwNumRulesWithName::_SwNumFormatGlobal::~_SwNumFormatGlobal()
 {
 }
 
-void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh,
-                            SwNumFmt& rNew ) const
+void SwNumRulesWithName::_SwNumFormatGlobal::ChgNumFormat( SwWrtShell& rSh,
+                            SwNumFormat& rNew ) const
 {
-    SwCharFmt* pFmt = 0;
-    if( !sCharFmtName.isEmpty() )
+    SwCharFormat* pFormat = 0;
+    if( !sCharFormatName.isEmpty() )
     {
         // at first, look for the name
-        sal_uInt16 nArrLen = rSh.GetCharFmtCount();
+        sal_uInt16 nArrLen = rSh.GetCharFormatCount();
         for( sal_uInt16 i = 1; i < nArrLen; ++i )
         {
-            pFmt = &rSh.GetCharFmt( i );
-            if (pFmt->GetName()==sCharFmtName)
+            pFormat = &rSh.GetCharFormat( i );
+            if (pFormat->GetName()==sCharFormatName)
                 // exists, so leave attributes as they are!
                 break;
-            pFmt = 0;
+            pFormat = 0;
         }
 
-        if( !pFmt )
+        if( !pFormat )
         {
-            if( IsPoolUserFmt( nCharPoolId ) )
+            if( IsPoolUserFormat( nCharPoolId ) )
             {
-                pFmt = rSh.MakeCharFmt( sCharFmtName );
-                pFmt->SetAuto( false );
+                pFormat = rSh.MakeCharFormat( sCharFormatName );
+                pFormat->SetAuto( false );
             }
             else
-                pFmt = rSh.GetCharFmtFromPool( nCharPoolId );
+                pFormat = rSh.GetCharFormatFromPool( nCharPoolId );
 
-            if( !pFmt->HasWriterListeners() )       // set attributes
+            if( !pFormat->HasWriterListeners() )       // set attributes
                 for( sal_uInt16 n = aItems.size(); n; )
-                    pFmt->SetFmtAttr( aItems[ --n ] );
+                    pFormat->SetFormatAttr( aItems[ --n ] );
         }
     }
-    const_cast<SwNumFmt&>(aFmt).SetCharFmt( pFmt );
-    rNew = aFmt;
-    if( pFmt )
-        const_cast<SwNumFmt&>(aFmt).SetCharFmt( 0 );
+    const_cast<SwNumFormat&>(aFormat).SetCharFormat( pFormat );
+    rNew = aFormat;
+    if( pFormat )
+        const_cast<SwNumFormat&>(aFormat).SetCharFormat( 0 );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index 4acbe987b471..7aec700cd7be 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -43,7 +43,7 @@ void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy)
 }
 
 SwMasterUsrPref::SwMasterUsrPref(bool bWeb) :
-    eFldUpdateFlags(AUTOUPD_OFF),
+    eFieldUpdateFlags(AUTOUPD_OFF),
     nLinkUpdateMode(0),
     bIsHScrollMetricSet(false),
     bIsVScrollMetricSet(false),
@@ -142,7 +142,7 @@ void SwContentViewConfig::ImplCommit()
             case  0: bVal = rParent.IsGraphic();    break;// "Display/GraphicObject",
             case  1: bVal = rParent.IsTable();  break;// "Display/Table",
             case  2: bVal = rParent.IsDraw();       break;// "Display/DrawingControl",
-            case  3: bVal = rParent.IsFldName();    break;// "Display/FieldCode",
+            case  3: bVal = rParent.IsFieldName();    break;// "Display/FieldCode",
             case  4: bVal = rParent.IsPostIts();    break;// "Display/Note",
             case  5: bVal = rParent.IsShowContentTips(); break; // "Display/ShowContentTips"
             case  6: bVal = rParent.IsViewMetaChars(); break; //"NonprintingCharacter/MetaCharacters"
@@ -183,7 +183,7 @@ void SwContentViewConfig::Load()
                     case  0: rParent.SetGraphic(bSet);  break;// "Display/GraphicObject",
                     case  1: rParent.SetTable(bSet);    break;// "Display/Table",
                     case  2: rParent.SetDraw(bSet);     break;// "Display/DrawingControl",
-                    case  3: rParent.SetFldName(bSet);  break;// "Display/FieldCode",
+                    case  3: rParent.SetFieldName(bSet);  break;// "Display/FieldCode",
                     case  4: rParent.SetPostIts(bSet);  break;// "Display/Note",
                     case  5: rParent.SetShowContentTips(bSet);  break;// "Display/ShowContentTips",
                     case  6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters"
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 1418abee8cb2..190a6e3b5d72 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -167,7 +167,7 @@ SwViewOption::SwViewOption() :
     bShowPlaceHolderFields( true ),
     nZoom( 100 ),
     eZoom( SvxZoomType::PERCENT ),
-    nTblDest(TBL_DEST_CELL)
+    nTableDest(TBL_DEST_CELL)
 {
     // Initialisation is a little simpler now
     // all Bits to 0
@@ -223,7 +223,7 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt)
     nPagePrevCol    = rVOpt.nPagePrevCol;
     bIsPagePreview  = rVOpt.bIsPagePreview;
     eZoom           = rVOpt.eZoom       ;
-    nTblDest        = rVOpt.nTblDest    ;
+    nTableDest        = rVOpt.nTableDest    ;
     nUIOptions      = rVOpt.nUIOptions  ;
     nCoreOptions    = rVOpt.nCoreOptions  ;
     nCore2Options   = rVOpt.nCore2Options  ;
@@ -263,7 +263,7 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt )
     nPagePrevCol    = rVOpt.nPagePrevCol;
     bIsPagePreview  = rVOpt.bIsPagePreview;
     eZoom           = rVOpt.eZoom       ;
-    nTblDest        = rVOpt.nTblDest    ;
+    nTableDest        = rVOpt.nTableDest    ;
     nUIOptions      = rVOpt.nUIOptions  ;
     nCoreOptions    = rVOpt.nCoreOptions;
     nCore2Options   = rVOpt.nCore2Options;
@@ -305,7 +305,7 @@ void SwViewOption::Init( vcl::Window *pWin )
 
 bool SwViewOption::IsAutoCompleteWords()
 {
-    const SvxSwAutoFmtFlags& rFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
+    const SvxSwAutoFormatFlags& rFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
     return rFlags.bAutoCmpltCollectWords;
 }
 
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 9b8ae4231d45..a3ab6d9716c3 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -466,7 +466,7 @@ bool SwDBManager::Merge(SwWrtShell* pSh)
 {
     pSh->StartAllAction();
 
-    pSh->SwViewShell::UpdateFlds(true);
+    pSh->SwViewShell::UpdateFields(true);
     pSh->SetModified();
 
     pSh->EndAllAction();
@@ -545,8 +545,8 @@ void SwDBManager::ImportDBEntry(SwWrtShell* pSh)
         uno::Reference< XColumnsSupplier > xColsSupp( pImpl->pMergeData->xResultSet, UNO_QUERY );
         uno::Reference<XNameAccess> xCols = xColsSupp->getColumns();
         OUString sFormatStr;
-        sal_uInt16 nFmtLen = sFormatStr.getLength();
-        if( nFmtLen )
+        sal_uInt16 nFormatLen = sFormatStr.getLength();
+        if( nFormatLen )
         {
             const char cSpace = ' ';
             const char cTab = '\t';
@@ -628,12 +628,12 @@ bool SwDBManager::GetTableNames(ListBox* pListBox, const OUString& rDBName)
         uno::Reference<XTablesSupplier> xTSupplier = uno::Reference<XTablesSupplier>(xConnection, UNO_QUERY);
         if(xTSupplier.is())
         {
-            uno::Reference<XNameAccess> xTbls = xTSupplier->getTables();
-            Sequence<OUString> aTbls = xTbls->getElementNames();
-            const OUString* pTbls = aTbls.getConstArray();
-            for(long i = 0; i < aTbls.getLength(); i++)
+            uno::Reference<XNameAccess> xTables = xTSupplier->getTables();
+            Sequence<OUString> aTables = xTables->getElementNames();
+            const OUString* pTables = aTables.getConstArray();
+            for(long i = 0; i < aTables.getLength(); i++)
             {
-                sal_uInt16 nEntry = pListBox->InsertEntry(pTbls[i]);
+                sal_uInt16 nEntry = pListBox->InsertEntry(pTables[i]);
                 pListBox->SetEntryData(nEntry, (void*)0);
             }
         }
@@ -781,10 +781,10 @@ static void lcl_CopyFollowPageDesc(
 static void lcl_RemoveSectionLinks( SwWrtShell& rWorkShell )
 {
     //reset all links of the sections of synchronized labels
-    size_t nSections = rWorkShell.GetSectionFmtCount();
+    size_t nSections = rWorkShell.GetSectionFormatCount();
     for (size_t nSection = 0; nSection < nSections; ++nSection)
     {
-        SwSectionData aSectionData( *rWorkShell.GetSectionFmt( nSection ).GetSection() );
+        SwSectionData aSectionData( *rWorkShell.GetSectionFormat( nSection ).GetSection() );
         if( aSectionData.GetType() == FILE_LINK_SECTION )
         {
             aSectionData.SetType( CONTENT_SECTION );
@@ -820,7 +820,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
                                  vcl::Window* pParent)
 {
     //check if the doc is synchronized and contains at least one linked section
-    bool bSynchronizedDoc = pSourceShell->IsLabelDoc() && pSourceShell->GetSectionFmtCount() > 1;
+    bool bSynchronizedDoc = pSourceShell->IsLabelDoc() && pSourceShell->GetSectionFormatCount() > 1;
     bool bNoError = true;
     const bool bEMail = rMergeDescriptor.nMergeType == DBMGR_MERGE_EMAIL;
     const bool bMergeShell = rMergeDescriptor.nMergeType == DBMGR_MERGE_SHELL;
@@ -878,15 +878,15 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 
     uno::Reference< XPropertySet > xColumnProp;
     {
-        bool bColumnName = !sEMailAddrFld.isEmpty();
+        bool bColumnName = !sEMailAddrField.isEmpty();
 
         if (bColumnName)
         {
             uno::Reference< XColumnsSupplier > xColsSupp( pImpl->pMergeData->xResultSet, UNO_QUERY );
             uno::Reference<XNameAccess> xCols = xColsSupp->getColumns();
-            if(!xCols->hasByName(sEMailAddrFld))
+            if(!xCols->hasByName(sEMailAddrField))
                 return false;
-            Any aCol = xCols->getByName(sEMailAddrFld);
+            Any aCol = xCols->getByName(sEMailAddrField);
             aCol >>= xColumnProp;
         }
 
@@ -997,7 +997,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 
                 // #i72517#
                 const SwPageDesc* pSourcePageDesc = pSourceShell->FindPageDescByName( sStartingPageDesc );
-                const SwFrmFmt& rMaster = pSourcePageDesc->GetMaster();
+                const SwFrameFormat& rMaster = pSourcePageDesc->GetMaster();
                 bPageStylesWithHeaderFooter = rMaster.GetHeader().IsActive()  ||
                                                 rMaster.GetFooter().IsActive();
 
@@ -1134,14 +1134,14 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
                         pWorkDoc->getIDocumentLinksAdministration().EmbedAllLinks();
 
                         // #i69458# lock fields to prevent access to the result set while calculating layout
-                        rWorkShell.LockExpFlds();
+                        rWorkShell.LockExpFields();
                         rWorkShell.CalcLayout();
-                        rWorkShell.UnlockExpFlds();
+                        rWorkShell.UnlockExpFields();
                     }
 
                         SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
                         SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), xWorkDocSh));
-                        rWorkShell.SwViewShell::UpdateFlds();
+                        rWorkShell.SwViewShell::UpdateFields();
                         SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE_FINISHED), xWorkDocSh));
 
                         // launch MailMergeEvent if required
@@ -1392,7 +1392,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 
             if (bCreateSingleFile)
             {
-                // sw::DocumentLayoutManager::CopyLayoutFmt() did not generate
+                // sw::DocumentLayoutManager::CopyLayoutFormat() did not generate
                 // unique fly names, do it here once.
                 pTargetDoc->SetInMailMerge(false);
                 pTargetDoc->SetAllUniqueFlyNames();
@@ -1522,14 +1522,14 @@ IMPL_LINK( SwDBManager, PrtCancelHdl, Button *, pButton )
 
 // determine the column's Numberformat and transfer to the forwarded Formatter,
 // if applicable.
-sal_uLong SwDBManager::GetColumnFmt( const OUString& rDBName,
+sal_uLong SwDBManager::GetColumnFormat( const OUString& rDBName,
                                 const OUString& rTableName,
                                 const OUString& rColNm,
-                                SvNumberFormatter* pNFmtr,
+                                SvNumberFormatter* pNFormatr,
                                 long nLanguage )
 {
     sal_uLong nRet = 0;
-    if(pNFmtr)
+    if(pNFormatr)
     {
         uno::Reference< XDataSource> xSource;
         uno::Reference< XConnection> xConnection;
@@ -1586,7 +1586,7 @@ sal_uLong SwDBManager::GetColumnFmt( const OUString& rDBName,
             Any aCol = xCols->getByName(rColNm);
             uno::Reference< XPropertySet > xColumn;
             aCol >>= xColumn;
-            nRet = GetColumnFmt(xSource, xConnection, xColumn, pNFmtr, nLanguage);
+            nRet = GetColumnFormat(xSource, xConnection, xColumn, pNFormatr, nLanguage);
             if(bDispose)
             {
                 ::comphelper::disposeComponent( xColsSupp );
@@ -1597,15 +1597,15 @@ sal_uLong SwDBManager::GetColumnFmt( const OUString& rDBName,
             }
         }
         else
-            nRet = pNFmtr->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM );
+            nRet = pNFormatr->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM );
     }
     return nRet;
 }
 
-sal_uLong SwDBManager::GetColumnFmt( uno::Reference< XDataSource> xSource,
+sal_uLong SwDBManager::GetColumnFormat( uno::Reference< XDataSource> xSource,
                         uno::Reference< XConnection> xConnection,
                         uno::Reference< XPropertySet> xColumn,
-                        SvNumberFormatter* pNFmtr,
+                        SvNumberFormatter* pNFormatr,
                         long nLanguage )
 {
     // set the NumberFormat in the doc if applicable
@@ -1617,11 +1617,11 @@ sal_uLong SwDBManager::GetColumnFmt( uno::Reference< XDataSource> xSource,
         if ( xChild.is() )
             xSource = uno::Reference<XDataSource>(xChild->getParent(), UNO_QUERY);
     }
-    if(xSource.is() && xConnection.is() && xColumn.is() && pNFmtr)
+    if(xSource.is() && xConnection.is() && xColumn.is() && pNFormatr)
     {
-        SvNumberFormatsSupplierObj* pNumFmt = new SvNumberFormatsSupplierObj( pNFmtr );
-        uno::Reference< util::XNumberFormatsSupplier >  xDocNumFmtsSupplier = pNumFmt;
-        uno::Reference< XNumberFormats > xDocNumberFormats = xDocNumFmtsSupplier->getNumberFormats();
+        SvNumberFormatsSupplierObj* pNumFormat = new SvNumberFormatsSupplierObj( pNFormatr );
+        uno::Reference< util::XNumberFormatsSupplier >  xDocNumFormatsSupplier = pNumFormat;
+        uno::Reference< XNumberFormats > xDocNumberFormats = xDocNumFormatsSupplier->getNumberFormats();
         uno::Reference< XNumberFormatTypes > xDocNumberFormatTypes(xDocNumberFormats, UNO_QUERY);
 
         com::sun::star::lang::Locale aLocale( LanguageTag( (LanguageType)nLanguage ).getLocale());
@@ -1648,23 +1648,23 @@ sal_uLong SwDBManager::GetColumnFmt( uno::Reference< XDataSource> xSource,
             Any aFormatKey = xColumn->getPropertyValue("FormatKey");
             if(aFormatKey.hasValue())
             {
-                sal_Int32 nFmt = 0;
-                aFormatKey >>= nFmt;
+                sal_Int32 nFormat = 0;
+                aFormatKey >>= nFormat;
                 if(xNumberFormats.is())
                 {
                     try
                     {
-                        uno::Reference<XPropertySet> xNumProps = xNumberFormats->getByKey( nFmt );
+                        uno::Reference<XPropertySet> xNumProps = xNumberFormats->getByKey( nFormat );
                         Any aFormatString = xNumProps->getPropertyValue("FormatString");
                         Any aLocaleVal = xNumProps->getPropertyValue("Locale");
                         OUString sFormat;
                         aFormatString >>= sFormat;
                         lang::Locale aLoc;
                         aLocaleVal >>= aLoc;
-                        nFmt = xDocNumberFormats->queryKey( sFormat, aLoc, sal_False );
-                        if(NUMBERFORMAT_ENTRY_NOT_FOUND == sal::static_int_cast< sal_uInt32, sal_Int32>(nFmt))
-                            nFmt = xDocNumberFormats->addNew( sFormat, aLoc );
-                        nRet = nFmt;
+                        nFormat = xDocNumberFormats->queryKey( sFormat, aLoc, sal_False );
+                        if(NUMBERFORMAT_ENTRY_NOT_FOUND == sal::static_int_cast< sal_uInt32, sal_Int32>(nFormat))
+                            nFormat = xDocNumberFormats->addNew( sFormat, aLoc );
+                        nRet = nFormat;
                         bUseDefault = false;
                     }
                     catch (const Exception& e)
@@ -1764,8 +1764,8 @@ uno::Reference< sdbcx::XColumnsSupplier> SwDBManager::GetColumnSupplier(uno::Ref
             Reference<XTablesSupplier> xTSupplier = Reference<XTablesSupplier>(xConnection, UNO_QUERY);
             if(xTSupplier.is())
             {
-                Reference<XNameAccess> xTbls = xTSupplier->getTables();
-                eTableOrQuery = xTbls->hasByName(rTableOrQuery) ?
+                Reference<XNameAccess> xTables = xTSupplier->getTables();
+                eTableOrQuery = xTables->hasByName(rTableOrQuery) ?
                             SW_DB_SELECT_TABLE : SW_DB_SELECT_QUERY;
             }
         }
@@ -2019,12 +2019,12 @@ bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter,
 
             lcl_GetColumnCnt( pImpl->pMergeData, xColumnProps, nLanguage, aString, &aNumber );
 
-            sal_uInt32 nFmt = GetColumnFmt( pImpl->pMergeData->sDataSource,
+            sal_uInt32 nFormat = GetColumnFormat( pImpl->pMergeData->sDataSource,
                                             pImpl->pMergeData->sCommand,
                                             pColNames[nCol], pDocFormatter, nLanguage );
             // aNumber is overwritten by SwDBField::FormatValue, so store initial status
             bool colIsNumber = aNumber != DBL_MAX;
-            bool bValidValue = SwDBField::FormatValue( pDocFormatter, aString, nFmt,
+            bool bValidValue = SwDBField::FormatValue( pDocFormatter, aString, nFormat,
                                                        aNumber, nColumnType, NULL );
             if( colIsNumber )
             {
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 72e0e1da7f59..18c8388985f4 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -301,11 +301,11 @@ void  SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent)
                     Reference<XTablesSupplier> xTSupplier = Reference<XTablesSupplier>(xConnection, UNO_QUERY);
                     if(xTSupplier.is())
                     {
-                        Reference<XNameAccess> xTbls = xTSupplier->getTables();
-                        OSL_ENSURE(xTbls->hasByName(sTableName), "table not available anymore?");
+                        Reference<XNameAccess> xTables = xTSupplier->getTables();
+                        OSL_ENSURE(xTables->hasByName(sTableName), "table not available anymore?");
                         try
                         {
-                            Any aTable = xTbls->getByName(sTableName);
+                            Any aTable = xTables->getByName(sTableName);
                             Reference<XPropertySet> xPropSet;
                             aTable >>= xPropSet;
                             xColsSupplier = Reference<XColumnsSupplier>(xPropSet, UNO_QUERY);
@@ -365,15 +365,15 @@ void  SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent)
                     Reference<XTablesSupplier> xTSupplier = Reference<XTablesSupplier>(xConnection, UNO_QUERY);
                     if(xTSupplier.is())
                     {
-                        Reference<XNameAccess> xTbls = xTSupplier->getTables();
-                        Sequence< OUString> aTblNames = xTbls->getElementNames();
+                        Reference<XNameAccess> xTables = xTSupplier->getTables();
+                        Sequence< OUString> aTableNames = xTables->getElementNames();
                         OUString sTableName;
-                        long nCount = aTblNames.getLength();
-                        const OUString* pTblNames = aTblNames.getConstArray();
+                        long nCount = aTableNames.getLength();
+                        const OUString* pTableNames = aTableNames.getConstArray();
                         Image aImg = aImageList.GetImage(IMG_DBTABLE);
                         for (long i = 0; i < nCount; i++)
                         {
-                            sTableName = pTblNames[i];
+                            sTableName = pTableNames[i];
                             SvTreeListEntry* pTableEntry = InsertEntry(sTableName, aImg, aImg, pParent, bShowColumns);
                             //to discriminate between queries and tables the user data of table entries is set
                             pTableEntry->SetUserData((void*)0);
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index c829ad5107cf..3716b92f774c 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -748,7 +748,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
     {
         m_pSpellState->m_bTextObjectsCollected = true;
         std::list<SdrTextObj*> aTextObjs;
-        SwDrawContact::GetTextObjectsFromFmt( aTextObjs, pDoc );
+        SwDrawContact::GetTextObjectsFromFormat( aTextObjs, pDoc );
         if(pCurrentTextObj)
         {
             m_pSpellState->m_aTextObjects.remove(pCurrentTextObj);
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index 958bc4ae9f18..b4f6046974bc 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -77,7 +77,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
         rSh.CalcBoundRect(aRect, FLY_AS_CHAR);
 
         long nWidth = aRect.Width();
-        aSet.Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
+        aSet.Put(SwFormatFrmSize(ATT_VAR_SIZE, nWidth));
 
         // height=width for more consistent preview (analog to edit region)
         aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
@@ -109,7 +109,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
         if(SfxItemState::SET == pSet->GetItemState(SID_ATTR_COLUMNS, false, &pItem)||
             SfxItemState::SET == pSet->GetItemState(FN_INSERT_REGION, false, &pItem))
         {
-            SwFmtCol aCol;
+            SwFormatCol aCol;
             SwRect aRect;
             rSh.CalcBoundRect(aRect, FLY_AS_CHAR);
             long nWidth = aRect.Width();
@@ -188,7 +188,7 @@ IMPL_LINK( SwWrtShell, InsertRegionDialog, SwSectionData*, pSect )
         SwRect aRect;
         CalcBoundRect(aRect, FLY_AS_CHAR);
         long nWidth = aRect.Width();
-        aSet.Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
+        aSet.Put(SwFormatFrmSize(ATT_VAR_SIZE, nWidth));
         // height=width for more consistent preview (analog to edit region)
         aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
         SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index be9179a6fc34..fbd4f6d92332 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -312,19 +312,19 @@ bool SwGlossaryHdl::NewGlossary(const OUString& rName, const OUString& rShortNam
     if(!pTmp)
         return false;
 
-    OUString sOnlyTxt;
-    OUString* pOnlyTxt = 0;
+    OUString sOnlyText;
+    OUString* pOnlyText = 0;
     if( bNoAttr )
     {
-        if( !pWrtShell->GetSelectedText( sOnlyTxt, GETSELTXT_PARABRK_TO_ONLYCR ))
+        if( !pWrtShell->GetSelectedText( sOnlyText, GETSELTXT_PARABRK_TO_ONLYCR ))
             return false;
-        pOnlyTxt = &sOnlyTxt;
+        pOnlyText = &sOnlyText;
     }
 
     const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
 
     const sal_uInt16 nSuccess = pWrtShell->MakeGlossary( *pTmp, rName, rShortName,
-                            rCfg.IsSaveRelFile(), pOnlyTxt );
+                            rCfg.IsSaveRelFile(), pOnlyText );
     if(nSuccess == (sal_uInt16) -1 )
     {
         MessageDialog(pWrtShell->GetView().GetWindow(), SW_RES(STR_ERR_INSERT_GLOS), VCL_MESSAGE_INFO).Execute();
@@ -370,7 +370,7 @@ bool SwGlossaryHdl::ExpandGlossary()
         // use this at text selection
     if(pWrtShell->SwCrsrShell::HasSelection() && !pWrtShell->IsBlockMode())
     {
-        aShortName = pWrtShell->GetSelTxt();
+        aShortName = pWrtShell->GetSelText();
     }
     else
     {
@@ -384,7 +384,7 @@ bool SwGlossaryHdl::ExpandGlossary()
         pWrtShell->SelNearestWrd();
             // ask for word
         if(pWrtShell->IsSelection())
-            aShortName = pWrtShell->GetSelTxt();
+            aShortName = pWrtShell->GetSelText();
     }
     return pGlossary && Expand( aShortName, &rStatGlossaries, pGlossary );
 }
@@ -509,7 +509,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName,
         pWrtShell->StartAllAction();
 
         // cache all InputFields
-        SwInputFieldList aFldLst( pWrtShell, true );
+        SwInputFieldList aFieldLst( pWrtShell, true );
 
         pWrtShell->InsertGlossary(*pGlossary, aShortName);
         pWrtShell->EndAllAction();
@@ -520,8 +520,8 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName,
         pWrtShell->EndUndo(UNDO_INSGLOSSARY);
 
         // demand input for all new InputFields
-        if( aFldLst.BuildSortLst() )
-            pWrtShell->UpdateInputFlds( &aFldLst );
+        if( aFieldLst.BuildSortLst() )
+            pWrtShell->UpdateInputFields( &aFieldLst );
     }
     delete pGlossary;
     return true;
@@ -553,7 +553,7 @@ bool SwGlossaryHdl::InsertGlossary(const OUString &rName)
     pWrtShell->StartAllAction();
 
     // cache all InputFields
-    SwInputFieldList aFldLst( pWrtShell, true );
+    SwInputFieldList aFieldLst( pWrtShell, true );
 
     pWrtShell->InsertGlossary(*pGlos, rName);
     pWrtShell->EndAllAction();
@@ -563,8 +563,8 @@ bool SwGlossaryHdl::InsertGlossary(const OUString &rName)
     }
 
     // demand input for all new InputFields
-    if( aFldLst.BuildSortLst() )
-        pWrtShell->UpdateInputFlds( &aFldLst );
+    if( aFieldLst.BuildSortLst() )
+        pWrtShell->UpdateInputFields( &aFieldLst );
 
     if(!pCurGrp)
         delete pGlos;
@@ -580,13 +580,13 @@ void SwGlossaryHdl::SetMacros(const OUString& rShortName,
     SwTextBlocks *pGlos = pGlossary ? pGlossary :
                                 pCurGrp ? pCurGrp
                                   : rStatGlossaries.GetGroupDoc( aCurGrp );
-    SvxMacroTableDtor aMacroTbl;
+    SvxMacroTableDtor aMacroTable;
     if( pStart )
-        aMacroTbl.Insert( SW_EVENT_START_INS_GLOSSARY, *pStart);
+        aMacroTable.Insert( SW_EVENT_START_INS_GLOSSARY, *pStart);
     if( pEnd )
-        aMacroTbl.Insert( SW_EVENT_END_INS_GLOSSARY, *pEnd);
+        aMacroTable.Insert( SW_EVENT_END_INS_GLOSSARY, *pEnd);
     sal_uInt16 nIdx = pGlos->GetIndex( rShortName );
-    if( !pGlos->SetMacroTable( nIdx, aMacroTbl ) && pGlos->GetError() )
+    if( !pGlos->SetMacroTable( nIdx, aMacroTable ) && pGlos->GetError() )
         ErrorHandler::HandleError( pGlos->GetError() );
 
     if(!pCurGrp && !pGlossary)
@@ -604,14 +604,14 @@ void SwGlossaryHdl::GetMacros( const OUString &rShortName,
     sal_uInt16 nIndex = pGlos->GetIndex( rShortName );
     if( nIndex != USHRT_MAX )
     {
-        SvxMacroTableDtor aMacroTbl;
-        if( pGlos->GetMacroTable( nIndex, aMacroTbl ) )
+        SvxMacroTableDtor aMacroTable;
+        if( pGlos->GetMacroTable( nIndex, aMacroTable ) )
         {
-            SvxMacro *pMacro = aMacroTbl.Get( SW_EVENT_START_INS_GLOSSARY );
+            SvxMacro *pMacro = aMacroTable.Get( SW_EVENT_START_INS_GLOSSARY );
             if( pMacro )
                 rStart = *pMacro;
 
-            pMacro = aMacroTbl.Get( SW_EVENT_END_INS_GLOSSARY );
+            pMacro = aMacroTable.Get( SW_EVENT_END_INS_GLOSSARY );
             if( pMacro )
                 rEnd = *pMacro;
         }
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index d8fd971d5b76..884e383f8460 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -326,8 +326,8 @@ uno::Reference < embed::XEmbeddedObject > SwTransferable::FindOLEObj( sal_Int64&
     uno::Reference < embed::XEmbeddedObject > xObj;
     if( pClpDocFac )
     {
-        SwIterator<SwCntntNode,SwFmtColl> aIter( *pClpDocFac->GetDoc()->GetDfltGrfFmtColl() );
-        for( SwCntntNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
+        SwIterator<SwContentNode,SwFormatColl> aIter( *pClpDocFac->GetDoc()->GetDfltGrfFormatColl() );
+        for( SwContentNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
             if( ND_OLENODE == pNd->GetNodeType() )
             {
                 xObj = static_cast<SwOLENode*>(pNd)->GetOLEObj().GetOleRef();
@@ -342,8 +342,8 @@ const Graphic* SwTransferable::FindOLEReplacementGraphic() const
 {
     if( pClpDocFac )
     {
-        SwIterator<SwCntntNode,SwFmtColl> aIter( *pClpDocFac->GetDoc()->GetDfltGrfFmtColl() );
-        for( SwCntntNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
+        SwIterator<SwContentNode,SwFormatColl> aIter( *pClpDocFac->GetDoc()->GetDfltGrfFormatColl() );
+        for( SwContentNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
             if( ND_OLENODE == pNd->GetNodeType() )
             {
                 return static_cast<SwOLENode*>(pNd)->GetGraphic();
@@ -444,7 +444,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
         pClpDocFac = new SwDocFac;
         SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac);
 
-        pTmpDoc->getIDocumentFieldsAccess().LockExpFlds();     // never update fields - leave text as it is
+        pTmpDoc->getIDocumentFieldsAccess().LockExpFields();     // never update fields - leave text as it is
         lclOverWriteDoc(*pWrtShell, *pTmpDoc);
 
         // in CORE a new one was created (OLE-Objekte copied!)
@@ -455,28 +455,28 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
 
         if( nSelectionType & nsSelectionType::SEL_TXT && !pWrtShell->HasMark() )
         {
-            SwContentAtPos aCntntAtPos( SwContentAtPos::SW_INETATTR );
+            SwContentAtPos aContentAtPos( SwContentAtPos::SW_INETATTR );
 
             Point aPos( SwEditWin::GetDDStartPosX(), SwEditWin::GetDDStartPosY());
 
             bool bSelect = g_bExecuteDrag &&
                             pWrtShell->GetView().GetDocShell() &&
                             !pWrtShell->GetView().GetDocShell()->IsReadOnly();
-            if( pWrtShell->GetContentAtPos( aPos, aCntntAtPos, bSelect ) )
+            if( pWrtShell->GetContentAtPos( aPos, aContentAtPos, bSelect ) )
             {
                 pBkmk = new INetBookmark(
-                        static_cast<const SwFmtINetFmt*>(aCntntAtPos.aFnd.pAttr)->GetValue(),
-                        aCntntAtPos.sStr );
+                        static_cast<const SwFormatINetFormat*>(aContentAtPos.aFnd.pAttr)->GetValue(),
+                        aContentAtPos.sStr );
                 eBufferType = TRNSFR_INETFLD;
                 if( bSelect )
-                    pWrtShell->SelectTxtAttr( RES_TXTATR_INETFMT );
+                    pWrtShell->SelectTextAttr( RES_TXTATR_INETFMT );
             }
         }
         if( pWrtShell->IsFrmSelected() )
         {
              SfxItemSet aSet( pWrtShell->GetAttrPool(), RES_URL, RES_URL );
             pWrtShell->GetFlyFrmAttr( aSet );
-            const SwFmtURL& rURL = static_cast<const SwFmtURL&>(aSet.Get( RES_URL ));
+            const SwFormatURL& rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL ));
             if( rURL.GetMap() )
                 pImageMap = new ImageMap( *rURL.GetMap() );
             else if( !rURL.GetURL().isEmpty() )
@@ -878,7 +878,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
 
         SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac);
 
-        pTmpDoc->getIDocumentFieldsAccess().LockExpFlds();     // Never update fields - leave text as is
+        pTmpDoc->getIDocumentFieldsAccess().LockExpFields();     // Never update fields - leave text as is
         lclOverWriteDoc(*pWrtShell, *pTmpDoc);
 
         {
@@ -994,7 +994,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
     {
         SfxItemSet aSet( pWrtShell->GetAttrPool(), RES_URL, RES_URL );
         pWrtShell->GetFlyFrmAttr( aSet );
-        const SwFmtURL& rURL = static_cast<const SwFmtURL&>(aSet.Get( RES_URL ));
+        const SwFormatURL& rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL ));
         if( rURL.GetMap() )
         {
             pImageMap = new ImageMap( *rURL.GetMap() );
@@ -1053,10 +1053,10 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary,
 
     SwNodes& rNds = pCDoc->GetNodes();
     SwNodeIndex aNodeIdx( *rNds.GetEndOfContent().StartOfSectionNode() );
-    SwCntntNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to 1st ContentNode
+    SwContentNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to 1st ContentNode
     SwPaM aPam( *pCNd );
 
-    pCDoc->getIDocumentFieldsAccess().LockExpFlds();   // never update fields - leave text as it is
+    pCDoc->getIDocumentFieldsAccess().LockExpFields();   // never update fields - leave text as it is
 
     pCDoc->InsertGlossary( rGlossary, rStr, aPam, 0 );
 
@@ -1181,7 +1181,7 @@ bool SwTransferable::Paste( SwWrtShell& rSh, TransferableDataHelper& rData )
 
 bool SwTransferable::PasteData( TransferableDataHelper& rData,
                             SwWrtShell& rSh, sal_uInt16 nAction, SotClipboardFormatId nFormat,
-                            SotExchangeDest nDestination, bool bIsPasteFmt,
+                            SotExchangeDest nDestination, bool bIsPasteFormat,
                             bool bIsDefault,
                             const Point* pPt, sal_Int8 nDropAction,
                             bool bPasteSelection )
@@ -1218,7 +1218,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
             }
         }
     }
-    else if( ( !GetSwTransferable( rData ) || bIsPasteFmt ) &&
+    else if( ( !GetSwTransferable( rData ) || bIsPasteFormat ) &&
             !rSh.IsTableMode() && rSh.HasSelection() )
     {
         // then delete the selections
@@ -1263,9 +1263,9 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
     {
         // check if dragged over a useful target. If yes, use as content exchange
         // drop as if from external
-        const SwFrmFmt* pSwFrmFmt = rSh.GetFmtFromObj(*pPt);
+        const SwFrameFormat* pSwFrameFormat = rSh.GetFormatFromObj(*pPt);
 
-        if(pSwFrmFmt && 0 != dynamic_cast< const SwDrawFrmFmt* >(pSwFrmFmt))
+        if(pSwFrameFormat && 0 != dynamic_cast< const SwDrawFrameFormat* >(pSwFrameFormat))
         {
             bPrivateDrop = false;
             bNeedToSelectBeforePaste = true;
@@ -1339,8 +1339,8 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
                     INetBookmark aBkmk;
                     if( rData.GetINetBookmark( nFormat, aBkmk ) )
                     {
-                        SwFmtINetFmt aFmt( aBkmk.GetURL(), OUString() );
-                        rSh.InsertURL( aFmt, aBkmk.GetDescription() );
+                        SwFormatINetFormat aFormat( aBkmk.GetURL(), OUString() );
+                        rSh.InsertURL( aFormat, aBkmk.GetDescription() );
                         nRet = true;
                     }
                 }
@@ -1473,8 +1473,8 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
 
                 if( nRet )
                 {
-                    SwFmtINetFmt aFmt( sURL, OUString() );
-                    rSh.InsertURL( aFmt, sDesc );
+                    SwFormatINetFormat aFormat( sURL, OUString() );
+                    rSh.InsertURL( aFormat, sDesc );
                 }
             }
             break;
@@ -1578,13 +1578,13 @@ SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh,
             bool bIMap, bLink;
             if( pPt )
             {
-                bIMap = 0 != rSh.GetFmtFromObj( *pPt )->GetURL().GetMap();
+                bIMap = 0 != rSh.GetFormatFromObj( *pPt )->GetURL().GetMap();
                 OUString aDummy;
                 rSh.GetGrfAtPos( *pPt, aDummy, bLink );
             }
             else
             {
-                bIMap = 0 != rSh.GetFlyFrmFmt()->GetURL().GetMap();
+                bIMap = 0 != rSh.GetFlyFrameFormat()->GetURL().GetMap();
                 OUString aDummy;
                 rSh.GetGrfNms( &aDummy, 0 );
                 bLink = !aDummy.isEmpty();
@@ -1628,7 +1628,7 @@ SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh,
 }
 
 bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
-                                    SwWrtShell& rSh, SotClipboardFormatId nFmt, bool bMsg )
+                                    SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bMsg )
 {
     sal_uInt16 nResId = STR_CLPBRD_FORMAT_ERROR;
     bool nRet = false;
@@ -1639,12 +1639,12 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
     SvStream* pStream = 0;
     SwRead pRead = 0;
     OUString sData;
-    switch( nFmt )
+    switch( nFormat )
     {
     case SotClipboardFormatId::STRING:
         {
             pRead = ReadAscii;
-            if( rData.GetString( nFmt, sData ) )
+            if( rData.GetString( nFormat, sData ) )
             {
                 pStream = new SvMemoryStream( (void*)sData.getStr(),
                             sData.getLength() * sizeof( sal_Unicode ),
@@ -1664,23 +1664,23 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
         // no break - because then test if we get a stream
 
     default:
-        if( rData.GetSotStorageStream( nFmt, xStrm ) )
+        if( rData.GetSotStorageStream( nFormat, xStrm ) )
         {
-            if( ( SotClipboardFormatId::HTML_SIMPLE == nFmt ) ||
-                ( SotClipboardFormatId::HTML_NO_COMMENT == nFmt ) )
+            if( ( SotClipboardFormatId::HTML_SIMPLE == nFormat ) ||
+                ( SotClipboardFormatId::HTML_NO_COMMENT == nFormat ) )
             {
                 pStream = aMSE40ClpObj.IsValid( *xStrm );
                 pRead = ReadHTML;
                 pRead->SetReadUTF8( true );
 
                 bool bNoComments =
-                    ( nFmt == SotClipboardFormatId::HTML_NO_COMMENT );
+                    ( nFormat == SotClipboardFormatId::HTML_NO_COMMENT );
                 pRead->SetIgnoreHTMLComments( bNoComments );
             }
             else
             {
                 pStream = &xStrm;
-                if( SotClipboardFormatId::RTF == nFmt )
+                if( SotClipboardFormatId::RTF == nFormat )
                     pRead = SwReaderWriter::GetReader( READER_WRITER_RTF );
                 else if( !pRead )
                 {
@@ -1699,7 +1699,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
 
         const SwPosition& rInsPos = *rSh.GetCrsr()->Start();
         SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCrsr() );
-        rSh.SaveTblBoxCntnt( &rInsPos );
+        rSh.SaveTableBoxContent( &rInsPos );
         if( IsError( aReader.Read( *pRead )) )
             nResId = STR_ERROR_CLPBRD_READ;
         else
@@ -1724,7 +1724,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
-                                SotClipboardFormatId nFmt, sal_uInt8 nActionFlags, bool bMsg )
+                                SotClipboardFormatId nFormat, sal_uInt8 nActionFlags, bool bMsg )
 {
     bool nRet = false;
     TransferableObjectDescriptor aObjDesc;
@@ -1784,7 +1784,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
             // it wasn't a storage, but maybe it's a useful stream
         }
 
-        nFmt = nId;
+        nFormat = nId;
     }
 
     if( pRead )
@@ -1813,7 +1813,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
         }
         else
         {
-            if( rData.HasFormat( nFmt = SotClipboardFormatId::OBJECTDESCRIPTOR_OLE ) && rData.GetTransferableObjectDescriptor( nFmt, aObjDesc ) )
+            if( rData.HasFormat( nFormat = SotClipboardFormatId::OBJECTDESCRIPTOR_OLE ) && rData.GetTransferableObjectDescriptor( nFormat, aObjDesc ) )
              {
                 xStrm = rData.GetInputStream(SotClipboardFormatId::EMBED_SOURCE_OLE, OUString());
                 if (!xStrm.is())
@@ -2014,7 +2014,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
     {
         SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
         rSh.GetFlyFrmAttr( aSet );
-        SwFmtURL aURL( static_cast<const SwFmtURL&>(aSet.Get( RES_URL )) );
+        SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
 
         if( aURL.GetURL() != aINetImg.GetTargetURL() ||
             aURL.GetTargetFrameName() != aINetImg.GetTargetFrame() )
@@ -2112,7 +2112,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
     sal_uInt16 i = 1,j;
     OUString aName;
     bool bAlreadyThere = false, bDoublePaste = false;
-    sal_uInt16 nSize = rWrtShell.GetFldTypeCount();
+    sal_uInt16 nSize = rWrtShell.GetFieldTypeCount();
     const ::utl::TransliterationWrapper& rColl = ::GetAppCmpStrIgnore();
 
     do {
@@ -2120,7 +2120,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
         aName += OUString::number( i );
         for( j = INIT_FLDTYPES; j < nSize; j++ )
         {
-            pTyp = rWrtShell.GetFldType( j );
+            pTyp = rWrtShell.GetFieldType( j );
             if( RES_DDEFLD == pTyp->Which() )
             {
                 OUString sTmp( static_cast<SwDDEFieldType*>(pTyp)->GetCmd() );
@@ -2148,7 +2148,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
     if( !bDoublePaste )
     {
         SwDDEFieldType aType( aName, aCmd, SfxLinkUpdateMode::ALWAYS );
-        pTyp = rWrtShell.InsertFldType( aType );
+        pTyp = rWrtShell.InsertFieldType( aType );
     }
 
     SwDDEFieldType* pDDETyp = static_cast<SwDDEFieldType*>(pTyp);
@@ -2214,9 +2214,9 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
     {
         // remove FieldType again - error occurred!
         for( j = nSize; j >= INIT_FLDTYPES; --j )
-            if( pTyp == rWrtShell.GetFldType( j ) )
+            if( pTyp == rWrtShell.GetFieldType( j ) )
             {
-                rWrtShell.RemoveFldType( j );
+                rWrtShell.RemoveFieldType( j );
                 break;
             }
     }
@@ -2252,7 +2252,7 @@ bool SwTransferable::_PasteSdrFormat(  TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
-                                SotClipboardFormatId nFmt, sal_uInt16 nAction, const Point* pPt,
+                                SotClipboardFormatId nFormat, sal_uInt16 nAction, const Point* pPt,
                                 sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste)
 {
     bool nRet = false;
@@ -2261,12 +2261,12 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
     INetBookmark aBkmk;
     bool bCheckForGrf = false, bCheckForImageMap = false;
 
-    switch( nFmt )
+    switch( nFormat )
     {
     case SotClipboardFormatId::BITMAP:
     case SotClipboardFormatId::PNG:
     case SotClipboardFormatId::GDIMETAFILE:
-        nRet = rData.GetGraphic( nFmt, aGraphic );
+        nRet = rData.GetGraphic( nFormat, aGraphic );
         break;
 
     case SotClipboardFormatId::SVXB:
@@ -2285,10 +2285,10 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
     case SotClipboardFormatId::NETSCAPE_BOOKMARK:
     case SotClipboardFormatId::FILEGRPDESCRIPTOR:
     case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
-        if( ( nRet = rData.GetINetBookmark( nFmt, aBkmk ) ))
+        if( ( nRet = rData.GetINetBookmark( nFormat, aBkmk ) ))
         {
             if( SW_PASTESDR_SETATTR == nAction )
-                nFmt = SotClipboardFormatId::NETSCAPE_BOOKMARK;
+                nFormat = SotClipboardFormatId::NETSCAPE_BOOKMARK;
             else
                 bCheckForGrf = true;
         }
@@ -2296,14 +2296,14 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
 
     case SotClipboardFormatId::SIMPLE_FILE:
         {
-            OUString sTxt;
-            if( ( nRet = rData.GetString( nFmt, sTxt ) ) )
+            OUString sText;
+            if( ( nRet = rData.GetString( nFormat, sText ) ) )
             {
                 OUString sDesc;
-                SwTransferable::_CheckForURLOrLNKFile( rData, sTxt, &sDesc );
+                SwTransferable::_CheckForURLOrLNKFile( rData, sText, &sDesc );
 
                 aBkmk = INetBookmark(
-                        URIHelper::SmartRel2Abs(INetURLObject(), sTxt, Link<OUString *, bool>(), false ),
+                        URIHelper::SmartRel2Abs(INetURLObject(), sText, Link<OUString *, bool>(), false ),
                         sDesc );
                 bCheckForGrf = true;
                 bCheckForImageMap = SW_PASTESDR_REPLACE == nAction;
@@ -2312,7 +2312,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
         break;
 
     default:
-        nRet = rData.GetGraphic( nFmt, aGraphic );
+        nRet = rData.GetGraphic( nFormat, aGraphic );
         break;
     }
 
@@ -2324,12 +2324,12 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
                                             aGraphic, &rFlt );
 
         if( !nRet && SW_PASTESDR_SETATTR == nAction &&
-            SotClipboardFormatId::SIMPLE_FILE == nFmt &&
+            SotClipboardFormatId::SIMPLE_FILE == nFormat &&
             // only at frame selection
             rSh.IsFrmSelected() )
         {
             // then set as hyperlink after the graphic
-            nFmt = SotClipboardFormatId::NETSCAPE_BOOKMARK;
+            nFormat = SotClipboardFormatId::NETSCAPE_BOOKMARK;
             nRet = true;
         }
     }
@@ -2390,13 +2390,13 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
 
             case SW_PASTESDR_SETATTR:
             {
-                if( SotClipboardFormatId::NETSCAPE_BOOKMARK == nFmt )
+                if( SotClipboardFormatId::NETSCAPE_BOOKMARK == nFormat )
                 {
                     if( rSh.IsFrmSelected() )
                     {
                         SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
                         rSh.GetFlyFrmAttr( aSet );
-                        SwFmtURL aURL( static_cast<const SwFmtURL&>(aSet.Get( RES_URL )) );
+                        SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
                         aURL.SetURL( aBkmk.GetURL(), false );
                         aSet.Put( aURL );
                         rSh.SetFlyFrmAttr( aSet );
@@ -2454,7 +2454,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
         {
             SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
             rSh.GetFlyFrmAttr( aSet );
-            SwFmtURL aURL( static_cast<const SwFmtURL&>(aSet.Get( RES_URL )) );
+            SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
             aURL.SetMap( &aMap );
             aSet.Put( aURL );
             rSh.SetFlyFrmAttr( aSet );
@@ -2473,7 +2473,7 @@ bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
     {
         SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
         rSh.GetFlyFrmAttr( aSet );
-        SwFmtURL aURL( static_cast<const SwFmtURL&>(aSet.Get( RES_URL )) );
+        SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
         const ImageMap* pOld = aURL.GetMap();
 
         // set or replace, that is the question
@@ -2491,11 +2491,11 @@ bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
-                                        SwWrtShell& rSh, SotClipboardFormatId nFmt )
+                                        SwWrtShell& rSh, SotClipboardFormatId nFormat )
 {
     bool nRet = false;
     OUString sFile;
-    if( rData.GetString( nFmt, sFile ) && !sFile.isEmpty() )
+    if( rData.GetString( nFormat, sFile ) && !sFile.isEmpty() )
     {
         OUString sDesc;
         SwTransferable::_CheckForURLOrLNKFile( rData, sFile, &sDesc );
@@ -2514,7 +2514,7 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
             {
                 SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
                 rSh.GetFlyFrmAttr( aSet );
-                SwFmtURL aURL2( static_cast<const SwFmtURL&>(aSet.Get( RES_URL )) );
+                SwFormatURL aURL2( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
                 aURL2.SetURL( sFile, false );
                 if( aURL2.GetName().isEmpty() )
                     aURL2.SetName( sFile );
@@ -2525,7 +2525,7 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
 
         default:
             {
-                rSh.InsertURL( SwFmtINetFmt( sFile, OUString() ),
+                rSh.InsertURL( SwFormatINetFormat( sFile, OUString() ),
                                 sDesc.isEmpty() ? sFile : sDesc);
             }
         }
@@ -2535,12 +2535,12 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
-                                    SwWrtShell& rSh, SotClipboardFormatId nFmt,
+                                    SwWrtShell& rSh, SotClipboardFormatId nFormat,
                                     sal_uInt16 nAction, const Point* pPt,
                     sal_uInt8 nActionFlags, bool /* bMsg */,
                     bool * graphicInserted)
 {
-    bool nRet = SwTransferable::_PasteGrf( rData, rSh, nFmt, nAction,
+    bool nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, nAction,
                                             pPt, nActionFlags, 0, false);
     if (graphicInserted != 0) {
         *graphicInserted = nRet;
@@ -2548,7 +2548,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
     if( !nRet )
     {
         OUString sFile, sDesc;
-        if( rData.GetString( nFmt, sFile ) && !sFile.isEmpty() )
+        if( rData.GetString( nFormat, sFile ) && !sFile.isEmpty() )
         {
 #if HAVE_FEATURE_AVMEDIA
             INetURLObject aMediaURL;
@@ -2608,7 +2608,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
                         {
                             SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
                             rSh.GetFlyFrmAttr( aSet );
-                            SwFmtURL aURL2( static_cast<const SwFmtURL&>(aSet.Get( RES_URL )) );
+                            SwFormatURL aURL2( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
                             aURL2.SetURL( sFile, false );
                             if( aURL2.GetName().isEmpty() )
                                 aURL2.SetName( sFile );
@@ -2619,7 +2619,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
 
                     default:
                         {
-                            rSh.InsertURL( SwFmtINetFmt( sFile, OUString() ),
+                            rSh.InsertURL( SwFormatINetFormat( sFile, OUString() ),
                                             sDesc.isEmpty() ? sFile : sDesc );
                         }
                     }
@@ -2632,16 +2632,16 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
-                                    SwWrtShell& rSh, SotClipboardFormatId nFmt, bool bLink,
+                                    SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bLink,
                                     const Point* pDragPt, bool bMsg )
 {
     bool nRet = false;
-    OUString sTxt;
-    if( rData.GetString( nFmt, sTxt ) && !sTxt.isEmpty() )
+    OUString sText;
+    if( rData.GetString( nFormat, sText ) && !sText.isEmpty() )
     {
-        sal_uInt16 nWh = SotClipboardFormatId::SBA_CTRLDATAEXCHANGE == nFmt
+        sal_uInt16 nWh = SotClipboardFormatId::SBA_CTRLDATAEXCHANGE == nFormat
                     ? 0
-                    : SotClipboardFormatId::SBA_DATAEXCHANGE == nFmt
+                    : SotClipboardFormatId::SBA_DATAEXCHANGE == nFormat
                                 ? (bLink
                                     ? FN_QRY_MERGE_FIELD
                                     : FN_QRY_INSERT)
@@ -2650,7 +2650,7 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
                                     : FN_QRY_INSERT_FIELD );
         DataFlavorExVector& rVector = rData.GetDataFlavorExVector();
         bool bHaveColumnDescriptor = OColumnTransferable::canExtractColumnDescriptor(rVector, ColumnTransferFormatFlags::COLUMN_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE);
-        if ( SotClipboardFormatId::XFORMS == nFmt )
+        if ( SotClipboardFormatId::XFORMS == nFormat )
         {
             rSh.MakeDrawView();
             FmFormView* pFmView = PTR_CAST( FmFormView, rSh.GetDrawView() );
@@ -2699,7 +2699,7 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
             //force ::SelectShell
             rView.StopShellTimer();
 
-            SfxStringItem aDataDesc( nWh, sTxt );
+            SfxStringItem aDataDesc( nWh, sText );
             rView.GetViewFrame()->GetDispatcher()->Execute(
                                 nWh, SfxCallMode::ASYNCHRON, &aDataDesc,
                                 pConnectionItem.get(), pColumnItem.get(),
@@ -2796,9 +2796,9 @@ bool SwTransferable::IsPasteSpecial( const SwWrtShell& rWrtShell,
                                      const TransferableDataHelper& rData )
 {
     // we can paste-special if there's an entry in the paste-special-format list
-    SvxClipboardFmtItem aClipboardFmtItem(0);
-    FillClipFmtItem( rWrtShell, rData, aClipboardFmtItem);
-    return aClipboardFmtItem.Count() > 0;
+    SvxClipboardFormatItem aClipboardFormatItem(0);
+    FillClipFormatItem( rWrtShell, rData, aClipboardFormatItem);
+    return aClipboardFormatItem.Count() > 0;
 }
 
 bool SwTransferable::PasteFormat( SwWrtShell& rSh,
@@ -2808,13 +2808,13 @@ bool SwTransferable::PasteFormat( SwWrtShell& rSh,
     SwWait aWait( *rSh.GetView().GetDocShell(), false );
     bool nRet = false;
 
-    SotClipboardFormatId nPrivateFmt = SotClipboardFormatId::PRIVATE;
+    SotClipboardFormatId nPrivateFormat = SotClipboardFormatId::PRIVATE;
     SwTransferable *pClipboard = GetSwTransferable( rData );
     if( pClipboard &&
         ((TRNSFR_DOCUMENT|TRNSFR_GRAPHIC|TRNSFR_OLE) & pClipboard->eBufferType ))
-        nPrivateFmt = SotClipboardFormatId::EMBED_SOURCE;
+        nPrivateFormat = SotClipboardFormatId::EMBED_SOURCE;
 
-    if( pClipboard && nPrivateFmt == nFormat )
+    if( pClipboard && nPrivateFormat == nFormat )
         nRet = pClipboard->PrivatePaste( rSh );
     else if( rData.HasFormat( nFormat ) )
     {
@@ -2959,9 +2959,9 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat
     return nRet;
 }
 
-void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh,
+void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh,
                                 const TransferableDataHelper& rData,
-                                SvxClipboardFmtItem & rToFill )
+                                SvxClipboardFormatItem & rToFill )
 {
     SotExchangeDest nDest = SwTransferable::GetSotDestination( rSh );
 
@@ -3116,10 +3116,10 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
     else if( nSelection & nsSelectionType::SEL_TXT && !pWrtShell->HasMark() )
     {
         // is only one field - selected?
-        SwContentAtPos aCntntAtPos( SwContentAtPos::SW_INETATTR );
+        SwContentAtPos aContentAtPos( SwContentAtPos::SW_INETATTR );
         Point aPos( SwEditWin::GetDDStartPosX(), SwEditWin::GetDDStartPosY());
 
-        if( pWrtShell->GetContentAtPos( aPos, aCntntAtPos ) )
+        if( pWrtShell->GetContentAtPos( aPos, aContentAtPos ) )
         {
             AddFormat( SotClipboardFormatId::STRING );
              AddFormat( SotClipboardFormatId::SOLK );
@@ -3135,7 +3135,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
     {
         SfxItemSet aSet( pWrtShell->GetAttrPool(), RES_URL, RES_URL );
         pWrtShell->GetFlyFrmAttr( aSet );
-        const SwFmtURL& rURL = static_cast<const SwFmtURL&>(aSet.Get( RES_URL ));
+        const SwFormatURL& rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL ));
         if( rURL.GetMap() )
         {
             pImageMap = new ImageMap( *rURL.GetMap() );
@@ -3188,7 +3188,7 @@ void SwTransferable::DragFinished( sal_Int8 nAction )
             pWrtShell->StartAllAction();
             pWrtShell->StartUndo( UNDO_UI_DRAG_AND_MOVE );
             if ( pWrtShell->IsTableMode() )
-                pWrtShell->DeleteTblSel();
+                pWrtShell->DeleteTableSel();
             else
             {
                 if ( !(pWrtShell->IsSelFrmMode() || pWrtShell->IsObjSelected()) )
@@ -3296,7 +3296,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
     bool bEndWrd = false;
     bool bSttWrd = false;
     bool bSttPara = false;
-    bool bTblSel = false;
+    bool bTableSel = false;
     bool bFrmSel = false;
 
     SwWrtShell& rSrcSh = *GetShell();
@@ -3305,7 +3305,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
 
     if( TRNSFR_INETFLD == eBufferType )
     {
-        if( rSh.GetFmtFromObj( rDragPt ) )
+        if( rSh.GetFormatFromObj( rDragPt ) )
         {
             INetBookmark aTmp;
             if( (TRNSFR_INETFLD & eBufferType) && pBkmk )
@@ -3326,7 +3326,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
             {
                 SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
                 rSh.GetFlyFrmAttr( aSet );
-                SwFmtURL aURL( static_cast<const SwFmtURL&>(aSet.Get( RES_URL )) );
+                SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
                 aURL.SetURL( aTmp.GetURL(), false );
                 aSet.Put( aURL );
                 rSh.SetFlyFrmAttr( aSet );
@@ -3360,7 +3360,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
         return false;
 
     if( rSrcSh.IsTableMode() )
-        bTblSel = true;
+        bTableSel = true;
     else if( rSrcSh.IsSelFrmMode() || rSrcSh.IsObjSelected() )
     {
         // don't move position-protected objects!
@@ -3391,7 +3391,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
         rSh.SwCrsrShell::SetCrsr( rDragPt, true );
         cWord = rSrcSh.IntelligentCut( nSel, false );
     }
-    else if( !bTblSel && !bFrmSel )
+    else if( !bTableSel && !bFrmSel )
     {
         if( !rSh.IsAddMode() )
         {
@@ -3424,7 +3424,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
         {
             rSh.GoPrevCrsr();
             rSh.SwCrsrShell::SetCrsr( aSttPt, true );
-            rSh.SelectTxtAttr( RES_TXTATR_INETFMT );
+            rSh.SelectTextAttr( RES_TXTATR_INETFMT );
             if( rSh.ChgCurrPam( rDragPt ) )
             {
                 // don't copy/move inside of yourself
@@ -3439,7 +3439,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
         else
         {
             rSrcSh.SwCrsrShell::SetCrsr( aSttPt, true );
-            rSrcSh.SelectTxtAttr( RES_TXTATR_INETFMT );
+            rSrcSh.SelectTextAttr( RES_TXTATR_INETFMT );
         }
 
         // is there an URL attribute at the insert point? Then replace that,
@@ -3462,7 +3462,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
         rSrcSh.Push();
         if ( bRet && bMove && !bFrmSel )
         {
-            if ( bTblSel )
+            if ( bTableSel )
             {
                 /* delete table contents not cells */
                 rSrcSh.Delete();
@@ -3483,14 +3483,14 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
 
         /* after dragging a table selection inside one shell
             set cursor to the drop position. */
-        if( &rSh == &rSrcSh && ( bTblSel || rSh.IsBlockMode() ) )
+        if( &rSh == &rSrcSh && ( bTableSel || rSh.IsBlockMode() ) )
         {
             rSrcSh.SwCrsrShell::SetCrsr(rDragPt);
             rSrcSh.GetSwCrsr()->SetMark();
         }
     }
 
-    if( bRet && !bTblSel && !bFrmSel )
+    if( bRet && !bTableSel && !bFrmSel )
     {
         if( (bInWrd || bEndWrd) &&
             (cWord == SwWrtShell::WORD_SPACE_AFTER ||
@@ -3624,9 +3624,9 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
     // we only end up here with table- or text selection
     if( nsSelectionType::SEL_TBL_CELLS & rSh.GetSelectionType() )
     {
-        SwFrmFmt* pFmt = rSh.GetTableFmt();
-        if( pFmt )
-            sName = pFmt->GetName();
+        SwFrameFormat* pFormat = rSh.GetTableFormat();
+        if( pFormat )
+            sName = pFormat->GetName();
     }
     else
     {
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index a2df960c99a0..6c5a5cdea0b9 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -60,10 +60,10 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
                                   SwPostItMgr& aMgr,
                                   SwPostItBits aBits,
                                   SwSidebarItem& rSidebarItem,
-                                  SwFmtFld* aField )
+                                  SwFormatField* aField )
     : SwSidebarWin( rEditWin, nBits, aMgr, aBits, rSidebarItem )
-    , mpFmtFld(aField)
-    , mpFld( static_cast<SwPostItField*>(aField->GetField()))
+    , mpFormatField(aField)
+    , mpField( static_cast<SwPostItField*>(aField->GetField()))
     , mpButtonPopup(0)
 {
 }
@@ -88,16 +88,16 @@ void SwAnnotationWin::SetPostItText()
 
     //If the new text is the same as the old text, keep the same insertion
     //point .e.g. fdo#33599
-    mpFld = static_cast<SwPostItField*>(mpFmtFld->GetField());
-    OUString sNewText = mpFld->GetPar2();
+    mpField = static_cast<SwPostItField*>(mpFormatField->GetField());
+    OUString sNewText = mpField->GetPar2();
     bool bTextUnchanged = sNewText.equals(Engine()->GetEditEngine().GetText());
     ESelection aOrigSelection(GetOutlinerView()->GetEditView().GetSelection());
 
     // get text from SwPostItField and insert into our textview
     Engine()->SetModifyHdl( Link<>() );
     Engine()->EnableUndo( false );
-    if( mpFld->GetTextObject() )
-        Engine()->SetText( *mpFld->GetTextObject() );
+    if( mpField->GetTextObject() )
+        Engine()->SetText( *mpField->GetTextObject() );
     else
     {
         Engine()->Clear();
@@ -125,22 +125,22 @@ void SwAnnotationWin::UpdateData()
         boost::scoped_ptr<SwField> pOldField;
         if (rUndoRedo.DoesUndo())
         {
-            pOldField.reset(mpFld->Copy());
+            pOldField.reset(mpField->Copy());
         }
-        mpFld->SetPar2(Engine()->GetEditEngine().GetText());
-        mpFld->SetTextObject(Engine()->CreateParaObject());
+        mpField->SetPar2(Engine()->GetEditEngine().GetText());
+        mpField->SetTextObject(Engine()->CreateParaObject());
         if (rUndoRedo.DoesUndo())
         {
-            SwTxtFld *const pTxtFld = mpFmtFld->GetTxtFld();
-            SwPosition aPosition( pTxtFld->GetTxtNode() );
-            aPosition.nContent = pTxtFld->GetStart();
+            SwTextField *const pTextField = mpFormatField->GetTextField();
+            SwPosition aPosition( pTextField->GetTextNode() );
+            aPosition.nContent = pTextField->GetStart();
             rUndoRedo.AppendUndo(
-                new SwUndoFieldFromDoc(aPosition, *pOldField, *mpFld, 0, true));
+                new SwUndoFieldFromDoc(aPosition, *pOldField, *mpField, 0, true));
         }
         // so we get a new layout of notes (anchor position is still the same and we would otherwise not get one)
         Mgr().SetLayout();
         // #i98686# if we have several views, all notes should update their text
-        mpFmtFld->Broadcast(SwFmtFldHint( 0, SwFmtFldHintWhich::CHANGED));
+        mpFormatField->Broadcast(SwFormatFieldHint( 0, SwFormatFieldHintWhich::CHANGED));
         DocView().GetDocShell()->SetModified();
     }
     Engine()->ClearModifyFlag();
@@ -149,7 +149,7 @@ void SwAnnotationWin::UpdateData()
 
 void SwAnnotationWin::Delete()
 {
-    if (DocView().GetWrtShellPtr()->GotoField(*mpFmtFld))
+    if (DocView().GetWrtShellPtr()->GotoField(*mpFormatField))
     {
         SwSidebarWin::Delete();
         // we delete the field directly, the Mgr cleans up the PostIt by listening
@@ -160,7 +160,7 @@ void SwAnnotationWin::Delete()
 
 void SwAnnotationWin::GotoPos()
 {
-    DocView().GetDocShell()->GetWrtShell()->GotoField(*mpFmtFld);
+    DocView().GetDocShell()->GetWrtShell()->GotoField(*mpFormatField);
 }
 
 sal_uInt32 SwAnnotationWin::MoveCaret()
@@ -175,39 +175,39 @@ sal_uInt32 SwAnnotationWin::MoveCaret()
 //returns true, if there is another note right before this note
 bool SwAnnotationWin::CalcFollow()
 {
-    SwTxtFld* pTxtFld = mpFmtFld->GetTxtFld();
-    SwPosition aPosition( pTxtFld->GetTxtNode() );
-    aPosition.nContent = pTxtFld->GetStart();
-    SwTxtAttr * const pTxtAttr =
-        pTxtFld->GetTxtNode().GetTxtAttrForCharAt(
+    SwTextField* pTextField = mpFormatField->GetTextField();
+    SwPosition aPosition( pTextField->GetTextNode() );
+    aPosition.nContent = pTextField->GetStart();
+    SwTextAttr * const pTextAttr =
+        pTextField->GetTextNode().GetTextAttrForCharAt(
             aPosition.nContent.GetIndex() - 1,
             RES_TXTATR_ANNOTATION );
-    const SwField* pFld = pTxtAttr ? pTxtAttr->GetFmtFld().GetField() : 0;
-    return pFld && (pFld->Which()== RES_POSTITFLD);
+    const SwField* pField = pTextAttr ? pTextAttr->GetFormatField().GetField() : 0;
+    return pField && (pField->Which()== RES_POSTITFLD);
 }
 
 // counts how many SwPostItField we have right after the current one
 sal_uInt32 SwAnnotationWin::CountFollowing()
 {
     sal_uInt32 aCount = 1;  // we start with 1, so we have to subtract one at the end again
-    SwTxtFld* pTxtFld = mpFmtFld->GetTxtFld();
-    SwPosition aPosition( pTxtFld->GetTxtNode() );
-    aPosition.nContent = pTxtFld->GetStart();
+    SwTextField* pTextField = mpFormatField->GetTextField();
+    SwPosition aPosition( pTextField->GetTextNode() );
+    aPosition.nContent = pTextField->GetStart();
 
-    SwTxtAttr * pTxtAttr = pTxtFld->GetTxtNode().GetTxtAttrForCharAt(
+    SwTextAttr * pTextAttr = pTextField->GetTextNode().GetTextAttrForCharAt(
                                         aPosition.nContent.GetIndex() + 1,
                                         RES_TXTATR_ANNOTATION );
-    SwField* pFld = pTxtAttr
-                    ? const_cast<SwField*>(pTxtAttr->GetFmtFld().GetField())
+    SwField* pField = pTextAttr
+                    ? const_cast<SwField*>(pTextAttr->GetFormatField().GetField())
                     : 0;
-    while ( pFld && ( pFld->Which()== RES_POSTITFLD ) )
+    while ( pField && ( pField->Which()== RES_POSTITFLD ) )
     {
         aCount++;
-        pTxtAttr = pTxtFld->GetTxtNode().GetTxtAttrForCharAt(
+        pTextAttr = pTextField->GetTextNode().GetTextAttrForCharAt(
                                         aPosition.nContent.GetIndex() + aCount,
                                         RES_TXTATR_ANNOTATION );
-        pFld = pTxtAttr
-               ? const_cast<SwField*>(pTxtAttr->GetFmtFld().GetField())
+        pField = pTextAttr
+               ? const_cast<SwField*>(pTextAttr->GetFormatField().GetField())
                : 0;
     }
     return aCount - 1;
@@ -267,17 +267,17 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
     boost::scoped_ptr<SwField> pOldField;
     if (rUndoRedo.DoesUndo())
     {
-        pOldField.reset(mpFld->Copy());
+        pOldField.reset(mpField->Copy());
     }
-    mpFld->SetPar2(Engine()->GetEditEngine().GetText());
-    mpFld->SetTextObject(Engine()->CreateParaObject());
+    mpField->SetPar2(Engine()->GetEditEngine().GetText());
+    mpField->SetTextObject(Engine()->CreateParaObject());
     if (rUndoRedo.DoesUndo())
     {
-        SwTxtFld *const pTxtFld = mpFmtFld->GetTxtFld();
-        SwPosition aPosition( pTxtFld->GetTxtNode() );
-        aPosition.nContent = pTxtFld->GetStart();
+        SwTextField *const pTextField = mpFormatField->GetTextField();
+        SwPosition aPosition( pTextField->GetTextNode() );
+        aPosition.nContent = pTextField->GetStart();
         rUndoRedo.AppendUndo(
-            new SwUndoFieldFromDoc(aPosition, *pOldField, *mpFld, 0, true));
+            new SwUndoFieldFromDoc(aPosition, *pOldField, *mpField, 0, true));
     }
     Engine()->SetModifyHdl( LINK( this, SwAnnotationWin, ModifyHdl ) );
     Engine()->ClearModifyFlag();
@@ -287,7 +287,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
 SvxLanguageItem SwAnnotationWin::GetLanguage()
 {
     // set initial language for outliner
-    SvtScriptType nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( mpFld->GetLanguage() );
+    SvtScriptType nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( mpField->GetLanguage() );
     sal_uInt16 nLangWhichId = 0;
     switch (nScriptType)
     {
@@ -296,29 +296,29 @@ SvxLanguageItem SwAnnotationWin::GetLanguage()
         case SvtScriptType::COMPLEX :  nLangWhichId = EE_CHAR_LANGUAGE_CTL; break;
         default: OSL_FAIL("GetLanguage: wrong script type");
     }
-    return SvxLanguageItem(mpFld->GetLanguage(),nLangWhichId);
+    return SvxLanguageItem(mpField->GetLanguage(),nLangWhichId);
 }
 
 bool SwAnnotationWin::IsProtected()
 {
     return SwSidebarWin::IsProtected() ||
            GetLayoutStatus() == SwPostItHelper::DELETED ||
-           ( mpFmtFld && mpFmtFld->IsProtect() );
+           ( mpFormatField && mpFormatField->IsProtect() );
 }
 
 OUString SwAnnotationWin::GetAuthor()
 {
-    return mpFld->GetPar1();
+    return mpField->GetPar1();
 }
 
 Date SwAnnotationWin::GetDate()
 {
-    return mpFld->GetDate();
+    return mpField->GetDate();
 }
 
 tools::Time SwAnnotationWin::GetTime()
 {
-    return mpFld->GetTime();
+    return mpField->GetTime();
 }
 
 } } // end of namespace sw::annotation
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 3b7f4046d8dd..548ae8849bba 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -394,16 +394,16 @@ bool SwHeaderFooterWin::IsEmptyHeaderFooter( )
     const SwPageDesc* pDesc = GetPageFrame()->GetPageDesc();
 
     bool const bFirst(GetPageFrame()->OnFirstPage());
-    const SwFrmFmt *const pFmt = (GetPageFrame()->OnRightPage())
-        ? pDesc->GetRightFmt(bFirst)
-        : pDesc->GetLeftFmt(bFirst);
+    const SwFrameFormat *const pFormat = (GetPageFrame()->OnRightPage())
+        ? pDesc->GetRightFormat(bFirst)
+        : pDesc->GetLeftFormat(bFirst);
 
-    if ( pFmt )
+    if ( pFormat )
     {
         if ( m_bIsHeader )
-            bResult = !pFmt->GetHeader().IsActive();
+            bResult = !pFormat->GetHeader().IsActive();
         else
-            bResult = !pFmt->GetFooter().IsActive();
+            bResult = !pFormat->GetFooter().IsActive();
     }
 
     return bResult;
@@ -426,24 +426,24 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot )
         case FN_HEADERFOOTER_BORDERBACK:
             {
                 const SwPageDesc* pDesc = GetPageFrame()->GetPageDesc();
-                const SwFrmFmt& rMaster = pDesc->GetMaster();
-                SwFrmFmt* pHFFmt = const_cast< SwFrmFmt* >( rMaster.GetFooter().GetFooterFmt() );
+                const SwFrameFormat& rMaster = pDesc->GetMaster();
+                SwFrameFormat* pHFFormat = const_cast< SwFrameFormat* >( rMaster.GetFooter().GetFooterFormat() );
                 if ( m_bIsHeader )
-                    pHFFmt = const_cast< SwFrmFmt* >( rMaster.GetHeader().GetHeaderFmt() );
+                    pHFFormat = const_cast< SwFrameFormat* >( rMaster.GetHeader().GetHeaderFormat() );
 
-                SfxItemPool* pPool = pHFFmt->GetAttrSet().GetPool();
+                SfxItemPool* pPool = pHFFormat->GetAttrSet().GetPool();
                 SfxItemSet aSet( *pPool,
                        RES_BACKGROUND, RES_BACKGROUND,
                        RES_BOX, RES_BOX,
                        SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
                        RES_SHADOW, RES_SHADOW, 0 );
 
-            aSet.Put( pHFFmt->GetAttrSet() );
+            aSet.Put( pHFFormat->GetAttrSet() );
 
             // Create a box info item... needed by the dialog
             SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
             const SfxPoolItem *pBoxInfo;
-            if ( SfxItemState::SET == pHFFmt->GetAttrSet().GetItemState( SID_ATTR_BORDER_INNER,
+            if ( SfxItemState::SET == pHFFormat->GetAttrSet().GetItemState( SID_ATTR_BORDER_INNER,
                                                     true, &pBoxInfo) )
                 aBoxInfo = *static_cast<const SvxBoxInfoItem*>(pBoxInfo);
 
@@ -458,17 +458,17 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot )
             {
                 const SfxPoolItem* pItem;
                 if ( SfxItemState::SET == aSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) {
-                    pHFFmt->SetFmtAttr( *pItem );
+                    pHFFormat->SetFormatAttr( *pItem );
                     rView.GetDocShell()->SetModified(true);
                 }
 
                 if ( SfxItemState::SET == aSet.GetItemState( RES_BOX, false, &pItem ) ) {
-                    pHFFmt->SetFmtAttr( *pItem );
+                    pHFFormat->SetFormatAttr( *pItem );
                     rView.GetDocShell()->SetModified(true);
                 }
 
                 if ( SfxItemState::SET == aSet.GetItemState( RES_SHADOW, false, &pItem ) ) {
-                    pHFFmt->SetFmtAttr( *pItem );
+                    pHFFormat->SetFormatAttr( *pItem );
                     rView.GetDocShell()->SetModified(true);
                 }
             }
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 680887173a69..879ebd42c122 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -242,8 +242,8 @@ void SwPageBreakWin::Select( )
                         rSh.Push( );
                         rSh.ClearMark();
 
-                        SwCntntFrm *pCnt = const_cast< SwCntntFrm* >( pBodyFrm->ContainsCntnt() );
-                        SwCntntNode* pNd = pCnt->GetNode();
+                        SwContentFrm *pCnt = const_cast< SwContentFrm* >( pBodyFrm->ContainsContent() );
+                        SwContentNode* pNd = pCnt->GetNode();
                         rSh.SetSelection( *pNd );
 
                         SfxStringItem aItem(pEditWin->GetView().GetPool().GetWhich(FN_FORMAT_TABLE_DLG), "textflow");
@@ -254,8 +254,8 @@ void SwPageBreakWin::Select( )
                     }
                     else
                     {
-                        SwCntntFrm *pCnt = const_cast< SwCntntFrm* >( pBodyFrm->ContainsCntnt() );
-                        SwCntntNode* pNd = pCnt->GetNode();
+                        SwContentFrm *pCnt = const_cast< SwContentFrm* >( pBodyFrm->ContainsContent() );
+                        SwContentNode* pNd = pCnt->GetNode();
 
                         SwPaM aPaM( *pNd );
                         SwPaMItem aPaMItem( pEditWin->GetView().GetPool( ).GetWhich( FN_PARAM_PAM ), &aPaM );
@@ -276,8 +276,8 @@ void SwPageBreakWin::Select( )
 
                 if ( pBodyFrm )
                 {
-                    SwCntntFrm *pCnt = const_cast< SwCntntFrm* >( pBodyFrm->ContainsCntnt() );
-                    SwCntntNode* pNd = pCnt->GetNode();
+                    SwContentFrm *pCnt = const_cast< SwContentFrm* >( pBodyFrm->ContainsContent() );
+                    SwContentNode* pNd = pCnt->GetNode();
 
                     pNd->GetDoc()->GetIDocumentUndoRedo( ).StartUndo( UNDO_UI_DELETE_PAGE_BREAK, NULL );
 
@@ -285,8 +285,8 @@ void SwPageBreakWin::Select( )
                             RES_PAGEDESC, RES_PAGEDESC,
                             RES_BREAK, RES_BREAK,
                             NULL );
-                    aSet.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
-                    aSet.Put( SwFmtPageDesc( NULL ) );
+                    aSet.Put( SvxFormatBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
+                    aSet.Put( SwFormatPageDesc( NULL ) );
 
                     SwPaM aPaM( *pNd );
                     pNd->GetDoc()->getIDocumentContentOperations().InsertItemSet( aPaM, aSet, SetAttrMode::DEFAULT );
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 90f02e258868..98a98964dbd9 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -158,7 +158,7 @@ SwPostItMgr::SwPostItMgr(SwView* pView)
     */
     // we want to receive stuff like SFX_HINT_DOCCHANGED
     StartListening(*mpView->GetDocShell());
-    if (!mvPostItFlds.empty())
+    if (!mvPostItFields.empty())
     {
         mbWaitingForCalcRects = true;
         mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl), 0 );
@@ -184,13 +184,13 @@ SwPostItMgr::~SwPostItMgr()
 void SwPostItMgr::CheckForRemovedPostIts()
 {
     bool bRemoved = false;
-    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end(); )
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end(); )
     {
         std::list<SwSidebarItem*>::iterator it = i++;
         if ( !(*it)->UseElement() )
         {
             SwSidebarItem* p = (*it);
-            mvPostItFlds.remove(*it);
+            mvPostItFields.remove(*it);
             if (GetActiveSidebarWin() == p->pPostIt)
                 SetActiveSidebarWin(0);
             p->pPostIt.disposeAndClear();
@@ -203,7 +203,7 @@ void SwPostItMgr::CheckForRemovedPostIts()
     {
         // make sure that no deleted items remain in page lists
         // todo: only remove deleted ones?!
-        if ( mvPostItFlds.empty() )
+        if ( mvPostItFields.empty() )
         {
             PreparePageContainer();
             PrepareView();
@@ -219,23 +219,23 @@ void SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExistance, bool b
 {
     if (bCheckExistance)
     {
-        for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+        for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
         {
             if ( (*i)->GetBroadCaster() == pItem )
                 return;
         }
     }
     mbLayout = bFocus;
-    if (pItem->ISA(SwFmtFld))
-        mvPostItFlds.push_back(new SwAnnotationItem(static_cast<SwFmtFld&>(*pItem), true, bFocus) );
-    OSL_ENSURE(pItem->ISA(SwFmtFld),"Mgr::InsertItem: seems like new stuff was added");
+    if (pItem->ISA(SwFormatField))
+        mvPostItFields.push_back(new SwAnnotationItem(static_cast<SwFormatField&>(*pItem), true, bFocus) );
+    OSL_ENSURE(pItem->ISA(SwFormatField),"Mgr::InsertItem: seems like new stuff was added");
     StartListening(*pItem);
 }
 
 void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast )
 {
     EndListening(*pBroadcast);
-    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
     {
         if ( (*i)->GetBroadCaster() == pBroadcast )
         {
@@ -243,7 +243,7 @@ void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast )
             if (GetActiveSidebarWin() == p->pPostIt)
                 SetActiveSidebarWin(0);
             p->pPostIt.disposeAndClear();
-            mvPostItFlds.erase(i);
+            mvPostItFields.erase(i);
             delete p;
             break;
         }
@@ -259,7 +259,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         sal_uInt32 nId = static_cast<const SfxEventHint&>(rHint).GetEventId();
         if ( nId == SW_EVENT_LAYOUT_FINISHED )
         {
-            if ( !mbWaitingForCalcRects && !mvPostItFlds.empty())
+            if ( !mbWaitingForCalcRects && !mvPostItFields.empty())
             {
                 mbWaitingForCalcRects = true;
                 mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl), 0 );
@@ -285,7 +285,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             {
                 if ( mpView->GetDocShell() == &rBC )
                 {
-                    if ( !mbWaitingForCalcRects && !mvPostItFlds.empty())
+                    if ( !mbWaitingForCalcRects && !mvPostItFields.empty())
                     {
                         mbWaitingForCalcRects = true;
                         mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl), 0 );
@@ -304,32 +304,32 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 if ( mpView->GetDocShell() != &rBC )
                 {
                     // field to be removed is the broadcaster
-                    OSL_FAIL("Notification for removed SwFmtFld was not sent!");
+                    OSL_FAIL("Notification for removed SwFormatField was not sent!");
                     RemoveItem(&rBC);
                 }
                 break;
             }
         }
     }
-    else if ( dynamic_cast<const SwFmtFldHint*>(&rHint) )
+    else if ( dynamic_cast<const SwFormatFieldHint*>(&rHint) )
     {
-        const SwFmtFldHint& rFmtHint = static_cast<const SwFmtFldHint&>(rHint);
-        SwFmtFld* pFld = const_cast <SwFmtFld*>( rFmtHint.GetField() );
-        switch ( rFmtHint.Which() )
+        const SwFormatFieldHint& rFormatHint = static_cast<const SwFormatFieldHint&>(rHint);
+        SwFormatField* pField = const_cast <SwFormatField*>( rFormatHint.GetField() );
+        switch ( rFormatHint.Which() )
         {
-            case SwFmtFldHintWhich::INSERTED :
+            case SwFormatFieldHintWhich::INSERTED :
             {
-                if (!pFld)
+                if (!pField)
                 {
                     AddPostIts(true);
                     break;
                 }
                 // get field to be inserted from hint
-                if ( pFld->IsFldInDoc() )
+                if ( pField->IsFieldInDoc() )
                 {
                     bool bEmpty = !HasNotes();
-                    InsertItem( pFld, true, false );
-                    if (bEmpty && !mvPostItFlds.empty())
+                    InsertItem( pField, true, false );
+                    if (bEmpty && !mvPostItFields.empty())
                         PrepareView(true);
                 }
                 else
@@ -338,31 +338,31 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 }
                 break;
             }
-            case SwFmtFldHintWhich::REMOVED:
+            case SwFormatFieldHintWhich::REMOVED:
             {
                 if (mbDeleteNote)
                 {
-                    if (!pFld)
+                    if (!pField)
                     {
                         CheckForRemovedPostIts();
                         break;
                     }
-                    RemoveItem(pFld);
+                    RemoveItem(pField);
                 }
                 break;
             }
-            case SwFmtFldHintWhich::FOCUS:
+            case SwFormatFieldHintWhich::FOCUS:
             {
-                if (rFmtHint.GetView()== mpView)
+                if (rFormatHint.GetView()== mpView)
                     Focus(rBC);
                 break;
             }
-            case SwFmtFldHintWhich::CHANGED:
+            case SwFormatFieldHintWhich::CHANGED:
             {
-                        SwFmtFld* pFmtFld = dynamic_cast<SwFmtFld*>(&rBC);
-                for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+                        SwFormatField* pFormatField = dynamic_cast<SwFormatField*>(&rBC);
+                for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
                 {
-                    if ( pFmtFld == (*i)->GetBroadCaster() )
+                    if ( pFormatField == (*i)->GetBroadCaster() )
                     {
                         if ((*i)->pPostIt)
                         {
@@ -375,16 +375,16 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 break;
             }
 
-            case SwFmtFldHintWhich::LANGUAGE:
+            case SwFormatFieldHintWhich::LANGUAGE:
             {
-                SwFmtFld* pFmtFld = dynamic_cast<SwFmtFld*>(&rBC);
-                for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+                SwFormatField* pFormatField = dynamic_cast<SwFormatField*>(&rBC);
+                for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
                 {
-                    if ( pFmtFld == (*i)->GetBroadCaster() )
+                    if ( pFormatField == (*i)->GetBroadCaster() )
                     {
                         if ((*i)->pPostIt)
                         {
-                            const SvtScriptType nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( (*i)->GetFmtFld().GetField()->GetLanguage() );
+                            const SvtScriptType nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( (*i)->GetFormatField().GetField()->GetLanguage() );
                             sal_uInt16 nLangWhichId = 0;
                             switch (nScriptType)
                             {
@@ -395,7 +395,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                             }
                             (*i)->pPostIt->SetLanguage(
                                 SvxLanguageItem(
-                                (*i)->GetFmtFld().GetField()->GetLanguage(),
+                                (*i)->GetFormatField().GetField()->GetLanguage(),
                                 nLangWhichId) );
                         }
                         break;
@@ -415,7 +415,7 @@ void SwPostItMgr::Focus(SfxBroadcaster& rBC)
         mpView->ExecViewOptions(aRequest);
     }
 
-    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
     {
         // field to get the focus is the broadcaster
         if ( &rBC == (*i)->GetBroadCaster() )
@@ -447,9 +447,9 @@ bool SwPostItMgr::CalcRects()
     bool bChange = false;
     bool bRepair = false;
     PreparePageContainer();
-    if ( !mvPostItFlds.empty() )
+    if ( !mvPostItFields.empty() )
     {
-        for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+        for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
         {
             SwSidebarItem* pItem = (*i);
             if ( !pItem->UseElement() )
@@ -465,10 +465,10 @@ bool SwPostItMgr::CalcRects()
             const sal_Int32 nOldStartContent( pItem->maLayoutInfo.mnStartContent );
             {
                 // update layout information
-                const SwTxtAnnotationFld* pTxtAnnotationFld =
-                    dynamic_cast< const SwTxtAnnotationFld* >( pItem->GetFmtFld().GetTxtFld() );
+                const SwTextAnnotationField* pTextAnnotationField =
+                    dynamic_cast< const SwTextAnnotationField* >( pItem->GetFormatField().GetTextField() );
                 const ::sw::mark::IMark* pAnnotationMark =
-                    pTxtAnnotationFld != NULL ? pTxtAnnotationFld->GetAnnotationMark() : NULL;
+                    pTextAnnotationField != NULL ? pTextAnnotationField->GetAnnotationMark() : NULL;
                 if ( pAnnotationMark != NULL )
                 {
                     pItem->mLayoutStatus =
@@ -495,7 +495,7 @@ bool SwPostItMgr::CalcRects()
         Sort();
 
         // sort the items into the right page vector, so layout can be done by page
-        for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+        for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
         {
             SwSidebarItem* pItem = (*i);
             if( SwPostItHelper::INVISIBLE == pItem->mLayoutStatus )
@@ -553,7 +553,7 @@ bool SwPostItMgr::CalcRects()
 
 bool SwPostItMgr::HasScrollbars() const
 {
-    for(std::list<SwSidebarItem*>::const_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(std::list<SwSidebarItem*>::const_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
     {
         if ((*i)->bShow && (*i)->pPostIt && (*i)->pPostIt->HasScrollbar())
             return true;
@@ -584,7 +584,7 @@ void SwPostItMgr::PreparePageContainer()
     for(std::vector<SwPostItPageItem*>::iterator i = mPages.begin(); i != mPages.end() ; ++i)
     {
         (*i)->mList->clear();
-        if (mvPostItFlds.empty())
+        if (mvPostItFields.empty())
             (*i)->bScrollbar = false;
 
     }
@@ -592,7 +592,7 @@ void SwPostItMgr::PreparePageContainer()
 
 void SwPostItMgr::LayoutPostIts()
 {
-    if ( !mvPostItFlds.empty() && !mbWaitingForCalcRects )
+    if ( !mvPostItFields.empty() && !mbWaitingForCalcRects )
     {
         mbLayouting = true;
 
@@ -776,7 +776,7 @@ void SwPostItMgr::LayoutPostIts()
         if (!ShowNotes())
         {       // we do not want to see the notes anymore -> Options-Writer-View-Notes
             bool bRepair = false;
-            for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+            for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
             {
                 SwSidebarItem* pItem = (*i);
                 if ( !pItem->UseElement() )
@@ -1151,55 +1151,55 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList, con
 
 void SwPostItMgr::AddPostIts(bool bCheckExistance, bool bFocus)
 {
-    bool bEmpty = mvPostItFlds.empty();
-    SwFieldType* pType = mpView->GetDocShell()->GetDoc()->getIDocumentFieldsAccess().GetFldType(RES_POSTITFLD, OUString(),false);
-    SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-    SwFmtFld* pSwFmtFld = aIter.First();
-    while(pSwFmtFld)
+    bool bEmpty = mvPostItFields.empty();
+    SwFieldType* pType = mpView->GetDocShell()->GetDoc()->getIDocumentFieldsAccess().GetFieldType(RES_POSTITFLD, OUString(),false);
+    SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+    SwFormatField* pSwFormatField = aIter.First();
+    while(pSwFormatField)
     {
-        if ( pSwFmtFld->GetTxtFld())
+        if ( pSwFormatField->GetTextField())
         {
-            if ( pSwFmtFld->IsFldInDoc() )
-                InsertItem(pSwFmtFld,bCheckExistance,bFocus);
+            if ( pSwFormatField->IsFieldInDoc() )
+                InsertItem(pSwFormatField,bCheckExistance,bFocus);
         }
-        pSwFmtFld = aIter.Next();
+        pSwFormatField = aIter.Next();
     }
 
     // if we just added the first one we have to update the view for centering
-    if (bEmpty && !mvPostItFlds.empty())
+    if (bEmpty && !mvPostItFields.empty())
         PrepareView(true);
 }
 
 void SwPostItMgr::RemoveSidebarWin()
 {
-    if (!mvPostItFlds.empty())
+    if (!mvPostItFields.empty())
     {
-        for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+        for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
         {
             EndListening( *(const_cast<SfxBroadcaster*>((*i)->GetBroadCaster())) );
             (*i)->pPostIt.disposeAndClear();
             delete (*i);
         }
-        mvPostItFlds.clear();
+        mvPostItFields.clear();
     }
 
     // all postits removed, no items should be left in pages
     PreparePageContainer();
 }
 
-class FilterFunctor : public std::unary_function<const SwFmtFld*, bool>
+class FilterFunctor : public std::unary_function<const SwFormatField*, bool>
 {
 public:
-    virtual bool operator()(const SwFmtFld* pFld) const = 0;
+    virtual bool operator()(const SwFormatField* pField) const = 0;
     virtual ~FilterFunctor() {}
 };
 
 class IsPostitField : public FilterFunctor
 {
 public:
-    bool operator()(const SwFmtFld* pFld) const SAL_OVERRIDE
+    bool operator()(const SwFormatField* pField) const SAL_OVERRIDE
     {
-        return pFld->GetField()->GetTyp()->Which() == RES_POSTITFLD;
+        return pField->GetField()->GetTyp()->Which() == RES_POSTITFLD;
     }
 };
 
@@ -1211,11 +1211,11 @@ public:
         : m_sAuthor(rAuthor)
     {
     }
-    bool operator()(const SwFmtFld* pFld) const SAL_OVERRIDE
+    bool operator()(const SwFormatField* pField) const SAL_OVERRIDE
     {
-        if (pFld->GetField()->GetTyp()->Which() != RES_POSTITFLD)
+        if (pField->GetField()->GetTyp()->Which() != RES_POSTITFLD)
             return false;
-        return static_cast<const SwPostItField*>(pFld->GetField())->GetPar1() == m_sAuthor;
+        return static_cast<const SwPostItField*>(pField->GetField())->GetPar1() == m_sAuthor;
     }
 };
 
@@ -1224,40 +1224,40 @@ public:
 //and automatically adding entries if they appear in the document and match the
 //functor.
 //
-//This will completely refill in the case of a "anonymous" NULL pFld stating
+//This will completely refill in the case of a "anonymous" NULL pField stating
 //rather unhelpfully that "something changed" so you may process the same
 //Fields more than once.
 class FieldDocWatchingStack : public SfxListener
 {
     std::list<SwSidebarItem*>& l;
-    std::vector<const SwFmtFld*> v;
+    std::vector<const SwFormatField*> v;
     SwDocShell& m_rDocShell;
     FilterFunctor& m_rFilter;
 
     virtual void Notify(SfxBroadcaster&, const SfxHint& rHint) SAL_OVERRIDE
     {
-        const SwFmtFldHint* pHint = dynamic_cast<const SwFmtFldHint*>(&rHint);
+        const SwFormatFieldHint* pHint = dynamic_cast<const SwFormatFieldHint*>(&rHint);
         if (pHint)
         {
             bool bAllInvalidated = false;
-            if (pHint->Which() == SwFmtFldHintWhich::REMOVED)
+            if (pHint->Which() == SwFormatFieldHintWhich::REMOVED)
             {
-                const SwFmtFld* pFld = pHint->GetField();
-                bAllInvalidated = pFld == NULL;
-                if (!bAllInvalidated && m_rFilter(pFld))
+                const SwFormatField* pField = pHint->GetField();
+                bAllInvalidated = pField == NULL;
+                if (!bAllInvalidated && m_rFilter(pField))
                 {
-                    EndListening(const_cast<SwFmtFld&>(*pFld));
-                    v.erase(std::remove(v.begin(), v.end(), pFld), v.end());
+                    EndListening(const_cast<SwFormatField&>(*pField));
+                    v.erase(std::remove(v.begin(), v.end(), pField), v.end());
                 }
             }
-            else if (pHint->Which() == SwFmtFldHintWhich::INSERTED)
+            else if (pHint->Which() == SwFormatFieldHintWhich::INSERTED)
             {
-                const SwFmtFld* pFld = pHint->GetField();
-                bAllInvalidated = pFld == NULL;
-                if (!bAllInvalidated && m_rFilter(pFld))
+                const SwFormatField* pField = pHint->GetField();
+                bAllInvalidated = pField == NULL;
+                if (!bAllInvalidated && m_rFilter(pField))
                 {
-                    StartListening(const_cast<SwFmtFld&>(*pFld));
-                    v.push_back(pFld);
+                    StartListening(const_cast<SwFormatField&>(*pField));
+                    v.push_back(pField);
                 }
             }
 
@@ -1285,19 +1285,19 @@ public:
         for(std::list<SwSidebarItem*>::iterator aI = l.begin(); aI != l.end(); ++aI)
         {
             SwSidebarItem* p = *aI;
-            const SwFmtFld& rFld = p->GetFmtFld();
-            if (!m_rFilter(&rFld))
+            const SwFormatField& rField = p->GetFormatField();
+            if (!m_rFilter(&rField))
                 continue;
-            StartListening(const_cast<SwFmtFld&>(rFld));
-            v.push_back(&rFld);
+            StartListening(const_cast<SwFormatField&>(rField));
+            v.push_back(&rField);
         }
     }
     void EndListeningToAllFields()
     {
-        for(std::vector<const SwFmtFld*>::iterator aI = v.begin(); aI != v.end(); ++aI)
+        for(std::vector<const SwFormatField*>::iterator aI = v.begin(); aI != v.end(); ++aI)
         {
-            const SwFmtFld* pFld = *aI;
-            EndListening(const_cast<SwFmtFld&>(*pFld));
+            const SwFormatField* pField = *aI;
+            EndListening(const_cast<SwFormatField&>(*pField));
         }
     }
     virtual ~FieldDocWatchingStack()
@@ -1305,18 +1305,18 @@ public:
         EndListeningToAllFields();
         EndListening(m_rDocShell);
     }
-    const SwFmtFld* pop()
+    const SwFormatField* pop()
     {
         if (v.empty())
             return NULL;
-        const SwFmtFld* p = v.back();
-        EndListening(const_cast<SwFmtFld&>(*p));
+        const SwFormatField* p = v.back();
+        EndListening(const_cast<SwFormatField&>(*p));
         v.pop_back();
         return p;
     }
 };
 
-// copy to new vector, otherwise RemoveItem would operate and delete stuff on mvPostItFlds as well
+// copy to new vector, otherwise RemoveItem would operate and delete stuff on mvPostItFields as well
 // RemoveItem will clean up the core field and visible postit if necessary
 // we cannot just delete everything as before, as postits could move into change tracking
 void SwPostItMgr::Delete(const OUString& rAuthor)
@@ -1331,10 +1331,10 @@ void SwPostItMgr::Delete(const OUString& rAuthor)
     mpWrtShell->StartUndo( UNDO_DELETE, &aRewriter );
 
     IsPostitFieldWithAuthorOf aFilter(rAuthor);
-    FieldDocWatchingStack aStack(mvPostItFlds, *mpView->GetDocShell(), aFilter);
-    while (const SwFmtFld* pFld = aStack.pop())
+    FieldDocWatchingStack aStack(mvPostItFields, *mpView->GetDocShell(), aFilter);
+    while (const SwFormatField* pField = aStack.pop())
     {
-        if (mpWrtShell->GotoField(*pFld))
+        if (mpWrtShell->GotoField(*pField))
             mpWrtShell->DelRight();
     }
     mpWrtShell->EndUndo();
@@ -1354,11 +1354,11 @@ void SwPostItMgr::Delete()
     mpWrtShell->StartUndo( UNDO_DELETE, &aRewriter );
 
     IsPostitField aFilter;
-    FieldDocWatchingStack aStack(mvPostItFlds, *mpView->GetDocShell(),
+    FieldDocWatchingStack aStack(mvPostItFields, *mpView->GetDocShell(),
         aFilter);
-    while (const SwFmtFld* pFld = aStack.pop())
+    while (const SwFormatField* pField = aStack.pop())
     {
-        if (mpWrtShell->GotoField(*pFld))
+        if (mpWrtShell->GotoField(*pField))
             mpWrtShell->DelRight();
     }
 
@@ -1372,13 +1372,13 @@ void SwPostItMgr::Delete()
 
 void SwPostItMgr::ExecuteFormatAllDialog(SwView& rView)
 {
-    if (mvPostItFlds.empty())
+    if (mvPostItFields.empty())
         return;
     sw::sidebarwindows::SwSidebarWin *pOrigActiveWin = GetActiveSidebarWin();
     sw::sidebarwindows::SwSidebarWin *pWin = pOrigActiveWin;
     if (!pWin)
     {
-        for (SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end(); ++i)
+        for (SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end(); ++i)
         {
             pWin = (*i)->pPostIt;
             if (pWin)
@@ -1412,7 +1412,7 @@ void SwPostItMgr::FormatAll(const SfxItemSet &rNewAttr)
     aRewriter.AddRule(UndoArg1, SW_RES(STR_FORMAT_ALL_NOTES) );
     mpWrtShell->StartUndo( UNDO_INSATTR, &aRewriter );
 
-    for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
     {
         if (!(*i)->pPostIt)
             continue;
@@ -1443,7 +1443,7 @@ void SwPostItMgr::FormatAll(const SfxItemSet &rNewAttr)
 
 void SwPostItMgr::Hide( const OUString& rAuthor )
 {
-    for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
     {
         if ( (*i)->pPostIt && ((*i)->pPostIt->GetAuthor() == rAuthor) )
         {
@@ -1457,7 +1457,7 @@ void SwPostItMgr::Hide( const OUString& rAuthor )
 
 void SwPostItMgr::Hide()
 {
-    for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
     {
         (*i)->bShow = false;
         (*i)->pPostIt->HideNote();
@@ -1466,7 +1466,7 @@ void SwPostItMgr::Hide()
 
 void SwPostItMgr::Show()
 {
-    for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
     {
         (*i)->bShow = true;
     }
@@ -1475,15 +1475,15 @@ void SwPostItMgr::Show()
 
 void SwPostItMgr::Sort()
 {
-    if (mvPostItFlds.size()>1 )
+    if (mvPostItFields.size()>1 )
     {
-        mvPostItFlds.sort(comp_pos);
+        mvPostItFields.sort(comp_pos);
     }
 }
 
 SwSidebarWin* SwPostItMgr::GetSidebarWin( const SfxBroadcaster* pBroadcaster) const
 {
-    for(const_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(const_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
     {
         if ( (*i)->GetBroadCaster() == pBroadcaster)
             return (*i)->pPostIt;
@@ -1491,11 +1491,11 @@ SwSidebarWin* SwPostItMgr::GetSidebarWin( const SfxBroadcaster* pBroadcaster) co
     return NULL;
 }
 
-sw::annotation::SwAnnotationWin* SwPostItMgr::GetAnnotationWin(const SwPostItField* pFld) const
+sw::annotation::SwAnnotationWin* SwPostItMgr::GetAnnotationWin(const SwPostItField* pField) const
 {
-    for(const_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(const_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
     {
-        if ( (*i)->GetFmtFld().GetField() == pFld )
+        if ( (*i)->GetFormatField().GetField() == pField )
             return dynamic_cast<sw::annotation::SwAnnotationWin*>((*i)->pPostIt.get());
     }
     return NULL;
@@ -1504,16 +1504,16 @@ sw::annotation::SwAnnotationWin* SwPostItMgr::GetAnnotationWin(const SwPostItFie
 SwSidebarWin* SwPostItMgr::GetNextPostIt( sal_uInt16 aDirection,
                                           SwSidebarWin* aPostIt )
 {
-    if (mvPostItFlds.size()>1)
+    if (mvPostItFields.size()>1)
     {
-        for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+        for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
         {
             if ( (*i)->pPostIt == aPostIt)
             {
                 SwSidebarItem_iterator iNextPostIt  = i;
                 if (aDirection == KEY_PAGEUP)
                 {
-                    if ( iNextPostIt == mvPostItFlds.begin() )
+                    if ( iNextPostIt == mvPostItFields.begin() )
                     {
                         return NULL;
                     }
@@ -1522,7 +1522,7 @@ SwSidebarWin* SwPostItMgr::GetNextPostIt( sal_uInt16 aDirection,
                 else
                 {
                     ++iNextPostIt;
-                    if ( iNextPostIt == mvPostItFlds.end() )
+                    if ( iNextPostIt == mvPostItFields.end() )
                     {
                         return NULL;
                     }
@@ -1570,28 +1570,28 @@ long SwPostItMgr::GetNextBorder()
     return -1;
 }
 
-void SwPostItMgr::SetShadowState(const SwPostItField* pFld,bool bCursor)
+void SwPostItMgr::SetShadowState(const SwPostItField* pField,bool bCursor)
 {
-    if (pFld)
+    if (pField)
     {
-        if (pFld !=mShadowState.mpShadowFld)
+        if (pField !=mShadowState.mpShadowField)
         {
-            if (mShadowState.mpShadowFld)
+            if (mShadowState.mpShadowField)
             {
                 // reset old one if still alive
                 // TODO: does not work properly if mouse and cursor was set
                 sw::annotation::SwAnnotationWin* pOldPostIt =
-                                    GetAnnotationWin(mShadowState.mpShadowFld);
+                                    GetAnnotationWin(mShadowState.mpShadowField);
                 if (pOldPostIt && pOldPostIt->Shadow() && (pOldPostIt->Shadow()->GetShadowState() != SS_EDIT))
                     pOldPostIt->SetViewState(ViewState::NORMAL);
             }
             //set new one, if it is not currently edited
-            sw::annotation::SwAnnotationWin* pNewPostIt = GetAnnotationWin(pFld);
+            sw::annotation::SwAnnotationWin* pNewPostIt = GetAnnotationWin(pField);
             if (pNewPostIt && pNewPostIt->Shadow() && (pNewPostIt->Shadow()->GetShadowState() != SS_EDIT))
             {
                 pNewPostIt->SetViewState(ViewState::VIEW);
                 //remember our new field
-                mShadowState.mpShadowFld = pFld;
+                mShadowState.mpShadowField = pField;
                 mShadowState.bCursor = false;
                 mShadowState.bMouse = false;
             }
@@ -1603,7 +1603,7 @@ void SwPostItMgr::SetShadowState(const SwPostItField* pFld,bool bCursor)
     }
     else
     {
-        if (mShadowState.mpShadowFld)
+        if (mShadowState.mpShadowField)
         {
             if (bCursor)
                 mShadowState.bCursor = false;
@@ -1612,11 +1612,11 @@ void SwPostItMgr::SetShadowState(const SwPostItField* pFld,bool bCursor)
             if (!mShadowState.bCursor && !mShadowState.bMouse)
             {
                 // reset old one if still alive
-                sw::annotation::SwAnnotationWin* pOldPostIt = GetAnnotationWin(mShadowState.mpShadowFld);
+                sw::annotation::SwAnnotationWin* pOldPostIt = GetAnnotationWin(mShadowState.mpShadowField);
                 if (pOldPostIt && pOldPostIt->Shadow() && (pOldPostIt->Shadow()->GetShadowState() != SS_EDIT))
                 {
                     pOldPostIt->SetViewState(ViewState::NORMAL);
-                    mShadowState.mpShadowFld = 0;
+                    mShadowState.mpShadowField = 0;
                 }
             }
         }
@@ -1728,12 +1728,12 @@ bool SwPostItMgr::ScrollbarHit(const unsigned long aPage,const Point &aPoint)
 
 void SwPostItMgr::CorrectPositions()
 {
-   if ( mbWaitingForCalcRects || mbLayouting || mvPostItFlds.empty() )
+   if ( mbWaitingForCalcRects || mbLayouting || mvPostItFields.empty() )
        return;
 
    // find first valid note
    SwSidebarWin *pFirstPostIt = 0;
-   for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+   for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
    {
        pFirstPostIt = (*i)->pPostIt;
        if (pFirstPostIt)
@@ -1782,7 +1782,7 @@ bool SwPostItMgr::ShowNotes() const
 
 bool SwPostItMgr::HasNotes() const
 {
-    return !mvPostItFlds.empty();
+    return !mvPostItFields.empty();
 }
 
 unsigned long SwPostItMgr::GetSidebarWidth(bool bPx) const
@@ -1864,7 +1864,7 @@ void SwPostItMgr::SetActiveSidebarWin( SwSidebarWin* p)
         if (pActive)
         {
             pActive->DeactivatePostIt();
-            mShadowState.mpShadowFld = 0;
+            mShadowState.mpShadowField = 0;
         }
         if (mpActivePostIt)
         {
@@ -1898,7 +1898,7 @@ IMPL_LINK_NOARG( SwPostItMgr, CalcHdl )
 
 void SwPostItMgr::Rescale()
 {
-    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
         if ( (*i)->pPostIt )
             (*i)->pPostIt->Rescale();
 }
@@ -1935,21 +1935,21 @@ sal_Int32 SwPostItMgr::GetSidebarScrollerHeight() const
 
 void SwPostItMgr::SetSpellChecking()
 {
-    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
         if ( (*i)->pPostIt )
             (*i)->pPostIt->SetSpellChecking();
 }
 
 void SwPostItMgr::SetReadOnlyState()
 {
-    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+    for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
         if ( (*i)->pPostIt )
             (*i)->pPostIt->SetReadonly( mbReadOnly );
 }
 
 void SwPostItMgr::CheckMetaText()
 {
-        for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
+        for(std::list<SwSidebarItem*>::iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
                 if ( (*i)->pPostIt )
                        (*i)->pPostIt->CheckMetaText();
 
@@ -1976,10 +1976,10 @@ sal_uInt16 SwPostItMgr::FinishSearchReplace(const ::com::sun::star::util::Search
     return aResult;
 }
 
-sal_uInt16 SwPostItMgr::SearchReplace(const SwFmtFld &pFld, const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bSrchForward)
+sal_uInt16 SwPostItMgr::SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bSrchForward)
 {
     sal_uInt16 aResult = 0;
-    SwSidebarWin* pWin = GetSidebarWin(&pFld);
+    SwSidebarWin* pWin = GetSidebarWin(&pField);
     if (pWin)
     {
         ESelection aOldSelection = pWin->GetOutlinerView()->GetSelection();
@@ -2079,7 +2079,7 @@ void SwPostItMgr::ToggleInsModeOnActiveSidebarWin()
 }
 
 void SwPostItMgr::ConnectSidebarWinToFrm( const SwFrm& rFrm,
-                                          const SwFmtFld& rFmtFld,
+                                          const SwFormatField& rFormatField,
                                           SwSidebarWin& rSidebarWin )
 {
     if ( mpFrmSidebarWinContainer == 0 )
@@ -2087,7 +2087,7 @@ void SwPostItMgr::ConnectSidebarWinToFrm( const SwFrm& rFrm,
         mpFrmSidebarWinContainer = new SwFrmSidebarWinContainer();
     }
 
-    const bool bInserted = mpFrmSidebarWinContainer->insert( rFrm, rFmtFld, rSidebarWin );
+    const bool bInserted = mpFrmSidebarWinContainer->insert( rFrm, rFormatField, rSidebarWin );
     if ( bInserted &&
          mpWrtShell->GetAccessibleMap() )
     {
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 4181df6259c6..6524ad61ed24 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -56,7 +56,7 @@
 
 namespace sw { namespace sidebarwindows {
 
-SidebarTxtControl::SidebarTxtControl( SwSidebarWin& rSidebarWin,
+SidebarTextControl::SidebarTextControl( SwSidebarWin& rSidebarWin,
                                       WinBits nBits,
                                       SwView& rDocView,
                                       SwPostItMgr& rPostItMgr )
@@ -68,23 +68,23 @@ SidebarTxtControl::SidebarTxtControl( SwSidebarWin& rSidebarWin,
     AddEventListener( LINK( &mrSidebarWin, SwSidebarWin, WindowEventListener ) );
 }
 
-SidebarTxtControl::~SidebarTxtControl()
+SidebarTextControl::~SidebarTextControl()
 {
     disposeOnce();
 }
 
-void SidebarTxtControl::dispose()
+void SidebarTextControl::dispose()
 {
     RemoveEventListener( LINK( &mrSidebarWin, SwSidebarWin, WindowEventListener ) );
     Control::dispose();
 }
 
-OutlinerView* SidebarTxtControl::GetTextView() const
+OutlinerView* SidebarTextControl::GetTextView() const
 {
     return mrSidebarWin.GetOutlinerView();
 }
 
-void SidebarTxtControl::GetFocus()
+void SidebarTextControl::GetFocus()
 {
     Window::GetFocus();
     if ( !mrSidebarWin.IsMouseOver() )
@@ -93,7 +93,7 @@ void SidebarTxtControl::GetFocus()
     }
 }
 
-void SidebarTxtControl::LoseFocus()
+void SidebarTextControl::LoseFocus()
 {
     // write the visible text back into the SwField
     mrSidebarWin.UpdateData();
@@ -105,7 +105,7 @@ void SidebarTxtControl::LoseFocus()
     }
 }
 
-void SidebarTxtControl::RequestHelp(const HelpEvent &rEvt)
+void SidebarTextControl::RequestHelp(const HelpEvent &rEvt)
 {
     sal_uInt16 nResId = 0;
     switch( mrSidebarWin.GetLayoutStatus() )
@@ -115,18 +115,18 @@ void SidebarTxtControl::RequestHelp(const HelpEvent &rEvt)
         default: nResId = 0;
     }
 
-    SwContentAtPos aCntntAtPos( SwContentAtPos::SW_REDLINE );
+    SwContentAtPos aContentAtPos( SwContentAtPos::SW_REDLINE );
     if ( nResId &&
-         mrDocView.GetWrtShell().GetContentAtPos( mrSidebarWin.GetAnchorPos(), aCntntAtPos ) )
+         mrDocView.GetWrtShell().GetContentAtPos( mrSidebarWin.GetAnchorPos(), aContentAtPos ) )
     {
-        OUString sTxt = SW_RESSTR( nResId ) + ": " +
-                        aCntntAtPos.aFnd.pRedl->GetAuthorString() + " - " +
-                        GetAppLangDateTimeString( aCntntAtPos.aFnd.pRedl->GetTimeStamp() );
-        Help::ShowQuickHelp( this,PixelToLogic(Rectangle(rEvt.GetMousePosPixel(),Size(50,10))),sTxt);
+        OUString sText = SW_RESSTR( nResId ) + ": " +
+                        aContentAtPos.aFnd.pRedl->GetAuthorString() + " - " +
+                        GetAppLangDateTimeString( aContentAtPos.aFnd.pRedl->GetTimeStamp() );
+        Help::ShowQuickHelp( this,PixelToLogic(Rectangle(rEvt.GetMousePosPixel(),Size(50,10))),sText);
     }
 }
 
-void SidebarTxtControl::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, sal_uLong)
+void SidebarTextControl::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, sal_uLong)
 {
     //Take the control's height, but overwrite the scrollbar area if there was one
     Size aSize(PixelToLogic(GetSizePixel()));
@@ -151,7 +151,7 @@ void SidebarTxtControl::Draw(OutputDevice* pDev, const Point& rPt, const Size& r
     }
 }
 
-void SidebarTxtControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void SidebarTextControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
 {
     if (!rRenderContext.GetSettings().GetStyleSettings().GetHighContrastMode())
     {
@@ -185,7 +185,7 @@ void SidebarTxtControl::Paint(vcl::RenderContext& rRenderContext, const Rectangl
     }
 }
 
-void SidebarTxtControl::KeyInput( const KeyEvent& rKeyEvt )
+void SidebarTextControl::KeyInput( const KeyEvent& rKeyEvt )
 {
     const vcl::KeyCode& rKeyCode = rKeyEvt.GetKeyCode();
     sal_uInt16 nKey = rKeyCode.GetCode();
@@ -247,7 +247,7 @@ void SidebarTxtControl::KeyInput( const KeyEvent& rKeyEvt )
     mrDocView.GetViewFrame()->GetBindings().InvalidateAll(false);
 }
 
-void SidebarTxtControl::MouseMove( const MouseEvent& rMEvt )
+void SidebarTextControl::MouseMove( const MouseEvent& rMEvt )
 {
     if ( GetTextView() )
     {
@@ -261,8 +261,8 @@ void SidebarTxtControl::MouseMove( const MouseEvent& rMEvt )
         const SvxFieldItem* pItem = aEV.GetFieldUnderMousePointer();
         if ( pItem )
         {
-            const SvxFieldData* pFld = pItem->GetField();
-            const SvxURLField* pURL = PTR_CAST( SvxURLField, pFld );
+            const SvxFieldData* pField = pItem->GetField();
+            const SvxURLField* pURL = PTR_CAST( SvxURLField, pField );
             if ( pURL )
             {
                 OUString sURL( pURL->GetURL() );
@@ -277,7 +277,7 @@ void SidebarTxtControl::MouseMove( const MouseEvent& rMEvt )
     }
 }
 
-void SidebarTxtControl::MouseButtonDown( const MouseEvent& rMEvt )
+void SidebarTextControl::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( GetTextView() )
     {
@@ -290,8 +290,8 @@ void SidebarTxtControl::MouseButtonDown( const MouseEvent& rMEvt )
             const SvxFieldItem* pItem = aEV.GetFieldUnderMousePointer();
             if ( pItem )
             {
-                const SvxFieldData* pFld = pItem->GetField();
-                const SvxURLField* pURL = PTR_CAST( SvxURLField, pFld );
+                const SvxFieldData* pField = pItem->GetField();
+                const SvxURLField* pURL = PTR_CAST( SvxURLField, pField );
                 if ( pURL )
                 {
                     GetTextView()->MouseButtonDown( rMEvt );
@@ -313,13 +313,13 @@ void SidebarTxtControl::MouseButtonDown( const MouseEvent& rMEvt )
     mrDocView.GetViewFrame()->GetBindings().InvalidateAll(false);
 }
 
-void SidebarTxtControl::MouseButtonUp( const MouseEvent& rMEvt )
+void SidebarTextControl::MouseButtonUp( const MouseEvent& rMEvt )
 {
     if ( GetTextView() )
         GetTextView()->MouseButtonUp( rMEvt );
 }
 
-IMPL_LINK( SidebarTxtControl, OnlineSpellCallback, SpellCallbackInfo*, pInfo )
+IMPL_LINK( SidebarTextControl, OnlineSpellCallback, SpellCallbackInfo*, pInfo )
 {
     if ( pInfo->nCommand == SpellCallbackCommand::STARTSPELLDLG )
     {
@@ -328,13 +328,13 @@ IMPL_LINK( SidebarTxtControl, OnlineSpellCallback, SpellCallbackInfo*, pInfo )
     return 0;
 }
 
-IMPL_LINK( SidebarTxtControl, Select, Menu*, pSelMenu )
+IMPL_LINK( SidebarTextControl, Select, Menu*, pSelMenu )
 {
     mrSidebarWin.ExecuteCommand( pSelMenu->GetCurItemId() );
     return 0;
 }
 
-void SidebarTxtControl::Command( const CommandEvent& rCEvt )
+void SidebarTextControl::Command( const CommandEvent& rCEvt )
 {
     if ( rCEvt.GetCommand() == CommandEventId::ContextMenu )
     {
@@ -342,13 +342,13 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
              GetTextView() &&
              GetTextView()->IsWrongSpelledWordAtPos( rCEvt.GetMousePosPixel(), true ))
         {
-            Link<> aLink = LINK(this, SidebarTxtControl, OnlineSpellCallback);
+            Link<> aLink = LINK(this, SidebarTextControl, OnlineSpellCallback);
             GetTextView()->ExecuteSpellPopup(rCEvt.GetMousePosPixel(),&aLink);
         }
         else
         {
             boost::scoped_ptr<SfxPopupMenuManager> pMgr(SfxDispatcher::Popup(0, this,&rCEvt.GetMousePosPixel()));
-            static_cast<PopupMenu*>(pMgr->GetSVMenu())->SetSelectHdl( LINK(this, SidebarTxtControl, Select) );
+            static_cast<PopupMenu*>(pMgr->GetSVMenu())->SetSelectHdl( LINK(this, SidebarTextControl, Select) );
 
             {
                 OUString aText = static_cast<PopupMenu*>(pMgr->GetSVMenu())->GetItemText( FN_DELETE_NOTE_AUTHOR );
@@ -402,14 +402,14 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
     }
 }
 
-OUString SidebarTxtControl::GetSurroundingText() const
+OUString SidebarTextControl::GetSurroundingText() const
 {
     if (GetTextView())
         return GetTextView()->GetSurroundingText();
     return OUString();
 }
 
-Selection SidebarTxtControl::GetSurroundingTextSelection() const
+Selection SidebarTextControl::GetSurroundingTextSelection() const
 {
     if( GetTextView() )
         return GetTextView()->GetSurroundingTextSelection();
@@ -417,10 +417,10 @@ Selection SidebarTxtControl::GetSurroundingTextSelection() const
         return Selection( 0, 0 );
 }
 
-css::uno::Reference< css::accessibility::XAccessible > SidebarTxtControl::CreateAccessible()
+css::uno::Reference< css::accessibility::XAccessible > SidebarTextControl::CreateAccessible()
 {
 
-    SidebarTxtControlAccessible* pAcc( new SidebarTxtControlAccessible( *this ) );
+    SidebarTextControlAccessible* pAcc( new SidebarTextControlAccessible( *this ) );
     css::uno::Reference< css::awt::XWindowPeer > xWinPeer( pAcc );
     SetWindowPeer( xWinPeer, pAcc );
 
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index a8e873e2736b..1a6d6677cd43 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -31,7 +31,7 @@ namespace sw { namespace sidebarwindows {
 
 class SwSidebarWin;
 
-class SidebarTxtControl : public Control
+class SidebarTextControl : public Control
 {
     private:
         SwSidebarWin& mrSidebarWin;
@@ -53,11 +53,11 @@ class SidebarTxtControl : public Control
         DECL_LINK( Select, Menu* );
 
     public:
-        SidebarTxtControl( SwSidebarWin& rSidebarWin,
+        SidebarTextControl( SwSidebarWin& rSidebarWin,
                            WinBits nBits,
                            SwView& rDocView,
                            SwPostItMgr& rPostItMgr );
-        virtual ~SidebarTxtControl();
+        virtual ~SidebarTextControl();
         virtual void dispose() SAL_OVERRIDE;
 
         virtual void GetFocus() SAL_OVERRIDE;
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index 75f6097e9c59..cbe437ec7b92 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -43,7 +43,7 @@ class SidebarTextEditSource : public SvxEditSource,
                               public SfxBroadcaster
 {
     public:
-        SidebarTextEditSource( SidebarTxtControl& rSidebarTxtControl );
+        SidebarTextEditSource( SidebarTextControl& rSidebarTextControl );
         virtual ~SidebarTextEditSource();
 
         virtual SvxEditSource* Clone() const SAL_OVERRIDE;
@@ -58,34 +58,34 @@ class SidebarTextEditSource : public SvxEditSource,
         DECL_LINK( NotifyHdl, EENotify* );
 
     private:
-        SidebarTxtControl& mrSidebarTxtControl;
+        SidebarTextControl& mrSidebarTextControl;
         SvxOutlinerForwarder mTextForwarder;
         SvxDrawOutlinerViewForwarder mViewForwarder;
 };
 
-SidebarTextEditSource::SidebarTextEditSource( SidebarTxtControl& rSidebarTxtControl )
+SidebarTextEditSource::SidebarTextEditSource( SidebarTextControl& rSidebarTextControl )
     : SvxEditSource()
-    , mrSidebarTxtControl( rSidebarTxtControl )
-    , mTextForwarder( *(rSidebarTxtControl.GetTextView()->GetOutliner()), false )
-    , mViewForwarder( *(rSidebarTxtControl.GetTextView()) )
+    , mrSidebarTextControl( rSidebarTextControl )
+    , mTextForwarder( *(rSidebarTextControl.GetTextView()->GetOutliner()), false )
+    , mViewForwarder( *(rSidebarTextControl.GetTextView()) )
 {
-    if ( mrSidebarTxtControl.GetTextView() )
+    if ( mrSidebarTextControl.GetTextView() )
     {
-        mrSidebarTxtControl.GetTextView()->GetOutliner()->SetNotifyHdl( LINK(this, SidebarTextEditSource, NotifyHdl) );
+        mrSidebarTextControl.GetTextView()->GetOutliner()->SetNotifyHdl( LINK(this, SidebarTextEditSource, NotifyHdl) );
     }
 }
 
 SidebarTextEditSource::~SidebarTextEditSource()
 {
-    if ( mrSidebarTxtControl.GetTextView() )
+    if ( mrSidebarTextControl.GetTextView() )
     {
-        mrSidebarTxtControl.GetTextView()->GetOutliner()->SetNotifyHdl( Link<>() );
+        mrSidebarTextControl.GetTextView()->GetOutliner()->SetNotifyHdl( Link<>() );
     }
 }
 
 SvxEditSource* SidebarTextEditSource::Clone() const
 {
-    return new SidebarTextEditSource( mrSidebarTxtControl );
+    return new SidebarTextEditSource( mrSidebarTextControl );
 }
 
 SvxTextForwarder* SidebarTextEditSource::GetTextForwarder()
@@ -128,12 +128,12 @@ IMPL_LINK(SidebarTextEditSource, NotifyHdl, EENotify*, pNotify)
     return 0;
 }
 
-// declaration and implementation of accessible context for <SidebarTxtControl> instance
-class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent
+// declaration and implementation of accessible context for <SidebarTextControl> instance
+class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent
 {
     public:
-        explicit SidebarTxtControlAccessibleContext( SidebarTxtControl& rSidebarTxtControl );
-        virtual ~SidebarTxtControlAccessibleContext();
+        explicit SidebarTextControlAccessibleContext( SidebarTextControl& rSidebarTextControl );
+        virtual ~SidebarTextControlAccessibleContext();
 
         virtual sal_Int32 SAL_CALL
                 getAccessibleChildCount()
@@ -157,7 +157,7 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent
         virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE;
 
     private:
-        SidebarTxtControl& mrSidebarTxtControl;
+        SidebarTextControl& mrSidebarTextControl;
         ::accessibility::AccessibleTextHelper* mpAccessibleTextHelper;
 
         ::osl::Mutex maMutex;
@@ -165,30 +165,30 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent
         void defunc();
 };
 
-SidebarTxtControlAccessibleContext::SidebarTxtControlAccessibleContext( SidebarTxtControl& rSidebarTxtControl )
-    : VCLXAccessibleComponent( rSidebarTxtControl.GetWindowPeer() )
-    , mrSidebarTxtControl( rSidebarTxtControl )
+SidebarTextControlAccessibleContext::SidebarTextControlAccessibleContext( SidebarTextControl& rSidebarTextControl )
+    : VCLXAccessibleComponent( rSidebarTextControl.GetWindowPeer() )
+    , mrSidebarTextControl( rSidebarTextControl )
     , mpAccessibleTextHelper( 0 )
     , maMutex()
 {
     ::std::unique_ptr<SvxEditSource> pEditSource(
-                        new SidebarTextEditSource( mrSidebarTxtControl ) );
+                        new SidebarTextEditSource( mrSidebarTextControl ) );
     mpAccessibleTextHelper = new ::accessibility::AccessibleTextHelper( std::move(pEditSource) );
-    mpAccessibleTextHelper->SetEventSource( mrSidebarTxtControl.GetWindowPeer() );
+    mpAccessibleTextHelper->SetEventSource( mrSidebarTextControl.GetWindowPeer() );
 }
 
-SidebarTxtControlAccessibleContext::~SidebarTxtControlAccessibleContext()
+SidebarTextControlAccessibleContext::~SidebarTextControlAccessibleContext()
 {
     defunc();
 }
 
-void SidebarTxtControlAccessibleContext::defunc()
+void SidebarTextControlAccessibleContext::defunc()
 {
     delete mpAccessibleTextHelper;
     mpAccessibleTextHelper = 0;
 }
 
-sal_Int32 SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChildCount()
+sal_Int32 SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChildCount()
     throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( maMutex );
@@ -203,7 +203,7 @@ sal_Int32 SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChildCount()
     return nChildCount;
 }
 
-css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChild( sal_Int32 i )
+css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChild( sal_Int32 i )
     throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( maMutex );
@@ -218,7 +218,7 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTxtContro
     return xChild;
 }
 
-void SAL_CALL SidebarTxtControlAccessibleContext::addAccessibleEventListener (
+void SAL_CALL SidebarTextControlAccessibleContext::addAccessibleEventListener (
     const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -230,7 +230,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::addAccessibleEventListener (
     }
 }
 
-void SAL_CALL SidebarTxtControlAccessibleContext::removeAccessibleEventListener (
+void SAL_CALL SidebarTextControlAccessibleContext::removeAccessibleEventListener (
     const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -242,7 +242,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::removeAccessibleEventListener
     }
 }
 
-void SidebarTxtControlAccessibleContext::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+void SidebarTextControlAccessibleContext::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
     if ( mpAccessibleTextHelper )
     {
@@ -271,22 +271,22 @@ void SidebarTxtControlAccessibleContext::ProcessWindowEvent( const VclWindowEven
     VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
 }
 
-// implementaion of accessible for <SidebarTxtControl> instance
-SidebarTxtControlAccessible::SidebarTxtControlAccessible( SidebarTxtControl& rSidebarTxtControl )
+// implementaion of accessible for <SidebarTextControl> instance
+SidebarTextControlAccessible::SidebarTextControlAccessible( SidebarTextControl& rSidebarTextControl )
     : VCLXWindow()
-    , mrSidebarTxtControl( rSidebarTxtControl )
+    , mrSidebarTextControl( rSidebarTextControl )
 {
-    SetWindow( &mrSidebarTxtControl );
+    SetWindow( &mrSidebarTextControl );
 }
 
-SidebarTxtControlAccessible::~SidebarTxtControlAccessible()
+SidebarTextControlAccessible::~SidebarTextControlAccessible()
 {
 }
 
-css::uno::Reference< css::accessibility::XAccessibleContext > SidebarTxtControlAccessible::CreateAccessibleContext()
+css::uno::Reference< css::accessibility::XAccessibleContext > SidebarTextControlAccessible::CreateAccessibleContext()
 {
-    SidebarTxtControlAccessibleContext* pAccContext(
-                        new SidebarTxtControlAccessibleContext( mrSidebarTxtControl ) );
+    SidebarTextControlAccessibleContext* pAccContext(
+                        new SidebarTextControlAccessibleContext( mrSidebarTextControl ) );
     css::uno::Reference< css::accessibility::XAccessibleContext > xAcc( pAccContext );
     return xAcc;
 }
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
index 38064ff247cf..f123aae842d3 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
@@ -24,19 +24,19 @@
 
 namespace sw { namespace sidebarwindows {
 
-class SidebarTxtControl;
+class SidebarTextControl;
 
-class SidebarTxtControlAccessible : public VCLXWindow
+class SidebarTextControlAccessible : public VCLXWindow
 {
     public:
-        explicit SidebarTxtControlAccessible( SidebarTxtControl& rSidebarTxtControl );
-        virtual ~SidebarTxtControlAccessible();
+        explicit SidebarTextControlAccessible( SidebarTextControl& rSidebarTextControl );
+        virtual ~SidebarTextControlAccessible();
 
         virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext >
                 CreateAccessibleContext() SAL_OVERRIDE;
 
     private:
-        SidebarTxtControl& mrSidebarTxtControl;
+        SidebarTextControl& mrSidebarTextControl;
 };
 
 } } // end of namespace sw::sidebarwindows
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index e48896e34c7d..c8fa94544303 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -101,7 +101,7 @@ SwSidebarWin::SwSidebarWin(SwEditWin& rEditWin,
     , mnEventId(0)
     , mpOutlinerView(0)
     , mpOutliner(0)
-    , mpSidebarTxtControl(0)
+    , mpSidebarTextControl(0)
     , mpVScrollbar(0)
     , mpMetadataAuthor(0)
     , mpMetadataDate(0)
@@ -131,7 +131,7 @@ SwSidebarWin::SwSidebarWin(SwEditWin& rEditWin,
     }
 
     mrMgr.ConnectSidebarWinToFrm( *(mrSidebarItem.maLayoutInfo.mpAnchorFrm),
-                                  mrSidebarItem.GetFmtFld(),
+                                  mrSidebarItem.GetFormatField(),
                                   *this );
 }
 
@@ -150,14 +150,14 @@ void SwSidebarWin::dispose()
 
     Disable();
 
-    if ( mpSidebarTxtControl )
+    if ( mpSidebarTextControl )
     {
         if ( mpOutlinerView )
         {
             mpOutlinerView->SetWindow( 0 );
         }
     }
-    mpSidebarTxtControl.disposeAndClear();
+    mpSidebarTextControl.disposeAndClear();
 
     if ( mpOutlinerView )
     {
@@ -267,7 +267,7 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, s
         mpMetadataDate->SetControlFont( aOrigFont );
     }
 
-    mpSidebarTxtControl->Draw(pDev, rPt, rSz, nInFlags);
+    mpSidebarTextControl->Draw(pDev, rPt, rSz, nInFlags);
 
     const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
     boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
@@ -352,10 +352,10 @@ void SwSidebarWin::InitControls()
     AddEventListener( LINK( this, SwSidebarWin, WindowEventListener ) );
 
     // actual window which holds the user text
-    mpSidebarTxtControl = VclPtr<SidebarTxtControl>::Create( *this,
+    mpSidebarTextControl = VclPtr<SidebarTextControl>::Create( *this,
                                                  WB_NODIALOGCONTROL,
                                                  mrView, mrMgr );
-    mpSidebarTxtControl->SetPointer(Pointer(POINTER_TEXT));
+    mpSidebarTextControl->SetPointer(Pointer(POINTER_TEXT));
 
     // window controls for author and date
     mpMetadataAuthor = VclPtr<Edit>::Create( this, 0 );
@@ -402,8 +402,8 @@ void SwSidebarWin::InitControls()
     mpOutliner->SetUpdateMode( true );
     Rescale();
 
-    mpSidebarTxtControl->EnableRTL( false );
-    mpOutlinerView = new OutlinerView ( mpOutliner, mpSidebarTxtControl );
+    mpSidebarTextControl->EnableRTL( false );
+    mpOutlinerView = new OutlinerView ( mpOutliner, mpSidebarTextControl );
     mpOutlinerView->SetBackgroundColor(COL_TRANSPARENT);
     mpOutliner->InsertView(mpOutlinerView );
     mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) );
@@ -446,7 +446,7 @@ void SwSidebarWin::InitControls()
     SetPostItText();
     Engine()->CompleteOnlineSpelling();
 
-    mpSidebarTxtControl->Show();
+    mpSidebarTextControl->Show();
     mpMetadataAuthor->Show();
     mpMetadataDate->Show();
     mpVScrollbar->Show();
@@ -504,7 +504,7 @@ void SwSidebarWin::Rescale()
     aMode.SetOrigin( Point() );
     mpOutliner->SetRefMapMode( aMode );
     SetMapMode( aMode );
-    mpSidebarTxtControl->SetMapMode( aMode );
+    mpSidebarTextControl->SetMapMode( aMode );
     if ( mpMetadataAuthor )
     {
         vcl::Font aFont( mpMetadataAuthor->GetSettings().GetStyleSettings().GetFieldFont() );
@@ -647,23 +647,23 @@ void SwSidebarWin::SetPosAndSize()
     {
         std::vector< basegfx::B2DRange > aAnnotationTextRanges;
         {
-            const SwTxtAnnotationFld* pTxtAnnotationFld =
-                dynamic_cast< const SwTxtAnnotationFld* >( mrSidebarItem.GetFmtFld().GetTxtFld() );
-            if ( pTxtAnnotationFld != NULL
-                 && pTxtAnnotationFld->GetpTxtNode() != NULL )
+            const SwTextAnnotationField* pTextAnnotationField =
+                dynamic_cast< const SwTextAnnotationField* >( mrSidebarItem.GetFormatField().GetTextField() );
+            if ( pTextAnnotationField != NULL
+                 && pTextAnnotationField->GetpTextNode() != NULL )
             {
-                SwTxtNode* pTxtNode = pTxtAnnotationFld->GetpTxtNode();
-                SwNodes& rNds = pTxtNode->GetDoc()->GetNodes();
-                SwCntntNode* const pCntntNd = rNds[mrSidebarItem.maLayoutInfo.mnStartNodeIdx]->GetCntntNode();
-                SwPosition aStartPos( *pCntntNd, mrSidebarItem.maLayoutInfo.mnStartContent );
+                SwTextNode* pTextNode = pTextAnnotationField->GetpTextNode();
+                SwNodes& rNds = pTextNode->GetDoc()->GetNodes();
+                SwContentNode* const pContentNd = rNds[mrSidebarItem.maLayoutInfo.mnStartNodeIdx]->GetContentNode();
+                SwPosition aStartPos( *pContentNd, mrSidebarItem.maLayoutInfo.mnStartContent );
                 SwShellCrsr* pTmpCrsr = NULL;
-                const bool bTableCrsrNeeded = pTxtNode->FindTableBoxStartNode() != pCntntNd->FindTableBoxStartNode();
+                const bool bTableCrsrNeeded = pTextNode->FindTableBoxStartNode() != pContentNd->FindTableBoxStartNode();
                 if ( bTableCrsrNeeded )
                 {
                     SwShellTableCrsr* pTableCrsr = new SwShellTableCrsr( DocView().GetWrtShell(), aStartPos );
                     pTableCrsr->SetMark();
-                    pTableCrsr->GetMark()->nNode = *pTxtNode;
-                    pTableCrsr->GetMark()->nContent.Assign( pTxtNode, pTxtAnnotationFld->GetStart()+1 );
+                    pTableCrsr->GetMark()->nNode = *pTextNode;
+                    pTableCrsr->GetMark()->nContent.Assign( pTextNode, pTextAnnotationField->GetStart()+1 );
                     pTableCrsr->NewTableSelection();
                     pTmpCrsr = pTableCrsr;
                 }
@@ -671,8 +671,8 @@ void SwSidebarWin::SetPosAndSize()
                 {
                     SwShellCrsr* pCrsr = new SwShellCrsr( DocView().GetWrtShell(), aStartPos );
                     pCrsr->SetMark();
-                    pCrsr->GetMark()->nNode = *pTxtNode;
-                    pCrsr->GetMark()->nContent.Assign( pTxtNode, pTxtAnnotationFld->GetStart()+1 );
+                    pCrsr->GetMark()->nNode = *pTextNode;
+                    pCrsr->GetMark()->nContent.Assign( pTextNode, pTextAnnotationField->GetStart()+1 );
                     pTmpCrsr = pCrsr;
                 }
                 ::boost::scoped_ptr<SwShellCrsr> pTmpCrsrForAnnotationTextRange( pTmpCrsr );
@@ -729,7 +729,7 @@ void SwSidebarWin::DoResize()
     aHeight -= GetMetaHeight();
     mpMetadataAuthor->Show();
     mpMetadataDate->Show();
-    mpSidebarTxtControl->SetQuickHelpText(OUString());
+    mpSidebarTextControl->SetQuickHelpText(OUString());
 
     if ((aTextHeight > aHeight) && !IsPreview())
     {   // we need vertical scrollbars and have to reduce the width
@@ -763,12 +763,12 @@ void SwSidebarWin::DoResize()
 
     if (!AllSettings::GetLayoutRTL())
     {
-        mpSidebarTxtControl->setPosSizePixel(0, 0, aWidth, aHeight);
+        mpSidebarTextControl->setPosSizePixel(0, 0, aWidth, aHeight);
         mpVScrollbar->setPosSizePixel( aWidth, 0, GetScrollbarWidth(), aHeight);
     }
     else
     {
-        mpSidebarTxtControl->setPosSizePixel( ( (aTextHeight > aHeight) && !IsPreview()
+        mpSidebarTextControl->setPosSizePixel( ( (aTextHeight > aHeight) && !IsPreview()
                                       ? GetScrollbarWidth() : 0 ) , 0,
                                       aWidth, aHeight);
         mpVScrollbar->setPosSizePixel( 0, 0, GetScrollbarWidth(), aHeight);
@@ -954,8 +954,8 @@ void SwSidebarWin::DataChanged( const DataChangedEvent& aEvent)
 
 void SwSidebarWin::GetFocus()
 {
-    if (mpSidebarTxtControl)
-        mpSidebarTxtControl->GrabFocus();
+    if (mpSidebarTextControl)
+        mpSidebarTextControl->GrabFocus();
 }
 
 void SwSidebarWin::LoseFocus()
@@ -1144,7 +1144,7 @@ IMPL_LINK( SwSidebarWin, WindowEventListener, VclSimpleEvent*, pEvent )
             }
         }
         else if ( pWinEvent->GetId() == VCLEVENT_WINDOW_ACTIVATE &&
-                  pWinEvent->GetWindow() == mpSidebarTxtControl )
+                  pWinEvent->GetWindow() == mpSidebarTextControl )
         {
             const bool bLockView = mrView.GetWrtShell().IsViewLocked();
             mrView.GetWrtShell().LockView( true );
@@ -1402,7 +1402,7 @@ void SwSidebarWin::ChangeSidebarItem( SwSidebarItem& rSidebarItem )
     if ( bAnchorChanged )
     {
         mrMgr.ConnectSidebarWinToFrm( *(mrSidebarItem.maLayoutInfo.mpAnchorFrm),
-                                      mrSidebarItem.GetFmtFld(),
+                                      mrSidebarItem.GetFormatField(),
                                       *this );
     }
 }
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index e0dd4aa90448..044d201ff4fe 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -248,7 +248,7 @@ SotExchangeDest SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject *
     const Point aDocPt( PixelToLogic( rPixPnt ) );
     if( rSh.ChgCurrPam( aDocPt )
         || rSh.IsOverReadOnlyPos( aDocPt )
-        || rSh.DocPtInsideInputFld( aDocPt ) )
+        || rSh.DocPtInsideInputField( aDocPt ) )
         return SotExchangeDest::NONE;
 
     SdrObject *pObj = NULL;
@@ -279,7 +279,7 @@ SotExchangeDest SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject *
         case OBJCNT_GRF:
             {
                 bool bLink,
-                    bIMap = 0 != rSh.GetFmtFromObj( aDocPt )->GetURL().GetMap();
+                    bIMap = 0 != rSh.GetFormatFromObj( aDocPt )->GetURL().GetMap();
                 OUString aDummy;
                 rSh.GetGrfAtPos( aDocPt, aDummy, bLink );
                 if ( bLink && bIMap )
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index c88a0f858f3e..b6a7f4079634 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -263,14 +263,14 @@ struct QuickHelpData
     /// Help string is currently displayed.
     bool m_bIsDisplayed;
 
-    QuickHelpData() { ClearCntnt(); }
+    QuickHelpData() { ClearContent(); }
 
     void Move( QuickHelpData& rCpy );
-    void ClearCntnt();
+    void ClearContent();
     void Start( SwWrtShell& rSh, sal_uInt16 nWrdLen );
     void Stop( SwWrtShell& rSh );
 
-    bool HasCntnt() const { return !m_aHelpStrings.empty() && 0 != nLen; }
+    bool HasContent() const { return !m_aHelpStrings.empty() && 0 != nLen; }
 
     /// Next help string.
     void Next( bool bEndLess )
@@ -345,7 +345,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
         {
             SwRect aRect;
             SwRect* pRect = &aRect;
-            const SwFrmFmt* pFmt = 0;
+            const SwFrameFormat* pFormat = 0;
 
             bool bFrameIsValidTarget = false;
             if( m_pApplyTempl->m_pFormatClipboard )
@@ -354,8 +354,8 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
                 bFrameIsValidTarget = ( m_pApplyTempl->eType == SFX_STYLE_FAMILY_FRAME );
 
             if( bFrameIsValidTarget &&
-                        0 !=(pFmt = rSh.GetFmtFromObj( rLPt, &pRect )) &&
-                        PTR_CAST(SwFlyFrmFmt, pFmt))
+                        0 !=(pFormat = rSh.GetFormatFromObj( rLPt, &pRect )) &&
+                        PTR_CAST(SwFlyFrameFormat, pFormat))
             {
                 //turn on highlight for frame
                 Rectangle aTmp( pRect->SVRect() );
@@ -385,7 +385,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
     if ( IsChainMode() )
     {
         SwRect aRect;
-        SwChainRet nChainable = rSh.Chainable( aRect, *rSh.GetFlyFrmFmt(), rLPt );
+        SwChainRet nChainable = rSh.Chainable( aRect, *rSh.GetFlyFrameFormat(), rLPt );
         PointerStyle eStyle = nChainable != SwChainRet::OK
                 ? POINTER_CHAIN_NOTALLOWED : POINTER_CHAIN;
         if ( nChainable == SwChainRet::OK )
@@ -559,23 +559,23 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
                 if( rSh.GetContentAtPos( rLPt, aSwContentAtPos) )
                 {
                     // Is edit inline input field
-                    if (SwContentAtPos::SW_FIELD == aSwContentAtPos.eCntntAtPos)
+                    if (SwContentAtPos::SW_FIELD == aSwContentAtPos.eContentAtPos)
                     {
-                        if ( aSwContentAtPos.pFndTxtAttr != NULL
-                            && aSwContentAtPos.pFndTxtAttr->Which() == RES_TXTATR_INPUTFIELD)
+                        if ( aSwContentAtPos.pFndTextAttr != NULL
+                            && aSwContentAtPos.pFndTextAttr->Which() == RES_TXTATR_INPUTFIELD)
                         {
-                            const SwField *pCrsrField = rSh.CrsrInsideInputFld() ? rSh.GetCurFld( true ) : NULL;
-                            if (!(pCrsrField && pCrsrField == aSwContentAtPos.pFndTxtAttr->GetFmtFld().GetField()))
+                            const SwField *pCrsrField = rSh.CrsrInsideInputField() ? rSh.GetCurField( true ) : NULL;
+                            if (!(pCrsrField && pCrsrField == aSwContentAtPos.pFndTextAttr->GetFormatField().GetField()))
                                 eStyle = POINTER_REFHAND;
                         }
                     }
                     else
                     {
-                        const bool bClickToFollow = SwContentAtPos::SW_INETATTR == aSwContentAtPos.eCntntAtPos ||
-                                                    SwContentAtPos::SW_SMARTTAG == aSwContentAtPos.eCntntAtPos;
+                        const bool bClickToFollow = SwContentAtPos::SW_INETATTR == aSwContentAtPos.eContentAtPos ||
+                                                    SwContentAtPos::SW_SMARTTAG == aSwContentAtPos.eContentAtPos;
                         if( !bClickToFollow ||
-                            (SwContentAtPos::SW_INETATTR == aSwContentAtPos.eCntntAtPos && bExecHyperlinks) ||
-                            (SwContentAtPos::SW_SMARTTAG == aSwContentAtPos.eCntntAtPos && bExecSmarttags) )
+                            (SwContentAtPos::SW_INETATTR == aSwContentAtPos.eContentAtPos && bExecHyperlinks) ||
+                            (SwContentAtPos::SW_SMARTTAG == aSwContentAtPos.eContentAtPos && bExecSmarttags) )
                             eStyle = POINTER_REFHAND;
                     }
                 }
@@ -614,7 +614,7 @@ IMPL_LINK_NOARG_TYPED(SwEditWin, TimerHandler, Timer *, void)
             bDone = true;
         }
         if ( !bDone )
-            aModPt = rSh.GetCntntPos( aModPt,aModPt.Y() > rSh.VisArea().Bottom() );
+            aModPt = rSh.GetContentPos( aModPt,aModPt.Y() > rSh.VisArea().Bottom() );
     }
     if ( !bDone && !(g_bFrmDrag || m_bInsDraw) )
     {
@@ -859,7 +859,7 @@ void SwEditWin::FlushInBuffer()
                 rSh.GetCrsr()->SetMark();
             rSh.GetCrsr()->GetMark()->nContent = 0;
 
-            const OUString aOldText( rSh.GetCrsr()->GetTxt() );
+            const OUString aOldText( rSh.GetCrsr()->GetText() );
             const sal_Int32 nOldLen = aOldText.getLength();
 
             SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions();
@@ -886,11 +886,11 @@ void SwEditWin::FlushInBuffer()
 
                     // find position of first character that has changed
                     sal_Int32 nNewLen = aNewText.getLength();
-                    const sal_Unicode *pOldTxt = aOldText.getStr();
-                    const sal_Unicode *pNewTxt = aNewText.getStr();
+                    const sal_Unicode *pOldText = aOldText.getStr();
+                    const sal_Unicode *pNewText = aNewText.getStr();
                     sal_Int32 nChgPos = 0;
                     while ( nChgPos < nOldLen && nChgPos < nNewLen &&
-                            pOldTxt[nChgPos] == pNewTxt[nChgPos] )
+                            pOldText[nChgPos] == pNewText[nChgPos] )
                         ++nChgPos;
 
                     const sal_Int32 nChgLen = nNewLen - nChgPos;
@@ -996,7 +996,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
                         RES_PROTECT, RES_PROTECT,
                         RES_FOLLOW_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW, 0);
         rSh.GetFlyFrmAttr( aSet );
-        RndStdIds eAnchorId = static_cast<const SwFmtAnchor&>(aSet.Get(RES_ANCHOR)).GetAnchorId();
+        RndStdIds eAnchorId = static_cast<const SwFormatAnchor&>(aSet.Get(RES_ANCHOR)).GetAnchorId();
         Size aSnap;
         bool bHuge(MOVE_LEFT_HUGE == nDir ||
             MOVE_UP_HUGE == nDir ||
@@ -1032,13 +1032,13 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
         // adjustment for allowing vertical position
         // aligned to page for fly frame anchored to paragraph or to character.
         {
-            SwFmtVertOrient aVert( static_cast<const SwFmtVertOrient&>(aSet.Get(RES_VERT_ORIENT)) );
+            SwFormatVertOrient aVert( static_cast<const SwFormatVertOrient&>(aSet.Get(RES_VERT_ORIENT)) );
             const bool bFollowTextFlow =
-                    static_cast<const SwFmtFollowTextFlow&>(aSet.Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
-            const SwPosition* pToCharCntntPos = static_cast<const SwFmtAnchor&>(aSet.Get(RES_ANCHOR)).GetCntntAnchor();
+                    static_cast<const SwFormatFollowTextFlow&>(aSet.Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
+            const SwPosition* pToCharContentPos = static_cast<const SwFormatAnchor&>(aSet.Get(RES_ANCHOR)).GetContentAnchor();
             rSh.CalcBoundRect( aBoundRect, eAnchorId,
                                text::RelOrientation::FRAME, aVert.GetRelationOrient(),
-                               pToCharCntntPos, bFollowTextFlow,
+                               pToCharContentPos, bFollowTextFlow,
                                false, &aRefPoint );
         }
         long nLeft = std::min( aTmp.Left() - aBoundRect.Left(), aSnap.Width() );
@@ -1084,7 +1084,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
                 aDiff = 0;
             else if ( aDiff < -aTmp.Height() )
                 aDiff = -aTmp.Height();
-            SwFmtVertOrient aVert( static_cast<const SwFmtVertOrient&>(aSet.Get(RES_VERT_ORIENT)) );
+            SwFormatVertOrient aVert( static_cast<const SwFormatVertOrient&>(aSet.Get(RES_VERT_ORIENT)) );
             sal_Int16 eNew;
             if( bWeb )
             {
@@ -1125,7 +1125,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
         if (bWeb && (FLY_AT_PARA == eAnchorId)
             && ( nDir==MOVE_LEFT_SMALL || nDir==MOVE_RIGHT_BIG ))
         {
-            SwFmtHoriOrient aHori( static_cast<const SwFmtHoriOrient&>(aSet.Get(RES_HORI_ORIENT)) );
+            SwFormatHoriOrient aHori( static_cast<const SwFormatHoriOrient&>(aSet.Get(RES_HORI_ORIENT)) );
             sal_Int16 eNew;
             eNew = aHori.GetHoriOrient();
             switch( eNew )
@@ -1420,10 +1420,10 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
             // 2. Exception: For a table cursor in a vertical table, the
             //               directions should always be mapped.
             const bool bVertText = rSh.IsInVerticalText();
-            const bool bTblCrsr = rSh.GetTableCrsr();
+            const bool bTableCrsr = rSh.GetTableCrsr();
             const bool bVertTable = rSh.IsTableVertical();
-            if( ( bVertText && ( !bTblCrsr || bVertTable ) ) ||
-                ( bTblCrsr && bVertTable ) )
+            if( ( bVertText && ( !bTableCrsr || bVertTable ) ) ||
+                ( bTableCrsr && bVertTable ) )
             {
                 // Attempt to integrate cursor travelling for mongolian layout does not work.
                 // Thus, back to previous mapping of cursor keys to direction keys.
@@ -1453,13 +1453,13 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
     if ((rKeyCode.IsMod1() && rKeyCode.IsMod2()) && ((rKeyCode.GetCode() == KEY_PAGEUP) || (rKeyCode.GetCode() == KEY_PAGEDOWN)))
     {
         const bool bNext = rKeyCode.GetCode()==KEY_PAGEDOWN;
-        const SwFieldType* pFldType = rSh.GetFldType( 0, RES_POSTITFLD );
-        rSh.MoveFldType( pFldType, bNext );
+        const SwFieldType* pFieldType = rSh.GetFieldType( 0, RES_POSTITFLD );
+        rSh.MoveFieldType( pFieldType, bNext );
         return;
     }
 
-    const SwFrmFmt* pFlyFmt = rSh.GetFlyFrmFmt();
-    if( pFlyFmt )
+    const SwFrameFormat* pFlyFormat = rSh.GetFlyFrameFormat();
+    if( pFlyFormat )
     {
         sal_uInt16 nEvent;
 
@@ -1469,12 +1469,12 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
         else
             nEvent = SW_EVENT_FRM_KEYINPUT_NOALPHA;
 
-        const SvxMacro* pMacro = pFlyFmt->GetMacro().GetMacroTable().Get( nEvent );
+        const SvxMacro* pMacro = pFlyFormat->GetMacro().GetMacroTable().Get( nEvent );
         if( pMacro )
         {
             SbxArrayRef xArgs = new SbxArray;
             SbxVariableRef xVar = new SbxVariable;
-            xVar->PutString( pFlyFmt->GetName() );
+            xVar->PutString( pFlyFormat->GetName() );
             xArgs->Put( &xVar, 1 );
 
             xVar = new SbxVariable;
@@ -1521,10 +1521,10 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 
     SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
-    TblChgWidthHeightType eTblChgMode = nsTblChgWidthHeightType::WH_COL_LEFT;    // initialization just for warning-free code
-    sal_uInt16 nTblChgSize = 0;
+    TableChgWidthHeightType eTableChgMode = nsTableChgWidthHeightType::WH_COL_LEFT;    // initialization just for warning-free code
+    sal_uInt16 nTableChgSize = 0;
     bool bStopKeyInputTimer = true;
-    OUString sFmlEntry;
+    OUString sFormulaEntry;
 
     enum SW_KeyState { KS_Start,
                        KS_CheckKey, KS_InsChar, KS_InsTab,
@@ -1534,7 +1534,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
                        KS_OutlineLvOff,
                        KS_NextCell, KS_PrevCell, KS_OutlineUp, KS_OutlineDown,
                        KS_GlossaryExpand, KS_NextPrevGlossary,
-                       KS_AutoFmtByInput,
+                       KS_AutoFormatByInput,
                        KS_NextObject, KS_PrevObject,
                        KS_KeyToView,
                        KS_LaunchOLEObject, KS_GoIntoFly, KS_GoIntoDrawing,
@@ -1558,7 +1558,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
                        KS_InsDel_CellLeftSmall, KS_InsDel_CellRightSmall,
                        KS_InsDel_CellTopBig, KS_InsDel_CellBottomBig,
                        KS_InsDel_CellTopSmall, KS_InsDel_CellBottomSmall,
-                       KS_TblColCellInsDel,
+                       KS_TableColCellInsDel,
 
                        KS_Fly_Change, KS_Draw_Change,
                        KS_SpecialInsert,
@@ -1596,7 +1596,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 #endif
 
             if( !rKeyCode.IsMod2() && '=' == aCh &&
-                !rSh.IsTableMode() && rSh.GetTableFmt() &&
+                !rSh.IsTableMode() && rSh.GetTableFormat() &&
                 rSh.IsSttPara() &&
                 !rSh.HasReadonlySel() )
             {
@@ -1615,14 +1615,14 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
                     rSh.MoveSection( fnSectionCurr, fnSectionEnd );
                     rSh.Pop( true );
                     rSh.EndSelect();
-                    sFmlEntry = "=";
+                    sFormulaEntry = "=";
                 }
                 else
                     rSh.Pop( false );
             }
             else
             {
-                if( pACorr && aTmpQHD.HasCntnt() && !rSh.HasSelection() &&
+                if( pACorr && aTmpQHD.HasContent() && !rSh.HasSelection() &&
                     !rSh.HasReadonlySel() && !aTmpQHD.m_bIsAutoText &&
                     pACorr->GetSwFlags().nAutoCmpltExpandKey ==
                     (rKeyCode.GetModifier() | rKeyCode.GetCode()) )
@@ -1698,17 +1698,17 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
                     goto KEYINPUT_CHECKTABLE;
 
 KEYINPUT_CHECKTABLE:
-                    if( rSh.IsTableMode() || !rSh.GetTableFmt() )
+                    if( rSh.IsTableMode() || !rSh.GetTableFormat() )
                     {
                         if(KS_KeyToView != eFlyState)
                         {
-                            if(!pFlyFmt && KS_KeyToView != eFlyState &&
+                            if(!pFlyFormat && KS_KeyToView != eFlyState &&
                                 (rSh.GetSelectionType() & (nsSelectionType::SEL_DRW|nsSelectionType::SEL_DRW_FORM))  &&
                                     rSh.GetDrawView()->AreObjectsMarked())
                                 eKeyState = KS_Draw_Change;
                         }
 
-                        if( pFlyFmt )
+                        if( pFlyFormat )
                             eKeyState = eFlyState;
                         else if( KS_Draw_Change != eKeyState)
                             eKeyState = KS_EnterCharCell;
@@ -1722,12 +1722,12 @@ KEYINPUT_CHECKTABLE:
                 case KEY_DOWN | KEY_SHIFT:
                 {
                     const int nSelectionType = rSh.GetSelectionType();
-                    if ( ( pFlyFmt
+                    if ( ( pFlyFormat
                            && ( nSelectionType & (nsSelectionType::SEL_FRM|nsSelectionType::SEL_OLE|nsSelectionType::SEL_GRF) ) )
                          || ( ( nSelectionType & (nsSelectionType::SEL_DRW|nsSelectionType::SEL_DRW_FORM) )
                               && rSh.GetDrawView()->AreObjectsMarked() ) )
                     {
-                        eKeyState = pFlyFmt ? KS_Fly_Change : KS_Draw_Change;
+                        eKeyState = pFlyFormat ? KS_Fly_Change : KS_Draw_Change;
                         switch ( rKeyCode.GetCode() )
                         {
                             case KEY_RIGHT: nDir = MOVE_RIGHT_HUGE; break;
@@ -1748,17 +1748,17 @@ KEYINPUT_CHECKTABLE:
                         eFlyState = KS_Fly_Change;
                         nDir = MOVE_LEFT_BIG;
                     }
-                    eTblChgMode = nsTblChgWidthHeightType::WH_FLAG_INSDEL |
+                    eTableChgMode = nsTableChgWidthHeightType::WH_FLAG_INSDEL |
                             ( bMod1
-                                ? nsTblChgWidthHeightType::WH_CELL_LEFT
-                                : nsTblChgWidthHeightType::WH_COL_LEFT );
-                    nTblChgSize = pModOpt->GetTblVInsert();
+                                ? nsTableChgWidthHeightType::WH_CELL_LEFT
+                                : nsTableChgWidthHeightType::WH_COL_LEFT );
+                    nTableChgSize = pModOpt->GetTableVInsert();
                 }
                     goto KEYINPUT_CHECKTABLE_INSDEL;
                 case KEY_RIGHT | KEY_MOD1:
                 {
-                    eTblChgMode = nsTblChgWidthHeightType::WH_FLAG_INSDEL | nsTblChgWidthHeightType::WH_CELL_RIGHT;
-                    nTblChgSize = pModOpt->GetTblVInsert();
+                    eTableChgMode = nsTableChgWidthHeightType::WH_FLAG_INSDEL | nsTableChgWidthHeightType::WH_CELL_RIGHT;
+                    nTableChgSize = pModOpt->GetTableVInsert();
                 }
                     goto KEYINPUT_CHECKTABLE_INSDEL;
                 case KEY_UP:
@@ -1770,11 +1770,11 @@ KEYINPUT_CHECKTABLE:
                         eFlyState = KS_Fly_Change;
                         nDir = MOVE_UP_BIG;
                     }
-                    eTblChgMode = nsTblChgWidthHeightType::WH_FLAG_INSDEL |
+                    eTableChgMode = nsTableChgWidthHeightType::WH_FLAG_INSDEL |
                             ( bMod1
-                                ? nsTblChgWidthHeightType::WH_CELL_TOP
-                                : nsTblChgWidthHeightType::WH_ROW_TOP );
-                    nTblChgSize = pModOpt->GetTblHInsert();
+                                ? nsTableChgWidthHeightType::WH_CELL_TOP
+                                : nsTableChgWidthHeightType::WH_ROW_TOP );
+                    nTableChgSize = pModOpt->GetTableHInsert();
                 }
                     goto KEYINPUT_CHECKTABLE_INSDEL;
                 case KEY_DOWN:
@@ -1786,17 +1786,17 @@ KEYINPUT_CHECKTABLE:
                         eFlyState = KS_Fly_Change;
                         nDir = MOVE_DOWN_BIG;
                     }
-                    eTblChgMode = nsTblChgWidthHeightType::WH_FLAG_INSDEL |
+                    eTableChgMode = nsTableChgWidthHeightType::WH_FLAG_INSDEL |
                             ( bMod1
-                                ? nsTblChgWidthHeightType::WH_CELL_BOTTOM
-                                : nsTblChgWidthHeightType::WH_ROW_BOTTOM );
-                    nTblChgSize = pModOpt->GetTblHInsert();
+                                ? nsTableChgWidthHeightType::WH_CELL_BOTTOM
+                                : nsTableChgWidthHeightType::WH_ROW_BOTTOM );
+                    nTableChgSize = pModOpt->GetTableHInsert();
                 }
                     goto KEYINPUT_CHECKTABLE_INSDEL;
 
 KEYINPUT_CHECKTABLE_INSDEL:
-                    if( rSh.IsTableMode() || !rSh.GetTableFmt() ||
-                        !m_bTblInsDelMode ||
+                    if( rSh.IsTableMode() || !rSh.GetTableFormat() ||
+                        !m_bTableInsDelMode ||
                         false /* table protected */
                             )
                     {
@@ -1814,9 +1814,9 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     }
                     else
                     {
-                        if( !m_bTblIsInsMode )
-                            eTblChgMode = eTblChgMode | nsTblChgWidthHeightType::WH_FLAG_BIGGER;
-                        eKeyState = KS_TblColCellInsDel;
+                        if( !m_bTableIsInsMode )
+                            eTableChgMode = eTableChgMode | nsTableChgWidthHeightType::WH_FLAG_BIGGER;
+                        eKeyState = KS_TableColCellInsDel;
                     }
                     break;
 
@@ -1835,21 +1835,21 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     break;
 
                 case KEY_DELETE | KEY_MOD2:
-                    if( !rSh.IsTableMode() && rSh.GetTableFmt() )
+                    if( !rSh.IsTableMode() && rSh.GetTableFormat() )
                     {
                         eKeyState = KS_End;
-                        m_bTblInsDelMode = true;
-                        m_bTblIsInsMode = false;
+                        m_bTableInsDelMode = true;
+                        m_bTableIsInsMode = false;
                         m_aKeyInputTimer.Start();
                         bStopKeyInputTimer = false;
                     }
                     break;
                 case KEY_INSERT | KEY_MOD2:
-                    if( !rSh.IsTableMode() && rSh.GetTableFmt() )
+                    if( !rSh.IsTableMode() && rSh.GetTableFormat() )
                     {
                         eKeyState = KS_End;
-                        m_bTblInsDelMode = true;
-                        m_bTblIsInsMode = true;
+                        m_bTableInsDelMode = true;
+                        m_bTableIsInsMode = true;
                         m_aKeyInputTimer.Start();
                         bStopKeyInputTimer = false;
                     }
@@ -1858,7 +1858,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 case KEY_RETURN:
                 {
                     if ( !rSh.HasReadonlySel()
-                         && !rSh.CrsrInsideInputFld() )
+                         && !rSh.CrsrInsideInputField() )
                     {
                         const int nSelectionType = rSh.GetSelectionType();
                         if(nSelectionType & nsSelectionType::SEL_OLE)
@@ -1869,7 +1869,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                                 0 == (nSelectionType & nsSelectionType::SEL_DRW_TXT) &&
                                 rSh.GetDrawView()->GetMarkedObjectList().GetMarkCount() == 1)
                             eKeyState = KS_GoIntoDrawing;
-                        else if( aTmpQHD.HasCntnt() && !rSh.HasSelection() &&
+                        else if( aTmpQHD.HasContent() && !rSh.HasSelection() &&
                             aTmpQHD.m_bIsAutoText )
                             eKeyState = KS_GlossaryExpand;
 
@@ -1882,12 +1882,12 @@ KEYINPUT_CHECKTABLE_INSDEL:
                             eKeyState = KS_NumOff, eNextKeyState = KS_OutlineLvOff;
 
                         //RETURN for new paragraph with AutoFormating
-                        else if( pACfg && pACfg->IsAutoFmtByInput() &&
+                        else if( pACfg && pACfg->IsAutoFormatByInput() &&
                                 !(nSelectionType & (nsSelectionType::SEL_GRF |
                                     nsSelectionType::SEL_OLE | nsSelectionType::SEL_FRM |
                                     nsSelectionType::SEL_TBL_CELLS | nsSelectionType::SEL_DRW |
                                     nsSelectionType::SEL_DRW_TXT)) )
-                            eKeyState = KS_CheckAutoCorrect, eNextKeyState = KS_AutoFmtByInput;
+                            eKeyState = KS_CheckAutoCorrect, eNextKeyState = KS_AutoFormatByInput;
                         else
                             eNextKeyState = eKeyState, eKeyState = KS_CheckAutoCorrect;
                     }
@@ -1898,7 +1898,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     if ( !rSh.HasReadonlySel()
                          && !rSh.IsSttPara()
                          && rSh.GetNumRuleAtCurrCrsrPos()
-                         && !rSh.CrsrInsideInputFld() )
+                         && !rSh.CrsrInsideInputField() )
                     {
                         eKeyState = KS_NoNum;
                     }
@@ -2002,8 +2002,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     {
                         eFlyState = KS_Fly_Change;
                         nDir = MOVE_RIGHT_BIG;
-                        eTblChgMode = nsTblChgWidthHeightType::WH_FLAG_INSDEL | nsTblChgWidthHeightType::WH_COL_RIGHT;
-                        nTblChgSize = pModOpt->GetTblVInsert();
+                        eTableChgMode = nsTableChgWidthHeightType::WH_FLAG_INSDEL | nsTableChgWidthHeightType::WH_COL_RIGHT;
+                        nTableChgSize = pModOpt->GetTableVInsert();
                         goto KEYINPUT_CHECKTABLE_INSDEL;
                     }
                 case KEY_TAB:
@@ -2013,7 +2013,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     {
                         eKeyState=KS_GotoNextFieldMark;
                     }
-                    else if ( !rSh.IsMultiSelection() && rSh.CrsrInsideInputFld() )
+                    else if ( !rSh.IsMultiSelection() && rSh.CrsrInsideInputField() )
                     {
                         GetView().GetViewFrame()->GetDispatcher()->Execute( FN_GOTO_NEXT_INPUTFLD );
                         eKeyState = KS_End;
@@ -2029,7 +2029,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                         else
                             eKeyState = KS_NumDown;
                     }
-                    else if ( rSh.GetTableFmt() )
+                    else if ( rSh.GetTableFormat() )
                     {
                         if( rSh.HasSelection() || rSh.HasReadonlySel() )
                             eKeyState = KS_NextCell;
@@ -2049,7 +2049,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                         eKeyState = KS_InsTab;
                         if( rSh.IsSttOfPara() && !rSh.HasReadonlySel() )
                         {
-                            SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
+                            SwTextFormatColl* pColl = rSh.GetCurTextFormatColl();
                             if( pColl &&
 
                                 pColl->IsAssignedToListLevelOfOutlineStyle()
@@ -2065,7 +2065,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     {
                         eKeyState=KS_GotoPrevFieldMark;
                     }
-                    else if ( !rSh.IsMultiSelection() && rSh.CrsrInsideInputFld() )
+                    else if ( !rSh.IsMultiSelection() && rSh.CrsrInsideInputField() )
                     {
                         GetView().GetViewFrame()->GetDispatcher()->Execute( FN_GOTO_PREV_INPUTFLD );
                         eKeyState = KS_End;
@@ -2081,7 +2081,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                         else
                             eKeyState = KS_NumUp;
                     }
-                    else if ( rSh.GetTableFmt() )
+                    else if ( rSh.GetTableFormat() )
                     {
                         if( rSh.HasSelection() || rSh.HasReadonlySel() )
                             eKeyState = KS_PrevCell;
@@ -2101,7 +2101,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                         eKeyState = KS_End;
                         if( rSh.IsSttOfPara() && !rSh.HasReadonlySel() )
                         {
-                            SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
+                            SwTextFormatColl* pColl = rSh.GetCurTextFormatColl();
                             if( pColl &&
                                 pColl->IsAssignedToListLevelOfOutlineStyle() &&
                                 0 < pColl->GetAssignedOutlineStyleLevel())
@@ -2114,14 +2114,14 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 case KEY_TAB | KEY_MOD2:
                     if( !rSh.HasReadonlySel() )
                     {
-                        if( aTmpQHD.HasCntnt() && !rSh.HasSelection() )
+                        if( aTmpQHD.HasContent() && !rSh.HasSelection() )
                         {
                             // Next auto-complete suggestion
                             aTmpQHD.Next( pACorr &&
                                           pACorr->GetSwFlags().bAutoCmpltEndless );
                             eKeyState = KS_NextPrevGlossary;
                         }
-                        else if( rSh.GetTableFmt() )
+                        else if( rSh.GetTableFormat() )
                             eKeyState = KS_InsTab;
                         else if((rSh.GetSelectionType() &
                                     (nsSelectionType::SEL_DRW|nsSelectionType::SEL_DRW_FORM|
@@ -2137,7 +2137,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
 
                     case KEY_TAB | KEY_MOD1 | KEY_SHIFT:
                     {
-                        if( aTmpQHD.HasCntnt() && !rSh.HasSelection() &&
+                        if( aTmpQHD.HasContent() && !rSh.HasSelection() &&
                             !rSh.HasReadonlySel() )
                         {
                             // Previous auto-complete suggestion.
@@ -2186,7 +2186,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                             eKeyState = rKeyCode.GetModifier() & KEY_SHIFT ?
                                                 KS_PrevObject : KS_NextObject;
                         }
-                        else if ( !rSh.IsMultiSelection() && rSh.CrsrInsideInputFld() )
+                        else if ( !rSh.IsMultiSelection() && rSh.CrsrInsideInputField() )
                         {
                             GetView().GetViewFrame()->GetDispatcher()->Execute(
                                 KEY_SHIFT != rKeyCode.GetModifier() ? FN_GOTO_NEXT_INPUTFLD : FN_GOTO_PREV_INPUTFLD );
@@ -2210,7 +2210,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                                 const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, true);
                                 bNormalChar = false;
                                 eKeyState = KS_End;
-                                rSh.ClickToINetAttr(static_cast<const SwFmtINetFmt&>(rItem), URLLOAD_NOFILTER);
+                                rSh.ClickToINetAttr(static_cast<const SwFormatINetFormat&>(rItem), URLLOAD_NOFILTER);
                             }
                         }
                     }
@@ -2365,7 +2365,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 eKeyState = KS_End;
             }
             else if ( !rSh.HasReadonlySel()
-                      || rSh.CrsrInsideInputFld() )
+                      || rSh.CrsrInsideInputField() )
             {
                 const bool bIsNormalChar =
                     GetAppCharClass().isLetterNumeric( OUString( aCh ), 0 );
@@ -2380,7 +2380,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 const bool bIsAutoCorrectChar =  SvxAutoCorrect::IsAutoCorrectChar( aCh );
                 const bool bRunNext = pACorr != NULL && pACorr->HasRunNext();
                 if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) &&
-                        pACfg->IsAutoFmtByInput() &&
+                        pACfg->IsAutoFormatByInput() &&
                     (( pACorr->IsAutoCorrFlag( ChgWeightUnderl ) &&
                         ( '*' == aCh || '_' == aCh ) ) ||
                      ( pACorr->IsAutoCorrFlag( ChgQuotes ) && ('\"' == aCh ))||
@@ -2392,7 +2392,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                         rSh.UpdateAttr();
                 }
                 else if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) &&
-                        pACfg->IsAutoFmtByInput() &&
+                        pACfg->IsAutoFormatByInput() &&
                     pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd |
                                             ChgOrdinalNumber | AddNonBrkSpace |
                                             ChgToEnEmDash | SetINetAttr |
@@ -2426,7 +2426,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
 
         case KS_CheckAutoCorrect:
         {
-            if( pACorr && pACfg->IsAutoFmtByInput() &&
+            if( pACorr && pACfg->IsAutoFormatByInput() &&
                 pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd |
                                         ChgOrdinalNumber |
                                         ChgToEnEmDash | SetINetAttr |
@@ -2510,7 +2510,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 rSh.GoPrevCell();
                 nSlotId = FN_GOTO_PREV_CELL;
                 break;
-            case KS_AutoFmtByInput:
+            case KS_AutoFormatByInput:
                 rSh.SplitNode( true );
                 break;
 
@@ -2576,44 +2576,44 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 SwInputChild* pChildWin = static_cast<SwInputChild*>(pVFrame->
                                                     GetChildWindow( nId ));
                 if( pChildWin )
-                    pChildWin->SetFormula( sFmlEntry );
+                    pChildWin->SetFormula( sFormulaEntry );
             }
             break;
 
-            case KS_ColLeftBig:         rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_COL_LEFT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHMove() );   break;
-            case KS_ColRightBig:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_COL_RIGHT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHMove() );  break;
-            case KS_ColLeftSmall:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_COL_LEFT, pModOpt->GetTblHMove() );   break;
-            case KS_ColRightSmall:      rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_COL_RIGHT, pModOpt->GetTblHMove() );  break;
-            case KS_ColBottomBig:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_ROW_BOTTOM|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblVMove() ); break;
-            case KS_ColBottomSmall:     rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_ROW_BOTTOM, pModOpt->GetTblVMove() ); break;
-            case KS_CellLeftBig:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_LEFT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHMove() );  break;
-            case KS_CellRightBig:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_RIGHT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHMove() ); break;
-            case KS_CellLeftSmall:      rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_LEFT, pModOpt->GetTblHMove() );  break;
-            case KS_CellRightSmall:     rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_RIGHT, pModOpt->GetTblHMove() ); break;
-            case KS_CellTopBig:         rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_TOP|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblVMove() );   break;
-            case KS_CellBottomBig:      rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_BOTTOM|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblVMove() );    break;
-            case KS_CellTopSmall:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_TOP, pModOpt->GetTblVMove() );   break;
-            case KS_CellBottomSmall:    rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_BOTTOM, pModOpt->GetTblVMove() );    break;
-
-            case KS_InsDel_ColLeftBig:          rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_LEFT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHInsert() ); break;
-            case KS_InsDel_ColRightBig:         rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_RIGHT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHInsert() );    break;
-            case KS_InsDel_ColLeftSmall:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_LEFT, pModOpt->GetTblHInsert() ); break;
-            case KS_InsDel_ColRightSmall:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_RIGHT, pModOpt->GetTblHInsert() );    break;
-            case KS_InsDel_ColTopBig:           rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_ROW_TOP|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblVInsert() );  break;
-            case KS_InsDel_ColBottomBig:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_ROW_BOTTOM|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblVInsert() );   break;
-            case KS_InsDel_ColTopSmall:         rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_ROW_TOP, pModOpt->GetTblVInsert() );  break;
-            case KS_InsDel_ColBottomSmall:      rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_ROW_BOTTOM, pModOpt->GetTblVInsert() );   break;
-            case KS_InsDel_CellLeftBig:         rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_LEFT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHInsert() );    break;
-            case KS_InsDel_CellRightBig:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_RIGHT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHInsert() );   break;
-            case KS_InsDel_CellLeftSmall:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_LEFT, pModOpt->GetTblHInsert() );    break;
-            case KS_InsDel_CellRightSmall:      rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_RIGHT, pModOpt->GetTblHInsert() );   break;
-            case KS_InsDel_CellTopBig:          rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_TOP|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblVInsert() ); break;
-            case KS_InsDel_CellBottomBig:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_BOTTOM|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblVInsert() );  break;
-            case KS_InsDel_CellTopSmall:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_TOP, pModOpt->GetTblVInsert() ); break;
-            case KS_InsDel_CellBottomSmall:     rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_BOTTOM, pModOpt->GetTblVInsert() );  break;
-
-            case KS_TblColCellInsDel:
-                rSh.SetColRowWidthHeight( eTblChgMode, nTblChgSize );
+            case KS_ColLeftBig:         rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_COL_LEFT|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableHMove() );   break;
+            case KS_ColRightBig:        rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_COL_RIGHT|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableHMove() );  break;
+            case KS_ColLeftSmall:       rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_COL_LEFT, pModOpt->GetTableHMove() );   break;
+            case KS_ColRightSmall:      rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_COL_RIGHT, pModOpt->GetTableHMove() );  break;
+            case KS_ColBottomBig:       rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_ROW_BOTTOM|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableVMove() ); break;
+            case KS_ColBottomSmall:     rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_ROW_BOTTOM, pModOpt->GetTableVMove() ); break;
+            case KS_CellLeftBig:        rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_CELL_LEFT|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableHMove() );  break;
+            case KS_CellRightBig:       rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_CELL_RIGHT|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableHMove() ); break;
+            case KS_CellLeftSmall:      rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_CELL_LEFT, pModOpt->GetTableHMove() );  break;
+            case KS_CellRightSmall:     rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_CELL_RIGHT, pModOpt->GetTableHMove() ); break;
+            case KS_CellTopBig:         rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_CELL_TOP|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableVMove() );   break;
+            case KS_CellBottomBig:      rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_CELL_BOTTOM|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableVMove() );    break;
+            case KS_CellTopSmall:       rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_CELL_TOP, pModOpt->GetTableVMove() );   break;
+            case KS_CellBottomSmall:    rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_CELL_BOTTOM, pModOpt->GetTableVMove() );    break;
+
+            case KS_InsDel_ColLeftBig:          rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_COL_LEFT|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableHInsert() ); break;
+            case KS_InsDel_ColRightBig:         rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_COL_RIGHT|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableHInsert() );    break;
+            case KS_InsDel_ColLeftSmall:        rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_COL_LEFT, pModOpt->GetTableHInsert() ); break;
+            case KS_InsDel_ColRightSmall:       rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_COL_RIGHT, pModOpt->GetTableHInsert() );    break;
+            case KS_InsDel_ColTopBig:           rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_ROW_TOP|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableVInsert() );  break;
+            case KS_InsDel_ColBottomBig:        rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_ROW_BOTTOM|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableVInsert() );   break;
+            case KS_InsDel_ColTopSmall:         rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_ROW_TOP, pModOpt->GetTableVInsert() );  break;
+            case KS_InsDel_ColBottomSmall:      rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_ROW_BOTTOM, pModOpt->GetTableVInsert() );   break;
+            case KS_InsDel_CellLeftBig:         rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_CELL_LEFT|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableHInsert() );    break;
+            case KS_InsDel_CellRightBig:        rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_CELL_RIGHT|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableHInsert() );   break;
+            case KS_InsDel_CellLeftSmall:       rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_CELL_LEFT, pModOpt->GetTableHInsert() );    break;
+            case KS_InsDel_CellRightSmall:      rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_CELL_RIGHT, pModOpt->GetTableHInsert() );   break;
+            case KS_InsDel_CellTopBig:          rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_CELL_TOP|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableVInsert() ); break;
+            case KS_InsDel_CellBottomBig:       rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_CELL_BOTTOM|nsTableChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTableVInsert() );  break;
+            case KS_InsDel_CellTopSmall:        rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_CELL_TOP, pModOpt->GetTableVInsert() ); break;
+            case KS_InsDel_CellBottomSmall:     rSh.SetColRowWidthHeight( nsTableChgWidthHeightType::WH_FLAG_INSDEL|nsTableChgWidthHeightType::WH_CELL_BOTTOM, pModOpt->GetTableVInsert() );  break;
+
+            case KS_TableColCellInsDel:
+                rSh.SetColRowWidthHeight( eTableChgMode, nTableChgSize );
                 break;
             case KS_Fly_Change:
             {
@@ -2644,7 +2644,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
     if( bStopKeyInputTimer )
     {
         m_aKeyInputTimer.Stop();
-        m_bTblInsDelMode = false;
+        m_bTableInsDelMode = false;
     }
 
     // in case the buffered characters are inserted
@@ -2735,7 +2735,7 @@ void SwEditWin::MoveCursor( SwWrtShell &rSh, const Point& rDocPos,
 void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 {
     SwWrtShell &rSh = m_rView.GetWrtShell();
-    const SwField *pCrsrFld = rSh.CrsrInsideInputFld() ? rSh.GetCurFld( true ) : NULL;
+    const SwField *pCrsrField = rSh.CrsrInsideInputField() ? rSh.GetCurField( true ) : NULL;
 
     // We have to check if a context menu is shown and we have an UI
     // active inplace client. In that case we have to ignore the mouse
@@ -2779,7 +2779,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
     bool bOverHeaderFooterFly = IsOverHeaderFooterFly( aDocPos, eControl, bOverFly, bPageAnchored );
 
     bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly();
-    if (bOverHeaderFooterFly && (!bIsDocReadOnly && rSh.GetCurFld()))
+    if (bOverHeaderFooterFly && (!bIsDocReadOnly && rSh.GetCurField()))
         // We have a field here, that should have priority over header/footer fly.
         bOverHeaderFooterFly = false;
 
@@ -2802,16 +2802,16 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
         bool bActive = true;
         const SwPageDesc* pDesc = pPageFrm->GetPageDesc();
 
-        const SwFrmFmt* pFmt = pDesc->GetLeftFmt();
+        const SwFrameFormat* pFormat = pDesc->GetLeftFormat();
         if ( pPageFrm->OnRightPage() )
-             pFmt = pDesc->GetRightFmt();
+             pFormat = pDesc->GetRightFormat();
 
-        if ( pFmt )
+        if ( pFormat )
         {
             if ( eControl == Header )
-                bActive = pFmt->GetHeader().IsActive();
+                bActive = pFormat->GetHeader().IsActive();
             else
-                bActive = pFmt->GetFooter().IsActive();
+                bActive = pFormat->GetFooter().IsActive();
         }
 
         if ( !bActive )
@@ -2869,9 +2869,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
     {
         SetChainMode( false );
         SwRect aDummy;
-        SwFlyFrmFmt *pFmt = static_cast<SwFlyFrmFmt*>(rSh.GetFlyFrmFmt());
-        if ( rSh.Chainable( aDummy, *pFmt, aDocPos ) == SwChainRet::OK )
-            rSh.Chain( *pFmt, aDocPos );
+        SwFlyFrameFormat *pFormat = static_cast<SwFlyFrameFormat*>(rSh.GetFlyFrameFormat());
+        if ( rSh.Chainable( aDummy, *pFormat, aDocPos ) == SwChainRet::OK )
+            rSh.Chain( *pFormat, aDocPos );
         UpdatePointer( aDocPos, rMEvt.GetModifier() );
         return;
     }
@@ -2959,7 +2959,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
     else if (bTmp &&
              rSh.IsNumLabel(aDocPos))
     {
-        SwTxtNode* pNodeAtPos = rSh.GetNumRuleNodeAtPos( aDocPos );
+        SwTextNode* pNodeAtPos = rSh.GetNumRuleNodeAtPos( aDocPos );
         m_rView.SetNumRuleNodeFromDoc( pNodeAtPos );
         m_rView.InvalidateRulerPos();
         SfxBindings& rBind = m_rView.GetViewFrame()->GetBindings();
@@ -3286,19 +3286,19 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         if ((!g_bValidCrsrPos || rSh.IsFrmSelected()) && !rSh.isTiledRendering())
                             return;
 
-                        SwField *pFld;
-                        bool bFtn = false;
+                        SwField *pField;
+                        bool bFootnote = false;
 
                         if( !bIsDocReadOnly &&
-                            ( 0 != ( pFld = rSh.GetCurFld() ) ||
-                              ( bFtn = rSh.GetCurFtn() )        ) )
+                            ( 0 != ( pField = rSh.GetCurField() ) ||
+                              ( bFootnote = rSh.GetCurFootnote() )        ) )
                         {
                             RstMBDownFlags();
-                            if( bFtn )
+                            if( bFootnote )
                                 GetView().GetViewFrame()->GetBindings().Execute( FN_EDIT_FOOTNOTE );
                             else
                             {
-                                sal_uInt16 nTypeId = pFld->GetTypeId();
+                                sal_uInt16 nTypeId = pField->GetTypeId();
                                 SfxViewFrame* pVFrame = GetView().GetViewFrame();
                                 switch( nTypeId )
                                 {
@@ -3339,7 +3339,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                                 // Double click did not select any word: try to
                                 // select the current cell in case we are in a
                                 // table.
-                                rSh.SelTblBox();
+                                rSh.SelTableBox();
                         }
                         g_bHoldSelection = true;
                         return;
@@ -3536,15 +3536,15 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                                     bSttSelect = true;
                                     if( bExecHyperlinks )
                                     {
-                                        SwContentAtPos aCntntAtPos(
+                                        SwContentAtPos aContentAtPos(
                                             SwContentAtPos::SW_FTN |
                                             SwContentAtPos::SW_INETATTR );
 
-                                        if( rSh.GetContentAtPos( aDocPos, aCntntAtPos ) )
+                                        if( rSh.GetContentAtPos( aDocPos, aContentAtPos ) )
                                         {
                                             if( !rSh.IsViewLocked() &&
                                                 !rSh.IsReadOnlyAvailable() &&
-                                                aCntntAtPos.IsInProtectSect() )
+                                                aContentAtPos.IsInProtectSect() )
                                                     bLockView = true;
 
                                             bSttSelect = false;
@@ -3564,11 +3564,11 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                     default:
                         if( !rSh.IsViewLocked() )
                         {
-                            SwContentAtPos aCntntAtPos( SwContentAtPos::SW_CLICKFIELD |
+                            SwContentAtPos aContentAtPos( SwContentAtPos::SW_CLICKFIELD |
                                                         SwContentAtPos::SW_INETATTR );
-                            if( rSh.GetContentAtPos( aDocPos, aCntntAtPos, false ) &&
+                            if( rSh.GetContentAtPos( aDocPos, aContentAtPos, false ) &&
                                 !rSh.IsReadOnlyAvailable() &&
-                                aCntntAtPos.IsInProtectSect() )
+                                aContentAtPos.IsInProtectSect() )
                                 bLockView = true;
                         }
                 }
@@ -3585,8 +3585,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                 // Are we clicking on a field?
                 if (rSh.GetContentAtPos(aDocPos, aFieldAtPos))
                 {
-                    bool bEditableField = (aFieldAtPos.pFndTxtAttr != NULL
-                        && aFieldAtPos.pFndTxtAttr->Which() == RES_TXTATR_INPUTFIELD);
+                    bool bEditableField = (aFieldAtPos.pFndTextAttr != NULL
+                        && aFieldAtPos.pFndTextAttr->Which() == RES_TXTATR_INPUTFIELD);
 
                     if (!bEditableField)
                     {
@@ -3594,12 +3594,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         // Unfortunately the cursor may be on field
                         // position or on position after field depending on which
                         // half of the field was clicked on.
-                        SwTxtAttr const*const pTxtFld(aFieldAtPos.pFndTxtAttr);
+                        SwTextAttr const*const pTextField(aFieldAtPos.pFndTextAttr);
                         if (rSh.GetCurrentShellCursor().GetPoint()->nContent
-                                .GetIndex() != pTxtFld->GetStart())
+                                .GetIndex() != pTextField->GetStart())
                         {
                             assert(rSh.GetCurrentShellCursor().GetPoint()->nContent
-                                    .GetIndex() == (pTxtFld->GetStart() + 1));
+                                    .GetIndex() == (pTextField->GetStart() + 1));
                             rSh.Left( CRSR_SKIP_CHARS, false, 1, false );
                         }
                         // don't go into the !bOverSelect block below - it moves
@@ -3635,14 +3635,14 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         bCallBase = false;
                     }
                 }
-                if ( !bOverSelect && bEditableFieldClicked && (!pCrsrFld ||
-                     pCrsrFld != aFieldAtPos.pFndTxtAttr->GetFmtFld().GetField()))
+                if ( !bOverSelect && bEditableFieldClicked && (!pCrsrField ||
+                     pCrsrField != aFieldAtPos.pFndTextAttr->GetFormatField().GetField()))
                 {
                     // select content of Input Field, but exclude CH_TXT_ATR_INPUTFIELDSTART
                     // and CH_TXT_ATR_INPUTFIELDEND
                     rSh.SttSelect();
-                    rSh.SelectTxt( aFieldAtPos.pFndTxtAttr->GetStart() + 1,
-                                 *(aFieldAtPos.pFndTxtAttr->End()) - 1 );
+                    rSh.SelectText( aFieldAtPos.pFndTextAttr->GetStart() + 1,
+                                 *(aFieldAtPos.pFndTextAttr->End()) - 1 );
                 }
                 // don't reset here any longer so that, in case through MouseMove
                 // with pressed Ctrl key a multiple-selection should happen,
@@ -3660,9 +3660,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
         // Are we clicking on a field?
         if (g_bValidCrsrPos
             && rSh.GetContentAtPos(aDocPos, aFieldAtPos)
-            && aFieldAtPos.pFndTxtAttr != NULL
-            && aFieldAtPos.pFndTxtAttr->Which() == RES_TXTATR_INPUTFIELD
-            && (!pCrsrFld || pCrsrFld != aFieldAtPos.pFndTxtAttr->GetFmtFld().GetField()))
+            && aFieldAtPos.pFndTextAttr != NULL
+            && aFieldAtPos.pFndTextAttr->Which() == RES_TXTATR_INPUTFIELD
+            && (!pCrsrField || pCrsrField != aFieldAtPos.pFndTextAttr->GetFormatField().GetField()))
         {
             // Move the cursor
             MoveCursor( rSh, aDocPos, rSh.IsObjSelectable( aDocPos ), m_bWasShdwCrsr );
@@ -3671,8 +3671,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
             // select content of Input Field, but exclude CH_TXT_ATR_INPUTFIELDSTART
             // and CH_TXT_ATR_INPUTFIELDEND
             rSh.SttSelect();
-            rSh.SelectTxt( aFieldAtPos.pFndTxtAttr->GetStart() + 1,
-                         *(aFieldAtPos.pFndTxtAttr->End()) - 1 );
+            rSh.SelectText( aFieldAtPos.pFndTextAttr->GetStart() + 1,
+                         *(aFieldAtPos.pFndTextAttr->End()) - 1 );
         }
     }
 
@@ -3796,19 +3796,19 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
              !rSh.IsObjSelectable( aDocPt ) )
         {
             sal_uInt16 nPointer = USHRT_MAX;
-            bool bChkTblSel = false;
+            bool bChkTableSel = false;
 
             switch ( nMouseTabCol )
             {
                 case SwTab::COL_VERT :
                 case SwTab::ROW_HORI :
                     nPointer = POINTER_VSIZEBAR;
-                    bChkTblSel = true;
+                    bChkTableSel = true;
                     break;
                 case SwTab::ROW_VERT :
                 case SwTab::COL_HORI :
                     nPointer = POINTER_HSIZEBAR;
-                    bChkTblSel = true;
+                    bChkTableSel = true;
                     break;
                 // Enhanced table selection
                 case SwTab::SEL_HORI :
@@ -3834,7 +3834,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 
             if ( USHRT_MAX != nPointer &&
                 // i#35543 - Enhanced table selection is explicitly allowed in table mode
-                ( !bChkTblSel || !rSh.IsTableMode() ) )
+                ( !bChkTableSel || !rSh.IsTableMode() ) )
             {
                 SetPointer( nPointer );
             }
@@ -3844,7 +3844,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
         else if (rSh.IsNumLabel(aDocPt, RULER_MOUSE_MARGINWIDTH))
         {
             // i#42921 - consider vertical mode
-            SwTxtNode* pNodeAtPos = rSh.GetNumRuleNodeAtPos( aDocPt );
+            SwTextNode* pNodeAtPos = rSh.GetNumRuleNodeAtPos( aDocPt );
             const sal_uInt16 nPointer =
                     SwFEShell::IsVerticalModeAtNdAndPos( *pNodeAtPos, aDocPt )
                     ? POINTER_VSIZEBAR
@@ -3934,7 +3934,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                     // event processing for resizing
                     if (pSdrView && pSdrView->AreObjectsMarked())
                     {
-                        const SwFrmFmt* pFlyFmt;
+                        const SwFrameFormat* pFlyFormat;
                         const SvxMacro* pMacro;
 
                         const Point aSttPt( PixelToLogic( m_aStartPos ) );
@@ -3950,8 +3950,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                                             ? SW_EVENT_FRM_MOVE
                                             : SW_EVENT_FRM_RESIZE;
 
-                        if( 0 != ( pFlyFmt = rSh.GetFlyFrmFmt() ) &&
-                            0 != ( pMacro = pFlyFmt->GetMacro().GetMacroTable().
+                        if( 0 != ( pFlyFormat = rSh.GetFlyFrameFormat() ) &&
+                            0 != ( pMacro = pFlyFormat->GetMacro().GetMacroTable().
                             Get( nEvent )) &&
                         // or notify only e.g. every 20 Twip?
                             m_aRszMvHdlPt != aDocPt )
@@ -3960,7 +3960,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                             sal_uInt16 nPos = 0;
                             SbxArrayRef xArgs = new SbxArray;
                             SbxVariableRef xVar = new SbxVariable;
-                            xVar->PutString( pFlyFmt->GetName() );
+                            xVar->PutString( pFlyFormat->GetName() );
                             xArgs->Put( &xVar, ++nPos );
 
                             if( SW_EVENT_FRM_RESIZE == nEvent )
@@ -4078,14 +4078,14 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
             }
             // change ui if mouse is over SwPostItField
             // TODO: do the same thing for redlines SW_REDLINE
-            SwRect aFldRect;
-            SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD);
-            if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, false, &aFldRect ) )
+            SwRect aFieldRect;
+            SwContentAtPos aContentAtPos( SwContentAtPos::SW_FIELD);
+            if( rSh.GetContentAtPos( aDocPt, aContentAtPos, false, &aFieldRect ) )
             {
-                const SwField* pFld = aCntntAtPos.aFnd.pFld;
-                if (pFld->Which()== RES_POSTITFLD)
+                const SwField* pField = aContentAtPos.aFnd.pField;
+                if (pField->Which()== RES_POSTITFLD)
                 {
-                    m_rView.GetPostItMgr()->SetShadowState(reinterpret_cast<const SwPostItField*>(pFld),false);
+                    m_rView.GetPostItMgr()->SetShadowState(reinterpret_cast<const SwPostItField*>(pField),false);
                 }
                 else
                     m_rView.GetPostItMgr()->SetShadowState(0,false);
@@ -4103,27 +4103,27 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 
                 UpdatePointer( aDocPt, rMEvt.GetModifier() );
 
-                const SwFrmFmt* pFmt = 0;
-                const SwFmtINetFmt* pINet = 0;
-                SwContentAtPos aCntntAtPos( SwContentAtPos::SW_INETATTR );
-                if( rSh.GetContentAtPos( aDocPt, aCntntAtPos ) )
-                    pINet = static_cast<const SwFmtINetFmt*>(aCntntAtPos.aFnd.pAttr);
+                const SwFrameFormat* pFormat = 0;
+                const SwFormatINetFormat* pINet = 0;
+                SwContentAtPos aContentAtPos( SwContentAtPos::SW_INETATTR );
+                if( rSh.GetContentAtPos( aDocPt, aContentAtPos ) )
+                    pINet = static_cast<const SwFormatINetFormat*>(aContentAtPos.aFnd.pAttr);
 
                 const void* pTmp = pINet;
 
                 if( pINet ||
-                    0 != ( pTmp = pFmt = rSh.GetFmtFromAnyObj( aDocPt )))
+                    0 != ( pTmp = pFormat = rSh.GetFormatFromAnyObj( aDocPt )))
                 {
                     bTstShdwCrsr = false;
                     if( pTmp == pINet )
                         m_aSaveCallEvent.Set( pINet );
                     else
                     {
-                        IMapObject* pIMapObj = pFmt->GetIMapObject( aDocPt );
+                        IMapObject* pIMapObj = pFormat->GetIMapObject( aDocPt );
                         if( pIMapObj )
-                            m_aSaveCallEvent.Set( pFmt, pIMapObj );
+                            m_aSaveCallEvent.Set( pFormat, pIMapObj );
                         else
-                            m_aSaveCallEvent.Set( EVENT_OBJECT_URLITEM, pFmt );
+                            m_aSaveCallEvent.Set( EVENT_OBJECT_URLITEM, pFormat );
                     }
 
                     // should be over a InternetField with an
@@ -4250,10 +4250,10 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
             SdrPageView* pPV;
             if (pSdrView && pSdrView->PickObj(aDocPos, pSdrView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER ))
             {
-                std::map<SwFrmFmt*, SwFrmFmt*> aTextBoxShapes = SwTextBoxHelper::findShapes(rSh.GetDoc());
+                std::map<SwFrameFormat*, SwFrameFormat*> aTextBoxShapes = SwTextBoxHelper::findShapes(rSh.GetDoc());
                 SwDrawContact* pDrawContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
-                SwFrmFmt* pFmt = pDrawContact->GetFmt();
-                if (aTextBoxShapes.find(pFmt) == aTextBoxShapes.end())
+                SwFrameFormat* pFormat = pDrawContact->GetFormat();
+                if (aTextBoxShapes.find(pFormat) == aTextBoxShapes.end())
                 {
                     pSdrView->UnmarkAllObj();
                     pSdrView->MarkObj(pObj,pPV,false,false);
@@ -4261,7 +4261,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                 else
                 {
                     // If the fly frame is a textbox of a shape, then select the shape instead.
-                    SdrObject* pShape = aTextBoxShapes[pFmt]->FindSdrObject();
+                    SdrObject* pShape = aTextBoxShapes[pFormat]->FindSdrObject();
                     pSdrView->UnmarkAllObj();
                     pSdrView->MarkObj(pShape, pPV, false, false);
                 }
@@ -4384,15 +4384,15 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                 else
                 {
                     {
-                        const SwFrmFmt* pFlyFmt;
+                        const SwFrameFormat* pFlyFormat;
                         const SvxMacro* pMacro;
 
                         sal_uInt16 nEvent = HDL_MOVE == eOldSdrMoveHdl
                                             ? SW_EVENT_FRM_MOVE
                                             : SW_EVENT_FRM_RESIZE;
 
-                        if( 0 != ( pFlyFmt = rSh.GetFlyFrmFmt() ) &&
-                            0 != ( pMacro = pFlyFmt->GetMacro().GetMacroTable().
+                        if( 0 != ( pFlyFormat = rSh.GetFlyFrameFormat() ) &&
+                            0 != ( pMacro = pFlyFormat->GetMacro().GetMacroTable().
                             Get( nEvent )) )
                         {
                             const Point aSttPt( PixelToLogic( m_aStartPos ) );
@@ -4400,7 +4400,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                             sal_uInt16 nPos = 0;
                             SbxArrayRef xArgs = new SbxArray;
                             SbxVariableRef xVar = new SbxVariable;
-                            xVar->PutString( pFlyFmt->GetName() );
+                            xVar->PutString( pFlyFormat->GetName() );
                             xArgs->Put( &xVar, ++nPos );
 
                             if( SW_EVENT_FRM_RESIZE == nEvent )
@@ -4495,25 +4495,25 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                         if(m_pApplyTempl)
                             bExecHyperlinks = false;
 
-                        SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD |
+                        SwContentAtPos aContentAtPos( SwContentAtPos::SW_FIELD |
                                                     SwContentAtPos::SW_INETATTR |
                                                     SwContentAtPos::SW_SMARTTAG  | SwContentAtPos::SW_FORMCTRL);
 
-                        if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, false ) )
+                        if( rSh.GetContentAtPos( aDocPt, aContentAtPos, false ) )
                         {
                             // Do it again if we're not on a field/hyperlink to update the cursor accordingly
-                            if ( SwContentAtPos::SW_FIELD != aCntntAtPos.eCntntAtPos
-                                 && SwContentAtPos::SW_INETATTR != aCntntAtPos.eCntntAtPos )
-                                rSh.GetContentAtPos( aDocPt, aCntntAtPos, true );
+                            if ( SwContentAtPos::SW_FIELD != aContentAtPos.eContentAtPos
+                                 && SwContentAtPos::SW_INETATTR != aContentAtPos.eContentAtPos )
+                                rSh.GetContentAtPos( aDocPt, aContentAtPos, true );
 
                             bool bViewLocked = rSh.IsViewLocked();
                             if( !bViewLocked && !rSh.IsReadOnlyAvailable() &&
-                                aCntntAtPos.IsInProtectSect() )
+                                aContentAtPos.IsInProtectSect() )
                                 rSh.LockView( true );
 
                             ReleaseMouse();
 
-                            if( SwContentAtPos::SW_FIELD == aCntntAtPos.eCntntAtPos )
+                            if( SwContentAtPos::SW_FIELD == aContentAtPos.eContentAtPos )
                             {
                                 bool bAddMode(false);
                                 // AdditionalMode if applicable
@@ -4523,8 +4523,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                                     bAddMode = true;
                                     rSh.EnterAddMode();
                                 }
-                                if ( aCntntAtPos.pFndTxtAttr != NULL
-                                     && aCntntAtPos.pFndTxtAttr->Which() == RES_TXTATR_INPUTFIELD )
+                                if ( aContentAtPos.pFndTextAttr != NULL
+                                     && aContentAtPos.pFndTextAttr->Which() == RES_TXTATR_INPUTFIELD )
                                 {
                                     if (!rSh.IsInSelect())
                                     {
@@ -4541,7 +4541,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                                 }
                                 else
                                 {
-                                    rSh.ClickToField( *aCntntAtPos.aFnd.pFld );
+                                    rSh.ClickToField( *aContentAtPos.aFnd.pField );
                                     // a bit of a mystery what this is good for?
                                     // in this case we assume it's valid since we
                                     // just selected a field
@@ -4552,18 +4552,18 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                                     rSh.LeaveAddMode();
                                 }
                             }
-                            else if ( SwContentAtPos::SW_SMARTTAG == aCntntAtPos.eCntntAtPos )
+                            else if ( SwContentAtPos::SW_SMARTTAG == aContentAtPos.eContentAtPos )
                             {
                                     // execute smarttag menu
                                     if ( bExecSmarttags && SwSmartTagMgr::Get().IsSmartTagsEnabled() )
                                         m_rView.ExecSmartTagPopup( aDocPt );
                             }
-                            else if ( SwContentAtPos::SW_FORMCTRL == aCntntAtPos.eCntntAtPos )
+                            else if ( SwContentAtPos::SW_FORMCTRL == aContentAtPos.eContentAtPos )
                             {
-                                OSL_ENSURE( aCntntAtPos.aFnd.pFldmark != NULL, "where is my field ptr???");
-                                if ( aCntntAtPos.aFnd.pFldmark != NULL)
+                                OSL_ENSURE( aContentAtPos.aFnd.pFieldmark != NULL, "where is my field ptr???");
+                                if ( aContentAtPos.aFnd.pFieldmark != NULL)
                                 {
-                                    IFieldmark *fieldBM = const_cast< IFieldmark* > ( aCntntAtPos.aFnd.pFldmark );
+                                    IFieldmark *fieldBM = const_cast< IFieldmark* > ( aContentAtPos.aFnd.pFieldmark );
                                     if ( fieldBM->GetFieldname( ) == ODF_FORMCHECKBOX )
                                     {
                                         ICheckboxFieldmark& rCheckboxFm = dynamic_cast<ICheckboxFieldmark&>(*fieldBM);
@@ -4579,10 +4579,10 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                                     }
                                 }
                             }
-                            else if ( SwContentAtPos::SW_INETATTR == aCntntAtPos.eCntntAtPos )
+                            else if ( SwContentAtPos::SW_INETATTR == aContentAtPos.eContentAtPos )
                             {
-                                if ( bExecHyperlinks && aCntntAtPos.aFnd.pAttr )
-                                    rSh.ClickToINetAttr( *static_cast<const SwFmtINetFmt*>(aCntntAtPos.aFnd.pAttr), nFilter );
+                                if ( bExecHyperlinks && aContentAtPos.aFnd.pAttr )
+                                    rSh.ClickToINetAttr( *static_cast<const SwFormatINetFormat*>(aContentAtPos.aFnd.pAttr), nFilter );
                             }
 
                             rSh.LockView( bViewLocked );
@@ -4590,8 +4590,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                         }
                         else
                         {
-                            aCntntAtPos = SwContentAtPos( SwContentAtPos::SW_FTN );
-                            if( !rSh.GetContentAtPos( aDocPt, aCntntAtPos, true ) && bExecHyperlinks )
+                            aContentAtPos = SwContentAtPos( SwContentAtPos::SW_FTN );
+                            if( !rSh.GetContentAtPos( aDocPt, aContentAtPos, true ) && bExecHyperlinks )
                             {
                                 SdrViewEvent aVEvt;
 
@@ -4734,37 +4734,37 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                     if( (( nsSelectionType::SEL_TXT | nsSelectionType::SEL_TBL )
                          & eSelection ) && !rSh.HasReadonlySel() )
                     {
-                        rSh.SetTxtFmtColl( m_pApplyTempl->aColl.pTxtColl );
+                        rSh.SetTextFormatColl( m_pApplyTempl->aColl.pTextColl );
                         m_pApplyTempl->bUndo = true;
                         bCallBase = false;
-                        if ( m_pApplyTempl->aColl.pTxtColl )
-                            aStyleName = m_pApplyTempl->aColl.pTxtColl->GetName();
+                        if ( m_pApplyTempl->aColl.pTextColl )
+                            aStyleName = m_pApplyTempl->aColl.pTextColl->GetName();
                     }
                     break;
                 case SFX_STYLE_FAMILY_CHAR:
                     if( (( nsSelectionType::SEL_TXT | nsSelectionType::SEL_TBL )
                          & eSelection ) && !rSh.HasReadonlySel() )
                     {
-                        rSh.SetAttrItem( SwFmtCharFmt(m_pApplyTempl->aColl.pCharFmt) );
+                        rSh.SetAttrItem( SwFormatCharFormat(m_pApplyTempl->aColl.pCharFormat) );
                         rSh.UnSetVisCrsr();
                         rSh.EnterStdMode();
                         rSh.SetVisCrsr(aDocPt);
                         m_pApplyTempl->bUndo = true;
                         bCallBase = false;
-                        if ( m_pApplyTempl->aColl.pCharFmt )
-                            aStyleName = m_pApplyTempl->aColl.pCharFmt->GetName();
+                        if ( m_pApplyTempl->aColl.pCharFormat )
+                            aStyleName = m_pApplyTempl->aColl.pCharFormat->GetName();
                     }
                     break;
                 case SFX_STYLE_FAMILY_FRAME :
                 {
-                    const SwFrmFmt* pFmt = rSh.GetFmtFromObj( aDocPt );
-                    if(PTR_CAST(SwFlyFrmFmt, pFmt))
+                    const SwFrameFormat* pFormat = rSh.GetFormatFromObj( aDocPt );
+                    if(PTR_CAST(SwFlyFrameFormat, pFormat))
                     {
-                        rSh.SetFrmFmt( m_pApplyTempl->aColl.pFrmFmt, false, &aDocPt );
+                        rSh.SetFrameFormat( m_pApplyTempl->aColl.pFrameFormat, false, &aDocPt );
                         m_pApplyTempl->bUndo = true;
                         bCallBase = false;
-                        if( m_pApplyTempl->aColl.pFrmFmt )
-                            aStyleName = m_pApplyTempl->aColl.pFrmFmt->GetName();
+                        if( m_pApplyTempl->aColl.pFrameFormat )
+                            aStyleName = m_pApplyTempl->aColl.pFrameFormat->GetName();
                     }
                     break;
                 }
@@ -4923,8 +4923,8 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
     m_bIsInDrag(false),
     m_bOldIdle(false),
     m_bOldIdleSet(false),
-    m_bTblInsDelMode(false),
-    m_bTblIsInsMode(false),
+    m_bTableInsDelMode(false),
+    m_bTableIsInsMode(false),
     m_bChainMode(false),
     m_bWasShdwCrsr(false),
     m_bLockInput(false),
@@ -4949,7 +4949,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
     SetPointer( POINTER_TEXT );
     m_aTimer.SetTimeoutHdl(LINK(this, SwEditWin, TimerHandler));
 
-    m_bTblInsDelMode = false;
+    m_bTableInsDelMode = false;
     m_aKeyInputTimer.SetTimeout( 3000 );
     m_aKeyInputTimer.SetTimeoutHdl(LINK(this, SwEditWin, KeyInputTimerHandler));
 
@@ -5428,7 +5428,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
                 rSh.GetCrsr()->GetPoint()->nContent = nPosIdx;
                 rSh.GetCrsr()->GetMark()->nNode = nPosNodeIdx;
                 rSh.GetCrsr()->GetMark()->nContent =
-                    rSh.GetCrsr()->GetCntntNode( true )->Len();
+                    rSh.GetCrsr()->GetContentNode( true )->Len();
                 }
                 else if( nPosNodeIdx == nMarkNodeIdx )
                 {
@@ -5443,7 +5443,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
                 rSh.GetCrsr()->GetMark()->nContent = nMarkIdx;
                 rSh.GetCrsr()->GetPoint()->nNode = nMarkNodeIdx;
                 rSh.GetCrsr()->GetPoint()->nContent =
-                    rSh.GetCrsr()->GetCntntNode( false )->Len();
+                    rSh.GetCrsr()->GetContentNode( false )->Len();
                 }
 
                 rSh.EndCrsrMove( true );
@@ -5742,7 +5742,7 @@ IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputFlushHandler, Timer *, void)
 
 IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputTimerHandler, Timer *, void)
 {
-    m_bTblInsDelMode = false;
+    m_bTableInsDelMode = false;
 }
 
 void SwEditWin::_InitStaticData()
@@ -5813,7 +5813,7 @@ void QuickHelpData::Move( QuickHelpData& rCpy )
     m_bIsAutoText = rCpy.m_bIsAutoText;
 }
 
-void QuickHelpData::ClearCntnt()
+void QuickHelpData::ClearContent()
 {
     nLen = nCurArrPos = 0;
     m_bIsDisplayed = m_bAppendSpace = false;
@@ -5874,7 +5874,7 @@ void QuickHelpData::Stop( SwWrtShell& rSh )
         rSh.DeleteExtTextInput( 0, false );
     else if( nTipId )
         Help::HideTip( nTipId );
-    ClearCntnt();
+    ClearContent();
 }
 
 void QuickHelpData::FillStrArr( SwWrtShell& rSh, const OUString& rWord )
@@ -6032,7 +6032,7 @@ void SwEditWin::ShowAutoTextCorrectQuickHelp(
         bool bFromIME )
 {
     SwWrtShell& rSh = m_rView.GetWrtShell();
-    m_pQuickHlpData->ClearCntnt();
+    m_pQuickHlpData->ClearContent();
     if( pACfg->IsAutoTextTip() )
     {
         SwGlossaryList* pList = ::GetGlossaryList();
@@ -6107,10 +6107,10 @@ bool SwEditWin::IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType& r
     if ( pStartFly )
     {
         bOverFly = true;
-        SwFrmFmt* pFlyFmt = pStartFly->GetFlyFmt( );
-        if ( pFlyFmt )
+        SwFrameFormat* pFlyFormat = pStartFly->GetFlyFormat( );
+        if ( pFlyFormat )
         {
-            const SwPosition* pAnchor = pFlyFmt->GetAnchor( ).GetCntntAnchor( );
+            const SwPosition* pAnchor = pFlyFormat->GetAnchor( ).GetContentAnchor( );
             if ( pAnchor )
             {
                 bool bInHeader = pAnchor->nNode.GetNode( ).FindHeaderStartNode( ) != NULL;
@@ -6123,7 +6123,7 @@ bool SwEditWin::IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType& r
                     rControl = Footer;
             }
             else
-                bPageAnchored = pFlyFmt->GetAnchor( ).GetAnchorId( ) == FLY_AT_PAGE;
+                bPageAnchored = pFlyFormat->GetAnchor( ).GetAnchorId( ) == FLY_AT_PAGE;
         }
     }
     else
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 28f5929a83df..47ef3ef52195 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -91,15 +91,15 @@ static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, bool bBalloon )
     return sBuf.makeStringAndClear();
 }
 
-OUString SwEditWin::ClipLongToolTip(const OUString& rTxt)
+OUString SwEditWin::ClipLongToolTip(const OUString& rText)
 {
-    OUString sDisplayTxt(rTxt);
-    long nTextWidth = GetTextWidth(sDisplayTxt);
+    OUString sDisplayText(rText);
+    long nTextWidth = GetTextWidth(sDisplayText);
     long nMaxWidth = GetDesktopRectPixel().GetWidth() * 2 / 3;
     nMaxWidth = PixelToLogic(Size(nMaxWidth, 0)).Width();
     if (nTextWidth > nMaxWidth)
-        sDisplayTxt = GetEllipsisString(sDisplayTxt, nMaxWidth, DrawTextFlags::CenterEllipsis);
-    return sDisplayTxt;
+        sDisplayText = GetEllipsisString(sDisplayText, nMaxWidth, DrawTextFlags::CenterEllipsis);
+    return sDisplayText;
 }
 
 void SwEditWin::RequestHelp(const HelpEvent &rEvt)
@@ -110,7 +110,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
         return;
     bool bContinue = true;
     SET_CURR_SHELL(&rSh);
-    OUString sTxt;
+    OUString sText;
     Point aPos( PixelToLogic( ScreenToOutputPixel( rEvt.GetMousePosPixel() ) ));
     bool bBalloon = bool(rEvt.GetMode() & HelpEventMode::BALLOON);
 
@@ -128,8 +128,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 
     if( bContinue && bQuickBalloon)
     {
-        SwRect aFldRect;
-        SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD |
+        SwRect aFieldRect;
+        SwContentAtPos aContentAtPos( SwContentAtPos::SW_FIELD |
                                     SwContentAtPos::SW_INETATTR |
                                     SwContentAtPos::SW_FTN |
                                     SwContentAtPos::SW_REDLINE |
@@ -142,39 +142,39 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 #endif
                                     SwContentAtPos::SW_TABLEBOXFML );
 
-        if( rSh.GetContentAtPos( aPos, aCntntAtPos, false, &aFldRect ) )
+        if( rSh.GetContentAtPos( aPos, aContentAtPos, false, &aFieldRect ) )
         {
             QuickHelpFlags nStyle = QuickHelpFlags::NONE; // style of quick help
-            switch( aCntntAtPos.eCntntAtPos )
+            switch( aContentAtPos.eContentAtPos )
             {
             case SwContentAtPos::SW_TABLEBOXFML:
-                sTxt = "= ";
-                sTxt += static_cast<const SwTblBoxFormula*>(aCntntAtPos.aFnd.pAttr)->GetFormula();
+                sText = "= ";
+                sText += static_cast<const SwTableBoxFormula*>(aContentAtPos.aFnd.pAttr)->GetFormula();
                 break;
 #ifdef DBG_UTIL
             case SwContentAtPos::SW_TABLEBOXVALUE:
             {
-                sTxt = OStringToOUString(OString::number(
-                            static_cast<const SwTblBoxValue*>(aCntntAtPos.aFnd.pAttr)->GetValue()),
+                sText = OStringToOUString(OString::number(
+                            static_cast<const SwTableBoxValue*>(aContentAtPos.aFnd.pAttr)->GetValue()),
                             osl_getThreadTextEncoding());
             }
             break;
             case SwContentAtPos::SW_CURR_ATTRS:
-                sTxt = aCntntAtPos.sStr;
+                sText = aContentAtPos.sStr;
                 break;
 #endif
 
             case SwContentAtPos::SW_INETATTR:
             {
-                sTxt = static_cast<const SfxStringItem*>(aCntntAtPos.aFnd.pAttr)->GetValue();
-                sTxt = URIHelper::removePassword( sTxt,
+                sText = static_cast<const SfxStringItem*>(aContentAtPos.aFnd.pAttr)->GetValue();
+                sText = URIHelper::removePassword( sText,
                                         INetURLObject::WAS_ENCODED,
                                            INetURLObject::DECODE_UNAMBIGUOUS);
                 //#i63832# remove the link target type
-                sal_Int32 nFound = sTxt.indexOf(cMarkSeparator);
-                if( nFound != -1 && (++nFound) < sTxt.getLength() )
+                sal_Int32 nFound = sText.indexOf(cMarkSeparator);
+                if( nFound != -1 && (++nFound) < sText.getLength() )
                 {
-                    OUString sSuffix( sTxt.copy(nFound) );
+                    OUString sSuffix( sText.copy(nFound) );
                     if( sSuffix == "table" ||
                         sSuffix == "frame" ||
                         sSuffix == "region" ||
@@ -182,12 +182,12 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                         sSuffix == "text" ||
                         sSuffix == "graphic" ||
                         sSuffix == "ole" )
-                    sTxt = sTxt.copy( 0, nFound - 1);
+                    sText = sText.copy( 0, nFound - 1);
                 }
                 // #i104300#
                 // special handling if target is a cross-reference bookmark
                 {
-                    OUString sTmpSearchStr = sTxt.copy( 1 );
+                    OUString sTmpSearchStr = sText.copy( 1 );
                     IDocumentMarkAccess* const pMarkAccess =
                                                 rSh.getIDocumentMarkAccess();
                     IDocumentMarkAccess::const_iterator_t ppBkmk =
@@ -196,14 +196,14 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                          IDocumentMarkAccess::GetType( *(ppBkmk->get()) )
                             == IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK )
                     {
-                        SwTxtNode* pTxtNode = ppBkmk->get()->GetMarkStart().nNode.GetNode().GetTxtNode();
-                        if ( pTxtNode )
+                        SwTextNode* pTextNode = ppBkmk->get()->GetMarkStart().nNode.GetNode().GetTextNode();
+                        if ( pTextNode )
                         {
-                            sTxt = pTxtNode->GetExpandTxt( 0, pTxtNode->Len(), true, true );
+                            sText = pTextNode->GetExpandText( 0, pTextNode->Len(), true, true );
 
-                            if( !sTxt.isEmpty() )
+                            if( !sText.isEmpty() )
                             {
-                                OUStringBuffer sTmp(comphelper::string::remove(sTxt, 0xad));
+                                OUStringBuffer sTmp(comphelper::string::remove(sText, 0xad));
                                 for (sal_Int32 i = 0; i < sTmp.getLength(); ++i)
                                 {
                                     if (sTmp[i] < 0x20)
@@ -211,7 +211,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                                     else if (sTmp[i] == 0x2011)
                                         sTmp[i] = '-';
                                 }
-                                sTxt = sTmp.makeStringAndClear();
+                                sText = sTmp.makeStringAndClear();
                             }
                         }
                     }
@@ -223,11 +223,11 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                     SvtSecurityOptions aSecOpts;
                     bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
 
-                    sTxt = ": " + sTxt;
+                    sText = ": " + sText;
                     if ( !bExecHyperlinks )
-                        sTxt = SwViewShell::GetShellRes()->aLinkCtrlClick + sTxt;
+                        sText = SwViewShell::GetShellRes()->aLinkCtrlClick + sText;
                     else
-                        sTxt = SwViewShell::GetShellRes()->aLinkClick + sTxt;
+                        sText = SwViewShell::GetShellRes()->aLinkClick + sText;
                 }
                 break;
             }
@@ -238,47 +238,47 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 OUString aModStr( aModifiedCode.GetName() );
                 aModStr = aModStr.replaceFirst(aCode.GetName(), OUString());
                 aModStr = aModStr.replaceAll("+", OUString());
-                sTxt = SW_RESSTR(STR_SMARTTAG_CLICK).replaceAll("%s", aModStr);
+                sText = SW_RESSTR(STR_SMARTTAG_CLICK).replaceAll("%s", aModStr);
             }
             break;
 
             case SwContentAtPos::SW_FTN:
-                if( aCntntAtPos.pFndTxtAttr && aCntntAtPos.aFnd.pAttr )
+                if( aContentAtPos.pFndTextAttr && aContentAtPos.aFnd.pAttr )
                 {
-                    const SwFmtFtn* pFtn = static_cast<const SwFmtFtn*>(aCntntAtPos.aFnd.pAttr);
+                    const SwFormatFootnote* pFootnote = static_cast<const SwFormatFootnote*>(aContentAtPos.aFnd.pAttr);
                     OUString sTmp;
-                    pFtn->GetFtnText( sTmp );
-                    sTxt = SW_RESSTR( pFtn->IsEndNote()
+                    pFootnote->GetFootnoteText( sTmp );
+                    sText = SW_RESSTR( pFootnote->IsEndNote()
                                     ? STR_ENDNOTE : STR_FTNNOTE ) + sTmp;
                     bBalloon = true;
-                    if( aCntntAtPos.IsInRTLText() )
+                    if( aContentAtPos.IsInRTLText() )
                         nStyle |= QuickHelpFlags::BiDiRtl;
                 }
                 break;
 
             case SwContentAtPos::SW_REDLINE:
-                sTxt = lcl_GetRedlineHelp(*aCntntAtPos.aFnd.pRedl, bBalloon);
+                sText = lcl_GetRedlineHelp(*aContentAtPos.aFnd.pRedl, bBalloon);
                 break;
 
             case SwContentAtPos::SW_TOXMARK:
-                sTxt = aCntntAtPos.sStr;
-                if( !sTxt.isEmpty() && aCntntAtPos.pFndTxtAttr )
+                sText = aContentAtPos.sStr;
+                if( !sText.isEmpty() && aContentAtPos.pFndTextAttr )
                 {
-                    const SwTOXType* pTType = aCntntAtPos.pFndTxtAttr->
+                    const SwTOXType* pTType = aContentAtPos.pFndTextAttr->
                                         GetTOXMark().GetTOXType();
                     if( pTType && !pTType->GetTypeName().isEmpty() )
                     {
-                        sTxt = ": " + sTxt;
-                        sTxt = pTType->GetTypeName() + sTxt;
+                        sText = ": " + sText;
+                        sText = pTType->GetTypeName() + sText;
                     }
                 }
                 break;
             case SwContentAtPos::SW_REFMARK:
-                if(aCntntAtPos.aFnd.pAttr)
+                if(aContentAtPos.aFnd.pAttr)
                 {
-                    sTxt = SW_RESSTR(STR_CONTENT_TYPE_SINGLE_REFERENCE);
-                    sTxt += ": ";
-                    sTxt += static_cast<const SwFmtRefMark*>(aCntntAtPos.aFnd.pAttr)->GetRefName();
+                    sText = SW_RESSTR(STR_CONTENT_TYPE_SINGLE_REFERENCE);
+                    sText += ": ";
+                    sText += static_cast<const SwFormatRefMark*>(aContentAtPos.aFnd.pAttr)->GetRefName();
                 }
             break;
 
@@ -287,17 +287,17 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                     SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
                     if(!pModOpt->IsHideFieldTips())
                     {
-                        const SwField* pFld = aCntntAtPos.aFnd.pFld;
-                        switch( pFld->Which() )
+                        const SwField* pField = aContentAtPos.aFnd.pField;
+                        switch( pField->Which() )
                         {
                         case RES_SETEXPFLD:
                         case RES_TABLEFLD:
                         case RES_GETEXPFLD:
                         {
-                            sal_uInt16 nOldSubType = pFld->GetSubType();
-                            const_cast<SwField*>(pFld)->SetSubType(nsSwExtendedSubType::SUB_CMD);
-                            sTxt = pFld->ExpandField(true);
-                            const_cast<SwField*>(pFld)->SetSubType(nOldSubType);
+                            sal_uInt16 nOldSubType = pField->GetSubType();
+                            const_cast<SwField*>(pField)->SetSubType(nsSwExtendedSubType::SUB_CMD);
+                            sText = pField->ExpandField(true);
+                            const_cast<SwField*>(pField)->SetSubType(nOldSubType);
                         }
                         break;
 
@@ -309,45 +309,45 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                             bBalloon = true;
                             /* no break */
                         case RES_JUMPEDITFLD:
-                            sTxt = pFld->GetPar2();
+                            sText = pField->GetPar2();
                             break;
 
                         case RES_DBFLD:
-                            sTxt = pFld->GetFieldName();
+                            sText = pField->GetFieldName();
                             break;
 
                         case RES_USERFLD:
                         case RES_HIDDENTXTFLD:
-                            sTxt = pFld->GetPar1();
+                            sText = pField->GetPar1();
                             break;
 
                         case RES_DOCSTATFLD:
                             break;
 
                         case RES_MACROFLD:
-                            sTxt = static_cast<const SwMacroField*>(pFld)->GetMacro();
+                            sText = static_cast<const SwMacroField*>(pField)->GetMacro();
                             break;
 
                         case RES_GETREFFLD:
                         {
                             // #i85090#
-                            const SwGetRefField* pRefFld( dynamic_cast<const SwGetRefField*>(pFld) );
-                            OSL_ENSURE( pRefFld,
-                                    "<SwEditWin::RequestHelp(..)> - unexpected type of <pFld>" );
-                            if ( pRefFld )
+                            const SwGetRefField* pRefField( dynamic_cast<const SwGetRefField*>(pField) );
+                            OSL_ENSURE( pRefField,
+                                    "<SwEditWin::RequestHelp(..)> - unexpected type of <pField>" );
+                            if ( pRefField )
                             {
-                                if ( pRefFld->IsRefToHeadingCrossRefBookmark() ||
-                                     pRefFld->IsRefToNumItemCrossRefBookmark() )
+                                if ( pRefField->IsRefToHeadingCrossRefBookmark() ||
+                                     pRefField->IsRefToNumItemCrossRefBookmark() )
                                 {
-                                    sTxt = pRefFld->GetExpandedTxtOfReferencedTxtNode();
-                                    if ( sTxt.getLength() > 80  )
+                                    sText = pRefField->GetExpandedTextOfReferencedTextNode();
+                                    if ( sText.getLength() > 80  )
                                     {
-                                        sTxt = sTxt.copy(0, 80) + "...";
+                                        sText = sText.copy(0, 80) + "...";
                                     }
                                 }
                                 else
                                 {
-                                    sTxt = static_cast<const SwGetRefField*>(pFld)->GetSetRefName();
+                                    sText = static_cast<const SwGetRefField*>(pField)->GetSetRefName();
                                 }
                             }
                         }
@@ -355,30 +355,30 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                         }
                     }
 
-                    if( sTxt.isEmpty() )
+                    if( sText.isEmpty() )
                     {
-                        aCntntAtPos.eCntntAtPos = SwContentAtPos::SW_REDLINE;
-                        if( rSh.GetContentAtPos( aPos, aCntntAtPos, false, &aFldRect ) )
-                            sTxt = lcl_GetRedlineHelp(*aCntntAtPos.aFnd.pRedl, bBalloon);
+                        aContentAtPos.eContentAtPos = SwContentAtPos::SW_REDLINE;
+                        if( rSh.GetContentAtPos( aPos, aContentAtPos, false, &aFieldRect ) )
+                            sText = lcl_GetRedlineHelp(*aContentAtPos.aFnd.pRedl, bBalloon);
                     }
                 }
             }
-            if (!sTxt.isEmpty())
+            if (!sText.isEmpty())
             {
                 if( bBalloon )
-                    Help::ShowBalloon( this, rEvt.GetMousePosPixel(), sTxt );
+                    Help::ShowBalloon( this, rEvt.GetMousePosPixel(), sText );
                 else
                 {
                     // the show the help
-                    Rectangle aRect( aFldRect.SVRect() );
+                    Rectangle aRect( aFieldRect.SVRect() );
                     Point aPt( OutputToScreenPixel( LogicToPixel( aRect.TopLeft() )));
                     aRect.Left()   = aPt.X();
                     aRect.Top()    = aPt.Y();
                     aPt = OutputToScreenPixel( LogicToPixel( aRect.BottomRight() ));
                     aRect.Right()  = aPt.X();
                     aRect.Bottom() = aPt.Y();
-                    OUString sDisplayTxt(ClipLongToolTip(sTxt));
-                    Help::ShowQuickHelp(this, aRect, sDisplayTxt, nStyle);
+                    OUString sDisplayText(ClipLongToolTip(sText));
+                    Help::ShowQuickHelp(this, aRect, sDisplayText, nStyle);
                 }
             }
 
@@ -417,11 +417,11 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
             }
             if(nTabRes)
             {
-                sTxt = SW_RESSTR(nTabRes);
-                Size aTxtSize( GetTextWidth(sTxt), GetTextHeight());
-                Rectangle aRect(rEvt.GetMousePosPixel(), aTxtSize);
-                OUString sDisplayTxt(ClipLongToolTip(sTxt));
-                Help::ShowQuickHelp(this, aRect, sDisplayTxt);
+                sText = SW_RESSTR(nTabRes);
+                Size aTextSize( GetTextWidth(sText), GetTextHeight());
+                Rectangle aRect(rEvt.GetMousePosPixel(), aTextSize);
+                OUString sDisplayText(ClipLongToolTip(sText));
+                Help::ShowQuickHelp(this, aRect, sDisplayText);
             }
             bContinue = false;
         }
diff --git a/sw/source/uibase/docvw/edtwin3.cxx b/sw/source/uibase/docvw/edtwin3.cxx
index 0f7fc2a24ba9..2d7502a51ba8 100644
--- a/sw/source/uibase/docvw/edtwin3.cxx
+++ b/sw/source/uibase/docvw/edtwin3.cxx
@@ -101,10 +101,10 @@ bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
     return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
 }
 
-TblChgMode GetTblChgDefaultMode()
+TableChgMode GetTableChgDefaultMode()
 {
     SwModuleOptions* pOpt = SW_MOD()->GetModuleConfig();
-    return pOpt ? pOpt->GetTblMode() : TBLVAR_CHGABS;
+    return pOpt ? pOpt->GetTableMode() : TBLVAR_CHGABS;
 }
 
 void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect )
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
index 2c037ffaf4bb..dd4193bec003 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
@@ -93,7 +93,7 @@ SwFrmSidebarWinContainer::~SwFrmSidebarWinContainer()
 }
 
 bool SwFrmSidebarWinContainer::insert( const SwFrm& rFrm,
-                                       const SwFmtFld& rFmtFld,
+                                       const SwFormatField& rFormatField,
                                        SwSidebarWin& rSidebarWin )
 {
     bool bInserted( false );
@@ -101,7 +101,7 @@ bool SwFrmSidebarWinContainer::insert( const SwFrm& rFrm,
     FrmKey aFrmKey( &rFrm );
     SidebarWinContainer& rSidebarWinContainer = (*mpFrmSidebarWinContainer)[ aFrmKey ];
 
-    SidebarWinKey aSidebarWinKey( rFmtFld.GetTxtFld()->GetStart() );
+    SidebarWinKey aSidebarWinKey( rFormatField.GetTextField()->GetStart() );
     if ( rSidebarWinContainer.empty() ||
          rSidebarWinContainer.find( aSidebarWinKey) == rSidebarWinContainer.end() )
     {
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
index fc7834c7e932..59aa0df6cebf 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
@@ -23,7 +23,7 @@
 #include <vector>
 
 class SwFrm;
-class SwFmtFld;
+class SwFormatField;
 namespace vcl { class Window; }
 
 namespace sw { namespace sidebarwindows {
@@ -38,7 +38,7 @@ class SwFrmSidebarWinContainer
         ~SwFrmSidebarWinContainer();
 
         bool insert( const SwFrm& rFrm,
-                     const SwFmtFld& rFmtFld,
+                     const SwFormatField& rFormatField,
                      SwSidebarWin& rSidebarWin );
 
         bool remove( const SwFrm& rFrm,
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index a4d51ae14ceb..77c0adc07063 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -93,13 +93,13 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
     rSh.IsURLGrfAtPos( rDocPos, &sURL, &sTargetFrameName, &sDescription );
     if ( sURL.isEmpty() )
     {
-        SwContentAtPos aCntntAtPos( SwContentAtPos::SW_INETATTR );
-        if( rSh.GetContentAtPos( rDocPos, aCntntAtPos, false))
+        SwContentAtPos aContentAtPos( SwContentAtPos::SW_INETATTR );
+        if( rSh.GetContentAtPos( rDocPos, aContentAtPos, false))
         {
-            const SwFmtINetFmt &rIItem = *static_cast<const SwFmtINetFmt*>(aCntntAtPos.aFnd.pAttr);
+            const SwFormatINetFormat &rIItem = *static_cast<const SwFormatINetFormat*>(aContentAtPos.aFnd.pAttr);
             sURL = rIItem.GetValue();
             sTargetFrameName = rIItem.GetTargetFrame();
-            sDescription = aCntntAtPos.sStr;
+            sDescription = aContentAtPos.sStr;
         }
     }
 
@@ -113,12 +113,12 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
     else
     {
         aGraphic = *pGrf;
-        const SwFrmFmt* pGrfFmt = rSh.GetFmtFromObj( rDocPos );
+        const SwFrameFormat* pGrfFormat = rSh.GetFormatFromObj( rDocPos );
         const SfxPoolItem* pURLItem;
-        if( pGrfFmt && SfxItemState::SET == pGrfFmt->GetItemState(
+        if( pGrfFormat && SfxItemState::SET == pGrfFormat->GetItemState(
             RES_URL, true, &pURLItem ))
         {
-            const SwFmtURL& rURL = *static_cast<const SwFmtURL*>(pURLItem);
+            const SwFormatURL& rURL = *static_cast<const SwFormatURL*>(pURLItem);
             if( rURL.GetMap() )
                 pImageMap = new ImageMap( *rURL.GetMap() );
             else if( !rURL.GetURL().isEmpty() )
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 80308ff785b5..a205c1515e9a 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -138,19 +138,19 @@ static const sal_uInt16 VF_USR_COUNT = 2; // { 0, nsSwExtendedSubType::SUB_CMD }
 static const sal_uInt16 VF_DB_COUNT = 1; // { nsSwExtendedSubType::SUB_OWN_FMT }
 
 // field types and subtypes
-struct SwFldPack
+struct SwFieldPack
 {
     sal_uInt16  nTypeId;
 
     sal_uInt16  nSubTypeStart;
     sal_uInt16  nSubTypeEnd;
 
-    sal_uLong   nFmtBegin;
-    sal_uLong   nFmtEnd;
+    sal_uLong   nFormatBegin;
+    sal_uLong   nFormatEnd;
 };
 
 // strings and formats
-static const SwFldPack aSwFlds[] =
+static const SwFieldPack aSwFields[] =
 {
     // Document
     { TYP_EXTUSERFLD,       FLD_EU_BEGIN,       FLD_EU_END,     0,                  0 },
@@ -213,25 +213,25 @@ static SwWrtShell* lcl_GetShell()
     return 0;
 }
 
-inline sal_uInt16 GetPackCount() {  return sizeof(aSwFlds) / sizeof(SwFldPack); }
+inline sal_uInt16 GetPackCount() {  return sizeof(aSwFields) / sizeof(SwFieldPack); }
 
 // FieldManager controls inserting and updating of fields
-SwFldMgr::SwFldMgr(SwWrtShell* pSh ) :
+SwFieldMgr::SwFieldMgr(SwWrtShell* pSh ) :
     pModule(0),
     pMacroItem(0),
     pWrtShell(pSh),
     bEvalExp(true)
 {
     // determine current field if existing
-    GetCurFld();
+    GetCurField();
 }
 
-SwFldMgr::~SwFldMgr()
+SwFieldMgr::~SwFieldMgr()
 {
 }
 
 // organise RefMark by names
-bool  SwFldMgr::CanInsertRefMark( const OUString& rStr )
+bool  SwFieldMgr::CanInsertRefMark( const OUString& rStr )
 {
     bool bRet = false;
     SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell();
@@ -250,60 +250,60 @@ bool  SwFldMgr::CanInsertRefMark( const OUString& rStr )
 }
 
 // access over ResIds
-void SwFldMgr::RemoveFldType(sal_uInt16 nResId, const OUString& rName )
+void SwFieldMgr::RemoveFieldType(sal_uInt16 nResId, const OUString& rName )
 {
     SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell();
     OSL_ENSURE(pSh, "no SwWrtShell found");
     if( pSh )
-        pSh->RemoveFldType(nResId, rName);
+        pSh->RemoveFieldType(nResId, rName);
 }
 
-sal_uInt16 SwFldMgr::GetFldTypeCount(sal_uInt16 nResId) const
+sal_uInt16 SwFieldMgr::GetFieldTypeCount(sal_uInt16 nResId) const
 {
     SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell();
     OSL_ENSURE(pSh, "no SwWrtShell found");
-    return pSh ? pSh->GetFldTypeCount(nResId) : 0;
+    return pSh ? pSh->GetFieldTypeCount(nResId) : 0;
 }
 
-SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, sal_uInt16 nId) const
+SwFieldType* SwFieldMgr::GetFieldType(sal_uInt16 nResId, sal_uInt16 nId) const
 {
     SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell();
     OSL_ENSURE(pSh, "no SwWrtShell found");
-    return pSh ? pSh->GetFldType(nId, nResId) : 0;
+    return pSh ? pSh->GetFieldType(nId, nResId) : 0;
 }
 
-SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, const OUString& rName) const
+SwFieldType* SwFieldMgr::GetFieldType(sal_uInt16 nResId, const OUString& rName) const
 {
     SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell();
     OSL_ENSURE(pSh, "no SwWrtShell found");
-    return pSh ? pSh->GetFldType(nResId, rName) : 0;
+    return pSh ? pSh->GetFieldType(nResId, rName) : 0;
 }
 
 // determine current field
-SwField* SwFldMgr::GetCurFld()
+SwField* SwFieldMgr::GetCurField()
 {
     SwWrtShell *pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
     if ( pSh )
-        pCurFld = pSh->GetCurFld( true );
+        pCurField = pSh->GetCurField( true );
     else
-        pCurFld = NULL;
+        pCurField = NULL;
 
     // initialise strings and format
     aCurPar1.clear();
     aCurPar2.clear();
     sCurFrame.clear();
-    nCurFmt = 0;
+    nCurFormat = 0;
 
-    if(!pCurFld)
+    if(!pCurField)
         return 0;
 
     // preprocess current values; determine parameter 1 and parameter 2
     // as well as the format
-    const sal_uInt16 nTypeId = pCurFld->GetTypeId();
+    const sal_uInt16 nTypeId = pCurField->GetTypeId();
 
-    nCurFmt     = pCurFld->GetFormat();
-    aCurPar1    = pCurFld->GetPar1();
-    aCurPar2    = pCurFld->GetPar2();
+    nCurFormat     = pCurField->GetFormat();
+    aCurPar1    = pCurField->GetPar1();
+    aCurPar2    = pCurField->GetPar2();
 
     switch( nTypeId )
     {
@@ -311,17 +311,17 @@ SwField* SwFldMgr::GetCurFld()
         case TYP_NEXTPAGEFLD:
         case TYP_PREVPAGEFLD:
         case TYP_GETREFPAGEFLD:
-            if( nCurFmt == SVX_NUM_PAGEDESC )
-                nCurFmt -= 2;
+            if( nCurFormat == SVX_NUM_PAGEDESC )
+                nCurFormat -= 2;
             break;
     }
-    return pCurFld;
+    return pCurField;
 }
 
 // provide group range
-const SwFldGroupRgn& SwFldMgr::GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId)
+const SwFieldGroupRgn& SwFieldMgr::GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId)
 {
-static SwFldGroupRgn const aRanges[] =
+static SwFieldGroupRgn const aRanges[] =
 {
     { /* Document   */  GRP_DOC_BEGIN,  GRP_DOC_END },
     { /* Functions  */  GRP_FKT_BEGIN,  GRP_FKT_END },
@@ -330,7 +330,7 @@ static SwFldGroupRgn const aRanges[] =
     { /* Database   */  GRP_DB_BEGIN,   GRP_DB_END  },
     { /* User       */  GRP_VAR_BEGIN,  GRP_VAR_END }
 };
-static SwFldGroupRgn const aWebRanges[] =
+static SwFieldGroupRgn const aWebRanges[] =
 {
     { /* Document    */  GRP_WEB_DOC_BEGIN,  GRP_WEB_DOC_END },
     { /* Functions   */  GRP_WEB_FKT_BEGIN,  GRP_WEB_FKT_END },
@@ -347,7 +347,7 @@ static SwFldGroupRgn const aWebRanges[] =
 }
 
 // determine GroupId
-sal_uInt16 SwFldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType)
+sal_uInt16 SwFieldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType)
 {
     if (nTypeId == TYP_SETINPFLD)
         nTypeId = TYP_SETFLD;
@@ -363,10 +363,10 @@ sal_uInt16 SwFldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSu
 
     for (sal_uInt16 i = GRP_DOC; i <= GRP_VAR; i++)
     {
-        const SwFldGroupRgn& rRange = GetGroupRange(bHtmlMode, i);
+        const SwFieldGroupRgn& rRange = GetGroupRange(bHtmlMode, i);
         for (sal_uInt16 nPos = rRange.nStart; nPos < rRange.nEnd; nPos++)
         {
-            if (aSwFlds[nPos].nTypeId == nTypeId)
+            if (aSwFields[nPos].nTypeId == nTypeId)
                 return i;
         }
     }
@@ -375,35 +375,35 @@ sal_uInt16 SwFldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSu
 
 // determine names to TypeId
 //  ACCESS over TYP_....
-sal_uInt16 SwFldMgr::GetTypeId(sal_uInt16 nPos)
+sal_uInt16 SwFieldMgr::GetTypeId(sal_uInt16 nPos)
 {
     OSL_ENSURE(nPos < ::GetPackCount(), "forbidden Pos");
-    return aSwFlds[ nPos ].nTypeId;
+    return aSwFields[ nPos ].nTypeId;
 }
 
-OUString SwFldMgr::GetTypeStr(sal_uInt16 nPos)
+OUString SwFieldMgr::GetTypeStr(sal_uInt16 nPos)
 {
     OSL_ENSURE(nPos < ::GetPackCount(), "forbidden TypeId");
 
-    sal_uInt16 nFldWh = aSwFlds[ nPos ].nTypeId;
+    sal_uInt16 nFieldWh = aSwFields[ nPos ].nTypeId;
 
     // special treatment for date/time fields (without var/fix)
-    if( TYP_DATEFLD == nFldWh )
+    if( TYP_DATEFLD == nFieldWh )
     {
         static OUString g_aDate( SW_RES( STR_DATEFLD ) );
         return g_aDate;
     }
-    if( TYP_TIMEFLD == nFldWh )
+    if( TYP_TIMEFLD == nFieldWh )
     {
         static OUString g_aTime( SW_RES( STR_TIMEFLD ) );
         return g_aTime;
     }
 
-    return SwFieldType::GetTypeStr( nFldWh );
+    return SwFieldType::GetTypeStr( nFieldWh );
 }
 
 // determine Pos in the list
-sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId)
+sal_uInt16 SwFieldMgr::GetPos(sal_uInt16 nTypeId)
 {
     switch( nTypeId )
     {
@@ -414,14 +414,14 @@ sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId)
     }
 
     for(sal_uInt16 i = 0; i < GetPackCount(); i++)
-        if(aSwFlds[i].nTypeId == nTypeId)
+        if(aSwFields[i].nTypeId == nTypeId)
             return i;
 
     return USHRT_MAX;
 }
 
 // localise subtypes of a field
-bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
+bool SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
 {
     bool bRet = false;
     SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell();
@@ -445,7 +445,7 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
             }
             case TYP_INPUTFLD:
             {
-                rToFill.push_back(SW_RES(aSwFlds[nPos].nSubTypeStart));
+                rToFill.push_back(SW_RES(aSwFields[nPos].nSubTypeStart));
                 // move on at generic types
             }
             case TYP_DDEFLD:
@@ -456,31 +456,31 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
             case TYP_USERFLD:
             {
 
-                const sal_uInt16 nCount = pSh->GetFldTypeCount();
+                const sal_uInt16 nCount = pSh->GetFieldTypeCount();
                 for(sal_uInt16 i = 0; i < nCount; ++i)
                 {
-                    SwFieldType* pFldType = pSh->GetFldType( i );
-                    const sal_uInt16 nWhich = pFldType->Which();
+                    SwFieldType* pFieldType = pSh->GetFieldType( i );
+                    const sal_uInt16 nWhich = pFieldType->Which();
 
-                    if((nTypeId == TYP_DDEFLD && pFldType->Which() == RES_DDEFLD) ||
+                    if((nTypeId == TYP_DDEFLD && pFieldType->Which() == RES_DDEFLD) ||
 
                        (nTypeId == TYP_USERFLD && nWhich == RES_USERFLD) ||
 
                        (nTypeId == TYP_GETFLD && nWhich == RES_SETEXPFLD &&
-                        !(static_cast<SwSetExpFieldType*>(pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) ||
+                        !(static_cast<SwSetExpFieldType*>(pFieldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) ||
 
                        (nTypeId == TYP_SETFLD && nWhich == RES_SETEXPFLD &&
-                        !(static_cast<SwSetExpFieldType*>(pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) ||
+                        !(static_cast<SwSetExpFieldType*>(pFieldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) ||
 
                        (nTypeId == TYP_SEQFLD && nWhich == RES_SETEXPFLD  &&
-                       (static_cast<SwSetExpFieldType*>(pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) ||
+                       (static_cast<SwSetExpFieldType*>(pFieldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) ||
 
                        ((nTypeId == TYP_INPUTFLD || nTypeId == TYP_FORMELFLD) &&
                          (nWhich == RES_USERFLD ||
                           (nWhich == RES_SETEXPFLD &&
-                          !(static_cast<SwSetExpFieldType*>(pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ))) ) )
+                          !(static_cast<SwSetExpFieldType*>(pFieldType)->GetType() & nsSwGetSetExpType::GSE_SEQ))) ) )
                     {
-                        rToFill.push_back(pFldType->GetName());
+                        rToFill.push_back(pFieldType->GetName());
                     }
                 }
                 break;
@@ -500,7 +500,7 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
                     if (nTypeId == TYP_DOCINFOFLD)
                         nCount = DI_SUBTYPE_END - DI_SUBTYPE_BEGIN;
                     else
-                        nCount = aSwFlds[nPos].nSubTypeEnd - aSwFlds[nPos].nSubTypeStart;
+                        nCount = aSwFields[nPos].nSubTypeEnd - aSwFields[nPos].nSubTypeStart;
 
                     for(sal_uInt16 i = 0; i < nCount; ++i)
                     {
@@ -513,7 +513,7 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
                                 sNew = SwViewShell::GetShellRes()->aDocInfoLst[i];
                         }
                         else
-                            sNew = SW_RES(aSwFlds[nPos].nSubTypeStart + i);
+                            sNew = SW_RES(aSwFields[nPos].nSubTypeStart + i);
 
                         rToFill.push_back(sNew);
                     }
@@ -527,7 +527,7 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
 
 // determine format
 //  ACCESS over TYP_....
-sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode) const
+sal_uInt16 SwFieldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode) const
 {
     OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId");
     {
@@ -536,8 +536,8 @@ sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtml
         if(nPos == USHRT_MAX || (bHtmlMode && nTypeId == TYP_SETFLD))
             return 0;
 
-        sal_uLong nStart = aSwFlds[nPos].nFmtBegin;
-        sal_uLong nEnd   = aSwFlds[nPos].nFmtEnd;
+        sal_uLong nStart = aSwFields[nPos].nFormatBegin;
+        sal_uLong nEnd   = aSwFields[nPos].nFormatEnd;
 
         if (bIsText && nEnd - nStart >= 2)
             return 2;
@@ -579,7 +579,7 @@ sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtml
 }
 
 // determine FormatString to a type
-OUString SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const
+OUString SwFieldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const
 {
     OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId");
     const sal_uInt16 nPos = GetPos(nTypeId);
@@ -589,12 +589,12 @@ OUString SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const
 
     sal_uLong nStart;
 
-    nStart = aSwFlds[nPos].nFmtBegin;
+    nStart = aSwFields[nPos].nFormatBegin;
 
     if (TYP_AUTHORFLD == nTypeId|| TYP_FILENAMEFLD == nTypeId)
         nFormatId &= ~FF_FIXED;     // mask out Fixed-Flag
 
-    if((nStart + nFormatId) < aSwFlds[nPos].nFmtEnd)
+    if((nStart + nFormatId) < aSwFields[nPos].nFormatEnd)
         return SW_RES((sal_uInt16)(nStart + nFormatId));
 
     OUString aRet;
@@ -607,7 +607,7 @@ OUString SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const
 
             Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
             const sal_Int16* pTypes = aTypes.getConstArray();
-            sal_Int32 nOffset = aSwFlds[nPos].nFmtEnd - nStart;
+            sal_Int32 nOffset = aSwFields[nPos].nFormatEnd - nStart;
             sal_Int32 nValidEntry = 0;
             for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
             {
@@ -637,13 +637,13 @@ OUString SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const
 }
 
 // determine FormatId from Pseudo-ID
-sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const
+sal_uInt16 SwFieldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const
 {
     sal_uInt16 nId = (sal_uInt16)nFormatId;
     switch( nTypeId )
     {
     case TYP_DOCINFOFLD:
-        switch( aSwFlds[ GetPos( nTypeId ) ].nFmtBegin + nFormatId )
+        switch( aSwFields[ GetPos( nTypeId ) ].nFormatBegin + nFormatId )
         {
         case FMT_REG_AUTHOR:    nId = DI_SUB_AUTHOR;    break;
         case FMT_REG_TIME:      nId = DI_SUB_TIME;      break;
@@ -660,8 +660,8 @@ sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const
     case TYP_GETREFPAGEFLD:
     {
         sal_uInt16 nPos = GetPos( nTypeId );
-        sal_uLong nBegin = aSwFlds[ nPos ].nFmtBegin;
-        sal_uLong nEnd = aSwFlds[nPos].nFmtEnd;
+        sal_uLong nBegin = aSwFields[ nPos ].nFormatBegin;
+        sal_uLong nEnd = aSwFields[nPos].nFormatEnd;
         if((nBegin + nFormatId) < nEnd)
         {
             switch( nBegin + nFormatId )
@@ -700,7 +700,7 @@ sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const
     }
     break;
     case TYP_DDEFLD:
-        switch ( aSwFlds[ GetPos( nTypeId ) ].nFmtBegin + nFormatId )
+        switch ( aSwFields[ GetPos( nTypeId ) ].nFormatBegin + nFormatId )
         {
         case FMT_DDE_NORMAL:    nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ONCALL); break;
         case FMT_DDE_HOT:       nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ALWAYS); break;
@@ -713,52 +713,52 @@ sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const
 }
 
 // Traveling
-bool SwFldMgr::GoNextPrev( bool bNext, SwFieldType* pTyp )
+bool SwFieldMgr::GoNextPrev( bool bNext, SwFieldType* pTyp )
 {
     SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
     if(!pSh)
         return false;
 
-    if( !pTyp && pCurFld )
+    if( !pTyp && pCurField )
     {
-        const sal_uInt16 nTypeId = pCurFld->GetTypeId();
+        const sal_uInt16 nTypeId = pCurField->GetTypeId();
         if( TYP_SETINPFLD == nTypeId || TYP_USRINPFLD == nTypeId )
-            pTyp = pSh->GetFldType( 0, RES_INPUTFLD );
+            pTyp = pSh->GetFieldType( 0, RES_INPUTFLD );
         else
-            pTyp = pCurFld->GetTyp();
+            pTyp = pCurField->GetTyp();
     }
 
     if (pTyp && pTyp->Which() == RES_DBFLD)
     {
         // for fieldcommand-edit (hop to all DB fields)
-        return pSh->MoveFldType( 0, bNext, RES_DBFLD );
+        return pSh->MoveFieldType( 0, bNext, RES_DBFLD );
     }
 
-    return pTyp && pSh && pSh->MoveFldType( pTyp, bNext );
+    return pTyp && pSh && pSh->MoveFieldType( pTyp, bNext );
 }
 
 // insert field types
-void SwFldMgr::InsertFldType(SwFieldType& rType)
+void SwFieldMgr::InsertFieldType(SwFieldType& rType)
 {
     SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
     OSL_ENSURE(pSh, "no SwWrtShell found");
     if(pSh)
-        pSh->InsertFldType(rType);
+        pSh->InsertFieldType(rType);
 }
 
 // determine current TypeId
-sal_uInt16 SwFldMgr::GetCurTypeId() const
+sal_uInt16 SwFieldMgr::GetCurTypeId() const
 {
-    return pCurFld ? pCurFld->GetTypeId() : USHRT_MAX;
+    return pCurField ? pCurField->GetTypeId() : USHRT_MAX;
 }
 
 // Over string  insert field or update
-bool SwFldMgr::InsertFld(
-    const SwInsertFld_Data& rData)
+bool SwFieldMgr::InsertField(
+    const SwInsertField_Data& rData)
 {
-    SwField* pFld   = 0;
+    SwField* pField   = 0;
     bool bExp = false;
-    bool bTbl = false;
+    bool bTable = false;
     bool bPageVar = false;
     sal_uLong nFormatId = rData.m_nFormatId;
     sal_uInt16 nSubType = rData.m_nSubType;
@@ -775,7 +775,7 @@ bool SwFldMgr::InsertFld(
         case TYP_POSTITFLD:
         {
             SvtUserOptions aUserOpt;
-            SwPostItFieldType* pType = static_cast<SwPostItFieldType*>(pCurShell->GetFldType(0, RES_POSTITFLD));
+            SwPostItFieldType* pType = static_cast<SwPostItFieldType*>(pCurShell->GetFieldType(0, RES_POSTITFLD));
             SwPostItField* pPostItField =
                 new SwPostItField(
                     pType,
@@ -784,36 +784,36 @@ bool SwFldMgr::InsertFld(
                     aUserOpt.GetID(), // author's initials
                     OUString(), // name
                     DateTime(DateTime::SYSTEM) );
-            pFld = pPostItField;
+            pField = pPostItField;
         }
         break;
         case TYP_SCRIPTFLD:
         {
             SwScriptFieldType* pType =
-                static_cast<SwScriptFieldType*>(pCurShell->GetFldType(0, RES_SCRIPTFLD));
-            pFld = new SwScriptField(pType, rData.m_sPar1, rData.m_sPar2, (bool)nFormatId);
+                static_cast<SwScriptFieldType*>(pCurShell->GetFieldType(0, RES_SCRIPTFLD));
+            pField = new SwScriptField(pType, rData.m_sPar1, rData.m_sPar2, (bool)nFormatId);
             break;
         }
 
     case TYP_COMBINED_CHARS:
         {
             SwCombinedCharFieldType* pType = static_cast<SwCombinedCharFieldType*>(
-                pCurShell->GetFldType( 0, RES_COMBINED_CHARS ));
-            pFld = new SwCombinedCharField( pType, rData.m_sPar1 );
+                pCurShell->GetFieldType( 0, RES_COMBINED_CHARS ));
+            pField = new SwCombinedCharField( pType, rData.m_sPar1 );
         }
         break;
 
     case TYP_AUTHORITY:
         {
             SwAuthorityFieldType* pType =
-                static_cast<SwAuthorityFieldType*>(pCurShell->GetFldType(0, RES_AUTHORITY));
+                static_cast<SwAuthorityFieldType*>(pCurShell->GetFieldType(0, RES_AUTHORITY));
             if (!pType)
             {
                 SwAuthorityFieldType const type(pCurShell->GetDoc());
                 pType = static_cast<SwAuthorityFieldType*>(
-                            pCurShell->InsertFldType(type));
+                            pCurShell->InsertFieldType(type));
             }
-            pFld = new SwAuthorityField(pType, rData.m_sPar1);
+            pField = new SwAuthorityField(pType, rData.m_sPar1);
         }
         break;
 
@@ -824,25 +824,25 @@ bool SwFldMgr::InsertFld(
             nSub |= nSubType == DATE_VAR ? 0 : FIXEDFLD;
 
             SwDateTimeFieldType* pTyp =
-                static_cast<SwDateTimeFieldType*>( pCurShell->GetFldType(0, RES_DATETIMEFLD) );
-            pFld = new SwDateTimeField(pTyp, nSub, nFormatId);
-            pFld->SetPar2(rData.m_sPar2);
+                static_cast<SwDateTimeFieldType*>( pCurShell->GetFieldType(0, RES_DATETIMEFLD) );
+            pField = new SwDateTimeField(pTyp, nSub, nFormatId);
+            pField->SetPar2(rData.m_sPar2);
             break;
         }
 
     case TYP_FILENAMEFLD:
         {
             SwFileNameFieldType* pTyp =
-                static_cast<SwFileNameFieldType*>( pCurShell->GetFldType(0, RES_FILENAMEFLD) );
-            pFld = new SwFileNameField(pTyp, nFormatId);
+                static_cast<SwFileNameFieldType*>( pCurShell->GetFieldType(0, RES_FILENAMEFLD) );
+            pField = new SwFileNameField(pTyp, nFormatId);
             break;
         }
 
     case TYP_TEMPLNAMEFLD:
         {
             SwTemplNameFieldType* pTyp =
-                static_cast<SwTemplNameFieldType*>( pCurShell->GetFldType(0, RES_TEMPLNAMEFLD) );
-            pFld = new SwTemplNameField(pTyp, nFormatId);
+                static_cast<SwTemplNameFieldType*>( pCurShell->GetFieldType(0, RES_TEMPLNAMEFLD) );
+            pField = new SwTemplNameField(pTyp, nFormatId);
             break;
         }
 
@@ -850,12 +850,12 @@ bool SwFldMgr::InsertFld(
         {
             sal_uInt16 nByte = (sal_uInt16)rData.m_sPar2.toInt32();
             SwChapterFieldType* pTyp =
-                static_cast<SwChapterFieldType*>( pCurShell->GetFldType(0, RES_CHAPTERFLD) );
-            pFld = new SwChapterField(pTyp, nFormatId);
+                static_cast<SwChapterFieldType*>( pCurShell->GetFieldType(0, RES_CHAPTERFLD) );
+            pField = new SwChapterField(pTyp, nFormatId);
             nByte = std::max(sal_uInt16(1), nByte);
             nByte = std::min(nByte, sal_uInt16(MAXLEVEL));
             nByte -= 1;
-            static_cast<SwChapterField*>(pFld)->SetLevel((sal_uInt8)nByte);
+            static_cast<SwChapterField*>(pField)->SetLevel((sal_uInt8)nByte);
             break;
         }
 
@@ -885,37 +885,37 @@ bool SwFldMgr::InsertFld(
                 nSubType = PG_RANDOM;
 
             SwPageNumberFieldType* pTyp =
-                static_cast<SwPageNumberFieldType*>( pCurShell->GetFldType(0, RES_PAGENUMBERFLD) );
-            pFld = new SwPageNumberField(pTyp, nSubType, nFormatId, nOff);
+                static_cast<SwPageNumberFieldType*>( pCurShell->GetFieldType(0, RES_PAGENUMBERFLD) );
+            pField = new SwPageNumberField(pTyp, nSubType, nFormatId, nOff);
 
             if( SVX_NUM_CHAR_SPECIAL == nFormatId &&
                 ( PG_PREV == nSubType || PG_NEXT == nSubType ) )
-                static_cast<SwPageNumberField*>(pFld)->SetUserString( rData.m_sPar2 );
+                static_cast<SwPageNumberField*>(pField)->SetUserString( rData.m_sPar2 );
             break;
         }
 
     case TYP_DOCSTATFLD:
         {
             SwDocStatFieldType* pTyp =
-                static_cast<SwDocStatFieldType*>( pCurShell->GetFldType(0, RES_DOCSTATFLD) );
-            pFld = new SwDocStatField(pTyp, nSubType, nFormatId);
+                static_cast<SwDocStatFieldType*>( pCurShell->GetFieldType(0, RES_DOCSTATFLD) );
+            pField = new SwDocStatField(pTyp, nSubType, nFormatId);
             break;
         }
 
     case TYP_AUTHORFLD:
         {
             SwAuthorFieldType* pTyp =
-                static_cast<SwAuthorFieldType*>( pCurShell->GetFldType(0, RES_AUTHORFLD) );
-            pFld = new SwAuthorField(pTyp, nFormatId);
+                static_cast<SwAuthorFieldType*>( pCurShell->GetFieldType(0, RES_AUTHORFLD) );
+            pField = new SwAuthorField(pTyp, nFormatId);
             break;
         }
 
     case TYP_CONDTXTFLD:
     case TYP_HIDDENTXTFLD:
         {
-            SwHiddenTxtFieldType* pTyp =
-                static_cast<SwHiddenTxtFieldType*>( pCurShell->GetFldType(0, RES_HIDDENTXTFLD) );
-            pFld = new SwHiddenTxtField(pTyp, true, rData.m_sPar1, rData.m_sPar2, false, rData.m_nTypeId);
+            SwHiddenTextFieldType* pTyp =
+                static_cast<SwHiddenTextFieldType*>( pCurShell->GetFieldType(0, RES_HIDDENTXTFLD) );
+            pField = new SwHiddenTextField(pTyp, true, rData.m_sPar1, rData.m_sPar2, false, rData.m_nTypeId);
             bExp = true;
             break;
         }
@@ -923,8 +923,8 @@ bool SwFldMgr::InsertFld(
     case TYP_HIDDENPARAFLD:
         {
             SwHiddenParaFieldType* pTyp =
-                static_cast<SwHiddenParaFieldType*>( pCurShell->GetFldType(0, RES_HIDDENPARAFLD) );
-            pFld = new SwHiddenParaField(pTyp, rData.m_sPar1);
+                static_cast<SwHiddenParaFieldType*>( pCurShell->GetFieldType(0, RES_HIDDENPARAFLD) );
+            pField = new SwHiddenParaField(pTyp, rData.m_sPar1);
             bExp = true;
             break;
         }
@@ -933,7 +933,7 @@ bool SwFldMgr::InsertFld(
         {
             if( !rData.m_sPar1.isEmpty() && CanInsertRefMark( rData.m_sPar1 ) )
             {
-                pCurShell->SetAttrItem( SwFmtRefMark( rData.m_sPar1 ) );
+                pCurShell->SetAttrItem( SwFormatRefMark( rData.m_sPar1 ) );
                 return true;
             }
             return false;
@@ -942,9 +942,9 @@ bool SwFldMgr::InsertFld(
     case TYP_GETREFFLD:
         {
             SwGetRefFieldType* pTyp =
-                static_cast<SwGetRefFieldType*>( pCurShell->GetFldType(0, RES_GETREFFLD) );
+                static_cast<SwGetRefFieldType*>( pCurShell->GetFieldType(0, RES_GETREFFLD) );
             sal_uInt16 nSeqNo = (sal_uInt16)rData.m_sPar2.toInt32();
-            pFld = new SwGetRefField(pTyp, rData.m_sPar1, nSubType, nSeqNo, nFormatId);
+            pField = new SwGetRefField(pTyp, rData.m_sPar1, nSubType, nSeqNo, nFormatId);
             bExp = true;
             break;
         }
@@ -961,51 +961,51 @@ bool SwFldMgr::InsertFld(
             }
 
             SwDDEFieldType aType( rData.m_sPar1, sCmd, static_cast<SfxLinkUpdateMode>(nFormatId) );
-            SwDDEFieldType* pTyp = static_cast<SwDDEFieldType*>( pCurShell->InsertFldType( aType ) );
-            pFld = new SwDDEField( pTyp );
+            SwDDEFieldType* pTyp = static_cast<SwDDEFieldType*>( pCurShell->InsertFieldType( aType ) );
+            pField = new SwDDEField( pTyp );
             break;
         }
 
     case TYP_MACROFLD:
         {
             SwMacroFieldType* pTyp =
-                static_cast<SwMacroFieldType*>(pCurShell->GetFldType(0, RES_MACROFLD));
+                static_cast<SwMacroFieldType*>(pCurShell->GetFieldType(0, RES_MACROFLD));
 
-            pFld = new SwMacroField(pTyp, rData.m_sPar1, rData.m_sPar2);
+            pField = new SwMacroField(pTyp, rData.m_sPar1, rData.m_sPar2);
 
             break;
         }
 
     case TYP_INTERNETFLD:
         {
-            SwFmtINetFmt aFmt( rData.m_sPar1, sCurFrame );
+            SwFormatINetFormat aFormat( rData.m_sPar1, sCurFrame );
             if( pMacroItem )
-                aFmt.SetMacroTbl( &pMacroItem->GetMacroTable() );
-            return pCurShell->InsertURL( aFmt, rData.m_sPar2 );
+                aFormat.SetMacroTable( &pMacroItem->GetMacroTable() );
+            return pCurShell->InsertURL( aFormat, rData.m_sPar2 );
         }
 
     case TYP_JUMPEDITFLD:
         {
             SwJumpEditFieldType* pTyp =
-                static_cast<SwJumpEditFieldType*>(pCurShell->GetFldType(0, RES_JUMPEDITFLD));
+                static_cast<SwJumpEditFieldType*>(pCurShell->GetFieldType(0, RES_JUMPEDITFLD));
 
-            pFld = new SwJumpEditField(pTyp, nFormatId, rData.m_sPar1, rData.m_sPar2);
+            pField = new SwJumpEditField(pTyp, nFormatId, rData.m_sPar1, rData.m_sPar2);
             break;
         }
 
     case TYP_DOCINFOFLD:
         {
-            SwDocInfoFieldType* pTyp = static_cast<SwDocInfoFieldType*>( pCurShell->GetFldType(
+            SwDocInfoFieldType* pTyp = static_cast<SwDocInfoFieldType*>( pCurShell->GetFieldType(
                 0, RES_DOCINFOFLD ) );
-            pFld = new SwDocInfoField(pTyp, nSubType, rData.m_sPar1, nFormatId);
+            pField = new SwDocInfoField(pTyp, nSubType, rData.m_sPar1, nFormatId);
             break;
         }
 
     case TYP_EXTUSERFLD:
         {
-            SwExtUserFieldType* pTyp = static_cast<SwExtUserFieldType*>( pCurShell->GetFldType(
+            SwExtUserFieldType* pTyp = static_cast<SwExtUserFieldType*>( pCurShell->GetFieldType(
                 0, RES_EXTUSERFLD) );
-            pFld = new SwExtUserField(pTyp, nSubType, nFormatId);
+            pField = new SwExtUserField(pTyp, nSubType, nFormatId);
             break;
         }
 
@@ -1031,10 +1031,10 @@ bool SwFldMgr::InsertFld(
             if(!aDBData.sDataSource.isEmpty() && pCurShell->GetDBData() != aDBData)
                 pCurShell->ChgDBData(aDBData);
 
-            SwDBFieldType* pTyp = static_cast<SwDBFieldType*>(pCurShell->InsertFldType(
+            SwDBFieldType* pTyp = static_cast<SwDBFieldType*>(pCurShell->InsertFieldType(
                 SwDBFieldType(pCurShell->GetDoc(), sPar1, aDBData) ) );
-            pFld = new SwDBField(pTyp);
-            pFld->SetSubType(nSubType);
+            pField = new SwDBField(pTyp);
+            pField->SetSubType(nSubType);
 
             if( !(nSubType & nsSwExtendedSubType::SUB_OWN_FMT) ) // determinee database format
             {
@@ -1046,15 +1046,15 @@ bool SwFldMgr::InsertFld(
                 rData.m_aDBColumn >>= xColumn;
                 if(xColumn.is())
                 {
-                    nFormatId = SwDBManager::GetColumnFmt(xSource, xConnection, xColumn,
+                    nFormatId = SwDBManager::GetColumnFormat(xSource, xConnection, xColumn,
                         pCurShell->GetNumberFormatter(), GetCurrLanguage() );
                 }
                 else
-                    nFormatId = pCurShell->GetDBManager()->GetColumnFmt(
+                    nFormatId = pCurShell->GetDBManager()->GetColumnFormat(
                     aDBData.sDataSource, aDBData.sCommand, sPar1,
                     pCurShell->GetNumberFormatter(), GetCurrLanguage() );
             }
-            pFld->ChangeFormat( nFormatId );
+            pField->ChangeFormat( nFormatId );
 
             bExp = true;
 #endif
@@ -1105,32 +1105,32 @@ bool SwFldMgr::InsertFld(
             case TYP_DBNAMEFLD:
                 {
                     SwDBNameFieldType* pTyp =
-                        static_cast<SwDBNameFieldType*>(pCurShell->GetFldType(0, RES_DBNAMEFLD));
-                    pFld = new SwDBNameField(pTyp, aDBData);
+                        static_cast<SwDBNameFieldType*>(pCurShell->GetFieldType(0, RES_DBNAMEFLD));
+                    pField = new SwDBNameField(pTyp, aDBData);
 
                     break;
                 }
             case TYP_DBNEXTSETFLD:
                 {
-                    SwDBNextSetFieldType* pTyp = static_cast<SwDBNextSetFieldType*>(pCurShell->GetFldType(
+                    SwDBNextSetFieldType* pTyp = static_cast<SwDBNextSetFieldType*>(pCurShell->GetFieldType(
                         0, RES_DBNEXTSETFLD) );
-                    pFld = new SwDBNextSetField(pTyp, sPar1, rData.m_sPar2, aDBData);
+                    pField = new SwDBNextSetField(pTyp, sPar1, rData.m_sPar2, aDBData);
                     bExp = true;
                     break;
                 }
             case TYP_DBNUMSETFLD:
                 {
-                    SwDBNumSetFieldType* pTyp = static_cast<SwDBNumSetFieldType*>( pCurShell->GetFldType(
+                    SwDBNumSetFieldType* pTyp = static_cast<SwDBNumSetFieldType*>( pCurShell->GetFieldType(
                         0, RES_DBNUMSETFLD) );
-                    pFld = new SwDBNumSetField( pTyp, sPar1, rData.m_sPar2, aDBData);
+                    pField = new SwDBNumSetField( pTyp, sPar1, rData.m_sPar2, aDBData);
                     bExp = true;
                     break;
                 }
             case TYP_DBSETNUMBERFLD:
                 {
                     SwDBSetNumberFieldType* pTyp = static_cast<SwDBSetNumberFieldType*>(
-                        pCurShell->GetFldType(0, RES_DBSETNUMBERFLD) );
-                    pFld = new SwDBSetNumberField( pTyp, aDBData, nFormatId);
+                        pCurShell->GetFieldType(0, RES_DBSETNUMBERFLD) );
+                    pField = new SwDBSetNumberField( pTyp, aDBData, nFormatId);
                     bExp = true;
                     break;
                 }
@@ -1142,20 +1142,20 @@ bool SwFldMgr::InsertFld(
     case TYP_USERFLD:
         {
             SwUserFieldType* pTyp =
-                static_cast<SwUserFieldType*>( pCurShell->GetFldType(RES_USERFLD, rData.m_sPar1) );
+                static_cast<SwUserFieldType*>( pCurShell->GetFieldType(RES_USERFLD, rData.m_sPar1) );
 
             // only if existing
             if(!pTyp)
             {
-                pTyp = static_cast<SwUserFieldType*>( pCurShell->InsertFldType(
+                pTyp = static_cast<SwUserFieldType*>( pCurShell->InsertFieldType(
                     SwUserFieldType(pCurShell->GetDoc(), rData.m_sPar1)) );
             }
             if (pTyp->GetContent(nFormatId) != rData.m_sPar2)
                 pTyp->SetContent(rData.m_sPar2, nFormatId);
-            pFld = new SwUserField(pTyp, 0, nFormatId);
-            if (pFld->GetSubType() != nSubType)
-                pFld->SetSubType(nSubType);
-            bTbl = true;
+            pField = new SwUserField(pTyp, 0, nFormatId);
+            if (pField->GetSubType() != nSubType)
+                pField->SetSubType(nSubType);
+            bTable = true;
             break;
         }
 
@@ -1164,22 +1164,22 @@ bool SwFldMgr::InsertFld(
             if ((nSubType & 0x00ff) == INP_VAR)
             {
                 SwSetExpFieldType* pTyp = static_cast<SwSetExpFieldType*>(
-                    pCurShell->GetFldType(RES_SETEXPFLD, rData.m_sPar1) );
+                    pCurShell->GetFieldType(RES_SETEXPFLD, rData.m_sPar1) );
 
                 // no Experssion Type with this name existing -> create
                 if(pTyp)
                 {
-                    SwSetExpField* pExpFld =
+                    SwSetExpField* pExpField =
                         new SwSetExpField(pTyp, OUString(), nFormatId);
 
                     // Don't change type of SwSetExpFieldType:
-                    sal_uInt16 nOldSubType = pExpFld->GetSubType();
-                    pExpFld->SetSubType(nOldSubType | (nSubType & 0xff00));
+                    sal_uInt16 nOldSubType = pExpField->GetSubType();
+                    pExpField->SetSubType(nOldSubType | (nSubType & 0xff00));
 
-                    pExpFld->SetPromptText(rData.m_sPar2);
-                    pExpFld->SetInputFlag(true) ;
+                    pExpField->SetPromptText(rData.m_sPar2);
+                    pExpField->SetInputFlag(true) ;
                     bExp = true;
-                    pFld = pExpFld;
+                    pField = pExpField;
                 }
                 else
                     return false;
@@ -1187,15 +1187,15 @@ bool SwFldMgr::InsertFld(
             else
             {
                 SwInputFieldType* pTyp =
-                    static_cast<SwInputFieldType*>( pCurShell->GetFldType(0, RES_INPUTFLD) );
+                    static_cast<SwInputFieldType*>( pCurShell->GetFieldType(0, RES_INPUTFLD) );
 
-                SwInputField* pInpFld =
+                SwInputField* pInpField =
                     new SwInputField( pTyp, rData.m_sPar1, rData.m_sPar2, nSubType|nsSwExtendedSubType::SUB_INVISIBLE, nFormatId);
-                pFld = pInpFld;
+                pField = pInpField;
             }
 
             // start dialog
-            pCurShell->StartInputFldDlg(pFld, false, rData.m_pParent);
+            pCurShell->StartInputFieldDlg(pField, false, rData.m_pParent);
             break;
         }
 
@@ -1204,20 +1204,20 @@ bool SwFldMgr::InsertFld(
             if (rData.m_sPar2.isEmpty())   // empty variables are not allowed
                 return false;
 
-            SwSetExpFieldType* pTyp = static_cast<SwSetExpFieldType*>( pCurShell->InsertFldType(
+            SwSetExpFieldType* pTyp = static_cast<SwSetExpFieldType*>( pCurShell->InsertFieldType(
                 SwSetExpFieldType(pCurShell->GetDoc(), rData.m_sPar1) ) );
 
-            SwSetExpField* pExpFld = new SwSetExpField( pTyp, rData.m_sPar2, nFormatId);
-            pExpFld->SetSubType(nSubType);
-            pExpFld->SetPar2(rData.m_sPar2);
+            SwSetExpField* pExpField = new SwSetExpField( pTyp, rData.m_sPar2, nFormatId);
+            pExpField->SetSubType(nSubType);
+            pExpField->SetPar2(rData.m_sPar2);
             bExp = true;
-            pFld = pExpFld;
+            pField = pExpField;
             break;
         }
 
     case TYP_SEQFLD:
         {
-            SwSetExpFieldType* pTyp = static_cast<SwSetExpFieldType*>( pCurShell->InsertFldType(
+            SwSetExpFieldType* pTyp = static_cast<SwSetExpFieldType*>( pCurShell->InsertFieldType(
                 SwSetExpFieldType(pCurShell->GetDoc(), rData.m_sPar1, nsSwGetSetExpType::GSE_SEQ)));
 
             sal_uInt8 nLevel = static_cast< sal_uInt8 >(nSubType & 0xff);
@@ -1227,9 +1227,9 @@ bool SwFldMgr::InsertFld(
                 cSeparator = '.';
 
             pTyp->SetDelimiter(OUString(cSeparator));
-            SwSetExpField* pExpFld = new SwSetExpField(pTyp, rData.m_sPar2, nFormatId);
+            SwSetExpField* pExpField = new SwSetExpField(pTyp, rData.m_sPar2, nFormatId);
             bExp = true;
-            pFld = pExpFld;
+            pField = pExpField;
             nSubType = nsSwGetSetExpType::GSE_SEQ;
             break;
         }
@@ -1238,14 +1238,14 @@ bool SwFldMgr::InsertFld(
         {
             // is there a corresponding SetField
             SwSetExpFieldType* pSetTyp = static_cast<SwSetExpFieldType*>(
-                pCurShell->GetFldType(RES_SETEXPFLD, rData.m_sPar1));
+                pCurShell->GetFieldType(RES_SETEXPFLD, rData.m_sPar1));
 
             if(pSetTyp)
             {
-                SwGetExpFieldType* pTyp = static_cast<SwGetExpFieldType*>( pCurShell->GetFldType(
+                SwGetExpFieldType* pTyp = static_cast<SwGetExpFieldType*>( pCurShell->GetFieldType(
                     0, RES_GETEXPFLD) );
-                pFld = new SwGetExpField(pTyp, rData.m_sPar1, pSetTyp->GetType(), nFormatId);
-                pFld->SetSubType(nSubType | pSetTyp->GetType());
+                pField = new SwGetExpField(pTyp, rData.m_sPar1, pSetTyp->GetType(), nFormatId);
+                pField->SetSubType(nSubType | pSetTyp->GetType());
                 bExp = true;
             }
             else
@@ -1272,14 +1272,14 @@ bool SwFldMgr::InsertFld(
                 SfxItemSet aBoxSet( pCurShell->GetAttrPool(),
                     RES_BOXATR_FORMULA, RES_BOXATR_FORMULA );
 
-                OUString sFml(comphelper::string::stripStart(rData.m_sPar2, ' '));
-                if ( sFml.startsWith("=") )
+                OUString sFormula(comphelper::string::stripStart(rData.m_sPar2, ' '));
+                if ( sFormula.startsWith("=") )
                 {
-                    sFml = sFml.copy(1);
+                    sFormula = sFormula.copy(1);
                 }
 
-                aBoxSet.Put( SwTblBoxFormula( sFml ));
-                pCurShell->SetTblBoxFormulaAttrs( aBoxSet );
+                aBoxSet.Put( SwTableBoxFormula( sFormula ));
+                pCurShell->SetTableBoxFormulaAttrs( aBoxSet );
                 pCurShell->UpdateTable();
 
                 pCurShell->EndAllAction();
@@ -1289,35 +1289,35 @@ bool SwFldMgr::InsertFld(
             else
             {
                 SwGetExpFieldType* pTyp = static_cast<SwGetExpFieldType*>(
-                    pCurShell->GetFldType(0, RES_GETEXPFLD) );
-                pFld = new SwGetExpField(pTyp, rData.m_sPar2, nsSwGetSetExpType::GSE_FORMULA, nFormatId);
-                pFld->SetSubType(nSubType);
+                    pCurShell->GetFieldType(0, RES_GETEXPFLD) );
+                pField = new SwGetExpField(pTyp, rData.m_sPar2, nsSwGetSetExpType::GSE_FORMULA, nFormatId);
+                pField->SetSubType(nSubType);
                 bExp = true;
             }
             break;
         }
         case TYP_SETREFPAGEFLD:
-            pFld = new SwRefPageSetField( static_cast<SwRefPageSetFieldType*>(
-                                pCurShell->GetFldType( 0, RES_REFPAGESETFLD ) ),
+            pField = new SwRefPageSetField( static_cast<SwRefPageSetFieldType*>(
+                                pCurShell->GetFieldType( 0, RES_REFPAGESETFLD ) ),
                                 (short)rData.m_sPar2.toInt32(), 0 != nSubType  );
             bPageVar = true;
             break;
 
         case TYP_GETREFPAGEFLD:
-            pFld = new SwRefPageGetField( static_cast<SwRefPageGetFieldType*>(
-                            pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ) ), nFormatId );
+            pField = new SwRefPageGetField( static_cast<SwRefPageGetFieldType*>(
+                            pCurShell->GetFieldType( 0, RES_REFPAGEGETFLD ) ), nFormatId );
             bPageVar = true;
             break;
         case TYP_DROPDOWN :
         {
-            pFld = new SwDropDownField(pCurShell->GetFldType( 0, RES_DROPDOWN ));
+            pField = new SwDropDownField(pCurShell->GetFieldType( 0, RES_DROPDOWN ));
             const sal_Int32 nTokenCount = comphelper::string::getTokenCount(rData.m_sPar2, DB_DELIM);
             Sequence<OUString> aEntries(nTokenCount);
             OUString* pArray = aEntries.getArray();
             for(sal_Int32 nToken = 0; nToken < nTokenCount; nToken++)
                 pArray[nToken] = rData.m_sPar2.getToken(nToken, DB_DELIM);
-            static_cast<SwDropDownField*>(pFld)->SetItems(aEntries);
-            static_cast<SwDropDownField*>(pFld)->SetName(rData.m_sPar1);
+            static_cast<SwDropDownField*>(pField)->SetItems(aEntries);
+            static_cast<SwDropDownField*>(pField)->SetName(rData.m_sPar1);
         }
         break;
         default:
@@ -1325,62 +1325,62 @@ bool SwFldMgr::InsertFld(
             return false;
         }
     }
-    OSL_ENSURE(pFld, "field not available");
+    OSL_ENSURE(pField, "field not available");
 
     //the auto language flag has to be set prior to the language!
-    pFld->SetAutomaticLanguage(rData.m_bIsAutomaticLanguage);
+    pField->SetAutomaticLanguage(rData.m_bIsAutomaticLanguage);
     sal_uInt16 nLang = GetCurrLanguage();
-    pFld->SetLanguage(nLang);
+    pField->SetLanguage(nLang);
 
     // insert
     pCurShell->StartAllAction();
 
-    pCurShell->Insert( *pFld );
+    pCurShell->Insert( *pField );
 
     if(bExp && bEvalExp)
-        pCurShell->UpdateExpFlds(true);
+        pCurShell->UpdateExpFields(true);
 
-    if(bTbl)
+    if(bTable)
     {
         pCurShell->Left(CRSR_SKIP_CHARS, false, 1, false );
-        pCurShell->UpdateFlds(*pFld);
+        pCurShell->UpdateFields(*pField);
         pCurShell->Right(CRSR_SKIP_CHARS, false, 1, false );
     }
     else if( bPageVar )
-        static_cast<SwRefPageGetFieldType*>(pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ))->UpdateFlds();
+        static_cast<SwRefPageGetFieldType*>(pCurShell->GetFieldType( 0, RES_REFPAGEGETFLD ))->UpdateFields();
     else if( TYP_GETREFFLD == rData.m_nTypeId )
-        pFld->GetTyp()->ModifyNotification( 0, 0 );
+        pField->GetTyp()->ModifyNotification( 0, 0 );
 
     // delete temporary field
-    delete pFld;
+    delete pField;
 
     pCurShell->EndAllAction();
     return true;
 }
 
 // fields update
-void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
+void SwFieldMgr::UpdateCurField(sal_uLong nFormat,
                             const OUString& rPar1,
                             const OUString& rPar2,
-                            SwField * _pTmpFld) // #111840#
+                            SwField * _pTmpField) // #111840#
 {
     // change format
-    OSL_ENSURE(pCurFld, "no field at CursorPos");
+    OSL_ENSURE(pCurField, "no field at CursorPos");
 
     bool bDelete = false;
-    SwField *pTmpFld;       // mb: fixed memory leak
-    if (NULL != _pTmpFld)
+    SwField *pTmpField;       // mb: fixed memory leak
+    if (NULL != _pTmpField)
     {
-        pTmpFld = _pTmpFld;
+        pTmpField = _pTmpField;
     }
     else
     {
-        pTmpFld = pCurFld->CopyField();
+        pTmpField = pCurField->CopyField();
         bDelete = true;
     }
 
-    SwFieldType* pType   = pTmpFld->GetTyp();
-    const sal_uInt16 nTypeId = pTmpFld->GetTypeId();
+    SwFieldType* pType   = pTmpField->GetTyp();
+    const sal_uInt16 nTypeId = pTmpField->GetTypeId();
 
     SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
     OSL_ENSURE(pSh, "no SwWrtShell found");
@@ -1415,19 +1415,19 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
             nByte = std::max(sal_uInt16(1), nByte);
             nByte = std::min(nByte, sal_uInt16(MAXLEVEL));
             nByte -= 1;
-            static_cast<SwChapterField*>(pTmpFld)->SetLevel((sal_uInt8)nByte);
+            static_cast<SwChapterField*>(pTmpField)->SetLevel((sal_uInt8)nByte);
             bSetPar2 = false;
             break;
         }
 
         case TYP_SCRIPTFLD:
-            static_cast<SwScriptField*>(pTmpFld)->SetCodeURL((bool)nFormat);
+            static_cast<SwScriptField*>(pTmpField)->SetCodeURL((bool)nFormat);
             break;
 
         case TYP_NEXTPAGEFLD:
             if( SVX_NUM_CHAR_SPECIAL == nFormat )
             {
-                static_cast<SwPageNumberField*>(pCurFld)->SetUserString( sPar2 );
+                static_cast<SwPageNumberField*>(pCurField)->SetUserString( sPar2 );
                 sPar2 = "1";
             }
             else
@@ -1443,7 +1443,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
         case TYP_PREVPAGEFLD:
             if( SVX_NUM_CHAR_SPECIAL == nFormat )
             {
-                static_cast<SwPageNumberField*>(pCurFld)->SetUserString( sPar2 );
+                static_cast<SwPageNumberField*>(pCurField)->SetUserString( sPar2 );
                 sPar2 = "-1";
             }
             else
@@ -1465,10 +1465,10 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
         case TYP_GETREFFLD:
             {
                 bSetPar2 = false;
-                static_cast<SwGetRefField*>(pTmpFld)->SetSubType( (sal_uInt16)rPar2.toInt32() );
+                static_cast<SwGetRefField*>(pTmpField)->SetSubType( (sal_uInt16)rPar2.toInt32() );
                 const sal_Int32 nPos = rPar2.indexOf( '|' );
                 if( nPos>=0 )
-                    static_cast<SwGetRefField*>(pTmpFld)->SetSeqNo( (sal_uInt16)rPar2.copy( nPos + 1 ).toInt32());
+                    static_cast<SwGetRefField*>(pTmpField)->SetSeqNo( (sal_uInt16)rPar2.copy( nPos + 1 ).toInt32());
             }
             break;
         case TYP_DROPDOWN:
@@ -1478,15 +1478,15 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
             OUString* pArray = aEntries.getArray();
             for(sal_Int32 nToken = 0; nToken < nTokenCount; nToken++)
                 pArray[nToken] = sPar2.getToken(nToken, DB_DELIM);
-            static_cast<SwDropDownField*>(pTmpFld)->SetItems(aEntries);
-            static_cast<SwDropDownField*>(pTmpFld)->SetName(sPar1);
+            static_cast<SwDropDownField*>(pTmpField)->SetItems(aEntries);
+            static_cast<SwDropDownField*>(pTmpField)->SetName(sPar1);
             bSetPar1 = bSetPar2 = false;
         }
         break;
         case TYP_AUTHORITY :
         {
             //#i99069# changes to a bibliography field should change the field type
-            SwAuthorityField* pAuthorityField = static_cast<SwAuthorityField*>(pTmpFld);
+            SwAuthorityField* pAuthorityField = static_cast<SwAuthorityField*>(pTmpField);
             SwAuthorityFieldType* pAuthorityType = static_cast<SwAuthorityFieldType*>(pType);
             SwAuthEntry aTempEntry;
             for( sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i )
@@ -1494,7 +1494,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
                                 rPar1.getToken( i, TOX_STYLE_DELIMITER ));
             if( pAuthorityType->ChangeEntryContent( &aTempEntry ) )
             {
-                pType->UpdateFlds();
+                pType->UpdateFields();
                 pSh->SetModified();
             }
 
@@ -1508,35 +1508,35 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
 
     // set format
     // setup format before SetPar2 because of NumberFormatter!
-    pTmpFld->ChangeFormat(nFormat);
+    pTmpField->ChangeFormat(nFormat);
 
     if(bSetPar1)
-        pTmpFld->SetPar1( sPar1 );
+        pTmpField->SetPar1( sPar1 );
     if( bSetPar2 )
-        pTmpFld->SetPar2( sPar2 );
+        pTmpField->SetPar2( sPar2 );
 
     // kick off update
     if(nTypeId == TYP_DDEFLD ||
        nTypeId == TYP_USERFLD ||
        nTypeId == TYP_USRINPFLD)
     {
-        pType->UpdateFlds();
+        pType->UpdateFields();
         pSh->SetModified();
     }
     else {
         // mb: #32157
-        pSh->SwEditShell::UpdateFlds(*pTmpFld);
-        GetCurFld();
+        pSh->SwEditShell::UpdateFields(*pTmpField);
+        GetCurField();
     }
 
     if (bDelete)
-        delete pTmpFld;
+        delete pTmpField;
 
     pSh->EndAllAction();
 }
 
 // explicitly evaluate ExpressionFields
-void SwFldMgr::EvalExpFlds(SwWrtShell* pSh)
+void SwFieldMgr::EvalExpFields(SwWrtShell* pSh)
 {
     if (pSh == NULL)
         pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
@@ -1544,11 +1544,11 @@ void SwFldMgr::EvalExpFlds(SwWrtShell* pSh)
     if(pSh)
     {
         pSh->StartAllAction();
-        pSh->UpdateExpFlds(true);
+        pSh->UpdateExpFields(true);
         pSh->EndAllAction();
     }
 }
-sal_uInt16 SwFldMgr::GetCurrLanguage() const
+sal_uInt16 SwFieldMgr::GetCurrLanguage() const
 {
     SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
     if( pSh )
@@ -1556,9 +1556,9 @@ sal_uInt16 SwFldMgr::GetCurrLanguage() const
     return SvtSysLocale().GetLanguageTag().getLanguageType();
 }
 
-void SwFieldType::_GetFldName()
+void SwFieldType::_GetFieldName()
 {
-    static const sal_uInt16 coFldNms[] = {
+    static const sal_uInt16 coFieldNms[] = {
         FLD_DATE_STD,
         FLD_TIME_STD,
         STR_FILENAMEFLD,
@@ -1606,16 +1606,16 @@ void SwFieldType::_GetFldName()
     };
 
     // insert infos for fields
-    SwFieldType::s_pFldNames = new std::vector<OUString>;
-    SwFieldType::s_pFldNames->reserve(SAL_N_ELEMENTS(coFldNms));
-    for( sal_uInt16 nIdx = 0; nIdx < SAL_N_ELEMENTS(coFldNms); ++nIdx )
+    SwFieldType::s_pFieldNames = new std::vector<OUString>;
+    SwFieldType::s_pFieldNames->reserve(SAL_N_ELEMENTS(coFieldNms));
+    for( sal_uInt16 nIdx = 0; nIdx < SAL_N_ELEMENTS(coFieldNms); ++nIdx )
     {
-        const OUString aTmp(SW_RES( coFldNms[ nIdx ] ));
-        SwFieldType::s_pFldNames->push_back(MnemonicGenerator::EraseAllMnemonicChars( aTmp ));
+        const OUString aTmp(SW_RES( coFieldNms[ nIdx ] ));
+        SwFieldType::s_pFieldNames->push_back(MnemonicGenerator::EraseAllMnemonicChars( aTmp ));
     }
 }
 
-bool SwFldMgr::ChooseMacro(const OUString&)
+bool SwFieldMgr::ChooseMacro(const OUString&)
 {
     bool bRet = false;
 
@@ -1632,7 +1632,7 @@ bool SwFldMgr::ChooseMacro(const OUString&)
     return bRet;
 }
 
-void SwFldMgr::SetMacroPath(const OUString& rPath)
+void SwFieldMgr::SetMacroPath(const OUString& rPath)
 {
     sMacroPath = rPath;
     sMacroName = rPath;
@@ -1655,7 +1655,7 @@ void SwFldMgr::SetMacroPath(const OUString& rPath)
     }
 }
 
-sal_uLong SwFldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal)
+sal_uLong SwFieldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal)
 {
     double fValue;
     short  nDefFormat;
@@ -1672,10 +1672,10 @@ sal_uLong SwFldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberF
 
             tools::Time aTime( tools::Time::SYSTEM );
 
-            sal_uLong nNumFmtTime = (sal_uLong)aTime.GetSec() + (sal_uLong)aTime.GetMin() * 60L +
+            sal_uLong nNumFormatTime = (sal_uLong)aTime.GetSec() + (sal_uLong)aTime.GetMin() * 60L +
                           (sal_uLong)aTime.GetHour() * 3600L;
 
-            fValue += (double)nNumFmtTime / 86400.0;
+            fValue += (double)nNumFormatTime / 86400.0;
 
             nDefFormat = (nTypeId == TYP_DATEFLD) ? css::util::NumberFormat::DATE : css::util::NumberFormat::TIME;
         }
@@ -1701,13 +1701,13 @@ sal_uLong SwFldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberF
     return pFormatter->GetStandardFormat(nDefFormat, GetCurrLanguage());
 }
 
-Reference<XNumberingTypeInfo> SwFldMgr::GetNumberingInfo() const
+Reference<XNumberingTypeInfo> SwFieldMgr::GetNumberingInfo() const
 {
     if(!xNumberingInfo.is())
     {
         Reference<XComponentContext>         xContext( ::comphelper::getProcessComponentContext() );
         Reference<XDefaultNumberingProvider> xDefNum = text::DefaultNumberingProvider::create(xContext);
-        const_cast<SwFldMgr*>(this)->xNumberingInfo = Reference<XNumberingTypeInfo>(xDefNum, UNO_QUERY);
+        const_cast<SwFieldMgr*>(this)->xNumberingInfo = Reference<XNumberingTypeInfo>(xDefNum, UNO_QUERY);
     }
     return xNumberingInfo;
 }
diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx
index a027814fa755..3573174dfc01 100644
--- a/sw/source/uibase/fldui/fldwrap.cxx
+++ b/sw/source/uibase/fldui/fldwrap.cxx
@@ -35,7 +35,7 @@
 #include <globals.hrc>
 #include "swabstdlg.hxx"
 
-SFX_IMPL_CHILDWINDOW_WITHID(SwFldDlgWrapper, FN_INSERT_FIELD)
+SFX_IMPL_CHILDWINDOW_WITHID(SwFieldDlgWrapper, FN_INSERT_FIELD)
 
 SwChildWinWrapper::SwChildWinWrapper(vcl::Window *pParentWindow, sal_uInt16 nId) :
         SfxChildWindow(pParentWindow, nId),
@@ -67,21 +67,21 @@ bool SwChildWinWrapper::ReInitDlg(SwDocShell *)
     return bRet;
 }
 
-SfxChildWinInfo SwFldDlgWrapper::GetInfo() const
+SfxChildWinInfo SwFieldDlgWrapper::GetInfo() const
 {
     SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();
     aInfo.aPos = GetWindow()->OutputToAbsoluteScreenPixel(aInfo.aPos);
     return aInfo;
 }
 
-SwFldDlgWrapper::SwFldDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
+SwFieldDlgWrapper::SwFieldDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
                                     SfxBindings* pB,
                                     SfxChildWinInfo*  )
     : SwChildWinWrapper( _pParent, nId )
 {
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
     assert(pFact && "SwAbstractDialogFactory fail!");
-    AbstractSwFldDlg* pDlg = pFact->CreateSwFldDlg(pB, this, _pParent);
+    AbstractSwFieldDlg* pDlg = pFact->CreateSwFieldDlg(pB, this, _pParent);
     assert(pDlg && "Dialog creation failed!");
     pDlgInterface = pDlg;
     pWindow = pDlg->GetWindow();
@@ -90,7 +90,7 @@ SwFldDlgWrapper::SwFldDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
 }
 
 // newly initialise dialog after Doc switch
-bool SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
+bool SwFieldDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
 {
     bool bRet;
 
@@ -102,14 +102,14 @@ bool SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
     return bRet;
 }
 
-void SwFldDlgWrapper::ShowReferencePage()
+void SwFieldDlgWrapper::ShowReferencePage()
 {
     pDlgInterface->ShowReferencePage();
 }
 
-SFX_IMPL_CHILDWINDOW(SwFldDataOnlyDlgWrapper, FN_INSERT_FIELD_DATA_ONLY)
+SFX_IMPL_CHILDWINDOW(SwFieldDataOnlyDlgWrapper, FN_INSERT_FIELD_DATA_ONLY)
 
-SfxChildWinInfo SwFldDataOnlyDlgWrapper::GetInfo() const
+SfxChildWinInfo SwFieldDataOnlyDlgWrapper::GetInfo() const
 {
     SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();
 // prevent instatiation of dialog other than by calling
@@ -118,7 +118,7 @@ SfxChildWinInfo SwFldDataOnlyDlgWrapper::GetInfo() const
     return aInfo;
 }
 
-SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
+SwFieldDataOnlyDlgWrapper::SwFieldDataOnlyDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
                                     SfxBindings* pB,
                                     SfxChildWinInfo* pInfo )
     : SwChildWinWrapper( _pParent, nId )
@@ -126,7 +126,7 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( vcl::Window* _pParent, sal_uIn
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    AbstractSwFldDlg* pDlg = pFact->CreateSwFldDlg(pB, this, _pParent);
+    AbstractSwFieldDlg* pDlg = pFact->CreateSwFieldDlg(pB, this, _pParent);
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     pDlgInterface = pDlg;
 
@@ -138,7 +138,7 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( vcl::Window* _pParent, sal_uIn
 }
 
 // re-init after doc activation
-bool SwFldDataOnlyDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
+bool SwFieldDataOnlyDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
 {
     bool bRet;
     if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)))  // update immediately, Doc switch
diff --git a/sw/source/uibase/fldui/xfldui.cxx b/sw/source/uibase/fldui/xfldui.cxx
index adc4f9cb91b0..5bf5b738ac9f 100644
--- a/sw/source/uibase/fldui/xfldui.cxx
+++ b/sw/source/uibase/fldui/xfldui.cxx
@@ -47,8 +47,8 @@ using namespace ::com::sun::star::beans;
 
 // Is the database field numeric?
 // remark: in case of error true is returned
-bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName,
-                            bool bIsTable, const OUString& rFldName)
+bool SwFieldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTableQryName,
+                            bool bIsTable, const OUString& rFieldName)
 {
     bool bNumeric = true;
 
@@ -68,11 +68,11 @@ bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName
         Reference<XTablesSupplier> xTSupplier = Reference<XTablesSupplier>(xConnection, UNO_QUERY);
         if(xTSupplier.is())
         {
-            Reference<XNameAccess> xTbls = xTSupplier->getTables();
-            OSL_ENSURE(xTbls->hasByName(rTblQryName), "table not available anymore?");
+            Reference<XNameAccess> xTables = xTSupplier->getTables();
+            OSL_ENSURE(xTables->hasByName(rTableQryName), "table not available anymore?");
             try
             {
-                Any aTable = xTbls->getByName(rTblQryName);
+                Any aTable = xTables->getByName(rTableQryName);
                 Reference<XPropertySet> xPropSet;
                 aTable >>= xPropSet;
                 xColsSupplier = Reference<XColumnsSupplier>(xPropSet, UNO_QUERY);
@@ -88,10 +88,10 @@ bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName
         if(xQSupplier.is())
         {
             Reference<XNameAccess> xQueries = xQSupplier->getQueries();
-            OSL_ENSURE(xQueries->hasByName(rTblQryName), "table not available anymore?");
+            OSL_ENSURE(xQueries->hasByName(rTableQryName), "table not available anymore?");
             try
             {
-                Any aQuery = xQueries->getByName(rTblQryName);
+                Any aQuery = xQueries->getByName(rTableQryName);
                 Reference<XPropertySet> xPropSet;
                 aQuery >>= xPropSet;
                 xColsSupplier = Reference<XColumnsSupplier>(xPropSet, UNO_QUERY);
@@ -113,9 +113,9 @@ bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName
         {
             OSL_FAIL("Exception in getColumns()");
         }
-        if(xCols.is() && xCols->hasByName(rFldName))
+        if(xCols.is() && xCols->hasByName(rFieldName))
         {
-            Any aCol = xCols->getByName(rFldName);
+            Any aCol = xCols->getByName(rFieldName);
             Reference <XPropertySet> xCol;
             aCol >>= xCol;
             Any aType = xCol->getPropertyValue("Type");
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index 397d5fb55dfe..de12203c955b 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -425,7 +425,7 @@ void SwColumnOnlyExample::Paint(vcl::RenderContext& rRenderContext, const Rectan
     }
 }
 
-void  SwColumnOnlyExample::SetColumns(const SwFmtCol& rCol)
+void  SwColumnOnlyExample::SetColumns(const SwFormatCol& rCol)
 {
     m_aCols = rCol;
     sal_uInt16 nWishSum = m_aCols.GetWishWidth();
diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx
index 3f040b844358..12773f181ce6 100644
--- a/sw/source/uibase/frmdlg/colmgr.cxx
+++ b/sw/source/uibase/frmdlg/colmgr.cxx
@@ -27,7 +27,7 @@
 // private methods
 
 // set column width to current width
-void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth)
+void FitToActualSize(SwFormatCol& rCol, sal_uInt16 nWidth)
 {
     const sal_uInt16 nCount = rCol.GetColumns().size();
     for(sal_uInt16 i = 0; i < nCount; ++i)
@@ -43,20 +43,20 @@ void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth)
 // set column quantity and Gutterwidth
 void SwColMgr::SetCount(sal_uInt16 nCount, sal_uInt16  nGutterWidth)
 {
-    aFmtCol.Init(nCount, nGutterWidth, nWidth);
-    aFmtCol.SetWishWidth(nWidth);
-    aFmtCol.SetGutterWidth(nGutterWidth, nWidth);
+    aFormatCol.Init(nCount, nGutterWidth, nWidth);
+    aFormatCol.SetWishWidth(nWidth);
+    aFormatCol.SetGutterWidth(nGutterWidth, nWidth);
 }
 
 sal_uInt16 SwColMgr::GetGutterWidth( sal_uInt16 nPos ) const
 {
     sal_uInt16 nRet;
     if(nPos == USHRT_MAX )
-        nRet = GetCount() > 1 ? aFmtCol.GetGutterWidth() : DEF_GUTTER_WIDTH;
+        nRet = GetCount() > 1 ? aFormatCol.GetGutterWidth() : DEF_GUTTER_WIDTH;
     else
     {
         OSL_ENSURE(nPos < GetCount() - 1, "Spalte ueberindiziert" );
-        const SwColumns& rCols = aFmtCol.GetColumns();
+        const SwColumns& rCols = aFormatCol.GetColumns();
         nRet = rCols[nPos].GetRight() + rCols[nPos + 1].GetLeft();
     }
     return nRet;
@@ -65,11 +65,11 @@ sal_uInt16 SwColMgr::GetGutterWidth( sal_uInt16 nPos ) const
 void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos )
 {
     if(nPos == USHRT_MAX)
-        aFmtCol.SetGutterWidth(nGutterWidth, nWidth);
+        aFormatCol.SetGutterWidth(nGutterWidth, nWidth);
     else
     {
         OSL_ENSURE(nPos < GetCount() - 1, "Spalte ueberindiziert" );
-        SwColumns& rCols = aFmtCol.GetColumns();
+        SwColumns& rCols = aFormatCol.GetColumns();
         sal_uInt16 nGutterWidth2 = nGutterWidth / 2;
         rCols[nPos].SetRight(nGutterWidth2);
         rCols[nPos + 1].SetLeft(nGutterWidth2);
@@ -79,25 +79,25 @@ void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos )
 // height separation line
 short SwColMgr::GetLineHeightPercent() const
 {
-    return (short)aFmtCol.GetLineHeight();
+    return (short)aFormatCol.GetLineHeight();
 }
 void SwColMgr::SetLineHeightPercent(short nPercent)
 {
     OSL_ENSURE(nPercent <= 100, "line height may be at most 100%");
-    aFmtCol.SetLineHeight((sal_uInt8)nPercent);
+    aFormatCol.SetLineHeight((sal_uInt8)nPercent);
 }
 
 // column width
 sal_uInt16 SwColMgr::GetColWidth(sal_uInt16 nIdx) const
 {
     OSL_ENSURE(nIdx < GetCount(), "Spaltenarray ueberindiziert.");
-    return aFmtCol.CalcPrtColWidth(nIdx, nWidth);
+    return aFormatCol.CalcPrtColWidth(nIdx, nWidth);
 }
 
 void SwColMgr::SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWd)
 {
     OSL_ENSURE(nIdx < GetCount(), "Spaltenarray ueberindiziert.");
-    aFmtCol.GetColumns()[nIdx].SetWishWidth(nWd);
+    aFormatCol.GetColumns()[nIdx].SetWishWidth(nWd);
 
 }
 
@@ -105,24 +105,24 @@ void SwColMgr::SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWd)
 void SwColMgr::SetActualWidth(sal_uInt16 nW)
 {
     nWidth = nW;
-    ::FitToActualSize(aFmtCol, nW);
+    ::FitToActualSize(aFormatCol, nW);
 }
 
 // ctor
 SwColMgr::SwColMgr(const SfxItemSet& rSet, sal_uInt16 nActWidth) :
-    aFmtCol(static_cast<const SwFmtCol&>(rSet.Get(RES_COL))),
+    aFormatCol(static_cast<const SwFormatCol&>(rSet.Get(RES_COL))),
     nWidth(nActWidth)
 {
     if(nWidth == USHRT_MAX)
     {
-        nWidth = (sal_uInt16)static_cast<const SwFmtFrmSize&>(rSet.Get(RES_FRM_SIZE)).GetWidth();
+        nWidth = (sal_uInt16)static_cast<const SwFormatFrmSize&>(rSet.Get(RES_FRM_SIZE)).GetWidth();
         if (nWidth < MINLAY)
             nWidth = USHRT_MAX;
         const SvxLRSpaceItem &rLR = static_cast<const SvxLRSpaceItem&>(rSet.Get(RES_LR_SPACE));
         nWidth = nWidth - (sal_uInt16)rLR.GetLeft();
         nWidth = nWidth - (sal_uInt16)rLR.GetRight();
     }
-    ::FitToActualSize(aFmtCol, nWidth);
+    ::FitToActualSize(aFormatCol, nWidth);
 }
 
 SwColMgr::~SwColMgr()
@@ -131,9 +131,9 @@ SwColMgr::~SwColMgr()
 
 void SwColMgr::SetLineWidthAndColor(::editeng::SvxBorderStyle eStyle, sal_uLong nLWidth, const Color& rCol)
 {
-    aFmtCol.SetLineStyle(eStyle);
-    aFmtCol.SetLineWidth(nLWidth);
-    aFmtCol.SetLineColor(rCol);
+    aFormatCol.SetLineStyle(eStyle);
+    aFormatCol.SetLineWidth(nLWidth);
+    aFormatCol.SetLineColor(rCol);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 925bd67b5b83..bd3c326429f0 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -74,10 +74,10 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( bool bNew, SwWrtShell* pSh, sal_uInt8 nType )
             case FRMMGR_TYPE_OLE:   nId = RES_POOLFRM_OLE;      break;
             case FRMMGR_TYPE_GRF:   nId = RES_POOLFRM_GRAPHIC;  break;
         }
-        m_aSet.SetParent( &m_pOwnSh->GetFmtFromPool( nId )->GetAttrSet());
-        m_aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE, DFLT_WIDTH, DFLT_HEIGHT ));
+        m_aSet.SetParent( &m_pOwnSh->GetFormatFromPool( nId )->GetAttrSet());
+        m_aSet.Put( SwFormatFrmSize( ATT_MIN_SIZE, DFLT_WIDTH, DFLT_HEIGHT ));
         if ( 0 != ::GetHtmlMode(pSh->GetView().GetDocShell()) )
-            m_aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::PRINT_AREA ) );
+            m_aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::PRINT_AREA ) );
     }
     else if ( nType == FRMMGR_TYPE_NONE )
     {
@@ -142,8 +142,8 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm()
             SfxItemSet aGetSet( *m_aSet.GetPool(), RES_ANCHOR, RES_ANCHOR );
             if( m_pOwnSh->GetFlyFrmAttr( aGetSet ) && 1 == aGetSet.Count() &&
                 SfxItemState::SET == aGetSet.GetItemState( RES_ANCHOR, false, &pGItem )
-                && static_cast<const SwFmtAnchor*>(pGItem)->GetAnchorId() ==
-                   static_cast<const SwFmtAnchor*>(pItem)->GetAnchorId() )
+                && static_cast<const SwFormatAnchor*>(pGItem)->GetAnchorId() ==
+                   static_cast<const SwFormatAnchor*>(pItem)->GetAnchorId() )
                 m_aSet.ClearItem( RES_ANCHOR );
         }
 
@@ -205,12 +205,12 @@ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
     sal_uInt16 nPhyPageNum, nVirtPageNum;
     m_pOwnSh->GetPageNum( nPhyPageNum, nVirtPageNum );
 
-    m_aSet.Put( SwFmtAnchor( eId, nPhyPageNum ) );
+    m_aSet.Put( SwFormatAnchor( eId, nPhyPageNum ) );
     if ((FLY_AT_PAGE == eId) || (FLY_AT_PARA == eId) || (FLY_AT_CHAR == eId)
         || (FLY_AT_FLY == eId))
     {
-        SwFmtVertOrient aVertOrient( GetVertOrient() );
-        SwFmtHoriOrient aHoriOrient( GetHoriOrient() );
+        SwFormatVertOrient aVertOrient( GetVertOrient() );
+        SwFormatHoriOrient aHoriOrient( GetHoriOrient() );
         aHoriOrient.SetRelationOrient( text::RelOrientation::FRAME );
         aVertOrient.SetRelationOrient( text::RelOrientation::FRAME );
         m_aSet.Put( aVertOrient );
@@ -219,7 +219,7 @@ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
 }
 
 // set the attribute for columns
-void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
+void SwFlyFrmAttrMgr::SetCol( const SwFormatCol &rCol )
 {
     m_aSet.Put( rCol );
 }
@@ -229,8 +229,8 @@ void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
 {
     m_bAbsPos = true;
     m_aAbsPos = rPoint;
-    SwFmtVertOrient aVertOrient( GetVertOrient() );
-    SwFmtHoriOrient aHoriOrient( GetHoriOrient() );
+    SwFormatVertOrient aVertOrient( GetVertOrient() );
+    SwFormatHoriOrient aHoriOrient( GetHoriOrient() );
     aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE );
     aVertOrient.SetVertOrient( text::VertOrientation::NONE );
     m_aSet.Put( aVertOrient );
@@ -239,7 +239,7 @@ void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
 
 // check metrics for correctness
 void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
-        const SwPosition* pToCharCntntPos,
+        const SwPosition* pToCharContentPos,
         bool bOnlyPercentRefValue )
 {
     if (!bOnlyPercentRefValue)
@@ -253,11 +253,11 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
     // OD 18.09.2003 #i18732# - adjustment for allowing vertical position
     //      aligned to page for fly frame anchored to paragraph or to character.
     const RndStdIds eAnchorType = static_cast<RndStdIds >(rVal.nAnchorType);
-    const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(m_aSet.Get(RES_FRM_SIZE));
+    const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>(m_aSet.Get(RES_FRM_SIZE));
     m_pOwnSh->CalcBoundRect( aBoundRect, eAnchorType,
                            rVal.nHRelOrient,
                            rVal.nVRelOrient,
-                           pToCharCntntPos,
+                           pToCharContentPos,
                            rVal.bFollowTextFlow,
                            rVal.bMirror, NULL, &rVal.aPercentSize,
                            &rSize);
@@ -539,8 +539,8 @@ void SwFlyFrmAttrMgr::SetULSpace( long nTop, long nBottom )
 
 void SwFlyFrmAttrMgr::SetPos( const Point& rPoint )
 {
-    SwFmtVertOrient aVertOrient( GetVertOrient() );
-    SwFmtHoriOrient aHoriOrient( GetHoriOrient() );
+    SwFormatVertOrient aVertOrient( GetVertOrient() );
+    SwFormatHoriOrient aHoriOrient( GetHoriOrient() );
 
     aHoriOrient.SetPos       ( rPoint.X() );
     aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE  );
@@ -554,28 +554,28 @@ void SwFlyFrmAttrMgr::SetPos( const Point& rPoint )
 
 void SwFlyFrmAttrMgr::SetHorzOrientation( sal_Int16 eOrient )
 {
-    SwFmtHoriOrient aHoriOrient( GetHoriOrient() );
+    SwFormatHoriOrient aHoriOrient( GetHoriOrient() );
     aHoriOrient.SetHoriOrient( eOrient );
     m_aSet.Put( aHoriOrient );
 }
 
 void SwFlyFrmAttrMgr::SetVertOrientation( sal_Int16 eOrient )
 {
-    SwFmtVertOrient aVertOrient( GetVertOrient() );
+    SwFormatVertOrient aVertOrient( GetVertOrient() );
     aVertOrient.SetVertOrient( eOrient );
     m_aSet.Put( aVertOrient );
 }
 
 void SwFlyFrmAttrMgr::SetHeightSizeType( SwFrmSize eType )
 {
-    SwFmtFrmSize aSize( GetFrmSize() );
+    SwFormatFrmSize aSize( GetFrmSize() );
     aSize.SetHeightSizeType( eType );
     m_aSet.Put( aSize );
 }
 
 void SwFlyFrmAttrMgr::SetSize( const Size& rSize )
 {
-    SwFmtFrmSize aSize( GetFrmSize() );
+    SwFormatFrmSize aSize( GetFrmSize() );
     aSize.SetSize(Size(std::max(rSize.Width(), long(MINFLY)), std::max(rSize.Height(), long(MINFLY))));
     m_aSet.Put( aSize );
 }
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index cca31c0ed9bf..280f3607e269 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -61,7 +61,7 @@ protected:
 
     DECL_LINK(          InsertDBTextHdl, DBTextStruct_Impl* );
 
-    void                InsertURLButton( const OUString& rURL, const OUString& rTarget, const OUString& rTxt );
+    void                InsertURLButton( const OUString& rURL, const OUString& rTarget, const OUString& rText );
     void                InsertTable( SfxRequest& _rRequest );
 
 public:
@@ -94,9 +94,9 @@ public:
     void        ExecDlg(SfxRequest &);
 
     void        StateStatusLine(SfxItemSet &rSet);
-    void        ExecTxtCtrl(SfxRequest& rReq);
-    void        GetTxtFontCtrlState(SfxItemSet& rSet);
-    void        GetTxtCtrlState(SfxItemSet& rSet);
+    void        ExecTextCtrl(SfxRequest& rReq);
+    void        GetTextFontCtrlState(SfxItemSet& rSet);
+    void        GetTextCtrlState(SfxItemSet& rSet);
     void        GetBorderState(SfxItemSet &rSet);
     void        GetBckColState(SfxItemSet &rSet);
 
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index 8bedf3f7e8ac..4eb1966ffc8d 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem
     bool bNonbreakingSpace  :1;
     bool bSoftHyphen        :1;
     bool bCharHiddenText    :1;
-    bool bFldHiddenText     :1;
+    bool bFieldHiddenText     :1;
     bool bManualBreak       :1;
     bool bShowHiddenPara    :1;
 
diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx
index c10948bab9c2..8a3f95a3003c 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.hxx
@@ -27,7 +27,7 @@
 #include <svx/stddlg.hxx>
 #include "dbtree.hxx"
 
-class SwFldMgr;
+class SwFieldMgr;
 class SwView;
 class SwWrtShell;
 struct SwDBData;
@@ -44,14 +44,14 @@ class SwChangeDBDlg: public SvxStandardDialog
     ImageList       aImageList;
 
     SwWrtShell      *pSh;
-    SwFldMgr        *pMgr;
+    SwFieldMgr        *pMgr;
 
     DECL_LINK(TreeSelectHdl, void * = 0);
     DECL_LINK(ButtonHdl, void *);
     DECL_LINK(AddDBHdl, void *);
 
     virtual void    Apply() SAL_OVERRIDE;
-    void            UpdateFlds();
+    void            UpdateFields();
     void            FillDBPopup();
     SvTreeListEntry*    Insert(const OUString& rDBName);
     void            ShowDBName(const SwDBData& rDBData);
diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx
index ff6f91b3a516..58366f7c3baa 100644
--- a/sw/source/uibase/inc/chrdlg.hxx
+++ b/sw/source/uibase/inc/chrdlg.hxx
@@ -50,7 +50,7 @@ class SwCharDlg: public SfxTabDialog
 
 public:
     SwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
-              sal_uInt8 nDialogMode, const OUString* pFmtStr = 0);
+              sal_uInt8 nDialogMode, const OUString* pFormatStr = 0);
 
     virtual ~SwCharDlg();
 
diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx
index 35a2809b7af8..506b41601969 100644
--- a/sw/source/uibase/inc/colex.hxx
+++ b/sw/source/uibase/inc/colex.hxx
@@ -95,7 +95,7 @@ private:
     Size        m_aWinSize;
 
     Size        m_aFrmSize;
-    SwFmtCol    m_aCols;
+    SwFormatCol    m_aCols;
 
 protected:
     virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
@@ -103,7 +103,7 @@ protected:
 public:
     SwColumnOnlyExample(vcl::Window*);
 
-    void        SetColumns(const SwFmtCol& rCol);
+    void        SetColumns(const SwFormatCol& rCol);
 
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
 };
diff --git a/sw/source/uibase/inc/colmgr.hxx b/sw/source/uibase/inc/colmgr.hxx
index e63b3f0aba53..fc52425801f7 100644
--- a/sw/source/uibase/inc/colmgr.hxx
+++ b/sw/source/uibase/inc/colmgr.hxx
@@ -22,7 +22,7 @@
 #include "swdllapi.h"
 #include <fmtclds.hxx>
 
-SW_DLLPUBLIC void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth);
+SW_DLLPUBLIC void FitToActualSize(SwFormatCol& rCol, sal_uInt16 nWidth);
 
 class SW_DLLPUBLIC SwColMgr
 {
@@ -59,57 +59,57 @@ public:
     inline void         NoCols();
     void                Update();
 
-    const SwFmtCol&     GetColumns() const { return aFmtCol; }
+    const SwFormatCol&     GetColumns() const { return aFormatCol; }
 
     void                SetActualWidth(sal_uInt16 nW);
     sal_uInt16              GetActualSize() const { return nWidth; }
 
 private:
 
-    SwFmtCol            aFmtCol;
+    SwFormatCol            aFormatCol;
     sal_uInt16              nWidth;
 };
 
 inline  sal_uInt16 SwColMgr::GetCount() const
 {
-    return aFmtCol.GetNumCols();
+    return aFormatCol.GetNumCols();
 }
 
 inline ::editeng::SvxBorderStyle SwColMgr::GetLineStyle() const
 {
-    return aFmtCol.GetLineStyle();
+    return aFormatCol.GetLineStyle();
 }
 inline sal_uLong        SwColMgr::GetLineWidth() const
 {
-    return aFmtCol.GetLineWidth();
+    return aFormatCol.GetLineWidth();
 }
 
 inline const Color& SwColMgr::GetLineColor() const
 {
-    return aFmtCol.GetLineColor();
+    return aFormatCol.GetLineColor();
 }
 
 inline  SwColLineAdj SwColMgr::GetAdjust() const
 {
-    return aFmtCol.GetLineAdj();
+    return aFormatCol.GetLineAdj();
 }
 
 inline  void SwColMgr::SetAdjust(SwColLineAdj eAdj)
 {
-    aFmtCol.SetLineAdj(eAdj);
+    aFormatCol.SetLineAdj(eAdj);
 }
 inline bool SwColMgr::IsAutoWidth() const
 {
-    return aFmtCol.IsOrtho();
+    return aFormatCol.IsOrtho();
 }
 inline void SwColMgr::SetAutoWidth(bool bOn, sal_uInt16 nGutterWidth)
 {
-    aFmtCol.SetOrtho(bOn, nGutterWidth, nWidth);
+    aFormatCol.SetOrtho(bOn, nGutterWidth, nWidth);
 }
 
 inline void SwColMgr::NoCols()
 {
-    aFmtCol.GetColumns().clear();
+    aFormatCol.GetColumns().clear();
 }
 inline bool SwColMgr::HasLine() const
 {
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index d065065ee66d..0d1a804b9d86 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -26,8 +26,8 @@
 class SwWrtShell;
 class SwContentArr;
 class SwContentType;
-class SwFmtFld;
-class SwTxtINetFmt;
+class SwFormatField;
+class SwTextINetFormat;
 class SwTOXBase;
 class SwRangeRedline;
 
@@ -71,34 +71,34 @@ class SwRegionContent : public SwContent
 class SwURLFieldContent : public SwContent
 {
     OUString sURL;
-    const SwTxtINetFmt* pINetAttr;
+    const SwTextINetFormat* pINetAttr;
 
 public:
     SwURLFieldContent(  const SwContentType* pCnt,
                             const OUString& rName,
                             const OUString& rURL,
-                            const SwTxtINetFmt* pAttr,
+                            const SwTextINetFormat* pAttr,
                             long nYPos )
         : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr )
     {}
 
     virtual bool        IsProtect() const SAL_OVERRIDE;
     const OUString&     GetURL()    const   { return sURL; }
-    const SwTxtINetFmt* GetINetAttr()       { return pINetAttr; }
+    const SwTextINetFormat* GetINetAttr()       { return pINetAttr; }
 };
 
 class SwPostItContent : public SwContent
 {
-    const SwFmtFld*     pFld;
+    const SwFormatField*     pField;
     SwRangeRedline*     pRedline;
     bool                mbPostIt;
 public:
     SwPostItContent( const SwContentType* pCnt,
                             const OUString& rName,
-                            const SwFmtFld* pFormatField,
+                            const SwFormatField* pFormatField,
                             long nYPos )
         : SwContent(pCnt, rName, nYPos)
-        , pFld(pFormatField)
+        , pField(pFormatField)
         , pRedline(NULL)
         , mbPostIt(true)
     {}
@@ -107,12 +107,12 @@ public:
                             SwRangeRedline* pRed,
                             long nYPos )
         : SwContent(pCnt, rName, nYPos)
-        , pFld(NULL)
+        , pField(NULL)
         , pRedline(pRed)
         , mbPostIt(false)
     {}
 
-    const SwFmtFld* GetPostIt() const  { return pFld; }
+    const SwFormatField* GetPostIt() const  { return pField; }
     SwRangeRedline* GetRedline() { return pRedline; }
     virtual bool    IsProtect()     const SAL_OVERRIDE;
     bool            IsPostIt()   const {return mbPostIt; }
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 9421f16c1926..48bf91fd1f3d 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -57,7 +57,7 @@ class SwContentTree
     OUString            aContextStrings[CONTEXT_COUNT + 1];
     OUString            sRemoveIdx;
     OUString            sUpdateIdx;
-    OUString            sUnprotTbl;
+    OUString            sUnprotTable;
     OUString            sRename;
     OUString            sReadonlyIdx;
     OUString            sInvisible;
diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx
index 1a52d8ba2c99..c1ff57ab4434 100644
--- a/sw/source/uibase/inc/convert.hxx
+++ b/sw/source/uibase/inc/convert.hxx
@@ -24,7 +24,7 @@
 #include <vcl/edit.hxx>
 #include <sfx2/basedlgs.hxx>
 
-class SwTableAutoFmt;
+class SwTableAutoFormat;
 class SwView;
 class SwWrtShell;
 class NumericField;
@@ -49,13 +49,13 @@ class SwConvertTableDlg: public SfxModalDialog
 
     VclPtr<CheckBox>       mpDontSplitCB;
     VclPtr<CheckBox>       mpBorderCB;
-    VclPtr<PushButton>     mpAutoFmtBtn;
+    VclPtr<PushButton>     mpAutoFormatBtn;
 
     OUString        sConvertTextTable;
-    SwTableAutoFmt* pTAutoFmt;
+    SwTableAutoFormat* pTAutoFormat;
     SwWrtShell*     pShell;
 
-    DECL_LINK( AutoFmtHdl, PushButton* );
+    DECL_LINK( AutoFormatHdl, PushButton* );
     DECL_LINK( BtnHdl, Button* );
     DECL_LINK(CheckBoxHdl, void * = 0);
     DECL_LINK( ReapeatHeaderCheckBoxHdl, void* p = 0 );
@@ -66,8 +66,8 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
     void GetValues( sal_Unicode& rDelim,
-                    SwInsertTableOptions& rInsTblOpts,
-                    SwTableAutoFmt const*& prTAFmt );
+                    SwInsertTableOptions& rInsTableOpts,
+                    SwTableAutoFormat const*& prTAFormat );
 };
 
 #endif
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 5f99c2025360..e152912e40e7 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
-class SwFldMgr;
+class SwFieldMgr;
 class SwView;
 
 #include <wrtsh.hxx>
@@ -83,7 +83,7 @@ class SwCaptionDialog : public SvxStandardDialog
     VclPtr<SwCaptionPreview> m_pPreview;
 
     SwView       &rView; // search per active, avoid View
-    SwFldMgr     *pMgr;      // pointer to save the include
+    SwFieldMgr     *pMgr;      // pointer to save the include
     SelectionType eType;
 
     OUString     sCharacterStyle;
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index 837c2f7019ab..789b197684a8 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -47,7 +47,7 @@ namespace com{namespace sun{namespace star{
     }
 }}}
 
-class SwTableAutoFmt;
+class SwTableAutoFormat;
 class SwView;
 class SfxItemSet;
 class SwTableRep;
@@ -56,22 +56,22 @@ typedef boost::ptr_vector<_DB_Column> _DB_Columns;
 
 struct SwInsDBColumn
 {
-    OUString sColumn, sUsrNumFmt;
-    sal_Int32 nDBNumFmt;
-    sal_uInt32 nUsrNumFmt;
-    LanguageType eUsrNumFmtLng;
+    OUString sColumn, sUsrNumFormat;
+    sal_Int32 nDBNumFormat;
+    sal_uInt32 nUsrNumFormat;
+    LanguageType eUsrNumFormatLng;
     sal_uInt16 nCol;
-    bool bHasFmt : 1;
-    bool bIsDBFmt : 1;
+    bool bHasFormat : 1;
+    bool bIsDBFormat : 1;
 
     SwInsDBColumn( const OUString& rStr, sal_uInt16 nColumn )
         : sColumn( rStr ),
-        nDBNumFmt( 0 ),
-        nUsrNumFmt( 0 ),
-        eUsrNumFmtLng( LANGUAGE_SYSTEM ),
+        nDBNumFormat( 0 ),
+        nUsrNumFormat( 0 ),
+        eUsrNumFormatLng( LANGUAGE_SYSTEM ),
         nCol( nColumn ),
-        bHasFmt(false),
-        bIsDBFmt(true)
+        bHasFormat(false),
+        bIsDBFormat(true)
     {}
 
     bool operator==( const SwInsDBColumn& rCmp ) const
@@ -93,13 +93,13 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
 
     VclPtr<VclFrame>       m_pHeadFrame;
 
-    VclPtr<ListBox>        m_pLbTblDbColumn;
-    VclPtr<ListBox>        m_pLbTxtDbColumn;
+    VclPtr<ListBox>        m_pLbTableDbColumn;
+    VclPtr<ListBox>        m_pLbTextDbColumn;
 
     VclPtr<VclFrame>       m_pFormatFrame;
-    VclPtr<RadioButton>    m_pRbDbFmtFromDb;
-    VclPtr<RadioButton>    m_pRbDbFmtFromUsr;
-    VclPtr<NumFormatListBox> m_pLbDbFmtFromUsr;
+    VclPtr<RadioButton>    m_pRbDbFormatFromDb;
+    VclPtr<RadioButton>    m_pRbDbFormatFromUsr;
+    VclPtr<NumFormatListBox> m_pLbDbFormatFromUsr;
 
     // Page Text/Field
     VclPtr<PushButton>     m_pIbDbcolToEdit;
@@ -117,32 +117,32 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
     VclPtr<CheckBox>       m_pCbTableHeadon;
     VclPtr<RadioButton>    m_pRbHeadlColnms;
     VclPtr<RadioButton>    m_pRbHeadlEmpty;
-    VclPtr<PushButton>     m_pPbTblFormat;
-    VclPtr<PushButton>     m_pPbTblAutofmt;
+    VclPtr<PushButton>     m_pPbTableFormat;
+    VclPtr<PushButton>     m_pPbTableAutofmt;
 
     SwInsDBColumns  aDBColumns;
     const SwDBData  aDBData;
 
-    Link<>          aOldNumFmtLnk;
+    Link<>          aOldNumFormatLnk;
     OUString        sNoTmpl;
 
     SwView*         pView;
-    SwTableAutoFmt* pTAutoFmt;
+    SwTableAutoFormat* pTAutoFormat;
 
-    SfxItemSet*     pTblSet;
+    SfxItemSet*     pTableSet;
     SwTableRep*     pRep;
-    sal_Int32       nGBFmtLen;
+    sal_Int32       nGBFormatLen;
 
     DECL_LINK( PageHdl, Button* );
-    DECL_LINK( AutoFmtHdl, PushButton* );
-    DECL_LINK( TblFmtHdl, PushButton* );
+    DECL_LINK( AutoFormatHdl, PushButton* );
+    DECL_LINK( TableFormatHdl, PushButton* );
     DECL_LINK( DBFormatHdl, Button* );
-    DECL_LINK( TblToFromHdl, Button* );
+    DECL_LINK( TableToFromHdl, Button* );
     DECL_LINK( SelectHdl, ListBox* );
     DECL_LINK( DblClickHdl, ListBox* );
     DECL_LINK( HeaderHdl, Button* );
 
-    bool SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, bool bInsField );
+    bool SplitTextToColArr( const OUString& rText, _DB_Columns& rColArr, bool bInsField );
         using SfxModalDialog::Notify;
     virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
     virtual void            ImplCommit() SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx
index b8656bdec8c4..a74868be1aba 100644
--- a/sw/source/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/uibase/inc/drwtxtsh.hxx
@@ -62,7 +62,7 @@ public:
     void        ExecDraw(SfxRequest &);
     void        GetStatePropPanelAttr(SfxItemSet &);
     void        GetState(SfxItemSet &);
-    void        GetDrawTxtCtrlState(SfxItemSet&);
+    void        GetDrawTextCtrlState(SfxItemSet&);
 
     void        ExecFontWork(SfxRequest& rReq);
     void        StateFontWork(SfxItemSet& rSet);
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 2c5062f20794..ed65f1e9d1d6 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -123,8 +123,8 @@ friend void     PageNumNotify(  SwViewShell* pVwSh,
                     m_bIsInDrag       : 1, // don't execute StartExecuteDrag twice
                     m_bOldIdle        : 1, // to stop to idle
                     m_bOldIdleSet     : 1, // during QeueryDrop
-                    m_bTblInsDelMode  : 1,
-                    m_bTblIsInsMode   : 1,
+                    m_bTableInsDelMode  : 1,
+                    m_bTableIsInsMode   : 1,
                     m_bChainMode      : 1, // connect frames
                     m_bWasShdwCrsr    : 1, // ShadowCrsr was on in MouseButtonDown
                     m_bLockInput      : 1, // lock while calc panel is active
@@ -289,7 +289,7 @@ public:
     /** fdo#55546 cut very long tooltips to 2/3 of the width of the screen
         via center ellipsis
      */
-    OUString ClipLongToolTip(const OUString& rTxt);
+    OUString ClipLongToolTip(const OUString& rText);
 
     SwFrameControlsManager& GetFrameControlsManager() { return m_aFrameControlsManager; }
 
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index fd4691a66453..44595cb91444 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -32,11 +32,11 @@
 
 #include "envimg.hxx"
 
-#define GetFldVal(rField)         (rField).Denormalize((rField).GetValue(FUNIT_TWIP))
-#define SetFldVal(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP)
+#define GetFieldVal(rField)         (rField).Denormalize((rField).GetValue(FUNIT_TWIP))
+#define SetFieldVal(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP)
 
 class SwEnvPage;
-class SwEnvFmtPage;
+class SwEnvFormatPage;
 class SwWrtShell;
 class Printer;
 
@@ -56,7 +56,7 @@ protected:
 class SwEnvDlg : public SfxTabDialog
 {
 friend class SwEnvPage;
-friend class SwEnvFmtPage;
+friend class SwEnvFormatPage;
 friend class SwEnvPrtPage;
 friend class SwEnvPreview;
 
diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx
index 626dc917c8fa..21334df3c20a 100644
--- a/sw/source/uibase/inc/fldedt.hxx
+++ b/sw/source/uibase/inc/fldedt.hxx
@@ -23,9 +23,9 @@
 
 class SwView;
 class SwWrtShell;
-class SwFldMgr;
+class SwFieldMgr;
 
-class SwFldEditDlg : public SfxSingleTabDialog
+class SwFieldEditDlg : public SfxSingleTabDialog
 {
     SwWrtShell* pSh;
     VclPtr<PushButton> m_pPrevBT;
@@ -38,11 +38,11 @@ class SwFldEditDlg : public SfxSingleTabDialog
     void            Init();
     VclPtr<SfxTabPage> CreatePage(sal_uInt16 nGroup);
 
-    void EnsureSelection(SwField *pCurFld, SwFldMgr &rMgr);
+    void EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr);
 public:
 
-    SwFldEditDlg(SwView& rVw);
-    virtual ~SwFldEditDlg();
+    SwFieldEditDlg(SwView& rVw);
+    virtual ~SwFieldEditDlg();
     virtual void dispose() SAL_OVERRIDE;
 
     DECL_LINK(OKHdl, void *);
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 3fc3a3c85975..39ff1783c7e8 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -45,7 +45,7 @@ class SvNumberFormatter;
 namespace vcl { class Window; }
 
 // the groups of fields
-enum SwFldGroups
+enum SwFieldGroups
 {
     GRP_DOC,
     GRP_FKT,
@@ -55,7 +55,7 @@ enum SwFldGroups
     GRP_VAR
 };
 
-struct SwFldGroupRgn
+struct SwFieldGroupRgn
 {
     sal_uInt16 nStart;
     sal_uInt16 nEnd;
@@ -63,7 +63,7 @@ struct SwFldGroupRgn
 
 // the field manager handles the insertation of fields
 // with command strings
-struct SwInsertFld_Data
+struct SwInsertField_Data
 {
     sal_uInt16 m_nTypeId;
     sal_uInt16 m_nSubType;
@@ -76,30 +76,30 @@ struct SwInsertFld_Data
     ::com::sun::star::uno::Any m_aDBDataSource;
     ::com::sun::star::uno::Any m_aDBConnection;
     ::com::sun::star::uno::Any m_aDBColumn;
-    VclPtr<vcl::Window> m_pParent; // parent dialog used for SwWrtShell::StartInputFldDlg()
+    VclPtr<vcl::Window> m_pParent; // parent dialog used for SwWrtShell::StartInputFieldDlg()
 
-    SwInsertFld_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2,
-                    sal_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) :
+    SwInsertField_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2,
+                    sal_uLong nFormatId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) :
         m_nTypeId(nType),
         m_nSubType(nSub),
         m_sPar1(rPar1),
         m_sPar2(rPar2),
-        m_nFormatId(nFmtId),
+        m_nFormatId(nFormatId),
         m_pSh(pShell),
         m_cSeparator(cSep),
         m_bIsAutomaticLanguage(bIsAutoLanguage),
         m_pParent(0) {}
 
-    SwInsertFld_Data() :
+    SwInsertField_Data() :
         m_pSh(0),
         m_cSeparator(' '),
         m_bIsAutomaticLanguage(true){}
 };
 
-class SW_DLLPUBLIC SwFldMgr
+class SW_DLLPUBLIC SwFieldMgr
 {
 private:
-    SwField*            pCurFld;
+    SwField*            pCurField;
     SbModule*           pModule;
     const SvxMacroItem* pMacroItem;
     SwWrtShell*         pWrtShell; // can be ZERO too!
@@ -110,7 +110,7 @@ private:
     OUString          sMacroPath;
     OUString          sMacroName;
 
-    sal_uLong           nCurFmt;
+    sal_uLong           nCurFormat;
     bool            bEvalExp;
 
     SAL_DLLPRIVATE sal_uInt16            GetCurrLanguage() const;
@@ -120,29 +120,29 @@ private:
     SAL_DLLPRIVATE com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> GetNumberingInfo()const;
 
 public:
-    SwFldMgr(SwWrtShell* pSh = 0);
-    ~SwFldMgr();
+    SwFieldMgr(SwWrtShell* pSh = 0);
+    ~SwFieldMgr();
 
     void                SetWrtShell( SwWrtShell* pShell )
                         {   pWrtShell = pShell;     }
 
      // insert field using TypeID (TYP_ ...)
-    bool InsertFld( const SwInsertFld_Data& rData );
+    bool InsertField( const SwInsertField_Data& rData );
 
     // change the current field directly
-    void            UpdateCurFld(sal_uLong nFormat,
+    void            UpdateCurField(sal_uLong nFormat,
                                  const OUString& rPar1,
                                  const OUString& rPar2,
                                  SwField * _pField = 0); // #111840#
 
-    OUString        GetCurFldPar1() const { return aCurPar1; }
-    OUString        GetCurFldPar2() const { return aCurPar2; }
-    inline sal_uLong   GetCurFldFmt() const;
+    OUString        GetCurFieldPar1() const { return aCurPar1; }
+    OUString        GetCurFieldPar2() const { return aCurPar2; }
+    inline sal_uLong   GetCurFieldFormat() const;
 
     // determine a field
-    SwField*        GetCurFld();
+    SwField*        GetCurField();
 
-    void            InsertFldType(SwFieldType& rType);
+    void            InsertFieldType(SwFieldType& rType);
 
     bool            ChooseMacro(const OUString &rSelMacro = OUString());
     void            SetMacroPath(const OUString& rPath);
@@ -157,22 +157,22 @@ public:
 
     // query values from database fields (BASIC )
 //  String          GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh);
-    bool            IsDBNumeric(const OUString& rDBName, const OUString& rTblQryName,
-                                    bool bIsTable, const OUString& rFldName);
+    bool            IsDBNumeric(const OUString& rDBName, const OUString& rTableQryName,
+                                    bool bIsTable, const OUString& rFieldName);
 
     // organise RefMark with names
     bool            CanInsertRefMark( const OUString& rStr );
 
     // access to field types via ResId
-    sal_uInt16          GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX) const;
-    SwFieldType*    GetFldType(sal_uInt16 nResId, sal_uInt16 nId = 0) const;
-    SwFieldType*    GetFldType(sal_uInt16 nResId, const OUString& rName) const;
+    sal_uInt16          GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX) const;
+    SwFieldType*    GetFieldType(sal_uInt16 nResId, sal_uInt16 nId = 0) const;
+    SwFieldType*    GetFieldType(sal_uInt16 nResId, const OUString& rName) const;
 
-    void            RemoveFldType(sal_uInt16 nResId, const OUString& rName);
+    void            RemoveFieldType(sal_uInt16 nResId, const OUString& rName);
 
     // access via TypeId from the dialog
     // Ids for a range of fields
-    static const SwFldGroupRgn& GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId);
+    static const SwFieldGroupRgn& GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId);
     static sal_uInt16           GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType = 0);
 
     // the current field's TypeId
@@ -198,15 +198,15 @@ public:
     // turn off evaluation of expression fields for insertation
     // of many expressino fields (see labels)
 
-    inline void     SetEvalExpFlds(bool bEval);
-    void            EvalExpFlds(SwWrtShell* pSh = NULL);
+    inline void     SetEvalExpFields(bool bEval);
+    void            EvalExpFields(SwWrtShell* pSh = NULL);
 };
 
-inline void SwFldMgr::SetEvalExpFlds(bool bEval)
+inline void SwFieldMgr::SetEvalExpFields(bool bEval)
     { bEvalExp = bEval; }
 
-inline sal_uLong SwFldMgr::GetCurFldFmt() const
-    { return nCurFmt; }
+inline sal_uLong SwFieldMgr::GetCurFieldFormat() const
+    { return nCurFormat; }
 
 #endif
 
diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx
index 71883a0f7119..cab774e12dd0 100644
--- a/sw/source/uibase/inc/fldtdlg.hxx
+++ b/sw/source/uibase/inc/fldtdlg.hxx
@@ -25,7 +25,7 @@ class SfxTabPage;
 class SwChildWinWrapper;
 struct SfxChildWinInfo;
 
-class SwFldDlg: public SfxTabDialog
+class SwFieldDlg: public SfxTabDialog
 {
     SwChildWinWrapper*  m_pChildWin;
     SfxBindings*        m_pBindings;
@@ -47,8 +47,8 @@ class SwFldDlg: public SfxTabDialog
                                        bool bOnlyActivate = false );
 
 public:
-    SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent);
-    virtual ~SwFldDlg();
+    SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent);
+    virtual ~SwFieldDlg();
 
     DECL_LINK(OKHdl, void *);
     DECL_LINK(CancelHdl, void *);
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index db4cdee3a440..89b70f36c54d 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.hxx
@@ -20,30 +20,30 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
 
 #include "chldwrap.hxx"
-class AbstractSwFldDlg;
+class AbstractSwFieldDlg;
 
-class SwFldDlgWrapper : public SwChildWinWrapper
+class SwFieldDlgWrapper : public SwChildWinWrapper
 {
 public:
-    AbstractSwFldDlg * pDlgInterface;
-    SwFldDlgWrapper( vcl::Window* pParent, sal_uInt16 nId,
+    AbstractSwFieldDlg * pDlgInterface;
+    SwFieldDlgWrapper( vcl::Window* pParent, sal_uInt16 nId,
                         SfxBindings* pBindings, SfxChildWinInfo* pInfo );
 
-    SFX_DECL_CHILDWINDOW_WITHID(SwFldDlgWrapper);
+    SFX_DECL_CHILDWINDOW_WITHID(SwFieldDlgWrapper);
 
     virtual bool    ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE;
     void ShowReferencePage();
 };
 
 // field dialog only showing database page to support mail merge
-class SwFldDataOnlyDlgWrapper : public SwChildWinWrapper
+class SwFieldDataOnlyDlgWrapper : public SwChildWinWrapper
 {
 public:
-    AbstractSwFldDlg * pDlgInterface;
-    SwFldDataOnlyDlgWrapper( vcl::Window* pParent, sal_uInt16 nId,
+    AbstractSwFieldDlg * pDlgInterface;
+    SwFieldDataOnlyDlgWrapper( vcl::Window* pParent, sal_uInt16 nId,
                         SfxBindings* pBindings, SfxChildWinInfo* pInfo );
 
-    SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper);
+    SFX_DECL_CHILDWINDOW(SwFieldDataOnlyDlgWrapper);
 
     virtual bool    ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE;
 };
diff --git a/sw/source/uibase/inc/formatclipboard.hxx b/sw/source/uibase/inc/formatclipboard.hxx
index 9e1d6b589e6a..a229e4519bca 100644
--- a/sw/source/uibase/inc/formatclipboard.hxx
+++ b/sw/source/uibase/inc/formatclipboard.hxx
@@ -69,7 +69,7 @@ private:
     int         m_nSelectionType;
 
     /** automatic/named character attribute set */
-    SfxItemSet* m_pItemSet_TxtAttr;
+    SfxItemSet* m_pItemSet_TextAttr;
     /** automatic/named paragraph attribute set
      * (it can be caractere attribute applyied to the paragraph) */
     SfxItemSet* m_pItemSet_ParAttr;
diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx
index 1e5a0c42d617..ab5977b9a869 100644
--- a/sw/source/uibase/inc/frmdlg.hxx
+++ b/sw/source/uibase/inc/frmdlg.hxx
@@ -54,9 +54,9 @@ public:
                 const SfxItemSet& rCoreSet,
                 bool bNewFrm  = false,
                 const OUString& sResType = OUString("FrameDialog"),
-                bool bFmt     = false,
+                bool bFormat     = false,
                 const OString& sDefPage = OString(),
-                const OUString* pFmtStr  = 0);
+                const OUString* pFormatStr  = 0);
 
     virtual ~SwFrmDlg();
 
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index 0cb84faeed57..f4b9ac13c659 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -33,7 +33,7 @@ class   SwWrtShell;
 struct  SvxSwFrameValidation;
 struct  SwPosition;
 
-class   SwFmtCol;
+class   SwFormatCol;
 
 const SwTwips   DFLT_WIDTH      = MM50 * 4;
 const SwTwips   DFLT_HEIGHT     = MM50;
@@ -100,7 +100,7 @@ public:
     void                SetULSpace( long nTop   = LONG_MAX,
                                     long nBottom= LONG_MAX );
 
-    void                SetCol( const SwFmtCol &rCol);
+    void                SetCol( const SwFormatCol &rCol);
 
     // change and query attributes
     void                UpdateAttrMgr();
@@ -115,7 +115,7 @@ public:
 
     // check and change metrics
     void                ValidateMetrics(SvxSwFrameValidation& rVal,
-                            const SwPosition* pToCharCntntPos,
+                            const SwPosition* pToCharContentPos,
                             bool bOnlyPercentRefValue = false);
 
     void                DelAttr(sal_uInt16 nId);
@@ -125,12 +125,12 @@ public:
     inline       SfxItemSet &GetAttrSet()       { return m_aSet; }
     void                     SetAttrSet(const SfxItemSet& rSet);
 
-    inline const SwFmtVertOrient &GetVertOrient() const;
-    inline const SwFmtHoriOrient &GetHoriOrient() const;
+    inline const SwFormatVertOrient &GetVertOrient() const;
+    inline const SwFormatHoriOrient &GetHoriOrient() const;
     inline const SvxShadowItem   &GetShadow() const;
     inline const SvxBoxItem      &GetBox() const;
-    inline const SwFmtSurround   &GetSurround() const;
-    inline const SwFmtFrmSize    &GetFrmSize() const;
+    inline const SwFormatSurround   &GetSurround() const;
+    inline const SwFormatFrmSize    &GetFrmSize() const;
 
     long CalcWidthBorder()  { return CalcLeftSpace()+CalcRightSpace(); }
     long CalcHeightBorder() { return CalcTopSpace()+CalcBottomSpace(); }
@@ -138,20 +138,20 @@ public:
 
 inline const Size& SwFlyFrmAttrMgr::GetSize() const
 {
-    return static_cast<const SwFmtFrmSize&>(m_aSet.Get(RES_FRM_SIZE)).GetSize();
+    return static_cast<const SwFormatFrmSize&>(m_aSet.Get(RES_FRM_SIZE)).GetSize();
 }
 
-inline const SwFmtVertOrient &SwFlyFrmAttrMgr::GetVertOrient() const
+inline const SwFormatVertOrient &SwFlyFrmAttrMgr::GetVertOrient() const
 {
-    return static_cast<const SwFmtVertOrient&>(m_aSet.Get(RES_VERT_ORIENT));
+    return static_cast<const SwFormatVertOrient&>(m_aSet.Get(RES_VERT_ORIENT));
 }
-inline const SwFmtHoriOrient &SwFlyFrmAttrMgr::GetHoriOrient() const
+inline const SwFormatHoriOrient &SwFlyFrmAttrMgr::GetHoriOrient() const
 {
-    return static_cast<const SwFmtHoriOrient &>(m_aSet.Get(RES_HORI_ORIENT));
+    return static_cast<const SwFormatHoriOrient &>(m_aSet.Get(RES_HORI_ORIENT));
 }
-inline const SwFmtFrmSize& SwFlyFrmAttrMgr::GetFrmSize() const
+inline const SwFormatFrmSize& SwFlyFrmAttrMgr::GetFrmSize() const
 {
-    return static_cast<const SwFmtFrmSize&>(m_aSet.Get(RES_FRM_SIZE));
+    return static_cast<const SwFormatFrmSize&>(m_aSet.Get(RES_FRM_SIZE));
 }
 inline const SvxShadowItem &SwFlyFrmAttrMgr::GetShadow() const
 {
@@ -161,9 +161,9 @@ inline const SvxBoxItem &SwFlyFrmAttrMgr::GetBox() const
 {
     return static_cast<const SvxBoxItem&>(m_aSet.Get(RES_BOX));
 }
-inline const SwFmtSurround &SwFlyFrmAttrMgr::GetSurround() const
+inline const SwFormatSurround &SwFlyFrmAttrMgr::GetSurround() const
 {
-    return static_cast<const SwFmtSurround&>(m_aSet.Get(RES_SURROUND));
+    return static_cast<const SwFormatSurround&>(m_aSet.Get(RES_SURROUND));
 }
 
 inline Point SwFlyFrmAttrMgr::GetPos() const
@@ -173,7 +173,7 @@ inline Point SwFlyFrmAttrMgr::GetPos() const
 
 inline RndStdIds SwFlyFrmAttrMgr::GetAnchor()  const
 {
-    return static_cast<const SwFmtAnchor&>(m_aSet.Get(RES_ANCHOR)).GetAnchorId();
+    return static_cast<const SwFormatAnchor&>(m_aSet.Get(RES_ANCHOR)).GetAnchorId();
 }
 
 inline sal_uInt16 SwFlyFrmAttrMgr::GetHeightPercent() const
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 095966548883..b603d5b70430 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -112,7 +112,7 @@ class SwFrmPage: public SfxTabPage
 
     // OD 12.11.2003 #i22341# - keep content position of character for
     // to character anchored objects.
-    const SwPosition* mpToCharCntntPos;
+    const SwPosition* mpToCharContentPos;
 
     // old alignment
     sal_Int16 nOldH;
@@ -193,7 +193,7 @@ public:
     virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE;
 
     void            SetNewFrame(bool bNewFrame) { bNew      = bNewFrame; }
-    void            SetFormatUsed(bool bFmt);
+    void            SetFormatUsed(bool bFormat);
     void            SetFrmType(const OUString &rType) { sDlgType  = rType; }
     inline bool     IsInGraficMode() { return sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"; }
     void            EnableVerticalPositioning( bool bEnable );
@@ -318,7 +318,7 @@ public:
     virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE;
 
-    void            SetFormatUsed(bool bFmt);
+    void            SetFormatUsed(bool bFormat);
     void            SetFrmType(const OUString &rType) { sDlgType = rType; }
     void            SetNewFrame(bool bNewFrame) { bNew  = bNewFrame; }
     void            SetShell(SwWrtShell* pSh) { pWrtSh  = pSh; }
diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx
index 260423a01ba4..2be62a3e1a8e 100644
--- a/sw/source/uibase/inc/inpdlg.hxx
+++ b/sw/source/uibase/inc/inpdlg.hxx
@@ -32,14 +32,14 @@ class SwField;
 class SwWrtShell;
 
 // insert fields
-class SwFldInputDlg: public SvxStandardDialog
+class SwFieldInputDlg: public SvxStandardDialog
 {
     virtual void    Apply() SAL_OVERRIDE;
     virtual void    StateChanged( StateChangedType ) SAL_OVERRIDE;
 
     SwWrtShell&       rSh;
-    SwInputField*     pInpFld;
-    SwSetExpField*    pSetFld;
+    SwInputField*     pInpField;
+    SwSetExpField*    pSetField;
     SwUserFieldType*  pUsrType;
 
     VclPtr<Edit>             m_pLabelED;
@@ -51,9 +51,9 @@ class SwFldInputDlg: public SvxStandardDialog
 
     DECL_LINK(NextHdl, void *);
 public:
-    SwFldInputDlg(  vcl::Window *pParent, SwWrtShell &rSh,
+    SwFieldInputDlg(  vcl::Window *pParent, SwWrtShell &rSh,
                     SwField* pField, bool bNextButton = false );
-    virtual ~SwFldInputDlg();
+    virtual ~SwFieldInputDlg();
     virtual void dispose() SAL_OVERRIDE;
 };
 
diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index 6a1edfc684c4..3d5dba6ed3e1 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.hxx
@@ -25,7 +25,7 @@
 
 #include <sfx2/childwin.hxx>
 
-class SwFldMgr;
+class SwFieldMgr;
 class SwWrtShell;
 class SwView;
 class SfxDispatcher;
@@ -37,7 +37,7 @@ public:
                         Edit(pParent , nStyle){}
 
     void            UpdateRange(const OUString& aSel,
-                                const OUString& aTblName );
+                                const OUString& aTableName );
 
 protected:
     virtual void    KeyInput( const KeyEvent&  ) SAL_OVERRIDE;
@@ -50,11 +50,11 @@ friend class InputEdit;
     VclPtr<Edit>        aPos;
     VclPtr<InputEdit>   aEdit;
     PopupMenu       aPopMenu;
-    SwFldMgr*       pMgr;
+    SwFieldMgr*       pMgr;
     SwWrtShell*     pWrtShell;
     SwView*         pView;
     SfxBindings*    pBindings;
-    OUString        aAktTableName, sOldFml;
+    OUString        aAktTableName, sOldFormula;
 
     bool        bFirst : 1;  // initialisations at first call
     bool        bActive : 1; // for hide/show when switching documents
@@ -66,7 +66,7 @@ friend class InputEdit;
 
     void CleanupUglyHackWithUndo();
 
-    void DelBoxCntnt();
+    void DelBoxContent();
     DECL_LINK( ModifyHdl, void* );
 
     using Window::IsActive;
@@ -92,7 +92,7 @@ public:
 
     bool            IsActive(){ return bActive; };
 
-    DECL_LINK( SelTblCellsNotify, SwWrtShell * );
+    DECL_LINK( SelTableCellsNotify, SwWrtShell * );
 
     void            SetFormula( const OUString& rFormula, bool bDelSel = true );
     const SwView*   GetView() const{return pView;}
diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx
index 8fee498f4022..b49a2477319d 100644
--- a/sw/source/uibase/inc/insfnote.hxx
+++ b/sw/source/uibase/inc/insfnote.hxx
@@ -47,7 +47,7 @@ class SwInsFootNoteDlg: public SvxStandardDialog
     VclPtr<PushButton>     m_pNumberExtChar;
 
     // everything for the selection footnote/endnote
-    VclPtr<RadioButton>    m_pFtnBtn;
+    VclPtr<RadioButton>    m_pFootnoteBtn;
     VclPtr<RadioButton>    m_pEndNoteBtn;
 
     VclPtr<PushButton>     m_pOkBtn;
diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx
index 1e1178306d4c..c52db239c9c7 100644
--- a/sw/source/uibase/inc/instable.hxx
+++ b/sw/source/uibase/inc/instable.hxx
@@ -28,7 +28,7 @@
 #include <actctrl.hxx>
 
 class SwWrtShell;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
 class SwView;
 struct SwInsertTableOptions;
 
@@ -49,15 +49,15 @@ class SwInsTableDlg : public SfxModalDialog
     VclPtr<CheckBox>       m_pBorderCB;
 
     VclPtr<PushButton>     m_pInsertBtn;
-    VclPtr<PushButton>     m_pAutoFmtBtn;
+    VclPtr<PushButton>     m_pAutoFormatBtn;
 
     SwWrtShell*     pShell;
-    SwTableAutoFmt* pTAutoFmt;
+    SwTableAutoFormat* pTAutoFormat;
     sal_Int64       nEnteredValRepeatHeaderNF;
 
     DECL_LINK( ModifyName, Edit * );
     DECL_LINK( ModifyRowCol, NumericField * );
-    DECL_LINK( AutoFmtHdl, PushButton* );
+    DECL_LINK( AutoFormatHdl, PushButton* );
     DECL_LINK(OKHdl, void*);
     DECL_LINK(CheckBoxHdl, void * = 0);
     DECL_LINK( ReapeatHeaderCheckBoxHdl, void* p = 0 );
@@ -69,8 +69,8 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
     void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                    SwInsertTableOptions& rInsTblOpts, OUString& rTableAutoFmtName,
-                    SwTableAutoFmt *& prTAFmt );
+                    SwInsertTableOptions& rInsTableOpts, OUString& rTableAutoFormatName,
+                    SwTableAutoFormat *& prTAFormat );
 };
 
 #endif
diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx
index 13b5295dc973..071faaf87f5a 100644
--- a/sw/source/uibase/inc/javaedit.hxx
+++ b/sw/source/uibase/inc/javaedit.hxx
@@ -25,7 +25,7 @@
 #include <vcl/button.hxx>
 
 class SwWrtShell;
-class SwFldMgr;
+class SwFieldMgr;
 class SwScriptField;
 
 namespace sfx2 { class FileDialogHelper; }
@@ -50,8 +50,8 @@ private:
     bool                bNew;
     bool                bIsUrl;
 
-    SwScriptField*          pFld;
-    SwFldMgr*               pMgr;
+    SwScriptField*          pField;
+    SwFieldMgr*               pMgr;
     SwWrtShell*             pSh;
     sfx2::FileDialogHelper* pFileDlg;
     VclPtr<vcl::Window>     pOldDefDlgParent;
@@ -66,7 +66,7 @@ private:
     virtual void    Apply() SAL_OVERRIDE;
 
     void            CheckTravel();
-    void            SetFld();
+    void            SetField();
 
 public:
     SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh);
diff --git a/sw/source/uibase/inc/macassgn.hxx b/sw/source/uibase/inc/macassgn.hxx
index df51ea5a046c..1bb1800c295d 100644
--- a/sw/source/uibase/inc/macassgn.hxx
+++ b/sw/source/uibase/inc/macassgn.hxx
@@ -38,7 +38,7 @@ class SwMacroAssignDlg
 {
 public:
     static SfxEventNamesItem AddEvents( DlgEventType eType );
-    static bool INetFmtDlg( vcl::Window* pParent, SwWrtShell& rSh,
+    static bool INetFormatDlg( vcl::Window* pParent, SwWrtShell& rSh,
                             SvxMacroItem*& rpINetItem );
 };
 
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index 1ae4b78829de..1ff9116abbb6 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -79,7 +79,7 @@ class SwMailMergeDlg : public SvxStandardDialog
     VclPtr<FixedText>       m_pFilterFT;
     VclPtr<ListBox>         m_pFilterLB;
 
-    VclPtr<ListBox>         m_pAddressFldLB;
+    VclPtr<ListBox>         m_pAddressFieldLB;
     VclPtr<FixedText>       m_pSubjectFT;
     VclPtr<Edit>            m_pSubjectED;
     VclPtr<FixedText>       m_pFormatFT;
@@ -117,7 +117,7 @@ class SwMailMergeDlg : public SvxStandardDialog
 public:
     SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rSh,
         const OUString& rSourceName,
-        const OUString& rTblName,
+        const OUString& rTableName,
         sal_Int32 nCommandType,
         const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0);
diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx
index 5bd7548ca358..94fe4bfa94de 100644
--- a/sw/source/uibase/inc/mergetbl.hxx
+++ b/sw/source/uibase/inc/mergetbl.hxx
@@ -24,7 +24,7 @@
 #include <vcl/fixed.hxx>
 #include <svx/stddlg.hxx>
 
-class SwMergeTblDlg : public SvxStandardDialog
+class SwMergeTableDlg : public SvxStandardDialog
 {
     VclPtr<RadioButton> m_pMergePrevRB;
 
@@ -33,8 +33,8 @@ protected:
     virtual void Apply() SAL_OVERRIDE;
 
 public:
-    SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev );
-    virtual ~SwMergeTblDlg();
+    SwMergeTableDlg( vcl::Window *pParent, bool& rWithPrev );
+    virtual ~SwMergeTableDlg();
     virtual void dispose() SAL_OVERRIDE;
 };
 
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index 8d285bea9a86..6a59a57cfefc 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox
     DECL_DLLPRIVATE_LINK( SelectHdl, ListBox * );
 
     SAL_DLLPRIVATE double          GetDefValue(const short nFormatType) const;
-    SAL_DLLPRIVATE void            Init(short nFormatType, bool bUsrFmts);
+    SAL_DLLPRIVATE void            Init(short nFormatType, bool bUsrFormats);
     SAL_DLLPRIVATE SwView*           GetView();
 
 public:
@@ -56,7 +56,7 @@ public:
 
     void            SetFormatType(const short nFormatType);
     inline short    GetFormatType() const { return nCurrFormatType; }
-    void            SetDefFormat(const sal_uLong nDefFmt);
+    void            SetDefFormat(const sal_uLong nDefFormat);
     sal_uLong           GetFormat() const;
 
     inline LanguageType GetCurLanguage() const { return eCurLanguage;}
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 6a0f8987b07f..5ac39f582816 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -32,7 +32,7 @@
 #include <swlbox.hxx>
 #include <caption.hxx>
 
-class SwFldMgr;
+class SwFieldMgr;
 class SvTreeListEntry;
 class SwWrtShell;
 
@@ -150,7 +150,7 @@ private:
 
     OUString m_sNone;
 
-    SwFldMgr* pMgr;
+    SwFieldMgr* pMgr;
     bool bHTMLMode;
 
     DECL_LINK(SelectHdl, void *);
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 8797615dd99d..eb8278469e8d 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -54,9 +54,9 @@ class SwContentOptPage : public SfxTabPage
     VclPtr<CheckBox>   m_pSmoothCBox;
 
     VclPtr<CheckBox>   m_pGrfCB;
-    VclPtr<CheckBox>   m_pTblCB;
+    VclPtr<CheckBox>   m_pTableCB;
     VclPtr<CheckBox>   m_pDrwCB;
-    VclPtr<CheckBox>   m_pFldNameCB;
+    VclPtr<CheckBox>   m_pFieldNameCB;
     VclPtr<CheckBox>   m_pPostItCB;
 
     VclPtr<VclFrame>   m_pSettingsFrame;
@@ -82,7 +82,7 @@ public:
 class SwAddPrinterTabPage : public SfxTabPage
 {
     VclPtr<CheckBox>       m_pGrfCB;
-    VclPtr<CheckBox>       m_pCtrlFldCB;
+    VclPtr<CheckBox>       m_pCtrlFieldCB;
     VclPtr<CheckBox>       m_pBackgroundCB;
     VclPtr<CheckBox>       m_pBlackFontCB;
     VclPtr<CheckBox>       m_pPrintHiddenTextCB;
@@ -209,7 +209,7 @@ class SwTableOptionsTabPage : public SfxTabPage
     VclPtr<CheckBox>    pBorderCB;
 
     VclPtr<CheckBox>    pNumFormattingCB;
-    VclPtr<CheckBox>    pNumFmtFormattingCB;
+    VclPtr<CheckBox>    pNumFormatFormattingCB;
     VclPtr<CheckBox>    pNumAlignmentCB;
 
     VclPtr<MetricField> pRowMoveMF;
@@ -253,8 +253,8 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage
     VclPtr<CheckBox> m_pTabCB;
     VclPtr<CheckBox> m_pBreakCB;
     VclPtr<CheckBox> m_pCharHiddenCB;
-    VclPtr<CheckBox> m_pFldHiddenCB;
-    VclPtr<CheckBox> m_pFldHiddenParaCB;
+    VclPtr<CheckBox> m_pFieldHiddenCB;
+    VclPtr<CheckBox> m_pFieldHiddenParaCB;
 
     VclPtr<VclFrame> m_pDirectCursorFrame;
     VclPtr<CheckBox> m_pOnOffCB;
@@ -299,7 +299,7 @@ class SwMarkPreview : public vcl::Window
     Color m_aMarkCol;  // marks
     Color m_aLineCol;  // general lines
     Color m_aShadowCol; // shadow
-    Color m_aTxtCol;    // text
+    Color m_aTextCol;    // text
     Color m_aPrintAreaCol; // frame for print area
 
     Rectangle aPage;
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index d4ae3c69821e..78f96c8c0dbb 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -74,7 +74,7 @@ public:
     virtual void        dispose() SAL_OVERRIDE;
 
     SwNumRule*          GetNumRule() {return pNumRule;}
-    sal_uInt16          GetLevel(const OUString &rFmtName) const;
+    sal_uInt16          GetLevel(const OUString &rFormatName) const;
     OUString*           GetCollNames() {return aCollNames;}
 
     static sal_uInt16   GetActNumLevel() {return nNumLevel;}
@@ -87,7 +87,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
 
     VclPtr<ListBox>        m_pCollBox;
     VclPtr<SwNumberingTypeListBox> m_pNumberBox;
-    VclPtr<ListBox>        m_pCharFmtLB;
+    VclPtr<ListBox>        m_pCharFormatLB;
     VclPtr<FixedText>      m_pAllLevelFT;
     VclPtr<NumericField>   m_pAllLevelNF;
     VclPtr<Edit>           m_pPrefixED;
@@ -95,7 +95,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
     VclPtr<NumericField>   m_pStartEdit;
     VclPtr<NumberingPreview> m_pPreviewWIN;
 
-    OUString            aNoFmtName;
+    OUString            aNoFormatName;
     OUString            aSaveCollNames[MAXLEVEL];
     SwWrtShell*         pSh;
     SwNumRule*          pNumRule;
@@ -109,7 +109,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
     DECL_LINK( NumberSelect, SwNumberingTypeListBox * );
     DECL_LINK(DelimModify, void *);
     DECL_LINK( StartModified, NumericField * );
-    DECL_LINK(CharFmtHdl, void *);
+    DECL_LINK(CharFormatHdl, void *);
 
     void    Update();
 
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 68fa0fd99ba4..a0932306237a 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -79,7 +79,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     OUString                sDeleted;
     OUString                sFormated;
     OUString                sTableChgd;
-    OUString                sFmtCollSet;
+    OUString                sFormatCollSet;
     OUString                sFilterAction;
     OUString                sAutoFormat;
     VclPtr<SvxTPView>       pTPView;
@@ -88,7 +88,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     Link<>                  aOldDeselectHdl;
     bool                    bOnlyFormatedRedlines;
     bool                    bHasReadonlySel;
-    bool                    bRedlnAutoFmt;
+    bool                    bRedlnAutoFormat;
 
     // prevent update dialog data during longer operations (cf #102657#)
     bool                    bInhibitActivate;
@@ -105,7 +105,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     DECL_DLLPRIVATE_LINK( CommandHdl,        void* );
 
     SAL_DLLPRIVATE sal_uInt16            CalcDiff(sal_uInt16 nStart, bool bChild);
-    SAL_DLLPRIVATE void          InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFmt);
+    SAL_DLLPRIVATE void          InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFormat);
     SAL_DLLPRIVATE void          InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd = USHRT_MAX);
     SAL_DLLPRIVATE void          RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd);
     SAL_DLLPRIVATE void          InitAuthors();
@@ -116,13 +116,13 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     SAL_DLLPRIVATE sal_uInt16    GetRedlinePos( const SvTreeListEntry& rEntry) const;
 
 public:
-    SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFmt = false);
+    SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFormat = false);
     virtual ~SwRedlineAcceptDlg();
 
     DECL_LINK( FilterChangedHdl, void *pDummy = 0 );
 
     inline SvxAcceptChgCtr& GetChgCtrl()        { return *aTabPagesCTRL.get(); }
-    inline bool     HasRedlineAutoFmt() const   { return bRedlnAutoFmt; }
+    inline bool     HasRedlineAutoFormat() const   { return bRedlnAutoFormat; }
 
     void            Init(sal_uInt16 nStart = 0);
     void            CallAcceptReject( bool bSelect, bool bAccept );
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index b0ea63315807..08fc1c6e9c8f 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -102,8 +102,8 @@ class SwEditRegionDlg : public SfxModalDialog
 
     Image  BuildBitmap(bool bProtect, bool bHidden);
 
-    void    RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry);
-    size_t  FindArrPos(const SwSectionFmt* pFmt);
+    void    RecurseList( const SwSectionFormat* pFormat, SvTreeListEntry* pEntry);
+    size_t  FindArrPos(const SwSectionFormat* pFormat);
 
     DECL_LINK( GetFirstEntryHdl, SvTreeListBox * );
     DECL_LINK( DeselectHdl, SvTreeListBox * );
@@ -196,28 +196,28 @@ public:
                                 const SfxItemSet* rAttrSet);
 };
 
-class SwSectionFtnEndTabPage : public SfxTabPage
+class SwSectionFootnoteEndTabPage : public SfxTabPage
 {
-    VclPtr<CheckBox>        pFtnNtAtTextEndCB;
+    VclPtr<CheckBox>        pFootnoteNtAtTextEndCB;
 
-    VclPtr<CheckBox>        pFtnNtNumCB;
-    VclPtr<FixedText>       pFtnOffsetLbl;
-    VclPtr<NumericField>    pFtnOffsetFld;
+    VclPtr<CheckBox>        pFootnoteNtNumCB;
+    VclPtr<FixedText>       pFootnoteOffsetLbl;
+    VclPtr<NumericField>    pFootnoteOffsetField;
 
-    VclPtr<CheckBox>        pFtnNtNumFmtCB;
-    VclPtr<FixedText>       pFtnPrefixFT;
-    VclPtr<Edit>            pFtnPrefixED;
-    VclPtr<SwNumberingTypeListBox> pFtnNumViewBox;
-    VclPtr<FixedText>       pFtnSuffixFT;
-    VclPtr<Edit>            pFtnSuffixED;
+    VclPtr<CheckBox>        pFootnoteNtNumFormatCB;
+    VclPtr<FixedText>       pFootnotePrefixFT;
+    VclPtr<Edit>            pFootnotePrefixED;
+    VclPtr<SwNumberingTypeListBox> pFootnoteNumViewBox;
+    VclPtr<FixedText>       pFootnoteSuffixFT;
+    VclPtr<Edit>            pFootnoteSuffixED;
 
     VclPtr<CheckBox>        pEndNtAtTextEndCB;
 
     VclPtr<CheckBox>        pEndNtNumCB;
     VclPtr<FixedText>       pEndOffsetLbl;
-    VclPtr<NumericField>    pEndOffsetFld;
+    VclPtr<NumericField>    pEndOffsetField;
 
-    VclPtr<CheckBox>        pEndNtNumFmtCB;
+    VclPtr<CheckBox>        pEndNtNumFormatCB;
     VclPtr<FixedText>       pEndPrefixFT;
     VclPtr<Edit>            pEndPrefixED;
     VclPtr<SwNumberingTypeListBox> pEndNumViewBox;
@@ -225,11 +225,11 @@ class SwSectionFtnEndTabPage : public SfxTabPage
     VclPtr<Edit>            pEndSuffixED;
 
     DECL_LINK( FootEndHdl, CheckBox * );
-    void ResetState( bool bFtn, const SwFmtFtnEndAtTxtEnd& );
+    void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& );
 
 public:
-    SwSectionFtnEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet );
-    virtual ~SwSectionFtnEndTabPage();
+    SwSectionFootnoteEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet );
+    virtual ~SwSectionFootnoteEndTabPage();
     virtual void dispose() SAL_OVERRIDE;
 
     virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx
index cc6a96d2c5f7..456108504aac 100644
--- a/sw/source/uibase/inc/splittbl.hxx
+++ b/sw/source/uibase/inc/splittbl.hxx
@@ -25,9 +25,9 @@
 
 class SwWrtShell;
 
-class SwSplitTblDlg : public SvxStandardDialog
+class SwSplitTableDlg : public SvxStandardDialog
 {
-    VclPtr<RadioButton>    mpCntntCopyRB;
+    VclPtr<RadioButton>    mpContentCopyRB;
     VclPtr<RadioButton>    mpBoxAttrCopyWithParaRB ;
     VclPtr<RadioButton>    mpBoxAttrCopyNoParaRB ;
     VclPtr<RadioButton>    mpBorderCopyRB;
@@ -39,8 +39,8 @@ protected:
     virtual void Apply() SAL_OVERRIDE;
 
 public:
-    SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh );
-    virtual ~SwSplitTblDlg();
+    SwSplitTableDlg( vcl::Window *pParent, SwWrtShell &rSh );
+    virtual ~SwSplitTableDlg();
     virtual void dispose() SAL_OVERRIDE;
 
     sal_uInt16 GetSplitMode() const { return m_nSplit; }
diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx
index 7facf548a45d..44d912562767 100644
--- a/sw/source/uibase/inc/srtdlg.hxx
+++ b/sw/source/uibase/inc/srtdlg.hxx
@@ -64,9 +64,9 @@ class SwSortDlg : public SvxStandardDialog
 
     VclPtr<CheckBox>           m_pCaseCB;
 
-    OUString aColTxt;
-    OUString aRowTxt;
-    OUString aNumericTxt;
+    OUString aColText;
+    OUString aRowText;
+    OUString aNumericText;
 
     SwWrtShell          &rSh;
     CollatorResource* pColRes;
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index 29b3df2dee15..039875b801d1 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -34,7 +34,7 @@ class SwDoc;
 class SwDocFac;
 class SwTextBlocks;
 class SwWrtShell;
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
 class SwFrameShell;
 class SwView_Impl;
 
@@ -89,9 +89,9 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
                                         SotClipboardFormatId nFormat, SotExchangeDest nDestination );
 
     static bool _PasteFileContent( TransferableDataHelper&,
-                                    SwWrtShell& rSh, SotClipboardFormatId nFmt, bool bMsg );
+                                    SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bMsg );
     static bool _PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
-                            SotClipboardFormatId nFmt, sal_uInt8 nActionFlags, bool bMsg );
+                            SotClipboardFormatId nFormat, sal_uInt8 nActionFlags, bool bMsg );
     static bool _PasteTargetURL( TransferableDataHelper& rData, SwWrtShell& rSh,
                         sal_uInt16 nAction, const Point* pPt, bool bInsertGRF );
 
@@ -103,21 +103,21 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
                                     const Point* pPt, sal_uInt8 nActionFlags, bool bNeedToSelectBeforePaste);
 
     static bool _PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
-                                SotClipboardFormatId nFmt, sal_uInt16 nAction, const Point* pPt,
+                                SotClipboardFormatId nFormat, sal_uInt16 nAction, const Point* pPt,
                                 sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste);
 
     static bool _PasteImageMap( TransferableDataHelper& rData,
                                     SwWrtShell& rSh );
 
     static bool _PasteAsHyperlink( TransferableDataHelper& rData,
-                                        SwWrtShell& rSh, SotClipboardFormatId nFmt );
+                                        SwWrtShell& rSh, SotClipboardFormatId nFormat );
 
     static bool _PasteFileName( TransferableDataHelper& rData,
-                            SwWrtShell& rSh, SotClipboardFormatId nFmt, sal_uInt16 nAction,
+                            SwWrtShell& rSh, SotClipboardFormatId nFormat, sal_uInt16 nAction,
                             const Point* pPt, sal_uInt8 nActionFlags, bool bMsg, bool * graphicInserted );
 
     static bool _PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh,
-                            SotClipboardFormatId nFmt, bool bLink, const Point* pDragPt,
+                            SotClipboardFormatId nFormat, bool bLink, const Point* pDragPt,
                             bool bMsg );
 
     static bool _PasteFileList( TransferableDataHelper& rData,
@@ -170,7 +170,7 @@ public:
     static bool Paste( SwWrtShell&, TransferableDataHelper& );
     static bool PasteData( TransferableDataHelper& rData,
                           SwWrtShell& rSh, sal_uInt16 nAction, SotClipboardFormatId nFormat,
-                          SotExchangeDest nDestination, bool bIsPasteFmt,
+                          SotExchangeDest nDestination, bool bIsPasteFormat,
                           bool bIsDefault,
                           const Point* pDDPos = 0, sal_Int8 nDropAction = 0,
                           bool bPasteSelection = false );
@@ -182,9 +182,9 @@ public:
     static bool PasteFormat( SwWrtShell& rSh, TransferableDataHelper& rData,
                              SotClipboardFormatId nFormat );
 
-    static void FillClipFmtItem( const SwWrtShell& rSh,
+    static void FillClipFormatItem( const SwWrtShell& rSh,
                                 const TransferableDataHelper& rData,
-                                SvxClipboardFmtItem & rToFill );
+                                SvxClipboardFormatItem & rToFill );
 
     // Interfaces for Drag & Drop
     void StartDrag( vcl::Window* pWin, const Point& rPos );
diff --git a/sw/source/uibase/inc/swtablerep.hxx b/sw/source/uibase/inc/swtablerep.hxx
index be8d2216dc05..b98e84037816 100644
--- a/sw/source/uibase/inc/swtablerep.hxx
+++ b/sw/source/uibase/inc/swtablerep.hxx
@@ -29,7 +29,7 @@ class SW_DLLPUBLIC SwTableRep
 {
     TColumn*    pTColumns;
 
-    SwTwips     nTblWidth;
+    SwTwips     nTableWidth;
     SwTwips     nSpace;
     SwTwips     nLeftSpace;
     SwTwips     nRightSpace;
@@ -53,8 +53,8 @@ public:
     SwTwips     GetRightSpace() const           {return nRightSpace;}
     void        SetRightSpace(SwTwips nSet)     {nRightSpace = nSet;}
 
-    SwTwips     GetWidth() const                {return nTblWidth;}
-    void        SetWidth(SwTwips nSet)          {nTblWidth = nSet;}
+    SwTwips     GetWidth() const                {return nTableWidth;}
+    void        SetWidth(SwTwips nSet)          {nTableWidth = nSet;}
 
     sal_uInt16      GetWidthPercent() const         {return nWidthPercent;}
     void        SetWidthPercent(sal_uInt16 nSet)    {nWidthPercent = nSet;}
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index fadb5655c59c..6934ec058952 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -22,7 +22,7 @@
 #include <tools/resary.hxx>
 
 class SwWrtShell;
-class SwFmt;
+class SwFormat;
 
 class SwCondCollPage : public SfxTabPage
 {
@@ -43,7 +43,7 @@ class SwCondCollPage : public SfxTabPage
 
     SwWrtShell          &m_rSh;
     const CommandStruct*m_pCmds;
-    SwFmt*              m_pFmt;
+    SwFormat*              m_pFormat;
 
     bool                m_bNewTemplate;
 
@@ -70,7 +70,7 @@ public:
     virtual bool FillItemSet(      SfxItemSet *rSet) SAL_OVERRIDE;
     virtual void Reset      (const SfxItemSet *rSet) SAL_OVERRIDE;
 
-    void SetCollection( SwFmt* pFormat, bool bNew );
+    void SetCollection( SwFormat* pFormat, bool bNew );
 };
 
 #endif
diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx
index 2276631dc818..6be1fbe54d29 100644
--- a/sw/source/uibase/inc/tablemgr.hxx
+++ b/sw/source/uibase/inc/tablemgr.hxx
@@ -23,10 +23,10 @@
 #include "swtypes.hxx"
 #include "tabcol.hxx"
 
-class SwFrmFmt;
+class SwFrameFormat;
 class SwWrtShell;
 namespace vcl { class Window; }
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
 
 namespace com { namespace sun { namespace star {
     namespace frame {
@@ -41,7 +41,7 @@ const char cParaDelim = 0x0a;
 
 class SW_DLLPUBLIC SwTableFUNC
 {
-    SwFrmFmt    *pFmt;
+    SwFrameFormat    *pFormat;
     SwWrtShell  *pSh;
     bool        bCopy;
     SwTabCols   aCols;
@@ -50,8 +50,8 @@ private:
     SAL_DLLPRIVATE int GetRightSeparator(int nNum) const;
 
 public:
-    inline SwTableFUNC(SwFrmFmt &);
-           SwTableFUNC(SwWrtShell *pShell, bool bCopyFmt = false);
+    inline SwTableFUNC(SwFrameFormat &);
+           SwTableFUNC(SwWrtShell *pShell, bool bCopyFormat = false);
            ~SwTableFUNC();
 
     void    InitTabCols();
@@ -62,9 +62,9 @@ public:
     sal_uInt16  GetColCount() const;
     sal_uInt16  GetCurColNum() const;
 
-    bool IsTableSelected() const { return pFmt != 0; }
+    bool IsTableSelected() const { return pFormat != 0; }
 
-    const SwFrmFmt *GetTableFmt() const { return pFmt; }
+    const SwFrameFormat *GetTableFormat() const { return pFormat; }
 
     SwWrtShell* GetShell() const { return pSh; }
 
@@ -73,11 +73,11 @@ public:
 
     /// @return the XModel of the newly inserted chart if successful
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
-        InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 );
+        InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = 0 );
 };
 
-inline SwTableFUNC::SwTableFUNC(SwFrmFmt &rFmt) :
-    pFmt(&rFmt),
+inline SwTableFUNC::SwTableFUNC(SwFrameFormat &rFormat) :
+    pFormat(&rFormat),
     pSh(0),
     bCopy(false)
 {
diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx
index fac2b1224840..72e62c2fe631 100644
--- a/sw/source/uibase/inc/tautofmt.hxx
+++ b/sw/source/uibase/inc/tautofmt.hxx
@@ -30,12 +30,12 @@
 
 #include <vcl/virdev.hxx>
 
-class SwTableAutoFmt;
-class AutoFmtPreview;
-class SwTableAutoFmtTbl;
+class SwTableAutoFormat;
+class AutoFormatPreview;
+class SwTableAutoFormatTable;
 class SwWrtShell;
 
-enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE };
+enum AutoFormatLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE };
 
 class SwAutoFormatDlg : public SfxModalDialog
 {
@@ -57,34 +57,34 @@ class SwAutoFormatDlg : public SfxModalDialog
     OUString        aStrDelTitle;
     OUString        aStrDelMsg;
     OUString        aStrRenameTitle;
-    OUString        aStrInvalidFmt;
-    VclPtr<AutoFmtPreview> m_pWndPreview;
+    OUString        aStrInvalidFormat;
+    VclPtr<AutoFormatPreview> m_pWndPreview;
 
     SwWrtShell*             pShell;
-    SwTableAutoFmtTbl*      pTableTbl;
+    SwTableAutoFormatTable*      pTableTable;
     sal_uInt8                   nIndex;
     sal_uInt8                   nDfltStylePos;
     bool                    bCoreDataChanged : 1;
-    bool                    bSetAutoFmt : 1;
+    bool                    bSetAutoFormat : 1;
 
-    void Init( const SwTableAutoFmt* pSelFmt );
-    void UpdateChecks( const SwTableAutoFmt&, bool bEnableBtn );
+    void Init( const SwTableAutoFormat* pSelFormat );
+    void UpdateChecks( const SwTableAutoFormat&, bool bEnableBtn );
 
     DECL_LINK( CheckHdl, Button * );
     DECL_LINK(OkHdl, void *);
     DECL_LINK( AddHdl, void * );
     DECL_LINK( RemoveHdl, void * );
     DECL_LINK( RenameHdl, void * );
-    DECL_LINK( SelFmtHdl, void * );
+    DECL_LINK( SelFormatHdl, void * );
 
 public:
     SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell,
-                        bool bSetAutoFmt = true,
-                        const SwTableAutoFmt* pSelFmt = 0 );
+                        bool bSetAutoFormat = true,
+                        const SwTableAutoFormat* pSelFormat = 0 );
     virtual ~SwAutoFormatDlg();
     virtual void dispose() SAL_OVERRIDE;
 
-    void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const;
+    void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const;
 };
 
 #endif // SW_AUTOFMT_HXX
diff --git a/sw/source/uibase/inc/tblnumfm.hxx b/sw/source/uibase/inc/tblnumfm.hxx
index 713084bea011..e7c1411acca4 100644
--- a/sw/source/uibase/inc/tblnumfm.hxx
+++ b/sw/source/uibase/inc/tblnumfm.hxx
@@ -24,10 +24,10 @@
 namespace vcl { class Window; }
 class SfxItemSet;
 
-class SwNumFmtDlg : public SfxSingleTabDialog
+class SwNumFormatDlg : public SfxSingleTabDialog
 {
 public:
-     SwNumFmtDlg(vcl::Window* pParent, const SfxItemSet& rSet);
+     SwNumFormatDlg(vcl::Window* pParent, const SfxItemSet& rSet);
 };
 
 #endif
diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx
index 8ac0722f5201..7c192aadb049 100644
--- a/sw/source/uibase/inc/textsh.hxx
+++ b/sw/source/uibase/inc/textsh.hxx
@@ -24,12 +24,12 @@
 #include <unotools/caserotate.hxx>
 
 class AbstractSvxPostItDialog;
-class SwFldMgr;
+class SwFieldMgr;
 class SvxHyperlinkItem;
 
 class SwTextShell: public SwBaseShell
 {
-    SwFldMgr*   pPostItFldMgr;
+    SwFieldMgr*   pPostItFieldMgr;
     RotateTransliteration m_aRotateCase;
 
     void InsertSymbol( SfxRequest& );
diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx
index a881cc41ff6c..40789e8ca2c3 100644
--- a/sw/source/uibase/inc/titlepage.hxx
+++ b/sw/source/uibase/inc/titlepage.hxx
@@ -43,7 +43,7 @@ private:
 
     SwWrtShell *mpSh;
 
-    const SwFmtPageDesc *mpPageFmtDesc;
+    const SwFormatPageDesc *mpPageFormatDesc;
 
     SwPageDesc *mpTitleDesc;
     const SwPageDesc *mpIndexDesc;
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 827c02e2fa4e..4bf83b29e1af 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -29,15 +29,15 @@ class IntlWrapper;
 class SwPaM;
 
 // container for FootNote
-class SW_DLLPUBLIC SwPageFtnInfoItem : public SfxPoolItem
+class SW_DLLPUBLIC SwPageFootnoteInfoItem : public SfxPoolItem
 {
-    SwPageFtnInfo aFtnInfo;
+    SwPageFootnoteInfo aFootnoteInfo;
 
 public:
 
-    SwPageFtnInfoItem(const sal_uInt16 nId, SwPageFtnInfo& rInfo);
-    SwPageFtnInfoItem(const SwPageFtnInfoItem& rItem );
-    virtual ~SwPageFtnInfoItem();
+    SwPageFootnoteInfoItem(const sal_uInt16 nId, SwPageFootnoteInfo& rInfo);
+    SwPageFootnoteInfoItem(const SwPageFootnoteInfoItem& rItem );
+    virtual ~SwPageFootnoteInfoItem();
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -50,9 +50,9 @@ public:
     virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
     virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
 
-    SwPageFtnInfo& GetPageFtnInfo()             { return aFtnInfo; }
-    const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; }
-    void SetPageFtnInfo(SwPageFtnInfo& rInf)    { aFtnInfo = rInf; }
+    SwPageFootnoteInfo& GetPageFootnoteInfo()             { return aFootnoteInfo; }
+    const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return aFootnoteInfo; }
+    void SetPageFootnoteInfo(SwPageFootnoteInfo& rInf)    { aFootnoteInfo = rInf; }
 };
 
 class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index ae2f14446a56..65823dd0231e 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -31,38 +31,38 @@ namespace sw { class StoredChapterNumberingRules; }
 
 #define MAX_NUM_RULES 9
 
-typedef boost::ptr_vector<SfxPoolItem> _SwNumFmtsAttrs;
+typedef boost::ptr_vector<SfxPoolItem> _SwNumFormatsAttrs;
 
 class SW_DLLPUBLIC SwNumRulesWithName
 {
     OUString maName;
     // the NumRule's formats _have_ to be independent of a document
     // (They should always be there!)
-    class SAL_DLLPRIVATE _SwNumFmtGlobal
+    class SAL_DLLPRIVATE _SwNumFormatGlobal
     {
         friend class SwNumRulesWithName;
-        SwNumFmt aFmt;
-        OUString sCharFmtName;
+        SwNumFormat aFormat;
+        OUString sCharFormatName;
         sal_uInt16 nCharPoolId;
-        _SwNumFmtsAttrs aItems;
+        _SwNumFormatsAttrs aItems;
 
-        _SwNumFmtGlobal& operator=( const _SwNumFmtGlobal& ) SAL_DELETED_FUNCTION;
+        _SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) SAL_DELETED_FUNCTION;
 
     public:
-        _SwNumFmtGlobal( const SwNumFmt& rFmt );
-        _SwNumFmtGlobal( const _SwNumFmtGlobal& );
-        ~_SwNumFmtGlobal();
+        _SwNumFormatGlobal( const SwNumFormat& rFormat );
+        _SwNumFormatGlobal( const _SwNumFormatGlobal& );
+        ~_SwNumFormatGlobal();
 
-        void ChgNumFmt( SwWrtShell& rSh, SwNumFmt& rChg ) const;
+        void ChgNumFormat( SwWrtShell& rSh, SwNumFormat& rChg ) const;
     };
 
-    _SwNumFmtGlobal* aFmts[ MAXLEVEL ];
+    _SwNumFormatGlobal* aFormats[ MAXLEVEL ];
 
 protected:
     friend class sw::StoredChapterNumberingRules;
     friend class SwChapterNumRules;
     void SetName(const OUString& rSet) {maName = rSet;}
-    void SetNumFmt(size_t, SwNumFmt const&, OUString const&);
+    void SetNumFormat(size_t, SwNumFormat const&, OUString const&);
     SwNumRulesWithName();
 
 public:
@@ -76,7 +76,7 @@ public:
     void MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const;
 
 
-    void GetNumFmt(size_t, SwNumFmt const*&, OUString const*&) const;
+    void GetNumFormat(size_t, SwNumFormat const*&, OUString const*&) const;
 };
 
 class SW_DLLPUBLIC SwChapterNumRules
diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx
index fe7aebc9b6f4..fc4620d377e4 100644
--- a/sw/source/uibase/inc/uitool.hxx
+++ b/sw/source/uibase/inc/uitool.hxx
@@ -31,7 +31,7 @@ class SvxTabStopItem;
 class SwWrtShell;
 class ListBox;
 class SwDocShell;
-class SwFrmFmt;
+class SwFrameFormat;
 class SwTabCols;
 class DateTime;
 class SfxViewFrame;
@@ -96,7 +96,7 @@ SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, boo
 SW_DLLPUBLIC sal_Int32 InsertStringSorted(const OUString& rEntry, ListBox& rToFill, sal_Int32 nOffset);
 
 // Get table width and alignement
-SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent,
+SwTwips GetTableWidth( SwFrameFormat* pFormat, SwTabCols& rCols, sal_uInt16 *pPercent,
         SwWrtShell* pSh );
 
 OUString GetAppLangDateTimeString( const DateTime& );
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index e3baf4647561..ee90ed801585 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.hxx
@@ -127,7 +127,7 @@ class SwMasterUsrPref : public SwViewOption
     friend class SwCursorConfig;
     friend class SwWebColorConfig;
 
-    SwFldUpdateFlags eFldUpdateFlags;    //update of fields and charts
+    SwFieldUpdateFlags eFieldUpdateFlags;    //update of fields and charts
     sal_Int32   nLinkUpdateMode;
     FieldUnit   eUserMetric;
     FieldUnit   eHScrollMetric;
@@ -182,25 +182,25 @@ public:
 
     void SetUpdateFields(bool bSet, bool bNoModify = false)
         {
-            if(bSet && eFldUpdateFlags == AUTOUPD_OFF)
+            if(bSet && eFieldUpdateFlags == AUTOUPD_OFF)
             {
-                eFldUpdateFlags = AUTOUPD_FIELD_ONLY;
+                eFieldUpdateFlags = AUTOUPD_FIELD_ONLY;
                 if(!bNoModify)
                     aContentConfig.SetModified();
              }
             else if(!bSet)
             {
-                eFldUpdateFlags = AUTOUPD_OFF;
+                eFieldUpdateFlags = AUTOUPD_OFF;
                 if(!bNoModify)
                     aContentConfig.SetModified();
             }
         };
-    bool IsUpdateFields()const {return eFldUpdateFlags != AUTOUPD_OFF; }
+    bool IsUpdateFields()const {return eFieldUpdateFlags != AUTOUPD_OFF; }
 
-    SwFldUpdateFlags   GetFldUpdateFlags()const {return eFldUpdateFlags;}
-    void        SetFldUpdateFlags(SwFldUpdateFlags eSet, bool bNoModify = false)
+    SwFieldUpdateFlags   GetFieldUpdateFlags()const {return eFieldUpdateFlags;}
+    void        SetFieldUpdateFlags(SwFieldUpdateFlags eSet, bool bNoModify = false)
         {
-            eFldUpdateFlags = eSet;
+            eFieldUpdateFlags = eSet;
             if(!bNoModify)
                 aContentConfig.SetModified();
         }
@@ -209,18 +209,18 @@ public:
         {
             if(bSet)
             {
-                eFldUpdateFlags = AUTOUPD_FIELD_AND_CHARTS;
+                eFieldUpdateFlags = AUTOUPD_FIELD_AND_CHARTS;
                 if(!bNoModify)
                     aContentConfig.SetModified();
              }
-             else if(eFldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS)
+             else if(eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS)
              {
-                eFldUpdateFlags = AUTOUPD_FIELD_ONLY;
+                eFieldUpdateFlags = AUTOUPD_FIELD_ONLY;
                 if(!bNoModify)
                     aContentConfig.SetModified();
              }
         };
-    bool IsUpdateCharts()const {return eFldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; }
+    bool IsUpdateCharts()const {return eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; }
 
     FieldUnit   GetMetric() const { return eUserMetric;}
     void        SetMetric(FieldUnit eSet, bool bNoModify = false)
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx
index 9d6a9b21e23c..a46879986888 100644
--- a/sw/source/uibase/inc/view.hxx
+++ b/sw/source/uibase/inc/view.hxx
@@ -39,10 +39,10 @@
 
 class Button;
 class ImageButton;
-class SwTxtFmtColl;
+class SwTextFormatColl;
 class SwPageDesc;
-class SwFrmFmt;
-class SwCharFmt;
+class SwFrameFormat;
+class SwCharFormat;
 class SwNumRule;
 class SwGlossaryHdl;
 class SwDrawBase;
@@ -71,7 +71,7 @@ class SvGlobalName;
 class SvtAccessibilityOptions;
 class SwTransferable;
 class SwMailMergeConfigItem;
-class SwTxtNode; // #i23726#
+class SwTextNode; // #i23726#
 class SwFormatClipboard;
 struct SwConversionArgs;
 class Graphic;
@@ -122,10 +122,10 @@ struct SwApplyTemplate
 {
     union
     {
-        SwTxtFmtColl* pTxtColl;
+        SwTextFormatColl* pTextColl;
         SwPageDesc*   pPageDesc;
-        SwFrmFmt*     pFrmFmt;
-        SwCharFmt*    pCharFmt;
+        SwFrameFormat*     pFrameFormat;
+        SwCharFormat*    pCharFormat;
         SwNumRule*    pNumRule;
     } aColl;
 
@@ -140,7 +140,7 @@ struct SwApplyTemplate
         m_pFormatClipboard(0),
         bUndo(false)
     {
-        aColl.pTxtColl = 0;
+        aColl.pTextColl = 0;
     }
 };
 
@@ -182,7 +182,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     OUString            m_sOldSectionName;
 
     Point               m_aTabColFromDocPos;  // moving table colmns out of the document
-    SwTxtNode           * m_pNumRuleNodeFromDoc; // Moving indent of numrule #i23726#
+    SwTextNode           * m_pNumRuleNodeFromDoc; // Moving indent of numrule #i23726#
 
     Size                m_aDocSz;         // current document size
     Rectangle           m_aVisArea;       // visible region
@@ -214,7 +214,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     SwGlossaryHdl       *m_pGlosHdl;          // handle text block
     SwDrawBase          *m_pDrawActual;
 
-    const SwFrmFmt      *m_pLastTableFormat;
+    const SwFrameFormat      *m_pLastTableFormat;
 
     SwFormatClipboard   *m_pFormatClipboard; //holds data for format paintbrush
 
@@ -328,7 +328,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     SAL_DLLPRIVATE void          SpellEnd( SwConversionArgs *pConvArgs = 0 );
 
     SAL_DLLPRIVATE void          HyphStart( SvxSpellArea eSpell );
-    SAL_DLLPRIVATE bool          CheckSpecialCntnt();
+    SAL_DLLPRIVATE bool          CheckSpecialContent();
     SAL_DLLPRIVATE void          SpellKontext(bool bOn = true)
                                  { m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; }
 
@@ -377,8 +377,8 @@ protected:
 
     void            SetImageButtonColor(Color& rColor);
 
-    const SwFrmFmt* GetLastTblFrmFmt() const {return m_pLastTableFormat;}
-    void            SetLastTblFrmFmt(const SwFrmFmt* pSet) {m_pLastTableFormat = pSet;}
+    const SwFrameFormat* GetLastTableFrameFormat() const {return m_pLastTableFormat;}
+    void            SetLastTableFrameFormat(const SwFrameFormat* pSet) {m_pLastTableFormat = pSet;}
 
     // form letter execution
     void    GenerateFormLetter(bool bUseCurrentDocument);
@@ -454,7 +454,7 @@ public:
     bool            ExecSmartTagPopup( const Point& rPt );
 
     DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*);
-    bool            ExecDrwTxtSpellPopup(const Point& rPt);
+    bool            ExecDrwTextSpellPopup(const Point& rPt);
 
     void            SetTabColFromDocPos( const Point &rPt ) { m_aTabColFromDocPos = rPt; }
     void            SetTabColFromDoc( bool b ) { m_bTabColFromDoc = b; }
@@ -463,7 +463,7 @@ public:
     bool            IsTabRowFromDoc() const    { return m_bTabRowFromDoc; }
 
     // -> #i23726#
-    void            SetNumRuleNodeFromDoc( SwTxtNode * pNumRuleNode )
+    void            SetNumRuleNodeFromDoc( SwTextNode * pNumRuleNode )
                     { m_pNumRuleNodeFromDoc = pNumRuleNode; }
     void            SetNumIndentFromDoc(bool b) { m_bNumIndentFromDoc = b; }
     bool            IsNumIndentFromDoc() const { return NULL != m_pNumRuleNodeFromDoc; }
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 6d66771875ff..cf8b019860b3 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -41,7 +41,7 @@ class SwInputFieldList;
 class SwSectionData;
 class Timer;
 class SvxMacro;
-class SwFmtINetFmt;
+class SwFormatINetFormat;
 class SvxAutoCorrect;
 class NaviContentBookmark;
 struct SwCallMouseEvent;
@@ -86,7 +86,7 @@ private:
     using SwCrsrShell::Down;
     using SwCrsrShell::LeftMargin;
     using SwCrsrShell::RightMargin;
-    using SwCrsrShell::SelectTxtAttr;
+    using SwCrsrShell::SelectTextAttr;
     using SwCrsrShell::GotoPage;
     using SwFEShell::InsertObject;
     using SwEditShell::AutoCorrect;
@@ -160,8 +160,8 @@ public:
     void    Invalidate();
 
     // select table cells for editing of formulas in the ribbonbar
-    inline void SelTblCells( const Link<> &rLink, bool bMark = true );
-    inline void EndSelTblCells();
+    inline void SelTableCells( const Link<> &rLink, bool bMark = true );
+    inline void EndSelTableCells();
 
     // leave per word or per line selection mode. Is usually called in MB-Up.
     bool    IsExtSel() const { return m_bSelWrd || m_bSelLn; }
@@ -227,7 +227,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
     bool SelectTableCol();
     bool SelectTableCell();
 
-    bool SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr = 0 );
+    bool SelectTextAttr( sal_uInt16 nWhich, const SwTextAttr* pAttr = 0 );
 
     // per column jumps
     bool StartOfColumn      ( bool bSelect = false );
@@ -249,7 +249,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
     bool    PageCrsr(SwTwips lOffset, bool bSelect);
 
     // update fields
-    void    UpdateInputFlds( SwInputFieldList* pLst = 0 );
+    void    UpdateInputFields( SwInputFieldList* pLst = 0 );
 
     void    NoEdit(bool bHideCrsr = true);
     void    Edit();
@@ -326,13 +326,13 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
                           bool bActivate = true,
                           sal_uInt16 nSlotId = 0);       // SlotId for dialog
 
-    bool    InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 );
+    bool    InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = 0 );
     void    LaunchOLEObj( long nVerb = 0 );             // start server
     virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) SAL_OVERRIDE;
     virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
                                   const SwRect *pFlyPrtRect = 0,
                                   const SwRect *pFlyFrmRect = 0,
-                                  const bool bNoTxtFrmPrtAreaChanged = false ) SAL_OVERRIDE;
+                                  const bool bNoTextFrmPrtAreaChanged = false ) SAL_OVERRIDE;
     virtual void ConnectObj( svt::EmbeddedObjectRef&  xIPObj, const SwRect &rPrt,
                              const SwRect &rFrm ) SAL_OVERRIDE;
 
@@ -343,11 +343,11 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
                     GETSTYLE_CREATESOME,        // if on PoolId create mapt
                     GETSTYLE_CREATEANY };       // return standard if applicable
 
-    SwTxtFmtColl*   GetParaStyle(const OUString &rCollName,
+    SwTextFormatColl*   GetParaStyle(const OUString &rCollName,
                                     GetStyle eCreate = GETSTYLE_NOCREATE);
-    SwCharFmt*      GetCharStyle(const OUString &rFmtName,
+    SwCharFormat*      GetCharStyle(const OUString &rFormatName,
                                     GetStyle eCreate = GETSTYLE_NOCREATE);
-    SwFrmFmt*       GetTblStyle(const OUString &rFmtName);
+    SwFrameFormat*       GetTableStyle(const OUString &rFormatName);
 
     void            SetPageStyle(const OUString &rCollName);
 
@@ -389,9 +389,9 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
     void    MoveCrsr( bool bWithSelect = false );
 
     // update input fields
-    bool    StartInputFldDlg(SwField*, bool bNextButton, vcl::Window* pParentWin = 0, OString* pWindowState = 0);
+    bool    StartInputFieldDlg(SwField*, bool bNextButton, vcl::Window* pParentWin = 0, OString* pWindowState = 0);
     // update DropDown fields
-    bool    StartDropDownFldDlg(SwField*, bool bNextButton, OString* pWindowState = 0);
+    bool    StartDropDownFieldDlg(SwField*, bool bNextButton, OString* pWindowState = 0);
 
     //"Handler" for changes at DrawView - for controls.
     virtual void DrawSelChanged( ) SAL_OVERRIDE;
@@ -405,7 +405,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
 
     bool GotoFieldmark(::sw::mark::IFieldmark const * const pMark);
 
-    bool GotoField( const SwFmtFld& rFld );
+    bool GotoField( const SwFormatField& rField );
 
     // jump to the next / previous hyperlink - inside text and also
     // on graphics
@@ -424,8 +424,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
 
     // a click at the given field. the cursor is on it.
     // execute the predefined actions.
-    void ClickToField( const SwField& rFld );
-    void ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter = URLLOAD_NOFILTER );
+    void ClickToField( const SwField& rField );
+    void ClickToINetAttr( const SwFormatINetFormat& rItem, sal_uInt16 nFilter = URLLOAD_NOFILTER );
     bool ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter = URLLOAD_NOFILTER );
     inline bool IsInClickToEdit() const ;
 
@@ -439,8 +439,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
     virtual void SetReadonlyOption( bool bSet ) SAL_OVERRIDE;
 
     // automatic update of styles
-    void AutoUpdateFrame(SwFrmFmt* pFmt, const SfxItemSet& rStyleSet);
-    void AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM = NULL );
+    void AutoUpdateFrame(SwFrameFormat* pFormat, const SfxItemSet& rStyleSet);
+    void AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM = NULL );
 
     // link for inserting ranges via Drag&Drop/Clipboard
     DECL_LINK( InsertRegionDialog, SwSectionData* );
@@ -460,7 +460,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
     void addCurrentPosition();
     bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL,
          bool bSelFrame = true );
-    bool GotoINetAttr( const SwTxtINetFmt& rAttr );
+    bool GotoINetAttr( const SwTextINetFormat& rAttr );
     void GotoOutline( sal_uInt16 nIdx );
     bool GotoOutline( const OUString& rName );
     bool GotoRegion( const OUString& rName );
@@ -468,7 +468,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
         sal_uInt16 nSeqNo = 0 );
     bool GotoNextTOXBase( const OUString* pName = 0);
     bool GotoTable( const OUString& rName );
-    bool GotoFld( const SwFmtFld& rFld );
+    bool GotoFormatField( const SwFormatField& rField );
     const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, bool bSelect = false);
 
     void ChangeHeaderOrFooter(const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning);
@@ -561,7 +561,7 @@ private:
     bool    m_bRetainSelection :1; // Do not remove selections
 
     Point   m_aStart;
-    Link<>  m_aSelTblLink;
+    Link<>  m_aSelTableLink;
 
     // resets the cursor stack after movement by PageUp/-Down
     SAL_DLLPRIVATE void  _ResetCursorStack();
@@ -616,15 +616,15 @@ inline void SwWrtShell::ResetCursorStack()
         _ResetCursorStack();
 }
 
-inline void SwWrtShell::SelTblCells(const Link<> &rLink, bool bMark )
+inline void SwWrtShell::SelTableCells(const Link<> &rLink, bool bMark )
 {
-    SetSelTblCells( true );
+    SetSelTableCells( true );
     m_bClearMark = bMark;
-    m_aSelTblLink = rLink;
+    m_aSelTableLink = rLink;
 }
-inline void SwWrtShell::EndSelTblCells()
+inline void SwWrtShell::EndSelTableCells()
 {
-    SetSelTblCells( false );
+    SetSelTableCells( false );
     m_bClearMark = true;
 }
 
diff --git a/sw/source/uibase/index/toxmgr.cxx b/sw/source/uibase/index/toxmgr.cxx
index 76ea0dced9dd..9bde8b126487 100644
--- a/sw/source/uibase/index/toxmgr.cxx
+++ b/sw/source/uibase/index/toxmgr.cxx
@@ -360,12 +360,12 @@ bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
             if(TOX_AUTHORITIES == eCurTOXType)
             {
                 SwAuthorityFieldType* pFType = static_cast<SwAuthorityFieldType*>(
-                                                pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr));
+                                                pSh->GetFieldType(RES_AUTHORITY, aEmptyOUStr));
                 if (!pFType)
                 {
                     SwAuthorityFieldType const type(pSh->GetDoc());
                     pFType = static_cast<SwAuthorityFieldType*>(
-                                pSh->InsertFldType(type));
+                                pSh->InsertFieldType(type));
                 }
                 pFType->SetPreSuffix(rDesc.GetAuthBrackets()[0],
                     rDesc.GetAuthBrackets()[1]);
@@ -379,7 +379,7 @@ bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
                 pFType->SetLanguage(rDesc.GetLanguage());
                 pFType->SetSortAlgorithm(rDesc.GetSortAlgorithm());
 
-                pFType->UpdateFlds();
+                pFType->UpdateFields();
             }
             // TODO: consider properties of the current TOXType
             if(!pCurTOX || (ppBase && !(*ppBase)))
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index 1ff242c640c5..d4c2479c564b 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -104,7 +104,7 @@ SwHHCWrapper::SwHHCWrapper(
     , m_nPageCount( 0 )
     , m_nPageStart( 0 )
     , m_bIsDrawObj( false )
-    , m_bIsOtherCntnt( bOther )
+    , m_bIsOtherContent( bOther )
     , m_bStartChk( bOther )
     , m_bIsSelection( bSelection )
     , m_bStartDone( bOther || bStart )
@@ -230,7 +230,7 @@ void SwHHCWrapper::ChangeText( const OUString &rNewText,
         const SwPosition *pStart = pCrsr->Start();
         const sal_Int32 nStartIndex = pStart->nContent.GetIndex();
         const SwNodeIndex aStartNodeIndex  = pStart->nNode;
-        SwTxtNode *pStartTxtNode = aStartNodeIndex.GetNode().GetTxtNode();
+        SwTextNode *pStartTextNode = aStartNodeIndex.GetNode().GetTextNode();
 
         const sal_Int32  nIndices = pOffsets->getLength();
         const sal_Int32 *pIndices = pOffsets->getConstArray();
@@ -275,8 +275,8 @@ void SwHHCWrapper::ChangeText( const OUString &rNewText,
                     // set selection to sub string to be replaced in original text
                     sal_Int32 nChgInNodeStartIndex = nStartIndex + nCorrectionOffset + nChgPos;
                     OSL_ENSURE( m_rWrtShell.GetCrsr()->HasMark(), "cursor misplaced (nothing selected)" );
-                    m_rWrtShell.GetCrsr()->GetMark()->nContent.Assign( pStartTxtNode, nChgInNodeStartIndex );
-                    m_rWrtShell.GetCrsr()->GetPoint()->nContent.Assign( pStartTxtNode, nChgInNodeStartIndex + nChgLen );
+                    m_rWrtShell.GetCrsr()->GetMark()->nContent.Assign( pStartTextNode, nChgInNodeStartIndex );
+                    m_rWrtShell.GetCrsr()->GetPoint()->nContent.Assign( pStartTextNode, nChgInNodeStartIndex + nChgLen );
 
                     // replace selected sub string with the corresponding
                     // sub string from the new text while keeping as
@@ -307,7 +307,7 @@ void SwHHCWrapper::ChangeText( const OUString &rNewText,
         // (as it would happen after ChangeText_impl (Delete and Insert)
         // of the whole text in the 'else' branch below)
         m_rWrtShell.ClearMark();
-        m_rWrtShell.GetCrsr()->Start()->nContent.Assign( pStartTxtNode, nStartIndex + nConvTextLen );
+        m_rWrtShell.GetCrsr()->Start()->nContent.Assign( pStartTextNode, nStartIndex + nConvTextLen );
     }
     else
     {
@@ -373,10 +373,10 @@ void SwHHCWrapper::ReplaceUnit(
     // select current unit
     SelectNewUnit_impl( nUnitStart, nUnitEnd );
 
-    OUString aOrigTxt( m_rWrtShell.GetSelTxt() );
-    OUString aNewTxt( rReplaceWith );
-    OSL_ENSURE( aOrigTxt == rOrigText, "!! text mismatch !!" );
-    SwFmtRuby *pRuby = 0;
+    OUString aOrigText( m_rWrtShell.GetSelText() );
+    OUString aNewText( rReplaceWith );
+    OSL_ENSURE( aOrigText == rOrigText, "!! text mismatch !!" );
+    SwFormatRuby *pRuby = 0;
     bool bRubyBelow = false;
     OUString  aNewOrigText;
     switch (eAction)
@@ -385,34 +385,34 @@ void SwHHCWrapper::ReplaceUnit(
         break;
         case eReplacementBracketed :
         {
-            aNewTxt = aOrigTxt + "(" + rReplaceWith + ")";
+            aNewText = aOrigText + "(" + rReplaceWith + ")";
         }
         break;
         case eOriginalBracketed :
         {
-            aNewTxt = rReplaceWith + "(" + aOrigTxt + ")";
+            aNewText = rReplaceWith + "(" + aOrigText + ")";
         }
         break;
         case eReplacementAbove  :
         {
-            pRuby = new SwFmtRuby( rReplaceWith );
+            pRuby = new SwFormatRuby( rReplaceWith );
         }
         break;
         case eOriginalAbove :
         {
-            pRuby = new SwFmtRuby( aOrigTxt );
+            pRuby = new SwFormatRuby( aOrigText );
             aNewOrigText = rReplaceWith;
         }
         break;
         case eReplacementBelow :
         {
-            pRuby = new SwFmtRuby( rReplaceWith );
+            pRuby = new SwFormatRuby( rReplaceWith );
             bRubyBelow = true;
         }
         break;
         case eOriginalBelow :
         {
-            pRuby = new SwFmtRuby( aOrigTxt );
+            pRuby = new SwFormatRuby( aOrigText );
             aNewOrigText = rReplaceWith;
             bRubyBelow = true;
         }
@@ -420,7 +420,7 @@ void SwHHCWrapper::ReplaceUnit(
         default:
             OSL_FAIL("unexpected case" );
     }
-    m_nUnitOffset += nUnitStart + aNewTxt.getLength();
+    m_nUnitOffset += nUnitStart + aNewText.getLength();
 
     if (pRuby)
     {
@@ -463,15 +463,15 @@ void SwHHCWrapper::ReplaceUnit(
         // Thus we do this only for Chinese translation...
         const bool bIsChineseConversion = IsChinese( GetSourceLanguage() );
         if (bIsChineseConversion)
-            ChangeText( aNewTxt, rOrigText, &rOffsets, m_rWrtShell.GetCrsr() );
+            ChangeText( aNewText, rOrigText, &rOffsets, m_rWrtShell.GetCrsr() );
         else
-            ChangeText( aNewTxt, rOrigText, NULL, NULL );
+            ChangeText( aNewText, rOrigText, NULL, NULL );
 
         // change language and font if necessary
         if (bIsChineseConversion)
         {
             m_rWrtShell.SetMark();
-            m_rWrtShell.GetCrsr()->GetMark()->nContent -= aNewTxt.getLength();
+            m_rWrtShell.GetCrsr()->GetMark()->nContent -= aNewText.getLength();
 
             OSL_ENSURE( GetTargetLanguage() == LANGUAGE_CHINESE_SIMPLIFIED || GetTargetLanguage() == LANGUAGE_CHINESE_TRADITIONAL,
                     "SwHHCWrapper::ReplaceUnit : unexpected target language" );
@@ -524,12 +524,12 @@ void SwHHCWrapper::Convert()
         SwPosition* pSttPos = pCrsr->Start();
         SwPosition* pEndPos = pCrsr->End();
 
-        if (pSttPos->nNode.GetNode().IsTxtNode() &&
-            pEndPos->nNode.GetNode().IsTxtNode())
+        if (pSttPos->nNode.GetNode().IsTextNode() &&
+            pEndPos->nNode.GetNode().IsTextNode())
         {
             m_pConvArgs = new SwConversionArgs( GetSourceLanguage(),
-                            pSttPos->nNode.GetNode().GetTxtNode(), pSttPos->nContent,
-                            pEndPos->nNode.GetNode().GetTxtNode(), pEndPos->nContent );
+                            pSttPos->nNode.GetNode().GetTextNode(), pSttPos->nContent,
+                            pEndPos->nNode.GetNode().GetTextNode(), pEndPos->nContent );
         }
         else    // we are not in the text (maybe a graphic or OLE object is selected) let's start from the top
         {
@@ -539,17 +539,17 @@ void SwHHCWrapper::Convert()
             aPam.Move( fnMoveBackward, fnGoDoc ); // move to start of document
 
             pSttPos = aPam.GetPoint();  //! using a PaM here makes sure we will get only text nodes
-            SwTxtNode *pTxtNode = pSttPos->nNode.GetNode().GetTxtNode();
+            SwTextNode *pTextNode = pSttPos->nNode.GetNode().GetTextNode();
             // just in case we check anyway...
-            if (!pTxtNode || !pTxtNode->IsTxtNode())
+            if (!pTextNode || !pTextNode->IsTextNode())
                 return;
             m_pConvArgs = new SwConversionArgs( GetSourceLanguage(),
-                            pTxtNode, pSttPos->nContent,
-                            pTxtNode, pSttPos->nContent );
+                            pTextNode, pSttPos->nContent,
+                            pTextNode, pSttPos->nContent );
         }
-        OSL_ENSURE( m_pConvArgs->pStartNode && m_pConvArgs->pStartNode->IsTxtNode(),
+        OSL_ENSURE( m_pConvArgs->pStartNode && m_pConvArgs->pStartNode->IsTextNode(),
                 "failed to get proper start text node" );
-        OSL_ENSURE( m_pConvArgs->pEndNode && m_pConvArgs->pEndNode->IsTxtNode(),
+        OSL_ENSURE( m_pConvArgs->pEndNode && m_pConvArgs->pEndNode->IsTextNode(),
                 "failed to get proper end text node" );
 
         // chinese conversion specific settings
@@ -581,7 +581,7 @@ void SwHHCWrapper::Convert()
                 nStartIdx = 0;
             else
             {
-                OUString aText( m_pConvArgs->pStartNode->GetTxt() );
+                OUString aText( m_pConvArgs->pStartNode->GetText() );
                 const sal_Int32 nPos = m_pConvArgs->pStartIdx->GetIndex();
                 Boundary aBoundary( g_pBreakIt->GetBreakIter()->
                         getWordBoundary( aText, nPos, g_pBreakIt->GetLocale( m_pConvArgs->nConvSrcLang ),
@@ -600,7 +600,7 @@ void SwHHCWrapper::Convert()
         }
     }
 
-    if ( m_bIsOtherCntnt )
+    if ( m_bIsOtherContent )
         ConvStart_impl( m_pConvArgs, SVX_SPELL_OTHER );
     else
     {
@@ -623,14 +623,14 @@ bool SwHHCWrapper::ConvNext_impl( )
     else
         m_bEndDone = true;
 
-    if( m_bIsOtherCntnt && m_bStartDone && m_bEndDone ) // document completely checked?
+    if( m_bIsOtherContent && m_bStartDone && m_bEndDone ) // document completely checked?
     {
         return false;
     }
 
     bool bGoOn = false;
 
-    if ( m_bIsOtherCntnt )
+    if ( m_bIsOtherContent )
     {
         m_bStartChk = false;
         ConvStart_impl( m_pConvArgs, SVX_SPELL_BODY );
@@ -642,7 +642,7 @@ bool SwHHCWrapper::ConvNext_impl( )
         if( HasOtherCnt_impl() )
         {
             ConvStart_impl( m_pConvArgs, SVX_SPELL_OTHER );
-            m_bIsOtherCntnt = bGoOn = true;
+            m_bIsOtherContent = bGoOn = true;
         }
     }
     else
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 70ef25cffe4a..b74693bb501a 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -196,20 +196,20 @@ void SwSpellPopup::fillLangPopupMenu(
     std::set< OUString >::const_iterator it;
     for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
     {
-        OUString aEntryTxt( *it );
-        if (aEntryTxt != OUString( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) )&&
-            aEntryTxt != "*" && // multiple languages in current selection
-            !aEntryTxt.isEmpty()) // 'no language found' from language guessing
+        OUString aEntryText( *it );
+        if (aEntryText != OUString( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) )&&
+            aEntryText != "*" && // multiple languages in current selection
+            !aEntryText.isEmpty()) // 'no language found' from language guessing
         {
             OSL_ENSURE( nLangItemIdStart <= nItemId && nItemId <= nLangItemIdStart + MN_MAX_NUM_LANG,
                     "nItemId outside of expected range!" );
-            pPopupMenu->InsertItem( nItemId, aEntryTxt, MenuItemBits::RADIOCHECK );
-            if (aEntryTxt == aCurLang)
+            pPopupMenu->InsertItem( nItemId, aEntryText, MenuItemBits::RADIOCHECK );
+            if (aEntryText == aCurLang)
             {
                 //make a check mark for the current language
                 pPopupMenu->CheckItem( nItemId, true );
             }
-            rLangTable[ nItemId ] = aEntryTxt;
+            rLangTable[ nItemId ] = aEntryText;
             ++nItemId;
         }
     }
@@ -824,13 +824,13 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
                     RES_CHRATR_CJK_LANGUAGE,    RES_CHRATR_CJK_LANGUAGE,
                     RES_CHRATR_CTL_LANGUAGE,    RES_CHRATR_CTL_LANGUAGE,
                     0 );
-        OUString aNewLangTxt;
+        OUString aNewLangText;
 
         if (MN_SET_LANGUAGE_SELECTION_START <= nId && nId <= MN_SET_LANGUAGE_SELECTION_END)
         {
             //Set language for current selection
-            aNewLangTxt = m_aLangTable_Text[nId];
-            SwLangHelper::SetLanguage( *m_pSh, aNewLangTxt, true, aCoreSet );
+            aNewLangText = m_aLangTable_Text[nId];
+            SwLangHelper::SetLanguage( *m_pSh, aNewLangText, true, aCoreSet );
         }
         else if (nId == MN_SET_SELECTION_NONE)
         {
@@ -850,10 +850,10 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
         else if (MN_SET_LANGUAGE_PARAGRAPH_START <= nId && nId <= MN_SET_LANGUAGE_PARAGRAPH_END)
         {
             //Set language for current paragraph
-            aNewLangTxt = m_aLangTable_Paragraph[nId];
+            aNewLangText = m_aLangTable_Paragraph[nId];
             m_pSh->Push();        // save cursor
             SwLangHelper::SelectCurrentPara( *m_pSh );
-            SwLangHelper::SetLanguage( *m_pSh, aNewLangTxt, true, aCoreSet );
+            SwLangHelper::SetLanguage( *m_pSh, aNewLangText, true, aCoreSet );
             m_pSh->Pop( false );  // restore cursor
         }
         else if (nId == MN_SET_PARA_NONE)
diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx
index 249efb3986d6..e899234b948d 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx
@@ -125,7 +125,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
     sal_uInt16 n = nDocIndex;
 
     std::list<SdrTextObj*> aTextObjs;
-    SwDrawContact::GetTextObjectsFromFmt( aTextObjs, pView->GetDocShell()->GetDoc() );
+    SwDrawContact::GetTextObjectsFromFormat( aTextObjs, pView->GetDocShell()->GetDoc() );
     for ( std::list<SdrTextObj*>::iterator aIt = aTextObjs.begin(); aIt != aTextObjs.end(); ++aIt )
     {
         pTextObj = (*aIt);
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index fcefbb95523a..73acb6a265bd 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -147,7 +147,7 @@ void SwModelessRedlineAcceptDlg::dispose()
 }
 
 SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder,
-                                       vcl::Window *pContentArea, bool bAutoFmt) :
+                                       vcl::Window *pContentArea, bool bAutoFormat) :
     pParentDlg      (pParent),
     aTabPagesCTRL   (VclPtr<SvxAcceptChgCtr>::Create(pContentArea, pBuilder)),
     aPopup          (SW_RES(MN_REDLINE_POPUP)),
@@ -155,11 +155,11 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer
     sDeleted        (SW_RES(STR_REDLINE_DELETED)),
     sFormated       (SW_RES(STR_REDLINE_FORMATED)),
     sTableChgd      (SW_RES(STR_REDLINE_TABLECHG)),
-    sFmtCollSet     (SW_RES(STR_REDLINE_FMTCOLLSET)),
+    sFormatCollSet     (SW_RES(STR_REDLINE_FMTCOLLSET)),
     sAutoFormat     (SW_RES(STR_REDLINE_AUTOFMT)),
     bOnlyFormatedRedlines( false ),
     bHasReadonlySel ( false ),
-    bRedlnAutoFmt   (bAutoFmt),
+    bRedlnAutoFormat   (bAutoFormat),
     bInhibitActivate( false )
 {
     aTabPagesCTRL->SetHelpId(HID_REDLINE_CTRL);
@@ -187,9 +187,9 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer
     pActLB->InsertEntry(sFormated);
     pActLB->InsertEntry(sTableChgd);
 
-    if (HasRedlineAutoFmt())
+    if (HasRedlineAutoFormat())
     {
-        pActLB->InsertEntry(sFmtCollSet);
+        pActLB->InsertEntry(sFormatCollSet);
         pActLB->InsertEntry(sAutoFormat);
         pTPView->ShowUndo(true);
         pTPView->DisableUndo();     // no UNDO events yet
@@ -342,7 +342,7 @@ Image SwRedlineAcceptDlg::GetActionImage(const SwRangeRedline& rRedln, sal_uInt1
     const static Image aDeleted(SW_RES(IMG_REDLINE_DELETED));
     const static Image aFormated(SW_RES(IMG_REDLINE_FORMATED));
     const static Image aTableChgd(SW_RES(IMG_REDLINE_TABLECHG));
-    const static Image aFmtCollSet(SW_RES(IMG_REDLINE_FMTCOLLSET));
+    const static Image aFormatCollSet(SW_RES(IMG_REDLINE_FMTCOLLSET));
     const static Image aAutoFormat(SW_RES(IMG_REDLINE_AUTOFMT));
 
     switch (rRedln.GetType(nStack))
@@ -352,7 +352,7 @@ Image SwRedlineAcceptDlg::GetActionImage(const SwRangeRedline& rRedln, sal_uInt1
         case nsRedlineType_t::REDLINE_FORMAT:  return aFormated;
         case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: return aFormated;
         case nsRedlineType_t::REDLINE_TABLE:   return aTableChgd;
-        case nsRedlineType_t::REDLINE_FMTCOLL: return aFmtCollSet;
+        case nsRedlineType_t::REDLINE_FMTCOLL: return aFormatCollSet;
     }
 
     return Image();
@@ -367,7 +367,7 @@ OUString SwRedlineAcceptDlg::GetActionText(const SwRangeRedline& rRedln, sal_uIn
         case nsRedlineType_t::REDLINE_FORMAT:   return sFormated;
         case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT:   return sFormated;
         case nsRedlineType_t::REDLINE_TABLE:    return sTableChgd;
-        case nsRedlineType_t::REDLINE_FMTCOLL:  return sFmtCollSet;
+        case nsRedlineType_t::REDLINE_FMTCOLL:  return sFormatCollSet;
         default:;//prevent warning
     }
 
@@ -489,7 +489,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, bool bChild)
     pTable->SetUpdateMode(false);
     SwView *pView   = ::GetActiveView();
     SwWrtShell* pSh = pView->GetWrtShellPtr();
-    sal_uInt16 nAutoFmt = HasRedlineAutoFmt() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0;
+    sal_uInt16 nAutoFormat = HasRedlineAutoFormat() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0;
     SwRedlineDataParent *pParent = &aRedlineParents[nStart];
     const SwRangeRedline& rRedln = pSh->GetRedline(nStart);
 
@@ -517,7 +517,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, bool bChild)
         pParent->pNext = 0;
 
         // insert new children
-        InsertChildren(pParent, rRedln, nAutoFmt);
+        InsertChildren(pParent, rRedln, nAutoFormat);
 
         pTable->SetUpdateMode(true);
         return nStart;
@@ -557,17 +557,17 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, bool bChild)
     return USHRT_MAX;
 }
 
-void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFmt)
+void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFormat)
 {
     OUString sChild;
     SwRedlineDataChild *pLastRedlineChild = 0;
     const SwRedlineData *pRedlineData = &rRedln.GetRedlineData();
-    bool bAutoFmt = (rRedln.GetRealType() & nAutoFmt) != 0;
+    bool bAutoFormat = (rRedln.GetRealType() & nAutoFormat) != 0;
 
     OUString sAction = GetActionText(rRedln);
     bool bValidParent = sFilterAction.isEmpty() || sFilterAction == sAction;
     bValidParent = bValidParent && pTable->IsValidEntry(rRedln.GetAuthorString(), rRedln.GetTimeStamp(), rRedln.GetComment());
-    if (nAutoFmt)
+    if (nAutoFormat)
     {
 
         if (pParent->pData->GetSeqNo())
@@ -586,7 +586,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRa
                 return;
             }
         }
-        bValidParent = bValidParent && bAutoFmt;
+        bValidParent = bValidParent && bAutoFormat;
     }
     bool bValidTree = bValidParent;
 
@@ -606,8 +606,8 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRa
         sAction = GetActionText(rRedln, nStack);
         bool bValidChild = sFilterAction.isEmpty() || sFilterAction == sAction;
         bValidChild = bValidChild && pTable->IsValidEntry(rRedln.GetAuthorString(nStack), rRedln.GetTimeStamp(nStack), rRedln.GetComment());
-        if (nAutoFmt)
-            bValidChild = bValidChild && bAutoFmt;
+        if (nAutoFormat)
+            bValidChild = bValidChild && bAutoFormat;
         bValidTree |= bValidChild;
 
         if (bValidChild)
@@ -637,7 +637,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRa
     {
         pTable->RemoveEntry(pParent->pTLBParent);
         pParent->pTLBParent = 0;
-        if (nAutoFmt)
+        if (nAutoFormat)
             aUsedSeqNo.erase(pParent);
     }
 }
@@ -720,7 +720,7 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd)
 {
     SwView *pView   = ::GetActiveView();
     SwWrtShell* pSh = pView->GetWrtShellPtr();
-    sal_uInt16 nAutoFmt = HasRedlineAutoFmt() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0;
+    sal_uInt16 nAutoFormat = HasRedlineAutoFormat() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0;
 
     OUString sParent;
     sal_uInt16 nCount = pSh->GetRedlineCount();
@@ -773,7 +773,7 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd)
 
         pRedlineParent->pTLBParent = pParent;
 
-        InsertChildren(pRedlineParent, rRedln, nAutoFmt);
+        InsertChildren(pRedlineParent, rRedln, nAutoFormat);
     }
 }
 
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index 77e34ac668fd..0cbea139e619 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -283,13 +283,13 @@ bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
                 if(m_pWin->GetFrmColCount() > 1)
                 {
                     SfxItemSet aSet(m_pView->GetPool(),RES_COL,RES_COL);
-                    SwFmtCol aCol(static_cast<const SwFmtCol&>(aSet.Get(RES_COL)));
+                    SwFormatCol aCol(static_cast<const SwFormatCol&>(aSet.Get(RES_COL)));
                     aCol.Init(m_pWin->GetFrmColCount(), aCol.GetGutterWidth(), aCol.GetWishWidth());
                     aSet.Put(aCol);
                     // Template AutoUpdate
-                    SwFrmFmt* pFmt = m_pSh->GetCurFrmFmt();
-                    if(pFmt && pFmt->IsAutoUpdateFmt())
-                        m_pSh->AutoUpdateFrame(pFmt, aSet);
+                    SwFrameFormat* pFormat = m_pSh->GetCurFrameFormat();
+                    if(pFormat && pFormat->IsAutoUpdateFormat())
+                        m_pSh->AutoUpdateFrame(pFormat, aSet);
                     else
                         m_pSh->SetFlyFrmAttr( aSet );
                 }
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 6456d6ecdc9d..2eed3b425667 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -142,7 +142,7 @@ void SwInputWindow::dispose()
     }
     delete pMgr;
     if(pWrtShell)
-        pWrtShell->EndSelTblCells();
+        pWrtShell->EndSelTableCells();
 
     CleanupUglyHackWithUndo();
 
@@ -157,7 +157,7 @@ void SwInputWindow::CleanupUglyHackWithUndo()
     {
         if (pWrtShell)
         {
-            DelBoxCntnt();
+            DelBoxContent();
             pWrtShell->DoUndo(m_bDoesUndo);
             if (m_bCallUndo)
             {
@@ -207,11 +207,11 @@ void SwInputWindow::ShowWin()
 
         OSL_ENSURE(pWrtShell, "no WrtShell!");
         // Cursor in table
-        bIsTable = pWrtShell->IsCrsrInTbl();
+        bIsTable = pWrtShell->IsCrsrInTable();
 
         if( bFirst )
-            pWrtShell->SelTblCells( LINK( this, SwInputWindow,
-                                                SelTblCellsNotify) );
+            pWrtShell->SelTableCells( LINK( this, SwInputWindow,
+                                                SelTableCellsNotify) );
         if( bIsTable )
         {
             const OUString& rPos = pWrtShell->GetBoxNms();
@@ -220,20 +220,20 @@ void SwInputWindow::ShowWin()
             while( (nPos = rPos.indexOf( ':',nPos + 1 ) ) != -1 )
                 nSrch = (short) nPos;
             aPos->SetText( rPos.copy( ++nSrch ) );
-            aAktTableName = pWrtShell->GetTableFmt()->GetName();
+            aAktTableName = pWrtShell->GetTableFormat()->GetName();
         }
         else
             aPos->SetText(SW_RESSTR(STR_TBL_FORMULA));
 
         // Edit current field
         OSL_ENSURE(pMgr == 0, "FieldManager not deleted");
-        pMgr = new SwFldMgr;
+        pMgr = new SwFieldMgr;
 
         // Formular should always begin with "=" , so set here
         OUString sEdit('=');
-        if( pMgr->GetCurFld() && TYP_FORMELFLD == pMgr->GetCurTypeId() )
+        if( pMgr->GetCurField() && TYP_FORMELFLD == pMgr->GetCurTypeId() )
         {
-            sEdit += pMgr->GetCurFldPar2();
+            sEdit += pMgr->GetCurFieldPar2();
         }
         else if( bFirst )
         {
@@ -268,8 +268,8 @@ void SwInputWindow::ShowWin()
                 pWrtShell->DoUndo(false);
 
                 SfxItemSet aSet( pWrtShell->GetAttrPool(), RES_BOXATR_FORMULA, RES_BOXATR_FORMULA );
-                if( pWrtShell->GetTblBoxFormulaAttrs( aSet ))
-                    sEdit += static_cast<const SwTblBoxFormula&>(aSet.Get( RES_BOXATR_FORMULA )).GetFormula();
+                if( pWrtShell->GetTableBoxFormulaAttrs( aSet ))
+                    sEdit += static_cast<const SwTableBoxFormula&>(aSet.Get( RES_BOXATR_FORMULA )).GetFormula();
             }
         }
 
@@ -286,7 +286,7 @@ void SwInputWindow::ShowWin()
 
         aEdit->SetText( sEdit );
         aEdit->SetSelection( Selection( sEdit.getLength(), sEdit.getLength() ) );
-        sOldFml = sEdit;
+        sOldFormula = sEdit;
 
         aEdit->Invalidate();
         aEdit->Update();
@@ -388,7 +388,7 @@ void  SwInputWindow::ApplyFormula()
         sEdit = sEdit.copy( 1 );
     SfxStringItem aParam(FN_EDIT_FORMULA, sEdit);
 
-    pWrtShell->EndSelTblCells();
+    pWrtShell->EndSelTableCells();
     pView->GetEditWin().GrabFocus();
     const SfxPoolItem* aArgs[2];
     aArgs[0] = &aParam;
@@ -408,7 +408,7 @@ void  SwInputWindow::CancelFormula()
         if( bDelSel )
             pWrtShell->EnterStdMode();
 
-        pWrtShell->EndSelTblCells();
+        pWrtShell->EndSelTableCells();
 
         pView->GetEditWin().GrabFocus();
 
@@ -419,24 +419,24 @@ void  SwInputWindow::CancelFormula()
 const sal_Unicode CH_LRE = 0x202a;
 const sal_Unicode CH_PDF = 0x202c;
 
-IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller )
+IMPL_LINK( SwInputWindow, SelTableCellsNotify, SwWrtShell *, pCaller )
 {
     if(bIsTable)
     {
-        SwFrmFmt* pTblFmt = pCaller->GetTableFmt();
+        SwFrameFormat* pTableFormat = pCaller->GetTableFormat();
         OUString sBoxNms( pCaller->GetBoxNms() );
-        OUString sTblNm;
-        if( pTblFmt && aAktTableName != pTblFmt->GetName() )
-            sTblNm = pTblFmt->GetName();
+        OUString sTableNm;
+        if( pTableFormat && aAktTableName != pTableFormat->GetName() )
+            sTableNm = pTableFormat->GetName();
 
-        aEdit->UpdateRange( sBoxNms, sTblNm );
+        aEdit->UpdateRange( sBoxNms, sTableNm );
 
         OUString sNew;
         sNew += OUString(CH_LRE);
         sNew += aEdit->GetText();
         sNew += OUString(CH_PDF);
 
-        if( sNew != sOldFml )
+        if( sNew != sOldFormula )
         {
             // The WrtShell is in the table selection,
             // then cancel the table selection otherwise, the cursor is
@@ -452,7 +452,7 @@ IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller )
             pIDCO->DeleteRange( aPam );
             pIDCO->InsertString( aPam, sNew );
             pWrtShell->EndAllAction();
-            sOldFml = sNew;
+            sOldFormula = sNew;
         }
     }
     else
@@ -481,19 +481,19 @@ IMPL_LINK_NOARG(SwInputWindow, ModifyHdl)
     if (bIsTable && m_bResetUndo)
     {
         pWrtShell->StartAllAction();
-        DelBoxCntnt();
+        DelBoxContent();
         OUString sNew;
         sNew += OUString(CH_LRE);
         sNew += aEdit->GetText();
         sNew += OUString(CH_PDF);
         pWrtShell->SwEditShell::Insert2( sNew );
         pWrtShell->EndAllAction();
-        sOldFml = sNew;
+        sOldFormula = sNew;
     }
     return 0;
 }
 
-void SwInputWindow::DelBoxCntnt()
+void SwInputWindow::DelBoxContent()
 {
     if( bIsTable )
     {
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 3b6c4e6401ad..ba0a7f642c94 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -379,8 +379,8 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
             if(pItem)
             {
                 const SvxHyperlinkItem& rHLinkItem = *static_cast<const SvxHyperlinkItem *>(pItem);
-                SvxURLField aFld(rHLinkItem.GetURL(), rHLinkItem.GetName(), SVXURLFORMAT_APPDEFAULT);
-                aFld.SetTargetFrame(rHLinkItem.GetTargetFrame());
+                SvxURLField aField(rHLinkItem.GetURL(), rHLinkItem.GetName(), SVXURLFORMAT_APPDEFAULT);
+                aField.SetTargetFrame(rHLinkItem.GetTargetFrame());
 
                 const SvxFieldItem* pFieldItem = pOLV->GetFieldAtSelection();
 
@@ -392,7 +392,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
                     pOLV->SetSelection(aSel);
                 }
                 if (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED)
-                    pOLV->InsertField(SvxFieldItem(aFld, EE_FEATURE_FIELD));
+                    pOLV->InsertField(SvxFieldItem(aField, EE_FEATURE_FIELD));
             }
             break;
         }
@@ -524,8 +524,8 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
                 aDlgAttr.Put(aEditAttr);
 
                 aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) );
-                aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
-                aDlgAttr.Put( SvxFmtSplitItem( true, RES_PARATR_SPLIT ) );
+                aDlgAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
+                aDlgAttr.Put( SvxFormatSplitItem( true, RES_PARATR_SPLIT ) );
                 aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
                 aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
 
@@ -983,7 +983,7 @@ void SwAnnotationShell::StateClpbrd(SfxItemSet &rSet)
                 {
                     if ( bPastePossible )
                     {
-                        SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+                        SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
                         if ( aDataHelper.HasFormat( SotClipboardFormatId::RTF ) )
                             aFormats.AddClipbrdFormat( SotClipboardFormatId::RTF );
                         aFormats.AddClipbrdFormat( SotClipboardFormatId::STRING );
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 0edb99813184..0a9c64f1f2b3 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -174,7 +174,7 @@ static void lcl_UpdateIMapDlg( SwWrtShell& rSh )
 
     SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
     rSh.GetFlyFrmAttr( aSet );
-    const SwFmtURL &rURL = static_cast<const SwFmtURL&>(aSet.Get( RES_URL ));
+    const SwFormatURL &rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL ));
     SvxIMapDlgChildWindow::UpdateIMapDlg(
             aGrf, rURL.GetMap(), pList.get(), pEditObj );
 }
@@ -298,8 +298,8 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
         case SID_CLIPBOARD_FORMAT_ITEMS:
             {
                 const SfxItemSet* pArgs = rReq.GetArgs();
-                const SfxPoolItem* pFmt;
-                if( pArgs && SfxItemState::SET == pArgs->GetItemState( nId, false, &pFmt ) )
+                const SfxPoolItem* pFormat;
+                if( pArgs && SfxItemState::SET == pArgs->GetItemState( nId, false, &pFormat ) )
                 {
                     TransferableDataHelper aDataHelper(
                         TransferableDataHelper::CreateFromSystemClipboard(
@@ -312,7 +312,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                         SwView* pView = &rView;
 
                         SwTransferable::PasteFormat( rSh, aDataHelper,
-                                        static_cast<SotClipboardFormatId>(static_cast<const SfxUInt32Item*>(pFmt)->GetValue()) );
+                                        static_cast<SotClipboardFormatId>(static_cast<const SfxUInt32Item*>(pFormat)->GetValue()) );
 
                         //Done() has to be called before the shell has been removed
                         rReq.Done();
@@ -364,7 +364,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                     TransferableDataHelper::CreateFromSystemClipboard( &rSh.GetView().GetEditWin()) );
                 if( aDataHelper.GetXTransferable().is()
                     && SwTransferable::IsPaste( rSh, aDataHelper )
-                    && !rSh.CrsrInsideInputFld() )
+                    && !rSh.CrsrInsideInputField() )
                 {
                     // Temporary variables, because the shell could already be
                     // destroyed after the paste.
@@ -436,7 +436,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
 
         case SID_PASTE_SPECIAL:
             if( !GetView().IsPasteSpecialAllowed()
-                || rSh.CrsrInsideInputFld() )
+                || rSh.CrsrInsideInputField() )
             {
                 rSet.DisableItem( nWhich );
             }
@@ -455,9 +455,9 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
                     TransferableDataHelper::CreateFromSystemClipboard(
                                             &rSh.GetView().GetEditWin()) );
 
-                SvxClipboardFmtItem aFmtItem( nWhich );
-                SwTransferable::FillClipFmtItem( rSh, aDataHelper, aFmtItem );
-                rSet.Put( aFmtItem );
+                SvxClipboardFormatItem aFormatItem( nWhich );
+                SwTransferable::FillClipFormatItem( rSh, aDataHelper, aFormatItem );
+                rSet.Put( aFormatItem );
             }
             break;
         }
@@ -600,15 +600,15 @@ void SwBaseShell::Execute(SfxRequest &rReq)
         case FN_UPDATE_FIELDS:
             {
                 rSh.UpdateDocStat();
-                rSh.EndAllTblBoxEdit();
-                rSh.SwViewShell::UpdateFlds(true);
+                rSh.EndAllTableBoxEdit();
+                rSh.SwViewShell::UpdateFields(true);
 
-                if( rSh.IsCrsrInTbl() )
+                if( rSh.IsCrsrInTable() )
                 {
-                    if( !rSh.IsTblComplexForChart() )
+                    if( !rSh.IsTableComplexForChart() )
                         SwTableFUNC( &rSh, false).UpdateChart();
-                    rSh.ClearTblBoxCntnt();
-                    rSh.SaveTblBoxCntnt();
+                    rSh.ClearTableBoxContent();
+                    rSh.SaveTableBoxContent();
                 }
             }
             break;
@@ -638,7 +638,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             break;
 
         case FN_UPDATE_INPUTFIELDS:
-            rSh.UpdateInputFlds();
+            rSh.UpdateInputFields();
             break;
 
         case FN_PREV_BOOKMARK:
@@ -651,10 +651,10 @@ void SwBaseShell::Execute(SfxRequest &rReq)
         case FN_GOTO_NEXT_MARK:
         case FN_GOTO_PREV_MARK:
         {
-            SwFldMgr aFldMgr;
-            SwFieldType* pFldType = aFldMgr.GetFldType(RES_JUMPEDITFLD);
+            SwFieldMgr aFieldMgr;
+            SwFieldType* pFieldType = aFieldMgr.GetFieldType(RES_JUMPEDITFLD);
 
-            if (pFldType)
+            if (pFieldType)
             {
                 if (rSh.IsSelFrmMode())
                 {
@@ -670,8 +670,8 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     rSh.ClearMark();
                     rSh.EndSelect();
                 }
-                bool bRet = rSh.MoveFldType( pFldType, nSlot == FN_GOTO_NEXT_MARK );
-                SwField* pCurField = bRet ? rSh.GetCurFld() : 0;
+                bool bRet = rSh.MoveFieldType( pFieldType, nSlot == FN_GOTO_NEXT_MARK );
+                SwField* pCurField = bRet ? rSh.GetCurField() : 0;
                 if (pCurField)
                     rSh.ClickToField(*pCurField);
                 rReq.SetReturnValue(SfxBoolItem( nSlot, bRet));
@@ -746,9 +746,9 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 const size_t nCurIdx = rSh.GetCurPageDesc();
                 SwPageDesc aPageDesc(rSh.GetPageDesc(nCurIdx));
 
-                SwFrmFmt &rFmt = aPageDesc.GetMaster();
+                SwFrameFormat &rFormat = aPageDesc.GetMaster();
 
-                SwFmtCol aFmtCol = rFmt.GetCol();
+                SwFormatCol aFormatCol = rFormat.GetCol();
 
                 sal_uInt16 nCount;
                 if(SfxItemState::SET == pArgs->GetItemState(nSlot))
@@ -757,11 +757,11 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     nCount = static_cast<const SfxUInt16Item &>(pArgs->Get(SID_ATTR_COLUMNS)).GetValue();
                 sal_uInt16 nGutterWidth = DEF_GUTTER_WIDTH;
 
-                aFmtCol.Init(nCount ? nCount : 1, nGutterWidth, USHRT_MAX);
-                aFmtCol.SetWishWidth(USHRT_MAX);
-                aFmtCol.SetGutterWidth(nGutterWidth, USHRT_MAX);
+                aFormatCol.Init(nCount ? nCount : 1, nGutterWidth, USHRT_MAX);
+                aFormatCol.SetWishWidth(USHRT_MAX);
+                aFormatCol.SetGutterWidth(nGutterWidth, USHRT_MAX);
 
-                rFmt.SetFmtAttr(aFmtCol);
+                rFormat.SetFormatAttr(aFormatCol);
 
                 rSh.ChgPageDesc(nCurIdx, aPageDesc);
             }
@@ -776,15 +776,15 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             sal_Unicode cDelim = 0;
             bool bToTable = false;
             if( nSlot == FN_CONVERT_TEXT_TO_TABLE ||
-                ( nSlot == FN_CONVERT_TEXT_TABLE && 0 == rSh.GetTableFmt() ))
+                ( nSlot == FN_CONVERT_TEXT_TABLE && 0 == rSh.GetTableFormat() ))
                 bToTable = true;
-            SwInsertTableOptions aInsTblOpts( tabopts::ALL_TBL_INS_ATTR, 1 );
-            SwTableAutoFmt const* pTAFmt = 0;
-            boost::scoped_ptr<SwTableAutoFmtTbl> pAutoFmtTbl;
+            SwInsertTableOptions aInsTableOpts( tabopts::ALL_TBL_INS_ATTR, 1 );
+            SwTableAutoFormat const* pTAFormat = 0;
+            boost::scoped_ptr<SwTableAutoFormatTable> pAutoFormatTable;
             bool bDeleteFormat = true;
             if(pArgs && SfxItemState::SET == pArgs->GetItemState( FN_PARAM_1, true, &pItem))
             {
-                aInsTblOpts.mnInsMode = 0;
+                aInsTableOpts.mnInsMode = 0;
                 // Delimiter
                 OUString sDelim = static_cast< const SfxStringItem* >(pItem)->GetValue();
                 if(!sDelim.isEmpty())
@@ -792,17 +792,17 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 // AutoFormat
                 if(SfxItemState::SET == pArgs->GetItemState( FN_PARAM_2, true, &pItem))
                 {
-                    OUString sAutoFmt = static_cast< const SfxStringItem* >(pItem)->GetValue();
+                    OUString sAutoFormat = static_cast< const SfxStringItem* >(pItem)->GetValue();
 
-                    pAutoFmtTbl.reset(new SwTableAutoFmtTbl);
-                    pAutoFmtTbl->Load();
+                    pAutoFormatTable.reset(new SwTableAutoFormatTable);
+                    pAutoFormatTable->Load();
 
-                    for( sal_uInt16 i = 0, nCount = pAutoFmtTbl->size(); i < nCount; i++ )
+                    for( sal_uInt16 i = 0, nCount = pAutoFormatTable->size(); i < nCount; i++ )
                     {
-                        SwTableAutoFmt const*const pFmt = &(*pAutoFmtTbl)[ i ];
-                        if( pFmt->GetName() == sAutoFmt )
+                        SwTableAutoFormat const*const pFormat = &(*pAutoFormatTable)[ i ];
+                        if( pFormat->GetName() == sAutoFormat )
                         {
-                            pTAFmt = pFmt;
+                            pTAFormat = pFormat;
                             bDeleteFormat = false;
                             break;
                         }
@@ -811,19 +811,19 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 //WithHeader
                 if(SfxItemState::SET == pArgs->GetItemState( FN_PARAM_3, true, &pItem) &&
                             static_cast< const SfxBoolItem* >(pItem)->GetValue())
-                    aInsTblOpts.mnInsMode |= tabopts::HEADLINE;
+                    aInsTableOpts.mnInsMode |= tabopts::HEADLINE;
                 // RepeatHeaderLines
                 if(SfxItemState::SET == pArgs->GetItemState( FN_PARAM_4, true, &pItem))
-                   aInsTblOpts.mnRowsToRepeat =
+                   aInsTableOpts.mnRowsToRepeat =
                             (sal_uInt16)static_cast< const SfxInt16Item* >(pItem)->GetValue();
                 //WithBorder
                 if(SfxItemState::SET == pArgs->GetItemState( FN_PARAM_5, true, &pItem) &&
                     static_cast< const SfxBoolItem* >(pItem)->GetValue())
-                    aInsTblOpts.mnInsMode |= tabopts::DEFAULT_BORDER;
+                    aInsTableOpts.mnInsMode |= tabopts::DEFAULT_BORDER;
                 //DontSplitTable
                 if(SfxItemState::SET == pArgs->GetItemState( FN_PARAM_6, true, &pItem) &&
                     !static_cast< const SfxBoolItem* >(pItem)->GetValue() )
-                    aInsTblOpts.mnInsMode |= tabopts::SPLIT_LAYOUT;
+                    aInsTableOpts.mnInsMode |= tabopts::SPLIT_LAYOUT;
             }
             else
             {
@@ -834,7 +834,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 OSL_ENSURE(pDlg, "Dialog creation failed!");
                 if( RET_OK == pDlg->Execute() )
                 {
-                    pDlg->GetValues( cDelim, aInsTblOpts, pTAFmt );
+                    pDlg->GetValues( cDelim, aInsTableOpts, pTAFormat );
 
                 }
             }
@@ -852,12 +852,12 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     aReq.AppendItem( SfxStringItem( FN_PARAM_1, OUString(cDelim) ));
                     if(bToTable)
                     {
-                        if(pTAFmt)
-                            aReq.AppendItem( SfxStringItem( FN_PARAM_2, pTAFmt->GetName()));
-                        aReq.AppendItem( SfxBoolItem ( FN_PARAM_3, 0 != (aInsTblOpts.mnInsMode & tabopts::HEADLINE)));
-                        aReq.AppendItem( SfxInt16Item( FN_PARAM_4, (short)aInsTblOpts.mnRowsToRepeat ));
-                        aReq.AppendItem( SfxBoolItem ( FN_PARAM_5, 0 != (aInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER) ));
-                        aReq.AppendItem( SfxBoolItem ( FN_PARAM_6, !(aInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT)));
+                        if(pTAFormat)
+                            aReq.AppendItem( SfxStringItem( FN_PARAM_2, pTAFormat->GetName()));
+                        aReq.AppendItem( SfxBoolItem ( FN_PARAM_3, 0 != (aInsTableOpts.mnInsMode & tabopts::HEADLINE)));
+                        aReq.AppendItem( SfxInt16Item( FN_PARAM_4, (short)aInsTableOpts.mnRowsToRepeat ));
+                        aReq.AppendItem( SfxBoolItem ( FN_PARAM_5, 0 != (aInsTableOpts.mnInsMode & tabopts::DEFAULT_BORDER) ));
+                        aReq.AppendItem( SfxBoolItem ( FN_PARAM_6, !(aInsTableOpts.mnInsMode & tabopts::SPLIT_LAYOUT)));
                     }
                     aReq.Done();
                 }
@@ -866,7 +866,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     rSh.TableToText( cDelim );
                 else
                 {
-                    bInserted = rSh.TextToTable( aInsTblOpts, cDelim, text::HoriOrientation::FULL, pTAFmt );
+                    bInserted = rSh.TextToTable( aInsTableOpts, cDelim, text::HoriOrientation::FULL, pTAFormat );
                 }
                 rSh.EnterStdMode();
 
@@ -874,7 +874,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     rSaveView.AutoCaption( TABLE_CAP );
             }
             if(bDeleteFormat)
-                delete pTAFmt;
+                delete pTAFormat;
         }
         break;
         case SID_STYLE_WATERCAN:
@@ -930,7 +930,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             {
                     SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
                     rSh.GetFlyFrmAttr( aSet );
-                    SwFmtURL aURL( static_cast<const SwFmtURL&>(aSet.Get( RES_URL )) );
+                    SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
                     aURL.SetMap( &pDlg->GetImageMap() );
                     aSet.Put( aURL );
                     rSh.SetFlyFrmAttr( aSet );
@@ -965,7 +965,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     rSh.StartAction();
                     SfxItemSet aSet( rSh.GetAttrPool(), RES_SURROUND, RES_SURROUND);
                     rSh.GetFlyFrmAttr( aSet );
-                    SwFmtSurround aSur( static_cast<const SwFmtSurround&>(aSet.Get( RES_SURROUND )) );
+                    SwFormatSurround aSur( static_cast<const SwFormatSurround&>(aSet.Get( RES_SURROUND )) );
                     if ( !aSur.IsContour() )
                     {
                         aSur.SetContour( true );
@@ -1016,7 +1016,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 // shall be changed in FEShell::SetFlyFrmAttr/SetFlyFrmAnchor,
                 // possibly as a result of the anchor change.
                 SfxItemSet aSet( GetPool(), RES_VERT_ORIENT, RES_ANCHOR );
-                SwFmtAnchor aAnc( eSet, rSh.GetPhyPageNum() );
+                SwFormatAnchor aAnc( eSet, rSh.GetPhyPageNum() );
                 aSet.Put( aAnc );
                 rSh.SetFlyFrmAttr(aSet);
             }
@@ -1034,9 +1034,9 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 SfxItemSet aSet(GetPool(), RES_SURROUND, RES_HORI_ORIENT);
                 rSh.GetFlyFrmAttr(aSet);
 
-                const SwFmtSurround& rSurround = static_cast<const SwFmtSurround&>(aSet.Get(RES_SURROUND));
-                const SwFmtVertOrient& rVert = static_cast<const SwFmtVertOrient&>(aSet.Get(RES_VERT_ORIENT));
-                const SwFmtHoriOrient& rHori = static_cast<const SwFmtHoriOrient&>(aSet.Get(RES_HORI_ORIENT));
+                const SwFormatSurround& rSurround = static_cast<const SwFormatSurround&>(aSet.Get(RES_SURROUND));
+                const SwFormatVertOrient& rVert = static_cast<const SwFormatVertOrient&>(aSet.Get(RES_VERT_ORIENT));
+                const SwFormatHoriOrient& rHori = static_cast<const SwFormatHoriOrient&>(aSet.Get(RES_HORI_ORIENT));
                 sal_Int16 eVOrient = rVert.GetVertOrient();
                 sal_Int16 eHOrient = rHori.GetHoriOrient();
                 SwSurround eSurround = rSurround.GetSurround();
@@ -1047,37 +1047,37 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 case FLY_AT_PAGE:
                     //Wrap through, left or from left, top, from top
                     if(eSurround != SURROUND_THROUGHT)
-                        aSet.Put(SwFmtSurround(SURROUND_THROUGHT));
+                        aSet.Put(SwFormatSurround(SURROUND_THROUGHT));
 
                     if( eVOrient != text::VertOrientation::TOP && eVOrient != text::VertOrientation::NONE)
-                        aSet.Put(SwFmtVertOrient(0, text::VertOrientation::TOP));
+                        aSet.Put(SwFormatVertOrient(0, text::VertOrientation::TOP));
 
                     if (eHOrient != text::HoriOrientation::NONE && eHOrient != text::HoriOrientation::LEFT)
-                        aSet.Put(SwFmtHoriOrient(0, text::HoriOrientation::LEFT));
+                        aSet.Put(SwFormatHoriOrient(0, text::HoriOrientation::LEFT));
                     break;
 
                 case FLY_AT_PARA:
                     // left, from left, right, top, no wrap, wrap left and right
                     if(eSurround != SURROUND_LEFT || eSurround != SURROUND_RIGHT)
-                        aSet.Put(SwFmtSurround(SURROUND_LEFT));
+                        aSet.Put(SwFormatSurround(SURROUND_LEFT));
 
                     if( eVOrient != text::VertOrientation::TOP)
-                        aSet.Put(SwFmtVertOrient(0, text::VertOrientation::TOP));
+                        aSet.Put(SwFormatVertOrient(0, text::VertOrientation::TOP));
 
                     if (eHOrient != text::HoriOrientation::NONE && eHOrient != text::HoriOrientation::LEFT && eHOrient != text::HoriOrientation::RIGHT)
-                        aSet.Put(SwFmtHoriOrient(0, text::HoriOrientation::LEFT));
+                        aSet.Put(SwFormatHoriOrient(0, text::HoriOrientation::LEFT));
                     break;
 
                 case FLY_AT_CHAR:
                     // left, from left, right, top, wrap through
                     if(eSurround != SURROUND_THROUGHT)
-                        aSet.Put(SwFmtSurround(SURROUND_THROUGHT));
+                        aSet.Put(SwFormatSurround(SURROUND_THROUGHT));
 
                     if( eVOrient != text::VertOrientation::TOP)
-                        aSet.Put(SwFmtVertOrient(0, text::VertOrientation::TOP));
+                        aSet.Put(SwFormatVertOrient(0, text::VertOrientation::TOP));
 
                     if (eHOrient != text::HoriOrientation::NONE && eHOrient != text::HoriOrientation::LEFT && eHOrient != text::HoriOrientation::RIGHT)
-                        aSet.Put(SwFmtHoriOrient(0, text::HoriOrientation::LEFT));
+                        aSet.Put(SwFormatHoriOrient(0, text::HoriOrientation::LEFT));
                     break;
 
                 default:
@@ -1163,8 +1163,8 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             // Tabele cell(s) selected?
             if ( rSh.IsTableMode() )
             {
-                SwFrmFmt *pFmt = rSh.GetTableFmt();
-                pFmt->SetFmtAttr( *pItem );
+                SwFrameFormat *pFormat = rSh.GetTableFormat();
+                pFormat->SetFormatAttr( *pItem );
             }
             else if ( rSh.IsFrmSelected() )
             {
@@ -1281,7 +1281,7 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl)
                 {
                     SfxItemSet aSet(GetPool(), RES_SURROUND, RES_SURROUND);
                     rSh.GetFlyFrmAttr(aSet);
-                    const SwFmtSurround& rWrap = static_cast<const SwFmtSurround&>(aSet.Get(RES_SURROUND));
+                    const SwFormatSurround& rWrap = static_cast<const SwFormatSurround&>(aSet.Get(RES_SURROUND));
                     bSetState = true;
                     bState = rWrap.IsContour();
                 }
@@ -1344,7 +1344,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                 break;
 
             case FN_INSERT_REGION:
-                if( rSh.CrsrInsideInputFld()
+                if( rSh.CrsrInsideInputField()
                     || rSh.IsSelFrmMode()
                     || !rSh.IsInsRegionAvailable() )
                 {
@@ -1356,7 +1356,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
             {
                 FrmTypeFlags eFrmType = rSh.GetFrmType(0,true);
                 if( (eFrmType & FrmTypeFlags::FOOTNOTE) ||
-                    !rSh.GetTableFmt() )
+                    !rSh.GetTableFormat() )
                     rSet.DisableItem( nWhich );
             }
             break;
@@ -1372,7 +1372,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
             {
                 FrmTypeFlags eFrmType = rSh.GetFrmType(0,true);
                 if( (eFrmType & FrmTypeFlags::FOOTNOTE) ||
-                    (!rSh.GetTableFmt() && !rSh.IsTextToTableAvailable() ) )
+                    (!rSh.GetTableFormat() && !rSh.IsTextToTableAvailable() ) )
                     rSet.DisableItem( nWhich );
             }
             break;
@@ -1384,8 +1384,8 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                 // Table cell(s) selected?
                 if ( rSh.IsTableMode() )
                 {
-                    SwFrmFmt *pFmt = rSh.GetTableFmt();
-                    aSet.Put(pFmt->GetFmtAttr( nWhich, true ));
+                    SwFrameFormat *pFormat = rSh.GetTableFormat();
+                    aSet.Put(pFormat->GetFormatAttr( nWhich, true ));
                 }
                 else if( rSh.IsFrmSelected() )
                 {
@@ -1475,7 +1475,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
 
             case FN_BACKSPACE:
             case SID_DELETE:
-                if ( ( rSh.HasReadonlySel() && !rSh.CrsrInsideInputFld() )
+                if ( ( rSh.HasReadonlySel() && !rSh.CrsrInsideInputField() )
                      || rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0 )
                 {
                     rSet.DisableItem( nWhich );
@@ -1566,7 +1566,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                         rSh.GetObjAttr(aSet);
                     else
                         rSh.GetFlyFrmAttr(aSet);
-                    RndStdIds eSet = static_cast<const SwFmtAnchor&>(aSet.Get(RES_ANCHOR)).GetAnchorId();
+                    RndStdIds eSet = static_cast<const SwFormatAnchor&>(aSet.Get(RES_ANCHOR)).GetAnchorId();
                     const bool bSet =
                            ((nWhich == FN_TOOL_ANCHOR_PAGE) &&
                             (eSet == FLY_AT_PAGE))
@@ -1641,9 +1641,9 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                     else
                     {
                         rSh.GetFlyFrmAttr(aSet);
-                        nAnchorType = static_cast<const SwFmtAnchor&>(aSet.Get(RES_ANCHOR)).GetAnchorId();
+                        nAnchorType = static_cast<const SwFormatAnchor&>(aSet.Get(RES_ANCHOR)).GetAnchorId();
                     }
-                    const SwFmtSurround& rWrap = static_cast<const SwFmtSurround&>(aSet.Get(RES_SURROUND));
+                    const SwFormatSurround& rWrap = static_cast<const SwFormatSurround&>(aSet.Get(RES_SURROUND));
 
                     const SvxOpaqueItem& rOpaque = static_cast<const SvxOpaqueItem&>(aSet.Get(RES_OPAQUE));
                     bool bOpaque = rOpaque.GetValue();
@@ -1812,7 +1812,7 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
             rSh.GetObjAttr(aSet);
         else
             rSh.GetFlyFrmAttr(aSet);
-        SwFmtSurround aWrap( static_cast<const SwFmtSurround&>(aSet.Get(RES_SURROUND)) );
+        SwFormatSurround aWrap( static_cast<const SwFormatSurround&>(aSet.Get(RES_SURROUND)) );
         SwSurround nOldSurround(aWrap.GetSurround());
         SwSurround nSurround = SURROUND_PARALLEL;
 
@@ -1932,7 +1932,7 @@ SwBaseShell::~SwBaseShell()
         rView.GetWrtShell().SetGrfArrivedLnk( Link<>() );
 }
 
-void SwBaseShell::ExecTxtCtrl( SfxRequest& rReq )
+void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
 {
     const SfxItemSet *pArgs = rReq.GetArgs();
 
@@ -2039,8 +2039,8 @@ void SwBaseShell::ExecTxtCtrl( SfxRequest& rReq )
             if ( !isCHRATR(nWhich) ||
                  ( rSh.HasSelection() && rSh.IsSelFullPara() ) )
             {
-                SwTxtFmtColl * pColl = rSh.GetCurTxtFmtColl();
-                if ( pColl && pColl->IsAutoUpdateFmt() )
+                SwTextFormatColl * pColl = rSh.GetCurTextFormatColl();
+                if ( pColl && pColl->IsAutoUpdateFormat() )
                 {
                     rSh.AutoUpdatePara( pColl, *pArgs );
                     bAuto = true;
@@ -2058,13 +2058,13 @@ void SwBaseShell::ExecTxtCtrl( SfxRequest& rReq )
     rReq.Done();
 }
 
-void SwBaseShell::GetTxtCtrlState( SfxItemSet& rSet )
+void SwBaseShell::GetTextCtrlState( SfxItemSet& rSet )
 {
     SwWrtShell &rSh = GetShell();
     rSh.GetCurAttr( rSet );
 }
 
-void SwBaseShell::GetTxtFontCtrlState( SfxItemSet& rSet )
+void SwBaseShell::GetTextFontCtrlState( SfxItemSet& rSet )
 {
     SwWrtShell &rSh = GetShell();
     bool bFirst = true;
@@ -2160,7 +2160,7 @@ void SwBaseShell::GetBckColState(SfxItemSet &rSet)
         //UUUU Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
         SfxItemSet aCoreSet(GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
-        aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrmFmt()->GetAttrSet());
+        aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
         if(nSelType & nsSelectionType::SEL_GRF || nsSelectionType::SEL_FRM & nSelType)
         {
@@ -2219,7 +2219,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
         //UUUU Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
         SfxItemSet aCoreSet(GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
-        aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrmFmt()->GetAttrSet());
+        aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
         if((nsSelectionType::SEL_FRM & nSelType) || (nsSelectionType::SEL_GRF & nSelType))
         {
@@ -2278,17 +2278,17 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
         //UUUU Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
         SfxItemSet aCoreSet(GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
 
-        aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrmFmt()->GetAttrSet());
+        aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
         setSvxBrushItemAsFillAttributesToTargetSet(aBrushItem, aCoreSet);
 
         if((nsSelectionType::SEL_FRM & nSelType) || (nsSelectionType::SEL_GRF & nSelType))
         {
             // Template autoupdate
-            SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
+            SwFrameFormat* pFormat = rSh.GetCurFrameFormat();
 
-            if(pFmt && pFmt->IsAutoUpdateFmt())
+            if(pFormat && pFormat->IsAutoUpdateFormat())
             {
-                rSh.AutoUpdateFrame(pFmt, aCoreSet);
+                rSh.AutoUpdateFrame(pFormat, aCoreSet);
             }
             else
             {
@@ -2297,9 +2297,9 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
         }
         else
         {
-            SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
+            SwTextFormatColl* pColl = rSh.GetCurTextFormatColl();
 
-            if(pColl && pColl->IsAutoUpdateFmt())
+            if(pColl && pColl->IsAutoUpdateFormat())
             {
                 rSh.AutoUpdatePara(pColl, aCoreSet);
             }
@@ -2559,12 +2559,12 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
             !rSh.IsTableMode() )
         {
             const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
-            SwInsertTableOptions aInsTblOpts = pModOpt->GetInsTblFlags(bHTMLMode);
+            SwInsertTableOptions aInsTableOpts = pModOpt->GetInsTableFlags(bHTMLMode);
 
             rSh.StartUndo(UNDO_INSTABLE);
             bCallEndUndo = true;
 
-            bool bInserted = rSh.TextToTable( aInsTblOpts, '\t', text::HoriOrientation::FULL );
+            bool bInserted = rSh.TextToTable( aInsTableOpts, '\t', text::HoriOrientation::FULL );
             rSh.EnterStdMode();
             if (bInserted)
                 rTempView.AutoCaption(TABLE_CAP);
@@ -2574,10 +2574,10 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
         {
             sal_uInt16 nCols = 0;
             sal_uInt16 nRows = 0;
-            SwInsertTableOptions aInsTblOpts( tabopts::ALL_TBL_INS_ATTR, 1 );
+            SwInsertTableOptions aInsTableOpts( tabopts::ALL_TBL_INS_ATTR, 1 );
             OUString aTableName;
             OUString aAutoName;
-            SwTableAutoFmt* pTAFmt = 0;
+            SwTableAutoFormat* pTAFormat = 0;
 
             if( pArgs && pArgs->Count() >= 2 )
             {
@@ -2598,13 +2598,13 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
                     aAutoName = pAuto->GetValue();
                     if ( !aAutoName.isEmpty() )
                     {
-                        SwTableAutoFmtTbl aTableTbl;
-                        aTableTbl.Load();
-                        for ( sal_uInt16 n=0; n<aTableTbl.size(); n++ )
+                        SwTableAutoFormatTable aTableTable;
+                        aTableTable.Load();
+                        for ( sal_uInt16 n=0; n<aTableTable.size(); n++ )
                         {
-                            if ( aTableTbl[n].GetName() == aAutoName )
+                            if ( aTableTable[n].GetName() == aAutoName )
                             {
-                                pTAFmt = new SwTableAutoFmt( aTableTbl[n] );
+                                pTAFormat = new SwTableAutoFormat( aTableTable[n] );
                                 break;
                             }
                         }
@@ -2612,11 +2612,11 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
                 }
 
                 if ( pFlags )
-                    aInsTblOpts.mnInsMode = (sal_uInt16) pFlags->GetValue();
+                    aInsTableOpts.mnInsMode = (sal_uInt16) pFlags->GetValue();
                 else
                 {
                     const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
-                    aInsTblOpts = pModOpt->GetInsTblFlags(bHTMLMode);
+                    aInsTableOpts = pModOpt->GetInsTableFlags(bHTMLMode);
                 }
             }
 
@@ -2628,7 +2628,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
                 OSL_ENSURE(pDlg, "Dialog creation failed!");
                 if( RET_OK == pDlg->Execute() )
                 {
-                    pDlg->GetValues( aTableName, nRows, nCols, aInsTblOpts, aAutoName, pTAFmt );
+                    pDlg->GetValues( aTableName, nRows, nCols, aInsTableOpts, aAutoName, pTAFormat );
                 }
                 else
                     _rRequest.Ignore();
@@ -2642,7 +2642,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
                     _rRequest.AppendItem( SfxStringItem( FN_PARAM_2, aAutoName ) );
                 _rRequest.AppendItem( SfxUInt16Item( SID_ATTR_TABLE_COLUMN, nCols ) );
                 _rRequest.AppendItem( SfxUInt16Item( SID_ATTR_TABLE_ROW, nRows ) );
-                _rRequest.AppendItem( SfxInt32Item( FN_PARAM_1, (sal_Int32) aInsTblOpts.mnInsMode ) );
+                _rRequest.AppendItem( SfxInt32Item( FN_PARAM_1, (sal_Int32) aInsTableOpts.mnInsMode ) );
                 _rRequest.Done();
 
                 rSh.StartUndo(UNDO_INSTABLE);
@@ -2652,26 +2652,26 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
                 if( rSh.HasSelection() )
                     rSh.DelRight();
 
-                rSh.InsertTable( aInsTblOpts, nRows, nCols, text::HoriOrientation::FULL, pTAFmt );
+                rSh.InsertTable( aInsTableOpts, nRows, nCols, text::HoriOrientation::FULL, pTAFormat );
                 rSh.MoveTable( fnTablePrev, fnTableStart );
 
-                if( !aTableName.isEmpty() && !rSh.GetTblStyle( aTableName ) )
-                    rSh.GetTableFmt()->SetName( aTableName );
+                if( !aTableName.isEmpty() && !rSh.GetTableStyle( aTableName ) )
+                    rSh.GetTableFormat()->SetName( aTableName );
 
                 rSh.EndAllAction();
                 rTempView.AutoCaption(TABLE_CAP);
             }
-            delete pTAFmt;
+            delete pTAFormat;
         }
 
         if( bCallEndUndo )
         {
             SwRewriter aRewriter;
 
-            if (rSh.GetTableFmt())
+            if (rSh.GetTableFormat())
             {
                 aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_START_QUOTE));
-                aRewriter.AddRule(UndoArg2, rSh.GetTableFmt()->GetName());
+                aRewriter.AddRule(UndoArg2, rSh.GetTableFormat()->GetName());
                 aRewriter.AddRule(UndoArg3, SW_RESSTR(STR_END_QUOTE));
 
             }
@@ -2806,18 +2806,18 @@ void SwBaseShell::ExecuteGallery(SfxRequest &rReq)
                 sal_uInt16 nDesc = rSh.GetCurPageDesc();
                 SwPageDesc aDesc( rSh.GetPageDesc( nDesc ) );
                 if ( nPos == nPagePos )
-                    aDesc.GetMaster().SetFmtAttr( aBrush );
+                    aDesc.GetMaster().SetFormatAttr( aBrush );
                 else if ( nPos == nHeaderPos )
                 {
-                    SwFmtHeader aHead( aDesc.GetMaster().GetHeader() );
-                    aHead.GetHeaderFmt()->SetFmtAttr( aBrush );
-                    aDesc.GetMaster().SetFmtAttr( aHead );
+                    SwFormatHeader aHead( aDesc.GetMaster().GetHeader() );
+                    aHead.GetHeaderFormat()->SetFormatAttr( aBrush );
+                    aDesc.GetMaster().SetFormatAttr( aHead );
                 }
                 else if ( nPos == nFooterPos )
                 {
-                    SwFmtFooter aFoot( aDesc.GetMaster().GetFooter() );
-                    aFoot.GetFooterFmt()->SetFmtAttr( aBrush );
-                    aDesc.GetMaster().SetFmtAttr( aFoot );
+                    SwFormatFooter aFoot( aDesc.GetMaster().GetFooter() );
+                    aFoot.GetFooterFormat()->SetFormatAttr( aBrush );
+                    aDesc.GetMaster().SetFormatAttr( aFoot );
                 }
                 rSh.ChgPageDesc( nDesc, aDesc );
             }
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 80cb4c4b1c49..28c8d9691452 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -369,9 +369,9 @@ void SwDrawShell::Execute(SfxRequest &rReq)
         {
             if (SdrObject* pObj = IsSingleFillableNonOLESelected())
             {
-                SwFrmFmt* pFrmFmt = ::FindFrmFmt(pObj);
-                if (pFrmFmt)
-                    SwTextBoxHelper::create(pFrmFmt);
+                SwFrameFormat* pFrameFormat = ::FindFrameFormat(pObj);
+                if (pFrameFormat)
+                    SwTextBoxHelper::create(pFrameFormat);
             }
             break;
         }
@@ -379,9 +379,9 @@ void SwDrawShell::Execute(SfxRequest &rReq)
         {
             if (SdrObject* pObj = IsSingleFillableNonOLESelected())
             {
-                SwFrmFmt* pFrmFmt = ::FindFrmFmt(pObj);
-                if (pFrmFmt)
-                    SwTextBoxHelper::destroy(pFrmFmt);
+                SwFrameFormat* pFrameFormat = ::FindFrameFormat(pObj);
+                if (pFrameFormat)
+                    SwTextBoxHelper::destroy(pFrameFormat);
             }
             break;
         }
@@ -495,9 +495,9 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
                 bool bDisable = true;
                 if (SdrObject* pObj = IsSingleFillableNonOLESelected())
                 {
-                    SwFrmFmt* pFrmFmt = ::FindFrmFmt(pObj);
+                    SwFrameFormat* pFrameFormat = ::FindFrameFormat(pObj);
                     // Allow creating a TextBox only in case this is a draw format without a TextBox so far.
-                    if (pFrmFmt && pFrmFmt->Which() == RES_DRAWFRMFMT && !SwTextBoxHelper::findTextBox(pFrmFmt))
+                    if (pFrameFormat && pFrameFormat->Which() == RES_DRAWFRMFMT && !SwTextBoxHelper::findTextBox(pFrameFormat))
                     {
                         if (SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pObj))
                         {
@@ -518,9 +518,9 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
                 bool bDisable = true;
                 if (SdrObject* pObj = IsSingleFillableNonOLESelected())
                 {
-                    SwFrmFmt* pFrmFmt = ::FindFrmFmt(pObj);
+                    SwFrameFormat* pFrameFormat = ::FindFrameFormat(pObj);
                     // Allow removing a TextBox only in case it has one.
-                    if (pFrmFmt && SwTextBoxHelper::findTextBox(pFrmFmt))
+                    if (pFrameFormat && SwTextBoxHelper::findTextBox(pFrameFormat))
                         bDisable = false;
                 }
 
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 348fff2b8c79..bf405b084e98 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -233,16 +233,16 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
                         aSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT, pSh->IsFrmVertical(true, bRTL, bVertL2R)));
                         aSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_IN_RTL_TEXT, bRTL));
 
-                        SwFrmFmt* pFrmFmt = FindFrmFmt( pObj );
+                        SwFrameFormat* pFrameFormat = FindFrameFormat( pObj );
 
-                        aSet.Put( pFrmFmt->GetFmtAttr(RES_FOLLOW_TEXT_FLOW) );
+                        aSet.Put( pFrameFormat->GetFormatAttr(RES_FOLLOW_TEXT_FLOW) );
 
-                        SwFmtVertOrient aVOrient(static_cast<const SwFmtVertOrient&>(pFrmFmt->GetFmtAttr(RES_VERT_ORIENT)));
+                        SwFormatVertOrient aVOrient(static_cast<const SwFormatVertOrient&>(pFrameFormat->GetFormatAttr(RES_VERT_ORIENT)));
                         aSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_ORIENT, aVOrient.GetVertOrient()));
                         aSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_RELATION, aVOrient.GetRelationOrient() ));
                         aSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_VERT_POSITION, aVOrient.GetPos()));
 
-                        SwFmtHoriOrient aHOrient(static_cast<const SwFmtHoriOrient&>(pFrmFmt->GetFmtAttr(RES_HORI_ORIENT)));
+                        SwFormatHoriOrient aHOrient(static_cast<const SwFormatHoriOrient&>(pFrameFormat->GetFormatAttr(RES_HORI_ORIENT)));
                         aSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_ORIENT, aHOrient.GetHoriOrient()));
                         aSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_RELATION, aHOrient.GetRelationOrient() ));
                         aSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, aHOrient.IsPosToggle()));
@@ -284,7 +284,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
                                             ->GetValue(), false, bPosCorr );
                                 else
                                 {
-                                    SwFmtAnchor aAnchor(pFrmFmt->GetAnchor());
+                                    SwFormatAnchor aAnchor(pFrameFormat->GetAnchor());
                                     aAnchor.SetType((RndStdIds)static_cast<const SfxInt16Item*>(pAnchorItem)->GetValue());
                                     aFrmAttrSet.Put( aAnchor );
                                 }
@@ -459,10 +459,10 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
                         {
                             pSh->StartAction();
                             SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-                            SwFrmFmt* pFrmFmt = FindFrmFmt( pObj );
-                            SwFmtVertOrient aVOrient(static_cast<const SwFmtVertOrient&>(pFrmFmt->GetFmtAttr(RES_VERT_ORIENT)));
+                            SwFrameFormat* pFrameFormat = FindFrameFormat( pObj );
+                            SwFormatVertOrient aVOrient(static_cast<const SwFormatVertOrient&>(pFrameFormat->GetFormatAttr(RES_VERT_ORIENT)));
                             aVOrient.SetVertOrient( nVertOrient );
-                            pFrmFmt->SetFmtAttr(aVOrient);
+                            pFrameFormat->SetFormatAttr(aVOrient);
                             pSh->EndAction();
                         }
                         break;
@@ -761,20 +761,20 @@ IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation*, pValidation
     // OD 18.09.2003 #i18732# - adjustment for allowing vertical position
     //      aligned to page for fly frame anchored to paragraph or to character.
     const RndStdIds eAnchorType = static_cast<RndStdIds >(pValidation->nAnchorType);
-    const SwPosition* pCntntPos = 0;
+    const SwPosition* pContentPos = 0;
     SdrView*  pSdrView = pSh->GetDrawView();
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     if( rMarkList.GetMarkCount() == 1 )
     {
         SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-        SwFrmFmt* pFrmFmt = FindFrmFmt( pObj );
-        pCntntPos = pFrmFmt->GetAnchor().GetCntntAnchor();
+        SwFrameFormat* pFrameFormat = FindFrameFormat( pObj );
+        pContentPos = pFrameFormat->GetAnchor().GetContentAnchor();
     }
 
     pSh->CalcBoundRect( aBoundRect, eAnchorType,
                            pValidation->nHRelOrient,
                            pValidation->nVRelOrient,
-                           pCntntPos,
+                           pContentPos,
                            pValidation->bFollowTextFlow,
                            pValidation->bMirror, NULL, &pValidation->aPercentSize);
 
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 8ebc76a8651c..57a8b3cb7438 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -415,8 +415,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
                 aDlgAttr.Put(aEditAttr);
 
                 aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) );
-                aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
-                aDlgAttr.Put( SvxFmtSplitItem( true, RES_PARATR_SPLIT ) );
+                aDlgAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
+                aDlgAttr.Put( SvxFormatSplitItem( true, RES_PARATR_SPLIT ) );
                 aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
                 aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
 
@@ -465,8 +465,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             if(pItem)
             {
                 const SvxHyperlinkItem& rHLinkItem = *static_cast<const SvxHyperlinkItem *>(pItem);
-                SvxURLField aFld(rHLinkItem.GetURL(), rHLinkItem.GetName(), SVXURLFORMAT_APPDEFAULT);
-                aFld.SetTargetFrame(rHLinkItem.GetTargetFrame());
+                SvxURLField aField(rHLinkItem.GetURL(), rHLinkItem.GetName(), SVXURLFORMAT_APPDEFAULT);
+                aField.SetTargetFrame(rHLinkItem.GetTargetFrame());
 
                 const SvxFieldItem* pFieldItem = pOLV->GetFieldAtSelection();
 
@@ -477,7 +477,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
                     aSel.nEndPos++;
                     pOLV->SetSelection(aSel);
                 }
-                pOLV->InsertField(SvxFieldItem(aFld, EE_FEATURE_FIELD));
+                pOLV->InsertField(SvxFieldItem(aField, EE_FEATURE_FIELD));
             }
         }
         break;
@@ -878,7 +878,7 @@ ASK_ESCAPE:
     }
 }
 
-void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet)
+void SwDrawTextShell::GetDrawTextCtrlState(SfxItemSet& rSet)
 {
     if (!IsTextEdit())  // Otherwise crash!
         return;
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index e78ef356e430..d42f0e98a2c8 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -89,14 +89,14 @@ using namespace ::com::sun::star::uno;
 
 // Prototypes
 static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine);
-static const SwFrmFmt* lcl_GetFrmFmtByName(SwWrtShell& rSh, const OUString& rName)
+static const SwFrameFormat* lcl_GetFrameFormatByName(SwWrtShell& rSh, const OUString& rName)
 {
     const size_t nCount = rSh.GetFlyCount(FLYCNTTYPE_FRM);
     for( size_t i = 0; i < nCount; ++i )
     {
-        const SwFrmFmt* pFmt = rSh.GetFlyNum(i, FLYCNTTYPE_FRM);
-        if(pFmt->GetName() == rName)
-            return pFmt;
+        const SwFrameFormat* pFormat = rSh.GetFlyNum(i, FLYCNTTYPE_FRM);
+        if(pFormat->GetName() == rName)
+            return pFormat;
     }
     return 0;
 }
@@ -167,7 +167,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
 
                 SfxItemSet aSet(GetPool(),RES_COL,RES_COL);
                 rSh.GetFlyFrmAttr( aSet );
-                SwFmtCol aCol(static_cast<const SwFmtCol&>(aSet.Get(RES_COL)));
+                SwFormatCol aCol(static_cast<const SwFormatCol&>(aSet.Get(RES_COL)));
                 // GutterWidth will not always passed, hence get firstly
                 // (see view2: Execute on this slot)
                 sal_uInt16 nGutterWidth = aCol.GetGutterWidth();
@@ -176,10 +176,10 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                 aCol.Init(nCols, nGutterWidth, aCol.GetWishWidth());
                 aSet.Put(aCol);
                 // Template AutoUpdate
-                SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
-                if(pFmt && pFmt->IsAutoUpdateFmt())
+                SwFrameFormat* pFormat = rSh.GetCurFrameFormat();
+                if(pFormat && pFormat->IsAutoUpdateFormat())
                 {
-                    rSh.AutoUpdateFrame(pFmt, aSet);
+                    rSh.AutoUpdateFrame(pFormat, aSet);
                 }
                 else
                 {
@@ -202,7 +202,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
 
                 SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
                 rSh.GetFlyFrmAttr( aSet );
-                SwFmtURL aURL( static_cast<const SwFmtURL&>(aSet.Get( RES_URL )) );
+                SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
 
                 OUString sOldName(rHLinkItem.GetName().toAsciiUpperCase());
                 OUString sFlyName(rSh.GetFlyName().toAsciiUpperCase());
@@ -232,7 +232,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             break;
 
         case FN_FRAME_UNCHAIN:
-            rSh.Unchain( (SwFrmFmt&)*rSh.GetFlyFrmFmt() );
+            rSh.Unchain( (SwFrameFormat&)*rSh.GetFlyFrameFormat() );
             GetView().GetViewFrame()->GetBindings().Invalidate(FN_FRAME_CHAIN);
             break;
         case FN_FORMAT_FOOTNOTE_DLG:
@@ -266,7 +266,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
 
     SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
     bool bUpdateMgr = true;
-    bool bCopyToFmt = false;
+    bool bCopyToFormat = false;
     switch ( nSlot )
     {
         case SID_OBJECT_ALIGN_MIDDLE:
@@ -329,7 +329,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             if(pArgs)
             {
                 aMgr.SetAttrSet( *pArgs );
-                bCopyToFmt = true;
+                bCopyToFormat = true;
             }
         }
         break;
@@ -339,7 +339,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             if(pArgs && SfxItemState::SET == pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem))
             {
                 aMgr.SetAttrSet( *pArgs );
-                bCopyToFmt = true;
+                bCopyToFormat = true;
             }
         }
         break;
@@ -433,12 +433,12 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                 }
 
                 const SwRect &rPg = rSh.GetAnyCurRect(RECT_PAGE);
-                SwFmtFrmSize aFrmSize(ATT_VAR_SIZE, rPg.Width(), rPg.Height());
+                SwFormatFrmSize aFrmSize(ATT_VAR_SIZE, rPg.Width(), rPg.Height());
                 aFrmSize.SetWhich(GetPool().GetWhich(SID_ATTR_PAGE_SIZE));
                 aSet.Put(aFrmSize);
 
                 const SwRect &rPr = rSh.GetAnyCurRect(RECT_PAGE_PRT);
-                SwFmtFrmSize aPrtSize(ATT_VAR_SIZE, rPr.Width(), rPr.Height());
+                SwFormatFrmSize aPrtSize(ATT_VAR_SIZE, rPr.Width(), rPr.Height());
                 aPrtSize.SetWhich(GetPool().GetWhich(FN_GET_PRINT_AREA));
                 aSet.Put(aPrtSize);
 
@@ -446,7 +446,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                 aSet.SetParent( aMgr.GetAttrSet().GetParent() );
 
                 // On % values initialize size
-                SwFmtFrmSize& rSize = const_cast<SwFmtFrmSize&>(static_cast<const SwFmtFrmSize&>(aSet.Get(RES_FRM_SIZE)));
+                SwFormatFrmSize& rSize = const_cast<SwFormatFrmSize&>(static_cast<const SwFormatFrmSize&>(aSet.Get(RES_FRM_SIZE)));
                 if (rSize.GetWidthPercent() && rSize.GetWidthPercent() != 0xff)
                     rSize.SetWidth(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Width());
                 if (rSize.GetHeightPercent() && rSize.GetHeightPercent() != 0xff)
@@ -502,10 +502,10 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                             rSh.SetObjTitle(static_cast<const SfxStringItem*>(pItem)->GetValue());
                         }
                         // Template AutoUpdate
-                        SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
-                        if(pFmt && pFmt->IsAutoUpdateFmt())
+                        SwFrameFormat* pFormat = rSh.GetCurFrameFormat();
+                        if(pFormat && pFormat->IsAutoUpdateFormat())
                         {
-                            rSh.AutoUpdateFrame(pFmt, *pOutSet);
+                            rSh.AutoUpdateFrame(pFormat, *pOutSet);
                             // Anything which is not supported by the format must be set hard.
                             if(SfxItemState::SET == pOutSet->GetItemState(FN_SET_FRM_NAME, false, &pItem))
                                 rSh.SetFlyName(static_cast<const SfxStringItem*>(pItem)->GetValue());
@@ -522,7 +522,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                         else
                             aMgr.SetAttrSet( *pOutSet );
 
-                        const SwFrmFmt* pCurrFlyFmt = rSh.GetFlyFrmFmt();
+                        const SwFrameFormat* pCurrFlyFormat = rSh.GetFlyFrameFormat();
                         if(SfxItemState::SET ==
                            pOutSet->GetItemState(FN_PARAM_CHAIN_PREVIOUS,
                                                  false, &pItem))
@@ -531,15 +531,15 @@ void SwFrameShell::Execute(SfxRequest &rReq)
 
                             OUString sPrevName =
                                 static_cast<const SfxStringItem*>(pItem)->GetValue();
-                            const SwFmtChain &rChain = pCurrFlyFmt->GetChain();
+                            const SwFormatChain &rChain = pCurrFlyFormat->GetChain();
                             //needs cast - no non-const method available
-                            SwFlyFrmFmt* pFlyFmt =
+                            SwFlyFrameFormat* pFlyFormat =
                                 rChain.GetPrev();
-                            if(pFlyFmt)
+                            if(pFlyFormat)
                             {
-                                if (pFlyFmt->GetName() != sPrevName)
+                                if (pFlyFormat->GetName() != sPrevName)
                                 {
-                                    rSh.Unchain(*pFlyFmt);
+                                    rSh.Unchain(*pFlyFormat);
                                 }
                                 else
                                     sPrevName.clear();
@@ -548,12 +548,12 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                             if (!sPrevName.isEmpty())
                             {
                                 //needs cast - no non-const method available
-                                SwFrmFmt* pPrevFmt = const_cast<SwFrmFmt*>(
-                                    lcl_GetFrmFmtByName(rSh, sPrevName));
-                                SAL_WARN_IF(!pPrevFmt, "sw.ui", "No frame found!");
-                                if(pPrevFmt)
+                                SwFrameFormat* pPrevFormat = const_cast<SwFrameFormat*>(
+                                    lcl_GetFrameFormatByName(rSh, sPrevName));
+                                SAL_WARN_IF(!pPrevFormat, "sw.ui", "No frame found!");
+                                if(pPrevFormat)
                                 {
-                                    rSh.Chain(*pPrevFmt, *pCurrFlyFmt);
+                                    rSh.Chain(*pPrevFormat, *pCurrFlyFormat);
                                 }
                             }
                             rSh.SetChainMarker();
@@ -565,15 +565,15 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                             rSh.HideChainMarker();
                             OUString sNextName =
                                 static_cast<const SfxStringItem*>(pItem)->GetValue();
-                            const SwFmtChain &rChain = pCurrFlyFmt->GetChain();
+                            const SwFormatChain &rChain = pCurrFlyFormat->GetChain();
                             //needs cast - no non-const method available
-                            SwFlyFrmFmt* pFlyFmt =
+                            SwFlyFrameFormat* pFlyFormat =
                                 rChain.GetNext();
-                            if(pFlyFmt)
+                            if(pFlyFormat)
                             {
-                                if (pFlyFmt->GetName() != sNextName)
+                                if (pFlyFormat->GetName() != sNextName)
                                 {
-                                    rSh.Unchain(*const_cast<SwFlyFrmFmt*>(static_cast<const SwFlyFrmFmt*>( pCurrFlyFmt)));
+                                    rSh.Unchain(*const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>( pCurrFlyFormat)));
                                 }
                                 else
                                     sNextName.clear();
@@ -582,13 +582,13 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                             if (!sNextName.isEmpty())
                             {
                                 //needs cast - no non-const method available
-                                SwFrmFmt* pNextFmt = const_cast<SwFrmFmt*>(
-                                    lcl_GetFrmFmtByName(rSh, sNextName));
-                                SAL_WARN_IF(!pNextFmt, "sw.ui", "No frame found!");
-                                if(pNextFmt)
+                                SwFrameFormat* pNextFormat = const_cast<SwFrameFormat*>(
+                                    lcl_GetFrameFormatByName(rSh, sNextName));
+                                SAL_WARN_IF(!pNextFormat, "sw.ui", "No frame found!");
+                                if(pNextFormat)
                                 {
-                                    rSh.Chain(*const_cast<SwFrmFmt*>(
-                                              pCurrFlyFmt), *pNextFmt);
+                                    rSh.Chain(*const_cast<SwFrameFormat*>(
+                                              pCurrFlyFormat), *pNextFormat);
                                 }
                             }
                             rSh.SetChainMarker();
@@ -602,13 +602,13 @@ void SwFrameShell::Execute(SfxRequest &rReq)
         break;
         case FN_FRAME_MIRROR_ON_EVEN_PAGES:
         {
-            SwFmtHoriOrient aHori(aMgr.GetHoriOrient());
+            SwFormatHoriOrient aHori(aMgr.GetHoriOrient());
             bool bMirror = !aHori.IsPosToggle();
             aHori.SetPosToggle(bMirror);
             SfxItemSet aSet(GetPool(), RES_HORI_ORIENT, RES_HORI_ORIENT);
             aSet.Put(aHori);
             aMgr.SetAttrSet(aSet);
-            bCopyToFmt = true;
+            bCopyToFormat = true;
             rReq.SetReturnValue(SfxBoolItem(nSlot, bMirror));
         }
         break;
@@ -648,10 +648,10 @@ void SwFrameShell::Execute(SfxRequest &rReq)
     }
     if ( bUpdateMgr )
     {
-        SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
-        if ( bCopyToFmt && pFmt && pFmt->IsAutoUpdateFmt() )
+        SwFrameFormat* pFormat = rSh.GetCurFrameFormat();
+        if ( bCopyToFormat && pFormat && pFormat->IsAutoUpdateFormat() )
         {
-            rSh.AutoUpdateFrame(pFmt, aMgr.GetAttrSet());
+            rSh.AutoUpdateFrame(pFormat, aMgr.GetAttrSet());
         }
         else
         {
@@ -691,7 +691,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
             {
                 case RES_FRM_SIZE:
                 {
-                    SwFmtFrmSize aSz(aMgr.GetFrmSize());
+                    SwFormatFrmSize aSz(aMgr.GetFrmSize());
                     rSet.Put(aSz);
                 }
                 break;
@@ -770,10 +770,10 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
                             {
                                 if (aMgr.GetAnchor() == FLY_AT_FLY)
                                 {
-                                    const SwFrmFmt* pFmt = rSh.IsFlyInFly();
-                                    if (pFmt)
+                                    const SwFrameFormat* pFormat = rSh.IsFlyInFly();
+                                    if (pFormat)
                                     {
-                                        const SwFmtFrmSize& rFrmSz = pFmt->GetFrmSize();
+                                        const SwFormatFrmSize& rFrmSz = pFormat->GetFrmSize();
                                         if (rFrmSz.GetHeightSizeType() != ATT_FIX_SIZE)
                                         {
                                             rSet.DisableItem( nWhich );
@@ -809,9 +809,9 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
 
                     if(SfxItemState::SET == aURLSet.GetItemState(RES_URL, true, &pItem))
                     {
-                        const SwFmtURL* pFmtURL = static_cast<const SwFmtURL*>(pItem);
-                        aHLinkItem.SetURL(pFmtURL->GetURL());
-                        aHLinkItem.SetTargetFrame(pFmtURL->GetTargetFrameName());
+                        const SwFormatURL* pFormatURL = static_cast<const SwFormatURL*>(pItem);
+                        aHLinkItem.SetURL(pFormatURL->GetURL());
+                        aHLinkItem.SetTargetFrame(pFormatURL->GetTargetFrameName());
                         aHLinkItem.SetName(rSh.GetFlyName());
                     }
 
@@ -829,9 +829,9 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
                         rSet.DisableItem( FN_FRAME_CHAIN );
                     else
                     {
-                        const SwFrmFmt *pFmt = rSh.GetFlyFrmFmt();
+                        const SwFrameFormat *pFormat = rSh.GetFlyFrameFormat();
                         if ( bParentCntProt || rSh.GetView().GetEditWin().GetApplyTemplate() ||
-                             !pFmt || pFmt->GetChain().GetNext() )
+                             !pFormat || pFormat->GetChain().GetNext() )
                         {
                             rSet.DisableItem( FN_FRAME_CHAIN );
                         }
@@ -850,9 +850,9 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
                         rSet.DisableItem( FN_FRAME_UNCHAIN );
                     else
                     {
-                        const SwFrmFmt *pFmt = rSh.GetFlyFrmFmt();
+                        const SwFrameFormat *pFormat = rSh.GetFlyFrameFormat();
                         if ( bParentCntProt || rSh.GetView().GetEditWin().GetApplyTemplate() ||
-                             !pFmt || !pFmt->GetChain().GetNext() )
+                             !pFormat || !pFormat->GetChain().GetNext() )
                         {
                             rSet.DisableItem( FN_FRAME_UNCHAIN );
                         }
@@ -1115,10 +1115,10 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
     }
     aFrameSet.Put( aBoxItem );
     // Template AutoUpdate
-    SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
-    if(pFmt && pFmt->IsAutoUpdateFmt())
+    SwFrameFormat* pFormat = rSh.GetCurFrameFormat();
+    if(pFormat && pFormat->IsAutoUpdateFormat())
     {
-        rSh.AutoUpdateFrame(pFmt, aFrameSet);
+        rSh.AutoUpdateFrame(pFormat, aFrameSet);
     }
     else
         rSh.SetFlyFrmAttr( aFrameSet );
@@ -1169,7 +1169,7 @@ void  SwFrameShell::StateInsert(SfxItemSet &rSet)
     {
         rSet.DisableItem(FN_INSERT_FRAME);
     }
-    else if ( GetShell().CrsrInsideInputFld() )
+    else if ( GetShell().CrsrInsideInputField() )
     {
         rSet.DisableItem(FN_INSERT_FRAME);
     }
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 86f76c2385a6..39e18fd1ee08 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -259,7 +259,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) );
 
             const SwRect* pRect = &rSh.GetAnyCurRect(RECT_PAGE);
-            SwFmtFrmSize aFrmSize( ATT_VAR_SIZE, pRect->Width(), pRect->Height());
+            SwFormatFrmSize aFrmSize( ATT_VAR_SIZE, pRect->Width(), pRect->Height());
             aFrmSize.SetWhich( GetPool().GetWhich( SID_ATTR_PAGE_SIZE ) );
             aSet.Put( aFrmSize );
 
@@ -280,7 +280,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             aSet.SetParent( aMgr.GetAttrSet().GetParent() );
 
             // At percentage values initialize size
-            SwFmtFrmSize aSizeCopy = static_cast<const SwFmtFrmSize&>(aSet.Get(RES_FRM_SIZE));
+            SwFormatFrmSize aSizeCopy = static_cast<const SwFormatFrmSize&>(aSet.Get(RES_FRM_SIZE));
             if (aSizeCopy.GetWidthPercent() && aSizeCopy.GetWidthPercent() != 0xff)
                 aSizeCopy.SetWidth(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Width());
             if (aSizeCopy.GetHeightPercent() && aSizeCopy.GetHeightPercent() != 0xff)
@@ -365,7 +365,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                 if( SfxItemState::SET == pSet->GetItemState(
                                 SID_ATTR_GRAF_FRMSIZE, false, &pItem ))
                 {
-                    SwFmtFrmSize aSize;
+                    SwFormatFrmSize aSize;
                     const Size& rSz = static_cast<const SvxSizeItem*>(pItem)->GetSize();
                     aSize.SetWidth( rSz.Width() );
                     aSize.SetHeight( rSz.Height() );
@@ -381,10 +381,10 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                 }
 
                 // Templates AutoUpdate
-                SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
-                if(pFmt && pFmt->IsAutoUpdateFmt())
+                SwFrameFormat* pFormat = rSh.GetCurFrameFormat();
+                if(pFormat && pFormat->IsAutoUpdateFormat())
                 {
-                    pFmt->SetFmtAttr(*pSet);
+                    pFormat->SetFormatAttr(*pSet);
                     SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE,   RES_FRM_SIZE,
                                                     RES_SURROUND,   RES_SURROUND,
                                                     RES_ANCHOR,     RES_ANCHOR,
@@ -646,10 +646,10 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
 void SwGrfShell::GetAttrState(SfxItemSet &rSet)
 {
     SwWrtShell &rSh = GetShell();
-    SfxItemSet aCoreSet( GetPool(), aNoTxtNodeSetRange );
+    SfxItemSet aCoreSet( GetPool(), aNoTextNodeSetRange );
     rSh.GetCurAttr( aCoreSet );
     bool bParentCntProt = 0 != rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT );
-    bool bIsGrfCntnt = CNT_GRF == GetShell().GetCntType();
+    bool bIsGrfContent = CNT_GRF == GetShell().GetCntType();
 
     SetGetStateSet( &rSet );
 
@@ -663,10 +663,10 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
         case SID_INSERT_GRAPHIC:
         case FN_FORMAT_GRAFIC_DLG:
         case SID_TWAIN_TRANSFER:
-            if( bParentCntProt || !bIsGrfCntnt )
+            if( bParentCntProt || !bIsGrfContent )
                 bDisable = true;
             else if ( nWhich == SID_INSERT_GRAPHIC
-                      && rSh.CrsrInsideInputFld() )
+                      && rSh.CrsrInsideInputField() )
             {
                 bDisable = true;
             }
@@ -680,7 +680,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
 
         case SID_COLOR_SETTINGS:
         {
-            if ( bParentCntProt || !bIsGrfCntnt )
+            if ( bParentCntProt || !bIsGrfContent )
                 bDisable = true;
             else
             {
@@ -790,7 +790,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
         case SID_GRFFILTER_SEPIA:
         case SID_GRFFILTER_SOLARIZE:
             {
-                if( bParentCntProt || !bIsGrfCntnt )
+                if( bParentCntProt || !bIsGrfContent )
                     bDisable = true;
                 // #i59688# load graphic only if type is unknown
                 else
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index 2b386bd07d0c..8c45ea30f451 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -109,18 +109,18 @@ namespace SwLangHelper
         EditEngine * pEditEngine = rEditView.GetEditEngine();
 
         // get the language
-        OUString aNewLangTxt;
+        OUString aNewLangText;
 
         SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_LANGUAGE_STATUS , false );
         if (pItem)
-            aNewLangTxt = pItem->GetValue();
+            aNewLangText = pItem->GetValue();
 
         //!! Remember the view frame right now...
         //!! (call to GetView().GetViewFrame() will break if the
         //!! SwTextShell got destroyed meanwhile.)
         SfxViewFrame *pViewFrame = rView.GetViewFrame();
 
-        if (aNewLangTxt == "*" )
+        if (aNewLangText == "*" )
         {
             // open the dialog "Tools/Options/Language Settings - Language"
             SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
@@ -133,7 +133,7 @@ namespace SwLangHelper
         else
         {
             // setting the new language...
-            if (!aNewLangTxt.isEmpty())
+            if (!aNewLangText.isEmpty())
             {
                 const OUString aSelectionLangPrefix("Current_");
                 const OUString aParagraphLangPrefix("Paragraph_");
@@ -144,23 +144,23 @@ namespace SwLangHelper
                 sal_Int32 nPos = 0;
                 bool bForSelection = true;
                 bool bForParagraph = false;
-                if (-1 != (nPos = aNewLangTxt.indexOf( aSelectionLangPrefix, 0 )))
+                if (-1 != (nPos = aNewLangText.indexOf( aSelectionLangPrefix, 0 )))
                 {
                     // ... for the current selection
-                    aNewLangTxt = aNewLangTxt.replaceAt(nPos, aSelectionLangPrefix.getLength(), "");
+                    aNewLangText = aNewLangText.replaceAt(nPos, aSelectionLangPrefix.getLength(), "");
                     bForSelection = true;
                 }
-                else if (-1 != (nPos = aNewLangTxt.indexOf( aParagraphLangPrefix , 0 )))
+                else if (-1 != (nPos = aNewLangText.indexOf( aParagraphLangPrefix , 0 )))
                 {
                     // ... for the current paragraph language
-                    aNewLangTxt = aNewLangTxt.replaceAt(nPos, aParagraphLangPrefix.getLength(), "");
+                    aNewLangText = aNewLangText.replaceAt(nPos, aParagraphLangPrefix.getLength(), "");
                     bForSelection = true;
                     bForParagraph = true;
                 }
-                else if (-1 != (nPos = aNewLangTxt.indexOf( aDocumentLangPrefix , 0 )))
+                else if (-1 != (nPos = aNewLangText.indexOf( aDocumentLangPrefix , 0 )))
                 {
                     // ... as default document language
-                    aNewLangTxt = aNewLangTxt.replaceAt(nPos, aDocumentLangPrefix.getLength(), "");
+                    aNewLangText = aNewLangText.replaceAt(nPos, aDocumentLangPrefix.getLength(), "");
                     bForSelection = false;
                 }
 
@@ -181,12 +181,12 @@ namespace SwLangHelper
                     rSh.ExtendedSelectAll();
                 }
 
-                if (aNewLangTxt == aStrNone)
+                if (aNewLangText == aStrNone)
                     SwLangHelper::SetLanguage_None( rSh, pOLV, aSelection, bForSelection, aEditAttr );
-                else if (aNewLangTxt == aStrResetLangs)
+                else if (aNewLangText == aStrResetLangs)
                     SwLangHelper::ResetLanguages( rSh, pOLV, aSelection, bForSelection );
                 else
-                    SwLangHelper::SetLanguage( rSh, pOLV, aSelection, aNewLangTxt, bForSelection, aEditAttr );
+                    SwLangHelper::SetLanguage( rSh, pOLV, aSelection, aNewLangText, bForSelection, aEditAttr );
 
                 // ugly hack, as it seems that EditView/EditEngine does not update their spellchecking marks
                 // when setting a new language attribute
@@ -285,19 +285,19 @@ namespace SwLangHelper
 
                     //Resolves: fdo#35282 Clear the language from all Text Styles, and
                     //fallback to default document language
-                    const SwTxtFmtColls *pColls = rWrtSh.GetDoc()->GetTxtFmtColls();
+                    const SwTextFormatColls *pColls = rWrtSh.GetDoc()->GetTextFormatColls();
                     for(size_t i = 0, nCount = pColls->size(); i < nCount; ++i)
                     {
-                        SwTxtFmtColl &rTxtColl = *(*pColls)[ i ];
-                        rTxtColl.ResetFmtAttr(nLangWhichId);
+                        SwTextFormatColl &rTextColl = *(*pColls)[ i ];
+                        rTextColl.ResetFormatAttr(nLangWhichId);
                     }
                     //Resolves: fdo#35282 Clear the language from all Character Styles,
                     //and fallback to default document language
-                    const SwCharFmts *pCharFmts = rWrtSh.GetDoc()->GetCharFmts();
-                    for(size_t i = 0, nCount = pCharFmts->size(); i < nCount; ++i)
+                    const SwCharFormats *pCharFormats = rWrtSh.GetDoc()->GetCharFormats();
+                    for(size_t i = 0, nCount = pCharFormats->size(); i < nCount; ++i)
                     {
-                        SwCharFmt &rCharFmt = *(*pCharFmts)[ i ];
-                        rCharFmt.ResetFmtAttr(nLangWhichId);
+                        SwCharFormat &rCharFormat = *(*pCharFormats)[ i ];
+                        rCharFormat.ResetFormatAttr(nLangWhichId);
                     }
 
                     // #i102191: hard set respective language attribute in text document
@@ -541,10 +541,10 @@ namespace SwLangHelper
         // string for guessing language
         OUString aText;
         SwPaM *pCrsr = rSh.GetCrsr();
-        SwTxtNode *pNode = pCrsr->GetNode().GetTxtNode();
+        SwTextNode *pNode = pCrsr->GetNode().GetTextNode();
         if (pNode)
         {
-            aText = pNode->GetTxt();
+            aText = pNode->GetText();
             if (!aText.isEmpty())
             {
                 sal_Int32 nEnd = pCrsr->GetPoint()->nContent.GetIndex();
@@ -596,9 +596,9 @@ namespace SwLangHelper
         if (!rWrtSh.IsEndPara())
             rWrtSh.MovePara( fnParaCurr, fnParaEnd );
     #if OSL_DEBUG_LEVEL > 1
-        OUString aSelTxt;
-        rWrtSh.GetSelectedText( aSelTxt );
-        (void) aSelTxt;
+        OUString aSelText;
+        rWrtSh.GetSelectedText( aSelText );
+        (void) aSelText;
     #endif
     }
 }
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index a92c5e850170..4d02524c75ce 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -261,7 +261,7 @@ void SwListShell::GetState(SfxItemSet &rSet)
             break;
 
             case FN_NUM_BULLET_NONUM:
-                if ( rSh.CrsrInsideInputFld() )
+                if ( rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem(nWhich);
                 }
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 7f0028122917..55abe1001d4f 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -138,26 +138,26 @@ static void lcl_SetAttr( SwWrtShell &rSh, const SfxPoolItem &rItem )
 {
     SfxItemSet aSet( rSh.GetView().GetPool(), rItem.Which(), rItem.Which(), 0);
     aSet.Put( rItem );
-    rSh.SetTblAttr( aSet );
+    rSh.SetTableAttr( aSet );
 }
 
 static SwTableRep*  lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
 {
-    SwFrmFmt *pFmt = rSh.GetTableFmt();
+    SwFrameFormat *pFormat = rSh.GetTableFormat();
     SwTabCols aCols;
     rSh.GetTabCols( aCols );
 
     //At first get the simple attributes.
-    rSet.Put( SfxStringItem( FN_PARAM_TABLE_NAME, pFmt->GetName()));
+    rSet.Put( SfxStringItem( FN_PARAM_TABLE_NAME, pFormat->GetName()));
     rSet.Put( SfxUInt16Item( FN_PARAM_TABLE_HEADLINE, rSh.GetRowsToRepeat() ) );
-    rSet.Put( pFmt->GetShadow() );
+    rSet.Put( pFormat->GetShadow() );
     rSet.Put(SfxUInt16Item(FN_TABLE_SET_VERT_ALIGN, rSh.GetBoxAlign()));
-    rSet.Put( pFmt->GetFrmDir() );
+    rSet.Put( pFormat->GetFrmDir() );
 
-    SvxULSpaceItem aULSpace( pFmt->GetULSpace() );
+    SvxULSpaceItem aULSpace( pFormat->GetULSpace() );
     rSet.Put( aULSpace );
 
-    const sal_uInt16  nBackgroundDestination = rSh.GetViewOptions()->GetTblDest();
+    const sal_uInt16  nBackgroundDestination = rSh.GetViewOptions()->GetTableDest();
     rSet.Put(SwBackgroundDestinationItem(SID_BACKGRND_DESTINATION, nBackgroundDestination ));
     SvxBrushItem aBrush( RES_BACKGROUND );
     if(rSh.GetRowBackground(aBrush))
@@ -201,7 +201,7 @@ static SwTableRep*  lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
     rSh.GetTabBorders( rSet );
 
     //row split
-    SwFmtRowSplit* pSplit = 0;
+    SwFormatRowSplit* pSplit = 0;
     rSh.GetRowSplit(pSplit);
     if(pSplit)
     {
@@ -225,13 +225,13 @@ static SwTableRep*  lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
     pRep->SetSpace(aCols.GetRightMax());
 
     sal_uInt16 nPercent = 0;
-    long nWidth = ::GetTableWidth(pFmt, aCols, &nPercent, &rSh );
+    long nWidth = ::GetTableWidth(pFormat, aCols, &nPercent, &rSh );
     // The table width is wrong for relative values.
     if(nPercent)
         nWidth = pRep->GetSpace() * nPercent / 100;
-    const sal_uInt16 nAlign = pFmt->GetHoriOrient().GetHoriOrient();
+    const sal_uInt16 nAlign = pFormat->GetHoriOrient().GetHoriOrient();
     pRep->SetAlign(nAlign);
-    SvxLRSpaceItem aLRSpace( pFmt->GetLRSpace() );
+    SvxLRSpaceItem aLRSpace( pFormat->GetLRSpace() );
     SwTwips nLeft = aLRSpace.GetLeft();
     SwTwips nRight = aLRSpace.GetRight();
     SwTwips nDiff = pRep->GetSpace() - nRight - nLeft - nWidth;
@@ -279,7 +279,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
     if(SfxItemState::SET == rSet.GetItemState(SID_BACKGRND_DESTINATION, false, &pItem))
     {
         SwViewOption aUsrPref( *rSh.GetViewOptions() );
-        aUsrPref.SetTblDest((sal_uInt8)static_cast<const SfxUInt16Item*>(pItem)->GetValue());
+        aUsrPref.SetTableDest((sal_uInt8)static_cast<const SfxUInt16Item*>(pItem)->GetValue());
         SW_MOD()->ApplyUsrPref(aUsrPref, &rSh.GetView());
     }
     bool bBorder = ( SfxItemState::SET == rSet.GetItemState( RES_BOX ) ||
@@ -338,7 +338,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
 
             if(bRowSplit)
             {
-                rSh.SetRowSplit(*static_cast<const SwFmtRowSplit*>(pSplit));
+                rSh.SetRowSplit(*static_cast<const SwFormatRowSplit*>(pSplit));
             }
 
             if(!bTableSel)
@@ -354,7 +354,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
     SwTabCols aTabCols;
     bool bTabCols = false;
     SwTableRep* pRep = 0;
-    SwFrmFmt *pFmt = rSh.GetTableFmt();
+    SwFrameFormat *pFormat = rSh.GetTableFormat();
     SfxItemSet aSet( rSh.GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
     if(SfxItemState::SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem ))
     {
@@ -363,13 +363,13 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
         const SwTwips nWidth = pRep->GetWidth();
         if ( text::HoriOrientation::FULL == pRep->GetAlign() )
         {
-            SwFmtHoriOrient aAttr( pFmt->GetHoriOrient() );
+            SwFormatHoriOrient aAttr( pFormat->GetHoriOrient() );
             aAttr.SetHoriOrient( text::HoriOrientation::FULL );
             aSet.Put( aAttr );
         }
         else
         {
-            SwFmtFrmSize aSz( ATT_VAR_SIZE, nWidth );
+            SwFormatFrmSize aSz( ATT_VAR_SIZE, nWidth );
             if(pRep->GetWidthPercent())
             {
                 aSz.SetWidthPercent( (sal_uInt8)pRep->GetWidthPercent() );
@@ -383,7 +383,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
         aSet.Put( aLRSpace );
 
         sal_Int16 eOrient = pRep->GetAlign();
-        SwFmtHoriOrient aAttr( 0, eOrient );
+        SwFormatHoriOrient aAttr( 0, eOrient );
         aSet.Put( aAttr );
         // The item must only be recorded while manual alignment, so that the
         // alignment is not overwritten by the distances while recording.
@@ -403,7 +403,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
         rSh.SetBoxAlign(static_cast<const SfxUInt16Item*>((pItem))->GetValue());
 
     if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_TABLE_NAME, false, &pItem ))
-        rSh.SetTableName( *pFmt, static_cast<const SfxStringItem*>(pItem)->GetValue() );
+        rSh.SetTableName( *pFormat, static_cast<const SfxStringItem*>(pItem)->GetValue() );
 
     // Copy the chosen attributes in the ItemSet.
     static const sal_uInt16 aIds[] =
@@ -425,7 +425,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
             aSet.Put( *pItem );
 
     if( aSet.Count() )
-        rSh.SetTblAttr( aSet );
+        rSh.SetTableAttr( aSet );
 
     if(bTabCols)
     {
@@ -561,11 +561,11 @@ void SwTableShell::Execute(SfxRequest &rReq)
 
             FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &rSh.GetView()));
             SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
-            boost::scoped_ptr<SwTableRep> pTblRep(::lcl_TableParamToItemSet( aCoreSet, rSh ));
+            boost::scoped_ptr<SwTableRep> pTableRep(::lcl_TableParamToItemSet( aCoreSet, rSh ));
 
             aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
-            rSh.GetTblAttr(aCoreSet);
-            // GetTblAttr overwrites the background!
+            rSh.GetTableAttr(aCoreSet);
+            // GetTableAttr overwrites the background!
             SvxBrushItem aBrush( RES_BACKGROUND );
             if(rSh.GetBoxBackground(aBrush))
                 aCoreSet.Put( aBrush );
@@ -598,7 +598,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
             }
 
             pDlg.reset();
-            pTblRep.reset();
+            pTableRep.reset();
             rBindings.Update(SID_RULER_BORDERS);
             rBindings.Update(SID_ATTR_TABSTOP);
             rBindings.Update(SID_RULER_BORDERS_VERTICAL);
@@ -628,7 +628,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
                                     RES_BOXATR_FORMAT, RES_BOXATR_FORMAT,
                                     RES_BOXATR_VALUE, RES_BOXATR_VALUE,
                                     0 );
-                rSh.GetTblBoxFormulaAttrs( aBoxSet );
+                rSh.GetTableBoxFormulaAttrs( aBoxSet );
 
                 SfxItemState eState = aBoxSet.GetItemState(RES_BOXATR_FORMAT);
                 if(eState == SfxItemState::DEFAULT)
@@ -638,12 +638,12 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 }
                 else
                     aCoreSet.Put( SfxUInt32Item( SID_ATTR_NUMBERFORMAT_VALUE,
-                                    static_cast<const SwTblBoxNumFormat&>(aBoxSet.Get(
+                                    static_cast<const SwTableBoxNumFormat&>(aBoxSet.Get(
                                     RES_BOXATR_FORMAT )).GetValue() ));
 
                 OUString sCurText( rSh.GetTableBoxText() );
                 aCoreSet.Put( SvxNumberInfoItem( pFormatter,
-                                    static_cast<const SwTblBoxValue&>(aBoxSet.Get(
+                                    static_cast<const SwTableBoxValue&>(aBoxSet.Get(
                                         RES_BOXATR_VALUE)).GetValue(),
                                     sCurText, SID_ATTR_NUMBERFORMAT_INFO ));
 
@@ -675,9 +675,9 @@ void SwTableShell::Execute(SfxRequest &rReq)
                     {
                         SfxItemSet aBoxFormatSet( *aCoreSet.GetPool(),
                                     RES_BOXATR_FORMAT, RES_BOXATR_FORMAT );
-                        aBoxFormatSet.Put( SwTblBoxNumFormat(
+                        aBoxFormatSet.Put( SwTableBoxNumFormat(
                                 static_cast<const SfxUInt32Item*>(pNumberFormatItem)->GetValue() ));
-                        rSh.SetTblBoxFormulaAttrs( aBoxFormatSet );
+                        rSh.SetTableBoxFormulaAttrs( aBoxFormatSet );
 
                     }
                 }
@@ -690,7 +690,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
             break;
         case FN_TABLE_OPTIMAL_HEIGHT:
         {
-            const SwFmtFrmSize aSz;
+            const SwFormatFrmSize aSz;
             rSh.SetRowHeight( aSz );
             bCallDone = true;
             break;
@@ -838,7 +838,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
             else if( !rReq.IsAPI() )
             {
                 SwSelBoxes aBoxes;
-                ::GetTblSel( rSh, aBoxes );
+                ::GetTableSel( rSh, aBoxes );
                 if ( !aBoxes.empty() )
                 {
                     long maxX = 0;
@@ -995,7 +995,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-                boost::scoped_ptr<AbstractSplitTableDialog> pDlg(pFact->CreateSplitTblDialog( GetView().GetWindow(), rSh ));
+                boost::scoped_ptr<AbstractSplitTableDialog> pDlg(pFact->CreateSplitTableDialog( GetView().GetWindow(), rSh ));
                 OSL_ENSURE(pDlg, "Dialog creation failed!");
                 pDlg->Execute();
                 rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, pDlg->GetSplitMode() ) );
@@ -1013,7 +1013,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
             {
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
-                boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateTblMergeDialog(GetView().GetWindow(), bPrev));
+                boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateTableMergeDialog(GetView().GetWindow(), bPrev));
                 OSL_ENSURE(pDlg, "Dialog creation failed!");
                 if( RET_OK != pDlg->Execute())
                     bPrev = bNext = false;
@@ -1028,7 +1028,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
         case FN_TABLE_MODE_FIX_PROP  :
         case FN_TABLE_MODE_VARIABLE  :
         {
-            rSh.SetTblChgMode( ( FN_TABLE_MODE_FIX == nSlot ? TBLFIX_CHGABS
+            rSh.SetTableChgMode( ( FN_TABLE_MODE_FIX == nSlot ? TBLFIX_CHGABS
                                     : FN_TABLE_MODE_FIX_PROP == nSlot
                                         ? TBLFIX_CHGPROP
                                         : TBLVAR_CHGABS ) );
@@ -1089,8 +1089,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
         return;
     }
 
-    // Now the slots which are working directly on the TableFmt.
-    SwFrmFmt *pFmt = rSh.GetTableFmt();
+    // Now the slots which are working directly on the TableFormat.
+    SwFrameFormat *pFormat = rSh.GetTableFormat();
     switch ( nSlot )
     {
         case SID_ATTR_ULSPACE:
@@ -1110,10 +1110,10 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 SvxLRSpaceItem aLRSpace( *static_cast<const SvxLRSpaceItem*>(pItem) );
                 aLRSpace.SetWhich( RES_LR_SPACE );
                 aSet.Put( aLRSpace );
-                SwFmtHoriOrient aHori( pFmt->GetHoriOrient() );
+                SwFormatHoriOrient aHori( pFormat->GetHoriOrient() );
                 aHori.SetHoriOrient( text::HoriOrientation::NONE );
                 aSet.Put( aLRSpace );
-                rSh.SetTblAttr( aSet );
+                rSh.SetTableAttr( aSet );
             }
             break;
         // The last case branch which needs a table manager!!
@@ -1139,38 +1139,38 @@ void SwTableShell::Execute(SfxRequest &rReq)
         case SID_ATTR_PARA_SPLIT:
             if ( pItem )
             {
-                SwFmtLayoutSplit aSplit( static_cast<const SvxFmtSplitItem*>(pItem)->GetValue());
+                SwFormatLayoutSplit aSplit( static_cast<const SvxFormatSplitItem*>(pItem)->GetValue());
                 SfxItemSet aSet(GetPool(),  RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, 0 );
                 aSet.Put(aSplit);
-                rSh.SetTblAttr(aSet);
+                rSh.SetTableAttr(aSet);
             }
             break;
 
         case SID_ATTR_PARA_KEEP:
             if ( pItem )
             {
-                SvxFmtKeepItem aKeep( *static_cast<const SvxFmtKeepItem*>(pItem) );
+                SvxFormatKeepItem aKeep( *static_cast<const SvxFormatKeepItem*>(pItem) );
                 aKeep.SetWhich( RES_KEEP );
                 SfxItemSet aSet(GetPool(),  RES_KEEP, RES_KEEP, 0 );
                 aSet.Put(aKeep);
-                rSh.SetTblAttr(aSet);
+                rSh.SetTableAttr(aSet);
             }
             break;
         case FN_TABLE_ROW_SPLIT :
         {
             const SfxBoolItem* pBool = static_cast<const SfxBoolItem*>(pItem);
-            SwFmtRowSplit* pSplit = 0;
+            SwFormatRowSplit* pSplit = 0;
             if(!pBool)
             {
                 rSh.GetRowSplit(pSplit);
                 if(pSplit)
                     pSplit->SetValue(!pSplit->GetValue());
                 else
-                   pSplit = new SwFmtRowSplit(true);
+                   pSplit = new SwFormatRowSplit(true);
             }
             else
             {
-                pSplit = new SwFmtRowSplit(pBool->GetValue());
+                pSplit = new SwFormatRowSplit(pBool->GetValue());
             }
             rSh.SetRowSplit( *pSplit );
             delete pSplit;
@@ -1189,9 +1189,9 @@ void SwTableShell::GetState(SfxItemSet &rSet)
 {
     SfxWhichIter aIter( rSet );
     SwWrtShell &rSh = GetShell();
-    SwFrmFmt *pFmt = rSh.GetTableFmt();
+    SwFrameFormat *pFormat = rSh.GetTableFormat();
     // os #124829# crash report: in case of an invalid shell selection return immediately
-    if(!pFmt)
+    if(!pFormat)
         return;
     sal_uInt16 nSlot = aIter.FirstWhich();
     while ( nSlot )
@@ -1226,13 +1226,13 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             case SID_INSERT_DIAGRAM:
                 {
                     SvtModuleOptions aMOpt;
-                    if ( !aMOpt.IsMath() || rSh.IsTblComplexForChart() )
+                    if ( !aMOpt.IsMath() || rSh.IsTableComplexForChart() )
                         rSet.DisableItem(nSlot);
                 }
                 break;
 
             case FN_INSERT_TABLE:
-                if ( rSh.CrsrInsideInputFld() )
+                if ( rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem( nSlot );
                 }
@@ -1241,7 +1241,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             case FN_TABLE_OPTIMAL_HEIGHT:
             {
                 // Disable if auto height already is enabled.
-                SwFmtFrmSize *pSz;
+                SwFormatFrmSize *pSz;
                 rSh.GetRowHeight( pSz );
                 if ( pSz )
                 {
@@ -1257,10 +1257,10 @@ void SwTableShell::GetState(SfxItemSet &rSet)
                     rSet.DisableItem( nSlot );
                 break;
             case RES_LR_SPACE:
-                rSet.Put(pFmt->GetLRSpace());
+                rSet.Put(pFormat->GetLRSpace());
                 break;
             case RES_UL_SPACE:
-                rSet.Put(pFmt->GetULSpace());
+                rSet.Put(pFormat->GetULSpace());
                 break;
 
             case SID_TABLE_VERT_NONE:
@@ -1279,7 +1279,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             case FN_TABLE_MODE_FIX_PROP  :
             case FN_TABLE_MODE_VARIABLE  :
                 {
-                    TblChgMode nMode = rSh.GetTblChgMode();
+                    TableChgMode nMode = rSh.GetTableChgMode();
                     bool bSet = (nSlot == FN_TABLE_MODE_FIX && nMode == TBLFIX_CHGABS) ||
                             (nSlot == FN_TABLE_MODE_FIX_PROP && nMode == TBLFIX_CHGPROP) ||
                             (nSlot == FN_TABLE_MODE_VARIABLE && nMode == TBLVAR_CHGABS);
@@ -1288,11 +1288,11 @@ void SwTableShell::GetState(SfxItemSet &rSet)
                 break;
 
             case SID_ATTR_PARA_SPLIT:
-                rSet.Put( pFmt->GetKeep() );
+                rSet.Put( pFormat->GetKeep() );
                 break;
 
             case SID_ATTR_PARA_KEEP:
-                rSet.Put( pFmt->GetLayoutSplit() );
+                rSet.Put( pFormat->GetLayoutSplit() );
                 break;
             case FN_TABLE_SPLIT_TABLE:
                 if ( rSh.IsInHeadline() )
@@ -1309,7 +1309,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             case FN_TABLE_DELETE_ROW:
                 {
                     SwSelBoxes aBoxes;
-                    ::GetTblSel( rSh, aBoxes, nsSwTblSearchType::TBLSEARCH_ROW );
+                    ::GetTableSel( rSh, aBoxes, nsSwTableSearchType::TBLSEARCH_ROW );
                     if( ::HasProtectedCells( aBoxes ))
                         rSet.DisableItem( nSlot );
                 }
@@ -1317,7 +1317,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             case FN_TABLE_DELETE_COL:
                 {
                     SwSelBoxes aBoxes;
-                    ::GetTblSel( rSh, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
+                    ::GetTableSel( rSh, aBoxes, nsSwTableSearchType::TBLSEARCH_COL );
                     if( ::HasProtectedCells( aBoxes ))
                         rSet.DisableItem( nSlot );
                 }
@@ -1330,14 +1330,14 @@ void SwTableShell::GetState(SfxItemSet &rSet)
                 break;
             case RES_ROW_SPLIT:
             {
-                const SwFmtLayoutSplit& rTabSplit = pFmt->GetLayoutSplit();
+                const SwFormatLayoutSplit& rTabSplit = pFormat->GetLayoutSplit();
                 if ( !rTabSplit.GetValue() )
                 {
                     rSet.DisableItem( nSlot );
                 }
                 else
                 {
-                    SwFmtRowSplit* pSplit = 0;
+                    SwFormatRowSplit* pSplit = 0;
                     rSh.GetRowSplit(pSplit);
                     if(pSplit)
                         rSet.Put(*pSplit);
@@ -1445,7 +1445,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
     LanguageType eLang = rSh.GetCurLang();
     SvNumberFormatter* pFormatter = rSh.GetNumberFormatter();
     sal_uInt32 nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;
-    sal_uInt16 nFmtType = 0, nOffset = 0;
+    sal_uInt16 nFormatType = 0, nOffset = 0;
 
     switch ( nSlot )
     {
@@ -1466,15 +1466,15 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
             }
         }
         break;
-    case FN_NUMBER_STANDARD:        nFmtType = css::util::NumberFormat::NUMBER; break;
-    case FN_NUMBER_SCIENTIFIC:      nFmtType = css::util::NumberFormat::SCIENTIFIC; break;
-    case FN_NUMBER_DATE:            nFmtType = css::util::NumberFormat::DATE; break;
-    case FN_NUMBER_TIME:            nFmtType = css::util::NumberFormat::TIME; break;
-    case FN_NUMBER_CURRENCY:        nFmtType = css::util::NumberFormat::CURRENCY; break;
-    case FN_NUMBER_PERCENT:         nFmtType = css::util::NumberFormat::PERCENT; break;
+    case FN_NUMBER_STANDARD:        nFormatType = css::util::NumberFormat::NUMBER; break;
+    case FN_NUMBER_SCIENTIFIC:      nFormatType = css::util::NumberFormat::SCIENTIFIC; break;
+    case FN_NUMBER_DATE:            nFormatType = css::util::NumberFormat::DATE; break;
+    case FN_NUMBER_TIME:            nFormatType = css::util::NumberFormat::TIME; break;
+    case FN_NUMBER_CURRENCY:        nFormatType = css::util::NumberFormat::CURRENCY; break;
+    case FN_NUMBER_PERCENT:         nFormatType = css::util::NumberFormat::PERCENT; break;
 
     case FN_NUMBER_TWODEC:          // #.##0,00
-        nFmtType = css::util::NumberFormat::NUMBER;
+        nFormatType = css::util::NumberFormat::NUMBER;
         nOffset = NF_NUMBER_1000DEC2;
         break;
 
@@ -1483,14 +1483,14 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
         return;
     }
 
-    if( nFmtType )
-        nNumberFormat = pFormatter->GetStandardFormat( nFmtType, eLang ) + nOffset;
+    if( nFormatType )
+        nNumberFormat = pFormatter->GetStandardFormat( nFormatType, eLang ) + nOffset;
 
     if( NUMBERFORMAT_ENTRY_NOT_FOUND != nNumberFormat )
     {
         SfxItemSet aBoxSet( GetPool(), RES_BOXATR_FORMAT, RES_BOXATR_FORMAT );
-        aBoxSet.Put( SwTblBoxNumFormat( nNumberFormat ));
-        rSh.SetTblBoxFormulaAttrs( aBoxSet );
+        aBoxSet.Put( SwTableBoxNumFormat( nNumberFormat ));
+        rSh.SetTableBoxFormulaAttrs( aBoxSet );
     }
 
 }
diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx
index 11ade2b2fc91..cef4a08ec2f3 100644
--- a/sw/source/uibase/shells/textdrw.cxx
+++ b/sw/source/uibase/shells/textdrw.cxx
@@ -43,7 +43,7 @@
 
 using namespace ::com::sun::star;
 
-void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, const OUString& rTxt)
+void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, const OUString& rText)
 {
     SwWrtShell& rSh = GetShell();
 
@@ -87,7 +87,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget,
 
             uno::Any aTmp;
 
-            aTmp <<= OUString(rTxt);
+            aTmp <<= OUString(rText);
             xPropSet->setPropertyValue( "Label", aTmp );
 
             SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium();
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 835191450907..076e5a5f7902 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -127,14 +127,14 @@ void SwTextShell::ExecField(SfxRequest &rReq)
     {
         case FN_EDIT_FIELD:
         {
-            SwField* pFld = rSh.GetCurFld();
-            if( pFld )
+            SwField* pField = rSh.GetCurField();
+            if( pField )
             {
-                switch ( pFld->GetTypeId() )
+                switch ( pField->GetTypeId() )
                 {
                     case TYP_DDEFLD:
                     {
-                        ::sfx2::SvBaseLink& rLink = static_cast<SwDDEFieldType*>(pFld->GetTyp())->
+                        ::sfx2::SvBaseLink& rLink = static_cast<SwDDEFieldType*>(pField->GetTyp())->
                                                 GetBaseLink();
                         if(rLink.IsVisible())
                         {
@@ -152,7 +152,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                         SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
                         assert(pFact && "SwAbstractDialogFactory fail!");
 
-                        boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwFldEditDlg( GetView(),RC_DLG_SWFLDEDITDLG ));
+                        boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwFieldEditDlg( GetView(),RC_DLG_SWFLDEDITDLG ));
                         assert(pDlg && "Dialog creation failed!");
                         pDlg->Execute();
                     }
@@ -162,11 +162,11 @@ void SwTextShell::ExecField(SfxRequest &rReq)
         }
         case FN_EXECUTE_MACROFIELD:
         {
-            SwField* pFld = rSh.GetCurFld();
-            if(pFld && pFld->GetTyp()->Which() == RES_MACROFLD)
+            SwField* pField = rSh.GetCurField();
+            if(pField && pField->GetTyp()->Which() == RES_MACROFLD)
             {
 
-                const OUString& rMacro = static_cast<SwMacroField*>(pFld)->GetMacro();
+                const OUString& rMacro = static_cast<SwMacroField*>(pField)->GetMacro();
                 sal_Int32 nPos = rMacro.indexOf('.');
                 if(nPos != -1)
                 {
@@ -181,26 +181,26 @@ void SwTextShell::ExecField(SfxRequest &rReq)
         case FN_GOTO_PREV_INPUTFLD:
             {
                 bool bRet = false;
-                SwFieldType* pFld = rSh.GetFldType( 0, RES_INPUTFLD );
-                const bool bAddSetExpressionFlds = !( rSh.GetViewOptions()->IsReadonly() );
-                if ( pFld != NULL
-                     && rSh.MoveFldType(
-                            pFld,
+                SwFieldType* pField = rSh.GetFieldType( 0, RES_INPUTFLD );
+                const bool bAddSetExpressionFields = !( rSh.GetViewOptions()->IsReadonly() );
+                if ( pField != NULL
+                     && rSh.MoveFieldType(
+                            pField,
                             FN_GOTO_NEXT_INPUTFLD == nSlot,
                             USHRT_MAX,
-                            bAddSetExpressionFlds ) )
+                            bAddSetExpressionFields ) )
                 {
                     rSh.ClearMark();
-                    if ( dynamic_cast<SwInputField*>(rSh.GetCurFld( true )) != NULL )
+                    if ( dynamic_cast<SwInputField*>(rSh.GetCurField( true )) != NULL )
                     {
                         rSh.SttSelect();
-                        rSh.SelectTxt(
-                            SwCrsrShell::StartOfInputFldAtPos( *(rSh.GetCrsr()->Start()) ) + 1,
-                            SwCrsrShell::EndOfInputFldAtPos( *(rSh.GetCrsr()->Start()) ) - 1 );
+                        rSh.SelectText(
+                            SwCrsrShell::StartOfInputFieldAtPos( *(rSh.GetCrsr()->Start()) ) + 1,
+                            SwCrsrShell::EndOfInputFieldAtPos( *(rSh.GetCrsr()->Start()) ) - 1 );
                     }
                     else
                     {
-                        rSh.StartInputFldDlg( rSh.GetCurFld( true ), false );
+                        rSh.StartInputFieldDlg( rSh.GetCurField( true ), false );
                     }
                     bRet = true;
                 }
@@ -214,8 +214,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
     }
     if(bMore)
     {
-        // Here come the slots with FldMgr.
-        SwFldMgr aFldMgr(GetShellPtr());
+        // Here come the slots with FieldMgr.
+        SwFieldMgr aFieldMgr(GetShellPtr());
         switch(nSlot)
         {
             case FN_INSERT_DBFIELD:
@@ -257,8 +257,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                         nFormat = static_cast<const SfxUInt32Item *>(pItem)->GetValue();
                     OSL_FAIL("Command is not yet used");
                     sal_Unicode cSeparator = ' ';
-                    SwInsertFld_Data aData(nType, 0, aPar1, aPar2, nFormat, GetShellPtr(), cSeparator );
-                    bRes = aFldMgr.InsertFld(aData);
+                    SwInsertField_Data aData(nType, 0, aPar1, aPar2, nFormat, GetShellPtr(), cSeparator );
+                    bRes = aFieldMgr.InsertField(aData);
                 }
                 rReq.SetReturnValue(SfxBoolItem( nSlot, bRes ));
             }
@@ -295,8 +295,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                         if(!sTmp.isEmpty())
                             cSeparator = sTmp[0];
                     }
-                    SwInsertFld_Data aData(nType, nSubType, aPar1, aPar2, nFormat, GetShellPtr(), cSeparator );
-                    bRes = aFldMgr.InsertFld( aData );
+                    SwInsertField_Data aData(nType, nSubType, aPar1, aPar2, nFormat, GetShellPtr(), cSeparator );
+                    bRes = aFieldMgr.InsertField( aData );
                 }
                 else
                         //#i5788# prevent closing of the field dialog while a modal dialog ( Input field dialog ) is active
@@ -319,9 +319,9 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                 if (!pVFrame->HasChildWindow(FN_INSERT_FIELD))
                     pVFrame->ToggleChildWindow(FN_INSERT_FIELD);    // Show dialog
 
-                // Switch Flddlg at a new TabPage
-                sal_uInt16 nId = SwFldDlgWrapper::GetChildWindowId();
-                SwFldDlgWrapper *pWrp = static_cast<SwFldDlgWrapper*>(pVFrame->GetChildWindow(nId));
+                // Switch Fielddlg at a new TabPage
+                sal_uInt16 nId = SwFieldDlgWrapper::GetChildWindowId();
+                SwFieldDlgWrapper *pWrp = static_cast<SwFieldDlgWrapper*>(pVFrame->GetChildWindow(nId));
                 if (pWrp)
                     pWrp->ShowReferencePage();
                 rReq.Ignore();
@@ -372,7 +372,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
             break;
             case FN_POSTIT:
             {
-                SwPostItField* pPostIt = dynamic_cast<SwPostItField*>(aFldMgr.GetCurFld());
+                SwPostItField* pPostIt = dynamic_cast<SwPostItField*>(aFieldMgr.GetCurField());
                 bool bNew = !(pPostIt && pPostIt->GetTyp()->Which() == RES_POSTITFLD);
                 if (bNew || GetView().GetPostItMgr()->IsAnswer())
                 {
@@ -402,28 +402,28 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                     // --> suggestion has to be removed before
                     GetView().GetEditWin().StopQuickHelp();
 
-                    SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, sText, 0);
-                    aFldMgr.InsertFld( aData );
+                    SwInsertField_Data aData(TYP_POSTITFLD, 0, sAuthor, sText, 0);
+                    aFieldMgr.InsertField( aData );
 
                     rSh.Push();
                     rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, false);
-                    pPostIt = static_cast<SwPostItField*>(aFldMgr.GetCurFld());
+                    pPostIt = static_cast<SwPostItField*>(aFieldMgr.GetCurField());
                     rSh.Pop(false); // Restore cursor position
                 }
 
                 if (pPostIt)
                 {
-                    SwFieldType* pType = rSh.GetDoc()->getIDocumentFieldsAccess().GetFldType(RES_POSTITFLD, OUString(), false);
-                    SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
-                    SwFmtFld* pSwFmtFld = aIter.First();
-                    while( pSwFmtFld )
+                    SwFieldType* pType = rSh.GetDoc()->getIDocumentFieldsAccess().GetFieldType(RES_POSTITFLD, OUString(), false);
+                    SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+                    SwFormatField* pSwFormatField = aIter.First();
+                    while( pSwFormatField )
                     {
-                        if ( pSwFmtFld->GetField() == pPostIt )
+                        if ( pSwFormatField->GetField() == pPostIt )
                         {
-                            pSwFmtFld->Broadcast( SwFmtFldHint( 0, SwFmtFldHintWhich::FOCUS, &GetView() ) );
+                            pSwFormatField->Broadcast( SwFormatFieldHint( 0, SwFormatFieldHintWhich::FOCUS, &GetView() ) );
                             break;
                         }
-                        pSwFmtFld = aIter.Next();
+                        pSwFormatField = aIter.Next();
                     }
                 }
             }
@@ -539,7 +539,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                 bool bIsUrl=false;
                 bool bNew=false;
                 bool bUpdate = false;
-                SwFldMgr aMgr;
+                SwFieldMgr aMgr;
                 if ( pItem )
                 {
                     aText = static_cast<const SfxStringItem*>(pItem)->GetValue();
@@ -550,9 +550,9 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                     if ( pIsUrl )
                         bIsUrl = pIsUrl->GetValue();
 
-                    SwScriptField* pFld = static_cast<SwScriptField*>(aMgr.GetCurFld());
-                    bNew = !pFld || !(pFld->GetTyp()->Which() == RES_SCRIPTFLD);
-                    bUpdate = pFld && ( bIsUrl != (bool)pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText );
+                    SwScriptField* pField = static_cast<SwScriptField*>(aMgr.GetCurField());
+                    bNew = !pField || !(pField->GetTyp()->Which() == RES_SCRIPTFLD);
+                    bUpdate = pField && ( bIsUrl != (bool)pField->GetFormat() || pField->GetPar2() != aType || pField->GetPar1() != aText );
                 }
                 else
                 {
@@ -575,13 +575,13 @@ void SwTextShell::ExecField(SfxRequest &rReq)
 
                 if( bNew )
                 {
-                    SwInsertFld_Data aData(TYP_SCRIPTFLD, 0, aType, aText, bIsUrl ? 1 : 0);
-                    aMgr.InsertFld(aData);
+                    SwInsertField_Data aData(TYP_SCRIPTFLD, 0, aType, aText, bIsUrl ? 1 : 0);
+                    aMgr.InsertField(aData);
                     rReq.Done();
                 }
                 else if( bUpdate )
                 {
-                    aMgr.UpdateCurFld( bIsUrl ? 1 : 0, aType, aText );
+                    aMgr.UpdateCurField( bIsUrl ? 1 : 0, aType, aText );
                     rSh.SetUndoNoResetModified();
                     rReq.Done();
                 }
@@ -625,10 +625,10 @@ FIELD_INSERT:
             {
                 //format conversion should only be done for number formatter formats
                 if(!nInsertFormat)
-                    nInsertFormat = aFldMgr.GetDefaultFormat(nInsertType, bIsText, rSh.GetNumberFormatter());
-                SwInsertFld_Data aData(nInsertType, nInsertSubType,
+                    nInsertFormat = aFieldMgr.GetDefaultFormat(nInsertType, bIsText, rSh.GetNumberFormatter());
+                SwInsertField_Data aData(nInsertType, nInsertSubType,
                                     OUString(), OUString(), nInsertFormat);
-                aFldMgr.InsertFld(aData);
+                aFieldMgr.InsertField(aData);
                 rReq.Done();
             }
             break;
@@ -674,7 +674,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
             {
                 if( !bGetField )
                 {
-                    pField = rSh.GetCurFld();
+                    pField = rSh.GetCurField();
                     bGetField = true;
                 }
 
@@ -697,7 +697,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
             {
                 if(!bGetField)
                 {
-                    pField = rSh.GetCurFld();
+                    pField = rSh.GetCurField();
                     bGetField = true;
                 }
                 if(!pField || pField->GetTyp()->Which() != RES_MACROFLD)
@@ -707,7 +707,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
 
         case FN_INSERT_FIELD:
             {
-                if ( rSh.CrsrInsideInputFld() )
+                if ( rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem(nWhich);
                 }
@@ -728,7 +728,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
             {
                 SfxViewFrame* pVFrame = GetView().GetViewFrame();
                 if ( !pVFrame->KnowsChildWindow(FN_INSERT_FIELD)
-                     || rSh.CrsrInsideInputFld() )
+                     || rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem(FN_INSERT_REF_FIELD);
                 }
@@ -736,7 +736,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
             break;
 
         case FN_INSERT_FIELD_CTRL:
-                if ( rSh.CrsrInsideInputFld() )
+                if ( rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem(nWhich);
                 }
@@ -755,7 +755,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
         case FN_JAVAEDIT :
             {
                 bool bCurField = false;
-                pField = rSh.GetCurFld();
+                pField = rSh.GetCurField();
                 if(nWhich == FN_POSTIT)
                     bCurField = pField && pField->GetTyp()->Which() == RES_POSTITFLD;
                 else
@@ -765,7 +765,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
                 {
                     rSet.DisableItem(nWhich);
                 }
-                else if ( rSh.CrsrInsideInputFld() )
+                else if ( rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem(nWhich);
                 }
@@ -781,7 +781,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
         case FN_INSERT_FLD_TITLE:
         case FN_INSERT_FLD_TOPIC:
         case FN_INSERT_DBFIELD:
-            if ( rSh.CrsrInsideInputFld() )
+            if ( rSh.CrsrInsideInputField() )
             {
                 rSet.DisableItem(nWhich);
             }
@@ -799,7 +799,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
     const OUString& rTarget = rHlnkItem.GetTargetFrame();
     sal_uInt16 nType =  (sal_uInt16)rHlnkItem.GetInsertMode();
     nType &= ~HLINK_HTMLMODE;
-    const SvxMacroTableDtor* pMacroTbl = rHlnkItem.GetMacroTbl();
+    const SvxMacroTableDtor* pMacroTable = rHlnkItem.GetMacroTable();
 
     SwWrtShell& rSh = GetShell();
 
@@ -813,29 +813,29 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
         if(SfxItemState::SET == aSet.GetItemState(RES_TXTATR_INETFMT, false, &pItem))
         {
             // Select links
-            rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT, false);
+            rSh.SwCrsrShell::SelectTextAttr(RES_TXTATR_INETFMT, false);
         }
         switch (nType)
         {
         case HLINK_DEFAULT:
         case HLINK_FIELD:
             {
-                SwFmtINetFmt aINetFmt( rURL, rTarget );
-                aINetFmt.SetName(rHlnkItem.GetIntName());
-                if(pMacroTbl)
+                SwFormatINetFormat aINetFormat( rURL, rTarget );
+                aINetFormat.SetName(rHlnkItem.GetIntName());
+                if(pMacroTable)
                 {
-                    const SvxMacro *pMacro = pMacroTbl->Get( SFX_EVENT_MOUSEOVER_OBJECT );
+                    const SvxMacro *pMacro = pMacroTable->Get( SFX_EVENT_MOUSEOVER_OBJECT );
                     if( pMacro )
-                        aINetFmt.SetMacro(SFX_EVENT_MOUSEOVER_OBJECT, *pMacro);
-                    pMacro = pMacroTbl->Get( SFX_EVENT_MOUSECLICK_OBJECT );
+                        aINetFormat.SetMacro(SFX_EVENT_MOUSEOVER_OBJECT, *pMacro);
+                    pMacro = pMacroTable->Get( SFX_EVENT_MOUSECLICK_OBJECT );
                     if( pMacro )
-                        aINetFmt.SetMacro(SFX_EVENT_MOUSECLICK_OBJECT, *pMacro);
-                    pMacro = pMacroTbl->Get( SFX_EVENT_MOUSEOUT_OBJECT );
+                        aINetFormat.SetMacro(SFX_EVENT_MOUSECLICK_OBJECT, *pMacro);
+                    pMacro = pMacroTable->Get( SFX_EVENT_MOUSEOUT_OBJECT );
                     if( pMacro )
-                        aINetFmt.SetMacro(SFX_EVENT_MOUSEOUT_OBJECT, *pMacro);
+                        aINetFormat.SetMacro(SFX_EVENT_MOUSEOUT_OBJECT, *pMacro);
                 }
                 rSh.SttSelect();
-                rSh.InsertURL( aINetFmt, rName, true );
+                rSh.InsertURL( aINetFormat, rName, true );
                 rSh.EndSelect();
             }
             break;
diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx
index f4647448d94f..f1c99467d276 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -118,7 +118,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
             rSh.CalcBoundRect(aRect, FLY_AS_CHAR);
 
             long nWidth = aRect.Width();
-            aSet.Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
+            aSet.Put(SwFormatFrmSize(ATT_VAR_SIZE, nWidth));
             // Height = width for a more consistent preview (analogous to edit range)
             aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
             const SwTOXBase* pCurTOX = 0;
@@ -195,7 +195,7 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet)
             rSet.Put(SfxBoolItem(FN_INSERT_AUTH_ENTRY_DLG, true));
 
     }
-    else if ( rSh.CrsrInsideInputFld() )
+    else if ( rSh.CrsrInsideInputField() )
     {
         rSet.DisableItem( FN_INSERT_IDX_ENTRY_DLG );
         rSet.DisableItem( FN_INSERT_AUTH_ENTRY_DLG );
@@ -231,7 +231,7 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet)
             rSet.Put(SfxBoolItem(FN_INSERT_IDX_ENTRY_DLG,
                                     0 != pIdxMrk));
 
-        SwField* pField = rSh.GetCurFld();
+        SwField* pField = rSh.GetCurField();
 
         if(bInReadonly)
             rSet.DisableItem(FN_INSERT_AUTH_ENTRY_DLG);
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 57bfb92d3673..2cf10fea72b8 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -167,7 +167,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
 
             SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get();
             SvxAutoCorrect* pACorr = rACfg.GetAutoCorrect();
-            if( pACorr && rACfg.IsAutoFmtByInput()
+            if( pACorr && rACfg.IsAutoFormatByInput()
                 && pACorr->IsAutoCorrFlag(
                     CptlSttSntnc | CptlSttWrd | AddNonBrkSpace | ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | Autocorrect ) )
             {
@@ -199,7 +199,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
 
     case FN_INSERT_BREAK:
         {
-            if( !rSh.CrsrInsideInputFld() )
+            if( !rSh.CrsrInsideInputField() )
             {
                 rSh.SplitNode();
             }
@@ -432,10 +432,10 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                 uno::Reference< chart2::data::XDataProvider > xDataProvider;
                 bool bFillWithData = true;
                 OUString aRangeString;
-                if (!GetShell().IsTblComplexForChart())
+                if (!GetShell().IsTableComplexForChart())
                 {
-                    SwFrmFmt* pTblFmt = GetShell().GetTableFmt();
-                    aRangeString = pTblFmt->GetName();
+                    SwFrameFormat* pTableFormat = GetShell().GetTableFormat();
+                    aRangeString = pTableFormat->GetName();
                     aRangeString += OUString( '.' );
                     aRangeString += GetShell().GetBoxNms();
 
@@ -508,7 +508,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
             SwFlyFrmAttrMgr aMgr( true, GetShellPtr(), FRMMGR_TYPE_TEXT );
             if(nCols > 1)
             {
-                SwFmtCol aCol;
+                SwFormatCol aCol;
                 aCol.Init( nCols, aCol.GetGutterWidth(), aCol.GetWishWidth() );
                 aMgr.SetCol( aCol );
             }
@@ -554,10 +554,10 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                 const sal_uInt16 nCols = static_cast<const SfxUInt16Item *>(pItem)->GetValue();
                 if( !bSingleCol && 1 < nCols )
                 {
-                    SwFmtCol aFmtCol;
-                    aFmtCol.Init( nCols , (rReq.IsAPI() ? 0
+                    SwFormatCol aFormatCol;
+                    aFormatCol.Init( nCols , (rReq.IsAPI() ? 0
                                         : DEF_GUTTER_WIDTH), USHRT_MAX );
-                    aMgr.SetCol(aFmtCol);
+                    aMgr.SetCol(aFormatCol);
                 }
             }
 
@@ -585,12 +585,12 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
             SfxItemSet aSet(GetPool(), aFrmAttrRange );
             aSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
             const SwRect &rPg = GetShell().GetAnyCurRect(RECT_PAGE);
-            SwFmtFrmSize aFrmSize(ATT_VAR_SIZE, rPg.Width(), rPg.Height());
+            SwFormatFrmSize aFrmSize(ATT_VAR_SIZE, rPg.Width(), rPg.Height());
             aFrmSize.SetWhich(GetPool().GetWhich(SID_ATTR_PAGE_SIZE));
             aSet.Put(aFrmSize);
 
             const SwRect &rPr = GetShell().GetAnyCurRect(RECT_PAGE_PRT);
-            SwFmtFrmSize aPrtSize(ATT_VAR_SIZE, rPr.Width(), rPr.Height());
+            SwFormatFrmSize aPrtSize(ATT_VAR_SIZE, rPr.Width(), rPr.Height());
             aPrtSize.SetWhich(GetPool().GetWhich(FN_GET_PRINT_AREA));
             aSet.Put(aPrtSize);
 
@@ -703,7 +703,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
         case SID_INSERT_SOUND:
         case SID_INSERT_VIDEO:
             if ( GetShell().IsSelFrmMode()
-                 || GetShell().CrsrInsideInputFld()
+                 || GetShell().CrsrInsideInputField()
                  || SfxObjectCreateMode::EMBEDDED == eCreateMode
                  || bCrsrInHidden )
             {
@@ -713,7 +713,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
 
         case SID_INSERT_DIAGRAM:
             if( !aMOpt.IsChart()
-                || GetShell().CrsrInsideInputFld()
+                || GetShell().CrsrInsideInputField()
                 || eCreateMode == SfxObjectCreateMode::EMBEDDED
                 || bCrsrInHidden )
             {
@@ -725,7 +725,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
                 if( !aMOpt.IsMath()
                     || eCreateMode == SfxObjectCreateMode::EMBEDDED
                     || bCrsrInHidden
-                    || rSh.CrsrInsideInputFld() )
+                    || rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem( nWhich );
                 }
@@ -740,7 +740,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
                         rSet.DisableItem( nWhich );
                     }
                     else if( GetShell().IsSelFrmMode()
-                             || GetShell().CrsrInsideInputFld() )
+                             || GetShell().CrsrInsideInputField() )
                     {
                         rSet.DisableItem( nWhich );
                     }
@@ -758,7 +758,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
             case FN_INSERT_FRAME_INTERACT:
                 {
                     if( GetShell().IsSelFrmMode()
-                        || GetShell().CrsrInsideInputFld()
+                        || GetShell().CrsrInsideInputField()
                         || bCrsrInHidden )
                         rSet.DisableItem(nWhich);
                 }
@@ -773,27 +773,27 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
                     const SfxPoolItem* pItem;
                     if(SfxItemState::SET == aSet.GetItemState(RES_TXTATR_INETFMT, false, &pItem))
                     {
-                        const SwFmtINetFmt* pINetFmt = static_cast<const SwFmtINetFmt*>(pItem);
-                        aHLinkItem.SetURL(pINetFmt->GetValue());
-                        aHLinkItem.SetTargetFrame(pINetFmt->GetTargetFrame());
-                        aHLinkItem.SetIntName(pINetFmt->GetName());
-                        const SvxMacro *pMacro = pINetFmt->GetMacro( SFX_EVENT_MOUSEOVER_OBJECT );
+                        const SwFormatINetFormat* pINetFormat = static_cast<const SwFormatINetFormat*>(pItem);
+                        aHLinkItem.SetURL(pINetFormat->GetValue());
+                        aHLinkItem.SetTargetFrame(pINetFormat->GetTargetFrame());
+                        aHLinkItem.SetIntName(pINetFormat->GetName());
+                        const SvxMacro *pMacro = pINetFormat->GetMacro( SFX_EVENT_MOUSEOVER_OBJECT );
                         if( pMacro )
                             aHLinkItem.SetMacro(HYPERDLG_EVENT_MOUSEOVER_OBJECT, *pMacro);
 
-                        pMacro = pINetFmt->GetMacro( SFX_EVENT_MOUSECLICK_OBJECT );
+                        pMacro = pINetFormat->GetMacro( SFX_EVENT_MOUSECLICK_OBJECT );
                         if( pMacro )
                             aHLinkItem.SetMacro(HYPERDLG_EVENT_MOUSECLICK_OBJECT, *pMacro);
 
-                        pMacro = pINetFmt->GetMacro( SFX_EVENT_MOUSEOUT_OBJECT );
+                        pMacro = pINetFormat->GetMacro( SFX_EVENT_MOUSEOUT_OBJECT );
                         if( pMacro )
                             aHLinkItem.SetMacro(HYPERDLG_EVENT_MOUSEOUT_OBJECT, *pMacro);
 
                         // Get the text of the Link.
                         rSh.StartAction();
                         rSh.CreateCrsr();
-                        rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT,true);
-                        OUString sLinkName = rSh.GetSelTxt();
+                        rSh.SwCrsrShell::SelectTextAttr(RES_TXTATR_INETFMT,true);
+                        OUString sLinkName = rSh.GetSelText();
                         aHLinkItem.SetName(sLinkName);
                         aHLinkItem.SetInsertMode(HLINK_FIELD);
                         rSh.DestroyCrsr();
@@ -801,7 +801,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
                     }
                     else
                     {
-                        OUString sReturn = rSh.GetSelTxt();
+                        OUString sReturn = rSh.GetSelText();
                         sReturn = sReturn.copy(0, std::min<sal_Int32>(255, sReturn.getLength()));
                         aHLinkItem.SetName(comphelper::string::stripEnd(sReturn, ' '));
                     }
@@ -822,7 +822,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
                     if( ((nsSelectionType::SEL_GRF | nsSelectionType::SEL_OLE ) & nSel ) || bCrsrInHidden )
                         rSet.DisableItem(nWhich);
                 }
-                else if ( rSh.CrsrInsideInputFld() )
+                else if ( rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem(nWhich);
                 }
@@ -832,7 +832,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
             {
                 //#i80458# column dialog cannot work if the selection contains different page styles and different sections
                 bool bDisable = true;
-                if( rSh.GetFlyFrmFmt() || rSh.GetSelectedPageDescs() )
+                if( rSh.GetFlyFrameFormat() || rSh.GetSelectedPageDescs() )
                     bDisable = false;
                 if( bDisable )
                 {
@@ -952,7 +952,7 @@ void SwTextShell::ExecRotateTransliteration( SfxRequest & rReq )
 }
 
 SwTextShell::SwTextShell(SwView &_rView) :
-    SwBaseShell(_rView), pPostItFldMgr( 0 )
+    SwBaseShell(_rView), pPostItFieldMgr( 0 )
 {
     SetName(OUString("Text"));
     SetHelpId(SW_TEXTSHELL);
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 6651087ad0cf..36bb996a55ee 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -146,10 +146,10 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
         {
             rWrtSh.StartAction();
             rWrtSh.Push();
-            if(!rWrtSh.SelectTxtAttr( RES_TXTATR_INETFMT ))
+            if(!rWrtSh.SelectTextAttr( RES_TXTATR_INETFMT ))
                 rWrtSh.SelWrd();
         }
-        aCoreSet.Put(SfxStringItem(FN_PARAM_SELECTION, rWrtSh.GetSelTxt()));
+        aCoreSet.Put(SfxStringItem(FN_PARAM_SELECTION, rWrtSh.GetSelText()));
         bSelectionPut = true;
         if(!bSel)
         {
@@ -232,8 +232,8 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
         }
         aTmpSet.ClearItem(FN_PARAM_SELECTION);
 
-        SwTxtFmtColl* pColl = rWrtSh.GetCurTxtFmtColl();
-        if(bSel && rWrtSh.IsSelFullPara() && pColl && pColl->IsAutoUpdateFmt())
+        SwTextFormatColl* pColl = rWrtSh.GetCurTextFormatColl();
+        if(bSel && rWrtSh.IsSelFullPara() && pColl && pColl->IsAutoUpdateFormat())
         {
             rWrtSh.AutoUpdatePara(pColl, aTmpSet);
         }
@@ -249,7 +249,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
             aReq1.Done();
             rWrtSh.SwapPam();
             rWrtSh.ClearMark();
-            rWrtSh.DontExpandFmt();
+            rWrtSh.DontExpandFormat();
             rWrtSh.EndAction();
         }
     }
@@ -290,17 +290,17 @@ void SwTextShell::Execute(SfxRequest &rReq)
         case SID_LANGUAGE_STATUS:
         {
             // get the language
-            OUString aNewLangTxt;
+            OUString aNewLangText;
             SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_LANGUAGE_STATUS , false );
             if (pItem2)
-                aNewLangTxt = pItem2->GetValue();
+                aNewLangText = pItem2->GetValue();
 
             //!! Remember the view frame right now...
             //!! (call to GetView().GetViewFrame() will break if the
             //!! SwTextShell got destroyed meanwhile.)
             SfxViewFrame *pViewFrame = GetView().GetViewFrame();
 
-            if (aNewLangTxt == "*")
+            if (aNewLangText == "*")
             {
                 // open the dialog "Tools/Options/Language Settings - Language"
                 // to set the documents default language
@@ -321,7 +321,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 rWrtSh.LockView( true );
 
                 // setting the new language...
-                if (!aNewLangTxt.isEmpty())
+                if (!aNewLangText.isEmpty())
                 {
                     const OUString aSelectionLangPrefix("Current_");
                     const OUString aParagraphLangPrefix("Paragraph_");
@@ -338,23 +338,23 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     sal_Int32 nPos = 0;
                     bool bForSelection = true;
                     bool bForParagraph = false;
-                    if (-1 != (nPos = aNewLangTxt.indexOf( aSelectionLangPrefix, 0 )))
+                    if (-1 != (nPos = aNewLangText.indexOf( aSelectionLangPrefix, 0 )))
                     {
                         // ... for the current selection
-                        aNewLangTxt = aNewLangTxt.replaceAt(nPos, aSelectionLangPrefix.getLength(), "");
+                        aNewLangText = aNewLangText.replaceAt(nPos, aSelectionLangPrefix.getLength(), "");
                         bForSelection = true;
                     }
-                    else if (-1 != (nPos = aNewLangTxt.indexOf(aParagraphLangPrefix, 0)))
+                    else if (-1 != (nPos = aNewLangText.indexOf(aParagraphLangPrefix, 0)))
                     {
                         // ... for the current paragraph language
-                        aNewLangTxt = aNewLangTxt.replaceAt(nPos, aParagraphLangPrefix.getLength(), "");
+                        aNewLangText = aNewLangText.replaceAt(nPos, aParagraphLangPrefix.getLength(), "");
                         bForSelection = true;
                         bForParagraph = true;
                     }
-                    else if (-1 != (nPos = aNewLangTxt.indexOf(aDocumentLangPrefix, 0)))
+                    else if (-1 != (nPos = aNewLangText.indexOf(aDocumentLangPrefix, 0)))
                     {
                         // ... as default document language
-                        aNewLangTxt = aNewLangTxt.replaceAt(nPos, aDocumentLangPrefix.getLength(), "");
+                        aNewLangText = aNewLangText.replaceAt(nPos, aDocumentLangPrefix.getLength(), "");
                         bForSelection = false;
                     }
 
@@ -374,12 +374,12 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     }
 
                     rWrtSh.StartUndo( ( !bForParagraph && !bForSelection ) ? UNDO_SETDEFTATTR : UNDO_EMPTY );
-                    if (aNewLangTxt == aStrNone)
+                    if (aNewLangText == aStrNone)
                         SwLangHelper::SetLanguage_None( rWrtSh, bForSelection, aCoreSet );
-                    else if (aNewLangTxt == aStrResetLangs)
+                    else if (aNewLangText == aStrResetLangs)
                         SwLangHelper::ResetLanguages( rWrtSh, bForSelection );
                     else
-                        SwLangHelper::SetLanguage( rWrtSh, aNewLangTxt, bForSelection, aCoreSet );
+                        SwLangHelper::SetLanguage( rWrtSh, aNewLangText, bForSelection, aCoreSet );
                     rWrtSh.EndUndo();
 
                     if (bForParagraph || !bForSelection)
@@ -443,7 +443,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 rWrtSh.SetAttrSet( aSet, SetAttrMode::DONTEXPAND );
                 rWrtSh.ResetSelect(0, false);
                 rWrtSh.EndSelect();
-                rWrtSh.GotoFtnTxt();
+                rWrtSh.GotoFootnoteText();
             }
             rWrtSh.EndUndo( UNDO_UI_INSERT_FOOTNOTE );
             rReq.Done();
@@ -609,9 +609,9 @@ void SwTextShell::Execute(SfxRequest &rReq)
         }
         case FN_AUTOFORMAT_REDLINE_APPLY:
         {
-            SvxSwAutoFmtFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags());
+            SvxSwAutoFormatFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags());
             // This must always be false for the postprocessing.
-            aFlags.bAFmtByInput = false;
+            aFlags.bAFormatByInput = false;
             aFlags.bWithRedlining = true;
             rWrtSh.AutoFormat( &aFlags );
             aFlags.bWithRedlining = false;
@@ -652,9 +652,9 @@ void SwTextShell::Execute(SfxRequest &rReq)
 
         case FN_AUTOFORMAT_APPLY:
         {
-            SvxSwAutoFmtFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags());
+            SvxSwAutoFormatFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags());
             // This must always be false for the postprocessing.
-            aFlags.bAFmtByInput = false;
+            aFlags.bAFormatByInput = false;
             rWrtSh.AutoFormat( &aFlags );
             rReq.Done();
         }
@@ -662,10 +662,10 @@ void SwTextShell::Execute(SfxRequest &rReq)
         case FN_AUTOFORMAT_AUTO:
         {
             SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get();
-            bool bSet = pItem ? static_cast<const SfxBoolItem*>(pItem)->GetValue() : !rACfg.IsAutoFmtByInput();
-            if( bSet != rACfg.IsAutoFmtByInput() )
+            bool bSet = pItem ? static_cast<const SfxBoolItem*>(pItem)->GetValue() : !rACfg.IsAutoFormatByInput();
+            if( bSet != rACfg.IsAutoFormatByInput() )
             {
-                rACfg.SetAutoFmtByInput( bSet );
+                rACfg.SetAutoFormatByInput( bSet );
                 GetView().GetViewFrame()->GetBindings().Invalidate( nSlot );
                 if ( !pItem )
                     rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), bSet ) );
@@ -712,13 +712,13 @@ void SwTextShell::Execute(SfxRequest &rReq)
             break;
         case FN_GOTO_REFERENCE:
         {
-            SwField *pFld = rWrtSh.GetCurFld();
-            if(pFld && pFld->GetTypeId() == TYP_GETREFFLD)
+            SwField *pField = rWrtSh.GetCurField();
+            if(pField && pField->GetTypeId() == TYP_GETREFFLD)
             {
                 rWrtSh.StartAllAction();
-                rWrtSh.SwCrsrShell::GotoRefMark( static_cast<SwGetRefField*>(pFld)->GetSetRefName(),
-                                    static_cast<SwGetRefField*>(pFld)->GetSubType(),
-                                    static_cast<SwGetRefField*>(pFld)->GetSeqNo() );
+                rWrtSh.SwCrsrShell::GotoRefMark( static_cast<SwGetRefField*>(pField)->GetSetRefName(),
+                                    static_cast<SwGetRefField*>(pField)->GetSubType(),
+                                    static_cast<SwGetRefField*>(pField)->GetSeqNo() );
                 rWrtSh.EndAllAction();
                 rReq.Done();
             }
@@ -738,7 +738,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 }
 
                 OUString sFormula(static_cast<const SfxStringItem*>(pItem)->GetValue());
-                SwFldMgr aFldMgr;
+                SwFieldMgr aFieldMgr;
                 rWrtSh.StartAllAction();
                 bool bDelSel;
                 if( (bDelSel = rWrtSh.HasSelection()) )
@@ -751,23 +751,23 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     rWrtSh.EnterStdMode();
                 }
 
-                if( !bDelSel && aFldMgr.GetCurFld() && TYP_FORMELFLD == aFldMgr.GetCurTypeId() )
-                    aFldMgr.UpdateCurFld( aFldMgr.GetCurFld()->GetFormat(), OUString(), sFormula );
+                if( !bDelSel && aFieldMgr.GetCurField() && TYP_FORMELFLD == aFieldMgr.GetCurTypeId() )
+                    aFieldMgr.UpdateCurField( aFieldMgr.GetCurField()->GetFormat(), OUString(), sFormula );
                 else if( !sFormula.isEmpty() )
                 {
-                    if( rWrtSh.IsCrsrInTbl() )
+                    if( rWrtSh.IsCrsrInTable() )
                     {
                         SfxItemSet aSet( rWrtSh.GetAttrPool(), RES_BOXATR_FORMULA, RES_BOXATR_FORMULA );
-                        aSet.Put( SwTblBoxFormula( sFormula ));
-                        rWrtSh.SetTblBoxFormulaAttrs( aSet );
+                        aSet.Put( SwTableBoxFormula( sFormula ));
+                        rWrtSh.SetTableBoxFormulaAttrs( aSet );
                         rWrtSh.UpdateTable();
                     }
                     else
                     {
                         SvNumberFormatter* pFormatter = rWrtSh.GetNumberFormatter();
-                        sal_uLong nSysNumFmt = pFormatter->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM);
-                        SwInsertFld_Data aData(TYP_FORMELFLD, nsSwGetSetExpType::GSE_FORMULA, OUString(), sFormula, nSysNumFmt);
-                        aFldMgr.InsertFld(aData);
+                        sal_uLong nSysNumFormat = pFormatter->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM);
+                        SwInsertField_Data aData(TYP_FORMELFLD, nsSwGetSetExpType::GSE_FORMULA, OUString(), sFormula, nSysNumFormat);
+                        aFieldMgr.InsertField(aData);
                     }
                 }
 
@@ -778,7 +778,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             }
             else
             {
-                rWrtSh.EndAllTblBoxEdit();
+                rWrtSh.EndAllTableBoxEdit();
                 pVFrame->ToggleChildWindow( nId );
                 if( !pVFrame->HasChildWindow( nId ) )
                     pVFrame->GetBindings().InvalidateAll( true );
@@ -789,7 +789,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
         break;
         case FN_TABLE_UNSET_READ_ONLY:
         {
-            rWrtSh.UnProtectTbls();
+            rWrtSh.UnProtectTables();
         }
         break;
         case FN_EDIT_HYPERLINK:
@@ -802,7 +802,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             {
                 rWrtSh.StartAction();
                 rWrtSh.Push();
-                if(!rWrtSh.SelectTxtAttr( RES_TXTATR_INETFMT ))
+                if(!rWrtSh.SelectTextAttr( RES_TXTATR_INETFMT ))
                     rWrtSh.SelWrd();
             }
             //now remove the attribute
@@ -939,7 +939,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             // Left border as offset
             //#i24363# tab stops relative to indent
             const long nOff = rWrtSh.getIDocumentSettingAccess()->get(DocumentSettingId::TABS_RELATIVE_TO_INDENT) ?
-                static_cast<const SvxLRSpaceItem&>(aCoreSet.Get( RES_LR_SPACE )).GetTxtLeft() : 0;
+                static_cast<const SvxLRSpaceItem&>(aCoreSet.Get( RES_LR_SPACE )).GetTextLeft() : 0;
             SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff );
             aCoreSet.Put( aOff );
 
@@ -1009,8 +1009,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 if( SfxItemState::SET == pSet->GetItemState( RES_PARATR_DROP, false, &pItem ))
                 {
                     OUString sCharStyleName;
-                    if(static_cast<const SwFmtDrop*>(pItem)->GetCharFmt())
-                        sCharStyleName = static_cast<const SwFmtDrop*>(pItem)->GetCharFmt()->GetName();
+                    if(static_cast<const SwFormatDrop*>(pItem)->GetCharFormat())
+                        sCharStyleName = static_cast<const SwFormatDrop*>(pItem)->GetCharFormat()->GetName();
                     pSet->Put(SfxStringItem(FN_DROP_CHAR_STYLE_NAME, sCharStyleName));
                 }
             }
@@ -1035,12 +1035,12 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     if ( SfxItemState::SET == pSet->GetItemState(FN_DROP_TEXT, false, &pItem) )
                     {
                         if ( !static_cast<const SfxStringItem*>(pItem)->GetValue().isEmpty() )
-                            rWrtSh.ReplaceDropTxt(static_cast<const SfxStringItem*>(pItem)->GetValue(), pPaM);
+                            rWrtSh.ReplaceDropText(static_cast<const SfxStringItem*>(pItem)->GetValue(), pPaM);
                     }
                     rWrtSh.SetAttrSet( *pSet, SetAttrMode::DEFAULT, pPaM );
                     rWrtSh.EndAction();
-                    SwTxtFmtColl* pColl = rWrtSh.GetPaMTxtFmtColl( pPaM );
-                    if(pColl && pColl->IsAutoUpdateFmt())
+                    SwTextFormatColl* pColl = rWrtSh.GetPaMTextFormatColl( pPaM );
+                    if(pColl && pColl->IsAutoUpdateFormat())
                     {
                         rWrtSh.AutoUpdatePara(pColl, *pSet, pPaM);
                     }
@@ -1336,16 +1336,16 @@ void SwTextShell::Execute(SfxRequest &rReq)
         rWrtSh.GetCurAttr(aSet);
         if(SfxItemState::SET <= aSet.GetItemState( RES_TXTATR_INETFMT, true ))
         {
-            const SwFmtINetFmt& rINetFmt = dynamic_cast<const SwFmtINetFmt&>( aSet.Get(RES_TXTATR_INETFMT, true) );
+            const SwFormatINetFormat& rINetFormat = dynamic_cast<const SwFormatINetFormat&>( aSet.Get(RES_TXTATR_INETFMT, true) );
             if( nSlot == FN_COPY_HYPERLINK_LOCATION )
             {
                 ::uno::Reference< datatransfer::clipboard::XClipboard > xClipboard = GetView().GetEditWin().GetClipboard();
                 vcl::unohelper::TextDataObject::CopyStringTo(
-                        rINetFmt.GetValue(),
+                        rINetFormat.GetValue(),
                         xClipboard );
             }
             else
-                rWrtSh.ClickToINetAttr(rINetFmt, URLLOAD_NOFILTER);
+                rWrtSh.ClickToINetAttr(rINetFormat, URLLOAD_NOFILTER);
         }
     }
     break;
@@ -1437,7 +1437,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             const sal_Int16 nWordType = ::i18n::WordType::DICTIONARY_WORD;
             bool bWord = rSh.IsInWord( nWordType ) || rSh.IsStartWord( nWordType ) || rSh.IsEndWord( nWordType );
             if (bValid && bWord)
-               aText = rSh.HasSelection()? OUString(rSh.GetSelTxt()) : rSh.GetCurWord();
+               aText = rSh.HasSelection()? OUString(rSh.GetSelText()) : rSh.GetCurWord();
 
             LanguageType nLang = rSh.GetCurLang();
             LanguageTag aLanguageTag( nLang);
@@ -1476,7 +1476,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
                     rSet.DisableItem(nWhich);
                 }
                 else if ( nWhich == FN_EDIT_FORMULA
-                          && rSh.CrsrInsideInputFld() )
+                          && rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem( nWhich );
                 }
@@ -1492,7 +1492,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
                 if ( rSh.GetFrmType(0,true) & nNoType )
                     rSet.DisableItem(nWhich);
 
-                if ( rSh.CrsrInsideInputFld() )
+                if ( rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem( nWhich );
                 }
@@ -1503,15 +1503,15 @@ void SwTextShell::GetState( SfxItemSet &rSet )
         case SID_INSERTDOC:
         case FN_INSERT_GLOSSARY:
         case FN_EXPAND_GLOSSARY:
-            if ( rSh.CrsrInsideInputFld() )
+            if ( rSh.CrsrInsideInputField() )
             {
                 rSet.DisableItem( nWhich );
             }
             break;
 
         case FN_INSERT_TABLE:
-            if ( rSh.CrsrInsideInputFld()
-                 || rSh.GetTableFmt()
+            if ( rSh.CrsrInsideInputField()
+                 || rSh.GetTableFormat()
                  || (rSh.GetFrmType(0,true) & FrmTypeFlags::FOOTNOTE) )
             {
                 rSet.DisableItem( nWhich );
@@ -1524,14 +1524,14 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             break;
         case FN_GOTO_REFERENCE:
             {
-                SwField *pFld = rSh.GetCurFld();
-                if ( !pFld || (pFld &&  pFld->GetTypeId() != TYP_GETREFFLD) )
+                SwField *pField = rSh.GetCurField();
+                if ( !pField || (pField &&  pField->GetTypeId() != TYP_GETREFFLD) )
                     rSet.DisableItem(nWhich);
             }
             break;
         case FN_AUTOFORMAT_AUTO:
             {
-                rSet.Put( SfxBoolItem( nWhich, SvxAutoCorrCfg::Get().IsAutoFmtByInput() ));
+                rSet.Put( SfxBoolItem( nWhich, SvxAutoCorrCfg::Get().IsAutoFormatByInput() ));
             }
             break;
 
@@ -1611,7 +1611,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
 
         case FN_INSERT_BOOKMARK:
             if( rSh.IsTableMode()
-                || rSh.CrsrInsideInputFld() )
+                || rSh.CrsrInsideInputField() )
             {
                 rSet.DisableItem( nWhich );
             }
@@ -1619,7 +1619,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
 
         case FN_INSERT_BREAK:
             if ( rSh.HasReadonlySel()
-                 && !rSh.CrsrInsideInputFld() )
+                 && !rSh.CrsrInsideInputField() )
             {
                 rSet.DisableItem( nWhich );
             }
@@ -1628,7 +1628,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
         case FN_INSERT_BREAK_DLG:
         case FN_INSERT_COLUMN_BREAK:
         case FN_INSERT_PAGEBREAK:
-            if( rSh.CrsrInsideInputFld() )
+            if( rSh.CrsrInsideInputField() )
             {
                 rSet.DisableItem( nWhich );
             }
@@ -1643,7 +1643,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             case FN_TABLE_SORT_DIALOG:
             case FN_SORTING_DLG:
                 if(!rSh.HasSelection() ||
-                        (FN_TABLE_SORT_DIALOG == nWhich && !rSh.GetTableFmt()))
+                        (FN_TABLE_SORT_DIALOG == nWhich && !rSh.GetTableFormat()))
                     rSet.DisableItem( nWhich );
             break;
 
@@ -1651,7 +1651,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
                 {
                     SvtCJKOptions aCJKOptions;
                     if( !aCJKOptions.IsRubyEnabled()
-                        || rSh.CrsrInsideInputFld() )
+                        || rSh.CrsrInsideInputField() )
                     {
                         GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, false );
                         rSet.DisableItem(nWhich);
@@ -1665,7 +1665,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
                 if( GetView().GetDocShell()->IsReadOnly()
                     || ( !GetView().GetViewFrame()->HasChildWindow(nWhich)
                          && rSh.HasReadonlySel() )
-                    || rSh.CrsrInsideInputFld() )
+                    || rSh.CrsrInsideInputField() )
                 {
                     rSet.DisableItem(nWhich);
                 }
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index a36f8f39ebe3..0622645c4215 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -205,13 +205,13 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
                 sDBName += OUString(DB_DELIM);
                 sDBName += sColumnName;
 
-                SwFldMgr aFldMgr(GetShellPtr());
-                SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, OUString(), 0);
+                SwFieldMgr aFieldMgr(GetShellPtr());
+                SwInsertField_Data aData(TYP_DBFLD, 0, sDBName, OUString(), 0);
                 if(pConnectionItem)
                     aData.m_aDBConnection = static_cast<const SfxUsrAnyItem*>(pConnectionItem)->GetValue();
                 if(pColumnItem)
                     aData.m_aDBColumn = static_cast<const SfxUsrAnyItem*>(pColumnItem)->GetValue();
-                aFldMgr.InsertFld(aData);
+                aFieldMgr.InsertField(aData);
                 SfxViewFrame* pViewFrame = GetView().GetViewFrame();
                 uno::Reference< XDispatchRecorder > xRecorder =
                         pViewFrame->GetBindings().GetRecorder();
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index cd61fd1b1ec9..5e5162aa6bcc 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -159,7 +159,7 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
         break;
         case FN_REMOVE_DIRECT_CHAR_FORMATS:
             if( !rSh.HasReadonlySel() && rSh.IsEndPara())
-                rSh.DontExpandFmt();
+                rSh.DontExpandFormat();
         break;
         default:
             OSL_FAIL("wrong  dispatcher");
@@ -173,13 +173,13 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
     const SfxItemSet* pArgs = rReq.GetArgs();
     bool bArgs = pArgs != 0 && pArgs->Count() > 0;
     SwWrtShell& rWrtSh = GetShell();
-    SwTxtFmtColl* pColl = 0;
+    SwTextFormatColl* pColl = 0;
 
-    // Is only set if the whole paragraph is selected and AutoUpdateFmt is set.
+    // Is only set if the whole paragraph is selected and AutoUpdateFormat is set.
     if (rWrtSh.HasSelection() && rWrtSh.IsSelFullPara())
     {
-        pColl = rWrtSh.GetCurTxtFmtColl();
-        if ( pColl && !pColl->IsAutoUpdateFmt() )
+        pColl = rWrtSh.GetCurTextFormatColl();
+        if ( pColl && !pColl->IsAutoUpdateFormat() )
             pColl = 0;
     }
     SfxItemPool& rPool = GetPool();
@@ -187,31 +187,31 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
     switch (nSlot)
     {
         case FN_TXTATR_INET:
-        // Special treatment of the PoolId of the SwFmtInetFmt
+        // Special treatment of the PoolId of the SwFormatInetFormat
         if(bArgs)
         {
             const SfxPoolItem& rItem = pArgs->Get( nWhich );
 
-            SwFmtINetFmt aINetFmt( static_cast<const SwFmtINetFmt&>(rItem) );
-            if ( USHRT_MAX == aINetFmt.GetVisitedFmtId() )
+            SwFormatINetFormat aINetFormat( static_cast<const SwFormatINetFormat&>(rItem) );
+            if ( USHRT_MAX == aINetFormat.GetVisitedFormatId() )
             {
                 OSL_ENSURE( false, "<SwTextShell::ExecCharAttrArgs(..)> - unexpected visited character format ID at hyperlink attribute" );
-                aINetFmt.SetVisitedFmtAndId(
-                        aINetFmt.GetVisitedFmt(),
-                        SwStyleNameMapper::GetPoolIdFromUIName( aINetFmt.GetVisitedFmt(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ) );
+                aINetFormat.SetVisitedFormatAndId(
+                        aINetFormat.GetVisitedFormat(),
+                        SwStyleNameMapper::GetPoolIdFromUIName( aINetFormat.GetVisitedFormat(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ) );
             }
-            if ( USHRT_MAX == aINetFmt.GetINetFmtId() )
+            if ( USHRT_MAX == aINetFormat.GetINetFormatId() )
             {
                 OSL_ENSURE( false, "<SwTextShell::ExecCharAttrArgs(..)> - unexpected unvisited character format ID at hyperlink attribute" );
-                aINetFmt.SetINetFmtAndId(
-                        aINetFmt.GetINetFmt(),
-                        SwStyleNameMapper::GetPoolIdFromUIName( aINetFmt.GetINetFmt(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ) );
+                aINetFormat.SetINetFormatAndId(
+                        aINetFormat.GetINetFormat(),
+                        SwStyleNameMapper::GetPoolIdFromUIName( aINetFormat.GetINetFormat(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ) );
             }
 
             if ( pColl )
-                pColl->SetFmtAttr( aINetFmt );
+                pColl->SetFormatAttr( aINetFormat );
             else
-                rWrtSh.SetAttrItem( aINetFmt );
+                rWrtSh.SetAttrItem( aINetFormat );
             rReq.Done();
         }
         break;
@@ -260,7 +260,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
                     aSetItem.PutItemForScriptType( nScriptTypes, aSize );
                     aAttrSet.Put( aSetItem.GetItemSet() );
                     if( pColl )
-                        pColl->SetFmtAttr( aAttrSet );
+                        pColl->SetFormatAttr( aAttrSet );
                     else
                         rWrtSh.SetAttrSet( aAttrSet, SetAttrMode::DEFAULT, pPaM.get() );
                 }
@@ -382,14 +382,14 @@ SET_LINESPACE:
 
                     for(sal_uInt16 i = 0; i < aRule.GetLevelCount(); i++)
                     {
-                        SvxNumberFormat aFmt(aRule.GetLevel(i));
-                        if(SVX_ADJUST_LEFT == aFmt.GetNumAdjust())
-                            aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
+                        SvxNumberFormat aFormat(aRule.GetLevel(i));
+                        if(SVX_ADJUST_LEFT == aFormat.GetNumAdjust())
+                            aFormat.SetNumAdjust( SVX_ADJUST_RIGHT );
 
-                        else if(SVX_ADJUST_RIGHT == aFmt.GetNumAdjust())
-                            aFmt.SetNumAdjust( SVX_ADJUST_LEFT );
+                        else if(SVX_ADJUST_RIGHT == aFormat.GetNumAdjust())
+                            aFormat.SetNumAdjust( SVX_ADJUST_LEFT );
 
-                        aRule.SetLevel(i, aFmt, aRule.Get(i) != 0);
+                        aRule.SetLevel(i, aFormat, aRule.Get(i) != 0);
                     }
                     SwNumRule aSetRule( pCurRule->GetName(),
                                         pCurRule->Get( 0 ).GetPositionAndSpaceMode() );
@@ -407,8 +407,8 @@ SET_LINESPACE:
             return;
     }
     SwWrtShell& rWrtSh = GetShell();
-    SwTxtFmtColl* pColl = rWrtSh.GetCurTxtFmtColl();
-    if(pColl && pColl->IsAutoUpdateFmt())
+    SwTextFormatColl* pColl = rWrtSh.GetCurTextFormatColl();
+    if(pColl && pColl->IsAutoUpdateFormat())
     {
         rWrtSh.AutoUpdatePara(pColl, aSet);
     }
@@ -434,11 +434,11 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
                 OUString sCharStyleName = static_cast<const SfxStringItem*>(pItem)->GetValue();
                 SfxItemSet aSet(GetPool(), RES_PARATR_DROP, RES_PARATR_DROP, 0L);
                 rSh.GetCurAttr(aSet);
-                SwFmtDrop aDropItem(static_cast<const SwFmtDrop&>(aSet.Get(RES_PARATR_DROP)));
-                SwCharFmt* pFmt = 0;
+                SwFormatDrop aDropItem(static_cast<const SwFormatDrop&>(aSet.Get(RES_PARATR_DROP)));
+                SwCharFormat* pFormat = 0;
                 if(!sCharStyleName.isEmpty())
-                    pFmt = rSh.FindCharFmtByName( sCharStyleName );
-                aDropItem.SetCharFmt( pFmt );
+                    pFormat = rSh.FindCharFormatByName( sCharStyleName );
+                aDropItem.SetCharFormat( pFormat );
                 aSet.Put(aDropItem);
                 rSh.SetAttrSet(aSet);
             }
@@ -468,7 +468,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
                     if ( SfxItemState::SET == aSet.GetItemState(HINT_END,false,&pItem) )
                     {
                         if ( !static_cast<const SfxStringItem*>(pItem)->GetValue().isEmpty() )
-                            rSh.ReplaceDropTxt(static_cast<const SfxStringItem*>(pItem)->GetValue());
+                            rSh.ReplaceDropText(static_cast<const SfxStringItem*>(pItem)->GetValue());
                     }
                     rSh.SetAttrSet(*pDlg->GetOutputItemSet());
                     rSh.StartUndo( UNDO_END );
@@ -510,7 +510,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
 {
     SwWrtShell &rSh = GetShell();
     SfxItemPool& rPool = GetPool();
-    SfxItemSet aCoreSet(rPool, aTxtFmtCollSetRange);
+    SfxItemSet aCoreSet(rPool, aTextFormatCollSetRange);
     // Request *all* text attributes from the core.
     // fdo#78737: this is called from SvxRuler, which requires the list indents!
     rSh.GetCurAttr(aCoreSet, /* bMergeIndentValuesOfNumRule = */ true);
diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx
index 0ea4d346762b..61a45da1d28f 100644
--- a/sw/source/uibase/shells/txtcrsr.cxx
+++ b/sw/source/uibase/shells/txtcrsr.cxx
@@ -355,11 +355,11 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
         break;
         case FN_NEXT_FOOTNOTE:
             rSh.MoveCrsr();
-            bRet = rSh.GotoNextFtnAnchor();
+            bRet = rSh.GotoNextFootnoteAnchor();
             break;
         case FN_PREV_FOOTNOTE:
             rSh.MoveCrsr();
-            bRet = rSh.GotoPrevFtnAnchor();
+            bRet = rSh.GotoPrevFootnoteAnchor();
             break;
         case FN_TO_HEADER:
             rSh.MoveCrsr();
@@ -367,7 +367,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
                 rSh.SttPg();
             else
             {
-                bool bMoved = rSh.GotoHeaderTxt();
+                bool bMoved = rSh.GotoHeaderText();
                 if ( !bMoved )
                     rSh.SttPg();
             }
@@ -379,7 +379,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
                 rSh.EndPg();
             else
             {
-                bool bMoved = rSh.GotoFooterTxt();
+                bool bMoved = rSh.GotoFooterText();
                 if ( !bMoved )
                     rSh.EndPg();
             }
@@ -388,13 +388,13 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
         case FN_FOOTNOTE_TO_ANCHOR:
             rSh.MoveCrsr();
             if ( FrmTypeFlags::FOOTNOTE & rSh.GetFrmType(0,false) )
-                rSh.GotoFtnAnchor();
+                rSh.GotoFootnoteAnchor();
             else
-                rSh.GotoFtnTxt();
+                rSh.GotoFootnoteText();
             bSetRetVal = false;
             break;
         case FN_TO_FOOTNOTE_AREA :
-            rSh.GotoFtnTxt();
+            rSh.GotoFootnoteText();
             break;
         case FN_PREV_TABLE:
             bRet = rSh.MoveTable( fnTablePrev, fnTableStart);
@@ -415,16 +415,16 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
             bRet = rSh.GotoNxtPrvTOXMark( false );
             break;
         case FN_NEXT_TBLFML:
-            bRet = rSh.GotoNxtPrvTblFormula( true, false );
+            bRet = rSh.GotoNxtPrvTableFormula( true, false );
             break;
         case FN_PREV_TBLFML:
-            bRet = rSh.GotoNxtPrvTblFormula( false, false );
+            bRet = rSh.GotoNxtPrvTableFormula( false, false );
             break;
         case FN_NEXT_TBLFML_ERR:
-            bRet = rSh.GotoNxtPrvTblFormula( true, true );
+            bRet = rSh.GotoNxtPrvTableFormula( true, true );
             break;
         case FN_PREV_TBLFML_ERR:
-            bRet = rSh.GotoNxtPrvTblFormula( false, true );
+            bRet = rSh.GotoNxtPrvTableFormula( false, true );
             break;
         default:
             OSL_FAIL("wrong dispatcher");
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index 9886a8a048df..30bf893c550f 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -123,13 +123,13 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
             //convert type of linked bitmaps from SVX_NUM_BITMAP to (SVX_NUM_BITMAP|LINK_TOKEN)
             for ( sal_uInt16 i = 0; i < aRule.GetLevelCount(); i++ )
             {
-                SvxNumberFormat aFmt( aRule.GetLevel( i ) );
-                if ( SVX_NUM_BITMAP == aFmt.GetNumberingType() )
+                SvxNumberFormat aFormat( aRule.GetLevel( i ) );
+                if ( SVX_NUM_BITMAP == aFormat.GetNumberingType() )
                 {
-                    const SvxBrushItem* pBrush = aFmt.GetBrush();
+                    const SvxBrushItem* pBrush = aFormat.GetBrush();
                     if(pBrush && !pBrush->GetGraphicLink().isEmpty())
-                        aFmt.SetNumberingType(SvxExtNumType(SVX_NUM_BITMAP|LINK_TOKEN));
-                    aRule.SetLevel(i, aFmt, aRule.Get(i) != 0);
+                        aFormat.SetNumberingType(SvxExtNumType(SVX_NUM_BITMAP|LINK_TOKEN));
+                    aRule.SetLevel(i, aFormat, aRule.Get(i) != 0);
                 }
             }
             if(bHtml)
@@ -157,19 +157,19 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
             {
                 for ( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
                 {
-                    SvxNumberFormat aFmt( aSvxRule.GetLevel( n ) );
+                    SvxNumberFormat aFormat( aSvxRule.GetLevel( n ) );
                     if ( n && bHtml )
                     {
                         // 1/2" for HTML
-                        aFmt.SetAbsLSpace(n * 720);
+                        aFormat.SetAbsLSpace(n * 720);
                     }
                     // #i38904#  Default alignment for
                     // numbering/bullet should be rtl in rtl paragraph:
                     if ( bRightToLeft )
                     {
-                        aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
+                        aFormat.SetNumAdjust( SVX_ADJUST_RIGHT );
                     }
-                    aSvxRule.SetLevel( n, aFmt, false );
+                    aSvxRule.SetLevel( n, aFormat, false );
                 }
                 aSvxRule.SetFeatureFlag(SvxNumRuleFlags::ENABLE_EMBEDDED_BMP, false);
             }
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index c180c383446f..a0c491fe0a84 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -110,7 +110,7 @@ IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl)
     if (pDocSh)
     {
         SwgReaderOption aOption;
-        aOption.SetTxtFmts(true);
+        aOption.SetTextFormats(true);
         aOption.SetNumRules(true);
         pDocSh->LoadStylesFromFile(pEntry->maURL, aOption, false);
     }
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index a246a24ad57a..9bedd354bf49 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -224,7 +224,7 @@ StyleSet setupThemes()
     return aSet;
 }
 
-void changeFont(SwFmt* pFormat, SwDocStyleSheet* pStyle, FontSet& rFontSet)
+void changeFont(SwFormat* pFormat, SwDocStyleSheet* pStyle, FontSet& rFontSet)
 {
     bool bChanged = false;
 
@@ -258,11 +258,11 @@ void changeFont(SwFmt* pFormat, SwDocStyleSheet* pStyle, FontSet& rFontSet)
 
     if (bChanged)
     {
-        pFormat->SetFmtAttr(aFontItem);
+        pFormat->SetFormatAttr(aFontItem);
     }
 }
 
-/*void changeBorder(SwTxtFmtColl* pCollection, SwDocStyleSheet* pStyle, StyleSet& rStyleSet)
+/*void changeBorder(SwTextFormatColl* pCollection, SwDocStyleSheet* pStyle, StyleSet& rStyleSet)
 {
     if (pStyle->GetName() == "Heading")
     {
@@ -272,17 +272,17 @@ void changeFont(SwFmt* pFormat, SwDocStyleSheet* pStyle, FontSet& rFontSet)
         aBorderLine.SetColor(rColorSet.mBaseColors[0]);
         aBoxItem.SetLine(&aBorderLine, SvxBoxItemLine::BOTTOM);
 
-        pCollection->SetFmtAttr(aBoxItem);
+        pCollection->SetFormatAttr(aBoxItem);
     }
 }*/
 
-void changeColor(SwTxtFmtColl* pCollection, ColorSet& rColorSet, StyleRedefinition* pRedefinition)
+void changeColor(SwTextFormatColl* pCollection, ColorSet& rColorSet, StyleRedefinition* pRedefinition)
 {
     Color aColor = pRedefinition->getColor(rColorSet);
 
     SvxColorItem aColorItem(pCollection->GetColor());
     aColorItem.SetValue(aColor);
-    pCollection->SetFmtAttr(aColorItem);
+    pCollection->SetFormatAttr(aColorItem);
 }
 
 std::vector<FontSet> initFontSets()
@@ -435,7 +435,7 @@ void applyTheme(SfxStyleSheetBasePool* pPool, const OUString& sFontSetName, cons
 
     while (pStyle)
     {
-        SwTxtFmtColl* pCollection = pStyle->GetCollection();
+        SwTextFormatColl* pCollection = pStyle->GetCollection();
 
         changeFont(pCollection, pStyle, aFontSet);
 
@@ -454,9 +454,9 @@ void applyTheme(SfxStyleSheetBasePool* pPool, const OUString& sFontSetName, cons
 
     while (pStyle)
     {
-        SwCharFmt* pCharFormat = pStyle->GetCharFmt();
+        SwCharFormat* pCharFormat = pStyle->GetCharFormat();
 
-        changeFont(static_cast<SwFmt*>(pCharFormat), pStyle, aFontSet);
+        changeFont(static_cast<SwFormat*>(pCharFormat), pStyle, aFontSet);
 
         pStyle = static_cast<SwDocStyleSheet*>(pPool->Next());
     }
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index 68d521d789cd..3b7a3e2fb389 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -144,7 +144,7 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings )
     uno::Reference< frame::XModel > xChartModel;
     OUString aRangeString;
 
-    if( rWrtShell.IsCrsrInTbl())
+    if( rWrtShell.IsCrsrInTable())
     {
         if (!rWrtShell.IsTableMode())
         {
@@ -152,18 +152,18 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings )
             rWrtShell.GetView().GetViewFrame()->GetDispatcher()->
                 Execute(FN_TABLE_SELECT_ALL, SfxCallMode::SYNCHRON);
         }
-        if( ! rWrtShell.IsTblComplexForChart())
+        if( ! rWrtShell.IsTableComplexForChart())
         {
-            SwFrmFmt* pTblFmt = rWrtShell.GetTableFmt();
-            aRangeString = pTblFmt->GetName() + "." + rWrtShell.GetBoxNms();
+            SwFrameFormat* pTableFormat = rWrtShell.GetTableFormat();
+            aRangeString = pTableFormat->GetName() + "." + rWrtShell.GetBoxNms();
 
             // get table data provider
             xDataProvider.set( pView->GetDocShell()->getIDocumentChartDataProviderAccess()->GetChartDataProvider( true ) );
         }
     }
 
-    SwFlyFrmFmt *pFlyFrmFmt = 0;
-    xChartModel.set( SwTableFUNC( &rWrtShell, false ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrmFmt ));
+    SwFlyFrameFormat *pFlyFrameFormat = 0;
+    xChartModel.set( SwTableFUNC( &rWrtShell, false ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrameFormat ));
 
     //open wizard
     //@todo get context from writer if that has one
@@ -211,8 +211,8 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings )
                             {
                                 //calculate and set new position
                                 SwRect aSwRect;
-                                if (pFlyFrmFmt)
-                                    aSwRect = pFlyFrmFmt->GetAnchoredObj()->GetObjRectWithSpaces();
+                                if (pFlyFrameFormat)
+                                    aSwRect = pFlyFrameFormat->GetAnchoredObj()->GetObjRectWithSpaces();
                                 Rectangle aRect( aSwRect.SVRect() );
                                 Point aDialogPos = SwGetChartDialogPos( &rWrtShell.GetView().GetEditWin(), aDialogSize, aRect );
                                 xDialogProps->setPropertyValue("Position",
diff --git a/sw/source/uibase/table/swtablerep.cxx b/sw/source/uibase/table/swtablerep.cxx
index 49fe7168c219..07cbad16a25c 100644
--- a/sw/source/uibase/table/swtablerep.cxx
+++ b/sw/source/uibase/table/swtablerep.cxx
@@ -55,7 +55,7 @@
 
 SwTableRep::SwTableRep( const SwTabCols& rTabCol )
     :
-    nTblWidth(0),
+    nTableWidth(0),
     nSpace(0),
     nLeftSpace(0),
     nRightSpace(0),
@@ -152,7 +152,7 @@ bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
             rTabCols[i] = nPos + nLeft;
             rTabCols.SetHidden( i, bOld );
         }
-        rTabCols.SetRight(nLeft + nTblWidth);
+        rTabCols.SetRight(nLeft + nTableWidth);
     }
     else
     {
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx
index 3f48722aeac5..a21b1687de17 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -161,35 +161,35 @@ void SwTableFUNC::InitTabCols()
 {
     OSL_ENSURE(pSh, "no Shell");
 
-    if( pFmt && pSh)
+    if( pFormat && pSh)
         pSh->GetTabCols( aCols );
 }
 
-SwTableFUNC::SwTableFUNC(SwWrtShell *pShell, bool bCopyFmt)
-    : pFmt(pShell->GetTableFmt()),
+SwTableFUNC::SwTableFUNC(SwWrtShell *pShell, bool bCopyFormat)
+    : pFormat(pShell->GetTableFormat()),
       pSh(pShell),
-      bCopy(bCopyFmt)
+      bCopy(bCopyFormat)
 {
     // if applicable copy the format for edit
-    if( pFmt && bCopy )
-        pFmt = new SwFrmFmt( *pFmt );
+    if( pFormat && bCopy )
+        pFormat = new SwFrameFormat( *pFormat );
 }
 
 SwTableFUNC::~SwTableFUNC()
 {
     if(bCopy)
-        delete pFmt;
+        delete pFormat;
 }
 
 void SwTableFUNC::UpdateChart()
 {
     //Update of the fields triggered by the user, all Charts of
     //the table will be brought up to date
-    SwFrmFmt *pFmt2 = pSh->GetTableFmt();
-    if ( pFmt2 && pSh->HasOLEObj( pFmt2->GetName() ) )
+    SwFrameFormat *pFormat2 = pSh->GetTableFormat();
+    if ( pFormat2 && pSh->HasOLEObj( pFormat2->GetName() ) )
     {
         pSh->StartAllAction();
-        pSh->UpdateCharts( pFmt2->GetName() );
+        pSh->UpdateCharts( pFormat2->GetName() );
         pSh->EndAllAction();
     }
 }
@@ -198,22 +198,22 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
         uno::Reference< chart2::data::XDataProvider > &rxDataProvider,
         bool bFillWithData,
         const OUString &rCellRange,
-        SwFlyFrmFmt** ppFlyFrmFmt )
+        SwFlyFrameFormat** ppFlyFrameFormat )
 {
     uno::Reference< frame::XModel > xChartModel;
     pSh->StartUndo( UNDO_UI_INSERT_CHART );
     pSh->StartAllAction();
 
     OUString aName;
-    if (pSh->IsCrsrInTbl())
+    if (pSh->IsCrsrInTable())
     {
-        aName = pSh->GetTableFmt()->GetName();
+        aName = pSh->GetTableFormat()->GetName();
         // insert node before table
         pSh->MoveTable( fnTableCurr, fnTableStart );
         pSh->Up( false, 1, false );
-        if ( pSh->IsCrsrInTbl() )
+        if ( pSh->IsCrsrInTable() )
         {
-            if ( aName != pSh->GetTableFmt()->GetName() )
+            if ( aName != pSh->GetTableFormat()->GetName() )
                 pSh->Down( false, 1, false ); // two adjacent tables
         }
         pSh->SplitNode();
@@ -229,10 +229,10 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
     if ( xObj.is() )
     {
 
-        SwFlyFrmFmt* pTmp = 0;
+        SwFlyFrameFormat* pTmp = 0;
         pSh->InsertOleObject( aEmbObjRef, &pTmp );
-        if (ppFlyFrmFmt)
-            *ppFlyFrmFmt = pTmp;
+        if (ppFlyFrameFormat)
+            *ppFlyFrameFormat = pTmp;
 
         uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY );
         if( xCompSupp.is())
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index 6d8a7670fcde..2a01c57a714b 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -61,7 +61,7 @@ class SwFormatTablePage : public SfxTabPage
 
     VclPtr<ListBox>        m_pTextDirectionLB;
 
-    SwTableRep*     pTblData;
+    SwTableRep*     pTableData;
     SwTwips         nSaveWidth;
     SwTwips         nMinTableWidth;
     bool            bModified;
@@ -103,7 +103,7 @@ class SwTableColumnPage : public SfxTabPage
     VclPtr<PushButton>     m_pUpBtn;
     VclPtr<PushButton>     m_pDownBtn;
 
-    SwTableRep*     pTblData;
+    SwTableRep*     pTableData;
     PercentField  m_aFieldArr[MET_FIELDS];
     VclPtr<FixedText>      m_pTextArr[MET_FIELDS];
     SwTwips         nTableWidth;
@@ -111,9 +111,9 @@ class SwTableColumnPage : public SfxTabPage
     sal_uInt16          nNoOfCols;
     sal_uInt16          nNoOfVisibleCols;
     // Remember the width, when switching to autoalign
-    sal_uInt16          aValueTbl[MET_FIELDS];// primary assignment of the MetricFields
+    sal_uInt16          aValueTable[MET_FIELDS];// primary assignment of the MetricFields
     bool            bModified:1;
-    bool            bModifyTbl:1;
+    bool            bModifyTable:1;
     bool            bPercentMode:1;
 
     void        Init(bool bWeb);
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index 2aaa3346dc1c..695d62a77517 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -111,18 +111,18 @@ void lcl_getTableAttributes( SfxItemSet& rSet, SwWrtShell &rSh )
 
     rSet.Put( SfxUInt16Item( FN_PARAM_TABLE_HEADLINE, rSh.GetRowsToRepeat() ) );
 
-    SwFrmFmt *pFrmFmt = rSh.GetTableFmt();
-    if(pFrmFmt)
+    SwFrameFormat *pFrameFormat = rSh.GetTableFormat();
+    if(pFrameFormat)
     {
-        rSet.Put( pFrmFmt->GetShadow() );
-        rSet.Put( pFrmFmt->GetBreak() );
-        rSet.Put( pFrmFmt->GetPageDesc() );
-        rSet.Put( pFrmFmt->GetLayoutSplit() );
-        rSet.Put( pFrmFmt->GetKeep() );
-        rSet.Put( pFrmFmt->GetFrmDir() );
+        rSet.Put( pFrameFormat->GetShadow() );
+        rSet.Put( pFrameFormat->GetBreak() );
+        rSet.Put( pFrameFormat->GetPageDesc() );
+        rSet.Put( pFrameFormat->GetLayoutSplit() );
+        rSet.Put( pFrameFormat->GetKeep() );
+        rSet.Put( pFrameFormat->GetFrmDir() );
     }
 
-    SwFmtRowSplit* pSplit = 0;
+    SwFormatRowSplit* pSplit = 0;
     rSh.GetRowSplit(pSplit);
     if(pSplit)
         rSet.Put(*pSplit);
@@ -161,44 +161,44 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh )
     if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem) )
         rSh.SetRowsToRepeat( static_cast<const SfxUInt16Item*>(pItem)->GetValue() );
 
-    SwFrmFmt* pFrmFmt = rSh.GetTableFmt();
-    if(pFrmFmt)
+    SwFrameFormat* pFrameFormat = rSh.GetTableFormat();
+    if(pFrameFormat)
     {
         //RES_SHADOW
         pItem=0;
         rSet.GetItemState(rSet.GetPool()->GetWhich(RES_SHADOW), false, &pItem);
         if(pItem)
-            pFrmFmt->SetFmtAttr( *pItem );
+            pFrameFormat->SetFormatAttr( *pItem );
 
         //RES_BREAK
         pItem=0;
         rSet.GetItemState(rSet.GetPool()->GetWhich(RES_BREAK), false, &pItem);
         if(pItem)
-            pFrmFmt->SetFmtAttr( *pItem );
+            pFrameFormat->SetFormatAttr( *pItem );
 
         //RES_PAGEDESC
         pItem=0;
         rSet.GetItemState(rSet.GetPool()->GetWhich(RES_PAGEDESC), false, &pItem);
         if(pItem)
-            pFrmFmt->SetFmtAttr( *pItem );
+            pFrameFormat->SetFormatAttr( *pItem );
 
         //RES_LAYOUT_SPLIT
         pItem=0;
         rSet.GetItemState(rSet.GetPool()->GetWhich(RES_LAYOUT_SPLIT), false, &pItem);
         if(pItem)
-            pFrmFmt->SetFmtAttr( *pItem );
+            pFrameFormat->SetFormatAttr( *pItem );
 
         //RES_KEEP
         pItem=0;
         rSet.GetItemState(rSet.GetPool()->GetWhich(RES_KEEP), false, &pItem);
         if(pItem)
-            pFrmFmt->SetFmtAttr( *pItem );
+            pFrameFormat->SetFormatAttr( *pItem );
 
         //RES_FRAMEDIR
         pItem=0;
         rSet.GetItemState(rSet.GetPool()->GetWhich(RES_FRAMEDIR), false, &pItem);
         if(pItem)
-            pFrmFmt->SetFmtAttr( *pItem );
+            pFrameFormat->SetFormatAttr( *pItem );
     }
 
     if( SfxItemState::SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, false, &pItem) )
@@ -212,13 +212,13 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh )
         rSh.SetBoxAlign(static_cast<const SfxUInt16Item*>((pItem))->GetValue());
 
     if( SfxItemState::SET == rSet.GetItemState( RES_ROW_SPLIT, false, &pItem) )
-        rSh.SetRowSplit(*static_cast<const SwFmtRowSplit*>(pItem));
+        rSh.SetRowSplit(*static_cast<const SwFormatRowSplit*>(pItem));
 }
 }//end anonymous namespace
 
 SwFormatClipboard::SwFormatClipboard()
         : m_nSelectionType(0)
-        , m_pItemSet_TxtAttr(0)
+        , m_pItemSet_TextAttr(0)
         , m_pItemSet_ParAttr(0)
         , m_pTableItemSet(0)
         , m_bPersistentCopy(false)
@@ -226,14 +226,14 @@ SwFormatClipboard::SwFormatClipboard()
 }
 SwFormatClipboard::~SwFormatClipboard()
 {
-    delete m_pItemSet_TxtAttr;
+    delete m_pItemSet_TextAttr;
     delete m_pItemSet_ParAttr;
     delete m_pTableItemSet;
 }
 
 bool SwFormatClipboard::HasContent() const
 {
-    return m_pItemSet_TxtAttr!=0
+    return m_pItemSet_TextAttr!=0
         || m_pItemSet_ParAttr!=0
         || m_pTableItemSet != 0
         || !m_aCharStyle.isEmpty()
@@ -275,7 +275,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
     m_bPersistentCopy = bPersistentCopy;
 
     int nSelectionType = rWrtShell.GetSelectionType();
-    SfxItemSet* pItemSet_TxtAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool, true );
+    SfxItemSet* pItemSet_TextAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool, true );
     SfxItemSet* pItemSet_ParAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool, false );
 
     rWrtShell.StartAction();
@@ -338,14 +338,14 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
             pCrsr->Move( bForwardSelection ? fnMoveBackward : fnMoveForward );
     }
 
-    if(pItemSet_TxtAttr)
+    if(pItemSet_TextAttr)
     {
         if( nSelectionType & (nsSelectionType::SEL_FRM | nsSelectionType::SEL_OLE | nsSelectionType::SEL_GRF) )
-            rWrtShell.GetFlyFrmAttr(*pItemSet_TxtAttr);
+            rWrtShell.GetFlyFrmAttr(*pItemSet_TextAttr);
         else
         {
             // get the text attributes from named and automatic formatting
-            rWrtShell.GetCurAttr(*pItemSet_TxtAttr);
+            rWrtShell.GetCurAttr(*pItemSet_TextAttr);
 
             if( nSelectionType & nsSelectionType::SEL_TXT )
             {
@@ -363,12 +363,12 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
             if( pDrawView->AreObjectsMarked() )
             {
                 bool bOnlyHardAttr = true;
-                pItemSet_TxtAttr = new SfxItemSet( pDrawView->GetAttrFromMarked(bOnlyHardAttr) );
+                pItemSet_TextAttr = new SfxItemSet( pDrawView->GetAttrFromMarked(bOnlyHardAttr) );
                 //remove attributes defining the type/data of custom shapes
-                pItemSet_TxtAttr->ClearItem(SDRATTR_CUSTOMSHAPE_ENGINE);
-                pItemSet_TxtAttr->ClearItem(SDRATTR_CUSTOMSHAPE_DATA);
-                pItemSet_TxtAttr->ClearItem(SDRATTR_CUSTOMSHAPE_GEOMETRY);
-                pItemSet_TxtAttr->ClearItem(SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL);
+                pItemSet_TextAttr->ClearItem(SDRATTR_CUSTOMSHAPE_ENGINE);
+                pItemSet_TextAttr->ClearItem(SDRATTR_CUSTOMSHAPE_DATA);
+                pItemSet_TextAttr->ClearItem(SDRATTR_CUSTOMSHAPE_GEOMETRY);
+                pItemSet_TextAttr->ClearItem(SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL);
             }
         }
     }
@@ -393,20 +393,20 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
     }
 
     m_nSelectionType = nSelectionType;
-    m_pItemSet_TxtAttr = pItemSet_TxtAttr;
+    m_pItemSet_TextAttr = pItemSet_TextAttr;
     m_pItemSet_ParAttr = pItemSet_ParAttr;
 
     if( nSelectionType & nsSelectionType::SEL_TXT )
     {
         // if text is selected save the named character format
-        SwFmt* pFmt = rWrtShell.GetCurCharFmt();
-        if( pFmt )
-            m_aCharStyle = pFmt->GetName();
+        SwFormat* pFormat = rWrtShell.GetCurCharFormat();
+        if( pFormat )
+            m_aCharStyle = pFormat->GetName();
 
         // and the named paragraph format
-        pFmt = rWrtShell.GetCurTxtFmtColl();
-        if( pFmt )
-            m_aParaStyle = pFmt->GetName();
+        pFormat = rWrtShell.GetCurTextFormatColl();
+        if( pFormat )
+            m_aParaStyle = pFormat->GetName();
     }
 
     rWrtShell.Pop(false);
@@ -479,13 +479,13 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
                 // if the style is found
                 if( pStyle )
                 {
-                    SwFmtCharFmt aFmt(pStyle->GetCharFmt());
+                    SwFormatCharFormat aFormat(pStyle->GetCharFormat());
                     // store the attributes from this style in aItemVector in order
                     // not to apply them as automatic formatting attributes later in the code
-                    lcl_AppendSetItems( aItemVector, aFmt.GetCharFmt()->GetAttrSet());
+                    lcl_AppendSetItems( aItemVector, aFormat.GetCharFormat()->GetAttrSet());
 
                     // apply the named format
-                    rWrtShell.SetAttrItem( aFmt );
+                    rWrtShell.SetAttrItem( aFormat );
                 }
             }
 
@@ -501,7 +501,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
                     lcl_AppendSetItems( aItemVector, pStyle->GetCollection()->GetAttrSet());
 
                     // apply the named format
-                    rWrtShell.SetTxtFmtColl( pStyle->GetCollection() );
+                    rWrtShell.SetTextFormatColl( pStyle->GetCollection() );
                 }
             }
         }
@@ -529,7 +529,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
         }
     }
 
-    if(m_pItemSet_TxtAttr)
+    if(m_pItemSet_TextAttr)
     {
         if( nSelectionType & nsSelectionType::SEL_DRW )
         {
@@ -537,19 +537,19 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
             if(pDrawView)
             {
                 bool bReplaceAll = true;
-                pDrawView->SetAttrToMarked(*m_pItemSet_TxtAttr, bReplaceAll);
+                pDrawView->SetAttrToMarked(*m_pItemSet_TextAttr, bReplaceAll);
             }
         }
         else
         {
             // temporary SfxItemSet
             boost::scoped_ptr<SfxItemSet> pTemplateItemSet(lcl_CreateEmptyItemSet(
-                    nSelectionType, *m_pItemSet_TxtAttr->GetPool(), true ));
+                    nSelectionType, *m_pItemSet_TextAttr->GetPool(), true ));
 
             if(pTemplateItemSet)
             {
                 // copy the stored automatic text attributes in a temporary SfxItemSet
-                pTemplateItemSet->Put( *m_pItemSet_TxtAttr );
+                pTemplateItemSet->Put( *m_pItemSet_TextAttr );
 
                 // only attributes that were not apply by named style attributes and automatic
                 // paragraph attributes should be applied
@@ -578,8 +578,8 @@ void SwFormatClipboard::Erase()
 {
     m_nSelectionType = 0;
 
-    delete m_pItemSet_TxtAttr;
-    m_pItemSet_TxtAttr = 0;
+    delete m_pItemSet_TextAttr;
+    m_pItemSet_TextAttr = 0;
 
     delete m_pItemSet_ParAttr;
     m_pItemSet_ParAttr = 0;
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 4ac28e81647e..144030b20242 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1131,7 +1131,7 @@ void SwPagePreview::Init(const SwViewOption * pPrefs)
     aOpt.SetPageBreak( false );
     aOpt.SetColumnBreak( false );
     aOpt.SetSoftHyph( false );
-    aOpt.SetFldName( false );
+    aOpt.SetFieldName( false );
     aOpt.SetPostIts( false );
     aOpt.SetShowHiddenChar( false );
     aOpt.SetShowHiddenField( false );
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index eb369258ce26..590774a9eb02 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -233,12 +233,12 @@ void SwView::SelectShell()
 
     // Decision if the UpdateTable has to be called
     bool bUpdateTable = false;
-    const SwFrmFmt* pCurTableFmt = m_pWrtShell->GetTableFmt();
-    if(pCurTableFmt && pCurTableFmt != m_pLastTableFormat)
+    const SwFrameFormat* pCurTableFormat = m_pWrtShell->GetTableFormat();
+    if(pCurTableFormat && pCurTableFormat != m_pLastTableFormat)
     {
         bUpdateTable = true; // can only be executed later
     }
-    m_pLastTableFormat = pCurTableFmt;
+    m_pLastTableFormat = pCurTableFormat;
 
     //SEL_TBL and SEL_TBL_CELLS can be ORed!
     int nNewSelectionType = (m_pWrtShell->GetSelectionType()
@@ -829,7 +829,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
             m_pWrtShell->MoveTo(&rPreviewViewShell);
             // to update the field command et.al. if necessary
             const SwViewOption* pPreviewOpt = rPreviewViewShell.GetViewOptions();
-            if( pPreviewOpt->IsFldName() != aUsrPref.IsFldName() ||
+            if( pPreviewOpt->IsFieldName() != aUsrPref.IsFieldName() ||
                     pPreviewOpt->IsShowHiddenField() != aUsrPref.IsShowHiddenField() ||
                     pPreviewOpt->IsShowHiddenPara() != aUsrPref.IsShowHiddenPara() ||
                     pPreviewOpt->IsShowHiddenChar() != aUsrPref.IsShowHiddenChar() )
@@ -940,17 +940,17 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     m_pWrtShell->SetReadOnlyAvailable( aUsrPref.IsCursorInProtectedArea() );
     m_pWrtShell->ApplyAccessiblityOptions(SW_MOD()->GetAccessibilityOptions());
 
-    if( m_pWrtShell->GetDoc()->getIDocumentState().IsUpdateExpFld() )
+    if( m_pWrtShell->GetDoc()->getIDocumentState().IsUpdateExpField() )
     {
         if (m_pWrtShell->GetDoc()->GetDocumentFieldsManager().containsUpdatableFields())
         {
             SET_CURR_SHELL( m_pWrtShell );
             m_pWrtShell->StartAction();
             m_pWrtShell->CalcLayout();
-            m_pWrtShell->GetDoc()->getIDocumentFieldsAccess().UpdateFlds(NULL, false);
+            m_pWrtShell->GetDoc()->getIDocumentFieldsAccess().UpdateFields(NULL, false);
             m_pWrtShell->EndAction();
         }
-        m_pWrtShell->GetDoc()->getIDocumentState().SetUpdateExpFldStat( false );
+        m_pWrtShell->GetDoc()->getIDocumentState().SetUpdateExpFieldStat( false );
     }
 
     // Update all tables if necessary:
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 46f4e5aa6d1c..a77ae11b771c 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -282,7 +282,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
             case FN_VIEW_FIELDS:
                 aBool.SetValue( SwViewOption::IsFieldShadings() ); break;
             case FN_VIEW_FIELDNAME:
-                aBool.SetValue( pOpt->IsFldName() ); break;
+                aBool.SetValue( pOpt->IsFieldName() ); break;
             case FN_VIEW_MARKS:
                 aBool.SetValue( lcl_IsViewMarks(*pOpt) ); break;
             case FN_VIEW_META_CHARS:
@@ -485,9 +485,9 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
 
     case FN_VIEW_FIELDNAME:
         if( STATE_TOGGLE == eState )
-            bFlag = !pOpt->IsFldName() ;
+            bFlag = !pOpt->IsFieldName() ;
 
-        pOpt->SetFldName( bFlag );
+        pOpt->SetFieldName( bFlag );
         break;
 
     case FN_VIEW_MARKS:
diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx
index 4081d58d0df4..5abd3b1e544a 100644
--- a/sw/source/uibase/uiview/view1.cxx
+++ b/sw/source/uibase/uiview/view1.cxx
@@ -81,10 +81,10 @@ void SwView::Activate(bool bMDIActivate)
 
         AttrChangedNotify(m_pWrtShell);
 
-        // Initialize Flddlg newly if necessary (e.g. for TYP_SETVAR)
-        sal_uInt16 nId = SwFldDlgWrapper::GetChildWindowId();
+        // Initialize Fielddlg newly if necessary (e.g. for TYP_SETVAR)
+        sal_uInt16 nId = SwFieldDlgWrapper::GetChildWindowId();
         SfxViewFrame* pVFrame = GetViewFrame();
-        SwFldDlgWrapper *pWrp = static_cast<SwFldDlgWrapper*>(pVFrame->GetChildWindow(nId));
+        SwFieldDlgWrapper *pWrp = static_cast<SwFieldDlgWrapper*>(pVFrame->GetChildWindow(nId));
         if (pWrp)
             pWrp->ReInitDlg(GetDocShell());
 
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 96012b98a3b5..b6f947ddfb5f 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -313,19 +313,19 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
 
     std::vector<OUString> aFormats;
     SwDoc* pDoc = pDocShell->GetDoc();
-    const size_t nArrLen = pDoc->GetFrmFmts()->size();
+    const size_t nArrLen = pDoc->GetFrameFormats()->size();
     for( size_t i = 0; i < nArrLen; ++i )
     {
-        const SwFrmFmt* pFmt = (*pDoc->GetFrmFmts())[ i ];
-        if(pFmt->IsDefault() || pFmt->IsAuto())
+        const SwFrameFormat* pFormat = (*pDoc->GetFrameFormats())[ i ];
+        if(pFormat->IsDefault() || pFormat->IsAuto())
             continue;
-        aFormats.push_back(pFmt->GetName());
+        aFormats.push_back(pFormat->GetName());
     }
 
     // pool formats
 
     const ::std::vector<OUString>& rFrmPoolArr(
-            SwStyleNameMapper::GetFrmFmtUINameArray());
+            SwStyleNameMapper::GetFrameFormatUINameArray());
     for( size_t i = 0; i < rFrmPoolArr.size(); ++i )
     {
         aFormats.push_back(rFrmPoolArr[i]);
@@ -467,12 +467,12 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
         // else this would reset the current setting for the frame holding the graphic
         if ( !bReplaceMode && rSh.IsFrmSelected() )
         {
-            SwFrmFmt* pFmt = pDoc->FindFrmFmtByName( sGraphicFormat );
-            if(!pFmt)
-                pFmt = pDoc->MakeFrmFmt(sGraphicFormat,
-                                        pDocShell->GetDoc()->GetDfltFrmFmt(),
+            SwFrameFormat* pFormat = pDoc->FindFrameFormatByName( sGraphicFormat );
+            if(!pFormat)
+                pFormat = pDoc->MakeFrameFormat(sGraphicFormat,
+                                        pDocShell->GetDoc()->GetDfltFrameFormat(),
                                         true, false);
-            rSh.SetFrmFmt( pFmt );
+            rSh.SetFrameFormat( pFormat );
         }
 
         RESOURCE_TYPE nResId = 0;
@@ -849,10 +849,10 @@ void SwView::Execute(SfxRequest &rReq)
             {
                 GetEditWin().SetChainMode( false );
             }
-            else if( m_pWrtShell->GetFlyFrmFmt() )
+            else if( m_pWrtShell->GetFlyFrameFormat() )
             {
-                const SwFrmFmt* pFmt = m_pWrtShell->GetFlyFrmFmt();
-                if(m_pWrtShell->GotoFly( pFmt->GetName(), FLYCNTTYPE_FRM ))
+                const SwFrameFormat* pFormat = m_pWrtShell->GetFlyFrameFormat();
+                if(m_pWrtShell->GotoFly( pFormat->GetName(), FLYCNTTYPE_FRM ))
                 {
                     m_pWrtShell->HideCrsr();
                     m_pWrtShell->EnterSelFrmMode();
@@ -975,8 +975,8 @@ void SwView::Execute(SfxRequest &rReq)
             {
                 const size_t nCurIdx = m_pWrtShell->GetCurPageDesc();
                 SwPageDesc aDesc( m_pWrtShell->GetPageDesc( nCurIdx ));
-                SwFrmFmt& rMaster = aDesc.GetMaster();
-                rMaster.SetFmtAttr(*pItem);
+                SwFrameFormat& rMaster = aDesc.GetMaster();
+                rMaster.SetFormatAttr(*pItem);
                 m_pWrtShell->ChgPageDesc( nCurIdx, aDesc);
             }
         }
@@ -1499,10 +1499,10 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
             else
             {
                 OUString sStr;
-                if( rShell.IsCrsrInTbl() )
+                if( rShell.IsCrsrInTable() )
                 {
                     // table name + cell coordinate
-                    sStr = rShell.GetTableFmt()->GetName();
+                    sStr = rShell.GetTableFormat()->GetName();
                     sStr += ":";
                     sStr += rShell.GetBoxNms();
                 }
@@ -1854,15 +1854,15 @@ void SwView::InsFrmMode(sal_uInt16 nCols)
     {
         SwFlyFrmAttrMgr aMgr( true, m_pWrtShell, FRMMGR_TYPE_TEXT );
 
-        const SwFrmFmt &rPageFmt =
+        const SwFrameFormat &rPageFormat =
                 m_pWrtShell->GetPageDesc(m_pWrtShell->GetCurPageDesc()).GetMaster();
-        SwTwips lWidth = rPageFmt.GetFrmSize().GetWidth();
-        const SvxLRSpaceItem &rLR = rPageFmt.GetLRSpace();
+        SwTwips lWidth = rPageFormat.GetFrmSize().GetWidth();
+        const SvxLRSpaceItem &rLR = rPageFormat.GetLRSpace();
         lWidth -= rLR.GetLeft() + rLR.GetRight();
         aMgr.SetSize(Size(lWidth, aMgr.GetSize().Height()));
         if(nCols > 1)
         {
-            SwFmtCol aCol;
+            SwFormatCol aCol;
             aCol.Init( nCols, aCol.GetGutterWidth(), aCol.GetWishWidth() );
             aMgr.SetCol( aCol );
         }
@@ -1899,7 +1899,7 @@ bool SwView::JumpToSwMark( const OUString& rMark )
         if( !bHasShFocus )
             m_pWrtShell->ShGetFcs( false );
 
-        const SwFmtINetFmt* pINet;
+        const SwFormatINetFormat* pINet;
         OUString sCmp;
         OUString  sMark( INetURLObject::decode( rMark,
                                            INetURLObject::DECODE_WITH_CHARSET,
@@ -1977,7 +1977,7 @@ bool SwView::JumpToSwMark( const OUString& rMark )
                 m_pWrtShell->GotoMark( ppMark->get(), false, true ), bRet = true;
             else if( 0 != ( pINet = m_pWrtShell->FindINetAttr( sMark ) )) {
                 m_pWrtShell->addCurrentPosition();
-                bRet = m_pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() );
+                bRet = m_pWrtShell->GotoINetAttr( *pINet->GetTextINetFormat() );
             }
 
             // for all types of Flys
@@ -2000,7 +2000,7 @@ bool SwView::JumpToSwMark( const OUString& rMark )
         else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)))
             m_pWrtShell->GotoMark( ppMark->get(), false, true ), bRet = true;
         else if( 0 != ( pINet = m_pWrtShell->FindINetAttr( sMark ) ))
-            bRet = m_pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() );
+            bRet = m_pWrtShell->GotoINetAttr( *pINet->GetTextINetFormat() );
 
         // make selection visible later
         if ( m_aVisArea.IsEmpty() )
@@ -2026,12 +2026,12 @@ static size_t lcl_PageDescWithHeader( const SwDoc& rDoc )
     for( size_t i = 0; i < nCnt; ++i )
     {
         const SwPageDesc& rPageDesc = rDoc.GetPageDesc( i );
-        const SwFrmFmt& rMaster = rPageDesc.GetMaster();
+        const SwFrameFormat& rMaster = rPageDesc.GetMaster();
         const SfxPoolItem* pItem;
         if( ( SfxItemState::SET == rMaster.GetAttrSet().GetItemState( RES_HEADER, false, &pItem ) &&
-              static_cast<const SwFmtHeader*>(pItem)->IsActive() ) ||
+              static_cast<const SwFormatHeader*>(pItem)->IsActive() ) ||
             ( SfxItemState::SET == rMaster.GetAttrSet().GetItemState( RES_FOOTER, false, &pItem )  &&
-              static_cast<const SwFmtFooter*>(pItem)->IsActive()) )
+              static_cast<const SwFormatFooter*>(pItem)->IsActive()) )
             ++nRet;
     }
     return nRet; // number of page styles with active header/footer
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index c16e48274d8c..f9e614001086 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -104,13 +104,13 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
     {
         sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
         if( USHRT_MAX != nPoolId )
-            rSh.GetTxtCollFromPool(nPoolId);
+            rSh.GetTextCollFromPool(nPoolId);
             // Pool template does not exist: Does it exist on the document?
         else if( !rSh.GetParaStyle(rName) )
         {
             // It also does not exist in the document: generate
-            SwTxtFmtColl* pDerivedFrom = rSh.GetTxtCollFromPool(RES_POOLCOLL_LABEL);
-            rSh.MakeTxtFmtColl(rName, pDerivedFrom);
+            SwTextFormatColl* pDerivedFrom = rSh.GetTextCollFromPool(RES_POOLCOLL_LABEL);
+            rSh.MakeTextFormatColl(rName, pDerivedFrom);
         }
     }
 
@@ -124,34 +124,34 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
                       eType & nsSelectionType::SEL_DRW ? LTYPE_DRAW :
                                                     LTYPE_OBJECT;
 
-    SwFldMgr aMgr(&rSh);
-    SwSetExpFieldType* pFldType =
-            static_cast<SwSetExpFieldType*>(aMgr.GetFldType(RES_SETEXPFLD, rName));
-    if (!pFldType && !rName.isEmpty() )
+    SwFieldMgr aMgr(&rSh);
+    SwSetExpFieldType* pFieldType =
+            static_cast<SwSetExpFieldType*>(aMgr.GetFieldType(RES_SETEXPFLD, rName));
+    if (!pFieldType && !rName.isEmpty() )
     {
         // Create new field types
         SwSetExpFieldType aSwSetExpFieldType(rSh.GetDoc(), rName, nsSwGetSetExpType::GSE_SEQ);
-        aMgr.InsertFldType(aSwSetExpFieldType);
-        pFldType = static_cast<SwSetExpFieldType*>(aMgr.GetFldType(RES_SETEXPFLD, rName));
+        aMgr.InsertFieldType(aSwSetExpFieldType);
+        pFieldType = static_cast<SwSetExpFieldType*>(aMgr.GetFieldType(RES_SETEXPFLD, rName));
     }
 
     if (!pOpt->IgnoreSeqOpts())
     {
-        if (pFldType)
+        if (pFieldType)
         {
-            pFldType->SetDelimiter(pOpt->GetSeparator());
-            pFldType->SetOutlineLvl( static_cast< sal_uInt8 >(pOpt->GetLevel()) );
+            pFieldType->SetDelimiter(pOpt->GetSeparator());
+            pFieldType->SetOutlineLvl( static_cast< sal_uInt8 >(pOpt->GetLevel()) );
         }
     }
 
     sal_uInt16       nID    = USHRT_MAX;
     SwFieldType* pType  = 0;
-    const sal_uInt16 nCount = aMgr.GetFldTypeCount();
+    const sal_uInt16 nCount = aMgr.GetFieldTypeCount();
     if( !rName.isEmpty() )
     {
         for (sal_uInt16 i = 0; i < nCount; ++i)
         {
-            pType = aMgr.GetFldType(USHRT_MAX, i);
+            pType = aMgr.GetFieldType(USHRT_MAX, i);
             OUString aTmpName( pType->GetName() );
             if (aTmpName == rName && pType->Which() == RES_SETEXPFLD)
             {
@@ -174,7 +174,7 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
     if(pType)
         static_cast<SwSetExpFieldType*>(pType)->SetSeqFormat(pOpt->GetNumType());
 
-    rSh.UpdateExpFlds( true );
+    rSh.UpdateExpFields( true );
 
     rSh.EndAllAction();
 
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 38c405f6d083..0b2d78a89a95 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -464,8 +464,8 @@ static bool lcl_isTextBox(SdrObject* pObject)
 {
     if (SwDrawContact* pDrawContact = static_cast<SwDrawContact*>(pObject->GetUserCall()))
     {
-        if (SwFrmFmt* pFmt = pDrawContact->GetFmt())
-            return SwTextBoxHelper::findTextBox(pFmt);
+        if (SwFrameFormat* pFormat = pDrawContact->GetFormat())
+            return SwTextBoxHelper::findTextBox(pFormat);
     }
     return false;
 }
@@ -733,7 +733,7 @@ IMPL_LINK(SwView, OnlineSpellCallback, SpellCallbackInfo*, pInfo)
     return 0;
 }
 
-bool SwView::ExecDrwTxtSpellPopup(const Point& rPt)
+bool SwView::ExecDrwTextSpellPopup(const Point& rPt)
 {
     bool bRet = false;
     SdrView *pSdrView = m_pWrtShell->GetDrawView();
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 4ae22cd95243..a6aae3ec7510 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -174,7 +174,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
 
                             // remember cursor position data for later restoration of the cursor
                             const SwPosition *pPoint = m_pWrtShell->GetCrsr()->GetPoint();
-                            bool bRestoreCursor = pPoint->nNode.GetNode().IsTxtNode();
+                            bool bRestoreCursor = pPoint->nNode.GetNode().IsTextNode();
                             const SwNodeIndex aPointNodeIndex( pPoint->nNode );
                             sal_Int32 nPointIndex = pPoint->nContent.GetIndex();
 
@@ -188,14 +188,14 @@ void SwView::ExecLingu(SfxRequest &rReq)
 
                             if (bRestoreCursor)
                             {
-                                SwTxtNode *pTxtNode = aPointNodeIndex.GetNode().GetTxtNode();
+                                SwTextNode *pTextNode = aPointNodeIndex.GetNode().GetTextNode();
                                 // check for unexpected error case
-                                OSL_ENSURE(pTxtNode && pTxtNode->GetTxt().getLength() >= nPointIndex,
+                                OSL_ENSURE(pTextNode && pTextNode->GetText().getLength() >= nPointIndex,
                                     "text missing: corrupted node?" );
-                                if (!pTxtNode || pTxtNode->GetTxt().getLength() < nPointIndex)
+                                if (!pTextNode || pTextNode->GetText().getLength() < nPointIndex)
                                     nPointIndex = 0;
                                 // restore cursor to its original position
-                                m_pWrtShell->GetCrsr()->GetPoint()->nContent.Assign( pTxtNode, nPointIndex );
+                                m_pWrtShell->GetCrsr()->GetPoint()->nContent.Assign( pTextNode, nPointIndex );
                             }
 
                             // enable all, restore view and cursor position
@@ -494,7 +494,7 @@ bool SwView::IsValidSelectionForThesaurus() const
 
 OUString SwView::GetThesaurusLookUpText( bool bSelection ) const
 {
-    return bSelection ? OUString(m_pWrtShell->GetSelTxt()) : m_pWrtShell->GetCurWord();
+    return bSelection ? OUString(m_pWrtShell->GetSelText()) : m_pWrtShell->GetCurWord();
 }
 
 void SwView::InsertThesaurusSynonym( const OUString &rSynonmText, const OUString &rLookUpText, bool bSelection )
@@ -633,7 +633,7 @@ bool SwView::ExecSpellPopup(const Point& rPt)
         !m_pWrtShell->IsSelection())
     {
         if (m_pWrtShell->GetSelectionType() & nsSelectionType::SEL_DRW_TXT)
-            bRet = ExecDrwTxtSpellPopup(rPt);
+            bRet = ExecDrwTextSpellPopup(rPt);
         else if (!m_pWrtShell->IsSelFrmMode())
         {
             const bool bOldViewLock = m_pWrtShell->IsViewLocked();
@@ -670,10 +670,10 @@ bool SwView::ExecSpellPopup(const Point& rPt)
                 // get paragraph text
                 OUString aParaText;
                 SwPosition aPoint( *m_pWrtShell->GetCrsr()->GetPoint() );
-                const SwTxtNode *pNode = dynamic_cast< const SwTxtNode * >(
+                const SwTextNode *pNode = dynamic_cast< const SwTextNode * >(
                                             &aPoint.nNode.GetNode() );
                 if (pNode)
-                    aParaText = pNode->GetTxt();    // this may include hidden text but that should be Ok
+                    aParaText = pNode->GetText();    // this may include hidden text but that should be Ok
                 else
                 {
                     OSL_FAIL("text node expected but not found" );
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index de87748eec31..e875d560739b 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -381,8 +381,8 @@ IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
         case NID_FTN:
             rSh.EnterStdMode();
             bNext ?
-                rSh.GotoNextFtnAnchor() :
-                    rSh.GotoPrevFtnAnchor();
+                rSh.GotoNextFootnoteAnchor() :
+                    rSh.GotoPrevFootnoteAnchor();
         break;
         case NID_MARK:
         {
@@ -426,8 +426,8 @@ IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
                 sw::sidebarwindows::SwSidebarWin* pPostIt = GetPostItMgr()->GetActiveSidebarWin();
                 if (pPostIt)
                     GetPostItMgr()->SetActiveSidebarWin(0);
-                SwFieldType* pFldType = rSh.GetFldType(0, RES_POSTITFLD);
-                if ( rSh.MoveFldType( pFldType, bNext ) )
+                SwFieldType* pFieldType = rSh.GetFieldType(0, RES_POSTITFLD);
+                if ( rSh.MoveFieldType( pFieldType, bNext ) )
                     GetViewFrame()->GetDispatcher()->Execute(FN_POSTIT);
                 else
                     //first/last item
@@ -452,11 +452,11 @@ IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
         break;
 
         case NID_TABLE_FORMULA:
-            rSh.GotoNxtPrvTblFormula( bNext );
+            rSh.GotoNxtPrvTableFormula( bNext );
             break;
 
         case NID_TABLE_FORMULA_ERROR:
-            rSh.GotoNxtPrvTblFormula( bNext, true );
+            rSh.GotoNxtPrvTableFormula( bNext, true );
             break;
     }
     m_pEditWin->GrabFocus();
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index 1dbd4eab9e1f..e7dad98ac39b 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -627,7 +627,7 @@ bool SwView::PageUpCrsr( bool bSelect )
         if ( eType & FrmTypeFlags::FOOTNOTE )
         {
             m_pWrtShell->MoveCrsr();
-            m_pWrtShell->GotoFtnAnchor();
+            m_pWrtShell->GotoFootnoteAnchor();
             m_pWrtShell->Right(CRSR_SKIP_CHARS, false, 1, false );
             return true;
         }
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index a7c7c88d1bfb..3d3dff11cb2f 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -613,7 +613,7 @@ void SwView::Replace()
 
         m_pWrtShell->StartUndo(UNDO_UI_REPLACE_STYLE, &aRewriter);
 
-        m_pWrtShell->SetTxtFmtColl( m_pWrtShell->GetParaStyle(
+        m_pWrtShell->SetTextFormatColl( m_pWrtShell->GetParaStyle(
                             m_pSrchItem->GetReplaceString(),
                             SwWrtShell::GETSTYLE_CREATESOME ));
 
@@ -679,7 +679,7 @@ void SwView::Replace()
             if( bReplaced && m_pReplList && m_pReplList->Count() && m_pWrtShell->HasSelection() )
             {
                 SfxItemSet aReplSet( m_pWrtShell->GetAttrPool(),
-                                     aTxtFmtCollSetRange );
+                                     aTextFormatCollSetRange );
                 if( m_pReplList->Get( aReplSet ).Count() )
                 {
                     ::SfxToSwPageDescAttr( *m_pWrtShell, aReplSet );
@@ -831,16 +831,16 @@ void SwView::StateSearch(SfxItemSet &rSet)
                 {
                     m_pSrchItem = new SvxSearchItem( SID_SEARCH_ITEM );
                     m_pSrchItem->SetFamily(SFX_STYLE_FAMILY_PARA);
-                    m_pSrchItem->SetSearchString( m_pWrtShell->GetSelTxt() );
+                    m_pSrchItem->SetSearchString( m_pWrtShell->GetSelText() );
                 }
 
                 if( m_bJustOpened && m_pWrtShell->IsSelection() )
                 {
-                    OUString aTxt;
+                    OUString aText;
                     if( 1 == m_pWrtShell->GetCrsrCnt() &&
-                        !( aTxt = m_pWrtShell->SwCrsrShell::GetSelTxt() ).isEmpty() )
+                        !( aText = m_pWrtShell->SwCrsrShell::GetSelText() ).isEmpty() )
                     {
-                        m_pSrchItem->SetSearchString( aTxt );
+                        m_pSrchItem->SetSearchString( aText );
                         m_pSrchItem->SetSelection( false );
                     }
                     else
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 29a6f207d188..2d9b0354d094 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -87,7 +87,7 @@ void SwView::GetState(SfxItemSet &rSet)
             break;
 
         case SID_INSERT_GRAPHIC:
-            if( m_pWrtShell->CrsrInsideInputFld() )
+            if( m_pWrtShell->CrsrInsideInputField() )
             {
                 rSet.DisableItem(nWhich);
             }
@@ -114,7 +114,7 @@ void SwView::GetState(SfxItemSet &rSet)
                         rSet.DisableItem(nWhich);
                     }
                     else if( m_pWrtShell->IsTableMode()
-                        || m_pWrtShell->CrsrInsideInputFld() )
+                        || m_pWrtShell->CrsrInsideInputField() )
                     {
                         rSet.DisableItem(nWhich);
                     }
@@ -123,7 +123,7 @@ void SwView::GetState(SfxItemSet &rSet)
 
             case FN_EDIT_FOOTNOTE:
             {
-                if( !m_pWrtShell->GetCurFtn() )
+                if( !m_pWrtShell->GetCurFootnote() )
                     rSet.DisableItem(nWhich);
             }
             break;
@@ -154,9 +154,9 @@ void SwView::GetState(SfxItemSet &rSet)
                 //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
                 if(!rSet.GetParent())
                 {
-                    const SwFrmFmt& rMaster = rDesc.GetMaster();
+                    const SwFrameFormat& rMaster = rDesc.GetMaster();
 
-                    rSet.SetParent(&rMaster.GetDoc()->GetDfltFrmFmt()->GetAttrSet());
+                    rSet.SetParent(&rMaster.GetDoc()->GetDfltFrameFormat()->GetAttrSet());
                 }
 
                 ::PageDescToItemSet( rDesc, rSet);
@@ -167,9 +167,9 @@ void SwView::GetState(SfxItemSet &rSet)
             {
                 const size_t nCurIdx = m_pWrtShell->GetCurPageDesc();
                 const SwPageDesc& rDesc = m_pWrtShell->GetPageDesc( nCurIdx );
-                const SwFrmFmt& rMaster = rDesc.GetMaster();
+                const SwFrameFormat& rMaster = rDesc.GetMaster();
                 const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>(
-                                    rMaster.GetFmtAttr(RES_BACKGROUND, true));
+                                    rMaster.GetFormatAttr(RES_BACKGROUND, true));
                 rSet.Put(rBrush);
             }
             break;
@@ -209,7 +209,7 @@ void SwView::GetState(SfxItemSet &rSet)
 
             case FN_INSERT_OBJ_CTRL:
                 if( bWeb
-                    || m_pWrtShell->CrsrInsideInputFld() )
+                    || m_pWrtShell->CrsrInsideInputField() )
                 {
                     rSet.DisableItem(nWhich);
                 }
@@ -308,7 +308,7 @@ void SwView::GetState(SfxItemSet &rSet)
                 else if (pCursor->HasMark())
                 { // If the selection does not contain redlines, disable accepting/rejecting changes.
                     sal_uInt16 index = 0;
-                    const SwRedlineTbl& table = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+                    const SwRedlineTable& table = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
                     const SwRangeRedline* redline = table.FindAtPosition( *pCursor->Start(), index );
                     if( redline != NULL && *redline->Start() == *pCursor->End())
                         redline = NULL;
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index ae04fafdc26e..7dac67eb7e16 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -59,7 +59,7 @@
 using namespace ::com::sun::star;
 
 // Pack columns
-static void lcl_FillSvxColumn(const SwFmtCol& rCol,
+static void lcl_FillSvxColumn(const SwFormatCol& rCol,
                           long nTotalWidth,
                           SvxColumnItem& rColItem,
                           long nDistance)
@@ -101,7 +101,7 @@ static void lcl_FillSvxColumn(const SwFmtCol& rCol,
 // Transfer ColumnItem in ColumnInfo
 static void lcl_ConvertToCols(const SvxColumnItem& rColItem,
                           long nTotalWidth,
-                          SwFmtCol& rCols)
+                          SwFormatCol& rCols)
 {
     OSL_ENSURE( rCols.GetNumCols() == rColItem.Count(), "Column count mismatch" );
     // ruler executes that change the columns shortly after the selection has changed
@@ -179,7 +179,7 @@ static void lcl_Scale(long& nVal, long nScale)
     nVal >>= 8;
 }
 
-void ResizeFrameCols(SwFmtCol& rCol,
+void ResizeFrameCols(SwFormatCol& rCol,
                     long nOldWidth,
                     long nNewWidth,
                     long nLeftDelta )
@@ -235,13 +235,13 @@ void SwView::ExecTabWin( SfxRequest& rReq )
     const SwPageDesc& rDesc = rSh.GetPageDesc( nDescId );
 
     const bool bVerticalWriting = rSh.IsInVerticalText();
-    const SwFmtHeader& rHeaderFmt = rDesc.GetMaster().GetHeader();
-    SwFrmFmt *pHeaderFmt = const_cast<SwFrmFmt*>(rHeaderFmt.GetHeaderFmt());
+    const SwFormatHeader& rHeaderFormat = rDesc.GetMaster().GetHeader();
+    SwFrameFormat *pHeaderFormat = const_cast<SwFrameFormat*>(rHeaderFormat.GetHeaderFormat());
 
-    const SwFmtFooter& rFooterFmt = rDesc.GetMaster().GetFooter();
-    SwFrmFmt *pFooterFmt = const_cast<SwFrmFmt*>(rFooterFmt.GetFooterFmt());
+    const SwFormatFooter& rFooterFormat = rDesc.GetMaster().GetFooter();
+    SwFrameFormat *pFooterFormat = const_cast<SwFrameFormat*>(rFooterFormat.GetFooterFormat());
 
-    const SwFmtFrmSize &rFrmSize = rDesc.GetMaster().GetFrmSize();
+    const SwFormatFrmSize &rFrmSize = rDesc.GetMaster().GetFrmSize();
 
     const SwRect& rPageRect = rSh.GetAnyCurRect(RECT_PAGE);
     const long nPageWidth  = bBrowse ? rPageRect.Width() : rFrmSize.GetWidth();
@@ -261,7 +261,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             SvxLRSpaceItem aLR(RES_LR_SPACE);
             if ( !bSect && (bFrmSelection || nFrmType & FrmTypeFlags::FLY_ANY) )
             {
-                SwFrmFmt* pFmt = static_cast<SwFrmFmt*>(rSh.GetFlyFrmFmt());
+                SwFrameFormat* pFormat = static_cast<SwFrameFormat*>(rSh.GetFlyFrameFormat());
                 const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED);
 
                 bool bVerticalFrame(false);
@@ -282,20 +282,20 @@ void SwView::ExecTabWin( SfxRequest& rReq )
 
                 if(bVerticalFrame)
                 {
-                    SwFmtVertOrient aVertOrient(pFmt->GetVertOrient());
+                    SwFormatVertOrient aVertOrient(pFormat->GetVertOrient());
                     aVertOrient.SetVertOrient(text::VertOrientation::NONE);
                     aVertOrient.SetPos(aVertOrient.GetPos() + nDeltaX );
                     aSet.Put( aVertOrient );
                 }
                 else
                 {
-                    SwFmtHoriOrient aHoriOrient( pFmt->GetHoriOrient() );
+                    SwFormatHoriOrient aHoriOrient( pFormat->GetHoriOrient() );
                     aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE );
                     aHoriOrient.SetPos( aHoriOrient.GetPos() + nDeltaX );
                     aSet.Put( aHoriOrient );
                 }
 
-                SwFmtFrmSize aSize( pFmt->GetFrmSize() );
+                SwFormatFrmSize aSize( pFormat->GetFrmSize() );
                 long nOldWidth = (long) aSize.GetWidth();
 
                 if(aSize.GetWidthPercent())
@@ -311,7 +311,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
 
                 if( nFrmType & FrmTypeFlags::COLUMN )
                 {
-                    SwFmtCol aCol(pFmt->GetCol());
+                    SwFormatCol aCol(pFormat->GetCol());
 
                     ::ResizeFrameCols(aCol, nOldWidth, (long)aSize.GetWidth(), nDeltaX );
                     aSet.Put(aCol);
@@ -342,10 +342,10 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 aLR.SetLeft(aLongLR.GetLeft());
                 aLR.SetRight(aLongLR.GetRight());
 
-                if ( nFrmType & FrmTypeFlags::HEADER && pHeaderFmt )
-                    pHeaderFmt->SetFmtAttr( aLR );
-                else if( nFrmType & FrmTypeFlags::FOOTER && pFooterFmt )
-                    pFooterFmt->SetFmtAttr( aLR );
+                if ( nFrmType & FrmTypeFlags::HEADER && pHeaderFormat )
+                    pHeaderFormat->SetFormatAttr( aLR );
+                else if( nFrmType & FrmTypeFlags::FOOTER && pFooterFormat )
+                    pFooterFormat->SetFormatAttr( aLR );
             }
             else if( nFrmType == FrmTypeFlags::DRAWOBJ)
             {
@@ -365,8 +365,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 long nRightDiff = aLongLR.GetRight() - (long)( rPageRect.Right() - aSectRect.Right());
                 //change the LRSpaceItem of the section accordingly
                 const SwSection* pCurrSect = rSh.GetCurrSection();
-                const SwSectionFmt* pSectFmt = pCurrSect->GetFmt();
-                SvxLRSpaceItem aLRTmp = pSectFmt->GetLRSpace();
+                const SwSectionFormat* pSectFormat = pCurrSect->GetFormat();
+                SvxLRSpaceItem aLRTmp = pSectFormat->GetLRSpace();
                 aLRTmp.SetLeft(aLRTmp.GetLeft() + nLeftDiff);
                 aLRTmp.SetRight(aLRTmp.GetRight() + nRightDiff);
                 SfxItemSet aSet(rSh.GetAttrPool(), RES_LR_SPACE, RES_LR_SPACE, RES_COL, RES_COL, 0L);
@@ -374,13 +374,13 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 //change the first/last column
                 if(bSect)
                 {
-                    SwFmtCol aCols( pSectFmt->GetCol() );
+                    SwFormatCol aCols( pSectFormat->GetCol() );
                     long nDiffWidth = nLeftDiff + nRightDiff;
                     ::ResizeFrameCols(aCols, aSectRect.Width(), aSectRect.Width() - nDiffWidth, nLeftDiff );
                     aSet.Put( aCols );
                 }
                 SwSectionData aData(*pCurrSect);
-                rSh.UpdateSection(rSh.GetSectionFmtPos(*pSectFmt), aData, &aSet);
+                rSh.UpdateSection(rSh.GetSectionFormatPos(*pSectFormat), aData, &aSet);
             }
             else
             {   // Adjust page margins
@@ -388,7 +388,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 aLR.SetRight(aLongLR.GetRight());
                 SwapPageMargin( rDesc, aLR );
                 SwPageDesc aDesc( rDesc );
-                aDesc.GetMaster().SetFmtAttr( aLR );
+                aDesc.GetMaster().SetFormatAttr( aLR );
                 rSh.ChgPageDesc( nDescId, aDesc );
             }
         }
@@ -406,7 +406,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 aLR.SetLeft(aLongLR.GetLeft());
                 aLR.SetRight(aLongLR.GetRight());
                 SwapPageMargin( rDesc, aLR );
-                aDesc.GetMaster().SetFmtAttr( aLR );
+                aDesc.GetMaster().SetFormatAttr( aLR );
             }
             rSh.ChgPageDesc( nDescId, aDesc );
         }
@@ -420,7 +420,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
 
             if( bFrmSelection || nFrmType & FrmTypeFlags::FLY_ANY )
             {
-                SwFrmFmt* pFmt = static_cast<SwFrmFmt*>(rSh.GetFlyFrmFmt());
+                SwFrameFormat* pFormat = static_cast<SwFrameFormat*>(rSh.GetFlyFrameFormat());
                 const SwRect &rRect = rSh.GetAnyCurRect(RECT_FLY_EMBEDDED);
                 const long nDeltaY = rPageRect.Top() + aLongULSpace.GetUpper() - rRect.Top();
                 const long nHeight = nPageHeight - (aLongULSpace.GetUpper() + aLongULSpace.GetLower());
@@ -434,19 +434,19 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                        rSh.IsFrmVertical(true, bRTL, bVertL2R ) ) ||
                      ( !bFrmSelection && bVerticalWriting ) )
                 {
-                    SwFmtHoriOrient aHoriOrient(pFmt->GetHoriOrient());
+                    SwFormatHoriOrient aHoriOrient(pFormat->GetHoriOrient());
                     aHoriOrient.SetHoriOrient(text::HoriOrientation::NONE);
                     aHoriOrient.SetPos(aHoriOrient.GetPos() + nDeltaY );
                     aSet.Put( aHoriOrient );
                 }
                 else
                 {
-                    SwFmtVertOrient aVertOrient(pFmt->GetVertOrient());
+                    SwFormatVertOrient aVertOrient(pFormat->GetVertOrient());
                     aVertOrient.SetVertOrient(text::VertOrientation::NONE);
                     aVertOrient.SetPos(aVertOrient.GetPos() + nDeltaY );
                     aSet.Put( aVertOrient );
                 }
-                SwFmtFrmSize aSize(pFmt->GetFrmSize());
+                SwFormatFrmSize aSize(pFormat->GetFrmSize());
                 if(aSize.GetHeightPercent())
                 {
                     SwRect aRect;
@@ -478,8 +478,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 const long nRightDiff = aLongULSpace.GetLower() - (long)(nPageHeight - aSectRect.Bottom() + rPageRect.Top());
                 //change the LRSpaceItem of the section accordingly
                 const SwSection* pCurrSect = rSh.GetCurrSection();
-                const SwSectionFmt* pSectFmt = pCurrSect->GetFmt();
-                SvxLRSpaceItem aLR = pSectFmt->GetLRSpace();
+                const SwSectionFormat* pSectFormat = pCurrSect->GetFormat();
+                SvxLRSpaceItem aLR = pSectFormat->GetLRSpace();
                 aLR.SetLeft(aLR.GetLeft() + nLeftDiff);
                 aLR.SetRight(aLR.GetRight() + nRightDiff);
                 SfxItemSet aSet(rSh.GetAttrPool(), RES_LR_SPACE, RES_LR_SPACE, RES_COL, RES_COL, 0L);
@@ -487,13 +487,13 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 //change the first/last column
                 if(bSect)
                 {
-                    SwFmtCol aCols( pSectFmt->GetCol() );
+                    SwFormatCol aCols( pSectFormat->GetCol() );
                     long nDiffWidth = nLeftDiff + nRightDiff;
                     ::ResizeFrameCols(aCols, aSectRect.Height(), aSectRect.Height() - nDiffWidth, nLeftDiff );
                     aSet.Put( aCols );
                 }
                 SwSectionData aData(*pCurrSect);
-                rSh.UpdateSection(rSh.GetSectionFmtPos(*pSectFmt), aData, &aSet);
+                rSh.UpdateSection(rSh.GetSectionFormatPos(*pSectFormat), aData, &aSet);
             }
             else
             {   SwPageDesc aDesc( rDesc );
@@ -507,19 +507,19 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                         aUL.SetUpper( (sal_uInt16)aLongULSpace.GetUpper() );
                     else
                         aUL.SetLower( (sal_uInt16)aLongULSpace.GetLower() );
-                    aDesc.GetMaster().SetFmtAttr( aUL );
+                    aDesc.GetMaster().SetFormatAttr( aUL );
 
-                    if( (bHead && pHeaderFmt) || (!bHead && pFooterFmt) )
+                    if( (bHead && pHeaderFormat) || (!bHead && pFooterFormat) )
                     {
-                        SwFmtFrmSize aSz( bHead ? pHeaderFmt->GetFrmSize() :
-                                                  pFooterFmt->GetFrmSize() );
+                        SwFormatFrmSize aSz( bHead ? pHeaderFormat->GetFrmSize() :
+                                                  pFooterFormat->GetFrmSize() );
                         aSz.SetHeightSizeType( ATT_FIX_SIZE );
                         aSz.SetHeight(nPageHeight - aLongULSpace.GetLower() -
                                                     aLongULSpace.GetUpper() );
                         if ( bHead )
-                            pHeaderFmt->SetFmtAttr( aSz );
+                            pHeaderFormat->SetFormatAttr( aSz );
                         else
-                            pFooterFmt->SetFmtAttr( aSz );
+                            pFooterFormat->SetFormatAttr( aSz );
                     }
                 }
                 else
@@ -527,7 +527,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                     SvxULSpaceItem aUL(RES_UL_SPACE);
                     aUL.SetUpper((sal_uInt16)aLongULSpace.GetUpper());
                     aUL.SetLower((sal_uInt16)aLongULSpace.GetLower());
-                    aDesc.GetMaster().SetFmtAttr(aUL);
+                    aDesc.GetMaster().SetFormatAttr(aUL);
                 }
 
                 rSh.ChgPageDesc( nDescId, aDesc );
@@ -547,7 +547,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 SvxULSpaceItem aUL(RES_UL_SPACE);
                 aUL.SetUpper((sal_uInt16)aLongULSpace.GetUpper());
                 aUL.SetLower((sal_uInt16)aLongULSpace.GetLower());
-                aDesc.GetMaster().SetFmtAttr(aUL);
+                aDesc.GetMaster().SetFormatAttr(aUL);
             }
             rSh.ChgPageDesc( nDescId, aDesc );
         }
@@ -583,7 +583,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             const long nRight = aLR.GetRight();
             const long nWidth = nPageWidth - nLeft - nRight;
 
-            SwFmtCol aCols( rDesc.GetMaster().GetCol() );
+            SwFormatCol aCols( rDesc.GetMaster().GetCol() );
             aCols.Init( nCount, nGutterWidth, nWidth );
             aCols.SetWishWidth( nWidth );
             aCols.SetGutterWidth( nGutterWidth, nWidth );
@@ -607,7 +607,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             }
 
             SwPageDesc aDesc( rDesc );
-            aDesc.GetMaster().SetFmtAttr( aCols );
+            aDesc.GetMaster().SetFormatAttr( aCols );
             rSh.ChgPageDesc( rSh.GetCurPageDesc(), aDesc );
         }
         break;
@@ -628,7 +628,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             rSh.GetCurAttr( aSet );
             const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(aSet.Get(RES_LR_SPACE));
 
-            if ( rLR.GetTxtFirstLineOfst() < 0 )
+            if ( rLR.GetTextFirstLineOfst() < 0 )
             {
                 SvxTabStop aSwTabStop( 0, SVX_TAB_ADJUST_DEFAULT );
                 aTabStops.Insert( aSwTabStop );
@@ -637,8 +637,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             // Populate with default tabs.
             ::MakeDefTabs( ::GetTabDist( rDefTabs ), aTabStops );
 
-            SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
-            if( pColl && pColl->IsAutoUpdateFmt() )
+            SwTextFormatColl* pColl = rSh.GetCurTextFormatColl();
+            if( pColl && pColl->IsAutoUpdateFormat() )
             {
                 SfxItemSet aTmp(GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP);
                 aTmp.Put(aTabStops);
@@ -656,10 +656,10 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             SvxLRSpaceItem aParaMargin(static_cast<const SvxLRSpaceItem&>(pReqArgs->Get(nSlot)));
 
             aParaMargin.SetRight( aParaMargin.GetRight() - m_nRightBorderDistance );
-            aParaMargin.SetTxtLeft(aParaMargin.GetTxtLeft() - m_nLeftBorderDistance );
+            aParaMargin.SetTextLeft(aParaMargin.GetTextLeft() - m_nLeftBorderDistance );
 
             aParaMargin.SetWhich( RES_LR_SPACE );
-            SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
+            SwTextFormatColl* pColl = rSh.GetCurTextFormatColl();
 
             // #i23726#
             if (m_pNumRuleNodeFromDoc)
@@ -673,12 +673,12 @@ void SwView::ExecTabWin( SfxRequest& rReq )
 
                 SwPosition aPos(*m_pNumRuleNodeFromDoc);
                 // #i90078#
-                rSh.SetIndent( static_cast< short >(aParaMargin.GetTxtLeft() - rLR.GetTxtLeft()), aPos);
+                rSh.SetIndent( static_cast< short >(aParaMargin.GetTextLeft() - rLR.GetTextLeft()), aPos);
                 // #i42921# invalidate state of indent in order to get a ruler update.
                 aParaMargin.SetWhich( nSlot );
                 GetViewFrame()->GetBindings().SetState( aParaMargin );
             }
-            else if( pColl && pColl->IsAutoUpdateFmt() )
+            else if( pColl && pColl->IsAutoUpdateFormat() )
             {
                 SfxItemSet aSet(GetPool(), RES_LR_SPACE, RES_LR_SPACE);
                 aSet.Put(aParaMargin);
@@ -687,7 +687,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             else
                 rSh.SetAttrItem( aParaMargin );
 
-            if ( aParaMargin.GetTxtFirstLineOfst() < 0 )
+            if ( aParaMargin.GetTextFirstLineOfst() < 0 )
             {
                 SfxItemSet aSet( GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP );
 
@@ -716,7 +716,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                         static_cast<const SvxTabStopItem&>(rSh.GetDefault(RES_PARATR_TABSTOP));
                     ::MakeDefTabs( ::GetTabDist(rDefTabs), aTabStops );
 
-                    if( pColl && pColl->IsAutoUpdateFmt())
+                    if( pColl && pColl->IsAutoUpdateFormat())
                     {
                         SfxItemSet aSetTmp(GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP);
                         aSetTmp.Put(aTabStops);
@@ -740,8 +740,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             aParaMargin.SetLower(aParaMargin.GetLower() - nLDist);
 
             aParaMargin.SetWhich( RES_UL_SPACE );
-            SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
-            if( pColl && pColl->IsAutoUpdateFmt() )
+            SwTextFormatColl* pColl = rSh.GetCurTextFormatColl();
+            if( pColl && pColl->IsAutoUpdateFormat() )
             {
                 SfxItemSet aSet(GetPool(), RES_UL_SPACE, RES_UL_SPACE);
                 aSet.Put(aParaMargin);
@@ -775,8 +775,8 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             aULSpace.SetUpper( nUpper );
             aULSpace.SetLower( nLower );
 
-            SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
-            if( pColl && pColl->IsAutoUpdateFmt() )
+            SwTextFormatColl* pColl = rSh.GetCurTextFormatColl();
+            if( pColl && pColl->IsAutoUpdateFormat() )
             {
                 aULSpaceSet.Put( aULSpace );
                 rSh.AutoUpdatePara( pColl, aULSpaceSet );
@@ -791,7 +791,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
         {
             SvxColumnItem aColItem(static_cast<const SvxColumnItem&>(pReqArgs->Get(nSlot)));
 
-            if( m_bSetTabColFromDoc || (!bSect && rSh.GetTableFmt()) )
+            if( m_bSetTabColFromDoc || (!bSect && rSh.GetTableFormat()) )
             {
                 OSL_ENSURE(aColItem.Count(), "ColDesc is empty!!");
 
@@ -858,28 +858,28 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             {
                 if ( bFrmSelection || nFrmType & FrmTypeFlags::FLY_ANY || bSect)
                 {
-                    SwSectionFmt *pSectFmt = 0;
+                    SwSectionFormat *pSectFormat = 0;
                     SfxItemSet aSet( GetPool(), RES_COL, RES_COL );
                     if(bSect)
                     {
                         SwSection *pSect = rSh.GetAnySection();
                         OSL_ENSURE( pSect, "Which section?");
-                        pSectFmt = pSect->GetFmt();
+                        pSectFormat = pSect->GetFormat();
                     }
                     else
                     {
                         rSh.GetFlyFrmAttr( aSet );
                     }
-                    SwFmtCol aCols(
+                    SwFormatCol aCols(
                         bSect ?
-                            pSectFmt->GetCol() :
-                                static_cast<const SwFmtCol&>(aSet.Get( RES_COL, false )));
+                            pSectFormat->GetCol() :
+                                static_cast<const SwFormatCol&>(aSet.Get( RES_COL, false )));
                     SwRect aCurRect = rSh.GetAnyCurRect(bSect ? RECT_SECTION_PRT : RECT_FLY_PRT_EMBEDDED);
                     const long lWidth = bVerticalWriting ? aCurRect.Height() : aCurRect.Width();
                     ::lcl_ConvertToCols( aColItem, lWidth, aCols );
                     aSet.Put( aCols );
                     if(bSect)
-                        rSh.SetSectionAttr( aSet, pSectFmt );
+                        rSh.SetSectionAttr( aSet, pSectFormat );
                     else
                     {
                         rSh.StartAction();
@@ -897,13 +897,13 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 }
                 else
                 {
-                    SwFmtCol aCols( rDesc.GetMaster().GetCol() );
+                    SwFormatCol aCols( rDesc.GetMaster().GetCol() );
                     const SwRect aPrtRect = rSh.GetAnyCurRect(RECT_PAGE_PRT);
                     ::lcl_ConvertToCols( aColItem,
                                     bVerticalWriting ? aPrtRect.Height() : aPrtRect.Width(),
                                     aCols );
                     SwPageDesc aDesc( rDesc );
-                    aDesc.GetMaster().SetFmtAttr( aCols );
+                    aDesc.GetMaster().SetFormatAttr( aCols );
                     rSh.ChgPageDesc( rSh.GetCurPageDesc(), aDesc );
                 }
             }
@@ -916,7 +916,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
         {
             SvxColumnItem aColItem(static_cast<const SvxColumnItem&>(pReqArgs->Get(nSlot)));
 
-            if( m_bSetTabColFromDoc || (!bSect && rSh.GetTableFmt()) )
+            if( m_bSetTabColFromDoc || (!bSect && rSh.GetTableFormat()) )
             {
                 OSL_ENSURE(aColItem.Count(), "ColDesc is empty!!");
 
@@ -1048,8 +1048,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
         {
             sal_uInt16 nColumnType = 0;
 
-            const SwFrmFmt& rMaster = rDesc.GetMaster();
-            SwFmtCol aCol(rMaster.GetCol());
+            const SwFrameFormat& rMaster = rDesc.GetMaster();
+            SwFormatCol aCol(rMaster.GetCol());
             const sal_uInt16 nCols = aCol.GetNumCols();
             if ( nCols == 0 )
             {
@@ -1095,14 +1095,14 @@ void SwView::StateTabWin(SfxItemSet& rSet)
             if ( ( nFrmType & FrmTypeFlags::HEADER || nFrmType & FrmTypeFlags::FOOTER ) &&
                  !(nFrmType & FrmTypeFlags::COLSECT) )
             {
-                SwFrmFmt *pFmt = const_cast<SwFrmFmt*>(nFrmType & FrmTypeFlags::HEADER ?
-                                rDesc.GetMaster().GetHeader().GetHeaderFmt() :
-                                rDesc.GetMaster().GetFooter().GetFooterFmt());
-                if( pFmt )// #i80890# if rDesc is not the one belonging to the current page is might crash
+                SwFrameFormat *pFormat = const_cast<SwFrameFormat*>(nFrmType & FrmTypeFlags::HEADER ?
+                                rDesc.GetMaster().GetHeader().GetHeaderFormat() :
+                                rDesc.GetMaster().GetFooter().GetFooterFormat());
+                if( pFormat )// #i80890# if rDesc is not the one belonging to the current page is might crash
                 {
                     SwRect aRect( rSh.GetAnyCurRect( RECT_HEADERFOOTER, pPt));
                     aRect.Pos() -= rSh.GetAnyCurRect( RECT_PAGE, pPt ).Pos();
-                    const SvxLRSpaceItem& aLR = pFmt->GetLRSpace();
+                    const SvxLRSpaceItem& aLR = pFormat->GetLRSpace();
                     aLongLR.SetLeft ( (long)aLR.GetLeft() + (long)aRect.Left() );
                     aLongLR.SetRight( (nPageWidth -
                                         (long)aRect.Right() + (long)aLR.GetRight()));
@@ -1268,7 +1268,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     // #i23726#
                     if (m_pNumRuleNodeFromDoc)
                     {
-                        short nOffset = static_cast< short >(aLR.GetTxtLeft() +
+                        short nOffset = static_cast< short >(aLR.GetTextLeft() +
                                         // #i42922# Mouse move of numbering label
                                         // has to consider the left indent of the paragraph
                                         m_pNumRuleNodeFromDoc->GetLeftMarginWithNum( true ) );
@@ -1358,7 +1358,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     m_nRightBorderDistance = static_cast< sal_uInt16 >(aDistLR.GetRight());
                 }
                 else if ( IsTabColFromDoc() ||
-                    ( rSh.GetTableFmt() && !bFrmSelection &&
+                    ( rSh.GetTableFormat() && !bFrmSelection &&
                     !(nFrmType & FrmTypeFlags::COLSECT ) ) )
                 {
                     SfxItemSet aCoreSet2( GetPool(),
@@ -1386,7 +1386,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 else if ( !rSh.IsDirectlyInSection() )
                 {
                     //get the page/header/footer border distance
-                    const SwFrmFmt& rMaster = rDesc.GetMaster();
+                    const SwFrameFormat& rMaster = rDesc.GetMaster();
                     const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(rMaster.GetAttrSet().Get(RES_BOX));
                     aDistLR.SetLeft(rBox.GetDistance(SvxBoxItemLine::LEFT));
                     aDistLR.SetRight(rBox.GetDistance(SvxBoxItemLine::RIGHT));
@@ -1395,17 +1395,17 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     if(nFrmType & FrmTypeFlags::HEADER)
                     {
                         rMaster.GetHeader();
-                        const SwFmtHeader& rHeaderFmt = rMaster.GetHeader();
-                        SwFrmFmt *pHeaderFmt = const_cast<SwFrmFmt*>(rHeaderFmt.GetHeaderFmt());
-                        if( pHeaderFmt )// #i80890# if rDesc is not the one belonging to the current page is might crash
-                            pBox = & (const SvxBoxItem&)pHeaderFmt->GetBox();
+                        const SwFormatHeader& rHeaderFormat = rMaster.GetHeader();
+                        SwFrameFormat *pHeaderFormat = const_cast<SwFrameFormat*>(rHeaderFormat.GetHeaderFormat());
+                        if( pHeaderFormat )// #i80890# if rDesc is not the one belonging to the current page is might crash
+                            pBox = & (const SvxBoxItem&)pHeaderFormat->GetBox();
                     }
                     else if(nFrmType & FrmTypeFlags::FOOTER )
                     {
-                        const SwFmtFooter& rFooterFmt = rMaster.GetFooter();
-                        SwFrmFmt *pFooterFmt = const_cast<SwFrmFmt*>(rFooterFmt.GetFooterFmt());
-                        if( pFooterFmt )// #i80890# if rDesc is not the one belonging to the current page is might crash
-                            pBox = & (const SvxBoxItem&)pFooterFmt->GetBox();
+                        const SwFormatFooter& rFooterFormat = rMaster.GetFooter();
+                        SwFrameFormat *pFooterFormat = const_cast<SwFrameFormat*>(rFooterFormat.GetFooterFormat());
+                        if( pFooterFormat )// #i80890# if rDesc is not the one belonging to the current page is might crash
+                            pBox = & (const SvxBoxItem&)pFooterFormat->GetBox();
                     }
                     if(pBox)
                     {
@@ -1455,7 +1455,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                                            bFrmSelection;
             }
             bool bHasTable = ( IsTabColFromDoc() ||
-                    ( rSh.GetTableFmt() && !bFrmSelection &&
+                    ( rSh.GetTableFormat() && !bFrmSelection &&
                     !(nFrmType & FrmTypeFlags::COLSECT ) ) );
 
             bool bTableVertical = bHasTable && rSh.IsTableVertical();
@@ -1544,9 +1544,9 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 sal_uInt16 nNum = 0;
                 if(bFrmSelection)
                 {
-                    const SwFrmFmt* pFmt = rSh.GetFlyFrmFmt();
-                    if(pFmt)
-                        nNum = pFmt->GetCol().GetNumCols();
+                    const SwFrameFormat* pFormat = rSh.GetFlyFrameFormat();
+                    if(pFormat)
+                        nNum = pFormat->GetCol().GetNumCols();
                 }
                 else
                     nNum = rSh.GetCurColNum();
@@ -1561,8 +1561,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     OSL_ENSURE( pSect, "Which section?");
                     if( pSect )
                     {
-                        SwSectionFmt const *pFmt = pSect->GetFmt();
-                        const SwFmtCol& rCol = pFmt->GetCol();
+                        SwSectionFormat const *pFormat = pSect->GetFormat();
+                        const SwFormatCol& rCol = pFormat->GetCol();
                         if(rSh.IsInRightToLeftText())
                             nNum = rCol.GetColumns().size() - nNum;
                         else
@@ -1598,9 +1598,9 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     // Columns in frame
                     if ( nNum  )
                     {
-                        const SwFrmFmt* pFmt = rSh.GetFlyFrmFmt() ;
+                        const SwFrameFormat* pFormat = rSh.GetFlyFrameFormat() ;
 
-                        const SwFmtCol& rCol = pFmt->GetCol();
+                        const SwFormatCol& rCol = pFormat->GetCol();
                         if(rSh.IsInRightToLeftText())
                             nNum = rCol.GetColumns().size() - nNum;
                         else
@@ -1637,8 +1637,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 }
                 else
                 {   // Columns on the page
-                    const SwFrmFmt& rMaster = rDesc.GetMaster();
-                    SwFmtCol aCol(rMaster.GetCol());
+                    const SwFrameFormat& rMaster = rDesc.GetMaster();
+                    SwFormatCol aCol(rMaster.GetCol());
                     if(rFrameDir.GetValue() == FRMDIR_HORI_RIGHT_TOP)
                         nNum = aCol.GetColumns().size() - nNum;
                     else
@@ -1646,7 +1646,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 
                     SvxColumnItem aColItem(nNum);
                     const SwRect aPrtRect = rSh.GetAnyCurRect(RECT_PAGE_PRT, pPt);
-                    const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(rMaster.GetFmtAttr(RES_BOX));
+                    const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(rMaster.GetFormatAttr(RES_BOX));
                     long nDist = rBox.GetDistance();
 
                     lcl_FillSvxColumn(
@@ -1708,7 +1708,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 ((bVerticalWriting && !bFrmSelection) || bFrameHasVerticalColumns)))
                 rSet.DisableItem(nWhich);
             else if ( IsTabRowFromDoc() ||
-                    ( rSh.GetTableFmt() && !bFrmSelection &&
+                    ( rSh.GetTableFormat() && !bFrmSelection &&
                     !(nFrmType & FrmTypeFlags::COLSECT ) ) )
             {
                 SwTabCols aTabCols;
@@ -1820,16 +1820,16 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 }
                 else
                 {
-                    const SwFrmFmt* pFmt =  rSh.GetFlyFrmFmt();
-                    const SwFmtCol* pCols = pFmt ? &pFmt->GetCol():
+                    const SwFrameFormat* pFormat =  rSh.GetFlyFrameFormat();
+                    const SwFormatCol* pCols = pFormat ? &pFormat->GetCol():
                                                    &rDesc.GetMaster().GetCol();
                     const SwColumns& rCols = pCols->GetColumns();
                     sal_uInt16 nNum = rSh.GetCurOutColNum();
                     const sal_uInt16 nCount = std::min(sal_uInt16(nNum + 1), sal_uInt16(rCols.size()));
-                    const SwRect aRect( rSh.GetAnyCurRect( pFmt
+                    const SwRect aRect( rSh.GetAnyCurRect( pFormat
                                                     ? RECT_FLY_PRT_EMBEDDED
                                                     : RECT_PAGE_PRT, pPt ));
-                    const SwRect aAbsRect( rSh.GetAnyCurRect( pFmt
+                    const SwRect aAbsRect( rSh.GetAnyCurRect( pFormat
                                                     ? RECT_FLY_EMBEDDED
                                                     : RECT_PAGE, pPt ));
 
@@ -1857,7 +1857,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                         aRectangle.Left() += MINLAY;
                         aRectangle.Left() += aRect.Left();
                     }
-                    if(pFmt) // Range in frame - here you may up to the edge
+                    if(pFormat) // Range in frame - here you may up to the edge
                         aRectangle.Left()  = aRectangle.Right() = 0;
                     else
                     {
@@ -1912,9 +1912,9 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 }
                 else
                 {   // Here only for table in multi-column pages and borders.
-                    bool bSectOutTbl = bool(nFrmType & FrmTypeFlags::TABLE);
+                    bool bSectOutTable = bool(nFrmType & FrmTypeFlags::TABLE);
                     bool bFrame = bool(nFrmType & FrmTypeFlags::FLY_ANY);
-                    bool bColSct = bool(nFrmType & ( bSectOutTbl
+                    bool bColSct = bool(nFrmType & ( bSectOutTable
                                                     ? FrmTypeFlags::COLSECTOUTTAB
                                                     : FrmTypeFlags::COLSECT )
                                                 );
@@ -1923,25 +1923,25 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     size_t nNum = IsTabColFromDoc() ?
                                 rSh.GetCurMouseColNum( m_aTabColFromDocPos ):
                                 rSh.GetCurOutColNum();
-                    const SwFrmFmt* pFmt = NULL;
+                    const SwFrameFormat* pFormat = NULL;
                     if( bColSct )
                     {
-                        eRecType = bSectOutTbl ? RECT_OUTTABSECTION
+                        eRecType = bSectOutTable ? RECT_OUTTABSECTION
                                                : RECT_SECTION;
-                        const SwSection *pSect = rSh.GetAnySection( bSectOutTbl, pPt );
+                        const SwSection *pSect = rSh.GetAnySection( bSectOutTable, pPt );
                         OSL_ENSURE( pSect, "Which section?");
-                        pFmt = pSect->GetFmt();
+                        pFormat = pSect->GetFormat();
                     }
                     else if( bFrame )
                     {
-                        pFmt = rSh.GetFlyFrmFmt();
+                        pFormat = rSh.GetFlyFrameFormat();
                         eRecType = RECT_FLY_PRT_EMBEDDED;
                     }
 
-                    const SwFmtCol* pCols = pFmt ? &pFmt->GetCol():
+                    const SwFormatCol* pCols = pFormat ? &pFormat->GetCol():
                                                    &rDesc.GetMaster().GetCol();
                     const SwColumns& rCols = pCols->GetColumns();
-                    const sal_uInt16 nBorder = pFmt ? pFmt->GetBox().GetDistance() :
+                    const sal_uInt16 nBorder = pFormat ? pFormat->GetBox().GetDistance() :
                                                   rDesc.GetMaster().GetBox().GetDistance();
 
                     // RECT_FLY_PRT_EMBEDDED returns the relative position to RECT_FLY_EMBEDDED
@@ -1960,7 +1960,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 
                     if( nNum > rCols.size() )
                     {
-                        OSL_ENSURE( false, "wrong FmtCol is being edited!" );
+                        OSL_ENSURE( false, "wrong FormatCol is being edited!" );
                         nNum = rCols.size();
                     }
 
@@ -2014,7 +2014,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 sal_uInt8 nProtect = m_pWrtShell->IsSelObjProtected( FLYPROTECT_SIZE|FLYPROTECT_POS|FLYPROTECT_CONTENT );
 
                 SvxProtectItem aProt(SID_RULER_PROTECT);
-                aProt.SetCntntProtect((nProtect & FLYPROTECT_CONTENT)   != 0);
+                aProt.SetContentProtect((nProtect & FLYPROTECT_CONTENT)   != 0);
                 aProt.SetSizeProtect ((nProtect & FLYPROTECT_SIZE)      != 0);
                 aProt.SetPosProtect  ((nProtect & FLYPROTECT_POS)       != 0);
                 rSet.Put(aProt);
@@ -2022,7 +2022,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
             else
             {
                 SvxProtectItem aProtect(SID_RULER_PROTECT);
-                if(bBrowse && !(nFrmType & (FrmTypeFlags::DRAWOBJ|FrmTypeFlags::COLUMN)) && !rSh.GetTableFmt())
+                if(bBrowse && !(nFrmType & (FrmTypeFlags::DRAWOBJ|FrmTypeFlags::COLUMN)) && !rSh.GetTableFormat())
                 {
                     aProtect.SetSizeProtect(true);
                     aProtect.SetPosProtect(true);
@@ -2037,7 +2037,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
     if(bPutContentProtection)
     {
         SvxProtectItem aProtect(SID_RULER_PROTECT);
-        aProtect.SetCntntProtect(true);
+        aProtect.SetContentProtect(true);
         rSet.Put(aProtect);
     }
 }
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index f57cf50171c7..7d513d4767f5 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -342,7 +342,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         case HANDLE_FIELD_AUTO_UPDATE:
         {
             bool bUpdateField = *static_cast<sal_Bool const *>(rValue.getValue());
-            SwFldUpdateFlags nFlag = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
+            SwFieldUpdateFlags nFlag = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
             mpDoc->getIDocumentSettingAccess().setFieldUpdateFlags( bUpdateField ?
                                         nFlag == AUTOUPD_FIELD_AND_CHARTS ?
                                         AUTOUPD_FIELD_AND_CHARTS :
@@ -353,7 +353,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         case HANDLE_CHART_AUTO_UPDATE:
         {
             bool bUpdateChart = *static_cast<sal_Bool const *>(rValue.getValue());
-            SwFldUpdateFlags nFlag = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
+            SwFieldUpdateFlags nFlag = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
             mpDoc->getIDocumentSettingAccess().setFieldUpdateFlags( (nFlag == AUTOUPD_FIELD_ONLY || nFlag == AUTOUPD_FIELD_AND_CHARTS ) ?
                                         bUpdateChart ?
                                         AUTOUPD_FIELD_AND_CHARTS :
@@ -896,13 +896,13 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_FIELD_AUTO_UPDATE:
         {
-            SwFldUpdateFlags nFlags = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
+            SwFieldUpdateFlags nFlags = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
             rValue <<= nFlags == AUTOUPD_FIELD_ONLY || nFlags == AUTOUPD_FIELD_AND_CHARTS;
         }
         break;
         case HANDLE_CHART_AUTO_UPDATE:
         {
-            SwFldUpdateFlags nFlags = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
+            SwFieldUpdateFlags nFlags = mpDoc->getIDocumentSettingAccess().getFieldUpdateFlags(true);
             rValue <<= nFlags == AUTOUPD_FIELD_AND_CHARTS;
         }
         break;
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index c0490a2a39cf..35e1042485b5 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -307,11 +307,11 @@ static bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTe
     SwNodes& rNds = pInsDoc->GetNodes();
 
     SwNodeIndex aIdx( rNds.GetEndOfContent(), -1 );
-    SwCntntNode * pNd = aIdx.GetNode().GetCntntNode();
+    SwContentNode * pNd = aIdx.GetNode().GetContentNode();
     SwPosition aPos(aIdx, SwIndex(pNd, (pNd) ? pNd->Len() : 0));
 
     bool bRet = false;
-    pInsDoc->getIDocumentFieldsAccess().LockExpFlds();
+    pInsDoc->getIDocumentFieldsAccess().LockExpFields();
     {
         SwDoc *const pDoc((pxCursor) ? pxCursor->GetDoc() : pxRange->GetDoc());
         SwPaM aPam(pDoc->GetNodes());
@@ -331,9 +331,9 @@ static bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTe
         bRet = pDoc->getIDocumentContentOperations().CopyRange( *pPam, aPos, /*bCopyAll=*/false, /*bCheckPos=*/true ) || bRet;
     }
 
-    pInsDoc->getIDocumentFieldsAccess().UnlockExpFlds();
-    if( !pInsDoc->getIDocumentFieldsAccess().IsExpFldsLocked() )
-        pInsDoc->getIDocumentFieldsAccess().UpdateExpFlds(NULL, true);
+    pInsDoc->getIDocumentFieldsAccess().UnlockExpFields();
+    if( !pInsDoc->getIDocumentFieldsAccess().IsExpFieldsLocked() )
+        pInsDoc->getIDocumentFieldsAccess().UpdateExpFields(NULL, true);
 
     return bRet;
 }
@@ -364,13 +364,13 @@ uno::Reference< text::XAutoTextEntry >  SwXAutoTextGroup::insertNewByName(const
                                     OTextCursorHelper::getUnoTunnelId()));
         }
 
-        OUString sOnlyTxt;
-        OUString* pOnlyTxt = 0;
+        OUString sOnlyText;
+        OUString* pOnlyText = 0;
         bool bNoAttr = !pxCursor && !pxRange;
         if(bNoAttr)
         {
-            sOnlyTxt = OUString(xTextRange->getString());
-            pOnlyTxt = &sOnlyTxt;
+            sOnlyText = OUString(xTextRange->getString());
+            pOnlyText = &sOnlyText;
         }
 
         const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
@@ -387,8 +387,8 @@ uno::Reference< text::XAutoTextEntry >  SwXAutoTextGroup::insertNewByName(const
             pGlosGroup->SetBaseURL( OUString() );
 
         sal_uInt16 nRet = USHRT_MAX;
-        if( pOnlyTxt )
-            nRet = pGlosGroup->PutText( sShortName, sLongName, *pOnlyTxt );
+        if( pOnlyText )
+            nRet = pGlosGroup->PutText( sShortName, sLongName, *pOnlyText );
         else
         {
             pGlosGroup->ClearDoc();
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 5812d728102e..483c2a40e5f5 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -604,7 +604,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
         case  HANDLE_VIEWSET_GRAPHICS              :   mpViewOption->SetGraphic(bVal);break;
         case  HANDLE_VIEWSET_TABLES                :   mpViewOption->SetTable(bVal);    break;
         case  HANDLE_VIEWSET_DRAWINGS              :   mpViewOption->SetDraw(bVal); break;
-        case  HANDLE_VIEWSET_FIELD_COMMANDS        :   mpViewOption->SetFldName(bVal);  break;
+        case  HANDLE_VIEWSET_FIELD_COMMANDS        :   mpViewOption->SetFieldName(bVal);  break;
         case  HANDLE_VIEWSET_ANNOTATIONS           :   mpViewOption->SetPostIts(bVal);  break;
         case  HANDLE_VIEWSET_INDEX_MARK_BACKGROUND :   SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true);  break;
         case  HANDLE_VIEWSET_NONPRINTING_CHARACTERS:   mpViewOption->SetViewMetaChars( bVal ); break;
@@ -834,7 +834,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
         case  HANDLE_VIEWSET_GRAPHICS              :    bBoolVal = mpConstViewOption->IsGraphic();break;
         case  HANDLE_VIEWSET_TABLES                :   bBoolVal = mpConstViewOption->IsTable(); break;
         case  HANDLE_VIEWSET_DRAWINGS              :   bBoolVal = mpConstViewOption->IsDraw();  break;
-        case  HANDLE_VIEWSET_FIELD_COMMANDS        :   bBoolVal = mpConstViewOption->IsFldName();   break;
+        case  HANDLE_VIEWSET_FIELD_COMMANDS        :   bBoolVal = mpConstViewOption->IsFieldName();   break;
         case  HANDLE_VIEWSET_ANNOTATIONS           :   bBoolVal = mpConstViewOption->IsPostIts();   break;
         case  HANDLE_VIEWSET_INDEX_MARK_BACKGROUND :   bBoolVal = SwViewOption::IsFieldShadings();   break;
         case  HANDLE_VIEWSET_NONPRINTING_CHARACTERS:   bBoolVal = mpConstViewOption->IsViewMetaChars(); break;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index a3ea47da95aa..8a61199b9688 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -200,15 +200,15 @@ static SwPrintUIOptions * lcl_GetPrintUIOptions(
     return new SwPrintUIOptions( nCurrentPage, bWebDoc, bSwSrcView, bHasSelection, bHasPostIts, rPrintData );
 }
 
-static SwTxtFmtColl *lcl_GetParaStyle(const OUString& rCollName, SwDoc* pDoc)
+static SwTextFormatColl *lcl_GetParaStyle(const OUString& rCollName, SwDoc* pDoc)
 {
-    SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName( rCollName );
+    SwTextFormatColl* pColl = pDoc->FindTextFormatCollByName( rCollName );
     if( !pColl )
     {
         const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(
             rCollName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
         if( USHRT_MAX != nId )
-            pColl = pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nId );
+            pColl = pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nId );
     }
     return pColl;
 }
@@ -271,9 +271,9 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI
         return nRet;
 
     GetNumberFormatter();
-    if (!xNumFmtAgg.is()) // may happen if not valid or no SwDoc
+    if (!xNumFormatAgg.is()) // may happen if not valid or no SwDoc
         return 0;
-    Any aNumTunnel = xNumFmtAgg->queryAggregation(cppu::UnoType<XUnoTunnel>::get());
+    Any aNumTunnel = xNumFormatAgg->queryAggregation(cppu::UnoType<XUnoTunnel>::get());
     Reference<XUnoTunnel> xNumTunnel;
     aNumTunnel >>= xNumTunnel;
     return (xNumTunnel.is()) ? xNumTunnel->getSomething(rId) : 0;
@@ -306,8 +306,8 @@ Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(Run
         && rType != cppu::UnoType<com::sun::star::awt::XWindow>::get())
     {
         GetNumberFormatter();
-        if(xNumFmtAgg.is())
-            aRet = xNumFmtAgg->queryAggregation(rType);
+        if(xNumFormatAgg.is())
+            aRet = xNumFormatAgg->queryAggregation(rType);
     }
     return aRet;
 }
@@ -334,10 +334,10 @@ Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() throw(RuntimeExceptio
 
     Sequence< uno::Type > aNumTypes;
     GetNumberFormatter();
-    if(xNumFmtAgg.is())
+    if(xNumFormatAgg.is())
     {
         const uno::Type& rProvType = cppu::UnoType<XTypeProvider>::get();
-        Any aNumProv = xNumFmtAgg->queryAggregation(rProvType);
+        Any aNumProv = xNumFormatAgg->queryAggregation(rProvType);
         Reference<XTypeProvider> xNumProv;
         if(aNumProv >>= xNumProv)
         {
@@ -411,11 +411,11 @@ SwXTextDocument::SwXTextDocument(SwDocShell* pShell)
 SwXTextDocument::~SwXTextDocument()
 {
     InitNewDoc();
-    if(xNumFmtAgg.is())
+    if(xNumFormatAgg.is())
     {
         Reference< XInterface >  x0;
-        xNumFmtAgg->setDelegator(x0);
-        xNumFmtAgg = 0;
+        xNumFormatAgg->setDelegator(x0);
+        xNumFormatAgg = 0;
     }
     delete m_pPrintUIOptions;
     if (m_pRenderData && m_pRenderData->IsViewOptionAdjust())
@@ -442,33 +442,33 @@ void SwXTextDocument::GetNumberFormatter()
 {
     if(IsValid())
     {
-        if(!xNumFmtAgg.is())
+        if(!xNumFormatAgg.is())
         {
             if ( pDocShell->GetDoc() )
             {
-                SvNumberFormatsSupplierObj* pNumFmt = new SvNumberFormatsSupplierObj(
+                SvNumberFormatsSupplierObj* pNumFormat = new SvNumberFormatsSupplierObj(
                                     pDocShell->GetDoc()->GetNumberFormatter( true ));
-                Reference< util::XNumberFormatsSupplier >  xTmp = pNumFmt;
-                xNumFmtAgg = Reference< XAggregation >(xTmp, UNO_QUERY);
+                Reference< util::XNumberFormatsSupplier >  xTmp = pNumFormat;
+                xNumFormatAgg = Reference< XAggregation >(xTmp, UNO_QUERY);
             }
-            if(xNumFmtAgg.is())
-                xNumFmtAgg->setDelegator((cppu::OWeakObject*)(SwXTextDocumentBaseClass*)this);
+            if(xNumFormatAgg.is())
+                xNumFormatAgg->setDelegator((cppu::OWeakObject*)(SwXTextDocumentBaseClass*)this);
         }
         else
         {
             const uno::Type& rTunnelType = cppu::UnoType<XUnoTunnel>::get();
-            Any aNumTunnel = xNumFmtAgg->queryAggregation(rTunnelType);
-            SvNumberFormatsSupplierObj* pNumFmt = 0;
+            Any aNumTunnel = xNumFormatAgg->queryAggregation(rTunnelType);
+            SvNumberFormatsSupplierObj* pNumFormat = 0;
             Reference< XUnoTunnel > xNumTunnel;
             if(aNumTunnel >>= xNumTunnel)
             {
-                pNumFmt = reinterpret_cast<SvNumberFormatsSupplierObj*>(
+                pNumFormat = reinterpret_cast<SvNumberFormatsSupplierObj*>(
                         xNumTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId()));
 
             }
-            OSL_ENSURE(pNumFmt, "No number formatter available");
-            if (pNumFmt && !pNumFmt->GetNumberFormatter())
-                pNumFmt->SetNumberFormatter(pDocShell->GetDoc()->GetNumberFormatter( true ));
+            OSL_ENSURE(pNumFormat, "No number formatter available");
+            if (pNumFormat && !pNumFormat->GetNumberFormatter())
+                pNumFormat->SetNumberFormatter(pDocShell->GetDoc()->GetNumberFormatter( true ));
         }
     }
 }
@@ -774,8 +774,8 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
     }
     else if(pSearch->bStyles)
     {
-        SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
-        SwTxtFmtColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCrsr->GetDoc());
+        SwTextFormatColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
+        SwTextFormatColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCrsr->GetDoc());
 
         bool bCancel;
         nResult = pUnoCrsr->Find( *pSearchColl,
@@ -904,9 +904,9 @@ SwUnoCrsr*  SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
         }
         else if(pSearch->bStyles)
         {
-            SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
+            SwTextFormatColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
             //pSearch->sReplaceText
-            SwTxtFmtColl *pReplaceColl = 0;
+            SwTextFormatColl *pReplaceColl = 0;
             bool bCancel;
             nResult = (sal_Int32)pUnoCrsr->Find( *pSearchColl,
                         eStart, eEnd, bCancel,
@@ -1054,11 +1054,11 @@ static OUString lcl_CreateOutlineString( size_t nIndex,
             const SwOutlineNodes& rOutlineNodes, const SwNumRule* pOutlRule)
 {
     OUString sEntry;
-    const SwTxtNode * pTxtNd = rOutlineNodes[ nIndex ]->GetTxtNode();
-    SwNumberTree::tNumberVector aNumVector = pTxtNd->GetNumberVector();
-    if( pOutlRule && pTxtNd->GetNumRule())
+    const SwTextNode * pTextNd = rOutlineNodes[ nIndex ]->GetTextNode();
+    SwNumberTree::tNumberVector aNumVector = pTextNd->GetNumberVector();
+    if( pOutlRule && pTextNd->GetNumRule())
         for( sal_Int8 nLevel = 0;
-             nLevel <= pTxtNd->GetActualListLevel();
+             nLevel <= pTextNd->GetActualListLevel();
              nLevel++ )
         {
             long nVal = aNumVector[nLevel];
@@ -1068,7 +1068,7 @@ static OUString lcl_CreateOutlineString( size_t nIndex,
             sEntry += ".";
         }
     sEntry += rOutlineNodes[ nIndex ]->
-                    GetTxtNode()->GetExpandTxt( 0, -1, false );
+                    GetTextNode()->GetExpandText( 0, -1, false );
     return sEntry;
 }
 
@@ -1392,19 +1392,19 @@ Reference< drawing::XDrawPage >  SwXTextDocument::getDrawPage() throw( RuntimeEx
 void SwXTextDocument::Invalidate()
 {
     bObjectValid = false;
-    if(xNumFmtAgg.is())
+    if(xNumFormatAgg.is())
     {
         const uno::Type& rTunnelType = cppu::UnoType<XUnoTunnel>::get();
-        Any aNumTunnel = xNumFmtAgg->queryAggregation(rTunnelType);
-        SvNumberFormatsSupplierObj* pNumFmt = 0;
+        Any aNumTunnel = xNumFormatAgg->queryAggregation(rTunnelType);
+        SvNumberFormatsSupplierObj* pNumFormat = 0;
         Reference< XUnoTunnel > xNumTunnel;
         if(aNumTunnel >>= xNumTunnel)
         {
-            pNumFmt = reinterpret_cast<SvNumberFormatsSupplierObj*>(
+            pNumFormat = reinterpret_cast<SvNumberFormatsSupplierObj*>(
                     xNumTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId()));
-            pNumFmt->SetNumberFormatter(0);
+            pNumFormat->SetNumberFormatter(0);
         }
-        OSL_ENSURE(pNumFmt, "No number formatter available");
+        OSL_ENSURE(pNumFormat, "No number formatter available");
     }
     InitNewDoc();
     pDocShell = 0;
@@ -1425,8 +1425,8 @@ void    SwXTextDocument::InitNewDoc()
     // first invalidate all collections, then delete references and Set to zero
     if(pxXTextTables)
     {
-         XNameAccess* pTbls = pxXTextTables->get();
-        static_cast<SwXTextTables*>(pTbls)->Invalidate();
+         XNameAccess* pTables = pxXTextTables->get();
+        static_cast<SwXTextTables*>(pTables)->Invalidate();
         delete pxXTextTables;
         pxXTextTables = 0;
     }
@@ -1461,21 +1461,21 @@ void    SwXTextDocument::InitNewDoc()
         pBodyText = 0;
     }
 
-    if(xNumFmtAgg.is())
+    if(xNumFormatAgg.is())
     {
         const uno::Type& rTunnelType = cppu::UnoType<XUnoTunnel>::get();
-        Any aNumTunnel = xNumFmtAgg->queryAggregation(rTunnelType);
-        SvNumberFormatsSupplierObj* pNumFmt = 0;
+        Any aNumTunnel = xNumFormatAgg->queryAggregation(rTunnelType);
+        SvNumberFormatsSupplierObj* pNumFormat = 0;
         Reference< XUnoTunnel > xNumTunnel;
         if(aNumTunnel >>= xNumTunnel)
         {
-            pNumFmt = reinterpret_cast<SvNumberFormatsSupplierObj*>(
+            pNumFormat = reinterpret_cast<SvNumberFormatsSupplierObj*>(
                     xNumTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId()));
 
         }
-        OSL_ENSURE(pNumFmt, "No number formatter available");
-        if (pNumFmt)
-            pNumFmt->SetNumberFormatter(0);
+        OSL_ENSURE(pNumFormat, "No number formatter available");
+        if (pNumFormat)
+            pNumFormat->SetNumberFormatter(0);
     }
 
     if(pxXTextFieldTypes)
@@ -1523,16 +1523,16 @@ void    SwXTextDocument::InitNewDoc()
 
     if(pxXFootnotes)
     {
-         XIndexAccess* pFtn = pxXFootnotes->get();
-        static_cast<SwXFootnotes*>(pFtn)->Invalidate();
+         XIndexAccess* pFootnote = pxXFootnotes->get();
+        static_cast<SwXFootnotes*>(pFootnote)->Invalidate();
         delete pxXFootnotes;
         pxXFootnotes = 0;
     }
 
     if(pxXEndnotes)
     {
-         XIndexAccess* pFtn = pxXEndnotes->get();
-        static_cast<SwXFootnotes*>(pFtn)->Invalidate();
+         XIndexAccess* pFootnote = pxXEndnotes->get();
+        static_cast<SwXFootnotes*>(pFootnote)->Invalidate();
         delete pxXEndnotes;
         pxXEndnotes = 0;
     }
@@ -2602,7 +2602,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
             }
 
             // #122919# Force field update before PDF export
-            pViewShell->SwViewShell::UpdateFlds(true);
+            pViewShell->SwViewShell::UpdateFields(true);
             if( bStateChanged )
                 pRenderDocShell->EnableSetModified( true );
 
@@ -3342,10 +3342,10 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
 
     //USER STYLES
 
-    const SwCharFmts *pFmts = pDoc->GetCharFmts();
-    for(size_t i = 0; i < pFmts->size(); ++i)
+    const SwCharFormats *pFormats = pDoc->GetCharFormats();
+    for(size_t i = 0; i < pFormats->size(); ++i)
     {
-        const SwAttrSet &rAttrSet = (*pFmts)[i]->GetAttrSet();
+        const SwAttrSet &rAttrSet = (*pFormats)[i]->GetAttrSet();
         LanguageType nLang = LANGUAGE_DONTKNOW;
         if (bLatin)
         {
@@ -3367,7 +3367,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
         }
     }
 
-    const SwTxtFmtColls *pColls = pDoc->GetTxtFmtColls();
+    const SwTextFormatColls *pColls = pDoc->GetTextFormatColls();
     for (size_t i = 0; i < pColls->size(); ++i)
     {
         const SwAttrSet &rAttrSet = (*pColls)[i]->GetAttrSet();
@@ -3533,49 +3533,49 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
     {
         sSuffix += "table";
 
-        Reference< XNameAccess >  xTbls = new SwXLinkNameAccessWrapper(
+        Reference< XNameAccess >  xTables = new SwXLinkNameAccessWrapper(
                                         pxDoc->getTextTables(), sToCompare, sSuffix );
-        Reference< XPropertySet >  xRet(xTbls, UNO_QUERY);
+        Reference< XPropertySet >  xRet(xTables, UNO_QUERY);
         aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
     }
     else if(sToCompare == sFrames)
     {
         sSuffix += "frame";
-        Reference< XNameAccess >  xTbls = new SwXLinkNameAccessWrapper(
+        Reference< XNameAccess >  xTables = new SwXLinkNameAccessWrapper(
                                         pxDoc->getTextFrames(), sToCompare, sSuffix );
-        Reference< XPropertySet >  xRet(xTbls, UNO_QUERY);
+        Reference< XPropertySet >  xRet(xTables, UNO_QUERY);
         aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
     }
     else if(sToCompare == sSections)
     {
         sSuffix += "region";
-        Reference< XNameAccess >  xTbls = new SwXLinkNameAccessWrapper(
+        Reference< XNameAccess >  xTables = new SwXLinkNameAccessWrapper(
                                         pxDoc->getTextSections(), sToCompare, sSuffix );
-        Reference< XPropertySet >  xRet(xTbls, UNO_QUERY);
+        Reference< XPropertySet >  xRet(xTables, UNO_QUERY);
         aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
     }
     else if(sToCompare == sGraphics)
     {
         sSuffix += "graphic";
-        Reference< XNameAccess >  xTbls = new SwXLinkNameAccessWrapper(
+        Reference< XNameAccess >  xTables = new SwXLinkNameAccessWrapper(
                                         pxDoc->getGraphicObjects(), sToCompare, sSuffix );
-        Reference< XPropertySet >  xRet(xTbls, UNO_QUERY);
+        Reference< XPropertySet >  xRet(xTables, UNO_QUERY);
         aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
     }
     else if(sToCompare == sOLEs)
     {
         sSuffix += "ole";
-        Reference< XNameAccess >  xTbls = new SwXLinkNameAccessWrapper(
+        Reference< XNameAccess >  xTables = new SwXLinkNameAccessWrapper(
                                         pxDoc->getEmbeddedObjects(), sToCompare, sSuffix );
-        Reference< XPropertySet >  xRet(xTbls, UNO_QUERY);
+        Reference< XPropertySet >  xRet(xTables, UNO_QUERY);
         aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
     }
     else if(sToCompare == sOutlines)
     {
         sSuffix += "outline";
-        Reference< XNameAccess >  xTbls = new SwXLinkNameAccessWrapper(
+        Reference< XNameAccess >  xTables = new SwXLinkNameAccessWrapper(
                                         *pxDoc, sToCompare, sSuffix );
-        Reference< XPropertySet >  xRet(xTbls, UNO_QUERY);
+        Reference< XPropertySet >  xRet(xTables, UNO_QUERY);
         aRet.setValue(&xRet, cppu::UnoType<XPropertySet>::get());
     }
     else if(sToCompare == sBookmarks)
@@ -4119,12 +4119,12 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
     // to avoid unnecessary reformatting the view options related to the content
     // below should only change if necessary, that is if respective content is present
     const bool bContainsHiddenChars         = m_pShell->GetDoc()->ContainsHiddenChars();
-    const SwFieldType* pFldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENTXTFLD );
-    const bool bContainsHiddenFields        = pFldType && pFldType->HasWriterListeners();
-    pFldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENPARAFLD );
-    const bool bContainsHiddenParagraphs    = pFldType && pFldType->HasWriterListeners();
-    pFldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFldType( RES_JUMPEDITFLD );
-    const bool bContainsPlaceHolders        = pFldType && pFldType->HasWriterListeners();
+    const SwFieldType* pFieldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENTXTFLD );
+    const bool bContainsHiddenFields        = pFieldType && pFieldType->HasWriterListeners();
+    pFieldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENPARAFLD );
+    const bool bContainsHiddenParagraphs    = pFieldType && pFieldType->HasWriterListeners();
+    pFieldType = m_pShell->GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( RES_JUMPEDITFLD );
+    const bool bContainsPlaceHolders        = pFieldType && pFieldType->HasWriterListeners();
     const bool bContainsFields              = m_pShell->IsAnyFieldInDoc();
 
     SwViewOption aRenderViewOptions( m_aOldViewOptions );
@@ -4156,7 +4156,7 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
     }
 
     if (bContainsFields)
-        aRenderViewOptions.SetFldName( false );
+        aRenderViewOptions.SetFieldName( false );
 
     // we need to set this flag in order to get to see the visible effect of
     // some of the above settings (needed for correct rendering)
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 3a2820f18d1c..b81fd2ecc647 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -338,8 +338,8 @@ uno::Any SwXTextView::getSelection()
             {
                 if(rSh.GetTableCrsr())
                 {
-                    OSL_ENSURE(rSh.GetTableFmt(), "not a table format?");
-                    uno::Reference< text::XTextTableCursor >  xCrsr = new SwXTextTableCursor(*rSh.GetTableFmt(),
+                    OSL_ENSURE(rSh.GetTableFormat(), "not a table format?");
+                    uno::Reference< text::XTextTableCursor >  xCrsr = new SwXTextTableCursor(*rSh.GetTableFormat(),
                                                     rSh.GetTableCrsr());
                     aRef = uno::Reference< uno::XInterface >  (xCrsr, uno::UNO_QUERY);
                     break;
@@ -358,31 +358,31 @@ uno::Any SwXTextView::getSelection()
             break;
             case SHELL_MODE_FRAME           :
             {
-                SwFrmFmt *const pFmt = rSh.GetFlyFrmFmt();
-                if (pFmt)
+                SwFrameFormat *const pFormat = rSh.GetFlyFrameFormat();
+                if (pFormat)
                 {
                     aRef = SwXTextFrame::CreateXTextFrame(
-                            *pFmt->GetDoc(), pFmt);
+                            *pFormat->GetDoc(), pFormat);
                 }
             }
             break;
             case SHELL_MODE_GRAPHIC         :
             {
-                SwFrmFmt *const pFmt = rSh.GetFlyFrmFmt();
-                if (pFmt)
+                SwFrameFormat *const pFormat = rSh.GetFlyFrameFormat();
+                if (pFormat)
                 {
                     aRef = SwXTextGraphicObject::CreateXTextGraphicObject(
-                            *pFmt->GetDoc(), pFmt);
+                            *pFormat->GetDoc(), pFormat);
                 }
             }
             break;
             case SHELL_MODE_OBJECT          :
             {
-                SwFrmFmt *const pFmt = rSh.GetFlyFrmFmt();
-                if (pFmt)
+                SwFrameFormat *const pFormat = rSh.GetFlyFrameFormat();
+                if (pFormat)
                 {
                     aRef = SwXTextEmbeddedObject::CreateXTextEmbeddedObject(
-                            *pFmt->GetDoc(), pFmt);
+                            *pFormat->GetDoc(), pFormat);
                 }
             }
             break;
@@ -550,7 +550,7 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
         const SwRubyListEntry* pEntry = &aList[n];
 
         const OUString& rEntryText = pEntry->GetText();
-        const SwFmtRuby& rAttr = pEntry->GetRubyAttr();
+        const SwFormatRuby& rAttr = pEntry->GetRubyAttr();
 
         pRet[n].realloc(5);
         PropertyValue* pValues = pRet[n].getArray();
@@ -559,7 +559,7 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
         pValues[1].Name = UNO_NAME_RUBY_TEXT;
         pValues[1].Value <<= rAttr.GetText();
         pValues[2].Name = UNO_NAME_RUBY_CHAR_STYLE_NAME;
-        SwStyleNameMapper::FillProgName(rAttr.GetCharFmtName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
+        SwStyleNameMapper::FillProgName(rAttr.GetCharFormatName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
         pValues[2].Value <<= aString;
         pValues[3].Name = UNO_NAME_RUBY_ADJUST;
         pValues[3].Value <<= (sal_Int16)rAttr.GetAdjustment();
@@ -616,8 +616,8 @@ void SAL_CALL SwXTextView::setRubyList(
                         : SwStyleNameMapper::GetPoolIdFromUIName(sName,
                                 nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
 
-                    pEntry->GetRubyAttr().SetCharFmtName( sName );
-                    pEntry->GetRubyAttr().SetCharFmtId( nPoolId );
+                    pEntry->GetRubyAttr().SetCharFormatName( sName );
+                    pEntry->GetRubyAttr().SetCharFormatId( nPoolId );
                 }
             }
             else if(pProperties[nProp].Name == UNO_NAME_RUBY_ADJUST)
@@ -916,7 +916,7 @@ awt::Point SwXTextViewCursor::getPosition() throw( uno::RuntimeException, std::e
         const SwWrtShell& rSh = m_pView->GetWrtShell();
         const SwRect aCharRect(rSh.GetCharRect());
 
-        const SwFrmFmt& rMaster = rSh.GetPageDesc( rSh.GetCurPageDesc() ).GetMaster();
+        const SwFrameFormat& rMaster = rSh.GetPageDesc( rSh.GetCurPageDesc() ).GetMaster();
 
         const SvxULSpaceItem& rUL = rMaster.GetULSpace();
         const long nY = aCharRect.Top() - (rUL.GetUpper() + DOCUMENTBORDER);
@@ -1113,9 +1113,9 @@ void SwXTextViewCursor::gotoRange(
                 pSrcNode = &aPam.GetNode();
             }
         }
-        else if (pPara && pPara->GetTxtNode())
+        else if (pPara && pPara->GetTextNode())
         {
-            pSrcNode = pPara->GetTxtNode();
+            pSrcNode = pPara->GetTextNode();
         }
         const SwStartNode* pTmp = pSrcNode ? pSrcNode->FindSttNodeByType(eSearchNodeType) : 0;
 
@@ -1494,7 +1494,7 @@ void  SwXTextViewCursor::setPropertyValue( const OUString& rPropertyName, const
         SwWrtShell& rSh = m_pView->GetWrtShell();
         SwPaM* pShellCrsr = rSh.GetCrsr();
         SwNode& rNode = pShellCrsr->GetNode();
-        if (rNode.IsTxtNode())
+        if (rNode.IsTextNode())
         {
             SwUnoCursorHelper::SetPropertyValue(
                 *pShellCrsr, *m_pPropSet, rPropertyName, aValue );
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 67479ebb562c..513a98a8b8db 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -59,7 +59,7 @@
 
 using namespace com::sun::star;
 
-TYPEINIT2(SwFmtCharFmt,SfxPoolItem,SwClient);
+TYPEINIT2(SwFormatCharFormat,SfxPoolItem,SwClient);
 
 // query the attribute descriptions
 void SwAttrSet::GetPresentation(
@@ -92,7 +92,7 @@ void SwAttrSet::GetPresentation(
     }
 }
 
-bool SwFmtCharFmt::GetPresentation
+bool SwFormatCharFormat::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          eCoreUnit,
@@ -101,12 +101,12 @@ bool SwFmtCharFmt::GetPresentation
     const IntlWrapper*        /*pIntl*/
 )   const
 {
-    const SwCharFmt *pCharFmt = GetCharFmt();
-    if ( pCharFmt )
+    const SwCharFormat *pCharFormat = GetCharFormat();
+    if ( pCharFormat )
     {
         OUString aStr;
         rText = OUString( SW_RESSTR( STR_CHARFMT ) );
-        pCharFmt->GetPresentation( ePres, eCoreUnit, ePresUnit, aStr );
+        pCharFormat->GetPresentation( ePres, eCoreUnit, ePresUnit, aStr );
         rText = rText + "(" + aStr + ")";
     }
     else
@@ -114,7 +114,7 @@ bool SwFmtCharFmt::GetPresentation
     return true;
 }
 
-bool SwFmtAutoFmt::GetPresentation
+bool SwFormatAutoFormat::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -127,7 +127,7 @@ bool SwFmtAutoFmt::GetPresentation
     return true;
 }
 
-bool SwFmtINetFmt::GetPresentation
+bool SwFormatINetFormat::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -140,7 +140,7 @@ bool SwFmtINetFmt::GetPresentation
     return true;
 }
 
-bool SwFmtRuby::GetPresentation( SfxItemPresentation /*ePres*/,
+bool SwFormatRuby::GetPresentation( SfxItemPresentation /*ePres*/,
                             SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
                             OUString &rText, const IntlWrapper* /*pIntl*/ ) const
 {
@@ -148,7 +148,7 @@ bool SwFmtRuby::GetPresentation( SfxItemPresentation /*ePres*/,
     return true;
 }
 
-bool SwFmtDrop::GetPresentation
+bool SwFormatDrop::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -223,7 +223,7 @@ bool SwParaConnectBorderItem::GetPresentation
 
 // Frame attribute
 
-bool SwFmtFrmSize::GetPresentation
+bool SwFormatFrmSize::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          eCoreUnit,
@@ -263,9 +263,9 @@ bool SwFmtFrmSize::GetPresentation
 }
 
 //Header for page formats.
-//Client of FrmFmt which describes the header.
+//Client of FrameFormat which describes the header.
 
-bool SwFmtHeader::GetPresentation
+bool SwFormatHeader::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -274,15 +274,15 @@ bool SwFmtHeader::GetPresentation
     const IntlWrapper*        /*pIntl*/
 )   const
 {
-    const sal_uInt16 nId = GetHeaderFmt() ? STR_HEADER : STR_NO_HEADER;
+    const sal_uInt16 nId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER;
     rText = SW_RESSTR( nId );
     return true;
 }
 
 //Footer for page formats.
-//Client of FrmFmt which describes the footer.
+//Client of FrameFormat which describes the footer.
 
-bool SwFmtFooter::GetPresentation
+bool SwFormatFooter::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -291,12 +291,12 @@ bool SwFmtFooter::GetPresentation
     const IntlWrapper*        /*pIntl*/
 )   const
 {
-    const sal_uInt16 nId = GetFooterFmt() ? STR_FOOTER : STR_NO_FOOTER;
+    const sal_uInt16 nId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER;
     rText = SW_RESSTR( nId );
     return true;
 }
 
-bool SwFmtSurround::GetPresentation
+bool SwFormatSurround::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -340,7 +340,7 @@ bool SwFmtSurround::GetPresentation
 
 //VertOrientation, how and by what orientate the FlyFrm in the vertical?
 
-bool SwFmtVertOrient::GetPresentation
+bool SwFormatVertOrient::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          eCoreUnit,
@@ -386,7 +386,7 @@ bool SwFmtVertOrient::GetPresentation
 
 //HoriOrientation, how and by what orientate the FlyFrm in the horizontal?
 
-bool SwFmtHoriOrient::GetPresentation
+bool SwFormatHoriOrient::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          eCoreUnit,
@@ -432,7 +432,7 @@ bool SwFmtHoriOrient::GetPresentation
 
 // FlyAnchor, Anchor of the free-flying frame
 
-bool SwFmtAnchor::GetPresentation
+bool SwFormatAnchor::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -460,7 +460,7 @@ bool SwFmtAnchor::GetPresentation
     return true;
 }
 
-bool SwFmtPageDesc::GetPresentation
+bool SwFormatPageDesc::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -479,7 +479,7 @@ bool SwFmtPageDesc::GetPresentation
 
 //The ColumnDescriptor
 
-bool SwFmtCol::GetPresentation
+bool SwFormatCol::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          eCoreUnit,
@@ -507,7 +507,7 @@ bool SwFmtCol::GetPresentation
 
 //URL's and maps
 
-bool SwFmtURL::GetPresentation
+bool SwFormatURL::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -534,7 +534,7 @@ bool SwFmtURL::GetPresentation
     return true;
 }
 
-bool SwFmtEditInReadonly::GetPresentation
+bool SwFormatEditInReadonly::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -549,15 +549,15 @@ bool SwFmtEditInReadonly::GetPresentation
     return true;
 }
 
-void SwFmtEditInReadonly::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatEditInReadonly::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtEditInReadonly"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatEditInReadonly"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::boolean(GetValue()).getStr()));
     xmlTextWriterEndElement(pWriter);
 }
 
-bool SwFmtLayoutSplit::GetPresentation
+bool SwFormatLayoutSplit::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -571,7 +571,7 @@ bool SwFmtLayoutSplit::GetPresentation
     return true;
 }
 
-bool SwFmtRowSplit::GetPresentation
+bool SwFormatRowSplit::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -583,7 +583,7 @@ bool SwFmtRowSplit::GetPresentation
     return false;
 }
 
-bool SwFmtFtnEndAtTxtEnd::GetPresentation
+bool SwFormatFootnoteEndAtTextEnd::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -595,7 +595,7 @@ bool SwFmtFtnEndAtTxtEnd::GetPresentation
     return true;
 }
 
-bool SwFmtChain::GetPresentation
+bool SwFormatChain::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -619,7 +619,7 @@ bool SwFmtChain::GetPresentation
     return true;
 }
 
-bool SwFmtLineNumber::GetPresentation
+bool SwFormatLineNumber::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -828,7 +828,7 @@ bool SwDrawModeGrf::GetPresentation(
     return true;
 }
 
-bool SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres,
+bool SwFormatFollowTextFlow::GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit /*eCoreMetric*/,
                                     SfxMapUnit /*ePresMetric*/,
                                     OUString &rText,
@@ -843,9 +843,9 @@ bool SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres,
     return true;
 }
 
-void SwFmtFollowTextFlow::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatFollowTextFlow::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtFollowTextFlow"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatFollowTextFlow"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::boolean(GetValue()).getStr()));
     xmlTextWriterEndElement(pWriter);
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 85bd0b19ceda..f79b378abc98 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -163,7 +163,7 @@ namespace
                                 pCntType,
                                 p->sText,
                                 INetURLObject::decode(
-                                    p->rINetAttr.GetINetFmt().GetValue(),
+                                    p->rINetAttr.GetINetFormat().GetValue(),
                                     INetURLObject::DECODE_UNAMBIGUOUS,
                                     RTL_TEXTENCODING_UTF8 ),
                                 &p->rINetAttr,
@@ -198,7 +198,7 @@ bool SwContent::IsProtect() const
 bool SwPostItContent::IsProtect() const
 {
     if (mbPostIt)
-        return pFld->IsProtect();
+        return pField->IsProtect();
     else
         return false;
 }
@@ -261,7 +261,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 
         case CONTENT_TYPE_TABLE     :
             sTypeToken = "table";
-            nMemberCount = static_cast<sal_uInt16>(pWrtShell->GetTblFrmFmtCount(true));
+            nMemberCount = static_cast<sal_uInt16>(pWrtShell->GetTableFrameFormatCount(true));
             bEdit = true;
         break;
 
@@ -310,31 +310,31 @@ void SwContentType::Init(bool* pbInvalidateWindow)
                 pMember = new SwContentArr;
             }
             const Point aNullPt;
-            nMemberCount = pWrtShell->GetSectionFmtCount();
+            nMemberCount = pWrtShell->GetSectionFormatCount();
             for(sal_uInt16 i = 0; i < nMemberCount; i++)
             {
-                const SwSectionFmt* pFmt;
+                const SwSectionFormat* pFormat;
                 SectionType eTmpType;
-                if( (pFmt = &pWrtShell->GetSectionFmt(i))->IsInNodesArr() &&
-                (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+                if( (pFormat = &pWrtShell->GetSectionFormat(i))->IsInNodesArr() &&
+                (eTmpType = pFormat->GetSection()->GetType()) != TOX_CONTENT_SECTION
                 && TOX_HEADER_SECTION != eTmpType )
                 {
                     const OUString& rSectionName =
-                        pFmt->GetSection()->GetSectionName();
+                        pFormat->GetSection()->GetSectionName();
                     sal_uInt8 nLevel = 0;
-                    SwSectionFmt* pParentFmt = pFmt->GetParent();
-                    while(pParentFmt)
+                    SwSectionFormat* pParentFormat = pFormat->GetParent();
+                    while(pParentFormat)
                     {
                         nLevel++;
-                        pParentFmt = pParentFmt->GetParent();
+                        pParentFormat = pParentFormat->GetParent();
                     }
 
                     SwContent* pCnt = new SwRegionContent(this, rSectionName,
                             nLevel,
-                            pFmt->FindLayoutRect( false, &aNullPt ).Top());
+                            pFormat->FindLayoutRect( false, &aNullPt ).Top());
 
                     SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 );
-                    if( !pFmt->GetInfo( aAskItem ) &&
+                    if( !pFormat->GetInfo( aAskItem ) &&
                         !aAskItem.pObject )     // not visible
                         pCnt->SetInvisible();
                     pMember->insert(pCnt);
@@ -400,18 +400,18 @@ void SwContentType::Init(bool* pbInvalidateWindow)
             {
                 for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i)
                 {
-                    if ( (*i)->GetBroadCaster()->ISA(SwFmtFld)) // SwPostit
+                    if ( (*i)->GetBroadCaster()->ISA(SwFormatField)) // SwPostit
                     {
-                        const SwFmtFld* aFmtFld = static_cast<const SwFmtFld*>((*i)->GetBroadCaster());
-                        if (aFmtFld->GetTxtFld() && aFmtFld->IsFldInDoc() &&
+                        const SwFormatField* aFormatField = static_cast<const SwFormatField*>((*i)->GetBroadCaster());
+                        if (aFormatField->GetTextField() && aFormatField->IsFieldInDoc() &&
                             (*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
                         {
-                            OUString sEntry = aFmtFld->GetField()->GetPar2();
+                            OUString sEntry = aFormatField->GetField()->GetPar2();
                             sEntry = RemoveNewline(sEntry);
                             SwPostItContent* pCnt = new SwPostItContent(
                                                 this,
                                                 sEntry,
-                                                aFmtFld,
+                                                aFormatField,
                                                 nMemberCount);
                             pMember->insert(pCnt);
                             nMemberCount++;
@@ -531,18 +531,18 @@ void    SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
 
         case CONTENT_TYPE_TABLE     :
         {
-            OSL_ENSURE(nMemberCount == static_cast<sal_uInt16>(pWrtShell->GetTblFrmFmtCount(true)),
+            OSL_ENSURE(nMemberCount == static_cast<sal_uInt16>(pWrtShell->GetTableFrameFormatCount(true)),
                        "MemberCount differs");
             Point aNullPt;
-            nMemberCount = static_cast<sal_uInt16>(pWrtShell->GetTblFrmFmtCount(true));
+            nMemberCount = static_cast<sal_uInt16>(pWrtShell->GetTableFrameFormatCount(true));
             for(sal_uInt16 i = 0; i < nMemberCount; i++)
             {
-                const SwFrmFmt& rTblFmt = pWrtShell->GetTblFrmFmt(i, true);
-                const OUString sTblName( rTblFmt.GetName() );
+                const SwFrameFormat& rTableFormat = pWrtShell->GetTableFrameFormat(i, true);
+                const OUString sTableName( rTableFormat.GetName() );
 
-                SwContent* pCnt = new SwContent(this, sTblName,
-                        rTblFmt.FindLayoutRect(false, &aNullPt).Top() );
-                if( !rTblFmt.GetInfo( aAskItem ) &&
+                SwContent* pCnt = new SwContent(this, sTableName,
+                        rTableFormat.FindLayoutRect(false, &aNullPt).Top() );
+                if( !rTableFormat.GetInfo( aAskItem ) &&
                     !aAskItem.pObject )     // not visible
                     pCnt->SetInvisible();
 
@@ -569,26 +569,26 @@ void    SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
             nMemberCount = pWrtShell->GetFlyCount(eType, /*bIgnoreTextBoxes=*/true);
             for(size_t i = 0; i < nMemberCount; ++i)
             {
-                const SwFrmFmt* pFrmFmt = pWrtShell->GetFlyNum(i,eType,/*bIgnoreTextBoxes=*/true);
-                const OUString sFrmName = pFrmFmt->GetName();
+                const SwFrameFormat* pFrameFormat = pWrtShell->GetFlyNum(i,eType,/*bIgnoreTextBoxes=*/true);
+                const OUString sFrmName = pFrameFormat->GetName();
 
                 SwContent* pCnt;
                 if(CONTENT_TYPE_GRAPHIC == nContentType)
                 {
                     OUString sLink;
-                    pWrtShell->GetGrfNms( &sLink, 0, static_cast<const SwFlyFrmFmt*>( pFrmFmt));
+                    pWrtShell->GetGrfNms( &sLink, 0, static_cast<const SwFlyFrameFormat*>( pFrameFormat));
                     pCnt = new SwGraphicContent(this, sFrmName,
                                 INetURLObject::decode( sLink,
                                            INetURLObject::DECODE_UNAMBIGUOUS,
                                         RTL_TEXTENCODING_UTF8 ),
-                                pFrmFmt->FindLayoutRect(false, &aNullPt).Top());
+                                pFrameFormat->FindLayoutRect(false, &aNullPt).Top());
                 }
                 else
                 {
                     pCnt = new SwContent(this, sFrmName,
-                            pFrmFmt->FindLayoutRect(false, &aNullPt).Top() );
+                            pFrameFormat->FindLayoutRect(false, &aNullPt).Top() );
                 }
-                if( !pFrmFmt->GetInfo( aAskItem ) &&
+                if( !pFrameFormat->GetInfo( aAskItem ) &&
                     !aAskItem.pObject )     // not visible
                     pCnt->SetInvisible();
                 pMember->insert(pCnt);
@@ -618,29 +618,29 @@ void    SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
         case CONTENT_TYPE_REGION    :
         {
             const Point aNullPt;
-            nMemberCount = pWrtShell->GetSectionFmtCount();
+            nMemberCount = pWrtShell->GetSectionFormatCount();
             for(sal_uInt16 i = 0; i < nMemberCount; i++)
             {
-                const SwSectionFmt* pFmt;
+                const SwSectionFormat* pFormat;
                 SectionType eTmpType;
-                if( (pFmt = &pWrtShell->GetSectionFmt(i))->IsInNodesArr() &&
-                (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+                if( (pFormat = &pWrtShell->GetSectionFormat(i))->IsInNodesArr() &&
+                (eTmpType = pFormat->GetSection()->GetType()) != TOX_CONTENT_SECTION
                 && TOX_HEADER_SECTION != eTmpType )
                 {
-                    OUString sSectionName = pFmt->GetSection()->GetSectionName();
+                    OUString sSectionName = pFormat->GetSection()->GetSectionName();
 
                     sal_uInt8 nLevel = 0;
-                    SwSectionFmt* pParentFmt = pFmt->GetParent();
-                    while(pParentFmt)
+                    SwSectionFormat* pParentFormat = pFormat->GetParent();
+                    while(pParentFormat)
                     {
                         nLevel++;
-                        pParentFmt = pParentFmt->GetParent();
+                        pParentFormat = pParentFormat->GetParent();
                     }
 
                     SwContent* pCnt = new SwRegionContent(this, sSectionName,
                             nLevel,
-                            pFmt->FindLayoutRect( false, &aNullPt ).Top());
-                    if( !pFmt->GetInfo( aAskItem ) &&
+                            pFormat->FindLayoutRect( false, &aNullPt ).Top());
+                    if( !pFormat->GetInfo( aAskItem ) &&
                         !aAskItem.pObject )     // not visible
                         pCnt->SetInvisible();
                     pMember->insert(pCnt);
@@ -708,18 +708,18 @@ void    SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
             {
                 for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i)
                 {
-                    if ( (*i)->GetBroadCaster()->ISA(SwFmtFld)) // SwPostit
+                    if ( (*i)->GetBroadCaster()->ISA(SwFormatField)) // SwPostit
                     {
-                        const SwFmtFld* aFmtFld = static_cast<const SwFmtFld*>((*i)->GetBroadCaster());
-                        if (aFmtFld->GetTxtFld() && aFmtFld->IsFldInDoc() &&
+                        const SwFormatField* aFormatField = static_cast<const SwFormatField*>((*i)->GetBroadCaster());
+                        if (aFormatField->GetTextField() && aFormatField->IsFieldInDoc() &&
                             (*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
                         {
-                            OUString sEntry = aFmtFld->GetField()->GetPar2();
+                            OUString sEntry = aFormatField->GetField()->GetPar2();
                             sEntry = RemoveNewline(sEntry);
                             SwPostItContent* pCnt = new SwPostItContent(
                                                 this,
                                                 sEntry,
-                                                aFmtFld,
+                                                aFormatField,
                                                 nMemberCount);
                             pMember->insert(pCnt);
                             nMemberCount++;
@@ -752,8 +752,8 @@ void    SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
                         SwContact* pContact = static_cast<SwContact*>(pTemp->GetUserCall());
                         long nYPos = 0;
                         const Point aNullPt;
-                        if(pContact && pContact->GetFmt())
-                            nYPos = pContact->GetFmt()->FindLayoutRect(false, &aNullPt).Top();
+                        if(pContact && pContact->GetFormat())
+                            nYPos = pContact->GetFormat()->FindLayoutRect(false, &aNullPt).Top();
                         SwContent* pCnt = new SwContent(
                                             this,
                                             pTemp->GetName(),
@@ -784,7 +784,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId)
     , sSpace(OUString("                    "))
     , sRemoveIdx(SW_RES(ST_REMOVE_INDEX))
     , sUpdateIdx(SW_RES(ST_UPDATE))
-    , sUnprotTbl(SW_RES(ST_REMOVE_TBL_PROTECTION))
+    , sUnprotTable(SW_RES(ST_REMOVE_TBL_PROTECTION))
     , sRename(SW_RES(ST_RENAME))
     , sReadonlyIdx(SW_RES(ST_READONLY_IDX))
     , sInvisible(SW_RES(ST_INVISIBLE))
@@ -916,14 +916,14 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
             {
                 if( pActiveShell && pActiveShell->GetDoc() )
                 {
-                    const SwFlyFrmFmt* pFrmFmt = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
-                    if( pFrmFmt )
+                    const SwFlyFrameFormat* pFrameFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
+                    if( pFrameFormat )
                     {
-//                        SwNodeIndex aIdx( *(pFrmFmt->GetCntnt().GetCntntIdx()), 1 );
+//                        SwNodeIndex aIdx( *(pFrameFormat->GetContent().GetContentIdx()), 1 );
 //                        const SwGrfNode* pGrfNd = aIdx.GetNode().GetGrfNode();
 //                        if( pGrfNd )
 //                            return pGrfNd->GetAlternateText();
-                        return pFrmFmt->GetObjTitle();
+                        return pFrameFormat->GetObjTitle();
                     }
                 }
             }
@@ -932,9 +932,9 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
         case CONTENT_TYPE_FRAME     :
             {
                 //Can't find the GetAlternateText function. Need to verify again.
-                const SwFlyFrmFmt* pFlyFmt = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
-                if( pFlyFmt )
-                    return pFlyFmt->/*GetAlternateText*/GetName();
+                const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
+                if( pFlyFormat )
+                    return pFlyFormat->/*GetAlternateText*/GetName();
             }
             break;
     }
@@ -1009,9 +1009,9 @@ OUString SwContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const
         case CONTENT_TYPE_FRAME     :
             {
                 //Can't find the function "GetLongDescription". Need to verify again.
-                const SwFlyFrmFmt* pFlyFmt = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
-                if( pFlyFmt )
-                    return pFlyFmt->GetDescription();
+                const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
+                if( pFlyFormat )
+                    return pFlyFormat->GetDescription();
             }
             break;
     }
@@ -1214,10 +1214,10 @@ PopupMenu* SwContentTree::CreateContextMenu()
             {
                 bSubPop4 = true;
                 pSubPop4->InsertItem(403, aContextStrings[ST_EDIT_ENTRY - ST_CONTEXT_FIRST]);
-                pSubPop4->InsertItem(404, sUnprotTbl);
+                pSubPop4->InsertItem(404, sUnprotTable);
                 bool bFull = false;
-                OUString sTblName = static_cast<SwContent*>(pEntry->GetUserData())->GetName();
-                bool bProt = pActiveShell->HasTblAnyProtection( &sTblName, &bFull );
+                OUString sTableName = static_cast<SwContent*>(pEntry->GetUserData())->GetName();
+                bool bProt = pActiveShell->HasTableAnyProtection( &sTableName, &bFull );
                 pSubPop4->EnableItem(403, !bFull );
                 pSubPop4->EnableItem(404, bProt );
                 pSubPop4->InsertItem(501, aContextStrings[ST_DELETE_ENTRY - ST_CONTEXT_FIRST]);
@@ -1791,14 +1791,14 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
             if( pWrtShell->IsOutlineCopyable( nPos ) )
             {
                 const SwNumRule* pOutlRule = pWrtShell->GetOutlineNumRule();
-                const SwTxtNode* pTxtNd =
+                const SwTextNode* pTextNd =
                         pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNode(nPos);
-                if( pTxtNd && pOutlRule && pTxtNd->IsNumbered())
+                if( pTextNd && pOutlRule && pTextNd->IsNumbered())
                 {
                     SwNumberTree::tNumberVector aNumVector =
-                        pTxtNd->GetNumberVector();
+                        pTextNd->GetNumberVector();
                     for( sal_Int8 nLevel = 0;
-                         nLevel <= pTxtNd->GetActualListLevel();
+                         nLevel <= pTextNd->GetActualListLevel();
                          nLevel++ )
                     {
                         const SwNumberTree::tSwNumTreeNumber nVal = aNumVector[nLevel] + 1;
@@ -3346,7 +3346,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
                             *static_cast<SwURLFieldContent*>(pCnt)->GetINetAttr() ))
             {
                 pActiveShell->Right( CRSR_SKIP_CHARS, true, 1, false);
-                pActiveShell->SwCrsrShell::SelectTxtAttr( RES_TXTATR_INETFMT, true );
+                pActiveShell->SwCrsrShell::SelectTextAttr( RES_TXTATR_INETFMT, true );
             }
 
         }
@@ -3366,7 +3366,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
         case CONTENT_TYPE_POSTIT:
             pActiveShell->GetView().GetPostItMgr()->AssureStdModeAtShell();
             if (static_cast<SwPostItContent*>(pCnt)->IsPostIt())
-                pActiveShell->GotoFld(*static_cast<SwPostItContent*>(pCnt)->GetPostIt());
+                pActiveShell->GotoFormatField(*static_cast<SwPostItContent*>(pCnt)->GetPostIt());
             else
                 pActiveShell->GetView().GetDocShell()->GetWrtShell()->GotoRedline(
                         pActiveShell->GetView().GetDocShell()->GetWrtShell()->FindRedlineOfData(static_cast<SwPostItContent*>(pCnt)->GetRedline()->GetRedlineData()));
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index eba6232f3bba..e068da231e33 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1317,16 +1317,16 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen
             aFileUrl.SetSmartURL( sFileName );
             OUString sSectionName(aFileUrl.GetLastName(
                 INetURLObject::DECODE_UNAMBIGUOUS).getToken(0, sfx2::cTokenSeparator));
-            sal_uInt16 nSectCount = rSh.GetSectionFmtCount();
+            sal_uInt16 nSectCount = rSh.GetSectionFormatCount();
             OUString sTempSectionName(sSectionName);
             sal_uInt16 nAddNumber = 0;
             sal_uInt16 nCount = 0;
             // if applicable: add index if the range name is already in use.
             while ( nCount < nSectCount )
             {
-                const SwSectionFmt& rFmt = rSh.GetSectionFmt(nCount);
-                if ((rFmt.GetSection()->GetSectionName() == sTempSectionName)
-                    && rFmt.IsInNodesArr())
+                const SwSectionFormat& rFormat = rSh.GetSectionFormat(nCount);
+                if ((rFormat.GetSection()->GetSectionName() == sTempSectionName)
+                    && rFormat.IsInNodesArr())
                 {
                     nCount = 0;
                     nAddNumber++;
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index 18744550338d..cfadf1b74209 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -155,7 +155,7 @@ void _FinitUI()
 
     DELETEZ(pGlossaries);
 
-    delete SwFieldType::s_pFldNames;
+    delete SwFieldType::s_pFieldNames;
 
     ClearStringCache();
     delete pGlossaryList;
@@ -189,10 +189,10 @@ ShellResource::ShellResource()
     aCalc_Default( SW_RES( STR_CALC_DEFAULT ) ),
     aCalc_Error( SW_RES( STR_CALC_ERROR ) ),
 
-    aGetRefFld_Up( SW_RES( STR_GETREFFLD_UP ) ),
-    aGetRefFld_Down( SW_RES( STR_GETREFFLD_DOWN ) ),
+    aGetRefField_Up( SW_RES( STR_GETREFFLD_UP ) ),
+    aGetRefField_Down( SW_RES( STR_GETREFFLD_DOWN ) ),
     // #i81002#
-    aGetRefFld_RefItemNotFound( SW_RES( STR_GETREFFLD_REFITEMNOTFOUND ) ),
+    aGetRefField_RefItemNotFound( SW_RES( STR_GETREFFLD_REFITEMNOTFOUND ) ),
     aStrAllPageHeadFoot( SW_RES( STR_ALLPAGE_HEADFOOT ) ),
     aStrNone( SW_RES( STR_TEMPLATE_NONE )),
     aFixedStr( SW_RES( STR_FIELD_FIXED )),
@@ -208,7 +208,7 @@ ShellResource::ShellResource()
     aTOXCitationName(    SW_RES(STR_TOX_CITATION)),
     aLinkCtrlClick(SW_RESSTR(STR_LINK_CTRL_CLICK)),
     aLinkClick(SW_RESSTR(STR_LINK_CLICK)),
-    pAutoFmtNameLst(0),
+    pAutoFormatNameLst(0),
     sPageDescFirstName(     SW_RES(STR_PAGEDESC_FIRSTNAME)),
     sPageDescFollowName(    SW_RES(STR_PAGEDESC_FOLLOWNAME)),
     sPageDescName(          SW_RES(STR_PAGEDESC_NAME))
@@ -230,7 +230,7 @@ ShellResource::ShellResource()
 
 ShellResource::~ShellResource()
 {
-    delete pAutoFmtNameLst;
+    delete pAutoFormatNameLst;
 }
 
 OUString ShellResource::GetPageDescName(sal_uInt16 nNo, PageNameMode eMode)
@@ -273,20 +273,20 @@ SwGlossaryList* GetGlossaryList()
     return pGlossaryList;
 }
 
-struct ImpAutoFmtNameListLoader : public Resource
+struct ImpAutoFormatNameListLoader : public Resource
 {
-    ImpAutoFmtNameListLoader( std::vector<OUString>& rLst );
+    ImpAutoFormatNameListLoader( std::vector<OUString>& rLst );
 };
 
-void ShellResource::_GetAutoFmtNameLst() const
+void ShellResource::_GetAutoFormatNameLst() const
 {
-    assert(!pAutoFmtNameLst);
-    pAutoFmtNameLst = new std::vector<OUString>;
-    pAutoFmtNameLst->reserve(STR_AUTOFMTREDL_END);
-    ImpAutoFmtNameListLoader aTmp(*pAutoFmtNameLst);
+    assert(!pAutoFormatNameLst);
+    pAutoFormatNameLst = new std::vector<OUString>;
+    pAutoFormatNameLst->reserve(STR_AUTOFMTREDL_END);
+    ImpAutoFormatNameListLoader aTmp(*pAutoFormatNameLst);
 }
 
-ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( std::vector<OUString>& rLst )
+ImpAutoFormatNameListLoader::ImpAutoFormatNameListLoader( std::vector<OUString>& rLst )
     : Resource( ResId(RID_SHELLRES_AUTOFMTSTRS, *pSwResMgr) )
 {
     for( sal_uInt16 n = 0; n < STR_AUTOFMTREDL_END; ++n )
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 85c9c835d1d8..25e7277c8844 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -250,7 +250,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
                 if (rSh.EndPg())
                     nFuncId = FN_END_OF_PAGE;
             }
-            else if (rSh.GotoFooterTxt())
+            else if (rSh.GotoFooterText())
                 nFuncId = FN_TO_FOOTER;
             bFocusToDoc = true;
         }
@@ -264,7 +264,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
                 if (rSh.SttPg())
                     nFuncId = FN_START_OF_PAGE;
             }
-            else if (rSh.GotoHeaderTxt())
+            else if (rSh.GotoHeaderText())
                 nFuncId = FN_TO_HEADER;
             bFocusToDoc = true;
         }
@@ -276,7 +276,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
                 // Jump from the footnote to the anchor.
             if (eFrmType & FrmTypeFlags::FOOTNOTE)
             {
-                if (rSh.GotoFtnAnchor())
+                if (rSh.GotoFootnoteAnchor())
                     nFuncId = FN_FOOTNOTE_TO_ANCHOR;
             }
                 // Otherwise, jump to the first footnote text;
@@ -284,11 +284,11 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox, void )
                 // if this is also not possible got to the footnote before.
             else
             {
-                if (rSh.GotoFtnTxt())
+                if (rSh.GotoFootnoteText())
                     nFuncId = FN_FOOTNOTE_TO_ANCHOR;
-                else if (rSh.GotoNextFtnAnchor())
+                else if (rSh.GotoNextFootnoteAnchor())
                     nFuncId = FN_NEXT_FOOTNOTE;
-                else if (rSh.GotoPrevFtnAnchor())
+                else if (rSh.GotoPrevFootnoteAnchor())
                     nFuncId = FN_PREV_FOOTNOTE;
             }
             bFocusToDoc = true;
@@ -1103,27 +1103,27 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
 OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
 {
     OUString sFileName;
-    SotClipboardFormatId nFmt;
-    if( rData.HasFormat( nFmt = SotClipboardFormatId::FILE_LIST ))
+    SotClipboardFormatId nFormat;
+    if( rData.HasFormat( nFormat = SotClipboardFormatId::FILE_LIST ))
     {
         FileList aFileList;
-        rData.GetFileList( nFmt, aFileList );
+        rData.GetFileList( nFormat, aFileList );
         sFileName = aFileList.GetFile( 0 );
     }
-    else if( rData.HasFormat( nFmt = SotClipboardFormatId::STRING ) ||
-              rData.HasFormat( nFmt = SotClipboardFormatId::SIMPLE_FILE ) ||
-             rData.HasFormat( nFmt = SotClipboardFormatId::FILENAME ))
+    else if( rData.HasFormat( nFormat = SotClipboardFormatId::STRING ) ||
+              rData.HasFormat( nFormat = SotClipboardFormatId::SIMPLE_FILE ) ||
+             rData.HasFormat( nFormat = SotClipboardFormatId::FILENAME ))
     {
-        (void)rData.GetString(nFmt, sFileName);
+        (void)rData.GetString(nFormat, sFileName);
     }
-    else if( rData.HasFormat( nFmt = SotClipboardFormatId::SOLK ) ||
-                rData.HasFormat( nFmt = SotClipboardFormatId::NETSCAPE_BOOKMARK )||
-                rData.HasFormat( nFmt = SotClipboardFormatId::FILECONTENT ) ||
-                rData.HasFormat( nFmt = SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
-                rData.HasFormat( nFmt = SotClipboardFormatId::UNIFORMRESOURCELOCATOR ))
+    else if( rData.HasFormat( nFormat = SotClipboardFormatId::SOLK ) ||
+                rData.HasFormat( nFormat = SotClipboardFormatId::NETSCAPE_BOOKMARK )||
+                rData.HasFormat( nFormat = SotClipboardFormatId::FILECONTENT ) ||
+                rData.HasFormat( nFormat = SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
+                rData.HasFormat( nFormat = SotClipboardFormatId::UNIFORMRESOURCELOCATOR ))
     {
         INetBookmark aBkmk( aEmptyOUStr, aEmptyOUStr );
-        if (rData.GetINetBookmark(nFmt, aBkmk))
+        if (rData.GetINetBookmark(nFormat, aBkmk))
             sFileName = aBkmk.GetURL();
     }
     if( !sFileName.isEmpty() )
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index a12a7ceb6e77..c5d3b8baa2c7 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -88,7 +88,7 @@ VCL_BUILDER_DECL_FACTORY(NumFormatListBox)
     rRet = pListBox;
 }
 
-void NumFormatListBox::Init(short nFormatType, bool bUsrFmts)
+void NumFormatListBox::Init(short nFormatType, bool bUsrFormats)
 {
     SwView *pView = GetView();
 
@@ -97,7 +97,7 @@ void NumFormatListBox::Init(short nFormatType, bool bUsrFmts)
     else
         eCurLanguage = SvtSysLocale().GetLanguageTag().getLanguageType();
 
-    if (!bUsrFmts)
+    if (!bUsrFormats)
     {
         pOwnFormatter = new SvNumberFormatter(comphelper::getProcessComponentContext(), eCurLanguage);
     }
@@ -212,41 +212,41 @@ void NumFormatListBox::SetFormatType(const short nFormatType)
             break;
         }
 
-        const SvNumberformat* pFmt;
+        const SvNumberformat* pFormat;
         sal_Int32 i = 0;
         sal_uLong  nFormat;
         Color* pCol;
         double fVal = GetDefValue( nFormatType );
         OUString sValue;
 
-        sal_uLong nSysNumFmt = pFormatter->GetFormatIndex(
+        sal_uLong nSysNumFormat = pFormatter->GetFormatIndex(
                                         NF_NUMBER_SYSTEM, eCurLanguage );
-        sal_uLong nSysShortDateFmt = pFormatter->GetFormatIndex(
+        sal_uLong nSysShortDateFormat = pFormatter->GetFormatIndex(
                                         NF_DATE_SYSTEM_SHORT, eCurLanguage );
-        sal_uLong nSysLongDateFmt = pFormatter->GetFormatIndex(
+        sal_uLong nSysLongDateFormat = pFormatter->GetFormatIndex(
                                         NF_DATE_SYSTEM_LONG, eCurLanguage );
 
         for( long nIndex = eOffsetStart; nIndex <= eOffsetEnd; ++nIndex )
         {
             nFormat = pFormatter->GetFormatIndex(
                             (NfIndexTableOffset)nIndex, eCurLanguage );
-            pFmt = pFormatter->GetEntry( nFormat );
+            pFormat = pFormatter->GetEntry( nFormat );
 
             if( nFormat == pFormatter->GetFormatIndex( NF_NUMBER_STANDARD,
                                                         eCurLanguage )
-                || const_cast<SvNumberformat*>(pFmt)->GetOutputString( fVal, sValue, &pCol )
+                || const_cast<SvNumberformat*>(pFormat)->GetOutputString( fVal, sValue, &pCol )
                 || nFormatType == css::util::NumberFormat::UNDEFINED )
             {
-                sValue = pFmt->GetFormatstring();
+                sValue = pFormat->GetFormatstring();
             }
             else if( nFormatType == css::util::NumberFormat::TEXT )
             {
                 pFormatter->GetOutputString( "\"ABC\"", nFormat, sValue, &pCol);
             }
 
-            if (nFormat != nSysNumFmt       &&
-                nFormat != nSysShortDateFmt &&
-                nFormat != nSysLongDateFmt)
+            if (nFormat != nSysNumFormat       &&
+                nFormat != nSysShortDateFormat &&
+                nFormat != nSysLongDateFormat)
             {
                 const sal_Int32 nPos = InsertEntry( sValue );
                 SetEntryData( nPos, reinterpret_cast<void*>(nFormat) );
@@ -326,20 +326,20 @@ void NumFormatListBox::SetDefFormat(const sal_uLong nDefaultFormat)
     while (reinterpret_cast<sal_uLong>(GetEntryData(nPos)) == ULONG_MAX)
         nPos++;
 
-    sal_uLong nSysNumFmt = pFormatter->GetFormatIndex( NF_NUMBER_SYSTEM, eCurLanguage);
-    sal_uLong nSysShortDateFmt = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eCurLanguage);
-    sal_uLong nSysLongDateFmt = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eCurLanguage);
+    sal_uLong nSysNumFormat = pFormatter->GetFormatIndex( NF_NUMBER_SYSTEM, eCurLanguage);
+    sal_uLong nSysShortDateFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eCurLanguage);
+    sal_uLong nSysLongDateFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eCurLanguage);
     bool bSysLang = false;
     if( eCurLanguage == GetAppLanguage() )
         bSysLang = true;
-    sal_uLong nNumFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysNumFmt, LANGUAGE_SYSTEM );
-    sal_uLong nShortDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysShortDateFmt, LANGUAGE_SYSTEM );
-    sal_uLong nLongDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysLongDateFmt, LANGUAGE_SYSTEM );
+    sal_uLong nNumFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysNumFormat, LANGUAGE_SYSTEM );
+    sal_uLong nShortDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysShortDateFormat, LANGUAGE_SYSTEM );
+    sal_uLong nLongDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysLongDateFormat, LANGUAGE_SYSTEM );
 
     if (
-         nDefaultFormat == nSysNumFmt ||
-         nDefaultFormat == nSysShortDateFmt ||
-         nDefaultFormat == nSysLongDateFmt ||
+         nDefaultFormat == nSysNumFormat ||
+         nDefaultFormat == nSysShortDateFormat ||
+         nDefaultFormat == nSysLongDateFormat ||
          (
            bSysLang &&
            (
@@ -427,9 +427,9 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox )
             {
                 sal_uInt32 nNumberFormat = static_cast<const SfxUInt32Item*>(pItem)->GetValue();
                 // oj #105473# change order of calls
-                const SvNumberformat* pFmt = pFormatter->GetEntry(nNumberFormat);
-                if( pFmt )
-                    eCurLanguage = pFmt->GetLanguage();
+                const SvNumberformat* pFormat = pFormatter->GetEntry(nNumberFormat);
+                if( pFormat )
+                    eCurLanguage = pFormat->GetLanguage();
                 // SetDefFormat uses eCurLanguage to look for if this format already in the list
                 SetDefFormat(nNumberFormat);
             }
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index 087dd8a13b85..16823c94e688 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -32,34 +32,34 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-SwPageFtnInfoItem::SwPageFtnInfoItem( const sal_uInt16 nId, SwPageFtnInfo& rInfo) :
+SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( const sal_uInt16 nId, SwPageFootnoteInfo& rInfo) :
     SfxPoolItem( nId ),
-    aFtnInfo(rInfo)
+    aFootnoteInfo(rInfo)
 {
 }
 
-SwPageFtnInfoItem::SwPageFtnInfoItem( const SwPageFtnInfoItem& rItem ) :
+SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( const SwPageFootnoteInfoItem& rItem ) :
     SfxPoolItem( rItem ),
-    aFtnInfo(rItem.GetPageFtnInfo())
+    aFootnoteInfo(rItem.GetPageFootnoteInfo())
 {
 }
 
- SwPageFtnInfoItem::~SwPageFtnInfoItem()
+ SwPageFootnoteInfoItem::~SwPageFootnoteInfoItem()
 {
 }
 
-SfxPoolItem*  SwPageFtnInfoItem::Clone( SfxItemPool * /*pPool*/ ) const
+SfxPoolItem*  SwPageFootnoteInfoItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
-    return new SwPageFtnInfoItem( *this );
+    return new SwPageFootnoteInfoItem( *this );
 }
 
-bool SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const
+bool SwPageFootnoteInfoItem::operator==( const SfxPoolItem& rAttr ) const
 {
     OSL_ENSURE( Which() == rAttr.Which(), "no equal attributes" );
-    return ( aFtnInfo == static_cast<const SwPageFtnInfoItem&>(rAttr).GetPageFtnInfo());
+    return ( aFootnoteInfo == static_cast<const SwPageFootnoteInfoItem&>(rAttr).GetPageFootnoteInfo());
 }
 
-bool  SwPageFtnInfoItem::GetPresentation
+bool  SwPageFootnoteInfoItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          eCoreUnit,
@@ -68,7 +68,7 @@ bool  SwPageFtnInfoItem::GetPresentation
     const IntlWrapper*  pIntl
 )   const
 {
-    const SwTwips nHght = GetPageFtnInfo().GetHeight();
+    const SwTwips nHght = GetPageFootnoteInfo().GetHeight();
     if ( nHght )
     {
         rText = SW_RESSTR( STR_MAX_FTN_HEIGHT ) + " " +
@@ -78,27 +78,27 @@ bool  SwPageFtnInfoItem::GetPresentation
     return true;
 }
 
-bool SwPageFtnInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
+bool SwPageFootnoteInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
 {
     bool bRet = true;
     switch(nMemberId & ~CONVERT_TWIPS)
     {
-        case MID_FTN_HEIGHT        :     rVal <<= (sal_Int32)convertTwipToMm100(aFtnInfo.GetHeight());break;
-        case MID_LINE_WEIGHT       :     rVal <<= (sal_Int16)convertTwipToMm100(aFtnInfo.GetLineWidth());break;
-        case MID_LINE_COLOR        :     rVal <<= (sal_Int32)aFtnInfo.GetLineColor().GetColor();break;
+        case MID_FTN_HEIGHT        :     rVal <<= (sal_Int32)convertTwipToMm100(aFootnoteInfo.GetHeight());break;
+        case MID_LINE_WEIGHT       :     rVal <<= (sal_Int16)convertTwipToMm100(aFootnoteInfo.GetLineWidth());break;
+        case MID_LINE_COLOR        :     rVal <<= (sal_Int32)aFootnoteInfo.GetLineColor().GetColor();break;
         case MID_LINE_RELWIDTH     :
         {
             Fraction aTmp( 100, 1 );
-            aTmp *= aFtnInfo.GetWidth();
+            aTmp *= aFootnoteInfo.GetWidth();
             rVal <<= (sal_Int8)(long)aTmp;
         }
         break;
-        case MID_LINE_ADJUST       :     rVal <<= (sal_Int16)aFtnInfo.GetAdj();break;//text::HorizontalAdjust
-        case MID_LINE_TEXT_DIST    :     rVal <<= (sal_Int32)convertTwipToMm100(aFtnInfo.GetTopDist());break;
-        case MID_LINE_FOOTNOTE_DIST:     rVal <<= (sal_Int32)convertTwipToMm100(aFtnInfo.GetBottomDist());break;
+        case MID_LINE_ADJUST       :     rVal <<= (sal_Int16)aFootnoteInfo.GetAdj();break;//text::HorizontalAdjust
+        case MID_LINE_TEXT_DIST    :     rVal <<= (sal_Int32)convertTwipToMm100(aFootnoteInfo.GetTopDist());break;
+        case MID_LINE_FOOTNOTE_DIST:     rVal <<= (sal_Int32)convertTwipToMm100(aFootnoteInfo.GetBottomDist());break;
         case MID_FTN_LINE_STYLE    :
         {
-            switch ( aFtnInfo.GetLineStyle( ) )
+            switch ( aFootnoteInfo.GetLineStyle( ) )
             {
                 default:
                 case table::BorderLineStyle::NONE : rVal <<= sal_Int8(0); break;
@@ -114,7 +114,7 @@ bool SwPageFtnInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
+bool SwPageFootnoteInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
 {
     sal_Int32 nSet32 = 0;
     bool bRet = true;
@@ -122,7 +122,7 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
     {
         case MID_LINE_COLOR        :
             rVal >>= nSet32;
-            aFtnInfo.SetLineColor(nSet32);
+            aFootnoteInfo.SetLineColor(nSet32);
         break;
         case MID_FTN_HEIGHT:
         case MID_LINE_TEXT_DIST    :
@@ -135,9 +135,9 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
                     nSet32 = convertMm100ToTwip(nSet32);
                     switch(nMemberId & ~CONVERT_TWIPS)
                     {
-                        case MID_FTN_HEIGHT:            aFtnInfo.SetHeight(nSet32);    break;
-                        case MID_LINE_TEXT_DIST:        aFtnInfo.SetTopDist(nSet32);break;
-                        case MID_LINE_FOOTNOTE_DIST:    aFtnInfo.SetBottomDist(nSet32);break;
+                        case MID_FTN_HEIGHT:            aFootnoteInfo.SetHeight(nSet32);    break;
+                        case MID_LINE_TEXT_DIST:        aFootnoteInfo.SetTopDist(nSet32);break;
+                        case MID_LINE_FOOTNOTE_DIST:    aFootnoteInfo.SetBottomDist(nSet32);break;
                     }
                 }
         break;
@@ -146,7 +146,7 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
             sal_Int16 nSet = 0;
             rVal >>= nSet;
             if(nSet >= 0)
-                aFtnInfo.SetLineWidth(convertMm100ToTwip(nSet));
+                aFootnoteInfo.SetLineWidth(convertMm100ToTwip(nSet));
             else
                 bRet = false;
         }
@@ -158,7 +158,7 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
             if(nSet < 0)
                 bRet = false;
             else
-                aFtnInfo.SetWidth(Fraction(nSet, 100));
+                aFootnoteInfo.SetWidth(Fraction(nSet, 100));
         }
         break;
         case MID_LINE_ADJUST       :
@@ -166,7 +166,7 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
             sal_Int16 nSet = 0;
             rVal >>= nSet;
             if(nSet >= 0 && nSet < 3) //text::HorizontalAdjust
-                aFtnInfo.SetAdj((SwFtnAdj)nSet);
+                aFootnoteInfo.SetAdj((SwFootnoteAdj)nSet);
             else
                 bRet = false;
         }
@@ -183,7 +183,7 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
                 case 3: eStyle = table::BorderLineStyle::DASHED; break;
                 default: break;
             }
-            aFtnInfo.SetLineStyle( eStyle );
+            aFootnoteInfo.SetLineStyle( eStyle );
         }
         break;
         default:
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index d7b30ac76096..d793a99775cf 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -232,20 +232,20 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const SfxItemSet& rOrigSet, const sa
 
 // Fill header footer
 
-void FillHdFt(SwFrmFmt* pFmt, const  SfxItemSet& rSet)
+void FillHdFt(SwFrameFormat* pFormat, const  SfxItemSet& rSet)
 {
-    SwAttrSet aSet(pFmt->GetAttrSet());
+    SwAttrSet aSet(pFormat->GetAttrSet());
     aSet.Put(rSet);
 
     const SvxSizeItem& rSize = static_cast<const SvxSizeItem&>(rSet.Get(SID_ATTR_PAGE_SIZE));
     const SfxBoolItem& rDynamic = static_cast<const SfxBoolItem&>(rSet.Get(SID_ATTR_PAGE_DYNAMIC));
 
     // Convert size
-    SwFmtFrmSize aFrmSize(rDynamic.GetValue() ? ATT_MIN_SIZE : ATT_FIX_SIZE,
+    SwFormatFrmSize aFrmSize(rDynamic.GetValue() ? ATT_MIN_SIZE : ATT_FIX_SIZE,
                             rSize.GetSize().Width(),
                             rSize.GetSize().Height());
     aSet.Put(aFrmSize);
-    pFmt->SetFmtAttr(aSet);
+    pFormat->SetFormatAttr(aSet);
 }
 
 /// Convert from UseOnPage to SvxPageUsage.
@@ -282,11 +282,11 @@ UseOnPage lcl_convertUseFromSvx(UseOnPage nUse)
 
 void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
 {
-    SwFrmFmt& rMaster = rPageDesc.GetMaster();
+    SwFrameFormat& rMaster = rPageDesc.GetMaster();
     int nFirstShare = -1;
 
     // Transfer all general frame attributes
-    rMaster.SetFmtAttr(rSet);
+    rMaster.SetFormatAttr(rSet);
 
     // PageData
     if(rSet.GetItemState(SID_ATTR_PAGE) == SfxItemState::SET)
@@ -305,9 +305,9 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
     if(rSet.GetItemState(SID_ATTR_PAGE_SIZE) == SfxItemState::SET)
     {
         const SvxSizeItem& rSizeItem = static_cast<const SvxSizeItem&>(rSet.Get(SID_ATTR_PAGE_SIZE));
-        SwFmtFrmSize aSize(ATT_FIX_SIZE);
+        SwFormatFrmSize aSize(ATT_FIX_SIZE);
         aSize.SetSize(rSizeItem.GetSize());
-        rMaster.SetFmtAttr(aSize);
+        rMaster.SetFormatAttr(aSize);
     }
     // Evaluate header attributes
     const SfxPoolItem* pItem;
@@ -321,14 +321,14 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
         {
             // Take over values
             if(!rMaster.GetHeader().IsActive())
-                rMaster.SetFmtAttr(SwFmtHeader(true));
+                rMaster.SetFormatAttr(SwFormatHeader(true));
 
             // Pick out everything and adapt the header format
-            SwFmtHeader aHeaderFmt(rMaster.GetHeader());
-            SwFrmFmt *pHeaderFmt = aHeaderFmt.GetHeaderFmt();
-            OSL_ENSURE(pHeaderFmt != 0, "no header format");
+            SwFormatHeader aHeaderFormat(rMaster.GetHeader());
+            SwFrameFormat *pHeaderFormat = aHeaderFormat.GetHeaderFormat();
+            OSL_ENSURE(pHeaderFormat != 0, "no header format");
 
-            ::FillHdFt(pHeaderFmt, rHeaderSet);
+            ::FillHdFt(pHeaderFormat, rHeaderSet);
 
             rPageDesc.ChgHeaderShare(static_cast<const SfxBoolItem&>(
                         rHeaderSet.Get(SID_ATTR_PAGE_SHARED)).GetValue());
@@ -344,7 +344,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
             // Disable header
             if(rMaster.GetHeader().IsActive())
             {
-                rMaster.SetFmtAttr(SwFmtHeader(false));
+                rMaster.SetFormatAttr(SwFormatHeader(false));
                 rPageDesc.ChgHeaderShare(false);
             }
         }
@@ -361,14 +361,14 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
         {
             // Take over values
             if(!rMaster.GetFooter().IsActive())
-                rMaster.SetFmtAttr(SwFmtFooter(true));
+                rMaster.SetFormatAttr(SwFormatFooter(true));
 
             // Pick out everything and adapt the footer format
-            SwFmtFooter aFooterFmt(rMaster.GetFooter());
-            SwFrmFmt *pFooterFmt = aFooterFmt.GetFooterFmt();
-            OSL_ENSURE(pFooterFmt != 0, "no footer format");
+            SwFormatFooter aFooterFormat(rMaster.GetFooter());
+            SwFrameFormat *pFooterFormat = aFooterFormat.GetFooterFormat();
+            OSL_ENSURE(pFooterFormat != 0, "no footer format");
 
-            ::FillHdFt(pFooterFmt, rFooterSet);
+            ::FillHdFt(pFooterFormat, rFooterSet);
 
             rPageDesc.ChgFooterShare(static_cast<const SfxBoolItem&>(
                         rFooterSet.Get(SID_ATTR_PAGE_SHARED)).GetValue());
@@ -384,7 +384,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
             // Disable footer
             if(rMaster.GetFooter().IsActive())
             {
-                rMaster.SetFmtAttr(SwFmtFooter(false));
+                rMaster.SetFormatAttr(SwFormatFooter(false));
                 rPageDesc.ChgFooterShare(false);
             }
         }
@@ -394,7 +394,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
 
     if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_FTN_INFO,
             false, &pItem ) )
-        rPageDesc.SetFtnInfo( static_cast<const SwPageFtnInfoItem*>(pItem)->GetPageFtnInfo() );
+        rPageDesc.SetFootnoteInfo( static_cast<const SwPageFootnoteInfoItem*>(pItem)->GetPageFootnoteInfo() );
 
     // Columns
 
@@ -405,33 +405,33 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
     {
         bool bSet = static_cast<const SfxBoolItem*>(pItem)->GetValue();
         if(!bSet)
-            rPageDesc.SetRegisterFmtColl(0);
+            rPageDesc.SetRegisterFormatColl(0);
         else if(SfxItemState::SET == rSet.GetItemState(
                                 SID_SWREGISTER_COLLECTION, false, &pItem))
         {
             const OUString& rColl = static_cast<const SfxStringItem*>(pItem)->GetValue();
             SwDoc& rDoc = *rMaster.GetDoc();
-            SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName( rColl );
+            SwTextFormatColl* pColl = rDoc.FindTextFormatCollByName( rColl );
             if( !pColl )
             {
                 const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(
                     rColl, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
                 if( USHRT_MAX != nId )
-                    pColl = rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( nId );
+                    pColl = rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( nId );
                 else
-                    pColl = rDoc.MakeTxtFmtColl( rColl,
-                                rDoc.GetDfltTxtFmtColl() );
+                    pColl = rDoc.MakeTextFormatColl( rColl,
+                                rDoc.GetDfltTextFormatColl() );
             }
             if( pColl )
-                pColl->SetFmtAttr( SwRegisterItem ( true ));
-            rPageDesc.SetRegisterFmtColl( pColl );
+                pColl->SetFormatAttr( SwRegisterItem ( true ));
+            rPageDesc.SetRegisterFormatColl( pColl );
         }
     }
 }
 
 void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
 {
-    const SwFrmFmt& rMaster = rPageDesc.GetMaster();
+    const SwFrameFormat& rMaster = rPageDesc.GetMaster();
 
     // Page data
     SvxPageItem aPageItem(SID_ATTR_PAGE);
@@ -477,9 +477,9 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
     // Header
     if(rMaster.GetHeader().IsActive())
     {
-        const SwFmtHeader &rHeaderFmt = rMaster.GetHeader();
-        const SwFrmFmt *pHeaderFmt = rHeaderFmt.GetHeaderFmt();
-        OSL_ENSURE(pHeaderFmt != 0, "no header format");
+        const SwFormatHeader &rHeaderFormat = rMaster.GetHeader();
+        const SwFrameFormat *pHeaderFormat = rHeaderFormat.GetHeaderFormat();
+        OSL_ENSURE(pHeaderFormat != 0, "no header format");
 
         // HeaderInfo, margins, background, border
         SfxItemSet aHeaderSet(*rSet.GetPool(),
@@ -495,13 +495,13 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
             0, 0);
 
         //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
-        aHeaderSet.SetParent(&rMaster.GetDoc()->GetDfltFrmFmt()->GetAttrSet());
+        aHeaderSet.SetParent(&rMaster.GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
         // Dynamic or fixed height
         SfxBoolItem aOn(SID_ATTR_PAGE_ON, true);
         aHeaderSet.Put(aOn);
 
-        const SwFmtFrmSize &rFrmSize = pHeaderFmt->GetFrmSize();
+        const SwFormatFrmSize &rFrmSize = pHeaderFormat->GetFrmSize();
         const SwFrmSize eSizeType = rFrmSize.GetHeightSizeType();
         SfxBoolItem aDynamic(SID_ATTR_PAGE_DYNAMIC, eSizeType != ATT_FIX_SIZE);
         aHeaderSet.Put(aDynamic);
@@ -517,7 +517,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
         aHeaderSet.Put(aSize);
 
         // Shifting frame attributes
-        aHeaderSet.Put(pHeaderFmt->GetAttrSet());
+        aHeaderSet.Put(pHeaderFormat->GetAttrSet());
         aHeaderSet.Put( aBoxInfo );
 
         // Create SetItem
@@ -528,9 +528,9 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
     // Footer
     if(rMaster.GetFooter().IsActive())
     {
-        const SwFmtFooter &rFooterFmt = rMaster.GetFooter();
-        const SwFrmFmt *pFooterFmt = rFooterFmt.GetFooterFmt();
-        OSL_ENSURE(pFooterFmt != 0, "no footer format");
+        const SwFormatFooter &rFooterFormat = rMaster.GetFooter();
+        const SwFrameFormat *pFooterFormat = rFooterFormat.GetFooterFormat();
+        OSL_ENSURE(pFooterFormat != 0, "no footer format");
 
         // FooterInfo, margins, background, border
         SfxItemSet aFooterSet(*rSet.GetPool(),
@@ -546,13 +546,13 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
             0, 0);
 
         //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
-        aFooterSet.SetParent(&rMaster.GetDoc()->GetDfltFrmFmt()->GetAttrSet());
+        aFooterSet.SetParent(&rMaster.GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
         // Dynamic or fixed height
         SfxBoolItem aOn(SID_ATTR_PAGE_ON, true);
         aFooterSet.Put(aOn);
 
-        const SwFmtFrmSize &rFrmSize = pFooterFmt->GetFrmSize();
+        const SwFormatFrmSize &rFrmSize = pFooterFormat->GetFrmSize();
         const SwFrmSize eSizeType = rFrmSize.GetHeightSizeType();
         SfxBoolItem aDynamic(SID_ATTR_PAGE_DYNAMIC, eSizeType != ATT_FIX_SIZE);
         aFooterSet.Put(aDynamic);
@@ -568,7 +568,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
         aFooterSet.Put(aSize);
 
         // Shifting Frame attributes
-        aFooterSet.Put(pFooterFmt->GetAttrSet());
+        aFooterSet.Put(pFooterFormat->GetAttrSet());
         aFooterSet.Put( aBoxInfo );
 
         // Create SetItem
@@ -577,12 +577,12 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
     }
 
     // Integrate footnotes
-    SwPageFtnInfo& rInfo = (SwPageFtnInfo&)rPageDesc.GetFtnInfo();
-    SwPageFtnInfoItem aFtnItem(FN_PARAM_FTN_INFO, rInfo);
-    rSet.Put(aFtnItem);
+    SwPageFootnoteInfo& rInfo = (SwPageFootnoteInfo&)rPageDesc.GetFootnoteInfo();
+    SwPageFootnoteInfoItem aFootnoteItem(FN_PARAM_FTN_INFO, rInfo);
+    rSet.Put(aFootnoteItem);
 
     // Register compliant
-    const SwTxtFmtColl* pCol = rPageDesc.GetRegisterFmtColl();
+    const SwTextFormatColl* pCol = rPageDesc.GetRegisterFormatColl();
     SwRegisterItem aReg(pCol != 0);
     aReg.SetWhich(SID_SWREGISTER_MODE);
     rSet.Put(aReg);
@@ -614,7 +614,7 @@ SwTwips GetTabDist(const SvxTabStopItem& rTabs)
 void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem;
-    SwFmtPageDesc aPgDesc;
+    SwFormatPageDesc aPgDesc;
 
     bool bChanged = false;
     // Page number
@@ -644,9 +644,9 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet )
         rShell.GetCurAttr( aCoreSet );
         if(SfxItemState::SET == aCoreSet.GetItemState( RES_PAGEDESC, true, &pItem ) )
         {
-            if( static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc() )
+            if( static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc() )
             {
-                aPgDesc.RegisterToPageDesc( *const_cast<SwFmtPageDesc*>(static_cast<const SwFmtPageDesc*>(pItem))->GetPageDesc() );
+                aPgDesc.RegisterToPageDesc( *const_cast<SwFormatPageDesc*>(static_cast<const SwFormatPageDesc*>(pItem))->GetPageDesc() );
             }
         }
     }
@@ -666,10 +666,10 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet )
     {
     case SfxItemState::SET:
         {
-            if( static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc() )
+            if( static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc() )
             {
-                aName = static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc()->GetName();
-                oNumOffset = static_cast<const SwFmtPageDesc*>(pItem)->GetNumOffset();
+                aName = static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc()->GetName();
+                oNumOffset = static_cast<const SwFormatPageDesc*>(pItem)->GetNumOffset();
             }
             rCoreSet.ClearItem( RES_PAGEDESC );
             // Page number
@@ -742,13 +742,13 @@ void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bo
         pBase = pPool->Next();
     }
     // non-pool styles
-    const SwCharFmts* pFmts = pDoc->GetCharFmts();
-    for(size_t i = 0; i < pFmts->size(); ++i)
+    const SwCharFormats* pFormats = pDoc->GetCharFormats();
+    for(size_t i = 0; i < pFormats->size(); ++i)
     {
-        const SwCharFmt* pFmt = (*pFmts)[i];
-        if(pFmt->IsDefault())
+        const SwCharFormat* pFormat = (*pFormats)[i];
+        if(pFormat->IsDefault())
             continue;
-        const OUString& rName = pFmt->GetName();
+        const OUString& rName = pFormat->GetName();
         if(rToFill.GetEntryPos(rName) == LISTBOX_ENTRY_NOTFOUND)
         {
             const sal_Int32 nPos = bSorted
@@ -760,12 +760,12 @@ void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bo
     }
 };
 
-SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent,
+SwTwips GetTableWidth( SwFrameFormat* pFormat, SwTabCols& rCols, sal_uInt16 *pPercent,
             SwWrtShell* pSh )
 {
     // To get the width is slightly more complicated.
     SwTwips nWidth = 0;
-    const sal_Int16 eOri = pFmt->GetHoriOrient().GetHoriOrient();
+    const sal_Int16 eOri = pFormat->GetHoriOrient().GetHoriOrient();
     switch(eOri)
     {
         case text::HoriOrientation::FULL: nWidth = rCols.GetRight(); break;
@@ -773,13 +773,13 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent,
         case text::HoriOrientation::LEFT:
         case text::HoriOrientation::RIGHT:
         case text::HoriOrientation::CENTER:
-            nWidth = pFmt->GetFrmSize().GetWidth();
+            nWidth = pFormat->GetFrmSize().GetWidth();
         break;
         default:
         {
             if(pSh)
             {
-                if ( 0 == pSh->GetFlyFrmFmt() )
+                if ( 0 == pSh->GetFlyFrameFormat() )
                 {
                     nWidth = pSh->GetAnyCurRect(RECT_PAGE_PRT).Width();
                 }
@@ -792,12 +792,12 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent,
             {
                 OSL_FAIL("where to get the actual width from?");
             }
-            const SvxLRSpaceItem& rLRSpace = pFmt->GetLRSpace();
+            const SvxLRSpaceItem& rLRSpace = pFormat->GetLRSpace();
             nWidth -= (rLRSpace.GetRight() + rLRSpace.GetLeft());
         }
     }
     if (pPercent)
-        *pPercent = pFmt->GetFrmSize().GetWidthPercent();
+        *pPercent = pFormat->GetFrmSize().GetWidthPercent();
     return nWidth;
 }
 
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 1a4e702ec1a8..66736a832595 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -102,12 +102,12 @@ void SwWebView::SelectShell()
 #if HAVE_FEATURE_DESKTOP
     // Decision whether UpdateTable must be called
     bool bUpdateTable = false;
-    const SwFrmFmt* pCurTableFmt = GetWrtShell().GetTableFmt();
-    if(pCurTableFmt && pCurTableFmt != GetLastTblFrmFmt())
+    const SwFrameFormat* pCurTableFormat = GetWrtShell().GetTableFormat();
+    if(pCurTableFormat && pCurTableFormat != GetLastTableFrameFormat())
     {
         bUpdateTable = true; // can only be executed later
     }
-    SetLastTblFrmFmt(pCurTableFmt);
+    SetLastTableFrameFormat(pCurTableFormat);
     //SEL_TBL and SEL_TBL_CELLS can be ored!
     int nNewSelectionType = (GetWrtShell().GetSelectionType()
                                 & ~nsSelectionType::SEL_TBL_CELLS);
diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx
index 68f2eaba05a4..c25a372b1efb 100644
--- a/sw/source/uibase/wrtsh/delete.cxx
+++ b/sw/source/uibase/wrtsh/delete.cxx
@@ -53,16 +53,16 @@ bool SwWrtShell::TryRemoveIndent()
     GetCurAttr(aAttrSet);
 
     SvxLRSpaceItem aItem = static_cast<const SvxLRSpaceItem &>(aAttrSet.Get(RES_LR_SPACE));
-    short aOldFirstLineOfst = aItem.GetTxtFirstLineOfst();
+    short aOldFirstLineOfst = aItem.GetTextFirstLineOfst();
 
     if (aOldFirstLineOfst > 0)
     {
-        aItem.SetTxtFirstLineOfst(0);
+        aItem.SetTextFirstLineOfst(0);
         bResult = true;
     }
     else if (aOldFirstLineOfst < 0)
     {
-        aItem.SetTxtFirstLineOfst(0);
+        aItem.SetTextFirstLineOfst(0);
         aItem.SetLeft(aItem.GetLeft() + aOldFirstLineOfst);
 
         bResult = true;
@@ -177,13 +177,13 @@ long SwWrtShell::DelLeft()
 
     // JP 29.06.95: never erase a table standing in front of it.
     bool bSwap = false;
-    const SwTableNode * pWasInTblNd = SwCrsrShell::IsCrsrInTbl();
+    const SwTableNode * pWasInTableNd = SwCrsrShell::IsCrsrInTable();
 
     if( SwCrsrShell::IsSttPara())
     {
         // #i4032# Don't actually call a 'delete' if we
         // changed the table cell, compare DelRight().
-        const SwStartNode * pSNdOld = pWasInTblNd ?
+        const SwStartNode * pSNdOld = pWasInTableNd ?
                                       GetSwCrsr()->GetNode().FindTableBoxStartNode() :
                                       0;
 
@@ -194,11 +194,11 @@ long SwWrtShell::DelLeft()
 
         // If the cursor entered or left a table (or both) we are done. No step
         // back.
-        const SwTableNode* pIsInTblNd = SwCrsrShell::IsCrsrInTbl();
-        if( pIsInTblNd != pWasInTblNd )
+        const SwTableNode* pIsInTableNd = SwCrsrShell::IsCrsrInTable();
+        if( pIsInTableNd != pWasInTableNd )
             return 0;
 
-        const SwStartNode* pSNdNew = pIsInTblNd ?
+        const SwStartNode* pSNdNew = pIsInTableNd ?
                                      GetSwCrsr()->GetNode().FindTableBoxStartNode() :
                                      0;
 
@@ -235,7 +235,7 @@ long SwWrtShell::DelRight()
     if(nSelection & nsSelectionType::SEL_TXT)
         nSelection = nsSelectionType::SEL_TXT;
 
-    const SwTableNode * pWasInTblNd = NULL;
+    const SwTableNode * pWasInTableNd = NULL;
 
     switch( nSelection & ~(nsSelectionType::SEL_BEZ) )
     {
@@ -271,7 +271,7 @@ long SwWrtShell::DelRight()
                 EnterStdMode();
         }
 
-        pWasInTblNd = IsCrsrInTbl();
+        pWasInTableNd = IsCrsrInTable();
 
         if( nsSelectionType::SEL_TXT & nSelection && SwCrsrShell::IsSttPara() &&
             SwCrsrShell::IsEndPara() )
@@ -282,8 +282,8 @@ long SwWrtShell::DelRight()
             bool bDelFull = false;
             if ( SwCrsrShell::Right(1,CRSR_SKIP_CHARS) )
             {
-                const SwTableNode * pCurrTblNd = IsCrsrInTbl();
-                bDelFull = pCurrTblNd && pCurrTblNd != pWasInTblNd;
+                const SwTableNode * pCurrTableNd = IsCrsrInTable();
+                bDelFull = pCurrTableNd && pCurrTableNd != pWasInTableNd;
             }
 
             // restore cursor
@@ -313,7 +313,7 @@ long SwWrtShell::DelRight()
 
                 if ( SwCrsrShell::Right(1, CRSR_SKIP_CHARS) )
                 {
-                    if (IsCrsrInTbl() || (pWasInTblNd != IsCrsrInTbl()))
+                    if (IsCrsrInTable() || (pWasInTableNd != IsCrsrInTable()))
                     {
                         /** #108049# Save the startnode of the current
                             cell. May be different to pSNdOld as we have
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index a407b33d8325..23a1a28e5b84 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -194,7 +194,7 @@ bool SwWrtShell::RightMargin( bool bSelect, bool bBasicCall  )
 bool SwWrtShell::GoStart( bool bKeepArea, bool *pMoveTable,
                           bool bSelect, bool bDontMoveRegion )
 {
-    if ( IsCrsrInTbl() )
+    if ( IsCrsrInTable() )
     {
         const bool bBoxSelection = HasBoxSelection();
         if( !m_bBlockMode )
@@ -262,7 +262,7 @@ bool SwWrtShell::GoEnd(bool bKeepArea, bool *pMoveTable)
     if ( pMoveTable && *pMoveTable )
         return MoveTable( fnTableCurr, fnTableEnd );
 
-    if ( IsCrsrInTbl() )
+    if ( IsCrsrInTable() )
     {
         if ( MoveSection( fnSectionCurr, fnSectionEnd ) ||
              MoveTable( fnTableCurr, fnTableEnd ) )
@@ -408,7 +408,7 @@ bool SwWrtShell::PushCrsr(SwTwips lOffset, bool bSelect)
             aPt.Y() = aTmpArea.Top() + aTmpArea.Height() / 2;
 
         aPt.Y() += lOffset;
-        m_aDest = GetCntntPos(aPt,lOffset > 0);
+        m_aDest = GetContentPos(aPt,lOffset > 0);
         m_aDest.X() = aPt.X();
         m_bDestOnStack = true;
     }
@@ -596,7 +596,7 @@ bool SwWrtShell::GotoFly( const OUString& rName, FlyCntType eType, bool bSelFram
     return bRet;
 }
 
-bool SwWrtShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
+bool SwWrtShell::GotoINetAttr( const SwTextINetFormat& rAttr )
 {
     SwPosition aPos = *GetCrsr()->GetPoint();
     bool bRet = SwCrsrShell::GotoINetAttr(rAttr);
@@ -657,9 +657,9 @@ bool SwWrtShell::GotoTable( const OUString& rName )
     return bRet;
 }
 
-bool SwWrtShell::GotoFld( const SwFmtFld& rFld ) {
+bool SwWrtShell::GotoFormatField( const SwFormatField& rField ) {
     SwPosition aPos = *GetCrsr()->GetPoint();
-    bool bRet = SwCrsrShell::GotoFld(rFld);
+    bool bRet = SwCrsrShell::GotoFormatField(rField);
     if (bRet)
         m_aNavigationMgr.addEntry(aPos);
     return bRet;
@@ -673,13 +673,13 @@ const SwRangeRedline* SwWrtShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
     return pRedline;
 }
 
-bool SwWrtShell::SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr )
+bool SwWrtShell::SelectTextAttr( sal_uInt16 nWhich, const SwTextAttr* pAttr )
 {
     bool bRet;
     {
         SwMvContext aMvContext(this);
         SttSelect();
-        bRet = SwCrsrShell::SelectTxtAttr( nWhich, false, pAttr );
+        bRet = SwCrsrShell::SelectTextAttr( nWhich, false, pAttr );
     }
     EndSelect();
     return bRet;
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index afe4d925c8c2..f075de555502 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -135,7 +135,7 @@ long SwWrtShell::SelAll()
 
         // Query these early, before we move the cursor.
         bool bHasWholeTabSelection = HasWholeTabSelection();
-        bool bIsCursorInTable = IsCrsrInTbl();
+        bool bIsCursorInTable = IsCrsrInTable();
 
         if (!bHasWholeTabSelection)
         {
@@ -173,9 +173,9 @@ long SwWrtShell::SelAll()
 
         if (bNeedsExtendedSelectAll)
         {
-            // Disable table cursor to make sure getShellCrsr() returns m_pCurCrsr, not m_pTblCrsr.
+            // Disable table cursor to make sure getShellCrsr() returns m_pCurCrsr, not m_pTableCrsr.
             if (IsTableMode())
-                TblCrsrToCursor();
+                TableCrsrToCursor();
             // Do the extended select all on m_pCurCrsr.
             ExtendedSelectAll(/*bFootnotes =*/ false);
         }
@@ -236,13 +236,13 @@ sal_uLong SwWrtShell::SearchTempl( const OUString &rTempl,
         // no enhancement of existing selections
     if(!(eFlags & FND_IN_SEL))
         ClearMark();
-    SwTxtFmtColl *pColl = GetParaStyle(rTempl, SwWrtShell::GETSTYLE_CREATESOME);
-    SwTxtFmtColl *pReplaceColl = 0;
+    SwTextFormatColl *pColl = GetParaStyle(rTempl, SwWrtShell::GETSTYLE_CREATESOME);
+    SwTextFormatColl *pReplaceColl = 0;
     if( pReplTempl )
         pReplaceColl = GetParaStyle(*pReplTempl, SwWrtShell::GETSTYLE_CREATESOME );
 
     bool bCancel = false;
-    sal_uLong nRet = Find(pColl? *pColl: GetDfltTxtFmtColl(),
+    sal_uLong nRet = Find(pColl? *pColl: GetDfltTextFormatColl(),
                                eStt,eEnd, bCancel, eFlags, pReplaceColl);
     if(bCancel)
     {
@@ -578,7 +578,7 @@ void SwWrtShell::LeaveExtMode()
 
 long SwWrtShell::SttLeaveSelect(const Point *, bool )
 {
-    if(SwCrsrShell::HasSelection() && !IsSelTblCells() && m_bClearMark) {
+    if(SwCrsrShell::HasSelection() && !IsSelTableCells() && m_bClearMark) {
         return 0;
     }
     ClearMark();
@@ -705,15 +705,15 @@ void SwWrtShell::LeaveSelFrmMode()
 
 // Description: execute framebound macro
 
-IMPL_LINK( SwWrtShell, ExecFlyMac, void *, pFlyFmt )
+IMPL_LINK( SwWrtShell, ExecFlyMac, void *, pFlyFormat )
 {
-    const SwFrmFmt *pFmt = pFlyFmt ? static_cast<SwFrmFmt*>(pFlyFmt) : GetFlyFrmFmt();
-    OSL_ENSURE(pFmt, "no frame format");
-    const SvxMacroItem &rFmtMac = pFmt->GetMacro();
+    const SwFrameFormat *pFormat = pFlyFormat ? static_cast<SwFrameFormat*>(pFlyFormat) : GetFlyFrameFormat();
+    OSL_ENSURE(pFormat, "no frame format");
+    const SvxMacroItem &rFormatMac = pFormat->GetMacro();
 
-    if(rFmtMac.HasMacro(SW_EVENT_OBJECT_SELECT))
+    if(rFormatMac.HasMacro(SW_EVENT_OBJECT_SELECT))
     {
-        const SvxMacro &rMac = rFmtMac.GetMacro(SW_EVENT_OBJECT_SELECT);
+        const SvxMacro &rMac = rFormatMac.GetMacro(SW_EVENT_OBJECT_SELECT);
         if( IsFrmSelected() )
             m_bLayoutMode = true;
         CallChgLnk();
@@ -783,8 +783,8 @@ long SwWrtShell::BeginDrag(const Point * /*pPt*/, bool )
 
 long SwWrtShell::DefaultDrag(const Point *, bool )
 {
-    if( IsSelTblCells() )
-        m_aSelTblLink.Call(this);
+    if( IsSelTableCells() )
+        m_aSelTableLink.Call(this);
 
     return 1;
 }
@@ -795,8 +795,8 @@ long SwWrtShell::DefaultEndDrag(const Point * /*pPt*/, bool )
     if( IsExtSel() )
         LeaveExtSel();
 
-    if( IsSelTblCells() )
-        m_aSelTblLink.Call(this);
+    if( IsSelTableCells() )
+        m_aSelTableLink.Call(this);
     EndSelect();
     return 1;
 }
@@ -806,7 +806,7 @@ bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, bool bR
 {
     SwMvContext aMvContext(this);
     SttSelect();
-    if(SelTblRowCol( rPt, pEnd, bRowDrag ))
+    if(SelTableRowCol( rPt, pEnd, bRowDrag ))
     {
         m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
         m_fnKillSel = &SwWrtShell::ResetSelect;
@@ -819,7 +819,7 @@ bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, bool bR
 
 bool SwWrtShell::SelectTableRow()
 {
-    if ( SelTblRow() )
+    if ( SelTableRow() )
     {
         m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
         m_fnKillSel = &SwWrtShell::ResetSelect;
@@ -830,7 +830,7 @@ bool SwWrtShell::SelectTableRow()
 
 bool SwWrtShell::SelectTableCol()
 {
-    if ( SelTblCol() )
+    if ( SelTableCol() )
     {
         m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
         m_fnKillSel = &SwWrtShell::ResetSelect;
@@ -841,7 +841,7 @@ bool SwWrtShell::SelectTableCol()
 
 bool SwWrtShell::SelectTableCell()
 {
-    if ( SelTblBox() )
+    if ( SelTableBox() )
     {
         m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
         m_fnKillSel = &SwWrtShell::ResetSelect;
@@ -863,7 +863,7 @@ int SwWrtShell::IntelligentCut(int nSelection, bool bCut)
     if( IsAddMode() || !(nSelection & nsSelectionType::SEL_TXT) )
         return NO_WORD;
 
-    OUString sTxt;
+    OUString sText;
     CharClass& rCC = GetAppCharClass();
 
         // If the first character is no word character,
@@ -871,8 +871,8 @@ int SwWrtShell::IntelligentCut(int nSelection, bool bCut)
     sal_Unicode cPrev = GetChar(false);
     sal_Unicode cNext = GetChar(true, -1);
     if( !cPrev || !cNext ||
-        !rCC.isLetterNumeric( ( sTxt = OUString(cPrev) ), 0 ) ||
-        !rCC.isLetterNumeric( ( sTxt = OUString(cNext) ), 0 ) )
+        !rCC.isLetterNumeric( ( sText = OUString(cPrev) ), 0 ) ||
+        !rCC.isLetterNumeric( ( sText = OUString(cNext) ), 0 ) )
         return NO_WORD;
 
     cPrev = GetChar(false, -1);
@@ -883,8 +883,8 @@ int SwWrtShell::IntelligentCut(int nSelection, bool bCut)
     if(!cWord && cPrev && cNext &&
         CH_TXTATR_BREAKWORD != cPrev && CH_TXTATR_INWORD != cPrev &&
         CH_TXTATR_BREAKWORD != cNext && CH_TXTATR_INWORD != cNext &&
-        !rCC.isLetterNumeric( ( sTxt = OUString(cPrev) ), 0 ) &&
-        !rCC.isLetterNumeric( ( sTxt = OUString(cNext) ), 0 ) )
+        !rCC.isLetterNumeric( ( sText = OUString(cPrev) ), 0 ) &&
+        !rCC.isLetterNumeric( ( sText = OUString(cNext) ), 0 ) )
        cWord = WORD_NO_SPACE;
 
     if(cWord == WORD_NO_SPACE && ' ' == cPrev )
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 669b23632179..08422c796ab2 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -438,7 +438,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
 // Insert object into the Core.
 // From ClipBoard or Insert
 
-bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFmt **pFlyFrmFmt )
+bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrameFormat **pFlyFrameFormat )
 {
     ResetCursorStack();
     StartAllAction();
@@ -512,14 +512,14 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFm
         aSz.Width() = aBound.Width();
     }
     aFrmMgr.SetSize( aSz );
-    SwFlyFrmFmt *pFmt = SwFEShell::InsertObject( xRef, &aFrmMgr.GetAttrSet() );
+    SwFlyFrameFormat *pFormat = SwFEShell::InsertObject( xRef, &aFrmMgr.GetAttrSet() );
 
     // --> #i972#
     if ( bStarMath && mpDoc->getIDocumentSettingAccess().get( DocumentSettingId::MATH_BASELINE_ALIGNMENT ) )
         AlignFormulaToBaseline( xRef.GetObject() );
 
-    if (pFlyFrmFmt)
-        *pFlyFrmFmt = pFmt;
+    if (pFlyFrameFormat)
+        *pFlyFrameFormat = pFormat;
 
     if ( SotExchange::IsChart( aCLSID ) )
     {
@@ -615,7 +615,7 @@ void SwWrtShell::MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point&
 void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
                                   const SwRect *pFlyPrtRect,
                                   const SwRect *pFlyFrmRect,
-                                  const bool bNoTxtFrmPrtAreaChanged )
+                                  const bool bNoTextFrmPrtAreaChanged )
 {
     // Setting the scale of the client. This arises from the difference
     // between the VisArea of the object and the ObjArea.
@@ -713,7 +713,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
              //|| SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xObj->GetMiscStatus()
              // --> OD #i117189# - refine condition for non-resizable objects
              // non-resizable objects need to be set the size back by this method
-             || ( bNoTxtFrmPrtAreaChanged && nMisc & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
+             || ( bNoTextFrmPrtAreaChanged && nMisc & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
         {
             pCli = new SwOleClient( &GetView(), &GetView().GetEditWin(), xObj );
         }
@@ -800,11 +800,11 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
     if ( bUseObjectSize )
     {
         // --> this moves non-resizable object so that when adding borders the baseline remains the same
-        const SwFlyFrmFmt *pFlyFrmFmt = dynamic_cast< const SwFlyFrmFmt * >( GetFlyFrmFmt() );
-        OSL_ENSURE( pFlyFrmFmt, "Could not find fly frame." );
-        if ( pFlyFrmFmt )
+        const SwFlyFrameFormat *pFlyFrameFormat = dynamic_cast< const SwFlyFrameFormat * >( GetFlyFrameFormat() );
+        OSL_ENSURE( pFlyFrameFormat, "Could not find fly frame." );
+        if ( pFlyFrameFormat )
         {
-            const Point &rPoint = pFlyFrmFmt->GetLastFlyFrmPrtRectPos();
+            const Point &rPoint = pFlyFrameFormat->GetLastFlyFrmPrtRectPos();
             SwRect aRect( pFlyPrtRect ? *pFlyPrtRect
                         : GetAnyCurRect( RECT_FLY_PRT_EMBEDDED, 0, xObj.GetObject() ));
             aArea += rPoint - aRect.Pos(); // adjust area by diff of printing area position in order to keep baseline alignment correct.
@@ -841,7 +841,7 @@ void SwWrtShell::InsertPageBreak(const OUString *pPageDesc, const ::boost::optio
         SwActContext aActContext(this);
         StartUndo(UNDO_UI_INSERT_PAGE_BREAK);
 
-        if ( !IsCrsrInTbl() )
+        if ( !IsCrsrInTable() )
         {
             if(HasSelection())
                 DelRight();
@@ -854,12 +854,12 @@ void SwWrtShell::InsertPageBreak(const OUString *pPageDesc, const ::boost::optio
                                 ? FindPageDescByName( *pPageDesc, true ) : 0;
         if( pDesc )
         {
-            SwFmtPageDesc aDesc( pDesc );
+            SwFormatPageDesc aDesc( pDesc );
             aDesc.SetNumOffset( oPgNum );
             SetAttrItem( aDesc );
         }
         else
-            SetAttrItem( SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
+            SetAttrItem( SvxFormatBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
         EndUndo(UNDO_UI_INSERT_PAGE_BREAK);
     }
 }
@@ -895,13 +895,13 @@ void SwWrtShell::InsertColumnBreak()
     {
         StartUndo(UNDO_UI_INSERT_COLUMN_BREAK);
 
-        if ( !IsCrsrInTbl() )
+        if ( !IsCrsrInTable() )
         {
             if(HasSelection())
                 DelRight();
             SwFEShell::SplitNode( false, false );
         }
-        SetAttrItem(SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
+        SetAttrItem(SvxFormatBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
 
         EndUndo(UNDO_UI_INSERT_COLUMN_BREAK);
     }
@@ -923,7 +923,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, bool bEndNote, bool bEdit
             ClearMark();
         }
         SwPosition aPos = *GetCrsr()->GetPoint();
-        SwFmtFtn aFootNote( bEndNote );
+        SwFormatFootnote aFootNote( bEndNote );
         if(!rStr.isEmpty())
             aFootNote.SetNumStr( rStr );
 
@@ -933,7 +933,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, bool bEndNote, bool bEdit
         {
             // For editing the footnote text.
             Left(CRSR_SKIP_CHARS, false, 1, false );
-            GotoFtnTxt();
+            GotoFootnoteText();
         }
         m_aNavigationMgr.addEntry(aPos);
     }
@@ -943,7 +943,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, bool bEndNote, bool bEdit
 //                  - of deleting selected content;
 //                  - of reset of the Cursorstack if necessary.
 
-void SwWrtShell::SplitNode( bool bAutoFmt, bool bCheckTableStart )
+void SwWrtShell::SplitNode( bool bAutoFormat, bool bCheckTableStart )
 {
     ResetCursorStack();
     if( CanInsert() )
@@ -958,7 +958,7 @@ void SwWrtShell::SplitNode( bool bAutoFmt, bool bCheckTableStart )
             DelRight();
         }
 
-        SwFEShell::SplitNode( bAutoFmt, bCheckTableStart );
+        SwFEShell::SplitNode( bAutoFormat, bCheckTableStart );
         if( bHasSel )
             EndUndo( UNDO_INSERT );
     }
@@ -970,7 +970,7 @@ void SwWrtShell::SplitNode( bool bAutoFmt, bool bCheckTableStart )
 //              into a number and less than nMaxRules.
 
 // To test the CharFormats at the numbering
-// external void SetNumChrFmt( SwWrtShell*, SwNumRules& );
+// external void SetNumChrFormat( SwWrtShell*, SwNumRules& );
 
 // -> #i40041#
 // Preconditions (as far as OD has figured out):
@@ -994,7 +994,7 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
     bool bContinueFoundNumRule( false );
     bool bActivateOutlineRule( false );
     int nActivateOutlineLvl( MAXLEVEL );    // only relevant, if <bActivateOutlineRule> == true
-    SwTxtFmtColl * pColl = GetCurTxtFmtColl();
+    SwTextFormatColl * pColl = GetCurTextFormatColl();
     if ( pColl )
     {
         // retrieve numbering rule at paragraph
@@ -1028,9 +1028,9 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
                 // check, if text node at current cursor positioned is counted.
                 // If not, let it been counted. Then it has to be checked,
                 // of the outline numbering has to be activated or continued.
-                SwTxtNode* pTxtNode =
-                            GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
-                if ( pTxtNode && !pTxtNode->IsCountedInList() )
+                SwTextNode* pTextNode =
+                            GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
+                if ( pTextNode && !pTextNode->IsCountedInList() )
                 {
                     // check, if numbering of the outline level of the paragraph
                     // style is active. If not, activate this outline level.
@@ -1135,14 +1135,14 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
         // do not change found numbering/bullet rule, if it should only be continued.
         if ( !bContinueFoundNumRule )
         {
-            SwTxtNode * pTxtNode = GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
+            SwTextNode * pTextNode = GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
 
-            if (pTxtNode)
+            if (pTextNode)
             {
                 // use above retrieve outline level, if outline numbering has to be activated.
                 int nLevel = bActivateOutlineRule
                               ? nActivateOutlineLvl
-                              : pTxtNode->GetActualListLevel();
+                              : pTextNode->GetActualListLevel();
 
                 if (nLevel < 0)
                     nLevel = 0;
@@ -1150,25 +1150,25 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
                 if (nLevel >= MAXLEVEL)
                     nLevel = MAXLEVEL - 1;
 
-                SwNumFmt aFmt(aNumRule.Get(static_cast<sal_uInt16>(nLevel)));
+                SwNumFormat aFormat(aNumRule.Get(static_cast<sal_uInt16>(nLevel)));
 
                 if (bNum)
-                    aFmt.SetNumberingType(SVX_NUM_ARABIC);
+                    aFormat.SetNumberingType(SVX_NUM_ARABIC);
                 else
                 {
                     // #i63395# Only apply user defined default bullet font
                     if ( numfunc::IsDefBulletFontUserDefined() )
                     {
                         const vcl::Font* pFnt = &numfunc::GetDefBulletFont();
-                        aFmt.SetBulletFont( pFnt );
+                        aFormat.SetBulletFont( pFnt );
                     }
-                    aFmt.SetBulletChar( numfunc::GetBulletChar(static_cast<sal_uInt8>(nLevel)));
-                    aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+                    aFormat.SetBulletChar( numfunc::GetBulletChar(static_cast<sal_uInt8>(nLevel)));
+                    aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
                     // #i93908# clear suffix for bullet lists
-                    aFmt.SetPrefix(OUString());
-                    aFmt.SetSuffix(OUString());
+                    aFormat.SetPrefix(OUString());
+                    aFormat.SetSuffix(OUString());
                 }
-                aNumRule.Set(static_cast<sal_uInt16>(nLevel), aFmt);
+                aNumRule.Set(static_cast<sal_uInt16>(nLevel), aFormat);
             }
         }
 
@@ -1182,7 +1182,7 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
                                     numfunc::GetDefaultPositionAndSpaceMode() );
         SwNumRule aNumRule( GetUniqueNumRuleName(), ePosAndSpaceMode );
         // Append the character template at the numbering.
-        SwCharFmt* pChrFmt;
+        SwCharFormat* pChrFormat;
         SwDocShell* pDocSh = GetView().GetDocShell();
         // #i63395#
         // Only apply user defined default bullet font
@@ -1192,16 +1192,16 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
 
         if (bNum)
         {
-            pChrFmt = GetCharFmtFromPool( RES_POOLCHR_NUM_LEVEL );
+            pChrFormat = GetCharFormatFromPool( RES_POOLCHR_NUM_LEVEL );
         }
         else
         {
-            pChrFmt = GetCharFmtFromPool( RES_POOLCHR_BUL_LEVEL );
+            pChrFormat = GetCharFormatFromPool( RES_POOLCHR_BUL_LEVEL );
         }
 
-        const SwTxtNode* pTxtNode = GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
-        const SwTwips nWidthOfTabs = pTxtNode
-                                     ? pTxtNode->GetWidthOfLeadingTabs()
+        const SwTextNode* pTextNode = GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
+        const SwTwips nWidthOfTabs = pTextNode
+                                     ? pTextNode->GetWidthOfLeadingTabs()
                                      : 0;
         GetDoc()->getIDocumentContentOperations().RemoveLeadingWhiteSpace( *GetCrsr()->GetPoint() );
 
@@ -1209,8 +1209,8 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
         const bool bRightToLeft = IsInRightToLeftText();
         for( sal_uInt8 nLvl = 0; nLvl < MAXLEVEL; ++nLvl )
         {
-            SwNumFmt aFmt( aNumRule.Get( nLvl ) );
-            aFmt.SetCharFmt( pChrFmt );
+            SwNumFormat aFormat( aNumRule.Get( nLvl ) );
+            aFormat.SetCharFormat( pChrFormat );
 
             if (! bNum)
             {
@@ -1218,13 +1218,13 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
                 // Only apply user defined default bullet font
                 if ( pFnt )
                 {
-                    aFmt.SetBulletFont( pFnt );
+                    aFormat.SetBulletFont( pFnt );
                 }
-                aFmt.SetBulletChar( numfunc::GetBulletChar(nLvl) );
-                aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+                aFormat.SetBulletChar( numfunc::GetBulletChar(nLvl) );
+                aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
                 // #i93908# clear suffix for bullet lists
-                aFmt.SetPrefix(OUString());
-                aFmt.SetSuffix(OUString());
+                aFormat.SetPrefix(OUString());
+                aFormat.SetSuffix(OUString());
             }
 
             // #i95907#
@@ -1233,11 +1233,11 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
                 if(bHtml && nLvl)
                 {
                     // 1/2" for HTML
-                    aFmt.SetAbsLSpace(nLvl * 720);
+                    aFormat.SetAbsLSpace(nLvl * 720);
                 }
                 else if ( nWidthOfTabs > 0 )
                 {
-                    aFmt.SetAbsLSpace(nWidthOfTabs + nLvl * 720);
+                    aFormat.SetAbsLSpace(nWidthOfTabs + nLvl * 720);
                 }
             }
 
@@ -1245,28 +1245,28 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
             // numbering/bullet should be rtl in rtl paragraph:
             if ( bRightToLeft )
             {
-                aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
+                aFormat.SetNumAdjust( SVX_ADJUST_RIGHT );
             }
 
-            aNumRule.Set( nLvl, aFmt );
+            aNumRule.Set( nLvl, aFormat );
         }
 
         // #i95907#
-        if ( pTxtNode &&
+        if ( pTextNode &&
              ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
         {
 
-            const SwTwips nTxtNodeIndent = pTxtNode->GetAdditionalIndentForStartingNewList();
-            if ( ( nTxtNodeIndent + nWidthOfTabs ) != 0 )
+            const SwTwips nTextNodeIndent = pTextNode->GetAdditionalIndentForStartingNewList();
+            if ( ( nTextNodeIndent + nWidthOfTabs ) != 0 )
             {
                 // #i111172#/fdo#85666
                 // If text node is already inside a list, assure that the indents
                 // are the same. Thus, adjust the indent change value by subtracting
                 // indents of to be applied list style.
-                SwTwips nIndentChange = nTxtNodeIndent + nWidthOfTabs;
-                if ( pTxtNode->GetNumRule() )
+                SwTwips nIndentChange = nTextNodeIndent + nWidthOfTabs;
+                if ( pTextNode->GetNumRule() )
                 {
-                    int nLevel = pTxtNode->GetActualListLevel();
+                    int nLevel = pTextNode->GetActualListLevel();
 
                     if (nLevel < 0)
                         nLevel = 0;
@@ -1274,10 +1274,10 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
                     if (nLevel >= MAXLEVEL)
                         nLevel = MAXLEVEL - 1;
 
-                    const SwNumFmt aFmt( aNumRule.Get( nLevel ) );
-                    if ( aFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
+                    const SwNumFormat aFormat( aNumRule.Get( nLevel ) );
+                    if ( aFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
                     {
-                        nIndentChange -= aFmt.GetIndentAt() + aFmt.GetFirstLineIndent();
+                        nIndentChange -= aFormat.GetIndentAt() + aFormat.GetFirstLineIndent();
                     }
                 }
                 aNumRule.ChangeIndent( nIndentChange );
@@ -1307,12 +1307,12 @@ void SwWrtShell::NumOrBulletOff()
         {
             SwNumRule aNumRule(*pCurNumRule);
 
-            SwTxtNode * pTxtNode =
-                GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
+            SwTextNode * pTextNode =
+                GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
 
-            if (pTxtNode)
+            if (pTextNode)
             {
-                int nLevel = pTxtNode->GetActualListLevel();
+                int nLevel = pTextNode->GetActualListLevel();
 
                 if (nLevel < 0)
                     nLevel = 0;
@@ -1320,10 +1320,10 @@ void SwWrtShell::NumOrBulletOff()
                 if (nLevel >= MAXLEVEL)
                     nLevel = MAXLEVEL - 1;
 
-                SwNumFmt aFmt(aNumRule.Get(static_cast<sal_uInt16>(nLevel)));
+                SwNumFormat aFormat(aNumRule.Get(static_cast<sal_uInt16>(nLevel)));
 
-                aFmt.SetNumberingType(SVX_NUM_NUMBER_NONE);
-                aNumRule.Set(nLevel, aFmt);
+                aFormat.SetNumberingType(SVX_NUM_NUMBER_NONE);
+                aNumRule.Set(nLevel, aFormat);
 
                 // no start or continuation of a list - the outline style is only changed.
                 SetCurNumRule( aNumRule, false );
@@ -1408,7 +1408,7 @@ SelectionType SwWrtShell::GetSelectionType() const
             return nsSelectionType::SEL_FRM;
     }
 
-    if ( IsCrsrInTbl() )
+    if ( IsCrsrInTable() )
         nCnt |= nsSelectionType::SEL_TBL;
 
     if ( IsTableMode() )
@@ -1418,12 +1418,12 @@ SelectionType SwWrtShell::GetSelectionType() const
     const SwNumRule* pNumRule = GetNumRuleAtCurrCrsrPos();
     if ( pNumRule )
     {
-        const SwTxtNode* pTxtNd =
-            GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
+        const SwTextNode* pTextNd =
+            GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode();
 
-        if ( pTxtNd && pTxtNd->IsInList() )
+        if ( pTextNd && pTextNd->IsInList() )
         {
-            int nLevel = pTxtNd->GetActualListLevel();
+            int nLevel = pTextNd->GetActualListLevel();
 
             if (nLevel < 0)
                 nLevel = 0;
@@ -1431,8 +1431,8 @@ SelectionType SwWrtShell::GetSelectionType() const
             if (nLevel >= MAXLEVEL)
                 nLevel = MAXLEVEL - 1;
 
-            const SwNumFmt& rFmt = pNumRule->Get(nLevel);
-            if ( SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType() )
+            const SwNumFormat& rFormat = pNumRule->Get(nLevel);
+            if ( SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType() )
                 nCnt |= nsSelectionType::SEL_NUM;
         }
     }
@@ -1445,14 +1445,14 @@ SelectionType SwWrtShell::GetSelectionType() const
 //            text collection with this name exists, or
 //            this is a default template.
 
-SwTxtFmtColl *SwWrtShell::GetParaStyle(const OUString &rCollName, GetStyle eCreate )
+SwTextFormatColl *SwWrtShell::GetParaStyle(const OUString &rCollName, GetStyle eCreate )
 {
-    SwTxtFmtColl* pColl = FindTxtFmtCollByName( rCollName );
+    SwTextFormatColl* pColl = FindTextFormatCollByName( rCollName );
     if( !pColl && GETSTYLE_NOCREATE != eCreate )
     {
         sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rCollName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
         if( USHRT_MAX != nId || GETSTYLE_CREATEANY == eCreate )
-            pColl = GetTxtCollFromPool( nId );
+            pColl = GetTextCollFromPool( nId );
     }
     return pColl;
 }
@@ -1462,31 +1462,31 @@ SwTxtFmtColl *SwWrtShell::GetParaStyle(const OUString &rCollName, GetStyle eCrea
 //            character template with this name exists, or
 //            this is a default template or template is automatic.
 
-SwCharFmt *SwWrtShell::GetCharStyle(const OUString &rFmtName, GetStyle eCreate )
+SwCharFormat *SwWrtShell::GetCharStyle(const OUString &rFormatName, GetStyle eCreate )
 {
-    SwCharFmt* pFmt = FindCharFmtByName( rFmtName );
-    if( !pFmt && GETSTYLE_NOCREATE != eCreate )
+    SwCharFormat* pFormat = FindCharFormatByName( rFormatName );
+    if( !pFormat && GETSTYLE_NOCREATE != eCreate )
     {
-        sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
+        sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rFormatName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
         if( USHRT_MAX != nId || GETSTYLE_CREATEANY == eCreate )
-            pFmt = static_cast<SwCharFmt*>(GetFmtFromPool( nId ));
+            pFormat = static_cast<SwCharFormat*>(GetFormatFromPool( nId ));
     }
-    return pFmt;
+    return pFormat;
 }
 
-// Find the table format with the name rFmtname
+// Find the table format with the name rFormatname
 // Returns:   Pointer at the collection or 0, if no
 //            frame format with this name exists or
 //            this is a default format or the format is automatic.
 
-SwFrmFmt *SwWrtShell::GetTblStyle(const OUString &rFmtName)
+SwFrameFormat *SwWrtShell::GetTableStyle(const OUString &rFormatName)
 {
-    for( size_t i = GetTblFrmFmtCount(); i; )
+    for( size_t i = GetTableFrameFormatCount(); i; )
     {
-        SwFrmFmt *pFmt = &GetTblFrmFmt( --i );
-        if( !pFmt->IsDefault() &&
-            pFmt->GetName() == rFmtName && IsUsed( *pFmt ) )
-            return pFmt;
+        SwFrameFormat *pFormat = &GetTableFrameFormat( --i );
+        if( !pFormat->IsDefault() &&
+            pFormat->GetName() == rFormatName && IsUsed( *pFormat ) )
+            return pFormat;
     }
     return 0;
 }
@@ -1519,18 +1519,18 @@ OUString SwWrtShell::GetCurPageStyle( const bool bCalcFrm ) const
 
 void SwWrtShell::QuickUpdateStyle()
 {
-    SwTxtFmtColl *pColl = GetCurTxtFmtColl();
+    SwTextFormatColl *pColl = GetCurTextFormatColl();
 
     // Default cannot be changed
     if(pColl && !pColl->IsDefault())
     {
         FillByEx(pColl);
             // Also apply the template to remove hard attribute assignment.
-        SetTxtFmtColl(pColl);
+        SetTextFormatColl(pColl);
     }
 }
 
-void SwWrtShell::AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM )
+void SwWrtShell::AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM )
 {
     SwPaM* pCrsr = pPaM ? pPaM : GetCrsr( );
     SfxItemSet aCoreSet( GetAttrPool(),
@@ -1568,16 +1568,16 @@ void SwWrtShell::AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet
         ResetAttr( std::set<sal_uInt16>(), pCrsr );
         SetAttrSet(aCoreSet, SetAttrMode::DEFAULT, pCrsr);
     }
-    mpDoc->ChgFmt(*pColl, rStyleSet );
+    mpDoc->ChgFormat(*pColl, rStyleSet );
     EndAction();
 }
 
-void SwWrtShell::AutoUpdateFrame( SwFrmFmt* pFmt, const SfxItemSet& rStyleSet )
+void SwWrtShell::AutoUpdateFrame( SwFrameFormat* pFormat, const SfxItemSet& rStyleSet )
 {
     StartAction();
 
     ResetFlyFrmAttr( 0, &rStyleSet );
-    pFmt->SetFmtAttr( rStyleSet );
+    pFormat->SetFormatAttr( rStyleSet );
 
     EndAction();
 }
@@ -1709,10 +1709,10 @@ OUString SwWrtShell::GetSelDescr() const
         break;
     case nsSelectionType::SEL_FRM:
         {
-            const SwFrmFmt * pFrmFmt = GetCurFrmFmt();
+            const SwFrameFormat * pFrameFormat = GetCurFrameFormat();
 
-            if (pFrmFmt)
-                aResult = pFrmFmt->GetDescription();
+            if (pFrameFormat)
+                aResult = pFrameFormat->GetDescription();
         }
         break;
     case nsSelectionType::SEL_DRW:
@@ -1782,18 +1782,18 @@ void SwWrtShell::ChangeHeaderOrFooter(
             if( bExecute )
             {
                 bChgd = true;
-                SwFrmFmt &rMaster = aDesc.GetMaster();
+                SwFrameFormat &rMaster = aDesc.GetMaster();
                 if(bHeader)
-                    rMaster.SetFmtAttr( SwFmtHeader( bOn ));
+                    rMaster.SetFormatAttr( SwFormatHeader( bOn ));
                 else
-                    rMaster.SetFmtAttr( SwFmtFooter( bOn ));
+                    rMaster.SetFormatAttr( SwFormatFooter( bOn ));
                 if( bOn )
                 {
                     SvxULSpaceItem aUL(bHeader ? 0 : MM50, bHeader ? MM50 : 0, RES_UL_SPACE );
-                    SwFrmFmt* pFmt = bHeader ?
-                        const_cast<SwFrmFmt*>(rMaster.GetHeader().GetHeaderFmt()) :
-                        const_cast<SwFrmFmt*>(rMaster.GetFooter().GetFooterFmt());
-                    pFmt->SetFmtAttr( aUL );
+                    SwFrameFormat* pFormat = bHeader ?
+                        const_cast<SwFrameFormat*>(rMaster.GetHeader().GetHeaderFormat()) :
+                        const_cast<SwFrameFormat*>(rMaster.GetFooter().GetFooterFormat());
+                    pFormat->SetFormatAttr( aUL );
                 }
             }
             if( bChgd )
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index b9cf0f6957f9..685fa8f04bbb 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -68,7 +68,7 @@
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
-void SwWrtShell::Insert(SwField &rFld)
+void SwWrtShell::Insert(SwField &rField)
 {
     ResetCursorStack();
     if(!CanInsert())
@@ -76,7 +76,7 @@ void SwWrtShell::Insert(SwField &rFld)
     StartAllAction();
 
     SwRewriter aRewriter;
-    aRewriter.AddRule(UndoArg1, rFld.GetDescription());
+    aRewriter.AddRule(UndoArg1, rField.GetDescription());
 
     StartUndo(UNDO_INSERT, &aRewriter);
 
@@ -84,15 +84,15 @@ void SwWrtShell::Insert(SwField &rFld)
     boost::scoped_ptr<SwPaM> pAnnotationTextRange;
     if ( HasSelection() )
     {
-        if ( rFld.GetTyp()->Which() == RES_POSTITFLD )
+        if ( rField.GetTyp()->Which() == RES_POSTITFLD )
         {
             // for annotation fields:
             // - keep the current selection in order to create a corresponding annotation mark
             // - collapse cursor to its end
             if ( IsTableMode() )
             {
-                GetTblCrs()->Normalize( false );
-                const SwPosition rStartPos( *(GetTblCrs()->GetMark()->nNode.GetNode().GetCntntNode()), 0 );
+                GetTableCrs()->Normalize( false );
+                const SwPosition rStartPos( *(GetTableCrs()->GetMark()->nNode.GetNode().GetContentNode()), 0 );
                 KillPams();
                 if ( !IsEndOfPara() )
                 {
@@ -115,7 +115,7 @@ void SwWrtShell::Insert(SwField &rFld)
         }
     }
 
-    SwEditShell::Insert2(rFld, bDeleted);
+    SwEditShell::Insert2(rField, bDeleted);
 
     if ( pAnnotationTextRange )
     {
@@ -133,7 +133,7 @@ void SwWrtShell::Insert(SwField &rFld)
 
 // Start the field update
 
-void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst )
+void SwWrtShell::UpdateInputFields( SwInputFieldList* pLst )
 {
     // Go through the list of fields and updating
     SwInputFieldList* pTmp = pLst;
@@ -152,14 +152,14 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst )
             pTmp->GotoFieldPos( i );
             SwField* pField = pTmp->GetField( i );
             if(pField->GetTyp()->Which() == RES_DROPDOWN)
-                bCancel = StartDropDownFldDlg( pField, true, &aDlgPos );
+                bCancel = StartDropDownFieldDlg( pField, true, &aDlgPos );
             else
-                bCancel = StartInputFldDlg( pField, true, 0, &aDlgPos);
+                bCancel = StartInputFieldDlg( pField, true, 0, &aDlgPos);
 
             if (!bCancel)
             {
                 // Otherwise update error at multi-selection:
-                pTmp->GetField( i )->GetTyp()->UpdateFlds();
+                pTmp->GetField( i )->GetTyp()->UpdateFields();
             }
         }
         pTmp->PopCrsr();
@@ -171,39 +171,39 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst )
 
 // Listener class: will close InputField dialog if input field(s)
 // is(are) deleted (for instance, by an extension) after the dialog shows up.
-// Otherwise, the for loop in SwWrtShell::UpdateInputFlds will crash when doing:
-//         'pTmp->GetField( i )->GetTyp()->UpdateFlds();'
+// Otherwise, the for loop in SwWrtShell::UpdateInputFields will crash when doing:
+//         'pTmp->GetField( i )->GetTyp()->UpdateFields();'
 // on a deleted field.
 class FieldDeletionModify : public SwModify
 {
     public:
-        FieldDeletionModify(AbstractFldInputDlg* pInputFieldDlg, SwField* pFld)
+        FieldDeletionModify(AbstractFieldInputDlg* pInputFieldDlg, SwField* pField)
             : mpInputFieldDlg(pInputFieldDlg)
-            , mpFmtFld(NULL)
+            , mpFormatField(NULL)
         {
-            SwInputField *const pInputField(dynamic_cast<SwInputField*>(pFld));
-            SwSetExpField *const pSetExpFld(dynamic_cast<SwSetExpField*>(pFld));
+            SwInputField *const pInputField(dynamic_cast<SwInputField*>(pField));
+            SwSetExpField *const pSetExpField(dynamic_cast<SwSetExpField*>(pField));
 
-            if (pInputField && pInputField->GetFmtFld())
+            if (pInputField && pInputField->GetFormatField())
             {
-                mpFmtFld = pInputField->GetFmtFld();
+                mpFormatField = pInputField->GetFormatField();
             }
-            else if (pSetExpFld && pSetExpFld->GetFmtFld())
+            else if (pSetExpField && pSetExpField->GetFormatField())
             {
-                mpFmtFld = pSetExpFld->GetFmtFld();
+                mpFormatField = pSetExpField->GetFormatField();
             }
 
             // Register for possible field deletion while dialog is open
-            if (mpFmtFld)
-                mpFmtFld->Add(this);
+            if (mpFormatField)
+                mpFormatField->Add(this);
         }
 
         virtual ~FieldDeletionModify()
         {
-            if (mpFmtFld)
+            if (mpFormatField)
             {
                 // Dialog closed, remove modification listener
-                mpFmtFld->Remove(this);
+                mpFormatField->Remove(this);
             }
         }
 
@@ -216,25 +216,25 @@ class FieldDeletionModify : public SwModify
                 {
                 case RES_REMOVE_UNO_OBJECT:
                 case RES_OBJECTDYING:
-                    mpFmtFld = NULL;
+                    mpFormatField = NULL;
                     mpInputFieldDlg->EndDialog(RET_CANCEL);
                     break;
                 }
             }
         }
     private:
-        AbstractFldInputDlg* mpInputFieldDlg;
-        SwFmtFld* mpFmtFld;
+        AbstractFieldInputDlg* mpInputFieldDlg;
+        SwFormatField* mpFormatField;
 };
 
 // Start input dialog for a specific field
-bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton,
+bool SwWrtShell::StartInputFieldDlg( SwField* pField, bool bNextButton,
                                    vcl::Window* pParentWin, OString* pWindowState )
 {
 
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "Dialog creation failed!");
-    boost::scoped_ptr<AbstractFldInputDlg> pDlg(pFact->CreateFldInputDlg(pParentWin, *this, pFld, bNextButton));
+    boost::scoped_ptr<AbstractFieldInputDlg> pDlg(pFact->CreateFieldInputDlg(pParentWin, *this, pField, bNextButton));
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     if(pWindowState && !pWindowState->isEmpty())
         pDlg->SetWindowState(*pWindowState);
@@ -242,7 +242,7 @@ bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton,
     bool bRet;
 
     {
-        FieldDeletionModify aModify(pDlg.get(), pFld);
+        FieldDeletionModify aModify(pDlg.get(), pField);
         bRet = RET_CANCEL == pDlg->Execute();
     }
 
@@ -254,12 +254,12 @@ bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton,
     return bRet;
 }
 
-bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, bool bNextButton, OString* pWindowState)
+bool SwWrtShell::StartDropDownFieldDlg(SwField* pField, bool bNextButton, OString* pWindowState)
 {
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    boost::scoped_ptr<AbstractDropDownFieldDialog> pDlg(pFact->CreateDropDownFieldDialog(NULL, *this, pFld, bNextButton));
+    boost::scoped_ptr<AbstractDropDownFieldDialog> pDlg(pFact->CreateDropDownFieldDialog(NULL, *this, pField, bNextButton));
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     if(pWindowState && !pWindowState->isEmpty())
         pDlg->SetWindowState(*pWindowState);
@@ -315,10 +315,10 @@ bool SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
 // handler for click on the field given as parameter.
 // the cursor is positioned on the field.
 
-void SwWrtShell::ClickToField( const SwField& rFld )
+void SwWrtShell::ClickToField( const SwField& rField )
 {
     // cross reference field must not be selected because it moves the cursor
-    if (RES_GETREFFLD != rFld.GetTyp()->Which())
+    if (RES_GETREFFLD != rField.GetTyp()->Which())
     {
         StartAllAction();
         Right( CRSR_SKIP_CHARS, true, 1, false ); // Select the field.
@@ -327,12 +327,12 @@ void SwWrtShell::ClickToField( const SwField& rFld )
     }
 
     m_bIsInClickToEdit = true;
-    switch( rFld.GetTyp()->Which() )
+    switch( rField.GetTyp()->Which() )
     {
     case RES_JUMPEDITFLD:
         {
             sal_uInt16 nSlotId = 0;
-            switch( rFld.GetFormat() )
+            switch( rField.GetFormat() )
             {
             case JE_FMT_TABLE:
                 nSlotId = FN_INSERT_TABLE;
@@ -361,17 +361,17 @@ void SwWrtShell::ClickToField( const SwField& rFld )
 
     case RES_MACROFLD:
         {
-            const SwMacroField *pFld = static_cast<const SwMacroField*>(&rFld);
-            const OUString sText( rFld.GetPar2() );
+            const SwMacroField *pField = static_cast<const SwMacroField*>(&rField);
+            const OUString sText( rField.GetPar2() );
             OUString sRet( sText );
-            ExecMacro( pFld->GetSvxMacro(), &sRet );
+            ExecMacro( pField->GetSvxMacro(), &sRet );
 
             // return value changed?
             if( sRet != sText )
             {
                 StartAllAction();
-                const_cast<SwField&>(rFld).SetPar2( sRet );
-                rFld.GetTyp()->UpdateFlds();
+                const_cast<SwField&>(rField).SetPar2( sRet );
+                rField.GetTyp()->UpdateFields();
                 EndAllAction();
             }
         }
@@ -379,37 +379,37 @@ void SwWrtShell::ClickToField( const SwField& rFld )
 
     case RES_GETREFFLD:
         StartAllAction();
-        SwCrsrShell::GotoRefMark( static_cast<const SwGetRefField&>(rFld).GetSetRefName(),
-                                    static_cast<const SwGetRefField&>(rFld).GetSubType(),
-                                    static_cast<const SwGetRefField&>(rFld).GetSeqNo() );
+        SwCrsrShell::GotoRefMark( static_cast<const SwGetRefField&>(rField).GetSetRefName(),
+                                    static_cast<const SwGetRefField&>(rField).GetSubType(),
+                                    static_cast<const SwGetRefField&>(rField).GetSeqNo() );
         EndAllAction();
         break;
 
     case RES_INPUTFLD:
         {
-            const SwInputField* pInputField = dynamic_cast<const SwInputField*>(&rFld);
+            const SwInputField* pInputField = dynamic_cast<const SwInputField*>(&rField);
             if ( pInputField == NULL )
             {
-                StartInputFldDlg( const_cast<SwField*>(&rFld), false );
+                StartInputFieldDlg( const_cast<SwField*>(&rField), false );
             }
         }
         break;
 
     case RES_SETEXPFLD:
-        if( static_cast<const SwSetExpField&>(rFld).GetInputFlag() )
-            StartInputFldDlg( const_cast<SwField*>(&rFld), false );
+        if( static_cast<const SwSetExpField&>(rField).GetInputFlag() )
+            StartInputFieldDlg( const_cast<SwField*>(&rField), false );
         break;
     case RES_DROPDOWN :
-        StartDropDownFldDlg( const_cast<SwField*>(&rFld), false );
+        StartDropDownFieldDlg( const_cast<SwField*>(&rField), false );
     break;
     default:
-        SAL_WARN_IF(rFld.IsClickable(), "sw", "unhandled clickable field!");
+        SAL_WARN_IF(rField.IsClickable(), "sw", "unhandled clickable field!");
     }
 
     m_bIsInClickToEdit = false;
 }
 
-void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter )
+void SwWrtShell::ClickToINetAttr( const SwFormatINetFormat& rItem, sal_uInt16 nFilter )
 {
     if( rItem.GetValue().isEmpty() )
         return ;
@@ -427,11 +427,11 @@ void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter
 
     // So that the implementation of templates is displayed immediately
     ::LoadURL( *this, rItem.GetValue(), nFilter, rItem.GetTargetFrame() );
-    const SwTxtINetFmt* pTxtAttr = rItem.GetTxtINetFmt();
-    if( pTxtAttr )
+    const SwTextINetFormat* pTextAttr = rItem.GetTextINetFormat();
+    if( pTextAttr )
     {
-        const_cast<SwTxtINetFmt*>(pTxtAttr)->SetVisited( true );
-        const_cast<SwTxtINetFmt*>(pTxtAttr)->SetVisitedValid( true );
+        const_cast<SwTextINetFormat*>(pTextAttr)->SetVisited( true );
+        const_cast<SwTextINetFormat*>(pTextAttr)->SetVisitedValid( true );
     }
 
     m_bIsInClickToEdit = false;
@@ -442,7 +442,7 @@ bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter )
     bool bRet = false;
     OUString sURL;
     OUString sTargetFrameName;
-    const SwFrmFmt* pFnd = IsURLGrfAtPos( rDocPt, &sURL, &sTargetFrameName );
+    const SwFrameFormat* pFnd = IsURLGrfAtPos( rDocPt, &sURL, &sTargetFrameName );
     if( pFnd && !sURL.isEmpty() )
     {
         bRet = true;
@@ -548,8 +548,8 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
                 }
             }
         }
-        SwFmtINetFmt aFmt( sURL, OUString() );
-        InsertURL( aFmt, rBkmk.GetDescription() );
+        SwFormatINetFormat aFormat( sURL, OUString() );
+        InsertURL( aFormat, rBkmk.GetDescription() );
     }
     else
     {
@@ -580,7 +580,7 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
                     DoUndo(false);
                 }
             }
-            UpdateSection( GetSectionFmtPos( *pIns->GetFmt() ), aSection );
+            UpdateSection( GetSectionFormatPos( *pIns->GetFormat() ), aSection );
             DoUndo( bDoesUndo );
         }
     }
diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx
index 0f97fbce9e52..a3ef19ea5a5f 100644
--- a/sw/source/uibase/wrtsh/wrtsh3.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh3.cxx
@@ -67,11 +67,11 @@ bool SwWrtShell::MoveBookMark( BookMarkMove eFuncId, const ::sw::mark::IMark* co
     return bRet;
 }
 
-bool SwWrtShell::GotoField( const SwFmtFld& rFld )
+bool SwWrtShell::GotoField( const SwFormatField& rField )
 {
     (this->*m_fnKillSel)( 0, false );
 
-    bool bRet = SwCrsrShell::GotoFld( rFld );
+    bool bRet = SwCrsrShell::GotoFormatField( rField );
     if( bRet && IsSelFrmMode() )
     {
         UnSelectFrm();
diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui
index 9ecb3226e716..ee7cf04593bd 100644
--- a/sw/uiconfig/swriter/ui/autoformattable.ui
+++ b/sw/uiconfig/swriter/ui/autoformattable.ui
@@ -138,7 +138,7 @@
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">6</property>
                         <child>
-                          <object class="swuilo-AutoFmtPreview" id="preview">
+                          <object class="swuilo-AutoFormatPreview" id="preview">
                             <property name="width_request">200</property>
                             <property name="height_request">200</property>
                             <property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui b/sw/uiconfig/swriter/ui/flddbpage.ui
index 026ae9c56a7a..7261c8f71ce4 100644
--- a/sw/uiconfig/swriter/ui/flddbpage.ui
+++ b/sw/uiconfig/swriter/ui/flddbpage.ui
@@ -2,7 +2,7 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
-  <object class="GtkBox" id="FldDbPage">
+  <object class="GtkBox" id="FieldDbPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
diff --git a/sw/uiconfig/swriter/ui/flddocinfopage.ui b/sw/uiconfig/swriter/ui/flddocinfopage.ui
index 913e9e01b7c9..01311517bf53 100644
--- a/sw/uiconfig/swriter/ui/flddocinfopage.ui
+++ b/sw/uiconfig/swriter/ui/flddocinfopage.ui
@@ -2,7 +2,7 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
-  <object class="GtkBox" id="FldDocInfoPage">
+  <object class="GtkBox" id="FieldDocInfoPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
diff --git a/sw/uiconfig/swriter/ui/flddocumentpage.ui b/sw/uiconfig/swriter/ui/flddocumentpage.ui
index 8858ab7233f0..ccef32327f50 100644
--- a/sw/uiconfig/swriter/ui/flddocumentpage.ui
+++ b/sw/uiconfig/swriter/ui/flddocumentpage.ui
@@ -9,7 +9,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkBox" id="FldDocumentPage">
+  <object class="GtkBox" id="FieldDocumentPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index e5f77b39c394..9b04e7ff246f 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -2,7 +2,7 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
-  <object class="GtkBox" id="FldFuncPage">
+  <object class="GtkBox" id="FieldFuncPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
diff --git a/sw/uiconfig/swriter/ui/fldrefpage.ui b/sw/uiconfig/swriter/ui/fldrefpage.ui
index b99ec1a6a625..347555abacb2 100644
--- a/sw/uiconfig/swriter/ui/fldrefpage.ui
+++ b/sw/uiconfig/swriter/ui/fldrefpage.ui
@@ -2,7 +2,7 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
-  <object class="GtkBox" id="FldRefPage">
+  <object class="GtkBox" id="FieldRefPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -148,7 +148,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="swuilo-SwFldRefTreeListBox" id="selecttip:border">
+                          <object class="swuilo-SwFieldRefTreeListBox" id="selecttip:border">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 8900bdeb97ba..845e6e1688e8 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -2,7 +2,7 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
-  <object class="GtkBox" id="FldVarPage">
+  <object class="GtkBox" id="FieldVarPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>